From c9a48395c4b2c2c31f145e970903203475c3cc24 Mon Sep 17 00:00:00 2001 From: narendrabandhamneni-wt-egov Date: Thu, 30 Apr 2020 12:49:25 +0530 Subject: [PATCH 0001/1242] added changes --- .../egov-indexer/billingservices-indexer.yml | 9 + configs/egov-indexer/chatbot-telemetry.yaml | 12 + configs/egov-indexer/egov-bpa-indexer.yml | 133 +++++ configs/egov-indexer/error-queue.yml | 27 + configs/egov-indexer/payment-indexer.yml | 158 ++++++ configs/egov-indexer/property-services.yml | 510 ++++++++++++++++++ .../rainmaker-bpastakeholder-indexer.yml | 24 + configs/egov-indexer/sewerage-service.yml | 199 +++++++ configs/egov-indexer/water-service.yml | 223 ++++++++ configs/egov-indexer/water-services-meter.yml | 29 + 10 files changed, 1324 insertions(+) create mode 100644 configs/egov-indexer/chatbot-telemetry.yaml create mode 100644 configs/egov-indexer/egov-bpa-indexer.yml create mode 100644 configs/egov-indexer/error-queue.yml create mode 100644 configs/egov-indexer/payment-indexer.yml create mode 100644 configs/egov-indexer/property-services.yml create mode 100644 configs/egov-indexer/rainmaker-bpastakeholder-indexer.yml create mode 100644 configs/egov-indexer/sewerage-service.yml create mode 100644 configs/egov-indexer/water-service.yml create mode 100644 configs/egov-indexer/water-services-meter.yml diff --git a/configs/egov-indexer/billingservices-indexer.yml b/configs/egov-indexer/billingservices-indexer.yml index 6b42a4f1..fe992cf3 100644 --- a/configs/egov-indexer/billingservices-indexer.yml +++ b/configs/egov-indexer/billingservices-indexer.yml @@ -10,3 +10,12 @@ ServiceMaps: id: $.id, $.tenantId isBulk: true jsonPath: $.Demands + - topic: demand-reindex + configKey: REINDEX + indexes: + - name: demandindex-v1 + type: demand + id: $.id, $.tenantId + isBulk: true + jsonPath: $.hits + timeStampField: $.auditDetail.createdTime diff --git a/configs/egov-indexer/chatbot-telemetry.yaml b/configs/egov-indexer/chatbot-telemetry.yaml new file mode 100644 index 00000000..0a02880b --- /dev/null +++ b/configs/egov-indexer/chatbot-telemetry.yaml @@ -0,0 +1,12 @@ +ServiceMaps: + serviceName: chatbot-messages + version: 1.0.0 + mappings: + - topic: send-message-localized + configKey: INDEX + indexes: + - name: chatbot-messages + type: general + id: $.message.messageId, $.response.timestamp + timeStampField: $.timestamp + fieldsToBeMasked: ["$.user.mobileNumber", "$.user.authToken", "$.user.refreshToken", "$.user.userInfo", "$.user.expiresAt", "$.extraInfo", "$.conversationState.questionDetails", "$.nextConversationState.questionDetails", "$.message.rawInput", "$.message.messageContent", "$.response.localizationCodes", "$.response.text", "$.response.fileStoreId", "$.response.location", "$.response.contactCard"] diff --git a/configs/egov-indexer/egov-bpa-indexer.yml b/configs/egov-indexer/egov-bpa-indexer.yml new file mode 100644 index 00000000..7c86a374 --- /dev/null +++ b/configs/egov-indexer/egov-bpa-indexer.yml @@ -0,0 +1,133 @@ +ServiceMaps: + serviceName: BPA Service + version: 1.0.0 + mappings: + - topic: save-bpa-buildingplan + configKey: INDEX + indexes: + - name: bpa-index + type: bpaapplication + id: $.id, $.tenantId + isBulk: false + timeStampField: $.auditDetails.createdTime + jsonPath: $.BPA + customJsonMapping: + indexMapping: {"Data":{"serviceType":"serviceType","edcrNumber":"edcrNumber","applicationType":"applicationType","applicationNo":"applicationNo","ownerName":"ownerName","ownerEmail":"ownerEmail","ownerMobileNo":"ownerMobileNo","tradeType":"tradeType","occupancyType":"occupancyType","subOccupancyType":"subOccupancyType","riskType":"riskType","holdingNo":"holdingNo","orderGeneratedDate":"orderGeneratedDate","action":"action","govtOrQuasi":"govtOrQuasi","usages":"usages","registrationDetails":"registrationDetails","tradeType":"tradeType","permitOrderNo":"permitOrderNo","ownershipCategory":"ownershipCategory","validityDate":"validityDate","status":"status","comment":"comment","remarks":"remarks","tenantId":"tenantId","@timestamp":"timestamp"}} + fieldMapping: + - inJsonPath: $.serviceType + outJsonPath: $.Data.serviceType + - inJsonPath: $.edcrNumber + outJsonPath: $.Data.edcrNumber + - inJsonPath: $.applicationType + outJsonPath: $.Data.applicationType + - inJsonPath: $.applicationNo + outJsonPath: $.Data.applicationNo + - inJsonPath: $.owners[0].name + outJsonPath: $.Data.ownerName + - inJsonPath: $.owners[0].emailId + outJsonPath: $.Data.ownerEmail + - inJsonPath: $.owners[0].mobileNumber + outJsonPath: $.Data.ownerMobileNo + - inJsonPath: $.tradeType + outJsonPath: $.Data.tradeType + - inJsonPath: $.occupancyType + outJsonPath: $.Data.occupancyType + - inJsonPath: $.subOccupancyType + outJsonPath: $.Data.subOccupancyType + - inJsonPath: $.riskType + outJsonPath: $.Data.riskType + - inJsonPath: $.holdingNo + outJsonPath: $.Data.holdingNo + - inJsonPath: $.orderGeneratedDate + outJsonPath: $.Data.orderGeneratedDate + - inJsonPath: $.action + outJsonPath: $.Data.action + - inJsonPath: $.govtOrQuasi + outJsonPath: $.Data.govtOrQuasi + - inJsonPath: $.usages + outJsonPath: $.Data.usages + - inJsonPath: $.registrationDetails + outJsonPath: $.Data.registrationDetails + - inJsonPath: $.tradeType + outJsonPath: $.Data.tradeType + - inJsonPath: $.permitOrderNo + outJsonPath: $.Data.permitOrderNo + - inJsonPath: $.ownershipCategory + outJsonPath: $.Data.ownershipCategory + - inJsonPath: $.validityDate + outJsonPath: $.Data.validityDate + - inJsonPath: $.status + outJsonPath: $.Data.status + - inJsonPath: $.comment + outJsonPath: $.Data.comment + - inJsonPath: $.remarks + outJsonPath: $.Data.remarks + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + + - topic: update-bpa-buildingplan + configKey: INDEX + indexes: + - name: bpa-index + type: bpaapplication + id: $.id, $.tenantId + isBulk: false + jsonPath: $.BPA + timeStampField: $.auditDetails.createdTime + customJsonMapping: + indexMapping: {"Data":{"serviceType":"serviceType","edcrNumber":"edcrNumber","applicationType":"applicationType","applicationNo":"applicationNo","ownerName":"ownerName","ownerEmail":"ownerEmail","ownerMobileNo":"ownerMobileNo","occupancyType":"occupancyType","subOccupancyType":"subOccupancyType","riskType":"riskType","holdingNo":"holdingNo","orderGeneratedDate":"orderGeneratedDate","action":"action","govtOrQuasi":"govtOrQuasi","usages":"usages","registrationDetails":"registrationDetails","tradeType":"tradeType","permitOrderNo":"permitOrderNo","ownershipCategory":"ownershipCategory","validityDate":"validityDate","status":"status","comment":"comment","remarks":"remarks","tenantId":"tenantId","@timestamp":"timestamp"}} + fieldMapping: + - inJsonPath: $.serviceType + outJsonPath: $.Data.serviceType + - inJsonPath: $.edcrNumber + outJsonPath: $.Data.edcrNumber + - inJsonPath: $.applicationType + outJsonPath: $.Data.applicationType + - inJsonPath: $.applicationNo + outJsonPath: $.Data.applicationNo + - inJsonPath: $.owners[0].name + outJsonPath: $.Data.ownerName + - inJsonPath: $.owners[0].emailId + outJsonPath: $.Data.ownerEmail + - inJsonPath: $.owners[0].mobileNumber + outJsonPath: $.Data.ownerMobileNo + - inJsonPath: $.occupancyType + outJsonPath: $.Data.occupancyType + - inJsonPath: $.subOccupancyType + outJsonPath: $.Data.subOccupancyType + - inJsonPath: $.riskType + outJsonPath: $.Data.riskType + - inJsonPath: $.holdingNo + outJsonPath: $.Data.holdingNo + - inJsonPath: $.orderGeneratedDate + outJsonPath: $.Data.orderGeneratedDate + - inJsonPath: $.action + outJsonPath: $.Data.action + - inJsonPath: $.govtOrQuasi + outJsonPath: $.Data.govtOrQuasi + - inJsonPath: $.usages + outJsonPath: $.Data.usages + - inJsonPath: $.registrationDetails + outJsonPath: $.Data.registrationDetails + - inJsonPath: $.tradeType + outJsonPath: $.Data.tradeType + - inJsonPath: $.permitOrderNo + outJsonPath: $.Data.permitOrderNo + - inJsonPath: $.ownershipCategory + outJsonPath: $.Data.ownershipCategory + - inJsonPath: $.validityDate + outJsonPath: $.Data.validityDate + - inJsonPath: $.status + outJsonPath: $.Data.status + - inJsonPath: $.comment + outJsonPath: $.Data.comment + - inJsonPath: $.remarks + outJsonPath: $.Data.remarks + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + + diff --git a/configs/egov-indexer/error-queue.yml b/configs/egov-indexer/error-queue.yml new file mode 100644 index 00000000..c8b550b5 --- /dev/null +++ b/configs/egov-indexer/error-queue.yml @@ -0,0 +1,27 @@ +ServiceMaps: + serviceName: Tracer + version: 1.0.0 + mappings: + - topic: tracer-error-queue-index + configKey: INDEX + indexes: + - name: egovtracer + type: errors + id: $.id + isBulk: false + timeStampField: $.ts + + - topic: tracer-error-queue-reindex + configKey: REINDEX + indexes: + - name: egovtracerreindex + type: errors + id: $.id + isBulk: true + jsonPath: $.hits + timeStampField: $.ts + + +#JOURNEY: egovtracer +#configKey=INDEX: Index that currently receives live data from the services +#configKey=REINDEX: Configuration for reindexing that will be enabled only during reindexing activity. diff --git a/configs/egov-indexer/payment-indexer.yml b/configs/egov-indexer/payment-indexer.yml new file mode 100644 index 00000000..682c633f --- /dev/null +++ b/configs/egov-indexer/payment-indexer.yml @@ -0,0 +1,158 @@ +ServiceMaps: + serviceName: Collection Services + version: 1.0.0 + mappings: + - topic: egov.collection.payment-create + configKey: INDEX + indexes: + - name: paymentsindex-v1 + type: payments + id: $.id + isBulk: false + timeStampField: $.auditDetails.createdTime + jsonPath: $.Payment + customJsonMapping: + indexMapping: {"Data":{"tenantId":"","id":"","transactionNumber":"","transactionDate":1,"paymentMode":"","paymentStatus":"","payer":{"id":"","name":""},"paidBy":"","paymentDetails":{},"auditDetails":{},"additionalDetails":{},"tenantData":{},"@timestamp":"timestamp"}} + fieldMapping: + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.transactionNumber + outJsonPath: $.Data.transactionNumber + - inJsonPath: $.transactionDate + outJsonPath: $.Data.transactionDate + - inJsonPath: $.paymentMode + outJsonPath: $.Data.paymentMode + - inJsonPath: $.paymentStatus + outJsonPath: $.Data.paymentStatus + - inJsonPath: $.payerId + outJsonPath: $.Data.payer.id + - inJsonPath: $.payerName + outJsonPath: $.Data.payer.name + - inJsonPath: $.paidBy + outJsonPath: $.Data.paidBy + - inJsonPath: $.paymentDetails + outJsonPath: $.Data.paymentDetails + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - inJsonPath: $.additionalDetails + outJsonPath: $.Data.additionalDetails + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + mdmsMapping: + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData + + + - topic: egov.collection.payment-update + configKey: INDEX + indexes: + - name: paymentsindex-v1 + type: payments + id: $.id + isBulk: false + timeStampField: $.auditDetails.createdTime + jsonPath: $.Payment + customJsonMapping: + indexMapping: {"Data":{"tenantId":"","id":"","transactionNumber":"","transactionDate":1,"paymentMode":"","paymentStatus":"","payer":{"id":"","name":""},"paidBy":"","paymentDetails":{},"auditDetails":{},"additionalDetails":{},"tenantData":{},"@timestamp":"timestamp"}} + fieldMapping: + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.transactionNumber + outJsonPath: $.Data.transactionNumber + - inJsonPath: $.transactionDate + outJsonPath: $.Data.transactionDate + - inJsonPath: $.paymentMode + outJsonPath: $.Data.paymentMode + - inJsonPath: $.paymentStatus + outJsonPath: $.Data.paymentStatus + - inJsonPath: $.payerId + outJsonPath: $.Data.payer.id + - inJsonPath: $.payerName + outJsonPath: $.Data.payer.name + - inJsonPath: $.paidBy + outJsonPath: $.Data.paidBy + - inJsonPath: $.paymentDetails + outJsonPath: $.Data.paymentDetails + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - inJsonPath: $.additionalDetails + outJsonPath: $.Data.additionalDetails + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + mdmsMapping: + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData + + + - topic: egov-payment-legacy-index + configKey: LEGACYINDEX + indexes: + - name: paymentsindex-v1 + type: payments + id: $.id + isBulk: true + timeStampField: $.auditDetails.createdTime + jsonPath: $.Payments.* + customJsonMapping: + indexMapping: {"Data":{"tenantId":"","id":"","transactionNumber":"","transactionDate":1,"paymentMode":"","paymentStatus":"","payer":{"id":"","name":""},"paidBy":"","paymentDetails":{},"auditDetails":{},"additionalDetails":{},"tenantData":{},"@timestamp":"timestamp"}} + fieldMapping: + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.transactionNumber + outJsonPath: $.Data.transactionNumber + - inJsonPath: $.transactionDate + outJsonPath: $.Data.transactionDate + - inJsonPath: $.paymentMode + outJsonPath: $.Data.paymentMode + - inJsonPath: $.paymentStatus + outJsonPath: $.Data.paymentStatus + - inJsonPath: $.payerId + outJsonPath: $.Data.payer.id + - inJsonPath: $.payerName + outJsonPath: $.Data.payer.name + - inJsonPath: $.paidBy + outJsonPath: $.Data.paidBy + - inJsonPath: $.paymentDetails + outJsonPath: $.Data.paymentDetails + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - inJsonPath: $.additionalDetails + outJsonPath: $.Data.additionalDetails + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + mdmsMapping: + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData diff --git a/configs/egov-indexer/property-services.yml b/configs/egov-indexer/property-services.yml new file mode 100644 index 00000000..2529011a --- /dev/null +++ b/configs/egov-indexer/property-services.yml @@ -0,0 +1,510 @@ +ServiceMaps: + serviceName: Property Tax - rainmaker + version: 1.0.0 + mappings: + - topic: save-property-registry + configKey: INDEX + indexes: + - name: property-services + type: general + id: $.propertyId,$.tenantId,$.auditDetails.lastModifiedTime + jsonPath: $.Property + timeStampField: $.auditDetails.lastModifiedTime + customJsonMapping: + indexMapping: {"Data":{"workflow":{"state":{},"action":"","assignes":[]},"owners":[],"acknowldgementNumber":"","propertyType":"","ownershipCategory":"","creationReason":"","usageCategory":"","noOfFloors":"","landArea":"","superBuiltUpArea":"","source":"","channel":"","units":{},"auditDetails":{},"id":"","propertyId":"","surveyId":"","linkedProperties":{},"tenantId":"","accountId":"","oldPropertyId":"","status":"","@timestamp":"timestamp"}} + fieldMapping: + - inJsonPath: $.owners.*.uuid + outJsonPath: $.Data.owners + - inJsonPath: $.workflow.state + outJsonPath: $.Data.workflow.state + - inJsonPath: $.workflow.action + outJsonPath: $.Data.workflow.action + - inJsonPath: $.workflow.assignes.*.uuid + outJsonPath: $.Data.workflow.assignes + - inJsonPath: $.acknowldgementNumber + outJsonPath: $.Data.acknowldgementNumber + - inJsonPath: $.propertyType + outJsonPath: $.Data.propertyType + - inJsonPath: $.ownershipCategory + outJsonPath: $.Data.ownershipCategory + - inJsonPath: $.creationReason + outJsonPath: $.Data.creationReason + - inJsonPath: $.usageCategory + outJsonPath: $.Data.usageCategory + - inJsonPath: $.noOfFloors + outJsonPath: $.Data.noOfFloors + - inJsonPath: $.landArea + outJsonPath: $.Data.landArea + - inJsonPath: $.superBuiltUpArea + outJsonPath: $.Data.superBuiltUpArea + - inJsonPath: $.source + outJsonPath: $.Data.source + - inJsonPath: $.channel + outJsonPath: $.Data.channel + - inJsonPath: $.units + outJsonPath: $.Data.units + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.propertyId + outJsonPath: $.Data.propertyId + - inJsonPath: $.surveyId + outJsonPath: $.Data.surveyId + - inJsonPath: $.linkedProperties + outJsonPath: $.Data.linkedProperties + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.accountId + outJsonPath: $.Data.accountId + - inJsonPath: $.oldPropertyId + outJsonPath: $.Data.oldPropertyId + - inJsonPath: $.status + outJsonPath: $.Data.status + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + externalUriMapping: + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + mdmsMapping: + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData + + - topic: update-property-registry + configKey: INDEX + indexes: + - name: property-services + type: general + id: $.propertyId,$.tenantId,$.auditDetails.lastModifiedTime + jsonPath: $.Property + timeStampField: $.auditDetails.lastModifiedTime + customJsonMapping: + indexMapping: {"Data":{"workflow":{"state":{},"action":"","assignes":[]},"owners":[],"acknowldgementNumber":"","propertyType":"","ownershipCategory":"","creationReason":"","usageCategory":"","noOfFloors":"","landArea":"","superBuiltUpArea":"","source":"","channel":"","units":{},"auditDetails":{},"id":"","propertyId":"","surveyId":"","linkedProperties":{},"tenantId":"","accountId":"","oldPropertyId":"","status":"","@timestamp":"timestamp"}} + fieldMapping: + - inJsonPath: $.owners.*.uuid + outJsonPath: $.Data.owners + - inJsonPath: $.workflow.state + outJsonPath: $.Data.workflow.state + - inJsonPath: $.workflow.action + outJsonPath: $.Data.workflow.action + - inJsonPath: $.workflow.assignes.*.uuid + outJsonPath: $.Data.workflow.assignes + - inJsonPath: $.acknowldgementNumber + outJsonPath: $.Data.acknowldgementNumber + - inJsonPath: $.propertyType + outJsonPath: $.Data.propertyType + - inJsonPath: $.ownershipCategory + outJsonPath: $.Data.ownershipCategory + - inJsonPath: $.creationReason + outJsonPath: $.Data.creationReason + - inJsonPath: $.usageCategory + outJsonPath: $.Data.usageCategory + - inJsonPath: $.noOfFloors + outJsonPath: $.Data.noOfFloors + - inJsonPath: $.landArea + outJsonPath: $.Data.landArea + - inJsonPath: $.superBuiltUpArea + outJsonPath: $.Data.superBuiltUpArea + - inJsonPath: $.source + outJsonPath: $.Data.source + - inJsonPath: $.channel + outJsonPath: $.Data.channel + - inJsonPath: $.units + outJsonPath: $.Data.units + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.propertyId + outJsonPath: $.Data.propertyId + - inJsonPath: $.surveyId + outJsonPath: $.Data.surveyId + - inJsonPath: $.linkedProperties + outJsonPath: $.Data.linkedProperties + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.accountId + outJsonPath: $.Data.accountId + - inJsonPath: $.oldPropertyId + outJsonPath: $.Data.oldPropertyId + - inJsonPath: $.status + outJsonPath: $.Data.status + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + externalUriMapping: + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + mdmsMapping: + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData + + - topic: cancel-property-registry + configKey: INDEX + indexes: + - name: property-services + type: general + id: $.propertyId,$.tenantId,$.auditDetails.lastModifiedTime + jsonPath: $.Property + timeStampField: $.auditDetails.lastModifiedTime + customJsonMapping: + indexMapping: {"Data":{"workflow":{"state":{},"action":"","assignes":[]},"owners":[],"acknowldgementNumber":"","propertyType":"","ownershipCategory":"","creationReason":"","usageCategory":"","noOfFloors":"","landArea":"","superBuiltUpArea":"","source":"","channel":"","units":{},"auditDetails":{},"id":"","propertyId":"","surveyId":"","linkedProperties":{},"tenantId":"","accountId":"","oldPropertyId":"","status":"","@timestamp":"timestamp"}} + fieldMapping: + - inJsonPath: $.owners.*.uuid + outJsonPath: $.Data.owners + - inJsonPath: $.workflow.state + outJsonPath: $.Data.workflow.state + - inJsonPath: $.workflow.action + outJsonPath: $.Data.workflow.action + - inJsonPath: $.workflow.assignes.*.uuid + outJsonPath: $.Data.workflow.assignes + - inJsonPath: $.acknowldgementNumber + outJsonPath: $.Data.acknowldgementNumber + - inJsonPath: $.propertyType + outJsonPath: $.Data.propertyType + - inJsonPath: $.ownershipCategory + outJsonPath: $.Data.ownershipCategory + - inJsonPath: $.creationReason + outJsonPath: $.Data.creationReason + - inJsonPath: $.usageCategory + outJsonPath: $.Data.usageCategory + - inJsonPath: $.noOfFloors + outJsonPath: $.Data.noOfFloors + - inJsonPath: $.landArea + outJsonPath: $.Data.landArea + - inJsonPath: $.superBuiltUpArea + outJsonPath: $.Data.superBuiltUpArea + - inJsonPath: $.source + outJsonPath: $.Data.source + - inJsonPath: $.channel + outJsonPath: $.Data.channel + - inJsonPath: $.units + outJsonPath: $.Data.units + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.propertyId + outJsonPath: $.Data.propertyId + - inJsonPath: $.surveyId + outJsonPath: $.Data.surveyId + - inJsonPath: $.linkedProperties + outJsonPath: $.Data.linkedProperties + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.accountId + outJsonPath: $.Data.accountId + - inJsonPath: $.oldPropertyId + outJsonPath: $.Data.oldPropertyId + - inJsonPath: $.status + outJsonPath: $.Data.status + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + externalUriMapping: + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + mdmsMapping: + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData + + - topic: property-registry-legacyIndex + configKey: LEGACYINDEX + indexes: + - name: property-services + type: general + isBulk: true + id: $.propertyId,$.tenantId,$.auditDetails.lastModifiedTime + jsonPath: $.Properties.* + timeStampField: $.auditDetails.lastModifiedTime + customJsonMapping: + indexMapping: {"Data":{"workflow":{"state":{},"action":"","assignes":[]},"owners":[],"acknowldgementNumber":"","propertyType":"","ownershipCategory":"","creationReason":"","usageCategory":"","noOfFloors":"","landArea":"","superBuiltUpArea":"","source":"","channel":"","units":{},"auditDetails":{},"id":"","propertyId":"","surveyId":"","linkedProperties":{},"tenantId":"","accountId":"","oldPropertyId":"","status":"","@timestamp":"timestamp"}} + fieldMapping: + - inJsonPath: $.owners.*.uuid + outJsonPath: $.Data.owners + - inJsonPath: $.workflow.state + outJsonPath: $.Data.workflow.state + - inJsonPath: $.workflow.action + outJsonPath: $.Data.workflow.action + - inJsonPath: $.workflow.assignes.*.uuid + outJsonPath: $.Data.workflow.assignes + - inJsonPath: $.acknowldgementNumber + outJsonPath: $.Data.acknowldgementNumber + - inJsonPath: $.propertyType + outJsonPath: $.Data.propertyType + - inJsonPath: $.ownershipCategory + outJsonPath: $.Data.ownershipCategory + - inJsonPath: $.creationReason + outJsonPath: $.Data.creationReason + - inJsonPath: $.usageCategory + outJsonPath: $.Data.usageCategory + - inJsonPath: $.noOfFloors + outJsonPath: $.Data.noOfFloors + - inJsonPath: $.landArea + outJsonPath: $.Data.landArea + - inJsonPath: $.superBuiltUpArea + outJsonPath: $.Data.superBuiltUpArea + - inJsonPath: $.source + outJsonPath: $.Data.source + - inJsonPath: $.channel + outJsonPath: $.Data.channel + - inJsonPath: $.units + outJsonPath: $.Data.units + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.propertyId + outJsonPath: $.Data.propertyId + - inJsonPath: $.surveyId + outJsonPath: $.Data.surveyId + - inJsonPath: $.linkedProperties + outJsonPath: $.Data.linkedProperties + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.accountId + outJsonPath: $.Data.accountId + - inJsonPath: $.oldPropertyId + outJsonPath: $.Data.oldPropertyId + - inJsonPath: $.status + outJsonPath: $.Data.status + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + externalUriMapping: + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + mdmsMapping: + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData + + - topic: save-pt-assessment + configKey: INDEX + indexes: + - name: property-assessments + type: general + id: $.assessmentNumber, $.tenantId + jsonPath: $.Assessment + timeStampField: $.auditDetails.createdTime + customJsonMapping: + indexMapping: {"Data":{"workflow":{"state":{},"action":"","assignes":[]},"id":"","tenantId":"","additionalDetails":"","assessmentNumber":"","financialYear":"","propertyId":"","assessmentDate":"","status":"","source":"","unitUsageList":{},"channel":"","auditDetails":{},"@timestamp":"timestamp"}} + fieldMapping: + - inJsonPath: $.workflow.state + outJsonPath: $.Data.workflow.state + - inJsonPath: $.workflow.action + outJsonPath: $.Data.workflow.action + - inJsonPath: $.workflow.assignes.*.uuid + outJsonPath: $.Data.workflow.assignes + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.assessmentNumber + outJsonPath: $.Data.assessmentNumber + - inJsonPath: $.financialYear + outJsonPath: $.Data.financialYear + - inJsonPath: $.propertyId + outJsonPath: $.Data.propertyId + - inJsonPath: $.assessmentDate + outJsonPath: $.Data.assessmentDate + - inJsonPath: $.status + outJsonPath: $.Data.status + - inJsonPath: $.source + outJsonPath: $.Data.source + - inJsonPath: $.unitUsageList + outJsonPath: $.Data.unitUsageList + - inJsonPath: $.channel + outJsonPath: $.Data.channel + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - inJsonPath: $.additionalDetails + outJsonPath: $.Data.additionalDetails + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + + + - topic: update-pt-assessment + configKey: INDEX + indexes: + - name: property-assessments + type: general + id: $.assessmentNumber, $.tenantId + jsonPath: $.Assessment + timeStampField: $.auditDetails.createdTime + customJsonMapping: + indexMapping: {"Data":{"workflow":{"state":{},"action":"","assignes":[]},"id":"","tenantId":"","additionalDetails":"","assessmentNumber":"","financialYear":"","propertyId":"","assessmentDate":"","status":"","source":"","unitUsageList":{},"channel":"","auditDetails":{},"@timestamp":"timestamp"}} + fieldMapping: + - inJsonPath: $.workflow.state + outJsonPath: $.Data.workflow.state + - inJsonPath: $.workflow.action + outJsonPath: $.Data.workflow.action + - inJsonPath: $.workflow.assignes.*.uuid + outJsonPath: $.Data.workflow.assignes + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.assessmentNumber + outJsonPath: $.Data.assessmentNumber + - inJsonPath: $.financialYear + outJsonPath: $.Data.financialYear + - inJsonPath: $.propertyId + outJsonPath: $.Data.propertyId + - inJsonPath: $.assessmentDate + outJsonPath: $.Data.assessmentDate + - inJsonPath: $.status + outJsonPath: $.Data.status + - inJsonPath: $.source + outJsonPath: $.Data.source + - inJsonPath: $.unitUsageList + outJsonPath: $.Data.unitUsageList + - inJsonPath: $.channel + outJsonPath: $.Data.channel + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - inJsonPath: $.additionalDetails + outJsonPath: $.Data.additionalDetails + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + + - topic: cancel-property-assessment + configKey: INDEX + indexes: + - name: property-assessments + type: general + id: $.assessmentNumber, $.tenantId + jsonPath: $.Assessment + timeStampField: $.auditDetails.createdTime + customJsonMapping: + indexMapping: {"Data":{"workflow":{"state":{},"action":"","assignes":[]},"id":"","tenantId":"","additionalDetails":"","assessmentNumber":"","financialYear":"","propertyId":"","assessmentDate":"","status":"","source":"","unitUsageList":{},"channel":"","auditDetails":{},"@timestamp":"timestamp"}} + fieldMapping: + - inJsonPath: $.workflow.state + outJsonPath: $.Data.workflow.state + - inJsonPath: $.workflow.action + outJsonPath: $.Data.workflow.action + - inJsonPath: $.workflow.assignes.*.uuid + outJsonPath: $.Data.workflow.assignes + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.assessmentNumber + outJsonPath: $.Data.assessmentNumber + - inJsonPath: $.financialYear + outJsonPath: $.Data.financialYear + - inJsonPath: $.propertyId + outJsonPath: $.Data.propertyId + - inJsonPath: $.assessmentDate + outJsonPath: $.Data.assessmentDate + - inJsonPath: $.status + outJsonPath: $.Data.status + - inJsonPath: $.source + outJsonPath: $.Data.source + - inJsonPath: $.unitUsageList + outJsonPath: $.Data.unitUsageList + - inJsonPath: $.channel + outJsonPath: $.Data.channel + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - inJsonPath: $.additionalDetails + outJsonPath: $.Data.additionalDetails + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + + - topic: pt-assessment-legacyIndex + configKey: LEGACYINDEX + indexes: + - name: property-assessments + type: general + id: $.assessmentNumber, $.tenantId + jsonPath: $.Assessments.* + isBulk: true + timeStampField: $.auditDetails.createdTime + customJsonMapping: + indexMapping: {"Data":{"workflow":{"state":{},"action":"","assignes":[]},"id":"","tenantId":"","additionalDetails":"","assessmentNumber":"","financialYear":"","propertyId":"","assessmentDate":"","status":"","source":"","unitUsageList":{},"channel":"","auditDetails":{},"@timestamp":"timestamp"}} + fieldMapping: + - inJsonPath: $.workflow.state + outJsonPath: $.Data.workflow.state + - inJsonPath: $.workflow.action + outJsonPath: $.Data.workflow.action + - inJsonPath: $.workflow.assignes.*.uuid + outJsonPath: $.Data.workflow.assignes + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.assessmentNumber + outJsonPath: $.Data.assessmentNumber + - inJsonPath: $.financialYear + outJsonPath: $.Data.financialYear + - inJsonPath: $.propertyId + outJsonPath: $.Data.propertyId + - inJsonPath: $.assessmentDate + outJsonPath: $.Data.assessmentDate + - inJsonPath: $.status + outJsonPath: $.Data.status + - inJsonPath: $.source + outJsonPath: $.Data.source + - inJsonPath: $.unitUsageList + outJsonPath: $.Data.unitUsageList + - inJsonPath: $.channel + outJsonPath: $.Data.channel + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - inJsonPath: $.additionalDetails + outJsonPath: $.Data.additionalDetails + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp diff --git a/configs/egov-indexer/rainmaker-bpastakeholder-indexer.yml b/configs/egov-indexer/rainmaker-bpastakeholder-indexer.yml new file mode 100644 index 00000000..14faf199 --- /dev/null +++ b/configs/egov-indexer/rainmaker-bpastakeholder-indexer.yml @@ -0,0 +1,24 @@ +ServiceMaps: + serviceName: BPA - rainmaker + version: 1.0.0 + mappings: + - topic: save-tl-tradelicense + configKey: INDEX + indexes: + - name: bpastakeholderindex-v1 + type: stakeholder + id: $.id, $.tenantId + isBulk: true + jsonPath: $.Licenses + timeStampField: $.auditDetails.createdTime + fieldsToBeMasked: ["$.tradeLicenseDetail.owners[0].userName","$.tradeLicenseDetail.owners[0].password","$.tradeLicenseDetail.owners[0].mobileNumber","$.tradeLicenseDetail.owners[0].emailId","$.tradeLicenseDetail.owners[0].altContactNumber","$.tradeLicenseDetail.owners[0].pan","$.tradeLicenseDetail.owners[0].aadhaarNumber"] + customJsonMapping: + indexMapping: {"Data":{"owners":{},"tradeUnits": {},"@timestamp":"timestamp"}} + fieldMapping: + - inJsonPath: $.tradeLicenseDetail.owners + outJsonPath: $.Data.owners + - inJsonPath: $.tradeLicenseDetail.tradeUnits + outJsonPath: $.Data.tradeUnits + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + diff --git a/configs/egov-indexer/sewerage-service.yml b/configs/egov-indexer/sewerage-service.yml new file mode 100644 index 00000000..878ae616 --- /dev/null +++ b/configs/egov-indexer/sewerage-service.yml @@ -0,0 +1,199 @@ +ServiceMaps: + serviceName: Sewerage Service - rainmaker + version: 1.0.0 + mappings: + - topic: save-sw-connection + configKey: INDEX + indexes: + - name: sewerage-services + type: general + id: $.id,$.property.tenantId + timeStampField: $.additionalDetails.appCreatedDate + jsonPath: $.SewerageConnection + customJsonMapping: + indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"ownersmobileNos":[],"applicationNo":"","applicationStatus":"","status":"","connectionNo":"","oldConnectionNo":"","plumberInfo":[],"roadType":"","roadCuttingArea":"","connectionExecutionDate":"","connectionCategory":"","connectionType":"","additionalDetails":{},"id":"","propertyId":"","tenantId":"","proposedWaterClosets":"","proposedToilets":"","noOfWaterClosets":"","noOfToilets":"","history":{}}} + fieldMapping: + - inJsonPath: $.applicationStatus.state + outJsonPath: $.Data.workflow.state + - inJsonPath: $.processInstance.action + outJsonPath: $.Data.workflow.action + - inJsonPath: $.processInstance.assignes.*.uuid + outJsonPath: $.Data.workflow.assignes + - inJsonPath: $.property.owners.*.mobileNumber + outJsonPath: $.Data.ownersmobileNos + - inJsonPath: $.applicationNo + outJsonPath: $.Data.applicationNo + - inJsonPath: $.applicationStatus + outJsonPath: $.Data.applicationStatus + - inJsonPath: $.status + outJsonPath: $.Data.status + - inJsonPath: $.connectionNo + outJsonPath: $.Data.connectionNo + - inJsonPath: $.oldConnectionNo + outJsonPath: $.Data.oldConnectionNo + - inJsonPath: $.plumberInfo + outJsonPath: $.Data.plumberInfo + - inJsonPath: $.roadType + outJsonPath: $.Data.roadType + - inJsonPath: $.roadCuttingArea + outJsonPath: $.Data.roadCuttingArea + - inJsonPath: $.connectionExecutionDate + outJsonPath: $.Data.connectionExecutionDate + - inJsonPath: $.connectionCategory + outJsonPath: $.Data.connectionCategory + - inJsonPath: $.connectionType + outJsonPath: $.Data.connectionType + - inJsonPath: $.additionalDetails + outJsonPath: $.Data.additionalDetails + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.property.propertyId + outJsonPath: $.Data.propertyId + - inJsonPath: $.property.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.proposedWaterClosets + outJsonPath: $.Data.proposedWaterClosets + - inJsonPath: $.proposedToilets + outJsonPath: $.Data.proposedToilets + - inJsonPath: $.noOfWaterClosets + outJsonPath: $.Data.noOfWaterClosets + - inJsonPath: $.noOfToilets + outJsonPath: $.Data.noOfToilets + externalUriMapping: + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.applicationNo,history=true,tenantId=$.property.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history + + - topic: update-sw-connection + configKey: INDEX + indexes: + - name: sewerage-services + type: general + id: $.id,$.property.tenantId + timeStampField: $.additionalDetails.appCreatedDate + jsonPath: $.SewerageConnection + customJsonMapping: + indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"ownersmobileNos":[],"applicationNo":"","applicationStatus":"","status":"","connectionNo":"","oldConnectionNo":"","plumberInfo":[],"roadType":"","roadCuttingArea":"","connectionExecutionDate":"","connectionCategory":"","connectionType":"","additionalDetails":{},"id":"","propertyId":"","tenantId":"","proposedWaterClosets":"","proposedToilets":"","noOfWaterClosets":"","noOfToilets":"","history":{}}} + fieldMapping: + - inJsonPath: $.applicationStatus.state + outJsonPath: $.Data.workflow.state + - inJsonPath: $.processInstance.action + outJsonPath: $.Data.workflow.action + - inJsonPath: $.processInstance.assignes.*.uuid + outJsonPath: $.Data.workflow.assignes + - inJsonPath: $.property.owners.*.mobileNumber + outJsonPath: $.Data.ownersmobileNos + - inJsonPath: $.applicationNo + outJsonPath: $.Data.applicationNo + - inJsonPath: $.applicationStatus + outJsonPath: $.Data.applicationStatus + - inJsonPath: $.status + outJsonPath: $.Data.status + - inJsonPath: $.connectionNo + outJsonPath: $.Data.connectionNo + - inJsonPath: $.oldConnectionNo + outJsonPath: $.Data.oldConnectionNo + - inJsonPath: $.plumberInfo + outJsonPath: $.Data.plumberInfo + - inJsonPath: $.roadType + outJsonPath: $.Data.roadType + - inJsonPath: $.roadCuttingArea + outJsonPath: $.Data.roadCuttingArea + - inJsonPath: $.connectionExecutionDate + outJsonPath: $.Data.connectionExecutionDate + - inJsonPath: $.connectionCategory + outJsonPath: $.Data.connectionCategory + - inJsonPath: $.connectionType + outJsonPath: $.Data.connectionType + - inJsonPath: $.additionalDetails + outJsonPath: $.Data.additionalDetails + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.property.propertyId + outJsonPath: $.Data.propertyId + - inJsonPath: $.property.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.proposedWaterClosets + outJsonPath: $.Data.proposedWaterClosets + - inJsonPath: $.proposedToilets + outJsonPath: $.Data.proposedToilets + - inJsonPath: $.noOfWaterClosets + outJsonPath: $.Data.noOfWaterClosets + - inJsonPath: $.noOfToilets + outJsonPath: $.Data.noOfToilets + externalUriMapping: + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.applicationNo,history=true,tenantId=$.property.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history + + + - topic: update-sw-workflow + configKey: INDEX + indexes: + - name: sewerage-services + type: general + id: $.id,$.property.tenantId + timeStampField: $.additionalDetails.appCreatedDate + jsonPath: $.SewerageConnection + customJsonMapping: + indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"ownersmobileNos":[],"applicationNo":"","applicationStatus":"","status":"","connectionNo":"","oldConnectionNo":"","plumberInfo":[],"roadType":"","roadCuttingArea":"","connectionExecutionDate":"","connectionCategory":"","connectionType":"","additionalDetails":{},"id":"","propertyId":"","tenantId":"","proposedWaterClosets":"","proposedToilets":"","noOfWaterClosets":"","noOfToilets":"","history":{}}} + fieldMapping: + - inJsonPath: $.applicationStatus.state + outJsonPath: $.Data.workflow.state + - inJsonPath: $.processInstance.action + outJsonPath: $.Data.workflow.action + - inJsonPath: $.processInstance.assignes.*.uuid + outJsonPath: $.Data.workflow.assignes + - inJsonPath: $.property.owners.*.mobileNumber + outJsonPath: $.Data.ownersmobileNos + - inJsonPath: $.applicationNo + outJsonPath: $.Data.applicationNo + - inJsonPath: $.applicationStatus + outJsonPath: $.Data.applicationStatus + - inJsonPath: $.status + outJsonPath: $.Data.status + - inJsonPath: $.connectionNo + outJsonPath: $.Data.connectionNo + - inJsonPath: $.oldConnectionNo + outJsonPath: $.Data.oldConnectionNo + - inJsonPath: $.plumberInfo + outJsonPath: $.Data.plumberInfo + - inJsonPath: $.roadType + outJsonPath: $.Data.roadType + - inJsonPath: $.roadCuttingArea + outJsonPath: $.Data.roadCuttingArea + - inJsonPath: $.connectionExecutionDate + outJsonPath: $.Data.connectionExecutionDate + - inJsonPath: $.connectionCategory + outJsonPath: $.Data.connectionCategory + - inJsonPath: $.connectionType + outJsonPath: $.Data.connectionType + - inJsonPath: $.additionalDetails + outJsonPath: $.Data.additionalDetails + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.property.propertyId + outJsonPath: $.Data.propertyId + - inJsonPath: $.property.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.proposedWaterClosets + outJsonPath: $.Data.proposedWaterClosets + - inJsonPath: $.proposedToilets + outJsonPath: $.Data.proposedToilets + - inJsonPath: $.noOfWaterClosets + outJsonPath: $.Data.noOfWaterClosets + - inJsonPath: $.noOfToilets + outJsonPath: $.Data.noOfToilets + externalUriMapping: + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.applicationNo,history=true,tenantId=$.property.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history diff --git a/configs/egov-indexer/water-service.yml b/configs/egov-indexer/water-service.yml new file mode 100644 index 00000000..63835bd3 --- /dev/null +++ b/configs/egov-indexer/water-service.yml @@ -0,0 +1,223 @@ +ServiceMaps: + serviceName: Water Service - rainmaker + version: 1.0.0 + mappings: + - topic: save-ws-connection + configKey: INDEX + indexes: + - name: water-services + type: general + id: $.id,$.property.tenantId + jsonPath: $.WaterConnection + timeStampField: $.additionalDetails.appCreatedDate + customJsonMapping: + indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"ownersmobileNos":[],"applicationNo":"","applicationStatus":"","status":"","connectionNo":"","oldConnectionNo":"","plumberInfo":[],"roadType":"","roadCuttingArea":"","connectionExecutionDate":"","connectionCategory":"","connectionType":"","additionalDetails":{},"id":"","propertyId":"","rainWaterHarvesting":"","waterSource":"","tenantId":"","meterId":"","meterInstallationDate":"","proposedPipeSize":"","proposedTaps":"","pipeSize":"","noOfTaps":"","history":{}}} + fieldMapping: + - inJsonPath: $.applicationStatus.state + outJsonPath: $.Data.workflow.state + - inJsonPath: $.processInstance.action + outJsonPath: $.Data.workflow.action + - inJsonPath: $.processInstance.assignes.*.uuid + outJsonPath: $.Data.workflow.assignes + - inJsonPath: $.property.owners.*.mobileNumber + outJsonPath: $.Data.ownersmobileNos + - inJsonPath: $.applicationNo + outJsonPath: $.Data.applicationNo + - inJsonPath: $.applicationStatus + outJsonPath: $.Data.applicationStatus + - inJsonPath: $.status + outJsonPath: $.Data.status + - inJsonPath: $.connectionNo + outJsonPath: $.Data.connectionNo + - inJsonPath: $.oldConnectionNo + outJsonPath: $.Data.oldConnectionNo + - inJsonPath: $.plumberInfo + outJsonPath: $.Data.plumberInfo + - inJsonPath: $.roadType + outJsonPath: $.Data.roadType + - inJsonPath: $.roadCuttingArea + outJsonPath: $.Data.roadCuttingArea + - inJsonPath: $.connectionExecutionDate + outJsonPath: $.Data.connectionExecutionDate + - inJsonPath: $.connectionCategory + outJsonPath: $.Data.connectionCategory + - inJsonPath: $.connectionType + outJsonPath: $.Data.connectionType + - inJsonPath: $.additionalDetails + outJsonPath: $.Data.additionalDetails + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.property.propertyId + outJsonPath: $.Data.propertyId + - inJsonPath: $.rainWaterHarvesting + outJsonPath: $.Data.rainWaterHarvesting + - inJsonPath: $.waterSource + outJsonPath: $.Data.waterSource + - inJsonPath: $.property.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.meterId + outJsonPath: $.Data.meterId + - inJsonPath: $.meterInstallationDate + outJsonPath: $.Data.meterInstallationDate + - inJsonPath: $.proposedPipeSize + outJsonPath: $.Data.proposedPipeSize + - inJsonPath: $.proposedTaps + outJsonPath: $.Data.proposedTaps + - inJsonPath: $.pipeSize + outJsonPath: $.Data.pipeSize + - inJsonPath: $.noOfTaps + outJsonPath: $.Data.noOfTaps + externalUriMapping: + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.applicationNo,history=true,tenantId=$.property.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history + + + - topic: update-ws-connection + configKey: INDEX + indexes: + - name: water-services + type: general + id: $.id,$.property.tenantId + jsonPath: $.WaterConnection + timeStampField: $.additionalDetails.appCreatedDate + customJsonMapping: + indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"ownersmobileNos":[],"applicationNo":"","applicationStatus":"","status":"","connectionNo":"","oldConnectionNo":"","plumberInfo":[],"roadType":"","roadCuttingArea":"","connectionExecutionDate":"","connectionCategory":"","connectionType":"","additionalDetails":{},"id":"","propertyId":"","rainWaterHarvesting":"","waterSource":"","tenantId":"","meterId":"","meterInstallationDate":"","proposedPipeSize":"","proposedTaps":"","pipeSize":"","noOfTaps":"","history":{}}} + fieldMapping: + - inJsonPath: $.applicationStatus.state + outJsonPath: $.Data.workflow.state + - inJsonPath: $.processInstance.action + outJsonPath: $.Data.workflow.action + - inJsonPath: $.processInstance.assignes.*.uuid + outJsonPath: $.Data.workflow.assignes + - inJsonPath: $.property.owners.*.mobileNumber + outJsonPath: $.Data.ownersmobileNos + - inJsonPath: $.applicationNo + outJsonPath: $.Data.applicationNo + - inJsonPath: $.applicationStatus + outJsonPath: $.Data.applicationStatus + - inJsonPath: $.status + outJsonPath: $.Data.status + - inJsonPath: $.connectionNo + outJsonPath: $.Data.connectionNo + - inJsonPath: $.oldConnectionNo + outJsonPath: $.Data.oldConnectionNo + - inJsonPath: $.plumberInfo + outJsonPath: $.Data.plumberInfo + - inJsonPath: $.roadType + outJsonPath: $.Data.roadType + - inJsonPath: $.roadCuttingArea + outJsonPath: $.Data.roadCuttingArea + - inJsonPath: $.connectionExecutionDate + outJsonPath: $.Data.connectionExecutionDate + - inJsonPath: $.connectionCategory + outJsonPath: $.Data.connectionCategory + - inJsonPath: $.connectionType + outJsonPath: $.Data.connectionType + - inJsonPath: $.additionalDetails + outJsonPath: $.Data.additionalDetails + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.property.propertyId + outJsonPath: $.Data.propertyId + - inJsonPath: $.rainWaterHarvesting + outJsonPath: $.Data.rainWaterHarvesting + - inJsonPath: $.waterSource + outJsonPath: $.Data.waterSource + - inJsonPath: $.property.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.meterId + outJsonPath: $.Data.meterId + - inJsonPath: $.meterInstallationDate + outJsonPath: $.Data.meterInstallationDate + - inJsonPath: $.proposedPipeSize + outJsonPath: $.Data.proposedPipeSize + - inJsonPath: $.proposedTaps + outJsonPath: $.Data.proposedTaps + - inJsonPath: $.pipeSize + outJsonPath: $.Data.pipeSize + - inJsonPath: $.noOfTaps + outJsonPath: $.Data.noOfTaps + externalUriMapping: + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.applicationNo,history=true,tenantId=$.property.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history + + - topic: update-ws-workflow + configKey: INDEX + indexes: + - name: water-services + type: general + id: $.id,$.property.tenantId + jsonPath: $.WaterConnection + timeStampField: $.additionalDetails.appCreatedDate + customJsonMapping: + indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"ownersmobileNos":[],"applicationNo":"","applicationStatus":"","status":"","connectionNo":"","oldConnectionNo":"","plumberInfo":[],"roadType":"","roadCuttingArea":"","connectionExecutionDate":"","connectionCategory":"","connectionType":"","additionalDetails":{},"id":"","propertyId":"","rainWaterHarvesting":"","waterSource":"","tenantId":"","meterId":"","meterInstallationDate":"","proposedPipeSize":"","proposedTaps":"","pipeSize":"","noOfTaps":"","history":{}}} + fieldMapping: + - inJsonPath: $.applicationStatus.state + outJsonPath: $.Data.workflow.state + - inJsonPath: $.processInstance.action + outJsonPath: $.Data.workflow.action + - inJsonPath: $.processInstance.assignes.*.uuid + outJsonPath: $.Data.workflow.assignes + - inJsonPath: $.property.owners.*.mobileNumber + outJsonPath: $.Data.ownersmobileNos + - inJsonPath: $.applicationNo + outJsonPath: $.Data.applicationNo + - inJsonPath: $.applicationStatus + outJsonPath: $.Data.applicationStatus + - inJsonPath: $.status + outJsonPath: $.Data.status + - inJsonPath: $.connectionNo + outJsonPath: $.Data.connectionNo + - inJsonPath: $.oldConnectionNo + outJsonPath: $.Data.oldConnectionNo + - inJsonPath: $.plumberInfo + outJsonPath: $.Data.plumberInfo + - inJsonPath: $.roadType + outJsonPath: $.Data.roadType + - inJsonPath: $.roadCuttingArea + outJsonPath: $.Data.roadCuttingArea + - inJsonPath: $.connectionExecutionDate + outJsonPath: $.Data.connectionExecutionDate + - inJsonPath: $.connectionCategory + outJsonPath: $.Data.connectionCategory + - inJsonPath: $.connectionType + outJsonPath: $.Data.connectionType + - inJsonPath: $.additionalDetails + outJsonPath: $.Data.additionalDetails + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.property.propertyId + outJsonPath: $.Data.propertyId + - inJsonPath: $.rainWaterHarvesting + outJsonPath: $.Data.rainWaterHarvesting + - inJsonPath: $.waterSource + outJsonPath: $.Data.waterSource + - inJsonPath: $.property.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.meterId + outJsonPath: $.Data.meterId + - inJsonPath: $.meterInstallationDate + outJsonPath: $.Data.meterInstallationDate + - inJsonPath: $.proposedPipeSize + outJsonPath: $.Data.proposedPipeSize + - inJsonPath: $.proposedTaps + outJsonPath: $.Data.proposedTaps + - inJsonPath: $.pipeSize + outJsonPath: $.Data.pipeSize + - inJsonPath: $.noOfTaps + outJsonPath: $.Data.noOfTaps + externalUriMapping: + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.applicationNo,history=true,tenantId=$.property.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history diff --git a/configs/egov-indexer/water-services-meter.yml b/configs/egov-indexer/water-services-meter.yml new file mode 100644 index 00000000..b669b121 --- /dev/null +++ b/configs/egov-indexer/water-services-meter.yml @@ -0,0 +1,29 @@ +ServiceMaps: + serviceName: Meter Connection - rainmaker + version: 1.0.0 + mappings: + - topic: save-ws-meter + configKey: INDEX + indexes: + - name: meter-services + type: general + id: $.id,$.connectionNo + jsonPath: $.meterReadings + customJsonMapping: + indexMapping: {"Data":{"connectionNo":"","meterStatus":"","currentReadingDate":"","currentReading":"","lastReading":"","billingPeriod":"","lastReadingDate":""}} + fieldMapping: + - inJsonPath: $.connectionNo + outJsonPath: $.Data.connectionNo + - inJsonPath: $.meterStatus + outJsonPath: $.Data.meterStatus + - inJsonPath: $.currentReadingDate + outJsonPath: $.Data.currentReadingDate + - inJsonPath: $.currentReading + outJsonPath: $.Data.currentReading + - inJsonPath: $.lastReading + outJsonPath: $.Data.lastReading + - inJsonPath: $.billingPeriod + outJsonPath: $.Data.billingPeriod + - inJsonPath: $.lastReadingDate + outJsonPath: $.Data.lastReadingDate + From b149b2e4297d337c65292b0c5a86b5dd19abf5ce Mon Sep 17 00:00:00 2001 From: narendrabandhamneni-wt-egov Date: Thu, 30 Apr 2020 16:54:01 +0530 Subject: [PATCH 0002/1242] Added new persister yaml --- .../egov-persister/assessment-persister.yml | 228 +++++ .../billing-services-persist.yml | 274 ++++++ configs/egov-persister/bpa-persister.yml | 691 ++++++++++++++ configs/egov-persister/chatbot.yml | 77 ++ .../collection-migration-persister.yml | 238 +++++ configs/egov-persister/egf-bill.yaml | 338 +++++++ .../egov-user-event-persister.yml | 154 ++++ configs/egov-persister/firenoc_persiter.yaml | 586 ++++++++++++ .../egov-persister/pdf-filestoreid-update.yml | 30 + configs/egov-persister/pdf-generator.yml | 41 + configs/egov-persister/pgr.yml | 203 +++++ .../pt-mutation-calculator-persister.yml | 87 ++ configs/egov-persister/pt-persist.yml | 582 ++++++++++++ configs/egov-persister/sewerage-persist.yml | 225 +++++ .../tradelicense-persister-bpachanges.yml | 843 ++++++++++++++++++ configs/egov-persister/tradelicense.yml | 843 ++++++++++++++++++ configs/egov-persister/water-meter.yml | 30 + configs/egov-persister/water-persist.yml | 258 ++++++ 18 files changed, 5728 insertions(+) create mode 100644 configs/egov-persister/assessment-persister.yml create mode 100644 configs/egov-persister/billing-services-persist.yml create mode 100644 configs/egov-persister/bpa-persister.yml create mode 100644 configs/egov-persister/chatbot.yml create mode 100644 configs/egov-persister/collection-migration-persister.yml create mode 100644 configs/egov-persister/egf-bill.yaml create mode 100644 configs/egov-persister/egov-user-event-persister.yml create mode 100644 configs/egov-persister/firenoc_persiter.yaml create mode 100644 configs/egov-persister/pdf-filestoreid-update.yml create mode 100644 configs/egov-persister/pdf-generator.yml create mode 100644 configs/egov-persister/pgr.yml create mode 100644 configs/egov-persister/pt-mutation-calculator-persister.yml create mode 100644 configs/egov-persister/pt-persist.yml create mode 100644 configs/egov-persister/sewerage-persist.yml create mode 100644 configs/egov-persister/tradelicense-persister-bpachanges.yml create mode 100644 configs/egov-persister/tradelicense.yml create mode 100644 configs/egov-persister/water-meter.yml create mode 100644 configs/egov-persister/water-persist.yml diff --git a/configs/egov-persister/assessment-persister.yml b/configs/egov-persister/assessment-persister.yml new file mode 100644 index 00000000..677f54ac --- /dev/null +++ b/configs/egov-persister/assessment-persister.yml @@ -0,0 +1,228 @@ +serviceMaps: + serviceName: property-services + mappings: + - version: 1.0 + description: Persists assessment details to eg_pt_asmt_assessment table + fromTopic: save-pt-assessment + isTransaction: true + queryMaps: + + - query: INSERT INTO eg_pt_asmt_assessment(id, tenantid, assessmentnumber, financialyear, propertyid, status, source, channel, assessmentdate, additionaldetails, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: Assessment + jsonMaps: + + - jsonPath: $.Assessment.id + + - jsonPath: $.Assessment.tenantId + + - jsonPath: $.Assessment.assessmentNumber + + - jsonPath: $.Assessment.financialYear + + - jsonPath: $.Assessment.propertyId + + - jsonPath: $.Assessment.status + + - jsonPath: $.Assessment.source + + - jsonPath: $.Assessment.channel + + - jsonPath: $.Assessment.assessmentDate + + - jsonPath: $.Assessment.additionalDetails + type: JSON + dbType: JSONB + + - jsonPath: $.Assessment.auditDetails.createdBy + + - jsonPath: $.Assessment.auditDetails.createdTime + + - jsonPath: $.Assessment.auditDetails.lastModifiedBy + + - jsonPath: $.Assessment.auditDetails.lastModifiedTime + + + + - query: INSERT INTO eg_pt_asmt_unitusage (tenantid, id, assessmentid, unitid, usagecategory, occupancytype, occupancydate, active, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: Assessment.unitUsageList.* + jsonMaps: + + - jsonPath: $.Assessment.unitUsageList.*.tenantId + + - jsonPath: $.Assessment.unitUsageList.*.id + + - jsonPath: $.Assessment[?({id} in @.unitUsageList[*].id)].id + + - jsonPath: $.Assessment.unitUsageList.*.unitId + + - jsonPath: $.Assessment.unitUsageList.*.usageCategory + + - jsonPath: $.Assessment.unitUsageList.*.occupancyType + + - jsonPath: $.Assessment.unitUsageList.*.occupancyDate + + - jsonPath: $.Assessment.unitUsageList.*.active + + - jsonPath: $.Assessment.unitUsageList.*.auditDetails.createdBy + + - jsonPath: $.Assessment.unitUsageList.*.auditDetails.createdTime + + - jsonPath: $.Assessment.unitUsageList.*.auditDetails.lastModifiedBy + + - jsonPath: $.Assessment.unitUsageList.*.auditDetails.lastModifiedTime + + + + - query: INSERT INTO eg_pt_asmt_document (id, tenantid, entityid, documenttype, filestoreid, documentuid, status, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: $.Assessment.documents.* + jsonMaps: + + - jsonPath: $.Assessment.documents.*.id + + - jsonPath: $.Assessment.tenantId + + - jsonPath: $.Assessment.id + + - jsonPath: $.Assessment.documents.*.documentType + + - jsonPath: $.Assessment.documents.*.fileStoreId + + - jsonPath: $.Assessment.documents.*.documentUid + + - jsonPath: $.Assessment.documents.*.status + + - jsonPath: $.Assessment.documents.*.auditDetails.createdBy + + - jsonPath: $.Assessment.documents.*.auditDetails.lastModifiedBy + + - jsonPath: $.Assessment.documents.*.auditDetails.createdTime + + - jsonPath: $.Assessment.documents.*.auditDetails.lastModifiedTime + + + + - version: 1.0 + description: Updates assessment details to eg_pt_asmt_assessment table + fromTopic: update-pt-assessment + isTransaction: true + queryMaps: + + - query: INSERT INTO eg_pt_asmt_assessment_audit SELECT *, (SELECT extract(epoch from now())) FROM eg_pt_asmt_assessment WHERE id = ?; + basePath: Assessment + jsonMaps: + + - jsonPath: $.Assessment.id + + + - query: INSERT INTO eg_pt_asmt_unitusage_audit SELECT *, (SELECT extract(epoch from now())) FROM eg_pt_asmt_unitusage WHERE id = ?; + basePath: Assessment.unitUsageList.* + jsonMaps: + + - jsonPath: $.Assessment.unitUsageList.*.id + + + - query: UPDATE eg_pt_asmt_assessment SET financialyear = ?, status = ?, source = ?, assessmentDate = ?, additionaldetails = ?, lastmodifiedby = ?, lastmodifiedtime = ? WHERE id = ?; + basePath: Assessment + jsonMaps: + + - jsonPath: $.Assessment.financialYear + + - jsonPath: $.Assessment.status + + - jsonPath: $.Assessment.source + + - jsonPath: $.Assessment.assessmentDate + + - jsonPath: $.Assessment.additionalDetails + type: JSON + dbType: JSONB + + - jsonPath: $.Assessment.auditDetails.lastModifiedBy + + - jsonPath: $.Assessment.auditDetails.lastModifiedTime + + - jsonPath: $.Assessment.id + + + + + - query: INSERT INTO eg_pt_asmt_unitusage (tenantid, id, assessmentId, unitid, usageCategory, occupancyType, occupancyDate, active, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET usageCategory = ?, occupancyType = ?, occupancyDate = ?, active = ?, lastmodifiedby = ?, lastmodifiedtime = ?; + basePath: Assessment.unitUsageList.* + jsonMaps: + + - jsonPath: $.Assessment.unitUsageList.*.tenantId + + - jsonPath: $.Assessment.unitUsageList.*.id + + - jsonPath: $.Assessment[?({id} in @.unitUsageList[*].id)].id + + - jsonPath: $.Assessment.unitUsageList.*.unitId + + - jsonPath: $.Assessment.unitUsageList.*.usageCategory + + - jsonPath: $.Assessment.unitUsageList.*.occupancyType + + - jsonPath: $.Assessment.unitUsageList.*.occupancyDate + + - jsonPath: $.Assessment.unitUsageList.*.active + + - jsonPath: $.Assessment.unitUsageList.*.auditDetails.createdBy + + - jsonPath: $.Assessment.unitUsageList.*.auditDetails.createdTime + + - jsonPath: $.Assessment.unitUsageList.*.auditDetails.lastModifiedBy + + - jsonPath: $.Assessment.unitUsageList.*.auditDetails.lastModifiedTime + + - jsonPath: $.Assessment.unitUsageList.*.usageCategory + + - jsonPath: $.Assessment.unitUsageList.*.occupancyType + + - jsonPath: $.Assessment.unitUsageList.*.occupancyDate + + - jsonPath: $.Assessment.unitUsageList.*.active + + - jsonPath: $.Assessment.unitUsageList.*.auditDetails.lastModifiedBy + + - jsonPath: $.Assessment.unitUsageList.*.auditDetails.lastModifiedTime + + + + + - query: INSERT INTO eg_pt_asmt_document (id, tenantid, entityid, documenttype, filestoreid, documentuid, status, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE documenttype = ?, documentuid = ?, status = ?, lastmodifiedby = ?, lastmodifiedtime = ?; + basePath: $.Assessment.documents.* + jsonMaps: + + - jsonPath: $.Assessment.documents.*.id + + - jsonPath: $.Assessment.tenantId + + - jsonPath: $.Assessment.id + + - jsonPath: $.Assessment.documents.*.documentType + + - jsonPath: $.Assessment.documents.*.fileStoreId + + - jsonPath: $.Assessment.documents.*.documentUid + + - jsonPath: $.Assessment.documents.*.status + + - jsonPath: $.Assessment.documents.*.auditDetails.createdBy + + - jsonPath: $.Assessment.documents.*.auditDetails.lastModifiedBy + + - jsonPath: $.Assessment.documents.*.auditDetails.createdTime + + - jsonPath: $.Assessment.documents.*.auditDetails.lastModifiedTime + + - jsonPath: $.Assessment.documents.*.documentType + + - jsonPath: $.Assessment.documents.*.documentUid + + - jsonPath: $.Assessment.documents.*.status + + - jsonPath: $.Assessment.documents.*.auditDetails.lastModifiedBy + + - jsonPath: $.Assessment.documents.*.auditDetails.lastModifiedTime + + diff --git a/configs/egov-persister/billing-services-persist.yml b/configs/egov-persister/billing-services-persist.yml new file mode 100644 index 00000000..f720d59e --- /dev/null +++ b/configs/egov-persister/billing-services-persist.yml @@ -0,0 +1,274 @@ +serviceMaps: + serviceName: User Service + mappings: + - version: 1.0 + name: bill create + description: create bill in egbs_bill + fromTopic: save-bill-db + queryMaps: + - query: INSERT into egbs_bill (id, tenantid, payeename, payeeaddress, payeeemail, isactive, iscancelled, createdby, createddate, lastmodifiedby, lastmodifieddate) values(?,?,?,?,?,?,?,?,?,?,?) + basePath: $.Bills.* + jsonMaps: + + - jsonPath: $.Bills.*.id + + - jsonPath: $.Bills.*.tenantId + + - jsonPath: $.Bills.*.payeeName + + - jsonPath: $.Bills.*.payeeAddress + + - jsonPath: $.Bills.*.payeeEmail + + - jsonPath: $.Bills.*.isActive + type: BOOLEAN + + - jsonPath: $.Bills.*.isCancelled + type: BOOLEAN + + - jsonPath: $.RequestInfo.userInfo.id + type: LONG + + - type: CURRENTDATE + dbType: LONG + + - jsonPath: $.RequestInfo.userInfo.id + + - type: CURRENTDATE + dbType: LONG + + - query: INSERT into egbs_billdetail (id, tenantid, billid, businessservice, billno, billdate, consumercode, consumertype, billdescription, displaymessage, minimumamount, totalamount, callbackforapportioning, partpaymentallowed, collectionmodesnotallowed, createdby, createddate, lastmodifiedby, lastmodifieddate) values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?); + basePath: $.Bills.*.billDetails.* + jsonMaps: + - jsonPath: $.Bills.*.billDetails.*.id + + - jsonPath: $.Bills.*.billDetails.*.tenantId + + - jsonPath: $.Bills[?({id} in @.billDetails[*].id)].id + + - jsonPath: $.Bills.*.billDetails.*.businessService + type: DOUBLE + + - jsonPath: $.Bills.*.billDetails.*.billNumber + type: DOUBLE + + - jsonPath: $.Bills.*.billDetails.*.billDate + type: LONG + + - jsonPath: $.Bills.*.billDetails.*.consumerCode + + - jsonPath: $.Bills.*.billDetails.*.consumerType + + - jsonPath: $.Bills.*.billDetails.*.billDescription + + - jsonPath: $.Bills.*.billDetails.*.displayMessage + + - jsonPath: $.Bills.*.billDetails.*.minimumAmount + type: DOUBLE + + - jsonPath: $.Bills.*.billDetails.*.totalAmount + type: DOUBLE + + - jsonPath: $.Bills.*.billDetails.*.callBackForApportioning + type: BOOLEAN + + - jsonPath: $.Bills.*.billDetails.*.partPaymentAllowed + type: BOOLEAN + + - jsonPath: $.Bills.*.billDetails.*.collectionModesNotAllowed + type: ARRAY + dbType: STRING + + - jsonPath: $.RequestInfo.userInfo.id + type: LONG + + - type: CURRENTDATE + dbType: LONG + + - jsonPath: $.RequestInfo.userInfo.id + + - type: CURRENTDATE + dbType: LONG + + - query: INSERT into egbs_billaccountdetail(id, tenantid, billdetail, glcode, orderno, accountdescription, cramounttobepaid, creditamount, debitamount, isactualdemand, purpose, createdby, createddate, lastmodifiedby, lastmodifieddate) values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?); + basePath: $.Bills.*.billDetails.*.billAccountDetails.* + jsonMaps: + - jsonPath: $.Bills.*.billDetails.*.billAccountDetails.*.id + + - jsonPath: $.Bills.*.billDetails.*.billAccountDetails.*.tenantId + + - jsonPath: $.Bills[*].billDetails[?({id} in @.billAccountDetails[*].id)].id + + - jsonPath: $.Bills.*.billDetails.*.billAccountDetails.*.glcode + + - jsonPath: $.Bills.*.billDetails.*.billAccountDetails.*.order + type: INT + + - jsonPath: $.Bills.*.billDetails.*.billAccountDetails.*.accountDescription + + - jsonPath: $.Bills.*.billDetails.*.billAccountDetails.*.crAmountToBePaid + type: DOUBLE + + - jsonPath: $.Bills.*.billDetails.*.billAccountDetails.*.creditAmount + type: DOUBLE + + - jsonPath: $.Bills.*.billDetails.*.billAccountDetails.*.debitAmount + type: DOUBLE + + - jsonPath: $.Bills.*.billDetails.*.billAccountDetails.*.isActualDemand + type: BOOLEAN + + - jsonPath: $.Bills.*.billDetails.*.billAccountDetails.*.purpose + + - jsonPath: $.RequestInfo.userInfo.id + type: LONG + + - type: CURRENTDATE + dbType: LONG + + - jsonPath: $.RequestInfo.userInfo.id + + - type: CURRENTDATE + dbType: LONG + + - version: 1.0 + name: demand create + description: create demand in egbs_demand + fromTopic: save-demand + isTransaction: true + queryMaps: + - query: INSERT INTO egbs_demand (id,consumerCode,consumerType,businessService,owner,taxPeriodFrom,taxPeriodTo,minimumAmountPayable,createdby,lastModifiedby,createdtime,lastModifiedtime,tenantid) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?); + basePath: $.Demands.* + jsonMaps: + + - jsonPath: $.Demands.*.id + type: STRING + + - jsonPath: $.Demands.*.consumerCode + type: STRING + + - jsonPath: $.Demands.*.consumerType + type: STRING + + - jsonPath: $.Demands.*.businessService + type: STRING + + - jsonPath: $.Demands.*.owner.id + type: STRING + + - jsonPath: $.Demands.*.taxPeriodFrom + type: LONG + + - jsonPath: $.Demands.*.taxPeriodTo + type: LONG + + - jsonPath: $.Demands.*.minimumAmountPayable + type: DOUBLE + + - jsonPath: $.Demands.*.auditDetail.createdBy + type: STRING + + - jsonPath: $.Demands.*.auditDetail.lastModifiedBy + type: STRING + + - jsonPath: $.Demands.*.auditDetail.createdTime + type: LONG + + - jsonPath: $.Demands.*.auditDetail.lastModifiedTime + type: LONG + + - jsonPath: $.Demands.*.tenantId + type: STRING + + - query: INSERT INTO egbs_demanddetail (id,demandid,taxHeadCode,taxamount,collectionamount,createdby,lastModifiedby,createdtime,lastModifiedtime,tenantid) VALUES (?,?,?,?,?,?,?,?,?,?); + basePath: $.Demands.*.demandDetails.* + jsonMaps: + - jsonPath: $.Demands.*.demandDetails.*.id + type: STRING + + - jsonPath: $.Demands.*.demandDetails.*.demandId + type: STRING + + - jsonPath: $.Demands.*.demandDetails.*.taxHeadMasterCode + type: STRING + + - jsonPath: $.Demands.*.demandDetails.*.taxAmount + type: DOUBLE + + - jsonPath: $.Demands.*.demandDetails.*.collectionAmount + type: DOUBLE + + - jsonPath: $.Demands.*.demandDetails.*.auditDetail.createdBy + type: STRING + + - jsonPath: $.Demands.*.demandDetails.*.auditDetail.lastModifiedBy + type: STRING + + - jsonPath: $.Demands.*.demandDetails.*.auditDetail.createdTime + type: LONG + + - jsonPath: $.Demands.*.demandDetails.*.auditDetail.lastModifiedTime + type: LONG + + - jsonPath: $.Demands.*.demandDetails.*.tenantId + type: STRING + + + - version: 1.0 + name: demand update + description: update demand in egbs_demand + fromTopic: update-demand + isTransaction: true + queryMaps: + - query: UPDATE egbs_demand SET consumerCode=?,consumerType=?,businessService=?,owner=?,taxPeriodFrom=?,taxPeriodTo=?,minimumAmountPayable=?,lastModifiedby=?,lastModifiedtime=? WHERE id=? AND tenantid=?; + basePath: $.Demands.* + jsonMaps: + + - jsonPath: $.Demands.*.consumerCode + + - jsonPath: $.Demands.*.consumerType + + - jsonPath: $.Demands.*.businessService + + - jsonPath: $.Demands.*.owner.id + + - jsonPath: $.Demands.*.taxPeriodFrom + type: LONG + + - jsonPath: $.Demands.*.taxPeriodTo + type: LONG + + - jsonPath: $.Demands.*.minimumAmountPayable + type: DOUBLE + + - jsonPath: $.Demands.*.auditDetail.lastModifiedBy + + - jsonPath: $.Demands.*.auditDetail.lastModifiedTime + type: LONG + + - jsonPath: $.Demands.*.id + + - jsonPath: $.Demands.*.tenantId + + - query: UPDATE egbs_demanddetail SET demandid=?,taxHeadCode=?,taxamount=?,collectionamount=?,lastModifiedby=?,lastModifiedtime=? WHERE id=? AND tenantid=?; + basePath: $.Demands.*.demandDetails.* + jsonMaps: + + - jsonPath: $.Demands.*.demandDetails.*.demandId + + - jsonPath: $.Demands.*.demandDetails.*.taxHeadMasterCode + + - jsonPath: $.Demands.*.demandDetails.*.taxAmount + type: DOUBLE + + - jsonPath: $.Demands.*.demandDetails.*.collectionAmount + type: DOUBLE + + - jsonPath: $.Demands.*.demandDetails.*.auditDetail.lastModifiedBy + + - jsonPath: $.Demands.*.demandDetails.*.auditDetail.lastModifiedTime + type: LONG + + - jsonPath: $.Demands.*.demandDetails.*.id + + - jsonPath: $.Demands.*.demandDetails.*.tenantId diff --git a/configs/egov-persister/bpa-persister.yml b/configs/egov-persister/bpa-persister.yml new file mode 100644 index 00000000..b5ee4a5c --- /dev/null +++ b/configs/egov-persister/bpa-persister.yml @@ -0,0 +1,691 @@ +serviceMaps: + serviceName: bpa-services + mappings: + - version: 1.0 + description: Persists buildingplan details in EG_BPA_BuildingPlan table + fromTopic: save-bpa-buildingplan + isTransaction: true + queryMaps: + + - query: INSERT INTO eg_bpa_buildingplan(id, applicationno,permitorderno,remarks, edcrnumber, tenantid, holdingNo, registrationDetails, govtOrQuasi, applicationtype, action, servicetype, occupancytype, suboccupancytype, usages, risktype, status, ownershipcategory, tradetype, additionaldetails, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: BPA + jsonMaps: + - jsonPath: $.BPA.id + + - jsonPath: $.BPA.applicationNo + + - jsonPath: $.BPA.permitOrderNo + + - jsonPath: $.BPA.remarks + + - jsonPath: $.BPA.edcrNumber + + - jsonPath: $.BPA.tenantId + + - jsonPath: $.BPA.holdingNo + + - jsonPath: $.BPA.registrationDetails + + - jsonPath: $.BPA.govtOrQuasi + + - jsonPath: $.BPA.applicationType + + - jsonPath: $.BPA.action + + - jsonPath: $.BPA.serviceType + + - jsonPath: $.BPA.occupancyType + + - jsonPath: $.BPA.subOccupancyType + + - jsonPath: $.BPA.usages + + - jsonPath: $.BPA.riskType + + - jsonPath: $.BPA.status + + - jsonPath: $.BPA.ownershipCategory + + - jsonPath: $.BPA.tradeType + + - jsonPath: $.BPA.additionalDetails + type: JSON + dbType: JSONB + + - jsonPath: $.BPA.auditDetails.createdBy + + - jsonPath: $.BPA.auditDetails.lastModifiedBy + + - jsonPath: $.BPA.auditDetails.createdTime + + - jsonPath: $.BPA.auditDetails.lastModifiedTime + + - query: INSERT INTO eg_bpa_document( id, documenttype, filestoreId, buildingplanid, documentuid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: BPA.documents.* + jsonMaps: + - jsonPath: $.BPA.documents.*.id + + - jsonPath: $.BPA.documents.*.documentType + + - jsonPath: $.BPA.documents.*.fileStoreId + + - jsonPath: $.BPA.id + + - jsonPath: $.BPA.documents.*.documentuid + + - jsonPath: $.BPA.auditDetails.createdBy + + - jsonPath: $.BPA.auditDetails.lastModifiedBy + + - jsonPath: $.BPA.auditDetails.createdTime + + - jsonPath: $.BPA.auditDetails.lastModifiedTime + + + - query: INSERT INTO eg_bpa_address( id, tenantid, doorno, plotno, district, street, region, state, country, pincode, additiondetails, buildingname, locality, landmark, city, buildingplanid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: BPA.address + jsonMaps: + - jsonPath: $.BPA.address.id + + - jsonPath: $.BPA.address.tenantId + + - jsonPath: $.BPA.address.doorNo + + - jsonPath: $.BPA.address.plotNo + + - jsonPath: $.BPA.address.district + + - jsonPath: $.BPA.address.street + + - jsonPath: $.BPA.address.region + + - jsonPath: $.BPA.address.state + + - jsonPath: $.BPA.address.country + + - jsonPath: $.BPA.address.pincode + + - jsonPath: $.BPA.address.additionDetails + + - jsonPath: $.BPA.address.buildingName + + - jsonPath: $.BPA.address.locality.code + + - jsonPath: $.BPA.address.landmark + + - jsonPath: $.BPA.address.city + + - jsonPath: $.BPA.id + + - jsonPath: $.BPA.auditDetails.createdBy + + - jsonPath: $.BPA.auditDetails.lastModifiedBy + + - jsonPath: $.BPA.auditDetails.createdTime + + - jsonPath: $.BPA.auditDetails.lastModifiedTime + + + + - query: INSERT INTO eg_bpa_owner( id, name, tenantid, mobilenumber, gender, fatherorhusbandname, correspondenceaddress, institutionid, isprimaryowner, ownertype, ownershippercentage, relationship, buildingplanid, active, createdby,lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: BPA.owners.* + jsonMaps: + - jsonPath: $.BPA.owners.*.uuid + + - jsonPath: $.BPA.owners.*.name + + - jsonPath: $.BPA.owners.*.tenantId + + - jsonPath: $.BPA.owners.*.mobileNumber + + - jsonPath: $.BPA.owners.*.gender + + - jsonPath: $.BPA.owners.*.fatherOrHusbandName + + - jsonPath: $.BPA.owners.*.correspondenceAddress + + - jsonPath: $.BPA.owners.*.institutionId + + - jsonPath: $.BPA.owners.*.isPrimaryOwner + + - jsonPath: $.BPA.owners.*.ownerType + + - jsonPath: $.BPA.owners.*.ownerShipPercentage + + - jsonPath: $.BPA.owners.*.relationship + + - jsonPath: $.BPA.id + + - jsonPath: $.BPA.owners.*.active + + - jsonPath: $.BPA.owners.*.auditDetails.createdBy + + - jsonPath: $.BPA.owners.*.auditDetails.lastModifiedBy + + - jsonPath: $.BPA.owners.*.auditDetails.createdTime + + - jsonPath: $.BPA.owners.*.auditDetails.lastModifiedTime + + + - query: INSERT INTO eg_bpa_unit( id,tenantid, usageCategory, blockIndex, buildingplanid, additionaldetails, createdby,lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: BPA.units.* + jsonMaps: + - jsonPath: $.BPA.units.*.id + + - jsonPath: $.BPA.tenantId + + - jsonPath: $.BPA.units.*.usageCategory + + - jsonPath: $.BPA.units.*.blockIndex + + - jsonPath: $.BPA.id + + - jsonPath: $.BPA.units.*.additionalDetails + type: JSON + dbType: JSONB + + - jsonPath: $.BPA.units.*.auditDetails.createdBy + + - jsonPath: $.BPA.units.*.auditDetails.lastModifiedBy + + - jsonPath: $.BPA.units.*.auditDetails.createdTime + + - jsonPath: $.BPA.units.*.auditDetails.lastModifiedTime + + + - query: INSERT INTO eg_bpa_geolocation( latitude, longitude, additionaldetails, addressid, createdby,lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?); + basePath: BPA.address.geoLocation + jsonMaps: + - jsonPath: $.BPA.address.geoLocation.latitude + type: DOUBLE + dbType: DOUBLE + + - jsonPath: $.BPA.address.geoLocation.longitude + type: DOUBLE + dbType: DOUBLE + + - jsonPath: $.BPA.address.geoLocation.additionalDetails + type: JSON + dbType: JSONB + + - jsonPath: $.BPA.address.id + + - jsonPath: $.BPA.auditDetails.createdBy + + - jsonPath: $.BPA.auditDetails.lastModifiedBy + + - jsonPath: $.BPA.auditDetails.createdTime + + - jsonPath: $.BPA.auditDetails.lastModifiedTime + + + + - query: INSERT INTO eg_bpa_auditdetails SELECT * FROM eg_bpa_buildingplan WHERE id =?; + basePath: BPA + jsonMaps: + + - jsonPath: $.BPA.id + + + + + + - query: INSERT INTO eg_bpa_document_owner(id,tenantId,owner,active, buildingplanid, documenttype, fileStoreid,documentuid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ? ,? ,?, ?, ?, ?, ?, ?, ?, ?); + basePath: BPA.owners.*.documents.* + jsonMaps: + - jsonPath: $.BPA.owners.*.documents.*.id + + - jsonPath: $.BPA.owners.*.documents.*.tenantId + + - jsonPath: $.BPA.owners.*.uuid + + - jsonPath: $.BPA.owners.*.documents.*.active + + - jsonPath: $.BPA.owners.*.buildingplanId + + - jsonPath: $.BPA.owners.*.documents.*.documentType + + - jsonPath: $.BPA.owners.*.documents.*.fileStoreId + + - jsonPath: $.BPA.owners.*.documents.*.documentUid + + - jsonPath: $.BPA.owners.*.documents.*.auditDetails.createdBy + + - jsonPath: $.BPA.owners.*.documents.*.auditDetails.lastModifiedBy + + - jsonPath: $.BPA.owners.*.documents.*.auditDetails.createdTime + + - jsonPath: $.BPA.owners.*.documents.*.auditDetails.lastModifiedTime + + + + + + - version: 1.0 + description: update buildingplan details in EG_BPA_BuildingPlan table + fromTopic: update-bpa-buildingplan + isTransaction: true + queryMaps: + + - query: UPDATE eg_bpa_buildingplan SET applicationno=?, remarks=?, holdingNo=?, subOccupancyType=?, permitOrderNo=?, edcrnumber=?, action=?, registrationdetails=?, govtorquasi=?, servicetype=?, riskType=?, status=?, ownershipcategory=?, additionaldetails=?, lastmodifiedby=?, lastmodifiedtime=?, validityDate=?, orderGeneratedDate=?, applicationDate=? WHERE id=?; + basePath: BPA + jsonMaps: + - jsonPath: $.BPA.applicationNo + + - jsonPath: $.BPA.remarks + + - jsonPath: $.BPA.holdingNo + + - jsonPath: $.BPA.subOccupancyType + + - jsonPath: $.BPA.permitOrderNo + + - jsonPath: $.BPA.edcrNumber + + - jsonPath: $.BPA.action + + - jsonPath: $.BPA.registrationDetails + + - jsonPath: $.BPA.govtOrQuasi + + - jsonPath: $.BPA.serviceType + + - jsonPath: $.BPA.riskType + + - jsonPath: $.BPA.status + + - jsonPath: $.BPA.ownershipCategory + + - jsonPath: $.BPA.additionalDetails + type: JSON + dbType: JSONB + + - jsonPath: $.BPA.auditDetails.lastModifiedBy + + - jsonPath: $.BPA.auditDetails.lastModifiedTime + + - jsonPath: $.BPA.validityDate + + - jsonPath: $.BPA.orderGeneratedDate + + - jsonPath: $.BPA.applicationDate + + - jsonPath: $.BPA.id + + - query: INSERT INTO eg_bpa_auditdetails SELECT * FROM eg_bpa_buildingplan WHERE id =?; + basePath: BPA + jsonMaps: + + - jsonPath: $.BPA.id + + - query: UPDATE eg_bpa_address SET doorno=?, plotno=?, district=?, region=?, state=?, country=?, pincode=?, additiondetails=?, buildingname=?, street=?, locality=?, landmark=?, city=?, lastmodifiedby=?, lastmodifiedtime=? WHERE id=?; + basePath: BPA.address + jsonMaps: + + - jsonPath: $.BPA.address.doorNo + + - jsonPath: $.BPA.address.plotNo + + - jsonPath: $.BPA.address.district + + - jsonPath: $.BPA.address.region + + - jsonPath: $.BPA.address.state + + - jsonPath: $.BPA.address.country + + - jsonPath: $.BPA.address.pincode + + - jsonPath: $.BPA.address.additionDetails + + - jsonPath: $.BPA.address.buildingName + + - jsonPath: $.BPA.address.street + + - jsonPath: $.BPA.address.locality.code + + - jsonPath: $.BPA.address.landmark + + - jsonPath: $.BPA.address.city + + - jsonPath: $.BPA.auditDetails.lastModifiedBy + + - jsonPath: $.BPA.auditDetails.lastModifiedTime + + - jsonPath: $.BPA.address.id + + - query: INSERT INTO eg_bpa_owner( id, name, tenantid, mobilenumber, gender, fatherorhusbandname, correspondenceaddress, institutionid, isprimaryowner, ownertype, ownershippercentage, relationship, buildingplanid, active, createdby,lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id, buildingplanid) WHERE id IS NOT NULL DO UPDATE SET name=?, mobilenumber=?, gender=?, fatherorhusbandname=?, correspondenceaddress=?, institutionid=?, isprimaryowner=?, ownertype=?, ownershippercentage=?, relationship=?, active=?, lastmodifiedby=?, lastmodifiedtime=?; + basePath: BPA.owners.* + jsonMaps: + - jsonPath: $.BPA.owners.*.uuid + + - jsonPath: $.BPA.owners.*.name + + - jsonPath: $.BPA.owners.*.tenantId + + - jsonPath: $.BPA.owners.*.mobileNumber + + - jsonPath: $.BPA.owners.*.gender + + - jsonPath: $.BPA.owners.*.fatherOrHusbandName + + - jsonPath: $.BPA.owners.*.correspondenceAddress + + - jsonPath: $.BPA.owners.*.institutionId + + - jsonPath: $.BPA.owners.*.isPrimaryOwner + + - jsonPath: $.BPA.owners.*.ownerType + + - jsonPath: $.BPA.owners.*.ownerShipPercentage + + - jsonPath: $.BPA.owners.*.relationship + + - jsonPath: $.BPA.id + + - jsonPath: $.BPA.owners.*.active + + - jsonPath: $.BPA.owners.*.auditDetails.createdBy + + - jsonPath: $.BPA.owners.*.auditDetails.lastModifiedBy + + - jsonPath: $.BPA.owners.*.auditDetails.createdTime + + - jsonPath: $.BPA.owners.*.auditDetails.lastModifiedTime + + - jsonPath: $.BPA.owners.*.name + + - jsonPath: $.BPA.owners.*.mobileNumber + + - jsonPath: $.BPA.owners.*.gender + + - jsonPath: $.BPA.owners.*.fatherOrHusbandName + + - jsonPath: $.BPA.owners.*.correspondenceAddress + + - jsonPath: $.BPA.owners.*.institutionId + + - jsonPath: $.BPA.owners.*.isPrimaryOwner + + - jsonPath: $.BPA.owners.*.ownerType + + - jsonPath: $.BPA.owners.*.ownerShipPercentage + + - jsonPath: $.BPA.owners.*.relationship + + - jsonPath: $.BPA.owners.*.active + + - jsonPath: $.BPA.owners.*.auditDetails.lastModifiedBy + + - jsonPath: $.BPA.owners.*.auditDetails.lastModifiedTime + + + - query: INSERT INTO eg_bpa_unit(id, tenantId, buildingplanid, blockindex, usageCategory ,additionalDetails ,createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id, buildingplanid, blockIndex) WHERE id IS NOT NULL DO UPDATE SET usageCategory=?, blockIndex=?, additionaldetails=?, lastmodifiedby=?, lastmodifiedtime=?; + basePath: BPA.units.* + jsonMaps: + - jsonPath: $.BPA.units.*.id + + - jsonPath: $.BPA.tenantId + + - jsonPath: $.BPA.id + + - jsonPath: $.BPA.units.*.blockIndex + + - jsonPath: $.BPA.units.*.usageCategory + + - jsonPath: $.BPA.units.*.additionalDetails + type: JSON + dbType: JSONB + + - jsonPath: $.BPA.units.*.auditDetails.createdBy + + - jsonPath: $.BPA.units.*.auditDetails.lastModifiedBy + + - jsonPath: $.BPA.units.*.auditDetails.createdTime + + - jsonPath: $.BPA.units.*.auditDetails.lastModifiedTime + + - jsonPath: $.BPA.units.*.usageCategory + + - jsonPath: $.BPA.units.*.blockIndex + + - jsonPath: $.BPA.units.*.additionalDetails + type: JSON + dbType: JSONB + + - jsonPath: $.BPA.units.*.auditDetails.lastModifiedBy + + - jsonPath: $.BPA.units.*.auditDetails.lastModifiedTime + + + + - query: UPDATE eg_bpa_document_owner SET tenantId=?,owner=?,active=?, buildingplanid=?, documenttype=?, fileStoreid=?,documentuid=?, lastmodifiedby=?, lastmodifiedtime=? WHERE id=?; + basePath: BPA.owners.*.documents.* + jsonMaps: + + - jsonPath: $.BPA.owners.*.documents.*.tenantId + + - jsonPath: $.BPA.owners.*.uuid + + - jsonPath: $.BPA.owners.*.documents.*.active + + - jsonPath: $.BPA.owners.*.buildingplanid + + - jsonPath: $.BPA.owners.*.documents.*.documentType + + - jsonPath: $.BPA.owners.*.documents.*.fileStoreId + + - jsonPath: $.BPA.owners.*.documents.*.documentUid + + - jsonPath: $.BPA.owners.*.documents.*.auditDetails.lastModifiedBy + + - jsonPath: $.BPA.owners.*.documents.*.auditDetails.lastModifiedTime + + - jsonPath: $.BPA.owners.*.documents.*.id + + - query: INSERT INTO eg_bpa_document( id, documenttype, fileStoreid, buildingplanid, documentuid, createdby, lastmodifiedby, createdtime, lastmodifiedtime, wfstate) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET documenttype =?, filestoreid =?,lastmodifiedby =?, lastmodifiedtime =?; + basePath: BPA.documents.* + jsonMaps: + + - jsonPath: $.BPA.documents.*.id + + - jsonPath: $.BPA.documents.*.documentType + + - jsonPath: $.BPA.documents.*.fileStoreId + + - jsonPath: $.BPA.id + + - jsonPath: $.BPA.documents.*.documentuid + + - jsonPath: $.BPA.auditDetails.createdBy + + - jsonPath: $.BPA.auditDetails.lastModifiedBy + + - jsonPath: $.BPA.auditDetails.createdTime + + - jsonPath: $.BPA.auditDetails.lastModifiedTime + + - jsonPath: $.BPA.documents.*.wfState + + - jsonPath: $.BPA.documents.*.documentType + + - jsonPath: $.BPA.documents.*.fileStoreId + + - jsonPath: $.BPA.auditDetails.lastModifiedBy + + - jsonPath: $.BPA.auditDetails.lastModifiedTime + + - version: 1.0 + description: update buildingplan details in EG_BPA_BuildingPlan table + fromTopic: update-bpa-workflow + isTransaction: true + queryMaps: + + - query: INSERT INTO eg_bpa_document( id, documenttype, filestoreid, buildingplanid, documentuid, createdby, lastmodifiedby, createdtime, lastmodifiedtime, wfstate) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET documenttype =?, filestoreid =?,lastmodifiedby =?, lastmodifiedtime =?; + basePath: BPA.documents.* + jsonMaps: + + - jsonPath: $.BPA.documents.*.id + + - jsonPath: $.BPA.documents.*.documentType + + - jsonPath: $.BPA.documents.*.fileStoreId + + - jsonPath: $.BPA.id + + - jsonPath: $.BPA.documents.*.documentuid + + - jsonPath: $.BPA.auditDetails.createdBy + + - jsonPath: $.BPA.auditDetails.lastModifiedBy + + - jsonPath: $.BPA.auditDetails.createdTime + + - jsonPath: $.BPA.auditDetails.lastModifiedTime + + - jsonPath: $.BPA.documents.*.wfState + + - jsonPath: $.BPA.documents.*.documentType + + - jsonPath: $.BPA.documents.*.fileStoreId + + - jsonPath: $.BPA.auditDetails.lastModifiedBy + + - jsonPath: $.BPA.auditDetails.lastModifiedTime + + - query: INSERT INTO eg_bpa_auditdetails SELECT * FROM eg_bpa_buildingplan WHERE id =?; + basePath: BPA + jsonMaps: + + - jsonPath: $.BPA.id + + - query: UPDATE eg_bpa_buildingplan SET status =?, permitOrderNo=?, validityDate=?, orderGeneratedDate=?, holdingno=?, registrationdetails=?, govtorquasi=?, additionaldetails=?, applicationDate =? WHERE id =?; + basePath: BPA + jsonMaps: + - jsonPath: $.BPA.status + + - jsonPath: $.BPA.permitOrderNo + + - jsonPath: $.BPA.validityDate + + - jsonPath: $.BPA.orderGeneratedDate + + - jsonPath: $.BPA.holdingNo + + - jsonPath: $.BPA.registrationDetails + + - jsonPath: $.BPA.govtOrQuasi + + - jsonPath: $.BPA.additionalDetails + type: JSON + dbType: JSONB + + - jsonPath: $.BPA.applicationDate + + - jsonPath: $.BPA.id + + - query: INSERT INTO eg_bpa_owner( id, name, tenantid, mobilenumber, gender, fatherorhusbandname, correspondenceaddress, institutionid, isprimaryowner, ownertype, ownershippercentage, relationship, buildingplanid, active, createdby,lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id, buildingplanid) WHERE id IS NOT NULL DO UPDATE SET name=?, mobilenumber=?, gender=?, fatherorhusbandname=?, correspondenceaddress=?, institutionid=?, isprimaryowner=?, ownertype=?, ownershippercentage=?, relationship=?, active=?, lastmodifiedby=?, lastmodifiedtime=?; + basePath: BPA.owners.* + jsonMaps: + - jsonPath: $.BPA.owners.*.uuid + + - jsonPath: $.BPA.owners.*.name + + - jsonPath: $.BPA.owners.*.tenantId + + - jsonPath: $.BPA.owners.*.mobileNumber + + - jsonPath: $.BPA.owners.*.gender + + - jsonPath: $.BPA.owners.*.fatherOrHusbandName + + - jsonPath: $.BPA.owners.*.correspondenceAddress + + - jsonPath: $.BPA.owners.*.institutionId + + - jsonPath: $.BPA.owners.*.isPrimaryOwner + + - jsonPath: $.BPA.owners.*.ownerType + + - jsonPath: $.BPA.owners.*.ownerShipPercentage + + - jsonPath: $.BPA.owners.*.relationship + + - jsonPath: $.BPA.id + + - jsonPath: $.BPA.owners.*.active + + - jsonPath: $.BPA.owners.*.auditDetails.createdBy + + - jsonPath: $.BPA.owners.*.auditDetails.lastModifiedBy + + - jsonPath: $.BPA.owners.*.auditDetails.createdTime + + - jsonPath: $.BPA.owners.*.auditDetails.lastModifiedTime + + - jsonPath: $.BPA.owners.*.name + + - jsonPath: $.BPA.owners.*.mobileNumber + + - jsonPath: $.BPA.owners.*.gender + + - jsonPath: $.BPA.owners.*.fatherOrHusbandName + + - jsonPath: $.BPA.owners.*.correspondenceAddress + + - jsonPath: $.BPA.owners.*.institutionId + + - jsonPath: $.BPA.owners.*.isPrimaryOwner + + - jsonPath: $.BPA.owners.*.ownerType + + - jsonPath: $.BPA.owners.*.ownerShipPercentage + + - jsonPath: $.BPA.owners.*.relationship + + - jsonPath: $.BPA.owners.*.active + + - jsonPath: $.BPA.owners.*.auditDetails.lastModifiedBy + + - jsonPath: $.BPA.owners.*.auditDetails.lastModifiedTime + + + + - query: INSERT INTO eg_bpa_unit(id, tenantId, buildingplanid, blockindex, usageCategory,additionalDetails , createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id, buildingplanid, blockIndex) WHERE id IS NOT NULL DO UPDATE SET usageCategory=?, blockIndex=?, additionaldetails=?, lastmodifiedby=?, lastmodifiedtime=?; + basePath: BPA.units.* + jsonMaps: + - jsonPath: $.BPA.units.*.id + + - jsonPath: $.BPA.tenantId + + - jsonPath: $.BPA.id + + - jsonPath: $.BPA.units.*.blockIndex + + - jsonPath: $.BPA.units.*.usageCategory + + - jsonPath: $.BPA.units.*.additionalDetails + type: JSON + dbType: JSONB + + - jsonPath: $.BPA.units.*.auditDetails.createdBy + + - jsonPath: $.BPA.units.*.auditDetails.lastModifiedBy + + - jsonPath: $.BPA.units.*.auditDetails.createdTime + + - jsonPath: $.BPA.units.*.auditDetails.lastModifiedTime + + - jsonPath: $.BPA.units.*.usageCategory + + - jsonPath: $.BPA.units.*.blockIndex + + - jsonPath: $.BPA.units.*.additionalDetails + type: JSON + dbType: JSONB + + - jsonPath: $.BPA.units.*.auditDetails.lastModifiedBy + + - jsonPath: $.BPA.units.*.auditDetails.lastModifiedTime + + diff --git a/configs/egov-persister/chatbot.yml b/configs/egov-persister/chatbot.yml new file mode 100644 index 00000000..5cd87288 --- /dev/null +++ b/configs/egov-persister/chatbot.yml @@ -0,0 +1,77 @@ +serviceMaps: + serviceName: Chatbot Persister + mappings: + - version: 1.0 + name: chatbot-persister + description: Insert new conversationState to database + fromTopic: chatbot-conversation-state-insert + isTransaction: true + queryMaps: + - query: INSERT INTO eg_chat_conversation_state (conversation_id, user_id, active, locale) VALUES (?, ?, ?, ?); + basePath: $ + jsonMaps: + + - jsonPath: $.conversationId + + - jsonPath: $.userId + + - jsonPath: $.active + + - jsonPath: $.locale + + - version: 1.0 + name: chatbot-persister + description: Update conversationState + fromTopic: chatbot-conversation-state-update + isTransaction: true + queryMaps: + - query: UPDATE eg_chat_conversation_state SET active_node_id=?, question_details=?, last_modified_time=? WHERE conversation_id=?; + basePath: $ + jsonMaps: + + - jsonPath: $.activeNodeId + + - jsonPath: $.questionDetails + type: JSON + dbType: JSONB + + - jsonPath: $.lastModifiedTime + + - jsonPath: $.conversationId + + - version: 1.0 + name: chatbot-persister + description: Mark conversationState inactive + fromTopic: chatbot-conversation-state-deactivate + isTransaction: true + queryMaps: + - query: UPDATE eg_chat_conversation_state SET active=FALSE WHERE conversation_id=?; + basePath: $ + jsonMaps: + + - jsonPath: $.conversationId + + + - version: 1.0 + name: chatbot-persister + description: Save chatbot message + fromTopic: chatbot-message-insert + isTransaction: true + queryMaps: + - query: INSERT INTO eg_chat_message (message_id, conversation_id, node_id, raw_input, message_content, content_type, is_valid) VALUES (?, ?, ?, ?, ?, ?, ?); + basePath: $ + jsonMaps: + + - jsonPath: $.messageId + + - jsonPath: $.conversationId + + - jsonPath: $.nodeId + + - jsonPath: $.rawInput + + - jsonPath: $.messageContent + + - jsonPath: $.contentType + + - jsonPath: $.valid diff --git a/configs/egov-persister/collection-migration-persister.yml b/configs/egov-persister/collection-migration-persister.yml new file mode 100644 index 00000000..8f580e09 --- /dev/null +++ b/configs/egov-persister/collection-migration-persister.yml @@ -0,0 +1,238 @@ +serviceMaps: + serviceName: Payment Service + mappings: + - version: 1.0 + name: collection migration + description: Inserting payment details into egcl_payment + fromTopic: egov.collection.migration + queryMaps: + + - query: INSERT into egcl_payment (id, tenantid, totaldue, totalamountpaid, transactionnumber, transactiondate, paymentmode, instrumentdate, instrumentnumber, instrumentstatus, ifsccode, additionaldetails, paidby, mobilenumber, payername, payeraddress, payeremail, payerid, paymentstatus, createdby, createdtime, lastmodifiedby, lastmodifiedtime) values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) + basePath: $.Payments.* + jsonMaps: + - jsonPath: $.Payments.*.id + + - jsonPath: $.Payments.*.tenantId + + - jsonPath: $.Payments.*.totalDue + type: DOUBLE + + - jsonPath: $.Payments.*.totalAmountPaid + type: Double + + - jsonPath: $.Payments.*.transactionNumber + + - jsonPath: $.Payments.*.transactionDate + type: LONG + + - jsonPath: $.Payments.*.paymentMode + + - jsonPath: $.Payments.*.instrumentDate + type: LONG + + - jsonPath: $.Payments.*.instrumentNumber + + - jsonPath: $.Payments.*.instrumentStatus + + - jsonPath: $.Payments.*.ifscCode + + - jsonPath: $.Payments.*.additionalDetails + type: JSON + dbType: JSONB + + - jsonPath: $.Payments.*.paidBy + + - jsonPath: $.Payments.*.mobileNumber + + - jsonPath: $.Payments.*.payerName + + - jsonPath: $.Payments.*.payerAddress + + - jsonPath: $.Payments.*.payerEmail + + - jsonPath: $.Payments.*.payerId + + - jsonPath: $.Payments.*.paymentStatus + + - jsonPath: $.Payments.*.auditDetails.createdBy + + - jsonPath: $.Payments.*.auditDetails.createdTime + type: LONG + + - jsonPath: $.Payments.*.auditDetails.lastModifiedBy + + - jsonPath: $.Payments.*.auditDetails.lastModifiedTime + type: LONG + + + + + - query: INSERT into egcl_paymentdetail (id, tenantid, paymentid, due, amountpaid, receiptnumber, receiptdate, receipttype, businessservice, billid, additionaldetails, createdby, createdtime, lastmodifiedby, lastmodifiedtime, manualreceiptnumber, manualreceiptdate) values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) + basePath: $.Payments.*.paymentDetails.* + jsonMaps: + - jsonPath: $.Payments.*.paymentDetails.*.id + + - jsonPath: $.Payments.*.paymentDetails.*.tenantId + + - jsonPath: $.Payments.*.id + + - jsonPath: $.Payments.*.paymentDetails.*.totalDue + type: DOUBLE + + - jsonPath: $.Payments.*.paymentDetails.*.totalAmountPaid + type: DOUBLE + + - jsonPath: $.Payments.*.paymentDetails.*.receiptNumber + + - jsonPath: $.Payments.*.paymentDetails.*.receiptDate + type: LONG + + - jsonPath: $.Payments.*.paymentDetails.*.receiptType + + - jsonPath: $.Payments.*.paymentDetails.*.businessService + + - jsonPath: $.Payments.*.paymentDetails.*.billId + + - jsonPath: $.Payments.*.paymentDetails.*.additionalDetails + type: JSON + dbType: JSONB + + - jsonPath: $.Payments.*.paymentDetails.*.auditDetails.createdBy + + - jsonPath: $.Payments.*.paymentDetails.*.auditDetails.createdTime + type: LONG + + - jsonPath: $.Payments.*.paymentDetails.*.auditDetails.lastModifiedBy + + - jsonPath: $.Payments.*.paymentDetails.*.auditDetails.lastModifiedTime + type: LONG + + - jsonPath: $.Payments.*.paymentDetails.*.manualReceiptNumber + + - jsonPath: $.Payments.*.paymentDetails.*.manualReceiptDate + type: LONG + + + - query: INSERT into egcl_bill (id, status, iscancelled, additionaldetails, tenantid, collectionmodesnotallowed, partpaymentallowed, isadvanceallowed, minimumamounttobepaid, businessservice, totalamount, consumercode, billnumber, billdate, reasonforcancellation, createdby, createdtime, lastmodifiedby, lastmodifiedtime) values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) + basePath: $.Payments.*.paymentDetails.*.bill + jsonMaps: + - jsonPath: $.Payments.*.paymentDetails.*.bill.id + + - jsonPath: $.Payments.*.paymentDetails.*.bill.status + + - jsonPath: $.Payments.*.paymentDetails.*.bill.isCancelled + type: BOOLEAN + + - jsonPath: $.Payments.*.paymentDetails.*.bill.additionalDetails + type: JSON + dbType: JSONB + + - jsonPath: $.Payments.*.paymentDetails.*.bill.tenantId + + - jsonPath: $.Payments.*.paymentDetails.*.bill.collectionModesNotAllowed[0] + + - jsonPath: $.Payments.*.paymentDetails.*.bill.partPaymentAllowed + type: BOOLEAN + + - jsonPath: $.Payments.*.paymentDetails.*.bill.isAdvanceAllowed + type: BOOLEAN + + - jsonPath: $.Payments.*.paymentDetails.*.bill.minimumAmountToBePaid + type: DOUBLE + + - jsonPath: $.Payments.*.paymentDetails.*.bill.businessService + + - jsonPath: $.Payments.*.paymentDetails.*.bill.totalAmount + type: DOUBLE + + - jsonPath: $.Payments.*.paymentDetails.*.bill.consumerCode + + - jsonPath: $.Payments.*.paymentDetails.*.bill.billNumber + + - jsonPath: $.Payments.*.paymentDetails.*.bill.billDate + type: LONG + + - jsonPath: $.Payments.*.paymentDetails.*.bill.reasonForCancellation + + - jsonPath: $.Payments.*.paymentDetails.*.bill.auditDetails.createdBy + + - jsonPath: $.Payments.*.paymentDetails.*.bill.auditDetails.createdTime + type: LONG + + - jsonPath: $.Payments.*.paymentDetails.*.bill.auditDetails.lastModifiedBy + + - jsonPath: $.Payments.*.paymentDetails.*.bill.auditDetails.lastModifiedTime + type: LONG + + + - query: INSERT into egcl_billdetial (id, tenantid, demandid, billid, amount, amountpaid, fromperiod, toperiod, additionaldetails, channel, voucherheader, boundary, collectiontype, billdescription, expirydate, displaymessage, callbackforapportioning, cancellationremarks) values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) + basePath: $.Payments.*.paymentDetails.*.bill.billDetails.* + jsonMaps: + - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.id + + - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.tenantId + + - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.demandId + + - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.billId + + - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.amount + type: DOUBLE + + - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.amountPaid + type: DOUBLE + + - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.fromPeriod + type: LONG + + - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.toPeriod + type: LONG + + - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.additionalDetails + type: JSON + dbType: JSONB + + - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.channel + + - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.voucherHeader + + - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.boundary + + - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.collectionType + + - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.billDescription + + - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.expiryDate + + - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.displayMessage + + - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.callBackForApportioning + + - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.cancellationRemarks + + + - query: INSERT into egcl_billaccountdetail (id, tenantid, billdetailid, demanddetailid, "order", amount, isactualdemand, taxheadcode, additionaldetails) values(?,?,?,?,?,?,?,?,?) + basePath: $.Payments.*.paymentDetails.*.bill.billDetails.*.billAccountDetails.* + jsonMaps: + - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.billAccountDetails.*.id + + - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.billAccountDetails.*.tenantId + + - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.billAccountDetails.*.billDetailId + + - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.billAccountDetails.*.demandDetailId + + - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.billAccountDetails.*.order + + - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.billAccountDetails.*.amount + type: DOUBLE + + - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.billAccountDetails.*.isActualDemand + type: BOOLEAN + + - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.billAccountDetails.*.taxHeadCode + + - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.billAccountDetails.*.additionalDetails + type: JSON + dbType: JSONB + diff --git a/configs/egov-persister/egf-bill.yaml b/configs/egov-persister/egf-bill.yaml new file mode 100644 index 00000000..c8453a0e --- /dev/null +++ b/configs/egov-persister/egf-bill.yaml @@ -0,0 +1,338 @@ +serviceMaps: + serviceName: Financial Bill Service + mappings: + - version: 1.0 + name: bill create + description: create bills in egf_billregister + fromTopic: egf-bill-billregister-save-topic + queryMaps: + - query: INSERT INTO egf_billregister( tenantid, billtype, billsubtype, billnumber, billdate, billamount, passedamount, modulename, status, fund, function, fundsource, scheme, subscheme, functionary, location, department, sourcepath, budgetcheckrequired, budgetappropriationno, partybillnumber, partybilldate, description, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: $.billRegisters.* + jsonMaps: + + - jsonPath: $.billRegisters.*.tenantId + + - jsonPath: $.billRegisters.*.billType + + - jsonPath: $.billRegisters.*.billSubType + + - jsonPath: $.billRegisters.*.billNumber + + - jsonPath: $.billRegisters.*.billDate + dbType: LONG + + - jsonPath: $.billRegisters.*.billAmount + dbType: DOUBLE + + - jsonPath: $.billRegisters.*.passedAmount + dbType: DOUBLE + + - jsonPath: $.billRegisters.*.moduleName + + - jsonPath: $.billRegisters.*.status.code + + - jsonPath: $.billRegisters.*.fund.code + + - jsonPath: $.billRegisters.*.function.code + + - jsonPath: $.billRegisters.*.fundsource.code + + - jsonPath: $.billRegisters.*.scheme.code + + - jsonPath: $.billRegisters.*.subScheme.code + + - jsonPath: $.billRegisters.*.functionary.code + + - jsonPath: $.billRegisters.*.location.code + + - jsonPath: $.billRegisters.*.department.code + + - jsonPath: $.billRegisters.*.sourcePath + + - jsonPath: $.billRegisters.*.budgetCheckRequired + + - jsonPath: $.billRegisters.*.budgetAppropriationNo + + - jsonPath: $.billRegisters.*.partyBillNumber + + - jsonPath: $.billRegisters.*.partyBillDate + dbType: LONG + + - jsonPath: $.billRegisters.*.description + + - jsonPath: $.billRegisters.*.auditDetails.createdBy + + - jsonPath: $.billRegisters.*.auditDetails.lastModifiedBy + + - jsonPath: $.billRegisters.*.auditDetails.createdTime + dbType: LONG + + - jsonPath: $.billRegisters.*.auditDetails.lastModifiedTime + dbType: LONG + + - query: INSERT INTO egf_billdetail(tenantId, id, orderid, chartofaccount, debitamount, creditamount, function, bill, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: $.billRegisters.*.billDetails.* + jsonMaps: + + - jsonPath: $.billRegisters.*.billDetails.*.tenantId + + - jsonPath: $.billRegisters.*.billDetails.*.id + + - jsonPath: $.billRegisters.*.billDetails.*.orderId + dbType: INTEGER + + - jsonPath: $.billRegisters.*.billDetails.*.chartOfAccount.glcode + + - jsonPath: $.billRegisters.*.billDetails.*.debitAmount + dbType: DOUBLE + + - jsonPath: $.billRegisters.*.billDetails.*.creditAmount + dbType: DOUBLE + + - jsonPath: $.billRegisters.*.billDetails.*.function.code + + - jsonPath: $.billRegisters[?({id} in @.billDetails[*].id)].billNumber + + - jsonPath: $.billRegisters.*.billDetails.*.auditDetails.createdBy + + - jsonPath: $.billRegisters.*.billDetails.*.auditDetails.lastModifiedBy + + - jsonPath: $.billRegisters.*.billDetails.*.auditDetails.createdTime + dbType: LONG + + - jsonPath: $.billRegisters.*.billDetails.*.auditDetails.lastModifiedTime + dbType: LONG + + - query: INSERT INTO egf_billpayeedetail(tenantId, id, accountdetailtype, accountdetailkey, amount, billdetail, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: $.billRegisters.*.billDetails.*.billPayeeDetails.* + jsonMaps: + + - jsonPath: $.billRegisters.*.billDetails.*.billPayeeDetails.*.tenantId + + - jsonPath: $.billRegisters.*.billDetails.*.billPayeeDetails.*.id + + - jsonPath: $.billRegisters.*.billDetails.*.billPayeeDetails.*.accountDetailType.id + + - jsonPath: $.billRegisters.*.billDetails.*.billPayeeDetails.*.accountDetailKey.id + + - jsonPath: $.billRegisters.*.billDetails.*.billPayeeDetails.*.amount + dbType: DOUBLE + + - jsonPath: $.billRegisters.*.billDetails[?({id} in @.billPayeeDetails[*].id)].id + + - jsonPath: $.billRegisters.*.billDetails.*.billPayeeDetails.*.auditDetails.createdBy + + - jsonPath: $.billRegisters.*.billDetails.*.billPayeeDetails.*.auditDetails.lastModifiedBy + + - jsonPath: $.billRegisters.*.billDetails.*.billPayeeDetails.*.auditDetails.createdTime + dbType: LONG + + - jsonPath: $.billRegisters.*.billDetails.*.billPayeeDetails.*.auditDetails.lastModifiedTime + dbType: LONG + + - query: INSERT INTO egf_billchecklist(tenantId, id, bill, checklist, checklistvalue, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: $.billRegisters.*.checkLists.* + jsonMaps: + + - jsonPath: $.billRegisters.*.checkLists.*.tenantId + + - jsonPath: $.billRegisters.*.checkLists.*.id + + - jsonPath: $.billRegisters[?({id} in @.checkLists[*].id)].billNumber + + - jsonPath: $.billRegisters.*.checkLists.*.checklist.code + + - jsonPath: $.billRegisters.*.checkLists.*.checklistValue + + - jsonPath: $.billRegisters.*.checkLists.*.auditDetails.createdBy + + - jsonPath: $.billRegisters.*.checkLists.*.auditDetails.lastModifiedBy + + - jsonPath: $.billRegisters.*.checkLists.*.auditDetails.createdTime + dbType: LONG + + - jsonPath: $.billRegisters.*.checkLists.*.auditDetails.lastModifiedTime + dbType: LONG + + + - version: 1.0 + name: bill update + description: update bills in egf_billregister + fromTopic: egf-bill-billregister-update-topic + queryMaps: + - query: update egf_billregister set billtype=? , billsubtype=? , billdate=? , billamount=? , passedamount=? , modulename=? , status=? , fund=? , function=? , fundsource=? , scheme=? , subscheme=? , functionary=? , location=? , department=? , sourcepath=? , budgetcheckrequired=? , budgetappropriationno=? , partybillnumber=? , partybilldate=? , description=? ,lastmodifiedby=? , lastmodifiedtime=? where tenantId=? and billNumber=?; + basePath: $.billRegisters.* + jsonMaps: + + - jsonPath: $.billRegisters.*.billType + + - jsonPath: $.billRegisters.*.billSubType + + - jsonPath: $.billRegisters.*.billDate + dbType: LONG + + - jsonPath: $.billRegisters.*.billAmount + dbType: DOUBLE + + - jsonPath: $.billRegisters.*.passedAmount + dbType: DOUBLE + + - jsonPath: $.billRegisters.*.moduleName + + - jsonPath: $.billRegisters.*.status.code + + - jsonPath: $.billRegisters.*.fund.code + + - jsonPath: $.billRegisters.*.function.code + + - jsonPath: $.billRegisters.*.fundsource.code + + - jsonPath: $.billRegisters.*.scheme.code + + - jsonPath: $.billRegisters.*.subScheme.code + + - jsonPath: $.billRegisters.*.functionary.code + + - jsonPath: $.billRegisters.*.location.code + + - jsonPath: $.billRegisters.*.department.code + + - jsonPath: $.billRegisters.*.sourcePath + + - jsonPath: $.billRegisters.*.budgetCheckRequired + + - jsonPath: $.billRegisters.*.budgetAppropriationNo + + - jsonPath: $.billRegisters.*.partyBillNumber + + - jsonPath: $.billRegisters.*.partyBillDate + dbType: LONG + + - jsonPath: $.billRegisters.*.description + + - jsonPath: $.billRegisters.*.auditDetails.lastModifiedBy + + - jsonPath: $.billRegisters.*.auditDetails.lastModifiedTime + dbType: LONG + + - jsonPath: $.billRegisters.*.tenantId + + - jsonPath: $.billRegisters.*.billNumber + + - query: INSERT INTO egf_billdetail(tenantId, id, orderid, chartofaccount, debitamount, creditamount, function, bill, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: $.billRegisters.*.billDetails.* + jsonMaps: + + - jsonPath: $.billRegisters.*.billDetails.*.tenantId + + - jsonPath: $.billRegisters.*.billDetails.*.id + + - jsonPath: $.billRegisters.*.billDetails.*.orderId + dbType: INTEGER + + - jsonPath: $.billRegisters.*.billDetails.*.chartOfAccount.glcode + + - jsonPath: $.billRegisters.*.billDetails.*.debitAmount + dbType: DOUBLE + + - jsonPath: $.billRegisters.*.billDetails.*.creditAmount + dbType: DOUBLE + + - jsonPath: $.billRegisters.*.billDetails.*.function.code + + - jsonPath: $.billRegisters[?({id} in @.billDetails[*].id)].billNumber + + - jsonPath: $.billRegisters.*.billDetails.*.auditDetails.createdBy + + - jsonPath: $.billRegisters.*.billDetails.*.auditDetails.lastModifiedBy + + - jsonPath: $.billRegisters.*.billDetails.*.auditDetails.createdTime + dbType: LONG + + - jsonPath: $.billRegisters.*.billDetails.*.auditDetails.lastModifiedTime + dbType: LONG + + - query: INSERT INTO egf_billpayeedetail(tenantId, id, accountdetailtype, accountdetailkey, amount, billdetail, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: $.billRegisters.*.billDetails.*.billPayeeDetails.* + jsonMaps: + + - jsonPath: $.billRegisters.*.billDetails.*.billPayeeDetails.*.tenantId + + - jsonPath: $.billRegisters.*.billDetails.*.billPayeeDetails.*.id + + - jsonPath: $.billRegisters.*.billDetails.*.billPayeeDetails.*.accountDetailType.id + + - jsonPath: $.billRegisters.*.billDetails.*.billPayeeDetails.*.accountDetailKey.id + + - jsonPath: $.billRegisters.*.billDetails.*.billPayeeDetails.*.amount + dbType: DOUBLE + + - jsonPath: $.billRegisters.*.billDetails[?({id} in @.billPayeeDetails[*].id)].id + + - jsonPath: $.billRegisters.*.billDetails.*.billPayeeDetails.*.auditDetails.createdBy + + - jsonPath: $.billRegisters.*.billDetails.*.billPayeeDetails.*.auditDetails.lastModifiedBy + + - jsonPath: $.billRegisters.*.billDetails.*.billPayeeDetails.*.auditDetails.createdTime + dbType: LONG + + - jsonPath: $.billRegisters.*.billDetails.*.billPayeeDetails.*.auditDetails.lastModifiedTime + dbType: LONG + + - version: 1.0 + name: checklist create + description: create checklists in egf_checklist + fromTopic: egf-bill-checklist-save-topic + queryMaps: + - query: INSERT INTO egf_checklist(code, type, subType, key, description, createdby, lastmodifiedby, createdtime, lastmodifiedtime, tenantId) VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: $.checklists.* + jsonMaps: + + - jsonPath: $.checklists.*.code + + - jsonPath: $.checklists.*.type + + - jsonPath: $.checklists.*.subType + + - jsonPath: $.checklists.*.key + + - jsonPath: $.checklists.*.description + + - jsonPath: $.checklists.*.auditDetails.createdBy + + - jsonPath: $.checklists.*.auditDetails.lastModifiedBy + + - jsonPath: $.checklists.*.auditDetails.createdTime + dbType: LONG + + - jsonPath: $.checklists.*.auditDetails.lastModifiedTime + dbType: LONG + + - jsonPath: $.checklists.*.tenantId + + + - version: 1.0 + name: checklist update + description: update checklists in egf_checklist + fromTopic: egf-bill-checklist-update-topic + queryMaps: + - query: update egf_checklist set type=?, subType=?, key=?, description=?, lastmodifiedby=?, lastmodifiedtime=? where code=? and tenantId=?; + basePath: $.checklists.* + jsonMaps: + + - jsonPath: $.checklists.*.type + + - jsonPath: $.checklists.*.subType + + - jsonPath: $.checklists.*.key + + - jsonPath: $.checklists.*.description + + - jsonPath: $.checklists.*.auditDetails.lastModifiedBy + + - jsonPath: $.checklists.*.auditDetails.lastModifiedTime + dbType: LONG + + - jsonPath: $.checklists.*.code + + - jsonPath: $.checklists.*.tenantId diff --git a/configs/egov-persister/egov-user-event-persister.yml b/configs/egov-persister/egov-user-event-persister.yml new file mode 100644 index 00000000..8132b8c8 --- /dev/null +++ b/configs/egov-persister/egov-user-event-persister.yml @@ -0,0 +1,154 @@ +serviceMaps: + serviceName: mSeva Event Notification + mappings: + - version: 1.0 + name: mSeva + description: Persists events into the table + fromTopic: save-user-events + isTransaction: true + queryMaps: + - query: INSERT INTO eg_usrevents_events(tenantid, id, source, eventtype, category, name, postedby, referenceid, description, status, eventdetails, actions, recepient, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + + basePath: events.* + jsonMaps: + + + - jsonPath: $.events.*.tenantId + + - jsonPath: $.events.*.id + + - jsonPath: $.events.*.source + + - jsonPath: $.events.*.eventType + + - jsonPath: $.events.*.eventCategory + + - jsonPath: $.events.*.name + + - jsonPath: $.events.*.postedBy + + - jsonPath: $.events.*.referenceId + + - jsonPath: $.events.*.description + + - jsonPath: $.events.*.status + + - jsonPath: $.events.*.eventDetails + type: JSON + dbType: JSONB + + - jsonPath: $.events.*.actions + type: JSON + dbType: JSONB + + - jsonPath: $.events.*.recepient + type: JSON + dbType: JSONB + + - jsonPath: $.events.*.auditDetails.createdBy + + - jsonPath: $.events.*.auditDetails.createdTime + + - jsonPath: $.events.*.auditDetails.lastModifiedBy + + - jsonPath: $.events.*.auditDetails.lastModifiedTime + + + + - query: INSERT INTO eg_usrevents_recepnt_event_registry(recepient, eventid) VALUES (?, ?); + + basePath: events.*.recepientEventMap.* + jsonMaps: + + + - jsonPath: $.events.*.recepientEventMap.*.recepient + + - jsonPath: $.events.*.recepientEventMap.*.eventId + + + + + + - version: 1.0 + name: mSeva + description: Updates event details in the table + fromTopic: update-user-events + isTransaction: true + queryMaps: + - query: UPDATE eg_usrevents_events SET description = ?, status = ?, name = ?, category = ?, eventdetails = ?, actions = ?, recepient = ? , lastmodifiedby = ?, lastmodifiedtime = ? WHERE id = ?; + + basePath: events.* + jsonMaps: + + - jsonPath: $.events.*.description + + - jsonPath: $.events.*.status + + - jsonPath: $.events.*.name + + - jsonPath: $.events.*.eventCategory + + - jsonPath: $.events.*.eventDetails + type: JSON + dbType: JSONB + + - jsonPath: $.events.*.actions + type: JSON + dbType: JSONB + + - jsonPath: $.events.*.recepient + type: JSON + dbType: JSONB + + - jsonPath: $.events.*.auditDetails.lastModifiedBy + + - jsonPath: $.events.*.auditDetails.lastModifiedTime + + - jsonPath: $.events.*.id + + + + - query: DELETE FROM eg_usrevents_recepnt_event_registry WHERE eventid = ?; + + basePath: events.* + jsonMaps: + + - jsonPath: $.events.*.id + + + + - query: INSERT INTO eg_usrevents_recepnt_event_registry(recepient, eventid) VALUES (?, ?); + + basePath: events.*.recepientEventMap.* + jsonMaps: + + + - jsonPath: $.events.*.recepientEventMap.*.recepient + + - jsonPath: $.events.*.recepientEventMap.*.eventId + + + + + + - version: 1.0 + name: mSeva + description: Persists user last login details + fromTopic: user-events-lat + isTransaction: true + queryMaps: + - query: INSERT INTO eg_usrevents_user_lat(userid, lastaccesstime) VALUES (?, ?) ON CONFLICT (userid) DO UPDATE SET lastaccesstime = ?; + + basePath: lastAccessDetails + jsonMaps: + + + - jsonPath: $.lastAccessDetails.userId + + - jsonPath: $.lastAccessDetails.lastAccessTime + + - jsonPath: $.lastAccessDetails.lastAccessTime + + + + diff --git a/configs/egov-persister/firenoc_persiter.yaml b/configs/egov-persister/firenoc_persiter.yaml new file mode 100644 index 00000000..cee5bbbf --- /dev/null +++ b/configs/egov-persister/firenoc_persiter.yaml @@ -0,0 +1,586 @@ +serviceMaps: + serviceName: fn-services + mappings: + - version: 1.0 + description: Persists fireNOC details in eg_fn_firenoc table + fromTopic: save-fn-firenoc + isTransaction: true + queryMaps: + + - query: INSERT INTO eg_fn_firenoc(uuid, tenantid, firenocnumber, provisionfirenocnumber, oldfirenocnumber, dateofapplied, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: FireNOCs.* + jsonMaps: + - jsonPath: $.FireNOCs.*.id + + - jsonPath: $.FireNOCs.*.tenantId + + - jsonPath: $.FireNOCs.*.firenocnumber + + - jsonPath: $.FireNOCs.*.provisionfirenocnumber + + - jsonPath: $.FireNOCs.*.oldfirenocnumber + + - jsonPath: $.FireNOCs.*.dateofapplied + + - jsonPath: $.FireNOCs.*.auditDetails.createdBy + + - jsonPath: $.FireNOCs.*.auditDetails.lastModifiedBy + + - jsonPath: $.FireNOCs.*.auditDetails.createdTime + + - jsonPath: $.FireNOCs.*.auditDetails.lastModifiedTime + + + - query: INSERT INTO eg_fn_firenocdetail(uuid, firenocuuid, applicationnumber, firenoctype, firestationid, applicationdate, financialyear, issueddate, validfrom, validto, action,channel, noofbuildings, tenantid, additionaldetail, createdby, lastmodifiedby, createdtime, lastmodifiedtime, propertyid,status) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?); + basePath: FireNOCs.*.fireNOCDetails + jsonMaps: + - jsonPath: $.FireNOCs.*.fireNOCDetails.id + + - jsonPath: $.FireNOCs.*.id + + - jsonPath: $.FireNOCs.*.fireNOCDetails.applicationNumber + + - jsonPath: $.FireNOCs.*.fireNOCDetails.fireNOCType + + - jsonPath: $.FireNOCs.*.fireNOCDetails.firestationId + + - jsonPath: $.FireNOCs.*.fireNOCDetails.applicationDate + + - jsonPath: $.FireNOCs.*.fireNOCDetails.financialYear + + - jsonPath: $.FireNOCs.*.fireNOCDetails.issuedDate + + - jsonPath: $.FireNOCs.*.fireNOCDetails.validFrom + + - jsonPath: $.FireNOCs.*.fireNOCDetails.validTo + + - jsonPath: $.FireNOCs.*.fireNOCDetails.action + + - jsonPath: $.FireNOCs.*.fireNOCDetails.channel + + - jsonPath: $.FireNOCs.*.fireNOCDetails.noOfBuildings + + - jsonPath: $.FireNOCs.*.fireNOCDetails.tenantId + + - jsonPath: $.FireNOCs.*.fireNOCDetails.additionalDetail + type: JSON + dbType: JSONB + + - jsonPath: $.FireNOCs.*.auditDetails.createdBy + + - jsonPath: $.FireNOCs.*.auditDetails.lastModifiedBy + + - jsonPath: $.FireNOCs.*.auditDetails.createdTime + + - jsonPath: $.FireNOCs.*.auditDetails.lastModifiedTime + + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.propertyid + + - jsonPath: $.FireNOCs.*.fireNOCDetails.status + + + - query: INSERT INTO eg_fn_owner(uuid, tenantid, firenocdetailsuuid, isactive, isprimaryowner, ownertype, ownershippercentage, relationship, active, institutionid, createdby, createdtime, lastmodifiedby, lastmodifiedtime,useruuid) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?); + basePath: FireNOCs.*.fireNOCDetails.applicantDetails.owners.* + jsonMaps: + - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.owners.*.ownerUUID + + - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.owners.*.tenantId + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.applicantDetails.owners[*].id)].fireNOCDetails.id + + - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.owners.*.isActive + + - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.owners.*.isPrimaryOwner + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.applicantDetails.owners[*].id)].fireNOCDetails.applicantDetails.ownerShipType + + - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.owners.*.ownerShipPercentage + + - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.owners.*.relationship + + - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.owners.*.active + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.applicantDetails.owners[*].id)].fireNOCDetails.applicantDetails.additionalDetail.id + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.applicantDetails.owners[*].id)].auditDetails.createdBy + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.applicantDetails.owners[*].id)].auditDetails.createdTime + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.applicantDetails.owners[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.applicantDetails.owners[*].id)].auditDetails.lastModifiedTime + + - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.owners.*.uuid + + - query: INSERT INTO public.eg_fn_address(uuid, tenantid, doorno, latitude, longitude, buildingname, addressid, addressnumber, type, addressline1, addressline2, landmark, street, city, locality, pincode, detail, firenocdetailsuuid, createdby, lastmodifiedby, createdtime, lastmodifiedtime,areatype,subdistrict) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?,?); + basePath: FireNOCs.*.fireNOCDetails.propertyDetails.address + jsonMaps: + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.id + + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.tenantId + + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.doorNo + + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.latitude + + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.longitude + + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.buildingName + + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.addressId + + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.addressNumber + + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.type + + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.addressline1 + + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.addressline1 + + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.landmark + + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.street + + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.city + + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.locality.code + + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.pincode + + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.detail + + - jsonPath: $.FireNOCs.*.fireNOCDetails.id + + - jsonPath: $.FireNOCs.*.auditDetails.createdBy + + - jsonPath: $.FireNOCs.*.auditDetails.lastModifiedBy + + - jsonPath: $.FireNOCs.*.auditDetails.createdTime + + - jsonPath: $.FireNOCs.*.auditDetails.lastModifiedTime + + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.areatype + + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.subdistrict + + - query: INSERT INTO public.eg_fn_institution(uuid, tenantid, firenocdetailsuuid, name, type, designation, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: FireNOCs.*.fireNOCDetails.applicantDetails.additionalDetail + jsonMaps: + + - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.additionalDetail.id + + - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.additionalDetail.tenantId + + - jsonPath: $.FireNOCs.*.fireNOCDetails.id + + - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.additionalDetail.name + + - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.additionalDetail.type + + - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.additionalDetail.designation + + - jsonPath: $.FireNOCs.*.auditDetails.createdBy + + - jsonPath: $.FireNOCs.*.auditDetails.createdTime + + - jsonPath: $.FireNOCs.*.auditDetails.lastModifiedBy + + - jsonPath: $.FireNOCs.*.auditDetails.lastModifiedTime + + - query: INSERT INTO eg_fn_buidlings(uuid, firenocdetailsuuid, tenantid, name, createdby, lastmodifiedby, createdtime, lastmodifiedtime, usagetype) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: FireNOCs.*.fireNOCDetails.buildings.* + jsonMaps: + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.id + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings[*].id)].fireNOCDetails.id + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.tenantId + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.name + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings[*].id)].auditDetails.createdBy + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings[*].id)].auditDetails.createdTime + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings[*].id)].auditDetails.lastModifiedTime + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.usageType + + - query: INSERT INTO eg_fn_buildingdocuments(uuid, tenantid, documenttype, filestoreid, active, documentuid, createdby, createdtime, lastmodifiedby, lastmodifiedtime, buildinguuid) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: FireNOCs.*.fireNOCDetails.buildings.*.applicationDocuments.* + jsonMaps: + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.applicationDocuments.*.id + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings.*.applicationDocuments[*].id)].tenantId + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.applicationDocuments.*.documentType + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.applicationDocuments.*.fileStoreId + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.applicationDocuments.*.active + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.applicationDocuments.*.documentUid + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings.*.applicationDocuments[*].id)].auditDetails.createdBy + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings.*.applicationDocuments[*].id)].auditDetails.createdTime + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings.*.applicationDocuments[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings.*.applicationDocuments[*].id)].auditDetails.lastModifiedTime + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings[*][?({id} in @.applicationDocuments[*].id)].id + + - query: INSERT INTO eg_fn_buildinguoms(uuid, code, activeuom, active, createdby, lastmodifiedby, createdtime, lastmodifiedtime, buildinguuid,value) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?,?); + basePath: FireNOCs.*.fireNOCDetails.buildings.*.uoms.* + jsonMaps: + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.uoms.*.id + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.uoms.*.code + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.uoms.*.isActiveUom + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.uoms.*.active + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings.*.uoms[*].id)].auditDetails.createdBy + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings.*.uoms[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings.*.uoms[*].id)].auditDetails.createdTime + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings.*.uoms[*].id)].auditDetails.lastModifiedTime + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings[*][?({id} in @.uoms[*].id)].id + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.uoms.*.value + + - version: 1.0 + description: Update fire NOC details in eg_fn_firenoc table + fromTopic: update-fn-firenoc + isTransaction: true + queryMaps: + + - query: UPDATE eg_fn_firenoc SET provisionFireNOCNumber = ?,oldFireNOCNumber = ?,lastmodifiedby = ?, lastmodifiedtime = ? WHERE uuid=?; + basePath: FireNOCs.* + jsonMaps: + - jsonPath: $.FireNOCs.*.provisionFireNOCNumber + + - jsonPath: $.FireNOCs.*.oldFireNOCNumber + + - jsonPath: $.FireNOCs.*.auditDetails.lastModifiedBy + + - jsonPath: $.FireNOCs.*.auditDetails.lastModifiedTime + + - jsonPath: $.FireNOCs.*.id + + + - query: UPDATE eg_fn_firenocdetail SET fireNOCType = ?, firestationId = ?, additionaldetail = ?,financialYear = ?,action = ?,status=?,channel = ?,noOfBuildings = ?,propertyId = ?,lastmodifiedby = ?, lastmodifiedtime = ? WHERE uuid = ?; + basePath: FireNOCs.*.fireNOCDetails + jsonMaps: + + - jsonPath: $.FireNOCs.*.fireNOCDetails.fireNOCType + + - jsonPath: $.FireNOCs.*.fireNOCDetails.firestationId + + - jsonPath: $.FireNOCs.*.fireNOCDetails.additionalDetail + type: JSON + dbType: JSONB + + - jsonPath: $.FireNOCs.*.fireNOCDetails.financialYear + + - jsonPath: $.FireNOCs.*.fireNOCDetails.action + + - jsonPath: $.FireNOCs.*.fireNOCDetails.status + + - jsonPath: $.FireNOCs.*.fireNOCDetails.channel + + - jsonPath: $.FireNOCs.*.fireNOCDetails.noOfBuildings + + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.propertyId + + - jsonPath: $.FireNOCs.*.auditDetails.lastModifiedBy + + - jsonPath: $.FireNOCs.*.auditDetails.lastModifiedTime + + - jsonPath: $.FireNOCs.*.fireNOCDetails.id + + + - query: INSERT INTO eg_fn_buidlings(uuid, tenantid, name, usageType, firenocdetailsuuid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (uuid) DO UPDATE SET active = ?, name = ?, usageType = ?, lastmodifiedby = ?, lastmodifiedtime = ?; + basePath: FireNOCs.*.fireNOCDetails.buildings.* + jsonMaps: + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.id + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.tenantId + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.name + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.usageType + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings[*].id)].fireNOCDetails.id + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings[*].id)].auditDetails.createdBy + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings[*].id)].auditDetails.createdTime + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings[*].id)].auditDetails.lastModifiedTime + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.active + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.name + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.usageType + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings[*].id)].auditDetails.lastModifiedTime + + + - query: INSERT INTO eg_fn_buildingdocuments(uuid, tenantid, documenttype, filestoreid, active, documentuid, createdby, createdtime, lastmodifiedby, lastmodifiedtime, buildinguuid) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (uuid) DO UPDATE SET active = ?,documentType = ?, fileStoreId = ?, documentUid=?,lastmodifiedby = ?, lastmodifiedtime = ?; + basePath: FireNOCs.*.fireNOCDetails.buildings.*.applicationDocuments.* + jsonMaps: + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.applicationDocuments.*.id + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings.*.applicationDocuments[*].id)].tenantId + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.applicationDocuments.*.documentType + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.applicationDocuments.*.fileStoreId + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.applicationDocuments.*.active + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.applicationDocuments.*.documentUid + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings.*.applicationDocuments[*].id)].auditDetails.createdBy + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings.*.applicationDocuments[*].id)].auditDetails.createdTime + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings.*.applicationDocuments[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings.*.applicationDocuments[*].id)].auditDetails.lastModifiedTime + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings[*][?({id} in @.applicationDocuments[*].id)].id + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.applicationDocuments.*.active + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.applicationDocuments.*.documentType + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.applicationDocuments.*.fileStoreId + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.applicationDocuments.*.documentUid + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings.*.applicationDocuments[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings.*.applicationDocuments[*].id)].auditDetails.lastModifiedTime + + - query: INSERT INTO eg_fn_buildinguoms(uuid, code, activeuom, active, createdby, lastmodifiedby, createdtime, lastmodifiedtime, buildinguuid,value) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?,?) ON CONFLICT (uuid) DO UPDATE SET active = ?,code = ?, activeuom = ?, value=?,lastmodifiedby = ?, lastmodifiedtime = ?; + basePath: FireNOCs.*.fireNOCDetails.buildings.*.uoms.* + jsonMaps: + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.uoms.*.id + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.uoms.*.code + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.uoms.*.isActiveUom + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.uoms.*.active + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings.*.uoms[*].id)].auditDetails.createdBy + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings.*.uoms[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings.*.uoms[*].id)].auditDetails.createdTime + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings.*.uoms[*].id)].auditDetails.lastModifiedTime + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings[*][?({id} in @.uoms[*].id)].id + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.uoms.*.value + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.uoms.*.active + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.uoms.*.code + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.uoms.*.isActiveUom + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.uoms.*.value + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings.*.uoms[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings.*.uoms[*].id)].auditDetails.lastModifiedTime + + + - query: INSERT INTO eg_fn_owner(uuid, tenantid, firenocdetailsuuid, isactive, isprimaryowner, ownertype, ownershippercentage, relationship, active, institutionid, createdby, createdtime, lastmodifiedby, lastmodifiedtime,useruuid) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?) ON CONFLICT ON CONSTRAINT pk_eg_fn_owner DO UPDATE SET active = ?, isprimaryowner = ?, ownertype = ?, ownershippercentage = ?, relationship = ?,useruuid=?, lastmodifiedby = ?, lastmodifiedtime = ?; + basePath: FireNOCs.*.fireNOCDetails.applicantDetails.owners.* + jsonMaps: + - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.owners.*.ownerUUID + + - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.owners.*.tenantId + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.applicantDetails.owners[*].id)].fireNOCDetails.id + + - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.owners.*.userActive + + - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.owners.*.isPrimaryOwner + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.applicantDetails.owners[*].id)].fireNOCDetails.applicantDetails.ownerShipType + + - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.owners.*.ownerShipPercentage + + - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.owners.*.relationship + + - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.owners.*.active + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.applicantDetails.owners[*].id)].fireNOCDetails.applicantDetails.additionalDetail.id + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.applicantDetails.owners[*].id)].auditDetails.createdBy + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.applicantDetails.owners[*].id)].auditDetails.createdTime + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.applicantDetails.owners[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.applicantDetails.owners[*].id)].auditDetails.lastModifiedTime + + - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.owners.*.uuid + + - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.owners.*.userActive + + - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.owners.*.isPrimaryOwner + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.applicantDetails.owners[*].id)].fireNOCDetails.applicantDetails.ownerShipType + + - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.owners.*.ownerShipPercentage + + - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.owners.*.relationship + + - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.owners.*.uuid + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.applicantDetails.owners[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.applicantDetails.owners[*].id)].auditDetails.lastModifiedTime + + - query: UPDATE eg_fn_address SET doorno =?,street = ?,buildingName = ?, latitude =?, longitude =?, addressid =?, addressnumber =?,locality =?, type =?, addressline1 =?, addressline2 =?, landmark =?, city =?, pincode =?, detail =?,lastmodifiedby =?, lastmodifiedtime =?, areatype=?, subdistrict=? WHERE uuid =?; + basePath: FireNOCs.*.fireNOCDetails.propertyDetails.address + jsonMaps: + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.doorNo + + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.street + + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.buildingName + + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.latitude + + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.longitude + + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.addressId + + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.addressNumber + + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.locality.code + + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.type + + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.addressline1 + + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.addressline1 + + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.landmark + + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.city + + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.pincode + + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.detail + + - jsonPath: $.FireNOCs.*.auditDetails.lastModifiedBy + + - jsonPath: $.FireNOCs.*.auditDetails.lastModifiedTime + + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.id + + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.areatype + + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.subdistrict + + + - query: INSERT INTO eg_fn_institution(tenantId,uuid, firenocdetailsuuid, name, type,designation, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (uuid) DO UPDATE SET active = ?,name = ?,type = ?,designation = ?, lastmodifiedby = ?,lastmodifiedtime = ?; + basePath: FireNOCs.*.fireNOCDetails.applicantDetails.additionalDetail + jsonMaps: + - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.additionalDetail.tenantId + + - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.additionalDetail.id + + - jsonPath: $.FireNOCs.*.fireNOCDetails.id + + - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.additionalDetail.name + + - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.additionalDetail.type + + - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.additionalDetail.designation + + - jsonPath: $.FireNOCs.*.auditDetails.createdBy + + - jsonPath: $.FireNOCs.*.auditDetails.lastModifiedBy + + - jsonPath: $.FireNOCs.*.auditDetails.createdTime + + - jsonPath: $.FireNOCs.*.auditDetails.lastModifiedTime + + - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.additionalDetail.active + + - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.additionalDetail.name + + - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.additionalDetail.type + + - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.additionalDetail.designation + + - jsonPath: $.FireNOCs.*.auditDetails.lastModifiedBy + + - jsonPath: $.FireNOCs.*.auditDetails.lastModifiedTime + + + - version: 1.0 + description: Persists tradeLicense details in eg_fn_firenoc table + fromTopic: update-fn-workflow + isTransaction: true + queryMaps: + + - query: UPDATE eg_fn_firenoc SET fireNOCNumber = ?, lastmodifiedby = ?, lastmodifiedtime = ? WHERE uuid=?; + basePath: FireNOCs.* + jsonMaps: + + - jsonPath: $.FireNOCs.*.fireNOCNumber + + - jsonPath: $.FireNOCs.*.auditDetails.lastModifiedBy + + - jsonPath: $.FireNOCs.*.auditDetails.lastModifiedTime + + - jsonPath: $.FireNOCs.*.id + + + - query: UPDATE eg_fn_firenocdetail SET validFrom=?,validTo=?,issueddate = ?, action = ?,status=?, additionaldetail = ?,lastmodifiedby = ?, lastmodifiedtime = ? WHERE uuid = ?; + basePath: FireNOCs.*.fireNOCDetails + jsonMaps: + + - jsonPath: $.FireNOCs.*.fireNOCDetails.validFrom + + - jsonPath: $.FireNOCs.*.fireNOCDetails.validTo + + - jsonPath: $.FireNOCs.*.fireNOCDetails.issuedDate + + - jsonPath: $.FireNOCs.*.fireNOCDetails.action + + - jsonPath: $.FireNOCs.*.fireNOCDetails.status + + - jsonPath: $.FireNOCs.*.fireNOCDetails.additionalDetail + type: JSON + dbType: JSONB + + - jsonPath: $.FireNOCs.*.auditDetails.lastModifiedBy + + - jsonPath: $.FireNOCs.*.auditDetails.lastModifiedTime + + - jsonPath: $.FireNOCs.*.fireNOCDetails.id + diff --git a/configs/egov-persister/pdf-filestoreid-update.yml b/configs/egov-persister/pdf-filestoreid-update.yml new file mode 100644 index 00000000..1549d28d --- /dev/null +++ b/configs/egov-persister/pdf-filestoreid-update.yml @@ -0,0 +1,30 @@ +serviceMaps: + serviceName: pdf-service + mappings: + - version: 1.0 + description: Update fileStoreIds + fromTopic: PDF_GEN_CREATE + isTransaction: true + queryMaps: + + + - query: UPDATE eg_tl_tradelicense SET filestoreid=? WHERE id = ? + basePath: jobs.* + jsonMaps: + + - jsonPath: $.jobs.*.filestoreids + type: ARRAY + dbType: STRING + + - jsonPath: $.jobs.*.entityid + + + - query: UPDATE egbs_bill_v1 SET filestoreid=? WHERE id = ? + basePath: jobs.* + jsonMaps: + + - jsonPath: $.jobs.*.filestoreids + type: ARRAY + dbType: STRING + + - jsonPath: $.jobs.*.entityid diff --git a/configs/egov-persister/pdf-generator.yml b/configs/egov-persister/pdf-generator.yml new file mode 100644 index 00000000..9bb8c94a --- /dev/null +++ b/configs/egov-persister/pdf-generator.yml @@ -0,0 +1,41 @@ +serviceMaps: + serviceName: PDF Generation Service + mappings: + - version: 1.0 + name: PDF create + description: create PDF + fromTopic: PDF_GEN_CREATE + queryMaps: + - query: INSERT INTO egov_pdf_gen(jobid,filestoreids,tenantid,createdtime,endtime,totalcount,entityid,isconsolidated,id,createdby,modifiedby,key,documenttype,modulename) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: $.jobs.* + jsonMaps: + + - jsonPath: $.jobs.*.jobid + + - jsonPath: $.jobs.*.filestoreids + type: JSON + dbType: JSONB + + - jsonPath: $.jobs.*.tenantId + + - jsonPath: $.jobs.*.createdtime + + - jsonPath: $.jobs.*.endtime + + - jsonPath: $.jobs.*.totalcount + + - jsonPath: $.jobs.*.entityid + + - jsonPath: $.jobs.*.isconsolidated + + - jsonPath: $.jobs.*.id + + - jsonPath: $.jobs.*.createdby + + - jsonPath: $.jobs.*.modifiedby + + - jsonPath: $.jobs.*.key + + - jsonPath: $.jobs.*.documentType + + - jsonPath: $.jobs.*.moduleName diff --git a/configs/egov-persister/pgr.yml b/configs/egov-persister/pgr.yml new file mode 100644 index 00000000..fda7078f --- /dev/null +++ b/configs/egov-persister/pgr.yml @@ -0,0 +1,203 @@ +serviceMaps: + serviceName: User Service + mappings: + - version: 1.0 + name: Asset + description: Persists asset details in eg_asset table + fromTopic: save-pgr-servicereq + isTransaction: true + queryMaps: + - query: INSERT INTO eg_pgr_servicereq(tenantId,serviceCode,serviceRequestId,description,lat,long,address,addressId,email,deviceId,accountId,firstName,lastName,phone,attributes,status,assignedTo,source,expectedTime,createdby,createdtime,lastmodifiedby,lastmodifiedtime) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?); + + basePath: serviceReq.* + jsonMaps: + + + - jsonPath: $.serviceReq.*.tenantId + + - jsonPath: $.serviceReq.*.serviceCode + + - jsonPath: $.serviceReq.*.serviceRequestId + + - jsonPath: $.serviceReq.*.description + + - jsonPath: $.serviceReq.*.lat + + - jsonPath: $.serviceReq.*._long + + - jsonPath: $.serviceReq.*.address + + - jsonPath: $.serviceReq.*.addressId + + - jsonPath: $.serviceReq.*.email + + - jsonPath: $.serviceReq.*.deviceId + + - jsonPath: $.serviceReq.*.accountId + + - jsonPath: $.serviceReq.*.firstName + + - jsonPath: $.serviceReq.*.lastName + + - jsonPath: $.serviceReq.*.phone + + - jsonPath: $.serviceReq.*.attributes + type: JSON + dbType: JSONB + + - jsonPath: $.serviceReq.*.status + + - jsonPath: $.serviceReq.*.assignedTo + + - jsonPath: $.serviceReq.*.source + + - jsonPath: $.serviceReq.*.expectedTime + + - jsonPath: $.serviceReq.*.auditDetails.createdBy + + - jsonPath: $.serviceReq.*.auditDetails.createdTime + + - jsonPath: $.serviceReq.*.auditDetails.lastModifiedBy + + - jsonPath: $.serviceReq.*.auditDetails.lastModifiedTime + + + - query: INSERT INTO eg_pgr_media(id, by, "when",url, tenantId,serviceRequestId) VALUES (?,?,?,?,?,?); + + basePath: serviceReq.*.media.* + jsonMaps: + + - jsonPath: $.serviceReq.*.media.*.id + + - jsonPath: $.serviceReq.*.media.*.by + + - jsonPath: $.serviceReq[?({id} in @.media[*].id)].auditDetails.createdTime + + - jsonPath: $.serviceReq.*.media.*.url + + - jsonPath: $.serviceReq[?({id} in @.media[*].id)].tenantId + + - jsonPath: $.serviceReq[?({id} in @.media[*].id)].serviceRequestId + + + - query: INSERT INTO eg_pgr_comment(id, by, "when", message, tenantId,serviceRequestId, isInternal) VALUES (?,?,?,?,?,?,?); + + basePath: serviceReq.*.comments.* + jsonMaps: + + - jsonPath: $.serviceReq.*.comments.*.id + + - jsonPath: $.serviceReq.*.comments.*.by + + - jsonPath: $.serviceReq[?({id} in @.comments[*].id)].auditDetails.createdTime + + - jsonPath: $.serviceReq.*.comments.*.message + + - jsonPath: $.serviceReq[?({id} in @.comments[*].id)].tenantId + + - jsonPath: $.serviceReq[?({id} in @.comments[*].id)].serviceRequestId + + - jsonPath: $.serviceReq.*.comments.*.isInternal + + + - version: 1.0 + name: Asset + description: Persists asset details in eg_asset table + fromTopic: update-pgr-servicereq + isTransaction: true + queryMaps: + - query: INSERT INTO eg_pgr_servicereq_audit (tenantid, servicecode, servicerequestid, description, lat, "long", address, addressid, email, deviceid, accountid, firstname,lastname, phone, attributes, status, assignedto, source, expectedtime, createdby, createdtime,auditcreatedtime) SELECT tenantid, servicecode, servicerequestid, description, lat, "long", address, addressid, email, deviceid, accountid,firstname, lastname, phone, attributes, status, assignedto, source, expectedtime,lastmodifiedby,lastmodifiedtime,(select extract (EPOCH from now())*1000) FROM eg_pgr_servicereq where tenantId=? AND servicerequestid=?; + + basePath: serviceReq.* + jsonMaps: + + - jsonPath: $.serviceReq.*.tenantId + + - jsonPath: $.serviceReq.*.serviceRequestId + + + - query: UPDATE eg_pgr_servicereq SET description=?, lat=?, long=?,address=?, addressid=?, email=?, deviceid=?, accountid=?, firstname=?, lastname=?, phone=?, attributes=?, status=?, assignedto=?, source=?, expectedtime=?, lastmodifiedby=?, lastmodifiedtime=? WHERE tenantid=? AND servicerequestid=?; + + basePath: serviceReq.* + jsonMaps: + + - jsonPath: $.serviceReq.*.description + + - jsonPath: $.serviceReq.*.lat + + - jsonPath: $.serviceReq.*._long + + - jsonPath: $.serviceReq.*.address + + - jsonPath: $.serviceReq.*.addressId + + - jsonPath: $.serviceReq.*.email + + - jsonPath: $.serviceReq.*.deviceId + + - jsonPath: $.serviceReq.*.accountId + + - jsonPath: $.serviceReq.*.firstName + + - jsonPath: $.serviceReq.*.lastName + + - jsonPath: $.serviceReq.*.phone + + - jsonPath: $.serviceReq.*.attributes + type: JSON + dbType: JSONB + + - jsonPath: $.serviceReq.*.status + + - jsonPath: $.serviceReq.*.assignedTo + + - jsonPath: $.serviceReq.*.source + + - jsonPath: $.serviceReq.*.expectedTime + + - jsonPath: $.serviceReq.*.auditDetails.lastModifiedBy + + - jsonPath: $.serviceReq.*.auditDetails.lastModifiedTime + + - jsonPath: $.serviceReq.*.tenantId + + - jsonPath: $.serviceReq.*.serviceRequestId + + + + - query: INSERT INTO eg_pgr_media(id, by, "when",url, tenantId,serviceRequestId) VALUES (?,?,?,?,?,?) ON CONFLICT (id,TenantId) DO NOTHING; + + basePath: serviceReq.*.media.* + jsonMaps: + + - jsonPath: $.serviceReq.*.media.*.id + + - jsonPath: $.serviceReq.*.media.*.by + + - jsonPath: $.serviceReq[?({id} in @.media[*].id)].auditDetails.lastModifiedTime + + - jsonPath: $.serviceReq.*.media.*.url + + - jsonPath: $.serviceReq[?({id} in @.media[*].id)].tenantId + + - jsonPath: $.serviceReq[?({id} in @.media[*].id)].serviceRequestId + + + - query: INSERT INTO eg_pgr_comment(id, by, "when", message, tenantId,serviceRequestId, isInternal) VALUES (?,?,?,?,?,?,?) ON CONFLICT (id,tenantId) DO NOTHING; + + basePath: serviceReq.*.comments.* + jsonMaps: + + - jsonPath: $.serviceReq.*.comments.*.id + + - jsonPath: $.serviceReq.*.comments.*.by + + - jsonPath: $.serviceReq[?({id} in @.comments[*].id)].auditDetails.lastModifiedTime + + - jsonPath: $.serviceReq.*.comments.*.message + + - jsonPath: $.serviceReq[?({id} in @.comments[*].id)].tenantId + + - jsonPath: $.serviceReq[?({id} in @.comments[*].id)].serviceRequestId + + - jsonPath: $.serviceReq.*.comments.*.isInternal diff --git a/configs/egov-persister/pt-mutation-calculator-persister.yml b/configs/egov-persister/pt-mutation-calculator-persister.yml new file mode 100644 index 00000000..42b72687 --- /dev/null +++ b/configs/egov-persister/pt-mutation-calculator-persister.yml @@ -0,0 +1,87 @@ +serviceMaps: + serviceName: Property Mutation Calculator + mappings: + - version: 1.0 + name: pt-mutation-calculator + description: Persists the pt-mutation-calculator related records to db + fromTopic: save-pt-mutation-billingslab + isTransaction: true + queryMaps: + - query: INSERT INTO eg_pt_mutation_billingslab(id, tenantid, propertyType, propertySubType, usageCategoryMajor, usageCategoryMinor, usageCategorySubMinor, usageCategoryDetail, ownershipCategory, subOwnershipCategory, minMarketValue, maxMarketValue, fixedAmount, rate, method) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, cast(? as double precision), cast(? as double precision), cast(? as double precision), cast(? as double precision), ?); + + basePath: MutationBillingSlab.* + jsonMaps: + + - jsonPath: $.MutationMutationBillingSlab.*.id + + - jsonPath: $.MutationMutationBillingSlab.*.tenantId + + - jsonPath: $.MutationBillingSlab.*.propertyType + + - jsonPath: $.MutationBillingSlab.*.propertySubType + + - jsonPath: $.MutationBillingSlab.*.usageCategoryMajor + + - jsonPath: $.MutationBillingSlab.*.usageCategoryMinor + + - jsonPath: $.MutationBillingSlab.*.usageCategorySubMinor + + - jsonPath: $.MutationBillingSlab.*.usageCategoryDetail + + - jsonPath: $.MutationBillingSlab.*.ownerShipCategory + + - jsonPath: $.MutationBillingSlab.*.subOwnerShipCategory + + - jsonPath: $.MutationBillingSlab.*.minMarketValue + + - jsonPath: $.MutationBillingSlab.*.maxMarketValue + + - jsonPath: $.MutationBillingSlab.*.fixedAmount + + - jsonPath: $.MutationBillingSlab.*.rate + + - jsonPath: $.MutationBillingSlab.*.type + + + + - version: 1.0 + name: pt-mutation-calculator + description: Persists the pt-mutation-calculator related records to db + fromTopic: update-pt-mutation-billingslab + isTransaction: true + queryMaps: + + - query: UPDATE eg_pt_mutation_billingslab SET propertyType=?, propertySubType=?, usageCategoryMajor=?, usageCategoryMinor=?, usageCategorySubMinor=?, usageCategoryDetail=?, ownershipCategory=?, subOwnershipCategory=?, minMarketValue=cast(? as double precision), maxMarketValue=cast(? as double precision), fixedAmount=cast(? as double precision), rate=cast(? as double precision), method=? WHERE tenantid=? AND id=?; + + basePath: MutationBillingSlab.* + jsonMaps: + + - jsonPath: $.MutationBillingSlab.*.propertyType + + - jsonPath: $.MutationBillingSlab.*.propertySubType + + - jsonPath: $.MutationBillingSlab.*.usageCategoryMajor + + - jsonPath: $.MutationBillingSlab.*.usageCategoryMinor + + - jsonPath: $.MutationBillingSlab.*.usageCategorySubMinor + + - jsonPath: $.MutationBillingSlab.*.usageCategoryDetail + + - jsonPath: $.MutationBillingSlab.*.ownerShipCategory + + - jsonPath: $.MutationBillingSlab.*.subOwnerShipCategory + + - jsonPath: $.MutationBillingSlab.*.minMarketValue + + - jsonPath: $.MutationBillingSlab.*.maxMarketValue + + - jsonPath: $.MutationBillingSlab.*.fixedAmount + + - jsonPath: $.MutationBillingSlab.*.rate + + - jsonPath: $.MutationBillingSlab.*.type + + - jsonPath: $.MutationBillingSlab.*.tenantId + + - jsonPath: $.MutationBillingSlab.*.id diff --git a/configs/egov-persister/pt-persist.yml b/configs/egov-persister/pt-persist.yml new file mode 100644 index 00000000..5efedcc5 --- /dev/null +++ b/configs/egov-persister/pt-persist.yml @@ -0,0 +1,582 @@ +serviceMaps: + serviceName: Property Tax Service + mappings: + - version: 1.0 + name: property tax create + description: create property tax in egpt_property + fromTopic: property-create-validated + queryMaps: + - query: INSERT INTO egpt_property (id,tenantId, upicNumber, oldUpicNumber, vltUpicNumber,creationReason, assessmentDate,occupancyDate, gisRefNo,isAuthorised, isUnderWorkflow, channel, createdBy,lastModifiedBy, createdTime,lastModifiedTime,sequenceNo,demands,oldestUpicNumber)VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?); + basePath: $.properties.* + jsonMaps: + + - jsonPath: $.properties.*.id + + - jsonPath: $.properties.*.tenantId + + - jsonPath: $.properties.*.upicNumber + + - jsonPath: $.properties.*.oldUpicNumber + + - jsonPath: $.properties.*.vltUpicNumber + + - jsonPath: $.properties.*.creationReason + + - jsonPath: $.properties.*.assessmentDate + type: DATE + dbType: DATE + + - jsonPath: $.properties.*.occupancyDate + type: DATE + dbType: DATE + + - jsonPath: $.properties.*.gisRefNo + + - jsonPath: $.properties.*.isAuthorised + type: BOOLEAN + + - jsonPath: $.properties.*.isUnderWorkflow + type: BOOLEAN + + - jsonPath: $.properties.*.channel + + - jsonPath: $.properties.*.auditDetails.createdBy + + - jsonPath: $.properties.*.auditDetails.lastModifiedBy + + - jsonPath: $.properties.*.auditDetails.createdTime + type: LONG + + - jsonPath: $.properties.*.auditDetails.lastModifiedTime + type: LONG + + - jsonPath: $.properties.*.sequenceNo + type: INT + + - jsonPath: $.properties.*.demandsJsonObject + type: JSON + dbType: JSONB + + - jsonPath: $.properties.*.oldestUpicNumber + + - query: INSERT INTO egpt_propertydetails (id, source, regdDocNo, regdDocDate,reason, status, isVerified,verificationDate, isExempted, exemptionReason, propertyType, category, usage,department, apartment, siteLength, siteBreadth, sitalArea,totalBuiltupArea, undividedShare, noOfFloors, isSuperStructure, landOwner, floorType,woodType, roofType, wallType, stateId, applicationNo, createdBy, lastModifiedBy,createdTime, lastModifiedTime, property, taxCalculations,factors,assessmentDates,builderDetails,bpaNo,bpaDate,subUsage)VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?); + basePath: $.properties.*.propertyDetail + jsonMaps: + - jsonPath: $.properties.*.propertyDetail.id + + - jsonPath: $.properties.*.propertyDetail.source + + - jsonPath: $.properties.*.propertyDetail.regdDocNo + + - jsonPath: $.properties.*.propertyDetail.regdDocDate + type: DATE + dbType: DATE + + - jsonPath: $.properties.*.propertyDetail.reason + + - jsonPath: $.properties.*.propertyDetail.status + + - jsonPath: $.properties.*.propertyDetail.isVerified + type: BOOLEAN + + - jsonPath: $.properties.*.propertyDetail.verificationDate + type: DATE + dbType: DATE + + - jsonPath: $.properties.*.propertyDetail.isExempted + type: BOOLEAN + + - jsonPath: $.properties.*.propertyDetail.exemptionReason + + - jsonPath: $.properties.*.propertyDetail.propertyType + + - jsonPath: $.properties.*.propertyDetail.category + + - jsonPath: $.properties.*.propertyDetail.usage + + - jsonPath: $.properties.*.propertyDetail.department + + - jsonPath: $.properties.*.propertyDetail.apartment + + - jsonPath: $.properties.*.propertyDetail.siteLength + type: DOUBLE + + - jsonPath: $.properties.*.propertyDetail.siteBreadth + type: DOUBLE + + - jsonPath: $.properties.*.propertyDetail.sitalArea + type: DOUBLE + + - jsonPath: $.properties.*.propertyDetail.totalBuiltupArea + type: DOUBLE + + - jsonPath: $.properties.*.propertyDetail.undividedShare + type: DOUBLE + + - jsonPath: $.properties.*.propertyDetail.noOfFloors + type: LONG + + - jsonPath: $.properties.*.propertyDetail.isSuperStructure + type: BOOLEAN + + - jsonPath: $.properties.*.propertyDetail.landOwner + + - jsonPath: $.properties.*.propertyDetail.floorType + + - jsonPath: $.properties.*.propertyDetail.woodType + + - jsonPath: $.properties.*.propertyDetail.roofType + + - jsonPath: $.properties.*.propertyDetail.wallType + + - jsonPath: $.properties.*.propertyDetail.stateId + + - jsonPath: $.properties.*.propertyDetail.applicationNo + + - jsonPath: $.properties.*.propertyDetail.auditDetails.createdBy + + - jsonPath: $.properties.*.propertyDetail.auditDetails.lastModifiedBy + + - jsonPath: $.properties.*.propertyDetail.auditDetails.createdTime + type: LONG + + - jsonPath: $.properties.*.propertyDetail.auditDetails.lastModifiedTime + type: LONG + + - jsonPath: $.properties.*.id + + - jsonPath: $.properties.*.propertyDetail.taxCalculations + type: JSON + dbType: JSONB + + - jsonPath: $.properties.*.propertyDetail.factors + type: JSON + dbType: JSONB + + - jsonPath: $.properties.*.propertyDetail.assessmentDates + type: JSON + dbType: JSONB + + - jsonPath: $.properties.*.propertyDetail.builderDetails + type: JSON + dbType: JSONB + + - jsonPath: $.properties.*.propertyDetail.bpaNo + + - jsonPath: $.properties.*.propertyDetail.bpaDate + + - jsonPath: $.properties.*.propertyDetail.subUsage + + + - query: INSERT INTO egpt_Address (id, tenantId, latitude, longitude, addressNumber, addressLine1, addressLine2, landmark, city, pincode, detail,createdBy, lastModifiedBy, createdTime, lastModifiedTime, property, surveyNo, plotNo )VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?); + basePath: $.properties.*.address + jsonMaps: + + - jsonPath: $.properties.*.address.id + + - jsonPath: $.properties.*.address.tenantId + + - jsonPath: $.properties.*.address.latitude + type: DOUBLE + + - jsonPath: $.properties.*.address.longitude + type: DOUBLE + + - jsonPath: $.properties.*.address.addressNumber + + - jsonPath: $.properties.*.address.addressLine1 + + - jsonPath: $.properties.*.address.addressLine2 + + - jsonPath: $.properties.*.address.landmark + + - jsonPath: $.properties.*.address.city + + - jsonPath: $.properties.*.address.pincode + + - jsonPath: $.properties.*.address.detail + + - jsonPath: $.properties.*.address.auditDetails.createdBy + + - jsonPath: $.properties.*.address.auditDetails.lastModifiedBy + + - jsonPath: $.properties.*.address.auditDetails.createdTime + type: LONG + + - jsonPath: $.properties.*.address.auditDetails.lastModifiedTime + type: LONG + + - jsonPath: $.properties.*.id + type: LONG + + - jsonPath: $.properties.*.address.surveyNo + + - jsonPath: $.properties.*.address.plotNo + + + - query: INSERT INTO egpt_floors (id,floorNo,createdBy, lastModifiedBy, createdTime, lastModifiedTime, propertydetails)VALUES(?,?,?,?,?,?,?); + basePath: $.properties.*.propertyDetail.floors.* + jsonMaps: + + - jsonPath: $.properties.*.propertyDetail.floors.*.id + + - jsonPath: $.properties.*.propertyDetail.floors.*.floorNo + + - jsonPath: $.properties.*.propertyDetail.floors.*.auditDetails.createdBy + + - jsonPath: $.properties.*.propertyDetail.floors.*.auditDetails.lastModifiedBy + + - jsonPath: $.properties.*.propertyDetail.floors.*.auditDetails.createdTime + type: LONG + + - jsonPath: $.properties.*.propertyDetail.floors.*.auditDetails.lastModifiedTime + type: LONG + + - jsonPath: $.properties.*.propertyDetail[?( {id} in @.floors[*].id)].id + + - query: INSERT INTO egpt_unit (id, unitNo, unitType, length,width,builtupArea,assessableArea,bpaBuiltupArea,bpaNo,bpaDate,usage,occupancytype,occupierName,firmName,rentCollected, structure, age,exemptionReason, isStructured, occupancyDate, constCompletionDate, manualArv, arv,electricMeterNo, waterMeterNo, createdBy, lastModifiedBy, createdTime, lastModifiedTime,floor,isAuthorised,constructionStartDate,landCost,buildingCost,subusage,carpetArea,exemptionArea,rv) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?); + basePath: $.properties.*.propertyDetail.floors.*.units.* + jsonMaps: + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.id + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.unitNo + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.unitType + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.length + type: DOUBLE + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.width + type: DOUBLE + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.builtupArea + type: DOUBLE + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.assessableArea + type: DOUBLE + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.bpaBuiltupArea + type: DOUBLE + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.bpaNo + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.bpaDate + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.usage + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.occupancyType + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.occupierName + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.firmName + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.rentCollected + type: DOUBLE + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.structure + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.age + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.exemptionReason + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.isStructured + type: BOOLEAN + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.occupancyDate + type: DATE + dbType: DATE + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.constCompletionDate + type: DATE + dbType: DATE + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.manualArv + type: DOUBLE + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.arv + type: DOUBLE + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.electricMeterNo + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.waterMeterNo + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.auditDetails.createdBy + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.auditDetails.lastModifiedBy + type: LONG + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.auditDetails.createdTime + type: LONG + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.auditDetails.lastModifiedTime + type: LONG + + - jsonPath: $.properties.*.propertyDetail.floors[?( {id} in @.units[*].id)].id + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.isAuthorised + type: BOOLEAN + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.constructionStartDate + type: DATE + dbType: DATE + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.landCost + type: DOUBLE + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.buildingCost + type: DOUBLE + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.subUsage + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.carpetArea + type: DOUBLE + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.exemptionArea + type: DOUBLE + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.rv + type: DOUBLE + + - query: INSERT INTO egpt_unit (id, unitNo, unitType, length,width,builtupArea,assessableArea,bpaBuiltupArea,bpaNo,bpaDate,usage,occupancytype,occupierName,firmName,rentCollected, structure, age,exemptionReason, isStructured, occupancyDate, constCompletionDate, manualArv, arv,electricMeterNo, waterMeterNo, createdBy, lastModifiedBy, createdTime, lastModifiedTime,floor,parentid,isAuthorised,constructionStartDate,landCost,buildingCost,subusage,carpetArea,exemptionArea,rv) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?); + basePath: $.properties.*.propertyDetail.floors.*.units.*.units.* + jsonMaps: + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.id + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.unitNo + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.unitType + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.length + type: DOUBLE + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.width + type: DOUBLE + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.builtupArea + type: DOUBLE + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.assessableArea + type: DOUBLE + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.bpaBuiltupArea + type: DOUBLE + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.bpaNo + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.bpaDate + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.usage + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.occupancyType + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.occupierName + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.firmName + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.rentCollected + type: DOUBLE + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.structure + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.age + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.exemptionReason + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.isStructured + type: BOOLEAN + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.occupancyDate + type: DATE + dbType: DATE + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.constCompletionDate + type: DATE + dbType: DATE + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.manualArv + type: DOUBLE + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.arv + type: DOUBLE + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.electricMeterNo + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.waterMeterNo + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.auditDetails.createdBy + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.auditDetails.lastModifiedBy + type: LONG + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.auditDetails.createdTime + type: LONG + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.auditDetails.lastModifiedTime + type: LONG + + - jsonPath: $.properties.*.propertyDetail.floors[?( {id} in @.units[*].id)].id + + - jsonPath: $.properties.*.propertyDetail.floors.*.units[?( {id} in @.units[*].id)].id + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.isAuthorised + type: BOOLEAN + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.constructionStartDate + type: DATE + dbType: DATE + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.landCost + type: DOUBLE + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.buildingCost + type: DOUBLE + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.subUsage + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.carpetArea + type: DOUBLE + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.exemptionArea + type: DOUBLE + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.rv + type: DOUBLE + + - query: INSERT INTO egpt_document (id, fileStore, createdBy, lastModifiedBy, createdTime, lastModifiedTime,propertydetails,documenttype) VALUES(?,?,?,?,?,?,?,?); + basePath: $.properties.*.propertyDetail.documents.* + jsonMaps: + + - jsonPath: $.properties.*.propertyDetail.documents.*.id + + - jsonPath: $.properties.*.propertyDetail.documents.*.fileStore + + - jsonPath: $.properties.*.propertyDetail.documents.*.auditDetails.createdBy + + - jsonPath: $.properties.*.propertyDetail.documents.*.auditDetails.lastModifiedBy + + - jsonPath: $.properties.*.propertyDetail.documents.*.auditDetails.createdTime + type: LONG + + - jsonPath: $.properties.*.propertyDetail.documents.*.auditDetails.lastModifiedTime + type: LONG + + - jsonPath: $.properties.*.propertyDetail[?({id} in @.documents[*].id)].id + + - jsonPath: $.properties.*.propertyDetail.documents.*.documentType + + + - query: INSERT INTO egpt_vacantland (id,surveyNumber,pattaNumber, marketValue,capitalValue,layoutApprovedAuth,layoutPermissionNo,layoutPermissionDate, resdPlotArea,nonResdPlotArea,createdBy, lastModifiedBy, createdTime,lastModifiedTime, property) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?); + basePath: $.properties.*.vacantLand + jsonMaps: + + - jsonPath: $.properties.*.vacantLand.id + + - jsonPath: $.properties.*.vacantLand.surveyNumber + + - jsonPath: $.properties.*.vacantLand.pattaNumber + + - jsonPath: $.properties.*.vacantLand.marketValue + type: DOUBLE + + - jsonPath: $.properties.*.vacantLand.capitalValue + type: DOUBLE + + - jsonPath: $.properties.*.vacantLand.layoutApprovedAuth + + - jsonPath: $.properties.*.vacantLand.layoutPermissionNo + + - jsonPath: $.properties.*.vacantLand.layoutPermissionDate + + - jsonPath: $.properties.*.vacantLand.resdPlotArea + type: DOUBLE + + - jsonPath: $.properties.*.vacantLand.nonResdPlotArea + type: DOUBLE + + - jsonPath: $.properties.*.vacantLand.auditDetails.createdBy + + - jsonPath: $.properties.*.vacantLand.auditDetails.lastModifiedBy + + - jsonPath: $.properties.*.vacantLand.auditDetails.createdTime + type: LONG + + - jsonPath: $.properties.*.vacantLand.auditDetails.lastModifiedTime + type: LONG + + - jsonPath: $.properties.*.id + type: LONG + + + - query: INSERT INTO egpt_propertylocation (id,revenueBoundary, locationBoundary, adminBoundary, northBoundedBy,eastBoundedBy, westBoundedBy, southBoundedBy,createdBy, lastModifiedBy, createdTime,lastModifiedTime,property,guidanceValueBoundary) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?); + basePath: $.properties.*.boundary + jsonMaps: + + - jsonPath: $.properties.*.boundary.id + + - jsonPath: $.properties.*.boundary.revenueBoundary.id + type: LONG + + - jsonPath: $.properties.*.boundary.locationBoundary.id + type: LONG + + - jsonPath: $.properties.*.boundary.adminBoundary.id + type: BOOLEAN + + - jsonPath: $.properties.*.boundary.northBoundedBy + + - jsonPath: $.properties.*.boundary.eastBoundedBy + + - jsonPath: $.properties.*.boundary.westBoundedBy + + - jsonPath: $.properties.*.boundary.southBoundedBy + + - jsonPath: $.properties.*.boundary.auditDetails.createdBy + + - jsonPath: $.properties.*.boundary.auditDetails.lastModifiedBy + + - jsonPath: $.properties.*.boundary.auditDetails.createdTime + type: LONG + + - jsonPath: $.properties.*.boundary.auditDetails.lastModifiedTime + type: LONG + + - jsonPath: $.properties.*.id + type: LONG + + - jsonPath: $.properties.*.boundary.guidanceValueBoundary + type: LONG + + - query: INSERT INTO egpt_property_owner (id, owner,property,isPrimaryOwner, isSecondaryOwner,ownerShipPercentage, ownerType,createdBy, lastModifiedBy, createdTime, lastModifiedTime ) VALUES(?,?,?,?,?,?,?,?,?,?,?); + basePath: $.properties.*.owners.* + jsonMaps: + + + - jsonPath: $.properties.*.owners.*.id + + - jsonPath: $.properties.*.owners.*.owner + type: LONG + + - jsonPath: $.properties[?({id} in @.owners[*].id)].id + + - jsonPath: $.properties.*.owners.*.isPrimaryOwner + type: BOOLEAN + + - jsonPath: $.properties.*.owners.*.isSecondaryOwner + type: BOOLEAN + + - jsonPath: $.properties.*.owners.*.ownerShipPercentage + type: DOUBLE + + - jsonPath: $.properties.*.owners.*.ownerType + + - jsonPath: $.properties.*.owners.*.auditDetails.createdBy + + - jsonPath: $.properties.*.owners.*.auditDetails.lastModifiedBy + + - jsonPath: $.properties.*.owners.*.auditDetails.createdTime + type: LONG + + - jsonPath: $.properties.*.owners.*.auditDetails.lastModifiedTime + type: LONG diff --git a/configs/egov-persister/sewerage-persist.yml b/configs/egov-persister/sewerage-persist.yml new file mode 100644 index 00000000..af65cff6 --- /dev/null +++ b/configs/egov-persister/sewerage-persist.yml @@ -0,0 +1,225 @@ +serviceMaps: + serviceName: Sewerage Connection Service + mappings: + - version: 1.0 + name: SewerageConnection + description: create ConnectionDetails in connection and eg_sw_service + fromTopic: save-sw-connection + isTransaction: true + queryMaps: + - query: INSERT INTO eg_sw_connection (id, tenantid, property_id, applicationno, applicationstatus, status, connectionno, oldconnectionno,roadcuttingarea,action,roadtype) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?,?,?); + basePath: $.SewerageConnection + jsonMaps: + - jsonPath: $.SewerageConnection.id + + - jsonPath: $.SewerageConnection.property.tenantId + + - jsonPath: $.SewerageConnection.property.propertyId + + - jsonPath: $.SewerageConnection.applicationNo + + - jsonPath: $.SewerageConnection.applicationStatus + + - jsonPath: $.SewerageConnection.status + + - jsonPath: $.SewerageConnection.connectionNo + + - jsonPath: $.SewerageConnection.oldConnectionNo + + - jsonPath: $.SewerageConnection.roadCuttingArea + + - jsonPath: $.SewerageConnection.processInstance.action + + - jsonPath: $.SewerageConnection.roadType + + - query: INSERT INTO eg_sw_service(connection_id,connectionExecutionDate,noOfWaterClosets,noOfToilets,connectiontype,proposedWaterClosets,proposedToilets, appCreatedDate) VALUES(?,?,?,?,?,?,?, ?); + basePath: $.SewerageConnection + jsonMaps: + + - jsonPath: $.SewerageConnection.id + + - jsonPath: $.SewerageConnection.connectionExecutionDate + + - jsonPath: $.SewerageConnection.noOfWaterClosets + + - jsonPath: $.SewerageConnection.noOfToilets + + - jsonPath: $.SewerageConnection.connectionType + + - jsonPath: $.SewerageConnection.proposedWaterClosets + + - jsonPath: $.SewerageConnection.proposedToilets + + - jsonPath: $.SewerageConnection.additionalDetails.appCreatedDate + + + - version: 1.0 + name: SewerageConnection + description: update ConnectionDetails in connection and eg_sw_service + fromTopic: update-sw-connection + isTransaction: true + queryMaps: + - query: UPDATE eg_sw_connection SET applicationstatus=?, status=?, connectionno=?, oldconnectionno=?, action=?, roadCuttingArea=?, roadType=?, adhocpenalty=?, adhocrebate=?, adhocpenaltyreason=?, adhocpenaltycomment=?, adhocrebatereason=?, adhocrebatecomment=? WHERE id=?; + basePath: $.SewerageConnection + jsonMaps: + + - jsonPath: $.SewerageConnection.applicationStatus + + - jsonPath: $.SewerageConnection.status + + - jsonPath: $.SewerageConnection.connectionNo + + - jsonPath: $.SewerageConnection.oldConnectionNo + + - jsonPath: $.SewerageConnection.processInstance.action + + - jsonPath: $.SewerageConnection.roadCuttingArea + + - jsonPath: $.SewerageConnection.roadType + + - jsonPath: $.SewerageConnection.additionalDetails.adhocPenalty + + - jsonPath: $.SewerageConnection.additionalDetails.adhocRebate + + - jsonPath: $.SewerageConnection.additionalDetails.adhocPenaltyReason + + - jsonPath: $.SewerageConnection.additionalDetails.adhocPenaltyComment + + - jsonPath: $.SewerageConnection.additionalDetails.adhocRebateReason + + - jsonPath: $.SewerageConnection.additionalDetails.adhocRebateComment + + - jsonPath: $.SewerageConnection.id + + - query: UPDATE eg_sw_service SET connectionexecutiondate=?, noOfWaterClosets=?, noOfToilets=?, connectiontype=?, proposedWaterClosets=?, proposedToilets=?, detailsprovidedby = ?, estimationfileStoreId = ?, sanctionfileStoreId = ? WHERE connection_id=?; + basePath: $.SewerageConnection + jsonMaps: + + - jsonPath: $.SewerageConnection.connectionExecutionDate + + - jsonPath: $.SewerageConnection.noOfWaterClosets + + - jsonPath: $.SewerageConnection.noOfToilets + + - jsonPath: $.SewerageConnection.connectionType + + - jsonPath: $.SewerageConnection.proposedWaterClosets + + - jsonPath: $.SewerageConnection.proposedToilets + + - jsonPath: $.SewerageConnection.additionalDetails.detailsProvidedBy + + - jsonPath: $.SewerageConnection.additionalDetails.estimationFileStoreId + + - jsonPath: $.SewerageConnection.additionalDetails.sanctionFileStoreId + + - jsonPath: $.SewerageConnection.id + + + - query: INSERT INTO eg_sw_applicationDocument(id, tenantId, documenttype, filestoreid, swid, active, createdBy, lastModifiedBy, createdTime, lastModifiedTime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET active = ?, documenttype =?, filestoreid =?,lastmodifiedby =?, lastmodifiedtime =?; + basePath: $.SewerageConnection.documents.* + jsonMaps: + + - jsonPath: $.SewerageConnection.documents.*.id + + - jsonPath: $.SewerageConnection.property.tenantId + + - jsonPath: $.SewerageConnection.documents.*.documentType + + - jsonPath: $.SewerageConnection.documents.*.fileStoreId + + - jsonPath: $.SewerageConnection.id + + - jsonPath: $.SewerageConnection.documents.*.status + + - jsonPath: $.SewerageConnection.documents.*.auditDetails.createdBy + + - jsonPath: $.SewerageConnection.documents.*.auditDetails.lastModifiedBy + + - jsonPath: $.SewerageConnection.documents.*.auditDetails.createdTime + + - jsonPath: $.SewerageConnection.documents.*.auditDetails.lastModifiedTime + + - jsonPath: $.SewerageConnection.documents.*.status + + - jsonPath: $.SewerageConnection.documents.*.documentType + + - jsonPath: $.SewerageConnection.documents.*.fileStoreId + + - jsonPath: $.SewerageConnection.documents.*.auditDetails.lastModifiedBy + + - jsonPath: $.SewerageConnection.documents.*.auditDetails.lastModifiedTime + + - query: INSERT INTO eg_sw_plumberinfo(id, name, licenseno, mobilenumber, gender, fatherorhusbandname, correspondenceaddress, relationship, swid) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET name =?, licenseno =?,mobilenumber =?, gender =?, fatherorhusbandname =?, correspondenceaddress =?, relationship=?; + basePath: $.SewerageConnection.plumberInfo.* + jsonMaps: + + - jsonPath: $.SewerageConnection.plumberInfo.*.id + + - jsonPath: $.SewerageConnection.plumberInfo.*.name + + - jsonPath: $.SewerageConnection.plumberInfo.*.licenseNo + + - jsonPath: $.SewerageConnection.plumberInfo.*.mobileNumber + + - jsonPath: $.SewerageConnection.plumberInfo.*.gender + + - jsonPath: $.SewerageConnection.plumberInfo.*.fatherOrHusbandName + + - jsonPath: $.SewerageConnection.plumberInfo.*.correspondenceAddress + + - jsonPath: $.SewerageConnection.plumberInfo.*.relationship + + - jsonPath: $.SewerageConnection.id + + - jsonPath: $.SewerageConnection.plumberInfo.*.name + + - jsonPath: $.SewerageConnection.plumberInfo.*.licenseNo + + - jsonPath: $.SewerageConnection.plumberInfo.*.mobileNumber + + - jsonPath: $.SewerageConnection.plumberInfo.*.gender + + - jsonPath: $.SewerageConnection.plumberInfo.*.fatherOrHusbandName + + - jsonPath: $.SewerageConnection.plumberInfo.*.correspondenceAddress + + - jsonPath: $.SewerageConnection.plumberInfo.*.relationship + + + + - version: 1.0 + name: SewerageConnection + description: update ConnectionDetails in eg_sw_connection and eg_sw_service + fromTopic: update-sw-workflow + isTransaction: true + queryMaps: + - query: UPDATE eg_sw_connection SET applicationstatus=?, status=?, connectionno=?, action=? WHERE id=?; + basePath: $.SewerageConnection + jsonMaps: + + - jsonPath: $.SewerageConnection.applicationStatus + + - jsonPath: $.SewerageConnection.status + + - jsonPath: $.SewerageConnection.connectionNo + + - jsonPath: $.SewerageConnection.processInstance.action + + - jsonPath: $.SewerageConnection.id + + - version: 1.0 + name: SewerageConnection + description: save filestore ids + fromTopic: save-sw-filestoreids + isTransaction: true + queryMaps: + - query: UPDATE eg_sw_service SET estimationfileStoreId = ?, sanctionfileStoreId = ? WHERE connection_id=?; + basePath: $.SewerageConnection + jsonMaps: + + - jsonPath: $.SewerageConnection.additionalDetails.estimationFileStoreId + + - jsonPath: $.SewerageConnection.additionalDetails.sanctionFileStoreId + + - jsonPath: $.SewerageConnection.id diff --git a/configs/egov-persister/tradelicense-persister-bpachanges.yml b/configs/egov-persister/tradelicense-persister-bpachanges.yml new file mode 100644 index 00000000..e772d467 --- /dev/null +++ b/configs/egov-persister/tradelicense-persister-bpachanges.yml @@ -0,0 +1,843 @@ +serviceMaps: + serviceName: tl-services + mappings: + - version: 1.0 + description: Persists tradeLicense details in EG_TL_TradeLicense table + fromTopic: save-tl-tradelicense + isTransaction: true + queryMaps: + + - query: INSERT INTO eg_tl_tradelicense( id, accountid,tenantid,tradeName, validfrom,validto,licensetype,applicationNumber, licenseNumber, oldlicensenumber, propertyid, oldpropertyid, applicationdate, commencementdate, financialyear, action, status, createdby, lastmodifiedby, createdtime, lastmodifiedtime, businessservice, applicationtype, workflowcode) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: Licenses.* + jsonMaps: + - jsonPath: $.Licenses.*.id + + - jsonPath: $.Licenses.*.accountId + + - jsonPath: $.Licenses.*.tenantId + + - jsonPath: $.Licenses.*.tradeName + + - jsonPath: $.Licenses.*.validFrom + + - jsonPath: $.Licenses.*.validTo + + - jsonPath: $.Licenses.*.licenseType + + - jsonPath: $.Licenses.*.applicationNumber + + - jsonPath: $.Licenses.*.licenseNumber + + - jsonPath: $.Licenses.*.oldLicenseNumber + + - jsonPath: $.Licenses.*.propertyId + + - jsonPath: $.Licenses.*.oldPropertyId + + - jsonPath: $.Licenses.*.applicationDate + + - jsonPath: $.Licenses.*.commencementDate + + - jsonPath: $.Licenses.*.financialYear + + - jsonPath: $.Licenses.*.action + + - jsonPath: $.Licenses.*.status + + - jsonPath: $.Licenses.*.auditDetails.createdBy + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy + + - jsonPath: $.Licenses.*.auditDetails.createdTime + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime + + - jsonPath: $.Licenses.*.businessService + + - jsonPath: $.Licenses.*.applicationType + + - jsonPath: $.Licenses.*.workflowCode + + + - query: INSERT INTO eg_tl_tradelicensedetail( id, surveyno, subownershipcategory, channel, additionaldetail, tradelicenseid,structureType,operationalArea,noOfEmployees,adhocExemption,adhocPenalty,adhocExemptionReason,adhocPenaltyReason, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?, ?, ?, ?); + basePath: Licenses.*.tradeLicenseDetail + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.id + + - jsonPath: $.Licenses.*.tradeLicenseDetail.surveyNo + + - jsonPath: $.Licenses.*.tradeLicenseDetail.subOwnerShipCategory + + - jsonPath: $.Licenses.*.tradeLicenseDetail.channel + + - jsonPath: $.Licenses.*.tradeLicenseDetail.additionalDetail + type: JSON + dbType: JSONB + + - jsonPath: $.Licenses.*.id + + - jsonPath: $.Licenses.*.tradeLicenseDetail.structureType + + - jsonPath: $.Licenses.*.tradeLicenseDetail.operationalArea + + - jsonPath: $.Licenses.*.tradeLicenseDetail.noOfEmployees + + - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocExemption + + - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocPenalty + + - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocExemptionReason + + - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocPenaltyReason + + - jsonPath: $.Licenses.*.auditDetails.createdBy + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy + + - jsonPath: $.Licenses.*.auditDetails.createdTime + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime + + + + - query: INSERT INTO eg_tl_tradeunit( id, tenantid,active, tradetype, uom, uomvalue, tradelicensedetailid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?,?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: Licenses.*.tradeLicenseDetail.tradeUnits.* + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.id + + - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.tenantId + + - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.active + + - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.tradeType + + - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.uom + + - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.uomValue + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].tradeLicenseDetail.id + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.createdBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.createdTime + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.lastModifiedTime + + + + - query: INSERT INTO eg_tl_accessory( id, tenantid,active, accessoryCategory, uom, uomvalue, count, tradelicensedetailid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?,?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: Licenses.*.tradeLicenseDetail.accessories.* + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.id + + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.tenantId + + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.active + + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.accessoryCategory + + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.uom + + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.uomValue + + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.count + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].tradeLicenseDetail.id + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.createdBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.createdTime + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.lastModifiedTime + + + - query: INSERT INTO eg_tl_owner( id,tenantid,active,institutionid, tradelicensedetailid, isprimaryowner, ownertype, ownershippercentage, relationship, createdby,lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: Licenses.*.tradeLicenseDetail.owners.* + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.uuid + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.tenantId + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.userActive + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.institutionId + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].tradeLicenseDetail.id + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.isPrimaryOwner + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.ownerType + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.ownerShipPercentage + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.relationship + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.createdBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.createdTime + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.lastModifiedTime + + + + - query: INSERT INTO eg_tl_document_owner(id,tenantId,userid,active, tradeLicenseDetailId, documenttype, fileStoreId,documentuid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ? ,? ,?, ?, ?, ?, ?, ?, ?, ?); + basePath: Licenses.*.tradeLicenseDetail.owners.*.documents.* + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.id + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].tenantId + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners[*][?({id} in @.documents[*].id)].uuid + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.active + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].tradeLicenseDetail.id + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.documentType + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.fileStoreId + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.documentUid + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.createdBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.createdTime + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.lastModifiedTime + + + + - query: INSERT INTO eg_tl_applicationdocument( id, tenantid, active, documenttype, tradecategorydetail, filestoreid, tradelicensedetailid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: Licenses.*.tradeLicenseDetail.applicationDocuments.* + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.id + + - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.tenantId + + - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.active + + - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.documentType + + - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.tradecategorydetail + + - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.fileStoreId + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].tradeLicenseDetail.id + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.createdBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.createdTime + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.lastModifiedTime + + + - query: INSERT INTO eg_tl_address( id, tenantid, doorno,street,buildingName, latitude,longitude, addressid, addressnumber,locality, type, addressline1, addressline2, landmark, city, pincode, detail, tradelicensedetailid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: Licenses.*.tradeLicenseDetail.address + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.id + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.tenantId + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.doorNo + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.street + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.buildingName + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.latitude + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.longitude + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.addressId + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.addressNumber + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.locality.code + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.type + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.addressLine1 + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.addressline2 + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.landmark + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.city + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.pincode + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.detail + + - jsonPath: $.Licenses.*.tradeLicenseDetail.id + + - jsonPath: $.Licenses.*.auditDetails.createdBy + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy + + - jsonPath: $.Licenses.*.auditDetails.createdTime + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime + + + - query: INSERT INTO eg_tl_institution(tenantId,active,id,instituionName,contactNo,organisationRegistrationNo,address, tradelicensedetailid, name, type,designation, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ; + basePath: Licenses.*.tradeLicenseDetail.institution + jsonMaps: + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.tenantId + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.active + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.id + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.instituionName + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.contactNo + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.organisationRegistrationNo + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.address + + - jsonPath: $.Licenses.*.tradeLicenseDetail.id + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.name + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.type + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.designation + + - jsonPath: $.Licenses.*.auditDetails.createdBy + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy + + - jsonPath: $.Licenses.*.auditDetails.createdTime + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime + + + + + + + - version: 1.0 + description: Update tradeLicense details in EG_TL_TradeLicense table + fromTopic: update-tl-tradelicense + isTransaction: true + queryMaps: + + + - query: INSERT INTO eg_tl_tradelicense_audit SELECT * FROM eg_tl_tradelicense WHERE id = ?; + basePath: Licenses.* + jsonMaps: + - jsonPath: $.Licenses.*.id + + + - query: UPDATE eg_tl_tradelicense SET tradeName = ?,licenseNumber = ?,licensetype = ?, oldlicensenumber = ?, propertyid = ?, oldpropertyid = ?, commencementdate = ?, issueddate = ?, financialyear = ?, validfrom = ?, validto = ?, action = ?, status = ?, lastmodifiedby = ?, lastmodifiedtime = ?, businessservice = ?, applicationtype = ?, workflowcode = ? WHERE id=?; + basePath: Licenses.* + jsonMaps: + - jsonPath: $.Licenses.*.tradeName + + - jsonPath: $.Licenses.*.licenseNumber + + - jsonPath: $.Licenses.*.licenseType + + - jsonPath: $.Licenses.*.oldLicenseNumber + + - jsonPath: $.Licenses.*.propertyId + + - jsonPath: $.Licenses.*.oldPropertyId + + - jsonPath: $.Licenses.*.commencementDate + + - jsonPath: $.Licenses.*.issuedDate + + - jsonPath: $.Licenses.*.financialYear + + - jsonPath: $.Licenses.*.validFrom + + - jsonPath: $.Licenses.*.validTo + + - jsonPath: $.Licenses.*.action + + - jsonPath: $.Licenses.*.status + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime + + - jsonPath: $.Licenses.*.businessService + + - jsonPath: $.Licenses.*.applicationType + + - jsonPath: $.Licenses.*.workflowCode + + - jsonPath: $.Licenses.*.id + + - query: INSERT INTO eg_tl_tradelicensedetail_audit SELECT * FROM eg_tl_tradelicensedetail WHERE id = ?; + basePath: Licenses.*.tradeLicenseDetail + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.id + + + + - query: UPDATE eg_tl_tradelicensedetail SET surveyno = ?, subownershipcategory = ?, channel = ?, additionaldetail = ?,operationalArea = ?,noOfEmployees = ?,structureType = ?,adhocExemption = ?,adhocPenalty = ?,adhocExemptionReason = ?,adhocPenaltyReason = ?,lastmodifiedby = ?, lastmodifiedtime = ? WHERE id = ?; + basePath: Licenses.*.tradeLicenseDetail + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.surveyNo + + - jsonPath: $.Licenses.*.tradeLicenseDetail.subOwnerShipCategory + + - jsonPath: $.Licenses.*.tradeLicenseDetail.channel + + - jsonPath: $.Licenses.*.tradeLicenseDetail.additionalDetail + type: JSON + dbType: JSONB + + - jsonPath: $.Licenses.*.tradeLicenseDetail.operationalArea + + - jsonPath: $.Licenses.*.tradeLicenseDetail.noOfEmployees + + - jsonPath: $.Licenses.*.tradeLicenseDetail.structureType + + - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocExemption + + - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocPenalty + + - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocExemptionReason + + - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocPenaltyReason + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime + + - jsonPath: $.Licenses.*.tradeLicenseDetail.id + + + - query: INSERT INTO eg_tl_tradeunit(id, tenantid, active, tradetype, uom, uomvalue, tradelicensedetailid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET active = ?, tradetype = ?, uom = ?, uomvalue = ?, lastmodifiedby = ?, lastmodifiedtime = ?; + basePath: Licenses.*.tradeLicenseDetail.tradeUnits.* + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.id + + - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.tenantId + + - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.active + + - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.tradeType + + - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.uom + + - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.uomValue + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].tradeLicenseDetail.id + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.createdBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.createdTime + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.lastModifiedTime + + - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.active + + - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.tradeType + + - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.uom + + - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.uomValue + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.lastModifiedTime + + + - query: INSERT INTO eg_tl_accessory(id, tenantid, active, accessoryCategory, uom, uomvalue, count, tradelicensedetailid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET active = ?,accessoryCategory = ?, uom = ?, uomvalue = ?,count =?, lastmodifiedby = ?, lastmodifiedtime = ?; + basePath: Licenses.*.tradeLicenseDetail.accessories.* + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.id + + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.tenantId + + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.active + + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.accessoryCategory + + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.uom + + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.uomValue + + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.count + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].tradeLicenseDetail.id + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.createdBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.createdTime + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.lastModifiedTime + + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.active + + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.accessoryCategory + + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.uom + + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.uomValue + + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.count + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.lastModifiedTime + + + + - query: INSERT INTO eg_tl_owner( id, tenantid, active, tradelicensedetailid, isprimaryowner, ownertype, ownershippercentage, relationship, createdby,lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT ON CONSTRAINT pk_eg_tl_owner DO UPDATE SET active = ?, isprimaryowner = ?, ownertype = ?, ownershippercentage = ?, relationship = ?, lastmodifiedby = ?, lastmodifiedtime = ?; + basePath: Licenses.*.tradeLicenseDetail.owners.* + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.uuid + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.tenantId + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.userActive + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].tradeLicenseDetail.id + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.isPrimaryOwner + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.ownerType + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.ownerShipPercentage + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.relationship + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.createdBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.createdTime + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.lastModifiedTime + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.userActive + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.isPrimaryOwner + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.ownerType + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.ownerShipPercentage + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.relationship + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.lastModifiedTime + + + - query: INSERT INTO eg_tl_document_owner(id,tenantId,active,userid, tradeLicenseDetailId, documenttype, fileStoreId,documentuid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT ON CONSTRAINT pk_eg_tl_document_owner DO UPDATE SET active = ?, documenttype = ?, fileStoreId = ?,documentuid = ?, lastmodifiedby = ?, lastmodifiedtime = ?; + basePath: Licenses.*.tradeLicenseDetail.owners.*.documents.* + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.id + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].tenantId + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.active + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners[*][?({id} in @.documents[*].id)].uuid + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].tradeLicenseDetail.id + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.documentType + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.fileStoreId + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.documentUid + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.createdBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.createdTime + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.lastModifiedTime + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.active + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.documentType + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.fileStoreId + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.documentUid + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.lastModifiedTime + + + + - query: INSERT INTO eg_tl_applicationdocument( id, tenantid, active, documenttype, tradecategorydetail, filestoreid, tradelicensedetailid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET active = ?, documenttype =?, tradecategorydetail =?, filestoreid =?,lastmodifiedby =?, lastmodifiedtime =?; + basePath: Licenses.*.tradeLicenseDetail.applicationDocuments.* + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.id + + - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.tenantId + + - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.active + + - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.documentType + + - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.tradecategorydetail + + - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.fileStoreId + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].tradeLicenseDetail.id + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.createdBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.createdTime + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.lastModifiedTime + + - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.active + + - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.documentType + + - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.tradecategorydetail + + - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.fileStoreId + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.lastModifiedTime + + + + - query: UPDATE eg_tl_address SET doorno =?,street = ?,buildingName = ?, latitude =?, longitude =?, addressid =?, addressnumber =?,locality =?, type =?, addressline1 =?, addressline2 =?, landmark =?, city =?, pincode =?, detail =?,lastmodifiedby =?, lastmodifiedtime =? WHERE id =?; + basePath: Licenses.*.tradeLicenseDetail.address + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.doorNo + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.street + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.buildingName + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.latitude + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.longitude + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.addressId + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.addressNumber + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.locality.code + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.type + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.addressline1 + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.addressline2 + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.landmark + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.city + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.pincode + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.detail + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.id + + + - query: INSERT INTO eg_tl_institution(tenantId, active, id, instituionName, contactNo, organisationRegistrationNo, address, tradelicensedetailid, name, type,designation, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET active = ?,name = ?,type = ?,designation = ?, lastmodifiedby = ?,lastmodifiedtime = ?, instituionName = ?, contactNo = ?, organisationRegistrationNo = ?, address = ?; + basePath: Licenses.*.tradeLicenseDetail.institution + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.tenantId + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.active + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.id + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.instituionName + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.contactNo + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.organisationRegistrationNo + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.address + + - jsonPath: $.Licenses.*.tradeLicenseDetail.id + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.name + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.type + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.designation + + - jsonPath: $.Licenses.*.auditDetails.createdBy + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy + + - jsonPath: $.Licenses.*.auditDetails.createdTime + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.active + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.name + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.type + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.designation + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.instituionName + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.contactNo + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.organisationRegistrationNo + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.address + + + + + - version: 1.0 + description: Persists tradeLicense details in EG_TL_TradeLicense table + fromTopic: update-tl-workflow + isTransaction: true + queryMaps: + + - query: INSERT INTO eg_tl_tradelicense_audit SELECT * FROM eg_tl_tradelicense WHERE id = ?; + basePath: Licenses.* + jsonMaps: + - jsonPath: $.Licenses.*.id + + + + - query: INSERT INTO eg_tl_tradelicensedetail_audit SELECT * FROM eg_tl_tradelicensedetail WHERE id = ?; + basePath: Licenses.*.tradeLicenseDetail + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.id + + + + - query: INSERT INTO eg_tl_verificationdocument( id, tenantid, active, documenttype, tradecategorydetail, filestoreid,tradelicensedetailid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET active = ?,documenttype =?, tradecategorydetail =?, filestoreid =?, lastmodifiedby =?, lastmodifiedtime =?; + basePath: Licenses.*.tradeLicenseDetail.verificationDocuments.* + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.id + + - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.tenantId + + - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.active + + - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.documentType + + - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.tradecategorydetail + + - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.fileStoreId + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.verificationDocuments[*].id)].tradeLicenseDetail.id + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.verificationDocuments[*].id)].auditDetails.createdBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.verificationDocuments[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.verificationDocuments[*].id)].auditDetails.createdTime + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.verificationDocuments[*].id)].auditDetails.lastModifiedTime + + - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.active + + - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.documentType + + - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.tradecategorydetail + + - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.fileStoreId + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.verificationDocuments[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.verificationDocuments[*].id)].auditDetails.lastModifiedTime + + + - query: UPDATE eg_tl_tradelicense SET validfrom = ?,validto = ?,licenseNumber =?, issueddate = ?, action = ?, status = ?, lastmodifiedby = ?, lastmodifiedtime = ? WHERE id=?; + basePath: Licenses.* + jsonMaps: + - jsonPath: $.Licenses.*.validFrom + + - jsonPath: $.Licenses.*.validTo + + - jsonPath: $.Licenses.*.licenseNumber + + - jsonPath: $.Licenses.*.issuedDate + + - jsonPath: $.Licenses.*.action + + - jsonPath: $.Licenses.*.status + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime + + - jsonPath: $.Licenses.*.id + + + - query: UPDATE eg_tl_tradelicensedetail SET additionaldetail = ?,lastmodifiedby = ?, lastmodifiedtime = ? WHERE id = ?; + basePath: Licenses.*.tradeLicenseDetail + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.additionalDetail + type: JSON + dbType: JSONB + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime + + - jsonPath: $.Licenses.*.tradeLicenseDetail.id + + + + - version: 1.0 + description: Update adhocDetails + fromTopic: update-tl-adhoc-tradelicense + isTransaction: true + queryMaps: + + + - query: UPDATE eg_tl_tradelicensedetail SET adhocExemption = ?,adhocPenalty = ?,adhocExemptionReason = ?,adhocPenaltyReason = ?,lastmodifiedby = ?, lastmodifiedtime = ? WHERE id = ?; + basePath: Licenses.*.tradeLicenseDetail + jsonMaps: + + - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocExemption + + - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocPenalty + + - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocExemptionReason + + - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocPenaltyReason + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime + + - jsonPath: $.Licenses.*.tradeLicenseDetail.id diff --git a/configs/egov-persister/tradelicense.yml b/configs/egov-persister/tradelicense.yml new file mode 100644 index 00000000..e772d467 --- /dev/null +++ b/configs/egov-persister/tradelicense.yml @@ -0,0 +1,843 @@ +serviceMaps: + serviceName: tl-services + mappings: + - version: 1.0 + description: Persists tradeLicense details in EG_TL_TradeLicense table + fromTopic: save-tl-tradelicense + isTransaction: true + queryMaps: + + - query: INSERT INTO eg_tl_tradelicense( id, accountid,tenantid,tradeName, validfrom,validto,licensetype,applicationNumber, licenseNumber, oldlicensenumber, propertyid, oldpropertyid, applicationdate, commencementdate, financialyear, action, status, createdby, lastmodifiedby, createdtime, lastmodifiedtime, businessservice, applicationtype, workflowcode) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: Licenses.* + jsonMaps: + - jsonPath: $.Licenses.*.id + + - jsonPath: $.Licenses.*.accountId + + - jsonPath: $.Licenses.*.tenantId + + - jsonPath: $.Licenses.*.tradeName + + - jsonPath: $.Licenses.*.validFrom + + - jsonPath: $.Licenses.*.validTo + + - jsonPath: $.Licenses.*.licenseType + + - jsonPath: $.Licenses.*.applicationNumber + + - jsonPath: $.Licenses.*.licenseNumber + + - jsonPath: $.Licenses.*.oldLicenseNumber + + - jsonPath: $.Licenses.*.propertyId + + - jsonPath: $.Licenses.*.oldPropertyId + + - jsonPath: $.Licenses.*.applicationDate + + - jsonPath: $.Licenses.*.commencementDate + + - jsonPath: $.Licenses.*.financialYear + + - jsonPath: $.Licenses.*.action + + - jsonPath: $.Licenses.*.status + + - jsonPath: $.Licenses.*.auditDetails.createdBy + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy + + - jsonPath: $.Licenses.*.auditDetails.createdTime + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime + + - jsonPath: $.Licenses.*.businessService + + - jsonPath: $.Licenses.*.applicationType + + - jsonPath: $.Licenses.*.workflowCode + + + - query: INSERT INTO eg_tl_tradelicensedetail( id, surveyno, subownershipcategory, channel, additionaldetail, tradelicenseid,structureType,operationalArea,noOfEmployees,adhocExemption,adhocPenalty,adhocExemptionReason,adhocPenaltyReason, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?, ?, ?, ?); + basePath: Licenses.*.tradeLicenseDetail + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.id + + - jsonPath: $.Licenses.*.tradeLicenseDetail.surveyNo + + - jsonPath: $.Licenses.*.tradeLicenseDetail.subOwnerShipCategory + + - jsonPath: $.Licenses.*.tradeLicenseDetail.channel + + - jsonPath: $.Licenses.*.tradeLicenseDetail.additionalDetail + type: JSON + dbType: JSONB + + - jsonPath: $.Licenses.*.id + + - jsonPath: $.Licenses.*.tradeLicenseDetail.structureType + + - jsonPath: $.Licenses.*.tradeLicenseDetail.operationalArea + + - jsonPath: $.Licenses.*.tradeLicenseDetail.noOfEmployees + + - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocExemption + + - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocPenalty + + - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocExemptionReason + + - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocPenaltyReason + + - jsonPath: $.Licenses.*.auditDetails.createdBy + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy + + - jsonPath: $.Licenses.*.auditDetails.createdTime + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime + + + + - query: INSERT INTO eg_tl_tradeunit( id, tenantid,active, tradetype, uom, uomvalue, tradelicensedetailid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?,?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: Licenses.*.tradeLicenseDetail.tradeUnits.* + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.id + + - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.tenantId + + - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.active + + - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.tradeType + + - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.uom + + - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.uomValue + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].tradeLicenseDetail.id + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.createdBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.createdTime + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.lastModifiedTime + + + + - query: INSERT INTO eg_tl_accessory( id, tenantid,active, accessoryCategory, uom, uomvalue, count, tradelicensedetailid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?,?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: Licenses.*.tradeLicenseDetail.accessories.* + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.id + + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.tenantId + + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.active + + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.accessoryCategory + + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.uom + + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.uomValue + + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.count + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].tradeLicenseDetail.id + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.createdBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.createdTime + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.lastModifiedTime + + + - query: INSERT INTO eg_tl_owner( id,tenantid,active,institutionid, tradelicensedetailid, isprimaryowner, ownertype, ownershippercentage, relationship, createdby,lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: Licenses.*.tradeLicenseDetail.owners.* + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.uuid + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.tenantId + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.userActive + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.institutionId + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].tradeLicenseDetail.id + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.isPrimaryOwner + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.ownerType + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.ownerShipPercentage + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.relationship + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.createdBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.createdTime + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.lastModifiedTime + + + + - query: INSERT INTO eg_tl_document_owner(id,tenantId,userid,active, tradeLicenseDetailId, documenttype, fileStoreId,documentuid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ? ,? ,?, ?, ?, ?, ?, ?, ?, ?); + basePath: Licenses.*.tradeLicenseDetail.owners.*.documents.* + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.id + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].tenantId + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners[*][?({id} in @.documents[*].id)].uuid + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.active + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].tradeLicenseDetail.id + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.documentType + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.fileStoreId + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.documentUid + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.createdBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.createdTime + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.lastModifiedTime + + + + - query: INSERT INTO eg_tl_applicationdocument( id, tenantid, active, documenttype, tradecategorydetail, filestoreid, tradelicensedetailid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: Licenses.*.tradeLicenseDetail.applicationDocuments.* + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.id + + - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.tenantId + + - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.active + + - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.documentType + + - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.tradecategorydetail + + - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.fileStoreId + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].tradeLicenseDetail.id + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.createdBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.createdTime + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.lastModifiedTime + + + - query: INSERT INTO eg_tl_address( id, tenantid, doorno,street,buildingName, latitude,longitude, addressid, addressnumber,locality, type, addressline1, addressline2, landmark, city, pincode, detail, tradelicensedetailid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: Licenses.*.tradeLicenseDetail.address + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.id + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.tenantId + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.doorNo + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.street + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.buildingName + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.latitude + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.longitude + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.addressId + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.addressNumber + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.locality.code + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.type + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.addressLine1 + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.addressline2 + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.landmark + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.city + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.pincode + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.detail + + - jsonPath: $.Licenses.*.tradeLicenseDetail.id + + - jsonPath: $.Licenses.*.auditDetails.createdBy + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy + + - jsonPath: $.Licenses.*.auditDetails.createdTime + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime + + + - query: INSERT INTO eg_tl_institution(tenantId,active,id,instituionName,contactNo,organisationRegistrationNo,address, tradelicensedetailid, name, type,designation, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ; + basePath: Licenses.*.tradeLicenseDetail.institution + jsonMaps: + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.tenantId + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.active + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.id + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.instituionName + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.contactNo + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.organisationRegistrationNo + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.address + + - jsonPath: $.Licenses.*.tradeLicenseDetail.id + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.name + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.type + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.designation + + - jsonPath: $.Licenses.*.auditDetails.createdBy + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy + + - jsonPath: $.Licenses.*.auditDetails.createdTime + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime + + + + + + + - version: 1.0 + description: Update tradeLicense details in EG_TL_TradeLicense table + fromTopic: update-tl-tradelicense + isTransaction: true + queryMaps: + + + - query: INSERT INTO eg_tl_tradelicense_audit SELECT * FROM eg_tl_tradelicense WHERE id = ?; + basePath: Licenses.* + jsonMaps: + - jsonPath: $.Licenses.*.id + + + - query: UPDATE eg_tl_tradelicense SET tradeName = ?,licenseNumber = ?,licensetype = ?, oldlicensenumber = ?, propertyid = ?, oldpropertyid = ?, commencementdate = ?, issueddate = ?, financialyear = ?, validfrom = ?, validto = ?, action = ?, status = ?, lastmodifiedby = ?, lastmodifiedtime = ?, businessservice = ?, applicationtype = ?, workflowcode = ? WHERE id=?; + basePath: Licenses.* + jsonMaps: + - jsonPath: $.Licenses.*.tradeName + + - jsonPath: $.Licenses.*.licenseNumber + + - jsonPath: $.Licenses.*.licenseType + + - jsonPath: $.Licenses.*.oldLicenseNumber + + - jsonPath: $.Licenses.*.propertyId + + - jsonPath: $.Licenses.*.oldPropertyId + + - jsonPath: $.Licenses.*.commencementDate + + - jsonPath: $.Licenses.*.issuedDate + + - jsonPath: $.Licenses.*.financialYear + + - jsonPath: $.Licenses.*.validFrom + + - jsonPath: $.Licenses.*.validTo + + - jsonPath: $.Licenses.*.action + + - jsonPath: $.Licenses.*.status + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime + + - jsonPath: $.Licenses.*.businessService + + - jsonPath: $.Licenses.*.applicationType + + - jsonPath: $.Licenses.*.workflowCode + + - jsonPath: $.Licenses.*.id + + - query: INSERT INTO eg_tl_tradelicensedetail_audit SELECT * FROM eg_tl_tradelicensedetail WHERE id = ?; + basePath: Licenses.*.tradeLicenseDetail + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.id + + + + - query: UPDATE eg_tl_tradelicensedetail SET surveyno = ?, subownershipcategory = ?, channel = ?, additionaldetail = ?,operationalArea = ?,noOfEmployees = ?,structureType = ?,adhocExemption = ?,adhocPenalty = ?,adhocExemptionReason = ?,adhocPenaltyReason = ?,lastmodifiedby = ?, lastmodifiedtime = ? WHERE id = ?; + basePath: Licenses.*.tradeLicenseDetail + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.surveyNo + + - jsonPath: $.Licenses.*.tradeLicenseDetail.subOwnerShipCategory + + - jsonPath: $.Licenses.*.tradeLicenseDetail.channel + + - jsonPath: $.Licenses.*.tradeLicenseDetail.additionalDetail + type: JSON + dbType: JSONB + + - jsonPath: $.Licenses.*.tradeLicenseDetail.operationalArea + + - jsonPath: $.Licenses.*.tradeLicenseDetail.noOfEmployees + + - jsonPath: $.Licenses.*.tradeLicenseDetail.structureType + + - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocExemption + + - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocPenalty + + - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocExemptionReason + + - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocPenaltyReason + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime + + - jsonPath: $.Licenses.*.tradeLicenseDetail.id + + + - query: INSERT INTO eg_tl_tradeunit(id, tenantid, active, tradetype, uom, uomvalue, tradelicensedetailid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET active = ?, tradetype = ?, uom = ?, uomvalue = ?, lastmodifiedby = ?, lastmodifiedtime = ?; + basePath: Licenses.*.tradeLicenseDetail.tradeUnits.* + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.id + + - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.tenantId + + - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.active + + - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.tradeType + + - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.uom + + - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.uomValue + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].tradeLicenseDetail.id + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.createdBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.createdTime + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.lastModifiedTime + + - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.active + + - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.tradeType + + - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.uom + + - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.uomValue + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.lastModifiedTime + + + - query: INSERT INTO eg_tl_accessory(id, tenantid, active, accessoryCategory, uom, uomvalue, count, tradelicensedetailid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET active = ?,accessoryCategory = ?, uom = ?, uomvalue = ?,count =?, lastmodifiedby = ?, lastmodifiedtime = ?; + basePath: Licenses.*.tradeLicenseDetail.accessories.* + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.id + + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.tenantId + + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.active + + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.accessoryCategory + + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.uom + + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.uomValue + + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.count + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].tradeLicenseDetail.id + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.createdBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.createdTime + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.lastModifiedTime + + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.active + + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.accessoryCategory + + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.uom + + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.uomValue + + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.count + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.lastModifiedTime + + + + - query: INSERT INTO eg_tl_owner( id, tenantid, active, tradelicensedetailid, isprimaryowner, ownertype, ownershippercentage, relationship, createdby,lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT ON CONSTRAINT pk_eg_tl_owner DO UPDATE SET active = ?, isprimaryowner = ?, ownertype = ?, ownershippercentage = ?, relationship = ?, lastmodifiedby = ?, lastmodifiedtime = ?; + basePath: Licenses.*.tradeLicenseDetail.owners.* + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.uuid + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.tenantId + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.userActive + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].tradeLicenseDetail.id + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.isPrimaryOwner + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.ownerType + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.ownerShipPercentage + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.relationship + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.createdBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.createdTime + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.lastModifiedTime + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.userActive + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.isPrimaryOwner + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.ownerType + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.ownerShipPercentage + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.relationship + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.lastModifiedTime + + + - query: INSERT INTO eg_tl_document_owner(id,tenantId,active,userid, tradeLicenseDetailId, documenttype, fileStoreId,documentuid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT ON CONSTRAINT pk_eg_tl_document_owner DO UPDATE SET active = ?, documenttype = ?, fileStoreId = ?,documentuid = ?, lastmodifiedby = ?, lastmodifiedtime = ?; + basePath: Licenses.*.tradeLicenseDetail.owners.*.documents.* + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.id + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].tenantId + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.active + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners[*][?({id} in @.documents[*].id)].uuid + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].tradeLicenseDetail.id + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.documentType + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.fileStoreId + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.documentUid + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.createdBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.createdTime + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.lastModifiedTime + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.active + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.documentType + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.fileStoreId + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.documentUid + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.lastModifiedTime + + + + - query: INSERT INTO eg_tl_applicationdocument( id, tenantid, active, documenttype, tradecategorydetail, filestoreid, tradelicensedetailid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET active = ?, documenttype =?, tradecategorydetail =?, filestoreid =?,lastmodifiedby =?, lastmodifiedtime =?; + basePath: Licenses.*.tradeLicenseDetail.applicationDocuments.* + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.id + + - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.tenantId + + - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.active + + - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.documentType + + - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.tradecategorydetail + + - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.fileStoreId + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].tradeLicenseDetail.id + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.createdBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.createdTime + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.lastModifiedTime + + - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.active + + - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.documentType + + - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.tradecategorydetail + + - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.fileStoreId + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.lastModifiedTime + + + + - query: UPDATE eg_tl_address SET doorno =?,street = ?,buildingName = ?, latitude =?, longitude =?, addressid =?, addressnumber =?,locality =?, type =?, addressline1 =?, addressline2 =?, landmark =?, city =?, pincode =?, detail =?,lastmodifiedby =?, lastmodifiedtime =? WHERE id =?; + basePath: Licenses.*.tradeLicenseDetail.address + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.doorNo + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.street + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.buildingName + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.latitude + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.longitude + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.addressId + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.addressNumber + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.locality.code + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.type + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.addressline1 + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.addressline2 + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.landmark + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.city + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.pincode + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.detail + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.id + + + - query: INSERT INTO eg_tl_institution(tenantId, active, id, instituionName, contactNo, organisationRegistrationNo, address, tradelicensedetailid, name, type,designation, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET active = ?,name = ?,type = ?,designation = ?, lastmodifiedby = ?,lastmodifiedtime = ?, instituionName = ?, contactNo = ?, organisationRegistrationNo = ?, address = ?; + basePath: Licenses.*.tradeLicenseDetail.institution + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.tenantId + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.active + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.id + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.instituionName + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.contactNo + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.organisationRegistrationNo + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.address + + - jsonPath: $.Licenses.*.tradeLicenseDetail.id + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.name + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.type + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.designation + + - jsonPath: $.Licenses.*.auditDetails.createdBy + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy + + - jsonPath: $.Licenses.*.auditDetails.createdTime + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.active + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.name + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.type + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.designation + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.instituionName + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.contactNo + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.organisationRegistrationNo + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.address + + + + + - version: 1.0 + description: Persists tradeLicense details in EG_TL_TradeLicense table + fromTopic: update-tl-workflow + isTransaction: true + queryMaps: + + - query: INSERT INTO eg_tl_tradelicense_audit SELECT * FROM eg_tl_tradelicense WHERE id = ?; + basePath: Licenses.* + jsonMaps: + - jsonPath: $.Licenses.*.id + + + + - query: INSERT INTO eg_tl_tradelicensedetail_audit SELECT * FROM eg_tl_tradelicensedetail WHERE id = ?; + basePath: Licenses.*.tradeLicenseDetail + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.id + + + + - query: INSERT INTO eg_tl_verificationdocument( id, tenantid, active, documenttype, tradecategorydetail, filestoreid,tradelicensedetailid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET active = ?,documenttype =?, tradecategorydetail =?, filestoreid =?, lastmodifiedby =?, lastmodifiedtime =?; + basePath: Licenses.*.tradeLicenseDetail.verificationDocuments.* + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.id + + - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.tenantId + + - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.active + + - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.documentType + + - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.tradecategorydetail + + - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.fileStoreId + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.verificationDocuments[*].id)].tradeLicenseDetail.id + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.verificationDocuments[*].id)].auditDetails.createdBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.verificationDocuments[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.verificationDocuments[*].id)].auditDetails.createdTime + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.verificationDocuments[*].id)].auditDetails.lastModifiedTime + + - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.active + + - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.documentType + + - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.tradecategorydetail + + - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.fileStoreId + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.verificationDocuments[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.verificationDocuments[*].id)].auditDetails.lastModifiedTime + + + - query: UPDATE eg_tl_tradelicense SET validfrom = ?,validto = ?,licenseNumber =?, issueddate = ?, action = ?, status = ?, lastmodifiedby = ?, lastmodifiedtime = ? WHERE id=?; + basePath: Licenses.* + jsonMaps: + - jsonPath: $.Licenses.*.validFrom + + - jsonPath: $.Licenses.*.validTo + + - jsonPath: $.Licenses.*.licenseNumber + + - jsonPath: $.Licenses.*.issuedDate + + - jsonPath: $.Licenses.*.action + + - jsonPath: $.Licenses.*.status + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime + + - jsonPath: $.Licenses.*.id + + + - query: UPDATE eg_tl_tradelicensedetail SET additionaldetail = ?,lastmodifiedby = ?, lastmodifiedtime = ? WHERE id = ?; + basePath: Licenses.*.tradeLicenseDetail + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.additionalDetail + type: JSON + dbType: JSONB + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime + + - jsonPath: $.Licenses.*.tradeLicenseDetail.id + + + + - version: 1.0 + description: Update adhocDetails + fromTopic: update-tl-adhoc-tradelicense + isTransaction: true + queryMaps: + + + - query: UPDATE eg_tl_tradelicensedetail SET adhocExemption = ?,adhocPenalty = ?,adhocExemptionReason = ?,adhocPenaltyReason = ?,lastmodifiedby = ?, lastmodifiedtime = ? WHERE id = ?; + basePath: Licenses.*.tradeLicenseDetail + jsonMaps: + + - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocExemption + + - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocPenalty + + - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocExemptionReason + + - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocPenaltyReason + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime + + - jsonPath: $.Licenses.*.tradeLicenseDetail.id diff --git a/configs/egov-persister/water-meter.yml b/configs/egov-persister/water-meter.yml new file mode 100644 index 00000000..52547b47 --- /dev/null +++ b/configs/egov-persister/water-meter.yml @@ -0,0 +1,30 @@ +serviceMaps: + serviceName: Meter Connection Service + mappings: + - version: 1.0 + name: MeterConnection + description: create meter reading for particular connection number + fromTopic: save-ws-meter + isTransaction: true + queryMaps: + - query: INSERT INTO meterreading (id,connectionNo, billingPeriod, meterStatus, lastReading, lastReadingDate, currentReading, currentReadingDate) VALUES (?, ?, ?, ?, ?, ?, ?,?); + basePath: $.meterReadings + jsonMaps: + - jsonPath: $.meterReadings.id + + - jsonPath: $.meterReadings.connectionNo + + - jsonPath: $.meterReadings.billingPeriod + + - jsonPath: $.meterReadings.meterStatus + + - jsonPath: $.meterReadings.lastReading + + - jsonPath: $.meterReadings.lastReadingDate + + - jsonPath: $.meterReadings.currentReading + + - jsonPath: $.meterReadings.currentReadingDate + + + diff --git a/configs/egov-persister/water-persist.yml b/configs/egov-persister/water-persist.yml new file mode 100644 index 00000000..69d2a883 --- /dev/null +++ b/configs/egov-persister/water-persist.yml @@ -0,0 +1,258 @@ +serviceMaps: + serviceName: Water Connection Service + mappings: + - version: 1.0 + name: WaterConnection + description: create ConnectionDetails in connection and water_service_connection + fromTopic: save-ws-connection + isTransaction: true + queryMaps: + - query: INSERT INTO connection (id, tenantid, property_id, applicationno, applicationstatus, status, connectionno, oldconnectionno,roadcuttingarea,action,roadtype) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?,?,?); + basePath: $.WaterConnection + jsonMaps: + - jsonPath: $.WaterConnection.id + + - jsonPath: $.WaterConnection.property.tenantId + + - jsonPath: $.WaterConnection.property.propertyId + + - jsonPath: $.WaterConnection.applicationNo + + - jsonPath: $.WaterConnection.applicationStatus + + - jsonPath: $.WaterConnection.status + + - jsonPath: $.WaterConnection.connectionNo + + - jsonPath: $.WaterConnection.oldConnectionNo + + - jsonPath: $.WaterConnection.roadCuttingArea + + - jsonPath: $.WaterConnection.processInstance.action + + - jsonPath: $.WaterConnection.roadType + + + - query: INSERT INTO water_service_connection(connection_id,connectionCategory,rainWaterHarvesting,connectionType,waterSource,meterId,meterInstallationDate,pipeSize,noOfTaps,connectionexecutiondate,proposedPipeSize,proposedTaps, appCreatedDate) VALUES(?,?,?,?,?,?,?,?,?,?,?,?, ?); + basePath: $.WaterConnection + jsonMaps: + + - jsonPath: $.WaterConnection.id + - jsonPath: $.WaterConnection.connectionCategory + + + - jsonPath: $.WaterConnection.rainWaterHarvesting + type: BOOLEAN + dbType: BOOLEAN + + - jsonPath: $.WaterConnection.connectionType + + - jsonPath: $.WaterConnection.waterSource + + - jsonPath: $.WaterConnection.meterId + + - jsonPath: $.WaterConnection.meterInstallationDate + + - jsonPath: $.WaterConnection.pipeSize + + - jsonPath: $.WaterConnection.noOfTaps + + - jsonPath: $.WaterConnection.connectionExecutionDate + + - jsonPath: $.WaterConnection.proposedPipeSize + + - jsonPath: $.WaterConnection.proposedTaps + + - jsonPath: $.WaterConnection.additionalDetails.appCreatedDate + + + + + - version: 1.0 + name: WaterConnection + description: update ConnectionDetails in connection and water_service_connection + fromTopic: update-ws-connection + isTransaction: true + queryMaps: + - query: UPDATE connection SET applicationstatus=?, status=?, connectionno=?, oldconnectionno=?, action=?, roadCuttingArea=?, roadType=?, adhocpenalty=?, adhocrebate=?, adhocpenaltyreason=?, adhocpenaltycomment=?, adhocrebatereason=?, adhocrebatecomment=? WHERE id=?; + basePath: $.WaterConnection + jsonMaps: + + - jsonPath: $.WaterConnection.applicationStatus + + - jsonPath: $.WaterConnection.status + + - jsonPath: $.WaterConnection.connectionNo + + - jsonPath: $.WaterConnection.oldConnectionNo + + - jsonPath: $.WaterConnection.processInstance.action + + - jsonPath: $.WaterConnection.roadCuttingArea + + - jsonPath: $.WaterConnection.roadType + + - jsonPath: $.WaterConnection.additionalDetails.adhocPenalty + + - jsonPath: $.WaterConnection.additionalDetails.adhocRebate + + - jsonPath: $.WaterConnection.additionalDetails.adhocPenaltyReason + + - jsonPath: $.WaterConnection.additionalDetails.adhocPenaltyComment + + - jsonPath: $.WaterConnection.additionalDetails.adhocRebateReason + + - jsonPath: $.WaterConnection.additionalDetails.adhocRebateComment + + - jsonPath: $.WaterConnection.id + + - query: UPDATE water_service_connection SET connectionCategory=?,rainWaterHarvesting=?,connectionType=?,waterSource=?,meterId=?,meterInstallationDate=?,pipeSize=?,noOfTaps=?,proposedPipeSize=?,proposedTaps=?, initialmeterreading = ?, connectionexecutiondate = ?, detailsprovidedby = ?, estimationfileStoreId = ?, sanctionfileStoreId = ? WHERE connection_id=?; + basePath: $.WaterConnection + jsonMaps: + + - jsonPath: $.WaterConnection.connectionCategory + + - jsonPath: $.WaterConnection.rainWaterHarvesting + type: BOOLEAN + dbType: BOOLEAN + + - jsonPath: $.WaterConnection.connectionType + + - jsonPath: $.WaterConnection.waterSource + + - jsonPath: $.WaterConnection.meterId + + - jsonPath: $.WaterConnection.meterInstallationDate + + - jsonPath: $.WaterConnection.pipeSize + + - jsonPath: $.WaterConnection.noOfTaps + + - jsonPath: $.WaterConnection.proposedPipeSize + + - jsonPath: $.WaterConnection.proposedTaps + + - jsonPath: $.WaterConnection.additionalDetails.initialMeterReading + + - jsonPath: $.WaterConnection.connectionExecutionDate + + - jsonPath: $.WaterConnection.additionalDetails.detailsProvidedBy + + - jsonPath: $.WaterConnection.additionalDetails.estimationFileStoreId + + - jsonPath: $.WaterConnection.additionalDetails.sanctionFileStoreId + + - jsonPath: $.WaterConnection.id + + - query: INSERT INTO eg_ws_applicationDocument(id, tenantId, documenttype, filestoreid, wsid, active, createdBy, lastModifiedBy, createdTime, lastModifiedTime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET active = ?, documenttype =?, filestoreid =?,lastmodifiedby =?, lastmodifiedtime =?; + basePath: $.WaterConnection.documents.* + jsonMaps: + + - jsonPath: $.WaterConnection.documents.*.id + + - jsonPath: $.WaterConnection.property.tenantId + + - jsonPath: $.WaterConnection.documents.*.documentType + + - jsonPath: $.WaterConnection.documents.*.fileStoreId + + - jsonPath: $.WaterConnection.id + + - jsonPath: $.WaterConnection.documents.*.status + + - jsonPath: $.WaterConnection.documents.*.auditDetails.createdBy + + - jsonPath: $.WaterConnection.documents.*.auditDetails.lastModifiedBy + + - jsonPath: $.WaterConnection.documents.*.auditDetails.createdTime + + - jsonPath: $.WaterConnection.documents.*.auditDetails.lastModifiedTime + + - jsonPath: $.WaterConnection.documents.*.status + + - jsonPath: $.WaterConnection.documents.*.documentType + + - jsonPath: $.WaterConnection.documents.*.fileStoreId + + - jsonPath: $.WaterConnection.documents.*.auditDetails.lastModifiedBy + + - jsonPath: $.WaterConnection.documents.*.auditDetails.lastModifiedTime + + - query: INSERT INTO eg_ws_plumberinfo(id, name, licenseno, mobilenumber, gender, fatherorhusbandname, correspondenceaddress, relationship, wsid) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET name =?, licenseno =?,mobilenumber =?, gender =?, fatherorhusbandname =?, correspondenceaddress =?, relationship=?; + basePath: $.WaterConnection.plumberInfo.* + jsonMaps: + + - jsonPath: $.WaterConnection.plumberInfo.*.id + + - jsonPath: $.WaterConnection.plumberInfo.*.name + + - jsonPath: $.WaterConnection.plumberInfo.*.licenseNo + + - jsonPath: $.WaterConnection.plumberInfo.*.mobileNumber + + - jsonPath: $.WaterConnection.plumberInfo.*.gender + + - jsonPath: $.WaterConnection.plumberInfo.*.fatherOrHusbandName + + - jsonPath: $.WaterConnection.plumberInfo.*.correspondenceAddress + + - jsonPath: $.WaterConnection.plumberInfo.*.relationship + + - jsonPath: $.WaterConnection.id + + - jsonPath: $.WaterConnection.plumberInfo.*.name + + - jsonPath: $.WaterConnection.plumberInfo.*.licenseNo + + - jsonPath: $.WaterConnection.plumberInfo.*.mobileNumber + + - jsonPath: $.WaterConnection.plumberInfo.*.gender + + - jsonPath: $.WaterConnection.plumberInfo.*.fatherOrHusbandName + + - jsonPath: $.WaterConnection.plumberInfo.*.correspondenceAddress + + - jsonPath: $.WaterConnection.plumberInfo.*.relationship + + + + - version: 1.0 + name: WaterConnection + description: update ConnectionDetails in connection and water_service_connection + fromTopic: update-ws-workflow + isTransaction: true + queryMaps: + - query: UPDATE connection SET applicationstatus=?, status=?, connectionno=?, action=? WHERE id=?; + basePath: $.WaterConnection + jsonMaps: + + - jsonPath: $.WaterConnection.applicationStatus + + - jsonPath: $.WaterConnection.status + + - jsonPath: $.WaterConnection.connectionNo + + - jsonPath: $.WaterConnection.processInstance.action + + - jsonPath: $.WaterConnection.id + + - version: 1.0 + name: WaterConnection + description: save filestore ids + fromTopic: save-ws-filestoreids + isTransaction: true + queryMaps: + - query: UPDATE water_service_connection SET estimationfileStoreId = ?, sanctionfileStoreId = ? WHERE connection_id=?; + basePath: $.WaterConnection + jsonMaps: + + - jsonPath: $.WaterConnection.additionalDetails.estimationFileStoreId + + - jsonPath: $.WaterConnection.additionalDetails.sanctionFileStoreId + + - jsonPath: $.WaterConnection.id + + + + + From 44a6d8ec4fe8e3d10708dbd8ae2f22328e94776a Mon Sep 17 00:00:00 2001 From: narendrabandhamneni-wt-egov Date: Thu, 30 Apr 2020 16:59:31 +0530 Subject: [PATCH 0003/1242] Added extra files --- .../egov-searcher/PTDemandBasedSearcher.yml | 45 ++++ configs/egov-searcher/bill-genie.yml | 252 ++++++++++++++++++ configs/egov-searcher/localitySearcher.yml | 101 +++++++ configs/egov-searcher/propertyopensearch.yml | 42 +++ configs/egov-searcher/rainmaker-tl.yml | 26 ++ 5 files changed, 466 insertions(+) create mode 100644 configs/egov-searcher/PTDemandBasedSearcher.yml create mode 100644 configs/egov-searcher/bill-genie.yml create mode 100644 configs/egov-searcher/localitySearcher.yml create mode 100644 configs/egov-searcher/propertyopensearch.yml create mode 100644 configs/egov-searcher/rainmaker-tl.yml diff --git a/configs/egov-searcher/PTDemandBasedSearcher.yml b/configs/egov-searcher/PTDemandBasedSearcher.yml new file mode 100644 index 00000000..0930f192 --- /dev/null +++ b/configs/egov-searcher/PTDemandBasedSearcher.yml @@ -0,0 +1,45 @@ +SearchDefinitions: + moduleName: rainmaker-pt-demandbased + summary: Searcher configuration for demand based search + version: 1.0.0 + definitions: + + - name: searchAssessmentsToUpdate + query: + baseQuery: | + select row_to_json(data) from ( + WITH summary AS ( + SELECT ptdl.property, + ptdl.assessmentnumber, + ptdl.financialYear, + pt.tenantId, + address.locality, + ROW_NUMBER() OVER(PARTITION BY ptdl.property + ORDER BY ptdl.financialyear DESC,ptdl.createdtime DESC ) AS rk + FROM eg_pt_property_v2 pt INNER JOIN eg_pt_propertydetail_v2 ptdl ON pt.propertyid = ptdl.property INNER JOIN eg_pt_address_v2 address on address.property=pt.propertyid) + SELECT s.* + FROM summary s + WHERE s.rk = 1) data $where + groupBy: + orderBy: + searchParams: + condition: AND + params: + - name: data.locality + isMandatory: true + jsonPath: $.searchCriteria.locality + operator: = + - name: data.tenantid + isMandatory: true + jsonPath: $.searchCriteria.tenantId + operator: = + - name: data.financialYear + isMandatory: true + jsonPath: $.searchCriteria.financialYear + operator: NE + + + output: + jsonFormat: {"ResponseInfo": {}} + outJsonPath: $.DemandBasedAssessments + responseInfoPath: $.ResponseInfo diff --git a/configs/egov-searcher/bill-genie.yml b/configs/egov-searcher/bill-genie.yml new file mode 100644 index 00000000..331965c2 --- /dev/null +++ b/configs/egov-searcher/bill-genie.yml @@ -0,0 +1,252 @@ +SearchDefinitions: + moduleName: bill-genie + summary: Search configs for bill-genie + version: 1.0.0 + definitions: + - name: billswithaddranduser + isCustomerRowMapEnabled: true + rowMapperKey: billsearch + query: + baseQuery: with bill_data as ( + + SELECT b.id AS b_id, b.mobilenumber, + b.tenantid AS b_tenantid, b.payername AS b_payername, + b.payeraddress AS b_payeraddress, b.payeremail AS b_payeremail, + b.isactive AS b_isactive, b.iscancelled AS b_iscancelled, + b.createdby AS b_createdby, b.status as b_status,b.filestoreid AS b_filestoreid, + b.createddate AS b_createddate, b.lastmodifiedby AS b_lastmodifiedby, + b.lastmodifieddate AS b_lastmodifieddate, bd.id AS bd_id, + bd.billid AS bd_billid, bd.tenantid AS bd_tenantid, + bd.businessservice AS bd_businessservice, bd.demandid, + bd.fromperiod, bd.toperiod, + bd.billno AS bd_billno, bd.billdate AS bd_billdate, + bd.consumercode AS bd_consumercode, bd.consumertype AS bd_consumertype, + bd.billdescription AS bd_billdescription, bd.displaymessage AS bd_displaymessage, + bd.minimumamount AS bd_minimumamount, bd.totalamount AS bd_totalamount, + bd.callbackforapportioning AS bd_callbackforapportioning, bd.expirydate AS bd_expirydate, + bd.partpaymentallowed AS bd_partpaymentallowed, bd.isadvanceallowed as bd_isadvanceallowed, + bd.collectionmodesnotallowed AS bd_collectionmodesnotallowed, bd.createddate as bd_createddate, + b.additionaldetails as b_additionaldetails, bd.additionaldetails as bd_additionaldetails, + ad.id AS ad_id, ad.tenantid AS ad_tenantid, + ad.billdetail AS ad_billdetail, ad.glcode AS ad_glcode, + ad.orderno AS ad_orderno, ad.accountdescription AS ad_accountdescription, + ad.amount AS ad_amount, ad.adjustedamount AS ad_adjustedamount, + ad.taxheadcode AS ad_taxheadcode, ad.demanddetailid, + ad.isactualdemand AS ad_isactualdemand, ad.purpose AS ad_purpose, + ad.additionaldetails as ad_additionaldetails, + ptadd.doorNo as ptadd_doorNo,ptadd.landmark as ptadd_landmark, + ptadd.city as ptadd_city, ptadd.pincode as ptadd_pincode, + ptadd.locality as ptadd_locality, ptown.userid as ptown_userid + + FROM egbs_bill_v1 b INNER JOIN egbs_billdetail_v1 bd ON b.id = bd.billid AND b.tenantid = bd.tenantid + INNER JOIN egbs_billaccountdetail_v1 ad ON bd.id = ad.billdetail AND bd.tenantid = ad.tenantid + LEFT OUTER JOIN eg_pt_property pt ON bd.consumercode = pt.propertyid + INNER JOIN eg_pt_address ptadd ON ptadd.propertyid = pt.id + INNER JOIN eg_pt_asmt_assessment ptdet ON ptdet.propertyid = pt.propertyid + INNER JOIN eg_pt_owner ptown ON pt.id = ptown.propertyid $where ) + + select * from bill_data inner join (select max(b_createddate) as maxcreateddate, bd_consumercode from bill_data group by bd_consumercode) as max ON max.maxcreateddate=b_createddate + searchParams: + condition: AND + params: + - name: b.tenantid + isMandatory: true + jsonPath: $.searchCriteria.tenantId + - name: bd.consumercode + isMandatory: false + jsonPath: $.searchCriteria.consumerCode + - name: bd.businessservice + isMandatory: false + jsonPath: $.searchCriteria.businesService + - name: b.mobilenumber + isMandatory: false + jsonPath: $.searchCriteria.mobileNumber + - name: bd.billno + isMandatory: false + jsonPath: $.searchCriteria.billNo + - name: ptadd.locality + isMandatory: false + jsonPath: $.searchCriteria.locality + - name: ptdet.financialyear + isMandatory: false + jsonPath: $.searchCriteria.financialYear + - name: fromperiod + isMandatory: false + jsonPath: $.searchCriteria.fromPeriod + operator: LE + - name: toperiod + isMandatory: false + jsonPath: $.searchCriteria.toPeriod + operator: GE + - name: b.status + isMandatory: false + jsonPath: $.searchCriteria.billActive + + output: + jsonFormat: {"ResponseInfo": {},"Bills": []} + outJsonPath: $.Bills + responseInfoPath: $.ResponseInfo + + + - name: waterbills + isCustomerRowMapEnabled: true + rowMapperKey: billsearch + query: + baseQuery: with bill_data as ( + SELECT b.id AS b_id, b.mobilenumber, + b.tenantid AS b_tenantid, b.payername AS b_payername, + b.payeraddress AS b_payeraddress, b.payeremail AS b_payeremail, + b.isactive AS b_isactive, b.iscancelled AS b_iscancelled, + b.createdby AS b_createdby, b.status as b_status, + b.createddate AS b_createddate, b.lastmodifiedby AS b_lastmodifiedby, + b.lastmodifieddate AS b_lastmodifieddate, bd.id AS bd_id, + bd.billid AS bd_billid, bd.tenantid AS bd_tenantid, + bd.businessservice AS bd_businessservice, bd.demandid, + bd.fromperiod, bd.toperiod, + bd.billno AS bd_billno, bd.billdate AS bd_billdate, + bd.consumercode AS bd_consumercode, bd.consumertype AS bd_consumertype, + bd.billdescription AS bd_billdescription, bd.displaymessage AS bd_displaymessage, + bd.minimumamount AS bd_minimumamount, bd.totalamount AS bd_totalamount, + bd.callbackforapportioning AS bd_callbackforapportioning, bd.expirydate AS bd_expirydate, + bd.partpaymentallowed AS bd_partpaymentallowed, bd.isadvanceallowed as bd_isadvanceallowed, + bd.collectionmodesnotallowed AS bd_collectionmodesnotallowed, bd.createddate as bd_createddate, + b.additionaldetails as b_additionaldetails, bd.additionaldetails as bd_additionaldetails, + ad.id AS ad_id, ad.tenantid AS ad_tenantid, + ad.billdetail AS ad_billdetail, ad.glcode AS ad_glcode, + ad.orderno AS ad_orderno, ad.accountdescription AS ad_accountdescription, + ad.amount AS ad_amount, ad.adjustedamount AS ad_adjustedamount, + ad.taxheadcode AS ad_taxheadcode, ad.demanddetailid, + ad.isactualdemand AS ad_isactualdemand, ad.purpose AS ad_purpose, + ad.additionaldetails as ad_additionaldetails, + ptadd.doorNo as ptadd_doorNo, ptadd.landmark as ptadd_landmark, + ptadd.city as ptadd_city, ptadd.pincode as ptadd_pincode, + ptadd.locality as ptadd_locality, ptown.userid as ptown_userid + + FROM egbs_bill_v1 b INNER JOIN egbs_billdetail_v1 bd ON b.id = bd.billid AND b.tenantid = bd.tenantid + INNER JOIN egbs_billaccountdetail_v1 ad ON bd.id = ad.billdetail AND bd.tenantid = ad.tenantid + INNER JOIN connection conn ON bd.consumercode = conn.connectionno + INNER JOIN eg_pt_property pt ON conn.property_id = pt.propertyId + INNER JOIN eg_pt_address ptadd ON ptadd.propertyid = pt.id + INNER JOIN eg_pt_owner ptown ON ptown.propertyid = pt.id $where ) + + select * from bill_data inner join (select max(b_createddate) as maxcreateddate, bd_consumercode from bill_data group by bd_consumercode) as max ON max.maxcreateddate=b_createddate + searchParams: + condition: AND + params: + - name: b.tenantid + isMandatory: true + jsonPath: $.searchCriteria.tenantId + - name: bd.consumercode + isMandatory: false + jsonPath: $.searchCriteria.consumerCode + - name: bd.businessservice + isMandatory: false + jsonPath: $.searchCriteria.businesService + - name: b.mobilenumber + isMandatory: false + jsonPath: $.searchCriteria.mobileNumber + - name: bd.billno + isMandatory: false + jsonPath: $.searchCriteria.billNo + - name: ptadd.locality + isMandatory: false + jsonPath: $.searchCriteria.locality + - name: fromperiod + isMandatory: false + jsonPath: $.searchCriteria.fromPeriod + operator: LE + - name: toperiod + isMandatory: false + jsonPath: $.searchCriteria.toPeriod + operator: GE + - name: b.status + isMandatory: false + jsonPath: $.searchCriteria.billActive + + output: + jsonFormat: {"ResponseInfo": {},"Bills": []} + outJsonPath: $.Bills + responseInfoPath: $.ResponseInfo + + + + + - name: seweragebills + isCustomerRowMapEnabled: true + rowMapperKey: billsearch + query: + baseQuery: with bill_data as ( + SELECT b.id AS b_id, b.mobilenumber, + b.tenantid AS b_tenantid, b.payername AS b_payername, + b.payeraddress AS b_payeraddress, b.payeremail AS b_payeremail, + b.isactive AS b_isactive, b.iscancelled AS b_iscancelled, + b.createdby AS b_createdby, b.status as b_status, + b.createddate AS b_createddate, b.lastmodifiedby AS b_lastmodifiedby, + b.lastmodifieddate AS b_lastmodifieddate, bd.id AS bd_id, + bd.billid AS bd_billid, bd.tenantid AS bd_tenantid, + bd.businessservice AS bd_businessservice, bd.demandid, + bd.fromperiod, bd.toperiod, + bd.billno AS bd_billno, bd.billdate AS bd_billdate, + bd.consumercode AS bd_consumercode, bd.consumertype AS bd_consumertype, + bd.billdescription AS bd_billdescription, bd.displaymessage AS bd_displaymessage, + bd.minimumamount AS bd_minimumamount, bd.totalamount AS bd_totalamount, + bd.callbackforapportioning AS bd_callbackforapportioning, bd.expirydate AS bd_expirydate, + bd.partpaymentallowed AS bd_partpaymentallowed, bd.isadvanceallowed as bd_isadvanceallowed, + bd.collectionmodesnotallowed AS bd_collectionmodesnotallowed, bd.createddate as bd_createddate, + b.additionaldetails as b_additionaldetails, bd.additionaldetails as bd_additionaldetails, + ad.id AS ad_id, ad.tenantid AS ad_tenantid, + ad.billdetail AS ad_billdetail, ad.glcode AS ad_glcode, + ad.orderno AS ad_orderno, ad.accountdescription AS ad_accountdescription, + ad.amount AS ad_amount, ad.adjustedamount AS ad_adjustedamount, + ad.taxheadcode AS ad_taxheadcode, ad.demanddetailid, + ad.isactualdemand AS ad_isactualdemand, ad.purpose AS ad_purpose, + ad.additionaldetails as ad_additionaldetails, + ptadd.doorNo as ptadd_doorNo, ptadd.landmark as ptadd_landmark, + ptadd.city as ptadd_city, ptadd.pincode as ptadd_pincode, + ptadd.locality as ptadd_locality, ptown.userid as ptown_userid + + FROM egbs_bill_v1 b INNER JOIN egbs_billdetail_v1 bd ON b.id = bd.billid AND b.tenantid = bd.tenantid + INNER JOIN egbs_billaccountdetail_v1 ad ON bd.id = ad.billdetail AND bd.tenantid = ad.tenantid + INNER JOIN eg_sw_connection conn ON bd.consumercode = conn.connectionno + INNER JOIN eg_pt_property pt ON conn.property_id = pt.propertyId + INNER JOIN eg_pt_address ptadd ON ptadd.propertyid = pt.id + INNER JOIN eg_pt_owner ptown ON ptown.propertyid = pt.id $where ) + + select * from bill_data inner join (select max(b_createddate) as maxcreateddate, bd_consumercode from bill_data group by bd_consumercode) as max ON max.maxcreateddate=b_createddate + searchParams: + condition: AND + params: + - name: b.tenantid + isMandatory: true + jsonPath: $.searchCriteria.tenantId + - name: bd.consumercode + isMandatory: false + jsonPath: $.searchCriteria.consumerCode + - name: bd.businessservice + isMandatory: false + jsonPath: $.searchCriteria.businesService + - name: b.mobilenumber + isMandatory: false + jsonPath: $.searchCriteria.mobileNumber + - name: bd.billno + isMandatory: false + jsonPath: $.searchCriteria.billNo + - name: ptadd.locality + isMandatory: false + jsonPath: $.searchCriteria.locality + - name: fromperiod + isMandatory: false + jsonPath: $.searchCriteria.fromPeriod + operator: LE + - name: toperiod + isMandatory: false + jsonPath: $.searchCriteria.toPeriod + operator: GE + - name: b.status + isMandatory: false + jsonPath: $.searchCriteria.billActive + + output: + jsonFormat: {"ResponseInfo": {},"Bills": []} + outJsonPath: $.Bills + responseInfoPath: $.ResponseInfo diff --git a/configs/egov-searcher/localitySearcher.yml b/configs/egov-searcher/localitySearcher.yml new file mode 100644 index 00000000..0cee0d3b --- /dev/null +++ b/configs/egov-searcher/localitySearcher.yml @@ -0,0 +1,101 @@ +SearchDefinitions: + moduleName: locality + summary: Searcher configuration for searching locality in workflow inbox + version: 1.0.0 + definitions: + + - name: tl-services + query: + baseQuery: | + Select row_to_json(result) from + ( + select applicationNumber as referenceNumber,locality from eg_tl_tradelicense tl + INNER JOIN eg_tl_TradeLicenseDetail tld ON tld.tradelicenseId = tl.id + INNER JOIN eg_tl_address ad ON ad.tradeLicenseDetailId = tld.id + ) result $where + groupBy: + orderBy: + searchParams: + condition: AND + params: + - name: result.referenceNumber + isMandatory: true + jsonPath: $.searchCriteria.referenceNumber + operator: + + output: + jsonFormat: {"ResponseInfo": {}} + outJsonPath: $.Localities + responseInfoPath: $.ResponseInfo + + - name: fireNoc + query: + baseQuery: | + Select row_to_json(result) from + ( + select fnd.applicationnumber as referenceNumber,locality from eg_fn_firenoc fn + INNER JOIN eg_fn_firenocDetail fnd ON fnd.firenocuuid = fn.uuid + INNER JOIN eg_fn_address ad ON ad.firenocdetailsuuid = fnd.uuid + ) result $where + groupBy: + orderBy: + searchParams: + condition: AND + params: + - name: result.referenceNumber + isMandatory: true + jsonPath: $.searchCriteria.referenceNumber + operator: + + output: + jsonFormat: {"ResponseInfo": {}} + outJsonPath: $.Localities + responseInfoPath: $.ResponseInfo + + + - name: BPAREG + query: + baseQuery: | + Select row_to_json(result) from + ( + select applicationNumber as referenceNumber,locality from eg_tl_tradelicense tl + INNER JOIN eg_tl_TradeLicenseDetail tld ON tld.tradelicenseId = tl.id + INNER JOIN eg_tl_address ad ON ad.tradeLicenseDetailId = tld.id + ) result $where + groupBy: + orderBy: + searchParams: + condition: AND + params: + - name: result.referenceNumber + isMandatory: true + jsonPath: $.searchCriteria.referenceNumber + operator: + + output: + jsonFormat: {"ResponseInfo": {}} + outJsonPath: $.Localities + responseInfoPath: $.ResponseInfo + + - name: bpa-services + query: + baseQuery: | + Select row_to_json(result) from + ( + select applicationNo as referenceNumber,locality from eg_bpa_buildingplan bpa + INNER JOIN eg_bpa_address ad ON ad.buildingplanid = bpa.id + ) result $where + groupBy: + orderBy: + searchParams: + condition: AND + params: + - name: result.referenceNumber + isMandatory: true + jsonPath: $.searchCriteria.referenceNumber + operator: + + output: + jsonFormat: {"ResponseInfo": {}} + outJsonPath: $.Localities + responseInfoPath: $.ResponseInfo diff --git a/configs/egov-searcher/propertyopensearch.yml b/configs/egov-searcher/propertyopensearch.yml new file mode 100644 index 00000000..84fed5ac --- /dev/null +++ b/configs/egov-searcher/propertyopensearch.yml @@ -0,0 +1,42 @@ +SearchDefinitions: + moduleName: property-services + summary: Property Services Open API + version: 1.0.0 + definitions: + - name: propertyopensearch + query: + baseQuery: Select row_to_json(result) from + ( + select property.tenantid, property.propertyid, surveyid, oldpropertyid, property.createdtime, locality, owner.userid as owneruuid from eg_pt_property as property + INNER JOIN eg_pt_address ptadd ON ptadd.propertyid = property.id + INNER JOIN eg_pt_owner owner ON owner.propertyid=property.id $where + ) result + groupBy: + orderBy: createdtime,desc + searchParams: + condition: AND + params: + - name: property.tenantid + isMandatory: true + jsonPath: $.searchCriteria.tenantId + - name: property.propertyId + isMandatory: false + jsonPath: $.searchCriteria.propertyId + - name: property.surveyId + isMandatory: false + jsonPath: $.searchCriteria.surveyId + - name: property.oldPropertyId + isMandatory: false + jsonPath: $.searchCriteria.oldPropertyId + - name: ptadd.doorNo + isMandatory: false + jsonPath: $.searchCriteria.doorNo + - name: ptadd.locality + isMandatory: true + jsonPath: $.searchCriteria.locality + + + output: + jsonFormat: {"ResponseInfo": {},"Properties": []} + outJsonPath: $.Properties + responseInfoPath: $.ResponseInfo diff --git a/configs/egov-searcher/rainmaker-tl.yml b/configs/egov-searcher/rainmaker-tl.yml new file mode 100644 index 00000000..d5ac3adc --- /dev/null +++ b/configs/egov-searcher/rainmaker-tl.yml @@ -0,0 +1,26 @@ +SearchDefinitions: + moduleName: tlservice-indexer + summary: Searcher for TradeLicense + version: 1.0.0 + definitions: + - name: serviceTradelicense + query: + baseQuery: select array_to_json(array_agg(row_to_json(result))) from ( select id,tenantid,licensetype,licensenumber,applicationnumber,oldlicensenumber,propertyid,oldpropertyid,accountid, tradename,applicationdate,commencementdate,issueddate,financialyear,validfrom,validto,action, null as assignee, null as wfdocuments,status, applicationdate,commencementdate, (select row_to_json(tltradelicensedetail) from (select id,surveyno,subownershipcategory,structuretype,operationalarea,noofemployees,adhocexemption, adhocpenalty,adhocexemptionreason,adhocpenaltyreason, (select array_to_json(array_agg(row_to_json(tlowner))) from (select isprimaryowner,ownershippercentage,ownertype, institutionid,(select array_to_json(array_agg(row_to_json(tlownerdoc))) from (select * from eg_tl_document_owner) tlownerdoc where tlownerdoc.userid = tlowner.id) documents,tlowner.active as useractive,relationship,urid id,uuid,username,password,salutation,name,(CASE gender WHEN 1 THEN 'FEMALE' WHEN 2 THEN 'MALE' ELSE 'OTHERS' END) AS gender,mobilenumber,emailid, altcontactnumber, pan, aadhaarnumber, permanentaddress, permanentcity, permanentpincode, correspondencecity, correspondencepincode, correspondenceaddress, u.active, TRUNC(EXTRACT(EPOCH FROM dob::timestamp AT time zone 'Asia/Kolkata'))*1000 dob, TRUNC(EXTRACT(EPOCH FROM pwdexpirydate::timestamp AT time zone 'Asia/Kolkata'))*1000 pwdexpirydate, locale,utype as type,signature,accountlocked,Roles,guardian as fatherorhusbandname, (CASE bloodgroup WHEN '' THEN null ELSE bloodgroup END) bloodgroup, identificationmark,photo, (CASE WHEN ucreatedby is null THEN 0 ELSE ucreatedby END)::text createdby, TRUNC(EXTRACT(EPOCH FROM ucreateddate::timestamp AT time zone 'Asia/Kolkata'))*1000 createddate, (CASE WHEN ulastmodifiedby is null THEN 0 ELSE ulastmodifiedby END)::text lastmodifiedby, TRUNC(EXTRACT(EPOCH FROM ulastmodifieddate::timestamp AT time zone 'Asia/Kolkata'))*1000 lastmodifieddate, null as otpreference,utenantid tenantid from eg_tl_owner tlowner left join ( select *,users.id urid,users.type utype, users.createdby ucreatedby, users.createddate ucreateddate, users.lastmodifiedby ulastmodifiedby, users.lastmodifieddate ulastmodifieddate, users.tenantid utenantid, addr1.address as permanentaddress, addr1.city as permanentcity, addr1.pincode as permanentpincode, addr2.address as correspondenceaddress, addr2.city as correspondencecity, addr2.pincode as correspondencepincode,(select array_to_json(array_agg(row_to_json(rolejson))) from (select null as id,role_code code from eg_userrole_v1 roles where roles.user_id=users.id) rolejson) Roles from eg_user users left outer join eg_user_address addr1 ON users.id = addr1.userid and addr1.type='PERMANENT' left outer join eg_user_address addr2 ON users.id = addr2.userid and addr2.type='CORRESPONDANCE') u on tlowner.id=u.uuid where tradelicensedetailid = tld.id) tlowner ) owners, null as channel, (select row_to_json(tladdress) from (select id,tenantid,doorno,latitude,longitude, addressid,addressnumber,type,addressline1,addressline2,landmark,city,pincode,detail,buildingname,street, (select row_to_json(loc) from (select locality as code from eg_tl_address addr where addr.tradelicensedetailid = tld.id) loc) locality from eg_tl_address addr where addr.tradelicensedetailid = tld.id) tladdress) address, (select array_to_json(array_agg(row_to_json(tlunit))) from (select id,tenantid,active,tradetype,uom,uomvalue, null as auditdetails from eg_tl_tradeunit trunit where trunit.tradelicensedetailid = tld.id) tlunit ) tradeunits, (select array_to_json(array_agg(row_to_json(tlacc))) from (select id,tenantid,active,accessorycategory, uom,uomvalue,null as count,null as auditdetails from eg_tl_accessory where tradelicensedetailid = tld.id) tlacc ) accessories, (select array_to_json(array_agg(row_to_json(tlapldoc))) from (select id,active,tenantid,documenttype,filestoreid, null as documentuid, null as auditdetails from eg_tl_applicationdocument where tradelicensedetailid = tld.id) tlapldoc ) applicationdocuments, (select array_to_json(array_agg(row_to_json(tlverdoc))) from (select * from eg_tl_verificationdocument) tlverdoc where tlverdoc.tradelicensedetailid = tld.id) verificationdocuments, additionaldetail, (select array_to_json(array_agg(row_to_json(tlinsti))) from (select * from eg_tl_institution) tlinsti where tlinsti.tradelicensedetailid = tld.id) institution, (select row_to_json(audit) from (select tld.createdBy,tld.lastModifiedBy,tld.createdTime,tld.createdTime as lastModifiedTime) as audit) as auditdetails from eg_tl_tradelicensedetail tld where tld.tradelicenseid=tl.id) tltradelicensedetail ) tradelicensedetail, null as calculation, (select row_to_json(audit) from (select tl.createdBy,tl.lastModifiedBy,tl.createdTime,tl.lastModifiedTime) as audit) as auditdetails,null as comment from eg_tl_tradelicense tl $where AND tl.id in (select id from eg_tl_tradelicense order by createdtime ASC $pagination)) result + groupBy: + orderBy: + searchParams: + condition: AND + params: + - name: tenantid + isMandatory: true + jsonPath: $.searchCriteria.tenantId + operator: LIKE + pagination: + noOfRecords: $.searchCriteria.noOfRecords + offset: $.searchCriteria.offset + + output: + jsonFormat: {"ResponseInfo": {}} + outJsonPath: $.Licenses + responseInfoPath: $.ResponseInfo + From 445efd5a23af882339d395c3d0c265ff6a15f271 Mon Sep 17 00:00:00 2001 From: narendrabandhamneni-wt-egov Date: Thu, 30 Apr 2020 17:02:15 +0530 Subject: [PATCH 0004/1242] Added extra files --- configs/reports/configs/asset-reports.yml | 1522 +++++++++++++++++ configs/reports/configs/citizen-reports.yml | 49 + configs/reports/configs/common-reports.yml | 68 + configs/reports/configs/e-pass-reports.yml | 96 ++ configs/reports/configs/finance-reports.yml | 177 ++ configs/reports/configs/inventoryReport.yml | 1090 ++++++++++++ configs/reports/configs/lcms-reports.yml | 891 ++++++++++ .../configs/rainmaker-common-reports.yml | 127 ++ .../reports/configs/rainmaker-noc-reports.yml | 149 ++ .../reports/configs/rainmaker-pgr-reports.yml | 727 ++++++++ .../reports/configs/rainmaker-pt-reports.yml | 987 +++++++++++ .../reports/configs/rainmaker-tl-reports.yml | 781 +++++++++ configs/reports/configs/swm-reports.yml | 135 ++ configs/reports/configs/works-reports.yml | 565 ++++++ 14 files changed, 7364 insertions(+) create mode 100644 configs/reports/configs/asset-reports.yml create mode 100644 configs/reports/configs/citizen-reports.yml create mode 100644 configs/reports/configs/common-reports.yml create mode 100644 configs/reports/configs/e-pass-reports.yml create mode 100644 configs/reports/configs/finance-reports.yml create mode 100644 configs/reports/configs/inventoryReport.yml create mode 100644 configs/reports/configs/lcms-reports.yml create mode 100644 configs/reports/configs/rainmaker-common-reports.yml create mode 100644 configs/reports/configs/rainmaker-noc-reports.yml create mode 100644 configs/reports/configs/rainmaker-pgr-reports.yml create mode 100644 configs/reports/configs/rainmaker-pt-reports.yml create mode 100644 configs/reports/configs/rainmaker-tl-reports.yml create mode 100644 configs/reports/configs/swm-reports.yml create mode 100644 configs/reports/configs/works-reports.yml diff --git a/configs/reports/configs/asset-reports.yml b/configs/reports/configs/asset-reports.yml new file mode 100644 index 00000000..5e38d058 --- /dev/null +++ b/configs/reports/configs/asset-reports.yml @@ -0,0 +1,1522 @@ +--- +ReportDefinitions: +- reportName: AssetImmovableRegister + summary: Immovable Asset Register Report + version: 1.0.0 + moduleName: asset + viewPath: assetImmovableReport + selectiveDownload: true + externalService: + - entity: $.MdmsRes.ASSET.AssetCategory + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=ASSET&masterName=AssetCategory&tenantId=$tenantid&filter=%5B%3F%28+%40.assetCategoryType%3D%3D%27IMMOVABLE%27++%26%26+%40.isAssetAllow%3D%3Dtrue%29%5D + keyOrder: id,name,depreciationRate,parent,tenantId + tableName: tbl_assetsubcategory + stateData: true + - entity: $.MdmsRes.ASSET.AssetCategory + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=ASSET&masterName=AssetCategory&tenantId=$tenantid&filter=%5B%3F%28+%40.assetCategoryType%3D%3D%27IMMOVABLE%27++%26%26+%40.isAssetAllow%3D%3Dfalse%29%5D + keyOrder: id,name,tenantId + tableName: tbl_assetcategory + stateData: true + sourceColumns: + - name: name + label: reports.asset.name + type: string + source: asset + - name: code + label: reports.asset.code + type: string + linkedReport: + reportName: AssetImmovableRegisterDetail + linkedColumn: _parent?reportName={reportName}&assetdetail={code} + source: asset + - name: dateofcreation + label: reports.asset.dateofcreation + type: epoch + source: asset + - name: grossvalue + label: reports.asset.grossvalue + type: number + source: asset + - name: originalvalue + label: reports.asset.originalvalue + type: number + source: asset + searchParams: + - name: assetcategory + label: reports.asset.assetCategory + isMandatory: false + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=ASSET&masterName=AssetCategory&tenantId=$tenantid&filter=%5B%3F(%20%40.assetCategoryType%3D%3D%27IMMOVABLE%27%20%26%26%20%40.isAssetAllow%3D%3Dfalse)%5D|$.MdmsRes.ASSET.AssetCategory.*.id|$.MdmsRes.ASSET.AssetCategory.*.name + source: asset + stateData: true + wrapper: true + searchClause : AND assetsubcategory.assetsubcategoryparent =$assetcategory + - name: assetsubcategory + label: reports.asset.assetSubCategory + isMandatory: false + type: url + pattern: /egov-mdms-service/v1/_get?moduleName=ASSET&masterName=AssetCategory&tenantId=$tenantid&filter=%5B%3F(%20%40.parent%3D%3D{assetcategory})%5D|$.MdmsRes.ASSET.AssetCategory.*.id|$.MdmsRes.ASSET.AssetCategory.*.name + source: asset + stateData: true + wrapper: true + searchClause : AND asset.assetcategory=$assetsubcategory + - name: department + label: reports.asset.departmentCode + isMandatory: false + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=common-masters&masterName=Department&tenantId=$tenantid|$..code|$..name + source: asset + stateData: true + wrapper: true + searchClause : AND asset.departmentcode=$department + - name: code + label: reports.asset.code + type: string + isMandatory: false + source: asset + searchClause : AND asset.code in ($code) + - name: name + label: reports.asset.name + type: string + isMandatory: false + source: asset + searchClause : AND asset.name ilike $name + - name: originalvaluefrom + label: reports.asset.originalvaluefrom + type: number + source: asset + searchClause : AND asset.originalvalue>=$originalvaluefrom + isMandatory: false + - name: originalvalueto + label: reports.asset.originalvalueto + type: number + source: asset + searchClause : AND asset.originalvalue<=$originalvalueto + isMandatory: false + - name: fromDate + label: reports.asset.fromDate + type: date + source: asset + searchClause : AND asset.createddate>=$fromDate + isMandatory: false + - name: toDate + label: reports.asset.toDate + type: date + source: asset + searchClause : AND asset.createddate<=$toDate + isMandatory: false + + + + + query: select asset.name,asset.code,asset.ordernumber,asset.warrantyavailable,asset.wipreferenceno,asset.titledocumentsavailable as titledocumentsavailable, + asset.accumulateddepreciation,asset.grossvalue,asset.id,asset.quantity,asset.totalarea,asset.openingdate,asset.fundsource, + asset.location,(select string_agg(land.surveynumber,',') from egasset_asset_landdetails land where land.isenabled=true and asset.id=land.assetid group by asset.id) as + totalsurveyno,asset.acquiredfrom,asset.anticipatedLife,asset.modeofacquisition,asset.warrantyexpirydate,asset.defectliabilityyear as + defectliability,asset.defectliabilitymonth as defectliabilitymonth,asset.assetCategoryType,asset.defectliabilityday as defectliabilityday, + asset.securitydepositretained,asset.securitydepositrealized,asset.dateofcreation,asset.acquisitiondate,asset.grossvalue,asset.originalvalue, + currentvalue.currentamount,disposal.salevalue as disposalsalevalue,disposal.profitlossvoucherreference as disposalvoucherno,disposal.disposaldate, + disposal.buyername,disposal.buyeraddress,revaluation.revaluationdate,revaluation.incrementalrevalsum,revaluation.decrementalrevalsum, + depreciation.depreciationvalue,depreciation.totaldepreciationval,assetsubcategoryname,assetSubCategory.depreciationrate,assetsubcategoryparent, + assetparentcategoryname from egasset_asset asset left outer join (select b.* from egasset_current_value b inner join ( select assetid,tenantid, + max(createdtime) as createdtime from egasset_current_value where tenantid = $tenantid group by assetid,tenantid) c ON b.assetid = c.assetid + and b.tenantid=c.tenantid AND c.createdtime=b.createdtime) currentvalue ON asset.id=currentvalue.assetid AND asset.tenantid=currentvalue.tenantid + left outer join egasset_disposal disposal ON asset.id=disposal.assetid AND asset.tenantId = disposal.tenantid left outer join + ( select dep1.*,depsum.totaldepreciationval from egasset_depreciation dep1 inner join (select assetid,tenantid,max(createdtime) as createdtime + from egasset_depreciation where tenantid = $tenantid group by assetid,tenantid ) depmax ON dep1.assetid=depmax.assetid AND + dep1.tenantid=depmax.tenantid AND dep1.createdtime=depmax.createdtime inner join (select assetid,tenantid,sum(depreciationvalue) as + totaldepreciationval from egasset_depreciation where tenantid = $tenantid group by assetid,tenantid) depsum ON dep1.assetid=depsum.assetid + AND dep1.tenantid=depsum.tenantid ) depreciation ON asset.id=depreciation.assetid AND asset.tenantid=depreciation.tenantid left outer join + (select rev1.*,revinc.incrementalrevalsum,revdec.decrementalrevalsum from egasset_revaluation rev1 inner join (select assetid,tenantid,max(createddate) + as createddate from egasset_revaluation where tenantid = $tenantid group by assetid,tenantid ) revalmax ON rev1.assetid=revalmax.assetid AND + rev1.tenantid=revalmax.tenantid AND rev1.createddate=revalmax.createddate left outer join (select assetid,tenantid,sum(revaluationamount) as + incrementalrevalsum from egasset_revaluation where tenantid = $tenantid AND typeofchange='INCREASED' group by assetid,tenantid) revinc + ON rev1.assetid=revinc.assetid and rev1.tenantid=revinc.tenantid left outer join (select assetid,tenantid,sum(revaluationamount) as decrementalrevalsum + from egasset_revaluation where tenantid = $tenantid AND typeofchange='DECREASED' group by assetid,tenantid) revdec + ON rev1.assetid=revdec.assetid and rev1.tenantid=revdec.tenantid where rev1.tenantid = $tenantid) revaluation + ON asset.tenantid=revaluation.tenantid AND asset.id=revaluation.assetid + left outer join ( select assetSubcategory.name assetsubcategoryname,assetSubcategory.depreciationrate as depreciationrate, + assetSubcategory.parent as assetsubcategoryparent,assetSubcategory.tenantid as tenantid,assetSubcategory.id assetsubcategoryid, + ac.name as assetparentcategoryname,ac.id assetparentcategoryid from (VALUES tbl_assetsubcategory) as assetSubcategory (id,name,depreciationRate,parent,tenantId) + inner join (VALUES tbl_assetcategory) as ac (id,name,tenantId) ON assetSubcategory.parent = ac.id ) as + assetsubcategory ON asset.assetcategory::character varying=assetsubcategory.assetsubcategoryid + where asset.tenantid = $tenantid AND asset.assetCategoryType='IMMOVABLE' + + +- reportName: AssetImmovableRegisterDetail + summary: Immovable Asset Register Report + version: 1.0.0 + moduleName: asset + viewPath: assetImmovableReport + selectiveDownload: true + externalService: + - entity: $.MdmsRes.egf-master.FinancialYear + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=egf-master&masterName=FinancialYear&tenantId=$tenantid&filter=%5B%3F(%20%40.startingDate%20%3C%3D%20$currentTime%20%26%26%20%40.endingDate%20%3E%3D%20$currentTime)%5D + keyOrder: startingDate,endingDate + tableName: tbl_financialYears + stateData: true + - entity: $.MdmsRes.ASSET.AssetCategory + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=ASSET&masterName=AssetCategory&tenantId=$tenantid&filter=%5B%3F%28+%40.assetCategoryType%3D%3D%27IMMOVABLE%27++%26%26+%40.isAssetAllow%3D%3Dtrue%29%5D + keyOrder: id,name,depreciationRate,parent,tenantId + tableName: tbl_assetsubcategory + stateData: true + - entity: $.MdmsRes.ASSET.AssetCategory + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=ASSET&masterName=AssetCategory&tenantId=$tenantid&filter=%5B%3F%28+%40.assetCategoryType%3D%3D%27IMMOVABLE%27++%26%26+%40.isAssetAllow%3D%3Dfalse%29%5D + keyOrder: id,name,tenantId + tableName: tbl_assetcategory + stateData: true + - entity: $.MdmsRes.egf-master.Fund + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=egf-master&masterName=Fund&tenantId=$tenantid + keyOrder: id,tenantId,name,code + tableName: tbl_funds + stateData: true + sourceColumns: + - name: id + label: reports.asset.id + type: number + source: asset + - name: quantity + label: reports.asset.quantity + type: number + source: asset + - name: plintharea + label: reports.asset.plintharea + type: number + source: asset + showColumn: true + - name: cubiccontents + label: reports.asset.cubiccontents + type: string + source: asset + - name: landsurveyno + label: reports.asset.landsurveyno + type: string + source: asset + - name: length + label: reports.asset.length + type: number + source: asset + - name: width + label: reports.asset.width + type: number + source: asset + - name: height + label: reports.asset.height + type: number + source: asset + - name: totalarea + label: reports.asset.totalarea + type: number + source: asset + - name: acquiredfrom + label: reports.asset.acquiredfrom + type: string + source: asset + - name: anticipatedLife + label: reports.asset.anticipatedLife + type: number + source: asset + - name: modeofacquisition + label: reports.asset.modeofacquisition + type: string + source: asset + - name: warrantyexpirydate + label: reports.asset.warrantyexpirydate + type: number + source: asset + - name: defectliability + label: reports.asset.defectliability + type: number + source: asset + - name: defectliabilitymonth + label: reports.asset.defectliabilitymonth + type: number + source: asset + - name: defectliabilityday + label: reports.asset.defectliabilityday + type: string + source: asset + - name: securitydepositretained + label: reports.asset.securitydepositretained + type: number + source: asset + - name: securitydepositrealized + label: reports.asset.securitydepositrealized + type: number + source: asset + - name: dateofcreation + label: reports.asset.dateofcreation + type: string + source: asset + - name: acquisitiondate + label: reports.asset.acquisitiondate + type: string + source: asset + - name: grossvalue + label: reports.asset.grossvalue + type: number + source: asset + - name: originalvalue + label: reports.asset.originalvalue + type: number + source: asset + - name: currentvalue + label: reports.asset.currentvalue + type: number + source: asset + - name: currentamount + label: reports.asset.currentamount + type: number + source: asset + - name: disposalsalevalue + label: reports.asset.disposalsalevalue + type: number + source: asset + - name: disposalvoucherno + label: reports.asset.disposalvoucherno + type: number + source: asset + - name: disposaldate + label: reports.asset.disposaldate + type: string + source: asset + - name: revaluationdate + label: reports.asset.revaluationdate + type: string + source: asset + - name: incrementalrevalsum + label: reports.asset.incrementalrevalsum + type: number + source: asset + - name: decrementalrevalsum + label: reports.asset.decrementalrevalsum + type: number + source: asset + - name: depreciationvalue + label: reports.asset.depreciationvalue + type: number + source: asset + - name: totaldepreciationval + label: reports.asset.totaldepreciationval + type: number + source: asset + - name: name + label: reports.asset.name + type: string + source: asset + - name: code + label: reports.asset.code + type: string + source: asset + - name: ordernumber + label: reports.asset.ordernumber + type: number + - name: warrantyavailable + label: reports.asset.warrantyavailable + type: string + source: asset + - name: wipreferenceno + label: reports.asset.wipreferenceno + type: string + source: asset + - name: floors + label: reports.asset.floors + type: number + source: asset + - name: titledocumentsavailable + label: reports.asset.titledocumentsavailable + type: number + - name: buyername + label: reports.asset.buyername + type: string + source: asset + - name: accumulateddepreciation + label: reports.asset.accumulateddepreciation + type: number + source: asset + - name: openingdate + label: reports.asset.openingdate + type: number + source: asset + - name: fundsourcename + label: reports.asset.fundsource + type: string + source: asset + - name: location + label: reports.asset.location + type: string + source: asset + - name: totalsurveyno + label: reports.asset.totalsurveyno + type: string + source: asset + - name: assetattributes + label: reports.asset.assetattributes + type: string + source: asset + - name: assetsubcategoryname + label: reports.asset.assetsubcategoryname + type: string + source: asset + - name: assetparentcategoryname + label: reports.asset.assetparentcategoryname + type: string + source: asset + - name: depreciationrate + label: reports.asset.depreciationrate + type: string + source: asset + - name: totalrevalsum + label: reports.asset.totalrevalsum + type: string + source: asset + - name: prevtotaldepreciationval + label: reports.asset.prevtotaldepreciationval + type: string + source: asset + - name: currtotaldepreciationval + label: reports.asset.currtotaldepreciationval + type: string + source: asset + searchParams: + - name: fromDate + label: reports.asset.fromDate + type: date + source: asset + searchClause : AND asset.createddate>=$fromDate + isMandatory: false + - name: toDate + label: reports.asset.toDate + type: date + source: asset + searchClause : AND asset.createddate<=$toDate + isMandatory: false + - name: name + label: reports.asset.name + type: string + isMandatory: false + source: asset + searchClause : AND asset.name=$name + - name: code + label: reports.asset.code + type: string + isMandatory: false + source: asset + searchClause : AND asset.code=$code + - name: assetdetail + label: reports.asset.detail + type: number + isMandatory: false + source: asset + searchClause : and asset.code in ($assetdetail) + + query: select asset.name,asset.code,asset.ordernumber,asset.warrantyavailable,asset.wipreferenceno,asset.titledocumentsavailable as titledocumentsavailable, + asset.accumulateddepreciation,asset.grossvalue,asset.id,asset.quantity,asset.totalarea,asset.openingdate,asset.fundsource,funds.fundsourcename, + asset.location,(select string_agg(land.surveynumber,',') from egasset_asset_landdetails land where land.isenabled=true and asset.id=land.assetid group by asset.id) as + totalsurveyno,asset.acquiredfrom,asset.anticipatedLife,asset.modeofacquisition,asset.warrantyexpirydate,asset.defectliabilityyear as + defectliability,asset.defectliabilitymonth as defectliabilitymonth,asset.assetCategoryType,asset.defectliabilityday as defectliabilityday, coalesce(grossvalue,0.0)-coalesce(accumulateddepreciation,0.0)+coalesce(incrementalrevalsum,0.0)-coalesce(decrementalrevalsum,0.0) as totalrevalsum, + asset.securitydepositretained,asset.securitydepositrealized,asset.dateofcreation,asset.acquisitiondate,asset.grossvalue,asset.originalvalue, + currentvalue.currentamount,disposal.salevalue as disposalsalevalue,disposal.profitlossvoucherreference as disposalvoucherno,disposal.disposaldate, + disposal.buyername,disposal.buyeraddress,revaluation.revaluationdate,revaluation.incrementalrevalsum,revaluation.decrementalrevalsum, + depreciation.depreciationvalue,depreciation.totaldepreciationval,depreciation.prevtotaldepreciationval,depreciation.currtotaldepreciationval,assetsubcategoryname,assetSubCategory.depreciationrate,assetsubcategoryparent, assetparentcategoryname from egasset_asset asset left outer join (select b.* from egasset_current_value b inner join ( select assetid,tenantid, max(createdtime) as createdtime from egasset_current_value where tenantid = $tenantid group by assetid,tenantid) c ON b.assetid = c.assetid and b.tenantid=c.tenantid AND c.createdtime=b.createdtime) currentvalue ON asset.id=currentvalue.assetid AND asset.tenantid=currentvalue.tenantid left outer join egasset_disposal disposal ON asset.id=disposal.assetid AND asset.tenantId = disposal.tenantid left outer join ( select dep1.*,depsum.totaldepreciationval,prevtotaldepreciationval,currtotaldepreciationval from egasset_depreciation dep1 + inner join (select assetid,tenantid,max(createdtime) as createdtime from egasset_depreciation where tenantid = $tenantid group by assetid,tenantid ) depmax ON dep1.assetid=depmax.assetid AND + dep1.tenantid=depmax.tenantid AND dep1.createdtime=depmax.createdtime inner join + (select assetid,tenantid,sum(depreciationvalue) as totaldepreciationval from egasset_depreciation where tenantid = $tenantid group by assetid,tenantid) depsum + ON dep1.assetid=depsum.assetid AND dep1.tenantid=depsum.tenantid left outer join + (select assetid,tenantid,sum(depreciationvalue) as prevtotaldepreciationval from egasset_depreciation where tenantid = $tenantid AND todate<=(select startingDate::bigint from (VALUES tbl_financialYears) as financialYears (startingDate,endingDate)) group by assetid,tenantid) prevdepsum + ON dep1.assetid=prevdepsum.assetid AND dep1.tenantid=prevdepsum.tenantid left outer join (select assetid,tenantid,sum(depreciationvalue) as currtotaldepreciationval + from egasset_depreciation where tenantid = $tenantid AND (todate BETWEEN (select startingDate::bigint from (VALUES tbl_financialYears) as financialYears (startingDate,endingDate)) + AND (select endingDate::bigint from (VALUES tbl_financialYears) as financialYears (startingDate,endingDate)) ) group by assetid,tenantid) currdepsum + ON dep1.assetid=currdepsum.assetid AND dep1.tenantid=currdepsum.tenantid) + depreciation ON asset.id=depreciation.assetid AND asset.tenantid=depreciation.tenantid + left outer join + (select rev1.*,revinc.incrementalrevalsum,revdec.decrementalrevalsum from egasset_revaluation rev1 inner join (select assetid,tenantid,max(createddate) + as createddate from egasset_revaluation where tenantid = $tenantid group by assetid,tenantid ) revalmax ON rev1.assetid=revalmax.assetid AND + rev1.tenantid=revalmax.tenantid AND rev1.createddate=revalmax.createddate left outer join (select assetid,tenantid,sum(revaluationamount) as + incrementalrevalsum from egasset_revaluation where tenantid = $tenantid AND typeofchange='INCREASED' group by assetid,tenantid) revinc + ON rev1.assetid=revinc.assetid and rev1.tenantid=revinc.tenantid left outer join (select assetid,tenantid,sum(revaluationamount) as decrementalrevalsum + from egasset_revaluation where tenantid = $tenantid AND typeofchange='DECREASED' group by assetid,tenantid) revdec + ON rev1.assetid=revdec.assetid and rev1.tenantid=revdec.tenantid where rev1.tenantid = $tenantid) revaluation + ON asset.tenantid=revaluation.tenantid AND asset.id=revaluation.assetid + left outer join ( select assetSubcategory.name assetsubcategoryname,assetSubcategory.depreciationrate as depreciationrate, + assetSubcategory.parent as assetsubcategoryparent,assetSubcategory.tenantid as tenantid,assetSubcategory.id assetsubcategoryid, + ac.name as assetparentcategoryname,ac.id assetparentcategoryid from (VALUES tbl_assetsubcategory) as assetSubcategory (id,name,depreciationRate,parent,tenantId) + inner join (VALUES tbl_assetcategory) as ac (id,name,tenantId) ON assetSubcategory.parent = ac.id ) as + assetsubcategory ON asset.assetcategory::character varying=assetsubcategory.assetsubcategoryid + left outer join (select funds.name fundsourcename,funds.code from (VALUES tbl_funds) as funds (id,tenantId,name,code)) as funds ON asset.fundsource=funds.code + where asset.tenantid = $tenantid AND asset.assetCategoryType='IMMOVABLE' + + +- reportName: AssetMovableRegister + summary: Movable Asset Register Report + version: 1.0.0 + moduleName: asset + viewPath: assetMovableReport + selectiveDownload: true + externalService: + - entity: $.MdmsRes.ASSET.AssetCategory + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=ASSET&masterName=AssetCategory&tenantId=$tenantid&filter=%5B%3F%28+%40.assetCategoryType%3D%3D%27MOVABLE%27++%26%26+%40.isAssetAllow%3D%3Dtrue%29%5D + keyOrder: id,name,depreciationRate,parent,tenantId + tableName: tbl_assetsubcategory + stateData: true + - entity: $.MdmsRes.ASSET.AssetCategory + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=ASSET&masterName=AssetCategory&tenantId=$tenantid&filter=%5B%3F%28+%40.assetCategoryType%3D%3D%27MOVABLE%27++%26%26+%40.isAssetAllow%3D%3Dfalse%29%5D + keyOrder: id,name,tenantId + tableName: tbl_assetcategory + stateData: true + sourceColumns: + - name: name + label: reports.asset.name + type: string + source: asset + - name: code + label: reports.asset.code + type: string + linkedReport: + reportName: AssetMovableRegisterDetail + linkedColumn: _parent?reportName={reportName}&assetdetail={code} + source: asset + - name: dateofcreation + label: reports.asset.dateofcreation + type: epoch + source: asset + - name: grossvalue + label: reports.asset.grossvalue + type: number + source: asset + - name: originalvalue + label: reports.asset.originalvalue + type: number + source: asset + searchParams: + - name: assetcategory + label: reports.asset.assetCategory + isMandatory: false + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=ASSET&masterName=AssetCategory&tenantId=$tenantid&filter=%5B%3F(%20%40.assetCategoryType%3D%3D%27MOVABLE%27%20%26%26%20%40.isAssetAllow%3D%3Dfalse)%5D|$.MdmsRes.ASSET.AssetCategory.*.id|$.MdmsRes.ASSET.AssetCategory.*.name + source: asset + wrapper: true + stateData: true + searchClause : AND assetsubcategory.assetsubcategoryparent =$assetcategory + - name: assetsubcategory + label: reports.asset.assetSubCategory + isMandatory: false + type: url + pattern: /egov-mdms-service/v1/_get?moduleName=ASSET&masterName=AssetCategory&tenantId=$tenantid&filter=%5B%3F(%20%40.parent%3D%3D{assetcategory})%5D|$.MdmsRes.ASSET.AssetCategory.*.id|$.MdmsRes.ASSET.AssetCategory.*.name + source: asset + wrapper: true + stateData: true + searchClause : AND asset.assetcategory=$assetsubcategory + - name: department + label: reports.asset.departmentCode + isMandatory: false + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=common-masters&masterName=Department&tenantId=$tenantid|$..code|$..name + source: asset + wrapper: true + stateData: true + searchClause : AND asset.departmentcode=$department + - name: code + label: reports.asset.code + type: string + isMandatory: false + source: asset + searchClause : AND asset.code in ($code) + - name: name + label: reports.asset.name + type: string + isMandatory: false + source: asset + searchClause : AND asset.name=$name + - name: originalvaluefrom + label: reports.asset.originalvaluefrom + type: number + source: asset + searchClause : AND asset.originalvalue>=$originalvaluefrom + isMandatory: false + - name: originalvalueto + label: reports.asset.originalvalueto + type: number + source: asset + searchClause : AND asset.originalvalue<=$originalvalueto + isMandatory: false + - name: fromDate + label: reports.asset.fromDate + type: date + source: asset + searchClause : AND asset.createddate>=$fromDate + isMandatory: false + - name: toDate + label: reports.asset.toDate + type: date + source: asset + searchClause : AND asset.createddate<=$toDate + isMandatory: false + + + + + + query: select asset.name,asset.code,asset.ordernumber,asset.warrantyavailable,asset.wipreferenceno,asset.titledocumentsavailable as titledocumentsavailable,asset.accumulateddepreciation,asset.grossvalue,asset.id,asset.quantity,asset.totalarea,asset.openingdate,asset.fundsource,asset.location,asset.assetCategoryType, + asset.acquiredfrom,asset.anticipatedLife,asset.modeofacquisition,asset.warrantyexpirydate,asset.defectliabilityyear as defectliability,asset.defectliabilitymonth as defectliabilitymonth,(select string_agg(land.surveynumber,',') from egasset_asset_landdetails land where land.isenabled=true and asset.id=land.assetid group by asset.id) as totalsurveyno, + asset.defectliabilityday as defectliabilityday,asset.securitydepositretained, + asset.securitydepositrealized,asset.dateofcreation,asset.acquisitiondate,asset.grossvalue,asset.originalvalue,currentvalue.currentamount, + disposal.salevalue as disposalsalevalue,disposal.profitlossvoucherreference as disposalvoucherno,disposal.disposaldate,disposal.buyername,disposal.buyeraddress, + revaluation.revaluationdate,revaluation.incrementalrevalsum,revaluation.decrementalrevalsum, + depreciation.depreciationvalue,depreciation.totaldepreciationval,assetsubcategoryname,assetSubCategory.depreciationrate,assetsubcategoryparent, + assetparentcategoryname + from egasset_asset asset left outer join + (select b.* from egasset_current_value b inner join ( select assetid,tenantid,max(createdtime) as createdtime from egasset_current_value + where tenantid = $tenantid group by assetid,tenantid) c + ON b.assetid = c.assetid and b.tenantid=c.tenantid AND c.createdtime=b.createdtime) currentvalue + ON asset.id=currentvalue.assetid AND asset.tenantid=currentvalue.tenantid + left outer join egasset_disposal disposal ON asset.id=disposal.assetid AND asset.tenantId = disposal.tenantid + left outer join ( select dep1.*,depsum.totaldepreciationval from egasset_depreciation dep1 + inner join + (select assetid,tenantid,max(createdtime) as createdtime from egasset_depreciation where tenantid = $tenantid + group by assetid,tenantid ) depmax ON dep1.assetid=depmax.assetid AND dep1.tenantid=depmax.tenantid AND dep1.createdtime=depmax.createdtime + inner join (select assetid,tenantid,sum(depreciationvalue) as totaldepreciationval from egasset_depreciation + where tenantid = $tenantid group by assetid,tenantid) depsum ON dep1.assetid=depsum.assetid + AND dep1.tenantid=depsum.tenantid ) depreciation ON asset.id=depreciation.assetid AND asset.tenantid=depreciation.tenantid + left outer join + (select rev1.*,revinc.incrementalrevalsum,revdec.decrementalrevalsum from egasset_revaluation rev1 inner join + (select assetid,tenantid,max(createddate) as createddate from egasset_revaluation where tenantid = $tenantid + group by assetid,tenantid ) revalmax ON rev1.assetid=revalmax.assetid AND rev1.tenantid=revalmax.tenantid AND rev1.createddate=revalmax.createddate + left outer join + (select assetid,tenantid,sum(revaluationamount) as incrementalrevalsum from egasset_revaluation where tenantid = $tenantid + AND typeofchange='INCREASED' group by assetid,tenantid) revinc ON rev1.assetid=revinc.assetid and rev1.tenantid=revinc.tenantid + left outer join (select assetid,tenantid,sum(revaluationamount) as decrementalrevalsum from egasset_revaluation + where tenantid = $tenantid AND typeofchange='DECREASED' group by assetid,tenantid) revdec + ON rev1.assetid=revdec.assetid and rev1.tenantid=revdec.tenantid + where rev1.tenantid = $tenantid) revaluation + ON asset.tenantid=revaluation.tenantid AND asset.id=revaluation.assetid + left outer join ( select assetSubcategory.name assetsubcategoryname,assetSubcategory.depreciationrate as depreciationrate, + assetSubcategory.parent as assetsubcategoryparent,assetSubcategory.tenantid as tenantid,assetSubcategory.id assetsubcategoryid, + ac.name as assetparentcategoryname,ac.id assetparentcategoryid from (VALUES tbl_assetsubcategory) as assetSubcategory (id,name,depreciationRate,parent,tenantId) + inner join (VALUES tbl_assetcategory) as ac (id,name,tenantId) ON assetSubcategory.parent = ac.id ) as + assetsubcategory ON asset.assetcategory::character varying=assetsubcategory.assetsubcategoryid + where asset.tenantid = $tenantid AND asset.assetCategoryType='MOVABLE' + + +- reportName: AssetMovableRegisterDetail + summary: Movable Asset Register Report + version: 1.0.0 + moduleName: asset + viewPath: assetMovableReport + selectiveDownload: true + externalService: + - entity: $.MdmsRes.egf-master.FinancialYear + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=egf-master&masterName=FinancialYear&tenantId=$tenantid&filter=%5B%3F(%20%40.startingDate%20%3C%3D%20$currentTime%20%26%26%20%40.endingDate%20%3E%3D%20$currentTime)%5D + keyOrder: startingDate,endingDate + tableName: tbl_financialYears + stateData: true + - entity: $.MdmsRes.ASSET.AssetCategory + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=ASSET&masterName=AssetCategory&tenantId=$tenantid&filter=%5B%3F%28+%40.assetCategoryType%3D%3D%27MOVABLE%27++%26%26+%40.isAssetAllow%3D%3Dtrue%29%5D + keyOrder: id,name,depreciationRate,parent,tenantId + tableName: tbl_assetsubcategory + stateData: true + - entity: $.MdmsRes.ASSET.AssetCategory + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=ASSET&masterName=AssetCategory&tenantId=$tenantid&filter=%5B%3F%28+%40.assetCategoryType%3D%3D%27MOVABLE%27++%26%26+%40.isAssetAllow%3D%3Dfalse%29%5D + keyOrder: id,name,tenantId + tableName: tbl_assetcategory + stateData: true + - entity: $.MdmsRes.egf-master.Fund + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=egf-master&masterName=Fund&tenantId=$tenantid + keyOrder: id,tenantId,name,code + tableName: tbl_funds + stateData: true + sourceColumns: + - name: id + label: reports.asset.id + type: number + source: asset + - name: quantity + label: reports.asset.quantity + type: number + source: asset + - name: plintharea + label: reports.asset.plintharea + type: number + source: asset + showColumn: true + - name: cubiccontents + label: reports.asset.cubiccontents + type: string + source: asset + - name: landsurveyno + label: reports.asset.landsurveyno + type: string + source: asset + - name: length + label: reports.asset.length + type: number + source: asset + - name: width + label: reports.asset.width + type: number + source: asset + - name: height + label: reports.asset.height + type: number + source: asset + - name: totalarea + label: reports.asset.totalarea + type: number + source: asset + - name: acquiredfrom + label: reports.asset.acquiredfrom + type: string + source: asset + - name: anticipatedLife + label: reports.asset.anticipatedLife + type: number + source: asset + - name: modeofacquisition + label: reports.asset.modeofacquisition + type: string + source: asset + - name: warrantyexpirydate + label: reports.asset.warrantyexpirydate + type: number + source: asset + - name: defectliability + label: reports.asset.defectliability + type: number + source: asset + - name: defectliabilitymonth + label: reports.asset.defectliabilitymonth + type: number + source: asset + - name: defectliabilityday + label: reports.asset.defectliabilityday + type: string + source: asset + - name: securitydepositretained + label: reports.asset.securitydepositretained + type: number + source: asset + - name: securitydepositrealized + label: reports.asset.securitydepositrealized + type: number + source: asset + - name: dateofcreation + label: reports.asset.dateofcreation + type: string + source: asset + - name: acquisitiondate + label: reports.asset.acquisitiondate + type: string + source: asset + - name: grossvalue + label: reports.asset.grossvalue + type: number + source: asset + - name: originalvalue + label: reports.asset.originalvalue + type: number + source: asset + - name: currentvalue + label: reports.asset.currentvalue + type: number + source: asset + - name: currentamount + label: reports.asset.currentamount + type: number + source: asset + - name: disposalsalevalue + label: reports.asset.disposalsalevalue + type: number + source: asset + - name: disposalvoucherno + label: reports.asset.disposalvoucherno + type: number + source: asset + - name: disposaldate + label: reports.asset.disposaldate + type: string + source: asset + - name: revaluationdate + label: reports.asset.revaluationdate + type: string + source: asset + - name: incrementalrevalsum + label: reports.asset.incrementalrevalsum + type: number + source: asset + - name: decrementalrevalsum + label: reports.asset.decrementalrevalsum + type: number + source: asset + - name: depreciationvalue + label: reports.asset.depreciationvalue + type: number + source: asset + - name: totaldepreciationval + label: reports.asset.totaldepreciationval + type: number + source: asset + - name: name + label: reports.asset.name + type: string + source: asset + - name: code + label: reports.asset.code + type: string + source: asset + - name: ordernumber + label: reports.asset.ordernumber + type: number + - name: warrantyavailable + label: reports.asset.warrantyavailable + type: string + source: asset + - name: wipreferenceno + label: reports.asset.wipreferenceno + type: string + source: asset + - name: floors + label: reports.asset.floors + type: number + source: asset + - name: titledocumentsavailable + label: reports.asset.titledocumentsavailable + type: number + - name: buyername + label: reports.asset.buyername + type: string + source: asset + - name: accumulateddepreciation + label: reports.asset.accumulateddepreciation + type: number + source: asset + - name: openingdate + label: reports.asset.openingdate + type: number + source: asset + - name: fundsourcename + label: reports.asset.fundsource + type: string + source: asset + - name: location + label: reports.asset.location + type: string + source: asset + - name: totalsurveyno + label: reports.asset.totalsurveyno + type: string + source: asset + - name: assetsubcategoryname + label: reports.asset.assetsubcategoryname + type: string + source: asset + - name: assetparentcategoryname + label: reports.asset.assetparentcategoryname + type: string + source: asset + - name: depreciationrate + label: reports.asset.depreciationrate + type: number + source: asset + - name: totalrevalsum + label: reports.asset.totalrevalsum + type: number + source: asset + - name: prevtotaldepreciationval + label: reports.asset.prevtotaldepreciationval + type: string + source: asset + - name: currtotaldepreciationval + label: reports.asset.currtotaldepreciationval + type: string + source: asset + searchParams: + - name: fromDate + label: reports.asset.fromDate + type: date + source: asset + searchClause : AND asset.createddate>=$fromDate + isMandatory: false + - name: toDate + label: reports.asset.toDate + type: date + source: asset + searchClause : AND asset.createddate<=$toDate + isMandatory: false + - name: name + label: reports.asset.name + type: string + isMandatory: false + source: asset + searchClause : AND asset.name=$name + - name: code + label: reports.asset.code + type: string + isMandatory: false + source: asset + searchClause : AND asset.code=$code + - name: assetcategory + label: reports.asset.assetcategory + type: string + isMandatory: false + source: asset + searchClause : AND asset.assetcategory=assetcategory + - name: assetdetail + label: reports.asset.detail + type: number + isMandatory: false + source: asset + searchClause : and asset.code in ($assetdetail) + + query: select asset.name,asset.code,asset.ordernumber,asset.warrantyavailable,asset.wipreferenceno,asset.titledocumentsavailable as titledocumentsavailable,asset.accumulateddepreciation,asset.grossvalue,asset.id,asset.quantity,asset.totalarea,asset.openingdate,asset.fundsource,asset.location,asset.assetCategoryType, + asset.acquiredfrom,asset.anticipatedLife,asset.modeofacquisition,asset.warrantyexpirydate,asset.defectliabilityyear as defectliability,asset.defectliabilitymonth as defectliabilitymonth,(select string_agg(land.surveynumber,',') from egasset_asset_landdetails land where land.isenabled=true and asset.id=land.assetid group by asset.id) as totalsurveyno,coalesce(grossvalue,0.0)-coalesce(accumulateddepreciation,0.0)+coalesce(incrementalrevalsum,0.0)-coalesce(decrementalrevalsum,0.0) as totalrevalsum, + asset.defectliabilityday as defectliabilityday,asset.securitydepositretained, + asset.securitydepositrealized,asset.dateofcreation,asset.acquisitiondate,asset.grossvalue,asset.originalvalue,currentvalue.currentamount,funds.fundsourcename, + disposal.salevalue as disposalsalevalue,disposal.profitlossvoucherreference as disposalvoucherno,disposal.disposaldate,disposal.buyername,disposal.buyeraddress, + revaluation.revaluationdate,revaluation.incrementalrevalsum,revaluation.decrementalrevalsum, + depreciation.depreciationvalue,depreciation.totaldepreciationval,depreciation.currtotaldepreciationval,depreciation.prevtotaldepreciationval,assetsubcategoryname,assetSubCategory.depreciationrate,assetsubcategoryparent, assetparentcategoryname from egasset_asset asset left outer join + (select b.* from egasset_current_value b inner join ( select assetid,tenantid,max(createdtime) as createdtime from egasset_current_value where tenantid = $tenantid group by assetid,tenantid) c + ON b.assetid = c.assetid and b.tenantid=c.tenantid AND c.createdtime=b.createdtime) currentvalue + ON asset.id=currentvalue.assetid AND asset.tenantid=currentvalue.tenantid left outer join egasset_disposal disposal ON asset.id=disposal.assetid AND asset.tenantId = disposal.tenantid left outer join ( select dep1.*,depsum.totaldepreciationval,prevtotaldepreciationval,currtotaldepreciationval from egasset_depreciation dep1 inner join (select assetid,tenantid,max(createdtime) as createdtime from egasset_depreciation where tenantid = $tenantid group by assetid,tenantid ) depmax ON dep1.assetid=depmax.assetid AND dep1.tenantid=depmax.tenantid AND dep1.createdtime=depmax.createdtime inner join (select assetid,tenantid,sum(depreciationvalue) as totaldepreciationval from egasset_depreciation where tenantid = $tenantid group by assetid,tenantid) depsum ON dep1.assetid=depsum.assetid AND dep1.tenantid=depsum.tenantid left outer join (select assetid,tenantid,sum(depreciationvalue) as prevtotaldepreciationval from egasset_depreciation where tenantid = $tenantid AND todate<=(select startingDate::bigint from (VALUES tbl_financialYears) as financialYears (startingDate,endingDate)) group by assetid,tenantid) prevdepsum ON dep1.assetid=prevdepsum.assetid AND dep1.tenantid=prevdepsum.tenantid left outer join (select assetid,tenantid,sum(depreciationvalue) as currtotaldepreciationval from egasset_depreciation where tenantid = $tenantid AND (todate BETWEEN (select startingDate::bigint from (VALUES tbl_financialYears) as financialYears (startingDate,endingDate)) AND (select endingDate::bigint from (VALUES tbl_financialYears) as financialYears (startingDate,endingDate)) ) group by assetid,tenantid) currdepsum ON dep1.assetid=currdepsum.assetid AND dep1.tenantid=currdepsum.tenantid) depreciation ON asset.id=depreciation.assetid AND asset.tenantid=depreciation.tenantid left outer join + (select rev1.*,revinc.incrementalrevalsum,revdec.decrementalrevalsum from egasset_revaluation rev1 inner join + (select assetid,tenantid,max(createddate) as createddate from egasset_revaluation where tenantid = $tenantid + group by assetid,tenantid ) revalmax ON rev1.assetid=revalmax.assetid AND rev1.tenantid=revalmax.tenantid AND rev1.createddate=revalmax.createddate + left outer join + (select assetid,tenantid,sum(revaluationamount) as incrementalrevalsum from egasset_revaluation where tenantid = $tenantid + AND typeofchange='INCREASED' group by assetid,tenantid) revinc ON rev1.assetid=revinc.assetid and rev1.tenantid=revinc.tenantid + left outer join (select assetid,tenantid,sum(revaluationamount) as decrementalrevalsum from egasset_revaluation + where tenantid = $tenantid AND typeofchange='DECREASED' group by assetid,tenantid) revdec + ON rev1.assetid=revdec.assetid and rev1.tenantid=revdec.tenantid + where rev1.tenantid = $tenantid) revaluation + ON asset.tenantid=revaluation.tenantid AND asset.id=revaluation.assetid + left outer join ( select assetSubcategory.name assetsubcategoryname,assetSubcategory.depreciationrate as depreciationrate, + assetSubcategory.parent as assetsubcategoryparent,assetSubcategory.tenantid as tenantid,assetSubcategory.id assetsubcategoryid, + ac.name as assetparentcategoryname,ac.id assetparentcategoryid from (VALUES tbl_assetsubcategory) as assetSubcategory (id,name,depreciationRate,parent,tenantId) + inner join (VALUES tbl_assetcategory) as ac (id,name,tenantId) ON assetSubcategory.parent = ac.id) as + assetsubcategory ON asset.assetcategory::character varying=assetsubcategory.assetsubcategoryid left outer join (select funds.name fundsourcename,funds.code from (VALUES tbl_funds) as funds (id,tenantId,name,code)) as funds ON asset.fundsource=funds.code + where asset.tenantid = $tenantid AND asset.assetCategoryType='MOVABLE' + + +- reportName: AssetSchedule + summary: Asset Schedule Register Report + version: 1.0.0 + moduleName: asset + viewPath: assetScheduleReport + externalService: + - entity: $.MdmsRes.egf-master.FinancialYear + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=egf-master&masterName=FinancialYear&tenantId=$tenantid&filter=%5B%3F(%20%40.startingDate%20%3C%3D%20$currentTime%20%26%26%20%40.endingDate%20%3E%3D%20$currentTime)%5D + keyOrder: startingDate,endingDate + tableName: tbl_financialYears + stateData: true + - entity: $.MdmsRes.ASSET.AssetCategory + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=ASSET&masterName=AssetCategory&tenantId=$tenantid&filter=%5B%3F%28+@.parent%21%3Dnull%29%5D + keyOrder: id,name,depreciationRate,parent,tenantId + tableName: tbl_assetsubcategory + stateData: true + - entity: $.MdmsRes.ASSET.AssetCategory + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=ASSET&masterName=AssetCategory&tenantId=$tenantid&filter=%5B%3F%28+%40.parent%3D%3Dnull%29%5D + keyOrder: id,name,tenantId + tableName: tbl_assetcategory + stateData: true + - entity: $.MdmsRes.ASSET.AssetCategory + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=ASSET&masterName=AssetCategory&tenantId=$tenantid + keyOrder: id,name,tenantId,depreciationRate,parent + tableName: tbl_assetcategories + stateData: true + sourceColumns: + - name: assetparentcategoryname + label: reports.asset.assetparentcategoryname + type: string + source: asset + - name: assetsubcategoryname + label: reports.asset.assetsubcategoryname + type: string + source: asset + - name: name + label: reports.asset.schedulename + type: string + source: asset + - name: depreciationrate + label: reports.asset.depreciationrate + type: string + source: asset + - name: code + label: reports.asset.code + type: string + source: asset + - name: revaluationreserveaccount + label: reports.asset.revaluationreserveaccount + type: string + source: asset + - name: previousfynetblock + label: reports.asset.currentstartnetblock + type: number + source: asset + - name: plusrevalsum + label: reports.asset.plusrevalsum + type: string + source: asset + - name: minusrevalsum + label: reports.asset.minusrevalsum + type: number + source: asset + - name: revaltotal + label: reports.asset.revaltotal + type: number + source: asset + - name: accumulateddepreciationaccount + label: reports.asset.accumulateddepreciationaccount + type: string + source: asset + - name: startdepval + label: reports.asset.startdepval + type: number + source: asset + - name: currdepsum + label: reports.asset.currdepsum + type: number + source: asset + - name: totaldepsum + label: reports.asset.totaldepsum + type: number + source: asset + - name: endcurrentamount + label: reports.asset.endcurrentamount + type: string + source: asset + - name: previousfynetblock + label: reports.asset.previousfynetblock + type: string + source: asset + searchParams: + - name: assetcategorytype + label: reports.asset.assetcategorytype + isMandatory: false + type: singlevaluelist + pattern: 'list://IMMOVABLE:IMMOVABLE,MOVABLE:MOVABLE,LAND:LAND' + source: asset + - name: assetcategory + label: reports.asset.assetCategory + isMandatory: false + type: url + pattern: /egov-mdms-service/v1/_get?moduleName=ASSET&masterName=AssetCategory&tenantId=$tenantid&filter=%5B%3F(%20%40.assetCategoryType%3D%3D%27{assetcategorytype}%27%20%26%26%20%40.isAssetAllow%3D%3Dfalse)%5D|$.MdmsRes.ASSET.AssetCategory.*.id|$.MdmsRes.ASSET.AssetCategory.*.name + source: asset + wrapper: true + stateData: true + searchClause : + - name: assetsubcategory + label: reports.asset.assetSubCategory + isMandatory: false + type: url + pattern: /egov-mdms-service/v1/_get?moduleName=ASSET&masterName=AssetCategory&tenantId=$tenantid&filter=%5B%3F(%20%40.parent%3D%3D{assetcategory})%5D|$.MdmsRes.ASSET.AssetCategory.*.id|$.MdmsRes.ASSET.AssetCategory.*.name + source: asset + stateData: true + wrapper: true + searchClause : AND asset.assetcategory=$assetsubcategory + - name: department + label: reports.asset.departmentCode + isMandatory: false + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=common-masters&masterName=Department&tenantId=$tenantid|$..id|$..name + source: asset + wrapper: true + stateData: true + searchClause : AND asset.departmentcode=$department + - name: code + label: reports.asset.code + type: string + isMandatory: false + source: asset + searchClause : AND asset.code in ($code) + - name: name + label: reports.asset.name + type: string + isMandatory: false + source: asset + searchClause : AND asset.name=$name + - name: originalvaluefrom + label: reports.asset.originalvaluefrom + type: number + source: asset + searchClause : AND asset.originalvalue>=$originalvaluefrom + isMandatory: false + - name: originalvalueto + label: reports.asset.originalvalueto + type: number + source: asset + searchClause : AND asset.originalvalue<=$originalvalueto + isMandatory: false + - name: fromDate + label: reports.asset.fromDate + type: date + source: asset + searchClause : AND asset.createddate>=$fromDate + isMandatory: false + - name: toDate + label: reports.asset.toDate + type: date + source: asset + searchClause : AND asset.createddate<=$toDate + isMandatory: false + + + query: select asset.code,asset.assetcategory,asset.name,asset.originalvalue,asset.revaluationreserveaccount, + asset.accumulateddepreciationaccount,asset.assetaccount,asset.accumulateddepreciation,previousfynetblock,endcurrentamount, + plusrevalsum,minusrevalsum,coalesce(prevdepsum,0)+coalesce(asset.accumulateddepreciation,0) as startdepval, + coalesce(previousfynetblock,0.0)+coalesce(plusrevalsum,0.0)-coalesce(minusRevalsum,0.0) as revaltotal,prevdepsum, currdepsum, + coalesce(prevdepsum,0.0)+coalesce(currdepsum,0.0)+coalesce(asset.accumulateddepreciation,0.0) as totaldepsum,assetsubcategoryname,assetSubCategory.depreciationrate,assetsubcategoryparent, + assetparentcategoryname from egasset_asset asset inner join (select distinct(current.assetid),current.tenantid,current.transactiondate,previousfynetblock,current.createdtime, + endcurrentamount,plusrevalsum,minusrevalsum ,previousfynetblock+plusrevalsum-minusRevalsum as revaltotal,prevdepsum,currdepsum, + prevdepsum+currdepsum as totaldepsum from egasset_current_value current inner join (select value.assetid,currentamount as + endcurrentamount,value.tenantid,value.transactiondate,value.createdtime from egasset_current_value value inner join (select max(createdtime) as createdtime, + assetid,tenantid from egasset_current_value where tenantid=$tenantid AND transactiondate<=(select endingDate::bigint::bigint from (VALUES tbl_financialYears) as financialYears (startingDate,endingDate)) + GROUP BY assetid,tenantid) as maxvalue ON value.assetid=maxvalue.assetid and value.tenantid=maxvalue.tenantid AND + value.createdtime=maxvalue.createdtime) endcurrent ON current.assetid=endcurrent.assetid AND current.tenantid= + endcurrent.tenantid AND current.createdtime=endcurrent.createdtime left outer join (select value.assetid,currentamount as + previousfynetblock,value.tenantid,value.transactiondate,value.createdtime from egasset_current_value value inner join (select max(createdtime) as + createdtime,assetid,tenantid from egasset_current_value where tenantid=$tenantid AND transactiondate<=(select startingDate::bigint from (VALUES tbl_financialYears) as financialYears (startingDate,endingDate)) GROUP BY assetid,tenantid ) as maxvalue ON value.assetid=maxvalue.assetid and + value.tenantid=maxvalue.tenantid AND value.createdtime=maxvalue.createdtime) prevyearcurrent ON current.assetid= + prevyearcurrent.assetid AND current.tenantid=prevyearcurrent.tenantid AND current.createdtime=prevyearcurrent.createdtime + left outer join (select COALESCE(sum(revaluationamount),0.0) plusRevalsum,assetid,tenantid from egasset_revaluation where + tenantid=$tenantid AND typeofchange='INCREASED' AND (revaluationdate BETWEEN (select startingDate::bigint from (VALUES tbl_financialYears) as financialYears (startingDate,endingDate)) AND (select endingDate::bigint from (VALUES tbl_financialYears) as financialYears (startingDate,endingDate))) + GROUP BY assetid,tenantid ) plusreval ON current.assetid=plusreval.assetid AND current.tenantid= + plusreval.tenantid left outer join (select sum(revaluationamount) minusRevalsum,assetid,tenantid from egasset_revaluation where + tenantid=$tenantid AND typeofchange='DECREASED' AND (revaluationdate between (select startingDate::bigint from (VALUES tbl_financialYears) as financialYears (startingDate,endingDate)) and (select endingDate::bigint from (VALUES tbl_financialYears) as financialYears (startingDate,endingDate))) GROUP BY assetid,tenantid ) minusreval ON current.assetid=minusreval.assetid AND current.tenantid= + minusreval.tenantid left outer join (select sum(depreciationvalue) prevdepsum,assetid,tenantid from egasset_depreciation where + tenantid=$tenantid AND todate<(select startingDate::bigint from (VALUES tbl_financialYears) as financialYears (startingDate,endingDate)) GROUP BY assetid,tenantid ) prevdep ON current.assetid=prevdep. + assetid AND current.tenantid=prevdep.tenantid left outer join (select sum(depreciationvalue) currdepsum,assetid,tenantid from + egasset_depreciation where tenantid=$tenantid AND (todate between (select startingDate::bigint from (VALUES tbl_financialYears) as financialYears (startingDate,endingDate)) and (select endingDate::bigint from (VALUES tbl_financialYears) as financialYears (startingDate,endingDate))) GROUP BY assetid,tenantid ) currdep ON current.assetid=currdep.assetid AND current.tenantid= + currdep.tenantid) as transactions ON asset.id=transactions.assetid AND asset.tenantid=transactions.tenantid + left outer join ( select assetSubcategory.name as assetsubcategoryname,CASE WHEN assetSubcategory.depreciationrate='null' THEN 'NA' WHEN assetSubcategory.depreciationrate='' THEN 'NA' ELSE assetSubcategory.depreciationrate END, + assetSubcategory.parent as assetsubcategoryparent,assetSubcategory.tenantid as tenantid,assetSubcategory.id assetsubcategoryid, + ac.name as assetparentcategoryname from (VALUES tbl_assetsubcategory) as assetSubcategory (id,name,depreciationRate,parent,tenantId) + inner join (VALUES tbl_assetcategories) as ac (id,name,tenantId) ON assetSubcategory.parent = ac.id ) as + assetsubcategory ON asset.assetcategory::character varying=assetsubcategory.assetsubcategoryid + WHERE asset.tenantid=$tenantid + +- reportName: LandRegister + summary: Land Register Report + version: 1.0.0 + moduleName: asset + viewPath: landRegisterReport + selectiveDownload: true + externalService: + - entity: $.MdmsRes.ASSET.AssetCategory + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=ASSET&masterName=AssetCategory&tenantId=$tenantid&filter=%5B%3F%28+%40.assetCategoryType%3D%3D%27LAND%27++%26%26+%40.isAssetAllow%3D%3Dtrue%29%5D + keyOrder: id,name,depreciationRate,parent,tenantId + tableName: tbl_assetsubcategory + stateData: true + - entity: $.MdmsRes.ASSET.AssetCategory + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=ASSET&masterName=AssetCategory&tenantId=$tenantid&filter=%5B%3F%28+%40.assetCategoryType%3D%3D%27LAND%27++%26%26+%40.isAssetAllow%3D%3Dfalse%29%5D + keyOrder: id,name,tenantId + tableName: tbl_assetcategory + stateData: true + sourceColumns: + - name: name + label: reports.asset.name + type: string + source: asset + - name: code + label: reports.asset.code + type: string + linkedReport: + reportName: LandRegisterDetail + linkedColumn: _parent?reportName={reportName}&assetdetail={code} + source: asset + - name: dateofcreation + label: reports.asset.dateofcreation + type: epoch + source: asset + - name: grossvalue + label: reports.asset.grossvalue + type: number + source: asset + - name: originalvalue + label: reports.asset.originalvalue + type: number + source: asset + searchParams: + - name: assetcategory + label: reports.asset.assetCategory + isMandatory: false + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=ASSET&masterName=AssetCategory&tenantId=$tenantid&filter=%5B%3F(%20%40.assetCategoryType%3D%3D%27LAND%27%20%26%26%20%40.isAssetAllow%3D%3Dfalse)%5D|$.MdmsRes.ASSET.AssetCategory.*.id|$.MdmsRes.ASSET.AssetCategory.*.name + source: asset + wrapper: true + stateData: true + searchClause : AND assetsubcategory.assetsubcategoryparent =$assetcategory + - name: assetsubcategory + label: reports.asset.assetSubCategory + isMandatory: false + type: url + pattern: /egov-mdms-service/v1/_get?moduleName=ASSET&masterName=AssetCategory&tenantId=$tenantid&filter=%5B%3F(%20%40.parent%3D%3D{assetcategory})%5D|$.MdmsRes.ASSET.AssetCategory.*.id|$.MdmsRes.ASSET.AssetCategory.*.name + source: asset + wrapper: true + stateData: true + searchClause : AND asset.assetcategory=$assetsubcategory + - name: department + label: reports.asset.departmentCode + isMandatory: false + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=common-masters&masterName=Department&tenantId=$tenantid|$..code|$..name + source: asset + wrapper: true + stateData: true + searchClause : AND asset.departmentcode=$department + - name: code + label: reports.asset.code + type: string + isMandatory: false + source: asset + searchClause : AND asset.code in ($code) + - name: name + label: reports.asset.name + type: string + isMandatory: false + source: asset + searchClause : AND asset.name=$name + - name: originalvaluefrom + label: reports.asset.originalvaluefrom + type: number + source: asset + searchClause : AND asset.originalvalue>=$originalvaluefrom + isMandatory: false + - name: originalvalueto + label: reports.asset.originalvalueto + type: number + source: asset + searchClause : AND asset.originalvalue<=$originalvalueto + isMandatory: false + - name: fromDate + label: reports.asset.fromDate + type: date + source: asset + searchClause : AND asset.createddate>=$fromDate + isMandatory: false + - name: toDate + label: reports.asset.toDate + type: date + source: asset + searchClause : AND asset.createddate<=$toDate + isMandatory: false + + + + + query: select asset.name,asset.code,asset.ordernumber,asset.warrantyavailable,asset.wipreferenceno,asset.titledocumentsavailable as titledocumentsavailable,asset.accumulateddepreciation,asset.grossvalue,asset.id,asset.quantity,asset.totalarea,asset.openingdate,asset.fundsource,asset.location,(select string_agg(land.surveynumber,',') from egasset_asset_landdetails land where land.isenabled=true and asset.id=land.assetid group by asset.id) as totalsurveyno, + asset.acquiredfrom,asset.anticipatedLife,asset.modeofacquisition,asset.warrantyexpirydate,asset.defectliabilityyear as defectliability,asset.defectliabilitymonth as defectliabilitymonth,asset.assetCategoryType, + asset.defectliabilityday as defectliabilityday,asset.securitydepositretained, + asset.securitydepositrealized,asset.dateofcreation,asset.acquisitiondate,asset.grossvalue,asset.originalvalue,currentvalue.currentamount, + disposal.salevalue as disposalsalevalue,disposal.profitlossvoucherreference as disposalvoucherno,disposal.disposaldate,disposal.buyername,disposal.buyeraddress, + revaluation.revaluationdate,revaluation.incrementalrevalsum,revaluation.decrementalrevalsum,assetsubcategoryname,assetSubCategory.depreciationrate,assetsubcategoryparent, + assetparentcategoryname + from egasset_asset asset left outer join + (select b.* from egasset_current_value b inner join ( select assetid,tenantid,max(createdtime) as createdtime from egasset_current_value + where tenantid = $tenantid group by assetid,tenantid) c + ON b.assetid = c.assetid and b.tenantid=c.tenantid AND c.createdtime=b.createdtime) currentvalue + ON asset.id=currentvalue.assetid AND asset.tenantid=currentvalue.tenantid + left outer join egasset_disposal disposal ON asset.id=disposal.assetid AND asset.tenantId = disposal.tenantid + left outer join + (select rev1.*,revinc.incrementalrevalsum,revdec.decrementalrevalsum from egasset_revaluation rev1 inner join + (select assetid,tenantid,max(createddate) as createddate from egasset_revaluation where tenantid = $tenantid + group by assetid,tenantid ) revalmax ON rev1.assetid=revalmax.assetid AND rev1.tenantid=revalmax.tenantid AND rev1.createddate=revalmax.createddate + left outer join + (select assetid,tenantid,sum(revaluationamount) as incrementalrevalsum from egasset_revaluation where tenantid = $tenantid + AND typeofchange='INCREASED' group by assetid,tenantid) revinc ON rev1.assetid=revinc.assetid and rev1.tenantid=revinc.tenantid + left outer join (select assetid,tenantid,sum(revaluationamount) as decrementalrevalsum from egasset_revaluation + where tenantid = $tenantid AND typeofchange='DECREASED' group by assetid,tenantid) revdec + ON rev1.assetid=revdec.assetid and rev1.tenantid=revdec.tenantid + where rev1.tenantid = $tenantid) revaluation + ON asset.tenantid=revaluation.tenantid AND asset.id=revaluation.assetid + left outer join ( select assetSubcategory.name assetsubcategoryname,assetSubcategory.depreciationrate as depreciationrate, + assetSubcategory.parent as assetsubcategoryparent,assetSubcategory.tenantid as tenantid,assetSubcategory.id assetsubcategoryid, + ac.name as assetparentcategoryname from (VALUES tbl_assetsubcategory) as assetSubcategory (id,name,depreciationRate,parent,tenantId) + inner join (VALUES tbl_assetcategory) as ac (id,name,tenantId) ON assetSubcategory.parent = ac.id ) as + assetsubcategory ON asset.assetcategory::character varying=assetsubcategory.assetsubcategoryid + where asset.tenantid = $tenantid AND asset.assetCategoryType='LAND' + + +- reportName: LandRegisterDetail + summary: Land Register Report + version: 1.0.0 + moduleName: asset + viewPath: landRegisterReport + selectiveDownload: true + externalService: + - entity: $.MdmsRes.ASSET.AssetCategory + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=ASSET&masterName=AssetCategory&tenantId=$tenantid&filter=%5B%3F%28+%40.assetCategoryType%3D%3D%27LAND%27++%26%26+%40.isAssetAllow%3D%3Dtrue%29%5D + keyOrder: id,name,depreciationRate,parent,tenantId + tableName: tbl_assetsubcategory + stateData: true + - entity: $.MdmsRes.ASSET.AssetCategory + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=ASSET&masterName=AssetCategory&tenantId=$tenantid&filter=%5B%3F%28+%40.assetCategoryType%3D%3D%27LAND%27++%26%26+%40.isAssetAllow%3D%3Dfalse%29%5D + keyOrder: id,name,tenantId + tableName: tbl_assetcategory + stateData: true + - entity: $.MdmsRes.egf-master.Fund + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=egf-master&masterName=Fund&tenantId=$tenantid + keyOrder: id,tenantId,name,code + tableName: tbl_funds + stateData: true + sourceColumns: + - name: id + label: reports.asset.id + type: number + source: asset + - name: quantity + label: reports.asset.quantity + type: number + source: asset + - name: plintharea + label: reports.asset.plintharea + type: number + source: asset + showColumn: true + - name: cubiccontents + label: reports.asset.cubiccontents + type: string + source: asset + - name: landsurveyno + label: reports.asset.landsurveyno + type: string + source: asset + - name: length + label: reports.asset.length + type: number + source: asset + - name: width + label: reports.asset.width + type: number + source: asset + - name: height + label: reports.asset.height + type: number + source: asset + - name: totalarea + label: reports.asset.totalarea + type: number + source: asset + - name: acquiredfrom + label: reports.asset.acquiredfrom + type: string + source: asset + - name: anticipatedLife + label: reports.asset.anticipatedLife + type: number + source: asset + - name: modeofacquisition + label: reports.asset.modeofacquisition + type: string + source: asset + - name: warrantyexpirydate + label: reports.asset.warrantyexpirydate + type: number + source: asset + - name: defectliability + label: reports.asset.defectliability + type: number + source: asset + - name: defectliabilitymonth + label: reports.asset.defectliabilitymonth + type: number + source: asset + - name: defectliabilityday + label: reports.asset.defectliabilityday + type: string + source: asset + - name: securitydepositretained + label: reports.asset.securitydepositretained + type: number + source: asset + - name: securitydepositrealized + label: reports.asset.securitydepositrealized + type: number + source: asset + - name: dateofcreation + label: reports.asset.dateofcreation + type: string + source: asset + - name: acquisitiondate + label: reports.asset.acquisitiondate + type: string + source: asset + - name: grossvalue + label: reports.asset.grossvalue + type: number + source: asset + - name: originalvalue + label: reports.asset.originalvalue + type: number + source: asset + - name: currentvalue + label: reports.asset.currentvalue + type: number + source: asset + - name: currentamount + label: reports.asset.currentamount + type: number + source: asset + - name: disposalsalevalue + label: reports.asset.disposalsalevalue + type: number + source: asset + - name: disposalvoucherno + label: reports.asset.disposalvoucherno + type: number + source: asset + - name: disposaldate + label: reports.asset.disposaldate + type: string + source: asset + - name: revaluationdate + label: reports.asset.revaluationdate + type: string + source: asset + - name: incrementalrevalsum + label: reports.asset.incrementalrevalsum + type: number + source: asset + - name: decrementalrevalsum + label: reports.asset.decrementalrevalsum + type: number + source: asset + - name: depreciationvalue + label: reports.asset.depreciationvalue + type: number + source: asset + - name: totaldepreciationval + label: reports.asset.totaldepreciationval + type: number + source: asset + - name: name + label: reports.asset.name + type: string + source: asset + - name: code + label: reports.asset.code + type: string + source: asset + - name: ordernumber + label: reports.asset.ordernumber + type: number + - name: warrantyavailable + label: reports.asset.warrantyavailable + type: string + source: asset + - name: wipreferenceno + label: reports.asset.wipreferenceno + type: string + source: asset + - name: floors + label: reports.asset.floors + type: number + source: asset + - name: titledocumentsavailable + label: reports.asset.titledocumentsavailable + type: number + - name: buyername + label: reports.asset.buyername + type: string + source: asset + - name: accumulateddepreciation + label: reports.asset.accumulateddepreciation + type: number + source: asset + - name: openingdate + label: reports.asset.openingdate + type: number + source: asset + - name: fundsourcename + label: reports.asset.fundsource + type: string + source: asset + - name: location + label: reports.asset.location + type: string + source: asset + - name: totalsurveyno + label: reports.asset.totalsurveyno + type: string + source: asset + - name: assetattributes + label: reports.asset.assetattributes + type: string + source: asset + - name: assetsubcategoryname + label: reports.asset.assetsubcategoryname + type: string + source: asset + - name: assetparentcategoryname + label: reports.asset.assetparentcategoryname + type: string + source: asset + - name: depreciationrate + label: reports.asset.depreciationrate + type: number + source: asset + - name: totalrevalsum + label: reports.asset.totalrevalsum + type: number + source: asset + searchParams: + - name: fromDate + label: reports.asset.fromDate + type: date + source: asset + searchClause : AND asset.createddate>=$fromDate + isMandatory: false + - name: toDate + label: reports.asset.toDate + type: date + source: asset + searchClause : AND asset.createddate<=$toDate + isMandatory: false + - name: name + label: reports.asset.name + type: string + isMandatory: false + source: asset + searchClause : AND asset.name=$name + - name: code + label: reports.asset.code + type: string + isMandatory: false + source: asset + searchClause : AND asset.code=$code + - name: assetdetail + label: reports.asset.detail + type: number + isMandatory: false + source: asset + searchClause : and asset.code in ($assetdetail) + + query: select asset.name,asset.code,asset.ordernumber,asset.warrantyavailable,asset.wipreferenceno,asset.titledocumentsavailable as titledocumentsavailable,asset.accumulateddepreciation,asset.grossvalue,asset.id,asset.quantity,asset.totalarea,asset.openingdate,asset.fundsource,asset.location,(select string_agg(land.surveynumber,',') from egasset_asset_landdetails land where land.isenabled=true and asset.id=land.assetid group by asset.id) as totalsurveyno,asset.assetattributes,funds.fundsourcename, + asset.acquiredfrom,asset.anticipatedLife,asset.modeofacquisition,asset.warrantyexpirydate,asset.defectliabilityyear as defectliability,asset.defectliabilitymonth as defectliabilitymonth,asset.assetCategoryType,coalesce(grossvalue,0.0)-coalesce(accumulateddepreciation,0.0)+coalesce(incrementalrevalsum,0.0)-coalesce(decrementalrevalsum,0.0) as totalrevalsum, + asset.defectliabilityday as defectliabilityday,asset.securitydepositretained, + asset.securitydepositrealized,asset.dateofcreation,asset.acquisitiondate,asset.grossvalue,asset.originalvalue,currentvalue.currentamount, + disposal.salevalue as disposalsalevalue,disposal.profitlossvoucherreference as disposalvoucherno,disposal.disposaldate,disposal.buyername,disposal.buyeraddress, + revaluation.revaluationdate,revaluation.incrementalrevalsum,revaluation.decrementalrevalsum,assetsubcategoryname,assetSubCategory.depreciationrate,assetsubcategoryparent, + assetparentcategoryname + from egasset_asset asset left outer join + (select b.* from egasset_current_value b inner join ( select assetid,tenantid,max(createdtime) as createdtime from egasset_current_value + where tenantid = $tenantid group by assetid,tenantid) c + ON b.assetid = c.assetid and b.tenantid=c.tenantid AND c.createdtime=b.createdtime) currentvalue + ON asset.id=currentvalue.assetid AND asset.tenantid=currentvalue.tenantid + left outer join egasset_disposal disposal ON asset.id=disposal.assetid AND asset.tenantId = disposal.tenantid + left outer join + (select rev1.*,revinc.incrementalrevalsum,revdec.decrementalrevalsum from egasset_revaluation rev1 inner join + (select assetid,tenantid,max(createddate) as createddate from egasset_revaluation where tenantid = $tenantid + group by assetid,tenantid ) revalmax ON rev1.assetid=revalmax.assetid AND rev1.tenantid=revalmax.tenantid AND rev1.createddate=revalmax.createddate + left outer join + (select assetid,tenantid,sum(revaluationamount) as incrementalrevalsum from egasset_revaluation where tenantid = $tenantid + AND typeofchange='INCREASED' group by assetid,tenantid) revinc ON rev1.assetid=revinc.assetid and rev1.tenantid=revinc.tenantid + left outer join (select assetid,tenantid,sum(revaluationamount) as decrementalrevalsum from egasset_revaluation + where tenantid = $tenantid AND typeofchange='DECREASED' group by assetid,tenantid) revdec + ON rev1.assetid=revdec.assetid and rev1.tenantid=revdec.tenantid + where rev1.tenantid = $tenantid) revaluation + ON asset.tenantid=revaluation.tenantid AND asset.id=revaluation.assetid + left outer join ( select assetSubcategory.name assetsubcategoryname,assetSubcategory.depreciationrate as depreciationrate, + assetSubcategory.parent as assetsubcategoryparent,assetSubcategory.tenantid as tenantid,assetSubcategory.id assetsubcategoryid, + ac.name as assetparentcategoryname from (VALUES tbl_assetsubcategory) as assetSubcategory (id,name,depreciationRate,parent,tenantId) + inner join (VALUES tbl_assetcategory) as ac (id,name,tenantId) ON assetSubcategory.parent = ac.id ) as + assetsubcategory ON asset.assetcategory::character varying=assetsubcategory.assetsubcategoryid left outer join (select funds.name fundsourcename,funds.code from (VALUES tbl_funds) as funds (id,tenantId,name,code)) as funds ON asset.fundsource=funds.code + where asset.tenantid = $tenantid AND asset.assetCategoryType='LAND' diff --git a/configs/reports/configs/citizen-reports.yml b/configs/reports/configs/citizen-reports.yml new file mode 100644 index 00000000..47098b07 --- /dev/null +++ b/configs/reports/configs/citizen-reports.yml @@ -0,0 +1,49 @@ +--- +ReportDefinitions: +- reportName: CitizenService + summary: Citizen Services Report + version: 1.0.0 + moduleName: citizen + sourceColumns: + - name: receiptNo + label: reports.citizen.receiptno + type: string + source: citizen + - name: receiptDate + label: reports.citizen.receiptdate + type: number + source: citizen + - name: totalAmount + label: reports.citizen.totalamount + type: number + source: citizen + - name: payeeName + label: reports.citizen.payeename + type: number + source: citizen + - name: consumerAddress + label: reports.citizen.consumeraddress + type: number + source: citizen + - name: print + label: reports.citizen.print + type: number + source: citizen + linkedReport: + reportName: ReceiptDetail + linkedColumn: _url?/pgr/viewGrievance/:srn + searchParams: + - name: consumerno + label: reports.citizen.consumerno + type: string + source: citizen + isMandatory: false + searchClause: and consumerNo = $consumerno + - name: receiptno + label: reports.citizen.receiptno + type: string + source: citizen + isMandatory: false + searchClause: and receiptno = $receiptno + query: select receiptNo,receiptDate,totalAmount,payeeName,consumerAddress,'print' as print from egcl_legacy_receipt_header where tenantid = $tenantid + diff --git a/configs/reports/configs/common-reports.yml b/configs/reports/configs/common-reports.yml new file mode 100644 index 00000000..98f4b55f --- /dev/null +++ b/configs/reports/configs/common-reports.yml @@ -0,0 +1,68 @@ +--- +ReportDefinitions: +- reportName: CommonInbox + summary: Common Inbox + version: 1.0.0 + moduleName: common + sourceColumns: + - name: createddate + label: reports.common.createddate + type: epoch + source: common + - name: sendername + label: reports.common.sendername + type: string + source: egpgr_router + - name: natureoftask + label: reports.common.natureoftask + type: string + source: common + - name: status + label: reports.common.status + type: string + source: common + - name: details + label: reports.common.details + type: string + source: common + - name: url + label: reports.common.url + type: string + source: common + searchParams: + - name: positionId + label: reports.pgr.complaintcategorytype + type: number + source: seva + - name: complainttype + label: reports.pgr.complainttype + type: number + source: seva + query: select * from ( + (select sub.createddate as createddate,sub.name as senderName,'Grievance' as natureoftask ,sub_a.code as status, + 'Complaint No.'|| sub.crn||' regarding '|| + (select name from egpgr_complainttype where code =sub.servicecode AND tenantid=sub.tenantid) ||' in '|| sub_a.code as details, + replace('_url?/pgr/viewGrievance/:srn',':srn',replace(sub.crn, '/', '%2F')::character varying) as url from submission sub inner join submission_attribute sub_a on sub.crn = sub_a.crn where + sub_a.key in('systemStatus','status') and sub_a.code in ('REGISTERED','FORWARDED','PROCESSING','REOPENED','ONHOLD') and sub.positionid IN ($positionId) and sub.tenantid = $tenantid order by createdDate desc) + union + (select createddate as createddate,sendername as sendername,natureoftask as natureoftask,value as status, abstractestimate.abstractestimatenumber::character varying ||':'||comments as details, + replace('_url?/non-framework/works/transaction/update/abstractEstimate/:id', ':id', replace(abstractestimate.abstractestimatenumber, '/', '%2F')::character varying) as url from EG_WF_STATES states JOIN + egw_abstractestimate abstractestimate ON abstractestimate.stateid = states.id::character varying where type = 'AbstractEstimate' and owner_pos IN ($positionId) + and states.tenantId=$tenantid and states.status<>2 order by states.createdDate desc) + union + (select createddate as createddate,sendername as sendername,natureoftask as natureoftask,value as status, abstractestimate.abstractestimatenumber::character varying ||':'||comments as details, + replace('_url?/non-framework/works/transaction/update/abstractEstimate/:id', ':id', replace(abstractestimate.abstractestimatenumber, '/', '%2F')::character varying) as url from EG_WF_STATES states JOIN + egw_abstractestimate abstractestimate ON abstractestimate.stateid = states.id::character varying where type = 'SpilloverAbstractEstimate' and owner_pos IN ($positionId) + and states.tenantId=$tenantid and states.status<>2 order by states.createdDate desc) + union + (select createddate as createddate,sendername as sendername,natureoftask as natureoftask,value as status, detailedestimate.id::character varying ||':'||comments as details, + replace('_url?/non-framework/works/transaction/viewDetailedEstimate/:id', ':id', replace(detailedestimate.estimatenumber, '/', '%2F')::character varying) as url from EG_WF_STATES states JOIN + egw_detailedestimate detailedestimate ON detailedestimate.stateid = states.id::character varying where type = 'DetailedEstimate' and owner_pos IN ($positionId) + and states.tenantId=$tenantid and states.status<>2 order by states.createdDate desc) + union + (select createddate as createddate,sendername as sendername,natureoftask as natureoftask,value as status, detailedestimate.id::character varying ||':'||comments as details, + replace('_url?/non-framework/works/transaction/viewDetailedEstimate/:id', ':id', replace(detailedestimate.estimatenumber, '/', '%2F')::character varying) as url from EG_WF_STATES states JOIN + egw_detailedestimate detailedestimate ON detailedestimate.stateid = states.id::character varying where type = 'SpilloverDetailedEstimate' and owner_pos IN ($positionId) + and states.tenantId=$tenantid and states.status<>2 order by states.createdDate desc)) result + order by createddate desc; + diff --git a/configs/reports/configs/e-pass-reports.yml b/configs/reports/configs/e-pass-reports.yml new file mode 100644 index 00000000..bb145438 --- /dev/null +++ b/configs/reports/configs/e-pass-reports.yml @@ -0,0 +1,96 @@ +ReportDefinitions: +- reportName: epassreport + summary: epass report + version: 1.0.0 + moduleName: rainmaker-epass + sourceColumns: + - name: applicationnumber + label: reports.epass.applicationnumber + type: string + source: epass + total: false + - name: applicationdate + label: reports.epass.applicationdate + type: string + source: epass + total: false + - name: fromdistrict + label: reports.epass.fromdistrict + type: string + source: epass + total: false + - name: todistrict + label: reports.epass.todistrict + type: string + source: epass + total: false + - name: tradeType + label: reports.epass.tradetype + type: string + source: epass + total: false + - name: issuedate + label: reports.epass.issuedate + type: string + source: epass + total: false + - name: purpose + label: reports.epass.purpose + type: string + source: epass + total: false + - name: vehiclenumber + label: reports.epass.vehiclenumber + type: string + source: epass + total: false + - name: licensenumber + label: reports.epass.licensenumber + type: string + source: epass + total: false + - name: status + label: reports.epass.status + type: string + source: epass + total: false + - name: rejectionremarks + label: reports.epass.rejectionremarks + type: string + source: epass + total: false + searchParams: + - name: fromDate + label: reports.epass.fromDate + type: epoch + source: epass + isMandatory: false + searchClause: AND tl.createdtime >= $fromDate + - name: toDate + label: reports.epass.toDate + type: epoch + source: epass + isMandatory: false + searchClause: AND tl.createdtime <= $toDate + query: | + select + tl.applicationnumber, + to_char((To_timestamp(tl.createdtime/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY HH:MI AM') as applicationDate, + CASE WHEN tlu.tradeType = 'INTERSTATE' THEN 'Other State to MP Pass' + WHEN tlu.tradeType = 'INTRASTATE' THEN 'MP Inter District Pass' + WHEN tlu.tradeType = 'MP_TO_OTHER_STATE' THEN 'MP to Other State Pass' + ELSE 'NA' END as tradeType, + initcap(replace(tld.additionaldetail->>'fromDistrict', 'MP_', '')) as fromDistrict, + initcap(replace(tld.additionaldetail->>'toDistrict', 'MP_', '')) as toDistrict, + COALESCE(to_char((To_timestamp(tl.issueddate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY HH:MI AM'), '') as issueDate, + initcap(replace(COALESCE(tld.additionaldetail->>'purpose', ''), '_',' ')) as purpose, + COALESCE(tld.additionaldetail->>'vehicleNumber', '') as vehicleNumber, + COALESCE(tl.licensenumber, '') as licensenumber, + initcap(tl.status) as status, + COALESCE(tlw.comment, '') as rejectionRemarks + from eg_tl_tradelicense as tl + inner join eg_tl_tradelicensedetail as tld on tld.tradelicenseid = tl.id + inner join eg_tl_TradeUnit as tlu on tlu.tradeLicenseDetailId = tld.id + left join eg_wf_processinstance_v2 as tlw on tlw.businessid = tl.applicationnumber and tlw.action = 'REJECT' + where tl.tenantid = $tenantid and tl.status not in ('INITIATED') + orderby: order by tl.createdtime desc diff --git a/configs/reports/configs/finance-reports.yml b/configs/reports/configs/finance-reports.yml new file mode 100644 index 00000000..a7cb996b --- /dev/null +++ b/configs/reports/configs/finance-reports.yml @@ -0,0 +1,177 @@ +ReportDefinitions: + - reportName: ReceiptRegister + summary: Receipt Register + version: 1.0.0 + moduleName: finance + externalService: + - entity: $.MdmsRes.common-masters.Department + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=common-masters&masterName=Department&tenantId=$tenantId + keyOrder: name,code + tableName: tbl_def_dept + sourceColumns: + - name: receiptnumber + label: reports.fin.erp.receiptnumber + type: string + source: finance-erp + total: false + - name: receiptdate + label: reports.fin.erp.receiptdate + type: string + source: finance-erp + total: false + - name: service + label: reports.fin.erp.service + type: string + source: finance-erp + total: false + - name: department + label: reports.fin.erp.department + type: string + source: finance-erp + total: false + - name: cash + label: reports.fin.erp.cash + type: number + source: finance-erp + total: true + - name: chequenumber + label: reports.fin.erp.chequenumber + type: number + source: finance-erp + total: false + - name: cheque + label: reports.fin.erp.cheque + type: number + source: finance-erp + total: true + - name: online + label: reports.fin.erp.online + type: number + source: finance-erp + total: true + - name: card + label: reports.fin.erp.card + type: number + source: finance-erp + total: true + - name: status + label: reports.fin.erp.status + type: string + source: finance-erp + total: false + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: false + searchClause: AND receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: false + searchClause: AND receiptdate <= $toDate + - name: dept + label: Department + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=common-masters&masterName=Department|$.MdmsRes.common-masters.Department[*].code|$.MdmsRes.common-masters.Department[*].name + source: finance-erp + wrapper: true + isMandatory: false + searchClause: AND deptmap_def.code = $dept + - name: service + label: Service + type: singlevaluelist + pattern: http://egov-common-masters:8080/egov-common-masters/businessDetails/_search?tenantId=$tenantid&active=true|$.BusinessDetails[*].code|$.BusinessDetails[*].name + source: finance-erp + wrapper: true + isMandatory: false + searchClause: AND rt.businessdetails = $service + + query: select to_char(to_timestamp(rt.receiptdate/1000),'DD/MM/YYYY') as receiptdate, rt.receiptnumber as receiptnumber, bd.name as Service, deptmap_def.name as department, (case when instrumenttype='Cash' then ins.amount end) as cash, (case when instrumenttype='Cheque' then ins.amount when instrumenttype='DD' then ins.amount end) as cheque, (case when instrumenttype='Cheque' then ins.instrumentnumber when instrumenttype='DD' then ins.instrumentnumber end) as chequenumber, (case when instrumenttype='Online' then ins.amount end) as online, (case when instrumenttype='Card' then amount end) as card, rt.status as status from egcl_receiptheader rt inner join (VALUES tbl_def_dept) AS deptmap_def(name,code) on deptmap_def.code=rt.department, eg_businessdetails bd, egcl_instrumentheader ins where ins.id = (select instrumentheader from egcl_receiptinstrument where receiptheader = rt.id) and rt.tenantid = bd.tenantid and rt.businessdetails = bd.code + orderby: ORDER BY receiptdate DESC NULLS LAST + - reportName: BankRemittance + summary: BankRemittance + version: 1.0.0 + moduleName: finance + sourceColumns: + - name: receiptnumber + label: reports.fin.erp.receiptnumber + type: string + source: finance-erp + total: false + - name: receiptdate + label: reports.fin.erp.receiptdate + type: string + source: finance-erp + total: false + - name: modeofpayment + label: reports.fin.erp.modeofpayment + type: string + source: finance-erp + total: false + - name: chequenumber + label: reports.fin.erp.chequenumber + type: string + source: finance-erp + total: false + - name: bankname + label: reports.fin.erp.bankname + type: string + source: finance-erp + total: false + - name: branchname + label: reports.fin.erp.branchname + type: string + source: finance-erp + total: false + - name: chequdate + label: reports.fin.erp.chequedate + type: string + source: finance-erp + total: false + - name: amount + label: reports.fin.erp.amount + type: number + source: finance-erp + total: true + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: false + searchClause: AND receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: false + searchClause: AND receiptdate <= $toDate + - name: dept + label: Department + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=common-masters&masterName=Department|$.MdmsRes.common-masters.Department[*].code|$.MdmsRes.common-masters.Department[*].name + source: finance-erp + wrapper: true + isMandatory: false + searchClause: AND rt.department = $dept + - name: service + label: Service + type: singlevaluelist + pattern: http://egov-common-masters:8080/egov-common-masters/businessDetails/_search?tenantId=$tenantid&active=true|$.BusinessDetails[*].code|$.BusinessDetails[*].name + source: finance-erp + wrapper: true + isMandatory: false + searchClause: AND rt.businessdetails = $service + - name: bankaccount + label: Bank Account + type: singlevaluelist + pattern: https://jalandhar-dev.egovernments.org/services/EGF/rest/bankaccount?tenantId=$tenantid|$.bankaccounts[*].code|$.bankaccounts[*].account + source: finance-erp + wrapper: true + isMandatory: false + searchClause: And ins.bankaccountid = $bankaccount + + query: select receiptnumber as receiptnumber , to_char(to_timestamp(receiptdate/1000),'DD/MM/YYYY') as receiptdate, instrumenttypeid as modeofpayment, transactionnumber as chequenumber, bankid as bankname, branchname branchname,amount as amount from egf_instrumentvoucher vh INNER JOIN egf_instrument ins on ins.id = vh.instrumentid INNER JOIN egcl_receiptheader rt on rt.id = vh.receiptheaderid WHERE rt.status = 'Remitted' diff --git a/configs/reports/configs/inventoryReport.yml b/configs/reports/configs/inventoryReport.yml new file mode 100644 index 00000000..d04da1db --- /dev/null +++ b/configs/reports/configs/inventoryReport.yml @@ -0,0 +1,1090 @@ +--- +ReportDefinitions: + # Stock Opening Balance Report +- reportName: openingBalanceReport + summary: Stock Opening Balance Report + version: 1.0.0 + moduleName: inventory + externalService: + - entity: $.MdmsRes.inventory.Material + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=inventory&masterName=Material&tenantId=$tenantid + keyOrder: code,name,tenantId + tableName: tbl_material + - entity: $.MdmsRes.common-masters.Uom + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=common-masters&masterName=Uom&tenantId=$tenantid + keyOrder: code,conversionFactor,tenantId + tableName: tbl_uom + sourceColumns: + + - name: financialYear + label: inventory.financialYear + type: string + source: materialReceipt + + - name: storeName + label: inventory.store.name + type: string + source: materialReceipt + + - name: materialCode + label: inventory.material.code + type: string + source: materialReceipt + + - name: materialName + label: inventory.materialName + type: string + source: material + + - name: materialTypeName + label: inventory.material.materialtype + type: string + source: materialReceiptDetails + + - name: uom + label: reports.inventory.openbal.Uom + type: string + source: materialReceiptDetails + + - name: qty + label: reports.inventory.openbal.Qty. + type: string + source: materialReceiptDetails + + - name: rate + label: inventory.Rate + type: string + source: materialReceiptDetails + + - name: totalAmount + label: reports.inventory.openbal.TotalAmount + type: string + source: materialReceiptDetails + + - name: remarks + label: reports.inventory.openbal.Remarks + type: string + source: materialReceiptDetails + + searchParams: + - name: financialYear + label: inventory.financialYear + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$..finYearRange|$..finYearRange + source: materialReceipt + isMandatory: true + + - name: storeName + label: inventory.store.name + type: singlevaluelist + pattern: http://inventory-services:8080/inventory-services/stores/_search?active=true&tenantId=$tenantid|$..code|$..name + source: store + isMandatory: true + wrapper: true + + - name: materialTypeName + label: inventory.material.materialtype + type: singlevaluelist + pattern: 'list://OPENING BALANCE:OPENING BALANCE' + source: materialReceipt + isMandatory: false + searchClause: AND matrcpt.receiptType = $materialTypeName + + - name: materialName + label: inventory.materialName + type: string + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=inventory&masterName=Material&tenantId=$tenantid|$.MdmsRes.inventory.Material.*.code|$.MdmsRes.inventory.Material.*.name + source: materialReceipt + isMandatory: false + searchClause: AND mat.name = $materialName + query: SELECT matrcpt.financialyear AS financialyear, + store.name AS storeName, + matrcptdtl.material AS materialcode, + mat.name AS materialname, + matrcpt.receiptType AS materialtypename, + matrcptdtl.uomno AS uom, + (matrcptdtl.receivedqty / (SELECT CAST(conversionFactor AS bigint) FROM (values tbl_uom )AS tb (code,conversionFactor,tenantid) + WHERE tb.code = matrcptdtl.uomno AND tb.tenantid= $tenantid AND matrcptdtl.tenantid = $tenantid)) ::numeric(13,2) AS qty, + matrcptdtl.unitrate AS rate, + (matrcptdtl.unitrate * (matrcptdtl.receivedqty / (SELECT CAST(conversionFactor AS bigint) FROM (values tbl_uom )AS tb (code,conversionFactor,tenantid) + WHERE tb.code = matrcptdtl.uomno AND tb.tenantid= $tenantid AND matrcptdtl.tenantid = $tenantid))) ::numeric(13,2) AS totalamount, + matrcptdtl.remarks AS remarks + FROM materialreceipt matrcpt, + (VALUES tbl_material) AS mat (code, name, tenantid), + (VALUES tbl_uom) AS uomtbl (code,conversionFactor,tenantid), + materialreceiptdetail matrcptdtl , store store + WHERE matrcpt.financialyear = $financialYear + AND matrcpt.receivingstore = store.code + AND matrcpt.receivingstore = $storeName + AND store.tenantid = matrcpt.tenantid + AND mat.tenantid= matrcpt.tenantid + AND uomtbl.code=matrcptdtl.uomno + AND uomtbl.tenantid= store.tenantid + AND matrcpt.tenantid = matrcptdtl.tenantid + AND mat.tenantid = matrcpt.tenantid + AND matrcpt.tenantid = $tenantid + AND matrcpt.mrnnumber = matrcptdtl.mrnnumber + AND mat.code = matrcptdtl.material + +# Supplier Report +- reportName: supplierreport + summary: Supplier List + version: 1.0.0 + moduleName: inventory + sourceColumns: + - name: supplierCode + label: inventory.supplier.code + type: string + source: supplier + + - name: supplierType + label: inventory.supplier.type + type: string + source: supplier + + - name: supplierName + label: inventory.supplier.name + type: string + source: supplier + + - name: status + label: inventory.common.status + type: string + source: supplier + + - name: address + label: inventory.supplier.address + type: string + source: supplier + + - name: contactNo + label: inventory.common.contactNo + type: string + source: supplier + + - name: email + label: inventory.report.email + type: string + source: supplier + + - name: cstNo + label: inventory.common.cstno + type: string + source: supplier + + - name: bankName + label: inventory.common.bankname + type: string + source: supplier + + - name: bankBranch + label: inventory.common.bankbranchname + type: string + source: supplier + + - name: bankAcctNo + label: inventory.common.bankacctno + type: string + source: supplier + + - name: ifsc + label: inventory.common.ifsc + type: string + source: supplier + + - name: contactPerson + label: inventory.common.contactperson + type: string + source: supplier + + - name: contactPersonNo + label: inventory.common.contactpersonno + type: string + source: supplier + + query: SELECT supplier.code AS supplierCode, supplier.type AS supplierType, supplier.name AS supplierName, + supplier.status AS status, supplier.address AS address , supplier.contactno AS contactNo, + supplier.email AS email, supplier.cstno AS cstNo, + bank.name AS bankName, supplier.bankbranch AS bankBranch, supplier.bankacctno AS bankAcctNo, + supplier.bankifsc AS ifsc, supplier.contactperson AS contactPerson, + supplier.contactpersonno AS contactPersonNo + FROM supplier AS supplier, egf_bank bank + WHERE + bank.code = supplier.bankcode + AND bank.tenantid = supplier.tenantid + AND supplier.tenantid = $tenantid + ORDER BY supplier.name asc; + +# Material Returned Report +# Need to change drop down Link based on report and Query +- reportName: materialReturnedReport + summary: Material Returned Report + version: 1.0.0 + moduleName: inventory + sourceColumns: + + - name: materialReturnNo + label: inventory.materialReturnNo + type: string + source: inventory + + - name: returnDate + label: inventory.returnDate + type: string + source: inventory + + - name: supplierName + label: inventory.supplierName + type: epoch + source: inventory + + - name: materialCode + label: inventory.materialCode + type: string + source: inventory + + - name: materialName + label: inventory.materialName + type: string + source: inventory + + - name: returnedQty + label: inventory.returnedQty + type: string + source: inventory + + - name: uom + label: inventory.uom + type: string + source: inventory + + - name: unitRate + label: inventory.unitRate + type: string + source: inventory + + - name: totalReturnedAmount + label: inventory.totalReturnedAmount + type: string + source: inventory + + - name: returnRemarks + label: inventory.returnRemarks + type: string + source: inventory + + - name: returnBy + label: inventory.returnBy + type: string + source: inventory + + searchParams: + + - name: storeName + label: inventory.store.name + type: singlevaluelist + pattern: http://inventory-services:8080/inventory-services/stores/_search?active=true&tenantId=$tenantid|$..code|$..name + source: store + isMandatory: true + + - name: fromDate + label: inventory.fromDate + type: epoch + source: inventory + isMandatory: false + + - name: toDate + label: inventory.toDate + type: epoch + source: inventory + isMandatory: false + + - name: supplierName + label: inventory.supplierName + pattern: http://inventory-services:8080/inventory-services/suppliers/_search?tenantId=$tenantid|$..code|$..name + type: singlevaluelist + source: inventory + isMandatory: false + + - name: materialReturnNo + label: inventory.materialReturnNo + type: singlevaluelist + source: inventory + isMandatory: false + + - name: materialName + label: inventory.materialName + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=inventory&masterName=Material&tenantId=$tenantid|$.MdmsRes.inventory.Material.*.code|$.MdmsRes.inventory.Material.*.name + type: singlevaluelist + source: inventory + isMandatory: false + + query: SELECT * FROM material; + +# Disposal of Scrap Report +# Need to Change drop down Link based on report and Query +- reportName: disposalOfScrapReport + summary: Disposal of Scrap Report + version: 1.0.0 + moduleName: inventory + sourceColumns: + + - name: storeName + label: inventory.storeName + type: string + source: inventory + + - name: materialCode + label: inventory.materialCode + type: string + source: inventory + + - name: materialName + label: inventory.materialName + type: string + source: inventory + + - name: materialTypeName + label: inventory.materialTypeName + type: epoch + source: inventory + + - name: disposalNo + label: inventory.disposalNo + type: string + source: inventory + + - name: disposalDate + label: inventory.disposalDate + type: string + source: inventory + + - name: disposalQty + label: inventory.disposalQty + type: string + source: inventory + + - name: uom + label: inventory.uom + type: string + source: inventory + + - name: disposalValue + label: inventory.disposalValue + type: string + source: inventory + + - name: lotNo + label: inventory.lotNo + type: string + source: inventory + + - name: disposalBy + label: inventory.disposalBy + type: string + source: inventory + + - name: remarks + label: inventory.remarks + type: string + source: inventory + + searchParams: + + - name: storeName + label: inventory.store.name + type: singlevaluelist + pattern: http://inventory-services:8080/inventory-services/stores/_search?active=true&tenantId=$tenantid|$..code|$..name + source: store + isMandatory: true + + - name: disposalFromDate + label: inventory.disposalFromDate + type: epoch + source: inventory + isMandatory: false + + - name: toDate + label: inventory.toDate + type: epoch + source: inventory + isMandatory: false + + - name: materialtypename + label: inventory.materialtypename + type: singlevaluelist + source: inventory + isMandatory: false + + - name: disposalNo + label: inventory.disposalNo + type: singlevaluelist + source: inventory + isMandatory: false + + - name: materialName + label: inventory.materialName + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=inventory&masterName=Material&tenantId=$tenantid|$.MdmsRes.inventory.Material.*.code|$.MdmsRes.inventory.Material.*.name + type: singlevaluelist + source: inventory + isMandatory: false + + query: SELECT * FROM material; + +# Rates comparison with history data Report +- reportName: ratesComparisonWithHistory + summary: Rates comparison with history data + version: 1.0.0 + moduleName: inventory + externalService: + - entity: $.MdmsRes.inventory.Material + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=inventory&masterName=Material&tenantId=$tenantid + keyOrder: code,name,tenantId + tableName: tbl_material + sourceColumns: + + - name: materialCode + label: inventory.material.code + type: string + source: inventory + + - name: materialName + label: inventory.material.name + type: string + source: inventory + + - name: supplierName + label: inventory.supplierName + type: string + source: inventory + + - name: rateType + label: inventory.rateType + type: string + source: inventory + + - name: currentRate + label: inventory.currentRate + type: string + source: inventory + + - name: currentYear + label: inventory.currentYear + type: string + source: inventory + + - name: previousYear + label: inventory.previousYear + type: string + source: inventory + + searchParams: + - name: supplierName + label: inventory.supplierName + pattern: http://inventory-services:8080/inventory-services/suppliers/_search?tenantId=$tenantid|$..code|$..name + type: singlevaluelist + source: inventory + searchClause: AND pl.supplier = $supplierName + wrapper: true + isMandatory: false + + - name: materialName + label: inventory.materialName + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=inventory&masterName=Material&tenantId=$tenantid|$.MdmsRes.inventory.Material.*.code|$.MdmsRes.inventory.Material.*.name + type: singlevaluelist + source: inventory + searchClause: AND pld.material = $materialName + isMandatory: false + wrapper: true + + query: SELECT pld.material AS materialCode, + sup.name AS supplierName, + mat.name AS materialName, + pl.ratetype AS ratetype, + pld.ratePerUnit AS currentRate, + (SELECT count(*) FROM pricelistdetails WHERE material=pld.material AND pld.tenantid = $tenantid + AND fromdate::bigint >= (SELECT EXTRACT(EPOCH FROM timestamptz (CONCAT ((SELECT to_char(now(),'YYYY')),'-','01','-','01')))) + AND todate::bigint <= (SELECT EXTRACT(EPOCH FROM timestamptz (CONCAT ((SELECT to_char(now(),'YYYY')),'-','03','-','01'))))) AS currentYear, + (SELECT count(*) FROM pricelistdetails WHERE material=pld.material AND pricelistdetails.tenantid = $tenantid + AND fromdate::bigint >= (SELECT EXTRACT(EPOCH FROM timestamptz (CONCAT ((SELECT to_char(now()- interval '1 year','YYYY')),'-','01','-','01')))) + AND todate::bigint <= (SELECT EXTRACT(EPOCH FROM timestamptz (CONCAT ((SELECT to_char(now()- interval '1 year','YYYY')),'-','12','-','31'))))) AS previousYear + FROM pricelist pl,pricelistdetails pld,supplier sup,(VALUES tbl_material) AS mat (code, name, tenantid) + WHERE + pld.tenantid = sup.tenantid + AND sup.tenantid = pl.tenantid + AND pl.tenantid = $tenantid + AND mat.tenantid = pld.tenantid + AND pl.supplier = sup.code + AND pl.id = pld.pricelist + AND pld.deleted = false + AND mat.code = pld.material + +# Comparison between different rates Report +- reportName: comparisonBetweenDifferentRates + summary: Comparison between different rates + version: 1.0.0 + moduleName: inventory + externalService: + - entity: $.MdmsRes.inventory.Material + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=inventory&masterName=Material&tenantId=$tenantid + keyOrder: code,name,tenantId + tableName: tbl_material + sourceColumns: + + - name: materialCode + label: inventory.material.code + type: string + source: inventory + + - name: materialName + label: inventory.materialName + type: string + source: inventory + + - name: supplierName + label: inventory.supplierName + type: string + source: inventory + + - name: dtt + label: inventory.DTT + type: string + source: inventory + + - name: quotation + label: inventory.quotation + type: string + source: inventory + + - name: dgsnd + label: inventory.DGSND + type: string + source: inventory + + - name: tender + label: inventory.tender + type: string + source: inventory + + searchParams: + - name: supplierName + label: inventory.supplierName + pattern: http://inventory-services:8080/inventory-services/suppliers/_search?tenantId=$tenantid|$..code|$..name + type: singlevaluelist + source: inventory + searchClause: AND pl.supplier = $supplierName + wrapper: true + isMandatory: false + + - name: materialName + label: inventory.materialName + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=inventory&masterName=Material&tenantId=$tenantid|$.MdmsRes.inventory.Material.*.code|$.MdmsRes.inventory.Material.*.name + type: singlevaluelist + source: inventory + searchClause: AND pld.material = $materialName + isMandatory: false + wrapper: true + + + query: SELECT pld.material AS materialCode, + mat.name AS materialName, + sup.name AS supplierName, + ((SELECT ratePerUnit FROM pricelistdetails WHERE material=pld.material AND pl.rateType = 'Quotation' AND pld.tenantid = $tenantid + AND FROMdate::bigint <= (SELECT extract(epoch FROM now())*1000) AND todate::bigint >= (SELECT extract(epoch FROM now()))*1000) + ORDER BY createdtime desc limit 1) AS quotation, + ((SELECT ratePerUnit FROM pricelistdetails WHERE material=pld.material AND pl.rateType ='DGSC Rate Contract' AND pld.tenantid = $tenantid + AND FROMdate::bigint <= (SELECT extract(epoch FROM now())*1000) AND todate::bigint >= (SELECT extract(epoch FROM now()))*1000) + ORDER BY createdtime desc limit 1) AS dgsnd, + ((SELECT ratePerUnit FROM pricelistdetails WHERE material=pld.material AND pl.rateType = 'ULB Rate Contract' AND pld.tenantid = $tenantid + AND FROMdate::bigint <= (SELECT extract(epoch FROM now())*1000) AND todate::bigint >= (SELECT extract(epoch FROM now()))*1000) + ORDER BY createdtime desc limit 1) AS dtt, + ((SELECT ratePerUnit FROM pricelistdetails WHERE material=pld.material AND pl.rateType = 'One Time Tender' AND pld.tenantid = $tenantid + AND FROMdate::bigint <= (SELECT extract(epoch FROM now())*1000) AND todate::bigint >= (SELECT extract(epoch FROM now()))*1000) + ORDER BY createdtime desc limit 1) AS tender + FROM pricelistdetails pld, pricelist pl, (VALUES tbl_material) AS mat (code, name, tenantid) , supplier sup + WHERE pld.tenantid = $tenantid + AND pl.tenantid = pld.tenantid + AND sup.tenantid=pl.tenantId + AND mat.tenantid = pl.tenantid + AND mat.code = pld.material + AND sup.code = pl.supplier + AND pld.deleted = false + AND pld.pricelist = pl.id + +# Procurement Expenditure Report +# Need to Change drop down Link based on report and Query +- reportName: procurementExpenditureReport + summary: Procurement Expenditure Report + version: 1.0.0 + moduleName: inventory + sourceColumns: + + - name: budgetHeadCode + label: inventory.budgetHeadCode + type: string + source: inventory + + - name: nameOfBudgetHead + label: inventory.nameOfBudgetHead + type: string + source: inventory + + - name: estimateBudget + label: inventory.estimateBudget + type: string + source: inventory + + - name: actualExpenses + label: inventory.actualExpenses + type: string + source: inventory + + - name: remainingBudget + label: inventory.remainingBudget + type: string + source: inventory + + searchParams: + + - name: storeName + label: inventory.store.name + type: singlevaluelist + pattern: http://inventory-services:8080/inventory-services/stores/_search?active=true&tenantId=$tenantid|$..code|$..name + source: inventory + isMandatory: true + wrapper: true + + - name: financialYear + label: inventory.financialYear + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$..finYearRange|$..finYearRange + source: inventory + isMandatory: true + + - name: budgetHead + label: inventory.budgetHead + type: singlevaluelist + source: inventory + isMandatory: true + + query: SELECT * FROM material; + +# Supplier wise Purchase Order History Report +- reportName: SupplierwisesPurchaseOrderHistoryReport + summary: Supplier wise Purchase Order History + version: 1.0.0 + moduleName: inventory + sourceColumns: + + - name: supplierName + label: inventory.supplierName + type: string + source: inventory + + - name: supplierCompanyName + label: inventory.supplierCompanyName + type: string + source: inventory + + - name: poNo + label: inventory.poNo + type: string + source: inventory + + - name: poDate + label: inventory.poDate + type: epoch + source: inventory + + - name: poStatus + label: inventory.poStatus + type: string + source: inventory + + - name: expectedDeliveryDate + label: inventory.expecteddeliverydate + type: epoch + source: inventory + + - name: paymentDueDate + label: inventory.paymentDueDate + type: epoch + source: inventory + + - name: qtyOrdered + label: inventory.qtyOrdered + type: string + source: inventory + + - name: poTotal + label: inventory.poTotal + type: string + source: inventory + + - name: amountPaid + label: inventory.amountPaid + type: string + source: inventory + + - name: balanceDue + label: inventory.balanceDue + type: string + source: inventory + + searchParams: + + - name: supplierName + label: inventory.supplierName + pattern: http://inventory-services:8080/inventory-services/suppliers/_search?tenantId=$tenantid|$..code|$..name + type: singlevaluelist + source: inventory + searchClause: AND po.supplier = $supplierName + wrapper: true + isMandatory: false + + - name: supplierCompanyName + label: inventory.supplierCompanyName + pattern: http://inventory-services:8080/inventory-services/suppliers/_search?tenantId=$tenantid&type=COMPANY|$..code|$..name + type: singlevaluelist + source: inventory + searchClause: AND sup.name = $supplierCompanyName + isMandatory: false + + - name: storeName + label: inventory.store.name + pattern: http://inventory-services:8080/inventory-services/stores/_search?active=true&tenantId=$tenantid|$..code|$..name + type: singlevaluelist + searchClause: AND po.store = $storeName + source: inventory + isMandatory: false + wrapper: true + + - name: poNo + label: inventory.poNo + type: string + source: inventory + searchClause: AND po.purchaseordernumber = $poNo + isMandatory: false + + - name: poDate + label: inventory.poDate + type: epoch + source: inventory + searchClause: AND po.purchaseorderdate = $poDate + isMandatory: false + + query: SELECT sup.name AS suppliername, + (SELECT name FROM supplier WHERE type = 'COMPANY' AND tenantid =$tenantid) AS supplierCompanyName, + po.purchaseorderNumber AS PoNo, + po.purchaseorderdate AS PoDate, + po.status AS postatus, + po.expecteddeliverydate AS expecteddeliverydate, + pod.orderquantity AS qtyOrdered + FROM supplier sup,purchaseorder po,purchaseorderdetail pod + WHERE po.tenantid = $tenantid + AND pod.tenantid = po.tenantid + AND pod.tenantid = sup.tenantid + AND po.purchaseordernumber = pod.purchaseorder + AND po.supplier = sup.code + +# Material wise Purchase Order History Report +- reportName: MaterialwisePurchaseOrderHistoryReport + summary: Material wise Purchase Order History + version: 1.0.0 + moduleName: inventory + externalService: + - entity: $.MdmsRes.inventory.Material + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=inventory&masterName=Material&tenantId=$tenantid + keyOrder: code,name,tenantId,description + tableName: tbl_material + sourceColumns: + + - name: materialName + label: inventory.materialName + type: string + source: inventory + + - name: materialdescription + label: inventory.material.description + type: string + source: inventory + + - name: poNo + label: inventory.poNo + type: string + source: inventory + + - name: poDate + label: inventory.poDate + type: epoch + source: inventory + + - name: poStatus + label: inventory.poStatus + type: string + source: inventory + + - name: expectedDeliveryDate + label: inventory.expecteddeliverydate + type: epoch + source: inventory + + - name: paymentDueDate + label: inventory.paymentDueDate + type: epoch + source: inventory + + - name: qtyOrdered + label: inventory.qtyOrdered + type: string + source: inventory + + - name: poTotal + label: inventory.poTotal + type: string + source: inventory + + searchParams: + + - name: materialName + label: inventory.materialName + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=inventory&masterName=Material&tenantId=$tenantid + type: singlevaluelist + source: inventory + searchClause: AND pld.material = $materialName + wrapper: true + isMandatory: false + + - name: storeName + label: inventory.store.name + pattern: http://inventory-services:8080/inventory-services/stores/_search?active=true&tenantId=$tenantid|$..code|$..name + type: singlevaluelist + source: inventory + searchClause: AND po.store = $storeName + isMandatory: false + wrapper: true + + - name: poNo + label: inventory.poNo + type: string + source: inventory + searchClause: AND po.purchaseordernumber = $poNo + isMandatory: false + + - name: poDate + label: inventory.poDate + type: epoch + source: inventory + searchClause: AND po.purchaseorderdate = $poDate + isMandatory: false + + query: SELECT mat.name AS materialName, + mat .description AS materialdescription, + po.purchaseorderNumber AS PoNo, + po.purchaseorderdate AS PoDate, + po.status AS postatus, + po.expecteddeliverydate AS expecteddeliverydate, + pod.orderquantity AS qtyOrdered + FROM (VALUES tbl_material) AS mat (code, name, tenantid,description),purchaseorder po,purchaseorderdetail pod + WHERE po.tenantid = $tenantid + AND pod.tenantid = po.tenantid + AND pod.tenantid = mat.tenantid + AND po.purchaseordernumber = pod.purchaseorder + AND pod.material = mat.code + +# Inventory Register Report +- reportName: inventoryRegisterReport + summary: Inventory Register + version: 1.0.0 + moduleName: inventory + sourceColumns: + - name: storeName + label: inventory.store.name + type: string + source: inventory + + - name: deptName + label: inventory.deptName + type: string + source: inventory + + - name: materialName + label: inventory.materialName + type: string + source: material + + - name: supplierName + label: inventory.suppliername + type: string + source: inventory + + - name: qty + label: inventory.qty + type: string + source: inventory + + - name: uom + label: inventory.uom + type: string + source: inventory + + - name: unitRate + label: inventory.unitrate + type: string + source: inventory + + - name: totalAmount + label: inventory.totalAmount + type: string + source: inventory + + - name: receiptDate + label: inventory.date + type: string + source: inventory + + - name: transactionNumber + label: inventory.transactionnumber + type: string + source: inventory + + - name: receiptType + label: inventory.receiptType + type: string + source: inventory + + searchParams: + - name: storeName + label: inventory.store.name + type: singlevaluelist + pattern: http://inventory-services:8080/inventory-services/stores/_search?active=true&tenantId=$tenantid|$..code|$..name + source: store + searchClause: AND store.code = $storeName + isMandatory: true + wrapper: true + + - name: materialName + label: inventory.materialName + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=inventory&masterName=Material&tenantId=$tenantid|$.MdmsRes.inventory.Material.*.code|$.MdmsRes.inventory.Material.*.name + source: materialReceipt + isMandatory: false + query: select store.name as storeName,store.department as deptName, + sup.name as supplierName, + detail.receivedqty as qty,detail.uomno as uom,detail.unitrate as unitRate, + (detail.receivedqty * detail.unitrate) as totalAmount, + (select to_date(to_char(to_timestamp(Trunc(CAST(mat.receiptdate as bigint)/1000 )), 'YYYY/MM/DD'), 'YYYY-MM-DD')) as receiptDate, + detail.mrnnumber as transactionNumber,mat.receipttype as receipttype + from materialreceiptdetail detail,materialreceipt mat,store store,supplier sup + where detail.tenantid=$tenantid + AND mat.tenantid=detail.tenantid + AND store.tenantid=mat.tenantid + AND sup.tenantid= store.tenantid + AND mat.suppliercode =sup.code + AND mat.receivingstore=store.code + AND mat.mrnnumber=detail.mrnnumber + +# Need to add query +# Stock Aging Report +- reportName: stockAgingReport + summary: Stock Aging Report + version: 1.0.0 + moduleName: inventory + sourceColumns: + - name: materialCode + label: inventory.materialcode + type: string + source: inventory + + - name: materialName + label: inventory.materialName + type: string + source: inventory + + - name: materialTypeName + label: inventory.materialTypeName + type: string + source: material + + - name: lotNo + label: inventory.lotNo + type: string + source: inventory + + - name: qtyFrom0to90Days + label: inventory.qtyFrom0to90Days + type: string + source: inventory + + - name: stockValueFrom0to90Days + label: inventory.stockValueFrom0to90Days + type: string + source: inventory + + - name: qtyFrom91to180Days + label: inventory.qtyFrom91to180Days + type: string + source: inventory + + - name: stockValueFrom91to180Days + label: inventory.stockValueFrom91to180Days + type: string + source: inventory + + - name: qtyFrom181DaysAndAbove + label: inventory.qtyFrom181DaysAndAbove + type: string + source: inventory + + - name: stockValueFrom181DaysAndAbove + label: inventory.stockValueFrom181DaysAndAbove + type: string + source: inventory + + - name: totalQty + label: inventory.totalQty + type: string + source: inventory + + - name: totalStockValue + label: inventory.totalStockValue + type: string + source: inventory + + searchParams: + - name: storeName + label: inventory.store.name + type: singlevaluelist + pattern: http://inventory-services:8080/inventory-services/stores/_search?active=true&tenantId=$tenantid|$..code|$..name + source: store + searchClause: AND store.code = $storeName + isMandatory: true + wrapper: true + + - name: materialTypeName + label: inventory.materialTypeName + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=inventory&masterName=MaterialType&tenantId=$tenantid|$.MdmsRes.inventory.Material.*.code|$.MdmsRes.inventory.Material.*.name + source: materialReceipt + isMandatory: false + + - name: materialName + label: inventory.materialName + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=inventory&masterName=Material&tenantId=$tenantid|$.MdmsRes.inventory.Material.*.code|$.MdmsRes.inventory.Material.*.name + source: materialReceipt + isMandatory: false + + - name: asOnDate + label: inventory.asOnDate + type: epoch + source: inventory + isMandatory: true + query: + + + + + + + diff --git a/configs/reports/configs/lcms-reports.yml b/configs/reports/configs/lcms-reports.yml new file mode 100644 index 00000000..ed7a3602 --- /dev/null +++ b/configs/reports/configs/lcms-reports.yml @@ -0,0 +1,891 @@ +--- +ReportDefinitions: +- reportName: CaseRegisterReport + summary: Case Register Report + version: 1.0.0 + moduleName: lcms + selectiveDownload: true + externalService: + - entity: $.MdmsRes.lcms.court + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=lcms&masterName=court&tenantId=$tenantid + keyOrder: code,name + tableName: tbl_court + sourceColumns: + - name: caseno + label: reports.lcms.caseNo + type: string + source: lcms + showColumn: true + - name: plantiffname + label: reports.lcms.nameOfPlaintiff + type: string + source: lcms + showColumn: true + - name: defendant + label: reports.lcms.nameOfDefendant + type: string + source: lcms + showColumn: true + - name: pleaderengagementdetails + label: reports.lcms.amountOfPleadersEngaged + type: string + source: lcms + showColumn: false + - name: sectionapplied + label: reports.lcms.sectionApplied + type: string + source: lcms + showColumn: false + - name: receiptdate + label: reports.lcms.dateOfReceiptOfOfficer + type: epoch + source: lcms + showColumn: false + - name: summondate + label: reports.lcms.dateOfSummon + type: epoch + source: lcms + showColumn: false + - name: resolutiondetails + label: reports.lcms.resolutionOfMunicipalDate + type: string + source: lcms + showColumn: false + - name: pleaderfee + label: reports.lcms.particularsOfPleadersFee + type: string + source: lcms + showColumn: false + - name: vakalatnamagenerationdate + label: reports.lcms.dateOfProductionOfVakalatnama + type: epoch + source: lcms + showColumn: false + - name: courtname + label: reports.lcms.suitFiledCourtName + type: string + source: lcms + showColumn: true + - name: departmentperson + label: reports.lcms.nameOfResponsibleOfficer + type: string + source: lcms + showColumn: false + - name: judgementdate + label: reports.lcms.dateOfJudgment + type: epoch + source: lcms + showColumn: false + - name: casejudgement + label: reports.lcms.judgmentDetails + type: string + source: lcms + showColumn: false + - name: advocateopinion + label: reports.lcms.opinionOfPleader + type: string + source: lcms + showColumn: false + - name: furtherprocessdetails + label: reports.lcms.furtherProcessDetails + type: string + source: lcms + showColumn: false + - name: particularsamount + label: reports.lcms.particularsOfActualAmount + type: string + source: lcms + showColumn: false + - name: voucherdate + label: reports.lcms.dateOfCredit + type: epoch + source: lcms + showColumn: false + - name: paymentdetails + label: reports.lcms.particularsOfPayment + type: string + source: lcms + showColumn: false + - name: voucherdate + label: reports.lcms.dateOfDebit + type: epoch + source: lcms + showColumn: false + - name: verificationremarks + label: reports.lcms.remarksRegardingReferenceToCourt + type: string + source: lcms + showColumn: false + - name: remarks + label: reports.lcms.remarks + type: string + source: lcms + showColumn: false + searchParams: + - name: fromDate + label: reports.lcms.fromDate + type: epoch + source: lcms + isMandatory: true + - name: toDate + label: reports.lcms.toDate + type: epoch + source: lcms + isMandatory: true + - name: caseNo + label: reports.lcms.caseNo + type: string + isMandatory: false + source: lcms + searchClause : AND upper(lc.caseno) = upper($caseNo) + - name: lcNumber + label: reports.lcms.lcNumber + type: string + isMandatory: false + source: lcms + searchClause : AND upper(lc.summonreferenceno) = upper($lcNumber) + - name: caseTitle + label: reports.lcms.caseTitle + type: string + isMandatory: false + source: lcms + searchClause : AND upper(lc.casedetails) = upper($caseTitle) + - name: courtName + label: reports.lcms.courtName + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=lcms&masterName=court|$..code|$..name + source: lcms + wrapper: true + isMandatory: false + searchClause : AND lc.courtname ->> 'code' = $courtName + - name: plaintiff + label: reports.lcms.plaintiff + type: string + isMandatory: false + source: lcms + searchClause : AND upper(lc.plantiffname) = upper($plaintiff) + - name: defendant + label: reports.lcms.defendant + type: string + isMandatory: false + source: lcms + searchClause : AND upper(lc.defendant) = upper($defendant) + - name: department + label: reports.lcms.department + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=common-masters&masterName=Department|$..code|$..name + source: lcms + wrapper: true + isMandatory: false + searchClause : AND lc.departmentname ->> 'code' = $department + - name: caseStatus + label: reports.lcms.caseStatus + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=lcms&masterName=caseStatus|$..code|$..name + source: lcms + wrapper: true + isMandatory: false + searchClause : AND lc.casestatus ->> 'code' = $caseStatus + query: select lc.caseno, lc.plantiffname, lc.defendant, lc.pleaderengagementdetails ,lc.sectionapplied, lc.summondate, CONCAT(lc.resloution, ', ', lc.resloutiondate) AS resolutiondetails, lc.vakalatnamagenerationdate, (select name from (VALUES tbl_court) as court (code,name) where court.code=lc.courtname::jsonb ->> 'code')as courtname, lc.departmentperson, lhd.judgementdate, lhd.casejudgement, lhd.advocateopinion, lhd.furtherprocessdetails, lc.remarks from egov_lcms_case lc LEFT OUTER JOIN egov_lcms_hearing_details as lhd ON (lc.code = lhd.casecode AND lhd.casestatus ->> 'code'= 'FO') WHERE lc.caseregistrationdate>=$fromDate and lc.caseregistrationdate<=$toDate AND lc.tenantid=$tenantid +- reportName: CaseSummaryReport + summary: Case Summary Report + version: 1.0.0 + moduleName: lcms + selectiveDownload: true + externalService: + - entity: $.MdmsRes.lcms.caseType + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=lcms&masterName=caseType&tenantId=$tenantid + keyOrder: code,name + tableName: tbl_casetype + - entity: $.MdmsRes.lcms.court + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=lcms&masterName=court&tenantId=$tenantid + keyOrder: code,name + tableName: tbl_court + - entity: $.MdmsRes.lcms.caseStatus + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=lcms&masterName=caseStatus&tenantId=$tenantid + keyOrder: code,name + tableName: tbl_casestatus + - entity: $.MdmsRes.common-masters.Department + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=common-masters&masterName=Department&tenantId=$tenantid + keyOrder: code,name + tableName: tbl_department + sourceColumns: + - name: caseno + label: reports.lcms.caseNo + type: string + source: lcms + showColumn: true + - name: department + label: reports.lcms.department + type: string + source: lcms + showColumn: false + - name: casetype + label: reports.lcms.caseType + type: string + source: lcms + showColumn: false + - name: plantiffname + label: reports.lcms.plaintiff + type: string + source: lcms + showColumn: true + - name: defendant + label: reports.lcms.defendant + type: string + source: lcms + showColumn: true + - name: courtname + label: reports.lcms.courtName + type: string + source: lcms + showColumn: true + - name: advocate + label: reports.lcms.advocateName + type: string + source: lcms + showColumn: false + - name: casestatus + label: reports.lcms.status + type: string + source: lcms + showColumn: false + searchParams: + - name: fromDate + label: reports.lcms.fromDate + type: epoch + source: lcms + isMandatory: true + - name: toDate + label: reports.lcms.toDate + type: epoch + source: lcms + isMandatory: true + - name: caseNo + label: reports.lcms.caseNo + type: string + isMandatory: false + source: lcms + searchClause : AND lc.caseno=$caseNo + - name: department + label: reports.lcms.department + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=common-masters&masterName=Department|$..code|$..name + source: lcms + wrapper: true + isMandatory: false + searchClause : AND lc.departmentname ->> 'code' = $department + - name: advocate + label: reports.lcms.advocate + type: singlevaluelist + pattern: http://lcms-services:8080/lcms-services/legalcase/advocate/_search?tenantId=$tenantid&pageSize=500|$..code|$..name + source: lcms + searchClause : AND position($advocate in tempadvocate.advocatecode) > 0 + isMandatory: false + - name: courtName + label: reports.lcms.courtName + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=lcms&masterName=court|$..code|$..name + source: lcms + wrapper: true + isMandatory: false + searchClause : AND lc.courtname ->> 'code' = $courtName + - name: plaintiff + label: reports.lcms.plaintiff + type: string + isMandatory: false + source: lcms + searchClause : AND lc.plantiffname = $plaintiff + - name: defendant + label: reports.lcms.defendant + type: string + isMandatory: false + source: lcms + searchClause : AND lc.defendant = $defendant + query: select lc.caseno, (select name from (VALUES tbl_department) as departmentdata (code,name) where departmentdata.code= lc.departmentname->>'code')as department, (select name from (VALUES tbl_casetype) as casetype (code,name) where casetype.code=lc.casetype::jsonb ->> 'code') as casetype, lc.plantiffName, lc.defendant, (select name from (VALUES tbl_court) as court (code,name) where court.code=lc.courtname::jsonb ->> 'code') as courtname, tempadvocate.advocatename as advocate,(select name from (VALUES tbl_casestatus) as casestatus (code,name) where casestatus.code=lc.casestatus::jsonb ->> 'code') as casestatus from egov_lcms_case as lc left outer join + (select lca.casecode as casecode, string_agg(la.name,',') as advocatename,string_agg(la.code,',') as advocatecode from egov_lcms_case_advocate as lca inner join egov_lcms_advocate as la on la.code=lca.advocate->>'code' where lca.tenantid=$tenantid group by lca.casecode) as tempadvocate on lc.code=tempadvocate.casecode WHERE lc.caseregistrationdate>=$fromDate and lc.caseregistrationdate<=$toDate and lc.tenantid=$tenantid + +- reportName: CaseDetailReport + summary: Case Detail Report + version: 1.0.0 + moduleName: lcms + selectiveDownload: true + externalService: + - entity: $.MdmsRes.lcms.court + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=lcms&masterName=court&tenantId=$tenantid + keyOrder: code,name,type + tableName: tbl_court + - entity: $.MdmsRes.lcms.caseCategory + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=lcms&masterName=caseCategory&tenantId=$tenantid + keyOrder: code,name + tableName: tbl_casecategory + - entity: $.MdmsRes.lcms.caseStatus + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=lcms&masterName=caseStatus&tenantId=$tenantid + keyOrder: code,name + tableName: tbl_casestatus + - entity: $.MdmsRes.common-masters.Department + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=common-masters&masterName=Department&tenantId=$tenantid + keyOrder: code,name + tableName: tbl_department + + sourceColumns: + - name: caseno + label: reports.lcms.caseNo + type: string + source: lcms + showColumn: false + - name: courtname + label: reports.lcms.courtName + type: string + source: lcms + showColumn: true + - name: courttype + label: reports.lcms.courtType + type: string + source: lcms + showColumn: false + - name: department + label: reports.lcms.department + type: string + source: lcms + showColumn: false + - name: casecategory + label: reports.lcms.caseCategory + type: string + source: lcms + showColumn: false + - name: sectionapplied + label: reports.lcms.sectionNo + type: string + source: lcms + showColumn: false + - name: advocate + label: reports.lcms.advocateName + type: string + source: lcms + showColumn: false + - name: plantiffname + label: reports.lcms.petitionName + type: string + source: lcms + showColumn: true + - name: defendant + label: reports.lcms.defendant + type: string + source: lcms + showColumn: true + - name: casestatus + label: reports.lcms.caseStatus + type: string + source: lcms + showColumn: true + searchParams: + - name: fromDate + label: reports.lcms.fromDate + type: epoch + source: lcms + isMandatory: true + - name: toDate + label: reports.lcms.toDate + type: epoch + source: lcms + isMandatory: true + - name: caseStatus + label: reports.lcms.caseStatus + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=lcms&masterName=caseStatus|$..code|$..name + source: lcms + wrapper: true + isMandatory: false + searchClause : AND lc.casestatus ->> 'code'= $caseStatus + - name: sectionNo + label: reports.lcms.sectionNo + type: string + isMandatory: false + source: lcms + searchClause : AND lc.sectionapplied=$sectionNo + - name: advocate + label: reports.lcms.advocate + type: singlevaluelist + pattern: http://lcms-services:8080/lcms-services/legalcase/advocate/_search?tenantId=$tenantid&pageSize=500|$..code|$..name + source: lcms + isMandatory: false + searchClause : AND position($advocate in tempadvocate.advocatecode) > 0 + - name: courtName + label: reports.lcms.courtName + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=lcms&masterName=court|$..code|$..name + source: lcms + wrapper: true + isMandatory: false + searchClause : AND lc.courtname ->> 'code' = $courtName + - name: plaintiff + label: reports.lcms.plaintiff + type: string + isMandatory: false + source: lcms + searchClause : AND lc.plantiffname = $plaintiff + - name: defendant + label: reports.lcms.defendant + type: string + isMandatory: false + source: lcms + searchClause : AND lc.defendant = $defendant + - name: caseCategory + label: reports.lcms.caseCategory + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=lcms&masterName=caseCategory|$..code|$..name + source: lcms + wrapper: true + isMandatory: false + searchClause : AND lc.casecategory ->> 'code' = $caseCategory + - name: department + label: reports.lcms.department + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=common-masters&masterName=Department|$..code|$..name + source: lcms + wrapper: true + isMandatory: false + searchClause : AND lc.departmentname ->> 'code' = $department + - name: caseType + label: reports.lcms.caseType + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=lcms&masterName=caseType|$..code|$..name + source: lcms + wrapper: true + isMandatory: false + searchClause : AND lc.casetype ->> 'code' = $caseType + query: select lc.caseno, (select name from (VALUES tbl_court) as court (code,name,type) where court.code=lc.courtname::jsonb ->> 'code') as courtname, (select type from (VALUES tbl_court) as court (code,name,type) where court.code=lc.courtname::jsonb ->> 'code') as courttype, (select name from (VALUES tbl_department) as departmentdata (code,name) where departmentdata.code= lc.departmentname->>'code')as department, (select name from (VALUES tbl_casecategory) as caseCategory (code,name) where caseCategory.code=lc.casecategory::jsonb ->> 'code') as casecategory, lc.sectionapplied, tempadvocate.advocatename as advocate, lc.plantiffName,lc.defendant, (select name from (VALUES tbl_casestatus) as caseStatus (code,name) where caseStatus.code=lc.casestatus::jsonb ->> 'code') as casestatus from egov_lcms_case as lc left outer join + (select lca.casecode as casecode, string_agg(la.name,',') as advocatename,string_agg(la.code,',') as advocatecode from egov_lcms_case_advocate as lca inner join egov_lcms_advocate as la on la.code=lca.advocate->>'code' where lca.tenantid=$tenantid group by lca.casecode) as tempadvocate on lc.code=tempadvocate.casecode WHERE lc.caseregistrationdate>=$fromDate and lc.caseregistrationdate<=$toDate and lc.tenantid=$tenantid +- reportName: CaseHistoryReport + summary: Case History Report + version: 1.0.0 + moduleName: lcms + selectiveDownload: true + externalService: + - entity: $.MdmsRes.lcms.caseType + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=lcms&masterName=caseType&tenantId=$tenantid + keyOrder: code,name + tableName: tbl_casetype + - entity: $.MdmsRes.lcms.court + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=lcms&masterName=court&tenantId=$tenantid + keyOrder: code,name + tableName: tbl_court + - entity: $.MdmsRes.lcms.caseStatus + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=lcms&masterName=caseStatus&tenantId=$tenantid + keyOrder: code,name + tableName: tbl_casestatus + - entity: $.MdmsRes.common-masters.Department + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=common-masters&masterName=Department&tenantId=$tenantid + keyOrder: code,name + tableName: tbl_department + sourceColumns: + - name: caseno + label: reports.lcms.caseNo + type: string + source: lcms + showColumn: true + - name: summondate + label: reports.lcms.caseDate + type: epoch + source: lcms + showColumn: false + - name: courtname + label: reports.lcms.courtName + type: string + source: lcms + showColumn: true + - name: casetype + label: reports.lcms.caseType + type: string + source: lcms + showColumn: true + - name: department + label: reports.lcms.department + type: string + source: lcms + showColumn: false + - name: advocate + label: reports.lcms.advocateName + type: string + source: lcms + showColumn: true + - name: plantiffname + label: reports.lcms.plaintiff + type: string + source: lcms + showColumn: false + - name: defendant + label: reports.lcms.defendant + type: string + source: lcms + showColumn: false + - name: hearingdate + label: reports.lcms.hearingDate + type: epoch + source: lcms + showColumn: false + - name: casestatus + label: reports.lcms.status + type: string + source: lcms + showColumn: false + searchParams: + - name: fromDate + label: reports.lcms.fromDate + type: epoch + source: lcms + isMandatory: true + - name: toDate + label: reports.lcms.toDate + type: epoch + source: lcms + isMandatory: true + + - name: oragnization + label: reports.lcms.organization + type: singlevaluelist + pattern: http://lcms-services:8080/lcms-services/legalcase/advocate/agency/_search?tenantId=$tenantid&pageSize=500|$.agencies[*].name|$.agencies[*].name + source: lcms + isMandatory: false + + - name: advocatename + label: reports.lcms.advocate + type: url + pattern: /lcms-services/legalcase/advocate/agency/_search?tenantId=$tenantid&agencyName={oragnization}&pageSize=500|$.agencies[*].advocates[*].code|$.agencies[*].advocates[*].name + source: lcms + isMandatory: false + searchClause : AND position($advocatename in tempadvocate.advocatecode) > 0 + + - name: department + label: reports.lcms.department + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=common-masters&masterName=Department|$..code|$..name + source: lcms + wrapper: true + isMandatory: false + searchClause : AND lc.departmentname ->> 'code' = $department + - name: caseType + label: reports.lcms.caseType + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=lcms&masterName=caseType|$..code|$..name + source: lcms + wrapper: true + isMandatory: false + searchClause : AND lc.casetype ->> 'code' = $caseType + - name: courtName + label: reports.lcms.courtName + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=lcms&masterName=court|$..code|$..name + source: lcms + wrapper: true + isMandatory: false + searchClause : AND lc.courtname ->> 'code' = $courtName + + - name: caseStatus + label: reports.lcms.caseStatus + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=lcms&masterName=caseStatus|$..code|$..name + source: lcms + wrapper: true + isMandatory: false + searchClause : AND lc.casestatus ->> 'code'= $caseStatus + query: select lc.caseno, lc.summondate, (select name from (VALUES tbl_court) as court (code,name) where court.code=lc.courtname::jsonb ->> 'code') as courtname, (select name from (VALUES tbl_casetype) as caseType (code,name) where caseType.code=lc.casetype::jsonb ->> 'code') as casetype, tempadvocate.advocatename as advocate, (select name from (VALUES tbl_department) as departmentdata (code,name) where departmentdata.code= lc.departmentname->>'code')as department, lc.plantiffName, lc.defendant, lc.hearingdate, (select name from (VALUES tbl_casestatus) as caseStatus (code,name) where caseStatus.code=lc.casestatus::jsonb ->> 'code') as casestatus from egov_lcms_case as lc left outer join (select lca.casecode as casecode, string_agg(la.name,',') as advocatename,string_agg(la.code,',') as advocatecode from egov_lcms_case_advocate as lca inner join egov_lcms_advocate as la on la.code=lca.advocate->>'code' where lca.tenantid=$tenantid group by lca.casecode) as tempadvocate on lc.code=tempadvocate.casecode WHERE lc.caseregistrationdate>=$fromDate and lc.caseregistrationdate<=$toDate +- reportName: CasePendencyReport + summary: Case Pendency Report + version: 1.0.0 + moduleName: lcms + selectiveDownload: true + externalService: + - entity: $.MdmsRes.lcms.caseType + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=lcms&masterName=caseType&tenantId=$tenantid + keyOrder: code,name + tableName: tbl_casetype + - entity: $.MdmsRes.lcms.court + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=lcms&masterName=court&tenantId=$tenantid + keyOrder: code,name + tableName: tbl_court + - entity: $.MdmsRes.lcms.caseStatus + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=lcms&masterName=caseStatus&tenantId=$tenantid + keyOrder: code,name + tableName: tbl_casestatus + - entity: $.MdmsRes.common-masters.Department + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=common-masters&masterName=Department&tenantId=$tenantid + keyOrder: code,name + tableName: tbl_department + sourceColumns: + - name: caseno + label: reports.lcms.caseNo + type: string + source: lcms + showColumn: true + - name: advocate + label: reports.lcms.advocateName + type: string + source: lcms + showColumn: true + - name: department + label: reports.lcms.department + type: string + source: lcms + showColumn: true + - name: courtname + label: reports.lcms.courtName + type: string + source: lcms + showColumn: false + - name: casetype + label: reports.lcms.caseType + type: string + source: lcms + showColumn: true + - name: plantiffname + label: reports.lcms.plaintiff + type: string + source: lcms + showColumn: false + - name: defendant + label: reports.lcms.defendant + type: string + source: lcms + showColumn: false + - name: casejudgement + label: reports.lcms.hearingDetails + type: string + source: lcms + showColumn: false + - name: casestatus + label: reports.lcms.caseStatus + type: string + source: lcms + showColumn: false + searchParams: + - name: fromDate + label: reports.lcms.fromDate + type: epoch + source: lcms + isMandatory: true + - name: toDate + label: reports.lcms.toDate + type: epoch + source: lcms + isMandatory: true + - name: department + label: reports.lcms.department + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=common-masters&masterName=Department|$..code|$..name + source: lcms + wrapper: true + isMandatory: false + searchClause : AND lc.departmentname ->> 'code' = $department + - name: advocate + label: reports.lcms.advocate + type: singlevaluelist + pattern: http://lcms-services:8080/lcms-services/legalcase/advocate/_search?tenantId=$tenantid&pageSize=500|$..code|$..name + source: lcms + isMandatory: false + searchClause : AND position($advocate in tempadvocate.advocatecode) > 0 + query: select lc.caseno, tempadvocate.advocatename as advocate, (select name from (VALUES tbl_department) as departmentdata (code,name) where departmentdata.code= lc.departmentname->>'code')as department, (select name from (VALUES tbl_court) as court (code,name) where court.code=lc.courtname::jsonb ->> 'code') as courtname, (select name from (VALUES tbl_casetype) as caseType (code,name) where caseType.code=lc.casetype::jsonb ->> 'code') as casetype, lc.plantiffName, lc.defendant, (select casejudgement from egov_lcms_hearing_details as lhd where lhd.casestatus->>'code'=lc.casestatus->>'code' and lhd.casecode=lc.code order by createdtime desc limit 1 ) as casejudgement, (select name from (VALUES tbl_casestatus) as caseStatus (code,name) where caseStatus.code=lc.casestatus::jsonb ->> 'code') as casestatus from egov_lcms_case as lc left outer join (select lca.casecode as casecode, string_agg(la.name,',') as advocatename,string_agg(la.code,',') as advocatecode from egov_lcms_case_advocate as lca inner join egov_lcms_advocate as la on la.code=lca.advocate->>'code' where lca.tenantid=$tenantid group by lca.casecode) as tempadvocate on lc.code=tempadvocate.casecode WHERE lc.caseregistrationdate>=$fromDate and lc.caseregistrationdate<=$toDate and lc.tenantid=$tenantid +- reportName: CaseStatusReport + summary: Case Status Report + version: 1.0.0 + moduleName: lcms + selectiveDownload: true + externalService: + - entity: $.MdmsRes.lcms.caseType + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=lcms&masterName=caseType&tenantId=$tenantid + keyOrder: code,name + tableName: tbl_casetype + - entity: $.MdmsRes.lcms.court + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=lcms&masterName=court&tenantId=$tenantid + keyOrder: code,name + tableName: tbl_court + - entity: $.MdmsRes.lcms.caseStatus + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=lcms&masterName=caseStatus&tenantId=$tenantid + keyOrder: code,name + tableName: tbl_casestatus + - entity: $.MdmsRes.common-masters.Department + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=common-masters&masterName=Department&tenantId=$tenantid + keyOrder: code,name + tableName: tbl_department + + sourceColumns: + - name: caseno + label: reports.lcms.caseNo + type: string + source: lcms + showColumn: true + - name: advocate + label: reports.lcms.advocateName + type: string + source: lcms + showColumn: true + - name: department + label: reports.lcms.department + type: string + source: lcms + showColumn: false + - name: courtname + label: reports.lcms.courtName + type: string + source: lcms + showColumn: false + - name: casetype + label: reports.lcms.caseType + type: string + source: lcms + showColumn: true + - name: plantiffname + label: reports.lcms.plaintiff + type: string + source: lcms + showColumn: false + - name: defendant + label: reports.lcms.defendant + type: string + source: lcms + showColumn: false + - name: casejudgement + label: reports.lcms.hearingDetails + type: string + source: lcms + showColumn: false + - name: casestatus + label: reports.lcms.status + type: string + source: lcms + showColumn: true + searchParams: + - name: fromDate + label: reports.lcms.fromDate + type: epoch + source: lcms + isMandatory: true + - name: toDate + label: reports.lcms.toDate + type: epoch + source: lcms + isMandatory: true + - name: caseStatus + label: reports.lcms.caseStatus + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=lcms&masterName=caseStatus|$..code|$..name + source: lcms + wrapper: true + isMandatory: false + searchClause : AND lc.casestatus ->> 'code'= $caseStatus + query: select lc.caseno, (select string_agg(name, ', ') from egov_lcms_advocate where code in( select advocate->>'code' from egov_lcms_case_advocate where casecode=lc.code)) as advocate, (select name from (VALUES tbl_department) as departmentdata (code,name) where departmentdata.code= lc.departmentname->>'code')as department,(select name from (VALUES tbl_court) as court (code,name) where court.code=lc.courtname::jsonb ->> 'code') as courtname, (select name from (VALUES tbl_casetype) as caseType (code,name) where caseType.code=lc.casetype::jsonb ->> 'code') as casetype, lc.plantiffName, lc.defendant,(select casejudgement from egov_lcms_hearing_details as lhd where lhd.casestatus->>'code'=lc.casestatus->>'code' and lhd.casecode=lc.code order by createdtime desc limit 1) as casejudgement, (select name from (VALUES tbl_casestatus) as caseStatus (code,name) where caseStatus.code=lc.casestatus::jsonb ->> 'code') as casestatus from egov_lcms_case as lc WHERE lc.caseregistrationdate>=$fromDate and lc.caseregistrationdate<=$toDate and lc.tenantid=$tenantid +- reportName: DueDateReport + summary: Due Date Report + version: 1.0.0 + moduleName: lcms + selectiveDownload: true + externalService: + - entity: $.MdmsRes.lcms.caseType + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=lcms&masterName=caseType&tenantId=$tenantid + keyOrder: code,name + tableName: tbl_casetype + - entity: $.MdmsRes.lcms.court + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=lcms&masterName=court&tenantId=$tenantid + keyOrder: code,name + tableName: tbl_court + - entity: $.MdmsRes.lcms.caseStatus + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=lcms&masterName=caseStatus&tenantId=$tenantid + keyOrder: code,name + tableName: tbl_casestatus + - entity: $.MdmsRes.common-masters.Department + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=common-masters&masterName=Department&tenantId=$tenantid + keyOrder: code,name + tableName: tbl_department + sourceColumns: + - name: caseno + label: reports.lcms.caseNo + type: string + source: lcms + showColumn: true + - name: courtname + label: reports.lcms.courtName + type: string + source: lcms + showColumn: false + - name: casetype + label: reports.lcms.caseType + type: string + source: lcms + showColumn: true + - name: department + label: reports.lcms.department + type: string + source: lcms + showColumn: false + - name: departmentperson + label: reports.lcms.concernedPersonName + type: string + source: lcms + showColumn: false + - name: advocate + label: reports.lcms.advocateName + type: string + source: lcms + showColumn: true + - name: plantiffname + label: reports.lcms.plaintiff + type: string + source: lcms + showColumn: false + - name: defendant + label: reports.lcms.defendant + type: string + source: lcms + showColumn: false + - name: casestatus + label: reports.lcms.caseStatus + type: string + source: lcms + showColumn: true + - name: hearingdate + label: reports.lcms.hearingDetailsDateAndTime + type: epoch + source: lcms + showColumn: false + searchParams: + - name: fromDate + label: reports.lcms.fromDate + type: epoch + source: lcms + isMandatory: true + - name: toDate + label: reports.lcms.toDate + type: epoch + source: lcms + isMandatory: true + - name: department + label: reports.lcms.department + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=common-masters&masterName=Department|$..code|$..name + source: lcms + wrapper: true + isMandatory: false + searchClause : AND lc.departmentname ->> 'code' = $department + - name: departmentPerson + label: reports.lcms.departmentPerson + type: string + isMandatory: false + source: lcms + searchClause : AND lc.departmentperson=$departmentPerson + - name: advocate + label: reports.lcms.advocate + type: singlevaluelist + pattern: http://lcms-services:8080/lcms-services/legalcase/advocate/_search?tenantId=$tenantid&pageSize=500|$..code|$..name + source: lcms + isMandatory: false + searchClause : AND position($advocate in tempadvocate.advocatecode) > 0 + - name: courtName + label: reports.lcms.courtName + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=lcms&masterName=court|$..code|$..name + source: lcms + wrapper: true + isMandatory: false + searchClause : AND lc.courtname ->> 'code' = $courtName + query: select lc.caseno, (select name from (VALUES tbl_court) as court (code,name) where court.code=lc.courtname::jsonb ->> 'code') as courtname, (select name from (VALUES tbl_casetype) as caseType (code,name) where caseType.code=lc.casetype::jsonb ->> 'code') as casetype, (select name from (VALUES tbl_department) as departmentdata (code,name) where departmentdata.code= lc.departmentname->>'code')as department, lc.departmentperson, tempadvocate.advocatename as advocate, lc.plantiffName, lc.defendant, (select name from (VALUES tbl_casestatus) as caseStatus (code,name) where caseStatus.code=lc.casestatus::jsonb ->> 'code') as casestatus, lc.hearingdate from egov_lcms_case as lc left outer join (select lca.casecode as casecode, string_agg(la.name,',') as advocatename,string_agg(la.code,',') as advocatecode from egov_lcms_case_advocate as lca inner join egov_lcms_advocate as la on la.code=lca.advocate->>'code' where lca.tenantid=$tenantid group by lca.casecode) as tempadvocate on lc.code=tempadvocate.casecode WHERE lc.caseregistrationdate>=$fromDate and lc.caseregistrationdate<=$toDate and lc.tenantid=$tenantid diff --git a/configs/reports/configs/rainmaker-common-reports.yml b/configs/reports/configs/rainmaker-common-reports.yml new file mode 100644 index 00000000..e13742a1 --- /dev/null +++ b/configs/reports/configs/rainmaker-common-reports.yml @@ -0,0 +1,127 @@ +ReportDefinitions: + - reportName: CollectionRegister + summary: Collection Register + version: 1.0.0 + moduleName: rainmaker-common + externalService: + - entity: $.MdmsRes.BillingService.BusinessService[*] + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=pb&moduleName=BillingService&masterName=BusinessService&filter=[?(@.type=='Adhoc')] + keyOrder: code,businessService + tableName: tbl_businessserviceList + sourceColumns: + - name: service + label: reports.common.CollectionRegister.serviceResult + type: string + source: common + total: false + - name: channel + label: reports.common.CollectionRegister.channel + type: string + source: common + total: false + - name: cash_count + label: reports.common.CollectionRegister.transactions + type: number + source: common + total: true + - name: cash_sum + label: reports.common.CollectionRegister.cash + type: number + source: common + total: true + - name: cheque_count + label: reports.common.CollectionRegister.transactions + type: number + source: common + total: true + - name: cheque_sum + label: reports.common.CollectionRegister.cheque + type: number + source: common + total: true + - name: dd_count + label: reports.common.CollectionRegister.transactions + type: number + source: common + total: true + - name: dd_sum + label: reports.common.CollectionRegister.dd + type: number + source: common + total: true + - name: online_count + label: reports.common.CollectionRegister.transactions + type: number + source: common + total: true + - name: online_sum + label: reports.common.CollectionRegister.online + type: number + source: common + total: true + - name: card_count + label: reports.common.CollectionRegister.transactions + type: number + source: common + total: true + - name: card_sum + label: reports.common.CollectionRegister.card + type: number + source: common + total: true + - name: total + label: reports.common.CollectionRegister.total + type: number + source: common + total: true + + searchParams: + - name: ulb + label: reports.common.CollectionRegister.ulb + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: common + wrapper: true + isMandatory: true + searchClause: AND rt.tenantId = $ulb + - name: service + label: reports.common.CollectionRegister.service + type: multivaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=BillingService&masterName=BusinessService&filter=[?(@.type=='Adhoc')]|$.MdmsRes.BillingService.BusinessService.*.code|$.MdmsRes.BillingService.BusinessService.*.businessService + source: common + wrapper: true + state: true + isMandatory: true + isLocalisationRequired: true + localisationPrefix: "BILLINGSERVICE_BUSINESSSERVICE_" + searchClause: AND REGEXP_REPLACE(rt.businessdetails,'\..*','') IN ($service) + - name: paymentMode + label: reports.common.CollectionRegister.mode + type: singlevaluelist + pattern: 'list://Cash:Cash,Online:Online,Card:Card,DD:DD,Cheque:Cheque' + source: common + isMandatory: false + searchClause: AND instrumenttype = $paymentMode + - name: channel + label: reports.common.CollectionRegister.channel + type: singlevaluelist + pattern: 'list://COUNTER:COUNTER,FIELD:FIELD' + source: common + isMandatory: false + searchClause: AND collectiontype = $channel + - name: fromDate + label: reports.common.CollectionRegister.fromdate + type: epoch + source: common + isMandatory: true + searchClause: AND receiptdate >= $fromDate + - name: toDate + label: reports.common.CollectionRegister.todate + type: epoch + source: common + isMandatory: true + searchClause: AND receiptdate <= $toDate + + query: select COALESCE(message,REGEXP_REPLACE(businessdetails,'\..*','')) service,collectiontype channel,sum(case when instrumenttype='Cash' then 1 else 0 end) as cash_count, sum(case when instrumenttype='Cash' then ins.amount else 0 end) as cash_sum, sum(case when instrumenttype='Cheque' then 1 else 0 end) as cheque_count, sum(case when instrumenttype='Cheque' then ins.amount else 0 end) as cheque_sum, sum(case when instrumenttype='DD' then 1 else 0 end) as dd_count, sum(case when instrumenttype='DD' then ins.amount else 0 end) as dd_sum, sum(case when instrumenttype='Online' then 1 else 0 end) as online_count, sum(case when instrumenttype='Online' then ins.amount else 0 end) as online_sum, sum(case when instrumenttype='Card' then 1 else 0 end) as card_count, sum(case when instrumenttype='Card' then amount else 0 end) as card_sum,sum(amount) total from egcl_receiptheader_v1 rt inner join egcl_receiptinstrument_v1 ihead on rt.id=receiptheader inner join egcl_instrumentheader_v1 ins on instrumentheader=ins.id left outer join message on LOWER(concat('BILLINGSERVICE_BUSINESSSERVICE_',REGEXP_REPLACE(businessdetails,'\..*','')))=LOWER(code) AND module='rainmaker-uc' where businessdetails IN (select code from (VALUES tbl_businessserviceList) AS serv_list(code,servicename)) + groupby: group by service,collectiontype + orderby: order by service,collectiontype \ No newline at end of file diff --git a/configs/reports/configs/rainmaker-noc-reports.yml b/configs/reports/configs/rainmaker-noc-reports.yml new file mode 100644 index 00000000..2fc2077f --- /dev/null +++ b/configs/reports/configs/rainmaker-noc-reports.yml @@ -0,0 +1,149 @@ +ReportDefinitions: + - reportName: CollectionReport + summary: Collection Report + version: 1.0.0 + moduleName: rainmaker-noc + sourceColumns: + - name: localisedmessage + label: reports.noc.collectionreport.usagetype + type: string + source: rainmaker-noc + total: false + - name: transactionNumber + label: reports.noc.collectionreport.transactionNumber + type: number + source: rainmaker-noc + total: true + - name: fees_counter + label: reports.noc.collectionreport.fees_counter + type: number + source: rainmaker-noc + total: true + - name: fees_online + label: reports.noc.collectionreport.fees_online + type: number + source: rainmaker-noc + total: true + searchParams: + - name: fromDate + label: reports.noc.collectionreport.fromDate + type: epoch + source: pt + isMandatory: false + searchClause: AND receiptdate >= $fromDate + - name: toDate + label: reports.noc.collectionreport.toDate + type: epoch + source: pt + isMandatory: false + searchClause: AND receiptdate <= $toDate + - name: channel + label: reports.noc.collectionreport.channel + type: multivaluelist + pattern: 'list://COUNTER:ULB Counter,ONLINE:Online by Citizen' + source: common + isMandatory: false + searchClause: AND collectiontype IN ($channel) + - name: paymentMode + label: reports.noc.collectionreport.paymentMode + type: singlevaluelist + pattern: 'list://Cash:Cash,Online:Online,Card:Card,DD:DD,Cheque:Cheque' + source: common + isMandatory: false + searchClause: AND instrumenttype = $paymentMode + - name: ulb + label: reports.noc.collectionreport.ulb + type: multivaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: noc + wrapper: true + isMandatory: false + searchClause: AND fnoc.tenantId IN ($ulb) + query: select COALESCE(message,usagetype) localisedmessage, COUNT(*) as transactionNumber, sum(case when collectiontype='COUNTER' then ins.amount else 0 end) fees_counter, sum(case when collectiontype='ONLINE' then ins.amount else 0 end) fees_online from eg_fn_firenoc fnoc inner join eg_fn_firenocdetail fdet on fdet.firenocuuid=fnoc.uuid inner join egcl_receiptheader_v1 rhead on rhead.consumercode=fdet.applicationnumber inner join eg_fn_buidlings build on build.firenocdetailsuuid=fdet.uuid inner join egcl_receiptinstrument_v1 recins on recins.receiptheader=rhead.id inner join egcl_instrumentheader_v1 ins on recins.instrumentheader=ins.id left outer join message on code=concat('FIRENOC_BUILDINGTYPE_',UPPER(REGEXP_REPLACE(usagetype,'\..*',''))) and module='rainmaker-noc' where 1=1 + groupby: GROUP BY localisedmessage + orderby: ORDER BY localisedmessage + + - reportName: ApplicationStatusReport + summary: Application Status Report + version: 1.0.0 + moduleName: rainmaker-noc + sourceColumns: + - name: application_status + label: reports.noc.applicationstatusreport.appStatus + type: string + source: rainmaker-noc + total: false + - name: number_of_application + label: reports.noc.applicationstatusreport.noofapplications + type: number + source: rainmaker-noc + total: true + searchParams: + - name: fromDate + label: reports.noc.applicationstatusreport.fromDate + type: epoch + source: noc + isMandatory: false + searchClause: AND applicationdate >= $fromDate + - name: toDate + label: reports.noc.applicationstatusreport.toDate + type: epoch + source: noc + isMandatory: false + searchClause: AND applicationdate <= $toDate + - name: ulb + label: reports.noc.applicationstatusreport.ulb + type: multivaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: noc + wrapper: true + isMandatory: false + searchClause: AND fnoc.tenantId IN ($ulb) + query: select COALESCE(message,state) application_status,count(*) number_of_application from eg_fn_firenoc fnoc inner join eg_fn_firenocdetail fdet on fdet.firenocuuid=fnoc.uuid inner join (SELECT DISTINCT ON (businessid) * FROM eg_wf_processinstance_v2 ORDER BY businessid,createdtime desc) pinstance on pinstance.businessid=fdet.applicationnumber inner join eg_wf_state_v2 wfstate on pinstance.status=wfstate.uuid left outer join message on code=concat('WF_FIRENOC_',UPPER(state)) and module='rainmaker-noc' where 1=1 + groupby: GROUP BY application_status + orderby: ORDER BY application_status + + - reportName: ChannelsReport + summary: Channels Report + version: 1.0.0 + moduleName: rainmaker-noc + sourceColumns: + - name: channel + label: reports.noc.channelsreport.channel + type: string + source: rainmaker-noc + total: false + - name: number_of_applications + label: reports.noc.channelsreport.applicationNo + type: number + source: rainmaker-noc + total: true + - name: percentage + label: reports.noc.channelsreport.percentage + type: number + source: rainmaker-noc + total: false + searchParams: + - name: fromDate + label: reports.noc.channelsreport.fromDate + type: epoch + source: noc + isMandatory: false + searchClause: AND applicationdate >= $fromDate + - name: toDate + label: reports.noc.channelsreport.toDate + type: epoch + source: noc + isMandatory: false + searchClause: AND applicationdate <= $toDate + - name: ulb + label: reports.noc.channelsreport.ulb + type: multivaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: noc + wrapper: true + isMandatory: false + searchClause: AND fnoc.tenantId IN ($ulb) + query: select channel, count (*) number_of_applications,round((count (*)::decimal/(select count(*) from eg_fn_firenoc fnoc inner join eg_fn_firenocdetail fdet on fdet.firenocuuid=fnoc.uuid))*100,2) percentage from eg_fn_firenoc fnoc inner join eg_fn_firenocdetail fdet on fdet.firenocuuid=fnoc.uuid + groupby: GROUP BY channel + orderby: ORDER BY channel \ No newline at end of file diff --git a/configs/reports/configs/rainmaker-pgr-reports.yml b/configs/reports/configs/rainmaker-pgr-reports.yml new file mode 100644 index 00000000..6a0aadaf --- /dev/null +++ b/configs/reports/configs/rainmaker-pgr-reports.yml @@ -0,0 +1,727 @@ +ReportDefinitions: +- reportName: SourceWiseReport + summary: Fetches reports based on the source of reception of the complaint + version: 1.0.0 + moduleName: rainmaker-pgr + sourceColumns: + - name: citizen_mobile_app + label: reports.rainmaker-pgr.citizen_mobile_app + type: number + source: eg_pgr_service + - name: citizen_web_app + label: reports.rainmaker-pgr.citizen_web_app + type: number + source: eg_pgr_service + - name: counter_desktop + label: reports.rainmaker-pgr.counter_desktop + type: number + source: eg_pgr_service + searchParams: + - name: tenantId + label: reports.rainmaker-pgr.tenantId + type: singlevaluelist + pattern: 'list://Wet:Wet,Dry:Dry' + source: eg_pgr_service + isMandatory: true + - name: fromDate + label: reports.rainmaker-pgr.datefrom + type: epoch + source: eg_pgr_service + isMandatory: true + - name: toDate + label: reports.rainmaker-pgr.dateto + type: epoch + source: eg_pgr_service + isMandatory: true + query: SELECT sum(case when source = 'mobileapp' then 1 else 0 end) as citizen_mobile_app, sum(case when source = 'web' then 1 else 0 end) as citizen_web_app, sum(case when source = 'ivr' then 1 else 0 end) as counter_desktop FROM eg_pgr_service WHERE tenantid = $tenantid + +- reportName: DescriptionReport + summary: Fetches department wise reports based description of the complaint + version: 1.0.0 + moduleName: rainmaker-pgr + externalService: + - entity: $.MdmsRes.RAINMAKER-PGR.ServiceDefs + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=RAINMAKER-PGR&masterName=ServiceDefs&tenantId=$tenantId + keyOrder: serviceCode,department,slaHours + tableName: tbl_dept + - entity: $.MdmsRes.common-masters.Department + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=common-masters&masterName=Department&tenantId=$tenantId + keyOrder: name,code + tableName: tbl_def_dept + - entity: $.TenantBoundary[0].boundary + apiURL: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search?hierarchyTypeCode=ADMIN&boundaryType=Locality&tenantId=$tenantId + keyOrder: name,code + tableName: tbl_boundary + sourceColumns: + - name: department + label: reports.rainmaker-pgr.department + type: string + source: eg_pgr_service + total: false + - name: servicecode + label: reports.rainmaker-pgr.servicecode + type: string + source: eg_pgr_service + total: false + - name: complaintNo + label: reports.rainmaker-pgr.complaintNo + type: string + source: eg_pgr_service + total: false + - name: date + label: reports.rainmaker-pgr.date + type: string + source: eg_pgr_service + total: false + - name: name + label: reports.rainmaker-pgr.name + type: string + source: eg_pgr_service + total: false + - name: phone + label: reports.rainmaker-pgr.phone + type: string + source: eg_pgr_service + total: false + - name: address + label: reports.rainmaker-pgr.address + type: string + source: eg_pgr_service + total: false + - name: locality + label: reports.rainmaker-pgr.locality + type: string + source: eg_pgr_service + total: false + - name: landmark + label: reports.rainmaker-pgr.landmark + type: string + source: eg_pgr_service + total: false + - name: description + label: reports.rainmaker-pgr.description + type: string + source: eg_pgr_service + total: false + - name: lastassignedto + label: reports.rainmaker-pgr.lastassignedto + type: string + source: eg_pgr_service + total: false + - name: status + label: reports.rainmaker-pgr.status + type: string + source: eg_pgr_service + total: false + - name: slahours + label: reports.rainmaker-pgr.slahours + type: string + source: eg_pgr_service + total: false + searchParams: + - name: fromDate + label: reports.rainmaker-pgr.datefrom + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND eg_pgr_service.createdtime >= $fromDate + - name: toDate + label: reports.rainmaker-pgr.dateto + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND eg_pgr_service.createdtime <= $toDate + query: | + SELECT + DISTINCT ON (servicerequestid) + ua.name as lastassignedto, + (SELECT deptmap_def.name FROM (VALUES tbl_def_dept) AS deptmap_def(name,code) INNER JOIN (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) on deptmap.serviceCode = eg_pgr_service.servicecode and deptmap_def.code = deptmap.department) AS department, + regexp_replace(servicecode, '([a-z])([A-Z])', '\1 \2','g') AS servicecode, + (SELECT boundary_def.name FROM (VALUES tbl_boundary) AS boundary_def(name,code) where code=eg_pgr_address.mohalla) as locality, + servicerequestid AS complaintNo, + to_char(to_timestamp(TRUNC(CAST(eg_pgr_service.createdtime AS bigint) / 1000)), 'DD/MM/YYYY') AS date, + eg_user.name, + phone, + eg_pgr_address.landmark, + eg_pgr_address.housenoandstreetname as address, + description, + (SELECT (CASE WHEN (((SELECT deptmap.slaHours FROM (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) WHERE deptmap.serviceCode = eg_pgr_service.servicecode)::integer / 24) - ((((select extract(epoch from now())) * 1000) - eg_pgr_service.createdtime)::bigint/86400000)) < 1 THEN CONCAT('Overdue by ', ((((select extract(epoch from now())) * 1000) - eg_pgr_service.createdtime)::bigint/86400000) - ((SELECT deptmap.slaHours FROM (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) WHERE deptmap.serviceCode = eg_pgr_service.servicecode)::integer / 24), ' days') ELSE CONCAT(((SELECT deptmap.slaHours FROM (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) WHERE deptmap.serviceCode = eg_pgr_service.servicecode)::integer / 24) - ((((select extract(epoch from now())) * 1000) - eg_pgr_service.createdtime)::bigint/86400000), ' days remaining') END) as slaHours), + Initcap(eg_pgr_service.status) as status + FROM eg_pgr_service + left outer join eg_pgr_address on eg_pgr_address.uuid = eg_pgr_service.addressid + left outer join eg_user on eg_user.id = eg_pgr_service.accountid::int + left outer join eg_pgr_action as epa on epa.businesskey = eg_pgr_service.servicerequestid and epa.action in ('assign','reassign') + left outer join eg_user as ua on ua.id = epa.assignee::int + WHERE + eg_pgr_service.tenantid LIKE $tenantid + AND eg_pgr_address.uuid = eg_pgr_service.addressid + AND eg_pgr_service.status IN ('open','assigned','reassigrequested','rejected') + orderby: ORDER BY servicerequestid, epa."when" desc + +- reportName: StateSourceReport + summary: Source of complaints across tenants + version: 1.0.0 + moduleName: rainmaker-pgr + sourceColumns: + - name: tenantid + label: reports.rainmaker-pgr.tenantid + type: string + source: eg_pgr_service + total: false + - name: ivr + label: reports.rainmaker-pgr.source.ivr + type: string + source: eg_pgr_service + total: true + - name: mobileapp + label: reports.rainmaker-pgr.source.mobileapp + type: string + source: eg_pgr_service + total: true + - name: web + label: reports.rainmaker-pgr.source.web + type: string + source: eg_pgr_service + total: true + - name: unknown + label: reports.rainmaker-pgr.source.unknown + type: string + source: eg_pgr_service + total: true + searchParams: + - name: fromDate + label: reports.rainmaker-pgr.datefrom + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND createdtime >= $fromDate + - name: toDate + label: reports.rainmaker-pgr.dateto + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND createdtime <= $toDate + query: | + select initcap(split_part(tenantid, '.', 2)) as tenantid, + SUM(CASE WHEN source ='ivr' THEN 1 ELSE 0 END) as ivr, + SUM(CASE WHEN source ='mobileapp' THEN 1 ELSE 0 END) as mobileapp, + SUM(CASE WHEN source ='web' THEN 1 ELSE 0 END) as web, + SUM(CASE WHEN source NOT IN ('web', 'ivr', 'mobileapp') OR source is NULL THEN 1 ELSE 0 END) as unknown + from eg_pgr_service + WHERE tenantid != 'pb.testing' + + groupby: GROUP BY tenantid + orderby: ORDER BY tenantid + +- reportName: EmployeeReport + summary: Fetches complaints for employees + version: 1.0.0 + moduleName: rainmaker-pgr + externalService: + - entity: $.MdmsRes.RAINMAKER-PGR.ServiceDefs + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=RAINMAKER-PGR&masterName=ServiceDefs&tenantId=$tenantId + keyOrder: serviceCode,department,slaHours + tableName: tbl_dept + - entity: $.TenantBoundary[0].boundary + apiURL: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search?hierarchyTypeCode=ADMIN&boundaryType=Locality&tenantId=$tenantId + keyOrder: name,code + tableName: tbl_boundary + sourceColumns: + - name: department + label: reports.rainmaker-pgr.department + type: string + source: eg_pgr_service + total: false + - name: servicecode + label: reports.rainmaker-pgr.servicecode + type: string + source: eg_pgr_service + total: false + - name: complaintNo + label: reports.rainmaker-pgr.complaintNo + type: string + source: eg_pgr_service + total: false + - name: date + label: reports.rainmaker-pgr.date + type: string + source: eg_pgr_service + total: false + - name: name + label: reports.rainmaker-pgr.name + type: string + source: eg_pgr_service + total: false + - name: phone + label: reports.rainmaker-pgr.phone + type: string + source: eg_pgr_service + total: false + - name: locality + label: reports.rainmaker-pgr.locality + type: string + source: eg_pgr_service + total: false + - name: address + label: reports.rainmaker-pgr.address + type: string + source: eg_pgr_service + total: false + - name: landmark + label: reports.rainmaker-pgr.landmark + type: string + source: eg_pgr_service + total: false + - name: description + label: reports.rainmaker-pgr.description + type: string + source: eg_pgr_service + total: false + - name: status + label: reports.rainmaker-pgr.status + type: string + source: eg_pgr_service + total: false + - name: slahours + label: reports.rainmaker-pgr.slahours + type: string + source: eg_pgr_service + total: false + searchParams: + - name: fromDate + label: reports.rainmaker-pgr.datefrom + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND eg_pgr_service.createdtime >= $fromDate + - name: toDate + label: reports.rainmaker-pgr.dateto + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND eg_pgr_service.createdtime <= $toDate + query: | + SELECT (SELECT deptmap.department FROM (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) WHERE deptmap.serviceCode = eg_pgr_service.servicecode) AS department, + regexp_replace(eg_pgr_service.servicecode, '([a-z])([A-Z])', '\1 \2','g') AS servicecode, + servicerequestid AS complaintNo, + to_char(to_timestamp(TRUNC(CAST(eg_pgr_service.createdtime AS bigint) / 1000)), 'DD/MM/YYYY') AS date, + (SELECT boundary_def.name FROM (VALUES tbl_boundary) AS boundary_def(name,code) where code=eg_pgr_address.mohalla) as locality, + eg_user.name, + phone, + eg_pgr_service.landmark, + housenoandstreetname as address, + description, + (SELECT (CASE WHEN (((SELECT deptmap.slaHours FROM (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) WHERE deptmap.serviceCode = eg_pgr_service.servicecode)::integer / 24) - ((((select extract(epoch from now())) * 1000) - eg_pgr_service.createdtime)::bigint/86400000)) < 1 THEN CONCAT('Overdue by ', ((((select extract(epoch from now())) * 1000) - eg_pgr_service.createdtime)::bigint/86400000) - ((SELECT deptmap.slaHours FROM (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) WHERE deptmap.serviceCode = eg_pgr_service.servicecode)::integer / 24), ' days') ELSE CONCAT(((SELECT deptmap.slaHours FROM (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) WHERE deptmap.serviceCode = eg_pgr_service.servicecode)::integer / 24) - ((((select extract(epoch from now())) * 1000) - eg_pgr_service.createdtime)::bigint/86400000), ' days remaining') END) as slaHours), + initcap(status) as status FROM eg_pgr_service + INNER JOIN eg_user ON eg_pgr_service.accountid = eg_user.id::VARCHAR + INNER JOIN eg_pgr_address ON eg_pgr_service.addressid = eg_pgr_address.uuid + WHERE eg_pgr_service.status = 'assigned' + AND servicerequestid IN (SELECT DISTINCT businesskey FROM eg_pgr_action WHERE status = 'assigned' AND "when" IN (select max("when") FROM eg_pgr_action WHERE assignee NOTNULL GROUP BY businesskey) AND assignee = $userid) + orderby: ORDER BY eg_pgr_service.createdtime asc + +- reportName: StateULBReport + summary: Fetches complaints stats for all ULBs in state + version: 1.0.0 + moduleName: rainmaker-pgr + sourceColumns: + - name: tenantid + label: reports.rainmaker-pgr.tenantid + type: string + source: eg_pgr_service + total: false + - name: open + label: reports.rainmaker-pgr.status.open + type: string + source: eg_pgr_service + total: true + - name: assigned + label: reports.rainmaker-pgr.status.assigned + type: string + source: eg_pgr_service + total: true + - name: closed + label: reports.rainmaker-pgr.status.closed + type: string + source: eg_pgr_service + total: true + - name: reassignrequested + label: reports.rainmaker-pgr.status.reassignrequested + type: string + source: eg_pgr_service + total: true + - name: rejected + label: reports.rainmaker-pgr.status.rejected + type: string + source: eg_pgr_service + total: true + - name: total + label: reports.rainmaker-pgr.total + type: string + source: eg_pgr_service + total: true + searchParams: + - name: fromDate + label: reports.rainmaker-pgr.datefrom + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND createdtime >= $fromDate + - name: toDate + label: reports.rainmaker-pgr.dateto + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND createdtime <= $toDate + query: | + select initcap(split_part(tenantid, '.', 2)) as tenantid, + SUM(CASE WHEN status ='open' THEN 1 ELSE 0 END) as open, + SUM(CASE WHEN status ='assigned' THEN 1 ELSE 0 END) as assigned, + SUM(CASE WHEN status in ('closed', 'resolved') THEN 1 ELSE 0 END) as closed, + SUM(CASE WHEN status ='reassignrequested' THEN 1 ELSE 0 END) as reassignrequested, + SUM(CASE WHEN status ='rejected' THEN 1 ELSE 0 END) as rejected, + COUNT(status) as total + from eg_pgr_service + WHERE tenantid != 'pb.testing' + groupby: GROUP BY tenantid + orderby: ORDER BY tenantid + +- reportName: ComplaintTypesReport + summary: Fetches complaint stats based on complaint types for a ULB + version: 1.0.0 + moduleName: rainmaker-pgr + sourceColumns: + - name: tenantid + label: reports.rainmaker-pgr.tenantid + type: string + source: eg_pgr_service + total: false + - name: complainttype + label: reports.rainmaker-pgr.complainttype + type: string + source: eg_pgr_service + total: false + - name: open + label: reports.rainmaker-pgr.status.open + type: string + source: eg_pgr_service + total: true + - name: assigned + label: reports.rainmaker-pgr.status.assigned + type: string + source: eg_pgr_service + total: true + - name: closed + label: reports.rainmaker-pgr.status.closed + type: string + source: eg_pgr_service + total: true + - name: reassignrequested + label: reports.rainmaker-pgr.status.reassignrequested + type: string + source: eg_pgr_service + total: true + - name: rejected + label: reports.rainmaker-pgr.status.rejected + type: string + source: eg_pgr_service + total: true + - name: total + label: reports.rainmaker-pgr.total + type: string + source: eg_pgr_service + total: true + searchParams: + - name: ulb + label: ULB + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: pt + wrapper: true + isMandatory: false + searchClause: AND tenantid = $ulb + - name: fromDate + label: reports.rainmaker-pgr.datefrom + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND createdtime >= $fromDate + - name: toDate + label: reports.rainmaker-pgr.dateto + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND createdtime <= $toDate + query: | + select + initcap(split_part(tenantid, '.', 2)) as tenantid, + regexp_replace(servicecode, '([a-z])([A-Z])', '\1 \2','g') as complainttype, + SUM(CASE WHEN status ='open' THEN 1 ELSE 0 END) as open, + SUM(CASE WHEN status ='assigned' THEN 1 ELSE 0 END) as assigned, + SUM(CASE WHEN status in ('closed', 'resolved') THEN 1 ELSE 0 END) as closed, + SUM(CASE WHEN status ='reassignrequested' THEN 1 ELSE 0 END) as reassignrequested, + SUM(CASE WHEN status ='rejected' THEN 1 ELSE 0 END) as rejected, + count(status) as total + from eg_pgr_service + WHERE tenantid != 'pb.testing' + groupby: GROUP BY tenantid,servicecode + orderby: ORDER BY tenantid,servicecode + +- reportName: DepartmentReport + summary: Fetches complaint stats based on complaint types for a ULB + version: 1.0.0 + moduleName: rainmaker-pgr + externalService: + - entity: $.MdmsRes.RAINMAKER-PGR.ServiceDefs + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=RAINMAKER-PGR&masterName=ServiceDefs&tenantId=$tenantId + keyOrder: serviceCode,department,slaHours + tableName: tbl_dept + - entity: $.MdmsRes.common-masters.Department + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=common-masters&masterName=Department&tenantId=$tenantId + keyOrder: name,code + tableName: tbl_def_dept + sourceColumns: + - name: tenantid + label: reports.rainmaker-pgr.tenantid + type: string + source: eg_pgr_service + total: false + - name: department + label: reports.rainmaker-pgr.department + type: string + source: eg_pgr_service + total: false + - name: open + label: reports.rainmaker-pgr.status.open + type: string + source: eg_pgr_service + total: true + - name: assigned + label: reports.rainmaker-pgr.status.assigned + type: string + source: eg_pgr_service + total: true + - name: closed + label: reports.rainmaker-pgr.status.closed + type: string + source: eg_pgr_service + total: true + - name: reassignrequested + label: reports.rainmaker-pgr.status.reassignrequested + type: string + source: eg_pgr_service + total: true + - name: rejected + label: reports.rainmaker-pgr.status.rejected + type: string + source: eg_pgr_service + total: true + searchParams: + - name: ulb + label: ULB + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: pt + wrapper: true + isMandatory: false + searchClause: AND tenantid = $ulb + - name: fromDate + label: reports.rainmaker-pgr.datefrom + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND createdtime >= $fromDate + - name: toDate + label: reports.rainmaker-pgr.dateto + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND createdtime <= $toDate + query: | + select + initcap(split_part(tenantid, '.', 2)) as tenantid, + deptmap_def.name as department, + SUM(CASE WHEN status ='open' THEN 1 ELSE 0 END) as open, + SUM(CASE WHEN status ='assigned' THEN 1 ELSE 0 END) as assigned, + SUM(CASE WHEN status in ('closed', 'resolved') THEN 1 ELSE 0 END) as closed, + SUM(CASE WHEN status ='reassignrequested' THEN 1 ELSE 0 END) as reassignrequested, + SUM(CASE WHEN status ='rejected' THEN 1 ELSE 0 END) as rejected, + count(status) as total + from eg_pgr_service + INNER JOIN (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) ON deptmap.serviceCode = eg_pgr_service.servicecode + INNER JOIN (VALUES tbl_def_dept) AS deptmap_def(name,code) ON deptmap.department = deptmap_def.code + WHERE tenantid != 'pb.testing' + groupby: GROUP BY tenantid,deptmap_def.name + orderby: ORDER BY tenantid,deptmap_def.name + +- reportName: ULBDepartmentReport + summary: Fetches complaint stats based on department types for a ULB + version: 1.0.0 + moduleName: rainmaker-pgr + externalService: + - entity: $.MdmsRes.RAINMAKER-PGR.ServiceDefs + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=RAINMAKER-PGR&masterName=ServiceDefs&tenantId=$tenantId + keyOrder: serviceCode,department,slaHours + tableName: tbl_dept + - entity: $.MdmsRes.common-masters.Department + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=common-masters&masterName=Department&tenantId=$tenantId + keyOrder: name,code + tableName: tbl_def_dept + sourceColumns: + - name: department + label: reports.rainmaker-pgr.department + type: string + source: eg_pgr_service + total: false + - name: rejected + label: reports.rainmaker-pgr.rejected + type: string + source: pgr_data + total: true + - name: resolved + label: reports.rainmaker-pgr.resolved + type: string + source: pgr_data + total: true + - name: resolvedoutsidesla + label: reports.rainmaker-pgr.resolvedoutsidesla + type: string + source: pgr_data + total: true + - name: open + label: reports.rainmaker-pgr.open + type: string + source: pgr_data + total: true + - name: assigned + label: reports.rainmaker-pgr.assigned + type: string + source: pgr_data + total: true + - name: outsidesla + label: reports.rainmaker-pgr.outsidesla + type: string + source: pgr_data + total: true + searchParams: + - name: fromDate + label: reports.rainmaker-pgr.datefrom + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND pgr_data.createdtime >= $fromDate + - name: toDate + label: reports.rainmaker-pgr.dateto + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND pgr_data.createdtime <= $toDate + query: | + with pgr_data as (select + servicerequestid, + servicecode, + createdtime, + status, + (select max("when") from eg_pgr_action where action='resolve' and businesskey = servicerequestid) as resolvedtime, + (select min("when") from eg_pgr_action where action='open' and businesskey = servicerequestid) as opentime + from eg_pgr_service as ps + where + tenantid = $tenantid) + + select + deptmap_def.name as department, + count(*) as total, + SUM (CASE WHEN status in ('rejected') THEN 1 ELSE 0 END) as rejected, + SUM (CASE WHEN status in ('closed', 'resolved') THEN 1 ELSE 0 END) as resolved, + SUM (CASE WHEN status in ('closed', 'resolved') and (resolvedtime - opentime) >= 14 * 86400 * 1000 THEN 1 ELSE 0 END) as resolvedoutsidesla, + SUM (CASE WHEN status in ('assigned', 'reassignrequested') THEN 1 ELSE 0 END) as assigned, + SUM (CASE WHEN status in ('open') THEN 1 ELSE 0 END) as open, + SUM (CASE WHEN status in ('assigned', 'reassignrequested', 'open') and (extract(epoch from now()) * 1000 - opentime) >= 14 * 86400 * 1000 THEN 1 ELSE 0 END) as outsidesla + from pgr_data + INNER JOIN (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) ON deptmap.serviceCode = pgr_data.servicecode + INNER JOIN (VALUES tbl_def_dept) AS deptmap_def(name,code) ON deptmap.department = deptmap_def.code + WHERE 1=1 + groupby: GROUP BY deptmap_def.name + orderby: ORDER BY deptmap_def.name + +- reportName: ULBEmployeeWiseReport + summary: Fetches employee wise assignment report + version: 1.0.0 + moduleName: rainmaker-pgr + sourceColumns: + - name: employee + label: reports.rainmaker-pgr.employee + type: string + source: pgr_data + total: false + - name: rejected + label: reports.rainmaker-pgr.rejected + type: string + source: pgr_data + total: true + - name: resolved + label: reports.rainmaker-pgr.resolved + type: string + source: pgr_data + total: true + - name: resolvedoutsidesla + label: reports.rainmaker-pgr.resolvedoutsidesla + type: string + source: pgr_data + total: true + - name: open + label: reports.rainmaker-pgr.open + type: string + source: pgr_data + total: true + - name: assigned + label: reports.rainmaker-pgr.assigned + type: string + source: pgr_data + total: true + - name: outsidesla + label: reports.rainmaker-pgr.outsidesla + type: string + source: pgr_data + total: true + searchParams: + - name: fromDate + label: reports.rainmaker-pgr.datefrom + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND pgr_data.createdtime >= $fromDate + - name: toDate + label: reports.rainmaker-pgr.dateto + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND pgr_data.createdtime <= $toDate + query: | + with pgr_data as (select + (select assignee from eg_pgr_action as pa where + pa.businesskey = ps.servicerequestid + and pa."action" in ('assign', 'reassign') + order by "when" desc + fetch first 1 rows only + ) as assignee, + servicerequestid, + createdtime, + status, + (select max("when") from eg_pgr_action where action='resolve' and businesskey = servicerequestid) as resolvedtime, + (select min("when") from eg_pgr_action where action='open' and businesskey = servicerequestid) as opentime + from eg_pgr_service as ps + where + tenantid = $tenantid) + + select + coalesce((select name from eg_user where id::varchar = assignee),'-- Unassigned --') as employee, + SUM (CASE WHEN status in ('rejected') THEN 1 ELSE 0 END) as rejected, + SUM (CASE WHEN status in ('closed', 'resolved') THEN 1 ELSE 0 END) as resolved, + SUM (CASE WHEN status in ('closed', 'resolved') and (resolvedtime - opentime) >= 14 * 86400 * 1000 THEN 1 ELSE 0 END) as resolvedoutsidesla, + SUM (CASE WHEN status in ('assigned', 'reassignrequested') THEN 1 ELSE 0 END) as assigned, + SUM (CASE WHEN status in ('open') THEN 1 ELSE 0 END) as open, + SUM (CASE WHEN status in ('assigned', 'reassignrequested', 'open') and (extract(epoch from now()) * 1000 - opentime) >= 14 * 86400 * 1000 THEN 1 ELSE 0 END) as outsidesla + from pgr_data + WHERE 1=1 + orderby: ORDER BY assignee NULLS FIRST + groupby: GROUP BY assignee diff --git a/configs/reports/configs/rainmaker-pt-reports.yml b/configs/reports/configs/rainmaker-pt-reports.yml new file mode 100644 index 00000000..22796616 --- /dev/null +++ b/configs/reports/configs/rainmaker-pt-reports.yml @@ -0,0 +1,987 @@ +--- +ReportDefinitions: +- reportName: ReceiptRegister + summary: Receipt Register + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: receiptnumber + label: reports.pt.receiptNo + type: string + source: pt + total: false + - name: transactiondate + label: reports.pt.receiptDate + type: string + source: pt + total: false + - name: g8issuedate + label: reports.pt.g8issuedate + type: string + source: pt + total: false + - name: g8receiptno + label: reports.pt.g8receiptno + type: string + source: pt + total: false + - name: amount + label: reports.pt.amount + type: string + source: pt + total: true + - name: propertytax + label: reports.pt.propertyTax + type: string + source: pt + total: true + - name: firecess + label: reports.pt.fireCess + type: string + source: pt + total: true + - name: cancercess + label: reports.pt.cancerCess + type: string + source: pt + total: true + - name: rebate + label: reports.pt.rebate + type: string + source: pt + total: true + - name: adhocrebate + label: reports.pt.adhocrebate + type: string + source: pt + total: true + - name: penalty + label: reports.pt.penalty + type: string + source: pt + total: true + - name: adhocpenalty + label: reports.pt.adhocpenalty + type: string + source: pt + total: true + - name: interest + label: reports.pt.interest + type: string + source: pt + total: true + - name: exemption + label: reports.pt.exemption + type: string + source: pt + total: true + - name: adjusment + label: reports.pt.roundoff + type: string + source: pt + total: true + - name: pendingamount + label: reports.pt.pendingamount + type: string + source: pt + total: true + - name: propertyid + label: reports.pt.propertyId + type: string + source: pt + total: false + - name: usagetype + label: reports.pt.usagetype + type: string + source: pt + total: false + - name: assessmentnumber + label: reports.pt.assessmentNo + type: string + source: pt + total: false + - name: financialyear + label: reports.pt.financialYear + type: string + source: pt + total: false + - name: instrumenttype + label: reports.pt.paymentMode + type: string + source: pt + total: false + - name: transactionnumber + label: reports.pt.ddChequeTransactionNo + type: string + source: pt + total: false + - name: bankname + label: reports.pt.bankName + type: string + source: pt + total: false + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: false + searchClause: AND rh.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: false + searchClause: AND rh.receiptdate <= $toDate + - name: paymentMode + label: Payment Mode + type: singlevaluelist + pattern: 'list://Cash:Cash,Online:Online,Card:Card,DD:DD,Cheque:Cheque' + source: pt + isMandatory: false + searchClause: AND instrumenttype = $paymentMode + - name: financialyear + label: Financial Year + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name + source: pt + wrapper: true + isMandatory: false + searchClause: AND financialyear = $financialyear + - name: localityArray + label: reports.pt.zoneList + type: boundarylist + source: pt + isMandatory: false + searchClause: AND pt_addr.locality IN ($localityArray) + query: | + -- Use CTE to force query plan, compute & use CTE later + WITH receipt_breakup AS ( + SELECT + receiptheader, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocrebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, + SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, + (SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END)) + as propertytax, + SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN adjustedamount ELSE 0 END) as exemption, + (SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END)) as adjusment + FROM egcl_receiptdetails_v1 + WHERE tenantid LIKE $tenantid + GROUP BY receiptheader + ) + SELECT + rh.tenantid AS tenantid, + rh.id, + Substring(rh.consumercode, '(.*):') AS propertyid, + Substring(rh.consumercode, ':(.*)') AS assessmentnumber, + rh.consumercode, + rh.receiptdate, + To_char(To_timestamp(rh.receiptdate / 1000), 'DD/MM/YYYY') AS transactiondate, + bankid AS bankname, + receiptnumber, + amount, + instrumenttype, + transactionnumber, + receipt_breakup.*, + rh.totalamount - ih.amount AS pendingamount, + pt_detail.financialyear, + To_char(To_timestamp(rh.manualreceiptdate / 1000), 'DD/MM/YYYY') AS g8issuedate, + Initcap(COALESCE(pt_detail.usagecategoryminor, pt_detail.usagecategorymajor)) as usagetype, + manualreceiptnumber as g8receiptno + FROM egcl_receiptheader_v1 AS rh + JOIN egcl_receiptinstrument_v1 AS ri ON rh.id = ri.receiptheader + JOIN egcl_instrumentheader_v1 AS ih ON ih.id = ri.instrumentheader + JOIN receipt_breakup ON rh.id = receipt_breakup.receiptheader + JOIN eg_pt_propertydetail_v2 pt_detail ON CONCAT(pt_detail.property, ':', pt_detail.assessmentnumber) = rh.consumercode + JOIN eg_pt_address_v2 pt_addr ON pt_detail.property = pt_addr.property + WHERE rh.tenantid LIKE $tenantid and rh.status != 'Cancelled' + orderby: ORDER BY rh.receiptdate DESC + +- reportName: CancelledReceiptRegister + summary: Receipt Register for cancelled Receipts + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: receiptnumber + label: reports.pt.receiptNo + type: string + source: pt + total: false + - name: status + label: reports.pt.status + type: string + source: pt + total: false + - name: transactiondate + label: reports.pt.receiptDate + type: string + source: pt + total: false + - name: g8issuedate + label: reports.pt.g8issuedate + type: string + source: pt + total: false + - name: g8receiptno + label: reports.pt.g8receiptno + type: string + source: pt + total: false + - name: amount + label: reports.pt.amount + type: string + source: pt + total: true + - name: propertytax + label: reports.pt.propertyTax + type: string + source: pt + total: true + - name: firecess + label: reports.pt.fireCess + type: string + source: pt + total: true + - name: cancercess + label: reports.pt.cancerCess + type: string + source: pt + total: true + - name: rebate + label: reports.pt.rebate + type: string + source: pt + total: true + - name: adhocrebate + label: reports.pt.adhocrebate + type: string + source: pt + total: true + - name: penalty + label: reports.pt.penalty + type: string + source: pt + total: true + - name: adhocpenalty + label: reports.pt.adhocpenalty + type: string + source: pt + total: true + - name: interest + label: reports.pt.interest + type: string + source: pt + total: true + - name: exemption + label: reports.pt.exemption + type: string + source: pt + total: true + - name: adjusment + label: reports.pt.roundoff + type: string + source: pt + total: true + - name: propertyid + label: reports.pt.propertyId + type: string + source: pt + total: false + - name: usagetype + label: reports.pt.usagetype + type: string + source: pt + total: false + - name: assessmentnumber + label: reports.pt.assessmentNo + type: string + source: pt + total: false + - name: financialyear + label: reports.pt.financialYear + type: string + source: pt + total: false + - name: instrumenttype + label: reports.pt.paymentMode + type: string + source: pt + total: false + - name: transactionnumber + label: reports.pt.ddChequeTransactionNo + type: string + source: pt + total: false + - name: bankname + label: reports.pt.bankName + type: string + source: pt + total: false + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: false + searchClause: AND rh.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: false + searchClause: AND rh.receiptdate <= $toDate + - name: paymentMode + label: Payment Mode + type: singlevaluelist + pattern: 'list://Cash:Cash,Online:Online,Card:Card,DD:DD,Cheque:Cheque' + source: pt + isMandatory: false + searchClause: AND instrumenttype = $paymentMode + - name: financialyear + label: Financial Year + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name + source: pt + wrapper: true + isMandatory: false + searchClause: AND financialyear = $financialyear + - name: localityArray + label: reports.pt.zoneList + type: boundarylist + source: pt + isMandatory: false + searchClause: AND pt_addr.locality IN ($localityArray) + query: | + -- Use CTE to force query plan, compute & use CTE later + WITH receipt_breakup AS ( + SELECT + receiptheader, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocrebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, + SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, + (SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END)) + as propertytax, + SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN adjustedamount ELSE 0 END) as exemption, + (SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END)) as adjusment + FROM egcl_receiptdetails_v1 + WHERE tenantid LIKE $tenantid + GROUP BY receiptheader + ) + SELECT + rh.tenantid AS tenantid, + rh.id, + Substring(rh.consumercode, '(.*):') AS propertyid, + Substring(rh.consumercode, ':(.*)') AS assessmentnumber, + rh.status, + rh.consumercode, + rh.receiptdate, + To_char(To_timestamp(rh.receiptdate / 1000), 'DD/MM/YYYY') AS transactiondate, + bankid AS bankname, + receiptnumber, + amount, + instrumenttype, + transactionnumber, + receipt_breakup.*, + rh.totalamount - ih.amount AS pendingamount, + pt_detail.financialyear, + To_char(To_timestamp(rh.manualreceiptdate / 1000), 'DD/MM/YYYY') AS g8issuedate, + Initcap(COALESCE(pt_detail.usagecategoryminor, pt_detail.usagecategorymajor)) as usagetype, + manualreceiptnumber as g8receiptno + FROM egcl_receiptheader_v1 AS rh + JOIN egcl_receiptinstrument_v1 AS ri ON rh.id = ri.receiptheader + JOIN egcl_instrumentheader_v1 AS ih ON ih.id = ri.instrumentheader + JOIN receipt_breakup ON rh.id = receipt_breakup.receiptheader + JOIN eg_pt_propertydetail_v2 pt_detail ON CONCAT(pt_detail.property, ':', pt_detail.assessmentnumber) = rh.consumercode + JOIN eg_pt_address_v2 pt_addr ON pt_detail.property = pt_addr.property + WHERE rh.tenantid LIKE $tenantid and rh.status = 'Cancelled' + orderby: ORDER BY rh.receiptdate DESC + +- reportName: OldUlbWisePtCollection + summary: ULB-wise PT Collection + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: totalassessments + label: reports.pt.totalassessments + type: string + source: pt + total: true + - name: totalamountpaid + label: reports.pt.totalamountpaid + type: string + source: pt + total: true + - name: totalamountdue + label: reports.pt.totalamountdue + type: string + source: pt + total: true + searchParams: + - name: financialyear + label: Financial Year + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name + source: pt + wrapper: true + isMandatory: false + searchClause: AND financialyear = $financialyear + - name: usage + label: Usage + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=PropertyTax&masterName=UsageCategoryMajor|$..code|$..name + source: pt + wrapper: true + isMandatory: false + searchClause: AND usagecategorymajor = $usage + query: | + SELECT + tenantid, + COUNT(*) AS totalassessments, + SUM(totalamount) AS totalamount, + SUM(amount) AS totalamountpaid, + (SUM(totalamount) - SUM(amount)) AS totalamountdue + FROM eg_pt_propertydetail_v2 AS pd + LEFT OUTER JOIN + (SELECT consumercode, totalamount, amount FROM egcl_receiptheader_v1 AS rh + LEFT OUTER JOIN egcl_receiptinstrument_v1 AS ri ON rh.id = ri.receiptheader + LEFT OUTER JOIN egcl_instrumentheader_v1 AS ih ON ri.instrumentheader = ih.id + and ih.instrumentstatus != 'CANCELLED' + where rh.status != 'Cancelled' + ) AS instrument_data ON CONCAT(pd.property, ':', pd.assessmentnumber) = instrument_data.consumercode + WHERE tenantid = $tenantid + groupby: GROUP BY tenantid + orderby: ORDER BY tenantid, totalamountpaid DESC NULLS LAST + +- reportName: StateCancelledReceiptRegister + summary: Receipt Register for cancelled Receipts State + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: tenantid + label: reports.pt.ulbName + type: string + source: pt + total: false + - name: receiptnumber + label: reports.pt.receiptNo + type: string + source: pt + total: false + - name: status + label: reports.pt.status + type: string + source: pt + total: false + - name: transactiondate + label: reports.pt.receiptDate + type: string + source: pt + total: false + - name: g8issuedate + label: reports.pt.g8issuedate + type: string + source: pt + total: false + - name: g8receiptno + label: reports.pt.g8receiptno + type: string + source: pt + total: false + - name: amount + label: reports.pt.amount + type: string + source: pt + total: true + - name: propertytax + label: reports.pt.propertyTax + type: string + source: pt + total: true + - name: firecess + label: reports.pt.fireCess + type: string + source: pt + total: true + - name: cancercess + label: reports.pt.cancerCess + type: string + source: pt + total: true + - name: rebate + label: reports.pt.rebate + type: string + source: pt + total: true + - name: adhocrebate + label: reports.pt.adhocrebate + type: string + source: pt + total: true + - name: penalty + label: reports.pt.penalty + type: string + source: pt + total: true + - name: adhocpenalty + label: reports.pt.adhocpenalty + type: string + source: pt + total: true + - name: interest + label: reports.pt.interest + type: string + source: pt + total: true + - name: exemption + label: reports.pt.exemption + type: string + source: pt + total: true + - name: adjusment + label: reports.pt.roundoff + type: string + source: pt + total: true + - name: propertyid + label: reports.pt.propertyId + type: string + source: pt + total: false + - name: usagetype + label: reports.pt.usagetype + type: string + source: pt + total: false + - name: assessmentnumber + label: reports.pt.assessmentNo + type: string + source: pt + total: false + - name: financialyear + label: reports.pt.financialYear + type: string + source: pt + total: false + - name: instrumenttype + label: reports.pt.paymentMode + type: string + source: pt + total: false + - name: transactionnumber + label: reports.pt.ddChequeTransactionNo + type: string + source: pt + total: false + - name: bankname + label: reports.pt.bankName + type: string + source: pt + total: false + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: false + searchClause: AND rh.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: false + searchClause: AND rh.receiptdate <= $toDate + - name: paymentMode + label: Payment Mode + type: singlevaluelist + pattern: 'list://Cash:Cash,Online:Online,Card:Card,DD:DD,Cheque:Cheque' + source: pt + isMandatory: false + searchClause: AND instrumenttype = $paymentMode + - name: financialyear + label: Financial Year + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name + source: pt + wrapper: true + isMandatory: false + searchClause: AND financialyear = $financialyear + query: | + -- Use CTE to force query plan, compute & use CTE later + WITH receipt_breakup AS ( + SELECT + receiptheader, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocrebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, + SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, + SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, + (SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END)) + as propertytax, + SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN adjustedamount ELSE 0 END) as exemption, + (SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END)) as adjusment + FROM egcl_receiptdetails_v1 + WHERE tenantid != 'pb.testing' + GROUP BY receiptheader + ) + SELECT + initcap(split_part(rh.tenantid, '.', 2)) as tenantid, + rh.id, + Substring(rh.consumercode, '(.*):') AS propertyid, + Substring(rh.consumercode, ':(.*)') AS assessmentnumber, + rh.status, + rh.consumercode, + rh.receiptdate, + To_char(To_timestamp(rh.receiptdate / 1000), 'DD/MM/YYYY') AS transactiondate, + bankid AS bankname, + receiptnumber, + amount, + instrumenttype, + transactionnumber, + receipt_breakup.*, + pt_detail.financialyear, + To_char(To_timestamp(rh.manualreceiptdate / 1000), 'DD/MM/YYYY') AS g8issuedate, + Initcap(COALESCE(pt_detail.usagecategoryminor, pt_detail.usagecategorymajor)) as usagetype, + manualreceiptnumber as g8receiptno + FROM egcl_receiptheader_v1 AS rh + JOIN egcl_receiptinstrument_v1 AS ri ON rh.id = ri.receiptheader + JOIN egcl_instrumentheader_v1 AS ih ON ih.id = ri.instrumentheader + JOIN receipt_breakup ON rh.id = receipt_breakup.receiptheader + JOIN eg_pt_propertydetail_v2 pt_detail ON CONCAT(pt_detail.property, ':', pt_detail.assessmentnumber) = rh.consumercode + JOIN eg_pt_address_v2 pt_addr ON pt_detail.property = pt_addr.property + WHERE rh.tenantid != 'pb.testing' and rh.status = 'Cancelled' + orderby: ORDER BY rh.receiptdate DESC + +- reportName: StateWidePtCollection + summary: State Wide PT Collection + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: tenantid + label: reports.pt.ulbName + type: string + source: pt + total: false + - name: totalassessments + label: reports.pt.totalassessments + type: string + source: pt + total: true + - name: totalamountpaid + label: reports.pt.totalamountpaid + type: string + source: pt + total: true + - name: totaloffline + label: reports.pt.totaloffline + type: string + source: pt + total: true + - name: totalonline + label: reports.pt.totalonline + type: string + source: pt + total: true + - name: totalamountdue + label: reports.pt.totalamountdue + type: string + source: pt + total: true + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: false + searchClause: AND receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: false + searchClause: AND receiptdate <= $toDate + - name: ulb + label: ULB + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: pt + wrapper: true + isMandatory: false + searchClause: AND tenantid = $ulb + - name: financialyear + label: Financial Year + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name + source: pt + wrapper: true + isMandatory: false + searchClause: AND financialyear = $financialyear + - name: usage + label: Usage + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=PropertyTax&masterName=UsageCategoryMajor|$..code|$..name + source: pt + wrapper: true + isMandatory: false + searchClause: AND usagecategorymajor = $usage + query: | + SELECT + initcap(split_part(tenantid, '.', 2)) as tenantid, + COUNT(*) AS totalassessments, + SUM(totalamount) AS totalamount, + SUM(amount) AS totalamountpaid, + SUM(CASE WHEN collectiontype LIKE 'ONLINE' THEN amount ELSE 0 END) AS totalonline, + SUM(CASE WHEN collectiontype LIKE 'COUNTER' THEN amount ELSE 0 END) AS totaloffline, + (SUM(totalamount) - SUM(amount)) AS totalamountdue + FROM eg_pt_propertydetail_v2 AS pd + LEFT OUTER JOIN (SELECT consumercode, totalamount, amount, collectiontype, receiptdate FROM egcl_receiptheader_v1 AS rh + LEFT OUTER JOIN egcl_receiptinstrument_v1 AS ri ON rh.id = ri.receiptheader + LEFT OUTER JOIN egcl_instrumentheader_v1 AS ih ON ri.instrumentheader = ih.id and ih.instrumentstatus != 'CANCELLED' + where rh.status != 'Cancelled' + ) AS tbl_amounts ON CONCAT(pd.property, ':', pd.assessmentnumber) = tbl_amounts.consumercode + WHERE tenantid LIKE CONCAT(SPLIT_PART($tenantid, '.', 1), '%') and tenantid != 'pb.testing' + groupby: GROUP BY tenantid + orderby: ORDER BY tenantid, totalamountpaid DESC NULLS LAST + +- reportName: UlbWisePtCollection + summary: State Wide PT Collection + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: totalassessments + label: reports.pt.totalassessments + type: string + source: pt + total: true + - name: totalamountpaid + label: reports.pt.totalamountpaid + type: string + source: pt + total: true + - name: totaloffline + label: reports.pt.totaloffline + type: string + source: pt + total: true + - name: totalonline + label: reports.pt.totalonline + type: string + source: pt + total: true + - name: totalamountdue + label: reports.pt.totalamountdue + type: string + source: pt + total: true + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: false + searchClause: AND receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: false + searchClause: AND receiptdate <= $toDate + - name: financialyear + label: Financial Year + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name + source: pt + wrapper: true + isMandatory: false + searchClause: AND financialyear = $financialyear + - name: usage + label: Usage + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=PropertyTax&masterName=UsageCategoryMajor|$..code|$..name + source: pt + wrapper: true + isMandatory: false + searchClause: AND usagecategorymajor = $usage + query: | + SELECT + initcap(split_part(tenantid, '.', 2)) as tenantid, + COUNT(*) AS totalassessments, + SUM(totalamount) AS totalamount, + SUM(amount) AS totalamountpaid, + SUM(CASE WHEN collectiontype LIKE 'ONLINE' THEN amount ELSE 0 END) AS totalonline, + SUM(CASE WHEN collectiontype LIKE 'COUNTER' THEN amount ELSE 0 END) AS totaloffline, + (SUM(totalamount) - SUM(amount)) AS totalamountdue + FROM eg_pt_propertydetail_v2 AS pd + LEFT OUTER JOIN (SELECT consumercode, totalamount, amount, collectiontype, receiptdate FROM egcl_receiptheader_v1 AS rh + LEFT OUTER JOIN egcl_receiptinstrument_v1 AS ri ON rh.id = ri.receiptheader + LEFT OUTER JOIN egcl_instrumentheader_v1 AS ih ON ri.instrumentheader = ih.id and ih.instrumentstatus != 'CANCELLED' + where rh.status != 'Cancelled' + ) AS tbl_amounts ON CONCAT(pd.property, ':', pd.assessmentnumber) = tbl_amounts.consumercode + WHERE tenantid LIKE CONCAT(SPLIT_PART($tenantid, '.', 1), '%') and tenantid = $tenantid + groupby: GROUP BY tenantid + orderby: ORDER BY tenantid, totalamountpaid DESC NULLS LAST + + +- reportName: ULBPTDataDumpReport + summary: ULB level report + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: ulb + label: reports.pt.ulb + type: string + source: pt + total: false + - name: propertytaxuniqueid + label: reports.pt.propertytaxuniqueid + type: string + source: pt + total: false + - name: transcationdate + label: reports.pt.transcationdate + type: string + source: pt + total: false + - name: receiptnumber + label: reports.pt.receiptnumber + type: string + source: pt + total: false + - name: existingpropertyid + label: reports.pt.existingpropertyid + type: string + source: pt + total: false + - name: ownername + label: reports.pt.ownername + type: string + source: pt + total: false + - name: guardianname + label: reports.pt.guardianname + type: string + source: pt + total: false + - name: totalarea + label: reports.pt.totalarea + type: string + source: pt + total: false + - name: builtarea + label: reports.pt.builtarea + type: string + source: pt + total: false + - name: floors + label: reports.pt.floors + type: string + source: pt + total: false + - name: occupancy + label: reports.pt.occupancy + type: string + source: pt + total: false + - name: propertytype + label: reports.pt.propertytype + type: string + source: pt + total: false + - name: mobileno + label: reports.pt.mobileno + type: string + source: pt + total: false + - name: transcationmode + label: reports.pt.transcationmode + type: string + source: pt + total: false + - name: paymentamount + label: reports.pt.paymentamount + type: string + source: pt + total: true + - name: paymentdate + label: reports.pt.paymentdate + type: string + source: pt + total: false + - name: emailid + label: reports.pt.emailid + type: string + source: pt + total: false + - name: address + label: reports.pt.address + type: string + source: pt + total: false + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: false + searchClause: AND rh.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: false + searchClause: AND rh.receiptdate <= $toDate + query: | + --S.no Service Name ULB Property Tax Unique ID Date Of Transcation Receipt Number Existing Property ID Owner Name Guardian Name Total Area (SQ.YARD) Covered Area/Built Area (SQ.FEET) Floors Occupancy (Rented,Self /Unoccupied) Type Of Property Mobile Number Transcation Mode of Payment Payment Amount Payment Date Email Id Address + with eg_pt_unit_v2_ot as ( + select + propertydetail, + string_agg(distinct pu.occupancytype, ',') as occupancytype, + string_agg(distinct coalesce(usagecategoryminor, usagecategorymajor), ',') as propertytype + from eg_pt_unit_v2 as pu + where pu.tenantid = $tenantid + group by propertydetail + ) + select + distinct on (rh.receiptnumber) + initcap(split_part(rh.tenantid, '.', 2)) as "ulb", + split_part(consumercode, ':', 1) as "propertytaxuniqueid", + to_timestamp(receiptdate/1000) at time zone 'Asia/Kolkata' as "transcationdate", + receiptnumber as "receiptnumber", + pt.oldpropertyid as "existingpropertyid", + eu."name" as "ownername", + eu.guardian as "guardianname", + pd.landarea as "totalarea", + pd.builduparea * 9 as "builtarea", + pd.nooffloors as "floors", + pot.occupancytype as "occupancy", + pot.propertytype as "propertytype", + eu.mobilenumber as "mobileno", + instrumenttype as "transcationmode", + ih.amount as "paymentamount", + to_timestamp(ih.transactiondate/1000) at time zone 'Asia/Kolkata' as "paymentdate", + eu.emailid as "emailid" , + REGEXP_REPLACE(REGEXP_REPLACE(CONCAT(pta.doorno, ',', pta.addressline1, ',', pta.addressline2, ',', pta.buildingname, ',', pta.pincode), ',+', ','), '^,|,$', '') as "address" + from egcl_receiptheader_v1 as rh + inner join egcl_receiptinstrument_v1 as ri on ri.receiptheader = rh.id inner join egcl_instrumentheader_v1 as ih on ih.id = ri.instrumentheader + inner join eg_pt_property_v2 as pt on pt.propertyid = split_part(consumercode, ':', 1) + inner join eg_pt_propertydetail_v2 as pd on pd.assessmentnumber = split_part(consumercode, ':', 2) + inner join eg_pt_owner_v2 as po on po.propertydetail = pd.assessmentnumber + inner join eg_user as eu on eu.uuid = po.userid + inner join eg_pt_address_v2 as pta on pta.property = pt.propertyid + inner join eg_pt_unit_v2_ot as pot on pot.propertydetail = pd.assessmentnumber + where rh.tenantid = $tenantid \ No newline at end of file diff --git a/configs/reports/configs/rainmaker-tl-reports.yml b/configs/reports/configs/rainmaker-tl-reports.yml new file mode 100644 index 00000000..9987e3e4 --- /dev/null +++ b/configs/reports/configs/rainmaker-tl-reports.yml @@ -0,0 +1,781 @@ +--- +ReportDefinitions: +- reportName: TradeLicenseRegistryReport + decryptionPathId: TradeLicenseRegistryReport + summary: TL Receipt Register Report + version: 1.0.0 + moduleName: rainmaker-tl + sourceColumns: + - name: receiptnumber + label: report.tl.receiptnumber + type: string + source: tl + total: false + - name: receiptIssueDate + label: report.tl.receiptissuedate + type: string + source: tl + total: false + - name: g8issuedate + label: report.tl.g8issuedate + type: string + source: tl + total: false + - name: g8receiptno + label: report.tl.g8receiptno + type: string + source: tl + total: false + - name: licensenumber + label: report.tl.licensenumber + type: string + source: tl + total: false + - name: formattedIssuedDate + label: report.tl.issueddate + type: string + source: tl + total: false + - name: name + label: report.tl.user.name + type: string + source: tl + total: false + - name: mobilenumber + label: report.tl.user.mobilenumber + type: string + source: tl + total: false + - name: bankid + label: report.tl.bankid + type: string + source: tl + total: false + - name: branchname + label: report.tl.branchname + type: string + source: tl + total: false + - name: transactionumber + label: report.tl.transactionumber + type: string + source: tl + total: false + - name: instrumenttype + label: report.tl.instrumenttype + type: string + source: tl + total: false + - name: status + label: report.tl.status + type: string + source: tl + total: false + - name: tradeTypeName + label: report.tl.tradetype + type: string + source: tl + total: true + - name: acc + label: report.tl.accessorycategories + type: string + source: tl + total: false + - name: tradeName + label: report.tl.tradeName + type: string + source: tl + total: false + - name: totalamount + label: report.tl.receipt.totalamount + type: string + source: tl + total: true + searchParams: + - name: fromDate + label: reports.tl.fromDate + type: epoch + source: tl + isMandatory: false + searchClause: AND receipt.createddate >= $fromDate + - name: toDate + label: reports.tl.toDate + type: epoch + source: tl + isMandatory: false + searchClause: AND receipt.createddate <= $toDate + query: | + SELECT + licensenumber, + to_char(To_timestamp(issueddate / 1000), 'DD/MM/YYYY') as formattedIssuedDate, + tl.tradeName, + initcap(tl.status) as status, + to_char(To_timestamp(receipt.receiptdate / 1000), 'DD/MM/YYYY') as receiptIssueDate , + receipt.receiptnumber, + tradeTypeName, + acc, + name, + mobilenumber, + ih.bankid, + ih.branchname, + ih.transactionnumber, + ih.instrumenttype, + amount as totalamount, + To_char(To_timestamp(receipt.manualreceiptdate / 1000), 'DD/MM/YYYY') AS g8issuedate, + receipt.manualreceiptnumber as g8receiptno + + FROM eg_tl_tradelicense tl + INNER JOIN eg_tl_tradelicensedetail tld ON tld.tradelicenseid = tl.id + INNER JOIN ( + SELECT tradelicensedetailid,array_to_string(array_agg(message.message),', ') as tradeTypeName FROM eg_tl_tradeunit + INNER JOIN message ON split_part(message.code,'_',2) = tradeType AND message.locale = 'en_IN' GROUP BY 1) tlunit ON tlunit.tradelicensedetailid = tld.id + INNER JOIN ( + SELECT tradelicensedetailid, array_to_string(array_agg(name),', ') as name, array_to_string(array_agg(mobilenumber),', ') as mobilenumber + FROM eg_tl_owner tlowner + INNER JOIN eg_user tluser ON tluser.uuid = tlowner.id + group by tradelicensedetailid + ) tlown ON tlown.tradelicensedetailid = tld.id + LEFT OUTER JOIN egcl_receiptheader_v1 receipt ON receipt.consumercode = tl.applicationnumber and receipt.status != 'Cancelled' + LEFT OUTER JOIN egcl_receiptinstrument_v1 as ri ON ri.receiptheader = receipt.id + LEFT OUTER JOIN egcl_instrumentheader_v1 as ih ON ih.id = ri.instrumentheader and ih.instrumentstatus != 'CANCELLED' + LEFT OUTER JOIN (SELECT tradelicensedetailid,array_to_string(array_agg(message.message),',') AS acc FROM eg_tl_accessory + LEFT OUTER JOIN message ON split_part(message.code,'_',2) = accessorycategory AND message.locale = 'en_IN' GROUP BY 1 ) tlacc ON tlacc.tradelicensedetailid = tld.id + WHERE tl.Status in ('APPROVED', 'PAID', 'CANCELLED') AND tl.tenantId LIKE $tenantid + +- reportName: StateTradeLicenseCancelledRegistryReport + summary: TL Cancelled Receipt Register Report + version: 1.0.0 + moduleName: rainmaker-tl + sourceColumns: + - name: tenantId + label: report.tl.tenantid + type: string + source: tl + total: false + - name: receiptnumber + label: report.tl.receiptnumber + type: string + source: tl + total: false + - name: receiptIssueDate + label: report.tl.receiptissuedate + type: string + source: tl + total: false + - name: g8issuedate + label: report.tl.g8issuedate + type: string + source: tl + total: false + - name: g8receiptno + label: report.tl.g8receiptno + type: string + source: tl + total: false + - name: licensenumber + label: report.tl.licensenumber + type: string + source: tl + total: false + - name: formattedIssuedDate + label: report.tl.issueddate + type: string + source: tl + total: false + - name: name + label: report.tl.user.name + type: string + source: tl + total: false + - name: mobilenumber + label: report.tl.user.mobilenumber + type: string + source: tl + total: false + - name: bankid + label: report.tl.bankid + type: string + source: tl + total: false + - name: branchname + label: report.tl.branchname + type: string + source: tl + total: false + - name: transactionumber + label: report.tl.transactionumber + type: string + source: tl + total: false + - name: instrumenttype + label: report.tl.instrumenttype + type: string + source: tl + total: false + - name: status + label: report.tl.status + type: string + source: tl + total: false + - name: tradeTypeName + label: report.tl.tradetype + type: string + source: tl + total: false + - name: acc + label: report.tl.accessorycategories + type: string + source: tl + total: false + - name: tradeName + label: report.tl.tradeName + type: string + source: tl + total: false + - name: totalamount + label: report.tl.receipt.totalamount + type: number + source: tl + total: true + searchParams: + - name: fromDate + label: reports.tl.fromDate + type: epoch + source: tl + isMandatory: false + searchClause: AND receipt.createddate >= $fromDate + - name: toDate + label: reports.tl.toDate + type: epoch + source: tl + isMandatory: false + searchClause: AND receipt.createddate <= $toDate + query: | + SELECT + initcap(split_part(tl.tenantId, '.', 2)) as tenantId, + licensenumber, + to_char(To_timestamp(issueddate / 1000), 'DD/MM/YYYY') as formattedIssuedDate, + tl.tradeName, + initcap(tl.status) as status, + to_char(To_timestamp(receipt.receiptdate / 1000), 'DD/MM/YYYY') as receiptIssueDate , + receipt.receiptnumber, + tradeTypeName, + acc, + name, + mobilenumber, + ih.bankid, + ih.branchname, + ih.transactionnumber, + ih.instrumenttype, + amount as totalamount, + To_char(To_timestamp(receipt.manualreceiptdate / 1000), 'DD/MM/YYYY') AS g8issuedate, + receipt.manualreceiptnumber as g8receiptno + + FROM eg_tl_tradelicense tl + INNER JOIN eg_tl_tradelicensedetail tld ON tld.tradelicenseid = tl.id + INNER JOIN ( + SELECT tradelicensedetailid,array_to_string(array_agg(message.message),', ') as tradeTypeName FROM eg_tl_tradeunit + INNER JOIN message ON split_part(message.code,'_',2) = tradeType AND message.locale = 'en_IN' GROUP BY 1) tlunit ON tlunit.tradelicensedetailid = tld.id + INNER JOIN ( + SELECT tradelicensedetailid, array_to_string(array_agg(name),', ') as name, array_to_string(array_agg(mobilenumber),', ') as mobilenumber + FROM eg_tl_owner tlowner + INNER JOIN eg_user tluser ON tluser.uuid = tlowner.id + group by tradelicensedetailid + ) tlown ON tlown.tradelicensedetailid = tld.id + INNER JOIN egcl_receiptheader_v1 receipt ON receipt.consumercode = tl.applicationnumber and receipt.status = 'Cancelled' + INNER JOIN egcl_receiptinstrument_v1 as ri ON ri.receiptheader = receipt.id + INNER JOIN egcl_instrumentheader_v1 as ih ON ih.id = ri.instrumentheader + LEFT OUTER JOIN (SELECT tradelicensedetailid,array_to_string(array_agg(message.message),',') AS acc FROM eg_tl_accessory + LEFT OUTER JOIN message ON split_part(message.code,'_',2) = accessorycategory AND message.locale = 'en_IN' GROUP BY 1 ) tlacc ON tlacc.tradelicensedetailid = tld.id + WHERE tl.tenantId != 'pb.testing' + +- reportName: TradeLicenseCancelledRegistryReport + summary: TL Cancelled Receipt Register Report + version: 1.0.0 + moduleName: rainmaker-tl + sourceColumns: + - name: receiptnumber + label: report.tl.receiptnumber + type: string + source: tl + total: false + - name: receiptIssueDate + label: report.tl.receiptissuedate + type: string + source: tl + total: false + - name: g8issuedate + label: report.tl.g8issuedate + type: string + source: tl + total: false + - name: g8receiptno + label: report.tl.g8receiptno + type: string + source: tl + total: false + - name: licensenumber + label: report.tl.licensenumber + type: string + source: tl + total: false + - name: formattedIssuedDate + label: report.tl.issueddate + type: string + source: tl + total: false + - name: name + label: report.tl.user.name + type: string + source: tl + total: false + - name: mobilenumber + label: report.tl.user.mobilenumber + type: string + source: tl + total: false + - name: bankid + label: report.tl.bankid + type: string + source: tl + total: false + - name: branchname + label: report.tl.branchname + type: string + source: tl + total: false + - name: transactionumber + label: report.tl.transactionumber + type: string + source: tl + total: false + - name: instrumenttype + label: report.tl.instrumenttype + type: string + source: tl + total: false + - name: status + label: report.tl.status + type: string + source: tl + total: false + - name: tradeTypeName + label: report.tl.tradetype + type: string + source: tl + total: false + - name: acc + label: report.tl.accessorycategories + type: string + source: tl + total: false + - name: tradeName + label: report.tl.tradeName + type: string + source: tl + total: false + - name: totalamount + label: report.tl.receipt.totalamount + type: number + source: tl + total: true + searchParams: + - name: fromDate + label: reports.tl.fromDate + type: epoch + source: tl + isMandatory: false + searchClause: AND receipt.createddate >= $fromDate + - name: toDate + label: reports.tl.toDate + type: epoch + source: tl + isMandatory: false + searchClause: AND receipt.createddate <= $toDate + query: | + SELECT + licensenumber, + to_char(To_timestamp(issueddate / 1000), 'DD/MM/YYYY') as formattedIssuedDate, + tl.tradeName, + initcap(tl.status) as status, + to_char(To_timestamp(receipt.receiptdate / 1000), 'DD/MM/YYYY') as receiptIssueDate , + receipt.receiptnumber, + tradeTypeName, + acc, + name, + mobilenumber, + ih.bankid, + ih.branchname, + ih.transactionnumber, + ih.instrumenttype, + amount as totalamount, + To_char(To_timestamp(receipt.manualreceiptdate / 1000), 'DD/MM/YYYY') AS g8issuedate, + receipt.manualreceiptnumber as g8receiptno + + FROM eg_tl_tradelicense tl + INNER JOIN eg_tl_tradelicensedetail tld ON tld.tradelicenseid = tl.id + INNER JOIN ( + SELECT tradelicensedetailid,array_to_string(array_agg(message.message),', ') as tradeTypeName FROM eg_tl_tradeunit + INNER JOIN message ON split_part(message.code,'_',2) = tradeType AND message.locale = 'en_IN' GROUP BY 1) tlunit ON tlunit.tradelicensedetailid = tld.id + INNER JOIN ( + SELECT tradelicensedetailid, array_to_string(array_agg(name),', ') as name, array_to_string(array_agg(mobilenumber),', ') as mobilenumber + FROM eg_tl_owner tlowner + INNER JOIN eg_user tluser ON tluser.uuid = tlowner.id + group by tradelicensedetailid + ) tlown ON tlown.tradelicensedetailid = tld.id + INNER JOIN egcl_receiptheader_v1 receipt ON receipt.consumercode = tl.applicationnumber and receipt.status = 'Cancelled' + INNER JOIN egcl_receiptinstrument_v1 as ri ON ri.receiptheader = receipt.id + INNER JOIN egcl_instrumentheader_v1 as ih ON ih.id = ri.instrumentheader + LEFT OUTER JOIN (SELECT tradelicensedetailid,array_to_string(array_agg(message.message),',') AS acc FROM eg_tl_accessory + LEFT OUTER JOIN message ON split_part(message.code,'_',2) = accessorycategory AND message.locale = 'en_IN' GROUP BY 1 ) tlacc ON tlacc.tradelicensedetailid = tld.id + WHERE tl.tenantId LIKE $tenantid + + +- reportName: TradeWiseCollectionReport + summary: Collection according to tradeTypes + version: 1.0.0 + moduleName: rainmaker-tl + sourceColumns: + - name: transactionNumber + label: report.tl.totalTransaction + type: string + source: tl + total: false + - name: online + label: report.tl.online.collection + type: number + source: tl + total: true + - name: offline + label: report.tl.offline.collection + type: number + source: tl + total: true + - name: total + label: report.tl.totalCollection + type: number + source: tl + total: true + searchParams: + - name: fromDate + label: reports.tl.fromDate + type: epoch + source: tl + isMandatory: false + searchClause: AND rh.receiptdate >= $fromDate + - name: toDate + label: reports.tl.toDate + type: epoch + source: tl + isMandatory: false + searchClause: AND rh.receiptdate <= $toDate + query: | + select + sum(ih.amount) as total, + count(*) as transactionNumber, + sum(case collectiontype when 'COUNTER' then amount else 0 end) as offline, + sum(case collectiontype when 'ONLINE' then amount else 0 end) as online, + initcap(split_part(rh.tenantId, '.', 2)) as tenantId + from egcl_receiptheader_v1 as rh + inner join egcl_receiptinstrument_v1 as ri on ri.receiptheader = rh.id + inner join egcl_instrumentheader_v1 as ih on ih.id = ri.instrumentheader + where rh.businessdetails = 'TL' and rh.status !='Cancelled' and rh.tenantid !='pb.testing' + AND rh.tenantId LIKE $tenantid + groupby: GROUP BY rh.tenantId + +- reportName: TradeLicenseApplicationStatusReport + summary: Nummber of applications by there status + version: 1.0.0 + moduleName: rainmaker-tl + externalService: + - entity: $.messages[*] + apiURL: http://egov-localization:8080/localization/messages/v1/_search?locale=en_IN&tenantId=pb&module=rainmaker-tl + keyOrder: code,message + tableName: tbl_localization + sourceColumns: + - name: status + label: report.tl.status + type: string + source: tl + total: false + - name: total + label: report.tl.total + type: number + source: tl + total: true + searchParams: + - name: fromDate + label: reports.tl.fromDate + type: epoch + source: tl + isMandatory: false + searchClause: AND tl.lastmodifiedtime >= $fromDate + - name: toDate + label: reports.tl.toDate + type: epoch + source: tl + isMandatory: false + searchClause: AND tl.lastmodifiedtime <= $toDate + query: SELECT COUNT(applicationnumber) as total,message.message as status from eg_tl_tradelicense tl LEFT OUTER JOIN message ON split_part(message.code,'_',2) = status AND message.locale = 'en_IN' WHERE tl.tenantid LIKE $tenantid + groupby: GROUP BY message.message + orderby: ORDER BY case message.message when 'Pending Application' then 1 when 'Pending Payment' then 2 when 'Pending Approval' then 3 when 'Approved' then 4 when 'Rejected' then 5 when 'Cancelled' then 6 else 7 end + +- reportName: TradeLicenseULBWiseApplicationStatusReport + summary: Nummber of applications by there status + version: 1.0.0 + moduleName: rainmaker-tl + sourceColumns: + - name: tenantId + label: report.tl.tenantid + type: string + source: tl + total: false + - name: initiated + label: TL_INITIATED + type: number + source: tl + total: true + - name: applied + label: TL_APPLIED + type: number + source: tl + total: true + - name: paid + label: TL_PAID + type: number + source: tl + total: true + - name: approved + label: TL_APPROVED + type: number + source: tl + total: true + - name: rejected + label: TL_REJECTED + type: number + source: tl + total: true + - name: cancelled + label: TL_CANCELLED + type: number + source: tl + total: true + searchParams: + - name: fromDate + label: reports.tl.fromDate + type: epoch + source: tl + isMandatory: false + searchClause: AND tl.lastmodifiedtime >= $fromDate + - name: toDate + label: reports.tl.toDate + type: epoch + source: tl + isMandatory: false + searchClause: AND tl.lastmodifiedtime <= $toDate + query: | + SELECT + initcap(split_part(tenantId, '.', 2)) as tenantId, + SUM(CASE status when 'REJECTED' then 1 else 0 end) as rejected, + SUM(CASE status when 'INITIATED' then 1 else 0 end) as initiated, + SUM(CASE status when 'PAID' then 1 else 0 end) as paid, + SUM(CASE status when 'APPROVED' then 1 else 0 end) as approved, + SUM(CASE status when 'APPLIED' then 1 else 0 end) as applied, + SUM(CASE status when 'CANCELLED' then 1 else 0 end) as cancelled + FROM eg_tl_tradelicense as tl + WHERE tl.tenantid != 'pb.testing' + groupby: GROUP BY tenantid + orderby: ORDER BY tenantid + + +- reportName: StateLevelStatus + summary: Nummber of applications by there status state level + version: 1.0.0 + moduleName: rainmaker-tl + sourceColumns: + - name: status + label: report.tl.status + type: string + source: tl + total: false + - name: total + label: report.tl.total + type: number + source: tl + total: true + searchParams: + - name: fromDate + label: reports.tl.fromDate + type: epoch + source: tl + isMandatory: false + searchClause: AND tl.lastmodifiedtime >= $fromDate + - name: toDate + label: reports.tl.toDate + type: epoch + source: tl + isMandatory: false + searchClause: AND tl.lastmodifiedtime <= $toDate + - name: ulb + label: ULB + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: tl + wrapper: true + isMandatory: false + searchClause: AND tl.tenantId = $ulb + query: SELECT COUNT(applicationnumber) as total,message.message as status from eg_tl_tradelicense tl LEFT OUTER JOIN (select distinct module,code,locale,tenantid,message from message where module='rainmaker-tl' ) as message ON split_part(message.code,'_',2) = status AND message.locale = 'en_IN' WHERE 1=1 + groupby: GROUP BY message.message + orderby: ORDER BY case message.message when 'Pending Application' then 1 when 'Pending Payment' then 2 when 'Pending Approval' then 3 when 'Approved' then 4 when 'Rejected' then 5 when 'Cancelled' then 6 else 7 end + + + +- reportName: StateLevelTradeWiseCollection + summary: Collection according to tradeTypes state level + version: 1.0.0 + moduleName: rainmaker-tl + sourceColumns: + - name: tenantId + label: report.tl.tenantid + type: string + source: tl + total: false + - name: transactionNumber + label: report.tl.totalTransaction + type: string + source: tl + total: true + - name: online + label: report.tl.online.collection + type: number + source: tl + total: true + - name: offline + label: report.tl.offline.collection + type: number + source: tl + total: true + - name: total + label: report.tl.totalCollection + type: number + source: tl + total: true + searchParams: + - name: fromDate + label: reports.tl.fromDate + type: epoch + source: tl + isMandatory: false + searchClause: AND rh.receiptdate >= $fromDate + - name: toDate + label: reports.tl.toDate + type: epoch + source: tl + isMandatory: false + searchClause: AND rh.receiptdate <= $toDate + - name: ulb + label: ULB + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: tl + wrapper: true + isMandatory: false + searchClause: AND tl.tenantId = $ulb + query: | + select + sum(ih.amount) as total, + count(*) as transactionNumber, + sum(case collectiontype when 'COUNTER' then amount else 0 end) as offline, + sum(case collectiontype when 'ONLINE' then amount else 0 end) as online, + initcap(split_part(rh.tenantId, '.', 2)) as tenantId + from egcl_receiptheader_v1 as rh + inner join egcl_receiptinstrument_v1 as ri on ri.receiptheader = rh.id + inner join egcl_instrumentheader_v1 as ih on ih.id = ri.instrumentheader + where rh.businessdetails = 'TL' and rh.status !='Cancelled' and rh.tenantid !='pb.testing' + groupby: GROUP BY rh.tenantId + orderby: ORDER BY rh.tenantId asc + + +- reportName: StateLevelTradeLicenseRegistryReport + summary: TL Basic Report State Level + version: 1.0.0 + moduleName: rainmaker-tl + sourceColumns: + - name: tenantId + label: report.tl.tenantId + type: string + source: tl + total: false + - name: licensenumber + label: report.tl.licensenumber + type: string + source: tl + total: false + - name: formattedIssuedDate + label: report.tl.issueddate + type: string + source: tl + total: false + - name: g8issuedate + label: report.tl.g8issuedate + type: string + source: tl + total: false + - name: g8receiptno + label: report.tl.g8receiptno + type: string + source: tl + total: false + - name: name + label: report.tl.user.name + type: string + source: tl + total: false + - name: mobilenumber + label: report.tl.user.mobilenumber + type: string + source: tl + total: false + - name: tradeTypeName + label: report.tl.tradetype + type: string + source: tl + total: false + - name: acc + label: report.tl.accessorycategories + type: string + source: tl + total: false + - name: tradeName + label: report.tl.tradeName + type: string + source: tl + total: false + - name: totalamount + label: report.tl.receipt.totalamount + type: number + source: tl + total: true + searchParams: + - name: fromDate + label: reports.tl.fromDate + type: epoch + source: tl + isMandatory: false + searchClause: AND issueddate >= $fromDate + - name: toDate + label: reports.tl.toDate + type: epoch + source: tl + isMandatory: false + searchClause: AND issueddate <= $toDate + - name: ulb + label: ULB + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: tl + wrapper: true + isMandatory: false + searchClause: AND tl.tenantId = $ulb + query: SELECT tl.tenantId as tenantId,licensenumber,to_char(To_timestamp(issueddate / 1000), 'DD/MM/YYYY') as formattedIssuedDate,tl.tradeName,tradeTypeName,acc, name,mobilenumber,amount as totalamount,To_char(To_timestamp(receipt.manualreceiptdate / 1000), 'DD/MM/YYYY') AS g8issuedate,receipt.manualreceiptnumber as g8receiptno FROM eg_tl_tradelicense tl INNER JOIN eg_tl_tradelicensedetail tld ON tld.tradelicenseid = tl.id INNER JOIN eg_tl_owner tlowner ON tlowner.tradelicensedetailid = tld.id INNER JOIN (SELECT tradelicensedetailid,message.message as tradeTypeName FROM eg_tl_tradeunit INNER JOIN message ON split_part(message.code,'_',2) = tradeType) tlunit ON tlunit.tradelicensedetailid = tld.id INNER JOIN eg_user tluser ON tluser.uuid = tlowner.id LEFT OUTER JOIN egcl_receiptheader_v1 receipt ON receipt.consumercode = tl.applicationnumber LEFT JOIN egcl_receiptinstrument_v1 as ri ON ri.receiptheader = receipt.id LEFT JOIN egcl_instrumentheader_v1 as ih ON ih.id = ri.instrumentheader LEFT OUTER JOIN (SELECT tradelicensedetailid,array_to_string(array_agg(message.message),',') AS acc FROM eg_tl_accessory LEFT OUTER JOIN message ON split_part(message.code,'_',2) = accessorycategory AND message.locale = 'en_IN' GROUP BY 1 ) tlacc ON tlacc.tradelicensedetailid = tld.id WHERE tl.Status = 'APPROVED' + orderby: ORDER BY tl.tenantId asc diff --git a/configs/reports/configs/swm-reports.yml b/configs/reports/configs/swm-reports.yml new file mode 100644 index 00000000..48c97dfc --- /dev/null +++ b/configs/reports/configs/swm-reports.yml @@ -0,0 +1,135 @@ +ReportDefinitions: +- reportName: DumpingGroundDetailReport + summary: Dumping Ground Details report + version: 1.0.0 + moduleName: swm + externalService: + - entity: $.MdmsRes.swm.DumpingGround + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=swm&masterName=DumpingGround&tenantId=$tenantid + keyOrder: code,name,tenantId,isProcessingSite + tableName: tbl_swmdumpingground + stateData: true + sourceColumns: + - name: dumpinggroundname + label: reports.swm.dumpingground + type: string + source: mdms + - name: date + label: reports.swm.date + type: string + source: egswm_sourcesegregation + - name: wetwastecollected + label: reports.swm.wetwaste + type: number + source: egswm_collectiondetails + - name: drywastecollected + label: reports.swm.drywaste + type: number + source: egswm_collectiondetails + - name: sortdate + label: reports.swm.date + type: string + source: egswm_sourcesegregation + showColumn: false + + searchParams: + - name: dumpinggroundcode + label: reports.swm.dumpingground + type: singlevaluelist + source: mdms + isMandatory: false + stateData: true + wrapper: true + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=swm&masterName=DumpingGround&tenantId=$tenantid|$.MdmsRes.swm.DumpingGround.*.code|$.MdmsRes.swm.DumpingGround.*.name + searchClause: and ssg.dumpingground = $dumpinggroundcode + - name: wasteprocess + label: reports.swm.wasteprocess + type: singlevaluelist + pattern: 'list://false:Dump,true:Process' + source: wastetypeprocess + isMandatory: false + searchClause: and dg.isProcessingSite = $wasteprocess + - name: wastetype + label: reports.swm.wastetype + type: singlevaluelist + pattern: 'list://Wet:Wet,Dry:Dry' + source: wastetype + isMandatory: false + - name: fromDate + label: reports.swm.datefrom + type: epoch + source: egswm_sourcesegregation + isMandatory: true + - name: toDate + label: reports.swm.dateto + type: epoch + source: egswm_sourcesegregation + isMandatory: true + query: select dg.name as dumpinggroundname, CASE WHEN $wastetype = 'Wet' THEN sum(cd.wetwastecollected) WHEN $wastetype = 'Dry' THEN 0 ELSE sum(cd.wetwastecollected) END as wetwastecollected, CASE WHEN $wastetype = 'Wet' THEN 0 WHEN $wastetype = 'Dry' THEN sum(cd.drywastecollected) ELSE sum(cd.drywastecollected) END as drywastecollected, to_char((to_timestamp(ssg.sourcesegregationdate/1000) AT TIME ZONE 'Asia/Kolkata')::date,'dd/mm/yyyy') as date, (to_timestamp(ssg.sourcesegregationdate/1000) AT TIME ZONE 'Asia/Kolkata')::date as sortdate from egswm_collectiondetails cd, egswm_sourcesegregation ssg, (VALUES tbl_swmdumpingground) as dg (code,name,tenantId,isProcessingSite) where cd.sourcesegregation = ssg.code and cd.tenantid = $tenantid and ssg.tenantid = $tenantid and ssg.dumpingground = dg.code and ssg.sourcesegregationdate >= $fromDate and ssg.sourcesegregationdate <= $toDate + groupBy: group by date, dumpinggroundname, sortdate order by dumpinggroundname, sortdate; + +- reportName: ExpenditureIncurredReport + summary: Expenditure incurred on Transportation report + version: 1.0.0 + moduleName: swm + externalService: + - entity: $.MdmsRes.swm.VehicleType + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=swm&masterName=VehicleType&tenantId=$tenantid + keyOrder: code,name,tenantId + tableName: tbl_swmvehicletype + stateData: true + sourceColumns: + - name: date + label: reports.swm.date + type: string + source: egswm_vehiclemaintenancedetails + - name: vehicletype + label: reports.swm.vehicletype + type: string + source: mdms + - name: registrationnumber + label: reports.swm.registrationnumber + type: string + source: egswm_vehicle + - name: fuellingcost + label: reports.swm.fuellingcost + type: number + source: egswm_vehiclefuellingdetails + - name: maintenancecost + label: reports.swm.maintenancecost + type: number + source: egswm_vehiclemaintenancedetails + - name: salary + label: reports.swm.salary + type: string + source: employee + - name: totalcost + label: reports.swm.totalcost + type: number + source: egswm_vehiclemaintenancedetails + searchParams: + - name: vehicle + label: reports.swm.vehicle + type: singlevaluelistac + source: egswm_vehicle + isMandatory: true + wrapper: true + pattern: http://swm-services:8080/swm-services/vehicles/_search?tenantId=$tenantid|$..regNumber|$..regNumber + - name: typeofvehicle + label: reports.swm.vehicletype + type: string + source: egswm_vehicle + isMandatory: false + wrapper: true + pattern: /swm-services/vehicles/_search?tenantId=$tenantid®Numbers={vehicle}|$..vehicleType.name|$..vehicleType.name + - name: fromDate + label: reports.swm.datefrom + type: epoch + source: egswm_vehiclemaintenancedetails + isMandatory: true + - name: toDate + label: reports.swm.dateto + type: epoch + source: egswm_vehiclemaintenancedetails + isMandatory: true + query: select to_char(result.date,'dd/mm/yyyy') as date,COALESCE(sum(result.fuellingcost),0) as fuellingcost,COALESCE(sum(result.maintenancecost),0) as maintenancecost,COALESCE(sum(result.totalcost),0) as totalcost, result.vehicletype as vehicletype, result.registrationnumber registrationnumber,'' as salary from ((select (to_timestamp(vmd.actualmaintenancedate/1000) AT TIME ZONE 'Asia/Kolkata')::date as date,0 as fuellingcost,COALESCE(sum(vmd.costincurred),0) as maintenancecost,COALESCE(sum(vmd.costincurred),0) as totalcost, vt.name as vehicletype,vehicle.regnumber as registrationnumber from egswm_vehicle vehicle, egswm_vehiclemaintenancedetails vmd, (VALUES tbl_swmvehicletype) as vt (code,name,tenantId) where vehicle.regnumber = $vehicle and vehicle.vehicletype = vt.code and vehicle.regnumber = vmd.vehicle and vehicle.tenantid = $tenantid and vmd.tenantid = $tenantid and vmd.actualmaintenancedate >= $fromDate and vmd.actualmaintenancedate <= $toDate group by date, vt.name, registrationnumber) UNION (select (to_timestamp(vfd.transactiondate/1000) AT TIME ZONE 'Asia/Kolkata')::date as date, COALESCE(sum(vfd.totalcostincurred),0) as fuellingcost, 0 as maintenancecost, COALESCE(sum(vfd.totalcostincurred),0) as totalcost, vt.name as vehicletype,vehicle.regnumber as registrationnumber from egswm_vehicle vehicle, egswm_vehiclefuellingdetails vfd, (VALUES tbl_swmvehicletype) as vt (code,name,tenantId) where vehicle.regnumber = $vehicle and vehicle.vehicletype = vt.code and vehicle.regnumber = vfd.vehicle and vehicle.tenantid = $tenantid and vfd.tenantid = $tenantid and vfd.transactiondate >= $fromDate and vfd.transactiondate <= $toDate group by date, vt.name, registrationnumber)) as result group by result.date, result.registrationnumber, result.vehicletype order by result.registrationnumber, result.date, result.vehicletype; diff --git a/configs/reports/configs/works-reports.yml b/configs/reports/configs/works-reports.yml new file mode 100644 index 00000000..43aa78d0 --- /dev/null +++ b/configs/reports/configs/works-reports.yml @@ -0,0 +1,565 @@ +--- +ReportDefinitions: +- reportName: WorkOrderRegister + summary: Work Order Register + version: 1.0.0 + moduleName: works + viewPath: workOrderRegister + externalService: + - entity: $.MdmsRes.egf-master.FinancialYear + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=egf-master&masterName=FinancialYear&tenantId=$tenantid&filter=%5B%3F%28%40.active%3D%3Dtrue%29%5D + keyOrder: finYearRange,startingDate,endingDate,tenantId + tableName: tbl_financialyear + stateData: true + sourceColumns: + - name: workorderdate + label: reports.works.workorderdate + type: epoch + source: works + - name: nameofwork + label: reports.works.nameofwork + type: string + source: works + - name: workordernumber + label: reports.works.workordernumber + type: number + source: works + - name: referencenoofwip + label: reports.works.referencenoofwip + type: string + source: works + - name: estimateamount + label: reports.works.estimateamount + type: number + source: works + - name: tenderamount + label: reports.works.tenderamount + type: number + source: works + - name: contractorname + label: reports.works.contractorname + type: string + source: works + - name: approvedattherateof + label: reports.works.approvedattherateof + type: number + source: works + - name: totalvalueofthework + label: reports.works.totalvalueofthework + type: number + source: works + - name: emdamount + label: reports.works.emdamount + type: number + source: works + - name: sanctionedfinyear + label: reports.works.sanctionedfinyear + type: string + source: works + - name: securitydepositamount + label: reports.works.securitydepositamount + type: number + source: works + - name: expectedcompletiondate + label: reports.works.expectedcompletiondate + type: epoch + source: works + searchParams: + - name: fromDate + label: reports.works.wofromDate + type: date + source: works + searchClause : AND wo.workorderdate>=$fromDate + isMandatory: false + - name: toDate + label: reports.works.wotoDate + type: date + source: works + searchClause : AND wo.workorderdate<=$toDate + isMandatory: false + - name: contractorName + label: reports.works.contractorname + type: string + source: works + searchClause : AND contractor.name=$contractorName + isMandatory: false + - name: amountFrom + label: reports.works.woamountfrom + type: number + source: works + searchClause : AND loae.estimateloaamount>=$amountFrom + isMandatory: false + - name: amountUpto + label: reports.works.woamountupto + type: number + source: works + searchClause : AND loae.estimateloaamount<=$amountUpto + isMandatory: false + + query: select wo.workorderdate, de.nameofwork, wo.workordernumber, de.projectcode as referencenoofwip, de.estimatevalue as estimateamount, de.workvalue as tenderamount, contractor.name as contractorname, loa.tenderfinalizedpercentage as approvedattherateof, loa.loaamount as totalvalueofthework, loa.emdamountdeposited as emdamount, (select sum(amount) from egw_securitydeposit where letterofacceptance=loa.id) as securitydepositamount, (select finyear.finYearRange from (values tbl_financialyear) as finyear (finYearRange,startingDate,endingDate,tenantId) where wo.createdtime between startingDate::bigint and endingDate::bigint) as sanctionedfinyear, ((select coalesce(statusdate, innerwo.workorderdate) from egw_workorder innerwo left join egw_offlinestatus fs on fs.objecttype='WorkOrderOffline' and fs.status='WORK_COMMENCED' and fs.objectnumber=innerwo.workordernumber where innerwo.workordernumber=wo.workordernumber) + loa.contractperiod*24*12*60*1000) as expectedcompletiondate from egw_workorder wo, egw_letterofacceptance loa, egw_letterofacceptanceestimate loae, egw_detailedestimate de, egw_contractor contractor where wo.letterofacceptance=loa.id and wo.letterofacceptance=loae.letterofacceptance and loae.letterofacceptance=loa.id and loae.detailedestimate=de.estimatenumber and contractor.code=loa.contractor + +- reportName: WorkStatusReport + summary: Work Status Report + version: 1.0.0 + moduleName: works + viewPath: WorkStatusReport + sourceColumns: + - name: nameofwork + label: reports.works.nameofwork + type: epoch + source: works + - name: fund + label: reports.works.fund + type: string + source: works + - name: typeofwork + label: reports.works.typeofwork + type: string + source: works + - name: subtypeofwork + label: reports.works.subtypeofwork + type: string + source: works + - name: estimatevalue + label: reports.works.estimatevalue + type: number + source: works + - name: agencyfirmname + label: reports.works.agencyfirmname + type: string + source: works + - name: workorderamount + label: reports.works.workorderamount + type: number + source: works + - name: billsubmittedtilldate + label: reports.works.billsubmittedtilldate + type: number + source: works + - name: worksstatuspercentage + label: reports.works.worksstatuspercentage + type: number + source: works + - name: amountpaidtilldate + label: reports.works.amountpaidtilldate + type: number + source: works + searchParams: + - name: fund + label: reports.works.fund + isMandatory: false + type: multivaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=egf-master&masterName=Fund&tenantId=$tenantid&filter=%5B%3F%28%40.active%3D%3Dtrue%29%5D + source: works + stateData: true + wrapper: true + searchClause : AND de.fund in ($fund) + - name: typeofwork + label: reports.works.typeofwork + isMandatory: false + type: multivaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=works&masterName=TypeOfWork&tenantId=$tenantid&filter=%5B%3F%28%40.active%3D%3Dtrue%29%5D + source: works + stateData: true + wrapper: true + searchClause : AND de.workstype in ($typeofwork) + - name: subtypeofwork + label: reports.works.subtypeofwork + isMandatory: false + type: multivaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=works&masterName=TypeOfWork&tenantId=$tenantid&filter%3D%5B%3F%28%20%40.parent%3D%3D%7Btypeofwork%7D%29%5D%7C%24.MdmsRes.works.TypeOfWork.%2A.code%7C%24.MdmsRes..works.TypeOfWork.%2A.name + source: works + stateData: true + wrapper: true + searchClause : AND de.workssubtype in ($subtypeofwork) + - name: department + label: reports.works.department + isMandatory: false + type: multivaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=common-masters&masterName=Department&tenantId=$tenantid&filter=%5B%3F%28%40.active%3D%3Dtrue%29%5D + source: works + stateData: true + wrapper: true + searchClause : AND de.department in ($department) + - name: scheme + label: reports.works.scheme + isMandatory: false + type: multivaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=Works&masterName=Scheme&tenantId=$tenantid&filter=%5B%3F%28%40.active%3D%3Dtrue%29%5D + source: works + stateData: true + wrapper: true + searchClause : AND de.scheme in ($scheme) + - name: status + label: reports.works.status + isMandatory: false + type: multivaluelist + pattern: 'list://Documentation stage:Documentation stage,Tendering Stage:Tendering Stage,Work In Progress Stage:Work In Progress Stage,Completed:Completed' + source: works + stateData: true + wrapper: true + searchClause : AND de.status in ('Approved') + + query: select de.nameofwork AS nameofwork, de.fund as fund, de.workstype AS typeofwork, de.workssubtype AS subtypeofwork, de.estimatevalue As estimatevalue, contractor.name as firmname, loa.loaamount AS workorderamount, cb.contractorbillamount as billsubmittedtilldate, tm.totalpercentage AS workstatuspercentage, (select COALESCE(sum(br.billamount),0) from egf_billregister br where br.billnumber=cb.billnumber) as amountpaidtilldate from egw_detailedestimate de, egw_letterofacceptanceestimate loae,egw_contractor contractor, egw_milestone m, egw_trackmilestone tm, egw_letterofacceptance loa, egw_contractorbill cb where loa.id=loae.letterofacceptance and loae.detailedestimate=de.id and contractor.code = loa.contractor and m.letterofacceptanceestimate = loae.id and m.id=tm.milestone and loae.id=cb.letterofacceptanceestimate; + +- reportName: WorkInProgressRegister + summary: Work In Progress Register + version: 1.0.0 + moduleName: works + externalService: + - entity: $.MdmsRes.works.TypeOfWork + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=works&masterName=TypeOfWork&tenantId=$tenantid&filter=%5B%3F%28%40.parent%3D%3Dnull%20%26%26%20%40.active%3D%3D%27true%27%29%5D + keyOrder: name,code,description,tenantId + tableName: tbl_typeofwork + stateData: true + - entity: $.MdmsRes.works.TypeOfWork + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=works&masterName=TypeOfWork&tenantId=$tenantid&filter=%5B%3F%28%40.parent%21%3Dnull%20%26%26%20%40.active%3D%3D%27true%27%29%5D + keyOrder: name,code,description,tenantId + tableName: tbl_subtypeofwork + stateData: true + - entity: $.MdmsRes.works.WorksStatus + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=works&masterName=WorksStatus&tenantId=$tenantid&filter=%5B%3F%28%40.moduleType%3D%3D%27DetailedEstimate%27%29%5D + keyOrder: code,description,tenantId + tableName: tbl_workstatus + stateData: true + sourceColumns: + - name: wincode + label: reports.works.wincode + type: string + source: works + linkedReport: + reportName: WorkInProgressDetails + linkedColumn: _parent?reportName={reportName}&wcode={wincode} + - name: nameofwork + label: reports.works.nameofwork + type: string + source: works + - name: subtypeofwork + label: reports.works.subtypeofwork + type: string + source: works + - name: status + label: reports.works.status + type: string + source: works + searchParams: + - name: typeOfWork + label: reports.works.typeofwork + type: singlevaluelist + source: works + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=works&masterName=TypeOfWork&tenantId=$tenantid&filter=%5B%3F%28%40.parent%3D%3Dnull%20%26%26%20%40.active%3D%3D%27true%27%29%5D|$.MdmsRes.works.TypeOfWork.*.code|$.MdmsRes.works.TypeOfWork.*.name + wrapper: true + stateData: true + searchClause : AND de.workstype=$typeOfWork + isMandatory: false + - name: subTypeOfWork + label: reports.works.subtypeofwork + type: singlevaluelist + source: works + pattern: /egov-mdms-service/v1/_get?moduleName=works&masterName=TypeOfWork&tenantId=$tenantid&filter=%5B%3F(%40.parent%3D%3D%27{typeOfWork}%27%20%26%26%20%40.active%3D%3D%27true%27)%5D|$.MdmsRes.works.TypeOfWork.*.code|$.MdmsRes.works.TypeOfWork.*.name + wrapper: true + stateData: true + searchClause : AND de.workssubtype=$subTypeOfWork + isMandatory: false + - name: nameOfWork + label: reports.works.nameofwork + type: string + source: works + searchClause : AND de.nameofwork=$nameOfWork + isMandatory: false + - name: wincode + label: reports.works.wincode + type: string + source: works + searchClause : AND de.projectcode=$wincode + isMandatory: false + - name: status + label: reports.works.status + type: singlevaluelist + source: works + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=works&masterName=WorksStatus&tenantId=$tenantid&filter=%5B%3F%28%40.moduleType%3D%3D%27DetailedEstimate%27%29%5D|$..code|$..description + wrapper: true + stateData: true + searchClause : AND de.status=$status + isMandatory: false + - name: statusason + label: reports.works.statusason + type: string + source: works + searchClause : AND de.status=$statusason + isMandatory: false + + query: select de.projectcode as wincode, de.nameofwork, tw.name||'/'||stw.name as subtypeofwork, workstatus.description as status from egw_detailedestimate de, (values tbl_workstatus) as workstatus (code,description,tenantId), (values tbl_typeofwork) as tw (name,code,description,tenantId), (values tbl_subtypeofwork) as stw (name,code,description,tenantId) where de.status='CREATED' and workstatus.code=de.status and tw.code=de.workstype and stw.code=de.workssubtype + +- reportName: WorkInProgressDetails + summary: Work In Progress Details + version: 1.0.0 + moduleName: works + externalService: + - entity: $.MdmsRes.egf-master.FinancialYear + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=egf-master&masterName=FinancialYear&tenantId=$tenantid&filter=%5B%3F%28%40.active%3D%3Dtrue%29%5D + keyOrder: finYearRange,startingDate,endingDate,tenantId + tableName: tbl_financialyear + stateData: true + - entity: $.MdmsRes.works.Scheme + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=works&masterName=Scheme&tenantId=$tenantid&filter=%5B%3F%28%40.parent%21%3Dnull%29%5D + keyOrder: name,code + tableName: tbl_scheme + stateData: true + sourceColumns: + - name: nameofwork + label: reports.works.nameofwork + type: string + source: works + - name: distributedforfinyear + label: reports.works.distributedforfinyear + type: string + source: works + - name: accountcode + label: reports.works.accountcode + type: string + source: works + - name: estimatevalue + label: reports.works.estimatevalue + type: number + source: works + - name: location + label: reports.works.location + type: string + source: works + - name: expectedcompletiondate + label: reports.works.expectedcompletiondate + type: epoch + source: works + - name: schemename + label: reports.works.schemename + type: string + source: works + - name: actualcompletiondate + label: reports.works.actualcompletiondate + type: epoch + source: works + - name: resolutionnumberanddate + label: reports.works.resolutionnumberanddate + type: string + source: works + - name: capitalisationdate + label: reports.works.capitalisationdate + type: epoch + source: works + - name: workordernumber + label: reports.works.workordernumber + type: number + source: works + - name: wincode + label: reports.works.wincode + type: number + source: works + - name: approvedbudget + label: reports.works.approvedbudget + type: string + source: works + - name: assetidentificationnumber + label: reports.works.assetidentificationnumber + type: string + source: works + - name: securitydepositamount + label: reports.works.securitydepositamount + type: string + source: works + - name: totalexpensesincurredsofar + label: reports.works.totalexpensesincurredsofar + type: string + source: works + - name: paymentdate + label: reports.works.paymentdate + type: epoch + source: works + - name: amount + label: reports.works.amount + type: number + source: works + - name: deductionamount + label: reports.works.deductionamount + type: number + source: works + - name: netpayable + label: reports.works.netpayable + type: number + source: works + - name: vouchernumber + label: reports.works.vouchernumber + type: string + source: works + - name: securitydepositrefunddate + label: reports.works.securitydepositrefunddate + type: epoch + source: works + - name: securitydepositrefundamount + label: reports.works.securitydepositrefundamount + type: number + source: works + - name: outstandingsecuritydepositamount + label: reports.works.outstandingsecuritydepositamount + type: number + source: works + - name: remarks + label: reports.works.remarks + type: string + source: works + - name: headofdepartment + label: reports.works.headofdepartment + type: string + source: works + searchParams: + - name: wcode + label: reports.works.wincode + type: string + source: works + searchClause : AND de.projectcode=$wcode + isMandatory: false + + query: select de.nameofwork, (select finyear.finYearRange from (values tbl_financialyear) as finyear (finYearRange,startingDate,endingDate,tenantId) where de.estimatedate between startingDate::bigint and endingDate::bigint) as distributedforfinyear, de.budgetgroup as accountcode, de.estimatevalue, de.location, ((select coalesce(statusdate, innerwo.workorderdate) from egw_workorder innerwo left join egw_offlinestatus fs on fs.objecttype='WorkOrderOffline' and fs.status='WORK_COMMENCED' and fs.objectnumber=innerwo.workordernumber where innerwo.workordernumber=wo.workordernumber) + loa.contractperiod*24*12*60*1000) as expectedcompletiondate, (select scheme.name from (values tbl_scheme) as scheme (name, code) where scheme.code=de.scheme) as schemename, (select cb.workcompletiondate from egw_contractorbill cb, egf_billregister bg where bg.billnumber=cb.billnumber and bg.billtype='contractorbill' and bg.billsubtype='Final' and cb.letterofacceptanceestimate=loae.id) as actualcompletiondate, de.councilresolutionnumber||'/'||de.councilresolutiondate as resolutionnumberanddate, (select bg.billdate from egw_contractorbill cb, egf_billregister bg where bg.billnumber=cb.billnumber and bg.billtype='contractorbill' and bg.billsubtype='Final' and cb.letterofacceptanceestimate=loae.id) as capitalisationdate, wo.workordernumber, de.projectcode as wincode, de.estimatevalue as approvedbudget, '' as assetidentificationnumber, (select sum(amount) from egw_securitydeposit where letterofacceptance=loa.id) as securitydepositamount, (select sum(bg.billamount) from egw_contractorbill cb, egf_billregister bg where bg.billnumber=cb.billnumber and bg.billtype='contractorbill' and cb.deleted=false and cb.letterofacceptanceestimate=loae.id) as totalexpensesincurredsofar, br.billdate as paymentdate, br.billamount as amount, br.billnumber as vouchernumber from egw_detailedestimate de left join egw_letterofacceptanceestimate loae on loae.detailedestimate=de.estimatenumber left join egw_letterofacceptance loa on loae.letterofacceptance=loa.id left join egw_workorder wo on wo.letterofacceptance=loa.id left join egw_contractorbill cb on cb.letterofacceptanceestimate=loae.id left join egf_billregister br on cb.billnumber=br.billnumber and br.billtype='contractorbill'where wo.letterofacceptance=loa.id and loae.letterofacceptance= wo.letterofacceptance and loae.letterofacceptance=loa.id and loae.detailedestimate=de.estimatenumber + +- reportName: ProjectStatusReport + summary: Project Status Report + version: 1.0.0 + moduleName: works + externalService: + - entity: $.MdmsRes.tenant.tenants[*].city + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_search + keyOrder: name,districtName, regionName + tableName: tbl_tenant + postObject: $RequestInfo,"MdmsCriteria":{"tenantId":"default","moduleDetails":[{"moduleName":"tenant","masterDetails":[{"name":"tenants","filter":"[?(@.code=='$tenantid')]"}]}]} + stateData: true + - entity: $.MdmsRes.works.Scheme + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=works&masterName=Scheme&tenantId=$tenantid&filter=%5B%3F%28%40.parent%21%3Dnull%29%5D + keyOrder: name,code + tableName: tbl_scheme + stateData: true + - entity: $.MdmsRes.works.TypeOfWork + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=works&masterName=TypeOfWork&tenantId=$tenantid&filter=%5B%3F%28%40.parent%3D%3Dnull%20%26%26%20%40.active%3D%3D%27true%27%29%5D + keyOrder: name,code,description,tenantId + tableName: tbl_typeofwork + stateData: true + - entity: $.MdmsRes.works.TypeOfWork + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=works&masterName=TypeOfWork&tenantId=$tenantid&filter=%5B%3F%28%40.parent%21%3Dnull%20%26%26%20%40.active%3D%3D%27true%27%29%5D + keyOrder: name,code,description,tenantId + tableName: tbl_subtypeofwork + stateData: true + sourceColumns: + - name: divisionname + label: reports.works.division + type: string + source: works + - name: districtname + label: reports.works.district + type: string + source: works + - name: ulbname + label: reports.works.ulbname + type: string + source: works + - name: typeofwork + label: reports.works.typeofwork + type: string + source: works + - name: subtypeofwork + label: reports.works.subtypeofwork + type: string + source: works + - name: schemename + label: reports.works.schemename + type: string + source: works + - name: estimatenumber + label: reports.works.estimatenumber + type: string + source: works + - name: nameofwork + label: reports.works.nameofwork + type: string + source: works + - name: estimateamount + label: reports.works.estimateamount + type: number + source: works + - name: sanctionedamount + label: reports.works.sanctionedamount + type: number + source: works + - name: workstatus + label: reports.works.status + type: string + source: works + - name: billsreceivedtill + label: reports.works.billsreceivedtill + type: string + source: works + - name: paymentdonetill + label: reports.works.paymentdonetill + type: number + source: works + searchParams: + - name: division + label: reports.works.division + type: singlevaluelist + source: works + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=tenant&masterName=tenants&tenantId=$tenantid|$.MdmsRes.tenant.tenants.*.city.regionName|$.MdmsRes.tenant.tenants.*.city.regionName + wrapper: true + stateData: true + searchClause : AND de.workstype=$typeOfWork + isMandatory: false + - name: district + label: reports.works.district + type: singlevaluelist + isMandatory: false + type: string + source: works + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=tenant&masterName=tenants&tenantId=$tenantid|$.MdmsRes.tenant.tenants.*.city.districtName|$.MdmsRes.tenant.tenants.*.city.districtName + wrapper: true + stateData: true + searchClause : AND de.workstype in ($typeofwork) + - name: ulb + label: reports.works.ulbname + isMandatory: false + type: multivaluelist + source: works + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=tenant&masterName=tenants&tenantId=$tenantid|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + wrapper: true + stateData: true + searchClause : AND de.workssubtype in ($subtypeofwork) + - name: status + label: reports.works.status + type: singlevaluelist + source: works + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=works&masterName=WorksStatus&tenantId=$tenantid&filter=%5B%3F%28%40.moduleType%3D%3D%27DetailedEstimate%27%29%5D|$..code|$..description + wrapper: true + stateData: true + searchClause : AND de.status=$status + isMandatory: false + - name: statusason + label: reports.works.statusason + type: string + source: works + searchClause : AND de.status=$statusason + isMandatory: false + - name: typeOfWork + label: reports.works.typeofwork + type: singlevaluelist + source: works + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=works&masterName=TypeOfWork&tenantId=$tenantid&filter=%5B%3F%28%40.parent%3D%3Dnull%20%26%26%20%40.active%3D%3D%27true%27%29%5D|$..code|$..name + wrapper: true + stateData: true + searchClause : AND de.workstype=$typeOfWork + isMandatory: false + - name: subTypeOfWork + label: reports.works.subtypeofwork + type: singlevaluelist + source: works + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=works&masterName=TypeOfWork&tenantId=$tenantid&filter=%5B%3F%28%40.parent%3D%3D%7BtypeOfWork%7D%20%26%26%20%40.active%3D%3D%27true%27%29%5D|$..code|$..name + wrapper: true + stateData: true + searchClause : AND de.workssubtype=$subTypeOfWork + isMandatory: false + query: select (select city.name from (values tbl_tenant) as city (name, districtName, regionName)) as divisionname, (select city.districtName from (values tbl_tenant) as city (name, districtName, regionName)) as districtname, (select name from (values tbl_tenant) as city (name, districtName, regionName)) as ulbname, (select tw.name from (values tbl_typeofwork) as tw (name,code,description,tenantId) where tw.code=de.workstype) as typeofwork, (select stw.name from (values tbl_subtypeofwork) as stw (name,code,description,tenantId) where stw.code=de.workssubtype) as subtypeofwork, (select scheme.name from (values tbl_scheme) as scheme (name, code) where scheme.code=de.scheme) as schemename, de.estimatenumber, de.nameofwork, de.estimatevalue as estimateamount, loa.loaamount as sanctionedamount, (select sum(bg.billamount) from egw_contractorbill cb, egf_billregister bg where bg.billnumber=cb.billnumber and bg.billtype='contractorbill' and cb.deleted=false and cb.letterofacceptanceestimate=loae.id) as billsreceivedtill from egw_letterofacceptance loa, egw_detailedestimate de, egw_letterofacceptanceestimate loae left join egw_contractorbill cb on cb.letterofacceptanceestimate=loae.id left join egf_billregister br on cb.billnumber=br.billnumber and br.billtype='contractorbill' where loae.letterofacceptance=loa.id and loae.detailedestimate=de.estimatenumber From d830e2179ec80204fc2f5a28fc9c950c64fa8838 Mon Sep 17 00:00:00 2001 From: narendrabandhamneni-wt-egov Date: Thu, 30 Apr 2020 17:03:11 +0530 Subject: [PATCH 0005/1242] Added pdf service --- .../data-config/bpa-revocation.json | 237 +++ .../data-config/buildingpermit-low.json | 623 +++++++ .../data-config/buildingpermit.json | 642 +++++++ .../data-config/consolidated-pdf1.json | 124 ++ .../data-config/consolidated-pdf2.json | 124 ++ .../data-config/consolidatedbill.json | 702 ++++++++ .../data-config/consolidatedreceipt.json | 476 ++++++ .../data-config/firenoc-receipt.json | 245 +++ .../pdf-service/data-config/misc-receipt.json | 511 ++++++ .../data-config/passvehicle-certificate.json | 555 ++++++ .../data-config/property-bill.json | 888 ++++++++++ .../data-config/property-receipt.json | 442 +++++ .../pdf-service/data-config/pt-receipt.json | 273 +++ .../data-config/ptmutationcertificate.json | 380 +++++ .../data-config/testconsolidatedreceipt.json | 476 ++++++ .../testlocalconsolidatedbill.json | 535 ++++++ .../testlocalconsolidatedreceipt.json | 457 +++++ .../pdf-service/data-config/tl-receipt.json | 236 +++ .../data-config/tlapplication.json | 1063 ++++++++++++ .../data-config/tlcertificate.json | 443 +++++ .../data-config/tlrenewalcertificate.json | 443 +++++ .../data-config/tradelicense-bill.json | 644 +++++++ .../data-config/tradelicense-receipt.json | 441 +++++ .../data-config/ws-applicationsewerage.json | 1019 +++++++++++ .../data-config/ws-applicationwater.json | 1098 ++++++++++++ configs/pdf-service/data-config/ws-bill.json | 691 ++++++++ .../ws-consolidatedacknowlegment.json | 684 ++++++++ .../ws-consolidatedsewerageconnection.json | 571 +++++++ .../data-config/ws-estimationnotice.json | 508 ++++++ .../data-config/ws-onetime-receipt.json | 476 ++++++ .../data-config/ws-sanctionletter-old.json | 672 ++++++++ .../data-config/ws-sanctionletter.json | 917 ++++++++++ .../format-config/bpa-revocation.json | 171 ++ .../format-config/buildingpermit-low.json | 328 ++++ .../format-config/buildingpermit.json | 341 ++++ .../format-config/consolidated-pdf1.json | 561 ++++++ .../format-config/consolidated-pdf2.json | 1030 ++++++++++++ .../format-config/consolidatedbill.json | 1014 +++++++++++ .../format-config/consolidatedreceipt.json | 572 +++++++ .../format-config/firenoc-receipt.json | 440 +++++ .../format-config/misc-receipt.json | 592 +++++++ .../passvehicle-certificate.json | 500 ++++++ .../format-config/property-bill.json | 1212 +++++++++++++ .../format-config/property-receipt.json | 570 +++++++ .../pdf-service/format-config/pt-receipt.json | 808 +++++++++ .../format-config/ptmutationcertificate.json | 518 ++++++ .../testconsolidatedreceipt.json | 573 +++++++ .../testlocalconsolidatedbill.json | 999 +++++++++++ .../testlocalconsolidatedreceipt.json | 579 +++++++ .../pdf-service/format-config/tl-receipt.json | 902 ++++++++++ .../format-config/tlapplication.json | 1370 +++++++++++++++ .../format-config/tlcertificate.json | 549 ++++++ .../format-config/tlrenewalcertificate.json | 549 ++++++ .../format-config/tradelicense-bill.json | 955 +++++++++++ .../format-config/tradelicense-receipt.json | 570 +++++++ .../format-config/ws-applicationsewerage.json | 1413 ++++++++++++++++ .../format-config/ws-applicationwater.json | 1497 +++++++++++++++++ .../pdf-service/format-config/ws-bill.json | 1012 +++++++++++ .../ws-consolidatedacknowlegment.json | 984 +++++++++++ .../ws-consolidatedsewerageconnection.json | 806 +++++++++ .../format-config/ws-estimationnotice.json | 667 ++++++++ .../format-config/ws-onetime-receipt.json | 572 +++++++ .../format-config/ws-sanctionletter-old.json | 1034 ++++++++++++ .../format-config/ws-sanctionletter.json | 636 +++++++ 64 files changed, 41920 insertions(+) create mode 100644 configs/pdf-service/data-config/bpa-revocation.json create mode 100644 configs/pdf-service/data-config/buildingpermit-low.json create mode 100644 configs/pdf-service/data-config/buildingpermit.json create mode 100644 configs/pdf-service/data-config/consolidated-pdf1.json create mode 100644 configs/pdf-service/data-config/consolidated-pdf2.json create mode 100644 configs/pdf-service/data-config/consolidatedbill.json create mode 100644 configs/pdf-service/data-config/consolidatedreceipt.json create mode 100644 configs/pdf-service/data-config/firenoc-receipt.json create mode 100644 configs/pdf-service/data-config/misc-receipt.json create mode 100644 configs/pdf-service/data-config/passvehicle-certificate.json create mode 100644 configs/pdf-service/data-config/property-bill.json create mode 100644 configs/pdf-service/data-config/property-receipt.json create mode 100644 configs/pdf-service/data-config/pt-receipt.json create mode 100644 configs/pdf-service/data-config/ptmutationcertificate.json create mode 100644 configs/pdf-service/data-config/testconsolidatedreceipt.json create mode 100644 configs/pdf-service/data-config/testlocalconsolidatedbill.json create mode 100644 configs/pdf-service/data-config/testlocalconsolidatedreceipt.json create mode 100644 configs/pdf-service/data-config/tl-receipt.json create mode 100644 configs/pdf-service/data-config/tlapplication.json create mode 100644 configs/pdf-service/data-config/tlcertificate.json create mode 100644 configs/pdf-service/data-config/tlrenewalcertificate.json create mode 100644 configs/pdf-service/data-config/tradelicense-bill.json create mode 100644 configs/pdf-service/data-config/tradelicense-receipt.json create mode 100644 configs/pdf-service/data-config/ws-applicationsewerage.json create mode 100644 configs/pdf-service/data-config/ws-applicationwater.json create mode 100644 configs/pdf-service/data-config/ws-bill.json create mode 100644 configs/pdf-service/data-config/ws-consolidatedacknowlegment.json create mode 100644 configs/pdf-service/data-config/ws-consolidatedsewerageconnection.json create mode 100644 configs/pdf-service/data-config/ws-estimationnotice.json create mode 100644 configs/pdf-service/data-config/ws-onetime-receipt.json create mode 100644 configs/pdf-service/data-config/ws-sanctionletter-old.json create mode 100644 configs/pdf-service/data-config/ws-sanctionletter.json create mode 100644 configs/pdf-service/format-config/bpa-revocation.json create mode 100644 configs/pdf-service/format-config/buildingpermit-low.json create mode 100644 configs/pdf-service/format-config/buildingpermit.json create mode 100644 configs/pdf-service/format-config/consolidated-pdf1.json create mode 100644 configs/pdf-service/format-config/consolidated-pdf2.json create mode 100644 configs/pdf-service/format-config/consolidatedbill.json create mode 100644 configs/pdf-service/format-config/consolidatedreceipt.json create mode 100644 configs/pdf-service/format-config/firenoc-receipt.json create mode 100644 configs/pdf-service/format-config/misc-receipt.json create mode 100644 configs/pdf-service/format-config/passvehicle-certificate.json create mode 100644 configs/pdf-service/format-config/property-bill.json create mode 100644 configs/pdf-service/format-config/property-receipt.json create mode 100644 configs/pdf-service/format-config/pt-receipt.json create mode 100644 configs/pdf-service/format-config/ptmutationcertificate.json create mode 100644 configs/pdf-service/format-config/testconsolidatedreceipt.json create mode 100644 configs/pdf-service/format-config/testlocalconsolidatedbill.json create mode 100644 configs/pdf-service/format-config/testlocalconsolidatedreceipt.json create mode 100644 configs/pdf-service/format-config/tl-receipt.json create mode 100644 configs/pdf-service/format-config/tlapplication.json create mode 100644 configs/pdf-service/format-config/tlcertificate.json create mode 100644 configs/pdf-service/format-config/tlrenewalcertificate.json create mode 100644 configs/pdf-service/format-config/tradelicense-bill.json create mode 100644 configs/pdf-service/format-config/tradelicense-receipt.json create mode 100644 configs/pdf-service/format-config/ws-applicationsewerage.json create mode 100644 configs/pdf-service/format-config/ws-applicationwater.json create mode 100644 configs/pdf-service/format-config/ws-bill.json create mode 100644 configs/pdf-service/format-config/ws-consolidatedacknowlegment.json create mode 100644 configs/pdf-service/format-config/ws-consolidatedsewerageconnection.json create mode 100644 configs/pdf-service/format-config/ws-estimationnotice.json create mode 100644 configs/pdf-service/format-config/ws-onetime-receipt.json create mode 100644 configs/pdf-service/format-config/ws-sanctionletter-old.json create mode 100644 configs/pdf-service/format-config/ws-sanctionletter.json diff --git a/configs/pdf-service/data-config/bpa-revocation.json b/configs/pdf-service/data-config/bpa-revocation.json new file mode 100644 index 00000000..edab8053 --- /dev/null +++ b/configs/pdf-service/data-config/bpa-revocation.json @@ -0,0 +1,237 @@ +{ + "key": "bpa-revocation", + "DataConfigs": { + "serviceName": "rainmaker-bpa", + "version": "1.0.0", + "baseKeyPath": "$.Bpa.*", + "entityIdPath": "$.applicationNo", + "isCommonTableBorderRequired": true, + "mappings": [ + { + "mappings": [ + { + "direct": [ + { + "variable": "logoImage", + "url": "https://raw.githubusercontent.com/egovernments/egov-web-app/master/web/rainmaker/dev-packages/egov-ui-kit-dev/src/assets/images/pblogo.png", + "type": "image" + }, + { + "variable": "applicationNo", + "value": { + "path": "$.applicationNo" + } + }, + { + "variable": "planPermissionNo", + "value": { + "path": "$.permitOrderNo" + } + }, + { + "variable": "tenantName", + "value": { + "path": "$.tenantId" + }, + "localisation": { + "required": true, + "prefix": "TENANT_TENANTS", + "module": "rainmaker-common" + } + }, + { + "variable": "createdDate", + "value": { + "path": "$.auditDetails.createdTime" + }, + "type": "date" + }, + { + "variable": "ownerName", + "value": { + "path": "$.owners.*.name" + } + }, + { + "variable": "Muncipal_Council", + "value": { + "path": "BPA_PDF_MUNCIPAL" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "Revocation_Title", + "value": { + "path": "BPA_PDF_BPA_REVOCATION_TITLE" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "Dated", + "value": { + "path": "BPA_PDF_DATED" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "SALUTATION", + "value": { + "path": "BPA_PDF_SALUTATION" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "Permision_Issued", + "value": { + "path": "BPA_PDF_PERMISSION_ISSUED" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "WRT_APPNO", + "value": { + "path": "BPA_PDF_WRT_APPNO" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "dated", + "value": { + "path": "BPA_PDF_DATED_SMALL" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "isRevocated", + "value": { + "path": "BPA_PDF_IS_REVOCATED" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "revocationReasonIs", + "value": { + "path": "BPA_PDF_REASON_REVOCATION_TXT" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "noAuthText", + "value": { + "path": "BPA_PDF_NOT_AUTH_TXT" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "contactULB", + "value": { + "path": "BPA_PDF_CONTACT_ULB" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "BY_ORDER", + "value": { + "path": "BPA_PDF_BY_ORDER" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "AUTH_OFFICER", + "value": { + "path": "BPA_PDF_AUTH_OFFICER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + } + ] + }, + { + "externalAPI": [ + { + "path": "http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search", + "queryParam": "tenantId=$.tenantId,businessIds=$.applicationNo,history=true", + "apiRequest": null, + "responseMapping": [ + { + "variable": "revocatedBy", + "value": "$.ProcessInstances[?(@.action=='REVOCATE')].assigner.name", + "isUpperCaseRequired": true + }, + { + "variable": "revocationReason", + "value": "$.ProcessInstances[?(@.action=='REVOCATE')].comment" + } + ] + } + ] + } + ] + } + ] + } +} diff --git a/configs/pdf-service/data-config/buildingpermit-low.json b/configs/pdf-service/data-config/buildingpermit-low.json new file mode 100644 index 00000000..c3e298cb --- /dev/null +++ b/configs/pdf-service/data-config/buildingpermit-low.json @@ -0,0 +1,623 @@ +{ + "key": "buildingpermit-low", + "DataConfigs": { + "serviceName": "rainmaker-bpa", + "version": "1.0.0", + "baseKeyPath": "$.Bpa.*", + "entityIdPath": "$.applicationNo", + "isCommonTableBorderRequired": true, + "mappings": [ + { + "mappings": [ + { + "direct": [ + { + "variable": "logoImage", + "url": "https://raw.githubusercontent.com/egovernments/egov-web-app/master/web/rainmaker/dev-packages/egov-ui-kit-dev/src/assets/images/pblogo.png", + "type": "image" + }, + { + "variable": "applicationNo", + "value": { + "path": "$.applicationNo" + } + }, + { + "variable": "planPermissionNo", + "value": { + "path": "$.permitOrderNo" + } + }, + { + "variable": "edcrNo", + "value": { + "path": "$.edcrNumber" + } + }, + { + "variable": "createdDate", + "value": { + "path": "$.auditDetails.createdTime" + }, + "type": "date" + }, + { + "variable": "favourOf", + "value": { + "path": "$.owners.*.name" + } + }, + { + "variable": "holdingNo", + "value": { + "path": "$.holdingNo" + } + }, + { + "variable": "validityDate", + "value": { + "path": "$.validityDate" + }, + "type": "date" + }, + { + "variable": "conditions", + "value": { + "path": "$.additionalDetails" + }, + "type": "array-column", + "format": { + "scema": [ + { + "key": "pendingapproval", + "type" : "array-orderedlist" + } + ] + } + }, + { + "variable": "reServeyPlotNo", + "value": { + "path": "$.additionalDetails.reSurveyPlotNo" + } + }, + { + "variable": "townPlanningScheme", + "value": { + "path": "$.additionalDetails.townPlanningScheme" + } + }, + { + "variable": "proposedLandUse", + "value": { + "path": "$.additionalDetails.proposedLandUse" + } + }, + { + "variable": "WRT_TXT", + "value": { + "path": "BOA_PDF_WRT_TXT" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "tenantName", + "value": { + "path": "$.tenantId" + }, + "localisation": { + "required": true, + "prefix": "TENANT_TENANTS", + "module": "rainmaker-common" + } + }, + { + "variable": "GENERATED_ON", + "value": { + "path": "BPA_PDF_GENERATED_ON" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "orderGeneratedOn", + "value": { + "path": "$.orderGeneratedDate" + }, + "type": "date" + }, + { + "variable": "Muncipal_Council", + "value": { + "path": "BPA_PDF_MUNCIPAL" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "BPA_FORM", + "value": { + "path": "BPA_PDF_FORM" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "BPA_FORM_APPROVAL", + "value": { + "path": "BPA_PDF_FORM_APPROVAL_TXT" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "BPA_BYELAWS", + "value": { + "path": "BPA_PDF_BYELAWS" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "PLAN_PERMISION_NO", + "value": { + "path": "BPA_PDF_PLANPERMISSION_NO" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "Dated", + "value": { + "path": "BPA_PDF_DATED" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "dated", + "value": { + "path": "BPA_PDF_DATED_SMALL" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "PERMISSION_GRANT_TXT", + "value": { + "path": "BPA_PDF_PERMISSION_GRANT_TXT" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "SALUTATION", + "value": { + "path": "BPA_PDF_SALUTATION" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "FOR", + "value": { + "path": "BPA_PDF_FOR" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "DSCR1", + "value": { + "path": "BPA_PDF_DSCR" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "PLOT_NO", + "value": { + "path": "BPA_PDF_PLOTNO_TXT" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "CS_PLOT", + "value": { + "path": "BPA_PDF_CS_PLOT" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "MSP_PLOT", + "value": { + "path": "BPA_PDF_MSP_PLOT" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "KHATA_NO", + "value": { + "path": "BPA_PDF_KHATANO_TXT" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "HOLDING_NO", + "value": { + "path": "BPA_PDF_HOLDINGNO_TXT" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "SERVEY_NO", + "value": { + "path": "BPA_PDF_SERVEYNO_TXT" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "TOWNPLANNING_TXT", + "value": { + "path": "BPA_PDF_TOWN_PLANNING_TXT" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "PROPOSE_LAND", + "value": { + "path": "BPA_PDF_PROPOSE_LAND" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "OF", + "value": { + "path": "BPA_PDF_OF" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "CONDNS_TXT", + "value": { + "path": "BPA_PDF_CONDNS_TXT" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "PERMIT_DETAILS_TXT", + "value": { + "path": "BPA_PDF_PERMITFEE_DETAILS_TXT" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "FEE_DSCR", + "value": { + "path": "BPA_PDF_FEE_DSCR" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "AMOUNT", + "value": { + "path": "BPA_PDF_AMOUNT_TXT" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "TOTAL", + "value": { + "path": "BPA_PDF_TOTAL" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "BY_ORDER", + "value": { + "path": "BPA_PDF_BY_ORDER" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "AUTH_OFFICER", + "value": { + "path": "BPA_PDF_COMMISSIONER" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "VALIDITY_DSCR", + "value": { + "path": "BPA_PDF_VALIDITY_DSCR" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "ONLY", + "value": { + "path": "BPA_PDF_ONLY" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "NOTE", + "value": { + "path": "BPA_PDF_NOTE" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "SUMMARY1", + "value": { + "path": "BPA_PDF_SUMMARY1" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "SUMMARY2", + "value": { + "path": "BPA_PDF_SUMMARY2" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "AUTH_DSCR", + "value": { + "path": "BPA_PDF_AUTH_DSCR" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "Bihar_Tenant", + "value": { + "path": "BIHAR_TENANT" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "applicantName", + "value": { + "path": "$.edcrDetail[0].planDetail.planInformation.applicantName" + } + }, + { + "variable": "applicationDate", + "value": { + "path": "$.edcrDetail[0].planDetail.applicationDate" + }, + "type": "date" + }, + { + "variable": "plotNo", + "value": { + "path": "$.edcrDetail[0].planDetail.planInformation.plotNo" + } + }, + { + "variable": "khataNo", + "value": { + "path": "$.edcrDetail[0].planDetail.planInformation.khataNo" + } + } + ] + }, + { + "externalAPI": [ + { + "path": "http://collection-services:8080/collection-services/payments/_search", + "queryParam": "tenantId=$.tenantId,consumerCodes=$.applicationNo", + "apiRequest": null, + "responseMapping": [ + { + "variable": "paymentDetails", + "value": "$.Payments[0].paymentDetails[0].bill.billDetails[0].billAccountDetails.*", + "type" : "array", + "format":{ + "type":"string", + "scema":[ + { + "variable": "headCode", + "value":"taxHeadCode", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "amnt", + "value":"amount" + } + ] + } + }, + { + "variable" : "totalDue", + "value" : "$.Payments[0].paymentDetails[0].bill.billDetails[0].amount" + } + ] + } + ] + }, + { + "qrcodeConfig": [ + { + "variable": "qrCode", + "value": "Applicant Name: {{favourOf}}, Permit Order Number : {{planPermissionNo}}, Permit Order Date : {{orderGeneratedOn}}, eDCR Scrutiny Number: {{edcrNo}}" + } + ] + } + ] + } + ] + } +} diff --git a/configs/pdf-service/data-config/buildingpermit.json b/configs/pdf-service/data-config/buildingpermit.json new file mode 100644 index 00000000..ddbb4eaa --- /dev/null +++ b/configs/pdf-service/data-config/buildingpermit.json @@ -0,0 +1,642 @@ +{ + "key": "buildingpermit", + "DataConfigs": { + "serviceName": "rainmaker-bpa", + "version": "1.0.0", + "baseKeyPath": "$.Bpa.*", + "entityIdPath": "$.applicationNo", + "isCommonTableBorderRequired": true, + "mappings": [ + { + "mappings": [ + { + "direct": [ + { + "variable": "logoImage", + "url": "https://raw.githubusercontent.com/egovernments/egov-web-app/master/web/rainmaker/dev-packages/egov-ui-kit-dev/src/assets/images/pblogo.png", + "type": "image" + }, + { + "variable": "applicationNo", + "value": { + "path": "$.applicationNo" + } + }, + { + "variable": "planPermissionNo", + "value": { + "path": "$.permitOrderNo" + } + }, + { + "variable": "edcrNo", + "value": { + "path": "$.edcrNumber" + } + }, + { + "variable": "createdDate", + "value": { + "path": "$.auditDetails.createdTime" + }, + "type": "date" + }, + { + "variable": "favourOf", + "value": { + "path": "$.owners.*.name" + } + }, + { + "variable": "holdingNo", + "value": { + "path": "$.holdingNo" + } + }, + { + "variable": "validityDate", + "value": { + "path": "$.validityDate" + }, + "type": "date" + }, + { + "variable": "conditions", + "value": { + "path": "$.additionalDetails" + }, + "type": "array-column", + "format": { + "scema": [ + { + "key": "pendingapproval", + "type" : "array-orderedlist" + } + ] + } + }, + { + "variable": "reServeyPlotNo", + "value": { + "path": "$.additionalDetails.reSurveyPlotNo" + } + }, + { + "variable": "townPlanningScheme", + "value": { + "path": "$.additionalDetails.townPlanningScheme" + } + }, + { + "variable": "proposedLandUse", + "value": { + "path": "$.additionalDetails.proposedLandUse" + } + }, + { + "variable": "WRT_TXT", + "value": { + "path": "BOA_PDF_WRT_TXT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "tenantName", + "value": { + "path": "$.tenantId" + }, + "localisation": { + "required": true, + "prefix": "TENANT_TENANTS", + "module": "rainmaker-common" + } + }, + { + "variable": "GENERATED_ON", + "value": { + "path": "BPA_PDF_GENERATED_ON" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "orderGeneratedOn", + "value": { + "path": "$.orderGeneratedDate" + }, + "type": "date" + }, + { + "variable": "Muncipal_Council", + "value": { + "path": "BPA_PDF_MUNCIPAL" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "BPA_FORM", + "value": { + "path": "BPA_PDF_FORM" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "BPA_FORM_APPROVAL", + "value": { + "path": "BPA_PDF_FORM_APPROVAL_TXT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "BPA_BYELAWS", + "value": { + "path": "BPA_PDF_BYELAWS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "PLAN_PERMISION_NO", + "value": { + "path": "BPA_PDF_PLANPERMISSION_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "Dated", + "value": { + "path": "BPA_PDF_DATED" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "dated", + "value": { + "path": "BPA_PDF_DATED_SMALL" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "PERMISSION_GRANT_TXT", + "value": { + "path": "BPA_PDF_PERMISSION_GRANT_TXT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "SALUTATION", + "value": { + "path": "BPA_PDF_SALUTATION" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "FOR", + "value": { + "path": "BPA_PDF_FOR" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "DSCR1", + "value": { + "path": "BPA_PDF_DSCR" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "PLOT_NO", + "value": { + "path": "BPA_PDF_PLOTNO_TXT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "CS_PLOT", + "value": { + "path": "BPA_PDF_CS_PLOT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "MSP_PLOT", + "value": { + "path": "BPA_PDF_MSP_PLOT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "KHATA_NO", + "value": { + "path": "BPA_PDF_KHATANO_TXT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "HOLDING_NO", + "value": { + "path": "BPA_PDF_HOLDINGNO_TXT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "SERVEY_NO", + "value": { + "path": "BPA_PDF_SERVEYNO_TXT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "TOWNPLANNING_TXT", + "value": { + "path": "BPA_PDF_TOWN_PLANNING_TXT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "PROPOSE_LAND", + "value": { + "path": "BPA_PDF_PROPOSE_LAND" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "OF", + "value": { + "path": "BPA_PDF_OF" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "CONDNS_TXT", + "value": { + "path": "BPA_PDF_CONDNS_TXT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "PERMIT_DETAILS_TXT", + "value": { + "path": "BPA_PDF_PERMITFEE_DETAILS_TXT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "FEE_DSCR", + "value": { + "path": "BPA_PDF_FEE_DSCR" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "AMOUNT", + "value": { + "path": "BPA_PDF_AMOUNT_TXT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "TOTAL", + "value": { + "path": "BPA_PDF_TOTAL" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "BY_ORDER", + "value": { + "path": "BPA_PDF_BY_ORDER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "AUTH_OFFICER", + "value": { + "path": "BPA_PDF_AUTH_OFFICER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "VALIDITY_DSCR", + "value": { + "path": "BPA_PDF_VALIDITY_DSCR" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "ONLY", + "value": { + "path": "BPA_PDF_ONLY" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "NOTE", + "value": { + "path": "BPA_PDF_NOTE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "SUMMARY1", + "value": { + "path": "BPA_PDF_SUMMARY1" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "SUMMARY2", + "value": { + "path": "BPA_PDF_SUMMARY2" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "AUTH_DSCR", + "value": { + "path": "BPA_PDF_AUTH_DSCR" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "Bihar_Tenant", + "value": { + "path": "BIHAR_TENANT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "applicantName", + "value": { + "path": "$.edcrDetail[0].planDetail.planInformation.applicantName" + } + }, + { + "variable": "applicationDate", + "value": { + "path": "$.edcrDetail[0].planDetail.applicationDate" + }, + "type": "date" + }, + { + "variable": "plotNo", + "value": { + "path": "$.edcrDetail[0].planDetail.planInformation.plotNo" + } + }, + { + "variable": "khataNo", + "value": { + "path": "$.edcrDetail[0].planDetail.planInformation.khataNo" + } + } + ] + }, + { + "externalAPI": [ + { + "path": "http://collection-services:8080/collection-services/payments/_search", + "queryParam": "tenantId=$.tenantId,consumerCodes=$.applicationNo", + "apiRequest": null, + "responseMapping": [ + { + "variable": "sanHeadCode", + "value": "$.Payments[0].paymentDetails[0].bill.billDetails[0].billAccountDetails[0].taxHeadCode", + "localisation": { + "required": true, + "prefix": "BPA", + "module": "rainmaker-bpa" + } + }, + { + "variable": "sanFee", + "value": "$.Payments[0].paymentDetails[0].bill.billDetails[0].billAccountDetails[0].amount" + }, + { + "variable": "appHeadCode", + "value": "$.Payments[1].paymentDetails[0].bill.billDetails[0].billAccountDetails[0].taxHeadCode", + "localisation": { + "required": true, + "prefix": "BPA", + "module": "rainmaker-bpa" + } + }, + { + "variable": "appFee", + "value": "$.Payments[1].paymentDetails[0].bill.billDetails[0].billAccountDetails[0].amount" + } + ] + }, + { + "path": "http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search", + "queryParam": "tenantId=$.tenantId,businessIds=$.applicationNo,history=true", + "apiRequest": null, + "responseMapping": [ + { + "variable": "approvedBy", + "value": "$.ProcessInstances[?(@.action=='APPROVE')].assigner.name", + "isUpperCaseRequired": true + } + ] + } + ] + }, + { + "derived": [ + { + "variable": "totalDue", + "formula": "{{sanFee}}+{{appFee}}" + } + ] + }, + { + "qrcodeConfig": [ + { + "variable": "qrCode", + "value": "Applicant Name: {{favourOf}}, Permit Order Number : {{planPermissionNo}}, Permit Order Date : {{orderGeneratedOn}}, eDCR Scrutiny Number: {{edcrNo}}, Approver Name : {{approvedBy}}" + } + ] + } + ] + } + ] + } +} diff --git a/configs/pdf-service/data-config/consolidated-pdf1.json b/configs/pdf-service/data-config/consolidated-pdf1.json new file mode 100644 index 00000000..14d85ad1 --- /dev/null +++ b/configs/pdf-service/data-config/consolidated-pdf1.json @@ -0,0 +1,124 @@ +{ + "key": "consolidated-pdf1", + "DataConfigs": { + "serviceName": "rainmaker-common", + "version": "1.0.0", + "baseKeyPath": "$.Receipt.*", + "isCommonTableBorderRequired": true, + "mappings": [ + { + "topic": "common-pdf-generation-1", + "staticConfigPath": "https://raw.githubusercontent.com/egovernments/egov-services/vishal-feature-filestore/core/egov-indexer/src/main/resources/rainmaker-pgr-indexer.yml", + "mappings": [ + { + "direct": [ + { + "variable": "variable1", + "value": { + "path": "$.Bill[0].payerName" + } + }, + { + "variable": "variable2", + "value": { + "path": "$.Bill[0].mobileNumber" + } + }, + { + "variable": "variable3", + "value": { + "path": "$.Bill[0].billDetails[0].receiptNumber" + } + }, + { + "variable": "variable4", + "value": { + "path": "$.Bill[0].taxAndPayments[0].businessService" + } + }, + { + "variable": "variable5", + "value": { + "path": "$.Bill[0].taxAndPayments[0].amountPaid" + } + }, + { + "variable": "variable6", + "value": { + "path": "$.Bill[0].billDetails[0].fromPeriod" + } + }, + { + "variable": "variable7", + "value": { + "path": "$.Bill[0].billDetails[0].toPeriod" + } + }, + { + "variable": "variable8", + "value": { + "path": "$.Bill[0].billDetails[0].billDate" + } + }, + { + "variable": "variable9", + "value": { + "path": "$.instrument.instrumentType.name" + } + }, + { + "variable": "variable10", + "value": { + "path": "$.Bill[0].billDetails[0].manualReceiptNumber" + } + }, + { + "variable": "variable11", + "value": { + "path": "$.Bill[0].billDetails[0].manualReceiptDate" + } + }, + { + "variable": "variable12", + "value": { + "path": "$.Bill[0].billDetails[0].totalAmount" + } + }, + { + "variable": "variable13", + "value": { + "path": "$.Receipt[0].instrument.transactionDateInput" + } + }, + { + "variable": "variable14", + "value": { + "path": "$.consumerCode" + } + }, + { + "variable": "variable15", + "value": { + "path": "$.transactionId" + } + }, + { + "variable": "variable16", + "url":"https://raw.githubusercontent.com/egovernments/egov-web-app/master/web/rainmaker/dev-packages/egov-ui-kit-dev/src/assets/images/pblogo.png", + "type":"image" + } + ] + }, + { + "derived": [ + { + "variable": "variable19", + "formula": "{{variable12}}-{{variable5}}" + } + ] + } + ] + } + ] + } +} diff --git a/configs/pdf-service/data-config/consolidated-pdf2.json b/configs/pdf-service/data-config/consolidated-pdf2.json new file mode 100644 index 00000000..ef1fb938 --- /dev/null +++ b/configs/pdf-service/data-config/consolidated-pdf2.json @@ -0,0 +1,124 @@ +{ + "key": "consolidated-pdf2", + "DataConfigs": { + "serviceName": "rainmaker-common", + "version": "1.0.0", + "baseKeyPath": "$.Receipt.*", + "isCommonTableBorderRequired": true, + "mappings": [ + { + "topic": "common-pdf-generation-1", + "staticConfigPath": "https://raw.githubusercontent.com/egovernments/egov-services/vishal-feature-filestore/core/egov-indexer/src/main/resources/rainmaker-pgr-indexer.yml", + "mappings": [ + { + "direct": [ + { + "variable": "variable1", + "url": "https://raw.githubusercontent.com/egovernments/egov-web-app/master/web/rainmaker/dev-packages/egov-ui-kit-dev/src/assets/images/pblogo.png", + "type": "image" + }, + { + "variable": "variable2", + "value": { + "path": "$.Bill[0].payerName" + } + }, + { + "variable": "variable3", + "value": { + "path": "$.Bill[0].mobileNumber" + } + }, + { + "variable": "variable4", + "value": { + "path": "$.Bill[0].payerAddress" + } + }, + { + "variable": "variable5", + "value": { + "path": "$.Bill[0].billDetails[0].billNumber" + } + }, + { + "variable": "variable6", + "value": { + "path": "$.Bill[0].billDetails[0].fromPeriod" + } + }, + { + "variable": "variable7", + "value": { + "path": "$.Bill[0].billDetails[0].toPeriod" + } + }, + { + "variable": "variable8", + "value": { + "path": "$.Bill[0].billDetails[0].billDate" + } + }, + { + "variable": "variable9", + "value": { + "path": "$.Bill[0].billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_TIME_PENALTY')].amount" + } + }, + { + "variable": "variable10", + "value": { + "path": "$.Bill[0].billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_TIME_REBATE')].amount" + } + }, + { + "variable": "variable11", + "value": { + "path": "$.Bill[0].billDetails[0].totalAmount" + } + }, + { + "variable": "variable12", + "value": { + "path": "$.transactionId" + } + }, + { + "variable": "variable13", + "value": { + "path": "$.Bill[0].billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_TIME_REBATE')].amount" + } + }, + { + "variable": "variable14", + "value": { + "path": "$.Receipt[0].Bill[0].billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_TAX')].amount" + } + }, + { + "variable": "variable15", + "value": { + "path": "$.consumerCode" + } + }, + { + "variable": "variable16", + "value": { + "path": "$.Bill[0].billDetails[0].amountPaid" + } + } + ] + }, + { + "derived": [ + { + "variable": "variable19", + "formula": "{{variable16}}-{{variable17}}" + } + ] + } + ] + } + ] + } +} diff --git a/configs/pdf-service/data-config/consolidatedbill.json b/configs/pdf-service/data-config/consolidatedbill.json new file mode 100644 index 00000000..0944cf75 --- /dev/null +++ b/configs/pdf-service/data-config/consolidatedbill.json @@ -0,0 +1,702 @@ +{ + "key": "consolidatedbill", + "DataConfigs": { + "serviceName": "rainmaker-common", + "version": "1.0.0", + "baseKeyPath": "$.Bill.*", + "entityIdPath":"$.billNumber", + "isCommonTableBorderRequired": true, + "mappings": [ + { + "topic": "common-pdf-generation-1", + "staticConfigPath": "https://raw.githubusercontent.com/egovernments/egov-services/vishal-feature-filestore/core/egov-indexer/src/main/resources/rainmaker-pgr-indexer.yml", + "mappings": [ + { + "direct": [ + { + "variable": "total_amount_due", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_TOTAL_AMOUNT_DUE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payer_name", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PAYER_NAME" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "Municipal_Corporation", + "value": { + "path": "PDF_STATIC_LABEL_MDMS_MUNICIPAL_CORPORATION" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "bill_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_BILL_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "Rs", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_RUPEE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "mobile_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_MOBILE_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "bill_period", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_BILL_PERIOD" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payer_address", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PAYER_ADDRESS" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + + { + "variable": "bill_issue_date", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ISSUE_DATE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "bill_due_date", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_BILL_DUE_DATE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "billing_summary_property_tax", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_BILLING_SUMMARY" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "serviceType", + "value": { + "path": "$.businessService" + }, + "localisation":{ + "required":true, + "prefix":"MODULE", + "module":"rainmaker-common" + } + }, + { + "variable": "property_id", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PROPERTY_ID" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "arrears_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ARREARS" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "charge_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_CHARGE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + + { + "variable": "penalty_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PENALTY" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "rebate_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_REBATE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "others_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_OTHERS" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "total_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_TOTAL" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "important_message", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_IMPORTANT_MESSAGE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payment_received", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PAYMENT_RECEIVED" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "this_document", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_THIS_DOCUMENT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "this_is_a", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_THIS_IS" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "assessment_payment", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ASSESSSMENT_PAYMENT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "please_deposit", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PLEASE_DEPOSIT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "if_the_tax", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_IF_THE_TAX" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "acknowledgement_for", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ACKNOWLEDGEMENT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "date_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_DATE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "consumer_id", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_CONSUMER_ID" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "consumer_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_CONSUMER_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "name_address", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_NAME_ADDRESS" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "total_payment", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_TOTAL_PAYMENT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "receivers_signature", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_RECEIVERS_SIGNATURE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "totalAmountDue", + "value": { + "path": "$.totalAmount" + } + }, + { + "variable": "total", + "value": { + "path": "$.totalAmount" + } + }, + + { + "variable": "payerName", + "value": { + "path": "$.payerName" + } + }, + + { + "variable": "mobileNo", + "value": { + "path": "$.mobileNumber" + } + }, + + { + "variable": "payerAddress", + "value": { + "path": "$.payerAddress" + } + }, + { + "variable": "nameAddress", + "value": { + "path": "$.payerAddress" + } + }, + + { + "variable": "billNo", + "value": { + "path": "$.billNumber" + } + }, + { + "variable": "fromPeriod", + "value": { + "path": "$.billDetails[0].fromPeriod" + }, + "type": "date" + }, + { + "variable": "toPeriod", + "value": { + "path": "$.billDetails[0].toPeriod" + }, + "type": "date" + }, + + { + "variable": "billIssueDate", + "value": { + "path": "$.billDate" + }, + "type": "date" + }, + + { + "variable": "billDueDate", + "value": { + "path": "$.billDetails[0].expiryDate" + }, + "type": "date" + }, + { + "variable": "billdate", + "value": { + "path": "$.billDate" + }, + "type": "date" + }, + + { + "variable": "propertyID", + "value": { + "path": "$.consumerCode" + } + }, + { + "variable": "taxCharge", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_TAX' || @.taxHeadCode == 'TL_TAX' || @.taxHeadCode == 'FIRENOC_TAXES' || @.taxHeadCode == 'WS_CHARGE' || @.taxHeadCode == 'SW_CHARGE' )].amount" + } + }, + { + "variable": "timeRebate", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_TIME_REBATE' || @.taxHeadCode == 'WS_TIME_REBATE' || @.taxHeadCode == 'SW_TIME_REBATE')].amount" + } + }, + { + "variable": "adhocRebate", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_ADHOC_REBATE' || @.taxHeadCode == 'TL_ADHOC_REBATE' || @.taxHeadCode == 'FIRENOC_ADHOC_REBATE')].amount" + } + }, + + { + "variable": "timePenalty", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_TIME_PENALTY' || @.taxHeadCode == 'WS_TIME_PENALTY' || @.taxHeadCode == 'SW_TIME_PENALTY')].amount" + } + }, + { + "variable": "adhocPenalty", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_ADHOC_PENALTY' || @.taxHeadCode == 'TL_ADHOC_PENALTY' || @.taxHeadCode == 'FIRENOC_ADHOC_PENALTY')].amount" + } + }, + { + "variable": "firecess", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_FIRE_CESS')].amount" + } + }, + { + "variable": "usageExemption", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_UNIT_USAGE_EXEMPTION')].amount" + } + }, + { + "variable": "roundoff", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_ROUNDOFF' || @.taxHeadCode == 'TL_ROUNDOFF' || @.taxHeadCode == 'FIRENOC_ROUNDOFF' || @.taxHeadCode == 'WS_Round_Off' || @.taxHeadCode == 'SW_Round_Off')].amount" + } + }, + { + "variable": "fees", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'FIRENOC_FEES')].amount" + } + }, + { + "variable": "ownerExemption", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_OWNER_EXEMPTION')].amount" + } + }, + { + "variable": "cancerCess", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_CANCER_CESS')].amount" + } + }, + { + "variable": "waterCess", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'WS_WATER_CESS')].amount" + } + }, + { + "variable": "timeInterest", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_TIME_INTEREST' || @.taxHeadCode == 'WS_TIME_INTEREST' || @.taxHeadCode == 'SW_TIME_INTEREST')].amount" + } + }, + { + "variable": "ceilingDebit", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_DECIMAL_CEILING_DEBIT')].amount" + } + }, + { + "variable": "ceilingCredit", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_DECIMAL_CEILING_CREDIT')].amount" + } + }, + { + "variable": "carryForward", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_ADVANCE_CARRYFORWARD')].amount" + } + }, + + { + "variable": "consumerID", + "value": { + "path": "$.consumerCode" + } + }, + { + "variable": "date", + "value": { + "path": "$.billDate" + }, + "type": "date" + }, + { + "variable": "totalPayment", + "value": { + "path": "$.billDetails[0].amountPaid" + } + }, + { + "variable": "WS_arrears", + "value":{ + "path": "$.arrearAmount" + } + }, + { + "variable":"scissorImage", + "url":"http://www.pngall.com/wp-content/uploads/2016/03/Scissor-PNG-Clipart.png", + "type":"image" + } + ] + }, + { + "derived": [ + { + "variable": "charge", + "formula": "{{taxCharge}}+{{fees}}" + }, + { + "variable": "penalty", + "formula": "{{timePenalty}}+{{adhocPenalty}}" + }, + { + "variable": "rebate", + "formula": "{{timeRebate}}+{{adhocRebate}}" + }, + { + "variable": "others", + "formula": "{{cancerCess}}+{{roundoff}}+{{timeInterest}}+{{ceilingDebit}}+{{ceilingCredit}}+{{firecess}}+{{waterCess}}" + }, + { + "variable": "arrears", + "formula": "{{WS_arrears}}" + } + ] + }, + { + "externalAPI": [ + { + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", + "apiRequest": null, + "responseMapping":[ + { + "variable":"address", + "value":"$.MdmsRes.tenant.tenants[0].address" + }, + { + "variable":"phoneNumber", + "value":"$.MdmsRes.tenant.tenants[0].contactNumber" + }, + { + "variable":"website", + "value":"$.MdmsRes.tenant.tenants[0].domainUrl" + }, + { + "variable":"email", + "value":"$.MdmsRes.tenant.tenants[0].emailId" + }, + { + "variable": "logoImage", + "value":"$.MdmsRes.tenant.tenants[0].logoId", + "type": "image" + }, + { + "variable": "logo_header", + "value":"$.MdmsRes.tenant.tenants[0].code", + "localisation":{ + "required":true, + "prefix": "TENANT_TENANTS", + "module":"rainmaker-common" + } + } + ] + } + ] + } + ] + } + ] + } +} diff --git a/configs/pdf-service/data-config/consolidatedreceipt.json b/configs/pdf-service/data-config/consolidatedreceipt.json new file mode 100644 index 00000000..ab0ca0e3 --- /dev/null +++ b/configs/pdf-service/data-config/consolidatedreceipt.json @@ -0,0 +1,476 @@ +{ + "key": "consolidatedreceipt", + "documentType":"CONSOLIDATED_RECEIPT", + "DataConfigs": { + "moduleName": "rainmaker-common", + "version": "1.0.0", + "baseKeyPath": "$.Payments.*", + "entityIdPath":"$.id", + "isCommonTableBorderRequired": true, + "mappings": [ + { + "topic": "common-pdf-generation-3", + "mappings": [ + { + "direct": [ + { + "variable": "payerName", + "value": { + "path": "$.payerName" + } + }, + { + "variable": "user-name", + "value": { + "path": "$.userInfo.name" + }, + "type":"selectFromRequestInfo" + }, + { + "variable": "payerContact", + "value": { + "path": "$.mobileNumber" + } + }, + { + "variable": "receiptNo", + "value": { + "path": "$.paymentDetails[0].receiptNumber" + } + }, + { + "variable": "serviceType", + "value": { + "path": "$.paymentDetails[0].businessService" + }, + "localisation":{ + "required":true, + "prefix":"MODULE", + "module":"rainmaker-common" + } + }, + { + "variable": "paidAmount", + "value": { + "path": "$.paymentDetails[0].totalAmountPaid" + } + }, + { + "variable": "fromPeriod", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].fromPeriod" + }, + "type": "date" + }, + { + "variable": "toPeriod", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].toPeriod" + }, + "type": "date" + }, + { + "variable": "paymentMode", + "value": { + "path": "$.paymentMode" + }, + "localisation":{ + "required":true, + "prefix": "COMMON_MASTERS_PAYMENTMODE", + "module": "rainmaker-common" + } + }, + { + "variable": "G8ReceiptNo", + "value": { + "path": "$.paymentDetails[0].manualReceiptNumber" + } + }, + { + "variable": "G8ReceiptDate", + "value": { + "path": "$.paymentDetails[0].manualReceiptDate" + }, + "type": "date" + }, + { + "variable": "paymentDate", + "value": { + "path": "$.transactionDate" + }, + "type": "date" + }, + { + "variable": "consumerID", + "value": { + "path": "$.paymentDetails[0].bill.consumerCode" + } + }, + { + "variable": "transactionID", + "value": { + "path": "$.transactionNumber" + } + }, + { + "variable": "dueAmount", + "value": { + "path": "$.paymentDetails[0].totalDue" + } + }, + { + "variable": "payment_receipt", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_RECEIPT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "receipt_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_RECEIPT_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "consumer_id", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_CONSUMER_ID" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payment_date", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_DATE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payer_name", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYER_NAME" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payer_contact", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYER_CONTACT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "service_type", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_SERVICE_TYPE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "billing_period", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_BILLING_PERIOD" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "paid_amount", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAID_AMOUNT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "pending_amount", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PENDING_AMOUNT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payment_mode", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_MODE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "transaction_id", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_TRANSACTION_ID" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "g8_receipt_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_G8_RECEIPT_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "g8_receipt_date", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_G8_RECEIPT_DATE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "generated_by", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_GENERATED_BY" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "commissioner/eo", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_COMMISSIONER_EO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "no_signature", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_NO_SIGNATURE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "disclamer", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "disclamer_1", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_FIRST_LINE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "disclamer_2", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_SECOND_LINE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "disclamer_3", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_THIRD_LINE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "disclamer_4", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_FOURTH_LINE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "disclamer_5", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_FIFTH_LINE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "to", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_TO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "Municipal_Corporation", + "value": { + "path": "PDF_STATIC_LABEL_MDMS_MUNICIPAL_CORPORATION" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + } + ] + }, + { + "derived": [ + { + "variable": "pendingAmount", + "formula": "{{dueAmount}}-{{paidAmount}}" + } + ] + }, + { + "externalAPI": [ + { + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", + "apiRequest": null, + "responseMapping":[ + { + "variable":"address", + "value":"$.MdmsRes.tenant.tenants[0].address" + }, + { + "variable":"phoneNumber", + "value":"$.MdmsRes.tenant.tenants[0].contactNumber" + }, + { + "variable":"website", + "value":"$.MdmsRes.tenant.tenants[0].domainUrl" + }, + { + "variable":"email", + "value":"$.MdmsRes.tenant.tenants[0].emailId" + }, + { + "variable": "logoImage", + "value":"$.MdmsRes.tenant.tenants[0].logoId", + "type":"image" + }, + { + "variable": "logo-header", + "value":"$.MdmsRes.tenant.tenants[0].code", + "localisation":{ + "required":true, + "prefix": "TENANT_TENANTS", + "module":"rainmaker-common" + } + } + ] + } + ] + } + ] + } + ] + } +} diff --git a/configs/pdf-service/data-config/firenoc-receipt.json b/configs/pdf-service/data-config/firenoc-receipt.json new file mode 100644 index 00000000..9a89b2e5 --- /dev/null +++ b/configs/pdf-service/data-config/firenoc-receipt.json @@ -0,0 +1,245 @@ +{ + "key":"firenoc-receipt", + "DataConfigs": { + "serviceName": "rainmaker-noc", + "version": "1.0.0", + "baseKeyPath": "$.FireNOCs.*", + "entityIdPath":"$.fireNOCNumber", + "isCommonTableBorderRequired":true, + "mappings": [ + { + "topic": "noc-pdf-generation", + "staticConfigPath": "https://raw.githubusercontent.com/egovernments/egov-services/vishal-feature-filestore/core/egov-indexer/src/main/resources/rainmaker-pgr-indexer.yml", + "mappings": [ + { + "direct": [ + { + "variable": "variable1", + "value": { + "path":"$.fireNOCDetails.applicationNumber" + } + }, + { + "variable": "variable32", + "url":"https://s3.ap-south-1.amazonaws.com/pb-egov-assets/pb.amritsar/logo.png", + "type":"image" + }, + { + "variable": "variable3", + "value": { + "path":"$.fireNOCDetails.applicantDetails.ownerShipType" + }, + "type":"function", + "format":"return type.startsWith('INSTITUTION')" + }, + { + "variable": "variable21", + "value": { + "path":"$.fireNOCDetails.applicantDetails.ownerShipType" + }, + "localisation":{ + "required":true, + "prefix":"COMMON_MASTERS_OWNERSHIPCATEGORY", + "module":"rainmaker-common" + } + }, + { + "variable": "variable22", + "value": { + "path":"$.fireNOCDetails.applicantDetails.additionalDetail.institutionName" + } + }, + { + "variable": "variable23", + "value": { + "path":"$.fireNOCDetails.applicantDetails.additionalDetail.telephoneNumber" + } + }, + { + "variable": "variable24", + "value": { + "path":"$.fireNOCDetails.applicantDetails.owners[0].name" + } + }, + { + "variable": "variable25", + "value": { + "path":"$.fireNOCDetails.applicantDetails.additionalDetail.institutionDesignation" + } + }, + { + "variable": "variable26", + "value": { + "path":"$.fireNOCDetails.applicantDetails.owners[0].mobileNumber" + } + }, + { + "variable": "variable27", + "value": { + "path":"$.fireNOCDetails.applicantDetails.owners[0].emailId" + } + }, + { + "variable": "variable28", + "value": { + "path":"$.fireNOCDetails.applicantDetails.owners[0].correspondenceAddress" + } + }, + { + "variable": "variable20", + "value": { + "path":"$.tenantId" + }, + "localisation":{ + "required":true, + "prefix":"TENANT_TENANTS", + "module":"rainmaker-common" + }, + "isUpperCaseRequired":true + }, + { + "variable": "variable2", + "value":{ + "path":"$.fireNOCDetails.applicantDetails.owners.*" + }, + "type":"array", + "format":{ + "type":"string", + "scema":[ + { + "key":"name" + }, + { + "key":"mobileNumber" + }] + } + } + ] + }, + { + "derived": [ + { + "variable": "variable31", + "formula": "{{variable29}}+{{variable30}}" + } + ] + }, + { + "externalAPI": [ + + { + + "path": "http://collection-services:8080/collection-services/receipts/_search", + "queryParam": "consumerCode=$.fireNOCDetails.applicationNumber", + "apiRequest": null, + + "responseMapping":[ + { + "variable":"variable6", + "value":"$.Receipt[0].instrument.transactionDateInput" + }, + { + "variable":"variable7", + "value":"$.Receipt[0].receiptNumber" + }, + { + "variable":"variable8", + "value":"$.Receipt[0].Bill[0].billDetails[0].billAccountDetails[?(@.taxHeadCode=='FIRENOC_FEES')].amount" + }, + { + "variable":"variable9", + "value":"$.Receipt[0].Bill[0].billDetails[0].billAccountDetails[?(@.taxHeadCode=='FIRENOC_TAXES')].amount" + }, + { + "variable":"variable29", + "value":"$.Receipt[0].Bill[0].billDetails[0].billAccountDetails[?(@.taxHeadCode=='FIRENOC_ADHOC_PENALTY')].amount" + }, + { + "variable":"variable30", + "value":"$.Receipt[0].Bill[0].billDetails[0].billAccountDetails[?(@.taxHeadCode=='FIRENOC_ADHOC_REBATE')].amount" + }, + { + "variable":"variable10", + "value":"$.Receipt[0].Bill[0].billDetails[0].totalAmount" + }, + { + "variable":"variable11", + "value":"$.Receipt[0].instrument.transactionType" + }, + { + "variable":"variable12", + "value":"$.Receipt[0].transactionId" + }, + { + "variable":"variable13", + "value":"$.Receipt[0].instrument.bank.name" + }, + { + "variable":"variable15", + "value":"$.Receipt[0].Bill[0].billDetails[0].receiptNumber" + }, + { + "variable":"variable16", + "value":"$.Receipt[0].Bill[0].billDetails[0].receiptDate" + }, + { + "variable":"variable17", + "value":"$.Receipt[0].Bill[0].billDetails[0].amountPaid" + }, + { + "variable":"variable18", + "value":"$.Receipt[0].instrument.instrumentType.name" + }, + { + "variable":"variable19", + "value":"$.Receipt[0].instrument.transactionNumber" + } + ] + } + ] + }, + { + "qrcodeConfig": [ + { + "variable": "variable14", + "value":"Application: {{variable1}}, Receipt number: {{variable15}}, Date of payment: {{variable16}}, Fees Paid: {{variable17}}, Payment mode: {{variable18}}, Transaction ID: {{variable19}}" + } + ] + }, + { + "mdmsDenormalization": [ + { + "variable": "$variable", + "moduleName": "common-masters", + "masterName": "Department", + "tenantId": "pb", + "filter": "[?(@.code == $department)]", + "filterMapping": [ + { + "variable": "$department", + "valueJsonpath": "$.department" + } + ], + "valueJsonPath": "$.TenantBoundary[0].boundary[0].name" + }, + { + "variable": "$variable", + "moduleName": "common-masters", + "masterName": "Department", + "tenantId": "pb", + "filter": "[?(@.code == $department)]", + "filterMapping": [ + { + "variable": "$department", + "valueJsonpath": "$.department" + } + ], + "valueJsonPath": "$.TenantBoundary[0].boundary[0].name" + } + ] + } + ] + } + ] + } + } diff --git a/configs/pdf-service/data-config/misc-receipt.json b/configs/pdf-service/data-config/misc-receipt.json new file mode 100644 index 00000000..c0fd312b --- /dev/null +++ b/configs/pdf-service/data-config/misc-receipt.json @@ -0,0 +1,511 @@ +{ + "key": "misc-receipt", + "DataConfigs": { + "serviceName": "rainmaker-common", + "version": "1.0.0", + "baseKeyPath": "$.Payments.*", + "entityIdPath":"$.paymentDetails[0].receiptNumber", + "isCommonTableBorderRequired": true, + "mappings": [ + { + "topic": "common-pdf-generation-3", + "mappings": [ + { + "direct": [ + { + "variable": "payerName", + "value": { + "path": "$.payerName" + } + }, + { + "variable": "user-name", + "value": { + "path": "$.userInfo.name" + }, + "type":"selectFromRequestInfo" + }, + { + "variable": "payerContact", + "value": { + "path": "$.mobileNumber" + } + }, + { + "variable": "receiptNo", + "value": { + "path": "$.paymentDetails[0].receiptNumber" + } + }, + { + "variable": "serviceType", + "value": { + "path": "$.paymentDetails[0].businessService" + }, + "localisation":{ + "required":true, + "prefix":"BILLINGSERVICE_BUSINESSSERVICE", + "module":"rainmaker-bpa" + } + }, + { + "variable": "paidAmount", + "value": { + "path": "$.paymentDetails[0].totalAmountPaid" + } + }, + { + "variable": "fromPeriod", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].fromPeriod" + }, + "type": "date" + }, + { + "variable": "toPeriod", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].toPeriod" + }, + "type": "date" + }, + { + "variable": "paymentMode", + "value": { + "path": "$.paymentMode" + }, + "localisation":{ + "required":true, + "prefix": "COMMON_MASTERS_PAYMENTMODE", + "module": "rainmaker-common" + } + }, + { + "variable": "G8ReceiptNo", + "value": { + "path": "$.paymentDetails[0].manualReceiptNumber" + } + }, + { + "variable": "G8ReceiptDate", + "value": { + "path": "$.paymentDetails[0].manualReceiptDate" + }, + "type": "date" + }, + { + "variable": "paymentDate", + "value": { + "path": "$.transactionDate" + }, + "type": "date" + }, + { + "variable": "consumerID", + "value": { + "path": "$.paymentDetails[0].bill.consumerCode" + } + }, + { + "variable": "transactionID", + "value": { + "path": "$.transactionNumber" + } + }, + { + "variable": "dueAmount", + "value": { + "path": "$.paymentDetails[0].totalDue" + } + }, + { + "variable": "payment_receipt", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_RECEIPT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "receipt_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_RECEIPT_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "consumer_id", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_CONSUMER_ID" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payment_date", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_DATE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payer_name", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYER_NAME" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payer_contact", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYER_CONTACT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "service_type", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_SERVICE_TYPE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "billing_period", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_BILLING_PERIOD" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "paid_amount", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAID_AMOUNT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "pending_amount", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PENDING_AMOUNT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payment_mode", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_MODE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "transaction_id", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_TRANSACTION_ID" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "g8_receipt_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_G8_RECEIPT_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "g8_receipt_date", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_G8_RECEIPT_DATE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "generated_by", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_GENERATED_BY" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "commissioner/eo", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_COMMISSIONER_EO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "no_signature", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_NO_SIGNATURE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "disclamer", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "disclamer_1", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_FIRST_LINE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "disclamer_2", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_SECOND_LINE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "disclamer_3", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_THIRD_LINE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "disclamer_4", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_FOURTH_LINE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "disclamer_5", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_FIFTH_LINE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "to", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_TO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "Municipal_Corporation", + "value": { + "path": "PDF_STATIC_LABEL_MDMS_MUNICIPAL_CORPORATION" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "receipt_info", + "value": { + "path": "PDF_STATIC_LABEL_RECEIPT_INFO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payer_info", + "value": { + "path": "PDF_STATIC_LABEL_PAYER_INFO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payment_info", + "value": { + "path": "PDF_STATIC_LABEL_PAYMENT_INFO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + } + ] + }, + { + "derived": [ + { + "variable": "pendingAmount", + "formula": "{{dueAmount}}-{{paidAmount}}" + } + ] + }, + { + "externalAPI": [ + { + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "queryParam": "moduleName=tenant&masterName=tenants&tenantId=bh&filter=%5B?(@.code=='{$.tenantId}')%5D", + "apiRequest": null, + "responseMapping":[ + { + "variable":"address", + "value":"$.MdmsRes.tenant.tenants[0].address" + }, + { + "variable":"phoneNumber", + "value":"$.MdmsRes.tenant.tenants[0].contactNumber" + }, + { + "variable":"website", + "value":"$.MdmsRes.tenant.tenants[0].domainUrl" + }, + { + "variable":"email", + "value":"$.MdmsRes.tenant.tenants[0].emailId" + }, + { + "variable": "logoImage", + "value":"$.MdmsRes.tenant.tenants[0].logoId", + "type":"image" + }, + { + "variable": "logo-header", + "value":"$.MdmsRes.tenant.tenants[0].code", + "localisation":{ + "required":true, + "prefix": "TENANT_TENANTS", + "module":"rainmaker-pgr" + } + } + ] + } + ] + } + ] + } + ] + } + } diff --git a/configs/pdf-service/data-config/passvehicle-certificate.json b/configs/pdf-service/data-config/passvehicle-certificate.json new file mode 100644 index 00000000..38f83596 --- /dev/null +++ b/configs/pdf-service/data-config/passvehicle-certificate.json @@ -0,0 +1,555 @@ +{ + "key": "tlcertificate", + "DataConfigs": { + "serviceName": "rainmaker-common", + "version": "1.0.0", + "baseKeyPath": "$.Licenses.*", + "entityIdPath":"$.licenseNumber", + "isCommonTableBorderRequired": true, + "mappings": [ + { + "mappings": [ + { + "direct": [ + { + "variable": "logoImage", + "url":"https://raw.githubusercontent.com/egovernments/egov-web-app/master/web/rainmaker/dev-packages/egov-ui-kit-dev/src/assets/images/pblogo.png", + "type":"image" + }, + { + "variable": "tradeLicenseNo", + "value": { + "path": "$.licenseNumber" + } + }, + { + "variable": "applicationNo", + "value": { + "path": "$.applicationNumber" + } + }, + { + "variable": "financialYear", + "value": { + "path": "$.financialYear" + } + }, + { + "variable": "tradeName", + "value": { + "path": "$.tradeName" + } + }, + { + "variable": "tradeOwnerName", + "value": { + "path": "$.tradeLicenseDetail.owners[0].name" + } + }, + { + "variable": "tradeOwnerContact", + "value": { + "path": "$.tradeLicenseDetail.owners[0].mobileNumber" + } + }, + { + "variable": "tradeAddress", + "value": { + "path": "$.tradeLicenseDetail.address.locality.name" + } + }, + { + "variable": "city", + "value": { + "path": "$.tradeLicenseDetail.address.city" + }, + "localisation":{ + "required":true, + "prefix": "TENANT_TENANTS", + "module": "rainmaker-common" + } + }, + { + "variable": "tradeType", + "value": { + "path": "$.tradeLicenseDetail.tradeUnits[0].tradeType" + }, + "localisation":{ + "required":true, + "prefix": "TRADELICENSE_TRADETYPE", + "module": "rainmaker-tl", + "isCategoryRequired":true + } + }, + { + "variable": "passSubCategory", + "value": { + "path": "$.tradeLicenseDetail.tradeUnits[0].tradeType" + }, + "localisation":{ + "required":true, + "prefix": "TRADELICENSE_TRADETYPE", + "module": "rainmaker-tl", + "isMainTypeRequired":true + } + }, + { + "variable": "accessories", + "value": { + "path": "$.tradeLicenseDetail.accessories[0].accessoryCategory" + }, + "localisation":{ + "required":true, + "prefix": "TL", + "module": "rainmaker-tl" + } + }, + { + "variable": "purpose_content", + "value": { + "path": "$.tradeLicenseDetail.additionalDetail.purpose" + } + }, + { + "variable": "licenseIssueDate", + "value": { + "path": "$.issuedDate" + }, + "type": "date" + }, + { + "variable": "licenseValidityFrom", + "value": { + "path": "$.validFrom" + }, + "type": "date" + }, + { + "variable": "licenseValidityTo", + "value": { + "path": "$.validTo" + }, + "type": "date" + }, + { + "variable": "vehicleNumber", + "value": { + "path": "$.tradeLicenseDetail.additionalDetail.vehicleNumber" + } + }, + { + "variable": "vehicleCompany", + "value": { + "path": "$.tradeLicenseDetail.additionalDetail.vehicleCompany" + } + }, + { + "variable": "vehicleModel", + "value": { + "path": "$.tradeLicenseDetail.additionalDetail.vehicleModel" + } + }, + { + "variable": "to", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_TO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "vehicle_number_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_PASS_VEHICLE_NUMBER_LABLE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "vehicle_company_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_PASS_VEHICLE_COMPANY_LABLE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "vehicle_model_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_PASS_VEHICLE_MODEL_LABLE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "municipal_corportaion", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_PASS_CITY_POLICE_LABLE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "corporation_contact", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_LICENSE_CORPORATION_CONTACT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "disclaimer_heading", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_LICENSE_DISCLAIMER_HEADING" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "disclaimer_body", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_LICENSE_DISCLAIMER_BODY" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "corporation_website", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_LICENSE_CORPORATION_WEBSITE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "corporation_email", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_LICENSE_CORPORATION_EMAIL" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "trade_license_certifcate", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_PASS_CERTIFICATE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "trade_license_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_PASS_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "application_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_APPLICATION_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "reciept_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_RECIEPT_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "financial_year", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_FINANCIAL_YEAR" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "trade_name", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_TRADE_NAME" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "trade_owner_name", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_TRADE_OWNER_NAME" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "trade_owner_contact", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_TRADE_OWNER_CONTACT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "trade_address", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_TRADE_ADDRESS" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "trade_type", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_PASS_TRADE_TYPE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "pass_subCategory", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_PASS_TRADE_SUB_TYPE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "purpose_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_PASS_PURPOSE_LABEL" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "accessories_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_ACCESSORIES_LABEL" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "trade_license_fee", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_TRADE_LICENSE_FEE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "license_issue_date", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_LICENSE_ISSUE_DATE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "license_validity", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_LICENSE_VALIDITY" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "license_validity_from", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_PASS_LICENSE_VALIDITY_FROM" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "license_validity_to", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_PASS_LICENSE_VALIDITY_TO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "approved_by", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_APPROVED_BY" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "commissioner", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_COMMISSIONER" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable":"userpic", + "url":"https://egov-covid-assets.s3.ap-south-1.amazonaws.com/Bangalore_Police.jpeg", + "type":"image" + }, + { + "variable": "tenantID", + "value": { + "path": "$.tenantId" + } + } + ] + }, + { + "externalAPI": [ + { + "path": "http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search", + "queryParam": "businessIds=$.applicationNumber,history=true,tenantId=$.tenantId", + "apiRequest": null, + "responseMapping":[ + { + "variable":"approvedBy", + "value":"$.ProcessInstances[?(@.action == 'APPROVE')].assigner.name" + } + + ] + } + + ] + }, + { + "qrcodeConfig": [ + { + "variable": "qr", + "value":"https://egov-micro-qa.egovernments.org/employee/tradelicence/search-preview?applicationNumber={{applicationNo}}&tenantId={{tenantID}}" + } + ] + } + ] + + } + ] + } + } \ No newline at end of file diff --git a/configs/pdf-service/data-config/property-bill.json b/configs/pdf-service/data-config/property-bill.json new file mode 100644 index 00000000..1ed8778d --- /dev/null +++ b/configs/pdf-service/data-config/property-bill.json @@ -0,0 +1,888 @@ +{ + "key": "property-bill", + "documentType": "PROPERTYBILL", + "DataConfigs": { + "moduleName": "PT", + "version": "1.0.0", + "baseKeyPath": "$.Bill.*", + "entityIdPath":"$.id", + "isCommonTableBorderRequired": true, + "mappings": [ + { + "topic": "common-pdf-generation-1", + "staticConfigPath": "https://raw.githubusercontent.com/egovernments/egov-services/vishal-feature-filestore/core/egov-indexer/src/main/resources/rainmaker-pgr-indexer.yml", + "mappings": [ + { + "direct": [ + { + "variable": "total_amount_due", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_TOTAL_AMOUNT_DUE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payer_name", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PAYER_NAME" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "Municipal_Corporation", + "value": { + "path": "PDF_STATIC_LABEL_MDMS_MUNICIPAL_CORPORATION" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "bill_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_BILL_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "Rs", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_RUPEE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "mobile_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_MOBILE_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "bill_period", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_BILL_PERIOD" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payer_address", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PAYER_ADDRESS" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + + { + "variable": "bill_issue_date", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ISSUE_DATE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "bill_due_date", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_BILL_DUE_DATE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "billing_summary_property_tax", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_BILLING_SUMMARY" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "serviceType", + "value": { + "path": "$.businessService" + }, + "localisation":{ + "required":true, + "prefix":"MODULE", + "module":"rainmaker-common" + } + }, + { + "variable": "tl_application_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_TL_APPLICATION_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "arrears_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ARREARS" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "charge_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_CHARGE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + + { + "variable": "penalty_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PENALTY" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "rebate_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_REBATE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "others_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_OTHERS" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "total_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_TOTAL" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "important_message", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_IMPORTANT_MESSAGE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payment_received", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PAYMENT_RECEIVED" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "this_document", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_THIS_DOCUMENT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "this_is_a", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_THIS_IS" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "assessment_payment", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ASSESSSMENT_PAYMENT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "please_deposit", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PLEASE_DEPOSIT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "if_the_tax", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_IF_THE_TAX" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "acknowledgement_for", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ACKNOWLEDGEMENT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "date_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_DATE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "consumer_id", + "value": { + "path": "$.businessService" + }, + "localisation":{ + "required":true, + "prefix": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_CONSUMER_ID", + "module":"rainmaker-common" + } + }, + { + "variable": "name_address", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_NAME_ADDRESS" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "total_payment", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_TOTAL_PAYMENT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "receivers_signature", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_RECEIVERS_SIGNATURE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "totalAmountDue", + "value": { + "path": "$.totalAmount" + } + }, + { + "variable": "total", + "value": { + "path": "$.totalAmount" + } + }, + + { + "variable": "payerName", + "value": { + "path": "$.payerName" + } + }, + + { + "variable": "mobileNo", + "value": { + "path": "$.mobileNumber" + } + }, + + { + "variable": "payerAddress", + "value": { + "path": "$.payerAddress" + } + }, + { + "variable": "nameAddress", + "value": { + "path": "$.payerAddress" + } + }, + + { + "variable": "billNo", + "value": { + "path": "$.billNumber" + } + }, + { + "variable": "fromPeriod", + "value": { + "path": "$.billDetails[0].fromPeriod" + }, + "type": "date" + }, + { + "variable": "toPeriod", + "value": { + "path": "$.billDetails[0].toPeriod" + }, + "type": "date" + }, + + { + "variable": "billIssueDate", + "value": { + "path": "$.billDate" + }, + "type": "date" + }, + + { + "variable": "billDueDate", + "value": { + "path": "$.billDetails[0].expiryDate" + }, + "type": "date" + }, + { + "variable": "billdate", + "value": { + "path": "$.billDate" + }, + "type": "date" + }, + + { + "variable": "propertyID", + "value": { + "path": "$.consumerCode" + } + }, + { + "variable": "fees", + "value":{ + "path": "$.billDetails[(@.length-1)].billAccountDetails[?(@.taxHeadCode == 'PT_TAX')].amount" + } + }, + { + "variable": "pt_penalty", + "value":{ + "path": "$.billDetails[(@.length-1)].billAccountDetails[?(@.taxHeadCode == 'PT_TIME_PENALTY')].amount" + } + }, + { + "variable": "pt_rebate", + "value":{ + "path": "$.billDetails[(@.length-1)].billAccountDetails[?(@.taxHeadCode == 'PT_TIME_REBATE')].amount" + } + }, + { + "variable": "pt_adhoc_penalty", + "value":{ + "path": "$.billDetails[(@.length-1)].billAccountDetails[?(@.taxHeadCode == 'PT_ADHOC_PENALTY')].amount" + } + }, + { + "variable": "pt_adhoc_rebate", + "value":{ + "path": "$.billDetails[(@.length-1)].billAccountDetails[?(@.taxHeadCode == 'PT_ADHOC_REBATE')].amount" + } + }, + { + "variable": "pt_owner_exemption", + "value":{ + "path": "$.billDetails[(@.length-1)].billAccountDetails[?(@.taxHeadCode == 'PT_OWNER_EXEMPTION')].amount" + } + }, + { + "variable": "pt_unit_usage_exemption", + "value":{ + "path": "$.billDetails[(@.length-1)].billAccountDetails[?(@.taxHeadCode == 'PT_UNIT_USAGE_EXEMPTION')].amount" + } + }, + { + "variable": "pt_fire_cess", + "value":{ + "path": "$.billDetails[(@.length-1)].billAccountDetails[?(@.taxHeadCode == 'PT_FIRE_CESS')].amount" + } + }, + { + "variable": "pt_cancer_cess", + "value":{ + "path": "$.billDetails[(@.length-1)].billAccountDetails[?(@.taxHeadCode == 'PT_CANCER_CESS')].amount" + } + }, + { + "variable": "pt_time_interest", + "value":{ + "path": "$.billDetails[(@.length-1)].billAccountDetails[?(@.taxHeadCode == 'PT_TIME_INTEREST')].amount" + } + }, + { + "variable": "pt_decimal_ceiling_debit", + "value":{ + "path": "$.billDetails[(@.length-1)].billAccountDetails[?(@.taxHeadCode == 'PT_DECIMAL_CEILING_DEBIT')].amount" + } + }, + { + "variable": "pt_decimal_ceiling_credit", + "value":{ + "path": "$.billDetails[(@.length-1)].billAccountDetails[?(@.taxHeadCode == 'PT_DECIMAL_CEILING_CREDIT')].amount" + } + }, + { + "variable": "pt_roundoff", + "value":{ + "path": "$.billDetails[(@.length-1)].billAccountDetails[?(@.taxHeadCode == 'PT_ROUNDOFF')].amount" + } + }, + { + "variable": "pt_arrearrs", + "value":{ + "path": "$.billDetails[(@.length-1)].amount" + } + }, + { + "variable": "pt_advance_carryforward", + "value":{ + "path": "$.billDetails[(@.length-1)].billAccountDetails[?(@.taxHeadCode == 'PT_ADVANCE_CARRYFORWARD')].amount" + } + }, + { + "variable": "consumerID", + "value": { + "path": "$.consumerCode" + } + }, + { + "variable": "date", + "value": { + "path": "$.billDate" + }, + "type": "date" + }, + { + "variable": "totalPayment", + "value": { + "path": "$.billDetails[0].amountPaid" + } + }, + { + "variable":"scissorImage", + "url":"http://www.pngall.com/wp-content/uploads/2016/03/Scissor-PNG-Clipart.png", + "type":"image" + }, + + { + "variable": "adhoc_penalty_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ADHOC_PENALTY" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "adhoc_rebate_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ADHOC_REBATE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "owner_exemption_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_OWNER_EXEMPTION" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "unit_usage_exemption_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_UNIT_USAGE_EXEMPTION" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "fire_cess_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_FIRE_CESS" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "cancer_cess_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_CANCER_CESS" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "time_interest_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_TIME_INTEREST" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "decimal_ceiling_debit_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_DECIMAL_CEILING_DEBIT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "decimal_ceiling_credit_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_DECIMAL_CEILING_CREDIT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "advance_carryforward_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_DECIMAL_ADVANCE_CARRYFORWARD" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "roundoff_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_DECIMAL_ADVANCE_ROUNDOFF" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "arrears_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_DECIMAL_ARREARS" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + } + ] + }, + { + "derived": [ + { + "variable": "charge", + "formula": "{{fees}}" + }, + { + "variable": "penalty", + "formula": "{{pt_penalty}}" + }, + { + "variable": "rebate", + "formula": "{{pt_rebate}}" + }, + { + "variable": "adhoc_penalty", + "formula": "{{pt_adhoc_penalty}}" + }, + { + "variable": "adhoc_rebate", + "formula": "{{pt_adhoc_rebate}}" + }, + { + "variable": "owner_exemption", + "formula": "{{pt_owner_exemption}}" + }, + { + "variable": "unit_usage_exemption", + "formula": "{{pt_unit_usage_exemption}}" + }, + { + "variable": "fire_cess", + "formula": "{{pt_owner_exemption}}" + }, + { + "variable": "cancer_cess", + "formula": "{{pt_cancer_cess}}" + }, + { + "variable": "time_interest", + "formula": "{{pt_time_interest}}" + }, + { + "variable": "decimal_ceiling_debit", + "formula": "{{pt_decimal_ceiling_debit}}" + }, + { + "variable": "decimal_ceiling_credit", + "formula": "{{pt_decimal_ceiling_credit}}" + }, + { + "variable": "advance_carryforward", + "formula": "{{pt_advance_carryforward}}" + }, + { + "variable": "roundoff", + "formula": "{{pt_roundoff}}" + }, + { + "variable": "arrearrs", + "formula": "{{totalAmountDue}} - {{pt_arrearrs}}" + } + ] + }, + { + "externalAPI": [ + { + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", + "apiRequest": null, + "responseMapping":[ + { + "variable":"address", + "value":"$.MdmsRes.tenant.tenants[0].address" + }, + { + "variable":"phoneNumber", + "value":"$.MdmsRes.tenant.tenants[0].contactNumber" + }, + { + "variable":"website", + "value":"$.MdmsRes.tenant.tenants[0].domainUrl" + }, + { + "variable":"email", + "value":"$.MdmsRes.tenant.tenants[0].emailId" + }, + { + "variable": "logoImage", + "value":"$.MdmsRes.tenant.tenants[0].logoId", + "type": "image" + }, + { + "variable": "logo_header", + "value":"$.MdmsRes.tenant.tenants[0].code", + "localisation":{ + "required":true, + "prefix": "TENANT_TENANTS", + "module":"rainmaker-common" + } + } + ] + }, + { + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "queryParam": "moduleName=tenant&masterName=footer&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}' %26%26 @.service=='{$.businessService}')%5D", + "apiRequest": null, + "responseMapping":[ + { + "variable": "variable11", + "value": "$.MdmsRes.tenant.footer[0].billFooterContent.*", + "type":"array", + "format":{ + "type":"string", + "scema":[ + { + "variable":"disclaimerContent", + "value":"disclaimer", + "type":"string", + "localisation":{ + "required":true, + "prefix": null, + "module": "rainmaker-common" + } + } + ] + } + } + ] + } + ] + } + ] + } + ] + } +} diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json new file mode 100644 index 00000000..82b0d51c --- /dev/null +++ b/configs/pdf-service/data-config/property-receipt.json @@ -0,0 +1,442 @@ +{ + "key": "property-receipt", + "documentType": "PROPERTYRECEIPT", + "DataConfigs": { + "moduleName": "PT", + "version": "1.0.0", + "baseKeyPath": "$.Payments.*", + "entityIdPath":"$.id", + "isCommonTableBorderRequired": true, + "mappings": [ + { + "topic": "common-pdf-generation-3", + "mappings": [ + { + "direct": [ + { + "variable": "payerName", + "value": { + "path": "$.payerName" + } + }, + { + "variable": "user-name", + "value": { + "path": "$.userInfo.name" + }, + "type":"selectFromRequestInfo" + }, + { + "variable": "payerContact", + "value": { + "path": "$.mobileNumber" + } + }, + { + "variable": "receiptNo", + "value": { + "path": "$.paymentDetails[0].receiptNumber" + } + }, + { + "variable": "serviceType", + "value": { + "path": "$.paymentDetails[0].businessService" + }, + "localisation":{ + "required":true, + "prefix":"MODULE", + "module":"rainmaker-common" + } + }, + { + "variable": "paidAmount", + "value": { + "path": "$.paymentDetails[0].totalAmountPaid" + } + }, + { + "variable": "fromPeriod", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].fromPeriod" + }, + "type": "date" + }, + { + "variable": "toPeriod", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].toPeriod" + }, + "type": "date" + }, + { + "variable": "paymentMode", + "value": { + "path": "$.paymentMode" + }, + "localisation":{ + "required":true, + "prefix": "COMMON_MASTERS_PAYMENTMODE", + "module": "rainmaker-common" + } + }, + { + "variable": "G8ReceiptNo", + "value": { + "path": "$.paymentDetails[0].manualReceiptNumber" + } + }, + { + "variable": "G8ReceiptDate", + "value": { + "path": "$.paymentDetails[0].manualReceiptDate" + }, + "type": "date" + }, + { + "variable": "paymentDate", + "value": { + "path": "$.transactionDate" + }, + "type": "date" + }, + { + "variable": "consumerID", + "value": { + "path": "$.paymentDetails[0].bill.consumerCode" + } + }, + { + "variable": "transactionID", + "value": { + "path": "$.transactionNumber" + } + }, + { + "variable": "dueAmount", + "value": { + "path": "$.paymentDetails[0].totalDue" + } + }, + { + "variable": "payment_receipt", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_RECEIPT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "receipt_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_RECEIPT_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "consumer_id", + "value": { + "path": "$.paymentDetails[0].businessService" + }, + "localisation":{ + "required":true, + "prefix": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_CONSUMER_ID", + "module":"rainmaker-common" + } + }, + { + "variable": "payment_date", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_DATE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payer_name", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYER_NAME" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payer_contact", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYER_CONTACT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "service_type", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_SERVICE_TYPE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "billing_period", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_BILLING_PERIOD" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "paid_amount", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAID_AMOUNT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "pending_amount", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PENDING_AMOUNT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payment_mode", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_MODE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "transaction_id", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_TRANSACTION_ID" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "g8_receipt_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_G8_RECEIPT_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "g8_receipt_date", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_G8_RECEIPT_DATE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "generated_by", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_GENERATED_BY" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "commissioner/eo", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_COMMISSIONER_EO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "no_signature", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_NO_SIGNATURE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "disclamer", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "to", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_TO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "Municipal_Corporation", + "value": { + "path": "PDF_STATIC_LABEL_MDMS_MUNICIPAL_CORPORATION" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + } + ] + }, + { + "derived": [ + { + "variable": "pendingAmount", + "formula": "{{dueAmount}}-{{paidAmount}}" + } + ] + }, + { + "externalAPI": [ + { + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", + "apiRequest": null, + "responseMapping":[ + { + "variable":"address", + "value":"$.MdmsRes.tenant.tenants[0].address" + }, + { + "variable":"phoneNumber", + "value":"$.MdmsRes.tenant.tenants[0].contactNumber" + }, + { + "variable":"website", + "value":"$.MdmsRes.tenant.tenants[0].domainUrl" + }, + { + "variable":"email", + "value":"$.MdmsRes.tenant.tenants[0].emailId" + }, + { + "variable": "logoImage", + "value":"$.MdmsRes.tenant.tenants[0].logoId", + "type":"image" + }, + { + "variable": "logo-header", + "value":"$.MdmsRes.tenant.tenants[0].code", + "localisation":{ + "required":true, + "prefix": "TENANT_TENANTS", + "module":"rainmaker-common" + } + } + ] + }, + { + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "queryParam": "moduleName=tenant&masterName=footer&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}' %26%26 @.service=='{$.paymentDetails[0].businessService}')%5D", + "apiRequest": null, + "responseMapping":[ + { + "variable": "variable11", + "value": "$.MdmsRes.tenant.footer[0].receiptFooterContent.*", + "type":"array", + "format":{ + "type":"string", + "scema":[ + { + "variable":"disclaimerContent", + "value":"disclaimer", + "type":"string", + "localisation":{ + "required":true, + "prefix": null, + "module": "rainmaker-common" + } + } + ] + } + } + ] + } + ] + } + ] + } + ] + } +} diff --git a/configs/pdf-service/data-config/pt-receipt.json b/configs/pdf-service/data-config/pt-receipt.json new file mode 100644 index 00000000..56e0706e --- /dev/null +++ b/configs/pdf-service/data-config/pt-receipt.json @@ -0,0 +1,273 @@ +{ + + "key":"pt-receipt", + "DataConfigs": { + "serviceName": "rainmaker-pt", + "version": "1.0.0", + "baseKeyPath": "$.Properties.*", + "entityIdPath":"$.propertyId", + "isCommonTableBorderRequired":true, + "mappings": [ + { + "topic": "pt-pdf-generation", + "staticConfigPath": "https://raw.githubusercontent.com/egovernments/egov-services/vishal-feature-filestore/core/egov-indexer/src/main/resources/rainmaker-pgr-indexer.yml", + "mappings": [ + { + "direct": [ + { + "variable": "variable1", + "value": { + "path":"$.propertyDetails[0].financialYear" + } + }, + { + "variable": "variable38", + "url":"https://raw.githubusercontent.com/egovernments/egov-web-app/master/web/rainmaker/dev-packages/egov-ui-kit-dev/src/assets/images/pblogo.png", + "type":"image" + }, + { + "variable": "variable35", + "value": { + "path":"$.tenantId" + }, + "localisation":{ + "required":true, + "prefix":"TENANT_TENANTS", + "module":"rainmaker-common" + }, + "isUpperCaseRequired":true + }, + { + "variable": "variable36", + "type":"citizen-employee-title" + }, + { + "variable":"variable2", + "value":{ + "path":"$.oldPropertyId" + } + }, + { + "variable": "variable3", + "value":{ + "path":"$.propertyId" + } + }, + { + "variable": "variable4", + "value":{ + "path":"$.propertyDetails[0].assessmentNumber" + } + }, + { + "variable": "variable5", + "value":{ + "path":"$.address.doorNo" + } + }, + { + "variable": "variable6", + "value":{ + "path":"$.address.buildingName" + } + }, + { + "variable": "variable7", + "value":{ + "path":"$.address.street" + } + }, + { + "variable": "variable8", + "value":{ + "path":"$.address.locality.name" + } + }, + { + "variable": "variable9", + "value":{ + "path":"$.propertyDetails[0].landArea" + } + }, + { + "variable": "variable10", + "value":{ + "path":"$.propertyDetails[0].propertySubType" + }, + "localisation":{ + "required":true, + "prefix":"PROPERTYTAX_BILLING_SLAB", + "module":"rainmaker-pt" + } + }, + { + "variable": "variable11", + "value":{ + "path":"$.propertyDetails[0].owners.*" + }, + "type":"array", + "format":{ + "type":"string", + "scema":[ + { + "key":"name" + }, + { + "key":"fatherOrHusbandName" + }] + } + }, + { + "variable": "variable12", + "value":{ + "path":"$.propertyDetails[0].units.*" + }, + "type":"array-column", + "format":{ + "type":"string", + "scema":[ + { + "key":"floorNo", + "localisation":{ + "required":true, + "prefix":"PROPERTYTAX_FLOOR", + "module":"rainmaker-pt" + } + + }, + { + "key":"usageCategoryMinor", + "localisation":{ + "required":true, + "prefix":"PROPERTYTAX_BILLING_SLAB", + "module":"rainmaker-pt" + } + + }, + { + "key":"usageCategoryDetail", + "localisation":{ + "required":true, + "prefix":"PROPERTYTAX_BILLING_SLAB", + "module":"rainmaker-pt" + } + }, + { + "key":"occupancyType", + "localisation":{ + "required":true, + "prefix":"PROPERTYTAX_OCCUPANCYTYPE", + "module":"rainmaker-pt" + } + }, + { + "key":"unitArea" + }] + } + } + ] + }, + { + "derived": [ + { + "variable": "variable37", + "formula": "{{variable34}}-{{variable27}}" + } + ] + }, + { + "externalAPI": [ + { + "path": "http://collection-services:8080/collection-services/receipts/_search", + "queryParam": "consumerCode=$.propertyId:$.propertyDetails[0].assessmentNumber", + "apiRequest": null, + "responseMapping":[ + { + "variable":"variable15", + "value":"$.Receipt[0].receiptNumber" + }, + { + "variable":"variable16", + "value":"$.Receipt[0].receiptDate" + }, + { + "variable":"variable17", + "value":"$.Receipt[0].Bill[0].billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_TAX')].amount" + }, + { + "variable":"variable18", + "value":"$.Receipt[0].Bill[0].billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_FIRE_CESS')].amount" + }, + { + "variable":"variable19", + "value":"$.Receipt[0].Bill[0].billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_CANCER_CESS')].amount" + }, + { + "variable":"variable20", + "value":"$.Receipt[0].Bill[0].billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_TIME_PENALTY')].amount" + }, + { + "variable":"variable21", + "value":"$.Receipt[0].Bill[0].billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_TIME_REBATE')].amount" + }, + { + "variable":"variable22", + "value":"$.Receipt[0].Bill[0].billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_TIME_INTEREST')].amount" + }, + { + "variable":"variable23", + "value":"$.Receipt[0].Bill[0].billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_UNIT_USAGE_EXEMPTION')].amount" + }, + { + "variable":"variable24", + "value":"$.Receipt[0].Bill[0].billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_OWNER_EXEMPTION')].amount" + }, + { + "variable":"variable25", + "value":"$.Receipt[0].Bill[0].billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_ROUNDOFF')].amount" + }, + { + "variable":"variable26", + "value":"$.Receipt[0].Bill[0].billDetails[0].totalAmount" + }, + { + "variable":"variable27", + "value":"$.Receipt[0].Bill[0].billDetails[0].amountPaid" + }, + { + "variable":"variable28", + "value":"$.Receipt[0].instrument.instrumentType.name" + }, + { + "variable":"variable29", + "value":"$.Receipt[0].instrument.bank.name" + }, + { + "variable":"variable30", + "value":"$.Receipt[0].transactionId" + }, + { + "variable":"variable31", + "value":"$.Receipt[0].instrument.transactionDateInput" + }, + { + "variable":"variable32", + "value":"$.Receipt[0].Bill[0].billDetails[0].manualReceiptNumber" + }, + { + "variable":"variable33", + "value":"$.Receipt[0].Bill[0].billDetails[0].manualReceiptDate" + }, + { + "variable":"variable34", + "value":"$.Receipt[0].Bill[0].billDetails[0].totalAmount" + } + ] + } + ] + } + ] + } + ] + } +} diff --git a/configs/pdf-service/data-config/ptmutationcertificate.json b/configs/pdf-service/data-config/ptmutationcertificate.json new file mode 100644 index 00000000..42326bdc --- /dev/null +++ b/configs/pdf-service/data-config/ptmutationcertificate.json @@ -0,0 +1,380 @@ +{ + "key": "ptmutationcertificate", + "documentType": "PTMUTATION", + "DataConfigs": { + "moduleName": "PT", + "version": "1.0.0", + "baseKeyPath": "$.Properties.*", + "entityIdPath":"$.id", + "isCommonTableBorderRequired": true, + "mappings": [ + { + "mappings": [ + { + "direct": [ + + { + "variable": "municipal_corportaion", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_MUNICIPAL_CORPORATION" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "corporation_fax", + "value": { + "path": "PDF_STATIC_LABEL_MUTATION_FAX" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "corporation_website", + "value": { + "path": "PDF_STATIC_LABEL_MUTATION_WEBSITE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "corporation_email", + "value": { + "path": "PDF_STATIC_LABEL_MUTATION_EMAIL" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "Mutation_Approval_Certificate", + "value": { + "path": "PDF_STATIC_LABEL_MUATATION_APPROVAL_CERTIFICATE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "Property_ID_Label", + "value": { + "path": "PDF_STATIC_LABEL_MUATATION_PROPERTY_ID_LABEL" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "Mutation_Number_Label", + "value": { + "path": "PDF_STATIC_LABEL_MUATATION_NUMBER_LABEL" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "Application_Number_Label", + "value": { + "path": "PDF_STATIC_LABEL_APPLICATION_NUMBER_LABEL" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "Receipt_Number_Label", + "value": { + "path": "PDF_STATIC_LABEL_RECEIPT_NUMBER_LABEL" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "Approval_Date_Label", + "value": { + "path": "PDF_STATIC_LABEL_APPROVAL_DATE_LABEL" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "Order_Label", + "value": { + "path": "PDF_STATIC_LABEL_ORDER_LABEL" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "Mutation_Declaration_Label", + "value": { + "path": "$.tenantId" + }, + "localisation":{ + "required":true, + "prefix": "PDF_STATIC_LABEL_MUTATION_DECLARATION_LABEL", + "module":"rainmaker-common" + } + }, + { + "variable": "Transferrer_Details_Label", + "value": { + "path": "PDF_STATIC_LABEL_TRANSFERRER_LABEL" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "Transferree_Details_Label", + "value": { + "path": "PDF_STATIC_LABEL_TRANSFERREE_LABEL" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "Mutation_To_Label", + "value": { + "path": "PDF_STATIC_LABEL_MUTATION_TO_LABEL" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "Shri_Smt_Label", + "value": { + "path": "PDF_STATIC_LABEL_SHRI_SMT_LABEL" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "approved_by", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_APPROVED_BY" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "commissioner", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_COMMISSIONER" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "Property_ID", + "value": { + "path": "$.propertyId" + } + }, + { + "variable": "Mutation_Number", + "value": { + "path": "$.acknowldgementNumber" + } + }, + { + "variable": "Application_Number", + "value": { + "path": "$.acknowldgementNumber" + } + }, + { + "variable": "Transferrer_Name", + "value": { + "path": "$.owners[?(@.status == 'INACTIVE')].name" + } + }, + { + "variable": "Transferrer_Relation", + "value": { + "path": "$.owners[?(@.status == 'INACTIVE')].relationship" + }, + "localisation":{ + "required":true, + "prefix": "PT_MUTATION", + "module": "rainmaker-common" + } + }, + { + "variable": "Transferrer_Relative_Name", + "value": { + "path": "$.owners[?(@.status == 'INACTIVE')].fatherOrHusbandName" + } + }, + { + "variable": "Transferree_Name", + "value": { + "path": "$.owners[?(@.status == 'ACTIVE')].name" + } + }, + { + "variable": "Transferree_Relation", + "value": { + "path": "$.owners[?(@.status == 'ACTIVE')].relationship" + }, + "localisation":{ + "required":true, + "prefix": "PT_MUTATION", + "module": "rainmaker-common" + } + }, + { + "variable": "Transferree_Relative_Name", + "value": { + "path": "$.owners[?(@.status == 'ACTIVE')].fatherOrHusbandName" + } + }, + { + "variable": "Transferree_Address", + "value": { + "path": "$.owners[?(@.status == 'ACTIVE')].permanentAddress" + } + }, + { + "variable": "Transferree_City", + "value": { + "path": "$.owners[?(@.status == 'ACTIVE')].permanentCity" + } + } + ] + }, + { + "externalAPI": [ + { + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", + "apiRequest": null, + "responseMapping":[ + { + "variable":"ULB_LOGO", + "value":"$.MdmsRes.tenant.tenants[0].logoId", + "type": "image" + }, + { + "variable":"ULB_ADDRESS", + "value":"$.MdmsRes.tenant.tenants[0].address" + }, + { + "variable":"ULB_CITY", + "value":"$.MdmsRes.tenant.tenants[0].name" + }, + { + "variable":"CorporationContact_Value", + "value":"$.MdmsRes.tenant.tenants[0].contactNumber" + }, + { + "variable":"corporationWebsite", + "value":"$.MdmsRes.tenant.tenants[0].domainUrl" + }, + { + "variable":"corporationEmail", + "value":"$.MdmsRes.tenant.tenants[0].emailId" + } + ] + }, + { + "path": "http://collection-services:8080/collection-services/payments/_search", + "queryParam": "tenantId=$.tenantId,consumerCodes=$.acknowldgementNumber,businessServices=PT.MUTATION", + "apiRequest": null, + "responseMapping":[ + { + "variable":"Receipt_Number", + "value":"$.Payments[0].paymentDetails[0].receiptNumber" + } + + ] + }, + { + "path": "http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search", + "queryParam": "businessIds=$.acknowldgementNumber,history=true,tenantId=$.tenantId", + "apiRequest": null, + "responseMapping":[ + { + "variable":"approved_by_value", + "value":"$.ProcessInstances[?(@.action == 'APPROVE')].assigner.name" + }, + { + "variable":"Approval_Date", + "value":"$.ProcessInstances[?(@.action == 'APPROVE')].auditDetails.lastModifiedTime", + "type": "date" + } + + ] + } + + ] + } + ] + +} +] +} +} diff --git a/configs/pdf-service/data-config/testconsolidatedreceipt.json b/configs/pdf-service/data-config/testconsolidatedreceipt.json new file mode 100644 index 00000000..7e996bb4 --- /dev/null +++ b/configs/pdf-service/data-config/testconsolidatedreceipt.json @@ -0,0 +1,476 @@ +{ + "key": "testconsolidatedreceipt", + "documentType":"CONSOLIDATED_RECEIPT", + "DataConfigs": { + "moduleName": "rainmaker-common", + "version": "1.0.0", + "baseKeyPath": "$.Payments.*", + "entityIdPath":"$.id", + "isCommonTableBorderRequired": true, + "mappings": [ + { + "topic": "common-pdf-generation-3", + "mappings": [ + { + "direct": [ + { + "variable": "payerName", + "value": { + "path": "$.payerName" + } + }, + { + "variable": "user-name", + "value": { + "path": "$.userInfo.name" + }, + "type":"selectFromRequestInfo" + }, + { + "variable": "payerContact", + "value": { + "path": "$.mobileNumber" + } + }, + { + "variable": "receiptNo", + "value": { + "path": "$.paymentDetails[0].receiptNumber" + } + }, + { + "variable": "serviceType", + "value": { + "path": "$.paymentDetails[0].businessService" + }, + "localisation":{ + "required":true, + "prefix":"MODULE", + "module":"rainmaker-common" + } + }, + { + "variable": "paidAmount", + "value": { + "path": "$.paymentDetails[0].totalAmountPaid" + } + }, + { + "variable": "fromPeriod", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].fromPeriod" + }, + "type": "date" + }, + { + "variable": "toPeriod", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].toPeriod" + }, + "type": "date" + }, + { + "variable": "paymentMode", + "value": { + "path": "$.paymentMode" + }, + "localisation":{ + "required":true, + "prefix": "COMMON_MASTERS_PAYMENTMODE", + "module": "rainmaker-common" + } + }, + { + "variable": "G8ReceiptNo", + "value": { + "path": "$.paymentDetails[0].manualReceiptNumber" + } + }, + { + "variable": "G8ReceiptDate", + "value": { + "path": "$.paymentDetails[0].manualReceiptDate" + }, + "type": "date" + }, + { + "variable": "paymentDate", + "value": { + "path": "$.transactionDate" + }, + "type": "date" + }, + { + "variable": "consumerID", + "value": { + "path": "$.paymentDetails[0].bill.consumerCode" + } + }, + { + "variable": "transactionID", + "value": { + "path": "$.transactionNumber" + } + }, + { + "variable": "dueAmount", + "value": { + "path": "$.paymentDetails[0].totalDue" + } + }, + { + "variable": "payment_receipt", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_RECEIPT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "receipt_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_RECEIPT_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "consumer_id", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_CONSUMER_ID" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payment_date", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_DATE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payer_name", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYER_NAME" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payer_contact", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYER_CONTACT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "service_type", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_SERVICE_TYPE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "billing_period", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_BILLING_PERIOD" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "paid_amount", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAID_AMOUNT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "pending_amount", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PENDING_AMOUNT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payment_mode", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_MODE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "transaction_id", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_TRANSACTION_ID" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "g8_receipt_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_G8_RECEIPT_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "g8_receipt_date", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_G8_RECEIPT_DATE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "generated_by", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_GENERATED_BY" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "commissioner/eo", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_COMMISSIONER_EO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "no_signature", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_NO_SIGNATURE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "disclamer", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "disclamer_1", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_FIRST_LINE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "disclamer_2", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_SECOND_LINE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "disclamer_3", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_THIRD_LINE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "disclamer_4", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_FOURTH_LINE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "disclamer_5", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_FIFTH_LINE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "to", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_TO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "Municipal_Corporation", + "value": { + "path": "PDF_STATIC_LABEL_MDMS_MUNICIPAL_CORPORATION" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + } + ] + }, + { + "derived": [ + { + "variable": "pendingAmount", + "formula": "{{dueAmount}}-{{paidAmount}}" + } + ] + }, + { + "externalAPI": [ + { + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", + "apiRequest": null, + "responseMapping":[ + { + "variable":"address", + "value":"$.MdmsRes.tenant.tenants[0].address" + }, + { + "variable":"phoneNumber", + "value":"$.MdmsRes.tenant.tenants[0].contactNumber" + }, + { + "variable":"website", + "value":"$.MdmsRes.tenant.tenants[0].domainUrl" + }, + { + "variable":"email", + "value":"$.MdmsRes.tenant.tenants[0].emailId" + }, + { + "variable": "logoImage", + "value":"$.MdmsRes.tenant.tenants[0].logoId", + "type":"image" + }, + { + "variable": "logo-header", + "value":"$.MdmsRes.tenant.tenants[0].code", + "localisation":{ + "required":true, + "prefix": "TENANT_TENANTS", + "module":"rainmaker-common" + } + } + ] + } + ] + } + ] + } + ] + } +} diff --git a/configs/pdf-service/data-config/testlocalconsolidatedbill.json b/configs/pdf-service/data-config/testlocalconsolidatedbill.json new file mode 100644 index 00000000..a9d8bf77 --- /dev/null +++ b/configs/pdf-service/data-config/testlocalconsolidatedbill.json @@ -0,0 +1,535 @@ +{ + "key": "testlocalconsolidatedbill", + "DataConfigs": { + "serviceName": "rainmaker-common", + "version": "1.0.0", + "baseKeyPath": "$.Bill.*", + "entityIdPath":"$.billNumber", + "isCommonTableBorderRequired": true, + "mappings": [ + { + "topic": "common-pdf-generation-1", + "staticConfigPath": "https://raw.githubusercontent.com/egovernments/egov-services/vishal-feature-filestore/core/egov-indexer/src/main/resources/rainmaker-pgr-indexer.yml", + "mappings": [ + { + "direct": [ + { + "variable": "logoImage", + "url": "https://raw.githubusercontent.com/egovernments/egov-web-app/master/web/rainmaker/dev-packages/egov-ui-kit-dev/src/assets/images/pblogo.png", + "type": "image" + }, + { + "variable": "logo_header", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_LOGO_HEADER" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "total_amount_due", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_TOTAL_AMOUNT_DUE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payer_name", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PAYER_NAME" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "bill_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_BILL_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "mobile_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_MOBILE_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "bill_period", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_BILL_PERIOD" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payer_address", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PAYER_ADDRESS" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + + { + "variable": "bill_issue_date", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ISSUE_DATE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "bill_due_date", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_BILL_DUE_DATE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "billing_summary_property_tax", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_BILLING_SUMMARY" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "property_id", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PROPERTY_ID" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "arrears_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ARREARS" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "charge_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_CHARGE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + + { + "variable": "penalty_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PENALTY" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "rebate_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_REBATE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "others_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_OTHERS" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "total_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_TOTAL" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "important_message", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_IMPORTANT_MESSAGE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payment_received", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PAYMENT_RECEIVED" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "this_document", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_THIS_DOCUMENT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "this_is_a", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_THIS_IS" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "assessment_payment", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ASSESSSMENT_PAYMENT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "please_deposit", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PLEASE_DEPOSIT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "if_the_tax", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_IF_THE_TAX" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "acknowledgement_for", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ACKNOWLEDGEMENT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "date_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_DATE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "consumer_id", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_CONSUMER_ID" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "name_address", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_NAME_ADDRESS" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "total_payment", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_TOTAL_PAYMENT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "receivers_signature", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_RECEIVERS_SIGNATURE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "totalAmountDue", + "value": { + "path": "$.totalAmount" + } + }, + { + "variable": "total", + "value": { + "path": "$.totalAmount" + } + }, + + { + "variable": "payerName", + "value": { + "path": "$.payerName" + } + }, + + { + "variable": "mobileNo", + "value": { + "path": "$.mobileNumber" + } + }, + + { + "variable": "payerAddress", + "value": { + "path": "$.payerAddress" + } + }, + { + "variable": "nameAddress", + "value": { + "path": "$.payerAddress" + } + }, + + { + "variable": "billNo", + "value": { + "path": "$.billNumber" + } + }, + { + "variable": "fromPeriod", + "value": { + "path": "$.billDetails[0].fromPeriod" + } + }, + { + "variable": "toPeriod", + "value": { + "path": "$.billDetails[0].toPeriod" + } + }, + + { + "variable": "billIssueDate", + "value": { + "path": "$.billDate" + } + }, + + { + "variable": "billDueDate", + "value": { + "path": "$.billDetails[0].expiryDate" + } + }, + + { + "variable": "propertyID", + "value": { + "path": "$.consumerCode" + } + }, + + { + "variable": "arrears", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_TIME_PENALTY')].amount" + } + }, + + { + "variable": "charge", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_TIME_REBATE')].amount" + } + }, + + { + "variable": "rebate", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_TIME_REBATE')].amount" + } + }, + + { + "variable": "penalty", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_TIME_REBATE')].amount" + } + }, + + { + "variable": "others", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_TAX')].amount" + } + }, + + { + "variable": "consumerID", + "value": { + "path": "$.consumerCode" + } + }, + { + "variable": "date", + "value": { + "path": "$.billDate" + } + }, + { + "variable": "totalPayment", + "value": { + "path": "$.billDetails[0].amountPaid" + } + }, + { + "variable":"scissorImage", + "url":"https://raw.githubusercontent.com/egovernments/egov-web-app/master/web/rainmaker/dev-packages/egov-ui-kit-dev/src/assets/images/pblogo.png", + "type":"image" + } + ] + }, + { + "derived": [ + { + "variable": "variable19", + "formula": "{{totalPayment}}-{{totalPayment}}" + } + ] + } + ] + } + ] + } + } \ No newline at end of file diff --git a/configs/pdf-service/data-config/testlocalconsolidatedreceipt.json b/configs/pdf-service/data-config/testlocalconsolidatedreceipt.json new file mode 100644 index 00000000..1c5af18a --- /dev/null +++ b/configs/pdf-service/data-config/testlocalconsolidatedreceipt.json @@ -0,0 +1,457 @@ +{ + "key": "consolidatedreceipt", + "DataConfigs": { + "serviceName": "rainmaker-common", + "version": "1.0.0", + "baseKeyPath": "$.Payments.*", + "entityIdPath":"$.paymentDetails[0].receiptNumber", + "isCommonTableBorderRequired": true, + "mappings": [ + { + "topic": "common-pdf-generation-3", + "mappings": [ + { + "direct": [ + { + "variable": "payerName", + "value": { + "path": "$.payerName" + } + }, + { + "variable": "user-name", + "value": { + "path": "$.userInfo.name" + }, + "type":"selectFromRequestInfo" + }, + { + "variable": "payerContact", + "value": { + "path": "$.mobileNumber" + } + }, + { + "variable": "receiptNo", + "value": { + "path": "$.paymentDetails[0].receiptNumber" + } + }, + { + "variable": "serviceType", + "value": { + "path": "$.paymentDetails[0].businessService" + }, + "localisation":{ + "required":true, + "prefix":"MODULE", + "module":"rainmaker-common" + } + }, + { + "variable": "paidAmount", + "value": { + "path": "$.paymentDetails[0].totalAmountPaid" + } + }, + { + "variable": "fromPeriod", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].fromPeriod" + } + }, + { + "variable": "toPeriod", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].toPeriod" + } + }, + { + "variable": "paymentMode", + "value": { + "path": "$.paymentMode" + } + }, + { + "variable": "G8ReceiptNo", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].manualReceiptNumber" + } + }, + { + "variable": "G8ReceiptDate", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].manualReceiptDate" + } + }, + { + "variable": "paymentDate", + "value": { + "path": "$.transactionDate" + } + }, + { + "variable": "consumerID", + "value": { + "path": "$.paymentDetails[0].bill.consumerCode" + } + }, + { + "variable": "transactionID", + "value": { + "path": "$.transactionNumber" + } + }, + { + "variable": "dueAmount", + "value": { + "path": "$.paymentDetails[0].totalDue" + } + }, + { + "variable": "logoImage", + "url":"https://raw.githubusercontent.com/egovernments/egov-web-app/master/web/rainmaker/dev-packages/egov-ui-kit-dev/src/assets/images/pblogo.png", + "type":"image" + }, + { + "variable": "logo-header", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT.LOGO.HEADER" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": "", + "module":"rainmaker-common" + } + }, + { + "variable": "payment_receipt", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_RECEIPT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "receipt_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_RECEIPT_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "consumer_id", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_CONSUMER_ID" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payment_date", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_DATE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payer_name", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYER_NAME" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payer_contact", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYER_CONTACT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "service_type", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_SERVICE_TYPE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "billing_period", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_BILLING_PERIOD" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "paid_amount", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAID_AMOUNT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "pending_amount", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PENDING_AMOUNT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payment_mode", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_MODE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "transaction_id", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_TRANSACTION_ID" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "g8_receipt_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_G8_RECEIPT_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "g8_receipt_date", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_G8_RECEIPT_DATE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "generated_by", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_GENERATED_BY" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "commissioner/eo", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_COMMISSIONER_EO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "no_signature", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_NO_SIGNATURE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "disclamer", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "disclamer_1", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_FIRST_LINE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "disclamer_2", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_SECOND_LINE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "disclamer_3", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_THIRD_LINE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "disclamer_4", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_FOURTH_LINE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "disclamer_5", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_FIFTH_LINE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "to", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_TO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + } + ] + }, + { + "derived": [ + { + "variable": "pendingAmount", + "formula": "{{dueAmount}}-{{paidAmount}}" + } + ] + }, + { + "externalAPI": [ + { + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='$.tenantId')%5D", + "apiRequest": null, + "responseMapping":[ + { + "variable":"address", + "value":"$.MdmsRes.tenant.tenants[0].address" + }, + { + "variable":"phoneNumber", + "value":"$.MdmsRes.tenant.tenants[0].contactNumber" + }, + { + "variable":"website", + "value":"$.MdmsRes.tenant.tenants[0].domainUrl" + }, + { + "variable":"email", + "value":"$.MdmsRes.tenant.tenants[0].emailId" + } + ] + } + ] + } + ] + } + ] + } +} \ No newline at end of file diff --git a/configs/pdf-service/data-config/tl-receipt.json b/configs/pdf-service/data-config/tl-receipt.json new file mode 100644 index 00000000..a97933bd --- /dev/null +++ b/configs/pdf-service/data-config/tl-receipt.json @@ -0,0 +1,236 @@ +{ + "key":"tl-receipt", + "DataConfigs": { + "serviceName": "rainmaker-tl", + "version": "1.0.0", + "baseKeyPath": "$.Licenses.*", + "entityIdPath":"$.applicationNumber", + "isCommonTableBorderRequired":true, + "mappings": [ + { + "topic": "tl-pdf-generation", + "staticConfigPath": "https://raw.githubusercontent.com/egovernments/egov-services/vishal-feature-filestore/core/egov-indexer/src/main/resources/rainmaker-pgr-indexer.yml", + "mappings": [ + { + "direct": [ + + { + "variable": "variable1", + "value": { + "path":"$.tradeLicenseDetail.additionalDetail.applicationType" + }, + "localisation":{ + "required":true, + "prefix":"TRADELICENSE_APPLICATIONTYPE", + "module":"rainmaker-tl" + } + }, + { + "variable": "variable33", + "url":"https://s3.ap-south-1.amazonaws.com/pb-egov-assets/pb.amritsar/logo.png", + "type":"image" + }, + { + "variable": "variable30", + "value": { + "path":"$.tenantId" + }, + "localisation":{ + "required":true, + "prefix":"TENANT_TENANTS", + "module":"rainmaker-common" + }, + "isUpperCaseRequired":true + }, + { + "variable": "variable31", + "type":"citizen-employee-title" + }, + { + "variable": "variable2", + "value": { + "path":"$.oldLicenseNumber" + } + }, + { + "variable": "variable3", + "value":{ + "path":"$.applicationNumber" + } + }, + { + "variable": "variable4", + "value": { + "path":"$.financialYear" + } + }, + { + "variable": "variable5", + "value": { + "path":"$.tradeName" + } + }, + { + "variable": "variable6", + "value": { + "path":"$.tradeLicenseDetail.tradeUnits[*].tradeType" + }, + "localisation":{ + "required":true, + "prefix":"TRADELICENSE_TRADETYPE", + "module":"rainmaker-tl", + "isCategoryRequired":true + } + }, + { + "variable": "variable7", + "value": { + "path":"$.tradeLicenseDetail.tradeUnits[*].tradeType" + }, + "localisation":{ + "required":true, + "prefix":"TRADELICENSE_TRADETYPE", + "module":"rainmaker-tl", + "isMainTypeRequired":true, + "isSubTypeRequired":true + } + }, + { + "variable": "variable8", + "value": { + "path":"$.tradeLicenseDetail.accessories[*].accessoryCategory" + }, + "localisation":{ + "required":true, + "prefix":"TRADELICENSE_ACCESSORIESCATEGORY", + "module":"rainmaker-tl" + } + }, + { + "variable": "variable9", + "value": { + "path":"$.tradeLicenseDetail.address.doorNo" + } + }, + { + "variable": "variable10", + "value": { + "path":"$.tradeLicenseDetail.address.buildingName" + } + }, + { + "variable": "variable11", + "value": { + "path":"$.tradeLicenseDetail.address.street" + } + }, + { + "variable": "variable12", + "value": { + "path":"$.tradeLicenseDetail.address.locality.name" + } + }, + { + "variable": "variable13", + "value":{ + "path":"$.tradeLicenseDetail.owners.*" + }, + "type":"array", + "format":{ + "type":"string", + "scema":[ + { + "key":"name" + }, + { + "key":"mobileNumber" + }] + } + } + ] + }, + { + "derived": [ + { + "variable": "variable32", + "formula": "{{variable19}}-{{variable20}}" + } + ] + }, + { + "externalAPI": [ + + { + + "path": "http://collection-services:8080/collection-services/receipts/_search", + "queryParam": "consumerCode=$.applicationNumber", + + + "apiRequest": null, + + "responseMapping":[ + { + "variable":"variable16", + "value":"$.Receipt[0].receiptNumber" + }, + { + "variable":"variable17", + "value":"$.Receipt[0].instrument.transactionDateInput" + }, + { + "variable":"variable18", + "value":"$.Receipt[0].Bill[0].billDetails[0].billAccountDetails[?(@.taxHeadCode=='TL_TAX')].amount" + }, + { + "variable":"variable19", + "value":"$.Receipt[0].Bill[0].billDetails[0].totalAmount" + }, + { + "variable":"variable20", + "value":"$.Receipt[0].Bill[0].billDetails[0].amountPaid" + }, + { + "variable":"variable21", + "value":"$.Receipt[0].instrument.instrumentType.name" + }, + { + "variable":"variable22", + "value":"$.Receipt[0].transactionId" + }, + { + "variable":"variable23", + "value":"$.Receipt[0].instrument.bank.name" + }, + { + "variable":"variable24", + "value":"$.Receipt[0].Bill[0].billDetails[0].manualReceiptNumber" + }, + { + "variable":"variable25", + "value":"$.Receipt[0].Bill[0].billDetails[0].manualReceiptDate" + }, + { + "variable":"variable26", + "value":"$.Receipt[0].Bill[0].billDetails[0].billAccountDetails[?(@.taxHeadCode=='TL_TIME_PENALTY')].amount" + }, + { + "variable":"variable27", + "value":"$.Receipt[0].Bill[0].billDetails[0].billAccountDetails[?(@.taxHeadCode=='TL_TIME_REBATE')].amount" + }, + { + "variable":"variable28", + "value":"$.Receipt[0].Bill[0].billDetails[0].billAccountDetails[?(@.taxHeadCode=='TL_ADHOC_PENALTY')].amount" + }, + { + "variable":"variable29", + "value":"$.Receipt[0].Bill[0].billDetails[0].billAccountDetails[?(@.taxHeadCode=='TL_ADHOC_REBATE')].amount" + } + ] + } + ] + } + ] + } + ] + } + } diff --git a/configs/pdf-service/data-config/tlapplication.json b/configs/pdf-service/data-config/tlapplication.json new file mode 100644 index 00000000..d62f88b1 --- /dev/null +++ b/configs/pdf-service/data-config/tlapplication.json @@ -0,0 +1,1063 @@ +{ + "key": "tlapplication", + "DataConfigs": { + "serviceName": "rainmaker-common", + "version": "1.0.0", + "baseKeyPath": "$.Licenses.*", + "entityIdPath":"$.applicationNumber", + "isCommonTableBorderRequired": true, + "mappings": [ + { + "mappings": [ + { + "direct": [ + { + "variable": "applicationNumber", + "value": { + "path": "$.applicationNumber" + } + }, + { + "variable": "applicationType", + "value": { + "path": "$.tradeLicenseDetail.additionalDetail.applicationType" + }, + "localisation":{ + "required":true, + "prefix": "TRADELICENSE_APPLICATIONTYPE", + "module": "rainmaker-tl" + } + }, + { + "variable": "oldLicenseNumber", + "value": { + "path": "$.oldLicenseNumber" + } + }, + { + "variable": "licenseType", + "value": { + "path": "$.licenseType" + }, + "localisation":{ + "required":true, + "prefix": "TRADELICENSE_LICENSETYPE", + "module": "rainmaker-tl" + } + }, + { + "variable": "tradeName", + "value": { + "path": "$.tradeName" + } + }, + { + "variable": "structureType", + "value": { + "path": "$.tradeLicenseDetail.structureType" + }, + "localisation":{ + "required":true, + "prefix": "COMMON_MASTERS_STRUCTURETYPE", + "module": "rainmaker-tl", + "isCategoryRequired":true + } + }, + { + "variable": "structureSubType", + "value": { + "path": "$.tradeLicenseDetail.structureType" + }, + "localisation":{ + "required":true, + "prefix": "COMMON_MASTERS_STRUCTURETYPE", + "module": "rainmaker-tl", + "isSubTypeRequired":true + } + }, + { + "variable": "commencementDate", + "value": { + "path": "$.commencementDate" + }, + "type": "date" + }, + { + "variable": "tradeGstNo", + "value": { + "path": "$.tradeLicenseDetail.additionalDetail.gstNo" + } + }, + { + "variable": "operationalArea", + "value": { + "path": "$.tradeLicenseDetail.operationalArea" + } + }, + { + "variable": "noOfEmployees", + "value": { + "path": "$.tradeLicenseDetail.noOfEmployees" + } + }, + { + "variable": "tradeCategory", + "value": { + "path": "$.tradeLicenseDetail.tradeUnits[0].tradeType" + }, + "localisation":{ + "required":true, + "prefix": "TRADELICENSE_TRADETYPE", + "module": "rainmaker-tl", + "isCategoryRequired":true + } + }, + { + "variable": "tradeType1", + "value": { + "path": "$.tradeLicenseDetail.tradeUnits[0].tradeType" + }, + "localisation":{ + "required":true, + "prefix": "TRADELICENSE_TRADETYPE", + "module": "rainmaker-tl", + "isMainTypeRequired":true + } + }, + { + "variable": "tradeSubType", + "value": { + "path": "$.tradeLicenseDetail.tradeUnits[0].tradeType" + }, + "localisation":{ + "required":true, + "prefix": "TRADELICENSE_TRADETYPE", + "module": "rainmaker-tl", + "isSubTypeRequired":true + } + }, + { + "variable": "uomMeasurement", + "value": { + "path": "$.tradeLicenseDetail.tradeUnits[0].uom" + } + }, + { + "variable": "uomValue1", + "value": { + "path": "$.tradeLicenseDetail.tradeUnits[0].uomValue" + } + }, + { + "variable": "propertyAssessmentId", + "value": { + "path": "$.propertyId" + } + }, + { + "variable": "city", + "value": { + "path": "$..tradeLicenseDetail.address.city" + }, + "localisation":{ + "required":true, + "prefix": "TENANT_TENANTS", + "module": "rainmaker-common" + } + + }, + { + "variable": "doorHouseNo", + "value": { + "path": "$.tradeLicenseDetail.address.doorNo" + } + }, + { + "variable": "buildingColonyName", + "value": { + "path": "$.tradeLicenseDetail.address.buildingName" + } + }, + { + "variable": "streetName", + "value": { + "path": "$.tradeLicenseDetail.address.street" + } + }, + { + "variable": "mohalla", + "value": { + "path": "$.tradeLicenseDetail.address.locality.code" + }, + "localisation":{ + "required":true, + "prefix": "TENANTS_MOHALLA", + "module": "rainmaker-common" + } + }, + { + "variable": "pincode", + "value": { + "path": "$.tradeLicenseDetail.address.pincode" + } + }, + { + "variable": "ownershipProof", + "value": { + "path": "$.additionalDetails.documents[?(@.title == 'TL_OWNERSHIPPROOF')].name" + } + }, + { + "variable": "ownersIdProof", + "value": { + "path": "$.additionalDetails.documents[?(@.title == 'TL_OWNERIDPROOF')].name" + } + }, + { + "variable": "ownerPhoto", + "value": { + "path": "$.additionalDetails.documents[?(@.title == 'TL_OWNERPHOTO')].name" + } + }, + { + "variable": "electricityConnectionNo", + "value": { + "path": "$.tradeLicenseDetail.additionalDetail.electricityConnectionNo" + } + }, + { + "variable": "typeOfOwnership", + "value": { + "path": "$.tradeLicenseDetail.subOwnerShipCategory" + }, + "localisation":{ + "required":true, + "prefix": "COMMON_MASTERS_OWNERSHIPCATEGORY", + "module": "rainmaker-tl", + "isCategoryRequired":true + } + + }, + { + "variable": "typeOfSubOwnership", + "value": { + "path": "$.tradeLicenseDetail.subOwnerShipCategory" + }, + "localisation":{ + "required":true, + "prefix": "COMMON_MASTERS_OWNERSHIPCATEGORY", + "module": "rainmaker-tl", + "isSubTypeRequired":true + } + }, + { + "variable": "mobileNo", + "value": { + "path": "$..tradeLicenseDetail.owners[0].mobileNumber" + } + }, + { + "variable": "name", + "value": { + "path": "$.tradeLicenseDetail.owners[0].name" + } + }, + { + "variable": "fatherHusbandName", + "value": { + "path": "$.tradeLicenseDetail.owners[0].fatherOrHusbandName" + } + }, + { + "variable": "relationship", + "value": { + "path": "$.tradeLicenseDetail.owners[0].relationship" + }, + "localisation":{ + "required":true, + "prefix": "COMMON_RELATION", + "module": "rainmaker-tl" + } + }, + { + "variable": "gender", + "value": { + "path": "$.tradeLicenseDetail.owners[0].gender" + }, + "localisation":{ + "required":true, + "prefix": "COMMON_GENDER", + "module": "rainmaker-common" + } + }, + { + "variable": "dateOfBirth", + "value": { + "path": "$.tradeLicenseDetail.owners[0].dob" + }, + "type": "date" + }, + { + "variable": "email", + "value": { + "path": "$.tradeLicenseDetail.owners[0].emailId" + } + }, + { + "variable": "panNo", + "value": { + "path": "$.tradeLicenseDetail.owners[0].pan" + } + }, + { + "variable": "correspondenceAddress", + "value": { + "path": "$.tradeLicenseDetail.owners[0].permanentAddress" + } + }, + { + "variable": "specialOwnerCategory", + "value": { + "path": "$.tradeLicenseDetail.owners[0].ownerType" + }, + "localisation":{ + "required":true, + "prefix": "COMMON_MASTERS_OWNERTYPE", + "module":"rainmaker-common" + } + + }, + { + "variable": "trade_license_application", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_LOGO_HEADER" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "application_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_APPLICATION_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "total_amount", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_TOTAL_AMOUNT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "Rs", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_RUPEE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "trade_license_tax", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_TRADE_LICENSE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "rebate_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_REBATE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "penalty_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_PENALTY" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "trade_details", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_TRADE_DETAILS" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "application_type", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_APPLICATION_TYPE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "old_application_number", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_OLD_APPLICATION_NUMBER" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "licence_type", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_LICENSE_TYPE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "trade_name", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_TRADE_NAME" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "structure_type", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_STRUCTURE_TYPE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "structure_sub_type", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_STRUCTURE_SUB_TYPE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "trade_commencement", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_TRADE_COMMENCEMENT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "trade_gst_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_TRADE_GST" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "operational_area", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_OPERATIONAL_AREA" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "no_of_employees", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_NO_OF_EMPLOYEES" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "trade_category", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_TRADE_CATEGORY" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "trade_type", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_TRADE_TYPE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "trade_sub_type", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_TRADE_SUB_TYPE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "uom_measurement", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_UOM_MEASUREMENT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "accesory_type", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_ACCESORY_TYPE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "uom_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_UOM" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "uom_value", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_UOM_VALUE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "accessory_count", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_ACCESORY_COUNT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "property_assessment_id", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_PROPERTY_ASSESSMENT_ID" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "city_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_CITY" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "door_house_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_DOOR_HOUSE_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "building_colony_name", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_BUILDING_COLONY_NAME" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "street_name", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_STREET_NAME" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "mohalla_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_MOHALLA" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "pincode_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_PINCODE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "electricity_connection_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_ELECTRICITY_CONNECTION_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "owner_details", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_OWNER_DETAILS" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "type_of_ownership", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_TYPE_OF_OWNERSHIP" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "type_of_sub_ownership", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_SUB_OWNERSHIP" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "mobile_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_MOBILE_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "name_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_NAME" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "father_husband", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_FATHER_HUSBAND" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "relationship_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_RELATIONSHIP" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "gender_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_GENDER" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "date_of_birth", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_DATE_OF_BIRTH" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "email_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_EMAIL" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "pan_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_PAN_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "correspondance_address", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_CORRESPONDANCE_ADDRESS" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "special_owner", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_SPECIAL_OWNER" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "documents_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_DOCUMENTS" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "ownership_proof", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_OWNERSHIP_PROOF" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "owners_id_proof", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_OWNERS_ID" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "owner_photo", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_OWNERSHIP_PHOTO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "variable13", + "value":{ + "path":"$.tradeLicenseDetail.tradeUnits.*" + }, + "type":"array", + "format":{ + "type":"string", + "scema":[ + { + "variable": "tradeCat", + "value":"tradeType", + "localisation":{ + "required":true, + "prefix": "TRADELICENSE_TRADETYPE", + "module": "rainmaker-tl", + "isCategoryRequired":true + } + }, + { + "variable": "tradetyp", + "value":"tradeType", + "localisation":{ + "required":true, + "prefix": "TRADELICENSE_TRADETYPE", + "module": "rainmaker-tl", + "isMainTypeRequired":true + } + }, + { + "variable": "tradesub", + "value":"tradeType", + "localisation":{ + "required":true, + "prefix": "TRADELICENSE_TRADETYPE", + "module": "rainmaker-tl", + "isSubTypeRequired":true + } + }, + { + "variable": "UOM-measurement", + "value":"uom" + }, + { + "variable":"uomValue", + "value":"uomValue" + } + ] + } + }, + { + "variable": "variable14", + "value":{ + "path":"$.tradeLicenseDetail.accessories.*" + }, + "type":"array", + "format":{ + "type":"string", + "scema":[ + { + "variable": "accesoryType", + "value": "accessoryCategory", + "localisation":{ + "required":true, + "prefix": "TRADELICENSE_ACCESSORIESCATEGORY", + "module": "rainmaker-tl" + } + }, + { + "variable": "accessoryUomValue", + "value": "uomValue" + }, + + { + "variable": "uom", + "value": "uom" + }, + { + "variable": "accessoryCount", + "value": "count" + } + + ] + } + } + + + + ] + }, + { + "externalAPI": [ + { + "path": "http://billing-service:8080/billing-service/bill/v2/_fetchbill", + "queryParam": "tenantId=$.tenantId,consumerCode=$.applicationNumber,businessService=TL", + "apiRequest": null, + "responseMapping":[ + { + "variable":"totalAmount", + "value":"$.Bill[0].totalAmount" + }, + { + "variable":"tradeLicenseTax", + "value":"$.Bill[0].billDetails[0].billAccountDetails[?(@.taxHeadCode == 'TL_TAX')].amount" + }, + { + "variable":"rebate", + "value":"$.Bill[0].billDetails[0].billAccountDetails[?(@.taxHeadCode == 'TL_ADHOC_REBATE')].amount" + }, + { + "variable":"penalty", + "value":"$.Bill[0].billDetails[0].billAccountDetails[?(@.taxHeadCode == 'TL_ADHOC_PENALTY')].amount" + } + ] + } + ] + } + ] + } + ] + } +} \ No newline at end of file diff --git a/configs/pdf-service/data-config/tlcertificate.json b/configs/pdf-service/data-config/tlcertificate.json new file mode 100644 index 00000000..916d6991 --- /dev/null +++ b/configs/pdf-service/data-config/tlcertificate.json @@ -0,0 +1,443 @@ +{ + "key": "tlcertificate", + "DataConfigs": { + "serviceName": "rainmaker-common", + "version": "1.0.0", + "baseKeyPath": "$.Licenses.*", + "entityIdPath":"$.id", + "isCommonTableBorderRequired": true, + "mappings": [ + { + "mappings": [ + { + "direct": [ + { + "variable": "logoImage", + "url":"https://raw.githubusercontent.com/egovernments/egov-web-app/master/web/rainmaker/dev-packages/egov-ui-kit-dev/src/assets/images/pblogo.png", + "type":"image" + }, + { + "variable": "tradeLicenseNo", + "value": { + "path": "$.licenseNumber" + } + }, + { + "variable": "applicationNo", + "value": { + "path": "$.applicationNumber" + } + }, + { + "variable": "financialYear", + "value": { + "path": "$.financialYear" + } + }, + { + "variable": "tradeName", + "value": { + "path": "$.tradeName" + } + }, + { + "variable": "tradeOwnerName", + "value": { + "path": "$.tradeLicenseDetail.owners[0].name" + } + }, + { + "variable": "tradeOwnerContact", + "value": { + "path": "$.tradeLicenseDetail.owners[0].mobileNumber" + } + }, + { + "variable": "tradeAddress", + "value": { + "path": "$.tradeLicenseDetail.address.locality.name" + } + }, + { + "variable": "city", + "value": { + "path": "$.tradeLicenseDetail.address.city" + }, + "localisation":{ + "required":true, + "prefix": "TENANT_TENANTS", + "module": "rainmaker-common" + } + }, + { + "variable": "tradeType", + "value": { + "path": "$.tradeLicenseDetail.tradeUnits[0].tradeType" + }, + "localisation":{ + "required":true, + "prefix": "TRADELICENSE_TRADETYPE", + "module": "rainmaker-tl" + } + }, + { + "variable": "accessories", + "value": { + "path": "$.tradeLicenseDetail.accessories[0].accessoryCategory" + }, + "localisation":{ + "required":true, + "prefix": "TL", + "module": "rainmaker-tl" + } + }, + { + "variable": "licenseIssueDate", + "value": { + "path": "$.issuedDate" + }, + "type": "date" + }, + { + "variable": "licenseValidityFrom", + "value": { + "path": "$.validFrom" + }, + "type": "date" + }, + { + "variable": "licenseValidityTo", + "value": { + "path": "$.validTo" + }, + "type": "date" + }, + { + "variable": "to", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_TO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "municipal_corportaion", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_MUNICIPAL_CORPORATION" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "corporation_contact", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_LICENSE_CORPORATION_CONTACT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "corporation_website", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_LICENSE_CORPORATION_WEBSITE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "corporation_email", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_LICENSE_CORPORATION_EMAIL" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "trade_license_certifcate", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_LICENSE_CERTIFICATE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "trade_license_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_LICENSE_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "application_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_APPLICATION_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "reciept_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_RECIEPT_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "financial_year", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_FINANCIAL_YEAR" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "trade_name", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_TRADE_NAME" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "trade_owner_name", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_TRADE_OWNER_NAME" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "trade_owner_contact", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_TRADE_OWNER_CONTACT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "trade_address", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_TRADE_ADDRESS" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "trade_type", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_TRADE_TYPE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "accessories_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_ACCESSORIES_LABEL" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "trade_license_fee", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_TRADE_LICENSE_FEE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "license_issue_date", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_LICENSE_ISSUE_DATE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "license_validity", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_LICENSE_VALIDITY" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "approved_by", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_APPROVED_BY" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "commissioner", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_COMMISSIONER" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + } + ] + }, + { + "externalAPI": [ + { + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", + "apiRequest": null, + "responseMapping":[ + { + "variable":"ulb-address", + "value":"$.MdmsRes.tenant.tenants[0].address" + }, + { + "variable":"corporationContact", + "value":"$.MdmsRes.tenant.tenants[0].contactNumber" + }, + { + "variable":"corporationWebsite", + "value":"$.MdmsRes.tenant.tenants[0].domainUrl" + }, + { + "variable":"corporationEmail", + "value":"$.MdmsRes.tenant.tenants[0].emailId" + } + ] + }, + { + "path": "http://collection-services:8080/collection-services/payments/_search", + "queryParam": "tenantId=$.tenantId,consumerCodes=$.applicationNumber,businessServices=TL", + "apiRequest": null, + "responseMapping":[ + { + "variable":"tradeLicenseFee", + "value":"$.Payments[0].totalDue" + }, + { + "variable":"recieptNo", + "value":"$.Payments[0].paymentDetails[0].receiptNumber" + } + + ] + }, + { + "path": "http://egov-filestore:8080/filestore/v1/files/url", + "queryParam": "tenantId=pb,fileStoreIds=$.tradeLicenseDetail.applicationDocuments[?(@.documentType== 'OWNERPHOTO')].fileStoreId", + "apiRequest": null, + "requesttype": "GET", + "responseMapping":[ + { + "variable":"userpic", + "value":"$.fileStoreIds[0].url", + "type": "image" + } + ] + }, + { + "path": "http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search", + "queryParam": "businessIds=$.applicationNumber,history=true,tenantId=$.tenantId", + "apiRequest": null, + "responseMapping":[ + { + "variable":"approvedBy", + "value":"$.ProcessInstances[?(@.action == 'APPROVE')].assigner.name" + } + + ] + } + + ] + } + ] + +} +] +} +} diff --git a/configs/pdf-service/data-config/tlrenewalcertificate.json b/configs/pdf-service/data-config/tlrenewalcertificate.json new file mode 100644 index 00000000..82cf2439 --- /dev/null +++ b/configs/pdf-service/data-config/tlrenewalcertificate.json @@ -0,0 +1,443 @@ +{ + "key": "tlrenewalcertificate", + "DataConfigs": { + "serviceName": "rainmaker-common", + "version": "1.0.0", + "baseKeyPath": "$.Licenses.*", + "entityIdPath":"$.id", + "isCommonTableBorderRequired": true, + "mappings": [ + { + "mappings": [ + { + "direct": [ + { + "variable": "logoImage", + "url":"https://raw.githubusercontent.com/egovernments/egov-web-app/master/web/rainmaker/dev-packages/egov-ui-kit-dev/src/assets/images/pblogo.png", + "type":"image" + }, + { + "variable": "tradeLicenseNo", + "value": { + "path": "$.licenseNumber" + } + }, + { + "variable": "applicationNo", + "value": { + "path": "$.applicationNumber" + } + }, + { + "variable": "financialYear", + "value": { + "path": "$.financialYear" + } + }, + { + "variable": "tradeName", + "value": { + "path": "$.tradeName" + } + }, + { + "variable": "tradeOwnerName", + "value": { + "path": "$.tradeLicenseDetail.owners[0].name" + } + }, + { + "variable": "tradeOwnerContact", + "value": { + "path": "$.tradeLicenseDetail.owners[0].mobileNumber" + } + }, + { + "variable": "tradeAddress", + "value": { + "path": "$.tradeLicenseDetail.address.locality.name" + } + }, + { + "variable": "city", + "value": { + "path": "$.tradeLicenseDetail.address.city" + }, + "localisation":{ + "required":true, + "prefix": "TENANT_TENANTS", + "module": "rainmaker-common" + } + }, + { + "variable": "tradeType", + "value": { + "path": "$.tradeLicenseDetail.tradeUnits[0].tradeType" + }, + "localisation":{ + "required":true, + "prefix": "TRADELICENSE_TRADETYPE", + "module": "rainmaker-tl" + } + }, + { + "variable": "accessories", + "value": { + "path": "$.tradeLicenseDetail.accessories[0].accessoryCategory" + }, + "localisation":{ + "required":true, + "prefix": "TL", + "module": "rainmaker-tl" + } + }, + { + "variable": "licenseIssueDate", + "value": { + "path": "$.issuedDate" + }, + "type": "date" + }, + { + "variable": "licenseValidityFrom", + "value": { + "path": "$.validFrom" + }, + "type": "date" + }, + { + "variable": "licenseValidityTo", + "value": { + "path": "$.validTo" + }, + "type": "date" + }, + { + "variable": "to", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_TO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "municipal_corportaion", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_MUNICIPAL_CORPORATION" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "corporation_contact", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_LICENSE_CORPORATION_CONTACT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "corporation_website", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_LICENSE_CORPORATION_WEBSITE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "corporation_email", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_LICENSE_CORPORATION_EMAIL" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "trade_license_certifcate", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_LICENSE_CERTIFICATE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "trade_license_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_LICENSE_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "application_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_RENEWAL_APPLICATION_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "reciept_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_RECIEPT_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "financial_year", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_FINANCIAL_YEAR" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "trade_name", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_TRADE_NAME" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "trade_owner_name", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_TRADE_OWNER_NAME" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "trade_owner_contact", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_TRADE_OWNER_CONTACT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "trade_address", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_TRADE_ADDRESS" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "trade_type", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_TRADE_TYPE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "accessories_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_ACCESSORIES_LABEL" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "trade_license_fee", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_TRADE_LICENSE_FEE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "license_issue_date", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_LICENSE_ISSUE_DATE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "license_validity", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_LICENSE_VALIDITY" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "approved_by", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_APPROVED_BY" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "commissioner", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_COMMISSIONER" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + } + ] + }, + { + "externalAPI": [ + { + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", + "apiRequest": null, + "responseMapping":[ + { + "variable":"ulb-address", + "value":"$.MdmsRes.tenant.tenants[0].address" + }, + { + "variable":"corporationContact", + "value":"$.MdmsRes.tenant.tenants[0].contactNumber" + }, + { + "variable":"corporationWebsite", + "value":"$.MdmsRes.tenant.tenants[0].domainUrl" + }, + { + "variable":"corporationEmail", + "value":"$.MdmsRes.tenant.tenants[0].emailId" + } + ] + }, + { + "path": "http://collection-services:8080/collection-services/payments/_search", + "queryParam": "tenantId=$.tenantId,consumerCodes=$.applicationNumber,businessServices=TL", + "apiRequest": null, + "responseMapping":[ + { + "variable":"tradeLicenseFee", + "value":"$.Payments[0].totalDue" + }, + { + "variable":"recieptNo", + "value":"$.Payments[0].paymentDetails[0].receiptNumber" + } + + ] + }, + { + "path": "http://egov-filestore:8080/filestore/v1/files/url", + "queryParam": "tenantId=pb,fileStoreIds=$.tradeLicenseDetail.applicationDocuments[?(@.documentType== 'OWNERPHOTO')].fileStoreId", + "apiRequest": null, + "requesttype": "GET", + "responseMapping":[ + { + "variable":"userpic", + "value":"$.fileStoreIds[0].url", + "type": "image" + } + ] + }, + { + "path": "http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search", + "queryParam": "businessIds=$.applicationNumber,history=true,tenantId=$.tenantId", + "apiRequest": null, + "responseMapping":[ + { + "variable":"approvedBy", + "value":"$.ProcessInstances[?(@.action == 'APPROVE')].assigner.name" + } + + ] + } + + ] + } + ] + +} +] +} +} diff --git a/configs/pdf-service/data-config/tradelicense-bill.json b/configs/pdf-service/data-config/tradelicense-bill.json new file mode 100644 index 00000000..0e012f7d --- /dev/null +++ b/configs/pdf-service/data-config/tradelicense-bill.json @@ -0,0 +1,644 @@ +{ + "key": "tradelicense-bill", + "DataConfigs": { + "serviceName": "rainmaker-common", + "version": "1.0.0", + "baseKeyPath": "$.Bill.*", + "entityIdPath":"$.id", + "isCommonTableBorderRequired": true, + "mappings": [ + { + "topic": "common-pdf-generation-1", + "staticConfigPath": "https://raw.githubusercontent.com/egovernments/egov-services/vishal-feature-filestore/core/egov-indexer/src/main/resources/rainmaker-pgr-indexer.yml", + "mappings": [ + { + "direct": [ + { + "variable": "total_amount_due", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_TOTAL_AMOUNT_DUE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payer_name", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PAYER_NAME" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "Municipal_Corporation", + "value": { + "path": "PDF_STATIC_LABEL_MDMS_MUNICIPAL_CORPORATION" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "bill_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_BILL_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "Rs", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_RUPEE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "mobile_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_MOBILE_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "bill_period", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_BILL_PERIOD" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payer_address", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PAYER_ADDRESS" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + + { + "variable": "bill_issue_date", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ISSUE_DATE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "bill_due_date", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_BILL_DUE_DATE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "billing_summary_property_tax", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_BILLING_SUMMARY" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "serviceType", + "value": { + "path": "$.businessService" + }, + "localisation":{ + "required":true, + "prefix":"MODULE", + "module":"rainmaker-common" + } + }, + { + "variable": "tl_application_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_TL_APPLICATION_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "arrears_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ARREARS" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "charge_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_CHARGE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + + { + "variable": "penalty_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PENALTY" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "rebate_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_REBATE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "others_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_OTHERS" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "total_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_TOTAL" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "important_message", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_IMPORTANT_MESSAGE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payment_received", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PAYMENT_RECEIVED" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "this_document", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_THIS_DOCUMENT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "this_is_a", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_THIS_IS" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "assessment_payment", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ASSESSSMENT_PAYMENT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "please_deposit", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PLEASE_DEPOSIT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "if_the_tax", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_IF_THE_TAX" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "acknowledgement_for", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ACKNOWLEDGEMENT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "date_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_DATE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "consumer_id", + "value": { + "path": "$.businessService" + }, + "localisation":{ + "required":true, + "prefix": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_CONSUMER_ID", + "module":"rainmaker-common" + } + }, + { + "variable": "name_address", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_NAME_ADDRESS" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "total_payment", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_TOTAL_PAYMENT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "receivers_signature", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_RECEIVERS_SIGNATURE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "totalAmountDue", + "value": { + "path": "$.totalAmount" + } + }, + { + "variable": "total", + "value": { + "path": "$.totalAmount" + } + }, + + { + "variable": "payerName", + "value": { + "path": "$.payerName" + } + }, + + { + "variable": "mobileNo", + "value": { + "path": "$.mobileNumber" + } + }, + + { + "variable": "payerAddress", + "value": { + "path": "$.payerAddress" + } + }, + { + "variable": "nameAddress", + "value": { + "path": "$.payerAddress" + } + }, + + { + "variable": "billNo", + "value": { + "path": "$.billNumber" + } + }, + { + "variable": "fromPeriod", + "value": { + "path": "$.billDetails[0].fromPeriod" + }, + "type": "date" + }, + { + "variable": "toPeriod", + "value": { + "path": "$.billDetails[0].toPeriod" + }, + "type": "date" + }, + + { + "variable": "billIssueDate", + "value": { + "path": "$.billDate" + }, + "type": "date" + }, + + { + "variable": "billDueDate", + "value": { + "path": "$.billDetails[0].expiryDate" + }, + "type": "date" + }, + { + "variable": "billdate", + "value": { + "path": "$.billDate" + }, + "type": "date" + }, + + { + "variable": "propertyID", + "value": { + "path": "$.consumerCode" + } + }, + { + "variable": "fees", + "value":{ + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'TL_TAX' || @.taxHeadCode == 'TL_RENEWAL_TAX')].amount" + } + }, + { + "variable": "tl_penalty", + "value":{ + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'TL_PENALTY' || @.taxHeadCode == 'TL_RENEWAL_PENALTY')].amount" + } + }, + { + "variable": "tl_rebate", + "value":{ + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'TL_REBATE' || @.taxHeadCode == 'TL_RENEWAL_REBATE')].amount" + } + }, + { + "variable": "tl_adhoc_penalty", + "value":{ + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'TL_ADHOC_PENALTY' || @.taxHeadCode == 'TL_RENEWAL_ADHOC_PENALTY')].amount" + } + }, + { + "variable": "tl_adhoc_rebate", + "value":{ + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'TL_ADHOC_REBATE' || @.taxHeadCode == 'TL_RENEWAL_ADHOC_REBATE')].amount" + } + }, + { + "variable": "tl_roundoff", + "value":{ + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'TL_ROUNDOFF')].amount" + } + }, + { + "variable": "consumerID", + "value": { + "path": "$.consumerCode" + } + }, + { + "variable": "date", + "value": { + "path": "$.billDate" + }, + "type": "date" + }, + { + "variable": "totalPayment", + "value": { + "path": "$.billDetails[0].amountPaid" + } + }, + { + "variable":"scissorImage", + "url":"http://www.pngall.com/wp-content/uploads/2016/03/Scissor-PNG-Clipart.png", + "type":"image" + } + ] + }, + { + "derived": [ + { + "variable": "charge", + "formula": "{{fees}}" + }, + { + "variable": "penalty", + "formula": "{{tl_penalty}}+{{tl_adhoc_penalty}}" + }, + { + "variable": "rebate", + "formula": "{{tl_rebate}}+{{tl_adhoc_rebate}}" + }, + { + "variable": "others", + "formula": "{{tl_roundoff}}" + } + ] + }, + { + "externalAPI": [ + { + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", + "apiRequest": null, + "responseMapping":[ + { + "variable":"address", + "value":"$.MdmsRes.tenant.tenants[0].address" + }, + { + "variable":"phoneNumber", + "value":"$.MdmsRes.tenant.tenants[0].contactNumber" + }, + { + "variable":"website", + "value":"$.MdmsRes.tenant.tenants[0].domainUrl" + }, + { + "variable":"email", + "value":"$.MdmsRes.tenant.tenants[0].emailId" + }, + { + "variable": "logoImage", + "value":"$.MdmsRes.tenant.tenants[0].logoId", + "type": "image" + }, + { + "variable": "logo_header", + "value":"$.MdmsRes.tenant.tenants[0].code", + "localisation":{ + "required":true, + "prefix": "TENANT_TENANTS", + "module":"rainmaker-common" + } + } + ] + }, + { + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "queryParam": "moduleName=tenant&masterName=footer&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}' %26%26 @.service=='{$.businessService}')%5D", + "apiRequest": null, + "responseMapping":[ + { + "variable": "variable11", + "value": "$.MdmsRes.tenant.footer[0].billFooterContent.*", + "type":"array", + "format":{ + "type":"string", + "scema":[ + { + "variable":"disclaimerContent", + "value":"disclaimer", + "type":"string", + "localisation":{ + "required":true, + "prefix": null, + "module": "rainmaker-common" + } + } + ] + } + } + ] + } + ] + } + ] + } + ] + } +} \ No newline at end of file diff --git a/configs/pdf-service/data-config/tradelicense-receipt.json b/configs/pdf-service/data-config/tradelicense-receipt.json new file mode 100644 index 00000000..126a0926 --- /dev/null +++ b/configs/pdf-service/data-config/tradelicense-receipt.json @@ -0,0 +1,441 @@ +{ + "key": "tradelicense-receipt", + "DataConfigs": { + "serviceName": "rainmaker-common", + "version": "1.0.0", + "baseKeyPath": "$.Payments.*", + "entityIdPath":"$.id", + "isCommonTableBorderRequired": true, + "mappings": [ + { + "topic": "common-pdf-generation-3", + "mappings": [ + { + "direct": [ + { + "variable": "payerName", + "value": { + "path": "$.payerName" + } + }, + { + "variable": "user-name", + "value": { + "path": "$.userInfo.name" + }, + "type":"selectFromRequestInfo" + }, + { + "variable": "payerContact", + "value": { + "path": "$.mobileNumber" + } + }, + { + "variable": "receiptNo", + "value": { + "path": "$.paymentDetails[0].receiptNumber" + } + }, + { + "variable": "serviceType", + "value": { + "path": "$.paymentDetails[0].businessService" + }, + "localisation":{ + "required":true, + "prefix":"MODULE", + "module":"rainmaker-common" + } + }, + { + "variable": "paidAmount", + "value": { + "path": "$.paymentDetails[0].totalAmountPaid" + } + }, + { + "variable": "fromPeriod", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].fromPeriod" + }, + "type": "date" + }, + { + "variable": "toPeriod", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].toPeriod" + }, + "type": "date" + }, + { + "variable": "paymentMode", + "value": { + "path": "$.paymentMode" + }, + "localisation":{ + "required":true, + "prefix": "COMMON_MASTERS_PAYMENTMODE", + "module": "rainmaker-common" + } + }, + { + "variable": "G8ReceiptNo", + "value": { + "path": "$.paymentDetails[0].manualReceiptNumber" + } + }, + { + "variable": "G8ReceiptDate", + "value": { + "path": "$.paymentDetails[0].manualReceiptDate" + }, + "type": "date" + }, + { + "variable": "paymentDate", + "value": { + "path": "$.transactionDate" + }, + "type": "date" + }, + { + "variable": "consumerID", + "value": { + "path": "$.paymentDetails[0].bill.consumerCode" + } + }, + { + "variable": "transactionID", + "value": { + "path": "$.transactionNumber" + } + }, + { + "variable": "dueAmount", + "value": { + "path": "$.paymentDetails[0].totalDue" + } + }, + { + "variable": "payment_receipt", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_RECEIPT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "receipt_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_RECEIPT_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "consumer_id", + "value": { + "path": "$.paymentDetails[0].businessService" + }, + "localisation":{ + "required":true, + "prefix": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_CONSUMER_ID", + "module":"rainmaker-common" + } + }, + { + "variable": "payment_date", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_DATE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payer_name", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYER_NAME" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payer_contact", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYER_CONTACT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "service_type", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_SERVICE_TYPE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "billing_period", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_BILLING_PERIOD" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "paid_amount", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAID_AMOUNT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "pending_amount", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PENDING_AMOUNT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payment_mode", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_MODE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "transaction_id", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_TRANSACTION_ID" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "g8_receipt_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_G8_RECEIPT_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "g8_receipt_date", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_G8_RECEIPT_DATE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "generated_by", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_GENERATED_BY" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "commissioner/eo", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_COMMISSIONER_EO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "no_signature", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_NO_SIGNATURE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "disclamer", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "to", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_TO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "Municipal_Corporation", + "value": { + "path": "PDF_STATIC_LABEL_MDMS_MUNICIPAL_CORPORATION" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + } + ] + }, + { + "derived": [ + { + "variable": "pendingAmount", + "formula": "{{dueAmount}}-{{paidAmount}}" + } + ] + }, + { + "externalAPI": [ + { + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", + "apiRequest": null, + "responseMapping":[ + { + "variable":"address", + "value":"$.MdmsRes.tenant.tenants[0].address" + }, + { + "variable":"phoneNumber", + "value":"$.MdmsRes.tenant.tenants[0].contactNumber" + }, + { + "variable":"website", + "value":"$.MdmsRes.tenant.tenants[0].domainUrl" + }, + { + "variable":"email", + "value":"$.MdmsRes.tenant.tenants[0].emailId" + }, + { + "variable": "logoImage", + "value":"$.MdmsRes.tenant.tenants[0].logoId", + "type":"image" + }, + { + "variable": "logo-header", + "value":"$.MdmsRes.tenant.tenants[0].code", + "localisation":{ + "required":true, + "prefix": "TENANT_TENANTS", + "module":"rainmaker-common" + } + } + ] + }, + { + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "queryParam": "moduleName=tenant&masterName=footer&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}' %26%26 @.service=='{$.paymentDetails[0].businessService}')%5D", + "apiRequest": null, + "responseMapping":[ + { + "variable": "variable11", + "value": "$.MdmsRes.tenant.footer[0].receiptFooterContent.*", + "type":"array", + "format":{ + "type":"string", + "scema":[ + { + "variable":"disclaimerContent", + "value":"disclaimer", + "type":"string", + "localisation":{ + "required":true, + "prefix": null, + "module": "rainmaker-common" + } + } + ] + } + } + ] + } + ] + } + ] + } + ] + } +} \ No newline at end of file diff --git a/configs/pdf-service/data-config/ws-applicationsewerage.json b/configs/pdf-service/data-config/ws-applicationsewerage.json new file mode 100644 index 00000000..29ac52ff --- /dev/null +++ b/configs/pdf-service/data-config/ws-applicationsewerage.json @@ -0,0 +1,1019 @@ +{ + "key": "ws-applicationsewerage", + "DataConfigs": { + "serviceName": "rainmaker-common", + "version": "1.0.0", + "baseKeyPath": "$.SewerageConnection.*", + "entityIdPath": "$.applicationNo", + "isCommonTableBorderRequired": true, + "mappings": [ + { + "topic": "common-pdf-generation-3", + "mappings": [ + { + "direct": [ + { + "variable": "applicationNo", + "value": { + "path": "$.applicationNo" + } + }, + { + "variable": "status", + "value": { + "path": "$.status" + } + }, + { + "variable": "totalAmount", + "value": { + "path": "$.totalAmount" + } + }, + { + "variable": "propertyId", + "value": { + "path": "$.property.propertyId" + } + }, + { + "variable": "propertyType", + "value": { + "path": "$.property.propertyType" + }, + "localisation": { + "required": true, + "prefix": "WS_PROPTYPE", + "module": "rainmaker-ws" + } + }, + { + "variable": "propertyUsageType", + "value": { + "path": "$.property.usageCategory" + }, + "localisation": { + "required": true, + "prefix": "WS_PROPUSGTYPE", + "module": "rainmaker-ws" + } + }, + { + "variable": "propertyUsageSubType", + "value": { + "path": "$.property.propertySubUsageType" + } + }, + { + "variable": "plotSize", + "value": { + "path": "$.property.landArea" + } + }, + { + "variable": "noOfFloor", + "value": { + "path": "$.property.noOfFloors" + } + }, + { + "variable": "rainwaterHarvestingFacility", + "value": { + "path": "$.property.rainWaterHarvesting" + }, + "localisation": { + "required": true, + "prefix": "HARVESTING", + "module": "rainmaker-common" + } + }, + { + "variable": "cityName", + "value": { + "path": "$.property.address.city" + } + }, + { + "variable": "doorHouseNo", + "value": { + "path": "$.property.address.doorNo" + } + }, + { + "variable": "buildingColonyName", + "value": { + "path": "$.property.address.buildingName" + } + }, + { + "variable": "streetName", + "value": { + "path": "$.property.address.street" + } + }, + { + "variable": "localityMohalla", + "value": { + "path": "$.property.address.locality.name" + } + }, + { + "variable": "pinCode", + "value": { + "path": "$.property.address.pincode" + } + }, + { + "variable": "variable13", + "value":{ + "path":"$.property.owners.*" + }, + "type":"array", + "format":{ + "type":"string", + "scema":[ + { + "variable": "ownerName", + "value": "name" + }, + { + "variable": "emailLabel", + "value":"emailId" + }, + { + "variable": "gender", + "value": "gender" + }, + { + "variable": "dob", + "value": "dob", + "type": "date" + }, + { + "variable": "guardianName", + "value": "fatherOrHusbandName" + }, + { + "variable": "relationshipLabel", + "value": "relationship" + }, + { + "variable": "specialApplicantCategory", + "value": "ownerType" + }, + { + "variable": "correspondenceAddress", + "value": "correspondenceAddress" + } + ] + } + + }, + { + "variable": "applyCategory", + "value": { + "path": "$.service" + } + }, + { + "variable": "noOfWaterClosetsProposed", + "value": { + "path": "$.proposedWaterClosets" + } + }, + { + "variable": "noOfWaterToiletsProposed", + "value": { + "path": "$.proposedToilets" + } + }, + { + "variable": "connectionType", + "value": { + "path": "$.connectionType" + } + }, + { + "variable": "noOfWaterClosets", + "value": { + "path": "$.noOfWaterClosets" + } + }, + { + "variable": "noOfToilets", + "value": { + "path": "$.noOfToilets" + } + }, + { + "variable": "plumberProvidedBy", + "value": { + "path": "$.additionalDetails.detailsProvidedBy" + } + }, + { + "variable": "plumberLicenceNo", + "value": { + "path": "$.plumberInfo[0].licenseNo" + } + }, + { + "variable": "plumberName", + "value": { + "path": "$.plumberInfo[0].name" + } + }, + { + "variable": "plumberMobileNo", + "value": { + "path": "$.plumberInfo[0].mobileNumber" + } + }, + { + "variable": "roadType", + "value": { + "path": "$.roadType" + } + }, + { + "variable": "area", + "value": { + "path": "$.roadCuttingArea" + } + }, + { + "variable": "connectionExecutionDate", + "value": { + "path": "$.connectionExecutionDate" + }, + "type": "date" + }, + { + "variable": "ownershipProof", + "value": { + "path": "$.pdfDocuments[?(@.title == 'WS_OWNER.ADDRESSPROOF')].name" + } + }, + { + "variable": "ownersIdProof", + "value": { + "path": "$.pdfDocuments[?(@.title == 'WS_OWNER.IDENTITYPROOF')].name" + } + }, + { + "variable": "electricityBill", + "value": { + "path": "$.pdfDocuments[?(@.title == 'WS_ELECTRICITY_BILL')].name" + } + }, + { + "variable": "plumberReport", + "value": { + "path": "$.pdfDocuments[?(@.title == 'WS_PLUMBER_REPORT_DRAWING')].name" + } + }, + { + "variable": "buildingPlan", + "value": { + "path": "$.pdfDocuments[?(@.title == 'WS_BUILDING_PLAN_OR_COMPLETION_CERTIFICATE')].name" + } + }, + { + "variable": "ptTaxReciept", + "value": { + "path": "$.pdfDocuments[?(@.title == 'WS_PROPERTY_TAX_RECIEPT')].name" + } + }, + { + "variable": "logoImage", + "url": "https://raw.githubusercontent.com/egovernments/egov-web-app/master/web/rainmaker/dev-packages/egov-ui-kit-dev/src/assets/images/pblogo.png", + "type": "image" + }, + { + "variable": "Municipal_Corporation", + "value": { + "path": "PDF_STATIC_LABEL_MDMS_MUNICIPAL_CORPORATION" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "logo_sub_header", + "value": { + "path": "PDF_STATIC_LABEL_SW_CONSOLIDATED_ACKNOWELDGMENT_LOGO_SUB_HEADER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "application_no", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_APPLICATION_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "status_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_STATUS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "document_details_header", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_DOCUMENT_DETAIL_HEADER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "fee_estimate_header", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_FEES_ESTIMATE_HEADER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "total_amount", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_TOTAL_AMOUNT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "total_amount", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_TOTAL_AMOUNT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "property_details_header", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PROPERTY_DETAILS_HEADER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "property_id", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PROPERTY_ID" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "property_type", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PROPERTY_TYPE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "property_usage_type", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PROPERTY_USAGE_TYPE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "property_usage_sub_type", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PROPERTY_USAGE_SUB_TYPE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "plot_size", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PLOT_SIZE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "no_of_floor", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_NO_OF_FLOOR" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "rainwater_harvesting_facility", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_RAINWATER_HARVESTING_FACILITY" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "property_location_details_header", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PROPERTY_LOCATION_HEADER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "city", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_CITY" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "door_house_no", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_DOOR_HOUSE_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "building_colony_name", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_BUILDING" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "street_name", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_STREETNAME" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "locality_mohalla", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_LOCALITY" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "pin_code", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PINCODE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "property_owner_details_header", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_OWNER_DETAILS_HEADER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "owner_name", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_OWNER_NAME" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "email_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_EMAIL" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "gender_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_GENDER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "dob_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_DOB" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "guardian_name", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_GUARDIAN_NAME" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "relationship_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_RELATIONSHIP" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "special_applicant_category", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_SPECIAL_APPLICANT_CATEGORY" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "connection_details_header", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_CONNECTION_DETAILS_HEADER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "apply_category", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_APPLY_CATEGORY" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "no_of_water_closets_proposed", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_NO_OF_WATER_CLOSETS_PROPOSED" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "no_of_water_toilets_proposed", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_NO_OF_WATER_TOILETS_PROPOSED" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "additional_connection_details_header", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ADDITIONAL_CONNECTION_HEADER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "connection_type", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_CONNECTION_TYPE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "no_of_water_closets", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_NO_OF_WATER_CLOSETS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "no_of_toilets", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_NO_OF_TOILETS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "plumber_details_header", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PLUMBER_DETAILS_HEADER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "plumber_provided_by", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PLUMBER_PROVIDED_BY" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "plumber_licence_no", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PLUMBER_LICENSE_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "plumber_name", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PLUMBER_NAME" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "plumber_mobile_no", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PLUMBER_MOBILE_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "road_charges_header", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ROAD_CHARGES_HEADER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "road_type", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ROAD_TYPE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "area_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_AREA_LABEL" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "activation_details_header", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ACTIVATION_DETAILS_HEADER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "connection_execution_date", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_CONNECTION_EXECUTION_DATE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "ownership_proof", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_OWNERSHIP_PROOF" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "owners_id_proof", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_OWNERS_ID_PROOF" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "electricty_bill", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ELECTRICITY_BILL" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "plumber_report", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PLUMBER_REPORT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "building_plan", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_BUILDING_PLAN" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "property_tax_reciept", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PROPERTY_TAX_RECEIPT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "sewerage_application", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_SEWERAGE_APPLICATION" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "correspondence_address", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_CORRESPONDENCE_ADDRESS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "Rs", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_RUPEE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + } + ] + }, + { + "externalAPI": [ + { + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.property.tenantId}')%5D", + "apiRequest": null, + "responseMapping": [ + { + "variable": "logoImage", + "value": "$.MdmsRes.tenant.tenants[0].logoId", + "type": "image" + }, + { + "variable": "logo_header", + "value": "$.MdmsRes.tenant.tenants[0].code", + "localisation": { + "required": true, + "prefix": "TENANT_TENANTS", + "module": "rainmaker-common" + } + } + ] + } + ] + } + ] + } + ] + } +} diff --git a/configs/pdf-service/data-config/ws-applicationwater.json b/configs/pdf-service/data-config/ws-applicationwater.json new file mode 100644 index 00000000..adc9d7b4 --- /dev/null +++ b/configs/pdf-service/data-config/ws-applicationwater.json @@ -0,0 +1,1098 @@ +{ + "key": "ws-applicationwater", + "DataConfigs": { + "serviceName": "rainmaker-common", + "version": "1.0.0", + "baseKeyPath": "$.WaterConnection.*", + "entityIdPath": "$.applicationNo", + "isCommonTableBorderRequired": true, + "mappings": [ + { + "topic": "common-pdf-generation-3", + "mappings": [ + { + "direct": [ + { + "variable": "applicationNo", + "value": { + "path": "$.applicationNo" + } + }, + { + "variable": "status", + "value": { + "path": "$.status" + } + }, + { + "variable": "totalAmount", + "value": { + "path": "$.totalAmount" + } + }, + { + "variable": "propertyId", + "value": { + "path": "$.property.propertyId" + } + }, + { + "variable": "propertyType", + "value": { + "path": "$.property.propertyType" + }, + "localisation": { + "required": true, + "prefix": "WS_PROPTYPE", + "module": "rainmaker-ws" + } + }, + { + "variable": "propertyUsageType", + "value": { + "path": "$.property.usageCategory" + }, + "localisation": { + "required": true, + "prefix": "WS_PROPUSGTYPE", + "module": "rainmaker-ws" + } + }, + { + "variable": "propertyUsageSubType", + "value": { + "path": "$.property.propertySubUsageType" + } + }, + { + "variable": "plotSize", + "value": { + "path": "$.property.landArea" + } + }, + { + "variable": "noOfFloor", + "value": { + "path": "$.property.noOfFloors" + } + }, + { + "variable": "rainwaterHarvestingFacility", + "value": { + "path": "$.property.rainWaterHarvesting" + }, + "localisation": { + "required": true, + "prefix": "HARVESTING", + "module": "rainmaker-common" + } + }, + { + "variable": "cityName", + "value": { + "path": "$.property.address.city" + } + }, + { + "variable": "doorHouseNo", + "value": { + "path": "$.property.address.doorNo" + } + }, + { + "variable": "buildingColonyName", + "value": { + "path": "$.property.address.buildingName" + } + }, + { + "variable": "streetName", + "value": { + "path": "$.property.address.street" + } + }, + { + "variable": "localityMohalla", + "value": { + "path": "$.property.address.locality.name" + } + }, + { + "variable": "pinCode", + "value": { + "path": "$.property.address.pincode" + } + }, + { + "variable": "variable13", + "value":{ + "path":"$.property.owners.*" + }, + "type":"array", + "format":{ + "type":"string", + "scema":[ + { + "variable": "ownerName", + "value": "name" + }, + { + "variable": "emailLabel", + "value":"emailId" + }, + { + "variable": "gender", + "value": "gender" + }, + { + "variable": "dob", + "value": "dob", + "type": "date" + }, + { + "variable": "guardianName", + "value": "fatherOrHusbandName" + }, + { + "variable": "relationshipLabel", + "value": "relationship" + }, + { + "variable": "specialApplicantCategory", + "value": "ownerType" + }, + { + "variable": "correspondenceAddress", + "value": "correspondenceAddress" + } + ] + } + + }, + { + "variable": "applyCategory", + "value": { + "path": "$.service" + } + }, + { + "variable": "noOfTapsProposed", + "value": { + "path": "$.proposedTaps" + } + }, + { + "variable": "pipeSizeProposed", + "value": { + "path": "$.proposedPipeSize" + } + }, + { + "variable": "connectionType", + "value": { + "path": "$.connectionType" + } + }, + { + "variable": "plumberProvidedBy", + "value": { + "path": "$.additionalDetails.detailsProvidedBy" + } + }, + { + "variable": "plumberLicenceNo", + "value": { + "path": "$.plumberInfo[0].licenseNo" + } + }, + { + "variable": "plumberName", + "value": { + "path": "$.plumberInfo[0].name" + } + }, + { + "variable": "plumberMobileNo", + "value": { + "path": "$.plumberInfo[0].mobileNumber" + } + }, + { + "variable": "roadType", + "value": { + "path": "$.roadType" + } + }, + { + "variable": "area", + "value": { + "path": "$.roadCuttingArea" + } + }, + { + "variable": "connectionExecutionDate", + "value": { + "path": "$.connectionExecutionDate" + }, + "type": "date" + }, + { + "variable": "noOfTaps", + "value": { + "path": "$.noOfTaps" + } + }, + { + "variable": "waterSource", + "value": { + "path": "$.waterSource" + } + }, + { + "variable": "waterSubSource", + "value": { + "path": "$.waterSubSource" + } + }, + { + "variable": "pipeSize", + "value": { + "path": "$.pipeSize" + } + }, + { + "variable": "ownershipProof", + "value": { + "path": "$.pdfDocuments[?(@.title == 'WS_OWNER.ADDRESSPROOF')].name" + } + }, + { + "variable": "ownersIdProof", + "value": { + "path": "$.pdfDocuments[?(@.title == 'WS_OWNER.IDENTITYPROOF')].name" + } + }, + { + "variable": "electricityBill", + "value": { + "path": "$.pdfDocuments[?(@.title == 'WS_ELECTRICITY_BILL')].name" + } + }, + { + "variable": "plumberReport", + "value": { + "path": "$.pdfDocuments[?(@.title == 'WS_PLUMBER_REPORT_DRAWING')].name" + } + }, + { + "variable": "buildingPlan", + "value": { + "path": "$.pdfDocuments[?(@.title == 'WS_BUILDING_PLAN_OR_COMPLETION_CERTIFICATE')].name" + } + }, + { + "variable": "ptTaxReciept", + "value": { + "path": "$.pdfDocuments[?(@.title == 'WS_PROPERTY_TAX_RECIEPT')].name" + } + }, + { + "variable": "meterId", + "value": { + "path": "$.meterId" + } + }, + { + "variable": "meterInstallationDate", + "value": { + "path": "$.meterInstallationDate" + }, + "type": "date" + }, + { + "variable": "initialMeterReading", + "value": { + "path": "$.additionalDetails.initialMeterReading" + } + }, + { + "variable": "logoImage", + "url": "https://raw.githubusercontent.com/egovernments/egov-web-app/master/web/rainmaker/dev-packages/egov-ui-kit-dev/src/assets/images/pblogo.png", + "type": "image" + }, + { + "variable": "Municipal_Corporation", + "value": { + "path": "PDF_STATIC_LABEL_MDMS_MUNICIPAL_CORPORATION" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "logo_sub_header", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_LOGO_SUB_HEADER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "application_no", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_APPLICATION_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "status_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_STATUS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "document_details_header", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_DOCUMENT_DETAIL_HEADER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "total_amount", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_TOTAL_AMOUNT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "total_amount", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_TOTAL_AMOUNT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "property_details_header", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PROPERTY_DETAILS_HEADER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "property_id", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PROPERTY_ID" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "property_type", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PROPERTY_TYPE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "property_usage_type", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PROPERTY_USAGE_TYPE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "property_usage_sub_type", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PROPERTY_USAGE_SUB_TYPE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "plot_size", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PLOT_SIZE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "no_of_floor", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_NO_OF_FLOOR" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "rainwater_harvesting_facility", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_RAINWATER_HARVESTING_FACILITY" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "property_location_details_header", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PROPERTY_LOCATION_HEADER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "city", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_CITY" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "door_house_no", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_DOOR_HOUSE_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "building_colony_name", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_BUILDING" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "street_name", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_STREETNAME" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "locality_mohalla", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_LOCALITY" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "pin_code", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PINCODE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "property_owner_details_header", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_OWNER_DETAILS_HEADER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "owner_name", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_OWNER_NAME" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "email_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_EMAIL" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "gender_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_GENDER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "dob_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_DOB" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "guardian_name", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_GUARDIAN_NAME" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "relationship_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_RELATIONSHIP" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "special_applicant_category", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_SPECIAL_APPLICANT_CATEGORY" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "connection_details_header", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_CONNECTION_DETAILS_HEADER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "apply_category", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_APPLY_CATEGORY" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "additional_connection_details_header", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ADDITIONAL_CONNECTION_HEADER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "connection_type", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_CONNECTION_TYPE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "plumber_details_header", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PLUMBER_DETAILS_HEADER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "plumber_provided_by", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PLUMBER_PROVIDED_BY" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "plumber_licence_no", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PLUMBER_LICENSE_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "plumber_name", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PLUMBER_NAME" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "plumber_mobile_no", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PLUMBER_MOBILE_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "road_charges_header", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ROAD_CHARGES_HEADER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "road_type", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ROAD_TYPE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "area_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_AREA_LABEL" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "activation_details_header", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ACTIVATION_DETAILS_HEADER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "connection_execution_date", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_CONNECTION_EXECUTION_DATE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "no_of_taps_proposed", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_TAPS_PROPOSED" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "pipe_size_proposed", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PIPE_SIZE_PROPOSED" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "no_of_taps", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_NO_OF_TAPS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "water_source", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_WATER_SOURCE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "water_sub_source", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_WATER_SUB_SOURCE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "pipe_size", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PIPE_SIZE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "ownership_proof", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_OWNERSHIP_PROOF" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "owners_id_proof", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_OWNERS_ID_PROOF" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "electricty_bill", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ELECTRICITY_BILL" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "plumber_report", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PLUMBER_REPORT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "building_plan", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_BUILDING_PLAN" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "property_tax_reciept", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PROPERTY_TAX_RECEIPT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "meter_id", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_METER_ID" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "meter_installation_date", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_METER_INSTALLATION" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "initial_meter_reading", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_INITIAL_METER_READING" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "water_application", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_WATER_APPLICATION" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "correspondence_address", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_CORRESPONDENCE_ADDRESS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "Rs", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_RUPEE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + } + ] + }, + { + "externalAPI": [ + { + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.property.tenantId}')%5D", + "apiRequest": null, + "responseMapping": [ + { + "variable": "logoImage", + "value": "$.MdmsRes.tenant.tenants[0].logoId", + "type": "image" + }, + { + "variable": "logo_header", + "value": "$.MdmsRes.tenant.tenants[0].code", + "localisation": { + "required": true, + "prefix": "TENANT_TENANTS", + "module": "rainmaker-common" + } + } + ] + } + ] + } + ] + } + ] + } +} diff --git a/configs/pdf-service/data-config/ws-bill.json b/configs/pdf-service/data-config/ws-bill.json new file mode 100644 index 00000000..0ae6f850 --- /dev/null +++ b/configs/pdf-service/data-config/ws-bill.json @@ -0,0 +1,691 @@ +{ + "key": "ws-bill", + "DataConfigs": { + "serviceName": "rainmaker-common", + "version": "1.0.0", + "baseKeyPath": "$.Bill.*", + "entityIdPath": "$.billNumber", + "isCommonTableBorderRequired": true, + "mappings": [ + { + "topic": "common-pdf-generation-1", + "staticConfigPath": "https://raw.githubusercontent.com/egovernments/egov-services/vishal-feature-filestore/core/egov-indexer/src/main/resources/rainmaker-pgr-indexer.yml", + "mappings": [ + { + "direct": [ + { + "variable": "total_amount_due", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_TOTAL_AMOUNT_DUE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "payer_name", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PAYER_NAME" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "Municipal_Corporation", + "value": { + "path": "PDF_STATIC_LABEL_MDMS_MUNICIPAL_CORPORATION" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "bill_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_BILL_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "Rs", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_RUPEE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "mobile_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_MOBILE_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "bill_period", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_BILL_PERIOD" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "payer_address", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PAYER_ADDRESS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "bill_issue_date", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ISSUE_DATE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "bill_due_date", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_BILL_DUE_DATE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "billing_summary_property_tax", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_BILLING_SUMMARY" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "serviceType", + "value": { + "path": "$.businessService" + }, + "localisation": { + "required": true, + "prefix": "MODULE", + "module": "rainmaker-common" + } + }, + { + "variable": "property_id", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PROPERTY_ID" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "arrears_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ARREARS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "charge_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_CHARGE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "penalty_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PENALTY" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "rebate_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_REBATE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "others_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_OTHERS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "total_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_TOTAL" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "important_message", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_IMPORTANT_MESSAGE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "payment_received", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PAYMENT_RECEIVED" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "this_document", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_THIS_DOCUMENT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "this_is_a", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_THIS_IS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "assessment_payment", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ASSESSSMENT_PAYMENT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "please_deposit", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PLEASE_DEPOSIT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "if_the_tax", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_IF_THE_TAX" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "acknowledgement_for", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ACKNOWLEDGEMENT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "date_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_DATE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "consumer_id", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_CONSUMER_ID" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "consumer_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_CONSUMER_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "name_address", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_NAME_ADDRESS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "total_payment", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_TOTAL_PAYMENT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "receivers_signature", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_RECEIVERS_SIGNATURE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "totalAmountDue", + "value": { + "path": "$.totalAmount" + } + }, + { + "variable": "total", + "value": { + "path": "$.totalAmount" + } + }, + { + "variable": "payerName", + "value": { + "path": "$.payerName" + } + }, + { + "variable": "mobileNo", + "value": { + "path": "$.mobileNumber" + } + }, + { + "variable": "payerAddress", + "value": { + "path": "$.payerAddress" + } + }, + { + "variable": "nameAddress", + "value": { + "path": "$.payerAddress" + } + }, + { + "variable": "billNo", + "value": { + "path": "$.billNumber" + } + }, + { + "variable": "fromPeriod", + "value": { + "path": "$.billDetails[0].fromPeriod" + }, + "type": "date" + }, + { + "variable": "toPeriod", + "value": { + "path": "$.billDetails[0].toPeriod" + }, + "type": "date" + }, + { + "variable": "billIssueDate", + "value": { + "path": "$.billDate" + }, + "type": "date" + }, + { + "variable": "billDueDate", + "value": { + "path": "$.billDetails[0].expiryDate" + }, + "type": "date" + }, + { + "variable": "billdate", + "value": { + "path": "$.billDate" + }, + "type": "date" + }, + { + "variable": "propertyID", + "value": { + "path": "$.consumerCode" + } + }, + { + "variable": "taxCharge", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_TAX' || @.taxHeadCode == 'TL_TAX' || @.taxHeadCode == 'FIRENOC_TAXES' || @.taxHeadCode == 'WS_CHARGE' || @.taxHeadCode == 'SW_CHARGE' )].amount" + } + }, + { + "variable": "timeRebate", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_TIME_REBATE' || @.taxHeadCode == 'WS_TIME_REBATE' || @.taxHeadCode == 'SW_TIME_REBATE')].amount" + } + }, + { + "variable": "adhocRebate", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_ADHOC_REBATE' || @.taxHeadCode == 'TL_ADHOC_REBATE' || @.taxHeadCode == 'FIRENOC_ADHOC_REBATE')].amount" + } + }, + { + "variable": "timePenalty", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_TIME_PENALTY' || @.taxHeadCode == 'WS_TIME_PENALTY' || @.taxHeadCode == 'SW_TIME_PENALTY')].amount" + } + }, + { + "variable": "adhocPenalty", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_ADHOC_PENALTY' || @.taxHeadCode == 'TL_ADHOC_PENALTY' || @.taxHeadCode == 'FIRENOC_ADHOC_PENALTY')].amount" + } + }, + { + "variable": "firecess", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_FIRE_CESS')].amount" + } + }, + { + "variable": "usageExemption", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_UNIT_USAGE_EXEMPTION')].amount" + } + }, + { + "variable": "roundoff", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_ROUNDOFF' || @.taxHeadCode == 'TL_ROUNDOFF' || @.taxHeadCode == 'FIRENOC_ROUNDOFF' || @.taxHeadCode == 'WS_Round_Off' || @.taxHeadCode == 'SW_Round_Off')].amount" + } + }, + { + "variable": "fees", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'FIRENOC_FEES')].amount" + } + }, + { + "variable": "ownerExemption", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_OWNER_EXEMPTION')].amount" + } + }, + { + "variable": "cancerCess", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_CANCER_CESS')].amount" + } + }, + { + "variable": "waterCess", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'WS_WATER_CESS')].amount" + } + }, + { + "variable": "timeInterest", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_TIME_INTEREST' || @.taxHeadCode == 'WS_TIME_INTEREST' || @.taxHeadCode == 'SW_TIME_INTEREST')].amount" + } + }, + { + "variable": "ceilingDebit", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_DECIMAL_CEILING_DEBIT')].amount" + } + }, + { + "variable": "ceilingCredit", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_DECIMAL_CEILING_CREDIT')].amount" + } + }, + { + "variable": "carryForward", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_ADVANCE_CARRYFORWARD')].amount" + } + }, + { + "variable": "consumerID", + "value": { + "path": "$.consumerCode" + } + }, + { + "variable": "date", + "value": { + "path": "$.billDate" + }, + "type": "date" + }, + { + "variable": "totalPayment", + "value": { + "path": "$.billDetails[0].amountPaid" + } + }, + { + "variable": "WS_arrears", + "value": { + "path": "$.arrearAmount" + } + }, + { + "variable": "scissorImage", + "url": "http://www.pngall.com/wp-content/uploads/2016/03/Scissor-PNG-Clipart.png", + "type": "image" + } + ] + }, + { + "derived": [ + { + "variable": "charge", + "formula": "{{taxCharge}}+{{fees}}" + }, + { + "variable": "penalty", + "formula": "{{timePenalty}}+{{adhocPenalty}}" + }, + { + "variable": "rebate", + "formula": "{{timeRebate}}+{{adhocRebate}}" + }, + { + "variable": "others", + "formula": "{{cancerCess}}+{{roundoff}}+{{timeInterest}}+{{ceilingDebit}}+{{ceilingCredit}}+{{firecess}}+{{waterCess}}" + }, + { + "variable": "arrears", + "formula": "{{WS_arrears}}" + } + ] + }, + { + "externalAPI": [ + { + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", + "apiRequest": null, + "responseMapping": [ + { + "variable": "address", + "value": "$.MdmsRes.tenant.tenants[0].address" + }, + { + "variable": "phoneNumber", + "value": "$.MdmsRes.tenant.tenants[0].contactNumber" + }, + { + "variable": "website", + "value": "$.MdmsRes.tenant.tenants[0].domainUrl" + }, + { + "variable": "email", + "value": "$.MdmsRes.tenant.tenants[0].emailId" + }, + { + "variable": "logoImage", + "value": "$.MdmsRes.tenant.tenants[0].logoId", + "type": "image" + }, + { + "variable": "logo_header", + "value": "$.MdmsRes.tenant.tenants[0].code", + "localisation": { + "required": true, + "prefix": "TENANT_TENANTS", + "module": "rainmaker-common" + } + } + ] + } + ] + } + ] + } + ] + } +} diff --git a/configs/pdf-service/data-config/ws-consolidatedacknowlegment.json b/configs/pdf-service/data-config/ws-consolidatedacknowlegment.json new file mode 100644 index 00000000..9ea5cbf9 --- /dev/null +++ b/configs/pdf-service/data-config/ws-consolidatedacknowlegment.json @@ -0,0 +1,684 @@ +{ + "key": "ws-consolidatedacknowlegment", + "DataConfigs": { + "serviceName": "rainmaker-common", + "version": "1.0.0", + "baseKeyPath": "$.WaterConnection.*", + "entityIdPath": "$.connectionNo", + "isCommonTableBorderRequired": true, + "mappings": [ + { + "topic": "common-pdf-generation-3", + "mappings": [ + { + "direct": [ + { + "variable": "consumerNo", + "value": { + "path": "$.connectionNo" + } + }, + { + "variable": "status", + "value": { + "path": "$.status" + } + }, + { + "variable": "connectionCategory", + "value": { + "path": "$.connectionCategory" + } + }, + { + "variable": "connectionType", + "value": { + "path": "$.connectionType" + } + }, + { + "variable": "meterID", + "value": { + "path": "$.meterId" + } + }, + { + "variable": "pipeSize", + "value": { + "path": "$.pipeSize" + } + }, + { + "variable": "connectionExecutionDate", + "value": { + "path": "$.connectionExecutionDate" + }, + "type": "date" + }, + { + "variable": "rainwaterHarvestingFacility", + "value": { + "path": "$.rainWaterHarvesting" + }, + "localisation": { + "required": true, + "prefix": "HARVESTING", + "module": "rainmaker-common" + } + }, + { + "variable": "waterSource", + "value": { + "path": "$.waterSource" + } + }, + { + "variable": "waterSubSource", + "value": { + "path": "$.waterSubSource" + } + }, + { + "variable": "propertyType", + "value": { + "path": "$.property.propertyType" + }, + "localisation": { + "required": true, + "prefix": "WS_PROPTYPE", + "module": "rainmaker-ws" + } + }, + { + "variable": "propertyUsageType", + "value": { + "path": "$.property.usageCategory" + }, + "localisation": { + "required": true, + "prefix": "WS_PROPUSGTYPE", + "module": "rainmaker-ws" + } + }, + { + "variable": "plotSize", + "value": { + "path": "$.property.landArea" + } + }, + { + "variable": "propertyID", + "value": { + "path": "$.property.propertyId" + } + }, + { + "variable": "city", + "value": { + "path": "$.property.address.city" + } + }, + { + "variable": "plot", + "value": { + "path": "$.property.address.doorNo" + } + }, + { + "variable": "building", + "value": { + "path": "$.property.address.buildingName" + } + }, + { + "variable": "streetName", + "value": { + "path": "$.property.address.street" + } + }, + { + "variable": "locality", + "value": { + "path": "$.property.address.locality.name" + } + }, + { + "variable": "pincode", + "value": { + "path": "$.property.address.pincode" + } + }, + { + "variable": "lat", + "value": { + "path": "$.property.address.locality.latitude" + } + }, + { + "variable": "long", + "value": { + "path": "$.property.address.locality.longitude" + } + }, + { + "variable": "ownerName", + "value": { + "path": "$.property.owners[0].name" + } + }, + { + "variable": "ownerMobileNumber", + "value": { + "path": "$.property.owners[0].mobileNumber" + } + }, + { + "variable": "gender", + "value": { + "path": "$.property.owners[0].gender" + }, + "localisation": { + "required": true, + "prefix": "COMMON_GENDER", + "module": "rainmaker-common" + } + }, + { + "variable": "guardian", + "value": { + "path": "$.property.owners[0].relationship" + } + }, + { + "variable": "guardianName", + "value": { + "path": "$.property.owners[0].fatherOrHusbandName" + } + }, + { + "variable": "ownerCategory", + "value": { + "path": "$.property.ownershipCategory" + }, + "localisation": { + "required": true, + "prefix": "WS_OWNERSHIPCATEGORY", + "module": "rainmaker-ws" + } + }, + { + "variable": "email", + "value": { + "path": "$.property.owners[0].emailId" + } + }, + { + "variable": "correspondenceAddress", + "value": { + "path": "$.property.owners[0].correspondenceAddress" + } + }, + { + "variable": "Municipal_Corporation", + "value": { + "path": "PDF_STATIC_LABEL_MDMS_MUNICIPAL_CORPORATION" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "logo_sub_header", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_LOGO_SUB_HEADER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "consumer_no", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_CONSUMER_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "status_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_STATUS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "service_details_header", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_SERVICE_DETAILS_HEADER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "service", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_SERVICE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "connection_category", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_CONNECTION_CAT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "connection_type", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_CONNECTION_TYPE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "meter_id", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_METER_ID" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "pipe_size", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PIPE_SIZE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "connection_execution_date", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_CONNECTION_EXECUTION_DATE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "rainwater_harvesting_facility", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_RAIN_HARV_FAC" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "water_source", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_WATER_SOURCE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "water_sub_source", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_WATER_SUB_SOURCE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "property_details_header", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PROPERTY_DETAILS_HEADER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "property_type", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PROPERTY_TYPE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "property_usage_type", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PROPERTY_USAGE_TYPE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "plot_size", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PLOT_SIZE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "property_ID", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PROPERTY_ID" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "city_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_CITY" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "plot_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PLOT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "building_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_BUILDING" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "street_name", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_STREET" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "locality_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_LOCALITY" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "pincode_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PINCODE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "location_on_map", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_LOCATION_ON_MAP" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "owner_details_header", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_OWNER_DETAILS_HEADER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "owner_name", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_OWNER_NAME" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "owner_mobile_number", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_OWNER_MOB_NUM" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "gender_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_GENDER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "guardian_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_GUARDIAN" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "guardian_name", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_GUARDIAN_NAME" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "owner_category", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_OWNER_CATEGORY" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "email_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_EMAIL" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "correspondence_address", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_CORR_ADDRESS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "water_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_WATER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + } + ] + }, + { + "externalAPI": [ + { + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.property.tenantId}')%5D", + "apiRequest": null, + "responseMapping":[ + { + "variable": "logoImage", + "value":"$.MdmsRes.tenant.tenants[0].logoId", + "type": "image" + }, + { + "variable": "logo_header", + "value":"$.MdmsRes.tenant.tenants[0].code", + "localisation":{ + "required":true, + "prefix": "TENANT_TENANTS", + "module":"rainmaker-common" + } + } + ] + } + ] + } + ] + } + ] + } +} \ No newline at end of file diff --git a/configs/pdf-service/data-config/ws-consolidatedsewerageconnection.json b/configs/pdf-service/data-config/ws-consolidatedsewerageconnection.json new file mode 100644 index 00000000..103ec392 --- /dev/null +++ b/configs/pdf-service/data-config/ws-consolidatedsewerageconnection.json @@ -0,0 +1,571 @@ +{ + "key": "ws-consolidatedsewerageconnection", + "DataConfigs": { + "serviceName": "rainmaker-common", + "version": "1.0.0", + "baseKeyPath": "$.SewerageConnections.*", + "entityIdPath": "$.connectionNo", + "isCommonTableBorderRequired": true, + "mappings": [ + { + "topic": "common-pdf-generation-3", + "mappings": [ + { + "direct": [ + { + "variable": "consumerNo", + "value": { + "path": "$.connectionNo" + } + }, + { + "variable": "status", + "value": { + "path": "$.status" + } + }, + { + "variable": "connectionExecutionDate", + "value": { + "path": "$.connectionExecutionDate" + }, + "type": "date" + }, + { + "variable": "uom", + "value": { + "path": "$.uom" + } + }, + { + "variable": "propertyType", + "value": { + "path": "$.property.propertyType" + }, + "localisation": { + "required": true, + "prefix": "WS_PROPTYPE", + "module": "rainmaker-ws" + } + }, + { + "variable": "propertyUsageType", + "value": { + "path": "$.property.usageCategory" + }, + "localisation": { + "required": true, + "prefix": "WS_PROPUSGTYPE", + "module": "rainmaker-ws" + } + }, + { + "variable": "plotSize", + "value": { + "path": "$.property.landArea" + } + }, + { + "variable": "propertyID", + "value": { + "path": "$.property.propertyId" + } + }, + { + "variable": "city", + "value": { + "path": "$.property.address.city" + } + }, + { + "variable": "plot", + "value": { + "path": "$.property.address.doorNo" + } + }, + { + "variable": "building", + "value": { + "path": "$.property.address.buildingName" + } + }, + { + "variable": "streetName", + "value": { + "path": "$.property.address.street" + } + }, + { + "variable": "locality", + "value": { + "path": "$.property.address.locality.name" + } + }, + { + "variable": "pincode", + "value": { + "path": "$.property.address.pincode" + } + }, + { + "variable": "lat", + "value": { + "path": "$.WaterConnection[0].property.address.locality.latitude" + } + }, + { + "variable": "long", + "value": { + "path": "$.WaterConnection[0].property.address.locality.longitude" + } + }, + { + "variable": "ownerName", + "value": { + "path": "$.property.owners[0].name" + } + }, + { + "variable": "ownerMobileNumber", + "value": { + "path": "$.property.owners[0].mobileNumber" + } + }, + { + "variable": "gender", + "value": { + "path": "$.property.owners[0].gender" + } + }, + { + "variable": "guardian", + "value": { + "path": "$.property.owners[0].relationship" + } + }, + { + "variable": "guardianName", + "value": { + "path": "$.property.owners[0].fatherOrHusbandName" + } + }, + { + "variable": "ownerCategory", + "value": { + "path": "$.property.ownershipCategory" + }, + "localisation": { + "required": true, + "prefix": "WS_OWNERSHIPCATEGORY", + "module": "rainmaker-ws" + } + }, + { + "variable": "email", + "value": { + "path": "$.property.owners[0].emailId" + } + }, + { + "variable": "correspondenceAddress", + "value": { + "path": "$.property.owners[0].correspondenceAddress" + } + }, + { + "variable": "logoImage", + "url": "https://raw.githubusercontent.com/egovernments/egov-web-app/master/web/rainmaker/dev-packages/egov-ui-kit-dev/src/assets/images/pblogo.png", + "type": "image" + }, + { + "variable": "Municipal_Corporation", + "value": { + "path": "PDF_STATIC_LABEL_MDMS_MUNICIPAL_CORPORATION" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "logo_sub_header", + "value": { + "path": "PDF_STATIC_LABEL_SW_CONSOLIDATED_ACKNOWELDGMENT_LOGO_SUB_HEADER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "consumer_no", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_CONSUMER_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "status_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_STATUS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "service_details_header", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_SERVICE_DETAILS_HEADER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "service", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_SERVICE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "connection_execution_date", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_CONNECTION_EXECUTION_DATE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "unit_of_measurement", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_UNIT_OF_MEASUREMENT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "property_details_header", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PROPERTY_DETAILS_HEADER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "property_type", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PROPERTY_TYPE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "property_usage_type", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PROPERTY_USAGE_TYPE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "plot_size", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PLOT_SIZE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "property_ID", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PROPERTY_ID" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "city_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_CITY" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "plot_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PLOT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "building_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_BUILDING" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "street_name", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_STREET" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "locality_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_LOCALITY" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "pincode_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PINCODE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "location_on_map", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_LOCATION_ON_MAP" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "owner_details_header", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_OWNER_DETAILS_HEADER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "owner_name", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_OWNER_NAME" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "owner_mobile_number", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_OWNER_MOB_NUM" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "gender_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_GENDER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "guardian_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_GUARDIAN" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "guardian_name", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_GUARDIAN_NAME" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "owner_category", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_OWNER_CATEGORY" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "email_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_EMAIL" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "correspondence_address", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_CORR_ADDRESS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "sewarage_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_SEWERAGE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + } + ] + }, + { + "externalAPI": [ + { + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.property.tenantId}')%5D", + "apiRequest": null, + "responseMapping":[ + { + "variable": "logoImage", + "value":"$.MdmsRes.tenant.tenants[0].logoId", + "type": "image" + }, + { + "variable": "logo_header", + "value":"$.MdmsRes.tenant.tenants[0].code", + "localisation":{ + "required":true, + "prefix": "TENANT_TENANTS", + "module":"rainmaker-common" + } + } + ] + } + ] + } + ] + } + ] + } +} \ No newline at end of file diff --git a/configs/pdf-service/data-config/ws-estimationnotice.json b/configs/pdf-service/data-config/ws-estimationnotice.json new file mode 100644 index 00000000..27bb4b36 --- /dev/null +++ b/configs/pdf-service/data-config/ws-estimationnotice.json @@ -0,0 +1,508 @@ +{ + "key": "ws-estimationnotice", + "DataConfigs": { + "serviceName": "rainmaker-common", + "version": "1.0.0", + "baseKeyPath": "$.WnsConnection.*", + "entityIdPath": "$.applicationNo", + "isCommonTableBorderRequired": true, + "mappings": [ + { + "topic": "common-pdf-generation-3", + "mappings": [ + { + "direct": [ + { + "variable": "appNo", + "value": { + "path": "$.applicationNo" + } + }, + { + "variable": "appDate", + "value": { + "path": "$.connectionExecutionDate" + }, + "type":"date" + }, + { + "variable": "name", + "value": { + "path": "$.property.owners[0].name" + } + }, + { + "variable": "guardianName", + "value": { + "path": "$.property.owners[0].fatherOrHusbandName" + } + }, + { + "variable": "usageType", + "value": { + "path": "$.property.usageCategory" + } + }, + { + "variable": "houseNo", + "value": { + "path": "$.property.address.doorNo" + } + }, + { + "variable": "mobileNumber", + "value": { + "path": "$.property.owners[0].mobileNumber" + } + }, + { + "variable": "address", + "value": { + "path": "$.property.address.locality.name" + } + }, + { + "variable": "pincode", + "value": { + "path": "$.property.address.pincode" + } + }, + { + "variable": "formFee", + "value": { + "path": "$.pdfTaxhead[?(@.taxHeadCode == 'FORM_FEE')].estimateAmount" + } + }, + { + "variable": "ScrutinyFee", + "value": { + "path": "$.pdfTaxhead[?(@.taxHeadCode == 'SCRUTINY_FEE')].estimateAmount" + } + }, + { + "variable": "otherCharge", + "value": { + "path": "$.pdfTaxhead[?(@.taxHeadCode == 'OTHER_CHARGE')].estimateAmount" + } + }, + { + "variable": "securityCharge", + "value": { + "path": "$.pdfTaxhead[?(@.taxHeadCode == 'SECURITY_CHARGE')].estimateAmount" + } + }, + { + "variable": "taxCess", + "value": { + "path": "$.pdfTaxhead[?(@.taxHeadCode == 'TAX_AND_CESS')].estimateAmount" + } + }, + { + "variable": "roadCharge", + "value": { + "path": "$.pdfTaxhead[?(@.taxHeadCode == 'ROAD_CUTTING_CHARGE')].estimateAmount" + } + }, + { + "variable": "oneTimeFee", + "value": { + "path": "$.pdfTaxhead[?(@.taxHeadCode == 'ONE_TIME_FEE')].estimateAmount" + } + }, + { + "variable": "penaltyAmount", + "value": { + "path": "$.additionalDetails.adhocPenalty" + } + }, + { + "variable": "rebateAmount", + "value": { + "path": "$.additionalDetails.adhocRebate" + } + }, + { + "variable": "penaltyComments", + "value": { + "path": "$.additionalDetails.adhocPenaltyComment" + } + }, + { + "variable": "totalAmount", + "value": { + "path": "$.totalAmount" + } + }, + { + "variable": "service", + "value": { + "path": "$.service" + } + }, + { + "variable": "tenantName", + "value": { + "path": "$.tenantName" + } + }, + { + "variable": "logoImage", + "url": "https://raw.githubusercontent.com/egovernments/egov-web-app/master/web/rainmaker/dev-packages/egov-ui-kit-dev/src/assets/images/pblogo.png", + "type": "image" + }, + { + "variable": "estimation_notice_header", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ESTIMATION_NOTICE_HEADER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "UAT", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_UAT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "connection_header", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_CONNECTION_HEADER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "app_no", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_APPLICATION_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "app_date", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_APP_DATE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "user_name", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_USER_NAME" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "guardian_name", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_GUARDIAN" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "usage_type", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_USAGE_TYPE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "mobile_no", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_MOBILE_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "house_no", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_DOOR_HOUSE_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "user_address", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ADDRESS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "estimation_header", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ESTIMATION_HEADER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "sl_no", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_SERIAL_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "fee_estimate", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_FEES_ESTIMATE_HEADER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "amount", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_AMOUNT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "form_fee", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_FORM_FEE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "scrutiny_fee", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_SCRUTINY_FEE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "other_charge", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_OTHER_CHARGE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "security_charge", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_SECURITY_CHARGE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "tax_cess", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_TAX_CESS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "penalty", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PENALTY" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "rebate", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_REBATE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "comments", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PENALTY_COMMENTS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "grand_total", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_GRAND_TOTAL" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "approved_by", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_APPROVED_BY" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "one_time_fee", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ONE_TIME_FEE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "road_charge", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ROAD_CHARGE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + } + ] + }, + { + "externalAPI": [ + { + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.property.tenantId}')%5D", + "apiRequest": null, + "responseMapping": [ + { + "variable": "logoImage", + "value": "$.MdmsRes.tenant.tenants[0].logoId", + "type": "image" + }, + { + "variable": "logo_header", + "value": "$.MdmsRes.tenant.tenants[0].code", + "localisation": { + "required": true, + "prefix": "TENANT_TENANTS", + "module": "rainmaker-common" + } + } + ] + } + ] + } + ] + } + ] + } +} \ No newline at end of file diff --git a/configs/pdf-service/data-config/ws-onetime-receipt.json b/configs/pdf-service/data-config/ws-onetime-receipt.json new file mode 100644 index 00000000..da4f9e25 --- /dev/null +++ b/configs/pdf-service/data-config/ws-onetime-receipt.json @@ -0,0 +1,476 @@ +{ + "key": "ws-onetime-receipt", + "documentType": "CONSOLIDATED_RECEIPT", + "DataConfigs": { + "moduleName": "rainmaker-common", + "version": "1.0.0", + "baseKeyPath": "$.Payments.*", + "entityIdPath": "$.id", + "isCommonTableBorderRequired": true, + "mappings": [ + { + "topic": "common-pdf-generation-3", + "mappings": [ + { + "direct": [ + { + "variable": "payerName", + "value": { + "path": "$.payerName" + } + }, + { + "variable": "user-name", + "value": { + "path": "$.userInfo.name" + }, + "type": "selectFromRequestInfo" + }, + { + "variable": "payerContact", + "value": { + "path": "$.mobileNumber" + } + }, + { + "variable": "receiptNo", + "value": { + "path": "$.paymentDetails[0].receiptNumber" + } + }, + { + "variable": "serviceType", + "value": { + "path": "$.paymentDetails[0].businessService" + }, + "localisation": { + "required": true, + "prefix": "MODULE", + "module": "rainmaker-common" + } + }, + { + "variable": "paidAmount", + "value": { + "path": "$.paymentDetails[0].totalAmountPaid" + } + }, + { + "variable": "fromPeriod", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].fromPeriod" + }, + "type": "date" + }, + { + "variable": "toPeriod", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].toPeriod" + }, + "type": "date" + }, + { + "variable": "paymentMode", + "value": { + "path": "$.paymentMode" + }, + "localisation": { + "required": true, + "prefix": "COMMON_MASTERS_PAYMENTMODE", + "module": "rainmaker-common" + } + }, + { + "variable": "G8ReceiptNo", + "value": { + "path": "$.paymentDetails[0].manualReceiptNumber" + } + }, + { + "variable": "G8ReceiptDate", + "value": { + "path": "$.paymentDetails[0].manualReceiptDate" + }, + "type": "date" + }, + { + "variable": "paymentDate", + "value": { + "path": "$.transactionDate" + }, + "type": "date" + }, + { + "variable": "consumerID", + "value": { + "path": "$.paymentDetails[0].bill.consumerCode" + } + }, + { + "variable": "transactionID", + "value": { + "path": "$.transactionNumber" + } + }, + { + "variable": "dueAmount", + "value": { + "path": "$.paymentDetails[0].totalDue" + } + }, + { + "variable": "payment_receipt", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_RECEIPT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "receipt_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_RECEIPT_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "consumer_id", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_CONSUMER_ID" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "payment_date", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_DATE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "payer_name", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYER_NAME" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "payer_contact", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYER_CONTACT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "service_type", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_SERVICE_TYPE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "billing_period", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_BILLING_PERIOD" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "paid_amount", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAID_AMOUNT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "pending_amount", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PENDING_AMOUNT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "payment_mode", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_MODE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "transaction_id", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_TRANSACTION_ID" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "g8_receipt_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_G8_RECEIPT_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "g8_receipt_date", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_G8_RECEIPT_DATE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "generated_by", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_GENERATED_BY" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "commissioner/eo", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_COMMISSIONER_EO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "no_signature", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_NO_SIGNATURE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "disclamer", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "disclamer_1", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_FIRST_LINE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "disclamer_2", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_SECOND_LINE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "disclamer_3", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_THIRD_LINE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "disclamer_4", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_FOURTH_LINE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "disclamer_5", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_FIFTH_LINE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "to", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_TO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "Municipal_Corporation", + "value": { + "path": "PDF_STATIC_LABEL_MDMS_MUNICIPAL_CORPORATION" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + } + ] + }, + { + "derived": [ + { + "variable": "pendingAmount", + "formula": "{{dueAmount}}-{{paidAmount}}" + } + ] + }, + { + "externalAPI": [ + { + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", + "apiRequest": null, + "responseMapping": [ + { + "variable": "address", + "value": "$.MdmsRes.tenant.tenants[0].address" + }, + { + "variable": "phoneNumber", + "value": "$.MdmsRes.tenant.tenants[0].contactNumber" + }, + { + "variable": "website", + "value": "$.MdmsRes.tenant.tenants[0].domainUrl" + }, + { + "variable": "email", + "value": "$.MdmsRes.tenant.tenants[0].emailId" + }, + { + "variable": "logoImage", + "value": "$.MdmsRes.tenant.tenants[0].logoId", + "type": "image" + }, + { + "variable": "logo-header", + "value": "$.MdmsRes.tenant.tenants[0].code", + "localisation": { + "required": true, + "prefix": "TENANT_TENANTS", + "module": "rainmaker-common" + } + } + ] + } + ] + } + ] + } + ] + } +} diff --git a/configs/pdf-service/data-config/ws-sanctionletter-old.json b/configs/pdf-service/data-config/ws-sanctionletter-old.json new file mode 100644 index 00000000..b0df2ba5 --- /dev/null +++ b/configs/pdf-service/data-config/ws-sanctionletter-old.json @@ -0,0 +1,672 @@ +{ + "key": "ws-sanctionletter-old", + "DataConfigs": { + "serviceName": "rainmaker-common", + "version": "1.0.0", + "baseKeyPath": "$.WnsConnection.*", + "entityIdPath": "$.applicationNo", + "isCommonTableBorderRequired": true, + "mappings": [ + { + "topic": "common-pdf-generation-3", + "mappings": [ + { + "direct": [ + { + "variable": "cityName", + "value": { + "path": "$.tenantName" + } + }, + { + "variable": "presentByName", + "value": { + "path": "$.commissionerName" + } + }, + { + "variable": "usageType", + "value": { + "path": "$.appUserType" + } + }, + { + "variable": "applicationNumber", + "value": { + "path": "$.applicationNo" + } + }, + { + "variable": "connectionExecutionDate", + "value": { + "path": "$.connectionExecutionDate" + }, + "type": "date" + }, + { + "variable": "applicationType", + "value": { + "path": "$.service" + } + }, + { + "variable": "service", + "value": { + "path": "$.service" + } + }, + { + "variable": "doorNo", + "value": { + "path": "$.property.address.doorNo" + } + }, + { + "variable": "locality", + "value": { + "path": "$.property.address.locality.name" + } + }, + { + "variable": "ownerName", + "value": { + "path": "$.property.owners[0].name" + } + }, + { + "variable": "formFee", + "value": { + "path": "$.pdfTaxhead[?(@.taxHeadCode == 'FORM_FEE')].estimateAmount" + } + }, + { + "variable": "ScrutinyFee", + "value": { + "path": "$.pdfTaxhead[?(@.taxHeadCode == 'SCRUTINY_FEE')].estimateAmount" + } + }, + { + "variable": "otherCharge", + "value": { + "path": "$.pdfTaxhead[?(@.taxHeadCode == 'OTHER_CHARGE')].estimateAmount" + } + }, + { + "variable": "securityCharge", + "value": { + "path": "$.pdfTaxhead[?(@.taxHeadCode == 'SECURITY_CHARGE')].estimateAmount" + } + }, + { + "variable": "taxCess", + "value": { + "path": "$.pdfTaxhead[?(@.taxHeadCode == 'TAX_AND_CESS')].estimateAmount" + } + }, + { + "variable": "roadCharge", + "value": { + "path": "$.pdfTaxhead[?(@.taxHeadCode == 'ROAD_CUTTING_CHARGE')].estimateAmount" + } + }, + { + "variable": "oneTimeFee", + "value": { + "path": "$.pdfTaxhead[?(@.taxHeadCode == 'ONE_TIME_FEE')].estimateAmount" + } + }, + { + "variable": "penaltyAmount", + "value": { + "path": "$.additionalDetails.adhocPenalty" + } + }, + { + "variable": "rebateAmount", + "value": { + "path": "$.additionalDetails.adhocRebate" + } + }, + { + "variable": "totalAmount", + "value": { + "path": "$.totalAmount" + } + }, + { + "variable": "tenantName", + "value": { + "path": "$.tenantName" + } + }, + { + "variable": "date", + "value": { + "path": "$.connectionExecutionDate" + }, + "type": "date" + }, + { + "variable": "total", + "value": { + "path": "PDF_STATIC_LABELWS_CONSOLIDATED_ACKNOWELDGMENT_TOTAL" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "Rs", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_RUPEE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "Municipal_Corporation", + "value": { + "path": "PDF_STATIC_LABEL_WS_MDMS_MUNICIPAL_CORPORATION_LOGO_HEADER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "presented_by", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PRESENTED_BY" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "commissioner_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_COMMISSIONER_LABEL" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "app_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_ACKNOWELDGMENT_APPLICATION_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "date_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_ACKNOWELDGMENT_DATE_LABEL" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "sub_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_SUB_LEBEL" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "ref_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_REF_LEBEL" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "total_amount", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_TOTAL_AMOUNT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "sub_data1", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_SUB_DATA1" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "sub_data2", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_SUB_DATA2" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "locality_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_LOCALITY_LABEL" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "order_issued", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ORDER_ISSUED" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "ref_message1", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_REF_MESSAGE1" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "dated_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_DATED_LABEL" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "ref_message2", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_REF_MESSAGE2" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "order_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ORDER_LABEL" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "in_ref_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_IN_REF_LABEL" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "order_meassage1", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ORDER_MESSAGE1" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "order_meassage2", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ORDER_MESSAGE2" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "order_meassage3", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ORDER_MESSAGE3" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "order_data2", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ORDER_DATA2" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "order_data3", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ORDER_DATA3" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "for_commissioner_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_FOR_COMMISSIONER_LABEL" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "to_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_TO_LABEL" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "sri_smt_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_SRI_SMT_LABEL" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "door_no_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_DOOR_NO_LABEL" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "copy_message1", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_COPY_MESSAGE1" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "copy_message-sub1", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_COPY_MESSAGE_SUB1" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "copy_message2", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_COPY_MESSAGE2" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "UAT", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_UAT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "form_fee", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_FORM_FEE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "scrutiny_fee", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_SCRUTINY_FEE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "other_charge", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_OTHER_CHARGE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "security_charge", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_SECURITY_CHARGE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "tax_cess", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_TAX_CESS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "penalty", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PENALTY" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "rebate", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_REBATE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "one_time_fee", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ONE_TIME_FEE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "road_charge", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ROAD_CHARGE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + } + ] + }, + { + "externalAPI": [ + { + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.property.tenantId}')%5D", + "apiRequest": null, + "responseMapping": [ + { + "variable": "logoImage", + "value": "$.MdmsRes.tenant.tenants[0].logoId", + "type": "image" + }, + { + "variable": "logo_header", + "value": "$.MdmsRes.tenant.tenants[0].code", + "localisation": { + "required": true, + "prefix": "TENANT_TENANTS", + "module": "rainmaker-common" + } + } + ] + } + ] + } + ] + } + ] + } +} diff --git a/configs/pdf-service/data-config/ws-sanctionletter.json b/configs/pdf-service/data-config/ws-sanctionletter.json new file mode 100644 index 00000000..ed94a250 --- /dev/null +++ b/configs/pdf-service/data-config/ws-sanctionletter.json @@ -0,0 +1,917 @@ +{ + "key": "ws-sanctionletter", + "DataConfigs": { + "serviceName": "rainmaker-common", + "version": "1.0.0", + "baseKeyPath": "$.WnsConnection.*", + "entityIdPath": "$.applicationNo", + "isCommonTableBorderRequired": true, + "mappings": [ + { + "topic": "common-pdf-generation-3", + "mappings": [ + { + "direct": [ + { + "variable": "tenantName", + "value": { + "path": "$.tenantName" + } + }, + { + "variable": "logoImage", + "url": "https://raw.githubusercontent.com/egovernments/egov-web-app/master/web/rainmaker/dev-packages/egov-ui-kit-dev/src/assets/images/pblogo.png", + "type": "image" + }, + { + "variable": "municipalCouncil", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_SUNAM_DEV_MUNICIPAL_COUNCIL" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "sanctionLetter", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_SANCTION_LETTER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "dated", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_DATED_IN_LOWER_CASE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "order_meassage4", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_SEEKING_ESTIMATE_AMOUNT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "order_meassage5", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_PREPARATION_NOTICE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "order_meassage6", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_SERVICE_PAYMENT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "order_meassage7", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_SAID_PREMISES" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "order_meassage8", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_FURTHER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "order_meassage9", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_CONNECTION_SANCTIONED" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "order_meassage10", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_PLUMBER_INFO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "order_meassage11", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_BILLING_CYCLE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "estimation_notice_header", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ESTIMATION_NOTICE_HEADER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "UAT", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_UAT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "cityName", + "value": { + "path": "$.tenantName" + } + }, + { + "variable": "presentByName", + "value": { + "path": "$.commissionerName" + } + }, + { + "variable": "usageType", + "value": { + "path": "$.appUserType" + } + }, + { + "variable": "applicationNumber", + "value": { + "path": "$.applicationNo" + } + }, + { + "variable": "connectionExecutionDate", + "value": { + "path": "$.connectionExecutionDate" + }, + "type": "date" + }, + { + "variable": "applicationType", + "value": { + "path": "$.service" + } + }, + { + "variable": "service", + "value": { + "path": "$.service" + } + }, + { + "variable": "doorNo", + "value": { + "path": "$.property.address.doorNo" + } + }, + { + "variable": "locality", + "value": { + "path": "$.property.address.locality.name" + } + }, + { + "variable": "ownerName", + "value": { + "path": "$.property.owners[0].name" + } + }, + { + "variable": "plumberName", + "value": { + "path": "$.plumberInfo[0].name" + } + }, + { + "variable": "licenceNo", + "value": { + "path": "$.plumberInfo[0].licenseNo" + } + }, + { + "variable": "contactNo", + "value": { + "path": "$.plumberInfo[0].mobileNumber" + } + }, + { + "variable": "order_meassage14", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_CONCERNED_PLUMBER_CONTACT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "order_meassage12", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_CONCERNED_PLUMBER_ALLOTED" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "order_meassage13", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_CONCERNED_PLUMBER_LICENCE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "formFee", + "value": { + "path": "$.pdfTaxhead[?(@.taxHeadCode == 'FORM_FEE')].estimateAmount" + } + }, + { + "variable": "ScrutinyFee", + "value": { + "path": "$.pdfTaxhead[?(@.taxHeadCode == 'SCRUTINY_FEE')].estimateAmount" + } + }, + { + "variable": "otherCharge", + "value": { + "path": "$.pdfTaxhead[?(@.taxHeadCode == 'OTHER_CHARGE')].estimateAmount" + } + }, + { + "variable": "securityCharge", + "value": { + "path": "$.pdfTaxhead[?(@.taxHeadCode == 'SECURITY_CHARGE')].estimateAmount" + } + }, + { + "variable": "taxCess", + "value": { + "path": "$.pdfTaxhead[?(@.taxHeadCode == 'TAX_AND_CESS')].estimateAmount" + } + }, + { + "variable": "roadCharge", + "value": { + "path": "$.pdfTaxhead[?(@.taxHeadCode == 'ROAD_CUTTING_CHARGE')].estimateAmount" + } + }, + { + "variable": "oneTimeFee", + "value": { + "path": "$.pdfTaxhead[?(@.taxHeadCode == 'ONE_TIME_FEE')].estimateAmount" + } + }, + { + "variable": "penaltyAmount", + "value": { + "path": "$.additionalDetails.adhocPenalty" + } + }, + { + "variable": "rebateAmount", + "value": { + "path": "$.additionalDetails.adhocRebate" + } + }, + { + "variable": "totalAmount", + "value": { + "path": "$.totalAmount" + } + }, + { + "variable": "tenantName", + "value": { + "path": "$.tenantName" + } + }, + { + "variable": "date", + "value": { + "path": "$.connectionExecutionDate" + }, + "type": "date" + }, + { + "variable": "total", + "value": { + "path": "PDF_STATIC_LABELWS_CONSOLIDATED_ACKNOWELDGMENT_TOTAL" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "Rs", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_RUPEE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "Municipal_Corporation", + "value": { + "path": "PDF_STATIC_LABEL_WS_MDMS_MUNICIPAL_CORPORATION_LOGO_HEADER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "presented_by", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PRESENTED_BY" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "commissioner_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_COMMISSIONER_LABEL" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "app_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_ACKNOWELDGMENT_APPLICATION_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "date_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_DATE_LABEL" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "sub_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_SUBJECT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "ref_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_REFERENCE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "total_amount", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_TOTAL_AMOUNT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "sub_data1", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_SUB_DATA1" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "sub_data2", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_SUB_DATA2" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "locality_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_LOCALITY_LABEL" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "order_issued", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ORDER_ISSUED" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "ref_message1", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_REF_MESSAGE1" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "dated_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_DATED_LABEL" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "ref_message2", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ESTIMATION_NOTICE_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "order_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ORDER_LABEL" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "in_ref_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ORDER_DESCRIPTION" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "order_meassage1", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ORDER_MESSAGE1" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "order_meassage2", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_SEEKING" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "order_meassage3", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_WATER_TAP_CONNECTION" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "order_data2", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ORDER_DATA2" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "order_data3", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ORDER_DATA3" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "for_commissioner_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_APPROVAL_EXECUTIVE_OFFICER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "to_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_TO_LABEL" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "sri_smt_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_SRI_SMT_LABEL" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "door_no_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_DOOR_NO_LABEL" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "copy_message1", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_COPY_MESSAGE1" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "copy_message-sub1", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_COPY_MESSAGE_SUB1" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "copy_message2", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_COPY_MESSAGE2" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "UAT", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_UAT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "form_fee", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_FORM_FEE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "scrutiny_fee", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_SCRUTINY_FEE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "other_charge", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_OTHER_CHARGE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "security_charge", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_SECURITY_CHARGE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "tax_cess", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_TAX_CESS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "penalty", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PENALTY" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "rebate", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_REBATE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "one_time_fee", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ONE_TIME_FEE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "approved_by", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_COMPUTER_GENERATED_DOCUMENT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "connection_header", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_CONNECTION_HEADER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "road_charge", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ROAD_CHARGE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + } + ] + }, + { + "externalAPI": [ + { + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.property.tenantId}')%5D", + "apiRequest": null, + "responseMapping": [ + { + "variable": "logoImage", + "value": "$.MdmsRes.tenant.tenants[0].logoId", + "type": "image" + }, + { + "variable": "logo_header", + "value": "$.MdmsRes.tenant.tenants[0].code", + "localisation": { + "required": true, + "prefix": "TENANT_TENANTS", + "module": "rainmaker-common" + } + } + ] + } + ] + } + ] + } + ] + } +} diff --git a/configs/pdf-service/format-config/bpa-revocation.json b/configs/pdf-service/format-config/bpa-revocation.json new file mode 100644 index 00000000..43731998 --- /dev/null +++ b/configs/pdf-service/format-config/bpa-revocation.json @@ -0,0 +1,171 @@ +{ + "key": "bpa-revocation", + "config": { + "defaultStyle": { + "font": "Cambay" + }, + "content": [ + { + "columns": [ + { + "image": "{{logoImage}}", + "width": 70, + "height": 70, + "alignment": "left" + }, + { + "stack": [ + { + "text": "{{tenantName}} {{Muncipal_Council}}", + "style": "header" + }, + { + "text": "{{Revocation_Title}}", + "style": "sub-header" + } + ] + }, + { + "image": "{{logoImage}}", + "width": 70, + "height": 70, + "alignment": "right" + } + ] + }, + { + "columns": [ + { + "text": [ + { + "text": "{{Dated}} : ", + "bold": true + }, + { + "text": "{{createdDate}}", + "bold": true + } + ], + "alignment": "right" + } + ], + "style": "top-margin" + }, + { + "text": [ + { + "text": "{{SALUTATION}} " + }, + { + "text": "{{ownerName}},", + "bold": true + } + ], + "style": "top-margin" + }, + { + "text": [ + { + "text": "{{Permision_Issued}} " + }, + { + "text": "{{planPermissionNo}}", + "bold": true, + "font": "Roboto" + }, + { + "text": " {{WRT_APPNO}} " + }, + { + "text": "{{applicationNo}}", + "bold": true, + "font": "Roboto" + }, + { + "text": " {{dated}} " + }, + { + "text": "{{createdDate}}", + "bold": true + }, + { + "text": " {{isRevocated}}. " + } + ], + "style": "top-low-margin" + }, + { + "text": [ + { + "text": "{{revocationReasonIs}}" + }, + { + "text": " {{revocationReason}}.", + "bold": true + }, + { + "text": " {{noAuthText}}." + } + ], + "style": "top-low-margin" + }, + { + "text": [ + { + "text": "{{contactULB}}." + } + ], + "style": "top-low-margin" + }, + { + "stack": [ + { + "text": "{{BY_ORDER}}", + "style": "top-margin" + }, + { + "text": "{{AUTH_OFFICER}}", + "margin": 2 + }, + { + "text": "{{revocatedBy}}", + "margin": 2 + } + ], + "alignment": "right", + "style": "top-margin" + } + ], + "styles": { + "header": { + "bold": true, + "alignment": "center" + }, + "sub-header": { + "alignment": "center", + "margin": [ + 0, + 5, + 0, + 5 + ] + }, + "top-margin": { + "margin": [ + 0, + 30, + 0, + 0 + ] + }, + "top-low-margin": { + "margin": [ + 0, + 10, + 0, + 0 + ] + } + } + } +} diff --git a/configs/pdf-service/format-config/buildingpermit-low.json b/configs/pdf-service/format-config/buildingpermit-low.json new file mode 100644 index 00000000..f565545f --- /dev/null +++ b/configs/pdf-service/format-config/buildingpermit-low.json @@ -0,0 +1,328 @@ +{ + "key": "buildingpermit-low", + "config": { + "defaultStyle": { + "font": "Cambay" + }, + "content": [ + { + "text" : "{{GENERATED_ON}} : ", + "absolutePosition" : { + "x" : 400, + "y" : 5 + } + }, + { + "text" : " {{orderGeneratedOn}}", + "absolutePosition" : { + "x" : 500, + "y" : 5 + } + }, + { + "columns": [ + { + "image": "{{logoImage}}", + "width": 70, + "height": 70, + "alignment": "left" + }, + { + "stack": [ + { + "text": "{{tenantName}} {{Muncipal_Council}}", + "style": "header" + }, + { + "text": "{{BPA_FORM}}", + "style": "sub-header" + }, + { + "text": "{{BPA_FORM_APPROVAL}}", + "style": "header" + }, + { + "text": "{{BPA_BYELAWS}}", + "style": "sub-header" + } + ] + }, + { + "image": "{{logoImage}}", + "width": 70, + "height": 70, + "alignment": "right" + } + ] + }, + { + "columns": [ + { + "text": [ + { + "text": "{{PLAN_PERMISION_NO}} : ", + "bold": true + }, + { + "text": "{{planPermissionNo}}", + "bold": true, + "font": "Roboto" + } + ], + "alignment": "left", + "width": "*" + } + ], + "style": "top-margin" + }, + { + "text": [ + { + "text": "{{WRT_TXT}}" + }, + { + "text" : " {{applicationNo}}", + "bold" : true, + "font": "Roboto" + }, + { + "text" : " {{dated}}" + }, + { + "text" : " {{applicationDate}}" + }, + { + "text" : ", {{PERMISSION_GRANT_TXT}} : " + } + ], + "style": "top-margin" + }, + { + "text": [ + { + "text": "{{SALUTATION}} " + }, + { + "text": "{{favourOf}}", + "bold": true + }, + { + "text": " {{FOR}} " + } + ], + "style": "top-margin" + }, + { + "text": [ + { + "text": "{{DSCR1}} {{PLOT_NO}} {{CS_PLOT}}" + }, + { + "text": " {{plotNo}}", + "bold": true + }, + { + "text": " {{PLOT_NO}} {{MSP_PLOT}} " + }, + { + "text": "{{plotNo}}", + "bold": true + }, + { + "text": " {{KHATA_NO}} " + }, + { + "text": "{{khataNo}}", + "bold": true + }, + { + "text": " {{HOLDING_NO}} " + }, + { + "text": "{{holdingNo}}", + "bold": true + }, + { + "text" : " {{SERVEY_NO}} " + }, + { + "text" : "{{reServeyPlotNo}}", + "bold" : true + }, + { + "text" : " {{TOWNPLANNING_TXT}} " + }, + { + "text" : "{{townPlanningScheme}}", + "bold" : true + }, + { + "text" : " {{PROPOSE_LAND}} " + }, + { + "text" : "{{proposedLandUse}}", + "bold" : true + }, + { + "text": " {{OF}} " + }, + { + "text": "{{tenantName}} {{BPA_PDF_MUNCIPAL}}", + "bold": true + }, + { + "text": " {{CONDNS_TXT}}" + } + ] + }, + { + "separator": ")", + "ol": ["{{conditions}}"] + }, + { + "stack": [ + { + "text": "{{PERMIT_DETAILS_TXT}}," + } + ], + "bold": true, + "style": "top-margin" + }, + { + "table": { + "widths": [ + "auto", + "auto" + ], + "body": [ + [ + { + "text" : "{{FEE_DSCR}}", + "alignment" : "center", + "bold" : true + }, + { + "text" : "{{AMOUNT}}", + "bold" : true, + "alignment" : "right" + } + ], + "{{#paymentDetails}}[{ \"text\":\"{{headCode}}\", \"border\":[ true, true, true, true ],\"alignment\": \"center\"},{ \"text\":\"{{amnt}}\", \"border\":[ true, true, true, true ],\"alignment\": \"right\"}]{{/paymentDetails}}", + [ + { + "text" : "{{TOTAL}}", + "alignment" : "center" + }, + { + "text" : "{{totalDue}}", + "alignment" : "right" + } + ] + ] + }, + "margin": [ + 0, + 5, + 0, + 0 + ] + }, + { + "stack": [ + { + "text": "{{BY_ORDER}}", + "style": "top-margin" + }, + { + "text": "{{AUTH_OFFICER}}", + "margin": 2 + }, + { + "text": "{{tenantName}}", + "margin": 2 + } + ], + "alignment": "right", + "style": "top-margin" + }, + { + "text" : [ + { + "text" : "{{AUTH_DSCR}}" + } + ] + }, + { + "text": [ + { + "text": "{{VALIDITY_DSCR}} " + }, + { + "text": "{{validityDate}}" + }, + { + "text": " {{ONLY}}." + } + ], + "style": "top-margin", + "bold": true + }, + { + "text": "{{NOTE}} : ", + "bold": true, + "style": "top-margin" + }, + { + "text": [ + { + "text" : "{{SUMMARY1}}" + }, + { + "text" : " {{Bihar_Tenant}} " + }, + { + "text" : "{{SUMMARY2}}." + } + ], + "style": "top-margin" + }, + { + "image": "{{qrCode}}", + "alignment": "right", + "width": 100, + "height": 100 + } + ], + "styles": { + "header": { + "bold": true, + "alignment": "center" + }, + "sub-header": { + "alignment": "center", + "margin": [ + 0, + 5, + 0, + 5 + ] + }, + "top-margin": { + "margin": [ + 0, + 10, + 0, + 0 + ] + }, + "top-high-margin": { + "margin": [ + 0, + 30, + 0, + 0 + ] + } + } + } +} diff --git a/configs/pdf-service/format-config/buildingpermit.json b/configs/pdf-service/format-config/buildingpermit.json new file mode 100644 index 00000000..0bb95339 --- /dev/null +++ b/configs/pdf-service/format-config/buildingpermit.json @@ -0,0 +1,341 @@ +{ + "key": "buildingpermit", + "config": { + "defaultStyle": { + "font": "Cambay" + }, + "content": [ + { + "text" : "{{GENERATED_ON}} : ", + "absolutePosition" : { + "x" : 400, + "y" : 5 + } + }, + { + "text" : " {{orderGeneratedOn}}", + "absolutePosition" : { + "x" : 500, + "y" : 5 + } + }, + { + "columns": [ + { + "image": "{{logoImage}}", + "width": 70, + "height": 70, + "alignment": "left" + }, + { + "stack": [ + { + "text": "{{tenantName}} {{Muncipal_Council}}", + "style": "header" + }, + { + "text": "{{BPA_FORM}}", + "style": "sub-header" + }, + { + "text": "{{BPA_FORM_APPROVAL}}", + "style": "header" + }, + { + "text": "{{BPA_BYELAWS}}", + "style": "sub-header" + } + ] + }, + { + "image": "{{logoImage}}", + "width": 70, + "height": 70, + "alignment": "right" + } + ] + }, + { + "columns": [ + { + "text": [ + { + "text": "{{PLAN_PERMISION_NO}} : ", + "bold": true + }, + { + "text": "{{planPermissionNo}}", + "bold": true, + "font": "Roboto" + } + ], + "alignment": "left", + "width": "*" + } + ], + "style": "top-margin" + }, + { + "text": [ + { + "text": "{{WRT_TXT}}" + }, + { + "text": " {{applicationNo}}", + "bold": true, + "font": "Roboto" + }, + { + "text": " {{dated}}" + }, + { + "text": " {{applicationDate}}" + }, + { + "text": ", {{PERMISSION_GRANT_TXT}} : " + } + ], + "style": "top-margin" + }, + { + "text": [ + { + "text": "{{SALUTATION}} " + }, + { + "text": "{{favourOf}}", + "bold": true + }, + { + "text": " {{FOR}} " + } + ], + "style": "top-margin" + }, + { + "text": [ + { + "text": "{{DSCR1}} {{PLOT_NO}} {{CS_PLOT}}" + }, + { + "text": " {{plotNo}}", + "bold": true + }, + { + "text": " {{PLOT_NO}} {{MSP_PLOT}} " + }, + { + "text": "{{plotNo}}", + "bold": true + }, + { + "text": " {{KHATA_NO}} " + }, + { + "text": "{{khataNo}}", + "bold": true + }, + { + "text": " {{HOLDING_NO}} " + }, + { + "text": "{{holdingNo}}", + "bold": true + }, + { + "text": " {{SERVEY_NO}} " + }, + { + "text": "{{reServeyPlotNo}}", + "bold": true + }, + { + "text": " {{TOWNPLANNING_TXT}} " + }, + { + "text": "{{townPlanningScheme}}", + "bold": true + }, + { + "text": " {{PROPOSE_LAND}} " + }, + { + "text": "{{proposedLandUse}}", + "bold": true + }, + { + "text": " {{OF}} " + }, + { + "text": "{{tenantName}} {{BPA_PDF_MUNCIPAL}}", + "bold": true + }, + { + "text": " {{CONDNS_TXT}}" + } + ] + }, + { + "separator": ")", + "ol": [ + "{{conditions}}" + ] + }, + { + "stack": [ + { + "text": "{{PERMIT_DETAILS_TXT}}," + } + ], + "bold": true, + "style": "top-margin" + }, + { + "table": { + "widths": [ + "auto", + "auto" + ], + "body": [ + [ + { + "text": "Fee Description", + "bold": true + }, + { + "text": "Amount (Rs)", + "bold": true, + "alignment": "right" + } + ], + [ + { + "text": "{{appHeadCode}}" + }, + { + "text": "{{appFee}}", + "alignment": "right" + } + ], + [ + { + "text": "{{sanHeadCode}}" + }, + { + "text": "{{sanFee}}", + "alignment": "right" + } + ], + [ + { + "text": "Total", + "bold": true + }, + { + "text": "{{totalDue}}", + "bold": true, + "alignment": "right" + } + ] + ] + }, + "margin": [ + 0, + 5, + 0, + 0 + ] + }, + { + "stack": [ + { + "text": "{{BY_ORDER}}", + "style": "top-margin" + }, + { + "text": "{{AUTH_OFFICER}}", + "margin": 2 + }, + { + "text": "{{approvedBy}}", + "margin": 2 + } + ], + "alignment": "right", + "style": "top-margin" + }, + { + "text": [ + { + "text": "{{VALIDITY_DSCR}} " + }, + { + "text": "{{validityDate}}" + }, + { + "text": " {{ONLY}}." + } + ], + "style": "top-margin", + "bold": true + }, + { + "text": "{{NOTE}} : ", + "bold": true, + "style": "top-margin" + }, + { + "text": [ + { + "text": "{{SUMMARY1}}" + }, + { + "text": " {{Bihar_Tenant}} " + }, + { + "text": "{{SUMMARY2}}." + } + ], + "style": "top-margin" + }, + { + "image": "{{qrCode}}", + "alignment": "right", + "width": 100, + "height": 100 + } + ], + "footer": "(function(currentPage, pageCount) { return currentPage.toString() + ' of ' + pageCount; })", + "styles": { + "header": { + "bold": true, + "alignment": "center" + }, + "sub-header": { + "alignment": "center", + "margin": [ + 0, + 5, + 0, + 5 + ] + }, + "top-margin": { + "margin": [ + 0, + 10, + 0, + 0 + ] + }, + "top-high-margin": { + "margin": [ + 0, + 30, + 0, + 0 + ] + } + } + } +} diff --git a/configs/pdf-service/format-config/consolidated-pdf1.json b/configs/pdf-service/format-config/consolidated-pdf1.json new file mode 100644 index 00000000..d9197f53 --- /dev/null +++ b/configs/pdf-service/format-config/consolidated-pdf1.json @@ -0,0 +1,561 @@ +{ + "key": "consolidated-pdf1", + "config": { + "content": [ + { + "style": "noc-head", + "table": { + "widths": [ + 60, + "*", + 120 + ], + "body": [ + [ + { + "image": "{{variable16}}", + "width": 50, + "height": 61.25 + }, + { + "stack": [ + { + "text": "Amritsar Municipal Corportaion", + "style": "receipt-logo-header" + }, + { + "text": "Property Tax payment Receipt", + "style": "receipt-logo-sub-header" + } + ], + "alignment": "left", + "margin": [ + 0, + 10, + 0, + 0 + ] + }, + { + "stack": [ + { + "text": "C Block, Ranjit Avenue, Amritsar" + }, + { + "text": " Tel. +91-183-2502339" + }, + { + "text": "website: www.amritsarcorp.com" + }, + { + "text": "Email: cmcasr@punjab.gov.in" + } + ], + "alignment": "right", + "color": "#484848", + "margin": [ + -150, + 0, + 0, + 0 + ] + } + ] + ] + }, + "layout": "noBorders" + }, + { + "style": "noc-table", + "table": { + "widths": [ + "*", + "*", + "*", + "*" + ], + "body": [ + [ + { + "text": "Receipt No.", + "border": [ + true, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{variable3}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Consumer ID", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{variable14}}", + "border": [ + false, + true, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "Payment Date", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{variable13}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Payer Name", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{variable1}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "Payer Contact", + "border": [ + true, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{variable2}}", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table" + }, + { + "text": "", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "", + "border": [ + false, + false, + true, + true + ] + } + ] + ] + }, + "layout": {} + }, + { + "style": "noc-table2", + "table": { + "widths": [ + "*", + "*", + "*", + "*" + ], + "body": [ + [ + { + "text": "Service Type", + "border": [ + true, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{variable4}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Billing Period", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{variable6}} to {{variable7}}", + "border": [ + false, + true, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "Paid Amount", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{variable5}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Pending Amount", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{variable19}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "Payment Mode", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{variable9}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Transaction ID", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{variable15}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "G8 Receipt No.", + "border": [ + true, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{variable10}}", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table" + }, + { + "text": "G8 Receipt Date", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{variable11}}", + "border": [ + false, + false, + true, + true + ], + "style": "receipt-table" + } + ] + ] + }, + "layout": {} + }, + { + "style": "receipt-approver", + "columns": [ + { + "text": [ + { + "text": "Generated by: ", + "bold": true + }, + { + "text": "Satplal Dhillon", + "bold": false + } + ], + "alignment": "left" + }, + { + "text": [ + { + "text": "Commissioner/EO", + "bold": true + } + ], + "alignment": "right" + } + ] + }, + { + "style": "no-signature", + "text": "This is Computer generated receipt, Signature is not required" + }, + { + "style": "pt-disclaimer", + "stack": [ + { + "text": "Disclamer", + "bold": true, + "style": "pt-disclaimer-value" + }, + { + "text": "Lorem ipsum dolor sit amet", + "bold": false, + "style": "pt-disclaimer-value" + }, + { + "text": "Lorem ipsum dolor sit amet", + "bold": false, + "style": "pt-disclaimer-value" + }, + { + "text": "Lorem ipsum dolor sit amet", + "bold": false, + "style": "pt-disclaimer-value" + } + ] + } + ], + "styles": { + "noc-head": { + "margin": [ + -30, + -30, + 0, + 1 + ] + }, + "receipt-logo-header": { + "color": "#484848", + "fontFamily": "Roboto", + "fontSize": 16, + "bold": true, + "letterSpacing": 0.74, + "margin": [ + 0, + 0, + 0, + 5 + ] + }, + "receipt-logo-sub-header": { + "color": "#484848", + "fontFamily": "Roboto", + "fontSize": 13, + "letterSpacing": 0.6 + }, + "noc-table": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -30, + 45, + -8, + -8 + ] + }, + "noc-table2": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -30, + 28, + -8, + -8 + ] + }, + "receipt-table-value": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 8, + 8, + 0, + 8 + ] + }, + "receipt-table": { + "color": "#484848", + "bold": true, + "fontSize": 12, + "fontWeight": 400, + "margin": [ + -30, + 8, + 0, + 8 + ] + }, + "receipt-approver": { + "fontSize": 12, + "bold": true, + "margin": [ + -27, + 50, + -10, + 0 + ], + "color": "#484848" + }, + "no-signature": { + "fontSize": 12, + "margin": [ + -27, + 35, + -10, + 0 + ], + "color": "#484848" + }, + "pt-disclaimer": { + "fontSize": 12, + "margin": [ + -27, + 30, + -10, + 0 + ], + "color": "#484848" + }, + "pt-disclaimer-value": { + "fontSize": 12, + "margin": [ + 0, + 5, + 0, + 0 + ], + "color": "#484848" + } + } + } +} diff --git a/configs/pdf-service/format-config/consolidated-pdf2.json b/configs/pdf-service/format-config/consolidated-pdf2.json new file mode 100644 index 00000000..f41c0de5 --- /dev/null +++ b/configs/pdf-service/format-config/consolidated-pdf2.json @@ -0,0 +1,1030 @@ +{ + "key": "consolidated-pdf2", + "config": { + "content": [ + { + "style": "noc-head", + "table": { + "widths": [ + 60, + "*", + 120 + ], + "body": [ + [ + { + "image": "{{variable1}}", + "width": 50, + "height": 61.25 + }, + { + "stack": [ + { + "text": "Amritsar Municipal Corportaion", + "style": "receipt-logo-header" + }, + { + "stack": [ + { + "text": "C Block, Ranjit Avenue, Amritsar" + }, + { + "text": " Tel. +91-183-2502339" + }, + { + "text": "website: www.amritsarcorp.com" + }, + { + "text": "Email: cmcasr@punjab.gov.in" + } + ] + } + ], + "alignment": "left", + "margin": [ + 0, + 10, + 0, + 0 + ] + }, + { + "stack": [ + { + "text": "Total Amount due" + }, + { + "text": "{{variable11}}", + "style": "amount-due" + }, + { + "table": { + "widths": [ + "*", + "*" + ], + "body": [ + [ + { + "image": "{{variable}}", + "width": 40, + "height": 40, + "border": [ + false, + false, + false, + false + ], + "style": "qr-image" + }, + { + "stack": [ + { + "text": "Scan Code to pay", + "style": "qr-text" + }, + { + "text": "Use any Bank/UPI App", + "style": "qr-text" + } + ], + "border": [ + false, + false, + false, + false + ] + } + ] + ], + "alignment": "right", + "margin": [ + 0, + 10, + 0, + 0 + ] + } + } + ], + "alignment": "right", + "color": "#484848", + "margin": [ + -150, + 2, + -20, + 0 + ] + } + ] + ] + }, + "layout": "noBorders" + }, + { + "style": "noc-table", + "table": { + "widths": [ + 130, + 130, + -2, + 130, + 130 + ], + "body": [ + [ + { + "text": "Payer Name", + "border": [ + true, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{variable2}}", + "border": [ + false, + true, + true, + false + ], + "style": "receipt-table" + }, + { + "text": "", + "border": [ + false, + false, + false, + false + ] + }, + { + "text": "Bill No.", + "border": [ + true, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{variable5}}", + "border": [ + false, + true, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "Mobile No.", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{variable3}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + }, + { + "text": "", + "border": [ + false, + false, + false, + false + ] + }, + { + "text": "Bill Period", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{variable6}} - {{variable7}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "Payer Address", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{variable4}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + }, + { + "text": "", + "border": [ + false, + false, + false, + false + ] + }, + { + "text": "Bill Issue Date", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{variable8}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "", + "border": [ + true, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "", + "border": [ + false, + false, + true, + true + ], + "style": "receipt-table" + }, + { + "text": "", + "border": [ + false, + false, + false, + false + ] + }, + { + "text": "Bill Due Date", + "border": [ + true, + false, + false, + true + ], + "style": "right-receipt-table" + }, + { + "text": "{{variable7}}", + "border": [ + false, + false, + true, + true + ], + "style": "right-receipt-table2" + } + ] + ] + }, + "layout": {} + }, + { + "style": "noc-table2", + "table": { + "widths": [ + "103%" + ], + "body": [ + [ + { + "text": "Billing Summary - Property Tax", + "border": [ + true, + true, + true, + false + ], + "style": "receipt-table-value" + } + ], + [ + { + "table": { + "widths": [ + "15%", + "20%", + "11%", + "12%", + "11%", + "12%", + "11%", + "11%" + ], + "body": [ + [ + { + "text": "Property ID", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "Bill Period", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "Arrears", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "Charge", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "Penalty", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "Rebate", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "Others", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "Total", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + } + ], + [ + { + "text": "{{variable12}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{variable6}}-{{variable7}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{variable13}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{variable14}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{variable9}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{variable10}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{variable14}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{variable11}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2", + "bold": true + } + ] + ] + }, + "border": [ + true, + false, + true, + true + ] + } + ] + ] + }, + "layout": {} + }, + { + "style": "noc-table3", + "table": { + "widths": [ + "103%" + ], + "body": [ + [ + { + "text": "Important Message", + "border": [ + true, + true, + true, + false + ], + "margin": [ + 9, + 10, + 0, + 5 + ], + "style": "receipt-table-value" + } + ], + [ + { + "ol": [ + { + "text": "Payment received by cheque/demand draft shall be subject to realization.", + "margin": [ + 8, + 0, + 0, + 5 + ] + }, + { + "text": "This document is not a proof of Property Ownership and regularization of unauthorized construction.", + "margin": [ + 8, + 0, + 0, + 5 + ] + }, + { + "text": "This is a computer generated document, hence requires no signature.", + "margin": [ + 8, + 0, + 0, + 5 + ] + }, + { + "text": "Assessment & Payment is subject to verification/Scrutiny by competitive authority.", + "margin": [ + 8, + 0, + 0, + 5 + ] + }, + { + "text": "Please deposit property tax dues for earlier years also. Ignore, if already paid.", + "margin": [ + 8, + 0, + 0, + 5 + ] + }, + { + "text": "If the tax payers fail to pay the property tax within 15 days from the date of receipt of this Demand Bill, the same amount can be collected by issuing a distraint warrant u/s Section-269 of Municipal Corporations Act, 1955 (formerly GHMC Act, 1955)", + "margin": [ + 8, + 0, + 0, + 10 + ] + } + ], + "border": [ + true, + false, + true, + true + ], + "alignment": "left" + } + ] + ] + }, + "layout": {} + }, + { + "canvas": [ + { + "type": "line", + "x1": -40, + "y1": 30, + "x2": 700, + "y2": 30, + "dash": { + "length": 10, + "space": 5 + } + } + ] + }, + { + "image": "{{variable1}}", + "width": 14, + "height": 14, + "margin": [ + -30, + -7, + 0, + 0 + ] + }, + { + "text": "Acknowledgement( For Official use only)", + "style": "footer-header" + }, + { + "style": "noc-table", + "table": { + "widths": [ + "*", + "*", + "*", + "*" + ], + "body": [ + [ + { + "text": "Date", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "24/04/2018", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "Consumer ID", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{variable15}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Bill No.", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{variable5}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "Name & Address", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{variable4}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Total Payment", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{variable16}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + } + ] + ] + } + } + ], + "styles": { + "noc-head": { + "margin": [ + -25, + -30, + 0, + 1 + ] + }, + "receipt-logo-header": { + "color": "#484848", + "fontFamily": "Roboto", + "fontSize": 14, + "bold": true, + "letterSpacing": 0.74, + "margin": [ + 0, + -10, + 0, + 5 + ] + }, + "receipt-logo-sub-header": { + "color": "#484848", + "fontFamily": "Roboto", + "fontSize": 13, + "letterSpacing": 0.6 + }, + "noc-table": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -25, + 45, + -8, + -8 + ] + }, + "noc-table2": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -25, + 18, + -8, + -8 + ] + }, + "noc-table3": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -25, + 30, + -8, + -8 + ] + }, + "receipt-table-value": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 8, + 5, + 0, + 0 + ] + }, + "receipt-table-value2": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 3, + 5, + 0, + 0 + ] + }, + "receipt-table": { + "color": "#484848", + "bold": true, + "fontSize": 12, + "fontWeight": 400, + "margin": [ + -30, + 5, + 0, + 0 + ] + }, + "receipt-table2": { + "color": "#484848", + "bold": true, + "fontSize": 12, + "fontWeight": 400, + "margin": [ + 3, + 8, + 0, + 10 + ] + }, + "right-receipt-table": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 8, + -10, + 0, + 10 + ] + }, + "right-receipt-table2": { + "color": "#484848", + "bold": true, + "fontSize": 12, + "fontWeight": 400, + "margin": [ + -30, + -10, + 0, + 0 + ] + }, + "receipt-approver": { + "fontSize": 12, + "bold": true, + "margin": [ + -27, + 50, + -10, + 0 + ], + "color": "#484848" + }, + "no-signature": { + "fontSize": 12, + "margin": [ + -27, + 35, + -10, + 0 + ], + "color": "#484848" + }, + "amount-due": { + "fontSize": 30, + "color": "#FC8019", + "fontWeight": 700 + }, + "pt-disclaimer": { + "fontSize": 12, + "margin": [ + -27, + 30, + -10, + 0 + ], + "color": "#484848" + }, + "pt-disclaimer-value": { + "fontSize": 12, + "margin": [ + 0, + 5, + 0, + 0 + ], + "color": "#484848" + }, + "qr-text": { + "fontSize": 12, + "margin": [ + 40, + 0, + 0, + 0 + ], + "color": "#484848", + "alignment": "left" + }, + "qr-image": { + "margin": [ + -40, + -1, + -3, + 0 + ], + "color": "#484848", + "alignment": "right" + }, + "footer-header": { + "margin": [ + 0, + 15, + 0, + -40 + ], + "color": "#000000", + "alignment": "center" + } + } + } +} diff --git a/configs/pdf-service/format-config/consolidatedbill.json b/configs/pdf-service/format-config/consolidatedbill.json new file mode 100644 index 00000000..992700b0 --- /dev/null +++ b/configs/pdf-service/format-config/consolidatedbill.json @@ -0,0 +1,1014 @@ +{ + "key": "consolidatedbill", + "config": { + "defaultStyle": { + "font": "Cambay" + }, + "content": [ + { + "style": "noc-head", + "table": { + "widths": [ + 60, + "*", + 120 + ], + "body": [ + [ + { + "image": "{{logoImage}}", + "width": 50, + "height": 61.25 + }, + { + "stack": [ + { + "text": "{{logo_header}} {{Municipal_Corporation}}", + "style": "receipt-logo-header" + }, + { + "stack": [ + { + "text": "{{address}}" + }, + { + "text": "{{phoneNumber}}" + }, + { + "text": "{{website}}" + }, + { + "text": "{{email}}" + } + ] + } + ], + "alignment": "left", + "margin": [ + 0, + 10, + 0, + 0 + ] + }, + { + "stack": [ + { + "text": "{{total_amount_due}}" + }, + { + "text": "{{Rs}} {{totalAmountDue}}", + "style": "amount-due" + } + ], + "alignment": "right", + "color": "#484848", + "margin": [ + -150, + 2, + -20, + 0 + ] + } + ] + ] + }, + "layout": "noBorders" + }, + { + "style": "noc-table", + "table": { + "widths": [ + 130, + 130, + -2, + 130, + 130 + ], + "body": [ + [ + { + "text": "{{payer_name}}", + "border": [ + true, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerName}}", + "border": [ + false, + true, + true, + false + ], + "style": "receipt-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ] + }, + { + "text": "{{bill_no}}", + "border": [ + true, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{billNo}}", + "border": [ + false, + true, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{mobile_no}}", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{mobileNo}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ] + }, + { + "text": "{{bill_period}}", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{fromPeriod}} - {{toPeriod}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{payer_address}}", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerAddress}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ] + }, + { + "text": "{{bill_issue_date}}", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{billIssueDate}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": " ", + "border": [ + true, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": " ", + "border": [ + false, + false, + true, + true + ], + "style": "receipt-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ] + }, + { + "text": "{{bill_due_date}}", + "border": [ + true, + false, + false, + true + ], + "style": "right-receipt-table" + }, + { + "text": "{{billDueDate}}", + "border": [ + false, + false, + true, + true + ], + "style": "right-receipt-table2" + } + ] + ] + }, + "layout": {} + }, + { + "style": "noc-table2", + "table": { + "widths": [ + "103%" + ], + "body": [ + [ + { + "text": "{{billing_summary_property_tax}} {{serviceType}}", + "border": [ + true, + true, + true, + false + ], + "style": "receipt-table-value" + } + ], + [ + { + "table": { + "widths": [ + "18%", + "26%", + "10%", + "9%", + "10%", + "9%", + "10%", + "9%" + ], + "body": [ + [ + { + "text": "{{consumer_no}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{bill_period}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{arrears_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{charge_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{penalty_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{rebate_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{others_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{total_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + } + ], + [ + { + "text": "{{propertyID}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{fromPeriod}}-{{toPeriod}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{arrears}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{charge}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{penalty}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{rebate}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{others}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{total}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2", + "bold": true + } + ] + ] + }, + "border": [ + true, + false, + true, + true + ] + } + ] + ] + }, + "layout": {} + }, + { + "style": "noc-table3", + "table": { + "widths": [ + "103%" + ], + "body": [ + [ + { + "text": "{{important_message}}", + "border": [ + true, + true, + true, + false + ], + "margin": [ + 9, + 10, + 0, + 5 + ], + "style": "receipt-table-value" + } + ], + [ + { + "ol": [ + { + "text": "{{payment_received}}", + "margin": [ + 8, + 0, + 0, + 3 + ] + }, + { + "text": "{{this_document}}", + "margin": [ + 8, + 0, + 0, + 3 + ] + }, + { + "text": "{{this_is_a}}", + "margin": [ + 8, + 0, + 0, + 3 + ] + }, + { + "text": "{{assessment_payment}}", + "margin": [ + 8, + 0, + 0, + 3 + ] + }, + { + "text": "{{please_deposit}}", + "margin": [ + 8, + 0, + 0, + 3 + ] + }, + { + "text": "{{if_the_tax}}", + "margin": [ + 8, + 0, + 0, + 5 + ] + } + ], + "border": [ + true, + false, + true, + true + ], + "alignment": "left" + } + ] + ] + }, + "layout": {} + }, + { + "canvas": [ + { + "type": "line", + "x1": -40, + "y1": 30, + "x2": 700, + "y2": 30, + "dash": { + "length": 10, + "space": 5 + } + } + ] + }, + { + "image": "{{scissorImage}}", + "width": 24, + "height": 24, + "margin": [ + -30, + -11.2, + 0, + 0 + ] + }, + + { + "text": "{{acknowledgement_for}}", + "style": "footer-header", + "pageBreak": "before" + + }, + { + "style": "noc-table4", + "table": { + "widths": [ + "*", + "*", + "*", + "*" + ], + "body": [ + [ + { + "text": "{{date_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{billdate}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{consumer_no}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{consumerID}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{bill_no}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{billNo}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{name_address}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{nameAddress}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{total_payment}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{total}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + } + ] + ] + } + }, + { + "text": "{{receivers_signature}}", + "style": "footer-bottom" + } + ], + "styles": { + "noc-head": { + "margin": [ + -25, + -30, + 0, + 1 + ] + }, + "receipt-logo-header": { + "color": "#484848", + "fontFamily": "Roboto", + "fontSize": 14, + "bold": true, + "letterSpacing": 0.74, + "margin": [ + 0, + -10, + 0, + 5 + ] + }, + "receipt-logo-sub-header": { + "color": "#484848", + "fontFamily": "Roboto", + "fontSize": 13, + "letterSpacing": 0.6 + }, + "noc-table": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -25, + 10, + -8, + -8 + ] + }, + "noc-table4": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -25, + 75, + -8, + -8 + ] + }, + "noc-table2": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -25, + 18, + -8, + -8 + ] + }, + "noc-table3": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -25, + 30, + -8, + -8 + ] + }, + "receipt-table-value": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 8, + 5, + 0, + 0 + ] + }, + "receipt-table-value2": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 3, + 5, + 0, + 0 + ] + }, + "receipt-table": { + "color": "#484848", + "bold": true, + "fontSize": 12, + "fontWeight": 400, + "margin": [ + -30, + 5, + 0, + 0 + ] + }, + "receipt-table2": { + "color": "#484848", + "bold": true, + "fontSize": 11, + "fontWeight": 400, + "margin": [ + 3, + 8, + 0, + 10 + ] + }, + "right-receipt-table": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 8, + 5, + 0, + 10 + ] + }, + "right-receipt-table2": { + "color": "#484848", + "bold": true, + "fontSize": 12, + "fontWeight": 400, + "margin": [ + -30, + 5, + 0, + 0 + ] + }, + "receipt-approver": { + "fontSize": 12, + "bold": true, + "margin": [ + -27, + 50, + -10, + 0 + ], + "color": "#484848" + }, + "no-signature": { + "fontSize": 12, + "margin": [ + -27, + 35, + -10, + 0 + ], + "color": "#484848" + }, + "amount-due": { + "fontSize": 30, + "color": "#FC8019", + "bold": true, + "fontWeight": 700 + }, + "pt-disclaimer": { + "fontSize": 12, + "margin": [ + -27, + 30, + -10, + 0 + ], + "color": "#484848" + }, + "pt-disclaimer-value": { + "fontSize": 12, + "margin": [ + 0, + 5, + 0, + 0 + ], + "color": "#484848" + }, + "qr-text": { + "fontSize": 12, + "margin": [ + 40, + 0, + 0, + 0 + ], + "color": "#484848", + "alignment": "left" + }, + "qr-image": { + "margin": [ + -40, + -1, + -3, + 0 + ], + "color": "#484848", + "alignment": "right" + }, + "footer-header": { + "margin": [ + 0, + 15, + 0, + -40 + ], + "bold": true, + "color": "#000000", + "alignment": "center" + }, + "footer-bottom": { + "margin": [ + 0, + 50, + 0, + 0 + ], + "bold": true, + "color": "#000000", + "alignment": "right" + } + } + } +} diff --git a/configs/pdf-service/format-config/consolidatedreceipt.json b/configs/pdf-service/format-config/consolidatedreceipt.json new file mode 100644 index 00000000..28a1b63d --- /dev/null +++ b/configs/pdf-service/format-config/consolidatedreceipt.json @@ -0,0 +1,572 @@ +{ + "key": "consolidatedreceipt", + "config": { + "defaultStyle": { + "font": "Cambay" + }, + "content": [ + { + "style": "noc-head", + "table": { + "widths": [ + 60, + "*", + 120 + ], + "body": [ + [ + { + "image": "{{logoImage}}", + "width": 50, + "height": 61.25 + }, + { + "stack": [ + { + "text": "{{logo-header}} {{Municipal_Corporation}}", + "style": "receipt-logo-header" + }, + { + "text": "{{serviceType}} {{payment_receipt}}", + "style": "receipt-logo-sub-header" + } + ], + "alignment": "left", + "margin": [ + 0, + 10, + 0, + 0 + ] + }, + { + "stack": [ + { + "text": "{{address}}" + }, + { + "text": "{{phoneNumber}}" + }, + { + "text": "{{website}}" + }, + { + "text": "{{email}}" + } + ], + "alignment": "right", + "color": "#484848", + "margin": [ + -100, + 0, + -25, + 0 + ] + } + ] + ] + }, + "layout": "noBorders" + }, + { + "style": "noc-table", + "table": { + "widths": [ + "25%", + "25%", + "25%", + "25%" + ], + "body": [ + [ + { + "text": "{{receipt_no}}.", + "border": [ + true, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{receiptNo}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table", + "font": "Roboto" + }, + { + "text": "{{consumer_id}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{consumerID}}", + "border": [ + false, + true, + true, + false + ], + "style": "receipt-table", + "font": "Roboto" + } + ], + [ + { + "text": "{{payment_date}}", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{paymentDate}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{payer_name}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerName}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{payer_contact}}", + "border": [ + true, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerContact}}", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table" + }, + { + "text" : " ", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text" : " ", + "border": [ + false, + false, + true, + true + ], + "style": "receipt-table" + } + ] + ] + }, + "layout": {} + }, + { + "style": "next-noc-table", + "table": { + "widths": [ + "25%", + "25%", + "25%", + "25%" + ], + "body": [ + [ + { + "text": "{{service_type}}", + "border": [ + true, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{serviceType}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{billing_period}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{fromPeriod}} {{to}} {{toPeriod}}", + "border": [ + false, + true, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{paid_amount}}", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "₹ {{paidAmount}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{pending_amount}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "₹ {{pendingAmount}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{payment_mode}}", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{paymentMode}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{transaction_id}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{transactionID}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table", + "font": "Roboto" + } + ], + [ + { + "text": "{{g8_receipt_no}}.", + "border": [ + true, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{G8ReceiptNo}}", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table" + }, + { + "text": "{{g8_receipt_date}}", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{G8ReceiptDate}}", + "border": [ + false, + false, + true, + true + ], + "style": "receipt-table" + } + ] + ] + }, + "layout": {} + }, + { + "style": "receipt-approver", + "columns": [ + { + "text": [ + { + "text": "{{generated_by}}: ", + "bold": true + }, + { + "text": "{{user-name}}", + "bold": false + } + ], + "alignment": "left" + }, + { + "text": [ + { + "text": "{{commissioner/eo}}", + "bold": true + } + ], + "alignment": "right", + "margin": [ + 0, + 0, + -10, + 1 + ] + } + ] + }, + { + "style": "no-signature", + "text": "{{no_signature}}" + }, + { + "style": "pt-disclaimer", + "stack": [ + { + "text": "{{disclamer}}", + "bold": true, + "style": "pt-disclaimer-value" + }, + { + "text": "{{disclamer_1}}", + "bold": false, + "style": "pt-disclaimer-value" + }, + { + "text": "{{disclamer_2}}", + "bold": false, + "style": "pt-disclaimer-value" + }, + { + "text": "{{disclamer_3}}", + "bold": false, + "style": "pt-disclaimer-value" + } + ] + } + ], + "styles": { + "noc-head": { + "margin": [ + -30, + -30, + 0, + 1 + ] + }, + "receipt-logo-header": { + "color": "#000000", + "fontSize": 14, + "bold": true, + "letterSpacing": 0.74, + "margin": [ + 0, + 0, + 0, + 5 + ] + }, + "receipt-logo-sub-header": { + "color": "#000000", + "fontSize": 12, + "letterSpacing": 0.6 + }, + "noc-table": { + "fontSize": 12, + "color": "#000000", + "margin": [ + -25, + 45, + -22, + -8 + ] + }, + "next-noc-table": { + "fontSize": 12, + "color": "#000000", + "margin": [ + -25, + 28, + -22, + -8 + ] + }, + "receipt-table-value": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 8, + 8, + 0, + 8 + ] + }, + "receipt-table": { + "color": "#000000", + "bold": false, + "fontSize": 12, + "fontWeight": 400, + "margin": [ + -30, + 8, + 0, + 8 + ] + }, + "receipt-approver": { + "fontSize": 12, + "bold": true, + "margin": [ + -27, + 50, + -10, + 0 + ], + "color": "#484848" + }, + "no-signature": { + "fontSize": 12, + "margin": [ + -27, + 35, + -10, + 0 + ], + "color": "#484848" + }, + "pt-disclaimer": { + "fontSize": 12, + "margin": [ + -27, + 30, + -10, + 0 + ], + "color": "#484848" + }, + "pt-disclaimer-value": { + "fontSize": 12, + "margin": [ + 2, + 5, + 0, + 0 + ], + "color": "#484848" + } + } + } +} diff --git a/configs/pdf-service/format-config/firenoc-receipt.json b/configs/pdf-service/format-config/firenoc-receipt.json new file mode 100644 index 00000000..afa0f628 --- /dev/null +++ b/configs/pdf-service/format-config/firenoc-receipt.json @@ -0,0 +1,440 @@ +{ + "key":"firenoc-receipt", + "config":{ + "content": [ + { + "style": "noc-head", + "table": { + "widths": [ + 120, + "*", + 120 + ], + "body": [ + [ + { + "image": "{{variable32}}", + "width": 60, + "height": 61.25, + "margin": [ + 51, + 12, + 10, + 10 + ] + }, + { + "stack": [ + { + "text": "{{variable20}} NAGAR PANCHAYAT", + "style": "receipt-logo-header" + }, + { + "text": "Fire NOC Payment Receipt", + "style": "receipt-logo-sub-header" + } + ], + "alignment": "left", + "margin": [ + 10, + 23, + 0, + 0 + ] + }, + { + "image": "{{variable14}}", + "width": 70, + "height": 70, + "margin": [ + 50, + 8, + 8, + 8 + ], + "alignment": "right" + } + ] + ] + }, + "layout": "noBorders" + }, + { + "style": "noc-subhead", + "columns": [ + { + "text": [ + { + "text": "Application No. ", + "bold": true + }, + { + "text": "{{variable1}}", + "bold": false + } + ], + "alignment": "left" + }, + { + "text": [ + { + "text": "Date of Payment ", + "bold": true + }, + { + "text": "{{variable6}}", + "bold": false + } + ], + "alignment": "right" + } + ] + }, + { + "style": "noc-subhead", + "columns": [ + { + "text": [ + { + "text": "Payment Receipt No. ", + "bold": true + }, + { + "text": "{{variable7}}", + "bold": false + } + ], + "alignment": "left" + } + ] + }, + "{{#variable3}}{ \"text\": \"INSTITUTION DETAILS\", \"style\": \"noc-title\" }, { \"style\": \"noc-table\", \"table\": { \"widths\": [\"*\", \"*\", \"*\", \"*\"], \"body\": [ [ { \"text\": \"Type of Institution\", \"border\": [true, true, false, false] }, { \"text\": \"Name of Institute\", \"border\": [false, true, false, false] }, { \"text\": \"Official Telephone No.\", \"border\": [false, true, false, false] }, { \"text\": \"Authorized Person\", \"border\": [false, true, true, false] } ], [ { \"text\": \"{{variable21}}\", \"style\": \"receipt-table-value\", \"border\": [true, false, false, false] }, { \"text\": \"{{variable22}}\", \"style\": \"receipt-table-value\", \"border\": [false, false, false, false] }, { \"text\": \"{{variable23}}\", \"style\": \"receipt-table-value\", \"border\": [false, false, false, false] }, { \"text\": \"{{variable24}}\", \"style\": \"receipt-table-value\", \"border\": [false, false, true, false] } ], [ { \"text\": \"Designation in Institution\", \"border\": [true, false, false, false] }, { \"text\": \"Mobile No. of Authorized Person\", \"border\": [false, false, false, false] }, { \"text\": \"Email of Authorized Person\", \"border\": [false, false, false, false] }, { \"text\": \"Official Correspondence Address\", \"border\": [false, false, true, false] } ], [ { \"text\": \"{{variable25}}\", \"style\": \"receipt-table-value\", \"border\": [true, false, false, true] }, { \"text\": \"{{variable26}}\", \"style\": \"receipt-table-value\", \"border\": [false, false, false, true] }, { \"text\": \"{{variable27}}\", \"style\": \"receipt-table-value\", \"border\": [false, false, false, true] }, { \"text\": \"{{variable28}}\", \"style\": \"receipt-table-value\", \"border\": [false, false, true, true] } ] ] }, \"layout\": {} }{{/variable3}}{{^variable3}}{ \"text\": \"APPLICANT INFORMATION\", \"style\": \"noc-title\" }, { \"style\": \"noc-table", "table\": { \"widths\": [ \"*\", \"*\", \"*\", \"*\" ], \"body\": [ \"{{#variable2}}[{\"text\":\"Applicant Name\",\"border\":[true,true,false,true],\"style\":\"receipt-table-value\"},{\"text\":\"{{name}}\",\"border\":[false,true,true,true]},{\"text\":\"Mobile No.\",\"border\":[true,true,false,true],\"style\":\"receipt-table-value\"},{\"text\":\"{{mobileNumber}}\",\"border\":[false,true,true,true]}]{{/variable2}}\" ] }, \"layout\": {} }{{/variable3}}", + { + "text": "AMOUNT PAID", + "style": "noc-title" + }, + { + "style": "noc-table", + "table": { + "widths": [ + "*", + "*", + "*", + "*" + ], + "body": [ + [ + { + "text": "NOC Fee", + "border": [ + true, + true, + true, + true + ], + "style": "receipt-table-value", + "alignment": "center" + }, + { + "text": "NOC Taxes", + "border": [ + true, + true, + true, + true + ], + "style": "receipt-table-value", + "alignment": "center" + }, + { + "text": "Adhoc Penalty/Rebate", + "border": [ + true, + true, + true, + true + ], + "style": "receipt-table-value", + "alignment": "center" + }, + { + "text": "TOTAL", + "border": [ + true, + true, + true, + true + ], + "style": "receipt-table-value", + "alignment": "center" + } + ], + [ + { + "text": "{{variable8}}", + "border": [ + true, + true, + true, + true + ], + "alignment": "center" + }, + { + "text": "{{variable9}}", + "border": [ + true, + true, + true, + true + ], + "alignment": "center" + }, + { + "text": "{{variable31}}", + "border": [ + true, + true, + true, + true + ], + "alignment": "center" + }, + { + "text": "{{variable10}}", + "border": [ + true, + true, + true, + true + ], + "alignment": "center" + } + ] + ] + }, + "layout": {} + }, + { + "text": "PAYMENT INFORMATION", + "style": "noc-title" + }, + { + "style": "noc-table", + "table": { + "widths": [ + "*", + "*", + "*" + ], + "body": [ + [ + { + "text": "Payment Mode", + "border": [ + true, + true, + true, + true + ], + "style": "receipt-table-value", + "alignment": "center" + }, + { + "text": "Transaction ID/ Cheque/ DD No.", + "border": [ + true, + true, + true, + true + ], + "style": "receipt-table-value", + "alignment": "center" + }, + { + "text": "Bank Name & Branch", + "border": [ + true, + true, + true, + true + ], + "style": "receipt-table-value", + "alignment": "center" + } + ], + [ + { + "text": "{{variable18}}", + "border": [ + true, + true, + true, + true + ], + "alignment": "center" + }, + { + "text": "{{variable12}}", + "border": [ + true, + true, + true, + true + ], + "alignment": "center" + }, + { + "text": "{{variable13}}", + "border": [ + true, + true, + true, + true + ], + "alignment": "center" + } + ] + ] + }, + "layout": {} + }, + { + "style": "receipt-approver", + "columns": [ + { + "text": [ + { + "text": "Generated by: ", + "bold": true + }, + { + "text": "NOC Approver", + "bold": false + } + ], + "alignment": "left" + }, + { + "text": [ + { + "text": "Commissioner/EO", + "bold": true + } + ], + "alignment": "right" + } + ] + } + ], + "footer": [], + "styles": { + "noc-head": { + "fillColor": "#F2F2F2", + "margin": [ + -70, + -41, + -81, + 0 + ] + }, + "receipt-logo-header": { + "color": "#484848", + "fontFamily": "Roboto", + "fontSize": 16, + "bold": true, + "letterSpacing": 0.74, + "margin": [ + 0, + 0, + 0, + 5 + ] + }, + "receipt-logo-sub-header": { + "color": "#484848", + "fontFamily": "Roboto", + "fontSize": 13, + "letterSpacing": 0.6 + }, + "noc-subhead": { + "fontSize": 12, + "bold": true, + "margin": [ + -18, + 8, + 0, + 0 + ], + "color": "#484848" + }, + "noc-title": { + "fontSize": 10, + "bold": true, + "margin": [ + -18, + 16, + 8, + 8 + ], + "color": "#484848", + "fontWeight": 500 + }, + "noc-table": { + "fontSize": 10, + "color": "#484848", + "margin": [ + -20, + -2, + -8, + -8 + ] + }, + "receipt-header-details": { + "fontSize": 9, + "margin": [ + 0, + 0, + 0, + 8 + ], + "color": "#484848" + }, + "noc-table-key": { + "color": "#484848", + "bold": false, + "fontSize": 10 + }, + "receipt-table-value": { + "color": "#484848", + "bold": true, + "fontSize": 10 + }, + "receipt-footer": { + "color": "#484848", + "fontSize": 8, + "margin": [ + -6, + 15, + -15, + -10 + ] + }, + "receipt-no": { + "color": "#484848", + "fontSize": 10 + }, + "receipt-approver": { + "fontSize": 12, + "bold": true, + "margin": [ + -20, + 30, + -10, + 0 + ], + "color": "#484848" + } + } + } +} \ No newline at end of file diff --git a/configs/pdf-service/format-config/misc-receipt.json b/configs/pdf-service/format-config/misc-receipt.json new file mode 100644 index 00000000..babaa3eb --- /dev/null +++ b/configs/pdf-service/format-config/misc-receipt.json @@ -0,0 +1,592 @@ +{ + "key": "misc-receipt", + "config": { + "defaultStyle": { + "font": "Cambay" + }, + "content": [ + { + "style": "noc-head", + "table": { + "widths": [ + 60, + "*" + ], + "body": [ + [ + { + "image": "{{logoImage}}", + "width": 50, + "height": 61.25, + "margin": [ + 10, + 0, + 0, + 0 + ] + }, + { + "stack": [ + { + "text": "{{logo-header}}", + "style": "receipt-logo-header" + }, + { + "text": "{{payment_receipt}}", + "style": "receipt-logo-sub-header" + } + ], + "alignment": "center", + "margin": [ + 0, + 10, + 0, + 0 + ] + } + ] + ] + }, + "layout": {} + }, + { + "style": "receipt-approver", + "columns": [ + { + "text": [ + { + "text": "{{receipt_info}}", + "bold": true + } + ], + "alignment": "left" + } + ] + }, + { + "style": "noc-table", + "table": { + "widths": [ + "16%", + "18%", + "16%", + "10%", + "18%", + "22%" + ], + "body": [ + [ + { + "text": "{{receipt_no}} :", + "border": [ + true, + true, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{receiptNo}}", + "border": [ + false, + true, + true, + true + ], + "style": "receipt-table" + }, + { + "text": "{{payment_date}} :", + "border": [ + true, + true, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{paymentDate}}", + "border": [ + false, + true, + true, + true + ], + "style": "receipt-table" + }, + { + "text": "{{consumer_id}} :", + "border": [ + true, + true, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{consumerID}}", + "border": [ + false, + true, + true, + true + ], + "style": "receipt-table" + } + ] + ] + }, + "layout": {} + }, + { + "style": "receipt-approver", + "columns": [ + { + "text": [ + { + "text": "{{payer_info}}", + "bold": true + } + ], + "alignment": "left" + } + ] + }, + { + "style": "noc-table", + "table": { + "widths": [ + "25%", + "25%", + "25%", + "25%" + ], + "body": [ + [ + { + "text": "{{payer_name}} :", + "border": [ + true, + true, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerName}}", + "border": [ + false, + true, + true, + true + ], + "style": "receipt-table" + }, + { + "text": "{{payer_contact}} :", + "border": [ + true, + true, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerContact}}", + "border": [ + false, + true, + true, + true + ], + "style": "receipt-table" + } + ] + ] + }, + "layout": {} + }, + { + "style": "receipt-approver", + "columns": [ + { + "text": [ + { + "text": "{{payment_info}}", + "bold": true + } + ], + "alignment": "left" + } + ] + }, + { + "style": "next-noc-table", + "table": { + "widths": [ + "25%", + "25%", + "25%", + "25%" + ], + "body": [ + [ + { + "text": "{{service_type}} :", + "border": [ + true, + true, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{serviceType}}", + "border": [ + false, + true, + false, + true + ], + "style": "receipt-table" + }, + { + "text": " ", + "border": [ + false, + true, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": " ", + "border": [ + false, + true, + true, + true + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{billing_period}} :", + "border": [ + true, + true, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{fromPeriod}} {{to}} {{toPeriod}}", + "border": [ + false, + true, + true, + true + ], + "style": "receipt-table" + }, + { + "text": "{{paid_amount}} :", + "border": [ + true, + true, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "₹ {{paidAmount}}", + "border": [ + false, + true, + true, + true + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{payment_mode}} :", + "border": [ + true, + true, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{paymentMode}}", + "border": [ + false, + true, + true, + true + ], + "style": "receipt-table" + }, + { + "text": "{{transaction_id}} :", + "border": [ + true, + true, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{transactionID}}", + "border": [ + false, + true, + true, + true + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{g8_receipt_no}} :", + "border": [ + true, + true, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{G8ReceiptNo}}", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table" + }, + { + "text": "{{g8_receipt_date}} :", + "border": [ + true, + true, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{G8ReceiptDate}}", + "border": [ + false, + true, + true, + true + ], + "style": "receipt-table" + } + ] + ] + }, + "layout": {} + }, + { + "style": "receipt-approver", + "columns": [ + { + "text": [ + { + "text": "{{generated_by}} : ", + "bold": true + }, + { + "text": "{{user-name}}", + "bold": false + } + ], + "alignment": "left" + }, + { + "text": [ + { + "text": "{{commissioner/eo}}", + "bold": true + } + ], + "alignment": "right", + "margin": [ + 0, + 0, + -10, + 1 + ] + } + ] + }, + { + "style": "no-signature", + "text": "{{no_signature}}" + }, + { + "style": "pt-disclaimer", + "stack": [ + { + "text": "{{disclamer}}", + "bold": true, + "style": "pt-disclaimer-value" + }, + { + "text": "{{disclamer_1}}", + "bold": false, + "style": "pt-disclaimer-value" + }, + { + "text": "{{disclamer_2}}", + "bold": false, + "style": "pt-disclaimer-value" + }, + { + "text": "{{disclamer_3}}", + "bold": false, + "style": "pt-disclaimer-value" + }, + { + "text": "{{disclamer_4}}", + "bold": false, + "style": "pt-disclaimer-value" + } + ] + } + ], + "styles": { + "noc-head": { + "fillColor": "#b8bfcc", + "margin": [ + -25, + -30, + -22, + 1 + ] + }, + "receipt-logo-header": { + "color": "#000000", + "fontSize": 14, + "bold": true, + "letterSpacing": 0.74, + "margin": [ + 0, + 0, + 0, + 5 + ] + }, + "receipt-logo-sub-header": { + "color": "#000000", + "fontSize": 12, + "letterSpacing": 0.6 + }, + "noc-table": { + "fontSize": 12, + "color": "#000000", + "margin": [ + -25, + 20, + -22, + 0 + ] + }, + "next-noc-table": { + "fontSize": 12, + "color": "#000000", + "margin": [ + -25, + 10, + -22, + 0 + ] + }, + "receipt-table-value": { + "color": "#000000", + "bold": true, + "fontSize": 10, + "fontWeight": 500, + "margin": [ + 8, + 8, + 0, + 0 + ] + }, + "receipt-table": { + "color": "#000000", + "bold": false, + "fontSize": 10, + "fontWeight": 400, + "margin": [ + -6, + 8, + 0, + 0 + ] + }, + "receipt-approver": { + "fontSize": 12, + "bold": true, + "margin": [ + -27, + 30, + -10, + 0 + ], + "color": "#484848" + }, + "no-signature": { + "fontSize": 12, + "margin": [ + -27, + 35, + -10, + 0 + ], + "color": "#484848" + }, + "pt-disclaimer": { + "fontSize": 12, + "margin": [ + -27, + 30, + -10, + 0 + ], + "color": "#484848" + }, + "pt-disclaimer-value": { + "fontSize": 9, + "margin": [ + 2, + 5, + 0, + 0 + ], + "color": "#484848" + } + } + } +} diff --git a/configs/pdf-service/format-config/passvehicle-certificate.json b/configs/pdf-service/format-config/passvehicle-certificate.json new file mode 100644 index 00000000..dcbb8d75 --- /dev/null +++ b/configs/pdf-service/format-config/passvehicle-certificate.json @@ -0,0 +1,500 @@ +{ + "key": "tlcertificate", + "config": { + "defaultStyle": { + "font": "Cambay" + }, + "content": [ + + { + "style": "noc-head", + "table": { + "widths": [ + "*" + ], + "body": [ + [ + { + "image": "{{qr}}", + "width": 70, + "height": 70, + "margin": [ + 50, + 8, + -30, + 8 + ], + "alignment": "right" + } + + ] + ] + }, + "layout": "noBorders" + }, + + { + "style":"noc-head", + "table":{ + "widths":[ + "*" + ], + "body":[ + [ + { + "image": "{{userpic}}", + "width": 80, + "height": 92, + "alignment": "center", + "margin": [ + 0, + 10, + 0, + 10 + ] + } + ], + [ + { + "stack": [ + { + "text":"{{municipal_corportaion}}", + "style":"receipt-logo-header" + } + ], + "alignment":"left", + "margin":[ + 0, + 10, + 0, + 0 + ] + } + ], + [ + { + "stack": [ + { + "text":"{{trade_license_certifcate}}", + "style":"receipt-sub-logo-header" + }, + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":"{{trade_license_no}}", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":"{{tradeLicenseNo}}", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + }, + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":"{{application_no}}", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":"{{applicationNo}}", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + }, + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":"{{trade_type}}", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":"{{tradeType}}", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + }, + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":"{{pass_subCategory}}", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":"{{passSubCategory}}", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + }, + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":"{{purpose_label}}", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":"{{purpose_content}}", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + }, + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":"{{license_issue_date}}", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":"{{licenseIssueDate}}", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + }, + + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":"{{license_validity_from}}", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":"{{licenseValidityFrom}}", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + }, + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":"{{license_validity_to}}", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":"{{licenseValidityTo}}", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + }, + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":"{{vehicle_number_label}}", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":"{{vehicleNumber}}", + "style":"receipt-sub-logo-sub-header", + "font": "Roboto" + } + ] + ] + }, + "layout":"noBorders" + }, + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":"{{vehicle_company_label}}", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":"{{vehicleCompany}}", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + }, + + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":"{{vehicle_model_label}}", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":"{{vehicleModel}}", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + } + ], + "alignment":"left", + "margin":[ + 0, + 10, + 0, + 0 + ] + } + ] + ] + }, + "layout":"noBorders" + }, + { + "style":"receipt-approver", + "columns": [ + { + "text":[ + { + "text":"{{approved_by}} ", + "bold": true + }, + { + "text":" {{approvedBy}}", + "bold": false + } + ], + "alignment":"left" + }, + { + "text":[ + { + "text":"{{commissioner}}", + "bold": true + } + ], + "alignment":"right" + } + ] + }, + { + "text": "{{disclaimer_heading}}", + "bold": true, + "style": "receipt-approver", + "alignment": "left", + "fontSize": 13, + "margin": [ + -10, + 70, + 0, + 0 + ] + }, + { + "text": "{{disclaimer_body}}", + "style": "receipt-sub-logo-sub-header", + "alignment": "left", + "fontSize": 13, + "margin": [ + -10, + 10, + 0, + 0 + ] + } + ], + "styles": { + "noc-head": { + "margin": [ + -30, + -35, + 0, + -2 + ] + }, + "receipt-approver": { + "color": "#000000", + "fontSize": 14, + "letterSpacing": 0.6, + "alignment": "center", + "margin": [ + -10, + 50, + 0, + 1 + ] + }, + "receipt-logo-header": { + "color": "#000000", + "fontSize": 20, + "letterSpacing": 0.74, + "alignment": "center", + "margin": [ + 0, + 0, + 0, + 5 + ] + }, + "receipt-sub-logo-header": { + "color": "#000000", + "fontSize": 18, + "letterSpacing": 0.74, + "alignment": "center", + "margin": [ + 0, + 5, + 0, + 5 + ] + }, + "receipt-logo-sub-header": { + "color": "#484848", + "fontSize": 14, + "letterSpacing": 0.6, + "alignment": "center", + "margin": [ + 0, + 5, + 0, + 0 + ] + }, + "receipt-sub-logo-sub-header": { + "color": "#484848", + "fontSize": 14, + "letterSpacing": 0.6, + "alignment": "left", + "margin": [ + 50, + 40, + 0, + 0 + ] + }, + "receipt-sub-address-sub-header": { + "color": "#484848", + "fontSize": 14, + "letterSpacing": 0.1, + "alignment": "right", + "margin": [ + 50, + 30, + -90, + 0 + ] + }, + "receipt-sub-website-sub-header": { + "color": "#484848", + "fontSize": 14, + "letterSpacing": 0.1, + "alignment": "right", + "margin": [ + 50, + 30, + -120, + 0 + ] + }, + "receipt-sub-email-sub-header": { + "color": "#484848", + "fontSize": 14, + "letterSpacing": 0.1, + "alignment": "right", + "margin": [ + 50, + 30, + -110, + 0 + ] + } + } + } + } \ No newline at end of file diff --git a/configs/pdf-service/format-config/property-bill.json b/configs/pdf-service/format-config/property-bill.json new file mode 100644 index 00000000..140463f7 --- /dev/null +++ b/configs/pdf-service/format-config/property-bill.json @@ -0,0 +1,1212 @@ +{ + "key": "property-bill", + "config": { + "defaultStyle": { + "font": "Cambay" + }, + "content": [ + { + "style": "noc-head", + "table": { + "widths": [ + 60, + "*", + 120 + ], + "body": [ + [ + { + "image": "{{logoImage}}", + "width": 50, + "height": 61.25 + }, + { + "stack": [ + { + "text": "{{logo_header}} {{Municipal_Corporation}}", + "style": "receipt-logo-header" + }, + { + "stack": [ + { + "text": "{{address}}" + }, + { + "text": "{{phoneNumber}}" + }, + { + "text": "{{website}}" + }, + { + "text": "{{email}}" + } + ] + } + ], + "alignment": "left", + "margin": [ + 0, + 10, + 0, + 0 + ] + }, + { + "stack": [ + { + "text": "{{total_amount_due}}" + }, + { + "text": "{{Rs}} {{totalAmountDue}}", + "style": "amount-due" + } + ], + "alignment": "right", + "color": "#484848", + "margin": [ + -150, + 2, + -20, + 0 + ] + } + ] + ] + }, + "layout": "noBorders" + }, + { + "style": "noc-table", + "table": { + "widths": [ + 130, + 130, + -2, + 130, + 130 + ], + "body": [ + [ + { + "text": "{{payer_name}}", + "border": [ + true, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerName}}", + "border": [ + false, + true, + true, + false + ], + "style": "receipt-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ] + }, + { + "text": "{{bill_no}}", + "border": [ + true, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{billNo}}", + "border": [ + false, + true, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{mobile_no}}", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{mobileNo}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ] + }, + { + "text": "{{bill_period}}", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{fromPeriod}} - {{toPeriod}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{payer_address}}", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerAddress}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ] + }, + { + "text": "{{bill_issue_date}}", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{billIssueDate}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": " ", + "border": [ + true, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": " ", + "border": [ + false, + false, + true, + true + ], + "style": "receipt-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ] + }, + { + "text": "{{bill_due_date}}", + "border": [ + true, + false, + false, + true + ], + "style": "right-receipt-table" + }, + { + "text": "{{billDueDate}}", + "border": [ + false, + false, + true, + true + ], + "style": "right-receipt-table2" + } + ] + ] + }, + "layout": {} + }, + { + "style": "noc-table2", + "table": { + "widths": [ + "103%" + ], + "body": [ + [ + { + "text": "{{billing_summary_property_tax}} {{serviceType}}", + "border": [ + true, + true, + true, + false + ], + "style": "receipt-table-value" + } + ], + [ + { + "table": { + "widths": [ + "30%", + "26%", + "10%", + "11%", + "10%", + "15%" + ], + "body": [ + [ + { + "text": "{{tl_application_no}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{bill_period}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{charge_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{penalty_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{rebate_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{adhoc_penalty_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + } + ], + [ + { + "text": "{{propertyID}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{fromPeriod}}-{{toPeriod}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{charge}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{penalty}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{rebate}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{adhoc_penalty}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + } + ] + ] + } + } + ], + [ + { + "table": { + "widths" : [ + "11%", + "15%", + "15%", + "11%", + "11%", + "11%", + "11%", + "11%" + ], + "body":[ + [ + { + "text": "{{adhoc_rebate_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{owner_exemption_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{unit_usage_exemption_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{fire_cess_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{cancer_cess_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{time_interest_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{decimal_ceiling_debit_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{decimal_ceiling_credit_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + } + ], + [ + { + "text": "{{adhoc_rebate}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2", + "bold": true + }, + { + "text": "{{owner_exemption}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{unit_usage_exemption}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{fire_cess}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{cancer_cess}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{time_interest}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{decimal_ceiling_debit}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{decimal_ceiling_credit}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2", + "bold": true + } + ] + + ] + } + + } + ], + [ + { + "table": { + "widths" : [ + "18%", + "11%", + "11%", + "11%" + ], + "body":[ + [ + { + "text": "{{advance_carryforward_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{arrears_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{roundoff_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{total_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + } + ], + [ + { + "text": "{{advance_carryforward}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{arrearrs}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{roundoff}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{total}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2", + "bold": true + } + ] + + ] + } + + } + ] + ] + }, + "layout": {} + }, + + { + "style" : "noc-table3", + "table" : { + "widths": [ + "103%" + ], + "body":[ + [ + { + "style": "noc-table3", + "table": { + "widths": [ + "100%" + ], + "body": ["[{\"text\": \"{{important_message}}\",\"border\":[false,false,false,false],\"style\":\"bill-message-header\"}],{{#variable11}}[{\"text\":\"{{disclaimerContent}}\",\"border\":[false,false,false,false],\"style\":\"bill-message-value\"}]{{/variable11}}"] + } + } + ] + ] + + } + }, + { + "canvas": [ + { + "type": "line", + "x1": -40, + "y1": 30, + "x2": 700, + "y2": 30, + "dash": { + "length": 10, + "space": 5 + } + } + ] + }, + { + "image": "{{scissorImage}}", + "width": 24, + "height": 24, + "margin": [ + -30, + -11.2, + 0, + 0 + ] + }, + + { + "text": "{{acknowledgement_for}}", + "style": "footer-header" + + }, + { + "style": "noc-table4", + "table": { + "widths": [ + "25%", + "30%", + "25%", + "25%" + ], + "body": [ + [ + { + "text": "{{date_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{billdate}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{consumer_id}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{consumerID}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{bill_no}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{billNo}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{name_address}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerName}}, {{nameAddress}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{total_payment}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{total}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + } + ] + ] + } + }, + { + "text": "{{receivers_signature}}", + "style": "footer-bottom" + } + ], + "styles": { + "noc-head": { + "margin": [ + -25, + -30, + 0, + 1 + ] + }, + "receipt-logo-header": { + "color": "#484848", + "fontFamily": "Roboto", + "fontSize": 14, + "bold": true, + "letterSpacing": 0.74, + "margin": [ + 0, + -10, + 0, + 5 + ] + }, + "receipt-logo-sub-header": { + "color": "#484848", + "fontFamily": "Roboto", + "fontSize": 13, + "letterSpacing": 0.6 + }, + "noc-table": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -25, + 10, + -8, + -8 + ] + }, + "noc-table4": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -25, + 75, + -8, + -8 + ] + }, + "noc-table2": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -25, + 18, + -8, + -8 + ] + }, + "noc-table3": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -25, + 30, + -8, + -8 + ] + }, + "receipt-table-value": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 8, + 5, + 0, + 0 + ] + }, + "receipt-table-value2": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 3, + 5, + 0, + 0 + ] + }, + "receipt-table": { + "color": "#484848", + "bold": true, + "fontSize": 12, + "fontWeight": 400, + "margin": [ + -10, + 5, + 0, + 0 + ] + }, + "receipt-table2": { + "color": "#484848", + "bold": true, + "fontSize": 11, + "fontWeight": 400, + "margin": [ + 3, + 8, + 0, + 10 + ] + }, + "right-receipt-table": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 8, + 5, + 0, + 10 + ] + }, + "right-receipt-table2": { + "color": "#484848", + "bold": true, + "fontSize": 12, + "fontWeight": 400, + "margin": [ + -10, + 5, + 0, + 0 + ] + }, + "receipt-approver": { + "fontSize": 12, + "bold": true, + "margin": [ + -27, + 50, + -10, + 0 + ], + "color": "#484848" + }, + "no-signature": { + "fontSize": 12, + "margin": [ + -27, + 35, + -10, + 0 + ], + "color": "#484848" + }, + "amount-due": { + "fontSize": 30, + "color": "#FC8019", + "bold": true, + "fontWeight": 700 + }, + "pt-disclaimer": { + "fontSize": 12, + "margin": [ + -27, + 30, + -10, + 0 + ], + "color": "#484848" + }, + "pt-disclaimer-value": { + "fontSize": 12, + "margin": [ + 2, + 5, + 0, + 0 + ], + "color": "#484848" + }, + "qr-text": { + "fontSize": 12, + "margin": [ + 40, + 0, + 0, + 0 + ], + "color": "#484848", + "alignment": "left" + }, + "qr-image": { + "margin": [ + -40, + -1, + -3, + 0 + ], + "color": "#484848", + "alignment": "right" + }, + "footer-header": { + "margin": [ + 0, + 15, + 0, + -40 + ], + "bold": true, + "color": "#000000", + "alignment": "center" + }, + "footer-bottom": { + "margin": [ + 0, + 50, + 0, + 0 + ], + "bold": true, + "color": "#000000", + "alignment": "right" + }, + "bill-message-header": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 28, + -15, + 0, + 10 + ] + }, + "bill-message-value": { + "color": "#484848", + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 28, + -5, + 0, + 10 + ] + }, + "disclaimer-table": { + "fontSize": 12, + "bold": false, + "color": "#FC8019", + "margin": [ + -25, + 16, + -8, + -8 + ] + } + } + } +} \ No newline at end of file diff --git a/configs/pdf-service/format-config/property-receipt.json b/configs/pdf-service/format-config/property-receipt.json new file mode 100644 index 00000000..bff9710a --- /dev/null +++ b/configs/pdf-service/format-config/property-receipt.json @@ -0,0 +1,570 @@ +{ + "key": "property-receipt", + "config": { + "defaultStyle": { + "font": "Cambay" + }, + "content": [ + { + "style": "noc-head", + "table": { + "widths": [ + 60, + "*", + 120 + ], + "body": [ + [ + { + "image": "{{logoImage}}", + "width": 50, + "height": 61.25 + }, + { + "stack": [ + { + "text": "{{logo-header}} {{Municipal_Corporation}}", + "style": "receipt-logo-header" + }, + { + "text": "{{serviceType}} {{payment_receipt}}", + "style": "receipt-logo-sub-header" + } + ], + "alignment": "left", + "margin": [ + 0, + 10, + 0, + 0 + ] + }, + { + "stack": [ + { + "text": "{{address}}" + }, + { + "text": "{{phoneNumber}}" + }, + { + "text": "{{website}}" + }, + { + "text": "{{email}}" + } + ], + "alignment": "right", + "color": "#484848", + "margin": [ + -100, + 0, + -25, + 0 + ] + } + ] + ] + }, + "layout": "noBorders" + }, + { + "style": "noc-table", + "table": { + "widths": [ + "25%", + "25%", + "25%", + "25%" + ], + "body": [ + [ + { + "text": "{{receipt_no}}.", + "border": [ + true, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{receiptNo}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table", + "font": "Roboto" + }, + { + "text": "{{consumer_id}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{consumerID}}", + "border": [ + false, + true, + true, + false + ], + "style": "receipt-table", + "font": "Roboto" + } + ], + [ + { + "text": "{{payment_date}}", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{paymentDate}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{payer_name}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerName}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{payer_contact}}", + "border": [ + true, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerContact}}", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table" + }, + { + "text" : " ", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text" : " ", + "border": [ + false, + false, + true, + true + ], + "style": "receipt-table" + } + ] + ] + }, + "layout": {} + }, + { + "style": "next-noc-table", + "table": { + "widths": [ + "25%", + "25%", + "25%", + "25%" + ], + "body": [ + [ + { + "text": "{{service_type}}", + "border": [ + true, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{serviceType}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{billing_period}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{fromPeriod}} {{to}} {{toPeriod}}", + "border": [ + false, + true, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{paid_amount}}", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "₹ {{paidAmount}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{pending_amount}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "₹ {{pendingAmount}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{payment_mode}}", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{paymentMode}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{transaction_id}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{transactionID}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table", + "font": "Roboto" + } + ], + [ + { + "text": "{{g8_receipt_no}}.", + "border": [ + true, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{G8ReceiptNo}}", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table" + }, + { + "text": "{{g8_receipt_date}}", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{G8ReceiptDate}}", + "border": [ + false, + false, + true, + true + ], + "style": "receipt-table" + } + ] + ] + }, + "layout": {} + }, + { + "style": "receipt-approver", + "columns": [ + { + "text": [ + { + "text": "{{generated_by}}: ", + "bold": true + }, + { + "text": "{{user-name}}", + "bold": false + } + ], + "alignment": "left" + }, + { + "text": [ + { + "text": "{{commissioner/eo}}", + "bold": true + } + ], + "alignment": "right", + "margin": [ + 0, + 0, + -10, + 1 + ] + } + ] + }, + { + "style": "no-signature", + "text": "{{no_signature}}" + }, + { + "style": "pt-disclaimer", + "stack": [ + { + "text": "{{disclamer}}", + "bold": true, + "style": "pt-disclaimer-value" + }, + { + "style": "pt-disclaimer-value", + "table": { + "widths": [ + "120%", + "*", + "*", + "*" + ], + "body": ["{{#variable11}}[{\"text\":\"{{disclaimerContent}}\",\"border\":[false,false,false,false],\"style\":\"pt-disclaimer-value\"}]{{/variable11}}"] + }, + "layout": {} + } + ] + } + ], + "styles": { + "noc-head": { + "margin": [ + -30, + -30, + 0, + 1 + ] + }, + "receipt-logo-header": { + "color": "#000000", + "fontSize": 14, + "bold": true, + "letterSpacing": 0.74, + "margin": [ + 0, + 0, + 0, + 5 + ] + }, + "receipt-logo-sub-header": { + "color": "#000000", + "fontSize": 12, + "letterSpacing": 0.6 + }, + "noc-table": { + "fontSize": 12, + "color": "#000000", + "margin": [ + -25, + 45, + -22, + -8 + ] + }, + "next-noc-table": { + "fontSize": 12, + "color": "#000000", + "margin": [ + -25, + 28, + -22, + -8 + ] + }, + "receipt-table-value": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 8, + 8, + 0, + 8 + ] + }, + "receipt-table": { + "color": "#000000", + "bold": false, + "fontSize": 12, + "fontWeight": 400, + "margin": [ + -10, + 8, + 0, + 8 + ] + }, + "receipt-approver": { + "fontSize": 12, + "bold": true, + "margin": [ + -27, + 50, + -10, + 0 + ], + "color": "#484848" + }, + "no-signature": { + "fontSize": 12, + "margin": [ + -27, + 35, + -10, + 0 + ], + "color": "#484848" + }, + "pt-disclaimer": { + "fontSize": 12, + "margin": [ + -27, + 30, + -10, + 0 + ], + "color": "#484848" + }, + "pt-disclaimer-value": { + "fontSize": 12, + "margin": [ + 2, + 5, + 0, + 0 + ], + "color": "#484848" + } + } + } +} \ No newline at end of file diff --git a/configs/pdf-service/format-config/pt-receipt.json b/configs/pdf-service/format-config/pt-receipt.json new file mode 100644 index 00000000..4a1b0797 --- /dev/null +++ b/configs/pdf-service/format-config/pt-receipt.json @@ -0,0 +1,808 @@ +{ + "key":"pt-receipt", + "config":{ + + "content":[ + { + "style": "pt-reciept-citizen-table", + "margin": [ + 0, + 0, + 0, + 18 + ], + "table": { + "widths": [ + 50, + "*", + 100 + ], + "body": [ + [ + { + "image": "{{variable38}}", + "width": 30, + "margin": [ + 10, + 10, + 10, + 10 + ] + }, + { + "stack": [ + { + "text": "{{variable35}} NAGAR PANCHAYAT", + "style": "receipt-logo-header" + }, + { + "text": "Property Tax Payment Receipt ({{variable36}}) ", + "style": "receipt-logo-sub-header" + } + ], + "alignment": "center", + "margin": [ + 0, + 5, + 0, + 0 + ] + }, + { + "text": [ + { + "text": "Receipt No.: ", + "bold": true + }, + "{{variable15}}" + ], + "margin": [10, 10, 10, 2] + } + ] + ] + }, + "layout": {} + }, + { + "style": "receipt-header-details", + "columns": [ + { + "text": [ + { + "text": "Date: ", + "bold": true + }, + "{{variable16}}" + ], + "alignment": "left" + }, + { + "text": [ + { + "text": "Contact Us: ", + "bold": true + }, + "0183-2545155" + ], + "alignment": "right" + } + ] + }, + { + "style": "receipt-header-details", + "columns": [ + { + "text": [ + { + "text": "Assessment Year: ", + "bold": true + }, + "{{variable1}}" + ], + "alignment": "left" + }, + { + "text": [ + { + "text": "Website: ", + "bold": true + }, + "www.amritsarcorp.com" + ], + "alignment": "right" + } + ] + }, + { + "style": "pt-reciept-citizen-table", + "table": { + "body": [ + [ + { + "text": "Existing Property ID:", + "border": [ + true, + true, + false, + true + ], + "style": "receipt-table-key" + }, + { + "text": "{{variable2}}", + "border": [ + false, + true, + true, + true + ] + }, + { + "text": "Property Tax Unique ID:", + "border": [ + true, + true, + false, + true + ], + "style": "receipt-table-key" + }, + { + "text": "{{variable3}}", + "border": [ + false, + true, + true, + true + ] + }, + { + "text": "Assessment No:", + "border": [ + true, + true, + false, + true + ], + "style": "receipt-table-key" + }, + { + "text": "{{variable4}}", + "border": [ + false, + true, + true, + true + ] + } + ] + ] + }, + "layout": {} + }, + { + "text": "PROPERTY ADDRESS", + "style": "pt-reciept-citizen-subheader" + }, + { + "style": "pt-reciept-citizen-table", + "table": { + "widths": [ + "*", + "*", + "*", + "*" + ], + "body": [ + [ + { + "text": "House/Door No.:", + "border": [ + true, + true, + false, + true + ], + "style": "receipt-table-key" + }, + { + "text": "{{variable5}}", + "border": [ + false, + true, + true, + true + ] + }, + { + "text": "Building/Colony Name.:", + "border": [ + true, + true, + false, + true + ], + "style": "receipt-table-key" + }, + { + "text": "{{variable6}}", + "border": [ + false, + true, + true, + true + ] + } + ], + [ + { + "text": "Street Name:", + "border": [ + true, + true, + false, + true + ], + "style": "receipt-table-key" + }, + { + "text": "{{variable7}}", + "border": [ + false, + true, + true, + true + ] + }, + { + "text": "Locality/Mohalla:", + "border": [ + true, + true, + false, + true + ], + "style": "receipt-table-key" + }, + { + "text": "{{variable8}}", + "border": [ + false, + true, + true, + true + ] + } + ] + ] + }, + "layout": {} + }, + { + "text": "ASSESSMENT INFORMATION", + "style": "pt-reciept-citizen-subheader" + }, + { + "style": "pt-reciept-citizen-table", + "table": { + "widths": [ + "*", + "*", + "*", + "*" + ], + "body": [ + [ + { + "text": "Plot Size(sq yards)", + "border": [ + true, + true, + false, + true + ], + "style": "receipt-table-key" + }, + { + "text": "{{variable9}}", + "border": [ + false, + true, + true, + true + ] + }, + { + "text": "Property Type:", + "border": [ + true, + true, + false, + true + ], + "style": "receipt-table-key" + }, + { + "text": "{{variable10}}", + "border": [ + false, + true, + true, + true + ] + } + ] + ] + }, + "layout": {} + }, + { + "text": "BUILT-UP AREA DETAILS", + "style": "pt-reciept-citizen-subheader" + }, + { + "style": "receipt-assess-table", + "table": { + "widths": [ + "*", + "*", + "*", + "*", + "*" + ], + "body": [ + [ + { + "text": "Floor", + "style": "receipt-assess-table-header" + }, + { + "text": "Usage Type", + "style": "receipt-assess-table-header" + }, + { + "text": "Sub Usage Type", + "style": "receipt-assess-table-header" + }, + { + "text": "Occupancy", + "style": "receipt-assess-table-header" + }, + { + "text": "Built Area/Total Annual Rent(sq yards)", + "style": "receipt-assess-table-header" + } + ], + "{{variable12}}" + ] + }, + "layout": {} + }, + { + "text": "OWNERSHIP INFORMATION", + "style": "pt-reciept-citizen-subheader" + }, + { + "style": "pt-reciept-citizen-table", + "table": { + "widths": [ + "*", + "*", + "*", + "*" + ], + "body": ["{{#variable11}}[{\"text\":\"Owner Name\",\"border\":[true,true,false,true],\"style\":\"receipt-table-key\"},{\"text\":\"{{name}}\",\"border\":[false,true,true,true]},{\"text\":\"Father's Name\",\"border\":[true,true,false,true],\"style\":\"receipt-table-key\"},{\"text\":\"{{fatherOrHusbandName}}\",\"border\":[false,true,true,true]}]{{/variable11}}"] + }, + "layout": {} + }, + { + "text": "PAYABLE AMOUNT", + "style": "pt-reciept-citizen-subheader" + }, + { + "style": "receipt-assess-table", + "table": { + "widths": [ + "auto", + "auto", + "auto", + "auto", + "auto", + "auto", + "auto", + "auto", + "auto", + "auto" + ], + "body": [ + [ + { + "text": "Property Tax" + }, + { + "text": "Fire Cess" + }, + { + "text": "Cancer Cess" + }, + { + "text": "Penalty" + }, + { + "text": "Rebate" + }, + { + "text": "Interest" + }, + { + "text": "Usage Exemption" + }, + { + "text": "Special Category Exemption" + }, + { + "text": "Round Off" + }, + { + "text": "Total" + } + ], + [ + { + "text": "{{variable17}}" + }, + { + "text": "{{variable18}}" + }, + { + "text": "{{variable19}}" + }, + { + "text": "{{variable20}}" + }, + { + "text": "{{variable21}}" + }, + { + "text": "{{variable22}}" + }, + { + "text": "{{variable23}}" + }, + { + "text": "{{variable24}}" + }, + { + "text": "{{variable25}}" + }, + { + "text": "{{variable34}}" + } + ] + ] + }, + "layout": {} + }, + { + "text": "PAYMENT INFORMATION", + "style": "pt-reciept-citizen-subheader" + }, + { + "style": "pt-reciept-citizen-table", + "table": { + "widths": [ + "auto", + "auto", + "auto", + "auto" + ], + "body": [ + [ + { + "text": "Total Amount Paid:", + "border": [ + true, + true, + false, + true + ], + "style": "receipt-table-key" + }, + { + "text": "{{variable27}}", + "border": [ + false, + true, + true, + true + ], + "style": "receipt-table-value" + }, + { + "text": "Pending Amount:", + "border": [ + true, + true, + false, + true + ], + "style": "receipt-table-key" + }, + { + "text": "{{variable37}}", + "border": [ + false, + true, + true, + true + ] + } + ], + [ + { + "text": "Payment Mode:", + "border": [ + true, + true, + false, + true + ], + "style": "receipt-table-key" + }, + { + "text": "{{variable28}}", + "border": [ + false, + true, + true, + true + ] + }, + { + "text": "Bank Name:", + "border": [ + true, + true, + false, + true + ], + "style": "receipt-table-key" + }, + { + "text": "{{variable29}}", + "border": [ + false, + true, + true, + true + ] + } + ], + [ + { + "text": "Transaction ID/ Cheque/ DD No.:", + "border": [ + true, + true, + false, + true + ], + "style": "receipt-table-key" + }, + { + "text": "{{variable30}}", + "border": [ + false, + true, + true, + true + ] + }, + { + "text": "Transaction Date:", + "border": [ + true, + true, + false, + true + ], + "style": "receipt-table-key" + }, + { + "text": "{{variable31}}", + "border": [ + false, + true, + true, + true + ] + } + ], + [ + { + "text": "G8 Receipt No:", + "border": [ + true, + true, + false, + true + ], + "style": "receipt-table-key" + }, + { + "text": "{{variable32}}", + "border": [ + false, + true, + true, + true + ] + }, + { + "text": "G8 Receipt Issue Date:", + "border": [ + true, + true, + false, + true + ], + "style": "receipt-table-key" + }, + { + "text": "{{variable33}}", + "border": [ + false, + true, + true, + true + ] + } + ] + ] + }, + "layout": {} + }, + { + "text": "Commissioner/EO", + "alignment": "right", + "color": "#484848", + "fontSize": 12, + "bold": true, + "margin": [ + 0, + 30, + 0, + 30 + ] + }, + { + "text": "Note:", + "alignment": "left", + "style": "receipt-footer" + }, + { + "ol": [ + { + "text": "Payment received by cheque/demand draft shall be subject to realization.", + "margin": [ + 0, + 0, + 0, + 5 + ] + }, + { + "text": "This document is not a proof of Property Ownership and regularization of unauthorized construction.", + "margin": [ + 0, + 0, + 0, + 5 + ] + }, + { + "text": "This is a computer generated document, hence requires no signature.", + "margin": [ + 0, + 0, + 0, + 5 + ] + }, + { + "text": "Assessment & Payment is subject to verification/Scrutiny by competitive authority.", + "margin": [ + 0, + 0, + 0, + 5 + ] + }, + { + "text": "Please deposit property tax dues for earlier years also. Ignore, if already paid.", + "margin": [ + 0, + 0, + 0, + 5 + ] + } + ], + "alignment": "left", + "style": "receipt-footer" + } + ], + "styles": { + "pt-reciept-citizen-subheader": { + "fontSize": 10, + "bold": true, + "margin": [ + 0, + 16, + 0, + 8 + ], + "color": "#484848" + }, + "pt-reciept-citizen-table": { + "fontSize": 10, + "color": "#484848" + }, + "receipt-assess-table": { + "fontSize": 10, + "color": "#484848", + "margin": [ + 0, + 8, + 0, + 0 + ] + }, + "receipt-assess-table-header": { + "bold": true, + "fillColor": "#D8D8D8", + "color": "#484848" + }, + "receipt-header-details": { + "fontSize": 9, + "margin": [ + 0, + 0, + 0, + 8 + ], + "color": "#484848" + }, + "receipt-table-key": { + "color": "#484848", + "bold": true + }, + "receipt-table-value": { + "color": "#484848" + }, + "receipt-logo-header": { + "color": "#484848", + "fontSize": 16, + "bold": true, + "decoration": "underline", + "decorationColor": "#484848" + }, + "receipt-logo-sub-header": { + "color": "#484848", + "fontSize": 13, + "decoration": "underline", + "decorationColor": "#484848" + }, + "receipt-footer": { + "color": "#484848", + "fontSize": 8, + "margin": [ + 0, + 0, + 0, + 5 + ] + } + } + } +} \ No newline at end of file diff --git a/configs/pdf-service/format-config/ptmutationcertificate.json b/configs/pdf-service/format-config/ptmutationcertificate.json new file mode 100644 index 00000000..07b8fe6d --- /dev/null +++ b/configs/pdf-service/format-config/ptmutationcertificate.json @@ -0,0 +1,518 @@ +{ + "key": "ptmutationcertificate", + "config": { + "defaultStyle": { + "font": "Cambay" + }, + "content": [ + { + "style": "noc-head", + "table": { + "widths": [ + "*" + ], + "body": [ + [ + { + "image": "{{ULB_LOGO}}", + "width": 70, + "height": 82, + "alignment": "center", + "margin": [ + 0, + 10, + 0, + 10 + ] + } + ], + [ + { + "stack": [ + { + "text": "{{ULB_CITY}} {{municipal_corportaion}}", + "style": "receipt-logo-header" + }, + { + "text": "{{ULB_ADDRESS}}", + "style": "receipt-logo-sub-header" + }, + { + "style": "noc-head", + "table": { + "widths": [ + "*", + "*" + ], + "body": [ + [ + { + "text": "{{corporation_fax}} : {{CorporationContact_Value}} ", + "style": "receipt-sub-address-sub-header" + } + ] + ] + }, + "layout": "noBorders" + }, + { + "style": "noc-head", + "table": { + "widths": [ + "*", + "*" + ], + "body": [ + [ + { + "text": "{{corporation_website}} : {{corporationWebsite}}", + "style": "receipt-sub-website-sub-header" + } + ] + ] + }, + "layout": "noBorders" + }, + { + "style": "noc-head", + "table": { + "widths": [ + "*", + "*" + ], + "body": [ + [ + { + "text": "{{corporation_email}} : {{corporationEmail}}", + "style": "receipt-sub-email-sub-header" + } + ] + ] + }, + "layout": "noBorders" + } + ], + "alignment": "left", + "margin": [ + 0, + 10, + 0, + 0 + ] + } + ], + [ + { + "stack": [ + { + "text": "{{Mutation_Approval_Certificate}}", + "style": "receipt-sub-logo-header" + }, + { + "style": "noc-head", + "table": { + "widths": [ + "35%", + "65%" + ], + "body": [ + [ + { + "text": "{{Property_ID_Label}}", + "style": "receipt-content" + }, + { + "text": "{{Property_ID}}", + "style": "receipt-content", + "font": "Roboto" + } + ] + ] + }, + "layout": "noBorders" + }, + { + "style": "noc-head", + "table": { + "widths": [ + "35%", + "65%" + ], + "body": [ + [ + { + "text": "{{Mutation_Number_Label}}", + "style": "receipt-content" + }, + { + "text": "{{Mutation_Number}}", + "style": "receipt-content", + "font": "Roboto" + } + ] + ] + }, + "layout": "noBorders" + }, + { + "style": "noc-head", + "table": { + "widths": [ + "35%", + "65%" + ], + "body": [ + [ + { + "text": "{{Application_Number_Label}}", + "style": "receipt-content" + }, + { + "text": "{{Application_Number}}", + "style": "receipt-content", + "font": "Roboto" + } + ] + ] + }, + "layout": "noBorders" + }, + { + "style": "noc-head", + "table": { + "widths": [ + "35%", + "65%" + ], + "body": [ + [ + { + "text": "{{Receipt_Number_Label}}", + "style": "receipt-content" + }, + { + "text": "{{Receipt_Number}}", + "style": "receipt-content", + "font": "Roboto" + } + ] + ] + }, + "layout": "noBorders" + }, + { + "style": "noc-head", + "table": { + "widths": [ + "35%", + "65%" + ], + "body": [ + [ + { + "text": "{{Approval_Date_Label}}", + "style": "receipt-content" + }, + { + "text": "{{Approval_Date}}", + "style": "receipt-content", + "font": "Roboto" + } + ] + ] + }, + "layout": "noBorders" + } + ], + "alignment": "left", + "margin": [ + 0, + 10, + 0, + 0 + ] + } + + ], + [ + { + "stack": [ + { + "text": "{{Order_Label}}", + "bold": true, + "style": "receipt-order-header" + }, + { + "text": "{{Mutation_Declaration_Label}}", + "style": "receipt-order-content" + } + ], + "alignment": "left", + "margin": [ + 0, + 10, + 0, + 0 + ] + } + ], + [ + { + "stack": [ + { + "style": "noc-head", + "table": { + "widths": [ + "35%", + "65%" + ], + "body": [ + [ + { + "text": "{{Transferrer_Details_Label}}", + "style": "receipt-content" + }, + { + "text": "{{Transferrer_Name}} {{Transferrer_Relation}} {{Transferrer_Relative_Name}}", + "style": "receipt-content" + } + ] + ] + }, + "layout": "noBorders" + }, + { + "style": "noc-head", + "table": { + "widths": [ + "35%", + "65%" + ], + "body": [ + [ + { + "text": "{{Transferree_Details_Label}}", + "style": "receipt-content" + }, + { + "text": "{{Transferree_Name}} {{Transferree_Relation}} {{Transferree_Relative_Name}}", + "style": "receipt-content" + } + ] + ] + }, + "layout": "noBorders" + } + ], + "alignment": "left", + "margin": [ + 0, + 10, + 0, + 0 + ] + } + + ], + [ + { + "stack": [ + { + "text": "{{Mutation_To_Label}}", + "bold": true, + "style": "receipt-order-header" + }, + { + "text": "{{Shri_Smt_Label}} {{Transferree_Name}}", + "style": "receipt-order-content" + }, + { + "text": "{{Transferree_Address}}", + "style": "receipt-order-content" + } + ], + "alignment": "left", + "margin": [ + 0, + 10, + 0, + 0 + ] + } + ] + ] + }, + "layout": "noBorders" + }, + { + "style": "receipt-approver", + "columns": [ + { + "text": [ + { + "text": "{{approved_by}} ", + "bold": true + }, + { + "text": "{{approved_by_value}}", + "bold": false + } + ], + "alignment": "left" + }, + { + "text": [ + { + "text": "{{commissioner}}", + "bold": true + } + ], + "alignment": "right" + } + ] + } + ], + "styles": { + "noc-head": { + "margin": [ + -30, + -35, + 0, + -2 + ] + }, + "receipt-approver": { + "color": "#000000", + "fontSize": 14, + "letterSpacing": 0.6, + "alignment": "center", + "margin": [ + -10, + 50, + 0, + 1 + ] + }, + "receipt-logo-header": { + "color": "#000000", + "fontSize": 20, + "letterSpacing": 0.74, + "alignment": "center", + "margin": [ + 0, + 0, + 0, + 5 + ] + }, + "receipt-sub-logo-header": { + "color": "#000000", + "fontSize": 18, + "letterSpacing": 0.74, + "alignment": "center", + "margin": [ + 0, + 5, + 0, + 10 + ] + }, + "receipt-logo-sub-header": { + "color": "#484848", + "fontSize": 14, + "letterSpacing": 0.6, + "alignment": "center", + "margin": [ + 0, + 5, + 0, + 0 + ] + }, + "receipt-sub-logo-sub-header": { + "color": "#484848", + "fontSize": 14, + "letterSpacing": 0.6, + "alignment": "left", + "margin": [ + 50, + 40, + 0, + 0 + ] + }, + "receipt-sub-address-sub-header": { + "color": "#484848", + "fontSize": 14, + "letterSpacing": 0.1, + "alignment": "right", + "margin": [ + 50, + 30, + -80, + 0 + ] + }, + "receipt-sub-website-sub-header": { + "color": "#484848", + "fontSize": 14, + "letterSpacing": 0.1, + "alignment": "right", + "margin": [ + 50, + 30, + -120, + 0 + ] + }, + "receipt-sub-email-sub-header": { + "color": "#484848", + "fontSize": 14, + "letterSpacing": 0.1, + "alignment": "right", + "margin": [ + 50, + 30, + -110, + 0 + ] + }, + "receipt-order-header": { + "color": "#000000", + "fontSize": 14, + "letterSpacing": 0.6, + "alignment": "left", + "margin": [ + 19, + 0, + 0, + 1 + ] + }, + "receipt-order-content": { + "color": "#484848", + "fontSize": 14, + "letterSpacing": 0.4, + "alignment": "left", + "margin": [ + 19, + -2, + 0, + 1 + ] + }, + "receipt-content": { + "color": "#000000", + "fontSize": 14, + "letterSpacing": 0.4, + "alignment": "left", + "margin": [ + 50, + 30, + 0, + 0 + ] + } + } + } + } \ No newline at end of file diff --git a/configs/pdf-service/format-config/testconsolidatedreceipt.json b/configs/pdf-service/format-config/testconsolidatedreceipt.json new file mode 100644 index 00000000..bb9d7d72 --- /dev/null +++ b/configs/pdf-service/format-config/testconsolidatedreceipt.json @@ -0,0 +1,573 @@ +{ + "key": "testconsolidatedreceipt", + "config": { + "defaultStyle": { + "font": "Cambay" + }, + "content": [ + { + "style": "noc-head", + "table": { + "widths": [ + 60, + "*", + 120 + ], + "body": [ + [ + { + "image": "{{logoImage}}", + "width": 50, + "height": 61.25 + }, + { + "stack": [ + { + "text": "{{logo-header}} {{Municipal_Corporation}}", + "style": "receipt-logo-header" + }, + { + "text": "{{serviceType}} {{payment_receipt}}", + "style": "receipt-logo-sub-header" + } + ], + "alignment": "left", + "margin": [ + 0, + 10, + 0, + 0 + ] + }, + { + "stack": [ + { + "text": "{{address}}" + }, + { + "text": "{{phoneNumber}}" + }, + { + "text": "{{website}}" + }, + { + "text": "{{email}}" + } + ], + "alignment": "right", + "color": "#484848", + "margin": [ + -100, + 0, + -25, + 0 + ] + } + ] + ] + }, + "layout": "noBorders" + }, + { + "style": "noc-table", + "table": { + "widths": [ + "25%", + "25%", + "25%", + "25%" + ], + "body": [ + [ + { + "text": "{{receipt_no}}.", + "border": [ + true, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{receiptNo}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table", + "font": "Roboto" + }, + { + "text": "{{consumer_id}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{consumerID}}", + "border": [ + false, + true, + true, + false + ], + "style": "receipt-table", + "font": "Roboto" + } + ], + [ + { + "text": "{{payment_date}}", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{paymentDate}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{payer_name}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerName}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{payer_contact}}", + "border": [ + true, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerContact}}", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table" + }, + { + "text" : " ", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text" : " ", + "border": [ + false, + false, + true, + true + ], + "style": "receipt-table" + } + ] + ] + }, + "layout": {} + }, + { + "style": "next-noc-table", + "table": { + "widths": [ + "25%", + "25%", + "25%", + "25%" + ], + "body": [ + [ + { + "text": "{{service_type}}", + "border": [ + true, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{serviceType}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{billing_period}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{fromPeriod}} {{to}} {{toPeriod}}", + "border": [ + false, + true, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{paid_amount}}", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "₹ {{paidAmount}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{pending_amount}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "₹ {{pendingAmount}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{payment_mode}}", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{paymentMode}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{transaction_id}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{transactionID}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table", + "font": "Roboto" + } + ], + [ + { + "text": "{{g8_receipt_no}}.", + "border": [ + true, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{G8ReceiptNo}}", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table" + }, + { + "text": "{{g8_receipt_date}}", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{G8ReceiptDate}}", + "border": [ + false, + false, + true, + true + ], + "style": "receipt-table" + } + ] + ] + }, + "layout": {} + }, + { + "style": "receipt-approver", + "columns": [ + { + "text": [ + { + "text": "{{generated_by}}: ", + "bold": true + }, + { + "text": "{{user-name}}", + "bold": false + } + ], + "alignment": "left" + }, + { + "text": [ + { + "text": "{{commissioner/eo}}", + "bold": true + } + ], + "alignment": "right", + "margin": [ + 0, + 0, + -10, + 1 + ] + } + ] + }, + { + "style": "no-signature", + "text": "{{no_signature}}" + }, + { + "style": "pt-disclaimer", + "stack": [ + { + "text": "{{disclamer}}", + "bold": true, + "style": "pt-disclaimer-value" + }, + { + "text": "{{disclamer_1}}", + "bold": false, + "style": "pt-disclaimer-value" + }, + { + "text": "{{disclamer_2}}", + "bold": false, + "style": "pt-disclaimer-value" + }, + { + "text": "{{disclamer_3}}", + "bold": false, + "style": "pt-disclaimer-value" + } + ] + } + ], + "styles": { + "noc-head": { + "margin": [ + -30, + -30, + 0, + 1 + ] + }, + "receipt-logo-header": { + "color": "#000000", + "fontSize": 14, + "bold": true, + "letterSpacing": 0.74, + "margin": [ + 0, + 0, + 0, + 5 + ] + }, + "receipt-logo-sub-header": { + "color": "#000000", + "fontSize": 12, + "letterSpacing": 0.6 + }, + "noc-table": { + "fontSize": 12, + "color": "#000000", + "margin": [ + -25, + 45, + -22, + -8 + ] + }, + "next-noc-table": { + "fontSize": 12, + "color": "#000000", + "margin": [ + -25, + 28, + -22, + -8 + ] + }, + "receipt-table-value": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 8, + 8, + 0, + 8 + ] + }, + "receipt-table": { + "color": "#000000", + "bold": false, + "fontSize": 12, + "fontWeight": 400, + "margin": [ + -30, + 8, + 0, + 8 + ] + }, + "receipt-approver": { + "fontSize": 12, + "bold": true, + "margin": [ + -27, + 50, + -10, + 0 + ], + "color": "#484848" + }, + "no-signature": { + "fontSize": 12, + "margin": [ + -27, + 35, + -10, + 0 + ], + "color": "#484848" + }, + "pt-disclaimer": { + "fontSize": 12, + "margin": [ + -27, + 30, + -10, + 0 + ], + "color": "#484848" + }, + "pt-disclaimer-value": { + "fontSize": 12, + "margin": [ + 2, + 5, + 0, + 0 + ], + "color": "#484848" + } + }, + "footer": "(function(currentPage, pageCount) { return currentPage.toString() + ' of ' + pageCount; })" + } +} diff --git a/configs/pdf-service/format-config/testlocalconsolidatedbill.json b/configs/pdf-service/format-config/testlocalconsolidatedbill.json new file mode 100644 index 00000000..2d7fde53 --- /dev/null +++ b/configs/pdf-service/format-config/testlocalconsolidatedbill.json @@ -0,0 +1,999 @@ +{ + "key": "testlocalconsolidatedbill", + "config": { + "defaultStyle": { + "font": "Cambay" + }, + "content": [ + { + "style": "noc-head", + "table": { + "widths": [ + 60, + "*", + 120 + ], + "body": [ + [ + { + "image": "{{logoImage}}", + "width": 50, + "height": 61.25 + }, + { + "stack": [ + { + "text": "{{logo_header}}", + "style": "receipt-logo-header" + }, + { + "stack": [ + { + "text": "C Block, Ranjit Avenue, Amritsar" + }, + { + "text": " Tel. +91-183-2502339" + }, + { + "text": "website: www.amritsarcorp.com" + }, + { + "text": "Email: cmcasr@punjab.gov.in" + } + ] + } + ], + "alignment": "left", + "margin": [ + 0, + 10, + 0, + 0 + ] + }, + { + "stack": [ + { + "text": "{{total_amount_due}}" + }, + { + "text": "{{totalAmountDue}}", + "style": "amount-due" + } + ], + "alignment": "right", + "color": "#484848", + "margin": [ + -150, + 2, + -20, + 0 + ] + } + ] + ] + }, + "layout": "noBorders" + }, + { + "style": "noc-table", + "table": { + "widths": [ + 130, + 130, + -2, + 130, + 130 + ], + "body": [ + [ + { + "text": "{{payer_name}}", + "border": [ + true, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerName}}", + "border": [ + false, + true, + true, + false + ], + "style": "receipt-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ] + }, + { + "text": "{{bill_no}}", + "border": [ + true, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{billNo}}", + "border": [ + false, + true, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{mobile_no}}", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{mobileNo}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ] + }, + { + "text": "{{bill_period}}", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{fromPeriod}} - {{toPeriod}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{payer_address}}", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerAddress}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ] + }, + { + "text": "{{bill_issue_date}}", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{billIssueDate}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": " ", + "border": [ + true, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": " ", + "border": [ + false, + false, + true, + true + ], + "style": "receipt-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ] + }, + { + "text": "{{bill_due_date}}", + "border": [ + true, + false, + false, + true + ], + "style": "right-receipt-table" + }, + { + "text": "{{billDueDate}}", + "border": [ + false, + false, + true, + true + ], + "style": "right-receipt-table2" + } + ] + ] + }, + "layout": {} + }, + { + "style": "noc-table2", + "table": { + "widths": [ + "103%" + ], + "body": [ + [ + { + "text": "{{billing_summary_property_tax}}", + "border": [ + true, + true, + true, + false + ], + "style": "receipt-table-value" + } + ], + [ + { + "table": { + "widths": [ + "18%", + "26%", + "10%", + "9%", + "10%", + "9%", + "10%", + "9%" + ], + "body": [ + [ + { + "text": "{{property_id}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{bill_period}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{arrears_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{charge_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{penalty_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{rebate_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{others_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{total_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + } + ], + [ + { + "text": "{{propertyID}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{fromPeriod}}-{{toPeriod}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{arrears}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{charge}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{penalty}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{rebate}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{others}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{total}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2", + "bold": true + } + ] + ] + }, + "border": [ + true, + false, + true, + true + ] + } + ] + ] + }, + "layout": {} + }, + { + "style": "noc-table3", + "table": { + "widths": [ + "103%" + ], + "body": [ + [ + { + "text": "{{important_message}}", + "border": [ + true, + true, + true, + false + ], + "margin": [ + 9, + 10, + 0, + 5 + ], + "style": "receipt-table-value" + } + ], + [ + { + "ol": [ + { + "text": "{{payment_received}}", + "margin": [ + 8, + 0, + 0, + 5 + ] + }, + { + "text": "{{this_document}}", + "margin": [ + 8, + 0, + 0, + 5 + ] + }, + { + "text": "{{this_is_a}}", + "margin": [ + 8, + 0, + 0, + 5 + ] + }, + { + "text": "{{assessment_payment}}", + "margin": [ + 8, + 0, + 0, + 5 + ] + }, + { + "text": "{{please_deposit}}", + "margin": [ + 8, + 0, + 0, + 5 + ] + }, + { + "text": "{{if_the_tax}}", + "margin": [ + 8, + 0, + 0, + 10 + ] + } + ], + "border": [ + true, + false, + true, + true + ], + "alignment": "left" + } + ] + ] + }, + "layout": {} + }, + { + "canvas": [ + { + "type": "line", + "x1": -40, + "y1": 30, + "x2": 700, + "y2": 30, + "dash": { + "length": 10, + "space": 5 + } + } + ] + }, + { + "image": "{{scissorImage}}", + "width": 14, + "height": 14, + "margin": [ + -30, + -7, + 0, + 0 + ] + }, + { + "text": "{{acknowledgement_for}}", + "style": "footer-header" + }, + { + "style": "noc-table", + "table": { + "widths": [ + "*", + "*", + "*", + "*" + ], + "body": [ + [ + { + "text": "{{date_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "date", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{consumer_id}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{consumerID}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{bill_no}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{billNo}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{name_address}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{nameAddress}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{total_payment}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{totalPayment}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + } + ] + ] + } + }, + { + "text": "{{receivers_signature}}", + "style": "footer-bottom" + } + ], + "styles": { + "noc-head": { + "margin": [ + -25, + -30, + 0, + 1 + ] + }, + "receipt-logo-header": { + "color": "#484848", + "fontFamily": "Roboto", + "fontSize": 14, + "bold": true, + "letterSpacing": 0.74, + "margin": [ + 0, + -10, + 0, + 5 + ] + }, + "receipt-logo-sub-header": { + "color": "#484848", + "fontFamily": "Roboto", + "fontSize": 13, + "letterSpacing": 0.6 + }, + "noc-table": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -25, + 45, + -8, + -8 + ] + }, + "noc-table2": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -25, + 18, + -8, + -8 + ] + }, + "noc-table3": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -25, + 30, + -8, + -8 + ] + }, + "receipt-table-value": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 8, + 5, + 0, + 0 + ] + }, + "receipt-table-value2": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 3, + 5, + 0, + 0 + ] + }, + "receipt-table": { + "color": "#484848", + "bold": true, + "fontSize": 12, + "fontWeight": 400, + "margin": [ + -30, + 5, + 0, + 0 + ] + }, + "receipt-table2": { + "color": "#484848", + "bold": true, + "fontSize": 11, + "fontWeight": 400, + "margin": [ + 3, + 8, + 0, + 10 + ] + }, + "right-receipt-table": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 8, + -10, + 0, + 10 + ] + }, + "right-receipt-table2": { + "color": "#484848", + "bold": true, + "fontSize": 12, + "fontWeight": 400, + "margin": [ + -30, + -10, + 0, + 0 + ] + }, + "receipt-approver": { + "fontSize": 12, + "bold": true, + "margin": [ + -27, + 50, + -10, + 0 + ], + "color": "#484848" + }, + "no-signature": { + "fontSize": 12, + "margin": [ + -27, + 35, + -10, + 0 + ], + "color": "#484848" + }, + "amount-due": { + "fontSize": 30, + "color": "#FC8019", + "bold": true, + "fontWeight": 700 + }, + "pt-disclaimer": { + "fontSize": 12, + "margin": [ + -27, + 30, + -10, + 0 + ], + "color": "#484848" + }, + "pt-disclaimer-value": { + "fontSize": 12, + "margin": [ + 0, + 5, + 0, + 0 + ], + "color": "#484848" + }, + "qr-text": { + "fontSize": 12, + "margin": [ + 40, + 0, + 0, + 0 + ], + "color": "#484848", + "alignment": "left" + }, + "qr-image": { + "margin": [ + -40, + -1, + -3, + 0 + ], + "color": "#484848", + "alignment": "right" + }, + "footer-header": { + "margin": [ + 0, + 15, + 0, + -40 + ], + "color": "#000000", + "alignment": "center" + }, + "footer-bottom": { + "margin": [ + 0, + 10, + 0, + 0 + ], + "color": "#000000", + "alignment": "right" + } + } + } + } \ No newline at end of file diff --git a/configs/pdf-service/format-config/testlocalconsolidatedreceipt.json b/configs/pdf-service/format-config/testlocalconsolidatedreceipt.json new file mode 100644 index 00000000..6aecca7b --- /dev/null +++ b/configs/pdf-service/format-config/testlocalconsolidatedreceipt.json @@ -0,0 +1,579 @@ +{ + "key": "testlocalconsolidatedreceipt", + "config": { + "defaultStyle": { + "font": "Cambay" + }, + "content": [ + { + "style": "noc-head", + "table": { + "widths": [ + 60, + "*", + 120 + ], + "body": [ + [ + { + "image": "{{logoImage}}", + "width": 50, + "height": 61.25 + }, + { + "stack": [ + { + "text": "{{logo-header}}", + "style": "receipt-logo-header" + }, + { + "text": "{{serviceType}} {{payment_receipt}}", + "style": "receipt-logo-sub-header" + } + ], + "alignment": "left", + "margin": [ + 0, + 10, + 0, + 0 + ] + }, + { + "stack": [ + { + "text": "{{address}}" + }, + { + "text": "{{phoneNumber}}" + }, + { + "text": "{{website}}" + }, + { + "text": "{{email}}" + } + ], + "alignment": "right", + "color": "#484848", + "margin": [ + -100, + 0, + -25, + 0 + ] + } + ] + ] + }, + "layout": "noBorders" + }, + { + "style": "noc-table", + "table": { + "widths": [ + "*", + "*", + "*", + "*" + ], + "body": [ + [ + { + "text": "{{receipt_no}}.", + "border": [ + true, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{receiptNo}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{consumer_id}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{consumerID}}", + "border": [ + false, + true, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{payment_date}}", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{paymentDate}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{payer_name}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerName}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{payer_contact}}", + "border": [ + true, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerContact}}", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table" + }, + { + "text" : " ", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text" : " ", + "border": [ + false, + false, + true, + true + ], + "style": "receipt-table" + } + ] + ] + }, + "layout": {} + }, + { + "style": "next-noc-table", + "table": { + "widths": [ + "25%", + "25%", + "25%", + "25%" + ], + "body": [ + [ + { + "text": "{{service_type}}", + "border": [ + true, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{serviceType}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{billing_period}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{fromPeriod}} {{to}} {{toPeriod}}", + "border": [ + false, + true, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{paid_amount}}", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "₹ {{paidAmount}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{pending_amount}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "₹ {{pendingAmount}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{payment_mode}}", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{paymentMode}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{transaction_id}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{transactionID}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{g8_receipt_no}}.", + "border": [ + true, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{G8ReceiptNo}}", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table" + }, + { + "text": "{{g8_receipt_date}}", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{G8ReceiptDate}}", + "border": [ + false, + false, + true, + true + ], + "style": "receipt-table" + } + ] + ] + }, + "layout": {} + }, + { + "style": "receipt-approver", + "columns": [ + { + "text": [ + { + "text": "{{generated_by}}: ", + "bold": true + }, + { + "text": "{{user-name}}", + "bold": false + } + ], + "alignment": "left" + }, + { + "text": [ + { + "text": "{{commissioner/eo}}", + "bold": true + } + ], + "alignment": "right", + "margin": [ + 0, + 0, + -10, + 1 + ] + } + ] + }, + { + "style": "no-signature", + "text": "{{no_signature}}" + }, + { + "style": "pt-disclaimer", + "stack": [ + { + "text": "{{disclamer}}", + "bold": true, + "style": "pt-disclaimer-value" + }, + { + "text": "{{disclamer_1}}", + "bold": false, + "style": "pt-disclaimer-value" + }, + { + "text": "{{disclamer_2}}", + "bold": false, + "style": "pt-disclaimer-value" + }, + { + "text": "{{disclamer_3}}", + "bold": false, + "style": "pt-disclaimer-value" + }, + { + "text": "{{disclamer_4}}", + "bold": false, + "style": "pt-disclaimer-value" + }, + { + "text": "{{disclamer_5}}", + "bold": false, + "style": "pt-disclaimer-value" + } + ] + } + ], + "styles": { + "noc-head": { + "margin": [ + -30, + -30, + 0, + 1 + ] + }, + "receipt-logo-header": { + "color": "#000000", + "fontSize": 14, + "bold": true, + "letterSpacing": 0.74, + "margin": [ + 0, + 0, + 0, + 5 + ] + }, + "receipt-logo-sub-header": { + "color": "#000000", + "fontSize": 12, + "letterSpacing": 0.6 + }, + "noc-table": { + "fontSize": 12, + "color": "#000000", + "margin": [ + -25, + 45, + -22, + -8 + ] + }, + "next-noc-table": { + "fontSize": 12, + "color": "#000000", + "margin": [ + -25, + 28, + -22, + -8 + ] + }, + "receipt-table-value": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 8, + 8, + 0, + 8 + ] + }, + "receipt-table": { + "color": "#000000", + "bold": false, + "fontSize": 12, + "fontWeight": 400, + "margin": [ + -30, + 8, + 0, + 8 + ] + }, + "receipt-approver": { + "fontSize": 12, + "bold": true, + "margin": [ + -27, + 50, + -10, + 0 + ], + "color": "#484848" + }, + "no-signature": { + "fontSize": 12, + "margin": [ + -27, + 35, + -10, + 0 + ], + "color": "#484848" + }, + "pt-disclaimer": { + "fontSize": 12, + "margin": [ + -27, + 30, + -10, + 0 + ], + "color": "#484848" + }, + "pt-disclaimer-value": { + "fontSize": 12, + "margin": [ + 2, + 5, + 0, + 0 + ], + "color": "#484848" + } + } + } +} \ No newline at end of file diff --git a/configs/pdf-service/format-config/tl-receipt.json b/configs/pdf-service/format-config/tl-receipt.json new file mode 100644 index 00000000..b11b6fb8 --- /dev/null +++ b/configs/pdf-service/format-config/tl-receipt.json @@ -0,0 +1,902 @@ +{ + "key":"tl-receipt", + "config":{ + "content": [ + { + "style": "tl-head", + "table": { + "widths": [ + 50, + "*", + 100 + ], + "body": [ + [ + { + "image": "{{variable33}}", + "width": 50, + "height": 61.25, + "margin": [ + 45, + 12, + 10, + 10 + ] + }, + { + "stack": [ + { + "text": "{{variable30}} Nagar Panchayat", + "style": "receipt-logo-header" + }, + { + "text": "Trade License Payment Receipt ({{variable31}})", + "style": "receipt-logo-sub-header" + } + ], + "alignment": "center", + "margin": [ + 56, + 23, + 0, + 0 + ] + }, + { + "stack": [ + { + "text": "Receipt No.", + "style": "receipt-no", + "bold": true + }, + { + "text": "{{variable16}}", + "style": "receipt-no", + "bold": true + } + ], + "alignment": "center", + "margin": [-50, 30, 0, 2] + } + ] + ] + }, + "layout": "noBorders" + }, + { + "style": "pt-reciept-citizen-header", + "columns": [ + { + "text": [ + { + "text": "Application Type ", + "bold": true + }, + { + "text": "{{variable1}}", + "bold": false + } + ], + "alignment": "left" + }, + { + "text": [ + { + "text": "Old License No. ", + "bold": true + }, + { + "text": "{{variable2}}", + "bold": false + } + ], + "alignment": "right" + } + ] + }, + { + "style": "pt-reciept-citizen-header", + "columns": [ + { + "text": [ + { + "text": "Application No. ", + "bold": true + }, + { + "text": "{{variable3}}", + "bold": false + } + ], + "alignment": "left" + }, + { + "text": [ + { + "text": "Receipt No. ", + "bold": true + }, + { + "text": "{{variable16}}", + "bold": false + } + ], + "alignment": "right" + } + ] + }, + { + "style": "pt-reciept-citizen-header", + "columns": [ + { + "text": [ + { + "text": "Financial Year ", + "bold": true + }, + { + "text": "{{variable4}}", + "bold": false + } + ], + "alignment": "left" + }, + { + "text": [ + { + "text": "Payment Date ", + "bold": true + }, + { + "text": "{{variable17}}", + "bold": false + } + ], + "alignment": "right" + } + ] + }, + { + "text": "TRADE DETAILS", + "style": "pt-reciept-citizen-subheader" + }, + + { + "style": "pt-reciept-citizen-table", + "table": { + "widths": ["*", "*", "*", "*"], + "body": [ + [ + { + "text": "Trade Name", + "border": [ + true, + true, + false, + true + ], + "style": "receipt-table-key" + }, + { + "text": "{{variable5}}", + "border": [ + false, + true, + true, + true + ] + }, + { + "text": "Trade Category", + "border": [ + true, + true, + false, + true + ], + "style": "receipt-table-key" + }, + { + "text": "{{variable6}}", + "border": [ + false, + true, + true, + true + ] + } + ] + ] + }, + "layout": {} + }, + { + "style": "pt-reciept-citizen-table", + "table": { + "widths": ["24%", "76%"], + "body": [ + [ + { + "text": "Trade Type", + "border": [ + true, + false, + false, + true + ], + "style": "receipt-table-key" + }, + { + "text": "{{variable7}}", + "border": [ + false, + false, + true, + true + ] + } + ], + [ + { + "text": "Accessories", + "border": [ + true, + true, + false, + true + ], + "style": "receipt-table-key" + }, + { + "text": "{{variable8}}", + "border": [ + false, + true, + true, + true + ] + } + ] + ] + }, + "layout": {} + }, + { + "text": "TRADE LOCATION DETAILS", + "style": "pt-reciept-citizen-subheader" + }, + { + "style": "pt-reciept-citizen-table", + "table": { + "widths": ["*", "*", "*", "*"], + "body": [ + [ + { + "text": "House/Door No.", + "border": [ + true, + true, + false, + true + ], + "style": "receipt-table-key" + }, + { + "text": "{{variable9}}", + "border": [ + false, + true, + true, + true + ] + }, + { + "text": "Building/Colony Name.", + "border": [ + true, + true, + false, + true + ], + "style": "receipt-table-key" + }, + { + "text": "{{variable10}}", + "border": [ + false, + true, + true, + true + ] + } + ], + [ + { + "text": "Street Name", + "border": [ + true, + true, + false, + true + ], + "style": "receipt-table-key" + }, + { + "text": "{{variable11}}", + "border": [ + false, + true, + true, + true + ] + }, + { + "text": "Locality/Mohalla", + "border": [ + true, + true, + false, + true + ], + "style": "receipt-table-key" + }, + { + "text": "{{variable12}}", + "border": [ + false, + true, + true, + true + ] + } + ] + ] + }, + "layout": {} + }, + { + "text": "OWNERSHIP INFORMATION", + "style": "pt-reciept-citizen-subheader" + }, + { + "style": "pt-reciept-citizen-table", + "table": { + "widths":["*", "*", "*", "*"], + "body": ["{{#variable13}}[{\"text\":\"Owner Name\",\"border\":[true,true,false,true],\"style\":\"receipt-table-key\"},{\"text\":\"{{name}}","border\":[false,true,true,true]},{\"text\":\"Mobile No.\",\"border\":[true,true,false,true],\"style\":\"receipt-table-key\"},{\"text\":\"{{mobileNumber}}\",\"border\":[false,true,true,true]}]{{/variable13}}"] + }, + "layout": {} + }, + { + "text": "PAYABLE AMOUNT", + "style": "pt-reciept-citizen-subheader" + }, + { + "style": "pt-reciept-citizen-table", + "table": { + "widths": ["*", "*", "*", "*", "*", "*"], + "body": [ + [ + { + "text": "Trade License Fee", + "border": [ + true, + true, + true, + true, + true, + true, + true + ], + "style": "receipt-table-key", + "alignment": "center" + }, + { + "text": "Penalty", + "border": [ + true, + true, + true, + true, + true, + true, + true + ], + "style": "receipt-table-key", + "alignment": "center" + }, + { + "text": "Rebate", + "border": [ + true, + true, + true, + true, + true, + true, + true + ], + "style": "receipt-table-key", + "alignment": "center" + }, + { + "text": "Adhoc Penalty", + "border": [ + true, + true, + true, + true, + true, + true, + true + ], + "style": "receipt-table-key", + "alignment": "center" + }, + { + "text": "Adhoc Rebate", + "border": [ + true, + true, + true, + true, + true, + true, + true + ], + "style": "receipt-table-key", + "alignment": "center" + }, + { + "text": "Total", + "border": [ + true, + true, + true, + true, + true, + true, + true + ], + "style": "receipt-table-key", + "alignment": "center" + } + ], + [ + { + "text": "{{variable18}}", + "border": [ + true, + true, + true, + true, + true, + true, + true + ], + "style": "receipt-table-value", + "alignment": "center" + }, + { + "text": "{{variable26}}", + "border": [ + true, + true, + true, + true, + true, + true, + true + ], + "style": "receipt-table-value", + "alignment": "center" + }, + { + "text": "{{variable27}}", + "border": [ + true, + true, + true, + true, + true, + true, + true + ], + "style": "receipt-table-value", + "alignment": "center" + }, + { + "text": "{{variable28}}", + "border": [ + true, + true, + true, + true, + true, + true, + true + ], + "style": "receipt-table-value", + "alignment": "center" + }, + { + "text": "{{variable29}}", + "border": [ + true, + true, + true, + true, + true, + true, + true + ], + "style": "receipt-table-value", + "alignment": "center" + }, + { + "text": "{{variable19}}", + "border": [ + true, + true, + true, + true, + true, + true, + true + ], + "style": "receipt-table-value", + "alignment": "center" + } + ] + ] + }, + "layout": {} + }, + { + "text": "PAYMENT INFORMATION", + "style": "pt-reciept-citizen-subheader" + }, + { + "style": "pt-reciept-citizen-table", + "table": { + "widths": ["*", "*", "*", "*"], + "body": [ + [ + { + "text": "Total Amount Paid:", + "border": [ + true, + true, + false, + true + ], + "style": "receipt-table-key" + }, + { + "text": "{{variable20}}", + "border": [ + false, + true, + true, + true + ] + }, + { + "text": "Amount Due:", + "border": [ + true, + true, + false, + true + ], + "style": "receipt-table-key" + }, + { + "text": "{{variable32}}", + "border": [ + false, + true, + true, + true + ] + } + ] + ] + }, + "layout": {} + }, + { + "style": "pt-reciept-citizen-table", + "table": { + "widths": ["*", "*", "*"], + "body": [ + [ + { + "text": "Payment Mode", + "border": [ + true, + true, + true, + true, + true, + true, + true + ], + "style": "receipt-table-key", + "alignment": "center" + }, + { + "text": "Transaction ID/ Cheque/ DD No.", + "border": [ + true, + true, + true, + true, + true, + true, + true + ], + "style": "receipt-table-key", + "alignment": "center" + }, + { + "text": "Bank Name & Branch", + "border": [ + true, + true, + true, + true, + true, + true, + true + ], + "style": "receipt-table-key", + "alignment": "center" + } + ], + [ + { + "text": "{{variable21}}", + "border": [ + true, + true, + true, + true, + true, + true, + true + ], + "style": "receipt-table-value", + "alignment": "center" + }, + { + "text": "{{variable22}}", + "border": [ + true, + true, + true, + true, + true, + true, + true + ], + "style": "receipt-table-value", + "alignment": "center" + }, + { + "text": "{{variable23}}", + "border": [ + true, + true, + true, + true, + true, + true, + true + ], + "style": "receipt-table-value", + "alignment": "center" + } + ] + ] + }, + "layout": {} + }, + { + "style": "pt-reciept-citizen-table", + "table": { + "widths": ["*", "*", "*", "*"], + "body": [ + [ + { + "text": "G8 Receipt No:", + "border": [ + true, + true, + false, + true + ], + "style": "receipt-table-key" + }, + { + "text": "{{variable24}}", + "border": [ + false, + true, + true, + true + ] + }, + { + "text": "G8 Receipt Issue Date:", + "border": [ + true, + true, + false, + true + ], + "style": "receipt-table-key" + }, + { + "text": "{{variable25}}", + "border": [ + false, + true, + true, + true + ] + } + ] + ] + }, + "layout": {} + }, + { + "style": "receipt-approver", + "columns": [ + { + "text": [ + { + "text": "Generated by: ", + "bold": true + }, + { + "text": "Kulvinder Approver", + "bold": false + } + ], + "alignment": "left" + }, + { + "text": [ + { + "text": "Commissioner/EO", + "bold": true + } + ], + "alignment": "right" + } + ] + } + ], + "footer": [ + { + "text": "Note:\n1. Payment received by cheque/demand draft shall be subject to realization.\n2. This document is not a proof of Property Ownership.\n3. This is a computer generated document, hence requires no signature.", + "style": "receipt-footer" + } + ], + "styles": { + "tl-head": { + "fillColor": "#F2F2F2", + "margin": [ + -41, + -41, + -41, + 0 + ] + }, + "pt-reciept-citizen-header": { + "fontSize": 12, + "bold": true, + "margin": [ + 0, + 8, + 0, + 0 + ], + "color": "#484848" + }, + "pt-reciept-citizen-subheader": { + "fontSize": 10, + "bold": true, + "margin": [ + 0, + 16, + 0, + 8 + ], + "color": "#484848" + }, + "pt-reciept-citizen-table": { + "fontSize": 10, + "color": "#484848" + }, + "receipt-assess-table": { + "fontSize": 10, + "color": "#484848", + "margin": [ + 0, + 8, + 0, + 0 + ] + }, + "receipt-assess-table-header": { + "bold": true, + "fillColor": "#D8D8D8", + "color": "#484848" + }, + "receipt-header-details": { + "fontSize": 9, + "margin": [ + 0, + 0, + 0, + 8 + ], + "color": "#484848" + }, + "receipt-table-key": { + "color": "#484848", + "bold": true + }, + "receipt-table-value": { + "color": "#484848" + }, + "receipt-logo-header": { + "color": "#484848", + "fontFamily": "Roboto", + "fontSize": 16, + "bold": true, + "letterSpacing": 0.74 + }, + "receipt-logo-sub-header": { + "color": "#484848", + "fontFamily": "Roboto", + "fontSize": 13, + "letterSpacing": 1.6, + "margin": [ + 0, + 6, + 0, + 0 + ] + }, + "receipt-footer": { + "color": "#484848", + "fontSize": 8, + "margin": [ + 30, + -20, + 0, + 0 + ] + }, + "receipt-no": { + "color": "#484848", + "fontSize": 10 + }, + "receipt-approver": { + "fontSize": 10, + "bold": true, + "margin": [ + 0, + 60, + 0, + 8 + ], + "color": "#484848" + } + } + } +} + \ No newline at end of file diff --git a/configs/pdf-service/format-config/tlapplication.json b/configs/pdf-service/format-config/tlapplication.json new file mode 100644 index 00000000..fa6d9fde --- /dev/null +++ b/configs/pdf-service/format-config/tlapplication.json @@ -0,0 +1,1370 @@ +{ + "key": "tlapplication", + "config": { + "defaultStyle": { + "font": "Cambay" + }, + "content": [ + { + "style": "noc-head", + "table": { + "widths": [ + "*", + "*", + "*" + ], + "body": [ + [ + { + "text":"{{trade_license_application}}", + "style": "receipt-logo-header" + }, + { + "text":"{{application_no}}", + "alignment":"right", + "color": "#484848", + "margin": [ + 0, + 2, + -50, + 0 + ] + }, + { + "text":"{{applicationNumber}}", + "alignment": "right", + "color": "#484848", + "bold": true, + "margin": [ + -150, + 2, + -20, + 0 + ] + } + ] + ] + }, + "layout": "noBorders" + }, + { + "style": "noc-table2", + "table": { + "widths": [ + "*" + ], + "body": [ + [ + { + "stack":[ + { + "text":"{{total_amount}}", + "style":"receipt-table-value-total", + "bold" : false + }, + { + "text":"{{Rs}} {{totalAmount}}", + "style":"receipt-table-value-total", + "fontSize": 20 + } + ], + "border":[ + true, + true, + true, + false + ] + } + ], + [ + { + "stack":[ + { + "table": { + "widths": [ + "*", + "*" + ], + "body": [ + [ + { + "text":"{{trade_license_tax}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table-value-down" + }, + { + "text":"{{tradeLicenseTax}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table-value-down" + } + ] + ] + } + }, + { + "table": { + "widths": [ + "*", + "*" + ], + "body": [ + [ + { + "text":"{{rebate_label}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table-value-down" + }, + { + "text":"{{rebate}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table-value-down" + } + ] + ] + } + }, + { + "table": { + "widths": [ + "*", + "*" + ], + "body": [ + [ + { + "text":"{{penalty_label}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table-value-down" + }, + { + "text":"{{penalty}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table-value-down" + } + ] + ] + } + }, + { + "canvas": [ + { + "type": "line", + "x1": 0, "y1": 0, + "x2": 315, "y2": 0, + "lineWidth": 1 + } + ] + }, + { + "table": { + "widths": [ + "*", + "*" + ], + "body": [ + [ + { + "text":"{{total_amount}}", + "border":[ + false, + false, + false, + false + ], + "bold": true, + "style": "receipt-table-value-down" + }, + { + "text":"{{totalAmount}}", + "border":[ + false, + false, + false, + false + ], + "bold": true, + "style": "receipt-table-value-down" + } + ] + ] + } + } + ], + "border":[ + true, + false, + true, + true + ], + "margin": [ + 0, + -15, + 0, + 0 + ] + } + ] + ] + }, + "layout": {} + }, + { + "style": "noc-table2", + "table": { + "widths": [ + "*" + ], + "body": [ + [ + { + "text":"{{trade_details}}", + "border":[ + true, + true, + true, + false + ], + "style": "receipt-table-value" + } + ], + [ + { + "table": { + "widths": [ + "25%", + "25%", + "30%", + "20%" + ], + "body": [ + [ + { + "text":"{{application_type}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table-value-cont" + }, + { + "text":"{{old_application_number}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table-value-cont", + "fontSize": 11 + }, + { + "text":"{{licence_type}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table-value-cont" + }, + { + "text":"{{trade_name}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table-value-cont" + } + ], + [ + { + "text":"{{applicationType}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text":"{{oldLicenseNumber}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text":"{{licenseType}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text":"{{tradeName}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table2" + } + ], + [ + { + "text":"{{structure_type}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table-value-cont" + }, + { + "text":"{{structure_sub_type}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table-value-cont", + "fontSize": 11 + }, + { + "text":"{{trade_commencement}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table-value-cont" + }, + { + "text":"{{trade_gst_no}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table-value-cont" + } + ], + [ + { + "text":"{{structureType}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text":"{{structureSubType}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text":"{{commencementDate}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text":"{{tradeGstNo}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table2" + } + ], + [ + { + "text":"{{operational_area}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table-value-cont" + }, + { + "text":"{{no_of_employees}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table-value-cont", + "fontSize": 11 + }, + { + "text":" ", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table-value-cont" + }, + { + "text":" ", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table-value-cont" + } + ], + [ + { + "text":"{{operationalArea}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text":"{{noOfEmployees}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text":" ", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text":" ", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table2" + } + ] + ] + }, + "border":[ + true, + false, + true, + false + ] + } + + ], + [ + { + "canvas": [ + { + "type": "line", + "x1": 5, "y1": 0, + "x2": 550, "y2": 0, + "lineWidth": 1 + } + ], + "border":[ + true, + false, + true, + false + ] + } + ], + [ + { + "table": { + "widths":["*", "*", "*", "*"], + "body": ["{{#variable13}}[{\"text\":\"{{trade_category}}\", \"border\":[ false, false, false, false ], \"style\": \"receipt-table-value-cont\" }, { \"text\":\"{{trade_type}}\", \"border\":[ false, false, false, false ], \"style\": \"receipt-table-value-cont\", \"fontSize\": 11 }, { \"text\":\"{{trade_sub_type}}\", \"border\":[ false, false, false, false ], \"style\": \"receipt-table-value-cont\" }, { \"text\":\"{{uom_measurement}}\", \"border\":[ false, false, false, false ], \"style\": \"receipt-table-value-cont\" } ], [ { \"text\":\"{{tradeCat}}\", \"border\":[ false, false, false, false ], \"style\": \"receipt-table2\" }, { \"text\":\"{{tradetyp}}\", \"border\":[ false, false, false, false ], \"style\": \"receipt-table2\" }, { \"text\":\"{{tradesub}}\", \"border\":[ false, false, false, false ], \"style\": \"receipt-table2\" }, { \"text\":\"{{UOM-measurement}}\", \"border\":[ false, false, false, false ], \"style\": \"receipt-table2\" } ], [ { \"text\":\"{{uom_value}}\", \"border\":[ false, false, false, false ], \"style\": \"receipt-table-value-cont\" }, { \"text\":\" \", \"border\":[ false, false, false, false ], \"style\": \"receipt-table-value-cont\", \"fontSize\": 11 }, { \"text\":\" \", \"border\":[ false, false, false, false ], \"style\": \"receipt-table-value-cont\" }, { \"text\":\" \", \"border\":[ false, false, false, false ], \"style\": \"receipt-table-value-cont\" } ], [ { \"text\":\"{{uomValue}}\", \"border\":[ false, false, false, false ], \"style\": \"receipt-table2\" }, { \"text\":\" \", \"border\":[ false, false, false, false ], \"style\": \"receipt-table2\" }, { \"text\":\" \", \"border\":[ false, false, false, false ], \"style\": \"receipt-table2\" }, { \"text\":\" \", \"border\":[ false, false, false, false ], \"style\": \"receipt-table2\" } ]{{/variable13}}" ] + }, + "border":[ + true, + false, + true, + false + ] + } + + ], + [ + { + "canvas": [ + { + "type": "line", + "x1": 5, "y1": 0, + "x2": 550, "y2": 0, + "lineWidth": 1 + } + ], + "border":[ + true, + false, + true, + false + ] + } + ], + [ + { + "table": { + "widths":["*", "*", "*", "*"], + "body": ["{{#variable14}}[{\"text\":\"{{accesory_type}}\", \"border\":[ false, false, false, false ], \"style\": \"receipt-table-value-cont\" },{ \"text\":\"{{uom_label}}\",\"border\":[ false, false, false, false ], \"style\": \"receipt-table-value-cont\", \"fontSize\": 11 }, { \"text\":\"{{uom_value}}\", \"border\":[ false, false, false, false ], \"style\": \"receipt-table-value-cont\" }, { \"text\":\"{{accessory_count}}\", \"border\":[ false, false, false, false ], \"style\": \"receipt-table-value-cont\" } ], [ { \"text\":\"{{accesoryType}}\", \"border\":[ false, false, false, false ], \"style\": \"receipt-table2\" }, { \"text\":\"{{uom}}\", \"border\":[ false, false, false, false ], \"style\": \"receipt-table2\" }, { \"text\":\"{{accessoryUomValue}}\", \"border\":[ false, false, false, false ], \"style\": \"receipt-table2\" }, { \"text\":\"{{accessoryCount}}\", \"border\":[ false, false, false, false ], \"style\": \"receipt-table2\" } ]{{/variable14}}" ] + }, + "border":[ + true, + false, + true, + false + ] + } + + ], + [ + { + "canvas": [ + { + "type": "line", + "x1": 5, "y1": 0, + "x2": 550, "y2": 0, + "lineWidth": 1 + } + ], + "border":[ + true, + false, + true, + false + ] + } + ], + [ + { + "table": { + "widths": [ + "25%", + "25%", + "20%", + "30%" + ], + "body": [ + [ + { + "text":"{{property_assessment_id}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table-value-cont" + }, + { + "text":"{{city_label}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table-value-cont", + "fontSize": 11 + }, + { + "text":"{{door_house_no}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table-value-cont" + }, + { + "text":"{{building_colony_name}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table-value-cont" + } + ], + [ + { + "text":"{{propertyAssessmentId}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text":"{{city}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text":"{{doorHouseNo}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text":"{{buildingColonyName}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table2" + } + ], + [ + { + "text":"{{street_name}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table-value-cont" + }, + { + "text":"{{mohalla_label}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table-value-cont", + "fontSize": 11 + }, + { + "text":"{{pincode_label}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table-value-cont" + }, + { + "text":"{{electricity_connection_no}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table-value-cont" + } + ], + [ + { + "text":"{{streetName}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text":"{{mohalla}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text":"{{pincode}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text":"{{electricityConnectionNo}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table2" + } + ] + ] + }, + "border":[ + true, + false, + true, + true + ] + } + + ] + ] + }, + "layout": {} + }, + { + "stack": [ + { + "style": "noc-table2", + "table": { + "widths": [ + "*" + ], + "body": [ + [ + { + "text":"{{owner_details}}", + "border":[ + true, + true, + true, + false + ], + "style": "receipt-table-value" + } + ], + [ + { + "table": { + "widths": [ + "25%", + "25%", + "25%", + "25%" + ], + "body": [ + [ + { + "text":"{{type_of_ownership}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table-value-cont" + }, + { + "text":"{{type_of_sub_ownership}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table-value-cont", + "fontSize": 11 + }, + { + "text":"{{mobile_no}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table-value-cont" + }, + { + "text":"{{name_label}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table-value-cont" + } + ], + [ + { + "text":"{{typeOfOwnership}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text":"{{typeOfSubOwnership}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text":"{{mobileNo}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text":"{{name}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table2" + } + ], + [ + { + "text":"{{father_husband}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table-value-cont" + }, + { + "text":"{{relationship_label}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table-value-cont", + "fontSize": 11 + }, + { + "text":"{{gender_label}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table-value-cont" + }, + { + "text":"{{date_of_birth}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table-value-cont" + } + ], + [ + { + "text":"{{fatherHusbandName}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text":"{{relationship}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text":"{{gender}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text":"{{dateOfBirth}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table2" + } + ], + [ + { + "text":"{{email_label}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table-value-cont" + }, + { + "text":"{{pan_no}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table-value-cont", + "fontSize": 11 + }, + { + "text":"{{correspondance_address}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table-value-cont" + }, + { + "text":"{{special_owner}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table-value-cont" + } + ], + [ + { + "text":"{{email}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text":"{{panNo}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text":"{{correspondenceAddress}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text":"{{specialOwnerCategory}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table2" + } + ] + ] + }, + "border":[ + true, + false, + true, + true + ] + } + + ] + ], + "unbreakable": true + }, + "layout": {} + } + ], + "unbreakable": true + }, + { + "stack": [ + { + "style": "noc-table2", + "table": { + "widths": [ + "*" + ], + "body": [ + [ + { + "text":"{{documents_label}}", + "border":[ + true, + true, + true, + false + ], + "style": "receipt-table-value" + } + ], + [ + { + "table": { + "widths": [ + "33%", + "33%", + "33%", + "1%" + ], + "body": [ + [ + { + "text":"{{ownership_proof}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table-value-cont" + }, + { + "text":"{{owners_id_proof}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table-value-cont", + "fontSize": 11 + }, + { + "text":"{{owner_photo}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table-value-cont", + "fontSize": 11 + } + + ], + [ + { + "text":"{{ownershipProof}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text":"{{ownersIdProof}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text":"{{ownerPhoto}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table2" + } + ] + ] + }, + "border":[ + true, + false, + true, + true + ] + } + + ] + ], + "unbreakable": true + }, + "layout": {} + } + ], + "unbreakable": true + } + + ], + "styles": { + "noc-head": { + "margin": [ + -25, + -30, + 0, + 1 + ] + }, + "receipt-logo-header": { + "color": "#484848", + "fontSize": 14, + "bold": true, + "letterSpacing": 0.74, + "margin": [ + 0, + 0, + 0, + 5 + ] + }, + "noc-table": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -25, + 45, + -8, + -8 + ] + }, + "noc-table2": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -25, + 18, + -25, + -8 + ] + }, + "receipt-table-value": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 5, + 5, + 0, + 0 + ] + }, + "receipt-table-value-total": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "alignment": "right", + "margin": [ + 0, + 5, + 30, + 0 + ] + }, + "receipt-table-value-down": { + "color": "#000000", + "bold": false, + "fontSize": 12, + "fontWeight": 400, + "alignment": "left", + "margin": [ + 3, + 5, + 0, + 5 + ] + }, + "receipt-table-value2": { + "color": "#000000", + "bold": false, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 3, + 0, + 0, + 0 + ] + }, + "receipt-table-value-cont": { + "color": "#000000", + "bold": false, + "fontSize": 11, + "fontWeight": 400, + "margin": [ + 3, + 0, + 0, + 0 + ] + }, + "receipt-table": { + "color": "#484848", + "bold": true, + "fontSize": 12, + "fontWeight": 400, + "margin": [ + -30, + 5, + 0, + 0 + ] + }, + "receipt-table2": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 3, + 0, + 0, + 0 + ] + } + + } + + } +} \ No newline at end of file diff --git a/configs/pdf-service/format-config/tlcertificate.json b/configs/pdf-service/format-config/tlcertificate.json new file mode 100644 index 00000000..8a679479 --- /dev/null +++ b/configs/pdf-service/format-config/tlcertificate.json @@ -0,0 +1,549 @@ +{ + "key": "tlcertificate", + "config": { + "defaultStyle": { + "font": "Cambay" + }, + "content": [ + { + "style":"noc-head", + "table":{ + "widths":[ + "*" + ], + "body":[ + [ + { + "image": "{{userpic}}", + "width": 70, + "height": 82, + "alignment": "center", + "margin": [ + 0, + 10, + 0, + 10 + ] + } + ], + [ + { + "stack": [ + { + "text":"{{municipal_corportaion}}", + "style":"receipt-logo-header" + }, + { + "text":"{{ulb-address}}", + "style":"receipt-logo-sub-header" + }, + { + "style": "noc-head", + "table": { + "widths": [ + "*", + "*" + ], + "body": [ + [ + { + "text": "{{corporation_contact}} : {{corporationContact}} ", + "style": "receipt-sub-address-sub-header" + + } + ] + ] + }, + "layout": "noBorders" + }, + { + "style": "noc-head", + "table": { + "widths": [ + "*", + "*" + ], + "body": [ + [ + { + "text": "{{corporation_website}} : {{corporationWebsite}}", + "style": "receipt-sub-website-sub-header" + + } + ] + ] + }, + "layout": "noBorders" + }, + { + "style": "noc-head", + "table": { + "widths": [ + "*", + "*" + ], + "body": [ + [ + { + "text": "{{corporation_email}} : {{corporationEmail}}", + "style": "receipt-sub-email-sub-header" + + } + ] + ] + }, + "layout": "noBorders" + } + ], + "alignment":"left", + "margin":[ + 0, + 10, + 0, + 0 + ] + } + ], + [ + { + "stack": [ + { + "text":"{{trade_license_certifcate}}", + "style":"receipt-sub-logo-header" + }, + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":"{{trade_license_no}}", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":"{{tradeLicenseNo}}", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + }, + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":"{{application_no}}", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":"{{applicationNo}}", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + }, + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":"{{reciept_no}}", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":"{{recieptNo}}", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + }, + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":"{{financial_year}}", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":"{{financialYear}}", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + }, + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":"{{trade_name}}", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":"{{tradeName}}", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + }, + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":"{{trade_owner_name}}", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":"{{tradeOwnerName}}", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + }, + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":"{{trade_owner_contact}}", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":"{{tradeOwnerContact}}", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + }, + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":"{{trade_address}}", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":"{{tradeAddress}}, {{city}}", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + }, + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":"{{trade_type}}", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":"{{tradeType}}", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + }, + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":"{{accessories_label}}", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":"{{accessories}}", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + }, + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":"{{trade_license_fee}}", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":"{{tradeLicenseFee}}", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + }, + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":"{{license_issue_date}}", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":"{{licenseIssueDate}}", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + }, + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":"{{license_validity}}", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":"{{licenseValidityFrom}} {{to}} {{licenseValidityTo}}", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + } + ], + "alignment":"left", + "margin":[ + 0, + 10, + 0, + 0 + ] + } + ] + ] + }, + "layout":"noBorders" + }, + { + "style":"receipt-approver", + "columns": [ + { + "text":[ + { + "text":"{{approved_by}} ", + "bold": true + }, + { + "text":" {{approvedBy}}", + "bold": false + } + ], + "alignment":"left" + }, + { + "text":[ + { + "text":"{{commissioner}}", + "bold": true + } + ], + "alignment":"right" + } + ] + } + ], + "styles": { + "noc-head": { + "margin": [ + -30, + -35, + 0, + -2 + ] + }, + "receipt-approver": { + "color": "#000000", + "fontSize": 14, + "letterSpacing": 0.6, + "alignment": "center", + "margin": [ + -10, + 50, + 0, + 1 + ] + }, + "receipt-logo-header": { + "color": "#000000", + "fontSize": 20, + "letterSpacing": 0.74, + "alignment": "center", + "margin": [ + 0, + 0, + 0, + 5 + ] + }, + "receipt-sub-logo-header": { + "color": "#000000", + "fontSize": 18, + "letterSpacing": 0.74, + "alignment": "center", + "margin": [ + 0, + 5, + 0, + 5 + ] + }, + "receipt-logo-sub-header": { + "color": "#484848", + "fontSize": 14, + "letterSpacing": 0.6, + "alignment": "center", + "margin": [ + 0, + 5, + 0, + 0 + ] + }, + "receipt-sub-logo-sub-header": { + "color": "#484848", + "fontSize": 14, + "letterSpacing": 0.6, + "alignment": "left", + "margin": [ + 50, + 40, + 0, + 0 + ] + }, + "receipt-sub-address-sub-header": { + "color": "#484848", + "fontSize": 14, + "letterSpacing": 0.1, + "alignment": "right", + "margin": [ + 50, + 30, + -90, + 0 + ] + }, + "receipt-sub-website-sub-header": { + "color": "#484848", + "fontSize": 14, + "letterSpacing": 0.1, + "alignment": "right", + "margin": [ + 50, + 30, + -120, + 0 + ] + }, + "receipt-sub-email-sub-header": { + "color": "#484848", + "fontSize": 14, + "letterSpacing": 0.1, + "alignment": "right", + "margin": [ + 50, + 30, + -110, + 0 + ] + } + } + } + } \ No newline at end of file diff --git a/configs/pdf-service/format-config/tlrenewalcertificate.json b/configs/pdf-service/format-config/tlrenewalcertificate.json new file mode 100644 index 00000000..a26a8cf9 --- /dev/null +++ b/configs/pdf-service/format-config/tlrenewalcertificate.json @@ -0,0 +1,549 @@ +{ + "key": "tlrenewalcertificate", + "config": { + "defaultStyle": { + "font": "Cambay" + }, + "content": [ + { + "style":"noc-head", + "table":{ + "widths":[ + "*" + ], + "body":[ + [ + { + "image": "{{userpic}}", + "width": 70, + "height": 82, + "alignment": "center", + "margin": [ + 0, + 10, + 0, + 10 + ] + } + ], + [ + { + "stack": [ + { + "text":"{{municipal_corportaion}}", + "style":"receipt-logo-header" + }, + { + "text":"{{ulb-address}}", + "style":"receipt-logo-sub-header" + }, + { + "style": "noc-head", + "table": { + "widths": [ + "*", + "*" + ], + "body": [ + [ + { + "text": "{{corporation_contact}} : {{corporationContact}} ", + "style": "receipt-sub-address-sub-header" + + } + ] + ] + }, + "layout": "noBorders" + }, + { + "style": "noc-head", + "table": { + "widths": [ + "*", + "*" + ], + "body": [ + [ + { + "text": "{{corporation_website}} : {{corporationWebsite}}", + "style": "receipt-sub-website-sub-header" + + } + ] + ] + }, + "layout": "noBorders" + }, + { + "style": "noc-head", + "table": { + "widths": [ + "*", + "*" + ], + "body": [ + [ + { + "text": "{{corporation_email}} : {{corporationEmail}}", + "style": "receipt-sub-email-sub-header" + + } + ] + ] + }, + "layout": "noBorders" + } + ], + "alignment":"left", + "margin":[ + 0, + 10, + 0, + 0 + ] + } + ], + [ + { + "stack": [ + { + "text":"{{trade_license_certifcate}}", + "style":"receipt-sub-logo-header" + }, + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":"{{trade_license_no}}", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":"{{tradeLicenseNo}}", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + }, + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":"{{application_no}}", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":"{{applicationNo}}", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + }, + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":"{{reciept_no}}", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":"{{recieptNo}}", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + }, + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":"{{financial_year}}", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":"{{financialYear}}", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + }, + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":"{{trade_name}}", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":"{{tradeName}}", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + }, + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":"{{trade_owner_name}}", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":"{{tradeOwnerName}}", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + }, + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":"{{trade_owner_contact}}", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":"{{tradeOwnerContact}}", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + }, + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":"{{trade_address}}", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":"{{tradeAddress}}, {{city}}", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + }, + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":"{{trade_type}}", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":"{{tradeType}}", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + }, + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":"{{accessories_label}}", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":"{{accessories}}", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + }, + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":"{{trade_license_fee}}", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":"{{tradeLicenseFee}}", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + }, + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":"{{license_issue_date}}", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":"{{licenseIssueDate}}", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + }, + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":"{{license_validity}}", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":"{{licenseValidityFrom}} {{to}} {{licenseValidityTo}}", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + } + ], + "alignment":"left", + "margin":[ + 0, + 10, + 0, + 0 + ] + } + ] + ] + }, + "layout":"noBorders" + }, + { + "style":"receipt-approver", + "columns": [ + { + "text":[ + { + "text":"{{approved_by}} ", + "bold": true + }, + { + "text":" {{approvedBy}}", + "bold": false + } + ], + "alignment":"left" + }, + { + "text":[ + { + "text":"{{commissioner}}", + "bold": true + } + ], + "alignment":"right" + } + ] + } + ], + "styles": { + "noc-head": { + "margin": [ + -30, + -35, + 0, + -2 + ] + }, + "receipt-approver": { + "color": "#000000", + "fontSize": 14, + "letterSpacing": 0.6, + "alignment": "center", + "margin": [ + -10, + 50, + 0, + 1 + ] + }, + "receipt-logo-header": { + "color": "#000000", + "fontSize": 20, + "letterSpacing": 0.74, + "alignment": "center", + "margin": [ + 0, + 0, + 0, + 5 + ] + }, + "receipt-sub-logo-header": { + "color": "#000000", + "fontSize": 18, + "letterSpacing": 0.74, + "alignment": "center", + "margin": [ + 0, + 5, + 0, + 5 + ] + }, + "receipt-logo-sub-header": { + "color": "#484848", + "fontSize": 14, + "letterSpacing": 0.6, + "alignment": "center", + "margin": [ + 0, + 5, + 0, + 0 + ] + }, + "receipt-sub-logo-sub-header": { + "color": "#484848", + "fontSize": 14, + "letterSpacing": 0.6, + "alignment": "left", + "margin": [ + 50, + 40, + 0, + 0 + ] + }, + "receipt-sub-address-sub-header": { + "color": "#484848", + "fontSize": 14, + "letterSpacing": 0.1, + "alignment": "right", + "margin": [ + 50, + 30, + -90, + 0 + ] + }, + "receipt-sub-website-sub-header": { + "color": "#484848", + "fontSize": 14, + "letterSpacing": 0.1, + "alignment": "right", + "margin": [ + 50, + 30, + -120, + 0 + ] + }, + "receipt-sub-email-sub-header": { + "color": "#484848", + "fontSize": 14, + "letterSpacing": 0.1, + "alignment": "right", + "margin": [ + 50, + 30, + -110, + 0 + ] + } + } + } + } diff --git a/configs/pdf-service/format-config/tradelicense-bill.json b/configs/pdf-service/format-config/tradelicense-bill.json new file mode 100644 index 00000000..93131e26 --- /dev/null +++ b/configs/pdf-service/format-config/tradelicense-bill.json @@ -0,0 +1,955 @@ +{ + "key": "tradelicense-bill", + "config": { + "defaultStyle": { + "font": "Cambay" + }, + "content": [ + { + "style": "noc-head", + "table": { + "widths": [ + 60, + "*", + 120 + ], + "body": [ + [ + { + "image": "{{logoImage}}", + "width": 50, + "height": 61.25 + }, + { + "stack": [ + { + "text": "{{logo_header}} {{Municipal_Corporation}}", + "style": "receipt-logo-header" + }, + { + "stack": [ + { + "text": "{{address}}" + }, + { + "text": "{{phoneNumber}}" + }, + { + "text": "{{website}}" + }, + { + "text": "{{email}}" + } + ] + } + ], + "alignment": "left", + "margin": [ + 0, + 10, + 0, + 0 + ] + }, + { + "stack": [ + { + "text": "{{total_amount_due}}" + }, + { + "text": "{{Rs}} {{totalAmountDue}}", + "style": "amount-due" + } + ], + "alignment": "right", + "color": "#484848", + "margin": [ + -150, + 2, + -20, + 0 + ] + } + ] + ] + }, + "layout": "noBorders" + }, + { + "style": "noc-table", + "table": { + "widths": [ + 130, + 130, + -2, + 130, + 130 + ], + "body": [ + [ + { + "text": "{{payer_name}}", + "border": [ + true, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerName}}", + "border": [ + false, + true, + true, + false + ], + "style": "receipt-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ] + }, + { + "text": "{{bill_no}}", + "border": [ + true, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{billNo}}", + "border": [ + false, + true, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{mobile_no}}", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{mobileNo}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ] + }, + { + "text": "{{bill_period}}", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{fromPeriod}} - {{toPeriod}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{payer_address}}", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerAddress}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ] + }, + { + "text": "{{bill_issue_date}}", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{billIssueDate}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": " ", + "border": [ + true, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": " ", + "border": [ + false, + false, + true, + true + ], + "style": "receipt-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ] + }, + { + "text": "{{bill_due_date}}", + "border": [ + true, + false, + false, + true + ], + "style": "right-receipt-table" + }, + { + "text": "{{billDueDate}}", + "border": [ + false, + false, + true, + true + ], + "style": "right-receipt-table2" + } + ] + ] + }, + "layout": {} + }, + { + "style": "noc-table2", + "table": { + "widths": [ + "103%" + ], + "body": [ + [ + { + "text": "{{billing_summary_property_tax}} {{serviceType}}", + "border": [ + true, + true, + true, + false + ], + "style": "receipt-table-value" + } + ], + [ + { + "table": { + "widths": [ + "30%", + "26%", + "10%", + "11%", + "10%", + "9%", + "10%", + "9%" + ], + "body": [ + [ + { + "text": "{{tl_application_no}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{bill_period}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{charge_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{penalty_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{rebate_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{others_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{total_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + } + ], + [ + { + "text": "{{propertyID}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{fromPeriod}}-{{toPeriod}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{charge}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{penalty}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{rebate}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{others}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{totalAmountDue}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2", + "bold": true + } + ] + ] + }, + "border": [ + true, + false, + true, + true + ] + } + ] + ] + }, + "layout": {} + }, + + { + "style" : "noc-table3", + "table" : { + "widths": [ + "103%" + ], + "body":[ + [ + { + "style": "noc-table3", + "table": { + "widths": [ + "100%" + ], + "body": ["[{\"text\": \"{{important_message}}\",\"border\":[false,false,false,false],\"style\":\"bill-message-header\"}],{{#variable11}}[{\"text\":\"{{disclaimerContent}}\",\"border\":[false,false,false,false],\"style\":\"bill-message-value\"}]{{/variable11}}"] + } + } + ] + ] + + } + }, + { + "canvas": [ + { + "type": "line", + "x1": -40, + "y1": 30, + "x2": 700, + "y2": 30, + "dash": { + "length": 10, + "space": 5 + } + } + ] + }, + { + "image": "{{scissorImage}}", + "width": 24, + "height": 24, + "margin": [ + -30, + -11.2, + 0, + 0 + ] + }, + + { + "text": "{{acknowledgement_for}}", + "style": "footer-header", + "pageBreak": "before" + + }, + { + "style": "noc-table4", + "table": { + "widths": [ + "25%", + "25%", + "25%", + "25%" + ], + "body": [ + [ + { + "text": "{{date_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{billdate}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{consumer_id}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{consumerID}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{bill_no}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{billNo}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{name_address}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerName}}, {{nameAddress}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{total_payment}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{total}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + } + ] + ] + } + }, + { + "text": "{{receivers_signature}}", + "style": "footer-bottom" + } + ], + "styles": { + "noc-head": { + "margin": [ + -25, + -30, + 0, + 1 + ] + }, + "receipt-logo-header": { + "color": "#484848", + "fontFamily": "Roboto", + "fontSize": 14, + "bold": true, + "letterSpacing": 0.74, + "margin": [ + 0, + -10, + 0, + 5 + ] + }, + "receipt-logo-sub-header": { + "color": "#484848", + "fontFamily": "Roboto", + "fontSize": 13, + "letterSpacing": 0.6 + }, + "noc-table": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -25, + 10, + -8, + -8 + ] + }, + "noc-table4": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -25, + 75, + -8, + -8 + ] + }, + "noc-table2": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -25, + 18, + -8, + -8 + ] + }, + "noc-table3": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -25, + 30, + -8, + -8 + ] + }, + "receipt-table-value": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 8, + 5, + 0, + 0 + ] + }, + "receipt-table-value2": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 3, + 5, + 0, + 0 + ] + }, + "receipt-table": { + "color": "#484848", + "bold": true, + "fontSize": 12, + "fontWeight": 400, + "margin": [ + -10, + 5, + 0, + 0 + ] + }, + "receipt-table2": { + "color": "#484848", + "bold": true, + "fontSize": 11, + "fontWeight": 400, + "margin": [ + 3, + 8, + 0, + 10 + ] + }, + "right-receipt-table": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 8, + 5, + 0, + 10 + ] + }, + "right-receipt-table2": { + "color": "#484848", + "bold": true, + "fontSize": 12, + "fontWeight": 400, + "margin": [ + -10, + 5, + 0, + 0 + ] + }, + "receipt-approver": { + "fontSize": 12, + "bold": true, + "margin": [ + -27, + 50, + -10, + 0 + ], + "color": "#484848" + }, + "no-signature": { + "fontSize": 12, + "margin": [ + -27, + 35, + -10, + 0 + ], + "color": "#484848" + }, + "amount-due": { + "fontSize": 30, + "color": "#FC8019", + "bold": true, + "fontWeight": 700 + }, + "pt-disclaimer": { + "fontSize": 12, + "margin": [ + -27, + 30, + -10, + 0 + ], + "color": "#484848" + }, + "pt-disclaimer-value": { + "fontSize": 12, + "margin": [ + 2, + 5, + 0, + 0 + ], + "color": "#484848" + }, + "qr-text": { + "fontSize": 12, + "margin": [ + 40, + 0, + 0, + 0 + ], + "color": "#484848", + "alignment": "left" + }, + "qr-image": { + "margin": [ + -40, + -1, + -3, + 0 + ], + "color": "#484848", + "alignment": "right" + }, + "footer-header": { + "margin": [ + 0, + 15, + 0, + -40 + ], + "bold": true, + "color": "#000000", + "alignment": "center" + }, + "footer-bottom": { + "margin": [ + 0, + 50, + 0, + 0 + ], + "bold": true, + "color": "#000000", + "alignment": "right" + }, + "bill-message-header": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 28, + -15, + 0, + 10 + ] + }, + "bill-message-value": { + "color": "#484848", + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 28, + -5, + 0, + 10 + ] + }, + "disclaimer-table": { + "fontSize": 12, + "bold": false, + "color": "#FC8019", + "margin": [ + -25, + 16, + -8, + -8 + ] + } + } + } +} \ No newline at end of file diff --git a/configs/pdf-service/format-config/tradelicense-receipt.json b/configs/pdf-service/format-config/tradelicense-receipt.json new file mode 100644 index 00000000..a9bcacfb --- /dev/null +++ b/configs/pdf-service/format-config/tradelicense-receipt.json @@ -0,0 +1,570 @@ +{ + "key": "tradelicense-receipt", + "config": { + "defaultStyle": { + "font": "Cambay" + }, + "content": [ + { + "style": "noc-head", + "table": { + "widths": [ + 60, + "*", + 120 + ], + "body": [ + [ + { + "image": "{{logoImage}}", + "width": 50, + "height": 61.25 + }, + { + "stack": [ + { + "text": "{{logo-header}} {{Municipal_Corporation}}", + "style": "receipt-logo-header" + }, + { + "text": "{{serviceType}} {{payment_receipt}}", + "style": "receipt-logo-sub-header" + } + ], + "alignment": "left", + "margin": [ + 0, + 10, + 0, + 0 + ] + }, + { + "stack": [ + { + "text": "{{address}}" + }, + { + "text": "{{phoneNumber}}" + }, + { + "text": "{{website}}" + }, + { + "text": "{{email}}" + } + ], + "alignment": "right", + "color": "#484848", + "margin": [ + -100, + 0, + -25, + 0 + ] + } + ] + ] + }, + "layout": "noBorders" + }, + { + "style": "noc-table", + "table": { + "widths": [ + "25%", + "25%", + "25%", + "25%" + ], + "body": [ + [ + { + "text": "{{receipt_no}}.", + "border": [ + true, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{receiptNo}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table", + "font": "Roboto" + }, + { + "text": "{{consumer_id}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{consumerID}}", + "border": [ + false, + true, + true, + false + ], + "style": "receipt-table", + "font": "Roboto" + } + ], + [ + { + "text": "{{payment_date}}", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{paymentDate}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{payer_name}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerName}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{payer_contact}}", + "border": [ + true, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerContact}}", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table" + }, + { + "text" : " ", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text" : " ", + "border": [ + false, + false, + true, + true + ], + "style": "receipt-table" + } + ] + ] + }, + "layout": {} + }, + { + "style": "next-noc-table", + "table": { + "widths": [ + "25%", + "25%", + "25%", + "25%" + ], + "body": [ + [ + { + "text": "{{service_type}}", + "border": [ + true, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{serviceType}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{billing_period}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{fromPeriod}} {{to}} {{toPeriod}}", + "border": [ + false, + true, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{paid_amount}}", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "₹ {{paidAmount}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{pending_amount}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "₹ {{pendingAmount}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{payment_mode}}", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{paymentMode}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{transaction_id}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{transactionID}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table", + "font": "Roboto" + } + ], + [ + { + "text": "{{g8_receipt_no}}.", + "border": [ + true, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{G8ReceiptNo}}", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table" + }, + { + "text": "{{g8_receipt_date}}", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{G8ReceiptDate}}", + "border": [ + false, + false, + true, + true + ], + "style": "receipt-table" + } + ] + ] + }, + "layout": {} + }, + { + "style": "receipt-approver", + "columns": [ + { + "text": [ + { + "text": "{{generated_by}}: ", + "bold": true + }, + { + "text": "{{user-name}}", + "bold": false + } + ], + "alignment": "left" + }, + { + "text": [ + { + "text": "{{commissioner/eo}}", + "bold": true + } + ], + "alignment": "right", + "margin": [ + 0, + 0, + -10, + 1 + ] + } + ] + }, + { + "style": "no-signature", + "text": "{{no_signature}}" + }, + { + "style": "pt-disclaimer", + "stack": [ + { + "text": "{{disclamer}}", + "bold": true, + "style": "pt-disclaimer-value" + }, + { + "style": "pt-disclaimer-value", + "table": { + "widths": [ + "120%", + "*", + "*", + "*" + ], + "body": ["{{#variable11}}[{\"text\":\"{{disclaimerContent}}\",\"border\":[false,false,false,false],\"style\":\"pt-disclaimer-value\"}]{{/variable11}}"] + }, + "layout": {} + } + ] + } + ], + "styles": { + "noc-head": { + "margin": [ + -30, + -30, + 0, + 1 + ] + }, + "receipt-logo-header": { + "color": "#000000", + "fontSize": 14, + "bold": true, + "letterSpacing": 0.74, + "margin": [ + 0, + 0, + 0, + 5 + ] + }, + "receipt-logo-sub-header": { + "color": "#000000", + "fontSize": 12, + "letterSpacing": 0.6 + }, + "noc-table": { + "fontSize": 12, + "color": "#000000", + "margin": [ + -25, + 45, + -22, + -8 + ] + }, + "next-noc-table": { + "fontSize": 12, + "color": "#000000", + "margin": [ + -25, + 28, + -22, + -8 + ] + }, + "receipt-table-value": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 8, + 8, + 0, + 8 + ] + }, + "receipt-table": { + "color": "#000000", + "bold": false, + "fontSize": 12, + "fontWeight": 400, + "margin": [ + -10, + 8, + 0, + 8 + ] + }, + "receipt-approver": { + "fontSize": 12, + "bold": true, + "margin": [ + -27, + 50, + -10, + 0 + ], + "color": "#484848" + }, + "no-signature": { + "fontSize": 12, + "margin": [ + -27, + 35, + -10, + 0 + ], + "color": "#484848" + }, + "pt-disclaimer": { + "fontSize": 12, + "margin": [ + -27, + 30, + -10, + 0 + ], + "color": "#484848" + }, + "pt-disclaimer-value": { + "fontSize": 12, + "margin": [ + 2, + 5, + 0, + 0 + ], + "color": "#484848" + } + } + } +} \ No newline at end of file diff --git a/configs/pdf-service/format-config/ws-applicationsewerage.json b/configs/pdf-service/format-config/ws-applicationsewerage.json new file mode 100644 index 00000000..bdc4599f --- /dev/null +++ b/configs/pdf-service/format-config/ws-applicationsewerage.json @@ -0,0 +1,1413 @@ +{ + "key": "ws-applicationsewerage", + "config": { + "defaultStyle": { + "font": "Cambay" + }, + "content": [ + { + "style": "ws-head", + "table": { + "widths": [ + 60, + "*", + 120 + ], + "body": [ + [ + { + "image": "{{logoImage}}", + "width": 50, + "height": 61.25, + "margin": [ + 12, + 10, + 12, + 10 + ] + }, + { + "stack": [ + { + "text": "{{logo_header}} {{Municipal_Corporation}}", + "style": "receipt-logo-header" + }, + { + "text": "{{logo_sub_header}}" + } + ], + "alignment": "left", + "margin": [ + 10, + 30, + 0, + 0 + ] + } + ] + ] + }, + "layout": "noBorders" + }, + { + "columns": [ + { + "text": "{{sewerage_application}}", + "style": "ws-header" + }, + { + "text": "{{application_no}}", + "alignment": "right", + "margin": [ + 0, + 2, + -50, + 0 + ] + }, + { + "text": "{{applicationNo}}", + "alignment": "right", + "bold": true, + "margin": [ + -150, + 2, + -20, + 0 + ] + } + ], + "margin": [ + -26, + 10, + 0, + 0 + ] + }, + { + "text": "{{property_details_header}}", + "style": "header" + }, + { + "style": "ws-table", + "table": { + "widths": [ + "103%" + ], + "body": [ + [ + { + "table": { + "widths": [ + "25%", + "25%", + "25%", + "25%" + ], + "body": [ + [ + { + "text": "{{property_id}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{property_type}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{property_usage_type}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{property_usage_sub_type}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + } + ], + [ + { + "text": "{{propertyId}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{propertyType}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{propertyUsageType}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{propertyUsageSubType}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + } + ], + [ + { + "text": "{{plot_size}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{no_of_floor}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{rainwater_harvesting_facility}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + } + ], + [ + { + "text": "{{plotSize}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{noOfFloor}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{rainwaterHarvestingFacility}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + } + ] + ] + }, + "border": [ + true, + true, + true, + true + ] + } + ] + ] + }, + "layout": {} + }, + { + "text": "{{property_location_details_header}}", + "style": "header" + }, + { + "style": "ws-table", + "table": { + "widths": [ + "103%" + ], + "body": [ + [ + { + "table": { + "widths": [ + "25%", + "25%", + "25%", + "25%" + ], + "body": [ + [ + { + "text": "{{city}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{door_house_no}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{building_colony_name}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{street_name}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + } + ], + [ + { + "text": "{{cityName}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{doorHouseNo}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{buildingColonyName}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{streetName}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + } + ], + [ + { + "text": "{{locality_mohalla}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{pin_code}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + } + ], + [ + { + "text": "{{localityMohalla}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{pinCode}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + } + ] + ] + }, + "border": [ + true, + true, + true, + true + ] + } + ] + ] + }, + "layout": {} + }, + { + "text": "{{property_owner_details_header}}", + "style": "header" + }, + { + "style": "ws-table", + "table": { + "widths": [ + "103%" + ], + "body": [ + [ + { + "table": { + "widths": [ + "25%", + "25%", + "25%", + "25%" + ], + "body": [ + "{{#variable13}}[{\"text\":\"{{owner_name}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\" }, { \"text\":\"{{email_label}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\", \"fontSize\": 11 }, { \"text\":\"{{gender_label}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\" }, { \"text\":\"{{dob_label}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\" } ], [ { \"text\":\"{{ownerName}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" }, { \"text\":\"{{emailId}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" }, { \"text\":\"{{gender}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" }, { \"text\":\"{{dob}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" } ], [ { \"text\":\"{{guardian_name}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\" }, { \"text\":\"{{relationship_label}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\", \"fontSize\": 11 }, { \"text\":\"{{correspondence_address}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\" }, { \"text\":\"{{special_applicant_category}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\" } ], [ { \"text\":\"{{guardianName}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" }, { \"text\":\"{{relationshipLabel}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" }, { \"text\":\"{{correspondenceAddress}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" }, { \"text\":\"{{specialApplicantCategory}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" } ]{{/variable13}}" + ] + }, + "border": [ + true, + true, + true, + true + ] + } + ] + ] + }, + "layout": {} + }, + { + "text": "{{connection_details_header}}", + "style": "header" + }, + { + "style": "ws-table", + "table": { + "widths": [ + "103%" + ], + "body": [ + [ + { + "table": { + "widths": [ + "25%", + "25%", + "25%", + "25%" + ], + "body": [ + [ + { + "text": "{{apply_category}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{no_of_water_closets_proposed}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{no_of_water_toilets_proposed}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + } + ], + [ + { + "text": "{{applyCategory}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{noOfWaterClosetsProposed}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{noOfWaterToiletsProposed}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + } + ] + ] + }, + "border": [ + true, + true, + true, + true + ] + } + ] + ] + }, + "layout": {} + }, + { + "text": "{{document_details_header}}", + "style": "header" + }, + { + "stack": [ + { + "style": "ws-table", + "table": { + "widths": [ + "103%" + ], + "body": [ + [ + { + "table": { + "widths": [ + "33%", + "33%", + "33%", + "1%" + ], + "body": [ + [ + { + "text": "{{ownership_proof}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{owners_id_proof}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table", + "fontSize": 11 + }, + { + "text": "{{electricty_bill}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table", + "fontSize": 11 + } + ], + [ + { + "text": "{{ownershipProof}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{ownersIdProof}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{electricityBill}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + } + ] + ] + }, + "border": [ + true, + true, + true, + false + ] + } + ], + [ + { + "table": { + "widths": [ + "33%", + "33%", + "33%", + "1%" + ], + "body": [ + [ + { + "text": "{{plumber_report}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{building_plan}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table", + "fontSize": 11 + }, + { + "text": "{{property_tax_reciept}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table", + "fontSize": 11 + } + ], + [ + { + "text": "{{plumberReport}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{buildingPlan}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{ptTaxReciept}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + } + ] + ] + }, + "border": [ + true, + false, + true, + true + ] + } + ] + ], + "unbreakable": true + }, + "layout": {} + } + ], + "unbreakable": true + }, + { + "text": "{{additional_connection_details_header}}", + "style": "header" + }, + { + "style": "ws-table", + "table": { + "widths": [ + "103%" + ], + "body": [ + [ + { + "table": { + "widths": [ + "25%", + "25%", + "25%", + "25%" + ], + "body": [ + [ + { + "text": "{{connection_type}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{no_of_water_closets}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{no_of_toilets}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + } + ], + [ + { + "text": "{{connectionType}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{noOfWaterClosets}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{noOfToilets}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + } + ] + ] + }, + "border": [ + true, + true, + true, + true + ] + } + ] + ] + }, + "layout": {} + }, + { + "text": "{{plumber_details_header}}", + "style": "header" + }, + { + "style": "ws-table", + "table": { + "widths": [ + "103%" + ], + "body": [ + [ + { + "table": { + "widths": [ + "25%", + "25%", + "25%", + "25%" + ], + "body": [ + [ + { + "text": "{{plumber_provided_by}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{plumber_licence_no}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{plumber_name}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{plumber_mobile_no}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + } + ], + [ + { + "text": "{{plumberProvidedBy}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{plumberLicenceNo}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{plumberName}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{plumberMobileNo}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + } + ] + ] + }, + "border": [ + true, + true, + true, + true + ] + } + ] + ] + }, + "layout": {} + }, + { + "text": "{{road_charges_header}}", + "style": "header" + }, + { + "style": "ws-table", + "table": { + "widths": [ + "103%" + ], + "body": [ + [ + { + "table": { + "widths": [ + "25%", + "25%", + "25%", + "25%" + ], + "body": [ + [ + { + "text": "{{road_type}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{area_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + } + ], + [ + { + "text": "{{roadType}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{area}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + } + ] + ] + }, + "border": [ + true, + true, + true, + true + ] + } + ] + ] + }, + "layout": {} + }, + { + "text": "{{activation_details_header}}", + "style": "header" + }, + { + "style": "ws-table", + "table": { + "widths": [ + "103%" + ], + "body": [ + [ + { + "table": { + "widths": [ + "25%", + "25%", + "25%", + "25%" + ], + "body": [ + [ + { + "text": "{{connection_execution_date}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + } + ], + [ + { + "text": "{{connectionExecutionDate}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + } + ] + ] + }, + "border": [ + true, + true, + true, + true + ] + } + ] + ] + }, + "layout": {} + } + ], + "styles": { + "ws-head": { + "margin": [ + -39, + -38, + -38, + 0 + ] + }, + "receipt-logo-header": { + "color": "#000000", + "fontFamily": "Cambay", + "fontSize": 14, + "bold": true, + "letterSpacing": 0.74, + "margin": [ + 0, + -10, + 0, + 5 + ] + }, + "ws-table": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -25, + 18, + -8, + 10 + ] + }, + "header": { + "color": "#000000", + "textTransform": "uppercase", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + -25, + 15, + 0, + -10 + ] + }, + "ws-sub-table-value": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 3, + 0, + 0, + 10 + ] + }, + "ws-sub-table": { + "color": "#484848", + "bold": true, + "fontSize": 12, + "fontWeight": 400, + "margin": [ + 3, + 8, + 0, + 0 + ] + }, + "qr-image": { + "margin": [ + -40, + -1, + -3, + 0 + ], + "color": "#484848", + "alignment": "right", + "backgroundColor": "#dddddd" + }, + "receipt-table-value-total": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "alignment": "right", + "margin": [ + 0, + 5, + 30, + 0 + ] + } + } + } +} \ No newline at end of file diff --git a/configs/pdf-service/format-config/ws-applicationwater.json b/configs/pdf-service/format-config/ws-applicationwater.json new file mode 100644 index 00000000..971d344a --- /dev/null +++ b/configs/pdf-service/format-config/ws-applicationwater.json @@ -0,0 +1,1497 @@ +{ + "key": "ws-applicationwater", + "config": { + "defaultStyle": { + "font": "Cambay" + }, + "content": [ + { + "style": "ws-head", + "table": { + "widths": [ + 60, + "*", + 120 + ], + "body": [ + [ + { + "image": "{{logoImage}}", + "width": 50, + "height": 61.25, + "margin": [ + 12, + 10, + 12, + 10 + ] + }, + { + "stack": [ + { + "text": "{{logo_header}} {{Municipal_Corporation}}", + "style": "receipt-logo-header" + }, + { + "text": "{{logo_sub_header}}" + } + ], + "alignment": "left", + "margin": [ + 10, + 30, + 0, + 0 + ] + } + ] + ] + }, + "layout": "noBorders" + }, + { + "columns": [ + { + "text": "{{water_application}}", + "style": "ws-header" + }, + { + "text": "{{application_no}}", + "alignment": "right", + "margin": [ + 0, + 2, + -50, + 0 + ] + }, + { + "text": "{{applicationNo}}", + "alignment": "right", + "bold": true, + "margin": [ + -150, + 2, + -20, + 0 + ] + } + ], + "margin": [ + -26, + 10, + 0, + 0 + ] + }, + { + "text": "{{property_details_header}}", + "style": "header" + }, + { + "style": "ws-table", + "table": { + "widths": [ + "103%" + ], + "body": [ + [ + { + "table": { + "widths": [ + "25%", + "25%", + "25%", + "25%" + ], + "body": [ + [ + { + "text": "{{property_id}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{property_type}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{property_usage_type}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{property_usage_sub_type}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + } + ], + [ + { + "text": "{{propertyId}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{propertyType}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{propertyUsageType}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{propertyUsageSubType}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + } + ], + [ + { + "text": "{{plot_size}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{no_of_floor}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{rainwater_harvesting_facility}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + } + ], + [ + { + "text": "{{plotSize}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{noOfFloor}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{rainwaterHarvestingFacility}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + } + ] + ] + }, + "border": [ + true, + true, + true, + true + ] + } + ] + ] + }, + "layout": {} + }, + { + "text": "{{property_location_details_header}}", + "style": "header" + }, + { + "style": "ws-table", + "table": { + "widths": [ + "103%" + ], + "body": [ + [ + { + "table": { + "widths": [ + "25%", + "25%", + "25%", + "25%" + ], + "body": [ + [ + { + "text": "{{city}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{door_house_no}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{building_colony_name}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{street_name}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + } + ], + [ + { + "text": "{{cityName}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{doorHouseNo}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{buildingColonyName}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{streetName}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + } + ], + [ + { + "text": "{{locality_mohalla}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{pin_code}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + } + ], + [ + { + "text": "{{localityMohalla}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{pinCode}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + } + ] + ] + }, + "border": [ + true, + true, + true, + true + ] + } + ] + ] + }, + "layout": {} + }, + { + "text": "{{property_owner_details_header}}", + "style": "header" + }, + { + "style": "ws-table", + "table": { + "widths": [ + "103%" + ], + "body": [ + [ + { + "table": { + "widths": [ + "25%", + "25%", + "25%", + "25%" + ], + "body": [ + "{{#variable13}}[{\"text\":\"{{owner_name}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\" }, { \"text\":\"{{email_label}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\", \"fontSize\": 11 }, { \"text\":\"{{gender_label}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\" }, { \"text\":\"{{dob_label}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\" } ], [ { \"text\":\"{{ownerName}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" }, { \"text\":\"{{emailId}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" }, { \"text\":\"{{gender}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" }, { \"text\":\"{{dob}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" } ], [ { \"text\":\"{{guardian_name}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\" }, { \"text\":\"{{relationship_label}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\", \"fontSize\": 11 }, { \"text\":\"{{correspondence_address}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\" }, { \"text\":\"{{special_applicant_category}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\" } ], [ { \"text\":\"{{guardianName}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" }, { \"text\":\"{{relationshipLabel}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" }, { \"text\":\"{{correspondenceAddress}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" }, { \"text\":\"{{specialApplicantCategory}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" } ]{{/variable13}}" + ] + }, + "border": [ + true, + true, + true, + true + ] + } + ] + ] + }, + "layout": {} + }, + { + "text": "{{connection_details_header}}", + "style": "header" + }, + { + "style": "ws-table", + "table": { + "widths": [ + "103%" + ], + "body": [ + [ + { + "table": { + "widths": [ + "25%", + "25%", + "25%", + "25%" + ], + "body": [ + [ + { + "text": "{{apply_category}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{no_of_taps_proposed}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{pipe_size_proposed}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + } + ], + [ + { + "text": "{{applyCategory}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{noOfTapsProposed}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{pipeSizeProposed}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + } + ] + ] + }, + "border": [ + true, + true, + true, + true + ] + } + ] + ] + }, + "layout": {} + }, + { + "text": "{{document_details_header}}", + "style": "header" + }, + { + "stack": [ + { + "style": "ws-table", + "table": { + "widths": [ + "103%" + ], + "body": [ + [ + { + "table": { + "widths": [ + "33%", + "33%", + "33%", + "1%" + ], + "body": [ + [ + { + "text": "{{ownership_proof}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{owners_id_proof}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table", + "fontSize": 11 + }, + { + "text": "{{electricty_bill}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table", + "fontSize": 11 + } + ], + [ + { + "text": "{{ownershipProof}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{ownersIdProof}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{electricityBill}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + } + ] + ] + }, + "border": [ + true, + true, + true, + false + ] + } + ], + [ + { + "table": { + "widths": [ + "33%", + "33%", + "33%", + "1%" + ], + "body": [ + [ + { + "text": "{{plumber_report}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{building_plan}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table", + "fontSize": 11 + }, + { + "text": "{{property_tax_reciept}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table", + "fontSize": 11 + } + ], + [ + { + "text": "{{plumberReport}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{buildingPlan}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{ptTaxReciept}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + } + ] + ] + }, + "border": [ + true, + false, + true, + true + ] + } + ] + ], + "unbreakable": true + }, + "layout": {} + } + ], + "unbreakable": true + }, + { + "text": "{{additional_connection_details_header}}", + "style": "header" + }, + { + "style": "ws-table", + "table": { + "widths": [ + "103%" + ], + "body": [ + [ + { + "table": { + "widths": [ + "25%", + "25%", + "25%", + "25%" + ], + "body": [ + [ + { + "text": "{{connection_type}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{no_of_taps}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{water_source}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{water_sub_source}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + } + ], + [ + { + "text": "{{connectionType}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{noOfTaps}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{waterSource}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{waterSubSource}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + } + ], + [ + { + "text": "{{pipe_size}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + } + ], + [ + { + "text": "{{pipeSize}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + } + ] + ] + }, + "border": [ + true, + true, + true, + true + ] + } + ] + ] + }, + "layout": {} + }, + { + "text": "{{plumber_details_header}}", + "style": "header" + }, + { + "style": "ws-table", + "table": { + "widths": [ + "103%" + ], + "body": [ + [ + { + "table": { + "widths": [ + "25%", + "25%", + "25%", + "25%" + ], + "body": [ + [ + { + "text": "{{plumber_provided_by}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{plumber_licence_no}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{plumber_name}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{plumber_mobile_no}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + } + ], + [ + { + "text": "{{plumberProvidedBy}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{plumberLicenceNo}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{plumberName}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{plumberMobileNo}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + } + ] + ] + }, + "border": [ + true, + true, + true, + true + ] + } + ] + ] + }, + "layout": {} + }, + { + "text": "{{road_charges_header}}", + "style": "header" + }, + { + "style": "ws-table", + "table": { + "widths": [ + "103%" + ], + "body": [ + [ + { + "table": { + "widths": [ + "25%", + "25%", + "25%", + "25%" + ], + "body": [ + [ + { + "text": "{{road_type}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{area_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + } + ], + [ + { + "text": "{{roadType}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{area}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + } + ] + ] + }, + "border": [ + true, + true, + true, + true + ] + } + ] + ] + }, + "layout": {} + }, + { + "text": "{{activation_details_header}}", + "style": "header" + }, + { + "style": "ws-table", + "table": { + "widths": [ + "103%" + ], + "body": [ + [ + { + "table": { + "widths": [ + "25%", + "25%", + "25%", + "25%" + ], + "body": [ + [ + { + "text": "{{connection_execution_date}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{meter_id}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{meter_installation_date}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{initial_meter_reading}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + } + ], + [ + { + "text": "{{connectionExecutionDate}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{meterId}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{meterInstallationDate}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{initialMeterReading}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + } + ] + ] + }, + "border": [ + true, + true, + true, + true + ] + } + ] + ] + }, + "layout": {} + } + ], + "styles": { + "ws-head": { + "margin": [ + -39, + -38, + -38, + 0 + ] + }, + "receipt-logo-header": { + "color": "#000000", + "fontFamily": "Cambay", + "fontSize": 14, + "bold": true, + "letterSpacing": 0.74, + "margin": [ + 0, + -10, + 0, + 5 + ] + }, + "ws-table": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -25, + 18, + -8, + 10 + ] + }, + "header": { + "color": "#000000", + "textTransform": "uppercase", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + -25, + 15, + 0, + -10 + ] + }, + "ws-sub-table-value": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 3, + 0, + 0, + 10 + ] + }, + "ws-sub-table": { + "color": "#484848", + "bold": true, + "fontSize": 12, + "fontWeight": 400, + "margin": [ + 3, + 8, + 0, + 0 + ] + }, + "qr-image": { + "margin": [ + -40, + -1, + -3, + 0 + ], + "color": "#484848", + "alignment": "right", + "backgroundColor": "#dddddd" + }, + "receipt-table-value-total": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "alignment": "right", + "margin": [ + 0, + 5, + 30, + 0 + ] + } + } + } +} \ No newline at end of file diff --git a/configs/pdf-service/format-config/ws-bill.json b/configs/pdf-service/format-config/ws-bill.json new file mode 100644 index 00000000..037ab46a --- /dev/null +++ b/configs/pdf-service/format-config/ws-bill.json @@ -0,0 +1,1012 @@ +{ + "key": "ws-bill", + "config": { + "defaultStyle": { + "font": "Cambay" + }, + "content": [ + { + "style": "noc-head", + "table": { + "widths": [ + 60, + "*", + 120 + ], + "body": [ + [ + { + "image": "{{logoImage}}", + "width": 50, + "height": 61.25 + }, + { + "stack": [ + { + "text": "{{logo_header}} {{Municipal_Corporation}}", + "style": "receipt-logo-header" + }, + { + "stack": [ + { + "text": "{{address}}" + }, + { + "text": "{{phoneNumber}}" + }, + { + "text": "{{website}}" + }, + { + "text": "{{email}}" + } + ] + } + ], + "alignment": "left", + "margin": [ + 0, + 10, + 0, + 0 + ] + }, + { + "stack": [ + { + "text": "{{total_amount_due}}" + }, + { + "text": "{{Rs}} {{totalAmountDue}}", + "style": "amount-due" + } + ], + "alignment": "right", + "color": "#484848", + "margin": [ + -150, + 2, + -20, + 0 + ] + } + ] + ] + }, + "layout": "noBorders" + }, + { + "style": "noc-table", + "table": { + "widths": [ + 130, + 130, + -2, + 130, + 130 + ], + "body": [ + [ + { + "text": "{{payer_name}}", + "border": [ + true, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerName}}", + "border": [ + false, + true, + true, + false + ], + "style": "receipt-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ] + }, + { + "text": "{{bill_no}}", + "border": [ + true, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{billNo}}", + "border": [ + false, + true, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{mobile_no}}", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{mobileNo}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ] + }, + { + "text": "{{bill_period}}", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{fromPeriod}} - {{toPeriod}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{payer_address}}", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerAddress}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ] + }, + { + "text": "{{bill_issue_date}}", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{billIssueDate}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": " ", + "border": [ + true, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": " ", + "border": [ + false, + false, + true, + true + ], + "style": "receipt-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ] + }, + { + "text": "{{bill_due_date}}", + "border": [ + true, + false, + false, + true + ], + "style": "right-receipt-table" + }, + { + "text": "{{billDueDate}}", + "border": [ + false, + false, + true, + true + ], + "style": "right-receipt-table2" + } + ] + ] + }, + "layout": {} + }, + { + "style": "noc-table2", + "table": { + "widths": [ + "103%" + ], + "body": [ + [ + { + "text": "{{billing_summary_property_tax}} {{serviceType}}", + "border": [ + true, + true, + true, + false + ], + "style": "receipt-table-value" + } + ], + [ + { + "table": { + "widths": [ + "18%", + "26%", + "10%", + "9%", + "10%", + "9%", + "10%", + "9%" + ], + "body": [ + [ + { + "text": "{{consumer_no}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{bill_period}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{arrears_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{charge_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{penalty_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{rebate_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{others_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{total_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + } + ], + [ + { + "text": "{{propertyID}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{fromPeriod}}-{{toPeriod}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{arrears}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{charge}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{penalty}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{rebate}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{others}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{total}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2", + "bold": true + } + ] + ] + }, + "border": [ + true, + false, + true, + true + ] + } + ] + ] + }, + "layout": {} + }, + { + "style": "noc-table3", + "table": { + "widths": [ + "103%" + ], + "body": [ + [ + { + "text": "{{important_message}}", + "border": [ + true, + true, + true, + false + ], + "margin": [ + 9, + 10, + 0, + 5 + ], + "style": "receipt-table-value" + } + ], + [ + { + "ol": [ + { + "text": "{{payment_received}}", + "margin": [ + 8, + 0, + 0, + 3 + ] + }, + { + "text": "{{this_document}}", + "margin": [ + 8, + 0, + 0, + 3 + ] + }, + { + "text": "{{this_is_a}}", + "margin": [ + 8, + 0, + 0, + 3 + ] + }, + { + "text": "{{assessment_payment}}", + "margin": [ + 8, + 0, + 0, + 3 + ] + }, + { + "text": "{{please_deposit}}", + "margin": [ + 8, + 0, + 0, + 3 + ] + }, + { + "text": "{{if_the_tax}}", + "margin": [ + 8, + 0, + 0, + 5 + ] + } + ], + "border": [ + true, + false, + true, + true + ], + "alignment": "left" + } + ] + ] + }, + "layout": {} + }, + { + "canvas": [ + { + "type": "line", + "x1": -40, + "y1": 30, + "x2": 700, + "y2": 30, + "dash": { + "length": 10, + "space": 5 + } + } + ] + }, + { + "image": "{{scissorImage}}", + "width": 24, + "height": 24, + "margin": [ + -30, + -11.2, + 0, + 0 + ] + }, + { + "text": "{{acknowledgement_for}}", + "style": "footer-header", + "pageBreak": "before" + }, + { + "style": "noc-table4", + "table": { + "widths": [ + "*", + "*", + "*", + "*" + ], + "body": [ + [ + { + "text": "{{date_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{billdate}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{consumer_no}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{consumerID}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{bill_no}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{billNo}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{name_address}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{nameAddress}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{total_payment}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{total}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + } + ] + ] + } + }, + { + "text": "{{receivers_signature}}", + "style": "footer-bottom" + } + ], + "styles": { + "noc-head": { + "margin": [ + -25, + -30, + 0, + 1 + ] + }, + "receipt-logo-header": { + "color": "#484848", + "fontFamily": "Roboto", + "fontSize": 14, + "bold": true, + "letterSpacing": 0.74, + "margin": [ + 0, + -10, + 0, + 5 + ] + }, + "receipt-logo-sub-header": { + "color": "#484848", + "fontFamily": "Roboto", + "fontSize": 13, + "letterSpacing": 0.6 + }, + "noc-table": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -25, + 10, + -8, + -8 + ] + }, + "noc-table4": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -25, + 75, + -8, + -8 + ] + }, + "noc-table2": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -25, + 18, + -8, + -8 + ] + }, + "noc-table3": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -25, + 30, + -8, + -8 + ] + }, + "receipt-table-value": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 8, + 5, + 0, + 0 + ] + }, + "receipt-table-value2": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 3, + 5, + 0, + 0 + ] + }, + "receipt-table": { + "color": "#484848", + "bold": true, + "fontSize": 12, + "fontWeight": 400, + "margin": [ + -30, + 5, + 0, + 0 + ] + }, + "receipt-table2": { + "color": "#484848", + "bold": true, + "fontSize": 11, + "fontWeight": 400, + "margin": [ + 3, + 8, + 0, + 10 + ] + }, + "right-receipt-table": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 8, + 5, + 0, + 10 + ] + }, + "right-receipt-table2": { + "color": "#484848", + "bold": true, + "fontSize": 12, + "fontWeight": 400, + "margin": [ + -30, + 5, + 0, + 0 + ] + }, + "receipt-approver": { + "fontSize": 12, + "bold": true, + "margin": [ + -27, + 50, + -10, + 0 + ], + "color": "#484848" + }, + "no-signature": { + "fontSize": 12, + "margin": [ + -27, + 35, + -10, + 0 + ], + "color": "#484848" + }, + "amount-due": { + "fontSize": 30, + "color": "#FC8019", + "bold": true, + "fontWeight": 700 + }, + "pt-disclaimer": { + "fontSize": 12, + "margin": [ + -27, + 30, + -10, + 0 + ], + "color": "#484848" + }, + "pt-disclaimer-value": { + "fontSize": 12, + "margin": [ + 0, + 5, + 0, + 0 + ], + "color": "#484848" + }, + "qr-text": { + "fontSize": 12, + "margin": [ + 40, + 0, + 0, + 0 + ], + "color": "#484848", + "alignment": "left" + }, + "qr-image": { + "margin": [ + -40, + -1, + -3, + 0 + ], + "color": "#484848", + "alignment": "right" + }, + "footer-header": { + "margin": [ + 0, + 15, + 0, + -40 + ], + "bold": true, + "color": "#000000", + "alignment": "center" + }, + "footer-bottom": { + "margin": [ + 0, + 50, + 0, + 0 + ], + "bold": true, + "color": "#000000", + "alignment": "right" + } + } + } +} diff --git a/configs/pdf-service/format-config/ws-consolidatedacknowlegment.json b/configs/pdf-service/format-config/ws-consolidatedacknowlegment.json new file mode 100644 index 00000000..054ffd89 --- /dev/null +++ b/configs/pdf-service/format-config/ws-consolidatedacknowlegment.json @@ -0,0 +1,984 @@ +{ + "key": "ws-consolidatedacknowlegment", + "config": { + "defaultStyle": { + "font": "Cambay" + }, + "content": [ + { + "style": "ws-head", + "table": { + "widths": [ + 60, + "*", + 120 + ], + "body": [ + [ + { + "image": "{{logoImage}}", + "width": 50, + "height": 61.25, + "margin": [ + 12, + 10, + 12, + 10 + ] + }, + { + "stack": [ + { + "text": "{{logo_header}} {{Municipal_Corporation}}", + "style": "receipt-logo-header" + }, + { + "text": "{{logo_sub_header}}" + } + ], + "alignment": "left", + "margin": [ + 10, + 30, + 0, + 0 + ] + }, + { + "stack": [ + { + "table": { + "widths": [ + "*", + "*" + ], + "body": [ + [ + { + "image": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAABkAAAAZAAQMAAAAbwhzkAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAGUExURQAAAP7+/soH9D0AAAYwSURBVHja7dyxcYNAEAVQPA4UugRKoTRcGqW4BIcKNMKBcABzXu8JhIXn/UwSJ/Zt/Oea8Z+kAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAXkiyGdTn77iaHt79nLHa1oQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEJA9IC+ZVvolhHS3b88hpE+130FAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQP4AMmQK7vNpruVme80OppxAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQECOCeluH1PdeBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQkGND4pvaQUBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBADgYJE0OG+TTh0TggICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB7QqqSgpS78TUBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQF5LGRF4h2MjwoICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICMhGkPI0izvTP6Ju/IosLnk/b1/yBwEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEB+RVyz1+mdjDlEu6gW4wKAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKyB6Scc1hp76MdjCGk3I0f5jsAAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQHZBRJ348PhYkhNrb6rWTIICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICMi2kB8yPfTRJFKepnz07fbjdX40tT4QEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEJCtICuSqtWndjDllHotCAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAjIRpDPpj797B+umSOv08PvGcj0sQUBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAdkD8pJppV/mkMXRYT5VuRtf3kFXU8kHAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQF5DGQoltbbImQxzYpMkMVN7SAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAeDnMZEype8p46CgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIA8AeSem9pr0oKAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgOwJSU0zh3ynW7yvOM17ceRurAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICMi2kKr00dFTZgdTrjU7AAEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEB2RhyvICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICArMkXJlylJdANIpEAAAAASUVORK5CYII=", + "width": 70, + "height": 70, + "alignment": "right", + "border": [ + false, + false, + false, + false + ], + "style": "qr-image" + } + ] + ] + } + } + ] + } + ] + ] + }, + "layout": "noBorders" + }, + { + "columns": [ + { + "width": "20%", + "text": "{{consumer_no}}" + }, + { + "width": "50%", + "text": "{{consumerNo}}" + }, + { + "width": "14%", + "text": " " + }, + { + "width": "10%", + "text": "{{status_label}}", + "alignment": "right" + }, + { + "width": "10%", + "text": "{{status}}", + "alignment": "right" + } + ], + "margin": [ + -26, + 10, + 0, + 0 + ] + }, + { + "text": "{{service_details_header}}", + "style": "header" + }, + { + "style": "ws-table", + "table": { + "widths": [ + "103%" + ], + "body": [ + [ + { + "table": { + "widths": [ + "25%", + "25%", + "25%", + "25%" + ], + "body": [ + [ + { + "text": "{{service}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{connection_category}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{connection_type}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{meter_id}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + } + ], + [ + { + "text": "{{water_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{connectionCategory}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{connectionType}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{meterID}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + } + ], + [ + { + "text": "{{pipe_size}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{connection_execution_date}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{rainwater_harvesting_facility}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{water_source}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + } + ], + [ + { + "text": "{{pipeSize}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{connectionExecutionDate}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{rainwaterHarvestingFacility}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{waterSource}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + } + ], + [ + { + "text": "{{water_sub_source}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + } + ], + [ + { + "text": "{{waterSubSource}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + } + ] + ] + }, + "border": [ + true, + true, + true, + true + ] + } + ] + ] + }, + "layout": {} + }, + { + "text": "{{property_details_header}}", + "style": "header" + }, + { + "style": "ws-table-property", + "table": { + "widths": [ + "103%" + ], + "body": [ + [ + { + "table": { + "widths": [ + "25%", + "25%", + "25%", + "25%" + ], + "body": [ + [ + { + "text": "{{property_type}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{property_usage_type}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{plot_size}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + } + ], + [ + { + "text": "{{propertyType}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{propertyUsageType}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{plotSize}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + } + ], + [ + { + "text": "{{property_ID}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{city_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{plot_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{building_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + } + ], + [ + { + "text": "{{propertyID}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{city}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{plot}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{building}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + } + ], + [ + { + "text": "{{street_name}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{locality_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{pincode_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{location_on_map}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + } + ], + [ + { + "text": "{{streetName}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{locality}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{pincode}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{lat}} {{long}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + } + ] + ] + }, + "border": [ + true, + true, + true, + true + ] + } + ] + ] + }, + "layout": {} + }, + { + "text": "{{owner_details_header}}", + "style": "header" + }, + { + "style": "ws-table", + "table": { + "widths": [ + "103%" + ], + "body": [ + [ + { + "table": { + "widths": [ + "25%", + "25%", + "25%", + "25%" + ], + "body": [ + [ + { + "text": "{{owner_mobile_number}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{owner_name}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{gender_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{guardian_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + } + ], + [ + { + "text": "{{ownerMobileNumber}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{ownerName}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{gender}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{guardian}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + } + ], + [ + { + "text": "{{guardian_name}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{owner_category}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{email_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{correspondence_address}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + } + ], + [ + { + "text": "{{guardianName}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{ownerCategory}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{email}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{correspondenceAddress}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + } + ] + ] + }, + "border": [ + true, + true, + true, + true + ] + } + ] + ] + }, + "layout": {} + } + ], + "styles": { + "ws-head": { + "fillColor": "#F2F2F2", + "margin": [ + -39, + -38, + -38, + 0 + ] + }, + "receipt-logo-header": { + "color": "#000000", + "fontFamily": "Cambay", + "fontSize": 14, + "bold": true, + "letterSpacing": 0.74, + "margin": [ + 0, + -10, + 0, + 5 + ] + }, + "ws-table": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -25, + 18, + -8, + 10 + ] + }, + "ws-table-property": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -25, + 18, + -8, + 110 + ] + }, + "header": { + "color": "#000000", + "textTransform": "uppercase", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + -25, + 15, + 0, + -10 + ] + }, + "ws-sub-table-value": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 3, + 0, + 0, + 10 + ] + }, + "ws-sub-table": { + "color": "#484848", + "bold": true, + "fontSize": 12, + "fontWeight": 400, + "margin": [ + 3, + 8, + 0, + 0 + ] + }, + "qr-image": { + "margin": [ + -40, + -1, + -3, + 0 + ], + "color": "#484848", + "alignment": "right", + "backgroundColor": "#dddddd" + } + } + } +} \ No newline at end of file diff --git a/configs/pdf-service/format-config/ws-consolidatedsewerageconnection.json b/configs/pdf-service/format-config/ws-consolidatedsewerageconnection.json new file mode 100644 index 00000000..eb948d08 --- /dev/null +++ b/configs/pdf-service/format-config/ws-consolidatedsewerageconnection.json @@ -0,0 +1,806 @@ +{ + "key": "ws-consolidatedsewerageconnection", + "config": { + "defaultStyle": { + "font": "Cambay" + }, + "content": [ + { + "style": "ws-head", + "table": { + "widths": [ + 60, + "*", + 120 + ], + "body": [ + [ + { + "image": "{{logoImage}}", + "width": 50, + "height": 61.25, + "margin": [ + 12, + 10, + 12, + 10 + ] + }, + { + "stack": [ + { + "text": "{{logo_header}} {{Municipal_Corporation}}", + "style": "receipt-logo-header" + }, + { + "text": "{{logo_sub_header}}" + } + ], + "alignment": "left", + "margin": [ + 10, + 30, + 0, + 0 + ] + }, + { + "stack": [ + { + "table": { + "widths": [ + "*", + "*" + ], + "body": [ + [ + { + "image": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAABkAAAAZAAQMAAAAbwhzkAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAGUExURQAAAP7+/soH9D0AAAYwSURBVHja7dyxcYNAEAVQPA4UugRKoTRcGqW4BIcKNMKBcABzXu8JhIXn/UwSJ/Zt/Oea8Z+kAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAXkiyGdTn77iaHt79nLHa1oQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEJA9IC+ZVvolhHS3b88hpE+130FAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQP4AMmQK7vNpruVme80OppxAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQECOCeluH1PdeBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQkGND4pvaQUBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBADgYJE0OG+TTh0TggICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB7QqqSgpS78TUBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQF5LGRF4h2MjwoICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICMhGkPI0izvTP6Ju/IosLnk/b1/yBwEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEB+RVyz1+mdjDlEu6gW4wKAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKyB6Scc1hp76MdjCGk3I0f5jsAAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQHZBRJ348PhYkhNrb6rWTIICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICMi2kB8yPfTRJFKepnz07fbjdX40tT4QEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEJCtICuSqtWndjDllHotCAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAjIRpDPpj797B+umSOv08PvGcj0sQUBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAdkD8pJppV/mkMXRYT5VuRtf3kFXU8kHAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQF5DGQoltbbImQxzYpMkMVN7SAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAeDnMZEype8p46CgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIA8AeSem9pr0oKAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgOwJSU0zh3ynW7yvOM17ceRurAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICMi2kKr00dFTZgdTrjU7AAEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEB2RhyvICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICArMkXJlylJdANIpEAAAAASUVORK5CYII=", + "width": 70, + "height": 70, + "alignment": "right", + "border": [ + false, + false, + false, + false + ], + "style": "qr-image" + } + ] + ] + } + } + ] + } + ] + ] + }, + "layout": "noBorders" + }, + { + "columns": [ + { + "width": "20%", + "text": "{{consumer_no}}" + }, + { + "width": "50%", + "text": "{{consumerNo}}" + }, + { + "width": "14%", + "text": " " + }, + { + "width": "10%", + "text": "{{status_label}}", + "alignment": "right" + }, + { + "width": "10%", + "text": "{{status}}", + "alignment": "right" + } + ], + "margin": [ + -26, + 10, + 0, + 0 + ] + }, + { + "text": "{{service_details_header}}", + "style": "header" + }, + { + "style": "ws-table", + "table": { + "widths": [ + "103%" + ], + "body": [ + [ + { + "table": { + "widths": [ + "25%", + "25%", + "25%", + "25%" + ], + "body": [ + [ + { + "text": "{{service}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{connection_execution_date}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{unit_of_measurement}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + } + ], + [ + { + "text": "{{sewarage_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{connectionExecutionDate}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{uom}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + } + ] + ] + }, + "border": [ + true, + true, + true, + true + ] + } + ] + ] + }, + "layout": {} + }, + { + "text": "{{property_details_header}}", + "style": "header" + }, + { + "style": "ws-table", + "table": { + "widths": [ + "103%" + ], + "body": [ + [ + { + "table": { + "widths": [ + "25%", + "25%", + "25%", + "25%" + ], + "body": [ + [ + { + "text": "{{property_type}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{property_usage_type}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{plot_size}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + } + ], + [ + { + "text": "{{propertyType}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{propertyUsageType}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{plotSize}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + } + ], + [ + { + "text": "{{property_ID}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{city_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{plot_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{building_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + } + ], + [ + { + "text": "{{propertyID}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{city}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{plot}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{building}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + } + ], + [ + { + "text": "{{street_name}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{locality_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{pincode_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{location_on_map}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + } + ], + [ + { + "text": "{{streetName}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{locality}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{pincode}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{lat}} {{long}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + } + ] + ] + }, + "border": [ + true, + true, + true, + true + ] + } + ] + ] + }, + "layout": {} + }, + { + "text": "{{owner_details_header}}", + "style": "header" + }, + { + "style": "ws-table", + "table": { + "widths": [ + "103%" + ], + "body": [ + [ + { + "table": { + "widths": [ + "25%", + "25%", + "25%", + "25%" + ], + "body": [ + [ + { + "text": "{{owner_mobile_number}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{owner_name}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{gender_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{guardian_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + } + ], + [ + { + "text": "{{ownerMobileNumber}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{ownerName}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{gender}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{guardian}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + } + ], + [ + { + "text": "{{guardian_name}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{owner_category}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{email_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{correspondence_address}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + } + ], + [ + { + "text": "{{guardianName}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{ownerCategory}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{email}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{correspondenceAddress}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + } + ] + ] + }, + "border": [ + true, + true, + true, + true + ] + } + ] + ] + }, + "layout": {} + } + ], + "styles": { + "ws-head": { + "fillColor": "#F2F2F2", + "margin": [ + -39, + -38, + -38, + 0 + ] + }, + "receipt-logo-header": { + "color": "#000000", + "fontFamily": "Cambay", + "fontSize": 14, + "bold": true, + "letterSpacing": 0.74, + "margin": [ + 0, + -10, + 0, + 5 + ] + }, + "ws-table": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -25, + 18, + -8, + 10 + ] + }, + "header": { + "color": "#000000", + "textTransform": "uppercase", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + -25, + 15, + 0, + -10 + ] + }, + "ws-sub-table-value": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 3, + 0, + 0, + 10 + ] + }, + "ws-sub-table": { + "color": "#484848", + "bold": true, + "fontSize": 12, + "fontWeight": 400, + "margin": [ + 3, + 8, + 0, + 0 + ] + }, + "qr-image": { + "margin": [ + -40, + -1, + -3, + 0 + ], + "color": "#484848", + "alignment": "right", + "backgroundColor": "#dddddd" + } + } + } +} \ No newline at end of file diff --git a/configs/pdf-service/format-config/ws-estimationnotice.json b/configs/pdf-service/format-config/ws-estimationnotice.json new file mode 100644 index 00000000..ffb27ad9 --- /dev/null +++ b/configs/pdf-service/format-config/ws-estimationnotice.json @@ -0,0 +1,667 @@ +{ + "key": "ws-estimationnotice", + "config": { + "defaultStyle": { + "font": "Cambay" + }, + "content": [ + { + "style": "ws-head", + "table": { + "widths": [ + 60, + "*", + 120 + ], + "body": [ + [ + { + "image": "{{logoImage}}", + "width": 50, + "height": 61.25, + "margin": [ + 12, + 10, + 12, + 10 + ] + }, + { + "stack": [ + { + "text": "{{tenantName}} - {{UAT}}", + "style": "receipt-logo-header", + "margin": [ + 0, + 0, + 0, + 20 + ] + }, + { + "text": "{{estimation_notice_header}} {{service}} {{connection_header}}", + "style": "receipt-logo-header" + } + ], + "alignment": "center", + "margin": [ + 10, + 30, + 0, + 0 + ] + } + ] + ] + }, + "layout": "noBorders" + }, + { + "style": "ws-table-property", + "table": { + "widths": [ + "103%" + ], + "body": [ + [ + { + "table": { + "widths": [ + "16%", + "34%", + "18%", + "32%" + ], + "body": [ + [ + { + "text": "{{app_no}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": ": {{appNo}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{app_date}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": ": {{appDate}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + } + ], + [ + { + "text": "{{user_name}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": ": {{name}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{guardian_name}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": ": {{guardianName}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + } + ], + [ + { + "text": "{{usage_type}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": ": {{usageType}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{mobile_no}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": ": {{mobileNumber}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + } + ], + [ + { + "text": "{{house_no}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": ": {{houseNo}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + } + ], + [ + { + "text": "{{user_address}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": ": {{address}}, PIN:{{pincode}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + } + ] + ] + }, + "border": [ + false, + false, + false, + false + ] + } + ] + ] + }, + "layout": {} + }, + { + "text": "{{estimation_header}} {{service}} {{connection_header}}", + "style": "receipt-logo-header", + "alignment": "center" + }, + { + "style": "ws-table-property", + "table": { + "widths": [ + "*" + ], + "body": [ + [ + { + "table": { + "widths": [ + "auto", + "*", + "*" + ], + "body": [ + [ + { + "text": "{{sl_no}}", + "alignment": "center" + }, + { + "text": "{{fee_estimate}}", + "alignment": "center" + }, + { + "text": "{{amount}}", + "alignment": "center" + } + ], + [ + { + "text": "1.", + "alignment": "center" + }, + { + "text": "{{form_fee}}" + }, + { + "text": "{{formFee}}", + "alignment": "right" + } + ], + [ + { + "text": "2.", + "alignment": "center" + }, + { + "text": "{{scrutiny_fee}}" + }, + { + "text": "{{ScrutinyFee}}", + "alignment": "right" + } + ], + [ + { + "text": "3.", + "alignment": "center" + }, + { + "text": "{{one_time_fee}}" + }, + { + "text": "{{oneTimeFee}}", + "alignment": "right" + } + ], + [ + { + "text": "4.", + "alignment": "center" + }, + { + "text": "{{other_charge}}" + }, + { + "text": "{{otherCharge}}", + "alignment": "right" + } + ], + [ + { + "text": "5.", + "alignment": "center" + }, + { + "text": "{{road_charge}}" + }, + { + "text": "{{roadCharge}}", + "alignment": "right" + } + ], + [ + { + "text": "6.", + "alignment": "center" + }, + { + "text": "{{security_charge}}" + }, + { + "text": "{{securityCharge}}", + "alignment": "right" + } + ], + [ + { + "text": "7.", + "alignment": "center" + }, + { + "text": "{{tax_cess}}" + }, + { + "text": "{{taxCess}}", + "alignment": "right" + } + ], + [ + { + "text": "8.", + "alignment": "center" + }, + { + "text": "{{penalty}}" + }, + { + "text": "{{penaltyAmount}}", + "alignment": "right" + } + ], + [ + { + "text": "9.", + "alignment": "center" + }, + { + "text": "{{rebate}}" + }, + { + "text": "{{rebateAmount}}", + "alignment": "right" + } + ], + [ + { + "text": "(+)", + "alignment": "center" + }, + { + "text": "{{comments}}" + }, + { + "text": "{{penaltyComments}}", + "alignment": "right" + } + ], + [ + { + "text": " " + }, + { + "text": "{{grand_total}}" + }, + { + "text": "{{totalAmount}}", + "alignment": "right" + } + ] + ] + }, + "border": [ + false, + false, + false, + false + ] + } + ] + ] + }, + "layout": {} + }, + { + "text": "{{approved_by}}", + "alignment": "center" + } + ], + "styles": { + "ws-head": { + "margin": [ + -39, + -38, + -38, + 0 + ] + }, + "receipt-logo-header": { + "color": "#000000", + "fontFamily": "Cambay", + "fontSize": 14, + "bold": true, + "letterSpacing": 0.74, + "margin": [ + 0, + -10, + 0, + 5 + ] + }, + "ws-table": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -25, + 18, + -8, + 10 + ] + }, + "ws-table-property": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -25, + 18, + -8, + 50 + ] + }, + "header": { + "color": "#000000", + "textTransform": "uppercase", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + -25, + 15, + 0, + -10 + ] + }, + "ws-sub-table-value": { + "color": "#000000", + "fontSize": 12, + "fontWeight": 500 + }, + "ws-sub-table": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 400, + "margin": [ + 3, + 8, + 0, + 0 + ] + }, + "qr-image": { + "margin": [ + -40, + -1, + -3, + 0 + ], + "color": "#484848", + "alignment": "right", + "backgroundColor": "#dddddd" + }, + "receipt-table-value": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 5, + 5, + 0, + 0 + ] + }, + "receipt-table-value-total": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "alignment": "right", + "margin": [ + 0, + 5, + 30, + 0 + ] + }, + "receipt-table-value-down": { + "color": "#000000", + "bold": false, + "fontSize": 12, + "fontWeight": 400, + "alignment": "left", + "margin": [ + 3, + 5, + 0, + 5 + ] + }, + "receipt-table-value2": { + "color": "#000000", + "bold": false, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 3, + 0, + 0, + 0 + ] + }, + "receipt-table-value-cont": { + "color": "#000000", + "bold": false, + "fontSize": 11, + "fontWeight": 400, + "margin": [ + 3, + 0, + 0, + 0 + ] + }, + "receipt-table": { + "color": "#484848", + "bold": true, + "fontSize": 12, + "fontWeight": 400, + "margin": [ + -30, + 5, + 0, + 0 + ] + }, + "receipt-table2": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 3, + 0, + 0, + 0 + ] + } + } + } +} \ No newline at end of file diff --git a/configs/pdf-service/format-config/ws-onetime-receipt.json b/configs/pdf-service/format-config/ws-onetime-receipt.json new file mode 100644 index 00000000..dad6d4c8 --- /dev/null +++ b/configs/pdf-service/format-config/ws-onetime-receipt.json @@ -0,0 +1,572 @@ +{ + "key": "ws-onetime-receipt", + "config": { + "defaultStyle": { + "font": "Cambay" + }, + "content": [ + { + "style": "noc-head", + "table": { + "widths": [ + 60, + "*", + 120 + ], + "body": [ + [ + { + "image": "{{logoImage}}", + "width": 50, + "height": 61.25 + }, + { + "stack": [ + { + "text": "{{logo-header}} {{Municipal_Corporation}}", + "style": "receipt-logo-header" + }, + { + "text": "{{serviceType}} {{payment_receipt}}", + "style": "receipt-logo-sub-header" + } + ], + "alignment": "left", + "margin": [ + 0, + 10, + 0, + 0 + ] + }, + { + "stack": [ + { + "text": "{{address}}" + }, + { + "text": "{{phoneNumber}}" + }, + { + "text": "{{website}}" + }, + { + "text": "{{email}}" + } + ], + "alignment": "right", + "color": "#484848", + "margin": [ + -100, + 0, + -25, + 0 + ] + } + ] + ] + }, + "layout": "noBorders" + }, + { + "style": "noc-table", + "table": { + "widths": [ + "25%", + "25%", + "25%", + "25%" + ], + "body": [ + [ + { + "text": "{{receipt_no}}.", + "border": [ + true, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{receiptNo}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table", + "font": "Roboto" + }, + { + "text": "{{consumer_id}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{consumerID}}", + "border": [ + false, + true, + true, + false + ], + "style": "receipt-table", + "font": "Roboto" + } + ], + [ + { + "text": "{{payment_date}}", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{paymentDate}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{payer_name}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerName}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{payer_contact}}", + "border": [ + true, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerContact}}", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": " ", + "border": [ + false, + false, + true, + true + ], + "style": "receipt-table" + } + ] + ] + }, + "layout": {} + }, + { + "style": "next-noc-table", + "table": { + "widths": [ + "25%", + "25%", + "25%", + "25%" + ], + "body": [ + [ + { + "text": "{{service_type}}", + "border": [ + true, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{serviceType}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{billing_period}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{fromPeriod}} {{to}} {{toPeriod}}", + "border": [ + false, + true, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{paid_amount}}", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "₹ {{paidAmount}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{pending_amount}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "₹ {{pendingAmount}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{payment_mode}}", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{paymentMode}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{transaction_id}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{transactionID}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table", + "font": "Roboto" + } + ], + [ + { + "text": "{{g8_receipt_no}}.", + "border": [ + true, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{G8ReceiptNo}}", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table" + }, + { + "text": "{{g8_receipt_date}}", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{G8ReceiptDate}}", + "border": [ + false, + false, + true, + true + ], + "style": "receipt-table" + } + ] + ] + }, + "layout": {} + }, + { + "style": "receipt-approver", + "columns": [ + { + "text": [ + { + "text": "{{generated_by}}: ", + "bold": true + }, + { + "text": "{{user-name}}", + "bold": false + } + ], + "alignment": "left" + }, + { + "text": [ + { + "text": "{{commissioner/eo}}", + "bold": true + } + ], + "alignment": "right", + "margin": [ + 0, + 0, + -10, + 1 + ] + } + ] + }, + { + "style": "no-signature", + "text": "{{no_signature}}" + }, + { + "style": "pt-disclaimer", + "stack": [ + { + "text": "{{disclamer}}", + "bold": true, + "style": "pt-disclaimer-value" + }, + { + "text": "{{disclamer_1}}", + "bold": false, + "style": "pt-disclaimer-value" + }, + { + "text": "{{disclamer_2}}", + "bold": false, + "style": "pt-disclaimer-value" + }, + { + "text": "{{disclamer_3}}", + "bold": false, + "style": "pt-disclaimer-value" + } + ] + } + ], + "styles": { + "noc-head": { + "margin": [ + -30, + -30, + 0, + 1 + ] + }, + "receipt-logo-header": { + "color": "#000000", + "fontSize": 14, + "bold": true, + "letterSpacing": 0.74, + "margin": [ + 0, + 0, + 0, + 5 + ] + }, + "receipt-logo-sub-header": { + "color": "#000000", + "fontSize": 12, + "letterSpacing": 0.6 + }, + "noc-table": { + "fontSize": 12, + "color": "#000000", + "margin": [ + -25, + 45, + -22, + -8 + ] + }, + "next-noc-table": { + "fontSize": 12, + "color": "#000000", + "margin": [ + -25, + 28, + -22, + -8 + ] + }, + "receipt-table-value": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 8, + 8, + 0, + 8 + ] + }, + "receipt-table": { + "color": "#000000", + "bold": false, + "fontSize": 12, + "fontWeight": 400, + "margin": [ + -30, + 8, + 0, + 8 + ] + }, + "receipt-approver": { + "fontSize": 12, + "bold": true, + "margin": [ + -27, + 50, + -10, + 0 + ], + "color": "#484848" + }, + "no-signature": { + "fontSize": 12, + "margin": [ + -27, + 35, + -10, + 0 + ], + "color": "#484848" + }, + "pt-disclaimer": { + "fontSize": 12, + "margin": [ + -27, + 30, + -10, + 0 + ], + "color": "#484848" + }, + "pt-disclaimer-value": { + "fontSize": 12, + "margin": [ + 2, + 5, + 0, + 0 + ], + "color": "#484848" + } + } + } +} diff --git a/configs/pdf-service/format-config/ws-sanctionletter-old.json b/configs/pdf-service/format-config/ws-sanctionletter-old.json new file mode 100644 index 00000000..fcb0b474 --- /dev/null +++ b/configs/pdf-service/format-config/ws-sanctionletter-old.json @@ -0,0 +1,1034 @@ +{ + "key": "ws-sanctionletter-old", + "config": { + "defaultStyle": { + "font": "Cambay" + }, + "content": [ + { + "style": "ws-table", + "table": { + "widths": [ + "103%" + ], + "body": [ + [ + { + "table": { + "widths": [ + "100%" + ], + "body": [ + [ + { + "text": "{{UAT}} {{cityName}} {{Municipal_Corporation}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-table-header" + } + ], + [ + { + "text": "{{cityName}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-table-header" + } + ], + [ + { + "text": "{{presented_by}} : {{presentByName}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-table-header" + } + ], + [ + { + "text": "{{commissioner_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-table-header" + } + ], + [ + { + "text": "{{usageType}}", + "border": [ + false, + false, + false, + false + ] + } + ], + [ + { + "border": [ + false, + false, + false, + false + ], + "columns": [ + { + "width": "auto", + "text": "{{app_no}}", + "style": "ws-sub-header" + }, + { + "width": "2%", + "text": ":", + "style": "ws-sub-header" + }, + { + "width": "auto", + "text": "{{applicationNumber}}", + "style": "ws-sub-data" + }, + { + "width": "auto", + "text": "{{date_label}}", + "style": "ws-sub-header", + "alignment": "right" + }, + { + "width": "*", + "text": "{{connectionExecutionDate}}", + "alignment": "right", + "style": "ws-sub-data" + } + ], + "margin": [ + 25, + 10, + 0, + 0 + ] + } + ], + [ + { + "border": [ + false, + false, + false, + false + ], + "columns": [ + { + "width": "20%", + "text": "{{sub_label}}", + "style": "receipt-value-down" + }, + { + "width": "80%", + "text": "{{applicationType}} {{sub_data1}} {{applicationType}} {{sub_data2}} {{doorNo}} {{locality_label}} {{locality}} {{order_issued}} ", + "style": "receipt-value-down" + } + ], + "margin": [ + 50, + 10, + 0, + 0 + ] + } + ], + [ + { + "border": [ + false, + false, + false, + false + ], + "columns": [ + { + "width": "20%", + "text": "{{ref_label}}", + "style": "receipt-value-down" + }, + { + "width": "80%", + "ol": [ + { + "text": "{{ref_message1}} {{ownerName}} {{doorNo}} {{locality_label}} {{locality}} {{dated_label}} {{date}}", + "style": "receipt-value-down" + }, + { + "text": "{{ref_message2}}", + "style": "receipt-value-down" + } + ] + } + ], + "margin": [ + 50, + 10, + 0, + 0 + ] + } + ], + [ + { + "border": [ + false, + false, + false, + false + ], + "columns": [ + { + "width": "100%", + "text": "{{order_label}}", + "style": "ws-sub-header" + } + ], + "margin": [ + 25, + 10, + 0, + 0 + ] + } + ], + [ + { + "border": [ + false, + false, + false, + false + ], + "columns": [ + { + "width": "100%", + "text": "{{in_ref_label}} {{ownerName}} {{order_meassage1}} {{applicationType}} {{order_meassage2}} {{doorNo}} {{locality}} {{order_meassage3}}", + "style": "receipt-value-down" + } + ], + "margin": [ + 50, + 10, + 0, + 0 + ] + } + ], + [ + { + "stack": [ + { + "table": { + "widths": [ + "3%", + "50%", + "3%", + "auto", + "auto" + ], + "body": [ + [ + { + "text": "1.", + "alignment": "center", + "border": [ + false + ] + }, + { + "text": "{{form_fee}}", + "layout": "noBorders", + "border": [ + false + ] + }, + { + "text": ":", + "alignment": "center", + "border": [ + false + ] + }, + { + "text": "{{Rs}}", + "alignment": "center", + "border": [ + false + ] + }, + { + "text": "{{formFee}}", + "alignment": "right", + "border": [ + false + ] + } + ], + [ + { + "text": "2.", + "alignment": "center", + "border": [ + false + ] + }, + { + "text": "{{scrutiny_fee}}", + "border": [ + false + ] + }, + { + "text": ":", + "alignment": "center", + "border": [ + false + ] + }, + { + "text": "{{Rs}}", + "alignment": "center", + "border": [ + false + ] + }, + { + "text": "{{ScrutinyFee}}", + "alignment": "right", + "border": [ + false + ] + } + ], + [ + { + "text": "3.", + "alignment": "center", + "border": [ + false + ] + }, + { + "text": "{{one_time_fee}}", + "border": [ + false + ] + }, + { + "text": ":", + "alignment": "center", + "border": [ + false + ] + }, + { + "text": "{{Rs}}", + "alignment": "center", + "border": [ + false + ] + }, + { + "text": "{{oneTimeFee}}", + "alignment": "right", + "border": [ + false + ] + } + ], + [ + { + "text": "4.", + "alignment": "center", + "border": [ + false + ] + }, + { + "text": "{{other_charge}}", + "border": [ + false + ] + }, + { + "text": ":", + "alignment": "center", + "border": [ + false + ] + }, + { + "text": "{{Rs}}", + "alignment": "center", + "border": [ + false + ] + }, + { + "text": "{{otherCharge}}", + "alignment": "right", + "border": [ + false + ] + } + ], + [ + { + "text": "5.", + "alignment": "center", + "border": [ + false + ] + }, + { + "text": "{{road_charge}}", + "border": [ + false + ] + }, + { + "text": ":", + "alignment": "center", + "border": [ + false + ] + }, + { + "text": "{{Rs}}", + "alignment": "center", + "border": [ + false + ] + }, + { + "text": "{{roadCharge}}", + "alignment": "right", + "border": [ + false + ] + } + ], + [ + { + "text": "6.", + "alignment": "center", + "border": [ + false + ] + }, + { + "text": "{{security_charge}}", + "border": [ + false + ] + }, + { + "text": ":", + "alignment": "center", + "border": [ + false + ] + }, + { + "text": "{{Rs}}", + "alignment": "center", + "border": [ + false + ] + }, + { + "text": "{{securityCharge}}", + "alignment": "right", + "border": [ + false + ] + } + ], + [ + { + "text": "7.", + "alignment": "center", + "border": [ + false + ] + }, + { + "text": "{{tax_cess}}", + "border": [ + false + ] + }, + { + "text": ":", + "alignment": "center", + "border": [ + false + ] + }, + { + "text": "{{Rs}}", + "alignment": "center", + "border": [ + false + ] + }, + { + "text": "{{taxCess}}", + "alignment": "right", + "border": [ + false + ] + } + ], + [ + { + "text": "8.", + "alignment": "center", + "border": [ + false + ] + }, + { + "text": "{{penalty}}", + "border": [ + false + ] + }, + { + "text": ":", + "alignment": "center", + "border": [ + false + ] + }, + { + "text": "{{Rs}}", + "alignment": "center", + "border": [ + false + ] + }, + { + "text": "{{penaltyAmount}}", + "alignment": "right", + "border": [ + false + ] + } + ], + [ + { + "text": "9.", + "alignment": "center", + "border": [ + false + ] + }, + { + "text": "{{rebate}}", + "border": [ + false + ] + }, + { + "text": ":", + "alignment": "center", + "border": [ + false + ] + }, + { + "text": "{{Rs}}", + "alignment": "center", + "border": [ + false + ] + }, + { + "text": "{{rebateAmount}}", + "alignment": "right", + "border": [ + false + ] + } + ], + [ + { + "text": " ", + "border": [ + false + ] + }, + { + "text": "{{total}}", + "alignment": "center", + "border": [ + false + ] + }, + { + "text": ":", + "alignment": "center", + "border": [ + false + ] + }, + { + "text": "{{Rs}}", + "alignment": "center", + "border": [ + false + ] + }, + { + "text": "{{totalAmount}}", + "alignment": "right", + "border": [ + false + ] + } + ] + ] + } + } + ], + "border": [ + false, + false, + false, + false + ], + "margin": [ + 50, + 5, + 0, + 0 + ] + } + ], + [ + { + "border": [ + false, + false, + false, + false + ], + "columns": [ + { + "width": "100%", + "text": "{{order_data2}} {{service}} {{order_data3}} {{app_no}}:{{applicationNumber}}", + "style": "receipt-value-down" + } + ], + "margin": [ + 30, + 10, + 0, + 0 + ] + } + ], + [ + { + "stack": [ + { + "text": "{{for_commissioner_label}}", + "style": "receipt-table-value-total", + "fontSize": 12 + }, + { + "text": "{{UAT}} {{cityName}} {{Municipal_Corporation}}", + "style": "receipt-table-value-total", + "fontSize": 12 + } + ], + "border": [ + false, + false, + false, + false + ], + "margin": [ + 40, + 80, + 0, + 0 + ] + } + ], + [ + { + "stack": [ + { + "table": { + "widths": [ + "10%", + "40%" + ], + "body": [ + [ + { + "text": "{{to_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-value-down" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-value-down" + } + ], + [ + { + "text": "{{sri_smt_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-value-down" + }, + { + "text": "{{ownerName}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-value-down" + } + ], + [ + { + "text": "{{door_no_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-value-down" + }, + { + "text": "{{doorNo}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-value-down" + } + ] + ] + } + }, + [ + { + "border": [ + false, + false, + false, + false + ], + "columns": [ + { + "width": "auto", + "text": "{{app_no}}", + "style": "ws-consumer-sub-header" + }, + { + "width": "2%", + "text": ":" + }, + { + "width": "auto", + "text": "{{applicationNumber}}", + "style": "ws-consumer-sub-header" + } + ], + "margin": [ + 0, + 10, + 0, + 0 + ] + } + ] + ], + "border": [ + false, + false, + false, + false + ], + "margin": [ + 50, + 5, + 0, + 0 + ] + } + ], + [ + { + "stack": [ + { + "text": "{{copy_message1}} {{service}} {{copy_message-sub1}}", + "style": "receipt-value-down" + } + ], + "border": [ + false, + false, + false, + false + ], + "margin": [ + 50, + 30, + 30, + 10 + ] + } + ], + [ + { + "stack": [ + { + "text": "{{copy_message2}}", + "style": "receipt-value-down" + } + ], + "border": [ + false, + false, + false, + false + ], + "margin": [ + 50, + 10, + 30, + 10 + ] + } + ] + ] + }, + "border": [ + true, + true, + true, + true + ] + } + ] + ] + }, + "layout": {} + } + ], + "styles": { + "ws-head": { + "fillColor": "#F2F2F2", + "margin": [ + -39, + -38, + -38, + 0 + ] + }, + "ws-table": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -25, + 18, + -8, + 10 + ] + }, + "ws-table-property": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -25, + 18, + -8, + 110 + ] + }, + "ws-sub-table-value": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 3, + 0, + 0, + 10 + ] + }, + "ws-sub-table": { + "color": "#484848", + "bold": true, + "fontSize": 12, + "fontWeight": 400 + }, + "ws-table-header": { + "color": "#000000", + "bold": true, + "fontSize": 18, + "fontWeight": 500, + "alignment": "center", + "margin": [ + 3, + 0, + 0, + 0 + ] + }, + "ws-inner-table": { + "color": "#000000", + "alignment": "center", + "margin": [ + 10, + 10, + 10, + 10 + ] + }, + "ws-sub-header": { + "color": "#000000", + "bold": true, + "fontSize": 14, + "fontWeight": 500, + "margin": [ + 10, + 10, + 10, + 10 + ] + }, + "ws-sub-data": { + "color": "#000000", + "fontSize": 14, + "fontWeight": 400, + "margin": [ + 10, + 10, + 10, + 10 + ] + }, + "ws-ul-header": { + "color": "#000000", + "fontSize": 16, + "fontWeight": 500 + }, + "ws-consumer-sub-header": { + "color": "#000000", + "fontSize": 12, + "fontWeight": 500 + }, + "receipt-value-down": { + "color": "#000000", + "bold": false, + "fontSize": 12, + "fontWeight": 400, + "alignment": "left", + "margin": [ + 3, + 0, + 0, + 5 + ] + }, + "ws-sign": { + "color": "#000000", + "fontSize": 14, + "fontWeight": 400, + "bold": true, + "alignment": "right", + "margin": [ + 0, + 5, + 30, + 0 + ] + }, + "receipt-table-value": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 5, + 5, + 0, + 0 + ] + }, + "receipt-table-value-total": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "alignment": "right", + "margin": [ + 0, + 5, + 30, + 0 + ] + }, + "receipt-table-value-down": { + "color": "#000000", + "bold": false, + "fontSize": 12, + "fontWeight": 400, + "alignment": "left", + "margin": [ + 3, + 5, + 0, + 5 + ] + } + } + } +} diff --git a/configs/pdf-service/format-config/ws-sanctionletter.json b/configs/pdf-service/format-config/ws-sanctionletter.json new file mode 100644 index 00000000..c6118b8a --- /dev/null +++ b/configs/pdf-service/format-config/ws-sanctionletter.json @@ -0,0 +1,636 @@ +{ + "key": "ws-sanctionletter", + "config": { + "defaultStyle": { + "font": "Cambay" + }, + "content": [ + { + "style": "ws-head", + "table": { + "widths": [ + 60, + "*", + 120 + ], + "body": [ + [ + { + "image": "{{logoImage}}", + "width": 60, + "height": 61.25, + "margin": [ + 50, + 30, + 12, + 10 + ] + }, + { + "stack": [ + { + "text": "{{municipalCouncil}}", + "style": "receipt-logo-header", + "margin": [ + 0, + 0, + 0, + 10 + ] + }, + { + "text": "{{tenantName}}", + "style": "receipt-logo-header" + }, + { + "text": "{{sanctionLetter}}", + "style": "receipt-logo-header" + } + ], + "alignment": "center", + "margin": [ + 90, + 30, + 0, + 0 + ] + } + ] + ] + }, + "layout": "noBorders" + }, + { + "style": "ws-table-property", + "table": { + "widths": [ + "103%" + ], + "body": [ + [ + { + "border": [ + false, + false, + false, + false + ], + "columns": [ + { + "width": "auto", + "text": "{{date_label}}", + "style": "ws-sub-header", + "alignment": "right" + }, + { + "width": "auto", + "text": "{{connectionExecutionDate}}", + "alignment": "right", + "style": "ws-sub-data" + } + ] + } + ], + [ + { + "border": [ + false, + false, + false, + false + ], + "columns": [ + { + "width": "20%", + "text": "{{sub_label}}", + "style": "receipt-value-down-sub" + }, + { + "width": "80%", + "text": "{{applicationType}} {{sub_data1}} {{applicationType}} {{sub_data2}} {{doorNo}} {{locality_label}} {{locality}} {{order_issued}} ", + "style": "receipt-value-down" + } + ], + "margin": [ + 50, + 10, + 0, + 0 + ] + } + ], + [ + { + "border": [ + false, + false, + false, + false + ], + "columns": [ + { + "width": "20%", + "text": "{{ref_label}}", + "style": "receipt-value-down-sub" + }, + { + "width": "80%", + "ol": [ + { + "text": "{{ref_message1}} {{ownerName}} {{doorNo}} {{locality_label}} {{locality}} {{dated_label}} {{date}}", + "style": "receipt-value-down" + }, + { + "text": "{{ref_message2}}{{applicationNumber}} {{dated_label}} {{date}}", + "style": "receipt-value-down" + } + ] + } + ], + "margin": [ + 50, + 10, + 0, + 0 + ] + } + ], + [ + { + "border": [ + false, + false, + false, + false + ], + "columns": [ + { + "width": "100%", + "text": "{{order_label}}", + "style": "receipt-value-down-sub" + } + ], + "margin": [ + 25, + 10, + 0, + 0 + ] + } + ], + [ + { + "border": [ + false, + false, + false, + false + ], + "columns": [ + { + "width": "100%", + "text": "{{in_ref_label}} {{applicationNumber}} {{dated}} {{date}} {{order_meassage2}} {{applicationType}} {{order_meassage3}} {{doorNo}} {{locality_label}} {{locality}}{{order_meassage4}} {{totalAmount}} {{order_meassage5}} {{applicationType}} {{order_meassage6}} {{totalAmount}} {{dated}} {{date}} {{order_meassage7}}", + "style": "receipt-value-down" + } + ], + "margin": [ + 50, + 10, + 0, + 0 + ] + } + ], + [ + { + "border": [ + false, + false, + false, + false + ], + "columns": [ + { + "width": "100%", + "text": "{{order_meassage8}} {{applicationType}} {{order_meassage9}} {{applicationNumber}} {{order_meassage12}} {{plumberName}}{{order_meassage13}} {{licenceNo}}{{order_meassage14}} {{contactNo}}{{order_meassage10}} {{date}}{{order_meassage11}}", + "style": "receipt-value-down" + } + ], + "margin": [ + 50, + 10, + 0, + 0 + ] + } + ], + [ + { + "stack": [ + { + "text": "{{for_commissioner_label}}", + "style": "receipt-table-value-total", + "fontSize": 12 + } + ], + "border": [ + false, + false, + false, + false + ], + "margin": [ + 40, + 60, + 0, + 0 + ] + } + ], + [ + { + "stack": [ + { + "table": { + "widths": [ + "10%", + "40%" + ], + "body": [ + [ + { + "text": "{{to_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-value-down-sub" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-value-down-sub" + } + ], + [ + { + "text": "{{sri_smt_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-value-down-sub" + }, + { + "text": "{{ownerName}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-value-down-sub" + } + ], + [ + { + "text": "{{door_no_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-value-down-sub" + }, + { + "text": "{{doorNo}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-value-down-sub" + } + ] + ] + } + }, + [ + { + "border": [ + false, + false, + false, + false + ], + "columns": [ + { + "width": "auto", + "text": "{{app_no}}", + "style": "receipt-value-down-sub" + }, + { + "width": "2%", + "text": ":" + }, + { + "width": "auto", + "text": "{{applicationNumber}}", + "style": "receipt-value-down-sub" + } + ], + "margin": [ + 0, + 10, + 0, + 0 + ] + } + ] + ], + "border": [ + false, + false, + false, + false + ], + "margin": [ + 20, + 5, + 0, + 0 + ] + } + ] + ] + }, + "layout": {} + }, + { + "text": "{{approved_by}}", + "alignment": "center", + "style": "receipt-down-footer" + } + ], + "styles": { + "ws-head": { + "margin": [ + -39, + -38, + -38, + 0 + ] + }, + "receipt-down-footer": { + "color": "#FF0000", + "fontFamily": "Cambay", + "fontSize": 14, + "bold": true, + "letterSpacing": 0.74, + "margin": [ + 0, + -10, + 0, + 5 + ] + }, + "ws-consumer-sub-header": { + "color": "#000000", + "fontSize": 12, + "fontWeight": 500 + }, + "receipt-value-down": { + "color": "#000000", + "bold": false, + "fontSize": 10, + "fontWeight": 400, + "alignment": "left", + "margin": [ + -8, + 0, + 0, + 5 + ] + }, + "receipt-value-down-sub": { + "color": "#000000", + "bold": true, + "fontSize": 10, + "fontWeight": 400, + "alignment": "left", + "margin": [ + 10, + 0, + 0, + 1 + ] + }, + "ws-sub-header": { + "color": "#000000", + "bold": true, + "fontSize": 10, + "fontWeight": 500, + "margin": [ + 360, + 10, + 10, + 10 + ] + }, + "ws-order-header": { + "color": "#000000", + "bold": true, + "fontSize": 10, + "fontWeight": 500, + "margin": [ + 10, + 10, + 10, + 10 + ] + }, + "receipt-logo-header": { + "color": "#000000", + "fontFamily": "Cambay", + "fontSize": 14, + "bold": true, + "letterSpacing": 0.74, + "margin": [ + 10, + -8, + 20, + 10 + ] + }, + "ws-table": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -25, + 18, + -8, + 10 + ] + }, + "ws-table-property": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -25, + 18, + -8, + 50 + ] + }, + "header": { + "color": "#000000", + "textTransform": "uppercase", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + -25, + 15, + 0, + -10 + ] + }, + "ws-sub-table-value": { + "color": "#000000", + "fontSize": 12, + "fontWeight": 500 + }, + "ws-sub-table": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 400, + "margin": [ + 3, + 8, + 0, + 0 + ] + }, + "ws-sub-data": { + "color": "#000000", + "fontSize": 10, + "fontWeight": 400, + "margin": [ + -5, + 10, + 10, + 10 + ] + }, + "qr-image": { + "margin": [ + -40, + -1, + -3, + 0 + ], + "color": "#484848", + "alignment": "right", + "backgroundColor": "#dddddd" + }, + "receipt-table-value": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 5, + 5, + 0, + 0 + ] + }, + "receipt-table-value-total": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "alignment": "right", + "margin": [ + 0, + 5, + 30, + 0 + ] + }, + "receipt-table-value-down": { + "color": "#000000", + "bold": false, + "fontSize": 12, + "fontWeight": 400, + "alignment": "left", + "margin": [ + 3, + 5, + 0, + 5 + ] + }, + "receipt-table-value2": { + "color": "#000000", + "bold": false, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 3, + 0, + 0, + 0 + ] + }, + "receipt-table-value-cont": { + "color": "#000000", + "bold": false, + "fontSize": 11, + "fontWeight": 400, + "margin": [ + 3, + 0, + 0, + 0 + ] + }, + "receipt-table": { + "color": "#484848", + "bold": true, + "fontSize": 12, + "fontWeight": 400, + "margin": [ + -30, + 5, + 0, + 0 + ] + }, + "receipt-table2": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 3, + 0, + 0, + 0 + ] + } + } + } +} From d25e2b6cf96eef613290015e8759e7d31de7ef7d Mon Sep 17 00:00:00 2001 From: narendrabandhamneni-wt-egov Date: Fri, 8 May 2020 18:17:39 +0530 Subject: [PATCH 0006/1242] Added firenoc changes --- configs/egov-persister/bpa-persister.yml | 691 -------------- .../firenoc-calculator-persister.yml | 92 ++ configs/egov-persister/firenoc_persiter.yaml | 79 +- .../tradelicense-persister-bpachanges.yml | 843 ------------------ 4 files changed, 159 insertions(+), 1546 deletions(-) delete mode 100644 configs/egov-persister/bpa-persister.yml create mode 100644 configs/egov-persister/firenoc-calculator-persister.yml delete mode 100644 configs/egov-persister/tradelicense-persister-bpachanges.yml diff --git a/configs/egov-persister/bpa-persister.yml b/configs/egov-persister/bpa-persister.yml deleted file mode 100644 index b5ee4a5c..00000000 --- a/configs/egov-persister/bpa-persister.yml +++ /dev/null @@ -1,691 +0,0 @@ -serviceMaps: - serviceName: bpa-services - mappings: - - version: 1.0 - description: Persists buildingplan details in EG_BPA_BuildingPlan table - fromTopic: save-bpa-buildingplan - isTransaction: true - queryMaps: - - - query: INSERT INTO eg_bpa_buildingplan(id, applicationno,permitorderno,remarks, edcrnumber, tenantid, holdingNo, registrationDetails, govtOrQuasi, applicationtype, action, servicetype, occupancytype, suboccupancytype, usages, risktype, status, ownershipcategory, tradetype, additionaldetails, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - basePath: BPA - jsonMaps: - - jsonPath: $.BPA.id - - - jsonPath: $.BPA.applicationNo - - - jsonPath: $.BPA.permitOrderNo - - - jsonPath: $.BPA.remarks - - - jsonPath: $.BPA.edcrNumber - - - jsonPath: $.BPA.tenantId - - - jsonPath: $.BPA.holdingNo - - - jsonPath: $.BPA.registrationDetails - - - jsonPath: $.BPA.govtOrQuasi - - - jsonPath: $.BPA.applicationType - - - jsonPath: $.BPA.action - - - jsonPath: $.BPA.serviceType - - - jsonPath: $.BPA.occupancyType - - - jsonPath: $.BPA.subOccupancyType - - - jsonPath: $.BPA.usages - - - jsonPath: $.BPA.riskType - - - jsonPath: $.BPA.status - - - jsonPath: $.BPA.ownershipCategory - - - jsonPath: $.BPA.tradeType - - - jsonPath: $.BPA.additionalDetails - type: JSON - dbType: JSONB - - - jsonPath: $.BPA.auditDetails.createdBy - - - jsonPath: $.BPA.auditDetails.lastModifiedBy - - - jsonPath: $.BPA.auditDetails.createdTime - - - jsonPath: $.BPA.auditDetails.lastModifiedTime - - - query: INSERT INTO eg_bpa_document( id, documenttype, filestoreId, buildingplanid, documentuid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?); - basePath: BPA.documents.* - jsonMaps: - - jsonPath: $.BPA.documents.*.id - - - jsonPath: $.BPA.documents.*.documentType - - - jsonPath: $.BPA.documents.*.fileStoreId - - - jsonPath: $.BPA.id - - - jsonPath: $.BPA.documents.*.documentuid - - - jsonPath: $.BPA.auditDetails.createdBy - - - jsonPath: $.BPA.auditDetails.lastModifiedBy - - - jsonPath: $.BPA.auditDetails.createdTime - - - jsonPath: $.BPA.auditDetails.lastModifiedTime - - - - query: INSERT INTO eg_bpa_address( id, tenantid, doorno, plotno, district, street, region, state, country, pincode, additiondetails, buildingname, locality, landmark, city, buildingplanid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - basePath: BPA.address - jsonMaps: - - jsonPath: $.BPA.address.id - - - jsonPath: $.BPA.address.tenantId - - - jsonPath: $.BPA.address.doorNo - - - jsonPath: $.BPA.address.plotNo - - - jsonPath: $.BPA.address.district - - - jsonPath: $.BPA.address.street - - - jsonPath: $.BPA.address.region - - - jsonPath: $.BPA.address.state - - - jsonPath: $.BPA.address.country - - - jsonPath: $.BPA.address.pincode - - - jsonPath: $.BPA.address.additionDetails - - - jsonPath: $.BPA.address.buildingName - - - jsonPath: $.BPA.address.locality.code - - - jsonPath: $.BPA.address.landmark - - - jsonPath: $.BPA.address.city - - - jsonPath: $.BPA.id - - - jsonPath: $.BPA.auditDetails.createdBy - - - jsonPath: $.BPA.auditDetails.lastModifiedBy - - - jsonPath: $.BPA.auditDetails.createdTime - - - jsonPath: $.BPA.auditDetails.lastModifiedTime - - - - - query: INSERT INTO eg_bpa_owner( id, name, tenantid, mobilenumber, gender, fatherorhusbandname, correspondenceaddress, institutionid, isprimaryowner, ownertype, ownershippercentage, relationship, buildingplanid, active, createdby,lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - basePath: BPA.owners.* - jsonMaps: - - jsonPath: $.BPA.owners.*.uuid - - - jsonPath: $.BPA.owners.*.name - - - jsonPath: $.BPA.owners.*.tenantId - - - jsonPath: $.BPA.owners.*.mobileNumber - - - jsonPath: $.BPA.owners.*.gender - - - jsonPath: $.BPA.owners.*.fatherOrHusbandName - - - jsonPath: $.BPA.owners.*.correspondenceAddress - - - jsonPath: $.BPA.owners.*.institutionId - - - jsonPath: $.BPA.owners.*.isPrimaryOwner - - - jsonPath: $.BPA.owners.*.ownerType - - - jsonPath: $.BPA.owners.*.ownerShipPercentage - - - jsonPath: $.BPA.owners.*.relationship - - - jsonPath: $.BPA.id - - - jsonPath: $.BPA.owners.*.active - - - jsonPath: $.BPA.owners.*.auditDetails.createdBy - - - jsonPath: $.BPA.owners.*.auditDetails.lastModifiedBy - - - jsonPath: $.BPA.owners.*.auditDetails.createdTime - - - jsonPath: $.BPA.owners.*.auditDetails.lastModifiedTime - - - - query: INSERT INTO eg_bpa_unit( id,tenantid, usageCategory, blockIndex, buildingplanid, additionaldetails, createdby,lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - basePath: BPA.units.* - jsonMaps: - - jsonPath: $.BPA.units.*.id - - - jsonPath: $.BPA.tenantId - - - jsonPath: $.BPA.units.*.usageCategory - - - jsonPath: $.BPA.units.*.blockIndex - - - jsonPath: $.BPA.id - - - jsonPath: $.BPA.units.*.additionalDetails - type: JSON - dbType: JSONB - - - jsonPath: $.BPA.units.*.auditDetails.createdBy - - - jsonPath: $.BPA.units.*.auditDetails.lastModifiedBy - - - jsonPath: $.BPA.units.*.auditDetails.createdTime - - - jsonPath: $.BPA.units.*.auditDetails.lastModifiedTime - - - - query: INSERT INTO eg_bpa_geolocation( latitude, longitude, additionaldetails, addressid, createdby,lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?); - basePath: BPA.address.geoLocation - jsonMaps: - - jsonPath: $.BPA.address.geoLocation.latitude - type: DOUBLE - dbType: DOUBLE - - - jsonPath: $.BPA.address.geoLocation.longitude - type: DOUBLE - dbType: DOUBLE - - - jsonPath: $.BPA.address.geoLocation.additionalDetails - type: JSON - dbType: JSONB - - - jsonPath: $.BPA.address.id - - - jsonPath: $.BPA.auditDetails.createdBy - - - jsonPath: $.BPA.auditDetails.lastModifiedBy - - - jsonPath: $.BPA.auditDetails.createdTime - - - jsonPath: $.BPA.auditDetails.lastModifiedTime - - - - - query: INSERT INTO eg_bpa_auditdetails SELECT * FROM eg_bpa_buildingplan WHERE id =?; - basePath: BPA - jsonMaps: - - - jsonPath: $.BPA.id - - - - - - - query: INSERT INTO eg_bpa_document_owner(id,tenantId,owner,active, buildingplanid, documenttype, fileStoreid,documentuid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ? ,? ,?, ?, ?, ?, ?, ?, ?, ?); - basePath: BPA.owners.*.documents.* - jsonMaps: - - jsonPath: $.BPA.owners.*.documents.*.id - - - jsonPath: $.BPA.owners.*.documents.*.tenantId - - - jsonPath: $.BPA.owners.*.uuid - - - jsonPath: $.BPA.owners.*.documents.*.active - - - jsonPath: $.BPA.owners.*.buildingplanId - - - jsonPath: $.BPA.owners.*.documents.*.documentType - - - jsonPath: $.BPA.owners.*.documents.*.fileStoreId - - - jsonPath: $.BPA.owners.*.documents.*.documentUid - - - jsonPath: $.BPA.owners.*.documents.*.auditDetails.createdBy - - - jsonPath: $.BPA.owners.*.documents.*.auditDetails.lastModifiedBy - - - jsonPath: $.BPA.owners.*.documents.*.auditDetails.createdTime - - - jsonPath: $.BPA.owners.*.documents.*.auditDetails.lastModifiedTime - - - - - - - version: 1.0 - description: update buildingplan details in EG_BPA_BuildingPlan table - fromTopic: update-bpa-buildingplan - isTransaction: true - queryMaps: - - - query: UPDATE eg_bpa_buildingplan SET applicationno=?, remarks=?, holdingNo=?, subOccupancyType=?, permitOrderNo=?, edcrnumber=?, action=?, registrationdetails=?, govtorquasi=?, servicetype=?, riskType=?, status=?, ownershipcategory=?, additionaldetails=?, lastmodifiedby=?, lastmodifiedtime=?, validityDate=?, orderGeneratedDate=?, applicationDate=? WHERE id=?; - basePath: BPA - jsonMaps: - - jsonPath: $.BPA.applicationNo - - - jsonPath: $.BPA.remarks - - - jsonPath: $.BPA.holdingNo - - - jsonPath: $.BPA.subOccupancyType - - - jsonPath: $.BPA.permitOrderNo - - - jsonPath: $.BPA.edcrNumber - - - jsonPath: $.BPA.action - - - jsonPath: $.BPA.registrationDetails - - - jsonPath: $.BPA.govtOrQuasi - - - jsonPath: $.BPA.serviceType - - - jsonPath: $.BPA.riskType - - - jsonPath: $.BPA.status - - - jsonPath: $.BPA.ownershipCategory - - - jsonPath: $.BPA.additionalDetails - type: JSON - dbType: JSONB - - - jsonPath: $.BPA.auditDetails.lastModifiedBy - - - jsonPath: $.BPA.auditDetails.lastModifiedTime - - - jsonPath: $.BPA.validityDate - - - jsonPath: $.BPA.orderGeneratedDate - - - jsonPath: $.BPA.applicationDate - - - jsonPath: $.BPA.id - - - query: INSERT INTO eg_bpa_auditdetails SELECT * FROM eg_bpa_buildingplan WHERE id =?; - basePath: BPA - jsonMaps: - - - jsonPath: $.BPA.id - - - query: UPDATE eg_bpa_address SET doorno=?, plotno=?, district=?, region=?, state=?, country=?, pincode=?, additiondetails=?, buildingname=?, street=?, locality=?, landmark=?, city=?, lastmodifiedby=?, lastmodifiedtime=? WHERE id=?; - basePath: BPA.address - jsonMaps: - - - jsonPath: $.BPA.address.doorNo - - - jsonPath: $.BPA.address.plotNo - - - jsonPath: $.BPA.address.district - - - jsonPath: $.BPA.address.region - - - jsonPath: $.BPA.address.state - - - jsonPath: $.BPA.address.country - - - jsonPath: $.BPA.address.pincode - - - jsonPath: $.BPA.address.additionDetails - - - jsonPath: $.BPA.address.buildingName - - - jsonPath: $.BPA.address.street - - - jsonPath: $.BPA.address.locality.code - - - jsonPath: $.BPA.address.landmark - - - jsonPath: $.BPA.address.city - - - jsonPath: $.BPA.auditDetails.lastModifiedBy - - - jsonPath: $.BPA.auditDetails.lastModifiedTime - - - jsonPath: $.BPA.address.id - - - query: INSERT INTO eg_bpa_owner( id, name, tenantid, mobilenumber, gender, fatherorhusbandname, correspondenceaddress, institutionid, isprimaryowner, ownertype, ownershippercentage, relationship, buildingplanid, active, createdby,lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id, buildingplanid) WHERE id IS NOT NULL DO UPDATE SET name=?, mobilenumber=?, gender=?, fatherorhusbandname=?, correspondenceaddress=?, institutionid=?, isprimaryowner=?, ownertype=?, ownershippercentage=?, relationship=?, active=?, lastmodifiedby=?, lastmodifiedtime=?; - basePath: BPA.owners.* - jsonMaps: - - jsonPath: $.BPA.owners.*.uuid - - - jsonPath: $.BPA.owners.*.name - - - jsonPath: $.BPA.owners.*.tenantId - - - jsonPath: $.BPA.owners.*.mobileNumber - - - jsonPath: $.BPA.owners.*.gender - - - jsonPath: $.BPA.owners.*.fatherOrHusbandName - - - jsonPath: $.BPA.owners.*.correspondenceAddress - - - jsonPath: $.BPA.owners.*.institutionId - - - jsonPath: $.BPA.owners.*.isPrimaryOwner - - - jsonPath: $.BPA.owners.*.ownerType - - - jsonPath: $.BPA.owners.*.ownerShipPercentage - - - jsonPath: $.BPA.owners.*.relationship - - - jsonPath: $.BPA.id - - - jsonPath: $.BPA.owners.*.active - - - jsonPath: $.BPA.owners.*.auditDetails.createdBy - - - jsonPath: $.BPA.owners.*.auditDetails.lastModifiedBy - - - jsonPath: $.BPA.owners.*.auditDetails.createdTime - - - jsonPath: $.BPA.owners.*.auditDetails.lastModifiedTime - - - jsonPath: $.BPA.owners.*.name - - - jsonPath: $.BPA.owners.*.mobileNumber - - - jsonPath: $.BPA.owners.*.gender - - - jsonPath: $.BPA.owners.*.fatherOrHusbandName - - - jsonPath: $.BPA.owners.*.correspondenceAddress - - - jsonPath: $.BPA.owners.*.institutionId - - - jsonPath: $.BPA.owners.*.isPrimaryOwner - - - jsonPath: $.BPA.owners.*.ownerType - - - jsonPath: $.BPA.owners.*.ownerShipPercentage - - - jsonPath: $.BPA.owners.*.relationship - - - jsonPath: $.BPA.owners.*.active - - - jsonPath: $.BPA.owners.*.auditDetails.lastModifiedBy - - - jsonPath: $.BPA.owners.*.auditDetails.lastModifiedTime - - - - query: INSERT INTO eg_bpa_unit(id, tenantId, buildingplanid, blockindex, usageCategory ,additionalDetails ,createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id, buildingplanid, blockIndex) WHERE id IS NOT NULL DO UPDATE SET usageCategory=?, blockIndex=?, additionaldetails=?, lastmodifiedby=?, lastmodifiedtime=?; - basePath: BPA.units.* - jsonMaps: - - jsonPath: $.BPA.units.*.id - - - jsonPath: $.BPA.tenantId - - - jsonPath: $.BPA.id - - - jsonPath: $.BPA.units.*.blockIndex - - - jsonPath: $.BPA.units.*.usageCategory - - - jsonPath: $.BPA.units.*.additionalDetails - type: JSON - dbType: JSONB - - - jsonPath: $.BPA.units.*.auditDetails.createdBy - - - jsonPath: $.BPA.units.*.auditDetails.lastModifiedBy - - - jsonPath: $.BPA.units.*.auditDetails.createdTime - - - jsonPath: $.BPA.units.*.auditDetails.lastModifiedTime - - - jsonPath: $.BPA.units.*.usageCategory - - - jsonPath: $.BPA.units.*.blockIndex - - - jsonPath: $.BPA.units.*.additionalDetails - type: JSON - dbType: JSONB - - - jsonPath: $.BPA.units.*.auditDetails.lastModifiedBy - - - jsonPath: $.BPA.units.*.auditDetails.lastModifiedTime - - - - - query: UPDATE eg_bpa_document_owner SET tenantId=?,owner=?,active=?, buildingplanid=?, documenttype=?, fileStoreid=?,documentuid=?, lastmodifiedby=?, lastmodifiedtime=? WHERE id=?; - basePath: BPA.owners.*.documents.* - jsonMaps: - - - jsonPath: $.BPA.owners.*.documents.*.tenantId - - - jsonPath: $.BPA.owners.*.uuid - - - jsonPath: $.BPA.owners.*.documents.*.active - - - jsonPath: $.BPA.owners.*.buildingplanid - - - jsonPath: $.BPA.owners.*.documents.*.documentType - - - jsonPath: $.BPA.owners.*.documents.*.fileStoreId - - - jsonPath: $.BPA.owners.*.documents.*.documentUid - - - jsonPath: $.BPA.owners.*.documents.*.auditDetails.lastModifiedBy - - - jsonPath: $.BPA.owners.*.documents.*.auditDetails.lastModifiedTime - - - jsonPath: $.BPA.owners.*.documents.*.id - - - query: INSERT INTO eg_bpa_document( id, documenttype, fileStoreid, buildingplanid, documentuid, createdby, lastmodifiedby, createdtime, lastmodifiedtime, wfstate) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET documenttype =?, filestoreid =?,lastmodifiedby =?, lastmodifiedtime =?; - basePath: BPA.documents.* - jsonMaps: - - - jsonPath: $.BPA.documents.*.id - - - jsonPath: $.BPA.documents.*.documentType - - - jsonPath: $.BPA.documents.*.fileStoreId - - - jsonPath: $.BPA.id - - - jsonPath: $.BPA.documents.*.documentuid - - - jsonPath: $.BPA.auditDetails.createdBy - - - jsonPath: $.BPA.auditDetails.lastModifiedBy - - - jsonPath: $.BPA.auditDetails.createdTime - - - jsonPath: $.BPA.auditDetails.lastModifiedTime - - - jsonPath: $.BPA.documents.*.wfState - - - jsonPath: $.BPA.documents.*.documentType - - - jsonPath: $.BPA.documents.*.fileStoreId - - - jsonPath: $.BPA.auditDetails.lastModifiedBy - - - jsonPath: $.BPA.auditDetails.lastModifiedTime - - - version: 1.0 - description: update buildingplan details in EG_BPA_BuildingPlan table - fromTopic: update-bpa-workflow - isTransaction: true - queryMaps: - - - query: INSERT INTO eg_bpa_document( id, documenttype, filestoreid, buildingplanid, documentuid, createdby, lastmodifiedby, createdtime, lastmodifiedtime, wfstate) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET documenttype =?, filestoreid =?,lastmodifiedby =?, lastmodifiedtime =?; - basePath: BPA.documents.* - jsonMaps: - - - jsonPath: $.BPA.documents.*.id - - - jsonPath: $.BPA.documents.*.documentType - - - jsonPath: $.BPA.documents.*.fileStoreId - - - jsonPath: $.BPA.id - - - jsonPath: $.BPA.documents.*.documentuid - - - jsonPath: $.BPA.auditDetails.createdBy - - - jsonPath: $.BPA.auditDetails.lastModifiedBy - - - jsonPath: $.BPA.auditDetails.createdTime - - - jsonPath: $.BPA.auditDetails.lastModifiedTime - - - jsonPath: $.BPA.documents.*.wfState - - - jsonPath: $.BPA.documents.*.documentType - - - jsonPath: $.BPA.documents.*.fileStoreId - - - jsonPath: $.BPA.auditDetails.lastModifiedBy - - - jsonPath: $.BPA.auditDetails.lastModifiedTime - - - query: INSERT INTO eg_bpa_auditdetails SELECT * FROM eg_bpa_buildingplan WHERE id =?; - basePath: BPA - jsonMaps: - - - jsonPath: $.BPA.id - - - query: UPDATE eg_bpa_buildingplan SET status =?, permitOrderNo=?, validityDate=?, orderGeneratedDate=?, holdingno=?, registrationdetails=?, govtorquasi=?, additionaldetails=?, applicationDate =? WHERE id =?; - basePath: BPA - jsonMaps: - - jsonPath: $.BPA.status - - - jsonPath: $.BPA.permitOrderNo - - - jsonPath: $.BPA.validityDate - - - jsonPath: $.BPA.orderGeneratedDate - - - jsonPath: $.BPA.holdingNo - - - jsonPath: $.BPA.registrationDetails - - - jsonPath: $.BPA.govtOrQuasi - - - jsonPath: $.BPA.additionalDetails - type: JSON - dbType: JSONB - - - jsonPath: $.BPA.applicationDate - - - jsonPath: $.BPA.id - - - query: INSERT INTO eg_bpa_owner( id, name, tenantid, mobilenumber, gender, fatherorhusbandname, correspondenceaddress, institutionid, isprimaryowner, ownertype, ownershippercentage, relationship, buildingplanid, active, createdby,lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id, buildingplanid) WHERE id IS NOT NULL DO UPDATE SET name=?, mobilenumber=?, gender=?, fatherorhusbandname=?, correspondenceaddress=?, institutionid=?, isprimaryowner=?, ownertype=?, ownershippercentage=?, relationship=?, active=?, lastmodifiedby=?, lastmodifiedtime=?; - basePath: BPA.owners.* - jsonMaps: - - jsonPath: $.BPA.owners.*.uuid - - - jsonPath: $.BPA.owners.*.name - - - jsonPath: $.BPA.owners.*.tenantId - - - jsonPath: $.BPA.owners.*.mobileNumber - - - jsonPath: $.BPA.owners.*.gender - - - jsonPath: $.BPA.owners.*.fatherOrHusbandName - - - jsonPath: $.BPA.owners.*.correspondenceAddress - - - jsonPath: $.BPA.owners.*.institutionId - - - jsonPath: $.BPA.owners.*.isPrimaryOwner - - - jsonPath: $.BPA.owners.*.ownerType - - - jsonPath: $.BPA.owners.*.ownerShipPercentage - - - jsonPath: $.BPA.owners.*.relationship - - - jsonPath: $.BPA.id - - - jsonPath: $.BPA.owners.*.active - - - jsonPath: $.BPA.owners.*.auditDetails.createdBy - - - jsonPath: $.BPA.owners.*.auditDetails.lastModifiedBy - - - jsonPath: $.BPA.owners.*.auditDetails.createdTime - - - jsonPath: $.BPA.owners.*.auditDetails.lastModifiedTime - - - jsonPath: $.BPA.owners.*.name - - - jsonPath: $.BPA.owners.*.mobileNumber - - - jsonPath: $.BPA.owners.*.gender - - - jsonPath: $.BPA.owners.*.fatherOrHusbandName - - - jsonPath: $.BPA.owners.*.correspondenceAddress - - - jsonPath: $.BPA.owners.*.institutionId - - - jsonPath: $.BPA.owners.*.isPrimaryOwner - - - jsonPath: $.BPA.owners.*.ownerType - - - jsonPath: $.BPA.owners.*.ownerShipPercentage - - - jsonPath: $.BPA.owners.*.relationship - - - jsonPath: $.BPA.owners.*.active - - - jsonPath: $.BPA.owners.*.auditDetails.lastModifiedBy - - - jsonPath: $.BPA.owners.*.auditDetails.lastModifiedTime - - - - - query: INSERT INTO eg_bpa_unit(id, tenantId, buildingplanid, blockindex, usageCategory,additionalDetails , createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id, buildingplanid, blockIndex) WHERE id IS NOT NULL DO UPDATE SET usageCategory=?, blockIndex=?, additionaldetails=?, lastmodifiedby=?, lastmodifiedtime=?; - basePath: BPA.units.* - jsonMaps: - - jsonPath: $.BPA.units.*.id - - - jsonPath: $.BPA.tenantId - - - jsonPath: $.BPA.id - - - jsonPath: $.BPA.units.*.blockIndex - - - jsonPath: $.BPA.units.*.usageCategory - - - jsonPath: $.BPA.units.*.additionalDetails - type: JSON - dbType: JSONB - - - jsonPath: $.BPA.units.*.auditDetails.createdBy - - - jsonPath: $.BPA.units.*.auditDetails.lastModifiedBy - - - jsonPath: $.BPA.units.*.auditDetails.createdTime - - - jsonPath: $.BPA.units.*.auditDetails.lastModifiedTime - - - jsonPath: $.BPA.units.*.usageCategory - - - jsonPath: $.BPA.units.*.blockIndex - - - jsonPath: $.BPA.units.*.additionalDetails - type: JSON - dbType: JSONB - - - jsonPath: $.BPA.units.*.auditDetails.lastModifiedBy - - - jsonPath: $.BPA.units.*.auditDetails.lastModifiedTime - - diff --git a/configs/egov-persister/firenoc-calculator-persister.yml b/configs/egov-persister/firenoc-calculator-persister.yml new file mode 100644 index 00000000..12773dd6 --- /dev/null +++ b/configs/egov-persister/firenoc-calculator-persister.yml @@ -0,0 +1,92 @@ +serviceMaps: + serviceName: FIRENOC_CALCULATOR + mappings: + - version: 1.0 + name: firenoc-calculator + description: Persists billing slab details in the table + fromTopic: save-firenoc-calculator-billingslab + isTransaction: true + queryMaps: + - query: INSERT INTO eg_firenoc_billingslab (id, tenantid, isactive , firenoctype, buildingusagetype, calculationtype, uom, fromuom, touom, fromdate, todate, rate, createdby, createddate, lastmodifiedby, lastModifiedDate) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?); + + basePath: BillingSlabs.* + jsonMaps: + - jsonPath: $.BillingSlabs.*.id + + - jsonPath: $.BillingSlabs.*.tenantId + + - jsonPath: $.BillingSlabs.*.isActive + + - jsonPath: $.BillingSlabs.*.fireNOCType + + - jsonPath: $.BillingSlabs.*.buildingUsageType + + - jsonPath: $.BillingSlabs.*.calculationType + + - jsonPath: $.BillingSlabs.*.uom + + - jsonPath: $.BillingSlabs.*.fromUom + + - jsonPath: $.BillingSlabs.*.toUom + + - jsonPath: $.BillingSlabs.*.fromDate + + - jsonPath: $.BillingSlabs.*.toDate + + - jsonPath: $.BillingSlabs.*.rate + + - jsonPath: $.BillingSlabs.*.auditDetails.createdBy + + - jsonPath: $.BillingSlabs.*.auditDetails.createdDate + + - jsonPath: $.BillingSlabs.*.auditDetails.lastModifiedBy + + - jsonPath: $.BillingSlabs.*.auditDetails.lastModifiedDate + + - version: 1.0 + name: firenoc-calculator + description: Persists billing slab details in the table + fromTopic: update-firenoc-calculator-billingslab + isTransaction: true + queryMaps: + - query: DELETE FROM eg_firenoc_billingslab + + basePath: BillingSlabs.* + jsonMaps: + - jsonPath: $.BillingSlabs.*.id + + - query: INSERT INTO eg_firenoc_billingslab (id, tenantid, isactive , firenoctype, buildingusagetype, calculationtype, uom, fromuom, touom, fromdate, todate, rate, createdby, createddate, lastmodifiedby, lastModifiedDate) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?); + + basePath: BillingSlabs.* + jsonMaps: + - jsonPath: $.BillingSlabs.*.id + + - jsonPath: $.BillingSlabs.*.tenantId + + - jsonPath: $.BillingSlabs.*.isActive + + - jsonPath: $.BillingSlabs.*.fireNOCType + + - jsonPath: $.BillingSlabs.*.buildingUsageType + + - jsonPath: $.BillingSlabs.*.calculationType + + - jsonPath: $.BillingSlabs.*.uom + + - jsonPath: $.BillingSlabs.*.fromUom + + - jsonPath: $.BillingSlabs.*.toUom + + - jsonPath: $.BillingSlabs.*.fromDate + + - jsonPath: $.BillingSlabs.*.toDate + + - jsonPath: $.BillingSlabs.*.rate + + - jsonPath: $.BillingSlabs.*.auditDetails.createdBy + + - jsonPath: $.BillingSlabs.*.auditDetails.createdDate + + - jsonPath: $.BillingSlabs.*.auditDetails.lastModifiedBy + + - jsonPath: $.BillingSlabs.*.auditDetails.lastModifiedDate diff --git a/configs/egov-persister/firenoc_persiter.yaml b/configs/egov-persister/firenoc_persiter.yaml index cee5bbbf..bd811d9c 100644 --- a/configs/egov-persister/firenoc_persiter.yaml +++ b/configs/egov-persister/firenoc_persiter.yaml @@ -133,9 +133,9 @@ serviceMaps: - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.type - - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.addressline1 + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.addressLine1 - - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.addressline1 + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.addressLine2 - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.landmark @@ -159,9 +159,9 @@ serviceMaps: - jsonPath: $.FireNOCs.*.auditDetails.lastModifiedTime - - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.areatype + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.areaType - - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.subdistrict + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.subDistrict - query: INSERT INTO public.eg_fn_institution(uuid, tenantid, firenocdetailsuuid, name, type, designation, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?); basePath: FireNOCs.*.fireNOCDetails.applicantDetails.additionalDetail @@ -187,7 +187,7 @@ serviceMaps: - jsonPath: $.FireNOCs.*.auditDetails.lastModifiedTime - - query: INSERT INTO eg_fn_buidlings(uuid, firenocdetailsuuid, tenantid, name, createdby, lastmodifiedby, createdtime, lastmodifiedtime, usagetype) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?); + - query: INSERT INTO eg_fn_buidlings(uuid, firenocdetailsuuid, tenantid, name, createdby, lastmodifiedby, createdtime, lastmodifiedtime, usagetype,usagesubtype,leftsurrounding,rightsurrounding,frontsurrounding,backsurrounding,landarea,totalcoveredarea,parkingarea) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?,?,?,?,?,?,?,?,?); basePath: FireNOCs.*.fireNOCDetails.buildings.* jsonMaps: - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.id @@ -207,6 +207,26 @@ serviceMaps: - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings[*].id)].auditDetails.lastModifiedTime - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.usageType + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.usageSubType + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.leftSurrounding + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.rightSurrounding + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.frontSurrounding + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.backSurrounding + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.landArea + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.totalCoveredArea + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.parkingArea + + + + - query: INSERT INTO eg_fn_buildingdocuments(uuid, tenantid, documenttype, filestoreid, active, documentuid, createdby, createdtime, lastmodifiedby, lastmodifiedtime, buildinguuid) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); basePath: FireNOCs.*.fireNOCDetails.buildings.*.applicationDocuments.* @@ -307,7 +327,7 @@ serviceMaps: - jsonPath: $.FireNOCs.*.fireNOCDetails.id - - query: INSERT INTO eg_fn_buidlings(uuid, tenantid, name, usageType, firenocdetailsuuid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (uuid) DO UPDATE SET active = ?, name = ?, usageType = ?, lastmodifiedby = ?, lastmodifiedtime = ?; + - query: INSERT INTO eg_fn_buidlings(uuid, tenantid, name, usagetype, firenocdetailsuuid, createdby, lastmodifiedby, createdtime, lastmodifiedtime,usagesubtype,leftsurrounding,rightsurrounding,frontsurrounding,backsurrounding,landarea,totalcoveredarea,parkingarea) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?,?,?,?,?,?,?,?,?) ON CONFLICT (uuid) DO UPDATE SET active = ?, name = ?, usageType = ?, lastmodifiedby = ?, lastmodifiedtime = ?,usagesubtype=?, leftsurrounding=?, rightsurrounding=?, frontsurrounding=?, backsurrounding=?, landarea=?,totalcoveredarea=?,parkingArea=?; basePath: FireNOCs.*.fireNOCDetails.buildings.* jsonMaps: - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.id @@ -327,7 +347,23 @@ serviceMaps: - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings[*].id)].auditDetails.createdTime - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings[*].id)].auditDetails.lastModifiedTime - + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.usageSubType + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.leftSurrounding + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.rightSurrounding + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.frontSurrounding + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.backSurrounding + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.landArea + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.totalCoveredArea + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.parkingArea + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.active - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.name @@ -337,6 +373,23 @@ serviceMaps: - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings[*].id)].auditDetails.lastModifiedBy - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings[*].id)].auditDetails.lastModifiedTime + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.usageSubType + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.leftSurrounding + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.rightSurrounding + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.frontSurrounding + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.backSurrounding + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.landArea + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.totalCoveredArea + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.parkingArea + - query: INSERT INTO eg_fn_buildingdocuments(uuid, tenantid, documenttype, filestoreid, active, documentuid, createdby, createdtime, lastmodifiedby, lastmodifiedtime, buildinguuid) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (uuid) DO UPDATE SET active = ?,documentType = ?, fileStoreId = ?, documentUid=?,lastmodifiedby = ?, lastmodifiedtime = ?; @@ -482,9 +535,9 @@ serviceMaps: - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.type - - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.addressline1 + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.addressLine1 - - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.addressline1 + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.addressLine2 - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.landmark @@ -497,12 +550,14 @@ serviceMaps: - jsonPath: $.FireNOCs.*.auditDetails.lastModifiedBy - jsonPath: $.FireNOCs.*.auditDetails.lastModifiedTime + + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.areaType + + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.subDistrict - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.id - - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.areatype - - - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.subdistrict + - query: INSERT INTO eg_fn_institution(tenantId,uuid, firenocdetailsuuid, name, type,designation, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (uuid) DO UPDATE SET active = ?,name = ?,type = ?,designation = ?, lastmodifiedby = ?,lastmodifiedtime = ?; diff --git a/configs/egov-persister/tradelicense-persister-bpachanges.yml b/configs/egov-persister/tradelicense-persister-bpachanges.yml deleted file mode 100644 index e772d467..00000000 --- a/configs/egov-persister/tradelicense-persister-bpachanges.yml +++ /dev/null @@ -1,843 +0,0 @@ -serviceMaps: - serviceName: tl-services - mappings: - - version: 1.0 - description: Persists tradeLicense details in EG_TL_TradeLicense table - fromTopic: save-tl-tradelicense - isTransaction: true - queryMaps: - - - query: INSERT INTO eg_tl_tradelicense( id, accountid,tenantid,tradeName, validfrom,validto,licensetype,applicationNumber, licenseNumber, oldlicensenumber, propertyid, oldpropertyid, applicationdate, commencementdate, financialyear, action, status, createdby, lastmodifiedby, createdtime, lastmodifiedtime, businessservice, applicationtype, workflowcode) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - basePath: Licenses.* - jsonMaps: - - jsonPath: $.Licenses.*.id - - - jsonPath: $.Licenses.*.accountId - - - jsonPath: $.Licenses.*.tenantId - - - jsonPath: $.Licenses.*.tradeName - - - jsonPath: $.Licenses.*.validFrom - - - jsonPath: $.Licenses.*.validTo - - - jsonPath: $.Licenses.*.licenseType - - - jsonPath: $.Licenses.*.applicationNumber - - - jsonPath: $.Licenses.*.licenseNumber - - - jsonPath: $.Licenses.*.oldLicenseNumber - - - jsonPath: $.Licenses.*.propertyId - - - jsonPath: $.Licenses.*.oldPropertyId - - - jsonPath: $.Licenses.*.applicationDate - - - jsonPath: $.Licenses.*.commencementDate - - - jsonPath: $.Licenses.*.financialYear - - - jsonPath: $.Licenses.*.action - - - jsonPath: $.Licenses.*.status - - - jsonPath: $.Licenses.*.auditDetails.createdBy - - - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy - - - jsonPath: $.Licenses.*.auditDetails.createdTime - - - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime - - - jsonPath: $.Licenses.*.businessService - - - jsonPath: $.Licenses.*.applicationType - - - jsonPath: $.Licenses.*.workflowCode - - - - query: INSERT INTO eg_tl_tradelicensedetail( id, surveyno, subownershipcategory, channel, additionaldetail, tradelicenseid,structureType,operationalArea,noOfEmployees,adhocExemption,adhocPenalty,adhocExemptionReason,adhocPenaltyReason, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?, ?, ?, ?); - basePath: Licenses.*.tradeLicenseDetail - jsonMaps: - - jsonPath: $.Licenses.*.tradeLicenseDetail.id - - - jsonPath: $.Licenses.*.tradeLicenseDetail.surveyNo - - - jsonPath: $.Licenses.*.tradeLicenseDetail.subOwnerShipCategory - - - jsonPath: $.Licenses.*.tradeLicenseDetail.channel - - - jsonPath: $.Licenses.*.tradeLicenseDetail.additionalDetail - type: JSON - dbType: JSONB - - - jsonPath: $.Licenses.*.id - - - jsonPath: $.Licenses.*.tradeLicenseDetail.structureType - - - jsonPath: $.Licenses.*.tradeLicenseDetail.operationalArea - - - jsonPath: $.Licenses.*.tradeLicenseDetail.noOfEmployees - - - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocExemption - - - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocPenalty - - - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocExemptionReason - - - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocPenaltyReason - - - jsonPath: $.Licenses.*.auditDetails.createdBy - - - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy - - - jsonPath: $.Licenses.*.auditDetails.createdTime - - - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime - - - - - query: INSERT INTO eg_tl_tradeunit( id, tenantid,active, tradetype, uom, uomvalue, tradelicensedetailid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?,?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - basePath: Licenses.*.tradeLicenseDetail.tradeUnits.* - jsonMaps: - - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.id - - - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.tenantId - - - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.active - - - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.tradeType - - - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.uom - - - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.uomValue - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].tradeLicenseDetail.id - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.createdBy - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.lastModifiedBy - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.createdTime - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.lastModifiedTime - - - - - query: INSERT INTO eg_tl_accessory( id, tenantid,active, accessoryCategory, uom, uomvalue, count, tradelicensedetailid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?,?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - basePath: Licenses.*.tradeLicenseDetail.accessories.* - jsonMaps: - - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.id - - - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.tenantId - - - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.active - - - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.accessoryCategory - - - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.uom - - - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.uomValue - - - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.count - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].tradeLicenseDetail.id - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.createdBy - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.lastModifiedBy - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.createdTime - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.lastModifiedTime - - - - query: INSERT INTO eg_tl_owner( id,tenantid,active,institutionid, tradelicensedetailid, isprimaryowner, ownertype, ownershippercentage, relationship, createdby,lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - basePath: Licenses.*.tradeLicenseDetail.owners.* - jsonMaps: - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.uuid - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.tenantId - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.userActive - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.institutionId - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].tradeLicenseDetail.id - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.isPrimaryOwner - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.ownerType - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.ownerShipPercentage - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.relationship - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.createdBy - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.lastModifiedBy - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.createdTime - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.lastModifiedTime - - - - - query: INSERT INTO eg_tl_document_owner(id,tenantId,userid,active, tradeLicenseDetailId, documenttype, fileStoreId,documentuid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ? ,? ,?, ?, ?, ?, ?, ?, ?, ?); - basePath: Licenses.*.tradeLicenseDetail.owners.*.documents.* - jsonMaps: - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.id - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].tenantId - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners[*][?({id} in @.documents[*].id)].uuid - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.active - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].tradeLicenseDetail.id - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.documentType - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.fileStoreId - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.documentUid - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.createdBy - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.lastModifiedBy - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.createdTime - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.lastModifiedTime - - - - - query: INSERT INTO eg_tl_applicationdocument( id, tenantid, active, documenttype, tradecategorydetail, filestoreid, tradelicensedetailid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - basePath: Licenses.*.tradeLicenseDetail.applicationDocuments.* - jsonMaps: - - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.id - - - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.tenantId - - - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.active - - - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.documentType - - - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.tradecategorydetail - - - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.fileStoreId - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].tradeLicenseDetail.id - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.createdBy - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.lastModifiedBy - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.createdTime - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.lastModifiedTime - - - - query: INSERT INTO eg_tl_address( id, tenantid, doorno,street,buildingName, latitude,longitude, addressid, addressnumber,locality, type, addressline1, addressline2, landmark, city, pincode, detail, tradelicensedetailid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - basePath: Licenses.*.tradeLicenseDetail.address - jsonMaps: - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.id - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.tenantId - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.doorNo - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.street - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.buildingName - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.latitude - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.longitude - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.addressId - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.addressNumber - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.locality.code - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.type - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.addressLine1 - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.addressline2 - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.landmark - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.city - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.pincode - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.detail - - - jsonPath: $.Licenses.*.tradeLicenseDetail.id - - - jsonPath: $.Licenses.*.auditDetails.createdBy - - - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy - - - jsonPath: $.Licenses.*.auditDetails.createdTime - - - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime - - - - query: INSERT INTO eg_tl_institution(tenantId,active,id,instituionName,contactNo,organisationRegistrationNo,address, tradelicensedetailid, name, type,designation, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ; - basePath: Licenses.*.tradeLicenseDetail.institution - jsonMaps: - - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.tenantId - - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.active - - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.id - - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.instituionName - - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.contactNo - - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.organisationRegistrationNo - - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.address - - - jsonPath: $.Licenses.*.tradeLicenseDetail.id - - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.name - - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.type - - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.designation - - - jsonPath: $.Licenses.*.auditDetails.createdBy - - - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy - - - jsonPath: $.Licenses.*.auditDetails.createdTime - - - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime - - - - - - - - version: 1.0 - description: Update tradeLicense details in EG_TL_TradeLicense table - fromTopic: update-tl-tradelicense - isTransaction: true - queryMaps: - - - - query: INSERT INTO eg_tl_tradelicense_audit SELECT * FROM eg_tl_tradelicense WHERE id = ?; - basePath: Licenses.* - jsonMaps: - - jsonPath: $.Licenses.*.id - - - - query: UPDATE eg_tl_tradelicense SET tradeName = ?,licenseNumber = ?,licensetype = ?, oldlicensenumber = ?, propertyid = ?, oldpropertyid = ?, commencementdate = ?, issueddate = ?, financialyear = ?, validfrom = ?, validto = ?, action = ?, status = ?, lastmodifiedby = ?, lastmodifiedtime = ?, businessservice = ?, applicationtype = ?, workflowcode = ? WHERE id=?; - basePath: Licenses.* - jsonMaps: - - jsonPath: $.Licenses.*.tradeName - - - jsonPath: $.Licenses.*.licenseNumber - - - jsonPath: $.Licenses.*.licenseType - - - jsonPath: $.Licenses.*.oldLicenseNumber - - - jsonPath: $.Licenses.*.propertyId - - - jsonPath: $.Licenses.*.oldPropertyId - - - jsonPath: $.Licenses.*.commencementDate - - - jsonPath: $.Licenses.*.issuedDate - - - jsonPath: $.Licenses.*.financialYear - - - jsonPath: $.Licenses.*.validFrom - - - jsonPath: $.Licenses.*.validTo - - - jsonPath: $.Licenses.*.action - - - jsonPath: $.Licenses.*.status - - - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy - - - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime - - - jsonPath: $.Licenses.*.businessService - - - jsonPath: $.Licenses.*.applicationType - - - jsonPath: $.Licenses.*.workflowCode - - - jsonPath: $.Licenses.*.id - - - query: INSERT INTO eg_tl_tradelicensedetail_audit SELECT * FROM eg_tl_tradelicensedetail WHERE id = ?; - basePath: Licenses.*.tradeLicenseDetail - jsonMaps: - - jsonPath: $.Licenses.*.tradeLicenseDetail.id - - - - - query: UPDATE eg_tl_tradelicensedetail SET surveyno = ?, subownershipcategory = ?, channel = ?, additionaldetail = ?,operationalArea = ?,noOfEmployees = ?,structureType = ?,adhocExemption = ?,adhocPenalty = ?,adhocExemptionReason = ?,adhocPenaltyReason = ?,lastmodifiedby = ?, lastmodifiedtime = ? WHERE id = ?; - basePath: Licenses.*.tradeLicenseDetail - jsonMaps: - - jsonPath: $.Licenses.*.tradeLicenseDetail.surveyNo - - - jsonPath: $.Licenses.*.tradeLicenseDetail.subOwnerShipCategory - - - jsonPath: $.Licenses.*.tradeLicenseDetail.channel - - - jsonPath: $.Licenses.*.tradeLicenseDetail.additionalDetail - type: JSON - dbType: JSONB - - - jsonPath: $.Licenses.*.tradeLicenseDetail.operationalArea - - - jsonPath: $.Licenses.*.tradeLicenseDetail.noOfEmployees - - - jsonPath: $.Licenses.*.tradeLicenseDetail.structureType - - - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocExemption - - - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocPenalty - - - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocExemptionReason - - - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocPenaltyReason - - - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy - - - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime - - - jsonPath: $.Licenses.*.tradeLicenseDetail.id - - - - query: INSERT INTO eg_tl_tradeunit(id, tenantid, active, tradetype, uom, uomvalue, tradelicensedetailid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET active = ?, tradetype = ?, uom = ?, uomvalue = ?, lastmodifiedby = ?, lastmodifiedtime = ?; - basePath: Licenses.*.tradeLicenseDetail.tradeUnits.* - jsonMaps: - - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.id - - - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.tenantId - - - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.active - - - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.tradeType - - - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.uom - - - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.uomValue - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].tradeLicenseDetail.id - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.createdBy - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.lastModifiedBy - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.createdTime - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.lastModifiedTime - - - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.active - - - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.tradeType - - - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.uom - - - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.uomValue - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.lastModifiedBy - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.lastModifiedTime - - - - query: INSERT INTO eg_tl_accessory(id, tenantid, active, accessoryCategory, uom, uomvalue, count, tradelicensedetailid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET active = ?,accessoryCategory = ?, uom = ?, uomvalue = ?,count =?, lastmodifiedby = ?, lastmodifiedtime = ?; - basePath: Licenses.*.tradeLicenseDetail.accessories.* - jsonMaps: - - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.id - - - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.tenantId - - - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.active - - - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.accessoryCategory - - - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.uom - - - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.uomValue - - - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.count - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].tradeLicenseDetail.id - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.createdBy - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.lastModifiedBy - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.createdTime - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.lastModifiedTime - - - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.active - - - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.accessoryCategory - - - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.uom - - - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.uomValue - - - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.count - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.lastModifiedBy - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.lastModifiedTime - - - - - query: INSERT INTO eg_tl_owner( id, tenantid, active, tradelicensedetailid, isprimaryowner, ownertype, ownershippercentage, relationship, createdby,lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT ON CONSTRAINT pk_eg_tl_owner DO UPDATE SET active = ?, isprimaryowner = ?, ownertype = ?, ownershippercentage = ?, relationship = ?, lastmodifiedby = ?, lastmodifiedtime = ?; - basePath: Licenses.*.tradeLicenseDetail.owners.* - jsonMaps: - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.uuid - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.tenantId - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.userActive - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].tradeLicenseDetail.id - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.isPrimaryOwner - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.ownerType - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.ownerShipPercentage - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.relationship - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.createdBy - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.lastModifiedBy - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.createdTime - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.lastModifiedTime - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.userActive - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.isPrimaryOwner - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.ownerType - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.ownerShipPercentage - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.relationship - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.lastModifiedBy - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.lastModifiedTime - - - - query: INSERT INTO eg_tl_document_owner(id,tenantId,active,userid, tradeLicenseDetailId, documenttype, fileStoreId,documentuid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT ON CONSTRAINT pk_eg_tl_document_owner DO UPDATE SET active = ?, documenttype = ?, fileStoreId = ?,documentuid = ?, lastmodifiedby = ?, lastmodifiedtime = ?; - basePath: Licenses.*.tradeLicenseDetail.owners.*.documents.* - jsonMaps: - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.id - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].tenantId - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.active - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners[*][?({id} in @.documents[*].id)].uuid - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].tradeLicenseDetail.id - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.documentType - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.fileStoreId - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.documentUid - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.createdBy - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.lastModifiedBy - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.createdTime - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.lastModifiedTime - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.active - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.documentType - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.fileStoreId - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.documentUid - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.lastModifiedBy - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.lastModifiedTime - - - - - query: INSERT INTO eg_tl_applicationdocument( id, tenantid, active, documenttype, tradecategorydetail, filestoreid, tradelicensedetailid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET active = ?, documenttype =?, tradecategorydetail =?, filestoreid =?,lastmodifiedby =?, lastmodifiedtime =?; - basePath: Licenses.*.tradeLicenseDetail.applicationDocuments.* - jsonMaps: - - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.id - - - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.tenantId - - - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.active - - - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.documentType - - - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.tradecategorydetail - - - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.fileStoreId - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].tradeLicenseDetail.id - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.createdBy - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.lastModifiedBy - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.createdTime - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.lastModifiedTime - - - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.active - - - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.documentType - - - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.tradecategorydetail - - - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.fileStoreId - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.lastModifiedBy - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.lastModifiedTime - - - - - query: UPDATE eg_tl_address SET doorno =?,street = ?,buildingName = ?, latitude =?, longitude =?, addressid =?, addressnumber =?,locality =?, type =?, addressline1 =?, addressline2 =?, landmark =?, city =?, pincode =?, detail =?,lastmodifiedby =?, lastmodifiedtime =? WHERE id =?; - basePath: Licenses.*.tradeLicenseDetail.address - jsonMaps: - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.doorNo - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.street - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.buildingName - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.latitude - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.longitude - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.addressId - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.addressNumber - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.locality.code - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.type - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.addressline1 - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.addressline2 - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.landmark - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.city - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.pincode - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.detail - - - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy - - - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.id - - - - query: INSERT INTO eg_tl_institution(tenantId, active, id, instituionName, contactNo, organisationRegistrationNo, address, tradelicensedetailid, name, type,designation, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET active = ?,name = ?,type = ?,designation = ?, lastmodifiedby = ?,lastmodifiedtime = ?, instituionName = ?, contactNo = ?, organisationRegistrationNo = ?, address = ?; - basePath: Licenses.*.tradeLicenseDetail.institution - jsonMaps: - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.tenantId - - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.active - - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.id - - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.instituionName - - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.contactNo - - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.organisationRegistrationNo - - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.address - - - jsonPath: $.Licenses.*.tradeLicenseDetail.id - - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.name - - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.type - - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.designation - - - jsonPath: $.Licenses.*.auditDetails.createdBy - - - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy - - - jsonPath: $.Licenses.*.auditDetails.createdTime - - - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime - - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.active - - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.name - - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.type - - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.designation - - - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy - - - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime - - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.instituionName - - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.contactNo - - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.organisationRegistrationNo - - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.address - - - - - - version: 1.0 - description: Persists tradeLicense details in EG_TL_TradeLicense table - fromTopic: update-tl-workflow - isTransaction: true - queryMaps: - - - query: INSERT INTO eg_tl_tradelicense_audit SELECT * FROM eg_tl_tradelicense WHERE id = ?; - basePath: Licenses.* - jsonMaps: - - jsonPath: $.Licenses.*.id - - - - - query: INSERT INTO eg_tl_tradelicensedetail_audit SELECT * FROM eg_tl_tradelicensedetail WHERE id = ?; - basePath: Licenses.*.tradeLicenseDetail - jsonMaps: - - jsonPath: $.Licenses.*.tradeLicenseDetail.id - - - - - query: INSERT INTO eg_tl_verificationdocument( id, tenantid, active, documenttype, tradecategorydetail, filestoreid,tradelicensedetailid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET active = ?,documenttype =?, tradecategorydetail =?, filestoreid =?, lastmodifiedby =?, lastmodifiedtime =?; - basePath: Licenses.*.tradeLicenseDetail.verificationDocuments.* - jsonMaps: - - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.id - - - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.tenantId - - - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.active - - - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.documentType - - - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.tradecategorydetail - - - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.fileStoreId - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.verificationDocuments[*].id)].tradeLicenseDetail.id - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.verificationDocuments[*].id)].auditDetails.createdBy - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.verificationDocuments[*].id)].auditDetails.lastModifiedBy - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.verificationDocuments[*].id)].auditDetails.createdTime - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.verificationDocuments[*].id)].auditDetails.lastModifiedTime - - - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.active - - - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.documentType - - - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.tradecategorydetail - - - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.fileStoreId - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.verificationDocuments[*].id)].auditDetails.lastModifiedBy - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.verificationDocuments[*].id)].auditDetails.lastModifiedTime - - - - query: UPDATE eg_tl_tradelicense SET validfrom = ?,validto = ?,licenseNumber =?, issueddate = ?, action = ?, status = ?, lastmodifiedby = ?, lastmodifiedtime = ? WHERE id=?; - basePath: Licenses.* - jsonMaps: - - jsonPath: $.Licenses.*.validFrom - - - jsonPath: $.Licenses.*.validTo - - - jsonPath: $.Licenses.*.licenseNumber - - - jsonPath: $.Licenses.*.issuedDate - - - jsonPath: $.Licenses.*.action - - - jsonPath: $.Licenses.*.status - - - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy - - - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime - - - jsonPath: $.Licenses.*.id - - - - query: UPDATE eg_tl_tradelicensedetail SET additionaldetail = ?,lastmodifiedby = ?, lastmodifiedtime = ? WHERE id = ?; - basePath: Licenses.*.tradeLicenseDetail - jsonMaps: - - jsonPath: $.Licenses.*.tradeLicenseDetail.additionalDetail - type: JSON - dbType: JSONB - - - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy - - - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime - - - jsonPath: $.Licenses.*.tradeLicenseDetail.id - - - - - version: 1.0 - description: Update adhocDetails - fromTopic: update-tl-adhoc-tradelicense - isTransaction: true - queryMaps: - - - - query: UPDATE eg_tl_tradelicensedetail SET adhocExemption = ?,adhocPenalty = ?,adhocExemptionReason = ?,adhocPenaltyReason = ?,lastmodifiedby = ?, lastmodifiedtime = ? WHERE id = ?; - basePath: Licenses.*.tradeLicenseDetail - jsonMaps: - - - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocExemption - - - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocPenalty - - - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocExemptionReason - - - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocPenaltyReason - - - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy - - - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime - - - jsonPath: $.Licenses.*.tradeLicenseDetail.id From 5bc43eae1ad2fa3aad7e89a13a7fb30b148e05e7 Mon Sep 17 00:00:00 2001 From: narendrabandhamneni-wt-egov Date: Tue, 2 Jun 2020 13:41:09 +0530 Subject: [PATCH 0007/1242] Added config files for pt-registry migration files --- .../assessment-persister-migration-temp.yml | 228 ++++++++++ .../migration-batch-count-persister.yml | 27 ++ ...roperty-services-migration-temp-config.yml | 400 ++++++++++++++++++ 3 files changed, 655 insertions(+) create mode 100644 configs/egov-persister/assessment-persister-migration-temp.yml create mode 100644 configs/egov-persister/migration-batch-count-persister.yml create mode 100644 configs/egov-persister/property-services-migration-temp-config.yml diff --git a/configs/egov-persister/assessment-persister-migration-temp.yml b/configs/egov-persister/assessment-persister-migration-temp.yml new file mode 100644 index 00000000..26cb84ed --- /dev/null +++ b/configs/egov-persister/assessment-persister-migration-temp.yml @@ -0,0 +1,228 @@ +serviceMaps: + serviceName: property-services + mappings: + - version: 1.0 + description: Persists assessment details to eg_pt_asmt_assessment table + fromTopic: save-pt-assessment-batch + isTransaction: true + queryMaps: + + - query: INSERT INTO eg_pt_asmt_assessment(id, tenantid, assessmentnumber, financialyear, propertyid, status, source, channel, assessmentdate, additionaldetails, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: Assessment + jsonMaps: + + - jsonPath: $.Assessment.id + + - jsonPath: $.Assessment.tenantId + + - jsonPath: $.Assessment.assessmentNumber + + - jsonPath: $.Assessment.financialYear + + - jsonPath: $.Assessment.propertyId + + - jsonPath: $.Assessment.status + + - jsonPath: $.Assessment.source + + - jsonPath: $.Assessment.channel + + - jsonPath: $.Assessment.assessmentDate + + - jsonPath: $.Assessment.additionalDetails + type: JSON + dbType: JSONB + + - jsonPath: $.Assessment.auditDetails.createdBy + + - jsonPath: $.Assessment.auditDetails.createdTime + + - jsonPath: $.Assessment.auditDetails.lastModifiedBy + + - jsonPath: $.Assessment.auditDetails.lastModifiedTime + + + + - query: INSERT INTO eg_pt_asmt_unitusage (tenantid, id, assessmentid, unitid, usagecategory, occupancytype, occupancydate, active, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: Assessment.unitUsageList.* + jsonMaps: + + - jsonPath: $.Assessment.unitUsageList.*.tenantId + + - jsonPath: $.Assessment.unitUsageList.*.id + + - jsonPath: $.Assessment[?({id} in @.unitUsageList[*].id)].id + + - jsonPath: $.Assessment.unitUsageList.*.unitId + + - jsonPath: $.Assessment.unitUsageList.*.usageCategory + + - jsonPath: $.Assessment.unitUsageList.*.occupancyType + + - jsonPath: $.Assessment.unitUsageList.*.occupancyDate + + - jsonPath: $.Assessment.unitUsageList.*.active + + - jsonPath: $.Assessment.unitUsageList.*.auditDetails.createdBy + + - jsonPath: $.Assessment.unitUsageList.*.auditDetails.createdTime + + - jsonPath: $.Assessment.unitUsageList.*.auditDetails.lastModifiedBy + + - jsonPath: $.Assessment.unitUsageList.*.auditDetails.lastModifiedTime + + + + - query: INSERT INTO eg_pt_asmt_document (id, tenantid, entityid, documenttype, filestoreid, documentuid, status, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: $.Assessment.documents.* + jsonMaps: + + - jsonPath: $.Assessment.documents.*.id + + - jsonPath: $.Assessment.tenantId + + - jsonPath: $.Assessment.id + + - jsonPath: $.Assessment.documents.*.documentType + + - jsonPath: $.Assessment.documents.*.fileStoreId + + - jsonPath: $.Assessment.documents.*.documentUid + + - jsonPath: $.Assessment.documents.*.status + + - jsonPath: $.Assessment.documents.*.auditDetails.createdBy + + - jsonPath: $.Assessment.documents.*.auditDetails.lastModifiedBy + + - jsonPath: $.Assessment.documents.*.auditDetails.createdTime + + - jsonPath: $.Assessment.documents.*.auditDetails.lastModifiedTime + + + + - version: 1.0 + description: Updates assessment details to eg_pt_asmt_assessment table + fromTopic: update-pt-assessment + isTransaction: true + queryMaps: + + - query: INSERT INTO eg_pt_asmt_assessment_audit SELECT *, (SELECT extract(epoch from now())) FROM eg_pt_asmt_assessment WHERE id = ?; + basePath: Assessment + jsonMaps: + + - jsonPath: $.Assessment.id + + + - query: INSERT INTO eg_pt_asmt_unitusage_audit SELECT *, (SELECT extract(epoch from now())) FROM eg_pt_asmt_unitusage WHERE id = ?; + basePath: Assessment.unitUsageList.* + jsonMaps: + + - jsonPath: $.Assessment.unitUsageList.*.id + + + - query: UPDATE eg_pt_asmt_assessment SET financialyear = ?, status = ?, source = ?, assessmentDate = ?, additionaldetails = ?, lastmodifiedby = ?, lastmodifiedtime = ? WHERE id = ?; + basePath: Assessment + jsonMaps: + + - jsonPath: $.Assessment.financialYear + + - jsonPath: $.Assessment.status + + - jsonPath: $.Assessment.source + + - jsonPath: $.Assessment.assessmentDate + + - jsonPath: $.Assessment.additionalDetails + type: JSON + dbType: JSONB + + - jsonPath: $.Assessment.auditDetails.lastModifiedBy + + - jsonPath: $.Assessment.auditDetails.lastModifiedTime + + - jsonPath: $.Assessment.id + + + + + - query: INSERT INTO eg_pt_asmt_unitusage (tenantid, id, assessmentId, unitid, usageCategory, occupancyType, occupancyDate, active, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET usageCategory = ?, occupancyType = ?, occupancyDate = ?, active = ?, lastmodifiedby = ?, lastmodifiedtime = ?; + basePath: Assessment.unitUsageList.* + jsonMaps: + + - jsonPath: $.Assessment.unitUsageList.*.tenantId + + - jsonPath: $.Assessment.unitUsageList.*.id + + - jsonPath: $.Assessment[?({id} in @.unitUsageList[*].id)].id + + - jsonPath: $.Assessment.unitUsageList.*.unitId + + - jsonPath: $.Assessment.unitUsageList.*.usageCategory + + - jsonPath: $.Assessment.unitUsageList.*.occupancyType + + - jsonPath: $.Assessment.unitUsageList.*.occupancyDate + + - jsonPath: $.Assessment.unitUsageList.*.active + + - jsonPath: $.Assessment.unitUsageList.*.auditDetails.createdBy + + - jsonPath: $.Assessment.unitUsageList.*.auditDetails.createdTime + + - jsonPath: $.Assessment.unitUsageList.*.auditDetails.lastModifiedBy + + - jsonPath: $.Assessment.unitUsageList.*.auditDetails.lastModifiedTime + + - jsonPath: $.Assessment.unitUsageList.*.usageCategory + + - jsonPath: $.Assessment.unitUsageList.*.occupancyType + + - jsonPath: $.Assessment.unitUsageList.*.occupancyDate + + - jsonPath: $.Assessment.unitUsageList.*.active + + - jsonPath: $.Assessment.unitUsageList.*.auditDetails.lastModifiedBy + + - jsonPath: $.Assessment.unitUsageList.*.auditDetails.lastModifiedTime + + + + + - query: INSERT INTO eg_pt_asmt_document (id, tenantid, entityid, documenttype, filestoreid, documentuid, status, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE documenttype = ?, documentuid = ?, status = ?, lastmodifiedby = ?, lastmodifiedtime = ?; + basePath: $.Assessment.documents.* + jsonMaps: + + - jsonPath: $.Assessment.documents.*.id + + - jsonPath: $.Assessment.tenantId + + - jsonPath: $.Assessment.id + + - jsonPath: $.Assessment.documents.*.documentType + + - jsonPath: $.Assessment.documents.*.fileStoreId + + - jsonPath: $.Assessment.documents.*.documentUid + + - jsonPath: $.Assessment.documents.*.status + + - jsonPath: $.Assessment.documents.*.auditDetails.createdBy + + - jsonPath: $.Assessment.documents.*.auditDetails.lastModifiedBy + + - jsonPath: $.Assessment.documents.*.auditDetails.createdTime + + - jsonPath: $.Assessment.documents.*.auditDetails.lastModifiedTime + + - jsonPath: $.Assessment.documents.*.documentType + + - jsonPath: $.Assessment.documents.*.documentUid + + - jsonPath: $.Assessment.documents.*.status + + - jsonPath: $.Assessment.documents.*.auditDetails.lastModifiedBy + + - jsonPath: $.Assessment.documents.*.auditDetails.lastModifiedTime + + diff --git a/configs/egov-persister/migration-batch-count-persister.yml b/configs/egov-persister/migration-batch-count-persister.yml new file mode 100644 index 00000000..46295c65 --- /dev/null +++ b/configs/egov-persister/migration-batch-count-persister.yml @@ -0,0 +1,27 @@ +serviceMaps: + serviceName: property-services + mappings: + - version: 1.0 + description: Persists property details in EG_PT_PROPERTY table + fromTopic: migartion-batch-count + isTransaction: true + queryMaps: + + + - query: INSERT INTO eg_pt_property_migration (id,batch,batchsize,createdtime,tenantid,recordCount) VALUES (?,?,?,?,?,?); + basePath: MigrationCount + jsonMaps: + + - jsonPath: $.MigrationCount.id + + - jsonPath: $.MigrationCount.offset + + - jsonPath: $.MigrationCount.limit + + - jsonPath: $.MigrationCount.createdTime + + - jsonPath: $.MigrationCount.tenantid + + - jsonPath: $.MigrationCount.recordCount + + \ No newline at end of file diff --git a/configs/egov-persister/property-services-migration-temp-config.yml b/configs/egov-persister/property-services-migration-temp-config.yml new file mode 100644 index 00000000..a4e65f92 --- /dev/null +++ b/configs/egov-persister/property-services-migration-temp-config.yml @@ -0,0 +1,400 @@ +serviceMaps: + serviceName: property-services + mappings: + - version: 1.0 + description: Persists property details in EG_PT_PROPERTY table + fromTopic: save-property-registry-batch + isTransaction: true + queryMaps: + + + - query: INSERT INTO eg_pt_property_audit (audituuid, propertyid, property, auditcreatedtime) VALUES ((select nextval('seq_eg_pt_registry_audit')), ?, ?, (SELECT extract(epoch from now()))); + basePath: Property + jsonMaps: + + - jsonPath: $.Property.propertyId + + - jsonPath: $.Property + type: JSON + dbType: JSONB + + - query: INSERT INTO eg_pt_property (id, propertyid, tenantid, surveyid, accountid, oldpropertyid, status, acknowldgementnumber, propertytype, ownershipcategory, usagecategory, creationreason, nooffloors, landarea, superbuiltuparea, source, channel, createdby, createdtime, lastmodifiedby, lastmodifiedtime, additionaldetails) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT(id) DO NOTHING; + basePath: Property + jsonMaps: + + - jsonPath: $.Property.id + + - jsonPath: $.Property.propertyId + + - jsonPath: $.Property.tenantId + + - jsonPath: $.Property.surveyId + + - jsonPath: $.Property.accountId + + - jsonPath: $.Property.oldPropertyId + + - jsonPath: $.Property.status + + - jsonPath: $.Property.acknowldgementNumber + + - jsonPath: $.Property.propertyType + + - jsonPath: $.Property.ownershipCategory + + - jsonPath: $.Property.usageCategory + + - jsonPath: $.Property.creationReason + + - jsonPath: $.Property.noOfFloors + + - jsonPath: $.Property.landArea + + - jsonPath: $.Property.superBuiltUpArea + + - jsonPath: $.Property.source + + - jsonPath: $.Property.channel + + - jsonPath: $.Property.auditDetails.createdBy + + - jsonPath: $.Property.auditDetails.createdTime + + - jsonPath: $.Property.auditDetails.lastModifiedBy + + - jsonPath: $.Property.auditDetails.lastModifiedTime + + - jsonPath: $.Property.additionalDetails + type: JSON + dbType: JSONB + + - query: INSERT INTO eg_pt_address(tenantid, id, propertyid, doorno, plotno, buildingname, street, landmark, city, pincode, locality, district, region, state, country, latitude, longitude, createdby, createdtime, lastmodifiedby, lastmodifiedtime, additionaldetails) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT(id) DO NOTHING; + basePath: Property.address + jsonMaps: + + - jsonPath: $.Property.address.tenantId + + - jsonPath: $.Property.address.id + + - jsonPath: $.Property.id + + - jsonPath: $.Property.address.doorNo + + - jsonPath: $.Property.address.plotNo + + - jsonPath: $.Property.address.buildingName + + - jsonPath: $.Property.address.street + + - jsonPath: $.Property.address.landmark + + - jsonPath: $.Property.address.city + + - jsonPath: $.Property.address.pincode + + - jsonPath: $.Property.address.locality.code + + - jsonPath: $.Property.address.district + + - jsonPath: $.Property.address.region + + - jsonPath: $.Property.address.state + + - jsonPath: $.Property.address.country + + - jsonPath: $.Property.address.geoLocation.latitude + + - jsonPath: $.Property.address.geoLocation.longitude + + - jsonPath: $.Property.auditDetails.createdBy + + - jsonPath: $.Property.auditDetails.createdTime + + - jsonPath: $.Property.auditDetails.lastModifiedBy + + - jsonPath: $.Property.auditDetails.lastModifiedTime + + - jsonPath: $.Property.address.additionalDetails + type: JSON + dbType: JSONB + + + - query: INSERT INTO eg_pt_unit(id, tenantid, propertyid, floorno, unittype, usagecategory, occupancytype, occupancydate, carpetarea, builtuparea, plintharea, superbuiltuparea, arv, constructiontype, constructiondate, dimensions, active, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT(id) DO NOTHING; + basePath: Property.units.* + jsonMaps: + + - jsonPath: $.Property.units.*.id + + - jsonPath: $.Property.tenantId + + - jsonPath: $.Property.id + + - jsonPath: $.Property.units.*.floorNo + + - jsonPath: $.Property.units.*.unitType + + - jsonPath: $.Property.units.*.usageCategory + + - jsonPath: $.Property.units.*.occupancyType + + - jsonPath: $.Property.units.*.occupancyDate + + - jsonPath: $.Property.units.*.constructionDetail.carpetArea + + - jsonPath: $.Property.units.*.constructionDetail.builtUpArea + + - jsonPath: $.Property.units.*.constructionDetail.plinthArea + + - jsonPath: $.Property.units.*.constructionDetail.superBuiltUpArea + + - jsonPath: $.Property.units.*.arv + + - jsonPath: $.Property.units.*.constructionDetail.constructionType + + - jsonPath: $.Property.units.*.constructionDetail.constructionDate + + - jsonPath: $.Property.units.*.constructionDetail.dimensions + type: JSON + dbType: JSONB + + - jsonPath: $.Property.units.*.active + + - jsonPath: $.Property.auditDetails.createdBy + + - jsonPath: $.Property.auditDetails.createdTime + + - jsonPath: $.Property.auditDetails.lastModifiedBy + + - jsonPath: $.Property.auditDetails.lastModifiedTime + + - query: UPDATE eg_pt_property SET propertyid=?, surveyid=?, accountid=?, oldpropertyid=?, status=?, propertytype=?, ownershipcategory=?, usagecategory=?, nooffloors=?, landarea=?, superbuiltuparea=?, lastmodifiedby=?, lastmodifiedtime=?, additionaldetails=? WHERE Id=? AND tenantId=?; + basePath: Property + jsonMaps: + + - jsonPath: $.Property.propertyId + + - jsonPath: $.Property.surveyId + + - jsonPath: $.Property.accountId + + - jsonPath: $.Property.oldPropertyId + + - jsonPath: $.Property.status + + - jsonPath: $.Property.propertyType + + - jsonPath: $.Property.ownershipCategory + + - jsonPath: $.Property.usageCategory + + - jsonPath: $.Property.noOfFloors + + - jsonPath: $.Property.landArea + + - jsonPath: $.Property.superBuiltUpArea + + - jsonPath: $.Property.auditDetails.lastModifiedBy + + - jsonPath: $.Property.auditDetails.lastModifiedTime + + - jsonPath: $.Property.additionalDetails + type: JSON + dbType: JSONB + + - jsonPath: $.Property.id + + - jsonPath: $.Property.tenantId + + + - query: INSERT INTO eg_pt_owner (ownerinfouuid, tenantid, propertyid, userid, status, isprimaryowner, ownertype, ownershippercentage, institutionid, relationship, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (userid, propertyid) DO UPDATE SET status=EXCLUDED.status, isprimaryowner=EXCLUDED.isprimaryowner, ownertype=EXCLUDED.ownertype, ownershippercentage=EXCLUDED.ownershippercentage, institutionid=EXCLUDED.institutionid, relationship=EXCLUDED.relationship, lastmodifiedby=EXCLUDED.lastModifiedby, lastmodifiedtime=EXCLUDED.lastmodifiedtime; + basePath: Property.owners.* + jsonMaps: + + - jsonPath: $.Property.owners.*.ownerInfoUuid + + - jsonPath: $.Property.tenantId + + - jsonPath: $.Property.id + + - jsonPath: $.Property.owners.*.uuid + + - jsonPath: $.Property.owners.*.status + + - jsonPath: $.Property.owners.*.isPrimaryOwner + + - jsonPath: $.Property.owners.*.ownerType + + - jsonPath: $.Property.owners.*.ownerShipPercentage + + - jsonPath: $.Property.owners.*.institutionId + + - jsonPath: $.Property.owners.*.relationship + + - jsonPath: $.Property.auditDetails.createdBy + + - jsonPath: $.Property.auditDetails.createdTime + + - jsonPath: $.Property.auditDetails.lastModifiedBy + + - jsonPath: $.Property.auditDetails.lastModifiedTime + + - query: INSERT INTO eg_pt_document (id, tenantid, entityid, documenttype, filestoreid, documentuid, status, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET documenttype = EXCLUDED.documenttype,fileStoreid = EXCLUDED.filestoreid, documentuid=EXCLUDED.documentuid, status=EXCLUDED.status, lastmodifiedby = EXCLUDED.lastModifiedby, lastmodifiedtime = EXCLUDED.lastmodifiedtime; + basePath: $.Property.documents.* + jsonMaps: + + - jsonPath: $.Property.documents.*.id + + - jsonPath: $.Property.tenantId + + - jsonPath: $.Property.id + + - jsonPath: $.Property.documents.*.documentType + + - jsonPath: $.Property.documents.*.fileStoreId + + - jsonPath: $.Property.documents.*.documentUid + + - jsonPath: $.Property.documents.*.status + + - jsonPath: $.Property.auditDetails.createdBy + + - jsonPath: $.Property.auditDetails.lastModifiedBy + + - jsonPath: $.Property.auditDetails.createdTime + + - jsonPath: $.Property.auditDetails.lastModifiedTime + + - query: INSERT INTO eg_pt_document (id, tenantid, entityid, documenttype, filestoreid, documentuid, status, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET documenttype = EXCLUDED.documenttype,fileStoreid = EXCLUDED.filestoreid, documentuid=EXCLUDED.documentuid, status=EXCLUDED.status, lastmodifiedby = EXCLUDED.lastModifiedby, lastmodifiedtime = EXCLUDED.lastmodifiedtime; + basePath: $.Property.owners.*.documents.* + jsonMaps: + + - jsonPath: $.Property.owners.*.documents.*.id + + - jsonPath: $.Property.tenantId + + - jsonPath: $.Property.owners[*][?({id} in @.documents[*].id)].ownerInfoUuid + + - jsonPath: $.Property.owners.*.documents.*.documentType + + - jsonPath: $.Property.owners.*.documents.*.fileStoreId + + - jsonPath: $.Property.owners.*.documents.*.documentUid + + - jsonPath: $.Property.owners.*.documents.*.status + + - jsonPath: $.Property.auditDetails.createdBy + + - jsonPath: $.Property.auditDetails.lastModifiedBy + + - jsonPath: $.Property.auditDetails.createdTime + + - jsonPath: $.Property.auditDetails.lastModifiedTime + + - query: UPDATE eg_pt_address SET doorno=?, plotno=?, buildingname=?, street=?, landmark=?, city=?, pincode=?, locality=?, district=?, region=?, state=?, country=?, latitude=?, longitude=?, lastmodifiedby=?, lastmodifiedtime=?, additionaldetails=? WHERE id=?; + basePath: Property.address + jsonMaps: + + - jsonPath: $.Property.address.doorNo + + - jsonPath: $.Property.address.plotNo + + - jsonPath: $.Property.address.buildingName + + - jsonPath: $.Property.address.street + + - jsonPath: $.Property.address.landmark + + - jsonPath: $.Property.address.city + + - jsonPath: $.Property.address.pincode + + - jsonPath: $.Property.address.locality.code + + - jsonPath: $.Property.address.district + + - jsonPath: $.Property.address.region + + - jsonPath: $.Property.address.state + + - jsonPath: $.Property.address.country + + - jsonPath: $.Property.address.geoLocation.latitude + + - jsonPath: $.Property.address.geoLocation.longitude + + - jsonPath: $.Property.auditDetails.lastModifiedBy + + - jsonPath: $.Property.auditDetails.lastModifiedTime + + - jsonPath: $.Property.address.additionalDetails + type: JSON + dbType: JSONB + + - jsonPath: $.Property.address.id + + - query: INSERT INTO eg_pt_institution (id, propertyid, tenantid, name, nameofauthorizedperson, type, designation, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET name=EXCLUDED.name, type=EXCLUDED.type, designation=EXCLUDED.designation, lastmodifiedby=EXCLUDED.lastModifiedby, lastmodifiedtime=EXCLUDED.lastmodifiedtime; + basePath: $.Property.institution + jsonMaps: + + - jsonPath: $.Property.institution.id + + - jsonPath: $.Property.id + + - jsonPath: $.Property.tenantId + + - jsonPath: $.Property.institution.name + + - jsonPath: $.Property.institution.nameOfAuthorizedPerson + + - jsonPath: $.Property.institution.type + + - jsonPath: $.Property.institution.designation + + - jsonPath: $.Property.auditDetails.createdBy + + - jsonPath: $.Property.auditDetails.createdTime + + - jsonPath: $.Property.auditDetails.lastModifiedBy + + - jsonPath: $.Property.auditDetails.lastModifiedTime + + + - query: UPDATE eg_pt_unit SET floorno=?, unittype=?, usagecategory=?, occupancytype=?, occupancydate=?, carpetarea=?, builtuparea=?, plintharea=?, superbuiltuparea=?, arv=?, constructiontype=?, constructiondate=?, dimensions=?, active=?, lastmodifiedby=?, lastmodifiedtime=? WHERE id=?; + basePath: Property.units.* + jsonMaps: + + - jsonPath: $.Property.units.*.floorNo + + - jsonPath: $.Property.units.*.unitType + + - jsonPath: $.Property.units.*.usageCategory + + - jsonPath: $.Property.units.*.occupancyType + + - jsonPath: $.Property.units.*.occupancyDate + + - jsonPath: $.Property.units.*.constructionDetail.carpetArea + + - jsonPath: $.Property.units.*.constructionDetail.builtUpArea + + - jsonPath: $.Property.units.*.constructionDetail.plinthArea + + - jsonPath: $.Property.units.*.constructionDetail.superBuiltUpArea + + - jsonPath: $.Property.units.*.arv + + - jsonPath: $.Property.units.*.constructionDetail.constructionType + + - jsonPath: $.Property.units.*.constructionDetail.constructionDate + + - jsonPath: $.Property.units.*.constructionDetail.dimensions + type: JSON + dbType: JSONB + + - jsonPath: $.Property.units.*.active + + - jsonPath: $.Property.auditDetails.lastModifiedBy + + - jsonPath: $.Property.auditDetails.lastModifiedTime + + - jsonPath: $.Property.units.*.id From eca56c8955ec801496cd14258a7f042ae21d6844 Mon Sep 17 00:00:00 2001 From: narendrabandhamneni-wt-egov Date: Wed, 3 Jun 2020 14:09:05 +0530 Subject: [PATCH 0008/1242] count change for digit upgrade --- configs/egov-searcher/rainmaker-pgr-v2-searcher.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-searcher/rainmaker-pgr-v2-searcher.yml b/configs/egov-searcher/rainmaker-pgr-v2-searcher.yml index 1e49ae91..252cd0bc 100644 --- a/configs/egov-searcher/rainmaker-pgr-v2-searcher.yml +++ b/configs/egov-searcher/rainmaker-pgr-v2-searcher.yml @@ -83,7 +83,7 @@ SearchDefinitions: - name: count query: - baseQuery: select array_to_json(array_agg(row_to_json(services))) from (select (row_to_json(services)) from ( select count(*) from eg_pgr_service $where) as services) services + baseQuery: select (row_to_json(services)) from ( select count(*) from eg_pgr_service $where) as services groupBy: orderBy: searchParams: From d0b415b3650413d7b8cf2a7a4fa8612cd3e559d0 Mon Sep 17 00:00:00 2001 From: karthik-egov-tarento Date: Thu, 4 Jun 2020 15:33:54 +0530 Subject: [PATCH 0009/1242] W&S module configs updated --- configs/egov-indexer/sewerage-service.yml | 2 +- configs/egov-indexer/water-service.yml | 4 +- configs/egov-indexer/water-services-meter.yml | 1 - configs/egov-persister/sewerage-persist.yml | 152 ++- configs/egov-persister/water-meter.yml | 15 +- configs/egov-persister/water-persist.yml | 148 +-- configs/egov-searcher/bill-genie.yml | 196 ++-- configs/egov-searcher/localitySearcher.yml | 57 +- .../data-config/ws-applicationsewerage.json | 21 +- .../data-config/ws-applicationwater.json | 17 +- .../ws-consolidatedacknowlegment.json | 6 +- .../ws-consolidatedsewerageconnection.json | 6 +- .../data-config/ws-estimationnotice.json | 2 +- .../data-config/ws-onetime-receipt.json | 2 +- .../data-config/ws-sanctionletter-old.json | 672 ----------- .../data-config/ws-sanctionletter.json | 86 +- .../format-config/ws-applicationsewerage.json | 4 +- .../format-config/ws-applicationwater.json | 4 +- .../ws-consolidatedacknowlegment.json | 2 +- .../ws-consolidatedsewerageconnection.json | 2 +- .../format-config/ws-estimationnotice.json | 2 +- .../format-config/ws-onetime-receipt.json | 2 +- .../format-config/ws-sanctionletter-old.json | 1034 ----------------- .../format-config/ws-sanctionletter.json | 12 +- 24 files changed, 454 insertions(+), 1995 deletions(-) delete mode 100644 configs/pdf-service/data-config/ws-sanctionletter-old.json delete mode 100644 configs/pdf-service/format-config/ws-sanctionletter-old.json diff --git a/configs/egov-indexer/sewerage-service.yml b/configs/egov-indexer/sewerage-service.yml index 878ae616..246dd2f9 100644 --- a/configs/egov-indexer/sewerage-service.yml +++ b/configs/egov-indexer/sewerage-service.yml @@ -196,4 +196,4 @@ ServiceMaps: apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} uriResponseMapping: - inJsonPath: $.ProcessInstances - outJsonPath: $.Data.history + outJsonPath: $.Data.history diff --git a/configs/egov-indexer/water-service.yml b/configs/egov-indexer/water-service.yml index 63835bd3..d2be3f51 100644 --- a/configs/egov-indexer/water-service.yml +++ b/configs/egov-indexer/water-service.yml @@ -74,7 +74,7 @@ ServiceMaps: uriResponseMapping: - inJsonPath: $.ProcessInstances outJsonPath: $.Data.history - + - topic: update-ws-connection configKey: INDEX @@ -148,7 +148,7 @@ ServiceMaps: uriResponseMapping: - inJsonPath: $.ProcessInstances outJsonPath: $.Data.history - + - topic: update-ws-workflow configKey: INDEX indexes: diff --git a/configs/egov-indexer/water-services-meter.yml b/configs/egov-indexer/water-services-meter.yml index b669b121..dd17bf31 100644 --- a/configs/egov-indexer/water-services-meter.yml +++ b/configs/egov-indexer/water-services-meter.yml @@ -26,4 +26,3 @@ ServiceMaps: outJsonPath: $.Data.billingPeriod - inJsonPath: $.lastReadingDate outJsonPath: $.Data.lastReadingDate - diff --git a/configs/egov-persister/sewerage-persist.yml b/configs/egov-persister/sewerage-persist.yml index af65cff6..1cab6be3 100644 --- a/configs/egov-persister/sewerage-persist.yml +++ b/configs/egov-persister/sewerage-persist.yml @@ -6,18 +6,18 @@ serviceMaps: description: create ConnectionDetails in connection and eg_sw_service fromTopic: save-sw-connection isTransaction: true - queryMaps: - - query: INSERT INTO eg_sw_connection (id, tenantid, property_id, applicationno, applicationstatus, status, connectionno, oldconnectionno,roadcuttingarea,action,roadtype) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?,?,?); + queryMaps: + - query: INSERT INTO eg_sw_connection (id, tenantid, property_id, applicationno, applicationstatus, status, connectionno, oldconnectionno,roadcuttingarea,action,roadtype, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?,?,?,?,?,?,?); basePath: $.SewerageConnection jsonMaps: - - jsonPath: $.SewerageConnection.id - - - jsonPath: $.SewerageConnection.property.tenantId - - - jsonPath: $.SewerageConnection.property.propertyId + - jsonPath: $.SewerageConnection.id + + - jsonPath: $.SewerageConnection.tenantId + + - jsonPath: $.SewerageConnection.propertyId - jsonPath: $.SewerageConnection.applicationNo - + - jsonPath: $.SewerageConnection.applicationStatus - jsonPath: $.SewerageConnection.status @@ -30,9 +30,17 @@ serviceMaps: - jsonPath: $.SewerageConnection.processInstance.action - - jsonPath: $.SewerageConnection.roadType + - jsonPath: $.SewerageConnection.roadType + + - jsonPath: $.SewerageConnection.auditDetails.createdBy + + - jsonPath: $.SewerageConnection.auditDetails.lastModifiedBy - - query: INSERT INTO eg_sw_service(connection_id,connectionExecutionDate,noOfWaterClosets,noOfToilets,connectiontype,proposedWaterClosets,proposedToilets, appCreatedDate) VALUES(?,?,?,?,?,?,?, ?); + - jsonPath: $.SewerageConnection.auditDetails.createdTime + + - jsonPath: $.SewerageConnection.auditDetails.lastModifiedTime + + - query: INSERT INTO eg_sw_service(connection_id,connectionExecutionDate,noOfWaterClosets,noOfToilets,connectiontype,proposedWaterClosets,proposedToilets, appCreatedDate, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES(?,?,?,?,?,?,?,?,?,?,?,?); basePath: $.SewerageConnection jsonMaps: @@ -41,28 +49,36 @@ serviceMaps: - jsonPath: $.SewerageConnection.connectionExecutionDate - jsonPath: $.SewerageConnection.noOfWaterClosets - + - jsonPath: $.SewerageConnection.noOfToilets - + - jsonPath: $.SewerageConnection.connectionType - + - jsonPath: $.SewerageConnection.proposedWaterClosets - + - jsonPath: $.SewerageConnection.proposedToilets - + - jsonPath: $.SewerageConnection.additionalDetails.appCreatedDate - + + - jsonPath: $.SewerageConnection.auditDetails.createdBy + + - jsonPath: $.SewerageConnection.auditDetails.lastModifiedBy + + - jsonPath: $.SewerageConnection.auditDetails.createdTime + + - jsonPath: $.SewerageConnection.auditDetails.lastModifiedTime + - version: 1.0 name: SewerageConnection description: update ConnectionDetails in connection and eg_sw_service fromTopic: update-sw-connection isTransaction: true - queryMaps: - - query: UPDATE eg_sw_connection SET applicationstatus=?, status=?, connectionno=?, oldconnectionno=?, action=?, roadCuttingArea=?, roadType=?, adhocpenalty=?, adhocrebate=?, adhocpenaltyreason=?, adhocpenaltycomment=?, adhocrebatereason=?, adhocrebatecomment=? WHERE id=?; + queryMaps: + - query: UPDATE eg_sw_connection SET applicationstatus=?, status=?, connectionno=?, oldconnectionno=?, action=?, roadCuttingArea=?, roadType=?, adhocpenalty=?, adhocrebate=?, adhocpenaltyreason=?, adhocpenaltycomment=?, adhocrebatereason=?, adhocrebatecomment=?, lastmodifiedby=?, lastmodifiedtime=? WHERE id=?; basePath: $.SewerageConnection jsonMaps: - + - jsonPath: $.SewerageConnection.applicationStatus - jsonPath: $.SewerageConnection.status @@ -76,53 +92,63 @@ serviceMaps: - jsonPath: $.SewerageConnection.roadCuttingArea - jsonPath: $.SewerageConnection.roadType - - - jsonPath: $.SewerageConnection.additionalDetails.adhocPenalty - - jsonPath: $.SewerageConnection.additionalDetails.adhocRebate - - - jsonPath: $.SewerageConnection.additionalDetails.adhocPenaltyReason + - jsonPath: $.SewerageConnection.additionalDetails.adhocPenalty + + - jsonPath: $.SewerageConnection.additionalDetails.adhocRebate + + - jsonPath: $.SewerageConnection.additionalDetails.adhocPenaltyReason - jsonPath: $.SewerageConnection.additionalDetails.adhocPenaltyComment - - - jsonPath: $.SewerageConnection.additionalDetails.adhocRebateReason - - jsonPath: $.SewerageConnection.additionalDetails.adhocRebateComment + - jsonPath: $.SewerageConnection.additionalDetails.adhocRebateReason + + - jsonPath: $.SewerageConnection.additionalDetails.adhocRebateComment - - jsonPath: $.SewerageConnection.id + - jsonPath: $.SewerageConnection.auditDetails.lastModifiedBy - - query: UPDATE eg_sw_service SET connectionexecutiondate=?, noOfWaterClosets=?, noOfToilets=?, connectiontype=?, proposedWaterClosets=?, proposedToilets=?, detailsprovidedby = ?, estimationfileStoreId = ?, sanctionfileStoreId = ? WHERE connection_id=?; + - jsonPath: $.SewerageConnection.auditDetails.lastModifiedTime + + - jsonPath: $.SewerageConnection.id + + - query: UPDATE eg_sw_service SET connectionexecutiondate=?, noOfWaterClosets=?, noOfToilets=?, connectiontype=?, proposedWaterClosets=?, proposedToilets=?, detailsprovidedby = ?, estimationfileStoreId = ?, sanctionfileStoreId = ?, estimationLetterDate = ?, lastmodifiedby=?, lastmodifiedtime=? WHERE connection_id=?; basePath: $.SewerageConnection jsonMaps: - jsonPath: $.SewerageConnection.connectionExecutionDate - jsonPath: $.SewerageConnection.noOfWaterClosets - + - jsonPath: $.SewerageConnection.noOfToilets - + - jsonPath: $.SewerageConnection.connectionType - + - jsonPath: $.SewerageConnection.proposedWaterClosets - + - jsonPath: $.SewerageConnection.proposedToilets - - - jsonPath: $.SewerageConnection.additionalDetails.detailsProvidedBy - + + - jsonPath: $.SewerageConnection.additionalDetails.detailsProvidedBy + - jsonPath: $.SewerageConnection.additionalDetails.estimationFileStoreId - + - jsonPath: $.SewerageConnection.additionalDetails.sanctionFileStoreId - + + - jsonPath: $.SewerageConnection.additionalDetails.estimationLetterDate + + - jsonPath: $.SewerageConnection.auditDetails.lastModifiedBy + + - jsonPath: $.SewerageConnection.auditDetails.lastModifiedTime + - jsonPath: $.SewerageConnection.id - query: INSERT INTO eg_sw_applicationDocument(id, tenantId, documenttype, filestoreid, swid, active, createdBy, lastModifiedBy, createdTime, lastModifiedTime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET active = ?, documenttype =?, filestoreid =?,lastmodifiedby =?, lastmodifiedtime =?; basePath: $.SewerageConnection.documents.* jsonMaps: - + - jsonPath: $.SewerageConnection.documents.*.id - - jsonPath: $.SewerageConnection.property.tenantId + - jsonPath: $.SewerageConnection.tenantId - jsonPath: $.SewerageConnection.documents.*.documentType @@ -149,13 +175,15 @@ serviceMaps: - jsonPath: $.SewerageConnection.documents.*.auditDetails.lastModifiedBy - jsonPath: $.SewerageConnection.documents.*.auditDetails.lastModifiedTime - - - query: INSERT INTO eg_sw_plumberinfo(id, name, licenseno, mobilenumber, gender, fatherorhusbandname, correspondenceaddress, relationship, swid) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET name =?, licenseno =?,mobilenumber =?, gender =?, fatherorhusbandname =?, correspondenceaddress =?, relationship=?; + + - query: INSERT INTO eg_sw_plumberinfo(id,tenantId, name, licenseno, mobilenumber, gender, fatherorhusbandname, correspondenceaddress, relationship, createdBy, lastModifiedBy, createdTime, lastModifiedTime, swid) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET name =?, licenseno =?,mobilenumber =?, gender =?, fatherorhusbandname =?, correspondenceaddress =?, relationship=?,lastmodifiedby =?, lastmodifiedtime =?; basePath: $.SewerageConnection.plumberInfo.* jsonMaps: - + - jsonPath: $.SewerageConnection.plumberInfo.*.id + - jsonPath: $.SewerageConnection.tenantId + - jsonPath: $.SewerageConnection.plumberInfo.*.name - jsonPath: $.SewerageConnection.plumberInfo.*.licenseNo @@ -169,9 +197,17 @@ serviceMaps: - jsonPath: $.SewerageConnection.plumberInfo.*.correspondenceAddress - jsonPath: $.SewerageConnection.plumberInfo.*.relationship - - - jsonPath: $.SewerageConnection.id - + + - jsonPath: $.SewerageConnection.plumberInfo.*.auditDetails.createdBy + + - jsonPath: $.SewerageConnection.plumberInfo.*.auditDetails.lastModifiedBy + + - jsonPath: $.SewerageConnection.plumberInfo.*.auditDetails.createdTime + + - jsonPath: $.SewerageConnection.plumberInfo.*.auditDetails.lastModifiedTime + + - jsonPath: $.SewerageConnection.id + - jsonPath: $.SewerageConnection.plumberInfo.*.name - jsonPath: $.SewerageConnection.plumberInfo.*.licenseNo @@ -184,9 +220,13 @@ serviceMaps: - jsonPath: $.SewerageConnection.plumberInfo.*.correspondenceAddress - - jsonPath: $.SewerageConnection.plumberInfo.*.relationship - - + - jsonPath: $.SewerageConnection.plumberInfo.*.relationship + + - jsonPath: $.SewerageConnection.plumberInfo.*.auditDetails.lastModifiedBy + + - jsonPath: $.SewerageConnection.plumberInfo.*.auditDetails.lastModifiedTime + + - version: 1.0 name: SewerageConnection @@ -194,10 +234,10 @@ serviceMaps: fromTopic: update-sw-workflow isTransaction: true queryMaps: - - query: UPDATE eg_sw_connection SET applicationstatus=?, status=?, connectionno=?, action=? WHERE id=?; + - query: UPDATE eg_sw_connection SET applicationstatus=?, status=?, connectionno=?, action=?, lastModifiedBy=?, lastModifiedTime=? WHERE id=?; basePath: $.SewerageConnection jsonMaps: - + - jsonPath: $.SewerageConnection.applicationStatus - jsonPath: $.SewerageConnection.status @@ -206,14 +246,18 @@ serviceMaps: - jsonPath: $.SewerageConnection.processInstance.action + - jsonPath: $.SewerageConnection.auditDetails.lastModifiedBy + + - jsonPath: $.SewerageConnection.auditDetails.lastModifiedTime + - jsonPath: $.SewerageConnection.id - + - version: 1.0 name: SewerageConnection description: save filestore ids fromTopic: save-sw-filestoreids isTransaction: true - queryMaps: + queryMaps: - query: UPDATE eg_sw_service SET estimationfileStoreId = ?, sanctionfileStoreId = ? WHERE connection_id=?; basePath: $.SewerageConnection jsonMaps: @@ -222,4 +266,4 @@ serviceMaps: - jsonPath: $.SewerageConnection.additionalDetails.sanctionFileStoreId - - jsonPath: $.SewerageConnection.id + - jsonPath: $.SewerageConnection.id diff --git a/configs/egov-persister/water-meter.yml b/configs/egov-persister/water-meter.yml index 52547b47..776e5703 100644 --- a/configs/egov-persister/water-meter.yml +++ b/configs/egov-persister/water-meter.yml @@ -7,7 +7,7 @@ serviceMaps: fromTopic: save-ws-meter isTransaction: true queryMaps: - - query: INSERT INTO meterreading (id,connectionNo, billingPeriod, meterStatus, lastReading, lastReadingDate, currentReading, currentReadingDate) VALUES (?, ?, ?, ?, ?, ?, ?,?); + - query: INSERT INTO eg_ws_meterreading (id,connectionNo, billingPeriod, meterStatus, lastReading, lastReadingDate, currentReading, currentReadingDate, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?,?,?,?,?,?); basePath: $.meterReadings jsonMaps: - jsonPath: $.meterReadings.id @@ -15,16 +15,21 @@ serviceMaps: - jsonPath: $.meterReadings.connectionNo - jsonPath: $.meterReadings.billingPeriod - + - jsonPath: $.meterReadings.meterStatus - jsonPath: $.meterReadings.lastReading - + - jsonPath: $.meterReadings.lastReadingDate - jsonPath: $.meterReadings.currentReading - jsonPath: $.meterReadings.currentReadingDate - - + - jsonPath: $.meterReadings.auditDetails.createdBy + + - jsonPath: $.meterReadings.auditDetails.lastModifiedBy + + - jsonPath: $.meterReadings.auditDetails.createdTime + + - jsonPath: $.meterReadings.auditDetails.lastModifiedTime diff --git a/configs/egov-persister/water-persist.yml b/configs/egov-persister/water-persist.yml index 69d2a883..10209cb4 100644 --- a/configs/egov-persister/water-persist.yml +++ b/configs/egov-persister/water-persist.yml @@ -6,18 +6,18 @@ serviceMaps: description: create ConnectionDetails in connection and water_service_connection fromTopic: save-ws-connection isTransaction: true - queryMaps: - - query: INSERT INTO connection (id, tenantid, property_id, applicationno, applicationstatus, status, connectionno, oldconnectionno,roadcuttingarea,action,roadtype) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?,?,?); + queryMaps: + - query: INSERT INTO eg_ws_connection (id, tenantid, property_id, applicationno, applicationstatus, status, connectionno, oldconnectionno,roadcuttingarea,action,roadtype, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?,?,?,?,?,?,?); basePath: $.WaterConnection jsonMaps: - - jsonPath: $.WaterConnection.id + - jsonPath: $.WaterConnection.id + + - jsonPath: $.WaterConnection.tenantId - - jsonPath: $.WaterConnection.property.tenantId - - - jsonPath: $.WaterConnection.property.propertyId + - jsonPath: $.WaterConnection.propertyId - jsonPath: $.WaterConnection.applicationNo - + - jsonPath: $.WaterConnection.applicationStatus - jsonPath: $.WaterConnection.status @@ -25,56 +25,59 @@ serviceMaps: - jsonPath: $.WaterConnection.connectionNo - jsonPath: $.WaterConnection.oldConnectionNo - + - jsonPath: $.WaterConnection.roadCuttingArea - jsonPath: $.WaterConnection.processInstance.action - jsonPath: $.WaterConnection.roadType - - - query: INSERT INTO water_service_connection(connection_id,connectionCategory,rainWaterHarvesting,connectionType,waterSource,meterId,meterInstallationDate,pipeSize,noOfTaps,connectionexecutiondate,proposedPipeSize,proposedTaps, appCreatedDate) VALUES(?,?,?,?,?,?,?,?,?,?,?,?, ?); + - jsonPath: $.WaterConnection.auditDetails.createdBy + + - jsonPath: $.WaterConnection.auditDetails.lastModifiedBy + + - jsonPath: $.WaterConnection.auditDetails.createdTime + + - jsonPath: $.WaterConnection.auditDetails.lastModifiedTime + + + - query: INSERT INTO eg_ws_service(connection_id,connectionCategory,connectionType,waterSource,meterId,meterInstallationDate,pipeSize,noOfTaps,connectionexecutiondate,proposedPipeSize,proposedTaps, appCreatedDate) VALUES(?,?,?,?,?,?,?,?,?,?,?, ?); basePath: $.WaterConnection jsonMaps: - jsonPath: $.WaterConnection.id - jsonPath: $.WaterConnection.connectionCategory - - - jsonPath: $.WaterConnection.rainWaterHarvesting - type: BOOLEAN - dbType: BOOLEAN - - jsonPath: $.WaterConnection.connectionType - + - jsonPath: $.WaterConnection.waterSource - + - jsonPath: $.WaterConnection.meterId - + - jsonPath: $.WaterConnection.meterInstallationDate - jsonPath: $.WaterConnection.pipeSize - jsonPath: $.WaterConnection.noOfTaps - + - jsonPath: $.WaterConnection.connectionExecutionDate - + - jsonPath: $.WaterConnection.proposedPipeSize - + - jsonPath: $.WaterConnection.proposedTaps - + - jsonPath: $.WaterConnection.additionalDetails.appCreatedDate - - - + + + - version: 1.0 name: WaterConnection - description: update ConnectionDetails in connection and water_service_connection + description: update ConnectionDetails in eg_ws_connection and eg_ws_service fromTopic: update-ws-connection isTransaction: true - queryMaps: - - query: UPDATE connection SET applicationstatus=?, status=?, connectionno=?, oldconnectionno=?, action=?, roadCuttingArea=?, roadType=?, adhocpenalty=?, adhocrebate=?, adhocpenaltyreason=?, adhocpenaltycomment=?, adhocrebatereason=?, adhocrebatecomment=? WHERE id=?; + queryMaps: + - query: UPDATE eg_ws_connection SET applicationstatus=?, status=?, connectionno=?, oldconnectionno=?, action=?, roadCuttingArea=?, roadType=?, adhocpenalty=?, adhocrebate=?, adhocpenaltyreason=?, adhocpenaltycomment=?, adhocrebatereason=?, adhocrebatecomment=?, lastModifiedBy=?, lastModifiedTime=? WHERE id=?; basePath: $.WaterConnection jsonMaps: @@ -91,53 +94,53 @@ serviceMaps: - jsonPath: $.WaterConnection.roadCuttingArea - jsonPath: $.WaterConnection.roadType - - - jsonPath: $.WaterConnection.additionalDetails.adhocPenalty + + - jsonPath: $.WaterConnection.additionalDetails.adhocPenalty - jsonPath: $.WaterConnection.additionalDetails.adhocRebate - - - jsonPath: $.WaterConnection.additionalDetails.adhocPenaltyReason + + - jsonPath: $.WaterConnection.additionalDetails.adhocPenaltyReason - jsonPath: $.WaterConnection.additionalDetails.adhocPenaltyComment - - - jsonPath: $.WaterConnection.additionalDetails.adhocRebateReason + + - jsonPath: $.WaterConnection.additionalDetails.adhocRebateReason - jsonPath: $.WaterConnection.additionalDetails.adhocRebateComment - - - jsonPath: $.WaterConnection.id - - query: UPDATE water_service_connection SET connectionCategory=?,rainWaterHarvesting=?,connectionType=?,waterSource=?,meterId=?,meterInstallationDate=?,pipeSize=?,noOfTaps=?,proposedPipeSize=?,proposedTaps=?, initialmeterreading = ?, connectionexecutiondate = ?, detailsprovidedby = ?, estimationfileStoreId = ?, sanctionfileStoreId = ? WHERE connection_id=?; + - jsonPath: $.WaterConnection.auditDetails.lastModifiedBy + + - jsonPath: $.WaterConnection.auditDetails.lastModifiedTime + + - jsonPath: $.WaterConnection.id + + - query: UPDATE eg_ws_service SET connectionCategory=?,connectionType=?,waterSource=?,meterId=?,meterInstallationDate=?,pipeSize=?,noOfTaps=?,proposedPipeSize=?,proposedTaps=?, initialmeterreading = ?, connectionexecutiondate = ?, detailsprovidedby = ?, estimationfileStoreId = ?, sanctionfileStoreId = ? WHERE connection_id=?; basePath: $.WaterConnection jsonMaps: - + - jsonPath: $.WaterConnection.connectionCategory - - - jsonPath: $.WaterConnection.rainWaterHarvesting - type: BOOLEAN - dbType: BOOLEAN - + - jsonPath: $.WaterConnection.connectionType - + - jsonPath: $.WaterConnection.waterSource - + - jsonPath: $.WaterConnection.meterId - + - jsonPath: $.WaterConnection.meterInstallationDate - jsonPath: $.WaterConnection.pipeSize - jsonPath: $.WaterConnection.noOfTaps - + - jsonPath: $.WaterConnection.proposedPipeSize - + - jsonPath: $.WaterConnection.proposedTaps - + - jsonPath: $.WaterConnection.additionalDetails.initialMeterReading - + - jsonPath: $.WaterConnection.connectionExecutionDate - + - jsonPath: $.WaterConnection.additionalDetails.detailsProvidedBy - + - jsonPath: $.WaterConnection.additionalDetails.estimationFileStoreId - jsonPath: $.WaterConnection.additionalDetails.sanctionFileStoreId @@ -147,10 +150,10 @@ serviceMaps: - query: INSERT INTO eg_ws_applicationDocument(id, tenantId, documenttype, filestoreid, wsid, active, createdBy, lastModifiedBy, createdTime, lastModifiedTime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET active = ?, documenttype =?, filestoreid =?,lastmodifiedby =?, lastmodifiedtime =?; basePath: $.WaterConnection.documents.* jsonMaps: - + - jsonPath: $.WaterConnection.documents.*.id - - jsonPath: $.WaterConnection.property.tenantId + - jsonPath: $.WaterConnection.tenantId - jsonPath: $.WaterConnection.documents.*.documentType @@ -181,7 +184,7 @@ serviceMaps: - query: INSERT INTO eg_ws_plumberinfo(id, name, licenseno, mobilenumber, gender, fatherorhusbandname, correspondenceaddress, relationship, wsid) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET name =?, licenseno =?,mobilenumber =?, gender =?, fatherorhusbandname =?, correspondenceaddress =?, relationship=?; basePath: $.WaterConnection.plumberInfo.* jsonMaps: - + - jsonPath: $.WaterConnection.plumberInfo.*.id - jsonPath: $.WaterConnection.plumberInfo.*.name @@ -197,9 +200,9 @@ serviceMaps: - jsonPath: $.WaterConnection.plumberInfo.*.correspondenceAddress - jsonPath: $.WaterConnection.plumberInfo.*.relationship - - - jsonPath: $.WaterConnection.id - + + - jsonPath: $.WaterConnection.id + - jsonPath: $.WaterConnection.plumberInfo.*.name - jsonPath: $.WaterConnection.plumberInfo.*.licenseNo @@ -213,16 +216,16 @@ serviceMaps: - jsonPath: $.WaterConnection.plumberInfo.*.correspondenceAddress - jsonPath: $.WaterConnection.plumberInfo.*.relationship - + - version: 1.0 name: WaterConnection - description: update ConnectionDetails in connection and water_service_connection + description: update ConnectionDetails in eg_ws_connection and eg_ws_service fromTopic: update-ws-workflow isTransaction: true - queryMaps: - - query: UPDATE connection SET applicationstatus=?, status=?, connectionno=?, action=? WHERE id=?; + queryMaps: + - query: UPDATE eg_ws_connection SET applicationstatus=?, status=?, connectionno=?, action=?, lastModifiedBy=?, lastModifiedTime=? WHERE id=?; basePath: $.WaterConnection jsonMaps: @@ -232,17 +235,21 @@ serviceMaps: - jsonPath: $.WaterConnection.connectionNo - - jsonPath: $.WaterConnection.processInstance.action + - jsonPath: $.WaterConnection.processInstance.action + + - jsonPath: $.WaterConnection.auditDetails.lastModifiedBy + + - jsonPath: $.WaterConnection.auditDetails.lastModifiedTime + + - jsonPath: $.WaterConnection.id - - jsonPath: $.WaterConnection.id - - version: 1.0 name: WaterConnection description: save filestore ids fromTopic: save-ws-filestoreids isTransaction: true - queryMaps: - - query: UPDATE water_service_connection SET estimationfileStoreId = ?, sanctionfileStoreId = ? WHERE connection_id=?; + queryMaps: + - query: UPDATE eg_ws_service SET estimationfileStoreId = ?, sanctionfileStoreId = ? WHERE connection_id=?; basePath: $.WaterConnection jsonMaps: @@ -250,9 +257,4 @@ serviceMaps: - jsonPath: $.WaterConnection.additionalDetails.sanctionFileStoreId - - jsonPath: $.WaterConnection.id - - - - - + - jsonPath: $.WaterConnection.id diff --git a/configs/egov-searcher/bill-genie.yml b/configs/egov-searcher/bill-genie.yml index 331965c2..ed06f02b 100644 --- a/configs/egov-searcher/bill-genie.yml +++ b/configs/egov-searcher/bill-genie.yml @@ -6,47 +6,47 @@ SearchDefinitions: - name: billswithaddranduser isCustomerRowMapEnabled: true rowMapperKey: billsearch - query: - baseQuery: with bill_data as ( + query: + baseQuery: with bill_data as ( - SELECT b.id AS b_id, b.mobilenumber, - b.tenantid AS b_tenantid, b.payername AS b_payername, - b.payeraddress AS b_payeraddress, b.payeremail AS b_payeremail, - b.isactive AS b_isactive, b.iscancelled AS b_iscancelled, + SELECT b.id AS b_id, b.mobilenumber, + b.tenantid AS b_tenantid, b.payername AS b_payername, + b.payeraddress AS b_payeraddress, b.payeremail AS b_payeremail, + b.isactive AS b_isactive, b.iscancelled AS b_iscancelled, b.createdby AS b_createdby, b.status as b_status,b.filestoreid AS b_filestoreid, - b.createddate AS b_createddate, b.lastmodifiedby AS b_lastmodifiedby, - b.lastmodifieddate AS b_lastmodifieddate, bd.id AS bd_id, + b.createddate AS b_createddate, b.lastmodifiedby AS b_lastmodifiedby, + b.lastmodifieddate AS b_lastmodifieddate, bd.id AS bd_id, bd.billid AS bd_billid, bd.tenantid AS bd_tenantid, - bd.businessservice AS bd_businessservice, bd.demandid, - bd.fromperiod, bd.toperiod, - bd.billno AS bd_billno, bd.billdate AS bd_billdate, - bd.consumercode AS bd_consumercode, bd.consumertype AS bd_consumertype, - bd.billdescription AS bd_billdescription, bd.displaymessage AS bd_displaymessage, - bd.minimumamount AS bd_minimumamount, bd.totalamount AS bd_totalamount, - bd.callbackforapportioning AS bd_callbackforapportioning, bd.expirydate AS bd_expirydate, - bd.partpaymentallowed AS bd_partpaymentallowed, bd.isadvanceallowed as bd_isadvanceallowed, - bd.collectionmodesnotallowed AS bd_collectionmodesnotallowed, bd.createddate as bd_createddate, + bd.businessservice AS bd_businessservice, bd.demandid, + bd.fromperiod, bd.toperiod, + bd.billno AS bd_billno, bd.billdate AS bd_billdate, + bd.consumercode AS bd_consumercode, bd.consumertype AS bd_consumertype, + bd.billdescription AS bd_billdescription, bd.displaymessage AS bd_displaymessage, + bd.minimumamount AS bd_minimumamount, bd.totalamount AS bd_totalamount, + bd.callbackforapportioning AS bd_callbackforapportioning, bd.expirydate AS bd_expirydate, + bd.partpaymentallowed AS bd_partpaymentallowed, bd.isadvanceallowed as bd_isadvanceallowed, + bd.collectionmodesnotallowed AS bd_collectionmodesnotallowed, bd.createddate as bd_createddate, b.additionaldetails as b_additionaldetails, bd.additionaldetails as bd_additionaldetails, - ad.id AS ad_id, ad.tenantid AS ad_tenantid, - ad.billdetail AS ad_billdetail, ad.glcode AS ad_glcode, - ad.orderno AS ad_orderno, ad.accountdescription AS ad_accountdescription, - ad.amount AS ad_amount, ad.adjustedamount AS ad_adjustedamount, - ad.taxheadcode AS ad_taxheadcode, ad.demanddetailid, - ad.isactualdemand AS ad_isactualdemand, ad.purpose AS ad_purpose, + ad.id AS ad_id, ad.tenantid AS ad_tenantid, + ad.billdetail AS ad_billdetail, ad.glcode AS ad_glcode, + ad.orderno AS ad_orderno, ad.accountdescription AS ad_accountdescription, + ad.amount AS ad_amount, ad.adjustedamount AS ad_adjustedamount, + ad.taxheadcode AS ad_taxheadcode, ad.demanddetailid, + ad.isactualdemand AS ad_isactualdemand, ad.purpose AS ad_purpose, ad.additionaldetails as ad_additionaldetails, - ptadd.doorNo as ptadd_doorNo,ptadd.landmark as ptadd_landmark, - ptadd.city as ptadd_city, ptadd.pincode as ptadd_pincode, - ptadd.locality as ptadd_locality, ptown.userid as ptown_userid - - FROM egbs_bill_v1 b INNER JOIN egbs_billdetail_v1 bd ON b.id = bd.billid AND b.tenantid = bd.tenantid - INNER JOIN egbs_billaccountdetail_v1 ad ON bd.id = ad.billdetail AND bd.tenantid = ad.tenantid - LEFT OUTER JOIN eg_pt_property pt ON bd.consumercode = pt.propertyid + ptadd.doorNo as ptadd_doorNo,ptadd.landmark as ptadd_landmark, + ptadd.city as ptadd_city, ptadd.pincode as ptadd_pincode, + ptadd.locality as ptadd_locality, ptown.userid as ptown_userid + + FROM egbs_bill_v1 b INNER JOIN egbs_billdetail_v1 bd ON b.id = bd.billid AND b.tenantid = bd.tenantid + INNER JOIN egbs_billaccountdetail_v1 ad ON bd.id = ad.billdetail AND bd.tenantid = ad.tenantid + LEFT OUTER JOIN eg_pt_property pt ON bd.consumercode = pt.propertyid INNER JOIN eg_pt_address ptadd ON ptadd.propertyid = pt.id - INNER JOIN eg_pt_asmt_assessment ptdet ON ptdet.propertyid = pt.propertyid + INNER JOIN eg_pt_asmt_assessment ptdet ON ptdet.propertyid = pt.propertyid INNER JOIN eg_pt_owner ptown ON pt.id = ptown.propertyid $where ) select * from bill_data inner join (select max(b_createddate) as maxcreateddate, bd_consumercode from bill_data group by bd_consumercode) as max ON max.maxcreateddate=b_createddate - searchParams: + searchParams: condition: AND params: - name: b.tenantid @@ -86,51 +86,51 @@ SearchDefinitions: jsonFormat: {"ResponseInfo": {},"Bills": []} outJsonPath: $.Bills responseInfoPath: $.ResponseInfo - + - name: waterbills isCustomerRowMapEnabled: true rowMapperKey: billsearch - query: - baseQuery: with bill_data as ( - SELECT b.id AS b_id, b.mobilenumber, - b.tenantid AS b_tenantid, b.payername AS b_payername, - b.payeraddress AS b_payeraddress, b.payeremail AS b_payeremail, - b.isactive AS b_isactive, b.iscancelled AS b_iscancelled, - b.createdby AS b_createdby, b.status as b_status, - b.createddate AS b_createddate, b.lastmodifiedby AS b_lastmodifiedby, - b.lastmodifieddate AS b_lastmodifieddate, bd.id AS bd_id, + query: + baseQuery: with bill_data as ( + SELECT b.id AS b_id, b.mobilenumber, + b.tenantid AS b_tenantid, b.payername AS b_payername, + b.payeraddress AS b_payeraddress, b.payeremail AS b_payeremail, + b.isactive AS b_isactive, b.iscancelled AS b_iscancelled, + b.createdby AS b_createdby, b.status as b_status, b.filestoreid AS b_filestoreid, + b.createddate AS b_createddate, b.lastmodifiedby AS b_lastmodifiedby, + b.lastmodifieddate AS b_lastmodifieddate, bd.id AS bd_id, bd.billid AS bd_billid, bd.tenantid AS bd_tenantid, - bd.businessservice AS bd_businessservice, bd.demandid, - bd.fromperiod, bd.toperiod, - bd.billno AS bd_billno, bd.billdate AS bd_billdate, - bd.consumercode AS bd_consumercode, bd.consumertype AS bd_consumertype, - bd.billdescription AS bd_billdescription, bd.displaymessage AS bd_displaymessage, - bd.minimumamount AS bd_minimumamount, bd.totalamount AS bd_totalamount, - bd.callbackforapportioning AS bd_callbackforapportioning, bd.expirydate AS bd_expirydate, - bd.partpaymentallowed AS bd_partpaymentallowed, bd.isadvanceallowed as bd_isadvanceallowed, - bd.collectionmodesnotallowed AS bd_collectionmodesnotallowed, bd.createddate as bd_createddate, + bd.businessservice AS bd_businessservice, bd.demandid, + bd.fromperiod, bd.toperiod, + bd.billno AS bd_billno, bd.billdate AS bd_billdate, + bd.consumercode AS bd_consumercode, bd.consumertype AS bd_consumertype, + bd.billdescription AS bd_billdescription, bd.displaymessage AS bd_displaymessage, + bd.minimumamount AS bd_minimumamount, bd.totalamount AS bd_totalamount, + bd.callbackforapportioning AS bd_callbackforapportioning, bd.expirydate AS bd_expirydate, + bd.partpaymentallowed AS bd_partpaymentallowed, bd.isadvanceallowed as bd_isadvanceallowed, + bd.collectionmodesnotallowed AS bd_collectionmodesnotallowed, bd.createddate as bd_createddate, b.additionaldetails as b_additionaldetails, bd.additionaldetails as bd_additionaldetails, - ad.id AS ad_id, ad.tenantid AS ad_tenantid, - ad.billdetail AS ad_billdetail, ad.glcode AS ad_glcode, - ad.orderno AS ad_orderno, ad.accountdescription AS ad_accountdescription, - ad.amount AS ad_amount, ad.adjustedamount AS ad_adjustedamount, - ad.taxheadcode AS ad_taxheadcode, ad.demanddetailid, - ad.isactualdemand AS ad_isactualdemand, ad.purpose AS ad_purpose, + ad.id AS ad_id, ad.tenantid AS ad_tenantid, + ad.billdetail AS ad_billdetail, ad.glcode AS ad_glcode, + ad.orderno AS ad_orderno, ad.accountdescription AS ad_accountdescription, + ad.amount AS ad_amount, ad.adjustedamount AS ad_adjustedamount, + ad.taxheadcode AS ad_taxheadcode, ad.demanddetailid, + ad.isactualdemand AS ad_isactualdemand, ad.purpose AS ad_purpose, ad.additionaldetails as ad_additionaldetails, - ptadd.doorNo as ptadd_doorNo, ptadd.landmark as ptadd_landmark, - ptadd.city as ptadd_city, ptadd.pincode as ptadd_pincode, - ptadd.locality as ptadd_locality, ptown.userid as ptown_userid + ptadd.doorNo as ptadd_doorNo, ptadd.landmark as ptadd_landmark, + ptadd.city as ptadd_city, ptadd.pincode as ptadd_pincode, + ptadd.locality as ptadd_locality, ptown.userid as ptown_userid - FROM egbs_bill_v1 b INNER JOIN egbs_billdetail_v1 bd ON b.id = bd.billid AND b.tenantid = bd.tenantid + FROM egbs_bill_v1 b INNER JOIN egbs_billdetail_v1 bd ON b.id = bd.billid AND b.tenantid = bd.tenantid INNER JOIN egbs_billaccountdetail_v1 ad ON bd.id = ad.billdetail AND bd.tenantid = ad.tenantid - INNER JOIN connection conn ON bd.consumercode = conn.connectionno - INNER JOIN eg_pt_property pt ON conn.property_id = pt.propertyId - INNER JOIN eg_pt_address ptadd ON ptadd.propertyid = pt.id + INNER JOIN eg_ws_connection conn ON bd.consumercode = conn.connectionno + INNER JOIN eg_pt_property pt ON conn.property_id = pt.id + INNER JOIN eg_pt_address ptadd ON ptadd.propertyid = pt.id INNER JOIN eg_pt_owner ptown ON ptown.propertyid = pt.id $where ) select * from bill_data inner join (select max(b_createddate) as maxcreateddate, bd_consumercode from bill_data group by bd_consumercode) as max ON max.maxcreateddate=b_createddate - searchParams: + searchParams: condition: AND params: - name: b.tenantid @@ -159,7 +159,7 @@ SearchDefinitions: isMandatory: false jsonPath: $.searchCriteria.toPeriod operator: GE - - name: b.status + - name: b.isactive isMandatory: false jsonPath: $.searchCriteria.billActive @@ -174,46 +174,46 @@ SearchDefinitions: - name: seweragebills isCustomerRowMapEnabled: true rowMapperKey: billsearch - query: - baseQuery: with bill_data as ( - SELECT b.id AS b_id, b.mobilenumber, - b.tenantid AS b_tenantid, b.payername AS b_payername, - b.payeraddress AS b_payeraddress, b.payeremail AS b_payeremail, - b.isactive AS b_isactive, b.iscancelled AS b_iscancelled, - b.createdby AS b_createdby, b.status as b_status, - b.createddate AS b_createddate, b.lastmodifiedby AS b_lastmodifiedby, - b.lastmodifieddate AS b_lastmodifieddate, bd.id AS bd_id, + query: + baseQuery: with bill_data as ( + SELECT b.id AS b_id, b.mobilenumber, + b.tenantid AS b_tenantid, b.payername AS b_payername, + b.payeraddress AS b_payeraddress, b.payeremail AS b_payeremail, + b.isactive AS b_isactive, b.iscancelled AS b_iscancelled, + b.createdby AS b_createdby, b.status as b_status, b.filestoreid AS b_filestoreid + b.createddate AS b_createddate, b.lastmodifiedby AS b_lastmodifiedby, + b.lastmodifieddate AS b_lastmodifieddate, bd.id AS bd_id, bd.billid AS bd_billid, bd.tenantid AS bd_tenantid, - bd.businessservice AS bd_businessservice, bd.demandid, - bd.fromperiod, bd.toperiod, - bd.billno AS bd_billno, bd.billdate AS bd_billdate, - bd.consumercode AS bd_consumercode, bd.consumertype AS bd_consumertype, - bd.billdescription AS bd_billdescription, bd.displaymessage AS bd_displaymessage, - bd.minimumamount AS bd_minimumamount, bd.totalamount AS bd_totalamount, - bd.callbackforapportioning AS bd_callbackforapportioning, bd.expirydate AS bd_expirydate, - bd.partpaymentallowed AS bd_partpaymentallowed, bd.isadvanceallowed as bd_isadvanceallowed, - bd.collectionmodesnotallowed AS bd_collectionmodesnotallowed, bd.createddate as bd_createddate, + bd.businessservice AS bd_businessservice, bd.demandid, + bd.fromperiod, bd.toperiod, + bd.billno AS bd_billno, bd.billdate AS bd_billdate, + bd.consumercode AS bd_consumercode, bd.consumertype AS bd_consumertype, + bd.billdescription AS bd_billdescription, bd.displaymessage AS bd_displaymessage, + bd.minimumamount AS bd_minimumamount, bd.totalamount AS bd_totalamount, + bd.callbackforapportioning AS bd_callbackforapportioning, bd.expirydate AS bd_expirydate, + bd.partpaymentallowed AS bd_partpaymentallowed, bd.isadvanceallowed as bd_isadvanceallowed, + bd.collectionmodesnotallowed AS bd_collectionmodesnotallowed, bd.createddate as bd_createddate, b.additionaldetails as b_additionaldetails, bd.additionaldetails as bd_additionaldetails, - ad.id AS ad_id, ad.tenantid AS ad_tenantid, - ad.billdetail AS ad_billdetail, ad.glcode AS ad_glcode, - ad.orderno AS ad_orderno, ad.accountdescription AS ad_accountdescription, - ad.amount AS ad_amount, ad.adjustedamount AS ad_adjustedamount, - ad.taxheadcode AS ad_taxheadcode, ad.demanddetailid, - ad.isactualdemand AS ad_isactualdemand, ad.purpose AS ad_purpose, + ad.id AS ad_id, ad.tenantid AS ad_tenantid, + ad.billdetail AS ad_billdetail, ad.glcode AS ad_glcode, + ad.orderno AS ad_orderno, ad.accountdescription AS ad_accountdescription, + ad.amount AS ad_amount, ad.adjustedamount AS ad_adjustedamount, + ad.taxheadcode AS ad_taxheadcode, ad.demanddetailid, + ad.isactualdemand AS ad_isactualdemand, ad.purpose AS ad_purpose, ad.additionaldetails as ad_additionaldetails, - ptadd.doorNo as ptadd_doorNo, ptadd.landmark as ptadd_landmark, - ptadd.city as ptadd_city, ptadd.pincode as ptadd_pincode, - ptadd.locality as ptadd_locality, ptown.userid as ptown_userid + ptadd.doorNo as ptadd_doorNo, ptadd.landmark as ptadd_landmark, + ptadd.city as ptadd_city, ptadd.pincode as ptadd_pincode, + ptadd.locality as ptadd_locality, ptown.userid as ptown_userid - FROM egbs_bill_v1 b INNER JOIN egbs_billdetail_v1 bd ON b.id = bd.billid AND b.tenantid = bd.tenantid + FROM egbs_bill_v1 b INNER JOIN egbs_billdetail_v1 bd ON b.id = bd.billid AND b.tenantid = bd.tenantid INNER JOIN egbs_billaccountdetail_v1 ad ON bd.id = ad.billdetail AND bd.tenantid = ad.tenantid INNER JOIN eg_sw_connection conn ON bd.consumercode = conn.connectionno - INNER JOIN eg_pt_property pt ON conn.property_id = pt.propertyId - INNER JOIN eg_pt_address ptadd ON ptadd.propertyid = pt.id + INNER JOIN eg_pt_property pt ON conn.property_id = pt.id + INNER JOIN eg_pt_address ptadd ON ptadd.propertyid = pt.id INNER JOIN eg_pt_owner ptown ON ptown.propertyid = pt.id $where ) select * from bill_data inner join (select max(b_createddate) as maxcreateddate, bd_consumercode from bill_data group by bd_consumercode) as max ON max.maxcreateddate=b_createddate - searchParams: + searchParams: condition: AND params: - name: b.tenantid @@ -242,7 +242,7 @@ SearchDefinitions: isMandatory: false jsonPath: $.searchCriteria.toPeriod operator: GE - - name: b.status + - name: b.isactive isMandatory: false jsonPath: $.searchCriteria.billActive diff --git a/configs/egov-searcher/localitySearcher.yml b/configs/egov-searcher/localitySearcher.yml index 0cee0d3b..c44c27cc 100644 --- a/configs/egov-searcher/localitySearcher.yml +++ b/configs/egov-searcher/localitySearcher.yml @@ -21,7 +21,7 @@ SearchDefinitions: - name: result.referenceNumber isMandatory: true jsonPath: $.searchCriteria.referenceNumber - operator: + operator: output: jsonFormat: {"ResponseInfo": {}} @@ -45,13 +45,13 @@ SearchDefinitions: - name: result.referenceNumber isMandatory: true jsonPath: $.searchCriteria.referenceNumber - operator: + operator: output: jsonFormat: {"ResponseInfo": {}} outJsonPath: $.Localities responseInfoPath: $.ResponseInfo - + - name: BPAREG query: @@ -70,7 +70,7 @@ SearchDefinitions: - name: result.referenceNumber isMandatory: true jsonPath: $.searchCriteria.referenceNumber - operator: + operator: output: jsonFormat: {"ResponseInfo": {}} @@ -93,7 +93,54 @@ SearchDefinitions: - name: result.referenceNumber isMandatory: true jsonPath: $.searchCriteria.referenceNumber - operator: + operator: + + output: + jsonFormat: {"ResponseInfo": {}} + outJsonPath: $.Localities + responseInfoPath: $.ResponseInfo + + - name: ws-services + query: + baseQuery: | + Select row_to_json(result) from + ( + select applicationno as referenceNumber,locality from eg_ws_connection conn + INNER JOIN eg_pt_property property ON property.id = conn.property_id + INNER JOIN eg_pt_address ptadd ON ptadd.propertyid = property.id + ) result $where + groupBy: + orderBy: + searchParams: + condition: AND + params: + - name: result.referenceNumber + isMandatory: true + jsonPath: $.searchCriteria.referenceNumber + operator: + + output: + jsonFormat: {"ResponseInfo": {}} + outJsonPath: $.Localities + responseInfoPath: $.ResponseInfo + - name: sw-services + query: + baseQuery: | + Select row_to_json(result) from + ( + select applicationno as referenceNumber,locality from eg_sw_connection conn + INNER JOIN eg_pt_property property ON property.id = conn.property_id + INNER JOIN eg_pt_address ptadd ON ptadd.propertyid = property.id + ) result $where + groupBy: + orderBy: + searchParams: + condition: AND + params: + - name: result.referenceNumber + isMandatory: true + jsonPath: $.searchCriteria.referenceNumber + operator: output: jsonFormat: {"ResponseInfo": {}} diff --git a/configs/pdf-service/data-config/ws-applicationsewerage.json b/configs/pdf-service/data-config/ws-applicationsewerage.json index 29ac52ff..6d5b8c69 100644 --- a/configs/pdf-service/data-config/ws-applicationsewerage.json +++ b/configs/pdf-service/data-config/ws-applicationsewerage.json @@ -62,7 +62,12 @@ "variable": "propertyUsageSubType", "value": { "path": "$.property.propertySubUsageType" - } + }, + "localisation": { + "required": true, + "prefix": "WS_PROPSUBUSGTYPE", + "module": "rainmaker-ws" + } }, { "variable": "plotSize", @@ -124,12 +129,12 @@ } }, { - "variable": "variable13", + "variable": "variable13", "value":{ - "path":"$.property.owners.*" + "path":"$.property.owners.*" }, "type":"array", - "format":{ + "format":{ "type":"string", "scema":[ { @@ -137,7 +142,7 @@ "value": "name" }, { - "variable": "emailLabel", + "variable": "ownerEmailId", "value":"emailId" }, { @@ -145,7 +150,7 @@ "value": "gender" }, { - "variable": "dob", + "variable": "ownerDob", "value": "dob", "type": "date" }, @@ -167,7 +172,7 @@ } ] } - + }, { "variable": "applyCategory", @@ -247,7 +252,7 @@ "path": "$.connectionExecutionDate" }, "type": "date" - }, + }, { "variable": "ownershipProof", "value": { diff --git a/configs/pdf-service/data-config/ws-applicationwater.json b/configs/pdf-service/data-config/ws-applicationwater.json index adc9d7b4..c6890135 100644 --- a/configs/pdf-service/data-config/ws-applicationwater.json +++ b/configs/pdf-service/data-config/ws-applicationwater.json @@ -62,6 +62,11 @@ "variable": "propertyUsageSubType", "value": { "path": "$.property.propertySubUsageType" + }, + "localisation": { + "required": true, + "prefix": "WS_PROPSUBUSGTYPE", + "module": "rainmaker-ws" } }, { @@ -124,12 +129,12 @@ } }, { - "variable": "variable13", + "variable": "variable13", "value":{ - "path":"$.property.owners.*" + "path":"$.property.owners.*" }, "type":"array", - "format":{ + "format":{ "type":"string", "scema":[ { @@ -137,7 +142,7 @@ "value": "name" }, { - "variable": "emailLabel", + "variable": "ownerEmailId", "value":"emailId" }, { @@ -145,9 +150,9 @@ "value": "gender" }, { - "variable": "dob", + "variable": "ownerDob", "value": "dob", - "type": "date" + "type":"date" }, { "variable": "guardianName", diff --git a/configs/pdf-service/data-config/ws-consolidatedacknowlegment.json b/configs/pdf-service/data-config/ws-consolidatedacknowlegment.json index 9ea5cbf9..9e3ea1be 100644 --- a/configs/pdf-service/data-config/ws-consolidatedacknowlegment.json +++ b/configs/pdf-service/data-config/ws-consolidatedacknowlegment.json @@ -653,8 +653,8 @@ ] }, { - "externalAPI": [ - { + "externalAPI": [ + { "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.property.tenantId}')%5D", "apiRequest": null, @@ -681,4 +681,4 @@ } ] } -} \ No newline at end of file +} diff --git a/configs/pdf-service/data-config/ws-consolidatedsewerageconnection.json b/configs/pdf-service/data-config/ws-consolidatedsewerageconnection.json index 103ec392..53b42b6e 100644 --- a/configs/pdf-service/data-config/ws-consolidatedsewerageconnection.json +++ b/configs/pdf-service/data-config/ws-consolidatedsewerageconnection.json @@ -540,8 +540,8 @@ ] }, { - "externalAPI": [ - { + "externalAPI": [ + { "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.property.tenantId}')%5D", "apiRequest": null, @@ -568,4 +568,4 @@ } ] } -} \ No newline at end of file +} diff --git a/configs/pdf-service/data-config/ws-estimationnotice.json b/configs/pdf-service/data-config/ws-estimationnotice.json index 27bb4b36..43b6de6d 100644 --- a/configs/pdf-service/data-config/ws-estimationnotice.json +++ b/configs/pdf-service/data-config/ws-estimationnotice.json @@ -505,4 +505,4 @@ } ] } -} \ No newline at end of file +} diff --git a/configs/pdf-service/data-config/ws-onetime-receipt.json b/configs/pdf-service/data-config/ws-onetime-receipt.json index da4f9e25..7b30715e 100644 --- a/configs/pdf-service/data-config/ws-onetime-receipt.json +++ b/configs/pdf-service/data-config/ws-onetime-receipt.json @@ -145,7 +145,7 @@ { "variable": "consumer_id", "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_CONSUMER_ID" + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_CONSUMER_NO" }, "type": "label", "localisation": { diff --git a/configs/pdf-service/data-config/ws-sanctionletter-old.json b/configs/pdf-service/data-config/ws-sanctionletter-old.json deleted file mode 100644 index b0df2ba5..00000000 --- a/configs/pdf-service/data-config/ws-sanctionletter-old.json +++ /dev/null @@ -1,672 +0,0 @@ -{ - "key": "ws-sanctionletter-old", - "DataConfigs": { - "serviceName": "rainmaker-common", - "version": "1.0.0", - "baseKeyPath": "$.WnsConnection.*", - "entityIdPath": "$.applicationNo", - "isCommonTableBorderRequired": true, - "mappings": [ - { - "topic": "common-pdf-generation-3", - "mappings": [ - { - "direct": [ - { - "variable": "cityName", - "value": { - "path": "$.tenantName" - } - }, - { - "variable": "presentByName", - "value": { - "path": "$.commissionerName" - } - }, - { - "variable": "usageType", - "value": { - "path": "$.appUserType" - } - }, - { - "variable": "applicationNumber", - "value": { - "path": "$.applicationNo" - } - }, - { - "variable": "connectionExecutionDate", - "value": { - "path": "$.connectionExecutionDate" - }, - "type": "date" - }, - { - "variable": "applicationType", - "value": { - "path": "$.service" - } - }, - { - "variable": "service", - "value": { - "path": "$.service" - } - }, - { - "variable": "doorNo", - "value": { - "path": "$.property.address.doorNo" - } - }, - { - "variable": "locality", - "value": { - "path": "$.property.address.locality.name" - } - }, - { - "variable": "ownerName", - "value": { - "path": "$.property.owners[0].name" - } - }, - { - "variable": "formFee", - "value": { - "path": "$.pdfTaxhead[?(@.taxHeadCode == 'FORM_FEE')].estimateAmount" - } - }, - { - "variable": "ScrutinyFee", - "value": { - "path": "$.pdfTaxhead[?(@.taxHeadCode == 'SCRUTINY_FEE')].estimateAmount" - } - }, - { - "variable": "otherCharge", - "value": { - "path": "$.pdfTaxhead[?(@.taxHeadCode == 'OTHER_CHARGE')].estimateAmount" - } - }, - { - "variable": "securityCharge", - "value": { - "path": "$.pdfTaxhead[?(@.taxHeadCode == 'SECURITY_CHARGE')].estimateAmount" - } - }, - { - "variable": "taxCess", - "value": { - "path": "$.pdfTaxhead[?(@.taxHeadCode == 'TAX_AND_CESS')].estimateAmount" - } - }, - { - "variable": "roadCharge", - "value": { - "path": "$.pdfTaxhead[?(@.taxHeadCode == 'ROAD_CUTTING_CHARGE')].estimateAmount" - } - }, - { - "variable": "oneTimeFee", - "value": { - "path": "$.pdfTaxhead[?(@.taxHeadCode == 'ONE_TIME_FEE')].estimateAmount" - } - }, - { - "variable": "penaltyAmount", - "value": { - "path": "$.additionalDetails.adhocPenalty" - } - }, - { - "variable": "rebateAmount", - "value": { - "path": "$.additionalDetails.adhocRebate" - } - }, - { - "variable": "totalAmount", - "value": { - "path": "$.totalAmount" - } - }, - { - "variable": "tenantName", - "value": { - "path": "$.tenantName" - } - }, - { - "variable": "date", - "value": { - "path": "$.connectionExecutionDate" - }, - "type": "date" - }, - { - "variable": "total", - "value": { - "path": "PDF_STATIC_LABELWS_CONSOLIDATED_ACKNOWELDGMENT_TOTAL" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "Rs", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_RUPEE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "Municipal_Corporation", - "value": { - "path": "PDF_STATIC_LABEL_WS_MDMS_MUNICIPAL_CORPORATION_LOGO_HEADER" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "presented_by", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PRESENTED_BY" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "commissioner_label", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_COMMISSIONER_LABEL" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "app_no", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_ACKNOWELDGMENT_APPLICATION_NO" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "date_label", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_ACKNOWELDGMENT_DATE_LABEL" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "sub_label", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_SUB_LEBEL" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "ref_label", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_REF_LEBEL" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "total_amount", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_TOTAL_AMOUNT" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "sub_data1", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_SUB_DATA1" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "sub_data2", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_SUB_DATA2" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "locality_label", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_LOCALITY_LABEL" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "order_issued", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ORDER_ISSUED" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "ref_message1", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_REF_MESSAGE1" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "dated_label", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_DATED_LABEL" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "ref_message2", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_REF_MESSAGE2" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "order_label", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ORDER_LABEL" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "in_ref_label", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_IN_REF_LABEL" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "order_meassage1", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ORDER_MESSAGE1" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "order_meassage2", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ORDER_MESSAGE2" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "order_meassage3", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ORDER_MESSAGE3" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "order_data2", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ORDER_DATA2" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "order_data3", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ORDER_DATA3" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "for_commissioner_label", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_FOR_COMMISSIONER_LABEL" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "to_label", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_TO_LABEL" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "sri_smt_label", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_SRI_SMT_LABEL" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "door_no_label", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_DOOR_NO_LABEL" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "copy_message1", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_COPY_MESSAGE1" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "copy_message-sub1", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_COPY_MESSAGE_SUB1" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "copy_message2", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_COPY_MESSAGE2" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "UAT", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_UAT" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "form_fee", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_FORM_FEE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "scrutiny_fee", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_SCRUTINY_FEE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "other_charge", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_OTHER_CHARGE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "security_charge", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_SECURITY_CHARGE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "tax_cess", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_TAX_CESS" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "penalty", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PENALTY" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "rebate", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_REBATE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "one_time_fee", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ONE_TIME_FEE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "road_charge", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ROAD_CHARGE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - } - ] - }, - { - "externalAPI": [ - { - "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", - "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.property.tenantId}')%5D", - "apiRequest": null, - "responseMapping": [ - { - "variable": "logoImage", - "value": "$.MdmsRes.tenant.tenants[0].logoId", - "type": "image" - }, - { - "variable": "logo_header", - "value": "$.MdmsRes.tenant.tenants[0].code", - "localisation": { - "required": true, - "prefix": "TENANT_TENANTS", - "module": "rainmaker-common" - } - } - ] - } - ] - } - ] - } - ] - } -} diff --git a/configs/pdf-service/data-config/ws-sanctionletter.json b/configs/pdf-service/data-config/ws-sanctionletter.json index ed94a250..f10eb83b 100644 --- a/configs/pdf-service/data-config/ws-sanctionletter.json +++ b/configs/pdf-service/data-config/ws-sanctionletter.json @@ -34,6 +34,18 @@ "prefix": null, "module": "rainmaker-common" } + }, + { + "variable": "door_no", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_DOOR_NO_LABEL" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } }, { "variable": "sanctionLetter", @@ -60,7 +72,7 @@ } }, { - "variable": "order_meassage4", + "variable": "order_message4", "value": { "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_SEEKING_ESTIMATE_AMOUNT" }, @@ -72,7 +84,7 @@ } }, { - "variable": "order_meassage5", + "variable": "order_message5", "value": { "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_PREPARATION_NOTICE" }, @@ -84,7 +96,7 @@ } }, { - "variable": "order_meassage6", + "variable": "order_message6", "value": { "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_SERVICE_PAYMENT" }, @@ -96,7 +108,7 @@ } }, { - "variable": "order_meassage7", + "variable": "order_message7", "value": { "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_SAID_PREMISES" }, @@ -108,7 +120,7 @@ } }, { - "variable": "order_meassage8", + "variable": "order_message8", "value": { "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_FURTHER" }, @@ -120,7 +132,7 @@ } }, { - "variable": "order_meassage9", + "variable": "order_message9", "value": { "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_CONNECTION_SANCTIONED" }, @@ -132,7 +144,7 @@ } }, { - "variable": "order_meassage10", + "variable": "order_message10", "value": { "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_PLUMBER_INFO" }, @@ -144,7 +156,7 @@ } }, { - "variable": "order_meassage11", + "variable": "order_message11", "value": { "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_BILLING_CYCLE" }, @@ -259,7 +271,20 @@ } }, { - "variable": "order_meassage14", + "variable": "sla", + "value": { + "path": "$.sla" + } + }, + { + "variable": "slaDate", + "value": { + "path": "$.slaDate" + }, + "type": "date" + }, + { + "variable": "order_message14", "value": { "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_CONCERNED_PLUMBER_CONTACT" }, @@ -271,7 +296,19 @@ } }, { - "variable": "order_meassage12", + "variable": "order_message15", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_SLA_DATE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "order_message12", "value": { "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_CONCERNED_PLUMBER_ALLOTED" }, @@ -283,7 +320,7 @@ } }, { - "variable": "order_meassage13", + "variable": "order_message13", "value": { "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_CONCERNED_PLUMBER_LICENCE" }, @@ -367,6 +404,27 @@ }, "type": "date" }, + { + "variable": "appCreatedDate", + "value": { + "path": "$.additionalDetails.appCreatedDate" + }, + "type": "date" + }, + { + "variable": "sanctionLetterDate", + "value": { + "path": "$.sanctionLetterDate" + }, + "type": "date" + }, + { + "variable": "estimationLetterDate", + "value": { + "path": "$.additionalDetails.estimationLetterDate" + }, + "type": "date" + }, { "variable": "total", "value": { @@ -596,7 +654,7 @@ } }, { - "variable": "order_meassage1", + "variable": "order_message1", "value": { "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ORDER_MESSAGE1" }, @@ -608,7 +666,7 @@ } }, { - "variable": "order_meassage2", + "variable": "order_message2", "value": { "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_SEEKING" }, @@ -620,7 +678,7 @@ } }, { - "variable": "order_meassage3", + "variable": "order_message3", "value": { "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_WATER_TAP_CONNECTION" }, diff --git a/configs/pdf-service/format-config/ws-applicationsewerage.json b/configs/pdf-service/format-config/ws-applicationsewerage.json index bdc4599f..6fc248c7 100644 --- a/configs/pdf-service/format-config/ws-applicationsewerage.json +++ b/configs/pdf-service/format-config/ws-applicationsewerage.json @@ -511,7 +511,7 @@ "25%" ], "body": [ - "{{#variable13}}[{\"text\":\"{{owner_name}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\" }, { \"text\":\"{{email_label}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\", \"fontSize\": 11 }, { \"text\":\"{{gender_label}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\" }, { \"text\":\"{{dob_label}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\" } ], [ { \"text\":\"{{ownerName}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" }, { \"text\":\"{{emailId}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" }, { \"text\":\"{{gender}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" }, { \"text\":\"{{dob}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" } ], [ { \"text\":\"{{guardian_name}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\" }, { \"text\":\"{{relationship_label}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\", \"fontSize\": 11 }, { \"text\":\"{{correspondence_address}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\" }, { \"text\":\"{{special_applicant_category}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\" } ], [ { \"text\":\"{{guardianName}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" }, { \"text\":\"{{relationshipLabel}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" }, { \"text\":\"{{correspondenceAddress}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" }, { \"text\":\"{{specialApplicantCategory}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" } ]{{/variable13}}" + "{{#variable13}}[{\"text\":\"{{owner_name}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\" }, { \"text\":\"{{email_label}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\", \"fontSize\": 11 }, { \"text\":\"{{gender_label}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\" }, { \"text\":\"{{dob_label}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\" } ], [ { \"text\":\"{{ownerName}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" }, { \"text\":\"{{ownerEmailId}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" }, { \"text\":\"{{gender}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" }, { \"text\":\"{{ownerDob}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" } ], [ { \"text\":\"{{guardian_name}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\" }, { \"text\":\"{{relationship_label}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\", \"fontSize\": 11 }, { \"text\":\"{{correspondence_address}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\" }, { \"text\":\"{{special_applicant_category}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\" } ], [ { \"text\":\"{{guardianName}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" }, { \"text\":\"{{relationshipLabel}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" }, { \"text\":\"{{correspondenceAddress}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" }, { \"text\":\"{{specialApplicantCategory}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" } ]{{/variable13}}" ] }, "border": [ @@ -1410,4 +1410,4 @@ } } } -} \ No newline at end of file +} diff --git a/configs/pdf-service/format-config/ws-applicationwater.json b/configs/pdf-service/format-config/ws-applicationwater.json index 971d344a..6979ce5e 100644 --- a/configs/pdf-service/format-config/ws-applicationwater.json +++ b/configs/pdf-service/format-config/ws-applicationwater.json @@ -511,7 +511,7 @@ "25%" ], "body": [ - "{{#variable13}}[{\"text\":\"{{owner_name}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\" }, { \"text\":\"{{email_label}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\", \"fontSize\": 11 }, { \"text\":\"{{gender_label}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\" }, { \"text\":\"{{dob_label}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\" } ], [ { \"text\":\"{{ownerName}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" }, { \"text\":\"{{emailId}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" }, { \"text\":\"{{gender}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" }, { \"text\":\"{{dob}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" } ], [ { \"text\":\"{{guardian_name}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\" }, { \"text\":\"{{relationship_label}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\", \"fontSize\": 11 }, { \"text\":\"{{correspondence_address}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\" }, { \"text\":\"{{special_applicant_category}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\" } ], [ { \"text\":\"{{guardianName}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" }, { \"text\":\"{{relationshipLabel}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" }, { \"text\":\"{{correspondenceAddress}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" }, { \"text\":\"{{specialApplicantCategory}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" } ]{{/variable13}}" + "{{#variable13}}[{\"text\":\"{{owner_name}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\" }, { \"text\":\"{{email_label}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\", \"fontSize\": 11 }, { \"text\":\"{{gender_label}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\" }, { \"text\":\"{{dob_label}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\" } ], [ { \"text\":\"{{ownerName}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" }, { \"text\":\"{{ownerEmailId}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" }, { \"text\":\"{{gender}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" }, { \"text\":\"{{ownerDob}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" } ], [ { \"text\":\"{{guardian_name}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\" }, { \"text\":\"{{relationship_label}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\", \"fontSize\": 11 }, { \"text\":\"{{correspondence_address}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\" }, { \"text\":\"{{special_applicant_category}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\" } ], [ { \"text\":\"{{guardianName}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" }, { \"text\":\"{{relationshipLabel}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" }, { \"text\":\"{{correspondenceAddress}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" }, { \"text\":\"{{specialApplicantCategory}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" } ]{{/variable13}}" ] }, "border": [ @@ -1494,4 +1494,4 @@ } } } -} \ No newline at end of file +} diff --git a/configs/pdf-service/format-config/ws-consolidatedacknowlegment.json b/configs/pdf-service/format-config/ws-consolidatedacknowlegment.json index 054ffd89..a59f005c 100644 --- a/configs/pdf-service/format-config/ws-consolidatedacknowlegment.json +++ b/configs/pdf-service/format-config/ws-consolidatedacknowlegment.json @@ -981,4 +981,4 @@ } } } -} \ No newline at end of file +} diff --git a/configs/pdf-service/format-config/ws-consolidatedsewerageconnection.json b/configs/pdf-service/format-config/ws-consolidatedsewerageconnection.json index eb948d08..595c280e 100644 --- a/configs/pdf-service/format-config/ws-consolidatedsewerageconnection.json +++ b/configs/pdf-service/format-config/ws-consolidatedsewerageconnection.json @@ -803,4 +803,4 @@ } } } -} \ No newline at end of file +} diff --git a/configs/pdf-service/format-config/ws-estimationnotice.json b/configs/pdf-service/format-config/ws-estimationnotice.json index ffb27ad9..bd671e53 100644 --- a/configs/pdf-service/format-config/ws-estimationnotice.json +++ b/configs/pdf-service/format-config/ws-estimationnotice.json @@ -664,4 +664,4 @@ } } } -} \ No newline at end of file +} diff --git a/configs/pdf-service/format-config/ws-onetime-receipt.json b/configs/pdf-service/format-config/ws-onetime-receipt.json index dad6d4c8..e8ae01b9 100644 --- a/configs/pdf-service/format-config/ws-onetime-receipt.json +++ b/configs/pdf-service/format-config/ws-onetime-receipt.json @@ -252,7 +252,7 @@ "style": "receipt-table-value" }, { - "text": "{{fromPeriod}} {{to}} {{toPeriod}}", + "text": "{{fromPeriod}} - {{toPeriod}}", "border": [ false, true, diff --git a/configs/pdf-service/format-config/ws-sanctionletter-old.json b/configs/pdf-service/format-config/ws-sanctionletter-old.json deleted file mode 100644 index fcb0b474..00000000 --- a/configs/pdf-service/format-config/ws-sanctionletter-old.json +++ /dev/null @@ -1,1034 +0,0 @@ -{ - "key": "ws-sanctionletter-old", - "config": { - "defaultStyle": { - "font": "Cambay" - }, - "content": [ - { - "style": "ws-table", - "table": { - "widths": [ - "103%" - ], - "body": [ - [ - { - "table": { - "widths": [ - "100%" - ], - "body": [ - [ - { - "text": "{{UAT}} {{cityName}} {{Municipal_Corporation}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-table-header" - } - ], - [ - { - "text": "{{cityName}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-table-header" - } - ], - [ - { - "text": "{{presented_by}} : {{presentByName}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-table-header" - } - ], - [ - { - "text": "{{commissioner_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-table-header" - } - ], - [ - { - "text": "{{usageType}}", - "border": [ - false, - false, - false, - false - ] - } - ], - [ - { - "border": [ - false, - false, - false, - false - ], - "columns": [ - { - "width": "auto", - "text": "{{app_no}}", - "style": "ws-sub-header" - }, - { - "width": "2%", - "text": ":", - "style": "ws-sub-header" - }, - { - "width": "auto", - "text": "{{applicationNumber}}", - "style": "ws-sub-data" - }, - { - "width": "auto", - "text": "{{date_label}}", - "style": "ws-sub-header", - "alignment": "right" - }, - { - "width": "*", - "text": "{{connectionExecutionDate}}", - "alignment": "right", - "style": "ws-sub-data" - } - ], - "margin": [ - 25, - 10, - 0, - 0 - ] - } - ], - [ - { - "border": [ - false, - false, - false, - false - ], - "columns": [ - { - "width": "20%", - "text": "{{sub_label}}", - "style": "receipt-value-down" - }, - { - "width": "80%", - "text": "{{applicationType}} {{sub_data1}} {{applicationType}} {{sub_data2}} {{doorNo}} {{locality_label}} {{locality}} {{order_issued}} ", - "style": "receipt-value-down" - } - ], - "margin": [ - 50, - 10, - 0, - 0 - ] - } - ], - [ - { - "border": [ - false, - false, - false, - false - ], - "columns": [ - { - "width": "20%", - "text": "{{ref_label}}", - "style": "receipt-value-down" - }, - { - "width": "80%", - "ol": [ - { - "text": "{{ref_message1}} {{ownerName}} {{doorNo}} {{locality_label}} {{locality}} {{dated_label}} {{date}}", - "style": "receipt-value-down" - }, - { - "text": "{{ref_message2}}", - "style": "receipt-value-down" - } - ] - } - ], - "margin": [ - 50, - 10, - 0, - 0 - ] - } - ], - [ - { - "border": [ - false, - false, - false, - false - ], - "columns": [ - { - "width": "100%", - "text": "{{order_label}}", - "style": "ws-sub-header" - } - ], - "margin": [ - 25, - 10, - 0, - 0 - ] - } - ], - [ - { - "border": [ - false, - false, - false, - false - ], - "columns": [ - { - "width": "100%", - "text": "{{in_ref_label}} {{ownerName}} {{order_meassage1}} {{applicationType}} {{order_meassage2}} {{doorNo}} {{locality}} {{order_meassage3}}", - "style": "receipt-value-down" - } - ], - "margin": [ - 50, - 10, - 0, - 0 - ] - } - ], - [ - { - "stack": [ - { - "table": { - "widths": [ - "3%", - "50%", - "3%", - "auto", - "auto" - ], - "body": [ - [ - { - "text": "1.", - "alignment": "center", - "border": [ - false - ] - }, - { - "text": "{{form_fee}}", - "layout": "noBorders", - "border": [ - false - ] - }, - { - "text": ":", - "alignment": "center", - "border": [ - false - ] - }, - { - "text": "{{Rs}}", - "alignment": "center", - "border": [ - false - ] - }, - { - "text": "{{formFee}}", - "alignment": "right", - "border": [ - false - ] - } - ], - [ - { - "text": "2.", - "alignment": "center", - "border": [ - false - ] - }, - { - "text": "{{scrutiny_fee}}", - "border": [ - false - ] - }, - { - "text": ":", - "alignment": "center", - "border": [ - false - ] - }, - { - "text": "{{Rs}}", - "alignment": "center", - "border": [ - false - ] - }, - { - "text": "{{ScrutinyFee}}", - "alignment": "right", - "border": [ - false - ] - } - ], - [ - { - "text": "3.", - "alignment": "center", - "border": [ - false - ] - }, - { - "text": "{{one_time_fee}}", - "border": [ - false - ] - }, - { - "text": ":", - "alignment": "center", - "border": [ - false - ] - }, - { - "text": "{{Rs}}", - "alignment": "center", - "border": [ - false - ] - }, - { - "text": "{{oneTimeFee}}", - "alignment": "right", - "border": [ - false - ] - } - ], - [ - { - "text": "4.", - "alignment": "center", - "border": [ - false - ] - }, - { - "text": "{{other_charge}}", - "border": [ - false - ] - }, - { - "text": ":", - "alignment": "center", - "border": [ - false - ] - }, - { - "text": "{{Rs}}", - "alignment": "center", - "border": [ - false - ] - }, - { - "text": "{{otherCharge}}", - "alignment": "right", - "border": [ - false - ] - } - ], - [ - { - "text": "5.", - "alignment": "center", - "border": [ - false - ] - }, - { - "text": "{{road_charge}}", - "border": [ - false - ] - }, - { - "text": ":", - "alignment": "center", - "border": [ - false - ] - }, - { - "text": "{{Rs}}", - "alignment": "center", - "border": [ - false - ] - }, - { - "text": "{{roadCharge}}", - "alignment": "right", - "border": [ - false - ] - } - ], - [ - { - "text": "6.", - "alignment": "center", - "border": [ - false - ] - }, - { - "text": "{{security_charge}}", - "border": [ - false - ] - }, - { - "text": ":", - "alignment": "center", - "border": [ - false - ] - }, - { - "text": "{{Rs}}", - "alignment": "center", - "border": [ - false - ] - }, - { - "text": "{{securityCharge}}", - "alignment": "right", - "border": [ - false - ] - } - ], - [ - { - "text": "7.", - "alignment": "center", - "border": [ - false - ] - }, - { - "text": "{{tax_cess}}", - "border": [ - false - ] - }, - { - "text": ":", - "alignment": "center", - "border": [ - false - ] - }, - { - "text": "{{Rs}}", - "alignment": "center", - "border": [ - false - ] - }, - { - "text": "{{taxCess}}", - "alignment": "right", - "border": [ - false - ] - } - ], - [ - { - "text": "8.", - "alignment": "center", - "border": [ - false - ] - }, - { - "text": "{{penalty}}", - "border": [ - false - ] - }, - { - "text": ":", - "alignment": "center", - "border": [ - false - ] - }, - { - "text": "{{Rs}}", - "alignment": "center", - "border": [ - false - ] - }, - { - "text": "{{penaltyAmount}}", - "alignment": "right", - "border": [ - false - ] - } - ], - [ - { - "text": "9.", - "alignment": "center", - "border": [ - false - ] - }, - { - "text": "{{rebate}}", - "border": [ - false - ] - }, - { - "text": ":", - "alignment": "center", - "border": [ - false - ] - }, - { - "text": "{{Rs}}", - "alignment": "center", - "border": [ - false - ] - }, - { - "text": "{{rebateAmount}}", - "alignment": "right", - "border": [ - false - ] - } - ], - [ - { - "text": " ", - "border": [ - false - ] - }, - { - "text": "{{total}}", - "alignment": "center", - "border": [ - false - ] - }, - { - "text": ":", - "alignment": "center", - "border": [ - false - ] - }, - { - "text": "{{Rs}}", - "alignment": "center", - "border": [ - false - ] - }, - { - "text": "{{totalAmount}}", - "alignment": "right", - "border": [ - false - ] - } - ] - ] - } - } - ], - "border": [ - false, - false, - false, - false - ], - "margin": [ - 50, - 5, - 0, - 0 - ] - } - ], - [ - { - "border": [ - false, - false, - false, - false - ], - "columns": [ - { - "width": "100%", - "text": "{{order_data2}} {{service}} {{order_data3}} {{app_no}}:{{applicationNumber}}", - "style": "receipt-value-down" - } - ], - "margin": [ - 30, - 10, - 0, - 0 - ] - } - ], - [ - { - "stack": [ - { - "text": "{{for_commissioner_label}}", - "style": "receipt-table-value-total", - "fontSize": 12 - }, - { - "text": "{{UAT}} {{cityName}} {{Municipal_Corporation}}", - "style": "receipt-table-value-total", - "fontSize": 12 - } - ], - "border": [ - false, - false, - false, - false - ], - "margin": [ - 40, - 80, - 0, - 0 - ] - } - ], - [ - { - "stack": [ - { - "table": { - "widths": [ - "10%", - "40%" - ], - "body": [ - [ - { - "text": "{{to_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-value-down" - }, - { - "text": " ", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-value-down" - } - ], - [ - { - "text": "{{sri_smt_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-value-down" - }, - { - "text": "{{ownerName}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-value-down" - } - ], - [ - { - "text": "{{door_no_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-value-down" - }, - { - "text": "{{doorNo}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-value-down" - } - ] - ] - } - }, - [ - { - "border": [ - false, - false, - false, - false - ], - "columns": [ - { - "width": "auto", - "text": "{{app_no}}", - "style": "ws-consumer-sub-header" - }, - { - "width": "2%", - "text": ":" - }, - { - "width": "auto", - "text": "{{applicationNumber}}", - "style": "ws-consumer-sub-header" - } - ], - "margin": [ - 0, - 10, - 0, - 0 - ] - } - ] - ], - "border": [ - false, - false, - false, - false - ], - "margin": [ - 50, - 5, - 0, - 0 - ] - } - ], - [ - { - "stack": [ - { - "text": "{{copy_message1}} {{service}} {{copy_message-sub1}}", - "style": "receipt-value-down" - } - ], - "border": [ - false, - false, - false, - false - ], - "margin": [ - 50, - 30, - 30, - 10 - ] - } - ], - [ - { - "stack": [ - { - "text": "{{copy_message2}}", - "style": "receipt-value-down" - } - ], - "border": [ - false, - false, - false, - false - ], - "margin": [ - 50, - 10, - 30, - 10 - ] - } - ] - ] - }, - "border": [ - true, - true, - true, - true - ] - } - ] - ] - }, - "layout": {} - } - ], - "styles": { - "ws-head": { - "fillColor": "#F2F2F2", - "margin": [ - -39, - -38, - -38, - 0 - ] - }, - "ws-table": { - "fontSize": 12, - "color": "#484848", - "margin": [ - -25, - 18, - -8, - 10 - ] - }, - "ws-table-property": { - "fontSize": 12, - "color": "#484848", - "margin": [ - -25, - 18, - -8, - 110 - ] - }, - "ws-sub-table-value": { - "color": "#000000", - "bold": true, - "fontSize": 12, - "fontWeight": 500, - "margin": [ - 3, - 0, - 0, - 10 - ] - }, - "ws-sub-table": { - "color": "#484848", - "bold": true, - "fontSize": 12, - "fontWeight": 400 - }, - "ws-table-header": { - "color": "#000000", - "bold": true, - "fontSize": 18, - "fontWeight": 500, - "alignment": "center", - "margin": [ - 3, - 0, - 0, - 0 - ] - }, - "ws-inner-table": { - "color": "#000000", - "alignment": "center", - "margin": [ - 10, - 10, - 10, - 10 - ] - }, - "ws-sub-header": { - "color": "#000000", - "bold": true, - "fontSize": 14, - "fontWeight": 500, - "margin": [ - 10, - 10, - 10, - 10 - ] - }, - "ws-sub-data": { - "color": "#000000", - "fontSize": 14, - "fontWeight": 400, - "margin": [ - 10, - 10, - 10, - 10 - ] - }, - "ws-ul-header": { - "color": "#000000", - "fontSize": 16, - "fontWeight": 500 - }, - "ws-consumer-sub-header": { - "color": "#000000", - "fontSize": 12, - "fontWeight": 500 - }, - "receipt-value-down": { - "color": "#000000", - "bold": false, - "fontSize": 12, - "fontWeight": 400, - "alignment": "left", - "margin": [ - 3, - 0, - 0, - 5 - ] - }, - "ws-sign": { - "color": "#000000", - "fontSize": 14, - "fontWeight": 400, - "bold": true, - "alignment": "right", - "margin": [ - 0, - 5, - 30, - 0 - ] - }, - "receipt-table-value": { - "color": "#000000", - "bold": true, - "fontSize": 12, - "fontWeight": 500, - "margin": [ - 5, - 5, - 0, - 0 - ] - }, - "receipt-table-value-total": { - "color": "#000000", - "bold": true, - "fontSize": 12, - "fontWeight": 500, - "alignment": "right", - "margin": [ - 0, - 5, - 30, - 0 - ] - }, - "receipt-table-value-down": { - "color": "#000000", - "bold": false, - "fontSize": 12, - "fontWeight": 400, - "alignment": "left", - "margin": [ - 3, - 5, - 0, - 5 - ] - } - } - } -} diff --git a/configs/pdf-service/format-config/ws-sanctionletter.json b/configs/pdf-service/format-config/ws-sanctionletter.json index c6118b8a..584d2805 100644 --- a/configs/pdf-service/format-config/ws-sanctionletter.json +++ b/configs/pdf-service/format-config/ws-sanctionletter.json @@ -84,7 +84,7 @@ }, { "width": "auto", - "text": "{{connectionExecutionDate}}", + "text": "{{sanctionLetterDate}}", "alignment": "right", "style": "ws-sub-data" } @@ -137,11 +137,11 @@ "width": "80%", "ol": [ { - "text": "{{ref_message1}} {{ownerName}} {{doorNo}} {{locality_label}} {{locality}} {{dated_label}} {{date}}", + "text": "{{ref_message1}} {{ownerName}} {{doorNo}} {{locality_label}} {{locality}} {{dated_label}} {{appCreatedDate}}", "style": "receipt-value-down" }, { - "text": "{{ref_message2}}{{applicationNumber}} {{dated_label}} {{date}}", + "text": "{{ref_message2}}{{applicationNumber}} {{dated_label}} {{estimationLetterDate}}", "style": "receipt-value-down" } ] @@ -189,7 +189,7 @@ "columns": [ { "width": "100%", - "text": "{{in_ref_label}} {{applicationNumber}} {{dated}} {{date}} {{order_meassage2}} {{applicationType}} {{order_meassage3}} {{doorNo}} {{locality_label}} {{locality}}{{order_meassage4}} {{totalAmount}} {{order_meassage5}} {{applicationType}} {{order_meassage6}} {{totalAmount}} {{dated}} {{date}} {{order_meassage7}}", + "text": "{{in_ref_label}} {{applicationNumber}} {{dated}} {{appCreatedDate}} {{order_message2}} {{applicationType}} {{order_message3}} {{door_no}} {{doorNo}} {{locality_label}} {{locality}}{{order_message4}} {{totalAmount}} {{order_message5}} {{applicationType}} {{order_message6}} {{totalAmount}} {{dated}} {{sanctionLetterDate}} {{order_message7}}", "style": "receipt-value-down" } ], @@ -212,7 +212,7 @@ "columns": [ { "width": "100%", - "text": "{{order_meassage8}} {{applicationType}} {{order_meassage9}} {{applicationNumber}} {{order_meassage12}} {{plumberName}}{{order_meassage13}} {{licenceNo}}{{order_meassage14}} {{contactNo}}{{order_meassage10}} {{date}}{{order_meassage11}}", + "text": "{{order_message12}} {{plumberName}}{{order_message13}} {{licenceNo}}{{order_message14}} {{contactNo}}{{order_message10}} {{sla}} {{order_message15}} {{slaDate}}{{order_message11}}", "style": "receipt-value-down" } ], @@ -442,7 +442,7 @@ "fontSize": 10, "fontWeight": 500, "margin": [ - 360, + 380, 10, 10, 10 From cdb151144beef8b7a9d5ebd95f4a267020c5e2ed Mon Sep 17 00:00:00 2001 From: narendrabandhamneni-wt-egov Date: Fri, 12 Jun 2020 19:45:07 +0530 Subject: [PATCH 0010/1242] Added property registry yaml --- .../property-services-registry.yml | 572 ++++++++++++ configs/egov-persister/property-services.yml | 819 ++++++++++++++++++ 2 files changed, 1391 insertions(+) create mode 100644 configs/egov-persister/property-services-registry.yml create mode 100644 configs/egov-persister/property-services.yml diff --git a/configs/egov-persister/property-services-registry.yml b/configs/egov-persister/property-services-registry.yml new file mode 100644 index 00000000..a851db88 --- /dev/null +++ b/configs/egov-persister/property-services-registry.yml @@ -0,0 +1,572 @@ +serviceMaps: + serviceName: property-services + mappings: + - version: 1.0 + description: Persists property details in EG_PT_PROPERTY table + fromTopic: save-property-registry + isTransaction: true + queryMaps: + + + - query: INSERT INTO eg_pt_property_audit (audituuid, propertyid, property, auditcreatedtime) VALUES ((select nextval('seq_eg_pt_registry_audit')), ?, ?, (SELECT extract(epoch from now()))); + basePath: Property + jsonMaps: + + - jsonPath: $.Property.propertyId + + - jsonPath: $.Property + type: JSON + dbType: JSONB + + - query: INSERT INTO eg_pt_property (id, propertyid, tenantid, surveyid, accountid, oldpropertyid, status, acknowldgementnumber, propertytype, ownershipcategory, usagecategory, creationreason, nooffloors, landarea, superbuiltuparea, linkedproperties, source, channel, createdby, createdtime, lastmodifiedby, lastmodifiedtime, additionaldetails) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: Property + jsonMaps: + + - jsonPath: $.Property.id + + - jsonPath: $.Property.propertyId + + - jsonPath: $.Property.tenantId + + - jsonPath: $.Property.surveyId + + - jsonPath: $.Property.accountId + + - jsonPath: $.Property.oldPropertyId + + - jsonPath: $.Property.status + + - jsonPath: $.Property.acknowldgementNumber + + - jsonPath: $.Property.propertyType + + - jsonPath: $.Property.ownershipCategory + + - jsonPath: $.Property.usageCategory + + - jsonPath: $.Property.creationReason + + - jsonPath: $.Property.noOfFloors + + - jsonPath: $.Property.landArea + + - jsonPath: $.Property.superBuiltUpArea + + - jsonPath: $.Property.linkedProperties + type: ARRAY + dbType: STRING + + - jsonPath: $.Property.source + + - jsonPath: $.Property.channel + + - jsonPath: $.Property.auditDetails.createdBy + + - jsonPath: $.Property.auditDetails.createdTime + + - jsonPath: $.Property.auditDetails.lastModifiedBy + + - jsonPath: $.Property.auditDetails.lastModifiedTime + + - jsonPath: $.Property.additionalDetails + type: JSON + dbType: JSONB + + + - query: INSERT INTO eg_pt_owner(ownerinfouuid, tenantid, propertyid, userid, status, isprimaryowner, ownertype, ownershippercentage, institutionid, relationship, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: Property.owners.* + jsonMaps: + + - jsonPath: $.Property.owners.*.ownerInfoUuid + + - jsonPath: $.Property.tenantId + + - jsonPath: $.Property.id + + - jsonPath: $.Property.owners.*.uuid + + - jsonPath: $.Property.owners.*.status + + - jsonPath: $.Property.owners.*.isPrimaryOwner + + - jsonPath: $.Property.owners.*.ownerType + + - jsonPath: $.Property.owners.*.ownerShipPercentage + + - jsonPath: $.Property.owners.*.institutionId + + - jsonPath: $.Property.owners.*.relationship + + - jsonPath: $.Property.auditDetails.createdBy + + - jsonPath: $.Property.auditDetails.createdTime + + - jsonPath: $.Property.auditDetails.lastModifiedBy + + - jsonPath: $.Property.auditDetails.lastModifiedTime + + + - query: INSERT INTO eg_pt_document (id, tenantid, entityid, documenttype, filestoreid, documentuid, status, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: $.Property.documents.* + jsonMaps: + + - jsonPath: $.Property.documents.*.id + + - jsonPath: $.Property.tenantId + + - jsonPath: $.Property.id + + - jsonPath: $.Property.documents.*.documentType + + - jsonPath: $.Property.documents.*.fileStoreId + + - jsonPath: $.Property.documents.*.documentUid + + - jsonPath: $.Property.documents.*.status + + - jsonPath: $.Property.auditDetails.createdBy + + - jsonPath: $.Property.auditDetails.lastModifiedBy + + - jsonPath: $.Property.auditDetails.createdTime + + - jsonPath: $.Property.auditDetails.lastModifiedTime + + + - query: INSERT INTO eg_pt_document (id, tenantid, entityid, documenttype, filestoreid, documentuid, status, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: $.Property.owners.*.documents.* + jsonMaps: + + - jsonPath: $.Property.owners.*.documents.*.id + + - jsonPath: $.Property.tenantId + + - jsonPath: $.Property.owners[*][?({id} in @.documents[*].id)].ownerInfoUuid + + - jsonPath: $.Property.owners.*.documents.*.documentType + + - jsonPath: $.Property.owners.*.documents.*.fileStoreId + + - jsonPath: $.Property.owners.*.documents.*.documentUid + + - jsonPath: $.Property.documents.*.status + + - jsonPath: $.Property.auditDetails.createdBy + + - jsonPath: $.Property.auditDetails.lastModifiedBy + + - jsonPath: $.Property.auditDetails.createdTime + + - jsonPath: $.Property.auditDetails.lastModifiedTime + + + - query: INSERT INTO eg_pt_institution (id, propertyid, tenantid, name, nameofauthorizedperson, type, designation, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: $.Property.institution + jsonMaps: + + - jsonPath: $.Property.institution.id + + - jsonPath: $.Property.id + + - jsonPath: $.Property.tenantId + + - jsonPath: $.Property.institution.name + + - jsonPath: $.Property.institution.nameOfAuthorizedPerson + + - jsonPath: $.Property.institution.type + + - jsonPath: $.Property.institution.designation + + - jsonPath: $.Property.auditDetails.createdBy + + - jsonPath: $.Property.auditDetails.createdTime + + - jsonPath: $.Property.auditDetails.lastModifiedBy + + - jsonPath: $.Property.auditDetails.lastModifiedTime + + + - query: INSERT INTO eg_pt_address(tenantid, id, propertyid, doorno, plotno, buildingname, street, landmark, city, pincode, locality, district, region, state, country, latitude, longitude, createdby, createdtime, lastmodifiedby, lastmodifiedtime, additionaldetails) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: Property.address + jsonMaps: + + - jsonPath: $.Property.tenantId + + - jsonPath: $.Property.address.id + + - jsonPath: $.Property.id + + - jsonPath: $.Property.address.doorNo + + - jsonPath: $.Property.address.plotNo + + - jsonPath: $.Property.address.buildingName + + - jsonPath: $.Property.address.street + + - jsonPath: $.Property.address.landmark + + - jsonPath: $.Property.address.city + + - jsonPath: $.Property.address.pincode + + - jsonPath: $.Property.address.locality.code + + - jsonPath: $.Property.address.district + + - jsonPath: $.Property.address.region + + - jsonPath: $.Property.address.state + + - jsonPath: $.Property.address.country + + - jsonPath: $.Property.address.geoLocation.latitude + + - jsonPath: $.Property.address.geoLocation.longitude + + - jsonPath: $.Property.auditDetails.createdBy + + - jsonPath: $.Property.auditDetails.createdTime + + - jsonPath: $.Property.auditDetails.lastModifiedBy + + - jsonPath: $.Property.auditDetails.lastModifiedTime + + - jsonPath: $.Property.address.additionalDetails + type: JSON + dbType: JSONB + + + - query: INSERT INTO eg_pt_unit(id, tenantid, propertyid, floorno, unittype, usagecategory, occupancytype, occupancydate, carpetarea, builtuparea, plintharea, superbuiltuparea, arv, constructiontype, constructiondate, dimensions, active, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: Property.units.* + jsonMaps: + + - jsonPath: $.Property.units.*.id + + - jsonPath: $.Property.tenantId + + - jsonPath: $.Property.id + + - jsonPath: $.Property.units.*.floorNo + + - jsonPath: $.Property.units.*.unitType + + - jsonPath: $.Property.units.*.usageCategory + + - jsonPath: $.Property.units.*.occupancyType + + - jsonPath: $.Property.units.*.occupancyDate + + - jsonPath: $.Property.units.*.constructionDetail.carpetArea + + - jsonPath: $.Property.units.*.constructionDetail.builtUpArea + + - jsonPath: $.Property.units.*.constructionDetail.plinthArea + + - jsonPath: $.Property.units.*.constructionDetail.superBuiltUpArea + + - jsonPath: $.Property.units.*.arv + + - jsonPath: $.Property.units.*.constructionDetail.constructionType + + - jsonPath: $.Property.units.*.constructionDetail.constructionDate + + - jsonPath: $.Property.units.*.constructionDetail.dimensions + type: JSON + dbType: JSONB + + - jsonPath: $.Property.units.*.active + + - jsonPath: $.Property.auditDetails.createdBy + + - jsonPath: $.Property.auditDetails.createdTime + + - jsonPath: $.Property.auditDetails.lastModifiedBy + + - jsonPath: $.Property.auditDetails.lastModifiedTime + + - version: 1.0 + description: Update property EG_PT_PROPERTY ltable + fromTopic: update-property-registry + isTransaction: true + queryMaps: + + + - query: INSERT INTO eg_pt_property_audit (audituuid, propertyid, property, auditcreatedtime) VALUES ((select nextval('seq_eg_pt_registry_audit')), ?, ?, (SELECT extract(epoch from now()))); + basePath: Property + jsonMaps: + + - jsonPath: $.Property.propertyId + + - jsonPath: $.Property + type: JSON + dbType: JSONB + + - query: UPDATE eg_pt_property SET propertyid=?, surveyid=?, accountid=?, oldpropertyid=?, status=?, propertytype=?, ownershipcategory=?, usagecategory=?, nooffloors=?, landarea=?, superbuiltuparea=?, linkedproperties=?, lastmodifiedby=?, lastmodifiedtime=?, additionaldetails=? WHERE Id=? AND tenantId=?; + basePath: Property + jsonMaps: + + - jsonPath: $.Property.propertyId + + - jsonPath: $.Property.surveyId + + - jsonPath: $.Property.accountId + + - jsonPath: $.Property.oldPropertyId + + - jsonPath: $.Property.status + + - jsonPath: $.Property.propertyType + + - jsonPath: $.Property.ownershipCategory + + - jsonPath: $.Property.usageCategory + + - jsonPath: $.Property.noOfFloors + + - jsonPath: $.Property.landArea + + - jsonPath: $.Property.superBuiltUpArea + + - jsonPath: $.Property.linkedProperties + + - jsonPath: $.Property.auditDetails.lastModifiedBy + + - jsonPath: $.Property.auditDetails.lastModifiedTime + + - jsonPath: $.Property.additionalDetails + type: JSON + dbType: JSONB + + - jsonPath: $.Property.id + + - jsonPath: $.Property.tenantId + + + - query: INSERT INTO eg_pt_owner (ownerinfouuid, tenantid, propertyid, userid, status, isprimaryowner, ownertype, ownershippercentage, institutionid, relationship, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (userid, propertyid) DO UPDATE SET status=EXCLUDED.status, isprimaryowner=EXCLUDED.isprimaryowner, ownertype=EXCLUDED.ownertype, ownershippercentage=EXCLUDED.ownershippercentage, institutionid=EXCLUDED.institutionid, relationship=EXCLUDED.relationship, lastmodifiedby=EXCLUDED.lastModifiedby, lastmodifiedtime=EXCLUDED.lastmodifiedtime; + basePath: Property.owners.* + jsonMaps: + + - jsonPath: $.Property.owners.*.ownerInfoUuid + + - jsonPath: $.Property.tenantId + + - jsonPath: $.Property.id + + - jsonPath: $.Property.owners.*.uuid + + - jsonPath: $.Property.owners.*.status + + - jsonPath: $.Property.owners.*.isPrimaryOwner + + - jsonPath: $.Property.owners.*.ownerType + + - jsonPath: $.Property.owners.*.ownerShipPercentage + + - jsonPath: $.Property.owners.*.institutionId + + - jsonPath: $.Property.owners.*.relationship + + - jsonPath: $.Property.auditDetails.createdBy + + - jsonPath: $.Property.auditDetails.createdTime + + - jsonPath: $.Property.auditDetails.lastModifiedBy + + - jsonPath: $.Property.auditDetails.lastModifiedTime + + - query: INSERT INTO eg_pt_document (id, tenantid, entityid, documenttype, filestoreid, documentuid, status, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET documenttype = EXCLUDED.documenttype,fileStoreid = EXCLUDED.filestoreid, documentuid=EXCLUDED.documentuid, status=EXCLUDED.status, lastmodifiedby = EXCLUDED.lastModifiedby, lastmodifiedtime = EXCLUDED.lastmodifiedtime; + basePath: $.Property.documents.* + jsonMaps: + + - jsonPath: $.Property.documents.*.id + + - jsonPath: $.Property.tenantId + + - jsonPath: $.Property.id + + - jsonPath: $.Property.documents.*.documentType + + - jsonPath: $.Property.documents.*.fileStoreId + + - jsonPath: $.Property.documents.*.documentUid + + - jsonPath: $.Property.documents.*.status + + - jsonPath: $.Property.auditDetails.createdBy + + - jsonPath: $.Property.auditDetails.lastModifiedBy + + - jsonPath: $.Property.auditDetails.createdTime + + - jsonPath: $.Property.auditDetails.lastModifiedTime + + - query: INSERT INTO eg_pt_document (id, tenantid, entityid, documenttype, filestoreid, documentuid, status, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET documenttype = EXCLUDED.documenttype,fileStoreid = EXCLUDED.filestoreid, documentuid=EXCLUDED.documentuid, status=EXCLUDED.status, lastmodifiedby = EXCLUDED.lastModifiedby, lastmodifiedtime = EXCLUDED.lastmodifiedtime; + basePath: $.Property.owners.*.documents.* + jsonMaps: + + - jsonPath: $.Property.owners.*.documents.*.id + + - jsonPath: $.Property.tenantId + + - jsonPath: $.Property.owners[*][?({id} in @.documents[*].id)].ownerInfoUuid + + - jsonPath: $.Property.owners.*.documents.*.documentType + + - jsonPath: $.Property.owners.*.documents.*.fileStoreId + + - jsonPath: $.Property.owners.*.documents.*.documentUid + + - jsonPath: $.Property.owners.*.documents.*.status + + - jsonPath: $.Property.auditDetails.createdBy + + - jsonPath: $.Property.auditDetails.lastModifiedBy + + - jsonPath: $.Property.auditDetails.createdTime + + - jsonPath: $.Property.auditDetails.lastModifiedTime + + - query: UPDATE eg_pt_address SET doorno=?, plotno=?, buildingname=?, street=?, landmark=?, city=?, pincode=?, locality=?, district=?, region=?, state=?, country=?, latitude=?, longitude=?, lastmodifiedby=?, lastmodifiedtime=?, additionaldetails=? WHERE id=?; + basePath: Property.address + jsonMaps: + + - jsonPath: $.Property.address.doorNo + + - jsonPath: $.Property.address.plotNo + + - jsonPath: $.Property.address.buildingName + + - jsonPath: $.Property.address.street + + - jsonPath: $.Property.address.landmark + + - jsonPath: $.Property.address.city + + - jsonPath: $.Property.address.pincode + + - jsonPath: $.Property.address.locality.code + + - jsonPath: $.Property.address.district + + - jsonPath: $.Property.address.region + + - jsonPath: $.Property.address.state + + - jsonPath: $.Property.address.country + + - jsonPath: $.Property.address.geoLocation.latitude + + - jsonPath: $.Property.address.geoLocation.longitude + + - jsonPath: $.Property.auditDetails.lastModifiedBy + + - jsonPath: $.Property.auditDetails.lastModifiedTime + + - jsonPath: $.Property.address.additionalDetails + type: JSON + dbType: JSONB + + - jsonPath: $.Property.address.id + + - query: INSERT INTO eg_pt_institution (id, propertyid, tenantid, name, nameofauthorizedperson, type, designation, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET name=EXCLUDED.name, type=EXCLUDED.type, designation=EXCLUDED.designation, lastmodifiedby=EXCLUDED.lastModifiedby, lastmodifiedtime=EXCLUDED.lastmodifiedtime; + basePath: $.Property.institution + jsonMaps: + + - jsonPath: $.Property.institution.id + + - jsonPath: $.Property.id + + - jsonPath: $.Property.tenantId + + - jsonPath: $.Property.institution.name + + - jsonPath: $.Property.institution.nameOfAuthorizedPerson + + - jsonPath: $.Property.institution.type + + - jsonPath: $.Property.institution.designation + + - jsonPath: $.Property.auditDetails.createdBy + + - jsonPath: $.Property.auditDetails.createdTime + + - jsonPath: $.Property.auditDetails.lastModifiedBy + + - jsonPath: $.Property.auditDetails.lastModifiedTime + + + - query: UPDATE eg_pt_unit SET floorno=?, unittype=?, usagecategory=?, occupancytype=?, occupancydate=?, carpetarea=?, builtuparea=?, plintharea=?, superbuiltuparea=?, arv=?, constructiontype=?, constructiondate=?, dimensions=?, active=?, lastmodifiedby=?, lastmodifiedtime=? WHERE id=?; + basePath: Property.units.* + jsonMaps: + + - jsonPath: $.Property.units.*.floorNo + + - jsonPath: $.Property.units.*.unitType + + - jsonPath: $.Property.units.*.usageCategory + + - jsonPath: $.Property.units.*.occupancyType + + - jsonPath: $.Property.units.*.occupancyDate + + - jsonPath: $.Property.units.*.constructionDetail.carpetArea + + - jsonPath: $.Property.units.*.constructionDetail.builtUpArea + + - jsonPath: $.Property.units.*.constructionDetail.plinthArea + + - jsonPath: $.Property.units.*.constructionDetail.superBuiltUpArea + + - jsonPath: $.Property.units.*.arv + + - jsonPath: $.Property.units.*.constructionDetail.constructionType + + - jsonPath: $.Property.units.*.constructionDetail.constructionDate + + - jsonPath: $.Property.units.*.constructionDetail.dimensions + type: JSON + dbType: JSONB + + - jsonPath: $.Property.units.*.active + + - jsonPath: $.Property.auditDetails.lastModifiedBy + + - jsonPath: $.Property.auditDetails.lastModifiedTime + + - jsonPath: $.Property.units.*.id + + + - version: 1.0 + description: Update documents in EG_PT_PROPERTY ltable + fromTopic: update-property-doc-registry + isTransaction: true + queryMaps: + + + - query: INSERT INTO eg_pt_document (id, tenantid, entityid, documenttype, filestoreid, documentuid, status, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET documenttype = EXCLUDED.documenttype,fileStoreid = EXCLUDED.filestoreid, documentuid=EXCLUDED.documentuid, status=EXCLUDED.status, lastmodifiedby = EXCLUDED.lastModifiedby, lastmodifiedtime = EXCLUDED.lastmodifiedtime; + basePath: $.Property.documents.* + jsonMaps: + + - jsonPath: $.Property.documents.*.id + + - jsonPath: $.Property.tenantId + + - jsonPath: $.Property.id + + - jsonPath: $.Property.documents.*.documentType + + - jsonPath: $.Property.documents.*.fileStoreId + + - jsonPath: $.Property.documents.*.documentUid + + - jsonPath: $.Property.documents.*.status + + - jsonPath: $.Property.auditDetails.createdBy + + - jsonPath: $.Property.auditDetails.lastModifiedBy + + - jsonPath: $.Property.auditDetails.createdTime + + - jsonPath: $.Property.auditDetails.lastModifiedTime diff --git a/configs/egov-persister/property-services.yml b/configs/egov-persister/property-services.yml new file mode 100644 index 00000000..0e4514f5 --- /dev/null +++ b/configs/egov-persister/property-services.yml @@ -0,0 +1,819 @@ +serviceMaps: + serviceName: property-services + mappings: + - version: 1.0 + description: Persists property details in EG_PT_PROPERTY table + fromTopic: save-pt-property + isTransaction: true + queryMaps: + + - query: INSERT INTO eg_pt_property_v2(tenantId,propertyId, status,acknowldgementNumber, oldPropertyId, creationReason, occupancyDate,additionalDetails ,createdBy,createdTime,lastModifiedBy,lastModifiedTime ) VALUES (?,?,?,?,?,?,?,?,?,?,?,?); + basePath: Properties.* + jsonMaps: + - jsonPath: $.Properties.*.tenantId + + - jsonPath: $.Properties.*.propertyId + + - jsonPath: $.Properties.*.status + + - jsonPath: $.Properties.*.acknowldgementNumber + + - jsonPath: $.Properties.*.oldPropertyId + + - jsonPath: $.Properties.*.creationReason + + - jsonPath: $.Properties.*.occupancyDate + + - jsonPath: $.Properties.*.additionalDetails + type: JSON + dbType: JSONB + + - jsonPath: $.Properties.*.auditDetails.createdBy + + - jsonPath: $.Properties.*.auditDetails.createdTime + + - jsonPath: $.Properties.*.auditDetails.lastModifiedBy + + - jsonPath: $.Properties.*.auditDetails.lastModifiedTime + + + - query: INSERT INTO eg_pt_propertydetail_v2(tenantId,assessmentNumber,property,accountId,ownershipCategory,subOwnershipCategory,source,usage,noOfFloors,landArea,buildUpArea,additionalDetails,channel,financialYear,propertyType,propertySubType,usageCategoryMajor,usageCategoryMinor,assessmentDate,adhocExemption,adhocPenalty,adhocExemptionReason,adhocPenaltyReason,createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?); + basePath: Properties.*.propertyDetails.* + jsonMaps: + + - jsonPath: $.Properties[*][?({assessmentNumber} in @.propertyDetails[*].assessmentNumber)].tenantId + + - jsonPath: $.Properties.*.propertyDetails.*.assessmentNumber + + - jsonPath: $.Properties[*][?({assessmentNumber} in @.propertyDetails[*].assessmentNumber)].propertyId + + - jsonPath: $.Properties.*.propertyDetails.*.citizenInfo.uuid + + - jsonPath: $.Properties.*.propertyDetails.*.ownershipCategory + + - jsonPath: $.Properties.*.propertyDetails.*.subOwnershipCategory + + - jsonPath: $.Properties.*.propertyDetails.*.source + + - jsonPath: $.Properties.*.propertyDetails.*.usage + + - jsonPath: $.Properties.*.propertyDetails.*.noOfFloors + + - jsonPath: $.Properties.*.propertyDetails.*.landArea + + - jsonPath: $.Properties.*.propertyDetails.*.buildUpArea + + - jsonPath: $.Properties.*.propertyDetails.*.additionalDetails + type: JSON + dbType: JSONB + + - jsonPath: $.Properties.*.propertyDetails.*.channel + + - jsonPath: $.Properties.*.propertyDetails.*.financialYear + + - jsonPath: $.Properties.*.propertyDetails.*.propertyType + + - jsonPath: $.Properties.*.propertyDetails.*.propertySubType + + - jsonPath: $.Properties.*.propertyDetails.*.usageCategoryMajor + + - jsonPath: $.Properties.*.propertyDetails.*.usageCategoryMinor + + - jsonPath: $.Properties.*.propertyDetails.*.assessmentDate + + - jsonPath: $.Properties.*.propertyDetails.*.adhocExemption + + - jsonPath: $.Properties.*.propertyDetails.*.adhocPenalty + + - jsonPath: $.Properties.*.propertyDetails.*.adhocExemptionReason + + - jsonPath: $.Properties.*.propertyDetails.*.adhocPenaltyReason + + - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.createdBy + + - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.lastModifiedBy + + - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.createdTime + + - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.lastModifiedTime + + - query: INSERT INTO eg_pt_owner_v2(tenantId,propertyDetail, userid,additionalDetails, isactive,isPrimaryOwner,ownerShipPercentage, ownerType,institutionId,relationship,createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: Properties.*.propertyDetails.*.owners.* + jsonMaps: + + - jsonPath: $.Properties[*][?({uuid} in @.propertyDetails.*.owners[*].uuid)].tenantId + + - jsonPath: $.Properties.*.propertyDetails[*][?({persisterRefId} in @.owners[*].persisterRefId)].assessmentNumber + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.uuid + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.additionalDetails + type: JSON + dbType: JSONB + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.isActive + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.isPrimaryOwner + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.ownerShipPercentage + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.ownerType + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.institutionId + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.relationship + + - jsonPath: $.Properties.*.propertyDetails[*][?({uuid} in @.owners[*].uuid)].auditDetails.createdBy + + - jsonPath: $.Properties.*.propertyDetails[*][?({uuid} in @.owners[*].uuid)].auditDetails.lastModifiedBy + + - jsonPath: $.Properties.*.propertyDetails[*][?({uuid} in @.owners[*].uuid)].auditDetails.createdTime + + - jsonPath: $.Properties.*.propertyDetails[*][?({uuid} in @.owners[*].uuid)].auditDetails.lastModifiedTime + + + + - query: INSERT INTO eg_pt_document_propertydetail_v2(tenantId,id, propertydetail, documenttype, fileStore,documentuid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?,?,?, ?, ?, ?, ?, ?, ?, ?); + basePath: $.Properties.*.propertyDetails.*.documents.* + jsonMaps: + + - jsonPath: $.Properties[*][?({id} in @.propertyDetails.*.documents[*].id)].tenantId + + - jsonPath: $.Properties.*.propertyDetails.*.documents.*.id + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.documents[*].id)].assessmentNumber + + - jsonPath: $.Properties.*.propertyDetails.*.documents.*.documentType + + - jsonPath: $.Properties.*.propertyDetails.*.documents.*.fileStore + + - jsonPath: $.Properties.*.propertyDetails.*.documents.*.documentUid + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.documents[*].id)].auditDetails.createdBy + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.documents[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.documents[*].id)].auditDetails.createdTime + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.documents[*].id)].auditDetails.lastModifiedTime + + + - query: INSERT INTO eg_pt_document_owner_v2(tenantId,id,userid, propertydetail, documenttype, fileStore,documentuid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?,?,?,?, ?, ?, ?, ?, ?, ?, ?); + basePath: $.Properties.*.propertyDetails.*.owners.*.documents.* + jsonMaps: + + - jsonPath: $.Properties[*][?({id} in @.propertyDetails.*.owners.*.documents[*].id)].tenantId + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.documents.*.id + + - jsonPath: $.Properties.*.propertyDetails.*.owners[*][?({id} in @.documents[*].id)].uuid + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.owners.*.documents[*].id)].assessmentNumber + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.documents.*.documentType + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.documents.*.fileStore + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.documents.*.documentUid + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.owners.*.documents[*].id)].auditDetails.createdBy + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.owners.*.documents[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.owners.*.documents[*].id)].auditDetails.createdTime + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.owners.*.documents[*].id)].auditDetails.lastModifiedTime + + + + - query: INSERT INTO eg_pt_address_v2(tenantId, id, property,additionalDetails,doorNo, latitude,longitude, addressid, addressnumber, type, addressline1, addressline2, landmark, city, pincode, detail,buildingName,street, locality, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ? , ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: Properties.*.address + jsonMaps: + + - jsonPath: $.Properties.*.tenantId + + - jsonPath: $.Properties.*.address.id + + - jsonPath: $.Properties.*.propertyId + + - jsonPath: $.Properties.*.address.additionalDetails + type: JSON + dbType: JSONB + + - jsonPath: $.Properties.*.address.doorNo + + - jsonPath: $.Properties.*.address.latitude + + - jsonPath: $.Properties.*.address.longitude + + - jsonPath: $.Properties.*.address.addressId + + - jsonPath: $.Properties.*.address.addressNumber + + - jsonPath: $.Properties.*.address.type + + - jsonPath: $.Properties.*.address.addressLine1 + + - jsonPath: $.Properties.*.address.addressLine2 + + - jsonPath: $.Properties.*.address.landmark + + - jsonPath: $.Properties.*.address.city + + - jsonPath: $.Properties.*.address.pincode + + - jsonPath: $.Properties.*.address.detail + + - jsonPath: $.Properties.*.address.buildingName + + - jsonPath: $.Properties.*.address.street + + - jsonPath: $.Properties.*.address.locality.code + + - jsonPath: $.Properties.*.auditDetails.createdBy + + - jsonPath: $.Properties.*.auditDetails.lastModifiedBy + + - jsonPath: $.Properties.*.auditDetails.createdTime + + - jsonPath: $.Properties.*.auditDetails.lastModifiedTime + + + - query: INSERT INTO eg_pt_unit_v2(tenantId,id,propertyDetail,additionalDetails,floorNo,unitType,unitArea,usageCategoryMajor,usageCategoryMinor,usageCategorySubMinor,usageCategoryDetail,occupancyType,occupancyDate,constructionType,constructionSubType,arv,createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?); + basePath: Properties.*.propertyDetails.*.units.* + jsonMaps: + + - jsonPath: $.Properties[*][?({id} in @.propertyDetails.*.units[*].id)].tenantId + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.id + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.units[*].id)].assessmentNumber + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.additionalDetails + type: JSON + dbType: JSONB + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.floorNo + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.unitType + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.unitArea + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.usageCategoryMajor + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.usageCategoryMinor + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.usageCategorySubMinor + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.usageCategoryDetail + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.occupancyType + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.occupancyDate + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.constructionType + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.constructionSubType + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.arv + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.units[*].id)].auditDetails.createdBy + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.units[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.units[*].id)].auditDetails.createdTime + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.units[*].id)].auditDetails.lastModifiedTime + + - query: INSERT INTO eg_pt_institution_v2(tenantId,id, propertyDetail,additionalDetails, name, type,designation, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT ON CONSTRAINT pk_eg_pt_institution_v2 DO NOTHING; + basePath: $.Properties.*.propertyDetails.*.institution + jsonMaps: + + - jsonPath: $.Properties.*.propertyDetails.*.tenantId + + - jsonPath: $.Properties.*.propertyDetails.*.institution.id + + - jsonPath: $.Properties.*.propertyDetails.*.assessmentNumber + + - jsonPath: $.Properties.*.propertyDetails.*.institution.additionalDetails + type: JSON + dbType: JSONB + + - jsonPath: $.Properties.*.propertyDetails.*.institution.name + + - jsonPath: $.Properties.*.propertyDetails.*.institution.type + + - jsonPath: $.Properties.*.propertyDetails.*.institution.designation + + - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.createdBy + + - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.lastModifiedBy + + - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.createdTime + + - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.lastModifiedTime + + + + + + - version: 1.0 + description: Update property details in EG_PT_PROPERTY table + fromTopic: update-pt-property + isTransaction: true + queryMaps: + + + - query: INSERT INTO eg_pt_property_audit_v2 SELECT * FROM eg_pt_property_v2 WHERE propertyid = ?; + basePath: Properties.* + jsonMaps: + + - jsonPath: $.Properties.*.propertyId + + + - query: INSERT INTO eg_pt_address_audit_v2 SELECT * FROM eg_pt_address_v2 WHERE id = ?; + basePath: Properties.*.address + jsonMaps: + + - jsonPath: $.Properties.*.address.id + + + + - query: UPDATE eg_pt_property_v2 SET additionalDetails=?,status=?,acknowldgementNumber=?,oldPropertyId=?,creationReason=?, occupancyDate=?,lastModifiedBy=?, lastModifiedTime=? where propertyId=? AND tenantId=?; + basePath: Properties.* + jsonMaps: + + - jsonPath: $.Properties.*.additionalDetails + type: JSON + dbType: JSONB + + - jsonPath: $.Properties.*.status + + - jsonPath: $.Properties.*.acknowldgementNumber + + - jsonPath: $.Properties.*.oldPropertyId + + - jsonPath: $.Properties.*.creationReason + + - jsonPath: $.Properties.*.occupancyDate + + - jsonPath: $.Properties.*.auditDetails.lastModifiedBy + + - jsonPath: $.Properties.*.auditDetails.lastModifiedTime + + - jsonPath: $.Properties.*.propertyId + + - jsonPath: $.Properties.*.tenantId + + + + + - query: INSERT INTO eg_pt_propertydetail_v2(tenantId,assessmentNumber,property,accountId,ownershipCategory,subOwnershipCategory,source,usage,noOfFloors,landArea,buildUpArea,additionalDetails,channel,financialYear,propertyType,propertySubType,usageCategoryMajor,usageCategoryMinor,assessmentDate,adhocExemption,adhocPenalty,adhocExemptionReason,adhocPenaltyReason,createdby, lastmodifiedby, createdtime,lastmodifiedtime) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) ON CONFLICT (assessmentNumber) DO UPDATE SET accountId=?,financialYear=?, propertyType=?, propertySubType=?,usageCategoryMajor=?,usageCategoryMinor=?, assessmentDate=?,ownershipCategory=?,subOwnershipCategory=?,source=?,usage=?,noOfFloors=?,landArea=?,buildUpArea=?,additionalDetails=?,channel=?,adhocExemption=?,adhocPenalty=?,adhocExemptionReason=?,adhocPenaltyReason=?,lastModifiedBy=?, lastModifiedTime=?; + basePath: Properties.*.propertyDetails.* + jsonMaps: + + - jsonPath: $.Properties[*][?({assessmentNumber} in @.propertyDetails[*].assessmentNumber)].tenantId + + - jsonPath: $.Properties.*.propertyDetails.*.assessmentNumber + + - jsonPath: $.Properties[*][?({assessmentNumber} in @.propertyDetails[*].assessmentNumber)].propertyId + + - jsonPath: $.Properties.*.propertyDetails.*.citizenInfo.uuid + + - jsonPath: $.Properties.*.propertyDetails.*.ownershipCategory + + - jsonPath: $.Properties.*.propertyDetails.*.subOwnershipCategory + + - jsonPath: $.Properties.*.propertyDetails.*.source + + - jsonPath: $.Properties.*.propertyDetails.*.usage + + - jsonPath: $.Properties.*.propertyDetails.*.noOfFloors + + - jsonPath: $.Properties.*.propertyDetails.*.landArea + + - jsonPath: $.Properties.*.propertyDetails.*.buildUpArea + + - jsonPath: $.Properties.*.propertyDetails.*.additionalDetails + type: JSON + dbType: JSONB + + - jsonPath: $.Properties.*.propertyDetails.*.channel + + - jsonPath: $.Properties.*.propertyDetails.*.financialYear + + - jsonPath: $.Properties.*.propertyDetails.*.propertyType + + - jsonPath: $.Properties.*.propertyDetails.*.propertySubType + + - jsonPath: $.Properties.*.propertyDetails.*.usageCategoryMajor + + - jsonPath: $.Properties.*.propertyDetails.*.usageCategoryMinor + + - jsonPath: $.Properties.*.propertyDetails.*.assessmentDate + + - jsonPath: $.Properties.*.propertyDetails.*.adhocExemption + + - jsonPath: $.Properties.*.propertyDetails.*.adhocPenalty + + - jsonPath: $.Properties.*.propertyDetails.*.adhocExemptionReason + + - jsonPath: $.Properties.*.propertyDetails.*.adhocPenaltyReason + + - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.createdBy + + - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.lastModifiedBy + + - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.createdTime + + - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.lastModifiedTime + + - jsonPath: $.Properties.*.propertyDetails.*.citizenInfo.uuid + + - jsonPath: $.Properties.*.propertyDetails.*.financialYear + + - jsonPath: $.Properties.*.propertyDetails.*.propertyType + + - jsonPath: $.Properties.*.propertyDetails.*.propertySubType + + - jsonPath: $.Properties.*.propertyDetails.*.usageCategoryMajor + + - jsonPath: $.Properties.*.propertyDetails.*.usageCategoryMinor + + - jsonPath: $.Properties.*.propertyDetails.*.assessmentDate + + - jsonPath: $.Properties.*.propertyDetails.*.ownershipCategory + + - jsonPath: $.Properties.*.propertyDetails.*.subOwnershipCategory + + - jsonPath: $.Properties.*.propertyDetails.*.source + + - jsonPath: $.Properties.*.propertyDetails.*.usage + + - jsonPath: $.Properties.*.propertyDetails.*.noOfFloors + + - jsonPath: $.Properties.*.propertyDetails.*.landArea + + - jsonPath: $.Properties.*.propertyDetails.*.buildUpArea + + - jsonPath: $.Properties.*.propertyDetails.*.additionalDetails + type: JSON + dbType: JSONB + + - jsonPath: $.Properties.*.propertyDetails.*.channel + + - jsonPath: $.Properties.*.propertyDetails.*.adhocExemption + + - jsonPath: $.Properties.*.propertyDetails.*.adhocPenalty + + - jsonPath: $.Properties.*.propertyDetails.*.adhocExemptionReason + + - jsonPath: $.Properties.*.propertyDetails.*.adhocPenaltyReason + + - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.lastModifiedBy + + - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.lastModifiedTime + + + + - query: INSERT INTO eg_pt_owner_v2(tenantId,propertyDetail, userid,additionalDetails, isActive,isPrimaryOwner,ownerShipPercentage, ownerType,institutionId,relationship, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT ON CONSTRAINT pk_eg_pt_owner_v2 DO UPDATE SET additionalDetails=?,isActive =?,isPrimaryOwner=?,ownerShipPercentage=?,ownerType=?,institutionId=?,relationship=?,lastmodifiedby =?,lastmodifiedtime =?; + basePath: Properties.*.propertyDetails.*.owners.* + jsonMaps: + + - jsonPath: $.Properties[*][?({uuid} in @.propertyDetails.*.owners[*].uuid)].tenantId + + - jsonPath: $.Properties.*.propertyDetails[*][?({persisterRefId} in @.owners[*].persisterRefId)].assessmentNumber + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.uuid + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.additionalDetails + type: JSON + dbType: JSONB + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.isActive + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.isPrimaryOwner + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.ownerShipPercentage + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.ownerType + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.institutionId + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.relationship + + - jsonPath: $.Properties.*.propertyDetails[*][?({persisterRefId} in @.owners[*].persisterRefId)].auditDetails.lastModifiedBy + + - jsonPath: $.Properties.*.propertyDetails[*][?({persisterRefId} in @.owners[*].persisterRefId)].auditDetails.lastModifiedBy + + - jsonPath: $.Properties.*.propertyDetails[*][?({persisterRefId} in @.owners[*].persisterRefId)].auditDetails.lastModifiedTime + + - jsonPath: $.Properties.*.propertyDetails[*][?({persisterRefId} in @.owners[*].persisterRefId)].auditDetails.lastModifiedTime + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.additionalDetails + type: JSON + dbType: JSONB + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.isActive + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.isPrimaryOwner + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.ownerShipPercentage + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.ownerType + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.institutionId + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.relationship + + - jsonPath: $.Properties.*.propertyDetails[*][?({persisterRefId} in @.owners[*].persisterRefId)].auditDetails.lastModifiedBy + + - jsonPath: $.Properties.*.propertyDetails[*][?({persisterRefId} in @.owners[*].persisterRefId)].auditDetails.lastModifiedTime + + + - query: INSERT INTO eg_pt_document_propertydetail_v2(tenantId,id, propertydetail, documenttype, fileStore,documentuid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?,?) ON CONFLICT (id) DO UPDATE SET documenttype = ?, fileStore = ?,documentuid=?, lastmodifiedby = ?, lastmodifiedtime = ?; + basePath: $.Properties.*.propertyDetails.*.documents.* + jsonMaps: + + - jsonPath: $.Properties[*][?({id} in @.propertyDetails.*.documents[*].id)].tenantId + + - jsonPath: $.Properties.*.propertyDetails.*.documents.*.id + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.documents[*].id)].assessmentNumber + + - jsonPath: $.Properties.*.propertyDetails.*.documents.*.documentType + + - jsonPath: $.Properties.*.propertyDetails.*.documents.*.fileStore + + - jsonPath: $.Properties.*.propertyDetails.*.documents.*.documentUid + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.documents[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.documents[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.documents[*].id)].auditDetails.lastModifiedTime + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.documents[*].id)].auditDetails.lastModifiedTime + + - jsonPath: $.Properties.*.propertyDetails.documents.*.documentType + + - jsonPath: $.Properties.*.propertyDetails.*.documents.*.fileStore + + - jsonPath: $.Properties.*.propertyDetails.*.documents.*.documentUid + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.documents[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.documents[*].id)].auditDetails.lastModifiedTime + + + - query: INSERT INTO eg_pt_document_owner_v2(tenantId,id, userid,propertydetail, documenttype, fileStore,documentuid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?) ON CONFLICT (userid,propertydetail) DO UPDATE SET documenttype = ?, fileStore = ?,documentuid=?, lastmodifiedby = ?, lastmodifiedtime = ?; + basePath: $.Properties.*.propertyDetails.*.owners.*.documents.* + jsonMaps: + + - jsonPath: $.Properties[*][?({id} in @.propertyDetails.*.owners.*.documents[*].id)].tenantId + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.documents.*.id + + - jsonPath: $.Properties.*.propertyDetails.*.owners[*][?({id} in @.documents[*].id)].uuid + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.owners.*.documents[*].id)].assessmentNumber + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.documents.*.documentType + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.documents.*.fileStore + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.documents.*.documentUid + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.owners.*.documents[*].id)].auditDetails.createdBy + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.owners.*.documents[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.owners.*.documents[*].id)].auditDetails.createdTime + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.owners.*.documents[*].id)].auditDetails.lastModifiedTime + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.documents.*.documentType + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.documents.*.fileStore + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.documents.*.documentUid + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.owners.*.documents[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.owners.*.documents[*].id)].auditDetails.lastModifiedTime + + + + - query: INSERT INTO eg_pt_unit_v2(tenantId,id,propertyDetail,additionalDetails,floorNo,unitType,unitArea,usageCategoryMajor,usageCategoryMinor,usageCategorySubMinor,usageCategoryDetail,occupancyType,occupancyDate,constructionType,constructionSubType,arv,createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) ON CONFLICT (id) DO UPDATE SET additionalDetails=?,floorNo=?,unitType=?,unitArea=?,usageCategoryMajor=?,usageCategoryMinor=?,usageCategorySubMinor=?,usageCategoryDetail=?,occupancyType=?,occupancyDate=?,constructionType=?,constructionSubType=?,arv=?,lastmodifiedby=?,lastmodifiedtime=?; + basePath: Properties.*.propertyDetails.*.units.* + jsonMaps: + + - jsonPath: $.Properties[*][?({id} in @.propertyDetails.*.units[*].id)].tenantId + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.id + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.units[*].id)].assessmentNumber + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.additionalDetails + type: JSON + dbType: JSONB + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.floorNo + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.unitType + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.unitArea + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.usageCategoryMajor + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.usageCategoryMinor + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.usageCategorySubMinor + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.usageCategoryDetail + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.occupancyType + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.occupancyDate + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.constructionType + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.constructionSubType + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.arv + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.units[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.units[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.units[*].id)].auditDetails.lastModifiedTime + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.units[*].id)].auditDetails.lastModifiedTime + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.additionalDetails + type: JSON + dbType: JSONB + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.floorNo + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.unitType + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.unitArea + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.usageCategoryMajor + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.usageCategoryMinor + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.usageCategorySubMinor + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.usageCategoryDetail + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.occupancyType + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.occupancyDate + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.constructionType + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.constructionSubType + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.arv + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.units[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.units[*].id)].auditDetails.lastModifiedTime + + + + - query: UPDATE eg_pt_address_v2 SET additionalDetails=?,doorNo=?,latitude=?,longitude=?, addressid=?, addressnumber=?, type=?, addressline1=?, addressline2=?, landmark=?, city=?, pincode=?, detail=?,buildingName=?,street=?, locality=?, lastmodifiedby=?, lastmodifiedtime=? where id=?; + basePath: Properties.*.address + jsonMaps: + + - jsonPath: $.Properties.*.address.additionalDetails + type: JSON + dbType: JSONB + + - jsonPath: $.Properties.*.address.doorNo + + - jsonPath: $.Properties.*.address.latitude + + - jsonPath: $.Properties.*.address.longitude + + - jsonPath: $.Properties.*.address.addressId + + - jsonPath: $.Properties.*.address.addressNumber + + - jsonPath: $.Properties.*.address.type + + - jsonPath: $.Properties.*.address.addressLine1 + + - jsonPath: $.Properties.*.address.addressLine2 + + - jsonPath: $.Properties.*.address.landmark + + - jsonPath: $.Properties.*.address.city + + - jsonPath: $.Properties.*.address.pincode + + - jsonPath: $.Properties.*.address.detail + + - jsonPath: $.Properties.*.address.buildingName + + - jsonPath: $.Properties.*.address.street + + - jsonPath: $.Properties.*.address.locality.code + + - jsonPath: $.Properties.*.auditDetails.lastModifiedBy + + - jsonPath: $.Properties.*.auditDetails.lastModifiedTime + + - jsonPath: $.Properties.*.address.id + + + - query: INSERT INTO eg_pt_institution_v2(tenantId,id, propertyDetail,additionalDetails, name, type,designation, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?) ON CONFLICT (id) DO UPDATE SET additionalDetails=?,name=?,type=?,designation=?,lastmodifiedby=?,lastmodifiedtime=?; + basePath: $.Properties.*.propertyDetails.*.institution + jsonMaps: + + - jsonPath: $.Properties.*.propertyDetails.*.tenantId + + - jsonPath: $.Properties.*.propertyDetails.*.institution.id + + - jsonPath: $.Properties.*.propertyDetails.*.assessmentNumber + + - jsonPath: $.Properties.*.propertyDetails.*.institution.additionalDetails + type: JSON + dbType: JSONB + + - jsonPath: $.Properties.*.propertyDetails.*.institution.name + + - jsonPath: $.Properties.*.propertyDetails.*.institution.type + + - jsonPath: $.Properties.*.propertyDetails.*.institution.designation + + - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.createdBy + + - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.lastModifiedBy + + - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.createdTime + + - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.lastModifiedTime + + - jsonPath: $.Properties.*.propertyDetails.*.institution.additionalDetails + type: JSON + dbType: JSONB + + - jsonPath: $.Properties.*.propertyDetails.*.institution.name + + - jsonPath: $.Properties.*.propertyDetails.*.institution.type + + - jsonPath: $.Properties.*.propertyDetails.*.institution.designation + + - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.lastModifiedBy + + - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.lastModifiedTime + + + - version: 1.0 + description: Cancel property details in eg_pt_propertydetail_v2 table + fromTopic: cancel-pt-propertyDetail + isTransaction: true + queryMaps: + + - query: UPDATE eg_pt_propertydetail_v2 SET status=? where propertyId=? AND assessmentNumber=? AND tenantId=?; + basePath: Properties.*.propertyDetails.* + jsonMaps: + + - jsonPath: $.Properties.*.propertyDetails.*.status + + - jsonPath: $.Properties[*][?({assessmentNumber} in @.propertyDetails[*].assessmentNumber)].propertyId + + - jsonPath: $.Properties.*.propertyDetails.*.assessmentNumber + + - jsonPath: $.Properties[*][?({assessmentNumber} in @.propertyDetails[*].assessmentNumber)].tenantId + + - version: 1.0 + description: Cancel property in eg_pt_property_v2 table + fromTopic: cancel-pt-property + isTransaction: true + queryMaps: + + - query: UPDATE eg_pt_property_v2 SET status=? where propertyId=? AND tenantId=?; + basePath: Properties.* + jsonMaps: + + - jsonPath: $.Properties.*.status + + - jsonPath: $.Properties.*.propertyId + + - jsonPath: $.Properties.*.tenantId + + - query: UPDATE eg_pt_propertydetail_v2 SET status=? where propertyId=? AND assessmentNumber=? AND tenantId=?; + basePath: Properties.*.propertyDetails.* + jsonMaps: + + - jsonPath: $.Properties.*.propertyDetails.*.status + + - jsonPath: $.Properties[*][?({assessmentNumber} in @.propertyDetails[*].assessmentNumber)].propertyId + + - jsonPath: $.Properties.*.propertyDetails.*.assessmentNumber + + - jsonPath: $.Properties[*][?({assessmentNumber} in @.propertyDetails[*].assessmentNumber)].tenantId From 07c46d33cf0425c4dea4ce50d815d5dfde7e7fef Mon Sep 17 00:00:00 2001 From: Deependra-egov <47975393+Deependra-egov@users.noreply.github.com> Date: Mon, 15 Jun 2020 12:22:54 +0530 Subject: [PATCH 0011/1242] update collection yml file --- configs/egov-persister/collection-migration-persister.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/configs/egov-persister/collection-migration-persister.yml b/configs/egov-persister/collection-migration-persister.yml index 8f580e09..ce324ec4 100644 --- a/configs/egov-persister/collection-migration-persister.yml +++ b/configs/egov-persister/collection-migration-persister.yml @@ -74,7 +74,7 @@ serviceMaps: - jsonPath: $.Payments.*.paymentDetails.*.tenantId - - jsonPath: $.Payments.*.id + - jsonPath: $.Payments.*.paymentDetails.*.paymentId - jsonPath: $.Payments.*.paymentDetails.*.totalDue type: DOUBLE @@ -235,4 +235,3 @@ serviceMaps: - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.billAccountDetails.*.additionalDetails type: JSON dbType: JSONB - From 75b0b7c153c61fffb746d02139f53f2bfa07f547 Mon Sep 17 00:00:00 2001 From: narendrabandhamneni-wt-egov Date: Wed, 17 Jun 2020 14:41:57 +0530 Subject: [PATCH 0012/1242] corrected the format of pt --- configs/egov-searcher/localitySearcher.yml | 139 +++++++++++++++++++++ 1 file changed, 139 insertions(+) diff --git a/configs/egov-searcher/localitySearcher.yml b/configs/egov-searcher/localitySearcher.yml index c44c27cc..4116f5d9 100644 --- a/configs/egov-searcher/localitySearcher.yml +++ b/configs/egov-searcher/localitySearcher.yml @@ -146,3 +146,142 @@ SearchDefinitions: jsonFormat: {"ResponseInfo": {}} outJsonPath: $.Localities responseInfoPath: $.ResponseInfo +- name: PT + query: + baseQuery: | + Select row_to_json(result) from + ( + select property.propertyid as referenceNumber,locality from eg_pt_property property + INNER JOIN eg_pt_address ptadd ON ptadd.propertyid = property.id + ) result $where + groupBy: + orderBy: + searchParams: + condition: AND + params: + - name: result.referenceNumber + isMandatory: true + jsonPath: $.searchCriteria.referenceNumber + operator: + + output: + jsonFormat: {"ResponseInfo": {}} + outJsonPath: $.Localities + responseInfoPath: $.ResponseInfo + + - name: ws-services + query: + baseQuery: | + Select row_to_json(result) from + ( + select applicationno as referenceNumber,locality from eg_ws_connection conn + INNER JOIN eg_pt_property property ON property.id = conn.property_id + INNER JOIN eg_pt_address ptadd ON ptadd.propertyid = property.id + ) result $where + groupBy: + orderBy: + searchParams: + condition: AND + params: + - name: result.referenceNumber + isMandatory: true + jsonPath: $.searchCriteria.referenceNumber + operator: + + output: + jsonFormat: {"ResponseInfo": {}} + outJsonPath: $.Localities + responseInfoPath: $.ResponseInfo + - name: sw-services + query: + baseQuery: | + Select row_to_json(result) from + ( + select applicationno as referenceNumber,locality from eg_sw_connection conn + INNER JOIN eg_pt_property property ON property.id = conn.property_id + INNER JOIN eg_pt_address ptadd ON ptadd.propertyid = property.id + ) result $where + groupBy: + orderBy: + searchParams: + condition: AND + params: + - name: result.referenceNumber + isMandatory: true + jsonPath: $.searchCriteria.referenceNumber + operator: + + output: + jsonFormat: {"ResponseInfo": {}} + outJsonPath: $.Localities + responseInfoPath: $.ResponseInfo + + - name: PT + query: + baseQuery: | + Select row_to_json(result) from + ( + select property.propertyid as referenceNumber,locality from eg_pt_property property + INNER JOIN eg_pt_address ptadd ON ptadd.propertyid = property.id + ) result $where + groupBy: + orderBy: + searchParams: + condition: AND + params: + - name: result.referenceNumber + isMandatory: true + jsonPath: $.searchCriteria.referenceNumber + operator: + + output: + jsonFormat: {"ResponseInfo": {}} + outJsonPath: $.Localities + responseInfoPath: $.ResponseInfo + + - name: ws-services + query: + baseQuery: | + Select row_to_json(result) from + ( + select applicationno as referenceNumber,locality from eg_ws_connection conn + INNER JOIN eg_pt_property property ON property.id = conn.property_id + INNER JOIN eg_pt_address ptadd ON ptadd.propertyid = property.id + ) result $where + groupBy: + orderBy: + searchParams: + condition: AND + params: + - name: result.referenceNumber + isMandatory: true + jsonPath: $.searchCriteria.referenceNumber + operator: + + output: + jsonFormat: {"ResponseInfo": {}} + outJsonPath: $.Localities + responseInfoPath: $.ResponseInfo + - name: sw-services + query: + baseQuery: | + Select row_to_json(result) from + ( + select applicationno as referenceNumber,locality from eg_sw_connection conn + INNER JOIN eg_pt_property property ON property.id = conn.property_id + INNER JOIN eg_pt_address ptadd ON ptadd.propertyid = property.id + ) result $where + groupBy: + orderBy: + searchParams: + condition: AND + params: + - name: result.referenceNumber + isMandatory: true + jsonPath: $.searchCriteria.referenceNumber + operator: + + output: + jsonFormat: {"ResponseInfo": {}} + outJsonPath: $.Localities + responseInfoPath: $.ResponseInfo From f33ddb7d507257cb544f4312c98411d46b82457e Mon Sep 17 00:00:00 2001 From: narendrabandhamneni-wt-egov Date: Wed, 17 Jun 2020 14:56:27 +0530 Subject: [PATCH 0013/1242] corrected the format --- configs/egov-searcher/localitySearcher.yml | 111 ++------------------- 1 file changed, 9 insertions(+), 102 deletions(-) diff --git a/configs/egov-searcher/localitySearcher.yml b/configs/egov-searcher/localitySearcher.yml index 4116f5d9..e6b8845c 100644 --- a/configs/egov-searcher/localitySearcher.yml +++ b/configs/egov-searcher/localitySearcher.yml @@ -21,7 +21,7 @@ SearchDefinitions: - name: result.referenceNumber isMandatory: true jsonPath: $.searchCriteria.referenceNumber - operator: + operator: output: jsonFormat: {"ResponseInfo": {}} @@ -45,13 +45,13 @@ SearchDefinitions: - name: result.referenceNumber isMandatory: true jsonPath: $.searchCriteria.referenceNumber - operator: + operator: output: jsonFormat: {"ResponseInfo": {}} outJsonPath: $.Localities responseInfoPath: $.ResponseInfo - + - name: BPAREG query: @@ -70,7 +70,7 @@ SearchDefinitions: - name: result.referenceNumber isMandatory: true jsonPath: $.searchCriteria.referenceNumber - operator: + operator: output: jsonFormat: {"ResponseInfo": {}} @@ -83,7 +83,7 @@ SearchDefinitions: Select row_to_json(result) from ( select applicationNo as referenceNumber,locality from eg_bpa_buildingplan bpa - INNER JOIN eg_bpa_address ad ON ad.buildingplanid = bpa.id + INNER JOIN eg_land_Address ad ON ad.landInfoId = bpa.landid ) result $where groupBy: orderBy: @@ -93,60 +93,14 @@ SearchDefinitions: - name: result.referenceNumber isMandatory: true jsonPath: $.searchCriteria.referenceNumber - operator: - - output: - jsonFormat: {"ResponseInfo": {}} - outJsonPath: $.Localities - responseInfoPath: $.ResponseInfo - - - name: ws-services - query: - baseQuery: | - Select row_to_json(result) from - ( - select applicationno as referenceNumber,locality from eg_ws_connection conn - INNER JOIN eg_pt_property property ON property.id = conn.property_id - INNER JOIN eg_pt_address ptadd ON ptadd.propertyid = property.id - ) result $where - groupBy: - orderBy: - searchParams: - condition: AND - params: - - name: result.referenceNumber - isMandatory: true - jsonPath: $.searchCriteria.referenceNumber - operator: + operator: output: jsonFormat: {"ResponseInfo": {}} outJsonPath: $.Localities responseInfoPath: $.ResponseInfo - - name: sw-services - query: - baseQuery: | - Select row_to_json(result) from - ( - select applicationno as referenceNumber,locality from eg_sw_connection conn - INNER JOIN eg_pt_property property ON property.id = conn.property_id - INNER JOIN eg_pt_address ptadd ON ptadd.propertyid = property.id - ) result $where - groupBy: - orderBy: - searchParams: - condition: AND - params: - - name: result.referenceNumber - isMandatory: true - jsonPath: $.searchCriteria.referenceNumber - operator: - output: - jsonFormat: {"ResponseInfo": {}} - outJsonPath: $.Localities - responseInfoPath: $.ResponseInfo -- name: PT + - name: pt-services query: baseQuery: | Select row_to_json(result) from @@ -164,58 +118,11 @@ SearchDefinitions: jsonPath: $.searchCriteria.referenceNumber operator: - output: - jsonFormat: {"ResponseInfo": {}} - outJsonPath: $.Localities - responseInfoPath: $.ResponseInfo - - - name: ws-services - query: - baseQuery: | - Select row_to_json(result) from - ( - select applicationno as referenceNumber,locality from eg_ws_connection conn - INNER JOIN eg_pt_property property ON property.id = conn.property_id - INNER JOIN eg_pt_address ptadd ON ptadd.propertyid = property.id - ) result $where - groupBy: - orderBy: - searchParams: - condition: AND - params: - - name: result.referenceNumber - isMandatory: true - jsonPath: $.searchCriteria.referenceNumber - operator: - output: jsonFormat: {"ResponseInfo": {}} outJsonPath: $.Localities responseInfoPath: $.ResponseInfo - - name: sw-services - query: - baseQuery: | - Select row_to_json(result) from - ( - select applicationno as referenceNumber,locality from eg_sw_connection conn - INNER JOIN eg_pt_property property ON property.id = conn.property_id - INNER JOIN eg_pt_address ptadd ON ptadd.propertyid = property.id - ) result $where - groupBy: - orderBy: - searchParams: - condition: AND - params: - - name: result.referenceNumber - isMandatory: true - jsonPath: $.searchCriteria.referenceNumber - operator: - output: - jsonFormat: {"ResponseInfo": {}} - outJsonPath: $.Localities - responseInfoPath: $.ResponseInfo - - name: PT query: baseQuery: | @@ -237,8 +144,8 @@ SearchDefinitions: output: jsonFormat: {"ResponseInfo": {}} outJsonPath: $.Localities - responseInfoPath: $.ResponseInfo - + responseInfoPath: $.ResponseInfo + - name: ws-services query: baseQuery: | From 1b3a637a4b947c490da5252cff39c0851e0de247 Mon Sep 17 00:00:00 2001 From: Deependra-egov <47975393+Deependra-egov@users.noreply.github.com> Date: Fri, 19 Jun 2020 10:43:28 +0530 Subject: [PATCH 0014/1242] for collection migration yml change --- configs/egov-persister/collection-migration-persister.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/configs/egov-persister/collection-migration-persister.yml b/configs/egov-persister/collection-migration-persister.yml index ce324ec4..f9a20d5b 100644 --- a/configs/egov-persister/collection-migration-persister.yml +++ b/configs/egov-persister/collection-migration-persister.yml @@ -4,7 +4,7 @@ serviceMaps: - version: 1.0 name: collection migration description: Inserting payment details into egcl_payment - fromTopic: egov.collection.migration + fromTopic: egov-collection-migration-batch queryMaps: - query: INSERT into egcl_payment (id, tenantid, totaldue, totalamountpaid, transactionnumber, transactiondate, paymentmode, instrumentdate, instrumentnumber, instrumentstatus, ifsccode, additionaldetails, paidby, mobilenumber, payername, payeraddress, payeremail, payerid, paymentstatus, createdby, createdtime, lastmodifiedby, lastmodifiedtime) values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) @@ -211,7 +211,7 @@ serviceMaps: - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.cancellationRemarks - - query: INSERT into egcl_billaccountdetail (id, tenantid, billdetailid, demanddetailid, "order", amount, isactualdemand, taxheadcode, additionaldetails) values(?,?,?,?,?,?,?,?,?) + - query: INSERT into egcl_billaccountdetail (id, tenantid, billdetailid, demanddetailid, "order", amount, adjustedamount, isactualdemand, taxheadcode, additionaldetails) values(?,?,?,?,?,?,?,?,?,?) basePath: $.Payments.*.paymentDetails.*.bill.billDetails.*.billAccountDetails.* jsonMaps: - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.billAccountDetails.*.id @@ -226,6 +226,9 @@ serviceMaps: - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.billAccountDetails.*.amount type: DOUBLE + + - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.billAccountDetails.*.adjustedAmount + type: DOUBLE - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.billAccountDetails.*.isActualDemand type: BOOLEAN From bdd0f0db6b3d23b3dbe43dadcb8ed85ca532b6a8 Mon Sep 17 00:00:00 2001 From: Deependra-egov <47975393+Deependra-egov@users.noreply.github.com> Date: Fri, 19 Jun 2020 11:09:42 +0530 Subject: [PATCH 0015/1242] tl yml file change From d33b82b8bac4830088724546b87a60bf8151dad5 Mon Sep 17 00:00:00 2001 From: narendrabandhamneni-wt-egov Date: Tue, 23 Jun 2020 12:08:05 +0530 Subject: [PATCH 0016/1242] added latest changes of tl persister --- .../egov-persister/tradelicense-persister.yml | 901 +++++++++--------- 1 file changed, 466 insertions(+), 435 deletions(-) diff --git a/configs/egov-persister/tradelicense-persister.yml b/configs/egov-persister/tradelicense-persister.yml index b92e7fe5..e772d467 100644 --- a/configs/egov-persister/tradelicense-persister.yml +++ b/configs/egov-persister/tradelicense-persister.yml @@ -1,812 +1,843 @@ serviceMaps: - serviceName: tl-services - mappings: - - version: 1.0 - description: Persists tradeLicense details in EG_TL_TradeLicense table - fromTopic: save-tl-tradelicense - isTransaction: true - queryMaps: + serviceName: tl-services + mappings: + - version: 1.0 + description: Persists tradeLicense details in EG_TL_TradeLicense table + fromTopic: save-tl-tradelicense + isTransaction: true + queryMaps: - - query: INSERT INTO eg_tl_tradelicense( id, accountid,tenantid,tradeName, validfrom,validto,licensetype,applicationNumber, oldlicensenumber, propertyid, oldpropertyid, applicationdate, commencementdate, financialyear, action, status, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - basePath: Licenses.* - jsonMaps: - - jsonPath: $.Licenses.*.id + - query: INSERT INTO eg_tl_tradelicense( id, accountid,tenantid,tradeName, validfrom,validto,licensetype,applicationNumber, licenseNumber, oldlicensenumber, propertyid, oldpropertyid, applicationdate, commencementdate, financialyear, action, status, createdby, lastmodifiedby, createdtime, lastmodifiedtime, businessservice, applicationtype, workflowcode) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: Licenses.* + jsonMaps: + - jsonPath: $.Licenses.*.id - - jsonPath: $.Licenses.*.accountId + - jsonPath: $.Licenses.*.accountId - - jsonPath: $.Licenses.*.tenantId + - jsonPath: $.Licenses.*.tenantId - - jsonPath: $.Licenses.*.tradeName + - jsonPath: $.Licenses.*.tradeName - - jsonPath: $.Licenses.*.validFrom + - jsonPath: $.Licenses.*.validFrom - - jsonPath: $.Licenses.*.validTo + - jsonPath: $.Licenses.*.validTo - - jsonPath: $.Licenses.*.licenseType + - jsonPath: $.Licenses.*.licenseType - - jsonPath: $.Licenses.*.applicationNumber + - jsonPath: $.Licenses.*.applicationNumber + + - jsonPath: $.Licenses.*.licenseNumber - - jsonPath: $.Licenses.*.oldLicenseNumber + - jsonPath: $.Licenses.*.oldLicenseNumber - - jsonPath: $.Licenses.*.propertyId + - jsonPath: $.Licenses.*.propertyId - - jsonPath: $.Licenses.*.oldPropertyId + - jsonPath: $.Licenses.*.oldPropertyId - - jsonPath: $.Licenses.*.applicationDate + - jsonPath: $.Licenses.*.applicationDate - - jsonPath: $.Licenses.*.commencementDate + - jsonPath: $.Licenses.*.commencementDate - - jsonPath: $.Licenses.*.financialYear + - jsonPath: $.Licenses.*.financialYear - - jsonPath: $.Licenses.*.action + - jsonPath: $.Licenses.*.action - - jsonPath: $.Licenses.*.status + - jsonPath: $.Licenses.*.status - - jsonPath: $.Licenses.*.auditDetails.createdBy + - jsonPath: $.Licenses.*.auditDetails.createdBy - - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy + - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy - - jsonPath: $.Licenses.*.auditDetails.createdTime + - jsonPath: $.Licenses.*.auditDetails.createdTime - - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime + - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime + - jsonPath: $.Licenses.*.businessService + - jsonPath: $.Licenses.*.applicationType - - query: INSERT INTO eg_tl_tradelicensedetail( id, surveyno, subownershipcategory, channel, additionaldetail, tradelicenseid,structureType,operationalArea,noOfEmployees,adhocExemption,adhocPenalty,adhocExemptionReason,adhocPenaltyReason, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?, ?, ?, ?); - basePath: Licenses.*.tradeLicenseDetail - jsonMaps: - - jsonPath: $.Licenses.*.tradeLicenseDetail.id + - jsonPath: $.Licenses.*.workflowCode - - jsonPath: $.Licenses.*.tradeLicenseDetail.surveyNo - - jsonPath: $.Licenses.*.tradeLicenseDetail.subOwnerShipCategory + - query: INSERT INTO eg_tl_tradelicensedetail( id, surveyno, subownershipcategory, channel, additionaldetail, tradelicenseid,structureType,operationalArea,noOfEmployees,adhocExemption,adhocPenalty,adhocExemptionReason,adhocPenaltyReason, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?, ?, ?, ?); + basePath: Licenses.*.tradeLicenseDetail + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.id - - jsonPath: $.Licenses.*.tradeLicenseDetail.channel + - jsonPath: $.Licenses.*.tradeLicenseDetail.surveyNo - - jsonPath: $.Licenses.*.tradeLicenseDetail.additionalDetail - type: JSON - dbType: JSONB + - jsonPath: $.Licenses.*.tradeLicenseDetail.subOwnerShipCategory - - jsonPath: $.Licenses.*.id + - jsonPath: $.Licenses.*.tradeLicenseDetail.channel - - jsonPath: $.Licenses.*.tradeLicenseDetail.structureType + - jsonPath: $.Licenses.*.tradeLicenseDetail.additionalDetail + type: JSON + dbType: JSONB - - jsonPath: $.Licenses.*.tradeLicenseDetail.operationalArea + - jsonPath: $.Licenses.*.id - - jsonPath: $.Licenses.*.tradeLicenseDetail.noOfEmployees + - jsonPath: $.Licenses.*.tradeLicenseDetail.structureType - - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocExemption + - jsonPath: $.Licenses.*.tradeLicenseDetail.operationalArea - - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocPenalty + - jsonPath: $.Licenses.*.tradeLicenseDetail.noOfEmployees - - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocExemptionReason + - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocExemption - - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocPenaltyReason + - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocPenalty - - jsonPath: $.Licenses.*.auditDetails.createdBy + - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocExemptionReason - - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy + - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocPenaltyReason - - jsonPath: $.Licenses.*.auditDetails.createdTime + - jsonPath: $.Licenses.*.auditDetails.createdBy - - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime + - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy + - jsonPath: $.Licenses.*.auditDetails.createdTime + - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime - - query: INSERT INTO eg_tl_tradeunit( id, tenantid,active, tradetype, uom, uomvalue, tradelicensedetailid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?,?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - basePath: Licenses.*.tradeLicenseDetail.tradeUnits.* - jsonMaps: - - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.id - - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.tenantId - - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.active + - query: INSERT INTO eg_tl_tradeunit( id, tenantid,active, tradetype, uom, uomvalue, tradelicensedetailid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?,?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: Licenses.*.tradeLicenseDetail.tradeUnits.* + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.id - - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.tradeType + - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.tenantId - - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.uom + - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.active - - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.uomValue + - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.tradeType - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].tradeLicenseDetail.id + - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.uom - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.createdBy + - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.uomValue - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.lastModifiedBy + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].tradeLicenseDetail.id - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.createdTime + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.createdBy - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.lastModifiedTime + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.lastModifiedBy + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.createdTime + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.lastModifiedTime - - query: INSERT INTO eg_tl_accessory( id, tenantid,active, accessoryCategory, uom, uomvalue, count, tradelicensedetailid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?,?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - basePath: Licenses.*.tradeLicenseDetail.accessories.* - jsonMaps: - - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.id - - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.tenantId - - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.active + - query: INSERT INTO eg_tl_accessory( id, tenantid,active, accessoryCategory, uom, uomvalue, count, tradelicensedetailid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?,?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: Licenses.*.tradeLicenseDetail.accessories.* + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.id - - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.accessoryCategory + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.tenantId - - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.uom + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.active - - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.uomValue + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.accessoryCategory - - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.count + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.uom - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].tradeLicenseDetail.id + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.uomValue - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.createdBy + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.count - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.lastModifiedBy + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].tradeLicenseDetail.id - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.createdTime + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.createdBy - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.lastModifiedTime + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.lastModifiedBy + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.createdTime - - query: INSERT INTO eg_tl_owner( id,tenantid,active,institutionid, tradelicensedetailid, isprimaryowner, ownertype, ownershippercentage, relationship, createdby,lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - basePath: Licenses.*.tradeLicenseDetail.owners.* - jsonMaps: - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.uuid + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.lastModifiedTime - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.tenantId - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.userActive + - query: INSERT INTO eg_tl_owner( id,tenantid,active,institutionid, tradelicensedetailid, isprimaryowner, ownertype, ownershippercentage, relationship, createdby,lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: Licenses.*.tradeLicenseDetail.owners.* + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.uuid - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.institutionId + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.tenantId - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].tradeLicenseDetail.id + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.userActive - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.isPrimaryOwner + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.institutionId - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.ownerType + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].tradeLicenseDetail.id - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.ownerShipPercentage + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.isPrimaryOwner - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.relationship + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.ownerType - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.createdBy + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.ownerShipPercentage - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.lastModifiedBy + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.relationship - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.createdTime + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.createdBy - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.lastModifiedTime + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.lastModifiedBy + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.createdTime + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.lastModifiedTime - - query: INSERT INTO eg_tl_document_owner(id,tenantId,userid,active, tradeLicenseDetailId, documenttype, fileStoreId,documentuid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ? ,? ,?, ?, ?, ?, ?, ?, ?, ?); - basePath: Licenses.*.tradeLicenseDetail.owners.*.documents.* - jsonMaps: - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.id - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].tenantId - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners[*][?({id} in @.documents[*].id)].uuid + - query: INSERT INTO eg_tl_document_owner(id,tenantId,userid,active, tradeLicenseDetailId, documenttype, fileStoreId,documentuid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ? ,? ,?, ?, ?, ?, ?, ?, ?, ?); + basePath: Licenses.*.tradeLicenseDetail.owners.*.documents.* + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.id - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.active + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].tenantId - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].tradeLicenseDetail.id + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners[*][?({id} in @.documents[*].id)].uuid - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.documentType + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.active - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.fileStoreId + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].tradeLicenseDetail.id - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.documentUid + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.documentType - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.createdBy + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.fileStoreId - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.lastModifiedBy + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.documentUid - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.createdTime + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.createdBy - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.lastModifiedTime + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.lastModifiedBy + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.createdTime + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.lastModifiedTime - - query: INSERT INTO eg_tl_applicationdocument( id, tenantid, active, documenttype, tradecategorydetail, filestoreid, tradelicensedetailid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - basePath: Licenses.*.tradeLicenseDetail.applicationDocuments.* - jsonMaps: - - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.id - - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.tenantId - - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.active + - query: INSERT INTO eg_tl_applicationdocument( id, tenantid, active, documenttype, tradecategorydetail, filestoreid, tradelicensedetailid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: Licenses.*.tradeLicenseDetail.applicationDocuments.* + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.id - - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.documentType + - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.tenantId - - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.tradecategorydetail + - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.active - - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.fileStoreId + - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.documentType - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].tradeLicenseDetail.id + - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.tradecategorydetail - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.createdBy + - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.fileStoreId - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.lastModifiedBy + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].tradeLicenseDetail.id - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.createdTime + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.createdBy - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.lastModifiedTime + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.lastModifiedBy + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.createdTime - - query: INSERT INTO eg_tl_address( id, tenantid, doorno,street,buildingName, latitude,longitude, addressid, addressnumber,locality, type, addressline1, addressline2, landmark, city, pincode, detail, tradelicensedetailid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - basePath: Licenses.*.tradeLicenseDetail.address - jsonMaps: - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.id + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.lastModifiedTime - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.tenantId - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.doorNo + - query: INSERT INTO eg_tl_address( id, tenantid, doorno,street,buildingName, latitude,longitude, addressid, addressnumber,locality, type, addressline1, addressline2, landmark, city, pincode, detail, tradelicensedetailid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: Licenses.*.tradeLicenseDetail.address + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.id - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.street + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.tenantId - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.buildingName + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.doorNo - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.latitude + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.street - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.longitude + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.buildingName - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.addressId + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.latitude - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.addressNumber + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.longitude - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.locality.code + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.addressId - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.type + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.addressNumber - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.addressline1 + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.locality.code - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.addressline2 + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.type - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.landmark + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.addressLine1 - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.city + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.addressline2 - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.pincode + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.landmark - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.detail + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.city - - jsonPath: $.Licenses.*.tradeLicenseDetail.id + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.pincode - - jsonPath: $.Licenses.*.auditDetails.createdBy + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.detail - - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy + - jsonPath: $.Licenses.*.tradeLicenseDetail.id - - jsonPath: $.Licenses.*.auditDetails.createdTime + - jsonPath: $.Licenses.*.auditDetails.createdBy - - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime + - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy + - jsonPath: $.Licenses.*.auditDetails.createdTime - - query: INSERT INTO eg_tl_institution(tenantId,active,id, tradelicensedetailid, name, type,designation, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ; - basePath: Licenses.*.tradeLicenseDetail.institution - jsonMaps: + - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.tenantId - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.active + - query: INSERT INTO eg_tl_institution(tenantId,active,id,instituionName,contactNo,organisationRegistrationNo,address, tradelicensedetailid, name, type,designation, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ; + basePath: Licenses.*.tradeLicenseDetail.institution + jsonMaps: - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.id + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.tenantId - - jsonPath: $.Licenses.*.tradeLicenseDetail.id + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.active - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.name + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.id - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.type + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.instituionName - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.designation + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.contactNo - - jsonPath: $.Licenses.*.auditDetails.createdBy + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.organisationRegistrationNo - - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.address - - jsonPath: $.Licenses.*.auditDetails.createdTime + - jsonPath: $.Licenses.*.tradeLicenseDetail.id - - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.name + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.type + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.designation + - jsonPath: $.Licenses.*.auditDetails.createdBy + - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy + - jsonPath: $.Licenses.*.auditDetails.createdTime - - version: 1.0 - description: Update tradeLicense details in EG_TL_TradeLicense table - fromTopic: update-tl-tradelicense - isTransaction: true - queryMaps: + - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime - - query: INSERT INTO eg_tl_tradelicense_audit SELECT * FROM eg_tl_tradelicense WHERE id = ?; - basePath: Licenses.* - jsonMaps: - - jsonPath: $.Licenses.*.id - - query: UPDATE eg_tl_tradelicense SET tradeName = ?,licenseNumber = ?,licensetype = ?, oldlicensenumber = ?, propertyid = ?, oldpropertyid = ?, applicationdate = ?, commencementdate = ?, issueddate = ?, financialyear = ?, validfrom = ?, validto = ?, action = ?, status = ?, lastmodifiedby = ?, lastmodifiedtime = ? WHERE id=?; - basePath: Licenses.* - jsonMaps: - - jsonPath: $.Licenses.*.tradeName - - jsonPath: $.Licenses.*.licenseNumber - - jsonPath: $.Licenses.*.licenseType + - version: 1.0 + description: Update tradeLicense details in EG_TL_TradeLicense table + fromTopic: update-tl-tradelicense + isTransaction: true + queryMaps: - - jsonPath: $.Licenses.*.oldLicenseNumber - - jsonPath: $.Licenses.*.propertyId + - query: INSERT INTO eg_tl_tradelicense_audit SELECT * FROM eg_tl_tradelicense WHERE id = ?; + basePath: Licenses.* + jsonMaps: + - jsonPath: $.Licenses.*.id - - jsonPath: $.Licenses.*.oldPropertyId - - jsonPath: $.Licenses.*.applicationDate + - query: UPDATE eg_tl_tradelicense SET tradeName = ?,licenseNumber = ?,licensetype = ?, oldlicensenumber = ?, propertyid = ?, oldpropertyid = ?, commencementdate = ?, issueddate = ?, financialyear = ?, validfrom = ?, validto = ?, action = ?, status = ?, lastmodifiedby = ?, lastmodifiedtime = ?, businessservice = ?, applicationtype = ?, workflowcode = ? WHERE id=?; + basePath: Licenses.* + jsonMaps: + - jsonPath: $.Licenses.*.tradeName - - jsonPath: $.Licenses.*.commencementDate + - jsonPath: $.Licenses.*.licenseNumber - - jsonPath: $.Licenses.*.issuedDate + - jsonPath: $.Licenses.*.licenseType - - jsonPath: $.Licenses.*.financialYear + - jsonPath: $.Licenses.*.oldLicenseNumber - - jsonPath: $.Licenses.*.validFrom + - jsonPath: $.Licenses.*.propertyId - - jsonPath: $.Licenses.*.validTo + - jsonPath: $.Licenses.*.oldPropertyId - - jsonPath: $.Licenses.*.action + - jsonPath: $.Licenses.*.commencementDate - - jsonPath: $.Licenses.*.status + - jsonPath: $.Licenses.*.issuedDate - - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy + - jsonPath: $.Licenses.*.financialYear - - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime + - jsonPath: $.Licenses.*.validFrom - - jsonPath: $.Licenses.*.id + - jsonPath: $.Licenses.*.validTo + - jsonPath: $.Licenses.*.action - - query: INSERT INTO eg_tl_tradelicensedetail_audit SELECT * FROM eg_tl_tradelicensedetail WHERE id = ?; - basePath: Licenses.*.tradeLicenseDetail - jsonMaps: - - jsonPath: $.Licenses.*.tradeLicenseDetail.id + - jsonPath: $.Licenses.*.status + - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy + - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime - - query: UPDATE eg_tl_tradelicensedetail SET surveyno = ?, subownershipcategory = ?, channel = ?, additionaldetail = ?,operationalArea = ?,noOfEmployees = ?,structureType = ?,adhocExemption = ?,adhocPenalty = ?,adhocExemptionReason = ?,adhocPenaltyReason = ?,lastmodifiedby = ?, lastmodifiedtime = ? WHERE id = ?; - basePath: Licenses.*.tradeLicenseDetail - jsonMaps: - - jsonPath: $.Licenses.*.tradeLicenseDetail.surveyNo + - jsonPath: $.Licenses.*.businessService + + - jsonPath: $.Licenses.*.applicationType + + - jsonPath: $.Licenses.*.workflowCode - - jsonPath: $.Licenses.*.tradeLicenseDetail.subOwnerShipCategory + - jsonPath: $.Licenses.*.id - - jsonPath: $.Licenses.*.tradeLicenseDetail.channel + - query: INSERT INTO eg_tl_tradelicensedetail_audit SELECT * FROM eg_tl_tradelicensedetail WHERE id = ?; + basePath: Licenses.*.tradeLicenseDetail + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.id - - jsonPath: $.Licenses.*.tradeLicenseDetail.additionalDetail - type: JSON - dbType: JSONB - - jsonPath: $.Licenses.*.tradeLicenseDetail.operationalArea - - jsonPath: $.Licenses.*.tradeLicenseDetail.noOfEmployees + - query: UPDATE eg_tl_tradelicensedetail SET surveyno = ?, subownershipcategory = ?, channel = ?, additionaldetail = ?,operationalArea = ?,noOfEmployees = ?,structureType = ?,adhocExemption = ?,adhocPenalty = ?,adhocExemptionReason = ?,adhocPenaltyReason = ?,lastmodifiedby = ?, lastmodifiedtime = ? WHERE id = ?; + basePath: Licenses.*.tradeLicenseDetail + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.surveyNo - - jsonPath: $.Licenses.*.tradeLicenseDetail.structureType + - jsonPath: $.Licenses.*.tradeLicenseDetail.subOwnerShipCategory - - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocExemption + - jsonPath: $.Licenses.*.tradeLicenseDetail.channel - - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocPenalty + - jsonPath: $.Licenses.*.tradeLicenseDetail.additionalDetail + type: JSON + dbType: JSONB - - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocExemptionReason + - jsonPath: $.Licenses.*.tradeLicenseDetail.operationalArea - - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocPenaltyReason + - jsonPath: $.Licenses.*.tradeLicenseDetail.noOfEmployees - - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy + - jsonPath: $.Licenses.*.tradeLicenseDetail.structureType - - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime + - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocExemption - - jsonPath: $.Licenses.*.tradeLicenseDetail.id + - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocPenalty + - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocExemptionReason - - query: INSERT INTO eg_tl_tradeunit(id, tenantid, active, tradetype, uom, uomvalue, tradelicensedetailid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET active = ?, tradetype = ?, uom = ?, uomvalue = ?, lastmodifiedby = ?, lastmodifiedtime = ?; - basePath: Licenses.*.tradeLicenseDetail.tradeUnits.* - jsonMaps: - - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.id + - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocPenaltyReason - - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.tenantId + - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy - - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.active + - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime - - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.tradeType + - jsonPath: $.Licenses.*.tradeLicenseDetail.id - - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.uom - - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.uomValue + - query: INSERT INTO eg_tl_tradeunit(id, tenantid, active, tradetype, uom, uomvalue, tradelicensedetailid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET active = ?, tradetype = ?, uom = ?, uomvalue = ?, lastmodifiedby = ?, lastmodifiedtime = ?; + basePath: Licenses.*.tradeLicenseDetail.tradeUnits.* + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.id - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].tradeLicenseDetail.id + - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.tenantId - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.createdBy + - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.active - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.lastModifiedBy + - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.tradeType - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.createdTime + - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.uom - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.lastModifiedTime + - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.uomValue - - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.active + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].tradeLicenseDetail.id - - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.tradeType + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.createdBy - - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.uom + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.lastModifiedBy - - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.uomValue + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.createdTime - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.lastModifiedBy + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.lastModifiedTime - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.lastModifiedTime + - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.active + - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.tradeType - - query: INSERT INTO eg_tl_accessory(id, tenantid, active, accessoryCategory, uom, uomvalue, count, tradelicensedetailid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET active = ?,accessoryCategory = ?, uom = ?, uomvalue = ?,count =?, lastmodifiedby = ?, lastmodifiedtime = ?; - basePath: Licenses.*.tradeLicenseDetail.accessories.* - jsonMaps: - - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.id + - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.uom - - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.tenantId + - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.uomValue - - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.active + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.lastModifiedBy - - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.accessoryCategory + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.lastModifiedTime - - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.uom - - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.uomValue + - query: INSERT INTO eg_tl_accessory(id, tenantid, active, accessoryCategory, uom, uomvalue, count, tradelicensedetailid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET active = ?,accessoryCategory = ?, uom = ?, uomvalue = ?,count =?, lastmodifiedby = ?, lastmodifiedtime = ?; + basePath: Licenses.*.tradeLicenseDetail.accessories.* + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.id - - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.count + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.tenantId - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].tradeLicenseDetail.id + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.active - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.createdBy + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.accessoryCategory - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.lastModifiedBy + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.uom - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.createdTime + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.uomValue - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.lastModifiedTime + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.count - - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.active + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].tradeLicenseDetail.id - - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.accessoryCategory + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.createdBy - - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.uom + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.lastModifiedBy - - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.uomValue + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.createdTime - - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.count + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.lastModifiedTime - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.lastModifiedBy + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.active - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.lastModifiedTime + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.accessoryCategory + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.uom + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.uomValue - - query: INSERT INTO eg_tl_owner( id, tenantid, active, tradelicensedetailid, isprimaryowner, ownertype, ownershippercentage, relationship, createdby,lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT ON CONSTRAINT pk_eg_tl_owner DO UPDATE SET active = ?, isprimaryowner = ?, ownertype = ?, ownershippercentage = ?, relationship = ?, lastmodifiedby = ?, lastmodifiedtime = ?; - basePath: Licenses.*.tradeLicenseDetail.owners.* - jsonMaps: - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.uuid + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.count - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.tenantId + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.lastModifiedBy - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.userActive + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.lastModifiedTime - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].tradeLicenseDetail.id - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.isPrimaryOwner - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.ownerType + - query: INSERT INTO eg_tl_owner( id, tenantid, active, tradelicensedetailid, isprimaryowner, ownertype, ownershippercentage, relationship, createdby,lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT ON CONSTRAINT pk_eg_tl_owner DO UPDATE SET active = ?, isprimaryowner = ?, ownertype = ?, ownershippercentage = ?, relationship = ?, lastmodifiedby = ?, lastmodifiedtime = ?; + basePath: Licenses.*.tradeLicenseDetail.owners.* + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.uuid - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.ownerShipPercentage + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.tenantId - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.relationship + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.userActive - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.createdBy + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].tradeLicenseDetail.id - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.lastModifiedBy + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.isPrimaryOwner - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.createdTime + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.ownerType - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.lastModifiedTime + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.ownerShipPercentage - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.userActive + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.relationship - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.isPrimaryOwner + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.createdBy - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.ownerType + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.lastModifiedBy - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.ownerShipPercentage + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.createdTime - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.relationship + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.lastModifiedTime - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.lastModifiedBy + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.userActive - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.lastModifiedTime + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.isPrimaryOwner + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.ownerType - - query: INSERT INTO eg_tl_document_owner(id,tenantId,active,userid, tradeLicenseDetailId, documenttype, fileStoreId,documentuid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT ON CONSTRAINT pk_eg_tl_document_owner DO UPDATE SET active = ?, documenttype = ?, fileStoreId = ?,documentuid = ?, lastmodifiedby = ?, lastmodifiedtime = ?; - basePath: Licenses.*.tradeLicenseDetail.owners.*.documents.* - jsonMaps: - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.id + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.ownerShipPercentage - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].tenantId + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.relationship - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.active + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.lastModifiedBy - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners[*][?({id} in @.documents[*].id)].uuid + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.lastModifiedTime - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].tradeLicenseDetail.id - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.documentType + - query: INSERT INTO eg_tl_document_owner(id,tenantId,active,userid, tradeLicenseDetailId, documenttype, fileStoreId,documentuid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT ON CONSTRAINT pk_eg_tl_document_owner DO UPDATE SET active = ?, documenttype = ?, fileStoreId = ?,documentuid = ?, lastmodifiedby = ?, lastmodifiedtime = ?; + basePath: Licenses.*.tradeLicenseDetail.owners.*.documents.* + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.id - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.fileStoreId + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].tenantId - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.documentUid + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.active - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.createdBy + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners[*][?({id} in @.documents[*].id)].uuid - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.lastModifiedBy + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].tradeLicenseDetail.id - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.createdTime + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.documentType - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.lastModifiedTime + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.fileStoreId - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.active + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.documentUid - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.documentType + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.createdBy - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.fileStoreId + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.lastModifiedBy - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.documentUid + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.createdTime - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.lastModifiedBy + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.lastModifiedTime - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.lastModifiedTime + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.active + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.documentType + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.fileStoreId - - query: INSERT INTO eg_tl_applicationdocument( id, tenantid, active, documenttype, tradecategorydetail, filestoreid, tradelicensedetailid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET active = ?, documenttype =?, tradecategorydetail =?, filestoreid =?,lastmodifiedby =?, lastmodifiedtime =?; - basePath: Licenses.*.tradeLicenseDetail.applicationDocuments.* - jsonMaps: - - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.id + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.documentUid - - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.tenantId + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.lastModifiedBy - - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.active + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.lastModifiedTime - - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.documentType - - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.tradecategorydetail - - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.fileStoreId + - query: INSERT INTO eg_tl_applicationdocument( id, tenantid, active, documenttype, tradecategorydetail, filestoreid, tradelicensedetailid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET active = ?, documenttype =?, tradecategorydetail =?, filestoreid =?,lastmodifiedby =?, lastmodifiedtime =?; + basePath: Licenses.*.tradeLicenseDetail.applicationDocuments.* + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.id - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].tradeLicenseDetail.id + - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.tenantId - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.createdBy + - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.active - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.lastModifiedBy + - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.documentType - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.createdTime + - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.tradecategorydetail - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.lastModifiedTime + - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.fileStoreId - - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.active + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].tradeLicenseDetail.id - - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.documentType + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.createdBy - - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.tradecategorydetail + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.lastModifiedBy - - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.fileStoreId + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.createdTime - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.lastModifiedBy + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.lastModifiedTime - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.lastModifiedTime + - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.active + - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.documentType + - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.tradecategorydetail - - query: UPDATE eg_tl_address SET doorno =?,street = ?,buildingName = ?, latitude =?, longitude =?, addressid =?, addressnumber =?,locality =?, type =?, addressline1 =?, addressline2 =?, landmark =?, city =?, pincode =?, detail =?,lastmodifiedby =?, lastmodifiedtime =? WHERE id =?; - basePath: Licenses.*.tradeLicenseDetail.address - jsonMaps: - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.doorNo + - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.fileStoreId - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.street + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.lastModifiedBy - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.buildingName + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.lastModifiedTime - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.latitude - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.longitude - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.addressId + - query: UPDATE eg_tl_address SET doorno =?,street = ?,buildingName = ?, latitude =?, longitude =?, addressid =?, addressnumber =?,locality =?, type =?, addressline1 =?, addressline2 =?, landmark =?, city =?, pincode =?, detail =?,lastmodifiedby =?, lastmodifiedtime =? WHERE id =?; + basePath: Licenses.*.tradeLicenseDetail.address + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.doorNo - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.addressNumber + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.street - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.locality.code + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.buildingName - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.type + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.latitude - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.addressline1 + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.longitude - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.addressline2 + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.addressId - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.landmark + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.addressNumber - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.city + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.locality.code - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.pincode + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.type - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.detail + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.addressline1 - - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.addressline2 - - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.landmark - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.id + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.city + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.pincode - - query: INSERT INTO eg_tl_institution(tenantId,active,id, tradelicensedetailid, name, type,designation, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET active = ?,name = ?,type = ?,designation = ?, lastmodifiedby = ?,lastmodifiedtime = ?; - basePath: Licenses.*.tradeLicenseDetail.institution - jsonMaps: - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.tenantId + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.detail - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.active + - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.id + - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime - - jsonPath: $.Licenses.*.tradeLicenseDetail.id + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.id - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.name - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.type + - query: INSERT INTO eg_tl_institution(tenantId, active, id, instituionName, contactNo, organisationRegistrationNo, address, tradelicensedetailid, name, type,designation, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET active = ?,name = ?,type = ?,designation = ?, lastmodifiedby = ?,lastmodifiedtime = ?, instituionName = ?, contactNo = ?, organisationRegistrationNo = ?, address = ?; + basePath: Licenses.*.tradeLicenseDetail.institution + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.tenantId - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.designation + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.active - - jsonPath: $.Licenses.*.auditDetails.createdBy + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.id - - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.instituionName - - jsonPath: $.Licenses.*.auditDetails.createdTime + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.contactNo - - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.organisationRegistrationNo - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.active + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.address - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.name + - jsonPath: $.Licenses.*.tradeLicenseDetail.id - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.type + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.name - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.designation + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.type - - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.designation - - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime + - jsonPath: $.Licenses.*.auditDetails.createdBy + - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy + - jsonPath: $.Licenses.*.auditDetails.createdTime + - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.active - - version: 1.0 - description: Persists tradeLicense details in EG_TL_TradeLicense table - fromTopic: update-tl-workflow - isTransaction: true - queryMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.name - - query: INSERT INTO eg_tl_tradelicense_audit SELECT * FROM eg_tl_tradelicense WHERE id = ?; - basePath: Licenses.* - jsonMaps: - - jsonPath: $.Licenses.*.id + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.type + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.designation + - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy - - query: INSERT INTO eg_tl_tradelicensedetail_audit SELECT * FROM eg_tl_tradelicensedetail WHERE id = ?; - basePath: Licenses.*.tradeLicenseDetail - jsonMaps: - - jsonPath: $.Licenses.*.tradeLicenseDetail.id + - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.instituionName + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.contactNo - - query: INSERT INTO eg_tl_verificationdocument( id, tenantid, active, documenttype, tradecategorydetail, filestoreid,tradelicensedetailid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET active = ?,documenttype =?, tradecategorydetail =?, filestoreid =?, lastmodifiedby =?, lastmodifiedtime =?; - basePath: Licenses.*.tradeLicenseDetail.verificationDocuments.* - jsonMaps: - - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.id + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.organisationRegistrationNo - - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.tenantId + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.address - - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.active - - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.documentType - - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.tradecategorydetail - - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.fileStoreId + - version: 1.0 + description: Persists tradeLicense details in EG_TL_TradeLicense table + fromTopic: update-tl-workflow + isTransaction: true + queryMaps: - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.verificationDocuments[*].id)].tradeLicenseDetail.id + - query: INSERT INTO eg_tl_tradelicense_audit SELECT * FROM eg_tl_tradelicense WHERE id = ?; + basePath: Licenses.* + jsonMaps: + - jsonPath: $.Licenses.*.id - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.verificationDocuments[*].id)].auditDetails.createdBy - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.verificationDocuments[*].id)].auditDetails.lastModifiedBy - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.verificationDocuments[*].id)].auditDetails.createdTime + - query: INSERT INTO eg_tl_tradelicensedetail_audit SELECT * FROM eg_tl_tradelicensedetail WHERE id = ?; + basePath: Licenses.*.tradeLicenseDetail + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.id - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.verificationDocuments[*].id)].auditDetails.lastModifiedTime - - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.active - - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.documentType + - query: INSERT INTO eg_tl_verificationdocument( id, tenantid, active, documenttype, tradecategorydetail, filestoreid,tradelicensedetailid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET active = ?,documenttype =?, tradecategorydetail =?, filestoreid =?, lastmodifiedby =?, lastmodifiedtime =?; + basePath: Licenses.*.tradeLicenseDetail.verificationDocuments.* + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.id - - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.tradecategorydetail + - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.tenantId - - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.fileStoreId + - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.active - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.verificationDocuments[*].id)].auditDetails.lastModifiedBy + - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.documentType - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.verificationDocuments[*].id)].auditDetails.lastModifiedTime + - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.tradecategorydetail + - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.fileStoreId - - query: UPDATE eg_tl_tradelicense SET validfrom = ?,licenseNumber =?, issueddate = ?, action = ?, status = ?, lastmodifiedby = ?, lastmodifiedtime = ? WHERE id=?; - basePath: Licenses.* - jsonMaps: - - jsonPath: $.Licenses.*.validFrom + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.verificationDocuments[*].id)].tradeLicenseDetail.id - - jsonPath: $.Licenses.*.licenseNumber + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.verificationDocuments[*].id)].auditDetails.createdBy - - jsonPath: $.Licenses.*.issuedDate + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.verificationDocuments[*].id)].auditDetails.lastModifiedBy - - jsonPath: $.Licenses.*.action + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.verificationDocuments[*].id)].auditDetails.createdTime - - jsonPath: $.Licenses.*.status + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.verificationDocuments[*].id)].auditDetails.lastModifiedTime - - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy + - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.active - - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime + - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.documentType - - jsonPath: $.Licenses.*.id + - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.tradecategorydetail + - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.fileStoreId - - query: UPDATE eg_tl_tradelicensedetail SET additionaldetail = ?,lastmodifiedby = ?, lastmodifiedtime = ? WHERE id = ?; - basePath: Licenses.*.tradeLicenseDetail - jsonMaps: - - jsonPath: $.Licenses.*.tradeLicenseDetail.additionalDetail - type: JSON - dbType: JSONB + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.verificationDocuments[*].id)].auditDetails.lastModifiedBy - - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.verificationDocuments[*].id)].auditDetails.lastModifiedTime - - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime - - jsonPath: $.Licenses.*.tradeLicenseDetail.id + - query: UPDATE eg_tl_tradelicense SET validfrom = ?,validto = ?,licenseNumber =?, issueddate = ?, action = ?, status = ?, lastmodifiedby = ?, lastmodifiedtime = ? WHERE id=?; + basePath: Licenses.* + jsonMaps: + - jsonPath: $.Licenses.*.validFrom + + - jsonPath: $.Licenses.*.validTo + - jsonPath: $.Licenses.*.licenseNumber + - jsonPath: $.Licenses.*.issuedDate - - version: 1.0 - description: Update adhocDetails - fromTopic: update-tl-adhoc-tradelicense - isTransaction: true - queryMaps: + - jsonPath: $.Licenses.*.action + - jsonPath: $.Licenses.*.status - - query: UPDATE eg_tl_tradelicensedetail SET adhocExemption = ?,adhocPenalty = ?,adhocExemptionReason = ?,adhocPenaltyReason = ?,lastmodifiedby = ?, lastmodifiedtime = ?, additionaldetail = ? WHERE id = ?; - basePath: Licenses.*.tradeLicenseDetail - jsonMaps: + - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy - - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocExemption + - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime - - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocPenalty + - jsonPath: $.Licenses.*.id - - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocExemptionReason - - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocPenaltyReason + - query: UPDATE eg_tl_tradelicensedetail SET additionaldetail = ?,lastmodifiedby = ?, lastmodifiedtime = ? WHERE id = ?; + basePath: Licenses.*.tradeLicenseDetail + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.additionalDetail + type: JSON + dbType: JSONB - - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy + - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy - - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime + - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime - - jsonPath: $.Licenses.*.tradeLicenseDetail.additionalDetail - type: JSON - dbType: JSONB - - - jsonPath: $.Licenses.*.tradeLicenseDetail.id + - jsonPath: $.Licenses.*.tradeLicenseDetail.id + + + + - version: 1.0 + description: Update adhocDetails + fromTopic: update-tl-adhoc-tradelicense + isTransaction: true + queryMaps: + + + - query: UPDATE eg_tl_tradelicensedetail SET adhocExemption = ?,adhocPenalty = ?,adhocExemptionReason = ?,adhocPenaltyReason = ?,lastmodifiedby = ?, lastmodifiedtime = ? WHERE id = ?; + basePath: Licenses.*.tradeLicenseDetail + jsonMaps: + + - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocExemption + + - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocPenalty + + - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocExemptionReason + + - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocPenaltyReason + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime + + - jsonPath: $.Licenses.*.tradeLicenseDetail.id From 5330a3ec0b1a21a14dc52f3f4786c99819203774 Mon Sep 17 00:00:00 2001 From: narendrabandhamneni-wt-egov Date: Fri, 26 Jun 2020 16:34:04 +0530 Subject: [PATCH 0017/1242] changed the query for the locality code in property tax --- configs/egov-searcher/localitySearcher.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-searcher/localitySearcher.yml b/configs/egov-searcher/localitySearcher.yml index e6b8845c..7673bcfb 100644 --- a/configs/egov-searcher/localitySearcher.yml +++ b/configs/egov-searcher/localitySearcher.yml @@ -128,7 +128,7 @@ SearchDefinitions: baseQuery: | Select row_to_json(result) from ( - select property.propertyid as referenceNumber,locality from eg_pt_property property + select property.acknowldgementnumber as referenceNumber,locality from eg_pt_property property INNER JOIN eg_pt_address ptadd ON ptadd.propertyid = property.id ) result $where groupBy: From f0324419c93d33233d8a19f4278ca6d0c084828b Mon Sep 17 00:00:00 2001 From: Kabir Date: Thu, 2 Jul 2020 14:46:07 +0530 Subject: [PATCH 0018/1242] testing tl reports qa --- configs/reports/configs/tl-reports.yml | 1228 +++++++++++++++++++++++- 1 file changed, 1227 insertions(+), 1 deletion(-) diff --git a/configs/reports/configs/tl-reports.yml b/configs/reports/configs/tl-reports.yml index d4788c88..8960e563 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -958,7 +958,7 @@ ReportDefinitions: ) tlown ON tlown.tradelicensedetailid = tld.id WHERE tl.tenantid=$tenantid - - reportName: TradeLicenseDetailsReport +- reportName: TradeLicenseDetailsReport summary: Trade License Details Report version: 1.0.0 moduleName: rainmaker-tl @@ -1215,4 +1215,1230 @@ ReportDefinitions: ) tlown ON tlown.tradelicensedetailid = tld.id where validto < extract (epoch from NOW())*1000 and licensenumber is not null and licensenumber not in (select oldlicensenumber from eg_tl_tradelicense where oldlicensenumber is not null) and tenantid = $tenantid + + +- reportName: TradeLicenseRegistryReport_v2 + summary: TL Receipt Register Report + version: 1.0.0 + moduleName: rainmaker-tl + sourceColumns: + - name: receiptnumber + label: report.tl.receiptnumber + type: string + source: tl + total: false + - name: receiptIssueDate + label: report.tl.receiptissuedate + type: string + source: tl + total: false + - name: g8issuedate + label: report.tl.g8issuedate + type: string + source: tl + total: false + - name: g8receiptno + label: report.tl.g8receiptno + type: string + source: tl + total: false + - name: licensenumber + label: report.tl.licensenumber + type: string + source: tl + total: false + - name: formattedIssuedDate + label: report.tl.issueddate + type: string + source: tl + total: false + - name: name + label: report.tl.user.name + type: string + source: tl + total: false + - name: mobilenumber + label: report.tl.user.mobilenumber + type: string + source: tl + total: false + - name: bankid + label: report.tl.bankid + type: string + source: tl + total: false + - name: branchname + label: report.tl.branchname + type: string + source: tl + total: false + - name: transactionnumber + label: report.tl.transactionumber + type: string + source: tl + total: false + - name: instrumenttype + label: report.tl.instrumenttype + type: string + source: tl + total: false + - name: status + label: report.tl.status + type: string + source: tl + total: false + - name: tradeTypeName + label: report.tl.tradetype + type: string + source: tl + total: true + - name: acc + label: report.tl.accessorycategories + type: string + source: tl + total: false + - name: tradeName + label: report.tl.tradeName + type: string + source: tl + total: false + - name: totalamount + label: report.tl.receipt.totalamount + type: string + source: tl + total: true + - name: collectorname + label: reports.uc.collectorname + type: string + source: pt + total: false + searchParams: + - name: fromDate + label: reports.tl.fromDate + type: epoch + source: tl + isMandatory: false + searchClause: AND receipt.createddate >= $fromDate + - name: toDate + label: reports.tl.toDate + type: epoch + source: tl + isMandatory: false + searchClause: AND receipt.createddate <= $toDate + - name: collectorname + label: reports.uc.collectorname + type: singlevaluelist + pattern: http://egov-hrms:8080/egov-hrms/employees/_search?tenantId=$tenantid&roles=TL_CEMP|$.Employees[*].user.id|$.Employees[*].user.name + source: pt + wrapper: true + isMandatory: false + searchClause: AND eg_user.id = $collectorname::INTEGER + query: | + SELECT + licensenumber, + to_char((To_timestamp(issueddate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as formattedIssuedDate, + tl.tradeName, + initcap(tl.status) as status, + to_char((To_timestamp(receipt.receiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as receiptIssueDate , + receipt.receiptnumber, + tradeTypeName, + acc, + tlown.name, + tlown.mobilenumber, + ih.bankid, + ih.branchname, + ih.transactionnumber as transactionnumber, + ih.instrumenttype, + amount as totalamount, + To_char((To_timestamp(receipt.manualreceiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') AS g8issuedate, + receipt.manualreceiptnumber as g8receiptno, + (CASE WHEN collectiontype='COUNTER' THEN eg_user.name ELSE '' END) as collectorname + + FROM eg_tl_tradelicense tl + INNER JOIN eg_tl_tradelicensedetail tld ON tld.tradelicenseid = tl.id + INNER JOIN ( + SELECT tradelicensedetailid, array_to_string(array_agg(message.message),', ') as tradeTypeName FROM eg_tl_tradeunit + LEFT OUTER JOIN message ON code = CONCAT('TRADELICENSE_TRADETYPE_', REGEXP_REPLACE(tradetype, '[^A-Za-z0-9]','_','g')) AND message.locale = 'en_IN' GROUP BY 1) tlunit ON tlunit.tradelicensedetailid = tld.id + INNER JOIN ( + SELECT tradelicensedetailid, array_to_string(array_agg(name),', ') as name, array_to_string(array_agg(mobilenumber),', ') as mobilenumber + FROM eg_tl_owner tlowner + INNER JOIN eg_user tluser ON tluser.uuid = tlowner.id + group by tradelicensedetailid + ) tlown ON tlown.tradelicensedetailid = tld.id + LEFT OUTER JOIN egcl_receiptheader_v1 receipt ON receipt.consumercode = tl.applicationnumber and receipt.status != 'Cancelled' + LEFT OUTER JOIN egcl_receiptinstrument_v1 as ri ON ri.receiptheader = receipt.id + LEFT OUTER JOIN egcl_instrumentheader_v1 as ih ON ih.id = ri.instrumentheader and ih.instrumentstatus != 'CANCELLED' + LEFT OUTER JOIN ( + SELECT tradelicensedetailid,array_to_string(array_agg(message.message),',') AS acc FROM eg_tl_accessory + LEFT OUTER JOIN message ON code=CONCAT('TRADELICENSE_ACCESSORIESCATEGORY_', REGEXP_REPLACE(accessorycategory, '[^A-Za-z0-9]','_', 'g')) AND message.locale = 'en_IN' GROUP BY 1 ) tlacc ON tlacc.tradelicensedetailid = tld.id + Join eg_user ON eg_user.id = receipt.createdby::INTEGER + WHERE tl.tenantId = $tenantid + + +- reportName: StateTradeLicenseCancelledRegistryReport_v2 + summary: TL Cancelled Receipt Register Report + version: 1.0.0 + moduleName: rainmaker-tl + sourceColumns: + - name: tenantId + label: report.tl.tenantid + type: string + source: tl + total: false + - name: receiptnumber + label: report.tl.receiptnumber + type: string + source: tl + total: false + - name: receiptIssueDate + label: report.tl.receiptissuedate + type: string + source: tl + total: false + - name: g8issuedate + label: report.tl.g8issuedate + type: string + source: tl + total: false + - name: g8receiptno + label: report.tl.g8receiptno + type: string + source: tl + total: false + - name: licensenumber + label: report.tl.licensenumber + type: string + source: tl + total: false + - name: formattedIssuedDate + label: report.tl.issueddate + type: string + source: tl + total: false + - name: name + label: report.tl.user.name + type: string + source: tl + total: false + - name: mobilenumber + label: report.tl.user.mobilenumber + type: string + source: tl + total: false + - name: bankid + label: report.tl.bankid + type: string + source: tl + total: false + - name: branchname + label: report.tl.branchname + type: string + source: tl + total: false + - name: transactionumber + label: report.tl.transactionumber + type: string + source: tl + total: false + - name: instrumenttype + label: report.tl.instrumenttype + type: string + source: tl + total: false + - name: status + label: report.tl.status + type: string + source: tl + total: false + - name: tradeTypeName + label: report.tl.tradetype + type: string + source: tl + total: false + - name: acc + label: report.tl.accessorycategories + type: string + source: tl + total: false + - name: tradeName + label: report.tl.tradeName + type: string + source: tl + total: false + - name: totalamount + label: report.tl.receipt.totalamount + type: string + source: tl + total: true + searchParams: + - name: fromDate + label: reports.tl.fromDate + type: epoch + source: tl + isMandatory: false + searchClause: AND receipt.createddate >= $fromDate + - name: toDate + label: reports.tl.toDate + type: epoch + source: tl + isMandatory: false + searchClause: AND receipt.createddate <= $toDate + query: | + SELECT + initcap(split_part(tl.tenantId, '.', 2)) as tenantId, + licensenumber, + to_char((To_timestamp(issueddate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as formattedIssuedDate, + tl.tradeName, + initcap(tl.status) as status, + to_char((To_timestamp(receipt.receiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as receiptIssueDate , + receipt.receiptnumber, + tradeTypeName, + acc, + name, + mobilenumber, + ih.bankid, + ih.branchname, + ih.transactionnumber, + ih.instrumenttype, + amount as totalamount, + To_char((To_timestamp(receipt.manualreceiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') AS g8issuedate, + receipt.manualreceiptnumber as g8receiptno + + FROM eg_tl_tradelicense tl + INNER JOIN eg_tl_tradelicensedetail tld ON tld.tradelicenseid = tl.id + INNER JOIN ( + SELECT tradelicensedetailid, array_to_string(array_agg(message.message),', ') as tradeTypeName FROM eg_tl_tradeunit + LEFT OUTER JOIN message ON code = CONCAT('TRADELICENSE_TRADETYPE_', REGEXP_REPLACE(tradetype, '[^A-Za-z0-9]','_','g')) AND message.locale = 'en_IN' GROUP BY 1) tlunit ON tlunit.tradelicensedetailid = tld.id + INNER JOIN ( + SELECT tradelicensedetailid, array_to_string(array_agg(name),', ') as name, array_to_string(array_agg(mobilenumber),', ') as mobilenumber + FROM eg_tl_owner tlowner + INNER JOIN eg_user tluser ON tluser.uuid = tlowner.id + group by tradelicensedetailid + ) tlown ON tlown.tradelicensedetailid = tld.id + INNER JOIN egcl_receiptheader_v1 receipt ON receipt.consumercode = tl.applicationnumber and receipt.status = 'Cancelled' + INNER JOIN egcl_receiptinstrument_v1 as ri ON ri.receiptheader = receipt.id + INNER JOIN egcl_instrumentheader_v1 as ih ON ih.id = ri.instrumentheader + LEFT OUTER JOIN ( + SELECT tradelicensedetailid,array_to_string(array_agg(message.message),',') AS acc FROM eg_tl_accessory + LEFT OUTER JOIN message ON code=CONCAT('TRADELICENSE_ACCESSORIESCATEGORY_', REGEXP_REPLACE(accessorycategory, '[^A-Za-z0-9]','_', 'g')) AND message.locale = 'en_IN' GROUP BY 1 ) tlacc ON tlacc.tradelicensedetailid = tld.id + WHERE tl.tenantId != 'pb.testing' + + +- reportName: TradeLicenseCancelledRegistryReport_v2 + summary: TL Cancelled Receipt Register Report + version: 1.0.0 + moduleName: rainmaker-tl + sourceColumns: + - name: receiptnumber + label: report.tl.receiptnumber + type: string + source: tl + total: false + - name: receiptIssueDate + label: report.tl.receiptissuedate + type: string + source: tl + total: false + - name: g8issuedate + label: report.tl.g8issuedate + type: string + source: tl + total: false + - name: g8receiptno + label: report.tl.g8receiptno + type: string + source: tl + total: false + - name: licensenumber + label: report.tl.licensenumber + type: string + source: tl + total: false + - name: formattedIssuedDate + label: report.tl.issueddate + type: string + source: tl + total: false + - name: name + label: report.tl.user.name + type: string + source: tl + total: false + - name: mobilenumber + label: report.tl.user.mobilenumber + type: string + source: tl + total: false + - name: bankid + label: report.tl.bankid + type: string + source: tl + total: false + - name: branchname + label: report.tl.branchname + type: string + source: tl + total: false + - name: transactionumber + label: report.tl.transactionumber + type: string + source: tl + total: false + - name: instrumenttype + label: report.tl.instrumenttype + type: string + source: tl + total: false + - name: status + label: report.tl.status + type: string + source: tl + total: false + - name: tradeTypeName + label: report.tl.tradetype + type: string + source: tl + total: false + - name: acc + label: report.tl.accessorycategories + type: string + source: tl + total: false + - name: tradeName + label: report.tl.tradeName + type: string + source: tl + total: false + - name: totalamount + label: report.tl.receipt.totalamount + type: string + source: tl + total: true + searchParams: + - name: fromDate + label: reports.tl.fromDate + type: epoch + source: tl + isMandatory: false + searchClause: AND receipt.createddate >= $fromDate + - name: toDate + label: reports.tl.toDate + type: epoch + source: tl + isMandatory: false + searchClause: AND receipt.createddate <= $toDate + query: | + SELECT + licensenumber, + to_char((To_timestamp(issueddate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as formattedIssuedDate, + tl.tradeName, + initcap(tl.status) as status, + to_char((To_timestamp(receipt.receiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as receiptIssueDate , + receipt.receiptnumber, + tradeTypeName, + acc, + name, + mobilenumber, + ih.bankid, + ih.branchname, + ih.transactionnumber, + ih.instrumenttype, + amount as totalamount, + To_char((To_timestamp(receipt.manualreceiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') AS g8issuedate, + receipt.manualreceiptnumber as g8receiptno + + FROM eg_tl_tradelicense tl + INNER JOIN eg_tl_tradelicensedetail tld ON tld.tradelicenseid = tl.id + INNER JOIN ( + SELECT tradelicensedetailid, array_to_string(array_agg(message.message),', ') as tradeTypeName FROM eg_tl_tradeunit + LEFT OUTER JOIN message ON code = CONCAT('TRADELICENSE_TRADETYPE_', REGEXP_REPLACE(tradetype, '[^A-Za-z0-9]','_','g')) AND message.locale = 'en_IN' GROUP BY 1) tlunit ON tlunit.tradelicensedetailid = tld.id + INNER JOIN ( + SELECT tradelicensedetailid, array_to_string(array_agg(name),', ') as name, array_to_string(array_agg(mobilenumber),', ') as mobilenumber + FROM eg_tl_owner tlowner + INNER JOIN eg_user tluser ON tluser.uuid = tlowner.id + group by tradelicensedetailid + ) tlown ON tlown.tradelicensedetailid = tld.id + INNER JOIN egcl_receiptheader_v1 receipt ON receipt.consumercode = tl.applicationnumber and receipt.status = 'Cancelled' + INNER JOIN egcl_receiptinstrument_v1 as ri ON ri.receiptheader = receipt.id + INNER JOIN egcl_instrumentheader_v1 as ih ON ih.id = ri.instrumentheader + LEFT OUTER JOIN ( + SELECT tradelicensedetailid,array_to_string(array_agg(message.message),',') AS acc FROM eg_tl_accessory + LEFT OUTER JOIN message ON code=CONCAT('TRADELICENSE_ACCESSORIESCATEGORY_', REGEXP_REPLACE(accessorycategory, '[^A-Za-z0-9]','_', 'g')) AND message.locale = 'en_IN' GROUP BY 1 ) tlacc ON tlacc.tradelicensedetailid = tld.id + WHERE tl.tenantId LIKE $tenantid + + +- reportName: TradeWiseCollectionReport_v2 + summary: Collection according to tradeTypes + version: 1.0.0 + moduleName: rainmaker-tl + sourceColumns: + - name: transactionNumber + label: report.tl.totalTransaction + type: string + source: tl + total: false + - name: online + label: report.tl.online.collection + type: string + source: tl + total: true + - name: offline + label: report.tl.offline.collection + type: string + source: tl + total: true + - name: total + label: report.tl.totalCollection + type: string + source: tl + total: true + searchParams: + - name: fromDate + label: reports.tl.fromDate + type: epoch + source: tl + isMandatory: false + searchClause: AND rh.receiptdate >= $fromDate + - name: toDate + label: reports.tl.toDate + type: epoch + source: tl + isMandatory: false + searchClause: AND rh.receiptdate <= $toDate + query: | + select + sum(ih.amount) as total, + count(*) as transactionNumber, + sum(case collectiontype when 'COUNTER' then amount else 0 end) as offline, + sum(case collectiontype when 'ONLINE' then amount else 0 end) as online, + initcap(split_part(rh.tenantId, '.', 2)) as tenantId + from egcl_receiptheader_v1 as rh + inner join egcl_receiptinstrument_v1 as ri on ri.receiptheader = rh.id + inner join egcl_instrumentheader_v1 as ih on ih.id = ri.instrumentheader + where rh.businessdetails = 'TL' and rh.status !='Cancelled' and rh.tenantid !='pb.testing' + AND rh.tenantId LIKE $tenantid + groupby: GROUP BY rh.tenantId + + +- reportName: TradeLicenseApplicationStatusReport_v2 + summary: Nummber of applications by there status + version: 1.0.0 + moduleName: rainmaker-tl + externalService: + - entity: $.messages[*] + apiURL: http://egov-localization:8080/localization/messages/v1/_search?locale=en_IN&tenantId=pb&module=rainmaker-tl + keyOrder: code,message + tableName: tbl_localization + sourceColumns: + - name: status + label: report.tl.status + type: string + source: tl + total: false + - name: total + label: report.tl.total + type: string + source: tl + total: true + searchParams: + - name: fromDate + label: reports.tl.fromDate + type: epoch + source: tl + isMandatory: false + searchClause: AND tl.lastmodifiedtime >= $fromDate + - name: toDate + label: reports.tl.toDate + type: epoch + source: tl + isMandatory: false + searchClause: AND tl.lastmodifiedtime <= $toDate + query: | + SELECT + COUNT(applicationnumber) as total, + message.message as status + from eg_tl_tradelicense tl + LEFT OUTER JOIN message ON split_part(message.code,'_',2) = status AND message.locale = 'en_IN' + WHERE tl.tenantid LIKE $tenantid + groupby: GROUP BY message.message + orderby: ORDER BY case message.message when 'Pending Application' then 1 when 'Pending Payment' then 2 when 'Pending Approval' then 3 when 'Approved' then 4 when 'Rejected' then 5 when 'Cancelled' then 6 else 7 end + + +- reportName: TradeLicenseULBWiseApplicationStatusReport_v2 + summary: Nummber of applications by there status + version: 1.0.0 + moduleName: rainmaker-tl + sourceColumns: + - name: tenantId + label: report.tl.tenantid + type: string + source: tl + total: false + - name: initiated + label: TL_INITIATED + type: string + source: tl + total: true + - name: applied + label: TL_APPLIED + type: string + source: tl + total: true + - name: paid + label: TL_PAID + type: string + source: tl + total: true + - name: approved + label: TL_APPROVED + type: string + source: tl + total: true + - name: rejected + label: TL_REJECTED + type: string + source: tl + total: true + - name: cancelled + label: TL_CANCELLED + type: string + source: tl + total: true + searchParams: + - name: fromDate + label: reports.tl.fromDate + type: epoch + source: tl + isMandatory: false + searchClause: AND tl.lastmodifiedtime >= $fromDate + - name: toDate + label: reports.tl.toDate + type: epoch + source: tl + isMandatory: false + searchClause: AND tl.lastmodifiedtime <= $toDate + query: | + SELECT + initcap(split_part(tenantId, '.', 2)) as tenantId, + SUM(CASE status when 'REJECTED' then 1 else 0 end) as rejected, + SUM(CASE status when 'INITIATED' then 1 else 0 end) as initiated, + SUM(CASE status when 'PAID' then 1 else 0 end) as paid, + SUM(CASE status when 'APPROVED' then 1 else 0 end) as approved, + SUM(CASE status when 'APPLIED' then 1 else 0 end) as applied, + SUM(CASE status when 'CANCELLED' then 1 else 0 end) as cancelled + FROM eg_tl_tradelicense as tl + WHERE tl.tenantid != 'pb.testing' + groupby: GROUP BY tenantid + orderby: ORDER BY tenantid + + +- reportName: StateLevelStatus_v2 + summary: Nummber of applications by there status state level + version: 1.0.0 + moduleName: rainmaker-tl + sourceColumns: + - name: status + label: report.tl.status + type: string + source: tl + total: false + - name: total + label: report.tl.total + type: string + source: tl + total: true + searchParams: + - name: fromDate + label: reports.tl.fromDate + type: epoch + source: tl + isMandatory: false + searchClause: AND tl.lastmodifiedtime >= $fromDate + - name: toDate + label: reports.tl.toDate + type: epoch + source: tl + isMandatory: false + searchClause: AND tl.lastmodifiedtime <= $toDate + - name: ulb + label: ULB + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: tl + wrapper: true + isMandatory: false + searchClause: AND tl.tenantId = $ulb + query: | + SELECT + COUNT(applicationnumber) as total, + message.message as status + from eg_tl_tradelicense tl + LEFT OUTER JOIN message ON split_part(message.code,'_',2) = status AND message.locale = 'en_IN' + WHERE tl.tenantid!='pb.testing' + groupby: GROUP BY message.message + orderby: ORDER BY case message.message when 'Pending Application' then 1 when 'Pending Payment' then 2 when 'Pending Approval' then 3 when 'Approved' then 4 when 'Rejected' then 5 when 'Cancelled' then 6 else 7 end + + +- reportName: ULBLevelStatus_v2 + summary: Nummber of applications by there status ULB level + version: 1.0.0 + moduleName: rainmaker-tl + sourceColumns: + - name: status + label: report.tl.status + type: string + source: tl + total: false + - name: total + label: report.tl.total + type: string + source: tl + total: true + searchParams: + - name: fromDate + label: reports.tl.fromDate + type: epoch + source: tl + isMandatory: false + searchClause: AND tl.lastmodifiedtime >= $fromDate + - name: toDate + label: reports.tl.toDate + type: epoch + source: tl + isMandatory: false + searchClause: AND tl.lastmodifiedtime <= $toDate + query: | + SELECT + COUNT(applicationnumber) as total, + message.message as status + from eg_tl_tradelicense tl + LEFT OUTER JOIN message ON split_part(message.code,'_',2) = status AND message.locale = 'en_IN' + WHERE tl.tenantid=$tenantid + groupby: GROUP BY message.message + orderby: ORDER BY case message.message when 'Pending Application' then 1 when 'Pending Payment' then 2 when 'Pending Approval' then 3 when 'Approved' then 4 when 'Rejected' then 5 when 'Cancelled' then 6 else 7 end + + +- reportName: StateLevelTradeWiseCollection_v2 + summary: Collection according to tradeTypes state level + version: 1.0.0 + moduleName: rainmaker-tl + sourceColumns: + - name: tenantId + label: report.tl.tenantid + type: string + source: tl + total: false + - name: transactionNumber + label: report.tl.totalTransaction + type: string + source: tl + total: true + - name: online + label: report.tl.online.collection + type: string + source: tl + total: true + - name: offline + label: report.tl.offline.collection + type: string + source: tl + total: true + - name: total + label: report.tl.totalCollection + type: string + source: tl + total: true + searchParams: + - name: fromDate + label: reports.tl.fromDate + type: epoch + source: tl + isMandatory: false + searchClause: AND rh.receiptdate >= $fromDate + - name: toDate + label: reports.tl.toDate + type: epoch + source: tl + isMandatory: false + searchClause: AND rh.receiptdate <= $toDate + - name: ulb + label: ULB + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: tl + wrapper: true + isMandatory: false + searchClause: AND tl.tenantId = $ulb + query: | + select + sum(ih.amount) as total, + count(*) as transactionNumber, + sum(case collectiontype when 'COUNTER' then amount else 0 end) as offline, + sum(case collectiontype when 'ONLINE' then amount else 0 end) as online, + initcap(split_part(rh.tenantId, '.', 2)) as tenantId + from egcl_receiptheader_v1 as rh + inner join egcl_receiptinstrument_v1 as ri on ri.receiptheader = rh.id + inner join egcl_instrumentheader_v1 as ih on ih.id = ri.instrumentheader + where rh.businessdetails = 'TL' and rh.status !='Cancelled' and rh.tenantid !='pb.testing' + groupby: GROUP BY rh.tenantId + orderby: ORDER BY rh.tenantId asc + + +- reportName: StateLevelTradeLicenseRegistryReport_v2 + summary: TL Basic Report State Level + version: 1.0.0 + moduleName: rainmaker-tl + sourceColumns: + - name: tenantId + label: report.tl.tenantId + type: string + source: tl + total: false + - name: licensenumber + label: report.tl.licensenumber + type: string + source: tl + total: false + - name: formattedIssuedDate + label: report.tl.issueddate + type: string + source: tl + total: false + - name: g8issuedate + label: report.tl.g8issuedate + type: string + source: tl + total: false + - name: g8receiptno + label: report.tl.g8receiptno + type: string + source: tl + total: false + - name: name + label: report.tl.user.name + type: string + source: tl + total: false + - name: mobilenumber + label: report.tl.user.mobilenumber + type: string + source: tl + total: false + - name: tradeTypeName + label: report.tl.tradetype + type: string + source: tl + total: false + - name: acc + label: report.tl.accessorycategories + type: string + source: tl + total: false + - name: tradeName + label: report.tl.tradeName + type: string + source: tl + total: false + - name: totalamount + label: report.tl.receipt.totalamount + type: string + source: tl + total: true + searchParams: + - name: fromDate + label: reports.tl.fromDate + type: epoch + source: tl + isMandatory: false + searchClause: AND issueddate >= $fromDate + - name: toDate + label: reports.tl.toDate + type: epoch + source: tl + isMandatory: false + searchClause: AND issueddate <= $toDate + - name: ulb + label: ULB + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: tl + wrapper: true + isMandatory: false + searchClause: AND tl.tenantId = $ulb + query: | + SELECT + tl.tenantId as tenantId, + licensenumber, + to_char((To_timestamp(issueddate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as formattedIssuedDate, + tl.tradeName, + tradeTypeName, + acc, + name, + mobilenumber, + amount as totalamount, + To_char((To_timestamp(receipt.manualreceiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') AS g8issuedate, + receipt.manualreceiptnumber as g8receiptno + FROM eg_tl_tradelicense tl + INNER JOIN eg_tl_tradelicensedetail tld ON tld.tradelicenseid = tl.id + INNER JOIN eg_tl_owner tlowner ON tlowner.tradelicensedetailid = tld.id + INNER JOIN ( + SELECT tradelicensedetailid, array_to_string(array_agg(message.message),', ') as tradeTypeName FROM eg_tl_tradeunit + LEFT OUTER JOIN message ON code = CONCAT('TRADELICENSE_TRADETYPE_', REGEXP_REPLACE(tradetype, '[^A-Za-z0-9]','_','g')) AND message.locale = 'en_IN' GROUP BY 1) tlunit ON tlunit.tradelicensedetailid = tld.id + INNER JOIN eg_user tluser ON tluser.uuid = tlowner.id + LEFT OUTER JOIN egcl_receiptheader_v1 receipt ON receipt.consumercode = tl.applicationnumber + LEFT JOIN egcl_receiptinstrument_v1 as ri ON ri.receiptheader = receipt.id + LEFT JOIN egcl_instrumentheader_v1 as ih ON ih.id = ri.instrumentheader + LEFT OUTER JOIN + ( + SELECT tradelicensedetailid,array_to_string(array_agg(message.message),',') AS acc FROM eg_tl_accessory + LEFT OUTER JOIN message ON code=CONCAT('TRADELICENSE_ACCESSORIESCATEGORY_', REGEXP_REPLACE(accessorycategory, '[^A-Za-z0-9]','_', 'g')) AND message.locale = 'en_IN' GROUP BY 1 ) tlacc ON tlacc.tradelicensedetailid = tld.id + WHERE tl.Status = 'APPROVED' + orderby: ORDER BY tl.tenantId asc + + +- reportName: SearchTradeLicenseApplicationReport_v2 + summary: TL Search Application Report + version: 1.0.0 + moduleName: rainmaker-tl + sourceColumns: + - name: applicationnumber + label: report.tl.applicationnumber + type: string + source: tl + total: false + - name: licensenumber + label: report.tl.licensenumber + type: string + source: tl + total: false + - name: tradeName + label: report.tl.tradeName + type: string + source: tl + total: false + - name: name + label: report.tl.user.name + type: string + source: tl + total: false + - name: mobilenumber + label: report.tl.user.mobilenumber + type: string + source: tl + total: false + - name: formattedIssuedDate + label: report.tl.issueddate + type: string + source: tl + total: false + - name: status + label: report.tl.status + type: string + source: tl + total: false + searchParams: + - name: fromDate + label: reports.tl.fromDate + type: epoch + source: tl + isMandatory: false + searchClause: AND tl.applicationdate >= $fromDate + - name: toDate + label: reports.tl.toDate + type: epoch + source: tl + isMandatory: false + searchClause: AND tl.applicationdate <= $toDate + - name: localityArray + label: reports.tl.zoneList + type: boundarylist + source: tl + isMandatory: false + searchClause: AND tla.locality IN ($localityArray) + query: | + SELECT + tl.applicationnumber, + tl.licensenumber, + tl.tradeName, + (split_part(tl.tenantId, '.', 2)) as tenantId, + ownername, + mobilenumber, + tla.locality, + to_char((To_timestamp(applicationdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as applicationDate, + tl.status + from eg_tl_tradelicense as tl + INNER JOIN eg_tl_tradelicensedetail tld ON + tld.tradelicenseid = tl.id + INNER JOIN eg_tl_address as tla ON + tla.tradelicensedetailid=tld.id + INNER JOIN (SELECT tradelicensedetailid, array_to_string(array_agg(name),', ') as ownername, array_to_string(array_agg(mobilenumber),', ') as mobilenumber + FROM eg_tl_owner tlowner + INNER JOIN eg_user tluser ON + tluser.uuid = tlowner.id + group by tradelicensedetailid + ) tlown ON tlown.tradelicensedetailid = tld.id + WHERE tl.tenantid=$tenantid + + +- reportName: TradeLicenseDetailsReport_v2 + summary: Trade License Details Report + version: 1.0.0 + moduleName: rainmaker-tl + sourceColumns: + - name: applicationnumber + label: report.tl.applicationnumber + type: string + source: tl + total: false + - name: propertyid + label: report.tl.propertyid + type: string + source: tl + total: false + - name: financialyear + label: report.tl.financialyear + type: string + source: tl + total: false + - name: licensetype + label: report.tl.licensetype + type: string + source: tl + total: false + - name: oldlicensenumber + label: report.tl.oldlicensenumber + type: string + source: tl + total: false + - name: licensenumber + label: report.tl.licensenumber + type: string + source: tl + total: false + - name: tradeName + label: report.tl.tradeName + type: string + source: tl + total: false + - name: name + label: report.tl.user.name + type: string + source: tl + total: false + - name: mobilenumber + label: report.tl.user.mobilenumber + type: string + source: tl + total: false + - name: formattedIssuedDate + label: report.tl.issueddate + type: string + source: tl + total: false + - name: tradeTypeName + label: report.tl.tradetype + type: string + source: tl + total: false + - name: acc + label: report.tl.accessorycategories + type: string + source: tl + total: false + - name: totalamount + label: report.tl.receipt.totalamount + type: string + source: tl + total: true + searchParams: + - name: fromDate + label: reports.tl.fromDate + type: epoch + source: tl + isMandatory: false + searchClause: AND tl.applicationdate >= $fromDate + - name: toDate + label: reports.tl.toDate + type: epoch + source: tl + isMandatory: false + searchClause: AND tl.applicationdate <= $toDate + - name: localityArray + label: reports.tl.zoneList + type: boundarylist + source: tl + isMandatory: false + searchClause: AND tla.locality IN ($localityArray) + query: | + SELECT + tl.applicationnumber, + propertyid, + financialyear, + (case when oldlicensenumber is null then 'New' else 'Renewal' end) AS licensetype, + + oldlicensenumber, + licensenumber, + to_char((To_timestamp(issueddate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as formattedIssuedDate, + tl.tradeName, + tradeTypeName, + + acc, + name, + mobilenumber, + amount as totalamount + FROM eg_tl_tradelicense tl + INNER JOIN eg_tl_tradelicensedetail tld ON tld.tradelicenseid = tl.id + + INNER JOIN eg_tl_address as tla ON + tla.tradelicensedetailid=tld.id + INNER JOIN eg_tl_owner tlowner ON tlowner.tradelicensedetailid = tld.id + INNER JOIN ( + SELECT tradelicensedetailid, array_to_string(array_agg(message.message),', ') as tradeTypeName FROM eg_tl_tradeunit + LEFT OUTER JOIN message ON code = CONCAT('TRADELICENSE_TRADETYPE_', REGEXP_REPLACE(tradetype, '[^A-Za-z0-9]','_','g')) AND message.locale = 'en_IN' GROUP BY 1) tlunit ON tlunit.tradelicensedetailid = tld.id + INNER JOIN eg_user tluser ON tluser.uuid = tlowner.id + LEFT OUTER JOIN egcl_receiptheader_v1 receipt ON receipt.consumercode = tl.applicationnumber + LEFT JOIN egcl_receiptinstrument_v1 as ri ON ri.receiptheader = receipt.id + LEFT JOIN egcl_instrumentheader_v1 as ih ON ih.id = ri.instrumentheader + LEFT OUTER JOIN + ( + SELECT tradelicensedetailid,array_to_string(array_agg(message.message),',') AS acc FROM eg_tl_accessory + LEFT OUTER JOIN message ON code=CONCAT('TRADELICENSE_ACCESSORIESCATEGORY_', REGEXP_REPLACE(accessorycategory, '[^A-Za-z0-9]','_', 'g')) AND message.locale = 'en_IN' GROUP BY 1 ) tlacc ON tlacc.tradelicensedetailid = tld.id + WHERE tl.tenantid=$tenantid + + +- reportName: StateDefaulterReport_v2 + summary: TL Defautler + version: 1.0.0 + moduleName: rainmaker-tl + sourceColumns: + - name: ulb + label: report.tl.ulb + type: string + source: tl + total: false + - name: licensenumber + label: report.tl.licensenumber + type: string + source: tl + total: false + - name: applicationnumber + label: report.tl.applicationnumber + type: string + source: tl + total: false + - name: oldlicensenumber + label: report.tl.oldlicensenumber + type: string + source: tl + total: false + - name: financialyear + label: report.tl.financialyear + type: string + source: tl + total: false + - name: tradename + label: report.tl.tradename + type: string + source: tl + total: false + - name: ownername + label: report.tl.ownername + type: string + source: tl + total: false + - name: mobilenumber + label: report.tl.mobilenumber + type: string + source: tl + total: false + query: | + select + split_part(tenantid,'.',2) as ulb, + licensenumber, + applicationnumber, + oldlicensenumber, + financialyear, + tradename, + name as ownername, + mobilenumber + from eg_tl_tradelicense tl + INNER JOIN eg_tl_tradelicensedetail tld ON tld.tradelicenseid = tl.id + INNER JOIN ( + SELECT tradelicensedetailid, array_to_string(array_agg(name),', ') as name, array_to_string(array_agg(mobilenumber),', ') as mobilenumber + FROM eg_tl_owner tlowner + INNER JOIN eg_user tluser ON tluser.uuid = tlowner.id + group by tradelicensedetailid + ) tlown ON tlown.tradelicensedetailid = tld.id + where validto < extract (epoch from NOW())*1000 and licensenumber is not null and licensenumber not in (select oldlicensenumber from eg_tl_tradelicense where oldlicensenumber is not null) + and tenantid!='pb.testing' + orderby: order by tenantid + + +- reportName: ULBDefaulterReport_v2 + summary: TL Defautler + version: 1.0.0 + moduleName: rainmaker-tl + sourceColumns: + - name: ulb + label: report.tl.ulb + type: string + source: tl + total: false + - name: licensenumber + label: report.tl.licensenumber + type: string + source: tl + total: false + - name: applicationnumber + label: report.tl.applicationnumber + type: string + source: tl + total: false + - name: oldlicensenumber + label: report.tl.oldlicensenumber + type: string + source: tl + total: false + - name: financialyear + label: report.tl.financialyear + type: string + source: tl + total: false + - name: tradename + label: report.tl.tradename + type: string + source: tl + total: false + - name: ownername + label: report.tl.ownername + type: string + source: tl + total: false + - name: mobilenumber + label: report.tl.mobilenumber + type: string + source: tl + total: false + query: | + select + split_part(tenantid,'.',2) as ulb, + licensenumber, + applicationnumber, + oldlicensenumber, + financialyear, + tradename, + name as ownername, + mobilenumber + from eg_tl_tradelicense tl + INNER JOIN eg_tl_tradelicensedetail tld ON tld.tradelicenseid = tl.id + INNER JOIN ( + SELECT tradelicensedetailid, array_to_string(array_agg(name),', ') as name, array_to_string(array_agg(mobilenumber),', ') as mobilenumber + FROM eg_tl_owner tlowner + INNER JOIN eg_user tluser ON tluser.uuid = tlowner.id + group by tradelicensedetailid + ) tlown ON tlown.tradelicensedetailid = tld.id + where validto < extract (epoch from NOW())*1000 and licensenumber is not null and licensenumber not in (select oldlicensenumber from eg_tl_tradelicense where oldlicensenumber is not null) + and tenantid = $tenantid + + From 718567c0f974fd63fe4475f90c809478722b4756 Mon Sep 17 00:00:00 2001 From: gurpreetsinghkhanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 3 Jul 2020 09:32:05 +0530 Subject: [PATCH 0019/1242] QA Miscellaneous report v2 --- configs/reports/configs/uc-reports.yml | 832 +++++++++++++++++++++++++ 1 file changed, 832 insertions(+) diff --git a/configs/reports/configs/uc-reports.yml b/configs/reports/configs/uc-reports.yml index bf13cd47..90db5717 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -831,3 +831,835 @@ ReportDefinitions: WHERE rh.status != 'Cancelled' AND businessdetails not in ('PT','TL') and rh.tenantid=$tenantid orderby: ORDER BY rh.receiptdate DESC + + + - reportName: MiscReceipt_v2 + summary: Receipt Register Miscellaneous + version: 1.0.0 + moduleName: rainmaker-uc + sourceColumns: + - name: ulb + label: reports.uc.ulb + type: string + source: uc + total: false + - name: receiptnumber + label: reports.uc.receiptnumber + type: string + source: uc + total: false + - name: receiptdate + label: reports.uc.receiptdate + type: string + source: uc + total: false + - name: g8issuedate + label: reports.uc.g8issuedate + type: string + source: uc + total: false + - name: g8receiptno + label: reports.uc.g8receiptno + type: string + source: uc + total: false + - name: status + label: reports.uc.receiptstatus + type: string + source: uc + total: false + - name: servicecategory + label: reports.uc.businessdetails + type: string + source: uc + total: false + - name: cgst + label: reports.uc.cgst + type: string + source: uc + total: true + - name: tax + label: reports.uc.tax + type: string + source: uc + total: true + - name: fieldcollection + label: reports.uc.fieldcollection + type: string + source: uc + total: true + - name: sgst + label: reports.uc.sgst + type: string + source: uc + total: true + - name: ddorchequenumber + label: reports.uc.ddorchequenumber + type: string + source: uc + total: false + - name: collectiontype + label: reports.uc.collectiontype + type: string + source: uc + total: false + - name: collectorname + label: reports.uc.collectorname + type: string + source: uc + total: false + - name: totalamount + label: reports.uc.totalamount + type: string + source: uc + total: true + - name: paymentmode + label: reports.uc.paymentmode + type: string + source: uc + total: false + searchParams: + - name: fromDate + label: reports.uc.fromDate + type: epoch + source: uc + isMandatory: false + searchClause: AND rh.receiptdate >= $fromDate + - name: toDate + label: reports.uc.toDate + type: epoch + source: uc + isMandatory: false + searchClause: AND rh.receiptdate <= $toDate + - name: ulb + label: reports.uc.ulb + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: uc + wrapper: true + isMandatory: false + searchClause: AND rh.tenantid = $ulb + query: | + -- Use CTE to force query plan, compute & use CTE later + WITH receipt_breakup AS ( + SELECT + receiptheader, + SUM(CASE WHEN taxheadcode LIKE '%_CGST' THEN adjustedamount ELSE 0 END) as cgst, + SUM(CASE WHEN taxheadcode LIKE '%_TAX' THEN adjustedamount ELSE 0 END) as tax, + SUM(CASE WHEN taxheadcode LIKE '%_SGST' THEN adjustedamount ELSE 0 END) as sgst, + SUM(CASE WHEN taxheadcode LIKE '%_FIELD_FEE' THEN adjustedamount ELSE 0 END) as fieldcollection + FROM egcl_receiptdetails_v1 as rd + INNER JOIN egcl_receiptheader_v1 as rh on rh.id = rd.receiptheader + WHERE rh.status != 'Cancelled' AND rh.tenantid!='pb.testing' AND businessdetails not in ('PT','TL','FIRENOC') + GROUP BY rd.receiptheader + ) + SELECT + rh.tenantid as ulb, + rh.receiptnumber as receiptnumber, + To_char((To_timestamp(rh.receiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as receiptdate, + To_char((To_timestamp(rh.manualreceiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as g8issuedate, + rh.manualreceiptnumber as g8receiptno, + rh.status as status, + businessdetails as servicecategory, + receipt_breakup.*, + amount as totalamount, + instrumenttype as paymentmode, + (case when instrumenttype like 'Cash' then '' else transactionnumber end) as ddorchequenumber, + 'System' as collectiontype, + eg_user.name as collectorname + FROM egcl_receiptheader_v1 AS rh + JOIN egcl_receiptinstrument_v1 AS ri ON rh.id = ri.receiptheader + JOIN egcl_instrumentheader_v1 AS ih ON ih.id = ri.instrumentheader + JOIN receipt_breakup ON rh.id = receipt_breakup.receiptheader + JOIN eg_user ON rh.createdby::INTEGER=eg_user.id + WHERE rh.status != 'Cancelled' AND rh.tenantid!='pb.testing' AND businessdetails not in ('PT','TL','FIRENOC') + orderby: ORDER BY rh.receiptdate DESC + + - reportName: MiscReceiptULB_v2 + summary: Receipt Register Miscellaneous + version: 1.0.0 + moduleName: rainmaker-uc + additionalConfig: + print: + pdfPageSize: "A3" + sourceColumns: + - name: ulb + label: reports.uc.ulb + type: string + source: uc + total: false + - name: receiptnumber + label: reports.uc.receiptnumber + type: string + source: uc + total: false + - name: receiptdate + label: reports.uc.receiptdate + type: string + source: uc + total: false + - name: g8issuedate + label: reports.uc.g8issuedate + type: string + source: uc + total: false + - name: g8receiptno + label: reports.uc.g8receiptno + type: string + source: uc + total: false + - name: status + label: reports.uc.receiptstatus + type: string + source: uc + total: false + - name: servicecategory + label: reports.uc.businessdetails + type: string + source: uc + total: false + - name: cgst + label: reports.uc.cgst + type: string + source: uc + total: true + - name: tax + label: reports.uc.tax + type: string + source: uc + total: true + - name: fieldcollection + label: reports.uc.fieldcollection + type: string + source: uc + total: true + - name: sgst + label: reports.uc.sgst + type: string + source: uc + total: true + - name: ddorchequenumber + label: reports.uc.ddorchequenumber + type: string + source: uc + total: false + - name: ddchequedate + label: reports.uc.ddorchequedate + type: string + source: uc + total: false + - name: bankname + label: reports.uc.bankname + type: string + source: uc + total: false + - name: branchname + label: reports.uc.branchname + type: string + source: uc + total: false + - name: collectiontype + label: reports.uc.collectiontype + type: string + source: uc + total: false + - name: collectorname + label: reports.uc.collectorname + type: string + source: uc + total: false + - name: totalamount + label: reports.uc.totalamount + type: string + source: uc + total: true + - name: paymentmode + label: reports.uc.paymentmode + type: string + source: uc + total: false + - name: comments + label: reports.uc.comment + type: string + source: uc + total: false + searchParams: + - name: fromDate + label: reports.uc.fromDate + type: epoch + source: uc + isMandatory: true + searchClause: AND rh.receiptdate >= $fromDate + - name: toDate + label: reports.uc.toDate + type: epoch + source: uc + isMandatory: true + searchClause: AND rh.receiptdate <= $toDate + - name: businessservice + label: reports.uc.businessservice + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=BillingService&masterName=BusinessService&tenantId=$tenantid|$.MdmsRes.BillingService.BusinessService[*].code|$.MdmsRes.BillingService.BusinessService[*].code + source: uc + wrapper: true + isMandatory: false + searchClause: AND rh.businessdetails = $businessservice + - name: collectorname + label: reports.uc.collectorname + type: singlevaluelist + pattern: http://egov-hrms:8080/egov-hrms/employees/_search?tenantId=$tenantid&roles=UC_EMP|$.Employees[*].user.id|$.Employees[*].user.name + source: uc + wrapper: true + isMandatory: false + searchClause: AND eg_user.id = $collectorname::INTEGER + query: | + -- Use CTE to force query plan, compute & use CTE later + WITH receipt_breakup AS ( + SELECT + receiptheader, + SUM(CASE WHEN taxheadcode LIKE '%_CGST' THEN adjustedamount ELSE 0 END) as cgst, + SUM(CASE WHEN taxheadcode LIKE '%_TAX' THEN adjustedamount ELSE 0 END) as tax, + SUM(CASE WHEN taxheadcode LIKE '%_SGST' THEN adjustedamount ELSE 0 END) as sgst, + SUM(CASE WHEN taxheadcode LIKE '%_FIELD_FEE' THEN adjustedamount ELSE 0 END) as fieldcollection + FROM egcl_receiptdetails_v1 as rd + INNER JOIN egcl_receiptheader_v1 as rh on rh.id = rd.receiptheader + where status!='Cancelled' and businessdetails not in ('PT','TL','FIRENOC') and rd.tenantid=$tenantid + GROUP BY rd.receiptheader + ) + SELECT + rh.tenantid as ulb, + rh.receiptnumber as receiptnumber, + To_char((To_timestamp(rh.receiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as receiptdate, + To_char((To_timestamp(rh.manualreceiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as g8issuedate, + rh.manualreceiptnumber as g8receiptno, + rh.status as status, + businessdetails as servicecategory, + receipt_breakup.*, + amount as totalamount, + instrumenttype as paymentmode, + (case when instrumenttype like 'Cash' then '' else transactionnumber end) as ddorchequenumber, + (case when instrumenttype like 'DD' or instrumenttype like 'Cheque' then To_char((To_timestamp(ih.transactiondate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') else '' end) as ddchequedate, + ih.bankid as bankname, + ih.branchname as branchname, + 'System' as collectiontype, + eg_user.name as collectorname, + rh.additionaldetails->>'comment' as comments + FROM egcl_receiptheader_v1 AS rh + JOIN egcl_receiptinstrument_v1 AS ri ON rh.id = ri.receiptheader + JOIN egcl_instrumentheader_v1 AS ih ON ih.id = ri.instrumentheader + JOIN receipt_breakup ON rh.id = receipt_breakup.receiptheader + JOIN eg_user ON rh.createdby::INTEGER=eg_user.id + WHERE rh.status != 'Cancelled' AND businessdetails not in ('PT','TL','FIRENOC') + and rh.tenantid=$tenantid + orderby: ORDER BY rh.receiptdate DESC + + - reportName: MiscReceiptStateWide_v2 + summary: State Receipt Register Miscellaneous + version: 1.0.0 + moduleName: rainmaker-uc + sourceColumns: + - name: ulb + label: reports.uc.ulb + type: string + source: uc + total: false + - name: servicecategory + label: reports.uc.businessdetails + type: string + source: uc + total: false + - name: cgst + label: reports.uc.cgst + type: string + source: uc + total: true + - name: tax + label: reports.uc.tax + type: string + source: uc + total: true + - name: fieldcollection + label: reports.uc.fieldcollection + type: string + source: uc + total: true + - name: sgst + label: reports.uc.sgst + type: string + source: uc + total: true + - name: totalamount + label: reports.uc.totalamount + type: string + source: uc + total: true + searchParams: + - name: fromDate + label: reports.uc.fromDate + type: epoch + source: uc + isMandatory: false + searchClause: AND rh.receiptdate >= $fromDate + - name: toDate + label: reports.uc.toDate + type: epoch + source: uc + isMandatory: false + searchClause: AND rh.receiptdate <= $toDate + - name: ulb + label: reports.uc.ulb + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: uc + wrapper: true + isMandatory: false + searchClause: AND rh.tenantid = $ulb + query: | + -- Use CTE to force query plan, compute & use CTE later + SELECT + rh.tenantid as ulb,rh.businessdetails as servicecategory, count(*) as receipts, + SUM(CASE WHEN taxheadcode LIKE '%_FIELD_FEE' THEN adjustedamount ELSE 0 END) as fieldcollection, + SUM(CASE WHEN taxheadcode LIKE '%_TAX' THEN adjustedamount ELSE 0 END) as tax, + SUM(CASE WHEN taxheadcode LIKE '%_CGST' THEN adjustedamount ELSE 0 END) as cgst, + SUM(CASE WHEN taxheadcode LIKE '%_SGST' THEN adjustedamount ELSE 0 END) as sgst, + sum(totalamount) as totalamount + from egcl_receiptheader_v1 rh, egcl_receiptdetails_v1 as rd + WHERE rh.id=rd.receiptheader and rh.status != 'Cancelled' AND rh.tenantid!='pb.testing' AND businessdetails not in ('PT','TL','FIRENOC') + groupby: group by rh.tenantid,rh.businessdetails + orderby: order by rh.tenantid + + - reportName: MiscReceiptState_v2 + summary: State Miscellaneous Receipt Register + version: 1.0.0 + moduleName: rainmaker-uc + sourceColumns: + - name: ulb + label: reports.uc.ulb + type: string + source: uc + total: false + - name: noofreceipts + label: reports.uc.noOfReceipts + type: string + source: uc + total: true + - name: tax + label: reports.uc.tax + type: string + source: uc + total: true + - name: cgst + label: reports.uc.cgst + type: string + source: uc + total: true + - name: sgst + label: reports.uc.sgst + type: string + source: uc + total: true + - name: fieldcollection + label: reports.uc.fieldCollection + type: string + source: uc + total: true + - name: totalamount + label: reports.uc.totalamount + type: string + source: uc + total: true + searchParams: + - name: fromDate + label: reports.uc.fromDate + type: epoch + source: uc + isMandatory: false + searchClause: AND rh.receiptdate >= $fromDate + - name: toDate + label: reports.uc.toDate + type: epoch + source: uc + isMandatory: false + searchClause: AND rh.receiptdate <= $toDate + - name: ulb + label: reports.uc.ulb + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: uc + wrapper: true + isMandatory: false + searchClause: AND rh.tenantid = $ulb + query: | + -- Use CTE to force query plan, compute & use CTE later + SELECT + rh.tenantid as ulb, + count(distinct rh.id) as noofreceipts, + SUM(CASE WHEN taxheadcode LIKE '%_TAX' THEN adjustedamount ELSE 0 END) as tax, + SUM(CASE WHEN taxheadcode LIKE '%_CGST' THEN adjustedamount ELSE 0 END) as cgst, + SUM(CASE WHEN taxheadcode LIKE '%_SGST' THEN adjustedamount ELSE 0 END) as sgst, + SUM(CASE WHEN taxheadcode LIKE '%_FIELD_FEE' THEN adjustedamount ELSE 0 END) as fieldcollection, + sum(amount) as totalamount + from egcl_receiptheader_v1 rh, egcl_receiptdetails_v1 as rd + WHERE rh.id=rd.receiptheader and rh.status != 'Cancelled' AND rh.tenantid!='pb.testing' AND businessdetails not in ('PT','TL','FIRENOC') + groupby: group by rh.tenantid + + - reportName: MiscCollectionState_v2 + summary: State Miscellaneous Collection Register + version: 1.0.0 + moduleName: rainmaker-uc + sourceColumns: + - name: ulb + label: reports.uc.ulb + type: string + source: uc + total: false + - name: offlinetransactions + label: reports.uc.noOfOfflineTransactions + type: string + source: uc + total: true + - name: onlinetransactions + label: reports.uc.noOfOnlineTransactions + type: string + source: uc + total: true + - name: totaltransactions + label: reports.uc.totalTransactions + type: string + source: uc + total: true + - name: offlinecollection + label: reports.uc.offlineCollection + type: string + source: uc + total: true + - name: onlinecollection + label: reports.uc.onlineCollection + type: string + source: uc + total: true + - name: totalcollection + label: reports.uc.totalCollection + type: string + source: uc + total: true + searchParams: + - name: fromDate + label: reports.uc.fromDate + type: epoch + source: uc + isMandatory: false + searchClause: AND rh.receiptdate >= $fromDate + - name: toDate + label: reports.uc.toDate + type: epoch + source: uc + isMandatory: false + searchClause: AND rh.receiptdate <= $toDate + - name: ulb + label: reports.uc.ulb + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: uc + wrapper: true + isMandatory: false + searchClause: AND rh.tenantid = $ulb + query: | + -- Use CTE to force query plan, compute & use CTE later + SELECT + initcap(split_part(rh.tenantId, '.', 2)) as ulb, + count(*) FILTER (where collectiontype='COUNTER') as offlinetransactions, + count(*) FILTER (where collectiontype='ONLINE') as onlinetransactions, + count(*) as totaltransactions, + sum(case collectiontype when 'COUNTER' then ih.amount else 0 end) as offlinecollection, + sum(case collectiontype when 'ONLINE' then ih.amount else 0 end) as onlinecollection, + sum(ih.amount) as totalcollection + from egcl_receiptheader_v1 as rh + inner join egcl_receiptinstrument_v1 as ri on ri.receiptheader = rh.id + inner join egcl_instrumentheader_v1 as ih on ih.id = ri.instrumentheader + where rh.businessdetails not in ('PT','TL','FIRENOC') and rh.status !='Cancelled' and rh.tenantid !='pb.testing' + groupby: GROUP BY rh.tenantid + orderby: ORDER BY rh.tenantId asc + + - reportName: MiscBusinessServiceCollectionTenant_v2 + summary: Miscellaneous Business Service Collection + version: 1.0.0 + moduleName: rainmaker-uc + sourceColumns: + - name: servicetype + label: reports.uc.serviceType + type: string + source: uc + total: false + - name: totalreceipts + label: reports.uc.totalReceipts + type: string + source: uc + total: true + - name: tax + label: reports.uc.tax + type: string + source: uc + total: true + - name: cgst + label: reports.uc.cgst + type: string + source: uc + total: true + - name: sgst + label: reports.uc.sgst + type: string + source: uc + total: true + - name: fieldcollection + label: reports.uc.fieldCollection + type: string + source: uc + total: true + - name: totalcollection + label: reports.uc.totalCollection + type: string + source: uc + total: true + searchParams: + - name: fromDate + label: reports.uc.fromDate + type: epoch + source: uc + isMandatory: false + searchClause: AND rh.receiptdate >= $fromDate + - name: toDate + label: reports.uc.toDate + type: epoch + source: uc + isMandatory: false + searchClause: AND rh.receiptdate <= $toDate + query: | + -- Use CTE to force query plan, compute & use CTE later + SELECT + rh.businessdetails as servicetype, + count(distinct rh.id) as totalreceipts, + SUM(CASE WHEN taxheadcode LIKE '%_TAX' THEN adjustedamount ELSE 0 END) as tax, + SUM(CASE WHEN taxheadcode LIKE '%_CGST' THEN adjustedamount ELSE 0 END) as cgst, + SUM(CASE WHEN taxheadcode LIKE '%_SGST' THEN adjustedamount ELSE 0 END) as sgst, + SUM(CASE WHEN taxheadcode LIKE '%_FIELD_FEE' THEN adjustedamount ELSE 0 END) as fieldcollection, + SUM(amount) as totalcollection + from egcl_receiptheader_v1 rh, egcl_receiptdetails_v1 as rd + WHERE rh.id=rd.receiptheader and rh.status != 'Cancelled' AND rh.tenantid=$tenantid AND businessdetails not in ('PT','TL','FIRENOC') + groupby: GROUP BY rh.businessdetails + orderby: ORDER BY rh.businessdetails + + - reportName: MiscReceiptULBCancelled_v2 + summary: Cancelled Receipt Miscellaneous + version: 1.0.0 + moduleName: rainmaker-uc + additionalConfig: + print: + pdfPageSize: "A3" + sourceColumns: + - name: ulb + label: reports.uc.ulb + type: string + source: uc + total: false + - name: receiptnumber + label: reports.uc.receiptnumber + type: string + source: uc + total: false + - name: receiptdate + label: reports.uc.receiptdate + type: string + source: uc + total: false + - name: servicecategory + label: reports.uc.businessdetails + type: string + source: uc + total: false + - name: cgst + label: reports.uc.cgst + type: string + source: uc + total: true + - name: tax + label: reports.uc.tax + type: string + source: uc + total: true + - name: fieldcollection + label: reports.uc.fieldcollection + type: string + source: uc + total: true + - name: sgst + label: reports.uc.sgst + type: string + source: uc + total: true + - name: ddorchequenumber + label: reports.uc.ddorchequenumber + type: string + source: uc + total: false + - name: ddchequedate + label: reports.uc.ddorchequedate + type: string + source: uc + total: false + - name: collectiontype + label: reports.uc.collectiontype + type: string + source: uc + total: false + - name: collectorname + label: reports.uc.collectorname + type: string + source: uc + total: false + - name: totalamount + label: reports.uc.totalamount + type: string + source: uc + total: true + - name: paymentmode + label: reports.uc.paymentmode + type: string + source: uc + total: false + searchParams: + - name: fromDate + label: reports.uc.fromDate + type: epoch + source: uc + isMandatory: false + searchClause: AND rh.receiptdate >= $fromDate + - name: toDate + label: reports.uc.toDate + type: epoch + source: uc + isMandatory: false + searchClause: AND rh.receiptdate <= $toDate + - name: collectorname + label: reports.uc.collectorname + type: singlevaluelist + pattern: http://egov-hrms:8080/egov-hrms/employees/_search?tenantId=$tenantid&roles=UC_EMP|$.Employees[*].user.id|$.Employees[*].user.name + source: uc + wrapper: true + isMandatory: false + searchClause: AND eg_user.id = $collectorname::INTEGER + query: | + -- Use CTE to force query plan, compute & use CTE later + WITH receipt_breakup AS ( + SELECT + receiptheader, + SUM(CASE WHEN taxheadcode LIKE '%_CGST' THEN adjustedamount ELSE 0 END) as cgst, + SUM(CASE WHEN taxheadcode LIKE '%_TAX' THEN adjustedamount ELSE 0 END) as tax, + SUM(CASE WHEN taxheadcode LIKE '%_SGST' THEN adjustedamount ELSE 0 END) as sgst, + SUM(CASE WHEN taxheadcode LIKE '%_FIELD_FEE' THEN adjustedamount ELSE 0 END) as fieldcollection + FROM egcl_receiptdetails_v1 as rd + INNER JOIN egcl_receiptheader_v1 as rh on rh.id = rd.receiptheader + WHERE rh.status = 'Cancelled' AND businessdetails not in ('PT','TL','FIRENOC') and rh.tenantid=$tenantid + GROUP BY rd.receiptheader + ) + SELECT + rh.tenantid as ulb, + rh.receiptnumber as receiptnumber, + To_char((To_timestamp(rh.receiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as receiptdate, + businessdetails as servicecategory, + receipt_breakup.*, + amount as totalamount, + instrumenttype as paymentmode, + (case when instrumenttype like 'Cash' then '' else transactionnumber end) as ddorchequenumber, + (case when instrumenttype like 'DD' or instrumenttype like 'Cheque' then To_char((To_timestamp(ih.transactiondate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') else '' end) as ddchequedate, + eg_user.name as collectorname + FROM egcl_receiptheader_v1 AS rh + JOIN egcl_receiptinstrument_v1 AS ri ON rh.id = ri.receiptheader + JOIN egcl_instrumentheader_v1 AS ih ON ih.id = ri.instrumentheader + JOIN receipt_breakup ON rh.id = receipt_breakup.receiptheader + JOIN eg_user ON rh.createdby::INTEGER=eg_user.id + WHERE rh.status = 'Cancelled' AND businessdetails not in ('PT','TL','FIRENOC') + and rh.tenantid=$tenantid + orderby: ORDER BY rh.receiptdate DESC + + - reportName: MiscReceiptULBShort_v2 + summary: Receipt Register Miscellaneous + version: 1.0.0 + moduleName: rainmaker-uc + additionalConfig: + print: + pdfPageSize: "A3" + sourceColumns: + - name: consumername + label: reports.uc.consumername + type: string + source: uc + total: false + - name: mobilenumber + label: reports.uc.mobilenumber + type: string + source: uc + total: false + - name: receiptdate + label: reports.uc.receiptdate + type: string + source: uc + total: false + - name: servicecategory + label: reports.uc.businessdetails + type: string + source: uc + total: false + - name: amount + label: reports.uc.totalamount + type: string + source: uc + total: true + - name: remarks + label: reports.uc.remarks + type: string + source: uc + total: false + - name: collectorname + label: reports.uc.collectorname + type: string + source: uc + total: false + searchParams: + - name: fromDate + label: reports.uc.fromDate + type: epoch + source: uc + isMandatory: false + searchClause: AND rh.receiptdate >= $fromDate + - name: toDate + label: reports.uc.toDate + type: epoch + source: uc + isMandatory: false + searchClause: AND rh.receiptdate <= $toDate + - name: collectorname + label: reports.uc.collectorname + type: singlevaluelist + pattern: http://egov-hrms:8080/egov-hrms/employees/_search?tenantId=$tenantid&roles=UC_EMP|$.Employees[*].user.id|$.Employees[*].user.name + source: uc + wrapper: true + isMandatory: false + searchClause: AND eg_user.id = $collectorname::INTEGER + query: | + -- Use CTE to force query plan, compute & use CTE later + SELECT + rh.payername as consumername, + rh.payermobile as mobilenumber, + To_char((To_timestamp(rh.receiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as receiptdate, + businessdetails as servicecategory, + rh.totalamount as amount, + eg_user.name as collectorname, + rh.additionaldetails->>'comment' as remarks + FROM egcl_receiptheader_v1 AS rh + JOIN egcl_receiptinstrument_v1 AS ri ON rh.id = ri.receiptheader + JOIN egcl_instrumentheader_v1 AS ih ON ih.id = ri.instrumentheader + JOIN eg_user ON rh.createdby::INTEGER=eg_user.id + WHERE rh.status != 'Cancelled' AND businessdetails not in ('PT','TL','FIRENOC') + and rh.tenantid=$tenantid + orderby: ORDER BY rh.receiptdate DESC \ No newline at end of file From 4d5860d208fc061fa87765e329d451de39bbadba Mon Sep 17 00:00:00 2001 From: narendrabandhamneni-wt-egov Date: Tue, 21 Jul 2020 15:43:32 +0530 Subject: [PATCH 0020/1242] added firenoc indexer --- .../rainmaker-firenoc-indexer.yml | 33 +++++++++++++++++++ .../weekly-impact-emailer-searcher.yml | 33 +++++++++++++++---- 2 files changed, 60 insertions(+), 6 deletions(-) create mode 100644 configs/egov-indexer/rainmaker-firenoc-indexer.yml diff --git a/configs/egov-indexer/rainmaker-firenoc-indexer.yml b/configs/egov-indexer/rainmaker-firenoc-indexer.yml new file mode 100644 index 00000000..925faa5b --- /dev/null +++ b/configs/egov-indexer/rainmaker-firenoc-indexer.yml @@ -0,0 +1,33 @@ +ServiceMaps: + serviceName: Fire NOC + version: 1.0.0 + mappings: + - topic: save-fn-firenoc + configKey: INDEX + indexes: + - name: firenoc-index + type: FireNOCs + id: $.id, $.tenantId + isBulk: true + timeStampField: $.auditDetails.createdTime + jsonPath: $.FireNOCs + + - topic: update-fn-firenoc + configKey: INDEX + indexes: + - name: firenoc-index + type: FireNOCs + id: $.id, $.tenantId + isBulk: true + timeStampField: $.auditDetails.createdTime + jsonPath: $.FireNOCs + + - topic: update-fn-workflow + configKey: INDEX + indexes: + - name: firenoc-index + type: FireNOCs + id: $.id, $.tenantId + isBulk: true + timeStampField: $.auditDetails.createdTime + jsonPath: $.FireNOCs \ No newline at end of file diff --git a/configs/egov-searcher/weekly-impact-emailer-searcher.yml b/configs/egov-searcher/weekly-impact-emailer-searcher.yml index 96d4b369..6ba4e8ae 100644 --- a/configs/egov-searcher/weekly-impact-emailer-searcher.yml +++ b/configs/egov-searcher/weekly-impact-emailer-searcher.yml @@ -5,13 +5,19 @@ definitions: - name: stateWideData query: - baseQuery: select array_to_json(array_agg(row_to_json(stateWideReports))) from ((SELECT (SELECT count(*) FROM ((SELECT DISTINCT tenantid FROM eg_pt_property_v2 WHERE (createdtime/1000) <= (extract(epoch from NOW())) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_tl_tradelicense WHERE (createdtime/1000) <= (extract(epoch from NOW())) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_pgr_service WHERE (createdtime/1000) <= (extract(epoch from NOW())) AND tenantid != 'pb.testing')) AS tenants) as ulbCovered,(SELECT TRUNC(((SELECT SUM(ins.amount) FROM eg_pt_property_v2 pt INNER JOIN egcl_receiptheader_v1 rh ON pt.propertyid = SPLIT_PART(rh.consumercode, ':', 1) INNER JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id WHERE (rh.receiptdate/1000) <= (extract(epoch from NOW())) AND pt.tenantid != 'pb.testing' AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED') + (SELECT SUM(ins.amount) FROM eg_tl_tradelicense tl INNER JOIN egcl_receiptheader_v1 rh ON tl.applicationnumber = rh.consumercode INNER JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id WHERE (rh.receiptdate/1000) <= (extract(epoch from NOW())) AND tl.tenantid != 'pb.testing' AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED')) / 10000000, 3)) as revenueCollected,(SELECT (SELECT count(*) FROM eg_pt_property_v2 WHERE (createdtime/1000) <= (extract(epoch from NOW())) AND tenantid != 'pb.testing') + (SELECT count(*) FROM eg_tl_tradelicense WHERE (createdtime/1000) <= (extract(epoch from NOW())) AND tenantid != 'pb.testing')) as servicesApplied, (SELECT count(*) FROM eg_user WHERE (createddate <= NOW()) AND tenantid != 'pb.testing' AND type = 'CITIZEN') as noOfUsersRegistered, 'Week0' as day) UNION (SELECT (SELECT count(*) FROM ((SELECT DISTINCT tenantid FROM eg_pt_property_v2 WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_tl_tradelicense WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing')) AS tenants) as ulbCovered,(SELECT TRUNC(((SELECT SUM(ins.amount) FROM eg_pt_property_v2 pt INNER JOIN egcl_receiptheader_v1 rh ON pt.propertyid = SPLIT_PART(rh.consumercode, ':', 1) INNER JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND pt.tenantid != 'pb.testing' AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED') + (SELECT SUM(ins.amount) FROM eg_tl_tradelicense tl INNER JOIN egcl_receiptheader_v1 rh ON tl.applicationnumber = rh.consumercode INNER JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tl.tenantid != 'pb.testing' AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED')) / 10000000, 3)) as revenueCollected,(SELECT (SELECT count(*) FROM eg_pt_property_v2 WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing') + (SELECT count(*) FROM eg_tl_tradelicense WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing')) as servicesApplied, (SELECT count(*) FROM eg_user WHERE createddate <= to_timestamp((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing' AND type = 'CITIZEN') as noOfUsersRegistered, 'Week1' as day) UNION (SELECT (SELECT count(*) FROM ((SELECT DISTINCT tenantid FROM eg_pt_property_v2 WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_tl_tradelicense WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing')) AS tenants) as ulbCovered,(SELECT TRUNC(((SELECT SUM(ins.amount) FROM eg_pt_property_v2 pt INNER JOIN egcl_receiptheader_v1 rh ON pt.propertyid = SPLIT_PART(rh.consumercode, ':', 1) INNER JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND pt.tenantid != 'pb.testing' AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED') + (SELECT SUM(ins.amount) FROM eg_tl_tradelicense tl INNER JOIN egcl_receiptheader_v1 rh ON tl.applicationnumber = rh.consumercode INNER JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tl.tenantid != 'pb.testing' AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED')) / 10000000, 3)) as revenueCollected,(SELECT (SELECT count(*) FROM eg_pt_property_v2 WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing') + (SELECT count(*) FROM eg_tl_tradelicense WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing')) as servicesApplied, (SELECT count(*) FROM eg_user WHERE createddate <= to_timestamp((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing' AND type = 'CITIZEN') as noOfUsersRegistered, 'Week2' as day) UNION (SELECT (SELECT count(*) FROM ((SELECT DISTINCT tenantid FROM eg_pt_property_v2 WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_tl_tradelicense WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing')) AS tenants) as ulbCovered,(SELECT TRUNC(((SELECT SUM(ins.amount) FROM eg_pt_property_v2 pt INNER JOIN egcl_receiptheader_v1 rh ON pt.propertyid = SPLIT_PART(rh.consumercode, ':', 1) INNER JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND pt.tenantid != 'pb.testing' AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED') + (SELECT SUM(ins.amount) FROM eg_tl_tradelicense tl INNER JOIN egcl_receiptheader_v1 rh ON tl.applicationnumber = rh.consumercode INNER JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tl.tenantid != 'pb.testing' AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED')) / 10000000, 3)) as revenueCollected,(SELECT (SELECT count(*) FROM eg_pt_property_v2 WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing') + (SELECT count(*) FROM eg_tl_tradelicense WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing')) as servicesApplied, (SELECT count(*) FROM eg_user WHERE createddate <= to_timestamp((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing' AND type = 'CITIZEN') as noOfUsersRegistered, 'Week3' as day) UNION (SELECT (SELECT count(*) FROM ((SELECT DISTINCT tenantid FROM eg_pt_property_v2 WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_tl_tradelicense WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing')) AS tenants) as ulbCovered,(SELECT TRUNC(((SELECT SUM(ins.amount) FROM eg_pt_property_v2 pt INNER JOIN egcl_receiptheader_v1 rh ON pt.propertyid = SPLIT_PART(rh.consumercode, ':', 1) INNER JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND pt.tenantid != 'pb.testing' AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED') + (SELECT SUM(ins.amount) FROM eg_tl_tradelicense tl INNER JOIN egcl_receiptheader_v1 rh ON tl.applicationnumber = rh.consumercode INNER JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tl.tenantid != 'pb.testing' AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED')) / 10000000, 3)) as revenueCollected,(SELECT (SELECT count(*) FROM eg_pt_property_v2 WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing') + (SELECT count(*) FROM eg_tl_tradelicense WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing')) as servicesApplied, (SELECT count(*) FROM eg_user WHERE createddate <= to_timestamp((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing' AND type = 'CITIZEN') as noOfUsersRegistered, 'Week4' as day) UNION (SELECT (SELECT count(*) FROM ((SELECT DISTINCT tenantid FROM eg_pt_property_v2 WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_tl_tradelicense WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing')) AS tenants) as ulbCovered,(SELECT TRUNC(((SELECT SUM(ins.amount) FROM eg_pt_property_v2 pt INNER JOIN egcl_receiptheader_v1 rh ON pt.propertyid = SPLIT_PART(rh.consumercode, ':', 1) INNER JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND pt.tenantid != 'pb.testing' AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED') + (SELECT SUM(ins.amount) FROM eg_tl_tradelicense tl INNER JOIN egcl_receiptheader_v1 rh ON tl.applicationnumber = rh.consumercode INNER JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tl.tenantid != 'pb.testing' AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED')) / 10000000, 3)) as revenueCollected, (SELECT (SELECT count(*) FROM eg_pt_property_v2 WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing') + (SELECT count(*) FROM eg_tl_tradelicense WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing')) as servicesApplied, (SELECT count(*) FROM eg_user WHERE createddate <= to_timestamp((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing' AND type = 'CITIZEN') as noOfUsersRegistered, 'Week5' as day)) stateWideReports + baseQuery: select array_to_json(array_agg(row_to_json(stateWideReports))) from ((SELECT (SELECT count(*) FROM ((SELECT DISTINCT tenantid FROM eg_pt_property_v2 WHERE (createdtime/1000) <= (extract(epoch from NOW())) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_tl_tradelicense WHERE (createdtime/1000) <= (extract(epoch from NOW())) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_pgr_service WHERE (createdtime/1000) <= (extract(epoch from NOW())) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_fn_firenoc WHERE (createdtime/1000) <= (extract(epoch from NOW())) AND tenantid != 'pb.testing')) AS tenants) as ulbCovered,(SELECT TRUNC(((SELECT SUM(ins.amount) FROM eg_pt_property_v2 pt INNER JOIN egcl_receiptheader_v1 rh ON pt.propertyid = SPLIT_PART(rh.consumercode, ':', 1) INNER JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id WHERE (rh.receiptdate/1000) <= (extract(epoch from NOW())) AND pt.tenantid != 'pb.testing' AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED') + (SELECT SUM(ins.amount) FROM eg_tl_tradelicense tl INNER JOIN egcl_receiptheader_v1 rh ON tl.applicationnumber = rh.consumercode INNER JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id WHERE (rh.receiptdate/1000) <= (extract(epoch from NOW())) AND tl.tenantid != 'pb.testing' AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED')+(SELECT COALESCE(SUM(ins.amount),0) FROM eg_fn_firenocdetail fn INNER JOIN egcl_receiptheader_v1 rh ON fn.applicationnumber = rh.consumercode INNER JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id WHERE (rh.receiptdate/1000) <= (extract(epoch from NOW())) AND fn.tenantid != 'pb.testing' AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED')+(SELECT SUM(ins.amount) FROM egcl_receiptheader_v1 rh LEFT JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id $where AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED' AND rh.tenantid!='pb.testing' AND (rh.receiptdate/1000) <= (extract(epoch from NOW())) )) / 10000000, 3)) as revenueCollected,(SELECT (SELECT count(*) FROM eg_pt_property_v2 WHERE (createdtime/1000) <= (extract(epoch from NOW())) AND tenantid != 'pb.testing') + (SELECT count(*) FROM eg_tl_tradelicense WHERE (createdtime/1000) <= (extract(epoch from NOW())) AND tenantid != 'pb.testing')+ (SELECT count(*) FROM eg_fn_firenoc WHERE (createdtime/1000) <= (extract(epoch from NOW())) AND tenantid != 'pb.testing')) as servicesApplied, (SELECT count(*) FROM eg_user WHERE (createddate <= NOW()) AND tenantid != 'pb.testing' AND type = 'CITIZEN') as noOfUsersRegistered, 'Week0' as day) UNION (SELECT (SELECT count(*) FROM ((SELECT DISTINCT tenantid FROM eg_pt_property_v2 WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_tl_tradelicense WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_fn_firenoc WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing')) AS tenants) as ulbCovered,(SELECT TRUNC(((SELECT SUM(ins.amount) FROM eg_pt_property_v2 pt INNER JOIN egcl_receiptheader_v1 rh ON pt.propertyid = SPLIT_PART(rh.consumercode, ':', 1) INNER JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND pt.tenantid != 'pb.testing' AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED') + (SELECT SUM(ins.amount) FROM eg_tl_tradelicense tl INNER JOIN egcl_receiptheader_v1 rh ON tl.applicationnumber = rh.consumercode INNER JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tl.tenantid != 'pb.testing' AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED')+(SELECT COALESCE(SUM(ins.amount),0) FROM eg_fn_firenocdetail fn INNER JOIN egcl_receiptheader_v1 rh ON fn.applicationnumber = rh.consumercode INNER JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND fn.tenantid != 'pb.testing' AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED')+(SELECT SUM(ins.amount) FROM egcl_receiptheader_v1 rh LEFT JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id $where AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED' AND (rh.receiptdate/1000) <= ((extract(epoch from NOW()))-604800) AND rh.tenantid != 'pb.testing')) / 10000000, 3)) as revenueCollected,(SELECT (SELECT count(*) FROM eg_pt_property_v2 WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing') + (SELECT count(*) FROM eg_tl_tradelicense WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing')+(SELECT count(*) FROM eg_fn_firenocdetail WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing')) as servicesApplied, (SELECT count(*) FROM eg_user WHERE createddate <= to_timestamp((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing' AND type = 'CITIZEN') as noOfUsersRegistered, 'Week1' as day) UNION (SELECT (SELECT count(*) FROM ((SELECT DISTINCT tenantid FROM eg_pt_property_v2 WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_tl_tradelicense WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing')UNION (SELECT DISTINCT tenantid FROM eg_fn_firenocdetail WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing')) AS tenants) as ulbCovered,(SELECT TRUNC(((SELECT SUM(ins.amount) FROM eg_pt_property_v2 pt INNER JOIN egcl_receiptheader_v1 rh ON pt.propertyid = SPLIT_PART(rh.consumercode, ':', 1) INNER JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND pt.tenantid != 'pb.testing' AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED') + (SELECT SUM(ins.amount) FROM eg_tl_tradelicense tl INNER JOIN egcl_receiptheader_v1 rh ON tl.applicationnumber = rh.consumercode INNER JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tl.tenantid != 'pb.testing' AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED')+(SELECT COALESCE(SUM(ins.amount),0) FROM eg_fn_firenocdetail fn INNER JOIN egcl_receiptheader_v1 rh ON fn.applicationnumber = rh.consumercode INNER JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND fn.tenantid != 'pb.testing' AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED')+(SELECT SUM(ins.amount) FROM egcl_receiptheader_v1 rh LEFT JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id $where AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED' AND rh.tenantid!='pb.testing' AND (rh.receiptdate/1000) <= ((extract(epoch from NOW())) - 604800*2))) / 10000000, 3)) as revenueCollected,(SELECT (SELECT count(*) FROM eg_pt_property_v2 WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing') + (SELECT count(*) FROM eg_tl_tradelicense WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing')) as servicesApplied, (SELECT count(*) FROM eg_user WHERE createddate <= to_timestamp((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing' AND type = 'CITIZEN') as noOfUsersRegistered, 'Week2' as day) UNION (SELECT (SELECT count(*) FROM ((SELECT DISTINCT tenantid FROM eg_pt_property_v2 WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_tl_tradelicense WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing')) AS tenants) as ulbCovered,(SELECT TRUNC(((SELECT SUM(ins.amount) FROM eg_pt_property_v2 pt INNER JOIN egcl_receiptheader_v1 rh ON pt.propertyid = SPLIT_PART(rh.consumercode, ':', 1) INNER JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND pt.tenantid != 'pb.testing' AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED') + (SELECT SUM(ins.amount) FROM eg_tl_tradelicense tl INNER JOIN egcl_receiptheader_v1 rh ON tl.applicationnumber = rh.consumercode INNER JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tl.tenantid != 'pb.testing' AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED')+(SELECT COALESCE(SUM(ins.amount),0) FROM eg_fn_firenocdetail fn INNER JOIN egcl_receiptheader_v1 rh ON fn.applicationnumber = rh.consumercode INNER JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND fn.tenantid != 'pb.testing' AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED')+(SELECT SUM(ins.amount) FROM egcl_receiptheader_v1 rh LEFT JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id $where AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED' AND rh.tenantid!='pb.testing' AND (rh.receiptdate/1000) <= ((extract(epoch from NOW())) - 604800*3))) / 10000000, 3)) as revenueCollected,(SELECT (SELECT count(*) FROM eg_pt_property_v2 WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing') + (SELECT count(*) FROM eg_tl_tradelicense WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing')+(SELECT count(*) FROM eg_fn_firenocdetail WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing')) as servicesApplied, (SELECT count(*) FROM eg_user WHERE createddate <= to_timestamp((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing' AND type = 'CITIZEN') as noOfUsersRegistered, 'Week3' as day) UNION (SELECT (SELECT count(*) FROM ((SELECT DISTINCT tenantid FROM eg_pt_property_v2 WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_tl_tradelicense WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_fn_firenoc WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing')) AS tenants) as ulbCovered,(SELECT TRUNC(((SELECT SUM(ins.amount) FROM eg_pt_property_v2 pt INNER JOIN egcl_receiptheader_v1 rh ON pt.propertyid = SPLIT_PART(rh.consumercode, ':', 1) INNER JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND pt.tenantid != 'pb.testing' AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED') + (SELECT SUM(ins.amount) FROM eg_tl_tradelicense tl INNER JOIN egcl_receiptheader_v1 rh ON tl.applicationnumber = rh.consumercode INNER JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tl.tenantid != 'pb.testing' AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED')+(SELECT COALESCE(SUM(ins.amount),0) FROM eg_fn_firenocdetail fn INNER JOIN egcl_receiptheader_v1 rh ON fn.applicationnumber = rh.consumercode INNER JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND fn.tenantid != 'pb.testing' AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED')+(SELECT SUM(ins.amount) FROM egcl_receiptheader_v1 rh LEFT JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id $where AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED' AND rh.tenantid!='pb.testing' AND(rh.receiptdate/1000) <= ((extract(epoch from NOW())) - 604800*4))) / 10000000, 3)) as revenueCollected,(SELECT (SELECT count(*) FROM eg_pt_property_v2 WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing') + (SELECT count(*) FROM eg_tl_tradelicense WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing')+ (SELECT count(*) FROM eg_fn_firenocdetail WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing')) as servicesApplied, (SELECT count(*) FROM eg_user WHERE createddate <= to_timestamp((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing' AND type = 'CITIZEN') as noOfUsersRegistered, 'Week4' as day) UNION (SELECT (SELECT count(*) FROM ((SELECT DISTINCT tenantid FROM eg_pt_property_v2 WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_tl_tradelicense WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing')UNION (SELECT DISTINCT tenantid FROM eg_fn_firenocdetail WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing')) AS tenants) as ulbCovered,(SELECT TRUNC(((SELECT SUM(ins.amount) FROM eg_pt_property_v2 pt INNER JOIN egcl_receiptheader_v1 rh ON pt.propertyid = SPLIT_PART(rh.consumercode, ':', 1) INNER JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND pt.tenantid != 'pb.testing' AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED') + (SELECT SUM(ins.amount) FROM eg_tl_tradelicense tl INNER JOIN egcl_receiptheader_v1 rh ON tl.applicationnumber = rh.consumercode INNER JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tl.tenantid != 'pb.testing' AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED')+ (SELECT COALESCE(SUM(ins.amount),0) FROM eg_fn_firenocdetail fn INNER JOIN egcl_receiptheader_v1 rh ON fn.applicationnumber = rh.consumercode INNER JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND fn.tenantid != 'pb.testing' AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED')+(SELECT SUM(ins.amount) FROM egcl_receiptheader_v1 rh LEFT JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id $where AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED' AND rh.tenantid!='pb.testing' AND (rh.receiptdate/1000) <= ((extract(epoch from NOW())) - 604800*5))) / 10000000, 3)) as revenueCollected, (SELECT (SELECT count(*) FROM eg_pt_property_v2 WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing') + (SELECT count(*) FROM eg_tl_tradelicense WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing')+ (SELECT count(*) FROM eg_fn_firenocdetail WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing')) as servicesApplied, (SELECT count(*) FROM eg_user WHERE createddate <= to_timestamp((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing' AND type = 'CITIZEN') as noOfUsersRegistered, 'Week5' as day)) stateWideReports searchParams: condition: AND params: - - name: intervalinsecs - isMandatory: true - jsonPath: $.searchCriteria.intervalinsecs + - name: rh.businessdetails + isMandatory: false + operator: IN + jsonPath: $.searchCriteria.taxHeads + - name: rh.businessdetails + isMandatory: false + operator: NOT IN + jsonPath: $.searchCriteria.ignoreTaxHeads + output: jsonFormat: {"ResponseInfo": {}} @@ -73,7 +79,7 @@ - name: tlData query: - baseQuery: select array_to_json(array_agg(row_to_json(tlReports))) from (SELECT (SELECT count(DISTINCT tenantid) as ulbCovered FROM eg_tl_tradelicense WHERE (createdtime/1000) <= (extract (epoch from NOW())) AND tenantid != 'pb.testing' ), count(*) as licenseIssued, 'Week0' as day FROM eg_tl_tradelicense WHERE (createdtime/1000) <= (extract (epoch from NOW())) AND tenantid != 'pb.testing' AND status = 'APPROVED' UNION SELECT (SELECT count(DISTINCT tenantid) as ulbCovered FROM eg_tl_tradelicense WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing'), count(*) as licenseIssued, 'Week1' as day FROM eg_tl_tradelicense WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing' AND status = 'APPROVED' UNION SELECT (SELECT count(DISTINCT tenantid) as ulbCovered FROM eg_tl_tradelicense WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing'), count(*) as licenseIssued, 'Week2' as day FROM eg_tl_tradelicense WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing' AND status = 'APPROVED' UNION SELECT (SELECT count(DISTINCT tenantid) as ulbCovered FROM eg_tl_tradelicense WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing'), count(*) as licenseIssued, 'Week3' as day FROM eg_tl_tradelicense WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing' AND status = 'APPROVED' UNION SELECT (SELECT count(DISTINCT tenantid) as ulbCovered FROM eg_tl_tradelicense WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing'), count(*) as licenseIssued, 'Week4' as day FROM eg_tl_tradelicense WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing' AND status = 'APPROVED' UNION SELECT (SELECT count(DISTINCT tenantid) as ulbCovered FROM eg_tl_tradelicense WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing'), count(*) as licenseIssued, 'Week5' as day FROM eg_tl_tradelicense WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing' AND status = 'APPROVED') tlReports + baseQuery: select array_to_json(array_agg(row_to_json(tlReports))) from (SELECT count(DISTINCT tl.tenantid) as ulbCovered , count(*) as licenseIssued,TRUNC(SUM(ins.amount) / 10000000, 3) as revenuecollected, 'Week0' as day FROM eg_tl_tradelicense as tl INNER JOIN egcl_receiptheader_v1 rh ON tl.applicationnumber = rh.consumercode INNER JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id WHERE (rh.receiptdate/1000) <= (extract(epoch from NOW())) AND tl.tenantid != 'pb.testing' AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED' AND tl.status='APPROVED' UNION SELECT count(DISTINCT tl.tenantid) as ulbCovered , count(*) as licenseIssued, TRUNC(SUM(ins.amount) / 10000000, 3) as revenuecollected,'Week1' as day FROM eg_tl_tradelicense tl INNER JOIN egcl_receiptheader_v1 rh ON tl.applicationnumber = rh.consumercode INNER JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tl.tenantid != 'pb.testing' AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED' AND tl.status='APPROVED' UNION SELECT count(DISTINCT tl.tenantid) as ulbCovered , count(*) as licenseIssued,TRUNC(SUM(ins.amount) / 10000000, 3) as revenuecollected, 'Week2' as day FROM eg_tl_tradelicense tl INNER JOIN egcl_receiptheader_v1 rh ON tl.applicationnumber = rh.consumercode INNER JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800*2) AND tl.tenantid != 'pb.testing' AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED' UNION SELECT count(DISTINCT tl.tenantid) as ulbCovered , count(*) as licenseIssued,TRUNC(SUM(ins.amount) / 10000000, 3) as revenuecollected, 'Week3' as day FROM eg_tl_tradelicense tl INNER JOIN egcl_receiptheader_v1 rh ON tl.applicationnumber = rh.consumercode INNER JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800*3) AND tl.tenantid != 'pb.testing' AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED' AND tl.status='APPROVED' UNION SELECT count(DISTINCT tl.tenantid) as ulbCovered , count(*) as licenseIssued,TRUNC(SUM(ins.amount) / 10000000, 3) as revenuecollected, 'Week4' as day FROM eg_tl_tradelicense tl INNER JOIN egcl_receiptheader_v1 rh ON tl.applicationnumber = rh.consumercode INNER JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800*4) AND tl.tenantid != 'pb.testing' AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED' AND tl.status='APPROVED' UNION SELECT count(DISTINCT tl.tenantid) as ulbCovered , count(*) as licenseIssued,TRUNC(SUM(ins.amount) / 10000000, 3) as revenuecollected, 'Week5' as day FROM eg_tl_tradelicense tl INNER JOIN egcl_receiptheader_v1 rh ON tl.applicationnumber = rh.consumercode INNER JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800*5) AND tl.tenantid != 'pb.testing' AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED' AND tl.status='APPROVED') tlReports searchParams: condition: AND params: @@ -114,4 +120,19 @@ output: jsonFormat: {"ResponseInfo": {}} outJsonPath: $.data - responseInfoPath: $.ResponseInfo + responseInfoPath: $.ResponseInfo + + - name: firenocData + query: + baseQuery: select array_to_json(array_agg(row_to_json(firenocReports))) from (SELECT count(DISTINCT fn.tenantid) as ulbCovered , count(*) as certificatesIssued,COALESCE(TRUNC(SUM(ins.amount) / 10000000, 3),0) as revenuecollected, 'Week0' as day FROM eg_fn_firenocdetail as fn INNER JOIN egcl_receiptheader_v1 rh ON fn.applicationnumber = rh.consumercode INNER JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id WHERE (rh.receiptdate/1000) <= (extract(epoch from NOW())) AND fn.tenantid != 'pb.testing' AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED' AND fn.status='APPROVED' UNION SELECT count(DISTINCT fn.tenantid) as ulbCovered , count(*) as certficatesIssued, COALESCE(TRUNC(SUM(ins.amount) / 10000000, 3),0) as revenuecollected,'Week1' as day FROM eg_fn_firenocdetail fn INNER JOIN egcl_receiptheader_v1 rh ON fn.applicationnumber = rh.consumercode INNER JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND fn.tenantid != 'pb.testing' AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED' AND fn.status='APPROVED' UNION SELECT count(DISTINCT fn.tenantid) as ulbCovered , count(*) as certficatesIssued,COALESCE(TRUNC(SUM(ins.amount) / 10000000, 3),0) as revenuecollected, 'Week2' as day FROM eg_fn_firenocdetail fn INNER JOIN egcl_receiptheader_v1 rh ON fn.applicationnumber = rh.consumercode INNER JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800*2) AND fn.tenantid != 'pb.testing' AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED' UNION SELECT count(DISTINCT fn.tenantid) as ulbCovered , count(*) as certificatesIssued,COALESCE(TRUNC(SUM(ins.amount) / 10000000, 3),0) as revenuecollected, 'Week3' as day FROM eg_fn_firenocdetail fn INNER JOIN egcl_receiptheader_v1 rh ON fn.applicationnumber = rh.consumercode INNER JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800*3) AND fn.tenantid != 'pb.testing' AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED' AND fn.status='APPROVED' UNION SELECT count(DISTINCT fn.tenantid) as ulbCovered , count(*) as certficatesIssued,COALESCE(TRUNC(SUM(ins.amount) / 10000000, 3),0) as revenuecollected, 'Week4' as day FROM eg_fn_firenocdetail fn INNER JOIN egcl_receiptheader_v1 rh ON fn.applicationnumber = rh.consumercode INNER JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800*4) AND fn.tenantid != 'pb.testing' AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED' AND fn.status='APPROVED' UNION SELECT count(DISTINCT fn.tenantid) as ulbCovered , count(*) as certficatesIssued,COALESCE(TRUNC(SUM(ins.amount) / 10000000, 3),0) as revenuecollected, 'Week5' as day FROM eg_fn_firenocdetail fn INNER JOIN egcl_receiptheader_v1 rh ON fn.applicationnumber = rh.consumercode INNER JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800*5) AND fn.tenantid != 'pb.testing' AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED' AND fn.status='APPROVED') firenocReports + searchParams: + condition: AND + params: + - name: intervalinsecs + isMandatory: true + jsonPath: $.searchCriteria.intervalinsecs + + output: + jsonFormat: {"ResponseInfo": {}} + outJsonPath: $.data + responseInfoPath: $.ResponseInfo \ No newline at end of file From aee1102a61dd239ddbeb760e5ffb5e76d5276d93 Mon Sep 17 00:00:00 2001 From: narendrabandhamneni-wt-egov Date: Fri, 24 Jul 2020 15:05:26 +0530 Subject: [PATCH 0021/1242] added islegacy --- configs/egov-persister/firenoc_persiter.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/configs/egov-persister/firenoc_persiter.yaml b/configs/egov-persister/firenoc_persiter.yaml index bd811d9c..58a718b9 100644 --- a/configs/egov-persister/firenoc_persiter.yaml +++ b/configs/egov-persister/firenoc_persiter.yaml @@ -7,7 +7,7 @@ serviceMaps: isTransaction: true queryMaps: - - query: INSERT INTO eg_fn_firenoc(uuid, tenantid, firenocnumber, provisionfirenocnumber, oldfirenocnumber, dateofapplied, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + - query: INSERT INTO eg_fn_firenoc(uuid, tenantid, firenocnumber, provisionfirenocnumber, oldfirenocnumber, dateofapplied, createdby, lastmodifiedby, createdtime, lastmodifiedtime,islegacy) VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?); basePath: FireNOCs.* jsonMaps: - jsonPath: $.FireNOCs.*.id @@ -29,6 +29,8 @@ serviceMaps: - jsonPath: $.FireNOCs.*.auditDetails.createdTime - jsonPath: $.FireNOCs.*.auditDetails.lastModifiedTime + + - jsonPath: $.FireNOCs.*.islegacy - query: INSERT INTO eg_fn_firenocdetail(uuid, firenocuuid, applicationnumber, firenoctype, firestationid, applicationdate, financialyear, issueddate, validfrom, validto, action,channel, noofbuildings, tenantid, additionaldetail, createdby, lastmodifiedby, createdtime, lastmodifiedtime, propertyid,status) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?); From c9c210cd87735b4639d2ed64d11256de416c7d5d Mon Sep 17 00:00:00 2001 From: gurpreetsinghkhanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Sun, 26 Jul 2020 12:31:09 +0530 Subject: [PATCH 0022/1242] Digit v2 reports added --- configs/reports/configs/pgr-reports.yml | 909 ++++++++++++++++++++++++ configs/reports/configs/tl-reports.yml | 167 +++-- configs/reports/configs/uc-reports.yml | 240 ++++--- 3 files changed, 1112 insertions(+), 204 deletions(-) diff --git a/configs/reports/configs/pgr-reports.yml b/configs/reports/configs/pgr-reports.yml index 41b780da..e3b5159f 100644 --- a/configs/reports/configs/pgr-reports.yml +++ b/configs/reports/configs/pgr-reports.yml @@ -907,3 +907,912 @@ ReportDefinitions: eg_pgr_address.uuid = eg_pgr_service.addressid AND rating is not null AND feedback is not null orderby: ORDER BY servicerequestid, epa."when" desc + + +- reportName: SourceWiseReport_v2 + summary: Fetches reports based on the source of reception of the complaint + version: 1.0.0 + moduleName: rainmaker-pgr + sourceColumns: + - name: citizen_mobile_app + label: reports.rainmaker-pgr.citizen_mobile_app + type: number + source: eg_pgr_service + - name: citizen_web_app + label: reports.rainmaker-pgr.citizen_web_app + type: number + source: eg_pgr_service + - name: counter_desktop + label: reports.rainmaker-pgr.counter_desktop + type: number + source: eg_pgr_service + searchParams: + - name: tenantId + label: reports.rainmaker-pgr.tenantId + type: singlevaluelist + pattern: 'list://Wet:Wet,Dry:Dry' + source: eg_pgr_service + isMandatory: false + - name: fromDate + label: reports.rainmaker-pgr.datefrom + type: epoch + source: eg_pgr_service + isMandatory: false + - name: toDate + label: reports.rainmaker-pgr.dateto + type: epoch + source: eg_pgr_service + isMandatory: false + query: SELECT sum(case when source = 'mobileapp' then 1 else 0 end) as citizen_mobile_app, sum(case when source = 'web' then 1 else 0 end) as citizen_web_app, sum(case when source = 'ivr' then 1 else 0 end) as counter_desktop FROM eg_pgr_service WHERE tenantid = $tenantid + +- reportName: DescriptionReport_v2 + summary: Fetches department wise reports based description of the complaint + version: 1.0.0 + moduleName: rainmaker-pgr + externalService: + - entity: $.MdmsRes.RAINMAKER-PGR.ServiceDefs + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=RAINMAKER-PGR&masterName=ServiceDefs&tenantId=$tenantId + keyOrder: serviceCode,department,slaHours + tableName: tbl_dept + - entity: $.MdmsRes.common-masters.Department + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=common-masters&masterName=Department&tenantId=$tenantId + keyOrder: name,code + tableName: tbl_def_dept + - entity: $.TenantBoundary[0].boundary + apiURL: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search?hierarchyTypeCode=ADMIN&boundaryType=Locality&tenantId=$tenantId + keyOrder: name,code + tableName: tbl_boundary + sourceColumns: + - name: department + label: reports.rainmaker-pgr.department + type: string + source: eg_pgr_service + total: false + - name: servicecode + label: reports.rainmaker-pgr.servicecode + type: string + source: eg_pgr_service + total: false + - name: complaintNo + label: reports.rainmaker-pgr.complaintNo + type: string + source: eg_pgr_service + total: false + - name: date + label: reports.rainmaker-pgr.date + type: string + source: eg_pgr_service + total: false + - name: name + label: reports.rainmaker-pgr.name + type: string + source: eg_pgr_service + total: false + - name: phone + label: reports.rainmaker-pgr.phone + type: string + source: eg_pgr_service + total: false + - name: address + label: reports.rainmaker-pgr.address + type: string + source: eg_pgr_service + total: false + - name: locality + label: reports.rainmaker-pgr.locality + type: string + source: eg_pgr_service + total: false + - name: landmark + label: reports.rainmaker-pgr.landmark + type: string + source: eg_pgr_service + total: false + - name: description + label: reports.rainmaker-pgr.description + type: string + source: eg_pgr_service + total: false + - name: lastassignedto + label: reports.rainmaker-pgr.lastassignedto + type: string + source: eg_pgr_service + total: false + - name: status + label: reports.rainmaker-pgr.status + type: string + source: eg_pgr_service + total: false + - name: slahours + label: reports.rainmaker-pgr.slahours + type: string + source: eg_pgr_service + total: false + - name: actiondate + label: reports.rainmaker-pgr.actiondate + type: string + source: eg_pgr_service + total: false + searchParams: + - name: fromDate + label: reports.rainmaker-pgr.datefrom + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND eg_pgr_service.createdtime >= $fromDate + - name: toDate + label: reports.rainmaker-pgr.dateto + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND eg_pgr_service.createdtime <= $toDate + query: | + SELECT + DISTINCT ON (servicerequestid) + ua.name as lastassignedto, + (SELECT deptmap_def.name FROM (VALUES tbl_def_dept) AS deptmap_def(name,code) INNER JOIN (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) on deptmap.serviceCode = eg_pgr_service.servicecode and deptmap_def.code = deptmap.department) AS department, + regexp_replace(servicecode, '([a-z])([A-Z])', '\1 \2','g') AS servicecode, + (SELECT boundary_def.name FROM (VALUES tbl_boundary) AS boundary_def(name,code) where code=eg_pgr_address.mohalla) as locality, + servicerequestid AS complaintNo, + to_char(to_timestamp(TRUNC(CAST(eg_pgr_service.createdtime AS bigint) / 1000)), 'DD/MM/YYYY') AS date, + eg_user.name, + phone, + eg_pgr_address.landmark, + eg_pgr_address.housenoandstreetname as address, + description, + (SELECT (CASE WHEN (((SELECT deptmap.slaHours FROM (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) WHERE deptmap.serviceCode = eg_pgr_service.servicecode)::integer / 24) - (epa.when - eg_pgr_service.createdtime)::bigint/86400000) < 1 THEN CONCAT('Overdue by ', ((epa.when - eg_pgr_service.createdtime)::bigint/86400000) - ((SELECT deptmap.slaHours FROM (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) WHERE deptmap.serviceCode = eg_pgr_service.servicecode)::integer / 24), ' days') ELSE CONCAT(((SELECT deptmap.slaHours FROM (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) WHERE deptmap.serviceCode = eg_pgr_service.servicecode)::integer / 24) - (epa.when - eg_pgr_service.createdtime)::bigint/86400000, ' days remaining') END) as slaHours), + Initcap(eg_pgr_service.status) as status, + to_char((To_timestamp(epa.when/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS actiondate + FROM eg_pgr_service + left outer join eg_pgr_address on eg_pgr_address.uuid = eg_pgr_service.addressid + left outer join eg_user on eg_user.id = eg_pgr_service.accountid::int + left outer join eg_pgr_action as epa on epa.businesskey = eg_pgr_service.servicerequestid and epa.action in ('assign','reassign','resolve') + left outer join eg_user as ua on (ua.id = epa.assignee::int or ua.id = split_part(epa.by,':',1)::INTEGER) + WHERE + eg_pgr_service.tenantid LIKE $tenantid + AND eg_pgr_address.uuid = eg_pgr_service.addressid + AND eg_pgr_service.status IN ('open','assigned','reassigrequested','rejected','closed','resolved') + orderby: ORDER BY servicerequestid, epa."when" desc + +- reportName: StateSourceReport_v2 + summary: Source of complaints across tenants + version: 1.0.0 + moduleName: rainmaker-pgr + sourceColumns: + - name: tenantid + label: reports.rainmaker-pgr.tenantid + type: string + source: eg_pgr_service + total: false + - name: whatsapp + label: reports.rainmaker-pgr.source.whatsapp + type: string + source: eg_pgr_service + total: true + - name: ivr + label: reports.rainmaker-pgr.source.ivr + type: string + source: eg_pgr_service + total: true + - name: mobileapp + label: reports.rainmaker-pgr.source.mobileapp + type: string + source: eg_pgr_service + total: true + - name: web + label: reports.rainmaker-pgr.source.web + type: string + source: eg_pgr_service + total: true + - name: unknown + label: reports.rainmaker-pgr.source.unknown + type: string + source: eg_pgr_service + total: true + searchParams: + - name: fromDate + label: reports.rainmaker-pgr.datefrom + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND createdtime >= $fromDate + - name: toDate + label: reports.rainmaker-pgr.dateto + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND createdtime <= $toDate + query: | + select initcap(split_part(tenantid, '.', 2)) as tenantid, + SUM(CASE WHEN source ='whatsapp' THEN 1 ELSE 0 END) as whatsapp, + SUM(CASE WHEN source ='ivr' THEN 1 ELSE 0 END) as ivr, + SUM(CASE WHEN source ='mobileapp' THEN 1 ELSE 0 END) as mobileapp, + SUM(CASE WHEN source ='web' THEN 1 ELSE 0 END) as web, + SUM(CASE WHEN source NOT IN ('web', 'ivr', 'mobileapp','whatsapp') OR source is NULL THEN 1 ELSE 0 END) as unknown + from eg_pgr_service + WHERE tenantid != 'pb.testing' + groupby: GROUP BY tenantid + orderby: ORDER BY tenantid + +- reportName: EmployeeReport_v2 + summary: Fetches complaints for employees + version: 1.0.0 + moduleName: rainmaker-pgr + externalService: + - entity: $.MdmsRes.RAINMAKER-PGR.ServiceDefs + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=RAINMAKER-PGR&masterName=ServiceDefs&tenantId=$tenantId + keyOrder: serviceCode,department,slaHours + tableName: tbl_dept + - entity: $.TenantBoundary[0].boundary + apiURL: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search?hierarchyTypeCode=ADMIN&boundaryType=Locality&tenantId=$tenantId + keyOrder: name,code + tableName: tbl_boundary + sourceColumns: + - name: department + label: reports.rainmaker-pgr.department + type: string + source: eg_pgr_service + total: false + - name: servicecode + label: reports.rainmaker-pgr.servicecode + type: string + source: eg_pgr_service + total: false + - name: complaintNo + label: reports.rainmaker-pgr.complaintNo + type: string + source: eg_pgr_service + total: false + - name: date + label: reports.rainmaker-pgr.date + type: string + source: eg_pgr_service + total: false + - name: name + label: reports.rainmaker-pgr.name + type: string + source: eg_pgr_service + total: false + - name: phone + label: reports.rainmaker-pgr.phone + type: string + source: eg_pgr_service + total: false + - name: locality + label: reports.rainmaker-pgr.locality + type: string + source: eg_pgr_service + total: false + - name: address + label: reports.rainmaker-pgr.address + type: string + source: eg_pgr_service + total: false + - name: landmark + label: reports.rainmaker-pgr.landmark + type: string + source: eg_pgr_service + total: false + - name: description + label: reports.rainmaker-pgr.description + type: string + source: eg_pgr_service + total: false + - name: status + label: reports.rainmaker-pgr.status + type: string + source: eg_pgr_service + total: false + - name: slahours + label: reports.rainmaker-pgr.slahours + type: string + source: eg_pgr_service + total: false + searchParams: + - name: fromDate + label: reports.rainmaker-pgr.datefrom + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND eg_pgr_service.createdtime >= $fromDate + - name: toDate + label: reports.rainmaker-pgr.dateto + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND eg_pgr_service.createdtime <= $toDate + query: | + SELECT (SELECT deptmap.department FROM (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) WHERE deptmap.serviceCode = eg_pgr_service.servicecode) AS department, + regexp_replace(eg_pgr_service.servicecode, '([a-z])([A-Z])', '\1 \2','g') AS servicecode, + servicerequestid AS complaintNo, + to_char(to_timestamp(TRUNC(CAST(eg_pgr_service.createdtime AS bigint) / 1000)), 'DD/MM/YYYY') AS date, + (SELECT boundary_def.name FROM (VALUES tbl_boundary) AS boundary_def(name,code) where code=eg_pgr_address.mohalla) as locality, + eg_user.name, + phone, + eg_pgr_service.landmark, + housenoandstreetname as address, + description, + (SELECT (CASE WHEN (((SELECT deptmap.slaHours FROM (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) WHERE deptmap.serviceCode = eg_pgr_service.servicecode)::integer / 24) - ((((select extract(epoch from now())) * 1000) - eg_pgr_service.createdtime)::bigint/86400000)) < 1 THEN CONCAT('Overdue by ', ((((select extract(epoch from now())) * 1000) - eg_pgr_service.createdtime)::bigint/86400000) - ((SELECT deptmap.slaHours FROM (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) WHERE deptmap.serviceCode = eg_pgr_service.servicecode)::integer / 24), ' days') ELSE CONCAT(((SELECT deptmap.slaHours FROM (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) WHERE deptmap.serviceCode = eg_pgr_service.servicecode)::integer / 24) - ((((select extract(epoch from now())) * 1000) - eg_pgr_service.createdtime)::bigint/86400000), ' days remaining') END) as slaHours), + initcap(status) as status FROM eg_pgr_service + INNER JOIN eg_user ON eg_pgr_service.accountid = eg_user.id::VARCHAR + INNER JOIN eg_pgr_address ON eg_pgr_service.addressid = eg_pgr_address.uuid + WHERE eg_pgr_service.status = 'assigned' + AND servicerequestid IN (SELECT DISTINCT businesskey FROM eg_pgr_action WHERE status = 'assigned' AND "when" IN (select max("when") FROM eg_pgr_action WHERE assignee NOTNULL GROUP BY businesskey) AND assignee = $userid) + orderby: ORDER BY eg_pgr_service.createdtime asc + +- reportName: StateULBReport_v2 + summary: Fetches complaints stats for all ULBs in state + version: 1.0.0 + moduleName: rainmaker-pgr + sourceColumns: + - name: tenantid + label: reports.rainmaker-pgr.tenantid + type: string + source: eg_pgr_service + total: false + - name: open + label: reports.rainmaker-pgr.status.open + type: string + source: eg_pgr_service + total: true + - name: assigned + label: reports.rainmaker-pgr.status.assigned + type: string + source: eg_pgr_service + total: true + - name: closed + label: reports.rainmaker-pgr.status.closed + type: string + source: eg_pgr_service + total: true + - name: reassignrequested + label: reports.rainmaker-pgr.status.reassignrequested + type: string + source: eg_pgr_service + total: true + - name: rejected + label: reports.rainmaker-pgr.status.rejected + type: string + source: eg_pgr_service + total: true + - name: total + label: reports.rainmaker-pgr.total + type: string + source: eg_pgr_service + total: true + searchParams: + - name: fromDate + label: reports.rainmaker-pgr.datefrom + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND createdtime >= $fromDate + - name: toDate + label: reports.rainmaker-pgr.dateto + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND createdtime <= $toDate + query: | + select initcap(split_part(tenantid, '.', 2)) as tenantid, + SUM(CASE WHEN status ='open' THEN 1 ELSE 0 END) as open, + SUM(CASE WHEN status ='assigned' THEN 1 ELSE 0 END) as assigned, + SUM(CASE WHEN status in ('closed', 'resolved') THEN 1 ELSE 0 END) as closed, + SUM(CASE WHEN status ='reassignrequested' THEN 1 ELSE 0 END) as reassignrequested, + SUM(CASE WHEN status ='rejected' THEN 1 ELSE 0 END) as rejected, + COUNT(status) as total + from eg_pgr_service + WHERE tenantid != 'pb.testing' + groupby: GROUP BY tenantid + orderby: ORDER BY tenantid + +- reportName: ComplaintTypesReport_v2 + summary: Fetches complaint stats based on complaint types for a ULB + version: 1.0.0 + moduleName: rainmaker-pgr + sourceColumns: + - name: tenantid + label: reports.rainmaker-pgr.tenantid + type: string + source: eg_pgr_service + total: false + - name: complainttype + label: reports.rainmaker-pgr.complainttype + type: string + source: eg_pgr_service + total: false + - name: open + label: reports.rainmaker-pgr.status.open + type: string + source: eg_pgr_service + total: true + - name: assigned + label: reports.rainmaker-pgr.status.assigned + type: string + source: eg_pgr_service + total: true + - name: closed + label: reports.rainmaker-pgr.status.closed + type: string + source: eg_pgr_service + total: true + - name: reassignrequested + label: reports.rainmaker-pgr.status.reassignrequested + type: string + source: eg_pgr_service + total: true + - name: rejected + label: reports.rainmaker-pgr.status.rejected + type: string + source: eg_pgr_service + total: true + - name: total + label: reports.rainmaker-pgr.total + type: string + source: eg_pgr_service + total: true + searchParams: + - name: ulb + label: ULB + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: pt + wrapper: true + isMandatory: false + searchClause: AND tenantid = $ulb + - name: fromDate + label: reports.rainmaker-pgr.datefrom + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND createdtime >= $fromDate + - name: toDate + label: reports.rainmaker-pgr.dateto + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND createdtime <= $toDate + query: | + select + initcap(split_part(tenantid, '.', 2)) as tenantid, + regexp_replace(servicecode, '([a-z])([A-Z])', '\1 \2','g') as complainttype, + SUM(CASE WHEN status ='open' THEN 1 ELSE 0 END) as open, + SUM(CASE WHEN status ='assigned' THEN 1 ELSE 0 END) as assigned, + SUM(CASE WHEN status in ('closed', 'resolved') THEN 1 ELSE 0 END) as closed, + SUM(CASE WHEN status ='reassignrequested' THEN 1 ELSE 0 END) as reassignrequested, + SUM(CASE WHEN status ='rejected' THEN 1 ELSE 0 END) as rejected, + count(status) as total + from eg_pgr_service + WHERE tenantid != 'pb.testing' + groupby: GROUP BY tenantid,servicecode + orderby: ORDER BY tenantid,servicecode + +- reportName: DepartmentReport_v2 + summary: Fetches complaint stats based on complaint types for a ULB + version: 1.0.0 + moduleName: rainmaker-pgr + externalService: + - entity: $.MdmsRes.RAINMAKER-PGR.ServiceDefs + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=RAINMAKER-PGR&masterName=ServiceDefs&tenantId=$tenantId + keyOrder: serviceCode,department,slaHours + tableName: tbl_dept + - entity: $.MdmsRes.common-masters.Department + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=common-masters&masterName=Department&tenantId=$tenantId + keyOrder: name,code + tableName: tbl_def_dept + sourceColumns: + - name: tenantid + label: reports.rainmaker-pgr.tenantid + type: string + source: eg_pgr_service + total: false + - name: department + label: reports.rainmaker-pgr.department + type: string + source: eg_pgr_service + total: false + - name: open + label: reports.rainmaker-pgr.status.open + type: string + source: eg_pgr_service + total: true + - name: assigned + label: reports.rainmaker-pgr.status.assigned + type: string + source: eg_pgr_service + total: true + - name: closed + label: reports.rainmaker-pgr.status.closed + type: string + source: eg_pgr_service + total: true + - name: reassignrequested + label: reports.rainmaker-pgr.status.reassignrequested + type: string + source: eg_pgr_service + total: true + - name: rejected + label: reports.rainmaker-pgr.status.rejected + type: string + source: eg_pgr_service + total: true + searchParams: + - name: ulb + label: ULB + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: pt + wrapper: true + isMandatory: false + searchClause: AND tenantid = $ulb + - name: fromDate + label: reports.rainmaker-pgr.datefrom + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND createdtime >= $fromDate + - name: toDate + label: reports.rainmaker-pgr.dateto + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND createdtime <= $toDate + query: | + select + initcap(split_part(tenantid, '.', 2)) as tenantid, + deptmap_def.name as department, + SUM(CASE WHEN status ='open' THEN 1 ELSE 0 END) as open, + SUM(CASE WHEN status ='assigned' THEN 1 ELSE 0 END) as assigned, + SUM(CASE WHEN status in ('closed', 'resolved') THEN 1 ELSE 0 END) as closed, + SUM(CASE WHEN status ='reassignrequested' THEN 1 ELSE 0 END) as reassignrequested, + SUM(CASE WHEN status ='rejected' THEN 1 ELSE 0 END) as rejected, + count(status) as total + from eg_pgr_service + INNER JOIN (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) ON deptmap.serviceCode = eg_pgr_service.servicecode + INNER JOIN (VALUES tbl_def_dept) AS deptmap_def(name,code) ON deptmap.department = deptmap_def.code + WHERE tenantid != 'pb.testing' + groupby: GROUP BY tenantid,deptmap_def.name + orderby: ORDER BY tenantid,deptmap_def.name + +- reportName: ULBDepartmentReport_v2 + summary: Fetches complaint stats based on department types for a ULB + version: 1.0.0 + moduleName: rainmaker-pgr + externalService: + - entity: $.MdmsRes.RAINMAKER-PGR.ServiceDefs + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=RAINMAKER-PGR&masterName=ServiceDefs&tenantId=$tenantId + keyOrder: serviceCode,department,slaHours + tableName: tbl_dept + - entity: $.MdmsRes.common-masters.Department + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=common-masters&masterName=Department&tenantId=$tenantId + keyOrder: name,code + tableName: tbl_def_dept + sourceColumns: + - name: department + label: reports.rainmaker-pgr.department + type: string + source: eg_pgr_service + total: false + - name: rejected + label: reports.rainmaker-pgr.rejected + type: string + source: pgr_data + total: true + - name: resolved + label: reports.rainmaker-pgr.resolved + type: string + source: pgr_data + total: true + - name: resolvedoutsidesla + label: reports.rainmaker-pgr.resolvedoutsidesla + type: string + source: pgr_data + total: true + - name: open + label: reports.rainmaker-pgr.open + type: string + source: pgr_data + total: true + - name: assigned + label: reports.rainmaker-pgr.assigned + type: string + source: pgr_data + total: true + - name: outsidesla + label: reports.rainmaker-pgr.outsidesla + type: string + source: pgr_data + total: true + searchParams: + - name: fromDate + label: reports.rainmaker-pgr.datefrom + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND pgr_data.createdtime >= $fromDate + - name: toDate + label: reports.rainmaker-pgr.dateto + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND pgr_data.createdtime <= $toDate + query: | + with pgr_data as (select + servicerequestid, + servicecode, + createdtime, + status, + (select max("when") from eg_pgr_action where action='resolve' and businesskey = servicerequestid) as resolvedtime, + (select min("when") from eg_pgr_action where action='open' and businesskey = servicerequestid) as opentime + from eg_pgr_service as ps + where + tenantid = $tenantid) + + select + deptmap_def.name as department, + count(*) as total, + SUM (CASE WHEN status in ('rejected') THEN 1 ELSE 0 END) as rejected, + SUM (CASE WHEN status in ('closed', 'resolved') THEN 1 ELSE 0 END) as resolved, + SUM (CASE WHEN status in ('closed', 'resolved') and (resolvedtime - opentime) >= 14 * 86400 * 1000 THEN 1 ELSE 0 END) as resolvedoutsidesla, + SUM (CASE WHEN status in ('assigned', 'reassignrequested') THEN 1 ELSE 0 END) as assigned, + SUM (CASE WHEN status in ('open') THEN 1 ELSE 0 END) as open, + SUM (CASE WHEN status in ('assigned', 'reassignrequested', 'open') and (extract(epoch from now()) * 1000 - opentime) >= 14 * 86400 * 1000 THEN 1 ELSE 0 END) as outsidesla + from pgr_data + INNER JOIN (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) ON deptmap.serviceCode = pgr_data.servicecode + INNER JOIN (VALUES tbl_def_dept) AS deptmap_def(name,code) ON deptmap.department = deptmap_def.code + WHERE 1=1 + groupby: GROUP BY deptmap_def.name + orderby: ORDER BY deptmap_def.name + +- reportName: ULBEmployeeWiseReport_v2 + summary: Fetches employee wise assignment report + version: 1.0.0 + moduleName: rainmaker-pgr + sourceColumns: + - name: employee + label: reports.rainmaker-pgr.employee + type: string + source: pgr_data + total: false + - name: rejected + label: reports.rainmaker-pgr.rejected + type: string + source: pgr_data + total: true + - name: resolved + label: reports.rainmaker-pgr.resolved + type: string + source: pgr_data + total: true + - name: resolvedoutsidesla + label: reports.rainmaker-pgr.resolvedoutsidesla + type: string + source: pgr_data + total: true + - name: open + label: reports.rainmaker-pgr.open + type: string + source: pgr_data + total: true + - name: assigned + label: reports.rainmaker-pgr.assigned + type: string + source: pgr_data + total: true + - name: outsidesla + label: reports.rainmaker-pgr.outsidesla + type: string + source: pgr_data + total: true + searchParams: + - name: fromDate + label: reports.rainmaker-pgr.datefrom + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND pgr_data.createdtime >= $fromDate + - name: toDate + label: reports.rainmaker-pgr.dateto + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND pgr_data.createdtime <= $toDate + query: | + with pgr_data as (select + (select assignee from eg_pgr_action as pa where + pa.businesskey = ps.servicerequestid + and pa."action" in ('assign', 'reassign') + order by "when" desc + fetch first 1 rows only + ) as assignee, + servicerequestid, + createdtime, + status, + (select max("when") from eg_pgr_action where action='resolve' and businesskey = servicerequestid) as resolvedtime, + (select min("when") from eg_pgr_action where action='open' and businesskey = servicerequestid) as opentime + from eg_pgr_service as ps + where + tenantid = $tenantid) + + select + coalesce((select name from eg_user where id::varchar = assignee),'-- Unassigned --') as employee, + SUM (CASE WHEN status in ('rejected') THEN 1 ELSE 0 END) as rejected, + SUM (CASE WHEN status in ('closed', 'resolved') THEN 1 ELSE 0 END) as resolved, + SUM (CASE WHEN status in ('closed', 'resolved') and (resolvedtime - opentime) >= 14 * 86400 * 1000 THEN 1 ELSE 0 END) as resolvedoutsidesla, + SUM (CASE WHEN status in ('assigned', 'reassignrequested') THEN 1 ELSE 0 END) as assigned, + SUM (CASE WHEN status in ('open') THEN 1 ELSE 0 END) as open, + SUM (CASE WHEN status in ('assigned', 'reassignrequested', 'open') and (extract(epoch from now()) * 1000 - opentime) >= 14 * 86400 * 1000 THEN 1 ELSE 0 END) as outsidesla + from pgr_data + WHERE 1=1 + orderby: ORDER BY assignee NULLS FIRST + groupby: GROUP BY assignee + + +- reportName: UlbPgrSlaReport_v2 + summary: Fetches employee sla + version: 1.0.0 + moduleName: rainmaker-pgr + sourceColumns: + - name: tenantid + label: reports.rainmaker-pgr.tenantid + type: string + source: eg_pgr_service + total: false + - name: complainttype + label: reports.rainmaker-pgr.complainttype + type: string + source: eg_pgr_service + total: false + - name: total + label: reports.rainmaker-pgr.total + type: string + source: eg_pgr_service + total: true + - name: pendinginsla + label: reports.rainmaker-pgr.pendinginsla + type: string + source: eg_pgr_service + total: true + - name: pendingoutsidesla + label: reports.rainmaker-pgr.pendingoutsidesla + type: string + source: eg_pgr_service + total: true + - name: resolvedinsla + label: reports.rainmaker-pgr.resolvedinsla + type: string + source: eg_pgr_service + total: true + - name: resolvedoutsidesla + label: reports.rainmaker-pgr.resolvedoutsidesla + type: string + source: eg_pgr_service + total: true + searchParams: + - name: fromDate + label: reports.rainmaker-pgr.datefrom + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND pgr_data.createdtime >= $fromDate + - name: toDate + label: reports.rainmaker-pgr.dateto + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND pgr_data.createdtime <= $toDate + query: | + with pgr_data as (select + servicerequestid, + servicecode, + createdtime, + status, + (select max("when") from eg_pgr_action where action='resolve' and businesskey = servicerequestid) as resolvedtime, + (select min("when") from eg_pgr_action where action='open' and businesskey = servicerequestid) as opentime + from eg_pgr_service as ps) + select + initcap(split_part(tenantid, '.', 2)) as tenantid, + regexp_replace(eg_pgr_service.servicecode, '([a-z])([A-Z])', '\1 \2','g') as complainttype, + count(eg_pgr_service.status) as total, + SUM (CASE WHEN eg_pgr_service.status in ('assigned', 'reassignrequested', 'open') and (extract(epoch from now()) * 1000 - opentime) < 14 * 86400 * 1000 THEN 1 ELSE 0 END) as pendinginsla, + SUM (CASE WHEN eg_pgr_service.status in ('assigned', 'reassignrequested', 'open') and (extract(epoch from now()) * 1000 - opentime) >= 14 * 86400 * 1000 THEN 1 ELSE 0 END) as pendingoutsidesla, + SUM (CASE WHEN eg_pgr_service.status in ('closed', 'resolved') and (resolvedtime - opentime) < 14 * 86400 * 1000 THEN 1 ELSE 0 END) as resolvedinsla, + SUM (CASE WHEN eg_pgr_service.status in ('closed', 'resolved') and (resolvedtime - opentime) >= 14 * 86400 * 1000 THEN 1 ELSE 0 END) as resolvedoutsidesla + from eg_pgr_service,pgr_data + WHERE tenantid != 'pb.testing' and eg_pgr_service.servicerequestid=pgr_data.servicerequestid + groupby: GROUP BY tenantid,eg_pgr_service.servicecode + orderby: ORDER BY tenantid,eg_pgr_service.servicecode + +- reportName: FeedbackReport_v2 + summary: Fetches complaint state based on Feedback + version: 1.0.0 + moduleName: rainmaker-pgr + externalService: + - entity: $.MdmsRes.RAINMAKER-PGR.ServiceDefs + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=RAINMAKER-PGR&masterName=ServiceDefs&tenantId=$tenantId + keyOrder: serviceCode,department,slaHours + tableName: tbl_dept + - entity: $.MdmsRes.common-masters.Department + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=common-masters&masterName=Department&tenantId=$tenantId + keyOrder: name,code + tableName: tbl_def_dept + sourceColumns: + - name: department + label: reports.rainmaker-pgr.department + type: string + source: eg_pgr_service + total: false + - name: tenantid + label: reports.rainmaker-pgr.tenantid + type: string + source: eg_pgr_service + total: false + - name: citizenname + label: reports.rainmaker-pgr.citizenname + type: string + source: eg_pgr_service + total: false + - name: complainttype + label: reports.rainmaker-pgr.complainttype + type: string + source: eg_pgr_service + total: false + - name: complaintnumber + label: reports.rainmaker-pgr.complaintnumber + type: string + source: eg_pgr_service + total: false + - name: lastassignto + label: reports.rainmaker-pgr.lastassignto + type: string + source: eg_pgr_service + total: false + - name: rating + label: reports.rainmaker-pgr.rating + type: string + source: eg_pgr_service + total: false + - name: feedback + label: reports.rainmaker-pgr.feedback + type: string + source: eg_pgr_service + total: false + searchParams: + - name: ulb + label: ULB + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: pt + wrapper: true + isMandatory: false + searchClause: AND eg_pgr_service.tenantid = $ulb + - name: fromDate + label: reports.rainmaker-pgr.datefrom + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND createdtime >= $fromDate + - name: toDate + label: reports.rainmaker-pgr.dateto + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND createdtime <= $toDate + query: | + SELECT + DISTINCT ON (servicerequestid) + initcap(split_part(eg_pgr_service.tenantid, '.', 2)) as tenantid, + (SELECT deptmap_def.name FROM (VALUES tbl_def_dept) AS deptmap_def(name,code) INNER JOIN (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) on deptmap.serviceCode = eg_pgr_service.servicecode and deptmap_def.code = deptmap.department) AS department, + regexp_replace(servicecode, '([a-z])([A-Z])', '\1 \2','g') AS complainttype, + ua.name as lastassignto, + servicerequestid AS complaintnumber, + eg_user.name AS citizenname, + rating, feedback FROM eg_pgr_service + left outer join eg_pgr_address on eg_pgr_address.uuid = eg_pgr_service.addressid + left outer join eg_user on eg_user.id = eg_pgr_service.accountid::int + left outer join eg_pgr_action as epa on epa.businesskey = eg_pgr_service.servicerequestid and epa.action in ('assign','reassign') + left outer join eg_user as ua on ua.id = epa.assignee::int + WHERE + eg_pgr_address.uuid = eg_pgr_service.addressid + AND rating is not null AND feedback is not null + orderby: ORDER BY servicerequestid, epa."when" desc diff --git a/configs/reports/configs/tl-reports.yml b/configs/reports/configs/tl-reports.yml index 8960e563..af4cb95e 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -1339,21 +1339,20 @@ ReportDefinitions: to_char((To_timestamp(issueddate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as formattedIssuedDate, tl.tradeName, initcap(tl.status) as status, - to_char((To_timestamp(receipt.receiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as receiptIssueDate , - receipt.receiptnumber, + to_char((To_timestamp(egcl_paymentdetail.receiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as receiptIssueDate , + egcl_paymentdetail.receiptnumber, tradeTypeName, acc, tlown.name, tlown.mobilenumber, - ih.bankid, - ih.branchname, - ih.transactionnumber as transactionnumber, - ih.instrumenttype, - amount as totalamount, - To_char((To_timestamp(receipt.manualreceiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') AS g8issuedate, - receipt.manualreceiptnumber as g8receiptno, - (CASE WHEN collectiontype='COUNTER' THEN eg_user.name ELSE '' END) as collectorname - + payment.ifsccode as bankid, -- ih.bankid, + payment.ifsccode as branchname, --ih.branchname, + payment.transactionnumber as transactionnumber, -- ih.transactionnumber as transactionnumber, + payment.paymentmode as instrumenttype, -- ih.instrumenttype, + payment.totalamountpaid as totalamount, --amount as totalamount, + To_char((To_timestamp(egcl_paymentdetail.manualreceiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') AS g8issuedate, + egcl_paymentdetail.manualreceiptnumber as g8receiptno, + (CASE WHEN paymentmode!='ONLINE' THEN eg_user.name ELSE '' END) as collectorname FROM eg_tl_tradelicense tl INNER JOIN eg_tl_tradelicensedetail tld ON tld.tradelicenseid = tl.id INNER JOIN ( @@ -1365,14 +1364,14 @@ ReportDefinitions: INNER JOIN eg_user tluser ON tluser.uuid = tlowner.id group by tradelicensedetailid ) tlown ON tlown.tradelicensedetailid = tld.id - LEFT OUTER JOIN egcl_receiptheader_v1 receipt ON receipt.consumercode = tl.applicationnumber and receipt.status != 'Cancelled' - LEFT OUTER JOIN egcl_receiptinstrument_v1 as ri ON ri.receiptheader = receipt.id - LEFT OUTER JOIN egcl_instrumentheader_v1 as ih ON ih.id = ri.instrumentheader and ih.instrumentstatus != 'CANCELLED' + LEFT OUTER JOIN egcl_bill bill ON bill.consumercode = tl.applicationnumber + LEFT OUTER JOIN egcl_paymentdetail on bill.id=egcl_paymentdetail.billid + LEFT OUTER JOIN egcl_payment as payment ON payment.id = egcl_paymentdetail.paymentid LEFT OUTER JOIN ( SELECT tradelicensedetailid,array_to_string(array_agg(message.message),',') AS acc FROM eg_tl_accessory LEFT OUTER JOIN message ON code=CONCAT('TRADELICENSE_ACCESSORIESCATEGORY_', REGEXP_REPLACE(accessorycategory, '[^A-Za-z0-9]','_', 'g')) AND message.locale = 'en_IN' GROUP BY 1 ) tlacc ON tlacc.tradelicensedetailid = tld.id - Join eg_user ON eg_user.id = receipt.createdby::INTEGER - WHERE tl.tenantId = $tenantid + Join eg_user ON eg_user.id = egcl_paymentdetail.createdby::INTEGER + WHERE tl.tenantId = $tenantid - reportName: StateTradeLicenseCancelledRegistryReport_v2 @@ -1490,20 +1489,19 @@ ReportDefinitions: to_char((To_timestamp(issueddate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as formattedIssuedDate, tl.tradeName, initcap(tl.status) as status, - to_char((To_timestamp(receipt.receiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as receiptIssueDate , - receipt.receiptnumber, + to_char((To_timestamp(paydetail.receiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as receiptIssueDate , + paydetail.receiptnumber, tradeTypeName, acc, name, - mobilenumber, - ih.bankid, - ih.branchname, - ih.transactionnumber, - ih.instrumenttype, - amount as totalamount, - To_char((To_timestamp(receipt.manualreceiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') AS g8issuedate, - receipt.manualreceiptnumber as g8receiptno - + payment.mobilenumber, + payment.ifsccode as bankid, -- ih.bankid, + payment.ifsccode as branchname, --ih.branchname, + payment.transactionnumber as transactionnumber, -- ih.transactionnumber as transactionnumber, + payment.paymentmode as instrumenttype, -- ih.instrumenttype, + payment.totalamountpaid as totalamount, --amount as totalamount, + To_char((To_timestamp(paydetail.manualreceiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') AS g8issuedate, + paydetail.manualreceiptnumber as g8receiptno FROM eg_tl_tradelicense tl INNER JOIN eg_tl_tradelicensedetail tld ON tld.tradelicenseid = tl.id INNER JOIN ( @@ -1515,9 +1513,9 @@ ReportDefinitions: INNER JOIN eg_user tluser ON tluser.uuid = tlowner.id group by tradelicensedetailid ) tlown ON tlown.tradelicensedetailid = tld.id - INNER JOIN egcl_receiptheader_v1 receipt ON receipt.consumercode = tl.applicationnumber and receipt.status = 'Cancelled' - INNER JOIN egcl_receiptinstrument_v1 as ri ON ri.receiptheader = receipt.id - INNER JOIN egcl_instrumentheader_v1 as ih ON ih.id = ri.instrumentheader + INNER JOIN egcl_bill as bill ON bill.consumercode = tl.applicationnumber + INNER JOIN egcl_paymentdetail as paydetail on bill.id=paydetail.billid + INNER JOIN egcl_payment as payment on payment.id=paydetail.paymentid and payment.paymentstatus='CANCELLED' LEFT OUTER JOIN ( SELECT tradelicensedetailid,array_to_string(array_agg(message.message),',') AS acc FROM eg_tl_accessory LEFT OUTER JOIN message ON code=CONCAT('TRADELICENSE_ACCESSORIESCATEGORY_', REGEXP_REPLACE(accessorycategory, '[^A-Za-z0-9]','_', 'g')) AND message.locale = 'en_IN' GROUP BY 1 ) tlacc ON tlacc.tradelicensedetailid = tld.id @@ -1633,20 +1631,19 @@ ReportDefinitions: to_char((To_timestamp(issueddate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as formattedIssuedDate, tl.tradeName, initcap(tl.status) as status, - to_char((To_timestamp(receipt.receiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as receiptIssueDate , - receipt.receiptnumber, + to_char((To_timestamp(paydetail.receiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as receiptIssueDate , + paydetail.receiptnumber, tradeTypeName, acc, name, - mobilenumber, - ih.bankid, - ih.branchname, - ih.transactionnumber, - ih.instrumenttype, - amount as totalamount, - To_char((To_timestamp(receipt.manualreceiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') AS g8issuedate, - receipt.manualreceiptnumber as g8receiptno - + payment.mobilenumber, + payment.ifsccode as bankid, -- ih.bankid, + payment.ifsccode as branchname, --ih.branchname, + payment.transactionnumber as transactionnumber, -- ih.transactionnumber as transactionnumber, + payment.paymentmode as instrumenttype, -- ih.instrumenttype, + payment.totalamountpaid as totalamount, --amount as totalamount, + To_char((To_timestamp(paydetail.manualreceiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') AS g8issuedate, + paydetail.manualreceiptnumber as g8receiptno FROM eg_tl_tradelicense tl INNER JOIN eg_tl_tradelicensedetail tld ON tld.tradelicenseid = tl.id INNER JOIN ( @@ -1658,9 +1655,9 @@ ReportDefinitions: INNER JOIN eg_user tluser ON tluser.uuid = tlowner.id group by tradelicensedetailid ) tlown ON tlown.tradelicensedetailid = tld.id - INNER JOIN egcl_receiptheader_v1 receipt ON receipt.consumercode = tl.applicationnumber and receipt.status = 'Cancelled' - INNER JOIN egcl_receiptinstrument_v1 as ri ON ri.receiptheader = receipt.id - INNER JOIN egcl_instrumentheader_v1 as ih ON ih.id = ri.instrumentheader + INNER JOIN egcl_bill as bill ON bill.consumercode = tl.applicationnumber + INNER JOIN egcl_paymentdetail as paydetail on bill.id=paydetail.billid + INNER JOIN egcl_payment as payment on payment.id=paydetail.paymentid and payment.paymentstatus='CANCELLED' LEFT OUTER JOIN ( SELECT tradelicensedetailid,array_to_string(array_agg(message.message),',') AS acc FROM eg_tl_accessory LEFT OUTER JOIN message ON code=CONCAT('TRADELICENSE_ACCESSORIESCATEGORY_', REGEXP_REPLACE(accessorycategory, '[^A-Za-z0-9]','_', 'g')) AND message.locale = 'en_IN' GROUP BY 1 ) tlacc ON tlacc.tradelicensedetailid = tld.id @@ -1707,17 +1704,16 @@ ReportDefinitions: searchClause: AND rh.receiptdate <= $toDate query: | select - sum(ih.amount) as total, + sum(payment.totalamountpaid) as total, count(*) as transactionNumber, - sum(case collectiontype when 'COUNTER' then amount else 0 end) as offline, - sum(case collectiontype when 'ONLINE' then amount else 0 end) as online, - initcap(split_part(rh.tenantId, '.', 2)) as tenantId - from egcl_receiptheader_v1 as rh - inner join egcl_receiptinstrument_v1 as ri on ri.receiptheader = rh.id - inner join egcl_instrumentheader_v1 as ih on ih.id = ri.instrumentheader - where rh.businessdetails = 'TL' and rh.status !='Cancelled' and rh.tenantid !='pb.testing' - AND rh.tenantId LIKE $tenantid - groupby: GROUP BY rh.tenantId + sum(case when payment.paymentmode!='ONLINE' then totalamountpaid else 0 end) as offline, + sum(case when payment.paymentmode='ONLINE' then totalamountpaid else 0 end) as online, + initcap(split_part(payment.tenantId, '.', 2)) as tenantId + from egcl_payment as payment + inner join egcl_paymentdetail paydetail on paydetail.paymentid=payment.id + where paydetail.businessservice = 'TL' and payment.tenantid !='pb.testing' and payment.paymentstatus != 'CANCELLED' + AND payment.tenantId LIKE '$tenantid' + groupby: GROUP BY payment.tenantId - reportName: TradeLicenseApplicationStatusReport_v2 @@ -1971,17 +1967,16 @@ ReportDefinitions: searchClause: AND tl.tenantId = $ulb query: | select - sum(ih.amount) as total, + sum(payment.totalamountpaid) as total, count(*) as transactionNumber, - sum(case collectiontype when 'COUNTER' then amount else 0 end) as offline, - sum(case collectiontype when 'ONLINE' then amount else 0 end) as online, - initcap(split_part(rh.tenantId, '.', 2)) as tenantId - from egcl_receiptheader_v1 as rh - inner join egcl_receiptinstrument_v1 as ri on ri.receiptheader = rh.id - inner join egcl_instrumentheader_v1 as ih on ih.id = ri.instrumentheader - where rh.businessdetails = 'TL' and rh.status !='Cancelled' and rh.tenantid !='pb.testing' - groupby: GROUP BY rh.tenantId - orderby: ORDER BY rh.tenantId asc + sum(case when payment.paymentmode!='ONLINE' then payment.totalamountpaid else 0 end) as offline, + sum(case payment.paymentmode when 'ONLINE' then payment.totalamountpaid else 0 end) as online, + initcap(split_part(payment.tenantId, '.', 2)) as tenantId + from egcl_payment as payment + inner join egcl_paymentdetail as paydetail on paydetail.paymentid=payment.id + where paydetail.businessservice = 'TL' and payment.tenantid !='pb.testing' and payment.paymentstatus != 'CANCELLED' + groupby: GROUP BY payment.tenantId + orderby: ORDER BY payment.tenantId asc - reportName: StateLevelTradeLicenseRegistryReport_v2 @@ -2075,9 +2070,9 @@ ReportDefinitions: acc, name, mobilenumber, - amount as totalamount, - To_char((To_timestamp(receipt.manualreceiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') AS g8issuedate, - receipt.manualreceiptnumber as g8receiptno + paydetail.amountpaid as totalamount, + To_char((To_timestamp(paydetail.manualreceiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') AS g8issuedate, + paydetail.manualreceiptnumber as g8receiptno FROM eg_tl_tradelicense tl INNER JOIN eg_tl_tradelicensedetail tld ON tld.tradelicenseid = tl.id INNER JOIN eg_tl_owner tlowner ON tlowner.tradelicensedetailid = tld.id @@ -2085,9 +2080,8 @@ ReportDefinitions: SELECT tradelicensedetailid, array_to_string(array_agg(message.message),', ') as tradeTypeName FROM eg_tl_tradeunit LEFT OUTER JOIN message ON code = CONCAT('TRADELICENSE_TRADETYPE_', REGEXP_REPLACE(tradetype, '[^A-Za-z0-9]','_','g')) AND message.locale = 'en_IN' GROUP BY 1) tlunit ON tlunit.tradelicensedetailid = tld.id INNER JOIN eg_user tluser ON tluser.uuid = tlowner.id - LEFT OUTER JOIN egcl_receiptheader_v1 receipt ON receipt.consumercode = tl.applicationnumber - LEFT JOIN egcl_receiptinstrument_v1 as ri ON ri.receiptheader = receipt.id - LEFT JOIN egcl_instrumentheader_v1 as ih ON ih.id = ri.instrumentheader + LEFT OUTER JOIN egcl_bill as bill ON bill.consumercode = tl.applicationnumber + inner join egcl_paymentdetail as paydetail on paydetail.billid=bill.id LEFT OUTER JOIN ( SELECT tradelicensedetailid,array_to_string(array_agg(message.message),',') AS acc FROM eg_tl_accessory @@ -2271,39 +2265,40 @@ ReportDefinitions: searchClause: AND tla.locality IN ($localityArray) query: | SELECT - tl.applicationnumber, - propertyid, - financialyear, - (case when oldlicensenumber is null then 'New' else 'Renewal' end) AS licensetype, - - oldlicensenumber, + tl.applicationnumber as applicationnumber, + locality_tlb.locality as locality, + propertyid, + financialyear, + (case when oldlicensenumber is null then 'New' else 'Renewal' end) AS licensetype, + oldlicensenumber, licensenumber, to_char((To_timestamp(issueddate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as formattedIssuedDate, tl.tradeName, - tradeTypeName, - + tradeTypeName, acc, name, mobilenumber, - amount as totalamount + paydetail.amountpaid as totalamount, + tl.status as status FROM eg_tl_tradelicense tl INNER JOIN eg_tl_tradelicensedetail tld ON tld.tradelicenseid = tl.id - - INNER JOIN eg_tl_address as tla ON - tla.tradelicensedetailid=tld.id + INNER JOIN ( + select tradelicensedetailid, array_to_string(array_agg(message.message),', ') as locality from eg_tl_address as tla + LEFT OUTER JOIN message on code=CONCAT(UPPER(REGEXP_REPLACE( $tenantid , '[^A-Za-z0-9]','_', 'g')),'_REVENUE_', REGEXP_REPLACE( locality , '[^A-Za-z0-9]','_', 'g')) + AND message.locale = 'en_IN' group by 1) locality_tlb ON locality_tlb.tradelicensedetailid = tld.id INNER JOIN eg_tl_owner tlowner ON tlowner.tradelicensedetailid = tld.id INNER JOIN ( SELECT tradelicensedetailid, array_to_string(array_agg(message.message),', ') as tradeTypeName FROM eg_tl_tradeunit LEFT OUTER JOIN message ON code = CONCAT('TRADELICENSE_TRADETYPE_', REGEXP_REPLACE(tradetype, '[^A-Za-z0-9]','_','g')) AND message.locale = 'en_IN' GROUP BY 1) tlunit ON tlunit.tradelicensedetailid = tld.id INNER JOIN eg_user tluser ON tluser.uuid = tlowner.id - LEFT OUTER JOIN egcl_receiptheader_v1 receipt ON receipt.consumercode = tl.applicationnumber - LEFT JOIN egcl_receiptinstrument_v1 as ri ON ri.receiptheader = receipt.id - LEFT JOIN egcl_instrumentheader_v1 as ih ON ih.id = ri.instrumentheader + LEFT OUTER JOIN egcl_bill bill ON bill.consumercode = tl.applicationnumber + LEFT OUTER JOIN egcl_paymentdetail as paydetail on paydetail.billid=bill.id + INNER JOIN eg_tl_address ON eg_tl_address.tradelicensedetailid = tld.id LEFT OUTER JOIN ( SELECT tradelicensedetailid,array_to_string(array_agg(message.message),',') AS acc FROM eg_tl_accessory LEFT OUTER JOIN message ON code=CONCAT('TRADELICENSE_ACCESSORIESCATEGORY_', REGEXP_REPLACE(accessorycategory, '[^A-Za-z0-9]','_', 'g')) AND message.locale = 'en_IN' GROUP BY 1 ) tlacc ON tlacc.tradelicensedetailid = tld.id - WHERE tl.tenantid=$tenantid + WHERE tl.tenantid=$tenantid - reportName: StateDefaulterReport_v2 diff --git a/configs/reports/configs/uc-reports.yml b/configs/reports/configs/uc-reports.yml index 90db5717..93e676a1 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -943,37 +943,37 @@ ReportDefinitions: -- Use CTE to force query plan, compute & use CTE later WITH receipt_breakup AS ( SELECT - receiptheader, + egcl_billaccountdetail.billdetailid bill_id, SUM(CASE WHEN taxheadcode LIKE '%_CGST' THEN adjustedamount ELSE 0 END) as cgst, SUM(CASE WHEN taxheadcode LIKE '%_TAX' THEN adjustedamount ELSE 0 END) as tax, SUM(CASE WHEN taxheadcode LIKE '%_SGST' THEN adjustedamount ELSE 0 END) as sgst, SUM(CASE WHEN taxheadcode LIKE '%_FIELD_FEE' THEN adjustedamount ELSE 0 END) as fieldcollection - FROM egcl_receiptdetails_v1 as rd - INNER JOIN egcl_receiptheader_v1 as rh on rh.id = rd.receiptheader - WHERE rh.status != 'Cancelled' AND rh.tenantid!='pb.testing' AND businessdetails not in ('PT','TL','FIRENOC') - GROUP BY rd.receiptheader + FROM egcl_billaccountdetail + INNER JOIN egcl_bill as bill on bill.id = egcl_billaccountdetail.billdetailid + WHERE bill.tenantid!='pb.testing' AND businessservice not in ('PT','TL','FIRENOC') -- and rh.status != 'Cancelled' + GROUP BY billdetailid ) SELECT - rh.tenantid as ulb, - rh.receiptnumber as receiptnumber, - To_char((To_timestamp(rh.receiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as receiptdate, - To_char((To_timestamp(rh.manualreceiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as g8issuedate, - rh.manualreceiptnumber as g8receiptno, - rh.status as status, - businessdetails as servicecategory, + payment.tenantid as ulb, + paydetail.receiptnumber as receiptnumber, + To_char((To_timestamp(paydetail.receiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as receiptdate, + To_char((To_timestamp(paydetail.manualreceiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as g8issuedate, + paydetail.manualreceiptnumber as g8receiptno, + payment.paymentstatus as status, + businessservice as servicecategory, receipt_breakup.*, - amount as totalamount, - instrumenttype as paymentmode, - (case when instrumenttype like 'Cash' then '' else transactionnumber end) as ddorchequenumber, + payment.totalamountpaid as totalamount, + paymentmode as paymentmode, + (case when paymentmode like 'CASH' then '' else transactionnumber end) as ddorchequenumber, 'System' as collectiontype, eg_user.name as collectorname - FROM egcl_receiptheader_v1 AS rh - JOIN egcl_receiptinstrument_v1 AS ri ON rh.id = ri.receiptheader - JOIN egcl_instrumentheader_v1 AS ih ON ih.id = ri.instrumentheader - JOIN receipt_breakup ON rh.id = receipt_breakup.receiptheader - JOIN eg_user ON rh.createdby::INTEGER=eg_user.id - WHERE rh.status != 'Cancelled' AND rh.tenantid!='pb.testing' AND businessdetails not in ('PT','TL','FIRENOC') - orderby: ORDER BY rh.receiptdate DESC + FROM egcl_payment AS payment + JOIN egcl_paymentdetail as paydetail on paydetail.paymentid=payment.id + JOIN receipt_breakup ON paydetail.billid = receipt_breakup.bill_id + JOIN eg_user ON payment.createdby::INTEGER=eg_user.id + WHERE payment.tenantid!='pb.testing' AND businessservice not in ('PT','TL','FIRENOC') and payment.paymentstatus != 'CANCELLED' + orderby: ORDER BY paydetail.receiptdate DESC + - reportName: MiscReceiptULB_v2 summary: Receipt Register Miscellaneous @@ -1116,42 +1116,38 @@ ReportDefinitions: -- Use CTE to force query plan, compute & use CTE later WITH receipt_breakup AS ( SELECT - receiptheader, + egcl_billaccountdetail.billdetailid bill_id, SUM(CASE WHEN taxheadcode LIKE '%_CGST' THEN adjustedamount ELSE 0 END) as cgst, SUM(CASE WHEN taxheadcode LIKE '%_TAX' THEN adjustedamount ELSE 0 END) as tax, SUM(CASE WHEN taxheadcode LIKE '%_SGST' THEN adjustedamount ELSE 0 END) as sgst, SUM(CASE WHEN taxheadcode LIKE '%_FIELD_FEE' THEN adjustedamount ELSE 0 END) as fieldcollection - FROM egcl_receiptdetails_v1 as rd - INNER JOIN egcl_receiptheader_v1 as rh on rh.id = rd.receiptheader - where status!='Cancelled' and businessdetails not in ('PT','TL','FIRENOC') and rd.tenantid=$tenantid - GROUP BY rd.receiptheader + FROM egcl_billaccountdetail + INNER JOIN egcl_bill as bill on bill.id = egcl_billaccountdetail.billdetailid + WHERE bill.tenantid!='pb.testing' AND businessservice not in ('PT','TL','FIRENOC') + and bill.tenantid=$tenantid -- and rh.status != 'Cancelled' + GROUP BY billdetailid ) SELECT - rh.tenantid as ulb, - rh.receiptnumber as receiptnumber, - To_char((To_timestamp(rh.receiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as receiptdate, - To_char((To_timestamp(rh.manualreceiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as g8issuedate, - rh.manualreceiptnumber as g8receiptno, - rh.status as status, - businessdetails as servicecategory, + payment.tenantid as ulb, + paydetail.receiptnumber as receiptnumber, + To_char((To_timestamp(paydetail.receiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as receiptdate, + To_char((To_timestamp(paydetail.manualreceiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as g8issuedate, + paydetail.manualreceiptnumber as g8receiptno, + payment.paymentstatus as status, + businessservice as servicecategory, receipt_breakup.*, - amount as totalamount, - instrumenttype as paymentmode, - (case when instrumenttype like 'Cash' then '' else transactionnumber end) as ddorchequenumber, - (case when instrumenttype like 'DD' or instrumenttype like 'Cheque' then To_char((To_timestamp(ih.transactiondate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') else '' end) as ddchequedate, - ih.bankid as bankname, - ih.branchname as branchname, + payment.totalamountpaid as totalamount, + paymentmode as paymentmode, + (case when paymentmode like 'CASH' then '' else transactionnumber end) as ddorchequenumber, 'System' as collectiontype, - eg_user.name as collectorname, - rh.additionaldetails->>'comment' as comments - FROM egcl_receiptheader_v1 AS rh - JOIN egcl_receiptinstrument_v1 AS ri ON rh.id = ri.receiptheader - JOIN egcl_instrumentheader_v1 AS ih ON ih.id = ri.instrumentheader - JOIN receipt_breakup ON rh.id = receipt_breakup.receiptheader - JOIN eg_user ON rh.createdby::INTEGER=eg_user.id - WHERE rh.status != 'Cancelled' AND businessdetails not in ('PT','TL','FIRENOC') - and rh.tenantid=$tenantid - orderby: ORDER BY rh.receiptdate DESC + eg_user.name as collectorname + FROM egcl_payment AS payment + JOIN egcl_paymentdetail as paydetail on paydetail.paymentid=payment.id + JOIN receipt_breakup ON paydetail.billid = receipt_breakup.bill_id + JOIN eg_user ON payment.createdby::INTEGER=eg_user.id + WHERE payment.tenantid!='pb.testing' AND businessservice not in ('PT','TL','FIRENOC') and payment.tenantid=$tenantid and payment.paymentstatus != 'CANCELLED' + orderby: ORDER BY paydetail.receiptdate DESC + - reportName: MiscReceiptStateWide_v2 summary: State Receipt Register Miscellaneous @@ -1217,16 +1213,20 @@ ReportDefinitions: query: | -- Use CTE to force query plan, compute & use CTE later SELECT - rh.tenantid as ulb,rh.businessdetails as servicecategory, count(*) as receipts, + payment.tenantid as ulb, + paydetail.businessservice as servicecategory, + count(*) as receipts, SUM(CASE WHEN taxheadcode LIKE '%_FIELD_FEE' THEN adjustedamount ELSE 0 END) as fieldcollection, SUM(CASE WHEN taxheadcode LIKE '%_TAX' THEN adjustedamount ELSE 0 END) as tax, SUM(CASE WHEN taxheadcode LIKE '%_CGST' THEN adjustedamount ELSE 0 END) as cgst, SUM(CASE WHEN taxheadcode LIKE '%_SGST' THEN adjustedamount ELSE 0 END) as sgst, - sum(totalamount) as totalamount - from egcl_receiptheader_v1 rh, egcl_receiptdetails_v1 as rd - WHERE rh.id=rd.receiptheader and rh.status != 'Cancelled' AND rh.tenantid!='pb.testing' AND businessdetails not in ('PT','TL','FIRENOC') - groupby: group by rh.tenantid,rh.businessdetails - orderby: order by rh.tenantid + sum(paydetail.amountpaid) as totalamount + from egcl_payment payment + inner join egcl_paymentdetail as paydetail on paydetail.paymentid=payment.id + inner join egcl_billaccountdetail as ebd on paydetail.billid=ebd.billdetailid + WHERE payment.tenantid!='pb.testing' AND paydetail.businessservice not in ('PT','TL','FIRENOC') and payment.paymentstatus != 'CANCELLED' + groupby: group by payment.tenantid,paydetail.businessservice + orderby: order by payment.tenantid - reportName: MiscReceiptState_v2 summary: State Miscellaneous Receipt Register @@ -1292,16 +1292,18 @@ ReportDefinitions: query: | -- Use CTE to force query plan, compute & use CTE later SELECT - rh.tenantid as ulb, - count(distinct rh.id) as noofreceipts, - SUM(CASE WHEN taxheadcode LIKE '%_TAX' THEN adjustedamount ELSE 0 END) as tax, - SUM(CASE WHEN taxheadcode LIKE '%_CGST' THEN adjustedamount ELSE 0 END) as cgst, - SUM(CASE WHEN taxheadcode LIKE '%_SGST' THEN adjustedamount ELSE 0 END) as sgst, + paydetail.tenantid as ulb, + count(distinct paydetail.receiptnumber) as noofreceipts, + SUM(CASE WHEN taxheadcode LIKE '%_TAX' THEN adjustedamount ELSE 0 END) as tax, + SUM(CASE WHEN taxheadcode LIKE '%_CGST' THEN adjustedamount ELSE 0 END) as cgst, + SUM(CASE WHEN taxheadcode LIKE '%_SGST' THEN adjustedamount ELSE 0 END) as sgst, SUM(CASE WHEN taxheadcode LIKE '%_FIELD_FEE' THEN adjustedamount ELSE 0 END) as fieldcollection, - sum(amount) as totalamount - from egcl_receiptheader_v1 rh, egcl_receiptdetails_v1 as rd - WHERE rh.id=rd.receiptheader and rh.status != 'Cancelled' AND rh.tenantid!='pb.testing' AND businessdetails not in ('PT','TL','FIRENOC') - groupby: group by rh.tenantid + sum(adjustedamount) as totalamount + from egcl_paymentdetail paydetail + inner join egcl_billaccountdetail as ebd on paydetail.billid=ebd.billdetailid + inner join egcl_payment as payment on paydetail.paymentid=payment.id + WHERE paydetail.tenantid!='pb.testing' AND businessservice not in ('PT','TL','FIRENOC') and payment.paymentstatus!='CANCELLED' + groupby: group by paydetail.tenantid - reportName: MiscCollectionState_v2 summary: State Miscellaneous Collection Register @@ -1367,19 +1369,19 @@ ReportDefinitions: query: | -- Use CTE to force query plan, compute & use CTE later SELECT - initcap(split_part(rh.tenantId, '.', 2)) as ulb, - count(*) FILTER (where collectiontype='COUNTER') as offlinetransactions, - count(*) FILTER (where collectiontype='ONLINE') as onlinetransactions, + initcap(split_part(payment.tenantId, '.', 2)) as ulb, + count(*) FILTER (where payment.paymentmode!='ONLINE') as offlinetransactions, + count(*) FILTER (where payment.paymentmode='ONLINE') as onlinetransactions, count(*) as totaltransactions, - sum(case collectiontype when 'COUNTER' then ih.amount else 0 end) as offlinecollection, - sum(case collectiontype when 'ONLINE' then ih.amount else 0 end) as onlinecollection, - sum(ih.amount) as totalcollection - from egcl_receiptheader_v1 as rh - inner join egcl_receiptinstrument_v1 as ri on ri.receiptheader = rh.id - inner join egcl_instrumentheader_v1 as ih on ih.id = ri.instrumentheader - where rh.businessdetails not in ('PT','TL','FIRENOC') and rh.status !='Cancelled' and rh.tenantid !='pb.testing' - groupby: GROUP BY rh.tenantid - orderby: ORDER BY rh.tenantId asc + sum(case when paymentmode!='ONLINE' then payment.totalamountpaid else 0 end) as offlinecollection, + sum(case paymentmode when 'ONLINE' then payment.totalamountpaid else 0 end) as onlinecollection, + sum(payment.totalamountpaid) as totalcollection + from egcl_payment as payment + inner join egcl_paymentdetail as paydetail on paydetail.paymentid=payment.id + where paydetail.businessservice not in ('PT','TL','FIRENOC') and payment.tenantid !='pb.testing' and payment.paymentstatus != 'CANCELLED' + goupby: GROUP BY payment.tenantid + orderby: ORDER BY payment.tenantId asc + - reportName: MiscBusinessServiceCollectionTenant_v2 summary: Miscellaneous Business Service Collection @@ -1437,17 +1439,19 @@ ReportDefinitions: query: | -- Use CTE to force query plan, compute & use CTE later SELECT - rh.businessdetails as servicetype, - count(distinct rh.id) as totalreceipts, + paydetail.businessservice as servicetype, + count(distinct paydetail.receiptnumber) as totalreceipts, SUM(CASE WHEN taxheadcode LIKE '%_TAX' THEN adjustedamount ELSE 0 END) as tax, SUM(CASE WHEN taxheadcode LIKE '%_CGST' THEN adjustedamount ELSE 0 END) as cgst, SUM(CASE WHEN taxheadcode LIKE '%_SGST' THEN adjustedamount ELSE 0 END) as sgst, SUM(CASE WHEN taxheadcode LIKE '%_FIELD_FEE' THEN adjustedamount ELSE 0 END) as fieldcollection, - SUM(amount) as totalcollection - from egcl_receiptheader_v1 rh, egcl_receiptdetails_v1 as rd - WHERE rh.id=rd.receiptheader and rh.status != 'Cancelled' AND rh.tenantid=$tenantid AND businessdetails not in ('PT','TL','FIRENOC') - groupby: GROUP BY rh.businessdetails - orderby: ORDER BY rh.businessdetails + SUM(adjustedamount) as totalcollection + from egcl_payment payment, egcl_paymentdetail as paydetail + inner join egcl_billaccountdetail as billdetail on billdetail.billdetailid=paydetail.billid + WHERE payment.id=paydetail.paymentid AND payment.tenantid='pb.testing' AND paydetail.businessservice not in ('PT','TL','FIRENOC') and payment.paymentstatus != 'CANCELLED' + groupby: GROUP BY paydetail.businessservice + orderby: ORDER BY paydetail.businessservice + - reportName: MiscReceiptULBCancelled_v2 summary: Cancelled Receipt Miscellaneous @@ -1552,35 +1556,37 @@ ReportDefinitions: -- Use CTE to force query plan, compute & use CTE later WITH receipt_breakup AS ( SELECT - receiptheader, + egcl_billaccountdetail.billdetailid bill_id, SUM(CASE WHEN taxheadcode LIKE '%_CGST' THEN adjustedamount ELSE 0 END) as cgst, SUM(CASE WHEN taxheadcode LIKE '%_TAX' THEN adjustedamount ELSE 0 END) as tax, SUM(CASE WHEN taxheadcode LIKE '%_SGST' THEN adjustedamount ELSE 0 END) as sgst, SUM(CASE WHEN taxheadcode LIKE '%_FIELD_FEE' THEN adjustedamount ELSE 0 END) as fieldcollection - FROM egcl_receiptdetails_v1 as rd - INNER JOIN egcl_receiptheader_v1 as rh on rh.id = rd.receiptheader - WHERE rh.status = 'Cancelled' AND businessdetails not in ('PT','TL','FIRENOC') and rh.tenantid=$tenantid - GROUP BY rd.receiptheader + FROM egcl_billaccountdetail + INNER JOIN egcl_bill as bill on bill.id = egcl_billaccountdetail.billdetailid + WHERE bill.tenantid!='pb.testing' AND businessservice not in ('PT','TL','FIRENOC') and bill.tenantid=$tenantid -- and rh.status != 'Cancelled' + GROUP BY billdetailid ) SELECT - rh.tenantid as ulb, - rh.receiptnumber as receiptnumber, - To_char((To_timestamp(rh.receiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as receiptdate, - businessdetails as servicecategory, + payment.tenantid as ulb, + paydetail.receiptnumber as receiptnumber, + To_char((To_timestamp(paydetail.receiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as receiptdate, + To_char((To_timestamp(paydetail.manualreceiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as g8issuedate, + paydetail.manualreceiptnumber as g8receiptno, + payment.paymentstatus as status, + businessservice as servicecategory, receipt_breakup.*, - amount as totalamount, - instrumenttype as paymentmode, - (case when instrumenttype like 'Cash' then '' else transactionnumber end) as ddorchequenumber, - (case when instrumenttype like 'DD' or instrumenttype like 'Cheque' then To_char((To_timestamp(ih.transactiondate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') else '' end) as ddchequedate, + payment.totalamountpaid as totalamount, + paymentmode as paymentmode, + (case when paymentmode like 'CASH' then '' else transactionnumber end) as ddorchequenumber, + 'System' as collectiontype, eg_user.name as collectorname - FROM egcl_receiptheader_v1 AS rh - JOIN egcl_receiptinstrument_v1 AS ri ON rh.id = ri.receiptheader - JOIN egcl_instrumentheader_v1 AS ih ON ih.id = ri.instrumentheader - JOIN receipt_breakup ON rh.id = receipt_breakup.receiptheader - JOIN eg_user ON rh.createdby::INTEGER=eg_user.id - WHERE rh.status = 'Cancelled' AND businessdetails not in ('PT','TL','FIRENOC') - and rh.tenantid=$tenantid - orderby: ORDER BY rh.receiptdate DESC + FROM egcl_payment AS payment + JOIN egcl_paymentdetail as paydetail on paydetail.paymentid=payment.id + JOIN receipt_breakup ON paydetail.billid = receipt_breakup.bill_id + JOIN eg_user ON payment.createdby::INTEGER=eg_user.id + WHERE payment.tenantid!='pb.testing' AND businessservice not in ('PT','TL','FIRENOC') and payment.tenantid=$tenantid and payment.paymentstatus = 'CANCELLED' + orderby: ORDER BY paydetail.receiptdate DESC + - reportName: MiscReceiptULBShort_v2 summary: Receipt Register Miscellaneous @@ -1649,17 +1655,15 @@ ReportDefinitions: query: | -- Use CTE to force query plan, compute & use CTE later SELECT - rh.payername as consumername, - rh.payermobile as mobilenumber, - To_char((To_timestamp(rh.receiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as receiptdate, - businessdetails as servicecategory, - rh.totalamount as amount, + payment.payername as consumername, + payment.mobilenumber as mobilenumber, + To_char((To_timestamp(paydetail.receiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as receiptdate, + paydetail.businessservice as servicecategory, + payment.totalamountpaid as amount, eg_user.name as collectorname, - rh.additionaldetails->>'comment' as remarks - FROM egcl_receiptheader_v1 AS rh - JOIN egcl_receiptinstrument_v1 AS ri ON rh.id = ri.receiptheader - JOIN egcl_instrumentheader_v1 AS ih ON ih.id = ri.instrumentheader - JOIN eg_user ON rh.createdby::INTEGER=eg_user.id - WHERE rh.status != 'Cancelled' AND businessdetails not in ('PT','TL','FIRENOC') - and rh.tenantid=$tenantid - orderby: ORDER BY rh.receiptdate DESC \ No newline at end of file + payment.additionaldetails->>'comment' as remarks + FROM egcl_payment AS payment + inner join egcl_paymentdetail as paydetail on paydetail.paymentid=payment.id + JOIN eg_user ON payment.createdby::INTEGER=eg_user.id + WHERE paydetail.businessservice not in ('PT','TL','FIRENOC') and payment.paymentstatus != 'CANCELLED' and payment.tenantid='pb.testing' + orderby: ORDER BY paydetail.receiptdate DESC \ No newline at end of file From 3643550ff662663eb4213f23dbf463d88e5b1c96 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Sun, 26 Jul 2020 12:41:54 +0530 Subject: [PATCH 0023/1242] uml format corrected --- configs/reports/configs/uc-reports.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/configs/reports/configs/uc-reports.yml b/configs/reports/configs/uc-reports.yml index 93e676a1..7c10d5c3 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -972,7 +972,7 @@ ReportDefinitions: JOIN receipt_breakup ON paydetail.billid = receipt_breakup.bill_id JOIN eg_user ON payment.createdby::INTEGER=eg_user.id WHERE payment.tenantid!='pb.testing' AND businessservice not in ('PT','TL','FIRENOC') and payment.paymentstatus != 'CANCELLED' - orderby: ORDER BY paydetail.receiptdate DESC + orderby: ORDER BY paydetail.receiptdate DESC - reportName: MiscReceiptULB_v2 @@ -1299,10 +1299,10 @@ ReportDefinitions: SUM(CASE WHEN taxheadcode LIKE '%_SGST' THEN adjustedamount ELSE 0 END) as sgst, SUM(CASE WHEN taxheadcode LIKE '%_FIELD_FEE' THEN adjustedamount ELSE 0 END) as fieldcollection, sum(adjustedamount) as totalamount - from egcl_paymentdetail paydetail - inner join egcl_billaccountdetail as ebd on paydetail.billid=ebd.billdetailid - inner join egcl_payment as payment on paydetail.paymentid=payment.id - WHERE paydetail.tenantid!='pb.testing' AND businessservice not in ('PT','TL','FIRENOC') and payment.paymentstatus!='CANCELLED' + from egcl_paymentdetail paydetail + inner join egcl_billaccountdetail as ebd on paydetail.billid=ebd.billdetailid + inner join egcl_payment as payment on paydetail.paymentid=payment.id + WHERE paydetail.tenantid!='pb.testing' AND businessservice not in ('PT','TL','FIRENOC') and payment.paymentstatus!='CANCELLED' groupby: group by paydetail.tenantid - reportName: MiscCollectionState_v2 @@ -1666,4 +1666,4 @@ ReportDefinitions: inner join egcl_paymentdetail as paydetail on paydetail.paymentid=payment.id JOIN eg_user ON payment.createdby::INTEGER=eg_user.id WHERE paydetail.businessservice not in ('PT','TL','FIRENOC') and payment.paymentstatus != 'CANCELLED' and payment.tenantid='pb.testing' - orderby: ORDER BY paydetail.receiptdate DESC \ No newline at end of file + orderby: ORDER BY paydetail.receiptdate DESC From 6d31e3761ccba5b0e788505e63d3436c9ab8b5fe Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov Date: Mon, 27 Jul 2020 21:26:07 +0530 Subject: [PATCH 0024/1242] Added WS collection by channel pie chart --- .../MasterDashboardConfig.json | 66 +++++++++++++++++-- 1 file changed, 60 insertions(+), 6 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json index 9ceeb61f..a3e11fc1 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json @@ -3129,7 +3129,13 @@ "headers": [] } ] - }, + } + ] + }, + { + "row": 3, + "name": "DSS_REVENUE", + "vizArray": [ { "id": 223, "name": "DSS_W&S_COLLECTION_BY_USAGE", @@ -3150,11 +3156,32 @@ "headers": [] } ] + }, + { + "id": 224, + "name": "DSS_W&S_COLLECTION_BY_CHANNEL", + "dimensions": { + "height": 250, + "width": 4 + }, + "vizType": "chart", + "noUnit": true, + "isCollapsible": false, + "charts": [ + { + "id": "wscollectionByChannel", + "name": "DSS_W&S_COLLECTION_BY_CHANNEL", + "code": "", + "chartType": "donut", + "filter": "", + "headers": [] + } + ] } ] }, { - "row": 3, + "row": 4, "name": "DSS_REVENUE", "vizArray": [ { @@ -3182,7 +3209,7 @@ ] }, { - "row": 4, + "row": 5, "name": "DSS_REVENUE", "vizArray": [ { @@ -3511,7 +3538,13 @@ "headers": [] } ] - }, + } + ] + }, + { + "row": 3, + "name": "DSS_REVENUE", + "vizArray": [ { "id": 223, "name": "DSS_W&S_COLLECTION_BY_USAGE", @@ -3532,11 +3565,32 @@ "headers": [] } ] + }, + { + "id": 224, + "name": "DSS_W&S_COLLECTION_BY_CHANNEL", + "dimensions": { + "height": 250, + "width": 4 + }, + "vizType": "chart", + "noUnit": true, + "isCollapsible": false, + "charts": [ + { + "id": "wscollectionByChannel", + "name": "DSS_W&S_COLLECTION_BY_CHANNEL", + "code": "", + "chartType": "donut", + "filter": "", + "headers": [] + } + ] } ] }, { - "row": 3, + "row": 4, "name": "DSS_REVENUE", "vizArray": [ { @@ -3564,7 +3618,7 @@ ] }, { - "row": 4, + "row": 5, "name": "DSS_REVENUE", "vizArray": [ { From 3ae9b6eecc57167dcd7f2f1ec215eb3758f6ad43 Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov Date: Tue, 28 Jul 2020 12:37:35 +0530 Subject: [PATCH 0025/1242] Added changes related to dss-collection-v2 index --- .../CollectionDomainConfig.json | 2 +- .../TopicContextConfiguration.json | 2 +- .../transform_collection_v1.json | 170 +++++++++--------- .../dashboard-ingest/transform_tl_v1.json | 6 - 4 files changed, 88 insertions(+), 92 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-ingest/CollectionDomainConfig.json b/configs/egov-dss-dashboards/dashboard-ingest/CollectionDomainConfig.json index 5265a535..fb7aafe7 100644 --- a/configs/egov-dss-dashboards/dashboard-ingest/CollectionDomainConfig.json +++ b/configs/egov-dss-dashboards/dashboard-ingest/CollectionDomainConfig.json @@ -48,4 +48,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/configs/egov-dss-dashboards/dashboard-ingest/TopicContextConfiguration.json b/configs/egov-dss-dashboards/dashboard-ingest/TopicContextConfiguration.json index b7547375..1c974b96 100644 --- a/configs/egov-dss-dashboards/dashboard-ingest/TopicContextConfiguration.json +++ b/configs/egov-dss-dashboards/dashboard-ingest/TopicContextConfiguration.json @@ -1,7 +1,7 @@ { "topicContextConfigurations": [ { - "topic": "collectionsindex-v1-enriched", + "topic": "dss-collection-update", "dataContext": "collection", "dataContextVersion": "v1" }, diff --git a/configs/egov-dss-dashboards/dashboard-ingest/transform_collection_v1.json b/configs/egov-dss-dashboards/dashboard-ingest/transform_collection_v1.json index 3bed7dd5..cfd516bf 100644 --- a/configs/egov-dss-dashboards/dashboard-ingest/transform_collection_v1.json +++ b/configs/egov-dss-dashboards/dashboard-ingest/transform_collection_v1.json @@ -3,96 +3,98 @@ "operation": "shift", "spec": { "tenantId": "tenantId", - "transactionId": "transactionId", - "@timestamp": "@timestamp", - "Bill": { + "id": "id", + "paymentMode": "paymentMode", + "paymentStatus": "paymentStatus", + "transactionId": "transactionNumber", + "paidBy": "paidBy", + "payer": "payer", + "paymentDetails": { "$i": { - "billDetails": { - "$j": { - "voucherHeader": "Bill.billDetails.voucherHeader", - "boundary": "Bill.billDetails.boundary", - "collectedAmount": "Bill.billDetails.collectedAmount", - "channel": "Bill.billDetails.channel", - "manualReceiptDate": "Bill.billDetails.manualReceiptDate", - "expiryDate": "Bill.billDetails.expiryDate", - "demandId": "Bill.billDetails.demandId", - "amountPaid": "Bill.billDetails.amountPaid", - "consumerCode": "Bill.billDetails.consumerCode", - "id": "Bill.billDetails.id", - "department": "Bill.billDetails.department", - "receiptNumber": "Bill.billDetails.receiptNumber", - "businessService": "Bill.billDetails.businessService", - "receiptType": "Bill.billDetails.receiptType", - "fromPeriod": "Bill.billDetails.fromPeriod", - "stateId": "Bill.billDetails.stateId", - "receiptDate": "Bill.billDetails.receiptDate", - "bill": "Bill.billDetails.bill", - "billDate": "Bill.billDetails.billDate", - "consumerType": "Bill.billDetails.consumerType", - "totalAmount": "Bill.billDetails.totalAmount", - "collectionType": "Bill.billDetails.collectionType", - "fund": "Bill.billDetails.fund", - "manualReceiptNumber": "Bill.billDetails.manualReceiptNumber", - "tenantId": "Bill.billDetails.tenantId", - "toPeriod": "Bill.billDetails.toPeriod", - "partPaymentAllowed": "Bill.billDetails.partPaymentAllowed", - "billNumber": "Bill.billDetails.billNumber", - "status": "Bill.billDetails.status", - "billAccountDetails": { - "*": { - "taxHeadCode": "Bill.billDetails.billAccountDetails.[&1].taxHeadCode", - "glcode": "Bill.billDetails.billAccountDetails.[&1].glcode", - "amount": "Bill.billDetails.billAccountDetails.[&1].amount", - "billDetail": "Bill.billDetails.billAccountDetails.[&1].billDetail", - "purpose": "Bill.billDetails.billAccountDetails.[&1].purpose", - "adjustedAmount": "Bill.billDetails.billAccountDetails.[&1].adjustedAmount", - "tenantId": "Bill.billDetails.billAccountDetails.[&1].tenantId", - "id": "Bill.billDetails.billAccountDetails.[&1].id", - "demandDetailId": "Bill.billDetails.billAccountDetails.[&1].demandDetailId" + "businessService": "paymentDetails.businessService", + "receiptType": "paymentDetails.receiptType", + "totalDue": "paymentDetails.totalDue", + "receiptDate": "paymentDetails.receiptDate", + "bill": { + "billDetails": { + "$j": { + "boundary": "paymentDetails.bill.billDetails.boundary", + "amount": "paymentDetails.bill.billDetails.amount", + "fromPeriod": "paymentDetails.bill.billDetails.fromPeriod", + "voucherHeader": "paymentDetails.bill.billDetails.voucherHeader", + "channel": "paymentDetails.bill.billDetails.channel", + "additionalDetails": "paymentDetails.bill.billDetails.additionalDetails", + "cancellationRemarks": "paymentDetails.bill.billDetails.cancellationRemarks", + "manualReceiptDate": "paymentDetails.bill.billDetails.manualReceiptDate", + "expiryDate": "paymentDetails.bill.billDetails.expiryDate", + "collectionType": "paymentDetails.bill.billDetails.collectionType", + "displayMessage": "paymentDetails.bill.billDetails.displayMessage", + "demandId": "paymentDetails.bill.billDetails.demandId", + "amountPaid": "paymentDetails.bill.billDetails.amountPaid", + "manualReceiptNumber": "paymentDetails.bill.billDetails.manualReceiptNumber", + "billId": "paymentDetails.bill.billDetails.billId", + "auditDetails": "paymentDetails.bill.billDetails.auditDetails", + "tenantId": "paymentDetails.bill.billDetails.tenantId", + "toPeriod": "paymentDetails.bill.billDetails.toPeriod", + "billDescription": "paymentDetails.bill.billDetails.billDescription", + "id": "paymentDetails.bill.billDetails.id", + "callBackForApportioning": "paymentDetails.bill.billDetails.callBackForApportioning", + "billAccountDetails": { + "*": { + "amount": "paymentDetails.bill.billDetails.billAccountDetails.[&1].amount", + "taxHeadCode": "paymentDetails.bill.billDetails.billAccountDetails.[&1].taxHeadCode", + "purpose": "paymentDetails.bill.billDetails.billAccountDetails.[&1].purpose", + "adjustedAmount": "paymentDetails.bill.billDetails.billAccountDetails.[&1].adjustedAmount", + "auditDetails": "paymentDetails.bill.billDetails.billAccountDetails.[&1].auditDetails", + "tenantId": "paymentDetails.bill.billDetails.billAccountDetails.[&1].tenantId", + "id": "paymentDetails.bill.billDetails.billAccountDetails.[&1].id", + "billDetailId": "paymentDetails.bill.billDetails.billAccountDetails.[&1].billDetailId", + "additionalDetails": "paymentDetails.bill.billDetails.billAccountDetails.[&1].additionalDetails", + "demandDetailId": "paymentDetails.bill.billDetails.billAccountDetails.[&1].demandDetailId", + "order": "paymentDetails.bill.billDetails.billAccountDetails.[&1].order", + "isActualDemand": "paymentDetails.bill.billDetails.billAccountDetails.[&1].isActualDemand" + } } } - } + }, + "isAdvanceAllowed": "paymentDetails.bill.isAdvanceAllowed", + "businessService": "paymentDetails.bill.businessService", + "isCancelled": "paymentDetails.bill.isCancelled", + "collectionModesNotAllowed": "paymentDetails.bill.collectionModesNotAllowed", + "paidBy": "paymentDetails.bill.paidBy", + "mobileNumber": "paymentDetails.bill.mobileNumber", + "payerId": "paymentDetails.bill.payerId", + "reasonForCancellation": "paymentDetails.bill.reasonForCancellation", + "minimumAmountToBePaid": "paymentDetails.bill.minimumAmountToBePaid", + "billDate": "paymentDetails.bill.billDate", + "additionalDetails": "paymentDetails.bill.additionalDetails", + "totalAmount": "paymentDetails.bill.totalAmount", + "payerAddress": "paymentDetails.bill.payerAddress", + "auditDetails": "paymentDetails.bill.auditDetails", + "tenantId": "paymentDetails.bill.tenantId", + "payerName": "paymentDetails.bill.payerName", + "partPaymentAllowed": "paymentDetails.bill.partPaymentAllowed", + "consumerCode": "paymentDetails.bill.consumerCode", + "id": "paymentDetails.bill.id", + "billNumber": "paymentDetails.bill.billNumber", + "payerEmail": "paymentDetails.bill.payerEmail", + "status": "paymentDetails.bill.status" }, - "isCancelled": "Bill.isCancelled", - "paidBy": "Bill.paidBy", - "mobileNumber": "Bill.mobileNumber", - "payerId": "Bill.payerId", - "isActive": "Bill.isActive", - "additionalDetails": "Bill.additionalDetails", - "payerAddress": "Bill.payerAddress", - "taxAndPayments": "Bill.taxAndPayments", - "auditDetails": "Bill.auditDetails", - "tenantId": "Bill.tenantId", - "payerName": "Bill.payerName", - "id": "Bill.id", - "payerEmail": "Bill.payerEmail" + "totalAmountPaid": "paymentDetails.totalAmountPaid", + "additionalDetails": "paymentDetails.additionalDetails", + "manualReceiptDate": "paymentDetails.manualReceiptDate", + "manualReceiptNumber": "paymentDetails.manualReceiptNumber", + "billId": "paymentDetails.billId", + "auditDetails": "paymentDetails.auditDetails", + "tenantId": "paymentDetails.tenantId", + "id": "paymentDetails.id", + "receiptNumber": "paymentDetails.receiptNumber" } }, - "instrument": { - "bankAccount": "instrument.bankAccount", - "transactionDateInput": "instrument.transactionDateInput", - "amount": "instrument.amount", - "instrumentType": { - "instrumentTypeProperties": "instrument.typeProperties", - "name": "instrument.typeName", - "id": "instrument.typeId" - }, - "instrumentNumber": "instrument.number" - }, - "tenantData": { - "code": "tenantData.code", - "name": "tenantData.name", - "type": "tenantData.type", - "city": { - "name": "tenantData.cityName", - "localName": "tenantData.cityLocalName", - "districtCode": "tenantData.cityDistrictCode", - "districtName": "tenantData.cityDistrictName", - "regionName": "tenantData.cityRegionName", - "ulbGrade": "tenantData.cityUlbGrade", - "code": "tenantData.cityCode" - } - } + "auditDetails": "auditDetails", + "additionalDetails": "additionalDetails", + "tenantData": "tenantData", + "@timestamp": "@timestamp" } } ] diff --git a/configs/egov-dss-dashboards/dashboard-ingest/transform_tl_v1.json b/configs/egov-dss-dashboards/dashboard-ingest/transform_tl_v1.json index c426ffdf..a88f95d8 100644 --- a/configs/egov-dss-dashboards/dashboard-ingest/transform_tl_v1.json +++ b/configs/egov-dss-dashboards/dashboard-ingest/transform_tl_v1.json @@ -21,9 +21,3 @@ } } ] - - - - - - From 66ab5b72f66c2c3ce12173d769634cf7dba94691 Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov <61416590+mahammadnizam-wt-eGov@users.noreply.github.com> Date: Tue, 4 Aug 2020 14:52:17 +0530 Subject: [PATCH 0026/1242] Removed assessmentNumber filter from ptindex-v1 query --- configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json b/configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json index 9d871855..d5d7ebdb 100644 --- a/configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json +++ b/configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json @@ -5,7 +5,7 @@ "domain": "PT", "indexName": "ptindex-v1", "documentType": "", - "query": "{\"query\":{\"bool\":{\"must\":[{\"match_phrase\":{\"Data.propertyDetails.assessmentNumber\":\"value\"}},{\"match_phrase\":{\"Data.propertyId\":\"value\"}}]}}}", + "query": "{\"query\":{\"bool\":{\"must\":[{\"match_phrase\":{\"Data.propertyId\":\"value\"}}]}}}", "targetReferences": [ { "fieldName": "propertyId", From e7502ab76c35fd5efe42bc9cd6241ccab4882e61 Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov <61416590+mahammadnizam-wt-eGov@users.noreply.github.com> Date: Tue, 4 Aug 2020 18:24:38 +0530 Subject: [PATCH 0027/1242] Changed index name from ptindex-v1 to property-services --- configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json b/configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json index d5d7ebdb..fc9cfada 100644 --- a/configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json +++ b/configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json @@ -3,7 +3,7 @@ { "id": "1", "domain": "PT", - "indexName": "ptindex-v1", + "indexName": "property-services", "documentType": "", "query": "{\"query\":{\"bool\":{\"must\":[{\"match_phrase\":{\"Data.propertyId\":\"value\"}}]}}}", "targetReferences": [ From a7e76669dfbad17175198ac4f03e23e5e574cf72 Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov <61416590+mahammadnizam-wt-eGov@users.noreply.github.com> Date: Wed, 5 Aug 2020 13:53:25 +0530 Subject: [PATCH 0028/1242] Removed property service index and added property assessment index --- .../dashboard-ingest/DomainConfig.json | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json b/configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json index fc9cfada..44eecb3a 100644 --- a/configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json +++ b/configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json @@ -3,7 +3,7 @@ { "id": "1", "domain": "PT", - "indexName": "property-services", + "indexName": "property-assessments", "documentType": "", "query": "{\"query\":{\"bool\":{\"must\":[{\"match_phrase\":{\"Data.propertyId\":\"value\"}}]}}}", "targetReferences": [ @@ -14,14 +14,6 @@ "value": "$value", "seperator": " ", "expression": "propertyId" - }, - { - "fieldName": "assessmentNumber", - "argument": "Data.propertyDetails.assessmentNumber", - "dataType": "String", - "value": "$value", - "seperator": " ", - "expression": "assessmentNumber" } ], "sourceReferences": [ @@ -30,8 +22,8 @@ "argument": "Bill.billDetails.consumerCode", "dataType": "String", "value": "$value", - "seperator": ":", - "expression": "propertyId:assessmentNumber" + "seperator": " ", + "expression": "propertyId" } ] }, From ace57e56a4f5160fabf408e0ab4f3cbbab7641ed Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov <61416590+mahammadnizam-wt-eGov@users.noreply.github.com> Date: Wed, 5 Aug 2020 14:04:46 +0530 Subject: [PATCH 0029/1242] Updated consumer code argument path --- configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json b/configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json index 44eecb3a..107ef706 100644 --- a/configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json +++ b/configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json @@ -19,7 +19,7 @@ "sourceReferences": [ { "fieldName": "consumerCode", - "argument": "Bill.billDetails.consumerCode", + "argument": "paymentDetails.bill.consumerCode", "dataType": "String", "value": "$value", "seperator": " ", From 196d8efbb9bc811fac864ffffe70ce923099dda4 Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov <61416590+mahammadnizam-wt-eGov@users.noreply.github.com> Date: Wed, 5 Aug 2020 16:56:28 +0530 Subject: [PATCH 0030/1242] Updated index name with property services --- configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json b/configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json index 107ef706..cb5249b7 100644 --- a/configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json +++ b/configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json @@ -3,7 +3,7 @@ { "id": "1", "domain": "PT", - "indexName": "property-assessments", + "indexName": "property-services", "documentType": "", "query": "{\"query\":{\"bool\":{\"must\":[{\"match_phrase\":{\"Data.propertyId\":\"value\"}}]}}}", "targetReferences": [ From 65388b0cb3e0551d920c3a8c307c2347cbc6f0a1 Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov <61416590+mahammadnizam-wt-eGov@users.noreply.github.com> Date: Wed, 5 Aug 2020 21:18:32 +0530 Subject: [PATCH 0031/1242] Added units in transform_pt_v1.json --- .../egov-dss-dashboards/dashboard-ingest/transform_pt_v1.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-ingest/transform_pt_v1.json b/configs/egov-dss-dashboards/dashboard-ingest/transform_pt_v1.json index 1bc6766b..451034b7 100644 --- a/configs/egov-dss-dashboards/dashboard-ingest/transform_pt_v1.json +++ b/configs/egov-dss-dashboards/dashboard-ingest/transform_pt_v1.json @@ -5,7 +5,8 @@ "tenantId": "tenantId", "propertyId": "propertyId", "propertyDetails": "propertyDetails", - "ward" : "ward" + "ward" : "ward", + "units": "units" } } ] From f3dcfbb68142a51a81a596f481c9c2e25873ecd1 Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov Date: Fri, 7 Aug 2020 11:14:18 +0530 Subject: [PATCH 0032/1242] Added PT enhance configurations --- .../dashboard-ingest/EnhanceDomainConfig.json | 31 +++++++++++++++++++ .../transform_pt_enhance_v1.json | 12 +++++++ 2 files changed, 43 insertions(+) create mode 100644 configs/egov-dss-dashboards/dashboard-ingest/EnhanceDomainConfig.json create mode 100644 configs/egov-dss-dashboards/dashboard-ingest/transform_pt_enhance_v1.json diff --git a/configs/egov-dss-dashboards/dashboard-ingest/EnhanceDomainConfig.json b/configs/egov-dss-dashboards/dashboard-ingest/EnhanceDomainConfig.json new file mode 100644 index 00000000..d157119f --- /dev/null +++ b/configs/egov-dss-dashboards/dashboard-ingest/EnhanceDomainConfig.json @@ -0,0 +1,31 @@ +{ + "domainConfig": [ + { + "id": "1", + "domain": "PT", + "indexName": "property-assessments", + "documentType": "", + "query": "{\"query\":{\"bool\":{\"must\":[{\"match_phrase\":{\"Data.propertyId\":\"value\"}}]}}}", + "targetReferences": [ + { + "fieldName": "propertyId", + "argument": "Data.propertyId", + "dataType": "String", + "value": "$value", + "seperator": " ", + "expression": "propertyId" + } + ], + "sourceReferences": [ + { + "fieldName": "consumerCode", + "argument": "paymentDetails.bill.consumerCode", + "dataType": "String", + "value": "$value", + "seperator": ":", + "expression": "propertyId" + } + ] + } + ] +} diff --git a/configs/egov-dss-dashboards/dashboard-ingest/transform_pt_enhance_v1.json b/configs/egov-dss-dashboards/dashboard-ingest/transform_pt_enhance_v1.json new file mode 100644 index 00000000..722d01a3 --- /dev/null +++ b/configs/egov-dss-dashboards/dashboard-ingest/transform_pt_enhance_v1.json @@ -0,0 +1,12 @@ +[ + { + "operation": "shift", + "spec": { + "assessmentNumber": "assessmentNumber", + "assessmentDate": "assessmentDate", + "financialYear": "financialYear", + "status" : "status", + "propertyId": "propertyId" + } + } +] From 12ed38898fa18791fda17f88e84423d0f11662d4 Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov Date: Mon, 10 Aug 2020 14:47:26 +0530 Subject: [PATCH 0033/1242] Added transaction number --- .../dashboard-ingest/transform_collection_v1.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-ingest/transform_collection_v1.json b/configs/egov-dss-dashboards/dashboard-ingest/transform_collection_v1.json index cfd516bf..14d2f7f6 100644 --- a/configs/egov-dss-dashboards/dashboard-ingest/transform_collection_v1.json +++ b/configs/egov-dss-dashboards/dashboard-ingest/transform_collection_v1.json @@ -6,7 +6,7 @@ "id": "id", "paymentMode": "paymentMode", "paymentStatus": "paymentStatus", - "transactionId": "transactionNumber", + "transactionNumber": "transactionNumber", "paidBy": "paidBy", "payer": "payer", "paymentDetails": { From 4b14ca625d0eae9d1af57c247eb58a8f371b8db5 Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov Date: Mon, 10 Aug 2020 23:36:17 +0530 Subject: [PATCH 0034/1242] Updated dss-collection_v2 index queries --- .../dashboard-analytics/ChartApiConfig.json | 194 +++++++++--------- 1 file changed, 97 insertions(+), 97 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 191a0793..ee1aeb38 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -6,17 +6,17 @@ "queries": [ { "module": "PT", - "dateRefField": "dataObject.Bill.billDetails.receiptDate", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.Bill.billDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.cityDistrictCode\"}", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\"}", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.Bill.billDetails.status.keyword\":[\"Cancelled\"]}}],\"must\":[{\"term\":{\"dataObject.Bill.billDetails.businessService.keyword\":\"PT\"}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.amountPaid\"}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}],\"must\":[{\"term\":{\"dataObject.paymentDetails.businessService.keyword\":\"PT\"}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" }, { "module": "TL", - "dateRefField": "dataObject.Bill.billDetails.receiptDate", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.Bill.billDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.cityDistrictCode\"}", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\"}", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.Bill.billDetails.status.keyword\":[\"Cancelled\"]}}],\"must\":[{\"term\":{\"dataObject.Bill.billDetails.businessService.keyword\":\"TL\"}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.amountPaid\"}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}],\"must\":[{\"term\":{\"dataObject.paymentDetails.businessService.keyword\":\"TL\"}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" } ], "chartType": "metric", @@ -43,10 +43,10 @@ "queries": [ { "module": "COMMON", - "dateRefField": "dataObject.Bill.billDetails.receiptDate", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\r\n \"module\" : \"dataObject.Bill.billDetails.businessService.keyword\", \n\"tenantId\" : \"dataObject.tenantId\"}", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\r\n \"module\" : \"dataObject.paymentDetails.businessService.keyword\", \n\"tenantId\" : \"dataObject.tenantId\"}", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.Bill.billDetails.status.keyword\":[\"Cancelled\"]}}],\"must\":[{\"terms\":{\"dataObject.Bill.billDetails.businessService.keyword\":[\"PT\",\"TL\"]}}]}},\"aggs\":{\"Collections\":{\"date_histogram\":{\"field\":\"dataObject.Bill.billDetails.receiptDate\",\"interval\":\"intervalvalue\"},\"aggs\":{\"Sum\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.amountPaid\"}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}],\"must\":[{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\"]}}]}},\"aggs\":{\"Collections\":{\"date_histogram\":{\"field\":\"dataObject.paymentDetails.receiptDate\",\"interval\":\"intervalvalue\"},\"aggs\":{\"Sum\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" } ], "chartType": "line", @@ -75,10 +75,10 @@ }, { "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\r\n \"district\" : \"dataObject.tenantData.cityDistrictCode\", \"module\" : \"dataObject.Bill.billDetails.businessService.keyword\", \n\"tenantId\" : \"dataObject.tenantId\"}", - "dateRefField": "dataObject.Bill.billDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\r\n \"district\" : \"dataObject.tenantData.city.districtCode\", \"module\" : \"dataObject.paymentDetails.businessService.keyword\", \n\"tenantId\" : \"dataObject.tenantId\"}", + "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.Bill.billDetails.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.amountPaid\"}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" } ], @@ -107,17 +107,17 @@ "queries": [ { "module": "PT", - "dateRefField": "dataObject.Bill.billDetails.receiptDate", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.Bill.billDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.cityDistrictCode\"}", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\"}", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.Bill.billDetails.status.keyword\":[\"Cancelled\"]}}],\"must\":[{\"term\":{\"dataObject.Bill.billDetails.businessService.keyword\":\"PT\"}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.amountPaid\"}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}],\"must\":[{\"term\":{\"dataObject.paymentDetails.businessService.keyword\":\"PT\"}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" }, { "module": "TL", - "dateRefField": "dataObject.Bill.billDetails.receiptDate", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.Bill.billDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.cityDistrictCode\"}", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\"}", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.Bill.billDetails.status.keyword\":[\"Cancelled\"]}}],\"must\":[{\"term\":{\"dataObject.Bill.billDetails.businessService.keyword\":\"TL\"}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.amountPaid\"}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}],\"must\":[{\"term\":{\"dataObject.paymentDetails.businessService.keyword\":\"TL\"}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" } ], "chartType": "metric", @@ -137,10 +137,10 @@ "queries": [ { "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.Bill.billDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.cityDistrictCode\"}", - "dateRefField": "dataObject.Bill.billDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\"}", + "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.Bill.billDetails.status.keyword\":[\"Cancelled\"]}}],\"must\":[{\"terms\":{\"dataObject.Bill.billDetails.businessService.keyword\":[\"PT\",\"TL\"]}}]}},\"aggs\":{\"Business Service\":{\"terms\":{\"field\":\"dataObject.Bill.billDetails.businessService.keyword\"},\"aggs\":{\"total\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.amountPaid\"}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}],\"must\":[{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\"]}}]}},\"aggs\":{\"Business Service\":{\"terms\":{\"field\":\"dataObject.paymentDetails.businessService.keyword\"},\"aggs\":{\"total\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" } ], "chartType": "pie", @@ -167,10 +167,10 @@ }, { "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\r\n \"module\" : \"dataObject.Bill.billDetails.businessService.keyword\", \n\"tenantId\" : \"dataObject.tenantId\"}", - "dateRefField": "dataObject.Bill.billDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\r\n \"module\" : \"dataObject.paymentDetails.businessService.keyword\", \n\"tenantId\" : \"dataObject.tenantId\"}", + "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.Bill.billDetails.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Total Collection\":{\"terms\":{\"field\":\"dataObject.tenantId.keyword\",\"size\":\"200\",\"order\":{\"Sum\":\"desc\"}},\"aggs\":{\"Sum\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.amountPaid\"}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Total Collection\":{\"terms\":{\"field\":\"dataObject.tenantId.keyword\",\"size\":\"200\",\"order\":{\"Sum\":\"desc\"}},\"aggs\":{\"Sum\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" } ], "chartType": "perform", @@ -200,10 +200,10 @@ }, { "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.Bill.billDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\" }", - "dateRefField": "dataObject.Bill.billDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\" }", + "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.Bill.billDetails.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Total Collection\":{\"terms\":{\"field\":\"dataObject.tenantId.keyword\",\"size\":\"200\",\"order\":{\"Sum\":\"asc\"}},\"aggs\":{\"Sum\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.amountPaid\"}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Total Collection\":{\"terms\":{\"field\":\"dataObject.tenantId.keyword\",\"size\":\"200\",\"order\":{\"Sum\":\"asc\"}},\"aggs\":{\"Sum\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" } ], "chartType": "perform", @@ -226,10 +226,10 @@ "queries": [ { "module": "COMMON", - "requestQueryMap": "{\"module\" : \"dataObject.Bill.billDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantData.code\", \"district\" : \"dataObject.tenantData.cityDistrictCode\"}", - "dateRefField": "dataObject.Bill.billDetails.receiptDate", + "requestQueryMap": "{\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantData.code\", \"district\" : \"dataObject.tenantData.city.districtCode\"}", + "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.Bill.billDetails.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"License Instrument Type\":{\"terms\":{\"field\":\"dataObject.instrument.typeName.keyword\"},\"aggs\":{\"Licens Issued\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.amountPaid\"}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"License Instrument Type\":{\"terms\":{\"field\":\"dataObject.instrument.typeName.keyword\"},\"aggs\":{\"Licens Issued\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" } ], "chartType": "pie", @@ -559,10 +559,10 @@ "queries": [ { "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.Bill.billDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.cityDistrictCode\" }", - "dateRefField": "dataObject.Bill.billDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", + "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.Bill.billDetails.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"attrs_root\":{\"nested\":{\"path\":\"domainObject.propertyDetails.units\"},\"aggs\":{\"Usage Type\":{\"terms\":{\"field\":\"domainObject.propertyDetails.units.usageCategoryMajor.keyword\",\"size\":200}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"attrs_root\":{\"nested\":{\"path\":\"domainObject.units\"},\"aggs\":{\"Usage Type\":{\"terms\":{\"field\":\"domainObject.units.usageCategory.keyword\",\"size\":200}}}}}}}}" } ], "chartType": "pie", @@ -584,7 +584,7 @@ "queries": [ { "module": "PT", - "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\",\"module\" : \"Data.Bill.billDetails.businessService.keyword\", \"tenantId\" : \"Data.tenantId\", \"district\" : \"dataObject.tenantData.cityDistrictCode\"}", + "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\",\"module\" : \"Data.Bill.billDetails.businessService.keyword\", \"tenantId\" : \"Data.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\"}", "dateRefField": "Data.@timestamp", "indexName": "ptindex-v1", "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Usage Type\":{\"terms\":{\"field\":\"Data.propertyDetails.units.usageCategoryMajor.keyword\"},\"aggs\":{\"Assessed Properties\":{\"value_count\":{\"field\":\"Data.propertyDetails.assessmentNumber.keyword\"}}}}}}}}" @@ -735,10 +735,10 @@ "queries": [ { "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.Bill.billDetails.businessService.keyword\", \"usageId\" : \"domainObject.propertyDetails.usageCategoryMajor.keyword\",\"minorUsageId\" : \"domainObject.propertyDetails.usageCategoryMinor.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.cityDistrictCode\" }", - "dateRefField": "dataObject.Bill.billDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"usageId\" : \"domainObject.units.usageCategory.keyword\",\"minorUsageId\" : \"domainObject.units.usageCategory.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", + "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.Bill.billDetails.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.amountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.transactionId.keyword\"}},\"Assessed Properties\":{\"nested\":{\"path\":\"domainObject.propertyDetails\"},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"domainObject.propertyDetails.assessmentNumber.keyword\"}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.paymentDetails.billId.keyword\"}},\"Assessed Properties\":{\"nested\":{\"path\":\"domainObject.assessmentsDetails\"},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"domainObject.assessmentsDetails.assessmentNumber.keyword\"}}}}}}}}" }, { "module": "COMMON", @@ -788,10 +788,10 @@ "queries": [ { "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.Bill.billDetails.businessService.keyword\", \"usageId\" : \"domainObject.propertyDetails.usageCategoryMajor.keyword\",\"minorUsageId\" : \"domainObject.propertyDetails.usageCategoryMinor.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.cityDistrictCode\" }", - "dateRefField": "dataObject.Bill.billDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"usageId\" : \"domainObject.units.usageCategory.keyword\",\"minorUsageId\" : \"domainObject.units.usageCategory.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", + "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.Bill.billDetails.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"ULBs \":{\"terms\":{\"field\":\"domainObject.tenantId.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.amountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.transactionId.keyword\"}},\"Assessed Properties\":{\"nested\":{\"path\":\"domainObject.propertyDetails\"},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"domainObject.propertyDetails.assessmentNumber.keyword\"}}}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"ULBs \":{\"terms\":{\"field\":\"domainObject.tenantId.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.paymentDetails.billId.keyword\"}},\"Assessed Properties\":{\"nested\":{\"path\":\"domainObject.assessmentsDetails\"},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"domainObject.assessmentsDetails.assessmentNumber.keyword\"}}}}}}}}}}" }, { "module": "COMMON", @@ -844,10 +844,10 @@ "queries": [ { "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.Bill.billDetails.businessService.keyword\", \"usageId\" : \"domainObject.propertyDetails.usageCategoryMajor.keyword\",\"minorUsageId\" : \"domainObject.propertyDetails.usageCategoryMinor.keyword\",\"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.cityDistrictCode\" }", - "dateRefField": "dataObject.Bill.billDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"usageId\" : \"domainObject.units.usageCategory.keyword\",\"minorUsageId\" : \"domainObject.units.usageCategory.keyword\",\"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", + "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.Bill.billDetails.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Ward \":{\"terms\":{\"field\":\"domainObject.ward.name.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.amountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.transactionId.keyword\"}},\"Assessed Properties\":{\"nested\":{\"path\":\"domainObject.propertyDetails\"},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"domainObject.propertyDetails.assessmentNumber.keyword\"}}}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Ward \":{\"terms\":{\"field\":\"domainObject.ward.name.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.paymentDetails.billId.keyword\"}},\"Assessed Properties\":{\"nested\":{\"path\":\"domainObject.assessmentsDetails\"},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"domainObject.assessmentsDetails.assessmentNumber.keyword\"}}}}}}}}}}" } ], "chartType": "table", @@ -888,10 +888,10 @@ "queries": [ { "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.Bill.billDetails.businessService.keyword\", \"usageId\" : \"domainObject.propertyDetails.usageCategoryMajor.keyword\",\"minorUsageId\" : \"domainObject.propertyDetails.usageCategoryMinor.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.cityDistrictCode\" }", - "dateRefField": "dataObject.Bill.billDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"usageId\" : \"domainObject.units.usageCategory.keyword\",\"minorUsageId\" : \"domainObject.units.usageCategory.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", + "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.Bill.billDetails.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Total Amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.totalAmount\"}},\"PT Tax\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TAX\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}},\"Fire Cess\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_FIRE_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}},\"Cancer Cess\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_CANCER_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}},\"Rebate\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_REBATE\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}},\"Penalty\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_PENALTY\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}},\"Time Interest\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_INTEREST\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}},\"Round Off\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_ROUNDOFF\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Total Amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.totalAmount\"}},\"PT Tax\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TAX\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Fire Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_FIRE_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Cancer Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_CANCER_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Rebate\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_REBATE\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Penalty\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_PENALTY\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Time Interest\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_INTEREST\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Round Off\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_ROUNDOFF\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}}}}}}" } ], "isMdmsEnabled": true, @@ -932,10 +932,10 @@ "queries": [ { "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.Bill.billDetails.businessService.keyword\", \"usageId\" : \"domainObject.propertyDetails.usageCategoryMajor.keyword\",\"minorUsageId\" : \"domainObject.propertyDetails.usageCategoryMinor.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.cityDistrictCode\" }", - "dateRefField": "dataObject.Bill.billDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"usageId\" : \"domainObject.units.usageCategory.keyword\",\"minorUsageId\" : \"domainObject.units.usageCategory.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", + "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.Bill.billDetails.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"ULBs \":{\"terms\":{\"field\":\"dataObject.tenantId.keyword\",\"size\":200},\"aggs\":{\"Total Amount\":{\"bucket_script\":{\"buckets_path\":{\"c1\":\"PT Tax>aggrFilter>amount\",\"c2\":\"Fire Cess>aggrFilter>amount\",\"c3\":\"Cancer Cess>aggrFilter>amount\",\"c4\":\"Rebate>aggrFilter>amount\",\"c5\":\"Penalty>aggrFilter>amount\",\"c6\":\"Time Interest>aggrFilter>amount\",\"c7\":\"Round Off>aggrFilter>amount\"},\"script\":{\"source\":\"params.c1+params.c2+params.c3+params.c4+params.c5+params.c6+params.c7\"}}},\"PT Tax\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TAX\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}},\"Fire Cess\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_FIRE_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}},\"Cancer Cess\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_CANCER_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}},\"Rebate\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_REBATE\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}},\"Penalty\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_PENALTY\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}},\"Time Interest\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_INTEREST\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}},\"Round Off\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_ROUNDOFF\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"ULBs \":{\"terms\":{\"field\":\"dataObject.tenantId.keyword\",\"size\":200},\"aggs\":{\"Total Amount\":{\"bucket_script\":{\"buckets_path\":{\"c1\":\"PT Tax>aggrFilter>amount\",\"c2\":\"Fire Cess>aggrFilter>amount\",\"c3\":\"Cancer Cess>aggrFilter>amount\",\"c4\":\"Rebate>aggrFilter>amount\",\"c5\":\"Penalty>aggrFilter>amount\",\"c6\":\"Time Interest>aggrFilter>amount\",\"c7\":\"Round Off>aggrFilter>amount\"},\"script\":{\"source\":\"params.c1+params.c2+params.c3+params.c4+params.c5+params.c6+params.c7\"}}},\"PT Tax\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TAX\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Fire Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_FIRE_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Cancer Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_CANCER_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Rebate\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_REBATE\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Penalty\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_PENALTY\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Time Interest\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_INTEREST\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Round Off\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_ROUNDOFF\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}}}}}}}}" } ], "filterKeys": [ @@ -970,10 +970,10 @@ "queries": [ { "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.Bill.billDetails.businessService.keyword\", \"usageId\" : \"domainObject.propertyDetails.usageCategoryMajor.keyword\",\"minorUsageId\" : \"domainObject.propertyDetails.usageCategoryMinor.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.cityDistrictCode\" }", - "dateRefField": "dataObject.Bill.billDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"usageId\" : \"domainObject.units.usageCategory.keyword\",\"minorUsageId\" : \"domainObject.units.usageCategory.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", + "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.Bill.billDetails.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Ward \":{\"terms\":{\"field\":\"domainObject.ward.name.keyword\",\"size\":200},\"aggs\":{\"Total Amount\":{\"bucket_script\":{\"buckets_path\":{\"c1\":\"PT Tax>aggrFilter>amount\",\"c2\":\"Fire Cess>aggrFilter>amount\",\"c3\":\"Cancer Cess>aggrFilter>amount\",\"c4\":\"Rebate>aggrFilter>amount\",\"c5\":\"Penalty>aggrFilter>amount\",\"c6\":\"Time Interest>aggrFilter>amount\",\"c7\":\"Round Off>aggrFilter>amount\"},\"script\":{\"source\":\"params.c1+params.c2+params.c3+params.c4+params.c5+params.c6+params.c7\"}}},\"PT Tax\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TAX\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}},\"Fire Cess\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_FIRE_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}},\"Cancer Cess\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_CANCER_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}},\"Rebate\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_REBATE\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}},\"Penalty\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_PENALTY\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}},\"Time Interest\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_INTEREST\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}},\"Round Off\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_ROUNDOFF\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Ward \":{\"terms\":{\"field\":\"domainObject.ward.name.keyword\",\"size\":200},\"aggs\":{\"Total Amount\":{\"bucket_script\":{\"buckets_path\":{\"c1\":\"PT Tax>aggrFilter>amount\",\"c2\":\"Fire Cess>aggrFilter>amount\",\"c3\":\"Cancer Cess>aggrFilter>amount\",\"c4\":\"Rebate>aggrFilter>amount\",\"c5\":\"Penalty>aggrFilter>amount\",\"c6\":\"Time Interest>aggrFilter>amount\",\"c7\":\"Round Off>aggrFilter>amount\"},\"script\":{\"source\":\"params.c1+params.c2+params.c3+params.c4+params.c5+params.c6+params.c7\"}}},\"PT Tax\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TAX\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Fire Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_FIRE_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Cancer Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_CANCER_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Rebate\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_REBATE\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Penalty\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_PENALTY\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Time Interest\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_INTEREST\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Round Off\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_ROUNDOFF\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}}}}}}}}" } ], "filterKeys": [ @@ -1008,10 +1008,10 @@ "queries": [ { "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.Bill.billDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.cityDistrictCode\" }", - "dateRefField": "dataObject.Bill.billDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", + "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.Bill.billDetails.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"attrs_root\":{\"nested\":{\"path\":\"domainObject.propertyDetails.units\"},\"aggs\":{\"Usage \":{\"terms\":{\"field\":\"domainObject.propertyDetails.units.usageCategoryMajor.keyword\",\"size\":200},\"aggs\":{\"Total Amount\":{\"nested\":{\"path\":\"dataObject.Bill.taxAndPayments\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.taxAndPayments.businessService.keyword\":[\"PT\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.taxAndPayments.taxAmount\"}}}}}},\"PT Tax\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TAX\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}},\"Fire Cess\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_FIRE_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}},\"Cancer Cess\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_CANCER_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}},\"Rebate\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_REBATE\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}},\"Penalty\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_PENALTY\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}}}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"attrs_root\":{\"nested\":{\"path\":\"domainObject.propertyDetails.units\"},\"aggs\":{\"Usage \":{\"terms\":{\"field\":\"domainObject.units.usageCategory.keyword\",\"size\":200},\"aggs\":{\"Total Amount\":{\"nested\":{\"path\":\"dataObject.Bill.taxAndPayments\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.taxAndPayments.businessService.keyword\":[\"PT\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.taxAndPayments.taxAmount\"}}}}}},\"PT Tax\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TAX\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Fire Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_FIRE_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Cancer Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_CANCER_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Rebate\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_REBATE\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Penalty\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_PENALTY\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}}}}}}}}}}" } ], "filterKeys": [ @@ -1060,10 +1060,10 @@ "queries": [ { "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"usageId\" : \"domainObject.propertyDetails.units.usageCategoryMajor.keyword\",\"minorUsageId\" : \"domainObject.propertyDetails.units.usageCategoryMinor.keyword\",\"module\" : \"dataObject.Bill.billDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.cityDistrictCode\" }", - "dateRefField": "dataObject.Bill.billDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"usageId\" : \"domainObject.units.usageCategory.keyword\",\"minorUsageId\" : \"domainObject.units.usageCategory.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", + "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.Bill.billDetails.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"attrs_root\":{\"nested\":{\"path\":\"domainObject.propertyDetails.units\"},\"aggs\":{\"Usage \":{\"terms\":{\"field\":\"domainObject.propertyDetails.units.usageCategoryMinor.keyword\",\"size\":200},\"aggs\":{\"Total Amount\":{\"nested\":{\"path\":\"dataObject.Bill.taxAndPayments\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.taxAndPayments.businessService.keyword\":[\"PT\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.taxAndPayments.taxAmount\"}}}}}},\"PT Tax\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TAX\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}},\"Fire Cess\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_FIRE_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}},\"Cancer Cess\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_CANCER_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}},\"Rebate\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_REBATE\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}},\"Penalty\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_PENALTY\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}}}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"attrs_root\":{\"nested\":{\"path\":\"domainObject.units\"},\"aggs\":{\"Usage \":{\"terms\":{\"field\":\"domainObject.units.usageCategory.keyword\",\"size\":200},\"aggs\":{\"Total Amount\":{\"nested\":{\"path\":\"dataObject.Bill.taxAndPayments\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.taxAndPayments.businessService.keyword\":[\"PT\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.taxAndPayments.taxAmount\"}}}}}},\"PT Tax\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TAX\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Fire Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_FIRE_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Cancer Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_CANCER_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Rebate\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_REBATE\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Penalty\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_PENALTY\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}}}}}}}}}}" } ], "filterKeys": [ @@ -1112,10 +1112,10 @@ "queries": [ { "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"usageId\" : \"domainObject.propertyDetails.units.usageCategoryMajor.keyword\",\"minorUsageId\" : \"domainObject.propertyDetails.units.usageCategoryMinor.keyword\",\"module\" : \"dataObject.Bill.billDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.cityDistrictCode\" }", - "dateRefField": "dataObject.Bill.billDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"usageId\" : \"domainObject.units.usageCategory.keyword\",\"minorUsageId\" : \"domainObject.units.usageCategory.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", + "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.Bill.billDetails.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"attrs_root\":{\"nested\":{\"path\":\"domainObject.propertyDetails.units\"},\"aggs\":{\"Usage \":{\"terms\":{\"field\":\"domainObject.propertyDetails.units.usageCategorySubMinor.keyword\",\"size\":200},\"aggs\":{\"Total Amount\":{\"nested\":{\"path\":\"dataObject.Bill.taxAndPayments\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.taxAndPayments.businessService.keyword\":[\"PT\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.taxAndPayments.taxAmount\"}}}}}},\"PT Tax\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TAX\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}},\"Fire Cess\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_FIRE_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}},\"Cancer Cess\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_CANCER_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}},\"Rebate\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_REBATE\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}},\"Penalty\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_PENALTY\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}}}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"attrs_root\":{\"nested\":{\"path\":\"domainObject.propertyDetails.units\"},\"aggs\":{\"Usage \":{\"terms\":{\"field\":\"domainObject.propertyDetails.units.usageCategorySubMinor.keyword\",\"size\":200},\"aggs\":{\"Total Amount\":{\"nested\":{\"path\":\"dataObject.Bill.taxAndPayments\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.taxAndPayments.businessService.keyword\":[\"PT\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.taxAndPayments.taxAmount\"}}}}}},\"PT Tax\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TAX\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Fire Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_FIRE_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Cancer Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_CANCER_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Rebate\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_REBATE\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Penalty\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_PENALTY\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}}}}}}}}}}" } ], "filterKeys": [ @@ -1164,11 +1164,11 @@ "queries": [ { "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.Bill.billDetails.businessService.keyword\",\"usageId\" : \"domainObject.propertyDetails.units.usageCategoryMajor.keyword\",\"minorUsageId\" : \"domainObject.propertyDetails.units.usageCategoryMinor.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.cityDistrictCode\" }", - "dateRefField": "dataObject.Bill.billDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\",\"usageId\" : \"domainObject.units.usageCategory.keyword\",\"minorUsageId\" : \"domainObject.units.usageCategory.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", + "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.Bill.billDetails.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"root\":{\"nested\":{\"path\":\"domainObject.propertyDetails.units\"},\"aggs\":{\"UsageType \":{\"terms\":{\"field\":\"domainObject.propertyDetails.units.usageCategoryMajor.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"reverse_nested\":{},\"aggs\":{\"top_tags_per_comment\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.amountPaid\"}}}},\"Transactions\":{\"reverse_nested\":{},\"aggs\":{\"top_tags_per_comment\":{\"cardinality\":{\"field\":\"dataObject.transactionId.keyword\"}}}},\"Assessed Properties\":{\"nested\":{\"path\":\"domainObject.propertyDetails\"},\"aggs\":{\"attr\":{\"cardinality\":{\"field\":\"domainObject.propertyDetails.assessmentNumber.keyword\"}}}}}}}}}}}}", - "aggrQuerybc": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}}],\"must\":[{\"term\":{\"dataObject.Bill.billDetails.status.keyword\":\"Approved\"}}]}},\"aggs\":{\"attrs_root\":{\"nested\":{\"path\":\"domainObject.propertyDetails.units\"},\"aggs\":{\"UsageType \":{\"terms\":{\"field\":\"domainObject.propertyDetails.units.usageCategoryMajor.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.amountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.transactionId.keyword\"}},\"Assessed Properties\":{\"nested\":{\"path\":\"Data.propertyDetails\"},\"aggs\":{\"attr\":{\"cardinality\":{\"field\":\"Data.propertyDetails.assessmentNumber.keyword\"}}}}}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"root\":{\"nested\":{\"path\":\"domainObject.units\"},\"aggs\":{\"UsageType \":{\"terms\":{\"field\":\"domainObject.units.usageCategory.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"reverse_nested\":{},\"aggs\":{\"top_tags_per_comment\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}},\"Transactions\":{\"reverse_nested\":{},\"aggs\":{\"top_tags_per_comment\":{\"cardinality\":{\"field\":\"dataObject.paymentDetails.billId.keyword\"}}}},\"Assessed Properties\":{\"nested\":{\"path\":\"domainObject.assessmentsDetails\"},\"aggs\":{\"attr\":{\"cardinality\":{\"field\":\"domainObject.assessmentsDetails.assessmentNumber.keyword\"}}}}}}}}}}}}", + "aggrQuerybc": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}}],\"must\":[{\"term\":{\"dataObject.paymentDetails.bill.status.keyword\":\"Approved\"}}]}},\"aggs\":{\"attrs_root\":{\"nested\":{\"path\":\"domainObject.units\"},\"aggs\":{\"UsageType \":{\"terms\":{\"field\":\"domainObject.units.usageCategory.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.paymentDetails.billId.keyword\"}},\"Assessed Properties\":{\"nested\":{\"path\":\"domainObject.assessmentsDetails\"},\"aggs\":{\"attr\":{\"cardinality\":{\"field\":\"domainObject.assessmentsDetails.assessmentNumber.keyword\"}}}}}}}}}}}}" } ], "filterKeys": [ @@ -1210,11 +1210,11 @@ "queries": [ { "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"usageId\" : \"domainObject.propertyDetails.units.usageCategoryMajor.keyword\",\"minorUsageId\" : \"domainObject.propertyDetails.units.usageCategoryMinor.keyword\",\"module\" : \"dataObject.Bill.billDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.cityDistrictCode\" }", - "dateRefField": "dataObject.Bill.billDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"usageId\" : \"domainObject.units.usageCategory.keyword\",\"minorUsageId\" : \"domainObject.units.usageCategory.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", + "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.Bill.billDetails.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"root\":{\"nested\":{\"path\":\"domainObject.propertyDetails.units\"},\"aggs\":{\"UsageType \":{\"terms\":{\"field\":\"domainObject.propertyDetails.units.usageCategoryMinor.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"reverse_nested\":{},\"aggs\":{\"top_tags_per_comment\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.amountPaid\"}}}},\"Transactions\":{\"reverse_nested\":{},\"aggs\":{\"top_tags_per_comment\":{\"cardinality\":{\"field\":\"dataObject.transactionId.keyword\"}}}},\"Assessed Properties\":{\"nested\":{\"path\":\"domainObject.propertyDetails\"},\"aggs\":{\"attr\":{\"cardinality\":{\"field\":\"domainObject.propertyDetails.assessmentNumber.keyword\"}}}}}}}}}}}}", - "aggrQuerybc": "{\"aggs\":{\"attrs_root\":{\"nested\":{\"path\":\"domainObject.propertyDetails.units\"},\"aggs\":{\"UsageType \":{\"terms\":{\"field\":\"domainObject.propertyDetails.units.usageCategoryMinor.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.amountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.transactionId.keyword\"}},\"Assessed Properties\":{\"nested\":{\"path\":\"Data.propertyDetails\"},\"aggs\":{\"attr\":{\"cardinality\":{\"field\":\"Data.propertyDetails.assessmentNumber.keyword\"}}}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"root\":{\"nested\":{\"path\":\"domainObject.propertyDetails.units\"},\"aggs\":{\"UsageType \":{\"terms\":{\"field\":\"domainObject.units.usageCategory.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"reverse_nested\":{},\"aggs\":{\"top_tags_per_comment\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}},\"Transactions\":{\"reverse_nested\":{},\"aggs\":{\"top_tags_per_comment\":{\"cardinality\":{\"field\":\"dataObject.paymentDetails.billId.keyword\"}}}},\"Assessed Properties\":{\"nested\":{\"path\":\"domainObject.propertyDetails\"},\"aggs\":{\"attr\":{\"cardinality\":{\"field\":\"domainObject.propertyDetails.assessmentNumber.keyword\"}}}}}}}}}}}}", + "aggrQuerybc": "{\"aggs\":{\"attrs_root\":{\"nested\":{\"path\":\"domainObject.propertyDetails.units\"},\"aggs\":{\"UsageType \":{\"terms\":{\"field\":\"domainObject.units.usageCategory.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.paymentDetails.billId.keyword\"}},\"Assessed Properties\":{\"nested\":{\"path\":\"Data.propertyDetails\"},\"aggs\":{\"attr\":{\"cardinality\":{\"field\":\"Data.propertyDetails.assessmentNumber.keyword\"}}}}}}}}}}" } ], "filterKeys": [ @@ -1251,11 +1251,11 @@ "queries": [ { "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"usageId\" : \"domainObject.propertyDetails.units.usageCategoryMajor.keyword\",\"minorUsageId\" : \"domainObject.propertyDetails.units.usageCategoryMinor.keyword\",\"module\" : \"dataObject.Bill.billDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.cityDistrictCode\" }", - "dateRefField": "dataObject.Bill.billDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"usageId\" : \"domainObject.units.usageCategory.keyword\",\"minorUsageId\" : \"domainObject.units.usageCategory.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", + "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.Bill.billDetails.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"root\":{\"nested\":{\"path\":\"domainObject.propertyDetails.units\"},\"aggs\":{\"UsageType \":{\"terms\":{\"field\":\"domainObject.propertyDetails.units.usageCategorySubMinor.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"reverse_nested\":{},\"aggs\":{\"top_tags_per_comment\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.amountPaid\"}}}},\"Transactions\":{\"reverse_nested\":{},\"aggs\":{\"top_tags_per_comment\":{\"cardinality\":{\"field\":\"dataObject.transactionId.keyword\"}}}},\"Assessed Properties\":{\"nested\":{\"path\":\"domainObject.propertyDetails\"},\"aggs\":{\"attr\":{\"cardinality\":{\"field\":\"domainObject.propertyDetails.assessmentNumber.keyword\"}}}}}}}}}}}}", - "aggrQuerybc": "{\"aggs\":{\"attrs_root\":{\"nested\":{\"path\":\"domainObject.propertyDetails.units\"},\"aggs\":{\"UsageType \":{\"terms\":{\"field\":\"domainObject.propertyDetails.units.usageCategorySubMinor.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.amountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.transactionId.keyword\"}},\"Assessed Properties\":{\"nested\":{\"path\":\"Data.propertyDetails\"},\"aggs\":{\"attr\":{\"cardinality\":{\"field\":\"Data.propertyDetails.assessmentNumber.keyword\"}}}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"root\":{\"nested\":{\"path\":\"domainObject.propertyDetails.units\"},\"aggs\":{\"UsageType \":{\"terms\":{\"field\":\"domainObject.propertyDetails.units.usageCategorySubMinor.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"reverse_nested\":{},\"aggs\":{\"top_tags_per_comment\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}},\"Transactions\":{\"reverse_nested\":{},\"aggs\":{\"top_tags_per_comment\":{\"cardinality\":{\"field\":\"dataObject.paymentDetails.billId.keyword\"}}}},\"Assessed Properties\":{\"nested\":{\"path\":\"domainObject.propertyDetails\"},\"aggs\":{\"attr\":{\"cardinality\":{\"field\":\"domainObject.propertyDetails.assessmentNumber.keyword\"}}}}}}}}}}}}", + "aggrQuerybc": "{\"aggs\":{\"attrs_root\":{\"nested\":{\"path\":\"domainObject.propertyDetails.units\"},\"aggs\":{\"UsageType \":{\"terms\":{\"field\":\"domainObject.propertyDetails.units.usageCategorySubMinor.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.paymentDetails.billId.keyword\"}},\"Assessed Properties\":{\"nested\":{\"path\":\"Data.propertyDetails\"},\"aggs\":{\"attr\":{\"cardinality\":{\"field\":\"Data.propertyDetails.assessmentNumber.keyword\"}}}}}}}}}}" } ], "filterKeys": [ @@ -1297,10 +1297,10 @@ "queries": [ { "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.Bill.billDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.cityDistrictCode\" }", - "dateRefField": "dataObject.Bill.billDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", + "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.Bill.billDetails.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.amountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.transactionId.keyword\"}},\"Total Licence Issued\":{\"value_count\":{\"field\":\"domainObject.tradelicense.licenseNumber.keyword\"}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.paymentDetails.billId.keyword\"}},\"Total Licence Issued\":{\"value_count\":{\"field\":\"domainObject.tradelicense.licenseNumber.keyword\"}}}}}}" }, { "module": "COMMON", @@ -1351,10 +1351,10 @@ "queries": [ { "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.Bill.billDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.cityDistrictCode\" }", - "dateRefField": "dataObject.Bill.billDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", + "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.Bill.billDetails.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"ULBs \":{\"terms\":{\"field\":\"dataObject.tenantId.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.amountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.transactionId.keyword\"}},\"Total Licence Issued\":{\"value_count\":{\"field\":\"domainObject.tradelicense.licenseNumber.keyword\"}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"ULBs \":{\"terms\":{\"field\":\"dataObject.tenantId.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.paymentDetails.billId.keyword\"}},\"Total Licence Issued\":{\"value_count\":{\"field\":\"domainObject.tradelicense.licenseNumber.keyword\"}}}}}}}}" }, { "module": "COMMON", @@ -1403,10 +1403,10 @@ "queries": [ { "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.Bill.billDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.cityDistrictCode\" }", - "dateRefField": "dataObject.Bill.billDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", + "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.Bill.billDetails.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Ward \":{\"terms\":{\"field\":\"domainObject.ward.name.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.amountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.transactionId.keyword\"}},\"Total Licence Issued\":{\"value_count\":{\"field\":\"domainObject.tradelicense.licenseNumber.keyword\"}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Ward \":{\"terms\":{\"field\":\"domainObject.ward.name.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.paymentDetails.billId.keyword\"}},\"Total Licence Issued\":{\"value_count\":{\"field\":\"domainObject.tradelicense.licenseNumber.keyword\"}}}}}}}}" } ], "postAggregationTheory" : "repsonseToDifferenceOfDates", @@ -1447,10 +1447,10 @@ "queries": [ { "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.Bill.billDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.cityDistrictCode\" }", - "dateRefField": "dataObject.Bill.billDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", + "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.Bill.billDetails.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Total Amount\":{\"nested\":{\"path\":\"dataObject.Bill.taxAndPayments\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.taxAndPayments.businessService.keyword\":[\"TL\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.taxAndPayments.taxAmount\"}}}}}},\"TL Tax\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"TL_TAX\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}},\"Adhoc Penalty\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"TL_ADHOC_PENALTY\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}},\"Adhoc Rebate\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"TL_ADHOC_REBATE\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Total Amount\":{\"nested\":{\"path\":\"dataObject.Bill.taxAndPayments\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.taxAndPayments.businessService.keyword\":[\"TL\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.taxAndPayments.taxAmount\"}}}}}},\"TL Tax\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"TL_TAX\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Adhoc Penalty\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"TL_ADHOC_PENALTY\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Adhoc Rebate\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"TL_ADHOC_REBATE\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}}}}}}" } ], "isMdmsEnabled": true, @@ -1488,10 +1488,10 @@ "queries": [ { "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.Bill.billDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.cityDistrictCode\" }", - "dateRefField": "dataObject.Bill.billDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", + "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.Bill.billDetails.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"ULBs \":{\"terms\":{\"field\":\"dataObject.tenantId.keyword\",\"size\":200},\"aggs\":{\"Total Amount\":{\"bucket_script\":{\"buckets_path\":{\"c1\":\"TL Tax>aggrFilter>amount\",\"c2\":\"Adhoc Penalty>aggrFilter>amount\",\"c3\":\"Adhoc Rebate>aggrFilter>amount\"},\"script\":{\"source\":\"params.c1+params.c2+params.c3\"}}},\"TL Tax\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"TL_TAX\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}},\"Adhoc Penalty\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"TL_ADHOC_PENALTY\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}},\"Adhoc Rebate\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"TL_ADHOC_REBATE\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"ULBs \":{\"terms\":{\"field\":\"dataObject.tenantId.keyword\",\"size\":200},\"aggs\":{\"Total Amount\":{\"bucket_script\":{\"buckets_path\":{\"c1\":\"TL Tax>aggrFilter>amount\",\"c2\":\"Adhoc Penalty>aggrFilter>amount\",\"c3\":\"Adhoc Rebate>aggrFilter>amount\"},\"script\":{\"source\":\"params.c1+params.c2+params.c3\"}}},\"TL Tax\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"TL_TAX\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Adhoc Penalty\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"TL_ADHOC_PENALTY\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Adhoc Rebate\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"TL_ADHOC_REBATE\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}}}}}}}}" } ], "filterKeys": [ @@ -1517,10 +1517,10 @@ "queries": [ { "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.Bill.billDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.cityDistrictCode\" }", - "dateRefField": "dataObject.Bill.billDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", + "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.Bill.billDetails.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"ULBs \":{\"terms\":{\"field\":\"dataObject.ward.name.keyword\",\"size\":200},\"aggs\":{\"Total Amount\":{\"bucket_script\":{\"buckets_path\":{\"c1\":\"TL Tax>aggrFilter>amount\",\"c2\":\"Adhoc Penalty>aggrFilter>amount\",\"c3\":\"Adhoc Rebate>aggrFilter>amount\"},\"script\":{\"source\":\"params.c1+params.c2+params.c3\"}}},\"TL Tax\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"TL_TAX\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}},\"Adhoc Penalty\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"TL_ADHOC_PENALTY\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}},\"Adhoc Rebate\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"TL_ADHOC_REBATE\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"ULBs \":{\"terms\":{\"field\":\"dataObject.ward.name.keyword\",\"size\":200},\"aggs\":{\"Total Amount\":{\"bucket_script\":{\"buckets_path\":{\"c1\":\"TL Tax>aggrFilter>amount\",\"c2\":\"Adhoc Penalty>aggrFilter>amount\",\"c3\":\"Adhoc Rebate>aggrFilter>amount\"},\"script\":{\"source\":\"params.c1+params.c2+params.c3\"}}},\"TL Tax\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"TL_TAX\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Adhoc Penalty\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"TL_ADHOC_PENALTY\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Adhoc Rebate\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"TL_ADHOC_REBATE\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}}}}}}}}" } ], "filterKeys": [ @@ -1838,10 +1838,10 @@ "queries": [ { "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.Bill.billDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.cityDistrictCode\" }", - "dateRefField": "dataObject.Bill.billDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", + "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.Bill.billDetails.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"ULBs \":{\"terms\":{\"field\":\"dataObject.tenantId.keyword\",\"size\":200,\"min_doc_count\":0},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.amountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.transactionId.keyword\"}},\"Total Licence Issued\":{\"value_count\":{\"field\":\"domainObject.tradelicense.licenseNumber.keyword\"}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"ULBs \":{\"terms\":{\"field\":\"dataObject.tenantId.keyword\",\"size\":200,\"min_doc_count\":0},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.paymentDetails.billId.keyword\"}},\"Total Licence Issued\":{\"value_count\":{\"field\":\"domainObject.tradelicense.licenseNumber.keyword\"}}}}}}}}" }, { "module": "COMMON", @@ -2866,7 +2866,7 @@ "_comment": "W&S charts below-----------------------------------------------------------------------", - + "wstodaysCollection": { "chartName": "DSS_W&S_TODAYS_COLLECTION", "queries": [ @@ -3518,8 +3518,8 @@ }, "_comment": "" }, - - + + "wstotalConnection": { "chartName": "DSS_W&S_CONNECTIONS", "queries": [ From 37759d4f93751d90d410723d44c60d95a28ff5c2 Mon Sep 17 00:00:00 2001 From: gurpreetsinghkhanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 11 Aug 2020 13:19:26 +0530 Subject: [PATCH 0035/1242] consolidatedreceipt-pdf-update --- configs/pdf-service/format-config/consolidatedreceipt.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/pdf-service/format-config/consolidatedreceipt.json b/configs/pdf-service/format-config/consolidatedreceipt.json index 28a1b63d..2907b364 100644 --- a/configs/pdf-service/format-config/consolidatedreceipt.json +++ b/configs/pdf-service/format-config/consolidatedreceipt.json @@ -284,7 +284,7 @@ "style": "receipt-table" }, { - "text": "{{pending_amount}}", + "text": "", "border": [ false, false, @@ -294,7 +294,7 @@ "style": "receipt-table-value" }, { - "text": "₹ {{pendingAmount}}", + "text": "", "border": [ false, false, From 1082ee7d0f1dcbfe65c2357cb32372d8ae28daa1 Mon Sep 17 00:00:00 2001 From: narendrabandhamneni-wt-egov Date: Tue, 11 Aug 2020 14:32:12 +0530 Subject: [PATCH 0036/1242] assign me issue --- .../egov-workflow-v2-persister.yml | 296 +++++++++--------- 1 file changed, 156 insertions(+), 140 deletions(-) diff --git a/configs/egov-persister/egov-workflow-v2-persister.yml b/configs/egov-persister/egov-workflow-v2-persister.yml index 7e3bea16..97412d3e 100644 --- a/configs/egov-persister/egov-workflow-v2-persister.yml +++ b/configs/egov-persister/egov-workflow-v2-persister.yml @@ -1,256 +1,272 @@ serviceMaps: - serviceName: egov-workflow-v2 - mappings: - - version: 1.0 - description: Persists workflow processInstanceFromRequest details in eg_workflow_v2 table - fromTopic: save-wf-transitions - isTransaction: true - queryMaps: + serviceName: egov-workflow-v2 + mappings: + - version: 1.0 + description: Persists workflow processInstanceFromRequest details in eg_workflow_v2 table + fromTopic: save-wf-transitions + isTransaction: true + queryMaps: - - query: INSERT INTO eg_wf_processinstance_v2( id,tenantid,businessService,businessId,moduleName,action,status,comment, assigner, assignee, stateSla,businessServiceSla, previousStatus, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - basePath: ProcessInstances.* - jsonMaps: - - jsonPath: $.ProcessInstances.*.id + - query: INSERT INTO eg_wf_processinstance_v2( id,tenantid,businessService,businessId,moduleName,action,status,comment, assigner, stateSla,businessServiceSla, previousStatus, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: ProcessInstances.* + jsonMaps: + - jsonPath: $.ProcessInstances.*.id - - jsonPath: $.ProcessInstances.*.tenantId + - jsonPath: $.ProcessInstances.*.tenantId - - jsonPath: $.ProcessInstances.*.businessService + - jsonPath: $.ProcessInstances.*.businessService - - jsonPath: $.ProcessInstances.*.businessId + - jsonPath: $.ProcessInstances.*.businessId - - jsonPath: $.ProcessInstances.*.moduleName + - jsonPath: $.ProcessInstances.*.moduleName - - jsonPath: $.ProcessInstances.*.action + - jsonPath: $.ProcessInstances.*.action - - jsonPath: $.ProcessInstances.*.state.uuid + - jsonPath: $.ProcessInstances.*.state.uuid - - jsonPath: $.ProcessInstances.*.comment + - jsonPath: $.ProcessInstances.*.comment - - jsonPath: $.ProcessInstances.*.assigner.uuid + - jsonPath: $.ProcessInstances.*.assigner.uuid - - jsonPath: $.ProcessInstances.*.assignee.uuid + - jsonPath: $.ProcessInstances.*.stateSla - - jsonPath: $.ProcessInstances.*.stateSla + - jsonPath: $.ProcessInstances.*.businesssServiceSla - - jsonPath: $.ProcessInstances.*.businesssServiceSla + - jsonPath: $.ProcessInstances.*.previousStatus - - jsonPath: $.ProcessInstances.*.previousStatus + - jsonPath: $.ProcessInstances.*.auditDetails.createdBy - - jsonPath: $.ProcessInstances.*.auditDetails.createdBy + - jsonPath: $.ProcessInstances.*.auditDetails.lastModifiedBy - - jsonPath: $.ProcessInstances.*.auditDetails.lastModifiedBy + - jsonPath: $.ProcessInstances.*.auditDetails.createdTime - - jsonPath: $.ProcessInstances.*.auditDetails.createdTime + - jsonPath: $.ProcessInstances.*.auditDetails.lastModifiedTime - - jsonPath: $.ProcessInstances.*.auditDetails.lastModifiedTime + - query: INSERT INTO eg_wf_document_v2( id, tenantid, active, documenttype,documentUid, processinstanceid, filestoreid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: ProcessInstances.*.documents.* + jsonMaps: + - jsonPath: $.ProcessInstances.documents.*.id - - query: INSERT INTO eg_wf_document_v2( id, tenantid, active, documenttype,documentUid, processinstanceid, filestoreid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - basePath: ProcessInstances.*.documents.* - jsonMaps: - - jsonPath: $.ProcessInstances.documents.*.id + - jsonPath: $.ProcessInstances.documents.*.tenantId - - jsonPath: $.ProcessInstances.documents.*.tenantId + - jsonPath: $.ProcessInstances.documents.*.active - - jsonPath: $.ProcessInstances.documents.*.active + - jsonPath: $.ProcessInstances.documents.*.documentType - - jsonPath: $.ProcessInstances.documents.*.documentType + - jsonPath: $.ProcessInstances.documents.*.documentUid - - jsonPath: $.ProcessInstances.documents.*.documentUid + - jsonPath: $.ProcessInstances[*][?({id} in @.documents[*].id)].id - - jsonPath: $.ProcessInstances[*][?({id} in @.documents[*].id)].id + - jsonPath: $.ProcessInstances.documents.*.fileStoreId - - jsonPath: $.ProcessInstances.documents.*.fileStoreId + - jsonPath: $.ProcessInstances.documents.*.auditDetails.createdBy - - jsonPath: $.ProcessInstances.documents.*.auditDetails.createdBy + - jsonPath: $.ProcessInstances.documents.*.auditDetails.lastModifiedBy - - jsonPath: $.ProcessInstances.documents.*.auditDetails.lastModifiedBy + - jsonPath: $.ProcessInstances.documents.*.auditDetails.createdTime - - jsonPath: $.ProcessInstances.documents.*.auditDetails.createdTime + - jsonPath: $.ProcessInstances.documents.*.auditDetails.lastModifiedTime - - jsonPath: $.ProcessInstances.documents.*.auditDetails.lastModifiedTime + - query: INSERT INTO eg_wf_assignee_v2(processinstanceid, tenantid, assignee, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?); + basePath: ProcessInstances.*.assignes.* + jsonMaps: + - jsonPath: $.ProcessInstances[*][?({uuid} in @.assignes[*].uuid)].id + - jsonPath: $.ProcessInstances[*][?({uuid} in @.assignes[*].uuid)].tenantId + - jsonPath: $.ProcessInstances.*.assignes.*.uuid - - version: 1.0 - description: Persists BusinessService in the table - fromTopic: save-wf-businessservice - isTransaction: true - queryMaps: + - jsonPath: $.ProcessInstances[*][?({uuid} in @.assignes[*].uuid)].auditDetails.createdBy - - query: INSERT INTO eg_wf_businessservice_v2(businessServiceSla, businessservice, business, tenantid, uuid, geturi, posturi, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - basePath: BusinessServices.* - jsonMaps: - - jsonPath: $.BusinessServices.*.businessServiceSla + - jsonPath: $.ProcessInstances[*][?({uuid} in @.assignes[*].uuid)].auditDetails.lastModifiedBy - - jsonPath: $.BusinessServices.*.businessService + - jsonPath: $.ProcessInstances[*][?({uuid} in @.assignes[*].uuid)].auditDetails.createdTime - - jsonPath: $.BusinessServices.*.business + - jsonPath: $.ProcessInstances[*][?({uuid} in @.assignes[*].uuid)].auditDetails.lastModifiedTime - - jsonPath: $.BusinessServices.*.tenantId - - jsonPath: $.BusinessServices.*.uuid - - jsonPath: $.BusinessServices.*.geturi - - jsonPath: $.BusinessServices.*.posturi + - version: 1.0 + description: Persists BusinessService in the table + fromTopic: save-wf-businessservice + isTransaction: true + queryMaps: - - jsonPath: $.BusinessServices.*.auditDetails.createdBy + - query: INSERT INTO eg_wf_businessservice_v2(businessServiceSla, businessservice, business, tenantid, uuid, geturi, posturi, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: BusinessServices.* + jsonMaps: + - jsonPath: $.BusinessServices.*.businessServiceSla - - jsonPath: $.BusinessServices.*.auditDetails.createdTime + - jsonPath: $.BusinessServices.*.businessService - - jsonPath: $.BusinessServices.*.auditDetails.lastModifiedBy + - jsonPath: $.BusinessServices.*.business - - jsonPath: $.BusinessServices.*.auditDetails.lastModifiedTime + - jsonPath: $.BusinessServices.*.tenantId + - jsonPath: $.BusinessServices.*.uuid + - jsonPath: $.BusinessServices.*.geturi + - jsonPath: $.BusinessServices.*.posturi - - query: INSERT INTO eg_wf_state_v2(seq, uuid, tenantid, businessserviceid, state,applicationStatus,sla,docuploadrequired, isstartstate, isterminatestate,isStateUpdatable, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (nextval('seq_eg_wf_state_v2'),? , ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - basePath: BusinessServices.*.states.* - jsonMaps: - - jsonPath: $.BusinessServices.*.states.*.uuid + - jsonPath: $.BusinessServices.*.auditDetails.createdBy - - jsonPath: $.BusinessServices.*.states.*.tenantId + - jsonPath: $.BusinessServices.*.auditDetails.createdTime - - jsonPath: $.BusinessServices[*][?({uuid} in @.states[*].uuid)].uuid + - jsonPath: $.BusinessServices.*.auditDetails.lastModifiedBy - - jsonPath: $.BusinessServices.*.states.*.state + - jsonPath: $.BusinessServices.*.auditDetails.lastModifiedTime - - jsonPath: $.BusinessServices.*.states.*.applicationStatus - - jsonPath: $.BusinessServices.*.states.*.sla - - jsonPath: $.BusinessServices.*.states.*.docUploadRequired - - jsonPath: $.BusinessServices.*.states.*.isStartState + - query: INSERT INTO eg_wf_state_v2(seq, uuid, tenantid, businessserviceid, state,applicationStatus,sla,docuploadrequired, isstartstate, isterminatestate,isStateUpdatable, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (nextval('seq_eg_wf_state_v2'),? , ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: BusinessServices.*.states.* + jsonMaps: + - jsonPath: $.BusinessServices.*.states.*.uuid - - jsonPath: $.BusinessServices.*.states.*.isTerminateState + - jsonPath: $.BusinessServices.*.states.*.tenantId - - jsonPath: $.BusinessServices.*.states.*.isStateUpdatable + - jsonPath: $.BusinessServices[*][?({uuid} in @.states[*].uuid)].uuid - - jsonPath: $.BusinessServices.*.states.*.auditDetails.createdBy + - jsonPath: $.BusinessServices.*.states.*.state - - jsonPath: $.BusinessServices.*.states.*.auditDetails.createdTime + - jsonPath: $.BusinessServices.*.states.*.applicationStatus - - jsonPath: $.BusinessServices.*.states.*.auditDetails.lastModifiedBy + - jsonPath: $.BusinessServices.*.states.*.sla - - jsonPath: $.BusinessServices.*.states.*.auditDetails.lastModifiedTime + - jsonPath: $.BusinessServices.*.states.*.docUploadRequired + - jsonPath: $.BusinessServices.*.states.*.isStartState + - jsonPath: $.BusinessServices.*.states.*.isTerminateState - - query: INSERT INTO eg_wf_action_v2( uuid,tenantId, currentState, action, nextstate, roles, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - basePath: BusinessServices.*.states.*.actions.* - jsonMaps: - - jsonPath: $.BusinessServices.*.states.*.actions.*.uuid + - jsonPath: $.BusinessServices.*.states.*.isStateUpdatable - - jsonPath: $.BusinessServices.*.states.*.actions.*.tenantId + - jsonPath: $.BusinessServices.*.states.*.auditDetails.createdBy - - jsonPath: $.BusinessServices.*.states[*][?({uuid} in @.actions[*].uuid)].uuid + - jsonPath: $.BusinessServices.*.states.*.auditDetails.createdTime - - jsonPath: $.BusinessServices.*.states.*.actions.*.action + - jsonPath: $.BusinessServices.*.states.*.auditDetails.lastModifiedBy - - jsonPath: $.BusinessServices.*.states.*.actions.*.nextState + - jsonPath: $.BusinessServices.*.states.*.auditDetails.lastModifiedTime - - jsonPath: $.BusinessServices.*.states.*.actions.*.roles - type: ARRAY - dbType: STRING - - jsonPath: $.BusinessServices.*.states.*.actions.*.auditDetails.createdBy - - jsonPath: $.BusinessServices.*.states.*.actions.*.auditDetails.createdTime + - query: INSERT INTO eg_wf_action_v2( uuid,tenantId, currentState, action, nextstate, roles, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: BusinessServices.*.states.*.actions.* + jsonMaps: + - jsonPath: $.BusinessServices.*.states.*.actions.*.uuid - - jsonPath: $.BusinessServices.*.states.*.actions.*.auditDetails.lastModifiedBy + - jsonPath: $.BusinessServices.*.states.*.actions.*.tenantId - - jsonPath: $.BusinessServices.*.states.*.actions.*.auditDetails.lastModifiedTime + - jsonPath: $.BusinessServices.*.states[*][?({uuid} in @.actions[*].uuid)].uuid + - jsonPath: $.BusinessServices.*.states.*.actions.*.action + - jsonPath: $.BusinessServices.*.states.*.actions.*.nextState - - version: 1.0 - description: Persists BusinessService in the table - fromTopic: update-wf-businessservice - isTransaction: true - queryMaps: + - jsonPath: $.BusinessServices.*.states.*.actions.*.roles + type: ARRAY + dbType: STRING - - query: UPDATE eg_wf_businessservice_v2 SET businessservicesla=?,businessservice=?, business=?, geturi=?, posturi=?, lastmodifiedby=?, lastmodifiedtime=? WHERE uuid=?; - basePath: BusinessServices.* - jsonMaps: - - jsonPath: $.BusinessServices.*.businessServiceSla + - jsonPath: $.BusinessServices.*.states.*.actions.*.auditDetails.createdBy - - jsonPath: $.BusinessServices.*.businessService + - jsonPath: $.BusinessServices.*.states.*.actions.*.auditDetails.createdTime - - jsonPath: $.BusinessServices.*.business + - jsonPath: $.BusinessServices.*.states.*.actions.*.auditDetails.lastModifiedBy - - jsonPath: $.BusinessServices.*.geturi + - jsonPath: $.BusinessServices.*.states.*.actions.*.auditDetails.lastModifiedTime - - jsonPath: $.BusinessServices.*.posturi - - jsonPath: $.BusinessServices.*.auditDetails.lastModifiedBy - - jsonPath: $.BusinessServices.*.auditDetails.lastModifiedTime + - version: 1.0 + description: Persists BusinessService in the table + fromTopic: update-wf-businessservice + isTransaction: true + queryMaps: - - jsonPath: $.BusinessServices.*.uuid + - query: UPDATE eg_wf_businessservice_v2 SET businessservicesla=?,businessservice=?, business=?, geturi=?, posturi=?, lastmodifiedby=?, lastmodifiedtime=? WHERE uuid=?; + basePath: BusinessServices.* + jsonMaps: + - jsonPath: $.BusinessServices.*.businessServiceSla + - jsonPath: $.BusinessServices.*.businessService + - jsonPath: $.BusinessServices.*.business + - jsonPath: $.BusinessServices.*.geturi - - query: INSERT INTO eg_wf_state_v2(seq, uuid, tenantid, businessserviceid, state,applicationStatus,sla,docuploadrequired, isstartstate, isterminatestate,isStateUpdatable, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (nextval('seq_eg_wf_state_v2'), ?,?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (uuid) DO UPDATE SET state=EXCLUDED.state, docuploadrequired=EXCLUDED.docuploadrequired, isstartstate=EXCLUDED.isstartstate, isterminatestate=EXCLUDED.isterminatestate,isStateUpdatable=EXCLUDED.isStateUpdatable, lastmodifiedby=EXCLUDED.lastmodifiedby, lastmodifiedtime=EXCLUDED.lastmodifiedtime; - basePath: BusinessServices.*.states.* - jsonMaps: + - jsonPath: $.BusinessServices.*.posturi - - jsonPath: $.BusinessServices.*.states.*.uuid + - jsonPath: $.BusinessServices.*.auditDetails.lastModifiedBy - - jsonPath: $.BusinessServices.*.states.*.tenantId + - jsonPath: $.BusinessServices.*.auditDetails.lastModifiedTime - - jsonPath: $.BusinessServices[*][?({uuid} in @.states[*].uuid)].uuid + - jsonPath: $.BusinessServices.*.uuid - - jsonPath: $.BusinessServices.*.states.*.state - - jsonPath: $.BusinessServices.*.states.*.applicationStatus - - jsonPath: $.BusinessServices.*.states.*.sla - - jsonPath: $.BusinessServices.*.states.*.docUploadRequired + - query: INSERT INTO eg_wf_state_v2(seq, uuid, tenantid, businessserviceid, state,applicationStatus,sla,docuploadrequired, isstartstate, isterminatestate,isStateUpdatable, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (nextval('seq_eg_wf_state_v2'), ?,?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (uuid) DO UPDATE SET state=EXCLUDED.state,sla=EXCLUDED.sla,docuploadrequired=EXCLUDED.docuploadrequired,isstartstate=EXCLUDED.isstartstate, isterminatestate=EXCLUDED.isterminatestate,isStateUpdatable=EXCLUDED.isStateUpdatable, lastmodifiedby=EXCLUDED.lastmodifiedby, lastmodifiedtime=EXCLUDED.lastmodifiedtime; + basePath: BusinessServices.*.states.* + jsonMaps: - - jsonPath: $.BusinessServices.*.states.*.isStartState + - jsonPath: $.BusinessServices.*.states.*.uuid - - jsonPath: $.BusinessServices.*.states.*.isTerminateState + - jsonPath: $.BusinessServices.*.states.*.tenantId - - jsonPath: $.BusinessServices.*.states.*.isStateUpdatable + - jsonPath: $.BusinessServices[*][?({uuid} in @.states[*].uuid)].uuid - - jsonPath: $.BusinessServices.*.states.*.auditDetails.createdBy + - jsonPath: $.BusinessServices.*.states.*.state - - jsonPath: $.BusinessServices.*.states.*.auditDetails.createdTime + - jsonPath: $.BusinessServices.*.states.*.applicationStatus - - jsonPath: $.BusinessServices.*.states.*.auditDetails.lastModifiedBy + - jsonPath: $.BusinessServices.*.states.*.sla - - jsonPath: $.BusinessServices.*.states.*.auditDetails.lastModifiedTime + - jsonPath: $.BusinessServices.*.states.*.docUploadRequired - - query: INSERT INTO eg_wf_action_v2( uuid,tenantId, currentState, action, nextstate, roles, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (uuid) DO UPDATE SET action=EXCLUDED.action, nextstate=EXCLUDED.nextstate, roles=EXCLUDED.roles, lastmodifiedby=EXCLUDED.lastmodifiedby, lastmodifiedtime=EXCLUDED.lastmodifiedtime; - basePath: BusinessServices.*.states.*.actions.* - jsonMaps: + - jsonPath: $.BusinessServices.*.states.*.isStartState - - jsonPath: $.BusinessServices.*.states.*.actions.*.uuid + - jsonPath: $.BusinessServices.*.states.*.isTerminateState - - jsonPath: $.BusinessServices.*.states.*.actions.*.tenantId + - jsonPath: $.BusinessServices.*.states.*.isStateUpdatable - - jsonPath: $.BusinessServices.*.states[*][?({uuid} in @.actions[*].uuid)].uuid + - jsonPath: $.BusinessServices.*.states.*.auditDetails.createdBy - - jsonPath: $.BusinessServices.*.states.*.actions.*.action + - jsonPath: $.BusinessServices.*.states.*.auditDetails.createdTime - - jsonPath: $.BusinessServices.*.states.*.actions.*.nextState + - jsonPath: $.BusinessServices.*.states.*.auditDetails.lastModifiedBy - - jsonPath: $.BusinessServices.*.states.*.actions.*.roles - type: ARRAY - dbType: STRING + - jsonPath: $.BusinessServices.*.states.*.auditDetails.lastModifiedTime - - jsonPath: $.BusinessServices.*.states.*.actions.*.auditDetails.createdBy + - query: INSERT INTO eg_wf_action_v2( uuid,tenantId, currentState, action, nextstate, roles, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (uuid) DO UPDATE SET action=EXCLUDED.action, nextstate=EXCLUDED.nextstate, roles=EXCLUDED.roles, lastmodifiedby=EXCLUDED.lastmodifiedby, lastmodifiedtime=EXCLUDED.lastmodifiedtime; + basePath: BusinessServices.*.states.*.actions.* + jsonMaps: - - jsonPath: $.BusinessServices.*.states.*.actions.*.auditDetails.createdTime + - jsonPath: $.BusinessServices.*.states.*.actions.*.uuid - - jsonPath: $.BusinessServices.*.states.*.actions.*.auditDetails.lastModifiedBy + - jsonPath: $.BusinessServices.*.states.*.actions.*.tenantId - - jsonPath: $.BusinessServices.*.states.*.actions.*.auditDetails.lastModifiedTime + - jsonPath: $.BusinessServices.*.states[*][?({uuid} in @.actions[*].uuid)].uuid + + - jsonPath: $.BusinessServices.*.states.*.actions.*.action + + - jsonPath: $.BusinessServices.*.states.*.actions.*.nextState + + - jsonPath: $.BusinessServices.*.states.*.actions.*.roles + type: ARRAY + dbType: STRING + + - jsonPath: $.BusinessServices.*.states.*.actions.*.auditDetails.createdBy + + - jsonPath: $.BusinessServices.*.states.*.actions.*.auditDetails.createdTime + + - jsonPath: $.BusinessServices.*.states.*.actions.*.auditDetails.lastModifiedBy + + - jsonPath: $.BusinessServices.*.states.*.actions.*.auditDetails.lastModifiedTime From 55a6d4fb5c39a2209471a230fe5e35fc30c6d00a Mon Sep 17 00:00:00 2001 From: narendrabandhamneni-wt-egov Date: Tue, 11 Aug 2020 14:34:02 +0530 Subject: [PATCH 0037/1242] assign me issue fix --- .../egov-workflow-v2-persister.yml | 296 +++++++++--------- 1 file changed, 156 insertions(+), 140 deletions(-) diff --git a/configs/egov-persister/egov-workflow-v2-persister.yml b/configs/egov-persister/egov-workflow-v2-persister.yml index 7e3bea16..97412d3e 100644 --- a/configs/egov-persister/egov-workflow-v2-persister.yml +++ b/configs/egov-persister/egov-workflow-v2-persister.yml @@ -1,256 +1,272 @@ serviceMaps: - serviceName: egov-workflow-v2 - mappings: - - version: 1.0 - description: Persists workflow processInstanceFromRequest details in eg_workflow_v2 table - fromTopic: save-wf-transitions - isTransaction: true - queryMaps: + serviceName: egov-workflow-v2 + mappings: + - version: 1.0 + description: Persists workflow processInstanceFromRequest details in eg_workflow_v2 table + fromTopic: save-wf-transitions + isTransaction: true + queryMaps: - - query: INSERT INTO eg_wf_processinstance_v2( id,tenantid,businessService,businessId,moduleName,action,status,comment, assigner, assignee, stateSla,businessServiceSla, previousStatus, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - basePath: ProcessInstances.* - jsonMaps: - - jsonPath: $.ProcessInstances.*.id + - query: INSERT INTO eg_wf_processinstance_v2( id,tenantid,businessService,businessId,moduleName,action,status,comment, assigner, stateSla,businessServiceSla, previousStatus, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: ProcessInstances.* + jsonMaps: + - jsonPath: $.ProcessInstances.*.id - - jsonPath: $.ProcessInstances.*.tenantId + - jsonPath: $.ProcessInstances.*.tenantId - - jsonPath: $.ProcessInstances.*.businessService + - jsonPath: $.ProcessInstances.*.businessService - - jsonPath: $.ProcessInstances.*.businessId + - jsonPath: $.ProcessInstances.*.businessId - - jsonPath: $.ProcessInstances.*.moduleName + - jsonPath: $.ProcessInstances.*.moduleName - - jsonPath: $.ProcessInstances.*.action + - jsonPath: $.ProcessInstances.*.action - - jsonPath: $.ProcessInstances.*.state.uuid + - jsonPath: $.ProcessInstances.*.state.uuid - - jsonPath: $.ProcessInstances.*.comment + - jsonPath: $.ProcessInstances.*.comment - - jsonPath: $.ProcessInstances.*.assigner.uuid + - jsonPath: $.ProcessInstances.*.assigner.uuid - - jsonPath: $.ProcessInstances.*.assignee.uuid + - jsonPath: $.ProcessInstances.*.stateSla - - jsonPath: $.ProcessInstances.*.stateSla + - jsonPath: $.ProcessInstances.*.businesssServiceSla - - jsonPath: $.ProcessInstances.*.businesssServiceSla + - jsonPath: $.ProcessInstances.*.previousStatus - - jsonPath: $.ProcessInstances.*.previousStatus + - jsonPath: $.ProcessInstances.*.auditDetails.createdBy - - jsonPath: $.ProcessInstances.*.auditDetails.createdBy + - jsonPath: $.ProcessInstances.*.auditDetails.lastModifiedBy - - jsonPath: $.ProcessInstances.*.auditDetails.lastModifiedBy + - jsonPath: $.ProcessInstances.*.auditDetails.createdTime - - jsonPath: $.ProcessInstances.*.auditDetails.createdTime + - jsonPath: $.ProcessInstances.*.auditDetails.lastModifiedTime - - jsonPath: $.ProcessInstances.*.auditDetails.lastModifiedTime + - query: INSERT INTO eg_wf_document_v2( id, tenantid, active, documenttype,documentUid, processinstanceid, filestoreid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: ProcessInstances.*.documents.* + jsonMaps: + - jsonPath: $.ProcessInstances.documents.*.id - - query: INSERT INTO eg_wf_document_v2( id, tenantid, active, documenttype,documentUid, processinstanceid, filestoreid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - basePath: ProcessInstances.*.documents.* - jsonMaps: - - jsonPath: $.ProcessInstances.documents.*.id + - jsonPath: $.ProcessInstances.documents.*.tenantId - - jsonPath: $.ProcessInstances.documents.*.tenantId + - jsonPath: $.ProcessInstances.documents.*.active - - jsonPath: $.ProcessInstances.documents.*.active + - jsonPath: $.ProcessInstances.documents.*.documentType - - jsonPath: $.ProcessInstances.documents.*.documentType + - jsonPath: $.ProcessInstances.documents.*.documentUid - - jsonPath: $.ProcessInstances.documents.*.documentUid + - jsonPath: $.ProcessInstances[*][?({id} in @.documents[*].id)].id - - jsonPath: $.ProcessInstances[*][?({id} in @.documents[*].id)].id + - jsonPath: $.ProcessInstances.documents.*.fileStoreId - - jsonPath: $.ProcessInstances.documents.*.fileStoreId + - jsonPath: $.ProcessInstances.documents.*.auditDetails.createdBy - - jsonPath: $.ProcessInstances.documents.*.auditDetails.createdBy + - jsonPath: $.ProcessInstances.documents.*.auditDetails.lastModifiedBy - - jsonPath: $.ProcessInstances.documents.*.auditDetails.lastModifiedBy + - jsonPath: $.ProcessInstances.documents.*.auditDetails.createdTime - - jsonPath: $.ProcessInstances.documents.*.auditDetails.createdTime + - jsonPath: $.ProcessInstances.documents.*.auditDetails.lastModifiedTime - - jsonPath: $.ProcessInstances.documents.*.auditDetails.lastModifiedTime + - query: INSERT INTO eg_wf_assignee_v2(processinstanceid, tenantid, assignee, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?); + basePath: ProcessInstances.*.assignes.* + jsonMaps: + - jsonPath: $.ProcessInstances[*][?({uuid} in @.assignes[*].uuid)].id + - jsonPath: $.ProcessInstances[*][?({uuid} in @.assignes[*].uuid)].tenantId + - jsonPath: $.ProcessInstances.*.assignes.*.uuid - - version: 1.0 - description: Persists BusinessService in the table - fromTopic: save-wf-businessservice - isTransaction: true - queryMaps: + - jsonPath: $.ProcessInstances[*][?({uuid} in @.assignes[*].uuid)].auditDetails.createdBy - - query: INSERT INTO eg_wf_businessservice_v2(businessServiceSla, businessservice, business, tenantid, uuid, geturi, posturi, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - basePath: BusinessServices.* - jsonMaps: - - jsonPath: $.BusinessServices.*.businessServiceSla + - jsonPath: $.ProcessInstances[*][?({uuid} in @.assignes[*].uuid)].auditDetails.lastModifiedBy - - jsonPath: $.BusinessServices.*.businessService + - jsonPath: $.ProcessInstances[*][?({uuid} in @.assignes[*].uuid)].auditDetails.createdTime - - jsonPath: $.BusinessServices.*.business + - jsonPath: $.ProcessInstances[*][?({uuid} in @.assignes[*].uuid)].auditDetails.lastModifiedTime - - jsonPath: $.BusinessServices.*.tenantId - - jsonPath: $.BusinessServices.*.uuid - - jsonPath: $.BusinessServices.*.geturi - - jsonPath: $.BusinessServices.*.posturi + - version: 1.0 + description: Persists BusinessService in the table + fromTopic: save-wf-businessservice + isTransaction: true + queryMaps: - - jsonPath: $.BusinessServices.*.auditDetails.createdBy + - query: INSERT INTO eg_wf_businessservice_v2(businessServiceSla, businessservice, business, tenantid, uuid, geturi, posturi, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: BusinessServices.* + jsonMaps: + - jsonPath: $.BusinessServices.*.businessServiceSla - - jsonPath: $.BusinessServices.*.auditDetails.createdTime + - jsonPath: $.BusinessServices.*.businessService - - jsonPath: $.BusinessServices.*.auditDetails.lastModifiedBy + - jsonPath: $.BusinessServices.*.business - - jsonPath: $.BusinessServices.*.auditDetails.lastModifiedTime + - jsonPath: $.BusinessServices.*.tenantId + - jsonPath: $.BusinessServices.*.uuid + - jsonPath: $.BusinessServices.*.geturi + - jsonPath: $.BusinessServices.*.posturi - - query: INSERT INTO eg_wf_state_v2(seq, uuid, tenantid, businessserviceid, state,applicationStatus,sla,docuploadrequired, isstartstate, isterminatestate,isStateUpdatable, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (nextval('seq_eg_wf_state_v2'),? , ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - basePath: BusinessServices.*.states.* - jsonMaps: - - jsonPath: $.BusinessServices.*.states.*.uuid + - jsonPath: $.BusinessServices.*.auditDetails.createdBy - - jsonPath: $.BusinessServices.*.states.*.tenantId + - jsonPath: $.BusinessServices.*.auditDetails.createdTime - - jsonPath: $.BusinessServices[*][?({uuid} in @.states[*].uuid)].uuid + - jsonPath: $.BusinessServices.*.auditDetails.lastModifiedBy - - jsonPath: $.BusinessServices.*.states.*.state + - jsonPath: $.BusinessServices.*.auditDetails.lastModifiedTime - - jsonPath: $.BusinessServices.*.states.*.applicationStatus - - jsonPath: $.BusinessServices.*.states.*.sla - - jsonPath: $.BusinessServices.*.states.*.docUploadRequired - - jsonPath: $.BusinessServices.*.states.*.isStartState + - query: INSERT INTO eg_wf_state_v2(seq, uuid, tenantid, businessserviceid, state,applicationStatus,sla,docuploadrequired, isstartstate, isterminatestate,isStateUpdatable, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (nextval('seq_eg_wf_state_v2'),? , ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: BusinessServices.*.states.* + jsonMaps: + - jsonPath: $.BusinessServices.*.states.*.uuid - - jsonPath: $.BusinessServices.*.states.*.isTerminateState + - jsonPath: $.BusinessServices.*.states.*.tenantId - - jsonPath: $.BusinessServices.*.states.*.isStateUpdatable + - jsonPath: $.BusinessServices[*][?({uuid} in @.states[*].uuid)].uuid - - jsonPath: $.BusinessServices.*.states.*.auditDetails.createdBy + - jsonPath: $.BusinessServices.*.states.*.state - - jsonPath: $.BusinessServices.*.states.*.auditDetails.createdTime + - jsonPath: $.BusinessServices.*.states.*.applicationStatus - - jsonPath: $.BusinessServices.*.states.*.auditDetails.lastModifiedBy + - jsonPath: $.BusinessServices.*.states.*.sla - - jsonPath: $.BusinessServices.*.states.*.auditDetails.lastModifiedTime + - jsonPath: $.BusinessServices.*.states.*.docUploadRequired + - jsonPath: $.BusinessServices.*.states.*.isStartState + - jsonPath: $.BusinessServices.*.states.*.isTerminateState - - query: INSERT INTO eg_wf_action_v2( uuid,tenantId, currentState, action, nextstate, roles, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - basePath: BusinessServices.*.states.*.actions.* - jsonMaps: - - jsonPath: $.BusinessServices.*.states.*.actions.*.uuid + - jsonPath: $.BusinessServices.*.states.*.isStateUpdatable - - jsonPath: $.BusinessServices.*.states.*.actions.*.tenantId + - jsonPath: $.BusinessServices.*.states.*.auditDetails.createdBy - - jsonPath: $.BusinessServices.*.states[*][?({uuid} in @.actions[*].uuid)].uuid + - jsonPath: $.BusinessServices.*.states.*.auditDetails.createdTime - - jsonPath: $.BusinessServices.*.states.*.actions.*.action + - jsonPath: $.BusinessServices.*.states.*.auditDetails.lastModifiedBy - - jsonPath: $.BusinessServices.*.states.*.actions.*.nextState + - jsonPath: $.BusinessServices.*.states.*.auditDetails.lastModifiedTime - - jsonPath: $.BusinessServices.*.states.*.actions.*.roles - type: ARRAY - dbType: STRING - - jsonPath: $.BusinessServices.*.states.*.actions.*.auditDetails.createdBy - - jsonPath: $.BusinessServices.*.states.*.actions.*.auditDetails.createdTime + - query: INSERT INTO eg_wf_action_v2( uuid,tenantId, currentState, action, nextstate, roles, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: BusinessServices.*.states.*.actions.* + jsonMaps: + - jsonPath: $.BusinessServices.*.states.*.actions.*.uuid - - jsonPath: $.BusinessServices.*.states.*.actions.*.auditDetails.lastModifiedBy + - jsonPath: $.BusinessServices.*.states.*.actions.*.tenantId - - jsonPath: $.BusinessServices.*.states.*.actions.*.auditDetails.lastModifiedTime + - jsonPath: $.BusinessServices.*.states[*][?({uuid} in @.actions[*].uuid)].uuid + - jsonPath: $.BusinessServices.*.states.*.actions.*.action + - jsonPath: $.BusinessServices.*.states.*.actions.*.nextState - - version: 1.0 - description: Persists BusinessService in the table - fromTopic: update-wf-businessservice - isTransaction: true - queryMaps: + - jsonPath: $.BusinessServices.*.states.*.actions.*.roles + type: ARRAY + dbType: STRING - - query: UPDATE eg_wf_businessservice_v2 SET businessservicesla=?,businessservice=?, business=?, geturi=?, posturi=?, lastmodifiedby=?, lastmodifiedtime=? WHERE uuid=?; - basePath: BusinessServices.* - jsonMaps: - - jsonPath: $.BusinessServices.*.businessServiceSla + - jsonPath: $.BusinessServices.*.states.*.actions.*.auditDetails.createdBy - - jsonPath: $.BusinessServices.*.businessService + - jsonPath: $.BusinessServices.*.states.*.actions.*.auditDetails.createdTime - - jsonPath: $.BusinessServices.*.business + - jsonPath: $.BusinessServices.*.states.*.actions.*.auditDetails.lastModifiedBy - - jsonPath: $.BusinessServices.*.geturi + - jsonPath: $.BusinessServices.*.states.*.actions.*.auditDetails.lastModifiedTime - - jsonPath: $.BusinessServices.*.posturi - - jsonPath: $.BusinessServices.*.auditDetails.lastModifiedBy - - jsonPath: $.BusinessServices.*.auditDetails.lastModifiedTime + - version: 1.0 + description: Persists BusinessService in the table + fromTopic: update-wf-businessservice + isTransaction: true + queryMaps: - - jsonPath: $.BusinessServices.*.uuid + - query: UPDATE eg_wf_businessservice_v2 SET businessservicesla=?,businessservice=?, business=?, geturi=?, posturi=?, lastmodifiedby=?, lastmodifiedtime=? WHERE uuid=?; + basePath: BusinessServices.* + jsonMaps: + - jsonPath: $.BusinessServices.*.businessServiceSla + - jsonPath: $.BusinessServices.*.businessService + - jsonPath: $.BusinessServices.*.business + - jsonPath: $.BusinessServices.*.geturi - - query: INSERT INTO eg_wf_state_v2(seq, uuid, tenantid, businessserviceid, state,applicationStatus,sla,docuploadrequired, isstartstate, isterminatestate,isStateUpdatable, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (nextval('seq_eg_wf_state_v2'), ?,?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (uuid) DO UPDATE SET state=EXCLUDED.state, docuploadrequired=EXCLUDED.docuploadrequired, isstartstate=EXCLUDED.isstartstate, isterminatestate=EXCLUDED.isterminatestate,isStateUpdatable=EXCLUDED.isStateUpdatable, lastmodifiedby=EXCLUDED.lastmodifiedby, lastmodifiedtime=EXCLUDED.lastmodifiedtime; - basePath: BusinessServices.*.states.* - jsonMaps: + - jsonPath: $.BusinessServices.*.posturi - - jsonPath: $.BusinessServices.*.states.*.uuid + - jsonPath: $.BusinessServices.*.auditDetails.lastModifiedBy - - jsonPath: $.BusinessServices.*.states.*.tenantId + - jsonPath: $.BusinessServices.*.auditDetails.lastModifiedTime - - jsonPath: $.BusinessServices[*][?({uuid} in @.states[*].uuid)].uuid + - jsonPath: $.BusinessServices.*.uuid - - jsonPath: $.BusinessServices.*.states.*.state - - jsonPath: $.BusinessServices.*.states.*.applicationStatus - - jsonPath: $.BusinessServices.*.states.*.sla - - jsonPath: $.BusinessServices.*.states.*.docUploadRequired + - query: INSERT INTO eg_wf_state_v2(seq, uuid, tenantid, businessserviceid, state,applicationStatus,sla,docuploadrequired, isstartstate, isterminatestate,isStateUpdatable, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (nextval('seq_eg_wf_state_v2'), ?,?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (uuid) DO UPDATE SET state=EXCLUDED.state,sla=EXCLUDED.sla,docuploadrequired=EXCLUDED.docuploadrequired,isstartstate=EXCLUDED.isstartstate, isterminatestate=EXCLUDED.isterminatestate,isStateUpdatable=EXCLUDED.isStateUpdatable, lastmodifiedby=EXCLUDED.lastmodifiedby, lastmodifiedtime=EXCLUDED.lastmodifiedtime; + basePath: BusinessServices.*.states.* + jsonMaps: - - jsonPath: $.BusinessServices.*.states.*.isStartState + - jsonPath: $.BusinessServices.*.states.*.uuid - - jsonPath: $.BusinessServices.*.states.*.isTerminateState + - jsonPath: $.BusinessServices.*.states.*.tenantId - - jsonPath: $.BusinessServices.*.states.*.isStateUpdatable + - jsonPath: $.BusinessServices[*][?({uuid} in @.states[*].uuid)].uuid - - jsonPath: $.BusinessServices.*.states.*.auditDetails.createdBy + - jsonPath: $.BusinessServices.*.states.*.state - - jsonPath: $.BusinessServices.*.states.*.auditDetails.createdTime + - jsonPath: $.BusinessServices.*.states.*.applicationStatus - - jsonPath: $.BusinessServices.*.states.*.auditDetails.lastModifiedBy + - jsonPath: $.BusinessServices.*.states.*.sla - - jsonPath: $.BusinessServices.*.states.*.auditDetails.lastModifiedTime + - jsonPath: $.BusinessServices.*.states.*.docUploadRequired - - query: INSERT INTO eg_wf_action_v2( uuid,tenantId, currentState, action, nextstate, roles, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (uuid) DO UPDATE SET action=EXCLUDED.action, nextstate=EXCLUDED.nextstate, roles=EXCLUDED.roles, lastmodifiedby=EXCLUDED.lastmodifiedby, lastmodifiedtime=EXCLUDED.lastmodifiedtime; - basePath: BusinessServices.*.states.*.actions.* - jsonMaps: + - jsonPath: $.BusinessServices.*.states.*.isStartState - - jsonPath: $.BusinessServices.*.states.*.actions.*.uuid + - jsonPath: $.BusinessServices.*.states.*.isTerminateState - - jsonPath: $.BusinessServices.*.states.*.actions.*.tenantId + - jsonPath: $.BusinessServices.*.states.*.isStateUpdatable - - jsonPath: $.BusinessServices.*.states[*][?({uuid} in @.actions[*].uuid)].uuid + - jsonPath: $.BusinessServices.*.states.*.auditDetails.createdBy - - jsonPath: $.BusinessServices.*.states.*.actions.*.action + - jsonPath: $.BusinessServices.*.states.*.auditDetails.createdTime - - jsonPath: $.BusinessServices.*.states.*.actions.*.nextState + - jsonPath: $.BusinessServices.*.states.*.auditDetails.lastModifiedBy - - jsonPath: $.BusinessServices.*.states.*.actions.*.roles - type: ARRAY - dbType: STRING + - jsonPath: $.BusinessServices.*.states.*.auditDetails.lastModifiedTime - - jsonPath: $.BusinessServices.*.states.*.actions.*.auditDetails.createdBy + - query: INSERT INTO eg_wf_action_v2( uuid,tenantId, currentState, action, nextstate, roles, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (uuid) DO UPDATE SET action=EXCLUDED.action, nextstate=EXCLUDED.nextstate, roles=EXCLUDED.roles, lastmodifiedby=EXCLUDED.lastmodifiedby, lastmodifiedtime=EXCLUDED.lastmodifiedtime; + basePath: BusinessServices.*.states.*.actions.* + jsonMaps: - - jsonPath: $.BusinessServices.*.states.*.actions.*.auditDetails.createdTime + - jsonPath: $.BusinessServices.*.states.*.actions.*.uuid - - jsonPath: $.BusinessServices.*.states.*.actions.*.auditDetails.lastModifiedBy + - jsonPath: $.BusinessServices.*.states.*.actions.*.tenantId - - jsonPath: $.BusinessServices.*.states.*.actions.*.auditDetails.lastModifiedTime + - jsonPath: $.BusinessServices.*.states[*][?({uuid} in @.actions[*].uuid)].uuid + + - jsonPath: $.BusinessServices.*.states.*.actions.*.action + + - jsonPath: $.BusinessServices.*.states.*.actions.*.nextState + + - jsonPath: $.BusinessServices.*.states.*.actions.*.roles + type: ARRAY + dbType: STRING + + - jsonPath: $.BusinessServices.*.states.*.actions.*.auditDetails.createdBy + + - jsonPath: $.BusinessServices.*.states.*.actions.*.auditDetails.createdTime + + - jsonPath: $.BusinessServices.*.states.*.actions.*.auditDetails.lastModifiedBy + + - jsonPath: $.BusinessServices.*.states.*.actions.*.auditDetails.lastModifiedTime From b30acbd8965bbdc41630ab61a5cee9cfa773de53 Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov Date: Tue, 11 Aug 2020 21:40:31 +0530 Subject: [PATCH 0038/1242] Updated property tax queries --- .../dashboard-analytics/ChartApiConfig.json | 47 +++++++++---------- 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index ee1aeb38..692bc78c 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -251,7 +251,7 @@ "queries": [ { "module": "PT", - "indexName": "ptindex-v1", + "indexName": "property-services", "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Total Application\":{\"value_count\":{\"field\":\"Data.propertyId.keyword\"}}}}}}", "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \r\n \"district\" : \"Data.tenantData.city.districtCode\", \r\n\"tenantId\" : \"Data.tenantId\" \r\n}", "dateRefField": "Data.@timestamp" @@ -297,7 +297,7 @@ "module": "PT", "dateRefField": "Data.@timestamp", "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \r\n \"district\" : \"Data.tenantData.city.districtCode\", \r\n\"tenantId\" : \"Data.tenantId\" \r\n}", - "indexName": "ptindex-v1", + "indexName": "property-services", "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Applications Closed\":{\"filter\":{\"bool\":{\"must\":[{\"terms\":{\"Data.status.keyword\":[\"closed\",\"resolved\"]}}]}},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.propertyId.keyword\"}}}}}}}}" }, { @@ -371,7 +371,7 @@ "module": "PT", "dateRefField": "Data.@timestamp", "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \r\n \"district\" : \"Data.tenantData.city.districtCode\", \r\n\"tenantId\" : \"Data.tenantId\" \r\n}", - "indexName": "ptindex-v1", + "indexName": "property-services", "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Property Tax\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}}" }, { @@ -410,7 +410,7 @@ "module": "PT", "dateRefField": "Data.@timestamp", "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \r\n \"district\" : \"Data.tenantData.city.districtCode\", \r\n\"tenantId\" : \"Data.tenantId.keyword\" \r\n}", - "indexName": "ptindex-v1", + "indexName": "property-services", "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Total Application\":{\"date_histogram\":{\"field\":\"Data.@timestamp\",\"interval\":\"intervalvalue\"},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.propertyId.keyword\"}}}},\"Closed Application\":{\"date_histogram\":{\"field\":\"Data.@timestamp\",\"interval\":\"intervalvalue\"},\"aggs\":{\"Applications Closed\":{\"filter\":{\"bool\":{\"must\":[{\"terms\":{\"Data.status.keyword\":[\"closed\",\"resolved\"]}}]}},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.propertyId.keyword\"}}}}}}}}}}" }, { @@ -459,7 +459,7 @@ "module": "PT", "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \"module\" : \"businessService.keyword\",\"tenantId\" : \"Data.tenantId\" , \"district\" : \"Data.tenantData.city.districtCode\"}", "dateRefField": "Data.@timestamp", - "indexName": "ptindex-v1", + "indexName": "property-services", "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Closed Application\":{\"filter\":{\"exists\":{\"field\":\"Data.propertyId.keyword\"}},\"aggs\":{\"count\":{\"terms\":{\"field\":\"Data.tenantId.keyword\"},\"aggs\":{\"tenant_count\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}},\"Total Application\":{\"terms\":{\"field\":\"Data.tenantId.keyword\"},\"aggs\":{\"tenant_count\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}}}}" }, { @@ -500,7 +500,7 @@ "module": "PT", "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \"module\" : \"businessService.keyword\",\"tenantId\" : \"Data.tenantId\" ,\"district\" : \"Data.tenantData.city.districtCode\"}", "dateRefField": "Data.@timestamp", - "indexName": "ptindex-v1", + "indexName": "property-services", "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Closed Application\":{\"filter\":{\"exists\":{\"field\":\"Data.propertyId.keyword\"}},\"aggs\":{\"count\":{\"terms\":{\"field\":\"Data.tenantId.keyword\"},\"aggs\":{\"tenant_count\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}},\"Total Application\":{\"terms\":{\"field\":\"Data.tenantId.keyword\"},\"aggs\":{\"tenant_count\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}}}}" }, { @@ -584,10 +584,10 @@ "queries": [ { "module": "PT", - "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\",\"module\" : \"Data.Bill.billDetails.businessService.keyword\", \"tenantId\" : \"Data.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\"}", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"Data.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\"}", "dateRefField": "Data.@timestamp", - "indexName": "ptindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Usage Type\":{\"terms\":{\"field\":\"Data.propertyDetails.units.usageCategoryMajor.keyword\"},\"aggs\":{\"Assessed Properties\":{\"value_count\":{\"field\":\"Data.propertyDetails.assessmentNumber.keyword\"}}}}}}}}" + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}}],\"must\":{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\"]}}}},\"aggs\":{\"Usage Type\":{\"terms\":{\"field\":\"domainObject.units.usageCategory.keyword\"}},\"Assessed Properties\":{\"nested\":{\"path\":\"domainObject.assessmentsDetails\"},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"domainObject.assessmentsDetails.assessmentNumber.keyword\"}}}}}}}}" } ], @@ -608,7 +608,7 @@ "queries": [ { "module": "PT", - "indexName": "ptindex-v1", + "indexName": "property-services", "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Assessed Properties\":{\"value_count\":{\"field\":\"Data.propertyId.keyword\"}}}}}}", "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\",\"tenantId\" : \"Data.tenantId\" ,\"district\" : \"Data.tenantData.city.districtCode\"}", "dateRefField": "Data.@timestamp" @@ -638,11 +638,10 @@ "queries": [ { "module": "PT", - "indexName": "ptindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Assessed Properties\":{\"value_count\":{\"field\":\"Data.propertyDetails.assessmentNumber.keyword\"}}}}}}", - - "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \"tenantId\" : \"Data.tenantId\" ,\"district\" : \"Data.tenantData.city.districtCode\"}", - "dateRefField": "Data.@timestamp" + "indexName": "property-assessments", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}],\"must\":{\"term\":{\"dataObject.paymentDetails.businessService.keyword\":\"PT\"}}}},\"aggs\":{\"Assessed Properties\":{\"nested\":{\"path\":\"domainObject.assessmentsDetails\"},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"domainObject.assessmentsDetails.assessmentNumber.keyword\"}}}}}}}}", + "requestQueryMap": "{\"wardId\" : \"dataObject.tenantData.city.districtCode.keyword\", \"tenantId\" : \"dataObject.tenantId\" ,\"district\" : \"Data.tenantData.city.districtCode\"}", + "dateRefField": "dataObject.paymentDetails.receiptDate" } ], "chartType": "metric", @@ -669,8 +668,8 @@ "queries": [ { "module": "PT", - "indexName": "ptindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Collections\":{\"date_histogram\":{\"field\":\"Data.@timestamp\",\"interval\":\"intervalvalue\"},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.propertyDetails.assessmentNumber.keyword\"}}}}}}}}", + "indexName": "property-assessments", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Collections\":{\"date_histogram\":{\"field\":\"Data.@timestamp\",\"interval\":\"intervalvalue\"},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.assessmentNumber.keyword\"}}}}}}}}", "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \"tenantId\" : \"Data.tenantId\" ,\"district\" : \"Data.tenantData.city.districtCode\"}", "dateRefField": "Data.@timestamp" } @@ -696,7 +695,7 @@ "module": "PT", "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \"tenantId\" : \"Data.tenantId\"}", "dateRefField": "Data.@timestamp", - "indexName": "ptindex-v1", + "indexName": "property-services", "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Active ULBs\":{\"cardinality\":{\"field\":\"Data.tenantId.keyword\"}}}}}}" }, { @@ -1890,14 +1889,14 @@ "module": "PT", "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\",\"tenantId\" : \"Data.tenantId.keyword\" }", "dateRefField": "Data.@timestamp", - "indexName": "ptindex-v1", + "indexName": "property-services", "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Fys\":{\"terms\":{\"field\":\"Data.propertyDetails.financialYear.keyword\",\"min_doc_count\":0}}}}}}" }, { "module": "PT", "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \"tenantId\" : \"Data.tenantId.keyword\" }", "dateRefField": "Data.@timestamp", - "indexName": "ptindex-v1", + "indexName": "property-services", "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Total\":{\"value_count\":{\"field\":\"Data.propertyDetails.assessmentNumber.keyword\"}}}}}}}}" } ], @@ -1920,14 +1919,14 @@ "module": "PT", "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\",\"tenantId\" : \"Data.tenantId.keyword\" }", "dateRefField": "Data.@timestamp", - "indexName": "ptindex-v1", + "indexName": "property-services", "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"ULBS \":{\"terms\":{\"field\":\"Data.tenantId.keyword\"},\"aggs\":{\"Fys\":{\"terms\":{\"field\":\"Data.propertyDetails.financialYear.keyword\",\"min_doc_count\":0}}}}}}}}" }, { "module": "PT", "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\",\"tenantId\" : \"Data.tenantId.keyword\" }", "dateRefField": "Data.@timestamp", - "indexName": "ptindex-v1", + "indexName": "property-services", "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"ULBS \":{\"terms\":{\"field\":\"Data.tenantId.keyword\"},\"aggs\":{\"Total\":{\"value_count\":{\"field\":\"Data.propertyDetails.assessmentNumber.keyword\"}}}}}}}}" } ], @@ -1949,14 +1948,14 @@ "module": "PT", "requestQueryMap": "{\"tenantId\" : \"Data.tenantId.keyword\" , \"wardId\" : \"Data.ward.name.keyword\"}", "dateRefField": "Data.@timestamp", - "indexName": "ptindex-v1", + "indexName": "property-services", "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Ward \":{\"terms\":{\"field\":\"Data.ward.name.keyword\"},\"aggs\":{\"Fys\":{\"terms\":{\"field\":\"Data.propertyDetails.financialYear.keyword\",\"min_doc_count\":0}}}}}}}}" }, { "module": "PT", "requestQueryMap": "{\"tenantId\" : \"Data.tenantId.keyword\" , \"wardId\" : \"Data.ward.name.keyword\"}", "dateRefField": "Data.@timestamp", - "indexName": "ptindex-v1", + "indexName": "property-services", "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Ward \":{\"terms\":{\"field\":\"Data.ward.name.keyword\"},\"aggs\":{\"Total\":{\"value_count\":{\"field\":\"Data.propertyDetails.assessmentNumber.keyword\"}}}}}}}}" } ], From 1c90afe681b76298b1c22b2e129baa703aa454e5 Mon Sep 17 00:00:00 2001 From: gurpreetsinghkhanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 12 Aug 2020 13:13:32 +0530 Subject: [PATCH 0039/1242] tl-report-fix-for-QA --- configs/reports/configs/tl-reports.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/reports/configs/tl-reports.yml b/configs/reports/configs/tl-reports.yml index af4cb95e..d1e15940 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -1318,13 +1318,13 @@ ReportDefinitions: type: epoch source: tl isMandatory: false - searchClause: AND receipt.createddate >= $fromDate + searchClause: AND egcl_paymentdetail.receiptdate >= $fromDate - name: toDate label: reports.tl.toDate type: epoch source: tl isMandatory: false - searchClause: AND receipt.createddate <= $toDate + searchClause: AND egcl_paymentdetail.receiptdate <= $toDate - name: collectorname label: reports.uc.collectorname type: singlevaluelist @@ -1950,13 +1950,13 @@ ReportDefinitions: type: epoch source: tl isMandatory: false - searchClause: AND rh.receiptdate >= $fromDate + searchClause: AND paydetail.receiptdate >= $fromDate - name: toDate label: reports.tl.toDate type: epoch source: tl isMandatory: false - searchClause: AND rh.receiptdate <= $toDate + searchClause: AND paydetail.receiptdate <= $toDate - name: ulb label: ULB type: singlevaluelist From af24e26734ef9e7faf7d322aa03f6b68d848dc69 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 12 Aug 2020 16:47:29 +0530 Subject: [PATCH 0040/1242] Update consolidatedreceipt.json --- configs/pdf-service/format-config/consolidatedreceipt.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/pdf-service/format-config/consolidatedreceipt.json b/configs/pdf-service/format-config/consolidatedreceipt.json index 2907b364..feda3407 100644 --- a/configs/pdf-service/format-config/consolidatedreceipt.json +++ b/configs/pdf-service/format-config/consolidatedreceipt.json @@ -284,7 +284,7 @@ "style": "receipt-table" }, { - "text": "", + "text": " ", "border": [ false, false, @@ -294,7 +294,7 @@ "style": "receipt-table-value" }, { - "text": "", + "text": " ", "border": [ false, false, From ff732af2494bca88f77347894c6d601313f94f83 Mon Sep 17 00:00:00 2001 From: narendrabandhamneni-wt-egov Date: Thu, 13 Aug 2020 16:55:46 +0530 Subject: [PATCH 0041/1242] migration issue fix --- ...property-services-migration-temp-config.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/configs/egov-persister/property-services-migration-temp-config.yml b/configs/egov-persister/property-services-migration-temp-config.yml index a4e65f92..fa057f50 100644 --- a/configs/egov-persister/property-services-migration-temp-config.yml +++ b/configs/egov-persister/property-services-migration-temp-config.yml @@ -398,3 +398,21 @@ serviceMaps: - jsonPath: $.Property.auditDetails.lastModifiedTime - jsonPath: $.Property.units.*.id + + + - query: UPDATE eg_pt_unit SET active=false WHERE propertyid=? AND createdtime < (SELECT MAXTIME FROM (SELECT propertyid,MAX(createdtime) AS MAXTIME FROM eg_pt_unit GROUP BY propertyid) AS UNIT WHERE propertyid=?); + basePath: Property + jsonMaps: + + - jsonPath: $.Property.id + + - jsonPath: $.Property.id + + + - query: UPDATE eg_pt_owner SET status='INACTIVE' WHERE propertyid=? AND createdtime < (SELECT MAXTIME FROM (SELECT propertyid,MAX(createdtime) AS MAXTIME FROM eg_pt_owner GROUP BY propertyid) AS OWNER WHERE propertyid=?); + basePath: Property + jsonMaps: + + - jsonPath: $.Property.id + + - jsonPath: $.Property.id From 20d7f845a5dbe8d4b0654e7e3e093efce650f6b7 Mon Sep 17 00:00:00 2001 From: gurpreetsinghkhanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 14 Aug 2020 08:12:10 +0530 Subject: [PATCH 0042/1242] TL v2 report fix applied as suggested by testing --- configs/reports/configs/tl-reports.yml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/tl-reports.yml b/configs/reports/configs/tl-reports.yml index d1e15940..caed106e 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -1475,13 +1475,13 @@ ReportDefinitions: type: epoch source: tl isMandatory: false - searchClause: AND receipt.createddate >= $fromDate + searchClause: AND paydetail.receiptdate >= $fromDate - name: toDate label: reports.tl.toDate type: epoch source: tl isMandatory: false - searchClause: AND receipt.createddate <= $toDate + searchClause: AND paydetail.receiptdate <= $toDate query: | SELECT initcap(split_part(tl.tenantId, '.', 2)) as tenantId, @@ -2184,6 +2184,11 @@ ReportDefinitions: type: string source: tl total: false + - name: locality + label: report.tl.locality + type: string + source: tl + total: false - name: propertyid label: report.tl.propertyid type: string @@ -2244,6 +2249,11 @@ ReportDefinitions: type: string source: tl total: true + - name: status + label: report.tl.receipt.status + type: string + source: tl + total: false searchParams: - name: fromDate label: reports.tl.fromDate From 0d01a3e3aeed7fcdf1836168d89580a9e626156c Mon Sep 17 00:00:00 2001 From: gurpreetsinghkhanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Sat, 15 Aug 2020 13:49:43 +0530 Subject: [PATCH 0043/1242] TL Certificate pdf update digit v2 --- .../data-config/tlcertificate.json | 12 ++ .../format-config/tlcertificate.json | 141 ++++++++---------- 2 files changed, 75 insertions(+), 78 deletions(-) diff --git a/configs/pdf-service/data-config/tlcertificate.json b/configs/pdf-service/data-config/tlcertificate.json index 916d6991..03e4a387 100644 --- a/configs/pdf-service/data-config/tlcertificate.json +++ b/configs/pdf-service/data-config/tlcertificate.json @@ -363,6 +363,18 @@ "prefix": null, "module":"rainmaker-common" } + }, + { + "variable": "disclaimer", + "value": { + "path": "TL_CERTIFICATE_DISCLAIMER" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } } ] }, diff --git a/configs/pdf-service/format-config/tlcertificate.json b/configs/pdf-service/format-config/tlcertificate.json index 8a679479..c80c0779 100644 --- a/configs/pdf-service/format-config/tlcertificate.json +++ b/configs/pdf-service/format-config/tlcertificate.json @@ -4,31 +4,36 @@ "defaultStyle": { "font": "Cambay" }, - "content": [ + + "content": [ { "style":"noc-head", "table":{ "widths":[ "*" ], - "body":[ - [ - { - "image": "{{userpic}}", + "body":[ + [ + + { + "style":"noc-head", + "table": + { + "widths":["30%","*"], + "body": + [ + [ + { + "image": "{{logoImage}}", "width": 70, "height": 82, "alignment": "center", - "margin": [ - 0, - 10, - 0, - 10 - ] - } - ], - [ - { - "stack": [ + "margin": [30, 40, 0,10 ] + }, + + { + "stack": + [ { "text":"{{municipal_corportaion}}", "style":"receipt-logo-header" @@ -38,72 +43,39 @@ "style":"receipt-logo-sub-header" }, { - "style": "noc-head", - "table": { - "widths": [ - "*", - "*" - ], - "body": [ - [ - { - "text": "{{corporation_contact}} : {{corporationContact}} ", - "style": "receipt-sub-address-sub-header" + "text": "{{corporation_contact}} : {{corporationContact}} ", + "style": "receipt-logo-sub-header" - } - ] - ] - }, - "layout": "noBorders" - }, - { - "style": "noc-head", - "table": { - "widths": [ - "*", - "*" - ], - "body": [ - [ - { + }, + { "text": "{{corporation_website}} : {{corporationWebsite}}", - "style": "receipt-sub-website-sub-header" + "style": "receipt-logo-sub-header" - } - ] - ] - }, - "layout": "noBorders" - }, - { - "style": "noc-head", - "table": { - "widths": [ - "*", - "*" - ], - "body": [ - [ - { + }, + { "text": "{{corporation_email}} : {{corporationEmail}}", - "style": "receipt-sub-email-sub-header" + "style": "receipt-logo-sub-header" } - ] - ] - }, - "layout": "noBorders" - } - ], - "alignment":"left", - "margin":[ - 0, - 10, - 0, - 0 - ] - } + ], + "alignment":"left", + "margin":[0,40,0,0] + + + + + + } + ] + ] + }, + "layout":"noBorders" + } + ], + + + [ { "stack": [ @@ -437,9 +409,16 @@ "alignment":"right" } ] + }, + { + "text":"\n\n\n Disclaimer\nThis license is not the proof of ownership.\nThis Trade License is issued under rule 10.39 of the Municipal Account Code 2017 with condition that the applicant shall obtain relevant NOC from concerned\ndepartments like Punjab Pollution control board / Fire Ofce /Health Department/ Excise Department/Deputy Commissioner (under Explosive Act) whichever\napplicable. The Municipal Council/Corporation reserves the right to cancel this Trade License for Breach of any condition in accordance with law.\nThis is a computer generated document, hence requires no signature.\nThe grant of Trade License is not approval to any violation of building by laws, town planning scheme.", + "style":"disclaimer" + } ], - "styles": { + + + "styles": { "noc-head": { "margin": [ -30, @@ -543,7 +522,13 @@ -110, 0 ] - } - } + }, + "disclaimer": + { + "fontSize":"10" + } + } + + } } \ No newline at end of file From 7c48b7da86c2bc96d405ef4bcd6f31dee4e37899 Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov Date: Sun, 16 Aug 2020 12:53:35 +0530 Subject: [PATCH 0044/1242] Updated PT ChartApiConfig queries --- .../dashboard-analytics/ChartApiConfig.json | 239 +++++++++--------- .../transform_collection_v1.json | 2 +- 2 files changed, 120 insertions(+), 121 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 191a0793..692bc78c 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -6,17 +6,17 @@ "queries": [ { "module": "PT", - "dateRefField": "dataObject.Bill.billDetails.receiptDate", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.Bill.billDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.cityDistrictCode\"}", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\"}", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.Bill.billDetails.status.keyword\":[\"Cancelled\"]}}],\"must\":[{\"term\":{\"dataObject.Bill.billDetails.businessService.keyword\":\"PT\"}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.amountPaid\"}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}],\"must\":[{\"term\":{\"dataObject.paymentDetails.businessService.keyword\":\"PT\"}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" }, { "module": "TL", - "dateRefField": "dataObject.Bill.billDetails.receiptDate", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.Bill.billDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.cityDistrictCode\"}", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\"}", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.Bill.billDetails.status.keyword\":[\"Cancelled\"]}}],\"must\":[{\"term\":{\"dataObject.Bill.billDetails.businessService.keyword\":\"TL\"}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.amountPaid\"}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}],\"must\":[{\"term\":{\"dataObject.paymentDetails.businessService.keyword\":\"TL\"}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" } ], "chartType": "metric", @@ -43,10 +43,10 @@ "queries": [ { "module": "COMMON", - "dateRefField": "dataObject.Bill.billDetails.receiptDate", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\r\n \"module\" : \"dataObject.Bill.billDetails.businessService.keyword\", \n\"tenantId\" : \"dataObject.tenantId\"}", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\r\n \"module\" : \"dataObject.paymentDetails.businessService.keyword\", \n\"tenantId\" : \"dataObject.tenantId\"}", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.Bill.billDetails.status.keyword\":[\"Cancelled\"]}}],\"must\":[{\"terms\":{\"dataObject.Bill.billDetails.businessService.keyword\":[\"PT\",\"TL\"]}}]}},\"aggs\":{\"Collections\":{\"date_histogram\":{\"field\":\"dataObject.Bill.billDetails.receiptDate\",\"interval\":\"intervalvalue\"},\"aggs\":{\"Sum\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.amountPaid\"}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}],\"must\":[{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\"]}}]}},\"aggs\":{\"Collections\":{\"date_histogram\":{\"field\":\"dataObject.paymentDetails.receiptDate\",\"interval\":\"intervalvalue\"},\"aggs\":{\"Sum\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" } ], "chartType": "line", @@ -75,10 +75,10 @@ }, { "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\r\n \"district\" : \"dataObject.tenantData.cityDistrictCode\", \"module\" : \"dataObject.Bill.billDetails.businessService.keyword\", \n\"tenantId\" : \"dataObject.tenantId\"}", - "dateRefField": "dataObject.Bill.billDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\r\n \"district\" : \"dataObject.tenantData.city.districtCode\", \"module\" : \"dataObject.paymentDetails.businessService.keyword\", \n\"tenantId\" : \"dataObject.tenantId\"}", + "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.Bill.billDetails.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.amountPaid\"}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" } ], @@ -107,17 +107,17 @@ "queries": [ { "module": "PT", - "dateRefField": "dataObject.Bill.billDetails.receiptDate", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.Bill.billDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.cityDistrictCode\"}", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\"}", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.Bill.billDetails.status.keyword\":[\"Cancelled\"]}}],\"must\":[{\"term\":{\"dataObject.Bill.billDetails.businessService.keyword\":\"PT\"}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.amountPaid\"}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}],\"must\":[{\"term\":{\"dataObject.paymentDetails.businessService.keyword\":\"PT\"}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" }, { "module": "TL", - "dateRefField": "dataObject.Bill.billDetails.receiptDate", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.Bill.billDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.cityDistrictCode\"}", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\"}", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.Bill.billDetails.status.keyword\":[\"Cancelled\"]}}],\"must\":[{\"term\":{\"dataObject.Bill.billDetails.businessService.keyword\":\"TL\"}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.amountPaid\"}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}],\"must\":[{\"term\":{\"dataObject.paymentDetails.businessService.keyword\":\"TL\"}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" } ], "chartType": "metric", @@ -137,10 +137,10 @@ "queries": [ { "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.Bill.billDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.cityDistrictCode\"}", - "dateRefField": "dataObject.Bill.billDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\"}", + "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.Bill.billDetails.status.keyword\":[\"Cancelled\"]}}],\"must\":[{\"terms\":{\"dataObject.Bill.billDetails.businessService.keyword\":[\"PT\",\"TL\"]}}]}},\"aggs\":{\"Business Service\":{\"terms\":{\"field\":\"dataObject.Bill.billDetails.businessService.keyword\"},\"aggs\":{\"total\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.amountPaid\"}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}],\"must\":[{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\"]}}]}},\"aggs\":{\"Business Service\":{\"terms\":{\"field\":\"dataObject.paymentDetails.businessService.keyword\"},\"aggs\":{\"total\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" } ], "chartType": "pie", @@ -167,10 +167,10 @@ }, { "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\r\n \"module\" : \"dataObject.Bill.billDetails.businessService.keyword\", \n\"tenantId\" : \"dataObject.tenantId\"}", - "dateRefField": "dataObject.Bill.billDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\r\n \"module\" : \"dataObject.paymentDetails.businessService.keyword\", \n\"tenantId\" : \"dataObject.tenantId\"}", + "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.Bill.billDetails.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Total Collection\":{\"terms\":{\"field\":\"dataObject.tenantId.keyword\",\"size\":\"200\",\"order\":{\"Sum\":\"desc\"}},\"aggs\":{\"Sum\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.amountPaid\"}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Total Collection\":{\"terms\":{\"field\":\"dataObject.tenantId.keyword\",\"size\":\"200\",\"order\":{\"Sum\":\"desc\"}},\"aggs\":{\"Sum\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" } ], "chartType": "perform", @@ -200,10 +200,10 @@ }, { "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.Bill.billDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\" }", - "dateRefField": "dataObject.Bill.billDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\" }", + "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.Bill.billDetails.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Total Collection\":{\"terms\":{\"field\":\"dataObject.tenantId.keyword\",\"size\":\"200\",\"order\":{\"Sum\":\"asc\"}},\"aggs\":{\"Sum\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.amountPaid\"}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Total Collection\":{\"terms\":{\"field\":\"dataObject.tenantId.keyword\",\"size\":\"200\",\"order\":{\"Sum\":\"asc\"}},\"aggs\":{\"Sum\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" } ], "chartType": "perform", @@ -226,10 +226,10 @@ "queries": [ { "module": "COMMON", - "requestQueryMap": "{\"module\" : \"dataObject.Bill.billDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantData.code\", \"district\" : \"dataObject.tenantData.cityDistrictCode\"}", - "dateRefField": "dataObject.Bill.billDetails.receiptDate", + "requestQueryMap": "{\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantData.code\", \"district\" : \"dataObject.tenantData.city.districtCode\"}", + "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.Bill.billDetails.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"License Instrument Type\":{\"terms\":{\"field\":\"dataObject.instrument.typeName.keyword\"},\"aggs\":{\"Licens Issued\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.amountPaid\"}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"License Instrument Type\":{\"terms\":{\"field\":\"dataObject.instrument.typeName.keyword\"},\"aggs\":{\"Licens Issued\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" } ], "chartType": "pie", @@ -251,7 +251,7 @@ "queries": [ { "module": "PT", - "indexName": "ptindex-v1", + "indexName": "property-services", "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Total Application\":{\"value_count\":{\"field\":\"Data.propertyId.keyword\"}}}}}}", "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \r\n \"district\" : \"Data.tenantData.city.districtCode\", \r\n\"tenantId\" : \"Data.tenantId\" \r\n}", "dateRefField": "Data.@timestamp" @@ -297,7 +297,7 @@ "module": "PT", "dateRefField": "Data.@timestamp", "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \r\n \"district\" : \"Data.tenantData.city.districtCode\", \r\n\"tenantId\" : \"Data.tenantId\" \r\n}", - "indexName": "ptindex-v1", + "indexName": "property-services", "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Applications Closed\":{\"filter\":{\"bool\":{\"must\":[{\"terms\":{\"Data.status.keyword\":[\"closed\",\"resolved\"]}}]}},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.propertyId.keyword\"}}}}}}}}" }, { @@ -371,7 +371,7 @@ "module": "PT", "dateRefField": "Data.@timestamp", "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \r\n \"district\" : \"Data.tenantData.city.districtCode\", \r\n\"tenantId\" : \"Data.tenantId\" \r\n}", - "indexName": "ptindex-v1", + "indexName": "property-services", "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Property Tax\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}}" }, { @@ -410,7 +410,7 @@ "module": "PT", "dateRefField": "Data.@timestamp", "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \r\n \"district\" : \"Data.tenantData.city.districtCode\", \r\n\"tenantId\" : \"Data.tenantId.keyword\" \r\n}", - "indexName": "ptindex-v1", + "indexName": "property-services", "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Total Application\":{\"date_histogram\":{\"field\":\"Data.@timestamp\",\"interval\":\"intervalvalue\"},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.propertyId.keyword\"}}}},\"Closed Application\":{\"date_histogram\":{\"field\":\"Data.@timestamp\",\"interval\":\"intervalvalue\"},\"aggs\":{\"Applications Closed\":{\"filter\":{\"bool\":{\"must\":[{\"terms\":{\"Data.status.keyword\":[\"closed\",\"resolved\"]}}]}},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.propertyId.keyword\"}}}}}}}}}}" }, { @@ -459,7 +459,7 @@ "module": "PT", "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \"module\" : \"businessService.keyword\",\"tenantId\" : \"Data.tenantId\" , \"district\" : \"Data.tenantData.city.districtCode\"}", "dateRefField": "Data.@timestamp", - "indexName": "ptindex-v1", + "indexName": "property-services", "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Closed Application\":{\"filter\":{\"exists\":{\"field\":\"Data.propertyId.keyword\"}},\"aggs\":{\"count\":{\"terms\":{\"field\":\"Data.tenantId.keyword\"},\"aggs\":{\"tenant_count\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}},\"Total Application\":{\"terms\":{\"field\":\"Data.tenantId.keyword\"},\"aggs\":{\"tenant_count\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}}}}" }, { @@ -500,7 +500,7 @@ "module": "PT", "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \"module\" : \"businessService.keyword\",\"tenantId\" : \"Data.tenantId\" ,\"district\" : \"Data.tenantData.city.districtCode\"}", "dateRefField": "Data.@timestamp", - "indexName": "ptindex-v1", + "indexName": "property-services", "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Closed Application\":{\"filter\":{\"exists\":{\"field\":\"Data.propertyId.keyword\"}},\"aggs\":{\"count\":{\"terms\":{\"field\":\"Data.tenantId.keyword\"},\"aggs\":{\"tenant_count\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}},\"Total Application\":{\"terms\":{\"field\":\"Data.tenantId.keyword\"},\"aggs\":{\"tenant_count\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}}}}" }, { @@ -559,10 +559,10 @@ "queries": [ { "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.Bill.billDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.cityDistrictCode\" }", - "dateRefField": "dataObject.Bill.billDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", + "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.Bill.billDetails.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"attrs_root\":{\"nested\":{\"path\":\"domainObject.propertyDetails.units\"},\"aggs\":{\"Usage Type\":{\"terms\":{\"field\":\"domainObject.propertyDetails.units.usageCategoryMajor.keyword\",\"size\":200}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"attrs_root\":{\"nested\":{\"path\":\"domainObject.units\"},\"aggs\":{\"Usage Type\":{\"terms\":{\"field\":\"domainObject.units.usageCategory.keyword\",\"size\":200}}}}}}}}" } ], "chartType": "pie", @@ -584,10 +584,10 @@ "queries": [ { "module": "PT", - "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\",\"module\" : \"Data.Bill.billDetails.businessService.keyword\", \"tenantId\" : \"Data.tenantId\", \"district\" : \"dataObject.tenantData.cityDistrictCode\"}", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"Data.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\"}", "dateRefField": "Data.@timestamp", - "indexName": "ptindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Usage Type\":{\"terms\":{\"field\":\"Data.propertyDetails.units.usageCategoryMajor.keyword\"},\"aggs\":{\"Assessed Properties\":{\"value_count\":{\"field\":\"Data.propertyDetails.assessmentNumber.keyword\"}}}}}}}}" + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}}],\"must\":{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\"]}}}},\"aggs\":{\"Usage Type\":{\"terms\":{\"field\":\"domainObject.units.usageCategory.keyword\"}},\"Assessed Properties\":{\"nested\":{\"path\":\"domainObject.assessmentsDetails\"},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"domainObject.assessmentsDetails.assessmentNumber.keyword\"}}}}}}}}" } ], @@ -608,7 +608,7 @@ "queries": [ { "module": "PT", - "indexName": "ptindex-v1", + "indexName": "property-services", "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Assessed Properties\":{\"value_count\":{\"field\":\"Data.propertyId.keyword\"}}}}}}", "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\",\"tenantId\" : \"Data.tenantId\" ,\"district\" : \"Data.tenantData.city.districtCode\"}", "dateRefField": "Data.@timestamp" @@ -638,11 +638,10 @@ "queries": [ { "module": "PT", - "indexName": "ptindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Assessed Properties\":{\"value_count\":{\"field\":\"Data.propertyDetails.assessmentNumber.keyword\"}}}}}}", - - "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \"tenantId\" : \"Data.tenantId\" ,\"district\" : \"Data.tenantData.city.districtCode\"}", - "dateRefField": "Data.@timestamp" + "indexName": "property-assessments", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}],\"must\":{\"term\":{\"dataObject.paymentDetails.businessService.keyword\":\"PT\"}}}},\"aggs\":{\"Assessed Properties\":{\"nested\":{\"path\":\"domainObject.assessmentsDetails\"},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"domainObject.assessmentsDetails.assessmentNumber.keyword\"}}}}}}}}", + "requestQueryMap": "{\"wardId\" : \"dataObject.tenantData.city.districtCode.keyword\", \"tenantId\" : \"dataObject.tenantId\" ,\"district\" : \"Data.tenantData.city.districtCode\"}", + "dateRefField": "dataObject.paymentDetails.receiptDate" } ], "chartType": "metric", @@ -669,8 +668,8 @@ "queries": [ { "module": "PT", - "indexName": "ptindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Collections\":{\"date_histogram\":{\"field\":\"Data.@timestamp\",\"interval\":\"intervalvalue\"},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.propertyDetails.assessmentNumber.keyword\"}}}}}}}}", + "indexName": "property-assessments", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Collections\":{\"date_histogram\":{\"field\":\"Data.@timestamp\",\"interval\":\"intervalvalue\"},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.assessmentNumber.keyword\"}}}}}}}}", "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \"tenantId\" : \"Data.tenantId\" ,\"district\" : \"Data.tenantData.city.districtCode\"}", "dateRefField": "Data.@timestamp" } @@ -696,7 +695,7 @@ "module": "PT", "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \"tenantId\" : \"Data.tenantId\"}", "dateRefField": "Data.@timestamp", - "indexName": "ptindex-v1", + "indexName": "property-services", "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Active ULBs\":{\"cardinality\":{\"field\":\"Data.tenantId.keyword\"}}}}}}" }, { @@ -735,10 +734,10 @@ "queries": [ { "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.Bill.billDetails.businessService.keyword\", \"usageId\" : \"domainObject.propertyDetails.usageCategoryMajor.keyword\",\"minorUsageId\" : \"domainObject.propertyDetails.usageCategoryMinor.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.cityDistrictCode\" }", - "dateRefField": "dataObject.Bill.billDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"usageId\" : \"domainObject.units.usageCategory.keyword\",\"minorUsageId\" : \"domainObject.units.usageCategory.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", + "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.Bill.billDetails.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.amountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.transactionId.keyword\"}},\"Assessed Properties\":{\"nested\":{\"path\":\"domainObject.propertyDetails\"},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"domainObject.propertyDetails.assessmentNumber.keyword\"}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.paymentDetails.billId.keyword\"}},\"Assessed Properties\":{\"nested\":{\"path\":\"domainObject.assessmentsDetails\"},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"domainObject.assessmentsDetails.assessmentNumber.keyword\"}}}}}}}}" }, { "module": "COMMON", @@ -788,10 +787,10 @@ "queries": [ { "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.Bill.billDetails.businessService.keyword\", \"usageId\" : \"domainObject.propertyDetails.usageCategoryMajor.keyword\",\"minorUsageId\" : \"domainObject.propertyDetails.usageCategoryMinor.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.cityDistrictCode\" }", - "dateRefField": "dataObject.Bill.billDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"usageId\" : \"domainObject.units.usageCategory.keyword\",\"minorUsageId\" : \"domainObject.units.usageCategory.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", + "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.Bill.billDetails.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"ULBs \":{\"terms\":{\"field\":\"domainObject.tenantId.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.amountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.transactionId.keyword\"}},\"Assessed Properties\":{\"nested\":{\"path\":\"domainObject.propertyDetails\"},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"domainObject.propertyDetails.assessmentNumber.keyword\"}}}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"ULBs \":{\"terms\":{\"field\":\"domainObject.tenantId.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.paymentDetails.billId.keyword\"}},\"Assessed Properties\":{\"nested\":{\"path\":\"domainObject.assessmentsDetails\"},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"domainObject.assessmentsDetails.assessmentNumber.keyword\"}}}}}}}}}}" }, { "module": "COMMON", @@ -844,10 +843,10 @@ "queries": [ { "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.Bill.billDetails.businessService.keyword\", \"usageId\" : \"domainObject.propertyDetails.usageCategoryMajor.keyword\",\"minorUsageId\" : \"domainObject.propertyDetails.usageCategoryMinor.keyword\",\"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.cityDistrictCode\" }", - "dateRefField": "dataObject.Bill.billDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"usageId\" : \"domainObject.units.usageCategory.keyword\",\"minorUsageId\" : \"domainObject.units.usageCategory.keyword\",\"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", + "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.Bill.billDetails.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Ward \":{\"terms\":{\"field\":\"domainObject.ward.name.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.amountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.transactionId.keyword\"}},\"Assessed Properties\":{\"nested\":{\"path\":\"domainObject.propertyDetails\"},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"domainObject.propertyDetails.assessmentNumber.keyword\"}}}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Ward \":{\"terms\":{\"field\":\"domainObject.ward.name.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.paymentDetails.billId.keyword\"}},\"Assessed Properties\":{\"nested\":{\"path\":\"domainObject.assessmentsDetails\"},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"domainObject.assessmentsDetails.assessmentNumber.keyword\"}}}}}}}}}}" } ], "chartType": "table", @@ -888,10 +887,10 @@ "queries": [ { "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.Bill.billDetails.businessService.keyword\", \"usageId\" : \"domainObject.propertyDetails.usageCategoryMajor.keyword\",\"minorUsageId\" : \"domainObject.propertyDetails.usageCategoryMinor.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.cityDistrictCode\" }", - "dateRefField": "dataObject.Bill.billDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"usageId\" : \"domainObject.units.usageCategory.keyword\",\"minorUsageId\" : \"domainObject.units.usageCategory.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", + "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.Bill.billDetails.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Total Amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.totalAmount\"}},\"PT Tax\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TAX\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}},\"Fire Cess\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_FIRE_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}},\"Cancer Cess\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_CANCER_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}},\"Rebate\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_REBATE\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}},\"Penalty\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_PENALTY\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}},\"Time Interest\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_INTEREST\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}},\"Round Off\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_ROUNDOFF\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Total Amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.totalAmount\"}},\"PT Tax\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TAX\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Fire Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_FIRE_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Cancer Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_CANCER_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Rebate\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_REBATE\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Penalty\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_PENALTY\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Time Interest\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_INTEREST\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Round Off\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_ROUNDOFF\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}}}}}}" } ], "isMdmsEnabled": true, @@ -932,10 +931,10 @@ "queries": [ { "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.Bill.billDetails.businessService.keyword\", \"usageId\" : \"domainObject.propertyDetails.usageCategoryMajor.keyword\",\"minorUsageId\" : \"domainObject.propertyDetails.usageCategoryMinor.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.cityDistrictCode\" }", - "dateRefField": "dataObject.Bill.billDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"usageId\" : \"domainObject.units.usageCategory.keyword\",\"minorUsageId\" : \"domainObject.units.usageCategory.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", + "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.Bill.billDetails.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"ULBs \":{\"terms\":{\"field\":\"dataObject.tenantId.keyword\",\"size\":200},\"aggs\":{\"Total Amount\":{\"bucket_script\":{\"buckets_path\":{\"c1\":\"PT Tax>aggrFilter>amount\",\"c2\":\"Fire Cess>aggrFilter>amount\",\"c3\":\"Cancer Cess>aggrFilter>amount\",\"c4\":\"Rebate>aggrFilter>amount\",\"c5\":\"Penalty>aggrFilter>amount\",\"c6\":\"Time Interest>aggrFilter>amount\",\"c7\":\"Round Off>aggrFilter>amount\"},\"script\":{\"source\":\"params.c1+params.c2+params.c3+params.c4+params.c5+params.c6+params.c7\"}}},\"PT Tax\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TAX\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}},\"Fire Cess\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_FIRE_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}},\"Cancer Cess\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_CANCER_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}},\"Rebate\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_REBATE\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}},\"Penalty\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_PENALTY\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}},\"Time Interest\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_INTEREST\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}},\"Round Off\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_ROUNDOFF\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"ULBs \":{\"terms\":{\"field\":\"dataObject.tenantId.keyword\",\"size\":200},\"aggs\":{\"Total Amount\":{\"bucket_script\":{\"buckets_path\":{\"c1\":\"PT Tax>aggrFilter>amount\",\"c2\":\"Fire Cess>aggrFilter>amount\",\"c3\":\"Cancer Cess>aggrFilter>amount\",\"c4\":\"Rebate>aggrFilter>amount\",\"c5\":\"Penalty>aggrFilter>amount\",\"c6\":\"Time Interest>aggrFilter>amount\",\"c7\":\"Round Off>aggrFilter>amount\"},\"script\":{\"source\":\"params.c1+params.c2+params.c3+params.c4+params.c5+params.c6+params.c7\"}}},\"PT Tax\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TAX\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Fire Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_FIRE_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Cancer Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_CANCER_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Rebate\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_REBATE\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Penalty\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_PENALTY\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Time Interest\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_INTEREST\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Round Off\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_ROUNDOFF\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}}}}}}}}" } ], "filterKeys": [ @@ -970,10 +969,10 @@ "queries": [ { "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.Bill.billDetails.businessService.keyword\", \"usageId\" : \"domainObject.propertyDetails.usageCategoryMajor.keyword\",\"minorUsageId\" : \"domainObject.propertyDetails.usageCategoryMinor.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.cityDistrictCode\" }", - "dateRefField": "dataObject.Bill.billDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"usageId\" : \"domainObject.units.usageCategory.keyword\",\"minorUsageId\" : \"domainObject.units.usageCategory.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", + "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.Bill.billDetails.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Ward \":{\"terms\":{\"field\":\"domainObject.ward.name.keyword\",\"size\":200},\"aggs\":{\"Total Amount\":{\"bucket_script\":{\"buckets_path\":{\"c1\":\"PT Tax>aggrFilter>amount\",\"c2\":\"Fire Cess>aggrFilter>amount\",\"c3\":\"Cancer Cess>aggrFilter>amount\",\"c4\":\"Rebate>aggrFilter>amount\",\"c5\":\"Penalty>aggrFilter>amount\",\"c6\":\"Time Interest>aggrFilter>amount\",\"c7\":\"Round Off>aggrFilter>amount\"},\"script\":{\"source\":\"params.c1+params.c2+params.c3+params.c4+params.c5+params.c6+params.c7\"}}},\"PT Tax\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TAX\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}},\"Fire Cess\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_FIRE_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}},\"Cancer Cess\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_CANCER_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}},\"Rebate\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_REBATE\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}},\"Penalty\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_PENALTY\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}},\"Time Interest\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_INTEREST\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}},\"Round Off\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_ROUNDOFF\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Ward \":{\"terms\":{\"field\":\"domainObject.ward.name.keyword\",\"size\":200},\"aggs\":{\"Total Amount\":{\"bucket_script\":{\"buckets_path\":{\"c1\":\"PT Tax>aggrFilter>amount\",\"c2\":\"Fire Cess>aggrFilter>amount\",\"c3\":\"Cancer Cess>aggrFilter>amount\",\"c4\":\"Rebate>aggrFilter>amount\",\"c5\":\"Penalty>aggrFilter>amount\",\"c6\":\"Time Interest>aggrFilter>amount\",\"c7\":\"Round Off>aggrFilter>amount\"},\"script\":{\"source\":\"params.c1+params.c2+params.c3+params.c4+params.c5+params.c6+params.c7\"}}},\"PT Tax\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TAX\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Fire Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_FIRE_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Cancer Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_CANCER_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Rebate\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_REBATE\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Penalty\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_PENALTY\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Time Interest\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_INTEREST\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Round Off\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_ROUNDOFF\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}}}}}}}}" } ], "filterKeys": [ @@ -1008,10 +1007,10 @@ "queries": [ { "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.Bill.billDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.cityDistrictCode\" }", - "dateRefField": "dataObject.Bill.billDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", + "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.Bill.billDetails.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"attrs_root\":{\"nested\":{\"path\":\"domainObject.propertyDetails.units\"},\"aggs\":{\"Usage \":{\"terms\":{\"field\":\"domainObject.propertyDetails.units.usageCategoryMajor.keyword\",\"size\":200},\"aggs\":{\"Total Amount\":{\"nested\":{\"path\":\"dataObject.Bill.taxAndPayments\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.taxAndPayments.businessService.keyword\":[\"PT\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.taxAndPayments.taxAmount\"}}}}}},\"PT Tax\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TAX\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}},\"Fire Cess\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_FIRE_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}},\"Cancer Cess\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_CANCER_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}},\"Rebate\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_REBATE\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}},\"Penalty\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_PENALTY\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}}}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"attrs_root\":{\"nested\":{\"path\":\"domainObject.propertyDetails.units\"},\"aggs\":{\"Usage \":{\"terms\":{\"field\":\"domainObject.units.usageCategory.keyword\",\"size\":200},\"aggs\":{\"Total Amount\":{\"nested\":{\"path\":\"dataObject.Bill.taxAndPayments\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.taxAndPayments.businessService.keyword\":[\"PT\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.taxAndPayments.taxAmount\"}}}}}},\"PT Tax\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TAX\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Fire Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_FIRE_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Cancer Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_CANCER_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Rebate\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_REBATE\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Penalty\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_PENALTY\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}}}}}}}}}}" } ], "filterKeys": [ @@ -1060,10 +1059,10 @@ "queries": [ { "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"usageId\" : \"domainObject.propertyDetails.units.usageCategoryMajor.keyword\",\"minorUsageId\" : \"domainObject.propertyDetails.units.usageCategoryMinor.keyword\",\"module\" : \"dataObject.Bill.billDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.cityDistrictCode\" }", - "dateRefField": "dataObject.Bill.billDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"usageId\" : \"domainObject.units.usageCategory.keyword\",\"minorUsageId\" : \"domainObject.units.usageCategory.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", + "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.Bill.billDetails.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"attrs_root\":{\"nested\":{\"path\":\"domainObject.propertyDetails.units\"},\"aggs\":{\"Usage \":{\"terms\":{\"field\":\"domainObject.propertyDetails.units.usageCategoryMinor.keyword\",\"size\":200},\"aggs\":{\"Total Amount\":{\"nested\":{\"path\":\"dataObject.Bill.taxAndPayments\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.taxAndPayments.businessService.keyword\":[\"PT\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.taxAndPayments.taxAmount\"}}}}}},\"PT Tax\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TAX\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}},\"Fire Cess\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_FIRE_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}},\"Cancer Cess\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_CANCER_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}},\"Rebate\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_REBATE\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}},\"Penalty\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_PENALTY\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}}}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"attrs_root\":{\"nested\":{\"path\":\"domainObject.units\"},\"aggs\":{\"Usage \":{\"terms\":{\"field\":\"domainObject.units.usageCategory.keyword\",\"size\":200},\"aggs\":{\"Total Amount\":{\"nested\":{\"path\":\"dataObject.Bill.taxAndPayments\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.taxAndPayments.businessService.keyword\":[\"PT\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.taxAndPayments.taxAmount\"}}}}}},\"PT Tax\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TAX\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Fire Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_FIRE_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Cancer Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_CANCER_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Rebate\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_REBATE\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Penalty\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_PENALTY\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}}}}}}}}}}" } ], "filterKeys": [ @@ -1112,10 +1111,10 @@ "queries": [ { "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"usageId\" : \"domainObject.propertyDetails.units.usageCategoryMajor.keyword\",\"minorUsageId\" : \"domainObject.propertyDetails.units.usageCategoryMinor.keyword\",\"module\" : \"dataObject.Bill.billDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.cityDistrictCode\" }", - "dateRefField": "dataObject.Bill.billDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"usageId\" : \"domainObject.units.usageCategory.keyword\",\"minorUsageId\" : \"domainObject.units.usageCategory.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", + "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.Bill.billDetails.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"attrs_root\":{\"nested\":{\"path\":\"domainObject.propertyDetails.units\"},\"aggs\":{\"Usage \":{\"terms\":{\"field\":\"domainObject.propertyDetails.units.usageCategorySubMinor.keyword\",\"size\":200},\"aggs\":{\"Total Amount\":{\"nested\":{\"path\":\"dataObject.Bill.taxAndPayments\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.taxAndPayments.businessService.keyword\":[\"PT\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.taxAndPayments.taxAmount\"}}}}}},\"PT Tax\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TAX\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}},\"Fire Cess\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_FIRE_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}},\"Cancer Cess\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_CANCER_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}},\"Rebate\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_REBATE\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}},\"Penalty\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_PENALTY\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}}}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"attrs_root\":{\"nested\":{\"path\":\"domainObject.propertyDetails.units\"},\"aggs\":{\"Usage \":{\"terms\":{\"field\":\"domainObject.propertyDetails.units.usageCategorySubMinor.keyword\",\"size\":200},\"aggs\":{\"Total Amount\":{\"nested\":{\"path\":\"dataObject.Bill.taxAndPayments\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.taxAndPayments.businessService.keyword\":[\"PT\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.taxAndPayments.taxAmount\"}}}}}},\"PT Tax\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TAX\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Fire Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_FIRE_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Cancer Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_CANCER_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Rebate\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_REBATE\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Penalty\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_PENALTY\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}}}}}}}}}}" } ], "filterKeys": [ @@ -1164,11 +1163,11 @@ "queries": [ { "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.Bill.billDetails.businessService.keyword\",\"usageId\" : \"domainObject.propertyDetails.units.usageCategoryMajor.keyword\",\"minorUsageId\" : \"domainObject.propertyDetails.units.usageCategoryMinor.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.cityDistrictCode\" }", - "dateRefField": "dataObject.Bill.billDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\",\"usageId\" : \"domainObject.units.usageCategory.keyword\",\"minorUsageId\" : \"domainObject.units.usageCategory.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", + "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.Bill.billDetails.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"root\":{\"nested\":{\"path\":\"domainObject.propertyDetails.units\"},\"aggs\":{\"UsageType \":{\"terms\":{\"field\":\"domainObject.propertyDetails.units.usageCategoryMajor.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"reverse_nested\":{},\"aggs\":{\"top_tags_per_comment\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.amountPaid\"}}}},\"Transactions\":{\"reverse_nested\":{},\"aggs\":{\"top_tags_per_comment\":{\"cardinality\":{\"field\":\"dataObject.transactionId.keyword\"}}}},\"Assessed Properties\":{\"nested\":{\"path\":\"domainObject.propertyDetails\"},\"aggs\":{\"attr\":{\"cardinality\":{\"field\":\"domainObject.propertyDetails.assessmentNumber.keyword\"}}}}}}}}}}}}", - "aggrQuerybc": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}}],\"must\":[{\"term\":{\"dataObject.Bill.billDetails.status.keyword\":\"Approved\"}}]}},\"aggs\":{\"attrs_root\":{\"nested\":{\"path\":\"domainObject.propertyDetails.units\"},\"aggs\":{\"UsageType \":{\"terms\":{\"field\":\"domainObject.propertyDetails.units.usageCategoryMajor.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.amountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.transactionId.keyword\"}},\"Assessed Properties\":{\"nested\":{\"path\":\"Data.propertyDetails\"},\"aggs\":{\"attr\":{\"cardinality\":{\"field\":\"Data.propertyDetails.assessmentNumber.keyword\"}}}}}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"root\":{\"nested\":{\"path\":\"domainObject.units\"},\"aggs\":{\"UsageType \":{\"terms\":{\"field\":\"domainObject.units.usageCategory.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"reverse_nested\":{},\"aggs\":{\"top_tags_per_comment\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}},\"Transactions\":{\"reverse_nested\":{},\"aggs\":{\"top_tags_per_comment\":{\"cardinality\":{\"field\":\"dataObject.paymentDetails.billId.keyword\"}}}},\"Assessed Properties\":{\"nested\":{\"path\":\"domainObject.assessmentsDetails\"},\"aggs\":{\"attr\":{\"cardinality\":{\"field\":\"domainObject.assessmentsDetails.assessmentNumber.keyword\"}}}}}}}}}}}}", + "aggrQuerybc": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}}],\"must\":[{\"term\":{\"dataObject.paymentDetails.bill.status.keyword\":\"Approved\"}}]}},\"aggs\":{\"attrs_root\":{\"nested\":{\"path\":\"domainObject.units\"},\"aggs\":{\"UsageType \":{\"terms\":{\"field\":\"domainObject.units.usageCategory.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.paymentDetails.billId.keyword\"}},\"Assessed Properties\":{\"nested\":{\"path\":\"domainObject.assessmentsDetails\"},\"aggs\":{\"attr\":{\"cardinality\":{\"field\":\"domainObject.assessmentsDetails.assessmentNumber.keyword\"}}}}}}}}}}}}" } ], "filterKeys": [ @@ -1210,11 +1209,11 @@ "queries": [ { "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"usageId\" : \"domainObject.propertyDetails.units.usageCategoryMajor.keyword\",\"minorUsageId\" : \"domainObject.propertyDetails.units.usageCategoryMinor.keyword\",\"module\" : \"dataObject.Bill.billDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.cityDistrictCode\" }", - "dateRefField": "dataObject.Bill.billDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"usageId\" : \"domainObject.units.usageCategory.keyword\",\"minorUsageId\" : \"domainObject.units.usageCategory.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", + "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.Bill.billDetails.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"root\":{\"nested\":{\"path\":\"domainObject.propertyDetails.units\"},\"aggs\":{\"UsageType \":{\"terms\":{\"field\":\"domainObject.propertyDetails.units.usageCategoryMinor.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"reverse_nested\":{},\"aggs\":{\"top_tags_per_comment\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.amountPaid\"}}}},\"Transactions\":{\"reverse_nested\":{},\"aggs\":{\"top_tags_per_comment\":{\"cardinality\":{\"field\":\"dataObject.transactionId.keyword\"}}}},\"Assessed Properties\":{\"nested\":{\"path\":\"domainObject.propertyDetails\"},\"aggs\":{\"attr\":{\"cardinality\":{\"field\":\"domainObject.propertyDetails.assessmentNumber.keyword\"}}}}}}}}}}}}", - "aggrQuerybc": "{\"aggs\":{\"attrs_root\":{\"nested\":{\"path\":\"domainObject.propertyDetails.units\"},\"aggs\":{\"UsageType \":{\"terms\":{\"field\":\"domainObject.propertyDetails.units.usageCategoryMinor.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.amountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.transactionId.keyword\"}},\"Assessed Properties\":{\"nested\":{\"path\":\"Data.propertyDetails\"},\"aggs\":{\"attr\":{\"cardinality\":{\"field\":\"Data.propertyDetails.assessmentNumber.keyword\"}}}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"root\":{\"nested\":{\"path\":\"domainObject.propertyDetails.units\"},\"aggs\":{\"UsageType \":{\"terms\":{\"field\":\"domainObject.units.usageCategory.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"reverse_nested\":{},\"aggs\":{\"top_tags_per_comment\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}},\"Transactions\":{\"reverse_nested\":{},\"aggs\":{\"top_tags_per_comment\":{\"cardinality\":{\"field\":\"dataObject.paymentDetails.billId.keyword\"}}}},\"Assessed Properties\":{\"nested\":{\"path\":\"domainObject.propertyDetails\"},\"aggs\":{\"attr\":{\"cardinality\":{\"field\":\"domainObject.propertyDetails.assessmentNumber.keyword\"}}}}}}}}}}}}", + "aggrQuerybc": "{\"aggs\":{\"attrs_root\":{\"nested\":{\"path\":\"domainObject.propertyDetails.units\"},\"aggs\":{\"UsageType \":{\"terms\":{\"field\":\"domainObject.units.usageCategory.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.paymentDetails.billId.keyword\"}},\"Assessed Properties\":{\"nested\":{\"path\":\"Data.propertyDetails\"},\"aggs\":{\"attr\":{\"cardinality\":{\"field\":\"Data.propertyDetails.assessmentNumber.keyword\"}}}}}}}}}}" } ], "filterKeys": [ @@ -1251,11 +1250,11 @@ "queries": [ { "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"usageId\" : \"domainObject.propertyDetails.units.usageCategoryMajor.keyword\",\"minorUsageId\" : \"domainObject.propertyDetails.units.usageCategoryMinor.keyword\",\"module\" : \"dataObject.Bill.billDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.cityDistrictCode\" }", - "dateRefField": "dataObject.Bill.billDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"usageId\" : \"domainObject.units.usageCategory.keyword\",\"minorUsageId\" : \"domainObject.units.usageCategory.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", + "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.Bill.billDetails.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"root\":{\"nested\":{\"path\":\"domainObject.propertyDetails.units\"},\"aggs\":{\"UsageType \":{\"terms\":{\"field\":\"domainObject.propertyDetails.units.usageCategorySubMinor.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"reverse_nested\":{},\"aggs\":{\"top_tags_per_comment\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.amountPaid\"}}}},\"Transactions\":{\"reverse_nested\":{},\"aggs\":{\"top_tags_per_comment\":{\"cardinality\":{\"field\":\"dataObject.transactionId.keyword\"}}}},\"Assessed Properties\":{\"nested\":{\"path\":\"domainObject.propertyDetails\"},\"aggs\":{\"attr\":{\"cardinality\":{\"field\":\"domainObject.propertyDetails.assessmentNumber.keyword\"}}}}}}}}}}}}", - "aggrQuerybc": "{\"aggs\":{\"attrs_root\":{\"nested\":{\"path\":\"domainObject.propertyDetails.units\"},\"aggs\":{\"UsageType \":{\"terms\":{\"field\":\"domainObject.propertyDetails.units.usageCategorySubMinor.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.amountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.transactionId.keyword\"}},\"Assessed Properties\":{\"nested\":{\"path\":\"Data.propertyDetails\"},\"aggs\":{\"attr\":{\"cardinality\":{\"field\":\"Data.propertyDetails.assessmentNumber.keyword\"}}}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"root\":{\"nested\":{\"path\":\"domainObject.propertyDetails.units\"},\"aggs\":{\"UsageType \":{\"terms\":{\"field\":\"domainObject.propertyDetails.units.usageCategorySubMinor.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"reverse_nested\":{},\"aggs\":{\"top_tags_per_comment\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}},\"Transactions\":{\"reverse_nested\":{},\"aggs\":{\"top_tags_per_comment\":{\"cardinality\":{\"field\":\"dataObject.paymentDetails.billId.keyword\"}}}},\"Assessed Properties\":{\"nested\":{\"path\":\"domainObject.propertyDetails\"},\"aggs\":{\"attr\":{\"cardinality\":{\"field\":\"domainObject.propertyDetails.assessmentNumber.keyword\"}}}}}}}}}}}}", + "aggrQuerybc": "{\"aggs\":{\"attrs_root\":{\"nested\":{\"path\":\"domainObject.propertyDetails.units\"},\"aggs\":{\"UsageType \":{\"terms\":{\"field\":\"domainObject.propertyDetails.units.usageCategorySubMinor.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.paymentDetails.billId.keyword\"}},\"Assessed Properties\":{\"nested\":{\"path\":\"Data.propertyDetails\"},\"aggs\":{\"attr\":{\"cardinality\":{\"field\":\"Data.propertyDetails.assessmentNumber.keyword\"}}}}}}}}}}" } ], "filterKeys": [ @@ -1297,10 +1296,10 @@ "queries": [ { "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.Bill.billDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.cityDistrictCode\" }", - "dateRefField": "dataObject.Bill.billDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", + "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.Bill.billDetails.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.amountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.transactionId.keyword\"}},\"Total Licence Issued\":{\"value_count\":{\"field\":\"domainObject.tradelicense.licenseNumber.keyword\"}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.paymentDetails.billId.keyword\"}},\"Total Licence Issued\":{\"value_count\":{\"field\":\"domainObject.tradelicense.licenseNumber.keyword\"}}}}}}" }, { "module": "COMMON", @@ -1351,10 +1350,10 @@ "queries": [ { "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.Bill.billDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.cityDistrictCode\" }", - "dateRefField": "dataObject.Bill.billDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", + "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.Bill.billDetails.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"ULBs \":{\"terms\":{\"field\":\"dataObject.tenantId.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.amountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.transactionId.keyword\"}},\"Total Licence Issued\":{\"value_count\":{\"field\":\"domainObject.tradelicense.licenseNumber.keyword\"}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"ULBs \":{\"terms\":{\"field\":\"dataObject.tenantId.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.paymentDetails.billId.keyword\"}},\"Total Licence Issued\":{\"value_count\":{\"field\":\"domainObject.tradelicense.licenseNumber.keyword\"}}}}}}}}" }, { "module": "COMMON", @@ -1403,10 +1402,10 @@ "queries": [ { "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.Bill.billDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.cityDistrictCode\" }", - "dateRefField": "dataObject.Bill.billDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", + "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.Bill.billDetails.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Ward \":{\"terms\":{\"field\":\"domainObject.ward.name.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.amountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.transactionId.keyword\"}},\"Total Licence Issued\":{\"value_count\":{\"field\":\"domainObject.tradelicense.licenseNumber.keyword\"}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Ward \":{\"terms\":{\"field\":\"domainObject.ward.name.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.paymentDetails.billId.keyword\"}},\"Total Licence Issued\":{\"value_count\":{\"field\":\"domainObject.tradelicense.licenseNumber.keyword\"}}}}}}}}" } ], "postAggregationTheory" : "repsonseToDifferenceOfDates", @@ -1447,10 +1446,10 @@ "queries": [ { "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.Bill.billDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.cityDistrictCode\" }", - "dateRefField": "dataObject.Bill.billDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", + "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.Bill.billDetails.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Total Amount\":{\"nested\":{\"path\":\"dataObject.Bill.taxAndPayments\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.taxAndPayments.businessService.keyword\":[\"TL\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.taxAndPayments.taxAmount\"}}}}}},\"TL Tax\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"TL_TAX\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}},\"Adhoc Penalty\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"TL_ADHOC_PENALTY\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}},\"Adhoc Rebate\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"TL_ADHOC_REBATE\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Total Amount\":{\"nested\":{\"path\":\"dataObject.Bill.taxAndPayments\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.taxAndPayments.businessService.keyword\":[\"TL\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.taxAndPayments.taxAmount\"}}}}}},\"TL Tax\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"TL_TAX\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Adhoc Penalty\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"TL_ADHOC_PENALTY\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Adhoc Rebate\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"TL_ADHOC_REBATE\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}}}}}}" } ], "isMdmsEnabled": true, @@ -1488,10 +1487,10 @@ "queries": [ { "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.Bill.billDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.cityDistrictCode\" }", - "dateRefField": "dataObject.Bill.billDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", + "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.Bill.billDetails.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"ULBs \":{\"terms\":{\"field\":\"dataObject.tenantId.keyword\",\"size\":200},\"aggs\":{\"Total Amount\":{\"bucket_script\":{\"buckets_path\":{\"c1\":\"TL Tax>aggrFilter>amount\",\"c2\":\"Adhoc Penalty>aggrFilter>amount\",\"c3\":\"Adhoc Rebate>aggrFilter>amount\"},\"script\":{\"source\":\"params.c1+params.c2+params.c3\"}}},\"TL Tax\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"TL_TAX\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}},\"Adhoc Penalty\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"TL_ADHOC_PENALTY\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}},\"Adhoc Rebate\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"TL_ADHOC_REBATE\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"ULBs \":{\"terms\":{\"field\":\"dataObject.tenantId.keyword\",\"size\":200},\"aggs\":{\"Total Amount\":{\"bucket_script\":{\"buckets_path\":{\"c1\":\"TL Tax>aggrFilter>amount\",\"c2\":\"Adhoc Penalty>aggrFilter>amount\",\"c3\":\"Adhoc Rebate>aggrFilter>amount\"},\"script\":{\"source\":\"params.c1+params.c2+params.c3\"}}},\"TL Tax\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"TL_TAX\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Adhoc Penalty\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"TL_ADHOC_PENALTY\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Adhoc Rebate\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"TL_ADHOC_REBATE\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}}}}}}}}" } ], "filterKeys": [ @@ -1517,10 +1516,10 @@ "queries": [ { "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.Bill.billDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.cityDistrictCode\" }", - "dateRefField": "dataObject.Bill.billDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", + "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.Bill.billDetails.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"ULBs \":{\"terms\":{\"field\":\"dataObject.ward.name.keyword\",\"size\":200},\"aggs\":{\"Total Amount\":{\"bucket_script\":{\"buckets_path\":{\"c1\":\"TL Tax>aggrFilter>amount\",\"c2\":\"Adhoc Penalty>aggrFilter>amount\",\"c3\":\"Adhoc Rebate>aggrFilter>amount\"},\"script\":{\"source\":\"params.c1+params.c2+params.c3\"}}},\"TL Tax\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"TL_TAX\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}},\"Adhoc Penalty\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"TL_ADHOC_PENALTY\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}},\"Adhoc Rebate\":{\"nested\":{\"path\":\"dataObject.Bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"TL_ADHOC_REBATE\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.billAccountDetails.amount\"}}}}}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"ULBs \":{\"terms\":{\"field\":\"dataObject.ward.name.keyword\",\"size\":200},\"aggs\":{\"Total Amount\":{\"bucket_script\":{\"buckets_path\":{\"c1\":\"TL Tax>aggrFilter>amount\",\"c2\":\"Adhoc Penalty>aggrFilter>amount\",\"c3\":\"Adhoc Rebate>aggrFilter>amount\"},\"script\":{\"source\":\"params.c1+params.c2+params.c3\"}}},\"TL Tax\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"TL_TAX\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Adhoc Penalty\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"TL_ADHOC_PENALTY\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Adhoc Rebate\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"TL_ADHOC_REBATE\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}}}}}}}}" } ], "filterKeys": [ @@ -1838,10 +1837,10 @@ "queries": [ { "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.Bill.billDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.cityDistrictCode\" }", - "dateRefField": "dataObject.Bill.billDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", + "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.Bill.billDetails.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"ULBs \":{\"terms\":{\"field\":\"dataObject.tenantId.keyword\",\"size\":200,\"min_doc_count\":0},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.Bill.billDetails.amountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.transactionId.keyword\"}},\"Total Licence Issued\":{\"value_count\":{\"field\":\"domainObject.tradelicense.licenseNumber.keyword\"}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"ULBs \":{\"terms\":{\"field\":\"dataObject.tenantId.keyword\",\"size\":200,\"min_doc_count\":0},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.paymentDetails.billId.keyword\"}},\"Total Licence Issued\":{\"value_count\":{\"field\":\"domainObject.tradelicense.licenseNumber.keyword\"}}}}}}}}" }, { "module": "COMMON", @@ -1890,14 +1889,14 @@ "module": "PT", "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\",\"tenantId\" : \"Data.tenantId.keyword\" }", "dateRefField": "Data.@timestamp", - "indexName": "ptindex-v1", + "indexName": "property-services", "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Fys\":{\"terms\":{\"field\":\"Data.propertyDetails.financialYear.keyword\",\"min_doc_count\":0}}}}}}" }, { "module": "PT", "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \"tenantId\" : \"Data.tenantId.keyword\" }", "dateRefField": "Data.@timestamp", - "indexName": "ptindex-v1", + "indexName": "property-services", "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Total\":{\"value_count\":{\"field\":\"Data.propertyDetails.assessmentNumber.keyword\"}}}}}}}}" } ], @@ -1920,14 +1919,14 @@ "module": "PT", "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\",\"tenantId\" : \"Data.tenantId.keyword\" }", "dateRefField": "Data.@timestamp", - "indexName": "ptindex-v1", + "indexName": "property-services", "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"ULBS \":{\"terms\":{\"field\":\"Data.tenantId.keyword\"},\"aggs\":{\"Fys\":{\"terms\":{\"field\":\"Data.propertyDetails.financialYear.keyword\",\"min_doc_count\":0}}}}}}}}" }, { "module": "PT", "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\",\"tenantId\" : \"Data.tenantId.keyword\" }", "dateRefField": "Data.@timestamp", - "indexName": "ptindex-v1", + "indexName": "property-services", "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"ULBS \":{\"terms\":{\"field\":\"Data.tenantId.keyword\"},\"aggs\":{\"Total\":{\"value_count\":{\"field\":\"Data.propertyDetails.assessmentNumber.keyword\"}}}}}}}}" } ], @@ -1949,14 +1948,14 @@ "module": "PT", "requestQueryMap": "{\"tenantId\" : \"Data.tenantId.keyword\" , \"wardId\" : \"Data.ward.name.keyword\"}", "dateRefField": "Data.@timestamp", - "indexName": "ptindex-v1", + "indexName": "property-services", "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Ward \":{\"terms\":{\"field\":\"Data.ward.name.keyword\"},\"aggs\":{\"Fys\":{\"terms\":{\"field\":\"Data.propertyDetails.financialYear.keyword\",\"min_doc_count\":0}}}}}}}}" }, { "module": "PT", "requestQueryMap": "{\"tenantId\" : \"Data.tenantId.keyword\" , \"wardId\" : \"Data.ward.name.keyword\"}", "dateRefField": "Data.@timestamp", - "indexName": "ptindex-v1", + "indexName": "property-services", "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Ward \":{\"terms\":{\"field\":\"Data.ward.name.keyword\"},\"aggs\":{\"Total\":{\"value_count\":{\"field\":\"Data.propertyDetails.assessmentNumber.keyword\"}}}}}}}}" } ], @@ -2866,7 +2865,7 @@ "_comment": "W&S charts below-----------------------------------------------------------------------", - + "wstodaysCollection": { "chartName": "DSS_W&S_TODAYS_COLLECTION", "queries": [ @@ -3518,8 +3517,8 @@ }, "_comment": "" }, - - + + "wstotalConnection": { "chartName": "DSS_W&S_CONNECTIONS", "queries": [ diff --git a/configs/egov-dss-dashboards/dashboard-ingest/transform_collection_v1.json b/configs/egov-dss-dashboards/dashboard-ingest/transform_collection_v1.json index cfd516bf..14d2f7f6 100644 --- a/configs/egov-dss-dashboards/dashboard-ingest/transform_collection_v1.json +++ b/configs/egov-dss-dashboards/dashboard-ingest/transform_collection_v1.json @@ -6,7 +6,7 @@ "id": "id", "paymentMode": "paymentMode", "paymentStatus": "paymentStatus", - "transactionId": "transactionNumber", + "transactionNumber": "transactionNumber", "paidBy": "paidBy", "payer": "payer", "paymentDetails": { From f5456ea4d81b6190712cc61066d927fcec0fdef0 Mon Sep 17 00:00:00 2001 From: gurpreetsinghkhanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 17 Aug 2020 22:34:59 +0530 Subject: [PATCH 0045/1242] pdf property-receipt update digit v2 --- .../data-config/property-receipt.json | 74 ++++ .../format-config/property-receipt.json | 396 +++++++++++++++++- 2 files changed, 447 insertions(+), 23 deletions(-) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index 82b0d51c..c279c8be 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -69,6 +69,14 @@ }, "type": "date" }, + { + "variable": "assessmentYear", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].fromPeriod" + }, + "type": "date", + "format": "YYYY " + }, { "variable": "paymentMode", "value": { @@ -118,6 +126,60 @@ "path": "$.paymentDetails[0].totalDue" } }, + { + "variable": "PropertyTax", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[8].adjustedAmount" + } + }, + { + "variable": "FireCess", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[7].adjustedAmount" + } + }, + { + "variable": "CancerCess", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[6].adjustedAmount" + } + }, + { + "variable": "Penalty", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[5].adjustedAmount" + } + }, + { + "variable": "Rebate", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[0].adjustedAmount" + } + }, + { + "variable": "Interest", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[4].adjustedAmount" + } + }, + { + "variable": "UsageExemption", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[2].adjustedAmount" + } + }, + { + "variable": "SpecialCategoryExemption", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[3].adjustedAmount" + } + }, + { + "variable": "RoundOff", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[1].adjustedAmount" + } + }, { "variable": "payment_receipt", "value": { @@ -356,6 +418,18 @@ "prefix": null, "module":"rainmaker-common" } + }, + { + "variable": "DisclaimerText", + "value": { + "path": "PT_RECEIPT_DISCLAIMER" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } } ] }, diff --git a/configs/pdf-service/format-config/property-receipt.json b/configs/pdf-service/format-config/property-receipt.json index bff9710a..569aef49 100644 --- a/configs/pdf-service/format-config/property-receipt.json +++ b/configs/pdf-service/format-config/property-receipt.json @@ -67,6 +67,146 @@ ] }, "layout": "noBorders" + }, + { + "style": "noc-table", + "table": { + "widths": [ + "25%", + "25%", + "25%", + "25%" + ], + "body": [ + [ + { + "text": "House/Door No. : ", + "border": [ + true, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "To-Fetch", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Building/Colony Name: ", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "To-Fetch", + "border": [ + false, + true, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "Street Name: ", + "border": [ + true, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "To-Fetch", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table" + }, + { + "text": "Locality/Mohalla :", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "To-Fetch", + "border": [ + false, + false, + true, + true + ], + "style": "receipt-table" + } + ], + [ + { + "text": "Plot Size (Sq. Yards) : ", + "border": [ + true, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "To-Fetch", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table" + }, + { + "text": "Property Type: ", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "To-Fetch", + "border": [ + false, + false, + true, + true + ], + "style": "receipt-table" + } + ] + ] + }, + "layout": {} }, { "style": "noc-table", @@ -97,8 +237,7 @@ false, false ], - "style": "receipt-table", - "font": "Roboto" + "style": "receipt-table" }, { "text": "{{consumer_id}}", @@ -118,8 +257,49 @@ true, false ], - "style": "receipt-table", - "font": "Roboto" + "style": "receipt-table" + } + ], + [ + { + "text": "assessment_year", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{assessmentYear}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "assessment_number", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "To-Fetch", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" } ], [ @@ -186,7 +366,7 @@ "style": "receipt-table" }, { - "text" : " ", + "text" : "Father/Husband Name: ", "border": [ false, false, @@ -196,7 +376,7 @@ "style": "receipt-table-value" }, { - "text" : " ", + "text" : "To-Fetch", "border": [ false, false, @@ -343,8 +523,7 @@ true, false ], - "style": "receipt-table", - "font": "Roboto" + "style": "receipt-table" } ], [ @@ -393,6 +572,170 @@ }, "layout": {} }, + { + "style": "next-noc-table", + "table": { + "widths": [ + "*","*","*","*","*","*","*","*","*","*" + ], + "body": [ + + [ + { + "text": "Property Tax", + "style": "amounts" + }, + { + "text": "Fire Cess", + "style": "amounts" + }, + { + "text": "Cancer Cess", + "style": "amounts" + }, + { + "text": "Penalty", + "style": "amounts" + }, + { + "text": "Rebate", + "style": "amounts" + }, + { + "text": "Interest", + "style": "amounts" + }, + { + "text": "Usage Exemption", + "style": "amounts" + }, + { + "text": "Special Category Exemption", + "style": "amounts" + }, + { + "text": "Round Off", + "style": "amounts" + }, + { + "text": "Total", + "style": "amounts" + } + + ], + + [ + { + "text": "{{PropertyTax}}", + "style": "amounts" + }, + { + "text": "{{FireCess}}", + "style": "amounts" + }, + { + "text": "{{CancerCess}}", + "style": "amounts" + }, + { + "text": "{{Penalty}}", + "style": "amounts" + }, + { + "text": "{{Rebate}}", + "style": "amounts" + }, + { + "text": "{{Interest}}", + "style": "amounts" + }, + { + "text": "{{UsageExemption}}", + "style": "amounts" + }, + { + "text": "{{SpecialCategoryExemption}}", + "style": "amounts" + }, + { + "text": "{{RoundOff}}", + "style": "amounts" + }, + { + "text": "{{paidAmount}}", + "style": "amounts" + } + + ] + + ] + }, + "layout":{} + }, + { + "style": "next-noc-table", + "table": { + "widths": [ + "20%", + "20%", + "20%", + "20%", + "20%" + ], + "body": [ + [ + { + "text": "Floor", + "style": "receipt-table-value" + }, + { + "text": "Usage Type", + "style": "receipt-table-value" + }, + { + "text": "Sub Usage Type", + "style": "receipt-table-value" + }, + { + "text": "Occupancy", + "style": "receipt-table-value" + }, + { + "text": "Built Area (Sq. Yard) / Total Annual Rent", + "style": "receipt-table-value" + } + ], + [ + { + "text": "To-Fetch", + "style": "receipt-table" + }, + { + "text": "To-Fetch", + "style": "receipt-table" + }, + { + "text": "To-Fetch", + "style": "receipt-table" + }, + { + "text": "To-Fetch", + "style": "receipt-table" + }, + { + "text": "To-Fetch", + "style": "receipt-table" + } + ] + ] + }, + "layout": {} + }, + { + "text": "Assessee Signature", + "style": "receipt-approver" + } + , { "style": "receipt-approver", "columns": [ @@ -426,10 +769,6 @@ } ] }, - { - "style": "no-signature", - "text": "{{no_signature}}" - }, { "style": "pt-disclaimer", "stack": [ @@ -450,7 +789,14 @@ "body": ["{{#variable11}}[{\"text\":\"{{disclaimerContent}}\",\"border\":[false,false,false,false],\"style\":\"pt-disclaimer-value\"}]{{/variable11}}"] }, "layout": {} - } + }, + { + "ol": [ + "Payment received by cheque/demand draft shall be subject to realization", + "This document is not a proof of property ownership and regularization of unauthorised construction", + "{{no_signature}}" + ] + } ] } ], @@ -481,7 +827,7 @@ "letterSpacing": 0.6 }, "noc-table": { - "fontSize": 12, + "fontSize": 10, "color": "#000000", "margin": [ -25, @@ -491,7 +837,7 @@ ] }, "next-noc-table": { - "fontSize": 12, + "fontSize": 10, "color": "#000000", "margin": [ -25, @@ -503,7 +849,7 @@ "receipt-table-value": { "color": "#000000", "bold": true, - "fontSize": 12, + "fontSize": 10, "fontWeight": 500, "margin": [ 8, @@ -515,17 +861,17 @@ "receipt-table": { "color": "#000000", "bold": false, - "fontSize": 12, + "fontSize": 10, "fontWeight": 400, "margin": [ - -10, + 0, 8, 0, 8 ] }, "receipt-approver": { - "fontSize": 12, + "fontSize": 10, "bold": true, "margin": [ -27, @@ -536,7 +882,7 @@ "color": "#484848" }, "no-signature": { - "fontSize": 12, + "fontSize": 10, "margin": [ -27, 35, @@ -546,7 +892,7 @@ "color": "#484848" }, "pt-disclaimer": { - "fontSize": 12, + "fontSize": 10, "margin": [ -27, 30, @@ -556,7 +902,7 @@ "color": "#484848" }, "pt-disclaimer-value": { - "fontSize": 12, + "fontSize": 10, "margin": [ 2, 5, @@ -564,7 +910,11 @@ 0 ], "color": "#484848" - } + }, + "amounts": + { + "fontSize": 8 + } } } } \ No newline at end of file From 559407a5384646aeb29646747e313fb5c23a046d Mon Sep 17 00:00:00 2001 From: mohaarif007 <48949208+mohaarif007@users.noreply.github.com> Date: Tue, 18 Aug 2020 16:23:57 +0530 Subject: [PATCH 0046/1242] Add Digit Upgrade V2 reports Add Digit Upgrade V2 reports --- configs/reports/configs/pt-reports.yml | 1912 +++++++++++++++++++++++- 1 file changed, 1911 insertions(+), 1 deletion(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index dec6b257..edf825f4 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2064,4 +2064,1914 @@ ReportDefinitions: inner join eg_user as eu on eu.uuid = po.userid inner join eg_pt_address_v2 as pta on pta.property = pt.propertyid left outer join eg_pt_unit_v2_ot as pot on pot.propertydetail = pd.assessmentnumber - where rh.tenantid =$tenantid and pd.property not in (select property from eg_pt_propertydetail_v2 where financialyear in ('2019-20')) + where rh.tenantid =$tenantid and pd.property not in (select property from eg_pt_propertydetail_v2 where financialyear in ('2019-20')) + + --- +ReportDefinitions: +- reportName: ReceiptRegister_V2 + summary: Receipt Register + version: 1.0.0 + moduleName: rainmaker-pt + additionalConfig: + print: + pdfPageSize: "A1" + sourceColumns: + - name: receiptnumber + label: reports.pt.receiptNo + type: string + source: pt + total: false + - name: receiptdate + label: reports.pt.receiptDate + type: string + source: pt + total: false + - name: g8issuedate + label: reports.pt.g8issuedate + type: string + source: pt + total: false + - name: g8receiptno + label: reports.pt.g8receiptno + type: string + source: pt + total: false + - name: amount + label: reports.pt.amount + type: string + source: pt + total: true + - name: propertytax + label: reports.pt.propertyTax + type: string + source: pt + total: true + - name: firecess + label: reports.pt.fireCess + type: string + source: pt + total: true + - name: cancercess + label: reports.pt.cancerCess + type: string + source: pt + total: true + - name: rebate + label: reports.pt.rebate + type: string + source: pt + total: true + - name: adhocrebate + label: reports.pt.adhocrebate + type: string + source: pt + total: true + - name: penalty + label: reports.pt.penalty + type: string + source: pt + total: true + - name: adhocpenalty + label: reports.pt.adhocpenalty + type: string + source: pt + total: true + - name: interest + label: reports.pt.interest + type: string + source: pt + total: true + - name: exemption + label: reports.pt.exemption + type: string + source: pt + total: true + - name: adjustment + label: reports.pt.roundoff + type: string + source: pt + total: true + - name: pendingamount + label: reports.pt.pendingamount + type: string + source: pt + total: true + - name: propertyid + label: reports.pt.propertyId + type: string + source: pt + total: false + - name: usagetype + label: reports.pt.usagetype + type: string + source: pt + total: false + - name: assessmentnumber + label: reports.pt.assessmentNo + type: string + source: pt + total: false + - name: financialyear + label: reports.pt.financialYear + type: string + source: pt + total: false + - name: instrumenttype + label: reports.pt.paymentMode + type: string + source: pt + total: false + - name: transactionnumber + label: reports.pt.ddChequeTransactionNo + type: string + source: pt + total: false + - name: transactiondate + label: reports.pt.ddChequeTransactionDate + type: string + source: pt + total: false + - name: bankname + label: reports.pt.bankName + type: string + source: pt + total: false + - name: collectorname + label: reports.pt.collectorname + type: string + source: pt + total: false + - name: remarks + label: reports.pt.remarks + type: string + source: pt + total: false + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: true + searchClause: AND rh.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: true + searchClause: AND rh.receiptdate <= $toDate + - name: paymentMode + label: Payment Mode + type: singlevaluelist + pattern: 'list://Cash:Cash,Online:Online,Card:Card,DD:DD,Cheque:Cheque' + source: pt + isMandatory: false + searchClause: AND instrumenttype = $paymentMode + - name: financialyear + label: Financial Year + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name + source: pt + wrapper: true + isMandatory: false + searchClause: AND financialyear = $financialyear + - name: localityArray + label: reports.pt.zoneList + type: boundarylist + source: pt + isMandatory: false + searchClause: AND pt_addr.locality IN ($localityArray) + query: | + -- Use CTE to force query plan, compute & use CTE later + WITH receipt_breakup AS ( + SELECT + billdetailid AS receiptheader, pd.id as pdid, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, + SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as propertytax, + (SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN adjustedamount ELSE 0 END) )as exemption, + ( SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END)) as adjustment + FROM egcl_billaccountdetail as bad + INNER JOIN egcl_billdetial as bd on bd.id = bad.billdetailid + INNER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid + INNER JOIN egcl_payment as payment on pd.paymentid=payment.id + WHERE bad.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' + GROUP BY billdetailid, pdid + ) + SELECT + pd.tenantid AS tenantid, + pd.id, + pt_detail.property AS propertyid, + pt_detail.assessmentnumber AS assessmentnumber, + bill.consumercode, + to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS receiptdate, + payment.ifsccode AS bankname, + receiptnumber, + payment.totalamountpaid as amount, + payment.paymentmode as instrumenttype, + payment.transactionnumber, + to_char((To_timestamp(payment.transactiondate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, + receipt_breakup.*, + pd.due AS pendingamount, + pt_detail.financialyear, + to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, + Initcap(COALESCE(pt_detail.usagecategoryminor, pt_detail.usagecategorymajor)) as usagetype, + manualreceiptnumber as g8receiptno, + (CASE WHEN collectiontype='COUNTER' THEN eg_user.name ELSE '' END) as collectorname, + pt_detail.additionaldetails->>'remarks' as "remarks" + FROM egcl_paymentdetail AS pd + JOIN egcl_payment as payment on pd.paymentid=payment.id + JOIN egcl_bill as bill on bill.id=pd.billid + JOIN egcl_billdetial as bd on bd.billid = bill.id + JOIN eg_pt_property_v2 as pt on pt.propertyid = bill.consumercode + JOIN receipt_breakup ON pd.id = receipt_breakup.pdid + JOIN eg_pt_propertydetail_v2 pt_detail ON pt_detail.property = pt.propertyid + JOIN eg_pt_address_v2 pt_addr ON pt_detail.property = pt_addr.property + LEFT OUTER JOIN eg_user ON eg_user.id = pd.createdby::INTEGER + WHERE pd.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' + orderby:ORDER BY pd.receiptdate DESC + +- reportName: CancelledReceiptRegister_V2 + summary: Receipt Register for cancelled Receipts + version: 1.0.0 + moduleName: rainmaker-pt + additionalConfig: + print: + pdfPageSize: "A1" + sourceColumns: + - name: receiptnumber + label: reports.pt.receiptNo + type: string + source: pt + total: false + - name: status + label: reports.pt.status + type: string + source: pt + total: false + - name: transactiondate + label: reports.pt.receiptDate + type: string + source: pt + total: false + - name: g8issuedate + label: reports.pt.g8issuedate + type: string + source: pt + total: false + - name: g8receiptno + label: reports.pt.g8receiptno + type: string + source: pt + total: false + - name: amount + label: reports.pt.amount + type: string + source: pt + total: true + - name: propertytax + label: reports.pt.propertyTax + type: string + source: pt + total: true + - name: firecess + label: reports.pt.fireCess + type: string + source: pt + total: true + - name: cancercess + label: reports.pt.cancerCess + type: string + source: pt + total: true + - name: rebate + label: reports.pt.rebate + type: string + source: pt + total: true + - name: adhocrebate + label: reports.pt.adhocrebate + type: string + source: pt + total: true + - name: penalty + label: reports.pt.penalty + type: string + source: pt + total: true + - name: adhocpenalty + label: reports.pt.adhocpenalty + type: string + source: pt + total: true + - name: interest + label: reports.pt.interest + type: string + source: pt + total: true + - name: exemption + label: reports.pt.exemption + type: string + source: pt + total: true + - name: adjustment + label: reports.pt.roundoff + type: string + source: pt + total: true + - name: propertyid + label: reports.pt.propertyId + type: string + source: pt + total: false + - name: usagetype + label: reports.pt.usagetype + type: string + source: pt + total: false + - name: assessmentnumber + label: reports.pt.assessmentNo + type: string + source: pt + total: false + - name: financialyear + label: reports.pt.financialYear + type: string + source: pt + total: false + - name: instrumenttype + label: reports.pt.paymentMode + type: string + source: pt + total: false + - name: transactionnumber + label: reports.pt.ddChequeTransactionNo + type: string + source: pt + total: false + - name: bankname + label: reports.pt.bankName + type: string + source: pt + total: false + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: false + searchClause: AND rh.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: false + searchClause: AND rh.receiptdate <= $toDate + - name: paymentMode + label: Payment Mode + type: singlevaluelist + pattern: 'list://Cash:Cash,Online:Online,Card:Card,DD:DD,Cheque:Cheque' + source: pt + isMandatory: false + searchClause: AND instrumenttype = $paymentMode + - name: financialyear + label: Financial Year + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name + source: pt + wrapper: true + isMandatory: false + searchClause: AND financialyear = $financialyear + - name: localityArray + label: reports.pt.zoneList + type: boundarylist + source: pt + isMandatory: false + searchClause: AND pt_addr.locality IN ($localityArray) + query: | + -- Use CTE to force query plan, compute & use CTE later + WITH receipt_breakup AS ( + SELECT + receiptnumber as receiptheader, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, + SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as propertytax, + (SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN adjustedamount ELSE 0 END) )as exemption, + ( SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END)) as adjustment + FROM egcl_billaccountdetail as bad + INNER JOIN egcl_billdetial as bd on bd.id = bad.billdetailid + INNER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid + INNER JOIN egcl_payment as payment on pd.paymentid=payment.id + WHERE pd.tenantid = $tenantid and payment.paymentstatus = 'CANCELLED' and pd.businessservice='PT' + GROUP BY pd.receiptnumber) + SELECT + pd.tenantid AS tenantid, + pd.id, + pt_detail.property AS propertyid, + pt_detail.assessmentnumber AS assessmentnumber, + payment.paymentstatus, + bill.consumercode, + to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS receiptdate, + payment.ifsccode AS bankname, + receiptnumber, + payment.totalamountpaid as amount, + payment.paymentmode as instrumenttype, + payment.transactionnumber, + receipt_breakup.*, + pd.due AS pendingamount, + pt_detail.financialyear, + to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, + Initcap(COALESCE(pt_detail.usagecategoryminor, pt_detail.usagecategorymajor)) as usagetype, + manualreceiptnumber as g8receiptno + FROM egcl_paymentdetail AS pd + JOIN egcl_payment as payment on pd.paymentid=payment.id + JOIN egcl_bill as bill on bill.id=pd.billid + JOIN egcl_billdetial as bd on bd.billid = bill.id + JOIN eg_pt_property_v2 as pt on pt.propertyid = bill.consumercode + JOIN receipt_breakup ON receipt_breakup.receiptheader = pd.receiptnumber + JOIN eg_pt_propertydetail_v2 pt_detail ON pt_detail.property = pt.propertyid + JOIN eg_pt_address_v2 pt_addr ON pt_detail.property = pt_addr.property + LEFT OUTER JOIN eg_user ON eg_user.id = pd.createdby::INTEGER + WHERE pd.tenantid = $tenantid and payment.paymentstatus = 'CANCELLED' and pd.businessservice='PT' + orderby:ORDER BY pd.receiptdate DESC + +- reportName: OldUlbWisePtCollection_V2 + summary: ULB-wise PT Collection + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: totalassessments + label: reports.pt.totalassessments + type: string + source: pt + total: true + - name: totalamountpaid + label: reports.pt.totalamountpaid + type: string + source: pt + total: true + - name: totalamountdue + label: reports.pt.totalamountdue + type: string + source: pt + total: true + searchParams: + - name: financialyear + label: Financial Year + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name + source: pt + wrapper: true + isMandatory: false + searchClause: AND financialyear = $financialyear + - name: usage + label: Usage + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=PropertyTax&masterName=UsageCategoryMajor|$..code|$..name + source: pt + wrapper: true + isMandatory: false + searchClause: AND usagecategorymajor = $usage + query: | + SELECT + tenantid, + COUNT(*) AS totalassessments, + SUM(totalamount) AS totalamount, + SUM(amount) AS totalamountpaid, + (SUM(totalamount) - SUM(amount)) AS totalamountdue + FROM eg_pt_propertydetail_v2 AS pd + LEFT OUTER JOIN + (SELECT consumercode, totalamount, amount FROM egcl_receiptheader_v1 AS rh + LEFT OUTER JOIN egcl_receiptinstrument_v1 AS ri ON rh.id = ri.receiptheader + LEFT OUTER JOIN egcl_instrumentheader_v1 AS ih ON ri.instrumentheader = ih.id + and ih.instrumentstatus != 'CANCELLED' + where rh.status != 'Cancelled' + ) AS instrument_data ON (pd.property || ':' || pd.assessmentnumber) = instrument_data.consumercode + WHERE tenantid = $tenantid + groupby: GROUP BY tenantid + orderby: ORDER BY tenantid, totalamountpaid DESC NULLS LAST + +- reportName: StateCancelledReceiptRegister_V2 + summary: Receipt Register for cancelled Receipts State + version: 1.0.0 + moduleName: rainmaker-pt + additionalConfig: + print: + pdfPageSize: "A1" + sourceColumns: + - name: tenantid + label: reports.pt.ulbName + type: string + source: pt + total: false + - name: receiptnumber + label: reports.pt.receiptNo + type: string + source: pt + total: false + - name: status + label: reports.pt.status + type: string + source: pt + total: false + - name: transactiondate + label: reports.pt.receiptDate + type: string + source: pt + total: false + - name: g8issuedate + label: reports.pt.g8issuedate + type: string + source: pt + total: false + - name: g8receiptno + label: reports.pt.g8receiptno + type: string + source: pt + total: false + - name: amount + label: reports.pt.amount + type: string + source: pt + total: true + - name: propertytax + label: reports.pt.propertyTax + type: string + source: pt + total: true + - name: firecess + label: reports.pt.fireCess + type: string + source: pt + total: true + - name: cancercess + label: reports.pt.cancerCess + type: string + source: pt + total: true + - name: rebate + label: reports.pt.rebate + type: string + source: pt + total: true + - name: adhocrebate + label: reports.pt.adhocrebate + type: string + source: pt + total: true + - name: penalty + label: reports.pt.penalty + type: string + source: pt + total: true + - name: adhocpenalty + label: reports.pt.adhocpenalty + type: string + source: pt + total: true + - name: interest + label: reports.pt.interest + type: string + source: pt + total: true + - name: exemption + label: reports.pt.exemption + type: string + source: pt + total: true + - name: adjustment + label: reports.pt.roundoff + type: string + source: pt + total: true + - name: propertyid + label: reports.pt.propertyId + type: string + source: pt + total: false + - name: usagetype + label: reports.pt.usagetype + type: string + source: pt + total: false + - name: assessmentnumber + label: reports.pt.assessmentNo + type: string + source: pt + total: false + - name: financialyear + label: reports.pt.financialYear + type: string + source: pt + total: false + - name: instrumenttype + label: reports.pt.paymentMode + type: string + source: pt + total: false + - name: transactionnumber + label: reports.pt.ddChequeTransactionNo + type: string + source: pt + total: false + - name: bankname + label: reports.pt.bankName + type: string + source: pt + total: false + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: false + searchClause: AND rh.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: false + searchClause: AND rh.receiptdate <= $toDate + - name: paymentMode + label: Payment Mode + type: singlevaluelist + pattern: 'list://Cash:Cash,Online:Online,Card:Card,DD:DD,Cheque:Cheque' + source: pt + isMandatory: false + searchClause: AND instrumenttype = $paymentMode + - name: financialyear + label: Financial Year + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name + source: pt + wrapper: true + isMandatory: false + searchClause: AND financialyear = $financialyear + query: | + -- Use CTE to force query plan, compute & use CTE later + WITH receipt_breakup AS ( + SELECT + receiptnumber as receiptheader, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, + SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as propertytax, + (SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN adjustedamount ELSE 0 END) )as exemption, + ( SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END)) as adjustment + FROM egcl_billaccountdetail as bad + INNER JOIN egcl_billdetial as bd on bd.id = bad.billdetailid + INNER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid + INNER JOIN egcl_payment as payment on pd.paymentid=payment.id + WHERE pd.tenantid != 'pb.testing' and payment.paymentstatus = 'CANCELLED' and pd.businessservice='PT' + GROUP BY pd.receiptnumber + ) + SELECT + pd.tenantid AS tenantid, + pd.id, + pt_detail.property AS propertyid, + pt_detail.assessmentnumber AS assessmentnumber, + payment.paymentstatus, + bill.consumercode, + to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS receiptdate, + payment.ifsccode AS bankname, + receiptnumber, + payment.totalamountpaid as amount, + payment.paymentmode as instrumenttype, + payment.transactionnumber, + receipt_breakup.*, + pd.due AS pendingamount, + pt_detail.financialyear, + to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, + Initcap(COALESCE(pt_detail.usagecategoryminor, pt_detail.usagecategorymajor)) as usagetype, + manualreceiptnumber as g8receiptno + FROM egcl_paymentdetail AS pd + JOIN egcl_payment as payment on pd.paymentid=payment.id + JOIN egcl_bill as bill on bill.id=pd.billid + JOIN egcl_billdetial as bd on bd.billid = bill.id + JOIN eg_pt_property_v2 as pt on pt.propertyid = bill.consumercode + JOIN receipt_breakup ON receipt_breakup.receiptheader = pd.receiptnumber + JOIN eg_pt_propertydetail_v2 pt_detail ON pt_detail.property = pt.propertyid + JOIN eg_pt_address_v2 pt_addr ON pt_detail.property = pt_addr.property + LEFT OUTER JOIN eg_user ON eg_user.id = pd.createdby::INTEGER + WHERE pd.tenantid != 'pb.testing' and payment.paymentstatus = 'CANCELLED' and pd.businessservice='PT' + orderby: ORDER BY pd.receiptdate DESC + +- reportName: StateWidePtCollection_V2 + summary: State Wide PT Collection + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: tenantid + label: reports.pt.ulbName + type: string + source: pt + total: false + - name: totalassessments + label: reports.pt.totalassessments + type: string + source: pt + total: true + - name: totalamountpaid + label: reports.pt.totalamountpaid + type: string + source: pt + total: true + - name: totaloffline + label: reports.pt.totaloffline + type: string + source: pt + total: true + - name: totalonline + label: reports.pt.totalonline + type: string + source: pt + total: true + - name: totalamountdue + label: reports.pt.totalamountdue + type: string + source: pt + total: true + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: false + searchClause: AND receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: false + searchClause: AND receiptdate <= $toDate + - name: ulb + label: ULB + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: pt + wrapper: true + isMandatory: false + searchClause: AND tenantid = $ulb + - name: financialyear + label: Financial Year + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name + source: pt + wrapper: true + isMandatory: false + searchClause: AND financialyear = $financialyear + - name: usage + label: Usage + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=PropertyTax&masterName=UsageCategoryMajor|$..code|$..name + source: pt + wrapper: true + isMandatory: false + searchClause: AND usagecategorymajor = $usage + query: | + SELECT + initcap(split_part(tenantid, '.', 2)) as tenantid, + COUNT(*) AS totalassessments, + SUM(billd.amount) AS totalamount, + SUM(billd.amountpaid) AS totalamountpaid, + SUM(CASE WHEN billd.collectiontype LIKE 'ONLINE' THEN amount ELSE 0 END) AS totalonline, + SUM(CASE WHEN billd.collectiontype LIKE 'COUNTER' THEN amount ELSE 0 END) AS totaloffline, + (SUM(billd.amount) - SUM(billd.amountpaid)) AS totalamountdue + FROM egcl_billdetial as billd + WHERE tenantid not in ('pb.testing','pb.ludhiana_legacy') + groupby: GROUP BY tenantid + orderby: ORDER BY tenantid, totalamountpaid DESC NULLS LAST + +- reportName: UlbWisePtCollection_V2 + summary: State Wide PT Collection + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: totalassessments + label: reports.pt.totalassessments + type: string + source: pt + total: true + - name: totalamountpaid + label: reports.pt.totalamountpaid + type: string + source: pt + total: true + - name: totaloffline + label: reports.pt.totaloffline + type: string + source: pt + total: true + - name: countoffline + label: reports.pt.countoffline + type: string + source: pt + total: true + - name: totalonline + label: reports.pt.totalonline + type: string + source: pt + total: true + - name: countonline + label: reports.pt.countonline + type: string + source: pt + total: true + - name: totalamountdue + label: reports.pt.totalamountdue + type: string + source: pt + total: true + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: false + searchClause: AND receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: false + searchClause: AND receiptdate <= $toDate + - name: financialyear + label: Financial Year + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name + source: pt + wrapper: true + isMandatory: false + searchClause: AND financialyear = $financialyear + - name: usage + label: Usage + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=PropertyTax&masterName=UsageCategoryMajor|$..code|$..name + source: pt + wrapper: true + isMandatory: false + searchClause: AND usagecategorymajor = $usage + query: | + SELECT + initcap(split_part(tenantid, '.', 2)) as tenantid, + COUNT(collectiontype) AS totalassessments, + SUM(billd.amount) AS totalamount, + SUM(billd.amountpaid) AS totalamountpaid, + SUM(CASE WHEN collectiontype LIKE 'ONLINE' THEN amount ELSE 0 END) AS totalonline, + SUM(CASE WHEN collectiontype LIKE 'ONLINE' THEN 1 ELSE 0 END) AS countonline, + SUM(CASE WHEN collectiontype LIKE 'COUNTER' THEN amount ELSE 0 END) AS totaloffline, + SUM(CASE WHEN collectiontype LIKE 'COUNTER' THEN 1 ELSE 0 END) AS countoffline, + (SUM(billd.amount) - SUM(billd.amountpaid)) AS totalamountdue + FROM egcl_billdetial as billd + WHERE tenantid LIKE CONCAT(SPLIT_PART($tenantid, '.', 1), '%') and tenantid = $tenantid + groupby: GROUP BY tenantid + orderby: ORDER BY tenantid, totalamountpaid DESC NULLS LAST + +- reportName: ReceiptRegisterShort_V2 + summary: Receipt Register + version: 1.0.0 + moduleName: rainmaker-pt + additionalConfig: + print: + pdfPageSize: "Legal" + sourceColumns: + - name: receiptnumber + label: reports.pt.receiptNo + type: string + source: pt + total: false + - name: transactiondate + label: reports.pt.receiptDate + type: string + source: pt + total: false + - name: g8receiptno + label: reports.pt.g8book + type: string + source: pt + total: false + - name: g8issuedate + label: reports.pt.g8dated + type: string + source: pt + total: false + - name: propertyid + label: reports.pt.ptrId + type: string + source: pt + total: false + - name: financialyear + label: reports.pt.financialYear + type: string + source: pt + total: false + - name: instrumenttype + label: reports.pt.paymentMode + type: string + source: pt + total: false + - name: amount + label: reports.pt.taxamount + type: string + source: pt + total: true + - name: transactionnumber + label: reports.pt.ddChequeNo + type: string + source: pt + total: false + - name: bankname + label: reports.pt.bankName + type: string + source: pt + total: false + - name: collectorname + label: reports.pt.collectorname + type: string + source: pt + total: false + - name: remarks + label: reports.pt.remarks + type: string + source: pt + total: false + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: true + searchClause: AND rh.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: true + searchClause: AND rh.receiptdate <= $toDate + - name: paymentMode + label: Payment Mode + type: singlevaluelist + pattern: 'list://Cash:Cash,Online:Online,Card:Card,DD:DD,Cheque:Cheque' + source: pt + isMandatory: false + searchClause: AND instrumenttype = $paymentMode + - name: financialyear + label: Financial Year + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name + source: pt + wrapper: true + isMandatory: false + searchClause: AND financialyear = $financialyear + - name: localityArray + label: reports.pt.zoneList + type: boundarylist + source: pt + isMandatory: false + searchClause: AND pt_addr.locality IN ($localityArray) + - name: collectorname + label: reports.pt.collectorname + type: singlevaluelist + pattern: http://egov-hrms:8080/egov-hrms/employees/_search?tenantId=$tenantid&roles=PTCEMP|$.Employees[*].user.id|$.Employees[*].user.name + source: pt + wrapper: true + isMandatory: false + searchClause: AND eg_user.id = $collectorname::INTEGER + query: | + -- Use CTE to force query plan, compute & use CTE later + WITH receipt_breakup AS ( + SELECT + receiptnumber, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, + SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as propertytax, + (SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN adjustedamount ELSE 0 END) )as exemption, + ( SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END)) as adjustment + FROM egcl_billaccountdetail as bad + INNER JOIN egcl_billdetial as bd on bd.id = bad.billdetailid + INNER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid + INNER JOIN egcl_payment as payment on pd.paymentid=payment.id + LEFT OUTER JOIN eg_user ON eg_user.id = pd.createdby::INTEGER + WHERE bd.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' + roupby: GROUP BY pd.receiptnumber) + SELECT + bill.tenantid AS tenantid, + bill.id, + pt_detail.property AS propertyid, + pt_detail.assessmentnumber AS assessmentnumber, + bill.consumercode, + pd.receiptdate, + to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, + payment.ifsccode AS bankname, + pd.receiptnumber, + payment.totalamountpaid as amount, + payment.paymentmode as instrumenttype, + payment.transactionnumber, + receipt_breakup.*, + pd.due AS pendingamount, + pt_detail.financialyear, + to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, + Initcap(COALESCE(pt_detail.usagecategoryminor, pt_detail.usagecategorymajor)) as usagetype, + manualreceiptnumber as g8receiptno, + (CASE WHEN collectiontype='COUNTER' THEN eg_user.name ELSE '' END) as collectorname, + pt_detail.additionaldetails->>'remarks' as "remarks" + FROM egcl_bill AS bill + INNER JOIN egcl_billdetial as bd on bd.billid = bill.id + LEFT OUTER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid + LEFT OUTER JOIN egcl_payment as payment on pd.paymentid=payment.id + JOIN eg_pt_propertydetail_v2 pt_detail ON pt_detail.property = bill.consumercode + JOIN eg_pt_address_v2 pt_addr ON pt_detail.property = pt_addr.property + JOIN receipt_breakup ON receipt_breakup.receiptnumber = pd.receiptnumber + LEFT OUTER JOIN eg_user ON eg_user.id = pd.createdby::INTEGER + WHERE pd.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' + orderby: ORDER BY pd.receiptdate DESC + + +- reportName: ULBPTDataDumpReport_V2 + summary: ULB level report + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: ulb + label: reports.pt.ulb + type: string + source: pt + total: false + - name: propertytaxuniqueid + label: reports.pt.propertytaxuniqueid + type: string + source: pt + total: false + - name: transcationdate + label: reports.pt.transcationdate + type: string + source: pt + total: false + - name: receiptnumber + label: reports.pt.receiptnumber + type: string + source: pt + total: false + - name: existingpropertyid + label: reports.pt.existingpropertyid + type: string + source: pt + total: false + - name: financialyear + label: reports.pt.financialYear + type: string + source: pt + total: false + - name: ownername + label: reports.pt.ownername + type: string + source: pt + total: false + - name: guardianname + label: reports.pt.guardianname + type: string + source: pt + total: false + - name: totalarea + label: reports.pt.totalarea + type: string + source: pt + total: false + - name: builtarea + label: reports.pt.builtarea + type: string + source: pt + total: false + - name: floors + label: reports.pt.floors + type: string + source: pt + total: false + - name: occupancy + label: reports.pt.occupancy + type: string + source: pt + total: false + - name: propertytype + label: reports.pt.propertytype + type: string + source: pt + total: false + - name: mobileno + label: reports.pt.mobileno + type: string + source: pt + total: false + - name: transcationmode + label: reports.pt.transcationmode + type: string + source: pt + total: false + - name: paymentamount + label: reports.pt.paymentamount + type: string + source: pt + total: true + - name: paymentdate + label: reports.pt.paymentdate + type: string + source: pt + total: false + - name: emailid + label: reports.pt.emailid + type: string + source: pt + total: false + - name: address + label: reports.pt.address + type: string + source: pt + total: false + - name: payeraddress + label: reports.pt.payeraddress + type: string + source: pt + total: false + - name: remarks + label: reports.pt.remarks + type: string + source: pt + total: false + - name: businessname + label: reports.pt.businessname + type: string + source: pt + total: false + - name: localitycode + label: reports.pt.localitycode + type: string + source: pt + total: false + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: true + searchClause: AND rh.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: true + searchClause: AND rh.receiptdate <= $toDate + - name: financialyear + label: Financial Year + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name + source: pt + wrapper: true + isMandatory: false + searchClause: AND pd.financialyear = $financialyear + - name: localityArray + label: reports.pt.zoneList + type: boundarylist + source: pt + isMandatory: false + searchClause: AND pta.locality IN ($localityArray) + query: | + --S.no Service Name ULB Property Tax Unique ID Date Of Transcation Receipt Number Existing Property ID Owner Name Guardian Name Total Area (SQ.YARD) Covered Area/Built Area (SQ.FEET) Floors Occupancy (Rented,Self /Unoccupied) Type Of Property Mobile Number Transcation Mode of Payment Payment Amount Payment Date Email Id Address + with eg_pt_unit_v2_ot as ( + select + propertydetail, + string_agg(distinct pu.occupancytype, ',') as occupancytype, + string_agg(distinct coalesce(usagecategoryminor, usagecategorymajor), ',') as propertytype + from eg_pt_unit_v2 as pu + where pu.tenantid = $tenantid + group by propertydetail) + select + distinct on (payd.receiptnumber) + initcap(split_part(payd.tenantid, '.', 2)) as "ulb", + split_part(consumercode, ':', 1) as "propertytaxuniqueid", + to_char((To_timestamp(receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS "transcationdate", + receiptnumber as "receiptnumber", + pt.oldpropertyid as "existingpropertyid", + pd.financialyear as "financialyear", + eu."name" as "ownername", + eu.guardian as "guardianname", + pd.landarea as "totalarea", + pd.builduparea * 9 as "builtarea", + pd.nooffloors as "floors", + eu.mobilenumber as "mobileno", + paymentmode as "transcationmode", + payment.totalamountpaid as "paymentamount", + to_char((To_timestamp(payment.transactiondate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS "paymentdate", + eu.emailid as "emailid", + REGEXP_REPLACE(REGEXP_REPLACE(CONCAT(pta.doorno, ',', pta.addressline1, ',', pta.addressline2, ',', pta.buildingname, ',', pta.pincode), ',+', ','), '^,|,$', '') as "address", + payment.payeraddress as "payeraddress", + pd.additionaldetails->>'remarks' as "remarks", + pt.additionaldetails->>'FirmBusinessName' as "businessname", + pta.locality as "localitycode" + from egcl_paymentdetail as payd + inner join egcl_payment as payment on payment.id = payd.paymentid + inner join egcl_bill as bill on bill.id = payd.billid + inner join eg_pt_property_v2 as pt on pt.propertyid = bill.consumercode + inner join eg_pt_propertydetail_v2 as pd on pd.property = bill.consumercode + inner join eg_pt_owner_v2 as po on po.propertydetail = pd.assessmentnumber + inner join eg_user as eu on eu.uuid = po.userid + inner join eg_pt_address_v2 as pta on pta.property = pt.propertyid + left outer join eg_pt_unit_v2_ot as pot on pot.propertydetail = pd.assessmentnumber + where payd.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and payd.businessservice='PT' + + +- reportName: Sewa_Kendra_ReceiptRegister_V2 + summary: Sewa Kendra Receipt Register + version: 1.0.0 + moduleName: rainmaker-pt + additionalConfig: + print: + pdfPageSize: "A1" + sourceColumns: + - name: receiptnumber + label: reports.pt.receiptNo + type: string + source: pt + total: false + - name: receiptdate + label: reports.pt.receiptDate + type: string + source: pt + total: false + - name: g8issuedate + label: reports.pt.g8issuedate + type: string + source: pt + total: false + - name: g8receiptno + label: reports.pt.g8receiptno + type: string + source: pt + total: false + - name: amount + label: reports.pt.amount + type: string + source: pt + total: true + - name: propertytax + label: reports.pt.propertyTax + type: string + source: pt + total: true + - name: firecess + label: reports.pt.fireCess + type: string + source: pt + total: true + - name: cancercess + label: reports.pt.cancerCess + type: string + source: pt + total: true + - name: rebate + label: reports.pt.rebate + type: string + source: pt + total: true + - name: adhocrebate + label: reports.pt.adhocrebate + type: string + source: pt + total: true + - name: penalty + label: reports.pt.penalty + type: string + source: pt + total: true + - name: adhocpenalty + label: reports.pt.adhocpenalty + type: string + source: pt + total: true + - name: interest + label: reports.pt.interest + type: string + source: pt + total: true + - name: exemption + label: reports.pt.exemption + type: string + source: pt + total: true + - name: adjustment + label: reports.pt.roundoff + type: string + source: pt + total: true + - name: pendingamount + label: reports.pt.pendingamount + type: string + source: pt + total: true + - name: propertyid + label: reports.pt.propertyId + type: string + source: pt + total: false + - name: usagetype + label: reports.pt.usagetype + type: string + source: pt + total: false + - name: assessmentnumber + label: reports.pt.assessmentNo + type: string + source: pt + total: false + - name: financialyear + label: reports.pt.financialYear + type: string + source: pt + total: false + - name: instrumenttype + label: reports.pt.paymentMode + type: string + source: pt + total: false + - name: transactionnumber + label: reports.pt.ddChequeTransactionNo + type: string + source: pt + total: false + - name: transactiondate + label: reports.pt.ddChequeTransactionDate + type: string + source: pt + total: false + - name: bankname + label: reports.pt.bankName + type: string + source: pt + total: false + - name: collectorname + label: reports.pt.collectorname + type: string + source: pt + total: false + - name: remarks + label: reports.pt.remarks + type: string + source: pt + total: false + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: true + searchClause: AND rh.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: true + searchClause: AND rh.receiptdate <= $toDate + - name: paymentMode + label: Payment Mode + type: singlevaluelist + pattern: 'list://Cash:Cash,Online:Online,Card:Card,DD:DD,Cheque:Cheque' + source: pt + isMandatory: false + searchClause: AND instrumenttype = $paymentMode + - name: financialyear + label: Financial Year + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name + source: pt + wrapper: true + isMandatory: false + searchClause: AND financialyear = $financialyear + - name: localityArray + label: reports.pt.zoneList + type: boundarylist + source: pt + isMandatory: false + searchClause: AND pt_addr.locality IN ($localityArray) + query: | + -- Use CTE to force query plan, compute & use CTE later + WITH receipt_breakup AS ( + SELECT + receiptnumber, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, + SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as propertytax, + (SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN adjustedamount ELSE 0 END) )as exemption, + ( SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END)) as adjustment + FROM egcl_billaccountdetail as bad + INNER JOIN egcl_billdetial as bd on bd.id = bad.billdetailid + INNER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid + INNER JOIN egcl_payment as payment on pd.paymentid=payment.id + WHERE bd.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' + and pd.createdby::INTEGER in (select user_id from eg_userrole_v1 where role_code ='SEVA_KENDRA_EMP') + GROUP BY pd.receiptnumber + ) + SELECT + bill.tenantid AS tenantid, + bill.id, + pt_detail.property AS propertyid, + pt_detail.assessmentnumber AS assessmentnumber, + bill.consumercode, + pd.receiptdate, + to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, + payment.ifsccode AS bankname, + pd.receiptnumber, + payment.totalamountpaid as amount, + payment.paymentmode as instrumenttype, + payment.transactionnumber, + receipt_breakup.*, + pd.due AS pendingamount, + pt_detail.financialyear, + to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, + Initcap(COALESCE(pt_detail.usagecategoryminor, pt_detail.usagecategorymajor)) as usagetype, + manualreceiptnumber as g8receiptno, + (CASE WHEN collectiontype='COUNTER' THEN eg_user.name ELSE '' END) as collectorname, + pt_detail.additionaldetails->>'remarks' as "remarks" + FROM egcl_bill AS bill + INNER JOIN egcl_billdetial as bd on bd.billid = bill.id + LEFT OUTER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid + LEFT OUTER JOIN egcl_payment as payment on pd.paymentid=payment.id + JOIN eg_pt_propertydetail_v2 pt_detail ON pt_detail.property = bill.consumercode + JOIN eg_pt_address_v2 pt_addr ON pt_detail.property = pt_addr.property + JOIN receipt_breakup ON receipt_breakup.receiptnumber = pd.receiptnumber + LEFT OUTER JOIN eg_user ON eg_user.id = pd.createdby::INTEGER + WHERE bd.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' + and pd.createdby::INTEGER in (select user_id from eg_userrole_v1 where role_code ='SEVA_KENDRA_EMP') + orderby: ORDER BY pd.receiptdate DESC + + +- reportName: ReceiptRegisterSummary_V2 + summary: Receipt Register Summary + version: 1.0.0 + moduleName: rainmaker-pt + additionalConfig: + print: + pdfPageSize: "A1" + sourceColumns: + - name: ulb + label: reports.pt.ulb + type: string + source: pt + total: false + - name: adhocpenalty + label: reports.pt.adhocpenalty + type: string + source: pt + total: true + - name: adhocrebate + label: reports.pt.adhocrebate + type: string + source: pt + total: true + - name: firecess + label: reports.pt.firecess + type: string + source: pt + total: true + - name: cancercess + label: reports.pt.cancercess + type: string + source: pt + total: true + - name: interest + label: reports.pt.interest + type: string + source: pt + total: true + - name: penalty + label: reports.pt.penalty + type: string + source: pt + total: true + - name: rebate + label: reports.pt.rebate + type: string + source: pt + total: true + - name: propertytax + label: reports.pt.propertytax + type: string + source: pt + total: true + - name: exemption + label: reports.pt.exemption + type: string + source: pt + total: true + - name: adjustment + label: reports.pt.adjustment + type: string + source: pt + total: true + - name: adhocrebate + label: reports.pt.adhocrebate + type: string + source: pt + total: true + - name: noofassessments + label: reports.pt.noofassessments + type: string + source: pt + total: true + - name: collectorname + label: reports.pt.collectorname + type: string + source: pt + total: false + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: true + searchClause: AND rh.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: true + searchClause: AND rh.receiptdate <= $toDate + - name: collectorname + label: reports.pt.collectorname + type: singlevaluelist + pattern: http://egov-hrms:8080/egov-hrms/employees/_search?tenantId=$tenantid&roles=PTCEMP|$.Employees[*].user.id|$.Employees[*].user.name + source: pt + wrapper: true + isMandatory: false + searchClause: AND eg_user.id = $collectorname::INTEGER + query: | + -- Use CTE to force query plan, compute & use CTE later + SELECT + split_part(bd.tenantid,'.',2) as ulb, + Count (*)/8 noofassessments, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, + SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as propertytax, + (SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN adjustedamount ELSE 0 END) )as exemption, + ( SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END)) as adjustment, + (CASE WHEN collectiontype='COUNTER' THEN eg_user.name ELSE 'Online' END) as collectorname, + sum(adjustedamount) as totalamount + FROM egcl_billaccountdetail as bad + INNER JOIN egcl_billdetial as bd on bd.id = bad.billdetailid + INNER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid + INNER JOIN egcl_payment as payment on pd.paymentid=payment.id + LEFT OUTER JOIN eg_user ON eg_user.id = pd.createdby::INTEGER + WHERE bd.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' + groupby: group by collectorname,bd.tenantid + +- reportName: StateReceiptRegisterSummary_V2 + summary: Receipt Register Summary + version: 1.0.0 + moduleName: rainmaker-pt + additionalConfig: + print: + pdfPageSize: "A1" + sourceColumns: + - name: ulb + label: reports.pt.ulb + type: string + source: pt + total: false + - name: adhocpenalty + label: reports.pt.adhocpenalty + type: string + source: pt + total: true + - name: adhocrebate + label: reports.pt.adhocrebate + type: string + source: pt + total: true + - name: firecess + label: reports.pt.firecess + type: string + source: pt + total: true + - name: cancercess + label: reports.pt.cancercess + type: string + source: pt + total: true + - name: interest + label: reports.pt.interest + type: string + source: pt + total: true + - name: penalty + label: reports.pt.penalty + type: string + source: pt + total: true + - name: rebate + label: reports.pt.rebate + type: string + source: pt + total: true + - name: propertytax + label: reports.pt.propertytax + type: string + source: pt + total: true + - name: exemption + label: reports.pt.exemption + type: string + source: pt + total: true + - name: adjustment + label: reports.pt.adjustment + type: string + source: pt + total: true + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: false + searchClause: AND rh.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: false + searchClause: AND rh.receiptdate <= $toDate + - name: ulb + label: ULB + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: pt + wrapper: true + isMandatory: false + searchClause: AND rd.tenantid = $ulb + query: | + -- Use CTE to force query plan, compute & use CTE later + SELECT + split_part(bd.tenantid,'.',2) as ulb, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, + SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as propertytax, + (SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN adjustedamount ELSE 0 END) )as exemption, + ( SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END)) as adjustment + FROM egcl_billaccountdetail as bad + INNER JOIN egcl_billdetial as bd on bd.id = bad.billdetailid + INNER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid + WHERE bd.tenantid = 'pb.testing' and pd.businessservice='PT' + groupby: group by bd.tenantid + orderby: order by bd.tenantid + +- reportName: FYCollectionsReport_V2 + summary: FY Collections + version: 1.0.0 + moduleName: rainmaker-pt + additionalConfig: + print: + pdfPageSize: "Legal" + sourceColumns: + - name: financialyear + label: reports.pt.financialyear + type: string + source: pt + total: false + - name: residential + label: reports.pt.residential + type: string + source: pt + total: true + - name: nonresidential + label: reports.pt.nonresidential + type: string + source: pt + total: true + - name: mixed + label: reports.pt.mixed + type: string + source: pt + total: true + - name: totalamount + label: reports.pt.totalamount + type: string + source: pt + total: true + - name: online + label: reports.pt.online + type: string + source: pt + total: true + - name: cash + label: reports.pt.cash + type: string + source: pt + total: true + - name: cheque + label: reports.pt.cheque + type: string + source: pt + total: true + - name: dd + label: reports.pt.dd + type: string + source: pt + total: true + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: false + searchClause: AND rh.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: false + searchClause: AND rh.receiptdate <= $toDate + - name: localityArray + label: reports.pt.zoneList + type: boundarylist + source: pt + isMandatory: false + searchClause: AND pt_addr.locality IN ($localityArray) + query: | + -- Use CTE to force query plan, compute & use CTE later + SELECT + financialyear, + sum(case when pt_detail.usagecategorymajor='RESIDENTIAL' then pd.amountpaid else 0 end) as "residential", + sum(case when pt_detail.usagecategorymajor='NONRESIDENTIAL' then pd.amountpaid else 0 end) as "nonresidential", + sum(case when pt_detail.usagecategorymajor='MIXED' then pd.amountpaid else 0 end) as "mixed", + sum(pd.amountpaid) as totalamount, + sum(case when payment.paymentmode='ONLINE' then pd.amountpaid else 0 end) as "online", + sum(case when payment.paymentmode='CASH' then pd.amountpaid else 0 end) as "cash", + sum(case when payment.paymentmode='CHEQUE' then pd.amountpaid else 0 end) as "cheque", + sum(case when payment.paymentmode='DD' then pd.amountpaid else 0 end) as "dd" + FROM egcl_paymentdetail AS pd + join egcl_payment as payment on payment.id = pd.paymentid + join egcl_bill as bill on bill.id = pd.billid + JOIN eg_pt_propertydetail_v2 pt_detail ON pt_detail.property = bill.consumercode + JOIN eg_pt_address_v2 pt_addr ON pt_detail.property = pt_addr.property + LEFT OUTER JOIN eg_user ON eg_user.id = pd.createdby::INTEGER + WHERE pd.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' + groupby: GROUP BY financialyear + orderby: ORDER BY financialyear + +- reportName: ULBDEFAULTERPTREPORT_V2 + summary: ULB Defaulter Pt report + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: ulb + label: reports.pt.ulb + type: string + source: pt + total: false + - name: propertytaxuniqueid + label: reports.pt.propertytaxuniqueid + type: string + source: pt + total: false + - name: transcationdate + label: reports.pt.transcationdate + type: string + source: pt + total: false + - name: receiptnumber + label: reports.pt.receiptnumber + type: string + source: pt + total: false + - name: existingpropertyid + label: reports.pt.existingpropertyid + type: string + source: pt + total: false + - name: financialyear + label: reports.pt.financialYear + type: string + source: pt + total: false + - name: ownername + label: reports.pt.ownername + type: string + source: pt + total: false + - name: guardianname + label: reports.pt.guardianname + type: string + source: pt + total: false + - name: propertytype + label: reports.pt.propertytype + type: string + source: pt + total: false + - name: mobileno + label: reports.pt.mobileno + type: string + source: pt + total: false + - name: address + label: reports.pt.address + type: string + source: pt + total: false + - name: payeraddress + label: reports.pt.payeraddress + type: string + source: pt + total: false + searchParams: + - name: localityArray + label: reports.pt.zoneList + type: boundarylist + source: pt + isMandatory: true + searchClause: AND pta.locality IN ($localityArray) + query: | + --S.no Service Name ULB Property Tax Unique ID Date Of Transcation Receipt Number Existing Property ID Type Of Property Mobile Number Address + with eg_pt_unit_v2_ot as ( + select + propertydetail, + string_agg(distinct pu.occupancytype, ',') as occupancytype, + string_agg(distinct coalesce(usagecategoryminor, usagecategorymajor), ',') as propertytype + from eg_pt_unit_v2 as pu + where pu.tenantid = $tenantid + group by propertydetail + ) + select + distinct on (payd.receiptnumber) + initcap(split_part(payd.tenantid, '.', 2)) as "ulb", + split_part(consumercode, ':', 1) as "propertytaxuniqueid", + to_char((To_timestamp(payd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS "transcationdate", + payd.receiptnumber as "receiptnumber", + pt.oldpropertyid as "existingpropertyid", + pd.financialyear as "financialyear", + eu."name" as "ownername", + eu.guardian as "guardianname", + pot.propertytype as "propertytype", + eu.mobilenumber as "mobileno", + REGEXP_REPLACE(REGEXP_REPLACE(CONCAT(pta.doorno, ',', pta.addressline1, ',', pta.addressline2, ',', pta.buildingname, ',', pta.pincode), ',+', ','), '^,|,$', '') as "address" + from egcl_paymentdetail as payd + inner join egcl_bill as bill on bill.id=payd.billid + inner join eg_pt_property_v2 as pt on pt.propertyid = bill.consumercode + inner join eg_pt_propertydetail_v2 as pd on pd.property = pt.propertyid + inner join eg_pt_owner_v2 as po on po.propertydetail = pd.assessmentnumber + inner join eg_user as eu on eu.uuid = po.userid + inner join eg_pt_address_v2 as pta on pta.property = pt.propertyid + left outer join eg_pt_unit_v2_ot as pot on pot.propertydetail = pd.assessmentnumber + where payd.tenantid = $tenantid and pd.property not in (select property from eg_pt_propertydetail_v2 where financialyear in ('2019-20')) From 5f3bd9452fc241e41a311e74ac688427ae41103c Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 19 Aug 2020 19:00:21 +0530 Subject: [PATCH 0047/1242] Adding monitoring stack for pb-uat-v2 --- .../kube-cluster-dashboard.json | 5629 +++++++++++++++++ .../nginx-ingress-dashboard.json | 1463 +++++ 2 files changed, 7092 insertions(+) create mode 100644 configs/monitoring-dashboards/kube-cluster-dashboard.json create mode 100644 configs/monitoring-dashboards/nginx-ingress-dashboard.json diff --git a/configs/monitoring-dashboards/kube-cluster-dashboard.json b/configs/monitoring-dashboards/kube-cluster-dashboard.json new file mode 100644 index 00000000..72a0fccc --- /dev/null +++ b/configs/monitoring-dashboards/kube-cluster-dashboard.json @@ -0,0 +1,5629 @@ +{ + "annotations": { + "list": [ + { + "builtIn": 1, + "datasource": "-- Grafana --", + "enable": true, + "hide": true, + "iconColor": "rgba(0, 211, 255, 1)", + "name": "Annotations & Alerts", + "type": "dashboard" + } + ] + }, + "description": "This dashboard can help troubleshooting issue in k8s cluster at cluster, node and namespace level.", + "editable": true, + "gnetId": 11802, + "graphTooltip": 0, + "id": 5, + "iteration": 1595353603518, + "links": [], + "panels": [ + { + "collapsed": true, + "datasource": "Prometheus", + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 0 + }, + "id": 37, + "panels": [ + { + "cacheTimeout": null, + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {}, + "mappings": [], + "noValue": "N/A", + "nullValueMode": "connected", + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + } + ] + }, + "unit": "s" + }, + "overrides": [] + }, + "gridPos": { + "h": 3, + "w": 5, + "x": 0, + "y": 1 + }, + "id": 98, + "interval": null, + "links": [], + "maxDataPoints": 100, + "options": { + "colorMode": "value", + "fieldOptions": { + "calcs": [ + "lastNotNull" + ] + }, + "graphMode": "none", + "justifyMode": "auto", + "orientation": "horizontal", + "reduceOptions": { + "calcs": [ + "mean" + ], + "fields": "", + "values": false + } + }, + "pluginVersion": "7.0.5", + "targets": [ + { + "expr": "sum(time() - kube_service_created{namespace=\"default\",service=\"kubernetes\"})", + "hide": false, + "instant": true, + "interval": "", + "legendFormat": "", + "refId": "B" + } + ], + "timeFrom": null, + "timeShift": null, + "title": "Cluster age", + "transformations": [], + "transparent": true, + "type": "stat" + }, + { + "cacheTimeout": null, + "colorBackground": false, + "colorValue": false, + "colors": [ + "#299c46", + "#37872D", + "#d44a3a" + ], + "datasource": "Prometheus", + "description": "", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, + "gridPos": { + "h": 3, + "w": 3, + "x": 5, + "y": 1 + }, + "id": 131, + "interval": null, + "links": [], + "mappingType": 1, + "mappingTypes": [ + { + "name": "value to text", + "value": 1 + }, + { + "name": "range to text", + "value": 2 + } + ], + "maxDataPoints": 100, + "nullPointMode": "connected", + "nullText": null, + "postfix": "", + "postfixFontSize": "50%", + "prefix": "", + "prefixFontSize": "50%", + "rangeMaps": [ + { + "from": "null", + "text": "N/A", + "to": "null" + } + ], + "sparkline": { + "fillColor": "rgba(31, 118, 189, 0.18)", + "full": false, + "lineColor": "rgb(31, 120, 193)", + "show": true, + "ymax": null, + "ymin": null + }, + "tableColumn": "", + "targets": [ + { + "expr": " count(kube_namespace_created)", + "hide": false, + "instant": false, + "interval": "", + "legendFormat": "{{pod}}", + "refId": "A" + }, + { + "expr": "", + "hide": true, + "refId": "B" + } + ], + "thresholds": "", + "timeFrom": null, + "timeShift": null, + "title": "Namespaces ", + "transparent": true, + "type": "singlestat", + "valueFontSize": "80%", + "valueMaps": [ + { + "op": "=", + "text": "N/A", + "value": "null" + } + ], + "valueName": "current" + }, + { + "cacheTimeout": null, + "colorBackground": false, + "colorValue": false, + "colors": [ + "#299c46", + "#37872D", + "#d44a3a" + ], + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, + "gridPos": { + "h": 3, + "w": 3, + "x": 8, + "y": 1 + }, + "id": 76, + "interval": null, + "links": [], + "mappingType": 1, + "mappingTypes": [ + { + "name": "value to text", + "value": 1 + }, + { + "name": "range to text", + "value": 2 + } + ], + "maxDataPoints": 100, + "nullPointMode": "connected", + "nullText": null, + "postfix": "", + "postfixFontSize": "50%", + "prefix": "", + "prefixFontSize": "50%", + "rangeMaps": [ + { + "from": "null", + "text": "N/A", + "to": "null" + } + ], + "sparkline": { + "fillColor": "rgba(31, 118, 189, 0.18)", + "full": false, + "lineColor": "rgb(31, 120, 193)", + "show": true, + "ymax": null, + "ymin": null + }, + "tableColumn": "", + "targets": [ + { + "expr": " count(count by (pod)(container_spec_memory_reservation_limit_bytes{pod!=\"\"}))", + "hide": false, + "instant": false, + "legendFormat": "{{pod}}", + "refId": "A" + }, + { + "expr": "", + "hide": true, + "refId": "B" + } + ], + "thresholds": "", + "timeFrom": null, + "timeShift": null, + "title": "Total pods", + "transparent": true, + "type": "singlestat", + "valueFontSize": "80%", + "valueMaps": [ + { + "op": "=", + "text": "N/A", + "value": "null" + } + ], + "valueName": "current" + }, + { + "cacheTimeout": null, + "colorBackground": false, + "colorValue": true, + "colors": [ + "#299c46", + "#37872D", + "#d44a3a" + ], + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, + "gridPos": { + "h": 3, + "w": 3, + "x": 11, + "y": 1 + }, + "id": 60, + "interval": null, + "links": [], + "mappingType": 1, + "mappingTypes": [ + { + "name": "value to text", + "value": 1 + }, + { + "name": "range to text", + "value": 2 + } + ], + "maxDataPoints": 100, + "nullPointMode": "connected", + "nullText": null, + "postfix": "", + "postfixFontSize": "50%", + "prefix": "", + "prefixFontSize": "50%", + "rangeMaps": [ + { + "from": "null", + "text": "N/A", + "to": "null" + } + ], + "sparkline": { + "fillColor": "rgba(31, 118, 189, 0.18)", + "full": false, + "lineColor": "rgb(31, 120, 193)", + "show": true, + "ymax": null, + "ymin": null + }, + "tableColumn": "", + "targets": [ + { + "expr": "count(kube_pod_container_status_waiting !=0 ) or vector(0)", + "hide": false, + "instant": false, + "interval": "", + "legendFormat": "{{pod}}", + "refId": "A" + }, + { + "expr": "", + "hide": true, + "refId": "B" + } + ], + "thresholds": "0,1", + "timeFrom": null, + "timeShift": null, + "title": "Waiting pods", + "transparent": true, + "type": "singlestat", + "valueFontSize": "80%", + "valueMaps": [ + { + "op": "=", + "text": "N/A", + "value": "null" + } + ], + "valueName": "current" + }, + { + "cacheTimeout": null, + "colorBackground": false, + "colorValue": true, + "colors": [ + "#299c46", + "#37872D", + "#d44a3a" + ], + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, + "gridPos": { + "h": 3, + "w": 3, + "x": 14, + "y": 1 + }, + "id": 61, + "interval": null, + "links": [], + "mappingType": 1, + "mappingTypes": [ + { + "name": "value to text", + "value": 1 + }, + { + "name": "range to text", + "value": 2 + } + ], + "maxDataPoints": 100, + "nullPointMode": "connected", + "nullText": null, + "postfix": "", + "postfixFontSize": "50%", + "prefix": "", + "prefixFontSize": "50%", + "rangeMaps": [ + { + "from": "null", + "text": "N/A", + "to": "null" + } + ], + "sparkline": { + "fillColor": "rgba(31, 118, 189, 0.18)", + "full": false, + "lineColor": "rgb(31, 120, 193)", + "show": true, + "ymax": null, + "ymin": null + }, + "tableColumn": "", + "targets": [ + { + "expr": "count(kube_pod_container_status_terminated_reason{reason!=\"Completed\"} !=0 ) or vector(0)", + "hide": false, + "instant": false, + "legendFormat": "{{pod}}", + "refId": "A" + }, + { + "expr": "", + "hide": true, + "refId": "B" + } + ], + "thresholds": "0,1", + "timeFrom": null, + "timeShift": null, + "title": "Terminated pods", + "transparent": true, + "type": "singlestat", + "valueFontSize": "80%", + "valueMaps": [ + { + "op": "=", + "text": "N/A", + "value": "null" + } + ], + "valueName": "current" + }, + { + "cacheTimeout": null, + "colorBackground": false, + "colorValue": false, + "colors": [ + "#299c46", + "#37872D", + "#d44a3a" + ], + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, + "gridPos": { + "h": 3, + "w": 3, + "x": 17, + "y": 1 + }, + "id": 74, + "interval": null, + "links": [], + "mappingType": 1, + "mappingTypes": [ + { + "name": "value to text", + "value": 1 + }, + { + "name": "range to text", + "value": 2 + } + ], + "maxDataPoints": 100, + "nullPointMode": "connected", + "nullText": null, + "postfix": "", + "postfixFontSize": "50%", + "prefix": "", + "prefixFontSize": "50%", + "rangeMaps": [ + { + "from": "null", + "text": "N/A", + "to": "null" + } + ], + "sparkline": { + "fillColor": "rgba(31, 118, 189, 0.18)", + "full": false, + "lineColor": "rgb(31, 120, 193)", + "show": true, + "ymax": null, + "ymin": null + }, + "tableColumn": "", + "targets": [ + { + "expr": "sum(count by (pod)(container_spec_memory_reservation_limit_bytes{id=~\".*.burstable.*\",id!~\".*.scope\",pod!=\"\"}))", + "hide": false, + "instant": false, + "interval": "", + "legendFormat": "{{pod}}", + "refId": "A" + }, + { + "expr": "", + "hide": true, + "refId": "B" + } + ], + "thresholds": "0,1", + "timeFrom": null, + "timeShift": null, + "title": "burstable pods", + "transparent": true, + "type": "singlestat", + "valueFontSize": "80%", + "valueMaps": [ + { + "op": "=", + "text": "N/A", + "value": "null" + } + ], + "valueName": "current" + }, + { + "cacheTimeout": null, + "colorBackground": false, + "colorValue": false, + "colors": [ + "#299c46", + "#37872D", + "#d44a3a" + ], + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, + "gridPos": { + "h": 3, + "w": 2, + "x": 20, + "y": 1 + }, + "id": 73, + "interval": null, + "links": [], + "mappingType": 1, + "mappingTypes": [ + { + "name": "value to text", + "value": 1 + }, + { + "name": "range to text", + "value": 2 + } + ], + "maxDataPoints": 100, + "nullPointMode": "connected", + "nullText": null, + "postfix": "", + "postfixFontSize": "50%", + "prefix": "", + "prefixFontSize": "50%", + "rangeMaps": [ + { + "from": "null", + "text": "N/A", + "to": "null" + } + ], + "sparkline": { + "fillColor": "rgba(31, 118, 189, 0.18)", + "full": false, + "lineColor": "rgb(31, 120, 193)", + "show": true, + "ymax": null, + "ymin": null + }, + "tableColumn": "", + "targets": [ + { + "expr": "count(count by (pod)(container_spec_memory_reservation_limit_bytes{id=~\".*.besteffort.*\",id!~\".*.scope\",pod!=\"\"}))", + "hide": false, + "instant": false, + "interval": "", + "legendFormat": "{{pod}}", + "refId": "A" + }, + { + "expr": "", + "hide": true, + "refId": "B" + } + ], + "thresholds": "0,1", + "timeFrom": null, + "timeShift": null, + "title": "Besteffort pods", + "transparent": true, + "type": "singlestat", + "valueFontSize": "80%", + "valueMaps": [ + { + "op": "=", + "text": "N/A", + "value": "null" + } + ], + "valueName": "current" + }, + { + "cacheTimeout": null, + "colorBackground": false, + "colorValue": false, + "colors": [ + "#299c46", + "#37872D", + "#d44a3a" + ], + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, + "gridPos": { + "h": 3, + "w": 2, + "x": 22, + "y": 1 + }, + "id": 59, + "interval": null, + "links": [], + "mappingType": 1, + "mappingTypes": [ + { + "name": "value to text", + "value": 1 + }, + { + "name": "range to text", + "value": 2 + } + ], + "maxDataPoints": 100, + "nullPointMode": "connected", + "nullText": null, + "postfix": "", + "postfixFontSize": "50%", + "prefix": "", + "prefixFontSize": "50%", + "rangeMaps": [ + { + "from": "null", + "text": "N/A", + "to": "null" + } + ], + "sparkline": { + "fillColor": "rgba(31, 118, 189, 0.18)", + "full": false, + "lineColor": "rgb(31, 120, 193)", + "show": false, + "ymax": null, + "ymin": null + }, + "tableColumn": "", + "targets": [ + { + "expr": "count(kube_persistentvolumeclaim_info) ", + "hide": false, + "instant": false, + "legendFormat": "{{pod}}", + "refId": "A" + }, + { + "expr": "", + "hide": true, + "refId": "B" + } + ], + "thresholds": "0", + "timeFrom": null, + "timeShift": null, + "title": "PVCs", + "transparent": true, + "type": "singlestat", + "valueFontSize": "80%", + "valueMaps": [ + { + "op": "=", + "text": "N/A", + "value": "null" + } + ], + "valueName": "current" + }, + { + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": { + "align": null + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [ + { + "matcher": { + "id": "byName", + "options": "osVersion" + }, + "properties": [ + { + "id": "custom.width", + "value": 360 + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "Docker version" + }, + "properties": [ + { + "id": "custom.width", + "value": 120 + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "Node name" + }, + "properties": [ + { + "id": "custom.width", + "value": 213 + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "No. of pods" + }, + "properties": [ + { + "id": "custom.width", + "value": 104 + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "dockerVersion" + }, + "properties": [ + { + "id": "custom.width", + "value": 123 + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "instance" + }, + "properties": [ + { + "id": "custom.width", + "value": 147 + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "Memory used" + }, + "properties": [ + { + "id": "custom.width", + "value": 109 + }, + { + "id": "unit", + "value": "percentunit" + }, + { + "id": "thresholds", + "value": { + "mode": "percentage", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + { + "id": "custom.displayMode", + "value": "lcd-gauge" + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "kernelVersion" + }, + "properties": [ + { + "id": "custom.width", + "value": 140 + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "node" + }, + "properties": [ + { + "id": "custom.width", + "value": 204 + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "Pod capacity used" + }, + "properties": [ + { + "id": "custom.width", + "value": 142 + }, + { + "id": "unit", + "value": "none" + }, + { + "id": "custom.displayMode", + "value": "auto" + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "CPU usage" + }, + "properties": [ + { + "id": "custom.width", + "value": 91 + }, + { + "id": "unit", + "value": "percentunit" + }, + { + "id": "thresholds", + "value": { + "mode": "percentage", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + { + "id": "custom.displayMode", + "value": "lcd-gauge" + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "K8s version" + }, + "properties": [ + { + "id": "custom.width", + "value": 105 + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "OS version" + }, + "properties": [ + { + "id": "custom.width", + "value": 178 + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "pod_cidr" + }, + "properties": [ + { + "id": "custom.width", + "value": 122 + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "Kernel version" + }, + "properties": [ + { + "id": "custom.width", + "value": 122 + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "Pod count" + }, + "properties": [ + { + "id": "custom.width", + "value": 88 + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "role" + }, + "properties": [ + { + "id": "custom.width", + "value": 72 + } + ] + } + ] + }, + "gridPos": { + "h": 10, + "w": 8, + "x": 0, + "y": 4 + }, + "id": 64, + "options": { + "angular": { + "decimals": 0, + "defaultColor": "#37872D", + "format": "none", + "linkIndex": "0", + "linkVars": [], + "mathColorValue": "data[end]", + "mathDisplayValue": "data[end]", + "mathScratchPad": "data = size(data)[1] == 0 ? [NaN] : data", + "options": {}, + "radius": "25px", + "thresholds": [ + { + "color": "#37872D", + "value": "1" + }, + { + "color": "#C4162A", + "value": "0" + } + ] + }, + "frameIndex": 0, + "showHeader": true + }, + "pluginVersion": "7.0.5", + "targets": [ + { + "expr": "kube_node_info", + "format": "table", + "hide": false, + "instant": true, + "interval": "", + "legendFormat": "{{node}}", + "refId": "A" + }, + { + "expr": " (count by (node)(container_spec_memory_reservation_limit_bytes{pod!=\"\"}))", + "format": "table", + "hide": false, + "instant": true, + "interval": "", + "legendFormat": "", + "refId": "B" + }, + { + "expr": "((label_replace((node_memory_MemTotal_bytes + on(instance) group_left(nodename) \nnode_uname_info),\"node\",\"$1\",\"nodename\", \"(.+)\")) - (label_replace((node_memory_MemAvailable_bytes + on(instance) group_left(nodename) \nnode_uname_info),\"node\",\"$1\",\"nodename\", \"(.+)\"))) / (label_replace((node_memory_MemTotal_bytes + on(instance) group_left(nodename) \nnode_uname_info),\"node\",\"$1\",\"nodename\", \"(.+)\")) ", + "format": "table", + "instant": true, + "interval": "", + "legendFormat": "", + "refId": "C" + }, + { + "expr": "max\n by(node) (max by(instance) (kubelet_running_pod_count{job=\"kubelet\",metrics_path=\"/metrics\"})\n * on(instance) group_left(node) kubelet_node_name{job=\"kubelet\",metrics_path=\"/metrics\"})\n", + "format": "table", + "instant": true, + "interval": "", + "legendFormat": "", + "refId": "D" + }, + { + "expr": "sum by (node)(label_replace(instance:node_cpu:ratio + on(instance) group_left(nodename) \nnode_uname_info,\"node\",\"$1\",\"nodename\", \"(.+)\") ) / sum by (node)(kube_node_status_capacity{resource=\"cpu\"})", + "format": "table", + "instant": true, + "interval": "", + "legendFormat": "", + "refId": "E" + }, + { + "expr": "kube_node_role", + "format": "table", + "interval": "", + "legendFormat": "", + "refId": "F" + } + ], + "timeFrom": null, + "timeShift": null, + "title": "cluster node details", + "transformations": [ + { + "id": "filterFieldsByName", + "options": { + "include": { + "names": [ + "container_runtime_version", + "kernel_version", + "kubelet_version", + "node", + "os_image", + "pod_cidr", + "provider_id", + "Value #C", + "Value #D", + "Value #E", + "role" + ] + } + } + }, + { + "id": "seriesToColumns", + "options": { + "byField": "node" + } + }, + { + "id": "organize", + "options": { + "excludeByName": {}, + "indexByName": { + "Value #C": 2, + "Value #D": 4, + "Value #E": 3, + "container_runtime_version": 9, + "kernel_version": 7, + "kubelet_version": 5, + "node": 0, + "os_image": 8, + "pod_cidr": 6, + "provider_id": 10, + "role": 1 + }, + "renameByName": { + "Value #C": "Memory used", + "Value #D": "Pod count", + "Value #E": "CPU usage", + "container_runtime_version": "Docker version", + "kernel_version": "Kernel version", + "kubelet_version": "K8s version", + "node": "Node name", + "os_image": "OS version", + "provider_id": "" + } + } + } + ], + "transparent": true, + "type": "table" + }, + { + "aliasColors": {}, + "bars": false, + "cacheTimeout": null, + "dashLength": 10, + "dashes": false, + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fill": 0, + "fillGradient": 0, + "gridPos": { + "h": 10, + "w": 8, + "x": 8, + "y": 4 + }, + "hiddenSeries": false, + "id": 68, + "legend": { + "avg": false, + "current": false, + "hideEmpty": true, + "hideZero": true, + "max": true, + "min": false, + "show": true, + "total": false, + "values": true + }, + "lines": true, + "linewidth": 1, + "links": [], + "nullPointMode": "null", + "options": { + "dataLinks": [] + }, + "percentage": false, + "pluginVersion": "6.5.2", + "pointradius": 2, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "sort(sum by (node)(container_memory_usage_bytes{pod!=\"POD\",namespace!=\"\"}))", + "hide": true, + "legendFormat": "{{node}}", + "refId": "A" + }, + { + "expr": "(sum by (namespace)(container_memory_usage_bytes{pod!=\"POD\",namespace!=\"\"}))", + "legendFormat": "{{namespace}}", + "refId": "B" + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "Memory usage by namespace in cluster", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "transparent": true, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "decbytes", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, + { + "aliasColors": {}, + "bars": false, + "cacheTimeout": null, + "dashLength": 10, + "dashes": false, + "datasource": "Prometheus", + "description": "", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fill": 0, + "fillGradient": 0, + "gridPos": { + "h": 9, + "w": 8, + "x": 16, + "y": 4 + }, + "hiddenSeries": false, + "id": 121, + "legend": { + "avg": false, + "current": false, + "hideEmpty": true, + "hideZero": false, + "max": false, + "min": false, + "rightSide": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "links": [], + "nullPointMode": "null as zero", + "options": { + "dataLinks": [] + }, + "percentage": false, + "pluginVersion": "6.5.2", + "pointradius": 2, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": " histogram_quantile(0.99,\n sum by(instance, le) (rate(kubelet_pod_worker_duration_seconds_bucket{job=\"kubelet\",metrics_path=\"/metrics\"}[10m])))\n * on(instance) group_left(node) kubelet_node_name{job=\"kubelet\",metrics_path=\"/metrics\"}", + "instant": false, + "interval": "", + "legendFormat": "{{node}} ", + "refId": "A" + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "Pod startup latency", + "tooltip": { + "shared": true, + "sort": 2, + "value_type": "individual" + }, + "transparent": true, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "decimals": null, + "format": "s", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": false + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + } + ], + "title": "Overall cluster status", + "type": "row" + }, + { + "collapsed": true, + "datasource": null, + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 1 + }, + "id": 135, + "panels": [ + { + "cacheTimeout": null, + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": { + "align": "left" + }, + "mappings": [ + { + "id": 0, + "op": "=", + "text": "0", + "type": 1, + "value": "null" + } + ], + "nullValueMode": "connected", + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "#299c46", + "value": null + }, + { + "color": "#37872D", + "value": 0 + }, + { + "color": "#d44a3a" + } + ] + }, + "unit": "percentunit" + }, + "overrides": [] + }, + "gridPos": { + "h": 6, + "w": 10, + "x": 0, + "y": 2 + }, + "id": 133, + "interval": null, + "links": [], + "maxDataPoints": 100, + "options": { + "displayMode": "lcd", + "orientation": "horizontal", + "reduceOptions": { + "calcs": [ + "mean" + ], + "fields": "", + "values": false + }, + "showUnfilled": true + }, + "pluginVersion": "7.0.5", + "targets": [ + { + "expr": "kubelet_volume_stats_available_bytes{job=\"kubelet\",metrics_path=\"/metrics\",namespace=\"$namespace\"}\n / kubelet_volume_stats_capacity_bytes{job=\"kubelet\",metrics_path=\"/metrics\",namespace=\"$namespace\"}\n ", + "format": "time_series", + "hide": false, + "instant": true, + "interval": "", + "legendFormat": "{{persistentvolumeclaim}}", + "refId": "A" + }, + { + "expr": "", + "hide": true, + "refId": "B" + } + ], + "timeFrom": null, + "timeShift": null, + "title": "PVCs available capacity in namespacee $namespace", + "transparent": true, + "type": "bargauge" + }, + { + "aliasColors": { + "ReadOnly::k8s-aboutmckinsey-intranet-aboutmckinsey-prod-pvc-0::intranet-aboutmckinsey-prod-85c4d8fcd6-cq4vv": "dark-red", + "Total": "dark-red" + }, + "bars": false, + "cacheTimeout": null, + "dashLength": 10, + "dashes": false, + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fill": 0, + "fillGradient": 0, + "gridPos": { + "h": 6, + "w": 10, + "x": 10, + "y": 2 + }, + "hiddenSeries": false, + "id": 50, + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, + "rightSide": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "links": [], + "nullPointMode": "null", + "options": { + "dataLinks": [] + }, + "percentage": false, + "pointradius": 2, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "(kube_persistentvolumeclaim_access_mode{namespace=\"$namespace\"})", + "format": "time_series", + "hide": false, + "legendFormat": "{{access_mode}}::{{persistentvolumeclaim}}", + "refId": "B" + }, + { + "expr": "kube_persistentvolumeclaim_status_phase{namespace=\"$namespace\",phase=\"Bound\"}", + "legendFormat": "Bound::{{persistentvolumeclaim}}", + "refId": "A" + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "persistentvolumeclaim status in namespace $namespace", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "transparent": true, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "none", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": false + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, + { + "cacheTimeout": null, + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {}, + "mappings": [ + { + "id": 0, + "op": "=", + "text": "0", + "type": 1, + "value": "null" + } + ], + "nullValueMode": "connected", + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "#299c46", + "value": null + }, + { + "color": "#37872D", + "value": 0 + }, + { + "color": "#d44a3a" + } + ] + }, + "unit": "none" + }, + "overrides": [] + }, + "gridPos": { + "h": 6, + "w": 2, + "x": 20, + "y": 2 + }, + "id": 106, + "interval": null, + "links": [], + "maxDataPoints": 100, + "options": { + "colorMode": "value", + "fieldOptions": { + "calcs": [ + "lastNotNull" + ] + }, + "graphMode": "none", + "justifyMode": "auto", + "orientation": "horizontal", + "reduceOptions": { + "calcs": [ + "mean" + ], + "fields": "", + "values": true + } + }, + "pluginVersion": "7.0.5", + "targets": [ + { + "expr": "count(kube_persistentvolume_status_phase{job=\"kube-state-metrics\",phase=\"Failed\",namespace=\"$namespace\"} != 0) ", + "hide": false, + "instant": true, + "interval": "", + "legendFormat": "", + "refId": "A" + } + ], + "timeFrom": null, + "timeShift": null, + "title": "PVCs Failed", + "transparent": true, + "type": "stat" + }, + { + "cacheTimeout": null, + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {}, + "mappings": [ + { + "id": 0, + "op": "=", + "text": "0", + "type": 1, + "value": "null" + } + ], + "nullValueMode": "connected", + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "#299c46", + "value": null + }, + { + "color": "#37872D", + "value": 0 + }, + { + "color": "#d44a3a" + } + ] + }, + "unit": "none" + }, + "overrides": [] + }, + "gridPos": { + "h": 6, + "w": 2, + "x": 22, + "y": 2 + }, + "id": 107, + "interval": null, + "links": [], + "maxDataPoints": 100, + "options": { + "colorMode": "value", + "fieldOptions": { + "calcs": [ + "lastNotNull" + ] + }, + "graphMode": "none", + "justifyMode": "auto", + "orientation": "horizontal", + "reduceOptions": { + "calcs": [ + "mean" + ], + "fields": "", + "values": true + } + }, + "pluginVersion": "7.0.5", + "targets": [ + { + "expr": "count(kube_persistentvolume_status_phase{job=\"kube-state-metrics\",phase=\"Pending\",namespace=\"$namespace\"} != 0)", + "hide": false, + "instant": true, + "interval": "", + "legendFormat": "", + "refId": "A" + } + ], + "timeFrom": null, + "timeShift": null, + "title": "PVCs Pending", + "transparent": true, + "type": "stat" + } + ], + "title": "Persistence Volumes", + "type": "row" + }, + { + "collapsed": false, + "datasource": "Prometheus", + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 2 + }, + "id": 41, + "panels": [], + "title": "Namespace $namespace details", + "type": "row" + }, + { + "cacheTimeout": null, + "colorBackground": false, + "colorValue": false, + "colors": [ + "#299c46", + "#37872D", + "#d44a3a" + ], + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, + "gridPos": { + "h": 3, + "w": 3, + "x": 0, + "y": 3 + }, + "id": 53, + "interval": null, + "links": [], + "mappingType": 1, + "mappingTypes": [ + { + "name": "value to text", + "value": 1 + }, + { + "name": "range to text", + "value": 2 + } + ], + "maxDataPoints": 100, + "nullPointMode": "connected", + "nullText": null, + "postfix": "", + "postfixFontSize": "50%", + "prefix": "", + "prefixFontSize": "50%", + "rangeMaps": [ + { + "from": "null", + "text": "N/A", + "to": "null" + } + ], + "sparkline": { + "fillColor": "rgba(31, 118, 189, 0.18)", + "full": false, + "lineColor": "rgb(31, 120, 193)", + "show": true, + "ymax": null, + "ymin": null + }, + "tableColumn": "", + "targets": [ + { + "expr": "count(kube_deployment_created{namespace=\"$namespace\"})", + "hide": false, + "instant": false, + "legendFormat": "{{deployment}}", + "refId": "A" + }, + { + "expr": "", + "hide": true, + "refId": "B" + } + ], + "thresholds": "0,1", + "timeFrom": null, + "timeShift": null, + "title": "Deployments", + "transparent": true, + "type": "singlestat", + "valueFontSize": "80%", + "valueMaps": [ + { + "op": "=", + "text": "N/A", + "value": "null" + } + ], + "valueName": "current" + }, + { + "cacheTimeout": null, + "colorBackground": false, + "colorValue": false, + "colors": [ + "#299c46", + "rgba(237, 129, 40, 0.89)", + "#d44a3a" + ], + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, + "gridPos": { + "h": 3, + "w": 3, + "x": 3, + "y": 3 + }, + "id": 44, + "interval": null, + "links": [], + "mappingType": 1, + "mappingTypes": [ + { + "name": "value to text", + "value": 1 + }, + { + "name": "range to text", + "value": 2 + } + ], + "maxDataPoints": 100, + "nullPointMode": "connected", + "nullText": null, + "postfix": "", + "postfixFontSize": "50%", + "prefix": "", + "prefixFontSize": "50%", + "rangeMaps": [ + { + "from": "null", + "text": "N/A", + "to": "null" + } + ], + "sparkline": { + "fillColor": "rgba(31, 118, 189, 0.18)", + "full": false, + "lineColor": "rgb(31, 120, 193)", + "show": true, + "ymax": null, + "ymin": null + }, + "tableColumn": "", + "targets": [ + { + "expr": "count(kube_pod_container_status_ready{namespace=\"$namespace\"} !=0 ) or vector(0)", + "hide": false, + "instant": false, + "interval": "", + "legendFormat": "{{pod}}", + "refId": "A" + }, + { + "expr": "", + "hide": true, + "refId": "B" + } + ], + "thresholds": "", + "timeFrom": null, + "timeShift": null, + "title": "Ready pods", + "transparent": true, + "type": "singlestat", + "valueFontSize": "80%", + "valueMaps": [ + { + "op": "=", + "text": "N/A", + "value": "null" + } + ], + "valueName": "current" + }, + { + "cacheTimeout": null, + "colorBackground": false, + "colorValue": true, + "colors": [ + "#299c46", + "#37872D", + "#d44a3a" + ], + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, + "gridPos": { + "h": 3, + "w": 3, + "x": 6, + "y": 3 + }, + "id": 42, + "interval": null, + "links": [], + "mappingType": 1, + "mappingTypes": [ + { + "name": "value to text", + "value": 1 + }, + { + "name": "range to text", + "value": 2 + } + ], + "maxDataPoints": 100, + "nullPointMode": "connected", + "nullText": null, + "postfix": "", + "postfixFontSize": "50%", + "prefix": "", + "prefixFontSize": "50%", + "rangeMaps": [ + { + "from": "null", + "text": "N/A", + "to": "null" + } + ], + "sparkline": { + "fillColor": "rgba(31, 118, 189, 0.18)", + "full": false, + "lineColor": "rgb(31, 120, 193)", + "show": true, + "ymax": null, + "ymin": null + }, + "tableColumn": "", + "targets": [ + { + "expr": "count(kube_pod_container_status_terminated{namespace=\"$namespace\"} !=0 ) or vector(0)", + "hide": false, + "instant": false, + "legendFormat": "{{pod}}", + "refId": "A" + }, + { + "expr": "", + "hide": true, + "refId": "B" + } + ], + "thresholds": "0,1", + "timeFrom": null, + "timeShift": null, + "title": "Terminated pods", + "transparent": true, + "type": "singlestat", + "valueFontSize": "80%", + "valueMaps": [ + { + "op": "=", + "text": "N/A", + "value": "null" + } + ], + "valueName": "current" + }, + { + "cacheTimeout": null, + "colorBackground": false, + "colorValue": true, + "colors": [ + "#299c46", + "#37872D", + "#d44a3a" + ], + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, + "gridPos": { + "h": 3, + "w": 3, + "x": 9, + "y": 3 + }, + "id": 45, + "interval": null, + "links": [], + "mappingType": 1, + "mappingTypes": [ + { + "name": "value to text", + "value": 1 + }, + { + "name": "range to text", + "value": 2 + } + ], + "maxDataPoints": 100, + "nullPointMode": "connected", + "nullText": null, + "postfix": "", + "postfixFontSize": "50%", + "prefix": "", + "prefixFontSize": "50%", + "rangeMaps": [ + { + "from": "null", + "text": "N/A", + "to": "null" + } + ], + "sparkline": { + "fillColor": "rgba(31, 118, 189, 0.18)", + "full": false, + "lineColor": "rgb(31, 120, 193)", + "show": true, + "ymax": null, + "ymin": null + }, + "tableColumn": "", + "targets": [ + { + "expr": "count(kube_pod_container_status_waiting{namespace=\"$namespace\"} !=0 ) or vector(0)", + "hide": false, + "instant": false, + "legendFormat": "{{pod}}", + "refId": "A" + }, + { + "expr": "", + "hide": true, + "refId": "B" + } + ], + "thresholds": "0,1", + "timeFrom": null, + "timeShift": null, + "title": "Waiting pods", + "transparent": true, + "type": "singlestat", + "valueFontSize": "80%", + "valueMaps": [ + { + "op": "=", + "text": "N/A", + "value": "null" + } + ], + "valueName": "current" + }, + { + "cacheTimeout": null, + "colorBackground": false, + "colorValue": false, + "colors": [ + "#299c46", + "#37872D", + "#d44a3a" + ], + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, + "gridPos": { + "h": 3, + "w": 3, + "x": 12, + "y": 3 + }, + "id": 92, + "interval": null, + "links": [], + "mappingType": 1, + "mappingTypes": [ + { + "name": "value to text", + "value": 1 + }, + { + "name": "range to text", + "value": 2 + } + ], + "maxDataPoints": 100, + "nullPointMode": "connected", + "nullText": null, + "postfix": "", + "postfixFontSize": "50%", + "prefix": "", + "prefixFontSize": "50%", + "rangeMaps": [ + { + "from": "null", + "text": "N/A", + "to": "null" + } + ], + "sparkline": { + "fillColor": "rgba(31, 118, 189, 0.18)", + "full": false, + "lineColor": "rgb(31, 120, 193)", + "show": true, + "ymax": null, + "ymin": null + }, + "tableColumn": "", + "targets": [ + { + "expr": "count(container_spec_memory_reservation_limit_bytes{namespace=\"$namespace\",container=\"POD\",id!~\".*.burstable.*|.*.besteffort.*\",id!~\".*.scope\",pod!=\"\"})", + "hide": false, + "instant": false, + "interval": "", + "legendFormat": "{{pod}}", + "refId": "A" + }, + { + "expr": "", + "hide": true, + "refId": "B" + } + ], + "thresholds": "0,1", + "timeFrom": null, + "timeShift": null, + "title": "Guaranteed pods", + "transparent": true, + "type": "singlestat", + "valueFontSize": "80%", + "valueMaps": [ + { + "op": "=", + "text": "N/A", + "value": "null" + } + ], + "valueName": "current" + }, + { + "cacheTimeout": null, + "colorBackground": false, + "colorValue": false, + "colors": [ + "#299c46", + "#37872D", + "#d44a3a" + ], + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, + "gridPos": { + "h": 3, + "w": 3, + "x": 15, + "y": 3 + }, + "id": 91, + "interval": null, + "links": [], + "mappingType": 1, + "mappingTypes": [ + { + "name": "value to text", + "value": 1 + }, + { + "name": "range to text", + "value": 2 + } + ], + "maxDataPoints": 100, + "nullPointMode": "connected", + "nullText": null, + "postfix": "", + "postfixFontSize": "50%", + "prefix": "", + "prefixFontSize": "50%", + "rangeMaps": [ + { + "from": "null", + "text": "N/A", + "to": "null" + } + ], + "sparkline": { + "fillColor": "rgba(31, 118, 189, 0.18)", + "full": false, + "lineColor": "rgb(31, 120, 193)", + "show": true, + "ymax": null, + "ymin": null + }, + "tableColumn": "", + "targets": [ + { + "expr": "sum(count by (pod)(container_spec_memory_reservation_limit_bytes{namespace=\"$namespace\",container=\"POD\"}))", + "hide": false, + "instant": false, + "interval": "", + "legendFormat": "", + "refId": "A" + }, + { + "expr": "", + "hide": true, + "refId": "B" + } + ], + "thresholds": "0,1", + "timeFrom": null, + "timeShift": null, + "title": "total pods", + "transparent": true, + "type": "singlestat", + "valueFontSize": "80%", + "valueMaps": [ + { + "op": "=", + "text": "N/A", + "value": "null" + } + ], + "valueName": "current" + }, + { + "cacheTimeout": null, + "colorBackground": false, + "colorValue": false, + "colors": [ + "#299c46", + "#37872D", + "#d44a3a" + ], + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, + "gridPos": { + "h": 3, + "w": 3, + "x": 18, + "y": 3 + }, + "id": 89, + "interval": null, + "links": [], + "mappingType": 1, + "mappingTypes": [ + { + "name": "value to text", + "value": 1 + }, + { + "name": "range to text", + "value": 2 + } + ], + "maxDataPoints": 100, + "nullPointMode": "connected", + "nullText": null, + "postfix": "", + "postfixFontSize": "50%", + "prefix": "", + "prefixFontSize": "50%", + "rangeMaps": [ + { + "from": "null", + "text": "N/A", + "to": "null" + } + ], + "sparkline": { + "fillColor": "rgba(31, 118, 189, 0.18)", + "full": false, + "lineColor": "rgb(31, 120, 193)", + "show": true, + "ymax": null, + "ymin": null + }, + "tableColumn": "", + "targets": [ + { + "expr": "count(count by (pod)(container_spec_memory_reservation_limit_bytes{id=~\".*.besteffort.*\",id!~\".*.scope\",pod!=\"\",namespace=\"$namespace\"}))", + "hide": false, + "instant": false, + "interval": "", + "legendFormat": "{{pod}}", + "refId": "A" + }, + { + "expr": "", + "hide": true, + "refId": "B" + } + ], + "thresholds": "0,1", + "timeFrom": null, + "timeShift": null, + "title": "Besteffort pods", + "transparent": true, + "type": "singlestat", + "valueFontSize": "80%", + "valueMaps": [ + { + "op": "=", + "text": "N/A", + "value": "null" + } + ], + "valueName": "current" + }, + { + "cacheTimeout": null, + "colorBackground": false, + "colorValue": false, + "colors": [ + "#299c46", + "#37872D", + "#d44a3a" + ], + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, + "gridPos": { + "h": 3, + "w": 3, + "x": 21, + "y": 3 + }, + "id": 94, + "interval": null, + "links": [], + "mappingType": 1, + "mappingTypes": [ + { + "name": "value to text", + "value": 1 + }, + { + "name": "range to text", + "value": 2 + } + ], + "maxDataPoints": 100, + "nullPointMode": "connected", + "nullText": null, + "postfix": "", + "postfixFontSize": "50%", + "prefix": "", + "prefixFontSize": "50%", + "rangeMaps": [ + { + "from": "null", + "text": "N/A", + "to": "null" + } + ], + "sparkline": { + "fillColor": "rgba(31, 118, 189, 0.18)", + "full": false, + "lineColor": "rgb(31, 120, 193)", + "show": true, + "ymax": null, + "ymin": null + }, + "tableColumn": "", + "targets": [ + { + "expr": "sum(count by (pod)(container_spec_memory_reservation_limit_bytes{id=~\".*.burstable.*\",id!~\".*.scope\",pod!=\"\",namespace=\"$namespace\",container=\"POD\"}))", + "hide": false, + "instant": false, + "interval": "", + "legendFormat": "", + "refId": "A" + }, + { + "expr": "", + "hide": true, + "refId": "B" + } + ], + "thresholds": "0,1", + "timeFrom": null, + "timeShift": null, + "title": "burstable pods", + "transparent": true, + "type": "singlestat", + "valueFontSize": "80%", + "valueMaps": [ + { + "op": "=", + "text": "N/A", + "value": "null" + } + ], + "valueName": "current" + }, + { + "cacheTimeout": null, + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": { + "align": "left", + "displayMode": "color-text" + }, + "mappings": [], + "noValue": "--", + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "dark-green", + "value": null + } + ] + }, + "unit": "decbytes" + }, + "overrides": [ + { + "matcher": { + "id": "byName", + "options": "pod" + }, + "properties": [ + { + "id": "custom.width", + "value": 366 + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "host_ip" + }, + "properties": [ + { + "id": "custom.width", + "value": 104 + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "pod_ip" + }, + "properties": [ + { + "id": "custom.width", + "value": 111 + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "node" + }, + "properties": [ + { + "id": "custom.width", + "value": 202 + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "Memory usage" + }, + "properties": [ + { + "id": "custom.width", + "value": 186 + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "Status" + }, + "properties": [ + { + "id": "custom.width", + "value": 68 + }, + { + "id": "mappings", + "value": [ + { + "from": "", + "id": 0, + "operator": "", + "text": "Up", + "to": "", + "type": 1, + "value": "1" + }, + { + "from": "", + "id": 1, + "operator": "", + "text": "Down", + "to": "", + "type": 1, + "value": "0" + } + ] + }, + { + "id": "thresholds", + "value": { + "mode": "absolute", + "steps": [ + { + "color": "dark-red", + "value": null + }, + { + "color": "dark-green", + "value": 1 + } + ] + } + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "Age" + }, + "properties": [ + { + "id": "custom.width", + "value": 92 + }, + { + "id": "unit", + "value": "s" + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "Restarts" + }, + "properties": [ + { + "id": "custom.width", + "value": 100 + }, + { + "id": "unit", + "value": "none" + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "CPU Usage" + }, + "properties": [ + { + "id": "custom.width", + "value": 247 + }, + { + "id": "unit" + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "CPU Usage [95th Percentile]" + }, + "properties": [ + { + "id": "custom.width", + "value": 253 + }, + { + "id": "unit", + "value": "none" + } + ] + } + ] + }, + "gridPos": { + "h": 8, + "w": 24, + "x": 0, + "y": 6 + }, + "id": 104, + "links": [], + "options": { + "angular": { + "columns": [], + "fontSize": "100%", + "options": {}, + "pageSize": null, + "showHeader": true, + "sort": { + "col": 0, + "desc": true + }, + "styles": [ + { + "alias": "Time", + "align": "auto", + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "pattern": "Time", + "type": "hidden" + }, + { + "alias": "", + "align": "auto", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "decimals": 2, + "pattern": "/pod.*/", + "thresholds": [], + "type": "string", + "unit": "short" + }, + { + "alias": "", + "align": "auto", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "mappingType": 1, + "pattern": "node", + "thresholds": [], + "type": "string", + "unit": "short" + }, + { + "alias": "", + "align": "auto", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "mappingType": 1, + "pattern": "__name__", + "thresholds": [], + "type": "hidden", + "unit": "short" + }, + { + "alias": "", + "align": "auto", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "mappingType": 1, + "pattern": "/created.*/", + "thresholds": [], + "type": "hidden", + "unit": "short" + }, + { + "alias": "", + "align": "auto", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "mappingType": 1, + "pattern": "/prom.*/", + "thresholds": [], + "type": "hidden", + "unit": "short" + }, + { + "alias": "", + "align": "auto", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "mappingType": 1, + "pattern": "/job/", + "thresholds": [], + "type": "hidden", + "unit": "short" + }, + { + "alias": "", + "align": "auto", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "mappingType": 1, + "pattern": "service", + "thresholds": [], + "type": "hidden", + "unit": "short" + }, + { + "alias": "", + "align": "auto", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "mappingType": 1, + "pattern": "instance", + "thresholds": [], + "type": "hidden", + "unit": "short" + }, + { + "alias": "", + "align": "auto", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "mappingType": 1, + "pattern": "endpoint", + "thresholds": [], + "type": "hidden", + "unit": "short" + }, + { + "alias": "", + "align": "auto", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "mappingType": 1, + "pattern": "uid", + "thresholds": [], + "type": "hidden", + "unit": "short" + }, + { + "alias": "", + "align": "auto", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "mappingType": 1, + "pattern": "", + "thresholds": [], + "type": "number", + "unit": "short" + }, + { + "alias": "", + "align": "auto", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "mappingType": 1, + "pattern": "namespace", + "thresholds": [], + "type": "hidden", + "unit": "short" + }, + { + "alias": "", + "align": "auto", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "mappingType": 1, + "pattern": "Value", + "thresholds": [], + "type": "string", + "unit": "short", + "valueMaps": [] + } + ], + "transform": "table" + }, + "frameIndex": 0, + "showHeader": true, + "sortBy": [ + { + "desc": false, + "displayName": "pod" + } + ] + }, + "pluginVersion": "7.0.5", + "targets": [ + { + "expr": "kube_pod_container_status_ready{namespace=\"$namespace\"}", + "format": "table", + "hide": false, + "instant": true, + "interval": "", + "legendFormat": "", + "refId": "A" + }, + { + "expr": "sum\r\n by(pod) (container_memory_usage_bytes{container!=\"POD\",image!=\"\",job=\"kubelet\",metrics_path=\"/metrics/cadvisor\",namespace=\"$namespace\"})", + "format": "table", + "hide": false, + "instant": true, + "interval": "", + "legendFormat": "Memory usage", + "refId": "B" + }, + { + "expr": "kube_pod_info{namespace=\"$namespace\"}", + "format": "table", + "interval": "", + "legendFormat": "", + "refId": "C" + }, + { + "expr": "sum by(pod) (kube_pod_container_status_restarts_total{namespace=\"$namespace\"})", + "format": "table", + "hide": false, + "instant": true, + "interval": "", + "legendFormat": "", + "refId": "E" + }, + { + "expr": "quantile_over_time(0.95,\r\n sum by (pod) (\r\n rate(container_cpu_usage_seconds_total{namespace=\"$namespace\", container_name!=\"POD\"}[10m])\r\n )[2d:]\r\n)", + "format": "table", + "instant": true, + "interval": "", + "legendFormat": "CPU Usage [95th Percentile]", + "refId": "D" + } + ], + "timeFrom": null, + "timeShift": null, + "title": "pods running in $namespace", + "transformations": [ + { + "id": "filterFieldsByName", + "options": { + "include": { + "names": [ + "pod", + "Value #A", + "Value #B", + "host_ip", + "node", + "pod_ip", + "Value #E", + "Value #D" + ] + } + } + }, + { + "id": "seriesToColumns", + "options": { + "byField": "pod" + } + }, + { + "id": "organize", + "options": { + "excludeByName": {}, + "indexByName": { + "Value #A": 3, + "Value #B": 2, + "Value #D": 1, + "Value #E": 4, + "host_ip": 6, + "node": 7, + "pod": 0, + "pod_ip": 5 + }, + "renameByName": { + "Value #A": "Status", + "Value #B": "Memory usage", + "Value #C": "Age", + "Value #D": "CPU Usage [95th Percentile]", + "Value #E": "Restarts" + } + } + } + ], + "transparent": true, + "type": "table" + }, + { + "aliasColors": {}, + "bars": false, + "cacheTimeout": null, + "dashLength": 10, + "dashes": false, + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fill": 1, + "fillGradient": 0, + "gridPos": { + "h": 9, + "w": 11, + "x": 0, + "y": 14 + }, + "hiddenSeries": false, + "id": 78, + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "links": [], + "nullPointMode": "null", + "options": { + "dataLinks": [] + }, + "percentage": false, + "pointradius": 2, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "sum\n by(namespace) (rate(container_cpu_usage_seconds_total{container!=\"POD\",image!=\"\",job=\"kubelet\",metrics_path=\"/metrics/cadvisor\",namespace=\"$namespace\"}[10m]))", + "format": "time_series", + "hide": false, + "instant": false, + "interval": "", + "legendFormat": "{{namespace}}", + "refId": "A" + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "Total CPU usage in $namespace namespace", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "transparent": true, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "none", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, + { + "aliasColors": {}, + "bars": false, + "cacheTimeout": null, + "dashLength": 10, + "dashes": false, + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fill": 1, + "fillGradient": 0, + "gridPos": { + "h": 9, + "w": 13, + "x": 11, + "y": 14 + }, + "hiddenSeries": false, + "id": 101, + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "links": [], + "nullPointMode": "null", + "options": { + "dataLinks": [] + }, + "percentage": false, + "pointradius": 2, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "sum\n by(pod) (rate(container_cpu_usage_seconds_total{container!=\"POD\",image!=\"\",job=\"kubelet\",metrics_path=\"/metrics/cadvisor\",namespace=\"$namespace\"}[10m]))", + "format": "time_series", + "hide": false, + "instant": false, + "interval": "", + "legendFormat": "{{pod}}", + "refId": "A" + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": " CPU usage by pod in $namespace namespace", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "transparent": true, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "none", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fill": 1, + "fillGradient": 0, + "gridPos": { + "h": 9, + "w": 10, + "x": 0, + "y": 23 + }, + "hiddenSeries": false, + "id": 48, + "legend": { + "avg": false, + "current": false, + "hideEmpty": true, + "hideZero": true, + "max": true, + "min": false, + "show": true, + "total": false, + "values": true + }, + "lines": true, + "linewidth": 1, + "nullPointMode": "null", + "options": { + "dataLinks": [] + }, + "percentage": false, + "pluginVersion": "6.5.2", + "pointradius": 2, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "sum\n by(namespace) (container_memory_usage_bytes{container!=\"POD\",image!=\"\",job=\"kubelet\",metrics_path=\"/metrics/cadvisor\",namespace=\"$namespace\"})", + "hide": false, + "interval": "", + "legendFormat": "{{namespace}}", + "refId": "A" + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "Total memory usage by pods in $namespace", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "transparent": true, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "bytes", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": false + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fill": 1, + "fillGradient": 0, + "gridPos": { + "h": 8, + "w": 13, + "x": 11, + "y": 23 + }, + "hiddenSeries": false, + "id": 100, + "legend": { + "avg": true, + "current": false, + "hideEmpty": true, + "hideZero": true, + "max": true, + "min": true, + "show": true, + "total": false, + "values": true + }, + "lines": true, + "linewidth": 1, + "nullPointMode": "null", + "options": { + "dataLinks": [] + }, + "percentage": false, + "pluginVersion": "6.5.2", + "pointradius": 2, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "sum\n by(pod) (container_memory_usage_bytes{container!=\"POD\",image!=\"\",job=\"kubelet\",metrics_path=\"/metrics/cadvisor\",namespace=\"$namespace\"})", + "hide": false, + "interval": "", + "legendFormat": "{{pod}}", + "refId": "A" + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "memory usage by pods in $namespace", + "tooltip": { + "shared": true, + "sort": 2, + "value_type": "individual" + }, + "transparent": true, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "bytes", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": false + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, + { + "collapsed": true, + "datasource": "Prometheus", + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 32 + }, + "id": 39, + "panels": [ + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "Prometheus", + "description": "This panel shows the NotReady state of nodes. If any node goes in NotReady state, graph value will go from 1 to 0.", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fill": 0, + "fillGradient": 0, + "gridPos": { + "h": 6, + "w": 6, + "x": 0, + "y": 4 + }, + "hiddenSeries": false, + "id": 2, + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "nullPointMode": "null", + "options": { + "dataLinks": [] + }, + "percentage": false, + "pointradius": 2, + "points": false, + "renderer": "flot", + "scopedVars": { + "node": { + "selected": true, + "text": "ip-192-168-72-226.ap-south-1.compute.internal", + "value": "ip-192-168-72-226.ap-south-1.compute.internal" + } + }, + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "(kube_node_status_condition{status=\"true\",condition=\"Ready\",node=\"$node\"}) ", + "legendFormat": "{{node}}", + "refId": "A" + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "Node readiness for $node ", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fill": 1, + "fillGradient": 0, + "gridPos": { + "h": 6, + "w": 6, + "x": 6, + "y": 4 + }, + "hiddenSeries": false, + "id": 9, + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "nullPointMode": "null", + "options": { + "dataLinks": [] + }, + "percentage": false, + "pointradius": 2, + "points": false, + "renderer": "flot", + "scopedVars": { + "node": { + "selected": true, + "text": "ip-192-168-72-226.ap-south-1.compute.internal", + "value": "ip-192-168-72-226.ap-south-1.compute.internal" + } + }, + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "(kube_node_status_condition{status=\"true\",condition=~\"MemoryPressure|PIDPressure|DiskPressure\",node=\"$node\"})", + "interval": "", + "legendFormat": "{{condition}}", + "refId": "A" + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "node $node Memory/Disk/PID Pressure", + "tooltip": { + "shared": true, + "sort": 1, + "value_type": "individual" + }, + "transformations": [], + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": false + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, + { + "cacheTimeout": null, + "colorBackground": false, + "colorValue": false, + "colors": [ + "#299c46", + "rgba(237, 129, 40, 0.89)", + "#d44a3a" + ], + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, + "gridPos": { + "h": 3, + "w": 3, + "x": 12, + "y": 4 + }, + "id": 10, + "interval": null, + "links": [], + "mappingType": 1, + "mappingTypes": [ + { + "name": "value to text", + "value": 1 + }, + { + "name": "range to text", + "value": 2 + } + ], + "maxDataPoints": 100, + "nullPointMode": "connected", + "nullText": null, + "postfix": "", + "postfixFontSize": "50%", + "prefix": "", + "prefixFontSize": "50%", + "rangeMaps": [ + { + "from": "null", + "text": "N/A", + "to": "null" + } + ], + "scopedVars": { + "node": { + "selected": true, + "text": "ip-192-168-72-226.ap-south-1.compute.internal", + "value": "ip-192-168-72-226.ap-south-1.compute.internal" + } + }, + "sparkline": { + "fillColor": "rgba(31, 118, 189, 0.18)", + "full": true, + "lineColor": "rgb(31, 120, 193)", + "show": true, + "ymax": null, + "ymin": null + }, + "tableColumn": "", + "targets": [ + { + "expr": " count(count by (pod)(container_spec_memory_reservation_limit_bytes{node=\"$node\",pod!=\"\"}))", + "instant": false, + "interval": "", + "legendFormat": "{{node}}", + "refId": "A" + } + ], + "thresholds": "", + "timeFrom": null, + "timeShift": null, + "title": "pod count", + "type": "singlestat", + "valueFontSize": "80%", + "valueMaps": [ + { + "op": "=", + "text": "N/A", + "value": "null" + } + ], + "valueName": "current" + }, + { + "cacheTimeout": null, + "colorBackground": false, + "colorValue": false, + "colors": [ + "#299c46", + "rgba(237, 129, 40, 0.89)", + "#d44a3a" + ], + "datasource": "Prometheus", + "decimals": 0, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, + "gridPos": { + "h": 3, + "w": 2, + "x": 15, + "y": 4 + }, + "id": 27, + "interval": null, + "links": [], + "mappingType": 1, + "mappingTypes": [ + { + "name": "value to text", + "value": 1 + }, + { + "name": "range to text", + "value": 2 + } + ], + "maxDataPoints": 100, + "nullPointMode": "connected", + "nullText": null, + "postfix": "", + "postfixFontSize": "50%", + "prefix": "", + "prefixFontSize": "50%", + "rangeMaps": [ + { + "from": "null", + "text": "N/A", + "to": "null" + } + ], + "scopedVars": { + "node": { + "selected": true, + "text": "ip-192-168-72-226.ap-south-1.compute.internal", + "value": "ip-192-168-72-226.ap-south-1.compute.internal" + } + }, + "sparkline": { + "fillColor": "rgba(31, 118, 189, 0.18)", + "full": true, + "lineColor": "rgb(31, 120, 193)", + "show": true, + "ymax": null, + "ymin": null + }, + "tableColumn": "", + "targets": [ + { + "expr": "count(count by (pod)(container_spec_memory_reservation_limit_bytes{id=~\".*.besteffort.*\",container=\"POD\",node=\"$node\"}))", + "instant": false, + "interval": "", + "legendFormat": "", + "refId": "A" + } + ], + "thresholds": "", + "timeFrom": null, + "timeShift": null, + "title": "besteffort pods", + "type": "singlestat", + "valueFontSize": "80%", + "valueMaps": [ + { + "op": "=", + "text": "N/A", + "value": "null" + } + ], + "valueName": "avg" + }, + { + "cacheTimeout": null, + "colorBackground": false, + "colorValue": false, + "colors": [ + "#299c46", + "rgba(237, 129, 40, 0.89)", + "#d44a3a" + ], + "datasource": "Prometheus", + "decimals": 0, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, + "gridPos": { + "h": 3, + "w": 2, + "x": 17, + "y": 4 + }, + "id": 93, + "interval": null, + "links": [], + "mappingType": 1, + "mappingTypes": [ + { + "name": "value to text", + "value": 1 + }, + { + "name": "range to text", + "value": 2 + } + ], + "maxDataPoints": 100, + "nullPointMode": "connected", + "nullText": null, + "postfix": "", + "postfixFontSize": "50%", + "prefix": "", + "prefixFontSize": "50%", + "rangeMaps": [ + { + "from": "null", + "text": "N/A", + "to": "null" + } + ], + "scopedVars": { + "node": { + "selected": true, + "text": "ip-192-168-72-226.ap-south-1.compute.internal", + "value": "ip-192-168-72-226.ap-south-1.compute.internal" + } + }, + "sparkline": { + "fillColor": "rgba(31, 118, 189, 0.18)", + "full": true, + "lineColor": "rgb(31, 120, 193)", + "show": true, + "ymax": null, + "ymin": null + }, + "tableColumn": "", + "targets": [ + { + "expr": "sum(count by (pod)(container_spec_memory_reservation_limit_bytes{container=\"POD\",id=~\".*.burstable.*\",node=\"$node\"}))", + "instant": false, + "interval": "", + "legendFormat": "", + "refId": "A" + } + ], + "thresholds": "", + "timeFrom": null, + "timeShift": null, + "title": "burstable pods", + "type": "singlestat", + "valueFontSize": "80%", + "valueMaps": [ + { + "op": "=", + "text": "N/A", + "value": "null" + } + ], + "valueName": "avg" + }, + { + "cacheTimeout": null, + "colorBackground": false, + "colorValue": false, + "colors": [ + "#299c46", + "rgba(237, 129, 40, 0.89)", + "#d44a3a" + ], + "datasource": "Prometheus", + "decimals": 0, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, + "gridPos": { + "h": 3, + "w": 2, + "x": 19, + "y": 4 + }, + "id": 26, + "interval": null, + "links": [], + "mappingType": 1, + "mappingTypes": [ + { + "name": "value to text", + "value": 1 + }, + { + "name": "range to text", + "value": 2 + } + ], + "maxDataPoints": 100, + "nullPointMode": "connected", + "nullText": null, + "postfix": "", + "postfixFontSize": "50%", + "prefix": "", + "prefixFontSize": "50%", + "rangeMaps": [ + { + "from": "null", + "text": "N/A", + "to": "null" + } + ], + "scopedVars": { + "node": { + "selected": true, + "text": "ip-192-168-72-226.ap-south-1.compute.internal", + "value": "ip-192-168-72-226.ap-south-1.compute.internal" + } + }, + "sparkline": { + "fillColor": "rgba(31, 118, 189, 0.18)", + "full": true, + "lineColor": "rgb(31, 120, 193)", + "show": true, + "ymax": null, + "ymin": null + }, + "tableColumn": "", + "targets": [ + { + "expr": "sum(count by (pod)(container_spec_memory_reservation_limit_bytes{container=\"POD\",id!~\".*.burstable.*\",id!~\".*.besteffort.*\",node=\"$node\"}))", + "instant": false, + "interval": "", + "legendFormat": "", + "refId": "A" + } + ], + "thresholds": "", + "timeFrom": null, + "timeShift": null, + "title": "guaranteed pods", + "type": "singlestat", + "valueFontSize": "80%", + "valueMaps": [ + { + "op": "=", + "text": "N/A", + "value": "null" + } + ], + "valueName": "avg" + }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fill": 0, + "fillGradient": 0, + "gridPos": { + "h": 6, + "w": 6, + "x": 12, + "y": 7 + }, + "hiddenSeries": false, + "id": 77, + "legend": { + "avg": false, + "current": true, + "max": false, + "min": false, + "show": true, + "total": false, + "values": true + }, + "lines": true, + "linewidth": 1, + "nullPointMode": "null", + "options": { + "dataLinks": [] + }, + "percentage": false, + "pointradius": 2, + "points": false, + "renderer": "flot", + "scopedVars": { + "node": { + "selected": true, + "text": "ip-192-168-72-226.ap-south-1.compute.internal", + "value": "ip-192-168-72-226.ap-south-1.compute.internal" + } + }, + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "count by (namespace)(container_memory_working_set_bytes{image!=\"\",node=\"$node\"})", + "legendFormat": "{{namespace}}", + "refId": "A" + }, + { + "expr": "", + "refId": "B" + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "Pod count by namespace on $node ", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "decimals": 0, + "format": "short", + "label": "", + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": false + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fill": 0, + "fillGradient": 0, + "gridPos": { + "h": 6, + "w": 6, + "x": 18, + "y": 7 + }, + "hiddenSeries": false, + "id": 126, + "legend": { + "avg": false, + "current": true, + "max": false, + "min": false, + "show": true, + "total": false, + "values": true + }, + "lines": true, + "linewidth": 1, + "nullPointMode": "null", + "options": { + "dataLinks": [] + }, + "percentage": false, + "pointradius": 2, + "points": false, + "renderer": "flot", + "scopedVars": { + "node": { + "selected": true, + "text": "ip-192-168-72-226.ap-south-1.compute.internal", + "value": "ip-192-168-72-226.ap-south-1.compute.internal" + } + }, + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": " histogram_quantile(0.99,\n sum by(instance, le) (rate(kubelet_pod_worker_duration_seconds_bucket{job=\"kubelet\",metrics_path=\"/metrics\",node=\"$node\"}[10m])))\n * on(instance) group_left(node) kubelet_node_name{job=\"kubelet\",metrics_path=\"/metrics\",node=\"$node\"}", + "interval": "", + "legendFormat": "{{node}}", + "refId": "A" + }, + { + "expr": "", + "refId": "B" + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "Pod startup latency ", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "decimals": 0, + "format": "µs", + "label": "", + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": false + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, + { + "aliasColors": { + "Total CPU": "dark-red" + }, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fill": 0, + "fillGradient": 0, + "gridPos": { + "h": 6, + "w": 6, + "x": 0, + "y": 10 + }, + "hiddenSeries": false, + "id": 7, + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "nullPointMode": "null", + "options": { + "dataLinks": [] + }, + "percentage": false, + "pointradius": 2, + "points": false, + "renderer": "flot", + "scopedVars": { + "node": { + "selected": true, + "text": "ip-192-168-72-226.ap-south-1.compute.internal", + "value": "ip-192-168-72-226.ap-south-1.compute.internal" + } + }, + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "node_load5 + on(instance) group_left(nodename) \nnode_uname_info{nodename=\"$node\"}", + "hide": false, + "interval": "", + "legendFormat": "{{nodename}}", + "refId": "A" + }, + { + "expr": "kube_node_status_capacity_cpu_cores{node=\"$node\"}", + "interval": "", + "legendFormat": "Total CPU", + "refId": "B" + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "Node $node load", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": false + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, + { + "aliasColors": { + "Total CPU": "dark-red" + }, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "Prometheus", + "description": "record: instance:node_cpu_utilisation:rate1m\nexpr: 1\n - avg without(cpu, mode) (rate(node_cpu_seconds_total{job=\"node-exporter\",mode=\"idle\"}[1m]))", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fill": 0, + "fillGradient": 0, + "gridPos": { + "h": 6, + "w": 6, + "x": 6, + "y": 10 + }, + "hiddenSeries": false, + "id": 4, + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "nullPointMode": "null", + "options": { + "dataLinks": [] + }, + "percentage": false, + "pointradius": 2, + "points": false, + "renderer": "flot", + "scopedVars": { + "node": { + "selected": true, + "text": "ip-192-168-72-226.ap-south-1.compute.internal", + "value": "ip-192-168-72-226.ap-south-1.compute.internal" + } + }, + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "\n((sum by (instance) (instance:node_cpu_utilisation:rate1m)) + on(instance) group_left(nodename) \nnode_uname_info{nodename=\"$node\"})", + "hide": false, + "interval": "", + "legendFormat": "{{nodename}}", + "refId": "A" + }, + { + "expr": "kube_node_status_capacity{node=\"$node\",resource=\"cpu\"}", + "interval": "", + "legendFormat": "Total CPU", + "refId": "B" + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "Node $node CPU usage", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": false + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, + { + "aliasColors": { + "Total CPU": "dark-red" + }, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fill": 0, + "fillGradient": 0, + "gridPos": { + "h": 6, + "w": 6, + "x": 12, + "y": 13 + }, + "hiddenSeries": false, + "id": 18, + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "nullPointMode": "null", + "options": { + "dataLinks": [] + }, + "percentage": false, + "pointradius": 2, + "points": false, + "renderer": "flot", + "scopedVars": { + "node": { + "selected": true, + "text": "ip-192-168-72-226.ap-south-1.compute.internal", + "value": "ip-192-168-72-226.ap-south-1.compute.internal" + } + }, + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "sum by (node)(kube_pod_container_resource_requests_cpu_cores{node=\"$node\"})", + "legendFormat": "requests", + "refId": "A" + }, + { + "expr": "kube_node_status_capacity{node=\"$node\",resource=\"cpu\"}", + "legendFormat": "Total CPU", + "refId": "B" + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "Total CPU requests on $node", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "decimals": 0, + "format": "none", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": false + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, + { + "aliasColors": { + "Total CPU": "dark-red" + }, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fill": 0, + "fillGradient": 0, + "gridPos": { + "h": 6, + "w": 6, + "x": 18, + "y": 13 + }, + "hiddenSeries": false, + "id": 20, + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "nullPointMode": "null", + "options": { + "dataLinks": [] + }, + "percentage": false, + "pointradius": 2, + "points": false, + "renderer": "flot", + "scopedVars": { + "node": { + "selected": true, + "text": "ip-192-168-72-226.ap-south-1.compute.internal", + "value": "ip-192-168-72-226.ap-south-1.compute.internal" + } + }, + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "sum by (node)(kube_pod_container_resource_limits_cpu_cores{node=\"$node\"})", + "interval": "", + "legendFormat": "total limits", + "refId": "A" + }, + { + "expr": "kube_node_status_capacity{node=\"$node\",resource=\"cpu\"}", + "hide": false, + "legendFormat": "Total CPU", + "refId": "B" + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "Total CPU limits on $node", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": false + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, + { + "aliasColors": { + "Total memory": "dark-red" + }, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fill": 0, + "fillGradient": 0, + "gridPos": { + "h": 6, + "w": 6, + "x": 0, + "y": 16 + }, + "hiddenSeries": false, + "id": 6, + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "nullPointMode": "null", + "options": { + "dataLinks": [] + }, + "percentage": false, + "pointradius": 2, + "points": false, + "renderer": "flot", + "scopedVars": { + "node": { + "selected": true, + "text": "ip-192-168-72-226.ap-south-1.compute.internal", + "value": "ip-192-168-72-226.ap-south-1.compute.internal" + } + }, + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "(node_memory_MemTotal_bytes + on(instance) group_left(nodename) \nnode_uname_info{nodename=\"$node\"}) - (node_memory_MemAvailable_bytes + on(instance) group_left(nodename) \nnode_uname_info{nodename=\"$node\"})", + "hide": false, + "interval": "", + "legendFormat": "{{nodename}}", + "refId": "A" + }, + { + "expr": "kube_node_status_capacity{node=\"$node\",resource=\"memory\"}", + "legendFormat": "Total memory", + "refId": "B" + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "Node $node memory usage", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "decbytes", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, + { + "aliasColors": { + "Total memory": "dark-red" + }, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fill": 0, + "fillGradient": 0, + "gridPos": { + "h": 6, + "w": 6, + "x": 6, + "y": 16 + }, + "hiddenSeries": false, + "id": 19, + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "nullPointMode": "null", + "options": { + "dataLinks": [] + }, + "percentage": false, + "pointradius": 2, + "points": false, + "renderer": "flot", + "scopedVars": { + "node": { + "selected": true, + "text": "ip-192-168-72-226.ap-south-1.compute.internal", + "value": "ip-192-168-72-226.ap-south-1.compute.internal" + } + }, + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "sum by (node)(kube_pod_container_resource_requests_memory_bytes{node=\"$node\"})", + "legendFormat": "requests", + "refId": "A" + }, + { + "expr": "kube_node_status_capacity{node=\"$node\",resource=\"memory\"}", + "legendFormat": "Total memory", + "refId": "B" + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "Total memory requests on $node", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "decbytes", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": false + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, + { + "aliasColors": { + "Total": "dark-red", + "Total memory": "dark-red" + }, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fill": 0, + "fillGradient": 0, + "gridPos": { + "h": 9, + "w": 6, + "x": 12, + "y": 19 + }, + "hiddenSeries": false, + "id": 21, + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "nullPointMode": "null", + "options": { + "dataLinks": [] + }, + "percentage": false, + "pointradius": 2, + "points": false, + "renderer": "flot", + "scopedVars": { + "node": { + "selected": true, + "text": "ip-192-168-72-226.ap-south-1.compute.internal", + "value": "ip-192-168-72-226.ap-south-1.compute.internal" + } + }, + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "sum by (node)(kube_pod_container_resource_limits_memory_bytes{node=\"$node\"})", + "legendFormat": "total liimits ", + "refId": "A" + }, + { + "expr": "kube_node_status_capacity{node=\"$node\",resource=\"memory\"}", + "legendFormat": "Total memory", + "refId": "B" + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "Total Memory limits on $node", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "decbytes", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": false + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fill": 0, + "fillGradient": 0, + "gridPos": { + "h": 9, + "w": 6, + "x": 18, + "y": 19 + }, + "hiddenSeries": false, + "id": 8, + "legend": { + "avg": false, + "current": true, + "max": true, + "min": false, + "show": true, + "total": false, + "values": true + }, + "lines": true, + "linewidth": 1, + "nullPointMode": "null", + "options": { + "dataLinks": [] + }, + "percentage": false, + "pointradius": 2, + "points": false, + "renderer": "flot", + "scopedVars": { + "node": { + "selected": true, + "text": "ip-192-168-72-226.ap-south-1.compute.internal", + "value": "ip-192-168-72-226.ap-south-1.compute.internal" + } + }, + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "histogram_quantile(0.9, sum by (node,le) (rate(kubelet_pleg_relist_duration_seconds_bucket{node=\"$node\"}[10m])))", + "legendFormat": "{{node}}", + "refId": "A" + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "kubelet_pleg_relist_duration_seconds_bucket", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "s", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": false + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fill": 0, + "fillGradient": 0, + "gridPos": { + "h": 6, + "w": 6, + "x": 0, + "y": 22 + }, + "hiddenSeries": false, + "id": 67, + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "nullPointMode": "null", + "options": { + "dataLinks": [] + }, + "percentage": false, + "pointradius": 2, + "points": false, + "renderer": "flot", + "scopedVars": { + "node": { + "selected": true, + "text": "ip-192-168-72-226.ap-south-1.compute.internal", + "value": "ip-192-168-72-226.ap-south-1.compute.internal" + } + }, + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": " sort(topk(5, container_memory_working_set_bytes{image!=\"\",node=\"$node\"}))", + "legendFormat": "{{pod}}", + "refId": "A" + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "Top 5 memory guzzling pods on $node", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "decbytes", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": false + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fill": 0, + "fillGradient": 0, + "gridPos": { + "h": 6, + "w": 6, + "x": 6, + "y": 22 + }, + "hiddenSeries": false, + "id": 117, + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "nullPointMode": "null", + "options": { + "dataLinks": [] + }, + "percentage": false, + "pointradius": 2, + "points": false, + "renderer": "flot", + "scopedVars": { + "node": { + "selected": true, + "text": "ip-192-168-72-226.ap-south-1.compute.internal", + "value": "ip-192-168-72-226.ap-south-1.compute.internal" + } + }, + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": " sort(topk(5, container_memory_working_set_bytes{image!=\"\",node=\"$node\"}))", + "legendFormat": "{{pod}}", + "refId": "A" + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "Top 5 memory guzzling pods on $node", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "decbytes", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": false + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + } + ], + "repeat": "node", + "scopedVars": { + "node": { + "selected": true, + "text": "ip-192-168-72-226.ap-south-1.compute.internal", + "value": "ip-192-168-72-226.ap-south-1.compute.internal" + } + }, + "title": "$node Node details", + "type": "row" + } + ], + "refresh": false, + "schemaVersion": 25, + "style": "dark", + "tags": [ + "kubernetes", + "k8s", + "namespace" + ], + "templating": { + "list": [ + { + "allValue": "", + "current": { + "selected": false, + "text": "ip-192-168-72-226.ap-south-1.compute.internal", + "value": "ip-192-168-72-226.ap-south-1.compute.internal" + }, + "datasource": "Prometheus", + "definition": "label_values(kube_node_created,node)", + "hide": 0, + "includeAll": false, + "label": null, + "multi": false, + "name": "node", + "options": [], + "query": "label_values(kube_node_created,node)", + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "sort": 5, + "tagValuesQuery": "", + "tags": [], + "tagsQuery": "", + "type": "query", + "useTags": false + }, + { + "allValue": null, + "current": { + "selected": true, + "text": "monitoring", + "value": "monitoring" + }, + "datasource": "Prometheus", + "definition": "query_result(kube_namespace_labels)", + "hide": 0, + "includeAll": false, + "label": null, + "multi": false, + "name": "namespace", + "options": [], + "query": "query_result(kube_namespace_labels)", + "refresh": 1, + "regex": "/.*namespace=\"([^\"]*).*/", + "skipUrlSync": false, + "sort": 0, + "tagValuesQuery": "", + "tags": [], + "tagsQuery": "", + "type": "query", + "useTags": false + }, + { + "allValue": null, + "current": { + "selected": false, + "text": "alertmanager", + "value": "alertmanager" + }, + "datasource": "Prometheus", + "definition": "kube_pod_container_info{namespace=\"$namespace\"}", + "hide": 0, + "includeAll": false, + "label": null, + "multi": false, + "name": "container", + "options": [], + "query": "kube_pod_container_info{namespace=\"$namespace\"}", + "refresh": 1, + "regex": "/.*container=\"([^\"]*).*/", + "skipUrlSync": false, + "sort": 0, + "tagValuesQuery": "", + "tags": [], + "tagsQuery": "", + "type": "query", + "useTags": false + }, + { + "allValue": null, + "current": { + "selected": true, + "text": "6h", + "value": "6h" + }, + "hide": 0, + "includeAll": false, + "label": null, + "multi": false, + "name": "duration", + "options": [ + { + "selected": false, + "text": "10m", + "value": "10m" + }, + { + "selected": false, + "text": "30m", + "value": "30m" + }, + { + "selected": false, + "text": "1h", + "value": "1h" + }, + { + "selected": false, + "text": "2h", + "value": "2h" + }, + { + "selected": true, + "text": "6h", + "value": "6h" + }, + { + "selected": false, + "text": "12h", + "value": "12h" + }, + { + "selected": false, + "text": "1d", + "value": "1d" + }, + { + "selected": false, + "text": "2d", + "value": "2d" + }, + { + "selected": false, + "text": "5d", + "value": "5d" + }, + { + "selected": false, + "text": "14d", + "value": "14d" + }, + { + "selected": false, + "text": "30d", + "value": "30d" + } + ], + "query": "10m,30m,1h,2h,6h,12h,1d,2d,5d,14d,30d", + "queryValue": "", + "skipUrlSync": false, + "type": "custom" + } + ] + }, + "time": { + "from": "now-2d", + "to": "now" + }, + "timepicker": { + "refresh_intervals": [ + "30s", + "1m", + "5m", + "15m", + "30m", + "1h", + "2h", + "1d" + ] + }, + "timezone": "", + "title": "1 Kubernetes cluster overview(कुबरनेटेस)", + "uid": "N9uZBy8Wz", + "version": 3 +} \ No newline at end of file diff --git a/configs/monitoring-dashboards/nginx-ingress-dashboard.json b/configs/monitoring-dashboards/nginx-ingress-dashboard.json new file mode 100644 index 00000000..7aa9811e --- /dev/null +++ b/configs/monitoring-dashboards/nginx-ingress-dashboard.json @@ -0,0 +1,1463 @@ +{ + "annotations": { + "list": [ + { + "builtIn": 1, + "datasource": "-- Grafana --", + "enable": true, + "hide": true, + "iconColor": "rgba(0, 211, 255, 1)", + "name": "Annotations & Alerts", + "type": "dashboard" + }, + { + "datasource": "Prometheus", + "enable": true, + "expr": "sum(changes(nginx_ingress_controller_config_last_reload_successful_timestamp_seconds{instance!=\"unknown\",controller_class=~\"$controller_class\",namespace=~\"$namespace\"}[30s])) by (controller_class)", + "hide": false, + "iconColor": "rgba(255, 96, 96, 1)", + "limit": 100, + "name": "Config Reloads", + "showIn": 0, + "step": "30s", + "tagKeys": "controller_class", + "tags": [], + "titleFormat": "Config Reloaded", + "type": "tags" + } + ] + }, + "description": "This Dashboard contains metrics visualization of Nginx Ingress Controller Running in Kubernetes Using Prometheus as Datasource.", + "editable": true, + "gnetId": 12575, + "graphTooltip": 0, + "id": 1, + "iteration": 1595328866350, + "links": [], + "panels": [ + { + "cacheTimeout": null, + "colorBackground": false, + "colorValue": false, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "format": "ops", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, + "id": 20, + "interval": null, + "links": [], + "mappingType": 1, + "mappingTypes": [ + { + "name": "value to text", + "value": 1 + }, + { + "name": "range to text", + "value": 2 + } + ], + "maxDataPoints": 100, + "nullPointMode": "connected", + "nullText": null, + "postfix": "", + "postfixFontSize": "50%", + "prefix": "", + "prefixFontSize": "50%", + "rangeMaps": [ + { + "from": "null", + "text": "N/A", + "to": "null" + } + ], + "sparkline": { + "fillColor": "rgba(31, 118, 189, 0.18)", + "full": true, + "lineColor": "rgb(31, 120, 193)", + "show": true + }, + "tableColumn": "", + "targets": [ + { + "expr": "round(sum(irate(nginx_ingress_controller_requests{controller_pod=~\"$controller\",controller_class=~\"$controller_class\",namespace=~\"$namespace\"}[$__range])), 0.001)", + "format": "time_series", + "intervalFactor": 1, + "refId": "A", + "step": 4 + } + ], + "thresholds": "", + "title": "Controller Request Volume", + "type": "singlestat", + "valueFontSize": "80%", + "valueMaps": [ + { + "op": "=", + "text": "N/A", + "value": "null" + } + ], + "valueName": "avg" + }, + { + "cacheTimeout": null, + "colorBackground": false, + "colorValue": false, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, + "gridPos": { + "h": 3, + "w": 6, + "x": 6, + "y": 0 + }, + "id": 82, + "interval": null, + "links": [], + "mappingType": 1, + "mappingTypes": [ + { + "name": "value to text", + "value": 1 + }, + { + "name": "range to text", + "value": 2 + } + ], + "maxDataPoints": 100, + "nullPointMode": "connected", + "nullText": null, + "postfix": "", + "postfixFontSize": "50%", + "prefix": "", + "prefixFontSize": "50%", + "rangeMaps": [ + { + "from": "null", + "text": "N/A", + "to": "null" + } + ], + "sparkline": { + "fillColor": "rgba(31, 118, 189, 0.18)", + "full": true, + "lineColor": "rgb(31, 120, 193)", + "show": true + }, + "tableColumn": "", + "targets": [ + { + "expr": "sum(avg_over_time(nginx_ingress_controller_nginx_process_connections{controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\"}[$__range]))", + "format": "time_series", + "instant": false, + "intervalFactor": 1, + "refId": "A", + "step": 4 + } + ], + "thresholds": "", + "title": "Controller Connections", + "type": "singlestat", + "valueFontSize": "80%", + "valueMaps": [ + { + "op": "=", + "text": "N/A", + "value": "null" + } + ], + "valueName": "avg" + }, + { + "cacheTimeout": null, + "colorBackground": false, + "colorValue": false, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "format": "percentunit", + "gauge": { + "maxValue": 100, + "minValue": 80, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": false + }, + "gridPos": { + "h": 3, + "w": 6, + "x": 12, + "y": 0 + }, + "id": 21, + "interval": null, + "links": [], + "mappingType": 1, + "mappingTypes": [ + { + "name": "value to text", + "value": 1 + }, + { + "name": "range to text", + "value": 2 + } + ], + "maxDataPoints": 100, + "nullPointMode": "connected", + "nullText": null, + "postfix": "", + "postfixFontSize": "50%", + "prefix": "", + "prefixFontSize": "50%", + "rangeMaps": [ + { + "from": "null", + "text": "N/A", + "to": "null" + } + ], + "sparkline": { + "fillColor": "rgba(31, 118, 189, 0.18)", + "full": true, + "lineColor": "rgb(31, 120, 193)", + "show": true + }, + "tableColumn": "", + "targets": [ + { + "expr": "sum(rate(nginx_ingress_controller_requests{controller_pod=~\"$controller\",controller_class=~\"$controller_class\",namespace=~\"$namespace\",status!~\"[4-5].*\"}[$__range])) / sum(rate(nginx_ingress_controller_requests{controller_pod=~\"$controller\",controller_class=~\"$controller_class\",namespace=~\"$namespace\"}[$__range]))", + "format": "time_series", + "intervalFactor": 1, + "refId": "A", + "step": 4 + } + ], + "thresholds": "95, 99, 99.5", + "title": "Controller Success Rate (non-4|5xx responses)", + "type": "singlestat", + "valueFontSize": "80%", + "valueMaps": [ + { + "op": "=", + "text": "N/A", + "value": "null" + } + ], + "valueName": "avg" + }, + { + "cacheTimeout": null, + "colorBackground": false, + "colorValue": false, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "datasource": "Prometheus", + "decimals": 0, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, + "gridPos": { + "h": 3, + "w": 3, + "x": 18, + "y": 0 + }, + "id": 81, + "interval": null, + "links": [], + "mappingType": 1, + "mappingTypes": [ + { + "name": "value to text", + "value": 1 + }, + { + "name": "range to text", + "value": 2 + } + ], + "maxDataPoints": 100, + "nullPointMode": "connected", + "nullText": null, + "postfix": "", + "postfixFontSize": "50%", + "prefix": "", + "prefixFontSize": "50%", + "rangeMaps": [ + { + "from": "null", + "text": "N/A", + "to": "null" + } + ], + "sparkline": { + "fillColor": "rgba(31, 118, 189, 0.18)", + "full": true, + "lineColor": "rgb(31, 120, 193)", + "show": true + }, + "tableColumn": "", + "targets": [ + { + "expr": "avg(irate(nginx_ingress_controller_success{controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\"}[$__range])) * 60", + "format": "time_series", + "instant": false, + "intervalFactor": 1, + "refId": "A", + "step": 4 + } + ], + "thresholds": "", + "title": "Config Reloads", + "type": "singlestat", + "valueFontSize": "80%", + "valueMaps": [ + { + "op": "=", + "text": "N/A", + "value": "null" + } + ], + "valueName": "total" + }, + { + "cacheTimeout": null, + "colorBackground": false, + "colorValue": false, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "datasource": "Prometheus", + "decimals": 0, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, + "gridPos": { + "h": 3, + "w": 3, + "x": 21, + "y": 0 + }, + "id": 83, + "interval": null, + "links": [], + "mappingType": 1, + "mappingTypes": [ + { + "name": "value to text", + "value": 1 + }, + { + "name": "range to text", + "value": 2 + } + ], + "maxDataPoints": 100, + "nullPointMode": "connected", + "nullText": null, + "postfix": "", + "postfixFontSize": "50%", + "prefix": "", + "prefixFontSize": "50%", + "rangeMaps": [ + { + "from": "null", + "text": "N/A", + "to": "null" + } + ], + "sparkline": { + "fillColor": "rgba(31, 118, 189, 0.18)", + "full": true, + "lineColor": "rgb(31, 120, 193)", + "show": true + }, + "tableColumn": "", + "targets": [ + { + "expr": "count(nginx_ingress_controller_config_last_reload_successful{controller_pod=~\"$controller\",controller_namespace=~\"$namespace\"} == 0)", + "format": "time_series", + "instant": true, + "intervalFactor": 1, + "refId": "A", + "step": 4 + } + ], + "thresholds": "", + "title": "Last Config Failed", + "type": "singlestat", + "valueFontSize": "80%", + "valueMaps": [ + { + "op": "=", + "text": "N/A", + "value": "null" + } + ], + "valueName": "avg" + }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "Prometheus", + "decimals": 2, + "editable": true, + "error": false, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fill": 1, + "fillGradient": 0, + "grid": {}, + "gridPos": { + "h": 7, + "w": 12, + "x": 0, + "y": 3 + }, + "height": "200px", + "hiddenSeries": false, + "id": 86, + "isNew": true, + "legend": { + "alignAsTable": true, + "avg": true, + "current": false, + "hideEmpty": false, + "hideZero": true, + "max": false, + "min": false, + "rightSide": true, + "show": true, + "sideWidth": 300, + "sort": "current", + "sortDesc": true, + "total": false, + "values": true + }, + "lines": true, + "linewidth": 2, + "links": [], + "nullPointMode": "connected", + "options": { + "dataLinks": [] + }, + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", + "repeat": null, + "repeatDirection": "h", + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "round(sum(irate(nginx_ingress_controller_requests{controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\",ingress=~\"$ingress\"}[$__range])) by (ingress), 0.001)", + "format": "time_series", + "hide": false, + "instant": false, + "interval": "", + "intervalFactor": 1, + "legendFormat": "{{ ingress }}", + "metric": "network", + "refId": "A", + "step": 10 + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "Ingress Request Volume", + "tooltip": { + "msResolution": false, + "shared": true, + "sort": 2, + "value_type": "cumulative" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "reqps", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "Bps", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": false + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, + { + "aliasColors": { + "max - istio-proxy": "#890f02", + "max - master": "#bf1b00", + "max - prometheus": "#bf1b00" + }, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "Prometheus", + "decimals": 2, + "editable": false, + "error": false, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fill": 0, + "fillGradient": 0, + "grid": {}, + "gridPos": { + "h": 7, + "w": 12, + "x": 12, + "y": 3 + }, + "hiddenSeries": false, + "id": 87, + "isNew": true, + "legend": { + "alignAsTable": true, + "avg": true, + "current": false, + "hideEmpty": true, + "hideZero": false, + "max": false, + "min": false, + "rightSide": true, + "show": true, + "sideWidth": 300, + "sort": "avg", + "sortDesc": true, + "total": false, + "values": true + }, + "lines": true, + "linewidth": 2, + "links": [], + "nullPointMode": "connected", + "options": { + "dataLinks": [] + }, + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "sum(rate(nginx_ingress_controller_requests{controller_pod=~\"$controller\",controller_class=~\"$controller_class\",namespace=~\"$namespace\",ingress=~\"$ingress\",status!~\"[4-5].*\"}[5m])) by (ingress) / sum(rate(nginx_ingress_controller_requests{controller_pod=~\"$controller\",controller_class=~\"$controller_class\",namespace=~\"$namespace\",ingress=~\"$ingress\"}[5m])) by (ingress)", + "format": "time_series", + "instant": false, + "interval": "10s", + "intervalFactor": 1, + "legendFormat": "{{ ingress }}", + "metric": "container_memory_usage:sort_desc", + "refId": "A", + "step": 10 + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "Ingress Success Rate (non-4|5xx responses)", + "tooltip": { + "msResolution": false, + "shared": true, + "sort": 1, + "value_type": "cumulative" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "percentunit", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": false + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, + { + "columns": [], + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fontSize": "100%", + "gridPos": { + "h": 8, + "w": 24, + "x": 0, + "y": 10 + }, + "hideTimeOverride": false, + "id": 75, + "links": [], + "pageSize": 7, + "repeat": null, + "repeatDirection": "h", + "scroll": true, + "showHeader": true, + "sort": { + "col": 1, + "desc": true + }, + "styles": [ + { + "alias": "Ingress", + "align": "auto", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "pattern": "ingress", + "preserveFormat": false, + "sanitize": false, + "thresholds": [], + "type": "string", + "unit": "short" + }, + { + "alias": "Requests", + "align": "auto", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "pattern": "Value #A", + "thresholds": [ + "" + ], + "type": "number", + "unit": "ops" + }, + { + "alias": "Errors", + "align": "auto", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "pattern": "Value #B", + "thresholds": [], + "type": "number", + "unit": "ops" + }, + { + "alias": "P50 Latency", + "align": "auto", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 0, + "link": false, + "pattern": "Value #C", + "thresholds": [], + "type": "number", + "unit": "dtdurations" + }, + { + "alias": "P90 Latency", + "align": "auto", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 0, + "pattern": "Value #D", + "thresholds": [], + "type": "number", + "unit": "dtdurations" + }, + { + "alias": "P99 Latency", + "align": "auto", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 0, + "pattern": "Value #E", + "thresholds": [], + "type": "number", + "unit": "dtdurations" + }, + { + "alias": "IN", + "align": "auto", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "pattern": "Value #F", + "thresholds": [ + "" + ], + "type": "number", + "unit": "Bps" + }, + { + "alias": "", + "align": "auto", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "pattern": "Time", + "thresholds": [], + "type": "hidden", + "unit": "short" + }, + { + "alias": "OUT", + "align": "auto", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "mappingType": 1, + "pattern": "Value #G", + "thresholds": [], + "type": "number", + "unit": "Bps" + } + ], + "targets": [ + { + "expr": "histogram_quantile(0.50, sum(rate(nginx_ingress_controller_request_duration_seconds_bucket{ingress!=\"\",controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\",ingress=~\"$ingress\"}[$__range])) by (le, ingress))", + "format": "table", + "hide": false, + "instant": true, + "intervalFactor": 1, + "legendFormat": "{{ ingress }}", + "refId": "C" + }, + { + "expr": "histogram_quantile(0.90, sum(rate(nginx_ingress_controller_request_duration_seconds_bucket{ingress!=\"\",controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\",ingress=~\"$ingress\"}[$__range])) by (le, ingress))", + "format": "table", + "hide": false, + "instant": true, + "intervalFactor": 1, + "legendFormat": "{{ ingress }}", + "refId": "D" + }, + { + "expr": "histogram_quantile(0.99, sum(rate(nginx_ingress_controller_request_duration_seconds_bucket{ingress!=\"\",controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\",ingress=~\"$ingress\"}[$__range])) by (le, ingress))", + "format": "table", + "hide": false, + "instant": true, + "intervalFactor": 1, + "legendFormat": "{{ destination_service }}", + "refId": "E" + }, + { + "expr": "sum(irate(nginx_ingress_controller_request_size_sum{ingress!=\"\",controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\",ingress=~\"$ingress\"}[$__range])) by (ingress)", + "format": "table", + "hide": false, + "instant": true, + "interval": "", + "intervalFactor": 1, + "legendFormat": "{{ ingress }}", + "refId": "F" + }, + { + "expr": "sum(irate(nginx_ingress_controller_response_size_sum{ingress!=\"\",controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\",ingress=~\"$ingress\"}[$__range])) by (ingress)", + "format": "table", + "instant": true, + "intervalFactor": 1, + "legendFormat": "{{ ingress }}", + "refId": "G" + } + ], + "timeFrom": null, + "title": "Ingress Percentile Response Times and Transfer Rates", + "transform": "table", + "type": "table-old" + }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "Prometheus", + "decimals": 2, + "editable": true, + "error": false, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fill": 1, + "fillGradient": 0, + "grid": {}, + "gridPos": { + "h": 6, + "w": 8, + "x": 0, + "y": 18 + }, + "height": "200px", + "hiddenSeries": false, + "id": 32, + "isNew": true, + "legend": { + "alignAsTable": false, + "avg": true, + "current": true, + "max": false, + "min": false, + "rightSide": false, + "show": false, + "sideWidth": 200, + "sort": "current", + "sortDesc": true, + "total": false, + "values": true + }, + "lines": true, + "linewidth": 2, + "links": [], + "nullPointMode": "connected", + "options": { + "dataLinks": [] + }, + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "sum (irate (nginx_ingress_controller_request_size_sum{controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\"}[5m]))", + "format": "time_series", + "instant": false, + "interval": "10s", + "intervalFactor": 1, + "legendFormat": "Received", + "metric": "network", + "refId": "A", + "step": 10 + }, + { + "expr": "- sum (irate (nginx_ingress_controller_response_size_sum{controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\"}[5m]))", + "format": "time_series", + "hide": false, + "interval": "10s", + "intervalFactor": 1, + "legendFormat": "Sent", + "metric": "network", + "refId": "B", + "step": 10 + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "Network I/O pressure", + "tooltip": { + "msResolution": false, + "shared": true, + "sort": 0, + "value_type": "cumulative" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "Bps", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "Bps", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": false + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, + { + "aliasColors": { + "max - istio-proxy": "#890f02", + "max - master": "#bf1b00", + "max - prometheus": "#bf1b00" + }, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "Prometheus", + "decimals": 2, + "editable": false, + "error": false, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fill": 0, + "fillGradient": 0, + "grid": {}, + "gridPos": { + "h": 6, + "w": 8, + "x": 8, + "y": 18 + }, + "hiddenSeries": false, + "id": 77, + "isNew": true, + "legend": { + "alignAsTable": true, + "avg": true, + "current": true, + "max": false, + "min": false, + "rightSide": false, + "show": false, + "sideWidth": 200, + "sort": "current", + "sortDesc": true, + "total": false, + "values": true + }, + "lines": true, + "linewidth": 2, + "links": [], + "nullPointMode": "connected", + "options": { + "dataLinks": [] + }, + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "avg(nginx_ingress_controller_nginx_process_resident_memory_bytes{controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\"}) ", + "format": "time_series", + "instant": false, + "interval": "10s", + "intervalFactor": 1, + "legendFormat": "nginx", + "metric": "container_memory_usage:sort_desc", + "refId": "A", + "step": 10 + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "Average Memory Usage", + "tooltip": { + "msResolution": false, + "shared": true, + "sort": 2, + "value_type": "cumulative" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "bytes", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": false + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, + { + "aliasColors": { + "max - istio-proxy": "#890f02", + "max - master": "#bf1b00" + }, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "Prometheus", + "decimals": 3, + "editable": false, + "error": false, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fill": 0, + "fillGradient": 0, + "grid": {}, + "gridPos": { + "h": 6, + "w": 8, + "x": 16, + "y": 18 + }, + "height": "", + "hiddenSeries": false, + "id": 79, + "isNew": true, + "legend": { + "alignAsTable": true, + "avg": true, + "current": true, + "max": false, + "min": false, + "rightSide": false, + "show": false, + "sort": null, + "sortDesc": null, + "total": false, + "values": true + }, + "lines": true, + "linewidth": 2, + "links": [], + "nullPointMode": "connected", + "options": { + "dataLinks": [] + }, + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "sum (rate (nginx_ingress_controller_nginx_process_cpu_seconds_total{controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\"}[5m])) ", + "format": "time_series", + "interval": "10s", + "intervalFactor": 1, + "legendFormat": "nginx", + "metric": "container_cpu", + "refId": "A", + "step": 10 + } + ], + "thresholds": [ + { + "colorMode": "critical", + "fill": true, + "line": true, + "op": "gt" + } + ], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "Average CPU Usage", + "tooltip": { + "msResolution": true, + "shared": true, + "sort": 2, + "value_type": "cumulative" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "none", + "label": "cores", + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + } + ], + "refresh": "30s", + "schemaVersion": 25, + "style": "dark", + "tags": [ + "nginx" + ], + "templating": { + "list": [ + { + "current": { + "selected": false, + "text": "Prometheus", + "value": "Prometheus" + }, + "hide": 0, + "includeAll": false, + "label": "datasource", + "multi": false, + "name": "DS_PROMETHEUS", + "options": [], + "query": "prometheus", + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "type": "datasource" + }, + { + "allValue": ".*", + "current": { + "selected": false, + "text": "All", + "value": "$__all" + }, + "datasource": "Prometheus", + "definition": "label_values(kube_service_status_load_balancer_ingress, namespace)", + "hide": 0, + "includeAll": true, + "label": "Namespace", + "multi": false, + "name": "namespace", + "options": [], + "query": "label_values(kube_service_status_load_balancer_ingress, namespace)", + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "sort": 0, + "tagValuesQuery": "", + "tags": [], + "tagsQuery": "", + "type": "query", + "useTags": false + }, + { + "allValue": ".*", + "current": { + "selected": false, + "text": "All", + "value": "$__all" + }, + "datasource": "Prometheus", + "definition": "label_values(kube_service_status_load_balancer_ingress{namespace=~\"$namespace\"}, service)", + "hide": 0, + "includeAll": true, + "label": "Controller Class", + "multi": false, + "name": "controller_class", + "options": [], + "query": "label_values(kube_service_status_load_balancer_ingress{namespace=~\"$namespace\"}, service)", + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "sort": 0, + "tagValuesQuery": "", + "tags": [], + "tagsQuery": "", + "type": "query", + "useTags": false + }, + { + "allValue": ".*", + "current": { + "selected": false, + "text": "All", + "value": "$__all" + }, + "datasource": "Prometheus", + "definition": "label_values(kube_service_status_load_balancer_ingress{namespace=~\"$namespace\",service=~\"$controller_class\"}, pod) ", + "hide": 0, + "includeAll": true, + "label": "Controller", + "multi": false, + "name": "controller", + "options": [], + "query": "label_values(kube_service_status_load_balancer_ingress{namespace=~\"$namespace\",service=~\"$controller_class\"}, pod) ", + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "sort": 0, + "tagValuesQuery": "", + "tags": [], + "tagsQuery": "", + "type": "query", + "useTags": false + }, + { + "allValue": ".*", + "current": { + "selected": false, + "text": "All", + "value": "$__all" + }, + "datasource": "Prometheus", + "definition": "label_values(kube_service_status_load_balancer_ingress{namespace=~\"$namespace\",service=~\"$controller_class\",pod=~\"$controller\"}, ingress) ", + "hide": 0, + "includeAll": true, + "label": "Ingress", + "multi": false, + "name": "ingress", + "options": [], + "query": "label_values(kube_service_status_load_balancer_ingress{namespace=~\"$namespace\",service=~\"$controller_class\",pod=~\"$controller\"}, ingress) ", + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "sort": 2, + "tagValuesQuery": "", + "tags": [], + "tagsQuery": "", + "type": "query", + "useTags": false + } + ] + }, + "time": { + "from": "now-30m", + "to": "now" + }, + "timepicker": { + "refresh_intervals": [ + "30s", + "1m", + "2m", + "5m", + "15m", + "30m", + "1h", + "2h", + "1d" + ], + "time_options": [ + "5m", + "15m", + "1h", + "6h", + "12h", + "24h", + "2d", + "7d", + "30d" + ] + }, + "timezone": "browser", + "title": "Kubernetes Ingress Controller Dashboard", + "uid": "nginx", + "version": 1 +} \ No newline at end of file From a842f1a5fbc75802107f399a7299830180f283d0 Mon Sep 17 00:00:00 2001 From: Nithin <36623418+nithindv@users.noreply.github.com> Date: Thu, 20 Aug 2020 11:48:00 +0530 Subject: [PATCH 0048/1242] Update kube-cluster-dashboard.json --- .../kube-cluster-dashboard.json | 4045 +++++++++-------- 1 file changed, 2220 insertions(+), 1825 deletions(-) diff --git a/configs/monitoring-dashboards/kube-cluster-dashboard.json b/configs/monitoring-dashboards/kube-cluster-dashboard.json index 72a0fccc..94872619 100644 --- a/configs/monitoring-dashboards/kube-cluster-dashboard.json +++ b/configs/monitoring-dashboards/kube-cluster-dashboard.json @@ -16,8 +16,7 @@ "editable": true, "gnetId": 11802, "graphTooltip": 0, - "id": 5, - "iteration": 1595353603518, + "iteration": 1597248957829, "links": [], "panels": [ { @@ -1439,98 +1438,287 @@ "x": 0, "y": 1 }, - "id": 135, + "id": 140, "panels": [ { - "cacheTimeout": null, - "datasource": "Prometheus", + "datasource": null, "fieldConfig": { "defaults": { "custom": { - "align": "left" + "align": "center" }, - "mappings": [ - { - "id": 0, - "op": "=", - "text": "0", - "type": 1, - "value": "null" - } - ], - "nullValueMode": "connected", + "mappings": [], "thresholds": { "mode": "absolute", "steps": [ { - "color": "#299c46", + "color": "green", "value": null }, { - "color": "#37872D", - "value": 0 - }, + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [ + { + "matcher": { + "id": "byName", + "options": "Lag" + }, + "properties": [ { - "color": "#d44a3a" + "id": "custom.displayMode", + "value": "color-text" } ] + } + ] + }, + "gridPos": { + "h": 8, + "w": 12, + "x": 0, + "y": 2 + }, + "id": 137, + "options": { + "frameIndex": 1, + "showHeader": true, + "sortBy": [ + { + "desc": true, + "displayName": "Value #B" + } + ] + }, + "pluginVersion": "7.0.5", + "targets": [ + { + "expr": "sort_desc(sum(kafka_consumergroup_lag_sum) by (consumergroup, topic))", + "format": "table", + "instant": true, + "interval": "", + "legendFormat": "Lag", + "refId": "A" + } + ], + "timeFrom": null, + "timeShift": null, + "title": "Consumer Group Lag", + "transformations": [ + { + "id": "organize", + "options": { + "excludeByName": { + "Time": true, + "__name__": true, + "consumergroup": false, + "endpoint": true, + "instance": true, + "job": true, + "namespace": true, + "pod": true, + "service": true + }, + "indexByName": {}, + "renameByName": { + "Value": "Lag", + "consumergroup": "", + "topic": "" + } + } + }, + { + "id": "organize", + "options": {} + } + ], + "type": "table" + }, + { + "datasource": null, + "fieldConfig": { + "defaults": { + "custom": { + "align": "center" }, - "unit": "percentunit" + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + } }, "overrides": [] }, "gridPos": { - "h": 6, - "w": 10, - "x": 0, + "h": 8, + "w": 12, + "x": 12, "y": 2 }, - "id": 133, - "interval": null, - "links": [], - "maxDataPoints": 100, + "id": 138, "options": { - "displayMode": "lcd", - "orientation": "horizontal", - "reduceOptions": { - "calcs": [ - "mean" - ], - "fields": "", - "values": false - }, - "showUnfilled": true + "frameIndex": 1, + "showHeader": true, + "sortBy": [] }, "pluginVersion": "7.0.5", "targets": [ { - "expr": "kubelet_volume_stats_available_bytes{job=\"kubelet\",metrics_path=\"/metrics\",namespace=\"$namespace\"}\n / kubelet_volume_stats_capacity_bytes{job=\"kubelet\",metrics_path=\"/metrics\",namespace=\"$namespace\"}\n ", - "format": "time_series", - "hide": false, + "expr": "sort_desc(sum(delta(kafka_consumergroup_current_offset[10m])) by (consumergroup, topic))", + "format": "table", "instant": true, "interval": "", - "legendFormat": "{{persistentvolumeclaim}}", + "legendFormat": "Lag", "refId": "A" + } + ], + "timeFrom": null, + "timeShift": null, + "title": "Consumption Rate", + "transformations": [ + { + "id": "organize", + "options": { + "excludeByName": { + "Time": true, + "__name__": true, + "consumergroup": false, + "endpoint": true, + "instance": true, + "job": true, + "namespace": true, + "pod": true, + "service": true + }, + "indexByName": {}, + "renameByName": { + "Value": "Messages/5min", + "consumergroup": "", + "topic": "" + } + } }, { - "expr": "", - "hide": true, - "refId": "B" + "id": "organize", + "options": {} + } + ], + "type": "table" + }, + { + "datasource": null, + "fieldConfig": { + "defaults": { + "custom": { + "align": "center" + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [ + { + "matcher": { + "id": "byName", + "options": "Dead Letters" + }, + "properties": [ + { + "id": "custom.displayMode", + "value": "color-text" + } + ] + } + ] + }, + "gridPos": { + "h": 9, + "w": 12, + "x": 0, + "y": 10 + }, + "id": 143, + "options": { + "frameIndex": 1, + "showHeader": true, + "sortBy": [ + { + "desc": true, + "displayName": "Value #B" + } + ] + }, + "pluginVersion": "7.0.5", + "targets": [ + { + "expr": "sort_desc(sum(kafka_topic_partition_current_offset{topic=~\".*deadletter\"}) by (topic))", + "format": "table", + "instant": true, + "interval": "", + "legendFormat": "Lag", + "refId": "A" } ], "timeFrom": null, "timeShift": null, - "title": "PVCs available capacity in namespacee $namespace", - "transparent": true, - "type": "bargauge" + "title": "Dead Letters", + "transformations": [ + { + "id": "organize", + "options": { + "excludeByName": { + "Time": true, + "__name__": true, + "consumergroup": false, + "endpoint": true, + "instance": true, + "job": true, + "namespace": true, + "pod": true, + "service": true + }, + "indexByName": {}, + "renameByName": { + "Value": "Dead Letters", + "consumergroup": "", + "topic": "" + } + } + }, + { + "id": "organize", + "options": {} + } + ], + "type": "table" }, { - "aliasColors": { - "ReadOnly::k8s-aboutmckinsey-intranet-aboutmckinsey-prod-pvc-0::intranet-aboutmckinsey-prod-85c4d8fcd6-cq4vv": "dark-red", - "Total": "dark-red" - }, + "aliasColors": {}, "bars": false, - "cacheTimeout": null, "dashLength": 10, "dashes": false, "datasource": "Prometheus", @@ -1543,32 +1731,36 @@ "fill": 0, "fillGradient": 0, "gridPos": { - "h": 6, - "w": 10, - "x": 10, - "y": 2 + "h": 9, + "w": 12, + "x": 12, + "y": 10 }, "hiddenSeries": false, - "id": 50, + "id": 142, "legend": { + "alignAsTable": true, "avg": false, "current": false, "max": false, "min": false, "rightSide": false, "show": true, + "sideWidth": 480, + "sort": "current", + "sortDesc": true, "total": false, "values": false }, "lines": true, "linewidth": 1, "links": [], - "nullPointMode": "null", + "nullPointMode": "connected", "options": { "dataLinks": [] }, "percentage": false, - "pointradius": 2, + "pointradius": 5, "points": false, "renderer": "flot", "seriesOverrides": [], @@ -1577,15 +1769,11 @@ "steppedLine": false, "targets": [ { - "expr": "(kube_persistentvolumeclaim_access_mode{namespace=\"$namespace\"})", + "expr": "sum(kafka_consumergroup_current_offset) by (consumergroup, topic)", "format": "time_series", - "hide": false, - "legendFormat": "{{access_mode}}::{{persistentvolumeclaim}}", - "refId": "B" - }, - { - "expr": "kube_persistentvolumeclaim_status_phase{namespace=\"$namespace\",phase=\"Bound\"}", - "legendFormat": "Bound::{{persistentvolumeclaim}}", + "interval": "", + "intervalFactor": 1, + "legendFormat": "{{consumergroup}} (topic: {{topic}})", "refId": "A" } ], @@ -1593,13 +1781,12 @@ "timeFrom": null, "timeRegions": [], "timeShift": null, - "title": "persistentvolumeclaim status in namespace $namespace", + "title": "Message Consumption", "tooltip": { "shared": true, "sort": 0, "value_type": "individual" }, - "transparent": true, "type": "graph", "xaxis": { "buckets": null, @@ -1610,7 +1797,8 @@ }, "yaxes": [ { - "format": "none", + "$$hashKey": "object:169", + "format": "short", "label": null, "logBase": 1, "max": null, @@ -1618,25 +1806,43 @@ "show": true }, { + "$$hashKey": "object:170", "format": "short", "label": null, "logBase": 1, "max": null, "min": null, - "show": false + "show": true } ], "yaxis": { "align": false, "alignLevel": null } - }, + } + ], + "title": "Kafka Consumer Groups", + "type": "row" + }, + { + "collapsed": true, + "datasource": null, + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 2 + }, + "id": 135, + "panels": [ { "cacheTimeout": null, "datasource": "Prometheus", "fieldConfig": { "defaults": { - "custom": {}, + "custom": { + "align": "left" + }, "mappings": [ { "id": 0, @@ -1663,13 +1869,201 @@ } ] }, - "unit": "none" + "unit": "percentunit" }, "overrides": [] }, "gridPos": { "h": 6, - "w": 2, + "w": 10, + "x": 0, + "y": 2 + }, + "id": 133, + "interval": null, + "links": [], + "maxDataPoints": 100, + "options": { + "displayMode": "lcd", + "orientation": "horizontal", + "reduceOptions": { + "calcs": [ + "mean" + ], + "fields": "", + "values": false + }, + "showUnfilled": true + }, + "pluginVersion": "7.0.5", + "targets": [ + { + "expr": "kubelet_volume_stats_available_bytes{job=\"kubelet\",metrics_path=\"/metrics\",namespace=\"$namespace\"}\n / kubelet_volume_stats_capacity_bytes{job=\"kubelet\",metrics_path=\"/metrics\",namespace=\"$namespace\"}\n ", + "format": "time_series", + "hide": false, + "instant": true, + "interval": "", + "legendFormat": "{{persistentvolumeclaim}}", + "refId": "A" + }, + { + "expr": "", + "hide": true, + "refId": "B" + } + ], + "timeFrom": null, + "timeShift": null, + "title": "PVCs available capacity in namespacee $namespace", + "transparent": true, + "type": "bargauge" + }, + { + "aliasColors": { + "ReadOnly::k8s-aboutmckinsey-intranet-aboutmckinsey-prod-pvc-0::intranet-aboutmckinsey-prod-85c4d8fcd6-cq4vv": "dark-red", + "Total": "dark-red" + }, + "bars": false, + "cacheTimeout": null, + "dashLength": 10, + "dashes": false, + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fill": 0, + "fillGradient": 0, + "gridPos": { + "h": 6, + "w": 10, + "x": 10, + "y": 2 + }, + "hiddenSeries": false, + "id": 50, + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, + "rightSide": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "links": [], + "nullPointMode": "null", + "options": { + "dataLinks": [] + }, + "percentage": false, + "pointradius": 2, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "(kube_persistentvolumeclaim_access_mode{namespace=\"$namespace\"})", + "format": "time_series", + "hide": false, + "legendFormat": "{{access_mode}}::{{persistentvolumeclaim}}", + "refId": "B" + }, + { + "expr": "kube_persistentvolumeclaim_status_phase{namespace=\"$namespace\",phase=\"Bound\"}", + "legendFormat": "Bound::{{persistentvolumeclaim}}", + "refId": "A" + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "persistentvolumeclaim status in namespace $namespace", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "transparent": true, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "none", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": false + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, + { + "cacheTimeout": null, + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {}, + "mappings": [ + { + "id": 0, + "op": "=", + "text": "0", + "type": 1, + "value": "null" + } + ], + "nullValueMode": "connected", + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "#299c46", + "value": null + }, + { + "color": "#37872D", + "value": 0 + }, + { + "color": "#d44a3a" + } + ] + }, + "unit": "none" + }, + "overrides": [] + }, + "gridPos": { + "h": 6, + "w": 2, "x": 20, "y": 2 }, @@ -1798,1754 +2192,1755 @@ "type": "row" }, { - "collapsed": false, + "collapsed": true, "datasource": "Prometheus", "gridPos": { "h": 1, "w": 24, "x": 0, - "y": 2 - }, - "id": 41, - "panels": [], - "title": "Namespace $namespace details", - "type": "row" - }, - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": false, - "colors": [ - "#299c46", - "#37872D", - "#d44a3a" - ], - "datasource": "Prometheus", - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, - "format": "none", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": false, - "thresholdLabels": false, - "thresholdMarkers": true - }, - "gridPos": { - "h": 3, - "w": 3, - "x": 0, - "y": 3 - }, - "id": 53, - "interval": null, - "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], - "maxDataPoints": 100, - "nullPointMode": "connected", - "nullText": null, - "postfix": "", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "50%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": false, - "lineColor": "rgb(31, 120, 193)", - "show": true, - "ymax": null, - "ymin": null - }, - "tableColumn": "", - "targets": [ - { - "expr": "count(kube_deployment_created{namespace=\"$namespace\"})", - "hide": false, - "instant": false, - "legendFormat": "{{deployment}}", - "refId": "A" - }, - { - "expr": "", - "hide": true, - "refId": "B" - } - ], - "thresholds": "0,1", - "timeFrom": null, - "timeShift": null, - "title": "Deployments", - "transparent": true, - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ - { - "op": "=", - "text": "N/A", - "value": "null" - } - ], - "valueName": "current" - }, - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": false, - "colors": [ - "#299c46", - "rgba(237, 129, 40, 0.89)", - "#d44a3a" - ], - "datasource": "Prometheus", - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, - "format": "none", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": false, - "thresholdLabels": false, - "thresholdMarkers": true - }, - "gridPos": { - "h": 3, - "w": 3, - "x": 3, "y": 3 }, - "id": 44, - "interval": null, - "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], - "maxDataPoints": 100, - "nullPointMode": "connected", - "nullText": null, - "postfix": "", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "50%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": false, - "lineColor": "rgb(31, 120, 193)", - "show": true, - "ymax": null, - "ymin": null - }, - "tableColumn": "", - "targets": [ - { - "expr": "count(kube_pod_container_status_ready{namespace=\"$namespace\"} !=0 ) or vector(0)", - "hide": false, - "instant": false, - "interval": "", - "legendFormat": "{{pod}}", - "refId": "A" - }, - { - "expr": "", - "hide": true, - "refId": "B" - } - ], - "thresholds": "", - "timeFrom": null, - "timeShift": null, - "title": "Ready pods", - "transparent": true, - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ + "id": 41, + "panels": [ { - "op": "=", - "text": "N/A", - "value": "null" - } - ], - "valueName": "current" - }, - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": true, - "colors": [ - "#299c46", - "#37872D", - "#d44a3a" - ], - "datasource": "Prometheus", - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, - "format": "none", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": false, - "thresholdLabels": false, - "thresholdMarkers": true - }, - "gridPos": { - "h": 3, - "w": 3, - "x": 6, - "y": 3 - }, - "id": 42, - "interval": null, - "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], - "maxDataPoints": 100, - "nullPointMode": "connected", - "nullText": null, - "postfix": "", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "50%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": false, - "lineColor": "rgb(31, 120, 193)", - "show": true, - "ymax": null, - "ymin": null - }, - "tableColumn": "", - "targets": [ - { - "expr": "count(kube_pod_container_status_terminated{namespace=\"$namespace\"} !=0 ) or vector(0)", - "hide": false, - "instant": false, - "legendFormat": "{{pod}}", - "refId": "A" - }, - { - "expr": "", - "hide": true, - "refId": "B" - } - ], - "thresholds": "0,1", - "timeFrom": null, - "timeShift": null, - "title": "Terminated pods", - "transparent": true, - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ - { - "op": "=", - "text": "N/A", - "value": "null" - } - ], - "valueName": "current" - }, - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": true, - "colors": [ - "#299c46", - "#37872D", - "#d44a3a" - ], - "datasource": "Prometheus", - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, - "format": "none", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": false, - "thresholdLabels": false, - "thresholdMarkers": true - }, - "gridPos": { - "h": 3, - "w": 3, - "x": 9, - "y": 3 - }, - "id": 45, - "interval": null, - "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], - "maxDataPoints": 100, - "nullPointMode": "connected", - "nullText": null, - "postfix": "", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "50%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": false, - "lineColor": "rgb(31, 120, 193)", - "show": true, - "ymax": null, - "ymin": null - }, - "tableColumn": "", - "targets": [ - { - "expr": "count(kube_pod_container_status_waiting{namespace=\"$namespace\"} !=0 ) or vector(0)", - "hide": false, - "instant": false, - "legendFormat": "{{pod}}", - "refId": "A" - }, - { - "expr": "", - "hide": true, - "refId": "B" - } - ], - "thresholds": "0,1", - "timeFrom": null, - "timeShift": null, - "title": "Waiting pods", - "transparent": true, - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ - { - "op": "=", - "text": "N/A", - "value": "null" - } - ], - "valueName": "current" - }, - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": false, - "colors": [ - "#299c46", - "#37872D", - "#d44a3a" - ], - "datasource": "Prometheus", - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, - "format": "none", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": false, - "thresholdLabels": false, - "thresholdMarkers": true - }, - "gridPos": { - "h": 3, - "w": 3, - "x": 12, - "y": 3 - }, - "id": 92, - "interval": null, - "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 + "cacheTimeout": null, + "colorBackground": false, + "colorValue": false, + "colors": [ + "#299c46", + "#37872D", + "#d44a3a" + ], + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, + "gridPos": { + "h": 3, + "w": 3, + "x": 0, + "y": 21 + }, + "id": 53, + "interval": null, + "links": [], + "mappingType": 1, + "mappingTypes": [ + { + "name": "value to text", + "value": 1 + }, + { + "name": "range to text", + "value": 2 + } + ], + "maxDataPoints": 100, + "nullPointMode": "connected", + "nullText": null, + "postfix": "", + "postfixFontSize": "50%", + "prefix": "", + "prefixFontSize": "50%", + "rangeMaps": [ + { + "from": "null", + "text": "N/A", + "to": "null" + } + ], + "sparkline": { + "fillColor": "rgba(31, 118, 189, 0.18)", + "full": false, + "lineColor": "rgb(31, 120, 193)", + "show": true, + "ymax": null, + "ymin": null + }, + "tableColumn": "", + "targets": [ + { + "expr": "count(kube_deployment_created{namespace=\"$namespace\"})", + "hide": false, + "instant": false, + "legendFormat": "{{deployment}}", + "refId": "A" + }, + { + "expr": "", + "hide": true, + "refId": "B" + } + ], + "thresholds": "0,1", + "timeFrom": null, + "timeShift": null, + "title": "Deployments", + "transparent": true, + "type": "singlestat", + "valueFontSize": "80%", + "valueMaps": [ + { + "op": "=", + "text": "N/A", + "value": "null" + } + ], + "valueName": "current" }, { - "name": "range to text", - "value": 2 - } - ], - "maxDataPoints": 100, - "nullPointMode": "connected", - "nullText": null, - "postfix": "", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "50%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": false, - "lineColor": "rgb(31, 120, 193)", - "show": true, - "ymax": null, - "ymin": null - }, - "tableColumn": "", - "targets": [ - { - "expr": "count(container_spec_memory_reservation_limit_bytes{namespace=\"$namespace\",container=\"POD\",id!~\".*.burstable.*|.*.besteffort.*\",id!~\".*.scope\",pod!=\"\"})", - "hide": false, - "instant": false, - "interval": "", - "legendFormat": "{{pod}}", - "refId": "A" + "cacheTimeout": null, + "colorBackground": false, + "colorValue": false, + "colors": [ + "#299c46", + "rgba(237, 129, 40, 0.89)", + "#d44a3a" + ], + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, + "gridPos": { + "h": 3, + "w": 3, + "x": 3, + "y": 21 + }, + "id": 44, + "interval": null, + "links": [], + "mappingType": 1, + "mappingTypes": [ + { + "name": "value to text", + "value": 1 + }, + { + "name": "range to text", + "value": 2 + } + ], + "maxDataPoints": 100, + "nullPointMode": "connected", + "nullText": null, + "postfix": "", + "postfixFontSize": "50%", + "prefix": "", + "prefixFontSize": "50%", + "rangeMaps": [ + { + "from": "null", + "text": "N/A", + "to": "null" + } + ], + "sparkline": { + "fillColor": "rgba(31, 118, 189, 0.18)", + "full": false, + "lineColor": "rgb(31, 120, 193)", + "show": true, + "ymax": null, + "ymin": null + }, + "tableColumn": "", + "targets": [ + { + "expr": "count(kube_pod_container_status_ready{namespace=\"$namespace\"} !=0 ) or vector(0)", + "hide": false, + "instant": false, + "interval": "", + "legendFormat": "{{pod}}", + "refId": "A" + }, + { + "expr": "", + "hide": true, + "refId": "B" + } + ], + "thresholds": "", + "timeFrom": null, + "timeShift": null, + "title": "Ready pods", + "transparent": true, + "type": "singlestat", + "valueFontSize": "80%", + "valueMaps": [ + { + "op": "=", + "text": "N/A", + "value": "null" + } + ], + "valueName": "current" }, { - "expr": "", - "hide": true, - "refId": "B" - } - ], - "thresholds": "0,1", - "timeFrom": null, - "timeShift": null, - "title": "Guaranteed pods", - "transparent": true, - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ - { - "op": "=", - "text": "N/A", - "value": "null" - } - ], - "valueName": "current" - }, - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": false, - "colors": [ - "#299c46", - "#37872D", - "#d44a3a" - ], - "datasource": "Prometheus", - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, - "format": "none", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": false, - "thresholdLabels": false, - "thresholdMarkers": true - }, - "gridPos": { - "h": 3, - "w": 3, - "x": 15, - "y": 3 - }, - "id": 91, - "interval": null, - "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], - "maxDataPoints": 100, - "nullPointMode": "connected", - "nullText": null, - "postfix": "", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "50%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": false, - "lineColor": "rgb(31, 120, 193)", - "show": true, - "ymax": null, - "ymin": null - }, - "tableColumn": "", - "targets": [ - { - "expr": "sum(count by (pod)(container_spec_memory_reservation_limit_bytes{namespace=\"$namespace\",container=\"POD\"}))", - "hide": false, - "instant": false, - "interval": "", - "legendFormat": "", - "refId": "A" - }, - { - "expr": "", - "hide": true, - "refId": "B" - } - ], - "thresholds": "0,1", - "timeFrom": null, - "timeShift": null, - "title": "total pods", - "transparent": true, - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ - { - "op": "=", - "text": "N/A", - "value": "null" - } - ], - "valueName": "current" - }, - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": false, - "colors": [ - "#299c46", - "#37872D", - "#d44a3a" - ], - "datasource": "Prometheus", - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, - "format": "none", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": false, - "thresholdLabels": false, - "thresholdMarkers": true - }, - "gridPos": { - "h": 3, - "w": 3, - "x": 18, - "y": 3 - }, - "id": 89, - "interval": null, - "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], - "maxDataPoints": 100, - "nullPointMode": "connected", - "nullText": null, - "postfix": "", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "50%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": false, - "lineColor": "rgb(31, 120, 193)", - "show": true, - "ymax": null, - "ymin": null - }, - "tableColumn": "", - "targets": [ - { - "expr": "count(count by (pod)(container_spec_memory_reservation_limit_bytes{id=~\".*.besteffort.*\",id!~\".*.scope\",pod!=\"\",namespace=\"$namespace\"}))", - "hide": false, - "instant": false, - "interval": "", - "legendFormat": "{{pod}}", - "refId": "A" - }, - { - "expr": "", - "hide": true, - "refId": "B" - } - ], - "thresholds": "0,1", - "timeFrom": null, - "timeShift": null, - "title": "Besteffort pods", - "transparent": true, - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ - { - "op": "=", - "text": "N/A", - "value": "null" - } - ], - "valueName": "current" - }, - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": false, - "colors": [ - "#299c46", - "#37872D", - "#d44a3a" - ], - "datasource": "Prometheus", - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, - "format": "none", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": false, - "thresholdLabels": false, - "thresholdMarkers": true - }, - "gridPos": { - "h": 3, - "w": 3, - "x": 21, - "y": 3 - }, - "id": 94, - "interval": null, - "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 + "cacheTimeout": null, + "colorBackground": false, + "colorValue": true, + "colors": [ + "#299c46", + "#37872D", + "#d44a3a" + ], + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, + "gridPos": { + "h": 3, + "w": 3, + "x": 6, + "y": 21 + }, + "id": 42, + "interval": null, + "links": [], + "mappingType": 1, + "mappingTypes": [ + { + "name": "value to text", + "value": 1 + }, + { + "name": "range to text", + "value": 2 + } + ], + "maxDataPoints": 100, + "nullPointMode": "connected", + "nullText": null, + "postfix": "", + "postfixFontSize": "50%", + "prefix": "", + "prefixFontSize": "50%", + "rangeMaps": [ + { + "from": "null", + "text": "N/A", + "to": "null" + } + ], + "sparkline": { + "fillColor": "rgba(31, 118, 189, 0.18)", + "full": false, + "lineColor": "rgb(31, 120, 193)", + "show": true, + "ymax": null, + "ymin": null + }, + "tableColumn": "", + "targets": [ + { + "expr": "count(kube_pod_container_status_terminated{namespace=\"$namespace\"} !=0 ) or vector(0)", + "hide": false, + "instant": false, + "legendFormat": "{{pod}}", + "refId": "A" + }, + { + "expr": "", + "hide": true, + "refId": "B" + } + ], + "thresholds": "0,1", + "timeFrom": null, + "timeShift": null, + "title": "Terminated pods", + "transparent": true, + "type": "singlestat", + "valueFontSize": "80%", + "valueMaps": [ + { + "op": "=", + "text": "N/A", + "value": "null" + } + ], + "valueName": "current" }, { - "name": "range to text", - "value": 2 - } - ], - "maxDataPoints": 100, - "nullPointMode": "connected", - "nullText": null, - "postfix": "", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "50%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": false, - "lineColor": "rgb(31, 120, 193)", - "show": true, - "ymax": null, - "ymin": null - }, - "tableColumn": "", - "targets": [ - { - "expr": "sum(count by (pod)(container_spec_memory_reservation_limit_bytes{id=~\".*.burstable.*\",id!~\".*.scope\",pod!=\"\",namespace=\"$namespace\",container=\"POD\"}))", - "hide": false, - "instant": false, - "interval": "", - "legendFormat": "", - "refId": "A" + "cacheTimeout": null, + "colorBackground": false, + "colorValue": true, + "colors": [ + "#299c46", + "#37872D", + "#d44a3a" + ], + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, + "gridPos": { + "h": 3, + "w": 3, + "x": 9, + "y": 21 + }, + "id": 45, + "interval": null, + "links": [], + "mappingType": 1, + "mappingTypes": [ + { + "name": "value to text", + "value": 1 + }, + { + "name": "range to text", + "value": 2 + } + ], + "maxDataPoints": 100, + "nullPointMode": "connected", + "nullText": null, + "postfix": "", + "postfixFontSize": "50%", + "prefix": "", + "prefixFontSize": "50%", + "rangeMaps": [ + { + "from": "null", + "text": "N/A", + "to": "null" + } + ], + "sparkline": { + "fillColor": "rgba(31, 118, 189, 0.18)", + "full": false, + "lineColor": "rgb(31, 120, 193)", + "show": true, + "ymax": null, + "ymin": null + }, + "tableColumn": "", + "targets": [ + { + "expr": "count(kube_pod_container_status_waiting{namespace=\"$namespace\"} !=0 ) or vector(0)", + "hide": false, + "instant": false, + "legendFormat": "{{pod}}", + "refId": "A" + }, + { + "expr": "", + "hide": true, + "refId": "B" + } + ], + "thresholds": "0,1", + "timeFrom": null, + "timeShift": null, + "title": "Waiting pods", + "transparent": true, + "type": "singlestat", + "valueFontSize": "80%", + "valueMaps": [ + { + "op": "=", + "text": "N/A", + "value": "null" + } + ], + "valueName": "current" }, { - "expr": "", - "hide": true, - "refId": "B" - } - ], - "thresholds": "0,1", - "timeFrom": null, - "timeShift": null, - "title": "burstable pods", - "transparent": true, - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ - { - "op": "=", - "text": "N/A", - "value": "null" - } - ], - "valueName": "current" - }, - { - "cacheTimeout": null, - "datasource": "Prometheus", - "fieldConfig": { - "defaults": { - "custom": { - "align": "left", - "displayMode": "color-text" - }, - "mappings": [], - "noValue": "--", - "thresholds": { - "mode": "absolute", - "steps": [ + "cacheTimeout": null, + "colorBackground": false, + "colorValue": false, + "colors": [ + "#299c46", + "#37872D", + "#d44a3a" + ], + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, + "gridPos": { + "h": 3, + "w": 3, + "x": 12, + "y": 21 + }, + "id": 92, + "interval": null, + "links": [], + "mappingType": 1, + "mappingTypes": [ + { + "name": "value to text", + "value": 1 + }, + { + "name": "range to text", + "value": 2 + } + ], + "maxDataPoints": 100, + "nullPointMode": "connected", + "nullText": null, + "postfix": "", + "postfixFontSize": "50%", + "prefix": "", + "prefixFontSize": "50%", + "rangeMaps": [ + { + "from": "null", + "text": "N/A", + "to": "null" + } + ], + "sparkline": { + "fillColor": "rgba(31, 118, 189, 0.18)", + "full": false, + "lineColor": "rgb(31, 120, 193)", + "show": true, + "ymax": null, + "ymin": null + }, + "tableColumn": "", + "targets": [ + { + "expr": "count(container_spec_memory_reservation_limit_bytes{namespace=\"$namespace\",container=\"POD\",id!~\".*.burstable.*|.*.besteffort.*\",id!~\".*.scope\",pod!=\"\"})", + "hide": false, + "instant": false, + "interval": "", + "legendFormat": "{{pod}}", + "refId": "A" + }, + { + "expr": "", + "hide": true, + "refId": "B" + } + ], + "thresholds": "0,1", + "timeFrom": null, + "timeShift": null, + "title": "Guaranteed pods", + "transparent": true, + "type": "singlestat", + "valueFontSize": "80%", + "valueMaps": [ + { + "op": "=", + "text": "N/A", + "value": "null" + } + ], + "valueName": "current" + }, + { + "cacheTimeout": null, + "colorBackground": false, + "colorValue": false, + "colors": [ + "#299c46", + "#37872D", + "#d44a3a" + ], + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, + "gridPos": { + "h": 3, + "w": 3, + "x": 15, + "y": 21 + }, + "id": 91, + "interval": null, + "links": [], + "mappingType": 1, + "mappingTypes": [ + { + "name": "value to text", + "value": 1 + }, + { + "name": "range to text", + "value": 2 + } + ], + "maxDataPoints": 100, + "nullPointMode": "connected", + "nullText": null, + "postfix": "", + "postfixFontSize": "50%", + "prefix": "", + "prefixFontSize": "50%", + "rangeMaps": [ + { + "from": "null", + "text": "N/A", + "to": "null" + } + ], + "sparkline": { + "fillColor": "rgba(31, 118, 189, 0.18)", + "full": false, + "lineColor": "rgb(31, 120, 193)", + "show": true, + "ymax": null, + "ymin": null + }, + "tableColumn": "", + "targets": [ + { + "expr": "sum(count by (pod)(container_spec_memory_reservation_limit_bytes{namespace=\"$namespace\",container=\"POD\"}))", + "hide": false, + "instant": false, + "interval": "", + "legendFormat": "", + "refId": "A" + }, + { + "expr": "", + "hide": true, + "refId": "B" + } + ], + "thresholds": "0,1", + "timeFrom": null, + "timeShift": null, + "title": "total pods", + "transparent": true, + "type": "singlestat", + "valueFontSize": "80%", + "valueMaps": [ + { + "op": "=", + "text": "N/A", + "value": "null" + } + ], + "valueName": "current" + }, + { + "cacheTimeout": null, + "colorBackground": false, + "colorValue": false, + "colors": [ + "#299c46", + "#37872D", + "#d44a3a" + ], + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, + "gridPos": { + "h": 3, + "w": 3, + "x": 18, + "y": 21 + }, + "id": 89, + "interval": null, + "links": [], + "mappingType": 1, + "mappingTypes": [ + { + "name": "value to text", + "value": 1 + }, + { + "name": "range to text", + "value": 2 + } + ], + "maxDataPoints": 100, + "nullPointMode": "connected", + "nullText": null, + "postfix": "", + "postfixFontSize": "50%", + "prefix": "", + "prefixFontSize": "50%", + "rangeMaps": [ + { + "from": "null", + "text": "N/A", + "to": "null" + } + ], + "sparkline": { + "fillColor": "rgba(31, 118, 189, 0.18)", + "full": false, + "lineColor": "rgb(31, 120, 193)", + "show": true, + "ymax": null, + "ymin": null + }, + "tableColumn": "", + "targets": [ + { + "expr": "count(count by (pod)(container_spec_memory_reservation_limit_bytes{id=~\".*.besteffort.*\",id!~\".*.scope\",pod!=\"\",namespace=\"$namespace\"}))", + "hide": false, + "instant": false, + "interval": "", + "legendFormat": "{{pod}}", + "refId": "A" + }, + { + "expr": "", + "hide": true, + "refId": "B" + } + ], + "thresholds": "0,1", + "timeFrom": null, + "timeShift": null, + "title": "Besteffort pods", + "transparent": true, + "type": "singlestat", + "valueFontSize": "80%", + "valueMaps": [ + { + "op": "=", + "text": "N/A", + "value": "null" + } + ], + "valueName": "current" + }, + { + "cacheTimeout": null, + "colorBackground": false, + "colorValue": false, + "colors": [ + "#299c46", + "#37872D", + "#d44a3a" + ], + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, + "gridPos": { + "h": 3, + "w": 3, + "x": 21, + "y": 21 + }, + "id": 94, + "interval": null, + "links": [], + "mappingType": 1, + "mappingTypes": [ + { + "name": "value to text", + "value": 1 + }, + { + "name": "range to text", + "value": 2 + } + ], + "maxDataPoints": 100, + "nullPointMode": "connected", + "nullText": null, + "postfix": "", + "postfixFontSize": "50%", + "prefix": "", + "prefixFontSize": "50%", + "rangeMaps": [ + { + "from": "null", + "text": "N/A", + "to": "null" + } + ], + "sparkline": { + "fillColor": "rgba(31, 118, 189, 0.18)", + "full": false, + "lineColor": "rgb(31, 120, 193)", + "show": true, + "ymax": null, + "ymin": null + }, + "tableColumn": "", + "targets": [ + { + "expr": "sum(count by (pod)(container_spec_memory_reservation_limit_bytes{id=~\".*.burstable.*\",id!~\".*.scope\",pod!=\"\",namespace=\"$namespace\",container=\"POD\"}))", + "hide": false, + "instant": false, + "interval": "", + "legendFormat": "", + "refId": "A" + }, + { + "expr": "", + "hide": true, + "refId": "B" + } + ], + "thresholds": "0,1", + "timeFrom": null, + "timeShift": null, + "title": "burstable pods", + "transparent": true, + "type": "singlestat", + "valueFontSize": "80%", + "valueMaps": [ + { + "op": "=", + "text": "N/A", + "value": "null" + } + ], + "valueName": "current" + }, + { + "cacheTimeout": null, + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": { + "align": "left", + "displayMode": "color-text" + }, + "mappings": [], + "noValue": "--", + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "dark-green", + "value": null + } + ] + }, + "unit": "decbytes" + }, + "overrides": [ + { + "matcher": { + "id": "byName", + "options": "pod" + }, + "properties": [ + { + "id": "custom.width", + "value": 366 + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "host_ip" + }, + "properties": [ + { + "id": "custom.width", + "value": 104 + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "pod_ip" + }, + "properties": [ + { + "id": "custom.width", + "value": 111 + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "node" + }, + "properties": [ + { + "id": "custom.width", + "value": 202 + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "Memory usage" + }, + "properties": [ + { + "id": "custom.width", + "value": null + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "Status" + }, + "properties": [ + { + "id": "custom.width", + "value": 68 + }, + { + "id": "mappings", + "value": [ + { + "from": "", + "id": 0, + "operator": "", + "text": "Up", + "to": "", + "type": 1, + "value": "1" + }, + { + "from": "", + "id": 1, + "operator": "", + "text": "Down", + "to": "", + "type": 1, + "value": "0" + } + ] + }, + { + "id": "thresholds", + "value": { + "mode": "absolute", + "steps": [ + { + "color": "dark-red", + "value": null + }, + { + "color": "dark-green", + "value": 1 + } + ] + } + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "Age" + }, + "properties": [ + { + "id": "custom.width", + "value": 92 + }, + { + "id": "unit", + "value": "s" + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "Restarts" + }, + "properties": [ + { + "id": "custom.width", + "value": null + }, + { + "id": "unit", + "value": "none" + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "CPU Usage" + }, + "properties": [ + { + "id": "custom.width", + "value": 247 + }, + { + "id": "unit" + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "CPU Usage [95th Percentile]" + }, + "properties": [ + { + "id": "custom.width", + "value": 253 + }, + { + "id": "unit", + "value": "none" + } + ] + } + ] + }, + "gridPos": { + "h": 8, + "w": 24, + "x": 0, + "y": 24 + }, + "id": 104, + "links": [], + "options": { + "angular": { + "columns": [], + "fontSize": "100%", + "options": {}, + "pageSize": null, + "showHeader": true, + "sort": { + "col": 0, + "desc": true + }, + "styles": [ + { + "alias": "Time", + "align": "auto", + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "pattern": "Time", + "type": "hidden" + }, + { + "alias": "", + "align": "auto", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "decimals": 2, + "pattern": "/pod.*/", + "thresholds": [], + "type": "string", + "unit": "short" + }, + { + "alias": "", + "align": "auto", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "mappingType": 1, + "pattern": "node", + "thresholds": [], + "type": "string", + "unit": "short" + }, + { + "alias": "", + "align": "auto", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "mappingType": 1, + "pattern": "__name__", + "thresholds": [], + "type": "hidden", + "unit": "short" + }, + { + "alias": "", + "align": "auto", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "mappingType": 1, + "pattern": "/created.*/", + "thresholds": [], + "type": "hidden", + "unit": "short" + }, + { + "alias": "", + "align": "auto", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "mappingType": 1, + "pattern": "/prom.*/", + "thresholds": [], + "type": "hidden", + "unit": "short" + }, + { + "alias": "", + "align": "auto", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "mappingType": 1, + "pattern": "/job/", + "thresholds": [], + "type": "hidden", + "unit": "short" + }, + { + "alias": "", + "align": "auto", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "mappingType": 1, + "pattern": "service", + "thresholds": [], + "type": "hidden", + "unit": "short" + }, + { + "alias": "", + "align": "auto", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "mappingType": 1, + "pattern": "instance", + "thresholds": [], + "type": "hidden", + "unit": "short" + }, + { + "alias": "", + "align": "auto", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "mappingType": 1, + "pattern": "endpoint", + "thresholds": [], + "type": "hidden", + "unit": "short" + }, + { + "alias": "", + "align": "auto", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "mappingType": 1, + "pattern": "uid", + "thresholds": [], + "type": "hidden", + "unit": "short" + }, + { + "alias": "", + "align": "auto", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "mappingType": 1, + "pattern": "", + "thresholds": [], + "type": "number", + "unit": "short" + }, + { + "alias": "", + "align": "auto", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "mappingType": 1, + "pattern": "namespace", + "thresholds": [], + "type": "hidden", + "unit": "short" + }, + { + "alias": "", + "align": "auto", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "mappingType": 1, + "pattern": "Value", + "thresholds": [], + "type": "string", + "unit": "short", + "valueMaps": [] + } + ], + "transform": "table" + }, + "frameIndex": 0, + "showHeader": true, + "sortBy": [ { - "color": "dark-green", - "value": null + "desc": false, + "displayName": "pod" } ] }, - "unit": "decbytes" + "pluginVersion": "7.0.5", + "targets": [ + { + "expr": "kube_pod_container_status_ready{namespace=\"$namespace\"}", + "format": "table", + "hide": false, + "instant": true, + "interval": "", + "legendFormat": "", + "refId": "A" + }, + { + "expr": "sum\r\n by(pod) (container_memory_usage_bytes{container!=\"POD\",image!=\"\",job=\"kubelet\",metrics_path=\"/metrics/cadvisor\",namespace=\"$namespace\"})", + "format": "table", + "hide": false, + "instant": true, + "interval": "", + "legendFormat": "Memory usage", + "refId": "B" + }, + { + "expr": "kube_pod_info{namespace=\"$namespace\"}", + "format": "table", + "interval": "", + "legendFormat": "", + "refId": "C" + }, + { + "expr": "sum by(pod) (kube_pod_container_status_restarts_total{namespace=\"$namespace\"})", + "format": "table", + "hide": false, + "instant": true, + "interval": "", + "legendFormat": "", + "refId": "E" + }, + { + "expr": "quantile_over_time(0.95,\r\n sum by (pod) (\r\n rate(container_cpu_usage_seconds_total{namespace=\"$namespace\", container_name!=\"POD\"}[10m])\r\n )[2d:]\r\n)", + "format": "table", + "instant": true, + "interval": "", + "legendFormat": "CPU Usage [95th Percentile]", + "refId": "D" + } + ], + "timeFrom": null, + "timeShift": null, + "title": "pods running in $namespace", + "transformations": [ + { + "id": "filterFieldsByName", + "options": { + "include": { + "names": [ + "pod", + "Value #A", + "Value #B", + "host_ip", + "node", + "pod_ip", + "Value #E", + "Value #D" + ] + } + } + }, + { + "id": "seriesToColumns", + "options": { + "byField": "pod" + } + }, + { + "id": "organize", + "options": { + "excludeByName": {}, + "indexByName": { + "Value #A": 3, + "Value #B": 2, + "Value #D": 1, + "Value #E": 4, + "host_ip": 6, + "node": 7, + "pod": 0, + "pod_ip": 5 + }, + "renameByName": { + "Value #A": "Status", + "Value #B": "Memory usage", + "Value #C": "Age", + "Value #D": "CPU Usage [95th Percentile]", + "Value #E": "Restarts" + } + } + } + ], + "transparent": true, + "type": "table" + }, + { + "aliasColors": {}, + "bars": false, + "cacheTimeout": null, + "dashLength": 10, + "dashes": false, + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fill": 1, + "fillGradient": 0, + "gridPos": { + "h": 9, + "w": 11, + "x": 0, + "y": 32 + }, + "hiddenSeries": false, + "id": 78, + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "links": [], + "nullPointMode": "null", + "options": { + "dataLinks": [] + }, + "percentage": false, + "pointradius": 2, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "sum\n by(namespace) (rate(container_cpu_usage_seconds_total{container!=\"POD\",image!=\"\",job=\"kubelet\",metrics_path=\"/metrics/cadvisor\",namespace=\"$namespace\"}[10m]))", + "format": "time_series", + "hide": false, + "instant": false, + "interval": "", + "legendFormat": "{{namespace}}", + "refId": "A" + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "Total CPU usage in $namespace namespace", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "transparent": true, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "none", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } }, - "overrides": [ - { - "matcher": { - "id": "byName", - "options": "pod" + { + "aliasColors": {}, + "bars": false, + "cacheTimeout": null, + "dashLength": 10, + "dashes": false, + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} }, - "properties": [ - { - "id": "custom.width", - "value": 366 - } - ] + "overrides": [] }, - { - "matcher": { - "id": "byName", - "options": "host_ip" - }, - "properties": [ - { - "id": "custom.width", - "value": 104 - } - ] + "fill": 1, + "fillGradient": 0, + "gridPos": { + "h": 9, + "w": 13, + "x": 11, + "y": 32 }, - { - "matcher": { - "id": "byName", - "options": "pod_ip" - }, - "properties": [ - { - "id": "custom.width", - "value": 111 - } - ] + "hiddenSeries": false, + "id": 101, + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, + "show": true, + "total": false, + "values": false }, - { - "matcher": { - "id": "byName", - "options": "node" - }, - "properties": [ - { - "id": "custom.width", - "value": 202 - } - ] + "lines": true, + "linewidth": 1, + "links": [], + "nullPointMode": "null", + "options": { + "dataLinks": [] }, - { - "matcher": { - "id": "byName", - "options": "Memory usage" - }, - "properties": [ - { - "id": "custom.width", - "value": 186 - } - ] + "percentage": false, + "pointradius": 2, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "sum\n by(pod) (rate(container_cpu_usage_seconds_total{container!=\"POD\",image!=\"\",job=\"kubelet\",metrics_path=\"/metrics/cadvisor\",namespace=\"$namespace\"}[10m]))", + "format": "time_series", + "hide": false, + "instant": false, + "interval": "", + "legendFormat": "{{pod}}", + "refId": "A" + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": " CPU usage by pod in $namespace namespace", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" }, - { - "matcher": { - "id": "byName", - "options": "Status" - }, - "properties": [ - { - "id": "custom.width", - "value": 68 - }, - { - "id": "mappings", - "value": [ - { - "from": "", - "id": 0, - "operator": "", - "text": "Up", - "to": "", - "type": 1, - "value": "1" - }, - { - "from": "", - "id": 1, - "operator": "", - "text": "Down", - "to": "", - "type": 1, - "value": "0" - } - ] - }, - { - "id": "thresholds", - "value": { - "mode": "absolute", - "steps": [ - { - "color": "dark-red", - "value": null - }, - { - "color": "dark-green", - "value": 1 - } - ] - } - } - ] + "transparent": true, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, - { - "matcher": { - "id": "byName", - "options": "Age" + "yaxes": [ + { + "format": "none", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true }, - "properties": [ - { - "id": "custom.width", - "value": 92 - }, - { - "id": "unit", - "value": "s" - } - ] - }, - { - "matcher": { - "id": "byName", - "options": "Restarts" + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} }, - "properties": [ - { - "id": "custom.width", - "value": 100 - }, - { - "id": "unit", - "value": "none" - } - ] + "overrides": [] + }, + "fill": 1, + "fillGradient": 0, + "gridPos": { + "h": 9, + "w": 10, + "x": 0, + "y": 41 + }, + "hiddenSeries": false, + "id": 48, + "legend": { + "avg": false, + "current": false, + "hideEmpty": true, + "hideZero": true, + "max": true, + "min": false, + "show": true, + "total": false, + "values": true + }, + "lines": true, + "linewidth": 1, + "nullPointMode": "null", + "options": { + "dataLinks": [] + }, + "percentage": false, + "pluginVersion": "6.5.2", + "pointradius": 2, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "sum\n by(namespace) (container_memory_usage_bytes{container!=\"POD\",image!=\"\",job=\"kubelet\",metrics_path=\"/metrics/cadvisor\",namespace=\"$namespace\"})", + "hide": false, + "interval": "", + "legendFormat": "{{namespace}}", + "refId": "A" + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "Total memory usage by pods in $namespace", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" }, - { - "matcher": { - "id": "byName", - "options": "CPU Usage" - }, - "properties": [ - { - "id": "custom.width", - "value": 247 - }, - { - "id": "unit" - } - ] + "transparent": true, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, - { - "matcher": { - "id": "byName", - "options": "CPU Usage [95th Percentile]" + "yaxes": [ + { + "format": "bytes", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true }, - "properties": [ - { - "id": "custom.width", - "value": 253 - }, - { - "id": "unit", - "value": "none" - } - ] - } - ] - }, - "gridPos": { - "h": 8, - "w": 24, - "x": 0, - "y": 6 - }, - "id": 104, - "links": [], - "options": { - "angular": { - "columns": [], - "fontSize": "100%", - "options": {}, - "pageSize": null, - "showHeader": true, - "sort": { - "col": 0, - "desc": true - }, - "styles": [ - { - "alias": "Time", - "align": "auto", - "dateFormat": "YYYY-MM-DD HH:mm:ss", - "pattern": "Time", - "type": "hidden" - }, - { - "alias": "", - "align": "auto", - "colorMode": null, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "decimals": 2, - "pattern": "/pod.*/", - "thresholds": [], - "type": "string", - "unit": "short" - }, - { - "alias": "", - "align": "auto", - "colorMode": null, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "dateFormat": "YYYY-MM-DD HH:mm:ss", - "decimals": 2, - "mappingType": 1, - "pattern": "node", - "thresholds": [], - "type": "string", - "unit": "short" - }, - { - "alias": "", - "align": "auto", - "colorMode": null, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "dateFormat": "YYYY-MM-DD HH:mm:ss", - "decimals": 2, - "mappingType": 1, - "pattern": "__name__", - "thresholds": [], - "type": "hidden", - "unit": "short" - }, - { - "alias": "", - "align": "auto", - "colorMode": null, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "dateFormat": "YYYY-MM-DD HH:mm:ss", - "decimals": 2, - "mappingType": 1, - "pattern": "/created.*/", - "thresholds": [], - "type": "hidden", - "unit": "short" - }, - { - "alias": "", - "align": "auto", - "colorMode": null, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "dateFormat": "YYYY-MM-DD HH:mm:ss", - "decimals": 2, - "mappingType": 1, - "pattern": "/prom.*/", - "thresholds": [], - "type": "hidden", - "unit": "short" - }, - { - "alias": "", - "align": "auto", - "colorMode": null, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "dateFormat": "YYYY-MM-DD HH:mm:ss", - "decimals": 2, - "mappingType": 1, - "pattern": "/job/", - "thresholds": [], - "type": "hidden", - "unit": "short" - }, - { - "alias": "", - "align": "auto", - "colorMode": null, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "dateFormat": "YYYY-MM-DD HH:mm:ss", - "decimals": 2, - "mappingType": 1, - "pattern": "service", - "thresholds": [], - "type": "hidden", - "unit": "short" - }, - { - "alias": "", - "align": "auto", - "colorMode": null, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "dateFormat": "YYYY-MM-DD HH:mm:ss", - "decimals": 2, - "mappingType": 1, - "pattern": "instance", - "thresholds": [], - "type": "hidden", - "unit": "short" - }, - { - "alias": "", - "align": "auto", - "colorMode": null, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "dateFormat": "YYYY-MM-DD HH:mm:ss", - "decimals": 2, - "mappingType": 1, - "pattern": "endpoint", - "thresholds": [], - "type": "hidden", - "unit": "short" - }, - { - "alias": "", - "align": "auto", - "colorMode": null, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "dateFormat": "YYYY-MM-DD HH:mm:ss", - "decimals": 2, - "mappingType": 1, - "pattern": "uid", - "thresholds": [], - "type": "hidden", - "unit": "short" - }, - { - "alias": "", - "align": "auto", - "colorMode": null, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "dateFormat": "YYYY-MM-DD HH:mm:ss", - "decimals": 2, - "mappingType": 1, - "pattern": "", - "thresholds": [], - "type": "number", - "unit": "short" - }, - { - "alias": "", - "align": "auto", - "colorMode": null, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "dateFormat": "YYYY-MM-DD HH:mm:ss", - "decimals": 2, - "mappingType": 1, - "pattern": "namespace", - "thresholds": [], - "type": "hidden", - "unit": "short" - }, - { - "alias": "", - "align": "auto", - "colorMode": null, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "dateFormat": "YYYY-MM-DD HH:mm:ss", - "decimals": 2, - "mappingType": 1, - "pattern": "Value", - "thresholds": [], - "type": "string", - "unit": "short", - "valueMaps": [] + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": false } ], - "transform": "table" - }, - "frameIndex": 0, - "showHeader": true, - "sortBy": [ - { - "desc": false, - "displayName": "pod" + "yaxis": { + "align": false, + "alignLevel": null } - ] - }, - "pluginVersion": "7.0.5", - "targets": [ - { - "expr": "kube_pod_container_status_ready{namespace=\"$namespace\"}", - "format": "table", - "hide": false, - "instant": true, - "interval": "", - "legendFormat": "", - "refId": "A" - }, - { - "expr": "sum\r\n by(pod) (container_memory_usage_bytes{container!=\"POD\",image!=\"\",job=\"kubelet\",metrics_path=\"/metrics/cadvisor\",namespace=\"$namespace\"})", - "format": "table", - "hide": false, - "instant": true, - "interval": "", - "legendFormat": "Memory usage", - "refId": "B" - }, - { - "expr": "kube_pod_info{namespace=\"$namespace\"}", - "format": "table", - "interval": "", - "legendFormat": "", - "refId": "C" - }, - { - "expr": "sum by(pod) (kube_pod_container_status_restarts_total{namespace=\"$namespace\"})", - "format": "table", - "hide": false, - "instant": true, - "interval": "", - "legendFormat": "", - "refId": "E" }, { - "expr": "quantile_over_time(0.95,\r\n sum by (pod) (\r\n rate(container_cpu_usage_seconds_total{namespace=\"$namespace\", container_name!=\"POD\"}[10m])\r\n )[2d:]\r\n)", - "format": "table", - "instant": true, - "interval": "", - "legendFormat": "CPU Usage [95th Percentile]", - "refId": "D" - } - ], - "timeFrom": null, - "timeShift": null, - "title": "pods running in $namespace", - "transformations": [ - { - "id": "filterFieldsByName", + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fill": 1, + "fillGradient": 0, + "gridPos": { + "h": 8, + "w": 13, + "x": 11, + "y": 41 + }, + "hiddenSeries": false, + "id": 100, + "legend": { + "avg": true, + "current": false, + "hideEmpty": true, + "hideZero": true, + "max": true, + "min": true, + "show": true, + "total": false, + "values": true + }, + "lines": true, + "linewidth": 1, + "nullPointMode": "null", "options": { - "include": { - "names": [ - "pod", - "Value #A", - "Value #B", - "host_ip", - "node", - "pod_ip", - "Value #E", - "Value #D" - ] + "dataLinks": [] + }, + "percentage": false, + "pluginVersion": "6.5.2", + "pointradius": 2, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "sum\n by(pod) (container_memory_usage_bytes{container!=\"POD\",image!=\"\",job=\"kubelet\",metrics_path=\"/metrics/cadvisor\",namespace=\"$namespace\"})", + "hide": false, + "interval": "", + "legendFormat": "{{pod}}", + "refId": "A" } - } - }, - { - "id": "seriesToColumns", - "options": { - "byField": "pod" - } - }, - { - "id": "organize", - "options": { - "excludeByName": {}, - "indexByName": { - "Value #A": 3, - "Value #B": 2, - "Value #D": 1, - "Value #E": 4, - "host_ip": 6, - "node": 7, - "pod": 0, - "pod_ip": 5 - }, - "renameByName": { - "Value #A": "Status", - "Value #B": "Memory usage", - "Value #C": "Age", - "Value #D": "CPU Usage [95th Percentile]", - "Value #E": "Restarts" + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "memory usage by pods in $namespace", + "tooltip": { + "shared": true, + "sort": 2, + "value_type": "individual" + }, + "transparent": true, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "bytes", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": false } + ], + "yaxis": { + "align": false, + "alignLevel": null } } ], - "transparent": true, - "type": "table" - }, - { - "aliasColors": {}, - "bars": false, - "cacheTimeout": null, - "dashLength": 10, - "dashes": false, - "datasource": "Prometheus", - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, - "fill": 1, - "fillGradient": 0, - "gridPos": { - "h": 9, - "w": 11, - "x": 0, - "y": 14 - }, - "hiddenSeries": false, - "id": 78, - "legend": { - "avg": false, - "current": false, - "max": false, - "min": false, - "show": true, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 1, - "links": [], - "nullPointMode": "null", - "options": { - "dataLinks": [] - }, - "percentage": false, - "pointradius": 2, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "sum\n by(namespace) (rate(container_cpu_usage_seconds_total{container!=\"POD\",image!=\"\",job=\"kubelet\",metrics_path=\"/metrics/cadvisor\",namespace=\"$namespace\"}[10m]))", - "format": "time_series", - "hide": false, - "instant": false, - "interval": "", - "legendFormat": "{{namespace}}", - "refId": "A" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Total CPU usage in $namespace namespace", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "transparent": true, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "none", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "cacheTimeout": null, - "dashLength": 10, - "dashes": false, - "datasource": "Prometheus", - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, - "fill": 1, - "fillGradient": 0, - "gridPos": { - "h": 9, - "w": 13, - "x": 11, - "y": 14 - }, - "hiddenSeries": false, - "id": 101, - "legend": { - "avg": false, - "current": false, - "max": false, - "min": false, - "show": true, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 1, - "links": [], - "nullPointMode": "null", - "options": { - "dataLinks": [] - }, - "percentage": false, - "pointradius": 2, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "sum\n by(pod) (rate(container_cpu_usage_seconds_total{container!=\"POD\",image!=\"\",job=\"kubelet\",metrics_path=\"/metrics/cadvisor\",namespace=\"$namespace\"}[10m]))", - "format": "time_series", - "hide": false, - "instant": false, - "interval": "", - "legendFormat": "{{pod}}", - "refId": "A" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": " CPU usage by pod in $namespace namespace", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "transparent": true, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "none", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "Prometheus", - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, - "fill": 1, - "fillGradient": 0, - "gridPos": { - "h": 9, - "w": 10, - "x": 0, - "y": 23 - }, - "hiddenSeries": false, - "id": 48, - "legend": { - "avg": false, - "current": false, - "hideEmpty": true, - "hideZero": true, - "max": true, - "min": false, - "show": true, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 1, - "nullPointMode": "null", - "options": { - "dataLinks": [] - }, - "percentage": false, - "pluginVersion": "6.5.2", - "pointradius": 2, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "sum\n by(namespace) (container_memory_usage_bytes{container!=\"POD\",image!=\"\",job=\"kubelet\",metrics_path=\"/metrics/cadvisor\",namespace=\"$namespace\"})", - "hide": false, - "interval": "", - "legendFormat": "{{namespace}}", - "refId": "A" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Total memory usage by pods in $namespace", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "transparent": true, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "bytes", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": false - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "Prometheus", - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, - "fill": 1, - "fillGradient": 0, - "gridPos": { - "h": 8, - "w": 13, - "x": 11, - "y": 23 - }, - "hiddenSeries": false, - "id": 100, - "legend": { - "avg": true, - "current": false, - "hideEmpty": true, - "hideZero": true, - "max": true, - "min": true, - "show": true, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 1, - "nullPointMode": "null", - "options": { - "dataLinks": [] - }, - "percentage": false, - "pluginVersion": "6.5.2", - "pointradius": 2, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "sum\n by(pod) (container_memory_usage_bytes{container!=\"POD\",image!=\"\",job=\"kubelet\",metrics_path=\"/metrics/cadvisor\",namespace=\"$namespace\"})", - "hide": false, - "interval": "", - "legendFormat": "{{pod}}", - "refId": "A" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "memory usage by pods in $namespace", - "tooltip": { - "shared": true, - "sort": 2, - "value_type": "individual" - }, - "transparent": true, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "bytes", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": false - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } + "title": "Namespace $namespace details", + "type": "row" }, { "collapsed": true, @@ -3554,7 +3949,7 @@ "h": 1, "w": 24, "x": 0, - "y": 32 + "y": 4 }, "id": 39, "panels": [ @@ -3603,8 +3998,8 @@ "scopedVars": { "node": { "selected": true, - "text": "ip-192-168-72-226.ap-south-1.compute.internal", - "value": "ip-192-168-72-226.ap-south-1.compute.internal" + "text": "ip-10-0-75-112.ap-south-1.compute.internal", + "value": "ip-10-0-75-112.ap-south-1.compute.internal" } }, "seriesOverrides": [], @@ -3703,8 +4098,8 @@ "scopedVars": { "node": { "selected": true, - "text": "ip-192-168-72-226.ap-south-1.compute.internal", - "value": "ip-192-168-72-226.ap-south-1.compute.internal" + "text": "ip-10-0-75-112.ap-south-1.compute.internal", + "value": "ip-10-0-75-112.ap-south-1.compute.internal" } }, "seriesOverrides": [], @@ -3822,8 +4217,8 @@ "scopedVars": { "node": { "selected": true, - "text": "ip-192-168-72-226.ap-south-1.compute.internal", - "value": "ip-192-168-72-226.ap-south-1.compute.internal" + "text": "ip-10-0-75-112.ap-south-1.compute.internal", + "value": "ip-10-0-75-112.ap-south-1.compute.internal" } }, "sparkline": { @@ -3921,8 +4316,8 @@ "scopedVars": { "node": { "selected": true, - "text": "ip-192-168-72-226.ap-south-1.compute.internal", - "value": "ip-192-168-72-226.ap-south-1.compute.internal" + "text": "ip-10-0-75-112.ap-south-1.compute.internal", + "value": "ip-10-0-75-112.ap-south-1.compute.internal" } }, "sparkline": { @@ -4020,8 +4415,8 @@ "scopedVars": { "node": { "selected": true, - "text": "ip-192-168-72-226.ap-south-1.compute.internal", - "value": "ip-192-168-72-226.ap-south-1.compute.internal" + "text": "ip-10-0-75-112.ap-south-1.compute.internal", + "value": "ip-10-0-75-112.ap-south-1.compute.internal" } }, "sparkline": { @@ -4119,8 +4514,8 @@ "scopedVars": { "node": { "selected": true, - "text": "ip-192-168-72-226.ap-south-1.compute.internal", - "value": "ip-192-168-72-226.ap-south-1.compute.internal" + "text": "ip-10-0-75-112.ap-south-1.compute.internal", + "value": "ip-10-0-75-112.ap-south-1.compute.internal" } }, "sparkline": { @@ -4200,8 +4595,8 @@ "scopedVars": { "node": { "selected": true, - "text": "ip-192-168-72-226.ap-south-1.compute.internal", - "value": "ip-192-168-72-226.ap-south-1.compute.internal" + "text": "ip-10-0-75-112.ap-south-1.compute.internal", + "value": "ip-10-0-75-112.ap-south-1.compute.internal" } }, "seriesOverrides": [], @@ -4305,8 +4700,8 @@ "scopedVars": { "node": { "selected": true, - "text": "ip-192-168-72-226.ap-south-1.compute.internal", - "value": "ip-192-168-72-226.ap-south-1.compute.internal" + "text": "ip-10-0-75-112.ap-south-1.compute.internal", + "value": "ip-10-0-75-112.ap-south-1.compute.internal" } }, "seriesOverrides": [], @@ -4413,8 +4808,8 @@ "scopedVars": { "node": { "selected": true, - "text": "ip-192-168-72-226.ap-south-1.compute.internal", - "value": "ip-192-168-72-226.ap-south-1.compute.internal" + "text": "ip-10-0-75-112.ap-south-1.compute.internal", + "value": "ip-10-0-75-112.ap-south-1.compute.internal" } }, "seriesOverrides": [], @@ -4524,8 +4919,8 @@ "scopedVars": { "node": { "selected": true, - "text": "ip-192-168-72-226.ap-south-1.compute.internal", - "value": "ip-192-168-72-226.ap-south-1.compute.internal" + "text": "ip-10-0-75-112.ap-south-1.compute.internal", + "value": "ip-10-0-75-112.ap-south-1.compute.internal" } }, "seriesOverrides": [], @@ -4634,8 +5029,8 @@ "scopedVars": { "node": { "selected": true, - "text": "ip-192-168-72-226.ap-south-1.compute.internal", - "value": "ip-192-168-72-226.ap-south-1.compute.internal" + "text": "ip-10-0-75-112.ap-south-1.compute.internal", + "value": "ip-10-0-75-112.ap-south-1.compute.internal" } }, "seriesOverrides": [], @@ -4742,8 +5137,8 @@ "scopedVars": { "node": { "selected": true, - "text": "ip-192-168-72-226.ap-south-1.compute.internal", - "value": "ip-192-168-72-226.ap-south-1.compute.internal" + "text": "ip-10-0-75-112.ap-south-1.compute.internal", + "value": "ip-10-0-75-112.ap-south-1.compute.internal" } }, "seriesOverrides": [], @@ -4851,8 +5246,8 @@ "scopedVars": { "node": { "selected": true, - "text": "ip-192-168-72-226.ap-south-1.compute.internal", - "value": "ip-192-168-72-226.ap-south-1.compute.internal" + "text": "ip-10-0-75-112.ap-south-1.compute.internal", + "value": "ip-10-0-75-112.ap-south-1.compute.internal" } }, "seriesOverrides": [], @@ -4960,8 +5355,8 @@ "scopedVars": { "node": { "selected": true, - "text": "ip-192-168-72-226.ap-south-1.compute.internal", - "value": "ip-192-168-72-226.ap-south-1.compute.internal" + "text": "ip-10-0-75-112.ap-south-1.compute.internal", + "value": "ip-10-0-75-112.ap-south-1.compute.internal" } }, "seriesOverrides": [], @@ -5068,8 +5463,8 @@ "scopedVars": { "node": { "selected": true, - "text": "ip-192-168-72-226.ap-south-1.compute.internal", - "value": "ip-192-168-72-226.ap-south-1.compute.internal" + "text": "ip-10-0-75-112.ap-south-1.compute.internal", + "value": "ip-10-0-75-112.ap-south-1.compute.internal" } }, "seriesOverrides": [], @@ -5173,8 +5568,8 @@ "scopedVars": { "node": { "selected": true, - "text": "ip-192-168-72-226.ap-south-1.compute.internal", - "value": "ip-192-168-72-226.ap-south-1.compute.internal" + "text": "ip-10-0-75-112.ap-south-1.compute.internal", + "value": "ip-10-0-75-112.ap-south-1.compute.internal" } }, "seriesOverrides": [], @@ -5273,8 +5668,8 @@ "scopedVars": { "node": { "selected": true, - "text": "ip-192-168-72-226.ap-south-1.compute.internal", - "value": "ip-192-168-72-226.ap-south-1.compute.internal" + "text": "ip-10-0-75-112.ap-south-1.compute.internal", + "value": "ip-10-0-75-112.ap-south-1.compute.internal" } }, "seriesOverrides": [], @@ -5373,8 +5768,8 @@ "scopedVars": { "node": { "selected": true, - "text": "ip-192-168-72-226.ap-south-1.compute.internal", - "value": "ip-192-168-72-226.ap-south-1.compute.internal" + "text": "ip-10-0-75-112.ap-south-1.compute.internal", + "value": "ip-10-0-75-112.ap-south-1.compute.internal" } }, "seriesOverrides": [], @@ -5434,8 +5829,8 @@ "scopedVars": { "node": { "selected": true, - "text": "ip-192-168-72-226.ap-south-1.compute.internal", - "value": "ip-192-168-72-226.ap-south-1.compute.internal" + "text": "ip-10-0-75-112.ap-south-1.compute.internal", + "value": "ip-10-0-75-112.ap-south-1.compute.internal" } }, "title": "$node Node details", @@ -5456,8 +5851,8 @@ "allValue": "", "current": { "selected": false, - "text": "ip-192-168-72-226.ap-south-1.compute.internal", - "value": "ip-192-168-72-226.ap-south-1.compute.internal" + "text": "ip-10-0-75-112.ap-south-1.compute.internal", + "value": "ip-10-0-75-112.ap-south-1.compute.internal" }, "datasource": "Prometheus", "definition": "label_values(kube_node_created,node)", @@ -5481,7 +5876,7 @@ { "allValue": null, "current": { - "selected": true, + "selected": false, "text": "monitoring", "value": "monitoring" }, @@ -5625,5 +6020,5 @@ "timezone": "", "title": "1 Kubernetes cluster overview(कुबरनेटेस)", "uid": "N9uZBy8Wz", - "version": 3 -} \ No newline at end of file + "version": 1 +} From a26ead1f763088b3bcf93378f6c3d46c320f317c Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov Date: Thu, 20 Aug 2020 19:54:21 +0530 Subject: [PATCH 0049/1242] Added chart api config for taxHeadsBreakupUsage --- .../dashboard-analytics/ChartApiConfig.json | 52 +++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 692bc78c..4c1d9a8b 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -1482,6 +1482,58 @@ }, "_comment": "" }, + "taxHeadsBreakupUsage": { + "chartName": "DSS_PT_TAX_HEAD_BREAKUP_USAGE", + "queries": [ + { + "module": "COMMON", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.Bill.billDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.cityDistrictCode\" }", + "dateRefField": "dataObject.Bill.billDetails.receiptDate", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"attrs_root\":{\"nested\":{\"path\":\"domainObject.units\"},\"aggs\":{\"Usage \":{\"terms\":{\"field\":\"domainObject.units.usageCategory.keyword\",\"size\":200},\"aggs\":{\"Total Amount\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"PT Tax\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TAX\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Fire Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_FIRE_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Cancer Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_CANCER_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Rebate\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_REBATE\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Penalty\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_PENALTY\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}}}}}}}}}}" + } + ], + "filterKeys": [ + + ], + "chartType": "table", + "valueType": "number", + "drillChart": "", + "documentType": "_doc", + "action": "", + "plotLabel": "Usage Type", + "aggregationPaths": [ + "Total Amount", + "PT Tax", + "Fire Cess", + "Cancer Cess", + "Rebate", + "Penalty" + ], + "pathDataTypeMapping": [ + { + "Total Amount": "amount" + }, + { + "PT Tax": "amount" + }, + { + "Fire Cess": "amount" + }, + { + "Cancer Cess": "amount" + }, + { + "Rebate": "amount" + }, + { + "Penalty": "amount" + } + ], + "insight": { + }, + "_comment": "" + }, "licenceTaxHeadsBreakupBoundary": { "chartName": "DSS_TL_TAX_HEAD_BREAKUP_BOUNDARY", "queries": [ From 5b9a349142ec7c3b5c0c585824ffcfd6420a1f0d Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov Date: Thu, 20 Aug 2020 20:45:04 +0530 Subject: [PATCH 0050/1242] updated requestQueryMap of taxHeadsBreakupUsage --- .../dashboard-analytics/ChartApiConfig.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 4c1d9a8b..c23d3793 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -1487,8 +1487,8 @@ "queries": [ { "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.Bill.billDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.cityDistrictCode\" }", - "dateRefField": "dataObject.Bill.billDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", + "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"attrs_root\":{\"nested\":{\"path\":\"domainObject.units\"},\"aggs\":{\"Usage \":{\"terms\":{\"field\":\"domainObject.units.usageCategory.keyword\",\"size\":200},\"aggs\":{\"Total Amount\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"PT Tax\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TAX\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Fire Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_FIRE_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Cancer Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_CANCER_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Rebate\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_REBATE\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Penalty\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_PENALTY\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}}}}}}}}}}" } From 48eba46e23b2138cde6c34e35ccd994058ec966a Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov Date: Thu, 20 Aug 2020 22:25:05 +0530 Subject: [PATCH 0051/1242] Updated total amount in taxHeadsBreakupUsage --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index c23d3793..042631fa 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -1490,7 +1490,7 @@ "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"attrs_root\":{\"nested\":{\"path\":\"domainObject.units\"},\"aggs\":{\"Usage \":{\"terms\":{\"field\":\"domainObject.units.usageCategory.keyword\",\"size\":200},\"aggs\":{\"Total Amount\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"PT Tax\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TAX\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Fire Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_FIRE_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Cancer Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_CANCER_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Rebate\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_REBATE\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Penalty\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_PENALTY\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}}}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"attrs_root\":{\"nested\":{\"path\":\"domainObject.units\"},\"aggs\":{\"Usage \":{\"terms\":{\"field\":\"domainObject.units.usageCategory.keyword\",\"size\":200},\"aggs\":{\"Total Amount\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}},\"PT Tax\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TAX\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Fire Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_FIRE_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Cancer Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_CANCER_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Rebate\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_REBATE\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Penalty\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_PENALTY\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}}}}}}}}}}" } ], "filterKeys": [ From 25f96d97bf02ca625788b05e0b70c1b309533fa7 Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov <61416590+mahammadnizam-wt-eGov@users.noreply.github.com> Date: Fri, 21 Aug 2020 00:41:02 +0530 Subject: [PATCH 0052/1242] Update transform_tl_v1.json --- .../dashboard-ingest/transform_tl_v1.json | 41 +++++++++---------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-ingest/transform_tl_v1.json b/configs/egov-dss-dashboards/dashboard-ingest/transform_tl_v1.json index a88f95d8..99c8df76 100644 --- a/configs/egov-dss-dashboards/dashboard-ingest/transform_tl_v1.json +++ b/configs/egov-dss-dashboards/dashboard-ingest/transform_tl_v1.json @@ -1,23 +1,22 @@ [ - { - "operation": "shift", - "spec": { - "tradelicense": { - "tenantid": "tenantId", - "calculation": "tradeLicense.calculation", - "licensenumber": "tradeLicense.licenseNumber", - "commencementdate": "tradeLicense.commencementDate", - "licensetype": "tradeLicense.licenseType", - "financialyear": "tradeLicense.finYear", - "tradename": "tradeLicense.tradeName", - "applicationnumber": "tradeLicense.applicationNumber", - "accountid": "tradeLicense.accountId", - "applicationdate": "tradeLicense.applicationDate", - "oldpropertyid": "tradeLicense.oldPropertyId", - "action": "tradeLicense.action" - }, - "ward": "ward" - - } - } + { + "operation": "shift", + "spec": { + "tradelicense": { + "tenantId": "tenantId", + "calculation": "tradelicense.calculation", + "licenseNumber": "tradelicense.licenseNumber", + "commencementDate": "tradelicense.commencementDate", + "licenseType": "tradelicense.licenseType", + "financialYear": "tradelicense.financialYear", + "tradeName": "tradelicense.tradeName", + "applicationNumber": "tradelicense.applicationNumber", + "accountId": "tradelicense.accountId", + "applicationDate": "tradelicense.applicationDate", + "oldPropertyId": "tradelicense.oldPropertyId", + "action": "tradelicense.action" + }, + "ward": "ward" + } + } ] From e30e663011185856241e437879add9478c2a8a4c Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov <61416590+mahammadnizam-wt-eGov@users.noreply.github.com> Date: Fri, 21 Aug 2020 00:41:33 +0530 Subject: [PATCH 0053/1242] Update transform_tl_v1.json --- .../dashboard-ingest/transform_tl_v1.json | 41 +++++++++---------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-ingest/transform_tl_v1.json b/configs/egov-dss-dashboards/dashboard-ingest/transform_tl_v1.json index a88f95d8..99c8df76 100644 --- a/configs/egov-dss-dashboards/dashboard-ingest/transform_tl_v1.json +++ b/configs/egov-dss-dashboards/dashboard-ingest/transform_tl_v1.json @@ -1,23 +1,22 @@ [ - { - "operation": "shift", - "spec": { - "tradelicense": { - "tenantid": "tenantId", - "calculation": "tradeLicense.calculation", - "licensenumber": "tradeLicense.licenseNumber", - "commencementdate": "tradeLicense.commencementDate", - "licensetype": "tradeLicense.licenseType", - "financialyear": "tradeLicense.finYear", - "tradename": "tradeLicense.tradeName", - "applicationnumber": "tradeLicense.applicationNumber", - "accountid": "tradeLicense.accountId", - "applicationdate": "tradeLicense.applicationDate", - "oldpropertyid": "tradeLicense.oldPropertyId", - "action": "tradeLicense.action" - }, - "ward": "ward" - - } - } + { + "operation": "shift", + "spec": { + "tradelicense": { + "tenantId": "tenantId", + "calculation": "tradelicense.calculation", + "licenseNumber": "tradelicense.licenseNumber", + "commencementDate": "tradelicense.commencementDate", + "licenseType": "tradelicense.licenseType", + "financialYear": "tradelicense.financialYear", + "tradeName": "tradelicense.tradeName", + "applicationNumber": "tradelicense.applicationNumber", + "accountId": "tradelicense.accountId", + "applicationDate": "tradelicense.applicationDate", + "oldPropertyId": "tradelicense.oldPropertyId", + "action": "tradelicense.action" + }, + "ward": "ward" + } + } ] From 05776b77429affa9cc0fd5f7b62a509b1462e9f0 Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov Date: Fri, 21 Aug 2020 01:20:26 +0530 Subject: [PATCH 0054/1242] Removed old schema query of taxHeadsBreakupUsage --- .../dashboard-analytics/ChartApiConfig.json | 105 +++++++++--------- 1 file changed, 52 insertions(+), 53 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 692bc78c..41e7790c 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -1001,59 +1001,6 @@ }, "_comment": "" }, - - "taxHeadsBreakupUsage": { - "chartName": "DSS_PT_TAX_HEAD_BREAKUP_USAGE", - "queries": [ - { - "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", - "dateRefField": "dataObject.paymentDetails.receiptDate", - "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"attrs_root\":{\"nested\":{\"path\":\"domainObject.propertyDetails.units\"},\"aggs\":{\"Usage \":{\"terms\":{\"field\":\"domainObject.units.usageCategory.keyword\",\"size\":200},\"aggs\":{\"Total Amount\":{\"nested\":{\"path\":\"dataObject.Bill.taxAndPayments\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.taxAndPayments.businessService.keyword\":[\"PT\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.taxAndPayments.taxAmount\"}}}}}},\"PT Tax\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TAX\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Fire Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_FIRE_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Cancer Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_CANCER_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Rebate\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_REBATE\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Penalty\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_PENALTY\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}}}}}}}}}}" - } - ], - "filterKeys": [ - - ], - "chartType": "table", - "valueType": "number", - "drillChart": "", - "documentType": "_doc", - "action": "", - "plotLabel": "Usage Type", - "aggregationPaths": [ - "Total Amount", - "PT Tax", - "Fire Cess", - "Cancer Cess", - "Rebate", - "Penalty" - ], - "pathDataTypeMapping": [ - { - "Total Amount": "amount" - }, - { - "PT Tax": "amount" - }, - { - "Fire Cess": "amount" - }, - { - "Cancer Cess": "amount" - }, - { - "Rebate": "amount" - }, - { - "Penalty": "amount" - } - ], - "insight": { - }, - "_comment": "" - }, "taxHeadsBreakupUsageMinor": { "chartName": "", "queries": [ @@ -1482,6 +1429,58 @@ }, "_comment": "" }, + "taxHeadsBreakupUsage": { + "chartName": "DSS_PT_TAX_HEAD_BREAKUP_USAGE", + "queries": [ + { + "module": "COMMON", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"attrs_root\":{\"nested\":{\"path\":\"domainObject.units\"},\"aggs\":{\"Usage \":{\"terms\":{\"field\":\"domainObject.units.usageCategory.keyword\",\"size\":200},\"aggs\":{\"Total Amount\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}},\"PT Tax\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TAX\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Fire Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_FIRE_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Cancer Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_CANCER_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Rebate\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_REBATE\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Penalty\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_PENALTY\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}}}}}}}}}}" + } + ], + "filterKeys": [ + + ], + "chartType": "table", + "valueType": "number", + "drillChart": "", + "documentType": "_doc", + "action": "", + "plotLabel": "Usage Type", + "aggregationPaths": [ + "Total Amount", + "PT Tax", + "Fire Cess", + "Cancer Cess", + "Rebate", + "Penalty" + ], + "pathDataTypeMapping": [ + { + "Total Amount": "amount" + }, + { + "PT Tax": "amount" + }, + { + "Fire Cess": "amount" + }, + { + "Cancer Cess": "amount" + }, + { + "Rebate": "amount" + }, + { + "Penalty": "amount" + } + ], + "insight": { + }, + "_comment": "" + }, "licenceTaxHeadsBreakupBoundary": { "chartName": "DSS_TL_TAX_HEAD_BREAKUP_BOUNDARY", "queries": [ From 9be992422b108fcb5b317ca933b943d5c5065dca Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov Date: Fri, 21 Aug 2020 01:22:06 +0530 Subject: [PATCH 0055/1242] Removed old schema query of taxHeadsBreakupUsage --- .../dashboard-analytics/ChartApiConfig.json | 55 +------------------ 1 file changed, 1 insertion(+), 54 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 042631fa..cafe72b6 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -1001,60 +1001,7 @@ }, "_comment": "" }, - - "taxHeadsBreakupUsage": { - "chartName": "DSS_PT_TAX_HEAD_BREAKUP_USAGE", - "queries": [ - { - "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", - "dateRefField": "dataObject.paymentDetails.receiptDate", - "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"attrs_root\":{\"nested\":{\"path\":\"domainObject.propertyDetails.units\"},\"aggs\":{\"Usage \":{\"terms\":{\"field\":\"domainObject.units.usageCategory.keyword\",\"size\":200},\"aggs\":{\"Total Amount\":{\"nested\":{\"path\":\"dataObject.Bill.taxAndPayments\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.taxAndPayments.businessService.keyword\":[\"PT\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.taxAndPayments.taxAmount\"}}}}}},\"PT Tax\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TAX\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Fire Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_FIRE_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Cancer Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_CANCER_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Rebate\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_REBATE\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Penalty\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_PENALTY\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}}}}}}}}}}" - } - ], - "filterKeys": [ - - ], - "chartType": "table", - "valueType": "number", - "drillChart": "", - "documentType": "_doc", - "action": "", - "plotLabel": "Usage Type", - "aggregationPaths": [ - "Total Amount", - "PT Tax", - "Fire Cess", - "Cancer Cess", - "Rebate", - "Penalty" - ], - "pathDataTypeMapping": [ - { - "Total Amount": "amount" - }, - { - "PT Tax": "amount" - }, - { - "Fire Cess": "amount" - }, - { - "Cancer Cess": "amount" - }, - { - "Rebate": "amount" - }, - { - "Penalty": "amount" - } - ], - "insight": { - }, - "_comment": "" - }, - "taxHeadsBreakupUsageMinor": { + "taxHeadsBreakupUsageMinor": { "chartName": "", "queries": [ { From e46c7c32a618791f130e857513048fff87857eeb Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov Date: Fri, 21 Aug 2020 07:56:24 +0530 Subject: [PATCH 0056/1242] Updated payment mode in licenseByLicenseType --- .../dashboard-analytics/ChartApiConfig.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 41e7790c..36eb1b88 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -226,10 +226,10 @@ "queries": [ { "module": "COMMON", - "requestQueryMap": "{\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantData.code\", \"district\" : \"dataObject.tenantData.city.districtCode\"}", + "requestQueryMap": "{\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\"}", "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"License Instrument Type\":{\"terms\":{\"field\":\"dataObject.instrument.typeName.keyword\"},\"aggs\":{\"Licens Issued\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"License Instrument Type\":{\"terms\":{\"field\":\"dataObject.paymentMode.keyword\"},\"aggs\":{\"Licens Issued\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" } ], "chartType": "pie", From e07a84d2a8d198a3b669e40f2dd440107aa4a479 Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov Date: Fri, 21 Aug 2020 07:59:49 +0530 Subject: [PATCH 0057/1242] Updated payment mode in licenseByLicenseType --- .../dashboard-analytics/ChartApiConfig.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index cafe72b6..ba86fb23 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -226,10 +226,10 @@ "queries": [ { "module": "COMMON", - "requestQueryMap": "{\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantData.code\", \"district\" : \"dataObject.tenantData.city.districtCode\"}", + "requestQueryMap": "{\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\"}", "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"License Instrument Type\":{\"terms\":{\"field\":\"dataObject.instrument.typeName.keyword\"},\"aggs\":{\"Licens Issued\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"License Instrument Type\":{\"terms\":{\"field\":\"dataObject.paymentMode.keyword\"},\"aggs\":{\"Licens Issued\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" } ], "chartType": "pie", From 716e8cc63c8e415fa20d6d5f5c1a86f7653a91d4 Mon Sep 17 00:00:00 2001 From: mohaarif007 <48949208+mohaarif007@users.noreply.github.com> Date: Fri, 21 Aug 2020 16:57:24 +0530 Subject: [PATCH 0058/1242] Update PT-report on QA Update PT-report on QA --- configs/reports/configs/pt-reports.yml | 38 ++++++++++++-------------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index edf825f4..bc3c90e7 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2065,9 +2065,7 @@ ReportDefinitions: inner join eg_pt_address_v2 as pta on pta.property = pt.propertyid left outer join eg_pt_unit_v2_ot as pot on pot.propertydetail = pd.assessmentnumber where rh.tenantid =$tenantid and pd.property not in (select property from eg_pt_propertydetail_v2 where financialyear in ('2019-20')) - - --- -ReportDefinitions: + - reportName: ReceiptRegister_V2 summary: Receipt Register version: 1.0.0 @@ -2296,7 +2294,7 @@ ReportDefinitions: JOIN eg_pt_address_v2 pt_addr ON pt_detail.property = pt_addr.property LEFT OUTER JOIN eg_user ON eg_user.id = pd.createdby::INTEGER WHERE pd.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' - orderby:ORDER BY pd.receiptdate DESC + orderby: ORDER BY pd.receiptdate DESC - reportName: CancelledReceiptRegister_V2 summary: Receipt Register for cancelled Receipts @@ -2508,7 +2506,7 @@ ReportDefinitions: JOIN eg_pt_address_v2 pt_addr ON pt_detail.property = pt_addr.property LEFT OUTER JOIN eg_user ON eg_user.id = pd.createdby::INTEGER WHERE pd.tenantid = $tenantid and payment.paymentstatus = 'CANCELLED' and pd.businessservice='PT' - orderby:ORDER BY pd.receiptdate DESC + orderby: ORDER BY pd.receiptdate DESC - reportName: OldUlbWisePtCollection_V2 summary: ULB-wise PT Collection @@ -2776,7 +2774,7 @@ ReportDefinitions: JOIN eg_pt_address_v2 pt_addr ON pt_detail.property = pt_addr.property LEFT OUTER JOIN eg_user ON eg_user.id = pd.createdby::INTEGER WHERE pd.tenantid != 'pb.testing' and payment.paymentstatus = 'CANCELLED' and pd.businessservice='PT' - orderby: ORDER BY pd.receiptdate DESC + orderby: ORDER BY pd.receiptdate DESC - reportName: StateWidePtCollection_V2 summary: State Wide PT Collection @@ -2860,9 +2858,9 @@ ReportDefinitions: SUM(CASE WHEN billd.collectiontype LIKE 'COUNTER' THEN amount ELSE 0 END) AS totaloffline, (SUM(billd.amount) - SUM(billd.amountpaid)) AS totalamountdue FROM egcl_billdetial as billd - WHERE tenantid not in ('pb.testing','pb.ludhiana_legacy') - groupby: GROUP BY tenantid - orderby: ORDER BY tenantid, totalamountpaid DESC NULLS LAST + WHERE tenantid not in ('pb.testing','pb.ludhiana_legacy') + groupby: GROUP BY tenantid + orderby: ORDER BY tenantid, totalamountpaid DESC NULLS LAST - reportName: UlbWisePtCollection_V2 summary: State Wide PT Collection @@ -2946,8 +2944,8 @@ ReportDefinitions: (SUM(billd.amount) - SUM(billd.amountpaid)) AS totalamountdue FROM egcl_billdetial as billd WHERE tenantid LIKE CONCAT(SPLIT_PART($tenantid, '.', 1), '%') and tenantid = $tenantid - groupby: GROUP BY tenantid - orderby: ORDER BY tenantid, totalamountpaid DESC NULLS LAST + groupby: GROUP BY tenantid + orderby: ORDER BY tenantid, totalamountpaid DESC NULLS LAST - reportName: ReceiptRegisterShort_V2 summary: Receipt Register @@ -3083,8 +3081,8 @@ ReportDefinitions: INNER JOIN egcl_payment as payment on pd.paymentid=payment.id LEFT OUTER JOIN eg_user ON eg_user.id = pd.createdby::INTEGER WHERE bd.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' - roupby: GROUP BY pd.receiptnumber) - SELECT + GROUP BY pd.receiptnumber) + SELECT bill.tenantid AS tenantid, bill.id, pt_detail.property AS propertyid, @@ -3114,7 +3112,7 @@ ReportDefinitions: JOIN receipt_breakup ON receipt_breakup.receiptnumber = pd.receiptnumber LEFT OUTER JOIN eg_user ON eg_user.id = pd.createdby::INTEGER WHERE pd.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' - orderby: ORDER BY pd.receiptdate DESC + orderby: ORDER BY pd.receiptdate DESC - reportName: ULBPTDataDumpReport_V2 @@ -3538,7 +3536,7 @@ ReportDefinitions: LEFT OUTER JOIN eg_user ON eg_user.id = pd.createdby::INTEGER WHERE bd.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and pd.createdby::INTEGER in (select user_id from eg_userrole_v1 where role_code ='SEVA_KENDRA_EMP') - orderby: ORDER BY pd.receiptdate DESC + orderby: ORDER BY pd.receiptdate DESC - reportName: ReceiptRegisterSummary_V2 @@ -3666,7 +3664,7 @@ ReportDefinitions: INNER JOIN egcl_payment as payment on pd.paymentid=payment.id LEFT OUTER JOIN eg_user ON eg_user.id = pd.createdby::INTEGER WHERE bd.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' - groupby: group by collectorname,bd.tenantid + groupby: group by collectorname,bd.tenantid - reportName: StateReceiptRegisterSummary_V2 summary: Receipt Register Summary @@ -3773,8 +3771,8 @@ ReportDefinitions: INNER JOIN egcl_billdetial as bd on bd.id = bad.billdetailid INNER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid WHERE bd.tenantid = 'pb.testing' and pd.businessservice='PT' - groupby: group by bd.tenantid - orderby: order by bd.tenantid + groupby: group by bd.tenantid + orderby: order by bd.tenantid - reportName: FYCollectionsReport_V2 summary: FY Collections @@ -3867,8 +3865,8 @@ ReportDefinitions: JOIN eg_pt_address_v2 pt_addr ON pt_detail.property = pt_addr.property LEFT OUTER JOIN eg_user ON eg_user.id = pd.createdby::INTEGER WHERE pd.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' - groupby: GROUP BY financialyear - orderby: ORDER BY financialyear + groupby: GROUP BY financialyear + orderby: ORDER BY financialyear - reportName: ULBDEFAULTERPTREPORT_V2 summary: ULB Defaulter Pt report From 798fe1cba03e1e205478a57718edafa6cf09d68e Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Sat, 22 Aug 2020 14:03:46 +0530 Subject: [PATCH 0059/1242] license fee corrected --- configs/pdf-service/data-config/tlcertificate.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/pdf-service/data-config/tlcertificate.json b/configs/pdf-service/data-config/tlcertificate.json index 03e4a387..e4d5bf1e 100644 --- a/configs/pdf-service/data-config/tlcertificate.json +++ b/configs/pdf-service/data-config/tlcertificate.json @@ -410,7 +410,7 @@ "responseMapping":[ { "variable":"tradeLicenseFee", - "value":"$.Payments[0].totalDue" + "value":"$.Payments[0].totalAmountPaid" }, { "variable":"recieptNo", From 74f179790612e9eb846d8102abcd16d160b4fd3a Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Sat, 22 Aug 2020 14:14:04 +0530 Subject: [PATCH 0060/1242] Update tlcertificate.json --- .../pdf-service/format-config/tlcertificate.json | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/configs/pdf-service/format-config/tlcertificate.json b/configs/pdf-service/format-config/tlcertificate.json index c80c0779..eb63e3ff 100644 --- a/configs/pdf-service/format-config/tlcertificate.json +++ b/configs/pdf-service/format-config/tlcertificate.json @@ -411,7 +411,18 @@ ] }, { - "text":"\n\n\n Disclaimer\nThis license is not the proof of ownership.\nThis Trade License is issued under rule 10.39 of the Municipal Account Code 2017 with condition that the applicant shall obtain relevant NOC from concerned\ndepartments like Punjab Pollution control board / Fire Ofce /Health Department/ Excise Department/Deputy Commissioner (under Explosive Act) whichever\napplicable. The Municipal Council/Corporation reserves the right to cancel this Trade License for Breach of any condition in accordance with law.\nThis is a computer generated document, hence requires no signature.\nThe grant of Trade License is not approval to any violation of building by laws, town planning scheme.", + "text":"Disclaimer", + "style":"disclaimer" + }, + { + "ol": + [ + "This license is not the proof of ownership.", + "This Trade License is issued under rule 10.39 of the Municipal Account Code 2017 with condition that the applicant shall obtain relevant NOC from concerned\ndepartments like Punjab Pollution control board / Fire Ofce /Health Department/ Excise Department/Deputy Commissioner (under Explosive Act) whichever applicable.", + "The Municipal Council/Corporation reserves the right to cancel this Trade License for Breach of any condition in accordance with law.", + "This is a computer generated document, hence requires no signature.", + "The grant of Trade License is not approval to any violation of building by laws, town planning scheme." + ], "style":"disclaimer" } @@ -531,4 +542,4 @@ } - } \ No newline at end of file + } From ae26f1051b8572c582c028ee03d9ec5d1a42c3e5 Mon Sep 17 00:00:00 2001 From: gurpreetsinghkhanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Sat, 22 Aug 2020 20:44:54 +0530 Subject: [PATCH 0061/1242] consolidatedReceipt_pdf_v2 updated --- .../data-config/consolidatedreceipt.json | 39 +++++- .../format-config/consolidatedreceipt.json | 124 ++++++++++++++++-- 2 files changed, 152 insertions(+), 11 deletions(-) diff --git a/configs/pdf-service/data-config/consolidatedreceipt.json b/configs/pdf-service/data-config/consolidatedreceipt.json index ab0ca0e3..e1850e0a 100644 --- a/configs/pdf-service/data-config/consolidatedreceipt.json +++ b/configs/pdf-service/data-config/consolidatedreceipt.json @@ -19,6 +19,18 @@ "path": "$.payerName" } }, + { + "variable": "PaidBy", + "value": { + "path": "$.paidBy" + } + }, + { + "variable": "chequeDD", + "value": { + "path": "$.instrumentNumber" + } + }, { "variable": "user-name", "value": { @@ -69,6 +81,12 @@ }, "type": "date" }, + { + "variable": "payerAddress", + "value": { + "path": "$.paymentDetails[0].bill.payerAddress" + } + }, { "variable": "paymentMode", "value": { @@ -93,6 +111,13 @@ }, "type": "date" }, + { + "variable": "ReceiptDate", + "value": { + "path": "$.paymentDetails[0].receiptDate" + }, + "type": "date" + }, { "variable": "paymentDate", "value": { @@ -286,6 +311,18 @@ "module":"rainmaker-common" } }, + { + "variable": "cheque_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_CHEQUE_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, { "variable": "generated_by", "value": { @@ -431,7 +468,7 @@ { "externalAPI": [ { - "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "path": "http://localhost:8069/egov-mdms-service/v1/_get", "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", "apiRequest": null, "responseMapping":[ diff --git a/configs/pdf-service/format-config/consolidatedreceipt.json b/configs/pdf-service/format-config/consolidatedreceipt.json index 2907b364..324936e7 100644 --- a/configs/pdf-service/format-config/consolidatedreceipt.json +++ b/configs/pdf-service/format-config/consolidatedreceipt.json @@ -97,8 +97,7 @@ false, false ], - "style": "receipt-table", - "font": "Roboto" + "style": "receipt-table" }, { "text": "{{consumer_id}}", @@ -118,8 +117,49 @@ true, false ], - "style": "receipt-table", - "font": "Roboto" + "style": "receipt-table" + } + ], + [ + { + "text": "Receipt Date", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{ReceiptDate}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Tax period", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{fromPeriod}} {{to}} {{toPeriod}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" } ], [ @@ -164,6 +204,48 @@ "style": "receipt-table" } ], + [ + { + "text": "Address: ", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerAddress}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Paid By: ", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{PaidBy}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], [ { "text": "{{payer_contact}}", @@ -284,7 +366,7 @@ "style": "receipt-table" }, { - "text": "", + "text": "{{payment_mode}}", "border": [ false, false, @@ -294,7 +376,7 @@ "style": "receipt-table-value" }, { - "text": "", + "text": "{{paymentMode}}", "border": [ false, false, @@ -306,7 +388,7 @@ ], [ { - "text": "{{payment_mode}}", + "text": "Cheque/DD No.", "border": [ true, false, @@ -316,7 +398,7 @@ "style": "receipt-table-value" }, { - "text": "{{paymentMode}}", + "text": "{{chequeDD}}", "border": [ false, false, @@ -343,8 +425,8 @@ true, false ], - "style": "receipt-table", - "font": "Roboto" + "style": "receipt-table" + } ], [ @@ -393,6 +475,28 @@ }, "layout": {} }, + { + "style": "next-noc-table", + "table": { + "widths": [ + "*", + "*" + ], + "body": [ + [ + { + "text":"Comments: ", + "border":[false, false, false, false] + }, + { + "text":" ", + "border":[false, false, false, false] + } + ] + ], + "layout":"noBorders" + } + }, { "style": "receipt-approver", "columns": [ From b448218a3dec57d92c54f9273cd5917f15b7c359 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Sat, 22 Aug 2020 20:51:25 +0530 Subject: [PATCH 0062/1242] Update consolidatedreceipt.json --- configs/pdf-service/data-config/consolidatedreceipt.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/pdf-service/data-config/consolidatedreceipt.json b/configs/pdf-service/data-config/consolidatedreceipt.json index e1850e0a..c515d679 100644 --- a/configs/pdf-service/data-config/consolidatedreceipt.json +++ b/configs/pdf-service/data-config/consolidatedreceipt.json @@ -468,7 +468,7 @@ { "externalAPI": [ { - "path": "http://localhost:8069/egov-mdms-service/v1/_get", + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", "apiRequest": null, "responseMapping":[ From 03c372bd40fb7baad5a39a25e8469572e6924f8a Mon Sep 17 00:00:00 2001 From: gurpreetsinghkhanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 24 Aug 2020 10:21:52 +0530 Subject: [PATCH 0063/1242] tlapplication_pdf_update_digit_v2 --- configs/pdf-service/data-config/tlapplication.json | 12 +++++++++++- configs/pdf-service/format-config/tlapplication.json | 4 ++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/configs/pdf-service/data-config/tlapplication.json b/configs/pdf-service/data-config/tlapplication.json index d62f88b1..8c5b420a 100644 --- a/configs/pdf-service/data-config/tlapplication.json +++ b/configs/pdf-service/data-config/tlapplication.json @@ -256,6 +256,12 @@ "path": "$..tradeLicenseDetail.owners[0].mobileNumber" } }, + { + "variable": "altContactNumber", + "value": { + "path": "$..tradeLicenseDetail.owners[0].altContactNumber" + } + }, { "variable": "name", "value": { @@ -1032,7 +1038,7 @@ { "externalAPI": [ { - "path": "http://billing-service:8080/billing-service/bill/v2/_fetchbill", + "path": "http://localhost:8073/billing-service/bill/v2/_search", "queryParam": "tenantId=$.tenantId,consumerCode=$.applicationNumber,businessService=TL", "apiRequest": null, "responseMapping":[ @@ -1044,6 +1050,10 @@ "variable":"tradeLicenseTax", "value":"$.Bill[0].billDetails[0].billAccountDetails[?(@.taxHeadCode == 'TL_TAX')].amount" }, + { + "variable":"billStatus", + "value":"$.Bill[0].status" + }, { "variable":"rebate", "value":"$.Bill[0].billDetails[0].billAccountDetails[?(@.taxHeadCode == 'TL_ADHOC_REBATE')].amount" diff --git a/configs/pdf-service/format-config/tlapplication.json b/configs/pdf-service/format-config/tlapplication.json index fa6d9fde..c0eafc3e 100644 --- a/configs/pdf-service/format-config/tlapplication.json +++ b/configs/pdf-service/format-config/tlapplication.json @@ -63,7 +63,7 @@ "bold" : false }, { - "text":"{{Rs}} {{totalAmount}}", + "text":"{{Rs}} {{totalAmount}} - {{billStatus}}", "style":"receipt-table-value-total", "fontSize": 20 } @@ -908,7 +908,7 @@ "style": "receipt-table2" }, { - "text":"{{mobileNo}}", + "text":"{{mobileNo}}, {{altContactNumber}}", "border":[ false, false, From f4d626e52b1af9287299743479c75b892e3f74e7 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 24 Aug 2020 10:25:01 +0530 Subject: [PATCH 0064/1242] Update tlapplication.json --- configs/pdf-service/data-config/tlapplication.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/pdf-service/data-config/tlapplication.json b/configs/pdf-service/data-config/tlapplication.json index 8c5b420a..45a43559 100644 --- a/configs/pdf-service/data-config/tlapplication.json +++ b/configs/pdf-service/data-config/tlapplication.json @@ -1038,7 +1038,7 @@ { "externalAPI": [ { - "path": "http://localhost:8073/billing-service/bill/v2/_search", + "path": "http://billing-service:8080/billing-service/bill/v2/_search", "queryParam": "tenantId=$.tenantId,consumerCode=$.applicationNumber,businessService=TL", "apiRequest": null, "responseMapping":[ @@ -1070,4 +1070,4 @@ } ] } -} \ No newline at end of file +} From 3905205870bb03f9a5e6f3c056f865fbcf08148d Mon Sep 17 00:00:00 2001 From: mohaarif007 <48949208+mohaarif007@users.noreply.github.com> Date: Mon, 24 Aug 2020 10:50:22 +0530 Subject: [PATCH 0065/1242] Update yml format for PT-Report Update yml format for PT-Report --- configs/reports/configs/pt-reports.yml | 319 +++++++++++++------------ 1 file changed, 161 insertions(+), 158 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index bc3c90e7..6d85fce5 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -1631,7 +1631,8 @@ ReportDefinitions: JOIN eg_pt_propertydetail_v2 pt_detail ON (pt_detail.property || ':' || pt_detail.assessmentnumber) = rh.consumercode JOIN eg_pt_address_v2 pt_addr ON pt_detail.property = pt_addr.property LEFT OUTER JOIN eg_user ON eg_user.id = rh.createdby::INTEGER - WHERE rh.tenantid = $tenantid and rh.status != 'Cancelled' and businessdetails='PT' and rh.createdby::INTEGER in (select user_id from eg_userrole_v1 where role_code ='SEVA_KENDRA_EMP') + WHERE rh.tenantid = $tenantid and rh.status != 'Cancelled' and businessdetails='PT' and rh.createdby::INTEGER in + (select user_id from eg_userrole_v1 where role_code ='SEVA_KENDRA_EMP') orderby: ORDER BY rh.receiptdate DESC - reportName: ReceiptRegisterSummary @@ -2284,17 +2285,17 @@ ReportDefinitions: manualreceiptnumber as g8receiptno, (CASE WHEN collectiontype='COUNTER' THEN eg_user.name ELSE '' END) as collectorname, pt_detail.additionaldetails->>'remarks' as "remarks" - FROM egcl_paymentdetail AS pd - JOIN egcl_payment as payment on pd.paymentid=payment.id - JOIN egcl_bill as bill on bill.id=pd.billid - JOIN egcl_billdetial as bd on bd.billid = bill.id - JOIN eg_pt_property_v2 as pt on pt.propertyid = bill.consumercode - JOIN receipt_breakup ON pd.id = receipt_breakup.pdid - JOIN eg_pt_propertydetail_v2 pt_detail ON pt_detail.property = pt.propertyid - JOIN eg_pt_address_v2 pt_addr ON pt_detail.property = pt_addr.property - LEFT OUTER JOIN eg_user ON eg_user.id = pd.createdby::INTEGER - WHERE pd.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' - orderby: ORDER BY pd.receiptdate DESC + FROM egcl_paymentdetail AS pd + JOIN egcl_payment as payment on pd.paymentid=payment.id + JOIN egcl_bill as bill on bill.id=pd.billid + JOIN egcl_billdetial as bd on bd.billid = bill.id + JOIN eg_pt_property_v2 as pt on pt.propertyid = bill.consumercode + JOIN receipt_breakup ON pd.id = receipt_breakup.pdid + JOIN eg_pt_propertydetail_v2 pt_detail ON pt_detail.property = pt.propertyid + JOIN eg_pt_address_v2 pt_addr ON pt_detail.property = pt_addr.property + LEFT OUTER JOIN eg_user ON eg_user.id = pd.createdby::INTEGER + WHERE pd.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' + orderby: ORDER BY pd.receiptdate DESC - reportName: CancelledReceiptRegister_V2 summary: Receipt Register for cancelled Receipts @@ -2459,54 +2460,55 @@ ReportDefinitions: SELECT receiptnumber as receiptheader, SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, - SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, - SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, - SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, - SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as propertytax, - (SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN adjustedamount ELSE 0 END) )as exemption, - ( SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END)) as adjustment - FROM egcl_billaccountdetail as bad - INNER JOIN egcl_billdetial as bd on bd.id = bad.billdetailid - INNER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid - INNER JOIN egcl_payment as payment on pd.paymentid=payment.id - WHERE pd.tenantid = $tenantid and payment.paymentstatus = 'CANCELLED' and pd.businessservice='PT' - GROUP BY pd.receiptnumber) + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, + SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as propertytax, + (SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN adjustedamount ELSE 0 END) )as exemption, + ( SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END)) as adjustment + FROM egcl_billaccountdetail as bad + INNER JOIN egcl_billdetial as bd on bd.id = bad.billdetailid + INNER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid + INNER JOIN egcl_payment as payment on pd.paymentid=payment.id + WHERE pd.tenantid = $tenantid and payment.paymentstatus = 'CANCELLED' and pd.businessservice='PT' + GROUP BY pd.receiptnumber + ) SELECT - pd.tenantid AS tenantid, - pd.id, - pt_detail.property AS propertyid, - pt_detail.assessmentnumber AS assessmentnumber, - payment.paymentstatus, - bill.consumercode, - to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS receiptdate, - payment.ifsccode AS bankname, - receiptnumber, - payment.totalamountpaid as amount, - payment.paymentmode as instrumenttype, - payment.transactionnumber, - receipt_breakup.*, - pd.due AS pendingamount, - pt_detail.financialyear, - to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, - Initcap(COALESCE(pt_detail.usagecategoryminor, pt_detail.usagecategorymajor)) as usagetype, - manualreceiptnumber as g8receiptno - FROM egcl_paymentdetail AS pd - JOIN egcl_payment as payment on pd.paymentid=payment.id - JOIN egcl_bill as bill on bill.id=pd.billid - JOIN egcl_billdetial as bd on bd.billid = bill.id - JOIN eg_pt_property_v2 as pt on pt.propertyid = bill.consumercode - JOIN receipt_breakup ON receipt_breakup.receiptheader = pd.receiptnumber - JOIN eg_pt_propertydetail_v2 pt_detail ON pt_detail.property = pt.propertyid - JOIN eg_pt_address_v2 pt_addr ON pt_detail.property = pt_addr.property - LEFT OUTER JOIN eg_user ON eg_user.id = pd.createdby::INTEGER - WHERE pd.tenantid = $tenantid and payment.paymentstatus = 'CANCELLED' and pd.businessservice='PT' - orderby: ORDER BY pd.receiptdate DESC + pd.tenantid AS tenantid, + pd.id, + pt_detail.property AS propertyid, + pt_detail.assessmentnumber AS assessmentnumber, + payment.paymentstatus, + bill.consumercode, + to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS receiptdate, + payment.ifsccode AS bankname, + receiptnumber, + payment.totalamountpaid as amount, + payment.paymentmode as instrumenttype, + payment.transactionnumber, + receipt_breakup.*, + pd.due AS pendingamount, + pt_detail.financialyear, + to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, + Initcap(COALESCE(pt_detail.usagecategoryminor, pt_detail.usagecategorymajor)) as usagetype, + manualreceiptnumber as g8receiptno + FROM egcl_paymentdetail AS pd + JOIN egcl_payment as payment on pd.paymentid=payment.id + JOIN egcl_bill as bill on bill.id=pd.billid + JOIN egcl_billdetial as bd on bd.billid = bill.id + JOIN eg_pt_property_v2 as pt on pt.propertyid = bill.consumercode + JOIN receipt_breakup ON receipt_breakup.receiptheader = pd.receiptnumber + JOIN eg_pt_propertydetail_v2 pt_detail ON pt_detail.property = pt.propertyid + JOIN eg_pt_address_v2 pt_addr ON pt_detail.property = pt_addr.property + LEFT OUTER JOIN eg_user ON eg_user.id = pd.createdby::INTEGER + WHERE pd.tenantid = $tenantid and payment.paymentstatus = 'CANCELLED' and pd.businessservice='PT' + orderby: ORDER BY pd.receiptdate DESC - reportName: OldUlbWisePtCollection_V2 summary: ULB-wise PT Collection @@ -2726,33 +2728,33 @@ ReportDefinitions: SELECT receiptnumber as receiptheader, SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, - SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, - SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, - SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, - SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as propertytax, - (SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN adjustedamount ELSE 0 END) )as exemption, - ( SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END)) as adjustment + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, + SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as propertytax, + (SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN adjustedamount ELSE 0 END) )as exemption, + ( SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END)) as adjustment FROM egcl_billaccountdetail as bad INNER JOIN egcl_billdetial as bd on bd.id = bad.billdetailid - INNER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid - INNER JOIN egcl_payment as payment on pd.paymentid=payment.id - WHERE pd.tenantid != 'pb.testing' and payment.paymentstatus = 'CANCELLED' and pd.businessservice='PT' + INNER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid + INNER JOIN egcl_payment as payment on pd.paymentid=payment.id + WHERE pd.tenantid != 'pb.testing' and payment.paymentstatus = 'CANCELLED' and pd.businessservice='PT' GROUP BY pd.receiptnumber ) SELECT - pd.tenantid AS tenantid, + pd.tenantid AS tenantid, pd.id, pt_detail.property AS propertyid, pt_detail.assessmentnumber AS assessmentnumber, - payment.paymentstatus, + payment.paymentstatus, bill.consumercode, - to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS receiptdate, + to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS receiptdate, payment.ifsccode AS bankname, receiptnumber, payment.totalamountpaid as amount, @@ -2765,15 +2767,15 @@ ReportDefinitions: Initcap(COALESCE(pt_detail.usagecategoryminor, pt_detail.usagecategorymajor)) as usagetype, manualreceiptnumber as g8receiptno FROM egcl_paymentdetail AS pd - JOIN egcl_payment as payment on pd.paymentid=payment.id - JOIN egcl_bill as bill on bill.id=pd.billid - JOIN egcl_billdetial as bd on bd.billid = bill.id - JOIN eg_pt_property_v2 as pt on pt.propertyid = bill.consumercode - JOIN receipt_breakup ON receipt_breakup.receiptheader = pd.receiptnumber - JOIN eg_pt_propertydetail_v2 pt_detail ON pt_detail.property = pt.propertyid - JOIN eg_pt_address_v2 pt_addr ON pt_detail.property = pt_addr.property - LEFT OUTER JOIN eg_user ON eg_user.id = pd.createdby::INTEGER - WHERE pd.tenantid != 'pb.testing' and payment.paymentstatus = 'CANCELLED' and pd.businessservice='PT' + JOIN egcl_payment as payment on pd.paymentid=payment.id + JOIN egcl_bill as bill on bill.id=pd.billid + JOIN egcl_billdetial as bd on bd.billid = bill.id + JOIN eg_pt_property_v2 as pt on pt.propertyid = bill.consumercode + JOIN receipt_breakup ON receipt_breakup.receiptheader = pd.receiptnumber + JOIN eg_pt_propertydetail_v2 pt_detail ON pt_detail.property = pt.propertyid + JOIN eg_pt_address_v2 pt_addr ON pt_detail.property = pt_addr.property + LEFT OUTER JOIN eg_user ON eg_user.id = pd.createdby::INTEGER + WHERE pd.tenantid != 'pb.testing' and payment.paymentstatus = 'CANCELLED' and pd.businessservice='PT' orderby: ORDER BY pd.receiptdate DESC - reportName: StateWidePtCollection_V2 @@ -2849,18 +2851,18 @@ ReportDefinitions: isMandatory: false searchClause: AND usagecategorymajor = $usage query: | - SELECT - initcap(split_part(tenantid, '.', 2)) as tenantid, - COUNT(*) AS totalassessments, - SUM(billd.amount) AS totalamount, - SUM(billd.amountpaid) AS totalamountpaid, - SUM(CASE WHEN billd.collectiontype LIKE 'ONLINE' THEN amount ELSE 0 END) AS totalonline, - SUM(CASE WHEN billd.collectiontype LIKE 'COUNTER' THEN amount ELSE 0 END) AS totaloffline, - (SUM(billd.amount) - SUM(billd.amountpaid)) AS totalamountdue - FROM egcl_billdetial as billd - WHERE tenantid not in ('pb.testing','pb.ludhiana_legacy') - groupby: GROUP BY tenantid - orderby: ORDER BY tenantid, totalamountpaid DESC NULLS LAST + SELECT + initcap(split_part(tenantid, '.', 2)) as tenantid, + COUNT(*) AS totalassessments, + SUM(billd.amount) AS totalamount, + SUM(billd.amountpaid) AS totalamountpaid, + SUM(CASE WHEN billd.collectiontype LIKE 'ONLINE' THEN amount ELSE 0 END) AS totalonline, + SUM(CASE WHEN billd.collectiontype LIKE 'COUNTER' THEN amount ELSE 0 END) AS totaloffline, + (SUM(billd.amount) - SUM(billd.amountpaid)) AS totalamountdue + FROM egcl_billdetial as billd + WHERE tenantid not in ('pb.testing','pb.ludhiana_legacy') + groupby: GROUP BY tenantid + orderby: ORDER BY tenantid, totalamountpaid DESC NULLS LAST - reportName: UlbWisePtCollection_V2 summary: State Wide PT Collection @@ -3063,25 +3065,26 @@ ReportDefinitions: SELECT receiptnumber, SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, - SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, - SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, - SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, - SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as propertytax, - (SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN adjustedamount ELSE 0 END) )as exemption, - ( SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END)) as adjustment + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, + SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as propertytax, + (SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN adjustedamount ELSE 0 END) )as exemption, + ( SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END)) as adjustment FROM egcl_billaccountdetail as bad INNER JOIN egcl_billdetial as bd on bd.id = bad.billdetailid - INNER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid - INNER JOIN egcl_payment as payment on pd.paymentid=payment.id - LEFT OUTER JOIN eg_user ON eg_user.id = pd.createdby::INTEGER - WHERE bd.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' - GROUP BY pd.receiptnumber) + INNER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid + INNER JOIN egcl_payment as payment on pd.paymentid=payment.id + LEFT OUTER JOIN eg_user ON eg_user.id = pd.createdby::INTEGER + WHERE bd.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' + GROUP BY pd.receiptnumber + ) SELECT bill.tenantid AS tenantid, bill.id, @@ -3092,7 +3095,7 @@ ReportDefinitions: to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, payment.ifsccode AS bankname, pd.receiptnumber, - payment.totalamountpaid as amount, + payment.totalamountpaid as amount, payment.paymentmode as instrumenttype, payment.transactionnumber, receipt_breakup.*, @@ -3104,15 +3107,15 @@ ReportDefinitions: (CASE WHEN collectiontype='COUNTER' THEN eg_user.name ELSE '' END) as collectorname, pt_detail.additionaldetails->>'remarks' as "remarks" FROM egcl_bill AS bill - INNER JOIN egcl_billdetial as bd on bd.billid = bill.id - LEFT OUTER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid - LEFT OUTER JOIN egcl_payment as payment on pd.paymentid=payment.id - JOIN eg_pt_propertydetail_v2 pt_detail ON pt_detail.property = bill.consumercode + INNER JOIN egcl_billdetial as bd on bd.billid = bill.id + LEFT OUTER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid + LEFT OUTER JOIN egcl_payment as payment on pd.paymentid=payment.id + JOIN eg_pt_propertydetail_v2 pt_detail ON pt_detail.property = bill.consumercode JOIN eg_pt_address_v2 pt_addr ON pt_detail.property = pt_addr.property - JOIN receipt_breakup ON receipt_breakup.receiptnumber = pd.receiptnumber + JOIN receipt_breakup ON receipt_breakup.receiptnumber = pd.receiptnumber LEFT OUTER JOIN eg_user ON eg_user.id = pd.createdby::INTEGER WHERE pd.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' - orderby: ORDER BY pd.receiptdate DESC + orderby: ORDER BY pd.receiptdate DESC - reportName: ULBPTDataDumpReport_V2 @@ -3296,14 +3299,14 @@ ReportDefinitions: pt.additionaldetails->>'FirmBusinessName' as "businessname", pta.locality as "localitycode" from egcl_paymentdetail as payd - inner join egcl_payment as payment on payment.id = payd.paymentid - inner join egcl_bill as bill on bill.id = payd.billid + inner join egcl_payment as payment on payment.id = payd.paymentid + inner join egcl_bill as bill on bill.id = payd.billid inner join eg_pt_property_v2 as pt on pt.propertyid = bill.consumercode inner join eg_pt_propertydetail_v2 as pd on pd.property = bill.consumercode inner join eg_pt_owner_v2 as po on po.propertydetail = pd.assessmentnumber inner join eg_user as eu on eu.uuid = po.userid inner join eg_pt_address_v2 as pta on pta.property = pt.propertyid - left outer join eg_pt_unit_v2_ot as pot on pot.propertydetail = pd.assessmentnumber + left outer join eg_pt_unit_v2_ot as pot on pot.propertydetail = pd.assessmentnumber where payd.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and payd.businessservice='PT' @@ -3485,25 +3488,25 @@ ReportDefinitions: SELECT receiptnumber, SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, - SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, - SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, - SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, - SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as propertytax, - (SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN adjustedamount ELSE 0 END) )as exemption, - ( SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END)) as adjustment - FROM egcl_billaccountdetail as bad - INNER JOIN egcl_billdetial as bd on bd.id = bad.billdetailid - INNER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid - INNER JOIN egcl_payment as payment on pd.paymentid=payment.id - WHERE bd.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' - and pd.createdby::INTEGER in (select user_id from eg_userrole_v1 where role_code ='SEVA_KENDRA_EMP') - GROUP BY pd.receiptnumber + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, + SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as propertytax, + (SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN adjustedamount ELSE 0 END) )as exemption, + ( SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END)) as adjustment + FROM egcl_billaccountdetail as bad + INNER JOIN egcl_billdetial as bd on bd.id = bad.billdetailid + INNER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid + INNER JOIN egcl_payment as payment on pd.paymentid=payment.id + WHERE bd.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' + and pd.createdby::INTEGER in (select user_id from eg_userrole_v1 where role_code ='SEVA_KENDRA_EMP') + GROUP BY pd.receiptnumber ) SELECT bill.tenantid AS tenantid, @@ -3515,7 +3518,7 @@ ReportDefinitions: to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, payment.ifsccode AS bankname, pd.receiptnumber, - payment.totalamountpaid as amount, + payment.totalamountpaid as amount, payment.paymentmode as instrumenttype, payment.transactionnumber, receipt_breakup.*, @@ -3527,15 +3530,15 @@ ReportDefinitions: (CASE WHEN collectiontype='COUNTER' THEN eg_user.name ELSE '' END) as collectorname, pt_detail.additionaldetails->>'remarks' as "remarks" FROM egcl_bill AS bill - INNER JOIN egcl_billdetial as bd on bd.billid = bill.id - LEFT OUTER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid - LEFT OUTER JOIN egcl_payment as payment on pd.paymentid=payment.id - JOIN eg_pt_propertydetail_v2 pt_detail ON pt_detail.property = bill.consumercode + INNER JOIN egcl_billdetial as bd on bd.billid = bill.id + LEFT OUTER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid + LEFT OUTER JOIN egcl_payment as payment on pd.paymentid=payment.id + JOIN eg_pt_propertydetail_v2 pt_detail ON pt_detail.property = bill.consumercode JOIN eg_pt_address_v2 pt_addr ON pt_detail.property = pt_addr.property - JOIN receipt_breakup ON receipt_breakup.receiptnumber = pd.receiptnumber - LEFT OUTER JOIN eg_user ON eg_user.id = pd.createdby::INTEGER - WHERE bd.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' - and pd.createdby::INTEGER in (select user_id from eg_userrole_v1 where role_code ='SEVA_KENDRA_EMP') + JOIN receipt_breakup ON receipt_breakup.receiptnumber = pd.receiptnumber + LEFT OUTER JOIN eg_user ON eg_user.id = pd.createdby::INTEGER + WHERE bd.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and pd.createdby::INTEGER in (select user_id + FROM eg_userrole_v1 where role_code ='SEVA_KENDRA_EMP') orderby: ORDER BY pd.receiptdate DESC @@ -3660,8 +3663,8 @@ ReportDefinitions: sum(adjustedamount) as totalamount FROM egcl_billaccountdetail as bad INNER JOIN egcl_billdetial as bd on bd.id = bad.billdetailid - INNER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid - INNER JOIN egcl_payment as payment on pd.paymentid=payment.id + INNER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid + INNER JOIN egcl_payment as payment on pd.paymentid=payment.id LEFT OUTER JOIN eg_user ON eg_user.id = pd.createdby::INTEGER WHERE bd.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' groupby: group by collectorname,bd.tenantid @@ -3769,7 +3772,7 @@ ReportDefinitions: + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END)) as adjustment FROM egcl_billaccountdetail as bad INNER JOIN egcl_billdetial as bd on bd.id = bad.billdetailid - INNER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid + INNER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid WHERE bd.tenantid = 'pb.testing' and pd.businessservice='PT' groupby: group by bd.tenantid orderby: order by bd.tenantid @@ -3859,8 +3862,8 @@ ReportDefinitions: sum(case when payment.paymentmode='CHEQUE' then pd.amountpaid else 0 end) as "cheque", sum(case when payment.paymentmode='DD' then pd.amountpaid else 0 end) as "dd" FROM egcl_paymentdetail AS pd - join egcl_payment as payment on payment.id = pd.paymentid - join egcl_bill as bill on bill.id = pd.billid + join egcl_payment as payment on payment.id = pd.paymentid + join egcl_bill as bill on bill.id = pd.billid JOIN eg_pt_propertydetail_v2 pt_detail ON pt_detail.property = bill.consumercode JOIN eg_pt_address_v2 pt_addr ON pt_detail.property = pt_addr.property LEFT OUTER JOIN eg_user ON eg_user.id = pd.createdby::INTEGER From cb88a3ab12facec6338a6dd3d20fec7b2df7d9f6 Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov Date: Mon, 24 Aug 2020 16:51:51 +0530 Subject: [PATCH 0066/1242] Added mdms filter for usage category --- configs/egov-indexer/property-services.yml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/configs/egov-indexer/property-services.yml b/configs/egov-indexer/property-services.yml index 2529011a..782a7db1 100644 --- a/configs/egov-indexer/property-services.yml +++ b/configs/egov-indexer/property-services.yml @@ -329,7 +329,18 @@ ServiceMaps: valueJsonpath: $.tenantId uriResponseMapping: - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.Data.tenantData + outJsonPath: $.Data.tenantData + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: PropertyTax + masterName: UsageCategory + tenantId: pb + filter: "[?(@.name == $UsageCategory)]" + filterMapping: + - variable: $name + valueJsonpath: $.UsageCategory + uriResponseMapping: + - inJsonPath: $.MdmsRes.PropertyTax.UsageCategory + outJsonPath: $.Data.UsageCategory - topic: save-pt-assessment configKey: INDEX From 21ff3e82acbc9ec49b144f88a475de2a4e519e5b Mon Sep 17 00:00:00 2001 From: gurpreetsinghkhanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 24 Aug 2020 17:02:41 +0530 Subject: [PATCH 0067/1242] tradelicense-receipt-pdf-update_digit_v2 --- .../data-config/tradelicense-receipt.json | 76 +++++- .../format-config/tradelicense-receipt.json | 239 +++++++++++++++++- 2 files changed, 307 insertions(+), 8 deletions(-) diff --git a/configs/pdf-service/data-config/tradelicense-receipt.json b/configs/pdf-service/data-config/tradelicense-receipt.json index 126a0926..91797a38 100644 --- a/configs/pdf-service/data-config/tradelicense-receipt.json +++ b/configs/pdf-service/data-config/tradelicense-receipt.json @@ -431,8 +431,80 @@ } } ] - } - ] + }, + { + "path": "http://tl-services.egov:8080/tl-services/v1/_search", + "queryParam": "tenantId=$.tenantId,applicationNumber=$.paymentDetails[0].bill.consumerCode", + "apiRequest": null, + "responseMapping":[ + { + "variable":"applicationType", + "value":"$.Licenses[0].applicationType" + }, + { + "variable":"licenseNumber", + "value":"$.Licenses[0].licenseNumber" + }, + { + "variable":"oldLicenseNumber", + "value":"$.Licenses[0].oldLicenseNumber" + }, + { + "variable":"financialYear", + "value":"$.Licenses[0].financialYear" + }, + { + "variable":"tradeName", + "value":"$.Licenses[0].tradeName" + }, + { + "variable": "tradeType", + "value": "$.Licenses[0].tradeLicenseDetail.tradeUnits[0].tradeType", + "localisation":{ + "required":true, + "prefix": "TRADELICENSE_TRADETYPE", + "module": "rainmaker-tl", + "isCategoryRequired":true + } + }, + { + "variable": "variable14", + "value": "$.Licenses[0].tradeLicenseDetail.accessories.*", + "type":"array", + "format":{ + "type":"string", + "scema":[ + { + "variable": "accesoryType", + "value": "accessoryCategory", + "localisation":{ + "required":true, + "prefix": "TRADELICENSE_ACCESSORIESCATEGORY", + "module": "rainmaker-tl" + } + }, + { + "variable": "accessoryUomValue", + "value": "uomValue" + }, + + { + "variable": "uom", + "value": "uom" + }, + { + "variable": "accessoryCount", + "value": "count" + } + + ] + } + } + + ] + } + ] + } ] } diff --git a/configs/pdf-service/format-config/tradelicense-receipt.json b/configs/pdf-service/format-config/tradelicense-receipt.json index a9bcacfb..a6c6df6e 100644 --- a/configs/pdf-service/format-config/tradelicense-receipt.json +++ b/configs/pdf-service/format-config/tradelicense-receipt.json @@ -97,8 +97,7 @@ false, false ], - "style": "receipt-table", - "font": "Roboto" + "style": "receipt-table" }, { "text": "{{consumer_id}}", @@ -118,8 +117,91 @@ true, false ], - "style": "receipt-table", - "font": "Roboto" + "style": "receipt-table" + } + ], + [ + { + "text": "Application Type", + "border": [ + true, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{applicationType}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "License No.", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{licenseNumber}}", + "border": [ + false, + true, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "Financial Year", + "border": [ + true, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{financialYear}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Old License No.", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{oldLicenseNumber}}", + "border": [ + false, + true, + true, + false + ], + "style": "receipt-table" } ], [ @@ -262,6 +344,48 @@ "style": "receipt-table" } ], + [ + { + "text": "Trade Name", + "border": [ + true, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{tradeName}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Trade Type", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{tradeType}}", + "border": [ + false, + true, + true, + false + ], + "style": "receipt-table" + } + ], [ { "text": "{{paid_amount}}", @@ -304,6 +428,90 @@ "style": "receipt-table" } ], + [ + { + "text": "Adhoc Rebate", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "₹ 0", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Rebate Reason", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": " ", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "Adhoc Penalty", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "₹ ", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Penalty reason", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": " ", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], [ { "text": "{{payment_mode}}", @@ -343,8 +551,7 @@ true, false ], - "style": "receipt-table", - "font": "Roboto" + "style": "receipt-table" } ], [ @@ -393,6 +600,19 @@ }, "layout": {} }, + { + "style": "noc-table", + "table": { + "widths":["*", "*", "*", "*"], + "body": ["{{#variable14}}[{\"text\":\"Accessory Type\", \"border\":[ false, false, false, false ], \"style\": \"receipt-table-value-cont\" },{ \"text\":\"UOM\",\"border\":[ false, false, false, false ], \"style\": \"receipt-table-value-cont\", \"fontSize\": 11 }, { \"text\":\"UOM Value\", \"border\":[ false, false, false, false ], \"style\": \"receipt-table-value-cont\" }, { \"text\":\"Count\", \"border\":[ false, false, false, false ], \"style\": \"receipt-table-value-cont\" } ], [ { \"text\":\"{{accesoryType}}\", \"border\":[ false, false, false, false ], \"style\": \"receipt-table2\" }, { \"text\":\"{{uom}}\", \"border\":[ false, false, false, false ], \"style\": \"receipt-table2\" }, { \"text\":\"{{accessoryUomValue}}\", \"border\":[ false, false, false, false ], \"style\": \"receipt-table2\" }, { \"text\":\"{{accessoryCount}}\", \"border\":[ false, false, false, false ], \"style\": \"receipt-table2\" } ]{{/variable14}}" ] + }, + "border":[ + true, + false, + true, + false + ] + }, { "style": "receipt-approver", "columns": [ @@ -450,6 +670,13 @@ "body": ["{{#variable11}}[{\"text\":\"{{disclaimerContent}}\",\"border\":[false,false,false,false],\"style\":\"pt-disclaimer-value\"}]{{/variable11}}"] }, "layout": {} + }, + { + "ol": + [ + "Payment received by Cheque/DD shall be subject to realization", + "This document is not a proof of property ownership" + ] } ] } From 8ac71a07392325ab2000568cae7740eaa72da749 Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov Date: Mon, 24 Aug 2020 17:16:22 +0530 Subject: [PATCH 0068/1242] Added usageCategory in the domain object of DSS collection index --- .../egov-dss-dashboards/dashboard-ingest/transform_pt_v1.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-ingest/transform_pt_v1.json b/configs/egov-dss-dashboards/dashboard-ingest/transform_pt_v1.json index 451034b7..b7a169b6 100644 --- a/configs/egov-dss-dashboards/dashboard-ingest/transform_pt_v1.json +++ b/configs/egov-dss-dashboards/dashboard-ingest/transform_pt_v1.json @@ -6,7 +6,8 @@ "propertyId": "propertyId", "propertyDetails": "propertyDetails", "ward" : "ward", - "units": "units" + "units": "units", + "usageCategory": "usageCategory" } } ] From 2006de4ecc991751accd539a5e0626f8b8680c94 Mon Sep 17 00:00:00 2001 From: gurpreetsinghkhanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 24 Aug 2020 22:09:44 +0530 Subject: [PATCH 0069/1242] property-receipt-pdf digit v2 update --- .../data-config/property-receipt.json | 57 +++++++++++++++---- .../data-config/tlapplication.json | 2 +- .../format-config/property-receipt.json | 14 ++--- 3 files changed, 54 insertions(+), 19 deletions(-) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index c279c8be..56d58200 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -129,55 +129,55 @@ { "variable": "PropertyTax", "value": { - "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[8].adjustedAmount" + "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_TAX')].adjustedAmount" } }, { "variable": "FireCess", "value": { - "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[7].adjustedAmount" + "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_FIRE_CESS')].adjustedAmount" } }, { "variable": "CancerCess", "value": { - "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[6].adjustedAmount" + "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_CANCER_CESS')].adjustedAmount" } }, { "variable": "Penalty", "value": { - "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[5].adjustedAmount" + "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_TIME_PENALTY')].adjustedAmount" } }, { "variable": "Rebate", "value": { - "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[0].adjustedAmount" + "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_TIME_REBATE')].adjustedAmount" } }, { "variable": "Interest", "value": { - "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[4].adjustedAmount" + "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_TIME_INTEREST')].adjustedAmount" } }, { "variable": "UsageExemption", "value": { - "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[2].adjustedAmount" + "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_UNIT_USAGE_EXEMPTION')].adjustedAmount" } }, { "variable": "SpecialCategoryExemption", "value": { - "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[3].adjustedAmount" + "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_OWNER_EXEMPTION')].adjustedAmount" } }, { "variable": "RoundOff", "value": { - "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[1].adjustedAmount" + "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_ROUNDOFF')].adjustedAmount" } }, { @@ -444,7 +444,7 @@ { "externalAPI": [ { - "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "path": "http://localhost:8069/egov-mdms-service/v1/_get", "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", "apiRequest": null, "responseMapping":[ @@ -481,7 +481,42 @@ ] }, { - "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "path": "http://localhost:8075/property-services/property/_search", + "queryParam": "propertyIds=PT-1012-877972,tenantId=pb.testing", + "apiRequest": null, + "responseMapping":[ + { + "variable":"fatherHusbandName", + "value":"$.Properties[0].owners[0].fatherOrHusbandName" + }, + { + "variable":"doorNo", + "value":"$.Properties[0].address.doorNo" + }, + { + "variable":"buildingName", + "value":"$.Properties[0].address.buildingName" + }, + { + "variable":"streetName", + "value":"$.Properties[0].address.street" + }, + { + "variable":"locality", + "value":"$.Properties[0].address.locality.name" + }, + { + "variable":"landArea", + "value":"$.Properties[0].landArea" + }, + { + "variable":"propertyType", + "value":"$.Properties[0].propertyType" + } + ] + }, + { + "path": "http://localhost:8069/egov-mdms-service/v1/_get", "queryParam": "moduleName=tenant&masterName=footer&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}' %26%26 @.service=='{$.paymentDetails[0].businessService}')%5D", "apiRequest": null, "responseMapping":[ diff --git a/configs/pdf-service/data-config/tlapplication.json b/configs/pdf-service/data-config/tlapplication.json index 45a43559..48956046 100644 --- a/configs/pdf-service/data-config/tlapplication.json +++ b/configs/pdf-service/data-config/tlapplication.json @@ -259,7 +259,7 @@ { "variable": "altContactNumber", "value": { - "path": "$..tradeLicenseDetail.owners[0].altContactNumber" + "path": "$.tradeLicenseDetail.owners[0].altContactNumber" } }, { diff --git a/configs/pdf-service/format-config/property-receipt.json b/configs/pdf-service/format-config/property-receipt.json index 569aef49..09ab7a55 100644 --- a/configs/pdf-service/format-config/property-receipt.json +++ b/configs/pdf-service/format-config/property-receipt.json @@ -90,7 +90,7 @@ "style": "receipt-table-value" }, { - "text": "To-Fetch", + "text": "{{doorNo}}", "border": [ false, true, @@ -110,7 +110,7 @@ "style": "receipt-table-value" }, { - "text": "To-Fetch", + "text": "{{buildingName}}", "border": [ false, true, @@ -132,7 +132,7 @@ "style": "receipt-table-value" }, { - "text": "To-Fetch", + "text": "{{streetName}}", "border": [ false, false, @@ -152,7 +152,7 @@ "style": "receipt-table-value" }, { - "text": "To-Fetch", + "text": "{{locality}}", "border": [ false, false, @@ -174,7 +174,7 @@ "style": "receipt-table-value" }, { - "text": "To-Fetch", + "text": "{{landArea}}", "border": [ false, false, @@ -194,7 +194,7 @@ "style": "receipt-table-value" }, { - "text": "To-Fetch", + "text": "{{propertyType}}", "border": [ false, false, @@ -376,7 +376,7 @@ "style": "receipt-table-value" }, { - "text" : "To-Fetch", + "text" : "{{fatherHusbandName}}", "border": [ false, false, From f4ac1bb44c6c9d79d213e1e0337cd7c01d9bab6a Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 24 Aug 2020 22:16:13 +0530 Subject: [PATCH 0070/1242] service paths update --- configs/pdf-service/data-config/property-receipt.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index 56d58200..d2590140 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -444,7 +444,7 @@ { "externalAPI": [ { - "path": "http://localhost:8069/egov-mdms-service/v1/_get", + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", "apiRequest": null, "responseMapping":[ @@ -481,7 +481,7 @@ ] }, { - "path": "http://localhost:8075/property-services/property/_search", + "path": "http://property-services.egov:8080/property-services/property/_search", "queryParam": "propertyIds=PT-1012-877972,tenantId=pb.testing", "apiRequest": null, "responseMapping":[ @@ -516,7 +516,7 @@ ] }, { - "path": "http://localhost:8069/egov-mdms-service/v1/_get", + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", "queryParam": "moduleName=tenant&masterName=footer&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}' %26%26 @.service=='{$.paymentDetails[0].businessService}')%5D", "apiRequest": null, "responseMapping":[ From 65c603d7b6c99ed648240c39f5e4bf18f9e3b2eb Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov <61416590+mahammadnizam-wt-eGov@users.noreply.github.com> Date: Mon, 24 Aug 2020 23:02:25 +0530 Subject: [PATCH 0071/1242] Updated filter with code in usage category --- configs/egov-indexer/property-services.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/egov-indexer/property-services.yml b/configs/egov-indexer/property-services.yml index 782a7db1..0a809a46 100644 --- a/configs/egov-indexer/property-services.yml +++ b/configs/egov-indexer/property-services.yml @@ -334,13 +334,13 @@ ServiceMaps: moduleName: PropertyTax masterName: UsageCategory tenantId: pb - filter: "[?(@.name == $UsageCategory)]" + filter: "[?(@.code == $usageCategory)]" filterMapping: - variable: $name valueJsonpath: $.UsageCategory uriResponseMapping: - inJsonPath: $.MdmsRes.PropertyTax.UsageCategory - outJsonPath: $.Data.UsageCategory + outJsonPath: $.Data.usageCategory - topic: save-pt-assessment configKey: INDEX From 5bccd9fce7aef9b65820ecad953c10184ccaa3ff Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov <61416590+mahammadnizam-wt-eGov@users.noreply.github.com> Date: Tue, 25 Aug 2020 11:45:52 +0530 Subject: [PATCH 0072/1242] Added mdms filter for usage category in save property registry --- configs/egov-indexer/property-services.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/configs/egov-indexer/property-services.yml b/configs/egov-indexer/property-services.yml index 0a809a46..4aeaa243 100644 --- a/configs/egov-indexer/property-services.yml +++ b/configs/egov-indexer/property-services.yml @@ -83,6 +83,17 @@ ServiceMaps: uriResponseMapping: - inJsonPath: $.MdmsRes.tenant.tenants outJsonPath: $.Data.tenantData + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: PropertyTax + masterName: UsageCategory + tenantId: pb + filter: "[?(@.code == $usageCategory)]" + filterMapping: + - variable: $name + valueJsonpath: $.UsageCategory + uriResponseMapping: + - inJsonPath: $.MdmsRes.PropertyTax.UsageCategory + outJsonPath: $.Data.usageCategory - topic: update-property-registry configKey: INDEX From 73027d3fe83aa9442edf38b0c26a3daf5e0f02f4 Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov <61416590+mahammadnizam-wt-eGov@users.noreply.github.com> Date: Tue, 25 Aug 2020 12:49:21 +0530 Subject: [PATCH 0073/1242] Removed usageCategory from outJsonPath --- configs/egov-indexer/property-services.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-indexer/property-services.yml b/configs/egov-indexer/property-services.yml index 4aeaa243..e2a76702 100644 --- a/configs/egov-indexer/property-services.yml +++ b/configs/egov-indexer/property-services.yml @@ -93,7 +93,7 @@ ServiceMaps: valueJsonpath: $.UsageCategory uriResponseMapping: - inJsonPath: $.MdmsRes.PropertyTax.UsageCategory - outJsonPath: $.Data.usageCategory + outJsonPath: $.Data - topic: update-property-registry configKey: INDEX From 73821346903a69981aa5c45799a10d7398660597 Mon Sep 17 00:00:00 2001 From: gurpreetsinghkhanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 25 Aug 2020 13:06:42 +0530 Subject: [PATCH 0074/1242] consolidatedreceipt employee copy added in pdf digit update v2 --- .../format-config/consolidatedreceipt.json | 631 +++++++++++++++++- 1 file changed, 599 insertions(+), 32 deletions(-) diff --git a/configs/pdf-service/format-config/consolidatedreceipt.json b/configs/pdf-service/format-config/consolidatedreceipt.json index 06f0ae03..90467bcd 100644 --- a/configs/pdf-service/format-config/consolidatedreceipt.json +++ b/configs/pdf-service/format-config/consolidatedreceipt.json @@ -27,14 +27,577 @@ "style": "receipt-logo-header" }, { - "text": "{{serviceType}} {{payment_receipt}}", + "text": "{{serviceType}} {{payment_receipt}} (Citizen Copy)", "style": "receipt-logo-sub-header" } ], "alignment": "left", "margin": [ 0, - 10, + 4, + 0, + 0 + ] + }, + { + "stack": [ + { + "text": "{{address}}" + }, + { + "text": "{{phoneNumber}}" + }, + { + "text": "{{website}}" + }, + { + "text": "{{email}}" + } + ], + "alignment": "right", + "color": "#484848", + "margin": [ + -100, + 0, + -25, + 0 + ] + } + ] + ] + }, + "layout": "noBorders" + }, + { + "style": "noc-table", + "table": { + "widths": [ + "25%", + "25%", + "25%", + "25%" + ], + "body": [ + [ + { + "text": "{{receipt_no}}.", + "border": [ + true, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{receiptNo}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{consumer_id}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{consumerID}}", + "border": [ + false, + true, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "Receipt Date", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{ReceiptDate}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Tax period", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{fromPeriod}} {{to}} {{toPeriod}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{payment_date}}", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{paymentDate}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{payer_name}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerName}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "Address: ", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerAddress}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Paid By: ", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{PaidBy}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{payer_contact}}", + "border": [ + true, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerContact}}", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table" + }, + { + "text" : " ", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text" : " ", + "border": [ + false, + false, + true, + true + ], + "style": "receipt-table" + } + ] + ] + }, + "layout": {} + }, + { + "style": "next-noc-table", + "table": { + "widths": [ + "25%", + "25%", + "25%", + "25%" + ], + "body": [ + [ + { + "text": "{{service_type}}", + "border": [ + true, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{serviceType}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{billing_period}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{fromPeriod}} {{to}} {{toPeriod}}", + "border": [ + false, + true, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{paid_amount}}", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "₹ {{paidAmount}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + + "text": "{{payment_mode}}", + + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + + "text": "{{paymentMode}}", + + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "Cheque/DD No.", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{chequeDD}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{transaction_id}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{transactionID}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + + } + ], + [ + { + "text": "{{g8_receipt_no}}.", + "border": [ + true, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{G8ReceiptNo}}", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table" + }, + { + "text": "{{g8_receipt_date}}", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{G8ReceiptDate}}", + "border": [ + false, + false, + true, + true + ], + "style": "receipt-table" + } + ] + ] + }, + "layout": {} + }, + { + "style": "next-noc-table", + "table": { + "widths": [ + "*", + "*" + ], + "body": [ + [ + { + "text":"Comments: ", + "border":[false, false, false, false] + }, + { + "text":" ", + "border":[false, false, false, false] + } + ] + ], + "layout":"noBorders" + } + }, + { + "style": "receipt-approver", + "columns": [ + { + "text": [ + { + "text": "{{generated_by}}: ", + "bold": true + }, + { + "text": "{{user-name}}", + "bold": false + } + ], + "alignment": "left" + }, + { + "text": [ + { + "text": "{{commissioner/eo}}", + "bold": true + } + ], + "alignment": "right", + "margin": [ + 0, + 0, + -10, + 1 + ] + } + ] + }, + { + "style": "no-signature", + "text": "{{no_signature}}" + }, + { + "style": "pt-disclaimer", + "stack": [ + { + "text": "{{disclamer}}", + "bold": true, + "style": "pt-disclaimer-value" + }, + { + "text": "{{disclamer_1}}", + "bold": false, + "style": "pt-disclaimer-value" + }, + { + "text": "{{disclamer_2}}", + "bold": false, + "style": "pt-disclaimer-value" + }, + { + "text": "{{disclamer_3}}", + "bold": false, + "style": "pt-disclaimer-value" + } + ] + }, + { + "text":"---------------x------------------------------x-----------------------------x------------------------------x-----------------------x------------------x------", + "style":"next-noc-table" + + }, + { + "style": "noc-head-emp", + "table": { + "widths": [ + 60, + "*", + 120 + ], + "body": [ + [ + { + "image": "{{logoImage}}", + "width": 50, + "height": 61.25 + }, + { + "stack": [ + { + "text": "{{logo-header}} {{Municipal_Corporation}}", + "style": "receipt-logo-header" + }, + { + "text": "{{serviceType}} {{payment_receipt}} (Employee Copy)", + "style": "receipt-logo-sub-header" + } + ], + "alignment": "left", + "margin": [ + 0, + 4, 0, 0 ] @@ -573,107 +1136,111 @@ 1 ] }, + "noc-head-emp": { + "margin": [ + -30, + 10, + 0, + 1 + ] + }, "receipt-logo-header": { "color": "#000000", - "fontSize": 14, + "fontSize": 10, "bold": true, "letterSpacing": 0.74, "margin": [ 0, 0, 0, - 5 + 4 ] }, "receipt-logo-sub-header": { "color": "#000000", - "fontSize": 12, + "fontSize": 8, "letterSpacing": 0.6 }, "noc-table": { - "fontSize": 12, + "fontSize": 8, "color": "#000000", "margin": [ -25, - 45, + 10, -22, -8 ] }, "next-noc-table": { - "fontSize": 12, + "fontSize": 8, "color": "#000000", "margin": [ -25, - 28, + 6, -22, - -8 + 0 ] }, "receipt-table-value": { "color": "#000000", "bold": true, - "fontSize": 12, + "fontSize": 8, "fontWeight": 500, "margin": [ - 8, 8, 0, - 8 + 0, + 0 ] }, "receipt-table": { "color": "#000000", "bold": false, - "fontSize": 12, + "fontSize": 8, "fontWeight": 400, "margin": [ -30, - 8, 0, - 8 + 0, + 0 ] }, "receipt-approver": { - "fontSize": 12, + "fontSize": 8, "bold": true, "margin": [ -27, - 50, + 5, -10, 0 - ], - "color": "#484848" + ] }, "no-signature": { - "fontSize": 12, + "fontSize": 8, "margin": [ -27, - 35, + 5, -10, 0 - ], - "color": "#484848" + ] }, "pt-disclaimer": { - "fontSize": 12, + "fontSize": 8, "margin": [ -27, - 30, + 5, -10, 0 - ], - "color": "#484848" + ] }, "pt-disclaimer-value": { - "fontSize": 12, + "fontSize": 8, "margin": [ 2, - 5, + 2, 0, 0 - ], - "color": "#484848" + ] } } } From b226efc45e8f38fc57b2850b5b1a699aa827e9ea Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov <61416590+mahammadnizam-wt-eGov@users.noreply.github.com> Date: Tue, 25 Aug 2020 13:14:32 +0530 Subject: [PATCH 0075/1242] Update property-services.yml --- configs/egov-indexer/property-services.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-indexer/property-services.yml b/configs/egov-indexer/property-services.yml index e2a76702..7cfba01b 100644 --- a/configs/egov-indexer/property-services.yml +++ b/configs/egov-indexer/property-services.yml @@ -90,7 +90,7 @@ ServiceMaps: filter: "[?(@.code == $usageCategory)]" filterMapping: - variable: $name - valueJsonpath: $.UsageCategory + valueJsonpath: $.usageCategory uriResponseMapping: - inJsonPath: $.MdmsRes.PropertyTax.UsageCategory outJsonPath: $.Data From e0e31a99973ffeb699b64c27c25b03aab5f886f6 Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov <61416590+mahammadnizam-wt-eGov@users.noreply.github.com> Date: Tue, 25 Aug 2020 14:01:20 +0530 Subject: [PATCH 0076/1242] Updated uri response mapping for usage category --- configs/egov-indexer/property-services.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/egov-indexer/property-services.yml b/configs/egov-indexer/property-services.yml index 7cfba01b..ce16198f 100644 --- a/configs/egov-indexer/property-services.yml +++ b/configs/egov-indexer/property-services.yml @@ -89,11 +89,11 @@ ServiceMaps: tenantId: pb filter: "[?(@.code == $usageCategory)]" filterMapping: - - variable: $name - valueJsonpath: $.usageCategory + - variable: $usageCategory + valueJsonpath: $.Data.usageCategory uriResponseMapping: - - inJsonPath: $.MdmsRes.PropertyTax.UsageCategory - outJsonPath: $.Data + - inJsonPath: $.MdmsRes.PropertyTax.UsageCategory[0].name + outJsonPath: $.Data.usageCategory - topic: update-property-registry configKey: INDEX From b0c37b31ffddb10683b41510202459b51762646f Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov <61416590+mahammadnizam-wt-eGov@users.noreply.github.com> Date: Tue, 25 Aug 2020 14:18:03 +0530 Subject: [PATCH 0077/1242] Added single code to filter usage category --- configs/egov-indexer/property-services.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-indexer/property-services.yml b/configs/egov-indexer/property-services.yml index ce16198f..8237afbc 100644 --- a/configs/egov-indexer/property-services.yml +++ b/configs/egov-indexer/property-services.yml @@ -87,7 +87,7 @@ ServiceMaps: moduleName: PropertyTax masterName: UsageCategory tenantId: pb - filter: "[?(@.code == $usageCategory)]" + filter: "[?(@.code == '$usageCategory')]" filterMapping: - variable: $usageCategory valueJsonpath: $.Data.usageCategory From d4b150319d24df6017ad65bb0ead72607bce3554 Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov <61416590+mahammadnizam-wt-eGov@users.noreply.github.com> Date: Tue, 25 Aug 2020 14:26:50 +0530 Subject: [PATCH 0078/1242] Updated out json path to Data --- configs/egov-indexer/property-services.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/egov-indexer/property-services.yml b/configs/egov-indexer/property-services.yml index 8237afbc..79d2f386 100644 --- a/configs/egov-indexer/property-services.yml +++ b/configs/egov-indexer/property-services.yml @@ -87,13 +87,13 @@ ServiceMaps: moduleName: PropertyTax masterName: UsageCategory tenantId: pb - filter: "[?(@.code == '$usageCategory')]" + filter: "[?(@.code == $usageCategory)]" filterMapping: - variable: $usageCategory valueJsonpath: $.Data.usageCategory uriResponseMapping: - inJsonPath: $.MdmsRes.PropertyTax.UsageCategory[0].name - outJsonPath: $.Data.usageCategory + outJsonPath: $.Data - topic: update-property-registry configKey: INDEX From f6dac09a382ee9d63177f8faaed9027808a47ef5 Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov <61416590+mahammadnizam-wt-eGov@users.noreply.github.com> Date: Tue, 25 Aug 2020 15:50:30 +0530 Subject: [PATCH 0079/1242] Added constant filter in usage category --- configs/egov-indexer/property-services.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-indexer/property-services.yml b/configs/egov-indexer/property-services.yml index 79d2f386..debabcbe 100644 --- a/configs/egov-indexer/property-services.yml +++ b/configs/egov-indexer/property-services.yml @@ -87,7 +87,7 @@ ServiceMaps: moduleName: PropertyTax masterName: UsageCategory tenantId: pb - filter: "[?(@.code == $usageCategory)]" + filter: "[?(@.code == 'RESIDENTIAL')]" filterMapping: - variable: $usageCategory valueJsonpath: $.Data.usageCategory From e6feabb4ab4f3e1bad9428784e80243d47f10532 Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov <61416590+mahammadnizam-wt-eGov@users.noreply.github.com> Date: Tue, 25 Aug 2020 16:06:44 +0530 Subject: [PATCH 0080/1242] Update property-services.yml --- configs/egov-indexer/property-services.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-indexer/property-services.yml b/configs/egov-indexer/property-services.yml index debabcbe..51e394f1 100644 --- a/configs/egov-indexer/property-services.yml +++ b/configs/egov-indexer/property-services.yml @@ -87,7 +87,7 @@ ServiceMaps: moduleName: PropertyTax masterName: UsageCategory tenantId: pb - filter: "[?(@.code == 'RESIDENTIAL')]" + filter: "[?(@.code == '\''RESIDENTIAL'\'')]" filterMapping: - variable: $usageCategory valueJsonpath: $.Data.usageCategory From 49b259253a0a1b44436d46121daf3333bfc10671 Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov <61416590+mahammadnizam-wt-eGov@users.noreply.github.com> Date: Tue, 25 Aug 2020 16:10:45 +0530 Subject: [PATCH 0081/1242] Update property-services.yml --- configs/egov-indexer/property-services.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-indexer/property-services.yml b/configs/egov-indexer/property-services.yml index 51e394f1..05c8b4fa 100644 --- a/configs/egov-indexer/property-services.yml +++ b/configs/egov-indexer/property-services.yml @@ -87,7 +87,7 @@ ServiceMaps: moduleName: PropertyTax masterName: UsageCategory tenantId: pb - filter: "[?(@.code == '\''RESIDENTIAL'\'')]" + filter: "[?(@.code == $UsageCategory)]" filterMapping: - variable: $usageCategory valueJsonpath: $.Data.usageCategory From e837acbbb73227e947dce20d37bcaf0972ed9bb8 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 26 Aug 2020 06:52:57 +0530 Subject: [PATCH 0082/1242] TL_UlbLevelStatus_Report fix --- configs/reports/configs/tl-reports.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/tl-reports.yml b/configs/reports/configs/tl-reports.yml index caed106e..e14fab28 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -691,7 +691,7 @@ ReportDefinitions: COUNT(applicationnumber) as total, message.message as status from eg_tl_tradelicense tl - LEFT OUTER JOIN message ON split_part(message.code,'_',2) = status AND message.locale = 'en_IN' + LEFT OUTER JOIN message ON split_part(message.code,'_',2) = status AND split_part(message.code,'_',1)='TL' AND message.locale = 'en_IN' WHERE tl.tenantid=$tenantid groupby: GROUP BY message.message orderby: ORDER BY case message.message when 'Pending Application' then 1 when 'Pending Payment' then 2 when 'Pending Approval' then 3 when 'Approved' then 4 when 'Rejected' then 5 when 'Cancelled' then 6 else 7 end @@ -1908,7 +1908,7 @@ ReportDefinitions: COUNT(applicationnumber) as total, message.message as status from eg_tl_tradelicense tl - LEFT OUTER JOIN message ON split_part(message.code,'_',2) = status AND message.locale = 'en_IN' + LEFT OUTER JOIN message ON split_part(message.code,'_',2) = status AND split_part(message.code,'_',1)='TL' AND message.locale = 'en_IN' WHERE tl.tenantid=$tenantid groupby: GROUP BY message.message orderby: ORDER BY case message.message when 'Pending Application' then 1 when 'Pending Payment' then 2 when 'Pending Approval' then 3 when 'Approved' then 4 when 'Rejected' then 5 when 'Cancelled' then 6 else 7 end From eb3766bf78b621b946c104e7512ad2fbc2ed591a Mon Sep 17 00:00:00 2001 From: egovmis Date: Wed, 26 Aug 2020 10:38:17 +0530 Subject: [PATCH 0083/1242] tlapplication.json pdf --- .../format-config/tlapplication.json | 90 +++++++++---------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/configs/pdf-service/format-config/tlapplication.json b/configs/pdf-service/format-config/tlapplication.json index c0eafc3e..8190ebef 100644 --- a/configs/pdf-service/format-config/tlapplication.json +++ b/configs/pdf-service/format-config/tlapplication.json @@ -65,7 +65,7 @@ { "text":"{{Rs}} {{totalAmount}} - {{billStatus}}", "style":"receipt-table-value-total", - "fontSize": 20 + "fontSize": 15 } ], "border":[ @@ -287,7 +287,7 @@ false ], "style": "receipt-table-value-cont", - "fontSize": 11 + "fontSize": 9 }, { "text":"{{licence_type}}", @@ -372,7 +372,7 @@ false ], "style": "receipt-table-value-cont", - "fontSize": 11 + "fontSize": 9 }, { "text":"{{trade_commencement}}", @@ -457,7 +457,7 @@ false ], "style": "receipt-table-value-cont", - "fontSize": 11 + "fontSize": 9 }, { "text":" ", @@ -555,7 +555,7 @@ { "table": { "widths":["*", "*", "*", "*"], - "body": ["{{#variable13}}[{\"text\":\"{{trade_category}}\", \"border\":[ false, false, false, false ], \"style\": \"receipt-table-value-cont\" }, { \"text\":\"{{trade_type}}\", \"border\":[ false, false, false, false ], \"style\": \"receipt-table-value-cont\", \"fontSize\": 11 }, { \"text\":\"{{trade_sub_type}}\", \"border\":[ false, false, false, false ], \"style\": \"receipt-table-value-cont\" }, { \"text\":\"{{uom_measurement}}\", \"border\":[ false, false, false, false ], \"style\": \"receipt-table-value-cont\" } ], [ { \"text\":\"{{tradeCat}}\", \"border\":[ false, false, false, false ], \"style\": \"receipt-table2\" }, { \"text\":\"{{tradetyp}}\", \"border\":[ false, false, false, false ], \"style\": \"receipt-table2\" }, { \"text\":\"{{tradesub}}\", \"border\":[ false, false, false, false ], \"style\": \"receipt-table2\" }, { \"text\":\"{{UOM-measurement}}\", \"border\":[ false, false, false, false ], \"style\": \"receipt-table2\" } ], [ { \"text\":\"{{uom_value}}\", \"border\":[ false, false, false, false ], \"style\": \"receipt-table-value-cont\" }, { \"text\":\" \", \"border\":[ false, false, false, false ], \"style\": \"receipt-table-value-cont\", \"fontSize\": 11 }, { \"text\":\" \", \"border\":[ false, false, false, false ], \"style\": \"receipt-table-value-cont\" }, { \"text\":\" \", \"border\":[ false, false, false, false ], \"style\": \"receipt-table-value-cont\" } ], [ { \"text\":\"{{uomValue}}\", \"border\":[ false, false, false, false ], \"style\": \"receipt-table2\" }, { \"text\":\" \", \"border\":[ false, false, false, false ], \"style\": \"receipt-table2\" }, { \"text\":\" \", \"border\":[ false, false, false, false ], \"style\": \"receipt-table2\" }, { \"text\":\" \", \"border\":[ false, false, false, false ], \"style\": \"receipt-table2\" } ]{{/variable13}}" ] + "body": ["{{#variable13}}[{\"text\":\"{{trade_category}}\", \"border\":[ false, false, false, false ], \"style\": \"receipt-table-value-cont\" }, { \"text\":\"{{trade_type}}\", \"border\":[ false, false, false, false ], \"style\": \"receipt-table-value-cont\", \"fontSize\": 9 }, { \"text\":\"{{trade_sub_type}}\", \"border\":[ false, false, false, false ], \"style\": \"receipt-table-value-cont\" }, { \"text\":\"{{uom_measurement}}\", \"border\":[ false, false, false, false ], \"style\": \"receipt-table-value-cont\" } ], [ { \"text\":\"{{tradeCat}}\", \"border\":[ false, false, false, false ], \"style\": \"receipt-table2\" }, { \"text\":\"{{tradetyp}}\", \"border\":[ false, false, false, false ], \"style\": \"receipt-table2\" }, { \"text\":\"{{tradesub}}\", \"border\":[ false, false, false, false ], \"style\": \"receipt-table2\" }, { \"text\":\"{{UOM-measurement}}\", \"border\":[ false, false, false, false ], \"style\": \"receipt-table2\" } ], [ { \"text\":\"{{uom_value}}\", \"border\":[ false, false, false, false ], \"style\": \"receipt-table-value-cont\" }, { \"text\":\" \", \"border\":[ false, false, false, false ], \"style\": \"receipt-table-value-cont\", \"fontSize\":9 }, { \"text\":\" \", \"border\":[ false, false, false, false ], \"style\": \"receipt-table-value-cont\" }, { \"text\":\" \", \"border\":[ false, false, false, false ], \"style\": \"receipt-table-value-cont\" } ], [ { \"text\":\"{{uomValue}}\", \"border\":[ false, false, false, false ], \"style\": \"receipt-table2\" }, { \"text\":\" \", \"border\":[ false, false, false, false ], \"style\": \"receipt-table2\" }, { \"text\":\" \", \"border\":[ false, false, false, false ], \"style\": \"receipt-table2\" }, { \"text\":\" \", \"border\":[ false, false, false, false ], \"style\": \"receipt-table2\" } ]{{/variable13}}" ] }, "border":[ true, @@ -588,7 +588,7 @@ { "table": { "widths":["*", "*", "*", "*"], - "body": ["{{#variable14}}[{\"text\":\"{{accesory_type}}\", \"border\":[ false, false, false, false ], \"style\": \"receipt-table-value-cont\" },{ \"text\":\"{{uom_label}}\",\"border\":[ false, false, false, false ], \"style\": \"receipt-table-value-cont\", \"fontSize\": 11 }, { \"text\":\"{{uom_value}}\", \"border\":[ false, false, false, false ], \"style\": \"receipt-table-value-cont\" }, { \"text\":\"{{accessory_count}}\", \"border\":[ false, false, false, false ], \"style\": \"receipt-table-value-cont\" } ], [ { \"text\":\"{{accesoryType}}\", \"border\":[ false, false, false, false ], \"style\": \"receipt-table2\" }, { \"text\":\"{{uom}}\", \"border\":[ false, false, false, false ], \"style\": \"receipt-table2\" }, { \"text\":\"{{accessoryUomValue}}\", \"border\":[ false, false, false, false ], \"style\": \"receipt-table2\" }, { \"text\":\"{{accessoryCount}}\", \"border\":[ false, false, false, false ], \"style\": \"receipt-table2\" } ]{{/variable14}}" ] + "body": ["{{#variable14}}[{\"text\":\"{{accesory_type}}\", \"border\":[ false, false, false, false ], \"style\": \"receipt-table-value-cont\" },{ \"text\":\"{{uom_label}}\",\"border\":[ false, false, false, false ], \"style\": \"receipt-table-value-cont\", \"fontSize\": 9 }, { \"text\":\"{{uom_value}}\", \"border\":[ false, false, false, false ], \"style\": \"receipt-table-value-cont\" }, { \"text\":\"{{accessory_count}}\", \"border\":[ false, false, false, false ], \"style\": \"receipt-table-value-cont\" } ], [ { \"text\":\"{{accesoryType}}\", \"border\":[ false, false, false, false ], \"style\": \"receipt-table2\" }, { \"text\":\"{{uom}}\", \"border\":[ false, false, false, false ], \"style\": \"receipt-table2\" }, { \"text\":\"{{accessoryUomValue}}\", \"border\":[ false, false, false, false ], \"style\": \"receipt-table2\" }, { \"text\":\"{{accessoryCount}}\", \"border\":[ false, false, false, false ], \"style\": \"receipt-table2\" } ]{{/variable14}}" ] }, "border":[ true, @@ -647,7 +647,7 @@ false ], "style": "receipt-table-value-cont", - "fontSize": 11 + "fontSize": 9 }, { "text":"{{door_house_no}}", @@ -732,7 +732,7 @@ false ], "style": "receipt-table-value-cont", - "fontSize": 11 + "fontSize": 9 }, { "text":"{{pincode_label}}", @@ -863,7 +863,7 @@ false ], "style": "receipt-table-value-cont", - "fontSize": 11 + "fontSize": 9 }, { "text":"{{mobile_no}}", @@ -948,7 +948,7 @@ false ], "style": "receipt-table-value-cont", - "fontSize": 11 + "fontSize": 9 }, { "text":"{{gender_label}}", @@ -1033,7 +1033,7 @@ false ], "style": "receipt-table-value-cont", - "fontSize": 11 + "fontSize": 9 }, { "text":"{{correspondance_address}}", @@ -1168,7 +1168,7 @@ false ], "style": "receipt-table-value-cont", - "fontSize": 11 + "fontSize": 9 }, { "text":"{{owner_photo}}", @@ -1179,7 +1179,7 @@ false ], "style": "receipt-table-value-cont", - "fontSize": 11 + "fontSize": 9 } ], @@ -1240,25 +1240,25 @@ "noc-head": { "margin": [ -25, - -30, + -40, 0, - 1 + 0 ] }, "receipt-logo-header": { "color": "#484848", - "fontSize": 14, + "fontSize": 11, "bold": true, "letterSpacing": 0.74, "margin": [ 0, 0, 0, - 5 + 2 ] }, "noc-table": { - "fontSize": 12, + "fontSize": 9, "color": "#484848", "margin": [ -25, @@ -1268,7 +1268,7 @@ ] }, "noc-table2": { - "fontSize": 12, + "fontSize": 9, "color": "#484848", "margin": [ -25, @@ -1280,11 +1280,11 @@ "receipt-table-value": { "color": "#000000", "bold": true, - "fontSize": 12, - "fontWeight": 500, + "fontSize": 9, + "fontWeight": 350, "margin": [ - 5, - 5, + 1, + 1, 0, 0 ] @@ -1292,36 +1292,36 @@ "receipt-table-value-total": { "color": "#000000", "bold": true, - "fontSize": 12, - "fontWeight": 500, + "fontSize": 10, + "fontWeight": 350, "alignment": "right", "margin": [ 0, - 5, - 30, + 3, + 15, 0 ] }, "receipt-table-value-down": { "color": "#000000", "bold": false, - "fontSize": 12, - "fontWeight": 400, + "fontSize": 9, + "fontWeight": 350, "alignment": "left", "margin": [ - 3, - 5, + 1, + 0, 0, - 5 + 0 ] }, "receipt-table-value2": { "color": "#000000", "bold": false, - "fontSize": 12, - "fontWeight": 500, + "fontSize": 9, + "fontWeight": 350, "margin": [ - 3, + 0, 0, 0, 0 @@ -1330,10 +1330,10 @@ "receipt-table-value-cont": { "color": "#000000", "bold": false, - "fontSize": 11, - "fontWeight": 400, + "fontSize": 9, + "fontWeight": 350, "margin": [ - 3, + 0, 0, 0, 0 @@ -1342,11 +1342,11 @@ "receipt-table": { "color": "#484848", "bold": true, - "fontSize": 12, - "fontWeight": 400, + "fontSize": 9, + "fontWeight": 3500, "margin": [ - -30, - 5, + -50, + 3, 0, 0 ] @@ -1354,10 +1354,10 @@ "receipt-table2": { "color": "#000000", "bold": true, - "fontSize": 12, - "fontWeight": 500, + "fontSize": 9, + "fontWeight": 350, "margin": [ - 3, + 1, 0, 0, 0 From 232ddabc262e4682de4b0bfc66a095f209f16fac Mon Sep 17 00:00:00 2001 From: mohaarif007 <48949208+mohaarif007@users.noreply.github.com> Date: Wed, 26 Aug 2020 11:35:57 +0530 Subject: [PATCH 0084/1242] Update From and To date in V2 reports Update From and To date in V2 reports --- configs/reports/configs/uc-reports.yml | 46 +++++++++++++------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/configs/reports/configs/uc-reports.yml b/configs/reports/configs/uc-reports.yml index 7c10d5c3..7e41c01c 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -924,13 +924,13 @@ ReportDefinitions: type: epoch source: uc isMandatory: false - searchClause: AND rh.receiptdate >= $fromDate + searchClause: AND paydetail.receiptdate >= $fromDate - name: toDate label: reports.uc.toDate type: epoch source: uc isMandatory: false - searchClause: AND rh.receiptdate <= $toDate + searchClause: AND paydetail.receiptdate <= $toDate - name: ulb label: reports.uc.ulb type: singlevaluelist @@ -938,7 +938,7 @@ ReportDefinitions: source: uc wrapper: true isMandatory: false - searchClause: AND rh.tenantid = $ulb + searchClause: AND paydetail.tenantid = $ulb query: | -- Use CTE to force query plan, compute & use CTE later WITH receipt_breakup AS ( @@ -1089,13 +1089,13 @@ ReportDefinitions: type: epoch source: uc isMandatory: true - searchClause: AND rh.receiptdate >= $fromDate + searchClause: AND paydetail.receiptdate >= $fromDate - name: toDate label: reports.uc.toDate type: epoch source: uc isMandatory: true - searchClause: AND rh.receiptdate <= $toDate + searchClause: AND paydetail.receiptdate <= $toDate - name: businessservice label: reports.uc.businessservice type: singlevaluelist @@ -1103,7 +1103,7 @@ ReportDefinitions: source: uc wrapper: true isMandatory: false - searchClause: AND rh.businessdetails = $businessservice + searchClause: AND paydetail.businessservice = $businessservice - name: collectorname label: reports.uc.collectorname type: singlevaluelist @@ -1195,13 +1195,13 @@ ReportDefinitions: type: epoch source: uc isMandatory: false - searchClause: AND rh.receiptdate >= $fromDate + searchClause: AND paydetail.receiptdate >= $fromDate - name: toDate label: reports.uc.toDate type: epoch source: uc isMandatory: false - searchClause: AND rh.receiptdate <= $toDate + searchClause: AND paydetail.receiptdate <= $toDate - name: ulb label: reports.uc.ulb type: singlevaluelist @@ -1209,7 +1209,7 @@ ReportDefinitions: source: uc wrapper: true isMandatory: false - searchClause: AND rh.tenantid = $ulb + searchClause: AND paydetail.tenantid = $ulb query: | -- Use CTE to force query plan, compute & use CTE later SELECT @@ -1274,13 +1274,13 @@ ReportDefinitions: type: epoch source: uc isMandatory: false - searchClause: AND rh.receiptdate >= $fromDate + searchClause: AND paydetail.receiptdate >= $fromDate - name: toDate label: reports.uc.toDate type: epoch source: uc isMandatory: false - searchClause: AND rh.receiptdate <= $toDate + searchClause: AND paydetail.receiptdate <= $toDate - name: ulb label: reports.uc.ulb type: singlevaluelist @@ -1288,7 +1288,7 @@ ReportDefinitions: source: uc wrapper: true isMandatory: false - searchClause: AND rh.tenantid = $ulb + searchClause: AND paydetail.tenantid = $ulb query: | -- Use CTE to force query plan, compute & use CTE later SELECT @@ -1351,13 +1351,13 @@ ReportDefinitions: type: epoch source: uc isMandatory: false - searchClause: AND rh.receiptdate >= $fromDate + searchClause: AND paydetail.receiptdate >= $fromDate - name: toDate label: reports.uc.toDate type: epoch source: uc isMandatory: false - searchClause: AND rh.receiptdate <= $toDate + searchClause: AND paydetail.receiptdate <= $toDate - name: ulb label: reports.uc.ulb type: singlevaluelist @@ -1365,7 +1365,7 @@ ReportDefinitions: source: uc wrapper: true isMandatory: false - searchClause: AND rh.tenantid = $ulb + searchClause: AND paydetail.tenantid = $ulb query: | -- Use CTE to force query plan, compute & use CTE later SELECT @@ -1429,13 +1429,13 @@ ReportDefinitions: type: epoch source: uc isMandatory: false - searchClause: AND rh.receiptdate >= $fromDate + searchClause: AND paydetail.receiptdate >= $fromDate - name: toDate label: reports.uc.toDate type: epoch source: uc isMandatory: false - searchClause: AND rh.receiptdate <= $toDate + searchClause: AND paydetail.receiptdate <= $toDate query: | -- Use CTE to force query plan, compute & use CTE later SELECT @@ -1448,7 +1448,7 @@ ReportDefinitions: SUM(adjustedamount) as totalcollection from egcl_payment payment, egcl_paymentdetail as paydetail inner join egcl_billaccountdetail as billdetail on billdetail.billdetailid=paydetail.billid - WHERE payment.id=paydetail.paymentid AND payment.tenantid='pb.testing' AND paydetail.businessservice not in ('PT','TL','FIRENOC') and payment.paymentstatus != 'CANCELLED' + WHERE payment.id=paydetail.paymentid AND payment.tenantid=$tenantid AND paydetail.businessservice not in ('PT','TL','FIRENOC') and payment.paymentstatus != 'CANCELLED' groupby: GROUP BY paydetail.businessservice orderby: ORDER BY paydetail.businessservice @@ -1537,13 +1537,13 @@ ReportDefinitions: type: epoch source: uc isMandatory: false - searchClause: AND rh.receiptdate >= $fromDate + searchClause: AND paydetail.receiptdate >= $fromDate - name: toDate label: reports.uc.toDate type: epoch source: uc isMandatory: false - searchClause: AND rh.receiptdate <= $toDate + searchClause: AND paydetail.receiptdate <= $toDate - name: collectorname label: reports.uc.collectorname type: singlevaluelist @@ -1637,13 +1637,13 @@ ReportDefinitions: type: epoch source: uc isMandatory: false - searchClause: AND rh.receiptdate >= $fromDate + searchClause: AND paydetail.receiptdate >= $fromDate - name: toDate label: reports.uc.toDate type: epoch source: uc isMandatory: false - searchClause: AND rh.receiptdate <= $toDate + searchClause: AND paydetail.receiptdate <= $toDate - name: collectorname label: reports.uc.collectorname type: singlevaluelist @@ -1665,5 +1665,5 @@ ReportDefinitions: FROM egcl_payment AS payment inner join egcl_paymentdetail as paydetail on paydetail.paymentid=payment.id JOIN eg_user ON payment.createdby::INTEGER=eg_user.id - WHERE paydetail.businessservice not in ('PT','TL','FIRENOC') and payment.paymentstatus != 'CANCELLED' and payment.tenantid='pb.testing' + WHERE paydetail.businessservice not in ('PT','TL','FIRENOC') and payment.paymentstatus != 'CANCELLED' and payment.tenantid =$tenantid orderby: ORDER BY paydetail.receiptdate DESC From 4847b259df825d1ece0408521d03e79219a31ba2 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 26 Aug 2020 12:57:25 +0530 Subject: [PATCH 0085/1242] updated message mapping all TL statusReports --- configs/reports/configs/tl-reports.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/reports/configs/tl-reports.yml b/configs/reports/configs/tl-reports.yml index e14fab28..13084bcc 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -539,7 +539,7 @@ ReportDefinitions: COUNT(applicationnumber) as total, message.message as status from eg_tl_tradelicense tl - LEFT OUTER JOIN message ON split_part(message.code,'_',2) = status AND message.locale = 'en_IN' + LEFT OUTER JOIN message ON split_part(message.code,'_',2) = status AND split_part(message.code,'_',1)='TL' AND message.locale = 'en_IN' WHERE tl.tenantid LIKE $tenantid groupby: GROUP BY message.message orderby: ORDER BY case message.message when 'Pending Application' then 1 when 'Pending Payment' then 2 when 'Pending Approval' then 3 when 'Approved' then 4 when 'Rejected' then 5 when 'Cancelled' then 6 else 7 end @@ -653,7 +653,7 @@ ReportDefinitions: COUNT(applicationnumber) as total, message.message as status from eg_tl_tradelicense tl - LEFT OUTER JOIN message ON split_part(message.code,'_',2) = status AND message.locale = 'en_IN' + LEFT OUTER JOIN message ON split_part(message.code,'_',2) = status AND split_part(message.code,'_',1)='TL' AND message.locale = 'en_IN' WHERE tl.tenantid!='pb.testing' groupby: GROUP BY message.message orderby: ORDER BY case message.message when 'Pending Application' then 1 when 'Pending Payment' then 2 when 'Pending Approval' then 3 when 'Approved' then 4 when 'Rejected' then 5 when 'Cancelled' then 6 else 7 end @@ -1754,7 +1754,7 @@ ReportDefinitions: COUNT(applicationnumber) as total, message.message as status from eg_tl_tradelicense tl - LEFT OUTER JOIN message ON split_part(message.code,'_',2) = status AND message.locale = 'en_IN' + LEFT OUTER JOIN message ON split_part(message.code,'_',2) = status AND split_part(message.code,'_',1)='TL' AND message.locale = 'en_IN' WHERE tl.tenantid LIKE $tenantid groupby: GROUP BY message.message orderby: ORDER BY case message.message when 'Pending Application' then 1 when 'Pending Payment' then 2 when 'Pending Approval' then 3 when 'Approved' then 4 when 'Rejected' then 5 when 'Cancelled' then 6 else 7 end @@ -1869,7 +1869,7 @@ ReportDefinitions: COUNT(applicationnumber) as total, message.message as status from eg_tl_tradelicense tl - LEFT OUTER JOIN message ON split_part(message.code,'_',2) = status AND message.locale = 'en_IN' + LEFT OUTER JOIN message ON split_part(message.code,'_',2) = status AND split_part(message.code,'_',1)='TL' AND message.locale = 'en_IN' WHERE tl.tenantid!='pb.testing' groupby: GROUP BY message.message orderby: ORDER BY case message.message when 'Pending Application' then 1 when 'Pending Payment' then 2 when 'Pending Approval' then 3 when 'Approved' then 4 when 'Rejected' then 5 when 'Cancelled' then 6 else 7 end From 44a2b2971abad8fff292369c57693b52931b3b16 Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov <61416590+mahammadnizam-wt-eGov@users.noreply.github.com> Date: Wed, 26 Aug 2020 14:08:09 +0530 Subject: [PATCH 0086/1242] Updated mdms filter configs for usage category --- configs/egov-indexer/property-services.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/egov-indexer/property-services.yml b/configs/egov-indexer/property-services.yml index 05c8b4fa..c7421e61 100644 --- a/configs/egov-indexer/property-services.yml +++ b/configs/egov-indexer/property-services.yml @@ -87,13 +87,13 @@ ServiceMaps: moduleName: PropertyTax masterName: UsageCategory tenantId: pb - filter: "[?(@.code == $UsageCategory)]" + filter: "[?(@.code == $usageCategory)]" filterMapping: - variable: $usageCategory - valueJsonpath: $.Data.usageCategory + valueJsonpath: $.usageCategory uriResponseMapping: - inJsonPath: $.MdmsRes.PropertyTax.UsageCategory[0].name - outJsonPath: $.Data + outJsonPath: $.Data.usageCategory - topic: update-property-registry configKey: INDEX From f98c3cbfa3161556588708e7c1cf29e566bd92c4 Mon Sep 17 00:00:00 2001 From: mohaarif007 <48949208+mohaarif007@users.noreply.github.com> Date: Wed, 26 Aug 2020 16:43:17 +0530 Subject: [PATCH 0087/1242] Update From and To date in PT-V2 reports Update From and To date in PT-V2 reports --- configs/reports/configs/pt-reports.yml | 38 ++++++++++++++------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 6d85fce5..a605d19e 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2067,6 +2067,7 @@ ReportDefinitions: left outer join eg_pt_unit_v2_ot as pot on pot.propertydetail = pd.assessmentnumber where rh.tenantid =$tenantid and pd.property not in (select property from eg_pt_propertydetail_v2 where financialyear in ('2019-20')) + - reportName: ReceiptRegister_V2 summary: Receipt Register version: 1.0.0 @@ -2211,13 +2212,13 @@ ReportDefinitions: type: epoch source: pt isMandatory: true - searchClause: AND rh.receiptdate >= $fromDate + searchClause: AND pd.receiptdate >= $fromDate - name: toDate label: reports.pt.toDate type: epoch source: pt isMandatory: true - searchClause: AND rh.receiptdate <= $toDate + searchClause: AND pd.receiptdate <= $toDate - name: paymentMode label: Payment Mode type: singlevaluelist @@ -2426,13 +2427,13 @@ ReportDefinitions: type: epoch source: pt isMandatory: false - searchClause: AND rh.receiptdate >= $fromDate + searchClause: AND pd.receiptdate >= $fromDate - name: toDate label: reports.pt.toDate type: epoch source: pt isMandatory: false - searchClause: AND rh.receiptdate <= $toDate + searchClause: AND pd.receiptdate <= $toDate - name: paymentMode label: Payment Mode type: singlevaluelist @@ -2700,13 +2701,13 @@ ReportDefinitions: type: epoch source: pt isMandatory: false - searchClause: AND rh.receiptdate >= $fromDate + searchClause: AND pd.receiptdate >= $fromDate - name: toDate label: reports.pt.toDate type: epoch source: pt isMandatory: false - searchClause: AND rh.receiptdate <= $toDate + searchClause: AND pd.receiptdate <= $toDate - name: paymentMode label: Payment Mode type: singlevaluelist @@ -3023,13 +3024,13 @@ ReportDefinitions: type: epoch source: pt isMandatory: true - searchClause: AND rh.receiptdate >= $fromDate + searchClause: AND pd.receiptdate >= $fromDate - name: toDate label: reports.pt.toDate type: epoch source: pt isMandatory: true - searchClause: AND rh.receiptdate <= $toDate + searchClause: AND pd.receiptdate <= $toDate - name: paymentMode label: Payment Mode type: singlevaluelist @@ -3244,13 +3245,13 @@ ReportDefinitions: type: epoch source: pt isMandatory: true - searchClause: AND rh.receiptdate >= $fromDate + searchClause: AND payd.receiptdate >= $fromDate - name: toDate label: reports.pt.toDate type: epoch source: pt isMandatory: true - searchClause: AND rh.receiptdate <= $toDate + searchClause: AND payd.receiptdate <= $toDate - name: financialyear label: Financial Year type: singlevaluelist @@ -3454,13 +3455,13 @@ ReportDefinitions: type: epoch source: pt isMandatory: true - searchClause: AND rh.receiptdate >= $fromDate + searchClause: AND pd.receiptdate >= $fromDate - name: toDate label: reports.pt.toDate type: epoch source: pt isMandatory: true - searchClause: AND rh.receiptdate <= $toDate + searchClause: AND pd.receiptdate <= $toDate - name: paymentMode label: Payment Mode type: singlevaluelist @@ -3626,13 +3627,13 @@ ReportDefinitions: type: epoch source: pt isMandatory: true - searchClause: AND rh.receiptdate >= $fromDate + searchClause: AND pd.receiptdate >= $fromDate - name: toDate label: reports.pt.toDate type: epoch source: pt isMandatory: true - searchClause: AND rh.receiptdate <= $toDate + searchClause: AND pd.receiptdate <= $toDate - name: collectorname label: reports.pt.collectorname type: singlevaluelist @@ -3738,13 +3739,13 @@ ReportDefinitions: type: epoch source: pt isMandatory: false - searchClause: AND rh.receiptdate >= $fromDate + searchClause: AND pd.receiptdate >= $fromDate - name: toDate label: reports.pt.toDate type: epoch source: pt isMandatory: false - searchClause: AND rh.receiptdate <= $toDate + searchClause: AND pd.receiptdate <= $toDate - name: ulb label: ULB type: singlevaluelist @@ -3836,13 +3837,13 @@ ReportDefinitions: type: epoch source: pt isMandatory: false - searchClause: AND rh.receiptdate >= $fromDate + searchClause: AND pd.receiptdate >= $fromDate - name: toDate label: reports.pt.toDate type: epoch source: pt isMandatory: false - searchClause: AND rh.receiptdate <= $toDate + searchClause: AND pd.receiptdate <= $toDate - name: localityArray label: reports.pt.zoneList type: boundarylist @@ -3976,3 +3977,4 @@ ReportDefinitions: inner join eg_pt_address_v2 as pta on pta.property = pt.propertyid left outer join eg_pt_unit_v2_ot as pot on pot.propertydetail = pd.assessmentnumber where payd.tenantid = $tenantid and pd.property not in (select property from eg_pt_propertydetail_v2 where financialyear in ('2019-20')) + From 24fb549675e6edb366dec8544e003ae88e1421c4 Mon Sep 17 00:00:00 2001 From: egovmis Date: Wed, 26 Aug 2020 16:53:30 +0530 Subject: [PATCH 0088/1242] certificate and license pdf format --- .../format-config/tlcertificate.json | 28 +++--- .../format-config/tradelicense-receipt.json | 90 ++++++++++++++----- 2 files changed, 83 insertions(+), 35 deletions(-) diff --git a/configs/pdf-service/format-config/tlcertificate.json b/configs/pdf-service/format-config/tlcertificate.json index eb63e3ff..7f48f6ce 100644 --- a/configs/pdf-service/format-config/tlcertificate.json +++ b/configs/pdf-service/format-config/tlcertificate.json @@ -440,7 +440,7 @@ }, "receipt-approver": { "color": "#000000", - "fontSize": 14, + "fontSize": 12, "letterSpacing": 0.6, "alignment": "center", "margin": [ @@ -459,12 +459,12 @@ 0, 0, 0, - 5 + 1 ] }, "receipt-sub-logo-header": { "color": "#000000", - "fontSize": 18, + "fontSize": 16, "letterSpacing": 0.74, "alignment": "center", "margin": [ @@ -476,19 +476,19 @@ }, "receipt-logo-sub-header": { "color": "#484848", - "fontSize": 14, + "fontSize": 10, "letterSpacing": 0.6, "alignment": "center", "margin": [ 0, - 5, + 1, 0, 0 ] }, "receipt-sub-logo-sub-header": { "color": "#484848", - "fontSize": 14, + "fontSize": 12, "letterSpacing": 0.6, "alignment": "left", "margin": [ @@ -500,7 +500,7 @@ }, "receipt-sub-address-sub-header": { "color": "#484848", - "fontSize": 14, + "fontSize": 12, "letterSpacing": 0.1, "alignment": "right", "margin": [ @@ -512,7 +512,7 @@ }, "receipt-sub-website-sub-header": { "color": "#484848", - "fontSize": 14, + "fontSize": 12, "letterSpacing": 0.1, "alignment": "right", "margin": [ @@ -524,11 +524,11 @@ }, "receipt-sub-email-sub-header": { "color": "#484848", - "fontSize": 14, + "fontSize": 12, "letterSpacing": 0.1, "alignment": "right", "margin": [ - 50, + 20, 30, -110, 0 @@ -536,7 +536,13 @@ }, "disclaimer": { - "fontSize":"10" + "fontSize":"10", + "margin": [ + 10, + 0, + 0, + 0 + ] } } diff --git a/configs/pdf-service/format-config/tradelicense-receipt.json b/configs/pdf-service/format-config/tradelicense-receipt.json index a6c6df6e..7e98496d 100644 --- a/configs/pdf-service/format-config/tradelicense-receipt.json +++ b/configs/pdf-service/format-config/tradelicense-receipt.json @@ -34,7 +34,7 @@ "alignment": "left", "margin": [ 0, - 10, + 2, 0, 0 ] @@ -440,7 +440,7 @@ "style": "receipt-table-value" }, { - "text": "₹ 0", + "text": "{{adhocRebate}}", "border": [ false, false, @@ -460,7 +460,7 @@ "style": "receipt-table-value" }, { - "text": " ", + "text": "{{adhocRebateReason}}", "border": [ false, false, @@ -482,7 +482,7 @@ "style": "receipt-table-value" }, { - "text": "₹ ", + "text": "{{adhocPenalty}}", "border": [ false, false, @@ -502,7 +502,7 @@ "style": "receipt-table-value" }, { - "text": " ", + "text": "NA", "border": [ false, false, @@ -554,6 +554,48 @@ "style": "receipt-table" } ], + [ + { + "text": "Cheque or DD No.", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{chequeNo}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Cheque or DD Date", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{chequeDate}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], [ { "text": "{{g8_receipt_no}}.", @@ -601,10 +643,10 @@ "layout": {} }, { - "style": "noc-table", + "style": "next-noc-table", "table": { "widths":["*", "*", "*", "*"], - "body": ["{{#variable14}}[{\"text\":\"Accessory Type\", \"border\":[ false, false, false, false ], \"style\": \"receipt-table-value-cont\" },{ \"text\":\"UOM\",\"border\":[ false, false, false, false ], \"style\": \"receipt-table-value-cont\", \"fontSize\": 11 }, { \"text\":\"UOM Value\", \"border\":[ false, false, false, false ], \"style\": \"receipt-table-value-cont\" }, { \"text\":\"Count\", \"border\":[ false, false, false, false ], \"style\": \"receipt-table-value-cont\" } ], [ { \"text\":\"{{accesoryType}}\", \"border\":[ false, false, false, false ], \"style\": \"receipt-table2\" }, { \"text\":\"{{uom}}\", \"border\":[ false, false, false, false ], \"style\": \"receipt-table2\" }, { \"text\":\"{{accessoryUomValue}}\", \"border\":[ false, false, false, false ], \"style\": \"receipt-table2\" }, { \"text\":\"{{accessoryCount}}\", \"border\":[ false, false, false, false ], \"style\": \"receipt-table2\" } ]{{/variable14}}" ] + "body": ["{{#variable14}}[{\"text\":\"Accessory Type\", \"border\":[ true, true, false, false ], \"style\": \"receipt-table-value\" },{ \"text\":\"UOM\",\"border\":[ false, true, false, false ], \"style\": \"receipt-table-value\", \"fontSize\": 11 }, { \"text\":\"UOM Value\", \"border\":[ false, true, false, false ], \"style\": \"receipt-table-value\" }, { \"text\":\"Count\", \"border\":[ false, true, true, false ], \"style\": \"receipt-table-value\" } ], [ { \"text\":\"{{accesoryType}}\", \"border\":[ true, false, false, true ], \"style\": \"receipt-table\" }, { \"text\":\"{{uom}}\", \"border\":[ false, false, false, true ], \"style\": \"receipt-table\" }, { \"text\":\"{{accessoryUomValue}}\", \"border\":[ false, false, false, true ], \"style\": \"receipt-table\" }, { \"text\":\"{{accessoryCount}}\", \"border\":[ false, false, true, true ], \"style\": \"receipt-table\" } ]{{/variable14}}" ] }, "border":[ true, @@ -632,14 +674,14 @@ { "text": [ { - "text": "{{commissioner/eo}}", + "text": "Authorised Signatory", "bold": true } ], "alignment": "right", "margin": [ 0, - 0, + 4, -10, 1 ] @@ -712,7 +754,7 @@ "color": "#000000", "margin": [ -25, - 45, + 25, -22, -8 ] @@ -722,7 +764,7 @@ "color": "#000000", "margin": [ -25, - 28, + 15, -22, -8 ] @@ -733,10 +775,10 @@ "fontSize": 12, "fontWeight": 500, "margin": [ - 8, - 8, + 2, + 2, 0, - 8 + 2 ] }, "receipt-table": { @@ -746,9 +788,9 @@ "fontWeight": 400, "margin": [ -10, - 8, + 2, 0, - 8 + 2 ] }, "receipt-approver": { @@ -756,37 +798,37 @@ "bold": true, "margin": [ -27, - 50, + 40, -10, 0 ], "color": "#484848" }, "no-signature": { - "fontSize": 12, + "fontSize": 10, "margin": [ -27, - 35, + 5, -10, 0 ], "color": "#484848" }, "pt-disclaimer": { - "fontSize": 12, + "fontSize": 10, "margin": [ -27, - 30, + 5, -10, 0 ], "color": "#484848" }, "pt-disclaimer-value": { - "fontSize": 12, + "fontSize": 10, "margin": [ - 2, - 5, + 0, + 1, 0, 0 ], From ac36cd8d907cc75a546061c9c8c9c2b275b7465a Mon Sep 17 00:00:00 2001 From: gurpreetsinghkhanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 26 Aug 2020 17:52:38 +0530 Subject: [PATCH 0089/1242] digit v2 property-receipt pdf update --- .../data-config/property-receipt.json | 92 +++++++++- .../format-config/property-receipt.json | 167 ++++++++---------- 2 files changed, 161 insertions(+), 98 deletions(-) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index d2590140..a5c040e0 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -70,12 +70,20 @@ "type": "date" }, { - "variable": "assessmentYear", + "variable": "assessmentYear1", "value": { "path": "$.paymentDetails[0].bill.billDetails[0].fromPeriod" }, "type": "date", - "format": "YYYY " + "format": "YYYY" + }, + { + "variable": "assessmentYear2", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].toPeriod" + }, + "type": "date", + "format": "YYYY" }, { "variable": "paymentMode", @@ -444,7 +452,7 @@ { "externalAPI": [ { - "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "path": "http://localhost:8069/egov-mdms-service/v1/_get", "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", "apiRequest": null, "responseMapping":[ @@ -481,8 +489,8 @@ ] }, { - "path": "http://property-services.egov:8080/property-services/property/_search", - "queryParam": "propertyIds=PT-1012-877972,tenantId=pb.testing", + "path": "http://localhost:8075/property-services/property/_search", + "queryParam": "propertyIds=$.paymentDetails[0].bill.consumerCode,tenantId=$.tenantId", "apiRequest": null, "responseMapping":[ { @@ -511,12 +519,80 @@ }, { "variable":"propertyType", - "value":"$.Properties[0].propertyType" - } + "value":"$.Properties[0].propertyType", + "localisation": { + "required": true, + "prefix": "WS_PROPTYPE", + "module": "rainmaker-ws" + } + }, + { + "variable": "var_owners", + "value":"$.Properties[0].owners.*", + "type":"array", + "format":{ + "type":"string", + "scema":[ + { + "variable":"name2", + "value":"name" + }, + { + "variable":"fatherOrHusbandName2", + "value":"fatherOrHusbandName" + }] + } + }, + { + "variable": "var_floors", + "value":"$.Properties[0].units.*", + "type":"array", + "format":{ + "type":"string", + "scema":[ + { + "variable":"floor_no", + "value":"floorNo", + "localisation": { + "required": true, + "prefix": "PROPERTYTAX_FLOOR", + "module": "rainmaker-pt" + } + }, + { + "variable":"usage_category", + "value":"usageCategory", + "localisation": { + "required": true, + "prefix": "COMMON_PROPSUBUSGTYPE", + "module": "rainmaker-pt" + } + }, + { + "variable":"occupancy_type", + "value":"occupancyType" + }, + { + "variable":"builtup_area", + "value":"constructionDetail.builtUpArea" + }, + { + "variable":"arv_rent", + "value":"arv" + }, + { + "variable":"additional_details", + "value":"additionalDetails" + } + ] + } + } + + ] }, { - "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "path": "http://localhost:8069/egov-mdms-service/v1/_get", "queryParam": "moduleName=tenant&masterName=footer&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}' %26%26 @.service=='{$.paymentDetails[0].businessService}')%5D", "apiRequest": null, "responseMapping":[ diff --git a/configs/pdf-service/format-config/property-receipt.json b/configs/pdf-service/format-config/property-receipt.json index 09ab7a55..23bf9ea7 100644 --- a/configs/pdf-service/format-config/property-receipt.json +++ b/configs/pdf-service/format-config/property-receipt.json @@ -34,7 +34,7 @@ "alignment": "left", "margin": [ 0, - 10, + 4, 0, 0 ] @@ -272,7 +272,7 @@ "style": "receipt-table-value" }, { - "text": "{{assessmentYear}}", + "text": "{{assessmentYear1}}-{{assessmentYear2}}", "border": [ false, false, @@ -292,7 +292,7 @@ "style": "receipt-table-value" }, { - "text": "To-Fetch", + "text": " ", "border": [ false, false, @@ -671,67 +671,58 @@ ] }, "layout":{} - }, + }, + { + "style": "next-noc-table", + "table": { + "widths": [ + "*", + "*", + "*", + "*" + ], + "body": ["{{#var_owners}}[{\"text\":\"Owner Name\",\"border\":[true,true,false,true],\"style\":\"receipt-table-key\"},{\"text\":\"{{name2}}\",\"border\":[false,true,true,true]},{\"text\":\"Father's Name\",\"border\":[true,true,false,true],\"style\":\"receipt-table-key\"},{\"text\":\"{{fatherOrHusbandName2}}\",\"border\":[false,true,true,true]}]{{/var_owners}}"] + }, + "layout": {} + }, { "style": "next-noc-table", "table": { "widths": [ - "20%", - "20%", - "20%", - "20%", - "20%" + "*", + "*", + "*", + "*" ], - "body": [ - [ - { - "text": "Floor", - "style": "receipt-table-value" - }, - { - "text": "Usage Type", - "style": "receipt-table-value" - }, - { - "text": "Sub Usage Type", - "style": "receipt-table-value" - }, - { - "text": "Occupancy", - "style": "receipt-table-value" - }, - { - "text": "Built Area (Sq. Yard) / Total Annual Rent", - "style": "receipt-table-value" - } - ], + "body": [ - { - "text": "To-Fetch", - "style": "receipt-table" - }, - { - "text": "To-Fetch", - "style": "receipt-table" - }, - { - "text": "To-Fetch", - "style": "receipt-table" - }, - { - "text": "To-Fetch", - "style": "receipt-table" - }, - { - "text": "To-Fetch", - "style": "receipt-table" - } - ] - ] + [ + { + "text": "Floor", + "style": "receipt-table-value" + }, + { + "text": "Usage", + "style": "receipt-table-value" + }, + { + "text": "Occupancy", + "style": "receipt-table-value" + }, + { + "text": "Built Area (Sq. Yard) / Total Annual Rent", + "style": "receipt-table-value" + } + ], + "{{#var_floors}}[{\"text\":\"{{floor_no}}\",\"style\":\"receipt-table\"},{\"text\":\"{{usage_category}}\",\"style\":\"receipt-table\"},{\"text\":\"{{occupancy_type}}\",\"style\":\"receipt-table\"},{\"text\":\"{{builtup_area}}/{{arv_rent}}\",\"style\":\"receipt-table\"}]{{/var_floors}}" + ] + + }, "layout": {} }, - { + + { "text": "Assessee Signature", "style": "receipt-approver" } @@ -777,20 +768,7 @@ "bold": true, "style": "pt-disclaimer-value" }, - { - "style": "pt-disclaimer-value", - "table": { - "widths": [ - "120%", - "*", - "*", - "*" - ], - "body": ["{{#variable11}}[{\"text\":\"{{disclaimerContent}}\",\"border\":[false,false,false,false],\"style\":\"pt-disclaimer-value\"}]{{/variable11}}"] - }, - "layout": {} - }, - { + { "ol": [ "Payment received by cheque/demand draft shall be subject to realization", "This document is not a proof of property ownership and regularization of unauthorised construction", @@ -809,39 +787,48 @@ 1 ] }, + "pt-reciept-citizen-table": { + "fontSize": 8, + "color": "#484848" + }, + "receipt-assess-table-header": { + "bold": true, + "fillColor": "#D8D8D8", + "color": "#484848" + }, "receipt-logo-header": { "color": "#000000", - "fontSize": 14, + "fontSize": 10, "bold": true, "letterSpacing": 0.74, "margin": [ 0, 0, 0, - 5 + 3 ] }, "receipt-logo-sub-header": { "color": "#000000", - "fontSize": 12, + "fontSize": 10, "letterSpacing": 0.6 }, "noc-table": { - "fontSize": 10, + "fontSize": 8, "color": "#000000", "margin": [ -25, - 45, + 15, -22, -8 ] }, "next-noc-table": { - "fontSize": 10, + "fontSize": 8, "color": "#000000", "margin": [ -25, - 28, + 18, -22, -8 ] @@ -849,63 +836,63 @@ "receipt-table-value": { "color": "#000000", "bold": true, - "fontSize": 10, + "fontSize": 8, "fontWeight": 500, "margin": [ 8, - 8, + 4, 0, - 8 + 4 ] }, "receipt-table": { "color": "#000000", "bold": false, - "fontSize": 10, + "fontSize": 8, "fontWeight": 400, "margin": [ 0, - 8, + 4, 0, - 8 + 4 ] }, "receipt-approver": { - "fontSize": 10, + "fontSize": 8, "bold": true, "margin": [ -27, - 50, + 20, -10, 0 ], "color": "#484848" }, "no-signature": { - "fontSize": 10, + "fontSize": 8, "margin": [ -27, - 35, + 20, -10, 0 ], "color": "#484848" }, "pt-disclaimer": { - "fontSize": 10, + "fontSize": 8, "margin": [ -27, - 30, + 20, -10, 0 ], "color": "#484848" }, "pt-disclaimer-value": { - "fontSize": 10, + "fontSize": 8, "margin": [ 2, - 5, + 3, 0, 0 ], From b15d11e547a7bcaa9a26f5f19e30e297748f2f2a Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 26 Aug 2020 18:00:07 +0530 Subject: [PATCH 0090/1242] host updated --- configs/pdf-service/data-config/property-receipt.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index a5c040e0..bfb28ea2 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -452,7 +452,7 @@ { "externalAPI": [ { - "path": "http://localhost:8069/egov-mdms-service/v1/_get", + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", "apiRequest": null, "responseMapping":[ @@ -489,7 +489,7 @@ ] }, { - "path": "http://localhost:8075/property-services/property/_search", + "path": "http://property-services.egov:8080/property-services/property/_search", "queryParam": "propertyIds=$.paymentDetails[0].bill.consumerCode,tenantId=$.tenantId", "apiRequest": null, "responseMapping":[ @@ -592,7 +592,7 @@ ] }, { - "path": "http://localhost:8069/egov-mdms-service/v1/_get", + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", "queryParam": "moduleName=tenant&masterName=footer&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}' %26%26 @.service=='{$.paymentDetails[0].businessService}')%5D", "apiRequest": null, "responseMapping":[ From b5e242553cdce8690532e4c38f035d2ea5e8310f Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov <61416590+mahammadnizam-wt-eGov@users.noreply.github.com> Date: Wed, 26 Aug 2020 18:48:14 +0530 Subject: [PATCH 0091/1242] Added usage category mdms filter for all the property service topics --- configs/egov-indexer/property-services.yml | 32 ++++++++++++++++++---- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/configs/egov-indexer/property-services.yml b/configs/egov-indexer/property-services.yml index c7421e61..d679c3c9 100644 --- a/configs/egov-indexer/property-services.yml +++ b/configs/egov-indexer/property-services.yml @@ -176,6 +176,17 @@ ServiceMaps: uriResponseMapping: - inJsonPath: $.MdmsRes.tenant.tenants outJsonPath: $.Data.tenantData + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: PropertyTax + masterName: UsageCategory + tenantId: pb + filter: "[?(@.code == $usageCategory)]" + filterMapping: + - variable: $usageCategory + valueJsonpath: $.usageCategory + uriResponseMapping: + - inJsonPath: $.MdmsRes.PropertyTax.UsageCategory[0].name + outJsonPath: $.Data.usageCategory - topic: cancel-property-registry configKey: INDEX @@ -257,7 +268,18 @@ ServiceMaps: valueJsonpath: $.tenantId uriResponseMapping: - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.Data.tenantData + outJsonPath: $.Data.tenantData + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: PropertyTax + masterName: UsageCategory + tenantId: pb + filter: "[?(@.code == $usageCategory)]" + filterMapping: + - variable: $usageCategory + valueJsonpath: $.usageCategory + uriResponseMapping: + - inJsonPath: $.MdmsRes.PropertyTax.UsageCategory[0].name + outJsonPath: $.Data.usageCategory - topic: property-registry-legacyIndex configKey: LEGACYINDEX @@ -347,11 +369,11 @@ ServiceMaps: tenantId: pb filter: "[?(@.code == $usageCategory)]" filterMapping: - - variable: $name - valueJsonpath: $.UsageCategory + - variable: $usageCategory + valueJsonpath: $.usageCategory uriResponseMapping: - - inJsonPath: $.MdmsRes.PropertyTax.UsageCategory - outJsonPath: $.Data.usageCategory + - inJsonPath: $.MdmsRes.PropertyTax.UsageCategory[0].name + outJsonPath: $.Data.usageCategory - topic: save-pt-assessment configKey: INDEX From 9b757fbc7611c4fc8e20c72029e4f66fe77a380a Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov <61416590+mahammadnizam-wt-eGov@users.noreply.github.com> Date: Wed, 26 Aug 2020 20:26:55 +0530 Subject: [PATCH 0092/1242] Added usageCategory in the pt transform for dss --- .../egov-dss-dashboards/dashboard-ingest/transform_pt_v1.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-ingest/transform_pt_v1.json b/configs/egov-dss-dashboards/dashboard-ingest/transform_pt_v1.json index 451034b7..b7a169b6 100644 --- a/configs/egov-dss-dashboards/dashboard-ingest/transform_pt_v1.json +++ b/configs/egov-dss-dashboards/dashboard-ingest/transform_pt_v1.json @@ -6,7 +6,8 @@ "propertyId": "propertyId", "propertyDetails": "propertyDetails", "ward" : "ward", - "units": "units" + "units": "units", + "usageCategory": "usageCategory" } } ] From 69ec7db864327484fc4737005bf4e4fbc46371c7 Mon Sep 17 00:00:00 2001 From: gurpreetsinghkhanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 27 Aug 2020 10:16:38 +0530 Subject: [PATCH 0093/1242] pdf consolidated receipt update --- .../data-config/consolidatedreceipt.json | 9 +++- .../format-config/consolidatedreceipt.json | 45 ++++++++----------- 2 files changed, 26 insertions(+), 28 deletions(-) diff --git a/configs/pdf-service/data-config/consolidatedreceipt.json b/configs/pdf-service/data-config/consolidatedreceipt.json index c515d679..0b8d3e62 100644 --- a/configs/pdf-service/data-config/consolidatedreceipt.json +++ b/configs/pdf-service/data-config/consolidatedreceipt.json @@ -23,7 +23,12 @@ "variable": "PaidBy", "value": { "path": "$.paidBy" - } + }, + "localisation":{ + "required":true, + "prefix":null, + "module":"rainmaker-common" + } }, { "variable": "chequeDD", @@ -468,7 +473,7 @@ { "externalAPI": [ { - "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "path": "http://localhost:8069/egov-mdms-service/v1/_get", "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", "apiRequest": null, "responseMapping":[ diff --git a/configs/pdf-service/format-config/consolidatedreceipt.json b/configs/pdf-service/format-config/consolidatedreceipt.json index 90467bcd..02600b30 100644 --- a/configs/pdf-service/format-config/consolidatedreceipt.json +++ b/configs/pdf-service/format-config/consolidatedreceipt.json @@ -206,7 +206,7 @@ ], [ { - "text": "Address: ", + "text": "{{payer_contact}}", "border": [ true, false, @@ -216,7 +216,7 @@ "style": "receipt-table-value" }, { - "text": "{{payerAddress}}", + "text": "{{payerContact}}", "border": [ false, false, @@ -248,22 +248,22 @@ ], [ { - "text": "{{payer_contact}}", + "text": "Address: ", "border": [ true, false, false, - true + false ], "style": "receipt-table-value" }, { - "text": "{{payerContact}}", + "text": "{{payerAddress}}", "border": [ false, false, false, - true + false ], "style": "receipt-table" }, @@ -273,9 +273,9 @@ false, false, false, - true + false ], - "style": "receipt-table-value" + "style": "receipt-table" }, { "text" : " ", @@ -283,7 +283,7 @@ false, false, true, - true + false ], "style": "receipt-table" } @@ -534,10 +534,6 @@ } ] }, - { - "style": "no-signature", - "text": "{{no_signature}}" - }, { "style": "pt-disclaimer", "stack": [ @@ -769,7 +765,7 @@ ], [ { - "text": "Address: ", + "text": "{{payer_contact}}", "border": [ true, false, @@ -779,7 +775,7 @@ "style": "receipt-table-value" }, { - "text": "{{payerAddress}}", + "text": "{{payerContact}}", "border": [ false, false, @@ -788,6 +784,7 @@ ], "style": "receipt-table" }, + { "text": "Paid By: ", "border": [ @@ -811,22 +808,22 @@ ], [ { - "text": "{{payer_contact}}", + "text": "Address: ", "border": [ true, false, false, - true + false ], "style": "receipt-table-value" }, { - "text": "{{payerContact}}", + "text": "{{payerAddress}}", "border": [ false, false, false, - true + false ], "style": "receipt-table" }, @@ -836,9 +833,9 @@ false, false, false, - true + false ], - "style": "receipt-table-value" + "style": "receipt-table" }, { "text" : " ", @@ -846,7 +843,7 @@ false, false, true, - true + false ], "style": "receipt-table" } @@ -1097,10 +1094,6 @@ } ] }, - { - "style": "no-signature", - "text": "{{no_signature}}" - }, { "style": "pt-disclaimer", "stack": [ From 76d1cd26a4b99e41f9f8a3318bf1dfd73a148f47 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 27 Aug 2020 10:19:21 +0530 Subject: [PATCH 0094/1242] Update consolidatedreceipt.json --- configs/pdf-service/data-config/consolidatedreceipt.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/pdf-service/data-config/consolidatedreceipt.json b/configs/pdf-service/data-config/consolidatedreceipt.json index 0b8d3e62..5b4ebc0d 100644 --- a/configs/pdf-service/data-config/consolidatedreceipt.json +++ b/configs/pdf-service/data-config/consolidatedreceipt.json @@ -473,7 +473,7 @@ { "externalAPI": [ { - "path": "http://localhost:8069/egov-mdms-service/v1/_get", + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", "apiRequest": null, "responseMapping":[ From a42f7152362882b89e3c4c1324abc8868ea22eaa Mon Sep 17 00:00:00 2001 From: egovmis Date: Thu, 27 Aug 2020 11:47:40 +0530 Subject: [PATCH 0095/1242] trade license receipt pdf --- .../format-config/tradelicense-receipt.json | 48 ++++++++++++++----- 1 file changed, 35 insertions(+), 13 deletions(-) diff --git a/configs/pdf-service/format-config/tradelicense-receipt.json b/configs/pdf-service/format-config/tradelicense-receipt.json index 7e98496d..2288bd82 100644 --- a/configs/pdf-service/format-config/tradelicense-receipt.json +++ b/configs/pdf-service/format-config/tradelicense-receipt.json @@ -440,7 +440,7 @@ "style": "receipt-table-value" }, { - "text": "{{adhocRebate}}", + "text": "₹ {{adhocRebate}}", "border": [ false, false, @@ -482,7 +482,7 @@ "style": "receipt-table-value" }, { - "text": "{{adhocPenalty}}", + "text": "₹ {{adhocPenalty}}", "border": [ false, false, @@ -502,7 +502,7 @@ "style": "receipt-table-value" }, { - "text": "NA", + "text": "{{adhocPenaltyReason}}", "border": [ false, false, @@ -645,15 +645,37 @@ { "style": "next-noc-table", "table": { - "widths":["*", "*", "*", "*"], - "body": ["{{#variable14}}[{\"text\":\"Accessory Type\", \"border\":[ true, true, false, false ], \"style\": \"receipt-table-value\" },{ \"text\":\"UOM\",\"border\":[ false, true, false, false ], \"style\": \"receipt-table-value\", \"fontSize\": 11 }, { \"text\":\"UOM Value\", \"border\":[ false, true, false, false ], \"style\": \"receipt-table-value\" }, { \"text\":\"Count\", \"border\":[ false, true, true, false ], \"style\": \"receipt-table-value\" } ], [ { \"text\":\"{{accesoryType}}\", \"border\":[ true, false, false, true ], \"style\": \"receipt-table\" }, { \"text\":\"{{uom}}\", \"border\":[ false, false, false, true ], \"style\": \"receipt-table\" }, { \"text\":\"{{accessoryUomValue}}\", \"border\":[ false, false, false, true ], \"style\": \"receipt-table\" }, { \"text\":\"{{accessoryCount}}\", \"border\":[ false, false, true, true ], \"style\": \"receipt-table\" } ]{{/variable14}}" ] - }, - "border":[ - true, - false, - true, - false - ] + "widths": [ + "*", + "*", + "*", + "*" + ], + "body": + [ + [ + { + "text": "Accessory Type", + "style": "receipt-table-value" + }, + { + "text": "UOM", + "style": "receipt-table-value" + }, + { + "text": "UOM Value", + "style": "receipt-table-value" + }, + { + "text": "Count", + "style": "receipt-table-value" + } + ], + "{{#variable_acc}}[{ \"text\":\"{{accesoryType}}\", \"border\":[ true, false, true, true ], \"style\": \"receipt-table\" }, { \"text\":\"{{uom}}\", \"border\":[ false, false, true, true ], \"style\": \"receipt-table\" }, { \"text\":\"{{accessoryUomValue}}\", \"border\":[ false, false, true, true ], \"style\": \"receipt-table\" }, { \"text\":\"{{accessoryCount}}\", \"border\":[ false, false, true, true ], \"style\": \"receipt-table\"}]{{/variable_acc}}" + ] + }, "layout": {} + + }, { "style": "receipt-approver", @@ -787,7 +809,7 @@ "fontSize": 12, "fontWeight": 400, "margin": [ - -10, + 0, 2, 0, 2 From 72ceff195943deade3fd3dba6f6406530340dbc8 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Thu, 27 Aug 2020 11:53:45 +0530 Subject: [PATCH 0096/1242] Update tradelicense-receipt.json --- .../data-config/tradelicense-receipt.json | 37 ++++++++++++++++++- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/configs/pdf-service/data-config/tradelicense-receipt.json b/configs/pdf-service/data-config/tradelicense-receipt.json index 91797a38..04c68c6b 100644 --- a/configs/pdf-service/data-config/tradelicense-receipt.json +++ b/configs/pdf-service/data-config/tradelicense-receipt.json @@ -48,6 +48,18 @@ "module":"rainmaker-common" } }, + { + "variable": "adhocRebate", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'TL_ADHOC_REBATE')].amount" + } + }, + { + "variable": "adhocPenalty", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'TL_ADHOC_PENALTY')].amount" + } + }, { "variable": "paidAmount", "value": { @@ -67,6 +79,19 @@ "path": "$.paymentDetails[0].bill.billDetails[0].toPeriod" }, "type": "date" + }, + { + "variable": "chequeNo", + "value": { + "path": "$.instrumentNumber" + } + }, + { + "variable": "chequeDate", + "value": { + "path": "$.instrumentDate" + }, + "type": "date" }, { "variable": "paymentMode", @@ -456,6 +481,14 @@ { "variable":"tradeName", "value":"$.Licenses[0].tradeName" + }, + { + "variable":"adhocRebateReason", + "value":"$.Licenses[0].tradeLicenseDetail.adhocExemptionReason" + }, + { + "variable":"adhocPenaltyReason", + "value":"$.Licenses[0].tradeLicenseDetail.adhocPenaltyReason" }, { "variable": "tradeType", @@ -468,7 +501,7 @@ } }, { - "variable": "variable14", + "variable": "variable_acc", "value": "$.Licenses[0].tradeLicenseDetail.accessories.*", "type":"array", "format":{ @@ -510,4 +543,4 @@ } ] } -} \ No newline at end of file +} From 39152c199f55e825c622abd5c3bc316dc947221b Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Thu, 27 Aug 2020 12:37:05 +0530 Subject: [PATCH 0097/1242] pdf update_v2_tlcertificate.json --- configs/pdf-service/data-config/tlcertificate.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/pdf-service/data-config/tlcertificate.json b/configs/pdf-service/data-config/tlcertificate.json index e4d5bf1e..04864a0b 100644 --- a/configs/pdf-service/data-config/tlcertificate.json +++ b/configs/pdf-service/data-config/tlcertificate.json @@ -87,7 +87,7 @@ }, "localisation":{ "required":true, - "prefix": "TL", + "prefix": "TRADELICENSE_ACCESSORIESCATEGORY", "module": "rainmaker-tl" } }, From ce7e32a410bda5a4c3b34cd140f99e216d92aa52 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Thu, 27 Aug 2020 13:03:49 +0530 Subject: [PATCH 0098/1242] Update tlapplication.json --- configs/pdf-service/data-config/tlapplication.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/pdf-service/data-config/tlapplication.json b/configs/pdf-service/data-config/tlapplication.json index 48956046..58ec1825 100644 --- a/configs/pdf-service/data-config/tlapplication.json +++ b/configs/pdf-service/data-config/tlapplication.json @@ -20,7 +20,7 @@ { "variable": "applicationType", "value": { - "path": "$.tradeLicenseDetail.additionalDetail.applicationType" + "path": "$.applicationType" }, "localisation":{ "required":true, From c90c99f3e16a6ad33dbaf6008fe43f245dc62b6e Mon Sep 17 00:00:00 2001 From: egovmis Date: Thu, 27 Aug 2020 13:44:17 +0530 Subject: [PATCH 0099/1242] tlcpplication_pdf_v2 --- .../format-config/tlapplication.json | 147 ++++++++++-------- 1 file changed, 86 insertions(+), 61 deletions(-) diff --git a/configs/pdf-service/format-config/tlapplication.json b/configs/pdf-service/format-config/tlapplication.json index 8190ebef..859667a1 100644 --- a/configs/pdf-service/format-config/tlapplication.json +++ b/configs/pdf-service/format-config/tlapplication.json @@ -63,7 +63,7 @@ "bold" : false }, { - "text":"{{Rs}} {{totalAmount}} - {{billStatus}}", + "text":"{{Rs}} {{totalAmount}}", "style":"receipt-table-value-total", "fontSize": 15 } @@ -553,9 +553,39 @@ ], [ { - "table": { - "widths":["*", "*", "*", "*"], - "body": ["{{#variable13}}[{\"text\":\"{{trade_category}}\", \"border\":[ false, false, false, false ], \"style\": \"receipt-table-value-cont\" }, { \"text\":\"{{trade_type}}\", \"border\":[ false, false, false, false ], \"style\": \"receipt-table-value-cont\", \"fontSize\": 9 }, { \"text\":\"{{trade_sub_type}}\", \"border\":[ false, false, false, false ], \"style\": \"receipt-table-value-cont\" }, { \"text\":\"{{uom_measurement}}\", \"border\":[ false, false, false, false ], \"style\": \"receipt-table-value-cont\" } ], [ { \"text\":\"{{tradeCat}}\", \"border\":[ false, false, false, false ], \"style\": \"receipt-table2\" }, { \"text\":\"{{tradetyp}}\", \"border\":[ false, false, false, false ], \"style\": \"receipt-table2\" }, { \"text\":\"{{tradesub}}\", \"border\":[ false, false, false, false ], \"style\": \"receipt-table2\" }, { \"text\":\"{{UOM-measurement}}\", \"border\":[ false, false, false, false ], \"style\": \"receipt-table2\" } ], [ { \"text\":\"{{uom_value}}\", \"border\":[ false, false, false, false ], \"style\": \"receipt-table-value-cont\" }, { \"text\":\" \", \"border\":[ false, false, false, false ], \"style\": \"receipt-table-value-cont\", \"fontSize\":9 }, { \"text\":\" \", \"border\":[ false, false, false, false ], \"style\": \"receipt-table-value-cont\" }, { \"text\":\" \", \"border\":[ false, false, false, false ], \"style\": \"receipt-table-value-cont\" } ], [ { \"text\":\"{{uomValue}}\", \"border\":[ false, false, false, false ], \"style\": \"receipt-table2\" }, { \"text\":\" \", \"border\":[ false, false, false, false ], \"style\": \"receipt-table2\" }, { \"text\":\" \", \"border\":[ false, false, false, false ], \"style\": \"receipt-table2\" }, { \"text\":\" \", \"border\":[ false, false, false, false ], \"style\": \"receipt-table2\" } ]{{/variable13}}" ] + "table": { + "widths": [ + "*", + "*", + "*", + "*", + "*" + ], + "body": + [ + [ + { + "text": "{{trade_category}}", + "style": "receipt-table-value" + }, + { + "text": "{{trade_type}}", + "style": "receipt-table-value" + }, + { + "text": "{{trade_sub_type}}", + "style": "receipt-table-value" + }, + { + "text": "{{uom_measurement}}", + "style": "receipt-table-value" + }, + { + "text": "{{uom_value}}", + "style": "receipt-table-value-cont" + } + ], + "{{#variable13}}[ { \"text\":\"{{tradeCat}}\", \"border\":[ true, false, true, true ], \"style\": \"receipt-table2\" }, { \"text\":\"{{tradetyp}}\", \"border\":[ false, false, true, true ], \"style\": \"receipt-table2\" }, { \"text\":\"{{tradesub}}\", \"border\":[ false, false, true,true ], \"style\": \"receipt-table2\" }, { \"text\":\"{{UOM-measurement}}\", \"border\":[ false, false, true, true ], \"style\": \"receipt-table2\" } ,{ \"text\":\"{{uomValue}}\", \"border\":[ false, false, true,true ], \"style\": \"receipt-table2\" }]{{/variable13}}" ] }, "border":[ true, @@ -566,57 +596,42 @@ } ], + [ { - "canvas": [ - { - "type": "line", - "x1": 5, "y1": 0, - "x2": 550, "y2": 0, - "lineWidth": 1 - } - ], - "border":[ - true, - false, - true, - false - ] - } - ], - [ - { - "table": { - "widths":["*", "*", "*", "*"], - "body": ["{{#variable14}}[{\"text\":\"{{accesory_type}}\", \"border\":[ false, false, false, false ], \"style\": \"receipt-table-value-cont\" },{ \"text\":\"{{uom_label}}\",\"border\":[ false, false, false, false ], \"style\": \"receipt-table-value-cont\", \"fontSize\": 9 }, { \"text\":\"{{uom_value}}\", \"border\":[ false, false, false, false ], \"style\": \"receipt-table-value-cont\" }, { \"text\":\"{{accessory_count}}\", \"border\":[ false, false, false, false ], \"style\": \"receipt-table-value-cont\" } ], [ { \"text\":\"{{accesoryType}}\", \"border\":[ false, false, false, false ], \"style\": \"receipt-table2\" }, { \"text\":\"{{uom}}\", \"border\":[ false, false, false, false ], \"style\": \"receipt-table2\" }, { \"text\":\"{{accessoryUomValue}}\", \"border\":[ false, false, false, false ], \"style\": \"receipt-table2\" }, { \"text\":\"{{accessoryCount}}\", \"border\":[ false, false, false, false ], \"style\": \"receipt-table2\" } ]{{/variable14}}" ] - }, - "border":[ - true, - false, - true, - false - ] - } + "table": { + "widths": [ + "*", + "*", + "*", + "*" + ], + "body": + [ + [ + { + "text": "{{accesory_type}}", + "style": "receipt-table-value" + }, + { + "text": "{{uom_label}}", + "style": "receipt-table-value" + }, + { + "text": "{{uom_value}}", + "style": "receipt-table-value" + }, + { + "text": "{{accessory_count}}", + "style": "receipt-table-value" + } + ], + "{{#variable14}}[ { \"text\":\"{{accesoryType}}\", \"border\":[ true, false, true,true ], \"style\": \"receipt-table2\" }, { \"text\":\"{{uom}}\", \"border\":[ false, false, true, true], \"style\": \"receipt-table2\" }, { \"text\":\"{{accessoryUomValue}}\", \"border\":[ false, false,true, true], \"style\": \"receipt-table2\" }, { \"text\":\"{{accessoryCount}}\", \"border\":[ false, false, true,true ], \"style\": \"receipt-table2\" } ]{{/variable14}}" ] + } + } ], - [ - { - "canvas": [ - { - "type": "line", - "x1": 5, "y1": 0, - "x2": 550, "y2": 0, - "lineWidth": 1 - } - ], - "border":[ - true, - false, - true, - false - ] - } - ], + [ { "table": { @@ -1272,7 +1287,7 @@ "color": "#484848", "margin": [ -25, - 18, + 8, -25, -8 ] @@ -1297,7 +1312,7 @@ "alignment": "right", "margin": [ 0, - 3, + 0, 15, 0 ] @@ -1306,20 +1321,30 @@ "color": "#000000", "bold": false, "fontSize": 9, - "fontWeight": 350, + "fontWeight": 250, "alignment": "left", "margin": [ - 1, + 0, 0, 0, 0 ] }, + "next-noc-table": { + "fontSize": 12, + "color": "#000000", + "margin": [ + -25, + 15, + -22, + -8 + ] + }, "receipt-table-value2": { "color": "#000000", "bold": false, "fontSize": 9, - "fontWeight": 350, + "fontWeight": 250, "margin": [ 0, 0, @@ -1331,7 +1356,7 @@ "color": "#000000", "bold": false, "fontSize": 9, - "fontWeight": 350, + "fontWeight": 250, "margin": [ 0, 0, @@ -1343,10 +1368,10 @@ "color": "#484848", "bold": true, "fontSize": 9, - "fontWeight": 3500, + "fontWeight": 250, "margin": [ -50, - 3, + 1, 0, 0 ] @@ -1355,9 +1380,9 @@ "color": "#000000", "bold": true, "fontSize": 9, - "fontWeight": 350, + "fontWeight": 200, "margin": [ - 1, + 0, 0, 0, 0 From 77c4d300d28bc3e8cbe4c5d02e3fa969551aa368 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 27 Aug 2020 17:28:41 +0530 Subject: [PATCH 0100/1242] MiscReceiptULB_v2 to view testing tenant records --- configs/reports/configs/uc-reports.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/configs/reports/configs/uc-reports.yml b/configs/reports/configs/uc-reports.yml index 7e41c01c..37039d67 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -1123,8 +1123,7 @@ ReportDefinitions: SUM(CASE WHEN taxheadcode LIKE '%_FIELD_FEE' THEN adjustedamount ELSE 0 END) as fieldcollection FROM egcl_billaccountdetail INNER JOIN egcl_bill as bill on bill.id = egcl_billaccountdetail.billdetailid - WHERE bill.tenantid!='pb.testing' AND businessservice not in ('PT','TL','FIRENOC') - and bill.tenantid=$tenantid -- and rh.status != 'Cancelled' + WHERE businessservice not in ('PT','TL','FIRENOC') and bill.tenantid=$tenantid -- and rh.status != 'Cancelled' GROUP BY billdetailid ) SELECT @@ -1145,7 +1144,7 @@ ReportDefinitions: JOIN egcl_paymentdetail as paydetail on paydetail.paymentid=payment.id JOIN receipt_breakup ON paydetail.billid = receipt_breakup.bill_id JOIN eg_user ON payment.createdby::INTEGER=eg_user.id - WHERE payment.tenantid!='pb.testing' AND businessservice not in ('PT','TL','FIRENOC') and payment.tenantid=$tenantid and payment.paymentstatus != 'CANCELLED' + WHERE businessservice not in ('PT','TL','FIRENOC') and payment.tenantid=$tenantid and payment.paymentstatus != 'CANCELLED' orderby: ORDER BY paydetail.receiptdate DESC From dd598038cab39900e7e2d68a86251659d48372eb Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 28 Aug 2020 07:45:05 +0530 Subject: [PATCH 0101/1242] TL report date filter issue fix --- configs/reports/configs/tl-reports.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/configs/reports/configs/tl-reports.yml b/configs/reports/configs/tl-reports.yml index 13084bcc..d3e5fb5f 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -1618,13 +1618,13 @@ ReportDefinitions: type: epoch source: tl isMandatory: false - searchClause: AND receipt.createddate >= $fromDate + searchClause: AND paydetail.receiptdate >= $fromDate - name: toDate label: reports.tl.toDate type: epoch source: tl isMandatory: false - searchClause: AND receipt.createddate <= $toDate + searchClause: AND paydetail.receiptdate <= $toDate query: | SELECT licensenumber, @@ -1695,13 +1695,13 @@ ReportDefinitions: type: epoch source: tl isMandatory: false - searchClause: AND rh.receiptdate >= $fromDate + searchClause: AND paydetail.receiptdate >= $fromDate - name: toDate label: reports.tl.toDate type: epoch source: tl isMandatory: false - searchClause: AND rh.receiptdate <= $toDate + searchClause: AND paydetail.receiptdate <= $toDate query: | select sum(payment.totalamountpaid) as total, @@ -1711,7 +1711,7 @@ ReportDefinitions: initcap(split_part(payment.tenantId, '.', 2)) as tenantId from egcl_payment as payment inner join egcl_paymentdetail paydetail on paydetail.paymentid=payment.id - where paydetail.businessservice = 'TL' and payment.tenantid !='pb.testing' and payment.paymentstatus != 'CANCELLED' + where paydetail.businessservice = 'TL' and payment.paymentstatus != 'CANCELLED' AND payment.tenantId LIKE '$tenantid' groupby: GROUP BY payment.tenantId From 79526252ec48a8d2b2cedfad7d983acb221fb744 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Fri, 28 Aug 2020 12:37:29 +0530 Subject: [PATCH 0102/1242] Update tlcertificate.json --- .../format-config/tlcertificate.json | 204 +++++++++++++----- 1 file changed, 156 insertions(+), 48 deletions(-) diff --git a/configs/pdf-service/format-config/tlcertificate.json b/configs/pdf-service/format-config/tlcertificate.json index 7f48f6ce..b0ed1fd1 100644 --- a/configs/pdf-service/format-config/tlcertificate.json +++ b/configs/pdf-service/format-config/tlcertificate.json @@ -259,50 +259,7 @@ }, "layout":"noBorders" }, - { - "style":"noc-head", - "table":{ - "widths":[ - "35%", - "65%" - ], - "body":[ - [ - { - "text":"{{trade_type}}", - "style":"receipt-sub-logo-sub-header" - }, - { - "text":"{{tradeType}}", - "style":"receipt-sub-logo-sub-header" - } - ] - ] - }, - "layout":"noBorders" - }, - { - "style":"noc-head", - "table":{ - "widths":[ - "35%", - "65%" - ], - "body":[ - [ - { - "text":"{{accessories_label}}", - "style":"receipt-sub-logo-sub-header" - }, - { - "text":"{{accessories}}", - "style":"receipt-sub-logo-sub-header" - } - ] - ] - }, - "layout":"noBorders" - }, + { "style":"noc-head", "table":{ @@ -347,6 +304,7 @@ }, "layout":"noBorders" }, + { "style":"noc-head", "table":{ @@ -368,7 +326,109 @@ ] }, "layout":"noBorders" - } + }, + { + "table":{ + "widths": [ + "*", + "*", + "*", + "*", + "*" + ], + "body": + [ + [ + { + "text": "{{trade_category}}", + "style": "receipt-table-value2" + }, + { + "text": "{{trade_type}}", + "style": "receipt-table-value" + }, + { + "text": "{{trade_sub_type}}", + "style": "receipt-table-value" + }, + { + "text": "{{uom_measurement}}", + "style": "receipt-table-value" + }, + { + "text": "{{uom_value}}", + "style": "receipt-table-value" + } + ], + "{{#variable13}}[ { \"text\":\"{{tradeCat}}\", \"border\":[ true, false, true, true ], \"style\": \"receipt-table3\" }, { \"text\":\"{{tradetyp}}\", \"border\":[ false, false, true, true ], \"style\": \"receipt-table2\" }, { \"text\":\"{{tradesub}}\", \"border\":[ false, false, true,true ], \"style\": \"receipt-table2\" }, { \"text\":\"{{UOM-measurement}}\", \"border\":[ false, false, true, true ], \"style\": \"receipt-table2\" } ,{ \"text\":\"{{uomValue}}\", \"border\":[ false, false, true,true ], \"style\": \"receipt-table2\" }]{{/variable13}}" ] + }, + "border":[ + true, + false, + true, + false + ] + }, + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":" ", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":" ", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + }, + { + "table": { + "widths": [ + "*", + "*", + "*", + "*" + ], + "body": + [ + [ + { + "text": "{{accesory_type}}", + "style": "receipt-table-value2" + }, + { + "text": "{{uom_label}}", + "style": "receipt-table-value" + }, + { + "text": "{{uom_value}}", + "style": "receipt-table-value" + }, + { + "text": "{{accessory_count}}", + "style": "receipt-table-value" + } + ], + "{{#variable14}}[ { \"text\":\"{{accesoryType}}\", \"border\":[ true, false, true,true ], \"style\": \"receipt-table3\" }, { \"text\":\"{{uom}}\", \"border\":[ false, false, true, true], \"style\": \"receipt-table2\" }, { \"text\":\"{{accessoryUomValue}}\", \"border\":[ false, false,true, true], \"style\": \"receipt-table2\" }, { \"text\":\"{{accessoryCount}}\", \"border\":[ false, false, true,true ], \"style\": \"receipt-table2\" } ]{{/variable14}}" ] + } , + "border":[ + true, + false, + true, + false + ] + } + ], "alignment":"left", "margin":[ @@ -438,6 +498,54 @@ -2 ] }, + + "noc-head2": { + "margin": [ + 50, + 2,0,0 + ] + }, + "receipt-table-value": { + "color": "#000000", + "fontSize": 9, + "margin": [ + 0, + 2, + 0, + 0 + ] + }, + "receipt-table2": { + "color": "#000000", + "fontSize": 9, + + "margin": [ + 0, + 2, + 0, + 0 + ] + }, + "receipt-table-value2": { + "color": "#000000", + "fontSize": 9, + "margin": [ + 20, + 2, + 0, + 0 + ] + }, + "receipt-table3": { + "color": "#000000", + "fontSize": 9, + "margin": [ + 20, + 2, + 0, + 0 + ] + }, "receipt-approver": { "color": "#000000", "fontSize": 12, @@ -481,7 +589,7 @@ "alignment": "center", "margin": [ 0, - 1, + 0, 0, 0 ] @@ -493,7 +601,7 @@ "alignment": "left", "margin": [ 50, - 40, + 30, 0, 0 ] @@ -538,7 +646,7 @@ { "fontSize":"10", "margin": [ - 10, + 8, 0, 0, 0 From d5d3896ff3cbe39d230e5f877479c08cf2b00c12 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Fri, 28 Aug 2020 12:38:48 +0530 Subject: [PATCH 0103/1242] Update tlcertificate.json --- .../data-config/tlcertificate.json | 194 +++++++++++++++++- 1 file changed, 192 insertions(+), 2 deletions(-) diff --git a/configs/pdf-service/data-config/tlcertificate.json b/configs/pdf-service/data-config/tlcertificate.json index 04864a0b..2a876010 100644 --- a/configs/pdf-service/data-config/tlcertificate.json +++ b/configs/pdf-service/data-config/tlcertificate.json @@ -55,8 +55,13 @@ { "variable": "tradeAddress", "value": { - "path": "$.tradeLicenseDetail.address.locality.name" - } + "path": "$.tradeLicenseDetail.address.locality.code" + }, + "localisation":{ + "required":true, + "prefix": "EGOVLOCATION_BOUNDARYDATA", + "module": "rainmaker-tl" + } }, { "variable": "city", @@ -80,6 +85,94 @@ "module": "rainmaker-tl" } }, + + { + "variable": "variable13", + "value":{ + "path":"$.tradeLicenseDetail.tradeUnits.*" + }, + "type":"array", + "format":{ + "type":"string", + "scema":[ + { + "variable": "tradeCat", + "value":"tradeType", + "localisation":{ + "required":true, + "prefix": "TRADELICENSE_TRADETYPE", + "module": "rainmaker-tl", + "isCategoryRequired":true + } + }, + { + "variable": "tradetyp", + "value":"tradeType", + "localisation":{ + "required":true, + "prefix": "TRADELICENSE_TRADETYPE", + "module": "rainmaker-tl", + "isMainTypeRequired":true + } + }, + { + "variable": "tradesub", + "value":"tradeType", + "localisation":{ + "required":true, + "prefix": "TRADELICENSE_TRADETYPE", + "module": "rainmaker-tl", + "isSubTypeRequired":true + } + }, + { + "variable": "UOM-measurement", + "value":"uom" + }, + { + "variable":"uomValue", + "value":"uomValue" + } + ] + } + }, + { + "variable": "variable14", + "value":{ + "path":"$.tradeLicenseDetail.accessories.*" + }, + "type":"array", + "format":{ + "type":"string", + "scema":[ + { + "variable": "accesoryType", + "value": "accessoryCategory", + "localisation":{ + "required":true, + "prefix": "TRADELICENSE_ACCESSORIESCATEGORY", + "module": "rainmaker-tl" + } + }, + { + "variable": "accessoryUomValue", + "value": "uomValue" + }, + + { + "variable": "uom", + "value": "uom" + }, + { + "variable": "accessoryCount", + "value": "count" + } + + ] + } + + }, + { "variable": "accessories", "value": { @@ -90,6 +183,7 @@ "prefix": "TRADELICENSE_ACCESSORIESCATEGORY", "module": "rainmaker-tl" } + }, { "variable": "licenseIssueDate", @@ -160,6 +254,102 @@ "module":"rainmaker-common" } }, + { + "variable": "trade_category", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_TRADE_CATEGORY" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "trade_type", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_TRADE_TYPE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "trade_sub_type", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_TRADE_SUB_TYPE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "uom_measurement", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_UOM_MEASUREMENT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "accesory_type", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_ACCESORY_TYPE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "uom_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_UOM" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "uom_value", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_UOM_VALUE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "accessory_count", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_ACCESORY_COUNT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, { "variable": "corporation_email", "value": { From 2adc497894eb888ee6aecea54c64533848d6ec0e Mon Sep 17 00:00:00 2001 From: Kabir Date: Fri, 28 Aug 2020 15:11:33 +0530 Subject: [PATCH 0104/1242] uat v2 testing firenoc reports --- .../reports/configs/rainmaker-noc-reports.yml | 632 +++++++++++++++++- 1 file changed, 630 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/rainmaker-noc-reports.yml b/configs/reports/configs/rainmaker-noc-reports.yml index 2fc2077f..934bb593 100644 --- a/configs/reports/configs/rainmaker-noc-reports.yml +++ b/configs/reports/configs/rainmaker-noc-reports.yml @@ -1,4 +1,4 @@ -ReportDefinitions: + ReportDefinitions: - reportName: CollectionReport summary: Collection Report version: 1.0.0 @@ -146,4 +146,632 @@ ReportDefinitions: searchClause: AND fnoc.tenantId IN ($ulb) query: select channel, count (*) number_of_applications,round((count (*)::decimal/(select count(*) from eg_fn_firenoc fnoc inner join eg_fn_firenocdetail fdet on fdet.firenocuuid=fnoc.uuid))*100,2) percentage from eg_fn_firenoc fnoc inner join eg_fn_firenocdetail fdet on fdet.firenocuuid=fnoc.uuid groupby: GROUP BY channel - orderby: ORDER BY channel \ No newline at end of file + orderby: ORDER BY channel + + + - reportName: CollectionReport_V2 + summary: Collection Report + version: 1.0.0 + moduleName: rainmaker-noc + sourceColumns: + - name: localisedmessage + label: reports.noc.collectionreport.usagetype + type: string + source: rainmaker-noc + total: false + - name: transactionNumber + label: reports.noc.collectionreport.transactionNumber + type: number + source: rainmaker-noc + total: true + - name: fees_counter + label: reports.noc.collectionreport.fees_counter + type: number + source: rainmaker-noc + total: true + - name: fees_online + label: reports.noc.collectionreport.fees_online + type: number + source: rainmaker-noc + total: true + searchParams: + - name: fromDate + label: reports.noc.collectionreport.fromDate + type: epoch + source: pt + isMandatory: false + searchClause: AND receiptdate >= $fromDate + - name: toDate + label: reports.noc.collectionreport.toDate + type: epoch + source: pt + isMandatory: false + searchClause: AND receiptdate <= $toDate + - name: channel + label: reports.noc.collectionreport.channel + type: multivaluelist + pattern: 'list://COUNTER:ULB Counter,ONLINE:Online by Citizen' + source: common + isMandatory: false + searchClause: AND collectiontype IN ($channel) + - name: paymentMode + label: reports.noc.collectionreport.paymentMode + type: singlevaluelist + pattern: 'list://Cash:Cash,Online:Online,Card:Card,DD:DD,Cheque:Cheque' + source: common + isMandatory: false + searchClause: AND instrumenttype = $paymentMode + - name: ulb + label: reports.noc.collectionreport.ulb + type: multivaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: noc + wrapper: true + isMandatory: false + searchClause: AND fnoc.tenantId IN ($ulb) + query: Select COALESCE(message,usagetype) localisedmessage, + COUNT(*) as transactionNumber, + (select COALESCE((select message from message where code=concat('FIRENOC_FIRESTATIONS_',UPPER(REGEXP_REPLACE(firestationid,'\..*',''))) limit 1), firestationid)) as firestation, + SUM (CASE WHEN egcl_payment.paymentmode='CASH' THEN egcl_payment.totalamountpaid ELSE 0 END) as fees_counter, + SUM (CASE WHEN egcl_payment.paymentmode='ONLINE' THEN egcl_payment.totalamountpaid ELSE 0 END) AS fees_online + from eg_fn_firenoc AS fnoc + INNER JOIN eg_fn_firenocdetail fdet on fdet.firenocuuid=fnoc.uuid + INNER JOIN egcl_bill as bill on bill.consumercode=fdet.applicationnumber + INNER JOIN egcl_billdetial as billd on billd.billid=bill.id + INNER JOIN eg_fn_buidlings build on build.firenocdetailsuuid=fdet.uuid + INNER JOIN egcl_paymentdetail ON (egcl_paymentdetail.billid=bill.id AND egcl_paymentdetail.businessservice='FIRENOC') + INNER JOIN egcl_payment on egcl_payment.id=egcl_paymentdetail.paymentid + LEFT OUTER JOIN message on code=concat('FIRENOC_BUILDINGTYPE_',UPPER(REGEXP_REPLACE(usagetype,'\..*',''))) + INNER JOIN eg_fn_address as fad on fad.firenocdetailsuuid=fdet.uuid and module='rainmaker-noc' where 1=1 + + groupby: GROUP BY (localisedmessage,firestation) + orderby: ORDER BY localisedmessage + +- reportName: ApplicationStatusReport_V2 + summary: Application Status Report + version: 1.0.0 + moduleName: rainmaker-noc + sourceColumns: + - name: application_status + label: reports.noc.applicationstatusreport.appStatus + type: string + source: rainmaker-noc + total: false + - name: number_of_application + label: reports.noc.applicationstatusreport.noofapplications + type: number + source: rainmaker-noc + total: true + searchParams: + - name: fromDate + label: reports.noc.applicationstatusreport.fromDate + type: epoch + source: noc + isMandatory: false + searchClause: AND applicationdate >= $fromDate + - name: toDate + label: reports.noc.applicationstatusreport.toDate + type: epoch + source: noc + isMandatory: false + searchClause: AND applicationdate <= $toDate + - name: ulb + label: reports.noc.applicationstatusreport.ulb + type: multivaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: noc + wrapper: true + isMandatory: false + searchClause: AND fnoc.tenantId IN ($ulb) + query: select COALESCE(message,state) application_status,count(*) number_of_application from eg_fn_firenoc fnoc inner join eg_fn_firenocdetail fdet on fdet.firenocuuid=fnoc.uuid inner join (SELECT DISTINCT ON (businessid) * FROM eg_wf_processinstance_v2 ORDER BY businessid,createdtime desc) pinstance on pinstance.businessid=fdet.applicationnumber inner join eg_wf_state_v2 wfstate on pinstance.status=wfstate.uuid left outer join message on code=concat('WF_FIRENOC_',UPPER(state)) and module='rainmaker-noc' where 1=1 + groupby: GROUP BY application_status + orderby: ORDER BY application_status + + - reportName: ChannelsReport_V2 + summary: Channels Report + version: 1.0.0 + moduleName: rainmaker-noc + sourceColumns: + - name: channel + label: reports.noc.channelsreport.channel + type: string + source: rainmaker-noc + total: false + - name: number_of_applications + label: reports.noc.channelsreport.applicationNo + type: number + source: rainmaker-noc + total: true + - name: percentage + label: reports.noc.channelsreport.percentage + type: number + source: rainmaker-noc + total: false + searchParams: + - name: fromDate + label: reports.noc.channelsreport.fromDate + type: epoch + source: noc + isMandatory: false + searchClause: AND applicationdate >= $fromDate + - name: toDate + label: reports.noc.channelsreport.toDate + type: epoch + source: noc + isMandatory: false + searchClause: AND applicationdate <= $toDate + - name: ulb + label: reports.noc.channelsreport.ulb + type: multivaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: noc + wrapper: true + isMandatory: false + searchClause: AND fnoc.tenantId IN ($ulb) + query: select channel, count (*) number_of_applications,round((count (*)::decimal/(select count(*) from eg_fn_firenoc fnoc inner join eg_fn_firenocdetail fdet on fdet.firenocuuid=fnoc.uuid))*100,2) percentage from eg_fn_firenoc fnoc inner join eg_fn_firenocdetail fdet on fdet.firenocuuid=fnoc.uuid + groupby: GROUP BY channel + orderby: ORDER BY channel + + - reportName: UrbanApplicationStatusReport_V2 + summary: Application Status Report + version: 1.0.0 + moduleName: rainmaker-noc + sourceColumns: + - name: application_status + label: reports.noc.applicationstatusreport.appStatus + type: string + source: rainmaker-noc + total: false + - name: number_of_application + label: reports.noc.applicationstatusreport.noofapplications + type: number + source: rainmaker-noc + total: true + - name: firestation + label: reports.noc.applicationstatusreport.firestation + type: string + source: rainmaker-noc + total: false + searchParams: + - name: fromDate + label: reports.noc.applicationstatusreport.fromDate + type: epoch + source: noc + isMandatory: false + searchClause: AND applicationdate >= $fromDate + - name: toDate + label: reports.noc.applicationstatusreport.toDate + type: epoch + source: noc + isMandatory: false + searchClause: AND applicationdate <= $toDate + - name: city + label: reports.noc.applicationstatusreport.city + type: multivaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: noc + wrapper: true + isMandatory: false + searchClause: AND fad.subdistrict IN ($city) + query: select COALESCE(message,state) application_status,(select COALESCE((select message from message where code=concat('FIRENOC_FIRESTATIONS_',UPPER(REGEXP_REPLACE(firestationid,'\..*',''))) limit 1), firestationid)) as firestation,count(*) number_of_application from eg_fn_firenoc fnoc inner join eg_fn_firenocdetail fdet on fdet.firenocuuid=fnoc.uuid inner join (SELECT DISTINCT ON (businessid) * FROM eg_wf_processinstance_v2 ORDER BY businessid,createdtime desc) pinstance on pinstance.businessid=fdet.applicationnumber inner join eg_wf_state_v2 wfstate on pinstance.status=wfstate.uuid left outer join message on code=concat('WF_FIRENOC_',UPPER(state)) and module='rainmaker-noc' inner join eg_fn_address as fad on fad.firenocdetailsuuid=fdet.uuid where 1=1 + groupby: GROUP BY (application_status,firestation) + orderby: ORDER BY application_status + + + - reportName: UrbanChannelsReport_V2 + summary: Channels Report + version: 1.0.0 + moduleName: rainmaker-noc + sourceColumns: + - name: channel + label: reports.noc.channelsreport.channel + type: string + source: rainmaker-noc + total: false + - name: number_of_applications + label: reports.noc.channelsreport.applicationNo + type: number + source: rainmaker-noc + total: true + - name: percentage + label: reports.noc.channelsreport.percentage + type: number + source: rainmaker-noc + total: false + - name: firestation + label: reports.noc.channelsreport.firestation + type: string + source: rainmaker-noc + total: false + searchParams: + - name: fromDate + label: reports.noc.channelsreport.fromDate + type: epoch + source: noc + isMandatory: false + searchClause: AND applicationdate >= $fromDate + - name: toDate + label: reports.noc.channelsreport.toDate + type: epoch + source: noc + isMandatory: false + searchClause: AND applicationdate <= $toDate + - name: city + label: reports.noc.channelsreport.city + type: multivaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: noc + wrapper: true + isMandatory: false + searchClause: AND fad.subdistrict IN ($city) + query: select channel,(select COALESCE((select message from message where code=concat('FIRENOC_FIRESTATIONS_',UPPER(REGEXP_REPLACE(firestationid,'\..*',''))) limit 1), firestationid)) as firestation, count (*) number_of_applications,round((count (*)::decimal/(select count(*) from eg_fn_firenoc fnoc inner join eg_fn_firenocdetail fdet on fdet.firenocuuid=fnoc.uuid))*100,2) percentage from eg_fn_firenoc fnoc inner join eg_fn_firenocdetail fdet on fdet.firenocuuid=fnoc.uuid + inner join eg_fn_address as fad on fad.firenocdetailsuuid=fdet.uuid + groupby: GROUP BY (channel,firestation) + orderby: ORDER BY channel + + + - reportName: DrillDownRuralSubdistrictCollectionReport_V2 + summary: Collection Report + version: 1.0.0 + moduleName: rainmaker-noc + sourceColumns: + - name: firestation + label: reports.noc.collectionreport.firestation + type: string + source: rainmaker-noc + total: false + - name: localisedmessage + label: reports.noc.collectionreport.usagetype + type: string + source: rainmaker-noc + total: false + - name: transactionNumber + label: reports.noc.collectionreport.transactionNumber + type: number + source: rainmaker-noc + total: true + - name: fees_counter + label: reports.noc.collectionreport.fees_counter + type: number + source: rainmaker-noc + total: true + - name: fees_online + label: reports.noc.collectionreport.fees_online + type: number + source: rainmaker-noc + total: true + searchParams: + - name: fromDate + label: reports.noc.collectionreport.fromDate + type: epoch + source: pt + isMandatory: false + searchClause: AND receiptdate >= $fromDate + - name: toDate + label: reports.noc.collectionreport.toDate + type: epoch + source: pt + isMandatory: false + searchClause: AND receiptdate <= $toDate + - name: channel + label: reports.noc.collectionreport.channel + type: multivaluelist + pattern: 'list://COUNTER:ULB Counter,ONLINE:Online by Citizen' + source: common + isMandatory: false + searchClause: AND collectiontype IN ($channel) + - name: paymentMode + label: reports.noc.collectionreport.paymentMode + type: singlevaluelist + pattern: 'list://Cash:Cash,Online:Online,Card:Card,DD:DD,Cheque:Cheque' + source: common + isMandatory: false + searchClause: AND instrumenttype = $paymentMode + - name: district + label: reports.noc.collectionreport.district + type: multivaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.city.districtName|$.MdmsRes.tenant.tenants.*.city.districtName + source: noc + wrapper: true + isMandatory: false + searchClause: AND fad.city IN ($district) + - name: subdistrict + label: reports.noc.collectionreport.subdistrict + type: multivaluelist + source: noc + wrapper: true + isMandatory: false + searchClause: AND fad.subdistrict IN ($subdistrict) + query: select COALESCE(message,usagetype) localisedmessage, COUNT(*) as transactionNumber,fad.subdistrict as subdistrict,(select COALESCE((select message from message where code=concat('FIRENOC_FIRESTATIONS_',UPPER(REGEXP_REPLACE(firestationid,'\..*',''))) limit 1), firestationid)) as firestation, sum(case when collectiontype='COUNTER' then ins.amount else 0 end) fees_counter, sum(case when collectiontype='ONLINE' then ins.amount else 0 end) fees_online from eg_fn_firenoc fnoc inner join eg_fn_firenocdetail fdet on fdet.firenocuuid=fnoc.uuid inner join egcl_receiptheader_v1 rhead on rhead.consumercode=fdet.applicationnumber inner join eg_fn_buidlings build on build.firenocdetailsuuid=fdet.uuid inner join egcl_receiptinstrument_v1 recins on recins.receiptheader=rhead.id inner join egcl_instrumentheader_v1 ins on recins.instrumentheader=ins.id left outer join message on code=concat('FIRENOC_BUILDINGTYPE_',UPPER(REGEXP_REPLACE(usagetype,'\..*',''))) inner join eg_fn_address as fad on fad.firenocdetailsuuid=fdet.uuid and module='rainmaker-noc' where 1=1 + groupby: GROUP BY (localisedmessage,subdistrict,firestation) + orderby: ORDER BY localisedmessage + + - reportName: RuralDistrictWiseCollectionReport_V2 + summary: Collection Report + version: 1.0.0 + moduleName: rainmaker-noc + sourceColumns: + - name: subdistrict + label: reports.noc.collectionreport.subdistrict + type: string + source: rainmaker-noc + total: false + - name: firestation + label: reports.noc.collectionreport.firestation + type: string + source: rainmaker-noc + total: false + - name: localisedmessage + label: reports.noc.collectionreport.usagetype + type: string + source: rainmaker-noc + total: false + - name: transactionNumber + label: reports.noc.collectionreport.transactionNumber + type: number + source: rainmaker-noc + total: true + - name: fees_counter + label: reports.noc.collectionreport.fees_counter + type: number + source: rainmaker-noc + total: true + - name: fees_online + label: reports.noc.collectionreport.fees_online + type: number + source: rainmaker-noc + total: true + searchParams: + - name: fromDate + label: reports.noc.collectionreport.fromDate + type: epoch + source: pt + isMandatory: false + searchClause: AND receiptdate >= $fromDate + - name: toDate + label: reports.noc.collectionreport.toDate + type: epoch + source: pt + isMandatory: false + searchClause: AND receiptdate <= $toDate + - name: channel + label: reports.noc.collectionreport.channel + type: multivaluelist + pattern: 'list://COUNTER:ULB Counter,ONLINE:Online by Citizen' + source: common + isMandatory: false + searchClause: AND collectiontype IN ($channel) + - name: paymentMode + label: reports.noc.collectionreport.paymentMode + type: singlevaluelist + pattern: 'list://Cash:Cash,Online:Online,Card:Card,DD:DD,Cheque:Cheque' + source: common + isMandatory: false + searchClause: AND instrumenttype = $paymentMode + - name: district + label: reports.noc.collectionreport.district + type: multivaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.city.districtTenantCode|$.MdmsRes.tenant.tenants.*.city.districtName + source: noc + wrapper: true + isMandatory: false + searchClause: AND fad.city IN ($district) + query: select COALESCE(message,usagetype) localisedmessage, COUNT(*) as transactionNumber,fad.subdistrict as subdistrict,(select COALESCE((select message from message where code=concat('FIRENOC_FIRESTATIONS_',UPPER(REGEXP_REPLACE(firestationid,'\..*',''))) limit 1), firestationid)) as firestation, sum(case when collectiontype='COUNTER' then ins.amount else 0 end) fees_counter, sum(case when collectiontype='ONLINE' then ins.amount else 0 end) fees_online from eg_fn_firenoc fnoc inner join eg_fn_firenocdetail fdet on fdet.firenocuuid=fnoc.uuid inner join egcl_receiptheader_v1 rhead on rhead.consumercode=fdet.applicationnumber inner join eg_fn_buidlings build on build.firenocdetailsuuid=fdet.uuid inner join egcl_receiptinstrument_v1 recins on recins.receiptheader=rhead.id inner join egcl_instrumentheader_v1 ins on recins.instrumentheader=ins.id left outer join message on code=concat('FIRENOC_BUILDINGTYPE_',UPPER(REGEXP_REPLACE(usagetype,'\..*',''))) inner join eg_fn_address as fad on fad.firenocdetailsuuid=fdet.uuid and module='rainmaker-noc' where 1=1 AND fad.subdistrict NOT LIKE 'pb.%' + groupby: GROUP BY (localisedmessage,subdistrict,firestation) + orderby: ORDER BY localisedmessage + + - reportName: RuralDistrictWiseApplicationStatusReport_V2 + summary: Application Status Report + version: 1.0.0 + moduleName: rainmaker-noc + sourceColumns: + - name: subdistrict + label: reports.noc.collectionreport.subdistrict + type: string + source: rainmaker-noc + total: false + - name: firestation + label: reports.noc.collectionreport.firestation + type: string + source: rainmaker-noc + total: false + - name: application_status + label: reports.noc.applicationstatusreport.appStatus + type: string + source: rainmaker-noc + total: false + - name: number_of_application + label: reports.noc.applicationstatusreport.noofapplications + type: number + source: rainmaker-noc + total: true + searchParams: + - name: fromDate + label: reports.noc.applicationstatusreport.fromDate + type: epoch + source: noc + isMandatory: false + searchClause: AND applicationdate >= $fromDate + - name: toDate + label: reports.noc.applicationstatusreport.toDate + type: epoch + source: noc + isMandatory: false + searchClause: AND applicationdate <= $toDate + - name: district + label: reports.noc.applicationstatusreport.district + type: multivaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.city.districtTenantCode|$.MdmsRes.tenant.tenants.*.city.districtName + source: noc + wrapper: true + isMandatory: false + searchClause: AND fad.city IN ($district) + query: select fad.subdistrict as subdistrict,(select COALESCE((select message from message where code=concat('FIRENOC_FIRESTATIONS_',UPPER(REGEXP_REPLACE(firestationid,'\..*',''))) limit 1), firestationid)) as firestation,COALESCE(message,state) application_status,count(*) number_of_application from eg_fn_firenoc fnoc inner join eg_fn_firenocdetail fdet on fdet.firenocuuid=fnoc.uuid inner join (SELECT DISTINCT ON (businessid) * FROM eg_wf_processinstance_v2 ORDER BY businessid,createdtime desc) pinstance on pinstance.businessid=fdet.applicationnumber inner join eg_wf_state_v2 wfstate on pinstance.status=wfstate.uuid left outer join message on code=concat('WF_FIRENOC_',UPPER(state)) and module='rainmaker-noc' inner join eg_fn_address as fad on fad.firenocdetailsuuid=fdet.uuid where 1=1 AND fad.subdistrict NOT LIKE 'pb.%' + groupby: GROUP BY (application_status,subdistrict,firestation) + orderby: ORDER BY application_status + + - reportName: DrillDownRuralWiseApplicationStatusReport_V2 + summary: Application Status Report + version: 1.0.0 + moduleName: rainmaker-noc + sourceColumns: + - name: firestation + label: reports.noc.collectionreport.firestation + type: string + source: rainmaker-noc + total: false + - name: application_status + label: reports.noc.applicationstatusreport.appStatus + type: string + source: rainmaker-noc + total: false + - name: number_of_application + label: reports.noc.applicationstatusreport.noofapplications + type: number + source: rainmaker-noc + total: true + searchParams: + - name: fromDate + label: reports.noc.applicationstatusreport.fromDate + type: epoch + source: noc + isMandatory: false + searchClause: AND applicationdate >= $fromDate + - name: toDate + label: reports.noc.applicationstatusreport.toDate + type: epoch + source: noc + isMandatory: false + searchClause: AND applicationdate <= $toDate + - name: district + label: reports.noc.applicationstatusreport.district + type: multivaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.city.districtName|$.MdmsRes.tenant.tenants.*.city.districtName + source: noc + wrapper: true + isMandatory: false + searchClause: AND fad.city IN ($district) + - name: subdistrict + label: reports.noc.applicationstatusreport.subdistrict + type: multivaluelist + source: noc + wrapper: true + isMandatory: false + searchClause: AND fad.subdistrict IN ($subdistrict) + query: (select COALESCE((select message from message where code=concat('FIRENOC_FIRESTATIONS_',UPPER(REGEXP_REPLACE(firestationid,'\..*',''))) limit 1), firestationid)) as firestation, fad.subdistrict as subdistrict,COALESCE(message,state) application_status,count(*) number_of_application from eg_fn_firenoc fnoc inner join eg_fn_firenocdetail fdet on fdet.firenocuuid=fnoc.uuid inner join (SELECT DISTINCT ON (businessid) * FROM eg_wf_processinstance_v2 ORDER BY businessid,createdtime desc) pinstance on pinstance.businessid=fdet.applicationnumber inner join eg_wf_state_v2 wfstate on pinstance.status=wfstate.uuid left outer join message on code=concat('WF_FIRENOC_',UPPER(state)) and module='rainmaker-noc' inner join eg_fn_address as fad on fad.firenocdetailsuuid=fdet.uuid where 1=1 + groupby: GROUP BY (application_status,subdistrict,firestation) + orderby: ORDER BY application_status + + - reportName: RuralDistrictWiseChannelsReport_V2 + summary: Channels Report + version: 1.0.0 + moduleName: rainmaker-noc + sourceColumns: + - name: subdistrict + label: reports.noc.collectionreport.subdistrict + type: string + source: rainmaker-noc + total: false + - name: firestation + label: reports.noc.collectionreport.firestation + type: string + source: rainmaker-noc + total: false + - name: channel + label: reports.noc.channelsreport.channel + type: string + source: rainmaker-noc + total: false + - name: number_of_applications + label: reports.noc.channelsreport.applicationNo + type: number + source: rainmaker-noc + total: true + - name: percentage + label: reports.noc.channelsreport.percentage + type: number + source: rainmaker-noc + total: false + searchParams: + - name: fromDate + label: reports.noc.channelsreport.fromDate + type: epoch + source: noc + isMandatory: false + searchClause: AND applicationdate >= $fromDate + - name: toDate + label: reports.noc.channelsreport.toDate + type: epoch + source: noc + isMandatory: false + searchClause: AND applicationdate <= $toDate + - name: district + label: reports.noc.channelsreport.district + type: multivaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.city.districtTenantCode|$.MdmsRes.tenant.tenants.*.city.districtName + source: noc + wrapper: true + isMandatory: false + searchClause: AND fad.city IN ($district) + query: select channel,fad.subdistrict as subdistrict,(select COALESCE((select message from message where code=concat('FIRENOC_FIRESTATIONS_',UPPER(REGEXP_REPLACE(firestationid,'\..*',''))) limit 1), firestationid)) as firestation, count (*) number_of_applications,round((count (*)::decimal/(select count(*) from eg_fn_firenoc fnoc inner join eg_fn_firenocdetail fdet on fdet.firenocuuid=fnoc.uuid))*100,2) percentage from eg_fn_firenoc fnoc inner join eg_fn_firenocdetail fdet on fdet.firenocuuid=fnoc.uuid + inner join eg_fn_address as fad on fad.firenocdetailsuuid=fdet.uuid Where 1=1 AND fad.subdistrict NOT LIKE 'pb.%' + groupby: GROUP BY (channel,subdistrict,firestation) + orderby: ORDER BY channel + + - reportName: DrillDownRuralWiseChannelReport_V2 + summary: Channels Report + version: 1.0.0 + moduleName: rainmaker-noc + sourceColumns: + - name: firestation + label: reports.noc.collectionreport.firestation + type: string + source: rainmaker-noc + total: false + - name: channel + label: reports.noc.channelsreport.channel + type: string + source: rainmaker-noc + total: false + - name: number_of_applications + label: reports.noc.channelsreport.applicationNo + type: number + source: rainmaker-noc + total: true + - name: percentage + label: reports.noc.channelsreport.percentage + type: number + source: rainmaker-noc + total: false + searchParams: + - name: fromDate + label: reports.noc.channelsreport.fromDate + type: epoch + source: noc + isMandatory: false + searchClause: AND applicationdate >= $fromDate + - name: toDate + label: reports.noc.channelsreport.toDate + type: epoch + source: noc + isMandatory: false + searchClause: AND applicationdate <= $toDate + - name: district + label: reports.noc.channelsreport.district + type: multivaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.city.districtCode|$.MdmsRes.tenant.tenants.*.city.districtName + source: noc + wrapper: true + isMandatory: false + searchClause: AND fad.city IN ($district) + - name: subdistrict + label: reports.noc.channelsreport.subdistrict + type: multivaluelist + source: noc + wrapper: true + isMandatory: false + searchClause: AND fad.subdistrict IN ($subdistrict) + query: select channel,fad.subdistrict as subdistrict,(select COALESCE((select message from message where code=concat('FIRENOC_FIRESTATIONS_',UPPER(REGEXP_REPLACE(firestationid,'\..*',''))) limit 1), firestationid)) as firestation, count (*) number_of_applications,round((count (*)::decimal/(select count(*) from eg_fn_firenoc fnoc inner join eg_fn_firenocdetail fdet on fdet.firenocuuid=fnoc.uuid))*100,2) percentage from eg_fn_firenoc fnoc inner join eg_fn_firenocdetail fdet on fdet.firenocuuid=fnoc.uuid + inner join eg_fn_address as fad on fad.firenocdetailsuuid=fdet.uuid + groupby: GROUP BY (channel,subdistrict,firestation) + orderby: ORDER BY channel \ No newline at end of file From 0ef693da8edbbe76e2be5d68e9a11068304a5a2d Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Fri, 28 Aug 2020 15:51:38 +0530 Subject: [PATCH 0105/1242] Update tlcertificate.json --- .../data-config/tlcertificate.json | 44 ++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/configs/pdf-service/data-config/tlcertificate.json b/configs/pdf-service/data-config/tlcertificate.json index 2a876010..5047698d 100644 --- a/configs/pdf-service/data-config/tlcertificate.json +++ b/configs/pdf-service/data-config/tlcertificate.json @@ -59,10 +59,52 @@ }, "localisation":{ "required":true, - "prefix": "EGOVLOCATION_BOUNDARYDATA", + "prefix": "EGOV-LOCATION_BOUNDARYDATA", "module": "rainmaker-tl" } }, + { + "variable": "doorNo", + "value": { + "path": "$.tradeLicenseDetail.address.doorNo" + } + }, + { + "variable": "structureType", + "value": { + "path": "$.tradeLicenseDetail.structureType" + }, + "localisation":{ + "required":true, + "prefix": "COMMON_MASTERS_STRUCTURETYPE", + "module": "rainmaker-tl", + "isCategoryRequired":true + } + }, + { + "variable": "structureSubType", + "value": { + "path": "$.tradeLicenseDetail.structureType" + }, + "localisation":{ + "required":true, + "prefix": "COMMON_MASTERS_STRUCTURETYPE", + "module": "rainmaker-tl", + "isSubTypeRequired":true + } + }, + { + "variable": "streetName", + "value": { + "path": "$.tradeLicenseDetail.address.street" + } + }, + { + "variable": "buildingName", + "value": { + "path": "$.tradeLicenseDetail.address.buildingName" + } + }, { "variable": "city", "value": { From 16fbf132a25477e55aa0c0e0c29271578ea0a539 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Fri, 28 Aug 2020 15:52:29 +0530 Subject: [PATCH 0106/1242] Update tradelicense-receipt.json --- .../data-config/tradelicense-receipt.json | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/configs/pdf-service/data-config/tradelicense-receipt.json b/configs/pdf-service/data-config/tradelicense-receipt.json index 04c68c6b..08634021 100644 --- a/configs/pdf-service/data-config/tradelicense-receipt.json +++ b/configs/pdf-service/data-config/tradelicense-receipt.json @@ -18,6 +18,12 @@ "path": "$.payerName" } }, + { + "variable": "payerAddress", + "value": { + "path": "$.payerAddress" + } + }, { "variable": "user-name", "value": { @@ -93,6 +99,19 @@ }, "type": "date" }, + { + "variable": "chequeNo", + "value": { + "path": "$.instrumentNumber" + } + }, + { + "variable": "chequeDate", + "value": { + "path": "$.instrumentDate" + }, + "type": "date" + }, { "variable": "paymentMode", "value": { From d0f7a028e3450e0f7d8b783f1fcefc57e0d3305a Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Fri, 28 Aug 2020 15:53:09 +0530 Subject: [PATCH 0107/1242] Update tlcertificate.json --- .../format-config/tlcertificate.json | 146 ++++++++++-------- 1 file changed, 79 insertions(+), 67 deletions(-) diff --git a/configs/pdf-service/format-config/tlcertificate.json b/configs/pdf-service/format-config/tlcertificate.json index b0ed1fd1..93d07643 100644 --- a/configs/pdf-service/format-config/tlcertificate.json +++ b/configs/pdf-service/format-config/tlcertificate.json @@ -215,51 +215,73 @@ }, "layout":"noBorders" }, - { - "style":"noc-head", - "table":{ - "widths":[ - "35%", - "65%" - ], - "body":[ - [ - { - "text":"{{trade_owner_contact}}", - "style":"receipt-sub-logo-sub-header" - }, - { - "text":"{{tradeOwnerContact}}", - "style":"receipt-sub-logo-sub-header" - } - ] - ] - }, - "layout":"noBorders" - }, - { - "style":"noc-head", - "table":{ - "widths":[ - "35%", - "65%" - ], - "body":[ - [ - { - "text":"{{trade_address}}", - "style":"receipt-sub-logo-sub-header" - }, - { - "text":"{{tradeAddress}}, {{city}}", - "style":"receipt-sub-logo-sub-header" - } - ] - ] - }, - "layout":"noBorders" - }, - + + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":"{{trade_owner_contact}}", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":"{{tradeOwnerContact}}", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + }, + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":"{{trade_address}}", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":"{{doorNo}},{{streetName}},{{buildingName}},{{tradeAddress}}, {{city}}", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + }, + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":"Structure Type/Sub Type", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":"{{structureType}}, {{structureSubType}}", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + }, { "style":"noc-head", "table":{ @@ -330,8 +352,6 @@ { "table":{ "widths": [ - "*", - "*", "*", "*", "*" @@ -350,17 +370,9 @@ { "text": "{{trade_sub_type}}", "style": "receipt-table-value" - }, - { - "text": "{{uom_measurement}}", - "style": "receipt-table-value" - }, - { - "text": "{{uom_value}}", - "style": "receipt-table-value" } ], - "{{#variable13}}[ { \"text\":\"{{tradeCat}}\", \"border\":[ true, false, true, true ], \"style\": \"receipt-table3\" }, { \"text\":\"{{tradetyp}}\", \"border\":[ false, false, true, true ], \"style\": \"receipt-table2\" }, { \"text\":\"{{tradesub}}\", \"border\":[ false, false, true,true ], \"style\": \"receipt-table2\" }, { \"text\":\"{{UOM-measurement}}\", \"border\":[ false, false, true, true ], \"style\": \"receipt-table2\" } ,{ \"text\":\"{{uomValue}}\", \"border\":[ false, false, true,true ], \"style\": \"receipt-table2\" }]{{/variable13}}" ] + "{{#variable13}}[ { \"text\":\"{{tradeCat}}\", \"border\":[ true, false, true, true ], \"style\": \"receipt-table3\" }, { \"text\":\"{{tradetyp}}\", \"border\":[ false, false, true, true ], \"style\": \"receipt-table2\" }, { \"text\":\"{{tradesub}}\", \"border\":[ false, false, true,true ], \"style\": \"receipt-table2\" }]{{/variable13}}" ] }, "border":[ true, @@ -394,10 +406,10 @@ { "table": { "widths": [ - "*", - "*", - "*", - "*" + "55%", + "15%", + "15%", + "15%" ], "body": [ @@ -553,21 +565,21 @@ "alignment": "center", "margin": [ -10, - 50, + 30, 0, 1 ] }, "receipt-logo-header": { "color": "#000000", - "fontSize": 20, + "fontSize": 17, "letterSpacing": 0.74, "alignment": "center", "margin": [ 0, 0, 0, - 1 + 0 ] }, "receipt-sub-logo-header": { @@ -577,9 +589,9 @@ "alignment": "center", "margin": [ 0, - 5, + -10, 0, - 5 + 0 ] }, "receipt-logo-sub-header": { @@ -589,7 +601,7 @@ "alignment": "center", "margin": [ 0, - 0, + -5, 0, 0 ] @@ -646,7 +658,7 @@ { "fontSize":"10", "margin": [ - 8, + 5, 0, 0, 0 From b66e53d8895fbeab7f374b8235dc3f4ead708635 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Fri, 28 Aug 2020 15:54:40 +0530 Subject: [PATCH 0108/1242] Update tradelicense-receipt.json --- .../format-config/tradelicense-receipt.json | 84 ++++++++++++------- 1 file changed, 52 insertions(+), 32 deletions(-) diff --git a/configs/pdf-service/format-config/tradelicense-receipt.json b/configs/pdf-service/format-config/tradelicense-receipt.json index 2288bd82..2c30fa26 100644 --- a/configs/pdf-service/format-config/tradelicense-receipt.json +++ b/configs/pdf-service/format-config/tradelicense-receipt.json @@ -72,10 +72,10 @@ "style": "noc-table", "table": { "widths": [ - "25%", - "25%", - "25%", - "25%" + "20%", + "29%", + "22%", + "29%" ], "body": [ [ @@ -184,7 +184,7 @@ "style": "receipt-table" }, { - "text": "Old License No.", + "text": "{{payer_contact}}", "border": [ false, true, @@ -194,7 +194,7 @@ "style": "receipt-table-value" }, { - "text": "{{oldLicenseNumber}}", + "text": "{{payerContact}}", "border": [ false, true, @@ -203,6 +203,7 @@ ], "style": "receipt-table" } + ], [ { @@ -248,7 +249,7 @@ ], [ { - "text": "{{payer_contact}}", + "text": "Address", "border": [ true, false, @@ -258,7 +259,7 @@ "style": "receipt-table-value" }, { - "text": "{{payerContact}}", + "text": "{{payerAddress}}", "border": [ false, false, @@ -366,7 +367,7 @@ "style": "receipt-table" }, { - "text": "Trade Type", + "text": "Structure Type", "border": [ false, true, @@ -376,7 +377,7 @@ "style": "receipt-table-value" }, { - "text": "{{tradeType}}", + "text": "{{structureType}},{{structureSubType}}", "border": [ false, true, @@ -642,6 +643,37 @@ }, "layout": {} }, + + { + "style": "next-noc-table", + "table": { + "widths": [ + "*", + "*", + "*" + ], + "body": + [ + [ + { + "text": "Trade ategory", + "style": "receipt-table-value" + }, + { + "text": "Trade Type", + "style": "receipt-table-value" + }, + { + "text": "Trade Sub Type", + "style": "receipt-table-value" + } + ], + "{{#variable13}}[{ \"text\":\"{{tradeCat}}\", \"border\":[ true, false, true, true ], \"style\": \"receipt-table\" }, { \"text\":\"{{tradeTyp}}\", \"border\":[ false, false, true, true ], \"style\": \"receipt-table\" },{ \"text\":\"{{tradeSub}}\", \"border\":[ false, false, true, true ], \"style\": \"receipt-table\"}]{{/variable13}}" + ] + }, "layout": {} + + + }, { "style": "next-noc-table", "table": { @@ -722,19 +754,7 @@ "bold": true, "style": "pt-disclaimer-value" }, - { - "style": "pt-disclaimer-value", - "table": { - "widths": [ - "120%", - "*", - "*", - "*" - ], - "body": ["{{#variable11}}[{\"text\":\"{{disclaimerContent}}\",\"border\":[false,false,false,false],\"style\":\"pt-disclaimer-value\"}]{{/variable11}}"] - }, - "layout": {} - }, + { "ol": [ @@ -776,7 +796,7 @@ "color": "#000000", "margin": [ -25, - 25, + 8, -22, -8 ] @@ -786,7 +806,7 @@ "color": "#000000", "margin": [ -25, - 15, + 10, -22, -8 ] @@ -798,9 +818,9 @@ "fontWeight": 500, "margin": [ 2, - 2, + -1, 0, - 2 + 1 ] }, "receipt-table": { @@ -810,7 +830,7 @@ "fontWeight": 400, "margin": [ 0, - 2, + -1, 0, 2 ] @@ -820,7 +840,7 @@ "bold": true, "margin": [ -27, - 40, + 30, -10, 0 ], @@ -840,7 +860,7 @@ "fontSize": 10, "margin": [ -27, - 5, + 0, -10, 0 ], @@ -850,7 +870,7 @@ "fontSize": 10, "margin": [ 0, - 1, + 0, 0, 0 ], @@ -858,4 +878,4 @@ } } } -} \ No newline at end of file +} From a29dbda21651cb692ae28b6641508bdff32fed4c Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 28 Aug 2020 16:46:54 +0530 Subject: [PATCH 0109/1242] Update tl-reports.yml --- configs/reports/configs/tl-reports.yml | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/configs/reports/configs/tl-reports.yml b/configs/reports/configs/tl-reports.yml index d3e5fb5f..45f65540 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -1291,7 +1291,7 @@ ReportDefinitions: label: report.tl.tradetype type: string source: tl - total: true + total: false - name: acc label: report.tl.accessorycategories type: string @@ -1813,6 +1813,14 @@ ReportDefinitions: source: tl isMandatory: false searchClause: AND tl.lastmodifiedtime <= $toDate + - name: ulb + label: ULB + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: tl + wrapper: true + isMandatory: false + searchClause: AND tl.tenantId = $ulb query: | SELECT initcap(split_part(tenantId, '.', 2)) as tenantId, @@ -2184,11 +2192,6 @@ ReportDefinitions: type: string source: tl total: false - - name: locality - label: report.tl.locality - type: string - source: tl - total: false - name: propertyid label: report.tl.propertyid type: string @@ -2249,6 +2252,11 @@ ReportDefinitions: type: string source: tl total: true + - name: locality + label: report.tl.locality + type: string + source: tl + total: false - name: status label: report.tl.receipt.status type: string @@ -2272,7 +2280,7 @@ ReportDefinitions: type: boundarylist source: tl isMandatory: false - searchClause: AND tla.locality IN ($localityArray) + searchClause: AND locality_tlb.locality IN ($localityArray) query: | SELECT tl.applicationnumber as applicationnumber, From ed3f0dc722bd3fcd6a3a532c3efded5c5d5c3cea Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov Date: Fri, 28 Aug 2020 16:49:47 +0530 Subject: [PATCH 0110/1242] Update dss dashboard v2 query changes as per new format --- .../dashboard-analytics/ChartApiConfig.json | 69 +++++++++---------- 1 file changed, 34 insertions(+), 35 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index ba86fb23..1ba474c2 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -562,7 +562,7 @@ "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"attrs_root\":{\"nested\":{\"path\":\"domainObject.units\"},\"aggs\":{\"Usage Type\":{\"terms\":{\"field\":\"domainObject.units.usageCategory.keyword\",\"size\":200}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Usage Type\":{\"terms\":{\"field\":\"domainObject.usageCategory.keyword\",\"size\":200}}}}}}" } ], "chartType": "pie", @@ -584,11 +584,10 @@ "queries": [ { "module": "PT", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"Data.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\"}", - "dateRefField": "Data.@timestamp", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\"}", + "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}}],\"must\":{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\"]}}}},\"aggs\":{\"Usage Type\":{\"terms\":{\"field\":\"domainObject.units.usageCategory.keyword\"}},\"Assessed Properties\":{\"nested\":{\"path\":\"domainObject.assessmentsDetails\"},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"domainObject.assessmentsDetails.assessmentNumber.keyword\"}}}}}}}}" - + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}}],\"must\":{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\"]}}}},\"aggs\":{\"Usage Type\":{\"terms\":{\"field\":\"domainObject.usageCategory.keyword\"},\"aggs\":{\"Assessed Properties\":{\"nested\":{\"path\":\"domainObject.assessmentsDetails\"},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"domainObject.assessmentsDetails.assessmentNumber.keyword\"}}}}}}}}}}" } ], "chartType": "pie", @@ -734,10 +733,10 @@ "queries": [ { "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"usageId\" : \"domainObject.units.usageCategory.keyword\",\"minorUsageId\" : \"domainObject.units.usageCategory.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"usageId\" : \"domainObject.usageCategory.keyword\",\"minorUsageId\" : \"domainObject.usageCategory.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.paymentDetails.billId.keyword\"}},\"Assessed Properties\":{\"nested\":{\"path\":\"domainObject.assessmentsDetails\"},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"domainObject.assessmentsDetails.assessmentNumber.keyword\"}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.transactionNumber.keyword\"}},\"Assessed Properties\":{\"nested\":{\"path\":\"domainObject.assessmentsDetails\"},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"domainObject.assessmentsDetails.assessmentNumber.keyword\"}}}}}}}}" }, { "module": "COMMON", @@ -787,10 +786,10 @@ "queries": [ { "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"usageId\" : \"domainObject.units.usageCategory.keyword\",\"minorUsageId\" : \"domainObject.units.usageCategory.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"usageId\" : \"domainObject.usageCategory.keyword\",\"minorUsageId\" : \"domainObject.usageCategory.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"ULBs \":{\"terms\":{\"field\":\"domainObject.tenantId.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.paymentDetails.billId.keyword\"}},\"Assessed Properties\":{\"nested\":{\"path\":\"domainObject.assessmentsDetails\"},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"domainObject.assessmentsDetails.assessmentNumber.keyword\"}}}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"ULBs \":{\"terms\":{\"field\":\"domainObject.tenantId.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.transactionNumber.keyword\"}},\"Assessed Properties\":{\"nested\":{\"path\":\"domainObject.assessmentsDetails\"},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"domainObject.assessmentsDetails.assessmentNumber.keyword\"}}}}}}}}}}" }, { "module": "COMMON", @@ -843,10 +842,10 @@ "queries": [ { "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"usageId\" : \"domainObject.units.usageCategory.keyword\",\"minorUsageId\" : \"domainObject.units.usageCategory.keyword\",\"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"usageId\" : \"domainObject.usageCategory.keyword\",\"minorUsageId\" : \"domainObject.usageCategory.keyword\",\"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Ward \":{\"terms\":{\"field\":\"domainObject.ward.name.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.paymentDetails.billId.keyword\"}},\"Assessed Properties\":{\"nested\":{\"path\":\"domainObject.assessmentsDetails\"},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"domainObject.assessmentsDetails.assessmentNumber.keyword\"}}}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Ward \":{\"terms\":{\"field\":\"domainObject.ward.name.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.transactionNumber.keyword\"}},\"Assessed Properties\":{\"nested\":{\"path\":\"domainObject.assessmentsDetails\"},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"domainObject.assessmentsDetails.assessmentNumber.keyword\"}}}}}}}}}}" } ], "chartType": "table", @@ -887,7 +886,7 @@ "queries": [ { "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"usageId\" : \"domainObject.units.usageCategory.keyword\",\"minorUsageId\" : \"domainObject.units.usageCategory.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"usageId\" : \"domainObject.usageCategory.keyword\",\"minorUsageId\" : \"domainObject.usageCategory.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Total Amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.totalAmount\"}},\"PT Tax\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TAX\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Fire Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_FIRE_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Cancer Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_CANCER_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Rebate\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_REBATE\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Penalty\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_PENALTY\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Time Interest\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_INTEREST\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Round Off\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_ROUNDOFF\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}}}}}}" @@ -931,7 +930,7 @@ "queries": [ { "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"usageId\" : \"domainObject.units.usageCategory.keyword\",\"minorUsageId\" : \"domainObject.units.usageCategory.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"usageId\" : \"domainObject.usageCategory.keyword\",\"minorUsageId\" : \"domainObject.usageCategory.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"ULBs \":{\"terms\":{\"field\":\"dataObject.tenantId.keyword\",\"size\":200},\"aggs\":{\"Total Amount\":{\"bucket_script\":{\"buckets_path\":{\"c1\":\"PT Tax>aggrFilter>amount\",\"c2\":\"Fire Cess>aggrFilter>amount\",\"c3\":\"Cancer Cess>aggrFilter>amount\",\"c4\":\"Rebate>aggrFilter>amount\",\"c5\":\"Penalty>aggrFilter>amount\",\"c6\":\"Time Interest>aggrFilter>amount\",\"c7\":\"Round Off>aggrFilter>amount\"},\"script\":{\"source\":\"params.c1+params.c2+params.c3+params.c4+params.c5+params.c6+params.c7\"}}},\"PT Tax\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TAX\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Fire Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_FIRE_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Cancer Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_CANCER_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Rebate\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_REBATE\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Penalty\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_PENALTY\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Time Interest\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_INTEREST\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Round Off\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_ROUNDOFF\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}}}}}}}}" @@ -969,7 +968,7 @@ "queries": [ { "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"usageId\" : \"domainObject.units.usageCategory.keyword\",\"minorUsageId\" : \"domainObject.units.usageCategory.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"usageId\" : \"domainObject.usageCategory.keyword\",\"minorUsageId\" : \"domainObject.usageCategory.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Ward \":{\"terms\":{\"field\":\"domainObject.ward.name.keyword\",\"size\":200},\"aggs\":{\"Total Amount\":{\"bucket_script\":{\"buckets_path\":{\"c1\":\"PT Tax>aggrFilter>amount\",\"c2\":\"Fire Cess>aggrFilter>amount\",\"c3\":\"Cancer Cess>aggrFilter>amount\",\"c4\":\"Rebate>aggrFilter>amount\",\"c5\":\"Penalty>aggrFilter>amount\",\"c6\":\"Time Interest>aggrFilter>amount\",\"c7\":\"Round Off>aggrFilter>amount\"},\"script\":{\"source\":\"params.c1+params.c2+params.c3+params.c4+params.c5+params.c6+params.c7\"}}},\"PT Tax\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TAX\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Fire Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_FIRE_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Cancer Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_CANCER_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Rebate\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_REBATE\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Penalty\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_PENALTY\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Time Interest\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_INTEREST\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Round Off\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_ROUNDOFF\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}}}}}}}}" @@ -1006,10 +1005,10 @@ "queries": [ { "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"usageId\" : \"domainObject.units.usageCategory.keyword\",\"minorUsageId\" : \"domainObject.units.usageCategory.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"usageId\" : \"domainObject.usageCategory.keyword\",\"minorUsageId\" : \"domainObject.usageCategory.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"attrs_root\":{\"nested\":{\"path\":\"domainObject.units\"},\"aggs\":{\"Usage \":{\"terms\":{\"field\":\"domainObject.units.usageCategory.keyword\",\"size\":200},\"aggs\":{\"Total Amount\":{\"nested\":{\"path\":\"dataObject.Bill.taxAndPayments\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.taxAndPayments.businessService.keyword\":[\"PT\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.taxAndPayments.taxAmount\"}}}}}},\"PT Tax\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TAX\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Fire Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_FIRE_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Cancer Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_CANCER_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Rebate\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_REBATE\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Penalty\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_PENALTY\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}}}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\": {\"Usage \":{\"terms\":{\"field\":\"domainObject.usageCategory.keyword\",\"size\":200},\"aggs\":{\"Total Amount\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"PT Tax\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TAX\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Fire Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_FIRE_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Cancer Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_CANCER_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Rebate\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_REBATE\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Penalty\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_PENALTY\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}}}}}}}}" } ], "filterKeys": [ @@ -1051,17 +1050,17 @@ ], "insight": { }, - "_comment": "" + "_comment": "present we are not using, Need to check the taxAndPayments" }, "taxHeadsBreakupUsageSubMinor": { "chartName": "", "queries": [ { "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"usageId\" : \"domainObject.units.usageCategory.keyword\",\"minorUsageId\" : \"domainObject.units.usageCategory.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"usageId\" : \"domainObject.usageCategory.keyword\",\"minorUsageId\" : \"domainObject.usageCategory.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"attrs_root\":{\"nested\":{\"path\":\"domainObject.propertyDetails.units\"},\"aggs\":{\"Usage \":{\"terms\":{\"field\":\"domainObject.propertyDetails.units.usageCategorySubMinor.keyword\",\"size\":200},\"aggs\":{\"Total Amount\":{\"nested\":{\"path\":\"dataObject.Bill.taxAndPayments\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.taxAndPayments.businessService.keyword\":[\"PT\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.taxAndPayments.taxAmount\"}}}}}},\"PT Tax\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TAX\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Fire Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_FIRE_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Cancer Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_CANCER_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Rebate\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_REBATE\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Penalty\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_PENALTY\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}}}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Usage \":{\"terms\":{\"field\":\"domainObject.usageCategory.keyword\",\"size\":200},\"aggs\":{\"Total Amount\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.taxAndPayments.taxAmount\"}}}}}},\"PT Tax\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TAX\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Fire Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_FIRE_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Cancer Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_CANCER_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Rebate\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_REBATE\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Penalty\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_PENALTY\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}}}}}}}}" } ], "filterKeys": [ @@ -1110,11 +1109,11 @@ "queries": [ { "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\",\"usageId\" : \"domainObject.units.usageCategory.keyword\",\"minorUsageId\" : \"domainObject.units.usageCategory.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\",\"usageId\" : \"domainObject.usageCategory.keyword\",\"minorUsageId\" : \"domainObject.usageCategory.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"root\":{\"nested\":{\"path\":\"domainObject.units\"},\"aggs\":{\"UsageType \":{\"terms\":{\"field\":\"domainObject.units.usageCategory.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"reverse_nested\":{},\"aggs\":{\"top_tags_per_comment\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}},\"Transactions\":{\"reverse_nested\":{},\"aggs\":{\"top_tags_per_comment\":{\"cardinality\":{\"field\":\"dataObject.paymentDetails.billId.keyword\"}}}},\"Assessed Properties\":{\"nested\":{\"path\":\"domainObject.assessmentsDetails\"},\"aggs\":{\"attr\":{\"cardinality\":{\"field\":\"domainObject.assessmentsDetails.assessmentNumber.keyword\"}}}}}}}}}}}}", - "aggrQuerybc": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}}],\"must\":[{\"term\":{\"dataObject.paymentDetails.bill.status.keyword\":\"Approved\"}}]}},\"aggs\":{\"attrs_root\":{\"nested\":{\"path\":\"domainObject.units\"},\"aggs\":{\"UsageType \":{\"terms\":{\"field\":\"domainObject.units.usageCategory.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.paymentDetails.billId.keyword\"}},\"Assessed Properties\":{\"nested\":{\"path\":\"domainObject.assessmentsDetails\"},\"aggs\":{\"attr\":{\"cardinality\":{\"field\":\"domainObject.assessmentsDetails.assessmentNumber.keyword\"}}}}}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"UsageType \":{\"terms\":{\"field\":\"domainObject.usageCategory.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.transactionNumber.keyword\"}},\"Assessed Properties\":{\"nested\":{\"path\":\"domainObject.assessmentsDetails\"},\"aggs\":{\"attr\":{\"cardinality\":{\"field\":\"domainObject.assessmentsDetails.assessmentNumber.keyword\"}}}}}}}}}}", + "aggrQuerybc": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Approved\"]}}]}},\"aggs\":{\"UsageType \":{\"terms\":{\"field\":\"domainObject.usageCategory.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.transactionNumber.keyword\"}},\"Assessed Properties\":{\"nested\":{\"path\":\"domainObject.assessmentsDetails\"},\"aggs\":{\"attr\":{\"cardinality\":{\"field\":\"domainObject.assessmentsDetails.assessmentNumber.keyword\"}}}}}}}}}}" } ], "filterKeys": [ @@ -1149,18 +1148,18 @@ ], "insight": { }, - "_comment": "" + "_comment": "removed reverse_nested in aggrQuery" }, "usageRevenueDrillDownMinor": { "chartName": "", "queries": [ { "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"usageId\" : \"domainObject.units.usageCategory.keyword\",\"minorUsageId\" : \"domainObject.units.usageCategory.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"usageId\" : \"domainObject.usageCategory.keyword\",\"minorUsageId\" : \"domainObject.usageCategory.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"root\":{\"nested\":{\"path\":\"domainObject.propertyDetails.units\"},\"aggs\":{\"UsageType \":{\"terms\":{\"field\":\"domainObject.units.usageCategory.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"reverse_nested\":{},\"aggs\":{\"top_tags_per_comment\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}},\"Transactions\":{\"reverse_nested\":{},\"aggs\":{\"top_tags_per_comment\":{\"cardinality\":{\"field\":\"dataObject.paymentDetails.billId.keyword\"}}}},\"Assessed Properties\":{\"nested\":{\"path\":\"domainObject.propertyDetails\"},\"aggs\":{\"attr\":{\"cardinality\":{\"field\":\"domainObject.propertyDetails.assessmentNumber.keyword\"}}}}}}}}}}}}", - "aggrQuerybc": "{\"aggs\":{\"attrs_root\":{\"nested\":{\"path\":\"domainObject.propertyDetails.units\"},\"aggs\":{\"UsageType \":{\"terms\":{\"field\":\"domainObject.units.usageCategory.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.paymentDetails.billId.keyword\"}},\"Assessed Properties\":{\"nested\":{\"path\":\"Data.propertyDetails\"},\"aggs\":{\"attr\":{\"cardinality\":{\"field\":\"Data.propertyDetails.assessmentNumber.keyword\"}}}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"UsageType \":{\"terms\":{\"field\":\"domainObject.usageCategory.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.transactionNumber.keyword\"}},\"Assessed Properties\":{\"nested\":{\"path\":\"domainObject.assessmentsDetails\"},\"aggs\":{\"attr\":{\"cardinality\":{\"field\":\"domainObject.assessmentsDetails.assessmentNumber.keyword\"}}}}}}}}}}", + "aggrQuerybc": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Approved\"]}}]}},\"aggs\":{\"UsageType \":{\"terms\":{\"field\":\"domainObject.usageCategory.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.transactionNumber.keyword\"}},\"Assessed Properties\":{\"nested\":{\"path\":\"domainObject.assessmentsDetails\"},\"aggs\":{\"attr\":{\"cardinality\":{\"field\":\"domainObject.assessmentsDetails.assessmentNumber.keyword\"}}}}}}}}}}" } ], "filterKeys": [ @@ -1197,11 +1196,11 @@ "queries": [ { "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"usageId\" : \"domainObject.units.usageCategory.keyword\",\"minorUsageId\" : \"domainObject.units.usageCategory.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"usageId\" : \"domainObject.usageCategory.keyword\",\"minorUsageId\" : \"domainObject.usageCategory.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"root\":{\"nested\":{\"path\":\"domainObject.propertyDetails.units\"},\"aggs\":{\"UsageType \":{\"terms\":{\"field\":\"domainObject.propertyDetails.units.usageCategorySubMinor.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"reverse_nested\":{},\"aggs\":{\"top_tags_per_comment\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}},\"Transactions\":{\"reverse_nested\":{},\"aggs\":{\"top_tags_per_comment\":{\"cardinality\":{\"field\":\"dataObject.paymentDetails.billId.keyword\"}}}},\"Assessed Properties\":{\"nested\":{\"path\":\"domainObject.propertyDetails\"},\"aggs\":{\"attr\":{\"cardinality\":{\"field\":\"domainObject.propertyDetails.assessmentNumber.keyword\"}}}}}}}}}}}}", - "aggrQuerybc": "{\"aggs\":{\"attrs_root\":{\"nested\":{\"path\":\"domainObject.propertyDetails.units\"},\"aggs\":{\"UsageType \":{\"terms\":{\"field\":\"domainObject.propertyDetails.units.usageCategorySubMinor.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.paymentDetails.billId.keyword\"}},\"Assessed Properties\":{\"nested\":{\"path\":\"Data.propertyDetails\"},\"aggs\":{\"attr\":{\"cardinality\":{\"field\":\"Data.propertyDetails.assessmentNumber.keyword\"}}}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"UsageType \":{\"terms\":{\"field\":\"domainObject.usageCategory.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.transactionNumber.keyword\"}},\"Assessed Properties\":{\"nested\":{\"path\":\"domainObject.assessmentsDetails\"},\"aggs\":{\"attr\":{\"cardinality\":{\"field\":\"domainObject.assessmentsDetails.assessmentNumber.keyword\"}}}}}}}}}}", + "aggrQuerybc": "{\"aggs\":{\"UsageType \":{\"terms\":{\"field\":\"domainObject.usageCategory.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.transactionNumber.keyword\"}},\"Assessed Properties\":{\"nested\":{\"path\":\"Data.propertyDetails\"},\"aggs\":{\"attr\":{\"cardinality\":{\"field\":\"Data.propertyDetails.assessmentNumber.keyword\"}}}}}}}}" } ], "filterKeys": [ @@ -1246,7 +1245,7 @@ "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.paymentDetails.billId.keyword\"}},\"Total Licence Issued\":{\"value_count\":{\"field\":\"domainObject.tradelicense.licenseNumber.keyword\"}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.transactionNumber.keyword\"}},\"Total Licence Issued\":{\"value_count\":{\"field\":\"domainObject.tradelicense.licenseNumber.keyword\"}}}}}}" }, { "module": "COMMON", @@ -1300,7 +1299,7 @@ "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"ULBs \":{\"terms\":{\"field\":\"dataObject.tenantId.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.paymentDetails.billId.keyword\"}},\"Total Licence Issued\":{\"value_count\":{\"field\":\"domainObject.tradelicense.licenseNumber.keyword\"}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"ULBs \":{\"terms\":{\"field\":\"dataObject.tenantId.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.transactionNumber.keyword\"}},\"Total Licence Issued\":{\"value_count\":{\"field\":\"domainObject.tradelicense.licenseNumber.keyword\"}}}}}}}}" }, { "module": "COMMON", @@ -1352,7 +1351,7 @@ "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Ward \":{\"terms\":{\"field\":\"domainObject.ward.name.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.paymentDetails.billId.keyword\"}},\"Total Licence Issued\":{\"value_count\":{\"field\":\"domainObject.tradelicense.licenseNumber.keyword\"}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Ward \":{\"terms\":{\"field\":\"domainObject.ward.name.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.transactionNumber.keyword\"}},\"Total Licence Issued\":{\"value_count\":{\"field\":\"domainObject.tradelicense.licenseNumber.keyword\"}}}}}}}}" } ], "postAggregationTheory" : "repsonseToDifferenceOfDates", @@ -1396,7 +1395,7 @@ "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Total Amount\":{\"nested\":{\"path\":\"dataObject.Bill.taxAndPayments\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.Bill.taxAndPayments.businessService.keyword\":[\"TL\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.taxAndPayments.taxAmount\"}}}}}},\"TL Tax\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"TL_TAX\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Adhoc Penalty\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"TL_ADHOC_PENALTY\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Adhoc Rebate\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"TL_ADHOC_REBATE\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Total Amount\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"TL\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"TL Tax\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"TL_TAX\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Adhoc Penalty\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"TL_ADHOC_PENALTY\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Adhoc Rebate\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"TL_ADHOC_REBATE\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}}}}}}" } ], "isMdmsEnabled": true, @@ -1437,7 +1436,7 @@ "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"attrs_root\":{\"nested\":{\"path\":\"domainObject.units\"},\"aggs\":{\"Usage \":{\"terms\":{\"field\":\"domainObject.units.usageCategory.keyword\",\"size\":200},\"aggs\":{\"Total Amount\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}},\"PT Tax\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TAX\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Fire Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_FIRE_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Cancer Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_CANCER_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Rebate\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_REBATE\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Penalty\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_PENALTY\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}}}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Usage \":{\"terms\":{\"field\":\"domainObject.usageCategory.keyword\",\"size\":200},\"aggs\":{\"Total Amount\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}},\"PT Tax\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TAX\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Fire Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_FIRE_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Cancer Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_CANCER_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Rebate\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_REBATE\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Penalty\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_PENALTY\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}}}}}}}}" } ], "filterKeys": [ @@ -1839,7 +1838,7 @@ "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"ULBs \":{\"terms\":{\"field\":\"dataObject.tenantId.keyword\",\"size\":200,\"min_doc_count\":0},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.paymentDetails.billId.keyword\"}},\"Total Licence Issued\":{\"value_count\":{\"field\":\"domainObject.tradelicense.licenseNumber.keyword\"}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"ULBs \":{\"terms\":{\"field\":\"dataObject.tenantId.keyword\",\"size\":200,\"min_doc_count\":0},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.transactionNumber.keyword\"}},\"Total Licence Issued\":{\"value_count\":{\"field\":\"domainObject.tradelicense.licenseNumber.keyword\"}}}}}}}}" }, { "module": "COMMON", From 5ceb1301354908073396d39ee01b9dded72516f5 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 28 Aug 2020 16:50:13 +0530 Subject: [PATCH 0111/1242] Update tl-reports.yml --- configs/reports/configs/tl-reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/reports/configs/tl-reports.yml b/configs/reports/configs/tl-reports.yml index 45f65540..a07cdde4 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -1972,7 +1972,7 @@ ReportDefinitions: source: tl wrapper: true isMandatory: false - searchClause: AND tl.tenantId = $ulb + searchClause: AND payment.tenantId = $ulb query: | select sum(payment.totalamountpaid) as total, From 6b227d7dd94ab75e2c4ce254aace38ae76b2c2a1 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 28 Aug 2020 17:07:18 +0530 Subject: [PATCH 0112/1242] Update uc-reports.yml --- configs/reports/configs/uc-reports.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/uc-reports.yml b/configs/reports/configs/uc-reports.yml index 37039d67..26576b28 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -1369,8 +1369,8 @@ ReportDefinitions: -- Use CTE to force query plan, compute & use CTE later SELECT initcap(split_part(payment.tenantId, '.', 2)) as ulb, - count(*) FILTER (where payment.paymentmode!='ONLINE') as offlinetransactions, - count(*) FILTER (where payment.paymentmode='ONLINE') as onlinetransactions, + count(*) FILTER (where payment.paymentmode!='ONLINE') as noOfOfflineTransactions, + count(*) FILTER (where payment.paymentmode='ONLINE') as noOfOnlineTransactions, count(*) as totaltransactions, sum(case when paymentmode!='ONLINE' then payment.totalamountpaid else 0 end) as offlinecollection, sum(case paymentmode when 'ONLINE' then payment.totalamountpaid else 0 end) as onlinecollection, From aefa1776f329900e9100b614f974b8d56f86ffae Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Fri, 28 Aug 2020 17:23:28 +0530 Subject: [PATCH 0113/1242] Update tlcertificate.json --- configs/pdf-service/format-config/tlcertificate.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/pdf-service/format-config/tlcertificate.json b/configs/pdf-service/format-config/tlcertificate.json index 93d07643..040c9e90 100644 --- a/configs/pdf-service/format-config/tlcertificate.json +++ b/configs/pdf-service/format-config/tlcertificate.json @@ -490,7 +490,7 @@ "ol": [ "This license is not the proof of ownership.", - "This Trade License is issued under rule 10.39 of the Municipal Account Code 2017 with condition that the applicant shall obtain relevant NOC from concerned\ndepartments like Punjab Pollution control board / Fire Ofce /Health Department/ Excise Department/Deputy Commissioner (under Explosive Act) whichever applicable.", + "This Trade License is issued under rule 10.39 of the Municipal Account Code 2017 with condition that the applicant shall obtain relevant NOC from concerned departments like Punjab Pollution control board / Fire Ofce /Health Department/ Excise Department/Deputy Commissioner (under Explosive Act) whichever applicable.", "The Municipal Council/Corporation reserves the right to cancel this Trade License for Breach of any condition in accordance with law.", "This is a computer generated document, hence requires no signature.", "The grant of Trade License is not approval to any violation of building by laws, town planning scheme." From 8a96803d3249ff8ee393c44cb547095075c3ee6b Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Fri, 28 Aug 2020 17:35:51 +0530 Subject: [PATCH 0114/1242] Update tradelicense-receipt.json --- .../data-config/tradelicense-receipt.json | 75 ++++++++++++++++--- 1 file changed, 66 insertions(+), 9 deletions(-) diff --git a/configs/pdf-service/data-config/tradelicense-receipt.json b/configs/pdf-service/data-config/tradelicense-receipt.json index 08634021..c286daf0 100644 --- a/configs/pdf-service/data-config/tradelicense-receipt.json +++ b/configs/pdf-service/data-config/tradelicense-receipt.json @@ -481,7 +481,7 @@ "queryParam": "tenantId=$.tenantId,applicationNumber=$.paymentDetails[0].bill.consumerCode", "apiRequest": null, "responseMapping":[ - { + { "variable":"applicationType", "value":"$.Licenses[0].applicationType" }, @@ -501,7 +501,7 @@ "variable":"tradeName", "value":"$.Licenses[0].tradeName" }, - { + { "variable":"adhocRebateReason", "value":"$.Licenses[0].tradeLicenseDetail.adhocExemptionReason" }, @@ -510,15 +510,25 @@ "value":"$.Licenses[0].tradeLicenseDetail.adhocPenaltyReason" }, { - "variable": "tradeType", - "value": "$.Licenses[0].tradeLicenseDetail.tradeUnits[0].tradeType", + "variable": "structureType", + "value": "$.Licenses[0].tradeLicenseDetail.structureType", "localisation":{ "required":true, - "prefix": "TRADELICENSE_TRADETYPE", + "prefix": "COMMON_MASTERS_STRUCTURETYPE", "module": "rainmaker-tl", "isCategoryRequired":true } }, + { + "variable": "structureSubType", + "value": "$.Licenses[0].tradeLicenseDetail.structureType", + "localisation":{ + "required":true, + "prefix": "COMMON_MASTERS_STRUCTURETYPE", + "module": "rainmaker-tl", + "isSubTypeRequired":true + } + }, { "variable": "variable_acc", "value": "$.Licenses[0].tradeLicenseDetail.accessories.*", @@ -529,6 +539,7 @@ { "variable": "accesoryType", "value": "accessoryCategory", + "type":"string", "localisation":{ "required":true, "prefix": "TRADELICENSE_ACCESSORIESCATEGORY", @@ -537,22 +548,68 @@ }, { "variable": "accessoryUomValue", - "value": "uomValue" + "value": "uomValue", + "type":"string" }, { "variable": "uom", - "value": "uom" + "value": "uom", + "type":"string" }, { "variable": "accessoryCount", - "value": "count" + "value": "count", + "type":"string" } ] } - } + }, + { + "variable": "variable13", + "value": "$.Licenses[0].tradeLicenseDetail.tradeUnits.*", + "type":"array", + "format":{ + "type":"string", + "scema":[ + { + "variable": "tradeCat", + "value": "tradeType", + "type":"string", + "localisation":{ + "required":true, + "prefix":"TRADELICENSE_TRADETYPE", + "module": "rainmaker-tl", + "isCategoryRequired":true + } + }, + { + "variable": "tradeTyp", + "value": "tradeType", + "type":"string", + "localisation":{ + "required":true, + "prefix":"TRADELICENSE_TRADETYPE", + "module": "rainmaker-tl", + "isMainTypeRequired":true + } + }, + { + "variable": "tradeSub", + "value": "tradeType", + "type":"string", + "localisation":{ + "required":true, + "prefix":"TRADELICENSE_TRADETYPE", + "module": "rainmaker-tl", + "isSubTypeRequired":true + } + } + ] + } + } ] } ] From 18803df88cbedd70c809440dc1badb34d73bf349 Mon Sep 17 00:00:00 2001 From: egovmis Date: Mon, 31 Aug 2020 09:55:02 +0530 Subject: [PATCH 0115/1242] pdf changes --- .../data-config/consolidatedreceipt.json | 2 +- .../data-config/tlapplication.json | 2 +- .../data-config/tlcertificate.json | 242 +++++++++++++- .../data-config/tradelicense-receipt.json | 96 +++++- .../format-config/firenoc-receipt.json | 36 +- .../format-config/tlapplication.json | 2 +- .../format-config/tlcertificate.json | 314 ++++++++++++------ .../format-config/tradelicense-receipt.json | 84 +++-- 8 files changed, 630 insertions(+), 148 deletions(-) diff --git a/configs/pdf-service/data-config/consolidatedreceipt.json b/configs/pdf-service/data-config/consolidatedreceipt.json index 5b4ebc0d..6423eded 100644 --- a/configs/pdf-service/data-config/consolidatedreceipt.json +++ b/configs/pdf-service/data-config/consolidatedreceipt.json @@ -473,7 +473,7 @@ { "externalAPI": [ { - "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "path": "http://localhost:8079/egov-mdms-service/v1/_get", "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", "apiRequest": null, "responseMapping":[ diff --git a/configs/pdf-service/data-config/tlapplication.json b/configs/pdf-service/data-config/tlapplication.json index 58ec1825..f7e938e2 100644 --- a/configs/pdf-service/data-config/tlapplication.json +++ b/configs/pdf-service/data-config/tlapplication.json @@ -1038,7 +1038,7 @@ { "externalAPI": [ { - "path": "http://billing-service:8080/billing-service/bill/v2/_search", + "path": "http://localhost:8069/billing-service/bill/v2/_search", "queryParam": "tenantId=$.tenantId,consumerCode=$.applicationNumber,businessService=TL", "apiRequest": null, "responseMapping":[ diff --git a/configs/pdf-service/data-config/tlcertificate.json b/configs/pdf-service/data-config/tlcertificate.json index 04864a0b..e6d259d1 100644 --- a/configs/pdf-service/data-config/tlcertificate.json +++ b/configs/pdf-service/data-config/tlcertificate.json @@ -55,9 +55,56 @@ { "variable": "tradeAddress", "value": { - "path": "$.tradeLicenseDetail.address.locality.name" - } + "path": "$.tradeLicenseDetail.address.locality.code" + }, + "localisation":{ + "required":true, + "prefix": "EGOV-LOCATION_BOUNDARYDATA", + "module": "rainmaker-tl" + } }, + { + "variable": "doorNo", + "value": { + "path": "$.tradeLicenseDetail.address.doorNo" + } + }, + { + "variable": "structureType", + "value": { + "path": "$.tradeLicenseDetail.structureType" + }, + "localisation":{ + "required":true, + "prefix": "COMMON_MASTERS_STRUCTURETYPE", + "module": "rainmaker-tl", + "isCategoryRequired":true + } + }, + { + "variable": "structureSubType", + "value": { + "path": "$.tradeLicenseDetail.structureType" + }, + "localisation":{ + "required":true, + "prefix": "COMMON_MASTERS_STRUCTURETYPE", + "module": "rainmaker-tl", + "isSubTypeRequired":true + } + }, + { + "variable": "streetName", + "value": { + "path": "$.tradeLicenseDetail.address.street" + } + }, + { + "variable": "buildingName", + "value": { + "path": "$.tradeLicenseDetail.address.buildingName" + } + }, { "variable": "city", "value": { @@ -80,6 +127,94 @@ "module": "rainmaker-tl" } }, + + { + "variable": "variable13", + "value":{ + "path":"$.tradeLicenseDetail.tradeUnits.*" + }, + "type":"array", + "format":{ + "type":"string", + "scema":[ + { + "variable": "tradeCat", + "value":"tradeType", + "localisation":{ + "required":true, + "prefix": "TRADELICENSE_TRADETYPE", + "module": "rainmaker-tl", + "isCategoryRequired":true + } + }, + { + "variable": "tradetyp", + "value":"tradeType", + "localisation":{ + "required":true, + "prefix": "TRADELICENSE_TRADETYPE", + "module": "rainmaker-tl", + "isMainTypeRequired":true + } + }, + { + "variable": "tradesub", + "value":"tradeType", + "localisation":{ + "required":true, + "prefix": "TRADELICENSE_TRADETYPE", + "module": "rainmaker-tl", + "isSubTypeRequired":true + } + }, + { + "variable": "UOM-measurement", + "value":"uom" + }, + { + "variable":"uomValue", + "value":"uomValue" + } + ] + } + }, + { + "variable": "variable14", + "value":{ + "path":"$.tradeLicenseDetail.accessories.*" + }, + "type":"array", + "format":{ + "type":"string", + "scema":[ + { + "variable": "accesoryType", + "value": "accessoryCategory", + "localisation":{ + "required":true, + "prefix": "TRADELICENSE_ACCESSORIESCATEGORY", + "module": "rainmaker-tl" + } + }, + { + "variable": "accessoryUomValue", + "value": "uomValue" + }, + + { + "variable": "uom", + "value": "uom" + }, + { + "variable": "accessoryCount", + "value": "count" + } + + ] + } + + }, + { "variable": "accessories", "value": { @@ -90,6 +225,7 @@ "prefix": "TRADELICENSE_ACCESSORIESCATEGORY", "module": "rainmaker-tl" } + }, { "variable": "licenseIssueDate", @@ -160,6 +296,102 @@ "module":"rainmaker-common" } }, + { + "variable": "trade_category", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_TRADE_CATEGORY" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "trade_type", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_TRADE_TYPE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "trade_sub_type", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_TRADE_SUB_TYPE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "uom_measurement", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_UOM_MEASUREMENT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "accesory_type", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_ACCESORY_TYPE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "uom_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_UOM" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "uom_value", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_UOM_VALUE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "accessory_count", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_ACCESORY_COUNT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, { "variable": "corporation_email", "value": { @@ -381,8 +613,8 @@ { "externalAPI": [ { - "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", - "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", "apiRequest": null, "responseMapping":[ { @@ -405,7 +637,7 @@ }, { "path": "http://collection-services:8080/collection-services/payments/_search", - "queryParam": "tenantId=$.tenantId,consumerCodes=$.applicationNumber,businessServices=TL", + "queryParam": "tenantId=$.tenantId,consumerCode=$.applicationNumber,businessServices=TL", "apiRequest": null, "responseMapping":[ { diff --git a/configs/pdf-service/data-config/tradelicense-receipt.json b/configs/pdf-service/data-config/tradelicense-receipt.json index 04c68c6b..145d2193 100644 --- a/configs/pdf-service/data-config/tradelicense-receipt.json +++ b/configs/pdf-service/data-config/tradelicense-receipt.json @@ -18,6 +18,12 @@ "path": "$.payerName" } }, + { + "variable": "payerAddress", + "value": { + "path": "$.payerAddress" + } + }, { "variable": "user-name", "value": { @@ -93,6 +99,19 @@ }, "type": "date" }, + { + "variable": "chequeNo", + "value": { + "path": "$.instrumentNumber" + } + }, + { + "variable": "chequeDate", + "value": { + "path": "$.instrumentDate" + }, + "type": "date" + }, { "variable": "paymentMode", "value": { @@ -394,7 +413,7 @@ { "externalAPI": [ { - "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", "apiRequest": null, "responseMapping":[ @@ -430,6 +449,7 @@ } ] }, + { "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", "queryParam": "moduleName=tenant&masterName=footer&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}' %26%26 @.service=='{$.paymentDetails[0].businessService}')%5D", @@ -482,7 +502,7 @@ "variable":"tradeName", "value":"$.Licenses[0].tradeName" }, - { + { "variable":"adhocRebateReason", "value":"$.Licenses[0].tradeLicenseDetail.adhocExemptionReason" }, @@ -491,15 +511,25 @@ "value":"$.Licenses[0].tradeLicenseDetail.adhocPenaltyReason" }, { - "variable": "tradeType", - "value": "$.Licenses[0].tradeLicenseDetail.tradeUnits[0].tradeType", + "variable": "structureType", + "value": "$.Licenses[0].tradeLicenseDetail.structureType", "localisation":{ "required":true, - "prefix": "TRADELICENSE_TRADETYPE", + "prefix": "COMMON_MASTERS_STRUCTURETYPE", "module": "rainmaker-tl", "isCategoryRequired":true } }, + { + "variable": "structureSubType", + "value": "$.Licenses[0].tradeLicenseDetail.structureType", + "localisation":{ + "required":true, + "prefix": "COMMON_MASTERS_STRUCTURETYPE", + "module": "rainmaker-tl", + "isSubTypeRequired":true + } + }, { "variable": "variable_acc", "value": "$.Licenses[0].tradeLicenseDetail.accessories.*", @@ -510,6 +540,7 @@ { "variable": "accesoryType", "value": "accessoryCategory", + "type":"string", "localisation":{ "required":true, "prefix": "TRADELICENSE_ACCESSORIESCATEGORY", @@ -518,21 +549,68 @@ }, { "variable": "accessoryUomValue", - "value": "uomValue" + "value": "uomValue", + "type":"string" }, { "variable": "uom", - "value": "uom" + "value": "uom", + "type":"string" }, { "variable": "accessoryCount", - "value": "count" + "value": "count", + "type":"string" } ] } - } + }, + + { + "variable": "variable13", + "value": "$.Licenses[0].tradeLicenseDetail.tradeUnits.*", + "type":"array", + "format":{ + "type":"string", + "scema":[ + { + "variable": "tradeCat", + "value": "tradeType", + "type":"string", + "localisation":{ + "required":true, + "prefix":"TRADELICENSE_TRADETYPE", + "module": "rainmaker-tl", + "isCategoryRequired":true + } + }, + { + "variable": "tradeTyp", + "value": "tradeType", + "type":"string", + "localisation":{ + "required":true, + "prefix":"TRADELICENSE_TRADETYPE", + "module": "rainmaker-tl", + "isMainTypeRequired":true + } + }, + { + "variable": "tradeSub", + "value": "tradeType", + "type":"string", + "localisation":{ + "required":true, + "prefix":"TRADELICENSE_TRADETYPE", + "module": "rainmaker-tl", + "isSubTypeRequired":true + } + } + ] + } + } ] } diff --git a/configs/pdf-service/format-config/firenoc-receipt.json b/configs/pdf-service/format-config/firenoc-receipt.json index afa0f628..623f282e 100644 --- a/configs/pdf-service/format-config/firenoc-receipt.json +++ b/configs/pdf-service/format-config/firenoc-receipt.json @@ -206,7 +206,7 @@ true, true, true, - true + true ], "alignment": "center" } @@ -323,7 +323,29 @@ } ], "alignment": "right" - } + }, + { + "text": [ + { + "text": "Note", + "bold": true + } + ], + "alignment": "left" + }, + + + { + "ol": + [ + + "This license is not the proof of Property Ownership or Copy of NOC.", + "This is a computer generated document, hence requires no signature.", + "Payment is subjected to vaerification /scrutiny by competent authority." + ], + "style":"disclaimer" + + } ] } ], @@ -434,6 +456,16 @@ 0 ], "color": "#484848" + }, + "disclaimer": + { + "fontSize":"10", + "margin": [ + 10, + 0, + 0, + 0 + ] } } } diff --git a/configs/pdf-service/format-config/tlapplication.json b/configs/pdf-service/format-config/tlapplication.json index 859667a1..2eb43e81 100644 --- a/configs/pdf-service/format-config/tlapplication.json +++ b/configs/pdf-service/format-config/tlapplication.json @@ -582,7 +582,7 @@ }, { "text": "{{uom_value}}", - "style": "receipt-table-value-cont" + "style": "receipt-table-value" } ], "{{#variable13}}[ { \"text\":\"{{tradeCat}}\", \"border\":[ true, false, true, true ], \"style\": \"receipt-table2\" }, { \"text\":\"{{tradetyp}}\", \"border\":[ false, false, true, true ], \"style\": \"receipt-table2\" }, { \"text\":\"{{tradesub}}\", \"border\":[ false, false, true,true ], \"style\": \"receipt-table2\" }, { \"text\":\"{{UOM-measurement}}\", \"border\":[ false, false, true, true ], \"style\": \"receipt-table2\" } ,{ \"text\":\"{{uomValue}}\", \"border\":[ false, false, true,true ], \"style\": \"receipt-table2\" }]{{/variable13}}" ] diff --git a/configs/pdf-service/format-config/tlcertificate.json b/configs/pdf-service/format-config/tlcertificate.json index 7f48f6ce..040c9e90 100644 --- a/configs/pdf-service/format-config/tlcertificate.json +++ b/configs/pdf-service/format-config/tlcertificate.json @@ -215,94 +215,73 @@ }, "layout":"noBorders" }, - { - "style":"noc-head", - "table":{ - "widths":[ - "35%", - "65%" - ], - "body":[ - [ - { - "text":"{{trade_owner_contact}}", - "style":"receipt-sub-logo-sub-header" - }, - { - "text":"{{tradeOwnerContact}}", - "style":"receipt-sub-logo-sub-header" - } - ] - ] - }, - "layout":"noBorders" - }, - { - "style":"noc-head", - "table":{ - "widths":[ - "35%", - "65%" - ], - "body":[ - [ - { - "text":"{{trade_address}}", - "style":"receipt-sub-logo-sub-header" - }, - { - "text":"{{tradeAddress}}, {{city}}", - "style":"receipt-sub-logo-sub-header" - } - ] - ] - }, - "layout":"noBorders" - }, + { - "style":"noc-head", - "table":{ - "widths":[ - "35%", - "65%" - ], - "body":[ - [ - { - "text":"{{trade_type}}", - "style":"receipt-sub-logo-sub-header" - }, - { - "text":"{{tradeType}}", - "style":"receipt-sub-logo-sub-header" - } - ] - ] - }, - "layout":"noBorders" - }, - { - "style":"noc-head", - "table":{ - "widths":[ - "35%", - "65%" - ], - "body":[ - [ - { - "text":"{{accessories_label}}", - "style":"receipt-sub-logo-sub-header" - }, - { - "text":"{{accessories}}", - "style":"receipt-sub-logo-sub-header" - } - ] - ] - }, - "layout":"noBorders" - }, + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":"{{trade_owner_contact}}", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":"{{tradeOwnerContact}}", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + }, + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":"{{trade_address}}", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":"{{doorNo}},{{streetName}},{{buildingName}},{{tradeAddress}}, {{city}}", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + }, + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":"Structure Type/Sub Type", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":"{{structureType}}, {{structureSubType}}", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + }, { "style":"noc-head", "table":{ @@ -347,6 +326,7 @@ }, "layout":"noBorders" }, + { "style":"noc-head", "table":{ @@ -368,7 +348,99 @@ ] }, "layout":"noBorders" - } + }, + { + "table":{ + "widths": [ + "*", + "*", + "*" + ], + "body": + [ + [ + { + "text": "{{trade_category}}", + "style": "receipt-table-value2" + }, + { + "text": "{{trade_type}}", + "style": "receipt-table-value" + }, + { + "text": "{{trade_sub_type}}", + "style": "receipt-table-value" + } + ], + "{{#variable13}}[ { \"text\":\"{{tradeCat}}\", \"border\":[ true, false, true, true ], \"style\": \"receipt-table3\" }, { \"text\":\"{{tradetyp}}\", \"border\":[ false, false, true, true ], \"style\": \"receipt-table2\" }, { \"text\":\"{{tradesub}}\", \"border\":[ false, false, true,true ], \"style\": \"receipt-table2\" }]{{/variable13}}" ] + }, + "border":[ + true, + false, + true, + false + ] + }, + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":" ", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":" ", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + }, + { + "table": { + "widths": [ + "55%", + "15%", + "15%", + "15%" + ], + "body": + [ + [ + { + "text": "{{accesory_type}}", + "style": "receipt-table-value2" + }, + { + "text": "{{uom_label}}", + "style": "receipt-table-value" + }, + { + "text": "{{uom_value}}", + "style": "receipt-table-value" + }, + { + "text": "{{accessory_count}}", + "style": "receipt-table-value" + } + ], + "{{#variable14}}[ { \"text\":\"{{accesoryType}}\", \"border\":[ true, false, true,true ], \"style\": \"receipt-table3\" }, { \"text\":\"{{uom}}\", \"border\":[ false, false, true, true], \"style\": \"receipt-table2\" }, { \"text\":\"{{accessoryUomValue}}\", \"border\":[ false, false,true, true], \"style\": \"receipt-table2\" }, { \"text\":\"{{accessoryCount}}\", \"border\":[ false, false, true,true ], \"style\": \"receipt-table2\" } ]{{/variable14}}" ] + } , + "border":[ + true, + false, + true, + false + ] + } + ], "alignment":"left", "margin":[ @@ -418,7 +490,7 @@ "ol": [ "This license is not the proof of ownership.", - "This Trade License is issued under rule 10.39 of the Municipal Account Code 2017 with condition that the applicant shall obtain relevant NOC from concerned\ndepartments like Punjab Pollution control board / Fire Ofce /Health Department/ Excise Department/Deputy Commissioner (under Explosive Act) whichever applicable.", + "This Trade License is issued under rule 10.39 of the Municipal Account Code 2017 with condition that the applicant shall obtain relevant NOC from concerned departments like Punjab Pollution control board / Fire Ofce /Health Department/ Excise Department/Deputy Commissioner (under Explosive Act) whichever applicable.", "The Municipal Council/Corporation reserves the right to cancel this Trade License for Breach of any condition in accordance with law.", "This is a computer generated document, hence requires no signature.", "The grant of Trade License is not approval to any violation of building by laws, town planning scheme." @@ -438,6 +510,54 @@ -2 ] }, + + "noc-head2": { + "margin": [ + 50, + 2,0,0 + ] + }, + "receipt-table-value": { + "color": "#000000", + "fontSize": 9, + "margin": [ + 0, + 2, + 0, + 0 + ] + }, + "receipt-table2": { + "color": "#000000", + "fontSize": 9, + + "margin": [ + 0, + 2, + 0, + 0 + ] + }, + "receipt-table-value2": { + "color": "#000000", + "fontSize": 9, + "margin": [ + 20, + 2, + 0, + 0 + ] + }, + "receipt-table3": { + "color": "#000000", + "fontSize": 9, + "margin": [ + 20, + 2, + 0, + 0 + ] + }, "receipt-approver": { "color": "#000000", "fontSize": 12, @@ -445,21 +565,21 @@ "alignment": "center", "margin": [ -10, - 50, + 30, 0, 1 ] }, "receipt-logo-header": { "color": "#000000", - "fontSize": 20, + "fontSize": 17, "letterSpacing": 0.74, "alignment": "center", "margin": [ 0, 0, 0, - 1 + 0 ] }, "receipt-sub-logo-header": { @@ -469,9 +589,9 @@ "alignment": "center", "margin": [ 0, - 5, + -10, 0, - 5 + 0 ] }, "receipt-logo-sub-header": { @@ -481,7 +601,7 @@ "alignment": "center", "margin": [ 0, - 1, + -5, 0, 0 ] @@ -493,7 +613,7 @@ "alignment": "left", "margin": [ 50, - 40, + 30, 0, 0 ] @@ -538,7 +658,7 @@ { "fontSize":"10", "margin": [ - 10, + 5, 0, 0, 0 diff --git a/configs/pdf-service/format-config/tradelicense-receipt.json b/configs/pdf-service/format-config/tradelicense-receipt.json index 2288bd82..81c88b5d 100644 --- a/configs/pdf-service/format-config/tradelicense-receipt.json +++ b/configs/pdf-service/format-config/tradelicense-receipt.json @@ -72,10 +72,10 @@ "style": "noc-table", "table": { "widths": [ - "25%", - "25%", - "25%", - "25%" + "20%", + "29%", + "22%", + "29%" ], "body": [ [ @@ -184,7 +184,7 @@ "style": "receipt-table" }, { - "text": "Old License No.", + "text": "{{payer_contact}}", "border": [ false, true, @@ -194,7 +194,7 @@ "style": "receipt-table-value" }, { - "text": "{{oldLicenseNumber}}", + "text": "{{payerContact}}", "border": [ false, true, @@ -203,6 +203,7 @@ ], "style": "receipt-table" } + ], [ { @@ -248,7 +249,7 @@ ], [ { - "text": "{{payer_contact}}", + "text": "Address", "border": [ true, false, @@ -258,7 +259,7 @@ "style": "receipt-table-value" }, { - "text": "{{payerContact}}", + "text": "{{payerAddress}}", "border": [ false, false, @@ -366,7 +367,7 @@ "style": "receipt-table" }, { - "text": "Trade Type", + "text": "Structure Type", "border": [ false, true, @@ -376,7 +377,7 @@ "style": "receipt-table-value" }, { - "text": "{{tradeType}}", + "text": "{{structureType}},{{structureSubType}}", "border": [ false, true, @@ -642,15 +643,46 @@ }, "layout": {} }, + { "style": "next-noc-table", "table": { "widths": [ - "*", "*", "*", "*" ], + "body": + [ + [ + { + "text": "Trade Category", + "style": "receipt-table-value" + }, + { + "text": "Trade Type", + "style": "receipt-table-value" + }, + { + "text": "Trade Sub Type", + "style": "receipt-table-value" + } + ], + "{{#variable13}}[{ \"text\":\"{{tradeCat}}\", \"border\":[ true, false, true, true ], \"style\": \"receipt-table\" }, { \"text\":\"{{tradeTyp}}\", \"border\":[ false, false, true, true ], \"style\": \"receipt-table\" },{ \"text\":\"{{tradeSub}}\", \"border\":[ false, false, true, true ], \"style\": \"receipt-table\"}]{{/variable13}}" + ] + }, "layout": {} + + + }, + { + "style": "next-noc-table", + "table": { + "widths": [ + "55%", + "15%", + "15%", + "15%" + ], "body": [ [ @@ -722,19 +754,7 @@ "bold": true, "style": "pt-disclaimer-value" }, - { - "style": "pt-disclaimer-value", - "table": { - "widths": [ - "120%", - "*", - "*", - "*" - ], - "body": ["{{#variable11}}[{\"text\":\"{{disclaimerContent}}\",\"border\":[false,false,false,false],\"style\":\"pt-disclaimer-value\"}]{{/variable11}}"] - }, - "layout": {} - }, + { "ol": [ @@ -776,7 +796,7 @@ "color": "#000000", "margin": [ -25, - 25, + 8, -22, -8 ] @@ -786,7 +806,7 @@ "color": "#000000", "margin": [ -25, - 15, + 10, -22, -8 ] @@ -798,9 +818,9 @@ "fontWeight": 500, "margin": [ 2, - 2, + -1, 0, - 2 + 1 ] }, "receipt-table": { @@ -810,7 +830,7 @@ "fontWeight": 400, "margin": [ 0, - 2, + -1, 0, 2 ] @@ -820,7 +840,7 @@ "bold": true, "margin": [ -27, - 40, + 30, -10, 0 ], @@ -840,7 +860,7 @@ "fontSize": 10, "margin": [ -27, - 5, + 0, -10, 0 ], @@ -850,7 +870,7 @@ "fontSize": 10, "margin": [ 0, - 1, + 0, 0, 0 ], From 84f9dfd4c212b3233eab22372596839a4c47e573 Mon Sep 17 00:00:00 2001 From: egovmis Date: Mon, 31 Aug 2020 13:04:52 +0530 Subject: [PATCH 0116/1242] pdf changes --- .../pdf-service/data-config/consolidatedreceipt.json | 4 ++-- configs/pdf-service/data-config/tlapplication.json | 2 +- .../format-config/consolidatedreceipt.json | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/configs/pdf-service/data-config/consolidatedreceipt.json b/configs/pdf-service/data-config/consolidatedreceipt.json index 6423eded..1b747720 100644 --- a/configs/pdf-service/data-config/consolidatedreceipt.json +++ b/configs/pdf-service/data-config/consolidatedreceipt.json @@ -473,8 +473,8 @@ { "externalAPI": [ { - "path": "http://localhost:8079/egov-mdms-service/v1/_get", - "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", "apiRequest": null, "responseMapping":[ { diff --git a/configs/pdf-service/data-config/tlapplication.json b/configs/pdf-service/data-config/tlapplication.json index f7e938e2..58ec1825 100644 --- a/configs/pdf-service/data-config/tlapplication.json +++ b/configs/pdf-service/data-config/tlapplication.json @@ -1038,7 +1038,7 @@ { "externalAPI": [ { - "path": "http://localhost:8069/billing-service/bill/v2/_search", + "path": "http://billing-service:8080/billing-service/bill/v2/_search", "queryParam": "tenantId=$.tenantId,consumerCode=$.applicationNumber,businessService=TL", "apiRequest": null, "responseMapping":[ diff --git a/configs/pdf-service/format-config/consolidatedreceipt.json b/configs/pdf-service/format-config/consolidatedreceipt.json index 02600b30..35a3126c 100644 --- a/configs/pdf-service/format-config/consolidatedreceipt.json +++ b/configs/pdf-service/format-config/consolidatedreceipt.json @@ -184,7 +184,7 @@ "style": "receipt-table" }, { - "text": "{{payer_name}}", + "text": "Consumer Name", "border": [ false, false, @@ -412,7 +412,7 @@ "style": "receipt-table" }, { - "text": "{{transaction_id}}", + "text": "Transaction No.", "border": [ false, false, @@ -520,7 +520,7 @@ { "text": [ { - "text": "{{commissioner/eo}}", + "text": "Authorised Signatory", "bold": true } ], @@ -743,7 +743,7 @@ "style": "receipt-table" }, { - "text": "{{payer_name}}", + "text": "Consumer Name", "border": [ false, false, @@ -972,7 +972,7 @@ "style": "receipt-table" }, { - "text": "{{transaction_id}}", + "text": "Transaction No.", "border": [ false, false, @@ -1080,7 +1080,7 @@ { "text": [ { - "text": "{{commissioner/eo}}", + "text": "Authorised Signatory", "bold": true } ], From 5a84caa2f5cc6cdbe2d32ff056ca7f58556e0ed2 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Mon, 31 Aug 2020 13:06:11 +0530 Subject: [PATCH 0117/1242] Update tradelicense-receipt.json --- .../data-config/tradelicense-receipt.json | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/configs/pdf-service/data-config/tradelicense-receipt.json b/configs/pdf-service/data-config/tradelicense-receipt.json index aa03ffa0..3f9b1204 100644 --- a/configs/pdf-service/data-config/tradelicense-receipt.json +++ b/configs/pdf-service/data-config/tradelicense-receipt.json @@ -504,11 +504,21 @@ }, { "variable":"adhocRebateReason", - "value":"$.Licenses[0].tradeLicenseDetail.adhocExemptionReason" + "value":"$.Licenses[0].tradeLicenseDetail.adhocExemptionReason", + "localisation":{ + "required":true, + "prefix": "null", + "module": "rainmaker-tl" + } }, { "variable":"adhocPenaltyReason", - "value":"$.Licenses[0].tradeLicenseDetail.adhocPenaltyReason" + "value":"$.Licenses[0].tradeLicenseDetail.adhocPenaltyReason", + "localisation":{ + "required":true, + "prefix": "null", + "module": "rainmaker-tl" + } }, { "variable": "structureType", From bbb38672834977d29dca538d49030634cd89db5f Mon Sep 17 00:00:00 2001 From: egovmis Date: Mon, 31 Aug 2020 15:31:19 +0530 Subject: [PATCH 0118/1242] pdf change --- configs/pdf-service/format-config/tlcertificate.json | 2 +- configs/pdf-service/format-config/tradelicense-receipt.json | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/pdf-service/format-config/tlcertificate.json b/configs/pdf-service/format-config/tlcertificate.json index 040c9e90..de510c02 100644 --- a/configs/pdf-service/format-config/tlcertificate.json +++ b/configs/pdf-service/format-config/tlcertificate.json @@ -658,7 +658,7 @@ { "fontSize":"10", "margin": [ - 5, + 8, 0, 0, 0 diff --git a/configs/pdf-service/format-config/tradelicense-receipt.json b/configs/pdf-service/format-config/tradelicense-receipt.json index 2ff460cf..63f40a31 100644 --- a/configs/pdf-service/format-config/tradelicense-receipt.json +++ b/configs/pdf-service/format-config/tradelicense-receipt.json @@ -184,7 +184,7 @@ "style": "receipt-table" }, { - "text": "{{payer_contact}}", + "text": "Owner Contact", "border": [ false, true, @@ -227,7 +227,7 @@ "style": "receipt-table" }, { - "text": "{{payer_name}}", + "text": "Owner Name", "border": [ false, false, @@ -535,7 +535,7 @@ "style": "receipt-table" }, { - "text": "{{transaction_id}}", + "text": "Transanction No.", "border": [ false, false, From 7a94b408c656a67e88d6db32806d339734a8d7e5 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Tue, 1 Sep 2020 10:33:12 +0530 Subject: [PATCH 0119/1242] Update tlapplication.json --- .../data-config/tlapplication.json | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/configs/pdf-service/data-config/tlapplication.json b/configs/pdf-service/data-config/tlapplication.json index 58ec1825..7673bf3f 100644 --- a/configs/pdf-service/data-config/tlapplication.json +++ b/configs/pdf-service/data-config/tlapplication.json @@ -184,17 +184,6 @@ "path": "$.tradeLicenseDetail.address.street" } }, - { - "variable": "mohalla", - "value": { - "path": "$.tradeLicenseDetail.address.locality.code" - }, - "localisation":{ - "required":true, - "prefix": "TENANTS_MOHALLA", - "module": "rainmaker-common" - } - }, { "variable": "pincode", "value": { @@ -1036,7 +1025,18 @@ ] }, { - "externalAPI": [ + "externalAPI": [ + { + "path": "http://egov-location:8080/egov-location/location/v11/boundarys/_search", + "queryParam": "tenantId=$.tenantId,hierarchyTypeCode=REVENUE,boundaryType=Locality,codes=$.tradeLicenseDetail.address.locality.code", + "apiRequest": null, + "responseMapping":[ + { + "variable":"mohalla", + "value":"$.TenantBoundary[0].boundary[0].name" + } + ] + }, { "path": "http://billing-service:8080/billing-service/bill/v2/_search", "queryParam": "tenantId=$.tenantId,consumerCode=$.applicationNumber,businessService=TL", From efa77716de72555fa2f149bb570a3bd4398b2066 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Tue, 1 Sep 2020 10:35:49 +0530 Subject: [PATCH 0120/1242] Update tlcertificate.json --- .../data-config/tlcertificate.json | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/configs/pdf-service/data-config/tlcertificate.json b/configs/pdf-service/data-config/tlcertificate.json index e6d259d1..6202b9e0 100644 --- a/configs/pdf-service/data-config/tlcertificate.json +++ b/configs/pdf-service/data-config/tlcertificate.json @@ -56,13 +56,8 @@ "variable": "tradeAddress", "value": { "path": "$.tradeLicenseDetail.address.locality.code" - }, - "localisation":{ - "required":true, - "prefix": "EGOV-LOCATION_BOUNDARYDATA", - "module": "rainmaker-tl" - } - }, + } + }, { "variable": "doorNo", "value": { @@ -651,6 +646,18 @@ ] }, + { + "path": "http://egov-location:8080/egov-location/location/v11/boundarys/_search", + "queryParam": "tenantId=$.tenantId,hierarchyTypeCode=REVENUE,boundaryType=Locality,codes=$.tradeLicenseDetail.address.locality.code", + "apiRequest": null, + "responseMapping":[ + { + "variable":"localityNName", + "value":"$.TenantBoundary[0].boundary[0].name" + } + ] + }, + { "path": "http://egov-filestore:8080/filestore/v1/files/url", "queryParam": "tenantId=pb,fileStoreIds=$.tradeLicenseDetail.applicationDocuments[?(@.documentType== 'OWNERPHOTO')].fileStoreId", From ff73c2099171d87eb2ad3b2193f5440852ed1b3c Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Tue, 1 Sep 2020 10:39:28 +0530 Subject: [PATCH 0121/1242] Update tlcertificate.json --- .../pdf-service/format-config/tlcertificate.json | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/configs/pdf-service/format-config/tlcertificate.json b/configs/pdf-service/format-config/tlcertificate.json index de510c02..00e34f09 100644 --- a/configs/pdf-service/format-config/tlcertificate.json +++ b/configs/pdf-service/format-config/tlcertificate.json @@ -252,7 +252,7 @@ "style":"receipt-sub-logo-sub-header" }, { - "text":"{{doorNo}},{{streetName}},{{buildingName}},{{tradeAddress}}, {{city}}", + "text":"{{doorNo}},{{streetName}},{{buildingName}},{{localityNName}}, {{city}}", "style":"receipt-sub-logo-sub-header" } ] @@ -350,6 +350,7 @@ "layout":"noBorders" }, { + "style":"noc-head2", "table":{ "widths": [ "*", @@ -404,6 +405,7 @@ "layout":"noBorders" }, { + "style":"noc-head2", "table": { "widths": [ "55%", @@ -474,7 +476,7 @@ { "text":[ { - "text":"{{commissioner}}", + "text":"Authorised Signatory", "bold": true } ], @@ -513,7 +515,7 @@ "noc-head2": { "margin": [ - 50, + 23, 2,0,0 ] }, @@ -542,7 +544,7 @@ "color": "#000000", "fontSize": 9, "margin": [ - 20, + 0, 2, 0, 0 @@ -552,7 +554,7 @@ "color": "#000000", "fontSize": 9, "margin": [ - 20, + 0, 2, 0, 0 @@ -658,8 +660,8 @@ { "fontSize":"10", "margin": [ - 8, - 0, + 2, + 2, 0, 0 ] From 474735a057c8fc4a01dc3edde5bb98edef5c4e68 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Tue, 1 Sep 2020 10:41:50 +0530 Subject: [PATCH 0122/1242] Update tlcertificate.json --- configs/pdf-service/format-config/tlcertificate.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/pdf-service/format-config/tlcertificate.json b/configs/pdf-service/format-config/tlcertificate.json index 00e34f09..89ea01b3 100644 --- a/configs/pdf-service/format-config/tlcertificate.json +++ b/configs/pdf-service/format-config/tlcertificate.json @@ -515,7 +515,7 @@ "noc-head2": { "margin": [ - 23, + 22, 2,0,0 ] }, @@ -661,7 +661,7 @@ "fontSize":"10", "margin": [ 2, - 2, + 3, 0, 0 ] From 676ab14c2abfcecfc5ae0f63348434631ff4e07f Mon Sep 17 00:00:00 2001 From: narendrabandhamneni-wt-egov Date: Tue, 1 Sep 2020 10:56:15 +0530 Subject: [PATCH 0123/1242] added rainmaker-custom-service --- build/build-config.yml | 15 + build/maven/Dockerfile | 9 + build/maven/start.sh | 11 + rainmaker-custom-service/.dockerignore | 1 + rainmaker-custom-service/.gitignore | 2 + rainmaker-custom-service/Dockerfile | 9 + rainmaker-custom-service/bnd.js | 15 + rainmaker-custom-service/build.wkflo | 9 + rainmaker-custom-service/encrypt.js | 41 + rainmaker-custom-service/index.js | 581 +++++ rainmaker-custom-service/package.json | 22 + rainmaker-custom-service/static/css/bnd.css | 137 + rainmaker-custom-service/static/js/bnd.js | 128 + .../templates/apicall.html | 45 + .../templates/bndlogin.html | 32 + .../templates/common/footer.html | 2 + .../templates/common/header.html | 13 + .../templates/common/scripts.html | 4 + .../utils/asyncMiddleware.js | 9 + rainmaker-custom-service/yarn.lock | 2297 +++++++++++++++++ 20 files changed, 3382 insertions(+) create mode 100644 build/build-config.yml create mode 100644 build/maven/Dockerfile create mode 100644 build/maven/start.sh create mode 100644 rainmaker-custom-service/.dockerignore create mode 100644 rainmaker-custom-service/.gitignore create mode 100644 rainmaker-custom-service/Dockerfile create mode 100644 rainmaker-custom-service/bnd.js create mode 100644 rainmaker-custom-service/build.wkflo create mode 100644 rainmaker-custom-service/encrypt.js create mode 100644 rainmaker-custom-service/index.js create mode 100644 rainmaker-custom-service/package.json create mode 100644 rainmaker-custom-service/static/css/bnd.css create mode 100644 rainmaker-custom-service/static/js/bnd.js create mode 100644 rainmaker-custom-service/templates/apicall.html create mode 100644 rainmaker-custom-service/templates/bndlogin.html create mode 100644 rainmaker-custom-service/templates/common/footer.html create mode 100644 rainmaker-custom-service/templates/common/header.html create mode 100644 rainmaker-custom-service/templates/common/scripts.html create mode 100644 rainmaker-custom-service/utils/asyncMiddleware.js create mode 100644 rainmaker-custom-service/yarn.lock diff --git a/build/build-config.yml b/build/build-config.yml new file mode 100644 index 00000000..a8ffeb01 --- /dev/null +++ b/build/build-config.yml @@ -0,0 +1,15 @@ +# +# config: +# - name: < Name of the job, foo/bar would create job named bar inside folder foo > +# build: +# - work-dir: < Working directory of the app to be built > +# dockerfile: < Path to the dockerfile, optional, assumes dockerfile in working directory if not provided > +# image-name: < Docker image name > +# - +# - +config: + - name: "builds/punjab-rainmaker-customization/rainmaker-custom-service" + build: + - work-dir: "rainmaker-custom-service" + image-name: "rainmaker-custom-service" + dockerfile: "build/maven/Dockerfile" diff --git a/build/maven/Dockerfile b/build/maven/Dockerfile new file mode 100644 index 00000000..c7c85163 --- /dev/null +++ b/build/maven/Dockerfile @@ -0,0 +1,9 @@ +FROM node:8.12-alpine +RUN npm install -g yarn +RUN mkdir /opt/app +COPY package.json yarn.lock /opt/app/ +WORKDIR /opt/app +RUN yarn install +COPY . /opt/app +CMD ["node", "index.js"] + diff --git a/build/maven/start.sh b/build/maven/start.sh new file mode 100644 index 00000000..08bdd8de --- /dev/null +++ b/build/maven/start.sh @@ -0,0 +1,11 @@ +#!/bin/sh + +if [[ -z "${JAVA_OPTS}" ]];then + export JAVA_OPTS="-Xmx64m -Xms64m" +fi + +if [ x"${JAVA_ENABLE_DEBUG}" != x ] && [ "${JAVA_ENABLE_DEBUG}" != "false" ]; then + java_debug_args="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=${JAVA_DEBUG_PORT:-5005}" +fi + +exec java ${java_debug_args} ${JAVA_OPTS} ${JAVA_ARGS} -jar /opt/egov/*.jar \ No newline at end of file diff --git a/rainmaker-custom-service/.dockerignore b/rainmaker-custom-service/.dockerignore new file mode 100644 index 00000000..3c3629e6 --- /dev/null +++ b/rainmaker-custom-service/.dockerignore @@ -0,0 +1 @@ +node_modules diff --git a/rainmaker-custom-service/.gitignore b/rainmaker-custom-service/.gitignore new file mode 100644 index 00000000..4f9f8bf4 --- /dev/null +++ b/rainmaker-custom-service/.gitignore @@ -0,0 +1,2 @@ +sampleRequest.js +nodemon.json \ No newline at end of file diff --git a/rainmaker-custom-service/Dockerfile b/rainmaker-custom-service/Dockerfile new file mode 100644 index 00000000..c7c85163 --- /dev/null +++ b/rainmaker-custom-service/Dockerfile @@ -0,0 +1,9 @@ +FROM node:8.12-alpine +RUN npm install -g yarn +RUN mkdir /opt/app +COPY package.json yarn.lock /opt/app/ +WORKDIR /opt/app +RUN yarn install +COPY . /opt/app +CMD ["node", "index.js"] + diff --git a/rainmaker-custom-service/bnd.js b/rainmaker-custom-service/bnd.js new file mode 100644 index 00000000..3514c63d --- /dev/null +++ b/rainmaker-custom-service/bnd.js @@ -0,0 +1,15 @@ +let requests = require("request") + +requests.post("http://13.126.198.70/eDistServices/ModuleCommon/serAuth.asmx/serAuthExternalUser", + { + form: { + username: "eomcbrn", + password: "esewa@123" + }, + headers: { + "x-api-key": "Tw0AxM3kyV3mb8SM" + } + } +,function(a,b,c) { + console.log(a,c); +}) \ No newline at end of file diff --git a/rainmaker-custom-service/build.wkflo b/rainmaker-custom-service/build.wkflo new file mode 100644 index 00000000..95cba3d1 --- /dev/null +++ b/rainmaker-custom-service/build.wkflo @@ -0,0 +1,9 @@ +def build(path, ci_image) { + stage("Build") { + docker.image("egovio/ci-react:v8.4.0").inside { + sh "cd ${path}/ && rm -rf node_modules"; + } + } +} + +return this; diff --git a/rainmaker-custom-service/encrypt.js b/rainmaker-custom-service/encrypt.js new file mode 100644 index 00000000..130ba4c9 --- /dev/null +++ b/rainmaker-custom-service/encrypt.js @@ -0,0 +1,41 @@ +const ENCRYPTION_KEY = process.env.ENCRYPTION_KEY +const ENCRYPTION_IV = process.env.ENCRYPTION_IV +const JWT_KEY = process.env.JWT_KEY +const JWT_EXPIRY = process.env.JWT_EXPIRY || '5min' +const DEBUG_MODE = Boolean(process.env.DEBUG_MODE) || false; + +function log(val) { + if (DEBUG_MODE) { + console.log(val) + } +} + +log ("EK=" + ENCRYPTION_KEY) +log ("EI=" + ENCRYPTION_IV) + +var encrypt = function (pass) { + // Include Library + var crypto = require('crypto'); + + // Declare Key and Block + var key = ENCRYPTION_KEY; + var iv = ENCRYPTION_IV; + + // Calc Cipher + var cipher = crypto.createCipheriv('aes256', key, iv) + var crypted = cipher.update(pass, 'utf8', 'base64') + crypted += cipher.final('base64'); + + // Return Cipher Text + return crypted; +} + + +var jwt = require("jsonwebtoken"); + +jwt_sign = (data) => jwt.sign(data, JWT_KEY, { expiresIn: JWT_EXPIRY }); + +module.exports = { + jwt_sign, + encrypt +} \ No newline at end of file diff --git a/rainmaker-custom-service/index.js b/rainmaker-custom-service/index.js new file mode 100644 index 00000000..568554fc --- /dev/null +++ b/rainmaker-custom-service/index.js @@ -0,0 +1,581 @@ +var express = require('express'), + slash = require('express-slash'); +var bodyParser = require('body-parser') + +var request = require('request-promise'); +const { + asyncMiddleware +} = require('./utils/asyncMiddleware'); + +var app = express(); +var mustache = require('mustache-express') +const Cryptr = require('cryptr'); +var {encrypt, jwt_sign } = require('./encrypt') + +app.engine('html', mustache()) +app.set('view engine', 'html') +app.set('views', __dirname + '/templates') +app.disable('view cache'); + +// https://codepen.io/graphicfreedom/pen/evaBXm + +const DEBUG_MODE = Boolean(process.env.DEBUG_MODE) || false; +const PT_DEMAND_HOST = process.env.PT_DEMAND_HOST +const EGOV_MDMS_HOST = process.env.EGOV_MDMS_HOST +const EGOV_BND_LOGIN_URL = process.env.EGOV_BND_LOGIN_URL +const EGOV_BND_REDIRECT_URL = process.env.EGOV_BND_REDIRECT_URL +// const EGOV_BND_API_KEY = process.env.EGOV_BND_API_KEY +const EGOV_BND_ENCRYPTION_KEY = process.env.EGOV_BND_ENCRYPTION_KEY || "Vol0otuji0X03wSuZGI3zySUzxj7bReQ" + +function log(val) { + if (DEBUG_MODE) { + console.log(val) + } +} + +log ("ENCKEY=" + EGOV_BND_ENCRYPTION_KEY) + +const cryptr = new Cryptr(EGOV_BND_ENCRYPTION_KEY); + + +function getUserUUID(data) { + return data.RequestInfo.userInfo.uuid; +} + +function getUserID(data) { + return data.RequestInfo.userInfo.id; +} + +async function getFireCessConfig(tenantId) { + let fireCessConfig = await request.post({ + url: EGOV_MDMS_HOST + "egov-mdms-service/v1/_search?tenantId=" + tenantId, + body: { + RequestInfo: { + "apiId": "Rainmaker-custom-service", + "ver": ".01", + "ts": "", + "action": "_search", + "did": "1", + "key": "", + "msgId": "20170310130900|en_IN", + "authToken": null + }, + "MdmsCriteria": { + "tenantId": tenantId, + "moduleDetails": [{ + "moduleName": "PropertyTax", + "masterDetails": [{ + "name": "FireCess" + }] + }] + } + }, + json: true + }) + + return fireCessConfig["MdmsRes"]["PropertyTax"]["FireCess"][0]; +} + +const TAX_TYPE = { + PT_TAX: false, + PT_TIME_REBATE: true, + PT_UNIT_USAGE_EXEMPTION: true, + PT_TIME_PENALTY: false, + PT_CANCER_CESS: false, + PT_ADHOC_PENALTY: false, + PT_ADHOC_REBATE: true, + PT_DECIMAL_CEILING_CREDIT: false, + PT_DECIMAL_CEILING_DEBIT: true, + PT_FIRE_CESS: false, + PT_OWNER_EXEMPTION: true, + PT_TIME_INTEREST: false +} + +if (PT_DEMAND_HOST === undefined) { + throw Error("PT_DEMAND_HOST environment variable needs to be configured to run this") +} + +function round(num, digits) { + return parseFloat(parseFloat(num).toFixed(digits)) +} + +// parse application/x-www-form-urlencoded +app.use(bodyParser.urlencoded({ + extended: true +})) + +// parse application/json +app.use(bodyParser.json()) + +// Because you're the type of developer who cares about this sort of thing! +app.enable('strict routing'); + +// Create the router using the same routing options as the app. +var router = express.Router({ + caseSensitive: app.get('case sensitive routing'), + strict: app.get('strict routing') +}); + +router.use("/static", express.static("static")) + +// Add the `slash()` middleware after your app's `router`, optionally specify +// an HTTP status code to use when redirecting (defaults to 301). +app.use('/customization', router); +// app.use(slash()); +app.use(express.json()); + +var promise = require('bluebird'); + +var options = { + // Initialization Options + promiseLib: promise +}; + +var pgp = require('pg-promise')(options); + +const connectionString = { + host: process.env.DB_HOST || 'localhost', + port: 5432, + database: process.env.DB_NAME || 'postgres', + user: process.env.DB_USER || 'postgres', + password: process.env.DB_PASSWORD || 'postgres' +}; + +// var connectionString = 'postgres://localhost:5432/egov_prod_db'; +var db = pgp(connectionString); +var path = require('path'); + +query = `SELECT servicerequestid as complaint_no, servicecode as complaint_type, eg_user.name as citizen_name, eg_user.mobilenumber as citizen_mobile, address, landmark, description as details +FROM eg_pgr_service INNER JOIN eg_user ON eg_pgr_service.accountid = cast(eg_user.id as varchar) +WHERE eg_pgr_service.status = 'assigned' AND servicerequestid IN (select DISTINCT businesskey from eg_pgr_action where status = 'assigned' AND "when" +IN (select max("when") from eg_pgr_action where assignee NOTNULL group by businesskey) AND assignee = $1);` + +router.get('/open/reports/*', function (req, res) { + res.render('apicall.html'); +}); + +router.get('/open/bndlogin', function (req, res) { + res.render('bndlogin.html'); +}); + +router.post('/protected/bndlogin/unlinkAccount', asyncMiddleware(async function (req, res) { + let uuid = getUserUUID(req.body); + + data = await db.any("DELETE FROM custom_eg_user_metatdata where user_id = $1 and key = $2", [uuid, 'BND_CREDENTIALS']); + res.status(200).send({}) +})); + +router.post('/protected/bndlogin/linkAccount', asyncMiddleware(async function (req, res) { + let username = req.body.username + let password = req.body.password + let uuid = getUserUUID(req.body); + let payload = { + Username: username, + Password: encrypt(password) + } + + log("inside linkAccount") + log(payload) + + let response = await request.post(EGOV_BND_LOGIN_URL, { + json: payload + }) + + log(response) + + if (response.sys_message && response.sys_message == 'Invalid User and Password') { + res.status(200).send({ code: "INVALID_CREDENTIALS", message: "Invalid User and Password"} ) + return + } else if (response.sys_message && response.sys_message == 'INTERNAL APPLICATION ERROR') { + res.status(200).send({ code: "ERROR", message: "Something went wrong"} ) + return + } + + loginID = response["data"][0]["loginID"]; + data = await db.any("select value from custom_eg_user_metatdata where user_id = $1 and key = $2", [uuid, 'BND_CREDENTIALS']); + value = { + username, + GUID: cryptr.encrypt(loginID) + } + + if (data.length == 0) { + await db.any("insert into custom_eg_user_metatdata(key, user_id, value) values ($1, $2, $3:json)", + ['BND_CREDENTIALS', uuid, value]) + } else { + await db.any("update custom_eg_user_metatdata set value = $3:json where key = $1 and user_id = $2", + ['BND_CREDENTIALS', uuid, value]) + } + res.json({code: "SUCCESS", redirect: EGOV_BND_REDIRECT_URL + jwt_sign({loginID: encrypt(loginID)})}) +})); + +router.post('/protected/bndlogin', asyncMiddleware(async function (req, res) { + try { + let uuid = getUserUUID(req.body); + data = await db.any("select value from custom_eg_user_metatdata where user_id = $1 and key = $2", [uuid, 'BND_CREDENTIALS']); + + if (data.length == 0) { + res.json({ + "code": "NO_CREDENTIAL_MAPPING", + "message": "Please update your Birth and Death credentials" + }) + return + } + + let loginID = cryptr.decrypt(data[0]["value"]["GUID"]) + + res.json({ + code: "SUCCESS", + redirect: EGOV_BND_REDIRECT_URL + jwt_sign({loginID: encrypt(loginID)}) + }) + + } catch (ex) { + console.log("Exception occured while login", ex) + res.json({ + "code": "ERROR", + "message": "Failed to login to BND - " + ex.toString() + }) + } + +})); + +function getFireCessPercentage(propertyDetails) { + // let propertyDetails = request["CalculationCriteria"][0]["propertyDetails"][0] + + let propertyUsageCategoryMajor = propertyDetails["usageCategoryMajor"] + let units = propertyDetails["units"] + let propertyAttributes = propertyDetails["additionalDetails"] + let unitSet = new Set() + + for (unit of units) { + unitSet.add(unit["usageCategoryMajor"]) + } + let firecess_category_major = 0; + let firecess_building_height = 0; + let firecess_inflammable = 0; + + if (propertyUsageCategoryMajor == "RESIDENTIAL" || (unitSet.size == 1 && unitSet.has("RESIDENTIAL"))) { + // There is no category major firecess applicable as it i + firecess_category_major = 0 + } else { + firecess_category_major = 5.0 + } + + if (propertyAttributes && + propertyAttributes.heightAbove36Feet && + propertyAttributes.heightAbove36Feet.toString() == "true") { + // height is above 36 feet + firecess_building_height = 2.0 + } + + if (propertyAttributes && + propertyAttributes.inflammable && + propertyAttributes.inflammable.toString() == "true") { + // height is above 36 feet + firecess_inflammable = 10.0 + } + + return { + firecess_inflammable, + firecess_building_height, + firecess_category_major, + firecess: firecess_category_major + firecess_building_height + firecess_inflammable + } +} + +function calculateNewFireCess(taxHeads, firecess_percent, taxField, taxHeadCodeField) { + + let applicablePropertyTax = 0 + for (taxHead of taxHeads) { + if (taxHead[taxHeadCodeField] == "PT_TAX") { + applicablePropertyTax += taxHead[taxField] + } else if (taxHead[taxHeadCodeField] == "PT_UNIT_USAGE_EXEMPTION") { + applicablePropertyTax -= taxHead[taxField] + } else if (taxHead[taxHeadCodeField] == "PT_OWNER_EXEMPTION") { + applicablePropertyTax -= taxHead[taxField] + } + } + + return round(applicablePropertyTax * (firecess_percent / 100), 2); +} + +async function findDemandForConsumerCode(consumerCode, tenantId, service, RequestInfo) { + let demandSearchResponse = await request.post({ + url: PT_DEMAND_HOST + "/billing-service/demand/_search?tenantId=" + tenantId + + "&consumerCode=" + consumerCode + "&businessService=" + service, + body: { + RequestInfo + }, + json: true + }) + + return demandSearchResponse; +} + +async function updateDemand(demands, RequestInfo) { + let demandUpdateResponse = await request.post({ + url: PT_DEMAND_HOST + "/billing-service/demand/_update", + body: { + RequestInfo, + "Demands": demands + }, + json: true + }) + + return demandUpdateResponse; +} + +function _estimateTaxProcessor(request, response) { + let index = 0; + for (let calc of request["CalculationCriteria"]) { + let fireCessPercentage = getFireCessPercentage(calc["property"]["propertyDetails"][0]) + + let updateFirecessAmount = calculateNewFireCess(response["Calculation"][0]["taxHeadEstimates"], fireCessPercentage.firecess, "estimateAmount", "taxHeadCode") + let taxes = getUpdateTaxSummary(response["Calculation"][index], updateFirecessAmount, "taxHeadCode", "estimateAmount") + + response["Calculation"][index]["totalAmount"] = taxes.totalAmount + response["Calculation"][index]["taxAmount"] = round(taxes.taxAmount, 2) + response["Calculation"][index]["rebate"] = taxes.rebate + + index++ + } + + return response; +} + +function getUpdateTaxSummary(calculation, newTaxAmount, taxHeadCodeField, taxAmountField) { + let ceilingTaxHead = null; + let firecessTaxHead = null; + + let taxAmount = 0, + penalty = 0, + rebate = 0, + exemption = 0 + let taxHeads = calculation["taxHeadEstimates"] + for (taxHead of taxHeads) { + if (taxHead[taxHeadCodeField] == "PT_FIRE_CESS") { + let existingTaxAmount = taxHead[taxAmountField] + taxHead[taxAmountField] = newTaxAmount + firecessTaxHead = taxHead + taxAmount += newTaxAmount + if (DEBUG_MODE) { + taxHead.oldEstimateAmount = existingTaxAmount + } + } else { + switch (taxHead[taxHeadCodeField]) { + case "PT_DECIMAL_CEILING_CREDIT": + case "PT_DECIMAL_CEILING_DEBIT": + ceilingTaxHead = taxHead + break + case "PT_ADVANCE_CARRYFORWARD": + exemption += taxHead[taxAmountField] + break + default: + switch (taxHead.category) { + case "PENALTY": + penalty += taxHead[taxAmountField] + break + case "TAX": + taxAmount += taxHead[taxAmountField] + break + case "REBATE": + rebate += taxHead[taxAmountField] + break + case "EXEMPTION": + exemption += taxHead[taxAmountField] + break + default: + console.log("Going to default for taxHead", taxHead) + taxAmount += taxHead[taxAmountField] + } + + } + } + } + + taxAmount = round(taxAmount, 2) + penalty = round(penalty, 2) + exemption = round(exemption, 2) + rebate = round(rebate, 2) + + let totalAmount = taxAmount + penalty - rebate - exemption + + totalAmount = round(totalAmount, 2) + let fractionAmount = totalAmount - Math.trunc(totalAmount) + let newCeilingTax = false + + if (ceilingTaxHead == null && fractionAmount == 0) { + + } else { + let ceilingDelta = 0.0; + + if (ceilingTaxHead == null) { + ceilingTaxHead = { + taxHeadCode: "", + estimateAmount: 0, + category: null + } + newCeilingTax = true + taxHeads.push(ceilingTaxHead) + } + + if (fractionAmount < 0.5) { + ceilingDelta = parseFloat(fractionAmount.toFixed(2)) + totalAmount = Math.trunc(totalAmount) + ceilingTaxHead[taxHeadCodeField] = "PT_DECIMAL_CEILING_DEBIT" + ceilingTaxHead[taxAmountField] = ceilingDelta + rebate += ceilingDelta + } else { + ceilingDelta = parseFloat((1 - fractionAmount).toFixed(2)) + + totalAmount = Math.trunc(totalAmount) + 1 + ceilingTaxHead[taxHeadCodeField] = "PT_DECIMAL_CEILING_CREDIT" + ceilingTaxHead[taxAmountField] = ceilingDelta + taxAmount += ceilingDelta + } + } + + return { + taxHeads, + rebate, + totalAmount, + taxAmount, + newCeilingTax, + ceilingTaxHead, + firecessTaxHead + } +} + +async function _createAndUpdateTaxProcessor(request, response) { + let index = 0 + for (reqProperty of request["Properties"]) { + + let resProperty = response["Properties"][index] + let propertyId = resProperty["propertyId"] + + let assessmentNumber = resProperty["propertyDetails"][0]["assessmentNumber"] + + let consumerCode = propertyId + ":" + assessmentNumber + let service = "PT" + let tenantId = reqProperty["tenantId"] + + let demandSearchResponse = await findDemandForConsumerCode(consumerCode, tenantId, service, request["RequestInfo"]) + + let fireCessPercentage = getFireCessPercentage(reqProperty["propertyDetails"][0]) + + if (DEBUG_MODE) { + demandSearchResponse["Demands"][0]["firecess"] = fireCessPercentage + } + let calc = response["Properties"][index]["propertyDetails"][0]["calculation"] + let updateFirecessTax = calculateNewFireCess(calc["taxHeadEstimates"], fireCessPercentage.firecess, "estimateAmount", "taxHeadCode") + + let taxes = getUpdateTaxSummary(calc, + updateFirecessTax, "taxHeadCode", "estimateAmount") + + if (taxes.newCeilingTax) { + let firstDemand = demandSearchResponse["Demands"][0]["demandDetails"][0] + let newDemand = { + id: null, + demandId: firstDemand["demandId"], + taxHeadMasterCode: taxes.ceilingTaxHead.taxHeadCode, + taxAmount: taxes.ceilingTaxHead.estimateAmount, + tenantId: firstDemand["tenantId"], + collectionAmount: 0 + } + demandSearchResponse["Demands"][0]["demandDetails"].push(newDemand) + } + + for (demandDetail of demandSearchResponse["Demands"][0]["demandDetails"]) { + if (demandDetail.taxHeadMasterCode == "PT_FIRE_CESS") { + demandDetail.taxAmount = taxes.firecessTaxHead.estimateAmount + } + if (demandDetail.taxHeadMasterCode == "PT_DECIMAL_CEILING_DEBIT" || demandDetail.taxHeadMasterCode == "PT_DECIMAL_CEILING_DEBIT") { + demandDetail.taxHeadMasterCode = taxes.ceilingTaxHead.taxHeadCode + demandDetail.taxAmount = taxes.ceilingTaxHead.estimateAmount + } + } + + let demandUpdateResponse = await updateDemand(demandSearchResponse["Demands"], request["RequestInfo"]) + + // let updateTaxHeads = [] + + // for (taxHead of demandSearchResponse["Demands"]) { + // updateTaxHeads.push({ + // taxHeadCode: taxHead.taxHeadMasterCode, + // estimateAmount: taxHead.taxtAmount, + // category: taxHead.category + // }) + // } + + calc["totalAmount"] = taxes.totalAmount + calc["taxAmount"] = taxes.taxAmount + calc["rebate"] = taxes.rebate + // calc["taxHeadEstimates"] = updateTaxHeads + index++ + } + + return response +} + +async function _createAndUpdateRequestHandler(req, res) { + let { + request, + response + } = getRequestResponse(req) + + let tenantId = request["Properties"][0]["tenantId"] + + let fireCessConfig = await getFireCessConfig(tenantId) + if (fireCessConfig && fireCessConfig.dynamicFirecess && fireCessConfig.dynamicFirecess == true) { + let updatedResponse = await _createAndUpdateTaxProcessor(request, response) + res.json(updatedResponse); + } else { + res.json(response) + } +} + +function getRequestResponse(req) { + let request, response + + if (typeof req.body.request === "string") { + request = JSON.parse(req.body.request) + response = JSON.parse(req.body.response) + } else { + request = req.body.request + response = req.body.response + } + return { + request, + response + } +} + +router.post('/protected/punjab-pt/property/_create', asyncMiddleware(_createAndUpdateRequestHandler)) + +router.post('/protected/punjab-pt/property/_update', asyncMiddleware(_createAndUpdateRequestHandler)) + +router.post('/protected/punjab-pt/pt-calculator-v2/_estimate', asyncMiddleware(async function (req, res) { + + let { + request, + response + } = getRequestResponse(req) + + let tenantId = request["CalculationCriteria"][0]["tenantId"] + + let fireCessConfig = await getFireCessConfig(tenantId) + + if (fireCessConfig && fireCessConfig.dynamicFirecess && fireCessConfig.dynamicFirecess == true) { + let updatedResponse = _estimateTaxProcessor(request, response) + res.json(updatedResponse); + } else { + res.json(response); + } +})) + +app.listen(8000, () => { + console.log("Listening on port 8000") +}); + +// TODO: +// Add total amount to calculations "totalAmount": 460, +// "taxAmount": 510, \ No newline at end of file diff --git a/rainmaker-custom-service/package.json b/rainmaker-custom-service/package.json new file mode 100644 index 00000000..f49122be --- /dev/null +++ b/rainmaker-custom-service/package.json @@ -0,0 +1,22 @@ +{ + "name": "nodeservice", + "version": "1.0.0", + "main": "index.js", + "license": "MIT", + "dependencies": { + "bluebird": "^3.5.1", + "cryptr": "^4.0.0", + "excel4node": "^1.5.0", + "express": "^4.16.3", + "express-slash": "^2.0.1", + "jsonwebtoken": "^8.4.0", + "mustache-express": "^1.2.7", + "nodemon": "^1.18.4", + "pg-promise": "^8.4.5", + "request": "^2.88.0", + "request-promise": "^4.2.2" + }, + "scripts": { + "debug": "nodemon --inspect index.js" + } +} diff --git a/rainmaker-custom-service/static/css/bnd.css b/rainmaker-custom-service/static/css/bnd.css new file mode 100644 index 00000000..d19b007b --- /dev/null +++ b/rainmaker-custom-service/static/css/bnd.css @@ -0,0 +1,137 @@ +body { + height: 100%; + padding: 0px; + margin: 0px; + background: #333; + font-family: 'Roboto', sans-serif !important; + font-size: 1em; + } + h1 { + font-family: 'Roboto', sans-serif; + font-size: 30px; + color: #999; + font-weight: 300; + margin-bottom: 55px; + margin-top: 45px; + text-transform: uppercase; + } + h1 small { + display: block; + font-size: 18px; + text-transform: none; + letter-spacing: 1.5px; + margin-top: 12px; + } + .row { + max-width: 950px; + margin: 0 auto; + } + .btn { + white-space: normal; + } + .button-wrap { + position: relative; + text-align: center; + } + .button-wrap .btn { + font-family: 'Roboto', sans-serif; + box-shadow: 0 0 15px 5px rgba(0, 0, 0, 0.5); + border-radius: 0px; + border-color: #222; + cursor: pointer; + text-transform: uppercase; + font-size: 1.1em; + font-weight: 400; + letter-spacing: 1px; + } + .button-wrap .btn small { + font-size: 0.8rem; + letter-spacing: normal; + text-transform: none; + } + /** SPINNER CREATION **/ + .loader { + position: relative; + text-align: center; + margin: 15px auto 35px auto; + z-index: 9999; + display: block; + width: 80px; + height: 80px; + border: 10px solid rgba(0, 0, 0, 0.3); + border-radius: 50%; + border-top-color: #000; + animation: spin 1s ease-in-out infinite; + -webkit-animation: spin 1s ease-in-out infinite; + } + @keyframes spin { + to { + -webkit-transform: rotate(360deg); + } + } + @-webkit-keyframes spin { + to { + -webkit-transform: rotate(360deg); + } + } + /** MODAL STYLING **/ + .modal-content { + border-radius: 0px; + box-shadow: 0 0 20px 8px rgba(0, 0, 0, 0.7); + } + .modal-backdrop.show { + opacity: 0.75; + } + .loader-txt p { + font-size: 13px; + color: #666; + } + .loader-txt p small { + font-size: 11.5px; + color: #999; + } + + html, +body { + height: 100%; +} + +body { + display: -ms-flexbox; + display: flex; + -ms-flex-align: center; + align-items: center; + padding-top: 40px; + padding-bottom: 40px; + background-color: #f5f5f5; +} + +.form-signin { + width: 100%; + max-width: 530px; + padding: 15px; + margin: auto; +} +.form-signin .checkbox { + font-weight: 400; +} +.form-signin .form-control { + position: relative; + box-sizing: border-box; + height: auto; + padding: 10px; + font-size: 16px; +} +.form-signin .form-control:focus { + z-index: 2; +} +.form-signin input[type="email"] { + margin-bottom: -1px; + border-bottom-right-radius: 0; + border-bottom-left-radius: 0; +} +.form-signin input[type="password"] { + margin-bottom: 10px; + border-top-left-radius: 0; + border-top-right-radius: 0; +} \ No newline at end of file diff --git a/rainmaker-custom-service/static/js/bnd.js b/rainmaker-custom-service/static/js/bnd.js new file mode 100644 index 00000000..4cbfa5d6 --- /dev/null +++ b/rainmaker-custom-service/static/js/bnd.js @@ -0,0 +1,128 @@ +$(document).ready(() => { + $("#linkAccount").on('click', linkAccount) + if (getAuthToken() !== null) { + let params = (new URL(document.location)).searchParams; + if (params.get("unlink") !== null) + { + unlinkAccount(); + } else { + setTimeout(loginToBND, 10); + } + } else { + $("#msg").html("You need to be logged in to access this page") + $("#form").hide() + } +}); + +function unlinkAccount() { + axios({ + url: location.pathname.replace("/open/", "/protected/") + "/unlinkAccount", + method: 'POST', + json: true, // important + headers: { + 'Accept': 'application/json' + }, + data: { + RequestInfo: { + "authToken": getAuthToken(), + } + } + }).then((response) => { + window.location.assign(window.location.href.replace("unlink", "")) + }); +} + +function linkAccount() { + username = $("#username").val(); + password = $("#password").val() + + axios({ + url: location.pathname.replace("/open/", "/protected/") + "/linkAccount", + method: 'POST', + json: true, // important + headers: { + 'Accept': 'application/json' + }, + data: { + username: username, + password: password, + RequestInfo: { + "authToken": getAuthToken(), + } + } + }).then((response) => { + let res = response.data; + if (res && res.code && res.code == "SUCCESS" && res.redirect) { + var urlInfo = decodeURI(window.location.href).split('?'); + var path = urlInfo[0]; + $("#msg").html("The application has been opened in new window. If you want to unlink your account click here") + window.open(res.redirect,"bnd", "", true) + } else { + $("#msg").text(res.message).css("color", "red"); + } + }); +} + +function getAuthToken() { + var access_token = localStorage.getItem("token"); + return access_token; +} + +function loginToBND() { + showLoader() + try { + axios({ + url: location.href.replace("/open/", "/protected/"), + method: 'POST', + json: true, // important + headers: { + 'Accept': 'application/json' + }, + data: { + RequestInfo: { + "authToken": getAuthToken() + } + } + }).then((response) => { + hideLoader() + switch (response.data.code) { + case "NO_CREDENTIAL_MAPPING": + $('#msg').text("Please enter your eSewa Health application Username & Password to link your account") + $('#inputEmail').val(response.data.username || "") + $("#form").show() + break + case "INVALID_CREDENTIALS": + $('#msg').text(response.data.message) + $('#inputEmail').val(response.data.username || "") + $("#form").show() + break + case "SUCCESS": + $("#msg").html("The application has been opened in new window. If you want to unlink your account click here") + window.open(response.data.redirect,"bnd", "", true) + break; + default: + $('#msg').text(response.data.message || "Some error occcured while processing your request") + break + } + }).catch((err) => { + hideLoader(); + }); + } catch (ex) { + hideLoader() + } +} + +function showLoader() { + $("#loadMe").modal({ + backdrop: "static", //remove ability to close modal with click + keyboard: false, //remove option to close with keyboard + show: true //Display loader! + }); +} + +function hideLoader() { + $("#loadMe").modal("hide") + $('#loadMe').on('shown.bs.modal', function (e) { + $("#loadMe").modal('hide'); + }) +} \ No newline at end of file diff --git a/rainmaker-custom-service/templates/apicall.html b/rainmaker-custom-service/templates/apicall.html new file mode 100644 index 00000000..f6382bba --- /dev/null +++ b/rainmaker-custom-service/templates/apicall.html @@ -0,0 +1,45 @@ +{{>common/header}} +
No report available for your user type
+ +{{>common/body}} \ No newline at end of file diff --git a/rainmaker-custom-service/templates/bndlogin.html b/rainmaker-custom-service/templates/bndlogin.html new file mode 100644 index 00000000..e7290ac1 --- /dev/null +++ b/rainmaker-custom-service/templates/bndlogin.html @@ -0,0 +1,32 @@ +{{>common/header}} + + + +{{>common/scripts}} + + +{{>common/footer}} \ No newline at end of file diff --git a/rainmaker-custom-service/templates/common/footer.html b/rainmaker-custom-service/templates/common/footer.html new file mode 100644 index 00000000..1fd5f4f2 --- /dev/null +++ b/rainmaker-custom-service/templates/common/footer.html @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/rainmaker-custom-service/templates/common/header.html b/rainmaker-custom-service/templates/common/header.html new file mode 100644 index 00000000..63d94260 --- /dev/null +++ b/rainmaker-custom-service/templates/common/header.html @@ -0,0 +1,13 @@ + + + + + + + + + + + eGov Extension + + \ No newline at end of file diff --git a/rainmaker-custom-service/templates/common/scripts.html b/rainmaker-custom-service/templates/common/scripts.html new file mode 100644 index 00000000..9f6c78bb --- /dev/null +++ b/rainmaker-custom-service/templates/common/scripts.html @@ -0,0 +1,4 @@ + + + + diff --git a/rainmaker-custom-service/utils/asyncMiddleware.js b/rainmaker-custom-service/utils/asyncMiddleware.js new file mode 100644 index 00000000..e261ae12 --- /dev/null +++ b/rainmaker-custom-service/utils/asyncMiddleware.js @@ -0,0 +1,9 @@ +const asyncMiddleware = fn => + (req, res, next) => { + Promise.resolve(fn(req, res, next)) + .catch(next); + }; + +module.exports = { + asyncMiddleware +} \ No newline at end of file diff --git a/rainmaker-custom-service/yarn.lock b/rainmaker-custom-service/yarn.lock new file mode 100644 index 00000000..6abd99f7 --- /dev/null +++ b/rainmaker-custom-service/yarn.lock @@ -0,0 +1,2297 @@ +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + + +abbrev@1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" + +accepts@~1.3.5: + version "1.3.5" + resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.5.tgz#eb777df6011723a3b14e8a72c0805c8e86746bd2" + dependencies: + mime-types "~2.1.18" + negotiator "0.6.1" + +ajv@^6.5.5: + version "6.6.2" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.6.2.tgz#caceccf474bf3fc3ce3b147443711a24063cc30d" + dependencies: + fast-deep-equal "^2.0.1" + fast-json-stable-stringify "^2.0.0" + json-schema-traverse "^0.4.1" + uri-js "^4.2.2" + +ansi-align@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-2.0.0.tgz#c36aeccba563b89ceb556f3690f0b1d9e3547f7f" + dependencies: + string-width "^2.0.0" + +ansi-regex@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" + +ansi-regex@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" + +ansi-styles@^3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" + dependencies: + color-convert "^1.9.0" + +anymatch@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb" + dependencies: + micromatch "^3.1.4" + normalize-path "^2.1.1" + +aproba@^1.0.3: + version "1.2.0" + resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" + +are-we-there-yet@~1.1.2: + version "1.1.5" + resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21" + dependencies: + delegates "^1.0.0" + readable-stream "^2.0.6" + +arr-diff@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520" + +arr-flatten@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1" + +arr-union@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4" + +array-flatten@1.1.1: + version "1.1.1" + resolved "http://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" + +array-unique@^0.3.2: + version "0.3.2" + resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" + +asn1@~0.2.3: + version "0.2.4" + resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136" + dependencies: + safer-buffer "~2.1.0" + +assert-plus@1.0.0, assert-plus@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" + +assign-symbols@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367" + +async-each@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d" + +async@~2.6.0: + version "2.6.1" + resolved "https://registry.yarnpkg.com/async/-/async-2.6.1.tgz#b245a23ca71930044ec53fa46aa00a3e87c6a610" + dependencies: + lodash "^4.17.10" + +asynckit@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" + +atob@^2.1.1: + version "2.1.2" + resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" + +aws-sign2@~0.7.0: + version "0.7.0" + resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8" + +aws4@^1.8.0: + version "1.8.0" + resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f" + +balanced-match@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" + +base@^0.11.1: + version "0.11.2" + resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f" + dependencies: + cache-base "^1.0.1" + class-utils "^0.3.5" + component-emitter "^1.2.1" + define-property "^1.0.0" + isobject "^3.0.1" + mixin-deep "^1.2.0" + pascalcase "^0.1.1" + +bcrypt-pbkdf@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e" + dependencies: + tweetnacl "^0.14.3" + +binary-extensions@^1.0.0: + version "1.12.0" + resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.12.0.tgz#c2d780f53d45bba8317a8902d4ceeaf3a6385b14" + +bluebird@^3.5.0, bluebird@^3.5.1: + version "3.5.3" + resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.3.tgz#7d01c6f9616c9a51ab0f8c549a79dfe6ec33efa7" + +body-parser@1.18.3: + version "1.18.3" + resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.18.3.tgz#5b292198ffdd553b3a0f20ded0592b956955c8b4" + dependencies: + bytes "3.0.0" + content-type "~1.0.4" + debug "2.6.9" + depd "~1.1.2" + http-errors "~1.6.3" + iconv-lite "0.4.23" + on-finished "~2.3.0" + qs "6.5.2" + raw-body "2.3.3" + type-is "~1.6.16" + +boxen@^1.2.1: + version "1.3.0" + resolved "https://registry.yarnpkg.com/boxen/-/boxen-1.3.0.tgz#55c6c39a8ba58d9c61ad22cd877532deb665a20b" + dependencies: + ansi-align "^2.0.0" + camelcase "^4.0.0" + chalk "^2.0.1" + cli-boxes "^1.0.0" + string-width "^2.0.0" + term-size "^1.2.0" + widest-line "^2.0.0" + +brace-expansion@^1.1.7: + version "1.1.11" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" + dependencies: + balanced-match "^1.0.0" + concat-map "0.0.1" + +braces@^2.3.0, braces@^2.3.1: + version "2.3.2" + resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729" + dependencies: + arr-flatten "^1.1.0" + array-unique "^0.3.2" + extend-shallow "^2.0.1" + fill-range "^4.0.0" + isobject "^3.0.1" + repeat-element "^1.1.2" + snapdragon "^0.8.1" + snapdragon-node "^2.0.1" + split-string "^3.0.2" + to-regex "^3.0.1" + +buffer-equal-constant-time@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz#f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819" + +buffer-writer@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/buffer-writer/-/buffer-writer-2.0.0.tgz#ce7eb81a38f7829db09c873f2fbb792c0c98ec04" + +bytes@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048" + +cache-base@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2" + dependencies: + collection-visit "^1.0.0" + component-emitter "^1.2.1" + get-value "^2.0.6" + has-value "^1.0.0" + isobject "^3.0.1" + set-value "^2.0.0" + to-object-path "^0.3.0" + union-value "^1.0.0" + unset-value "^1.0.0" + +camelcase@^4.0.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd" + +capture-stack-trace@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz#a6c0bbe1f38f3aa0b92238ecb6ff42c344d4135d" + +caseless@~0.12.0: + version "0.12.0" + resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" + +chalk@^2.0.1: + version "2.4.1" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e" + dependencies: + ansi-styles "^3.2.1" + escape-string-regexp "^1.0.5" + supports-color "^5.3.0" + +chokidar@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.4.tgz#356ff4e2b0e8e43e322d18a372460bbcf3accd26" + dependencies: + anymatch "^2.0.0" + async-each "^1.0.0" + braces "^2.3.0" + glob-parent "^3.1.0" + inherits "^2.0.1" + is-binary-path "^1.0.0" + is-glob "^4.0.0" + lodash.debounce "^4.0.8" + normalize-path "^2.1.1" + path-is-absolute "^1.0.0" + readdirp "^2.0.0" + upath "^1.0.5" + optionalDependencies: + fsevents "^1.2.2" + +chownr@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.1.tgz#54726b8b8fff4df053c42187e801fb4412df1494" + +ci-info@^1.5.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.6.0.tgz#2ca20dbb9ceb32d4524a683303313f0304b1e497" + +class-utils@^0.3.5: + version "0.3.6" + resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463" + dependencies: + arr-union "^3.1.0" + define-property "^0.2.5" + isobject "^3.0.0" + static-extend "^0.1.1" + +cli-boxes@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-1.0.0.tgz#4fa917c3e59c94a004cd61f8ee509da651687143" + +code-point-at@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" + +collection-visit@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0" + dependencies: + map-visit "^1.0.0" + object-visit "^1.0.0" + +color-convert@^1.9.0: + version "1.9.3" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" + dependencies: + color-name "1.1.3" + +color-name@1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" + +combined-stream@^1.0.6, combined-stream@~1.0.6: + version "1.0.7" + resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.7.tgz#2d1d24317afb8abe95d6d2c0b07b57813539d828" + dependencies: + delayed-stream "~1.0.0" + +component-emitter@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6" + +concat-map@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" + +configstore@^3.0.0: + version "3.1.2" + resolved "https://registry.yarnpkg.com/configstore/-/configstore-3.1.2.tgz#c6f25defaeef26df12dd33414b001fe81a543f8f" + dependencies: + dot-prop "^4.1.0" + graceful-fs "^4.1.2" + make-dir "^1.0.0" + unique-string "^1.0.0" + write-file-atomic "^2.0.0" + xdg-basedir "^3.0.0" + +console-control-strings@^1.0.0, console-control-strings@~1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" + +content-disposition@0.5.2: + version "0.5.2" + resolved "http://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz#0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4" + +content-type@~1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b" + +cookie-signature@1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" + +cookie@0.3.1: + version "0.3.1" + resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb" + +copy-descriptor@^0.1.0: + version "0.1.1" + resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" + +core-js@~2.3.0: + version "2.3.0" + resolved "http://registry.npmjs.org/core-js/-/core-js-2.3.0.tgz#fab83fbb0b2d8dc85fa636c4b9d34c75420c6d65" + +core-util-is@1.0.2, core-util-is@~1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" + +create-error-class@^3.0.0: + version "3.0.2" + resolved "https://registry.yarnpkg.com/create-error-class/-/create-error-class-3.0.2.tgz#06be7abef947a3f14a30fd610671d401bca8b7b6" + dependencies: + capture-stack-trace "^1.0.0" + +cross-spawn@^5.0.1: + version "5.1.0" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449" + dependencies: + lru-cache "^4.0.1" + shebang-command "^1.2.0" + which "^1.2.9" + +crypto-random-string@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-1.0.0.tgz#a230f64f568310e1498009940790ec99545bca7e" + +cryptr@^4.0.0: + version "4.0.2" + resolved "https://registry.yarnpkg.com/cryptr/-/cryptr-4.0.2.tgz#8a93b5ca7667d1a6131e396bab23a134ff1f5dc6" + +dashdash@^1.12.0: + version "1.14.1" + resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0" + dependencies: + assert-plus "^1.0.0" + +debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3: + version "2.6.9" + resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" + dependencies: + ms "2.0.0" + +debug@^3.1.0: + version "3.2.6" + resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b" + dependencies: + ms "^2.1.1" + +decode-uri-component@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545" + +deep-extend@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" + +deepmerge@2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-2.1.1.tgz#e862b4e45ea0555072bf51e7fd0d9845170ae768" + +define-property@^0.2.5: + version "0.2.5" + resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116" + dependencies: + is-descriptor "^0.1.0" + +define-property@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6" + dependencies: + is-descriptor "^1.0.0" + +define-property@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d" + dependencies: + is-descriptor "^1.0.2" + isobject "^3.0.1" + +delayed-stream@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" + +delegates@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" + +depd@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" + +destroy@~1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80" + +detect-libc@^1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" + +dot-prop@^4.1.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.0.tgz#1f19e0c2e1aa0e32797c49799f2837ac6af69c57" + dependencies: + is-obj "^1.0.0" + +duplexer3@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2" + +ecc-jsbn@~0.1.1: + version "0.1.2" + resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9" + dependencies: + jsbn "~0.1.0" + safer-buffer "^2.1.0" + +ecdsa-sig-formatter@1.0.10: + version "1.0.10" + resolved "https://registry.yarnpkg.com/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.10.tgz#1c595000f04a8897dfb85000892a0f4c33af86c3" + dependencies: + safe-buffer "^5.0.1" + +ee-first@1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" + +encodeurl@~1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" + +es6-promise@~3.0.2: + version "3.0.2" + resolved "http://registry.npmjs.org/es6-promise/-/es6-promise-3.0.2.tgz#010d5858423a5f118979665f46486a95c6ee2bb6" + +escape-html@~1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" + +escape-string-regexp@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" + +etag@~1.8.1: + version "1.8.1" + resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" + +excel4node@^1.5.0: + version "1.7.0" + resolved "https://registry.yarnpkg.com/excel4node/-/excel4node-1.7.0.tgz#e7f8a797284832d86dda8713745323cd2302d9d2" + dependencies: + deepmerge "2.1.1" + image-size "0.6.3" + jszip "3.1.5" + lodash.get "4.4.2" + lodash.isequal "4.5.0" + lodash.isundefined "3.0.1" + lodash.reduce "4.6.0" + lodash.uniqueid "4.0.1" + mime "2.3.1" + uuid "3.3.2" + xmlbuilder "10.0.0" + +execa@^0.7.0: + version "0.7.0" + resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777" + dependencies: + cross-spawn "^5.0.1" + get-stream "^3.0.0" + is-stream "^1.1.0" + npm-run-path "^2.0.0" + p-finally "^1.0.0" + signal-exit "^3.0.0" + strip-eof "^1.0.0" + +expand-brackets@^2.1.4: + version "2.1.4" + resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622" + dependencies: + debug "^2.3.3" + define-property "^0.2.5" + extend-shallow "^2.0.1" + posix-character-classes "^0.1.0" + regex-not "^1.0.0" + snapdragon "^0.8.1" + to-regex "^3.0.1" + +express-slash@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/express-slash/-/express-slash-2.0.1.tgz#76eb869fed8f71ae4f98785cbe00bf1bb454d627" + +express@^4.16.3: + version "4.16.4" + resolved "https://registry.yarnpkg.com/express/-/express-4.16.4.tgz#fddef61926109e24c515ea97fd2f1bdbf62df12e" + dependencies: + accepts "~1.3.5" + array-flatten "1.1.1" + body-parser "1.18.3" + content-disposition "0.5.2" + content-type "~1.0.4" + cookie "0.3.1" + cookie-signature "1.0.6" + debug "2.6.9" + depd "~1.1.2" + encodeurl "~1.0.2" + escape-html "~1.0.3" + etag "~1.8.1" + finalhandler "1.1.1" + fresh "0.5.2" + merge-descriptors "1.0.1" + methods "~1.1.2" + on-finished "~2.3.0" + parseurl "~1.3.2" + path-to-regexp "0.1.7" + proxy-addr "~2.0.4" + qs "6.5.2" + range-parser "~1.2.0" + safe-buffer "5.1.2" + send "0.16.2" + serve-static "1.13.2" + setprototypeof "1.1.0" + statuses "~1.4.0" + type-is "~1.6.16" + utils-merge "1.0.1" + vary "~1.1.2" + +extend-shallow@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f" + dependencies: + is-extendable "^0.1.0" + +extend-shallow@^3.0.0, extend-shallow@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8" + dependencies: + assign-symbols "^1.0.0" + is-extendable "^1.0.1" + +extend@~3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" + +extglob@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543" + dependencies: + array-unique "^0.3.2" + define-property "^1.0.0" + expand-brackets "^2.1.4" + extend-shallow "^2.0.1" + fragment-cache "^0.2.1" + regex-not "^1.0.0" + snapdragon "^0.8.1" + to-regex "^3.0.1" + +extsprintf@1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05" + +extsprintf@^1.2.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f" + +fast-deep-equal@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49" + +fast-json-stable-stringify@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2" + +fill-range@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7" + dependencies: + extend-shallow "^2.0.1" + is-number "^3.0.0" + repeat-string "^1.6.1" + to-regex-range "^2.1.0" + +finalhandler@1.1.1: + version "1.1.1" + resolved "http://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz#eebf4ed840079c83f4249038c9d703008301b105" + dependencies: + debug "2.6.9" + encodeurl "~1.0.2" + escape-html "~1.0.3" + on-finished "~2.3.0" + parseurl "~1.3.2" + statuses "~1.4.0" + unpipe "~1.0.0" + +for-in@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" + +forever-agent@~0.6.1: + version "0.6.1" + resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" + +form-data@~2.3.2: + version "2.3.3" + resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6" + dependencies: + asynckit "^0.4.0" + combined-stream "^1.0.6" + mime-types "^2.1.12" + +forwarded@~0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84" + +fragment-cache@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19" + dependencies: + map-cache "^0.2.2" + +fresh@0.5.2: + version "0.5.2" + resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" + +fs-minipass@^1.2.5: + version "1.2.5" + resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.5.tgz#06c277218454ec288df77ada54a03b8702aacb9d" + dependencies: + minipass "^2.2.1" + +fs.realpath@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" + +fsevents@^1.2.2: + version "1.2.4" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.4.tgz#f41dcb1af2582af3692da36fc55cbd8e1041c426" + dependencies: + nan "^2.9.2" + node-pre-gyp "^0.10.0" + +gauge@~2.7.3: + version "2.7.4" + resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7" + dependencies: + aproba "^1.0.3" + console-control-strings "^1.0.0" + has-unicode "^2.0.0" + object-assign "^4.1.0" + signal-exit "^3.0.0" + string-width "^1.0.1" + strip-ansi "^3.0.1" + wide-align "^1.1.0" + +get-stream@^3.0.0: + version "3.0.0" + resolved "http://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14" + +get-value@^2.0.3, get-value@^2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28" + +getpass@^0.1.1: + version "0.1.7" + resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa" + dependencies: + assert-plus "^1.0.0" + +glob-parent@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae" + dependencies: + is-glob "^3.1.0" + path-dirname "^1.0.0" + +glob@^7.0.5: + version "7.1.3" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1" + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.0.4" + once "^1.3.0" + path-is-absolute "^1.0.0" + +global-dirs@^0.1.0: + version "0.1.1" + resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-0.1.1.tgz#b319c0dd4607f353f3be9cca4c72fc148c49f445" + dependencies: + ini "^1.3.4" + +got@^6.7.1: + version "6.7.1" + resolved "http://registry.npmjs.org/got/-/got-6.7.1.tgz#240cd05785a9a18e561dc1b44b41c763ef1e8db0" + dependencies: + create-error-class "^3.0.0" + duplexer3 "^0.1.4" + get-stream "^3.0.0" + is-redirect "^1.0.0" + is-retry-allowed "^1.0.0" + is-stream "^1.0.0" + lowercase-keys "^1.0.0" + safe-buffer "^5.0.1" + timed-out "^4.0.0" + unzip-response "^2.0.1" + url-parse-lax "^1.0.0" + +graceful-fs@^4.1.11, graceful-fs@^4.1.2: + version "4.1.15" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00" + +har-schema@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92" + +har-validator@~5.1.0: + version "5.1.3" + resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz#1ef89ebd3e4996557675eed9893110dc350fa080" + dependencies: + ajv "^6.5.5" + har-schema "^2.0.0" + +has-flag@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" + +has-unicode@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" + +has-value@^0.3.1: + version "0.3.1" + resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f" + dependencies: + get-value "^2.0.3" + has-values "^0.1.4" + isobject "^2.0.0" + +has-value@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177" + dependencies: + get-value "^2.0.6" + has-values "^1.0.0" + isobject "^3.0.0" + +has-values@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771" + +has-values@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f" + dependencies: + is-number "^3.0.0" + kind-of "^4.0.0" + +http-errors@1.6.3, http-errors@~1.6.2, http-errors@~1.6.3: + version "1.6.3" + resolved "http://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d" + dependencies: + depd "~1.1.2" + inherits "2.0.3" + setprototypeof "1.1.0" + statuses ">= 1.4.0 < 2" + +http-signature@~1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1" + dependencies: + assert-plus "^1.0.0" + jsprim "^1.2.2" + sshpk "^1.7.0" + +iconv-lite@0.4.23: + version "0.4.23" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63" + dependencies: + safer-buffer ">= 2.1.2 < 3" + +iconv-lite@^0.4.4: + version "0.4.24" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" + dependencies: + safer-buffer ">= 2.1.2 < 3" + +ignore-by-default@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/ignore-by-default/-/ignore-by-default-1.0.1.tgz#48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09" + +ignore-walk@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.1.tgz#a83e62e7d272ac0e3b551aaa82831a19b69f82f8" + dependencies: + minimatch "^3.0.4" + +image-size@0.6.3: + version "0.6.3" + resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.6.3.tgz#e7e5c65bb534bd7cdcedd6cb5166272a85f75fb2" + +immediate@~3.0.5: + version "3.0.6" + resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b" + +import-lazy@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43" + +imurmurhash@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" + +inflight@^1.0.4: + version "1.0.6" + resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" + dependencies: + once "^1.3.0" + wrappy "1" + +inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@~2.0.1, inherits@~2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" + +ini@^1.3.4, ini@~1.3.0: + version "1.3.5" + resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" + +ipaddr.js@1.8.0: + version "1.8.0" + resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.8.0.tgz#eaa33d6ddd7ace8f7f6fe0c9ca0440e706738b1e" + +is-accessor-descriptor@^0.1.6: + version "0.1.6" + resolved "http://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6" + dependencies: + kind-of "^3.0.2" + +is-accessor-descriptor@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656" + dependencies: + kind-of "^6.0.0" + +is-binary-path@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898" + dependencies: + binary-extensions "^1.0.0" + +is-buffer@^1.1.5: + version "1.1.6" + resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" + +is-ci@^1.0.10: + version "1.2.1" + resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.2.1.tgz#e3779c8ee17fccf428488f6e281187f2e632841c" + dependencies: + ci-info "^1.5.0" + +is-data-descriptor@^0.1.4: + version "0.1.4" + resolved "http://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56" + dependencies: + kind-of "^3.0.2" + +is-data-descriptor@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7" + dependencies: + kind-of "^6.0.0" + +is-descriptor@^0.1.0: + version "0.1.6" + resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca" + dependencies: + is-accessor-descriptor "^0.1.6" + is-data-descriptor "^0.1.4" + kind-of "^5.0.0" + +is-descriptor@^1.0.0, is-descriptor@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec" + dependencies: + is-accessor-descriptor "^1.0.0" + is-data-descriptor "^1.0.0" + kind-of "^6.0.2" + +is-extendable@^0.1.0, is-extendable@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" + +is-extendable@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4" + dependencies: + is-plain-object "^2.0.4" + +is-extglob@^2.1.0, is-extglob@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" + +is-fullwidth-code-point@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb" + dependencies: + number-is-nan "^1.0.0" + +is-fullwidth-code-point@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" + +is-glob@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a" + dependencies: + is-extglob "^2.1.0" + +is-glob@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.0.tgz#9521c76845cc2610a85203ddf080a958c2ffabc0" + dependencies: + is-extglob "^2.1.1" + +is-installed-globally@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.1.0.tgz#0dfd98f5a9111716dd535dda6492f67bf3d25a80" + dependencies: + global-dirs "^0.1.0" + is-path-inside "^1.0.0" + +is-npm@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-1.0.0.tgz#f2fb63a65e4905b406c86072765a1a4dc793b9f4" + +is-number@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195" + dependencies: + kind-of "^3.0.2" + +is-obj@^1.0.0: + version "1.0.1" + resolved "http://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f" + +is-path-inside@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz#8ef5b7de50437a3fdca6b4e865ef7aa55cb48036" + dependencies: + path-is-inside "^1.0.1" + +is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" + dependencies: + isobject "^3.0.1" + +is-redirect@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-redirect/-/is-redirect-1.0.0.tgz#1d03dded53bd8db0f30c26e4f95d36fc7c87dc24" + +is-retry-allowed@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz#11a060568b67339444033d0125a61a20d564fb34" + +is-stream@^1.0.0, is-stream@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" + +is-typedarray@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" + +is-windows@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" + +isarray@1.0.0, isarray@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" + +isexe@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" + +isobject@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89" + dependencies: + isarray "1.0.0" + +isobject@^3.0.0, isobject@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" + +isstream@~0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" + +jsbn@~0.1.0: + version "0.1.1" + resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" + +json-schema-traverse@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" + +json-schema@0.2.3: + version "0.2.3" + resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13" + +json-stringify-safe@~5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" + +jsonwebtoken@^8.4.0: + version "8.4.0" + resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-8.4.0.tgz#8757f7b4cb7440d86d5e2f3becefa70536c8e46a" + dependencies: + jws "^3.1.5" + lodash.includes "^4.3.0" + lodash.isboolean "^3.0.3" + lodash.isinteger "^4.0.4" + lodash.isnumber "^3.0.3" + lodash.isplainobject "^4.0.6" + lodash.isstring "^4.0.1" + lodash.once "^4.0.0" + ms "^2.1.1" + +jsprim@^1.2.2: + version "1.4.1" + resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2" + dependencies: + assert-plus "1.0.0" + extsprintf "1.3.0" + json-schema "0.2.3" + verror "1.10.0" + +jszip@3.1.5: + version "3.1.5" + resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.1.5.tgz#e3c2a6c6d706ac6e603314036d43cd40beefdf37" + dependencies: + core-js "~2.3.0" + es6-promise "~3.0.2" + lie "~3.1.0" + pako "~1.0.2" + readable-stream "~2.0.6" + +jwa@^1.1.5: + version "1.1.6" + resolved "https://registry.yarnpkg.com/jwa/-/jwa-1.1.6.tgz#87240e76c9808dbde18783cf2264ef4929ee50e6" + dependencies: + buffer-equal-constant-time "1.0.1" + ecdsa-sig-formatter "1.0.10" + safe-buffer "^5.0.1" + +jws@^3.1.5: + version "3.1.5" + resolved "https://registry.yarnpkg.com/jws/-/jws-3.1.5.tgz#80d12d05b293d1e841e7cb8b4e69e561adcf834f" + dependencies: + jwa "^1.1.5" + safe-buffer "^5.0.1" + +kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0: + version "3.2.2" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" + dependencies: + is-buffer "^1.1.5" + +kind-of@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57" + dependencies: + is-buffer "^1.1.5" + +kind-of@^5.0.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d" + +kind-of@^6.0.0, kind-of@^6.0.2: + version "6.0.2" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051" + +latest-version@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-3.1.0.tgz#a205383fea322b33b5ae3b18abee0dc2f356ee15" + dependencies: + package-json "^4.0.0" + +lie@~3.1.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/lie/-/lie-3.1.1.tgz#9a436b2cc7746ca59de7a41fa469b3efb76bd87e" + dependencies: + immediate "~3.0.5" + +lodash.debounce@^4.0.8: + version "4.0.8" + resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" + +lodash.get@4.4.2: + version "4.4.2" + resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99" + +lodash.includes@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/lodash.includes/-/lodash.includes-4.3.0.tgz#60bb98a87cb923c68ca1e51325483314849f553f" + +lodash.isboolean@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz#6c2e171db2a257cd96802fd43b01b20d5f5870f6" + +lodash.isequal@4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0" + +lodash.isinteger@^4.0.4: + version "4.0.4" + resolved "https://registry.yarnpkg.com/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz#619c0af3d03f8b04c31f5882840b77b11cd68343" + +lodash.isnumber@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz#3ce76810c5928d03352301ac287317f11c0b1ffc" + +lodash.isplainobject@^4.0.6: + version "4.0.6" + resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb" + +lodash.isstring@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451" + +lodash.isundefined@3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/lodash.isundefined/-/lodash.isundefined-3.0.1.tgz#23ef3d9535565203a66cefd5b830f848911afb48" + +lodash.once@^4.0.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac" + +lodash.reduce@4.6.0: + version "4.6.0" + resolved "https://registry.yarnpkg.com/lodash.reduce/-/lodash.reduce-4.6.0.tgz#f1ab6b839299ad48f784abbf476596f03b914d3b" + +lodash.uniqueid@4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/lodash.uniqueid/-/lodash.uniqueid-4.0.1.tgz#3268f26a7c88e4f4b1758d679271814e31fa5b26" + +lodash@^4.13.1, lodash@^4.17.10: + version "4.17.14" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.14.tgz#9ce487ae66c96254fe20b599f21b6816028078ba" + +lowercase-keys@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f" + +lru-cache@^4.0.1, lru-cache@~4.1.3: + version "4.1.5" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd" + dependencies: + pseudomap "^1.0.2" + yallist "^2.1.2" + +make-dir@^1.0.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c" + dependencies: + pify "^3.0.0" + +manakin@0.5.2: + version "0.5.2" + resolved "https://registry.yarnpkg.com/manakin/-/manakin-0.5.2.tgz#abe3df430ca6085f6983f6e4cf5af0298f4d30cc" + +map-cache@^0.2.2: + version "0.2.2" + resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf" + +map-visit@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f" + dependencies: + object-visit "^1.0.0" + +media-typer@0.3.0: + version "0.3.0" + resolved "http://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" + +merge-descriptors@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" + +methods@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" + +micromatch@^3.1.10, micromatch@^3.1.4: + version "3.1.10" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23" + dependencies: + arr-diff "^4.0.0" + array-unique "^0.3.2" + braces "^2.3.1" + define-property "^2.0.2" + extend-shallow "^3.0.2" + extglob "^2.0.4" + fragment-cache "^0.2.1" + kind-of "^6.0.2" + nanomatch "^1.2.9" + object.pick "^1.3.0" + regex-not "^1.0.0" + snapdragon "^0.8.1" + to-regex "^3.0.2" + +mime-db@~1.37.0: + version "1.37.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.37.0.tgz#0b6a0ce6fdbe9576e25f1f2d2fde8830dc0ad0d8" + +mime-types@^2.1.12, mime-types@~2.1.18, mime-types@~2.1.19: + version "2.1.21" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.21.tgz#28995aa1ecb770742fe6ae7e58f9181c744b3f96" + dependencies: + mime-db "~1.37.0" + +mime@1.4.1: + version "1.4.1" + resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6" + +mime@2.3.1: + version "2.3.1" + resolved "http://registry.npmjs.org/mime/-/mime-2.3.1.tgz#b1621c54d63b97c47d3cfe7f7215f7d64517c369" + +minimatch@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" + dependencies: + brace-expansion "^1.1.7" + +minimist@0.0.8: + version "0.0.8" + resolved "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" + +minimist@^1.2.0: + version "1.2.0" + resolved "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" + +minipass@^2.2.1, minipass@^2.3.4: + version "2.3.5" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.5.tgz#cacebe492022497f656b0f0f51e2682a9ed2d848" + dependencies: + safe-buffer "^5.1.2" + yallist "^3.0.0" + +minizlib@^1.1.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.2.1.tgz#dd27ea6136243c7c880684e8672bb3a45fd9b614" + dependencies: + minipass "^2.2.1" + +mixin-deep@^1.2.0: + version "1.3.1" + resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.1.tgz#a49e7268dce1a0d9698e45326c5626df3543d0fe" + dependencies: + for-in "^1.0.2" + is-extendable "^1.0.1" + +mkdirp@^0.5.0, mkdirp@^0.5.1: + version "0.5.1" + resolved "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" + dependencies: + minimist "0.0.8" + +ms@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" + +ms@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a" + +mustache-express@^1.2.7: + version "1.2.8" + resolved "https://registry.yarnpkg.com/mustache-express/-/mustache-express-1.2.8.tgz#caf3fc93e5b729e92077b1c4ff713aba4bced259" + dependencies: + async "~2.6.0" + lru-cache "~4.1.3" + mustache "~2.3.0" + +mustache@~2.3.0: + version "2.3.2" + resolved "https://registry.yarnpkg.com/mustache/-/mustache-2.3.2.tgz#a6d4d9c3f91d13359ab889a812954f9230a3d0c5" + +nan@^2.9.2: + version "2.12.1" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.12.1.tgz#7b1aa193e9aa86057e3c7bbd0ac448e770925552" + +nanomatch@^1.2.9: + version "1.2.13" + resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119" + dependencies: + arr-diff "^4.0.0" + array-unique "^0.3.2" + define-property "^2.0.2" + extend-shallow "^3.0.2" + fragment-cache "^0.2.1" + is-windows "^1.0.2" + kind-of "^6.0.2" + object.pick "^1.3.0" + regex-not "^1.0.0" + snapdragon "^0.8.1" + to-regex "^3.0.1" + +needle@^2.2.1: + version "2.2.4" + resolved "https://registry.yarnpkg.com/needle/-/needle-2.2.4.tgz#51931bff82533b1928b7d1d69e01f1b00ffd2a4e" + dependencies: + debug "^2.1.2" + iconv-lite "^0.4.4" + sax "^1.2.4" + +negotiator@0.6.1: + version "0.6.1" + resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9" + +node-pre-gyp@^0.10.0: + version "0.10.3" + resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.10.3.tgz#3070040716afdc778747b61b6887bf78880b80fc" + dependencies: + detect-libc "^1.0.2" + mkdirp "^0.5.1" + needle "^2.2.1" + nopt "^4.0.1" + npm-packlist "^1.1.6" + npmlog "^4.0.2" + rc "^1.2.7" + rimraf "^2.6.1" + semver "^5.3.0" + tar "^4" + +nodemon@^1.18.4: + version "1.18.9" + resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-1.18.9.tgz#90b467efd3b3c81b9453380aeb2a2cba535d0ead" + dependencies: + chokidar "^2.0.4" + debug "^3.1.0" + ignore-by-default "^1.0.1" + minimatch "^3.0.4" + pstree.remy "^1.1.6" + semver "^5.5.0" + supports-color "^5.2.0" + touch "^3.1.0" + undefsafe "^2.0.2" + update-notifier "^2.5.0" + +nopt@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d" + dependencies: + abbrev "1" + osenv "^0.1.4" + +nopt@~1.0.10: + version "1.0.10" + resolved "https://registry.yarnpkg.com/nopt/-/nopt-1.0.10.tgz#6ddd21bd2a31417b92727dd585f8a6f37608ebee" + dependencies: + abbrev "1" + +normalize-path@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9" + dependencies: + remove-trailing-separator "^1.0.1" + +npm-bundled@^1.0.1: + version "1.0.5" + resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.5.tgz#3c1732b7ba936b3a10325aef616467c0ccbcc979" + +npm-packlist@^1.1.6: + version "1.1.12" + resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.1.12.tgz#22bde2ebc12e72ca482abd67afc51eb49377243a" + dependencies: + ignore-walk "^3.0.1" + npm-bundled "^1.0.1" + +npm-run-path@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f" + dependencies: + path-key "^2.0.0" + +npmlog@^4.0.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" + dependencies: + are-we-there-yet "~1.1.2" + console-control-strings "~1.1.0" + gauge "~2.7.3" + set-blocking "~2.0.0" + +number-is-nan@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" + +oauth-sign@~0.9.0: + version "0.9.0" + resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455" + +object-assign@^4.1.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" + +object-copy@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c" + dependencies: + copy-descriptor "^0.1.0" + define-property "^0.2.5" + kind-of "^3.0.3" + +object-visit@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb" + dependencies: + isobject "^3.0.0" + +object.pick@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747" + dependencies: + isobject "^3.0.1" + +on-finished@~2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947" + dependencies: + ee-first "1.1.1" + +once@^1.3.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" + dependencies: + wrappy "1" + +os-homedir@^1.0.0: + version "1.0.2" + resolved "http://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" + +os-tmpdir@^1.0.0: + version "1.0.2" + resolved "http://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" + +osenv@^0.1.4: + version "0.1.5" + resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410" + dependencies: + os-homedir "^1.0.0" + os-tmpdir "^1.0.0" + +p-finally@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae" + +package-json@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/package-json/-/package-json-4.0.1.tgz#8869a0401253661c4c4ca3da6c2121ed555f5eed" + dependencies: + got "^6.7.1" + registry-auth-token "^3.0.1" + registry-url "^3.0.3" + semver "^5.1.0" + +packet-reader@0.3.1: + version "0.3.1" + resolved "https://registry.yarnpkg.com/packet-reader/-/packet-reader-0.3.1.tgz#cd62e60af8d7fea8a705ec4ff990871c46871f27" + +pako@~1.0.2: + version "1.0.7" + resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.7.tgz#2473439021b57f1516c82f58be7275ad8ef1bb27" + +parseurl@~1.3.2: + version "1.3.2" + resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.2.tgz#fc289d4ed8993119460c156253262cdc8de65bf3" + +pascalcase@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14" + +path-dirname@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0" + +path-is-absolute@^1.0.0: + version "1.0.1" + resolved "http://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" + +path-is-inside@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53" + +path-key@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40" + +path-to-regexp@0.1.7: + version "0.1.7" + resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" + +performance-now@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" + +pg-connection-string@0.1.3: + version "0.1.3" + resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-0.1.3.tgz#da1847b20940e42ee1492beaf65d49d91b245df7" + +pg-minify@0.5.5: + version "0.5.5" + resolved "https://registry.yarnpkg.com/pg-minify/-/pg-minify-0.5.5.tgz#6c961a61aa19f469d8edfe5a3c0da58760f3c339" + +pg-pool@^2.0.4: + version "2.0.5" + resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-2.0.5.tgz#f00556fab23f1bbb14b0650ba8d0e447434a1b04" + +pg-promise@^8.4.5: + version "8.5.4" + resolved "https://registry.yarnpkg.com/pg-promise/-/pg-promise-8.5.4.tgz#3c1c656d340b1d8e21bbd8017a650c795b375aca" + dependencies: + manakin "0.5.2" + pg "7.7.1" + pg-minify "0.5.5" + spex "2.1.0" + +pg-types@~1.12.1: + version "1.12.1" + resolved "https://registry.yarnpkg.com/pg-types/-/pg-types-1.12.1.tgz#d64087e3903b58ffaad279e7595c52208a14c3d2" + dependencies: + postgres-array "~1.0.0" + postgres-bytea "~1.0.0" + postgres-date "~1.0.0" + postgres-interval "^1.1.0" + +pg@7.7.1: + version "7.7.1" + resolved "https://registry.yarnpkg.com/pg/-/pg-7.7.1.tgz#546b192ff484322b69689391f885de3ba91a30d4" + dependencies: + buffer-writer "2.0.0" + packet-reader "0.3.1" + pg-connection-string "0.1.3" + pg-pool "^2.0.4" + pg-types "~1.12.1" + pgpass "1.x" + semver "4.3.2" + +pgpass@1.x: + version "1.0.2" + resolved "https://registry.yarnpkg.com/pgpass/-/pgpass-1.0.2.tgz#2a7bb41b6065b67907e91da1b07c1847c877b306" + dependencies: + split "^1.0.0" + +pify@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176" + +posix-character-classes@^0.1.0: + version "0.1.1" + resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" + +postgres-array@~1.0.0: + version "1.0.3" + resolved "https://registry.yarnpkg.com/postgres-array/-/postgres-array-1.0.3.tgz#c561fc3b266b21451fc6555384f4986d78ec80f5" + +postgres-bytea@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/postgres-bytea/-/postgres-bytea-1.0.0.tgz#027b533c0aa890e26d172d47cf9ccecc521acd35" + +postgres-date@~1.0.0: + version "1.0.3" + resolved "https://registry.yarnpkg.com/postgres-date/-/postgres-date-1.0.3.tgz#e2d89702efdb258ff9d9cee0fe91bd06975257a8" + +postgres-interval@^1.1.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/postgres-interval/-/postgres-interval-1.1.2.tgz#bf71ff902635f21cb241a013fc421d81d1db15a9" + dependencies: + xtend "^4.0.0" + +prepend-http@^1.0.1: + version "1.0.4" + resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc" + +process-nextick-args@~1.0.6: + version "1.0.7" + resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3" + +process-nextick-args@~2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa" + +proxy-addr@~2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.4.tgz#ecfc733bf22ff8c6f407fa275327b9ab67e48b93" + dependencies: + forwarded "~0.1.2" + ipaddr.js "1.8.0" + +pseudomap@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3" + +psl@^1.1.24, psl@^1.1.28: + version "1.1.31" + resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.31.tgz#e9aa86d0101b5b105cbe93ac6b784cd547276184" + +pstree.remy@^1.1.6: + version "1.1.6" + resolved "https://registry.yarnpkg.com/pstree.remy/-/pstree.remy-1.1.6.tgz#73a55aad9e2d95814927131fbf4dc1b62d259f47" + +punycode@^1.4.1: + version "1.4.1" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" + +punycode@^2.1.0, punycode@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" + +qs@6.5.2, qs@~6.5.2: + version "6.5.2" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36" + +range-parser@~1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e" + +raw-body@2.3.3: + version "2.3.3" + resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.3.3.tgz#1b324ece6b5706e153855bc1148c65bb7f6ea0c3" + dependencies: + bytes "3.0.0" + http-errors "1.6.3" + iconv-lite "0.4.23" + unpipe "1.0.0" + +rc@^1.0.1, rc@^1.1.6, rc@^1.2.7: + version "1.2.8" + resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" + dependencies: + deep-extend "^0.6.0" + ini "~1.3.0" + minimist "^1.2.0" + strip-json-comments "~2.0.1" + +readable-stream@^2.0.2, readable-stream@^2.0.6: + version "2.3.6" + resolved "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf" + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.3" + isarray "~1.0.0" + process-nextick-args "~2.0.0" + safe-buffer "~5.1.1" + string_decoder "~1.1.1" + util-deprecate "~1.0.1" + +readable-stream@~2.0.6: + version "2.0.6" + resolved "http://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e" + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.1" + isarray "~1.0.0" + process-nextick-args "~1.0.6" + string_decoder "~0.10.x" + util-deprecate "~1.0.1" + +readdirp@^2.0.0: + version "2.2.1" + resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525" + dependencies: + graceful-fs "^4.1.11" + micromatch "^3.1.10" + readable-stream "^2.0.2" + +regex-not@^1.0.0, regex-not@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c" + dependencies: + extend-shallow "^3.0.2" + safe-regex "^1.1.0" + +registry-auth-token@^3.0.1: + version "3.3.2" + resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.3.2.tgz#851fd49038eecb586911115af845260eec983f20" + dependencies: + rc "^1.1.6" + safe-buffer "^5.0.1" + +registry-url@^3.0.3: + version "3.1.0" + resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-3.1.0.tgz#3d4ef870f73dde1d77f0cf9a381432444e174942" + dependencies: + rc "^1.0.1" + +remove-trailing-separator@^1.0.1: + version "1.1.0" + resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef" + +repeat-element@^1.1.2: + version "1.1.3" + resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce" + +repeat-string@^1.6.1: + version "1.6.1" + resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" + +request-promise-core@1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.1.tgz#3eee00b2c5aa83239cfb04c5700da36f81cd08b6" + dependencies: + lodash "^4.13.1" + +request-promise@^4.2.2: + version "4.2.2" + resolved "https://registry.yarnpkg.com/request-promise/-/request-promise-4.2.2.tgz#d1ea46d654a6ee4f8ee6a4fea1018c22911904b4" + dependencies: + bluebird "^3.5.0" + request-promise-core "1.1.1" + stealthy-require "^1.1.0" + tough-cookie ">=2.3.3" + +request@^2.88.0: + version "2.88.0" + resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef" + dependencies: + aws-sign2 "~0.7.0" + aws4 "^1.8.0" + caseless "~0.12.0" + combined-stream "~1.0.6" + extend "~3.0.2" + forever-agent "~0.6.1" + form-data "~2.3.2" + har-validator "~5.1.0" + http-signature "~1.2.0" + is-typedarray "~1.0.0" + isstream "~0.1.2" + json-stringify-safe "~5.0.1" + mime-types "~2.1.19" + oauth-sign "~0.9.0" + performance-now "^2.1.0" + qs "~6.5.2" + safe-buffer "^5.1.2" + tough-cookie "~2.4.3" + tunnel-agent "^0.6.0" + uuid "^3.3.2" + +resolve-url@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" + +ret@~0.1.10: + version "0.1.15" + resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc" + +rimraf@^2.6.1: + version "2.6.2" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36" + dependencies: + glob "^7.0.5" + +safe-buffer@5.1.2, safe-buffer@^5.0.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: + version "5.1.2" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" + +safe-regex@^1.1.0: + version "1.1.0" + resolved "http://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e" + dependencies: + ret "~0.1.10" + +"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: + version "2.1.2" + resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" + +sax@^1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" + +semver-diff@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-2.1.0.tgz#4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36" + dependencies: + semver "^5.0.3" + +semver@4.3.2: + version "4.3.2" + resolved "http://registry.npmjs.org/semver/-/semver-4.3.2.tgz#c7a07158a80bedd052355b770d82d6640f803be7" + +semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.5.0: + version "5.6.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004" + +send@0.16.2: + version "0.16.2" + resolved "https://registry.yarnpkg.com/send/-/send-0.16.2.tgz#6ecca1e0f8c156d141597559848df64730a6bbc1" + dependencies: + debug "2.6.9" + depd "~1.1.2" + destroy "~1.0.4" + encodeurl "~1.0.2" + escape-html "~1.0.3" + etag "~1.8.1" + fresh "0.5.2" + http-errors "~1.6.2" + mime "1.4.1" + ms "2.0.0" + on-finished "~2.3.0" + range-parser "~1.2.0" + statuses "~1.4.0" + +serve-static@1.13.2: + version "1.13.2" + resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.2.tgz#095e8472fd5b46237db50ce486a43f4b86c6cec1" + dependencies: + encodeurl "~1.0.2" + escape-html "~1.0.3" + parseurl "~1.3.2" + send "0.16.2" + +set-blocking@~2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" + +set-value@^0.4.3: + version "0.4.3" + resolved "https://registry.yarnpkg.com/set-value/-/set-value-0.4.3.tgz#7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1" + dependencies: + extend-shallow "^2.0.1" + is-extendable "^0.1.1" + is-plain-object "^2.0.1" + to-object-path "^0.3.0" + +set-value@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.0.tgz#71ae4a88f0feefbbf52d1ea604f3fb315ebb6274" + dependencies: + extend-shallow "^2.0.1" + is-extendable "^0.1.1" + is-plain-object "^2.0.3" + split-string "^3.0.1" + +setprototypeof@1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656" + +shebang-command@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" + dependencies: + shebang-regex "^1.0.0" + +shebang-regex@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3" + +signal-exit@^3.0.0, signal-exit@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d" + +snapdragon-node@^2.0.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b" + dependencies: + define-property "^1.0.0" + isobject "^3.0.0" + snapdragon-util "^3.0.1" + +snapdragon-util@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2" + dependencies: + kind-of "^3.2.0" + +snapdragon@^0.8.1: + version "0.8.2" + resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d" + dependencies: + base "^0.11.1" + debug "^2.2.0" + define-property "^0.2.5" + extend-shallow "^2.0.1" + map-cache "^0.2.2" + source-map "^0.5.6" + source-map-resolve "^0.5.0" + use "^3.1.0" + +source-map-resolve@^0.5.0: + version "0.5.2" + resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.2.tgz#72e2cc34095543e43b2c62b2c4c10d4a9054f259" + dependencies: + atob "^2.1.1" + decode-uri-component "^0.2.0" + resolve-url "^0.2.1" + source-map-url "^0.4.0" + urix "^0.1.0" + +source-map-url@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3" + +source-map@^0.5.6: + version "0.5.7" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" + +spex@2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/spex/-/spex-2.1.0.tgz#21939ab7722322c3a1d002870fab022daa79335f" + +split-string@^3.0.1, split-string@^3.0.2: + version "3.1.0" + resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2" + dependencies: + extend-shallow "^3.0.0" + +split@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/split/-/split-1.0.1.tgz#605bd9be303aa59fb35f9229fbea0ddec9ea07d9" + dependencies: + through "2" + +sshpk@^1.7.0: + version "1.16.0" + resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.0.tgz#1d4963a2fbffe58050aa9084ca20be81741c07de" + dependencies: + asn1 "~0.2.3" + assert-plus "^1.0.0" + bcrypt-pbkdf "^1.0.0" + dashdash "^1.12.0" + ecc-jsbn "~0.1.1" + getpass "^0.1.1" + jsbn "~0.1.0" + safer-buffer "^2.0.2" + tweetnacl "~0.14.0" + +static-extend@^0.1.1: + version "0.1.2" + resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6" + dependencies: + define-property "^0.2.5" + object-copy "^0.1.0" + +"statuses@>= 1.4.0 < 2": + version "1.5.0" + resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" + +statuses@~1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087" + +stealthy-require@^1.1.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b" + +string-width@^1.0.1: + version "1.0.2" + resolved "http://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" + dependencies: + code-point-at "^1.0.0" + is-fullwidth-code-point "^1.0.0" + strip-ansi "^3.0.0" + +"string-width@^1.0.2 || 2", string-width@^2.0.0, string-width@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" + dependencies: + is-fullwidth-code-point "^2.0.0" + strip-ansi "^4.0.0" + +string_decoder@~0.10.x: + version "0.10.31" + resolved "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" + +string_decoder@~1.1.1: + version "1.1.1" + resolved "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" + dependencies: + safe-buffer "~5.1.0" + +strip-ansi@^3.0.0, strip-ansi@^3.0.1: + version "3.0.1" + resolved "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" + dependencies: + ansi-regex "^2.0.0" + +strip-ansi@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f" + dependencies: + ansi-regex "^3.0.0" + +strip-eof@^1.0.0: + version "1.0.0" + resolved "http://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf" + +strip-json-comments@~2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" + +supports-color@^5.2.0, supports-color@^5.3.0: + version "5.5.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" + dependencies: + has-flag "^3.0.0" + +tar@^4: + version "4.4.8" + resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.8.tgz#b19eec3fde2a96e64666df9fdb40c5ca1bc3747d" + dependencies: + chownr "^1.1.1" + fs-minipass "^1.2.5" + minipass "^2.3.4" + minizlib "^1.1.1" + mkdirp "^0.5.0" + safe-buffer "^5.1.2" + yallist "^3.0.2" + +term-size@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/term-size/-/term-size-1.2.0.tgz#458b83887f288fc56d6fffbfad262e26638efa69" + dependencies: + execa "^0.7.0" + +through@2: + version "2.3.8" + resolved "http://registry.npmjs.org/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" + +timed-out@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f" + +to-object-path@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af" + dependencies: + kind-of "^3.0.2" + +to-regex-range@^2.1.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38" + dependencies: + is-number "^3.0.0" + repeat-string "^1.6.1" + +to-regex@^3.0.1, to-regex@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce" + dependencies: + define-property "^2.0.2" + extend-shallow "^3.0.2" + regex-not "^1.0.2" + safe-regex "^1.1.0" + +touch@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/touch/-/touch-3.1.0.tgz#fe365f5f75ec9ed4e56825e0bb76d24ab74af83b" + dependencies: + nopt "~1.0.10" + +tough-cookie@>=2.3.3: + version "2.5.0" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2" + dependencies: + psl "^1.1.28" + punycode "^2.1.1" + +tough-cookie@~2.4.3: + version "2.4.3" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781" + dependencies: + psl "^1.1.24" + punycode "^1.4.1" + +tunnel-agent@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" + dependencies: + safe-buffer "^5.0.1" + +tweetnacl@^0.14.3, tweetnacl@~0.14.0: + version "0.14.5" + resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" + +type-is@~1.6.16: + version "1.6.16" + resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.16.tgz#f89ce341541c672b25ee7ae3c73dee3b2be50194" + dependencies: + media-typer "0.3.0" + mime-types "~2.1.18" + +undefsafe@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/undefsafe/-/undefsafe-2.0.2.tgz#225f6b9e0337663e0d8e7cfd686fc2836ccace76" + dependencies: + debug "^2.2.0" + +union-value@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4" + dependencies: + arr-union "^3.1.0" + get-value "^2.0.6" + is-extendable "^0.1.1" + set-value "^0.4.3" + +unique-string@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-1.0.0.tgz#9e1057cca851abb93398f8b33ae187b99caec11a" + dependencies: + crypto-random-string "^1.0.0" + +unpipe@1.0.0, unpipe@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" + +unset-value@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559" + dependencies: + has-value "^0.3.1" + isobject "^3.0.0" + +unzip-response@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97" + +upath@^1.0.5: + version "1.1.0" + resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.0.tgz#35256597e46a581db4793d0ce47fa9aebfc9fabd" + +update-notifier@^2.5.0: + version "2.5.0" + resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-2.5.0.tgz#d0744593e13f161e406acb1d9408b72cad08aff6" + dependencies: + boxen "^1.2.1" + chalk "^2.0.1" + configstore "^3.0.0" + import-lazy "^2.1.0" + is-ci "^1.0.10" + is-installed-globally "^0.1.0" + is-npm "^1.0.0" + latest-version "^3.0.0" + semver-diff "^2.0.0" + xdg-basedir "^3.0.0" + +uri-js@^4.2.2: + version "4.2.2" + resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0" + dependencies: + punycode "^2.1.0" + +urix@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72" + +url-parse-lax@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-1.0.0.tgz#7af8f303645e9bd79a272e7a14ac68bc0609da73" + dependencies: + prepend-http "^1.0.1" + +use@^3.1.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f" + +util-deprecate@~1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" + +utils-merge@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" + +uuid@3.3.2, uuid@^3.3.2: + version "3.3.2" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131" + +vary@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" + +verror@1.10.0: + version "1.10.0" + resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400" + dependencies: + assert-plus "^1.0.0" + core-util-is "1.0.2" + extsprintf "^1.2.0" + +which@^1.2.9: + version "1.3.1" + resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" + dependencies: + isexe "^2.0.0" + +wide-align@^1.1.0: + version "1.1.3" + resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457" + dependencies: + string-width "^1.0.2 || 2" + +widest-line@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-2.0.1.tgz#7438764730ec7ef4381ce4df82fb98a53142a3fc" + dependencies: + string-width "^2.1.1" + +wrappy@1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" + +write-file-atomic@^2.0.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.3.0.tgz#1ff61575c2e2a4e8e510d6fa4e243cce183999ab" + dependencies: + graceful-fs "^4.1.11" + imurmurhash "^0.1.4" + signal-exit "^3.0.2" + +xdg-basedir@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-3.0.0.tgz#496b2cc109eca8dbacfe2dc72b603c17c5870ad4" + +xmlbuilder@10.0.0: + version "10.0.0" + resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-10.0.0.tgz#c64e52f8ae097fe5fd46d1c38adaade071ee1b55" + +xtend@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af" + +yallist@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" + +yallist@^3.0.0, yallist@^3.0.2: + version "3.0.3" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.3.tgz#b4b049e314be545e3ce802236d6cd22cd91c3de9" From d3960ffd5ac6f8fb1a87f6e82037c9f1cf2b4855 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Tue, 1 Sep 2020 11:00:23 +0530 Subject: [PATCH 0124/1242] Update tlapplication.json --- configs/pdf-service/data-config/tlapplication.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/pdf-service/data-config/tlapplication.json b/configs/pdf-service/data-config/tlapplication.json index 7673bf3f..81429460 100644 --- a/configs/pdf-service/data-config/tlapplication.json +++ b/configs/pdf-service/data-config/tlapplication.json @@ -1027,7 +1027,7 @@ { "externalAPI": [ { - "path": "http://egov-location:8080/egov-location/location/v11/boundarys/_search", + "path": "http://localhost:8082/egov-location/location/v11/boundarys/_search", "queryParam": "tenantId=$.tenantId,hierarchyTypeCode=REVENUE,boundaryType=Locality,codes=$.tradeLicenseDetail.address.locality.code", "apiRequest": null, "responseMapping":[ From e2da9ceaf455b06741bf650dca4f8b12fd1b1522 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Tue, 1 Sep 2020 11:00:59 +0530 Subject: [PATCH 0125/1242] Update tlcertificate.json --- configs/pdf-service/data-config/tlcertificate.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/pdf-service/data-config/tlcertificate.json b/configs/pdf-service/data-config/tlcertificate.json index 6202b9e0..1ba64860 100644 --- a/configs/pdf-service/data-config/tlcertificate.json +++ b/configs/pdf-service/data-config/tlcertificate.json @@ -647,7 +647,7 @@ ] }, { - "path": "http://egov-location:8080/egov-location/location/v11/boundarys/_search", + "path": "http://localhost:8082/egov-location/location/v11/boundarys/_search", "queryParam": "tenantId=$.tenantId,hierarchyTypeCode=REVENUE,boundaryType=Locality,codes=$.tradeLicenseDetail.address.locality.code", "apiRequest": null, "responseMapping":[ From 3e258c9f0d9bf049a7ac16824575f97fac609cbe Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 1 Sep 2020 11:01:41 +0530 Subject: [PATCH 0126/1242] enable fireoc reports --- configs/reports/report.config | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/reports/report.config b/configs/reports/report.config index e4ee1ec4..19d53a92 100644 --- a/configs/reports/report.config +++ b/configs/reports/report.config @@ -2,3 +2,4 @@ rainmaker-pgr=file:///work-dir/punjab-rainmaker-customization/configs/reports/co rainmaker-pt=file:///work-dir/punjab-rainmaker-customization/configs/reports/configs/pt-reports.yml rainmaker-tl=file:///work-dir/punjab-rainmaker-customization/configs/reports/configs/tl-reports.yml rainmaker-uc=file:///work-dir/punjab-rainmaker-customization/configs/reports/configs/uc-reports.yml +rainmaker-noc=file:///work-dir/punjab-rainmaker-customization/configs/reports/configs/rainmaker-noc-reports.yml From d882b80231cfeb3dcb68425ae07a49c6622ab830 Mon Sep 17 00:00:00 2001 From: Kabir Date: Tue, 1 Sep 2020 11:22:25 +0530 Subject: [PATCH 0127/1242] uatv2 receipt register summary addon total amount --- configs/reports/configs/pt-reports.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index a605d19e..e510c1f5 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -3621,6 +3621,11 @@ ReportDefinitions: type: string source: pt total: false + - name: totalamount + label: reports.pt.totalamount + type: string + source: pt + total: true searchParams: - name: fromDate label: reports.pt.fromDate From f1105d9df0a337617cfb49aec73f87e925d0e1f0 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Tue, 1 Sep 2020 12:13:30 +0530 Subject: [PATCH 0128/1242] Update tradelicense-receipt.json --- configs/pdf-service/data-config/tradelicense-receipt.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/configs/pdf-service/data-config/tradelicense-receipt.json b/configs/pdf-service/data-config/tradelicense-receipt.json index 3f9b1204..f21b13c6 100644 --- a/configs/pdf-service/data-config/tradelicense-receipt.json +++ b/configs/pdf-service/data-config/tradelicense-receipt.json @@ -485,6 +485,14 @@ { "variable":"applicationType", "value":"$.Licenses[0].applicationType" + }, + { + "variable":"penaltyComments", + "value":"$.Licenses[0].tradeLicenseDetail.additionalDetail.penaltyComments" + }, + { + "variable":"rebateComments", + "value":"$.Licenses[0].tradeLicenseDetail.additionalDetail.rebateComments" }, { "variable":"licenseNumber", From 2e90ea886418e56780cdde1664d5c2f043808ac2 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Tue, 1 Sep 2020 12:14:43 +0530 Subject: [PATCH 0129/1242] Update tradelicense-receipt.json --- .../format-config/tradelicense-receipt.json | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/configs/pdf-service/format-config/tradelicense-receipt.json b/configs/pdf-service/format-config/tradelicense-receipt.json index 63f40a31..d9cc2c71 100644 --- a/configs/pdf-service/format-config/tradelicense-receipt.json +++ b/configs/pdf-service/format-config/tradelicense-receipt.json @@ -513,6 +513,48 @@ "style": "receipt-table" } ], + [ + { + "text": "Rebate Comments", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{rebateComments}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Penalty Comments", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{penaltyComments}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], [ { "text": "{{payment_mode}}", From 746abd1f195cce2090ac8b354ee3f0c72229d59f Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Tue, 1 Sep 2020 12:48:16 +0530 Subject: [PATCH 0130/1242] Update tlapplication.json --- configs/pdf-service/data-config/tlapplication.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/pdf-service/data-config/tlapplication.json b/configs/pdf-service/data-config/tlapplication.json index 81429460..7673bf3f 100644 --- a/configs/pdf-service/data-config/tlapplication.json +++ b/configs/pdf-service/data-config/tlapplication.json @@ -1027,7 +1027,7 @@ { "externalAPI": [ { - "path": "http://localhost:8082/egov-location/location/v11/boundarys/_search", + "path": "http://egov-location:8080/egov-location/location/v11/boundarys/_search", "queryParam": "tenantId=$.tenantId,hierarchyTypeCode=REVENUE,boundaryType=Locality,codes=$.tradeLicenseDetail.address.locality.code", "apiRequest": null, "responseMapping":[ From 70a73dee067b2f78fff62562096dd5a3e1a79a01 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Tue, 1 Sep 2020 12:48:45 +0530 Subject: [PATCH 0131/1242] Update tlcertificate.json --- configs/pdf-service/data-config/tlcertificate.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/pdf-service/data-config/tlcertificate.json b/configs/pdf-service/data-config/tlcertificate.json index 1ba64860..6202b9e0 100644 --- a/configs/pdf-service/data-config/tlcertificate.json +++ b/configs/pdf-service/data-config/tlcertificate.json @@ -647,7 +647,7 @@ ] }, { - "path": "http://localhost:8082/egov-location/location/v11/boundarys/_search", + "path": "http://egov-location:8080/egov-location/location/v11/boundarys/_search", "queryParam": "tenantId=$.tenantId,hierarchyTypeCode=REVENUE,boundaryType=Locality,codes=$.tradeLicenseDetail.address.locality.code", "apiRequest": null, "responseMapping":[ From 58fc0eb3acd80a4cb55594f2f6a61e98e69167ed Mon Sep 17 00:00:00 2001 From: Kabir Date: Tue, 1 Sep 2020 15:35:55 +0530 Subject: [PATCH 0132/1242] uatv2 testing firenocc reports update --- .../reports/configs/rainmaker-noc-reports.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/configs/reports/configs/rainmaker-noc-reports.yml b/configs/reports/configs/rainmaker-noc-reports.yml index 934bb593..92cc46f0 100644 --- a/configs/reports/configs/rainmaker-noc-reports.yml +++ b/configs/reports/configs/rainmaker-noc-reports.yml @@ -313,7 +313,7 @@ orderby: ORDER BY channel - reportName: UrbanApplicationStatusReport_V2 - summary: Application Status Report + summary: Urban Application Status Report version: 1.0.0 moduleName: rainmaker-noc sourceColumns: @@ -359,7 +359,7 @@ - reportName: UrbanChannelsReport_V2 - summary: Channels Report + summary: Urban Channels Report version: 1.0.0 moduleName: rainmaker-noc sourceColumns: @@ -411,7 +411,7 @@ - reportName: DrillDownRuralSubdistrictCollectionReport_V2 - summary: Collection Report + summary: Rural Subdistrict Collection Report version: 1.0.0 moduleName: rainmaker-noc sourceColumns: @@ -487,7 +487,7 @@ orderby: ORDER BY localisedmessage - reportName: RuralDistrictWiseCollectionReport_V2 - summary: Collection Report + summary: Rural District Wise Collection Report version: 1.0.0 moduleName: rainmaker-noc sourceColumns: @@ -561,7 +561,7 @@ orderby: ORDER BY localisedmessage - reportName: RuralDistrictWiseApplicationStatusReport_V2 - summary: Application Status Report + summary: Rural District Wise Application Status Report version: 1.0.0 moduleName: rainmaker-noc sourceColumns: @@ -611,7 +611,7 @@ orderby: ORDER BY application_status - reportName: DrillDownRuralWiseApplicationStatusReport_V2 - summary: Application Status Report + summary: Rural Wise Application Status Report version: 1.0.0 moduleName: rainmaker-noc sourceColumns: @@ -663,7 +663,7 @@ orderby: ORDER BY application_status - reportName: RuralDistrictWiseChannelsReport_V2 - summary: Channels Report + summary: Rural District Wise Channels Report version: 1.0.0 moduleName: rainmaker-noc sourceColumns: @@ -719,7 +719,7 @@ orderby: ORDER BY channel - reportName: DrillDownRuralWiseChannelReport_V2 - summary: Channels Report + summary: Rural Wise Channel Report version: 1.0.0 moduleName: rainmaker-noc sourceColumns: From beb0a9cb6a67de808f4be9d2b70e5ef0d0c24301 Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov Date: Tue, 1 Sep 2020 23:37:12 +0530 Subject: [PATCH 0133/1242] Update queries for propertiesAssessed and xptFyByDDR --- .../dashboard-analytics/ChartApiConfig.json | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 1ba474c2..04ae8617 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -584,10 +584,10 @@ "queries": [ { "module": "PT", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\"}", - "dateRefField": "dataObject.paymentDetails.receiptDate", - "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}}],\"must\":{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\"]}}}},\"aggs\":{\"Usage Type\":{\"terms\":{\"field\":\"domainObject.usageCategory.keyword\"},\"aggs\":{\"Assessed Properties\":{\"nested\":{\"path\":\"domainObject.assessmentsDetails\"},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"domainObject.assessmentsDetails.assessmentNumber.keyword\"}}}}}}}}}}" + "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\",\"module\" : \"Data.businessService.keyword\", \"tenantId\" : \"Data.tenantId\", \"district\" : \"Data.tenantData.city.districtCode\"}", + "dateRefField": "Data.@timestamp", + "indexName": "property-services", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Usage Type\":{\"terms\":{\"field\":\"Data.usageCategory.keyword\"}}}}}}" } ], "chartType": "pie", @@ -607,8 +607,8 @@ "queries": [ { "module": "PT", - "indexName": "property-services", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Assessed Properties\":{\"value_count\":{\"field\":\"Data.propertyId.keyword\"}}}}}}", + "indexName": "property-assessments", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Assessed Properties\":{\"value_count\":{\"field\":\"Data.assessmentNumber.keyword\"}}}}}}", "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\",\"tenantId\" : \"Data.tenantId\" ,\"district\" : \"Data.tenantData.city.districtCode\"}", "dateRefField": "Data.@timestamp" } @@ -1887,15 +1887,15 @@ "module": "PT", "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\",\"tenantId\" : \"Data.tenantId.keyword\" }", "dateRefField": "Data.@timestamp", - "indexName": "property-services", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Fys\":{\"terms\":{\"field\":\"Data.propertyDetails.financialYear.keyword\",\"min_doc_count\":0}}}}}}" + "indexName": "property-assessments", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Fys\":{\"terms\":{\"field\":\"Data.financialYear.keyword\",\"min_doc_count\":0}}}}}}" }, { "module": "PT", "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \"tenantId\" : \"Data.tenantId.keyword\" }", "dateRefField": "Data.@timestamp", - "indexName": "property-services", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Total\":{\"value_count\":{\"field\":\"Data.propertyDetails.assessmentNumber.keyword\"}}}}}}}}" + "indexName": "property-assessments", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Total\":{\"value_count\":{\"field\":\"Data.assessmentNumber.keyword\"}}}}}}}}" } ], "isMdmsEnabled": true, @@ -1917,15 +1917,15 @@ "module": "PT", "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\",\"tenantId\" : \"Data.tenantId.keyword\" }", "dateRefField": "Data.@timestamp", - "indexName": "property-services", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"ULBS \":{\"terms\":{\"field\":\"Data.tenantId.keyword\"},\"aggs\":{\"Fys\":{\"terms\":{\"field\":\"Data.propertyDetails.financialYear.keyword\",\"min_doc_count\":0}}}}}}}}" + "indexName": "property-assessments", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"ULBS \":{\"terms\":{\"field\":\"Data.tenantId.keyword\"},\"aggs\":{\"Fys\":{\"terms\":{\"field\":\"Data.financialYear.keyword\",\"min_doc_count\":0}}}}}}}}" }, { "module": "PT", "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\",\"tenantId\" : \"Data.tenantId.keyword\" }", "dateRefField": "Data.@timestamp", - "indexName": "property-services", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"ULBS \":{\"terms\":{\"field\":\"Data.tenantId.keyword\"},\"aggs\":{\"Total\":{\"value_count\":{\"field\":\"Data.propertyDetails.assessmentNumber.keyword\"}}}}}}}}" + "indexName": "property-assessments", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"ULBS \":{\"terms\":{\"field\":\"Data.tenantId.keyword\"},\"aggs\":{\"Total\":{\"value_count\":{\"field\":\"Data.assessmentNumber.keyword\"}}}}}}}}" } ], "filterKeys": [ @@ -1946,15 +1946,15 @@ "module": "PT", "requestQueryMap": "{\"tenantId\" : \"Data.tenantId.keyword\" , \"wardId\" : \"Data.ward.name.keyword\"}", "dateRefField": "Data.@timestamp", - "indexName": "property-services", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Ward \":{\"terms\":{\"field\":\"Data.ward.name.keyword\"},\"aggs\":{\"Fys\":{\"terms\":{\"field\":\"Data.propertyDetails.financialYear.keyword\",\"min_doc_count\":0}}}}}}}}" + "indexName": "property-assessments", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Ward \":{\"terms\":{\"field\":\"Data.ward.name.keyword\"},\"aggs\":{\"Fys\":{\"terms\":{\"field\":\"Data.financialYear.keyword\",\"min_doc_count\":0}}}}}}}}" }, { "module": "PT", "requestQueryMap": "{\"tenantId\" : \"Data.tenantId.keyword\" , \"wardId\" : \"Data.ward.name.keyword\"}", "dateRefField": "Data.@timestamp", - "indexName": "property-services", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Ward \":{\"terms\":{\"field\":\"Data.ward.name.keyword\"},\"aggs\":{\"Total\":{\"value_count\":{\"field\":\"Data.propertyDetails.assessmentNumber.keyword\"}}}}}}}}" + "indexName": "property-assessments", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Ward \":{\"terms\":{\"field\":\"Data.ward.name.keyword\"},\"aggs\":{\"Total\":{\"value_count\":{\"field\":\"Data.assessmentNumber.keyword\"}}}}}}}}" } ], "filterKeys": [ From 4924d782622ef6532807c34dc3de68f38747fd2f Mon Sep 17 00:00:00 2001 From: gurpreetsinghkhanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 2 Sep 2020 07:01:28 +0530 Subject: [PATCH 0134/1242] pdf property receipt update v2 --- .../data-config/property-receipt.json | 14 +++- .../format-config/property-receipt.json | 79 +++++++++++++------ 2 files changed, 68 insertions(+), 25 deletions(-) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index bfb28ea2..ffccd6f3 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -452,7 +452,7 @@ { "externalAPI": [ { - "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "path": "http://localhost:8069/egov-mdms-service/v1/_get", "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", "apiRequest": null, "responseMapping":[ @@ -489,7 +489,7 @@ ] }, { - "path": "http://property-services.egov:8080/property-services/property/_search", + "path": "http://localhost:8070/property-services/property/_search", "queryParam": "propertyIds=$.paymentDetails[0].bill.consumerCode,tenantId=$.tenantId", "apiRequest": null, "responseMapping":[ @@ -526,6 +526,14 @@ "module": "rainmaker-ws" } }, + { + "variable":"oldPropertyId", + "value":"$.Properties[0].oldPropertyId" + }, + { + "variable":"ownerMobileNumber", + "value":"$.Properties[0].owners[0].mobileNumber" + }, { "variable": "var_owners", "value":"$.Properties[0].owners.*", @@ -592,7 +600,7 @@ ] }, { - "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "path": "http://localhost:8069/egov-mdms-service/v1/_get", "queryParam": "moduleName=tenant&masterName=footer&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}' %26%26 @.service=='{$.paymentDetails[0].businessService}')%5D", "apiRequest": null, "responseMapping":[ diff --git a/configs/pdf-service/format-config/property-receipt.json b/configs/pdf-service/format-config/property-receipt.json index 23bf9ea7..58746df3 100644 --- a/configs/pdf-service/format-config/property-receipt.json +++ b/configs/pdf-service/format-config/property-receipt.json @@ -68,8 +68,12 @@ }, "layout": "noBorders" }, + { + "text":"PROPERTY INFORMATION", + "style":"block-head" + }, { - "style": "noc-table", + "style": "next-noc-table", "table": { "widths": [ "25%", @@ -127,7 +131,7 @@ true, false, false, - true + false ], "style": "receipt-table-value" }, @@ -137,7 +141,7 @@ false, false, false, - true + false ], "style": "receipt-table" }, @@ -147,7 +151,7 @@ false, false, false, - true + false ], "style": "receipt-table-value" }, @@ -157,7 +161,7 @@ false, false, true, - true + false ], "style": "receipt-table" } @@ -223,7 +227,7 @@ "text": "{{receipt_no}}.", "border": [ true, - true, + false, false, false ], @@ -233,7 +237,7 @@ "text": "{{receiptNo}}", "border": [ false, - true, + false, false, false ], @@ -243,7 +247,7 @@ "text": "{{consumer_id}}", "border": [ false, - true, + false, false, false ], @@ -253,7 +257,7 @@ "text": "{{consumerID}}", "border": [ false, - true, + false, true, false ], @@ -282,7 +286,7 @@ "style": "receipt-table" }, { - "text": "assessment_number", + "text": "Existing Property Id", "border": [ false, false, @@ -292,7 +296,7 @@ "style": "receipt-table-value" }, { - "text": " ", + "text": "{{oldPropertyId}}", "border": [ false, false, @@ -390,6 +394,10 @@ }, "layout": {} }, + { + "text":"PAYMENT INFORMATION", + "style":"block-head" + }, { "style": "next-noc-table", "table": { @@ -572,7 +580,11 @@ }, "layout": {} }, - { + { + "text":"PAYABLE AMOUNT", + "style":"block-head" + }, + { "style": "next-noc-table", "table": { "widths": [ @@ -672,6 +684,11 @@ }, "layout":{} }, + { + "text":"OWNERSHIP INFORMATION", + "style":"block-head" + } + , { "style": "next-noc-table", "table": { @@ -684,6 +701,10 @@ "body": ["{{#var_owners}}[{\"text\":\"Owner Name\",\"border\":[true,true,false,true],\"style\":\"receipt-table-key\"},{\"text\":\"{{name2}}\",\"border\":[false,true,true,true]},{\"text\":\"Father's Name\",\"border\":[true,true,false,true],\"style\":\"receipt-table-key\"},{\"text\":\"{{fatherOrHusbandName2}}\",\"border\":[false,true,true,true]}]{{/var_owners}}"] }, "layout": {} + }, + { + "text":"BUILT-UP AREA DETAILS", + "style":"block-head" }, { "style": "next-noc-table", @@ -723,7 +744,7 @@ }, { - "text": "Assessee Signature", + "text": "Mobile Number {{ownerMobileNumber}} Assessee Signature: ", "style": "receipt-approver" } , @@ -772,7 +793,10 @@ "ol": [ "Payment received by cheque/demand draft shall be subject to realization", "This document is not a proof of property ownership and regularization of unauthorised construction", - "{{no_signature}}" + "{{no_signature}}", + "Assessment and payment is subjected to verification/scruitiny by competetive authority", + "Please deposit the property tx dues for earlier years also, Ignore if already paid", + "Citizen for online payments please refer to the link http://lgpunjab.gov.in/cms/pay-property-tax.php" ] } ] @@ -787,6 +811,17 @@ 1 ] }, + "block-head": { + "fontSize": 8, + "bold": true, + "letterSpacing": 0.74, + "margin": [ + -25, + 10, + 0, + -10 + ] + }, "pt-reciept-citizen-table": { "fontSize": 8, "color": "#484848" @@ -818,7 +853,7 @@ "color": "#000000", "margin": [ -25, - 15, + 5, -22, -8 ] @@ -828,7 +863,7 @@ "color": "#000000", "margin": [ -25, - 18, + 10, -22, -8 ] @@ -840,9 +875,9 @@ "fontWeight": 500, "margin": [ 8, - 4, 0, - 4 + 0, + 0 ] }, "receipt-table": { @@ -852,9 +887,9 @@ "fontWeight": 400, "margin": [ 0, - 4, 0, - 4 + 0, + 0 ] }, "receipt-approver": { @@ -882,7 +917,7 @@ "fontSize": 8, "margin": [ -27, - 20, + 10, -10, 0 ], @@ -892,7 +927,7 @@ "fontSize": 8, "margin": [ 2, - 3, + 1, 0, 0 ], From fac2126128b2d5d83636937e6cf97034dc2619cc Mon Sep 17 00:00:00 2001 From: Kabir Date: Wed, 2 Sep 2020 12:34:12 +0530 Subject: [PATCH 0135/1242] uatv2 testing ptreports final --- configs/reports/configs/pt-reports.yml | 43 ++++++++++++++------------ 1 file changed, 23 insertions(+), 20 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index a605d19e..8d26bead 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2307,7 +2307,7 @@ ReportDefinitions: pdfPageSize: "A1" sourceColumns: - name: receiptnumber - label: reports.pt.receiptNo + label: reports.pt.receiptnumber type: string source: pt total: false @@ -2316,7 +2316,7 @@ ReportDefinitions: type: string source: pt total: false - - name: transactiondate + - name: receiptDate label: reports.pt.receiptDate type: string source: pt @@ -2337,17 +2337,17 @@ ReportDefinitions: source: pt total: true - name: propertytax - label: reports.pt.propertyTax + label: reports.pt.propertytax type: string source: pt total: true - name: firecess - label: reports.pt.fireCess + label: reports.pt.firecess type: string source: pt total: true - name: cancercess - label: reports.pt.cancerCess + label: reports.pt.cancercess type: string source: pt total: true @@ -2382,12 +2382,12 @@ ReportDefinitions: source: pt total: true - name: adjustment - label: reports.pt.roundoff + label: reports.pt.adjustment type: string source: pt total: true - name: propertyid - label: reports.pt.propertyId + label: reports.pt.propertyid type: string source: pt total: false @@ -2397,27 +2397,27 @@ ReportDefinitions: source: pt total: false - name: assessmentnumber - label: reports.pt.assessmentNo + label: reports.pt.assessmentnumber type: string source: pt total: false - name: financialyear - label: reports.pt.financialYear + label: reports.pt.financialyear type: string source: pt total: false - name: instrumenttype - label: reports.pt.paymentMode + label: reports.pt.instrumenttype type: string source: pt total: false - name: transactionnumber - label: reports.pt.ddChequeTransactionNo + label: reports.pt.transactionnumber type: string source: pt total: false - name: bankname - label: reports.pt.bankName + label: reports.pt.bankname type: string source: pt total: false @@ -2457,7 +2457,7 @@ ReportDefinitions: searchClause: AND pt_addr.locality IN ($localityArray) query: | -- Use CTE to force query plan, compute & use CTE later - WITH receipt_breakup AS ( + WITH receipt_breakup AS ( SELECT receiptnumber as receiptheader, SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, @@ -2485,7 +2485,7 @@ ReportDefinitions: pd.id, pt_detail.property AS propertyid, pt_detail.assessmentnumber AS assessmentnumber, - payment.paymentstatus, + payment.paymentstatus as status, bill.consumercode, to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS receiptdate, payment.ifsccode AS bankname, @@ -2508,7 +2508,7 @@ ReportDefinitions: JOIN eg_pt_propertydetail_v2 pt_detail ON pt_detail.property = pt.propertyid JOIN eg_pt_address_v2 pt_addr ON pt_detail.property = pt_addr.property LEFT OUTER JOIN eg_user ON eg_user.id = pd.createdby::INTEGER - WHERE pd.tenantid = $tenantid and payment.paymentstatus = 'CANCELLED' and pd.businessservice='PT' + WHERE pd.tenantid = $tenantid and payment.paymentstatus = 'CANCELLED' and pd.businessservice='PT' orderby: ORDER BY pd.receiptdate DESC - reportName: OldUlbWisePtCollection_V2 @@ -2936,7 +2936,8 @@ ReportDefinitions: searchClause: AND usagecategorymajor = $usage query: | SELECT - initcap(split_part(tenantid, '.', 2)) as tenantid, + financialyear, + initcap(split_part(pt_detail.tenantid, '.', 2)) as tenantid, COUNT(collectiontype) AS totalassessments, SUM(billd.amount) AS totalamount, SUM(billd.amountpaid) AS totalamountpaid, @@ -2945,10 +2946,12 @@ ReportDefinitions: SUM(CASE WHEN collectiontype LIKE 'COUNTER' THEN amount ELSE 0 END) AS totaloffline, SUM(CASE WHEN collectiontype LIKE 'COUNTER' THEN 1 ELSE 0 END) AS countoffline, (SUM(billd.amount) - SUM(billd.amountpaid)) AS totalamountdue - FROM egcl_billdetial as billd - WHERE tenantid LIKE CONCAT(SPLIT_PART($tenantid, '.', 1), '%') and tenantid = $tenantid - groupby: GROUP BY tenantid - orderby: ORDER BY tenantid, totalamountpaid DESC NULLS LAST + FROM egcl_billdetial as billd + JOIN egcl_bill as bill ON bill.id = billd.billid + JOIN eg_pt_propertydetail_v2 as pt_detail ON pt_detail.property = bill.consumercode + WHERE pt_detail.tenantid LIKE CONCAT(SPLIT_PART($tenantid, '.', 1), '%') and pt_detail.tenantid = $tenantid + groupby: GROUP BY financialyear, pt_detail.tenantid + orderby: ORDER BY pt_detail.tenantid, totalamountpaid DESC NULLS LAST - reportName: ReceiptRegisterShort_V2 summary: Receipt Register From 0c4c387741763a8013bff12d1fae7008169ea42e Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Wed, 2 Sep 2020 12:51:11 +0530 Subject: [PATCH 0136/1242] Update tradelicense-receipt.json --- .../format-config/tradelicense-receipt.json | 48 ++++++++++++------- 1 file changed, 30 insertions(+), 18 deletions(-) diff --git a/configs/pdf-service/format-config/tradelicense-receipt.json b/configs/pdf-service/format-config/tradelicense-receipt.json index d9cc2c71..b71c2111 100644 --- a/configs/pdf-service/format-config/tradelicense-receipt.json +++ b/configs/pdf-service/format-config/tradelicense-receipt.json @@ -34,7 +34,7 @@ "alignment": "left", "margin": [ 0, - 2, + 0, 0, 0 ] @@ -42,16 +42,23 @@ { "stack": [ { - "text": "{{address}}" + "text": "{{address}}", + "style":"receipt-logo-address-header" }, { - "text": "{{phoneNumber}}" + "text": "{{phoneNumber}}", + "style":"receipt-logo-address-header" + }, { - "text": "{{website}}" + "text": "{{website}}", + "style":"receipt-logo-address-header" + }, { - "text": "{{email}}" + "text": "{{email}}", + "style":"receipt-logo-address-header" + } ], "alignment": "right", @@ -825,26 +832,31 @@ 0, 0, 0, - 5 + 1 ] }, "receipt-logo-sub-header": { "color": "#000000", "fontSize": 12, "letterSpacing": 0.6 + }, + "receipt-logo-address-header": { + "color": "#000000", + "fontSize": 8, + "letterSpacing": 0.6 }, "noc-table": { - "fontSize": 12, + "fontSize": 10, "color": "#000000", "margin": [ -25, - 8, + 1, -22, -8 ] }, "next-noc-table": { - "fontSize": 12, + "fontSize": 10, "color": "#000000", "margin": [ -25, @@ -856,29 +868,29 @@ "receipt-table-value": { "color": "#000000", "bold": true, - "fontSize": 12, - "fontWeight": 500, + "fontSize": 10, + "fontWeight": 400, "margin": [ 2, -1, 0, - 1 + 0 ] }, "receipt-table": { "color": "#000000", "bold": false, - "fontSize": 12, - "fontWeight": 400, + "fontSize": 10, + "fontWeight": 300, "margin": [ 0, -1, 0, - 2 + 0 ] }, "receipt-approver": { - "fontSize": 12, + "fontSize": 10, "bold": true, "margin": [ -27, @@ -889,7 +901,7 @@ "color": "#484848" }, "no-signature": { - "fontSize": 10, + "fontSize": 8, "margin": [ -27, 5, @@ -899,7 +911,7 @@ "color": "#484848" }, "pt-disclaimer": { - "fontSize": 10, + "fontSize": 9, "margin": [ -27, 0, From d196cb48e2b3520563f15f345f7454fbd3fde2d1 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Wed, 2 Sep 2020 12:52:12 +0530 Subject: [PATCH 0137/1242] Update tlcertificate.json --- configs/pdf-service/format-config/tlcertificate.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/pdf-service/format-config/tlcertificate.json b/configs/pdf-service/format-config/tlcertificate.json index 89ea01b3..0a9d5954 100644 --- a/configs/pdf-service/format-config/tlcertificate.json +++ b/configs/pdf-service/format-config/tlcertificate.json @@ -35,7 +35,7 @@ "stack": [ { - "text":"{{municipal_corportaion}}", + "text":"{{municipal_corportaion}},{{city}}", "style":"receipt-logo-header" }, { From 8c8a67e3a6b9f20c78c5cb07e8ae5d655dde8a60 Mon Sep 17 00:00:00 2001 From: Abhilashegov Date: Wed, 2 Sep 2020 13:41:53 +0530 Subject: [PATCH 0138/1242] Added rainmaker-custom-service folder for 13-14 Integration --- rainmaker-custom-service/.gitignore | 3 +- rainmaker-custom-service/index.js | 928 +++++++++++++++++++------- rainmaker-custom-service/package.json | 3 +- rainmaker-custom-service/yarn.lock | 4 +- 4 files changed, 699 insertions(+), 239 deletions(-) diff --git a/rainmaker-custom-service/.gitignore b/rainmaker-custom-service/.gitignore index 4f9f8bf4..6cacf563 100644 --- a/rainmaker-custom-service/.gitignore +++ b/rainmaker-custom-service/.gitignore @@ -1,2 +1,3 @@ sampleRequest.js -nodemon.json \ No newline at end of file +nodemon.json +.vscode diff --git a/rainmaker-custom-service/index.js b/rainmaker-custom-service/index.js index 568554fc..dde98481 100644 --- a/rainmaker-custom-service/index.js +++ b/rainmaker-custom-service/index.js @@ -1,7 +1,7 @@ var express = require('express'), slash = require('express-slash'); var bodyParser = require('body-parser') - +var url = require("url"); var request = require('request-promise'); const { asyncMiddleware @@ -10,7 +10,12 @@ const { var app = express(); var mustache = require('mustache-express') const Cryptr = require('cryptr'); -var {encrypt, jwt_sign } = require('./encrypt') +var { + encrypt, + jwt_sign +} = require('./encrypt') + +app.use(require('morgan')('dev')); app.engine('html', mustache()) app.set('view engine', 'html') @@ -21,6 +26,20 @@ app.disable('view cache'); const DEBUG_MODE = Boolean(process.env.DEBUG_MODE) || false; const PT_DEMAND_HOST = process.env.PT_DEMAND_HOST + +const PT_ZERO_ASSESSMENTYEAR = process.env.PT_ZERO_ASSESSMENTYEAR || "2013-14"; +const PT_ZERO_TENANTS = (process.env.PT_ZERO_TENANTS || "pb.testing").split(","); + +// +const PT_INTEGRATION_ASSESSMENTYEAR =process.env.PT_INTEGRATION_ASSESSMENTYEAR || "2013-14" +const PT_INTEGRATION_TENANTS = (process.env.PT_INTEGRATION_TENANTS || "pb.testing").split(","); + +const PT_INTEGRATION_HOST = process.env.PT_INTEGRATION_HOST +const PT_CALCULATOR_V2_HOST = process.env.PT_CALCULATOR_V2_HOST + +// + +const PT_ENABLE_FC_CALC = Boolean(process.env.PT_ENABLE_FC_CALC || false); const EGOV_MDMS_HOST = process.env.EGOV_MDMS_HOST const EGOV_BND_LOGIN_URL = process.env.EGOV_BND_LOGIN_URL const EGOV_BND_REDIRECT_URL = process.env.EGOV_BND_REDIRECT_URL @@ -33,7 +52,7 @@ function log(val) { } } -log ("ENCKEY=" + EGOV_BND_ENCRYPTION_KEY) +log("ENCKEY=" + EGOV_BND_ENCRYPTION_KEY) const cryptr = new Cryptr(EGOV_BND_ENCRYPTION_KEY); @@ -42,13 +61,55 @@ function getUserUUID(data) { return data.RequestInfo.userInfo.uuid; } +function isCitizen(data) { + return data.RequestInfo.userInfo.roles.filter(role => role.code.toUpperCase() == "CITIZEN").length > 0 +} + function getUserID(data) { return data.RequestInfo.userInfo.id; } +function getIntegrateYearDemand(demands){ + for(demand of demands["Demands"]){ + demandYear = new Date(demand["taxPeriodFrom"]).getFullYear() + integrationYear = PT_INTEGRATION_ASSESSMENTYEAR.split("-")[0] + demandStatus = demand["status"] + if((demandYear == integrationYear) && (demandStatus == "ACTIVE")){ + demands["Demands"] = demand + break; + } + + } + return demands; +} + +function isValidDemand(demands){ + let count = 0; + for(demand of demands["Demands"]){ + demandYear = new Date(demand["taxPeriodFrom"]).getFullYear() + integrationYear = PT_INTEGRATION_ASSESSMENTYEAR.split("-")[0] + demandStatus = demand["status"] + if((demandYear == integrationYear) && (demandStatus == "ACTIVE")){ + count++; + } + } + + return count == 1; +} + +function isReceiptGenerated(demand){ + for (demandDetail of demand["Demands"][0]["demandDetails"]) + { + if(demandDetail.collectionAmount || 0 > 0){ + return true; + } + } + return false; +} + async function getFireCessConfig(tenantId) { let fireCessConfig = await request.post({ - url: EGOV_MDMS_HOST + "egov-mdms-service/v1/_search?tenantId=" + tenantId, + url: url.resolve(EGOV_MDMS_HOST, "/egov-mdms-service/v1/_search?tenantId=" + tenantId), body: { RequestInfo: { "apiId": "Rainmaker-custom-service", @@ -184,10 +245,16 @@ router.post('/protected/bndlogin/linkAccount', asyncMiddleware(async function (r log(response) if (response.sys_message && response.sys_message == 'Invalid User and Password') { - res.status(200).send({ code: "INVALID_CREDENTIALS", message: "Invalid User and Password"} ) + res.status(200).send({ + code: "INVALID_CREDENTIALS", + message: "Invalid User and Password" + }) return } else if (response.sys_message && response.sys_message == 'INTERNAL APPLICATION ERROR') { - res.status(200).send({ code: "ERROR", message: "Something went wrong"} ) + res.status(200).send({ + code: "ERROR", + message: "Something went wrong" + }) return } @@ -205,7 +272,12 @@ router.post('/protected/bndlogin/linkAccount', asyncMiddleware(async function (r await db.any("update custom_eg_user_metatdata set value = $3:json where key = $1 and user_id = $2", ['BND_CREDENTIALS', uuid, value]) } - res.json({code: "SUCCESS", redirect: EGOV_BND_REDIRECT_URL + jwt_sign({loginID: encrypt(loginID)})}) + res.json({ + code: "SUCCESS", + redirect: EGOV_BND_REDIRECT_URL + jwt_sign({ + loginID: encrypt(loginID) + }) + }) })); router.post('/protected/bndlogin', asyncMiddleware(async function (req, res) { @@ -225,7 +297,9 @@ router.post('/protected/bndlogin', asyncMiddleware(async function (req, res) { res.json({ code: "SUCCESS", - redirect: EGOV_BND_REDIRECT_URL + jwt_sign({loginID: encrypt(loginID)}) + redirect: EGOV_BND_REDIRECT_URL + jwt_sign({ + loginID: encrypt(loginID) + }) }) } catch (ex) { @@ -238,70 +312,70 @@ router.post('/protected/bndlogin', asyncMiddleware(async function (req, res) { })); -function getFireCessPercentage(propertyDetails) { - // let propertyDetails = request["CalculationCriteria"][0]["propertyDetails"][0] - - let propertyUsageCategoryMajor = propertyDetails["usageCategoryMajor"] - let units = propertyDetails["units"] - let propertyAttributes = propertyDetails["additionalDetails"] - let unitSet = new Set() - - for (unit of units) { - unitSet.add(unit["usageCategoryMajor"]) - } - let firecess_category_major = 0; - let firecess_building_height = 0; - let firecess_inflammable = 0; - - if (propertyUsageCategoryMajor == "RESIDENTIAL" || (unitSet.size == 1 && unitSet.has("RESIDENTIAL"))) { - // There is no category major firecess applicable as it i - firecess_category_major = 0 - } else { - firecess_category_major = 5.0 - } - - if (propertyAttributes && - propertyAttributes.heightAbove36Feet && - propertyAttributes.heightAbove36Feet.toString() == "true") { - // height is above 36 feet - firecess_building_height = 2.0 - } - - if (propertyAttributes && - propertyAttributes.inflammable && - propertyAttributes.inflammable.toString() == "true") { - // height is above 36 feet - firecess_inflammable = 10.0 - } - - return { - firecess_inflammable, - firecess_building_height, - firecess_category_major, - firecess: firecess_category_major + firecess_building_height + firecess_inflammable - } -} - -function calculateNewFireCess(taxHeads, firecess_percent, taxField, taxHeadCodeField) { - - let applicablePropertyTax = 0 - for (taxHead of taxHeads) { - if (taxHead[taxHeadCodeField] == "PT_TAX") { - applicablePropertyTax += taxHead[taxField] - } else if (taxHead[taxHeadCodeField] == "PT_UNIT_USAGE_EXEMPTION") { - applicablePropertyTax -= taxHead[taxField] - } else if (taxHead[taxHeadCodeField] == "PT_OWNER_EXEMPTION") { - applicablePropertyTax -= taxHead[taxField] - } - } - - return round(applicablePropertyTax * (firecess_percent / 100), 2); -} +// function getFireCessPercentage(propertyDetails, fireCessConfig) { +// // let propertyDetails = request["CalculationCriteria"][0]["propertyDetails"][0] + +// let propertyUsageCategoryMajor = propertyDetails["usageCategoryMajor"] +// let units = propertyDetails["units"] +// let propertyAttributes = propertyDetails["additionalDetails"] +// let unitSet = new Set() + +// for (unit of units) { +// unitSet.add(unit["usageCategoryMajor"]) +// } +// let firecess_category_major = 0; +// let firecess_building_height = 0; +// let firecess_inflammable = 0; + +// if (propertyUsageCategoryMajor == "RESIDENTIAL" || (unitSet.size == 1 && unitSet.has("RESIDENTIAL"))) { +// // There is no category major firecess applicable as it i +// firecess_category_major = 0 +// } else { +// firecess_category_major = fireCessConfig.dynamicRates.firecess_category_major; +// } + +// if (propertyAttributes && +// propertyAttributes.heightAbove36Feet && +// propertyAttributes.heightAbove36Feet.toString() == "true") { +// // height is above 36 feet +// firecess_building_height = fireCessConfig.dynamicRates.firecess_building_height; +// } + +// if (propertyAttributes && +// propertyAttributes.inflammable && +// propertyAttributes.inflammable.toString() == "true") { +// // height is above 36 feet +// firecess_inflammable = fireCessConfig.dynamicRates.firecess_inflammable; +// } + +// return { +// firecess_inflammable, +// firecess_building_height, +// firecess_category_major, +// firecess: firecess_category_major + firecess_building_height + firecess_inflammable +// } +// } + +// function calculateNewFireCess(taxHeads, firecess_percent, taxField, taxHeadCodeField) { + +// let applicablePropertyTax = 0 +// for (taxHead of taxHeads) { +// if (taxHead[taxHeadCodeField] == "PT_TAX") { +// applicablePropertyTax += taxHead[taxField] +// } else if (taxHead[taxHeadCodeField] == "PT_UNIT_USAGE_EXEMPTION") { +// applicablePropertyTax += taxHead[taxField] +// } else if (taxHead[taxHeadCodeField] == "PT_OWNER_EXEMPTION") { +// applicablePropertyTax += taxHead[taxField] +// } +// } + +// return round(applicablePropertyTax * (firecess_percent / 100), 2); +// } async function findDemandForConsumerCode(consumerCode, tenantId, service, RequestInfo) { let demandSearchResponse = await request.post({ - url: PT_DEMAND_HOST + "/billing-service/demand/_search?tenantId=" + tenantId + - "&consumerCode=" + consumerCode + "&businessService=" + service, + url: url.resolve(PT_DEMAND_HOST, "/billing-service/demand/_search?tenantId=" + tenantId + + "&consumerCode=" + consumerCode + "&businessService=" + service), body: { RequestInfo }, @@ -311,9 +385,11 @@ async function findDemandForConsumerCode(consumerCode, tenantId, service, Reques return demandSearchResponse; } + + async function updateDemand(demands, RequestInfo) { let demandUpdateResponse = await request.post({ - url: PT_DEMAND_HOST + "/billing-service/demand/_update", + url: url.resolve(PT_DEMAND_HOST, "/billing-service/demand/_update"), body: { RequestInfo, "Demands": demands @@ -324,128 +400,223 @@ async function updateDemand(demands, RequestInfo) { return demandUpdateResponse; } -function _estimateTaxProcessor(request, response) { - let index = 0; - for (let calc of request["CalculationCriteria"]) { - let fireCessPercentage = getFireCessPercentage(calc["property"]["propertyDetails"][0]) +async function getOldRequestBody(requestBody) { + let CalculationCriteria = await request.post({ + url: url.resolve(PT_CALCULATOR_V2_HOST, "/pt-calculator-v2/propertytax/v2/_translate"), + body: requestBody, + json: true + }) - let updateFirecessAmount = calculateNewFireCess(response["Calculation"][0]["taxHeadEstimates"], fireCessPercentage.firecess, "estimateAmount", "taxHeadCode") - let taxes = getUpdateTaxSummary(response["Calculation"][index], updateFirecessAmount, "taxHeadCode", "estimateAmount") + return CalculationCriteria; +} - response["Calculation"][index]["totalAmount"] = taxes.totalAmount - response["Calculation"][index]["taxAmount"] = round(taxes.taxAmount, 2) - response["Calculation"][index]["rebate"] = taxes.rebate +async function findEstimate(requestBody){ - index++ - } + let estimateRes = await request.post({ + url: url.resolve(PT_CALCULATOR_V2_HOST, "/pt-calculator-v2/propertytax/v2/_estimate"), + body: requestBody, + json: true + }) - return response; + return estimateRes; } +// function _estimateTaxProcessor(request, response, fireCessConfig) { +// response = _estimateZeroTaxProcessor(request, response); -function getUpdateTaxSummary(calculation, newTaxAmount, taxHeadCodeField, taxAmountField) { - let ceilingTaxHead = null; - let firecessTaxHead = null; - - let taxAmount = 0, - penalty = 0, - rebate = 0, - exemption = 0 - let taxHeads = calculation["taxHeadEstimates"] - for (taxHead of taxHeads) { - if (taxHead[taxHeadCodeField] == "PT_FIRE_CESS") { - let existingTaxAmount = taxHead[taxAmountField] - taxHead[taxAmountField] = newTaxAmount - firecessTaxHead = taxHead - taxAmount += newTaxAmount - if (DEBUG_MODE) { - taxHead.oldEstimateAmount = existingTaxAmount - } - } else { - switch (taxHead[taxHeadCodeField]) { - case "PT_DECIMAL_CEILING_CREDIT": - case "PT_DECIMAL_CEILING_DEBIT": - ceilingTaxHead = taxHead - break - case "PT_ADVANCE_CARRYFORWARD": - exemption += taxHead[taxAmountField] - break - default: - switch (taxHead.category) { - case "PENALTY": - penalty += taxHead[taxAmountField] - break - case "TAX": - taxAmount += taxHead[taxAmountField] - break - case "REBATE": - rebate += taxHead[taxAmountField] - break - case "EXEMPTION": - exemption += taxHead[taxAmountField] - break - default: - console.log("Going to default for taxHead", taxHead) - taxAmount += taxHead[taxAmountField] - } +// let index = 0; +// for (let calc of request["CalculationCriteria"]) { +// let fireCessPercentage = getFireCessPercentage(calc["property"]["propertyDetails"][0], fireCessConfig) - } - } - } +// let updateFirecessAmount = calculateNewFireCess(response["Calculation"][0]["taxHeadEstimates"], fireCessPercentage.firecess, "estimateAmount", "taxHeadCode") +// let taxes = getUpdateTaxSummary(response["Calculation"][index], updateFirecessAmount, "taxHeadCode", "estimateAmount") - taxAmount = round(taxAmount, 2) - penalty = round(penalty, 2) - exemption = round(exemption, 2) - rebate = round(rebate, 2) +// response["Calculation"][index]["totalAmount"] = taxes.totalAmount +// response["Calculation"][index]["taxAmount"] = round(taxes.taxAmount, 2) +// response["Calculation"][index]["rebate"] = taxes.rebate - let totalAmount = taxAmount + penalty - rebate - exemption +// index++ +// } - totalAmount = round(totalAmount, 2) - let fractionAmount = totalAmount - Math.trunc(totalAmount) - let newCeilingTax = false +// return response; +// } - if (ceilingTaxHead == null && fractionAmount == 0) { - } else { - let ceilingDelta = 0.0; +async function _estimateIntegrationTaxProcessor(req1, res1) { - if (ceilingTaxHead == null) { - ceilingTaxHead = { - taxHeadCode: "", - estimateAmount: 0, - category: null - } - newCeilingTax = true - taxHeads.push(ceilingTaxHead) + log("Calling PMIDC estimate API: "+res1 ) + + let estimate = await request.post({ + url: url.resolve(PT_INTEGRATION_HOST, "/apt_estimate_pt_2013/api_estimate_pt_2013"), + body: {request:req1, response:res1}, + json: true + }) + + log("Got response from PMIDC estimate API: " +estimate) + + return estimate; +} + + + +function _estimateZeroTaxProcessor(request, response) { + let index = 0; + + for (let calc of response["Calculation"]) { + let assessmentYear = request["CalculationCriteria"][index]["assessmentYear"] + let tenantId = request["CalculationCriteria"][index]["tenantId"] + let newTotal = 0; + + if (isCitizen(request) && assessmentYear == PT_ZERO_ASSESSMENTYEAR) { + + data = + { + "ResponseInfo":null, + "Errors":[ + { + "code":"CitizenOnlineNotAllowed", + "message":"Sorry but online assessment for " + PT_ZERO_ASSESSMENTYEAR + " is not allowed. Please make the payment at the counter", + "description": "Sorry but online assessment for " + PT_ZERO_ASSESSMENTYEAR + " is not allowed. Please make the payment at the counter", + "params":null + } + ] + } + return data; + } - if (fractionAmount < 0.5) { - ceilingDelta = parseFloat(fractionAmount.toFixed(2)) - totalAmount = Math.trunc(totalAmount) - ceilingTaxHead[taxHeadCodeField] = "PT_DECIMAL_CEILING_DEBIT" - ceilingTaxHead[taxAmountField] = ceilingDelta - rebate += ceilingDelta - } else { - ceilingDelta = parseFloat((1 - fractionAmount).toFixed(2)) - - totalAmount = Math.trunc(totalAmount) + 1 - ceilingTaxHead[taxHeadCodeField] = "PT_DECIMAL_CEILING_CREDIT" - ceilingTaxHead[taxAmountField] = ceilingDelta - taxAmount += ceilingDelta + if (!(assessmentYear == PT_ZERO_ASSESSMENTYEAR && PT_ZERO_TENANTS.indexOf(tenantId) >= 0)) + continue + + let taxHeads = calc["taxHeadEstimates"]; + + for (taxHead of taxHeads) { + if (taxHead.taxHeadCode != "PT_ADHOC_PENALTY" && taxHead.taxHeadCode != 'PT_ADVANCE_CARRYFORWARD') { + taxHead.estimateAmount = 0 + } else if (taxHead.taxHeadCode == 'PT_ADVANCE_CARRYFORWARD') { + newTotal += taxHead.estimateAmount + } else { + newTotal += taxHead.estimateAmount + } } - } - return { - taxHeads, - rebate, - totalAmount, - taxAmount, - newCeilingTax, - ceilingTaxHead, - firecessTaxHead + calc["totalAmount"] = newTotal + calc["taxAmount"] = 0 + calc["rebate"] = 0 + calc["penalty"] = newTotal + calc["exemption"] = 0 + + index++ } + + return response; } -async function _createAndUpdateTaxProcessor(request, response) { + +// function getUpdateTaxSummary(calculation, newTaxAmount, taxHeadCodeField, taxAmountField) { +// let ceilingTaxHead = null; +// let firecessTaxHead = null; + +// let taxAmount = 0, +// penalty = 0, +// rebate = 0, +// exemption = 0 +// let taxHeads = calculation["taxHeadEstimates"] +// for (taxHead of taxHeads) { +// if (taxHead[taxHeadCodeField] == "PT_FIRE_CESS") { +// let existingTaxAmount = taxHead[taxAmountField] +// taxHead[taxAmountField] = newTaxAmount +// firecessTaxHead = taxHead +// taxAmount += newTaxAmount +// if (DEBUG_MODE) { +// taxHead.oldEstimateAmount = existingTaxAmount +// } +// } else { +// switch (taxHead[taxHeadCodeField]) { +// case "PT_DECIMAL_CEILING_CREDIT": +// case "PT_DECIMAL_CEILING_DEBIT": +// case "PT_ROUNDOFF": +// ceilingTaxHead = taxHead +// break +// case "PT_ADVANCE_CARRYFORWARD": +// exemption += taxHead[taxAmountField] +// break +// default: +// switch (taxHead.category) { +// case "PENALTY": +// penalty += taxHead[taxAmountField] +// break +// case "TAX": +// taxAmount += taxHead[taxAmountField] +// break +// case "REBATE": +// rebate += taxHead[taxAmountField] +// break +// case "EXEMPTION": +// exemption += taxHead[taxAmountField] +// break +// default: +// console.log("Going to default for taxHead", taxHead) +// taxAmount += taxHead[taxAmountField] +// } + +// } +// } +// } + +// taxAmount = round(taxAmount, 2) +// penalty = round(penalty, 2) +// exemption = round(exemption, 2) +// rebate = round(rebate, 2) + +// let totalAmount = taxAmount + penalty - rebate - exemption + +// totalAmount = round(totalAmount, 2) +// let fractionAmount = totalAmount - Math.trunc(totalAmount) +// let newCeilingTax = false + +// if (ceilingTaxHead == null && fractionAmount == 0) { + +// } else { +// let ceilingDelta = 0.0; + +// if (ceilingTaxHead == null) { +// ceilingTaxHead = { +// taxHeadCode: "", +// estimateAmount: 0, +// category: null +// } +// newCeilingTax = true +// taxHeads.push(ceilingTaxHead) +// } + +// if (fractionAmount < 0.5) { +// ceilingDelta = parseFloat(fractionAmount.toFixed(2)) +// totalAmount = Math.trunc(totalAmount) +// ceilingTaxHead[taxHeadCodeField] = "PT_ROUNDOFF" +// ceilingTaxHead[taxAmountField] = -ceilingDelta +// rebate += ceilingDelta +// } else { +// ceilingDelta = parseFloat((1 - fractionAmount).toFixed(2)) + +// totalAmount = Math.trunc(totalAmount) + 1 +// ceilingTaxHead[taxHeadCodeField] = "PT_ROUNDOFF" +// ceilingTaxHead[taxAmountField] = ceilingDelta +// taxAmount += ceilingDelta +// } +// } + +// return { +// taxHeads, +// rebate, +// totalAmount, +// taxAmount, +// newCeilingTax, +// ceilingTaxHead, +// firecessTaxHead +// } +// } + +async function _createAndUpdateZeroTaxProcessor(request, response) { let index = 0 for (reqProperty of request["Properties"]) { @@ -454,104 +625,346 @@ async function _createAndUpdateTaxProcessor(request, response) { let assessmentNumber = resProperty["propertyDetails"][0]["assessmentNumber"] - let consumerCode = propertyId + ":" + assessmentNumber - let service = "PT" + let assessmentYear = resProperty["propertyDetails"][0]["financialYear"] let tenantId = reqProperty["tenantId"] - let demandSearchResponse = await findDemandForConsumerCode(consumerCode, tenantId, service, request["RequestInfo"]) + if (isCitizen(request) && assessmentYear === PT_ZERO_ASSESSMENTYEAR) { + data = + { + "ResponseInfo":null, + "Errors":[ + { + "code":"CitizenOnlineNotAllowed", + "message":"Sorry but online assessment for " + PT_ZERO_ASSESSMENTYEAR + " is not allowed. Please make the payment at the counter", + "description": "Sorry but online assessment for " + PT_ZERO_ASSESSMENTYEAR + " is not allowed. Please make the payment at the counter", + "params":null + } + ] + }; + return data; + } - let fireCessPercentage = getFireCessPercentage(reqProperty["propertyDetails"][0]) + if (!(assessmentYear == PT_ZERO_ASSESSMENTYEAR && PT_ZERO_TENANTS.indexOf(tenantId) >= 0)) + continue - if (DEBUG_MODE) { - demandSearchResponse["Demands"][0]["firecess"] = fireCessPercentage - } + request_info = request["RequestInfo"] || request["requestInfo"] + + let consumerCode = propertyId + ":" + assessmentNumber + let service = "PT" let calc = response["Properties"][index]["propertyDetails"][0]["calculation"] - let updateFirecessTax = calculateNewFireCess(calc["taxHeadEstimates"], fireCessPercentage.firecess, "estimateAmount", "taxHeadCode") - - let taxes = getUpdateTaxSummary(calc, - updateFirecessTax, "taxHeadCode", "estimateAmount") - - if (taxes.newCeilingTax) { - let firstDemand = demandSearchResponse["Demands"][0]["demandDetails"][0] - let newDemand = { - id: null, - demandId: firstDemand["demandId"], - taxHeadMasterCode: taxes.ceilingTaxHead.taxHeadCode, - taxAmount: taxes.ceilingTaxHead.estimateAmount, - tenantId: firstDemand["tenantId"], - collectionAmount: 0 - } - demandSearchResponse["Demands"][0]["demandDetails"].push(newDemand) - } + + let newTotal = 0; + + let demandSearchResponse = await findDemandForConsumerCode(consumerCode, tenantId, service, request["RequestInfo"]) for (demandDetail of demandSearchResponse["Demands"][0]["demandDetails"]) { - if (demandDetail.taxHeadMasterCode == "PT_FIRE_CESS") { - demandDetail.taxAmount = taxes.firecessTaxHead.estimateAmount - } - if (demandDetail.taxHeadMasterCode == "PT_DECIMAL_CEILING_DEBIT" || demandDetail.taxHeadMasterCode == "PT_DECIMAL_CEILING_DEBIT") { - demandDetail.taxHeadMasterCode = taxes.ceilingTaxHead.taxHeadCode - demandDetail.taxAmount = taxes.ceilingTaxHead.estimateAmount + if (demandDetail.taxHeadMasterCode != "PT_ADHOC_PENALTY" && demandDetail.taxHeadMasterCode != 'PT_ADVANCE_CARRYFORWARD') { + demandDetail.taxAmount = 0 + } else if (demandDetail.taxHeadMasterCode == 'PT_ADVANCE_CARRYFORWARD') { + newTotal += demandDetail.taxAmount + } else { + newTotal += demandDetail.taxAmount } } - let demandUpdateResponse = await updateDemand(demandSearchResponse["Demands"], request["RequestInfo"]) - - // let updateTaxHeads = [] + let taxHeads = calc["taxHeadEstimates"]; - // for (taxHead of demandSearchResponse["Demands"]) { - // updateTaxHeads.push({ - // taxHeadCode: taxHead.taxHeadMasterCode, - // estimateAmount: taxHead.taxtAmount, - // category: taxHead.category - // }) - // } + for (taxHead of taxHeads) { + if (taxHead.taxHeadCode != "PT_ADHOC_PENALTY" && taxHead.taxHeadCode == 'PT_ADVANCE_CARRYFORWARD') { + taxHead.estimateAmount = 0 + } + } + let demandUpdateResponse = await updateDemand(demandSearchResponse["Demands"], request["RequestInfo"]) - calc["totalAmount"] = taxes.totalAmount - calc["taxAmount"] = taxes.taxAmount - calc["rebate"] = taxes.rebate - // calc["taxHeadEstimates"] = updateTaxHeads + calc["taxAmount"] = 0; + calc["exemption"] = 0; + calc["totalAmount"] = newTotal; + calc["rebate"] = 0 + calc["penanlty"] = newTotal index++ } - return response + return response; +} + +async function _createAndUpdateIntegrationTaxProcessor(req, response){ + + reqProperty = req["Assessment"]; + + let propertyId = reqProperty["propertyId"] + + let assessmentYear = reqProperty["financialYear"] + let tenantId = reqProperty["tenantId"] + + if (!(assessmentYear == PT_INTEGRATION_ASSESSMENTYEAR && PT_INTEGRATION_TENANTS.indexOf(tenantId) >= 0)) + return response; + + + + let oldRequestbody = getOldRequestBody(req) + + oldRequestbody["CalculationCriteria"][0]["assessmentYear"] = oldRequestBody["CalculationCriteria"][0]["property"]["propertyDetails"][0]["financialYear"] + + log("Got request for tenantid: "+tenantId+" and finanancial year: "+assessmentYear) + log("Assessment CREATE/ UPDATE Request body: "+reqProperty) + + estimateResponse = await findEstimate(req) + + + request_info = req["RequestInfo"] || req["requestInfo"] + + let consumerCode = propertyId + let service = "PT" + let calc = estimateResponse["Calculation"] + let taxHeads = calc["taxHeadEstimates"]; + let createTaxHeadsArray = {}; + for(taxHead of taxHeads){ + createTaxHeadsArray[taxHead.taxHeadCode] = taxHead.estimateAmount; + //print(texthead) + } + + let demandSearchResponse = await findDemandForConsumerCode(consumerCode, tenantId, service, req["RequestInfo"]) + + if( !isValidDemand(demandSearchResponse)){ + //Throw Error + data = + { + "ResponseInfo":null, + "Errors":[ + { + "code":"MultipleActiveDemandForOneFinancialYear", + "message":"There are multiple demand for property id : "+ propertyId +" for financial year" + PT_INTEGRATION_ASSESSMENTYEAR, + "description": "There multiple demand for property id : "+ propertyId +" for financial year" + PT_INTEGRATION_ASSESSMENTYEAR, + "params":null + } + ] + }; + return data; + } + + demandSearchResponse = getIntegrateYearDemand(demandSearchResponse) + + log("Search Demand response For Integrated Year: " + demandSearchResponse) + + if(isReceiptGenerated(demandSearchResponse)){ + //Throw Error + data = + { + "ResponseInfo":null, + "Errors":[ + { + "code":"MultiplePaymentNotAllowed", + "message":"There already exists a recipt for property id : "+ propertyId +" for financial year" + PT_INTEGRATION_ASSESSMENTYEAR, + "description": "There already exists a recipt for property id : "+ propertyId +" for financial year" + PT_INTEGRATION_ASSESSMENTYEAR, + "params":null + } + ] + }; + return data; + } + + + let newTotal = 0; + + for (demandDetail of demandSearchResponse["Demands"][0]["demandDetails"]) + { + if(demandDetail.taxAmount){ + demandDetail.taxAmount = 0 + } + } + + + + for (demandDetail of demandSearchResponse["Demands"][0]["demandDetails"]) + { + if(createTaxHeadsArray[demandDetail.taxHeadMasterCode]) + { + demandDetail.taxAmount = createTaxHeadsArray[demandDetail.taxHeadMasterCode]; + createTaxHeadsArray[demandDetail.taxHeadMasterCode] =0; // Incase of Multiple PT_ROUNDOFF + newTotal += demandDetail.taxAmount; + } + } + + let demandUpdateResponse = await updateDemand(demandSearchResponse["Demands"], req["RequestInfo"]) + calc["taxAmount"] = 0; + calc["exemption"] = 0; + calc["totalAmount"] = newTotal; + calc["rebate"] = 0; + calc["penanlty"] = 0; + + log("Demand Updated with Details : " + demandUpdateResponse ) + + return response; + } +// async function _createAndUpdateTaxProcessor(request, response, fireCessConfig) { + +// let index = 0 +// for (reqProperty of request["Properties"]) { + +// let resProperty = response["Properties"][index] +// let propertyId = resProperty["propertyId"] + +// let assessmentNumber = resProperty["propertyDetails"][0]["assessmentNumber"] + +// let consumerCode = propertyId + ":" + assessmentNumber +// let service = "PT" +// let tenantId = reqProperty["tenantId"] + +// let demandSearchResponse = await findDemandForConsumerCode(consumerCode, tenantId, service, request["RequestInfo"]) + +// let fireCessPercentage = getFireCessPercentage(reqProperty["propertyDetails"][0], fireCessConfig) + +// if (DEBUG_MODE) { +// demandSearchResponse["Demands"][0]["firecess"] = fireCessPercentage +// } +// let calc = response["Properties"][index]["propertyDetails"][0]["calculation"] +// let updateFirecessTax = calculateNewFireCess(calc["taxHeadEstimates"], fireCessPercentage.firecess, "estimateAmount", "taxHeadCode") + +// let taxes = getUpdateTaxSummary(calc, +// updateFirecessTax, "taxHeadCode", "estimateAmount") + +// if (taxes.newCeilingTax) { +// let firstDemand = demandSearchResponse["Demands"][0]["demandDetails"][0] +// let newDemand = { +// id: null, +// demandId: firstDemand["demandId"], +// taxHeadMasterCode: taxes.ceilingTaxHead.taxHeadCode, +// taxAmount: taxes.ceilingTaxHead.estimateAmount, +// tenantId: firstDemand["tenantId"], +// collectionAmount: 0 +// } +// demandSearchResponse["Demands"][0]["demandDetails"].push(newDemand) +// } + +// for (demandDetail of demandSearchResponse["Demands"][0]["demandDetails"]) { +// if (demandDetail.taxHeadMasterCode == "PT_FIRE_CESS") { +// demandDetail.taxAmount = taxes.firecessTaxHead.estimateAmount +// } +// if (demandDetail.taxHeadMasterCode == "PT_ROUNDOFF" && demandDetail.adjustedAmount == 0.0) { +// demandDetail.taxHeadMasterCode = taxes.ceilingTaxHead.taxHeadCode +// demandDetail.taxAmount = taxes.ceilingTaxHead.estimateAmount +// } +// } + +// let demandUpdateResponse = await updateDemand(demandSearchResponse["Demands"], request["RequestInfo"]) + +// // let updateTaxHeads = [] + +// // for (taxHead of demandSearchResponse["Demands"]) { +// // updateTaxHeads.push({ +// // taxHeadCode: taxHead.taxHeadMasterCode, +// // estimateAmount: taxHead.taxtAmount, +// // category: taxHead.category +// // }) +// // } + +// calc["totalAmount"] = taxes.totalAmount +// calc["taxAmount"] = taxes.taxAmount +// calc["rebate"] = taxes.rebate +// // calc["taxHeadEstimates"] = updateTaxHeads +// index++ +// } + +// return response +// } + async function _createAndUpdateRequestHandler(req, res) { let { request, response } = getRequestResponse(req) + for (reqProperty of request["Assessment"]) { - let tenantId = request["Properties"][0]["tenantId"] + let assessmentYear = reqProperty["financialYear"] + let tenantId = reqProperty["tenantId"] - let fireCessConfig = await getFireCessConfig(tenantId) - if (fireCessConfig && fireCessConfig.dynamicFirecess && fireCessConfig.dynamicFirecess == true) { - let updatedResponse = await _createAndUpdateTaxProcessor(request, response) - res.json(updatedResponse); - } else { - res.json(response) + if (assessmentYear == PT_ZERO_ASSESSMENTYEAR && PT_ZERO_TENANTS.indexOf(tenantId) >= 0){ + response = await _createAndUpdateZeroTaxProcessor(request, response) + }else if(assessmentYear == PT_INTEGRATION_ASSESSMENTYEAR && PT_INTEGRATION_TENANTS.indexOf(tenantId) >= 0){ + response = await _createAndUpdateIntegrationTaxProcessor(request, response) + } + index++; } + // if (!PT_ENABLE_FC_CALC) + if ("Errors" in response) + res.status(400).json(response) + else + res.json(response); + + // firecess logic is enabled, so execute it + // let tenantId = request["Properties"][0]["tenantId"] + + // let fireCessConfig = await getFireCessConfig(tenantId) + // if (fireCessConfig && fireCessConfig.dynamicFirecess && fireCessConfig.dynamicFirecess == true) { + // let updatedResponse = await _createAndUpdateTaxProcessor(request, response, fireCessConfig) + // res.json(updatedResponse); + // } else { + // res.json(response) + // } } function getRequestResponse(req) { - let request, response + let request = null, + response = null if (typeof req.body.request === "string") { request = JSON.parse(req.body.request) - response = JSON.parse(req.body.response) + if (req.body.response) + response = JSON.parse(req.body.response) } else { request = req.body.request response = req.body.response } + return { request, response } } -router.post('/protected/punjab-pt/property/_create', asyncMiddleware(_createAndUpdateRequestHandler)) +router.post('/protected/punjab-pt/assessment/_create', asyncMiddleware(_createAndUpdateRequestHandler)) + +router.post('/protected/punjab-pt/assessment/_update', asyncMiddleware(_createAndUpdateRequestHandler)) + +router.post('/open/punjab-pt/payu/confirm', asyncMiddleware((async function (req, res) { + let return_data = req.body; + original_callback = req.query.original_callback; + delete req.query['original_callback']; + new_query_params = Object.assign({}, return_data, req.query); + redirect_url = url.format( + { + pathname: original_callback, + query: new_query_params + } + ) + + res.redirect(redirect_url); +}))) + +router.post('/protected/punjab-pt/pre-hook/pg-service/transaction/v1/_create', asyncMiddleware((async function (req, res) { + let { + request + } = getRequestResponse(req) + + if (request['Transaction']['tenantId'] == 'pb.jalandhar' || request['Transaction']['tenantId'] == 'pb.testing') { + let original_callback = request['Transaction']['callbackUrl']; + request['Transaction']['gateway'] = 'PAYU' + url_callback = url.parse(original_callback) -router.post('/protected/punjab-pt/property/_update', asyncMiddleware(_createAndUpdateRequestHandler)) + url_callback.query = url_callback.query || {}; + + url_callback.query['original_callback'] = url_callback.path; + + url_callback.path = '/customization/open/punjab-pt/payu/confirm'; + url_callback.pathname = '/customization/open/punjab-pt/payu/confirm'; + + request['Transaction']['callbackUrl'] = url.format(url_callback); + } + + res.json(request); +}))); router.post('/protected/punjab-pt/pt-calculator-v2/_estimate', asyncMiddleware(async function (req, res) { @@ -560,16 +973,61 @@ router.post('/protected/punjab-pt/pt-calculator-v2/_estimate', asyncMiddleware(a response } = getRequestResponse(req) + let oldRequestbody = getOldRequestBody(request) + + oldRequestbody["CalculationCriteria"][0]["assessmentYear"] = oldRequestBody["CalculationCriteria"][0]["property"]["propertyDetails"][0]["financialYear"] + // assessmentYear field was there in old request body but not present in new request body so we are adding this field. + + request = oldRequestbody + let tenantId = request["CalculationCriteria"][0]["tenantId"] + let assessmentYear = request["CalculationCriteria"][0]["assessmentYear"] - let fireCessConfig = await getFireCessConfig(tenantId) + log("Got request for tenantid: "+tenantId+" and finanancial year: "+assessmentYear) + log("Request body: "+request) - if (fireCessConfig && fireCessConfig.dynamicFirecess && fireCessConfig.dynamicFirecess == true) { - let updatedResponse = _estimateTaxProcessor(request, response) - res.json(updatedResponse); - } else { - res.json(response); + if (assessmentYear == PT_ZERO_ASSESSMENTYEAR && PT_ZERO_TENANTS.indexOf(tenantId) >= 0){ + response = _estimateZeroTaxProcessor(request, response) } + else if (assessmentYear == PT_INTEGRATION_ASSESSMENTYEAR){ + + if(PT_INTEGRATION_TENANTS.indexOf(tenantId) >= 0){ + response = await _estimateIntegrationTaxProcessor(request, response) + } else if(isCitizen(request)){ + data = + { + "ResponseInfo":null, + "Errors":[ + { + "code":"CitizenOnlineNotAllowed", + "message":"Sorry but online assessment for " + PT_INTEGRATION_ASSESSMENTYEAR + " is not allowed. Please make the payment at the counter", + "description": "Sorry but online assessment for " + PT_INTEGRATION_ASSESSMENTYEAR + " is not allowed. Please make the payment at the counter", + "params":null + } + ] + } + response = data; + } + + } + + + // if (!PT_ENABLE_FC_CALC) + if ("Errors" in response) + res.status(400).json(response) + else + res.json(response); + + // let tenantId = request["CalculationCriteria"][0]["tenantId"] + + // let fireCessConfig = await getFireCessConfig(tenantId) + + // if (fireCessConfig && fireCessConfig.dynamicFirecess && fireCessConfig.dynamicFirecess == true) { + // let updatedResponse = _estimateTaxProcessor(request, response, fireCessConfig) + // res.json(updatedResponse); + // } else { + // res.json(response); + // } })) app.listen(8000, () => { @@ -578,4 +1036,4 @@ app.listen(8000, () => { // TODO: // Add total amount to calculations "totalAmount": 460, -// "taxAmount": 510, \ No newline at end of file +// "taxAmount": 510, diff --git a/rainmaker-custom-service/package.json b/rainmaker-custom-service/package.json index f49122be..adfe942c 100644 --- a/rainmaker-custom-service/package.json +++ b/rainmaker-custom-service/package.json @@ -14,7 +14,8 @@ "nodemon": "^1.18.4", "pg-promise": "^8.4.5", "request": "^2.88.0", - "request-promise": "^4.2.2" + "request-promise": "^4.2.2", + "morgan": "*" }, "scripts": { "debug": "nodemon --inspect index.js" diff --git a/rainmaker-custom-service/yarn.lock b/rainmaker-custom-service/yarn.lock index 6abd99f7..04493197 100644 --- a/rainmaker-custom-service/yarn.lock +++ b/rainmaker-custom-service/yarn.lock @@ -1201,8 +1201,8 @@ lodash.uniqueid@4.0.1: resolved "https://registry.yarnpkg.com/lodash.uniqueid/-/lodash.uniqueid-4.0.1.tgz#3268f26a7c88e4f4b1758d679271814e31fa5b26" lodash@^4.13.1, lodash@^4.17.10: - version "4.17.14" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.14.tgz#9ce487ae66c96254fe20b599f21b6816028078ba" + version "4.17.11" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d" lowercase-keys@^1.0.0: version "1.0.1" From 213aa72e94a7eced1e8ec8f805897e7de649ad6c Mon Sep 17 00:00:00 2001 From: Deependra-egov <47975393+Deependra-egov@users.noreply.github.com> Date: Wed, 2 Sep 2020 17:07:04 +0530 Subject: [PATCH 0139/1242] tl report update --- configs/reports/configs/tl-reports.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/reports/configs/tl-reports.yml b/configs/reports/configs/tl-reports.yml index a07cdde4..11585473 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -1,6 +1,7 @@ --- ReportDefinitions: - reportName: TradeLicenseRegistryReport + decryptionPathId: TradeLicenseRegistryReport summary: TL Receipt Register Report version: 1.0.0 moduleName: rainmaker-tl From ee4006a39a03f16a81e58a8d7455c84999a65214 Mon Sep 17 00:00:00 2001 From: narendrabandhamneni-wt-egov Date: Wed, 2 Sep 2020 20:01:51 +0530 Subject: [PATCH 0140/1242] modified build files --- Jenkinsfile | 42 ++--------------------------- build/build-config.yml | 2 +- rainmaker-custom-service/Dockerfile | 3 +-- 3 files changed, 4 insertions(+), 43 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 10efb9dd..1206b9c1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,41 +1,3 @@ -def app = ""; -def commit_id=""; -def module_name = "${env.JOB_NAME}".split("/")[-2]; -def service_name = "${env.JOB_BASE_NAME}"; -def path = "${module_name}/${service_name}" -def build_wkflo; -def ci_image = "egovio/ci:0.0.4" -def notifier = ""; +library 'ci-libs' -try { - node("slave"){ - checkout scm - sh "git rev-parse --short HEAD > .git/commit-id".trim() - commit_id = readFile('.git/commit-id') - - def docker_file_exists = fileExists("${path}/Dockerfile") - - code_builder = load("jenkins/code_builder.groovy") - notifier = load("jenkins/notifier.groovy") - currentBuild.displayName = "${BUILD_ID}-${commit_id}" - - if (!docker_file_exists) { - code_builder.build(path, ci_image) - } - else { - archiver = load("jenkins/archiver.groovy") - image_builder = load("jenkins/image_builder.groovy") - code_builder.build(path, ci_image) - archiver.archiveArtifacts(["${path}/target/*.jar", "${path}/target/*.html"]) - image_builder.build(module_name, service_name, commit_id) - image_builder.publish(service_name, commit_id) - image_builder.clean(service_name, commit_id) - } - } -} catch (e) { - node{ - echo - notifier.notifyBuild("FAILED") - throw e - } -} +buildPipeline(configFile: './build/build-config.yml') diff --git a/build/build-config.yml b/build/build-config.yml index a8ffeb01..08a376d4 100644 --- a/build/build-config.yml +++ b/build/build-config.yml @@ -12,4 +12,4 @@ config: build: - work-dir: "rainmaker-custom-service" image-name: "rainmaker-custom-service" - dockerfile: "build/maven/Dockerfile" + dockerfile: "rainmaker-custom-service/Dockerfile" diff --git a/rainmaker-custom-service/Dockerfile b/rainmaker-custom-service/Dockerfile index c7c85163..37c7dacd 100644 --- a/rainmaker-custom-service/Dockerfile +++ b/rainmaker-custom-service/Dockerfile @@ -1,5 +1,4 @@ -FROM node:8.12-alpine -RUN npm install -g yarn +FROM egovio/alpine-node-builder-10:yarn AS build RUN mkdir /opt/app COPY package.json yarn.lock /opt/app/ WORKDIR /opt/app From 7bc6f04107bd65ec1fd68c28107d645556120148 Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov Date: Wed, 2 Sep 2020 23:44:57 +0530 Subject: [PATCH 0141/1242] Updated total assessment query for PT --- .../dashboard-analytics/ChartApiConfig.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 04ae8617..18434979 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -638,9 +638,9 @@ { "module": "PT", "indexName": "property-assessments", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}],\"must\":{\"term\":{\"dataObject.paymentDetails.businessService.keyword\":\"PT\"}}}},\"aggs\":{\"Assessed Properties\":{\"nested\":{\"path\":\"domainObject.assessmentsDetails\"},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"domainObject.assessmentsDetails.assessmentNumber.keyword\"}}}}}}}}", - "requestQueryMap": "{\"wardId\" : \"dataObject.tenantData.city.districtCode.keyword\", \"tenantId\" : \"dataObject.tenantId\" ,\"district\" : \"Data.tenantData.city.districtCode\"}", - "dateRefField": "dataObject.paymentDetails.receiptDate" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Assessed Properties\":{\"value_count\":{\"field\":\"Data.assessmentNumber.keyword\"}}}}}}", + "requestQueryMap": "{\"wardId\" : \"Data.tenantData.city.districtCode.keyword\", \"tenantId\" : \"Data.tenantId\" ,\"district\" : \"Data.tenantData.city.districtCode\"}", + "dateRefField": "Data.@timestamp" } ], "chartType": "metric", From 7cb224d580aae8fd428ca6675443d2ef870bb0b6 Mon Sep 17 00:00:00 2001 From: Abhilashegov Date: Thu, 3 Sep 2020 07:23:36 +0530 Subject: [PATCH 0142/1242] added post hook url adress and added check PT_CALCULATOR_V2_HOST should not be null --- configs/egov-zuul/post-hook.json | 5 ++++- rainmaker-custom-service/index.js | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/configs/egov-zuul/post-hook.json b/configs/egov-zuul/post-hook.json index b534e253..567d3f37 100644 --- a/configs/egov-zuul/post-hook.json +++ b/configs/egov-zuul/post-hook.json @@ -1,5 +1,8 @@ { "/pt-services-v2/property/_create":"http://rainmaker-custom-service:8000/customization/protected/punjab-pt/property/_create", "/pt-services-v2/property/_update":"http://rainmaker-custom-service:8000/customization/protected/punjab-pt/property/_create", - "/pt-calculator-v2/propertytax/_estimate":"http://rainmaker-custom-service:8000/customization/protected/punjab-pt/pt-calculator-v2/_estimate" + "/pt-calculator-v2/propertytax/_estimate":"http://rainmaker-custom-service:8000/customization/protected/punjab-pt/pt-calculator-v2/_estimate", + "/pt-calculator-v2/propertytax/v2/_estimate":"http://rainmaker-custom-service:8000/customization/protected/punjab-pt/pt-calculator-v2/_estimate", + "/property-services/assessment/_create":"http://rainmaker-custom-service:8000/customization/protected/punjab-pt/assessment/_create", + "/property-services/assessment/_update":"http://rainmaker-custom-service:8000/customization/protected/punjab-pt/assessment/_update" } \ No newline at end of file diff --git a/rainmaker-custom-service/index.js b/rainmaker-custom-service/index.js index dde98481..4a3de901 100644 --- a/rainmaker-custom-service/index.js +++ b/rainmaker-custom-service/index.js @@ -156,6 +156,10 @@ if (PT_DEMAND_HOST === undefined) { throw Error("PT_DEMAND_HOST environment variable needs to be configured to run this") } +if (PT_CALCULATOR_V2_HOST === undefined) { + throw Error("PT_CALCULATOR_V2_HOST environment variable needs to be configured to run this") +} + function round(num, digits) { return parseFloat(parseFloat(num).toFixed(digits)) } From e136d0f4eafd8f51e95e5ac10cb26370e78f16fd Mon Sep 17 00:00:00 2001 From: Abhilashegov Date: Thu, 3 Sep 2020 08:51:36 +0530 Subject: [PATCH 0143/1242] added logs and fixed unfined error --- rainmaker-custom-service/index.js | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/rainmaker-custom-service/index.js b/rainmaker-custom-service/index.js index 4a3de901..fbca112b 100644 --- a/rainmaker-custom-service/index.js +++ b/rainmaker-custom-service/index.js @@ -405,12 +405,15 @@ async function updateDemand(demands, RequestInfo) { } async function getOldRequestBody(requestBody) { + log("Translate Call for Property: ") let CalculationCriteria = await request.post({ url: url.resolve(PT_CALCULATOR_V2_HOST, "/pt-calculator-v2/propertytax/v2/_translate"), body: requestBody, json: true }) + log("Response from Translate API: " +CalculationCriteria); + return CalculationCriteria; } @@ -977,12 +980,17 @@ router.post('/protected/punjab-pt/pt-calculator-v2/_estimate', asyncMiddleware(a response } = getRequestResponse(req) - let oldRequestbody = getOldRequestBody(request) + log("Estimate req : " +req); + log("Estimate res : "+res); + log("Estimate request : "+request); + log("Estimate response : "+response); + + let oldRequestbody = getOldRequestBody(req) - oldRequestbody["CalculationCriteria"][0]["assessmentYear"] = oldRequestBody["CalculationCriteria"][0]["property"]["propertyDetails"][0]["financialYear"] + oldRequestbody["CalculationCriteria"][0]["assessmentYear"] = oldRequestbody["CalculationCriteria"][0]["property"]["propertyDetails"][0]["financialYear"] // assessmentYear field was there in old request body but not present in new request body so we are adding this field. - request = oldRequestbody + request = oldRequestbody; let tenantId = request["CalculationCriteria"][0]["tenantId"] let assessmentYear = request["CalculationCriteria"][0]["assessmentYear"] From ea942b359b06f990ac79ad0d9ae558e9f0c3196f Mon Sep 17 00:00:00 2001 From: Abhilashegov Date: Thu, 3 Sep 2020 09:06:20 +0530 Subject: [PATCH 0144/1242] paresed the logs --- rainmaker-custom-service/index.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rainmaker-custom-service/index.js b/rainmaker-custom-service/index.js index fbca112b..f2660045 100644 --- a/rainmaker-custom-service/index.js +++ b/rainmaker-custom-service/index.js @@ -980,10 +980,10 @@ router.post('/protected/punjab-pt/pt-calculator-v2/_estimate', asyncMiddleware(a response } = getRequestResponse(req) - log("Estimate req : " +req); - log("Estimate res : "+res); - log("Estimate request : "+request); - log("Estimate response : "+response); + log("Estimate req : " +JSON.parse(req)); + log("Estimate res : "+JSON.parse(res)); + log("Estimate request : "+JSON.parse(request)); + log("Estimate response : "+JSON.parse(response)); let oldRequestbody = getOldRequestBody(req) From c0b829a4cd9b2e747efc10786453b1e62cec222b Mon Sep 17 00:00:00 2001 From: Abhilashegov Date: Thu, 3 Sep 2020 09:12:45 +0530 Subject: [PATCH 0145/1242] parsed the logs for req and res --- rainmaker-custom-service/index.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rainmaker-custom-service/index.js b/rainmaker-custom-service/index.js index f2660045..5650a688 100644 --- a/rainmaker-custom-service/index.js +++ b/rainmaker-custom-service/index.js @@ -980,10 +980,10 @@ router.post('/protected/punjab-pt/pt-calculator-v2/_estimate', asyncMiddleware(a response } = getRequestResponse(req) - log("Estimate req : " +JSON.parse(req)); - log("Estimate res : "+JSON.parse(res)); - log("Estimate request : "+JSON.parse(request)); - log("Estimate response : "+JSON.parse(response)); + log("Estimate req : " +JSON.parse(req.body.request)); + log("Estimate res : "+JSON.parse(res.body.request)); + log("Estimate request : "+JSON.parse(request.body.request)); + log("Estimate response : "+JSON.parse(response.body.request)); let oldRequestbody = getOldRequestBody(req) From b9d753c6721b65390cc8f40e4422b87ccdf6923a Mon Sep 17 00:00:00 2001 From: Abhilashegov Date: Thu, 3 Sep 2020 09:31:54 +0530 Subject: [PATCH 0146/1242] commented some logs and changed the request body --- rainmaker-custom-service/index.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/rainmaker-custom-service/index.js b/rainmaker-custom-service/index.js index 5650a688..7be27fe4 100644 --- a/rainmaker-custom-service/index.js +++ b/rainmaker-custom-service/index.js @@ -980,12 +980,12 @@ router.post('/protected/punjab-pt/pt-calculator-v2/_estimate', asyncMiddleware(a response } = getRequestResponse(req) - log("Estimate req : " +JSON.parse(req.body.request)); - log("Estimate res : "+JSON.parse(res.body.request)); - log("Estimate request : "+JSON.parse(request.body.request)); - log("Estimate response : "+JSON.parse(response.body.request)); + // log("Estimate req : " +JSON.stringify(req)); + // log("Estimate res : "+JSON.parse(res.body.request)); + // log("Estimate request : "+JSON.parse(request.body.request)); + // log("Estimate response : "+JSON.parse(response.body.request)); - let oldRequestbody = getOldRequestBody(req) + let oldRequestbody = getOldRequestBody(request) oldRequestbody["CalculationCriteria"][0]["assessmentYear"] = oldRequestbody["CalculationCriteria"][0]["property"]["propertyDetails"][0]["financialYear"] // assessmentYear field was there in old request body but not present in new request body so we are adding this field. From 72cf828e15877fae6bd39bd95ed93c769b4261d6 Mon Sep 17 00:00:00 2001 From: Abhilashegov Date: Thu, 3 Sep 2020 09:46:06 +0530 Subject: [PATCH 0147/1242] changed the variable --- rainmaker-custom-service/index.js | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/rainmaker-custom-service/index.js b/rainmaker-custom-service/index.js index 7be27fe4..51ad3e77 100644 --- a/rainmaker-custom-service/index.js +++ b/rainmaker-custom-service/index.js @@ -980,20 +980,17 @@ router.post('/protected/punjab-pt/pt-calculator-v2/_estimate', asyncMiddleware(a response } = getRequestResponse(req) - // log("Estimate req : " +JSON.stringify(req)); - // log("Estimate res : "+JSON.parse(res.body.request)); - // log("Estimate request : "+JSON.parse(request.body.request)); - // log("Estimate response : "+JSON.parse(response.body.request)); + log(":: Estimate request Received ::"); - let oldRequestbody = getOldRequestBody(request) + // let oldRequestbody = getOldRequestBody(request) - oldRequestbody["CalculationCriteria"][0]["assessmentYear"] = oldRequestbody["CalculationCriteria"][0]["property"]["propertyDetails"][0]["financialYear"] - // assessmentYear field was there in old request body but not present in new request body so we are adding this field. + // oldRequestbody["CalculationCriteria"][0]["assessmentYear"] = oldRequestbody["CalculationCriteria"][0]["property"]["propertyDetails"][0]["financialYear"] + // // assessmentYear field was there in old request body but not present in new request body so we are adding this field. - request = oldRequestbody; + // request = oldRequestbody; - let tenantId = request["CalculationCriteria"][0]["tenantId"] - let assessmentYear = request["CalculationCriteria"][0]["assessmentYear"] + let tenantId = request["Assessment"]["tenantId"] + let assessmentYear = request["Assessment"]["financialYear"] log("Got request for tenantid: "+tenantId+" and finanancial year: "+assessmentYear) log("Request body: "+request) From 8fbcc682c6065b7fee20ecbdead9a79f820270ef Mon Sep 17 00:00:00 2001 From: Kabir Date: Thu, 3 Sep 2020 10:44:37 +0530 Subject: [PATCH 0148/1242] uatv2 testing ptreports final update --- configs/reports/configs/pt-reports.yml | 65 +++++++++++++++++--------- 1 file changed, 44 insertions(+), 21 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 62120fe5..7ae90cd6 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -3786,6 +3786,7 @@ ReportDefinitions: groupby: group by bd.tenantid orderby: order by bd.tenantid + - reportName: FYCollectionsReport_V2 summary: FY Collections version: 1.0.0 @@ -3804,21 +3805,41 @@ ReportDefinitions: type: string source: pt total: true + - name: countresidential + label: reports.pt.countresidential + type: string + source: pt + total: true - name: nonresidential label: reports.pt.nonresidential type: string source: pt total: true + - name: countnonresidential + label: reports.pt.countnonresidential + type: string + source: pt + total: true - name: mixed label: reports.pt.mixed type: string source: pt total: true + - name: countmixed + label: reports.pt.countmixed + type: string + source: pt + total: true - name: totalamount label: reports.pt.totalamount type: string source: pt total: true + - name: totalcount + label: reports.pt.totalcount + type: string + source: pt + total: true - name: online label: reports.pt.online type: string @@ -3845,13 +3866,13 @@ ReportDefinitions: type: epoch source: pt isMandatory: false - searchClause: AND pd.receiptdate >= $fromDate + searchClause: AND rh.receiptdate >= $fromDate - name: toDate label: reports.pt.toDate type: epoch source: pt isMandatory: false - searchClause: AND pd.receiptdate <= $toDate + searchClause: AND rh.receiptdate <= $toDate - name: localityArray label: reports.pt.zoneList type: boundarylist @@ -3860,25 +3881,27 @@ ReportDefinitions: searchClause: AND pt_addr.locality IN ($localityArray) query: | -- Use CTE to force query plan, compute & use CTE later - SELECT - financialyear, - sum(case when pt_detail.usagecategorymajor='RESIDENTIAL' then pd.amountpaid else 0 end) as "residential", - sum(case when pt_detail.usagecategorymajor='NONRESIDENTIAL' then pd.amountpaid else 0 end) as "nonresidential", - sum(case when pt_detail.usagecategorymajor='MIXED' then pd.amountpaid else 0 end) as "mixed", - sum(pd.amountpaid) as totalamount, - sum(case when payment.paymentmode='ONLINE' then pd.amountpaid else 0 end) as "online", - sum(case when payment.paymentmode='CASH' then pd.amountpaid else 0 end) as "cash", - sum(case when payment.paymentmode='CHEQUE' then pd.amountpaid else 0 end) as "cheque", - sum(case when payment.paymentmode='DD' then pd.amountpaid else 0 end) as "dd" - FROM egcl_paymentdetail AS pd - join egcl_payment as payment on payment.id = pd.paymentid - join egcl_bill as bill on bill.id = pd.billid - JOIN eg_pt_propertydetail_v2 pt_detail ON pt_detail.property = bill.consumercode - JOIN eg_pt_address_v2 pt_addr ON pt_detail.property = pt_addr.property - LEFT OUTER JOIN eg_user ON eg_user.id = pd.createdby::INTEGER - WHERE pd.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' - groupby: GROUP BY financialyear - orderby: ORDER BY financialyear + SELECT + financialyear, + initcap(split_part(tenantid, '.', 2)) as tenantid, + COUNT(collectiontype) AS totalassessments, + SUM(totalamount) AS totalamount, + SUM(amount) AS totalamountpaid, + SUM(CASE WHEN collectiontype = 'ONLINE' THEN amount ELSE 0 END) AS totalonline, + SUM(CASE WHEN collectiontype = 'ONLINE' THEN 1 ELSE 0 END) AS totalonlinecount, + SUM(CASE WHEN collectiontype != 'ONLINE' THEN amount ELSE 0 END) AS totaloffline, + SUM(CASE WHEN collectiontype != 'ONLINE' THEN 1 ELSE 0 END) AS totalofflinecount, + (SUM(totalamount) - SUM(amount)) AS totalamountdue + FROM eg_pt_propertydetail_v2 AS pd + LEFT OUTER JOIN (SELECT consumercode, totalamount, amount, collectiontype, receiptdate FROM egcl_receiptheader_v1 AS rh + LEFT OUTER JOIN egcl_receiptinstrument_v1 AS ri ON rh.id = ri.receiptheader + LEFT OUTER JOIN egcl_instrumentheader_v1 AS ih ON ri.instrumentheader = ih.id and ih.instrumentstatus != 'CANCELLED' + where rh.status != 'Cancelled' + ) AS tbl_amounts ON CONCAT(pd.property, ':', pd.assessmentnumber) = tbl_amounts.consumercode + WHERE tenantid = $tenantid + groupby: GROUP BY tenantid, financialyear + orderby: ORDER BY tenantid, totalamountpaid DESC NULLS LAST + - reportName: ULBDEFAULTERPTREPORT_V2 summary: ULB Defaulter Pt report From ed798fe17cecdf3411dbd6aa5be131e73446fa3f Mon Sep 17 00:00:00 2001 From: Abhilashegov Date: Thu, 3 Sep 2020 10:46:44 +0530 Subject: [PATCH 0149/1242] Fetching the response in old structure --- rainmaker-custom-service/index.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/rainmaker-custom-service/index.js b/rainmaker-custom-service/index.js index 51ad3e77..c105d857 100644 --- a/rainmaker-custom-service/index.js +++ b/rainmaker-custom-service/index.js @@ -405,14 +405,14 @@ async function updateDemand(demands, RequestInfo) { } async function getOldRequestBody(requestBody) { - log("Translate Call for Property: ") + log("Translate Call for Property: "+ JSON.stringify(requestBody)); let CalculationCriteria = await request.post({ url: url.resolve(PT_CALCULATOR_V2_HOST, "/pt-calculator-v2/propertytax/v2/_translate"), body: requestBody, json: true }) - log("Response from Translate API: " +CalculationCriteria); + log("Response from Translate API: " +JSON.stringify(CalculationCriteria)); return CalculationCriteria; } @@ -993,7 +993,12 @@ router.post('/protected/punjab-pt/pt-calculator-v2/_estimate', asyncMiddleware(a let assessmentYear = request["Assessment"]["financialYear"] log("Got request for tenantid: "+tenantId+" and finanancial year: "+assessmentYear) - log("Request body: "+request) + log("Request body: "+ JSON.stringify(request)); + + let oldRequestbody = getOldRequestBody(request); + oldRequestbody["CalculationCriteria"][0]["assessmentYear"] = assessmentYear; + // assessmentYear field was there in old request body but not present in new request body Without this field we will get null pointer exception. + if (assessmentYear == PT_ZERO_ASSESSMENTYEAR && PT_ZERO_TENANTS.indexOf(tenantId) >= 0){ response = _estimateZeroTaxProcessor(request, response) @@ -1001,7 +1006,7 @@ router.post('/protected/punjab-pt/pt-calculator-v2/_estimate', asyncMiddleware(a else if (assessmentYear == PT_INTEGRATION_ASSESSMENTYEAR){ if(PT_INTEGRATION_TENANTS.indexOf(tenantId) >= 0){ - response = await _estimateIntegrationTaxProcessor(request, response) + response = await _estimateIntegrationTaxProcessor(oldRequestbody, response) } else if(isCitizen(request)){ data = { From 1a83e01ff7b774de07f9ecb6a4a989acde3be877 Mon Sep 17 00:00:00 2001 From: Abhilashegov Date: Thu, 3 Sep 2020 10:56:10 +0530 Subject: [PATCH 0150/1242] added await for translate api response --- rainmaker-custom-service/index.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rainmaker-custom-service/index.js b/rainmaker-custom-service/index.js index c105d857..2b631763 100644 --- a/rainmaker-custom-service/index.js +++ b/rainmaker-custom-service/index.js @@ -708,14 +708,14 @@ async function _createAndUpdateIntegrationTaxProcessor(req, response){ - let oldRequestbody = getOldRequestBody(req) + let oldRequestbody = await getOldRequestBody(req) oldRequestbody["CalculationCriteria"][0]["assessmentYear"] = oldRequestBody["CalculationCriteria"][0]["property"]["propertyDetails"][0]["financialYear"] log("Got request for tenantid: "+tenantId+" and finanancial year: "+assessmentYear) log("Assessment CREATE/ UPDATE Request body: "+reqProperty) - estimateResponse = await findEstimate(req) + let estimateResponse = await findEstimate(req) request_info = req["RequestInfo"] || req["requestInfo"] @@ -995,7 +995,7 @@ router.post('/protected/punjab-pt/pt-calculator-v2/_estimate', asyncMiddleware(a log("Got request for tenantid: "+tenantId+" and finanancial year: "+assessmentYear) log("Request body: "+ JSON.stringify(request)); - let oldRequestbody = getOldRequestBody(request); + let oldRequestbody = await getOldRequestBody(request); oldRequestbody["CalculationCriteria"][0]["assessmentYear"] = assessmentYear; // assessmentYear field was there in old request body but not present in new request body Without this field we will get null pointer exception. From 4f7455de037d7c41ed68525e36f6aa90b2fbbf1d Mon Sep 17 00:00:00 2001 From: Abhilashegov Date: Thu, 3 Sep 2020 11:47:35 +0530 Subject: [PATCH 0151/1242] Removed itiration from assessment create and update --- rainmaker-custom-service/index.js | 34 +++++++++++++++++++------------ 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/rainmaker-custom-service/index.js b/rainmaker-custom-service/index.js index 2b631763..790fdfe5 100644 --- a/rainmaker-custom-service/index.js +++ b/rainmaker-custom-service/index.js @@ -377,6 +377,9 @@ router.post('/protected/bndlogin', asyncMiddleware(async function (req, res) { // } async function findDemandForConsumerCode(consumerCode, tenantId, service, RequestInfo) { + + log("Got Request to Find Demand for Comsumer code: "+consumerCode+" tenantid : "+tenantId+" Service : "+service); + let demandSearchResponse = await request.post({ url: url.resolve(PT_DEMAND_HOST, "/billing-service/demand/_search?tenantId=" + tenantId + "&consumerCode=" + consumerCode + "&businessService=" + service), @@ -386,6 +389,8 @@ async function findDemandForConsumerCode(consumerCode, tenantId, service, Reques json: true }) + log("Got response from demand search : "+ JSON.stringify(demandSearchResponse)); + return demandSearchResponse; } @@ -419,12 +424,16 @@ async function getOldRequestBody(requestBody) { async function findEstimate(requestBody){ + log("Got Request to find estimate : "+ JSON.stringify(requestBody)) + let estimateRes = await request.post({ url: url.resolve(PT_CALCULATOR_V2_HOST, "/pt-calculator-v2/propertytax/v2/_estimate"), body: requestBody, json: true }) + log("Got response from estimate : "+ JSON.stringify(estimateRes)); + return estimateRes; } // function _estimateTaxProcessor(request, response, fireCessConfig) { @@ -450,7 +459,7 @@ async function findEstimate(requestBody){ async function _estimateIntegrationTaxProcessor(req1, res1) { - log("Calling PMIDC estimate API: "+res1 ) + log("Calling PMIDC estimate API: "+ JSON.stringify(res1) ) let estimate = await request.post({ url: url.resolve(PT_INTEGRATION_HOST, "/apt_estimate_pt_2013/api_estimate_pt_2013"), @@ -458,7 +467,7 @@ async function _estimateIntegrationTaxProcessor(req1, res1) { json: true }) - log("Got response from PMIDC estimate API: " +estimate) + log("Got response from PMIDC estimate API: " + JSON.stringify(estimate)) return estimate; } @@ -696,7 +705,7 @@ async function _createAndUpdateZeroTaxProcessor(request, response) { async function _createAndUpdateIntegrationTaxProcessor(req, response){ - reqProperty = req["Assessment"]; + let reqProperty = req["Assessment"]; let propertyId = reqProperty["propertyId"] @@ -705,15 +714,14 @@ async function _createAndUpdateIntegrationTaxProcessor(req, response){ if (!(assessmentYear == PT_INTEGRATION_ASSESSMENTYEAR && PT_INTEGRATION_TENANTS.indexOf(tenantId) >= 0)) return response; - - let oldRequestbody = await getOldRequestBody(req) - oldRequestbody["CalculationCriteria"][0]["assessmentYear"] = oldRequestBody["CalculationCriteria"][0]["property"]["propertyDetails"][0]["financialYear"] + oldRequestbody["CalculationCriteria"][0]["assessmentYear"] = assessmentYear; + // assessmentYear field was there in old request body but not present in new request body Without this field we will get null pointer exception. - log("Got request for tenantid: "+tenantId+" and finanancial year: "+assessmentYear) - log("Assessment CREATE/ UPDATE Request body: "+reqProperty) + log("Got Assessment CREATE/ UPDATE request for tenantid: "+tenantId+" and finanancial year: "+assessmentYear) + log("Assessment CREATE/ UPDATE Request body: "+ JSON.stringify(reqProperty) ) let estimateResponse = await findEstimate(req) @@ -882,18 +890,18 @@ async function _createAndUpdateRequestHandler(req, res) { request, response } = getRequestResponse(req) - for (reqProperty of request["Assessment"]) { - let assessmentYear = reqProperty["financialYear"] - let tenantId = reqProperty["tenantId"] + log("Got Request for Assessment Create and Update") + + let assessmentYear = request["Assessment"]["financialYear"] + let tenantId = request["Assessment"]["tenantId"] if (assessmentYear == PT_ZERO_ASSESSMENTYEAR && PT_ZERO_TENANTS.indexOf(tenantId) >= 0){ response = await _createAndUpdateZeroTaxProcessor(request, response) }else if(assessmentYear == PT_INTEGRATION_ASSESSMENTYEAR && PT_INTEGRATION_TENANTS.indexOf(tenantId) >= 0){ response = await _createAndUpdateIntegrationTaxProcessor(request, response) } - index++; - } + // if (!PT_ENABLE_FC_CALC) if ("Errors" in response) res.status(400).json(response) From d7b216f5f1e63808cd029cb9d8b2aa46644015b6 Mon Sep 17 00:00:00 2001 From: Abhilashegov Date: Thu, 3 Sep 2020 12:24:30 +0530 Subject: [PATCH 0152/1242] corrected the path for retriving taxHeads --- rainmaker-custom-service/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rainmaker-custom-service/index.js b/rainmaker-custom-service/index.js index 790fdfe5..bb24594f 100644 --- a/rainmaker-custom-service/index.js +++ b/rainmaker-custom-service/index.js @@ -730,7 +730,7 @@ async function _createAndUpdateIntegrationTaxProcessor(req, response){ let consumerCode = propertyId let service = "PT" - let calc = estimateResponse["Calculation"] + let calc = estimateResponse["Calculation"][0] let taxHeads = calc["taxHeadEstimates"]; let createTaxHeadsArray = {}; for(taxHead of taxHeads){ From 1b4d88b5e5154854494d98429313373c06aa4b24 Mon Sep 17 00:00:00 2001 From: Abhilashegov Date: Thu, 3 Sep 2020 13:11:25 +0530 Subject: [PATCH 0153/1242] fixed error in getIntegrateYearDemand fun --- rainmaker-custom-service/index.js | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/rainmaker-custom-service/index.js b/rainmaker-custom-service/index.js index bb24594f..fd917f0d 100644 --- a/rainmaker-custom-service/index.js +++ b/rainmaker-custom-service/index.js @@ -71,15 +71,21 @@ function getUserID(data) { function getIntegrateYearDemand(demands){ for(demand of demands["Demands"]){ - demandYear = new Date(demand["taxPeriodFrom"]).getFullYear() - integrationYear = PT_INTEGRATION_ASSESSMENTYEAR.split("-")[0] - demandStatus = demand["status"] + let demandYear = new Date(demand["taxPeriodFrom"]).getFullYear(); + let integrationYear = PT_INTEGRATION_ASSESSMENTYEAR.split("-")[0]; + let demandStatus = demand["status"] + + log("getIntegrateYearDemand> Demand year: "+ demandYear+" Integrated Year: "+integrationYear+" Demand Status: "+status); + if((demandYear == integrationYear) && (demandStatus == "ACTIVE")){ - demands["Demands"] = demand + demands["Demands"] = [demand]; break; } } + + log("Response from getIntegrateYearDemand: "+ JSON.stringify(demands)); + return demands; } @@ -759,7 +765,7 @@ async function _createAndUpdateIntegrationTaxProcessor(req, response){ demandSearchResponse = getIntegrateYearDemand(demandSearchResponse) - log("Search Demand response For Integrated Year: " + demandSearchResponse) + log("Search Demand response For Integrated Year: " + JSON.stringify(demandSearchResponse)) if(isReceiptGenerated(demandSearchResponse)){ //Throw Error From 99e829562c2a2f86402031bbc02a98f829d25da6 Mon Sep 17 00:00:00 2001 From: Abhilashegov Date: Thu, 3 Sep 2020 13:17:57 +0530 Subject: [PATCH 0154/1242] fixed error in getIntegrateYearDemand fun for demand status --- rainmaker-custom-service/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rainmaker-custom-service/index.js b/rainmaker-custom-service/index.js index fd917f0d..deb7fac0 100644 --- a/rainmaker-custom-service/index.js +++ b/rainmaker-custom-service/index.js @@ -75,7 +75,7 @@ function getIntegrateYearDemand(demands){ let integrationYear = PT_INTEGRATION_ASSESSMENTYEAR.split("-")[0]; let demandStatus = demand["status"] - log("getIntegrateYearDemand> Demand year: "+ demandYear+" Integrated Year: "+integrationYear+" Demand Status: "+status); + log("getIntegrateYearDemand> Demand year: "+ demandYear+" Integrated Year: "+integrationYear+" Demand Status: "+demandStatus); if((demandYear == integrationYear) && (demandStatus == "ACTIVE")){ demands["Demands"] = [demand]; From df66cebb2777c004d81b151317ee31cc23d53ce4 Mon Sep 17 00:00:00 2001 From: Deependra-egov <47975393+Deependra-egov@users.noreply.github.com> Date: Thu, 3 Sep 2020 13:22:15 +0530 Subject: [PATCH 0155/1242] update tl reports yml --- configs/reports/configs/tl-reports.yml | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/configs/reports/configs/tl-reports.yml b/configs/reports/configs/tl-reports.yml index 11585473..5cebec1a 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -1219,6 +1219,7 @@ ReportDefinitions: - reportName: TradeLicenseRegistryReport_v2 + decryptionPathId: TradeLicenseRegistryReport_v2 summary: TL Receipt Register Report version: 1.0.0 moduleName: rainmaker-tl @@ -1376,6 +1377,7 @@ ReportDefinitions: - reportName: StateTradeLicenseCancelledRegistryReport_v2 + decryptionPathId: StateTradeLicenseCancelledRegistryReport_v2 summary: TL Cancelled Receipt Register Report version: 1.0.0 moduleName: rainmaker-tl @@ -1524,6 +1526,7 @@ ReportDefinitions: - reportName: TradeLicenseCancelledRegistryReport_v2 + decryptionPathId: TradeLicenseCancelledRegistryReport_v2 summary: TL Cancelled Receipt Register Report version: 1.0.0 moduleName: rainmaker-tl @@ -1666,6 +1669,7 @@ ReportDefinitions: - reportName: TradeWiseCollectionReport_v2 + decryptionPathId: TradeWiseCollectionReport_v2 summary: Collection according to tradeTypes version: 1.0.0 moduleName: rainmaker-tl @@ -1718,6 +1722,7 @@ ReportDefinitions: - reportName: TradeLicenseApplicationStatusReport_v2 + decryptionPathId: TradeLicenseApplicationStatusReport_v2 summary: Nummber of applications by there status version: 1.0.0 moduleName: rainmaker-tl @@ -1762,6 +1767,7 @@ ReportDefinitions: - reportName: TradeLicenseULBWiseApplicationStatusReport_v2 + decryptionPathId: TradeLicenseULBWiseApplicationStatusReport_v2 summary: Nummber of applications by there status version: 1.0.0 moduleName: rainmaker-tl @@ -1838,6 +1844,7 @@ ReportDefinitions: - reportName: StateLevelStatus_v2 + decryptionPathId: StateLevelStatus_v2 summary: Nummber of applications by there status state level version: 1.0.0 moduleName: rainmaker-tl @@ -1885,6 +1892,7 @@ ReportDefinitions: - reportName: ULBLevelStatus_v2 + decryptionPathId: ULBLevelStatus_v2 summary: Nummber of applications by there status ULB level version: 1.0.0 moduleName: rainmaker-tl @@ -1924,6 +1932,7 @@ ReportDefinitions: - reportName: StateLevelTradeWiseCollection_v2 + decryptionPathId: StateLevelTradeWiseCollection_v2 summary: Collection according to tradeTypes state level version: 1.0.0 moduleName: rainmaker-tl @@ -1989,6 +1998,7 @@ ReportDefinitions: - reportName: StateLevelTradeLicenseRegistryReport_v2 + decryptionPathId: StateLevelTradeLicenseRegistryReport_v2 summary: TL Basic Report State Level version: 1.0.0 moduleName: rainmaker-tl @@ -2100,6 +2110,7 @@ ReportDefinitions: - reportName: SearchTradeLicenseApplicationReport_v2 + decryptionPathId: SearchTradeLicenseApplicationReport_v2 summary: TL Search Application Report version: 1.0.0 moduleName: rainmaker-tl @@ -2183,7 +2194,8 @@ ReportDefinitions: WHERE tl.tenantid=$tenantid -- reportName: TradeLicenseDetailsReport_v2 +- reportName: TradeLicenseDetailsReport_v2 + decryptionPathId: TradeLicenseDetailsReport_v2 summary: Trade License Details Report version: 1.0.0 moduleName: rainmaker-tl @@ -2321,6 +2333,7 @@ ReportDefinitions: - reportName: StateDefaulterReport_v2 + decryptionPathId: StateDefaulterReport_v2 summary: TL Defautler version: 1.0.0 moduleName: rainmaker-tl @@ -2389,6 +2402,7 @@ ReportDefinitions: - reportName: ULBDefaulterReport_v2 + decryptionPathId: StateDefaulterReport_v2 summary: TL Defautler version: 1.0.0 moduleName: rainmaker-tl From 705fe24a831e2fb979541938328310477b80d231 Mon Sep 17 00:00:00 2001 From: Deependra-egov <47975393+Deependra-egov@users.noreply.github.com> Date: Thu, 3 Sep 2020 13:32:03 +0530 Subject: [PATCH 0156/1242] update pt yml --- configs/reports/configs/pt-reports.yml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 7ae90cd6..b1376b46 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2069,6 +2069,7 @@ ReportDefinitions: - reportName: ReceiptRegister_V2 + decryptionPathId: ReceiptRegister_V2 summary: Receipt Register version: 1.0.0 moduleName: rainmaker-pt @@ -2299,6 +2300,7 @@ ReportDefinitions: orderby: ORDER BY pd.receiptdate DESC - reportName: CancelledReceiptRegister_V2 + decryptionPathId: CancelledReceiptRegister_V2 summary: Receipt Register for cancelled Receipts version: 1.0.0 moduleName: rainmaker-pt @@ -2568,6 +2570,7 @@ ReportDefinitions: orderby: ORDER BY tenantid, totalamountpaid DESC NULLS LAST - reportName: StateCancelledReceiptRegister_V2 + decryptionPathId: StateCancelledReceiptRegister_V2 summary: Receipt Register for cancelled Receipts State version: 1.0.0 moduleName: rainmaker-pt @@ -2780,6 +2783,7 @@ ReportDefinitions: orderby: ORDER BY pd.receiptdate DESC - reportName: StateWidePtCollection_V2 + decryptionPathId: StateWidePtCollection_V2 summary: State Wide PT Collection version: 1.0.0 moduleName: rainmaker-pt @@ -2866,6 +2870,7 @@ ReportDefinitions: orderby: ORDER BY tenantid, totalamountpaid DESC NULLS LAST - reportName: UlbWisePtCollection_V2 + decryptionPathId: UlbWisePtCollection_V2 summary: State Wide PT Collection version: 1.0.0 moduleName: rainmaker-pt @@ -2954,6 +2959,7 @@ ReportDefinitions: orderby: ORDER BY pt_detail.tenantid, totalamountpaid DESC NULLS LAST - reportName: ReceiptRegisterShort_V2 + decryptionPathId: ReceiptRegisterShort_V2 summary: Receipt Register version: 1.0.0 moduleName: rainmaker-pt @@ -3123,6 +3129,7 @@ ReportDefinitions: - reportName: ULBPTDataDumpReport_V2 + decryptionPathId: ULBPTDataDumpReport_V2 summary: ULB level report version: 1.0.0 moduleName: rainmaker-pt @@ -3315,6 +3322,7 @@ ReportDefinitions: - reportName: Sewa_Kendra_ReceiptRegister_V2 + decryptionPathId: Sewa_Kendra_ReceiptRegister_V2 summary: Sewa Kendra Receipt Register version: 1.0.0 moduleName: rainmaker-pt @@ -3547,6 +3555,7 @@ ReportDefinitions: - reportName: ReceiptRegisterSummary_V2 + decryptionPathId: ReceiptRegisterSummary_V2 summary: Receipt Register Summary version: 1.0.0 moduleName: rainmaker-pt @@ -3679,6 +3688,7 @@ ReportDefinitions: groupby: group by collectorname,bd.tenantid - reportName: StateReceiptRegisterSummary_V2 + decryptionPathId: StateReceiptRegisterSummary_V2 summary: Receipt Register Summary version: 1.0.0 moduleName: rainmaker-pt @@ -3788,6 +3798,7 @@ ReportDefinitions: - reportName: FYCollectionsReport_V2 + decryptionPathId: FYCollectionsReport_V2 summary: FY Collections version: 1.0.0 moduleName: rainmaker-pt @@ -3904,6 +3915,7 @@ ReportDefinitions: - reportName: ULBDEFAULTERPTREPORT_V2 + decryptionPathId: ULBDEFAULTERPTREPORT_V2 summary: ULB Defaulter Pt report version: 1.0.0 moduleName: rainmaker-pt @@ -4008,4 +4020,3 @@ ReportDefinitions: inner join eg_pt_address_v2 as pta on pta.property = pt.propertyid left outer join eg_pt_unit_v2_ot as pot on pot.propertydetail = pd.assessmentnumber where payd.tenantid = $tenantid and pd.property not in (select property from eg_pt_propertydetail_v2 where financialyear in ('2019-20')) - From c0da5182a4607217ff9ff8af468d21a5d0f5da09 Mon Sep 17 00:00:00 2001 From: Deependra-egov <47975393+Deependra-egov@users.noreply.github.com> Date: Thu, 3 Sep 2020 14:17:44 +0530 Subject: [PATCH 0157/1242] Update pgr-reports.yml --- configs/reports/configs/pgr-reports.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/configs/reports/configs/pgr-reports.yml b/configs/reports/configs/pgr-reports.yml index e3b5159f..36943931 100644 --- a/configs/reports/configs/pgr-reports.yml +++ b/configs/reports/configs/pgr-reports.yml @@ -910,6 +910,7 @@ ReportDefinitions: - reportName: SourceWiseReport_v2 + decryptionPathId: SourceWiseReport_v2 summary: Fetches reports based on the source of reception of the complaint version: 1.0.0 moduleName: rainmaker-pgr @@ -946,6 +947,7 @@ ReportDefinitions: query: SELECT sum(case when source = 'mobileapp' then 1 else 0 end) as citizen_mobile_app, sum(case when source = 'web' then 1 else 0 end) as citizen_web_app, sum(case when source = 'ivr' then 1 else 0 end) as counter_desktop FROM eg_pgr_service WHERE tenantid = $tenantid - reportName: DescriptionReport_v2 + decryptionPathId: DescriptionReport_v2 summary: Fetches department wise reports based description of the complaint version: 1.0.0 moduleName: rainmaker-pgr @@ -1075,6 +1077,7 @@ ReportDefinitions: orderby: ORDER BY servicerequestid, epa."when" desc - reportName: StateSourceReport_v2 + decryptionPathId: StateSourceReport_v2 summary: Source of complaints across tenants version: 1.0.0 moduleName: rainmaker-pgr @@ -1135,6 +1138,7 @@ ReportDefinitions: orderby: ORDER BY tenantid - reportName: EmployeeReport_v2 + decryptionPathId: EmployeeReport_v2 summary: Fetches complaints for employees version: 1.0.0 moduleName: rainmaker-pgr @@ -1241,6 +1245,7 @@ ReportDefinitions: orderby: ORDER BY eg_pgr_service.createdtime asc - reportName: StateULBReport_v2 + decryptionPathId: StateULBReport_v2 summary: Fetches complaints stats for all ULBs in state version: 1.0.0 moduleName: rainmaker-pgr @@ -1307,6 +1312,7 @@ ReportDefinitions: orderby: ORDER BY tenantid - reportName: ComplaintTypesReport_v2 + decryptionPathId: ComplaintTypesReport_v2 summary: Fetches complaint stats based on complaint types for a ULB version: 1.0.0 moduleName: rainmaker-pgr @@ -1388,6 +1394,7 @@ ReportDefinitions: orderby: ORDER BY tenantid,servicecode - reportName: DepartmentReport_v2 + decryptionPathId: DepartmentReport_v2 summary: Fetches complaint stats based on complaint types for a ULB version: 1.0.0 moduleName: rainmaker-pgr @@ -1475,6 +1482,7 @@ ReportDefinitions: orderby: ORDER BY tenantid,deptmap_def.name - reportName: ULBDepartmentReport_v2 + decryptionPathId: ULBDepartmentReport_v2 summary: Fetches complaint stats based on department types for a ULB version: 1.0.0 moduleName: rainmaker-pgr @@ -1565,6 +1573,7 @@ ReportDefinitions: orderby: ORDER BY deptmap_def.name - reportName: ULBEmployeeWiseReport_v2 + decryptionPathId: ULBEmployeeWiseReport_v2 summary: Fetches employee wise assignment report version: 1.0.0 moduleName: rainmaker-pgr @@ -1649,6 +1658,7 @@ ReportDefinitions: - reportName: UlbPgrSlaReport_v2 + decryptionPathId: UlbPgrSlaReport_v2 summary: Fetches employee sla version: 1.0.0 moduleName: rainmaker-pgr @@ -1724,6 +1734,7 @@ ReportDefinitions: orderby: ORDER BY tenantid,eg_pgr_service.servicecode - reportName: FeedbackReport_v2 + decryptionPathId: FeedbackReport_v2 summary: Fetches complaint state based on Feedback version: 1.0.0 moduleName: rainmaker-pgr From a852893a7431ae4e981c4d82b2c26d6aadb9fd01 Mon Sep 17 00:00:00 2001 From: Deependra-egov <47975393+Deependra-egov@users.noreply.github.com> Date: Thu, 3 Sep 2020 14:35:22 +0530 Subject: [PATCH 0158/1242] Update rainmaker-noc-reports.yml --- configs/reports/configs/rainmaker-noc-reports.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/configs/reports/configs/rainmaker-noc-reports.yml b/configs/reports/configs/rainmaker-noc-reports.yml index 92cc46f0..22023846 100644 --- a/configs/reports/configs/rainmaker-noc-reports.yml +++ b/configs/reports/configs/rainmaker-noc-reports.yml @@ -150,6 +150,7 @@ - reportName: CollectionReport_V2 + decryptionPathId: CollectionReport_V2 summary: Collection Report version: 1.0.0 moduleName: rainmaker-noc @@ -228,6 +229,7 @@ orderby: ORDER BY localisedmessage - reportName: ApplicationStatusReport_V2 + decryptionPathId: ApplicationStatusReport_V2 summary: Application Status Report version: 1.0.0 moduleName: rainmaker-noc @@ -268,6 +270,7 @@ orderby: ORDER BY application_status - reportName: ChannelsReport_V2 + decryptionPathId: ChannelsReport_V2 summary: Channels Report version: 1.0.0 moduleName: rainmaker-noc @@ -313,6 +316,7 @@ orderby: ORDER BY channel - reportName: UrbanApplicationStatusReport_V2 + decryptionPathId: UrbanApplicationStatusReport_V2 summary: Urban Application Status Report version: 1.0.0 moduleName: rainmaker-noc @@ -359,6 +363,7 @@ - reportName: UrbanChannelsReport_V2 + decryptionPathId: UrbanChannelsReport_V2 summary: Urban Channels Report version: 1.0.0 moduleName: rainmaker-noc @@ -411,6 +416,7 @@ - reportName: DrillDownRuralSubdistrictCollectionReport_V2 + decryptionPathId: DrillDownRuralSubdistrictCollectionReport_V2 summary: Rural Subdistrict Collection Report version: 1.0.0 moduleName: rainmaker-noc @@ -487,6 +493,7 @@ orderby: ORDER BY localisedmessage - reportName: RuralDistrictWiseCollectionReport_V2 + decryptionPathId: RuralDistrictWiseCollectionReport_V2 summary: Rural District Wise Collection Report version: 1.0.0 moduleName: rainmaker-noc @@ -561,6 +568,7 @@ orderby: ORDER BY localisedmessage - reportName: RuralDistrictWiseApplicationStatusReport_V2 + decryptionPathId: RuralDistrictWiseApplicationStatusReport_V2 summary: Rural District Wise Application Status Report version: 1.0.0 moduleName: rainmaker-noc @@ -611,6 +619,7 @@ orderby: ORDER BY application_status - reportName: DrillDownRuralWiseApplicationStatusReport_V2 + decryptionPathId: DrillDownRuralWiseApplicationStatusReport_V2 summary: Rural Wise Application Status Report version: 1.0.0 moduleName: rainmaker-noc @@ -719,6 +728,7 @@ orderby: ORDER BY channel - reportName: DrillDownRuralWiseChannelReport_V2 + decryptionPathId: DrillDownRuralWiseChannelReport_V2 summary: Rural Wise Channel Report version: 1.0.0 moduleName: rainmaker-noc @@ -774,4 +784,4 @@ query: select channel,fad.subdistrict as subdistrict,(select COALESCE((select message from message where code=concat('FIRENOC_FIRESTATIONS_',UPPER(REGEXP_REPLACE(firestationid,'\..*',''))) limit 1), firestationid)) as firestation, count (*) number_of_applications,round((count (*)::decimal/(select count(*) from eg_fn_firenoc fnoc inner join eg_fn_firenocdetail fdet on fdet.firenocuuid=fnoc.uuid))*100,2) percentage from eg_fn_firenoc fnoc inner join eg_fn_firenocdetail fdet on fdet.firenocuuid=fnoc.uuid inner join eg_fn_address as fad on fad.firenocdetailsuuid=fdet.uuid groupby: GROUP BY (channel,subdistrict,firestation) - orderby: ORDER BY channel \ No newline at end of file + orderby: ORDER BY channel From 8d44ade1df102a587738cd3342255ebfe997c2ca Mon Sep 17 00:00:00 2001 From: Deependra-egov <47975393+Deependra-egov@users.noreply.github.com> Date: Thu, 3 Sep 2020 17:36:42 +0530 Subject: [PATCH 0159/1242] Update tl-reports.yml --- configs/reports/configs/tl-reports.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/reports/configs/tl-reports.yml b/configs/reports/configs/tl-reports.yml index 5cebec1a..3c722be3 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -1219,7 +1219,6 @@ ReportDefinitions: - reportName: TradeLicenseRegistryReport_v2 - decryptionPathId: TradeLicenseRegistryReport_v2 summary: TL Receipt Register Report version: 1.0.0 moduleName: rainmaker-tl From a23518e6c3712fe1ea7c3e51abd5ad7fc9ef6b61 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Thu, 3 Sep 2020 20:36:47 +0530 Subject: [PATCH 0160/1242] Update consolidatedreceipt.json --- configs/pdf-service/data-config/consolidatedreceipt.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/configs/pdf-service/data-config/consolidatedreceipt.json b/configs/pdf-service/data-config/consolidatedreceipt.json index 1b747720..63bb701f 100644 --- a/configs/pdf-service/data-config/consolidatedreceipt.json +++ b/configs/pdf-service/data-config/consolidatedreceipt.json @@ -72,12 +72,20 @@ "path": "$.paymentDetails[0].totalAmountPaid" } }, + { "variable": "fromPeriod", "value": { "path": "$.paymentDetails[0].bill.billDetails[0].fromPeriod" }, "type": "date" + }, + { + "variable": "chequeDDDate", + "value": { + "path": "$.instrumentDate" + }, + "type":"date" }, { "variable": "toPeriod", From 8ce812fc4fee4f9caa293f18ddd1e7428176eba1 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Thu, 3 Sep 2020 21:12:52 +0530 Subject: [PATCH 0161/1242] Update consolidatedreceipt.json --- .../format-config/consolidatedreceipt.json | 229 +++++++++--------- 1 file changed, 119 insertions(+), 110 deletions(-) diff --git a/configs/pdf-service/format-config/consolidatedreceipt.json b/configs/pdf-service/format-config/consolidatedreceipt.json index 35a3126c..8392f2ce 100644 --- a/configs/pdf-service/format-config/consolidatedreceipt.json +++ b/configs/pdf-service/format-config/consolidatedreceipt.json @@ -163,8 +163,9 @@ } ], [ + { - "text": "{{payment_date}}", + "text": "Consumer Name", "border": [ true, false, @@ -174,7 +175,7 @@ "style": "receipt-table-value" }, { - "text": "{{paymentDate}}", + "text": "{{payerName}}", "border": [ false, false, @@ -184,7 +185,7 @@ "style": "receipt-table" }, { - "text": "Consumer Name", + "text": "{{payer_contact}}", "border": [ false, false, @@ -194,7 +195,7 @@ "style": "receipt-table-value" }, { - "text": "{{payerName}}", + "text": "{{payerContact}}", "border": [ false, false, @@ -205,8 +206,9 @@ } ], [ + { - "text": "{{payer_contact}}", + "text": "Paid By: ", "border": [ true, false, @@ -216,7 +218,7 @@ "style": "receipt-table-value" }, { - "text": "{{payerContact}}", + "text": "{{PaidBy}}", "border": [ false, false, @@ -225,32 +227,10 @@ ], "style": "receipt-table" }, - { - "text": "Paid By: ", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{PaidBy}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - } - ], - [ { "text": "Address: ", "border": [ - true, + false, false, false, false @@ -259,26 +239,6 @@ }, { "text": "{{payerAddress}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text" : " ", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text" : " ", "border": [ false, false, @@ -288,7 +248,7 @@ "style": "receipt-table" } ] - ] + ] }, "layout": {} }, @@ -412,7 +372,7 @@ "style": "receipt-table" }, { - "text": "Transaction No.", + "text": "Cheque/DD Date", "border": [ false, false, @@ -422,7 +382,7 @@ "style": "receipt-table-value" }, { - "text": "{{transactionID}}", + "text": "{{chequeDDDate}}", "border": [ false, false, @@ -440,7 +400,7 @@ true, false, false, - true + false ], "style": "receipt-table-value" }, @@ -450,7 +410,7 @@ false, false, false, - true + false ], "style": "receipt-table" }, @@ -460,12 +420,55 @@ false, false, false, - true + false ], "style": "receipt-table-value" }, { "text": "{{G8ReceiptDate}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "Transaction No.", + "border": [ + true, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{transactionID}}", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table" + + }, + { + "text": " ", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": " ", "border": [ false, false, @@ -473,8 +476,10 @@ true ], "style": "receipt-table" + } ] + ] }, "layout": {} @@ -722,8 +727,9 @@ } ], [ + { - "text": "{{payment_date}}", + "text": "Consumer Name", "border": [ true, false, @@ -733,7 +739,7 @@ "style": "receipt-table-value" }, { - "text": "{{paymentDate}}", + "text": "{{payerName}}", "border": [ false, false, @@ -743,7 +749,7 @@ "style": "receipt-table" }, { - "text": "Consumer Name", + "text": "{{payer_contact}}", "border": [ false, false, @@ -753,7 +759,7 @@ "style": "receipt-table-value" }, { - "text": "{{payerName}}", + "text": "{{payerContact}}", "border": [ false, false, @@ -764,51 +770,9 @@ } ], [ - { - "text": "{{payer_contact}}", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{payerContact}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, { "text": "Paid By: ", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{PaidBy}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": "Address: ", "border": [ true, false, @@ -818,7 +782,7 @@ "style": "receipt-table-value" }, { - "text": "{{payerAddress}}", + "text": "{{PaidBy}}", "border": [ false, false, @@ -828,17 +792,17 @@ "style": "receipt-table" }, { - "text" : " ", + "text": "Address: ", "border": [ false, false, false, false ], - "style": "receipt-table" + "style": "receipt-table-value" }, { - "text" : " ", + "text": "{{payerAddress}}", "border": [ false, false, @@ -848,6 +812,7 @@ "style": "receipt-table" } ] + ] }, "layout": {} @@ -972,7 +937,7 @@ "style": "receipt-table" }, { - "text": "Transaction No.", + "text": "Cheque/DD Date", "border": [ false, false, @@ -982,7 +947,7 @@ "style": "receipt-table-value" }, { - "text": "{{transactionID}}", + "text": "{{chequeDDDate}}", "border": [ false, false, @@ -1000,7 +965,7 @@ true, false, false, - true + false ], "style": "receipt-table-value" }, @@ -1010,7 +975,7 @@ false, false, false, - true + false ], "style": "receipt-table" }, @@ -1020,12 +985,55 @@ false, false, false, - true + false ], "style": "receipt-table-value" }, { "text": "{{G8ReceiptDate}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "Transaction No.", + "border": [ + true, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{transactionID}}", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table" + + }, + { + "text": " ", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": " ", "border": [ false, false, @@ -1033,6 +1041,7 @@ true ], "style": "receipt-table" + } ] ] From 13055440e86fcbe397d7b6d768f8f3925fad2bd5 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Thu, 3 Sep 2020 21:17:47 +0530 Subject: [PATCH 0162/1242] Update consolidatedreceipt.json --- .../format-config/consolidatedreceipt.json | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/configs/pdf-service/format-config/consolidatedreceipt.json b/configs/pdf-service/format-config/consolidatedreceipt.json index 8392f2ce..8918f8ac 100644 --- a/configs/pdf-service/format-config/consolidatedreceipt.json +++ b/configs/pdf-service/format-config/consolidatedreceipt.json @@ -72,10 +72,10 @@ "style": "noc-table", "table": { "widths": [ - "25%", - "25%", - "25%", - "25%" + "30%", + "20%", + "30%", + "20%" ], "body": [ [ @@ -256,10 +256,10 @@ "style": "next-noc-table", "table": { "widths": [ - "25%", - "25%", - "25%", - "25%" + "30%", + "20%", + "30%", + "20%" ], "body": [ [ @@ -352,7 +352,7 @@ ], [ { - "text": "Cheque/DD No.", + "text": "Cheque/DD/RTGS/NEFT No.", "border": [ true, false, @@ -372,7 +372,7 @@ "style": "receipt-table" }, { - "text": "Cheque/DD Date", + "text": "Cheque/DD/RTGS/NEFT Date", "border": [ false, false, @@ -636,10 +636,10 @@ "style": "noc-table", "table": { "widths": [ - "25%", - "25%", - "25%", - "25%" + "30%", + "20%", + "30%", + "20%" ], "body": [ [ @@ -821,10 +821,10 @@ "style": "next-noc-table", "table": { "widths": [ - "25%", - "25%", - "25%", - "25%" + "30%", + "20%", + "30%", + "20%" ], "body": [ [ @@ -917,7 +917,7 @@ ], [ { - "text": "Cheque/DD No.", + "text": "Cheque/DD/RTGS/NEFT No.", "border": [ true, false, @@ -937,7 +937,7 @@ "style": "receipt-table" }, { - "text": "Cheque/DD Date", + "text": "Cheque/DD/RTGS/NEFT Date", "border": [ false, false, From c6f6c0223c094c198c93204c6a322ba80db83dde Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Thu, 3 Sep 2020 22:06:32 +0530 Subject: [PATCH 0163/1242] Update consolidatedreceipt.json --- configs/pdf-service/data-config/consolidatedreceipt.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/configs/pdf-service/data-config/consolidatedreceipt.json b/configs/pdf-service/data-config/consolidatedreceipt.json index 63bb701f..f481dc6a 100644 --- a/configs/pdf-service/data-config/consolidatedreceipt.json +++ b/configs/pdf-service/data-config/consolidatedreceipt.json @@ -97,7 +97,13 @@ { "variable": "payerAddress", "value": { - "path": "$.paymentDetails[0].bill.payerAddress" + "path": "$.paymentDetails[0].bill.billDetails[0].additionalDetails.address" + } + }, + { + "variable": "comments", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].additionalDetails.comment" } }, { From f4328d2e93b3a085af7cdb083d4e0644455d70d6 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Thu, 3 Sep 2020 22:15:26 +0530 Subject: [PATCH 0164/1242] Update consolidatedreceipt.json --- .../format-config/consolidatedreceipt.json | 97 +------------------ 1 file changed, 4 insertions(+), 93 deletions(-) diff --git a/configs/pdf-service/format-config/consolidatedreceipt.json b/configs/pdf-service/format-config/consolidatedreceipt.json index 8918f8ac..66a37eb8 100644 --- a/configs/pdf-service/format-config/consolidatedreceipt.json +++ b/configs/pdf-service/format-config/consolidatedreceipt.json @@ -434,52 +434,7 @@ ], "style": "receipt-table" } - ], - [ - { - "text": "Transaction No.", - "border": [ - true, - false, - false, - true - ], - "style": "receipt-table-value" - }, - { - "text": "{{transactionID}}", - "border": [ - false, - false, - false, - true - ], - "style": "receipt-table" - - }, - { - "text": " ", - "border": [ - false, - false, - false, - true - ], - "style": "receipt-table-value" - }, - { - "text": " ", - "border": [ - false, - false, - true, - true - ], - "style": "receipt-table" - - } ] - ] }, "layout": {} @@ -488,7 +443,7 @@ "style": "next-noc-table", "table": { "widths": [ - "*", + "10%", "*" ], "body": [ @@ -498,7 +453,7 @@ "border":[false, false, false, false] }, { - "text":" ", + "text":"{{comments}}", "border":[false, false, false, false] } ] @@ -999,50 +954,6 @@ ], "style": "receipt-table" } - ], - [ - { - "text": "Transaction No.", - "border": [ - true, - false, - false, - true - ], - "style": "receipt-table-value" - }, - { - "text": "{{transactionID}}", - "border": [ - false, - false, - false, - true - ], - "style": "receipt-table" - - }, - { - "text": " ", - "border": [ - false, - false, - false, - true - ], - "style": "receipt-table-value" - }, - { - "text": " ", - "border": [ - false, - false, - true, - true - ], - "style": "receipt-table" - - } ] ] }, @@ -1052,7 +963,7 @@ "style": "next-noc-table", "table": { "widths": [ - "*", + "10%", "*" ], "body": [ @@ -1062,7 +973,7 @@ "border":[false, false, false, false] }, { - "text":" ", + "text":"{{comments}}", "border":[false, false, false, false] } ] From 4fcf959926ab9d42cb188dfae688b5415d8f1f68 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Thu, 3 Sep 2020 22:24:11 +0530 Subject: [PATCH 0165/1242] Update consolidatedreceipt.json --- .../format-config/consolidatedreceipt.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/configs/pdf-service/format-config/consolidatedreceipt.json b/configs/pdf-service/format-config/consolidatedreceipt.json index 66a37eb8..cf3f594f 100644 --- a/configs/pdf-service/format-config/consolidatedreceipt.json +++ b/configs/pdf-service/format-config/consolidatedreceipt.json @@ -400,7 +400,7 @@ true, false, false, - false + true ], "style": "receipt-table-value" }, @@ -410,7 +410,7 @@ false, false, false, - false + true ], "style": "receipt-table" }, @@ -420,7 +420,7 @@ false, false, false, - false + true ], "style": "receipt-table-value" }, @@ -430,7 +430,7 @@ false, false, true, - false + true ], "style": "receipt-table" } @@ -920,7 +920,7 @@ true, false, false, - false + true ], "style": "receipt-table-value" }, @@ -930,7 +930,7 @@ false, false, false, - false + true ], "style": "receipt-table" }, @@ -940,7 +940,7 @@ false, false, false, - false + true ], "style": "receipt-table-value" }, @@ -950,7 +950,7 @@ false, false, true, - false + true ], "style": "receipt-table" } From 6c183160a3b3748a0fcd37c62db7ddc91244ed2e Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 3 Sep 2020 23:26:51 +0530 Subject: [PATCH 0166/1242] Update rainmaker-noc-reports.yml --- .../reports/configs/rainmaker-noc-reports.yml | 45 +++++++++++++------ 1 file changed, 31 insertions(+), 14 deletions(-) diff --git a/configs/reports/configs/rainmaker-noc-reports.yml b/configs/reports/configs/rainmaker-noc-reports.yml index 22023846..6f0adc03 100644 --- a/configs/reports/configs/rainmaker-noc-reports.yml +++ b/configs/reports/configs/rainmaker-noc-reports.yml @@ -149,7 +149,7 @@ orderby: ORDER BY channel - - reportName: CollectionReport_V2 + - reportName: CollectionReport_V2 decryptionPathId: CollectionReport_V2 summary: Collection Report version: 1.0.0 @@ -210,11 +210,13 @@ wrapper: true isMandatory: false searchClause: AND fnoc.tenantId IN ($ulb) - query: Select COALESCE(message,usagetype) localisedmessage, - COUNT(*) as transactionNumber, - (select COALESCE((select message from message where code=concat('FIRENOC_FIRESTATIONS_',UPPER(REGEXP_REPLACE(firestationid,'\..*',''))) limit 1), firestationid)) as firestation, - SUM (CASE WHEN egcl_payment.paymentmode='CASH' THEN egcl_payment.totalamountpaid ELSE 0 END) as fees_counter, - SUM (CASE WHEN egcl_payment.paymentmode='ONLINE' THEN egcl_payment.totalamountpaid ELSE 0 END) AS fees_online + query: + Select + COALESCE(message,usagetype) localisedmessage, + COUNT(*) as transactionNumber, + --(select COALESCE((select message from message where code=concat('FIRENOC_FIRESTATIONS_',UPPER(REGEXP_REPLACE(firestationid,'\..*',''))) limit 1), firestationid)) as firestation, + SUM (CASE WHEN egcl_payment.paymentmode='CASH' THEN egcl_payment.totalamountpaid ELSE 0 END) as fees_counter, + SUM (CASE WHEN egcl_payment.paymentmode='ONLINE' THEN egcl_payment.totalamountpaid ELSE 0 END) AS fees_online from eg_fn_firenoc AS fnoc INNER JOIN eg_fn_firenocdetail fdet on fdet.firenocuuid=fnoc.uuid INNER JOIN egcl_bill as bill on bill.consumercode=fdet.applicationnumber @@ -224,11 +226,10 @@ INNER JOIN egcl_payment on egcl_payment.id=egcl_paymentdetail.paymentid LEFT OUTER JOIN message on code=concat('FIRENOC_BUILDINGTYPE_',UPPER(REGEXP_REPLACE(usagetype,'\..*',''))) INNER JOIN eg_fn_address as fad on fad.firenocdetailsuuid=fdet.uuid and module='rainmaker-noc' where 1=1 - - groupby: GROUP BY (localisedmessage,firestation) + groupby: GROUP BY (localisedmessage) orderby: ORDER BY localisedmessage -- reportName: ApplicationStatusReport_V2 + - reportName: ApplicationStatusReport_V2 decryptionPathId: ApplicationStatusReport_V2 summary: Application Status Report version: 1.0.0 @@ -265,7 +266,16 @@ wrapper: true isMandatory: false searchClause: AND fnoc.tenantId IN ($ulb) - query: select COALESCE(message,state) application_status,count(*) number_of_application from eg_fn_firenoc fnoc inner join eg_fn_firenocdetail fdet on fdet.firenocuuid=fnoc.uuid inner join (SELECT DISTINCT ON (businessid) * FROM eg_wf_processinstance_v2 ORDER BY businessid,createdtime desc) pinstance on pinstance.businessid=fdet.applicationnumber inner join eg_wf_state_v2 wfstate on pinstance.status=wfstate.uuid left outer join message on code=concat('WF_FIRENOC_',UPPER(state)) and module='rainmaker-noc' where 1=1 + query: + select + COALESCE(message,state) application_status, + count(*) number_of_application + from eg_fn_firenoc fnoc + inner join eg_fn_firenocdetail fdet on fdet.firenocuuid=fnoc.uuid + inner join (SELECT DISTINCT ON (businessid) * FROM eg_wf_processinstance_v2 ORDER BY businessid,createdtime desc) pinstance on pinstance.businessid=fdet.applicationnumber + inner join eg_wf_state_v2 wfstate on pinstance.status=wfstate.uuid + left outer join message on code=concat('WF_FIRENOC_',UPPER(state)) and module='rainmaker-noc' + where 1=1 groupby: GROUP BY application_status orderby: ORDER BY application_status @@ -315,7 +325,7 @@ groupby: GROUP BY channel orderby: ORDER BY channel - - reportName: UrbanApplicationStatusReport_V2 + - reportName: UrbanApplicationStatusReport_V2 decryptionPathId: UrbanApplicationStatusReport_V2 summary: Urban Application Status Report version: 1.0.0 @@ -362,7 +372,7 @@ orderby: ORDER BY application_status - - reportName: UrbanChannelsReport_V2 + - reportName: UrbanChannelsReport_V2 decryptionPathId: UrbanChannelsReport_V2 summary: Urban Channels Report version: 1.0.0 @@ -409,8 +419,15 @@ wrapper: true isMandatory: false searchClause: AND fad.subdistrict IN ($city) - query: select channel,(select COALESCE((select message from message where code=concat('FIRENOC_FIRESTATIONS_',UPPER(REGEXP_REPLACE(firestationid,'\..*',''))) limit 1), firestationid)) as firestation, count (*) number_of_applications,round((count (*)::decimal/(select count(*) from eg_fn_firenoc fnoc inner join eg_fn_firenocdetail fdet on fdet.firenocuuid=fnoc.uuid))*100,2) percentage from eg_fn_firenoc fnoc inner join eg_fn_firenocdetail fdet on fdet.firenocuuid=fnoc.uuid - inner join eg_fn_address as fad on fad.firenocdetailsuuid=fdet.uuid + query: + select + channel, + (select COALESCE((select message from message where code=concat('FIRENOC_FIRESTATIONS_',UPPER(REGEXP_REPLACE(firestationid,'\..*',''))) limit 1), firestationid)) as firestation, + count (*) number_of_applications, + round((count (*)::decimal/(select count(*) from eg_fn_firenoc fnoc + inner join eg_fn_firenocdetail fdet on fdet.firenocuuid=fnoc.uuid))*100,2) percentage from eg_fn_firenoc fnoc + inner join eg_fn_firenocdetail fdet on fdet.firenocuuid=fnoc.uuid + inner join eg_fn_address as fad on fad.firenocdetailsuuid=fdet.uuid groupby: GROUP BY (channel,firestation) orderby: ORDER BY channel From 433fa2e8d4b89856214abc23b5f931bf0867945d Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 3 Sep 2020 23:58:09 +0530 Subject: [PATCH 0167/1242] Update rainmaker-noc-reports.yml --- configs/reports/configs/rainmaker-noc-reports.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configs/reports/configs/rainmaker-noc-reports.yml b/configs/reports/configs/rainmaker-noc-reports.yml index 6f0adc03..8cf860fd 100644 --- a/configs/reports/configs/rainmaker-noc-reports.yml +++ b/configs/reports/configs/rainmaker-noc-reports.yml @@ -1,4 +1,5 @@ - ReportDefinitions: +--- +ReportDefinitions: - reportName: CollectionReport summary: Collection Report version: 1.0.0 From ae8a281aeffde049dfb58c5d9de265d0612b145f Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 4 Sep 2020 00:43:22 +0530 Subject: [PATCH 0168/1242] Update rainmaker-noc-reports.yml --- .../reports/configs/rainmaker-noc-reports.yml | 60 +++++++++---------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/configs/reports/configs/rainmaker-noc-reports.yml b/configs/reports/configs/rainmaker-noc-reports.yml index 8cf860fd..e924dab8 100644 --- a/configs/reports/configs/rainmaker-noc-reports.yml +++ b/configs/reports/configs/rainmaker-noc-reports.yml @@ -1,6 +1,6 @@ --- ReportDefinitions: - - reportName: CollectionReport + - reportName: UrbanCollectionReport summary: Collection Report version: 1.0.0 moduleName: rainmaker-noc @@ -12,17 +12,17 @@ ReportDefinitions: total: false - name: transactionNumber label: reports.noc.collectionreport.transactionNumber - type: number + type: string source: rainmaker-noc total: true - name: fees_counter label: reports.noc.collectionreport.fees_counter - type: number + type: string source: rainmaker-noc total: true - name: fees_online label: reports.noc.collectionreport.fees_online - type: number + type: string source: rainmaker-noc total: true searchParams: @@ -64,7 +64,7 @@ ReportDefinitions: groupby: GROUP BY localisedmessage orderby: ORDER BY localisedmessage - - reportName: ApplicationStatusReport + - reportName: UrbanApplicationStatusReport summary: Application Status Report version: 1.0.0 moduleName: rainmaker-noc @@ -76,7 +76,7 @@ ReportDefinitions: total: false - name: number_of_application label: reports.noc.applicationstatusreport.noofapplications - type: number + type: string source: rainmaker-noc total: true searchParams: @@ -104,7 +104,7 @@ ReportDefinitions: groupby: GROUP BY application_status orderby: ORDER BY application_status - - reportName: ChannelsReport + - reportName: UrbanChannelsReport summary: Channels Report version: 1.0.0 moduleName: rainmaker-noc @@ -116,12 +116,12 @@ ReportDefinitions: total: false - name: number_of_applications label: reports.noc.channelsreport.applicationNo - type: number + type: string source: rainmaker-noc total: true - name: percentage label: reports.noc.channelsreport.percentage - type: number + type: string source: rainmaker-noc total: false searchParams: @@ -163,17 +163,17 @@ ReportDefinitions: total: false - name: transactionNumber label: reports.noc.collectionreport.transactionNumber - type: number + type: string source: rainmaker-noc total: true - name: fees_counter label: reports.noc.collectionreport.fees_counter - type: number + type: string source: rainmaker-noc total: true - name: fees_online label: reports.noc.collectionreport.fees_online - type: number + type: string source: rainmaker-noc total: true searchParams: @@ -243,7 +243,7 @@ ReportDefinitions: total: false - name: number_of_application label: reports.noc.applicationstatusreport.noofapplications - type: number + type: string source: rainmaker-noc total: true searchParams: @@ -293,12 +293,12 @@ ReportDefinitions: total: false - name: number_of_applications label: reports.noc.channelsreport.applicationNo - type: number + type: string source: rainmaker-noc total: true - name: percentage label: reports.noc.channelsreport.percentage - type: number + type: string source: rainmaker-noc total: false searchParams: @@ -339,7 +339,7 @@ ReportDefinitions: total: false - name: number_of_application label: reports.noc.applicationstatusreport.noofapplications - type: number + type: string source: rainmaker-noc total: true - name: firestation @@ -386,12 +386,12 @@ ReportDefinitions: total: false - name: number_of_applications label: reports.noc.channelsreport.applicationNo - type: number + type: string source: rainmaker-noc total: true - name: percentage label: reports.noc.channelsreport.percentage - type: number + type: string source: rainmaker-noc total: false - name: firestation @@ -451,17 +451,17 @@ ReportDefinitions: total: false - name: transactionNumber label: reports.noc.collectionreport.transactionNumber - type: number + type: string source: rainmaker-noc total: true - name: fees_counter label: reports.noc.collectionreport.fees_counter - type: number + type: string source: rainmaker-noc total: true - name: fees_online label: reports.noc.collectionreport.fees_online - type: number + type: string source: rainmaker-noc total: true searchParams: @@ -533,17 +533,17 @@ ReportDefinitions: total: false - name: transactionNumber label: reports.noc.collectionreport.transactionNumber - type: number + type: string source: rainmaker-noc total: true - name: fees_counter label: reports.noc.collectionreport.fees_counter - type: number + type: string source: rainmaker-noc total: true - name: fees_online label: reports.noc.collectionreport.fees_online - type: number + type: string source: rainmaker-noc total: true searchParams: @@ -608,7 +608,7 @@ ReportDefinitions: total: false - name: number_of_application label: reports.noc.applicationstatusreport.noofapplications - type: number + type: string source: rainmaker-noc total: true searchParams: @@ -654,7 +654,7 @@ ReportDefinitions: total: false - name: number_of_application label: reports.noc.applicationstatusreport.noofapplications - type: number + type: string source: rainmaker-noc total: true searchParams: @@ -711,12 +711,12 @@ ReportDefinitions: total: false - name: number_of_applications label: reports.noc.channelsreport.applicationNo - type: number + type: string source: rainmaker-noc total: true - name: percentage label: reports.noc.channelsreport.percentage - type: number + type: string source: rainmaker-noc total: false searchParams: @@ -763,12 +763,12 @@ ReportDefinitions: total: false - name: number_of_applications label: reports.noc.channelsreport.applicationNo - type: number + type: string source: rainmaker-noc total: true - name: percentage label: reports.noc.channelsreport.percentage - type: number + type: string source: rainmaker-noc total: false searchParams: From 706dbff5eeaf4a6367798be0cdc04362d6602b92 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 4 Sep 2020 07:58:14 +0530 Subject: [PATCH 0169/1242] Update rainmaker-noc-reports.yml --- configs/reports/configs/rainmaker-noc-reports.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/reports/configs/rainmaker-noc-reports.yml b/configs/reports/configs/rainmaker-noc-reports.yml index e924dab8..2d3bc9dc 100644 --- a/configs/reports/configs/rainmaker-noc-reports.yml +++ b/configs/reports/configs/rainmaker-noc-reports.yml @@ -586,7 +586,6 @@ ReportDefinitions: orderby: ORDER BY localisedmessage - reportName: RuralDistrictWiseApplicationStatusReport_V2 - decryptionPathId: RuralDistrictWiseApplicationStatusReport_V2 summary: Rural District Wise Application Status Report version: 1.0.0 moduleName: rainmaker-noc From bb16e19fe367e7c31504d19cac22e245b4cfc53d Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 4 Sep 2020 08:14:15 +0530 Subject: [PATCH 0170/1242] DecrptionPaths removed --- configs/reports/configs/rainmaker-noc-reports.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/configs/reports/configs/rainmaker-noc-reports.yml b/configs/reports/configs/rainmaker-noc-reports.yml index 2d3bc9dc..eb8a37c7 100644 --- a/configs/reports/configs/rainmaker-noc-reports.yml +++ b/configs/reports/configs/rainmaker-noc-reports.yml @@ -151,7 +151,6 @@ ReportDefinitions: - reportName: CollectionReport_V2 - decryptionPathId: CollectionReport_V2 summary: Collection Report version: 1.0.0 moduleName: rainmaker-noc @@ -231,7 +230,6 @@ ReportDefinitions: orderby: ORDER BY localisedmessage - reportName: ApplicationStatusReport_V2 - decryptionPathId: ApplicationStatusReport_V2 summary: Application Status Report version: 1.0.0 moduleName: rainmaker-noc @@ -281,7 +279,6 @@ ReportDefinitions: orderby: ORDER BY application_status - reportName: ChannelsReport_V2 - decryptionPathId: ChannelsReport_V2 summary: Channels Report version: 1.0.0 moduleName: rainmaker-noc @@ -636,7 +633,6 @@ ReportDefinitions: orderby: ORDER BY application_status - reportName: DrillDownRuralWiseApplicationStatusReport_V2 - decryptionPathId: DrillDownRuralWiseApplicationStatusReport_V2 summary: Rural Wise Application Status Report version: 1.0.0 moduleName: rainmaker-noc @@ -745,7 +741,6 @@ ReportDefinitions: orderby: ORDER BY channel - reportName: DrillDownRuralWiseChannelReport_V2 - decryptionPathId: DrillDownRuralWiseChannelReport_V2 summary: Rural Wise Channel Report version: 1.0.0 moduleName: rainmaker-noc From ece64fd535772a21f4abde9404ffc69c10908d20 Mon Sep 17 00:00:00 2001 From: Deependra-egov <47975393+Deependra-egov@users.noreply.github.com> Date: Fri, 4 Sep 2020 11:55:55 +0530 Subject: [PATCH 0171/1242] pathid for _v2 reports --- configs/reports/configs/tl-reports.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/reports/configs/tl-reports.yml b/configs/reports/configs/tl-reports.yml index 3c722be3..5cebec1a 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -1219,6 +1219,7 @@ ReportDefinitions: - reportName: TradeLicenseRegistryReport_v2 + decryptionPathId: TradeLicenseRegistryReport_v2 summary: TL Receipt Register Report version: 1.0.0 moduleName: rainmaker-tl From 3f5db75b25f5b76878063bfe844da99a774ee70a Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Fri, 4 Sep 2020 11:58:25 +0530 Subject: [PATCH 0172/1242] Update tlcertificate.json --- configs/pdf-service/data-config/tlcertificate.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/pdf-service/data-config/tlcertificate.json b/configs/pdf-service/data-config/tlcertificate.json index 6202b9e0..bc516425 100644 --- a/configs/pdf-service/data-config/tlcertificate.json +++ b/configs/pdf-service/data-config/tlcertificate.json @@ -632,7 +632,7 @@ }, { "path": "http://collection-services:8080/collection-services/payments/_search", - "queryParam": "tenantId=$.tenantId,consumerCode=$.applicationNumber,businessServices=TL", + "queryParam": "tenantId=$.tenantId,consumerCodes=$.applicationNumber,businessServices=TL", "apiRequest": null, "responseMapping":[ { From b5bbdeb516835c450e99ce949cf7f468e9b85792 Mon Sep 17 00:00:00 2001 From: Deependra-egov <47975393+Deependra-egov@users.noreply.github.com> Date: Fri, 4 Sep 2020 13:13:48 +0530 Subject: [PATCH 0173/1242] Update tl-reports.yml --- configs/reports/configs/tl-reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/reports/configs/tl-reports.yml b/configs/reports/configs/tl-reports.yml index 5cebec1a..e6805440 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -1219,7 +1219,7 @@ ReportDefinitions: - reportName: TradeLicenseRegistryReport_v2 - decryptionPathId: TradeLicenseRegistryReport_v2 + decryptionPathId: TradeLicenseRegistryReport summary: TL Receipt Register Report version: 1.0.0 moduleName: rainmaker-tl From 8ef734fc6eac6376414cc94e4e5b66195d9f9db5 Mon Sep 17 00:00:00 2001 From: Deependra-egov <47975393+Deependra-egov@users.noreply.github.com> Date: Fri, 4 Sep 2020 13:29:55 +0530 Subject: [PATCH 0174/1242] Update tl-reports.yml --- configs/reports/configs/tl-reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/reports/configs/tl-reports.yml b/configs/reports/configs/tl-reports.yml index e6805440..5cebec1a 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -1219,7 +1219,7 @@ ReportDefinitions: - reportName: TradeLicenseRegistryReport_v2 - decryptionPathId: TradeLicenseRegistryReport + decryptionPathId: TradeLicenseRegistryReport_v2 summary: TL Receipt Register Report version: 1.0.0 moduleName: rainmaker-tl From 347eb5d95a6f265d0a2bcc85b25cb8d358e82803 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Fri, 4 Sep 2020 13:59:24 +0530 Subject: [PATCH 0175/1242] Update consolidatedreceipt.json --- .../format-config/consolidatedreceipt.json | 32 +++++++------------ 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/configs/pdf-service/format-config/consolidatedreceipt.json b/configs/pdf-service/format-config/consolidatedreceipt.json index cf3f594f..13372fd2 100644 --- a/configs/pdf-service/format-config/consolidatedreceipt.json +++ b/configs/pdf-service/format-config/consolidatedreceipt.json @@ -11,14 +11,14 @@ "widths": [ 60, "*", - 120 + 150 ], "body": [ [ { "image": "{{logoImage}}", "width": 50, - "height": 61.25 + "height": 50 }, { "stack": [ @@ -42,16 +42,12 @@ { "stack": [ { - "text": "{{address}}" - }, - { - "text": "{{phoneNumber}}" - }, - { - "text": "{{website}}" + "text": "{{address}},{{phoneNumber}}", + "style": "receipt-logo-sub-header" }, { - "text": "{{email}}" + "text": "{{website}},{{email}}", + "style": "receipt-logo-sub-header" } ], "alignment": "right", @@ -537,7 +533,7 @@ { "image": "{{logoImage}}", "width": 50, - "height": 61.25 + "height": 50 }, { "stack": [ @@ -546,7 +542,7 @@ "style": "receipt-logo-header" }, { - "text": "{{serviceType}} {{payment_receipt}} (Employee Copy)", + "text": "{{serviceType}} {{payment_receipt}} (Citizen Copy)", "style": "receipt-logo-sub-header" } ], @@ -561,16 +557,12 @@ { "stack": [ { - "text": "{{address}}" - }, - { - "text": "{{phoneNumber}}" - }, - { - "text": "{{website}}" + "text": "{{address}},{{phoneNumber}}", + "style": "receipt-logo-sub-header" }, { - "text": "{{email}}" + "text": "{{website}},{{email}}", + "style": "receipt-logo-sub-header" } ], "alignment": "right", From f9b35c82e5b9fa0fecc3c40919795f997be022e5 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Fri, 4 Sep 2020 14:01:15 +0530 Subject: [PATCH 0176/1242] Update tradelicense-receipt.json --- .../pdf-service/format-config/tradelicense-receipt.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/pdf-service/format-config/tradelicense-receipt.json b/configs/pdf-service/format-config/tradelicense-receipt.json index b71c2111..99aa26ad 100644 --- a/configs/pdf-service/format-config/tradelicense-receipt.json +++ b/configs/pdf-service/format-config/tradelicense-receipt.json @@ -584,7 +584,7 @@ "style": "receipt-table" }, { - "text": "Transanction No.", + "text": " ", "border": [ false, false, @@ -594,7 +594,7 @@ "style": "receipt-table-value" }, { - "text": "{{transactionID}}", + "text": " ", "border": [ false, false, @@ -606,7 +606,7 @@ ], [ { - "text": "Cheque or DD No.", + "text": "Cheque/DD/PO/Transaction No.", "border": [ true, false, @@ -626,7 +626,7 @@ "style": "receipt-table" }, { - "text": "Cheque or DD Date", + "text": "Cheque/DD/PO/Transaction Date", "border": [ false, false, From 23d46d67cf01b1be4a42c3d806dc2d2665d23119 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 4 Sep 2020 14:35:54 +0530 Subject: [PATCH 0177/1242] host changes --- configs/pdf-service/data-config/property-receipt.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index ffccd6f3..2c969ef2 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -452,7 +452,7 @@ { "externalAPI": [ { - "path": "http://localhost:8069/egov-mdms-service/v1/_get", + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", "apiRequest": null, "responseMapping":[ @@ -489,7 +489,7 @@ ] }, { - "path": "http://localhost:8070/property-services/property/_search", + "path": "http://property-services.egov:8080/property-services/property/_search", "queryParam": "propertyIds=$.paymentDetails[0].bill.consumerCode,tenantId=$.tenantId", "apiRequest": null, "responseMapping":[ From 67c6d42f38f1480471b4346d81fe73dbf974539c Mon Sep 17 00:00:00 2001 From: Deependra-egov <47975393+Deependra-egov@users.noreply.github.com> Date: Fri, 4 Sep 2020 14:44:20 +0530 Subject: [PATCH 0178/1242] Update tl-reports.yml --- configs/reports/configs/tl-reports.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/reports/configs/tl-reports.yml b/configs/reports/configs/tl-reports.yml index 5cebec1a..2e5b880c 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -1,7 +1,6 @@ --- ReportDefinitions: - reportName: TradeLicenseRegistryReport - decryptionPathId: TradeLicenseRegistryReport summary: TL Receipt Register Report version: 1.0.0 moduleName: rainmaker-tl From 390ab4cf462d629dd6308000e6a78b8b47bde3bb Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 4 Sep 2020 14:47:29 +0530 Subject: [PATCH 0179/1242] Update property-receipt.json --- configs/pdf-service/data-config/property-receipt.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index 2c969ef2..25d97bd4 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -600,7 +600,7 @@ ] }, { - "path": "http://localhost:8069/egov-mdms-service/v1/_get", + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", "queryParam": "moduleName=tenant&masterName=footer&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}' %26%26 @.service=='{$.paymentDetails[0].businessService}')%5D", "apiRequest": null, "responseMapping":[ From 76398ef7fbd94998d1975a3ad9eeba644dfb3f63 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Fri, 4 Sep 2020 14:49:48 +0530 Subject: [PATCH 0180/1242] Update consolidatedreceipt.json --- .../pdf-service/format-config/consolidatedreceipt.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/pdf-service/format-config/consolidatedreceipt.json b/configs/pdf-service/format-config/consolidatedreceipt.json index 13372fd2..df0979d9 100644 --- a/configs/pdf-service/format-config/consolidatedreceipt.json +++ b/configs/pdf-service/format-config/consolidatedreceipt.json @@ -348,7 +348,7 @@ ], [ { - "text": "Cheque/DD/RTGS/NEFT No.", + "text": "Cheque/DD/PO/Transaction No.", "border": [ true, false, @@ -368,7 +368,7 @@ "style": "receipt-table" }, { - "text": "Cheque/DD/RTGS/NEFT Date", + "text": "Cheque/DD/PO/Transaction Date", "border": [ false, false, @@ -864,7 +864,7 @@ ], [ { - "text": "Cheque/DD/RTGS/NEFT No.", + "text": "Cheque/DD/PO/Transaction No.", "border": [ true, false, @@ -884,7 +884,7 @@ "style": "receipt-table" }, { - "text": "Cheque/DD/RTGS/NEFT Date", + "text": "Cheque/DD/PO/Transaction Date", "border": [ false, false, From 35edd3c6398987803a9e6688dc90cd12a87666aa Mon Sep 17 00:00:00 2001 From: mohaarif007 <48949208+mohaarif007@users.noreply.github.com> Date: Sun, 6 Sep 2020 16:26:12 +0530 Subject: [PATCH 0181/1242] Update ReceiptRegister_V2 And CancelledReceiptRegister_V2 Reports Update ReceiptRegister_V2 And CancelledReceiptRegister_V2 Reports --- configs/reports/configs/pt-reports.yml | 185 +++++++++---------------- 1 file changed, 68 insertions(+), 117 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index b1376b46..92789adb 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2067,9 +2067,7 @@ ReportDefinitions: left outer join eg_pt_unit_v2_ot as pot on pot.propertydetail = pd.assessmentnumber where rh.tenantid =$tenantid and pd.property not in (select property from eg_pt_propertydetail_v2 where financialyear in ('2019-20')) - - reportName: ReceiptRegister_V2 - decryptionPathId: ReceiptRegister_V2 summary: Receipt Register version: 1.0.0 moduleName: rainmaker-pt @@ -2213,13 +2211,13 @@ ReportDefinitions: type: epoch source: pt isMandatory: true - searchClause: AND pd.receiptdate >= $fromDate + searchClause: AND rh.receiptdate >= $fromDate - name: toDate label: reports.pt.toDate type: epoch source: pt isMandatory: true - searchClause: AND pd.receiptdate <= $toDate + searchClause: AND rh.receiptdate <= $toDate - name: paymentMode label: Payment Mode type: singlevaluelist @@ -2245,7 +2243,8 @@ ReportDefinitions: -- Use CTE to force query plan, compute & use CTE later WITH receipt_breakup AS ( SELECT - billdetailid AS receiptheader, pd.id as pdid, + --billdetailid AS receiptheader, + pd.id as pdid, SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, @@ -2263,44 +2262,37 @@ ReportDefinitions: INNER JOIN egcl_billdetial as bd on bd.id = bad.billdetailid INNER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid INNER JOIN egcl_payment as payment on pd.paymentid=payment.id - WHERE bad.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' - GROUP BY billdetailid, pdid + WHERE bad.tenantid = 'pb.boha' and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' + GROUP BY pdid ) SELECT pd.tenantid AS tenantid, pd.id, - pt_detail.property AS propertyid, - pt_detail.assessmentnumber AS assessmentnumber, - bill.consumercode, + --pt_detail.property AS propertyid, + --pt_detail.assessmentnumber AS assessmentnumber, + bill.consumercode as propertyid, to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS receiptdate, payment.ifsccode AS bankname, receiptnumber, payment.totalamountpaid as amount, payment.paymentmode as instrumenttype, - payment.transactionnumber, + payment.transactionnumber, + concat (to_char(To_timestamp(bd.fromPeriod/1000),'YYYY'),'-',to_char(To_timestamp(bd.toPeriod/1000),'YY')) as financialyear, to_char((To_timestamp(payment.transactiondate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, receipt_breakup.*, pd.due AS pendingamount, - pt_detail.financialyear, + --pt_detail.financialyear, to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, Initcap(COALESCE(pt_detail.usagecategoryminor, pt_detail.usagecategorymajor)) as usagetype, manualreceiptnumber as g8receiptno, (CASE WHEN collectiontype='COUNTER' THEN eg_user.name ELSE '' END) as collectorname, pt_detail.additionaldetails->>'remarks' as "remarks" - FROM egcl_paymentdetail AS pd - JOIN egcl_payment as payment on pd.paymentid=payment.id - JOIN egcl_bill as bill on bill.id=pd.billid - JOIN egcl_billdetial as bd on bd.billid = bill.id - JOIN eg_pt_property_v2 as pt on pt.propertyid = bill.consumercode - JOIN receipt_breakup ON pd.id = receipt_breakup.pdid - JOIN eg_pt_propertydetail_v2 pt_detail ON pt_detail.property = pt.propertyid - JOIN eg_pt_address_v2 pt_addr ON pt_detail.property = pt_addr.property - LEFT OUTER JOIN eg_user ON eg_user.id = pd.createdby::INTEGER - WHERE pd.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' + FROM egcl_paymentdetail pd, egcl_payment payment, egcl_bill bill, egcl_billdetial bd, eg_pt_property pt, eg_user, receipt_breakup, eg_pt_propertydetail_v2 pt_detail + where pd.paymentid=payment.id and bill.id=pd.billid and bd.billid=bill.id and pt.propertyid=bill.consumercode and payment.paymentstatus !='CANCELLED' and pd.businessservice='PT' and eg_user.id = pd.createdby::INTEGER and receipt_breakup.pdid=pd.id and concat(pt_detail.property, + ':',pt_detail.financialyear)=concat(pt.propertyid,':',to_char(To_timestamp(bd.fromPeriod/1000),'YYYY'),'-',to_char(To_timestamp(bd.toPeriod/1000),'YY')) and pd.tenantid = $tenantid orderby: ORDER BY pd.receiptdate DESC - reportName: CancelledReceiptRegister_V2 - decryptionPathId: CancelledReceiptRegister_V2 summary: Receipt Register for cancelled Receipts version: 1.0.0 moduleName: rainmaker-pt @@ -2309,7 +2301,7 @@ ReportDefinitions: pdfPageSize: "A1" sourceColumns: - name: receiptnumber - label: reports.pt.receiptnumber + label: reports.pt.receiptNo type: string source: pt total: false @@ -2318,7 +2310,7 @@ ReportDefinitions: type: string source: pt total: false - - name: receiptDate + - name: transactiondate label: reports.pt.receiptDate type: string source: pt @@ -2339,17 +2331,17 @@ ReportDefinitions: source: pt total: true - name: propertytax - label: reports.pt.propertytax + label: reports.pt.propertyTax type: string source: pt total: true - name: firecess - label: reports.pt.firecess + label: reports.pt.fireCess type: string source: pt total: true - name: cancercess - label: reports.pt.cancercess + label: reports.pt.cancerCess type: string source: pt total: true @@ -2384,12 +2376,12 @@ ReportDefinitions: source: pt total: true - name: adjustment - label: reports.pt.adjustment + label: reports.pt.roundoff type: string source: pt total: true - name: propertyid - label: reports.pt.propertyid + label: reports.pt.propertyId type: string source: pt total: false @@ -2399,27 +2391,27 @@ ReportDefinitions: source: pt total: false - name: assessmentnumber - label: reports.pt.assessmentnumber + label: reports.pt.assessmentNo type: string source: pt total: false - name: financialyear - label: reports.pt.financialyear + label: reports.pt.financialYear type: string source: pt total: false - name: instrumenttype - label: reports.pt.instrumenttype + label: reports.pt.paymentMode type: string source: pt total: false - name: transactionnumber - label: reports.pt.transactionnumber + label: reports.pt.ddChequeTransactionNo type: string source: pt total: false - name: bankname - label: reports.pt.bankname + label: reports.pt.bankName type: string source: pt total: false @@ -2429,13 +2421,13 @@ ReportDefinitions: type: epoch source: pt isMandatory: false - searchClause: AND pd.receiptdate >= $fromDate + searchClause: AND rh.receiptdate >= $fromDate - name: toDate label: reports.pt.toDate type: epoch source: pt isMandatory: false - searchClause: AND pd.receiptdate <= $toDate + searchClause: AND rh.receiptdate <= $toDate - name: paymentMode label: Payment Mode type: singlevaluelist @@ -2459,7 +2451,7 @@ ReportDefinitions: searchClause: AND pt_addr.locality IN ($localityArray) query: | -- Use CTE to force query plan, compute & use CTE later - WITH receipt_breakup AS ( + WITH receipt_breakup AS ( SELECT receiptnumber as receiptheader, SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, @@ -2487,7 +2479,7 @@ ReportDefinitions: pd.id, pt_detail.property AS propertyid, pt_detail.assessmentnumber AS assessmentnumber, - payment.paymentstatus as status, + payment.paymentstatus, bill.consumercode, to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS receiptdate, payment.ifsccode AS bankname, @@ -2510,7 +2502,7 @@ ReportDefinitions: JOIN eg_pt_propertydetail_v2 pt_detail ON pt_detail.property = pt.propertyid JOIN eg_pt_address_v2 pt_addr ON pt_detail.property = pt_addr.property LEFT OUTER JOIN eg_user ON eg_user.id = pd.createdby::INTEGER - WHERE pd.tenantid = $tenantid and payment.paymentstatus = 'CANCELLED' and pd.businessservice='PT' + WHERE pd.tenantid = $tenantid and payment.paymentstatus = 'CANCELLED' and pd.businessservice='PT' orderby: ORDER BY pd.receiptdate DESC - reportName: OldUlbWisePtCollection_V2 @@ -2570,7 +2562,6 @@ ReportDefinitions: orderby: ORDER BY tenantid, totalamountpaid DESC NULLS LAST - reportName: StateCancelledReceiptRegister_V2 - decryptionPathId: StateCancelledReceiptRegister_V2 summary: Receipt Register for cancelled Receipts State version: 1.0.0 moduleName: rainmaker-pt @@ -2704,13 +2695,13 @@ ReportDefinitions: type: epoch source: pt isMandatory: false - searchClause: AND pd.receiptdate >= $fromDate + searchClause: AND rh.receiptdate >= $fromDate - name: toDate label: reports.pt.toDate type: epoch source: pt isMandatory: false - searchClause: AND pd.receiptdate <= $toDate + searchClause: AND rh.receiptdate <= $toDate - name: paymentMode label: Payment Mode type: singlevaluelist @@ -2783,7 +2774,6 @@ ReportDefinitions: orderby: ORDER BY pd.receiptdate DESC - reportName: StateWidePtCollection_V2 - decryptionPathId: StateWidePtCollection_V2 summary: State Wide PT Collection version: 1.0.0 moduleName: rainmaker-pt @@ -2870,7 +2860,6 @@ ReportDefinitions: orderby: ORDER BY tenantid, totalamountpaid DESC NULLS LAST - reportName: UlbWisePtCollection_V2 - decryptionPathId: UlbWisePtCollection_V2 summary: State Wide PT Collection version: 1.0.0 moduleName: rainmaker-pt @@ -2941,8 +2930,7 @@ ReportDefinitions: searchClause: AND usagecategorymajor = $usage query: | SELECT - financialyear, - initcap(split_part(pt_detail.tenantid, '.', 2)) as tenantid, + initcap(split_part(tenantid, '.', 2)) as tenantid, COUNT(collectiontype) AS totalassessments, SUM(billd.amount) AS totalamount, SUM(billd.amountpaid) AS totalamountpaid, @@ -2951,15 +2939,12 @@ ReportDefinitions: SUM(CASE WHEN collectiontype LIKE 'COUNTER' THEN amount ELSE 0 END) AS totaloffline, SUM(CASE WHEN collectiontype LIKE 'COUNTER' THEN 1 ELSE 0 END) AS countoffline, (SUM(billd.amount) - SUM(billd.amountpaid)) AS totalamountdue - FROM egcl_billdetial as billd - JOIN egcl_bill as bill ON bill.id = billd.billid - JOIN eg_pt_propertydetail_v2 as pt_detail ON pt_detail.property = bill.consumercode - WHERE pt_detail.tenantid LIKE CONCAT(SPLIT_PART($tenantid, '.', 1), '%') and pt_detail.tenantid = $tenantid - groupby: GROUP BY financialyear, pt_detail.tenantid - orderby: ORDER BY pt_detail.tenantid, totalamountpaid DESC NULLS LAST + FROM egcl_billdetial as billd + WHERE tenantid LIKE CONCAT(SPLIT_PART($tenantid, '.', 1), '%') and tenantid = $tenantid + groupby: GROUP BY tenantid + orderby: ORDER BY tenantid, totalamountpaid DESC NULLS LAST - reportName: ReceiptRegisterShort_V2 - decryptionPathId: ReceiptRegisterShort_V2 summary: Receipt Register version: 1.0.0 moduleName: rainmaker-pt @@ -3033,13 +3018,13 @@ ReportDefinitions: type: epoch source: pt isMandatory: true - searchClause: AND pd.receiptdate >= $fromDate + searchClause: AND rh.receiptdate >= $fromDate - name: toDate label: reports.pt.toDate type: epoch source: pt isMandatory: true - searchClause: AND pd.receiptdate <= $toDate + searchClause: AND rh.receiptdate <= $toDate - name: paymentMode label: Payment Mode type: singlevaluelist @@ -3129,7 +3114,6 @@ ReportDefinitions: - reportName: ULBPTDataDumpReport_V2 - decryptionPathId: ULBPTDataDumpReport_V2 summary: ULB level report version: 1.0.0 moduleName: rainmaker-pt @@ -3255,13 +3239,13 @@ ReportDefinitions: type: epoch source: pt isMandatory: true - searchClause: AND payd.receiptdate >= $fromDate + searchClause: AND rh.receiptdate >= $fromDate - name: toDate label: reports.pt.toDate type: epoch source: pt isMandatory: true - searchClause: AND payd.receiptdate <= $toDate + searchClause: AND rh.receiptdate <= $toDate - name: financialyear label: Financial Year type: singlevaluelist @@ -3322,7 +3306,6 @@ ReportDefinitions: - reportName: Sewa_Kendra_ReceiptRegister_V2 - decryptionPathId: Sewa_Kendra_ReceiptRegister_V2 summary: Sewa Kendra Receipt Register version: 1.0.0 moduleName: rainmaker-pt @@ -3466,13 +3449,13 @@ ReportDefinitions: type: epoch source: pt isMandatory: true - searchClause: AND pd.receiptdate >= $fromDate + searchClause: AND rh.receiptdate >= $fromDate - name: toDate label: reports.pt.toDate type: epoch source: pt isMandatory: true - searchClause: AND pd.receiptdate <= $toDate + searchClause: AND rh.receiptdate <= $toDate - name: paymentMode label: Payment Mode type: singlevaluelist @@ -3555,7 +3538,6 @@ ReportDefinitions: - reportName: ReceiptRegisterSummary_V2 - decryptionPathId: ReceiptRegisterSummary_V2 summary: Receipt Register Summary version: 1.0.0 moduleName: rainmaker-pt @@ -3633,24 +3615,19 @@ ReportDefinitions: type: string source: pt total: false - - name: totalamount - label: reports.pt.totalamount - type: string - source: pt - total: true searchParams: - name: fromDate label: reports.pt.fromDate type: epoch source: pt isMandatory: true - searchClause: AND pd.receiptdate >= $fromDate + searchClause: AND rh.receiptdate >= $fromDate - name: toDate label: reports.pt.toDate type: epoch source: pt isMandatory: true - searchClause: AND pd.receiptdate <= $toDate + searchClause: AND rh.receiptdate <= $toDate - name: collectorname label: reports.pt.collectorname type: singlevaluelist @@ -3688,7 +3665,6 @@ ReportDefinitions: groupby: group by collectorname,bd.tenantid - reportName: StateReceiptRegisterSummary_V2 - decryptionPathId: StateReceiptRegisterSummary_V2 summary: Receipt Register Summary version: 1.0.0 moduleName: rainmaker-pt @@ -3757,13 +3733,13 @@ ReportDefinitions: type: epoch source: pt isMandatory: false - searchClause: AND pd.receiptdate >= $fromDate + searchClause: AND rh.receiptdate >= $fromDate - name: toDate label: reports.pt.toDate type: epoch source: pt isMandatory: false - searchClause: AND pd.receiptdate <= $toDate + searchClause: AND rh.receiptdate <= $toDate - name: ulb label: ULB type: singlevaluelist @@ -3796,9 +3772,7 @@ ReportDefinitions: groupby: group by bd.tenantid orderby: order by bd.tenantid - - reportName: FYCollectionsReport_V2 - decryptionPathId: FYCollectionsReport_V2 summary: FY Collections version: 1.0.0 moduleName: rainmaker-pt @@ -3816,41 +3790,21 @@ ReportDefinitions: type: string source: pt total: true - - name: countresidential - label: reports.pt.countresidential - type: string - source: pt - total: true - name: nonresidential label: reports.pt.nonresidential type: string source: pt total: true - - name: countnonresidential - label: reports.pt.countnonresidential - type: string - source: pt - total: true - name: mixed label: reports.pt.mixed type: string source: pt total: true - - name: countmixed - label: reports.pt.countmixed - type: string - source: pt - total: true - name: totalamount label: reports.pt.totalamount type: string source: pt total: true - - name: totalcount - label: reports.pt.totalcount - type: string - source: pt - total: true - name: online label: reports.pt.online type: string @@ -3892,30 +3846,27 @@ ReportDefinitions: searchClause: AND pt_addr.locality IN ($localityArray) query: | -- Use CTE to force query plan, compute & use CTE later - SELECT - financialyear, - initcap(split_part(tenantid, '.', 2)) as tenantid, - COUNT(collectiontype) AS totalassessments, - SUM(totalamount) AS totalamount, - SUM(amount) AS totalamountpaid, - SUM(CASE WHEN collectiontype = 'ONLINE' THEN amount ELSE 0 END) AS totalonline, - SUM(CASE WHEN collectiontype = 'ONLINE' THEN 1 ELSE 0 END) AS totalonlinecount, - SUM(CASE WHEN collectiontype != 'ONLINE' THEN amount ELSE 0 END) AS totaloffline, - SUM(CASE WHEN collectiontype != 'ONLINE' THEN 1 ELSE 0 END) AS totalofflinecount, - (SUM(totalamount) - SUM(amount)) AS totalamountdue - FROM eg_pt_propertydetail_v2 AS pd - LEFT OUTER JOIN (SELECT consumercode, totalamount, amount, collectiontype, receiptdate FROM egcl_receiptheader_v1 AS rh - LEFT OUTER JOIN egcl_receiptinstrument_v1 AS ri ON rh.id = ri.receiptheader - LEFT OUTER JOIN egcl_instrumentheader_v1 AS ih ON ri.instrumentheader = ih.id and ih.instrumentstatus != 'CANCELLED' - where rh.status != 'Cancelled' - ) AS tbl_amounts ON CONCAT(pd.property, ':', pd.assessmentnumber) = tbl_amounts.consumercode - WHERE tenantid = $tenantid - groupby: GROUP BY tenantid, financialyear - orderby: ORDER BY tenantid, totalamountpaid DESC NULLS LAST - + SELECT + financialyear, + sum(case when pt_detail.usagecategorymajor='RESIDENTIAL' then pd.amountpaid else 0 end) as "residential", + sum(case when pt_detail.usagecategorymajor='NONRESIDENTIAL' then pd.amountpaid else 0 end) as "nonresidential", + sum(case when pt_detail.usagecategorymajor='MIXED' then pd.amountpaid else 0 end) as "mixed", + sum(pd.amountpaid) as totalamount, + sum(case when payment.paymentmode='ONLINE' then pd.amountpaid else 0 end) as "online", + sum(case when payment.paymentmode='CASH' then pd.amountpaid else 0 end) as "cash", + sum(case when payment.paymentmode='CHEQUE' then pd.amountpaid else 0 end) as "cheque", + sum(case when payment.paymentmode='DD' then pd.amountpaid else 0 end) as "dd" + FROM egcl_paymentdetail AS pd + join egcl_payment as payment on payment.id = pd.paymentid + join egcl_bill as bill on bill.id = pd.billid + JOIN eg_pt_propertydetail_v2 pt_detail ON pt_detail.property = bill.consumercode + JOIN eg_pt_address_v2 pt_addr ON pt_detail.property = pt_addr.property + LEFT OUTER JOIN eg_user ON eg_user.id = pd.createdby::INTEGER + WHERE pd.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' + groupby: GROUP BY financialyear + orderby: ORDER BY financialyear - reportName: ULBDEFAULTERPTREPORT_V2 - decryptionPathId: ULBDEFAULTERPTREPORT_V2 summary: ULB Defaulter Pt report version: 1.0.0 moduleName: rainmaker-pt From d13ce4e47879700879a2a7e116b916628f37c975 Mon Sep 17 00:00:00 2001 From: Deependra-egov <47975393+Deependra-egov@users.noreply.github.com> Date: Sun, 6 Sep 2020 21:02:21 +0530 Subject: [PATCH 0182/1242] remove additional config for print --- configs/reports/configs/pt-reports.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 92789adb..03b578cd 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2071,9 +2071,6 @@ ReportDefinitions: summary: Receipt Register version: 1.0.0 moduleName: rainmaker-pt - additionalConfig: - print: - pdfPageSize: "A1" sourceColumns: - name: receiptnumber label: reports.pt.receiptNo From cf73b46f2bb2b2fb9c06a60dc98acb837826930c Mon Sep 17 00:00:00 2001 From: Deependra-egov <47975393+Deependra-egov@users.noreply.github.com> Date: Sun, 6 Sep 2020 21:16:03 +0530 Subject: [PATCH 0183/1242] Update pt-reports.yml --- configs/reports/configs/pt-reports.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 03b578cd..f1d7666d 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -1,6 +1,7 @@ --- ReportDefinitions: - reportName: ReceiptRegister + decryptionPathId: ReceiptRegister summary: Receipt Register version: 1.0.0 moduleName: rainmaker-pt @@ -2068,6 +2069,7 @@ ReportDefinitions: where rh.tenantid =$tenantid and pd.property not in (select property from eg_pt_propertydetail_v2 where financialyear in ('2019-20')) - reportName: ReceiptRegister_V2 + decryptionPathId: ReceiptRegister_V2 summary: Receipt Register version: 1.0.0 moduleName: rainmaker-pt From d0dcfd72dcd77fd13314e38d8e38a65b46c55a6a Mon Sep 17 00:00:00 2001 From: Deependra-egov <47975393+Deependra-egov@users.noreply.github.com> Date: Sun, 6 Sep 2020 21:43:57 +0530 Subject: [PATCH 0184/1242] Update pt-reports.yml --- configs/reports/configs/pt-reports.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index f1d7666d..bf0349de 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -1,7 +1,6 @@ --- ReportDefinitions: - reportName: ReceiptRegister - decryptionPathId: ReceiptRegister summary: Receipt Register version: 1.0.0 moduleName: rainmaker-pt From 7fa3fb7625f1ed1eac6ecec801a332434cac2da4 Mon Sep 17 00:00:00 2001 From: Deependra-egov <47975393+Deependra-egov@users.noreply.github.com> Date: Sun, 6 Sep 2020 21:52:15 +0530 Subject: [PATCH 0185/1242] Update pt-reports.yml --- configs/reports/configs/pt-reports.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index bf0349de..48ed2873 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -1,12 +1,10 @@ --- ReportDefinitions: - reportName: ReceiptRegister + decryptionPathId: ReceiptRegister summary: Receipt Register version: 1.0.0 moduleName: rainmaker-pt - additionalConfig: - print: - pdfPageSize: "A1" sourceColumns: - name: receiptnumber label: reports.pt.receiptNo From 80b90a0c1239101d802087e63d37d836db9e5388 Mon Sep 17 00:00:00 2001 From: Deependra-egov <47975393+Deependra-egov@users.noreply.github.com> Date: Sun, 6 Sep 2020 21:58:56 +0530 Subject: [PATCH 0186/1242] Update pt-reports.yml --- configs/reports/configs/pt-reports.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 48ed2873..bf0349de 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -1,10 +1,12 @@ --- ReportDefinitions: - reportName: ReceiptRegister - decryptionPathId: ReceiptRegister summary: Receipt Register version: 1.0.0 moduleName: rainmaker-pt + additionalConfig: + print: + pdfPageSize: "A1" sourceColumns: - name: receiptnumber label: reports.pt.receiptNo From f870331b711d9be04942c79bd38ade06d4e9482f Mon Sep 17 00:00:00 2001 From: Deependra-egov <47975393+Deependra-egov@users.noreply.github.com> Date: Mon, 7 Sep 2020 12:12:04 +0530 Subject: [PATCH 0187/1242] Update pt-reports.yml --- configs/reports/configs/pt-reports.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index bf0349de..03b578cd 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2068,7 +2068,6 @@ ReportDefinitions: where rh.tenantid =$tenantid and pd.property not in (select property from eg_pt_propertydetail_v2 where financialyear in ('2019-20')) - reportName: ReceiptRegister_V2 - decryptionPathId: ReceiptRegister_V2 summary: Receipt Register version: 1.0.0 moduleName: rainmaker-pt From 86d99fd67a26ffa0fa63d7d84474b211a4b6ffa2 Mon Sep 17 00:00:00 2001 From: Deependra-egov <47975393+Deependra-egov@users.noreply.github.com> Date: Mon, 7 Sep 2020 12:16:47 +0530 Subject: [PATCH 0188/1242] Update pt-reports.yml --- configs/reports/configs/pt-reports.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 03b578cd..fb201165 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -1,6 +1,7 @@ --- ReportDefinitions: - reportName: ReceiptRegister + decryptionPathId: ReceiptRegister summary: Receipt Register version: 1.0.0 moduleName: rainmaker-pt From 6e8b60727627147a7908eeae7e0112543be015b9 Mon Sep 17 00:00:00 2001 From: mohaarif007 <48949208+mohaarif007@users.noreply.github.com> Date: Mon, 7 Sep 2020 12:47:30 +0530 Subject: [PATCH 0189/1242] Update ReceiptRegister_V2 And CancelReceiptRegister_V2 Update ReceiptRegister_V2 And CancelReceiptRegister_V2 --- configs/reports/configs/pt-reports.yml | 119 ++++++------------------- 1 file changed, 25 insertions(+), 94 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index fb201165..7c7f7d3b 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2239,56 +2239,23 @@ ReportDefinitions: searchClause: AND pt_addr.locality IN ($localityArray) query: | -- Use CTE to force query plan, compute & use CTE later - WITH receipt_breakup AS ( - SELECT - --billdetailid AS receiptheader, - pd.id as pdid, - SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, - SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, - SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, - SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, - SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as propertytax, - (SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN adjustedamount ELSE 0 END) )as exemption, - ( SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END)) as adjustment - FROM egcl_billaccountdetail as bad - INNER JOIN egcl_billdetial as bd on bd.id = bad.billdetailid - INNER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid - INNER JOIN egcl_payment as payment on pd.paymentid=payment.id - WHERE bad.tenantid = 'pb.boha' and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' - GROUP BY pdid - ) SELECT pd.tenantid AS tenantid, - pd.id, - --pt_detail.property AS propertyid, - --pt_detail.assessmentnumber AS assessmentnumber, - bill.consumercode as propertyid, + bill.consumercode, to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS receiptdate, payment.ifsccode AS bankname, receiptnumber, payment.totalamountpaid as amount, payment.paymentmode as instrumenttype, payment.transactionnumber, - concat (to_char(To_timestamp(bd.fromPeriod/1000),'YYYY'),'-',to_char(To_timestamp(bd.toPeriod/1000),'YY')) as financialyear, - to_char((To_timestamp(payment.transactiondate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, - receipt_breakup.*, + to_char((To_timestamp(bd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS fromdate, + to_char((To_timestamp(bd.toperiod/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS todate, + to_char((To_timestamp(payment.transactiondate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, pd.due AS pendingamount, - --pt_detail.financialyear, - to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, - Initcap(COALESCE(pt_detail.usagecategoryminor, pt_detail.usagecategorymajor)) as usagetype, - manualreceiptnumber as g8receiptno, - (CASE WHEN collectiontype='COUNTER' THEN eg_user.name ELSE '' END) as collectorname, - pt_detail.additionaldetails->>'remarks' as "remarks" - FROM egcl_paymentdetail pd, egcl_payment payment, egcl_bill bill, egcl_billdetial bd, eg_pt_property pt, eg_user, receipt_breakup, eg_pt_propertydetail_v2 pt_detail - where pd.paymentid=payment.id and bill.id=pd.billid and bd.billid=bill.id and pt.propertyid=bill.consumercode and payment.paymentstatus !='CANCELLED' and pd.businessservice='PT' and eg_user.id = pd.createdby::INTEGER and receipt_breakup.pdid=pd.id and concat(pt_detail.property, - ':',pt_detail.financialyear)=concat(pt.propertyid,':',to_char(To_timestamp(bd.fromPeriod/1000),'YYYY'),'-',to_char(To_timestamp(bd.toPeriod/1000),'YY')) and pd.tenantid = $tenantid - orderby: ORDER BY pd.receiptdate DESC + to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, manualreceiptnumber as g8receiptno + FROM egcl_paymentdetail pd, egcl_payment payment, egcl_bill bill, (select bill.id as billid, min(bd.fromperiod) fromperiod, max(bd.toperiod) toperiod from egcl_billdetial bd, egcl_bill bill where bill.id=bd.billid group by bill.id) bd + where pd.paymentid=payment.id and bill.id=pd.billid and bd.billid=bill.id and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + orderby: ORDER BY pd.receiptdate DESC; - reportName: CancelledReceiptRegister_V2 summary: Receipt Register for cancelled Receipts @@ -2449,59 +2416,23 @@ ReportDefinitions: searchClause: AND pt_addr.locality IN ($localityArray) query: | -- Use CTE to force query plan, compute & use CTE later - WITH receipt_breakup AS ( - SELECT - receiptnumber as receiptheader, - SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, - SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, - SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, - SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, - SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as propertytax, - (SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN adjustedamount ELSE 0 END) )as exemption, - ( SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END)) as adjustment - FROM egcl_billaccountdetail as bad - INNER JOIN egcl_billdetial as bd on bd.id = bad.billdetailid - INNER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid - INNER JOIN egcl_payment as payment on pd.paymentid=payment.id - WHERE pd.tenantid = $tenantid and payment.paymentstatus = 'CANCELLED' and pd.businessservice='PT' - GROUP BY pd.receiptnumber - ) - SELECT - pd.tenantid AS tenantid, - pd.id, - pt_detail.property AS propertyid, - pt_detail.assessmentnumber AS assessmentnumber, - payment.paymentstatus, - bill.consumercode, - to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS receiptdate, - payment.ifsccode AS bankname, - receiptnumber, - payment.totalamountpaid as amount, - payment.paymentmode as instrumenttype, - payment.transactionnumber, - receipt_breakup.*, - pd.due AS pendingamount, - pt_detail.financialyear, - to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, - Initcap(COALESCE(pt_detail.usagecategoryminor, pt_detail.usagecategorymajor)) as usagetype, - manualreceiptnumber as g8receiptno - FROM egcl_paymentdetail AS pd - JOIN egcl_payment as payment on pd.paymentid=payment.id - JOIN egcl_bill as bill on bill.id=pd.billid - JOIN egcl_billdetial as bd on bd.billid = bill.id - JOIN eg_pt_property_v2 as pt on pt.propertyid = bill.consumercode - JOIN receipt_breakup ON receipt_breakup.receiptheader = pd.receiptnumber - JOIN eg_pt_propertydetail_v2 pt_detail ON pt_detail.property = pt.propertyid - JOIN eg_pt_address_v2 pt_addr ON pt_detail.property = pt_addr.property - LEFT OUTER JOIN eg_user ON eg_user.id = pd.createdby::INTEGER - WHERE pd.tenantid = $tenantid and payment.paymentstatus = 'CANCELLED' and pd.businessservice='PT' - orderby: ORDER BY pd.receiptdate DESC + SELECT + pd.tenantid AS tenantid, + bill.consumercode, + to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS receiptdate, + payment.ifsccode AS bankname, + receiptnumber, + payment.totalamountpaid as amount, + payment.paymentmode as instrumenttype, + payment.transactionnumber, + to_char((To_timestamp(bd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS fromdate, + to_char((To_timestamp(bd.toperiod/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS todate, + to_char((To_timestamp(payment.transactiondate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, + pd.due AS pendingamount, + to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, manualreceiptnumber as g8receiptno + FROM egcl_paymentdetail pd, egcl_payment payment, egcl_bill bill, (select bill.id as billid, min(bd.fromperiod) fromperiod, max(bd.toperiod) toperiod from egcl_billdetial bd, egcl_bill bill where bill.id=bd.billid group by bill.id) bd + where pd.paymentid=payment.id and bill.id=pd.billid and bd.billid=bill.id and payment.paymentstatus = 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + orderby: ORDER BY pd.receiptdate DESC; - reportName: OldUlbWisePtCollection_V2 summary: ULB-wise PT Collection From ad7614145f60792b0b628a10522e9df919d690d0 Mon Sep 17 00:00:00 2001 From: mohaarif007 <48949208+mohaarif007@users.noreply.github.com> Date: Mon, 7 Sep 2020 13:17:19 +0530 Subject: [PATCH 0190/1242] Update ReceiptRegister_V2 Report Update ReceiptRegister_V2 Report --- configs/reports/configs/pt-reports.yml | 81 +------------------------- 1 file changed, 3 insertions(+), 78 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 7c7f7d3b..70822be3 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2098,81 +2098,16 @@ ReportDefinitions: type: string source: pt total: true - - name: propertytax - label: reports.pt.propertyTax - type: string - source: pt - total: true - - name: firecess - label: reports.pt.fireCess - type: string - source: pt - total: true - - name: cancercess - label: reports.pt.cancerCess - type: string - source: pt - total: true - - name: rebate - label: reports.pt.rebate - type: string - source: pt - total: true - - name: adhocrebate - label: reports.pt.adhocrebate - type: string - source: pt - total: true - - name: penalty - label: reports.pt.penalty - type: string - source: pt - total: true - - name: adhocpenalty - label: reports.pt.adhocpenalty - type: string - source: pt - total: true - - name: interest - label: reports.pt.interest - type: string - source: pt - total: true - - name: exemption - label: reports.pt.exemption - type: string - source: pt - total: true - - name: adjustment - label: reports.pt.roundoff - type: string - source: pt - total: true - name: pendingamount label: reports.pt.pendingamount type: string source: pt total: true - - name: propertyid + - name: consumercode label: reports.pt.propertyId type: string source: pt total: false - - name: usagetype - label: reports.pt.usagetype - type: string - source: pt - total: false - - name: assessmentnumber - label: reports.pt.assessmentNo - type: string - source: pt - total: false - - name: financialyear - label: reports.pt.financialYear - type: string - source: pt - total: false - name: instrumenttype label: reports.pt.paymentMode type: string @@ -2193,29 +2128,19 @@ ReportDefinitions: type: string source: pt total: false - - name: collectorname - label: reports.pt.collectorname - type: string - source: pt - total: false - - name: remarks - label: reports.pt.remarks - type: string - source: pt - total: false searchParams: - name: fromDate label: reports.pt.fromDate type: epoch source: pt isMandatory: true - searchClause: AND rh.receiptdate >= $fromDate + searchClause: AND pd.receiptdate >= $fromDate - name: toDate label: reports.pt.toDate type: epoch source: pt isMandatory: true - searchClause: AND rh.receiptdate <= $toDate + searchClause: AND pd.receiptdate <= $toDate - name: paymentMode label: Payment Mode type: singlevaluelist From 35d02e738819b4317d6e84826de37f70b735599a Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 7 Sep 2020 14:37:17 +0530 Subject: [PATCH 0191/1242] updated receiptREgister --- configs/reports/configs/pt-reports.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 70822be3..8c16ba8a 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2156,13 +2156,7 @@ ReportDefinitions: wrapper: true isMandatory: false searchClause: AND financialyear = $financialyear - - name: localityArray - label: reports.pt.zoneList - type: boundarylist - source: pt - isMandatory: false - searchClause: AND pt_addr.locality IN ($localityArray) - query: | + query: | -- Use CTE to force query plan, compute & use CTE later SELECT pd.tenantid AS tenantid, From fa8d8e62e697cac80d5de4d92f370625acc9384a Mon Sep 17 00:00:00 2001 From: mohaarif007 <48949208+mohaarif007@users.noreply.github.com> Date: Mon, 7 Sep 2020 14:43:45 +0530 Subject: [PATCH 0192/1242] Update ReceiptRegister_V2 report Update ReceiptRegister_V2 report --- configs/reports/configs/pt-reports.yml | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 8c16ba8a..e6e1dac0 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2147,16 +2147,8 @@ ReportDefinitions: pattern: 'list://Cash:Cash,Online:Online,Card:Card,DD:DD,Cheque:Cheque' source: pt isMandatory: false - searchClause: AND instrumenttype = $paymentMode - - name: financialyear - label: Financial Year - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name - source: pt - wrapper: true - isMandatory: false - searchClause: AND financialyear = $financialyear - query: | + searchClause: AND payment.paymentmode = $paymentMode + query: | -- Use CTE to force query plan, compute & use CTE later SELECT pd.tenantid AS tenantid, From cd9e6ad05bea48d1ca5ab4336aac589a78ab8445 Mon Sep 17 00:00:00 2001 From: mohaarif007 <48949208+mohaarif007@users.noreply.github.com> Date: Mon, 7 Sep 2020 16:28:26 +0530 Subject: [PATCH 0193/1242] Update Column in ReciptRegister_V2 report Update Column in ReciptRegister_V2 report --- configs/reports/configs/pt-reports.yml | 88 ++++++++++++++++++++++++-- 1 file changed, 83 insertions(+), 5 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index e6e1dac0..b6052c1d 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2072,6 +2072,9 @@ ReportDefinitions: summary: Receipt Register version: 1.0.0 moduleName: rainmaker-pt + additionalConfig: + print: + pdfPageSize: "A1" sourceColumns: - name: receiptnumber label: reports.pt.receiptNo @@ -2098,6 +2101,56 @@ ReportDefinitions: type: string source: pt total: true + - name: propertytax + label: reports.pt.propertyTax + type: string + source: pt + total: true + - name: firecess + label: reports.pt.fireCess + type: string + source: pt + total: true + - name: cancercess + label: reports.pt.cancerCess + type: string + source: pt + total: true + - name: rebate + label: reports.pt.rebate + type: string + source: pt + total: true + - name: adhocrebate + label: reports.pt.adhocrebate + type: string + source: pt + total: true + - name: penalty + label: reports.pt.penalty + type: string + source: pt + total: true + - name: adhocpenalty + label: reports.pt.adhocpenalty + type: string + source: pt + total: true + - name: interest + label: reports.pt.interest + type: string + source: pt + total: true + - name: exemption + label: reports.pt.exemption + type: string + source: pt + total: true + - name: adjustment + label: reports.pt.roundoff + type: string + source: pt + total: true - name: pendingamount label: reports.pt.pendingamount type: string @@ -2150,8 +2203,32 @@ ReportDefinitions: searchClause: AND payment.paymentmode = $paymentMode query: | -- Use CTE to force query plan, compute & use CTE later + WITH receipt_breakup AS ( + SELECT + pd.id as pdid, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, + SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as propertytax, + (SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN adjustedamount ELSE 0 END) )as exemption, + ( SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END)) as adjustment + FROM egcl_billaccountdetail as bad + INNER JOIN egcl_billdetial as bd on bd.id = bad.billdetailid + INNER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid + INNER JOIN egcl_payment as payment on pd.paymentid=payment.id + WHERE bad.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' + GROUP BY pdid + ) SELECT - pd.tenantid AS tenantid, + pd.tenantid AS tenantid, + pd.id, bill.consumercode, to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS receiptdate, payment.ifsccode AS bankname, @@ -2161,11 +2238,12 @@ ReportDefinitions: payment.transactionnumber, to_char((To_timestamp(bd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS fromdate, to_char((To_timestamp(bd.toperiod/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS todate, - to_char((To_timestamp(payment.transactiondate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, + to_char((To_timestamp(payment.transactiondate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, pd.due AS pendingamount, - to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, manualreceiptnumber as g8receiptno - FROM egcl_paymentdetail pd, egcl_payment payment, egcl_bill bill, (select bill.id as billid, min(bd.fromperiod) fromperiod, max(bd.toperiod) toperiod from egcl_billdetial bd, egcl_bill bill where bill.id=bd.billid group by bill.id) bd - where pd.paymentid=payment.id and bill.id=pd.billid and bd.billid=bill.id and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + receipt_breakup.*, + to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, manualreceiptnumber as g8receiptno + FROM egcl_paymentdetail pd, egcl_payment payment,receipt_breakup, egcl_bill bill, (select bill.id as billid, min(bd.fromperiod) fromperiod, max(bd.toperiod) toperiod from egcl_billdetial bd, egcl_bill bill where bill.id=bd.billid group by bill.id) bd + WHERE pd.paymentid=payment.id and bill.id=pd.billid and bd.billid=bill.id and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid and receipt_breakup.pdid=pd.id orderby: ORDER BY pd.receiptdate DESC; - reportName: CancelledReceiptRegister_V2 From ff98c9a445a63f9d6a3ba548e96d82c418617758 Mon Sep 17 00:00:00 2001 From: mohaarif007 <48949208+mohaarif007@users.noreply.github.com> Date: Mon, 7 Sep 2020 16:54:48 +0530 Subject: [PATCH 0194/1242] Update reports Update reports --- configs/reports/configs/pt-reports.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index b6052c1d..477411ca 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2171,11 +2171,21 @@ ReportDefinitions: type: string source: pt total: false + - name: fromdate + label: reports.pt.fromDate + type: string + source: pt + total: false + - name: todate + label: reports.pt.toDate + type: string + source: pt + total: false - name: transactiondate label: reports.pt.ddChequeTransactionDate type: string source: pt - total: false + total: false - name: bankname label: reports.pt.bankName type: string From 386370fdf4b149b94c69fd93ab6205a17c43ef36 Mon Sep 17 00:00:00 2001 From: mohaarif007 <48949208+mohaarif007@users.noreply.github.com> Date: Mon, 7 Sep 2020 18:21:42 +0530 Subject: [PATCH 0195/1242] Update ReceiptRegister_V2 reports Update ReceiptRegister_V2 reports --- configs/reports/configs/pt-reports.yml | 44 ++++++++++++++++++-------- 1 file changed, 31 insertions(+), 13 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 477411ca..1b8fc04f 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2161,6 +2161,11 @@ ReportDefinitions: type: string source: pt total: false + - name: usagetype + label: reports.pt.usagetype + type: string + source: pt + total: false - name: instrumenttype label: reports.pt.paymentMode type: string @@ -2171,26 +2176,31 @@ ReportDefinitions: type: string source: pt total: false - - name: fromdate - label: reports.pt.fromDate + - name: transactiondate + label: reports.pt.ddChequeTransactionDate type: string source: pt total: false - - name: todate - label: reports.pt.toDate + - name: bankname + label: reports.pt.bankName type: string source: pt total: false - - name: transactiondate - label: reports.pt.ddChequeTransactionDate + - name: collectorname + label: reports.pt.collectorname type: string source: pt - total: false - - name: bankname - label: reports.pt.bankName + total: false + - name: fromdate + label: reports.pt.fromDate type: string source: pt total: false + - name: todate + label: reports.pt.toDate + type: string + source: pt + total: false searchParams: - name: fromDate label: reports.pt.fromDate @@ -2211,6 +2221,12 @@ ReportDefinitions: source: pt isMandatory: false searchClause: AND payment.paymentmode = $paymentMode + - name: localityArray + label: reports.pt.zoneList + type: boundarylist + source: pt + isMandatory: false + searchClause: AND pt_addr.locality IN ($localityArray) query: | -- Use CTE to force query plan, compute & use CTE later WITH receipt_breakup AS ( @@ -2250,11 +2266,13 @@ ReportDefinitions: to_char((To_timestamp(bd.toperiod/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS todate, to_char((To_timestamp(payment.transactiondate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, pd.due AS pendingamount, + Initcap(pt.usagecategory) as usagetype, + (CASE WHEN billd.collectiontype='COUNTER' THEN eg_user.name ELSE '' END) as collectorname, receipt_breakup.*, - to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, manualreceiptnumber as g8receiptno - FROM egcl_paymentdetail pd, egcl_payment payment,receipt_breakup, egcl_bill bill, (select bill.id as billid, min(bd.fromperiod) fromperiod, max(bd.toperiod) toperiod from egcl_billdetial bd, egcl_bill bill where bill.id=bd.billid group by bill.id) bd - WHERE pd.paymentid=payment.id and bill.id=pd.billid and bd.billid=bill.id and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid and receipt_breakup.pdid=pd.id - orderby: ORDER BY pd.receiptdate DESC; + to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, manualreceiptnumber as g8receiptno + FROM egcl_paymentdetail pd, eg_user, eg_pt_property as pt, egcl_billdetial as billd, egcl_payment payment,receipt_breakup, egcl_bill bill, (select bill.id as billid, min(bd.fromperiod) fromperiod, max(bd.toperiod) toperiod from egcl_billdetial bd, egcl_bill bill where bill.id=bd.billid group by bill.id) bd + WHERE pd.paymentid=payment.id and eg_user.id = pd.createdby::INTEGER and pt.propertyid = bill.consumercode and bill.id=pd.billid and bill.id=billd.billid and bd.billid=bill.id and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid and receipt_breakup.pdid=pd.id + orerby: ORDER BY pd.receiptdate DESC; - reportName: CancelledReceiptRegister_V2 summary: Receipt Register for cancelled Receipts From 272ab8b6d4c08cdb63e66165d6c0e9a773340922 Mon Sep 17 00:00:00 2001 From: mohaarif007 <48949208+mohaarif007@users.noreply.github.com> Date: Mon, 7 Sep 2020 19:19:38 +0530 Subject: [PATCH 0196/1242] Update Reports Update Reports --- configs/reports/configs/pt-reports.yml | 101 ++++++++++++++++--------- 1 file changed, 65 insertions(+), 36 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 1b8fc04f..2c62555f 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2287,12 +2287,7 @@ ReportDefinitions: type: string source: pt total: false - - name: status - label: reports.pt.status - type: string - source: pt - total: false - - name: transactiondate + - name: receiptdate label: reports.pt.receiptDate type: string source: pt @@ -2362,7 +2357,12 @@ ReportDefinitions: type: string source: pt total: true - - name: propertyid + - name: pendingamount + label: reports.pt.pendingamount + type: string + source: pt + total: true + - name: consumercode label: reports.pt.propertyId type: string source: pt @@ -2372,16 +2372,6 @@ ReportDefinitions: type: string source: pt total: false - - name: assessmentnumber - label: reports.pt.assessmentNo - type: string - source: pt - total: false - - name: financialyear - label: reports.pt.financialYear - type: string - source: pt - total: false - name: instrumenttype label: reports.pt.paymentMode type: string @@ -2392,39 +2382,51 @@ ReportDefinitions: type: string source: pt total: false + - name: transactiondate + label: reports.pt.ddChequeTransactionDate + type: string + source: pt + total: false - name: bankname label: reports.pt.bankName type: string source: pt total: false + - name: collectorname + label: reports.pt.collectorname + type: string + source: pt + total: false + - name: fromdate + label: reports.pt.fromDate + type: string + source: pt + total: false + - name: todate + label: reports.pt.toDate + type: string + source: pt + total: false searchParams: - name: fromDate label: reports.pt.fromDate type: epoch source: pt - isMandatory: false - searchClause: AND rh.receiptdate >= $fromDate + isMandatory: true + searchClause: AND pd.receiptdate >= $fromDate - name: toDate label: reports.pt.toDate type: epoch source: pt - isMandatory: false - searchClause: AND rh.receiptdate <= $toDate + isMandatory: true + searchClause: AND pd.receiptdate <= $toDate - name: paymentMode label: Payment Mode type: singlevaluelist pattern: 'list://Cash:Cash,Online:Online,Card:Card,DD:DD,Cheque:Cheque' source: pt isMandatory: false - searchClause: AND instrumenttype = $paymentMode - - name: financialyear - label: Financial Year - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name - source: pt - wrapper: true - isMandatory: false - searchClause: AND financialyear = $financialyear + searchClause: AND payment.paymentmode = $paymentMode - name: localityArray label: reports.pt.zoneList type: boundarylist @@ -2433,8 +2435,32 @@ ReportDefinitions: searchClause: AND pt_addr.locality IN ($localityArray) query: | -- Use CTE to force query plan, compute & use CTE later + WITH receipt_breakup AS ( + SELECT + pd.id as pdid, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, + SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as propertytax, + (SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN adjustedamount ELSE 0 END) )as exemption, + ( SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END)) as adjustment + FROM egcl_billaccountdetail as bad + INNER JOIN egcl_billdetial as bd on bd.id = bad.billdetailid + INNER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid + INNER JOIN egcl_payment as payment on pd.paymentid=payment.id + WHERE bad.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' + GROUP BY pdid + ) SELECT - pd.tenantid AS tenantid, + pd.tenantid AS tenantid, + pd.id, bill.consumercode, to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS receiptdate, payment.ifsccode AS bankname, @@ -2444,12 +2470,15 @@ ReportDefinitions: payment.transactionnumber, to_char((To_timestamp(bd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS fromdate, to_char((To_timestamp(bd.toperiod/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS todate, - to_char((To_timestamp(payment.transactiondate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, + to_char((To_timestamp(payment.transactiondate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, pd.due AS pendingamount, - to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, manualreceiptnumber as g8receiptno - FROM egcl_paymentdetail pd, egcl_payment payment, egcl_bill bill, (select bill.id as billid, min(bd.fromperiod) fromperiod, max(bd.toperiod) toperiod from egcl_billdetial bd, egcl_bill bill where bill.id=bd.billid group by bill.id) bd - where pd.paymentid=payment.id and bill.id=pd.billid and bd.billid=bill.id and payment.paymentstatus = 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid - orderby: ORDER BY pd.receiptdate DESC; + Initcap(pt.usagecategory) as usagetype, + (CASE WHEN billd.collectiontype='COUNTER' THEN eg_user.name ELSE '' END) as collectorname, + receipt_breakup.*, + to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, manualreceiptnumber as g8receiptno + FROM egcl_paymentdetail pd, eg_user, eg_pt_property as pt, egcl_billdetial as billd, egcl_payment payment,receipt_breakup, egcl_bill bill, (select bill.id as billid, min(bd.fromperiod) fromperiod, max(bd.toperiod) toperiod from egcl_billdetial bd, egcl_bill bill where bill.id=bd.billid group by bill.id) bd + WHERE pd.paymentid=payment.id and eg_user.id = pd.createdby::INTEGER and pt.propertyid = bill.consumercode and bill.id=pd.billid and bill.id=billd.billid and bd.billid=bill.id and payment.paymentstatus = 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid and receipt_breakup.pdid=pd.id + orerby: ORDER BY pd.receiptdate DESC; - reportName: OldUlbWisePtCollection_V2 summary: ULB-wise PT Collection From 6d36b8a54290b3bec8269b2c84c0af719b7f8a87 Mon Sep 17 00:00:00 2001 From: mohaarif007 <48949208+mohaarif007@users.noreply.github.com> Date: Mon, 7 Sep 2020 21:20:35 +0530 Subject: [PATCH 0197/1242] Update PT Report Update PT Report --- configs/reports/configs/pt-reports.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 2c62555f..3c300ba2 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2269,7 +2269,7 @@ ReportDefinitions: Initcap(pt.usagecategory) as usagetype, (CASE WHEN billd.collectiontype='COUNTER' THEN eg_user.name ELSE '' END) as collectorname, receipt_breakup.*, - to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, manualreceiptnumber as g8receiptno + to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, manualreceiptnumber as g8receiptno FROM egcl_paymentdetail pd, eg_user, eg_pt_property as pt, egcl_billdetial as billd, egcl_payment payment,receipt_breakup, egcl_bill bill, (select bill.id as billid, min(bd.fromperiod) fromperiod, max(bd.toperiod) toperiod from egcl_billdetial bd, egcl_bill bill where bill.id=bd.billid group by bill.id) bd WHERE pd.paymentid=payment.id and eg_user.id = pd.createdby::INTEGER and pt.propertyid = bill.consumercode and bill.id=pd.billid and bill.id=billd.billid and bd.billid=bill.id and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid and receipt_breakup.pdid=pd.id orerby: ORDER BY pd.receiptdate DESC; @@ -2455,7 +2455,7 @@ ReportDefinitions: INNER JOIN egcl_billdetial as bd on bd.id = bad.billdetailid INNER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid INNER JOIN egcl_payment as payment on pd.paymentid=payment.id - WHERE bad.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' + WHERE bad.tenantid = $tenantid and payment.paymentstatus = 'CANCELLED' and pd.businessservice='PT' GROUP BY pdid ) SELECT @@ -2475,7 +2475,7 @@ ReportDefinitions: Initcap(pt.usagecategory) as usagetype, (CASE WHEN billd.collectiontype='COUNTER' THEN eg_user.name ELSE '' END) as collectorname, receipt_breakup.*, - to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, manualreceiptnumber as g8receiptno + to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, manualreceiptnumber as g8receiptno FROM egcl_paymentdetail pd, eg_user, eg_pt_property as pt, egcl_billdetial as billd, egcl_payment payment,receipt_breakup, egcl_bill bill, (select bill.id as billid, min(bd.fromperiod) fromperiod, max(bd.toperiod) toperiod from egcl_billdetial bd, egcl_bill bill where bill.id=bd.billid group by bill.id) bd WHERE pd.paymentid=payment.id and eg_user.id = pd.createdby::INTEGER and pt.propertyid = bill.consumercode and bill.id=pd.billid and bill.id=billd.billid and bd.billid=bill.id and payment.paymentstatus = 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid and receipt_breakup.pdid=pd.id orerby: ORDER BY pd.receiptdate DESC; From 9ddcbefd002683ad241662f648f122b0127f7783 Mon Sep 17 00:00:00 2001 From: mohaarif007 <48949208+mohaarif007@users.noreply.github.com> Date: Mon, 7 Sep 2020 21:27:58 +0530 Subject: [PATCH 0198/1242] Update ReceiptRegister_V2 report Update ReceiptRegister_V2 report --- configs/reports/configs/pt-reports.yml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 3c300ba2..2d30d29c 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2221,12 +2221,6 @@ ReportDefinitions: source: pt isMandatory: false searchClause: AND payment.paymentmode = $paymentMode - - name: localityArray - label: reports.pt.zoneList - type: boundarylist - source: pt - isMandatory: false - searchClause: AND pt_addr.locality IN ($localityArray) query: | -- Use CTE to force query plan, compute & use CTE later WITH receipt_breakup AS ( @@ -2427,12 +2421,6 @@ ReportDefinitions: source: pt isMandatory: false searchClause: AND payment.paymentmode = $paymentMode - - name: localityArray - label: reports.pt.zoneList - type: boundarylist - source: pt - isMandatory: false - searchClause: AND pt_addr.locality IN ($localityArray) query: | -- Use CTE to force query plan, compute & use CTE later WITH receipt_breakup AS ( From 36ba96a504ab5768d01b6be52bfa4be8f93a58e4 Mon Sep 17 00:00:00 2001 From: ramakrishnaippili Date: Mon, 7 Sep 2020 23:32:09 +0530 Subject: [PATCH 0199/1242] collected by fix --- configs/reports/configs/pt-reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 2d30d29c..35c7bd83 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -215,7 +215,7 @@ ReportDefinitions: to_char((To_timestamp(rh.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, Initcap(COALESCE(pt_detail.usagecategoryminor, pt_detail.usagecategorymajor)) as usagetype, manualreceiptnumber as g8receiptno, - (CASE WHEN collectiontype='COUNTER' THEN eg_user.name ELSE '' END) as collectorname, + eg_user.name as collectorname, pt_detail.additionaldetails->>'remarks' as "remarks" FROM egcl_receiptheader_v1 AS rh JOIN egcl_receiptinstrument_v1 AS ri ON rh.id = ri.receiptheader From 46ac0c1f963ff168a1a8377174dc4b9368a98edc Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 8 Sep 2020 14:21:23 +0530 Subject: [PATCH 0200/1242] receiptregister query update --- configs/reports/configs/pt-reports.yml | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 35c7bd83..47e09c69 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2236,23 +2236,23 @@ ReportDefinitions: SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as propertytax, (SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN adjustedamount ELSE 0 END) + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN adjustedamount ELSE 0 END) )as exemption, - ( SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) + (SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END)) as adjustment FROM egcl_billaccountdetail as bad INNER JOIN egcl_billdetial as bd on bd.id = bad.billdetailid INNER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid INNER JOIN egcl_payment as payment on pd.paymentid=payment.id - WHERE bad.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' + WHERE payment.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' GROUP BY pdid ) SELECT pd.tenantid AS tenantid, pd.id, - bill.consumercode, + pt.propertyid as consumercode, to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS receiptdate, payment.ifsccode AS bankname, - receiptnumber, + receiptnumber, payment.totalamountpaid as amount, payment.paymentmode as instrumenttype, payment.transactionnumber, @@ -2261,11 +2261,16 @@ ReportDefinitions: to_char((To_timestamp(payment.transactiondate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, pd.due AS pendingamount, Initcap(pt.usagecategory) as usagetype, - (CASE WHEN billd.collectiontype='COUNTER' THEN eg_user.name ELSE '' END) as collectorname, + eg_user.name as collectorname, receipt_breakup.*, - to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, manualreceiptnumber as g8receiptno - FROM egcl_paymentdetail pd, eg_user, eg_pt_property as pt, egcl_billdetial as billd, egcl_payment payment,receipt_breakup, egcl_bill bill, (select bill.id as billid, min(bd.fromperiod) fromperiod, max(bd.toperiod) toperiod from egcl_billdetial bd, egcl_bill bill where bill.id=bd.billid group by bill.id) bd - WHERE pd.paymentid=payment.id and eg_user.id = pd.createdby::INTEGER and pt.propertyid = bill.consumercode and bill.id=pd.billid and bill.id=billd.billid and bd.billid=bill.id and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid and receipt_breakup.pdid=pd.id + to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, + manualreceiptnumber as g8receiptno + FROM egcl_paymentdetail pd, egcl_payment payment, eg_pt_property as pt, receipt_breakup, eg_user, + (select bill.id as billid, bill.consumercode as consumercodei, min(bd.fromperiod) fromperiod, max(bd.toperiod) toperiod from egcl_billdetial bd, egcl_bill bill + where bill.id=bd.billid and bill.tenantid = 'pb.testing' group by bill.id) bd + where pd.paymentid=payment.id and bd.billid=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + and pt.propertyid = bd.consumercodei and receipt_breakup.pdid=pd.id and eg_user.id = pd.createdby::INTEGER and pt.status='ACTIVE' + --and pt.propertyid='PT-1012-978737' orerby: ORDER BY pd.receiptdate DESC; - reportName: CancelledReceiptRegister_V2 From 3bd7975de45a838f337ddf915e86097f8edcbd81 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 8 Sep 2020 14:27:25 +0530 Subject: [PATCH 0201/1242] Update pt-reports.yml --- configs/reports/configs/pt-reports.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 47e09c69..e45de5f0 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2271,7 +2271,7 @@ ReportDefinitions: where pd.paymentid=payment.id and bd.billid=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid and pt.propertyid = bd.consumercodei and receipt_breakup.pdid=pd.id and eg_user.id = pd.createdby::INTEGER and pt.status='ACTIVE' --and pt.propertyid='PT-1012-978737' - orerby: ORDER BY pd.receiptdate DESC; + orderby: ORDER BY pd.receiptdate DESC; - reportName: CancelledReceiptRegister_V2 summary: Receipt Register for cancelled Receipts @@ -2471,7 +2471,7 @@ ReportDefinitions: to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, manualreceiptnumber as g8receiptno FROM egcl_paymentdetail pd, eg_user, eg_pt_property as pt, egcl_billdetial as billd, egcl_payment payment,receipt_breakup, egcl_bill bill, (select bill.id as billid, min(bd.fromperiod) fromperiod, max(bd.toperiod) toperiod from egcl_billdetial bd, egcl_bill bill where bill.id=bd.billid group by bill.id) bd WHERE pd.paymentid=payment.id and eg_user.id = pd.createdby::INTEGER and pt.propertyid = bill.consumercode and bill.id=pd.billid and bill.id=billd.billid and bd.billid=bill.id and payment.paymentstatus = 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid and receipt_breakup.pdid=pd.id - orerby: ORDER BY pd.receiptdate DESC; + orderby: ORDER BY pd.receiptdate DESC; - reportName: OldUlbWisePtCollection_V2 summary: ULB-wise PT Collection From d29e56898c4a6d14e9f44ec50f60fb0f7580691d Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 8 Sep 2020 14:36:03 +0530 Subject: [PATCH 0202/1242] decryptionPath added --- configs/reports/configs/pt-reports.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index e45de5f0..dcb4864c 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2069,6 +2069,7 @@ ReportDefinitions: where rh.tenantid =$tenantid and pd.property not in (select property from eg_pt_propertydetail_v2 where financialyear in ('2019-20')) - reportName: ReceiptRegister_V2 + decryptionPathId: ReceiptRegister_V2 summary: Receipt Register version: 1.0.0 moduleName: rainmaker-pt From 15e7cbe21cf32e6d5c49dff80263565f1c1d8bfa Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 8 Sep 2020 15:32:18 +0530 Subject: [PATCH 0203/1242] Update pt-reports.yml --- configs/reports/configs/pt-reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index dcb4864c..12694778 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2268,7 +2268,7 @@ ReportDefinitions: manualreceiptnumber as g8receiptno FROM egcl_paymentdetail pd, egcl_payment payment, eg_pt_property as pt, receipt_breakup, eg_user, (select bill.id as billid, bill.consumercode as consumercodei, min(bd.fromperiod) fromperiod, max(bd.toperiod) toperiod from egcl_billdetial bd, egcl_bill bill - where bill.id=bd.billid and bill.tenantid = 'pb.testing' group by bill.id) bd + where bill.id=bd.billid and bill.tenantid = $tenantid group by bill.id) bd where pd.paymentid=payment.id and bd.billid=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid and pt.propertyid = bd.consumercodei and receipt_breakup.pdid=pd.id and eg_user.id = pd.createdby::INTEGER and pt.status='ACTIVE' --and pt.propertyid='PT-1012-978737' From 303b4934217e6963f7418b130fb426e359ba839a Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 8 Sep 2020 16:37:44 +0530 Subject: [PATCH 0204/1242] updated cancelled receipt register --- configs/reports/configs/pt-reports.yml | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 12694778..62c9e181 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2275,7 +2275,8 @@ ReportDefinitions: orderby: ORDER BY pd.receiptdate DESC; - reportName: CancelledReceiptRegister_V2 - summary: Receipt Register for cancelled Receipts + decryptionPathId: CancelledReceiptRegister_V2 + summary: Cancelled Receipt Register version: 1.0.0 moduleName: rainmaker-pt additionalConfig: @@ -2442,23 +2443,23 @@ ReportDefinitions: SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as propertytax, (SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN adjustedamount ELSE 0 END) + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN adjustedamount ELSE 0 END) )as exemption, - ( SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) + (SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END)) as adjustment FROM egcl_billaccountdetail as bad INNER JOIN egcl_billdetial as bd on bd.id = bad.billdetailid INNER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid INNER JOIN egcl_payment as payment on pd.paymentid=payment.id - WHERE bad.tenantid = $tenantid and payment.paymentstatus = 'CANCELLED' and pd.businessservice='PT' + WHERE payment.tenantid = $tenantid and payment.paymentstatus = 'CANCELLED' and pd.businessservice='PT' GROUP BY pdid ) SELECT pd.tenantid AS tenantid, pd.id, - bill.consumercode, + pt.propertyid as consumercode, to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS receiptdate, payment.ifsccode AS bankname, - receiptnumber, + receiptnumber, payment.totalamountpaid as amount, payment.paymentmode as instrumenttype, payment.transactionnumber, @@ -2467,11 +2468,16 @@ ReportDefinitions: to_char((To_timestamp(payment.transactiondate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, pd.due AS pendingamount, Initcap(pt.usagecategory) as usagetype, - (CASE WHEN billd.collectiontype='COUNTER' THEN eg_user.name ELSE '' END) as collectorname, + eg_user.name as collectorname, receipt_breakup.*, - to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, manualreceiptnumber as g8receiptno - FROM egcl_paymentdetail pd, eg_user, eg_pt_property as pt, egcl_billdetial as billd, egcl_payment payment,receipt_breakup, egcl_bill bill, (select bill.id as billid, min(bd.fromperiod) fromperiod, max(bd.toperiod) toperiod from egcl_billdetial bd, egcl_bill bill where bill.id=bd.billid group by bill.id) bd - WHERE pd.paymentid=payment.id and eg_user.id = pd.createdby::INTEGER and pt.propertyid = bill.consumercode and bill.id=pd.billid and bill.id=billd.billid and bd.billid=bill.id and payment.paymentstatus = 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid and receipt_breakup.pdid=pd.id + to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, + manualreceiptnumber as g8receiptno + FROM egcl_paymentdetail pd, egcl_payment payment, eg_pt_property as pt, receipt_breakup, eg_user, + (select bill.id as billid, bill.consumercode as consumercodei, min(bd.fromperiod) fromperiod, max(bd.toperiod) toperiod from egcl_billdetial bd, egcl_bill bill + where bill.id=bd.billid and bill.tenantid = $tenantid group by bill.id) bd + where pd.paymentid=payment.id and bd.billid=pd.billid and payment.paymentstatus = 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + and pt.propertyid = bd.consumercodei and receipt_breakup.pdid=pd.id and eg_user.id = pd.createdby::INTEGER and pt.status='ACTIVE' + --and pt.propertyid='PT-1012-978737' orderby: ORDER BY pd.receiptdate DESC; - reportName: OldUlbWisePtCollection_V2 From ee403444769eb4e4740e5e1400442bc8eb44a783 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 8 Sep 2020 16:48:23 +0530 Subject: [PATCH 0205/1242] paymentmode filter fixed --- configs/reports/configs/pt-reports.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 62c9e181..4ccfa7b4 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2221,7 +2221,7 @@ ReportDefinitions: pattern: 'list://Cash:Cash,Online:Online,Card:Card,DD:DD,Cheque:Cheque' source: pt isMandatory: false - searchClause: AND payment.paymentmode = $paymentMode + searchClause: AND payment.paymentmode = upper($paymentMode) query: | -- Use CTE to force query plan, compute & use CTE later WITH receipt_breakup AS ( @@ -2427,7 +2427,7 @@ ReportDefinitions: pattern: 'list://Cash:Cash,Online:Online,Card:Card,DD:DD,Cheque:Cheque' source: pt isMandatory: false - searchClause: AND payment.paymentmode = $paymentMode + searchClause: AND payment.paymentmode = upper($paymentMode) query: | -- Use CTE to force query plan, compute & use CTE later WITH receipt_breakup AS ( From 8e21f0b94dc496e797187f5d2f66525b416eadd4 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 8 Sep 2020 17:04:04 +0530 Subject: [PATCH 0206/1242] Update pt-reports.yml --- configs/reports/configs/pt-reports.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 4ccfa7b4..e52635b0 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2275,7 +2275,6 @@ ReportDefinitions: orderby: ORDER BY pd.receiptdate DESC; - reportName: CancelledReceiptRegister_V2 - decryptionPathId: CancelledReceiptRegister_V2 summary: Cancelled Receipt Register version: 1.0.0 moduleName: rainmaker-pt From 1969b0ac4b7035b07a6e3113c5a7a1405ff8e932 Mon Sep 17 00:00:00 2001 From: Kabir Date: Tue, 8 Sep 2020 17:19:22 +0530 Subject: [PATCH 0207/1242] uatv2 testing ulbwise collection and fy collection --- configs/reports/configs/pt-reports.yml | 65 +++++++++++++++++--------- 1 file changed, 44 insertions(+), 21 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index e52635b0..f16f8164 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -1944,9 +1944,13 @@ ReportDefinitions: SELECT financialyear, sum(case when usagecategorymajor='RESIDENTIAL' then amount else 0 end) as "residential", + sum(case when usagecategorymajor='RESIDENTIAL' then 1 else 0 end) as "countresidential", sum(case when usagecategorymajor='NONRESIDENTIAL' then amount else 0 end) as "nonresidential", + sum(case when usagecategorymajor='NONRESIDENTIAL' then 1 else 0 end) as "countnonresidential", sum(case when usagecategorymajor='MIXED' then amount else 0 end) as "mixed", + sum(case when usagecategorymajor='MIXED' then 1 else 0 end) as "countmixed", sum(amount) as totalamount, + count(amount) as totalcount, sum(case when instrumenttype='Online' then amount else 0 end) as "online", sum(case when instrumenttype='Cash' then amount else 0 end) as "cash", sum(case when instrumenttype='Cheque' then amount else 0 end) as "cheque", @@ -2221,7 +2225,7 @@ ReportDefinitions: pattern: 'list://Cash:Cash,Online:Online,Card:Card,DD:DD,Cheque:Cheque' source: pt isMandatory: false - searchClause: AND payment.paymentmode = upper($paymentMode) + searchClause: AND payment.paymentmode = $paymentMode query: | -- Use CTE to force query plan, compute & use CTE later WITH receipt_breakup AS ( @@ -2275,7 +2279,7 @@ ReportDefinitions: orderby: ORDER BY pd.receiptdate DESC; - reportName: CancelledReceiptRegister_V2 - summary: Cancelled Receipt Register + summary: Receipt Register for cancelled Receipts version: 1.0.0 moduleName: rainmaker-pt additionalConfig: @@ -2426,7 +2430,7 @@ ReportDefinitions: pattern: 'list://Cash:Cash,Online:Online,Card:Card,DD:DD,Cheque:Cheque' source: pt isMandatory: false - searchClause: AND payment.paymentmode = upper($paymentMode) + searchClause: AND payment.paymentmode = $paymentMode query: | -- Use CTE to force query plan, compute & use CTE later WITH receipt_breakup AS ( @@ -2442,23 +2446,23 @@ ReportDefinitions: SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as propertytax, (SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN adjustedamount ELSE 0 END) + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN adjustedamount ELSE 0 END) )as exemption, - (SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) + ( SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END)) as adjustment FROM egcl_billaccountdetail as bad INNER JOIN egcl_billdetial as bd on bd.id = bad.billdetailid INNER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid INNER JOIN egcl_payment as payment on pd.paymentid=payment.id - WHERE payment.tenantid = $tenantid and payment.paymentstatus = 'CANCELLED' and pd.businessservice='PT' + WHERE bad.tenantid = $tenantid and payment.paymentstatus = 'CANCELLED' and pd.businessservice='PT' GROUP BY pdid ) SELECT pd.tenantid AS tenantid, pd.id, - pt.propertyid as consumercode, + bill.consumercode, to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS receiptdate, payment.ifsccode AS bankname, - receiptnumber, + receiptnumber, payment.totalamountpaid as amount, payment.paymentmode as instrumenttype, payment.transactionnumber, @@ -2467,16 +2471,11 @@ ReportDefinitions: to_char((To_timestamp(payment.transactiondate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, pd.due AS pendingamount, Initcap(pt.usagecategory) as usagetype, - eg_user.name as collectorname, + (CASE WHEN billd.collectiontype='COUNTER' THEN eg_user.name ELSE '' END) as collectorname, receipt_breakup.*, - to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, - manualreceiptnumber as g8receiptno - FROM egcl_paymentdetail pd, egcl_payment payment, eg_pt_property as pt, receipt_breakup, eg_user, - (select bill.id as billid, bill.consumercode as consumercodei, min(bd.fromperiod) fromperiod, max(bd.toperiod) toperiod from egcl_billdetial bd, egcl_bill bill - where bill.id=bd.billid and bill.tenantid = $tenantid group by bill.id) bd - where pd.paymentid=payment.id and bd.billid=pd.billid and payment.paymentstatus = 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid - and pt.propertyid = bd.consumercodei and receipt_breakup.pdid=pd.id and eg_user.id = pd.createdby::INTEGER and pt.status='ACTIVE' - --and pt.propertyid='PT-1012-978737' + to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, manualreceiptnumber as g8receiptno + FROM egcl_paymentdetail pd, eg_user, eg_pt_property as pt, egcl_billdetial as billd, egcl_payment payment,receipt_breakup, egcl_bill bill, (select bill.id as billid, min(bd.fromperiod) fromperiod, max(bd.toperiod) toperiod from egcl_billdetial bd, egcl_bill bill where bill.id=bd.billid group by bill.id) bd + WHERE pd.paymentid=payment.id and eg_user.id = pd.createdby::INTEGER and pt.propertyid = bill.consumercode and bill.id=pd.billid and bill.id=billd.billid and bd.billid=bill.id and payment.paymentstatus = 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid and receipt_breakup.pdid=pd.id orderby: ORDER BY pd.receiptdate DESC; - reportName: OldUlbWisePtCollection_V2 @@ -2838,16 +2837,16 @@ ReportDefinitions: version: 1.0.0 moduleName: rainmaker-pt sourceColumns: - - name: totalassessments - label: reports.pt.totalassessments - type: string - source: pt - total: true - name: totalamountpaid label: reports.pt.totalamountpaid type: string source: pt total: true + - name: totalassessments + label: reports.pt.totalassessments + type: string + source: pt + total: true - name: totaloffline label: reports.pt.totaloffline type: string @@ -3764,21 +3763,41 @@ ReportDefinitions: type: string source: pt total: true + - name: countresidential + label: reports.pt.countresidential + type: string + source: pt + total: true - name: nonresidential label: reports.pt.nonresidential type: string source: pt total: true + - name: countnonresidential + label: reports.pt.countnonresidential + type: string + source: pt + total: true - name: mixed label: reports.pt.mixed type: string source: pt total: true + - name: countmixed + label: reports.pt.countmixed + type: string + source: pt + total: true - name: totalamount label: reports.pt.totalamount type: string source: pt total: true + - name: totalcount + label: reports.pt.totalcount + type: string + source: pt + total: true - name: online label: reports.pt.online type: string @@ -3823,9 +3842,13 @@ ReportDefinitions: SELECT financialyear, sum(case when pt_detail.usagecategorymajor='RESIDENTIAL' then pd.amountpaid else 0 end) as "residential", + sum(case when pt_detail.usagecategorymajor='RESIDENTIAL' then 1 else 0 end) as "countresidential", sum(case when pt_detail.usagecategorymajor='NONRESIDENTIAL' then pd.amountpaid else 0 end) as "nonresidential", + sum(case when pt_detail.usagecategorymajor='NONRESIDENTIAL' then 1 else 0 end) as "countnonresidential", sum(case when pt_detail.usagecategorymajor='MIXED' then pd.amountpaid else 0 end) as "mixed", + sum(case when pt_detail.usagecategorymajor='MIXED' then 1 else 0 end) as "countmixed", sum(pd.amountpaid) as totalamount, + count(pd.amountpaid) as totalcount, sum(case when payment.paymentmode='ONLINE' then pd.amountpaid else 0 end) as "online", sum(case when payment.paymentmode='CASH' then pd.amountpaid else 0 end) as "cash", sum(case when payment.paymentmode='CHEQUE' then pd.amountpaid else 0 end) as "cheque", From fe467ae13bcea9dad7232617384d152ae3239318 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Tue, 8 Sep 2020 17:23:59 +0530 Subject: [PATCH 0208/1242] Update consolidatedreceipt.json --- .../format-config/consolidatedreceipt.json | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/configs/pdf-service/format-config/consolidatedreceipt.json b/configs/pdf-service/format-config/consolidatedreceipt.json index df0979d9..73b8fccd 100644 --- a/configs/pdf-service/format-config/consolidatedreceipt.json +++ b/configs/pdf-service/format-config/consolidatedreceipt.json @@ -23,11 +23,11 @@ { "stack": [ { - "text": "{{logo-header}} {{Municipal_Corporation}}", + "text": "{{logo-header}} {{mcGrade}}", "style": "receipt-logo-header" }, { - "text": "{{serviceType}} {{payment_receipt}} (Citizen Copy)", + "text": "{{serviceType}} {{payment_receipt}} (Employee Copy)", "style": "receipt-logo-sub-header" } ], @@ -181,7 +181,7 @@ "style": "receipt-table" }, { - "text": "{{payer_contact}}", + "text": "Consumer Contact", "border": [ false, false, @@ -204,7 +204,7 @@ [ { - "text": "Paid By: ", + "text": "Address:", "border": [ true, false, @@ -214,7 +214,7 @@ "style": "receipt-table-value" }, { - "text": "{{PaidBy}}", + "text": "{{payerAddress}}", "border": [ false, false, @@ -224,7 +224,7 @@ "style": "receipt-table" }, { - "text": "Address: ", + "text": " ", "border": [ false, false, @@ -234,7 +234,7 @@ "style": "receipt-table-value" }, { - "text": "{{payerAddress}}", + "text": " ", "border": [ false, false, @@ -538,7 +538,7 @@ { "stack": [ { - "text": "{{logo-header}} {{Municipal_Corporation}}", + "text": "{{logo-header}} {{mcGrade}}", "style": "receipt-logo-header" }, { @@ -696,7 +696,7 @@ "style": "receipt-table" }, { - "text": "{{payer_contact}}", + "text": "Consumer Contact", "border": [ false, false, @@ -719,7 +719,7 @@ [ { - "text": "Paid By: ", + "text": "Address:", "border": [ true, false, @@ -728,8 +728,8 @@ ], "style": "receipt-table-value" }, - { - "text": "{{PaidBy}}", + { + "text": "{{payerAddress}}", "border": [ false, false, @@ -739,7 +739,7 @@ "style": "receipt-table" }, { - "text": "Address: ", + "text": " ", "border": [ false, false, @@ -749,7 +749,7 @@ "style": "receipt-table-value" }, { - "text": "{{payerAddress}}", + "text": " ", "border": [ false, false, From 7fa46898c3baa3232920ce4fbe259a6572b5fe88 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Tue, 8 Sep 2020 17:24:56 +0530 Subject: [PATCH 0209/1242] Update consolidatedreceipt.json --- configs/pdf-service/data-config/consolidatedreceipt.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/configs/pdf-service/data-config/consolidatedreceipt.json b/configs/pdf-service/data-config/consolidatedreceipt.json index f481dc6a..e9d0540b 100644 --- a/configs/pdf-service/data-config/consolidatedreceipt.json +++ b/configs/pdf-service/data-config/consolidatedreceipt.json @@ -503,6 +503,10 @@ "variable":"website", "value":"$.MdmsRes.tenant.tenants[0].domainUrl" }, + { + "variable":"mcGrade", + "value":"$.MdmsRes.tenant.tenants[0].city.ulbType" + }, { "variable":"email", "value":"$.MdmsRes.tenant.tenants[0].emailId" From 54a115a856620cdd8aa055f9aa8df0979b82a48f Mon Sep 17 00:00:00 2001 From: mohaarif007 <48949208+mohaarif007@users.noreply.github.com> Date: Tue, 8 Sep 2020 18:07:33 +0530 Subject: [PATCH 0210/1242] CancelledReceiptRegister_V2 update decryptionPath CancelledReceiptRegister_V2 update decryptionPath --- configs/reports/configs/pt-reports.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index f16f8164..b991e847 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2279,6 +2279,7 @@ ReportDefinitions: orderby: ORDER BY pd.receiptdate DESC; - reportName: CancelledReceiptRegister_V2 + decryptionPathId: CancelledReceiptRegister_V2 summary: Receipt Register for cancelled Receipts version: 1.0.0 moduleName: rainmaker-pt From c10ec563b0a6732f0fe321fb6def5deef2085863 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 9 Sep 2020 02:08:13 +0530 Subject: [PATCH 0211/1242] misReceiptULB_v2 fix --- configs/reports/configs/uc-reports.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/configs/reports/configs/uc-reports.yml b/configs/reports/configs/uc-reports.yml index 26576b28..229b0e2c 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -1116,15 +1116,15 @@ ReportDefinitions: -- Use CTE to force query plan, compute & use CTE later WITH receipt_breakup AS ( SELECT - egcl_billaccountdetail.billdetailid bill_id, - SUM(CASE WHEN taxheadcode LIKE '%_CGST' THEN adjustedamount ELSE 0 END) as cgst, - SUM(CASE WHEN taxheadcode LIKE '%_TAX' THEN adjustedamount ELSE 0 END) as tax, - SUM(CASE WHEN taxheadcode LIKE '%_SGST' THEN adjustedamount ELSE 0 END) as sgst, - SUM(CASE WHEN taxheadcode LIKE '%_FIELD_FEE' THEN adjustedamount ELSE 0 END) as fieldcollection - FROM egcl_billaccountdetail - INNER JOIN egcl_bill as bill on bill.id = egcl_billaccountdetail.billdetailid - WHERE businessservice not in ('PT','TL','FIRENOC') and bill.tenantid=$tenantid -- and rh.status != 'Cancelled' - GROUP BY billdetailid + billid as bill_id, + SUM(CASE WHEN taxheadcode LIKE '%_CGST' THEN taxamount ELSE 0 END) as cgst, + SUM(CASE WHEN taxheadcode LIKE '%_TAX' THEN taxamount ELSE 0 END) as tax, + SUM(CASE WHEN taxheadcode LIKE '%_SGST' THEN taxamount ELSE 0 END) as sgst, + SUM(CASE WHEN taxheadcode LIKE '%_FIELD_FEE' THEN taxamount ELSE 0 END) as fieldcollection + FROM egbs_demanddetail_v1 + inner join egbs_billdetail_v1 on egbs_billdetail_v1.demandid=egbs_demanddetail_v1.demandid + WHERE egbs_billdetail_v1.businessservice not in ('PT','TL','FIRENOC') and egbs_billdetail_v1.tenantid =$tenantid + GROUP BY egbs_demanddetail_v1.demandid,billid ) SELECT payment.tenantid as ulb, From 36617569e9776edfedce00ae105405af864925e7 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 10 Sep 2020 02:23:14 +0530 Subject: [PATCH 0212/1242] Update uc-reports.yml --- configs/reports/configs/uc-reports.yml | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/configs/reports/configs/uc-reports.yml b/configs/reports/configs/uc-reports.yml index 229b0e2c..3bc301b6 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -1116,15 +1116,16 @@ ReportDefinitions: -- Use CTE to force query plan, compute & use CTE later WITH receipt_breakup AS ( SELECT - billid as bill_id, - SUM(CASE WHEN taxheadcode LIKE '%_CGST' THEN taxamount ELSE 0 END) as cgst, - SUM(CASE WHEN taxheadcode LIKE '%_TAX' THEN taxamount ELSE 0 END) as tax, - SUM(CASE WHEN taxheadcode LIKE '%_SGST' THEN taxamount ELSE 0 END) as sgst, - SUM(CASE WHEN taxheadcode LIKE '%_FIELD_FEE' THEN taxamount ELSE 0 END) as fieldcollection - FROM egbs_demanddetail_v1 - inner join egbs_billdetail_v1 on egbs_billdetail_v1.demandid=egbs_demanddetail_v1.demandid - WHERE egbs_billdetail_v1.businessservice not in ('PT','TL','FIRENOC') and egbs_billdetail_v1.tenantid =$tenantid - GROUP BY egbs_demanddetail_v1.demandid,billid + bill.id as bill_id, + SUM(CASE WHEN taxheadcode LIKE '%_CGST' THEN adjustedamount ELSE 0 END) as cgst, + SUM(CASE WHEN taxheadcode LIKE '%_TAX' THEN adjustedamount ELSE 0 END) as tax, + SUM(CASE WHEN taxheadcode LIKE '%_SGST' THEN adjustedamount ELSE 0 END) as sgst, + SUM(CASE WHEN taxheadcode LIKE '%_FIELD_FEE' THEN adjustedamount ELSE 0 END) as fieldcollection + FROM egcl_billaccountdetail + INNER JOIN egcl_billdetial as billd on billd.id = egcl_billaccountdetail.billdetailid + INNER JOIN egcl_bill as bill on bill.id=billd.billid + WHERE billd.tenantid=$tenantid AND businessservice not in ('PT','TL','FIRENOC') + GROUP BY billdetailid,bill.id ) SELECT payment.tenantid as ulb, @@ -1144,7 +1145,7 @@ ReportDefinitions: JOIN egcl_paymentdetail as paydetail on paydetail.paymentid=payment.id JOIN receipt_breakup ON paydetail.billid = receipt_breakup.bill_id JOIN eg_user ON payment.createdby::INTEGER=eg_user.id - WHERE businessservice not in ('PT','TL','FIRENOC') and payment.tenantid=$tenantid and payment.paymentstatus != 'CANCELLED' + WHERE payment.tenantid=$tenantid AND businessservice not in ('PT','TL','FIRENOC') and payment.paymentstatus != 'CANCELLED' orderby: ORDER BY paydetail.receiptdate DESC From 58c47d4831a7276af1872d77bcd9c27c159e143a Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 10 Sep 2020 02:26:50 +0530 Subject: [PATCH 0213/1242] decryptionPathId added --- configs/reports/configs/uc-reports.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/reports/configs/uc-reports.yml b/configs/reports/configs/uc-reports.yml index 3bc301b6..63a71be9 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -976,6 +976,7 @@ ReportDefinitions: - reportName: MiscReceiptULB_v2 + decryptionPathId: MiscReceiptULB_v2 summary: Receipt Register Miscellaneous version: 1.0.0 moduleName: rainmaker-uc From 6dc049d9cee8695182815a0202c791522ad962b2 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 10 Sep 2020 03:25:52 +0530 Subject: [PATCH 0214/1242] Update consolidatedreceipt.json --- .../format-config/consolidatedreceipt.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/configs/pdf-service/format-config/consolidatedreceipt.json b/configs/pdf-service/format-config/consolidatedreceipt.json index 73b8fccd..e756f3d2 100644 --- a/configs/pdf-service/format-config/consolidatedreceipt.json +++ b/configs/pdf-service/format-config/consolidatedreceipt.json @@ -161,7 +161,7 @@ [ { - "text": "Consumer Name", + "text": "Paid By", "border": [ true, false, @@ -171,7 +171,7 @@ "style": "receipt-table-value" }, { - "text": "{{payerName}}", + "text": "{{PaidBy}}", "border": [ false, false, @@ -181,7 +181,7 @@ "style": "receipt-table" }, { - "text": "Consumer Contact", + "text": "Contact No.", "border": [ false, false, @@ -676,7 +676,7 @@ [ { - "text": "Consumer Name", + "text": "Paid By", "border": [ true, false, @@ -686,7 +686,7 @@ "style": "receipt-table-value" }, { - "text": "{{payerName}}", + "text": "{{PaidBy}}", "border": [ false, false, @@ -696,7 +696,7 @@ "style": "receipt-table" }, { - "text": "Consumer Contact", + "text": "Contact No.", "border": [ false, false, From dc5a7f1cb16e16882bdbcea4c0d9d144edc52f94 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 10 Sep 2020 03:33:14 +0530 Subject: [PATCH 0215/1242] Update uc-reports.yml --- configs/reports/configs/uc-reports.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/reports/configs/uc-reports.yml b/configs/reports/configs/uc-reports.yml index 63a71be9..3bc301b6 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -976,7 +976,6 @@ ReportDefinitions: - reportName: MiscReceiptULB_v2 - decryptionPathId: MiscReceiptULB_v2 summary: Receipt Register Miscellaneous version: 1.0.0 moduleName: rainmaker-uc From dccc266d71055106de8eb1c188836be0200009a0 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 10 Sep 2020 03:41:02 +0530 Subject: [PATCH 0216/1242] Update uc-reports.yml --- configs/reports/configs/uc-reports.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/reports/configs/uc-reports.yml b/configs/reports/configs/uc-reports.yml index 3bc301b6..63a71be9 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -976,6 +976,7 @@ ReportDefinitions: - reportName: MiscReceiptULB_v2 + decryptionPathId: MiscReceiptULB_v2 summary: Receipt Register Miscellaneous version: 1.0.0 moduleName: rainmaker-uc From 97796c3e32e877f41141bd8d1fd3440c46c80bad Mon Sep 17 00:00:00 2001 From: ramakrishnaippili-eGov Date: Thu, 10 Sep 2020 04:15:08 +0530 Subject: [PATCH 0217/1242] Update consolidatedreceipt.json showing payer name --- configs/pdf-service/data-config/consolidatedreceipt.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/pdf-service/data-config/consolidatedreceipt.json b/configs/pdf-service/data-config/consolidatedreceipt.json index e9d0540b..4d1bf029 100644 --- a/configs/pdf-service/data-config/consolidatedreceipt.json +++ b/configs/pdf-service/data-config/consolidatedreceipt.json @@ -22,7 +22,7 @@ { "variable": "PaidBy", "value": { - "path": "$.paidBy" + "path": "$.payerName" }, "localisation":{ "required":true, From 2926f59597d2274f7d0c842b59f154aac60909fe Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 10 Sep 2020 06:36:18 +0530 Subject: [PATCH 0218/1242] cancelledReceiptRegister Update --- configs/reports/configs/uc-reports.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/configs/reports/configs/uc-reports.yml b/configs/reports/configs/uc-reports.yml index 63a71be9..16787429 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -1557,15 +1557,16 @@ ReportDefinitions: -- Use CTE to force query plan, compute & use CTE later WITH receipt_breakup AS ( SELECT - egcl_billaccountdetail.billdetailid bill_id, + bill.id as bill_id, SUM(CASE WHEN taxheadcode LIKE '%_CGST' THEN adjustedamount ELSE 0 END) as cgst, SUM(CASE WHEN taxheadcode LIKE '%_TAX' THEN adjustedamount ELSE 0 END) as tax, SUM(CASE WHEN taxheadcode LIKE '%_SGST' THEN adjustedamount ELSE 0 END) as sgst, SUM(CASE WHEN taxheadcode LIKE '%_FIELD_FEE' THEN adjustedamount ELSE 0 END) as fieldcollection FROM egcl_billaccountdetail - INNER JOIN egcl_bill as bill on bill.id = egcl_billaccountdetail.billdetailid - WHERE bill.tenantid!='pb.testing' AND businessservice not in ('PT','TL','FIRENOC') and bill.tenantid=$tenantid -- and rh.status != 'Cancelled' - GROUP BY billdetailid + INNER JOIN egcl_billdetial as billd on billd.id = egcl_billaccountdetail.billdetailid + INNER JOIN egcl_bill as bill on bill.id=billd.billid + WHERE billd.tenantid=$tenantid AND businessservice not in ('PT','TL','FIRENOC') + GROUP BY billdetailid,bill.id ) SELECT payment.tenantid as ulb, @@ -1585,7 +1586,7 @@ ReportDefinitions: JOIN egcl_paymentdetail as paydetail on paydetail.paymentid=payment.id JOIN receipt_breakup ON paydetail.billid = receipt_breakup.bill_id JOIN eg_user ON payment.createdby::INTEGER=eg_user.id - WHERE payment.tenantid!='pb.testing' AND businessservice not in ('PT','TL','FIRENOC') and payment.tenantid=$tenantid and payment.paymentstatus = 'CANCELLED' + WHERE payment.tenantid=$tenantid AND businessservice not in ('PT','TL','FIRENOC') and payment.paymentstatus = 'CANCELLED' orderby: ORDER BY paydetail.receiptdate DESC From 0a6630a00e5793ac6a0bbdf35913bb95418a6f21 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 10 Sep 2020 06:59:03 +0530 Subject: [PATCH 0219/1242] businssServiceCollectionReport update --- configs/reports/configs/uc-reports.yml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/configs/reports/configs/uc-reports.yml b/configs/reports/configs/uc-reports.yml index 16787429..e2667cb6 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -1439,17 +1439,18 @@ ReportDefinitions: searchClause: AND paydetail.receiptdate <= $toDate query: | -- Use CTE to force query plan, compute & use CTE later - SELECT - paydetail.businessservice as servicetype, - count(distinct paydetail.receiptnumber) as totalreceipts, + SELECT + paydetail.businessservice, + SUM(CASE WHEN taxheadcode LIKE '%_CGST' THEN adjustedamount ELSE 0 END) as cgst, SUM(CASE WHEN taxheadcode LIKE '%_TAX' THEN adjustedamount ELSE 0 END) as tax, - SUM(CASE WHEN taxheadcode LIKE '%_CGST' THEN adjustedamount ELSE 0 END) as cgst, SUM(CASE WHEN taxheadcode LIKE '%_SGST' THEN adjustedamount ELSE 0 END) as sgst, - SUM(CASE WHEN taxheadcode LIKE '%_FIELD_FEE' THEN adjustedamount ELSE 0 END) as fieldcollection, - SUM(adjustedamount) as totalcollection - from egcl_payment payment, egcl_paymentdetail as paydetail - inner join egcl_billaccountdetail as billdetail on billdetail.billdetailid=paydetail.billid - WHERE payment.id=paydetail.paymentid AND payment.tenantid=$tenantid AND paydetail.businessservice not in ('PT','TL','FIRENOC') and payment.paymentstatus != 'CANCELLED' + SUM(CASE WHEN taxheadcode LIKE '%_FIELD_FEE' THEN adjustedamount ELSE 0 END) as fieldcollection + FROM egcl_billaccountdetail + INNER JOIN egcl_billdetial as billd on billd.id = egcl_billaccountdetail.billdetailid + INNER JOIN egcl_bill as bill on bill.id=billd.billid + INNER Join egcl_paymentdetail as paydetail ON paydetail.billid = bill.id + Inner join egcl_payment as payment on paydetail.paymentid = payment.id + WHERE billd.tenantid=$tenantid AND paydetail.businessservice not in ('PT','TL','FIRENOC') and payment.paymentStatus!='CANCELLED' groupby: GROUP BY paydetail.businessservice orderby: ORDER BY paydetail.businessservice From 7e425c2aae80ada3d8d412134cdd4ae7a10a4c38 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Thu, 10 Sep 2020 16:22:43 +0530 Subject: [PATCH 0220/1242] Update property-receipt.json --- .../data-config/property-receipt.json | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index 25d97bd4..6b29291e 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -157,6 +157,18 @@ "value": { "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_TIME_PENALTY')].adjustedAmount" } + }, + { + "variable": "adhocPenalty", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_ADHOC_PENALTY')].adjustedAmount" + } + }, + { + "variable": "adhocRebate", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_ADHOC_REBATE')].adjustedAmount" + } }, { "variable": "Rebate", @@ -468,6 +480,10 @@ "variable":"website", "value":"$.MdmsRes.tenant.tenants[0].domainUrl" }, + { + "variable":"mcGrade", + "value":"$.MdmsRes.tenant.tenants[0].city.ulbType" + }, { "variable":"email", "value":"$.MdmsRes.tenant.tenants[0].emailId" @@ -536,7 +552,7 @@ }, { "variable": "var_owners", - "value":"$.Properties[0].owners.*", + "value":"$.Properties[0].owners[?(@.active== true && @.status== 'ACTIVE')]", "type":"array", "format":{ "type":"string", @@ -553,7 +569,7 @@ }, { "variable": "var_floors", - "value":"$.Properties[0].units.*", + "value":"$.Properties[0].units[?(@.active== true)]", "type":"array", "format":{ "type":"string", From 383200417f85e4c94befc679bcb7d6b87b8ea224 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Thu, 10 Sep 2020 16:23:40 +0530 Subject: [PATCH 0221/1242] Update consolidatedreceipt.json --- .../pdf-service/format-config/consolidatedreceipt.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/pdf-service/format-config/consolidatedreceipt.json b/configs/pdf-service/format-config/consolidatedreceipt.json index e756f3d2..b0ff96e7 100644 --- a/configs/pdf-service/format-config/consolidatedreceipt.json +++ b/configs/pdf-service/format-config/consolidatedreceipt.json @@ -161,7 +161,7 @@ [ { - "text": "Paid By", + "text": "Consumer Name", "border": [ true, false, @@ -171,7 +171,7 @@ "style": "receipt-table-value" }, { - "text": "{{PaidBy}}", + "text": "{{payerName}}", "border": [ false, false, @@ -676,7 +676,7 @@ [ { - "text": "Paid By", + "text": "Consumer Name", "border": [ true, false, @@ -686,7 +686,7 @@ "style": "receipt-table-value" }, { - "text": "{{PaidBy}}", + "text": "{{payerName}}", "border": [ false, false, From c9ed23225bca98230fd138844d6794e1bdea671f Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Thu, 10 Sep 2020 16:32:17 +0530 Subject: [PATCH 0222/1242] Update consolidatedreceipt.json --- configs/pdf-service/data-config/consolidatedreceipt.json | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/configs/pdf-service/data-config/consolidatedreceipt.json b/configs/pdf-service/data-config/consolidatedreceipt.json index 4d1bf029..26c1eade 100644 --- a/configs/pdf-service/data-config/consolidatedreceipt.json +++ b/configs/pdf-service/data-config/consolidatedreceipt.json @@ -22,13 +22,8 @@ { "variable": "PaidBy", "value": { - "path": "$.payerName" - }, - "localisation":{ - "required":true, - "prefix":null, - "module":"rainmaker-common" - } + "path": "$.paidBy" + } }, { "variable": "chequeDD", From df38ba56de1f4d82a6520eb2a8c555c1569984ce Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Thu, 10 Sep 2020 16:32:40 +0530 Subject: [PATCH 0223/1242] Update consolidatedreceipt.json --- .../pdf-service/format-config/consolidatedreceipt.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/pdf-service/format-config/consolidatedreceipt.json b/configs/pdf-service/format-config/consolidatedreceipt.json index b0ff96e7..68474098 100644 --- a/configs/pdf-service/format-config/consolidatedreceipt.json +++ b/configs/pdf-service/format-config/consolidatedreceipt.json @@ -224,7 +224,7 @@ "style": "receipt-table" }, { - "text": " ", + "text": "Paid By", "border": [ false, false, @@ -234,7 +234,7 @@ "style": "receipt-table-value" }, { - "text": " ", + "text": "{{PaidBy}}", "border": [ false, false, @@ -739,7 +739,7 @@ "style": "receipt-table" }, { - "text": " ", + "text": "Paid By", "border": [ false, false, @@ -749,7 +749,7 @@ "style": "receipt-table-value" }, { - "text": " ", + "text": "{{PaidBy}}", "border": [ false, false, From b241d2e5592f8ff97c0a6657c20fb64aada1821f Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Thu, 10 Sep 2020 17:10:25 +0530 Subject: [PATCH 0224/1242] Update property-receipt.json --- .../format-config/property-receipt.json | 444 +++++++++--------- 1 file changed, 235 insertions(+), 209 deletions(-) diff --git a/configs/pdf-service/format-config/property-receipt.json b/configs/pdf-service/format-config/property-receipt.json index 58746df3..3e7da112 100644 --- a/configs/pdf-service/format-config/property-receipt.json +++ b/configs/pdf-service/format-config/property-receipt.json @@ -23,7 +23,7 @@ { "stack": [ { - "text": "{{logo-header}} {{Municipal_Corporation}}", + "text": "{{logo-header}} {{mcGrade}}", "style": "receipt-logo-header" }, { @@ -42,16 +42,24 @@ { "stack": [ { - "text": "{{address}}" + "text": "{{address}}", + "style": "receipt-logo-sub-header" + }, { - "text": "{{phoneNumber}}" + "text": "{{phoneNumber}}", + "style": "receipt-logo-sub-header" + }, { - "text": "{{website}}" + "text": "{{website}}", + "style": "receipt-logo-sub-header" + }, { - "text": "{{email}}" + "text": "{{email}}", "style": "receipt-logo-sub-header" + + } ], "alignment": "right", @@ -72,8 +80,190 @@ "text":"PROPERTY INFORMATION", "style":"block-head" }, + { + "style": "next-noc-table", + "table": { + "widths": [ + "25%", + "25%", + "25%", + "25%" + ], + "body": [ + [ + { + "text": "{{receipt_no}}.", + "border": [ + true, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{receiptNo}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{consumer_id}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{consumerID}}", + "border": [ + false, + true, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "assessment_year", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{assessmentYear1}}-{{assessmentYear2}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Existing Property Id", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{oldPropertyId}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{payment_date}}", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{paymentDate}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{payer_name}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerName}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{payer_contact}}", + "border": [ + true, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerContact}}", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table" + }, + { + "text" : "Father/Husband Name: ", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text" : "{{fatherHusbandName}}", + "border": [ + false, + false, + true, + true + ], + "style": "receipt-table" + } + ] + ] + }, + "layout": {} + }, { - "style": "next-noc-table", + "style": "noc-table", "table": { "widths": [ "25%", @@ -86,9 +276,9 @@ { "text": "House/Door No. : ", "border": [ - true, true, false, + false, false ], "style": "receipt-table-value" @@ -97,7 +287,7 @@ "text": "{{doorNo}}", "border": [ false, - true, + false, false, false ], @@ -107,7 +297,7 @@ "text": "Building/Colony Name: ", "border": [ false, - true, + false, false, false ], @@ -117,7 +307,7 @@ "text": "{{buildingName}}", "border": [ false, - true, + false, true, false ], @@ -212,188 +402,7 @@ }, "layout": {} }, - { - "style": "noc-table", - "table": { - "widths": [ - "25%", - "25%", - "25%", - "25%" - ], - "body": [ - [ - { - "text": "{{receipt_no}}.", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{receiptNo}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "{{consumer_id}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{consumerID}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": "assessment_year", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{assessmentYear1}}-{{assessmentYear2}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "Existing Property Id", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{oldPropertyId}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": "{{payment_date}}", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{paymentDate}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "{{payer_name}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{payerName}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": "{{payer_contact}}", - "border": [ - true, - false, - false, - true - ], - "style": "receipt-table-value" - }, - { - "text": "{{payerContact}}", - "border": [ - false, - false, - false, - true - ], - "style": "receipt-table" - }, - { - "text" : "Father/Husband Name: ", - "border": [ - false, - false, - false, - true - ], - "style": "receipt-table-value" - }, - { - "text" : "{{fatherHusbandName}}", - "border": [ - false, - false, - true, - true - ], - "style": "receipt-table" - } - ] - ] - }, - "layout": {} - }, + { "text":"PAYMENT INFORMATION", "style":"block-head" @@ -588,7 +597,8 @@ "style": "next-noc-table", "table": { "widths": [ - "*","*","*","*","*","*","*","*","*","*" + + "9%","8%","7%","7%","8%","7%","10%","10%","8%","8%","8%","*" ], "body": [ @@ -624,6 +634,14 @@ { "text": "Special Category Exemption", "style": "amounts" + }, + { + "text": "Adhoc Penalty", + "style": "amounts" + }, + { + "text": "Adhoc Rebate", + "style": "amounts" }, { "text": "Round Off", @@ -668,6 +686,14 @@ { "text": "{{SpecialCategoryExemption}}", "style": "amounts" + }, + { + "text": "{{adhocPenalty}}", + "style": "amounts" + }, + { + "text": "{{adhocRebate}}", + "style": "amounts" }, { "text": "{{RoundOff}}", @@ -710,10 +736,10 @@ "style": "next-noc-table", "table": { "widths": [ + "15%", "*", - "*", - "*", - "*" + "20%", + "20%" ], "body": [ @@ -731,7 +757,7 @@ "style": "receipt-table-value" }, { - "text": "Built Area (Sq. Yard) / Total Annual Rent", + "text": "Built Area (Sq. Feet) / Total Annual Rent", "style": "receipt-table-value" } ], @@ -796,7 +822,7 @@ "{{no_signature}}", "Assessment and payment is subjected to verification/scruitiny by competetive authority", "Please deposit the property tx dues for earlier years also, Ignore if already paid", - "Citizen for online payments please refer to the link http://lgpunjab.gov.in/cms/pay-property-tax.php" + "Citizen for online payments please refer to the link https://mseva.lgpunjab.gov.in/" ] } ] @@ -812,7 +838,7 @@ ] }, "block-head": { - "fontSize": 8, + "fontSize": 7, "bold": true, "letterSpacing": 0.74, "margin": [ @@ -823,7 +849,7 @@ ] }, "pt-reciept-citizen-table": { - "fontSize": 8, + "fontSize": 7, "color": "#484848" }, "receipt-assess-table-header": { @@ -833,7 +859,7 @@ }, "receipt-logo-header": { "color": "#000000", - "fontSize": 10, + "fontSize": 8.5, "bold": true, "letterSpacing": 0.74, "margin": [ @@ -845,11 +871,11 @@ }, "receipt-logo-sub-header": { "color": "#000000", - "fontSize": 10, + "fontSize": 8.5, "letterSpacing": 0.6 }, "noc-table": { - "fontSize": 8, + "fontSize": 7, "color": "#000000", "margin": [ -25, @@ -859,7 +885,7 @@ ] }, "next-noc-table": { - "fontSize": 8, + "fontSize": 7, "color": "#000000", "margin": [ -25, @@ -871,7 +897,7 @@ "receipt-table-value": { "color": "#000000", "bold": true, - "fontSize": 8, + "fontSize": 7, "fontWeight": 500, "margin": [ 8, @@ -883,7 +909,7 @@ "receipt-table": { "color": "#000000", "bold": false, - "fontSize": 8, + "fontSize": 7, "fontWeight": 400, "margin": [ 0, @@ -893,7 +919,7 @@ ] }, "receipt-approver": { - "fontSize": 8, + "fontSize": 7, "bold": true, "margin": [ -27, @@ -904,7 +930,7 @@ "color": "#484848" }, "no-signature": { - "fontSize": 8, + "fontSize": 7, "margin": [ -27, 20, @@ -939,4 +965,4 @@ } } } -} \ No newline at end of file +} From c2797875e47c28b9633a5b227d9dc9b27ffddb4d Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Thu, 10 Sep 2020 17:22:23 +0530 Subject: [PATCH 0225/1242] Update property-receipt.json --- configs/pdf-service/data-config/property-receipt.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index 6b29291e..29084f38 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -16,7 +16,7 @@ { "variable": "payerName", "value": { - "path": "$.payerName" + "path": "$.paidBy" } }, { From 1a4e604d476765807f2f3da330dd0cd9842f8576 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Thu, 10 Sep 2020 17:35:33 +0530 Subject: [PATCH 0226/1242] Update property-receipt.json --- configs/pdf-service/format-config/property-receipt.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/pdf-service/format-config/property-receipt.json b/configs/pdf-service/format-config/property-receipt.json index 3e7da112..fc6b1e72 100644 --- a/configs/pdf-service/format-config/property-receipt.json +++ b/configs/pdf-service/format-config/property-receipt.json @@ -238,7 +238,7 @@ "style": "receipt-table" }, { - "text" : "Father/Husband Name: ", + "text" : " ", "border": [ false, false, @@ -248,7 +248,7 @@ "style": "receipt-table-value" }, { - "text" : "{{fatherHusbandName}}", + "text" : " ", "border": [ false, false, From d63e52984f8ff09750a229a18b05009cbab8cafb Mon Sep 17 00:00:00 2001 From: narendrabandhamneni-wt-egov Date: Wed, 16 Sep 2020 15:06:07 +0530 Subject: [PATCH 0227/1242] payment issue fix --- rainmaker-custom-service/index.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/rainmaker-custom-service/index.js b/rainmaker-custom-service/index.js index deb7fac0..6e42249a 100644 --- a/rainmaker-custom-service/index.js +++ b/rainmaker-custom-service/index.js @@ -953,6 +953,9 @@ router.post('/open/punjab-pt/payu/confirm', asyncMiddleware((async function (req let return_data = req.body; original_callback = req.query.original_callback; delete req.query['original_callback']; + let txnid = req.query.eg_pg_txnid + delete req.query['eg_pg_txnid']; + new_query_params = Object.assign({}, return_data, req.query); redirect_url = url.format( { @@ -960,7 +963,8 @@ router.post('/open/punjab-pt/payu/confirm', asyncMiddleware((async function (req query: new_query_params } ) - + //ensuring the first query param is eg_pg_txnid + redirect_url = redirect_url.replace('?', '?'+ 'eg_pg_txnid=' + txnid +'&') res.redirect(redirect_url); }))) From 6967df5a1e278d2462fcdd7e033df3b1c6a1a2cd Mon Sep 17 00:00:00 2001 From: Kabir Date: Wed, 23 Sep 2020 11:29:43 +0530 Subject: [PATCH 0228/1242] uatv2 reports urban rural firenocc --- .../reports/configs/rainmaker-noc-reports.yml | 302 +----------------- 1 file changed, 5 insertions(+), 297 deletions(-) diff --git a/configs/reports/configs/rainmaker-noc-reports.yml b/configs/reports/configs/rainmaker-noc-reports.yml index eb8a37c7..182ff8ac 100644 --- a/configs/reports/configs/rainmaker-noc-reports.yml +++ b/configs/reports/configs/rainmaker-noc-reports.yml @@ -150,7 +150,7 @@ ReportDefinitions: orderby: ORDER BY channel - - reportName: CollectionReport_V2 + - reportName: UrbanCollectionReport_V2 summary: Collection Report version: 1.0.0 moduleName: rainmaker-noc @@ -229,7 +229,7 @@ ReportDefinitions: groupby: GROUP BY (localisedmessage) orderby: ORDER BY localisedmessage - - reportName: ApplicationStatusReport_V2 + - reportName: UrbanApplicationStatusReport_V2 summary: Application Status Report version: 1.0.0 moduleName: rainmaker-noc @@ -278,7 +278,7 @@ ReportDefinitions: groupby: GROUP BY application_status orderby: ORDER BY application_status - - reportName: ChannelsReport_V2 + - reportName: UrbanChannelsReport_V2 summary: Channels Report version: 1.0.0 moduleName: rainmaker-noc @@ -321,191 +321,7 @@ ReportDefinitions: searchClause: AND fnoc.tenantId IN ($ulb) query: select channel, count (*) number_of_applications,round((count (*)::decimal/(select count(*) from eg_fn_firenoc fnoc inner join eg_fn_firenocdetail fdet on fdet.firenocuuid=fnoc.uuid))*100,2) percentage from eg_fn_firenoc fnoc inner join eg_fn_firenocdetail fdet on fdet.firenocuuid=fnoc.uuid groupby: GROUP BY channel - orderby: ORDER BY channel - - - reportName: UrbanApplicationStatusReport_V2 - decryptionPathId: UrbanApplicationStatusReport_V2 - summary: Urban Application Status Report - version: 1.0.0 - moduleName: rainmaker-noc - sourceColumns: - - name: application_status - label: reports.noc.applicationstatusreport.appStatus - type: string - source: rainmaker-noc - total: false - - name: number_of_application - label: reports.noc.applicationstatusreport.noofapplications - type: string - source: rainmaker-noc - total: true - - name: firestation - label: reports.noc.applicationstatusreport.firestation - type: string - source: rainmaker-noc - total: false - searchParams: - - name: fromDate - label: reports.noc.applicationstatusreport.fromDate - type: epoch - source: noc - isMandatory: false - searchClause: AND applicationdate >= $fromDate - - name: toDate - label: reports.noc.applicationstatusreport.toDate - type: epoch - source: noc - isMandatory: false - searchClause: AND applicationdate <= $toDate - - name: city - label: reports.noc.applicationstatusreport.city - type: multivaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name - source: noc - wrapper: true - isMandatory: false - searchClause: AND fad.subdistrict IN ($city) - query: select COALESCE(message,state) application_status,(select COALESCE((select message from message where code=concat('FIRENOC_FIRESTATIONS_',UPPER(REGEXP_REPLACE(firestationid,'\..*',''))) limit 1), firestationid)) as firestation,count(*) number_of_application from eg_fn_firenoc fnoc inner join eg_fn_firenocdetail fdet on fdet.firenocuuid=fnoc.uuid inner join (SELECT DISTINCT ON (businessid) * FROM eg_wf_processinstance_v2 ORDER BY businessid,createdtime desc) pinstance on pinstance.businessid=fdet.applicationnumber inner join eg_wf_state_v2 wfstate on pinstance.status=wfstate.uuid left outer join message on code=concat('WF_FIRENOC_',UPPER(state)) and module='rainmaker-noc' inner join eg_fn_address as fad on fad.firenocdetailsuuid=fdet.uuid where 1=1 - groupby: GROUP BY (application_status,firestation) - orderby: ORDER BY application_status - - - - reportName: UrbanChannelsReport_V2 - decryptionPathId: UrbanChannelsReport_V2 - summary: Urban Channels Report - version: 1.0.0 - moduleName: rainmaker-noc - sourceColumns: - - name: channel - label: reports.noc.channelsreport.channel - type: string - source: rainmaker-noc - total: false - - name: number_of_applications - label: reports.noc.channelsreport.applicationNo - type: string - source: rainmaker-noc - total: true - - name: percentage - label: reports.noc.channelsreport.percentage - type: string - source: rainmaker-noc - total: false - - name: firestation - label: reports.noc.channelsreport.firestation - type: string - source: rainmaker-noc - total: false - searchParams: - - name: fromDate - label: reports.noc.channelsreport.fromDate - type: epoch - source: noc - isMandatory: false - searchClause: AND applicationdate >= $fromDate - - name: toDate - label: reports.noc.channelsreport.toDate - type: epoch - source: noc - isMandatory: false - searchClause: AND applicationdate <= $toDate - - name: city - label: reports.noc.channelsreport.city - type: multivaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name - source: noc - wrapper: true - isMandatory: false - searchClause: AND fad.subdistrict IN ($city) - query: - select - channel, - (select COALESCE((select message from message where code=concat('FIRENOC_FIRESTATIONS_',UPPER(REGEXP_REPLACE(firestationid,'\..*',''))) limit 1), firestationid)) as firestation, - count (*) number_of_applications, - round((count (*)::decimal/(select count(*) from eg_fn_firenoc fnoc - inner join eg_fn_firenocdetail fdet on fdet.firenocuuid=fnoc.uuid))*100,2) percentage from eg_fn_firenoc fnoc - inner join eg_fn_firenocdetail fdet on fdet.firenocuuid=fnoc.uuid - inner join eg_fn_address as fad on fad.firenocdetailsuuid=fdet.uuid - groupby: GROUP BY (channel,firestation) orderby: ORDER BY channel - - - - reportName: DrillDownRuralSubdistrictCollectionReport_V2 - decryptionPathId: DrillDownRuralSubdistrictCollectionReport_V2 - summary: Rural Subdistrict Collection Report - version: 1.0.0 - moduleName: rainmaker-noc - sourceColumns: - - name: firestation - label: reports.noc.collectionreport.firestation - type: string - source: rainmaker-noc - total: false - - name: localisedmessage - label: reports.noc.collectionreport.usagetype - type: string - source: rainmaker-noc - total: false - - name: transactionNumber - label: reports.noc.collectionreport.transactionNumber - type: string - source: rainmaker-noc - total: true - - name: fees_counter - label: reports.noc.collectionreport.fees_counter - type: string - source: rainmaker-noc - total: true - - name: fees_online - label: reports.noc.collectionreport.fees_online - type: string - source: rainmaker-noc - total: true - searchParams: - - name: fromDate - label: reports.noc.collectionreport.fromDate - type: epoch - source: pt - isMandatory: false - searchClause: AND receiptdate >= $fromDate - - name: toDate - label: reports.noc.collectionreport.toDate - type: epoch - source: pt - isMandatory: false - searchClause: AND receiptdate <= $toDate - - name: channel - label: reports.noc.collectionreport.channel - type: multivaluelist - pattern: 'list://COUNTER:ULB Counter,ONLINE:Online by Citizen' - source: common - isMandatory: false - searchClause: AND collectiontype IN ($channel) - - name: paymentMode - label: reports.noc.collectionreport.paymentMode - type: singlevaluelist - pattern: 'list://Cash:Cash,Online:Online,Card:Card,DD:DD,Cheque:Cheque' - source: common - isMandatory: false - searchClause: AND instrumenttype = $paymentMode - - name: district - label: reports.noc.collectionreport.district - type: multivaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.city.districtName|$.MdmsRes.tenant.tenants.*.city.districtName - source: noc - wrapper: true - isMandatory: false - searchClause: AND fad.city IN ($district) - - name: subdistrict - label: reports.noc.collectionreport.subdistrict - type: multivaluelist - source: noc - wrapper: true - isMandatory: false - searchClause: AND fad.subdistrict IN ($subdistrict) - query: select COALESCE(message,usagetype) localisedmessage, COUNT(*) as transactionNumber,fad.subdistrict as subdistrict,(select COALESCE((select message from message where code=concat('FIRENOC_FIRESTATIONS_',UPPER(REGEXP_REPLACE(firestationid,'\..*',''))) limit 1), firestationid)) as firestation, sum(case when collectiontype='COUNTER' then ins.amount else 0 end) fees_counter, sum(case when collectiontype='ONLINE' then ins.amount else 0 end) fees_online from eg_fn_firenoc fnoc inner join eg_fn_firenocdetail fdet on fdet.firenocuuid=fnoc.uuid inner join egcl_receiptheader_v1 rhead on rhead.consumercode=fdet.applicationnumber inner join eg_fn_buidlings build on build.firenocdetailsuuid=fdet.uuid inner join egcl_receiptinstrument_v1 recins on recins.receiptheader=rhead.id inner join egcl_instrumentheader_v1 ins on recins.instrumentheader=ins.id left outer join message on code=concat('FIRENOC_BUILDINGTYPE_',UPPER(REGEXP_REPLACE(usagetype,'\..*',''))) inner join eg_fn_address as fad on fad.firenocdetailsuuid=fdet.uuid and module='rainmaker-noc' where 1=1 - groupby: GROUP BY (localisedmessage,subdistrict,firestation) - orderby: ORDER BY localisedmessage - reportName: RuralDistrictWiseCollectionReport_V2 decryptionPathId: RuralDistrictWiseCollectionReport_V2 @@ -630,59 +446,7 @@ ReportDefinitions: searchClause: AND fad.city IN ($district) query: select fad.subdistrict as subdistrict,(select COALESCE((select message from message where code=concat('FIRENOC_FIRESTATIONS_',UPPER(REGEXP_REPLACE(firestationid,'\..*',''))) limit 1), firestationid)) as firestation,COALESCE(message,state) application_status,count(*) number_of_application from eg_fn_firenoc fnoc inner join eg_fn_firenocdetail fdet on fdet.firenocuuid=fnoc.uuid inner join (SELECT DISTINCT ON (businessid) * FROM eg_wf_processinstance_v2 ORDER BY businessid,createdtime desc) pinstance on pinstance.businessid=fdet.applicationnumber inner join eg_wf_state_v2 wfstate on pinstance.status=wfstate.uuid left outer join message on code=concat('WF_FIRENOC_',UPPER(state)) and module='rainmaker-noc' inner join eg_fn_address as fad on fad.firenocdetailsuuid=fdet.uuid where 1=1 AND fad.subdistrict NOT LIKE 'pb.%' groupby: GROUP BY (application_status,subdistrict,firestation) - orderby: ORDER BY application_status - - - reportName: DrillDownRuralWiseApplicationStatusReport_V2 - summary: Rural Wise Application Status Report - version: 1.0.0 - moduleName: rainmaker-noc - sourceColumns: - - name: firestation - label: reports.noc.collectionreport.firestation - type: string - source: rainmaker-noc - total: false - - name: application_status - label: reports.noc.applicationstatusreport.appStatus - type: string - source: rainmaker-noc - total: false - - name: number_of_application - label: reports.noc.applicationstatusreport.noofapplications - type: string - source: rainmaker-noc - total: true - searchParams: - - name: fromDate - label: reports.noc.applicationstatusreport.fromDate - type: epoch - source: noc - isMandatory: false - searchClause: AND applicationdate >= $fromDate - - name: toDate - label: reports.noc.applicationstatusreport.toDate - type: epoch - source: noc - isMandatory: false - searchClause: AND applicationdate <= $toDate - - name: district - label: reports.noc.applicationstatusreport.district - type: multivaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.city.districtName|$.MdmsRes.tenant.tenants.*.city.districtName - source: noc - wrapper: true - isMandatory: false - searchClause: AND fad.city IN ($district) - - name: subdistrict - label: reports.noc.applicationstatusreport.subdistrict - type: multivaluelist - source: noc - wrapper: true - isMandatory: false - searchClause: AND fad.subdistrict IN ($subdistrict) - query: (select COALESCE((select message from message where code=concat('FIRENOC_FIRESTATIONS_',UPPER(REGEXP_REPLACE(firestationid,'\..*',''))) limit 1), firestationid)) as firestation, fad.subdistrict as subdistrict,COALESCE(message,state) application_status,count(*) number_of_application from eg_fn_firenoc fnoc inner join eg_fn_firenocdetail fdet on fdet.firenocuuid=fnoc.uuid inner join (SELECT DISTINCT ON (businessid) * FROM eg_wf_processinstance_v2 ORDER BY businessid,createdtime desc) pinstance on pinstance.businessid=fdet.applicationnumber inner join eg_wf_state_v2 wfstate on pinstance.status=wfstate.uuid left outer join message on code=concat('WF_FIRENOC_',UPPER(state)) and module='rainmaker-noc' inner join eg_fn_address as fad on fad.firenocdetailsuuid=fdet.uuid where 1=1 - groupby: GROUP BY (application_status,subdistrict,firestation) - orderby: ORDER BY application_status + orderby: ORDER BY application_status - reportName: RuralDistrictWiseChannelsReport_V2 summary: Rural District Wise Channels Report @@ -740,60 +504,4 @@ ReportDefinitions: groupby: GROUP BY (channel,subdistrict,firestation) orderby: ORDER BY channel - - reportName: DrillDownRuralWiseChannelReport_V2 - summary: Rural Wise Channel Report - version: 1.0.0 - moduleName: rainmaker-noc - sourceColumns: - - name: firestation - label: reports.noc.collectionreport.firestation - type: string - source: rainmaker-noc - total: false - - name: channel - label: reports.noc.channelsreport.channel - type: string - source: rainmaker-noc - total: false - - name: number_of_applications - label: reports.noc.channelsreport.applicationNo - type: string - source: rainmaker-noc - total: true - - name: percentage - label: reports.noc.channelsreport.percentage - type: string - source: rainmaker-noc - total: false - searchParams: - - name: fromDate - label: reports.noc.channelsreport.fromDate - type: epoch - source: noc - isMandatory: false - searchClause: AND applicationdate >= $fromDate - - name: toDate - label: reports.noc.channelsreport.toDate - type: epoch - source: noc - isMandatory: false - searchClause: AND applicationdate <= $toDate - - name: district - label: reports.noc.channelsreport.district - type: multivaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.city.districtCode|$.MdmsRes.tenant.tenants.*.city.districtName - source: noc - wrapper: true - isMandatory: false - searchClause: AND fad.city IN ($district) - - name: subdistrict - label: reports.noc.channelsreport.subdistrict - type: multivaluelist - source: noc - wrapper: true - isMandatory: false - searchClause: AND fad.subdistrict IN ($subdistrict) - query: select channel,fad.subdistrict as subdistrict,(select COALESCE((select message from message where code=concat('FIRENOC_FIRESTATIONS_',UPPER(REGEXP_REPLACE(firestationid,'\..*',''))) limit 1), firestationid)) as firestation, count (*) number_of_applications,round((count (*)::decimal/(select count(*) from eg_fn_firenoc fnoc inner join eg_fn_firenocdetail fdet on fdet.firenocuuid=fnoc.uuid))*100,2) percentage from eg_fn_firenoc fnoc inner join eg_fn_firenocdetail fdet on fdet.firenocuuid=fnoc.uuid - inner join eg_fn_address as fad on fad.firenocdetailsuuid=fdet.uuid - groupby: GROUP BY (channel,subdistrict,firestation) - orderby: ORDER BY channel + \ No newline at end of file From dc56bffe0a60579cfb3feaa0b88cba3a0db1759a Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 24 Sep 2020 11:44:01 +0530 Subject: [PATCH 0229/1242] paymentmode search disabled --- .../reports/configs/rainmaker-noc-reports.yml | 20 +++---------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/configs/reports/configs/rainmaker-noc-reports.yml b/configs/reports/configs/rainmaker-noc-reports.yml index 182ff8ac..d4658f81 100644 --- a/configs/reports/configs/rainmaker-noc-reports.yml +++ b/configs/reports/configs/rainmaker-noc-reports.yml @@ -194,14 +194,7 @@ ReportDefinitions: pattern: 'list://COUNTER:ULB Counter,ONLINE:Online by Citizen' source: common isMandatory: false - searchClause: AND collectiontype IN ($channel) - - name: paymentMode - label: reports.noc.collectionreport.paymentMode - type: singlevaluelist - pattern: 'list://Cash:Cash,Online:Online,Card:Card,DD:DD,Cheque:Cheque' - source: common - isMandatory: false - searchClause: AND instrumenttype = $paymentMode + searchClause: AND collectiontype IN ($channel) - name: ulb label: reports.noc.collectionreport.ulb type: multivaluelist @@ -378,14 +371,7 @@ ReportDefinitions: pattern: 'list://COUNTER:ULB Counter,ONLINE:Online by Citizen' source: common isMandatory: false - searchClause: AND collectiontype IN ($channel) - - name: paymentMode - label: reports.noc.collectionreport.paymentMode - type: singlevaluelist - pattern: 'list://Cash:Cash,Online:Online,Card:Card,DD:DD,Cheque:Cheque' - source: common - isMandatory: false - searchClause: AND instrumenttype = $paymentMode + searchClause: AND collectiontype IN ($channel) - name: district label: reports.noc.collectionreport.district type: multivaluelist @@ -504,4 +490,4 @@ ReportDefinitions: groupby: GROUP BY (channel,subdistrict,firestation) orderby: ORDER BY channel - \ No newline at end of file + From 1c4a119d4bd442005dae3fa00f7cd073b0c45386 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Thu, 24 Sep 2020 16:41:51 +0530 Subject: [PATCH 0230/1242] Update tlrenewalcertificate.json --- .../data-config/tlrenewalcertificate.json | 267 +++++++++++++++++- 1 file changed, 261 insertions(+), 6 deletions(-) diff --git a/configs/pdf-service/data-config/tlrenewalcertificate.json b/configs/pdf-service/data-config/tlrenewalcertificate.json index 82cf2439..a647b834 100644 --- a/configs/pdf-service/data-config/tlrenewalcertificate.json +++ b/configs/pdf-service/data-config/tlrenewalcertificate.json @@ -55,9 +55,51 @@ { "variable": "tradeAddress", "value": { - "path": "$.tradeLicenseDetail.address.locality.name" + "path": "$.tradeLicenseDetail.address.locality.code" } + }, + { + "variable": "doorNo", + "value": { + "path": "$.tradeLicenseDetail.address.doorNo" + } + }, + { + "variable": "structureType", + "value": { + "path": "$.tradeLicenseDetail.structureType" }, + "localisation":{ + "required":true, + "prefix": "COMMON_MASTERS_STRUCTURETYPE", + "module": "rainmaker-tl", + "isCategoryRequired":true + } + }, + { + "variable": "structureSubType", + "value": { + "path": "$.tradeLicenseDetail.structureType" + }, + "localisation":{ + "required":true, + "prefix": "COMMON_MASTERS_STRUCTURETYPE", + "module": "rainmaker-tl", + "isSubTypeRequired":true + } + }, + { + "variable": "streetName", + "value": { + "path": "$.tradeLicenseDetail.address.street" + } + }, + { + "variable": "buildingName", + "value": { + "path": "$.tradeLicenseDetail.address.buildingName" + } + }, { "variable": "city", "value": { @@ -80,6 +122,94 @@ "module": "rainmaker-tl" } }, + + { + "variable": "variable13", + "value":{ + "path":"$.tradeLicenseDetail.tradeUnits.*" + }, + "type":"array", + "format":{ + "type":"string", + "scema":[ + { + "variable": "tradeCat", + "value":"tradeType", + "localisation":{ + "required":true, + "prefix": "TRADELICENSE_TRADETYPE", + "module": "rainmaker-tl", + "isCategoryRequired":true + } + }, + { + "variable": "tradetyp", + "value":"tradeType", + "localisation":{ + "required":true, + "prefix": "TRADELICENSE_TRADETYPE", + "module": "rainmaker-tl", + "isMainTypeRequired":true + } + }, + { + "variable": "tradesub", + "value":"tradeType", + "localisation":{ + "required":true, + "prefix": "TRADELICENSE_TRADETYPE", + "module": "rainmaker-tl", + "isSubTypeRequired":true + } + }, + { + "variable": "UOM-measurement", + "value":"uom" + }, + { + "variable":"uomValue", + "value":"uomValue" + } + ] + } + }, + { + "variable": "variable14", + "value":{ + "path":"$.tradeLicenseDetail.accessories.*" + }, + "type":"array", + "format":{ + "type":"string", + "scema":[ + { + "variable": "accesoryType", + "value": "accessoryCategory", + "localisation":{ + "required":true, + "prefix": "TRADELICENSE_ACCESSORIESCATEGORY", + "module": "rainmaker-tl" + } + }, + { + "variable": "accessoryUomValue", + "value": "uomValue" + }, + + { + "variable": "uom", + "value": "uom" + }, + { + "variable": "accessoryCount", + "value": "count" + } + + ] + } + + }, + { "variable": "accessories", "value": { @@ -87,9 +217,10 @@ }, "localisation":{ "required":true, - "prefix": "TL", + "prefix": "TRADELICENSE_ACCESSORIESCATEGORY", "module": "rainmaker-tl" } + }, { "variable": "licenseIssueDate", @@ -160,6 +291,102 @@ "module":"rainmaker-common" } }, + { + "variable": "trade_category", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_TRADE_CATEGORY" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "trade_type", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_TRADE_TYPE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "trade_sub_type", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_TRADE_SUB_TYPE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "uom_measurement", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_UOM_MEASUREMENT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "accesory_type", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_ACCESORY_TYPE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "uom_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_UOM" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "uom_value", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_UOM_VALUE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "accessory_count", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_ACCESORY_COUNT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, { "variable": "corporation_email", "value": { @@ -199,7 +426,7 @@ { "variable": "application_no", "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_RENEWAL_APPLICATION_NO" + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_APPLICATION_NO" }, "type": "label", "localisation":{ @@ -363,20 +590,36 @@ "prefix": null, "module":"rainmaker-common" } + }, + { + "variable": "disclaimer", + "value": { + "path": "TL_CERTIFICATE_DISCLAIMER" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } } ] }, { "externalAPI": [ { - "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", - "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", "apiRequest": null, "responseMapping":[ { "variable":"ulb-address", "value":"$.MdmsRes.tenant.tenants[0].address" }, + { + "variable":"mcGrade", + "value":"$.MdmsRes.tenant.tenants[0].city.ulbType" + }, { "variable":"corporationContact", "value":"$.MdmsRes.tenant.tenants[0].contactNumber" @@ -398,7 +641,7 @@ "responseMapping":[ { "variable":"tradeLicenseFee", - "value":"$.Payments[0].totalDue" + "value":"$.Payments[0].totalAmountPaid" }, { "variable":"recieptNo", @@ -407,6 +650,18 @@ ] }, + { + "path": "http://egov-location:8080/egov-location/location/v11/boundarys/_search", + "queryParam": "tenantId=$.tenantId,hierarchyTypeCode=REVENUE,boundaryType=Locality,codes=$.tradeLicenseDetail.address.locality.code", + "apiRequest": null, + "responseMapping":[ + { + "variable":"localityNName", + "value":"$.TenantBoundary[0].boundary[0].name" + } + ] + }, + { "path": "http://egov-filestore:8080/filestore/v1/files/url", "queryParam": "tenantId=pb,fileStoreIds=$.tradeLicenseDetail.applicationDocuments[?(@.documentType== 'OWNERPHOTO')].fileStoreId", From 1c738bb00d1cc9a3d5a7688e0e61b6546ae7c771 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Thu, 24 Sep 2020 16:43:04 +0530 Subject: [PATCH 0231/1242] Update tlrenewalcertificate.json --- .../format-config/tlrenewalcertificate.json | 492 +++++++++++------- 1 file changed, 308 insertions(+), 184 deletions(-) diff --git a/configs/pdf-service/format-config/tlrenewalcertificate.json b/configs/pdf-service/format-config/tlrenewalcertificate.json index a26a8cf9..1c74c077 100644 --- a/configs/pdf-service/format-config/tlrenewalcertificate.json +++ b/configs/pdf-service/format-config/tlrenewalcertificate.json @@ -4,33 +4,38 @@ "defaultStyle": { "font": "Cambay" }, - "content": [ + + "content": [ { "style":"noc-head", "table":{ "widths":[ "*" ], - "body":[ - [ - { - "image": "{{userpic}}", + "body":[ + [ + + { + "style":"noc-head", + "table": + { + "widths":["30%","*"], + "body": + [ + [ + { + "image": "{{logoImage}}", "width": 70, "height": 82, "alignment": "center", - "margin": [ - 0, - 10, - 0, - 10 - ] - } - ], - [ - { - "stack": [ + "margin": [30, 40, 0,10 ] + }, + + { + "stack": + [ { - "text":"{{municipal_corportaion}}", + "text":"{{mcGrade}},{{city}}", "style":"receipt-logo-header" }, { @@ -38,72 +43,39 @@ "style":"receipt-logo-sub-header" }, { - "style": "noc-head", - "table": { - "widths": [ - "*", - "*" - ], - "body": [ - [ - { - "text": "{{corporation_contact}} : {{corporationContact}} ", - "style": "receipt-sub-address-sub-header" + "text": "{{corporation_contact}} : {{corporationContact}} ", + "style": "receipt-logo-sub-header" - } - ] - ] - }, - "layout": "noBorders" - }, - { - "style": "noc-head", - "table": { - "widths": [ - "*", - "*" - ], - "body": [ - [ - { + }, + { "text": "{{corporation_website}} : {{corporationWebsite}}", - "style": "receipt-sub-website-sub-header" + "style": "receipt-logo-sub-header" - } - ] - ] - }, - "layout": "noBorders" - }, - { - "style": "noc-head", - "table": { - "widths": [ - "*", - "*" - ], - "body": [ - [ - { + }, + { "text": "{{corporation_email}} : {{corporationEmail}}", - "style": "receipt-sub-email-sub-header" + "style": "receipt-logo-sub-header" } - ] - ] - }, - "layout": "noBorders" - } - ], - "alignment":"left", - "margin":[ - 0, - 10, - 0, - 0 - ] - } + ], + "alignment":"left", + "margin":[0,40,0,0] + + + + + + } + ] + ] + }, + "layout":"noBorders" + } + ], + + + [ { "stack": [ @@ -243,94 +215,73 @@ }, "layout":"noBorders" }, - { - "style":"noc-head", - "table":{ - "widths":[ - "35%", - "65%" - ], - "body":[ - [ - { - "text":"{{trade_owner_contact}}", - "style":"receipt-sub-logo-sub-header" - }, - { - "text":"{{tradeOwnerContact}}", - "style":"receipt-sub-logo-sub-header" - } - ] - ] - }, - "layout":"noBorders" - }, - { - "style":"noc-head", - "table":{ - "widths":[ - "35%", - "65%" - ], - "body":[ - [ - { - "text":"{{trade_address}}", - "style":"receipt-sub-logo-sub-header" - }, - { - "text":"{{tradeAddress}}, {{city}}", - "style":"receipt-sub-logo-sub-header" - } - ] - ] - }, - "layout":"noBorders" - }, - { - "style":"noc-head", - "table":{ - "widths":[ - "35%", - "65%" - ], - "body":[ - [ - { - "text":"{{trade_type}}", - "style":"receipt-sub-logo-sub-header" - }, - { - "text":"{{tradeType}}", - "style":"receipt-sub-logo-sub-header" - } - ] - ] - }, - "layout":"noBorders" - }, + { - "style":"noc-head", - "table":{ - "widths":[ - "35%", - "65%" - ], - "body":[ - [ - { - "text":"{{accessories_label}}", - "style":"receipt-sub-logo-sub-header" - }, - { - "text":"{{accessories}}", - "style":"receipt-sub-logo-sub-header" - } - ] - ] - }, - "layout":"noBorders" - }, + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":"{{trade_owner_contact}}", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":"{{tradeOwnerContact}}", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + }, + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":"{{trade_address}}", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":"{{doorNo}},{{streetName}},{{buildingName}},{{localityNName}}, {{city}}", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + }, + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":"Structure Type/Sub Type", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":"{{structureType}}, {{structureSubType}}", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + }, { "style":"noc-head", "table":{ @@ -375,6 +326,7 @@ }, "layout":"noBorders" }, + { "style":"noc-head", "table":{ @@ -396,7 +348,101 @@ ] }, "layout":"noBorders" - } + }, + { + "style":"noc-head2", + "table":{ + "widths": [ + "*", + "*", + "*" + ], + "body": + [ + [ + { + "text": "{{trade_category}}", + "style": "receipt-table-value2" + }, + { + "text": "{{trade_type}}", + "style": "receipt-table-value" + }, + { + "text": "{{trade_sub_type}}", + "style": "receipt-table-value" + } + ], + "{{#variable13}}[ { \"text\":\"{{tradeCat}}\", \"border\":[ true, false, true, true ], \"style\": \"receipt-table3\" }, { \"text\":\"{{tradetyp}}\", \"border\":[ false, false, true, true ], \"style\": \"receipt-table2\" }, { \"text\":\"{{tradesub}}\", \"border\":[ false, false, true,true ], \"style\": \"receipt-table2\" }]{{/variable13}}" ] + }, + "border":[ + true, + false, + true, + false + ] + }, + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":" ", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":" ", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + }, + { + "style":"noc-head2", + "table": { + "widths": [ + "55%", + "15%", + "15%", + "15%" + ], + "body": + [ + [ + { + "text": "{{accesory_type}}", + "style": "receipt-table-value2" + }, + { + "text": "{{uom_label}}", + "style": "receipt-table-value" + }, + { + "text": "{{uom_value}}", + "style": "receipt-table-value" + }, + { + "text": "{{accessory_count}}", + "style": "receipt-table-value" + } + ], + "{{#variable14}}[ { \"text\":\"{{accesoryType}}\", \"border\":[ true, false, true,true ], \"style\": \"receipt-table3\" }, { \"text\":\"{{uom}}\", \"border\":[ false, false, true, true], \"style\": \"receipt-table2\" }, { \"text\":\"{{accessoryUomValue}}\", \"border\":[ false, false,true, true], \"style\": \"receipt-table2\" }, { \"text\":\"{{accessoryCount}}\", \"border\":[ false, false, true,true ], \"style\": \"receipt-table2\" } ]{{/variable14}}" ] + } , + "border":[ + true, + false, + true, + false + ] + } + ], "alignment":"left", "margin":[ @@ -421,7 +467,7 @@ "bold": true }, { - "text":" {{approvedBy}}", + "text":"Auto Approved", "bold": false } ], @@ -430,16 +476,34 @@ { "text":[ { - "text":"{{commissioner}}", + "text":"Authorised Signatory", "bold": true } ], "alignment":"right" } ] + }, + { + "text":"Disclaimer", + "style":"disclaimer" + }, + { + "ol": + [ + "This license is not the proof of ownership.", + "This Trade License is issued under rule 10.39 of the Municipal Account Code 2017 with condition that the applicant shall obtain relevant NOC from concerned departments like Punjab Pollution control board / Fire Ofce /Health Department/ Excise Department/Deputy Commissioner (under Explosive Act) whichever applicable.", + "The Municipal Council/Corporation reserves the right to cancel this Trade License for Breach of any condition in accordance with law.", + "This is a computer generated document, hence requires no signature.", + "The grant of Trade License is not approval to any violation of building by laws, town planning scheme." + ], + "style":"disclaimer" + } ], - "styles": { + + + "styles": { "noc-head": { "margin": [ -30, @@ -448,69 +512,117 @@ -2 ] }, + + "noc-head2": { + "margin": [ + 22, + 2,0,0 + ] + }, + "receipt-table-value": { + "color": "#000000", + "fontSize": 9, + "margin": [ + 0, + 2, + 0, + 0 + ] + }, + "receipt-table2": { + "color": "#000000", + "fontSize": 9, + + "margin": [ + 0, + 2, + 0, + 0 + ] + }, + "receipt-table-value2": { + "color": "#000000", + "fontSize": 9, + "margin": [ + 0, + 2, + 0, + 0 + ] + }, + "receipt-table3": { + "color": "#000000", + "fontSize": 9, + "margin": [ + 0, + 2, + 0, + 0 + ] + }, "receipt-approver": { "color": "#000000", - "fontSize": 14, + "fontSize": 12, "letterSpacing": 0.6, "alignment": "center", "margin": [ -10, - 50, + 30, 0, 1 ] }, "receipt-logo-header": { "color": "#000000", - "fontSize": 20, + "fontSize": 17, "letterSpacing": 0.74, "alignment": "center", "margin": [ 0, 0, 0, - 5 + 0 ] }, "receipt-sub-logo-header": { "color": "#000000", - "fontSize": 18, + "fontSize": 16, "letterSpacing": 0.74, "alignment": "center", "margin": [ 0, - 5, + -10, 0, - 5 + 0 ] }, "receipt-logo-sub-header": { "color": "#484848", - "fontSize": 14, + "fontSize": 10, "letterSpacing": 0.6, "alignment": "center", "margin": [ 0, - 5, + -5, 0, 0 ] }, "receipt-sub-logo-sub-header": { "color": "#484848", - "fontSize": 14, + "fontSize": 12, "letterSpacing": 0.6, "alignment": "left", "margin": [ 50, - 40, + 30, 0, 0 ] }, "receipt-sub-address-sub-header": { "color": "#484848", - "fontSize": 14, + "fontSize": 12, "letterSpacing": 0.1, "alignment": "right", "margin": [ @@ -522,7 +634,7 @@ }, "receipt-sub-website-sub-header": { "color": "#484848", - "fontSize": 14, + "fontSize": 12, "letterSpacing": 0.1, "alignment": "right", "margin": [ @@ -534,16 +646,28 @@ }, "receipt-sub-email-sub-header": { "color": "#484848", - "fontSize": 14, + "fontSize": 12, "letterSpacing": 0.1, "alignment": "right", "margin": [ - 50, + 20, 30, -110, 0 ] - } - } + }, + "disclaimer": + { + "fontSize":"10", + "margin": [ + 2, + 3, + 0, + 0 + ] + } + } + + } } From 00c254cedf9548fec3314718f5633dc2f469a9ff Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 25 Sep 2020 11:11:02 +0530 Subject: [PATCH 0232/1242] yml syntax update --- .../reports/configs/rainmaker-noc-reports.yml | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/configs/reports/configs/rainmaker-noc-reports.yml b/configs/reports/configs/rainmaker-noc-reports.yml index d4658f81..f27363dc 100644 --- a/configs/reports/configs/rainmaker-noc-reports.yml +++ b/configs/reports/configs/rainmaker-noc-reports.yml @@ -203,7 +203,7 @@ ReportDefinitions: wrapper: true isMandatory: false searchClause: AND fnoc.tenantId IN ($ulb) - query: + query: | Select COALESCE(message,usagetype) localisedmessage, COUNT(*) as transactionNumber, @@ -258,7 +258,7 @@ ReportDefinitions: wrapper: true isMandatory: false searchClause: AND fnoc.tenantId IN ($ulb) - query: + query: | select COALESCE(message,state) application_status, count(*) number_of_application @@ -485,8 +485,16 @@ ReportDefinitions: wrapper: true isMandatory: false searchClause: AND fad.city IN ($district) - query: select channel,fad.subdistrict as subdistrict,(select COALESCE((select message from message where code=concat('FIRENOC_FIRESTATIONS_',UPPER(REGEXP_REPLACE(firestationid,'\..*',''))) limit 1), firestationid)) as firestation, count (*) number_of_applications,round((count (*)::decimal/(select count(*) from eg_fn_firenoc fnoc inner join eg_fn_firenocdetail fdet on fdet.firenocuuid=fnoc.uuid))*100,2) percentage from eg_fn_firenoc fnoc inner join eg_fn_firenocdetail fdet on fdet.firenocuuid=fnoc.uuid - inner join eg_fn_address as fad on fad.firenocdetailsuuid=fdet.uuid Where 1=1 AND fad.subdistrict NOT LIKE 'pb.%' + query: | + select + channel, + fad.subdistrict as subdistrict, + (select COALESCE((select message from message where code=concat('FIRENOC_FIRESTATIONS_',UPPER(REGEXP_REPLACE(firestationid,'\..*',''))) limit 1), firestationid)) as firestation, + count (*) number_of_applications, + round((count (*)::decimal/(select count(*) from eg_fn_firenoc fnoc inner join eg_fn_firenocdetail fdet on fdet.firenocuuid=fnoc.uuid))*100,2) percentage + from eg_fn_firenoc fnoc + inner join eg_fn_firenocdetail fdet on fdet.firenocuuid=fnoc.uuid + inner join eg_fn_address as fad on fad.firenocdetailsuuid=fdet.uuid Where 1=1 AND fad.subdistrict NOT LIKE 'pb.%' groupby: GROUP BY (channel,subdistrict,firestation) orderby: ORDER BY channel From 01b9c52b96288ea4e45149293c8bb53538659e75 Mon Sep 17 00:00:00 2001 From: Kabir Date: Fri, 25 Sep 2020 13:14:51 +0530 Subject: [PATCH 0233/1242] uatv2 reports firnocc correction --- .../reports/configs/rainmaker-noc-reports.yml | 30 +++++++++++++++---- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/configs/reports/configs/rainmaker-noc-reports.yml b/configs/reports/configs/rainmaker-noc-reports.yml index f27363dc..6984fece 100644 --- a/configs/reports/configs/rainmaker-noc-reports.yml +++ b/configs/reports/configs/rainmaker-noc-reports.yml @@ -219,6 +219,7 @@ ReportDefinitions: INNER JOIN egcl_payment on egcl_payment.id=egcl_paymentdetail.paymentid LEFT OUTER JOIN message on code=concat('FIRENOC_BUILDINGTYPE_',UPPER(REGEXP_REPLACE(usagetype,'\..*',''))) INNER JOIN eg_fn_address as fad on fad.firenocdetailsuuid=fdet.uuid and module='rainmaker-noc' where 1=1 + and egcl_payment.tenantid!='pb.testing' and fad.areatype!='Rural' groupby: GROUP BY (localisedmessage) orderby: ORDER BY localisedmessage @@ -271,7 +272,8 @@ ReportDefinitions: groupby: GROUP BY application_status orderby: ORDER BY application_status - - reportName: UrbanChannelsReport_V2 + + - reportName: UrbanChannelsReport_V2 summary: Channels Report version: 1.0.0 moduleName: rainmaker-noc @@ -337,8 +339,8 @@ ReportDefinitions: type: string source: rainmaker-noc total: false - - name: transactionNumber - label: reports.noc.collectionreport.transactionNumber + - name: transactionnumber + label: reports.noc.collectionreport.transactionnumber type: string source: rainmaker-noc total: true @@ -380,9 +382,27 @@ ReportDefinitions: wrapper: true isMandatory: false searchClause: AND fad.city IN ($district) - query: select COALESCE(message,usagetype) localisedmessage, COUNT(*) as transactionNumber,fad.subdistrict as subdistrict,(select COALESCE((select message from message where code=concat('FIRENOC_FIRESTATIONS_',UPPER(REGEXP_REPLACE(firestationid,'\..*',''))) limit 1), firestationid)) as firestation, sum(case when collectiontype='COUNTER' then ins.amount else 0 end) fees_counter, sum(case when collectiontype='ONLINE' then ins.amount else 0 end) fees_online from eg_fn_firenoc fnoc inner join eg_fn_firenocdetail fdet on fdet.firenocuuid=fnoc.uuid inner join egcl_receiptheader_v1 rhead on rhead.consumercode=fdet.applicationnumber inner join eg_fn_buidlings build on build.firenocdetailsuuid=fdet.uuid inner join egcl_receiptinstrument_v1 recins on recins.receiptheader=rhead.id inner join egcl_instrumentheader_v1 ins on recins.instrumentheader=ins.id left outer join message on code=concat('FIRENOC_BUILDINGTYPE_',UPPER(REGEXP_REPLACE(usagetype,'\..*',''))) inner join eg_fn_address as fad on fad.firenocdetailsuuid=fdet.uuid and module='rainmaker-noc' where 1=1 AND fad.subdistrict NOT LIKE 'pb.%' - groupby: GROUP BY (localisedmessage,subdistrict,firestation) + query: | + Select + COALESCE(message,usagetype) localisedmessage, + COUNT(*) as transactionNumber, + fad.subdistrict, + --(select COALESCE((select message from message where code=concat('FIRENOC_FIRESTATIONS_',UPPER(REGEXP_REPLACE(firestationid,'\..*',''))) limit 1), firestationid)) as firestation, + SUM (CASE WHEN egcl_payment.paymentmode='CASH' THEN egcl_payment.totalamountpaid ELSE 0 END) as fees_counter, + SUM (CASE WHEN egcl_payment.paymentmode='ONLINE' THEN egcl_payment.totalamountpaid ELSE 0 END) AS fees_online + from eg_fn_firenoc AS fnoc + INNER JOIN eg_fn_firenocdetail fdet on fdet.firenocuuid=fnoc.uuid + INNER JOIN egcl_bill as bill on bill.consumercode=fdet.applicationnumber + INNER JOIN egcl_billdetial as billd on billd.billid=bill.id + INNER JOIN eg_fn_buidlings build on build.firenocdetailsuuid=fdet.uuid + INNER JOIN egcl_paymentdetail ON (egcl_paymentdetail.billid=bill.id AND egcl_paymentdetail.businessservice='FIRENOC') + INNER JOIN egcl_payment on egcl_payment.id=egcl_paymentdetail.paymentid + LEFT OUTER JOIN message on code=concat('FIRENOC_BUILDINGTYPE_',UPPER(REGEXP_REPLACE(usagetype,'\..*',''))) + INNER JOIN eg_fn_address as fad on fad.firenocdetailsuuid=fdet.uuid and module='rainmaker-noc' where 1=1 + and egcl_payment.tenantid!='pb.testing' and fad.areatype!='Urban' + groupby: GROUP BY (localisedmessage),fad.subdistrict, orderby: ORDER BY localisedmessage + - reportName: RuralDistrictWiseApplicationStatusReport_V2 summary: Rural District Wise Application Status Report From 64672ed33d4ecaa107ba6941b713b32eae0e0511 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 25 Sep 2020 13:20:12 +0530 Subject: [PATCH 0234/1242] yml syntax corrected --- configs/reports/configs/rainmaker-noc-reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/reports/configs/rainmaker-noc-reports.yml b/configs/reports/configs/rainmaker-noc-reports.yml index 6984fece..50ff054a 100644 --- a/configs/reports/configs/rainmaker-noc-reports.yml +++ b/configs/reports/configs/rainmaker-noc-reports.yml @@ -273,7 +273,7 @@ ReportDefinitions: orderby: ORDER BY application_status - - reportName: UrbanChannelsReport_V2 + - reportName: UrbanChannelsReport_V2 summary: Channels Report version: 1.0.0 moduleName: rainmaker-noc From 6bdc69390f0495803573a37151edfe0a4be31a2d Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 28 Sep 2020 09:49:52 +0530 Subject: [PATCH 0235/1242] sql syntax update --- configs/reports/configs/rainmaker-noc-reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/reports/configs/rainmaker-noc-reports.yml b/configs/reports/configs/rainmaker-noc-reports.yml index 50ff054a..443b8f8d 100644 --- a/configs/reports/configs/rainmaker-noc-reports.yml +++ b/configs/reports/configs/rainmaker-noc-reports.yml @@ -400,7 +400,7 @@ ReportDefinitions: LEFT OUTER JOIN message on code=concat('FIRENOC_BUILDINGTYPE_',UPPER(REGEXP_REPLACE(usagetype,'\..*',''))) INNER JOIN eg_fn_address as fad on fad.firenocdetailsuuid=fdet.uuid and module='rainmaker-noc' where 1=1 and egcl_payment.tenantid!='pb.testing' and fad.areatype!='Urban' - groupby: GROUP BY (localisedmessage),fad.subdistrict, + groupby: GROUP BY (localisedmessage),fad.subdistrict orderby: ORDER BY localisedmessage From 1f2b1e78094eb170f9fc31376ffe309fe0b2a07e Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 28 Sep 2020 11:56:26 +0530 Subject: [PATCH 0236/1242] Rural correction transcationnumber syntax error --- configs/reports/configs/rainmaker-noc-reports.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/rainmaker-noc-reports.yml b/configs/reports/configs/rainmaker-noc-reports.yml index 443b8f8d..c38a0255 100644 --- a/configs/reports/configs/rainmaker-noc-reports.yml +++ b/configs/reports/configs/rainmaker-noc-reports.yml @@ -339,8 +339,8 @@ ReportDefinitions: type: string source: rainmaker-noc total: false - - name: transactionnumber - label: reports.noc.collectionreport.transactionnumber + - name: transactionNumber + label: reports.noc.collectionreport.transactionNumber type: string source: rainmaker-noc total: true From 8ff0990fa515bc756e9d8dc0bcfab184aaa64881 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Mon, 28 Sep 2020 20:06:23 +0530 Subject: [PATCH 0237/1242] Added arrears in amount table Pi-8252 --- .../data-config/property-receipt.json | 47 ++++++++++++++++++- 1 file changed, 46 insertions(+), 1 deletion(-) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index 29084f38..0aa3e35a 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -158,6 +158,47 @@ "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_TIME_PENALTY')].adjustedAmount" } }, + { + "variable": "Arrears1", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[1].amountPaid" + } + }, { + "variable": "Arrears2", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[2].amountPaid" + } + }, { + "variable": "Arrears3", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[3].amountPaid" + } + }, { + "variable": "Arrears4", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[4].amountPaid" + } + }, { + "variable": "Arrears5", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[5].amountPaid" + } + }, { + "variable": "Arrears6", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[6].amountPaid" + } + }, { + "variable": "Arrears7", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[7].amountPaid" + } + }, { + "variable": "Arrears8", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[8].amountPaid" + } + }, { "variable": "adhocPenalty", "value": { @@ -458,7 +499,11 @@ { "variable": "pendingAmount", "formula": "{{dueAmount}}-{{paidAmount}}" - } + }, + { + "variable": "Arrears", + "formula": "{{Arrears1}}+{{Arrears2}}+{{Arrears3}}+{{Arrears4}}+{{Arrears5}}+{{Arrears6}}+{{Arrears7}}+{{Arrears8}}" + } ] }, { From 4f8de1381ab34d10e2c1b1253e03ec283b67b2a2 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Mon, 28 Sep 2020 20:08:51 +0530 Subject: [PATCH 0238/1242] added arrears in PT amount table Pi-8252 --- configs/pdf-service/format-config/property-receipt.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/configs/pdf-service/format-config/property-receipt.json b/configs/pdf-service/format-config/property-receipt.json index fc6b1e72..0a8ee3c3 100644 --- a/configs/pdf-service/format-config/property-receipt.json +++ b/configs/pdf-service/format-config/property-receipt.json @@ -598,7 +598,7 @@ "table": { "widths": [ - "9%","8%","7%","7%","8%","7%","10%","10%","8%","8%","8%","*" + "9%","8%","7%","7%","8%","7%","10%","10%","8%","8%","7%","8%","*" ], "body": [ @@ -642,6 +642,9 @@ { "text": "Adhoc Rebate", "style": "amounts" + },{ + "text": "Arrears", + "style": "amounts" }, { "text": "Round Off", @@ -694,6 +697,9 @@ { "text": "{{adhocRebate}}", "style": "amounts" + },{ + "text": "{{Arrears}}", + "style": "amounts" }, { "text": "{{RoundOff}}", From cf7bdf3e3525112152814acb1267709afab29b12 Mon Sep 17 00:00:00 2001 From: Kabir Date: Tue, 29 Sep 2020 12:15:17 +0530 Subject: [PATCH 0239/1242] uatv2 rural collection report decriptionpath --- configs/reports/configs/rainmaker-noc-reports.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/configs/reports/configs/rainmaker-noc-reports.yml b/configs/reports/configs/rainmaker-noc-reports.yml index c38a0255..fce5d3d7 100644 --- a/configs/reports/configs/rainmaker-noc-reports.yml +++ b/configs/reports/configs/rainmaker-noc-reports.yml @@ -318,8 +318,7 @@ ReportDefinitions: groupby: GROUP BY channel orderby: ORDER BY channel - - reportName: RuralDistrictWiseCollectionReport_V2 - decryptionPathId: RuralDistrictWiseCollectionReport_V2 + - reportName: RuralDistrictWiseCollectionReport_V2 summary: Rural District Wise Collection Report version: 1.0.0 moduleName: rainmaker-noc @@ -358,13 +357,13 @@ ReportDefinitions: - name: fromDate label: reports.noc.collectionreport.fromDate type: epoch - source: pt + source: noc isMandatory: false searchClause: AND receiptdate >= $fromDate - name: toDate label: reports.noc.collectionreport.toDate type: epoch - source: pt + source: noc isMandatory: false searchClause: AND receiptdate <= $toDate - name: channel From 9a3cb0fd3effe4be09328620113623a725a524e4 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Tue, 29 Sep 2020 12:39:26 +0530 Subject: [PATCH 0240/1242] Adjusted width of payable amount table in PT --- configs/pdf-service/format-config/property-receipt.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/pdf-service/format-config/property-receipt.json b/configs/pdf-service/format-config/property-receipt.json index 0a8ee3c3..c117a3bb 100644 --- a/configs/pdf-service/format-config/property-receipt.json +++ b/configs/pdf-service/format-config/property-receipt.json @@ -598,7 +598,7 @@ "table": { "widths": [ - "9%","8%","7%","7%","8%","7%","10%","10%","8%","8%","7%","8%","*" + "9%","8%","6%","7%","7%","7%","9%","9%","8%","8%","7%","7%","*" ], "body": [ From ce6c8ed2c7ef70daaed7a07f38599e453e637841 Mon Sep 17 00:00:00 2001 From: Kabir Date: Tue, 29 Sep 2020 14:34:39 +0530 Subject: [PATCH 0241/1242] uatv2 testing receipt regsiter firenocc --- .../reports/configs/rainmaker-noc-reports.yml | 142 +++++++++++++++++- 1 file changed, 141 insertions(+), 1 deletion(-) diff --git a/configs/reports/configs/rainmaker-noc-reports.yml b/configs/reports/configs/rainmaker-noc-reports.yml index fce5d3d7..444bd9e6 100644 --- a/configs/reports/configs/rainmaker-noc-reports.yml +++ b/configs/reports/configs/rainmaker-noc-reports.yml @@ -517,4 +517,144 @@ ReportDefinitions: groupby: GROUP BY (channel,subdistrict,firestation) orderby: ORDER BY channel - + - reportName: ReceiptRegisterFirenocReport_V2 + summary: Receipt Register FireNoc + version: 1.0.0 + moduleName: rainmaker-noc + additionalConfig: + print: + pdfPageSize: "A3" + sourceColumns: + - name: ulb + label: reports.noc.ulb + type: string + source: rainmaker-noc + total: false + - name: receiptnumber + label: reports.noc.receiptnumber + type: string + source: rainmaker-noc + total: false + - name: receiptdate + label: reports.noc.receiptdate + type: string + source: rainmaker-noc + total: false + - name: g8issuedate + label: reports.noc.g8issuedate + type: string + source: rainmaker-noc + total: false + - name: g8receiptno + label: reports.noc.g8receiptno + type: string + source: rainmaker-noc + total: false + - name: status + label: reports.noc.status + type: string + source: rainmaker-noc + total: false + - name: servicecategory + label: reports.noc.servicecategory + type: string + source: rainmaker-noc + total: false + - name: totalamount + label: reports.noc.totalamount + type: string + source: rainmaker-noc + total: false + - name: paymentmode + label: reports.noc.paymentmode + type: string + source: rainmaker-noc + total: false + - name: ddorchequenumber + label: reports.noc.ddorchequenumber + type: string + source: rainmaker-noc + total: false + - name: firenoctype + label: reports.noc.firenoctype + type: string + source: rainmaker-noc + total: false + - name: usagetype + label: reports.noc.usagetype + type: string + source: rainmaker-noc + total: false + - name: ownername + label: reports.noc.ownername + type: string + source: rainmaker-noc + total: false + - name: collectiontype + label: reports.noc.collectiontype + type: string + source: rainmaker-noc + total: false + - name: collectorname + label: reports.noc.collectorname + type: string + source: rainmaker-noc + total: false + searchParams: + - name: fromDate + label: reports.noc.fromDate + type: epoch + source: noc + isMandatory: false + searchClause: AND applicationdate >= $fromDate + - name: toDate + label: reports.noc.toDate + type: epoch + source: noc + isMandatory: false + searchClause: AND applicationdate <= $toDate + - name: ulb + label: reports.noc.ulb + type: multivaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: noc + wrapper: true + isMandatory: false + searchClause: AND fnoc.tenantId IN ($ulb) + query: | + -- Use CTE to force query plan, compute & use CTE later + WITH receipt_breakup AS ( + SELECT + egcl_billaccountdetail.billdetailid bill_id, + string_agg(distinct consumercode,',') as consumercode + FROM egcl_billaccountdetail + INNER JOIN egcl_bill as bill on bill.id = egcl_billaccountdetail.billdetailid + WHERE bill.tenantid!='pb.testing' AND businessservice in ('FIRENOC') + GROUP BY billdetailid + ) + SELECT + payment.tenantid as ulb, + paydetail.receiptnumber as receiptnumber, + To_char((To_timestamp(paydetail.receiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as receiptdate, + To_char((To_timestamp(paydetail.manualreceiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as g8issuedate, + paydetail.manualreceiptnumber as g8receiptno, + payment.paymentstatus as status, + paydetail.businessservice as servicecategory, + receipt_breakup.*, + payment.totalamountpaid as totalamount, + paymentmode as paymentmode, + (case when paymentmode like 'CASH' then '' else transactionnumber end) as ddorchequenumber, + 'System' as collectiontype, + eg_user.name as collectorname, + fdet.firenoctype as firenoctype, + build.usagetype as usagetype, + build.name as ownername + FROM egcl_payment AS payment + JOIN egcl_paymentdetail as paydetail on paydetail.paymentid=payment.id + JOIN receipt_breakup ON paydetail.billid = receipt_breakup.bill_id + JOIN eg_user ON payment.createdby::INTEGER=eg_user.id + JOIN egcl_bill as bill ON bill.id=paydetail.billid + JOIN eg_fn_firenocdetail AS fdet ON fdet.applicationnumber=bill.consumercode + JOIN eg_fn_buidlings AS build ON build.firenocdetailsuuid=fdet.uuid + WHERE payment.tenantid!='pb.testing' AND paydetail.businessservice in ('FIRENOC') AND paydetail.receiptnumber NOT LIKE 'MP%' and paydetail.tenantid=$tenantid + orderby: ORDER BY paydetail.receiptdate DESC From 7a5015aa4c6f40143abc4dbdb23b2cfe4581035d Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Tue, 29 Sep 2020 16:19:18 +0530 Subject: [PATCH 0242/1242] copied PROD_v2 to UAT_V2(mcgrade change) --- configs/pdf-service/data-config/tlcertificate.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/configs/pdf-service/data-config/tlcertificate.json b/configs/pdf-service/data-config/tlcertificate.json index bc516425..9e8368be 100644 --- a/configs/pdf-service/data-config/tlcertificate.json +++ b/configs/pdf-service/data-config/tlcertificate.json @@ -616,6 +616,10 @@ "variable":"ulb-address", "value":"$.MdmsRes.tenant.tenants[0].address" }, + { + "variable":"mcGrade", + "value":"$.MdmsRes.tenant.tenants[0].city.ulbType" + }, { "variable":"corporationContact", "value":"$.MdmsRes.tenant.tenants[0].contactNumber" From 3fdd264175c93af32535da141cc9054f473f515d Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Tue, 29 Sep 2020 16:22:15 +0530 Subject: [PATCH 0243/1242] copied prod_v2 changes to uat_v2(mcgrade change) --- configs/pdf-service/data-config/tradelicense-receipt.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/configs/pdf-service/data-config/tradelicense-receipt.json b/configs/pdf-service/data-config/tradelicense-receipt.json index f21b13c6..b7620aee 100644 --- a/configs/pdf-service/data-config/tradelicense-receipt.json +++ b/configs/pdf-service/data-config/tradelicense-receipt.json @@ -421,6 +421,10 @@ "variable":"address", "value":"$.MdmsRes.tenant.tenants[0].address" }, + { + "variable":"mcGrade", + "value":"$.MdmsRes.tenant.tenants[0].city.ulbType" + }, { "variable":"phoneNumber", "value":"$.MdmsRes.tenant.tenants[0].contactNumber" From 370050ec94b113bfe31b9ab91c9024dd31db5b85 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Tue, 29 Sep 2020 16:38:14 +0530 Subject: [PATCH 0244/1242] copied prod_v2 changes to uat_v2 --- configs/pdf-service/format-config/tlcertificate.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/pdf-service/format-config/tlcertificate.json b/configs/pdf-service/format-config/tlcertificate.json index 0a9d5954..b744a6d2 100644 --- a/configs/pdf-service/format-config/tlcertificate.json +++ b/configs/pdf-service/format-config/tlcertificate.json @@ -35,7 +35,7 @@ "stack": [ { - "text":"{{municipal_corportaion}},{{city}}", + "text":"{{mcGrade}},{{city}}", "style":"receipt-logo-header" }, { From a546b58dd748932ee594f15b574f108a8405e665 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Tue, 29 Sep 2020 16:39:49 +0530 Subject: [PATCH 0245/1242] copied prod_v2 changes to uat_v2 --- configs/pdf-service/format-config/tradelicense-receipt.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/pdf-service/format-config/tradelicense-receipt.json b/configs/pdf-service/format-config/tradelicense-receipt.json index 99aa26ad..f0ad6055 100644 --- a/configs/pdf-service/format-config/tradelicense-receipt.json +++ b/configs/pdf-service/format-config/tradelicense-receipt.json @@ -23,7 +23,7 @@ { "stack": [ { - "text": "{{logo-header}} {{Municipal_Corporation}}", + "text": "{{logo-header}} {{mcGrade}}", "style": "receipt-logo-header" }, { From f872ef3eb6ab2166b28b2fa037ff75317913846e Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 30 Sep 2020 13:38:18 +0530 Subject: [PATCH 0246/1242] synch with PROD_V2 --- configs/reports/configs/tl-reports.yml | 37 ++++++++++++++++++-------- 1 file changed, 26 insertions(+), 11 deletions(-) diff --git a/configs/reports/configs/tl-reports.yml b/configs/reports/configs/tl-reports.yml index 2e5b880c..d6679fb2 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -1668,7 +1668,6 @@ ReportDefinitions: - reportName: TradeWiseCollectionReport_v2 - decryptionPathId: TradeWiseCollectionReport_v2 summary: Collection according to tradeTypes version: 1.0.0 moduleName: rainmaker-tl @@ -1721,7 +1720,6 @@ ReportDefinitions: - reportName: TradeLicenseApplicationStatusReport_v2 - decryptionPathId: TradeLicenseApplicationStatusReport_v2 summary: Nummber of applications by there status version: 1.0.0 moduleName: rainmaker-tl @@ -1766,7 +1764,6 @@ ReportDefinitions: - reportName: TradeLicenseULBWiseApplicationStatusReport_v2 - decryptionPathId: TradeLicenseULBWiseApplicationStatusReport_v2 summary: Nummber of applications by there status version: 1.0.0 moduleName: rainmaker-tl @@ -1786,11 +1783,26 @@ ReportDefinitions: type: string source: tl total: true + - name: pendingpayment + label: TL_PENDINGPAYMENT + type: string + source: tl + total: true - name: paid label: TL_PAID type: string source: tl total: true + - name: fieldinspection + label: TL_FIELDINSPECTION + type: string + source: tl + total: true + - name: pendingapproval + label: TL_PENDINGAPPROVAL + type: string + source: tl + total: true - name: approved label: TL_APPROVED type: string @@ -1806,6 +1818,11 @@ ReportDefinitions: type: string source: tl total: true + - name: citizenactionrequired + label: TL_CITIZENACTIONREQUIRED + type: string + source: tl + total: true searchParams: - name: fromDate label: reports.tl.fromDate @@ -1832,7 +1849,11 @@ ReportDefinitions: initcap(split_part(tenantId, '.', 2)) as tenantId, SUM(CASE status when 'REJECTED' then 1 else 0 end) as rejected, SUM(CASE status when 'INITIATED' then 1 else 0 end) as initiated, + SUM(CASE status when 'PENDINGPAYMENT' then 1 else 0 end) as pendingpayment, SUM(CASE status when 'PAID' then 1 else 0 end) as paid, + SUM(CASE status when 'FIELDINSPECTION' then 1 else 0 end) as fieldinspection, + SUM(CASE status when 'CITIZENACTIONREQUIRED' then 1 else 0 end) as citizenactionrequired, + SUM(CASE status when 'PENDINGAPPROVAL' then 1 else 0 end) as pendingapproval, SUM(CASE status when 'APPROVED' then 1 else 0 end) as approved, SUM(CASE status when 'APPLIED' then 1 else 0 end) as applied, SUM(CASE status when 'CANCELLED' then 1 else 0 end) as cancelled @@ -1843,7 +1864,6 @@ ReportDefinitions: - reportName: StateLevelStatus_v2 - decryptionPathId: StateLevelStatus_v2 summary: Nummber of applications by there status state level version: 1.0.0 moduleName: rainmaker-tl @@ -1891,7 +1911,6 @@ ReportDefinitions: - reportName: ULBLevelStatus_v2 - decryptionPathId: ULBLevelStatus_v2 summary: Nummber of applications by there status ULB level version: 1.0.0 moduleName: rainmaker-tl @@ -1931,7 +1950,6 @@ ReportDefinitions: - reportName: StateLevelTradeWiseCollection_v2 - decryptionPathId: StateLevelTradeWiseCollection_v2 summary: Collection according to tradeTypes state level version: 1.0.0 moduleName: rainmaker-tl @@ -2280,13 +2298,13 @@ ReportDefinitions: type: epoch source: tl isMandatory: false - searchClause: AND tl.applicationdate >= $fromDate + searchClause: AND issueddate >= $fromDate - name: toDate label: reports.tl.toDate type: epoch source: tl isMandatory: false - searchClause: AND tl.applicationdate <= $toDate + searchClause: AND issueddate <= $toDate - name: localityArray label: reports.tl.zoneList type: boundarylist @@ -2466,6 +2484,3 @@ ReportDefinitions: ) tlown ON tlown.tradelicensedetailid = tld.id where validto < extract (epoch from NOW())*1000 and licensenumber is not null and licensenumber not in (select oldlicensenumber from eg_tl_tradelicense where oldlicensenumber is not null) and tenantid = $tenantid - - - From 6165c06f7a9573165788c64648b677f6d0cbb2db Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 30 Sep 2020 14:14:18 +0530 Subject: [PATCH 0247/1242] Synch with PROD_V2 --- configs/reports/configs/uc-reports.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/configs/reports/configs/uc-reports.yml b/configs/reports/configs/uc-reports.yml index e2667cb6..8336e3c2 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -969,7 +969,7 @@ ReportDefinitions: eg_user.name as collectorname FROM egcl_payment AS payment JOIN egcl_paymentdetail as paydetail on paydetail.paymentid=payment.id - JOIN receipt_breakup ON paydetail.billid = receipt_breakup.bill_id + LEFT JOIN receipt_breakup ON paydetail.billid = receipt_breakup.bill_id JOIN eg_user ON payment.createdby::INTEGER=eg_user.id WHERE payment.tenantid!='pb.testing' AND businessservice not in ('PT','TL','FIRENOC') and payment.paymentstatus != 'CANCELLED' orderby: ORDER BY paydetail.receiptdate DESC @@ -1104,7 +1104,7 @@ ReportDefinitions: source: uc wrapper: true isMandatory: false - searchClause: AND paydetail.businessservice = $businessservice + searchClause: AND businessservice = $businessservice - name: collectorname label: reports.uc.collectorname type: singlevaluelist @@ -1371,8 +1371,8 @@ ReportDefinitions: -- Use CTE to force query plan, compute & use CTE later SELECT initcap(split_part(payment.tenantId, '.', 2)) as ulb, - count(*) FILTER (where payment.paymentmode!='ONLINE') as noOfOfflineTransactions, - count(*) FILTER (where payment.paymentmode='ONLINE') as noOfOnlineTransactions, + count(*) FILTER (where payment.paymentmode!='ONLINE') as offlinetransactions, + count(*) FILTER (where payment.paymentmode='ONLINE') as onlinetransactions, count(*) as totaltransactions, sum(case when paymentmode!='ONLINE' then payment.totalamountpaid else 0 end) as offlinecollection, sum(case paymentmode when 'ONLINE' then payment.totalamountpaid else 0 end) as onlinecollection, @@ -1440,7 +1440,8 @@ ReportDefinitions: query: | -- Use CTE to force query plan, compute & use CTE later SELECT - paydetail.businessservice, + paydetail.businessservice as servicetype, + count(distinct paydetail.receiptnumber) totalreceipts, SUM(CASE WHEN taxheadcode LIKE '%_CGST' THEN adjustedamount ELSE 0 END) as cgst, SUM(CASE WHEN taxheadcode LIKE '%_TAX' THEN adjustedamount ELSE 0 END) as tax, SUM(CASE WHEN taxheadcode LIKE '%_SGST' THEN adjustedamount ELSE 0 END) as sgst, @@ -1590,7 +1591,6 @@ ReportDefinitions: WHERE payment.tenantid=$tenantid AND businessservice not in ('PT','TL','FIRENOC') and payment.paymentstatus = 'CANCELLED' orderby: ORDER BY paydetail.receiptdate DESC - - reportName: MiscReceiptULBShort_v2 summary: Receipt Register Miscellaneous version: 1.0.0 From 223075d38ec357c438dcc865a5caa59097f2f549 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 30 Sep 2020 14:34:27 +0530 Subject: [PATCH 0248/1242] Synch with PROD_V2 --- configs/reports/configs/pgr-reports.yml | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/configs/reports/configs/pgr-reports.yml b/configs/reports/configs/pgr-reports.yml index 36943931..9f00950c 100644 --- a/configs/reports/configs/pgr-reports.yml +++ b/configs/reports/configs/pgr-reports.yml @@ -6,15 +6,15 @@ ReportDefinitions: sourceColumns: - name: citizen_mobile_app label: reports.rainmaker-pgr.citizen_mobile_app - type: number + type: string source: eg_pgr_service - name: citizen_web_app label: reports.rainmaker-pgr.citizen_web_app - type: number + type: string source: eg_pgr_service - name: counter_desktop label: reports.rainmaker-pgr.counter_desktop - type: number + type: string source: eg_pgr_service searchParams: - name: tenantId @@ -910,23 +910,25 @@ ReportDefinitions: - reportName: SourceWiseReport_v2 - decryptionPathId: SourceWiseReport_v2 summary: Fetches reports based on the source of reception of the complaint version: 1.0.0 moduleName: rainmaker-pgr sourceColumns: - name: citizen_mobile_app label: reports.rainmaker-pgr.citizen_mobile_app - type: number + type: string source: eg_pgr_service + total: true - name: citizen_web_app label: reports.rainmaker-pgr.citizen_web_app - type: number + type: string source: eg_pgr_service + total: true - name: counter_desktop label: reports.rainmaker-pgr.counter_desktop - type: number + type: string source: eg_pgr_service + total: true searchParams: - name: tenantId label: reports.rainmaker-pgr.tenantId @@ -1077,7 +1079,6 @@ ReportDefinitions: orderby: ORDER BY servicerequestid, epa."when" desc - reportName: StateSourceReport_v2 - decryptionPathId: StateSourceReport_v2 summary: Source of complaints across tenants version: 1.0.0 moduleName: rainmaker-pgr @@ -1138,7 +1139,6 @@ ReportDefinitions: orderby: ORDER BY tenantid - reportName: EmployeeReport_v2 - decryptionPathId: EmployeeReport_v2 summary: Fetches complaints for employees version: 1.0.0 moduleName: rainmaker-pgr @@ -1245,7 +1245,6 @@ ReportDefinitions: orderby: ORDER BY eg_pgr_service.createdtime asc - reportName: StateULBReport_v2 - decryptionPathId: StateULBReport_v2 summary: Fetches complaints stats for all ULBs in state version: 1.0.0 moduleName: rainmaker-pgr @@ -1312,7 +1311,6 @@ ReportDefinitions: orderby: ORDER BY tenantid - reportName: ComplaintTypesReport_v2 - decryptionPathId: ComplaintTypesReport_v2 summary: Fetches complaint stats based on complaint types for a ULB version: 1.0.0 moduleName: rainmaker-pgr @@ -1394,7 +1392,6 @@ ReportDefinitions: orderby: ORDER BY tenantid,servicecode - reportName: DepartmentReport_v2 - decryptionPathId: DepartmentReport_v2 summary: Fetches complaint stats based on complaint types for a ULB version: 1.0.0 moduleName: rainmaker-pgr @@ -1482,7 +1479,6 @@ ReportDefinitions: orderby: ORDER BY tenantid,deptmap_def.name - reportName: ULBDepartmentReport_v2 - decryptionPathId: ULBDepartmentReport_v2 summary: Fetches complaint stats based on department types for a ULB version: 1.0.0 moduleName: rainmaker-pgr @@ -1573,7 +1569,6 @@ ReportDefinitions: orderby: ORDER BY deptmap_def.name - reportName: ULBEmployeeWiseReport_v2 - decryptionPathId: ULBEmployeeWiseReport_v2 summary: Fetches employee wise assignment report version: 1.0.0 moduleName: rainmaker-pgr @@ -1658,7 +1653,6 @@ ReportDefinitions: - reportName: UlbPgrSlaReport_v2 - decryptionPathId: UlbPgrSlaReport_v2 summary: Fetches employee sla version: 1.0.0 moduleName: rainmaker-pgr @@ -1734,7 +1728,6 @@ ReportDefinitions: orderby: ORDER BY tenantid,eg_pgr_service.servicecode - reportName: FeedbackReport_v2 - decryptionPathId: FeedbackReport_v2 summary: Fetches complaint state based on Feedback version: 1.0.0 moduleName: rainmaker-pgr From 0c28ab6e649276ec6d6eddb97fbae29478b8a862 Mon Sep 17 00:00:00 2001 From: Kabir Date: Thu, 1 Oct 2020 11:10:44 +0530 Subject: [PATCH 0249/1242] uatv2 firenoc reports cancelled receipt register pi8255 --- .../reports/configs/rainmaker-noc-reports.yml | 123 ++++++++++++++++++ 1 file changed, 123 insertions(+) diff --git a/configs/reports/configs/rainmaker-noc-reports.yml b/configs/reports/configs/rainmaker-noc-reports.yml index 444bd9e6..c3df009d 100644 --- a/configs/reports/configs/rainmaker-noc-reports.yml +++ b/configs/reports/configs/rainmaker-noc-reports.yml @@ -658,3 +658,126 @@ ReportDefinitions: JOIN eg_fn_buidlings AS build ON build.firenocdetailsuuid=fdet.uuid WHERE payment.tenantid!='pb.testing' AND paydetail.businessservice in ('FIRENOC') AND paydetail.receiptnumber NOT LIKE 'MP%' and paydetail.tenantid=$tenantid orderby: ORDER BY paydetail.receiptdate DESC + + - reportName: CancelledReceiptRegisterFirenocReport_V2 + summary: Cancelled Receipt Register FireNoc + version: 1.0.0 + moduleName: rainmaker-noc + additionalConfig: + print: + pdfPageSize: "A3" + sourceColumns: + - name: ulb + label: reports.noc.ulb + type: string + source: rainmaker-noc + total: false + - name: receiptnumber + label: reports.noc.receiptnumber + type: string + source: rainmaker-noc + total: false + - name: receiptdate + label: reports.noc.receiptdate + type: string + source: rainmaker-noc + total: false + - name: g8issuedate + label: reports.noc.g8issuedate + type: string + source: rainmaker-noc + total: false + - name: g8receiptno + label: reports.noc.g8receiptno + type: string + source: rainmaker-noc + total: false + - name: status + label: reports.noc.status + type: string + source: rainmaker-noc + total: false + - name: servicecategory + label: reports.noc.servicecategory + type: string + source: rainmaker-noc + total: false + - name: totalamount + label: reports.noc.totalamount + type: string + source: rainmaker-noc + total: false + - name: paymentmode + label: reports.noc.paymentmode + type: string + source: rainmaker-noc + total: false + - name: ddorchequenumber + label: reports.noc.ddorchequenumber + type: string + source: rainmaker-noc + total: false + - name: collectiontype + label: reports.noc.collectiontype + type: string + source: rainmaker-noc + total: false + - name: collectorname + label: reports.noc.collectorname + type: string + source: rainmaker-noc + total: false + searchParams: + - name: fromDate + label: reports.noc.fromDate + type: epoch + source: noc + isMandatory: false + searchClause: AND applicationdate >= $fromDate + - name: toDate + label: reports.noc.toDate + type: epoch + source: noc + isMandatory: false + searchClause: AND applicationdate <= $toDate + - name: ulb + label: reports.noc.ulb + type: multivaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: noc + wrapper: true + isMandatory: false + searchClause: AND fnoc.tenantId IN ($ulb) + query: | + -- Use CTE to force query plan, compute & use CTE later + WITH receipt_breakup AS ( + SELECT + egcl_billaccountdetail.billdetailid bill_id, + string_agg(distinct consumercode,',') as consumercode + FROM egcl_billaccountdetail + INNER JOIN egcl_bill as bill on bill.id = egcl_billaccountdetail.billdetailid + WHERE bill.tenantid!='pb.testing' AND businessservice in ('FIRENOC') + GROUP BY billdetailid + ) + SELECT + payment.tenantid as ulb, + paydetail.receiptnumber as receiptnumber, + To_char((To_timestamp(paydetail.receiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as receiptdate, + To_char((To_timestamp(paydetail.manualreceiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as g8issuedate, + paydetail.manualreceiptnumber as g8receiptno, + payment.paymentstatus as status, + paydetail.businessservice as servicecategory, + receipt_breakup.*, + payment.totalamountpaid as totalamount, + paymentmode as paymentmode, + (case when paymentmode like 'CASH' then '' else transactionnumber end) as ddorchequenumber, + 'System' as collectiontype, + eg_user.name as collectorname, + fdet.firenoctype as firenoctype, + FROM egcl_payment AS payment + JOIN egcl_paymentdetail as paydetail on paydetail.paymentid=payment.id + JOIN receipt_breakup ON paydetail.billid = receipt_breakup.bill_id + JOIN eg_user ON payment.createdby::INTEGER=eg_user.id + payment.tenantid=$tenantid AND businessservice not in ('PT','TL','UC') and payment.paymentstatus = 'CANCELLED' + orderby: ORDER BY paydetail.receiptdate DESC + From a2b313f952fec9f69a3ab1e355ecf1f77116646d Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 1 Oct 2020 12:20:55 +0530 Subject: [PATCH 0250/1242] Update query cancelled report PI-8255 --- configs/reports/configs/rainmaker-noc-reports.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/configs/reports/configs/rainmaker-noc-reports.yml b/configs/reports/configs/rainmaker-noc-reports.yml index c3df009d..e3e2c31c 100644 --- a/configs/reports/configs/rainmaker-noc-reports.yml +++ b/configs/reports/configs/rainmaker-noc-reports.yml @@ -772,12 +772,11 @@ ReportDefinitions: paymentmode as paymentmode, (case when paymentmode like 'CASH' then '' else transactionnumber end) as ddorchequenumber, 'System' as collectiontype, - eg_user.name as collectorname, - fdet.firenoctype as firenoctype, + eg_user.name as collectorname FROM egcl_payment AS payment JOIN egcl_paymentdetail as paydetail on paydetail.paymentid=payment.id JOIN receipt_breakup ON paydetail.billid = receipt_breakup.bill_id JOIN eg_user ON payment.createdby::INTEGER=eg_user.id - payment.tenantid=$tenantid AND businessservice not in ('PT','TL','UC') and payment.paymentstatus = 'CANCELLED' + WHERE payment.tenantid=$tenantid AND businessservice not in ('PT','TL','UC') and payment.paymentstatus = 'CANCELLED' orderby: ORDER BY paydetail.receiptdate DESC From 8af30a210e5d78dede7f46df5886a7b25ff7e010 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Mon, 5 Oct 2020 12:20:40 +0530 Subject: [PATCH 0251/1242] [PI-8282] added property usage in PT receipt --- configs/pdf-service/data-config/property-receipt.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index 0aa3e35a..7d671fb8 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -557,6 +557,9 @@ { "variable":"fatherHusbandName", "value":"$.Properties[0].owners[0].fatherOrHusbandName" + },{ + "variable":"propertyUsage", + "value":"$.Properties[0].usageCategory" }, { "variable":"doorNo", From 65741b32617a24037266e0eba0a46a3131abe681 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Mon, 5 Oct 2020 12:21:47 +0530 Subject: [PATCH 0252/1242] [PI-8282] added property Usage in PT Receipt --- .../format-config/property-receipt.json | 53 +++++++++++++++++-- 1 file changed, 48 insertions(+), 5 deletions(-) diff --git a/configs/pdf-service/format-config/property-receipt.json b/configs/pdf-service/format-config/property-receipt.json index c117a3bb..172710d2 100644 --- a/configs/pdf-service/format-config/property-receipt.json +++ b/configs/pdf-service/format-config/property-receipt.json @@ -363,7 +363,7 @@ true, false, false, - true + false ], "style": "receipt-table-value" }, @@ -373,7 +373,7 @@ false, false, false, - true + false ], "style": "receipt-table" }, @@ -383,7 +383,7 @@ false, false, false, - true + false ], "style": "receipt-table-value" }, @@ -393,11 +393,54 @@ false, false, true, - true + false ], "style": "receipt-table" } - ] + ], + [ + { + "text": "Property Usage Type ", + "border": [ + true, + false, + false, + true + + ], + "style": "receipt-table-value" + }, + { + "text": "{{propertyUsage}}", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": " ", + "border": [ + false, + false, + true, + true + ], + "style": "receipt-table" + } + ] ] }, "layout": {} From 88d25cf804227a2a5bc7c21fd51199faac479a9d Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Tue, 6 Oct 2020 11:14:43 +0530 Subject: [PATCH 0253/1242] [PI-8078] localisation issue in TL receipt --- configs/pdf-service/data-config/tradelicense-receipt.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/pdf-service/data-config/tradelicense-receipt.json b/configs/pdf-service/data-config/tradelicense-receipt.json index b7620aee..ee5114bc 100644 --- a/configs/pdf-service/data-config/tradelicense-receipt.json +++ b/configs/pdf-service/data-config/tradelicense-receipt.json @@ -519,7 +519,7 @@ "value":"$.Licenses[0].tradeLicenseDetail.adhocExemptionReason", "localisation":{ "required":true, - "prefix": "null", + "prefix": null, "module": "rainmaker-tl" } }, @@ -528,7 +528,7 @@ "value":"$.Licenses[0].tradeLicenseDetail.adhocPenaltyReason", "localisation":{ "required":true, - "prefix": "null", + "prefix": null, "module": "rainmaker-tl" } }, From 35fb965fee0e5421cb665d91729c5cf1c89369cd Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Thu, 8 Oct 2020 11:04:43 +0530 Subject: [PATCH 0254/1242] updated localisation in TL Receipt --- configs/pdf-service/data-config/tradelicense-receipt.json | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/configs/pdf-service/data-config/tradelicense-receipt.json b/configs/pdf-service/data-config/tradelicense-receipt.json index ee5114bc..63850fce 100644 --- a/configs/pdf-service/data-config/tradelicense-receipt.json +++ b/configs/pdf-service/data-config/tradelicense-receipt.json @@ -516,7 +516,9 @@ }, { "variable":"adhocRebateReason", - "value":"$.Licenses[0].tradeLicenseDetail.adhocExemptionReason", + "value": { + "path": "$.Licenses[0].tradeLicenseDetail.adhocExemptionReason" + }, "localisation":{ "required":true, "prefix": null, @@ -525,7 +527,8 @@ }, { "variable":"adhocPenaltyReason", - "value":"$.Licenses[0].tradeLicenseDetail.adhocPenaltyReason", + "value":{ + "path":"$.Licenses[0].tradeLicenseDetail.adhocPenaltyReason"}, "localisation":{ "required":true, "prefix": null, From f985d5449e08640ae8ec263a66abf951ad2de8fa Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Thu, 8 Oct 2020 11:23:02 +0530 Subject: [PATCH 0255/1242] Update tradelicense-receipt.json --- configs/pdf-service/data-config/tradelicense-receipt.json | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/configs/pdf-service/data-config/tradelicense-receipt.json b/configs/pdf-service/data-config/tradelicense-receipt.json index 63850fce..ee5114bc 100644 --- a/configs/pdf-service/data-config/tradelicense-receipt.json +++ b/configs/pdf-service/data-config/tradelicense-receipt.json @@ -516,9 +516,7 @@ }, { "variable":"adhocRebateReason", - "value": { - "path": "$.Licenses[0].tradeLicenseDetail.adhocExemptionReason" - }, + "value":"$.Licenses[0].tradeLicenseDetail.adhocExemptionReason", "localisation":{ "required":true, "prefix": null, @@ -527,8 +525,7 @@ }, { "variable":"adhocPenaltyReason", - "value":{ - "path":"$.Licenses[0].tradeLicenseDetail.adhocPenaltyReason"}, + "value":"$.Licenses[0].tradeLicenseDetail.adhocPenaltyReason", "localisation":{ "required":true, "prefix": null, From 80d2df3a467493034e66704874f47da9ac634299 Mon Sep 17 00:00:00 2001 From: Kabir Date: Fri, 9 Oct 2020 10:11:08 +0530 Subject: [PATCH 0256/1242] uatv2 short receipt register misc reportcomment --- configs/reports/configs/uc-reports.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/uc-reports.yml b/configs/reports/configs/uc-reports.yml index 8336e3c2..ece402e2 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -1664,9 +1664,10 @@ ReportDefinitions: paydetail.businessservice as servicecategory, payment.totalamountpaid as amount, eg_user.name as collectorname, - payment.additionaldetails->>'comment' as remarks + billd.additionaldetails->>'comment' as remarks FROM egcl_payment AS payment - inner join egcl_paymentdetail as paydetail on paydetail.paymentid=payment.id + INNER JOIN egcl_paymentdetail as paydetail on paydetail.paymentid=payment.id + INNER JOIN egcl_billdetial as billd on billd.billid=paydetail.billid JOIN eg_user ON payment.createdby::INTEGER=eg_user.id WHERE paydetail.businessservice not in ('PT','TL','FIRENOC') and payment.paymentstatus != 'CANCELLED' and payment.tenantid =$tenantid orderby: ORDER BY paydetail.receiptdate DESC From 4de6f40f9bc1fcbfda6361cb2be38ae34cd1ab89 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 9 Oct 2020 10:45:30 +0530 Subject: [PATCH 0257/1242] MiscBusinessServiceCollection added sum total --- configs/reports/configs/uc-reports.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configs/reports/configs/uc-reports.yml b/configs/reports/configs/uc-reports.yml index ece402e2..a869ab56 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -1445,7 +1445,8 @@ ReportDefinitions: SUM(CASE WHEN taxheadcode LIKE '%_CGST' THEN adjustedamount ELSE 0 END) as cgst, SUM(CASE WHEN taxheadcode LIKE '%_TAX' THEN adjustedamount ELSE 0 END) as tax, SUM(CASE WHEN taxheadcode LIKE '%_SGST' THEN adjustedamount ELSE 0 END) as sgst, - SUM(CASE WHEN taxheadcode LIKE '%_FIELD_FEE' THEN adjustedamount ELSE 0 END) as fieldcollection + SUM(CASE WHEN taxheadcode LIKE '%_FIELD_FEE' THEN adjustedamount ELSE 0 END) as fieldcollection, + SUM(adjustedamount) as totalcollection FROM egcl_billaccountdetail INNER JOIN egcl_billdetial as billd on billd.id = egcl_billaccountdetail.billdetailid INNER JOIN egcl_bill as bill on bill.id=billd.billid From 682d3fceeb3b51a6aad9f86e5bf81f417ae8f50f Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 9 Oct 2020 11:27:10 +0530 Subject: [PATCH 0258/1242] uc ddcheque date query added --- configs/reports/configs/uc-reports.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/reports/configs/uc-reports.yml b/configs/reports/configs/uc-reports.yml index a869ab56..e407bfae 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -1140,6 +1140,7 @@ ReportDefinitions: payment.totalamountpaid as totalamount, paymentmode as paymentmode, (case when paymentmode like 'CASH' then '' else transactionnumber end) as ddorchequenumber, + (case when paymentmode like 'DD' or paymentmode like 'Cheque' then To_char((To_timestamp(payment.transactiondate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') else '' end) as ddchequedate, 'System' as collectiontype, eg_user.name as collectorname FROM egcl_payment AS payment @@ -1583,6 +1584,7 @@ ReportDefinitions: payment.totalamountpaid as totalamount, paymentmode as paymentmode, (case when paymentmode like 'CASH' then '' else transactionnumber end) as ddorchequenumber, + (case when paymentmode like 'DD' or paymentmode like 'Cheque' then To_char((To_timestamp(payment.transactiondate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') else '' end) as ddchequedate, 'System' as collectiontype, eg_user.name as collectorname FROM egcl_payment AS payment From 93ec4a330edc24fe13112069f3e335222047f49a Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Fri, 9 Oct 2020 11:39:55 +0530 Subject: [PATCH 0259/1242] [PI-8282] added usage of units --- .../data-config/property-receipt.json | 24 +++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index 7d671fb8..e3750b16 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -127,6 +127,12 @@ "value": { "path": "$.transactionNumber" } + }, { + "variable": "transactionDate", + "value": { + "path": "$.instrumentDate" + }, + "type": "date" }, { "variable": "dueAmount", @@ -632,14 +638,24 @@ } }, { - "variable":"usage_category", + "variable":"usage_category", + "value":"usageCategory", + "localisation": { + "required": true, + "prefix": "COMMON_PROPUSGTYPE", + "module": "rainmaker-pt", + "isMainTypeRequired":true + } + }, + { + "variable":"sub_usage_category", "value":"usageCategory", "localisation": { "required": true, "prefix": "COMMON_PROPSUBUSGTYPE", - "module": "rainmaker-pt" - } - }, + "module": "rainmaker-pt", + "isSubTypeRequired":true + }, { "variable":"occupancy_type", "value":"occupancyType" From 0f6003f4bc69d43e395286acbaada86d3a326b84 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Fri, 9 Oct 2020 11:42:00 +0530 Subject: [PATCH 0260/1242] [PI-8282] added uasge category of units --- .../format-config/property-receipt.json | 66 ++++++++++++++++--- 1 file changed, 56 insertions(+), 10 deletions(-) diff --git a/configs/pdf-service/format-config/property-receipt.json b/configs/pdf-service/format-config/property-receipt.json index 172710d2..0b6b7886 100644 --- a/configs/pdf-service/format-config/property-receipt.json +++ b/configs/pdf-service/format-config/property-receipt.json @@ -504,7 +504,7 @@ ], [ { - "text": "{{paid_amount}}", + "text": "Amount to be Paid", "border": [ true, false, @@ -514,7 +514,7 @@ "style": "receipt-table-value" }, { - "text": "₹ {{paidAmount}}", + "text": "₹ {{dueAmount}}", "border": [ false, false, @@ -524,7 +524,7 @@ "style": "receipt-table" }, { - "text": "{{pending_amount}}", + "text": "{{paid_amount}}", "border": [ false, false, @@ -534,7 +534,7 @@ "style": "receipt-table-value" }, { - "text": "₹ {{pendingAmount}}", + "text": "₹ {{paidAmount}}", "border": [ false, false, @@ -546,7 +546,7 @@ ], [ { - "text": "{{payment_mode}}", + "text": "{{pending_amount}}", "border": [ true, false, @@ -556,7 +556,7 @@ "style": "receipt-table-value" }, { - "text": "{{paymentMode}}", + "text": "₹ {{pendingAmount}}", "border": [ false, false, @@ -566,7 +566,7 @@ "style": "receipt-table" }, { - "text": "{{transaction_id}}", + "text": "{{payment_mode}}", "border": [ false, false, @@ -575,8 +575,50 @@ ], "style": "receipt-table-value" }, + { + "text": "₹ {{paymentMode}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{transaction_id}}", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, { "text": "{{transactionID}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Trans/Cheque/DD Date", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{transactionDate}}", "border": [ false, false, @@ -633,7 +675,7 @@ "layout": {} }, { - "text":"PAYABLE AMOUNT", + "text":"PAID AMOUNT", "style":"block-head" }, { @@ -786,6 +828,7 @@ "table": { "widths": [ "15%", + "20%", "*", "20%", "20%" @@ -796,9 +839,12 @@ { "text": "Floor", "style": "receipt-table-value" + },{ + "text": "Usage", + "style": "receipt-table-value" }, { - "text": "Usage", + "text": "Sub Usage", "style": "receipt-table-value" }, { @@ -810,7 +856,7 @@ "style": "receipt-table-value" } ], - "{{#var_floors}}[{\"text\":\"{{floor_no}}\",\"style\":\"receipt-table\"},{\"text\":\"{{usage_category}}\",\"style\":\"receipt-table\"},{\"text\":\"{{occupancy_type}}\",\"style\":\"receipt-table\"},{\"text\":\"{{builtup_area}}/{{arv_rent}}\",\"style\":\"receipt-table\"}]{{/var_floors}}" + "{{#var_floors}}[{\"text\":\"{{floor_no}}\",\"style\":\"receipt-table\"},{\"text\":\"{{usage_category}}\",\"style\":\"receipt-table\"},{\"text\":\"{{sub_usage_category}}\",\"style\":\"receipt-table\"},{\"text\":\"{{occupancy_type}}\",\"style\":\"receipt-table\"},{\"text\":\"{{builtup_area}}/{{arv_rent}}\",\"style\":\"receipt-table\"}]{{/var_floors}}" ] From e963bed6fb131d6a7997525e71da4079ebeb44bf Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Fri, 9 Oct 2020 11:46:01 +0530 Subject: [PATCH 0261/1242] [PI-8271] added branch name on MISC Receipt --- .../format-config/consolidatedreceipt.json | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/configs/pdf-service/format-config/consolidatedreceipt.json b/configs/pdf-service/format-config/consolidatedreceipt.json index 68474098..18abb6ef 100644 --- a/configs/pdf-service/format-config/consolidatedreceipt.json +++ b/configs/pdf-service/format-config/consolidatedreceipt.json @@ -387,6 +387,48 @@ ], "style": "receipt-table" + } + ], [ + { + "text": "Bank Name", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{bankName}},{{branchName}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "IFSC Code", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{ifsc}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } ], [ From 62c8d9918db2003aab4e68f8ff9b3ae42757fdb1 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Fri, 9 Oct 2020 11:49:25 +0530 Subject: [PATCH 0262/1242] [PI-8271] added bank/branch on misc receipt --- .../data-config/consolidatedreceipt.json | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/configs/pdf-service/data-config/consolidatedreceipt.json b/configs/pdf-service/data-config/consolidatedreceipt.json index 26c1eade..b4cb9513 100644 --- a/configs/pdf-service/data-config/consolidatedreceipt.json +++ b/configs/pdf-service/data-config/consolidatedreceipt.json @@ -131,6 +131,21 @@ "path": "$.paymentDetails[0].receiptDate" }, "type": "date" + }, { + "variable": "bankName", + "value": { + "path": "$.additionalDetails.bankName" + } + }, { + "variable": "branchName", + "value": { + "path": "$.additionalDetails.branchName" + } + }, { + "variable": "ifsc", + "value": { + "path": "$.ifscCode" + } }, { "variable": "paymentDate", From 6612387b1f2eba897a01152b7323a28777d58150 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 9 Oct 2020 11:52:04 +0530 Subject: [PATCH 0263/1242] Capital CHEQUE name --- configs/reports/configs/uc-reports.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/uc-reports.yml b/configs/reports/configs/uc-reports.yml index e407bfae..7de02fcb 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -1140,7 +1140,7 @@ ReportDefinitions: payment.totalamountpaid as totalamount, paymentmode as paymentmode, (case when paymentmode like 'CASH' then '' else transactionnumber end) as ddorchequenumber, - (case when paymentmode like 'DD' or paymentmode like 'Cheque' then To_char((To_timestamp(payment.transactiondate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') else '' end) as ddchequedate, + (case when paymentmode like 'DD' or paymentmode like 'CHEQUE' then To_char((To_timestamp(payment.transactiondate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') else '' end) as ddchequedate, 'System' as collectiontype, eg_user.name as collectorname FROM egcl_payment AS payment @@ -1584,7 +1584,7 @@ ReportDefinitions: payment.totalamountpaid as totalamount, paymentmode as paymentmode, (case when paymentmode like 'CASH' then '' else transactionnumber end) as ddorchequenumber, - (case when paymentmode like 'DD' or paymentmode like 'Cheque' then To_char((To_timestamp(payment.transactiondate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') else '' end) as ddchequedate, + (case when paymentmode like 'DD' or paymentmode like 'CHEQUE' then To_char((To_timestamp(payment.transactiondate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') else '' end) as ddchequedate, 'System' as collectiontype, eg_user.name as collectorname FROM egcl_payment AS payment From d39e5abf065d1cae3235931e47ea798dcec289de Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Fri, 9 Oct 2020 12:22:55 +0530 Subject: [PATCH 0264/1242] Update property-receipt.json --- configs/pdf-service/data-config/property-receipt.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index e3750b16..0b8b5867 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -655,7 +655,8 @@ "prefix": "COMMON_PROPSUBUSGTYPE", "module": "rainmaker-pt", "isSubTypeRequired":true - }, + } + }, { "variable":"occupancy_type", "value":"occupancyType" From 790e98ecea53d3fee24fb800a060a6701baf2ea5 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Fri, 9 Oct 2020 12:42:27 +0530 Subject: [PATCH 0265/1242] added bank and branch name in msc receipt --- configs/pdf-service/data-config/consolidatedreceipt.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/pdf-service/data-config/consolidatedreceipt.json b/configs/pdf-service/data-config/consolidatedreceipt.json index b4cb9513..0f32eede 100644 --- a/configs/pdf-service/data-config/consolidatedreceipt.json +++ b/configs/pdf-service/data-config/consolidatedreceipt.json @@ -134,12 +134,12 @@ }, { "variable": "bankName", "value": { - "path": "$.additionalDetails.bankName" + "path": "$.additionalDetails[0].bankName" } }, { "variable": "branchName", "value": { - "path": "$.additionalDetails.branchName" + "path": "$.additionalDetails[0].branchName" } }, { "variable": "ifsc", From fce7add1bf51bb64eb0057e0e43daa8cb0315e09 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Fri, 9 Oct 2020 12:44:32 +0530 Subject: [PATCH 0266/1242] added bank /branch name on misc receipt --- .../format-config/consolidatedreceipt.json | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/configs/pdf-service/format-config/consolidatedreceipt.json b/configs/pdf-service/format-config/consolidatedreceipt.json index 18abb6ef..786955e3 100644 --- a/configs/pdf-service/format-config/consolidatedreceipt.json +++ b/configs/pdf-service/format-config/consolidatedreceipt.json @@ -945,6 +945,48 @@ ], "style": "receipt-table" + } + ],[ + { + "text": "Bank Name", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{bankName}},{{branchName}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "IFSC Code", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{ifsc}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } ], [ From 47afbdb135df7d63af7b15ae592b84c2e31ae5f3 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Fri, 9 Oct 2020 13:05:34 +0530 Subject: [PATCH 0267/1242] updated usage category code --- configs/pdf-service/data-config/property-receipt.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index 0b8b5867..5628b66e 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -644,8 +644,7 @@ "required": true, "prefix": "COMMON_PROPUSGTYPE", "module": "rainmaker-pt", - "isMainTypeRequired":true - } + } }, { "variable":"sub_usage_category", From 4a336f03898f65be3bc2f3bb71a20c825c423c52 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Fri, 9 Oct 2020 16:45:00 +0530 Subject: [PATCH 0268/1242] Update property-receipt.json --- configs/pdf-service/data-config/property-receipt.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index 5628b66e..02563315 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -643,7 +643,7 @@ "localisation": { "required": true, "prefix": "COMMON_PROPUSGTYPE", - "module": "rainmaker-pt", + "module": "rainmaker-pt" } }, { From 7726572d35fc84a50c375750a28bba0e7c52701d Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 12 Oct 2020 11:04:17 +0530 Subject: [PATCH 0269/1242] feedbackReport_v2 fix --- configs/reports/configs/pgr-reports.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/pgr-reports.yml b/configs/reports/configs/pgr-reports.yml index 9f00950c..7eaa08bd 100644 --- a/configs/reports/configs/pgr-reports.yml +++ b/configs/reports/configs/pgr-reports.yml @@ -1795,13 +1795,13 @@ ReportDefinitions: type: epoch source: eg_pgr_service isMandatory: false - searchClause: AND createdtime >= $fromDate + searchClause: AND eg_pgr_service.createdtime >= $fromDate - name: toDate label: reports.rainmaker-pgr.dateto type: epoch source: eg_pgr_service isMandatory: false - searchClause: AND createdtime <= $toDate + searchClause: AND eg_pgr_service.createdtime <= $toDate query: | SELECT DISTINCT ON (servicerequestid) From 0b4c316473eb8cc7102af2aa36109a8926dd3d5d Mon Sep 17 00:00:00 2001 From: Kabir Date: Mon, 12 Oct 2020 12:12:27 +0530 Subject: [PATCH 0270/1242] uatv2 testing firenoc cancelled report --- configs/reports/configs/rainmaker-noc-reports.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/configs/reports/configs/rainmaker-noc-reports.yml b/configs/reports/configs/rainmaker-noc-reports.yml index e3e2c31c..900aa87f 100644 --- a/configs/reports/configs/rainmaker-noc-reports.yml +++ b/configs/reports/configs/rainmaker-noc-reports.yml @@ -772,11 +772,17 @@ ReportDefinitions: paymentmode as paymentmode, (case when paymentmode like 'CASH' then '' else transactionnumber end) as ddorchequenumber, 'System' as collectiontype, - eg_user.name as collectorname + eg_user.name as collectorname, + fdet.firenoctype as firenoctype, + build.usagetype as usagetype, + build.name as ownername FROM egcl_payment AS payment JOIN egcl_paymentdetail as paydetail on paydetail.paymentid=payment.id JOIN receipt_breakup ON paydetail.billid = receipt_breakup.bill_id JOIN eg_user ON payment.createdby::INTEGER=eg_user.id - WHERE payment.tenantid=$tenantid AND businessservice not in ('PT','TL','UC') and payment.paymentstatus = 'CANCELLED' - orderby: ORDER BY paydetail.receiptdate DESC + JOIN egcl_bill as bill ON bill.id=paydetail.billid + JOIN eg_fn_firenocdetail AS fdet ON fdet.applicationnumber=bill.consumercode + JOIN eg_fn_buidlings AS build ON build.firenocdetailsuuid=fdet.uuid + WHERE payment.tenantid!='pb.testing' and paydetail.businessservice not in ('PT','TL','UC') and payment.paymentstatus = 'CANCELLED' and paydetail.receiptnumber NOT LIKE 'MP%' and paydetail.tenantid=$tenantid + orderby: ORDER BY paydetail.receiptdate DESC From 4ec2b24434f2bb1ff4b70e91b33b7d38999f01fd Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 12 Oct 2020 13:36:58 +0530 Subject: [PATCH 0271/1242] uc reports fix --- configs/reports/configs/uc-reports.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/configs/reports/configs/uc-reports.yml b/configs/reports/configs/uc-reports.yml index 7de02fcb..c1f600ee 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -943,13 +943,14 @@ ReportDefinitions: -- Use CTE to force query plan, compute & use CTE later WITH receipt_breakup AS ( SELECT - egcl_billaccountdetail.billdetailid bill_id, + string_agg(distinct billd.billid,',') bill_id, SUM(CASE WHEN taxheadcode LIKE '%_CGST' THEN adjustedamount ELSE 0 END) as cgst, SUM(CASE WHEN taxheadcode LIKE '%_TAX' THEN adjustedamount ELSE 0 END) as tax, SUM(CASE WHEN taxheadcode LIKE '%_SGST' THEN adjustedamount ELSE 0 END) as sgst, SUM(CASE WHEN taxheadcode LIKE '%_FIELD_FEE' THEN adjustedamount ELSE 0 END) as fieldcollection FROM egcl_billaccountdetail - INNER JOIN egcl_bill as bill on bill.id = egcl_billaccountdetail.billdetailid + inner join egcl_billdetial as billd on billd.id=egcl_billaccountdetail.billdetailid + INNER JOIN egcl_bill as bill on bill.id = billd.billid WHERE bill.tenantid!='pb.testing' AND businessservice not in ('PT','TL','FIRENOC') -- and rh.status != 'Cancelled' GROUP BY billdetailid ) @@ -1381,7 +1382,7 @@ ReportDefinitions: from egcl_payment as payment inner join egcl_paymentdetail as paydetail on paydetail.paymentid=payment.id where paydetail.businessservice not in ('PT','TL','FIRENOC') and payment.tenantid !='pb.testing' and payment.paymentstatus != 'CANCELLED' - goupby: GROUP BY payment.tenantid + groupby: GROUP BY payment.tenantid orderby: ORDER BY payment.tenantId asc From 65b8348782ce1be4a2d87fbd06f71e53f8098195 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 12 Oct 2020 14:47:42 +0530 Subject: [PATCH 0272/1242] Update uc-reports.yml --- configs/reports/configs/uc-reports.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/configs/reports/configs/uc-reports.yml b/configs/reports/configs/uc-reports.yml index c1f600ee..ab7d93ef 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -1303,7 +1303,10 @@ ReportDefinitions: SUM(CASE WHEN taxheadcode LIKE '%_FIELD_FEE' THEN adjustedamount ELSE 0 END) as fieldcollection, sum(adjustedamount) as totalamount from egcl_paymentdetail paydetail - inner join egcl_billaccountdetail as ebd on paydetail.billid=ebd.billdetailid + from egcl_paymentdetail paydetail + INNER JOIN egcl_bill as bill on bill.id = paydetail.billid + inner join egcl_billdetial as billd on billd.billid=bill.id + inner join egcl_billaccountdetail as ebd on ebd.billdetailid=billd.id inner join egcl_payment as payment on paydetail.paymentid=payment.id WHERE paydetail.tenantid!='pb.testing' AND businessservice not in ('PT','TL','FIRENOC') and payment.paymentstatus!='CANCELLED' groupby: group by paydetail.tenantid From 12145a1e55acc621af65592f1f5a0005226618bd Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 12 Oct 2020 15:15:00 +0530 Subject: [PATCH 0273/1242] MiscReceiptState_v2 report syntax error fix --- configs/reports/configs/uc-reports.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/reports/configs/uc-reports.yml b/configs/reports/configs/uc-reports.yml index ab7d93ef..f7731bdc 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -1303,7 +1303,6 @@ ReportDefinitions: SUM(CASE WHEN taxheadcode LIKE '%_FIELD_FEE' THEN adjustedamount ELSE 0 END) as fieldcollection, sum(adjustedamount) as totalamount from egcl_paymentdetail paydetail - from egcl_paymentdetail paydetail INNER JOIN egcl_bill as bill on bill.id = paydetail.billid inner join egcl_billdetial as billd on billd.billid=bill.id inner join egcl_billaccountdetail as ebd on ebd.billdetailid=billd.id From 9495a16f3f75f703e235a5a90834832ab0df6563 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 12 Oct 2020 15:21:55 +0530 Subject: [PATCH 0274/1242] Update uc-reports.yml --- configs/reports/configs/uc-reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/reports/configs/uc-reports.yml b/configs/reports/configs/uc-reports.yml index f7731bdc..4e638a4c 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -1307,7 +1307,7 @@ ReportDefinitions: inner join egcl_billdetial as billd on billd.billid=bill.id inner join egcl_billaccountdetail as ebd on ebd.billdetailid=billd.id inner join egcl_payment as payment on paydetail.paymentid=payment.id - WHERE paydetail.tenantid!='pb.testing' AND businessservice not in ('PT','TL','FIRENOC') and payment.paymentstatus!='CANCELLED' + WHERE paydetail.tenantid!='pb.testing' AND paydetail.businessservice not in ('PT','TL','FIRENOC') and payment.paymentstatus!='CANCELLED' groupby: group by paydetail.tenantid - reportName: MiscCollectionState_v2 From 6274a8b73d629004bf1c21556ba93cffda826e5b Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 13 Oct 2020 20:13:37 +0530 Subject: [PATCH 0275/1242] pt report fixed --- configs/reports/configs/pt-reports.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index b991e847..bb7f2a5c 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2992,13 +2992,13 @@ ReportDefinitions: type: epoch source: pt isMandatory: true - searchClause: AND rh.receiptdate >= $fromDate + searchClause: AND pd.receiptdate >= $fromDate - name: toDate label: reports.pt.toDate type: epoch source: pt isMandatory: true - searchClause: AND rh.receiptdate <= $toDate + searchClause: AND pd.receiptdate <= $toDate - name: paymentMode label: Payment Mode type: singlevaluelist @@ -3595,13 +3595,13 @@ ReportDefinitions: type: epoch source: pt isMandatory: true - searchClause: AND rh.receiptdate >= $fromDate + searchClause: AND pd.receiptdate >= $fromDate - name: toDate label: reports.pt.toDate type: epoch source: pt isMandatory: true - searchClause: AND rh.receiptdate <= $toDate + searchClause: AND pd.receiptdate <= $toDate - name: collectorname label: reports.pt.collectorname type: singlevaluelist @@ -3825,13 +3825,13 @@ ReportDefinitions: type: epoch source: pt isMandatory: false - searchClause: AND rh.receiptdate >= $fromDate + searchClause: AND pd.receiptdate >= $fromDate - name: toDate label: reports.pt.toDate type: epoch source: pt isMandatory: false - searchClause: AND rh.receiptdate <= $toDate + searchClause: AND pd.receiptdate <= $toDate - name: localityArray label: reports.pt.zoneList type: boundarylist From 4c85ff737a6171cc66ed81cc7fcbc2691776a5a1 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 13 Oct 2020 21:51:19 +0530 Subject: [PATCH 0276/1242] Update pt-reports.yml --- configs/reports/configs/pt-reports.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index bb7f2a5c..a1fc5662 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -3213,13 +3213,13 @@ ReportDefinitions: type: epoch source: pt isMandatory: true - searchClause: AND rh.receiptdate >= $fromDate + searchClause: AND payd.receiptdate >= $fromDate - name: toDate label: reports.pt.toDate type: epoch source: pt isMandatory: true - searchClause: AND rh.receiptdate <= $toDate + searchClause: AND payd.receiptdate <= $toDate - name: financialyear label: Financial Year type: singlevaluelist From 8ee7d00e7631b8e3c5cc09a72f31edbb0e18cd07 Mon Sep 17 00:00:00 2001 From: ramakrishnaippili Date: Wed, 14 Oct 2020 07:25:13 +0530 Subject: [PATCH 0277/1242] [PI-819] Filtering all properties except inactive properties for pt register report --- configs/reports/configs/pt-reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index a1fc5662..8602f435 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2274,7 +2274,7 @@ ReportDefinitions: (select bill.id as billid, bill.consumercode as consumercodei, min(bd.fromperiod) fromperiod, max(bd.toperiod) toperiod from egcl_billdetial bd, egcl_bill bill where bill.id=bd.billid and bill.tenantid = $tenantid group by bill.id) bd where pd.paymentid=payment.id and bd.billid=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid - and pt.propertyid = bd.consumercodei and receipt_breakup.pdid=pd.id and eg_user.id = pd.createdby::INTEGER and pt.status='ACTIVE' + and pt.propertyid = bd.consumercodei and receipt_breakup.pdid=pd.id and eg_user.id = pd.createdby::INTEGER and pt.status!='INACTIVE' --and pt.propertyid='PT-1012-978737' orderby: ORDER BY pd.receiptdate DESC; From 52c835a440d60cd3122b63f31dca104ab72d47b6 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 14 Oct 2020 12:00:59 +0530 Subject: [PATCH 0278/1242] UC receipt ulb remarks added --- configs/reports/configs/uc-reports.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/configs/reports/configs/uc-reports.yml b/configs/reports/configs/uc-reports.yml index 4e638a4c..589cd188 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -1080,8 +1080,8 @@ ReportDefinitions: type: string source: uc total: false - - name: comments - label: reports.uc.comment + - name: remarks + label: reports.uc.remarks type: string source: uc total: false @@ -1143,10 +1143,12 @@ ReportDefinitions: (case when paymentmode like 'CASH' then '' else transactionnumber end) as ddorchequenumber, (case when paymentmode like 'DD' or paymentmode like 'CHEQUE' then To_char((To_timestamp(payment.transactiondate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') else '' end) as ddchequedate, 'System' as collectiontype, - eg_user.name as collectorname + eg_user.name as collectorname, + billd.additionaldetails->>'comment' as remarks FROM egcl_payment AS payment JOIN egcl_paymentdetail as paydetail on paydetail.paymentid=payment.id JOIN receipt_breakup ON paydetail.billid = receipt_breakup.bill_id + JOIN egcl_billdetial as billd on billd.billid=paydetail.billid JOIN eg_user ON payment.createdby::INTEGER=eg_user.id WHERE payment.tenantid=$tenantid AND businessservice not in ('PT','TL','FIRENOC') and payment.paymentstatus != 'CANCELLED' orderby: ORDER BY paydetail.receiptdate DESC From 38949834ddec34e5b7899b4681f22e68dfe35e37 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 14 Oct 2020 13:40:35 +0530 Subject: [PATCH 0279/1242] Update bankname ulb receipt --- configs/reports/configs/uc-reports.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/reports/configs/uc-reports.yml b/configs/reports/configs/uc-reports.yml index 589cd188..ba0a0577 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -1135,6 +1135,8 @@ ReportDefinitions: To_char((To_timestamp(paydetail.receiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as receiptdate, To_char((To_timestamp(paydetail.manualreceiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as g8issuedate, paydetail.manualreceiptnumber as g8receiptno, + payment.ifsccode as bankname, + payment.ifsccode as branchname, payment.paymentstatus as status, businessservice as servicecategory, receipt_breakup.*, From 5661d172cf14cc29d8cb17edb759eb9f351ade4d Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 14 Oct 2020 14:15:17 +0530 Subject: [PATCH 0280/1242] receiptregistershort_v2 fix --- configs/reports/configs/pt-reports.yml | 75 +++++++------------------- 1 file changed, 20 insertions(+), 55 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 8602f435..bd516d26 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -3013,7 +3013,7 @@ ReportDefinitions: source: pt wrapper: true isMandatory: false - searchClause: AND financialyear = $financialyear + searchClause: AND concat(t amp(bd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(bd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY')) = $financialyear - name: localityArray label: reports.pt.zoneList type: boundarylist @@ -3030,61 +3030,26 @@ ReportDefinitions: searchClause: AND eg_user.id = $collectorname::INTEGER query: | -- Use CTE to force query plan, compute & use CTE later - WITH receipt_breakup AS ( - SELECT - receiptnumber, - SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, - SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, - SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, - SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, - SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as propertytax, - (SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN adjustedamount ELSE 0 END) )as exemption, - ( SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END)) as adjustment - FROM egcl_billaccountdetail as bad - INNER JOIN egcl_billdetial as bd on bd.id = bad.billdetailid - INNER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid - INNER JOIN egcl_payment as payment on pd.paymentid=payment.id - LEFT OUTER JOIN eg_user ON eg_user.id = pd.createdby::INTEGER - WHERE bd.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' - GROUP BY pd.receiptnumber - ) - SELECT - bill.tenantid AS tenantid, - bill.id, - pt_detail.property AS propertyid, - pt_detail.assessmentnumber AS assessmentnumber, - bill.consumercode, - pd.receiptdate, - to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, - payment.ifsccode AS bankname, - pd.receiptnumber, - payment.totalamountpaid as amount, - payment.paymentmode as instrumenttype, - payment.transactionnumber, - receipt_breakup.*, - pd.due AS pendingamount, - pt_detail.financialyear, - to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, - Initcap(COALESCE(pt_detail.usagecategoryminor, pt_detail.usagecategorymajor)) as usagetype, + SELECT + pt.propertyid as propertyid, + to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') as transactiondate, + payment.ifsccode AS bankname, + receiptnumber, + payment.totalamountpaid as amount, + payment.paymentmode as instrumenttype, + payment.transactionnumber as transactionnumber, + concat(to_char((To_timestamp(bd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(bd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY')) AS financialyear, + eg_user.name as collectorname, + --receipt_breakup.*, + to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, manualreceiptnumber as g8receiptno, - (CASE WHEN collectiontype='COUNTER' THEN eg_user.name ELSE '' END) as collectorname, - pt_detail.additionaldetails->>'remarks' as "remarks" - FROM egcl_bill AS bill - INNER JOIN egcl_billdetial as bd on bd.billid = bill.id - LEFT OUTER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid - LEFT OUTER JOIN egcl_payment as payment on pd.paymentid=payment.id - JOIN eg_pt_propertydetail_v2 pt_detail ON pt_detail.property = bill.consumercode - JOIN eg_pt_address_v2 pt_addr ON pt_detail.property = pt_addr.property - JOIN receipt_breakup ON receipt_breakup.receiptnumber = pd.receiptnumber - LEFT OUTER JOIN eg_user ON eg_user.id = pd.createdby::INTEGER - WHERE pd.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' - orderby: ORDER BY pd.receiptdate DESC + 'NA' as remarks + FROM egcl_paymentdetail pd, egcl_payment payment, eg_pt_property as pt, eg_user, + (select bill.id as billid, bill.consumercode as consumercodei, min(bd.fromperiod) fromperiod, max(bd.toperiod) toperiod from egcl_billdetial bd, egcl_bill bill + where bill.id=bd.billid and bill.tenantid = $tenantid group by bill.id) bd + where pd.paymentid=payment.id and bd.billid=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid='pb.zirakpur' + and pt.propertyid = bd.consumercodei and eg_user.id = pd.createdby::INTEGER and pt.status!='INACTIVE' + orderby: ORDER BY pd.receiptdate DESC; - reportName: ULBPTDataDumpReport_V2 From fb24cb3681434fae2d58ee08d2027f76c556c739 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 14 Oct 2020 14:44:49 +0530 Subject: [PATCH 0281/1242] removed decryptionpathKey tradelicenseregistryrepo --- configs/reports/configs/tl-reports.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/reports/configs/tl-reports.yml b/configs/reports/configs/tl-reports.yml index d6679fb2..b1c9401c 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -1218,7 +1218,6 @@ ReportDefinitions: - reportName: TradeLicenseRegistryReport_v2 - decryptionPathId: TradeLicenseRegistryReport_v2 summary: TL Receipt Register Report version: 1.0.0 moduleName: rainmaker-tl From 6a0ab87a9e9d24440cdd6672d9dc96a16df0210b Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 14 Oct 2020 14:58:11 +0530 Subject: [PATCH 0282/1242] Update pt-reports.yml --- configs/reports/configs/pt-reports.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index bd516d26..47767468 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -3047,7 +3047,8 @@ ReportDefinitions: FROM egcl_paymentdetail pd, egcl_payment payment, eg_pt_property as pt, eg_user, (select bill.id as billid, bill.consumercode as consumercodei, min(bd.fromperiod) fromperiod, max(bd.toperiod) toperiod from egcl_billdetial bd, egcl_bill bill where bill.id=bd.billid and bill.tenantid = $tenantid group by bill.id) bd - where pd.paymentid=payment.id and bd.billid=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid='pb.zirakpur' + where pd.paymentid=payment.id and bd.billid=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + and pt_addr.propertyid=pt.id and pt.propertyid = bd.consumercodei and eg_user.id = pd.createdby::INTEGER and pt.status!='INACTIVE' orderby: ORDER BY pd.receiptdate DESC; From c8fb592793b5783a6e92d98a907b9c6713afe0fc Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 14 Oct 2020 15:38:20 +0530 Subject: [PATCH 0283/1242] Update pt-reports.yml --- configs/reports/configs/pt-reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 47767468..0561590b 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -3044,7 +3044,7 @@ ReportDefinitions: to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, manualreceiptnumber as g8receiptno, 'NA' as remarks - FROM egcl_paymentdetail pd, egcl_payment payment, eg_pt_property as pt, eg_user, + FROM egcl_paymentdetail pd, egcl_payment payment, eg_pt_property as pt, eg_user, eg_pt_address pt_addr, (select bill.id as billid, bill.consumercode as consumercodei, min(bd.fromperiod) fromperiod, max(bd.toperiod) toperiod from egcl_billdetial bd, egcl_bill bill where bill.id=bd.billid and bill.tenantid = $tenantid group by bill.id) bd where pd.paymentid=payment.id and bd.billid=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid From 847ee51fcc76413fd92b5da9d57af1f18f91887c Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 14 Oct 2020 16:51:24 +0530 Subject: [PATCH 0284/1242] Added application number in report firenoc --- configs/reports/configs/rainmaker-noc-reports.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/configs/reports/configs/rainmaker-noc-reports.yml b/configs/reports/configs/rainmaker-noc-reports.yml index 900aa87f..b6b6b95a 100644 --- a/configs/reports/configs/rainmaker-noc-reports.yml +++ b/configs/reports/configs/rainmaker-noc-reports.yml @@ -535,6 +535,11 @@ ReportDefinitions: type: string source: rainmaker-noc total: false + - name: applicationnumber + label: reports.noc.applicationnumber + type: string + source: rainmaker-noc + total: false - name: receiptdate label: reports.noc.receiptdate type: string @@ -648,6 +653,7 @@ ReportDefinitions: eg_user.name as collectorname, fdet.firenoctype as firenoctype, build.usagetype as usagetype, + fdet.applicationnumber as applicationnumber, build.name as ownername FROM egcl_payment AS payment JOIN egcl_paymentdetail as paydetail on paydetail.paymentid=payment.id @@ -677,6 +683,11 @@ ReportDefinitions: type: string source: rainmaker-noc total: false + - name: applicationnumber + label: reports.noc.applicationnumber + type: string + source: rainmaker-noc + total: false - name: receiptdate label: reports.noc.receiptdate type: string @@ -775,6 +786,7 @@ ReportDefinitions: eg_user.name as collectorname, fdet.firenoctype as firenoctype, build.usagetype as usagetype, + fdet.applicationnumber as applicationnumber, build.name as ownername FROM egcl_payment AS payment JOIN egcl_paymentdetail as paydetail on paydetail.paymentid=payment.id From 2f548cc68691401352cd87d2794de7ea4b09d966 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 14 Oct 2020 18:38:03 +0530 Subject: [PATCH 0285/1242] defaulterReportYear update --- configs/reports/configs/pt-reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 0561590b..5a970ff5 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -3934,4 +3934,4 @@ ReportDefinitions: inner join eg_user as eu on eu.uuid = po.userid inner join eg_pt_address_v2 as pta on pta.property = pt.propertyid left outer join eg_pt_unit_v2_ot as pot on pot.propertydetail = pd.assessmentnumber - where payd.tenantid = $tenantid and pd.property not in (select property from eg_pt_propertydetail_v2 where financialyear in ('2019-20')) + where payd.tenantid = $tenantid and pd.property not in (select property from eg_pt_propertydetail_v2 where financialyear in ('2020-21')) From 607040a00cd64a8e50242e3f6c8a1eb91314602e Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 14 Oct 2020 19:23:24 +0530 Subject: [PATCH 0286/1242] fyReport update --- configs/reports/configs/pt-reports.yml | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 5a970ff5..1d4cb987 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -3807,13 +3807,13 @@ ReportDefinitions: query: | -- Use CTE to force query plan, compute & use CTE later SELECT - financialyear, - sum(case when pt_detail.usagecategorymajor='RESIDENTIAL' then pd.amountpaid else 0 end) as "residential", - sum(case when pt_detail.usagecategorymajor='RESIDENTIAL' then 1 else 0 end) as "countresidential", - sum(case when pt_detail.usagecategorymajor='NONRESIDENTIAL' then pd.amountpaid else 0 end) as "nonresidential", - sum(case when pt_detail.usagecategorymajor='NONRESIDENTIAL' then 1 else 0 end) as "countnonresidential", - sum(case when pt_detail.usagecategorymajor='MIXED' then pd.amountpaid else 0 end) as "mixed", - sum(case when pt_detail.usagecategorymajor='MIXED' then 1 else 0 end) as "countmixed", + concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY')) AS "financialyear", + sum(case when pt.usagecategory='RESIDENTIAL' then pd.amountpaid else 0 end) as "residential", + sum(case when pt.usagecategory='RESIDENTIAL' then 1 else 0 end) as "countresidential", + sum(case when pt.usagecategory='NONRESIDENTIAL' then pd.amountpaid else 0 end) as "nonresidential", + sum(case when pt.usagecategory='NONRESIDENTIAL' then 1 else 0 end) as "countnonresidential", + sum(case when pt.usagecategory='MIXED' then pd.amountpaid else 0 end) as "mixed", + sum(case when pt.usagecategory='MIXED' then 1 else 0 end) as "countmixed", sum(pd.amountpaid) as totalamount, count(pd.amountpaid) as totalcount, sum(case when payment.paymentmode='ONLINE' then pd.amountpaid else 0 end) as "online", @@ -3823,10 +3823,11 @@ ReportDefinitions: FROM egcl_paymentdetail AS pd join egcl_payment as payment on payment.id = pd.paymentid join egcl_bill as bill on bill.id = pd.billid - JOIN eg_pt_propertydetail_v2 pt_detail ON pt_detail.property = bill.consumercode - JOIN eg_pt_address_v2 pt_addr ON pt_detail.property = pt_addr.property + join egcl_billdetial as billd on billd.billid = bill.id + JOIN eg_pt_property pt ON pt.propertyid = bill.consumercode + JOIN eg_pt_address pt_addr ON pt.id = pt_addr.propertyid LEFT OUTER JOIN eg_user ON eg_user.id = pd.createdby::INTEGER - WHERE pd.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' + WHERE pd.tenantid = 'pb.zirakpur' and payment.paymentstatus != 'CANCELLED' groupby: GROUP BY financialyear orderby: ORDER BY financialyear From 39e5126b262b02d8c2c39db59d052e8e98165815 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 14 Oct 2020 22:41:23 +0530 Subject: [PATCH 0287/1242] Update pt-reports.yml --- configs/reports/configs/pt-reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 1d4cb987..b30678d3 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -3827,7 +3827,7 @@ ReportDefinitions: JOIN eg_pt_property pt ON pt.propertyid = bill.consumercode JOIN eg_pt_address pt_addr ON pt.id = pt_addr.propertyid LEFT OUTER JOIN eg_user ON eg_user.id = pd.createdby::INTEGER - WHERE pd.tenantid = 'pb.zirakpur' and payment.paymentstatus != 'CANCELLED' + WHERE pd.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' groupby: GROUP BY financialyear orderby: ORDER BY financialyear From 274947b315cf9832d82f9d720bc8a14a2b60281d Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 14 Oct 2020 23:39:42 +0530 Subject: [PATCH 0288/1242] update ULBWiseReport --- configs/reports/configs/pt-reports.yml | 41 +++++++++++++------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index b30678d3..8720b8e4 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2868,11 +2868,6 @@ ReportDefinitions: type: string source: pt total: true - - name: totalamountdue - label: reports.pt.totalamountdue - type: string - source: pt - total: true searchParams: - name: fromDate label: reports.pt.fromDate @@ -2893,7 +2888,7 @@ ReportDefinitions: source: pt wrapper: true isMandatory: false - searchClause: AND financialyear = $financialyear + searchClause: AND concat(to_char((To_timestamp(fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) = $financialyear - name: usage label: Usage type: singlevaluelist @@ -2901,22 +2896,26 @@ ReportDefinitions: source: pt wrapper: true isMandatory: false - searchClause: AND usagecategorymajor = $usage + searchClause: AND eg_pt_property.usagecategory = $usage query: | SELECT - initcap(split_part(tenantid, '.', 2)) as tenantid, - COUNT(collectiontype) AS totalassessments, - SUM(billd.amount) AS totalamount, - SUM(billd.amountpaid) AS totalamountpaid, - SUM(CASE WHEN collectiontype LIKE 'ONLINE' THEN amount ELSE 0 END) AS totalonline, - SUM(CASE WHEN collectiontype LIKE 'ONLINE' THEN 1 ELSE 0 END) AS countonline, - SUM(CASE WHEN collectiontype LIKE 'COUNTER' THEN amount ELSE 0 END) AS totaloffline, - SUM(CASE WHEN collectiontype LIKE 'COUNTER' THEN 1 ELSE 0 END) AS countoffline, - (SUM(billd.amount) - SUM(billd.amountpaid)) AS totalamountdue - FROM egcl_billdetial as billd - WHERE tenantid LIKE CONCAT(SPLIT_PART($tenantid, '.', 1), '%') and tenantid = $tenantid - groupby: GROUP BY tenantid - orderby: ORDER BY tenantid, totalamountpaid DESC NULLS LAST + initcap(split_part(payment.tenantid, '.', 2)) as tenantid, + COUNT(paymentmode) AS totalassessments, + SUM(payment.totalamountpaid) AS totalamountpaid, + SUM(CASE WHEN paymentmode='ONLINE' THEN totalamountpaid ELSE 0 END) AS totalonline, + SUM(CASE WHEN paymentmode='ONLINE' THEN 1 ELSE 0 END) AS countonline, + SUM(CASE WHEN paymentmode!='ONLINE' THEN totalamountpaid ELSE 0 END) AS totaloffline, + SUM(CASE WHEN paymentmode!='ONLINE' THEN 1 ELSE 0 END) AS countoffline + FROM egcl_paymentdetail as pd, egcl_payment as payment, eg_pt_property, egcl_bill bill, egcl_billdetial billd + WHERE payment.tenantid LIKE CONCAT(SPLIT_PART($tenantid, '.', 1), '%') + and payment.tenantid = $tenantid + and payment.id=pd.paymentid + and payment.paymentstatus!='CANCELLED' + and bill.id=pd.billid + and billd.billid=bill.id + and eg_pt_property.propertyid=bill.consumercode + groupby: GROUP BY payment.tenantid + orderby: ORDER BY payment.tenantid, totalamountpaid DESC NULLS LAST - reportName: ReceiptRegisterShort_V2 summary: Receipt Register @@ -3013,7 +3012,7 @@ ReportDefinitions: source: pt wrapper: true isMandatory: false - searchClause: AND concat(t amp(bd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(bd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY')) = $financialyear + searchClause: AND concat(t amp(bd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(bd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) = $financialyear - name: localityArray label: reports.pt.zoneList type: boundarylist From 7dc913c5f680361e90ef70a2772711e33ab18b3c Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 15 Oct 2020 00:09:29 +0530 Subject: [PATCH 0289/1242] Update pt-reports.yml --- configs/reports/configs/pt-reports.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 8720b8e4..f7d8f983 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -3809,8 +3809,8 @@ ReportDefinitions: concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY')) AS "financialyear", sum(case when pt.usagecategory='RESIDENTIAL' then pd.amountpaid else 0 end) as "residential", sum(case when pt.usagecategory='RESIDENTIAL' then 1 else 0 end) as "countresidential", - sum(case when pt.usagecategory='NONRESIDENTIAL' then pd.amountpaid else 0 end) as "nonresidential", - sum(case when pt.usagecategory='NONRESIDENTIAL' then 1 else 0 end) as "countnonresidential", + sum(case when pt.usagecategory like 'NONRESIDENTIAL%' then pd.amountpaid else 0 end) as "nonresidential", + sum(case when pt.usagecategory like 'NONRESIDENTIAL%' then 1 else 0 end) as "countnonresidential", sum(case when pt.usagecategory='MIXED' then pd.amountpaid else 0 end) as "mixed", sum(case when pt.usagecategory='MIXED' then 1 else 0 end) as "countmixed", sum(pd.amountpaid) as totalamount, From 155e523c9f58b0909c1112b641888c21fe329e11 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 15 Oct 2020 00:12:01 +0530 Subject: [PATCH 0290/1242] Update pt-reports.yml --- configs/reports/configs/pt-reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index f7d8f983..d4717e10 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -3012,7 +3012,7 @@ ReportDefinitions: source: pt wrapper: true isMandatory: false - searchClause: AND concat(t amp(bd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(bd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) = $financialyear + searchClause: AND concat(to_char((To_timestamp(bd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(bd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) = $financialyear - name: localityArray label: reports.pt.zoneList type: boundarylist From 951f488dae30142216fbb27ad1ceb5c3dafb5659 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 15 Oct 2020 00:57:33 +0530 Subject: [PATCH 0291/1242] ptDumpReport_v2 updated --- configs/reports/configs/pt-reports.yml | 33 +++++++++++++------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index d4717e10..2c3fc580 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -3192,7 +3192,7 @@ ReportDefinitions: source: pt wrapper: true isMandatory: false - searchClause: AND pd.financialyear = $financialyear + searchClause: AND concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) = $financialyear - name: localityArray label: reports.pt.zoneList type: boundarylist @@ -3203,12 +3203,13 @@ ReportDefinitions: --S.no Service Name ULB Property Tax Unique ID Date Of Transcation Receipt Number Existing Property ID Owner Name Guardian Name Total Area (SQ.YARD) Covered Area/Built Area (SQ.FEET) Floors Occupancy (Rented,Self /Unoccupied) Type Of Property Mobile Number Transcation Mode of Payment Payment Amount Payment Date Email Id Address with eg_pt_unit_v2_ot as ( select - propertydetail, + propertyid, string_agg(distinct pu.occupancytype, ',') as occupancytype, - string_agg(distinct coalesce(usagecategoryminor, usagecategorymajor), ',') as propertytype - from eg_pt_unit_v2 as pu + string_agg(distinct coalesce(usagecategory), ',') as propertytype + from eg_pt_unit as pu where pu.tenantid = $tenantid - group by propertydetail) + group by propertyid + ) select distinct on (payd.receiptnumber) initcap(split_part(payd.tenantid, '.', 2)) as "ulb", @@ -3216,31 +3217,31 @@ ReportDefinitions: to_char((To_timestamp(receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS "transcationdate", receiptnumber as "receiptnumber", pt.oldpropertyid as "existingpropertyid", - pd.financialyear as "financialyear", + concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) AS "financialyear", eu."name" as "ownername", eu.guardian as "guardianname", - pd.landarea as "totalarea", - pd.builduparea * 9 as "builtarea", - pd.nooffloors as "floors", + pt.landarea as "totalarea", + pt.superbuiltuparea * 9 as "builtarea", + pt.nooffloors as "floors", eu.mobilenumber as "mobileno", paymentmode as "transcationmode", payment.totalamountpaid as "paymentamount", to_char((To_timestamp(payment.transactiondate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS "paymentdate", eu.emailid as "emailid", - REGEXP_REPLACE(REGEXP_REPLACE(CONCAT(pta.doorno, ',', pta.addressline1, ',', pta.addressline2, ',', pta.buildingname, ',', pta.pincode), ',+', ','), '^,|,$', '') as "address", + REGEXP_REPLACE(REGEXP_REPLACE(CONCAT(pta.doorno, ',', pta.buildingname, ',',pta.street,',', pta.pincode), ',+', ','), '^,|,$', '') as "address", payment.payeraddress as "payeraddress", - pd.additionaldetails->>'remarks' as "remarks", + pt.additionaldetails->>'remarks' as "remarks", pt.additionaldetails->>'FirmBusinessName' as "businessname", pta.locality as "localitycode" from egcl_paymentdetail as payd inner join egcl_payment as payment on payment.id = payd.paymentid inner join egcl_bill as bill on bill.id = payd.billid - inner join eg_pt_property_v2 as pt on pt.propertyid = bill.consumercode - inner join eg_pt_propertydetail_v2 as pd on pd.property = bill.consumercode - inner join eg_pt_owner_v2 as po on po.propertydetail = pd.assessmentnumber + inner join egcl_billdetial as billd on billd.billid=bill.id + inner join eg_pt_property as pt on pt.propertyid = bill.consumercode + inner join eg_pt_owner as po on po.propertyid = pt.id inner join eg_user as eu on eu.uuid = po.userid - inner join eg_pt_address_v2 as pta on pta.property = pt.propertyid - left outer join eg_pt_unit_v2_ot as pot on pot.propertydetail = pd.assessmentnumber + inner join eg_pt_address as pta on pta.propertyid = pt.id + left outer join eg_pt_unit_v2_ot as pot on pot.propertyid = pt.id where payd.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and payd.businessservice='PT' From e0e3c8e366488a919ebe6b98303e4b042f742f7b Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 15 Oct 2020 01:43:52 +0530 Subject: [PATCH 0292/1242] update ulbPTDefaulterReport_v2 --- configs/reports/configs/pt-reports.yml | 60 +++++++++++++------------- 1 file changed, 31 insertions(+), 29 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 2c3fc580..6dce8534 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -3906,33 +3906,35 @@ ReportDefinitions: query: | --S.no Service Name ULB Property Tax Unique ID Date Of Transcation Receipt Number Existing Property ID Type Of Property Mobile Number Address with eg_pt_unit_v2_ot as ( + select + propertyid, + string_agg(distinct pu.occupancytype, ',') as occupancytype, + string_agg(distinct coalesce(usagecategory), ',') as propertytype + from eg_pt_unit as pu + where pu.tenantid = $tenantid + group by propertyid + ) select - propertydetail, - string_agg(distinct pu.occupancytype, ',') as occupancytype, - string_agg(distinct coalesce(usagecategoryminor, usagecategorymajor), ',') as propertytype - from eg_pt_unit_v2 as pu - where pu.tenantid = $tenantid - group by propertydetail - ) - select - distinct on (payd.receiptnumber) - initcap(split_part(payd.tenantid, '.', 2)) as "ulb", - split_part(consumercode, ':', 1) as "propertytaxuniqueid", - to_char((To_timestamp(payd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS "transcationdate", - payd.receiptnumber as "receiptnumber", - pt.oldpropertyid as "existingpropertyid", - pd.financialyear as "financialyear", - eu."name" as "ownername", - eu.guardian as "guardianname", - pot.propertytype as "propertytype", - eu.mobilenumber as "mobileno", - REGEXP_REPLACE(REGEXP_REPLACE(CONCAT(pta.doorno, ',', pta.addressline1, ',', pta.addressline2, ',', pta.buildingname, ',', pta.pincode), ',+', ','), '^,|,$', '') as "address" - from egcl_paymentdetail as payd - inner join egcl_bill as bill on bill.id=payd.billid - inner join eg_pt_property_v2 as pt on pt.propertyid = bill.consumercode - inner join eg_pt_propertydetail_v2 as pd on pd.property = pt.propertyid - inner join eg_pt_owner_v2 as po on po.propertydetail = pd.assessmentnumber - inner join eg_user as eu on eu.uuid = po.userid - inner join eg_pt_address_v2 as pta on pta.property = pt.propertyid - left outer join eg_pt_unit_v2_ot as pot on pot.propertydetail = pd.assessmentnumber - where payd.tenantid = $tenantid and pd.property not in (select property from eg_pt_propertydetail_v2 where financialyear in ('2020-21')) + distinct on (payd.receiptnumber) + initcap(split_part(payd.tenantid, '.', 2)) as "ulb", + split_part(consumercode, ':', 1) as "propertytaxuniqueid", + to_char((To_timestamp(payd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS "transcationdate", + payd.receiptnumber as "receiptnumber", + pt.oldpropertyid as "existingpropertyid", + concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) AS "financialyear", + eu."name" as "ownername", + eu.guardian as "guardianname", + pot.propertytype as "propertytype", + eu.mobilenumber as "mobileno", + REGEXP_REPLACE(REGEXP_REPLACE(CONCAT(pta.doorno, ',', pta.buildingname, ',',pta.street,',', pta.pincode), ',+', ','), '^,|,$', '') as "address" + from egcl_paymentdetail as payd + inner join egcl_payment as payment on payment.id = payd.paymentid + inner join egcl_bill as bill on bill.id = payd.billid + inner join egcl_billdetial as billd on billd.billid=bill.id + inner join eg_pt_property as pt on pt.propertyid = bill.consumercode + inner join eg_pt_owner as po on po.propertyid = pt.id + inner join eg_user as eu on eu.uuid = po.userid + inner join eg_pt_address as pta on pta.propertyid = pt.id + left outer join eg_pt_unit_v2_ot as pot on pot.propertyid = pt.id + where payd.tenantid = $tenantid + and bill.consumercode not in (select consumercode from egcl_bill where tenantid=$tenantid and businessservice='PT' and id not in (select billid from egcl_billdetial where tenantid=$tenantid and concat(to_char((To_timestamp(fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) ='2020-21')) From f38b7dad15cfb1fd0fb2acab6962b2f9199979e0 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 15 Oct 2020 01:55:53 +0530 Subject: [PATCH 0293/1242] Update pt-reports.yml --- configs/reports/configs/pt-reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 6dce8534..a1558529 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -3937,4 +3937,4 @@ ReportDefinitions: inner join eg_pt_address as pta on pta.propertyid = pt.id left outer join eg_pt_unit_v2_ot as pot on pot.propertyid = pt.id where payd.tenantid = $tenantid - and bill.consumercode not in (select consumercode from egcl_bill where tenantid=$tenantid and businessservice='PT' and id not in (select billid from egcl_billdetial where tenantid=$tenantid and concat(to_char((To_timestamp(fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) ='2020-21')) + and bill.consumercode not in (select consumercode from egcl_bill where tenantid=$tenantid and businessservice='PT' and id in (select billid from egcl_billdetial where tenantid=$tenantid and concat(to_char((To_timestamp(fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) ='2020-21')) From 08d57251e301aaea92abec82ea8713eda2f235b5 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 15 Oct 2020 02:06:23 +0530 Subject: [PATCH 0294/1242] ignoring INACTIVE properties --- configs/reports/configs/pt-reports.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index a1558529..52ebe555 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -3242,7 +3242,7 @@ ReportDefinitions: inner join eg_user as eu on eu.uuid = po.userid inner join eg_pt_address as pta on pta.propertyid = pt.id left outer join eg_pt_unit_v2_ot as pot on pot.propertyid = pt.id - where payd.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and payd.businessservice='PT' + where payd.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and payd.businessservice='PT' and pt.status!='INACTIVE' - reportName: Sewa_Kendra_ReceiptRegister_V2 @@ -3827,7 +3827,7 @@ ReportDefinitions: JOIN eg_pt_property pt ON pt.propertyid = bill.consumercode JOIN eg_pt_address pt_addr ON pt.id = pt_addr.propertyid LEFT OUTER JOIN eg_user ON eg_user.id = pd.createdby::INTEGER - WHERE pd.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' + WHERE pd.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and pt.status!='INACTIVE' groupby: GROUP BY financialyear orderby: ORDER BY financialyear @@ -3938,3 +3938,4 @@ ReportDefinitions: left outer join eg_pt_unit_v2_ot as pot on pot.propertyid = pt.id where payd.tenantid = $tenantid and bill.consumercode not in (select consumercode from egcl_bill where tenantid=$tenantid and businessservice='PT' and id in (select billid from egcl_billdetial where tenantid=$tenantid and concat(to_char((To_timestamp(fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) ='2020-21')) + and pt.status!='INACTIVE' From 6012bc8f4bf1aab419bc4735b924513bb766af58 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 15 Oct 2020 02:20:46 +0530 Subject: [PATCH 0295/1242] Update pt-reports.yml --- configs/reports/configs/pt-reports.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 52ebe555..2fcc742b 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2911,6 +2911,7 @@ ReportDefinitions: and payment.tenantid = $tenantid and payment.id=pd.paymentid and payment.paymentstatus!='CANCELLED' + and pd.businessservice='PT' and bill.id=pd.billid and billd.billid=bill.id and eg_pt_property.propertyid=bill.consumercode From 13a685598b7fe61afb4fa3d9e094ba08fac0b63d Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 15 Oct 2020 06:54:24 +0530 Subject: [PATCH 0296/1242] DecryptionKeys Applied --- configs/reports/configs/pt-reports.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 2fcc742b..e0648d65 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -215,7 +215,7 @@ ReportDefinitions: to_char((To_timestamp(rh.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, Initcap(COALESCE(pt_detail.usagecategoryminor, pt_detail.usagecategorymajor)) as usagetype, manualreceiptnumber as g8receiptno, - eg_user.name as collectorname, + (case when eg_user.name is null then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else eg_user.name end) as collectorname, pt_detail.additionaldetails->>'remarks' as "remarks" FROM egcl_receiptheader_v1 AS rh JOIN egcl_receiptinstrument_v1 AS ri ON rh.id = ri.receiptheader @@ -2919,7 +2919,8 @@ ReportDefinitions: orderby: ORDER BY payment.tenantid, totalamountpaid DESC NULLS LAST - reportName: ReceiptRegisterShort_V2 - summary: Receipt Register + decryptionPathId: ReceiptRegisterShort_V2 + summary: Account Receipt Register version: 1.0.0 moduleName: rainmaker-pt additionalConfig: @@ -3054,6 +3055,7 @@ ReportDefinitions: - reportName: ULBPTDataDumpReport_V2 + decryptionPathId: ULBPTDataDumpReport_V2 summary: ULB level report version: 1.0.0 moduleName: rainmaker-pt @@ -3833,6 +3835,7 @@ ReportDefinitions: orderby: ORDER BY financialyear - reportName: ULBDEFAULTERPTREPORT_V2 + decryptionPathId: ULBDEFAULTERPTREPORT_V2 summary: ULB Defaulter Pt report version: 1.0.0 moduleName: rainmaker-pt From 4841833562a41dce0e5aeaf664cd581ac338f1be Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 15 Oct 2020 07:20:18 +0530 Subject: [PATCH 0297/1242] decryption default value --- configs/reports/configs/pt-reports.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index e0648d65..36c1bddd 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2920,7 +2920,7 @@ ReportDefinitions: - reportName: ReceiptRegisterShort_V2 decryptionPathId: ReceiptRegisterShort_V2 - summary: Account Receipt Register + summary: Receipt Register version: 1.0.0 moduleName: rainmaker-pt additionalConfig: @@ -3040,7 +3040,7 @@ ReportDefinitions: payment.paymentmode as instrumenttype, payment.transactionnumber as transactionnumber, concat(to_char((To_timestamp(bd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(bd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY')) AS financialyear, - eg_user.name as collectorname, + (case when eg_user.name is null then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else eg_user.name end) as collectorname, --receipt_breakup.*, to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, manualreceiptnumber as g8receiptno, @@ -3221,12 +3221,12 @@ ReportDefinitions: receiptnumber as "receiptnumber", pt.oldpropertyid as "existingpropertyid", concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) AS "financialyear", - eu."name" as "ownername", - eu.guardian as "guardianname", + (case when eu."name" is null then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else eu."name" end) as "ownername", + (case when eu.guardian is null then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else eu.guardian end) as "guardianname", pt.landarea as "totalarea", pt.superbuiltuparea * 9 as "builtarea", pt.nooffloors as "floors", - eu.mobilenumber as "mobileno", + (case when eu.mobilenumber is null then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else eu.mobilenumber end) as "mobileno", paymentmode as "transcationmode", payment.totalamountpaid as "paymentamount", to_char((To_timestamp(payment.transactiondate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS "paymentdate", @@ -3465,7 +3465,7 @@ ReportDefinitions: to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, Initcap(COALESCE(pt_detail.usagecategoryminor, pt_detail.usagecategorymajor)) as usagetype, manualreceiptnumber as g8receiptno, - (CASE WHEN collectiontype='COUNTER' THEN eg_user.name ELSE '' END) as collectorname, + (CASE WHEN collectiontype='COUNTER' THEN eg_user.name ELSE '30048|21Fj+c3k2ldB0X3AzIh7atXB' END) as collectorname, pt_detail.additionaldetails->>'remarks' as "remarks" FROM egcl_bill AS bill INNER JOIN egcl_billdetial as bd on bd.billid = bill.id @@ -3926,10 +3926,10 @@ ReportDefinitions: payd.receiptnumber as "receiptnumber", pt.oldpropertyid as "existingpropertyid", concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) AS "financialyear", - eu."name" as "ownername", - eu.guardian as "guardianname", + (case when eu."name" is null then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else eu."name" end) as "ownername", + (case when eu.guardian is null then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else eu.guardian end) as "guardianname", pot.propertytype as "propertytype", - eu.mobilenumber as "mobileno", + (case when eu.mobilenumber is null then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else eu.mobilenumber end) as "mobileno", REGEXP_REPLACE(REGEXP_REPLACE(CONCAT(pta.doorno, ',', pta.buildingname, ',',pta.street,',', pta.pincode), ',+', ','), '^,|,$', '') as "address" from egcl_paymentdetail as payd inner join egcl_payment as payment on payment.id = payd.paymentid From be6edcea2749d7b62bee802f1f50466523d1178a Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 15 Oct 2020 09:48:47 +0530 Subject: [PATCH 0298/1242] decryption fix --- configs/reports/configs/pt-reports.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 36c1bddd..68cc735a 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2919,7 +2919,6 @@ ReportDefinitions: orderby: ORDER BY payment.tenantid, totalamountpaid DESC NULLS LAST - reportName: ReceiptRegisterShort_V2 - decryptionPathId: ReceiptRegisterShort_V2 summary: Receipt Register version: 1.0.0 moduleName: rainmaker-pt @@ -3040,7 +3039,7 @@ ReportDefinitions: payment.paymentmode as instrumenttype, payment.transactionnumber as transactionnumber, concat(to_char((To_timestamp(bd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(bd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY')) AS financialyear, - (case when eg_user.name is null then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else eg_user.name end) as collectorname, + (case when eg_user.name is null then ' ' else eg_user.name end) as collectorname, --receipt_breakup.*, to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, manualreceiptnumber as g8receiptno, @@ -3221,12 +3220,12 @@ ReportDefinitions: receiptnumber as "receiptnumber", pt.oldpropertyid as "existingpropertyid", concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) AS "financialyear", - (case when eu."name" is null then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else eu."name" end) as "ownername", - (case when eu.guardian is null then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else eu.guardian end) as "guardianname", + eu."name" as "ownername", + eu.guardian as "guardianname", pt.landarea as "totalarea", pt.superbuiltuparea * 9 as "builtarea", pt.nooffloors as "floors", - (case when eu.mobilenumber is null then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else eu.mobilenumber end) as "mobileno", + eu.mobilenumber as "mobileno", paymentmode as "transcationmode", payment.totalamountpaid as "paymentamount", to_char((To_timestamp(payment.transactiondate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS "paymentdate", @@ -3926,10 +3925,10 @@ ReportDefinitions: payd.receiptnumber as "receiptnumber", pt.oldpropertyid as "existingpropertyid", concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) AS "financialyear", - (case when eu."name" is null then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else eu."name" end) as "ownername", - (case when eu.guardian is null then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else eu.guardian end) as "guardianname", + eu."name" as "ownername", + eu.guardian as "guardianname", pot.propertytype as "propertytype", - (case when eu.mobilenumber is null then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else eu.mobilenumber end) as "mobileno", + eu.mobilenumber as "mobileno", REGEXP_REPLACE(REGEXP_REPLACE(CONCAT(pta.doorno, ',', pta.buildingname, ',',pta.street,',', pta.pincode), ',+', ','), '^,|,$', '') as "address" from egcl_paymentdetail as payd inner join egcl_payment as payment on payment.id = payd.paymentid From a820be8945c877a4100e7a84d67b02e7cd3d987c Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 15 Oct 2020 10:01:45 +0530 Subject: [PATCH 0299/1242] decryption removed --- configs/reports/configs/pt-reports.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 68cc735a..56cd08ab 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -3054,7 +3054,6 @@ ReportDefinitions: - reportName: ULBPTDataDumpReport_V2 - decryptionPathId: ULBPTDataDumpReport_V2 summary: ULB level report version: 1.0.0 moduleName: rainmaker-pt @@ -3834,7 +3833,6 @@ ReportDefinitions: orderby: ORDER BY financialyear - reportName: ULBDEFAULTERPTREPORT_V2 - decryptionPathId: ULBDEFAULTERPTREPORT_V2 summary: ULB Defaulter Pt report version: 1.0.0 moduleName: rainmaker-pt From 5dcee11a7f1f8cea6c89c8baf61013d642c8441f Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 15 Oct 2020 12:02:45 +0530 Subject: [PATCH 0300/1242] updated state reports --- configs/reports/configs/pt-reports.yml | 204 ++++++++++++------------- 1 file changed, 98 insertions(+), 106 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 56cd08ab..7f1ebe21 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2536,29 +2536,19 @@ ReportDefinitions: orderby: ORDER BY tenantid, totalamountpaid DESC NULLS LAST - reportName: StateCancelledReceiptRegister_V2 - summary: Receipt Register for cancelled Receipts State + summary: Receipt Register for cancelled Receipts state version: 1.0.0 moduleName: rainmaker-pt additionalConfig: print: pdfPageSize: "A1" sourceColumns: - - name: tenantid - label: reports.pt.ulbName - type: string - source: pt - total: false - name: receiptnumber label: reports.pt.receiptNo type: string source: pt total: false - - name: status - label: reports.pt.status - type: string - source: pt - total: false - - name: transactiondate + - name: receiptdate label: reports.pt.receiptDate type: string source: pt @@ -2628,7 +2618,12 @@ ReportDefinitions: type: string source: pt total: true - - name: propertyid + - name: pendingamount + label: reports.pt.pendingamount + type: string + source: pt + total: true + - name: consumercode label: reports.pt.propertyId type: string source: pt @@ -2638,16 +2633,6 @@ ReportDefinitions: type: string source: pt total: false - - name: assessmentnumber - label: reports.pt.assessmentNo - type: string - source: pt - total: false - - name: financialyear - label: reports.pt.financialYear - type: string - source: pt - total: false - name: instrumenttype label: reports.pt.paymentMode type: string @@ -2658,53 +2643,65 @@ ReportDefinitions: type: string source: pt total: false + - name: transactiondate + label: reports.pt.ddChequeTransactionDate + type: string + source: pt + total: false - name: bankname label: reports.pt.bankName type: string source: pt total: false + - name: collectorname + label: reports.pt.collectorname + type: string + source: pt + total: false + - name: fromdate + label: reports.pt.fromDate + type: string + source: pt + total: false + - name: todate + label: reports.pt.toDate + type: string + source: pt + total: false searchParams: - name: fromDate label: reports.pt.fromDate type: epoch source: pt - isMandatory: false - searchClause: AND rh.receiptdate >= $fromDate + isMandatory: true + searchClause: AND pd.receiptdate >= $fromDate - name: toDate label: reports.pt.toDate type: epoch source: pt - isMandatory: false - searchClause: AND rh.receiptdate <= $toDate + isMandatory: true + searchClause: AND pd.receiptdate <= $toDate - name: paymentMode label: Payment Mode type: singlevaluelist pattern: 'list://Cash:Cash,Online:Online,Card:Card,DD:DD,Cheque:Cheque' source: pt isMandatory: false - searchClause: AND instrumenttype = $paymentMode - - name: financialyear - label: Financial Year - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name - source: pt - wrapper: true - isMandatory: false - searchClause: AND financialyear = $financialyear + searchClause: AND payment.paymentmode = $paymentMode query: | -- Use CTE to force query plan, compute & use CTE later - WITH receipt_breakup AS ( - SELECT - receiptnumber as receiptheader, - SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, - SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, - SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, - SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, - SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as propertytax, - (SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN adjustedamount ELSE 0 END) + WITH receipt_breakup AS ( + SELECT + pd.id as pdid, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, + SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as propertytax, + (SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN adjustedamount ELSE 0 END) + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN adjustedamount ELSE 0 END) )as exemption, ( SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) @@ -2713,75 +2710,71 @@ ReportDefinitions: INNER JOIN egcl_billdetial as bd on bd.id = bad.billdetailid INNER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid INNER JOIN egcl_payment as payment on pd.paymentid=payment.id - WHERE pd.tenantid != 'pb.testing' and payment.paymentstatus = 'CANCELLED' and pd.businessservice='PT' - GROUP BY pd.receiptnumber + WHERE bad.tenantid not in ('pb.testing','pb.ludhiana_legacy') and payment.paymentstatus = 'CANCELLED' and pd.businessservice='PT' + GROUP BY pdid ) - SELECT - pd.tenantid AS tenantid, - pd.id, - pt_detail.property AS propertyid, - pt_detail.assessmentnumber AS assessmentnumber, - payment.paymentstatus, + SELECT + pd.tenantid AS tenantid, + pd.id, bill.consumercode, to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS receiptdate, payment.ifsccode AS bankname, receiptnumber, payment.totalamountpaid as amount, payment.paymentmode as instrumenttype, - payment.transactionnumber, - receipt_breakup.*, + payment.transactionnumber, + to_char((To_timestamp(bd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS fromdate, + to_char((To_timestamp(bd.toperiod/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS todate, + to_char((To_timestamp(payment.transactiondate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, pd.due AS pendingamount, - pt_detail.financialyear, - to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, - Initcap(COALESCE(pt_detail.usagecategoryminor, pt_detail.usagecategorymajor)) as usagetype, - manualreceiptnumber as g8receiptno - FROM egcl_paymentdetail AS pd - JOIN egcl_payment as payment on pd.paymentid=payment.id - JOIN egcl_bill as bill on bill.id=pd.billid - JOIN egcl_billdetial as bd on bd.billid = bill.id - JOIN eg_pt_property_v2 as pt on pt.propertyid = bill.consumercode - JOIN receipt_breakup ON receipt_breakup.receiptheader = pd.receiptnumber - JOIN eg_pt_propertydetail_v2 pt_detail ON pt_detail.property = pt.propertyid - JOIN eg_pt_address_v2 pt_addr ON pt_detail.property = pt_addr.property - LEFT OUTER JOIN eg_user ON eg_user.id = pd.createdby::INTEGER - WHERE pd.tenantid != 'pb.testing' and payment.paymentstatus = 'CANCELLED' and pd.businessservice='PT' - orderby: ORDER BY pd.receiptdate DESC - + Initcap(pt.usagecategory) as usagetype, + (CASE WHEN billd.collectiontype='COUNTER' THEN eg_user.name ELSE '' END) as collectorname, + receipt_breakup.*, + to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, manualreceiptnumber as g8receiptno + FROM egcl_paymentdetail pd, eg_user, eg_pt_property as pt, egcl_billdetial as billd, egcl_payment payment,receipt_breakup, egcl_bill bill, (select bill.id as billid, min(bd.fromperiod) fromperiod, max(bd.toperiod) toperiod from egcl_billdetial bd, egcl_bill bill where bill.id=bd.billid group by bill.id) bd + WHERE pd.paymentid=payment.id and eg_user.id = pd.createdby::INTEGER and pt.propertyid = bill.consumercode and bill.id=pd.billid and bill.id=billd.billid and bd.billid=bill.id and payment.paymentstatus = 'CANCELLED' and pd.businessservice='PT' and payment.tenantid not in ('pb.testing','pb.ludhiana_legacy') and receipt_breakup.pdid=pd.id + orderby: ORDER BY pd.receiptdate DESC; + - reportName: StateWidePtCollection_V2 summary: State Wide PT Collection version: 1.0.0 moduleName: rainmaker-pt sourceColumns: - name: tenantid - label: reports.pt.ulbName + label: reports.pt.tenantid type: string source: pt total: false - - name: totalassessments - label: reports.pt.totalassessments - type: string - source: pt - total: true - name: totalamountpaid label: reports.pt.totalamountpaid type: string source: pt total: true + - name: totalassessments + label: reports.pt.totalassessments + type: string + source: pt + total: true - name: totaloffline label: reports.pt.totaloffline type: string source: pt total: true + - name: countoffline + label: reports.pt.countoffline + type: string + source: pt + total: true - name: totalonline label: reports.pt.totalonline type: string source: pt total: true - - name: totalamountdue - label: reports.pt.totalamountdue + - name: countonline + label: reports.pt.countonline type: string source: pt - total: true + total: true searchParams: - name: fromDate label: reports.pt.fromDate @@ -2795,14 +2788,6 @@ ReportDefinitions: source: pt isMandatory: false searchClause: AND receiptdate <= $toDate - - name: ulb - label: ULB - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name - source: pt - wrapper: true - isMandatory: false - searchClause: AND tenantid = $ulb - name: financialyear label: Financial Year type: singlevaluelist @@ -2810,7 +2795,7 @@ ReportDefinitions: source: pt wrapper: true isMandatory: false - searchClause: AND financialyear = $financialyear + searchClause: AND concat(to_char((To_timestamp(fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) = $financialyear - name: usage label: Usage type: singlevaluelist @@ -2818,21 +2803,28 @@ ReportDefinitions: source: pt wrapper: true isMandatory: false - searchClause: AND usagecategorymajor = $usage + searchClause: AND eg_pt_property.usagecategory = $usage query: | - SELECT - initcap(split_part(tenantid, '.', 2)) as tenantid, - COUNT(*) AS totalassessments, - SUM(billd.amount) AS totalamount, - SUM(billd.amountpaid) AS totalamountpaid, - SUM(CASE WHEN billd.collectiontype LIKE 'ONLINE' THEN amount ELSE 0 END) AS totalonline, - SUM(CASE WHEN billd.collectiontype LIKE 'COUNTER' THEN amount ELSE 0 END) AS totaloffline, - (SUM(billd.amount) - SUM(billd.amountpaid)) AS totalamountdue - FROM egcl_billdetial as billd - WHERE tenantid not in ('pb.testing','pb.ludhiana_legacy') - groupby: GROUP BY tenantid - orderby: ORDER BY tenantid, totalamountpaid DESC NULLS LAST - + SELECT + initcap(split_part(payment.tenantid, '.', 2)) as tenantid, + COUNT(paymentmode) AS totalassessments, + SUM(payment.totalamountpaid) AS totalamountpaid, + SUM(CASE WHEN paymentmode='ONLINE' THEN totalamountpaid ELSE 0 END) AS totalonline, + SUM(CASE WHEN paymentmode='ONLINE' THEN 1 ELSE 0 END) AS countonline, + SUM(CASE WHEN paymentmode!='ONLINE' THEN totalamountpaid ELSE 0 END) AS totaloffline, + SUM(CASE WHEN paymentmode!='ONLINE' THEN 1 ELSE 0 END) AS countoffline + FROM egcl_paymentdetail as pd, egcl_payment as payment, eg_pt_property, egcl_bill bill, egcl_billdetial billd + WHERE payment.id=pd.paymentid + and payment.paymentstatus!='CANCELLED' + and pd.businessservice='PT' + and bill.id=pd.billid + and billd.billid=bill.id + and eg_pt_property.propertyid=bill.consumercode + and payment.tenantid !='pb.testing' + groupby: GROUP BY payment.tenantid + orderby: ORDER BY payment.tenantid, totalamountpaid DESC NULLS LAST + + - reportName: UlbWisePtCollection_V2 summary: State Wide PT Collection version: 1.0.0 From 1ad3b39445720c794b08ef9259134ad696385afe Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 15 Oct 2020 13:07:06 +0530 Subject: [PATCH 0301/1242] removed decryptionKey --- configs/reports/configs/tl-reports.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/reports/configs/tl-reports.yml b/configs/reports/configs/tl-reports.yml index b1c9401c..99109ddb 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -2126,7 +2126,6 @@ ReportDefinitions: - reportName: SearchTradeLicenseApplicationReport_v2 - decryptionPathId: SearchTradeLicenseApplicationReport_v2 summary: TL Search Application Report version: 1.0.0 moduleName: rainmaker-tl From ed419533606bf9d9481900514da509014d081d97 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 15 Oct 2020 13:36:08 +0530 Subject: [PATCH 0302/1242] updated stateReceiptRegisterSummary_V2 --- configs/reports/configs/pt-reports.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 7f1ebe21..e8c179a1 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -3666,13 +3666,13 @@ ReportDefinitions: type: epoch source: pt isMandatory: false - searchClause: AND rh.receiptdate >= $fromDate + searchClause: AND pd.receiptdate >= $fromDate - name: toDate label: reports.pt.toDate type: epoch source: pt isMandatory: false - searchClause: AND rh.receiptdate <= $toDate + searchClause: AND pd.receiptdate <= $toDate - name: ulb label: ULB type: singlevaluelist @@ -3680,7 +3680,7 @@ ReportDefinitions: source: pt wrapper: true isMandatory: false - searchClause: AND rd.tenantid = $ulb + searchClause: AND bd.tenantid = $ulb query: | -- Use CTE to force query plan, compute & use CTE later SELECT @@ -3701,7 +3701,7 @@ ReportDefinitions: FROM egcl_billaccountdetail as bad INNER JOIN egcl_billdetial as bd on bd.id = bad.billdetailid INNER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid - WHERE bd.tenantid = 'pb.testing' and pd.businessservice='PT' + WHERE bd.tenantid != 'pb.testing' and pd.businessservice='PT' groupby: group by bd.tenantid orderby: order by bd.tenantid From 941a2c979a9373046b4de2081cbaddc35796cf97 Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov Date: Thu, 15 Oct 2020 23:33:12 +0530 Subject: [PATCH 0303/1242] [PI-831]-Updated update-tl-adhoc-tradelicense kafka topic query for additional details --- configs/egov-persister/tradelicense-persister.yml | 6 +++++- configs/egov-persister/tradelicense.yml | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/configs/egov-persister/tradelicense-persister.yml b/configs/egov-persister/tradelicense-persister.yml index e772d467..6fc5110f 100644 --- a/configs/egov-persister/tradelicense-persister.yml +++ b/configs/egov-persister/tradelicense-persister.yml @@ -824,7 +824,7 @@ serviceMaps: queryMaps: - - query: UPDATE eg_tl_tradelicensedetail SET adhocExemption = ?,adhocPenalty = ?,adhocExemptionReason = ?,adhocPenaltyReason = ?,lastmodifiedby = ?, lastmodifiedtime = ? WHERE id = ?; + - query: UPDATE eg_tl_tradelicensedetail SET additionaldetail = ?, adhocExemption = ?,adhocPenalty = ?,adhocExemptionReason = ?,adhocPenaltyReason = ?,lastmodifiedby = ?, lastmodifiedtime = ? WHERE id = ?; basePath: Licenses.*.tradeLicenseDetail jsonMaps: @@ -841,3 +841,7 @@ serviceMaps: - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime - jsonPath: $.Licenses.*.tradeLicenseDetail.id + + - jsonPath: $.Licenses.*.tradeLicenseDetail.additionalDetail + type: JSON + dbType: JSONB diff --git a/configs/egov-persister/tradelicense.yml b/configs/egov-persister/tradelicense.yml index e772d467..6fc5110f 100644 --- a/configs/egov-persister/tradelicense.yml +++ b/configs/egov-persister/tradelicense.yml @@ -824,7 +824,7 @@ serviceMaps: queryMaps: - - query: UPDATE eg_tl_tradelicensedetail SET adhocExemption = ?,adhocPenalty = ?,adhocExemptionReason = ?,adhocPenaltyReason = ?,lastmodifiedby = ?, lastmodifiedtime = ? WHERE id = ?; + - query: UPDATE eg_tl_tradelicensedetail SET additionaldetail = ?, adhocExemption = ?,adhocPenalty = ?,adhocExemptionReason = ?,adhocPenaltyReason = ?,lastmodifiedby = ?, lastmodifiedtime = ? WHERE id = ?; basePath: Licenses.*.tradeLicenseDetail jsonMaps: @@ -841,3 +841,7 @@ serviceMaps: - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime - jsonPath: $.Licenses.*.tradeLicenseDetail.id + + - jsonPath: $.Licenses.*.tradeLicenseDetail.additionalDetail + type: JSON + dbType: JSONB From 7da9f9c9288300e5de3ce9c239ce18464607970a Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 16 Oct 2020 06:25:55 +0530 Subject: [PATCH 0304/1242] applied decryption --- configs/reports/configs/pt-reports.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index e8c179a1..53aaaf50 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -3825,6 +3825,7 @@ ReportDefinitions: orderby: ORDER BY financialyear - reportName: ULBDEFAULTERPTREPORT_V2 + decryptionPathId: ULBDEFAULTERPTREPORT_V2 summary: ULB Defaulter Pt report version: 1.0.0 moduleName: rainmaker-pt From b6dd6dfa8f46fbc0aeea7a53b74e740ed97f1539 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 16 Oct 2020 06:54:21 +0530 Subject: [PATCH 0305/1242] DumptReport DecryptionKey applied --- configs/reports/configs/pt-reports.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 53aaaf50..2f82ab12 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -3046,6 +3046,7 @@ ReportDefinitions: - reportName: ULBPTDataDumpReport_V2 + decryptionPathId: ULBPTDataDumpReport_V2 summary: ULB level report version: 1.0.0 moduleName: rainmaker-pt From b6ec4d3188a37c17e8b08bba4c2851d3597b94cc Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 16 Oct 2020 07:14:15 +0530 Subject: [PATCH 0306/1242] DecryptionKey applied ReceiptRegiserShort_V2 --- configs/reports/configs/pt-reports.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 2f82ab12..c42f9274 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2911,6 +2911,7 @@ ReportDefinitions: orderby: ORDER BY payment.tenantid, totalamountpaid DESC NULLS LAST - reportName: ReceiptRegisterShort_V2 + decryptionPathId: ReceiptRegisterShort_V2 summary: Receipt Register version: 1.0.0 moduleName: rainmaker-pt From 896af7705a1b29b5880dc76439f379ed32517616 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 16 Oct 2020 07:32:21 +0530 Subject: [PATCH 0307/1242] applied decryption StateCancelledReceiptRegister_V --- configs/reports/configs/pt-reports.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index c42f9274..acd5d8f1 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2536,6 +2536,7 @@ ReportDefinitions: orderby: ORDER BY tenantid, totalamountpaid DESC NULLS LAST - reportName: StateCancelledReceiptRegister_V2 + decryptionPathId: CancelledReceiptRegister_V2 summary: Receipt Register for cancelled Receipts state version: 1.0.0 moduleName: rainmaker-pt From 42c198117a030b8d041c80ae0dc43c3cd2950d48 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 16 Oct 2020 07:41:51 +0530 Subject: [PATCH 0308/1242] default encrypted value for collectorName --- configs/reports/configs/pt-reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index acd5d8f1..f0929603 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2729,7 +2729,7 @@ ReportDefinitions: to_char((To_timestamp(payment.transactiondate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, pd.due AS pendingamount, Initcap(pt.usagecategory) as usagetype, - (CASE WHEN billd.collectiontype='COUNTER' THEN eg_user.name ELSE '' END) as collectorname, + (CASE WHEN billd.collectiontype='COUNTER' THEN eg_user.name ELSE '30048|21Fj+c3k2ldB0X3AzIh7atXB' END) as collectorname, receipt_breakup.*, to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, manualreceiptnumber as g8receiptno FROM egcl_paymentdetail pd, eg_user, eg_pt_property as pt, egcl_billdetial as billd, egcl_payment payment,receipt_breakup, egcl_bill bill, (select bill.id as billid, min(bd.fromperiod) fromperiod, max(bd.toperiod) toperiod from egcl_billdetial bd, egcl_bill bill where bill.id=bd.billid group by bill.id) bd From 7b0986db8554af163395d56f2565c576ffc3f487 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 16 Oct 2020 07:59:02 +0530 Subject: [PATCH 0309/1242] default encrypted NA for Collectorname --- configs/reports/configs/pt-reports.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index f0929603..daa1a4b6 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -1623,7 +1623,7 @@ ReportDefinitions: to_char((To_timestamp(rh.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, Initcap(COALESCE(pt_detail.usagecategoryminor, pt_detail.usagecategorymajor)) as usagetype, manualreceiptnumber as g8receiptno, - (CASE WHEN collectiontype='COUNTER' THEN eg_user.name ELSE '' END) as collectorname, + (case when eg_user.name is null then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else eg_user.name end) as collectorname, pt_detail.additionaldetails->>'remarks' as "remarks" FROM egcl_receiptheader_v1 AS rh JOIN egcl_receiptinstrument_v1 AS ri ON rh.id = ri.receiptheader @@ -2266,7 +2266,7 @@ ReportDefinitions: to_char((To_timestamp(payment.transactiondate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, pd.due AS pendingamount, Initcap(pt.usagecategory) as usagetype, - eg_user.name as collectorname, + (case when eg_user.name is null then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else eg_user.name end) as collectorname, receipt_breakup.*, to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, manualreceiptnumber as g8receiptno @@ -2472,7 +2472,7 @@ ReportDefinitions: to_char((To_timestamp(payment.transactiondate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, pd.due AS pendingamount, Initcap(pt.usagecategory) as usagetype, - (CASE WHEN billd.collectiontype='COUNTER' THEN eg_user.name ELSE '' END) as collectorname, + (CASE WHEN billd.collectiontype='COUNTER' THEN eg_user.name ELSE '30048|21Fj+c3k2ldB0X3AzIh7atXB' END) as collectorname, receipt_breakup.*, to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, manualreceiptnumber as g8receiptno FROM egcl_paymentdetail pd, eg_user, eg_pt_property as pt, egcl_billdetial as billd, egcl_payment payment,receipt_breakup, egcl_bill bill, (select bill.id as billid, min(bd.fromperiod) fromperiod, max(bd.toperiod) toperiod from egcl_billdetial bd, egcl_bill bill where bill.id=bd.billid group by bill.id) bd @@ -3033,7 +3033,7 @@ ReportDefinitions: payment.paymentmode as instrumenttype, payment.transactionnumber as transactionnumber, concat(to_char((To_timestamp(bd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(bd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY')) AS financialyear, - (case when eg_user.name is null then ' ' else eg_user.name end) as collectorname, + (case when eg_user.name is null then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else eg_user.name end) as collectorname, --receipt_breakup.*, to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, manualreceiptnumber as g8receiptno, From b62c6264c977f10564be61c969532bf7699efab7 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 16 Oct 2020 08:34:30 +0530 Subject: [PATCH 0310/1242] financialYear Search in ReceiptRegister --- configs/reports/configs/pt-reports.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index daa1a4b6..6b648bd3 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2219,6 +2219,14 @@ ReportDefinitions: source: pt isMandatory: true searchClause: AND pd.receiptdate <= $toDate + - name: financialyear + label: Financial Year + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name + source: pt + wrapper: true + isMandatory: false + searchClause: AND concat(to_char((To_timestamp(fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) = $financialyear - name: paymentMode label: Payment Mode type: singlevaluelist @@ -2425,6 +2433,14 @@ ReportDefinitions: source: pt isMandatory: true searchClause: AND pd.receiptdate <= $toDate + - name: financialyear + label: Financial Year + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name + source: pt + wrapper: true + isMandatory: false + searchClause: AND concat(to_char((To_timestamp(fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) = $financialyear - name: paymentMode label: Payment Mode type: singlevaluelist From b537980203f786c865523e95a4a03d57e7978e4b Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov Date: Fri, 16 Oct 2020 11:53:41 +0530 Subject: [PATCH 0311/1242] PI-831-Corrected TL adhoc update query --- configs/egov-persister/tradelicense-persister.yml | 10 +++++----- configs/egov-persister/tradelicense.yml | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/configs/egov-persister/tradelicense-persister.yml b/configs/egov-persister/tradelicense-persister.yml index 6fc5110f..b012713e 100644 --- a/configs/egov-persister/tradelicense-persister.yml +++ b/configs/egov-persister/tradelicense-persister.yml @@ -828,6 +828,10 @@ serviceMaps: basePath: Licenses.*.tradeLicenseDetail jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.additionalDetail + type: JSON + dbType: JSONB + - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocExemption - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocPenalty @@ -840,8 +844,4 @@ serviceMaps: - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime - - jsonPath: $.Licenses.*.tradeLicenseDetail.id - - - jsonPath: $.Licenses.*.tradeLicenseDetail.additionalDetail - type: JSON - dbType: JSONB + - jsonPath: $.Licenses.*.tradeLicenseDetail.id \ No newline at end of file diff --git a/configs/egov-persister/tradelicense.yml b/configs/egov-persister/tradelicense.yml index 6fc5110f..2efc3184 100644 --- a/configs/egov-persister/tradelicense.yml +++ b/configs/egov-persister/tradelicense.yml @@ -828,6 +828,10 @@ serviceMaps: basePath: Licenses.*.tradeLicenseDetail jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.additionalDetail + type: JSON + dbType: JSONB + - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocExemption - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocPenalty @@ -841,7 +845,3 @@ serviceMaps: - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime - jsonPath: $.Licenses.*.tradeLicenseDetail.id - - - jsonPath: $.Licenses.*.tradeLicenseDetail.additionalDetail - type: JSON - dbType: JSONB From 540dfe2aba95661f40ff1e9d0e882cf56a773004 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 16 Oct 2020 19:13:58 +0530 Subject: [PATCH 0312/1242] localitySearch in ReceiptRegister_v2 --- configs/reports/configs/pt-reports.yml | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 6b648bd3..47ec8bc2 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2234,6 +2234,12 @@ ReportDefinitions: source: pt isMandatory: false searchClause: AND payment.paymentmode = $paymentMode + - name: localityArray + label: reports.pt.zoneList + type: boundarylist + source: pt + isMandatory: false + searchClause: AND pt_addr.locality IN ($localityArray) query: | -- Use CTE to force query plan, compute & use CTE later WITH receipt_breakup AS ( @@ -2280,9 +2286,11 @@ ReportDefinitions: manualreceiptnumber as g8receiptno FROM egcl_paymentdetail pd, egcl_payment payment, eg_pt_property as pt, receipt_breakup, eg_user, (select bill.id as billid, bill.consumercode as consumercodei, min(bd.fromperiod) fromperiod, max(bd.toperiod) toperiod from egcl_billdetial bd, egcl_bill bill - where bill.id=bd.billid and bill.tenantid = $tenantid group by bill.id) bd + where bill.id=bd.billid and bill.tenantid = $tenantid group by bill.id) bd, + (select string_agg(distinct propertyid,',') as propertyid,string_agg(distinct locality,',') as locality from eg_pt_address where tenantid='pb.testing' group by propertyid ) pt_addr where pd.paymentid=payment.id and bd.billid=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid and pt.propertyid = bd.consumercodei and receipt_breakup.pdid=pd.id and eg_user.id = pd.createdby::INTEGER and pt.status!='INACTIVE' + and pt_addr.propertyid=pt.id --and pt.propertyid='PT-1012-978737' orderby: ORDER BY pd.receiptdate DESC; @@ -2448,6 +2456,12 @@ ReportDefinitions: source: pt isMandatory: false searchClause: AND payment.paymentmode = $paymentMode + - name: localityArray + label: reports.pt.zoneList + type: boundarylist + source: pt + isMandatory: false + searchClause: AND pt_addr.locality IN ($localityArray) query: | -- Use CTE to force query plan, compute & use CTE later WITH receipt_breakup AS ( @@ -2491,8 +2505,10 @@ ReportDefinitions: (CASE WHEN billd.collectiontype='COUNTER' THEN eg_user.name ELSE '30048|21Fj+c3k2ldB0X3AzIh7atXB' END) as collectorname, receipt_breakup.*, to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, manualreceiptnumber as g8receiptno - FROM egcl_paymentdetail pd, eg_user, eg_pt_property as pt, egcl_billdetial as billd, egcl_payment payment,receipt_breakup, egcl_bill bill, (select bill.id as billid, min(bd.fromperiod) fromperiod, max(bd.toperiod) toperiod from egcl_billdetial bd, egcl_bill bill where bill.id=bd.billid group by bill.id) bd + FROM egcl_paymentdetail pd, eg_user, eg_pt_property as pt, egcl_billdetial as billd, egcl_payment payment,receipt_breakup, egcl_bill bill, (select bill.id as billid, min(bd.fromperiod) fromperiod, max(bd.toperiod) toperiod from egcl_billdetial bd, egcl_bill bill where bill.id=bd.billid group by bill.id) bd, + (select string_agg(distinct propertyid,',') as propertyid,string_agg(distinct locality,',') as locality from eg_pt_address where tenantid='pb.testing' group by propertyid ) pt_addr WHERE pd.paymentid=payment.id and eg_user.id = pd.createdby::INTEGER and pt.propertyid = bill.consumercode and bill.id=pd.billid and bill.id=billd.billid and bd.billid=bill.id and payment.paymentstatus = 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid and receipt_breakup.pdid=pd.id + and pt_addr.propertyid=pt.id orderby: ORDER BY pd.receiptdate DESC; - reportName: OldUlbWisePtCollection_V2 From 38dc04785b3d74a35314e676854e1ec46e0e07ef Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Sat, 17 Oct 2020 06:37:52 +0530 Subject: [PATCH 0313/1242] Decryption in registeryReport and default value --- configs/reports/configs/tl-reports.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/tl-reports.yml b/configs/reports/configs/tl-reports.yml index 99109ddb..508bd69a 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -135,7 +135,7 @@ ReportDefinitions: amount as totalamount, To_char((To_timestamp(receipt.manualreceiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') AS g8issuedate, receipt.manualreceiptnumber as g8receiptno, - (CASE WHEN collectiontype='COUNTER' THEN eg_user.name ELSE '' END) as collectorname + (CASE WHEN collectiontype='COUNTER' THEN eg_user.name ELSE '30048|21Fj+c3k2ldB0X3AzIh7atXB' END) as collectorname FROM eg_tl_tradelicense tl INNER JOIN eg_tl_tradelicensedetail tld ON tld.tradelicenseid = tl.id @@ -1218,6 +1218,7 @@ ReportDefinitions: - reportName: TradeLicenseRegistryReport_v2 + decryptionPathId: TradeLicenseRegistryReport_v2 summary: TL Receipt Register Report version: 1.0.0 moduleName: rainmaker-tl @@ -1352,7 +1353,7 @@ ReportDefinitions: payment.totalamountpaid as totalamount, --amount as totalamount, To_char((To_timestamp(egcl_paymentdetail.manualreceiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') AS g8issuedate, egcl_paymentdetail.manualreceiptnumber as g8receiptno, - (CASE WHEN paymentmode!='ONLINE' THEN eg_user.name ELSE '' END) as collectorname + (CASE WHEN paymentmode!='ONLINE' THEN eg_user.name ELSE '30048|21Fj+c3k2ldB0X3AzIh7atXB' END) as collectorname FROM eg_tl_tradelicense tl INNER JOIN eg_tl_tradelicensedetail tld ON tld.tradelicenseid = tl.id INNER JOIN ( From f4a29693445f6bc63ee5ea71deacdf5efa57a1d6 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Sat, 17 Oct 2020 07:38:51 +0530 Subject: [PATCH 0314/1242] decryptionKey added --- configs/reports/configs/tl-reports.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/reports/configs/tl-reports.yml b/configs/reports/configs/tl-reports.yml index 508bd69a..1eb86596 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -2127,6 +2127,7 @@ ReportDefinitions: - reportName: SearchTradeLicenseApplicationReport_v2 + decryptionPathId: SearchTradeLicenseApplicationReport_v2 summary: TL Search Application Report version: 1.0.0 moduleName: rainmaker-tl From 8d634d118ff9b53353f2d75de3756b036b2e127e Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Sat, 17 Oct 2020 08:48:29 +0530 Subject: [PATCH 0315/1242] localitySearch enabled in TLDetailsReport_v2 --- configs/reports/configs/tl-reports.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/tl-reports.yml b/configs/reports/configs/tl-reports.yml index 1eb86596..bb9f66bd 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -2310,7 +2310,7 @@ ReportDefinitions: type: boundarylist source: tl isMandatory: false - searchClause: AND locality_tlb.locality IN ($localityArray) + searchClause: AND localitycode IN ($localityArray) query: | SELECT tl.applicationnumber as applicationnumber, @@ -2331,7 +2331,7 @@ ReportDefinitions: FROM eg_tl_tradelicense tl INNER JOIN eg_tl_tradelicensedetail tld ON tld.tradelicenseid = tl.id INNER JOIN ( - select tradelicensedetailid, array_to_string(array_agg(message.message),', ') as locality from eg_tl_address as tla + select tradelicensedetailid, array_to_string(array_agg(message.message),', ') as locality,array_to_string(array_agg(locality),', ') as localitycode from eg_tl_address as tla LEFT OUTER JOIN message on code=CONCAT(UPPER(REGEXP_REPLACE( $tenantid , '[^A-Za-z0-9]','_', 'g')),'_REVENUE_', REGEXP_REPLACE( locality , '[^A-Za-z0-9]','_', 'g')) AND message.locale = 'en_IN' group by 1) locality_tlb ON locality_tlb.tradelicensedetailid = tld.id INNER JOIN eg_tl_owner tlowner ON tlowner.tradelicensedetailid = tld.id From 49e218980ae9f7f3c9bce039b77cd2c615e648b7 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Sat, 17 Oct 2020 09:27:34 +0530 Subject: [PATCH 0316/1242] decryptionkey applied --- configs/reports/configs/uc-reports.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/uc-reports.yml b/configs/reports/configs/uc-reports.yml index ba0a0577..07db96ad 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -1466,6 +1466,7 @@ ReportDefinitions: - reportName: MiscReceiptULBCancelled_v2 + decryptionPathId: MiscReceiptULB_v2 summary: Cancelled Receipt Miscellaneous version: 1.0.0 moduleName: rainmaker-uc @@ -1593,7 +1594,7 @@ ReportDefinitions: (case when paymentmode like 'CASH' then '' else transactionnumber end) as ddorchequenumber, (case when paymentmode like 'DD' or paymentmode like 'CHEQUE' then To_char((To_timestamp(payment.transactiondate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') else '' end) as ddchequedate, 'System' as collectiontype, - eg_user.name as collectorname + (case when eg_user.name is null then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else eg_user.name end) as collectorname FROM egcl_payment AS payment JOIN egcl_paymentdetail as paydetail on paydetail.paymentid=payment.id JOIN receipt_breakup ON paydetail.billid = receipt_breakup.bill_id @@ -1602,6 +1603,7 @@ ReportDefinitions: orderby: ORDER BY paydetail.receiptdate DESC - reportName: MiscReceiptULBShort_v2 + decryptionPathId: MiscReceiptULB_v2 summary: Receipt Register Miscellaneous version: 1.0.0 moduleName: rainmaker-uc @@ -1673,7 +1675,7 @@ ReportDefinitions: To_char((To_timestamp(paydetail.receiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as receiptdate, paydetail.businessservice as servicecategory, payment.totalamountpaid as amount, - eg_user.name as collectorname, + (case when eg_user.name is null then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else eg_user.name end) as collectorname, billd.additionaldetails->>'comment' as remarks FROM egcl_payment AS payment INNER JOIN egcl_paymentdetail as paydetail on paydetail.paymentid=payment.id From a4e295e305914797bfbdfef0ca20badc99b5e52d Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 19 Oct 2020 07:26:28 +0530 Subject: [PATCH 0317/1242] decryptionKeys applied --- configs/reports/configs/pgr-reports.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/configs/reports/configs/pgr-reports.yml b/configs/reports/configs/pgr-reports.yml index 7eaa08bd..f16841e4 100644 --- a/configs/reports/configs/pgr-reports.yml +++ b/configs/reports/configs/pgr-reports.yml @@ -1053,13 +1053,13 @@ ReportDefinitions: query: | SELECT DISTINCT ON (servicerequestid) - ua.name as lastassignedto, + (case when ua.name is null then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else ua.name end) as lastassignedto, (SELECT deptmap_def.name FROM (VALUES tbl_def_dept) AS deptmap_def(name,code) INNER JOIN (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) on deptmap.serviceCode = eg_pgr_service.servicecode and deptmap_def.code = deptmap.department) AS department, regexp_replace(servicecode, '([a-z])([A-Z])', '\1 \2','g') AS servicecode, (SELECT boundary_def.name FROM (VALUES tbl_boundary) AS boundary_def(name,code) where code=eg_pgr_address.mohalla) as locality, servicerequestid AS complaintNo, to_char(to_timestamp(TRUNC(CAST(eg_pgr_service.createdtime AS bigint) / 1000)), 'DD/MM/YYYY') AS date, - eg_user.name, + (case when eg_user.name is null then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else eg_user.name end) as name, phone, eg_pgr_address.landmark, eg_pgr_address.housenoandstreetname as address, @@ -1139,6 +1139,7 @@ ReportDefinitions: orderby: ORDER BY tenantid - reportName: EmployeeReport_v2 + decryptionPathId: EmployeeReport_v2 summary: Fetches complaints for employees version: 1.0.0 moduleName: rainmaker-pgr @@ -1569,6 +1570,7 @@ ReportDefinitions: orderby: ORDER BY deptmap_def.name - reportName: ULBEmployeeWiseReport_v2 + decryptionPathId: ULBEmployeeWiseReport summary: Fetches employee wise assignment report version: 1.0.0 moduleName: rainmaker-pgr @@ -1639,7 +1641,7 @@ ReportDefinitions: tenantid = $tenantid) select - coalesce((select name from eg_user where id::varchar = assignee),'-- Unassigned --') as employee, + coalesce((select name from eg_user where id::varchar = assignee),'30048|4H7+iWsYwRRFSuD94NxlbTqpg/CC952iFU8=') as employee, -- encrypted value for unassigned SUM (CASE WHEN status in ('rejected') THEN 1 ELSE 0 END) as rejected, SUM (CASE WHEN status in ('closed', 'resolved') THEN 1 ELSE 0 END) as resolved, SUM (CASE WHEN status in ('closed', 'resolved') and (resolvedtime - opentime) >= 14 * 86400 * 1000 THEN 1 ELSE 0 END) as resolvedoutsidesla, @@ -1728,6 +1730,7 @@ ReportDefinitions: orderby: ORDER BY tenantid,eg_pgr_service.servicecode - reportName: FeedbackReport_v2 + decryptionPathId: DescriptionReport_v2 summary: Fetches complaint state based on Feedback version: 1.0.0 moduleName: rainmaker-pgr From 6e2673ddf74c9b2eeee0c6e648b0748422a6817e Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 19 Oct 2020 11:30:18 +0530 Subject: [PATCH 0318/1242] Update pt-reports.yml --- configs/reports/configs/pt-reports.yml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 47ec8bc2..854ff890 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2427,7 +2427,12 @@ ReportDefinitions: label: reports.pt.toDate type: string source: pt - total: false + total: false + - name: paymentstatus + label: reports.pt.paymentstatus + type: string + source: pt + total: false searchParams: - name: fromDate label: reports.pt.fromDate @@ -2452,7 +2457,7 @@ ReportDefinitions: - name: paymentMode label: Payment Mode type: singlevaluelist - pattern: 'list://Cash:Cash,Online:Online,Card:Card,DD:DD,Cheque:Cheque' + pattern: 'list://Cash:Cash,Onlifne:Online,Card:Card,DD:DD,Cheque:Cheque' source: pt isMandatory: false searchClause: AND payment.paymentmode = $paymentMode @@ -2504,7 +2509,9 @@ ReportDefinitions: Initcap(pt.usagecategory) as usagetype, (CASE WHEN billd.collectiontype='COUNTER' THEN eg_user.name ELSE '30048|21Fj+c3k2ldB0X3AzIh7atXB' END) as collectorname, receipt_breakup.*, - to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, manualreceiptnumber as g8receiptno + to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, + manualreceiptnumber as g8receiptno, + payment.paymentstatus as paymentstatus FROM egcl_paymentdetail pd, eg_user, eg_pt_property as pt, egcl_billdetial as billd, egcl_payment payment,receipt_breakup, egcl_bill bill, (select bill.id as billid, min(bd.fromperiod) fromperiod, max(bd.toperiod) toperiod from egcl_billdetial bd, egcl_bill bill where bill.id=bd.billid group by bill.id) bd, (select string_agg(distinct propertyid,',') as propertyid,string_agg(distinct locality,',') as locality from eg_pt_address where tenantid='pb.testing' group by propertyid ) pt_addr WHERE pd.paymentid=payment.id and eg_user.id = pd.createdby::INTEGER and pt.propertyid = bill.consumercode and bill.id=pd.billid and bill.id=billd.billid and bd.billid=bill.id and payment.paymentstatus = 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid and receipt_breakup.pdid=pd.id From 0298099cfc1099a1ea94b76b92404a78b3582fc7 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 19 Oct 2020 11:36:16 +0530 Subject: [PATCH 0319/1242] feedback report search by date fix --- configs/reports/configs/pgr-reports.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/pgr-reports.yml b/configs/reports/configs/pgr-reports.yml index f16841e4..67ac7890 100644 --- a/configs/reports/configs/pgr-reports.yml +++ b/configs/reports/configs/pgr-reports.yml @@ -882,13 +882,13 @@ ReportDefinitions: type: epoch source: eg_pgr_service isMandatory: false - searchClause: AND createdtime >= $fromDate + searchClause: AND eg_pgr_service.createdtime >= $fromDate - name: toDate label: reports.rainmaker-pgr.dateto type: epoch source: eg_pgr_service isMandatory: false - searchClause: AND createdtime <= $toDate + searchClause: AND eg_pgr_service.createdtime <= $toDate query: | SELECT DISTINCT ON (servicerequestid) From 22241e6df33fdd845e7fe68118cf30947abbf2b3 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 19 Oct 2020 11:37:56 +0530 Subject: [PATCH 0320/1242] summaryreceiptregister sum cash cheque and count --- configs/reports/configs/pt-reports.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 854ff890..49246777 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -3575,6 +3575,21 @@ ReportDefinitions: type: string source: pt total: true + - name: sumcash + label: reports.pt.sumcash + type: string + source: pt + total: true + - name: sumcheque + label: reports.pt.sumcheque + type: string + source: pt + total: true + - name: countcheque + label: reports.pt.countcheque + type: string + source: pt + total: true - name: adhocrebate label: reports.pt.adhocrebate type: string @@ -3629,6 +3644,9 @@ ReportDefinitions: ( SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END)) as adjustment, + sum(case when payment.paymentmode='CASH' then pd.amountpaid else 0 end) as sumcash, + sum(case when payment.paymentmode='CHEQUE' then pd.amountpaid else 0 end) as sumcheque, + count (distinct case when payment.paymentmode='CHEQUE' then concat(payment.paymentmode) end) as countcheque, (CASE WHEN collectiontype='COUNTER' THEN eg_user.name ELSE 'Online' END) as collectorname, sum(adjustedamount) as totalamount FROM egcl_billaccountdetail as bad From abedebc0d04ef1625e4ab3077c46571f30345435 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 19 Oct 2020 11:45:19 +0530 Subject: [PATCH 0321/1242] removed one adhoc rebate column --- configs/reports/configs/pt-reports.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 49246777..e0b5d3fa 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -3589,12 +3589,7 @@ ReportDefinitions: label: reports.pt.countcheque type: string source: pt - total: true - - name: adhocrebate - label: reports.pt.adhocrebate - type: string - source: pt - total: true + total: true - name: noofassessments label: reports.pt.noofassessments type: string From f4ff0eb0bb010829d7851505222d62b9c5a35c0d Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 19 Oct 2020 11:52:43 +0530 Subject: [PATCH 0322/1242] sumonline summary receipt register --- configs/reports/configs/pt-reports.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index e0b5d3fa..ecfd1a3d 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -3642,6 +3642,7 @@ ReportDefinitions: sum(case when payment.paymentmode='CASH' then pd.amountpaid else 0 end) as sumcash, sum(case when payment.paymentmode='CHEQUE' then pd.amountpaid else 0 end) as sumcheque, count (distinct case when payment.paymentmode='CHEQUE' then concat(payment.paymentmode) end) as countcheque, + sum(case when payment.paymentmode='ONLINE' then pd.amountpaid else 0 end) as sumonline, (CASE WHEN collectiontype='COUNTER' THEN eg_user.name ELSE 'Online' END) as collectorname, sum(adjustedamount) as totalamount FROM egcl_billaccountdetail as bad From 93e4c88cc74452acba29b155bc5236164d889bd0 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 19 Oct 2020 11:54:33 +0530 Subject: [PATCH 0323/1242] update column summry rr --- configs/reports/configs/pt-reports.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index ecfd1a3d..2d6767a1 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -3589,11 +3589,16 @@ ReportDefinitions: label: reports.pt.countcheque type: string source: pt - total: true + total: true - name: noofassessments label: reports.pt.noofassessments type: string source: pt + total: true + - name: sumonline + label: reports.pt.sumonline + type: string + source: pt total: true - name: collectorname label: reports.pt.collectorname From ee52d7439cd1be59cd5c2a3ae38213b97a486eb6 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 19 Oct 2020 12:07:11 +0530 Subject: [PATCH 0324/1242] total column added in summaryrr --- configs/reports/configs/pt-reports.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 2d6767a1..5858aa88 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -3600,6 +3600,11 @@ ReportDefinitions: type: string source: pt total: true + - name: totalamount + label: reports.pt.totalamount + type: string + source: pt + total: true - name: collectorname label: reports.pt.collectorname type: string From 2296807dbd8787ab80814dd8c380ae746e7ef91c Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 19 Oct 2020 16:09:33 +0530 Subject: [PATCH 0325/1242] Update pgr-reports.yml --- configs/reports/configs/pgr-reports.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/reports/configs/pgr-reports.yml b/configs/reports/configs/pgr-reports.yml index 67ac7890..0faec700 100644 --- a/configs/reports/configs/pgr-reports.yml +++ b/configs/reports/configs/pgr-reports.yml @@ -949,7 +949,6 @@ ReportDefinitions: query: SELECT sum(case when source = 'mobileapp' then 1 else 0 end) as citizen_mobile_app, sum(case when source = 'web' then 1 else 0 end) as citizen_web_app, sum(case when source = 'ivr' then 1 else 0 end) as counter_desktop FROM eg_pgr_service WHERE tenantid = $tenantid - reportName: DescriptionReport_v2 - decryptionPathId: DescriptionReport_v2 summary: Fetches department wise reports based description of the complaint version: 1.0.0 moduleName: rainmaker-pgr From 45f12a5e4adb8bbcf622cac8985779fc350a1c56 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 19 Oct 2020 17:18:54 +0530 Subject: [PATCH 0326/1242] Update pgr-reports.yml --- configs/reports/configs/pgr-reports.yml | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/configs/reports/configs/pgr-reports.yml b/configs/reports/configs/pgr-reports.yml index 0faec700..ae42ca16 100644 --- a/configs/reports/configs/pgr-reports.yml +++ b/configs/reports/configs/pgr-reports.yml @@ -929,26 +929,29 @@ ReportDefinitions: type: string source: eg_pgr_service total: true - searchParams: - - name: tenantId - label: reports.rainmaker-pgr.tenantId - type: singlevaluelist - pattern: 'list://Wet:Wet,Dry:Dry' - source: eg_pgr_service - isMandatory: false + searchParams: - name: fromDate label: reports.rainmaker-pgr.datefrom type: epoch source: eg_pgr_service isMandatory: false + searchClause: AND eg_pgr_service.createdtime >= $fromDate - name: toDate label: reports.rainmaker-pgr.dateto type: epoch source: eg_pgr_service isMandatory: false - query: SELECT sum(case when source = 'mobileapp' then 1 else 0 end) as citizen_mobile_app, sum(case when source = 'web' then 1 else 0 end) as citizen_web_app, sum(case when source = 'ivr' then 1 else 0 end) as counter_desktop FROM eg_pgr_service WHERE tenantid = $tenantid + searchClause: AND eg_pgr_service.createdtime >= $fromDate + query: | + SELECT + sum(case when source = 'mobileapp' then 1 else 0 end) as citizen_mobile_app, + sum(case when source = 'web' then 1 else 0 end) as citizen_web_app, + sum(case when source = 'ivr' then 1 else 0 end) as counter_desktop + FROM eg_pgr_service + WHERE tenantid = $tenantid - reportName: DescriptionReport_v2 + decryptionPathId: DescriptionReport_v2 summary: Fetches department wise reports based description of the complaint version: 1.0.0 moduleName: rainmaker-pgr @@ -1310,7 +1313,7 @@ ReportDefinitions: groupby: GROUP BY tenantid orderby: ORDER BY tenantid -- reportName: ComplaintTypesReport_v2 +- reportName: ComplaintTypeWiseReport summary: Fetches complaint stats based on complaint types for a ULB version: 1.0.0 moduleName: rainmaker-pgr @@ -1387,7 +1390,7 @@ ReportDefinitions: SUM(CASE WHEN status ='rejected' THEN 1 ELSE 0 END) as rejected, count(status) as total from eg_pgr_service - WHERE tenantid != 'pb.testing' + WHERE tenantid = $tenantid groupby: GROUP BY tenantid,servicecode orderby: ORDER BY tenantid,servicecode @@ -1729,7 +1732,7 @@ ReportDefinitions: orderby: ORDER BY tenantid,eg_pgr_service.servicecode - reportName: FeedbackReport_v2 - decryptionPathId: DescriptionReport_v2 + decryptionPathId: FeedbackReport_v2 summary: Fetches complaint state based on Feedback version: 1.0.0 moduleName: rainmaker-pgr From c4c5a717f7031be0098a257d2675250b3ae95787 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 19 Oct 2020 17:44:52 +0530 Subject: [PATCH 0327/1242] remove ulb filter from ulb report --- configs/reports/configs/pgr-reports.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/configs/reports/configs/pgr-reports.yml b/configs/reports/configs/pgr-reports.yml index ae42ca16..7e01c279 100644 --- a/configs/reports/configs/pgr-reports.yml +++ b/configs/reports/configs/pgr-reports.yml @@ -1359,14 +1359,6 @@ ReportDefinitions: source: eg_pgr_service total: true searchParams: - - name: ulb - label: ULB - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name - source: pt - wrapper: true - isMandatory: false - searchClause: AND tenantid = $ulb - name: fromDate label: reports.rainmaker-pgr.datefrom type: epoch From d3ff77721c878beccfeabe442b811a42c52909e7 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 19 Oct 2020 18:06:11 +0530 Subject: [PATCH 0328/1242] Update pt-reports.yml --- configs/reports/configs/pt-reports.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 5858aa88..b95d4cec 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2287,7 +2287,7 @@ ReportDefinitions: FROM egcl_paymentdetail pd, egcl_payment payment, eg_pt_property as pt, receipt_breakup, eg_user, (select bill.id as billid, bill.consumercode as consumercodei, min(bd.fromperiod) fromperiod, max(bd.toperiod) toperiod from egcl_billdetial bd, egcl_bill bill where bill.id=bd.billid and bill.tenantid = $tenantid group by bill.id) bd, - (select string_agg(distinct propertyid,',') as propertyid,string_agg(distinct locality,',') as locality from eg_pt_address where tenantid='pb.testing' group by propertyid ) pt_addr + (select string_agg(distinct propertyid,',') as propertyid,string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr where pd.paymentid=payment.id and bd.billid=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid and pt.propertyid = bd.consumercodei and receipt_breakup.pdid=pd.id and eg_user.id = pd.createdby::INTEGER and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id @@ -2513,7 +2513,7 @@ ReportDefinitions: manualreceiptnumber as g8receiptno, payment.paymentstatus as paymentstatus FROM egcl_paymentdetail pd, eg_user, eg_pt_property as pt, egcl_billdetial as billd, egcl_payment payment,receipt_breakup, egcl_bill bill, (select bill.id as billid, min(bd.fromperiod) fromperiod, max(bd.toperiod) toperiod from egcl_billdetial bd, egcl_bill bill where bill.id=bd.billid group by bill.id) bd, - (select string_agg(distinct propertyid,',') as propertyid,string_agg(distinct locality,',') as locality from eg_pt_address where tenantid='pb.testing' group by propertyid ) pt_addr + (select string_agg(distinct propertyid,',') as propertyid,string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr WHERE pd.paymentid=payment.id and eg_user.id = pd.createdby::INTEGER and pt.propertyid = bill.consumercode and bill.id=pd.billid and bill.id=billd.billid and bd.billid=bill.id and payment.paymentstatus = 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid and receipt_breakup.pdid=pd.id and pt_addr.propertyid=pt.id orderby: ORDER BY pd.receiptdate DESC; From 1413e95059a19b1be512800d13eacaa6c1e9de04 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 19 Oct 2020 22:33:02 +0530 Subject: [PATCH 0329/1242] DefaulterReport localityFilter not mandatory --- configs/reports/configs/pt-reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index b95d4cec..a112ff24 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -3961,7 +3961,7 @@ ReportDefinitions: label: reports.pt.zoneList type: boundarylist source: pt - isMandatory: true + isMandatory: false searchClause: AND pta.locality IN ($localityArray) query: | --S.no Service Name ULB Property Tax Unique ID Date Of Transcation Receipt Number Existing Property ID Type Of Property Mobile Number Address From 392553d777fb9162ac5c3956a47b964f252b5677 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 21 Oct 2020 10:26:17 +0530 Subject: [PATCH 0330/1242] summaryrr column interchanged --- configs/reports/configs/pt-reports.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index a112ff24..f3b1b998 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -3575,6 +3575,11 @@ ReportDefinitions: type: string source: pt total: true + - name: noofassessments + label: reports.pt.noofassessments + type: string + source: pt + total: true - name: sumcash label: reports.pt.sumcash type: string @@ -3589,11 +3594,6 @@ ReportDefinitions: label: reports.pt.countcheque type: string source: pt - total: true - - name: noofassessments - label: reports.pt.noofassessments - type: string - source: pt total: true - name: sumonline label: reports.pt.sumonline From 8fc7c437bc8fa492be726da5c8d7d45b4689e155 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 22 Oct 2020 16:53:22 +0530 Subject: [PATCH 0331/1242] some receipts missing fix receipts were not being shown when found createdby as 0 --- configs/reports/configs/pt-reports.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index f3b1b998..b708b715 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2284,12 +2284,12 @@ ReportDefinitions: receipt_breakup.*, to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, manualreceiptnumber as g8receiptno - FROM egcl_paymentdetail pd, egcl_payment payment, eg_pt_property as pt, receipt_breakup, eg_user, + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, receipt_breakup, (select bill.id as billid, bill.consumercode as consumercodei, min(bd.fromperiod) fromperiod, max(bd.toperiod) toperiod from egcl_billdetial bd, egcl_bill bill where bill.id=bd.billid and bill.tenantid = $tenantid group by bill.id) bd, (select string_agg(distinct propertyid,',') as propertyid,string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr where pd.paymentid=payment.id and bd.billid=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid - and pt.propertyid = bd.consumercodei and receipt_breakup.pdid=pd.id and eg_user.id = pd.createdby::INTEGER and pt.status!='INACTIVE' + and pt.propertyid = bd.consumercodei and receipt_breakup.pdid=pd.id and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id --and pt.propertyid='PT-1012-978737' orderby: ORDER BY pd.receiptdate DESC; From 63c3554b8261db2a7eda0ec928386e41afb4ddee Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 26 Oct 2020 11:03:10 +0530 Subject: [PATCH 0332/1242] receiptregister_short update --- configs/reports/configs/pt-reports.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index b708b715..d20ba713 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -3038,7 +3038,7 @@ ReportDefinitions: pattern: 'list://Cash:Cash,Online:Online,Card:Card,DD:DD,Cheque:Cheque' source: pt isMandatory: false - searchClause: AND instrumenttype = $paymentMode + searchClause: AND payment.paymentmode = $paymentMode - name: financialyear label: Financial Year type: singlevaluelist @@ -3077,12 +3077,13 @@ ReportDefinitions: to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, manualreceiptnumber as g8receiptno, 'NA' as remarks - FROM egcl_paymentdetail pd, egcl_payment payment, eg_pt_property as pt, eg_user, eg_pt_address pt_addr, - (select bill.id as billid, bill.consumercode as consumercodei, min(bd.fromperiod) fromperiod, max(bd.toperiod) toperiod from egcl_billdetial bd, egcl_bill bill - where bill.id=bd.billid and bill.tenantid = $tenantid group by bill.id) bd - where pd.paymentid=payment.id and bd.billid=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid - and pt_addr.propertyid=pt.id - and pt.propertyid = bd.consumercodei and eg_user.id = pd.createdby::INTEGER and pt.status!='INACTIVE' + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, + (select bill.id as billid, bill.consumercode as consumercodei, min(bd.fromperiod) fromperiod, max(bd.toperiod) toperiod from egcl_billdetial bd, egcl_bill bill + where bill.id=bd.billid and bill.tenantid = $tenantid group by bill.id) bd, + (select string_agg(distinct propertyid,',') as propertyid,string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr + where pd.paymentid=payment.id and bd.billid=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + and pt.propertyid = bd.consumercodei and pt.status!='INACTIVE' + and pt_addr.propertyid=pt.id orderby: ORDER BY pd.receiptdate DESC; From 511e775bcb295dcb8d5e91673c3926f84496a4ba Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 27 Oct 2020 12:40:50 +0530 Subject: [PATCH 0333/1242] total amount count enabled --- configs/reports/configs/rainmaker-noc-reports.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/rainmaker-noc-reports.yml b/configs/reports/configs/rainmaker-noc-reports.yml index b6b6b95a..cc06a4af 100644 --- a/configs/reports/configs/rainmaker-noc-reports.yml +++ b/configs/reports/configs/rainmaker-noc-reports.yml @@ -569,7 +569,7 @@ ReportDefinitions: label: reports.noc.totalamount type: string source: rainmaker-noc - total: false + total: true - name: paymentmode label: reports.noc.paymentmode type: string @@ -717,7 +717,7 @@ ReportDefinitions: label: reports.noc.totalamount type: string source: rainmaker-noc - total: false + total: true - name: paymentmode label: reports.noc.paymentmode type: string From 6537b6349a140b32fb28c67bbeb51d16c8a6400e Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 29 Oct 2020 11:59:35 +0530 Subject: [PATCH 0334/1242] paymentmode search filter fixed --- configs/reports/configs/pt-reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index d20ba713..7a38a878 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2230,7 +2230,7 @@ ReportDefinitions: - name: paymentMode label: Payment Mode type: singlevaluelist - pattern: 'list://Cash:Cash,Online:Online,Card:Card,DD:DD,Cheque:Cheque' + pattern: 'list://CARD:Card,CASH:Cash,CHEQUE:Cheque,DD:DD,OFFLINE_NEFT:NEFT,OFFLINE_RTGS:RTGS,ONLINE:Online,POSTAL_ORDER:PostalOrder' source: pt isMandatory: false searchClause: AND payment.paymentmode = $paymentMode From d38fbed1de905ce98df2097990c9d510380c5ad0 Mon Sep 17 00:00:00 2001 From: ashok-eGov <57890337+ashok-eGov@users.noreply.github.com> Date: Thu, 29 Oct 2020 17:26:47 +0530 Subject: [PATCH 0335/1242] Update property-receipt.json Show the status of the receipt if the receipt is cancelled(Payment Status in Receipt) --- .../data-config/property-receipt.json | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index 02563315..79061665 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -31,6 +31,12 @@ "value": { "path": "$.mobileNumber" } + }, + { + "variable": "paymentStatus", + "value": { + "path": "$.paymentStatus" + } }, { "variable": "receiptNo", @@ -317,6 +323,18 @@ "prefix": null, "module":"rainmaker-common" } + }, + { + "variable": "payment_status", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_STATUS" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } }, { "variable": "service_type", From 7421a8256c6710c265b0937fd5fdd11b128472c9 Mon Sep 17 00:00:00 2001 From: ashok-eGov <57890337+ashok-eGov@users.noreply.github.com> Date: Thu, 29 Oct 2020 17:34:11 +0530 Subject: [PATCH 0336/1242] Update property-receipt.json Added Payment status("text" : "{{payment_status}}) --- configs/pdf-service/format-config/property-receipt.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/pdf-service/format-config/property-receipt.json b/configs/pdf-service/format-config/property-receipt.json index 0b6b7886..d98a999d 100644 --- a/configs/pdf-service/format-config/property-receipt.json +++ b/configs/pdf-service/format-config/property-receipt.json @@ -238,7 +238,7 @@ "style": "receipt-table" }, { - "text" : " ", + "text" : "{{payment_status}}", "border": [ false, false, @@ -248,7 +248,7 @@ "style": "receipt-table-value" }, { - "text" : " ", + "text" : "{{payment_status}}", "border": [ false, false, From 748dfef11fd1bc63e8b78512fcd67501d061070f Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 2 Nov 2020 15:49:32 +0530 Subject: [PATCH 0337/1242] paymentmode filter fix --- configs/reports/configs/pt-reports.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 7a38a878..e729a9dd 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2457,7 +2457,7 @@ ReportDefinitions: - name: paymentMode label: Payment Mode type: singlevaluelist - pattern: 'list://Cash:Cash,Onlifne:Online,Card:Card,DD:DD,Cheque:Cheque' + pattern: 'list://CARD:Card,CASH:Cash,CHEQUE:Cheque,DD:DD,OFFLINE_NEFT:NEFT,OFFLINE_RTGS:RTGS,ONLINE:Online,POSTAL_ORDER:PostalOrder' source: pt isMandatory: false searchClause: AND payment.paymentmode = $paymentMode @@ -2724,7 +2724,7 @@ ReportDefinitions: - name: paymentMode label: Payment Mode type: singlevaluelist - pattern: 'list://Cash:Cash,Online:Online,Card:Card,DD:DD,Cheque:Cheque' + pattern: 'list://CARD:Card,CASH:Cash,CHEQUE:Cheque,DD:DD,OFFLINE_NEFT:NEFT,OFFLINE_RTGS:RTGS,ONLINE:Online,POSTAL_ORDER:PostalOrder' source: pt isMandatory: false searchClause: AND payment.paymentmode = $paymentMode @@ -3035,7 +3035,7 @@ ReportDefinitions: - name: paymentMode label: Payment Mode type: singlevaluelist - pattern: 'list://Cash:Cash,Online:Online,Card:Card,DD:DD,Cheque:Cheque' + pattern: 'list://CARD:Card,CASH:Cash,CHEQUE:Cheque,DD:DD,OFFLINE_NEFT:NEFT,OFFLINE_RTGS:RTGS,ONLINE:Online,POSTAL_ORDER:PostalOrder' source: pt isMandatory: false searchClause: AND payment.paymentmode = $paymentMode @@ -3435,7 +3435,7 @@ ReportDefinitions: - name: paymentMode label: Payment Mode type: singlevaluelist - pattern: 'list://Cash:Cash,Online:Online,Card:Card,DD:DD,Cheque:Cheque' + pattern: 'list://CARD:Card,CASH:Cash,CHEQUE:Cheque,DD:DD,OFFLINE_NEFT:NEFT,OFFLINE_RTGS:RTGS,ONLINE:Online,POSTAL_ORDER:PostalOrder' source: pt isMandatory: false searchClause: AND instrumenttype = $paymentMode From 0a0a1de619d31a1761ef8fb1945894ec3e392423 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Wed, 4 Nov 2020 11:34:17 +0530 Subject: [PATCH 0338/1242] changed label for mobile number --- configs/pdf-service/format-config/tlapplication.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/pdf-service/format-config/tlapplication.json b/configs/pdf-service/format-config/tlapplication.json index 2eb43e81..5fc7b2ab 100644 --- a/configs/pdf-service/format-config/tlapplication.json +++ b/configs/pdf-service/format-config/tlapplication.json @@ -881,7 +881,7 @@ "fontSize": 9 }, { - "text":"{{mobile_no}}", + "text":"Mobile Number/Alternate Contact", "border":[ false, false, @@ -1392,4 +1392,4 @@ } } -} \ No newline at end of file +} From c53fd60897e35ffbc286606667cbd27ae6d83b17 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Thu, 5 Nov 2020 16:23:16 +0530 Subject: [PATCH 0339/1242] changed label of assessment year --- configs/pdf-service/format-config/property-receipt.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/pdf-service/format-config/property-receipt.json b/configs/pdf-service/format-config/property-receipt.json index d98a999d..33a463c4 100644 --- a/configs/pdf-service/format-config/property-receipt.json +++ b/configs/pdf-service/format-config/property-receipt.json @@ -134,7 +134,7 @@ ], [ { - "text": "assessment_year", + "text": "Assessment Year", "border": [ true, false, From bf19378ae35f5fc9de8e59e3e1bf84b386cd726b Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Fri, 6 Nov 2020 11:12:50 +0530 Subject: [PATCH 0340/1242] added localisation for property usage --- configs/pdf-service/data-config/property-receipt.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index 79061665..0f44f5a6 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -583,7 +583,12 @@ "value":"$.Properties[0].owners[0].fatherOrHusbandName" },{ "variable":"propertyUsage", - "value":"$.Properties[0].usageCategory" + "value":"$.Properties[0].usageCategory", + "localisation": { + "required": true, + "prefix": "COMMON_PROPUSGTYPE", + "module": "rainmaker-pt" + } }, { "variable":"doorNo", From 3412595af56ba3c1280a943a80566f37eed7457d Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Fri, 6 Nov 2020 11:21:02 +0530 Subject: [PATCH 0341/1242] removed payment status column --- configs/pdf-service/format-config/property-receipt.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/pdf-service/format-config/property-receipt.json b/configs/pdf-service/format-config/property-receipt.json index 33a463c4..8675bd67 100644 --- a/configs/pdf-service/format-config/property-receipt.json +++ b/configs/pdf-service/format-config/property-receipt.json @@ -238,7 +238,7 @@ "style": "receipt-table" }, { - "text" : "{{payment_status}}", + "text" : " ", "border": [ false, false, @@ -248,7 +248,7 @@ "style": "receipt-table-value" }, { - "text" : "{{payment_status}}", + "text" : " ", "border": [ false, false, From 4089f9a24a2a2a0bcced27a993b244405f668037 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Fri, 6 Nov 2020 12:04:40 +0530 Subject: [PATCH 0342/1242] converted built up area from sq yard to feet --- configs/pdf-service/data-config/property-receipt.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index 0f44f5a6..5534fa4a 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -685,7 +685,7 @@ }, { "variable":"builtup_area", - "value":"constructionDetail.builtUpArea" + "value":"constructionDetail.builtUpArea * 9" }, { "variable":"arv_rent", From 547ecc2ceb26b16ed7a735e9db64a3d9b2f0c18d Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Sat, 7 Nov 2020 10:43:12 +0530 Subject: [PATCH 0343/1242] synch prod_v2 changes --- configs/reports/configs/pt-reports.yml | 97 +++++++++++--------------- 1 file changed, 39 insertions(+), 58 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index e729a9dd..7c2b9ace 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2196,16 +2196,11 @@ ReportDefinitions: type: string source: pt total: false - - name: fromdate - label: reports.pt.fromDate + - name: financialyear + label: reports.pt.financialyear type: string source: pt total: false - - name: todate - label: reports.pt.toDate - type: string - source: pt - total: false searchParams: - name: fromDate label: reports.pt.fromDate @@ -2275,11 +2270,10 @@ ReportDefinitions: payment.totalamountpaid as amount, payment.paymentmode as instrumenttype, payment.transactionnumber, - to_char((To_timestamp(bd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS fromdate, - to_char((To_timestamp(bd.toperiod/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS todate, + concat(to_char((To_timestamp(bd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(bd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear, to_char((To_timestamp(payment.transactiondate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, pd.due AS pendingamount, - Initcap(pt.usagecategory) as usagetype, + Initcap(case when pt.usagecategory like '%.%' then split_part(pt.usagecategory,'.',2) else pt.usagecategory end) as usagetype, (case when eg_user.name is null then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else eg_user.name end) as collectorname, receipt_breakup.*, to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, @@ -2418,13 +2412,8 @@ ReportDefinitions: type: string source: pt total: false - - name: fromdate - label: reports.pt.fromDate - type: string - source: pt - total: false - - name: todate - label: reports.pt.toDate + - name: financialyear + label: reports.pt.financialyear type: string source: pt total: false @@ -2453,7 +2442,7 @@ ReportDefinitions: source: pt wrapper: true isMandatory: false - searchClause: AND concat(to_char((To_timestamp(fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) = $financialyear + searchClause: AND concat(to_char((To_timestamp(bd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(bd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) = $financialyear - name: paymentMode label: Payment Mode type: singlevaluelist @@ -2501,12 +2490,10 @@ ReportDefinitions: receiptnumber, payment.totalamountpaid as amount, payment.paymentmode as instrumenttype, - payment.transactionnumber, - to_char((To_timestamp(bd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS fromdate, - to_char((To_timestamp(bd.toperiod/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS todate, + payment.transactionnumber,concat(to_char((To_timestamp(bd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(bd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear, to_char((To_timestamp(payment.transactiondate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, pd.due AS pendingamount, - Initcap(pt.usagecategory) as usagetype, + Initcap(case when pt.usagecategory like '%.%' then split_part(pt.usagecategory,'.',2) else pt.usagecategory end) as usagetype, (CASE WHEN billd.collectiontype='COUNTER' THEN eg_user.name ELSE '30048|21Fj+c3k2ldB0X3AzIh7atXB' END) as collectorname, receipt_breakup.*, to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, @@ -2698,16 +2685,11 @@ ReportDefinitions: type: string source: pt total: false - - name: fromdate - label: reports.pt.fromDate + - name: financialyear + label: reports.pt.financialyear type: string source: pt total: false - - name: todate - label: reports.pt.toDate - type: string - source: pt - total: false searchParams: - name: fromDate label: reports.pt.fromDate @@ -2763,11 +2745,10 @@ ReportDefinitions: payment.totalamountpaid as amount, payment.paymentmode as instrumenttype, payment.transactionnumber, - to_char((To_timestamp(bd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS fromdate, - to_char((To_timestamp(bd.toperiod/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS todate, + concat(to_char((To_timestamp(bd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(bd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear, to_char((To_timestamp(payment.transactiondate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, pd.due AS pendingamount, - Initcap(pt.usagecategory) as usagetype, + Initcap(case when pt.usagecategory like '%.%' then split_part(pt.usagecategory,'.',2) else pt.usagecategory end) as usagetype, (CASE WHEN billd.collectiontype='COUNTER' THEN eg_user.name ELSE '30048|21Fj+c3k2ldB0X3AzIh7atXB' END) as collectorname, receipt_breakup.*, to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, manualreceiptnumber as g8receiptno @@ -2821,13 +2802,13 @@ ReportDefinitions: type: epoch source: pt isMandatory: false - searchClause: AND receiptdate >= $fromDate + searchClause: AND payment.createdtime >= $fromDate - name: toDate label: reports.pt.toDate type: epoch source: pt isMandatory: false - searchClause: AND receiptdate <= $toDate + searchClause: AND payment.createdtime <= $toDate - name: financialyear label: Financial Year type: singlevaluelist @@ -2853,20 +2834,18 @@ ReportDefinitions: SUM(CASE WHEN paymentmode='ONLINE' THEN 1 ELSE 0 END) AS countonline, SUM(CASE WHEN paymentmode!='ONLINE' THEN totalamountpaid ELSE 0 END) AS totaloffline, SUM(CASE WHEN paymentmode!='ONLINE' THEN 1 ELSE 0 END) AS countoffline - FROM egcl_paymentdetail as pd, egcl_payment as payment, eg_pt_property, egcl_bill bill, egcl_billdetial billd - WHERE payment.id=pd.paymentid - and payment.paymentstatus!='CANCELLED' - and pd.businessservice='PT' - and bill.id=pd.billid - and billd.billid=bill.id - and eg_pt_property.propertyid=bill.consumercode - and payment.tenantid !='pb.testing' + FROM egcl_paymentdetail as pd + inner join egcl_payment as payment on payment.id=pd.paymentid + inner join egcl_bill bill on bill.id=pd.billid + inner join eg_pt_property on eg_pt_property.propertyid=bill.consumercode + inner join egcl_billdetial billd on billd.billid=bill.id + WHERE payment.paymentstatus!='CANCELLED' and pd.businessservice='PT' and payment.tenantid !='pb.testing' groupby: GROUP BY payment.tenantid orderby: ORDER BY payment.tenantid, totalamountpaid DESC NULLS LAST - reportName: UlbWisePtCollection_V2 - summary: State Wide PT Collection + summary: ULB Wide PT Collection version: 1.0.0 moduleName: rainmaker-pt sourceColumns: @@ -2906,13 +2885,13 @@ ReportDefinitions: type: epoch source: pt isMandatory: false - searchClause: AND receiptdate >= $fromDate + searchClause: AND payment.createdtime >= $fromDate - name: toDate label: reports.pt.toDate type: epoch source: pt isMandatory: false - searchClause: AND receiptdate <= $toDate + searchClause: AND payment.createdtime <= $toDate - name: financialyear label: Financial Year type: singlevaluelist @@ -2938,15 +2917,15 @@ ReportDefinitions: SUM(CASE WHEN paymentmode='ONLINE' THEN 1 ELSE 0 END) AS countonline, SUM(CASE WHEN paymentmode!='ONLINE' THEN totalamountpaid ELSE 0 END) AS totaloffline, SUM(CASE WHEN paymentmode!='ONLINE' THEN 1 ELSE 0 END) AS countoffline - FROM egcl_paymentdetail as pd, egcl_payment as payment, eg_pt_property, egcl_bill bill, egcl_billdetial billd - WHERE payment.tenantid LIKE CONCAT(SPLIT_PART($tenantid, '.', 1), '%') - and payment.tenantid = $tenantid - and payment.id=pd.paymentid + FROM egcl_paymentdetail as pd + inner join egcl_payment as payment on payment.id=pd.paymentid + inner join egcl_bill bill on bill.id=pd.billid + inner join eg_pt_property on eg_pt_property.propertyid=bill.consumercode + inner join egcl_billdetial billd on billd.billid=bill.id + WHERE payment.tenantid = $tenantid and payment.paymentstatus!='CANCELLED' and pd.businessservice='PT' - and bill.id=pd.billid - and billd.billid=bill.id - and eg_pt_property.propertyid=bill.consumercode + --and payment.createdtime>='1577817000000' and payment.createdtime<='1580495399000' groupby: GROUP BY payment.tenantid orderby: ORDER BY payment.tenantid, totalamountpaid DESC NULLS LAST @@ -3514,6 +3493,7 @@ ReportDefinitions: - reportName: ReceiptRegisterSummary_V2 + decryptionPathId: ReceiptRegisterShort_V2 summary: Receipt Register Summary version: 1.0.0 moduleName: rainmaker-pt @@ -3636,7 +3616,7 @@ ReportDefinitions: -- Use CTE to force query plan, compute & use CTE later SELECT split_part(bd.tenantid,'.',2) as ulb, - Count (*)/8 noofassessments, + Count (distinct pd.paymentid) as noofassessments, SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, @@ -3650,11 +3630,11 @@ ReportDefinitions: ( SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END)) as adjustment, - sum(case when payment.paymentmode='CASH' then pd.amountpaid else 0 end) as sumcash, - sum(case when payment.paymentmode='CHEQUE' then pd.amountpaid else 0 end) as sumcheque, + sum(case when payment.paymentmode='CASH' then bad.adjustedamount else 0 end) as sumcash, + sum(case when payment.paymentmode='CHEQUE' then bad.adjustedamount else 0 end) as sumcheque, count (distinct case when payment.paymentmode='CHEQUE' then concat(payment.paymentmode) end) as countcheque, - sum(case when payment.paymentmode='ONLINE' then pd.amountpaid else 0 end) as sumonline, - (CASE WHEN collectiontype='COUNTER' THEN eg_user.name ELSE 'Online' END) as collectorname, + sum(case when payment.paymentmode='ONLINE' then bad.adjustedamount else 0 end) as sumonline, + (CASE WHEN collectiontype='COUNTER' THEN eg_user.name ELSE '30048|+2XzlkQVhqavkQNuL+i/3UDc+MI=' END) as collectorname, --for online collecion show null as collectorname sum(adjustedamount) as totalamount FROM egcl_billaccountdetail as bad INNER JOIN egcl_billdetial as bd on bd.id = bad.billdetailid @@ -3970,7 +3950,8 @@ ReportDefinitions: select propertyid, string_agg(distinct pu.occupancytype, ',') as occupancytype, - string_agg(distinct coalesce(usagecategory), ',') as propertytype + --string_agg(distinct coalesce(usagecategory), ',') as propertytype + string_agg(distinct Initcap(case when usagecategory like '%.%' then split_part(usagecategory,'.',2) else usagecategory end),',') as propertytype from eg_pt_unit as pu where pu.tenantid = $tenantid group by propertyid From 8621286b1962ab9ec2c714b7fffe25010939c565 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Sat, 7 Nov 2020 12:36:06 +0530 Subject: [PATCH 0344/1242] ptDumpReport Long PropertyType Fix --- configs/reports/configs/pt-reports.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 7c2b9ace..35fcd176 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -3220,7 +3220,7 @@ ReportDefinitions: select propertyid, string_agg(distinct pu.occupancytype, ',') as occupancytype, - string_agg(distinct coalesce(usagecategory), ',') as propertytype + string_agg(distinct Initcap(case when usagecategory like '%.%' then split_part(usagecategory,'.',2) else usagecategory end),',') as propertytype from eg_pt_unit as pu where pu.tenantid = $tenantid group by propertyid @@ -3247,6 +3247,8 @@ ReportDefinitions: payment.payeraddress as "payeraddress", pt.additionaldetails->>'remarks' as "remarks", pt.additionaldetails->>'FirmBusinessName' as "businessname", + pot.occupancytype as occupancy, + pot.propertytype as propertytype, pta.locality as "localitycode" from egcl_paymentdetail as payd inner join egcl_payment as payment on payment.id = payd.paymentid From b3371a3609b0bb478cebeecd7b783c498a0e9a2a Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Sat, 7 Nov 2020 13:55:24 +0530 Subject: [PATCH 0345/1242] Tradelicensedetailsreport filter applicationDate --- configs/reports/configs/tl-reports.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/tl-reports.yml b/configs/reports/configs/tl-reports.yml index bb9f66bd..cffae313 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -2298,13 +2298,13 @@ ReportDefinitions: type: epoch source: tl isMandatory: false - searchClause: AND issueddate >= $fromDate + searchClause: AND applicationdate >= $fromDate - name: toDate label: reports.tl.toDate type: epoch source: tl isMandatory: false - searchClause: AND issueddate <= $toDate + searchClause: AND applicationdate <= $toDate - name: localityArray label: reports.tl.zoneList type: boundarylist From e5b69a42f3937b21259c92196c05433ce6eaa8f4 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Sat, 7 Nov 2020 15:09:38 +0530 Subject: [PATCH 0346/1242] ulbEmployeeWisereport_v2 update --- configs/reports/configs/pgr-reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/reports/configs/pgr-reports.yml b/configs/reports/configs/pgr-reports.yml index 7e01c279..22168827 100644 --- a/configs/reports/configs/pgr-reports.yml +++ b/configs/reports/configs/pgr-reports.yml @@ -1644,8 +1644,8 @@ ReportDefinitions: SUM (CASE WHEN status in ('assigned', 'reassignrequested', 'open') and (extract(epoch from now()) * 1000 - opentime) >= 14 * 86400 * 1000 THEN 1 ELSE 0 END) as outsidesla from pgr_data WHERE 1=1 - orderby: ORDER BY assignee NULLS FIRST groupby: GROUP BY assignee + orderby: ORDER BY assignee NULLS FIRST - reportName: UlbPgrSlaReport_v2 From 596c75305b81cfc6de7014a920a575b1f6ea16c6 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Sat, 7 Nov 2020 16:09:42 +0530 Subject: [PATCH 0347/1242] ulbEmployeeWiseReport Decryption changed --- configs/reports/configs/pgr-reports.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/configs/reports/configs/pgr-reports.yml b/configs/reports/configs/pgr-reports.yml index 22168827..b9570b14 100644 --- a/configs/reports/configs/pgr-reports.yml +++ b/configs/reports/configs/pgr-reports.yml @@ -1633,9 +1633,8 @@ ReportDefinitions: from eg_pgr_service as ps where tenantid = $tenantid) - select - coalesce((select name from eg_user where id::varchar = assignee),'30048|4H7+iWsYwRRFSuD94NxlbTqpg/CC952iFU8=') as employee, -- encrypted value for unassigned + coalesce((select name from eg_user where id::varchar = assignee),'30048|+3/xnyTtx2VYznMwVlAA/wJxplY=') as employee, -- encrypted value for none SUM (CASE WHEN status in ('rejected') THEN 1 ELSE 0 END) as rejected, SUM (CASE WHEN status in ('closed', 'resolved') THEN 1 ELSE 0 END) as resolved, SUM (CASE WHEN status in ('closed', 'resolved') and (resolvedtime - opentime) >= 14 * 86400 * 1000 THEN 1 ELSE 0 END) as resolvedoutsidesla, From fb6d93cdcef996d0987485e2f5469a1fde83c6c9 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Sat, 7 Nov 2020 16:35:02 +0530 Subject: [PATCH 0348/1242] source column in descryption report --- configs/reports/configs/pgr-reports.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/configs/reports/configs/pgr-reports.yml b/configs/reports/configs/pgr-reports.yml index b9570b14..ec1d47f8 100644 --- a/configs/reports/configs/pgr-reports.yml +++ b/configs/reports/configs/pgr-reports.yml @@ -1039,6 +1039,11 @@ ReportDefinitions: type: string source: eg_pgr_service total: false + - name: source + label: reports.rainmaker-pgr.source + type: string + source: eg_pgr_service + total: false searchParams: - name: fromDate label: reports.rainmaker-pgr.datefrom @@ -1065,7 +1070,8 @@ ReportDefinitions: phone, eg_pgr_address.landmark, eg_pgr_address.housenoandstreetname as address, - description, + description, + source, (SELECT (CASE WHEN (((SELECT deptmap.slaHours FROM (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) WHERE deptmap.serviceCode = eg_pgr_service.servicecode)::integer / 24) - (epa.when - eg_pgr_service.createdtime)::bigint/86400000) < 1 THEN CONCAT('Overdue by ', ((epa.when - eg_pgr_service.createdtime)::bigint/86400000) - ((SELECT deptmap.slaHours FROM (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) WHERE deptmap.serviceCode = eg_pgr_service.servicecode)::integer / 24), ' days') ELSE CONCAT(((SELECT deptmap.slaHours FROM (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) WHERE deptmap.serviceCode = eg_pgr_service.servicecode)::integer / 24) - (epa.when - eg_pgr_service.createdtime)::bigint/86400000, ' days remaining') END) as slaHours), Initcap(eg_pgr_service.status) as status, to_char((To_timestamp(epa.when/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS actiondate From 74616526d4629a07b539ecd7779310aa50706081 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Sat, 7 Nov 2020 17:44:03 +0530 Subject: [PATCH 0349/1242] miscReceipt_v2 date fileter mandatory --- configs/reports/configs/uc-reports.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/uc-reports.yml b/configs/reports/configs/uc-reports.yml index 07db96ad..1b2325fe 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -923,13 +923,13 @@ ReportDefinitions: label: reports.uc.fromDate type: epoch source: uc - isMandatory: false + isMandatory: true searchClause: AND paydetail.receiptdate >= $fromDate - name: toDate label: reports.uc.toDate type: epoch source: uc - isMandatory: false + isMandatory: true searchClause: AND paydetail.receiptdate <= $toDate - name: ulb label: reports.uc.ulb From 6a5c7f9a53d37617c678ad9fe029b8a9411b3351 Mon Sep 17 00:00:00 2001 From: Abhilashegov Date: Mon, 9 Nov 2020 09:27:32 +0530 Subject: [PATCH 0350/1242] Added changes for addtional taxhead present in response --- rainmaker-custom-service/index.js | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/rainmaker-custom-service/index.js b/rainmaker-custom-service/index.js index 6e42249a..d864d8d3 100644 --- a/rainmaker-custom-service/index.js +++ b/rainmaker-custom-service/index.js @@ -711,6 +711,9 @@ async function _createAndUpdateZeroTaxProcessor(request, response) { async function _createAndUpdateIntegrationTaxProcessor(req, response){ + console.log("REQ : ", JSON.stringify(req)) + console.log("RESPONSE : ", JSON.stringify(response)) + let reqProperty = req["Assessment"]; let propertyId = reqProperty["propertyId"] @@ -739,9 +742,13 @@ async function _createAndUpdateIntegrationTaxProcessor(req, response){ let calc = estimateResponse["Calculation"][0] let taxHeads = calc["taxHeadEstimates"]; let createTaxHeadsArray = {}; + let TaxHeadsType= {}; //Collecting All the Tax head coming from PMIDC + for(taxHead of taxHeads){ createTaxHeadsArray[taxHead.taxHeadCode] = taxHead.estimateAmount; + TaxHeadsType[taxHead.taxHeadCode] = taxHead.estimateAmount; //print(texthead) + console.log(taxHead.taxHeadCode , ": ", taxHead.estimateAmount) } let demandSearchResponse = await findDemandForConsumerCode(consumerCode, tenantId, service, req["RequestInfo"]) @@ -792,9 +799,25 @@ async function _createAndUpdateIntegrationTaxProcessor(req, response){ if(demandDetail.taxAmount){ demandDetail.taxAmount = 0 } + delete TaxHeadsType[demandDetail.taxHeadMasterCode]//Deleting tax head codes present in both TaxHeadsType and demandDetail + console.log("Deleted taxhead from TaxHeadsType: ", demandDetail.taxHeadMasterCode); } + console.log("After Deleting the taxhead present in demand: ", JSON.stringify(TaxHeadsType)); + console.log("demandSearchResponse AFTER MAKING EVERYTHING ZERO : ", JSON.stringify(demandSearchResponse)) + + if(!(Object.keys(TaxHeadsType).length === 0)){ + for(taxHead in TaxHeadsType){ + taxHeadObj={}; + taxHeadObj["taxHeadMasterCode"] = taxHead; + taxHeadObj["taxAmount"] = 0; + taxHeadObj["collectionAmount"] = 0; + demandSearchResponse["Demands"][0]["demandDetails"].push(taxHeadObj); // Adding those obj to demand details for which taxhead there was no entry in it + console.log("Pushing obj", taxHeadObj); + } + } + console.log("After Adding All the tax head demandDetail: ", demandSearchResponse["Demands"][0]["demandDetails"]) for (demandDetail of demandSearchResponse["Demands"][0]["demandDetails"]) { @@ -806,12 +829,17 @@ async function _createAndUpdateIntegrationTaxProcessor(req, response){ } } + console.log("demandSearchResponse AFTER SETTING THE VALUE: ", JSON.stringify(demandSearchResponse)) + let demandUpdateResponse = await updateDemand(demandSearchResponse["Demands"], req["RequestInfo"]) + + console.log("demandUpdateResponse : ", JSON.stringify(demandUpdateResponse)) + calc["taxAmount"] = 0; calc["exemption"] = 0; calc["totalAmount"] = newTotal; calc["rebate"] = 0; - calc["penanlty"] = 0; + calc["penalty"] = 0; log("Demand Updated with Details : " + demandUpdateResponse ) From 5edc1d032a46c133e9ac4e3f49ee8e686c0ed229 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 9 Nov 2020 10:38:29 +0530 Subject: [PATCH 0351/1242] Update tl-reports.yml --- configs/reports/configs/tl-reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/reports/configs/tl-reports.yml b/configs/reports/configs/tl-reports.yml index cffae313..2f3fcf31 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -1376,7 +1376,7 @@ ReportDefinitions: - reportName: StateTradeLicenseCancelledRegistryReport_v2 - decryptionPathId: StateTradeLicenseCancelledRegistryReport_v2 + decryptionPathId: TradeLicenseCancelledRegistryReport_v2 summary: TL Cancelled Receipt Register Report version: 1.0.0 moduleName: rainmaker-tl From 9d446bdee77e7e7c09b77e4d756023032a6560a9 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 9 Nov 2020 14:10:19 +0530 Subject: [PATCH 0352/1242] enrypted constant updated --- configs/reports/configs/tl-reports.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/tl-reports.yml b/configs/reports/configs/tl-reports.yml index 2f3fcf31..fddff2b0 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -135,7 +135,7 @@ ReportDefinitions: amount as totalamount, To_char((To_timestamp(receipt.manualreceiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') AS g8issuedate, receipt.manualreceiptnumber as g8receiptno, - (CASE WHEN collectiontype='COUNTER' THEN eg_user.name ELSE '30048|21Fj+c3k2ldB0X3AzIh7atXB' END) as collectorname + (CASE WHEN collectiontype='COUNTER' THEN eg_user.name ELSE '721995|Jit/FZQHkmU8SNc06DKOhEnWXXfadQ==' END) as collectorname --value for Online FROM eg_tl_tradelicense tl INNER JOIN eg_tl_tradelicensedetail tld ON tld.tradelicenseid = tl.id @@ -1353,7 +1353,7 @@ ReportDefinitions: payment.totalamountpaid as totalamount, --amount as totalamount, To_char((To_timestamp(egcl_paymentdetail.manualreceiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') AS g8issuedate, egcl_paymentdetail.manualreceiptnumber as g8receiptno, - (CASE WHEN paymentmode!='ONLINE' THEN eg_user.name ELSE '30048|21Fj+c3k2ldB0X3AzIh7atXB' END) as collectorname + (CASE WHEN paymentmode!='ONLINE' THEN eg_user.name ELSE '721995|Jit/FZQHkmU8SNc06DKOhEnWXXfadQ==' END) as collectorname FROM eg_tl_tradelicense tl INNER JOIN eg_tl_tradelicensedetail tld ON tld.tradelicenseid = tl.id INNER JOIN ( From 6a8bdf965083b823ff97f03b5601dc320b9ca7a1 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 9 Nov 2020 14:12:30 +0530 Subject: [PATCH 0353/1242] encrypted value updated for Online collectorname --- configs/reports/configs/pt-reports.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 35fcd176..df34e7c9 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -215,7 +215,7 @@ ReportDefinitions: to_char((To_timestamp(rh.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, Initcap(COALESCE(pt_detail.usagecategoryminor, pt_detail.usagecategorymajor)) as usagetype, manualreceiptnumber as g8receiptno, - (case when eg_user.name is null then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else eg_user.name end) as collectorname, + (case when eg_user.name is null then '721995|Jit/FZQHkmU8SNc06DKOhEnWXXfadQ==' else eg_user.name end) as collectorname, pt_detail.additionaldetails->>'remarks' as "remarks" FROM egcl_receiptheader_v1 AS rh JOIN egcl_receiptinstrument_v1 AS ri ON rh.id = ri.receiptheader @@ -1623,7 +1623,7 @@ ReportDefinitions: to_char((To_timestamp(rh.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, Initcap(COALESCE(pt_detail.usagecategoryminor, pt_detail.usagecategorymajor)) as usagetype, manualreceiptnumber as g8receiptno, - (case when eg_user.name is null then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else eg_user.name end) as collectorname, + (case when eg_user.name is null then '721995|Jit/FZQHkmU8SNc06DKOhEnWXXfadQ==' else eg_user.name end) as collectorname, pt_detail.additionaldetails->>'remarks' as "remarks" FROM egcl_receiptheader_v1 AS rh JOIN egcl_receiptinstrument_v1 AS ri ON rh.id = ri.receiptheader @@ -2274,7 +2274,7 @@ ReportDefinitions: to_char((To_timestamp(payment.transactiondate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, pd.due AS pendingamount, Initcap(case when pt.usagecategory like '%.%' then split_part(pt.usagecategory,'.',2) else pt.usagecategory end) as usagetype, - (case when eg_user.name is null then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else eg_user.name end) as collectorname, + (case when eg_user.name is null then '721995|Jit/FZQHkmU8SNc06DKOhEnWXXfadQ==' else eg_user.name end) as collectorname, receipt_breakup.*, to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, manualreceiptnumber as g8receiptno @@ -2494,7 +2494,7 @@ ReportDefinitions: to_char((To_timestamp(payment.transactiondate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, pd.due AS pendingamount, Initcap(case when pt.usagecategory like '%.%' then split_part(pt.usagecategory,'.',2) else pt.usagecategory end) as usagetype, - (CASE WHEN billd.collectiontype='COUNTER' THEN eg_user.name ELSE '30048|21Fj+c3k2ldB0X3AzIh7atXB' END) as collectorname, + (CASE WHEN billd.collectiontype='COUNTER' THEN eg_user.name ELSE '721995|Jit/FZQHkmU8SNc06DKOhEnWXXfadQ==' END) as collectorname, receipt_breakup.*, to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, manualreceiptnumber as g8receiptno, @@ -2749,7 +2749,7 @@ ReportDefinitions: to_char((To_timestamp(payment.transactiondate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, pd.due AS pendingamount, Initcap(case when pt.usagecategory like '%.%' then split_part(pt.usagecategory,'.',2) else pt.usagecategory end) as usagetype, - (CASE WHEN billd.collectiontype='COUNTER' THEN eg_user.name ELSE '30048|21Fj+c3k2ldB0X3AzIh7atXB' END) as collectorname, + (CASE WHEN billd.collectiontype='COUNTER' THEN eg_user.name ELSE '721995|Jit/FZQHkmU8SNc06DKOhEnWXXfadQ==' END) as collectorname, receipt_breakup.*, to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, manualreceiptnumber as g8receiptno FROM egcl_paymentdetail pd, eg_user, eg_pt_property as pt, egcl_billdetial as billd, egcl_payment payment,receipt_breakup, egcl_bill bill, (select bill.id as billid, min(bd.fromperiod) fromperiod, max(bd.toperiod) toperiod from egcl_billdetial bd, egcl_bill bill where bill.id=bd.billid group by bill.id) bd @@ -3051,7 +3051,7 @@ ReportDefinitions: payment.paymentmode as instrumenttype, payment.transactionnumber as transactionnumber, concat(to_char((To_timestamp(bd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(bd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY')) AS financialyear, - (case when eg_user.name is null then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else eg_user.name end) as collectorname, + (case when eg_user.name is null then '721995|Jit/FZQHkmU8SNc06DKOhEnWXXfadQ==' else eg_user.name end) as collectorname, --receipt_breakup.*, to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, manualreceiptnumber as g8receiptno, @@ -3479,7 +3479,7 @@ ReportDefinitions: to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, Initcap(COALESCE(pt_detail.usagecategoryminor, pt_detail.usagecategorymajor)) as usagetype, manualreceiptnumber as g8receiptno, - (CASE WHEN collectiontype='COUNTER' THEN eg_user.name ELSE '30048|21Fj+c3k2ldB0X3AzIh7atXB' END) as collectorname, + (CASE WHEN collectiontype='COUNTER' THEN eg_user.name ELSE '721995|Jit/FZQHkmU8SNc06DKOhEnWXXfadQ==' END) as collectorname, pt_detail.additionaldetails->>'remarks' as "remarks" FROM egcl_bill AS bill INNER JOIN egcl_billdetial as bd on bd.billid = bill.id @@ -3636,7 +3636,7 @@ ReportDefinitions: sum(case when payment.paymentmode='CHEQUE' then bad.adjustedamount else 0 end) as sumcheque, count (distinct case when payment.paymentmode='CHEQUE' then concat(payment.paymentmode) end) as countcheque, sum(case when payment.paymentmode='ONLINE' then bad.adjustedamount else 0 end) as sumonline, - (CASE WHEN collectiontype='COUNTER' THEN eg_user.name ELSE '30048|+2XzlkQVhqavkQNuL+i/3UDc+MI=' END) as collectorname, --for online collecion show null as collectorname + (CASE WHEN collectiontype='COUNTER' THEN eg_user.name ELSE '721995|Jit/FZQHkmU8SNc06DKOhEnWXXfadQ==' END) as collectorname, --for Online collecion show null as collectorname sum(adjustedamount) as totalamount FROM egcl_billaccountdetail as bad INNER JOIN egcl_billdetial as bd on bd.id = bad.billdetailid From 7860dbf76ab782600ad1cb7db35874a47ea826fa Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 9 Nov 2020 14:13:30 +0530 Subject: [PATCH 0354/1242] encrypted value updated Online collectorname --- configs/reports/configs/uc-reports.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/uc-reports.yml b/configs/reports/configs/uc-reports.yml index 1b2325fe..8919f4b7 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -1594,7 +1594,7 @@ ReportDefinitions: (case when paymentmode like 'CASH' then '' else transactionnumber end) as ddorchequenumber, (case when paymentmode like 'DD' or paymentmode like 'CHEQUE' then To_char((To_timestamp(payment.transactiondate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') else '' end) as ddchequedate, 'System' as collectiontype, - (case when eg_user.name is null then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else eg_user.name end) as collectorname + (case when eg_user.name is null then '721995|Jit/FZQHkmU8SNc06DKOhEnWXXfadQ==' else eg_user.name end) as collectorname FROM egcl_payment AS payment JOIN egcl_paymentdetail as paydetail on paydetail.paymentid=payment.id JOIN receipt_breakup ON paydetail.billid = receipt_breakup.bill_id @@ -1675,7 +1675,7 @@ ReportDefinitions: To_char((To_timestamp(paydetail.receiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as receiptdate, paydetail.businessservice as servicecategory, payment.totalamountpaid as amount, - (case when eg_user.name is null then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else eg_user.name end) as collectorname, + (case when eg_user.name is null then '721995|Jit/FZQHkmU8SNc06DKOhEnWXXfadQ==' else eg_user.name end) as collectorname, billd.additionaldetails->>'comment' as remarks FROM egcl_payment AS payment INNER JOIN egcl_paymentdetail as paydetail on paydetail.paymentid=payment.id From 8336fc896a85c7a18dd0873788103ce06c02d067 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 9 Nov 2020 14:15:54 +0530 Subject: [PATCH 0355/1242] encrypted values updated --- configs/reports/configs/pgr-reports.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/reports/configs/pgr-reports.yml b/configs/reports/configs/pgr-reports.yml index ec1d47f8..ac3a7747 100644 --- a/configs/reports/configs/pgr-reports.yml +++ b/configs/reports/configs/pgr-reports.yml @@ -1060,13 +1060,13 @@ ReportDefinitions: query: | SELECT DISTINCT ON (servicerequestid) - (case when ua.name is null then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else ua.name end) as lastassignedto, + (case when ua.name is null then '721995|PCtyD4kL8cT1K/SqWCPDDLhr8n3vdfJ1R9s=' else ua.name end) as lastassignedto, --value for Unassigned (SELECT deptmap_def.name FROM (VALUES tbl_def_dept) AS deptmap_def(name,code) INNER JOIN (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) on deptmap.serviceCode = eg_pgr_service.servicecode and deptmap_def.code = deptmap.department) AS department, regexp_replace(servicecode, '([a-z])([A-Z])', '\1 \2','g') AS servicecode, (SELECT boundary_def.name FROM (VALUES tbl_boundary) AS boundary_def(name,code) where code=eg_pgr_address.mohalla) as locality, servicerequestid AS complaintNo, to_char(to_timestamp(TRUNC(CAST(eg_pgr_service.createdtime AS bigint) / 1000)), 'DD/MM/YYYY') AS date, - (case when eg_user.name is null then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else eg_user.name end) as name, + (case when eg_user.name is null then '721995|JxBfMOBlJR+m/IMM/1eQwdVYJkI=' else eg_user.name end) as name, --value for NULL phone, eg_pgr_address.landmark, eg_pgr_address.housenoandstreetname as address, @@ -1640,7 +1640,7 @@ ReportDefinitions: where tenantid = $tenantid) select - coalesce((select name from eg_user where id::varchar = assignee),'30048|+3/xnyTtx2VYznMwVlAA/wJxplY=') as employee, -- encrypted value for none + coalesce((select name from eg_user where id::varchar = assignee),'721995|JxBfMOBlJR+m/IMM/1eQwdVYJkI=') as employee, -- encrypted value for NULL SUM (CASE WHEN status in ('rejected') THEN 1 ELSE 0 END) as rejected, SUM (CASE WHEN status in ('closed', 'resolved') THEN 1 ELSE 0 END) as resolved, SUM (CASE WHEN status in ('closed', 'resolved') and (resolvedtime - opentime) >= 14 * 86400 * 1000 THEN 1 ELSE 0 END) as resolvedoutsidesla, From 7cd3e36e614b3a23a4fec902de8644a7c7ce3009 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 9 Nov 2020 17:57:39 +0530 Subject: [PATCH 0356/1242] shown localityname PTdump report --- configs/reports/configs/pt-reports.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index df34e7c9..026b42b5 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -3187,6 +3187,11 @@ ReportDefinitions: type: string source: pt total: false + - name: localityname + label: reports.pt.localityname + type: string + source: pt + total: false searchParams: - name: fromDate label: reports.pt.fromDate @@ -3249,7 +3254,8 @@ ReportDefinitions: pt.additionaldetails->>'FirmBusinessName' as "businessname", pot.occupancytype as occupancy, pot.propertytype as propertytype, - pta.locality as "localitycode" + pta.locality as "localitycode", + localnames.localityname as localityname from egcl_paymentdetail as payd inner join egcl_payment as payment on payment.id = payd.paymentid inner join egcl_bill as bill on bill.id = payd.billid @@ -3258,6 +3264,7 @@ ReportDefinitions: inner join eg_pt_owner as po on po.propertyid = pt.id inner join eg_user as eu on eu.uuid = po.userid inner join eg_pt_address as pta on pta.propertyid = pt.id + left outer join eg_bndry_mohalla as localnames on pta.locality=localnames.localitycode left outer join eg_pt_unit_v2_ot as pot on pot.propertyid = pt.id where payd.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and payd.businessservice='PT' and pt.status!='INACTIVE' From 5f3af5201681a2c551c2f856a2e2990ddb82e12c Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Wed, 11 Nov 2020 12:34:45 +0530 Subject: [PATCH 0357/1242] added path for amount to be paid column --- configs/pdf-service/data-config/property-receipt.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index 5534fa4a..f68927ae 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -58,7 +58,7 @@ { "variable": "paidAmount", "value": { - "path": "$.paymentDetails[0].totalAmountPaid" + "path": "$.paymentDetails[0].bill.billDetails[0].amountPaid" } }, { @@ -143,7 +143,7 @@ { "variable": "dueAmount", "value": { - "path": "$.paymentDetails[0].totalDue" + "path": "$.paymentDetails[0].bill.billDetails[0].amount" } }, { From 7085f493614f30447a9cf37366b96ed60a01453e Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Wed, 11 Nov 2020 13:15:28 +0530 Subject: [PATCH 0358/1242] Update property-receipt.json --- configs/pdf-service/data-config/property-receipt.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index f68927ae..cfa122a2 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -685,7 +685,7 @@ }, { "variable":"builtup_area", - "value":"constructionDetail.builtUpArea * 9" + "value":"constructionDetail.builtUpArea" }, { "variable":"arv_rent", From f23390c37effa0e39d958fd486b410ae1821f942 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Wed, 11 Nov 2020 13:16:18 +0530 Subject: [PATCH 0359/1242] changed sq feet to yard --- configs/pdf-service/format-config/property-receipt.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/pdf-service/format-config/property-receipt.json b/configs/pdf-service/format-config/property-receipt.json index 8675bd67..53202895 100644 --- a/configs/pdf-service/format-config/property-receipt.json +++ b/configs/pdf-service/format-config/property-receipt.json @@ -852,7 +852,7 @@ "style": "receipt-table-value" }, { - "text": "Built Area (Sq. Feet) / Total Annual Rent", + "text": "Built Area (Sq. Yard) / Total Annual Rent", "style": "receipt-table-value" } ], From 77a4600e2bbb510fd6f1f3be62446b46a53271de Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 11 Nov 2020 13:24:08 +0530 Subject: [PATCH 0360/1242] Update pt-reports.yml --- configs/reports/configs/pt-reports.yml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 026b42b5..2f8900d4 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2570,6 +2570,11 @@ ReportDefinitions: print: pdfPageSize: "A1" sourceColumns: + - name: tenantid + label: reports.pt.ulb + type: string + source: pt + total: false - name: receiptnumber label: reports.pt.receiptNo type: string @@ -2595,6 +2600,11 @@ ReportDefinitions: type: string source: pt total: true + - name: paystatus + label: reports.pt.paymentstatus + type: string + source: pt + total: false - name: propertytax label: reports.pt.propertyTax type: string @@ -2751,7 +2761,8 @@ ReportDefinitions: Initcap(case when pt.usagecategory like '%.%' then split_part(pt.usagecategory,'.',2) else pt.usagecategory end) as usagetype, (CASE WHEN billd.collectiontype='COUNTER' THEN eg_user.name ELSE '721995|Jit/FZQHkmU8SNc06DKOhEnWXXfadQ==' END) as collectorname, receipt_breakup.*, - to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, manualreceiptnumber as g8receiptno + to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, manualreceiptnumber as g8receiptno, + payment.paymentstatus as paystatus FROM egcl_paymentdetail pd, eg_user, eg_pt_property as pt, egcl_billdetial as billd, egcl_payment payment,receipt_breakup, egcl_bill bill, (select bill.id as billid, min(bd.fromperiod) fromperiod, max(bd.toperiod) toperiod from egcl_billdetial bd, egcl_bill bill where bill.id=bd.billid group by bill.id) bd WHERE pd.paymentid=payment.id and eg_user.id = pd.createdby::INTEGER and pt.propertyid = bill.consumercode and bill.id=pd.billid and bill.id=billd.billid and bd.billid=bill.id and payment.paymentstatus = 'CANCELLED' and pd.businessservice='PT' and payment.tenantid not in ('pb.testing','pb.ludhiana_legacy') and receipt_breakup.pdid=pd.id orderby: ORDER BY pd.receiptdate DESC; From 37bf03c80464155f216aaf29d4cf6788968f12e2 Mon Sep 17 00:00:00 2001 From: narendrabandhamneni-wt-egov Date: Wed, 11 Nov 2020 13:58:53 +0530 Subject: [PATCH 0361/1242] https://digit-discuss.atlassian.net/browse/PI-946 --- configs/egov-persister/property-services-registry.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/egov-persister/property-services-registry.yml b/configs/egov-persister/property-services-registry.yml index a851db88..d52151a8 100644 --- a/configs/egov-persister/property-services-registry.yml +++ b/configs/egov-persister/property-services-registry.yml @@ -106,7 +106,7 @@ serviceMaps: - jsonPath: $.Property.auditDetails.lastModifiedTime - - query: INSERT INTO eg_pt_document (id, tenantid, entityid, documenttype, filestoreid, documentuid, status, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + - query: INSERT INTO eg_pt_document (id, tenantid, entityid, documenttype, filestoreid, documentuid, status, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET documenttype = EXCLUDED.documenttype,fileStoreid = EXCLUDED.filestoreid, documentuid=EXCLUDED.documentuid, status=EXCLUDED.status, lastmodifiedby = EXCLUDED.lastModifiedby, lastmodifiedtime = EXCLUDED.lastmodifiedtime; basePath: $.Property.documents.* jsonMaps: @@ -133,7 +133,7 @@ serviceMaps: - jsonPath: $.Property.auditDetails.lastModifiedTime - - query: INSERT INTO eg_pt_document (id, tenantid, entityid, documenttype, filestoreid, documentuid, status, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + - query: INSERT INTO eg_pt_document (id, tenantid, entityid, documenttype, filestoreid, documentuid, status, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET documenttype = EXCLUDED.documenttype,fileStoreid = EXCLUDED.filestoreid, documentuid=EXCLUDED.documentuid, status=EXCLUDED.status, lastmodifiedby = EXCLUDED.lastModifiedby, lastmodifiedtime = EXCLUDED.lastmodifiedtime; basePath: $.Property.owners.*.documents.* jsonMaps: From 4f95e75caabf28c677f9afeab249a710da555806 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 11 Nov 2020 14:13:18 +0530 Subject: [PATCH 0362/1242] added complaintTypesReport_v2 --- configs/reports/configs/pgr-reports.yml | 82 +++++++++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/configs/reports/configs/pgr-reports.yml b/configs/reports/configs/pgr-reports.yml index ac3a7747..01eecc46 100644 --- a/configs/reports/configs/pgr-reports.yml +++ b/configs/reports/configs/pgr-reports.yml @@ -1822,3 +1822,85 @@ ReportDefinitions: eg_pgr_address.uuid = eg_pgr_service.addressid AND rating is not null AND feedback is not null orderby: ORDER BY servicerequestid, epa."when" desc + + +- reportName: ComplaintTypesReport_v2 + summary: Fetches complaint stats based on complaint types for a ULB + version: 1.0.0 + moduleName: rainmaker-pgr + sourceColumns: + - name: tenantid + label: reports.rainmaker-pgr.tenantid + type: string + source: eg_pgr_service + total: false + - name: complainttype + label: reports.rainmaker-pgr.complainttype + type: string + source: eg_pgr_service + total: false + - name: open + label: reports.rainmaker-pgr.status.open + type: string + source: eg_pgr_service + total: true + - name: assigned + label: reports.rainmaker-pgr.status.assigned + type: string + source: eg_pgr_service + total: true + - name: closed + label: reports.rainmaker-pgr.status.closed + type: string + source: eg_pgr_service + total: true + - name: reassignrequested + label: reports.rainmaker-pgr.status.reassignrequested + type: string + source: eg_pgr_service + total: true + - name: rejected + label: reports.rainmaker-pgr.status.rejected + type: string + source: eg_pgr_service + total: true + - name: total + label: reports.rainmaker-pgr.total + type: string + source: eg_pgr_service + total: true + searchParams: + - name: ulb + label: ULB + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: pt + wrapper: true + isMandatory: false + searchClause: AND tenantid = $ulb + - name: fromDate + label: reports.rainmaker-pgr.datefrom + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND createdtime >= $fromDate + - name: toDate + label: reports.rainmaker-pgr.dateto + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND createdtime <= $toDate + query: | + select + initcap(split_part(tenantid, '.', 2)) as tenantid, + regexp_replace(servicecode, '([a-z])([A-Z])', '\1 \2','g') as complainttype, + SUM(CASE WHEN status ='open' THEN 1 ELSE 0 END) as open, + SUM(CASE WHEN status ='assigned' THEN 1 ELSE 0 END) as assigned, + SUM(CASE WHEN status in ('closed', 'resolved') THEN 1 ELSE 0 END) as closed, + SUM(CASE WHEN status ='reassignrequested' THEN 1 ELSE 0 END) as reassignrequested, + SUM(CASE WHEN status ='rejected' THEN 1 ELSE 0 END) as rejected, + count(status) as total + from eg_pgr_service + WHERE tenantid != 'pb.testing' + groupby: GROUP BY tenantid,servicecode + orderby: ORDER BY tenantid,servicecode From 1060365eec65eaeff7706530d23ee805bd734adf Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Wed, 11 Nov 2020 14:44:11 +0530 Subject: [PATCH 0363/1242] changed amount to be paid path --- configs/pdf-service/data-config/property-receipt.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index cfa122a2..0d7a8406 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -58,7 +58,7 @@ { "variable": "paidAmount", "value": { - "path": "$.paymentDetails[0].bill.billDetails[0].amountPaid" + "path": "$.totalAmountPaid" } }, { @@ -143,7 +143,7 @@ { "variable": "dueAmount", "value": { - "path": "$.paymentDetails[0].bill.billDetails[0].amount" + "path": "$.paymentDetails[0].bill.totalAmount" } }, { From 980753b81f1f14e1a272292acc178c463e51f1cf Mon Sep 17 00:00:00 2001 From: Abhilashegov Date: Wed, 11 Nov 2020 17:25:56 +0530 Subject: [PATCH 0364/1242] Fixed the estimate call issue --- rainmaker-custom-service/index.js | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/rainmaker-custom-service/index.js b/rainmaker-custom-service/index.js index d864d8d3..fc742333 100644 --- a/rainmaker-custom-service/index.js +++ b/rainmaker-custom-service/index.js @@ -732,7 +732,10 @@ async function _createAndUpdateIntegrationTaxProcessor(req, response){ log("Got Assessment CREATE/ UPDATE request for tenantid: "+tenantId+" and finanancial year: "+assessmentYear) log("Assessment CREATE/ UPDATE Request body: "+ JSON.stringify(reqProperty) ) - let estimateResponse = await findEstimate(req) + let estimateResponseBody = await findEstimate(req) + console.log("After Getting Response from entimate sending it to PMIDC TO get the Estimate Response") + let estimateResponse = await _estimateIntegrationTaxProcessor(oldRequestbody, estimateResponseBody) + request_info = req["RequestInfo"] || req["requestInfo"] @@ -925,7 +928,6 @@ async function _createAndUpdateRequestHandler(req, res) { response } = getRequestResponse(req) - log("Got Request for Assessment Create and Update") let assessmentYear = request["Assessment"]["financialYear"] let tenantId = request["Assessment"]["tenantId"] @@ -933,6 +935,8 @@ async function _createAndUpdateRequestHandler(req, res) { if (assessmentYear == PT_ZERO_ASSESSMENTYEAR && PT_ZERO_TENANTS.indexOf(tenantId) >= 0){ response = await _createAndUpdateZeroTaxProcessor(request, response) }else if(assessmentYear == PT_INTEGRATION_ASSESSMENTYEAR && PT_INTEGRATION_TENANTS.indexOf(tenantId) >= 0){ + log("Got Request for Assessment Create and Update") + response = await _createAndUpdateIntegrationTaxProcessor(request, response) } @@ -1026,7 +1030,6 @@ router.post('/protected/punjab-pt/pt-calculator-v2/_estimate', asyncMiddleware(a response } = getRequestResponse(req) - log(":: Estimate request Received ::"); // let oldRequestbody = getOldRequestBody(request) @@ -1038,8 +1041,6 @@ router.post('/protected/punjab-pt/pt-calculator-v2/_estimate', asyncMiddleware(a let tenantId = request["Assessment"]["tenantId"] let assessmentYear = request["Assessment"]["financialYear"] - log("Got request for tenantid: "+tenantId+" and finanancial year: "+assessmentYear) - log("Request body: "+ JSON.stringify(request)); let oldRequestbody = await getOldRequestBody(request); oldRequestbody["CalculationCriteria"][0]["assessmentYear"] = assessmentYear; @@ -1052,6 +1053,11 @@ router.post('/protected/punjab-pt/pt-calculator-v2/_estimate', asyncMiddleware(a else if (assessmentYear == PT_INTEGRATION_ASSESSMENTYEAR){ if(PT_INTEGRATION_TENANTS.indexOf(tenantId) >= 0){ + log(":: Estimate request Received ::"); + + log("Got request for tenantid: "+tenantId+" and finanancial year: "+assessmentYear) + log("Request body: "+ JSON.stringify(request)); + response = await _estimateIntegrationTaxProcessor(oldRequestbody, response) } else if(isCitizen(request)){ data = From 70d9ab3f34479f10190ee4b5082831564d4fad5a Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Thu, 12 Nov 2020 10:45:00 +0530 Subject: [PATCH 0365/1242] [PI-8543] remove rupee symbol from payment mode --- configs/pdf-service/format-config/property-receipt.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/pdf-service/format-config/property-receipt.json b/configs/pdf-service/format-config/property-receipt.json index 53202895..62d46deb 100644 --- a/configs/pdf-service/format-config/property-receipt.json +++ b/configs/pdf-service/format-config/property-receipt.json @@ -576,7 +576,7 @@ "style": "receipt-table-value" }, { - "text": "₹ {{paymentMode}}", + "text": "{{paymentMode}}", "border": [ false, false, From da8b854e99d6c0d56af73756771f375ea243ac89 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Thu, 12 Nov 2020 11:06:54 +0530 Subject: [PATCH 0366/1242] [Pi-8487] changes for paid amount heads --- .../pdf-service/data-config/property-receipt.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index 0d7a8406..54ab9380 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -214,43 +214,43 @@ { "variable": "adhocPenalty", "value": { - "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_ADHOC_PENALTY')].adjustedAmount" + "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_ADHOC_PENALTY')].amount" } }, { "variable": "adhocRebate", "value": { - "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_ADHOC_REBATE')].adjustedAmount" + "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_ADHOC_REBATE')].amount" } }, { "variable": "Rebate", "value": { - "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_TIME_REBATE')].adjustedAmount" + "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_TIME_REBATE')].amount" } }, { "variable": "Interest", "value": { - "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_TIME_INTEREST')].adjustedAmount" + "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_TIME_INTEREST')].amount" } }, { "variable": "UsageExemption", "value": { - "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_UNIT_USAGE_EXEMPTION')].adjustedAmount" + "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_UNIT_USAGE_EXEMPTION')].amount" } }, { "variable": "SpecialCategoryExemption", "value": { - "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_OWNER_EXEMPTION')].adjustedAmount" + "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_OWNER_EXEMPTION')].amount" } }, { "variable": "RoundOff", "value": { - "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_ROUNDOFF')].adjustedAmount" + "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_ROUNDOFF')].amount" } }, { From 5c4aa704c1f0780eee733b6a1cf0957be2baaad4 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Thu, 12 Nov 2020 11:08:07 +0530 Subject: [PATCH 0367/1242] added paymentStatus field --- configs/pdf-service/format-config/property-receipt.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/pdf-service/format-config/property-receipt.json b/configs/pdf-service/format-config/property-receipt.json index 62d46deb..0b7a4299 100644 --- a/configs/pdf-service/format-config/property-receipt.json +++ b/configs/pdf-service/format-config/property-receipt.json @@ -238,7 +238,7 @@ "style": "receipt-table" }, { - "text" : " ", + "text" : "Payment Status", "border": [ false, false, @@ -248,7 +248,7 @@ "style": "receipt-table-value" }, { - "text" : " ", + "text" : "{{paymentStatus}}", "border": [ false, false, From 0c2262ce28eb28580311dc0f2569e9fc3665d3b2 Mon Sep 17 00:00:00 2001 From: egovmis Date: Thu, 12 Nov 2020 11:25:13 +0530 Subject: [PATCH 0368/1242] ccds --- configs/pdf-service/data-config/property-receipt.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index 54ab9380..ff960b8c 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -533,7 +533,7 @@ { "externalAPI": [ { - "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "path": "http://localhost:8079/egov-mdms-service/v1/_get", "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", "apiRequest": null, "responseMapping":[ @@ -574,7 +574,7 @@ ] }, { - "path": "http://property-services.egov:8080/property-services/property/_search", + "path": "http://localhost:8078/property-services/property/_search", "queryParam": "propertyIds=$.paymentDetails[0].bill.consumerCode,tenantId=$.tenantId", "apiRequest": null, "responseMapping":[ @@ -703,7 +703,7 @@ ] }, { - "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "path": "http://localhost:8079/egov-mdms-service/v1/_get", "queryParam": "moduleName=tenant&masterName=footer&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}' %26%26 @.service=='{$.paymentDetails[0].businessService}')%5D", "apiRequest": null, "responseMapping":[ From e8c0b56c9d1821c9ac4e230fccfec26432954a12 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Thu, 12 Nov 2020 11:27:08 +0530 Subject: [PATCH 0369/1242] updated head of PT values --- configs/pdf-service/data-config/property-receipt.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index 54ab9380..78b842bf 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -149,25 +149,25 @@ { "variable": "PropertyTax", "value": { - "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_TAX')].adjustedAmount" + "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_TAX')].amount" } }, { "variable": "FireCess", "value": { - "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_FIRE_CESS')].adjustedAmount" + "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_FIRE_CESS')].amount" } }, { "variable": "CancerCess", "value": { - "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_CANCER_CESS')].adjustedAmount" + "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_CANCER_CESS')].amount" } }, { "variable": "Penalty", "value": { - "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_TIME_PENALTY')].adjustedAmount" + "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_TIME_PENALTY')].amount" } }, { From db3bc7b091fcb6581185caf5dcbe138af59a4aee Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Thu, 12 Nov 2020 12:07:18 +0530 Subject: [PATCH 0370/1242] Changed paid amount to payable amount --- configs/pdf-service/format-config/property-receipt.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/pdf-service/format-config/property-receipt.json b/configs/pdf-service/format-config/property-receipt.json index 0b7a4299..fde56b16 100644 --- a/configs/pdf-service/format-config/property-receipt.json +++ b/configs/pdf-service/format-config/property-receipt.json @@ -675,7 +675,7 @@ "layout": {} }, { - "text":"PAID AMOUNT", + "text":"PAYABLE AMOUNT", "style":"block-head" }, { @@ -791,7 +791,7 @@ "style": "amounts" }, { - "text": "{{paidAmount}}", + "text": "{{dueAmount}}", "style": "amounts" } From 034be2e33382f3f33b13689561ca3aaf9751d772 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Thu, 12 Nov 2020 12:31:22 +0530 Subject: [PATCH 0371/1242] changed background color of tables --- .../format-config/property-receipt.json | 285 ++++++++++-------- 1 file changed, 151 insertions(+), 134 deletions(-) diff --git a/configs/pdf-service/format-config/property-receipt.json b/configs/pdf-service/format-config/property-receipt.json index fde56b16..4e638e62 100644 --- a/configs/pdf-service/format-config/property-receipt.json +++ b/configs/pdf-service/format-config/property-receipt.json @@ -445,7 +445,133 @@ }, "layout": {} }, - + { + "text":"PAYABLE AMOUNT", + "style":"block-head" + }, + { + "style": "next-noc-table", + "table": { + "widths": [ + + "9%","8%","6%","7%","7%","7%","9%","9%","8%","8%","7%","7%","*" + ], + "body": [ + + [ + { + "text": "Property Tax", + "style": "amounts" + }, + { + "text": "Fire Cess", + "style": "amounts" + }, + { + "text": "Cancer Cess", + "style": "amounts" + }, + { + "text": "Penalty", + "style": "amounts" + }, + { + "text": "Rebate", + "style": "amounts" + }, + { + "text": "Interest", + "style": "amounts" + }, + { + "text": "Usage Exemption", + "style": "amounts" + }, + { + "text": "Special Category Exemption", + "style": "amounts" + }, + { + "text": "Adhoc Penalty", + "style": "amounts" + }, + { + "text": "Adhoc Rebate", + "style": "amounts" + },{ + "text": "Arrears", + "style": "amounts" + }, + { + "text": "Round Off", + "style": "amounts" + }, + { + "text": "Total", + "style": "amounts" + } + + ], + + [ + { + "text": "{{PropertyTax}}", + "style": "amountss" + }, + { + "text": "{{FireCess}}", + "style": "amountss" + }, + { + "text": "{{CancerCess}}", + "style": "amountss" + }, + { + "text": "{{Penalty}}", + "style": "amountss" + }, + { + "text": "{{Rebate}}", + "style": "amountss" + }, + { + "text": "{{Interest}}", + "style": "amountss" + }, + { + "text": "{{UsageExemption}}", + "style": "amountss" + }, + { + "text": "{{SpecialCategoryExemption}}", + "style": "amountss" + }, + { + "text": "{{adhocPenalty}}", + "style": "amountss" + }, + { + "text": "{{adhocRebate}}", + "style": "amountss" + },{ + "text": "{{Arrears}}", + "style": "amountss" + }, + { + "text": "{{RoundOff}}", + "style": "amountss" + }, + { + "text": "{{dueAmount}}", + "style": "amountss" + } + + ] + + ] + }, + "layout":{} + }, { "text":"PAYMENT INFORMATION", "style":"block-head" @@ -674,133 +800,6 @@ }, "layout": {} }, - { - "text":"PAYABLE AMOUNT", - "style":"block-head" - }, - { - "style": "next-noc-table", - "table": { - "widths": [ - - "9%","8%","6%","7%","7%","7%","9%","9%","8%","8%","7%","7%","*" - ], - "body": [ - - [ - { - "text": "Property Tax", - "style": "amounts" - }, - { - "text": "Fire Cess", - "style": "amounts" - }, - { - "text": "Cancer Cess", - "style": "amounts" - }, - { - "text": "Penalty", - "style": "amounts" - }, - { - "text": "Rebate", - "style": "amounts" - }, - { - "text": "Interest", - "style": "amounts" - }, - { - "text": "Usage Exemption", - "style": "amounts" - }, - { - "text": "Special Category Exemption", - "style": "amounts" - }, - { - "text": "Adhoc Penalty", - "style": "amounts" - }, - { - "text": "Adhoc Rebate", - "style": "amounts" - },{ - "text": "Arrears", - "style": "amounts" - }, - { - "text": "Round Off", - "style": "amounts" - }, - { - "text": "Total", - "style": "amounts" - } - - ], - - [ - { - "text": "{{PropertyTax}}", - "style": "amounts" - }, - { - "text": "{{FireCess}}", - "style": "amounts" - }, - { - "text": "{{CancerCess}}", - "style": "amounts" - }, - { - "text": "{{Penalty}}", - "style": "amounts" - }, - { - "text": "{{Rebate}}", - "style": "amounts" - }, - { - "text": "{{Interest}}", - "style": "amounts" - }, - { - "text": "{{UsageExemption}}", - "style": "amounts" - }, - { - "text": "{{SpecialCategoryExemption}}", - "style": "amounts" - }, - { - "text": "{{adhocPenalty}}", - "style": "amounts" - }, - { - "text": "{{adhocRebate}}", - "style": "amounts" - },{ - "text": "{{Arrears}}", - "style": "amounts" - }, - { - "text": "{{RoundOff}}", - "style": "amounts" - }, - { - "text": "{{dueAmount}}", - "style": "amounts" - } - - ] - - ] - }, - "layout":{} - }, { "text":"OWNERSHIP INFORMATION", "style":"block-head" @@ -838,22 +837,22 @@ [ { "text": "Floor", - "style": "receipt-table-value" + "style": "receipt-table-value22" },{ "text": "Usage", - "style": "receipt-table-value" + "style": "receipt-table-value22" }, { "text": "Sub Usage", - "style": "receipt-table-value" + "style": "receipt-table-value22" }, { "text": "Occupancy", - "style": "receipt-table-value" + "style": "receipt-table-value22" }, { "text": "Built Area (Sq. Yard) / Total Annual Rent", - "style": "receipt-table-value" + "style": "receipt-table-value22" } ], "{{#var_floors}}[{\"text\":\"{{floor_no}}\",\"style\":\"receipt-table\"},{\"text\":\"{{usage_category}}\",\"style\":\"receipt-table\"},{\"text\":\"{{sub_usage_category}}\",\"style\":\"receipt-table\"},{\"text\":\"{{occupancy_type}}\",\"style\":\"receipt-table\"},{\"text\":\"{{builtup_area}}/{{arv_rent}}\",\"style\":\"receipt-table\"}]{{/var_floors}}" @@ -1001,6 +1000,19 @@ 0 ] }, + "receipt-table-value22": { + "color": "#000000", + "bold": true, + "fontSize": 7, + "fontWeight": 500, + "backgroundColor": "#D3D3D3", + "margin": [ + 8, + 0, + 0, + 0 + ] + }, "receipt-table": { "color": "#000000", "bold": false, @@ -1056,7 +1068,12 @@ }, "amounts": { - "fontSize": 8 + "fontSize": 8, + "backgroundColor": "#D3D3D3" + }, + "amountss": + { + "fontSize": 8 } } } From 4afdbfb5084b8f470c23fb4e0d9e1a1412e393ad Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Thu, 12 Nov 2020 15:51:06 +0530 Subject: [PATCH 0372/1242] changed path for total amount --- configs/pdf-service/data-config/tradelicense-receipt.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/pdf-service/data-config/tradelicense-receipt.json b/configs/pdf-service/data-config/tradelicense-receipt.json index ee5114bc..02be3dae 100644 --- a/configs/pdf-service/data-config/tradelicense-receipt.json +++ b/configs/pdf-service/data-config/tradelicense-receipt.json @@ -158,7 +158,7 @@ { "variable": "dueAmount", "value": { - "path": "$.paymentDetails[0].totalDue" + "path": "$.paymentDetails[0].bill.totalAmount" } }, { From 045b8b7b95e4f1d3cdff203f1d7c9f115b28a9e3 Mon Sep 17 00:00:00 2001 From: egovmis Date: Fri, 13 Nov 2020 10:50:25 +0530 Subject: [PATCH 0373/1242] Added whatsapp message and trade owner --- .../data-config/tradelicense-receipt.json | 56 ++++++++++++++++++- .../format-config/consolidatedreceipt.json | 6 +- .../format-config/property-receipt.json | 3 +- .../format-config/tradelicense-receipt.json | 39 +++++++++++-- 4 files changed, 96 insertions(+), 8 deletions(-) diff --git a/configs/pdf-service/data-config/tradelicense-receipt.json b/configs/pdf-service/data-config/tradelicense-receipt.json index 02be3dae..fbca7850 100644 --- a/configs/pdf-service/data-config/tradelicense-receipt.json +++ b/configs/pdf-service/data-config/tradelicense-receipt.json @@ -489,6 +489,10 @@ { "variable":"applicationType", "value":"$.Licenses[0].applicationType" + }, + { + "variable":"localityCode", + "value":"$.tradeLicenseDetail.address.locality.code" }, { "variable":"penaltyComments", @@ -513,6 +517,15 @@ { "variable":"tradeName", "value":"$.Licenses[0].tradeName" + },{ + "variable":"tradeBuilding", + "value":"$.Licenses[0].tradeLicenseDetail.address.buildingName" + },{ + "variable":"tradeDoor", + "value":"$.Licenses[0].tradeLicenseDetail.address.doorNo" + },{ + "variable":"tradeStreet", + "value":"$.Licenses[0].tradeLicenseDetail.address.street" }, { "variable":"adhocRebateReason", @@ -589,7 +602,38 @@ ] } }, - + { + "variable": "variable_owners", + "value": "$.Licenses[0].tradeLicenseDetail.owners[?(@.active== true && @.userActive== true)]", + "type":"array", + "format":{ + "type":"string", + "scema":[ + { + "variable": "name", + "value": "name", + "type":"string" + }, + { + "variable": "fatherOrHusbandName", + "value": "fatherOrHusbandName", + "type":"string" + }, + + { + "variable": "permanentAddress", + "value": "permanentAddress", + "type":"string" + }, + { + "variable": "mobileNumber", + "value": "mobileNumber", + "type":"string" + } + + ] + } + }, { "variable": "variable13", "value": "$.Licenses[0].tradeLicenseDetail.tradeUnits.*", @@ -634,6 +678,16 @@ } } ] + },{ + "path": "http://egov-location:8080/egov-location/location/v11/boundarys/_search", + "queryParam": "tenantId=$.tenantId,hierarchyTypeCode=REVENUE,boundaryType=Locality,codes={{localityCode}}", + "apiRequest": null, + "responseMapping":[ + { + "variable":"mohalla", + "value":"$.TenantBoundary[0].boundary[0].name" + } + ] } ] diff --git a/configs/pdf-service/format-config/consolidatedreceipt.json b/configs/pdf-service/format-config/consolidatedreceipt.json index 786955e3..ee430f8e 100644 --- a/configs/pdf-service/format-config/consolidatedreceipt.json +++ b/configs/pdf-service/format-config/consolidatedreceipt.json @@ -554,7 +554,8 @@ "text": "{{disclamer_3}}", "bold": false, "style": "pt-disclaimer-value" - } + }, { + "text":"Now log a complaint from WhatsApp, give a missed call on 8750975975 or send a Hi message on WhatsApp to this number", "bold": true, "fontSize": 8, "color": "blue", "decoration": "underline"} ] }, { @@ -1112,7 +1113,8 @@ "text": "{{disclamer_3}}", "bold": false, "style": "pt-disclaimer-value" - } + }, { + "text":"Now log a complaint from WhatsApp, give a missed call on 8750975975 or send a Hi message on WhatsApp to this number", "bold": true, "fontSize": 8, "color": "blue", "decoration": "underline"} ] } ], diff --git a/configs/pdf-service/format-config/property-receipt.json b/configs/pdf-service/format-config/property-receipt.json index 4e638e62..cd6d0e22 100644 --- a/configs/pdf-service/format-config/property-receipt.json +++ b/configs/pdf-service/format-config/property-receipt.json @@ -918,7 +918,8 @@ "Please deposit the property tx dues for earlier years also, Ignore if already paid", "Citizen for online payments please refer to the link https://mseva.lgpunjab.gov.in/" ] - } + }, { + "text":"Now log a complaint from WhatsApp, give a missed call on 8750975975 or send a Hi message on WhatsApp to this number", "bold": true, "fontSize": 8, "color": "blue", "decoration": "underline"} ] } ], diff --git a/configs/pdf-service/format-config/tradelicense-receipt.json b/configs/pdf-service/format-config/tradelicense-receipt.json index f0ad6055..f6a5d47f 100644 --- a/configs/pdf-service/format-config/tradelicense-receipt.json +++ b/configs/pdf-service/format-config/tradelicense-receipt.json @@ -191,7 +191,7 @@ "style": "receipt-table" }, { - "text": "Owner Contact", + "text": "Payer Contact", "border": [ false, true, @@ -234,7 +234,7 @@ "style": "receipt-table" }, { - "text": "Owner Name", + "text": "Payer Name", "border": [ false, false, @@ -266,7 +266,7 @@ "style": "receipt-table-value" }, { - "text": "{{payerAddress}}", + "text": "{{tradeDoor}} {{tradeBuilding}} {{tradeStreet}} {{mohalla}}", "border": [ false, false, @@ -757,6 +757,35 @@ }, "layout": {} + },{ + "style": "next-noc-table", + "table": { + "widths": [ + "55%", + "*", + "15%" + ], + "body": + [ + [ + { + "text": "Owner Name", + "style": "receipt-table-value" + }, + { + "text": "Father/Husband Name", + "style": "receipt-table-value" + }, + { + "text": "Mobile Number", + "style": "receipt-table-value" + } + ], + "{{#variable_owners}}[{ \"text\":\"{{name}}\", \"border\":[ true, false, true, true ], \"style\": \"receipt-table\" }, { \"text\":\"{{fatherOrHusbandName}}\", \"border\":[ false, false, true, true ], \"style\": \"receipt-table\" }, { \"text\":\"{{mobileNumber}}\", \"border\":[ false, false, true, true ], \"style\": \"receipt-table\" }]{{/variable_owners}}" + ] + }, "layout": {} + + }, { "style": "receipt-approver", @@ -810,7 +839,9 @@ "Payment received by Cheque/DD shall be subject to realization", "This document is not a proof of property ownership" ] - } + }, + { + "text":"Now log a complaint from WhatsApp, give a missed call on 8750975975 or send a Hi message on WhatsApp to this number", "bold": true, "fontSize": 8, "color": "blue", "decoration": "underline"} ] } ], From 46eaff48f54962eb885694d7bdf48ebfea0113ad Mon Sep 17 00:00:00 2001 From: egovmis Date: Fri, 13 Nov 2020 12:27:27 +0530 Subject: [PATCH 0374/1242] added mutiple owner in tlcertificate --- .../data-config/tlcertificate.json | 1 + .../data-config/tlrenewalcertificate.json | 33 ++++++++++++++++++- .../data-config/tradelicense-receipt.json | 2 +- .../format-config/tlcertificate.json | 29 ++++++++++++++++ .../format-config/tlrenewalcertificate.json | 29 ++++++++++++++++ 5 files changed, 92 insertions(+), 2 deletions(-) diff --git a/configs/pdf-service/data-config/tlcertificate.json b/configs/pdf-service/data-config/tlcertificate.json index 9e8368be..dcb10891 100644 --- a/configs/pdf-service/data-config/tlcertificate.json +++ b/configs/pdf-service/data-config/tlcertificate.json @@ -209,6 +209,7 @@ } }, + { "variable": "accessories", diff --git a/configs/pdf-service/data-config/tlrenewalcertificate.json b/configs/pdf-service/data-config/tlrenewalcertificate.json index a647b834..cc548ca5 100644 --- a/configs/pdf-service/data-config/tlrenewalcertificate.json +++ b/configs/pdf-service/data-config/tlrenewalcertificate.json @@ -209,7 +209,38 @@ } }, - + { + "variable": "variable_owners", + "value": "$.Licenses[0].tradeLicenseDetail.owners[?(@.active== true && @.userActive== true)]", + "type":"array", + "format":{ + "type":"string", + "scema":[ + { + "variable": "name", + "value": "name", + "type":"string" + }, + { + "variable": "fatherOrHusbandName", + "value": "fatherOrHusbandName", + "type":"string" + }, + + { + "variable": "permanentAddress", + "value": "permanentAddress", + "type":"string" + }, + { + "variable": "mobileNumber", + "value": "mobileNumber", + "type":"string" + } + + ] + } + }, { "variable": "accessories", "value": { diff --git a/configs/pdf-service/data-config/tradelicense-receipt.json b/configs/pdf-service/data-config/tradelicense-receipt.json index fbca7850..f5db43c5 100644 --- a/configs/pdf-service/data-config/tradelicense-receipt.json +++ b/configs/pdf-service/data-config/tradelicense-receipt.json @@ -567,7 +567,7 @@ }, { "variable": "variable_acc", - "value": "$.Licenses[0].tradeLicenseDetail.accessories.*", + "value": "$.Licenses[0].tradeLicenseDetail.accessories.* || 'NA'", "type":"array", "format":{ "type":"string", diff --git a/configs/pdf-service/format-config/tlcertificate.json b/configs/pdf-service/format-config/tlcertificate.json index b744a6d2..50dffcf0 100644 --- a/configs/pdf-service/format-config/tlcertificate.json +++ b/configs/pdf-service/format-config/tlcertificate.json @@ -441,6 +441,35 @@ true, false ] + }, { + "style": "next-noc-table", + "table": { + "widths": [ + "55%", + "*", + "15%" + ], + "body": + [ + [ + { + "text": "Owner Name", + "style": "receipt-table-value" + }, + { + "text": "Father/Husband Name", + "style": "receipt-table-value" + }, + { + "text": "Mobile Number", + "style": "receipt-table-value" + } + ], + "{{#variable_owners}}[{ \"text\":\"{{name}}\", \"border\":[ true, false, true, true ], \"style\": \"receipt-table\" }, { \"text\":\"{{fatherOrHusbandName}}\", \"border\":[ false, false, true, true ], \"style\": \"receipt-table\" }, { \"text\":\"{{mobileNumber}}\", \"border\":[ false, false, true, true ], \"style\": \"receipt-table\" }]{{/variable_owners}}" + ] + }, "layout": {} + + } ], diff --git a/configs/pdf-service/format-config/tlrenewalcertificate.json b/configs/pdf-service/format-config/tlrenewalcertificate.json index 1c74c077..cc751826 100644 --- a/configs/pdf-service/format-config/tlrenewalcertificate.json +++ b/configs/pdf-service/format-config/tlrenewalcertificate.json @@ -441,6 +441,35 @@ true, false ] + }, { + "style": "next-noc-table", + "table": { + "widths": [ + "55%", + "*", + "15%" + ], + "body": + [ + [ + { + "text": "Owner Name", + "style": "receipt-table-value" + }, + { + "text": "Father/Husband Name", + "style": "receipt-table-value" + }, + { + "text": "Mobile Number", + "style": "receipt-table-value" + } + ], + "{{#variable_owners}}[{ \"text\":\"{{name}}\", \"border\":[ true, false, true, true ], \"style\": \"receipt-table\" }, { \"text\":\"{{fatherOrHusbandName}}\", \"border\":[ false, false, true, true ], \"style\": \"receipt-table\" }, { \"text\":\"{{mobileNumber}}\", \"border\":[ false, false, true, true ], \"style\": \"receipt-table\" }]{{/variable_owners}}" + ] + }, "layout": {} + + } ], From e8ece1022ef80dda56a67a92fde9154693a71d48 Mon Sep 17 00:00:00 2001 From: egovmis Date: Fri, 13 Nov 2020 13:59:05 +0530 Subject: [PATCH 0375/1242] trade accessories issue --- configs/pdf-service/data-config/tradelicense-receipt.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/pdf-service/data-config/tradelicense-receipt.json b/configs/pdf-service/data-config/tradelicense-receipt.json index f5db43c5..fbca7850 100644 --- a/configs/pdf-service/data-config/tradelicense-receipt.json +++ b/configs/pdf-service/data-config/tradelicense-receipt.json @@ -567,7 +567,7 @@ }, { "variable": "variable_acc", - "value": "$.Licenses[0].tradeLicenseDetail.accessories.* || 'NA'", + "value": "$.Licenses[0].tradeLicenseDetail.accessories.*", "type":"array", "format":{ "type":"string", From 28474e92bfcc6cb387acca1a3ccfccb4c0d90d65 Mon Sep 17 00:00:00 2001 From: narendrabandhamneni-wt-egov Date: Fri, 13 Nov 2020 16:02:17 +0530 Subject: [PATCH 0376/1242] temporary fix for https://digit-discuss.atlassian.net/browse/PI-950 --- configs/egov-persister/property-services-registry.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-persister/property-services-registry.yml b/configs/egov-persister/property-services-registry.yml index d52151a8..8722cd1e 100644 --- a/configs/egov-persister/property-services-registry.yml +++ b/configs/egov-persister/property-services-registry.yml @@ -344,7 +344,7 @@ serviceMaps: - jsonPath: $.Property.tenantId - - query: INSERT INTO eg_pt_owner (ownerinfouuid, tenantid, propertyid, userid, status, isprimaryowner, ownertype, ownershippercentage, institutionid, relationship, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (userid, propertyid) DO UPDATE SET status=EXCLUDED.status, isprimaryowner=EXCLUDED.isprimaryowner, ownertype=EXCLUDED.ownertype, ownershippercentage=EXCLUDED.ownershippercentage, institutionid=EXCLUDED.institutionid, relationship=EXCLUDED.relationship, lastmodifiedby=EXCLUDED.lastModifiedby, lastmodifiedtime=EXCLUDED.lastmodifiedtime; + - query: INSERT INTO eg_pt_owner (ownerinfouuid, tenantid, propertyid, userid, status, isprimaryowner, ownertype, ownershippercentage, institutionid, relationship, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (ownerinfouuid,userid, propertyid) DO UPDATE SET status=EXCLUDED.status, isprimaryowner=EXCLUDED.isprimaryowner, ownertype=EXCLUDED.ownertype, ownershippercentage=EXCLUDED.ownershippercentage, institutionid=EXCLUDED.institutionid, relationship=EXCLUDED.relationship, lastmodifiedby=EXCLUDED.lastModifiedby, lastmodifiedtime=EXCLUDED.lastmodifiedtime; basePath: Property.owners.* jsonMaps: From cf50b962bbccfdb7a5c84b042219b427813b78ee Mon Sep 17 00:00:00 2001 From: narendrabandhamneni-wt-egov Date: Fri, 13 Nov 2020 16:14:58 +0530 Subject: [PATCH 0377/1242] chceck for https://digit-discuss.atlassian.net/browse/PI-950 --- configs/egov-persister/property-services-registry.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-persister/property-services-registry.yml b/configs/egov-persister/property-services-registry.yml index 8722cd1e..4456bbd3 100644 --- a/configs/egov-persister/property-services-registry.yml +++ b/configs/egov-persister/property-services-registry.yml @@ -344,7 +344,7 @@ serviceMaps: - jsonPath: $.Property.tenantId - - query: INSERT INTO eg_pt_owner (ownerinfouuid, tenantid, propertyid, userid, status, isprimaryowner, ownertype, ownershippercentage, institutionid, relationship, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (ownerinfouuid,userid, propertyid) DO UPDATE SET status=EXCLUDED.status, isprimaryowner=EXCLUDED.isprimaryowner, ownertype=EXCLUDED.ownertype, ownershippercentage=EXCLUDED.ownershippercentage, institutionid=EXCLUDED.institutionid, relationship=EXCLUDED.relationship, lastmodifiedby=EXCLUDED.lastModifiedby, lastmodifiedtime=EXCLUDED.lastmodifiedtime; + - query: INSERT INTO eg_pt_owner (ownerinfouuid, tenantid, propertyid, userid, status, isprimaryowner, ownertype, ownershippercentage, institutionid, relationship, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (ownerinfouuid) DO UPDATE SET status=EXCLUDED.status, isprimaryowner=EXCLUDED.isprimaryowner, ownertype=EXCLUDED.ownertype, ownershippercentage=EXCLUDED.ownershippercentage, institutionid=EXCLUDED.institutionid, relationship=EXCLUDED.relationship, lastmodifiedby=EXCLUDED.lastModifiedby, lastmodifiedtime=EXCLUDED.lastmodifiedtime; basePath: Property.owners.* jsonMaps: From 07f149e607889526a331eea0e4a2be7a6911296f Mon Sep 17 00:00:00 2001 From: narendrabandhamneni-wt-egov Date: Fri, 13 Nov 2020 16:53:48 +0530 Subject: [PATCH 0378/1242] reverted change --- configs/egov-persister/property-services-registry.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-persister/property-services-registry.yml b/configs/egov-persister/property-services-registry.yml index 4456bbd3..d52151a8 100644 --- a/configs/egov-persister/property-services-registry.yml +++ b/configs/egov-persister/property-services-registry.yml @@ -344,7 +344,7 @@ serviceMaps: - jsonPath: $.Property.tenantId - - query: INSERT INTO eg_pt_owner (ownerinfouuid, tenantid, propertyid, userid, status, isprimaryowner, ownertype, ownershippercentage, institutionid, relationship, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (ownerinfouuid) DO UPDATE SET status=EXCLUDED.status, isprimaryowner=EXCLUDED.isprimaryowner, ownertype=EXCLUDED.ownertype, ownershippercentage=EXCLUDED.ownershippercentage, institutionid=EXCLUDED.institutionid, relationship=EXCLUDED.relationship, lastmodifiedby=EXCLUDED.lastModifiedby, lastmodifiedtime=EXCLUDED.lastmodifiedtime; + - query: INSERT INTO eg_pt_owner (ownerinfouuid, tenantid, propertyid, userid, status, isprimaryowner, ownertype, ownershippercentage, institutionid, relationship, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (userid, propertyid) DO UPDATE SET status=EXCLUDED.status, isprimaryowner=EXCLUDED.isprimaryowner, ownertype=EXCLUDED.ownertype, ownershippercentage=EXCLUDED.ownershippercentage, institutionid=EXCLUDED.institutionid, relationship=EXCLUDED.relationship, lastmodifiedby=EXCLUDED.lastModifiedby, lastmodifiedtime=EXCLUDED.lastmodifiedtime; basePath: Property.owners.* jsonMaps: From 995a53d83a487fa52a7777eca2bce775c87a99a0 Mon Sep 17 00:00:00 2001 From: narendrabandhamneni-wt-egov Date: Fri, 13 Nov 2020 18:11:18 +0530 Subject: [PATCH 0379/1242] added change for duplicate owner issue --- configs/egov-persister/property-services-registry.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-persister/property-services-registry.yml b/configs/egov-persister/property-services-registry.yml index d52151a8..4456bbd3 100644 --- a/configs/egov-persister/property-services-registry.yml +++ b/configs/egov-persister/property-services-registry.yml @@ -344,7 +344,7 @@ serviceMaps: - jsonPath: $.Property.tenantId - - query: INSERT INTO eg_pt_owner (ownerinfouuid, tenantid, propertyid, userid, status, isprimaryowner, ownertype, ownershippercentage, institutionid, relationship, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (userid, propertyid) DO UPDATE SET status=EXCLUDED.status, isprimaryowner=EXCLUDED.isprimaryowner, ownertype=EXCLUDED.ownertype, ownershippercentage=EXCLUDED.ownershippercentage, institutionid=EXCLUDED.institutionid, relationship=EXCLUDED.relationship, lastmodifiedby=EXCLUDED.lastModifiedby, lastmodifiedtime=EXCLUDED.lastmodifiedtime; + - query: INSERT INTO eg_pt_owner (ownerinfouuid, tenantid, propertyid, userid, status, isprimaryowner, ownertype, ownershippercentage, institutionid, relationship, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (ownerinfouuid) DO UPDATE SET status=EXCLUDED.status, isprimaryowner=EXCLUDED.isprimaryowner, ownertype=EXCLUDED.ownertype, ownershippercentage=EXCLUDED.ownershippercentage, institutionid=EXCLUDED.institutionid, relationship=EXCLUDED.relationship, lastmodifiedby=EXCLUDED.lastModifiedby, lastmodifiedtime=EXCLUDED.lastmodifiedtime; basePath: Property.owners.* jsonMaps: From ec7660c447c07b260f5176d5ce29e1044793f79d Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Mon, 16 Nov 2020 10:21:24 +0530 Subject: [PATCH 0380/1242] Changed localhost to actual services name --- configs/pdf-service/data-config/property-receipt.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index 466faf7c..78b842bf 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -533,7 +533,7 @@ { "externalAPI": [ { - "path": "http://localhost:8079/egov-mdms-service/v1/_get", + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", "apiRequest": null, "responseMapping":[ @@ -574,7 +574,7 @@ ] }, { - "path": "http://localhost:8078/property-services/property/_search", + "path": "http://property-services.egov:8080/property-services/property/_search", "queryParam": "propertyIds=$.paymentDetails[0].bill.consumerCode,tenantId=$.tenantId", "apiRequest": null, "responseMapping":[ @@ -703,7 +703,7 @@ ] }, { - "path": "http://localhost:8079/egov-mdms-service/v1/_get", + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", "queryParam": "moduleName=tenant&masterName=footer&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}' %26%26 @.service=='{$.paymentDetails[0].businessService}')%5D", "apiRequest": null, "responseMapping":[ From 728710320bb948ca817e8257f60186a3899be21c Mon Sep 17 00:00:00 2001 From: egovmis Date: Mon, 16 Nov 2020 10:22:48 +0530 Subject: [PATCH 0381/1242] changes for TL receipt locality name --- configs/pdf-service/data-config/tradelicense-receipt.json | 6 +----- configs/pdf-service/format-config/tradelicense-receipt.json | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/configs/pdf-service/data-config/tradelicense-receipt.json b/configs/pdf-service/data-config/tradelicense-receipt.json index fbca7850..6a89ca6f 100644 --- a/configs/pdf-service/data-config/tradelicense-receipt.json +++ b/configs/pdf-service/data-config/tradelicense-receipt.json @@ -489,10 +489,6 @@ { "variable":"applicationType", "value":"$.Licenses[0].applicationType" - }, - { - "variable":"localityCode", - "value":"$.tradeLicenseDetail.address.locality.code" }, { "variable":"penaltyComments", @@ -680,7 +676,7 @@ ] },{ "path": "http://egov-location:8080/egov-location/location/v11/boundarys/_search", - "queryParam": "tenantId=$.tenantId,hierarchyTypeCode=REVENUE,boundaryType=Locality,codes={{localityCode}}", + "queryParam": "tenantId=$.tenantId,hierarchyTypeCode=REVENUE,boundaryType=Locality,codes=$.Payments[0].paymentDetails[0].bill.billDetails[0].additionalDetails.address", "apiRequest": null, "responseMapping":[ { diff --git a/configs/pdf-service/format-config/tradelicense-receipt.json b/configs/pdf-service/format-config/tradelicense-receipt.json index f6a5d47f..c0b82da4 100644 --- a/configs/pdf-service/format-config/tradelicense-receipt.json +++ b/configs/pdf-service/format-config/tradelicense-receipt.json @@ -266,7 +266,7 @@ "style": "receipt-table-value" }, { - "text": "{{tradeDoor}} {{tradeBuilding}} {{tradeStreet}} {{mohalla}}", + "text": "{{tradeDoor || ' '}} + {{tradeBuilding || ''}} + {{tradeStreet || ''}} + {{mohalla || ''}}", "border": [ false, false, From 99ae59912dec009930b776faff0daf856121ee6b Mon Sep 17 00:00:00 2001 From: egovmis Date: Mon, 16 Nov 2020 10:39:03 +0530 Subject: [PATCH 0382/1242] changes for locality on tl receipt --- configs/pdf-service/data-config/tradelicense-receipt.json | 2 +- configs/pdf-service/format-config/tradelicense-receipt.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/pdf-service/data-config/tradelicense-receipt.json b/configs/pdf-service/data-config/tradelicense-receipt.json index 6a89ca6f..af0e8591 100644 --- a/configs/pdf-service/data-config/tradelicense-receipt.json +++ b/configs/pdf-service/data-config/tradelicense-receipt.json @@ -676,7 +676,7 @@ ] },{ "path": "http://egov-location:8080/egov-location/location/v11/boundarys/_search", - "queryParam": "tenantId=$.tenantId,hierarchyTypeCode=REVENUE,boundaryType=Locality,codes=$.Payments[0].paymentDetails[0].bill.billDetails[0].additionalDetails.address", + "queryParam": "tenantId=$.tenantId,hierarchyTypeCode=REVENUE,boundaryType=Locality,codes=$.paymentDetails[0].bill.billDetails[0].additionalDetails.address", "apiRequest": null, "responseMapping":[ { diff --git a/configs/pdf-service/format-config/tradelicense-receipt.json b/configs/pdf-service/format-config/tradelicense-receipt.json index c0b82da4..90e86053 100644 --- a/configs/pdf-service/format-config/tradelicense-receipt.json +++ b/configs/pdf-service/format-config/tradelicense-receipt.json @@ -266,7 +266,7 @@ "style": "receipt-table-value" }, { - "text": "{{tradeDoor || ' '}} + {{tradeBuilding || ''}} + {{tradeStreet || ''}} + {{mohalla || ''}}", + "text": "{{tradeDoor || ' '}} {{tradeBuilding || ''}} {{tradeStreet || ''}} {{mohalla || ''}}", "border": [ false, false, From 0229f721de8d051a81c1b447fe6b2cf555060688 Mon Sep 17 00:00:00 2001 From: egovmis Date: Mon, 16 Nov 2020 10:58:24 +0530 Subject: [PATCH 0383/1242] TL receipt locality --- configs/pdf-service/data-config/tradelicense-receipt.json | 6 ++++++ configs/pdf-service/format-config/tradelicense-receipt.json | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/configs/pdf-service/data-config/tradelicense-receipt.json b/configs/pdf-service/data-config/tradelicense-receipt.json index af0e8591..573ad193 100644 --- a/configs/pdf-service/data-config/tradelicense-receipt.json +++ b/configs/pdf-service/data-config/tradelicense-receipt.json @@ -43,6 +43,12 @@ "path": "$.paymentDetails[0].receiptNumber" } }, + { + "variable": "add", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].additionalDetails.address" + } + }, { "variable": "serviceType", "value": { diff --git a/configs/pdf-service/format-config/tradelicense-receipt.json b/configs/pdf-service/format-config/tradelicense-receipt.json index 90e86053..443d45c2 100644 --- a/configs/pdf-service/format-config/tradelicense-receipt.json +++ b/configs/pdf-service/format-config/tradelicense-receipt.json @@ -266,7 +266,7 @@ "style": "receipt-table-value" }, { - "text": "{{tradeDoor || ' '}} {{tradeBuilding || ''}} {{tradeStreet || ''}} {{mohalla || ''}}", + "text": "{{tradeDoor || ' '}} {{tradeBuilding || ''}} {{tradeStreet || ''}} {{add}} {{mohalla || ''}}", "border": [ false, false, From 0bfe9940f0ebf736c04c2856729431bcfcaf3205 Mon Sep 17 00:00:00 2001 From: egovmis Date: Mon, 16 Nov 2020 11:28:09 +0530 Subject: [PATCH 0384/1242] added sq yard to sq feet on PT receipt --- configs/pdf-service/data-config/property-receipt.json | 2 +- configs/pdf-service/format-config/property-receipt.json | 8 +++++--- .../pdf-service/format-config/tradelicense-receipt.json | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index 78b842bf..ac805df7 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -685,7 +685,7 @@ }, { "variable":"builtup_area", - "value":"constructionDetail.builtUpArea" + "value":"constructionDetail.builtUpArea * 9" }, { "variable":"arv_rent", diff --git a/configs/pdf-service/format-config/property-receipt.json b/configs/pdf-service/format-config/property-receipt.json index cd6d0e22..f90f18b9 100644 --- a/configs/pdf-service/format-config/property-receipt.json +++ b/configs/pdf-service/format-config/property-receipt.json @@ -851,7 +851,7 @@ "style": "receipt-table-value22" }, { - "text": "Built Area (Sq. Yard) / Total Annual Rent", + "text": "Built Area (Sq. Feet) / Total Annual Rent", "style": "receipt-table-value22" } ], @@ -916,9 +916,11 @@ "{{no_signature}}", "Assessment and payment is subjected to verification/scruitiny by competetive authority", "Please deposit the property tx dues for earlier years also, Ignore if already paid", - "Citizen for online payments please refer to the link https://mseva.lgpunjab.gov.in/" + "Citizen for online payments please refer to the link " ] - }, { + }, + {"text": "https://mseva.lgpunjab.gov.in/ \n", "bold": true, "fontSize": 8, "color": "blue", "decoration": "underline"}, + { "text":"Now log a complaint from WhatsApp, give a missed call on 8750975975 or send a Hi message on WhatsApp to this number", "bold": true, "fontSize": 8, "color": "blue", "decoration": "underline"} ] } diff --git a/configs/pdf-service/format-config/tradelicense-receipt.json b/configs/pdf-service/format-config/tradelicense-receipt.json index 443d45c2..fe7a2a47 100644 --- a/configs/pdf-service/format-config/tradelicense-receipt.json +++ b/configs/pdf-service/format-config/tradelicense-receipt.json @@ -266,7 +266,7 @@ "style": "receipt-table-value" }, { - "text": "{{tradeDoor || ' '}} {{tradeBuilding || ''}} {{tradeStreet || ''}} {{add}} {{mohalla || ''}}", + "text": "{{tradeDoor || ' '}} {{tradeBuilding || ''}} {{tradeStreet || ''}} {{mohalla}}", "border": [ false, false, From dabec8705cd9f1264593b1b62d97c29a72ba9a35 Mon Sep 17 00:00:00 2001 From: egovmis Date: Mon, 16 Nov 2020 12:36:27 +0530 Subject: [PATCH 0385/1242] chnged mseva link style --- .../data-config/property-receipt.json | 13 ++++++++++--- .../format-config/property-receipt.json | 18 +++++++++--------- 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index ac805df7..174ec9ba 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -684,8 +684,8 @@ "value":"occupancyType" }, { - "variable":"builtup_area", - "value":"constructionDetail.builtUpArea * 9" + "variable":"builtup_areaAA", + "value":"constructionDetail.builtUpArea" }, { "variable":"arv_rent", @@ -694,7 +694,14 @@ { "variable":"additional_details", "value":"additionalDetails" - } + }, { + "derived": [ + { + "variable": "builtup_area", + "formula": "{{builtup_areaAA}}*9" + } + ] + } ] } } diff --git a/configs/pdf-service/format-config/property-receipt.json b/configs/pdf-service/format-config/property-receipt.json index f90f18b9..f5ab51c2 100644 --- a/configs/pdf-service/format-config/property-receipt.json +++ b/configs/pdf-service/format-config/property-receipt.json @@ -910,16 +910,16 @@ "style": "pt-disclaimer-value" }, { - "ol": [ - "Payment received by cheque/demand draft shall be subject to realization", - "This document is not a proof of property ownership and regularization of unauthorised construction", - "{{no_signature}}", - "Assessment and payment is subjected to verification/scruitiny by competetive authority", - "Please deposit the property tx dues for earlier years also, Ignore if already paid", - "Citizen for online payments please refer to the link " - ] + "text": [ + { "text": "1. Payment received by cheque/demand draft shall be subject to realization. \n"}, + { "text": "2. This document is not a proof of Property Ownership and regularization of unauthorized construction. \n"}, + { "text": "3. This is a computer generated document, hence requires no signature.\n"}, + { "text": "4. Assessment & Payment is subject to verification/Scrutiny by competitive authority. \n"}, + { "text": "5. Please deposit property tax dues for earlier years also. Ignore, if already paid. \n"}, + { "text": "6. Citizen for Online Payments please refer to the link "}, + {"text": "https://mseva.lgpunjab.gov.in/", "bold": true, "fontSize": 8, "color": "blue", "decoration": "underline"} + ] }, - {"text": "https://mseva.lgpunjab.gov.in/ \n", "bold": true, "fontSize": 8, "color": "blue", "decoration": "underline"}, { "text":"Now log a complaint from WhatsApp, give a missed call on 8750975975 or send a Hi message on WhatsApp to this number", "bold": true, "fontSize": 8, "color": "blue", "decoration": "underline"} ] From d15e3426ff0fafc8ff42b3bdb8052db871b2c0a4 Mon Sep 17 00:00:00 2001 From: egovmis Date: Mon, 16 Nov 2020 13:10:01 +0530 Subject: [PATCH 0386/1242] generated by field changes --- configs/pdf-service/data-config/tradelicense-receipt.json | 6 ++++++ configs/pdf-service/format-config/tradelicense-receipt.json | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/configs/pdf-service/data-config/tradelicense-receipt.json b/configs/pdf-service/data-config/tradelicense-receipt.json index 573ad193..ce845c3f 100644 --- a/configs/pdf-service/data-config/tradelicense-receipt.json +++ b/configs/pdf-service/data-config/tradelicense-receipt.json @@ -31,6 +31,12 @@ }, "type":"selectFromRequestInfo" }, + { + "variable": "userName", + "value": { + "path": "$.Payments[0].additionalDetails.collectedBy" + } + }, { "variable": "payerContact", "value": { diff --git a/configs/pdf-service/format-config/tradelicense-receipt.json b/configs/pdf-service/format-config/tradelicense-receipt.json index fe7a2a47..41651108 100644 --- a/configs/pdf-service/format-config/tradelicense-receipt.json +++ b/configs/pdf-service/format-config/tradelicense-receipt.json @@ -797,7 +797,7 @@ "bold": true }, { - "text": "{{user-name}}", + "text": "{{userName}}", "bold": false } ], From 1c4359221302998318cda74b1e51ce5b3dcc00f1 Mon Sep 17 00:00:00 2001 From: egovmis Date: Mon, 16 Nov 2020 13:36:01 +0530 Subject: [PATCH 0387/1242] changes for generated by option --- configs/pdf-service/data-config/property-receipt.json | 9 ++++----- configs/pdf-service/format-config/property-receipt.json | 7 +------ .../pdf-service/format-config/tradelicense-receipt.json | 4 ++-- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index 174ec9ba..688505d8 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -694,12 +694,11 @@ { "variable":"additional_details", "value":"additionalDetails" - }, { - "derived": [ - { + }, + { "variable": "builtup_area", - "formula": "{{builtup_areaAA}}*9" - } + "formula": "{{builtup_areaAA}} * 9" + } ] } ] diff --git a/configs/pdf-service/format-config/property-receipt.json b/configs/pdf-service/format-config/property-receipt.json index f5ab51c2..fd9eb8e0 100644 --- a/configs/pdf-service/format-config/property-receipt.json +++ b/configs/pdf-service/format-config/property-receipt.json @@ -911,12 +911,7 @@ }, { "text": [ - { "text": "1. Payment received by cheque/demand draft shall be subject to realization. \n"}, - { "text": "2. This document is not a proof of Property Ownership and regularization of unauthorized construction. \n"}, - { "text": "3. This is a computer generated document, hence requires no signature.\n"}, - { "text": "4. Assessment & Payment is subject to verification/Scrutiny by competitive authority. \n"}, - { "text": "5. Please deposit property tax dues for earlier years also. Ignore, if already paid. \n"}, - { "text": "6. Citizen for Online Payments please refer to the link "}, + { "text": "1. Payment received by cheque/demand draft shall be subject to realization. \n2. This document is not a proof of Property Ownership and regularization of unauthorized construction. \n3. This is a computer generated document, hence requires no signature.\n4. Assessment & Payment is subject to verification/Scrutiny by competitive authority. \n5. Please deposit property tax dues for earlier years also. Ignore, if already paid. \n6. Citizen for Online Payments please refer to the link "}, {"text": "https://mseva.lgpunjab.gov.in/", "bold": true, "fontSize": 8, "color": "blue", "decoration": "underline"} ] }, diff --git a/configs/pdf-service/format-config/tradelicense-receipt.json b/configs/pdf-service/format-config/tradelicense-receipt.json index 41651108..fa7b5aa4 100644 --- a/configs/pdf-service/format-config/tradelicense-receipt.json +++ b/configs/pdf-service/format-config/tradelicense-receipt.json @@ -266,7 +266,7 @@ "style": "receipt-table-value" }, { - "text": "{{tradeDoor || ' '}} {{tradeBuilding || ''}} {{tradeStreet || ''}} {{mohalla}}", + "text": "{{tradeDoor || ' '}} {{tradeBuilding || ''}} {{tradeStreet || ''}} {{mohalla}},{{logo-header}}", "border": [ false, false, @@ -804,7 +804,7 @@ "alignment": "left" }, { - "text": [ + "text": [ { "text": "Authorised Signatory", "bold": true From f0c4ce514f696e3225744e9bcc6157c35591ecb1 Mon Sep 17 00:00:00 2001 From: egovmis Date: Mon, 16 Nov 2020 14:18:44 +0530 Subject: [PATCH 0388/1242] error fix --- configs/pdf-service/data-config/property-receipt.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index 688505d8..cf1dd398 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -699,8 +699,8 @@ "variable": "builtup_area", "formula": "{{builtup_areaAA}} * 9" } - ] - } + + ] } } From ce870ae8bae7b3b9499ecc5753ef82ca93e479a7 Mon Sep 17 00:00:00 2001 From: egovmis Date: Mon, 16 Nov 2020 14:38:19 +0530 Subject: [PATCH 0389/1242] added multiplier --- .../pdf-service/data-config/property-receipt.json | 5 ++++- .../pdf-service/format-config/property-receipt.json | 13 ++++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index cf1dd398..88f11f1d 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -690,6 +690,9 @@ { "variable":"arv_rent", "value":"arv" + },{ + "variable":"multiplier", + "value":"9" }, { "variable":"additional_details", @@ -697,7 +700,7 @@ }, { "variable": "builtup_area", - "formula": "{{builtup_areaAA}} * 9" + "formula": "{{builtup_areaAA}} * {{multiplier}}" } diff --git a/configs/pdf-service/format-config/property-receipt.json b/configs/pdf-service/format-config/property-receipt.json index fd9eb8e0..371b2be1 100644 --- a/configs/pdf-service/format-config/property-receipt.json +++ b/configs/pdf-service/format-config/property-receipt.json @@ -909,11 +909,14 @@ "bold": true, "style": "pt-disclaimer-value" }, - { - "text": [ - { "text": "1. Payment received by cheque/demand draft shall be subject to realization. \n2. This document is not a proof of Property Ownership and regularization of unauthorized construction. \n3. This is a computer generated document, hence requires no signature.\n4. Assessment & Payment is subject to verification/Scrutiny by competitive authority. \n5. Please deposit property tax dues for earlier years also. Ignore, if already paid. \n6. Citizen for Online Payments please refer to the link "}, - {"text": "https://mseva.lgpunjab.gov.in/", "bold": true, "fontSize": 8, "color": "blue", "decoration": "underline"} - ] + { "text": "1. Payment received by cheque/demand draft shall be subject to realization."}, + {"text":"2. This document is not a proof of Property Ownership and regularization of unauthorized construction."}, + {"text":"3. This is a computer generated document, hence requires no signature."}, + {"text":"4. Assessment & Payment is subject to verification/Scrutiny by competitive authority."}, + {"text":"5. Please deposit property tax dues for earlier years also. Ignore, if already paid."}, + {"text":[{"text":"6. Citizen for Online Payments please refer to the link "}, + {"text": "https://mseva.lgpunjab.gov.in/", "bold": true, "fontSize": 8, "color": "blue", "decoration": "underline"} + ] }, { "text":"Now log a complaint from WhatsApp, give a missed call on 8750975975 or send a Hi message on WhatsApp to this number", "bold": true, "fontSize": 8, "color": "blue", "decoration": "underline"} From c32d75adf868ecd68e42338005e10c7b30d62118 Mon Sep 17 00:00:00 2001 From: egovmis Date: Mon, 16 Nov 2020 14:53:59 +0530 Subject: [PATCH 0390/1242] added multiplier for sq yard --- .../data-config/property-receipt.json | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index 88f11f1d..2a956e3f 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -584,7 +584,7 @@ },{ "variable":"propertyUsage", "value":"$.Properties[0].usageCategory", - "localisation": { + "localisation": { "required": true, "prefix": "COMMON_PROPUSGTYPE", "module": "rainmaker-pt" @@ -651,6 +651,7 @@ "format":{ "type":"string", "scema":[ + {"direct":[ { "variable":"floor_no", "value":"floorNo", @@ -678,7 +679,7 @@ "module": "rainmaker-pt", "isSubTypeRequired":true } - }, + }, { "variable":"occupancy_type", "value":"occupancyType" @@ -690,19 +691,19 @@ { "variable":"arv_rent", "value":"arv" - },{ - "variable":"multiplier", - "value":"9" }, { "variable":"additional_details", "value":"additionalDetails" - }, - { - "variable": "builtup_area", - "formula": "{{builtup_areaAA}} * {{multiplier}}" } + ]},{ + "derived":[{ + "variable": "builtup_area", + "formula": "{{builtup_areaAA}} * 9" + } + + ]} ] } From 0ef6b7f25bdcecce9203debb2188e1814900670d Mon Sep 17 00:00:00 2001 From: egovmis Date: Mon, 16 Nov 2020 15:02:54 +0530 Subject: [PATCH 0391/1242] built up area changes --- .../data-config/property-receipt.json | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index 2a956e3f..ea4ce903 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -584,7 +584,7 @@ },{ "variable":"propertyUsage", "value":"$.Properties[0].usageCategory", - "localisation": { + "localisation": { "required": true, "prefix": "COMMON_PROPUSGTYPE", "module": "rainmaker-pt" @@ -651,7 +651,6 @@ "format":{ "type":"string", "scema":[ - {"direct":[ { "variable":"floor_no", "value":"floorNo", @@ -679,7 +678,7 @@ "module": "rainmaker-pt", "isSubTypeRequired":true } - }, + }, { "variable":"occupancy_type", "value":"occupancyType" @@ -691,19 +690,19 @@ { "variable":"arv_rent", "value":"arv" + },{ + "variable":"multiplier", + "value":"9" }, { "variable":"additional_details", "value":"additionalDetails" + }, + { + "variable": "builtup_area", + "formula": "{{builtup_areaAA}} +{{builtup_areaAA}}+{{builtup_areaAA}}+{{builtup_areaAA}}+{{builtup_areaAA}}+{{builtup_areaAA}}+{{builtup_areaAA}}+{{builtup_areaAA}}+{{builtup_areaAA}}" } - ]},{ - "derived":[{ - "variable": "builtup_area", - "formula": "{{builtup_areaAA}} * 9" - } - - ]} ] } From bcb10035d9fe2d9070531bc4376d59fafb16bbca Mon Sep 17 00:00:00 2001 From: egovmis Date: Mon, 16 Nov 2020 15:25:36 +0530 Subject: [PATCH 0392/1242] reverted changes for built up area --- .../pdf-service/data-config/property-receipt.json | 12 ++---------- .../pdf-service/format-config/property-receipt.json | 2 +- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index ea4ce903..1f29ad52 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -684,25 +684,17 @@ "value":"occupancyType" }, { - "variable":"builtup_areaAA", + "variable":"builtup_area", "value":"constructionDetail.builtUpArea" }, { "variable":"arv_rent", "value":"arv" - },{ - "variable":"multiplier", - "value":"9" }, { "variable":"additional_details", "value":"additionalDetails" - }, - { - "variable": "builtup_area", - "formula": "{{builtup_areaAA}} +{{builtup_areaAA}}+{{builtup_areaAA}}+{{builtup_areaAA}}+{{builtup_areaAA}}+{{builtup_areaAA}}+{{builtup_areaAA}}+{{builtup_areaAA}}+{{builtup_areaAA}}" - } - + } ] } diff --git a/configs/pdf-service/format-config/property-receipt.json b/configs/pdf-service/format-config/property-receipt.json index 371b2be1..49385b28 100644 --- a/configs/pdf-service/format-config/property-receipt.json +++ b/configs/pdf-service/format-config/property-receipt.json @@ -851,7 +851,7 @@ "style": "receipt-table-value22" }, { - "text": "Built Area (Sq. Feet) / Total Annual Rent", + "text": "Built Area (Sq. Yard) / Total Annual Rent", "style": "receipt-table-value22" } ], From 9bfcb00872263a04babb25e0e60b25bc6fdd979d Mon Sep 17 00:00:00 2001 From: egovmis Date: Mon, 16 Nov 2020 15:31:29 +0530 Subject: [PATCH 0393/1242] modified generated by field value --- configs/pdf-service/data-config/tradelicense-receipt.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/pdf-service/data-config/tradelicense-receipt.json b/configs/pdf-service/data-config/tradelicense-receipt.json index ce845c3f..0ac26997 100644 --- a/configs/pdf-service/data-config/tradelicense-receipt.json +++ b/configs/pdf-service/data-config/tradelicense-receipt.json @@ -34,7 +34,7 @@ { "variable": "userName", "value": { - "path": "$.Payments[0].additionalDetails.collectedBy" + "path": "$.additionalDetails.collectedBy" } }, { From 8ea208dcae1125af550f97dd3f19f7f6c240e027 Mon Sep 17 00:00:00 2001 From: narendrabandhamneni-wt-egov Date: Mon, 16 Nov 2020 18:07:40 +0530 Subject: [PATCH 0394/1242] reverted change --- configs/egov-persister/property-services-registry.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-persister/property-services-registry.yml b/configs/egov-persister/property-services-registry.yml index 4456bbd3..d52151a8 100644 --- a/configs/egov-persister/property-services-registry.yml +++ b/configs/egov-persister/property-services-registry.yml @@ -344,7 +344,7 @@ serviceMaps: - jsonPath: $.Property.tenantId - - query: INSERT INTO eg_pt_owner (ownerinfouuid, tenantid, propertyid, userid, status, isprimaryowner, ownertype, ownershippercentage, institutionid, relationship, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (ownerinfouuid) DO UPDATE SET status=EXCLUDED.status, isprimaryowner=EXCLUDED.isprimaryowner, ownertype=EXCLUDED.ownertype, ownershippercentage=EXCLUDED.ownershippercentage, institutionid=EXCLUDED.institutionid, relationship=EXCLUDED.relationship, lastmodifiedby=EXCLUDED.lastModifiedby, lastmodifiedtime=EXCLUDED.lastmodifiedtime; + - query: INSERT INTO eg_pt_owner (ownerinfouuid, tenantid, propertyid, userid, status, isprimaryowner, ownertype, ownershippercentage, institutionid, relationship, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (userid, propertyid) DO UPDATE SET status=EXCLUDED.status, isprimaryowner=EXCLUDED.isprimaryowner, ownertype=EXCLUDED.ownertype, ownershippercentage=EXCLUDED.ownershippercentage, institutionid=EXCLUDED.institutionid, relationship=EXCLUDED.relationship, lastmodifiedby=EXCLUDED.lastModifiedby, lastmodifiedtime=EXCLUDED.lastmodifiedtime; basePath: Property.owners.* jsonMaps: From 2aa136680acdf104d62db1eca5302ef2868f72aa Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 17 Nov 2020 10:21:29 +0530 Subject: [PATCH 0395/1242] added paymentMode filter in ptDump --- configs/reports/configs/pt-reports.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 2f8900d4..520cce79 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -3224,6 +3224,13 @@ ReportDefinitions: wrapper: true isMandatory: false searchClause: AND concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) = $financialyear + - name: paymentMode + label: Payment Mode + type: singlevaluelist + pattern: 'list://CARD:Card,CASH:Cash,CHEQUE:Cheque,DD:DD,OFFLINE_NEFT:NEFT,OFFLINE_RTGS:RTGS,ONLINE:Online,POSTAL_ORDER:PostalOrder' + source: pt + isMandatory: false + searchClause: AND payment.paymentmode = $paymentMode - name: localityArray label: reports.pt.zoneList type: boundarylist From 76c19114739c24153a2fd26a126d1cf74d878ece Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 17 Nov 2020 10:59:39 +0530 Subject: [PATCH 0396/1242] Update rainmaker-noc-reports.yml --- .../reports/configs/rainmaker-noc-reports.yml | 40 ++++++++++++++----- 1 file changed, 30 insertions(+), 10 deletions(-) diff --git a/configs/reports/configs/rainmaker-noc-reports.yml b/configs/reports/configs/rainmaker-noc-reports.yml index cc06a4af..11de16a9 100644 --- a/configs/reports/configs/rainmaker-noc-reports.yml +++ b/configs/reports/configs/rainmaker-noc-reports.yml @@ -218,8 +218,9 @@ ReportDefinitions: INNER JOIN egcl_paymentdetail ON (egcl_paymentdetail.billid=bill.id AND egcl_paymentdetail.businessservice='FIRENOC') INNER JOIN egcl_payment on egcl_payment.id=egcl_paymentdetail.paymentid LEFT OUTER JOIN message on code=concat('FIRENOC_BUILDINGTYPE_',UPPER(REGEXP_REPLACE(usagetype,'\..*',''))) - INNER JOIN eg_fn_address as fad on fad.firenocdetailsuuid=fdet.uuid and module='rainmaker-noc' where 1=1 - and egcl_payment.tenantid!='pb.testing' and fad.areatype!='Rural' + INNER JOIN eg_fn_address as fad on fad.firenocdetailsuuid=fdet.uuid and module='rainmaker-noc' + where 1=1 + and egcl_payment.tenantid!='pb.testing' and fad.areatype='Urban' and egcl_payment.paymentstatus!='CANCELLED' groupby: GROUP BY (localisedmessage) orderby: ORDER BY localisedmessage @@ -258,7 +259,7 @@ ReportDefinitions: source: noc wrapper: true isMandatory: false - searchClause: AND fnoc.tenantId IN ($ulb) + searchClause: AND fnoc.tenantid IN ($ulb) query: | select COALESCE(message,state) application_status, @@ -268,7 +269,7 @@ ReportDefinitions: inner join (SELECT DISTINCT ON (businessid) * FROM eg_wf_processinstance_v2 ORDER BY businessid,createdtime desc) pinstance on pinstance.businessid=fdet.applicationnumber inner join eg_wf_state_v2 wfstate on pinstance.status=wfstate.uuid left outer join message on code=concat('WF_FIRENOC_',UPPER(state)) and module='rainmaker-noc' - where 1=1 + where 1=1 and fnoc.tenantid!='pb.testing' groupby: GROUP BY application_status orderby: ORDER BY application_status @@ -313,8 +314,15 @@ ReportDefinitions: source: noc wrapper: true isMandatory: false - searchClause: AND fnoc.tenantId IN ($ulb) - query: select channel, count (*) number_of_applications,round((count (*)::decimal/(select count(*) from eg_fn_firenoc fnoc inner join eg_fn_firenocdetail fdet on fdet.firenocuuid=fnoc.uuid))*100,2) percentage from eg_fn_firenoc fnoc inner join eg_fn_firenocdetail fdet on fdet.firenocuuid=fnoc.uuid + searchClause: AND fnoc.tenantid IN ($ulb) + query: | + select + channel, + count (*) number_of_applications, + round((count (*)::decimal/(select count(*) from eg_fn_firenoc fnoc inner join eg_fn_firenocdetail fdet on fdet.firenocuuid=fnoc.uuid))*100,2) percentage + from eg_fn_firenoc fnoc + inner join eg_fn_firenocdetail fdet on fdet.firenocuuid=fnoc.uuid + where 1=1 and fnoc.tenantid!='pb.testing' groupby: GROUP BY channel orderby: ORDER BY channel @@ -397,8 +405,8 @@ ReportDefinitions: INNER JOIN egcl_paymentdetail ON (egcl_paymentdetail.billid=bill.id AND egcl_paymentdetail.businessservice='FIRENOC') INNER JOIN egcl_payment on egcl_payment.id=egcl_paymentdetail.paymentid LEFT OUTER JOIN message on code=concat('FIRENOC_BUILDINGTYPE_',UPPER(REGEXP_REPLACE(usagetype,'\..*',''))) - INNER JOIN eg_fn_address as fad on fad.firenocdetailsuuid=fdet.uuid and module='rainmaker-noc' where 1=1 - and egcl_payment.tenantid!='pb.testing' and fad.areatype!='Urban' + INNER JOIN eg_fn_address as fad on fad.firenocdetailsuuid=fdet.uuid and module='rainmaker-noc' + where 1=1 and egcl_payment.tenantid!='pb.testing' and fad.areatype='Rural' and egcl_payment.paymentstatus!='CANCELLED' groupby: GROUP BY (localisedmessage),fad.subdistrict orderby: ORDER BY localisedmessage @@ -449,7 +457,18 @@ ReportDefinitions: wrapper: true isMandatory: false searchClause: AND fad.city IN ($district) - query: select fad.subdistrict as subdistrict,(select COALESCE((select message from message where code=concat('FIRENOC_FIRESTATIONS_',UPPER(REGEXP_REPLACE(firestationid,'\..*',''))) limit 1), firestationid)) as firestation,COALESCE(message,state) application_status,count(*) number_of_application from eg_fn_firenoc fnoc inner join eg_fn_firenocdetail fdet on fdet.firenocuuid=fnoc.uuid inner join (SELECT DISTINCT ON (businessid) * FROM eg_wf_processinstance_v2 ORDER BY businessid,createdtime desc) pinstance on pinstance.businessid=fdet.applicationnumber inner join eg_wf_state_v2 wfstate on pinstance.status=wfstate.uuid left outer join message on code=concat('WF_FIRENOC_',UPPER(state)) and module='rainmaker-noc' inner join eg_fn_address as fad on fad.firenocdetailsuuid=fdet.uuid where 1=1 AND fad.subdistrict NOT LIKE 'pb.%' + query: | + select + fad.subdistrict as subdistrict, + (select COALESCE((select message from message where code=concat('FIRENOC_FIRESTATIONS_',UPPER(REGEXP_REPLACE(firestationid,'\..*',''))) limit 1), firestationid)) as firestation, + COALESCE(message,state) application_status, + count(*) number_of_application + from eg_fn_firenoc fnoc + inner join eg_fn_firenocdetail fdet on fdet.firenocuuid=fnoc.uuid + inner join (SELECT DISTINCT ON (businessid) * FROM eg_wf_processinstance_v2 ORDER BY businessid,createdtime desc) pinstance on pinstance.businessid=fdet.applicationnumber + inner join eg_wf_state_v2 wfstate on pinstance.status=wfstate.uuid left outer join message on code=concat('WF_FIRENOC_',UPPER(state)) and module='rainmaker-noc' + inner join eg_fn_address as fad on fad.firenocdetailsuuid=fdet.uuid + where 1=1 AND fad.subdistrict NOT LIKE 'pb.%' groupby: GROUP BY (application_status,subdistrict,firestation) orderby: ORDER BY application_status @@ -513,7 +532,8 @@ ReportDefinitions: round((count (*)::decimal/(select count(*) from eg_fn_firenoc fnoc inner join eg_fn_firenocdetail fdet on fdet.firenocuuid=fnoc.uuid))*100,2) percentage from eg_fn_firenoc fnoc inner join eg_fn_firenocdetail fdet on fdet.firenocuuid=fnoc.uuid - inner join eg_fn_address as fad on fad.firenocdetailsuuid=fdet.uuid Where 1=1 AND fad.subdistrict NOT LIKE 'pb.%' + inner join eg_fn_address as fad on fad.firenocdetailsuuid=fdet.uuid + Where 1=1 AND fad.subdistrict NOT LIKE 'pb.%' groupby: GROUP BY (channel,subdistrict,firestation) orderby: ORDER BY channel From 8ba3023189cccd70b1e9fb403c55399193d96343 Mon Sep 17 00:00:00 2001 From: egovmis Date: Tue, 17 Nov 2020 11:42:28 +0530 Subject: [PATCH 0397/1242] added owners on tlcertificate --- .../data-config/tlcertificate.json | 33 ++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/configs/pdf-service/data-config/tlcertificate.json b/configs/pdf-service/data-config/tlcertificate.json index dcb10891..a42e2e39 100644 --- a/configs/pdf-service/data-config/tlcertificate.json +++ b/configs/pdf-service/data-config/tlcertificate.json @@ -208,7 +208,38 @@ ] } - }, + }, { + "variable": "variable_owners", + "value": "$.Licenses[0].tradeLicenseDetail.owners[?(@.active== true && @.userActive== true)]", + "type":"array", + "format":{ + "type":"string", + "scema":[ + { + "variable": "name", + "value": "name", + "type":"string" + }, + { + "variable": "fatherOrHusbandName", + "value": "fatherOrHusbandName", + "type":"string" + }, + + { + "variable": "permanentAddress", + "value": "permanentAddress", + "type":"string" + }, + { + "variable": "mobileNumber", + "value": "mobileNumber", + "type":"string" + } + + ] + } + }, { From 037333a7de81b2615dd95a7012d3870f6fd13cc2 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 17 Nov 2020 11:44:48 +0530 Subject: [PATCH 0398/1242] FYCollectionReport Update --- configs/reports/configs/pt-reports.yml | 27 +++++++++++++------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 520cce79..ddca7008 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -3874,27 +3874,26 @@ ReportDefinitions: query: | -- Use CTE to force query plan, compute & use CTE later SELECT - concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY')) AS "financialyear", - sum(case when pt.usagecategory='RESIDENTIAL' then pd.amountpaid else 0 end) as "residential", - sum(case when pt.usagecategory='RESIDENTIAL' then 1 else 0 end) as "countresidential", - sum(case when pt.usagecategory like 'NONRESIDENTIAL%' then pd.amountpaid else 0 end) as "nonresidential", + concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY')) AS "financialyear", + sum(case when split_part(pt.usagecategory, '.', 1)='RESIDENTIAL' then payment.totalamountpaid else 0 end) as "residential", + sum(case when split_part(pt.usagecategory, '.', 1)='RESIDENTIAL' then 1 else 0 end) as "countresidential", + sum(case when split_part(pt.usagecategory, '.', 1) = 'NONRESIDENTIAL' then payment.totalamountpaid else 0 end) as "nonresidential", sum(case when pt.usagecategory like 'NONRESIDENTIAL%' then 1 else 0 end) as "countnonresidential", - sum(case when pt.usagecategory='MIXED' then pd.amountpaid else 0 end) as "mixed", + sum(case when pt.usagecategory='MIXED' then payment.totalamountpaid else 0 end) as "mixed", sum(case when pt.usagecategory='MIXED' then 1 else 0 end) as "countmixed", - sum(pd.amountpaid) as totalamount, - count(pd.amountpaid) as totalcount, - sum(case when payment.paymentmode='ONLINE' then pd.amountpaid else 0 end) as "online", - sum(case when payment.paymentmode='CASH' then pd.amountpaid else 0 end) as "cash", - sum(case when payment.paymentmode='CHEQUE' then pd.amountpaid else 0 end) as "cheque", - sum(case when payment.paymentmode='DD' then pd.amountpaid else 0 end) as "dd" + sum(payment.totalamountpaid) as totalamount, + count(payment.totalamountpaid) as totalcount, + sum(case when payment.paymentmode='ONLINE' then payment.totalamountpaid else 0 end) as "online", + sum(case when payment.paymentmode='CASH' then payment.totalamountpaid else 0 end) as "cash", + sum(case when payment.paymentmode='CHEQUE' then payment.totalamountpaid else 0 end) as "cheque", + sum(case when payment.paymentmode='DD' then payment.totalamountpaid else 0 end) as "dd" FROM egcl_paymentdetail AS pd join egcl_payment as payment on payment.id = pd.paymentid join egcl_bill as bill on bill.id = pd.billid join egcl_billdetial as billd on billd.billid = bill.id - JOIN eg_pt_property pt ON pt.propertyid = bill.consumercode - JOIN eg_pt_address pt_addr ON pt.id = pt_addr.propertyid + JOIN eg_pt_property pt ON pt.propertyid = bill.consumercode LEFT OUTER JOIN eg_user ON eg_user.id = pd.createdby::INTEGER - WHERE pd.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and pt.status!='INACTIVE' + WHERE pd.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and pt.status!='INACTIVE' groupby: GROUP BY financialyear orderby: ORDER BY financialyear From 434937e760965e1e3b36d28037df236097775b84 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 17 Nov 2020 16:02:36 +0530 Subject: [PATCH 0399/1242] shown first name for multiple owner Decryption service not able to decrypt mulltiple encrypted values seperated by comma, therefore only first name and mobile number is being shown --- configs/reports/configs/tl-reports.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/configs/reports/configs/tl-reports.yml b/configs/reports/configs/tl-reports.yml index fddff2b0..dd742e73 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -1344,8 +1344,8 @@ ReportDefinitions: egcl_paymentdetail.receiptnumber, tradeTypeName, acc, - tlown.name, - tlown.mobilenumber, + split_part(tlown.name,',',1) as name, -- showing first name as decryption service not able to decrypt multiple comma seperated encrypted names + split_part(tlown.mobilenumber,',',1) as mobilenumber, -- similary showing first mobilenumber only payment.ifsccode as bankid, -- ih.bankid, payment.ifsccode as branchname, --ih.branchname, payment.transactionnumber as transactionnumber, -- ih.transactionnumber as transactionnumber, @@ -1494,8 +1494,8 @@ ReportDefinitions: to_char((To_timestamp(paydetail.receiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as receiptIssueDate , paydetail.receiptnumber, tradeTypeName, - acc, - name, + acc, + split_part(name,',',1) as name, -- showing first name as decryption service not able to decrypt multiple encrypted values seperate by comma payment.mobilenumber, payment.ifsccode as bankid, -- ih.bankid, payment.ifsccode as branchname, --ih.branchname, @@ -1638,7 +1638,7 @@ ReportDefinitions: paydetail.receiptnumber, tradeTypeName, acc, - name, + split_part(name,',',1) as name, -- showing first name as decryption service not able to decrypt multiple encrypted values seperate by comma payment.mobilenumber, payment.ifsccode as bankid, -- ih.bankid, payment.ifsccode as branchname, --ih.branchname, @@ -2192,8 +2192,8 @@ ReportDefinitions: tl.licensenumber, tl.tradeName, (split_part(tl.tenantId, '.', 2)) as tenantId, - ownername, - mobilenumber, + split_part(ownername,',',1) as ownername, + split_part(mobilenumber,',',1) as mobilenumber, tla.locality, to_char((To_timestamp(applicationdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as applicationDate, tl.status @@ -2403,8 +2403,8 @@ ReportDefinitions: oldlicensenumber, financialyear, tradename, - name as ownername, - mobilenumber + split_part(name,',',1) as ownername, + split_part(mobilenumber,',',1) as mobilenumber from eg_tl_tradelicense tl INNER JOIN eg_tl_tradelicensedetail tld ON tld.tradelicenseid = tl.id INNER JOIN ( @@ -2472,8 +2472,8 @@ ReportDefinitions: oldlicensenumber, financialyear, tradename, - name as ownername, - mobilenumber + split_part(name,',',1) as ownername, + split_part(mobilenumber,',',1) as mobilenumber from eg_tl_tradelicense tl INNER JOIN eg_tl_tradelicensedetail tld ON tld.tradelicenseid = tl.id INNER JOIN ( From de264cdcea21d2b3a298dc917825b709459199f2 Mon Sep 17 00:00:00 2001 From: egovmis Date: Tue, 17 Nov 2020 16:20:25 +0530 Subject: [PATCH 0400/1242] tl certificate owner changes --- configs/pdf-service/data-config/tlcertificate.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/pdf-service/data-config/tlcertificate.json b/configs/pdf-service/data-config/tlcertificate.json index a42e2e39..7fb8bc72 100644 --- a/configs/pdf-service/data-config/tlcertificate.json +++ b/configs/pdf-service/data-config/tlcertificate.json @@ -210,7 +210,7 @@ }, { "variable": "variable_owners", - "value": "$.Licenses[0].tradeLicenseDetail.owners[?(@.active== true && @.userActive== true)]", + "value": "$.tradeLicenseDetail.owners[?(@.active== true && @.userActive== true)]", "type":"array", "format":{ "type":"string", @@ -640,7 +640,7 @@ { "externalAPI": [ { - "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "path": "http://localhost:8079/egov-mdms-service/v1/_get", "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", "apiRequest": null, "responseMapping":[ From 3f96c506ae49277d7c071765f3ff35df4a2f9ea2 Mon Sep 17 00:00:00 2001 From: egovmis Date: Tue, 17 Nov 2020 16:21:03 +0530 Subject: [PATCH 0401/1242] tl renewal certificate owner changes --- configs/pdf-service/data-config/tlrenewalcertificate.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/pdf-service/data-config/tlrenewalcertificate.json b/configs/pdf-service/data-config/tlrenewalcertificate.json index cc548ca5..6c7bc610 100644 --- a/configs/pdf-service/data-config/tlrenewalcertificate.json +++ b/configs/pdf-service/data-config/tlrenewalcertificate.json @@ -211,7 +211,7 @@ }, { "variable": "variable_owners", - "value": "$.Licenses[0].tradeLicenseDetail.owners[?(@.active== true && @.userActive== true)]", + "value": "$.tradeLicenseDetail.owners[?(@.active== true && @.userActive== true)]", "type":"array", "format":{ "type":"string", From cbc230a0a4c7c00b53125e36f1b35878e13a4ab6 Mon Sep 17 00:00:00 2001 From: egovmis Date: Tue, 17 Nov 2020 16:34:56 +0530 Subject: [PATCH 0402/1242] owner on tl certificate --- configs/pdf-service/data-config/tlcertificate.json | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/configs/pdf-service/data-config/tlcertificate.json b/configs/pdf-service/data-config/tlcertificate.json index 7fb8bc72..0511763f 100644 --- a/configs/pdf-service/data-config/tlcertificate.json +++ b/configs/pdf-service/data-config/tlcertificate.json @@ -208,7 +208,8 @@ ] } - }, { + }, + { "variable": "variable_owners", "value": "$.tradeLicenseDetail.owners[?(@.active== true && @.userActive== true)]", "type":"array", @@ -217,23 +218,23 @@ "scema":[ { "variable": "name", - "value": "name", + "value": {"path":"name"}, "type":"string" }, { "variable": "fatherOrHusbandName", - "value": "fatherOrHusbandName", + "value": {"path": "fatherOrHusbandName"}, "type":"string" }, { "variable": "permanentAddress", - "value": "permanentAddress", + "value": {"path": "permanentAddress"}, "type":"string" }, { "variable": "mobileNumber", - "value": "mobileNumber", + "value": {"path":"mobileNumber"}, "type":"string" } From d0c41d42f10fd2a36566283ac7c75e46124917dd Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Tue, 17 Nov 2020 16:42:48 +0530 Subject: [PATCH 0403/1242] Update tlcertificate.json --- configs/pdf-service/data-config/tlcertificate.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/pdf-service/data-config/tlcertificate.json b/configs/pdf-service/data-config/tlcertificate.json index 0511763f..c8efcee3 100644 --- a/configs/pdf-service/data-config/tlcertificate.json +++ b/configs/pdf-service/data-config/tlcertificate.json @@ -211,7 +211,7 @@ }, { "variable": "variable_owners", - "value": "$.tradeLicenseDetail.owners[?(@.active== true && @.userActive== true)]", + "value": {"path":"$.tradeLicenseDetail.owners[?(@.active== true && @.userActive== true)]"}, "type":"array", "format":{ "type":"string", From 83a510f6188fdd79af0ac674c16ec4136962da33 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Tue, 17 Nov 2020 16:45:48 +0530 Subject: [PATCH 0404/1242] Update tlcertificate.json --- configs/pdf-service/data-config/tlcertificate.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/pdf-service/data-config/tlcertificate.json b/configs/pdf-service/data-config/tlcertificate.json index c8efcee3..02432739 100644 --- a/configs/pdf-service/data-config/tlcertificate.json +++ b/configs/pdf-service/data-config/tlcertificate.json @@ -641,7 +641,7 @@ { "externalAPI": [ { - "path": "http://localhost:8079/egov-mdms-service/v1/_get", + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", "apiRequest": null, "responseMapping":[ From dfd6d478f078fd331bf30723a4deb4a87d6387a3 Mon Sep 17 00:00:00 2001 From: egovmis Date: Tue, 17 Nov 2020 16:53:43 +0530 Subject: [PATCH 0405/1242] adjusted width of tl certificate owner table --- configs/pdf-service/data-config/tlcertificate.json | 8 ++++---- configs/pdf-service/format-config/tlcertificate.json | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/configs/pdf-service/data-config/tlcertificate.json b/configs/pdf-service/data-config/tlcertificate.json index 02432739..f53de215 100644 --- a/configs/pdf-service/data-config/tlcertificate.json +++ b/configs/pdf-service/data-config/tlcertificate.json @@ -218,23 +218,23 @@ "scema":[ { "variable": "name", - "value": {"path":"name"}, + "value": "name", "type":"string" }, { "variable": "fatherOrHusbandName", - "value": {"path": "fatherOrHusbandName"}, + "value": "fatherOrHusbandName", "type":"string" }, { "variable": "permanentAddress", - "value": {"path": "permanentAddress"}, + "value": "permanentAddress", "type":"string" }, { "variable": "mobileNumber", - "value": {"path":"mobileNumber"}, + "value": "mobileNumber", "type":"string" } diff --git a/configs/pdf-service/format-config/tlcertificate.json b/configs/pdf-service/format-config/tlcertificate.json index 50dffcf0..56415c88 100644 --- a/configs/pdf-service/format-config/tlcertificate.json +++ b/configs/pdf-service/format-config/tlcertificate.json @@ -445,7 +445,7 @@ "style": "next-noc-table", "table": { "widths": [ - "55%", + "50%", "*", "15%" ], @@ -454,7 +454,7 @@ [ { "text": "Owner Name", - "style": "receipt-table-value" + "style": "receipt-table-value2" }, { "text": "Father/Husband Name", @@ -465,7 +465,7 @@ "style": "receipt-table-value" } ], - "{{#variable_owners}}[{ \"text\":\"{{name}}\", \"border\":[ true, false, true, true ], \"style\": \"receipt-table\" }, { \"text\":\"{{fatherOrHusbandName}}\", \"border\":[ false, false, true, true ], \"style\": \"receipt-table\" }, { \"text\":\"{{mobileNumber}}\", \"border\":[ false, false, true, true ], \"style\": \"receipt-table\" }]{{/variable_owners}}" + "{{#variable_owners}}[{ \"text\":\"{{name}}\", \"border\":[ true, false, true, true ], \"style\": \"receipt-table3\" }, { \"text\":\"{{fatherOrHusbandName}}\", \"border\":[ false, false, true, true ], \"style\": \"receipt-table3\" }, { \"text\":\"{{mobileNumber}}\", \"border\":[ false, false, true, true ], \"style\": \"receipt-table3\" }]{{/variable_owners}}" ] }, "layout": {} From 76ff2b85670d80b17e18ad5c8d5e57bfc970ae79 Mon Sep 17 00:00:00 2001 From: egovmis Date: Tue, 17 Nov 2020 17:04:33 +0530 Subject: [PATCH 0406/1242] tl certificate table adjustment --- configs/pdf-service/format-config/tlcertificate.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/pdf-service/format-config/tlcertificate.json b/configs/pdf-service/format-config/tlcertificate.json index 56415c88..01b81c68 100644 --- a/configs/pdf-service/format-config/tlcertificate.json +++ b/configs/pdf-service/format-config/tlcertificate.json @@ -465,7 +465,7 @@ "style": "receipt-table-value" } ], - "{{#variable_owners}}[{ \"text\":\"{{name}}\", \"border\":[ true, false, true, true ], \"style\": \"receipt-table3\" }, { \"text\":\"{{fatherOrHusbandName}}\", \"border\":[ false, false, true, true ], \"style\": \"receipt-table3\" }, { \"text\":\"{{mobileNumber}}\", \"border\":[ false, false, true, true ], \"style\": \"receipt-table3\" }]{{/variable_owners}}" + "{{#variable_owners}}[{ \"text\":\"{{name}}\", \"border\":[ true, false, true, true ], \"style\": \"receipt-table3\" }, { \"text\":\"{{fatherOrHusbandName}}\", \"border\":[ false, false, true, true ], \"style\": \"receipt-table2\" }, { \"text\":\"{{mobileNumber}}\", \"border\":[ false, false, true, true ], \"style\": \"receipt-table2\" }]{{/variable_owners}}" ] }, "layout": {} From 3ea3e4833cdde8ee54edcaa7fb064465421c4c6d Mon Sep 17 00:00:00 2001 From: ramakrishnaippili Date: Tue, 17 Nov 2020 21:31:31 +0530 Subject: [PATCH 0407/1242] [PI-993] adding migration indexing config --- .../payment-indexer-migration.yml | 54 +++++++ .../property-services-migration.yml | 140 ++++++++++++++++++ 2 files changed, 194 insertions(+) create mode 100644 configs/egov-indexer/payment-indexer-migration.yml create mode 100644 configs/egov-indexer/property-services-migration.yml diff --git a/configs/egov-indexer/payment-indexer-migration.yml b/configs/egov-indexer/payment-indexer-migration.yml new file mode 100644 index 00000000..8bd4f5c1 --- /dev/null +++ b/configs/egov-indexer/payment-indexer-migration.yml @@ -0,0 +1,54 @@ +ServiceMaps: + serviceName: Collection Services + version: 1.0.0 + mappings: + - topic: egov-collection-migration-batch + configKey: INDEX + indexes: + - name: paymentsindex-v1 + type: payments + id: $.id + isBulk: false + timeStampField: $.auditDetails.createdTime + jsonPath: $.Payment + customJsonMapping: + indexMapping: {"Data":{"tenantId":"","id":"","transactionNumber":"","transactionDate":1,"paymentMode":"","paymentStatus":"","payer":{"id":"","name":""},"paidBy":"","paymentDetails":{},"auditDetails":{},"additionalDetails":{},"tenantData":{},"@timestamp":"timestamp"}} + fieldMapping: + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.transactionNumber + outJsonPath: $.Data.transactionNumber + - inJsonPath: $.transactionDate + outJsonPath: $.Data.transactionDate + - inJsonPath: $.paymentMode + outJsonPath: $.Data.paymentMode + - inJsonPath: $.paymentStatus + outJsonPath: $.Data.paymentStatus + - inJsonPath: $.payerId + outJsonPath: $.Data.payer.id + - inJsonPath: $.payerName + outJsonPath: $.Data.payer.name + - inJsonPath: $.paidBy + outJsonPath: $.Data.paidBy + - inJsonPath: $.paymentDetails + outJsonPath: $.Data.paymentDetails + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - inJsonPath: $.additionalDetails + outJsonPath: $.Data.additionalDetails + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + mdmsMapping: + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData diff --git a/configs/egov-indexer/property-services-migration.yml b/configs/egov-indexer/property-services-migration.yml new file mode 100644 index 00000000..8c4a195e --- /dev/null +++ b/configs/egov-indexer/property-services-migration.yml @@ -0,0 +1,140 @@ +ServiceMaps: + serviceName: Property Tax - rainmaker + version: 1.0.0 + mappings: + - topic: save-property-registry-batch + configKey: INDEX + indexes: + - name: property-services + type: general + id: $.propertyId,$.tenantId,$.auditDetails.lastModifiedTime + jsonPath: $.Property + timeStampField: $.auditDetails.lastModifiedTime + customJsonMapping: + indexMapping: {"Data":{"workflow":{"state":{},"action":"","assignes":[]},"owners":[],"acknowldgementNumber":"","propertyType":"","ownershipCategory":"","creationReason":"","usageCategory":"","noOfFloors":"","landArea":"","superBuiltUpArea":"","source":"","channel":"","units":{},"auditDetails":{},"id":"","propertyId":"","surveyId":"","linkedProperties":{},"tenantId":"","accountId":"","oldPropertyId":"","status":"","@timestamp":"timestamp"}} + fieldMapping: + - inJsonPath: $.owners.*.uuid + outJsonPath: $.Data.owners + - inJsonPath: $.workflow.state + outJsonPath: $.Data.workflow.state + - inJsonPath: $.workflow.action + outJsonPath: $.Data.workflow.action + - inJsonPath: $.workflow.assignes.*.uuid + outJsonPath: $.Data.workflow.assignes + - inJsonPath: $.acknowldgementNumber + outJsonPath: $.Data.acknowldgementNumber + - inJsonPath: $.propertyType + outJsonPath: $.Data.propertyType + - inJsonPath: $.ownershipCategory + outJsonPath: $.Data.ownershipCategory + - inJsonPath: $.creationReason + outJsonPath: $.Data.creationReason + - inJsonPath: $.usageCategory + outJsonPath: $.Data.usageCategory + - inJsonPath: $.noOfFloors + outJsonPath: $.Data.noOfFloors + - inJsonPath: $.landArea + outJsonPath: $.Data.landArea + - inJsonPath: $.superBuiltUpArea + outJsonPath: $.Data.superBuiltUpArea + - inJsonPath: $.source + outJsonPath: $.Data.source + - inJsonPath: $.channel + outJsonPath: $.Data.channel + - inJsonPath: $.units + outJsonPath: $.Data.units + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.propertyId + outJsonPath: $.Data.propertyId + - inJsonPath: $.surveyId + outJsonPath: $.Data.surveyId + - inJsonPath: $.linkedProperties + outJsonPath: $.Data.linkedProperties + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.accountId + outJsonPath: $.Data.accountId + - inJsonPath: $.oldPropertyId + outJsonPath: $.Data.oldPropertyId + - inJsonPath: $.status + outJsonPath: $.Data.status + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + externalUriMapping: + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + mdmsMapping: + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: PropertyTax + masterName: UsageCategory + tenantId: pb + filter: "[?(@.code == $usageCategory)]" + filterMapping: + - variable: $usageCategory + valueJsonpath: $.usageCategory + uriResponseMapping: + - inJsonPath: $.MdmsRes.PropertyTax.UsageCategory[0].name + outJsonPath: $.Data.usageCategory + + - topic: save-pt-assessment-batch + configKey: INDEX + indexes: + - name: property-assessments + type: general + id: $.assessmentNumber, $.tenantId + jsonPath: $.Assessment + timeStampField: $.auditDetails.createdTime + customJsonMapping: + indexMapping: {"Data":{"workflow":{"state":{},"action":"","assignes":[]},"id":"","tenantId":"","additionalDetails":"","assessmentNumber":"","financialYear":"","propertyId":"","assessmentDate":"","status":"","source":"","unitUsageList":{},"channel":"","auditDetails":{},"@timestamp":"timestamp"}} + fieldMapping: + - inJsonPath: $.workflow.state + outJsonPath: $.Data.workflow.state + - inJsonPath: $.workflow.action + outJsonPath: $.Data.workflow.action + - inJsonPath: $.workflow.assignes.*.uuid + outJsonPath: $.Data.workflow.assignes + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.assessmentNumber + outJsonPath: $.Data.assessmentNumber + - inJsonPath: $.financialYear + outJsonPath: $.Data.financialYear + - inJsonPath: $.propertyId + outJsonPath: $.Data.propertyId + - inJsonPath: $.assessmentDate + outJsonPath: $.Data.assessmentDate + - inJsonPath: $.status + outJsonPath: $.Data.status + - inJsonPath: $.source + outJsonPath: $.Data.source + - inJsonPath: $.unitUsageList + outJsonPath: $.Data.unitUsageList + - inJsonPath: $.channel + outJsonPath: $.Data.channel + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - inJsonPath: $.additionalDetails + outJsonPath: $.Data.additionalDetails + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp From a6e3ac90d5877e6fec4f598b1e3ce74cf39241b1 Mon Sep 17 00:00:00 2001 From: ramakrishnaippili Date: Wed, 18 Nov 2020 07:11:41 +0530 Subject: [PATCH 0408/1242] [PI-993] format correction --- .../collection-migration-count.yml | 23 +++++++++++++++++++ .../collection-migration-persister.yml | 4 ++-- 2 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 configs/egov-persister/collection-migration-count.yml diff --git a/configs/egov-persister/collection-migration-count.yml b/configs/egov-persister/collection-migration-count.yml new file mode 100644 index 00000000..ce6c394c --- /dev/null +++ b/configs/egov-persister/collection-migration-count.yml @@ -0,0 +1,23 @@ +serviceMaps: + serviceName: collection-services-migration-count + mappings: + - version: 1.0 + description: Persists property details in egcl_payment_migration table + fromTopic: collection-migartion-batch-count + isTransaction: true + queryMaps: + + + - query: INSERT INTO egcl_payment_migration (id,batch,batchsize,createdtime,tenantid,recordCount) VALUES (?,?,?,(SELECT extract(epoch from CURRENT_TIMESTAMP)*1000),?,?); + basePath: MigrationCount + jsonMaps: + + - jsonPath: $.MigrationCount.id + + - jsonPath: $.MigrationCount.offset + + - jsonPath: $.MigrationCount.limit + + - jsonPath: $.MigrationCount.tenantid + + - jsonPath: $.MigrationCount.recordCount \ No newline at end of file diff --git a/configs/egov-persister/collection-migration-persister.yml b/configs/egov-persister/collection-migration-persister.yml index f9a20d5b..c1106a59 100644 --- a/configs/egov-persister/collection-migration-persister.yml +++ b/configs/egov-persister/collection-migration-persister.yml @@ -165,7 +165,7 @@ serviceMaps: type: LONG - - query: INSERT into egcl_billdetial (id, tenantid, demandid, billid, amount, amountpaid, fromperiod, toperiod, additionaldetails, channel, voucherheader, boundary, collectiontype, billdescription, expirydate, displaymessage, callbackforapportioning, cancellationremarks) values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) + - query: INSERT into egcl_billdetail (id, tenantid, demandid, billid, amount, amountpaid, fromperiod, toperiod, additionaldetails, channel, voucherheader, boundary, collectiontype, billdescription, expirydate, displaymessage, callbackforapportioning, cancellationremarks) values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) basePath: $.Payments.*.paymentDetails.*.bill.billDetails.* jsonMaps: - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.id @@ -237,4 +237,4 @@ serviceMaps: - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.billAccountDetails.*.additionalDetails type: JSON - dbType: JSONB + dbType: JSONB \ No newline at end of file From be14a2f61c66eb3202fa4279cf6ab1f9aa107b5d Mon Sep 17 00:00:00 2001 From: egovmis Date: Thu, 19 Nov 2020 10:22:11 +0530 Subject: [PATCH 0409/1242] PI-8588 comments/address changes for old UC receipts --- .../pdf-service/data-config/consolidatedreceipt.json | 12 ++++++++++++ .../format-config/consolidatedreceipt.json | 8 ++++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/configs/pdf-service/data-config/consolidatedreceipt.json b/configs/pdf-service/data-config/consolidatedreceipt.json index 0f32eede..c66ae993 100644 --- a/configs/pdf-service/data-config/consolidatedreceipt.json +++ b/configs/pdf-service/data-config/consolidatedreceipt.json @@ -95,6 +95,18 @@ "path": "$.paymentDetails[0].bill.billDetails[0].additionalDetails.address" } }, + { + "variable": "oldPayerAddress", + "value": { + "path": "$.payerAddress" + } + }, + { + "variable": "oldComments", + "value": { + "path": "$.additionalDetails.address" + } + }, { "variable": "comments", "value": { diff --git a/configs/pdf-service/format-config/consolidatedreceipt.json b/configs/pdf-service/format-config/consolidatedreceipt.json index ee430f8e..d963d2a4 100644 --- a/configs/pdf-service/format-config/consolidatedreceipt.json +++ b/configs/pdf-service/format-config/consolidatedreceipt.json @@ -214,7 +214,7 @@ "style": "receipt-table-value" }, { - "text": "{{payerAddress}}", + "text": "{{payerAddress}} || {{oldPayerAddress}}", "border": [ false, false, @@ -491,7 +491,7 @@ "border":[false, false, false, false] }, { - "text":"{{comments}}", + "text":"{{comments}} || {{oldComments}}", "border":[false, false, false, false] } ] @@ -772,7 +772,7 @@ "style": "receipt-table-value" }, { - "text": "{{payerAddress}}", + "text": "{{payerAddress}} || {{oldPayerAddress}}", "border": [ false, false, @@ -1050,7 +1050,7 @@ "border":[false, false, false, false] }, { - "text":"{{comments}}", + "text":"{{comments}} || {{oldComments}}", "border":[false, false, false, false] } ] From a8cf4e0d9a1feab64bc771acf7dd0b1fc1f62934 Mon Sep 17 00:00:00 2001 From: egovmis Date: Thu, 19 Nov 2020 10:43:31 +0530 Subject: [PATCH 0410/1242] PI-8588 comments/address changes for old UC receipts --- .../pdf-service/format-config/consolidatedreceipt.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/pdf-service/format-config/consolidatedreceipt.json b/configs/pdf-service/format-config/consolidatedreceipt.json index d963d2a4..152b9a6b 100644 --- a/configs/pdf-service/format-config/consolidatedreceipt.json +++ b/configs/pdf-service/format-config/consolidatedreceipt.json @@ -214,7 +214,7 @@ "style": "receipt-table-value" }, { - "text": "{{payerAddress}} || {{oldPayerAddress}}", + "text": "{{payerAddress || oldPayerAddress}}", "border": [ false, false, @@ -491,7 +491,7 @@ "border":[false, false, false, false] }, { - "text":"{{comments}} || {{oldComments}}", + "text":"{{comments || oldComments}}", "border":[false, false, false, false] } ] @@ -772,7 +772,7 @@ "style": "receipt-table-value" }, { - "text": "{{payerAddress}} || {{oldPayerAddress}}", + "text": "{{payerAddress || oldPayerAddress}}", "border": [ false, false, @@ -1050,7 +1050,7 @@ "border":[false, false, false, false] }, { - "text":"{{comments}} || {{oldComments}}", + "text":"{{comments || oldComments}}", "border":[false, false, false, false] } ] From 465b4ac1e120409c47c4ad3c0c6ce1d6e8c92cf3 Mon Sep 17 00:00:00 2001 From: egovmis Date: Thu, 19 Nov 2020 10:58:35 +0530 Subject: [PATCH 0411/1242] PI-8588 comments/address changes for old UC receipts --- configs/pdf-service/data-config/consolidatedreceipt.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/pdf-service/data-config/consolidatedreceipt.json b/configs/pdf-service/data-config/consolidatedreceipt.json index c66ae993..5f1f9147 100644 --- a/configs/pdf-service/data-config/consolidatedreceipt.json +++ b/configs/pdf-service/data-config/consolidatedreceipt.json @@ -104,7 +104,7 @@ { "variable": "oldComments", "value": { - "path": "$.additionalDetails.address" + "path": "$.additionalDetails.comments" } }, { From b6c8243fcc130d9f29f4ea02c117beb4f78c5a06 Mon Sep 17 00:00:00 2001 From: egovmis Date: Thu, 19 Nov 2020 11:06:58 +0530 Subject: [PATCH 0412/1242] PI-8588 comments/address changes for old UC receipts --- configs/pdf-service/data-config/consolidatedreceipt.json | 4 ++-- .../pdf-service/format-config/consolidatedreceipt.json | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/configs/pdf-service/data-config/consolidatedreceipt.json b/configs/pdf-service/data-config/consolidatedreceipt.json index 5f1f9147..09e357de 100644 --- a/configs/pdf-service/data-config/consolidatedreceipt.json +++ b/configs/pdf-service/data-config/consolidatedreceipt.json @@ -92,7 +92,7 @@ { "variable": "payerAddress", "value": { - "path": "$.paymentDetails[0].bill.billDetails[0].additionalDetails.address" + "path": "$.paymentDetails[0].bill.billDetails[0].additionalDetails.address || $.payerAddress" } }, { @@ -110,7 +110,7 @@ { "variable": "comments", "value": { - "path": "$.paymentDetails[0].bill.billDetails[0].additionalDetails.comment" + "path": "$.paymentDetails[0].bill.billDetails[0].additionalDetails.comment || $.additionalDetails.comments" } }, { diff --git a/configs/pdf-service/format-config/consolidatedreceipt.json b/configs/pdf-service/format-config/consolidatedreceipt.json index 152b9a6b..ee430f8e 100644 --- a/configs/pdf-service/format-config/consolidatedreceipt.json +++ b/configs/pdf-service/format-config/consolidatedreceipt.json @@ -214,7 +214,7 @@ "style": "receipt-table-value" }, { - "text": "{{payerAddress || oldPayerAddress}}", + "text": "{{payerAddress}}", "border": [ false, false, @@ -491,7 +491,7 @@ "border":[false, false, false, false] }, { - "text":"{{comments || oldComments}}", + "text":"{{comments}}", "border":[false, false, false, false] } ] @@ -772,7 +772,7 @@ "style": "receipt-table-value" }, { - "text": "{{payerAddress || oldPayerAddress}}", + "text": "{{payerAddress}}", "border": [ false, false, @@ -1050,7 +1050,7 @@ "border":[false, false, false, false] }, { - "text":"{{comments || oldComments}}", + "text":"{{comments}}", "border":[false, false, false, false] } ] From d5424c86b6c5129bfd260b24ac7ef26a4d495362 Mon Sep 17 00:00:00 2001 From: egovmis Date: Thu, 19 Nov 2020 11:11:52 +0530 Subject: [PATCH 0413/1242] PI-8588 comments/address changes for old UC receipts --- configs/pdf-service/data-config/consolidatedreceipt.json | 4 ++-- .../pdf-service/format-config/consolidatedreceipt.json | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/configs/pdf-service/data-config/consolidatedreceipt.json b/configs/pdf-service/data-config/consolidatedreceipt.json index 09e357de..5f1f9147 100644 --- a/configs/pdf-service/data-config/consolidatedreceipt.json +++ b/configs/pdf-service/data-config/consolidatedreceipt.json @@ -92,7 +92,7 @@ { "variable": "payerAddress", "value": { - "path": "$.paymentDetails[0].bill.billDetails[0].additionalDetails.address || $.payerAddress" + "path": "$.paymentDetails[0].bill.billDetails[0].additionalDetails.address" } }, { @@ -110,7 +110,7 @@ { "variable": "comments", "value": { - "path": "$.paymentDetails[0].bill.billDetails[0].additionalDetails.comment || $.additionalDetails.comments" + "path": "$.paymentDetails[0].bill.billDetails[0].additionalDetails.comment" } }, { diff --git a/configs/pdf-service/format-config/consolidatedreceipt.json b/configs/pdf-service/format-config/consolidatedreceipt.json index ee430f8e..152b9a6b 100644 --- a/configs/pdf-service/format-config/consolidatedreceipt.json +++ b/configs/pdf-service/format-config/consolidatedreceipt.json @@ -214,7 +214,7 @@ "style": "receipt-table-value" }, { - "text": "{{payerAddress}}", + "text": "{{payerAddress || oldPayerAddress}}", "border": [ false, false, @@ -491,7 +491,7 @@ "border":[false, false, false, false] }, { - "text":"{{comments}}", + "text":"{{comments || oldComments}}", "border":[false, false, false, false] } ] @@ -772,7 +772,7 @@ "style": "receipt-table-value" }, { - "text": "{{payerAddress}}", + "text": "{{payerAddress || oldPayerAddress}}", "border": [ false, false, @@ -1050,7 +1050,7 @@ "border":[false, false, false, false] }, { - "text":"{{comments}}", + "text":"{{comments || oldComments}}", "border":[false, false, false, false] } ] From 9e70c87485c2f061984f7dfa7a9b4b14d033d865 Mon Sep 17 00:00:00 2001 From: egovmis Date: Thu, 19 Nov 2020 11:18:00 +0530 Subject: [PATCH 0414/1242] PI-8588 comments/address changes for old UC receipts --- .../pdf-service/format-config/consolidatedreceipt.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/pdf-service/format-config/consolidatedreceipt.json b/configs/pdf-service/format-config/consolidatedreceipt.json index 152b9a6b..54db660c 100644 --- a/configs/pdf-service/format-config/consolidatedreceipt.json +++ b/configs/pdf-service/format-config/consolidatedreceipt.json @@ -214,7 +214,7 @@ "style": "receipt-table-value" }, { - "text": "{{payerAddress || oldPayerAddress}}", + "text": "{{payerAddress ||''}}{{oldPayerAddress || ''}}", "border": [ false, false, @@ -491,7 +491,7 @@ "border":[false, false, false, false] }, { - "text":"{{comments || oldComments}}", + "text":"{{comments || ''}} {{oldComments || ''}}", "border":[false, false, false, false] } ] @@ -772,7 +772,7 @@ "style": "receipt-table-value" }, { - "text": "{{payerAddress || oldPayerAddress}}", + "text": "{{payerAddress || ''}}{{oldPayerAddress || ''}}", "border": [ false, false, @@ -1050,7 +1050,7 @@ "border":[false, false, false, false] }, { - "text":"{{comments || oldComments}}", + "text":"{{comments || ''}} {{oldComments || ''}}", "border":[false, false, false, false] } ] From 189befa18a6861da16db432f8789ff0b9c888cfa Mon Sep 17 00:00:00 2001 From: egovmis Date: Thu, 19 Nov 2020 11:20:43 +0530 Subject: [PATCH 0415/1242] PI-8588 comments/address changes for old UC receipts --- configs/pdf-service/data-config/consolidatedreceipt.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/pdf-service/data-config/consolidatedreceipt.json b/configs/pdf-service/data-config/consolidatedreceipt.json index 5f1f9147..c3ddd590 100644 --- a/configs/pdf-service/data-config/consolidatedreceipt.json +++ b/configs/pdf-service/data-config/consolidatedreceipt.json @@ -104,7 +104,7 @@ { "variable": "oldComments", "value": { - "path": "$.additionalDetails.comments" + "path": "$.additionalDetails.comment" } }, { From 2a8b22d75fdceba933b7dc7050894eecd4ed2028 Mon Sep 17 00:00:00 2001 From: egovmis Date: Thu, 19 Nov 2020 11:27:04 +0530 Subject: [PATCH 0416/1242] PI-8588 comments/address changes for old UC receipts --- configs/pdf-service/format-config/consolidatedreceipt.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/pdf-service/format-config/consolidatedreceipt.json b/configs/pdf-service/format-config/consolidatedreceipt.json index 54db660c..24de0268 100644 --- a/configs/pdf-service/format-config/consolidatedreceipt.json +++ b/configs/pdf-service/format-config/consolidatedreceipt.json @@ -214,7 +214,7 @@ "style": "receipt-table-value" }, { - "text": "{{payerAddress ||''}}{{oldPayerAddress || ''}}", + "text": "{{payerAddress || ''}} {{oldPayerAddress || ''}}", "border": [ false, false, @@ -772,7 +772,7 @@ "style": "receipt-table-value" }, { - "text": "{{payerAddress || ''}}{{oldPayerAddress || ''}}", + "text": "{{payerAddress || ''}} {{oldPayerAddress || ''}}", "border": [ false, false, From e0e8841c2a48bf9e3f23866f3a84130920bfadf8 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 19 Nov 2020 11:28:08 +0530 Subject: [PATCH 0417/1242] fetched comment/remarks from egcl_paymenr --- configs/reports/configs/uc-reports.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/uc-reports.yml b/configs/reports/configs/uc-reports.yml index 8919f4b7..58653976 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -1146,7 +1146,7 @@ ReportDefinitions: (case when paymentmode like 'DD' or paymentmode like 'CHEQUE' then To_char((To_timestamp(payment.transactiondate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') else '' end) as ddchequedate, 'System' as collectiontype, eg_user.name as collectorname, - billd.additionaldetails->>'comment' as remarks + payment.additionaldetails->>'comment' as remarks FROM egcl_payment AS payment JOIN egcl_paymentdetail as paydetail on paydetail.paymentid=payment.id JOIN receipt_breakup ON paydetail.billid = receipt_breakup.bill_id @@ -1676,7 +1676,7 @@ ReportDefinitions: paydetail.businessservice as servicecategory, payment.totalamountpaid as amount, (case when eg_user.name is null then '721995|Jit/FZQHkmU8SNc06DKOhEnWXXfadQ==' else eg_user.name end) as collectorname, - billd.additionaldetails->>'comment' as remarks + payment.additionaldetails->>'comment' as remarks FROM egcl_payment AS payment INNER JOIN egcl_paymentdetail as paydetail on paydetail.paymentid=payment.id INNER JOIN egcl_billdetial as billd on billd.billid=paydetail.billid From a6f13fc38917a3b6d88c31364811b221586d6d82 Mon Sep 17 00:00:00 2001 From: egovmis Date: Thu, 19 Nov 2020 11:32:04 +0530 Subject: [PATCH 0418/1242] PI-8588 comments/address changes for old UC receipts --- .../pdf-service/format-config/consolidatedreceipt.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/pdf-service/format-config/consolidatedreceipt.json b/configs/pdf-service/format-config/consolidatedreceipt.json index 24de0268..ee430f8e 100644 --- a/configs/pdf-service/format-config/consolidatedreceipt.json +++ b/configs/pdf-service/format-config/consolidatedreceipt.json @@ -214,7 +214,7 @@ "style": "receipt-table-value" }, { - "text": "{{payerAddress || ''}} {{oldPayerAddress || ''}}", + "text": "{{payerAddress}}", "border": [ false, false, @@ -491,7 +491,7 @@ "border":[false, false, false, false] }, { - "text":"{{comments || ''}} {{oldComments || ''}}", + "text":"{{comments}}", "border":[false, false, false, false] } ] @@ -772,7 +772,7 @@ "style": "receipt-table-value" }, { - "text": "{{payerAddress || ''}} {{oldPayerAddress || ''}}", + "text": "{{payerAddress}}", "border": [ false, false, @@ -1050,7 +1050,7 @@ "border":[false, false, false, false] }, { - "text":"{{comments || ''}} {{oldComments || ''}}", + "text":"{{comments}}", "border":[false, false, false, false] } ] From ad01aae15d9c62eff1d98a06d9ab72346e1634b1 Mon Sep 17 00:00:00 2001 From: egovmis Date: Thu, 19 Nov 2020 12:03:20 +0530 Subject: [PATCH 0419/1242] PI-8588 comments/address changes for old UC receipts --- .../pdf-service/format-config/consolidatedreceipt.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/pdf-service/format-config/consolidatedreceipt.json b/configs/pdf-service/format-config/consolidatedreceipt.json index ee430f8e..2d29a20a 100644 --- a/configs/pdf-service/format-config/consolidatedreceipt.json +++ b/configs/pdf-service/format-config/consolidatedreceipt.json @@ -214,7 +214,7 @@ "style": "receipt-table-value" }, { - "text": "{{payerAddress}}", + "text": "{{payerAddress}}{{oldPayerAddress}}", "border": [ false, false, @@ -491,7 +491,7 @@ "border":[false, false, false, false] }, { - "text":"{{comments}}", + "text":"{{comments}}{{oldComments}}", "border":[false, false, false, false] } ] @@ -772,7 +772,7 @@ "style": "receipt-table-value" }, { - "text": "{{payerAddress}}", + "text": "{{payerAddress}}{{oldPayerAddress}}", "border": [ false, false, @@ -1050,7 +1050,7 @@ "border":[false, false, false, false] }, { - "text":"{{comments}}", + "text":"{{comments}}{{oldComments}}", "border":[false, false, false, false] } ] From 19d0cbb244a93de249d48d35abdc670f75d0897b Mon Sep 17 00:00:00 2001 From: egovmis Date: Thu, 19 Nov 2020 12:07:03 +0530 Subject: [PATCH 0420/1242] PI-8588 comments/address changes for old UC receipts --- .../pdf-service/format-config/consolidatedreceipt.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/pdf-service/format-config/consolidatedreceipt.json b/configs/pdf-service/format-config/consolidatedreceipt.json index 2d29a20a..6059181d 100644 --- a/configs/pdf-service/format-config/consolidatedreceipt.json +++ b/configs/pdf-service/format-config/consolidatedreceipt.json @@ -214,7 +214,7 @@ "style": "receipt-table-value" }, { - "text": "{{payerAddress}}{{oldPayerAddress}}", + "text": "{{payerAddress || ' '}}{{oldPayerAddress || ' '}}", "border": [ false, false, @@ -491,7 +491,7 @@ "border":[false, false, false, false] }, { - "text":"{{comments}}{{oldComments}}", + "text":"{{comments || ' '}}{{oldComments || ' '}}", "border":[false, false, false, false] } ] @@ -772,7 +772,7 @@ "style": "receipt-table-value" }, { - "text": "{{payerAddress}}{{oldPayerAddress}}", + "text": "{{payerAddress || ' '}}{{oldPayerAddress || ' '}}", "border": [ false, false, @@ -1050,7 +1050,7 @@ "border":[false, false, false, false] }, { - "text":"{{comments}}{{oldComments}}", + "text":"{{comments || ' '}}{{oldComments || ' '}}", "border":[false, false, false, false] } ] From 5886c3210abdec8b368441c39b5c85de8645a3a6 Mon Sep 17 00:00:00 2001 From: egovmis Date: Thu, 19 Nov 2020 12:31:50 +0530 Subject: [PATCH 0421/1242] owners table on tl certificate --- .../pdf-service/format-config/consolidatedreceipt.json | 8 ++++---- configs/pdf-service/format-config/tlcertificate.json | 2 +- .../pdf-service/format-config/tlrenewalcertificate.json | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/configs/pdf-service/format-config/consolidatedreceipt.json b/configs/pdf-service/format-config/consolidatedreceipt.json index 6059181d..39b67c1c 100644 --- a/configs/pdf-service/format-config/consolidatedreceipt.json +++ b/configs/pdf-service/format-config/consolidatedreceipt.json @@ -214,7 +214,7 @@ "style": "receipt-table-value" }, { - "text": "{{payerAddress || ' '}}{{oldPayerAddress || ' '}}", + "text": "{{payerAddress || ''}}{{oldPayerAddress || ''}}", "border": [ false, false, @@ -491,7 +491,7 @@ "border":[false, false, false, false] }, { - "text":"{{comments || ' '}}{{oldComments || ' '}}", + "text":"{{comments || ''}}{{oldComments || ''}}", "border":[false, false, false, false] } ] @@ -772,7 +772,7 @@ "style": "receipt-table-value" }, { - "text": "{{payerAddress || ' '}}{{oldPayerAddress || ' '}}", + "text": "{{payerAddress || ''}}{{oldPayerAddress || ''}}", "border": [ false, false, @@ -1050,7 +1050,7 @@ "border":[false, false, false, false] }, { - "text":"{{comments || ' '}}{{oldComments || ' '}}", + "text":"{{comments || ''}}{{oldComments || ''}}", "border":[false, false, false, false] } ] diff --git a/configs/pdf-service/format-config/tlcertificate.json b/configs/pdf-service/format-config/tlcertificate.json index 01b81c68..ebc70a71 100644 --- a/configs/pdf-service/format-config/tlcertificate.json +++ b/configs/pdf-service/format-config/tlcertificate.json @@ -442,7 +442,7 @@ false ] }, { - "style": "next-noc-table", + "style": "noc-head2", "table": { "widths": [ "50%", diff --git a/configs/pdf-service/format-config/tlrenewalcertificate.json b/configs/pdf-service/format-config/tlrenewalcertificate.json index cc751826..6d730906 100644 --- a/configs/pdf-service/format-config/tlrenewalcertificate.json +++ b/configs/pdf-service/format-config/tlrenewalcertificate.json @@ -442,10 +442,10 @@ false ] }, { - "style": "next-noc-table", + "style": "noc-head2", "table": { "widths": [ - "55%", + "50%", "*", "15%" ], @@ -454,7 +454,7 @@ [ { "text": "Owner Name", - "style": "receipt-table-value" + "style": "receipt-table-value2" }, { "text": "Father/Husband Name", @@ -465,7 +465,7 @@ "style": "receipt-table-value" } ], - "{{#variable_owners}}[{ \"text\":\"{{name}}\", \"border\":[ true, false, true, true ], \"style\": \"receipt-table\" }, { \"text\":\"{{fatherOrHusbandName}}\", \"border\":[ false, false, true, true ], \"style\": \"receipt-table\" }, { \"text\":\"{{mobileNumber}}\", \"border\":[ false, false, true, true ], \"style\": \"receipt-table\" }]{{/variable_owners}}" + "{{#variable_owners}}[{ \"text\":\"{{name}}\", \"border\":[ true, false, true, true ], \"style\": \"receipt-table3\" }, { \"text\":\"{{fatherOrHusbandName}}\", \"border\":[ false, false, true, true ], \"style\": \"receipt-table2\" }, { \"text\":\"{{mobileNumber}}\", \"border\":[ false, false, true, true ], \"style\": \"receipt-table2\" }]{{/variable_owners}}" ] }, "layout": {} From 4b3d44b57b9f81ad6d57e42edf4b757befbfed22 Mon Sep 17 00:00:00 2001 From: egovmis Date: Thu, 19 Nov 2020 12:40:55 +0530 Subject: [PATCH 0422/1242] comments/address changes for old UC receipts --- .../pdf-service/format-config/consolidatedreceipt.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/pdf-service/format-config/consolidatedreceipt.json b/configs/pdf-service/format-config/consolidatedreceipt.json index 39b67c1c..24de0268 100644 --- a/configs/pdf-service/format-config/consolidatedreceipt.json +++ b/configs/pdf-service/format-config/consolidatedreceipt.json @@ -214,7 +214,7 @@ "style": "receipt-table-value" }, { - "text": "{{payerAddress || ''}}{{oldPayerAddress || ''}}", + "text": "{{payerAddress || ''}} {{oldPayerAddress || ''}}", "border": [ false, false, @@ -491,7 +491,7 @@ "border":[false, false, false, false] }, { - "text":"{{comments || ''}}{{oldComments || ''}}", + "text":"{{comments || ''}} {{oldComments || ''}}", "border":[false, false, false, false] } ] @@ -772,7 +772,7 @@ "style": "receipt-table-value" }, { - "text": "{{payerAddress || ''}}{{oldPayerAddress || ''}}", + "text": "{{payerAddress || ''}} {{oldPayerAddress || ''}}", "border": [ false, false, @@ -1050,7 +1050,7 @@ "border":[false, false, false, false] }, { - "text":"{{comments || ''}}{{oldComments || ''}}", + "text":"{{comments || ''}} {{oldComments || ''}}", "border":[false, false, false, false] } ] From ce6340459cbc98291139ba769f63911297ad0a38 Mon Sep 17 00:00:00 2001 From: egovmis Date: Thu, 19 Nov 2020 12:45:21 +0530 Subject: [PATCH 0423/1242] testing comments --- .../pdf-service/format-config/consolidatedreceipt.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/pdf-service/format-config/consolidatedreceipt.json b/configs/pdf-service/format-config/consolidatedreceipt.json index 24de0268..e47c32f7 100644 --- a/configs/pdf-service/format-config/consolidatedreceipt.json +++ b/configs/pdf-service/format-config/consolidatedreceipt.json @@ -214,7 +214,7 @@ "style": "receipt-table-value" }, { - "text": "{{payerAddress || ''}} {{oldPayerAddress || ''}}", + "text": "{{payerAddress || ' '}} {{oldPayerAddress || ''}}", "border": [ false, false, @@ -491,7 +491,7 @@ "border":[false, false, false, false] }, { - "text":"{{comments || ''}} {{oldComments || ''}}", + "text":"{{comments || ' '}} {{oldComments || ''}}", "border":[false, false, false, false] } ] @@ -772,7 +772,7 @@ "style": "receipt-table-value" }, { - "text": "{{payerAddress || ''}} {{oldPayerAddress || ''}}", + "text": "{{payerAddress || ' '}} {{oldPayerAddress || ''}}", "border": [ false, false, @@ -1050,7 +1050,7 @@ "border":[false, false, false, false] }, { - "text":"{{comments || ''}} {{oldComments || ''}}", + "text":"{{comments || ' '}} {{oldComments || ''}}", "border":[false, false, false, false] } ] From ecab505ea3192e304cf9ce004be1f26fe9b71bb3 Mon Sep 17 00:00:00 2001 From: egovmis Date: Thu, 19 Nov 2020 13:22:57 +0530 Subject: [PATCH 0424/1242] changes for comments/address on UC Receipt --- .../pdf-service/format-config/consolidatedreceipt.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/pdf-service/format-config/consolidatedreceipt.json b/configs/pdf-service/format-config/consolidatedreceipt.json index e47c32f7..ee430f8e 100644 --- a/configs/pdf-service/format-config/consolidatedreceipt.json +++ b/configs/pdf-service/format-config/consolidatedreceipt.json @@ -214,7 +214,7 @@ "style": "receipt-table-value" }, { - "text": "{{payerAddress || ' '}} {{oldPayerAddress || ''}}", + "text": "{{payerAddress}}", "border": [ false, false, @@ -491,7 +491,7 @@ "border":[false, false, false, false] }, { - "text":"{{comments || ' '}} {{oldComments || ''}}", + "text":"{{comments}}", "border":[false, false, false, false] } ] @@ -772,7 +772,7 @@ "style": "receipt-table-value" }, { - "text": "{{payerAddress || ' '}} {{oldPayerAddress || ''}}", + "text": "{{payerAddress}}", "border": [ false, false, @@ -1050,7 +1050,7 @@ "border":[false, false, false, false] }, { - "text":"{{comments || ' '}} {{oldComments || ''}}", + "text":"{{comments}}", "border":[false, false, false, false] } ] From f9bd9706dc7ee8876d7aa50535c1afc17b8652b6 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 19 Nov 2020 15:16:33 +0530 Subject: [PATCH 0425/1242] fy fix for receipt register --- configs/reports/configs/pt-reports.yml | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index ddca7008..27251a4f 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2270,21 +2270,17 @@ ReportDefinitions: payment.totalamountpaid as amount, payment.paymentmode as instrumenttype, payment.transactionnumber, - concat(to_char((To_timestamp(bd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(bd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear, - to_char((To_timestamp(payment.transactiondate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, - pd.due AS pendingamount, - Initcap(case when pt.usagecategory like '%.%' then split_part(pt.usagecategory,'.',2) else pt.usagecategory end) as usagetype, - (case when eg_user.name is null then '721995|Jit/FZQHkmU8SNc06DKOhEnWXXfadQ==' else eg_user.name end) as collectorname, + concat(to_char((To_timestamp(bd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(bd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) AS financialyear, + to_char((To_timestamp(payment.transactiondate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, + Initcap(pt.usagecategory) as usagetype, + eg_user.name as collectorname, receipt_breakup.*, to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, manualreceiptnumber as g8receiptno - FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, receipt_breakup, - (select bill.id as billid, bill.consumercode as consumercodei, min(bd.fromperiod) fromperiod, max(bd.toperiod) toperiod from egcl_billdetial bd, egcl_bill bill - where bill.id=bd.billid and bill.tenantid = $tenantid group by bill.id) bd, - (select string_agg(distinct propertyid,',') as propertyid,string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr + FROM egcl_paymentdetail pd, egcl_payment payment, eg_pt_property as pt, receipt_breakup, eg_user, + (select bill.id as billid, bill.consumercode as consumercodei, (select get_fromperiod(bill.id)) as fromperiod, (select get_toperiod(bill.id)) as toperiod from egcl_billdetial bd, egcl_bill bill where bill.id=bd.billid and bill.tenantid = $tenantid group by bill.id) bd where pd.paymentid=payment.id and bd.billid=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid - and pt.propertyid = bd.consumercodei and receipt_breakup.pdid=pd.id and pt.status!='INACTIVE' - and pt_addr.propertyid=pt.id + and pt.propertyid = bd.consumercodei and receipt_breakup.pdid=pd.id and eg_user.id = pd.createdby::INTEGER and pt.status!='INACTIVE' --and pt.propertyid='PT-1012-978737' orderby: ORDER BY pd.receiptdate DESC; From 5b6cce692b7be8b216b1feece0b82394c7399726 Mon Sep 17 00:00:00 2001 From: ramakrishnaippili Date: Thu, 19 Nov 2020 18:48:59 +0530 Subject: [PATCH 0426/1242] [PI-993] updating migration indexing config --- .../payment-indexer-migration.yml | 2 +- .../property-services-migration.yml | 32 ++++++++----------- 2 files changed, 14 insertions(+), 20 deletions(-) diff --git a/configs/egov-indexer/payment-indexer-migration.yml b/configs/egov-indexer/payment-indexer-migration.yml index 8bd4f5c1..f0724926 100644 --- a/configs/egov-indexer/payment-indexer-migration.yml +++ b/configs/egov-indexer/payment-indexer-migration.yml @@ -6,7 +6,7 @@ ServiceMaps: configKey: INDEX indexes: - name: paymentsindex-v1 - type: payments + type: general id: $.id isBulk: false timeStampField: $.auditDetails.createdTime diff --git a/configs/egov-indexer/property-services-migration.yml b/configs/egov-indexer/property-services-migration.yml index 8c4a195e..2195e4d3 100644 --- a/configs/egov-indexer/property-services-migration.yml +++ b/configs/egov-indexer/property-services-migration.yml @@ -2,25 +2,19 @@ ServiceMaps: serviceName: Property Tax - rainmaker version: 1.0.0 mappings: - - topic: save-property-registry-batch + - topic: save-property-registry configKey: INDEX indexes: - name: property-services type: general - id: $.propertyId,$.tenantId,$.auditDetails.lastModifiedTime + id: $.propertyId,$.tenantId jsonPath: $.Property timeStampField: $.auditDetails.lastModifiedTime customJsonMapping: - indexMapping: {"Data":{"workflow":{"state":{},"action":"","assignes":[]},"owners":[],"acknowldgementNumber":"","propertyType":"","ownershipCategory":"","creationReason":"","usageCategory":"","noOfFloors":"","landArea":"","superBuiltUpArea":"","source":"","channel":"","units":{},"auditDetails":{},"id":"","propertyId":"","surveyId":"","linkedProperties":{},"tenantId":"","accountId":"","oldPropertyId":"","status":"","@timestamp":"timestamp"}} + indexMapping: {"Data":{"owners":[],"acknowldgementNumber":"","propertyType":"","ownershipCategory":"","creationReason":"","usageCategory":"","noOfFloors":"","landArea":"","superBuiltUpArea":"","source":"","channel":"","units":{},"auditDetails":{},"id":"","propertyId":"","surveyId":"","linkedProperties":{},"tenantId":"","accountId":"","oldPropertyId":"","status":"","@timestamp":"timestamp"}} fieldMapping: - inJsonPath: $.owners.*.uuid outJsonPath: $.Data.owners - - inJsonPath: $.workflow.state - outJsonPath: $.Data.workflow.state - - inJsonPath: $.workflow.action - outJsonPath: $.Data.workflow.action - - inJsonPath: $.workflow.assignes.*.uuid - outJsonPath: $.Data.workflow.assignes - inJsonPath: $.acknowldgementNumber outJsonPath: $.Data.acknowldgementNumber - inJsonPath: $.propertyType @@ -71,6 +65,12 @@ ServiceMaps: uriResponseMapping: - inJsonPath: $.TenantBoundary[0].boundary[0] outJsonPath: $.Data.ward + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.acknowldgementNumber,history=true,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history mdmsMapping: - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search moduleName: tenant @@ -93,9 +93,9 @@ ServiceMaps: valueJsonpath: $.usageCategory uriResponseMapping: - inJsonPath: $.MdmsRes.PropertyTax.UsageCategory[0].name - outJsonPath: $.Data.usageCategory - - - topic: save-pt-assessment-batch + outJsonPath: $.Data.usageCategory + + - topic: save-pt-assessment configKey: INDEX indexes: - name: property-assessments @@ -104,14 +104,8 @@ ServiceMaps: jsonPath: $.Assessment timeStampField: $.auditDetails.createdTime customJsonMapping: - indexMapping: {"Data":{"workflow":{"state":{},"action":"","assignes":[]},"id":"","tenantId":"","additionalDetails":"","assessmentNumber":"","financialYear":"","propertyId":"","assessmentDate":"","status":"","source":"","unitUsageList":{},"channel":"","auditDetails":{},"@timestamp":"timestamp"}} + indexMapping: {"Data":{"id":"","tenantId":"","additionalDetails":"","assessmentNumber":"","financialYear":"","propertyId":"","assessmentDate":"","status":"","source":"","unitUsageList":{},"channel":"","auditDetails":{},"@timestamp":"timestamp"}} fieldMapping: - - inJsonPath: $.workflow.state - outJsonPath: $.Data.workflow.state - - inJsonPath: $.workflow.action - outJsonPath: $.Data.workflow.action - - inJsonPath: $.workflow.assignes.*.uuid - outJsonPath: $.Data.workflow.assignes - inJsonPath: $.id outJsonPath: $.Data.id - inJsonPath: $.tenantId From 6d4eed8fd085ea4a8b7e58bfcafa3738f93cb715 Mon Sep 17 00:00:00 2001 From: egovmis Date: Fri, 20 Nov 2020 10:45:49 +0530 Subject: [PATCH 0427/1242] added additionalDetails on property Details --- .../data-config/property-receipt.json | 20 ++- .../format-config/property-receipt.json | 145 +++++++++++++++++- 2 files changed, 163 insertions(+), 2 deletions(-) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index 1f29ad52..dfbe00f2 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -579,9 +579,27 @@ "apiRequest": null, "responseMapping":[ { + "variable":"vasikaNo", + "value":"$.Properties[0].additionalDetails.vasikaNo" + }, { + "variable":"vasikaDate", + "value":"$.Properties[0].additionalDetails.vasikaDate" + }, { + "variable":"allotmentNo", + "value":"$.Properties[0].additionalDetails.allotmentNo" + }, { + "variable":"allotmentDate", + "value":"$.Properties[0].additionalDetails.allotmentDate" + }, { + "variable":"businessName", + "value":"$.Properties[0].additionalDetails.businessName" + }, { + "variable":"remarks", + "value":"$.Properties[0].additionalDetails.remarks" + }, { "variable":"fatherHusbandName", "value":"$.Properties[0].owners[0].fatherOrHusbandName" - },{ + }, { "variable":"propertyUsage", "value":"$.Properties[0].usageCategory", "localisation": { diff --git a/configs/pdf-service/format-config/property-receipt.json b/configs/pdf-service/format-config/property-receipt.json index 49385b28..e5e6ff18 100644 --- a/configs/pdf-service/format-config/property-receipt.json +++ b/configs/pdf-service/format-config/property-receipt.json @@ -862,7 +862,150 @@ }, "layout": {} }, - + { + "text":"ADDITIONAL DETAILS", + "style":"block-head" + }, + { + "style": "next-noc-table", + "table": { + "widths": [ + "25%", + "25%", + "25%", + "25%" + ], + "body": [ + [ + { + "text": "Vasika No.", + "border": [ + true, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{vasikaNo}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Vasika Date", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{vasikaDate}}", + "border": [ + false, + true, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "Allotment No", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{allotmentNo}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Allotment Date", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{allotmentDate}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "Business Name", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{businessName}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Remarks", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{remarks}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ] + ] + }, + "layout": {} + }, { "text": "Mobile Number {{ownerMobileNumber}} Assessee Signature: ", "style": "receipt-approver" From 2fdc662f1e54f46132fccc6a652542a6398cb4c5 Mon Sep 17 00:00:00 2001 From: egovmis Date: Fri, 20 Nov 2020 11:23:55 +0530 Subject: [PATCH 0428/1242] adjusted boundary of tables on PT receipt --- configs/pdf-service/format-config/property-receipt.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/pdf-service/format-config/property-receipt.json b/configs/pdf-service/format-config/property-receipt.json index e5e6ff18..b0b43860 100644 --- a/configs/pdf-service/format-config/property-receipt.json +++ b/configs/pdf-service/format-config/property-receipt.json @@ -967,7 +967,7 @@ true, false, false, - false + true ], "style": "receipt-table-value" }, @@ -977,7 +977,7 @@ false, false, false, - false + true ], "style": "receipt-table" }, @@ -987,7 +987,7 @@ false, false, false, - false + true ], "style": "receipt-table-value" }, @@ -997,7 +997,7 @@ false, false, true, - false + true ], "style": "receipt-table" } From ea89bb788747f359421fdf54c774a169560d45df Mon Sep 17 00:00:00 2001 From: egovmis Date: Fri, 20 Nov 2020 11:50:55 +0530 Subject: [PATCH 0429/1242] changed name of remarks on PT receipt --- configs/pdf-service/data-config/property-receipt.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index dfbe00f2..f6bb86e6 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -595,7 +595,7 @@ "value":"$.Properties[0].additionalDetails.businessName" }, { "variable":"remarks", - "value":"$.Properties[0].additionalDetails.remarks" + "value":"$.Properties[0].additionalDetails.remrks" }, { "variable":"fatherHusbandName", "value":"$.Properties[0].owners[0].fatherOrHusbandName" From 6eac8c19b2a63b09464921211ae2497412b73df5 Mon Sep 17 00:00:00 2001 From: egovmis Date: Fri, 20 Nov 2020 11:58:46 +0530 Subject: [PATCH 0430/1242] added type for date fields on PT receipt --- configs/pdf-service/data-config/property-receipt.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index f6bb86e6..4eaa19a3 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -583,13 +583,15 @@ "value":"$.Properties[0].additionalDetails.vasikaNo" }, { "variable":"vasikaDate", - "value":"$.Properties[0].additionalDetails.vasikaDate" + "value":"$.Properties[0].additionalDetails.vasikaDate", + "type":"date" }, { "variable":"allotmentNo", "value":"$.Properties[0].additionalDetails.allotmentNo" }, { "variable":"allotmentDate", - "value":"$.Properties[0].additionalDetails.allotmentDate" + "value":"$.Properties[0].additionalDetails.allotmentDate", + "type":"date" }, { "variable":"businessName", "value":"$.Properties[0].additionalDetails.businessName" From c4202540097d4ac33824d14e9f54669e7191424c Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 20 Nov 2020 12:31:16 +0530 Subject: [PATCH 0431/1242] decryption Added for Collectorname --- configs/reports/configs/rainmaker-noc-reports.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/rainmaker-noc-reports.yml b/configs/reports/configs/rainmaker-noc-reports.yml index 11de16a9..3add36f0 100644 --- a/configs/reports/configs/rainmaker-noc-reports.yml +++ b/configs/reports/configs/rainmaker-noc-reports.yml @@ -537,7 +537,8 @@ ReportDefinitions: groupby: GROUP BY (channel,subdistrict,firestation) orderby: ORDER BY channel - - reportName: ReceiptRegisterFirenocReport_V2 + - reportName: ReceiptRegisterFirenocReport_V2 + decryptionPathId: ReceiptRegister_V2 summary: Receipt Register FireNoc version: 1.0.0 moduleName: rainmaker-noc @@ -685,7 +686,8 @@ ReportDefinitions: WHERE payment.tenantid!='pb.testing' AND paydetail.businessservice in ('FIRENOC') AND paydetail.receiptnumber NOT LIKE 'MP%' and paydetail.tenantid=$tenantid orderby: ORDER BY paydetail.receiptdate DESC - - reportName: CancelledReceiptRegisterFirenocReport_V2 + - reportName: CancelledReceiptRegisterFirenocReport_V2 + decryptionPathId: ReceiptRegister_V2 summary: Cancelled Receipt Register FireNoc version: 1.0.0 moduleName: rainmaker-noc From d57ea7f6e7ee32537ffbb2e821f5722d85e37b3c Mon Sep 17 00:00:00 2001 From: Abhilashegov <35691559+Abhilashegov@users.noreply.github.com> Date: Fri, 20 Nov 2020 13:29:13 +0530 Subject: [PATCH 0432/1242] Changed the id for service property-services --- configs/egov-indexer/property-services.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/egov-indexer/property-services.yml b/configs/egov-indexer/property-services.yml index d679c3c9..6f1c2522 100644 --- a/configs/egov-indexer/property-services.yml +++ b/configs/egov-indexer/property-services.yml @@ -7,7 +7,7 @@ ServiceMaps: indexes: - name: property-services type: general - id: $.propertyId,$.tenantId,$.auditDetails.lastModifiedTime + id: $.propertyId,$.tenantId jsonPath: $.Property timeStampField: $.auditDetails.lastModifiedTime customJsonMapping: @@ -100,7 +100,7 @@ ServiceMaps: indexes: - name: property-services type: general - id: $.propertyId,$.tenantId,$.auditDetails.lastModifiedTime + id: $.propertyId,$.tenantId jsonPath: $.Property timeStampField: $.auditDetails.lastModifiedTime customJsonMapping: @@ -193,7 +193,7 @@ ServiceMaps: indexes: - name: property-services type: general - id: $.propertyId,$.tenantId,$.auditDetails.lastModifiedTime + id: $.propertyId,$.tenantId jsonPath: $.Property timeStampField: $.auditDetails.lastModifiedTime customJsonMapping: @@ -287,7 +287,7 @@ ServiceMaps: - name: property-services type: general isBulk: true - id: $.propertyId,$.tenantId,$.auditDetails.lastModifiedTime + id: $.propertyId,$.tenantId jsonPath: $.Properties.* timeStampField: $.auditDetails.lastModifiedTime customJsonMapping: From 9cbaae3641d1cef0518caf085553432f875e03e7 Mon Sep 17 00:00:00 2001 From: Abhilashegov <35691559+Abhilashegov@users.noreply.github.com> Date: Fri, 20 Nov 2020 15:59:54 +0530 Subject: [PATCH 0433/1242] set jsonPaath from Payment to Payments --- configs/egov-indexer/payment-indexer-migration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-indexer/payment-indexer-migration.yml b/configs/egov-indexer/payment-indexer-migration.yml index f0724926..7416aa46 100644 --- a/configs/egov-indexer/payment-indexer-migration.yml +++ b/configs/egov-indexer/payment-indexer-migration.yml @@ -10,7 +10,7 @@ ServiceMaps: id: $.id isBulk: false timeStampField: $.auditDetails.createdTime - jsonPath: $.Payment + jsonPath: $.Payments customJsonMapping: indexMapping: {"Data":{"tenantId":"","id":"","transactionNumber":"","transactionDate":1,"paymentMode":"","paymentStatus":"","payer":{"id":"","name":""},"paidBy":"","paymentDetails":{},"auditDetails":{},"additionalDetails":{},"tenantData":{},"@timestamp":"timestamp"}} fieldMapping: From 9202722f7fbce3a13880024b5860777010a556f0 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 20 Nov 2020 16:24:25 +0530 Subject: [PATCH 0434/1242] pt receiptRegister locality search enabled --- configs/reports/configs/pt-reports.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 27251a4f..1f19c146 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2278,12 +2278,15 @@ ReportDefinitions: to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, manualreceiptnumber as g8receiptno FROM egcl_paymentdetail pd, egcl_payment payment, eg_pt_property as pt, receipt_breakup, eg_user, + (select propertyid,max(createdtime),locality from eg_pt_address where tenantid=$tenantid group by propertyid,locality) as pt_addr, (select bill.id as billid, bill.consumercode as consumercodei, (select get_fromperiod(bill.id)) as fromperiod, (select get_toperiod(bill.id)) as toperiod from egcl_billdetial bd, egcl_bill bill where bill.id=bd.billid and bill.tenantid = $tenantid group by bill.id) bd where pd.paymentid=payment.id and bd.billid=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid - and pt.propertyid = bd.consumercodei and receipt_breakup.pdid=pd.id and eg_user.id = pd.createdby::INTEGER and pt.status!='INACTIVE' + and pt.propertyid = bd.consumercodei and receipt_breakup.pdid=pd.id and eg_user.id = pd.createdby::INTEGER and pt.status!='INACTIVE' + and pt_addr.propertyid=pt.id --and pt.propertyid='PT-1012-978737' orderby: ORDER BY pd.receiptdate DESC; - + + - reportName: CancelledReceiptRegister_V2 decryptionPathId: CancelledReceiptRegister_V2 summary: Receipt Register for cancelled Receipts From e40af15e116f0a7ae360259dcd82e5010cf1aa4b Mon Sep 17 00:00:00 2001 From: egovmis Date: Fri, 20 Nov 2020 16:39:10 +0530 Subject: [PATCH 0435/1242] added trade fee on TL receipt --- .../data-config/tradelicense-receipt.json | 18 +++++++- .../format-config/tradelicense-receipt.json | 43 +++++++++---------- 2 files changed, 38 insertions(+), 23 deletions(-) diff --git a/configs/pdf-service/data-config/tradelicense-receipt.json b/configs/pdf-service/data-config/tradelicense-receipt.json index 0ac26997..da919bc8 100644 --- a/configs/pdf-service/data-config/tradelicense-receipt.json +++ b/configs/pdf-service/data-config/tradelicense-receipt.json @@ -66,6 +66,18 @@ "module":"rainmaker-common" } }, + { + "variable": "renewalTradeFee", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'TL_RENEWAL_TAX')].amount" + } + }, + { + "variable": "newTradeFee", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'TL_TAX')].amount" + } + }, { "variable": "adhocRebate", "value": { @@ -419,7 +431,11 @@ { "variable": "pendingAmount", "formula": "{{dueAmount}}-{{paidAmount}}" - } + }, + { + "variable": "tradeFee", + "formula": "{{renewalTradeFee}}+{{newTradeFee}}" + } ] }, { diff --git a/configs/pdf-service/format-config/tradelicense-receipt.json b/configs/pdf-service/format-config/tradelicense-receipt.json index fa7b5aa4..427aa13a 100644 --- a/configs/pdf-service/format-config/tradelicense-receipt.json +++ b/configs/pdf-service/format-config/tradelicense-receipt.json @@ -393,10 +393,9 @@ ], "style": "receipt-table" } - ], - [ + ], [ { - "text": "{{paid_amount}}", + "text": "{{payment_mode}}", "border": [ true, false, @@ -406,7 +405,7 @@ "style": "receipt-table-value" }, { - "text": "₹ {{paidAmount}}", + "text": "{{paymentMode}}", "border": [ false, false, @@ -416,7 +415,7 @@ "style": "receipt-table" }, { - "text": "{{pending_amount}}", + "text": "{{paid_amount}}", "border": [ false, false, @@ -426,7 +425,7 @@ "style": "receipt-table-value" }, { - "text": "₹ {{pendingAmount}}", + "text": "₹ {{paidAmount}}", "border": [ false, false, @@ -438,7 +437,7 @@ ], [ { - "text": "Adhoc Rebate", + "text": "{{pending_amount}}", "border": [ true, false, @@ -448,7 +447,7 @@ "style": "receipt-table-value" }, { - "text": "₹ {{adhocRebate}}", + "text": "₹ {{pendingAmount}}", "border": [ false, false, @@ -458,7 +457,7 @@ "style": "receipt-table" }, { - "text": "Rebate Reason", + "text": "Trade License Fee", "border": [ false, false, @@ -468,7 +467,7 @@ "style": "receipt-table-value" }, { - "text": "{{adhocRebateReason}}", + "text": "₹ {{tradeFee}}", "border": [ false, false, @@ -480,7 +479,7 @@ ], [ { - "text": "Adhoc Penalty", + "text": "Adhoc Rebate", "border": [ true, false, @@ -490,7 +489,7 @@ "style": "receipt-table-value" }, { - "text": "₹ {{adhocPenalty}}", + "text": "₹ {{adhocRebate}}", "border": [ false, false, @@ -500,7 +499,7 @@ "style": "receipt-table" }, { - "text": "Penalty reason", + "text": "Rebate Reason", "border": [ false, false, @@ -510,7 +509,7 @@ "style": "receipt-table-value" }, { - "text": "{{adhocPenaltyReason}}", + "text": "{{adhocRebateReason}}", "border": [ false, false, @@ -522,7 +521,7 @@ ], [ { - "text": "Rebate Comments", + "text": "Adhoc Penalty", "border": [ true, false, @@ -532,7 +531,7 @@ "style": "receipt-table-value" }, { - "text": "{{rebateComments}}", + "text": "₹ {{adhocPenalty}}", "border": [ false, false, @@ -542,7 +541,7 @@ "style": "receipt-table" }, { - "text": "Penalty Comments", + "text": "Penalty reason", "border": [ false, false, @@ -552,7 +551,7 @@ "style": "receipt-table-value" }, { - "text": "{{penaltyComments}}", + "text": "{{adhocPenaltyReason}}", "border": [ false, false, @@ -564,7 +563,7 @@ ], [ { - "text": "{{payment_mode}}", + "text": "Rebate Comments", "border": [ true, false, @@ -574,7 +573,7 @@ "style": "receipt-table-value" }, { - "text": "{{paymentMode}}", + "text": "{{rebateComments}}", "border": [ false, false, @@ -584,7 +583,7 @@ "style": "receipt-table" }, { - "text": " ", + "text": "Penalty Comments", "border": [ false, false, @@ -594,7 +593,7 @@ "style": "receipt-table-value" }, { - "text": " ", + "text": "{{penaltyComments}}", "border": [ false, false, From b6436a172909a7e1ff99c1df2ec6d2bdef2355c7 Mon Sep 17 00:00:00 2001 From: Abhilashegov <35691559+Abhilashegov@users.noreply.github.com> Date: Fri, 20 Nov 2020 16:55:43 +0530 Subject: [PATCH 0436/1242] changed the topic name for migration --- configs/egov-indexer/property-services-migration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-indexer/property-services-migration.yml b/configs/egov-indexer/property-services-migration.yml index 2195e4d3..e22ad257 100644 --- a/configs/egov-indexer/property-services-migration.yml +++ b/configs/egov-indexer/property-services-migration.yml @@ -2,7 +2,7 @@ ServiceMaps: serviceName: Property Tax - rainmaker version: 1.0.0 mappings: - - topic: save-property-registry + - topic: save-property-registry-batch configKey: INDEX indexes: - name: property-services From 4886fc69d97fe968173a288822f81f3a4a3ae4e9 Mon Sep 17 00:00:00 2001 From: Abhilashegov <35691559+Abhilashegov@users.noreply.github.com> Date: Fri, 20 Nov 2020 18:21:18 +0530 Subject: [PATCH 0437/1242] Changed topic name for assmt mrgtion --- configs/egov-indexer/property-services-migration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-indexer/property-services-migration.yml b/configs/egov-indexer/property-services-migration.yml index e22ad257..dc720213 100644 --- a/configs/egov-indexer/property-services-migration.yml +++ b/configs/egov-indexer/property-services-migration.yml @@ -95,7 +95,7 @@ ServiceMaps: - inJsonPath: $.MdmsRes.PropertyTax.UsageCategory[0].name outJsonPath: $.Data.usageCategory - - topic: save-pt-assessment + - topic: save-pt-assessment-batch configKey: INDEX indexes: - name: property-assessments From bc3cd53f978dea244d16b388f06ee49684689696 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 23 Nov 2020 13:08:58 +0530 Subject: [PATCH 0438/1242] Hard coded Encrypted values updated --- configs/reports/configs/pt-reports.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 1f19c146..7e301d73 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -215,7 +215,7 @@ ReportDefinitions: to_char((To_timestamp(rh.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, Initcap(COALESCE(pt_detail.usagecategoryminor, pt_detail.usagecategorymajor)) as usagetype, manualreceiptnumber as g8receiptno, - (case when eg_user.name is null then '721995|Jit/FZQHkmU8SNc06DKOhEnWXXfadQ==' else eg_user.name end) as collectorname, + (case when eg_user.name is null then '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' else eg_user.name end) as collectorname, pt_detail.additionaldetails->>'remarks' as "remarks" FROM egcl_receiptheader_v1 AS rh JOIN egcl_receiptinstrument_v1 AS ri ON rh.id = ri.receiptheader @@ -1623,7 +1623,7 @@ ReportDefinitions: to_char((To_timestamp(rh.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, Initcap(COALESCE(pt_detail.usagecategoryminor, pt_detail.usagecategorymajor)) as usagetype, manualreceiptnumber as g8receiptno, - (case when eg_user.name is null then '721995|Jit/FZQHkmU8SNc06DKOhEnWXXfadQ==' else eg_user.name end) as collectorname, + (case when eg_user.name is null then '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' else eg_user.name end) as collectorname, pt_detail.additionaldetails->>'remarks' as "remarks" FROM egcl_receiptheader_v1 AS rh JOIN egcl_receiptinstrument_v1 AS ri ON rh.id = ri.receiptheader @@ -2493,7 +2493,7 @@ ReportDefinitions: to_char((To_timestamp(payment.transactiondate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, pd.due AS pendingamount, Initcap(case when pt.usagecategory like '%.%' then split_part(pt.usagecategory,'.',2) else pt.usagecategory end) as usagetype, - (CASE WHEN billd.collectiontype='COUNTER' THEN eg_user.name ELSE '721995|Jit/FZQHkmU8SNc06DKOhEnWXXfadQ==' END) as collectorname, + (CASE WHEN billd.collectiontype='COUNTER' THEN eg_user.name ELSE '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' END) as collectorname, receipt_breakup.*, to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, manualreceiptnumber as g8receiptno, @@ -2758,7 +2758,7 @@ ReportDefinitions: to_char((To_timestamp(payment.transactiondate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, pd.due AS pendingamount, Initcap(case when pt.usagecategory like '%.%' then split_part(pt.usagecategory,'.',2) else pt.usagecategory end) as usagetype, - (CASE WHEN billd.collectiontype='COUNTER' THEN eg_user.name ELSE '721995|Jit/FZQHkmU8SNc06DKOhEnWXXfadQ==' END) as collectorname, + (CASE WHEN billd.collectiontype='COUNTER' THEN eg_user.name ELSE '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' END) as collectorname, receipt_breakup.*, to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, manualreceiptnumber as g8receiptno, payment.paymentstatus as paystatus @@ -3061,7 +3061,7 @@ ReportDefinitions: payment.paymentmode as instrumenttype, payment.transactionnumber as transactionnumber, concat(to_char((To_timestamp(bd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(bd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY')) AS financialyear, - (case when eg_user.name is null then '721995|Jit/FZQHkmU8SNc06DKOhEnWXXfadQ==' else eg_user.name end) as collectorname, + (case when eg_user.name is null then '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' else eg_user.name end) as collectorname, --receipt_breakup.*, to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, manualreceiptnumber as g8receiptno, @@ -3503,7 +3503,7 @@ ReportDefinitions: to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, Initcap(COALESCE(pt_detail.usagecategoryminor, pt_detail.usagecategorymajor)) as usagetype, manualreceiptnumber as g8receiptno, - (CASE WHEN collectiontype='COUNTER' THEN eg_user.name ELSE '721995|Jit/FZQHkmU8SNc06DKOhEnWXXfadQ==' END) as collectorname, + (CASE WHEN collectiontype='COUNTER' THEN eg_user.name ELSE '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' END) as collectorname, pt_detail.additionaldetails->>'remarks' as "remarks" FROM egcl_bill AS bill INNER JOIN egcl_billdetial as bd on bd.billid = bill.id @@ -3660,7 +3660,7 @@ ReportDefinitions: sum(case when payment.paymentmode='CHEQUE' then bad.adjustedamount else 0 end) as sumcheque, count (distinct case when payment.paymentmode='CHEQUE' then concat(payment.paymentmode) end) as countcheque, sum(case when payment.paymentmode='ONLINE' then bad.adjustedamount else 0 end) as sumonline, - (CASE WHEN collectiontype='COUNTER' THEN eg_user.name ELSE '721995|Jit/FZQHkmU8SNc06DKOhEnWXXfadQ==' END) as collectorname, --for Online collecion show null as collectorname + (CASE WHEN collectiontype='COUNTER' THEN eg_user.name ELSE '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' END) as collectorname, --for Online collecion show None as collectorname sum(adjustedamount) as totalamount FROM egcl_billaccountdetail as bad INNER JOIN egcl_billdetial as bd on bd.id = bad.billdetailid From a0b72512fe40d8e08be784b9a249e2191a0d1b39 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 23 Nov 2020 13:09:54 +0530 Subject: [PATCH 0439/1242] Hard coded encrypted values updated --- configs/reports/configs/tl-reports.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/tl-reports.yml b/configs/reports/configs/tl-reports.yml index dd742e73..9ade15e5 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -135,7 +135,7 @@ ReportDefinitions: amount as totalamount, To_char((To_timestamp(receipt.manualreceiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') AS g8issuedate, receipt.manualreceiptnumber as g8receiptno, - (CASE WHEN collectiontype='COUNTER' THEN eg_user.name ELSE '721995|Jit/FZQHkmU8SNc06DKOhEnWXXfadQ==' END) as collectorname --value for Online + (CASE WHEN collectiontype='COUNTER' THEN eg_user.name ELSE '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' END) as collectorname --value for Online FROM eg_tl_tradelicense tl INNER JOIN eg_tl_tradelicensedetail tld ON tld.tradelicenseid = tl.id @@ -1353,7 +1353,7 @@ ReportDefinitions: payment.totalamountpaid as totalamount, --amount as totalamount, To_char((To_timestamp(egcl_paymentdetail.manualreceiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') AS g8issuedate, egcl_paymentdetail.manualreceiptnumber as g8receiptno, - (CASE WHEN paymentmode!='ONLINE' THEN eg_user.name ELSE '721995|Jit/FZQHkmU8SNc06DKOhEnWXXfadQ==' END) as collectorname + (CASE WHEN paymentmode!='ONLINE' THEN eg_user.name ELSE '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' END) as collectorname FROM eg_tl_tradelicense tl INNER JOIN eg_tl_tradelicensedetail tld ON tld.tradelicenseid = tl.id INNER JOIN ( From a61743d6af5dcce22fbca2bda722d69d37c1eba7 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 23 Nov 2020 13:10:45 +0530 Subject: [PATCH 0440/1242] Hard coded encrypted values updated --- configs/reports/configs/uc-reports.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/uc-reports.yml b/configs/reports/configs/uc-reports.yml index 58653976..4557ea35 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -1594,7 +1594,7 @@ ReportDefinitions: (case when paymentmode like 'CASH' then '' else transactionnumber end) as ddorchequenumber, (case when paymentmode like 'DD' or paymentmode like 'CHEQUE' then To_char((To_timestamp(payment.transactiondate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') else '' end) as ddchequedate, 'System' as collectiontype, - (case when eg_user.name is null then '721995|Jit/FZQHkmU8SNc06DKOhEnWXXfadQ==' else eg_user.name end) as collectorname + (case when eg_user.name is null then '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' else eg_user.name end) as collectorname FROM egcl_payment AS payment JOIN egcl_paymentdetail as paydetail on paydetail.paymentid=payment.id JOIN receipt_breakup ON paydetail.billid = receipt_breakup.bill_id @@ -1675,7 +1675,7 @@ ReportDefinitions: To_char((To_timestamp(paydetail.receiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as receiptdate, paydetail.businessservice as servicecategory, payment.totalamountpaid as amount, - (case when eg_user.name is null then '721995|Jit/FZQHkmU8SNc06DKOhEnWXXfadQ==' else eg_user.name end) as collectorname, + (case when eg_user.name is null then '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' else eg_user.name end) as collectorname, payment.additionaldetails->>'comment' as remarks FROM egcl_payment AS payment INNER JOIN egcl_paymentdetail as paydetail on paydetail.paymentid=payment.id From b55cc5524d4c3d1e2f4d4040306e0e89ce647599 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 23 Nov 2020 13:12:05 +0530 Subject: [PATCH 0441/1242] Hard Coded encrypted values updated --- configs/reports/configs/pgr-reports.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/reports/configs/pgr-reports.yml b/configs/reports/configs/pgr-reports.yml index 01eecc46..dfaa4e4d 100644 --- a/configs/reports/configs/pgr-reports.yml +++ b/configs/reports/configs/pgr-reports.yml @@ -1060,13 +1060,13 @@ ReportDefinitions: query: | SELECT DISTINCT ON (servicerequestid) - (case when ua.name is null then '721995|PCtyD4kL8cT1K/SqWCPDDLhr8n3vdfJ1R9s=' else ua.name end) as lastassignedto, --value for Unassigned + (case when ua.name is null then '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' else ua.name end) as lastassignedto, --value for Unassigned (SELECT deptmap_def.name FROM (VALUES tbl_def_dept) AS deptmap_def(name,code) INNER JOIN (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) on deptmap.serviceCode = eg_pgr_service.servicecode and deptmap_def.code = deptmap.department) AS department, regexp_replace(servicecode, '([a-z])([A-Z])', '\1 \2','g') AS servicecode, (SELECT boundary_def.name FROM (VALUES tbl_boundary) AS boundary_def(name,code) where code=eg_pgr_address.mohalla) as locality, servicerequestid AS complaintNo, to_char(to_timestamp(TRUNC(CAST(eg_pgr_service.createdtime AS bigint) / 1000)), 'DD/MM/YYYY') AS date, - (case when eg_user.name is null then '721995|JxBfMOBlJR+m/IMM/1eQwdVYJkI=' else eg_user.name end) as name, --value for NULL + (case when eg_user.name is null then '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' else eg_user.name end) as name, --value for NULL phone, eg_pgr_address.landmark, eg_pgr_address.housenoandstreetname as address, @@ -1640,7 +1640,7 @@ ReportDefinitions: where tenantid = $tenantid) select - coalesce((select name from eg_user where id::varchar = assignee),'721995|JxBfMOBlJR+m/IMM/1eQwdVYJkI=') as employee, -- encrypted value for NULL + coalesce((select name from eg_user where id::varchar = assignee),'30048|23/xn3x2FAxn8vYAN0IdplsOxaE=') as employee, -- encrypted value for NULL SUM (CASE WHEN status in ('rejected') THEN 1 ELSE 0 END) as rejected, SUM (CASE WHEN status in ('closed', 'resolved') THEN 1 ELSE 0 END) as resolved, SUM (CASE WHEN status in ('closed', 'resolved') and (resolvedtime - opentime) >= 14 * 86400 * 1000 THEN 1 ELSE 0 END) as resolvedoutsidesla, From b4660d0ee0769be23defa155c4b1ca229f330f25 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 23 Nov 2020 14:37:08 +0530 Subject: [PATCH 0442/1242] comments fetched from billd.additionaldetails --- configs/reports/configs/uc-reports.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/uc-reports.yml b/configs/reports/configs/uc-reports.yml index 4557ea35..8e4cd47c 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -1146,7 +1146,7 @@ ReportDefinitions: (case when paymentmode like 'DD' or paymentmode like 'CHEQUE' then To_char((To_timestamp(payment.transactiondate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') else '' end) as ddchequedate, 'System' as collectiontype, eg_user.name as collectorname, - payment.additionaldetails->>'comment' as remarks + billd.additionaldetails->>'comment' as remarks FROM egcl_payment AS payment JOIN egcl_paymentdetail as paydetail on paydetail.paymentid=payment.id JOIN receipt_breakup ON paydetail.billid = receipt_breakup.bill_id @@ -1676,7 +1676,7 @@ ReportDefinitions: paydetail.businessservice as servicecategory, payment.totalamountpaid as amount, (case when eg_user.name is null then '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' else eg_user.name end) as collectorname, - payment.additionaldetails->>'comment' as remarks + billd.additionaldetails->>'comment' as remarks FROM egcl_payment AS payment INNER JOIN egcl_paymentdetail as paydetail on paydetail.paymentid=payment.id INNER JOIN egcl_billdetial as billd on billd.billid=paydetail.billid From 63a5823a01b9b108d6acd1db6c0e4b11112d1356 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Mon, 23 Nov 2020 14:40:05 +0530 Subject: [PATCH 0443/1242] changes dor multiple owners --- configs/pdf-service/data-config/tlrenewalcertificate.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/pdf-service/data-config/tlrenewalcertificate.json b/configs/pdf-service/data-config/tlrenewalcertificate.json index 6c7bc610..2cd370ed 100644 --- a/configs/pdf-service/data-config/tlrenewalcertificate.json +++ b/configs/pdf-service/data-config/tlrenewalcertificate.json @@ -211,8 +211,8 @@ }, { "variable": "variable_owners", - "value": "$.tradeLicenseDetail.owners[?(@.active== true && @.userActive== true)]", - "type":"array", + "value": {"path":"$.tradeLicenseDetail.owners[?(@.active== true && @.userActive== true)]"}, + "type":"array", "format":{ "type":"string", "scema":[ From 4126737459005e03334a4dff90f670c83caad367 Mon Sep 17 00:00:00 2001 From: egovmis Date: Wed, 25 Nov 2020 10:48:46 +0530 Subject: [PATCH 0444/1242] fix for assessment year on PT receipt --- configs/pdf-service/data-config/property-receipt.json | 5 +++++ configs/pdf-service/format-config/property-receipt.json | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index 4eaa19a3..de586d51 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -60,6 +60,11 @@ "value": { "path": "$.totalAmountPaid" } + }, { + "variable": "assessmentYear", + "value": { + "path": "$.additionalDetails.assessmentYears" + } }, { "variable": "fromPeriod", diff --git a/configs/pdf-service/format-config/property-receipt.json b/configs/pdf-service/format-config/property-receipt.json index b0b43860..22fcd4c8 100644 --- a/configs/pdf-service/format-config/property-receipt.json +++ b/configs/pdf-service/format-config/property-receipt.json @@ -144,7 +144,7 @@ "style": "receipt-table-value" }, { - "text": "{{assessmentYear1}}-{{assessmentYear2}}", + "text": "{{assessmentYear}}", "border": [ false, false, From 1c5fad5cd5d919e0590e68ea285dbe08a3e40142 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 25 Nov 2020 11:00:21 +0530 Subject: [PATCH 0445/1242] shown receipt register for tenants except testing As $tenantid correspond to one tenant (logged in one) and one tenant in firenoc may be serving many other tenants. therefore reports should be shown for all tenants. Quick fixed for all because only batala is live and serving 4 tenants like Qaudian, Hargobindpura, batala etc --- configs/reports/configs/rainmaker-noc-reports.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/rainmaker-noc-reports.yml b/configs/reports/configs/rainmaker-noc-reports.yml index 3add36f0..a241db58 100644 --- a/configs/reports/configs/rainmaker-noc-reports.yml +++ b/configs/reports/configs/rainmaker-noc-reports.yml @@ -683,7 +683,7 @@ ReportDefinitions: JOIN egcl_bill as bill ON bill.id=paydetail.billid JOIN eg_fn_firenocdetail AS fdet ON fdet.applicationnumber=bill.consumercode JOIN eg_fn_buidlings AS build ON build.firenocdetailsuuid=fdet.uuid - WHERE payment.tenantid!='pb.testing' AND paydetail.businessservice in ('FIRENOC') AND paydetail.receiptnumber NOT LIKE 'MP%' and paydetail.tenantid=$tenantid + WHERE payment.tenantid!='pb.testing' AND paydetail.businessservice in ('FIRENOC') AND paydetail.receiptnumber NOT LIKE 'MP%' and paydetail.tenantid!='pb.testing' orderby: ORDER BY paydetail.receiptdate DESC - reportName: CancelledReceiptRegisterFirenocReport_V2 @@ -817,6 +817,7 @@ ReportDefinitions: JOIN egcl_bill as bill ON bill.id=paydetail.billid JOIN eg_fn_firenocdetail AS fdet ON fdet.applicationnumber=bill.consumercode JOIN eg_fn_buidlings AS build ON build.firenocdetailsuuid=fdet.uuid - WHERE payment.tenantid!='pb.testing' and paydetail.businessservice not in ('PT','TL','UC') and payment.paymentstatus = 'CANCELLED' and paydetail.receiptnumber NOT LIKE 'MP%' and paydetail.tenantid=$tenantid + WHERE payment.tenantid!='pb.testing' and paydetail.businessservice not in ('PT','TL','UC') and payment.paymentstatus = 'CANCELLED' and paydetail.receiptnumber NOT LIKE 'MP%' + --and paydetail.tenantid=$tenantid orderby: ORDER BY paydetail.receiptdate DESC From ebef253fa372c947bc7ea365820eadf5e36b8ce9 Mon Sep 17 00:00:00 2001 From: egovmis Date: Wed, 25 Nov 2020 11:58:54 +0530 Subject: [PATCH 0446/1242] added table for property tax payments --- .../data-config/property-receipt.json | 74 ++++++++++++++++++- .../format-config/property-receipt.json | 60 +++++++++++++++ 2 files changed, 132 insertions(+), 2 deletions(-) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index de586d51..f1e7fda1 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -60,7 +60,8 @@ "value": { "path": "$.totalAmountPaid" } - }, { + }, + { "variable": "assessmentYear", "value": { "path": "$.additionalDetails.assessmentYears" @@ -472,7 +473,76 @@ "prefix": null, "module":"rainmaker-common" } - }, + }, { + "variable": "var_assessments", + "value":"$.paymentDetails[0].bill.billDetails.*", + "type":"array", + "format":{ + "type":"string", + "scema":[ + { + "variable":"ass_to", + "value":"toPeriod", + "type":"date", + "format":"YYYY" + }, { + "variable":"ass_from", + "value":"toPeriod", + "type":"date", + "format":"YYYY" + }, + { + "variable":"ass_interest", + "value":"billAccountDetails[?(@.taxHeadCode=='PT_TIME_INTEREST')].amount" + + }, { + "variable":"ass_time_penalty", + "value":"billAccountDetails[?(@.taxHeadCode=='PT_TIME_PENALTY')].amount" + + }, { + "variable":"ass_cancer_cess", + "value":"billAccountDetails[?(@.taxHeadCode=='PT_CANCER_CESS')].amount" + + }, { + "variable":"ass_fire_cess", + "value":"billAccountDetails[?(@.taxHeadCode=='PT_FIRE_CESS')].amount" + + }, { + "variable":"ass_tax", + "value":"billAccountDetails[?(@.taxHeadCode=='PT_TAX')].amount" + + }, { + "variable":"ass_adhoc_penalty", + "value":"billAccountDetails[?(@.taxHeadCode=='PT_ADHOC_PENALTY')].amount" + + }, { + "variable":"ass_adhoc_rebate", + "value":"billAccountDetails[?(@.taxHeadCode=='PT_ADHOC_REBATE')].amount" + + }, { + "variable":"ass_time_rebate", + "value":"billAccountDetails[?(@.taxHeadCode=='PT_TIME_REBATE')].amount" + + } , { + "variable":"ass_unit_usage_exemption", + "value":"billAccountDetails[?(@.taxHeadCode=='PT_UNIT_USAGE_EXEMPTION')].amount" + + }, { + "variable":"ass_owner_exemption", + "value":"billAccountDetails[?(@.taxHeadCode=='PT_OWNER_EXEMPTION')].amount" + + }, { + "variable":"ass_round_off", + "value":"billAccountDetails[?(@.taxHeadCode=='PT_ROUND_OFF')].amount" + + }, { + "variable":"ass_total", + "value":"amount" + + } + ] + } + }, { "variable": "disclamer", "value": { diff --git a/configs/pdf-service/format-config/property-receipt.json b/configs/pdf-service/format-config/property-receipt.json index 22fcd4c8..a42d6349 100644 --- a/configs/pdf-service/format-config/property-receipt.json +++ b/configs/pdf-service/format-config/property-receipt.json @@ -571,6 +571,66 @@ ] }, "layout":{} + }, { + "style": "next-noc-table", + "table": { + "widths": [ + + "9%","8%","6%","7%","7%","7%","9%","9%","8%","8%","7%","7%","*" + ], + "body": + [ + [ + { + "text": "Assessment Year", + "style": "receipt-table-value22" + },{ + "text": "Property Tax", + "style": "receipt-table-value22" + }, + { + "text": "Fire Cess", + "style": "receipt-table-value22" + }, + { + "text": "Cancer Cess", + "style": "receipt-table-value22" + }, + { + "text": "Penalty", + "style": "receipt-table-value22" + }, { + "text": "Rebate", + "style": "receipt-table-value22" + }, { + "text": "Interest", + "style": "receipt-table-value22" + }, { + "text": "Usage Exemption", + "style": "receipt-table-value22" + }, { + "text": "Special Category Exemption", + "style": "receipt-table-value22" + }, { + "text": "Adhoc Penalty", + "style": "receipt-table-value22" + }, { + "text": "Adhoc Rebate", + "style": "receipt-table-value22" + }, { + "text": "Round Off", + "style": "receipt-table-value22" + }, { + "text": "Total", + "style": "receipt-table-value22" + } + ], + "{{#var_assessments}}[{\"text\":\"{{ass_from}}-{{ass_to}}\",\"style\":\"receipt-table\"},{\"text\":\"{{ass_tax}}\",\"style\":\"receipt-table\"},{\"text\":\"{{ass_fire_cess}}\",\"style\":\"receipt-table\"},{\"text\":\"{{ass_cancer_cess}}\",\"style\":\"receipt-table\"},{\"text\":\"{{ass_time_penalty}}\",\"style\":\"receipt-table\"},{\"text\":\"{{ass_time_rebate}}\",\"style\":\"receipt-table\"},{\"text\":\"{{ass_time_interest}}\",\"style\":\"receipt-table\"},{\"text\":\"{{ass_unit_usage_exemption}}\",\"style\":\"receipt-table\"},{\"text\":\"{{ass_owner_exemption}}\",\"style\":\"receipt-table\"},{\"text\":\"{{ass_adhoc_penalty}}\",\"style\":\"receipt-table\"},{\"text\":\"{{ass_adhoc_rebate}}\",\"style\":\"receipt-table\"},{\"text\":\"{{ass_round_off}}\",\"style\":\"receipt-table\"},{\"text\":\"{{ass_total}}\",\"style\":\"receipt-table\"}]{{/var_floors}}" + ] + + + }, + "layout": {} }, { "text":"PAYMENT INFORMATION", From c201ed638576b9dc3ea5a800af66f5be2608ee39 Mon Sep 17 00:00:00 2001 From: egovmis Date: Wed, 25 Nov 2020 12:07:27 +0530 Subject: [PATCH 0447/1242] added path for variable in PT receipt --- .../data-config/property-receipt.json | 67 ++++++++++++------- 1 file changed, 41 insertions(+), 26 deletions(-) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index f1e7fda1..6f9dd89c 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -475,69 +475,84 @@ } }, { "variable": "var_assessments", - "value":"$.paymentDetails[0].bill.billDetails.*", + "value":{ + "path":"$.paymentDetails[0].bill.billDetails.*"}, "type":"array", "format":{ "type":"string", "scema":[ { "variable":"ass_to", - "value":"toPeriod", + "value":{ + "path":"toPeriod"}, "type":"date", "format":"YYYY" }, { "variable":"ass_from", - "value":"toPeriod", + "value":{ + "path":"fromPeriod"}, "type":"date", "format":"YYYY" }, { "variable":"ass_interest", - "value":"billAccountDetails[?(@.taxHeadCode=='PT_TIME_INTEREST')].amount" - + "value":{ + "path":"billAccountDetails[?(@.taxHeadCode=='PT_TIME_INTEREST')].amount" + } }, { "variable":"ass_time_penalty", - "value":"billAccountDetails[?(@.taxHeadCode=='PT_TIME_PENALTY')].amount" - + "value":{ + "path":"billAccountDetails[?(@.taxHeadCode=='PT_TIME_PENALTY')].amount" + } }, { "variable":"ass_cancer_cess", - "value":"billAccountDetails[?(@.taxHeadCode=='PT_CANCER_CESS')].amount" - + "value":{ + "path":"billAccountDetails[?(@.taxHeadCode=='PT_CANCER_CESS')].amount" + } }, { "variable":"ass_fire_cess", - "value":"billAccountDetails[?(@.taxHeadCode=='PT_FIRE_CESS')].amount" - + "value":{ + "path":"billAccountDetails[?(@.taxHeadCode=='PT_FIRE_CESS')].amount" + } }, { "variable":"ass_tax", - "value":"billAccountDetails[?(@.taxHeadCode=='PT_TAX')].amount" - + "value":{ + "path":"billAccountDetails[?(@.taxHeadCode=='PT_TAX')].amount" + } }, { "variable":"ass_adhoc_penalty", - "value":"billAccountDetails[?(@.taxHeadCode=='PT_ADHOC_PENALTY')].amount" - + "value":{ + "path":"billAccountDetails[?(@.taxHeadCode=='PT_ADHOC_PENALTY')].amount" + } }, { "variable":"ass_adhoc_rebate", - "value":"billAccountDetails[?(@.taxHeadCode=='PT_ADHOC_REBATE')].amount" - + "value":{ + "path":"billAccountDetails[?(@.taxHeadCode=='PT_ADHOC_REBATE')].amount" + } }, { "variable":"ass_time_rebate", - "value":"billAccountDetails[?(@.taxHeadCode=='PT_TIME_REBATE')].amount" - + "value":{ + "path":"billAccountDetails[?(@.taxHeadCode=='PT_TIME_REBATE')].amount" + } } , { "variable":"ass_unit_usage_exemption", - "value":"billAccountDetails[?(@.taxHeadCode=='PT_UNIT_USAGE_EXEMPTION')].amount" - + "value":{ + "path":"billAccountDetails[?(@.taxHeadCode=='PT_UNIT_USAGE_EXEMPTION')].amount" + } }, { "variable":"ass_owner_exemption", - "value":"billAccountDetails[?(@.taxHeadCode=='PT_OWNER_EXEMPTION')].amount" - + "value":{ + "path":"billAccountDetails[?(@.taxHeadCode=='PT_OWNER_EXEMPTION')].amount" + } }, { "variable":"ass_round_off", - "value":"billAccountDetails[?(@.taxHeadCode=='PT_ROUND_OFF')].amount" - + "value":{ + "path":"billAccountDetails[?(@.taxHeadCode=='PT_ROUND_OFF')].amount" + } }, { "variable":"ass_total", - "value":"amount" + "value":{ + "path":"amount"} } ] From 35731e605570d99ec2a288349ddf5c7a600c4378 Mon Sep 17 00:00:00 2001 From: egovmis Date: Wed, 25 Nov 2020 12:13:15 +0530 Subject: [PATCH 0448/1242] added path for variable in PT receipt --- configs/pdf-service/data-config/property-receipt.json | 3 ++- configs/pdf-service/format-config/property-receipt.json | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index 6f9dd89c..cc2003b6 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -473,7 +473,8 @@ "prefix": null, "module":"rainmaker-common" } - }, { + }, + { "variable": "var_assessments", "value":{ "path":"$.paymentDetails[0].bill.billDetails.*"}, diff --git a/configs/pdf-service/format-config/property-receipt.json b/configs/pdf-service/format-config/property-receipt.json index a42d6349..7a82085d 100644 --- a/configs/pdf-service/format-config/property-receipt.json +++ b/configs/pdf-service/format-config/property-receipt.json @@ -625,7 +625,7 @@ "style": "receipt-table-value22" } ], - "{{#var_assessments}}[{\"text\":\"{{ass_from}}-{{ass_to}}\",\"style\":\"receipt-table\"},{\"text\":\"{{ass_tax}}\",\"style\":\"receipt-table\"},{\"text\":\"{{ass_fire_cess}}\",\"style\":\"receipt-table\"},{\"text\":\"{{ass_cancer_cess}}\",\"style\":\"receipt-table\"},{\"text\":\"{{ass_time_penalty}}\",\"style\":\"receipt-table\"},{\"text\":\"{{ass_time_rebate}}\",\"style\":\"receipt-table\"},{\"text\":\"{{ass_time_interest}}\",\"style\":\"receipt-table\"},{\"text\":\"{{ass_unit_usage_exemption}}\",\"style\":\"receipt-table\"},{\"text\":\"{{ass_owner_exemption}}\",\"style\":\"receipt-table\"},{\"text\":\"{{ass_adhoc_penalty}}\",\"style\":\"receipt-table\"},{\"text\":\"{{ass_adhoc_rebate}}\",\"style\":\"receipt-table\"},{\"text\":\"{{ass_round_off}}\",\"style\":\"receipt-table\"},{\"text\":\"{{ass_total}}\",\"style\":\"receipt-table\"}]{{/var_floors}}" + "{{#var_assessments}}[{\"text\":\"{{ass_from}}-{{ass_to}}\",\"style\":\"receipt-table\"},{\"text\":\"{{ass_tax}}\",\"style\":\"receipt-table\"},{\"text\":\"{{ass_fire_cess}}\",\"style\":\"receipt-table\"},{\"text\":\"{{ass_cancer_cess}}\",\"style\":\"receipt-table\"},{\"text\":\"{{ass_time_penalty}}\",\"style\":\"receipt-table\"},{\"text\":\"{{ass_time_rebate}}\",\"style\":\"receipt-table\"},{\"text\":\"{{ass_time_interest}}\",\"style\":\"receipt-table\"},{\"text\":\"{{ass_unit_usage_exemption}}\",\"style\":\"receipt-table\"},{\"text\":\"{{ass_owner_exemption}}\",\"style\":\"receipt-table\"},{\"text\":\"{{ass_adhoc_penalty}}\",\"style\":\"receipt-table\"},{\"text\":\"{{ass_adhoc_rebate}}\",\"style\":\"receipt-table\"},{\"text\":\"{{ass_round_off}}\",\"style\":\"receipt-table\"},{\"text\":\"{{ass_total}}\",\"style\":\"receipt-table\"}]{{/var_assessments}}" ] From 0589537d22131020a5d70c67adb22494447d64a8 Mon Sep 17 00:00:00 2001 From: egovmis Date: Wed, 25 Nov 2020 12:26:58 +0530 Subject: [PATCH 0449/1242] changes for pt payable table --- .../data-config/property-receipt.json | 71 ++++++++----------- .../format-config/property-receipt.json | 2 +- 2 files changed, 29 insertions(+), 44 deletions(-) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index cc2003b6..a2809e10 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -473,87 +473,72 @@ "prefix": null, "module":"rainmaker-common" } - }, - { + }, { "variable": "var_assessments", "value":{ - "path":"$.paymentDetails[0].bill.billDetails.*"}, + "path":"$.paymentDetails[0].bill.billDetails[?(@.amount>0)]"}, "type":"array", "format":{ "type":"string", "scema":[ { "variable":"ass_to", - "value":{ - "path":"toPeriod"}, + "value":"toPeriod", "type":"date", "format":"YYYY" }, { "variable":"ass_from", - "value":{ - "path":"fromPeriod"}, + "value":"fromPeriod", "type":"date", "format":"YYYY" }, { - "variable":"ass_interest", - "value":{ - "path":"billAccountDetails[?(@.taxHeadCode=='PT_TIME_INTEREST')].amount" - } + "variable":"ass_time_interest", + "value":"billAccountDetails[?(@.taxHeadCode=='PT_TIME_INTEREST')].amount" + }, { "variable":"ass_time_penalty", - "value":{ - "path":"billAccountDetails[?(@.taxHeadCode=='PT_TIME_PENALTY')].amount" - } + "value":"billAccountDetails[?(@.taxHeadCode=='PT_TIME_PENALTY')].amount" + }, { "variable":"ass_cancer_cess", - "value":{ - "path":"billAccountDetails[?(@.taxHeadCode=='PT_CANCER_CESS')].amount" - } + "value":"billAccountDetails[?(@.taxHeadCode=='PT_CANCER_CESS')].amount" + }, { "variable":"ass_fire_cess", - "value":{ - "path":"billAccountDetails[?(@.taxHeadCode=='PT_FIRE_CESS')].amount" - } + "value":"billAccountDetails[?(@.taxHeadCode=='PT_FIRE_CESS')].amount" + }, { "variable":"ass_tax", - "value":{ - "path":"billAccountDetails[?(@.taxHeadCode=='PT_TAX')].amount" - } + "value":"billAccountDetails[?(@.taxHeadCode=='PT_TAX')].amount" + }, { "variable":"ass_adhoc_penalty", - "value":{ - "path":"billAccountDetails[?(@.taxHeadCode=='PT_ADHOC_PENALTY')].amount" - } + "value":"billAccountDetails[?(@.taxHeadCode=='PT_ADHOC_PENALTY')].amount" + }, { "variable":"ass_adhoc_rebate", - "value":{ - "path":"billAccountDetails[?(@.taxHeadCode=='PT_ADHOC_REBATE')].amount" - } + "value":"billAccountDetails[?(@.taxHeadCode=='PT_ADHOC_REBATE')].amount" + }, { "variable":"ass_time_rebate", - "value":{ - "path":"billAccountDetails[?(@.taxHeadCode=='PT_TIME_REBATE')].amount" - } + "value":"billAccountDetails[?(@.taxHeadCode=='PT_TIME_REBATE')].amount" + } , { "variable":"ass_unit_usage_exemption", - "value":{ - "path":"billAccountDetails[?(@.taxHeadCode=='PT_UNIT_USAGE_EXEMPTION')].amount" - } + "value":"billAccountDetails[?(@.taxHeadCode=='PT_UNIT_USAGE_EXEMPTION')].amount" + }, { "variable":"ass_owner_exemption", - "value":{ - "path":"billAccountDetails[?(@.taxHeadCode=='PT_OWNER_EXEMPTION')].amount" - } + "value":"billAccountDetails[?(@.taxHeadCode=='PT_OWNER_EXEMPTION')].amount" + }, { "variable":"ass_round_off", - "value":{ - "path":"billAccountDetails[?(@.taxHeadCode=='PT_ROUND_OFF')].amount" - } + "value":"billAccountDetails[?(@.taxHeadCode=='PT_ROUND_OFF')].amount" + }, { "variable":"ass_total", - "value":{ - "path":"amount"} + "value":"amount" } ] diff --git a/configs/pdf-service/format-config/property-receipt.json b/configs/pdf-service/format-config/property-receipt.json index 7a82085d..66079541 100644 --- a/configs/pdf-service/format-config/property-receipt.json +++ b/configs/pdf-service/format-config/property-receipt.json @@ -576,7 +576,7 @@ "table": { "widths": [ - "9%","8%","6%","7%","7%","7%","9%","9%","8%","8%","7%","7%","*" + "10%","7%","6%","7%","8%","7%","7%","9%","10%","8%","7%","7%","*" ], "body": [ From 5fcdcd87dc2b8eecd795843c4bc0c233c9581aa6 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 25 Nov 2020 12:34:06 +0530 Subject: [PATCH 0450/1242] bank_name extracted from bank_branches and ifsc --- configs/reports/configs/uc-reports.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/uc-reports.yml b/configs/reports/configs/uc-reports.yml index 8e4cd47c..63a09cce 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -1135,8 +1135,8 @@ ReportDefinitions: To_char((To_timestamp(paydetail.receiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as receiptdate, To_char((To_timestamp(paydetail.manualreceiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as g8issuedate, paydetail.manualreceiptnumber as g8receiptno, - payment.ifsccode as bankname, - payment.ifsccode as branchname, + bank_branches.bank_name as bankname, + bank_branches.branch as branchname, payment.paymentstatus as status, businessservice as servicecategory, receipt_breakup.*, @@ -1152,6 +1152,7 @@ ReportDefinitions: JOIN receipt_breakup ON paydetail.billid = receipt_breakup.bill_id JOIN egcl_billdetial as billd on billd.billid=paydetail.billid JOIN eg_user ON payment.createdby::INTEGER=eg_user.id + LEFT OUTER JOIN bank_branches on bank_branches.ifsc=payment.ifsccode WHERE payment.tenantid=$tenantid AND businessservice not in ('PT','TL','FIRENOC') and payment.paymentstatus != 'CANCELLED' orderby: ORDER BY paydetail.receiptdate DESC From c432f3267a7355e3378b20966de9d6653e5d794b Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 25 Nov 2020 12:41:52 +0530 Subject: [PATCH 0451/1242] Query Correction fire --- configs/reports/configs/rainmaker-noc-reports.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/reports/configs/rainmaker-noc-reports.yml b/configs/reports/configs/rainmaker-noc-reports.yml index a241db58..66cf8c28 100644 --- a/configs/reports/configs/rainmaker-noc-reports.yml +++ b/configs/reports/configs/rainmaker-noc-reports.yml @@ -654,7 +654,7 @@ ReportDefinitions: egcl_billaccountdetail.billdetailid bill_id, string_agg(distinct consumercode,',') as consumercode FROM egcl_billaccountdetail - INNER JOIN egcl_bill as bill on bill.id = egcl_billaccountdetail.billdetailid + LEFT JOIN egcl_bill as bill on bill.id = egcl_billaccountdetail.billdetailid WHERE bill.tenantid!='pb.testing' AND businessservice in ('FIRENOC') GROUP BY billdetailid ) @@ -677,8 +677,8 @@ ReportDefinitions: fdet.applicationnumber as applicationnumber, build.name as ownername FROM egcl_payment AS payment - JOIN egcl_paymentdetail as paydetail on paydetail.paymentid=payment.id - JOIN receipt_breakup ON paydetail.billid = receipt_breakup.bill_id + LEFT JOIN egcl_paymentdetail as paydetail on paydetail.paymentid=payment.id + LEFT JOIN receipt_breakup ON paydetail.billid = receipt_breakup.bill_id JOIN eg_user ON payment.createdby::INTEGER=eg_user.id JOIN egcl_bill as bill ON bill.id=paydetail.billid JOIN eg_fn_firenocdetail AS fdet ON fdet.applicationnumber=bill.consumercode From 3830b5a0badd7ba1a222822489c940d04b2c70e1 Mon Sep 17 00:00:00 2001 From: egovmis Date: Wed, 25 Nov 2020 12:47:52 +0530 Subject: [PATCH 0452/1242] adjusted width for pt payable table --- .../data-config/property-receipt.json | 22 +++++++++---------- .../format-config/property-receipt.json | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index a2809e10..f550ef06 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -494,47 +494,47 @@ }, { "variable":"ass_time_interest", - "value":"billAccountDetails[?(@.taxHeadCode=='PT_TIME_INTEREST')].amount" + "value":{"path":"billAccountDetails[?(@.taxHeadCode=='PT_TIME_INTEREST')].amount"} }, { "variable":"ass_time_penalty", - "value":"billAccountDetails[?(@.taxHeadCode=='PT_TIME_PENALTY')].amount" + "value":{"path":"billAccountDetails[?(@.taxHeadCode=='PT_TIME_PENALTY')].amount"} }, { "variable":"ass_cancer_cess", - "value":"billAccountDetails[?(@.taxHeadCode=='PT_CANCER_CESS')].amount" + "value":{"path":"billAccountDetails[?(@.taxHeadCode=='PT_CANCER_CESS')].amount"} }, { "variable":"ass_fire_cess", - "value":"billAccountDetails[?(@.taxHeadCode=='PT_FIRE_CESS')].amount" + "value":{"path":"billAccountDetails[?(@.taxHeadCode=='PT_FIRE_CESS')].amount"} }, { "variable":"ass_tax", - "value":"billAccountDetails[?(@.taxHeadCode=='PT_TAX')].amount" + "value":{"path":"billAccountDetails[?(@.taxHeadCode=='PT_TAX')].amount"} }, { "variable":"ass_adhoc_penalty", - "value":"billAccountDetails[?(@.taxHeadCode=='PT_ADHOC_PENALTY')].amount" + "value":{"path":"billAccountDetails[?(@.taxHeadCode=='PT_ADHOC_PENALTY')].amount"} }, { "variable":"ass_adhoc_rebate", - "value":"billAccountDetails[?(@.taxHeadCode=='PT_ADHOC_REBATE')].amount" + "value":{"path":"billAccountDetails[?(@.taxHeadCode=='PT_ADHOC_REBATE')].amount"} }, { "variable":"ass_time_rebate", - "value":"billAccountDetails[?(@.taxHeadCode=='PT_TIME_REBATE')].amount" + "value":{"path":"billAccountDetails[?(@.taxHeadCode=='PT_TIME_REBATE')].amount"} } , { "variable":"ass_unit_usage_exemption", - "value":"billAccountDetails[?(@.taxHeadCode=='PT_UNIT_USAGE_EXEMPTION')].amount" + "value":{"path":"billAccountDetails[?(@.taxHeadCode=='PT_UNIT_USAGE_EXEMPTION')].amount"} }, { "variable":"ass_owner_exemption", - "value":"billAccountDetails[?(@.taxHeadCode=='PT_OWNER_EXEMPTION')].amount" + "value":{"path":"billAccountDetails[?(@.taxHeadCode=='PT_OWNER_EXEMPTION')].amount"} }, { "variable":"ass_round_off", - "value":"billAccountDetails[?(@.taxHeadCode=='PT_ROUND_OFF')].amount" + "value":{"path":"billAccountDetails[?(@.taxHeadCode=='PT_ROUND_OFF')].amount"} }, { "variable":"ass_total", diff --git a/configs/pdf-service/format-config/property-receipt.json b/configs/pdf-service/format-config/property-receipt.json index 66079541..53f779aa 100644 --- a/configs/pdf-service/format-config/property-receipt.json +++ b/configs/pdf-service/format-config/property-receipt.json @@ -576,7 +576,7 @@ "table": { "widths": [ - "10%","7%","6%","7%","8%","7%","7%","9%","10%","8%","7%","7%","*" + "10%","8%","6%","7%","8%","7%","8%","10%","10%","7%","7%","7%","*" ], "body": [ From 876648ad362e9d28f60d3563d8e90cb1ef924954 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 25 Nov 2020 12:54:58 +0530 Subject: [PATCH 0453/1242] query change --- configs/reports/configs/rainmaker-noc-reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/reports/configs/rainmaker-noc-reports.yml b/configs/reports/configs/rainmaker-noc-reports.yml index 66cf8c28..78e96ebf 100644 --- a/configs/reports/configs/rainmaker-noc-reports.yml +++ b/configs/reports/configs/rainmaker-noc-reports.yml @@ -683,7 +683,7 @@ ReportDefinitions: JOIN egcl_bill as bill ON bill.id=paydetail.billid JOIN eg_fn_firenocdetail AS fdet ON fdet.applicationnumber=bill.consumercode JOIN eg_fn_buidlings AS build ON build.firenocdetailsuuid=fdet.uuid - WHERE payment.tenantid!='pb.testing' AND paydetail.businessservice in ('FIRENOC') AND paydetail.receiptnumber NOT LIKE 'MP%' and paydetail.tenantid!='pb.testing' + WHERE payment.tenantid!='pb.testing' AND paydetail.businessservice in ('FIRENOC') AND paydetail.receiptnumber NOT LIKE 'MP%' and payment.tenantid = $tenantid orderby: ORDER BY paydetail.receiptdate DESC - reportName: CancelledReceiptRegisterFirenocReport_V2 From d3f1efa12b7a8a438280927cfa32c3bf09c178d7 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 25 Nov 2020 14:04:58 +0530 Subject: [PATCH 0454/1242] ZoneFY report added in for V2 --- configs/reports/configs/pt-reports.yml | 316 +++++++++++++++++++++++++ 1 file changed, 316 insertions(+) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 7e301d73..5fb3c82b 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -4006,3 +4006,319 @@ ReportDefinitions: where payd.tenantid = $tenantid and bill.consumercode not in (select consumercode from egcl_bill where tenantid=$tenantid and businessservice='PT' and id in (select billid from egcl_billdetial where tenantid=$tenantid and concat(to_char((To_timestamp(fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) ='2020-21')) and pt.status!='INACTIVE' + + +- reportName: ZoneFYReport_v2 + summary: Zone FY Collection Pt report + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: zonecode + label: reports.pt.zonename + type: string + source: pt + total: false + - name: 2013_14PTR + label: reports.pt.2013_14_PTR + type: string + source: pt + total: true + - name: 2013_14Collection + label: reports.pt.2013_14Collection + type: string + source: pt + total: true + - name: 2014_15PTR + label: reports.pt.2014_15_PTR + type: string + source: pt + total: true + - name: 2014_15Collection + label: reports.pt.2014_15Collection + type: string + source: pt + total: true + - name: 2015_16PTR + label: reports.pt.2015_16_PTR + type: string + source: pt + total: true + - name: 2015_16Collection + label: reports.pt.2015_16Collection + type: string + source: pt + total: true + - name: 2016_17PTR + label: reports.pt.2016_17_PTR + type: string + source: pt + total: true + - name: 2016_17Collection + label: reports.pt.2016_17Collection + type: string + source: pt + total: true + - name: 2017_18PTR + label: reports.pt.2017_18_PTR + type: string + source: pt + total: true + - name: 2017_18Collection + label: reports.pt.2017_18Collection + type: string + source: pt + total: true + - name: 2018_19PTR + label: reports.pt.2018_19_PTR + type: string + source: pt + total: true + - name: 2018_19Collection + label: reports.pt.2018_19Collection + type: string + source: pt + total: true + - name: 2019_20PTR + label: reports.pt.2019_20_PTR + type: string + source: pt + total: true + - name: 2019_20Collection + label: reports.pt.2019_20Collection + type: string + source: pt + total: true + - name: 2020_21PTR + label: reports.pt.2020_21_PTR + type: string + source: pt + total: true + - name: 2020_21Collection + label: reports.pt.2020_21Collection + type: string + source: pt + total: true + - name: totalptr + label: reports.pt.totalptr + type: string + source: pt + total: true + - name: totalcollection + label: reports.pt.totalcollection + type: string + source: pt + total: true + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: true + searchClause: AND 1=1 + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: true + searchClause: AND 1=1 + query: | + --S.no Service Name ULB Property Tax Unique ID Date Of Transcation Receipt Number Existing Property ID Type Of Property Mobile Number Address + with fy2013 as + ( + SELECT + zonecode, + string_agg(distinct zonename,',') as zonename, + string_agg(distinct concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')),',') AS "financialyear", + count(*) as totalptr, + sum(payment.totalamountpaid) as amountcollected + FROM egcl_paymentdetail AS pd + join egcl_payment as payment on payment.id = pd.paymentid + join egcl_bill as bill on bill.id = pd.billid + join egcl_billdetial as billd on billd.billid = bill.id + JOIN eg_pt_property pt ON pt.propertyid = bill.consumercode + inner JOIN eg_pt_address as pt_addr ON pt_addr.propertyid = pt.id + inner JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality + WHERE pd.tenantid = 'pb.amritsar' and payment.paymentstatus != 'CANCELLED' and pt.status!='INACTIVE' + and concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY'))='2013-14' + GROUP BY zonecode + + ), + fy2014 as + ( + SELECT + zonecode, + string_agg(distinct zonename,',') as zonename, + string_agg(distinct concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')),',') AS "financialyear", + count(*) as totalptr, + sum(payment.totalamountpaid) as amountcollected + FROM egcl_paymentdetail AS pd + join egcl_payment as payment on payment.id = pd.paymentid + join egcl_bill as bill on bill.id = pd.billid + join egcl_billdetial as billd on billd.billid = bill.id + JOIN eg_pt_property pt ON pt.propertyid = bill.consumercode + inner JOIN eg_pt_address as pt_addr ON pt_addr.propertyid = pt.id + inner JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality + WHERE pd.tenantid = 'pb.amritsar' and payment.paymentstatus != 'CANCELLED' and pt.status!='INACTIVE' + and concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY'))='2014-15' + GROUP BY zonecode + + ), + fy2015 as + ( + SELECT + zonecode, + string_agg(distinct zonename,',') as zonename, + string_agg(distinct concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')),',') AS "financialyear", + count(*) as totalptr, + sum(payment.totalamountpaid) as amountcollected + FROM egcl_paymentdetail AS pd + join egcl_payment as payment on payment.id = pd.paymentid + join egcl_bill as bill on bill.id = pd.billid + join egcl_billdetial as billd on billd.billid = bill.id + JOIN eg_pt_property pt ON pt.propertyid = bill.consumercode + inner JOIN eg_pt_address as pt_addr ON pt_addr.propertyid = pt.id + inner JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality + WHERE pd.tenantid = 'pb.amritsar' and payment.paymentstatus != 'CANCELLED' and pt.status!='INACTIVE' + and concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY'))='2015-16' + GROUP BY zonecode + + ), + fy2016 as + ( + SELECT + zonecode, + string_agg(distinct zonename,',') as zonename, + string_agg(distinct concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')),',') AS "financialyear", + count(*) as totalptr, + sum(payment.totalamountpaid) as amountcollected + FROM egcl_paymentdetail AS pd + join egcl_payment as payment on payment.id = pd.paymentid + join egcl_bill as bill on bill.id = pd.billid + join egcl_billdetial as billd on billd.billid = bill.id + JOIN eg_pt_property pt ON pt.propertyid = bill.consumercode + inner JOIN eg_pt_address as pt_addr ON pt_addr.propertyid = pt.id + inner JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality + WHERE pd.tenantid = 'pb.amritsar' and payment.paymentstatus != 'CANCELLED' and pt.status!='INACTIVE' + and concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY'))='2016-17' + GROUP BY zonecode + + + ), + fy2017 as + ( + SELECT + zonecode, + string_agg(distinct zonename,',') as zonename, + string_agg(distinct concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')),',') AS "financialyear", + count(*) as totalptr, + sum(payment.totalamountpaid) as amountcollected + FROM egcl_paymentdetail AS pd + join egcl_payment as payment on payment.id = pd.paymentid + join egcl_bill as bill on bill.id = pd.billid + join egcl_billdetial as billd on billd.billid = bill.id + JOIN eg_pt_property pt ON pt.propertyid = bill.consumercode + inner JOIN eg_pt_address as pt_addr ON pt_addr.propertyid = pt.id + inner JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality + WHERE pd.tenantid = 'pb.amritsar' and payment.paymentstatus != 'CANCELLED' and pt.status!='INACTIVE' + and concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY'))='2017-18' + GROUP BY zonecode + + ), + fy2018 as + ( + SELECT + zonecode, + string_agg(distinct zonename,',') as zonename, + string_agg(distinct concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')),',') AS "financialyear", + count(*) as totalptr, + sum(payment.totalamountpaid) as amountcollected + FROM egcl_paymentdetail AS pd + join egcl_payment as payment on payment.id = pd.paymentid + join egcl_bill as bill on bill.id = pd.billid + join egcl_billdetial as billd on billd.billid = bill.id + JOIN eg_pt_property pt ON pt.propertyid = bill.consumercode + inner JOIN eg_pt_address as pt_addr ON pt_addr.propertyid = pt.id + inner JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality + WHERE pd.tenantid = 'pb.amritsar' and payment.paymentstatus != 'CANCELLED' and pt.status!='INACTIVE' + and concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY'))='2018-19' + GROUP BY zonecode + + ), + fy2019 as + ( + SELECT + zonecode, + string_agg(distinct zonename,',') as zonename, + string_agg(distinct concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')),',') AS "financialyear", + count(*) as totalptr, + sum(payment.totalamountpaid) as amountcollected + FROM egcl_paymentdetail AS pd + join egcl_payment as payment on payment.id = pd.paymentid + join egcl_bill as bill on bill.id = pd.billid + join egcl_billdetial as billd on billd.billid = bill.id + JOIN eg_pt_property pt ON pt.propertyid = bill.consumercode + inner JOIN eg_pt_address as pt_addr ON pt_addr.propertyid = pt.id + inner JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality + WHERE pd.tenantid = 'pb.amritsar' and payment.paymentstatus != 'CANCELLED' and pt.status!='INACTIVE' + and concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY'))='2019-20' + GROUP BY zonecode + ), + fy2020 as + ( + SELECT + zonecode, + string_agg(distinct zonename,',') as zonename, + string_agg(distinct concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')),',') AS "financialyear", + count(*) as totalptr, + sum(payment.totalamountpaid) as amountcollected + FROM egcl_paymentdetail AS pd + join egcl_payment as payment on payment.id = pd.paymentid + join egcl_bill as bill on bill.id = pd.billid + join egcl_billdetial as billd on billd.billid = bill.id + JOIN eg_pt_property pt ON pt.propertyid = bill.consumercode + inner JOIN eg_pt_address as pt_addr ON pt_addr.propertyid = pt.id + inner JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality + WHERE pd.tenantid = 'pb.amritsar' and payment.paymentstatus != 'CANCELLED' and pt.status!='INACTIVE' + and concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY'))='2020-21' + GROUP BY zonecode + + + ), + zones as + ( + select distinct zonecode,string_agg(distinct zonename,',') as zname from eg_bndry_mohalla where tenantid='pb.amritsar' group by zonecode + ) + SELECT + zones.zonecode as zonecode, + zones.zname as zonename, + coalesce(fy2013.totalptr,0) as "2013_14PTR", + coalesce(fy2013.amountcollected,0) as "2013_14Collection", + coalesce(fy2014.totalptr,0) as "2014_15PTR", + coalesce(fy2014.amountcollected,0) as "2014_15Collection", + coalesce(fy2015.totalptr,0) as "2015_16PTR", + coalesce(fy2015.amountcollected,0) as "2015_16Collection", + coalesce(fy2016.totalptr,0) as "2016_17PTR", + coalesce(fy2016.amountcollected,0) as "2016_17Collection", + coalesce(fy2017.totalptr,0) as "2017_18PTR", + coalesce(fy2017.amountcollected,0) as "2017_18Collection", + coalesce(fy2018.totalptr,0) as "2018_19PTR", + coalesce(fy2018.amountcollected,0) as "2018_19Collection", + coalesce(fy2019.totalptr,0) as "2019_20PTR", + coalesce(fy2019.amountcollected,0) as "2019_20Collection", + coalesce(fy2020.totalptr,0) as "2020_21PTR", + coalesce(fy2020.amountcollected,0) as "2020_21Collection", + coalesce(fy2013.totalptr,0)+coalesce(fy2014.totalptr,0)+coalesce(fy2015.totalptr,0)+coalesce(fy2016.totalptr,0)+coalesce(fy2017.totalptr,0)+coalesce(fy2018.totalptr,0)+coalesce(fy2019.totalptr,0)+coalesce(fy2020.totalptr,0) as "totalptr", + coalesce(fy2013.amountcollected,0)+coalesce(fy2014.amountcollected,0)+coalesce(fy2015.amountcollected,0)+coalesce(fy2016.amountcollected,0)+coalesce(fy2017.amountcollected,0)+coalesce(fy2018.amountcollected,0)+coalesce(fy2019.amountcollected,0)+coalesce(fy2020.amountcollected,0) as "totalcollection" + from zones + left outer join fy2013 on fy2013.zonecode=zones.zonecode + left outer join fy2014 on fy2014.zonecode=zones.zonecode + left outer join fy2015 on fy2015.zonecode=zones.zonecode + left outer join fy2016 on fy2016.zonecode=zones.zonecode + left outer join fy2017 on fy2017.zonecode=zones.zonecode + left outer join fy2018 on fy2018.zonecode=zones.zonecode + left outer join fy2019 on fy2019.zonecode=zones.zonecode + left outer join fy2020 on fy2020.zonecode=zones.zonecode + where 1=1 + orderby: order by zonename + + From 0944939bec346c79a6f986267c6bba2977850fc9 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 25 Nov 2020 14:27:24 +0530 Subject: [PATCH 0455/1242] capital of V2 in zonefy report --- configs/reports/configs/pt-reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 5fb3c82b..5daea3ed 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -4008,7 +4008,7 @@ ReportDefinitions: and pt.status!='INACTIVE' -- reportName: ZoneFYReport_v2 +- reportName: ZoneFYReport_V2 summary: Zone FY Collection Pt report version: 1.0.0 moduleName: rainmaker-pt From 11029dfc905ffd796b63cc1ddfcb926939a75283 Mon Sep 17 00:00:00 2001 From: egovmis Date: Wed, 25 Nov 2020 14:46:16 +0530 Subject: [PATCH 0456/1242] changes for PT amount table --- .../pdf-service/data-config/property-receipt.json | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index f550ef06..63510d88 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -483,14 +483,11 @@ "scema":[ { "variable":"ass_to", - "value":"toPeriod", - "type":"date", - "format":"YYYY" - }, { + "value":"toPeriod" + }, + { "variable":"ass_from", - "value":"fromPeriod", - "type":"date", - "format":"YYYY" + "value":"fromPeriod" }, { "variable":"ass_time_interest", @@ -510,8 +507,7 @@ }, { "variable":"ass_tax", - "value":{"path":"billAccountDetails[?(@.taxHeadCode=='PT_TAX')].amount"} - + "value":"billAccountDetails[?(@.taxHeadCode=='PT_TAX')].amount" }, { "variable":"ass_adhoc_penalty", "value":{"path":"billAccountDetails[?(@.taxHeadCode=='PT_ADHOC_PENALTY')].amount"} From 6c7099fceae6d897a8837dac2f7bf933d61ff89b Mon Sep 17 00:00:00 2001 From: egovmis Date: Wed, 25 Nov 2020 14:53:40 +0530 Subject: [PATCH 0457/1242] changes for pt payable table --- .../data-config/property-receipt.json | 29 ++++++++++--------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index 63510d88..8784a56b 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -483,54 +483,57 @@ "scema":[ { "variable":"ass_to", - "value":"toPeriod" + "value":"toPeriod", + "type":"date" + }, { "variable":"ass_from", - "value":"fromPeriod" + "value":"fromPeriod", + "type":"date" }, { "variable":"ass_time_interest", - "value":{"path":"billAccountDetails[?(@.taxHeadCode=='PT_TIME_INTEREST')].amount"} + "value":{"path":"$.billAccountDetails[?(@.taxHeadCode=='PT_TIME_INTEREST')].amount"} }, { "variable":"ass_time_penalty", - "value":{"path":"billAccountDetails[?(@.taxHeadCode=='PT_TIME_PENALTY')].amount"} + "value":{"path":"$.billAccountDetails[?(@.taxHeadCode=='PT_TIME_PENALTY')].amount"} }, { "variable":"ass_cancer_cess", - "value":{"path":"billAccountDetails[?(@.taxHeadCode=='PT_CANCER_CESS')].amount"} + "value":{"path":"$.billAccountDetails[?(@.taxHeadCode=='PT_CANCER_CESS')].amount"} }, { "variable":"ass_fire_cess", - "value":{"path":"billAccountDetails[?(@.taxHeadCode=='PT_FIRE_CESS')].amount"} + "value":{"path":"$.billAccountDetails[?(@.taxHeadCode=='PT_FIRE_CESS')].amount"} }, { "variable":"ass_tax", - "value":"billAccountDetails[?(@.taxHeadCode=='PT_TAX')].amount" + "value":"$.billAccountDetails[?(@.taxHeadCode=='PT_TAX')].amount" }, { "variable":"ass_adhoc_penalty", - "value":{"path":"billAccountDetails[?(@.taxHeadCode=='PT_ADHOC_PENALTY')].amount"} + "value":{"path":"$.billAccountDetails[?(@.taxHeadCode=='PT_ADHOC_PENALTY')].amount"} }, { "variable":"ass_adhoc_rebate", - "value":{"path":"billAccountDetails[?(@.taxHeadCode=='PT_ADHOC_REBATE')].amount"} + "value":{"path":"$.billAccountDetails[?(@.taxHeadCode=='PT_ADHOC_REBATE')].amount"} }, { "variable":"ass_time_rebate", - "value":{"path":"billAccountDetails[?(@.taxHeadCode=='PT_TIME_REBATE')].amount"} + "value":{"path":"$.billAccountDetails[?(@.taxHeadCode=='PT_TIME_REBATE')].amount"} } , { "variable":"ass_unit_usage_exemption", - "value":{"path":"billAccountDetails[?(@.taxHeadCode=='PT_UNIT_USAGE_EXEMPTION')].amount"} + "value":{"path":"$.billAccountDetails[?(@.taxHeadCode=='PT_UNIT_USAGE_EXEMPTION')].amount"} }, { "variable":"ass_owner_exemption", - "value":{"path":"billAccountDetails[?(@.taxHeadCode=='PT_OWNER_EXEMPTION')].amount"} + "value":{"path":"$.billAccountDetails[?(@.taxHeadCode=='PT_OWNER_EXEMPTION')].amount"} }, { "variable":"ass_round_off", - "value":{"path":"billAccountDetails[?(@.taxHeadCode=='PT_ROUND_OFF')].amount"} + "value":{"path":"$.billAccountDetails[?(@.taxHeadCode=='PT_ROUND_OFF')].amount"} }, { "variable":"ass_total", From 6583e3cdee6fd060d479e303e73220b9ca6b3c36 Mon Sep 17 00:00:00 2001 From: egovmis Date: Wed, 25 Nov 2020 15:07:11 +0530 Subject: [PATCH 0458/1242] added path for variable in PT receipt --- .../data-config/property-receipt.json | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index 8784a56b..21ad65ca 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -483,7 +483,7 @@ "scema":[ { "variable":"ass_to", - "value":"toPeriod", + "value":{"path":"toPeriod"}, "type":"date" }, @@ -494,23 +494,23 @@ }, { "variable":"ass_time_interest", - "value":{"path":"$.billAccountDetails[?(@.taxHeadCode=='PT_TIME_INTEREST')].amount"} + "value":"$.billAccountDetails[7].amount" }, { "variable":"ass_time_penalty", - "value":{"path":"$.billAccountDetails[?(@.taxHeadCode=='PT_TIME_PENALTY')].amount"} + "value":"billAccountDetails[6].amount" }, { "variable":"ass_cancer_cess", - "value":{"path":"$.billAccountDetails[?(@.taxHeadCode=='PT_CANCER_CESS')].amount"} + "value":"$.billAccountDetails[5].amount" }, { "variable":"ass_fire_cess", - "value":{"path":"$.billAccountDetails[?(@.taxHeadCode=='PT_FIRE_CESS')].amount"} + "value":"$.billAccountDetails[4].amount" }, { "variable":"ass_tax", - "value":"$.billAccountDetails[?(@.taxHeadCode=='PT_TAX')].amount" + "value":"billAccountDetails[8].amount" }, { "variable":"ass_adhoc_penalty", "value":{"path":"$.billAccountDetails[?(@.taxHeadCode=='PT_ADHOC_PENALTY')].amount"} @@ -521,19 +521,19 @@ }, { "variable":"ass_time_rebate", - "value":{"path":"$.billAccountDetails[?(@.taxHeadCode=='PT_TIME_REBATE')].amount"} + "value":"billAccountDetails[3].amount" } , { "variable":"ass_unit_usage_exemption", - "value":{"path":"$.billAccountDetails[?(@.taxHeadCode=='PT_UNIT_USAGE_EXEMPTION')].amount"} + "value":"billAccountDetails[1].amount" }, { "variable":"ass_owner_exemption", - "value":{"path":"$.billAccountDetails[?(@.taxHeadCode=='PT_OWNER_EXEMPTION')].amount"} + "value":"billAccountDetails[2].amount" }, { "variable":"ass_round_off", - "value":{"path":"$.billAccountDetails[?(@.taxHeadCode=='PT_ROUND_OFF')].amount"} + "value":"billAccountDetails[0].amount" }, { "variable":"ass_total", From 4fe408160b4f021a1a1d6be6359cee20f8aab094 Mon Sep 17 00:00:00 2001 From: egovmis Date: Wed, 25 Nov 2020 15:14:57 +0530 Subject: [PATCH 0459/1242] added path for variable in PT receipt --- configs/pdf-service/data-config/property-receipt.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index 21ad65ca..3a606563 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -479,7 +479,7 @@ "path":"$.paymentDetails[0].bill.billDetails[?(@.amount>0)]"}, "type":"array", "format":{ - "type":"string", + "scema":[ { "variable":"ass_to", @@ -494,19 +494,19 @@ }, { "variable":"ass_time_interest", - "value":"$.billAccountDetails[7].amount" + "value":"billAccountDetails[6].amount" }, { "variable":"ass_time_penalty", - "value":"billAccountDetails[6].amount" + "value":"billAccountDetails[7].amount" }, { "variable":"ass_cancer_cess", - "value":"$.billAccountDetails[5].amount" + "value":"billAccountDetails[5].amount" }, { "variable":"ass_fire_cess", - "value":"$.billAccountDetails[4].amount" + "value":"billAccountDetails[4].amount" }, { "variable":"ass_tax", From 89ce260e69f3dcbb0aac6bb5e13a405f2b763d41 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 25 Nov 2020 15:31:34 +0530 Subject: [PATCH 0460/1242] Areatype added in firenoc --- configs/reports/configs/rainmaker-noc-reports.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/reports/configs/rainmaker-noc-reports.yml b/configs/reports/configs/rainmaker-noc-reports.yml index 78e96ebf..56441f89 100644 --- a/configs/reports/configs/rainmaker-noc-reports.yml +++ b/configs/reports/configs/rainmaker-noc-reports.yml @@ -674,6 +674,7 @@ ReportDefinitions: eg_user.name as collectorname, fdet.firenoctype as firenoctype, build.usagetype as usagetype, + fad.areatype as areatype, fdet.applicationnumber as applicationnumber, build.name as ownername FROM egcl_payment AS payment @@ -683,6 +684,7 @@ ReportDefinitions: JOIN egcl_bill as bill ON bill.id=paydetail.billid JOIN eg_fn_firenocdetail AS fdet ON fdet.applicationnumber=bill.consumercode JOIN eg_fn_buidlings AS build ON build.firenocdetailsuuid=fdet.uuid + INNER JOIN eg_fn_address as fad on fad.firenocdetailsuuid=fdet.uuid WHERE payment.tenantid!='pb.testing' AND paydetail.businessservice in ('FIRENOC') AND paydetail.receiptnumber NOT LIKE 'MP%' and payment.tenantid = $tenantid orderby: ORDER BY paydetail.receiptdate DESC From 6b57fa31928e88cc9977a9c01953d04cc82d0c30 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 25 Nov 2020 16:09:22 +0530 Subject: [PATCH 0461/1242] Area type added in fire register --- configs/reports/configs/rainmaker-noc-reports.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/configs/reports/configs/rainmaker-noc-reports.yml b/configs/reports/configs/rainmaker-noc-reports.yml index 56441f89..3bc40580 100644 --- a/configs/reports/configs/rainmaker-noc-reports.yml +++ b/configs/reports/configs/rainmaker-noc-reports.yml @@ -611,6 +611,11 @@ ReportDefinitions: type: string source: rainmaker-noc total: false + - name: areatype + label: reports.noc.areatype + type: string + source: rainmaker-noc + total: false - name: ownername label: reports.noc.ownername type: string From 39cd72de99fb8fa35ef611c167e59ded2e2a04b9 Mon Sep 17 00:00:00 2001 From: egovmis Date: Wed, 25 Nov 2020 16:09:41 +0530 Subject: [PATCH 0462/1242] added path for variable in PT receipt --- .../data-config/property-receipt.json | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index 3a606563..6f00c483 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -476,7 +476,7 @@ }, { "variable": "var_assessments", "value":{ - "path":"$.paymentDetails[0].bill.billDetails[?(@.amount>0)]"}, + "path":"$.paymentDetails[0].bill.billDetails.*.billAccountDetails[?(@.taxHeadCode=='PT_TAX')].amount>0"}, "type":"array", "format":{ @@ -494,23 +494,23 @@ }, { "variable":"ass_time_interest", - "value":"billAccountDetails[6].amount" + "value":"billAccountDetails[?(@.taxHeadCode=='PT_TIME_INTEREST')].amount" }, { "variable":"ass_time_penalty", - "value":"billAccountDetails[7].amount" + "value":"billAccountDetails[?(@.taxHeadCode=='PT_TIME_PENALTY')].amount" }, { "variable":"ass_cancer_cess", - "value":"billAccountDetails[5].amount" + "value":"billAccountDetails[?(@.taxHeadCode=='PT_CANCER_CESS')].amount" }, { "variable":"ass_fire_cess", - "value":"billAccountDetails[4].amount" + "value":"billAccountDetails[?(@.taxHeadCode=='PT_FIRE_CESS')].amount" }, { "variable":"ass_tax", - "value":"billAccountDetails[8].amount" + "value":"billAccountDetails[?(@.taxHeadCode=='PT_TAX')].amount" }, { "variable":"ass_adhoc_penalty", "value":{"path":"$.billAccountDetails[?(@.taxHeadCode=='PT_ADHOC_PENALTY')].amount"} @@ -521,19 +521,19 @@ }, { "variable":"ass_time_rebate", - "value":"billAccountDetails[3].amount" + "value":"billAccountDetails[?(@.taxHeadCode=='PT_TIME_REBATE)].amount" } , { "variable":"ass_unit_usage_exemption", - "value":"billAccountDetails[1].amount" + "value":"billAccountDetails[?(@.taxHeadCode=='PT_UNIT_USAGE_EXEMPTION')].amount" }, { "variable":"ass_owner_exemption", - "value":"billAccountDetails[2].amount" + "value":"billAccountDetails[?(@.taxHeadCode=='PT_OWNER_EXEMPTION')].amount" }, { "variable":"ass_round_off", - "value":"billAccountDetails[0].amount" + "value":"billAccountDetails[?(@.taxHeadCode=='PT_ROUNDOFF')].amount" }, { "variable":"ass_total", From ec91c705f60f4bfe0def7f5e523f9ce1ff1c7caa Mon Sep 17 00:00:00 2001 From: egovmis Date: Wed, 25 Nov 2020 16:19:36 +0530 Subject: [PATCH 0463/1242] fix for assessment year on PT receipt --- configs/pdf-service/data-config/property-receipt.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index 6f00c483..e424ca7b 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -476,7 +476,7 @@ }, { "variable": "var_assessments", "value":{ - "path":"$.paymentDetails[0].bill.billDetails.*.billAccountDetails[?(@.taxHeadCode=='PT_TAX')].amount>0"}, + "path":"$.paymentDetails[0].bill.billDetails.*.billAccountDetails[?(@.taxHeadCode=='PT_TAX' && @.amount>0)]"}, "type":"array", "format":{ From 7354c14cad7e3a4a554156be1daa806020f3316b Mon Sep 17 00:00:00 2001 From: egovmis Date: Wed, 25 Nov 2020 16:32:08 +0530 Subject: [PATCH 0464/1242] fix for assessment year on PT receipt --- configs/pdf-service/data-config/property-receipt.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index e424ca7b..784b0589 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -510,7 +510,7 @@ }, { "variable":"ass_tax", - "value":"billAccountDetails[?(@.taxHeadCode=='PT_TAX')].amount" + "value":{"path":"billAccountDetails[?(@.taxHeadCode=='PT_TAX')].amount"} }, { "variable":"ass_adhoc_penalty", "value":{"path":"$.billAccountDetails[?(@.taxHeadCode=='PT_ADHOC_PENALTY')].amount"} From d50aac1e7a89a412167d700e335a9ad0258fba4f Mon Sep 17 00:00:00 2001 From: egovmis Date: Wed, 25 Nov 2020 16:39:31 +0530 Subject: [PATCH 0465/1242] fix for assessment year on PT receipt --- configs/pdf-service/data-config/property-receipt.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index 784b0589..56e28dc5 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -510,7 +510,7 @@ }, { "variable":"ass_tax", - "value":{"path":"billAccountDetails[?(@.taxHeadCode=='PT_TAX')].amount"} + "value":{"path":"billAccountDetails[4].amount"} }, { "variable":"ass_adhoc_penalty", "value":{"path":"$.billAccountDetails[?(@.taxHeadCode=='PT_ADHOC_PENALTY')].amount"} @@ -529,7 +529,7 @@ }, { "variable":"ass_owner_exemption", - "value":"billAccountDetails[?(@.taxHeadCode=='PT_OWNER_EXEMPTION')].amount" + "value":"billAccountDetails[2].amount" }, { "variable":"ass_round_off", From b90d45ce6faafb6f0ea97741400268e209acdf16 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 25 Nov 2020 17:08:39 +0530 Subject: [PATCH 0466/1242] BlockFY CollectionReport_V2 added --- configs/reports/configs/pt-reports.yml | 314 +++++++++++++++++++++++++ 1 file changed, 314 insertions(+) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 5daea3ed..2c74a9f7 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -4322,3 +4322,317 @@ ReportDefinitions: orderby: order by zonename +- reportName: BlockFYReport_V2 + summary: Block FY Collection PT report + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: blockname + label: reports.pt.blockname + type: string + source: pt + total: false + - name: 2013_14PTR + label: reports.pt.2013_14_PTR + type: string + source: pt + total: true + - name: 2013_14Collection + label: reports.pt.2013_14Collection + type: string + source: pt + total: true + - name: 2014_15PTR + label: reports.pt.2014_15_PTR + type: string + source: pt + total: true + - name: 2014_15Collection + label: reports.pt.2014_15Collection + type: string + source: pt + total: true + - name: 2015_16PTR + label: reports.pt.2015_16_PTR + type: string + source: pt + total: true + - name: 2015_16Collection + label: reports.pt.2015_16Collection + type: string + source: pt + total: true + - name: 2016_17PTR + label: reports.pt.2016_17_PTR + type: string + source: pt + total: true + - name: 2016_17Collection + label: reports.pt.2016_17Collection + type: string + source: pt + total: true + - name: 2017_18PTR + label: reports.pt.2017_18_PTR + type: string + source: pt + total: true + - name: 2017_18Collection + label: reports.pt.2017_18Collection + type: string + source: pt + total: true + - name: 2018_19PTR + label: reports.pt.2018_19_PTR + type: string + source: pt + total: true + - name: 2018_19Collection + label: reports.pt.2018_19Collection + type: string + source: pt + total: true + - name: 2019_20PTR + label: reports.pt.2019_20_PTR + type: string + source: pt + total: true + - name: 2019_20Collection + label: reports.pt.2019_20Collection + type: string + source: pt + total: true + - name: 2020_21PTR + label: reports.pt.2020_21_PTR + type: string + source: pt + total: true + - name: 2020_21Collection + label: reports.pt.2020_21Collection + type: string + source: pt + total: true + - name: totalptr + label: reports.pt.totalptr + type: string + source: pt + total: true + - name: totalcollection + label: reports.pt.totalcollection + type: string + source: pt + total: true + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: true + searchClause: AND 1=1 + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: true + searchClause: AND 1=1 + query: | + --S.no Service Name ULB Property Tax Unique ID Date Of Transcation Receipt Number Existing Property ID Type Of Property Mobile Number Address + with fy2013 as + ( + SELECT + blockcode, + string_agg(distinct blockname,',') as blockname, + string_agg(distinct concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')),',') AS "financialyear", + count(*) as totalptr, + sum(payment.totalamountpaid) as amountcollected + FROM egcl_paymentdetail AS pd + join egcl_payment as payment on payment.id = pd.paymentid + join egcl_bill as bill on bill.id = pd.billid + join egcl_billdetial as billd on billd.billid = bill.id + JOIN eg_pt_property pt ON pt.propertyid = bill.consumercode + inner JOIN eg_pt_address as pt_addr ON pt_addr.propertyid = pt.id + inner JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality + WHERE pd.tenantid = 'pb.amritsar' and payment.paymentstatus != 'CANCELLED' and pt.status!='INACTIVE' + and concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY'))='2019-20' + GROUP BY blockcode + + ), + fy2014 as + ( + SELECT + blockcode, + string_agg(distinct blockname,',') as blockname, + string_agg(distinct concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')),',') AS "financialyear", + count(*) as totalptr, + sum(payment.totalamountpaid) as amountcollected + FROM egcl_paymentdetail AS pd + join egcl_payment as payment on payment.id = pd.paymentid + join egcl_bill as bill on bill.id = pd.billid + join egcl_billdetial as billd on billd.billid = bill.id + JOIN eg_pt_property pt ON pt.propertyid = bill.consumercode + inner JOIN eg_pt_address as pt_addr ON pt_addr.propertyid = pt.id + inner JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality + WHERE pd.tenantid = 'pb.amritsar' and payment.paymentstatus != 'CANCELLED' and pt.status!='INACTIVE' + and concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY'))='2014-15' + GROUP BY blockcode + + ), + fy2015 as + ( + SELECT + blockcode, + string_agg(distinct blockname,',') as blockname, + string_agg(distinct concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')),',') AS "financialyear", + count(*) as totalptr, + sum(payment.totalamountpaid) as amountcollected + FROM egcl_paymentdetail AS pd + join egcl_payment as payment on payment.id = pd.paymentid + join egcl_bill as bill on bill.id = pd.billid + join egcl_billdetial as billd on billd.billid = bill.id + JOIN eg_pt_property pt ON pt.propertyid = bill.consumercode + inner JOIN eg_pt_address as pt_addr ON pt_addr.propertyid = pt.id + inner JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality + WHERE pd.tenantid = 'pb.amritsar' and payment.paymentstatus != 'CANCELLED' and pt.status!='INACTIVE' + and concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY'))='2015-16' + GROUP BY blockcode + + ), + fy2016 as + ( + SELECT + blockcode, + string_agg(distinct blockname,',') as blockname, + string_agg(distinct concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')),',') AS "financialyear", + count(*) as totalptr, + sum(payment.totalamountpaid) as amountcollected + FROM egcl_paymentdetail AS pd + join egcl_payment as payment on payment.id = pd.paymentid + join egcl_bill as bill on bill.id = pd.billid + join egcl_billdetial as billd on billd.billid = bill.id + JOIN eg_pt_property pt ON pt.propertyid = bill.consumercode + inner JOIN eg_pt_address as pt_addr ON pt_addr.propertyid = pt.id + inner JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality + WHERE pd.tenantid = 'pb.amritsar' and payment.paymentstatus != 'CANCELLED' and pt.status!='INACTIVE' + and concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY'))='2016-17' + GROUP BY blockcode + + + ), + fy2017 as + ( + SELECT + blockcode, + string_agg(distinct blockname,',') as blockname, + string_agg(distinct concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')),',') AS "financialyear", + count(*) as totalptr, + sum(payment.totalamountpaid) as amountcollected + FROM egcl_paymentdetail AS pd + join egcl_payment as payment on payment.id = pd.paymentid + join egcl_bill as bill on bill.id = pd.billid + join egcl_billdetial as billd on billd.billid = bill.id + JOIN eg_pt_property pt ON pt.propertyid = bill.consumercode + inner JOIN eg_pt_address as pt_addr ON pt_addr.propertyid = pt.id + inner JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality + WHERE pd.tenantid = 'pb.amritsar' and payment.paymentstatus != 'CANCELLED' and pt.status!='INACTIVE' + and concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY'))='2017-18' + GROUP BY blockcode + + ), + fy2018 as + ( + SELECT + blockcode, + string_agg(distinct blockname,',') as blockname, + string_agg(distinct concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')),',') AS "financialyear", + count(*) as totalptr, + sum(payment.totalamountpaid) as amountcollected + FROM egcl_paymentdetail AS pd + join egcl_payment as payment on payment.id = pd.paymentid + join egcl_bill as bill on bill.id = pd.billid + join egcl_billdetial as billd on billd.billid = bill.id + JOIN eg_pt_property pt ON pt.propertyid = bill.consumercode + inner JOIN eg_pt_address as pt_addr ON pt_addr.propertyid = pt.id + inner JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality + WHERE pd.tenantid = 'pb.amritsar' and payment.paymentstatus != 'CANCELLED' and pt.status!='INACTIVE' + and concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY'))='2018-19' + GROUP BY blockcode + + ), + fy2019 as + ( + SELECT + blockcode, + string_agg(distinct blockname,',') as blockname, + string_agg(distinct concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')),',') AS "financialyear", + count(*) as totalptr, + sum(payment.totalamountpaid) as amountcollected + FROM egcl_paymentdetail AS pd + join egcl_payment as payment on payment.id = pd.paymentid + join egcl_bill as bill on bill.id = pd.billid + join egcl_billdetial as billd on billd.billid = bill.id + JOIN eg_pt_property pt ON pt.propertyid = bill.consumercode + inner JOIN eg_pt_address as pt_addr ON pt_addr.propertyid = pt.id + inner JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality + WHERE pd.tenantid = 'pb.amritsar' and payment.paymentstatus != 'CANCELLED' and pt.status!='INACTIVE' + and concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY'))='2019-20' + GROUP BY blockcode + + + ), + fy2020 as + ( + SELECT + blockcode, + string_agg(distinct blockname,',') as blockname, + string_agg(distinct concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')),',') AS "financialyear", + count(*) as totalptr, + sum(payment.totalamountpaid) as amountcollected + FROM egcl_paymentdetail AS pd + join egcl_payment as payment on payment.id = pd.paymentid + join egcl_bill as bill on bill.id = pd.billid + join egcl_billdetial as billd on billd.billid = bill.id + JOIN eg_pt_property pt ON pt.propertyid = bill.consumercode + inner JOIN eg_pt_address as pt_addr ON pt_addr.propertyid = pt.id + inner JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality + WHERE pd.tenantid = 'pb.amritsar' and payment.paymentstatus != 'CANCELLED' and pt.status!='INACTIVE' + and concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY'))='2020-21' + GROUP BY blockcode + + + ), + blocks as + ( + select distinct blockcode,string_agg(distinct blockname,',') as zname from eg_bndry_mohalla where tenantid='pb.amritsar' group by blockcode + ) + SELECT + blocks.blockcode as blockcode, + blocks.zname as blockname, + coalesce(fy2013.totalptr,0) as "2013_14PTR", + coalesce(fy2013.amountcollected,0) as "2013_14Collection", + coalesce(fy2014.totalptr,0) as "2014_15PTR", + coalesce(fy2014.amountcollected,0) as "2014_15Collection", + coalesce(fy2015.totalptr,0) as "2015_16PTR", + coalesce(fy2015.amountcollected,0) as "2015_16Collection", + coalesce(fy2016.totalptr,0) as "2016_17PTR", + coalesce(fy2016.amountcollected,0) as "2016_17Collection", + coalesce(fy2017.totalptr,0) as "2017_18PTR", + coalesce(fy2017.amountcollected,0) as "2017_18Collection", + coalesce(fy2018.totalptr,0) as "2018_19PTR", + coalesce(fy2018.amountcollected,0) as "2018_19Collection", + coalesce(fy2019.totalptr,0) as "2019_20PTR", + coalesce(fy2019.amountcollected,0) as "2019_20Collection", + coalesce(fy2020.totalptr,0) as "2020_21PTR", + coalesce(fy2020.amountcollected,0) as "2020_21Collection", + coalesce(fy2013.totalptr,0)+coalesce(fy2014.totalptr,0)+coalesce(fy2015.totalptr,0)+coalesce(fy2016.totalptr,0)+coalesce(fy2017.totalptr,0)+coalesce(fy2018.totalptr,0)+coalesce(fy2019.totalptr,0)+coalesce(fy2020.totalptr,0) as "totalptr", + coalesce(fy2013.amountcollected,0)+coalesce(fy2014.amountcollected,0)+coalesce(fy2015.amountcollected,0)+coalesce(fy2016.amountcollected,0)+coalesce(fy2017.amountcollected,0)+coalesce(fy2018.amountcollected,0)+coalesce(fy2019.amountcollected,0)+coalesce(fy2020.amountcollected,0) as "totalcollection" + from blocks + left outer join fy2013 on fy2013.blockcode=blocks.blockcode + left outer join fy2014 on fy2014.blockcode=blocks.blockcode + left outer join fy2015 on fy2015.blockcode=blocks.blockcode + left outer join fy2016 on fy2016.blockcode=blocks.blockcode + left outer join fy2017 on fy2017.blockcode=blocks.blockcode + left outer join fy2018 on fy2018.blockcode=blocks.blockcode + left outer join fy2019 on fy2019.blockcode=blocks.blockcode + left outer join fy2020 on fy2020.blockcode=blocks.blockcode + where 1=1 + orderby: order by blockname From 0854ad56f9a26fa3ca4e7d75e2ee618a0693a503 Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov Date: Wed, 25 Nov 2020 21:17:20 +0530 Subject: [PATCH 0467/1242] [PI-1054]-Added indexing configurations as per QA environment --- .../payment-indexer-migration.yml | 6 +- .../property-services-migration-temp.yml | 731 ++++++++++++++++++ 2 files changed, 734 insertions(+), 3 deletions(-) create mode 100644 configs/egov-indexer/property-services-migration-temp.yml diff --git a/configs/egov-indexer/payment-indexer-migration.yml b/configs/egov-indexer/payment-indexer-migration.yml index 7416aa46..f2b0a305 100644 --- a/configs/egov-indexer/payment-indexer-migration.yml +++ b/configs/egov-indexer/payment-indexer-migration.yml @@ -6,11 +6,11 @@ ServiceMaps: configKey: INDEX indexes: - name: paymentsindex-v1 - type: general + type: payments id: $.id - isBulk: false + isBulk: true timeStampField: $.auditDetails.createdTime - jsonPath: $.Payments + jsonPath: $.Payments.* customJsonMapping: indexMapping: {"Data":{"tenantId":"","id":"","transactionNumber":"","transactionDate":1,"paymentMode":"","paymentStatus":"","payer":{"id":"","name":""},"paidBy":"","paymentDetails":{},"auditDetails":{},"additionalDetails":{},"tenantData":{},"@timestamp":"timestamp"}} fieldMapping: diff --git a/configs/egov-indexer/property-services-migration-temp.yml b/configs/egov-indexer/property-services-migration-temp.yml new file mode 100644 index 00000000..b399805c --- /dev/null +++ b/configs/egov-indexer/property-services-migration-temp.yml @@ -0,0 +1,731 @@ +ServiceMaps: + serviceName: Property Tax - rainmaker + version: 1.0.0 + mappings: + - topic: save-property-registry-batch + configKey: INDEX + indexes: + - name: property-services-test + type: general + id: $.propertyId,$.tenantId + jsonPath: $.Property + timeStampField: $.auditDetails.lastModifiedTime + customJsonMapping: + indexMapping: {"Data":{"owners":[],"acknowldgementNumber":"","propertyType":"","ownershipCategory":"","creationReason":"","usageCategory":"","noOfFloors":"","landArea":"","superBuiltUpArea":"","source":"","channel":"","units":{},"auditDetails":{},"id":"","propertyId":"","surveyId":"","linkedProperties":{},"tenantId":"","accountId":"","oldPropertyId":"","status":"","@timestamp":"timestamp"}} + fieldMapping: + - inJsonPath: $.owners.*.uuid + outJsonPath: $.Data.owners + - inJsonPath: $.acknowldgementNumber + outJsonPath: $.Data.acknowldgementNumber + - inJsonPath: $.propertyType + outJsonPath: $.Data.propertyType + - inJsonPath: $.ownershipCategory + outJsonPath: $.Data.ownershipCategory + - inJsonPath: $.creationReason + outJsonPath: $.Data.creationReason + - inJsonPath: $.usageCategory + outJsonPath: $.Data.usageCategory + - inJsonPath: $.noOfFloors + outJsonPath: $.Data.noOfFloors + - inJsonPath: $.landArea + outJsonPath: $.Data.landArea + - inJsonPath: $.superBuiltUpArea + outJsonPath: $.Data.superBuiltUpArea + - inJsonPath: $.source + outJsonPath: $.Data.source + - inJsonPath: $.channel + outJsonPath: $.Data.channel + - inJsonPath: $.units + outJsonPath: $.Data.units + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.propertyId + outJsonPath: $.Data.propertyId + - inJsonPath: $.surveyId + outJsonPath: $.Data.surveyId + - inJsonPath: $.linkedProperties + outJsonPath: $.Data.linkedProperties + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.accountId + outJsonPath: $.Data.accountId + - inJsonPath: $.oldPropertyId + outJsonPath: $.Data.oldPropertyId + - inJsonPath: $.status + outJsonPath: $.Data.status + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + externalUriMapping: + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.acknowldgementNumber,history=true,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history + mdmsMapping: + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData + + - name: property-application + type: general + id: $.propertyId,$.acknowldgementNumber,$.tenantId + jsonPath: $.Property + timeStampField: $.auditDetails.lastModifiedTime + customJsonMapping: + indexMapping: {"Data":{"acknowldgementNumber":"","creationReason":"","auditDetails":{},"propertyId":"","tenantId":"","accountId":"","status":"","@timestamp":""}} + fieldMapping: + - inJsonPath: $.acknowldgementNumber + outJsonPath: $.Data.acknowldgementNumber + - inJsonPath: $.creationReason + outJsonPath: $.Data.creationReason + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - inJsonPath: $.propertyId + outJsonPath: $.Data.propertyId + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.accountId + outJsonPath: $.Data.accountId + - inJsonPath: $.status + outJsonPath: $.Data.status + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + externalUriMapping: + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + - inJsonPath: $.TenantBoundary[0].boundary[0].children + outJsonPath: $.Data.ward.children + filter: "[?(@.code == $locality)]" + filterMapping: + - variable: $locality + valueJsonpath: $.address.locality.code + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.acknowldgementNumber,history=true,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history + mdmsMapping: + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: PropertyTax + masterName: UsageCategory + tenantId: pb + filter: "[?(@.code == $usageCategory)]" + filterMapping: + - variable: $usageCategory + valueJsonpath: $.usageCategory + uriResponseMapping: + - inJsonPath: $.MdmsRes.PropertyTax.UsageCategory[0].name + outJsonPath: $.Data.usageCategory + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData + + + + + - topic: update-property-registry + configKey: INDEX + indexes: + - name: property-services + type: general + id: $.propertyId,$.tenantId + jsonPath: $.Property + timeStampField: $.auditDetails.lastModifiedTime + customJsonMapping: + indexMapping: {"Data":{"owners":[],"acknowldgementNumber":"","propertyType":"","ownershipCategory":"","creationReason":"","usageCategory":"","noOfFloors":"","landArea":"","superBuiltUpArea":"","source":"","channel":"","units":{},"auditDetails":{},"id":"","propertyId":"","surveyId":"","linkedProperties":{},"tenantId":"","accountId":"","oldPropertyId":"","status":"","@timestamp":"timestamp"}} + fieldMapping: + - inJsonPath: $.owners.*.uuid + outJsonPath: $.Data.owners + - inJsonPath: $.acknowldgementNumber + outJsonPath: $.Data.acknowldgementNumber + - inJsonPath: $.propertyType + outJsonPath: $.Data.propertyType + - inJsonPath: $.ownershipCategory + outJsonPath: $.Data.ownershipCategory + - inJsonPath: $.creationReason + outJsonPath: $.Data.creationReason + - inJsonPath: $.usageCategory + outJsonPath: $.Data.usageCategory + - inJsonPath: $.noOfFloors + outJsonPath: $.Data.noOfFloors + - inJsonPath: $.landArea + outJsonPath: $.Data.landArea + - inJsonPath: $.superBuiltUpArea + outJsonPath: $.Data.superBuiltUpArea + - inJsonPath: $.source + outJsonPath: $.Data.source + - inJsonPath: $.channel + outJsonPath: $.Data.channel + - inJsonPath: $.units + outJsonPath: $.Data.units + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.propertyId + outJsonPath: $.Data.propertyId + - inJsonPath: $.surveyId + outJsonPath: $.Data.surveyId + - inJsonPath: $.linkedProperties + outJsonPath: $.Data.linkedProperties + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.accountId + outJsonPath: $.Data.accountId + - inJsonPath: $.oldPropertyId + outJsonPath: $.Data.oldPropertyId + - inJsonPath: $.status + outJsonPath: $.Data.status + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + externalUriMapping: + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.acknowldgementNumber,history=true,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history + mdmsMapping: + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData + + - name: property-application + type: general + id: $.propertyId,$.acknowldgementNumber,$.tenantId + jsonPath: $.Property + timeStampField: $.auditDetails.lastModifiedTime + customJsonMapping: + indexMapping: {"Data":{"acknowldgementNumber":"","creationReason":"","auditDetails":{},"propertyId":"","tenantId":"","accountId":"","status":"","@timestamp":""}} + fieldMapping: + - inJsonPath: $.acknowldgementNumber + outJsonPath: $.Data.acknowldgementNumber + - inJsonPath: $.creationReason + outJsonPath: $.Data.creationReason + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - inJsonPath: $.propertyId + outJsonPath: $.Data.propertyId + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.accountId + outJsonPath: $.Data.accountId + - inJsonPath: $.status + outJsonPath: $.Data.status + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + externalUriMapping: + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + - inJsonPath: $.TenantBoundary[0].boundary[0].children + outJsonPath: $.Data.ward.children + filter: "[?(@.code == $locality)]" + filterMapping: + - variable: $locality + valueJsonpath: $.address.locality.code + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.acknowldgementNumber,history=true,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history + mdmsMapping: + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData + + - topic: cancel-property-registry + configKey: INDEX + indexes: + - name: property-services + type: general + id: $.propertyId,$.tenantId + jsonPath: $.Property + timeStampField: $.auditDetails.lastModifiedTime + customJsonMapping: + indexMapping: {"Data":{"owners":[],"acknowldgementNumber":"","propertyType":"","ownershipCategory":"","creationReason":"","usageCategory":"","noOfFloors":"","landArea":"","superBuiltUpArea":"","source":"","channel":"","units":{},"auditDetails":{},"id":"","propertyId":"","surveyId":"","linkedProperties":{},"tenantId":"","accountId":"","oldPropertyId":"","status":"","@timestamp":"timestamp"}} + fieldMapping: + - inJsonPath: $.owners.*.uuid + outJsonPath: $.Data.owners + - inJsonPath: $.acknowldgementNumber + outJsonPath: $.Data.acknowldgementNumber + - inJsonPath: $.propertyType + outJsonPath: $.Data.propertyType + - inJsonPath: $.ownershipCategory + outJsonPath: $.Data.ownershipCategory + - inJsonPath: $.creationReason + outJsonPath: $.Data.creationReason + - inJsonPath: $.usageCategory + outJsonPath: $.Data.usageCategory + - inJsonPath: $.noOfFloors + outJsonPath: $.Data.noOfFloors + - inJsonPath: $.landArea + outJsonPath: $.Data.landArea + - inJsonPath: $.superBuiltUpArea + outJsonPath: $.Data.superBuiltUpArea + - inJsonPath: $.source + outJsonPath: $.Data.source + - inJsonPath: $.channel + outJsonPath: $.Data.channel + - inJsonPath: $.units + outJsonPath: $.Data.units + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.propertyId + outJsonPath: $.Data.propertyId + - inJsonPath: $.surveyId + outJsonPath: $.Data.surveyId + - inJsonPath: $.linkedProperties + outJsonPath: $.Data.linkedProperties + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.accountId + outJsonPath: $.Data.accountId + - inJsonPath: $.oldPropertyId + outJsonPath: $.Data.oldPropertyId + - inJsonPath: $.status + outJsonPath: $.Data.status + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + externalUriMapping: + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.acknowldgementNumber,history=true,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history + mdmsMapping: + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData + + - name: property-application + type: general + id: $.propertyId,$.acknowldgementNumber,$.tenantId + jsonPath: $.Property + timeStampField: $.auditDetails.lastModifiedTime + customJsonMapping: + indexMapping: {"Data":{"acknowldgementNumber":"","creationReason":"","auditDetails":{},"propertyId":"","tenantId":"","accountId":"","status":"","@timestamp":""}} + fieldMapping: + - inJsonPath: $.acknowldgementNumber + outJsonPath: $.Data.acknowldgementNumber + - inJsonPath: $.creationReason + outJsonPath: $.Data.creationReason + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - inJsonPath: $.propertyId + outJsonPath: $.Data.propertyId + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.accountId + outJsonPath: $.Data.accountId + - inJsonPath: $.status + outJsonPath: $.Data.status + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + externalUriMapping: + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + - inJsonPath: $.TenantBoundary[0].boundary[0].children + outJsonPath: $.Data.ward.children + filter: "[?(@.code == $locality)]" + filterMapping: + - variable: $locality + valueJsonpath: $.address.locality.code + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.acknowldgementNumber,history=true,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history + mdmsMapping: + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData + + - topic: property-registry-legacyIndex + configKey: LEGACYINDEX + indexes: + - name: property-services + type: general + isBulk: true + id: $.propertyId,$.tenantId + jsonPath: $.Properties.* + timeStampField: $.auditDetails.lastModifiedTime + customJsonMapping: + indexMapping: {"Data":{"owners":[],"acknowldgementNumber":"","propertyType":"","ownershipCategory":"","creationReason":"","usageCategory":"","noOfFloors":"","landArea":"","superBuiltUpArea":"","source":"","channel":"","units":{},"auditDetails":{},"id":"","propertyId":"","surveyId":"","linkedProperties":{},"tenantId":"","accountId":"","oldPropertyId":"","status":"","@timestamp":"timestamp"}} + fieldMapping: + - inJsonPath: $.owners.*.uuid + outJsonPath: $.Data.owners + - inJsonPath: $.acknowldgementNumber + outJsonPath: $.Data.acknowldgementNumber + - inJsonPath: $.propertyType + outJsonPath: $.Data.propertyType + - inJsonPath: $.ownershipCategory + outJsonPath: $.Data.ownershipCategory + - inJsonPath: $.creationReason + outJsonPath: $.Data.creationReason + - inJsonPath: $.usageCategory + outJsonPath: $.Data.usageCategory + - inJsonPath: $.noOfFloors + outJsonPath: $.Data.noOfFloors + - inJsonPath: $.landArea + outJsonPath: $.Data.landArea + - inJsonPath: $.superBuiltUpArea + outJsonPath: $.Data.superBuiltUpArea + - inJsonPath: $.source + outJsonPath: $.Data.source + - inJsonPath: $.channel + outJsonPath: $.Data.channel + - inJsonPath: $.units + outJsonPath: $.Data.units + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.propertyId + outJsonPath: $.Data.propertyId + - inJsonPath: $.surveyId + outJsonPath: $.Data.surveyId + - inJsonPath: $.linkedProperties + outJsonPath: $.Data.linkedProperties + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.accountId + outJsonPath: $.Data.accountId + - inJsonPath: $.oldPropertyId + outJsonPath: $.Data.oldPropertyId + - inJsonPath: $.status + outJsonPath: $.Data.status + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + externalUriMapping: + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.acknowldgementNumber,history=true,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history + mdmsMapping: + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData + + - topic: property-application-legacyIndex + configKey: LEGACYINDEX + indexes: + - name: property-application + type: general + isBulk: true + id: $.propertyId,$.acknowldgementNumber,$.tenantId + jsonPath: $.Properties.* + timeStampField: $.auditDetails.lastModifiedTime + customJsonMapping: + indexMapping: {"Data":{"acknowldgementNumber":"","creationReason":"","auditDetails":{},"propertyId":"","tenantId":"","accountId":"","status":"","@timestamp":""}} + fieldMapping: + - inJsonPath: $.acknowldgementNumber + outJsonPath: $.Data.acknowldgementNumber + - inJsonPath: $.creationReason + outJsonPath: $.Data.creationReason + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - inJsonPath: $.propertyId + outJsonPath: $.Data.propertyId + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.accountId + outJsonPath: $.Data.accountId + - inJsonPath: $.status + outJsonPath: $.Data.status + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + externalUriMapping: + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + - inJsonPath: $.TenantBoundary[0].boundary[0].children + outJsonPath: $.Data.ward.children + filter: "[?(@.code == $locality)]" + filterMapping: + - variable: $locality + valueJsonpath: $.address.locality.code + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.acknowldgementNumber,history=true,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history + mdmsMapping: + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData + + - topic: save-pt-assessment-batch + configKey: INDEX + indexes: + - name: property-assessments-test + type: general + id: $.assessmentNumber, $.tenantId + jsonPath: $.Assessment + timeStampField: $.auditDetails.createdTime + customJsonMapping: + indexMapping: {"Data":{"id":"","tenantId":"","additionalDetails":"","assessmentNumber":"","financialYear":"","propertyId":"","assessmentDate":"","status":"","source":"","unitUsageList":{},"channel":"","auditDetails":{},"@timestamp":"timestamp"}} + fieldMapping: + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.assessmentNumber + outJsonPath: $.Data.assessmentNumber + - inJsonPath: $.financialYear + outJsonPath: $.Data.financialYear + - inJsonPath: $.propertyId + outJsonPath: $.Data.propertyId + - inJsonPath: $.assessmentDate + outJsonPath: $.Data.assessmentDate + - inJsonPath: $.status + outJsonPath: $.Data.status + - inJsonPath: $.source + outJsonPath: $.Data.source + - inJsonPath: $.unitUsageList + outJsonPath: $.Data.unitUsageList + - inJsonPath: $.channel + outJsonPath: $.Data.channel + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - inJsonPath: $.additionalDetails + outJsonPath: $.Data.additionalDetails + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + + - topic: update-pt-assessment + configKey: INDEX + indexes: + - name: property-assessments + type: general + id: $.assessmentNumber, $.tenantId + jsonPath: $.Assessment + timeStampField: $.auditDetails.createdTime + customJsonMapping: + indexMapping: {"Data":{"id":"","tenantId":"","additionalDetails":"","assessmentNumber":"","financialYear":"","propertyId":"","assessmentDate":"","status":"","source":"","unitUsageList":{},"channel":"","auditDetails":{},"@timestamp":"timestamp"}} + fieldMapping: + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.assessmentNumber + outJsonPath: $.Data.assessmentNumber + - inJsonPath: $.financialYear + outJsonPath: $.Data.financialYear + - inJsonPath: $.propertyId + outJsonPath: $.Data.propertyId + - inJsonPath: $.assessmentDate + outJsonPath: $.Data.assessmentDate + - inJsonPath: $.status + outJsonPath: $.Data.status + - inJsonPath: $.source + outJsonPath: $.Data.source + - inJsonPath: $.unitUsageList + outJsonPath: $.Data.unitUsageList + - inJsonPath: $.channel + outJsonPath: $.Data.channel + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - inJsonPath: $.additionalDetails + outJsonPath: $.Data.additionalDetails + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + + - topic: cancel-property-assessment + configKey: INDEX + indexes: + - name: property-assessments + type: general + id: $.assessmentNumber, $.tenantId + jsonPath: $.Assessment + timeStampField: $.auditDetails.createdTime + customJsonMapping: + indexMapping: {"Data":{"id":"","tenantId":"","additionalDetails":"","assessmentNumber":"","financialYear":"","propertyId":"","assessmentDate":"","status":"","source":"","unitUsageList":{},"channel":"","auditDetails":{},"@timestamp":"timestamp"}} + fieldMapping: + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.assessmentNumber + outJsonPath: $.Data.assessmentNumber + - inJsonPath: $.financialYear + outJsonPath: $.Data.financialYear + - inJsonPath: $.propertyId + outJsonPath: $.Data.propertyId + - inJsonPath: $.assessmentDate + outJsonPath: $.Data.assessmentDate + - inJsonPath: $.status + outJsonPath: $.Data.status + - inJsonPath: $.source + outJsonPath: $.Data.source + - inJsonPath: $.unitUsageList + outJsonPath: $.Data.unitUsageList + - inJsonPath: $.channel + outJsonPath: $.Data.channel + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - inJsonPath: $.additionalDetails + outJsonPath: $.Data.additionalDetails + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + + - topic: pt-assessment-legacyIndex + configKey: LEGACYINDEX + indexes: + - name: property-assessments + type: general + id: $.assessmentNumber, $.tenantId + jsonPath: $.Assessments.* + isBulk: true + timeStampField: $.auditDetails.createdTime + customJsonMapping: + indexMapping: {"Data":{"id":"","tenantId":"","additionalDetails":"","assessmentNumber":"","financialYear":"","propertyId":"","assessmentDate":"","status":"","source":"","unitUsageList":{},"channel":"","auditDetails":{},"@timestamp":"timestamp"}} + fieldMapping: + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.assessmentNumber + outJsonPath: $.Data.assessmentNumber + - inJsonPath: $.financialYear + outJsonPath: $.Data.financialYear + - inJsonPath: $.propertyId + outJsonPath: $.Data.propertyId + - inJsonPath: $.assessmentDate + outJsonPath: $.Data.assessmentDate + - inJsonPath: $.status + outJsonPath: $.Data.status + - inJsonPath: $.source + outJsonPath: $.Data.source + - inJsonPath: $.unitUsageList + outJsonPath: $.Data.unitUsageList + - inJsonPath: $.channel + outJsonPath: $.Data.channel + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - inJsonPath: $.additionalDetails + outJsonPath: $.Data.additionalDetails + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp From d599d25e4f76c3279c72ebdbaa0d6fc8bceaf96e Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 25 Nov 2020 21:55:51 +0530 Subject: [PATCH 0468/1242] PTreceiptRegister financial year fix --- configs/reports/configs/pt-reports.yml | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 2c74a9f7..e0ce9286 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2270,20 +2270,22 @@ ReportDefinitions: payment.totalamountpaid as amount, payment.paymentmode as instrumenttype, payment.transactionnumber, - concat(to_char((To_timestamp(bd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(bd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) AS financialyear, - to_char((To_timestamp(payment.transactiondate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, - Initcap(pt.usagecategory) as usagetype, - eg_user.name as collectorname, + concat(to_char((To_timestamp(bd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(bd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear, + to_char((To_timestamp(payment.transactiondate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, + pd.due AS pendingamount, + Initcap(case when pt.usagecategory like '%.%' then split_part(pt.usagecategory,'.',2) else pt.usagecategory end) as usagetype, + (case when eg_user.name is null then '721995|Jit/FZQHkmU8SNc06DKOhEnWXXfadQ==' else eg_user.name end) as collectorname, receipt_breakup.*, to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, manualreceiptnumber as g8receiptno - FROM egcl_paymentdetail pd, egcl_payment payment, eg_pt_property as pt, receipt_breakup, eg_user, - (select propertyid,max(createdtime),locality from eg_pt_address where tenantid=$tenantid group by propertyid,locality) as pt_addr, - (select bill.id as billid, bill.consumercode as consumercodei, (select get_fromperiod(bill.id)) as fromperiod, (select get_toperiod(bill.id)) as toperiod from egcl_billdetial bd, egcl_bill bill where bill.id=bd.billid and bill.tenantid = $tenantid group by bill.id) bd + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, receipt_breakup, + (select bill.id as billid, bill.consumercode as consumercodei, get_fromperiod(bill.id) fromperiod, get_toperiod(bill.id) toperiod from egcl_bill bill where bill.tenantid = $tenantid) bd, + (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr where pd.paymentid=payment.id and bd.billid=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid - and pt.propertyid = bd.consumercodei and receipt_breakup.pdid=pd.id and eg_user.id = pd.createdby::INTEGER and pt.status!='INACTIVE' - and pt_addr.propertyid=pt.id + and pt.propertyid = bd.consumercodei and receipt_breakup.pdid=pd.id and pt.status!='INACTIVE' + and pt_addr.propertyid=pt.id --and pt.propertyid='PT-1012-978737' + --and receiptnumber='PT/1012/2020-21/001021' orderby: ORDER BY pd.receiptdate DESC; From 615ce9a61c13ce9331528fa49887d4233d2fff3a Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 25 Nov 2020 22:35:48 +0530 Subject: [PATCH 0469/1242] encrypted value updated --- configs/reports/configs/pt-reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index e0ce9286..fe17382b 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2274,7 +2274,7 @@ ReportDefinitions: to_char((To_timestamp(payment.transactiondate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, pd.due AS pendingamount, Initcap(case when pt.usagecategory like '%.%' then split_part(pt.usagecategory,'.',2) else pt.usagecategory end) as usagetype, - (case when eg_user.name is null then '721995|Jit/FZQHkmU8SNc06DKOhEnWXXfadQ==' else eg_user.name end) as collectorname, + (case when eg_user.name is null then '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' else eg_user.name end) as collectorname, receipt_breakup.*, to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, manualreceiptnumber as g8receiptno From 035921d15c30fb412146196352ca84e4ce85c928 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 26 Nov 2020 11:02:22 +0530 Subject: [PATCH 0470/1242] Firenoc cancelled register update --- configs/reports/configs/rainmaker-noc-reports.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/configs/reports/configs/rainmaker-noc-reports.yml b/configs/reports/configs/rainmaker-noc-reports.yml index 3bc40580..7c49499f 100644 --- a/configs/reports/configs/rainmaker-noc-reports.yml +++ b/configs/reports/configs/rainmaker-noc-reports.yml @@ -691,6 +691,7 @@ ReportDefinitions: JOIN eg_fn_buidlings AS build ON build.firenocdetailsuuid=fdet.uuid INNER JOIN eg_fn_address as fad on fad.firenocdetailsuuid=fdet.uuid WHERE payment.tenantid!='pb.testing' AND paydetail.businessservice in ('FIRENOC') AND paydetail.receiptnumber NOT LIKE 'MP%' and payment.tenantid = $tenantid + and payment.paymentstatus!='CANCELLED' orderby: ORDER BY paydetail.receiptdate DESC - reportName: CancelledReceiptRegisterFirenocReport_V2 @@ -795,7 +796,7 @@ ReportDefinitions: egcl_billaccountdetail.billdetailid bill_id, string_agg(distinct consumercode,',') as consumercode FROM egcl_billaccountdetail - INNER JOIN egcl_bill as bill on bill.id = egcl_billaccountdetail.billdetailid + LEFT JOIN egcl_bill as bill on bill.id = egcl_billaccountdetail.billdetailid WHERE bill.tenantid!='pb.testing' AND businessservice in ('FIRENOC') GROUP BY billdetailid ) @@ -818,8 +819,8 @@ ReportDefinitions: fdet.applicationnumber as applicationnumber, build.name as ownername FROM egcl_payment AS payment - JOIN egcl_paymentdetail as paydetail on paydetail.paymentid=payment.id - JOIN receipt_breakup ON paydetail.billid = receipt_breakup.bill_id + LEFT JOIN egcl_paymentdetail as paydetail on paydetail.paymentid=payment.id + LEFT JOIN receipt_breakup ON paydetail.billid = receipt_breakup.bill_id JOIN eg_user ON payment.createdby::INTEGER=eg_user.id JOIN egcl_bill as bill ON bill.id=paydetail.billid JOIN eg_fn_firenocdetail AS fdet ON fdet.applicationnumber=bill.consumercode From 4107f672a801d51345a463a0e75dcb9bad885a16 Mon Sep 17 00:00:00 2001 From: egovmis Date: Thu, 26 Nov 2020 11:17:07 +0530 Subject: [PATCH 0471/1242] removed table of PT payable from receipt --- .../format-config/property-receipt.json | 63 +------------------ 1 file changed, 2 insertions(+), 61 deletions(-) diff --git a/configs/pdf-service/format-config/property-receipt.json b/configs/pdf-service/format-config/property-receipt.json index 53f779aa..306426a6 100644 --- a/configs/pdf-service/format-config/property-receipt.json +++ b/configs/pdf-service/format-config/property-receipt.json @@ -571,67 +571,8 @@ ] }, "layout":{} - }, { - "style": "next-noc-table", - "table": { - "widths": [ - - "10%","8%","6%","7%","8%","7%","8%","10%","10%","7%","7%","7%","*" - ], - "body": - [ - [ - { - "text": "Assessment Year", - "style": "receipt-table-value22" - },{ - "text": "Property Tax", - "style": "receipt-table-value22" - }, - { - "text": "Fire Cess", - "style": "receipt-table-value22" - }, - { - "text": "Cancer Cess", - "style": "receipt-table-value22" - }, - { - "text": "Penalty", - "style": "receipt-table-value22" - }, { - "text": "Rebate", - "style": "receipt-table-value22" - }, { - "text": "Interest", - "style": "receipt-table-value22" - }, { - "text": "Usage Exemption", - "style": "receipt-table-value22" - }, { - "text": "Special Category Exemption", - "style": "receipt-table-value22" - }, { - "text": "Adhoc Penalty", - "style": "receipt-table-value22" - }, { - "text": "Adhoc Rebate", - "style": "receipt-table-value22" - }, { - "text": "Round Off", - "style": "receipt-table-value22" - }, { - "text": "Total", - "style": "receipt-table-value22" - } - ], - "{{#var_assessments}}[{\"text\":\"{{ass_from}}-{{ass_to}}\",\"style\":\"receipt-table\"},{\"text\":\"{{ass_tax}}\",\"style\":\"receipt-table\"},{\"text\":\"{{ass_fire_cess}}\",\"style\":\"receipt-table\"},{\"text\":\"{{ass_cancer_cess}}\",\"style\":\"receipt-table\"},{\"text\":\"{{ass_time_penalty}}\",\"style\":\"receipt-table\"},{\"text\":\"{{ass_time_rebate}}\",\"style\":\"receipt-table\"},{\"text\":\"{{ass_time_interest}}\",\"style\":\"receipt-table\"},{\"text\":\"{{ass_unit_usage_exemption}}\",\"style\":\"receipt-table\"},{\"text\":\"{{ass_owner_exemption}}\",\"style\":\"receipt-table\"},{\"text\":\"{{ass_adhoc_penalty}}\",\"style\":\"receipt-table\"},{\"text\":\"{{ass_adhoc_rebate}}\",\"style\":\"receipt-table\"},{\"text\":\"{{ass_round_off}}\",\"style\":\"receipt-table\"},{\"text\":\"{{ass_total}}\",\"style\":\"receipt-table\"}]{{/var_assessments}}" - ] - - - }, - "layout": {} - }, + }, + { "text":"PAYMENT INFORMATION", "style":"block-head" From f22b0f4a2dc0c671d5173a04d1ec7cd508f504eb Mon Sep 17 00:00:00 2001 From: egovmis Date: Thu, 26 Nov 2020 12:30:36 +0530 Subject: [PATCH 0472/1242] removed billing period from PT receipt --- configs/pdf-service/format-config/property-receipt.json | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/configs/pdf-service/format-config/property-receipt.json b/configs/pdf-service/format-config/property-receipt.json index 306426a6..dc82bf46 100644 --- a/configs/pdf-service/format-config/property-receipt.json +++ b/configs/pdf-service/format-config/property-receipt.json @@ -134,7 +134,7 @@ ], [ { - "text": "Assessment Year", + "text": "Assessment Year(Paid Amount)", "border": [ true, false, @@ -572,8 +572,7 @@ }, "layout":{} }, - - { + { "text":"PAYMENT INFORMATION", "style":"block-head" }, @@ -609,7 +608,7 @@ "style": "receipt-table" }, { - "text": "{{billing_period}}", + "text": " ", "border": [ false, true, @@ -619,7 +618,7 @@ "style": "receipt-table-value" }, { - "text": "{{fromPeriod}} {{to}} {{toPeriod}}", + "text": " ", "border": [ false, true, From 2cb4547ec89b72bbe293a1b2bc63393e848b9ac8 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 26 Nov 2020 14:56:54 +0530 Subject: [PATCH 0473/1242] Report correction --- configs/reports/configs/pt-reports.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index fe17382b..a0954d8c 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -4011,7 +4011,7 @@ ReportDefinitions: - reportName: ZoneFYReport_V2 - summary: Zone FY Collection Pt report + summary: Zone FY Collection version: 1.0.0 moduleName: rainmaker-pt sourceColumns: @@ -4325,7 +4325,7 @@ ReportDefinitions: - reportName: BlockFYReport_V2 - summary: Block FY Collection PT report + summary: Block FY Collection version: 1.0.0 moduleName: rainmaker-pt sourceColumns: From 435a1111eb46935e358d6fdfdecb3d469b37dcf9 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 26 Nov 2020 17:04:09 +0530 Subject: [PATCH 0474/1242] pendingAmount update --- configs/reports/configs/pt-reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index a0954d8c..9f1798b8 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2272,7 +2272,7 @@ ReportDefinitions: payment.transactionnumber, concat(to_char((To_timestamp(bd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(bd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear, to_char((To_timestamp(payment.transactiondate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, - pd.due AS pendingamount, + payment.totaldue - payment.totalamountpaid AS pendingamount, Initcap(case when pt.usagecategory like '%.%' then split_part(pt.usagecategory,'.',2) else pt.usagecategory end) as usagetype, (case when eg_user.name is null then '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' else eg_user.name end) as collectorname, receipt_breakup.*, From 77811d3047864e63ccb37de9946199df8d365a04 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 26 Nov 2020 18:56:12 +0530 Subject: [PATCH 0475/1242] exemption and actual tax shown PI-8644 fix billaccountdetail.amount is actual amount calculated and billaccountdetail.adjustedamount is amout to be paid or paid --- configs/reports/configs/pt-reports.yml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 9f1798b8..64153649 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2111,6 +2111,11 @@ ReportDefinitions: type: string source: pt total: true + - name: paidpropertytax + label: reports.pt.propertyTax + type: string + source: pt + total: true - name: firecess label: reports.pt.fireCess type: string @@ -2246,10 +2251,11 @@ ReportDefinitions: SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, - SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as propertytax, - (SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN adjustedamount ELSE 0 END) )as exemption, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN bad.amount ELSE 0 END) as propertytax, + SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as paidpropertytax, + (SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN bad.amount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN bad.amount ELSE 0 END) ) as exemption, (SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END)) as adjustment From 846a3e44d0f2a6aa753f7c24f1886ed678854215 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 26 Nov 2020 19:09:53 +0530 Subject: [PATCH 0476/1242] column label update --- configs/reports/configs/pt-reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 64153649..bc5edf8e 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2112,7 +2112,7 @@ ReportDefinitions: source: pt total: true - name: paidpropertytax - label: reports.pt.propertyTax + label: reports.pt.paidpropertyTax type: string source: pt total: true From b6f5ab8d2ffa7437b2dc384e29986bebbc0a06c0 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 26 Nov 2020 19:52:58 +0530 Subject: [PATCH 0477/1242] Update pt-reports.yml --- configs/reports/configs/pt-reports.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index bc5edf8e..0741eee9 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2111,11 +2111,6 @@ ReportDefinitions: type: string source: pt total: true - - name: paidpropertytax - label: reports.pt.paidpropertyTax - type: string - source: pt - total: true - name: firecess label: reports.pt.fireCess type: string From e008d1e516d8c52e858da16372117f47c022a521 Mon Sep 17 00:00:00 2001 From: egovmis Date: Fri, 27 Nov 2020 10:06:56 +0530 Subject: [PATCH 0478/1242] changed path for assessment year for cheque/DD payments --- configs/pdf-service/data-config/property-receipt.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index 56e28dc5..88542d5f 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -64,7 +64,7 @@ { "variable": "assessmentYear", "value": { - "path": "$.additionalDetails.assessmentYears" + "path": "$.paymentDetails[0].additionalDetails.assessmentYears" } }, { From 0ed53068208570abf504d36a386d326e1afbd5a2 Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov Date: Fri, 27 Nov 2020 10:10:06 +0530 Subject: [PATCH 0479/1242] [PI-1054]-Added config for usage category property for UAT V2 --- .../property-services-migration-temp.yml | 48 ++++++++++++++++++- 1 file changed, 46 insertions(+), 2 deletions(-) diff --git a/configs/egov-indexer/property-services-migration-temp.yml b/configs/egov-indexer/property-services-migration-temp.yml index b399805c..ee91c294 100644 --- a/configs/egov-indexer/property-services-migration-temp.yml +++ b/configs/egov-indexer/property-services-migration-temp.yml @@ -83,6 +83,17 @@ ServiceMaps: uriResponseMapping: - inJsonPath: $.MdmsRes.tenant.tenants outJsonPath: $.Data.tenantData + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: PropertyTax + masterName: UsageCategory + tenantId: pb + filter: "[?(@.code == $usageCategory)]" + filterMapping: + - variable: $usageCategory + valueJsonpath: $.usageCategory + uriResponseMapping: + - inJsonPath: $.MdmsRes.PropertyTax.UsageCategory[0].name + outJsonPath: $.Data.usageCategory - name: property-application type: general @@ -236,6 +247,17 @@ ServiceMaps: uriResponseMapping: - inJsonPath: $.MdmsRes.tenant.tenants outJsonPath: $.Data.tenantData + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: PropertyTax + masterName: UsageCategory + tenantId: pb + filter: "[?(@.code == $usageCategory)]" + filterMapping: + - variable: $usageCategory + valueJsonpath: $.usageCategory + uriResponseMapping: + - inJsonPath: $.MdmsRes.PropertyTax.UsageCategory[0].name + outJsonPath: $.Data.usageCategory - name: property-application type: general @@ -374,7 +396,18 @@ ServiceMaps: valueJsonpath: $.tenantId uriResponseMapping: - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.Data.tenantData + outJsonPath: $.Data.tenantData + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: PropertyTax + masterName: UsageCategory + tenantId: pb + filter: "[?(@.code == $usageCategory)]" + filterMapping: + - variable: $usageCategory + valueJsonpath: $.usageCategory + uriResponseMapping: + - inJsonPath: $.MdmsRes.PropertyTax.UsageCategory[0].name + outJsonPath: $.Data.usageCategory - name: property-application type: general @@ -514,7 +547,18 @@ ServiceMaps: valueJsonpath: $.tenantId uriResponseMapping: - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.Data.tenantData + outJsonPath: $.Data.tenantData + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: PropertyTax + masterName: UsageCategory + tenantId: pb + filter: "[?(@.code == $usageCategory)]" + filterMapping: + - variable: $usageCategory + valueJsonpath: $.usageCategory + uriResponseMapping: + - inJsonPath: $.MdmsRes.PropertyTax.UsageCategory[0].name + outJsonPath: $.Data.usageCategory - topic: property-application-legacyIndex configKey: LEGACYINDEX From 3967a3bbc5161bc92bb5d2688dc0f5a5fe8376d9 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 27 Nov 2020 10:53:24 +0530 Subject: [PATCH 0480/1242] FYCollectionsREport update for locality --- configs/reports/configs/pt-reports.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 0741eee9..d09ed1b8 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -3894,6 +3894,7 @@ ReportDefinitions: join egcl_bill as bill on bill.id = pd.billid join egcl_billdetial as billd on billd.billid = bill.id JOIN eg_pt_property pt ON pt.propertyid = bill.consumercode + inner JOIN eg_pt_address as pt_addr ON pt_addr.propertyid = pt.id LEFT OUTER JOIN eg_user ON eg_user.id = pd.createdby::INTEGER WHERE pd.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and pt.status!='INACTIVE' groupby: GROUP BY financialyear From cbdbe2c958d8fbc1bd8141b00c5e2c083b15e511 Mon Sep 17 00:00:00 2001 From: egovmis Date: Fri, 27 Nov 2020 11:07:31 +0530 Subject: [PATCH 0481/1242] added table of penalty/rebate reason on PT receipt --- .../data-config/property-receipt.json | 7 +++ .../format-config/property-receipt.json | 59 +++++++++++++++++++ 2 files changed, 66 insertions(+) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index 88542d5f..86bd5e4b 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -653,6 +653,13 @@ "queryParam": "propertyIds=$.paymentDetails[0].bill.consumerCode,tenantId=$.tenantId", "apiRequest": null, "responseMapping":[ + { + "variable":"penaltyReason", + "value":"$.Properties[0].propertyDetails[0].adhocPenaltyReason" + }, { + "variable":"rebateReason", + "value":"$.Properties[0].propertyDetails[0].adhocExemptionReason" + }, { "variable":"vasikaNo", "value":"$.Properties[0].additionalDetails.vasikaNo" diff --git a/configs/pdf-service/format-config/property-receipt.json b/configs/pdf-service/format-config/property-receipt.json index dc82bf46..f5d230ef 100644 --- a/configs/pdf-service/format-config/property-receipt.json +++ b/configs/pdf-service/format-config/property-receipt.json @@ -799,6 +799,65 @@ ] }, "layout": {} + },{ + "text":"ADDITIONAL REBATE/PENALTY REASON", + "style":"block-head" + }, + { + "style": "next-noc-table", + "table": { + "widths": [ + "25%", + "25%", + "25%", + "25%" + ], + "body": [ + [ + { + "text": "Penalty Reason", + "border": [ + true, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{penaltyReason}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Rebate Reason", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{rebateReason}}", + "border": [ + false, + true, + true, + false + ], + "style": "receipt-table" + } + ] + ] + }, + "layout": {} }, { "text":"OWNERSHIP INFORMATION", From fe477c0837ed4f6056ae1c4b5ddcfc8e22ccd704 Mon Sep 17 00:00:00 2001 From: egovmis Date: Fri, 27 Nov 2020 12:31:30 +0530 Subject: [PATCH 0482/1242] changes for adhoc reason/penalty on PT receipt --- .../data-config/property-receipt.json | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index 86bd5e4b..e7570396 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -151,6 +151,17 @@ "value": { "path": "$.paymentDetails[0].bill.totalAmount" } + }, { + "variable": "penaltyReason", + "value": { + "path": "$.paymentDetails[0].bill.additionalDetails.adhocPenaltyReason" + } + }, + { + "variable": "rebateReason", + "value": { + "path": "$.paymentDetails[0].bill.additionalDetails.adhocRebateReason" + } }, { "variable": "PropertyTax", @@ -653,13 +664,7 @@ "queryParam": "propertyIds=$.paymentDetails[0].bill.consumerCode,tenantId=$.tenantId", "apiRequest": null, "responseMapping":[ - { - "variable":"penaltyReason", - "value":"$.Properties[0].propertyDetails[0].adhocPenaltyReason" - }, { - "variable":"rebateReason", - "value":"$.Properties[0].propertyDetails[0].adhocExemptionReason" - }, + { "variable":"vasikaNo", "value":"$.Properties[0].additionalDetails.vasikaNo" From c8b57c19a27d62ed4fcaee76f77f7a33267c7e15 Mon Sep 17 00:00:00 2001 From: egovmis Date: Fri, 27 Nov 2020 12:33:16 +0530 Subject: [PATCH 0483/1242] changes for adhoc reason/penalty on PT receipt --- configs/pdf-service/format-config/property-receipt.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/pdf-service/format-config/property-receipt.json b/configs/pdf-service/format-config/property-receipt.json index f5d230ef..d08351f8 100644 --- a/configs/pdf-service/format-config/property-receipt.json +++ b/configs/pdf-service/format-config/property-receipt.json @@ -820,7 +820,7 @@ true, true, false, - false + true ], "style": "receipt-table-value" }, @@ -830,7 +830,7 @@ false, true, false, - false + true ], "style": "receipt-table" }, @@ -840,7 +840,7 @@ false, true, false, - false + true ], "style": "receipt-table-value" }, @@ -850,7 +850,7 @@ false, true, true, - false + true ], "style": "receipt-table" } From 69192cebe75ecc1a9cf35ca39364d6c241b1a784 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 27 Nov 2020 12:49:57 +0530 Subject: [PATCH 0484/1242] decryption key for State report MiscReceipt_v2 --- configs/reports/configs/uc-reports.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/reports/configs/uc-reports.yml b/configs/reports/configs/uc-reports.yml index 63a09cce..5c972d18 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -834,6 +834,7 @@ ReportDefinitions: - reportName: MiscReceipt_v2 + decryptionPathId: MiscReceiptULB_v2 summary: Receipt Register Miscellaneous version: 1.0.0 moduleName: rainmaker-uc From 4ae0294873ba4475460404b372d997c4bc0a80a9 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 27 Nov 2020 13:05:49 +0530 Subject: [PATCH 0485/1242] RegistryReport_v2 not to show cancelled receipts --- configs/reports/configs/tl-reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/reports/configs/tl-reports.yml b/configs/reports/configs/tl-reports.yml index 9ade15e5..f9148724 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -1372,7 +1372,7 @@ ReportDefinitions: SELECT tradelicensedetailid,array_to_string(array_agg(message.message),',') AS acc FROM eg_tl_accessory LEFT OUTER JOIN message ON code=CONCAT('TRADELICENSE_ACCESSORIESCATEGORY_', REGEXP_REPLACE(accessorycategory, '[^A-Za-z0-9]','_', 'g')) AND message.locale = 'en_IN' GROUP BY 1 ) tlacc ON tlacc.tradelicensedetailid = tld.id Join eg_user ON eg_user.id = egcl_paymentdetail.createdby::INTEGER - WHERE tl.tenantId = $tenantid + WHERE tl.tenantId = $tenantid and payment.paymentstatus!='CANCELLED' - reportName: StateTradeLicenseCancelledRegistryReport_v2 From c628e64593ae703bf7a1350c14490f68e3fa2d50 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Sat, 28 Nov 2020 11:10:57 +0530 Subject: [PATCH 0486/1242] optimising receiptRegister query --- configs/reports/configs/pt-reports.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index d09ed1b8..dd6c7972 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2259,6 +2259,7 @@ ReportDefinitions: INNER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid INNER JOIN egcl_payment as payment on pd.paymentid=payment.id WHERE payment.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' + AND pd.receiptdate >= $fromDate AND pd.receiptdate <= $toDate GROUP BY pdid ) SELECT From a6b826aaf344ff0c230320a8fa87549cb70cb813 Mon Sep 17 00:00:00 2001 From: ramakrishnaippili Date: Sun, 29 Nov 2020 13:21:32 +0530 Subject: [PATCH 0487/1242] [PI-1074] moved finyear function call to select clause instead to get for all the tenenats and map --- configs/reports/configs/pt-reports.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index dd6c7972..1ed2f8c7 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2237,7 +2237,7 @@ ReportDefinitions: searchClause: AND pt_addr.locality IN ($localityArray) query: | -- Use CTE to force query plan, compute & use CTE later - WITH receipt_breakup AS ( +WITH receipt_breakup AS ( SELECT pd.id as pdid, SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, @@ -2259,7 +2259,7 @@ ReportDefinitions: INNER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid INNER JOIN egcl_payment as payment on pd.paymentid=payment.id WHERE payment.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' - AND pd.receiptdate >= $fromDate AND pd.receiptdate <= $toDate + AND pd.receiptdate >= $fromDate AND pd.receiptdate <= $toDate GROUP BY pdid ) SELECT @@ -2272,7 +2272,7 @@ ReportDefinitions: payment.totalamountpaid as amount, payment.paymentmode as instrumenttype, payment.transactionnumber, - concat(to_char((To_timestamp(bd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(bd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear, + concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear, to_char((To_timestamp(payment.transactiondate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, payment.totaldue - payment.totalamountpaid AS pendingamount, Initcap(case when pt.usagecategory like '%.%' then split_part(pt.usagecategory,'.',2) else pt.usagecategory end) as usagetype, @@ -2280,11 +2280,10 @@ ReportDefinitions: receipt_breakup.*, to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, manualreceiptnumber as g8receiptno - FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, receipt_breakup, - (select bill.id as billid, bill.consumercode as consumercodei, get_fromperiod(bill.id) fromperiod, get_toperiod(bill.id) toperiod from egcl_bill bill where bill.tenantid = $tenantid) bd, + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, receipt_breakup, egcl_bill bill, (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr - where pd.paymentid=payment.id and bd.billid=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid - and pt.propertyid = bd.consumercodei and receipt_breakup.pdid=pd.id and pt.status!='INACTIVE' + where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + and pt.propertyid = bill.consumercode and receipt_breakup.pdid=pd.id and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id --and pt.propertyid='PT-1012-978737' --and receiptnumber='PT/1012/2020-21/001021' From c5e2ce2c4a39af84491bdbec85f80b6072be9a89 Mon Sep 17 00:00:00 2001 From: ramakrishnaippili Date: Sun, 29 Nov 2020 13:40:32 +0530 Subject: [PATCH 0488/1242] [PI-1074] moved finyear function call to select clause instead to get for all the tenenats and map --- configs/reports/configs/pt-reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 1ed2f8c7..3c311558 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2237,7 +2237,7 @@ ReportDefinitions: searchClause: AND pt_addr.locality IN ($localityArray) query: | -- Use CTE to force query plan, compute & use CTE later -WITH receipt_breakup AS ( + WITH receipt_breakup AS ( SELECT pd.id as pdid, SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, From a68e9932fde4652156b49a0e6244332f9ee07bf9 Mon Sep 17 00:00:00 2001 From: ramakrishnaippili Date: Sun, 29 Nov 2020 13:52:26 +0530 Subject: [PATCH 0489/1242] [PI-1074] moved finyear function call to select clause instead to get for all the tenenats and map --- configs/reports/configs/pt-reports.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 3c311558..0e82a41d 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2237,7 +2237,7 @@ ReportDefinitions: searchClause: AND pt_addr.locality IN ($localityArray) query: | -- Use CTE to force query plan, compute & use CTE later - WITH receipt_breakup AS ( + WITH receipt_breakup AS ( SELECT pd.id as pdid, SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, @@ -2259,7 +2259,7 @@ ReportDefinitions: INNER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid INNER JOIN egcl_payment as payment on pd.paymentid=payment.id WHERE payment.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' - AND pd.receiptdate >= $fromDate AND pd.receiptdate <= $toDate + AND pd.receiptdate >= $fromDate AND pd.receiptdate <= $toDate GROUP BY pdid ) SELECT @@ -2282,7 +2282,7 @@ ReportDefinitions: manualreceiptnumber as g8receiptno FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, receipt_breakup, egcl_bill bill, (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr - where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + where pd.paymentid=payment.id and bd.billid=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid and pt.propertyid = bill.consumercode and receipt_breakup.pdid=pd.id and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id --and pt.propertyid='PT-1012-978737' From 46bbaf68a5912ef40645131839905f215ed9ef6c Mon Sep 17 00:00:00 2001 From: ramakrishnaippili Date: Sun, 29 Nov 2020 13:56:06 +0530 Subject: [PATCH 0490/1242] [PI-1074] moved finyear function call to select clause instead to get for all the tenenats and map --- configs/reports/configs/pt-reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 0e82a41d..7b1c964c 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2282,7 +2282,7 @@ ReportDefinitions: manualreceiptnumber as g8receiptno FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, receipt_breakup, egcl_bill bill, (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr - where pd.paymentid=payment.id and bd.billid=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid and pt.propertyid = bill.consumercode and receipt_breakup.pdid=pd.id and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id --and pt.propertyid='PT-1012-978737' From 20c1b2f3540d75578bdf7303ebdb8352c291e051 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Tue, 1 Dec 2020 11:46:39 +0530 Subject: [PATCH 0491/1242] changed label for guardian name --- configs/pdf-service/format-config/property-receipt.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/pdf-service/format-config/property-receipt.json b/configs/pdf-service/format-config/property-receipt.json index d08351f8..be9f280f 100644 --- a/configs/pdf-service/format-config/property-receipt.json +++ b/configs/pdf-service/format-config/property-receipt.json @@ -873,7 +873,7 @@ "*", "*" ], - "body": ["{{#var_owners}}[{\"text\":\"Owner Name\",\"border\":[true,true,false,true],\"style\":\"receipt-table-key\"},{\"text\":\"{{name2}}\",\"border\":[false,true,true,true]},{\"text\":\"Father's Name\",\"border\":[true,true,false,true],\"style\":\"receipt-table-key\"},{\"text\":\"{{fatherOrHusbandName2}}\",\"border\":[false,true,true,true]}]{{/var_owners}}"] + "body": ["{{#var_owners}}[{\"text\":\"Owner Name\",\"border\":[true,true,false,true],\"style\":\"receipt-table-key\"},{\"text\":\"{{name2}}\",\"border\":[false,true,true,true]},{\"text\":\"Father/Husband Name\",\"border\":[true,true,false,true],\"style\":\"receipt-table-key\"},{\"text\":\"{{fatherOrHusbandName2}}\",\"border\":[false,true,true,true]}]{{/var_owners}}"] }, "layout": {} }, From ec255c8323f4382fcb236aca5c6f8d0ff2dddd82 Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov Date: Thu, 3 Dec 2020 13:29:52 +0530 Subject: [PATCH 0492/1242] Added console logs --- rainmaker-custom-service/index.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/rainmaker-custom-service/index.js b/rainmaker-custom-service/index.js index fc742333..9efcd7f8 100644 --- a/rainmaker-custom-service/index.js +++ b/rainmaker-custom-service/index.js @@ -482,8 +482,13 @@ async function _estimateIntegrationTaxProcessor(req1, res1) { function _estimateZeroTaxProcessor(request, response) { let index = 0; + console.log("Request:",request, "Response:", response ); + + console.log("request[CalculationCriteria]:", request["CalculationCriteria"]) for (let calc of response["Calculation"]) { + console.log("Response Calculation:", calc ); + let assessmentYear = request["CalculationCriteria"][index]["assessmentYear"] let tenantId = request["CalculationCriteria"][index]["tenantId"] let newTotal = 0; From 3ba396215baf516fea4128fc225f123bb7164ece Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov Date: Thu, 3 Dec 2020 13:51:51 +0530 Subject: [PATCH 0493/1242] Added old request body to _estimateZeroTaxProcessor function --- rainmaker-custom-service/index.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rainmaker-custom-service/index.js b/rainmaker-custom-service/index.js index 9efcd7f8..131d93e4 100644 --- a/rainmaker-custom-service/index.js +++ b/rainmaker-custom-service/index.js @@ -1048,12 +1048,13 @@ router.post('/protected/punjab-pt/pt-calculator-v2/_estimate', asyncMiddleware(a let oldRequestbody = await getOldRequestBody(request); + console.log("Old Request Body:", oldRequestbody); oldRequestbody["CalculationCriteria"][0]["assessmentYear"] = assessmentYear; // assessmentYear field was there in old request body but not present in new request body Without this field we will get null pointer exception. if (assessmentYear == PT_ZERO_ASSESSMENTYEAR && PT_ZERO_TENANTS.indexOf(tenantId) >= 0){ - response = _estimateZeroTaxProcessor(request, response) + response = _estimateZeroTaxProcessor(oldRequestbody, response) } else if (assessmentYear == PT_INTEGRATION_ASSESSMENTYEAR){ From 33105fc67fed32fe17df758267f41a5508356843 Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov Date: Thu, 3 Dec 2020 18:28:38 +0530 Subject: [PATCH 0494/1242] Added console logs --- rainmaker-custom-service/index.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/rainmaker-custom-service/index.js b/rainmaker-custom-service/index.js index 131d93e4..1d1928a2 100644 --- a/rainmaker-custom-service/index.js +++ b/rainmaker-custom-service/index.js @@ -644,6 +644,9 @@ function _estimateZeroTaxProcessor(request, response) { // } async function _createAndUpdateZeroTaxProcessor(request, response) { + console.log("Entered in to _createAndUpdateZeroTaxProcessor======"); + console.log("Request:", request); + console.log("Response:", response); let index = 0 for (reqProperty of request["Properties"]) { From 0ef5290c5aa67b3188ce5709c5e7483144340ec6 Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov Date: Thu, 3 Dec 2020 21:25:11 +0530 Subject: [PATCH 0495/1242] Commiting partial code for zero tenant calculation --- rainmaker-custom-service/index.js | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/rainmaker-custom-service/index.js b/rainmaker-custom-service/index.js index 1d1928a2..ed439bbf 100644 --- a/rainmaker-custom-service/index.js +++ b/rainmaker-custom-service/index.js @@ -385,10 +385,13 @@ router.post('/protected/bndlogin', asyncMiddleware(async function (req, res) { async function findDemandForConsumerCode(consumerCode, tenantId, service, RequestInfo) { log("Got Request to Find Demand for Comsumer code: "+consumerCode+" tenantid : "+tenantId+" Service : "+service); - + let fromDate = 1364774400000 + let toDate = 1396310399000 + let status = "ACTIVE" let demandSearchResponse = await request.post({ url: url.resolve(PT_DEMAND_HOST, "/billing-service/demand/_search?tenantId=" + tenantId + - "&consumerCode=" + consumerCode + "&businessService=" + service), + "&consumerCode=" + consumerCode + "&businessService=" + service + "&periodFrom=" + fromDate + + "&periodTo=" + toDate + "&status=" + status), body: { RequestInfo }, @@ -648,16 +651,26 @@ async function _createAndUpdateZeroTaxProcessor(request, response) { console.log("Request:", request); console.log("Response:", response); let index = 0 - for (reqProperty of request["Properties"]) { - let resProperty = response["Properties"][index] - let propertyId = resProperty["propertyId"] + for (reqProperty of request["Assessments"]) { - let assessmentNumber = resProperty["propertyDetails"][0]["assessmentNumber"] + let resProperty = response["Assessments"][index] + let propertyId = resProperty["propertyId"] + let assessmentNumber = resProperty["assessmentNumber"] - let assessmentYear = resProperty["propertyDetails"][0]["financialYear"] + let assessmentYear = resProperty["financialYear"] let tenantId = reqProperty["tenantId"] + // for (reqProperty of request["Properties"]) { + + // let resProperty = response["Properties"][index] + // let propertyId = resProperty["propertyId"] + + // let assessmentNumber = resProperty["propertyDetails"][0]["assessmentNumber"] + + // let assessmentYear = resProperty["propertyDetails"][0]["financialYear"] + // let tenantId = reqProperty["tenantId"] + if (isCitizen(request) && assessmentYear === PT_ZERO_ASSESSMENTYEAR) { data = { @@ -679,7 +692,7 @@ async function _createAndUpdateZeroTaxProcessor(request, response) { request_info = request["RequestInfo"] || request["requestInfo"] - let consumerCode = propertyId + ":" + assessmentNumber + let consumerCode = propertyId let service = "PT" let calc = response["Properties"][index]["propertyDetails"][0]["calculation"] From c7640f8e86d153b67e7a7cc047be822a7c3692a3 Mon Sep 17 00:00:00 2001 From: narendrabandhamneni-wt-egov Date: Thu, 3 Dec 2020 21:58:13 +0530 Subject: [PATCH 0496/1242] testing for 13-14 --- rainmaker-custom-service/index.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rainmaker-custom-service/index.js b/rainmaker-custom-service/index.js index ed439bbf..075a2b54 100644 --- a/rainmaker-custom-service/index.js +++ b/rainmaker-custom-service/index.js @@ -694,7 +694,7 @@ async function _createAndUpdateZeroTaxProcessor(request, response) { let consumerCode = propertyId let service = "PT" - let calc = response["Properties"][index]["propertyDetails"][0]["calculation"] + // let calc = response["Properties"][index]["propertyDetails"][0]["calculation"] let newTotal = 0; @@ -719,11 +719,11 @@ async function _createAndUpdateZeroTaxProcessor(request, response) { } let demandUpdateResponse = await updateDemand(demandSearchResponse["Demands"], request["RequestInfo"]) - calc["taxAmount"] = 0; + /* calc["taxAmount"] = 0; calc["exemption"] = 0; calc["totalAmount"] = newTotal; calc["rebate"] = 0 - calc["penanlty"] = newTotal + calc["penanlty"] = newTotal*/ index++ } From 5b54a29408cd8b03e031288d43a9be3477f13ba9 Mon Sep 17 00:00:00 2001 From: narendrabandhamneni-wt-egov Date: Thu, 3 Dec 2020 22:26:10 +0530 Subject: [PATCH 0497/1242] changed request to response --- rainmaker-custom-service/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rainmaker-custom-service/index.js b/rainmaker-custom-service/index.js index 075a2b54..574a5934 100644 --- a/rainmaker-custom-service/index.js +++ b/rainmaker-custom-service/index.js @@ -652,7 +652,7 @@ async function _createAndUpdateZeroTaxProcessor(request, response) { console.log("Response:", response); let index = 0 - for (reqProperty of request["Assessments"]) { + for (reqProperty of response["Assessments"]) { let resProperty = response["Assessments"][index] let propertyId = resProperty["propertyId"] From ae3a995605391b9ef496398bdf313eb7ad293400 Mon Sep 17 00:00:00 2001 From: narendrabandhamneni-wt-egov Date: Thu, 3 Dec 2020 22:37:34 +0530 Subject: [PATCH 0498/1242] 2013-14 issue --- rainmaker-custom-service/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rainmaker-custom-service/index.js b/rainmaker-custom-service/index.js index 574a5934..11462ade 100644 --- a/rainmaker-custom-service/index.js +++ b/rainmaker-custom-service/index.js @@ -710,13 +710,13 @@ async function _createAndUpdateZeroTaxProcessor(request, response) { } } - let taxHeads = calc["taxHeadEstimates"]; + /*let taxHeads = calc["taxHeadEstimates"]; for (taxHead of taxHeads) { if (taxHead.taxHeadCode != "PT_ADHOC_PENALTY" && taxHead.taxHeadCode == 'PT_ADVANCE_CARRYFORWARD') { taxHead.estimateAmount = 0 } - } + }*/ let demandUpdateResponse = await updateDemand(demandSearchResponse["Demands"], request["RequestInfo"]) /* calc["taxAmount"] = 0; From 2feda119ff7d528b3d774a3e68e4b90b42f1ad23 Mon Sep 17 00:00:00 2001 From: narendrabandhamneni-wt-egov Date: Tue, 8 Dec 2020 14:49:12 +0530 Subject: [PATCH 0499/1242] https://digit-discuss.atlassian.net/browse/PI-591 --- .../weekly-impact-emailer-searcher.yml | 34 ++++++++----------- 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/configs/egov-searcher/weekly-impact-emailer-searcher.yml b/configs/egov-searcher/weekly-impact-emailer-searcher.yml index 6ba4e8ae..6c95ec9c 100644 --- a/configs/egov-searcher/weekly-impact-emailer-searcher.yml +++ b/configs/egov-searcher/weekly-impact-emailer-searcher.yml @@ -5,20 +5,14 @@ definitions: - name: stateWideData query: - baseQuery: select array_to_json(array_agg(row_to_json(stateWideReports))) from ((SELECT (SELECT count(*) FROM ((SELECT DISTINCT tenantid FROM eg_pt_property_v2 WHERE (createdtime/1000) <= (extract(epoch from NOW())) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_tl_tradelicense WHERE (createdtime/1000) <= (extract(epoch from NOW())) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_pgr_service WHERE (createdtime/1000) <= (extract(epoch from NOW())) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_fn_firenoc WHERE (createdtime/1000) <= (extract(epoch from NOW())) AND tenantid != 'pb.testing')) AS tenants) as ulbCovered,(SELECT TRUNC(((SELECT SUM(ins.amount) FROM eg_pt_property_v2 pt INNER JOIN egcl_receiptheader_v1 rh ON pt.propertyid = SPLIT_PART(rh.consumercode, ':', 1) INNER JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id WHERE (rh.receiptdate/1000) <= (extract(epoch from NOW())) AND pt.tenantid != 'pb.testing' AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED') + (SELECT SUM(ins.amount) FROM eg_tl_tradelicense tl INNER JOIN egcl_receiptheader_v1 rh ON tl.applicationnumber = rh.consumercode INNER JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id WHERE (rh.receiptdate/1000) <= (extract(epoch from NOW())) AND tl.tenantid != 'pb.testing' AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED')+(SELECT COALESCE(SUM(ins.amount),0) FROM eg_fn_firenocdetail fn INNER JOIN egcl_receiptheader_v1 rh ON fn.applicationnumber = rh.consumercode INNER JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id WHERE (rh.receiptdate/1000) <= (extract(epoch from NOW())) AND fn.tenantid != 'pb.testing' AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED')+(SELECT SUM(ins.amount) FROM egcl_receiptheader_v1 rh LEFT JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id $where AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED' AND rh.tenantid!='pb.testing' AND (rh.receiptdate/1000) <= (extract(epoch from NOW())) )) / 10000000, 3)) as revenueCollected,(SELECT (SELECT count(*) FROM eg_pt_property_v2 WHERE (createdtime/1000) <= (extract(epoch from NOW())) AND tenantid != 'pb.testing') + (SELECT count(*) FROM eg_tl_tradelicense WHERE (createdtime/1000) <= (extract(epoch from NOW())) AND tenantid != 'pb.testing')+ (SELECT count(*) FROM eg_fn_firenoc WHERE (createdtime/1000) <= (extract(epoch from NOW())) AND tenantid != 'pb.testing')) as servicesApplied, (SELECT count(*) FROM eg_user WHERE (createddate <= NOW()) AND tenantid != 'pb.testing' AND type = 'CITIZEN') as noOfUsersRegistered, 'Week0' as day) UNION (SELECT (SELECT count(*) FROM ((SELECT DISTINCT tenantid FROM eg_pt_property_v2 WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_tl_tradelicense WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_fn_firenoc WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing')) AS tenants) as ulbCovered,(SELECT TRUNC(((SELECT SUM(ins.amount) FROM eg_pt_property_v2 pt INNER JOIN egcl_receiptheader_v1 rh ON pt.propertyid = SPLIT_PART(rh.consumercode, ':', 1) INNER JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND pt.tenantid != 'pb.testing' AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED') + (SELECT SUM(ins.amount) FROM eg_tl_tradelicense tl INNER JOIN egcl_receiptheader_v1 rh ON tl.applicationnumber = rh.consumercode INNER JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tl.tenantid != 'pb.testing' AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED')+(SELECT COALESCE(SUM(ins.amount),0) FROM eg_fn_firenocdetail fn INNER JOIN egcl_receiptheader_v1 rh ON fn.applicationnumber = rh.consumercode INNER JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND fn.tenantid != 'pb.testing' AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED')+(SELECT SUM(ins.amount) FROM egcl_receiptheader_v1 rh LEFT JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id $where AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED' AND (rh.receiptdate/1000) <= ((extract(epoch from NOW()))-604800) AND rh.tenantid != 'pb.testing')) / 10000000, 3)) as revenueCollected,(SELECT (SELECT count(*) FROM eg_pt_property_v2 WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing') + (SELECT count(*) FROM eg_tl_tradelicense WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing')+(SELECT count(*) FROM eg_fn_firenocdetail WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing')) as servicesApplied, (SELECT count(*) FROM eg_user WHERE createddate <= to_timestamp((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing' AND type = 'CITIZEN') as noOfUsersRegistered, 'Week1' as day) UNION (SELECT (SELECT count(*) FROM ((SELECT DISTINCT tenantid FROM eg_pt_property_v2 WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_tl_tradelicense WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing')UNION (SELECT DISTINCT tenantid FROM eg_fn_firenocdetail WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing')) AS tenants) as ulbCovered,(SELECT TRUNC(((SELECT SUM(ins.amount) FROM eg_pt_property_v2 pt INNER JOIN egcl_receiptheader_v1 rh ON pt.propertyid = SPLIT_PART(rh.consumercode, ':', 1) INNER JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND pt.tenantid != 'pb.testing' AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED') + (SELECT SUM(ins.amount) FROM eg_tl_tradelicense tl INNER JOIN egcl_receiptheader_v1 rh ON tl.applicationnumber = rh.consumercode INNER JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tl.tenantid != 'pb.testing' AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED')+(SELECT COALESCE(SUM(ins.amount),0) FROM eg_fn_firenocdetail fn INNER JOIN egcl_receiptheader_v1 rh ON fn.applicationnumber = rh.consumercode INNER JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND fn.tenantid != 'pb.testing' AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED')+(SELECT SUM(ins.amount) FROM egcl_receiptheader_v1 rh LEFT JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id $where AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED' AND rh.tenantid!='pb.testing' AND (rh.receiptdate/1000) <= ((extract(epoch from NOW())) - 604800*2))) / 10000000, 3)) as revenueCollected,(SELECT (SELECT count(*) FROM eg_pt_property_v2 WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing') + (SELECT count(*) FROM eg_tl_tradelicense WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing')) as servicesApplied, (SELECT count(*) FROM eg_user WHERE createddate <= to_timestamp((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing' AND type = 'CITIZEN') as noOfUsersRegistered, 'Week2' as day) UNION (SELECT (SELECT count(*) FROM ((SELECT DISTINCT tenantid FROM eg_pt_property_v2 WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_tl_tradelicense WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing')) AS tenants) as ulbCovered,(SELECT TRUNC(((SELECT SUM(ins.amount) FROM eg_pt_property_v2 pt INNER JOIN egcl_receiptheader_v1 rh ON pt.propertyid = SPLIT_PART(rh.consumercode, ':', 1) INNER JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND pt.tenantid != 'pb.testing' AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED') + (SELECT SUM(ins.amount) FROM eg_tl_tradelicense tl INNER JOIN egcl_receiptheader_v1 rh ON tl.applicationnumber = rh.consumercode INNER JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tl.tenantid != 'pb.testing' AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED')+(SELECT COALESCE(SUM(ins.amount),0) FROM eg_fn_firenocdetail fn INNER JOIN egcl_receiptheader_v1 rh ON fn.applicationnumber = rh.consumercode INNER JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND fn.tenantid != 'pb.testing' AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED')+(SELECT SUM(ins.amount) FROM egcl_receiptheader_v1 rh LEFT JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id $where AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED' AND rh.tenantid!='pb.testing' AND (rh.receiptdate/1000) <= ((extract(epoch from NOW())) - 604800*3))) / 10000000, 3)) as revenueCollected,(SELECT (SELECT count(*) FROM eg_pt_property_v2 WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing') + (SELECT count(*) FROM eg_tl_tradelicense WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing')+(SELECT count(*) FROM eg_fn_firenocdetail WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing')) as servicesApplied, (SELECT count(*) FROM eg_user WHERE createddate <= to_timestamp((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing' AND type = 'CITIZEN') as noOfUsersRegistered, 'Week3' as day) UNION (SELECT (SELECT count(*) FROM ((SELECT DISTINCT tenantid FROM eg_pt_property_v2 WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_tl_tradelicense WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_fn_firenoc WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing')) AS tenants) as ulbCovered,(SELECT TRUNC(((SELECT SUM(ins.amount) FROM eg_pt_property_v2 pt INNER JOIN egcl_receiptheader_v1 rh ON pt.propertyid = SPLIT_PART(rh.consumercode, ':', 1) INNER JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND pt.tenantid != 'pb.testing' AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED') + (SELECT SUM(ins.amount) FROM eg_tl_tradelicense tl INNER JOIN egcl_receiptheader_v1 rh ON tl.applicationnumber = rh.consumercode INNER JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tl.tenantid != 'pb.testing' AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED')+(SELECT COALESCE(SUM(ins.amount),0) FROM eg_fn_firenocdetail fn INNER JOIN egcl_receiptheader_v1 rh ON fn.applicationnumber = rh.consumercode INNER JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND fn.tenantid != 'pb.testing' AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED')+(SELECT SUM(ins.amount) FROM egcl_receiptheader_v1 rh LEFT JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id $where AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED' AND rh.tenantid!='pb.testing' AND(rh.receiptdate/1000) <= ((extract(epoch from NOW())) - 604800*4))) / 10000000, 3)) as revenueCollected,(SELECT (SELECT count(*) FROM eg_pt_property_v2 WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing') + (SELECT count(*) FROM eg_tl_tradelicense WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing')+ (SELECT count(*) FROM eg_fn_firenocdetail WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing')) as servicesApplied, (SELECT count(*) FROM eg_user WHERE createddate <= to_timestamp((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing' AND type = 'CITIZEN') as noOfUsersRegistered, 'Week4' as day) UNION (SELECT (SELECT count(*) FROM ((SELECT DISTINCT tenantid FROM eg_pt_property_v2 WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_tl_tradelicense WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing')UNION (SELECT DISTINCT tenantid FROM eg_fn_firenocdetail WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing')) AS tenants) as ulbCovered,(SELECT TRUNC(((SELECT SUM(ins.amount) FROM eg_pt_property_v2 pt INNER JOIN egcl_receiptheader_v1 rh ON pt.propertyid = SPLIT_PART(rh.consumercode, ':', 1) INNER JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND pt.tenantid != 'pb.testing' AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED') + (SELECT SUM(ins.amount) FROM eg_tl_tradelicense tl INNER JOIN egcl_receiptheader_v1 rh ON tl.applicationnumber = rh.consumercode INNER JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tl.tenantid != 'pb.testing' AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED')+ (SELECT COALESCE(SUM(ins.amount),0) FROM eg_fn_firenocdetail fn INNER JOIN egcl_receiptheader_v1 rh ON fn.applicationnumber = rh.consumercode INNER JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND fn.tenantid != 'pb.testing' AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED')+(SELECT SUM(ins.amount) FROM egcl_receiptheader_v1 rh LEFT JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id $where AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED' AND rh.tenantid!='pb.testing' AND (rh.receiptdate/1000) <= ((extract(epoch from NOW())) - 604800*5))) / 10000000, 3)) as revenueCollected, (SELECT (SELECT count(*) FROM eg_pt_property_v2 WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing') + (SELECT count(*) FROM eg_tl_tradelicense WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing')+ (SELECT count(*) FROM eg_fn_firenocdetail WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing')) as servicesApplied, (SELECT count(*) FROM eg_user WHERE createddate <= to_timestamp((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing' AND type = 'CITIZEN') as noOfUsersRegistered, 'Week5' as day)) stateWideReports + baseQuery: select array_to_json(array_agg(row_to_json(stateWideReports))) from ((SELECT (SELECT count(*) FROM ((SELECT DISTINCT tenantid FROM eg_pt_property WHERE (createdtime/1000) <= (extract(epoch from NOW())) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_tl_tradelicense WHERE (createdtime/1000) <= (extract(epoch from NOW())) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_pgr_service WHERE (createdtime/1000) <= (extract(epoch from NOW())) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_fn_firenoc WHERE (createdtime/1000) <= (extract(epoch from NOW())) AND tenantid != 'pb.testing')) AS tenants) as ulbCovered,(SELECT TRUNC((SELECT SUM(payment.totalamountpaid) FROM egcl_payment payment INNER JOIN egcl_paymentdetail paymentdetail ON payment.id = paymentdetail.paymentid INNER JOIN egcl_bill bill ON paymentdetail.billid =bill.id WHERE (paymentdetail.receiptdate/1000) <= (extract(epoch from NOW())) AND payment.tenantid != 'pb.testing' AND payment.paymentstatus != 'CANCELLED') / 10000000, 3)) as revenueCollected,(SELECT (SELECT count(*) FROM eg_pt_property WHERE (createdtime/1000) <= (extract(epoch from NOW())) AND tenantid != 'pb.testing') + (SELECT count(*) FROM eg_tl_tradelicense WHERE (createdtime/1000) <= (extract(epoch from NOW())) AND tenantid != 'pb.testing')+ (SELECT count(*) FROM eg_fn_firenoc WHERE (createdtime/1000) <= (extract(epoch from NOW())) AND tenantid != 'pb.testing')) as servicesApplied, (SELECT count(*) FROM eg_user WHERE (createddate <= NOW()) AND tenantid != 'pb.testing' AND type = 'CITIZEN') as noOfUsersRegistered, 'Week0' as day) UNION (SELECT (SELECT count(*) FROM ((SELECT DISTINCT tenantid FROM eg_pt_property WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_tl_tradelicense WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_fn_firenoc WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing')) AS tenants) as ulbCovered,(SELECT TRUNC((SELECT SUM(payment.totalamountpaid) FROM egcl_payment payment INNER JOIN egcl_paymentdetail paymentdetail ON payment.id = paymentdetail.paymentid INNER JOIN egcl_bill bill ON paymentdetail.billid =bill.id WHERE (paymentdetail.receiptdate/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND payment.tenantid != 'pb.testing' AND payment.paymentstatus != 'CANCELLED') / 10000000, 3)) as revenueCollected,(SELECT (SELECT count(*) FROM eg_pt_property WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing') + (SELECT count(*) FROM eg_tl_tradelicense WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing')+(SELECT count(*) FROM eg_fn_firenocdetail WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing')) as servicesApplied, (SELECT count(*) FROM eg_user WHERE createddate <= to_timestamp((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing' AND type = 'CITIZEN') as noOfUsersRegistered, 'Week1' as day) UNION (SELECT (SELECT count(*) FROM ((SELECT DISTINCT tenantid FROM eg_pt_property WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_tl_tradelicense WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_fn_firenocdetail WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing')) AS tenants) as ulbCovered,(SELECT TRUNC((SELECT SUM(payment.totalamountpaid) FROM egcl_payment payment INNER JOIN egcl_paymentdetail paymentdetail ON payment.id = paymentdetail.paymentid INNER JOIN egcl_bill bill ON paymentdetail.billid =bill.id WHERE (paymentdetail.receiptdate/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND payment.tenantid != 'pb.testing' AND payment.paymentstatus != 'CANCELLED') / 10000000, 3)) as revenueCollected,(SELECT (SELECT count(*) FROM eg_pt_property WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing') + (SELECT count(*) FROM eg_tl_tradelicense WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing')) as servicesApplied, (SELECT count(*) FROM eg_user WHERE createddate <= to_timestamp((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing' AND type = 'CITIZEN') as noOfUsersRegistered, 'Week2' as day) UNION (SELECT (SELECT count(*) FROM ((SELECT DISTINCT tenantid FROM eg_pt_property WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_tl_tradelicense WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing')) AS tenants) as ulbCovered,(SELECT TRUNC(((SELECT SUM(payment.totalamountpaid) FROM egcl_payment payment INNER JOIN egcl_paymentdetail paymentdetail ON payment.id = paymentdetail.paymentid INNER JOIN egcl_bill bill ON paymentdetail.billid =bill.id WHERE (paymentdetail.receiptdate/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND payment.tenantid != 'pb.testing' AND payment.paymentstatus != 'CANCELLED')) / 10000000, 3)) as revenueCollected,(SELECT (SELECT count(*) FROM eg_pt_property WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing') + (SELECT count(*) FROM eg_tl_tradelicense WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing')+(SELECT count(*) FROM eg_fn_firenocdetail WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing')) as servicesApplied, (SELECT count(*) FROM eg_user WHERE createddate <= to_timestamp((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing' AND type = 'CITIZEN') as noOfUsersRegistered, 'Week3' as day) UNION (SELECT (SELECT count(*) FROM ((SELECT DISTINCT tenantid FROM eg_pt_property WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_tl_tradelicense WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_fn_firenoc WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing')) AS tenants) as ulbCovered,(SELECT TRUNC((SELECT SUM(payment.totalamountpaid) FROM egcl_payment payment INNER JOIN egcl_paymentdetail paymentdetail ON payment.id = paymentdetail.paymentid INNER JOIN egcl_bill bill ON paymentdetail.billid =bill.id WHERE (paymentdetail.receiptdate/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND payment.tenantid != 'pb.testing' AND payment.paymentstatus != 'CANCELLED') / 10000000, 3)) as revenueCollected,(SELECT (SELECT count(*) FROM eg_pt_property WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing') + (SELECT count(*) FROM eg_tl_tradelicense WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing')+ (SELECT count(*) FROM eg_fn_firenocdetail WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing')) as servicesApplied, (SELECT count(*) FROM eg_user WHERE createddate <= to_timestamp((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing' AND type = 'CITIZEN') as noOfUsersRegistered, 'Week4' as day) UNION (SELECT (SELECT count(*) FROM ((SELECT DISTINCT tenantid FROM eg_pt_property WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_tl_tradelicense WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing')UNION (SELECT DISTINCT tenantid FROM eg_fn_firenocdetail WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing')) AS tenants) as ulbCovered,(SELECT TRUNC((SELECT SUM(payment.totalamountpaid) FROM egcl_payment payment INNER JOIN egcl_paymentdetail paymentdetail ON payment.id = paymentdetail.paymentid INNER JOIN egcl_bill bill ON paymentdetail.billid =bill.id WHERE (paymentdetail.receiptdate/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND payment.tenantid != 'pb.testing' AND payment.paymentstatus != 'CANCELLED')/ 10000000, 3)) as revenueCollected, (SELECT (SELECT count(*) FROM eg_pt_property WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing') + (SELECT count(*) FROM eg_tl_tradelicense WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing')+ (SELECT count(*) FROM eg_fn_firenocdetail WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing')) as servicesApplied, (SELECT count(*) FROM eg_user WHERE createddate <= to_timestamp((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing' AND type = 'CITIZEN') as noOfUsersRegistered, 'Week5' as day)) stateWideReports searchParams: condition: AND params: - - name: rh.businessdetails - isMandatory: false - operator: IN - jsonPath: $.searchCriteria.taxHeads - - name: rh.businessdetails - isMandatory: false - operator: NOT IN - jsonPath: $.searchCriteria.ignoreTaxHeads + - name: intervalinsecs + isMandatory: true + jsonPath: $.searchCriteria.intervalinsecs - output: jsonFormat: {"ResponseInfo": {}} outJsonPath: $.data @@ -44,7 +38,7 @@ - name: pgrChannelData query: - baseQuery: select array_to_json(array_agg(row_to_json(pgrChannel))) from ((SELECT (SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= (extract (epoch from NOW())) AND tenantid != 'pb.testing') != 0) THEN CONCAT(((SELECT count(*) FROM eg_pgr_service WHERE source = 'ivr' AND (createdtime/1000) <= (extract (epoch from NOW())) AND tenantid != 'pb.testing') * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= (extract (epoch from NOW())) AND tenantid != 'pb.testing')), '%') ELSE '0%' END) as ivr), (SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= (extract (epoch from NOW())) AND tenantid != 'pb.testing') != 0) THEN CONCAT(((SELECT count(*) FROM eg_pgr_service WHERE source = 'web' AND (createdtime/1000) <= (extract (epoch from NOW())) AND tenantid != 'pb.testing') * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= (extract (epoch from NOW())) AND tenantid != 'pb.testing')), '%') ELSE '0%' END) as webapp),(SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= (extract (epoch from NOW())) AND tenantid != 'pb.testing') != 0) THEN CONCAT(((SELECT count(*) FROM eg_pgr_service WHERE source = 'mobileapp' AND (createdtime/1000) <= (extract (epoch from NOW())) AND tenantid != 'pb.testing') * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= (extract (epoch from NOW())) AND tenantid != 'pb.testing')), '%') ELSE '0%' END) as mobileapp), 'Week0' as day FROM eg_pgr_service LIMIT 1) UNION (SELECT (SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing') != 0) THEN CONCAT(((SELECT count(*) FROM eg_pgr_service WHERE source = 'ivr' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing') * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing')), '%') ELSE '0%' END) as redressal), (SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing') != 0) THEN CONCAT(((SELECT count(*) FROM eg_pgr_service WHERE source = 'web' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing') * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing')), '%') ELSE '0%' END) as redressal),(SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing') != 0) THEN CONCAT(((SELECT count(*) FROM eg_pgr_service WHERE source = 'mobileapp' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing') * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing')), '%') ELSE '0%' END) as redressal), 'Week1' as day FROM eg_pgr_service LIMIT 1) UNION (SELECT (SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing') != 0) THEN CONCAT(((SELECT count(*) FROM eg_pgr_service WHERE source = 'ivr' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing') * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing')), '%') ELSE '0%' END) as redressal), (SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing') != 0) THEN CONCAT(((SELECT count(*) FROM eg_pgr_service WHERE source = 'web' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing') * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing')), '%') ELSE '0%' END) as redressal),(SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing') != 0) THEN CONCAT(((SELECT count(*) FROM eg_pgr_service WHERE source = 'mobileapp' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing') * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing')), '%') ELSE '0%' END) as redressal), 'Week2' as day FROM eg_pgr_service LIMIT 1) UNION (SELECT (SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing') != 0) THEN CONCAT(((SELECT count(*) FROM eg_pgr_service WHERE source = 'ivr' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing') * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing')), '%') ELSE '0%' END) as redressal), (SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing') != 0) THEN CONCAT(((SELECT count(*) FROM eg_pgr_service WHERE source = 'web' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing') * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing')), '%') ELSE '0%' END) as redressal), (SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing') != 0) THEN CONCAT(((SELECT count(*) FROM eg_pgr_service WHERE source = 'mobileapp' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing') * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing')), '%') ELSE '0%' END) as redressal), 'Week3' as day FROM eg_pgr_service LIMIT 1) UNION (SELECT (SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing') != 0) THEN CONCAT(((SELECT count(*) FROM eg_pgr_service WHERE source = 'ivr' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing') * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing')), '%') ELSE '0%' END) as redressal), (SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing') != 0) THEN CONCAT(((SELECT count(*) FROM eg_pgr_service WHERE source = 'web' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing') * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing')), '%') ELSE '0%' END) as redressal), (SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing') != 0) THEN CONCAT(((SELECT count(*) FROM eg_pgr_service WHERE source = 'mobileapp' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing') * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing')), '%') ELSE '0%' END) as redressal), 'Week4' as day FROM eg_pgr_service LIMIT 1) UNION (SELECT (SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing') != 0) THEN CONCAT(((SELECT count(*) FROM eg_pgr_service WHERE source = 'ivr' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing') * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing')), '%') ELSE '0%' END) as redressal), (SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing') != 0) THEN CONCAT(((SELECT count(*) FROM eg_pgr_service WHERE source = 'web' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing') * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing')), '%') ELSE '0%' END) as redressal), (SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing') != 0) THEN CONCAT(((SELECT count(*) FROM eg_pgr_service WHERE source = 'mobileapp' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing') * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing')), '%') ELSE '0%' END) as redressal), 'Week5' as day FROM eg_pgr_service LIMIT 1)) pgrChannel + baseQuery: select array_to_json(array_agg(row_to_json(pgrChannel))) from ((SELECT (SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= (extract (epoch from NOW())) AND tenantid != 'pb.testing') != 0) THEN CONCAT(round(((SELECT count(*) FROM eg_pgr_service WHERE source = 'ivr' AND (createdtime/1000) <= (extract (epoch from NOW())) AND tenantid != 'pb.testing')::numeric * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= (extract (epoch from NOW())) AND tenantid != 'pb.testing'))::numeric, 2), '%') ELSE '0%' END) as ivr), (SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= (extract (epoch from NOW())) AND tenantid != 'pb.testing') != 0) THEN CONCAT(round(((SELECT count(*) FROM eg_pgr_service WHERE source = 'web' AND (createdtime/1000) <= (extract (epoch from NOW())) AND tenantid != 'pb.testing')::numeric * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= (extract (epoch from NOW())) AND tenantid != 'pb.testing'))::numeric, 2), '%') ELSE '0%' END) as webapp),(SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= (extract (epoch from NOW())) AND tenantid != 'pb.testing') != 0) THEN CONCAT(round(((SELECT count(*) FROM eg_pgr_service WHERE source = 'mobileapp' AND (createdtime/1000) <= (extract (epoch from NOW())) AND tenantid != 'pb.testing')::numeric * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= (extract (epoch from NOW())) AND tenantid != 'pb.testing'))::numeric, 2), '%') ELSE '0%' END) as mobileapp), (SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= (extract (epoch from NOW())) AND tenantid != 'pb.testing') != 0) THEN CONCAT(round(((SELECT count(*) FROM eg_pgr_service WHERE source = 'whatsapp' AND (createdtime/1000) <= (extract (epoch from NOW())) AND tenantid != 'pb.testing')::numeric * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= (extract (epoch from NOW())) AND tenantid != 'pb.testing'))::numeric, 2), '%') ELSE '0%' END) as whatsapp), 'Week0' as day FROM eg_pgr_service LIMIT 1) UNION (SELECT (SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing') != 0) THEN CONCAT(round(((SELECT count(*) FROM eg_pgr_service WHERE source = 'ivr' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing')::numeric * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing'))::numeric, 2), '%') ELSE '0%' END) as redressal), (SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing') != 0) THEN CONCAT(round(((SELECT count(*) FROM eg_pgr_service WHERE source = 'web' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing')::numeric * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing'))::numeric, 2), '%') ELSE '0%' END) as redressal),(SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing') != 0) THEN CONCAT(round(((SELECT count(*) FROM eg_pgr_service WHERE source = 'mobileapp' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing')::numeric * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing'))::numeric, 2), '%') ELSE '0%' END) as redressal), (SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing') != 0) THEN CONCAT(round(((SELECT count(*) FROM eg_pgr_service WHERE source = 'whatsapp' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing')::numeric * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing'))::numeric, 2), '%') ELSE '0%' END) as redressal), 'Week1' as day FROM eg_pgr_service LIMIT 1) UNION (SELECT (SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing') != 0) THEN CONCAT(round(((SELECT count(*) FROM eg_pgr_service WHERE source = 'ivr' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing')::numeric * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing'))::numeric, 2), '%') ELSE '0%' END) as redressal), (SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing') != 0) THEN CONCAT(round(((SELECT count(*) FROM eg_pgr_service WHERE source = 'web' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing')::numeric * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing'))::numeric, 2), '%') ELSE '0%' END) as redressal),(SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing') != 0) THEN CONCAT(round(((SELECT count(*) FROM eg_pgr_service WHERE source = 'mobileapp' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing')::numeric * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing'))::numeric, 2), '%') ELSE '0%' END) as redressal), (SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing') != 0) THEN CONCAT(round(((SELECT count(*) FROM eg_pgr_service WHERE source = 'whatsapp' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing')::numeric * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing'))::numeric, 2), '%') ELSE '0%' END) as redressal), 'Week2' as day FROM eg_pgr_service LIMIT 1) UNION (SELECT (SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing') != 0) THEN CONCAT(round(((SELECT count(*) FROM eg_pgr_service WHERE source = 'ivr' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing')::numeric * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing'))::numeric, 2), '%') ELSE '0%' END) as redressal), (SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing') != 0) THEN CONCAT(round(((SELECT count(*) FROM eg_pgr_service WHERE source = 'web' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing')::numeric * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing'))::numeric, 2), '%') ELSE '0%' END) as redressal), (SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing') != 0) THEN CONCAT(round(((SELECT count(*) FROM eg_pgr_service WHERE source = 'mobileapp' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing')::numeric * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing'))::numeric, 2), '%') ELSE '0%' END) as redressal), (SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing') != 0) THEN CONCAT(round(((SELECT count(*) FROM eg_pgr_service WHERE source = 'whatsapp' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing')::numeric * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing'))::numeric, 2), '%') ELSE '0%' END) as redressal), 'Week3' as day FROM eg_pgr_service LIMIT 1) UNION (SELECT (SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing') != 0) THEN CONCAT(round(((SELECT count(*) FROM eg_pgr_service WHERE source = 'ivr' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing')::numeric * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing'))::numeric, 2), '%') ELSE '0%' END) as redressal), (SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing') != 0) THEN CONCAT(round(((SELECT count(*) FROM eg_pgr_service WHERE source = 'web' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing')::numeric * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing'))::numeric, 2), '%') ELSE '0%' END) as redressal), (SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing') != 0) THEN CONCAT(round(((SELECT count(*) FROM eg_pgr_service WHERE source = 'mobileapp' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing')::numeric * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing'))::numeric, 2), '%') ELSE '0%' END) as redressal), (SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing') != 0) THEN CONCAT(round(((SELECT count(*) FROM eg_pgr_service WHERE source = 'whatsapp' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing')::numeric * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing'))::numeric, 2), '%') ELSE '0%' END) as redressal), 'Week4' as day FROM eg_pgr_service LIMIT 1) UNION (SELECT (SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing') != 0) THEN CONCAT(round(((SELECT count(*) FROM eg_pgr_service WHERE source = 'ivr' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing')::numeric * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing'))::numeric, 2), '%') ELSE '0%' END) as redressal), (SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing') != 0) THEN CONCAT(round(((SELECT count(*) FROM eg_pgr_service WHERE source = 'web' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing')::numeric * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing'))::numeric, 2), '%') ELSE '0%' END) as redressal), (SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing') != 0) THEN CONCAT(round(((SELECT count(*) FROM eg_pgr_service WHERE source = 'mobileapp' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing')::numeric * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing'))::numeric, 2), '%') ELSE '0%' END) as redressal), (SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing') != 0) THEN CONCAT(round(((SELECT count(*) FROM eg_pgr_service WHERE source = 'whatsapp' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing')::numeric * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing'))::numeric, 2), '%') ELSE '0%' END) as redressal), 'Week5' as day FROM eg_pgr_service LIMIT 1)) pgrChannel searchParams: condition: AND params: @@ -61,8 +55,7 @@ - name: ptData query: - baseQuery: select array_to_json(array_agg(row_to_json(ptReports))) from ((SELECT (SELECT count(DISTINCT tenantid) as ulbCovered FROM eg_pt_property_v2 WHERE (createdtime/1000) <= (extract (epoch from NOW())) AND tenantid != 'pb.testing'), TRUNC(SUM(ins.amount) / 10000000, 3) as revenuecollected, CONCAT((count(DISTINCT pt.propertyid) / 1000), '.', MOD(count(DISTINCT pt.propertyid), 1000)) as noofpropertiescreated, 'Week0' as day FROM eg_pt_property_v2 pt INNER JOIN egcl_receiptheader_v1 rh ON pt.propertyid = SPLIT_PART(rh.consumercode, ':', 1) INNER JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id WHERE (rh.receiptdate/1000) <= (extract(epoch from NOW())) AND pt.tenantid != 'pb.testing' AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED') UNION (SELECT (SELECT count(DISTINCT tenantid) as ulbCovered FROM eg_pt_property_v2 WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing'), TRUNC(SUM(ins.amount) / 10000000, 3) as revenuecollected, CONCAT((count(DISTINCT pt.propertyid) / 1000), '.', MOD(count(DISTINCT pt.propertyid), 1000)) as noofpropertiescreated, 'Week1' as day FROM eg_pt_property_v2 pt INNER JOIN egcl_receiptheader_v1 rh ON pt.propertyid = SPLIT_PART(rh.consumercode, ':', 1) INNER JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id WHERE (rh.receiptdate/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND pt.tenantid != 'pb.testing' AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED') UNION (SELECT (SELECT count(DISTINCT tenantid) as ulbCovered FROM eg_pt_property_v2 WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing'), TRUNC(SUM(ins.amount) / 10000000, 3) as revenuecollected, CONCAT((count(DISTINCT pt.propertyid) / 1000), '.', MOD(count(DISTINCT pt.propertyid), 1000)) as noofpropertiescreated, 'Week2' as day FROM eg_pt_property_v2 pt INNER JOIN egcl_receiptheader_v1 rh ON pt.propertyid = SPLIT_PART(rh.consumercode, ':', 1) INNER JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id WHERE (rh.receiptdate/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND pt.tenantid != 'pb.testing' AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED') UNION (SELECT (SELECT count(DISTINCT tenantid) as ulbCovered FROM eg_pt_property_v2 WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing'), TRUNC(SUM(ins.amount) / 10000000, 3) as revenuecollected, CONCAT((count(DISTINCT pt.propertyid) / 1000), '.', MOD(count(DISTINCT pt.propertyid), 1000)) as noofpropertiescreated, 'Week3' as day FROM eg_pt_property_v2 pt INNER JOIN egcl_receiptheader_v1 rh ON pt.propertyid = SPLIT_PART(rh.consumercode, ':', 1) INNER JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id WHERE (rh.receiptdate/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND pt.tenantid != 'pb.testing' AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED') UNION (SELECT (SELECT count(DISTINCT tenantid) as ulbCovered FROM eg_pt_property_v2 WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing'), TRUNC(SUM(ins.amount) / 10000000, 3) as revenuecollected, CONCAT((count(DISTINCT pt.propertyid) / 1000), '.', MOD(count(DISTINCT pt.propertyid), 1000)) as noofpropertiescreated, 'Week4' as day FROM eg_pt_property_v2 pt INNER JOIN egcl_receiptheader_v1 rh ON pt.propertyid = SPLIT_PART(rh.consumercode, ':', 1) INNER JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id WHERE (rh.receiptdate/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND pt.tenantid != 'pb.testing' AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED') UNION (SELECT (SELECT count(DISTINCT tenantid) as ulbCovered FROM eg_pt_property_v2 WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing'), TRUNC(SUM(ins.amount) / 10000000, 3) as revenuecollected, CONCAT((count(DISTINCT pt.propertyid) / 1000), '.', MOD(count(DISTINCT pt.propertyid), 1000)) as noofpropertiescreated, 'Week5' as day FROM eg_pt_property_v2 pt INNER JOIN egcl_receiptheader_v1 rh ON pt.propertyid = SPLIT_PART(rh.consumercode, ':', 1) INNER JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id WHERE (rh.receiptdate/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND pt.tenantid != 'pb.testing' AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED')) ptReports - + baseQuery: select array_to_json(array_agg(row_to_json(ptReports))) from ((SELECT (SELECT count(DISTINCT tenantid) as ulbCovered FROM eg_pt_property WHERE (createdtime/1000) <= (extract (epoch from NOW())) AND tenantid != 'pb.testing'), TRUNC(SUM(payment.totalamountpaid) / 10000000, 3) as revenuecollected, CONCAT((count(DISTINCT pt.propertyid) / 1000), '.', MOD(count(DISTINCT pt.propertyid), 1000)) as noofpropertiescreated, 'Week0' as day FROM eg_pt_property pt INNER JOIN egcl_bill bill ON pt.propertyid = bill.consumercode INNER JOIN egcl_paymentdetail paymentdetail ON bill.id = paymentdetail.billid INNER JOIN egcl_payment payment ON paymentdetail.paymentid =payment.id WHERE (paymentdetail.receiptdate/1000) <= (extract(epoch from NOW())) AND pt.tenantid != 'pb.testing' AND payment.tenantid != 'pb.testing' AND payment.paymentstatus != 'CANCELLED') UNION (SELECT (SELECT count(DISTINCT tenantid) as ulbCovered FROM eg_pt_property WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing'), TRUNC(SUM(payment.totalamountpaid) / 10000000, 3) as revenuecollected, CONCAT((count(DISTINCT pt.propertyid) / 1000), '.', MOD(count(DISTINCT pt.propertyid), 1000)) as noofpropertiescreated, 'Week1' as day FROM eg_pt_property pt INNER JOIN egcl_bill bill ON pt.propertyid = bill.consumercode INNER JOIN egcl_paymentdetail paymentdetail ON bill.id = paymentdetail.billid INNER JOIN egcl_payment payment ON paymentdetail.paymentid =payment.id WHERE (paymentdetail.receiptdate/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND pt.tenantid != 'pb.testing' AND payment.paymentstatus != 'CANCELLED') UNION (SELECT (SELECT count(DISTINCT tenantid) as ulbCovered FROM eg_pt_property WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing'), TRUNC(SUM(payment.totalamountpaid) / 10000000, 3) as revenuecollected, CONCAT((count(DISTINCT pt.propertyid) / 1000), '.', MOD(count(DISTINCT pt.propertyid), 1000)) as noofpropertiescreated, 'Week2' as day FROM eg_pt_property pt INNER JOIN egcl_bill bill ON pt.propertyid = bill.consumercode INNER JOIN egcl_paymentdetail paymentdetail ON bill.id = paymentdetail.billid INNER JOIN egcl_payment payment ON paymentdetail.paymentid =payment.id WHERE (paymentdetail.receiptdate/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND pt.tenantid != 'pb.testing' AND payment.paymentstatus != 'CANCELLED') UNION (SELECT (SELECT count(DISTINCT tenantid) as ulbCovered FROM eg_pt_property WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing'), TRUNC(SUM(payment.totalamountpaid) / 10000000, 3) as revenuecollected, CONCAT((count(DISTINCT pt.propertyid) / 1000), '.', MOD(count(DISTINCT pt.propertyid), 1000)) as noofpropertiescreated, 'Week3' as day FROM eg_pt_property pt INNER JOIN egcl_bill bill ON pt.propertyid = bill.consumercode INNER JOIN egcl_paymentdetail paymentdetail ON bill.id = paymentdetail.billid INNER JOIN egcl_payment payment ON paymentdetail.paymentid =payment.id WHERE (paymentdetail.receiptdate/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND pt.tenantid != 'pb.testing' AND payment.paymentstatus != 'CANCELLED') UNION (SELECT (SELECT count(DISTINCT tenantid) as ulbCovered FROM eg_pt_property WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing'), TRUNC(SUM(payment.totalamountpaid) / 10000000, 3) as revenuecollected, CONCAT((count(DISTINCT pt.propertyid) / 1000), '.', MOD(count(DISTINCT pt.propertyid), 1000)) as noofpropertiescreated, 'Week4' as day FROM eg_pt_property pt INNER JOIN egcl_bill bill ON pt.propertyid = bill.consumercode INNER JOIN egcl_paymentdetail paymentdetail ON bill.id = paymentdetail.billid INNER JOIN egcl_payment payment ON paymentdetail.paymentid =payment.id WHERE (paymentdetail.receiptdate/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND pt.tenantid != 'pb.testing' AND payment.paymentstatus != 'CANCELLED') UNION (SELECT (SELECT count(DISTINCT tenantid) as ulbCovered FROM eg_pt_property WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing'), TRUNC(SUM(payment.totalamountpaid) / 10000000, 3) as revenuecollected, CONCAT((count(DISTINCT pt.propertyid) / 1000), '.', MOD(count(DISTINCT pt.propertyid), 1000)) as noofpropertiescreated, 'Week5' as day FROM eg_pt_property pt INNER JOIN egcl_bill bill ON pt.propertyid = bill.consumercode INNER JOIN egcl_paymentdetail paymentdetail ON bill.id = paymentdetail.billid INNER JOIN egcl_payment payment ON paymentdetail.paymentid =payment.id WHERE (paymentdetail.receiptdate/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND pt.tenantid != 'pb.testing' AND payment.paymentstatus != 'CANCELLED')) ptReports searchParams: condition: AND params: @@ -79,7 +72,8 @@ - name: tlData query: - baseQuery: select array_to_json(array_agg(row_to_json(tlReports))) from (SELECT count(DISTINCT tl.tenantid) as ulbCovered , count(*) as licenseIssued,TRUNC(SUM(ins.amount) / 10000000, 3) as revenuecollected, 'Week0' as day FROM eg_tl_tradelicense as tl INNER JOIN egcl_receiptheader_v1 rh ON tl.applicationnumber = rh.consumercode INNER JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id WHERE (rh.receiptdate/1000) <= (extract(epoch from NOW())) AND tl.tenantid != 'pb.testing' AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED' AND tl.status='APPROVED' UNION SELECT count(DISTINCT tl.tenantid) as ulbCovered , count(*) as licenseIssued, TRUNC(SUM(ins.amount) / 10000000, 3) as revenuecollected,'Week1' as day FROM eg_tl_tradelicense tl INNER JOIN egcl_receiptheader_v1 rh ON tl.applicationnumber = rh.consumercode INNER JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tl.tenantid != 'pb.testing' AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED' AND tl.status='APPROVED' UNION SELECT count(DISTINCT tl.tenantid) as ulbCovered , count(*) as licenseIssued,TRUNC(SUM(ins.amount) / 10000000, 3) as revenuecollected, 'Week2' as day FROM eg_tl_tradelicense tl INNER JOIN egcl_receiptheader_v1 rh ON tl.applicationnumber = rh.consumercode INNER JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800*2) AND tl.tenantid != 'pb.testing' AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED' UNION SELECT count(DISTINCT tl.tenantid) as ulbCovered , count(*) as licenseIssued,TRUNC(SUM(ins.amount) / 10000000, 3) as revenuecollected, 'Week3' as day FROM eg_tl_tradelicense tl INNER JOIN egcl_receiptheader_v1 rh ON tl.applicationnumber = rh.consumercode INNER JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800*3) AND tl.tenantid != 'pb.testing' AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED' AND tl.status='APPROVED' UNION SELECT count(DISTINCT tl.tenantid) as ulbCovered , count(*) as licenseIssued,TRUNC(SUM(ins.amount) / 10000000, 3) as revenuecollected, 'Week4' as day FROM eg_tl_tradelicense tl INNER JOIN egcl_receiptheader_v1 rh ON tl.applicationnumber = rh.consumercode INNER JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800*4) AND tl.tenantid != 'pb.testing' AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED' AND tl.status='APPROVED' UNION SELECT count(DISTINCT tl.tenantid) as ulbCovered , count(*) as licenseIssued,TRUNC(SUM(ins.amount) / 10000000, 3) as revenuecollected, 'Week5' as day FROM eg_tl_tradelicense tl INNER JOIN egcl_receiptheader_v1 rh ON tl.applicationnumber = rh.consumercode INNER JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800*5) AND tl.tenantid != 'pb.testing' AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED' AND tl.status='APPROVED') tlReports + baseQuery: select array_to_json(array_agg(row_to_json(tlReports))) from (SELECT count(DISTINCT tl.tenantid) as ulbCovered , count(*) as licenseIssued,TRUNC(SUM(payment.totalamountpaid) / 10000000, 3) as revenuecollected, 'Week0' as day FROM eg_tl_tradelicense as tl INNER JOIN egcl_bill bill ON tl.applicationnumber = bill.consumercode INNER JOIN egcl_paymentdetail paymentdetail ON bill.id = paymentdetail.billid INNER JOIN egcl_payment payment ON paymentdetail.paymentid =payment.id WHERE (paymentdetail.receiptdate/1000) <= (extract(epoch from NOW())) AND tl.tenantid != 'pb.testing' AND payment.paymentstatus != 'CANCELLED' AND tl.status='APPROVED' UNION SELECT count(DISTINCT tl.tenantid) as ulbCovered , count(*) as licenseIssued, TRUNC(SUM(payment.totalamountpaid) / 10000000, 3) as revenuecollected,'Week1' as day FROM eg_tl_tradelicense tl INNER JOIN egcl_bill bill ON tl.applicationnumber = bill.consumercode INNER JOIN egcl_paymentdetail paymentdetail ON bill.id = paymentdetail.billid INNER JOIN egcl_payment payment ON paymentdetail.paymentid =payment.id WHERE (paymentdetail.receiptdate/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tl.tenantid != 'pb.testing' AND payment.paymentstatus != 'CANCELLED' AND tl.status='APPROVED' UNION SELECT count(DISTINCT tl.tenantid) as ulbCovered , count(*) as licenseIssued,TRUNC(SUM(payment.totalamountpaid) / 10000000, 3) as revenuecollected, 'Week2' as day FROM eg_tl_tradelicense tl INNER JOIN egcl_bill bill ON tl.applicationnumber = bill.consumercode INNER JOIN egcl_paymentdetail paymentdetail ON bill.id = paymentdetail.billid INNER JOIN egcl_payment payment ON paymentdetail.paymentid =payment.id WHERE (paymentdetail.receiptdate/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800*2) AND tl.tenantid != 'pb.testing' AND payment.paymentstatus != 'CANCELLED' AND tl.status='APPROVED' UNION SELECT count(DISTINCT tl.tenantid) as ulbCovered , count(*) as licenseIssued,TRUNC(SUM(payment.totalamountpaid) / 10000000, 3) as revenuecollected, 'Week3' as day FROM eg_tl_tradelicense tl INNER JOIN egcl_bill bill ON tl.applicationnumber = bill.consumercode INNER JOIN egcl_paymentdetail paymentdetail ON bill.id = paymentdetail.billid INNER JOIN egcl_payment payment ON paymentdetail.paymentid =payment.id WHERE (paymentdetail.receiptdate/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800*3) AND tl.tenantid != 'pb.testing' AND payment.paymentstatus != 'CANCELLED' AND tl.status='APPROVED' UNION SELECT count(DISTINCT tl.tenantid) as ulbCovered , count(*) as licenseIssued,TRUNC(SUM(payment.totalamountpaid) / 10000000, 3) as revenuecollected, 'Week4' as day FROM eg_tl_tradelicense tl INNER JOIN egcl_bill bill ON tl.applicationnumber = bill.consumercode INNER JOIN egcl_paymentdetail paymentdetail ON bill.id = paymentdetail.billid INNER JOIN egcl_payment payment ON paymentdetail.paymentid =payment.id WHERE (paymentdetail.receiptdate/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800*4) AND tl.tenantid != 'pb.testing' AND payment.paymentstatus != 'CANCELLED' AND tl.status='APPROVED' UNION SELECT count(DISTINCT tl.tenantid) as ulbCovered , count(*) as licenseIssued,TRUNC(SUM(payment.totalamountpaid) / 10000000, 3) as revenuecollected, 'Week5' as day FROM eg_tl_tradelicense tl INNER JOIN egcl_bill bill ON tl.applicationnumber = bill.consumercode INNER JOIN egcl_paymentdetail paymentdetail ON bill.id = paymentdetail.billid INNER JOIN egcl_payment payment ON paymentdetail.paymentid =payment.id WHERE (paymentdetail.receiptdate/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800*5) AND tl.tenantid != 'pb.testing' AND payment.paymentstatus != 'CANCELLED' AND tl.status='APPROVED') tlReports + searchParams: condition: AND params: @@ -96,23 +90,23 @@ - name: miscCollections query: - baseQuery: SELECT array_to_json(array_agg(row_to_json(misccollections))) from ((SELECT COUNT(*) as receiptscreated, TRUNC(SUM(ins.amount) / 10000000, 3) as revenuecollected, 'Week0' as day FROM egcl_receiptheader_v1 rh LEFT JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id $where AND (rh.receiptdate/1000) <= (extract(epoch from NOW()))) UNION (SELECT COUNT(*) as receiptscreated, TRUNC(SUM(ins.amount) / 10000000, 3) as revenuecollected, 'Week1' as day FROM egcl_receiptheader_v1 rh LEFT JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id $where AND (rh.receiptdate/1000) <= ((extract(epoch from NOW())) - 604800)) UNION (SELECT COUNT(*) as receiptscreated, TRUNC(SUM(ins.amount) / 10000000, 3) as revenuecollected, 'Week2' as day FROM egcl_receiptheader_v1 rh LEFT JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id $where AND (rh.receiptdate/1000) <= ((extract(epoch from NOW())) - 604800 * 2)) UNION (SELECT COUNT(*) as receiptscreated, TRUNC(SUM(ins.amount) / 10000000, 3) as revenuecollected, 'Week3' as day FROM egcl_receiptheader_v1 rh LEFT JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id $where AND (rh.receiptdate/1000) <= ((extract(epoch from NOW())) - 604800 * 3)) UNION (SELECT COUNT(*) as receiptscreated, TRUNC(SUM(ins.amount) / 10000000, 3) as revenuecollected, 'Week4' as day FROM egcl_receiptheader_v1 rh LEFT JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id $where AND (rh.receiptdate/1000) <= ((extract(epoch from NOW())) - 604800 * 4)) UNION (SELECT COUNT(*) as receiptscreated, TRUNC(SUM(ins.amount) / 10000000, 3) as revenuecollected, 'Week5' as day FROM egcl_receiptheader_v1 rh LEFT JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id $where AND (rh.receiptdate/1000) <= ((extract(epoch from NOW())) - 604800 * 5))) misccollections + baseQuery:SELECT array_to_json(array_agg(row_to_json(misccollections))) from ((SELECT COUNT(*) as receiptscreated, TRUNC(SUM(payment.totalamountpaid) / 10000000, 3) as revenuecollected, 'Week0' as day FROM egcl_payment payment LEFT JOIN egcl_paymentdetail paymentdetail ON payment.id = paymentdetail.paymentid $where AND (paymentdetail.receiptdate/1000) <= (extract(epoch from NOW()))) UNION (SELECT COUNT(*) as receiptscreated, TRUNC(SUM(payment.totalamountpaid) / 10000000, 3) as revenuecollected, 'Week1' as day FROM egcl_payment payment LEFT JOIN egcl_paymentdetail paymentdetail ON payment.id = paymentdetail.paymentid $where AND (paymentdetail.receiptdate/1000) <= ((extract(epoch from NOW())) - 604800)) UNION (SELECT COUNT(*) as receiptscreated, TRUNC(SUM(payment.totalamountpaid) / 10000000, 3) as revenuecollected, 'Week2' as day FROM egcl_payment payment LEFT JOIN egcl_paymentdetail paymentdetail ON payment.id = paymentdetail.paymentid $where AND (paymentdetail.receiptdate/1000) <= ((extract(epoch from NOW())) - 604800 * 2)) UNION (SELECT COUNT(*) as receiptscreated, TRUNC(SUM(payment.totalamountpaid) / 10000000, 3) as revenuecollected, 'Week3' as day FROM egcl_payment payment LEFT JOIN egcl_paymentdetail paymentdetail ON payment.id = paymentdetail.paymentid $where AND (paymentdetail.receiptdate/1000) <= ((extract(epoch from NOW())) - 604800 * 3)) UNION (SELECT COUNT(*) as receiptscreated, TRUNC(SUM(payment.totalamountpaid) / 10000000, 3) as revenuecollected, 'Week4' as day FROM egcl_payment payment LEFT JOIN egcl_paymentdetail paymentdetail ON payment.id = paymentdetail.paymentid $where AND (paymentdetail.receiptdate/1000) <= ((extract(epoch from NOW())) - 604800 * 4)) UNION (SELECT COUNT(*) as receiptscreated, TRUNC(SUM(payment.totalamountpaid) / 10000000, 3) as revenuecollected, 'Week5' as day FROM egcl_payment payment LEFT JOIN egcl_paymentdetail paymentdetail ON payment.id = paymentdetail.paymentid $where AND (paymentdetail.receiptdate/1000) <= ((extract(epoch from NOW())) - 604800 * 5))) misccollections searchParams: condition: AND params: - - name: rh.tenantid + - name: payment.tenantid isMandatory: true operator: NE jsonPath: $.searchCriteria.ignoreTenant - - name: rh.businessdetails + - name: paymentdetail.businessservice isMandatory: false operator: IN jsonPath: $.searchCriteria.taxHeads - - name: rh.businessdetails + - name: paymentdetail.businessservice isMandatory: false operator: NOT IN jsonPath: $.searchCriteria.ignoreTaxHeads - - name: rh.status + - name: payment.paymentstatus isMandatory: true operator: NE jsonPath: $.searchCriteria.ignoreStatus @@ -124,7 +118,7 @@ - name: firenocData query: - baseQuery: select array_to_json(array_agg(row_to_json(firenocReports))) from (SELECT count(DISTINCT fn.tenantid) as ulbCovered , count(*) as certificatesIssued,COALESCE(TRUNC(SUM(ins.amount) / 10000000, 3),0) as revenuecollected, 'Week0' as day FROM eg_fn_firenocdetail as fn INNER JOIN egcl_receiptheader_v1 rh ON fn.applicationnumber = rh.consumercode INNER JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id WHERE (rh.receiptdate/1000) <= (extract(epoch from NOW())) AND fn.tenantid != 'pb.testing' AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED' AND fn.status='APPROVED' UNION SELECT count(DISTINCT fn.tenantid) as ulbCovered , count(*) as certficatesIssued, COALESCE(TRUNC(SUM(ins.amount) / 10000000, 3),0) as revenuecollected,'Week1' as day FROM eg_fn_firenocdetail fn INNER JOIN egcl_receiptheader_v1 rh ON fn.applicationnumber = rh.consumercode INNER JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND fn.tenantid != 'pb.testing' AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED' AND fn.status='APPROVED' UNION SELECT count(DISTINCT fn.tenantid) as ulbCovered , count(*) as certficatesIssued,COALESCE(TRUNC(SUM(ins.amount) / 10000000, 3),0) as revenuecollected, 'Week2' as day FROM eg_fn_firenocdetail fn INNER JOIN egcl_receiptheader_v1 rh ON fn.applicationnumber = rh.consumercode INNER JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800*2) AND fn.tenantid != 'pb.testing' AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED' UNION SELECT count(DISTINCT fn.tenantid) as ulbCovered , count(*) as certificatesIssued,COALESCE(TRUNC(SUM(ins.amount) / 10000000, 3),0) as revenuecollected, 'Week3' as day FROM eg_fn_firenocdetail fn INNER JOIN egcl_receiptheader_v1 rh ON fn.applicationnumber = rh.consumercode INNER JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800*3) AND fn.tenantid != 'pb.testing' AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED' AND fn.status='APPROVED' UNION SELECT count(DISTINCT fn.tenantid) as ulbCovered , count(*) as certficatesIssued,COALESCE(TRUNC(SUM(ins.amount) / 10000000, 3),0) as revenuecollected, 'Week4' as day FROM eg_fn_firenocdetail fn INNER JOIN egcl_receiptheader_v1 rh ON fn.applicationnumber = rh.consumercode INNER JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800*4) AND fn.tenantid != 'pb.testing' AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED' AND fn.status='APPROVED' UNION SELECT count(DISTINCT fn.tenantid) as ulbCovered , count(*) as certficatesIssued,COALESCE(TRUNC(SUM(ins.amount) / 10000000, 3),0) as revenuecollected, 'Week5' as day FROM eg_fn_firenocdetail fn INNER JOIN egcl_receiptheader_v1 rh ON fn.applicationnumber = rh.consumercode INNER JOIN egcl_receiptinstrument_v1 rins ON rh.id = rins.receiptheader INNER JOIN egcl_instrumentheader_v1 ins ON rins.instrumentheader = ins.id WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800*5) AND fn.tenantid != 'pb.testing' AND rh.status != 'Cancelled' AND ins.instrumentstatus != 'CANCELLED' AND fn.status='APPROVED') firenocReports + baseQuery: select array_to_json(array_agg(row_to_json(firenocReports))) from (SELECT count(DISTINCT fn.tenantid) as ulbCovered , count(*) as certificatesIssued,COALESCE(TRUNC(SUM(payment.totalamountpaid) / 10000000, 3),0) as revenuecollected, 'Week0' as day FROM eg_fn_firenocdetail as fn INNER JOIN egcl_bill bill ON fn.applicationnumber = bill.consumercode INNER JOIN egcl_paymentdetail paymentdetail ON bill.id = paymentdetail.billid INNER JOIN egcl_payment payment ON paymentdetail.paymentid =payment.id WHERE (paymentdetail.receiptdate/1000) <= (extract(epoch from NOW())) AND fn.tenantid != 'pb.testing' AND payment.paymentstatus='CANCELLED' AND fn.status='APPROVED' UNION SELECT count(DISTINCT fn.tenantid) as ulbCovered , count(*) as certficatesIssued, COALESCE(TRUNC(SUM(payment.totalamountpaid) / 10000000, 3),0) as revenuecollected,'Week1' as day FROM eg_fn_firenocdetail fn INNER JOIN egcl_bill bill ON fn.applicationnumber = bill.consumercode INNER JOIN egcl_paymentdetail paymentdetail ON bill.id = paymentdetail.billid INNER JOIN egcl_payment payment ON paymentdetail.paymentid =payment.id WHERE (paymentdetail.receiptdate/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND fn.tenantid != 'pb.testing' AND payment.paymentstatus='CANCELLED' AND fn.status='APPROVED' UNION SELECT count(DISTINCT fn.tenantid) as ulbCovered , count(*) as certficatesIssued,COALESCE(TRUNC(SUM(payment.totalamountpaid) / 10000000, 3),0) as revenuecollected, 'Week2' as day FROM eg_fn_firenocdetail fn INNER JOIN egcl_bill bill ON fn.applicationnumber = bill.consumercode INNER JOIN egcl_paymentdetail paymentdetail ON bill.id = paymentdetail.billid INNER JOIN egcl_payment payment ON paymentdetail.paymentid =payment.id WHERE (paymentdetail.receiptdate/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800*2) AND fn.tenantid != 'pb.testing' AND payment.paymentstatus='CANCELLED' AND fn.status='APPROVED' UNION SELECT count(DISTINCT fn.tenantid) as ulbCovered , count(*) as certificatesIssued,COALESCE(TRUNC(SUM(payment.totalamountpaid) / 10000000, 3),0) as revenuecollected, 'Week3' as day FROM eg_fn_firenocdetail fn INNER JOIN egcl_bill bill ON fn.applicationnumber = bill.consumercode INNER JOIN egcl_paymentdetail paymentdetail ON bill.id = paymentdetail.billid INNER JOIN egcl_payment payment ON paymentdetail.paymentid =payment.id WHERE (paymentdetail.receiptdate/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800*3) AND fn.tenantid != 'pb.testing' AND payment.paymentstatus='CANCELLED' AND fn.status='APPROVED' UNION SELECT count(DISTINCT fn.tenantid) as ulbCovered , count(*) as certficatesIssued,COALESCE(TRUNC(SUM(payment.totalamountpaid) / 10000000, 3),0) as revenuecollected, 'Week4' as day FROM eg_fn_firenocdetail fn INNER JOIN egcl_bill bill ON fn.applicationnumber = bill.consumercode INNER JOIN egcl_paymentdetail paymentdetail ON bill.id = paymentdetail.billid INNER JOIN egcl_payment payment ON paymentdetail.paymentid =payment.id WHERE (paymentdetail.receiptdate/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800*4) AND fn.tenantid != 'pb.testing' AND payment.paymentstatus='CANCELLED' AND fn.status='APPROVED' UNION SELECT count(DISTINCT fn.tenantid) as ulbCovered , count(*) as certficatesIssued,COALESCE(TRUNC(SUM(payment.totalamountpaid) / 10000000, 3),0) as revenuecollected, 'Week5' as day FROM eg_fn_firenocdetail fn INNER JOIN egcl_bill bill ON fn.applicationnumber = bill.consumercode INNER JOIN egcl_paymentdetail paymentdetail ON bill.id = paymentdetail.billid INNER JOIN egcl_payment payment ON paymentdetail.paymentid =payment.id WHERE (paymentdetail.receiptdate/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800*5) AND fn.tenantid != 'pb.testing' AND payment.paymentstatus='CANCELLED' AND fn.status='APPROVED') firenocReports searchParams: condition: AND params: From b09f773c8f68783044de2501dde15f703c488a7e Mon Sep 17 00:00:00 2001 From: narendrabandhamneni-wt-egov Date: Tue, 8 Dec 2020 16:35:02 +0530 Subject: [PATCH 0500/1242] added space --- configs/egov-searcher/weekly-impact-emailer-searcher.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-searcher/weekly-impact-emailer-searcher.yml b/configs/egov-searcher/weekly-impact-emailer-searcher.yml index 6c95ec9c..2cf53cd1 100644 --- a/configs/egov-searcher/weekly-impact-emailer-searcher.yml +++ b/configs/egov-searcher/weekly-impact-emailer-searcher.yml @@ -90,7 +90,7 @@ - name: miscCollections query: - baseQuery:SELECT array_to_json(array_agg(row_to_json(misccollections))) from ((SELECT COUNT(*) as receiptscreated, TRUNC(SUM(payment.totalamountpaid) / 10000000, 3) as revenuecollected, 'Week0' as day FROM egcl_payment payment LEFT JOIN egcl_paymentdetail paymentdetail ON payment.id = paymentdetail.paymentid $where AND (paymentdetail.receiptdate/1000) <= (extract(epoch from NOW()))) UNION (SELECT COUNT(*) as receiptscreated, TRUNC(SUM(payment.totalamountpaid) / 10000000, 3) as revenuecollected, 'Week1' as day FROM egcl_payment payment LEFT JOIN egcl_paymentdetail paymentdetail ON payment.id = paymentdetail.paymentid $where AND (paymentdetail.receiptdate/1000) <= ((extract(epoch from NOW())) - 604800)) UNION (SELECT COUNT(*) as receiptscreated, TRUNC(SUM(payment.totalamountpaid) / 10000000, 3) as revenuecollected, 'Week2' as day FROM egcl_payment payment LEFT JOIN egcl_paymentdetail paymentdetail ON payment.id = paymentdetail.paymentid $where AND (paymentdetail.receiptdate/1000) <= ((extract(epoch from NOW())) - 604800 * 2)) UNION (SELECT COUNT(*) as receiptscreated, TRUNC(SUM(payment.totalamountpaid) / 10000000, 3) as revenuecollected, 'Week3' as day FROM egcl_payment payment LEFT JOIN egcl_paymentdetail paymentdetail ON payment.id = paymentdetail.paymentid $where AND (paymentdetail.receiptdate/1000) <= ((extract(epoch from NOW())) - 604800 * 3)) UNION (SELECT COUNT(*) as receiptscreated, TRUNC(SUM(payment.totalamountpaid) / 10000000, 3) as revenuecollected, 'Week4' as day FROM egcl_payment payment LEFT JOIN egcl_paymentdetail paymentdetail ON payment.id = paymentdetail.paymentid $where AND (paymentdetail.receiptdate/1000) <= ((extract(epoch from NOW())) - 604800 * 4)) UNION (SELECT COUNT(*) as receiptscreated, TRUNC(SUM(payment.totalamountpaid) / 10000000, 3) as revenuecollected, 'Week5' as day FROM egcl_payment payment LEFT JOIN egcl_paymentdetail paymentdetail ON payment.id = paymentdetail.paymentid $where AND (paymentdetail.receiptdate/1000) <= ((extract(epoch from NOW())) - 604800 * 5))) misccollections + baseQuery: select array_to_json(array_agg(row_to_json(misccollections))) from ((SELECT COUNT(*) as receiptscreated, TRUNC(SUM(payment.totalamountpaid) / 10000000, 3) as revenuecollected, 'Week0' as day FROM egcl_payment payment LEFT JOIN egcl_paymentdetail paymentdetail ON payment.id = paymentdetail.paymentid $where AND (paymentdetail.receiptdate/1000) <= (extract(epoch from NOW()))) UNION (SELECT COUNT(*) as receiptscreated, TRUNC(SUM(payment.totalamountpaid) / 10000000, 3) as revenuecollected, 'Week1' as day FROM egcl_payment payment LEFT JOIN egcl_paymentdetail paymentdetail ON payment.id = paymentdetail.paymentid $where AND (paymentdetail.receiptdate/1000) <= ((extract(epoch from NOW())) - 604800)) UNION (SELECT COUNT(*) as receiptscreated, TRUNC(SUM(payment.totalamountpaid) / 10000000, 3) as revenuecollected, 'Week2' as day FROM egcl_payment payment LEFT JOIN egcl_paymentdetail paymentdetail ON payment.id = paymentdetail.paymentid $where AND (paymentdetail.receiptdate/1000) <= ((extract(epoch from NOW())) - 604800 * 2)) UNION (SELECT COUNT(*) as receiptscreated, TRUNC(SUM(payment.totalamountpaid) / 10000000, 3) as revenuecollected, 'Week3' as day FROM egcl_payment payment LEFT JOIN egcl_paymentdetail paymentdetail ON payment.id = paymentdetail.paymentid $where AND (paymentdetail.receiptdate/1000) <= ((extract(epoch from NOW())) - 604800 * 3)) UNION (SELECT COUNT(*) as receiptscreated, TRUNC(SUM(payment.totalamountpaid) / 10000000, 3) as revenuecollected, 'Week4' as day FROM egcl_payment payment LEFT JOIN egcl_paymentdetail paymentdetail ON payment.id = paymentdetail.paymentid $where AND (paymentdetail.receiptdate/1000) <= ((extract(epoch from NOW())) - 604800 * 4)) UNION (SELECT COUNT(*) as receiptscreated, TRUNC(SUM(payment.totalamountpaid) / 10000000, 3) as revenuecollected, 'Week5' as day FROM egcl_payment payment LEFT JOIN egcl_paymentdetail paymentdetail ON payment.id = paymentdetail.paymentid $where AND (paymentdetail.receiptdate/1000) <= ((extract(epoch from NOW())) - 604800 * 5))) misccollections searchParams: condition: AND params: From b8f56cfd388b9e0d94e103c8c77dfc672041cfc7 Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov <61416590+mahammadnizam-wt-eGov@users.noreply.github.com> Date: Tue, 8 Dec 2020 22:06:46 +0530 Subject: [PATCH 0501/1242] [PI-1127]-Added topic for firenoc legacy index --- configs/egov-indexer/rainmaker-firenoc-indexer.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/configs/egov-indexer/rainmaker-firenoc-indexer.yml b/configs/egov-indexer/rainmaker-firenoc-indexer.yml index 925faa5b..711039d5 100644 --- a/configs/egov-indexer/rainmaker-firenoc-indexer.yml +++ b/configs/egov-indexer/rainmaker-firenoc-indexer.yml @@ -30,4 +30,14 @@ ServiceMaps: id: $.id, $.tenantId isBulk: true timeStampField: $.auditDetails.createdTime - jsonPath: $.FireNOCs \ No newline at end of file + jsonPath: $.FireNOCs + + - topic: save-firenoc-legacyIndex + configKey: INDEX + indexes: + - name: firenoc-index + type: FireNOCs + id: $.id, $.tenantId + isBulk: true + timeStampField: $.auditDetails.createdTime + jsonPath: $.FireNOCs From 5f6640d576ec2a3128b0ee8219d74202d114df30 Mon Sep 17 00:00:00 2001 From: Tarun Lalwani Date: Wed, 9 Dec 2020 15:43:05 +0530 Subject: [PATCH 0502/1242] Optimize PGR query for _search --- .../rainmaker-pgr-v2-searcher.yml | 233 +++++++++++++++--- 1 file changed, 204 insertions(+), 29 deletions(-) diff --git a/configs/egov-searcher/rainmaker-pgr-v2-searcher.yml b/configs/egov-searcher/rainmaker-pgr-v2-searcher.yml index 252cd0bc..4a7d3621 100644 --- a/configs/egov-searcher/rainmaker-pgr-v2-searcher.yml +++ b/configs/egov-searcher/rainmaker-pgr-v2-searcher.yml @@ -5,7 +5,210 @@ SearchDefinitions: definitions: - name: serviceSearchWithDetails query: - baseQuery: select array_to_json(array_agg(row_to_json(serviceRequests))) from (select (select (select (row_to_json(services)) from ( select *, (select (select row_to_json(auditDetails) from (select createdtime, lastmodifiedtime, createdby, lastmodifiedby from eg_pgr_service where svc.serviceRequestId=eg_pgr_service.serviceRequestId) auditDetails) as auditDetails), (select (select (row_to_json(addressDetail)) from (select * from eg_pgr_address where eg_pgr_address.uuid=eg_pgr_service.addressid) addressDetail) as addressDetail) from eg_pgr_service svc where svc.serviceRequestId=eg_pgr_service.serviceRequestId order by createdtime desc) services) as services),(select (select array_to_json(array_agg(row_to_json(actionHistory))) from ( select * from eg_pgr_action where businessKey=eg_pgr_service.serviceRequestId order by "when" desc) actionHistory) as actionHistory) from eg_pgr_service $where order by createdtime desc $pagination) serviceRequests + # select array_to_json(array_agg(row_to_json(serviceRequests))) from (select (select (select (row_to_json(services)) from ( select *, (select (select row_to_json(auditDetails) from (select createdtime, lastmodifiedtime, createdby, lastmodifiedby from eg_pgr_service where svc.serviceRequestId=eg_pgr_service.serviceRequestId) auditDetails) as auditDetails), (select (select (row_to_json(addressDetail)) from (select * from eg_pgr_address where eg_pgr_address.uuid=eg_pgr_service.addressid) addressDetail) as addressDetail) from eg_pgr_service svc where svc.serviceRequestId=eg_pgr_service.serviceRequestId order by createdtime desc) services) as services),(select (select array_to_json(array_agg(row_to_json(actionHistory))) from ( select * from eg_pgr_action where businessKey=eg_pgr_service.serviceRequestId order by "when" desc) actionHistory) as actionHistory) from eg_pgr_service $where order by createdtime desc $pagination) serviceRequests + baseQuery: | + SELECT + coalesce( + json_agg( + "root" + ORDER BY + "root.pg.createdtime" DESC NULLS FIRST + ), + '[]' + ) AS "root" + FROM + ( + SELECT + row_to_json( + ( + SELECT + "_14_e" + FROM + ( + SELECT + "_9_root.or.self"."services" AS "services", + "_13_root.ar.root.actionhistory"."actionhistory" AS "actionhistory" + ) AS "_14_e" + ) + ) AS "root", + "_0_root.base"."createdtime" AS "root.pg.createdtime" + FROM + ( + SELECT + * + FROM + "public"."eg_pgr_service" + $where + ) AS "_0_root.base" + LEFT OUTER JOIN LATERAL ( + SELECT + row_to_json( + ( + SELECT + "_8_e" + FROM + ( + SELECT + "_1_root.or.self.base"."tenantid" AS "tenantid", + "_1_root.or.self.base"."servicecode" AS "servicecode", + "_1_root.or.self.base"."servicerequestid" AS "servicerequestid", + "_1_root.or.self.base"."description" AS "description", + "_1_root.or.self.base"."lat" AS "lat", + "_1_root.or.self.base"."long" AS "long", + "_1_root.or.self.base"."address" AS "address", + "_1_root.or.self.base"."addressid" AS "addressid", + "_1_root.or.self.base"."email" AS "email", + "_1_root.or.self.base"."deviceid" AS "deviceid", + "_1_root.or.self.base"."accountid" AS "accountid", + "_1_root.or.self.base"."firstname" AS "firstname", + "_1_root.or.self.base"."lastname" AS "lastname", + "_1_root.or.self.base"."phone" AS "phone", + "_1_root.or.self.base"."attributes" AS "attributes", + "_1_root.or.self.base"."status" AS "status", + "_1_root.or.self.base"."source" AS "source", + "_1_root.or.self.base"."expectedtime" AS "expectedtime", + "_1_root.or.self.base"."feedback" AS "feedback", + "_1_root.or.self.base"."rating" AS "rating", + "_1_root.or.self.base"."createdby" AS "createdby", + "_1_root.or.self.base"."createdtime" AS "createdtime", + "_1_root.or.self.base"."lastmodifiedby" AS "lastmodifiedby", + "_1_root.or.self.base"."lastmodifiedtime" AS "lastmodifiedtime", + "_1_root.or.self.base"."landmark" AS "landmark", + "_1_root.or.self.base"."active" AS "active", + "_4_root.or.self.or.self"."auditdetails" AS "auditdetails", + "_7_root.or.self.or.eg_pgr_address_id"."addressdetail" AS "addressdetail" + ) AS "_8_e" + ) + ) AS "services" + FROM + ( + SELECT + * + FROM + "public"."eg_pgr_service" + WHERE + ( + (("_0_root.base"."tenantid") = ("tenantid")) + AND ( + ("_0_root.base"."servicerequestid") = ("servicerequestid") + ) + ) + ) AS "_1_root.or.self.base" + LEFT OUTER JOIN LATERAL ( + SELECT + row_to_json( + ( + SELECT + "_3_e" + FROM + ( + SELECT + "_2_root.or.self.or.self.base"."createdby" AS "createdby", + "_2_root.or.self.or.self.base"."lastmodifiedby" AS "lastmodifiedby", + "_2_root.or.self.or.self.base"."createdtime" AS "createdtime", + "_2_root.or.self.or.self.base"."lastmodifiedtime" AS "lastmodifiedtime" + ) AS "_3_e" + ) + ) AS "auditdetails" + FROM + ( + SELECT + * + FROM + "public"."eg_pgr_service" + WHERE + ( + ( + ("_1_root.or.self.base"."tenantid") = ("tenantid") + ) + AND ( + ("_1_root.or.self.base"."servicerequestid") = ("servicerequestid") + ) + ) + ) AS "_2_root.or.self.or.self.base" + ) AS "_4_root.or.self.or.self" ON ('true') + LEFT OUTER JOIN LATERAL ( + SELECT + row_to_json( + ( + SELECT + "_6_e" + FROM + ( + SELECT + "_5_root.or.self.or.eg_pgr_address_id.base"."uuid" AS "uuid", + "_5_root.or.self.or.eg_pgr_address_id.base"."housenoandstreetname" AS "housenoandstreetname", + "_5_root.or.self.or.eg_pgr_address_id.base"."mohalla" AS "mohalla", + "_5_root.or.self.or.eg_pgr_address_id.base"."landmark" AS "landmark", + "_5_root.or.self.or.eg_pgr_address_id.base"."latitude" AS "latitude", + "_5_root.or.self.or.eg_pgr_address_id.base"."longitude" AS "longitude", + "_5_root.or.self.or.eg_pgr_address_id.base"."city" AS "city", + "_5_root.or.self.or.eg_pgr_address_id.base"."tenantid" AS "tenantid", + "_5_root.or.self.or.eg_pgr_address_id.base"."createdby" AS "createdby", + "_5_root.or.self.or.eg_pgr_address_id.base"."createdtime" AS "createdtime", + "_5_root.or.self.or.eg_pgr_address_id.base"."lastmodifiedby" AS "lastmodifiedby", + "_5_root.or.self.or.eg_pgr_address_id.base"."lastmodifiedtime" AS "lastmodifiedtime" + ) AS "_6_e" + ) + ) AS "addressdetail" + FROM + ( + SELECT + * + FROM + "public"."eg_pgr_address" + WHERE + (("_1_root.or.self.base"."addressid") = ("uuid")) + ) AS "_5_root.or.self.or.eg_pgr_address_id.base" + ) AS "_7_root.or.self.or.eg_pgr_address_id" ON ('true') + ) AS "_9_root.or.self" ON ('true') + LEFT OUTER JOIN LATERAL ( + SELECT + coalesce(json_agg("actionhistory"), '[]') AS "actionhistory" + FROM + ( + SELECT + row_to_json( + ( + SELECT + "_11_e" + FROM + ( + SELECT + "_10_root.ar.root.actionhistory.base"."uuid" AS "uuid", + "_10_root.ar.root.actionhistory.base"."tenantid" AS "tenantid", + "_10_root.ar.root.actionhistory.base"."by" AS "by", + "_10_root.ar.root.actionhistory.base"."isinternal" AS "isinternal", + "_10_root.ar.root.actionhistory.base"."when" AS "when", + "_10_root.ar.root.actionhistory.base"."businesskey" AS "businesskey", + "_10_root.ar.root.actionhistory.base"."status" AS "status", + "_10_root.ar.root.actionhistory.base"."assignee" AS "assignee", + "_10_root.ar.root.actionhistory.base"."media" AS "media", + "_10_root.ar.root.actionhistory.base"."comments" AS "comments", + "_10_root.ar.root.actionhistory.base"."action" AS "action" + ) AS "_11_e" + ) + ) AS "actionhistory" + FROM + ( + SELECT + * + FROM + "public"."eg_pgr_action" + WHERE + ( + (("_0_root.base"."tenantid") = ("tenantid")) + AND ( + ("_0_root.base"."servicerequestid") = ("businesskey") + ) + ) + ) AS "_10_root.ar.root.actionhistory.base" + ) AS "_12_root.ar.root.actionhistory" + ) AS "_13_root.ar.root.actionhistory" ON ('true') + ORDER BY + "root.pg.createdtime" DESC NULLS FIRST + $pagination + ) AS "_15_root" groupBy: orderBy: searchParams: @@ -185,31 +388,3 @@ SearchDefinitions: jsonFormat: {"ResponseInfo": {}} outJsonPath: $.services responseInfoPath: $.ResponseInfo - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 98fd6b42c018b9b657cce2100f0778e863875d8e Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Wed, 9 Dec 2020 16:24:23 +0530 Subject: [PATCH 0503/1242] syncing prod v2 to uat v2 --- .../data-config/property-receipt.json | 95 +++++-------------- 1 file changed, 23 insertions(+), 72 deletions(-) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index e7570396..3d4f1632 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -66,6 +66,21 @@ "value": { "path": "$.paymentDetails[0].additionalDetails.assessmentYears" } + }, { + "variable": "ifsc", + "value": { + "path": "$.ifscCode" + } + },{ + "variable": "bank", + "value": { + "path": "$.additionalDetails[0].bankName" + } + },{ + "variable": "branch", + "value": { + "path": "$.additionalDetails[0].branchName" + } }, { "variable": "fromPeriod", @@ -137,7 +152,7 @@ { "variable": "transactionID", "value": { - "path": "$.transactionNumber" + "path": "$.instrumentNumber" } }, { "variable": "transactionDate", @@ -151,7 +166,12 @@ "value": { "path": "$.paymentDetails[0].bill.totalAmount" } - }, { + }, { + "variable": "approvedBy", + "value": { + "path": "$.paymentDetails[0].bill.additionalDetails.lastModifier" + } + }, { "variable": "penaltyReason", "value": { "path": "$.paymentDetails[0].bill.additionalDetails.adhocPenaltyReason" @@ -484,76 +504,7 @@ "prefix": null, "module":"rainmaker-common" } - }, { - "variable": "var_assessments", - "value":{ - "path":"$.paymentDetails[0].bill.billDetails.*.billAccountDetails[?(@.taxHeadCode=='PT_TAX' && @.amount>0)]"}, - "type":"array", - "format":{ - - "scema":[ - { - "variable":"ass_to", - "value":{"path":"toPeriod"}, - "type":"date" - - }, - { - "variable":"ass_from", - "value":"fromPeriod", - "type":"date" - }, - { - "variable":"ass_time_interest", - "value":"billAccountDetails[?(@.taxHeadCode=='PT_TIME_INTEREST')].amount" - - }, { - "variable":"ass_time_penalty", - "value":"billAccountDetails[?(@.taxHeadCode=='PT_TIME_PENALTY')].amount" - - }, { - "variable":"ass_cancer_cess", - "value":"billAccountDetails[?(@.taxHeadCode=='PT_CANCER_CESS')].amount" - - }, { - "variable":"ass_fire_cess", - "value":"billAccountDetails[?(@.taxHeadCode=='PT_FIRE_CESS')].amount" - - }, { - "variable":"ass_tax", - "value":{"path":"billAccountDetails[4].amount"} - }, { - "variable":"ass_adhoc_penalty", - "value":{"path":"$.billAccountDetails[?(@.taxHeadCode=='PT_ADHOC_PENALTY')].amount"} - - }, { - "variable":"ass_adhoc_rebate", - "value":{"path":"$.billAccountDetails[?(@.taxHeadCode=='PT_ADHOC_REBATE')].amount"} - - }, { - "variable":"ass_time_rebate", - "value":"billAccountDetails[?(@.taxHeadCode=='PT_TIME_REBATE)].amount" - - } , { - "variable":"ass_unit_usage_exemption", - "value":"billAccountDetails[?(@.taxHeadCode=='PT_UNIT_USAGE_EXEMPTION')].amount" - - }, { - "variable":"ass_owner_exemption", - "value":"billAccountDetails[2].amount" - - }, { - "variable":"ass_round_off", - "value":"billAccountDetails[?(@.taxHeadCode=='PT_ROUNDOFF')].amount" - - }, { - "variable":"ass_total", - "value":"amount" - - } - ] - } - }, + }, { "variable": "disclamer", "value": { From 6412116099c3c86af94777353aa224f79977b63f Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Wed, 9 Dec 2020 16:26:18 +0530 Subject: [PATCH 0504/1242] syncing prod v2 to uat v2 --- .../format-config/property-receipt.json | 95 ++++++++++++++++++- 1 file changed, 90 insertions(+), 5 deletions(-) diff --git a/configs/pdf-service/format-config/property-receipt.json b/configs/pdf-service/format-config/property-receipt.json index be9f280f..d978acb7 100644 --- a/configs/pdf-service/format-config/property-receipt.json +++ b/configs/pdf-service/format-config/property-receipt.json @@ -109,7 +109,7 @@ false, false ], - "style": "receipt-table" + "style": "receipt-tableee" }, { "text": "{{consumer_id}}", @@ -129,7 +129,7 @@ true, false ], - "style": "receipt-table" + "style": "receipt-tableee" } ], [ @@ -151,7 +151,7 @@ false, false ], - "style": "receipt-table" + "style": "receipt-tableee" }, { "text": "Existing Property Id", @@ -171,7 +171,7 @@ true, false ], - "style": "receipt-table" + "style": "receipt-tableee" } ], [ @@ -711,6 +711,47 @@ ], "style": "receipt-table" } + ],[ + { + "text": "IFSC Code", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{ifsc}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Bank/Branch Name", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{bank}},{{branch}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } ], [ { @@ -1102,6 +1143,39 @@ ] } ] + }, + { + "style": "receipt-approver", + "columns": [ + { + "text": [ + { + "text": "Approved By ", + "bold": true + }, + { + "text": "{{approvedBy}}", + "bold": false + } + ], + "alignment": "left" + }, + { + "text": [ + { + "text": " ", + "bold": true + } + ], + "alignment": "right", + "margin": [ + 0, + 0, + 0, + 0 + ] + } + ] }, { "style": "pt-disclaimer", @@ -1227,6 +1301,17 @@ 0, 0 ] + },"receipt-tableee": { + "color": "#000000", + "bold": true, + "fontSize": 7, + "fontWeight": 500, + "margin": [ + 0, + 0, + 0, + 0 + ] }, "receipt-approver": { "fontSize": 7, @@ -1263,7 +1348,7 @@ "fontSize": 8, "margin": [ 2, - 1, + 0, 0, 0 ], From 49bedcbfef1c058dd0cbd5f35ad8ca8212582c95 Mon Sep 17 00:00:00 2001 From: egovmis Date: Thu, 10 Dec 2020 13:11:10 +0530 Subject: [PATCH 0505/1242] changes for pt receipt on one page --- .../format-config/property-receipt.json | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/configs/pdf-service/format-config/property-receipt.json b/configs/pdf-service/format-config/property-receipt.json index d978acb7..35c49a1c 100644 --- a/configs/pdf-service/format-config/property-receipt.json +++ b/configs/pdf-service/format-config/property-receipt.json @@ -1145,7 +1145,7 @@ ] }, { - "style": "receipt-approver", + "style": "receipt-approver2", "columns": [ { "text": [ @@ -1318,7 +1318,17 @@ "bold": true, "margin": [ -27, - 20, + 5, + -10, + 0 + ], + "color": "#484848" + },"receipt-approver2": { + "fontSize": 7, + "bold": true, + "margin": [ + -27, + 1, -10, 0 ], From 8dbce96f290d59f6bb85cb9ca02e32730a0527c3 Mon Sep 17 00:00:00 2001 From: egovmis Date: Thu, 10 Dec 2020 14:33:30 +0530 Subject: [PATCH 0506/1242] adjusted height of tables --- .../pdf-service/format-config/property-receipt.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/configs/pdf-service/format-config/property-receipt.json b/configs/pdf-service/format-config/property-receipt.json index 35c49a1c..e6690a27 100644 --- a/configs/pdf-service/format-config/property-receipt.json +++ b/configs/pdf-service/format-config/property-receipt.json @@ -967,7 +967,7 @@ "style":"block-head" }, { - "style": "next-noc-table", + "style": "next-noc-table2", "table": { "widths": [ "25%", @@ -1264,6 +1264,15 @@ -22, -8 ] + }, "next-noc-table2": { + "fontSize": 7, + "color": "#000000", + "margin": [ + -25, + 10, + -22, + 0 + ] }, "receipt-table-value": { "color": "#000000", @@ -1318,7 +1327,7 @@ "bold": true, "margin": [ -27, - 5, + 7, -10, 0 ], From 9f84ee1da31219fb0b1fee54f8424860f0886a3f Mon Sep 17 00:00:00 2001 From: Tarun Lalwani Date: Mon, 14 Dec 2020 00:43:27 +0530 Subject: [PATCH 0507/1242] Fix PGR query for better performance --- .../rainmaker-pgr-v2-searcher.yml | 23 ++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/configs/egov-searcher/rainmaker-pgr-v2-searcher.yml b/configs/egov-searcher/rainmaker-pgr-v2-searcher.yml index 4a7d3621..4c724c8a 100644 --- a/configs/egov-searcher/rainmaker-pgr-v2-searcher.yml +++ b/configs/egov-searcher/rainmaker-pgr-v2-searcher.yml @@ -264,8 +264,29 @@ SearchDefinitions: responseInfoPath: $.ResponseInfo - name: getServiceRequestsOnAssignedTo + #select array_to_json(array_agg(row_to_json(servicesRequestIds))) from (select businessKey from eg_pgr_action $where AND eg_pgr_action.when IN (select max("when") from eg_pgr_action where assignee NOTNULL group by businessKey)) servicesRequestIds baseQuery: | query: - baseQuery: select array_to_json(array_agg(row_to_json(servicesRequestIds))) from (select businessKey from eg_pgr_action $where AND eg_pgr_action.when IN (select max("when") from eg_pgr_action where assignee NOTNULL group by businessKey)) servicesRequestIds + baseQuery: | + select + array_to_json(array_agg(row_to_json(servicesRequestIds))) + from + ( + select + businessKey + from + eg_pgr_action $where + where + AND eg_pgr_action.when IN ( + select + max("when") + from + eg_pgr_action + $where + and assignee NOTNULL + group by + businessKey + ) + ) servicesRequestIds groupBy: orderBy: searchParams: From 7bf8d838fca22c788074079aaad4dd62875baba2 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Mon, 14 Dec 2020 10:32:10 +0530 Subject: [PATCH 0508/1242] changes for arrears amount /amountPaid --- .../data-config/property-receipt.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index 3d4f1632..a124ddef 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -210,42 +210,42 @@ { "variable": "Arrears1", "value": { - "path": "$.paymentDetails[0].bill.billDetails[1].amountPaid" + "path": "$.paymentDetails[0].bill.billDetails[1].amount" } }, { "variable": "Arrears2", "value": { - "path": "$.paymentDetails[0].bill.billDetails[2].amountPaid" + "path": "$.paymentDetails[0].bill.billDetails[2].amount" } }, { "variable": "Arrears3", "value": { - "path": "$.paymentDetails[0].bill.billDetails[3].amountPaid" + "path": "$.paymentDetails[0].bill.billDetails[3].amount" } }, { "variable": "Arrears4", "value": { - "path": "$.paymentDetails[0].bill.billDetails[4].amountPaid" + "path": "$.paymentDetails[0].bill.billDetails[4].amount" } }, { "variable": "Arrears5", "value": { - "path": "$.paymentDetails[0].bill.billDetails[5].amountPaid" + "path": "$.paymentDetails[0].bill.billDetails[5].amount" } }, { "variable": "Arrears6", "value": { - "path": "$.paymentDetails[0].bill.billDetails[6].amountPaid" + "path": "$.paymentDetails[0].bill.billDetails[6].amount" } }, { "variable": "Arrears7", "value": { - "path": "$.paymentDetails[0].bill.billDetails[7].amountPaid" + "path": "$.paymentDetails[0].bill.billDetails[7].amount" } }, { "variable": "Arrears8", "value": { - "path": "$.paymentDetails[0].bill.billDetails[8].amountPaid" + "path": "$.paymentDetails[0].bill.billDetails[8].amount" } }, { From 183a23d221813e493f65d21eed5bc1b716b5ec53 Mon Sep 17 00:00:00 2001 From: egovmis Date: Tue, 15 Dec 2020 14:37:58 +0530 Subject: [PATCH 0509/1242] added ifsc code.bank on TL receipt --- .../data-config/tradelicense-receipt.json | 15 +++++++ .../format-config/tradelicense-receipt.json | 41 +++++++++++++++++++ 2 files changed, 56 insertions(+) diff --git a/configs/pdf-service/data-config/tradelicense-receipt.json b/configs/pdf-service/data-config/tradelicense-receipt.json index da919bc8..87903670 100644 --- a/configs/pdf-service/data-config/tradelicense-receipt.json +++ b/configs/pdf-service/data-config/tradelicense-receipt.json @@ -36,6 +36,21 @@ "value": { "path": "$.additionalDetails.collectedBy" } + },{ + "variable": "ifsc", + "value": { + "path": "$.ifscCode" + } + },{ + "variable": "bank", + "value": { + "path": "$.additionalDetails[0].bankName" + } + },{ + "variable": "branch", + "value": { + "path": "$.additionalDetails[0].branchName" + } }, { "variable": "payerContact", diff --git a/configs/pdf-service/format-config/tradelicense-receipt.json b/configs/pdf-service/format-config/tradelicense-receipt.json index 427aa13a..104ad5d4 100644 --- a/configs/pdf-service/format-config/tradelicense-receipt.json +++ b/configs/pdf-service/format-config/tradelicense-receipt.json @@ -644,6 +644,47 @@ ], "style": "receipt-table" } + ],[ + { + "text": "IFSC Code", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{ifsc}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Bank/Branch Name", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{bank}},{{branch}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } ], [ { From 5ff2c22398aaf15875ea06d3b80a55d1c3cf1b77 Mon Sep 17 00:00:00 2001 From: narendrabandhamneni-wt-egov Date: Wed, 16 Dec 2020 16:07:04 +0530 Subject: [PATCH 0510/1242] added title transfer change --- .../property-services-registry.yml | 25 ++++++++++++------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/configs/egov-persister/property-services-registry.yml b/configs/egov-persister/property-services-registry.yml index d52151a8..4c48bb0f 100644 --- a/configs/egov-persister/property-services-registry.yml +++ b/configs/egov-persister/property-services-registry.yml @@ -8,7 +8,7 @@ serviceMaps: queryMaps: - - query: INSERT INTO eg_pt_property_audit (audituuid, propertyid, property, auditcreatedtime) VALUES ((select nextval('seq_eg_pt_registry_audit')), ?, ?, (SELECT extract(epoch from now()))); + - query: INSERT INTO eg_pt_property_audit (audituuid, propertyid, property, auditcreatedtime) VALUES ((select nextval('seq_eg_pt_registry_audit')), ?, ?, (SELECT extract(epoch from now()))*1000); basePath: Property jsonMaps: @@ -106,7 +106,7 @@ serviceMaps: - jsonPath: $.Property.auditDetails.lastModifiedTime - - query: INSERT INTO eg_pt_document (id, tenantid, entityid, documenttype, filestoreid, documentuid, status, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET documenttype = EXCLUDED.documenttype,fileStoreid = EXCLUDED.filestoreid, documentuid=EXCLUDED.documentuid, status=EXCLUDED.status, lastmodifiedby = EXCLUDED.lastModifiedby, lastmodifiedtime = EXCLUDED.lastmodifiedtime; + - query: INSERT INTO eg_pt_document (id, tenantid, entityid, documenttype, filestoreid, documentuid, status, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); basePath: $.Property.documents.* jsonMaps: @@ -133,7 +133,7 @@ serviceMaps: - jsonPath: $.Property.auditDetails.lastModifiedTime - - query: INSERT INTO eg_pt_document (id, tenantid, entityid, documenttype, filestoreid, documentuid, status, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET documenttype = EXCLUDED.documenttype,fileStoreid = EXCLUDED.filestoreid, documentuid=EXCLUDED.documentuid, status=EXCLUDED.status, lastmodifiedby = EXCLUDED.lastModifiedby, lastmodifiedtime = EXCLUDED.lastmodifiedtime; + - query: INSERT INTO eg_pt_document (id, tenantid, entityid, documenttype, filestoreid, documentuid, status, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); basePath: $.Property.owners.*.documents.* jsonMaps: @@ -293,7 +293,7 @@ serviceMaps: queryMaps: - - query: INSERT INTO eg_pt_property_audit (audituuid, propertyid, property, auditcreatedtime) VALUES ((select nextval('seq_eg_pt_registry_audit')), ?, ?, (SELECT extract(epoch from now()))); + - query: INSERT INTO eg_pt_property_audit (audituuid, propertyid, property, auditcreatedtime) VALUES ((select nextval('seq_eg_pt_registry_audit')), ?, ?, (SELECT extract(epoch from now()))*1000); basePath: Property jsonMaps: @@ -497,10 +497,16 @@ serviceMaps: - jsonPath: $.Property.auditDetails.lastModifiedTime - - query: UPDATE eg_pt_unit SET floorno=?, unittype=?, usagecategory=?, occupancytype=?, occupancydate=?, carpetarea=?, builtuparea=?, plintharea=?, superbuiltuparea=?, arv=?, constructiontype=?, constructiondate=?, dimensions=?, active=?, lastmodifiedby=?, lastmodifiedtime=? WHERE id=?; + - query: INSERT INTO eg_pt_unit(id, tenantid, propertyid, floorno, unittype, usagecategory, occupancytype, occupancydate, carpetarea, builtuparea, plintharea, superbuiltuparea, arv, constructiontype, constructiondate, dimensions, active, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET floorno=EXCLUDED.floorno, unittype=EXCLUDED.unittype, usagecategory=EXCLUDED.usagecategory, occupancytype=EXCLUDED.occupancytype, occupancydate=EXCLUDED.occupancydate, carpetarea=EXCLUDED.carpetarea, builtuparea=EXCLUDED.builtuparea, plintharea=EXCLUDED.plintharea, superbuiltuparea=EXCLUDED.superbuiltuparea, arv=EXCLUDED.arv, constructiontype=EXCLUDED.constructiontype, constructiondate=EXCLUDED.constructiondate, dimensions=excluded.dimensions, active=EXCLUDED.active, lastmodifiedby=EXCLUDED.lastmodifiedby, lastmodifiedtime=EXCLUDED.lastmodifiedtime; basePath: Property.units.* jsonMaps: + - jsonPath: $.Property.units.*.id + + - jsonPath: $.Property.tenantId + + - jsonPath: $.Property.id + - jsonPath: $.Property.units.*.floorNo - jsonPath: $.Property.units.*.unitType @@ -531,12 +537,13 @@ serviceMaps: - jsonPath: $.Property.units.*.active - - jsonPath: $.Property.auditDetails.lastModifiedBy + - jsonPath: $.Property.auditDetails.createdBy - - jsonPath: $.Property.auditDetails.lastModifiedTime + - jsonPath: $.Property.auditDetails.createdTime - - jsonPath: $.Property.units.*.id + - jsonPath: $.Property.auditDetails.lastModifiedBy + - jsonPath: $.Property.auditDetails.lastModifiedTime - version: 1.0 description: Update documents in EG_PT_PROPERTY ltable @@ -569,4 +576,4 @@ serviceMaps: - jsonPath: $.Property.auditDetails.createdTime - - jsonPath: $.Property.auditDetails.lastModifiedTime + - jsonPath: $.Property.auditDetails.lastModifiedTime \ No newline at end of file From d49782398022a1ba07d79038f120ac9c1eb9144a Mon Sep 17 00:00:00 2001 From: egovmis Date: Thu, 17 Dec 2020 13:11:29 +0530 Subject: [PATCH 0511/1242] removed payer name from pt receipt --- configs/pdf-service/format-config/property-receipt.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/pdf-service/format-config/property-receipt.json b/configs/pdf-service/format-config/property-receipt.json index e6690a27..c001da37 100644 --- a/configs/pdf-service/format-config/property-receipt.json +++ b/configs/pdf-service/format-config/property-receipt.json @@ -196,7 +196,7 @@ "style": "receipt-table" }, { - "text": "{{payer_name}}", + "text": " ", "border": [ false, false, @@ -206,7 +206,7 @@ "style": "receipt-table-value" }, { - "text": "{{payerName}}", + "text": " ", "border": [ false, false, From 14e5b2c11875b1715a027194217c6c01a8446f7a Mon Sep 17 00:00:00 2001 From: narendrabandhamneni-wt-egov Date: Thu, 17 Dec 2020 17:47:26 +0530 Subject: [PATCH 0512/1242] Removed extra configuration --- configs/egov-searcher/rainmaker-pgr-v2-searcher.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-searcher/rainmaker-pgr-v2-searcher.yml b/configs/egov-searcher/rainmaker-pgr-v2-searcher.yml index 4c724c8a..fc055952 100644 --- a/configs/egov-searcher/rainmaker-pgr-v2-searcher.yml +++ b/configs/egov-searcher/rainmaker-pgr-v2-searcher.yml @@ -275,7 +275,7 @@ SearchDefinitions: businessKey from eg_pgr_action $where - where + AND eg_pgr_action.when IN ( select max("when") From 4cdf7b5fb76a686c19f8ef31cd60e145fc65d109 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 18 Dec 2020 11:17:14 +0530 Subject: [PATCH 0513/1242] synch with prod_v2 --- configs/reports/configs/pt-reports.yml | 1400 +++++++++++++++++------- 1 file changed, 999 insertions(+), 401 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 7b1c964c..13863d9c 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2221,7 +2221,7 @@ ReportDefinitions: source: pt wrapper: true isMandatory: false - searchClause: AND concat(to_char((To_timestamp(fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) = $financialyear + searchClause: AND concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) = $financialyear - name: paymentMode label: Payment Mode type: singlevaluelist @@ -2259,7 +2259,6 @@ ReportDefinitions: INNER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid INNER JOIN egcl_payment as payment on pd.paymentid=payment.id WHERE payment.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' - AND pd.receiptdate >= $fromDate AND pd.receiptdate <= $toDate GROUP BY pdid ) SELECT @@ -2276,7 +2275,7 @@ ReportDefinitions: to_char((To_timestamp(payment.transactiondate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, payment.totaldue - payment.totalamountpaid AS pendingamount, Initcap(case when pt.usagecategory like '%.%' then split_part(pt.usagecategory,'.',2) else pt.usagecategory end) as usagetype, - (case when eg_user.name is null then '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' else eg_user.name end) as collectorname, + (case when eg_user.name is null then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else eg_user.name end) as collectorname, receipt_breakup.*, to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, manualreceiptnumber as g8receiptno @@ -2290,6 +2289,215 @@ ReportDefinitions: orderby: ORDER BY pd.receiptdate DESC; +- reportName: ReceiptRegister_without_locality_V2 + decryptionPathId: ReceiptRegister_V2 + summary: Receipt Register + version: 1.0.0 + moduleName: rainmaker-pt + additionalConfig: + print: + pdfPageSize: "A1" + sourceColumns: + - name: receiptnumber + label: reports.pt.receiptNo + type: string + source: pt + total: false + - name: receiptdate + label: reports.pt.receiptDate + type: string + source: pt + total: false + - name: g8issuedate + label: reports.pt.g8issuedate + type: string + source: pt + total: false + - name: g8receiptno + label: reports.pt.g8receiptno + type: string + source: pt + total: false + - name: amount + label: reports.pt.amount + type: string + source: pt + total: true + - name: propertytax + label: reports.pt.propertyTax + type: string + source: pt + total: true + - name: firecess + label: reports.pt.fireCess + type: string + source: pt + total: true + - name: cancercess + label: reports.pt.cancerCess + type: string + source: pt + total: true + - name: rebate + label: reports.pt.rebate + type: string + source: pt + total: true + - name: adhocrebate + label: reports.pt.adhocrebate + type: string + source: pt + total: true + - name: penalty + label: reports.pt.penalty + type: string + source: pt + total: true + - name: adhocpenalty + label: reports.pt.adhocpenalty + type: string + source: pt + total: true + - name: interest + label: reports.pt.interest + type: string + source: pt + total: true + - name: exemption + label: reports.pt.exemption + type: string + source: pt + total: true + - name: adjustment + label: reports.pt.roundoff + type: string + source: pt + total: true + - name: pendingamount + label: reports.pt.pendingamount + type: string + source: pt + total: true + - name: consumercode + label: reports.pt.propertyId + type: string + source: pt + total: false + - name: usagetype + label: reports.pt.usagetype + type: string + source: pt + total: false + - name: instrumenttype + label: reports.pt.paymentMode + type: string + source: pt + total: false + - name: transactionnumber + label: reports.pt.ddChequeTransactionNo + type: string + source: pt + total: false + - name: transactiondate + label: reports.pt.ddChequeTransactionDate + type: string + source: pt + total: false + - name: bankname + label: reports.pt.bankName + type: string + source: pt + total: false + - name: collectorname + label: reports.pt.collectorname + type: string + source: pt + total: false + - name: financialyear + label: reports.pt.financialyear + type: string + source: pt + total: false + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: true + searchClause: AND pd.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: true + searchClause: AND pd.receiptdate <= $toDate + - name: financialyear + label: Financial Year + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name + source: pt + wrapper: true + isMandatory: false + searchClause: AND concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) = $financialyear + - name: paymentMode + label: Payment Mode + type: singlevaluelist + pattern: 'list://CARD:Card,CASH:Cash,CHEQUE:Cheque,DD:DD,OFFLINE_NEFT:NEFT,OFFLINE_RTGS:RTGS,ONLINE:Online,POSTAL_ORDER:PostalOrder' + source: pt + isMandatory: false + searchClause: AND payment.paymentmode = $paymentMode + query: | + -- Use CTE to force query plan, compute & use CTE later + WITH receipt_breakup AS ( + SELECT + pd.id as pdid, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, + SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN bad.amount ELSE 0 END) as propertytax, + SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as paidpropertytax, + (SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN bad.amount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN bad.amount ELSE 0 END) ) as exemption, + (SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END)) as adjustment + FROM egcl_billaccountdetail as bad + INNER JOIN egcl_billdetial as bd on bd.id = bad.billdetailid + INNER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid + INNER JOIN egcl_payment as payment on pd.paymentid=payment.id + WHERE payment.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' + GROUP BY pdid + ) + SELECT + pd.tenantid AS tenantid, + pd.id, + pt.propertyid as consumercode, + to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS receiptdate, + payment.ifsccode AS bankname, + receiptnumber, + payment.totalamountpaid as amount, + payment.paymentmode as instrumenttype, + payment.transactionnumber, + concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear, + to_char((To_timestamp(payment.transactiondate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, + payment.totaldue - payment.totalamountpaid AS pendingamount, + Initcap(case when pt.usagecategory like '%.%' then split_part(pt.usagecategory,'.',2) else pt.usagecategory end) as usagetype, + (case when eg_user.name is null then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else eg_user.name end) as collectorname, + receipt_breakup.*, + to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, + manualreceiptnumber as g8receiptno + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, receipt_breakup, egcl_bill bill + --,(select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr + where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + and pt.propertyid = bill.consumercode and receipt_breakup.pdid=pd.id and pt.status!='INACTIVE' + --and pt_addr.propertyid=pt.id + orderby: ORDER BY pd.receiptdate DESC; + + - reportName: CancelledReceiptRegister_V2 decryptionPathId: CancelledReceiptRegister_V2 summary: Receipt Register for cancelled Receipts @@ -2444,7 +2652,7 @@ ReportDefinitions: source: pt wrapper: true isMandatory: false - searchClause: AND concat(to_char((To_timestamp(bd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(bd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) = $financialyear + searchClause: AND concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) = $financialyear - name: paymentMode label: Payment Mode type: singlevaluelist @@ -2452,12 +2660,6 @@ ReportDefinitions: source: pt isMandatory: false searchClause: AND payment.paymentmode = $paymentMode - - name: localityArray - label: reports.pt.zoneList - type: boundarylist - source: pt - isMandatory: false - searchClause: AND pt_addr.locality IN ($localityArray) query: | -- Use CTE to force query plan, compute & use CTE later WITH receipt_breakup AS ( @@ -2469,42 +2671,44 @@ ReportDefinitions: SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, - SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as propertytax, - (SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN adjustedamount ELSE 0 END) )as exemption, - ( SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN bad.amount ELSE 0 END) as propertytax, + SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as paidpropertytax, + (SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN bad.amount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN bad.amount ELSE 0 END) ) as exemption, + (SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END)) as adjustment FROM egcl_billaccountdetail as bad INNER JOIN egcl_billdetial as bd on bd.id = bad.billdetailid INNER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid INNER JOIN egcl_payment as payment on pd.paymentid=payment.id - WHERE bad.tenantid = $tenantid and payment.paymentstatus = 'CANCELLED' and pd.businessservice='PT' + WHERE payment.tenantid = $tenantid and payment.paymentstatus = 'CANCELLED' and pd.businessservice='PT' GROUP BY pdid ) SELECT pd.tenantid AS tenantid, pd.id, - bill.consumercode, + pt.propertyid as consumercode, to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS receiptdate, payment.ifsccode AS bankname, - receiptnumber, + receiptnumber, payment.totalamountpaid as amount, payment.paymentmode as instrumenttype, - payment.transactionnumber,concat(to_char((To_timestamp(bd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(bd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear, + payment.transactionnumber, + concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear, to_char((To_timestamp(payment.transactiondate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, - pd.due AS pendingamount, + payment.totaldue - payment.totalamountpaid AS pendingamount, Initcap(case when pt.usagecategory like '%.%' then split_part(pt.usagecategory,'.',2) else pt.usagecategory end) as usagetype, - (CASE WHEN billd.collectiontype='COUNTER' THEN eg_user.name ELSE '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' END) as collectorname, + (case when eg_user.name is null then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else eg_user.name end) as collectorname, receipt_breakup.*, - to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, - manualreceiptnumber as g8receiptno, - payment.paymentstatus as paymentstatus - FROM egcl_paymentdetail pd, eg_user, eg_pt_property as pt, egcl_billdetial as billd, egcl_payment payment,receipt_breakup, egcl_bill bill, (select bill.id as billid, min(bd.fromperiod) fromperiod, max(bd.toperiod) toperiod from egcl_billdetial bd, egcl_bill bill where bill.id=bd.billid group by bill.id) bd, - (select string_agg(distinct propertyid,',') as propertyid,string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr - WHERE pd.paymentid=payment.id and eg_user.id = pd.createdby::INTEGER and pt.propertyid = bill.consumercode and bill.id=pd.billid and bill.id=billd.billid and bd.billid=bill.id and payment.paymentstatus = 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid and receipt_breakup.pdid=pd.id - and pt_addr.propertyid=pt.id + to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, + manualreceiptnumber as g8receiptno + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, receipt_breakup, egcl_bill bill + --,(select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr + where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus = 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + and pt.propertyid = bill.consumercode and receipt_breakup.pdid=pd.id and pt.status!='INACTIVE' + --and pt_addr.propertyid=pt.id orderby: ORDER BY pd.receiptdate DESC; - reportName: OldUlbWisePtCollection_V2 @@ -2757,7 +2961,7 @@ ReportDefinitions: payment.totalamountpaid as amount, payment.paymentmode as instrumenttype, payment.transactionnumber, - concat(to_char((To_timestamp(bd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(bd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear, + concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear, to_char((To_timestamp(payment.transactiondate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, pd.due AS pendingamount, Initcap(case when pt.usagecategory like '%.%' then split_part(pt.usagecategory,'.',2) else pt.usagecategory end) as usagetype, @@ -2815,13 +3019,13 @@ ReportDefinitions: type: epoch source: pt isMandatory: false - searchClause: AND payment.createdtime >= $fromDate + searchClause: AND pd.receiptdate >= $fromDate - name: toDate label: reports.pt.toDate type: epoch source: pt isMandatory: false - searchClause: AND payment.createdtime <= $toDate + searchClause: AND pd.receiptdate <= $toDate - name: financialyear label: Financial Year type: singlevaluelist @@ -2829,7 +3033,7 @@ ReportDefinitions: source: pt wrapper: true isMandatory: false - searchClause: AND concat(to_char((To_timestamp(fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) = $financialyear + searchClause: AND concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) = $financialyear - name: usage label: Usage type: singlevaluelist @@ -2837,22 +3041,27 @@ ReportDefinitions: source: pt wrapper: true isMandatory: false - searchClause: AND eg_pt_property.usagecategory = $usage + searchClause: AND pt.usagecategory = $usage query: | SELECT - initcap(split_part(payment.tenantid, '.', 2)) as tenantid, - COUNT(paymentmode) AS totalassessments, - SUM(payment.totalamountpaid) AS totalamountpaid, - SUM(CASE WHEN paymentmode='ONLINE' THEN totalamountpaid ELSE 0 END) AS totalonline, - SUM(CASE WHEN paymentmode='ONLINE' THEN 1 ELSE 0 END) AS countonline, - SUM(CASE WHEN paymentmode!='ONLINE' THEN totalamountpaid ELSE 0 END) AS totaloffline, - SUM(CASE WHEN paymentmode!='ONLINE' THEN 1 ELSE 0 END) AS countoffline - FROM egcl_paymentdetail as pd - inner join egcl_payment as payment on payment.id=pd.paymentid - inner join egcl_bill bill on bill.id=pd.billid - inner join eg_pt_property on eg_pt_property.propertyid=bill.consumercode - inner join egcl_billdetial billd on billd.billid=bill.id - WHERE payment.paymentstatus!='CANCELLED' and pd.businessservice='PT' and payment.tenantid !='pb.testing' + initcap(split_part(payment.tenantid, '.', 2)) as tenantid, + sum(payment.totalamountpaid) as totalamountpaid, + count(payment.totalamountpaid) as totalassessments, + sum(case when payment.paymentmode='ONLINE' then payment.totalamountpaid else 0 end) as "totalonline", + sum(case when payment.paymentmode='ONLINE' then 1 else 0 end) as "countonline", + sum(case when payment.paymentmode='CASH' then payment.totalamountpaid else 0 end) + + sum(case when payment.paymentmode='CHEQUE' then payment.totalamountpaid else 0 end) + + sum(case when payment.paymentmode='DD' then payment.totalamountpaid else 0 end) + + sum(case when payment.paymentmode='CARD' then payment.totalamountpaid else 0 end) + + sum(case when payment.paymentmode='OFFLINE_RTGS' then payment.totalamountpaid else 0 end) + + sum(case when payment.paymentmode='OFFLINE_NEFT' then payment.totalamountpaid else 0 end) + + sum(case when payment.paymentmode='POTAL_ORDER' then payment.totalamountpaid else 0 end) as "totaloffline", + sum(case when payment.paymentmode!='ONLINE' then 1 else 0 end) as "countoffline" + --concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, + (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid!='pb.testing' group by propertyid ) pt_addr + where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid!='pb.testing' + and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id groupby: GROUP BY payment.tenantid orderby: ORDER BY payment.tenantid, totalamountpaid DESC NULLS LAST @@ -2898,13 +3107,13 @@ ReportDefinitions: type: epoch source: pt isMandatory: false - searchClause: AND payment.createdtime >= $fromDate + searchClause: AND pd.receiptdate >= $fromDate - name: toDate label: reports.pt.toDate type: epoch source: pt isMandatory: false - searchClause: AND payment.createdtime <= $toDate + searchClause: AND pd.receiptdate <= $toDate - name: financialyear label: Financial Year type: singlevaluelist @@ -2912,7 +3121,7 @@ ReportDefinitions: source: pt wrapper: true isMandatory: false - searchClause: AND concat(to_char((To_timestamp(fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) = $financialyear + searchClause: AND concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) = $financialyear - name: usage label: Usage type: singlevaluelist @@ -2920,27 +3129,28 @@ ReportDefinitions: source: pt wrapper: true isMandatory: false - searchClause: AND eg_pt_property.usagecategory = $usage + searchClause: AND pt.usagecategory = $usage query: | SELECT - initcap(split_part(payment.tenantid, '.', 2)) as tenantid, - COUNT(paymentmode) AS totalassessments, - SUM(payment.totalamountpaid) AS totalamountpaid, - SUM(CASE WHEN paymentmode='ONLINE' THEN totalamountpaid ELSE 0 END) AS totalonline, - SUM(CASE WHEN paymentmode='ONLINE' THEN 1 ELSE 0 END) AS countonline, - SUM(CASE WHEN paymentmode!='ONLINE' THEN totalamountpaid ELSE 0 END) AS totaloffline, - SUM(CASE WHEN paymentmode!='ONLINE' THEN 1 ELSE 0 END) AS countoffline - FROM egcl_paymentdetail as pd - inner join egcl_payment as payment on payment.id=pd.paymentid - inner join egcl_bill bill on bill.id=pd.billid - inner join eg_pt_property on eg_pt_property.propertyid=bill.consumercode - inner join egcl_billdetial billd on billd.billid=bill.id - WHERE payment.tenantid = $tenantid - and payment.paymentstatus!='CANCELLED' - and pd.businessservice='PT' - --and payment.createdtime>='1577817000000' and payment.createdtime<='1580495399000' - groupby: GROUP BY payment.tenantid - orderby: ORDER BY payment.tenantid, totalamountpaid DESC NULLS LAST + --initcap(split_part(payment.tenantid, '.', 2)) as tenantid, + sum(payment.totalamountpaid) as totalamountpaid, + count(payment.totalamountpaid) as totalassessments, + sum(case when payment.paymentmode='ONLINE' then payment.totalamountpaid else 0 end) as "totalonline", + sum(case when payment.paymentmode='ONLINE' then 1 else 0 end) as "countonline", + sum(case when payment.paymentmode='CASH' then payment.totalamountpaid else 0 end) + + sum(case when payment.paymentmode='CHEQUE' then payment.totalamountpaid else 0 end) + + sum(case when payment.paymentmode='DD' then payment.totalamountpaid else 0 end) + + sum(case when payment.paymentmode='CARD' then payment.totalamountpaid else 0 end) + + sum(case when payment.paymentmode='OFFLINE_RTGS' then payment.totalamountpaid else 0 end) + + sum(case when payment.paymentmode='OFFLINE_NEFT' then payment.totalamountpaid else 0 end) + + sum(case when payment.paymentmode='POTAL_ORDER' then payment.totalamountpaid else 0 end) as "totaloffline", + sum(case when payment.paymentmode!='ONLINE' then 1 else 0 end) as "countoffline" + --concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, + (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr + where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id + - reportName: ReceiptRegisterShort_V2 decryptionPathId: ReceiptRegisterShort_V2 @@ -3063,7 +3273,8 @@ ReportDefinitions: payment.totalamountpaid as amount, payment.paymentmode as instrumenttype, payment.transactionnumber as transactionnumber, - concat(to_char((To_timestamp(bd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(bd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY')) AS financialyear, + --concat(to_char((To_timestamp(bd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(bd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY')) AS financialyear, + concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear, (case when eg_user.name is null then '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' else eg_user.name end) as collectorname, --receipt_breakup.*, to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, @@ -3077,11 +3288,141 @@ ReportDefinitions: and pt.propertyid = bd.consumercodei and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id orderby: ORDER BY pd.receiptdate DESC; - - -- reportName: ULBPTDataDumpReport_V2 - decryptionPathId: ULBPTDataDumpReport_V2 - summary: ULB level report + + +- reportName: ReceiptRegisterShort_WithoutLocality_V2 + decryptionPathId: ReceiptRegisterShort_V2 + summary: Receipt Register + version: 1.0.0 + moduleName: rainmaker-pt + additionalConfig: + print: + pdfPageSize: "Legal" + sourceColumns: + - name: receiptnumber + label: reports.pt.receiptNo + type: string + source: pt + total: false + - name: transactiondate + label: reports.pt.receiptDate + type: string + source: pt + total: false + - name: g8receiptno + label: reports.pt.g8book + type: string + source: pt + total: false + - name: g8issuedate + label: reports.pt.g8dated + type: string + source: pt + total: false + - name: propertyid + label: reports.pt.ptrId + type: string + source: pt + total: false + - name: financialyear + label: reports.pt.financialYear + type: string + source: pt + total: false + - name: instrumenttype + label: reports.pt.paymentMode + type: string + source: pt + total: false + - name: amount + label: reports.pt.taxamount + type: string + source: pt + total: true + - name: transactionnumber + label: reports.pt.ddChequeNo + type: string + source: pt + total: false + - name: bankname + label: reports.pt.bankName + type: string + source: pt + total: false + - name: collectorname + label: reports.pt.collectorname + type: string + source: pt + total: false + - name: remarks + label: reports.pt.remarks + type: string + source: pt + total: false + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: true + searchClause: AND pd.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: true + searchClause: AND pd.receiptdate <= $toDate + - name: paymentMode + label: Payment Mode + type: singlevaluelist + pattern: 'list://CARD:Card,CASH:Cash,CHEQUE:Cheque,DD:DD,OFFLINE_NEFT:NEFT,OFFLINE_RTGS:RTGS,ONLINE:Online,POSTAL_ORDER:PostalOrder' + source: pt + isMandatory: false + searchClause: AND payment.paymentmode = $paymentMode + - name: financialyear + label: Financial Year + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name + source: pt + wrapper: true + isMandatory: false + searchClause: AND concat(to_char((To_timestamp(bd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(bd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) = $financialyear + - name: collectorname + label: reports.pt.collectorname + type: singlevaluelist + pattern: http://egov-hrms:8080/egov-hrms/employees/_search?tenantId=$tenantid&roles=PTCEMP|$.Employees[*].user.id|$.Employees[*].user.name + source: pt + wrapper: true + isMandatory: false + searchClause: AND eg_user.id = $collectorname::INTEGER + query: | + -- Use CTE to force query plan, compute & use CTE later + SELECT + pt.propertyid as propertyid, + to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') as transactiondate, + payment.ifsccode AS bankname, + receiptnumber, + payment.totalamountpaid as amount, + payment.paymentmode as instrumenttype, + payment.transactionnumber as transactionnumber, + --concat(to_char((To_timestamp(bd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(bd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY')) AS financialyear, + concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear, + (case when eg_user.name is null then '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' else eg_user.name end) as collectorname, + --receipt_breakup.*, + to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, + manualreceiptnumber as g8receiptno, + 'NA' as remarks + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, + (select bill.id as billid, bill.consumercode as consumercodei, min(bd.fromperiod) fromperiod, max(bd.toperiod) toperiod from egcl_billdetial bd, egcl_bill bill + where bill.id=bd.billid and bill.tenantid = $tenantid group by bill.id) bd + where pd.paymentid=payment.id and bd.billid=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + and pt.propertyid = bd.consumercodei and pt.status!='INACTIVE' + orderby: ORDER BY pd.receiptdate DESC; + + +- reportName: ULBPTDataDumpReport_V2 + decryptionPathId: ULBPTDataDumpReport_V2 + summary: ULB level report version: 1.0.0 moduleName: rainmaker-pt sourceColumns: @@ -3281,7 +3622,7 @@ ReportDefinitions: inner join egcl_bill as bill on bill.id = payd.billid inner join egcl_billdetial as billd on billd.billid=bill.id inner join eg_pt_property as pt on pt.propertyid = bill.consumercode - inner join eg_pt_owner as po on po.propertyid = pt.id + inner join eg_pt_owner as po on po.propertyid = pt.id and po.status='ACTIVE' inner join eg_user as eu on eu.uuid = po.userid inner join eg_pt_address as pta on pta.propertyid = pt.id left outer join eg_bndry_mohalla as localnames on pta.locality=localnames.localitycode @@ -3854,6 +4195,26 @@ ReportDefinitions: type: string source: pt total: true + - name: card + label: reports.pt.card + type: string + source: pt + total: true + - name: neft + label: reports.pt.neft + type: string + source: pt + total: true + - name: rtgs + label: reports.pt.rtgs + type: string + source: pt + total: true + - name: po + label: reports.pt.po + type: string + source: pt + total: true searchParams: - name: fromDate label: reports.pt.fromDate @@ -3875,30 +4236,162 @@ ReportDefinitions: searchClause: AND pt_addr.locality IN ($localityArray) query: | -- Use CTE to force query plan, compute & use CTE later - SELECT - concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY')) AS "financialyear", + SELECT + sum(payment.totalamountpaid) as totalamount, + count(payment.totalamountpaid) as totalcount, + sum(case when payment.paymentmode='ONLINE' then payment.totalamountpaid else 0 end) as "online", + sum(case when payment.paymentmode='CASH' then payment.totalamountpaid else 0 end) as "cash", + sum(case when payment.paymentmode='CHEQUE' then payment.totalamountpaid else 0 end) as "cheque", + sum(case when payment.paymentmode='DD' then payment.totalamountpaid else 0 end) as "dd", + sum(case when payment.paymentmode='CARD' then payment.totalamountpaid else 0 end) as "card", + sum(case when payment.paymentmode='OFFLINE_RTGS' then payment.totalamountpaid else 0 end) as "rtgs", + sum(case when payment.paymentmode='OFFLINE_NEFT' then payment.totalamountpaid else 0 end) as "neft", + sum(case when payment.paymentmode='POTAL_ORDER' then payment.totalamountpaid else 0 end) as "po", sum(case when split_part(pt.usagecategory, '.', 1)='RESIDENTIAL' then payment.totalamountpaid else 0 end) as "residential", sum(case when split_part(pt.usagecategory, '.', 1)='RESIDENTIAL' then 1 else 0 end) as "countresidential", sum(case when split_part(pt.usagecategory, '.', 1) = 'NONRESIDENTIAL' then payment.totalamountpaid else 0 end) as "nonresidential", sum(case when pt.usagecategory like 'NONRESIDENTIAL%' then 1 else 0 end) as "countnonresidential", sum(case when pt.usagecategory='MIXED' then payment.totalamountpaid else 0 end) as "mixed", sum(case when pt.usagecategory='MIXED' then 1 else 0 end) as "countmixed", + concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, + (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr + where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id + groupby: GROUP BY financialyear + orderby: ORDER BY financialyear + +- reportName: FYCollectionsReport_WithoutLocality_V2 + summary: FY Collections + version: 1.0.0 + moduleName: rainmaker-pt + additionalConfig: + print: + pdfPageSize: "Legal" + sourceColumns: + - name: financialyear + label: reports.pt.financialyear + type: string + source: pt + total: false + - name: residential + label: reports.pt.residential + type: string + source: pt + total: true + - name: countresidential + label: reports.pt.countresidential + type: string + source: pt + total: true + - name: nonresidential + label: reports.pt.nonresidential + type: string + source: pt + total: true + - name: countnonresidential + label: reports.pt.countnonresidential + type: string + source: pt + total: true + - name: mixed + label: reports.pt.mixed + type: string + source: pt + total: true + - name: countmixed + label: reports.pt.countmixed + type: string + source: pt + total: true + - name: totalamount + label: reports.pt.totalamount + type: string + source: pt + total: true + - name: totalcount + label: reports.pt.totalcount + type: string + source: pt + total: true + - name: online + label: reports.pt.online + type: string + source: pt + total: true + - name: cash + label: reports.pt.cash + type: string + source: pt + total: true + - name: cheque + label: reports.pt.cheque + type: string + source: pt + total: true + - name: dd + label: reports.pt.dd + type: string + source: pt + total: true + - name: card + label: reports.pt.card + type: string + source: pt + total: true + - name: neft + label: reports.pt.neft + type: string + source: pt + total: true + - name: rtgs + label: reports.pt.rtgs + type: string + source: pt + total: true + - name: po + label: reports.pt.po + type: string + source: pt + total: true + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: false + searchClause: AND pd.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: false + searchClause: AND pd.receiptdate <= $toDate + query: | + -- Use CTE to force query plan, compute & use CTE later + SELECT sum(payment.totalamountpaid) as totalamount, count(payment.totalamountpaid) as totalcount, sum(case when payment.paymentmode='ONLINE' then payment.totalamountpaid else 0 end) as "online", sum(case when payment.paymentmode='CASH' then payment.totalamountpaid else 0 end) as "cash", sum(case when payment.paymentmode='CHEQUE' then payment.totalamountpaid else 0 end) as "cheque", - sum(case when payment.paymentmode='DD' then payment.totalamountpaid else 0 end) as "dd" - FROM egcl_paymentdetail AS pd - join egcl_payment as payment on payment.id = pd.paymentid - join egcl_bill as bill on bill.id = pd.billid - join egcl_billdetial as billd on billd.billid = bill.id - JOIN eg_pt_property pt ON pt.propertyid = bill.consumercode - inner JOIN eg_pt_address as pt_addr ON pt_addr.propertyid = pt.id - LEFT OUTER JOIN eg_user ON eg_user.id = pd.createdby::INTEGER - WHERE pd.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and pt.status!='INACTIVE' + sum(case when payment.paymentmode='DD' then payment.totalamountpaid else 0 end) as "dd", + sum(case when payment.paymentmode='CARD' then payment.totalamountpaid else 0 end) as "card", + sum(case when payment.paymentmode='OFFLINE_RTGS' then payment.totalamountpaid else 0 end) as "rtgs", + sum(case when payment.paymentmode='OFFLINE_NEFT' then payment.totalamountpaid else 0 end) as "neft", + sum(case when payment.paymentmode='POTAL_ORDER' then payment.totalamountpaid else 0 end) as "po", + sum(case when split_part(pt.usagecategory, '.', 1)='RESIDENTIAL' then payment.totalamountpaid else 0 end) as "residential", + sum(case when split_part(pt.usagecategory, '.', 1)='RESIDENTIAL' then 1 else 0 end) as "countresidential", + sum(case when split_part(pt.usagecategory, '.', 1) = 'NONRESIDENTIAL' then payment.totalamountpaid else 0 end) as "nonresidential", + sum(case when pt.usagecategory like 'NONRESIDENTIAL%' then 1 else 0 end) as "countnonresidential", + sum(case when pt.usagecategory='MIXED' then payment.totalamountpaid else 0 end) as "mixed", + sum(case when pt.usagecategory='MIXED' then 1 else 0 end) as "countmixed", + concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill + where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' groupby: GROUP BY financialyear - orderby: ORDER BY financialyear + orderby: ORDER BY financialyear - reportName: ULBDEFAULTERPTREPORT_V2 decryptionPathId: ULBDEFAULTERPTREPORT_V2 @@ -4003,15 +4496,186 @@ ReportDefinitions: inner join egcl_bill as bill on bill.id = payd.billid inner join egcl_billdetial as billd on billd.billid=bill.id inner join eg_pt_property as pt on pt.propertyid = bill.consumercode - inner join eg_pt_owner as po on po.propertyid = pt.id + inner join eg_pt_owner as po on po.propertyid = pt.id and po.status='ACTIVE' inner join eg_user as eu on eu.uuid = po.userid inner join eg_pt_address as pta on pta.propertyid = pt.id left outer join eg_pt_unit_v2_ot as pot on pot.propertyid = pt.id where payd.tenantid = $tenantid and bill.consumercode not in (select consumercode from egcl_bill where tenantid=$tenantid and businessservice='PT' and id in (select billid from egcl_billdetial where tenantid=$tenantid and concat(to_char((To_timestamp(fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) ='2020-21')) - and pt.status!='INACTIVE' + and pt.status!='INACTIVE' - +- reportName: ULBDEFAULTERPTREPORT_NEW_V2 + decryptionPathId: ULBDEFAULTERPTREPORT_V2 + summary: ULB Defaulter Pt report + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: propertytaxuniqueid + label: reports.pt.propertytaxuniqueid + type: string + source: pt + total: false + - name: existingpropertyid + label: reports.pt.existingpropertyid + type: string + source: pt + total: false + - name: ownername + label: reports.pt.ownername + type: string + source: pt + total: false + - name: propertytype + label: reports.pt.propertytype + type: string + source: pt + total: false + - name: mobileno + label: reports.pt.mobileno + type: string + source: pt + total: false + - name: address + label: reports.pt.address + type: string + source: pt + total: false + searchParams: + - name: localityArray + label: reports.pt.zoneList + type: boundarylist + source: pt + isMandatory: false + searchClause: AND pta.locality IN ($localityArray) + query: | + --S.no Service Name ULB Property Tax Unique ID Date Of Transcation Receipt Number Existing Property ID Type Of Property Mobile Number Address + with eg_pt_unit_v2_ot as ( + select + propertyid, + string_agg(distinct pu.occupancytype, ',') as occupancytype, + --string_agg(distinct coalesce(usagecategory), ',') as propertytype + string_agg(distinct Initcap(case when usagecategory like '%.%' then split_part(usagecategory,'.',2) else usagecategory end),',') as propertytype + from eg_pt_unit as pu + where pu.tenantid = $tenantid + group by propertyid + ) + select + --distinct on (payd.receiptnumber) + --initcap(split_part(payd.tenantid, '.', 2)) as "ulb", + --split_part(consumercode, ':', 1) as "propertytaxuniqueid", + --to_char((To_timestamp(payd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS "transcationdate", + --payd.receiptnumber as "receiptnumber", + pt.propertyid as "propertytaxuniqueid", + string_agg(pt.oldpropertyid,',') as "existingpropertyid", + --concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) AS "financialyear", + split_part(string_agg(eu."name",','),',',1) as "ownername", --first owner + --eu.guardian as "guardianname", + string_agg(pot.propertytype,',') as "propertytype", + split_part(string_agg(eu.mobilenumber,','),',',1) as "mobileno", + --string_agg(distinct REGEXP_REPLACE(REGEXP_REPLACE(CONCAT(pta.doorno, ',', pta.buildingname, ',',pta.street,',', pta.pincode), ',+', ','), '^,|,$', ''),',') as "address", + string_agg(distinct concat(pta.doorno,',',pta.plotno,',',pta.buildingname,',',pta.street,',',pta.landmark,',',eg_bndry_mohalla.localityname,',',pta.city),',') as "address" + from eg_pt_property pt + --inner join egcl_payment as payment on payment.id = payd.paymentid + --inner join egcl_bill as bill on bill.id = payd.billid + --inner join egcl_billdetial as billd on billd.billid=bill.id + --inner join as pt on pt.propertyid = bill.consumercode + inner join eg_pt_owner as po on po.propertyid = pt.id and po.status='ACTIVE' + inner join eg_user as eu on eu.uuid = po.userid + inner join eg_pt_address as pta on pta.propertyid = pt.id + inner join eg_pt_unit_v2_ot as pot on pot.propertyid = pt.id + inner join eg_bndry_mohalla on eg_bndry_mohalla.localitycode=pta.locality + where pt.tenantid = $tenantid + --and bill.consumercode not in (select consumercode from egcl_bill where tenantid=$tenantid and businessservice='PT' and id in (select billid from egcl_billdetial where tenantid=$tenantid and concat(to_char((To_timestamp(fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) ='2020-21')) + and pt.status!='INACTIVE' + and pt.propertyid not in (select consumercode from egcl_bill where tenantid=$tenantid and businessservice='PT' and id in (select billid from egcl_billdetial where tenantid=$tenantid and concat(to_char((To_timestamp(fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) ='2020-21')) + groupby: group by pt.propertyid + +- reportName: ULBDEFAULTERPTREPORT_MINI_STATE_V2 + decryptionPathId: ULBDEFAULTERPTREPORT_V2 + summary: ULB Defaulter Pt report + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: propertytaxuniqueid + label: reports.pt.propertytaxuniqueid + type: string + source: pt + total: false + - name: existingpropertyid + label: reports.pt.existingpropertyid + type: string + source: pt + total: false + - name: ownername + label: reports.pt.ownername + type: string + source: pt + total: false + - name: propertytype + label: reports.pt.propertytype + type: string + source: pt + total: false + - name: mobileno + label: reports.pt.mobileno + type: string + source: pt + total: false + - name: address + label: reports.pt.address + type: string + source: pt + total: false + searchParams: + - name: ulb + label: ULB + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: pt + wrapper: true + isMandatory: false + searchClause: AND tenantid = $ulb + query: | + --S.no Service Name ULB Property Tax Unique ID Date Of Transcation Receipt Number Existing Property ID Type Of Property Mobile Number Address + with eg_pt_unit_v2_ot as ( + select + propertyid, + string_agg(distinct pu.occupancytype, ',') as occupancytype, + --string_agg(distinct coalesce(usagecategory), ',') as propertytype + string_agg(distinct Initcap(case when usagecategory like '%.%' then split_part(usagecategory,'.',2) else usagecategory end),',') as propertytype + from eg_pt_unit as pu + where pu.tenantid = $ulb + group by propertyid + ) + select + --distinct on (payd.receiptnumber) + --initcap(split_part(payd.tenantid, '.', 2)) as "ulb", + --split_part(consumercode, ':', 1) as "propertytaxuniqueid", + --to_char((To_timestamp(payd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS "transcationdate", + --payd.receiptnumber as "receiptnumber", + pt.propertyid as "propertytaxuniqueid", + string_agg(pt.oldpropertyid,',') as "existingpropertyid", + --concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) AS "financialyear", + split_part(string_agg(eu."name",','),',',1) as "ownername", + --eu.guardian as "guardianname", + string_agg(pot.propertytype,',') as "propertytype", + split_part(string_agg(eu.mobilenumber,','),',',1) as "mobileno", + string_agg(distinct REGEXP_REPLACE(REGEXP_REPLACE(CONCAT(pta.doorno, ',', pta.buildingname, ',',pta.street,',', pta.pincode), ',+', ','), '^,|,$', ''),',') as "address" + from eg_pt_property pt + --inner join egcl_payment as payment on payment.id = payd.paymentid + --inner join egcl_bill as bill on bill.id = payd.billid + --inner join egcl_billdetial as billd on billd.billid=bill.id + --inner join as pt on pt.propertyid = bill.consumercode + inner join eg_pt_owner as po on po.propertyid = pt.id and po.status='ACTIVE' + inner join eg_user as eu on eu.uuid = po.userid + inner join eg_pt_address as pta on pta.propertyid = pt.id + inner join eg_pt_unit_v2_ot as pot on pot.propertyid = pt.id + where pt.tenantid = $ulb + --and bill.consumercode not in (select consumercode from egcl_bill where tenantid=$ulb and businessservice='PT' and id in (select billid from egcl_billdetial where tenantid=$ulb and concat(to_char((To_timestamp(fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) ='2020-21')) + and pt.status!='INACTIVE' + and pt.propertyid not in (select consumercode from egcl_bill where tenantid=$ulb and businessservice='PT' and id in (select billid from egcl_billdetial where tenantid=$ulb and concat(to_char((To_timestamp(fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) ='2020-21')) + groupby: group by pt.propertyid + - reportName: ZoneFYReport_V2 summary: Zone FY Collection version: 1.0.0 @@ -4129,191 +4793,159 @@ ReportDefinitions: --S.no Service Name ULB Property Tax Unique ID Date Of Transcation Receipt Number Existing Property ID Type Of Property Mobile Number Address with fy2013 as ( - SELECT - zonecode, - string_agg(distinct zonename,',') as zonename, - string_agg(distinct concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')),',') AS "financialyear", - count(*) as totalptr, - sum(payment.totalamountpaid) as amountcollected - FROM egcl_paymentdetail AS pd - join egcl_payment as payment on payment.id = pd.paymentid - join egcl_bill as bill on bill.id = pd.billid - join egcl_billdetial as billd on billd.billid = bill.id - JOIN eg_pt_property pt ON pt.propertyid = bill.consumercode - inner JOIN eg_pt_address as pt_addr ON pt_addr.propertyid = pt.id - inner JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality - WHERE pd.tenantid = 'pb.amritsar' and payment.paymentstatus != 'CANCELLED' and pt.status!='INACTIVE' - and concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY'))='2013-14' - GROUP BY zonecode - + SELECT + zonecode, + sum(payment.totalamountpaid) as amount, + count(payment.totalamountpaid) as totalcount, + concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, + (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr + INNER JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality and eg_bndry_mohalla.tenantid=$tenantid + where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id + and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY'))='2013-14' + and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate + GROUP BY financialyear,zonecode + ), fy2014 as ( - SELECT - zonecode, - string_agg(distinct zonename,',') as zonename, - string_agg(distinct concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')),',') AS "financialyear", - count(*) as totalptr, - sum(payment.totalamountpaid) as amountcollected - FROM egcl_paymentdetail AS pd - join egcl_payment as payment on payment.id = pd.paymentid - join egcl_bill as bill on bill.id = pd.billid - join egcl_billdetial as billd on billd.billid = bill.id - JOIN eg_pt_property pt ON pt.propertyid = bill.consumercode - inner JOIN eg_pt_address as pt_addr ON pt_addr.propertyid = pt.id - inner JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality - WHERE pd.tenantid = 'pb.amritsar' and payment.paymentstatus != 'CANCELLED' and pt.status!='INACTIVE' - and concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY'))='2014-15' - GROUP BY zonecode - + SELECT + zonecode, + sum(payment.totalamountpaid) as amount, + count(payment.totalamountpaid) as totalcount, + concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, + (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr + INNER JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality and eg_bndry_mohalla.tenantid=$tenantid + where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id + and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY'))='2014-15' + and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate + GROUP BY financialyear,zonecode ), fy2015 as ( - SELECT - zonecode, - string_agg(distinct zonename,',') as zonename, - string_agg(distinct concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')),',') AS "financialyear", - count(*) as totalptr, - sum(payment.totalamountpaid) as amountcollected - FROM egcl_paymentdetail AS pd - join egcl_payment as payment on payment.id = pd.paymentid - join egcl_bill as bill on bill.id = pd.billid - join egcl_billdetial as billd on billd.billid = bill.id - JOIN eg_pt_property pt ON pt.propertyid = bill.consumercode - inner JOIN eg_pt_address as pt_addr ON pt_addr.propertyid = pt.id - inner JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality - WHERE pd.tenantid = 'pb.amritsar' and payment.paymentstatus != 'CANCELLED' and pt.status!='INACTIVE' - and concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY'))='2015-16' - GROUP BY zonecode - + SELECT + zonecode, + sum(payment.totalamountpaid) as amount, + count(payment.totalamountpaid) as totalcount, + concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, + (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr + INNER JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality and eg_bndry_mohalla.tenantid=$tenantid + where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id + and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY'))='2015-16' + and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate + GROUP BY financialyear,zonecode ), fy2016 as ( - SELECT - zonecode, - string_agg(distinct zonename,',') as zonename, - string_agg(distinct concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')),',') AS "financialyear", - count(*) as totalptr, - sum(payment.totalamountpaid) as amountcollected - FROM egcl_paymentdetail AS pd - join egcl_payment as payment on payment.id = pd.paymentid - join egcl_bill as bill on bill.id = pd.billid - join egcl_billdetial as billd on billd.billid = bill.id - JOIN eg_pt_property pt ON pt.propertyid = bill.consumercode - inner JOIN eg_pt_address as pt_addr ON pt_addr.propertyid = pt.id - inner JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality - WHERE pd.tenantid = 'pb.amritsar' and payment.paymentstatus != 'CANCELLED' and pt.status!='INACTIVE' - and concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY'))='2016-17' - GROUP BY zonecode - - + SELECT + zonecode, + sum(payment.totalamountpaid) as amount, + count(payment.totalamountpaid) as totalcount, + concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, + (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr + inner JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality + where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id + and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY'))='2016-17' + and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate + GROUP BY financialyear,zonecode ), fy2017 as ( - SELECT - zonecode, - string_agg(distinct zonename,',') as zonename, - string_agg(distinct concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')),',') AS "financialyear", - count(*) as totalptr, - sum(payment.totalamountpaid) as amountcollected - FROM egcl_paymentdetail AS pd - join egcl_payment as payment on payment.id = pd.paymentid - join egcl_bill as bill on bill.id = pd.billid - join egcl_billdetial as billd on billd.billid = bill.id - JOIN eg_pt_property pt ON pt.propertyid = bill.consumercode - inner JOIN eg_pt_address as pt_addr ON pt_addr.propertyid = pt.id - inner JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality - WHERE pd.tenantid = 'pb.amritsar' and payment.paymentstatus != 'CANCELLED' and pt.status!='INACTIVE' - and concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY'))='2017-18' - GROUP BY zonecode - + SELECT + zonecode, + sum(payment.totalamountpaid) as amount, + count(payment.totalamountpaid) as totalcount, + concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, + (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr + INNER JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality and eg_bndry_mohalla.tenantid=$tenantid + where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id + and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY'))='2017-18' + and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate + GROUP BY financialyear,zonecode ), fy2018 as ( - SELECT - zonecode, - string_agg(distinct zonename,',') as zonename, - string_agg(distinct concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')),',') AS "financialyear", - count(*) as totalptr, - sum(payment.totalamountpaid) as amountcollected - FROM egcl_paymentdetail AS pd - join egcl_payment as payment on payment.id = pd.paymentid - join egcl_bill as bill on bill.id = pd.billid - join egcl_billdetial as billd on billd.billid = bill.id - JOIN eg_pt_property pt ON pt.propertyid = bill.consumercode - inner JOIN eg_pt_address as pt_addr ON pt_addr.propertyid = pt.id - inner JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality - WHERE pd.tenantid = 'pb.amritsar' and payment.paymentstatus != 'CANCELLED' and pt.status!='INACTIVE' - and concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY'))='2018-19' - GROUP BY zonecode - + SELECT + zonecode, + sum(payment.totalamountpaid) as amount, + count(payment.totalamountpaid) as totalcount, + concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, + (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr + INNER JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality and eg_bndry_mohalla.tenantid=$tenantid + where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id + and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY'))='2018-19' + and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate + GROUP BY financialyear,zonecode ), fy2019 as ( - SELECT - zonecode, - string_agg(distinct zonename,',') as zonename, - string_agg(distinct concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')),',') AS "financialyear", - count(*) as totalptr, - sum(payment.totalamountpaid) as amountcollected - FROM egcl_paymentdetail AS pd - join egcl_payment as payment on payment.id = pd.paymentid - join egcl_bill as bill on bill.id = pd.billid - join egcl_billdetial as billd on billd.billid = bill.id - JOIN eg_pt_property pt ON pt.propertyid = bill.consumercode - inner JOIN eg_pt_address as pt_addr ON pt_addr.propertyid = pt.id - inner JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality - WHERE pd.tenantid = 'pb.amritsar' and payment.paymentstatus != 'CANCELLED' and pt.status!='INACTIVE' - and concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY'))='2019-20' - GROUP BY zonecode + SELECT + zonecode, + sum(payment.totalamountpaid) as amount, + count(payment.totalamountpaid) as totalcount, + concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, + (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr + INNER JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality and eg_bndry_mohalla.tenantid=$tenantid + where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id + and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY'))='2019-20' + and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate + GROUP BY financialyear,zonecode ), fy2020 as ( - SELECT - zonecode, - string_agg(distinct zonename,',') as zonename, - string_agg(distinct concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')),',') AS "financialyear", - count(*) as totalptr, - sum(payment.totalamountpaid) as amountcollected - FROM egcl_paymentdetail AS pd - join egcl_payment as payment on payment.id = pd.paymentid - join egcl_bill as bill on bill.id = pd.billid - join egcl_billdetial as billd on billd.billid = bill.id - JOIN eg_pt_property pt ON pt.propertyid = bill.consumercode - inner JOIN eg_pt_address as pt_addr ON pt_addr.propertyid = pt.id - inner JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality - WHERE pd.tenantid = 'pb.amritsar' and payment.paymentstatus != 'CANCELLED' and pt.status!='INACTIVE' - and concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY'))='2020-21' - GROUP BY zonecode - - + SELECT + zonecode, + sum(payment.totalamountpaid) as amount, + count(payment.totalamountpaid) as totalcount, + concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, + (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr + INNER JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality and eg_bndry_mohalla.tenantid=$tenantid + where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id + and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY'))='2020-21' + and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate + GROUP BY financialyear,zonecode ), zones as ( - select distinct zonecode,string_agg(distinct zonename,',') as zname from eg_bndry_mohalla where tenantid='pb.amritsar' group by zonecode + select zonecode,string_agg(distinct zonename,',') as zname from eg_bndry_mohalla where tenantid=$tenantid group by zonecode ) SELECT zones.zonecode as zonecode, zones.zname as zonename, - coalesce(fy2013.totalptr,0) as "2013_14PTR", - coalesce(fy2013.amountcollected,0) as "2013_14Collection", - coalesce(fy2014.totalptr,0) as "2014_15PTR", - coalesce(fy2014.amountcollected,0) as "2014_15Collection", - coalesce(fy2015.totalptr,0) as "2015_16PTR", - coalesce(fy2015.amountcollected,0) as "2015_16Collection", - coalesce(fy2016.totalptr,0) as "2016_17PTR", - coalesce(fy2016.amountcollected,0) as "2016_17Collection", - coalesce(fy2017.totalptr,0) as "2017_18PTR", - coalesce(fy2017.amountcollected,0) as "2017_18Collection", - coalesce(fy2018.totalptr,0) as "2018_19PTR", - coalesce(fy2018.amountcollected,0) as "2018_19Collection", - coalesce(fy2019.totalptr,0) as "2019_20PTR", - coalesce(fy2019.amountcollected,0) as "2019_20Collection", - coalesce(fy2020.totalptr,0) as "2020_21PTR", - coalesce(fy2020.amountcollected,0) as "2020_21Collection", - coalesce(fy2013.totalptr,0)+coalesce(fy2014.totalptr,0)+coalesce(fy2015.totalptr,0)+coalesce(fy2016.totalptr,0)+coalesce(fy2017.totalptr,0)+coalesce(fy2018.totalptr,0)+coalesce(fy2019.totalptr,0)+coalesce(fy2020.totalptr,0) as "totalptr", - coalesce(fy2013.amountcollected,0)+coalesce(fy2014.amountcollected,0)+coalesce(fy2015.amountcollected,0)+coalesce(fy2016.amountcollected,0)+coalesce(fy2017.amountcollected,0)+coalesce(fy2018.amountcollected,0)+coalesce(fy2019.amountcollected,0)+coalesce(fy2020.amountcollected,0) as "totalcollection" - from zones + coalesce(fy2013.totalcount,0) as "2013_14PTR", + coalesce(fy2013.amount,0) as "2013_14Collection", + coalesce(fy2014.totalcount,0) as "2014_15PTR", + coalesce(fy2014.amount,0) as "2014_15Collection", + coalesce(fy2015.totalcount,0) as "2015_16PTR", + coalesce(fy2015.amount,0) as "2015_16Collection", + coalesce(fy2016.totalcount,0) as "2016_17PTR", + coalesce(fy2016.amount,0) as "2016_17Collection", + coalesce(fy2017.totalcount,0) as "2017_18PTR", + coalesce(fy2017.amount,0) as "2017_18Collection", + coalesce(fy2018.totalcount,0) as "2018_19PTR", + coalesce(fy2018.amount,0) as "2018_19Collection", + coalesce(fy2019.totalcount,0) as "2019_20PTR", + coalesce(fy2019.amount,0) as "2019_20Collection", + coalesce(fy2020.totalcount,0) as "2020_21PTR", + coalesce(fy2020.amount,0) as "2020_21Collection", + coalesce(fy2013.totalcount,0)+coalesce(fy2014.totalcount,0)+coalesce(fy2015.totalcount,0)+coalesce(fy2016.totalcount,0)+coalesce(fy2017.totalcount,0)+coalesce(fy2018.totalcount,0)+coalesce(fy2019.totalcount,0)+coalesce(fy2020.totalcount,0) as "totalptr", + coalesce(fy2013.amount,0)+coalesce(fy2014.amount,0)+coalesce(fy2015.amount,0)+coalesce(fy2016.amount,0)+coalesce(fy2017.amount,0)+coalesce(fy2018.amount,0)+coalesce(fy2019.amount,0)+coalesce(fy2020.amount,0) as "totalcollection" + from zones left outer join fy2013 on fy2013.zonecode=zones.zonecode left outer join fy2014 on fy2014.zonecode=zones.zonecode left outer join fy2015 on fy2015.zonecode=zones.zonecode @@ -4441,195 +5073,161 @@ ReportDefinitions: searchClause: AND 1=1 query: | --S.no Service Name ULB Property Tax Unique ID Date Of Transcation Receipt Number Existing Property ID Type Of Property Mobile Number Address - with fy2013 as + with fy2013 as ( - SELECT + SELECT blockcode, - string_agg(distinct blockname,',') as blockname, - string_agg(distinct concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')),',') AS "financialyear", - count(*) as totalptr, - sum(payment.totalamountpaid) as amountcollected - FROM egcl_paymentdetail AS pd - join egcl_payment as payment on payment.id = pd.paymentid - join egcl_bill as bill on bill.id = pd.billid - join egcl_billdetial as billd on billd.billid = bill.id - JOIN eg_pt_property pt ON pt.propertyid = bill.consumercode - inner JOIN eg_pt_address as pt_addr ON pt_addr.propertyid = pt.id - inner JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality - WHERE pd.tenantid = 'pb.amritsar' and payment.paymentstatus != 'CANCELLED' and pt.status!='INACTIVE' - and concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY'))='2019-20' - GROUP BY blockcode - + sum(payment.totalamountpaid) as amount, + count(payment.totalamountpaid) as totalcount, + concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY')) as financialyear + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, + (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr + INNER JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality and eg_bndry_mohalla.tenantid=$tenantid + where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id + and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY'))='2013-14' + and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate + GROUP BY financialyear,blockcode + ), fy2014 as ( - SELECT + SELECT blockcode, - string_agg(distinct blockname,',') as blockname, - string_agg(distinct concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')),',') AS "financialyear", - count(*) as totalptr, - sum(payment.totalamountpaid) as amountcollected - FROM egcl_paymentdetail AS pd - join egcl_payment as payment on payment.id = pd.paymentid - join egcl_bill as bill on bill.id = pd.billid - join egcl_billdetial as billd on billd.billid = bill.id - JOIN eg_pt_property pt ON pt.propertyid = bill.consumercode - inner JOIN eg_pt_address as pt_addr ON pt_addr.propertyid = pt.id - inner JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality - WHERE pd.tenantid = 'pb.amritsar' and payment.paymentstatus != 'CANCELLED' and pt.status!='INACTIVE' - and concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY'))='2014-15' - GROUP BY blockcode - + sum(payment.totalamountpaid) as amount, + count(payment.totalamountpaid) as totalcount, + concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY')) as financialyear + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, + (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr + INNER JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality and eg_bndry_mohalla.tenantid=$tenantid + where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id + and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY'))='2014-15' + and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate + GROUP BY financialyear,blockcode ), fy2015 as ( - SELECT + SELECT blockcode, - string_agg(distinct blockname,',') as blockname, - string_agg(distinct concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')),',') AS "financialyear", - count(*) as totalptr, - sum(payment.totalamountpaid) as amountcollected - FROM egcl_paymentdetail AS pd - join egcl_payment as payment on payment.id = pd.paymentid - join egcl_bill as bill on bill.id = pd.billid - join egcl_billdetial as billd on billd.billid = bill.id - JOIN eg_pt_property pt ON pt.propertyid = bill.consumercode - inner JOIN eg_pt_address as pt_addr ON pt_addr.propertyid = pt.id - inner JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality - WHERE pd.tenantid = 'pb.amritsar' and payment.paymentstatus != 'CANCELLED' and pt.status!='INACTIVE' - and concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY'))='2015-16' - GROUP BY blockcode - + sum(payment.totalamountpaid) as amount, + count(payment.totalamountpaid) as totalcount, + concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY')) as financialyear + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, + (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr + INNER JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality and eg_bndry_mohalla.tenantid=$tenantid + where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id + and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY'))='2015-16' + and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate + GROUP BY financialyear,blockcode ), fy2016 as ( - SELECT + SELECT blockcode, - string_agg(distinct blockname,',') as blockname, - string_agg(distinct concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')),',') AS "financialyear", - count(*) as totalptr, - sum(payment.totalamountpaid) as amountcollected - FROM egcl_paymentdetail AS pd - join egcl_payment as payment on payment.id = pd.paymentid - join egcl_bill as bill on bill.id = pd.billid - join egcl_billdetial as billd on billd.billid = bill.id - JOIN eg_pt_property pt ON pt.propertyid = bill.consumercode - inner JOIN eg_pt_address as pt_addr ON pt_addr.propertyid = pt.id - inner JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality - WHERE pd.tenantid = 'pb.amritsar' and payment.paymentstatus != 'CANCELLED' and pt.status!='INACTIVE' - and concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY'))='2016-17' - GROUP BY blockcode - - + sum(payment.totalamountpaid) as amount, + count(payment.totalamountpaid) as totalcount, + concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY')) as financialyear + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, + (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr + inner JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality + where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id + and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY'))='2016-17' + and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate + GROUP BY financialyear,blockcode ), fy2017 as ( - SELECT + SELECT blockcode, - string_agg(distinct blockname,',') as blockname, - string_agg(distinct concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')),',') AS "financialyear", - count(*) as totalptr, - sum(payment.totalamountpaid) as amountcollected - FROM egcl_paymentdetail AS pd - join egcl_payment as payment on payment.id = pd.paymentid - join egcl_bill as bill on bill.id = pd.billid - join egcl_billdetial as billd on billd.billid = bill.id - JOIN eg_pt_property pt ON pt.propertyid = bill.consumercode - inner JOIN eg_pt_address as pt_addr ON pt_addr.propertyid = pt.id - inner JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality - WHERE pd.tenantid = 'pb.amritsar' and payment.paymentstatus != 'CANCELLED' and pt.status!='INACTIVE' - and concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY'))='2017-18' - GROUP BY blockcode - + sum(payment.totalamountpaid) as amount, + count(payment.totalamountpaid) as totalcount, + concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY')) as financialyear + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, + (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr + INNER JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality and eg_bndry_mohalla.tenantid=$tenantid + where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id + and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY'))='2017-18' + and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate + GROUP BY financialyear,blockcode ), fy2018 as ( - SELECT + SELECT blockcode, - string_agg(distinct blockname,',') as blockname, - string_agg(distinct concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')),',') AS "financialyear", - count(*) as totalptr, - sum(payment.totalamountpaid) as amountcollected - FROM egcl_paymentdetail AS pd - join egcl_payment as payment on payment.id = pd.paymentid - join egcl_bill as bill on bill.id = pd.billid - join egcl_billdetial as billd on billd.billid = bill.id - JOIN eg_pt_property pt ON pt.propertyid = bill.consumercode - inner JOIN eg_pt_address as pt_addr ON pt_addr.propertyid = pt.id - inner JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality - WHERE pd.tenantid = 'pb.amritsar' and payment.paymentstatus != 'CANCELLED' and pt.status!='INACTIVE' - and concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY'))='2018-19' - GROUP BY blockcode - + sum(payment.totalamountpaid) as amount, + count(payment.totalamountpaid) as totalcount, + concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY')) as financialyear + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, + (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr + INNER JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality and eg_bndry_mohalla.tenantid=$tenantid + where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id + and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY'))='2018-19' + and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate + GROUP BY financialyear,blockcode ), fy2019 as ( - SELECT + SELECT blockcode, - string_agg(distinct blockname,',') as blockname, - string_agg(distinct concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')),',') AS "financialyear", - count(*) as totalptr, - sum(payment.totalamountpaid) as amountcollected - FROM egcl_paymentdetail AS pd - join egcl_payment as payment on payment.id = pd.paymentid - join egcl_bill as bill on bill.id = pd.billid - join egcl_billdetial as billd on billd.billid = bill.id - JOIN eg_pt_property pt ON pt.propertyid = bill.consumercode - inner JOIN eg_pt_address as pt_addr ON pt_addr.propertyid = pt.id - inner JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality - WHERE pd.tenantid = 'pb.amritsar' and payment.paymentstatus != 'CANCELLED' and pt.status!='INACTIVE' - and concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY'))='2019-20' - GROUP BY blockcode - - + sum(payment.totalamountpaid) as amount, + count(payment.totalamountpaid) as totalcount, + concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY')) as financialyear + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, + (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr + INNER JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality and eg_bndry_mohalla.tenantid=$tenantid + where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id + and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY'))='2019-20' + and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate + GROUP BY financialyear,blockcode ), fy2020 as ( - SELECT + SELECT blockcode, - string_agg(distinct blockname,',') as blockname, - string_agg(distinct concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')),',') AS "financialyear", - count(*) as totalptr, - sum(payment.totalamountpaid) as amountcollected - FROM egcl_paymentdetail AS pd - join egcl_payment as payment on payment.id = pd.paymentid - join egcl_bill as bill on bill.id = pd.billid - join egcl_billdetial as billd on billd.billid = bill.id - JOIN eg_pt_property pt ON pt.propertyid = bill.consumercode - inner JOIN eg_pt_address as pt_addr ON pt_addr.propertyid = pt.id - inner JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality - WHERE pd.tenantid = 'pb.amritsar' and payment.paymentstatus != 'CANCELLED' and pt.status!='INACTIVE' - and concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY'))='2020-21' - GROUP BY blockcode - - + sum(payment.totalamountpaid) as amount, + count(payment.totalamountpaid) as totalcount, + concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY')) as financialyear + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, + (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr + INNER JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality and eg_bndry_mohalla.tenantid=$tenantid + where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id + and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY'))='2020-21' + and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate + GROUP BY financialyear,blockcode ), blocks as ( - select distinct blockcode,string_agg(distinct blockname,',') as zname from eg_bndry_mohalla where tenantid='pb.amritsar' group by blockcode + select blockcode,string_agg(distinct blockname,',') as zname from eg_bndry_mohalla where tenantid=$tenantid group by blockcode ) - SELECT + SELECT blocks.blockcode as blockcode, blocks.zname as blockname, - coalesce(fy2013.totalptr,0) as "2013_14PTR", - coalesce(fy2013.amountcollected,0) as "2013_14Collection", - coalesce(fy2014.totalptr,0) as "2014_15PTR", - coalesce(fy2014.amountcollected,0) as "2014_15Collection", - coalesce(fy2015.totalptr,0) as "2015_16PTR", - coalesce(fy2015.amountcollected,0) as "2015_16Collection", - coalesce(fy2016.totalptr,0) as "2016_17PTR", - coalesce(fy2016.amountcollected,0) as "2016_17Collection", - coalesce(fy2017.totalptr,0) as "2017_18PTR", - coalesce(fy2017.amountcollected,0) as "2017_18Collection", - coalesce(fy2018.totalptr,0) as "2018_19PTR", - coalesce(fy2018.amountcollected,0) as "2018_19Collection", - coalesce(fy2019.totalptr,0) as "2019_20PTR", - coalesce(fy2019.amountcollected,0) as "2019_20Collection", - coalesce(fy2020.totalptr,0) as "2020_21PTR", - coalesce(fy2020.amountcollected,0) as "2020_21Collection", - coalesce(fy2013.totalptr,0)+coalesce(fy2014.totalptr,0)+coalesce(fy2015.totalptr,0)+coalesce(fy2016.totalptr,0)+coalesce(fy2017.totalptr,0)+coalesce(fy2018.totalptr,0)+coalesce(fy2019.totalptr,0)+coalesce(fy2020.totalptr,0) as "totalptr", - coalesce(fy2013.amountcollected,0)+coalesce(fy2014.amountcollected,0)+coalesce(fy2015.amountcollected,0)+coalesce(fy2016.amountcollected,0)+coalesce(fy2017.amountcollected,0)+coalesce(fy2018.amountcollected,0)+coalesce(fy2019.amountcollected,0)+coalesce(fy2020.amountcollected,0) as "totalcollection" - from blocks + coalesce(fy2013.totalcount,0) as "2013_14PTR", + coalesce(fy2013.amount,0) as "2013_14Collection", + coalesce(fy2014.totalcount,0) as "2014_15PTR", + coalesce(fy2014.amount,0) as "2014_15Collection", + coalesce(fy2015.totalcount,0) as "2015_16PTR", + coalesce(fy2015.amount,0) as "2015_16Collection", + coalesce(fy2016.totalcount,0) as "2016_17PTR", + coalesce(fy2016.amount,0) as "2016_17Collection", + coalesce(fy2017.totalcount,0) as "2017_18PTR", + coalesce(fy2017.amount,0) as "2017_18Collection", + coalesce(fy2018.totalcount,0) as "2018_19PTR", + coalesce(fy2018.amount,0) as "2018_19Collection", + coalesce(fy2019.totalcount,0) as "2019_20PTR", + coalesce(fy2019.amount,0) as "2019_20Collection", + coalesce(fy2020.totalcount,0) as "2020_21PTR", + coalesce(fy2020.amount,0) as "2020_21Collection", + coalesce(fy2013.totalcount,0)+coalesce(fy2014.totalcount,0)+coalesce(fy2015.totalcount,0)+coalesce(fy2016.totalcount,0)+coalesce(fy2017.totalcount,0)+coalesce(fy2018.totalcount,0)+coalesce(fy2019.totalcount,0)+coalesce(fy2020.totalcount,0) as "totalptr", + coalesce(fy2013.amount,0)+coalesce(fy2014.amount,0)+coalesce(fy2015.amount,0)+coalesce(fy2016.amount,0)+coalesce(fy2017.amount,0)+coalesce(fy2018.amount,0)+coalesce(fy2019.amount,0)+coalesce(fy2020.amount,0) as "totalcollection" + from blocks left outer join fy2013 on fy2013.blockcode=blocks.blockcode left outer join fy2014 on fy2014.blockcode=blocks.blockcode left outer join fy2015 on fy2015.blockcode=blocks.blockcode @@ -4637,6 +5235,6 @@ ReportDefinitions: left outer join fy2017 on fy2017.blockcode=blocks.blockcode left outer join fy2018 on fy2018.blockcode=blocks.blockcode left outer join fy2019 on fy2019.blockcode=blocks.blockcode - left outer join fy2020 on fy2020.blockcode=blocks.blockcode + left outer join fy2020 on fy2020.blockcode=blocks.blockcode where 1=1 orderby: order by blockname From 8f9dd0df7cbaa3ae2b3277c754e9447f83abc9d5 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 18 Dec 2020 11:19:03 +0530 Subject: [PATCH 0514/1242] financialyear function applied receiptregister_v2 --- configs/reports/configs/pt-reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 13863d9c..48068969 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2271,7 +2271,7 @@ ReportDefinitions: payment.totalamountpaid as amount, payment.paymentmode as instrumenttype, payment.transactionnumber, - concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear, + getfinancialyear(pd.billid) as financialyear, to_char((To_timestamp(payment.transactiondate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, payment.totaldue - payment.totalamountpaid AS pendingamount, Initcap(case when pt.usagecategory like '%.%' then split_part(pt.usagecategory,'.',2) else pt.usagecategory end) as usagetype, From cc22d52287fb59cc300dd3feb219b23417e6936c Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 30 Dec 2020 11:57:27 +0530 Subject: [PATCH 0515/1242] bank_name in receipt register --- configs/reports/configs/pt-reports.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 48068969..52b62095 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2477,7 +2477,8 @@ ReportDefinitions: pd.id, pt.propertyid as consumercode, to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS receiptdate, - payment.ifsccode AS bankname, + --payment.ifsccode AS bankname, + concat(bank_branches.bank_name,' ',bank_branches.branch) as bankname, receiptnumber, payment.totalamountpaid as amount, payment.paymentmode as instrumenttype, @@ -2490,7 +2491,7 @@ ReportDefinitions: receipt_breakup.*, to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, manualreceiptnumber as g8receiptno - FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, receipt_breakup, egcl_bill bill + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment left outer join bank_branches on bank_branches.ifsc=payment.ifsccode, eg_pt_property as pt, receipt_breakup, egcl_bill bill --,(select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid and pt.propertyid = bill.consumercode and receipt_breakup.pdid=pd.id and pt.status!='INACTIVE' @@ -2691,7 +2692,8 @@ ReportDefinitions: pd.id, pt.propertyid as consumercode, to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS receiptdate, - payment.ifsccode AS bankname, + --payment.ifsccode AS bankname, + concat(bank_branches.bank_name,' ',bank_branches.branch) as bankname, receiptnumber, payment.totalamountpaid as amount, payment.paymentmode as instrumenttype, @@ -2704,7 +2706,7 @@ ReportDefinitions: receipt_breakup.*, to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, manualreceiptnumber as g8receiptno - FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, receipt_breakup, egcl_bill bill + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment left outer join bank_branches on bank_branches.ifsc=payment.ifsccode, eg_pt_property as pt, receipt_breakup, egcl_bill bill --,(select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus = 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid and pt.propertyid = bill.consumercode and receipt_breakup.pdid=pd.id and pt.status!='INACTIVE' From e01087a56e9d9a5552ad3f92d9a5ce9f49907856 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Thu, 31 Dec 2020 11:53:48 +0530 Subject: [PATCH 0516/1242] added institution name on pt receipt --- configs/pdf-service/data-config/property-receipt.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index a124ddef..949b4826 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -615,7 +615,9 @@ "queryParam": "propertyIds=$.paymentDetails[0].bill.consumerCode,tenantId=$.tenantId", "apiRequest": null, "responseMapping":[ - + { "variable":"institutionName", + "value":"$.Properties[0].institution.name" + }, { "variable":"vasikaNo", "value":"$.Properties[0].additionalDetails.vasikaNo" From 47e22497cb5549d5d0a2e35b6f77de8e9b460539 Mon Sep 17 00:00:00 2001 From: egovmis Date: Thu, 31 Dec 2020 11:54:27 +0530 Subject: [PATCH 0517/1242] added institution name on reecipt --- .../format-config/property-receipt.json | 55 +++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/configs/pdf-service/format-config/property-receipt.json b/configs/pdf-service/format-config/property-receipt.json index c001da37..905c1109 100644 --- a/configs/pdf-service/format-config/property-receipt.json +++ b/configs/pdf-service/format-config/property-receipt.json @@ -917,6 +917,61 @@ "body": ["{{#var_owners}}[{\"text\":\"Owner Name\",\"border\":[true,true,false,true],\"style\":\"receipt-table-key\"},{\"text\":\"{{name2}}\",\"border\":[false,true,true,true]},{\"text\":\"Father/Husband Name\",\"border\":[true,true,false,true],\"style\":\"receipt-table-key\"},{\"text\":\"{{fatherOrHusbandName2}}\",\"border\":[false,true,true,true]}]{{/var_owners}}"] }, "layout": {} + }, { + "style": "next-noc-table", + "table": { + "widths": [ + "25%", + "25%", + "25%", + "25%" + ], + "body": [ + [ + { + "text": "Name of Institution", + "border": [ + true, + true, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{institutionName}}", + "border": [ + false, + true, + false, + true + ], + "style": "receipt-table" + }, + { + "text": " ", + "border": [ + false, + true, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": " ", + "border": [ + false, + true, + true, + true + ], + "style": "receipt-table" + } + ] + ] + }, + "layout": {} }, { "text":"BUILT-UP AREA DETAILS", From 0cb0170aa8b76152cb645a3d5d96edfaca6c95dc Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Mon, 4 Jan 2021 10:29:31 +0530 Subject: [PATCH 0518/1242] [Pi-8793]added islegacy in insert of tl license --- configs/egov-persister/tradelicense-persister.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/configs/egov-persister/tradelicense-persister.yml b/configs/egov-persister/tradelicense-persister.yml index b012713e..23e9a07a 100644 --- a/configs/egov-persister/tradelicense-persister.yml +++ b/configs/egov-persister/tradelicense-persister.yml @@ -57,6 +57,8 @@ serviceMaps: - jsonPath: $.Licenses.*.applicationType - jsonPath: $.Licenses.*.workflowCode + + - jsonPath: $.Licenses.*.isLegacy - query: INSERT INTO eg_tl_tradelicensedetail( id, surveyno, subownershipcategory, channel, additionaldetail, tradelicenseid,structureType,operationalArea,noOfEmployees,adhocExemption,adhocPenalty,adhocExemptionReason,adhocPenaltyReason, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?, ?, ?, ?); @@ -844,4 +846,4 @@ serviceMaps: - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime - - jsonPath: $.Licenses.*.tradeLicenseDetail.id \ No newline at end of file + - jsonPath: $.Licenses.*.tradeLicenseDetail.id From 810473a839f676809e651e8f77efc79da7be9fa2 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Mon, 4 Jan 2021 10:31:13 +0530 Subject: [PATCH 0519/1242] [Pi-8793] added islegacy field in tl license --- configs/egov-persister/tradelicense.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/configs/egov-persister/tradelicense.yml b/configs/egov-persister/tradelicense.yml index 2efc3184..68fde3f0 100644 --- a/configs/egov-persister/tradelicense.yml +++ b/configs/egov-persister/tradelicense.yml @@ -7,7 +7,7 @@ serviceMaps: isTransaction: true queryMaps: - - query: INSERT INTO eg_tl_tradelicense( id, accountid,tenantid,tradeName, validfrom,validto,licensetype,applicationNumber, licenseNumber, oldlicensenumber, propertyid, oldpropertyid, applicationdate, commencementdate, financialyear, action, status, createdby, lastmodifiedby, createdtime, lastmodifiedtime, businessservice, applicationtype, workflowcode) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + - query: INSERT INTO eg_tl_tradelicense( id, accountid,tenantid,tradeName, validfrom,validto,licensetype,applicationNumber, licenseNumber, oldlicensenumber, propertyid, oldpropertyid, applicationdate, commencementdate, financialyear, action, status, createdby, lastmodifiedby, createdtime, lastmodifiedtime, businessservice, applicationtype, workflowcode,islegacy) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); basePath: Licenses.* jsonMaps: - jsonPath: $.Licenses.*.id @@ -57,6 +57,8 @@ serviceMaps: - jsonPath: $.Licenses.*.applicationType - jsonPath: $.Licenses.*.workflowCode + + - jsonPath: $.Licenses.*.isLegacy - query: INSERT INTO eg_tl_tradelicensedetail( id, surveyno, subownershipcategory, channel, additionaldetail, tradelicenseid,structureType,operationalArea,noOfEmployees,adhocExemption,adhocPenalty,adhocExemptionReason,adhocPenaltyReason, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?, ?, ?, ?); From 1bba7703a05a34d267d2eceae545a0c6ec9657cc Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Mon, 4 Jan 2021 10:32:19 +0530 Subject: [PATCH 0520/1242] [PI-8793 added islegacy in insert of tl --- configs/egov-persister/tradelicense-persister.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-persister/tradelicense-persister.yml b/configs/egov-persister/tradelicense-persister.yml index 23e9a07a..a3b6539d 100644 --- a/configs/egov-persister/tradelicense-persister.yml +++ b/configs/egov-persister/tradelicense-persister.yml @@ -7,7 +7,7 @@ serviceMaps: isTransaction: true queryMaps: - - query: INSERT INTO eg_tl_tradelicense( id, accountid,tenantid,tradeName, validfrom,validto,licensetype,applicationNumber, licenseNumber, oldlicensenumber, propertyid, oldpropertyid, applicationdate, commencementdate, financialyear, action, status, createdby, lastmodifiedby, createdtime, lastmodifiedtime, businessservice, applicationtype, workflowcode) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + - query: INSERT INTO eg_tl_tradelicense( id, accountid,tenantid,tradeName, validfrom,validto,licensetype,applicationNumber, licenseNumber, oldlicensenumber, propertyid, oldpropertyid, applicationdate, commencementdate, financialyear, action, status, createdby, lastmodifiedby, createdtime, lastmodifiedtime, businessservice, applicationtype, workflowcode, islegacy) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ? , ?); basePath: Licenses.* jsonMaps: - jsonPath: $.Licenses.*.id From 09ceb6ce4489ef60fc2fe3b7602a7251bce97449 Mon Sep 17 00:00:00 2001 From: narendrabandhamneni-wt-egov Date: Mon, 4 Jan 2021 12:28:02 +0530 Subject: [PATCH 0521/1242] updated query for firenoc --- configs/egov-searcher/weekly-impact-emailer-searcher.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-searcher/weekly-impact-emailer-searcher.yml b/configs/egov-searcher/weekly-impact-emailer-searcher.yml index 2cf53cd1..3d5b2045 100644 --- a/configs/egov-searcher/weekly-impact-emailer-searcher.yml +++ b/configs/egov-searcher/weekly-impact-emailer-searcher.yml @@ -118,7 +118,7 @@ - name: firenocData query: - baseQuery: select array_to_json(array_agg(row_to_json(firenocReports))) from (SELECT count(DISTINCT fn.tenantid) as ulbCovered , count(*) as certificatesIssued,COALESCE(TRUNC(SUM(payment.totalamountpaid) / 10000000, 3),0) as revenuecollected, 'Week0' as day FROM eg_fn_firenocdetail as fn INNER JOIN egcl_bill bill ON fn.applicationnumber = bill.consumercode INNER JOIN egcl_paymentdetail paymentdetail ON bill.id = paymentdetail.billid INNER JOIN egcl_payment payment ON paymentdetail.paymentid =payment.id WHERE (paymentdetail.receiptdate/1000) <= (extract(epoch from NOW())) AND fn.tenantid != 'pb.testing' AND payment.paymentstatus='CANCELLED' AND fn.status='APPROVED' UNION SELECT count(DISTINCT fn.tenantid) as ulbCovered , count(*) as certficatesIssued, COALESCE(TRUNC(SUM(payment.totalamountpaid) / 10000000, 3),0) as revenuecollected,'Week1' as day FROM eg_fn_firenocdetail fn INNER JOIN egcl_bill bill ON fn.applicationnumber = bill.consumercode INNER JOIN egcl_paymentdetail paymentdetail ON bill.id = paymentdetail.billid INNER JOIN egcl_payment payment ON paymentdetail.paymentid =payment.id WHERE (paymentdetail.receiptdate/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND fn.tenantid != 'pb.testing' AND payment.paymentstatus='CANCELLED' AND fn.status='APPROVED' UNION SELECT count(DISTINCT fn.tenantid) as ulbCovered , count(*) as certficatesIssued,COALESCE(TRUNC(SUM(payment.totalamountpaid) / 10000000, 3),0) as revenuecollected, 'Week2' as day FROM eg_fn_firenocdetail fn INNER JOIN egcl_bill bill ON fn.applicationnumber = bill.consumercode INNER JOIN egcl_paymentdetail paymentdetail ON bill.id = paymentdetail.billid INNER JOIN egcl_payment payment ON paymentdetail.paymentid =payment.id WHERE (paymentdetail.receiptdate/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800*2) AND fn.tenantid != 'pb.testing' AND payment.paymentstatus='CANCELLED' AND fn.status='APPROVED' UNION SELECT count(DISTINCT fn.tenantid) as ulbCovered , count(*) as certificatesIssued,COALESCE(TRUNC(SUM(payment.totalamountpaid) / 10000000, 3),0) as revenuecollected, 'Week3' as day FROM eg_fn_firenocdetail fn INNER JOIN egcl_bill bill ON fn.applicationnumber = bill.consumercode INNER JOIN egcl_paymentdetail paymentdetail ON bill.id = paymentdetail.billid INNER JOIN egcl_payment payment ON paymentdetail.paymentid =payment.id WHERE (paymentdetail.receiptdate/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800*3) AND fn.tenantid != 'pb.testing' AND payment.paymentstatus='CANCELLED' AND fn.status='APPROVED' UNION SELECT count(DISTINCT fn.tenantid) as ulbCovered , count(*) as certficatesIssued,COALESCE(TRUNC(SUM(payment.totalamountpaid) / 10000000, 3),0) as revenuecollected, 'Week4' as day FROM eg_fn_firenocdetail fn INNER JOIN egcl_bill bill ON fn.applicationnumber = bill.consumercode INNER JOIN egcl_paymentdetail paymentdetail ON bill.id = paymentdetail.billid INNER JOIN egcl_payment payment ON paymentdetail.paymentid =payment.id WHERE (paymentdetail.receiptdate/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800*4) AND fn.tenantid != 'pb.testing' AND payment.paymentstatus='CANCELLED' AND fn.status='APPROVED' UNION SELECT count(DISTINCT fn.tenantid) as ulbCovered , count(*) as certficatesIssued,COALESCE(TRUNC(SUM(payment.totalamountpaid) / 10000000, 3),0) as revenuecollected, 'Week5' as day FROM eg_fn_firenocdetail fn INNER JOIN egcl_bill bill ON fn.applicationnumber = bill.consumercode INNER JOIN egcl_paymentdetail paymentdetail ON bill.id = paymentdetail.billid INNER JOIN egcl_payment payment ON paymentdetail.paymentid =payment.id WHERE (paymentdetail.receiptdate/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800*5) AND fn.tenantid != 'pb.testing' AND payment.paymentstatus='CANCELLED' AND fn.status='APPROVED') firenocReports + baseQuery: select array_to_json(array_agg(row_to_json(firenocReports))) from (SELECT count(DISTINCT fn.tenantid) as ulbCovered , count(*) as certificatesIssued,COALESCE(TRUNC(SUM(payment.totalamountpaid) / 10000000, 3),0) as revenuecollected, 'Week0' as day FROM eg_fn_firenocdetail as fn INNER JOIN egcl_bill bill ON fn.applicationnumber = bill.consumercode INNER JOIN egcl_paymentdetail paymentdetail ON bill.id = paymentdetail.billid INNER JOIN egcl_payment payment ON paymentdetail.paymentid =payment.id WHERE (paymentdetail.receiptdate/1000) <= (extract(epoch from NOW())) AND fn.tenantid != 'pb.testing' AND payment.paymentstatus!='CANCELLED' AND fn.status='APPROVED' UNION SELECT count(DISTINCT fn.tenantid) as ulbCovered , count(*) as certficatesIssued, COALESCE(TRUNC(SUM(payment.totalamountpaid) / 10000000, 3),0) as revenuecollected,'Week1' as day FROM eg_fn_firenocdetail fn INNER JOIN egcl_bill bill ON fn.applicationnumber = bill.consumercode INNER JOIN egcl_paymentdetail paymentdetail ON bill.id = paymentdetail.billid INNER JOIN egcl_payment payment ON paymentdetail.paymentid =payment.id WHERE (paymentdetail.receiptdate/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND fn.tenantid != 'pb.testing' AND payment.paymentstatus!='CANCELLED' AND fn.status='APPROVED' UNION SELECT count(DISTINCT fn.tenantid) as ulbCovered , count(*) as certficatesIssued,COALESCE(TRUNC(SUM(payment.totalamountpaid) / 10000000, 3),0) as revenuecollected, 'Week2' as day FROM eg_fn_firenocdetail fn INNER JOIN egcl_bill bill ON fn.applicationnumber = bill.consumercode INNER JOIN egcl_paymentdetail paymentdetail ON bill.id = paymentdetail.billid INNER JOIN egcl_payment payment ON paymentdetail.paymentid =payment.id WHERE (paymentdetail.receiptdate/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800*2) AND fn.tenantid != 'pb.testing' AND payment.paymentstatus!='CANCELLED' AND fn.status='APPROVED' UNION SELECT count(DISTINCT fn.tenantid) as ulbCovered , count(*) as certificatesIssued,COALESCE(TRUNC(SUM(payment.totalamountpaid) / 10000000, 3),0) as revenuecollected, 'Week3' as day FROM eg_fn_firenocdetail fn INNER JOIN egcl_bill bill ON fn.applicationnumber = bill.consumercode INNER JOIN egcl_paymentdetail paymentdetail ON bill.id = paymentdetail.billid INNER JOIN egcl_payment payment ON paymentdetail.paymentid =payment.id WHERE (paymentdetail.receiptdate/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800*3) AND fn.tenantid != 'pb.testing' AND payment.paymentstatus!='CANCELLED' AND fn.status='APPROVED' UNION SELECT count(DISTINCT fn.tenantid) as ulbCovered , count(*) as certficatesIssued,COALESCE(TRUNC(SUM(payment.totalamountpaid) / 10000000, 3),0) as revenuecollected, 'Week4' as day FROM eg_fn_firenocdetail fn INNER JOIN egcl_bill bill ON fn.applicationnumber = bill.consumercode INNER JOIN egcl_paymentdetail paymentdetail ON bill.id = paymentdetail.billid INNER JOIN egcl_payment payment ON paymentdetail.paymentid =payment.id WHERE (paymentdetail.receiptdate/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800*4) AND fn.tenantid != 'pb.testing' AND payment.paymentstatus!='CANCELLED' AND fn.status='APPROVED' UNION SELECT count(DISTINCT fn.tenantid) as ulbCovered , count(*) as certficatesIssued,COALESCE(TRUNC(SUM(payment.totalamountpaid) / 10000000, 3),0) as revenuecollected, 'Week5' as day FROM eg_fn_firenocdetail fn INNER JOIN egcl_bill bill ON fn.applicationnumber = bill.consumercode INNER JOIN egcl_paymentdetail paymentdetail ON bill.id = paymentdetail.billid INNER JOIN egcl_payment payment ON paymentdetail.paymentid =payment.id WHERE (paymentdetail.receiptdate/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800*5) AND fn.tenantid != 'pb.testing' AND payment.paymentstatus!='CANCELLED' AND fn.status='APPROVED') firenocReports searchParams: condition: AND params: From 910076f01a66130f2baa4cdae22ba8468f12638e Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Wed, 6 Jan 2021 13:12:00 +0530 Subject: [PATCH 0522/1242] reverted is legacy changes --- configs/egov-persister/tradelicense.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/configs/egov-persister/tradelicense.yml b/configs/egov-persister/tradelicense.yml index 68fde3f0..e1559b7d 100644 --- a/configs/egov-persister/tradelicense.yml +++ b/configs/egov-persister/tradelicense.yml @@ -7,7 +7,7 @@ serviceMaps: isTransaction: true queryMaps: - - query: INSERT INTO eg_tl_tradelicense( id, accountid,tenantid,tradeName, validfrom,validto,licensetype,applicationNumber, licenseNumber, oldlicensenumber, propertyid, oldpropertyid, applicationdate, commencementdate, financialyear, action, status, createdby, lastmodifiedby, createdtime, lastmodifiedtime, businessservice, applicationtype, workflowcode,islegacy) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + - query: INSERT INTO eg_tl_tradelicense( id, accountid,tenantid,tradeName, validfrom,validto,licensetype,applicationNumber, licenseNumber, oldlicensenumber, propertyid, oldpropertyid, applicationdate, commencementdate, financialyear, action, status, createdby, lastmodifiedby, createdtime, lastmodifiedtime, businessservice, applicationtype, workflowcode) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); basePath: Licenses.* jsonMaps: - jsonPath: $.Licenses.*.id @@ -57,10 +57,7 @@ serviceMaps: - jsonPath: $.Licenses.*.applicationType - jsonPath: $.Licenses.*.workflowCode - - - jsonPath: $.Licenses.*.isLegacy - - + - query: INSERT INTO eg_tl_tradelicensedetail( id, surveyno, subownershipcategory, channel, additionaldetail, tradelicenseid,structureType,operationalArea,noOfEmployees,adhocExemption,adhocPenalty,adhocExemptionReason,adhocPenaltyReason, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?, ?, ?, ?); basePath: Licenses.*.tradeLicenseDetail jsonMaps: From 18b498c4c417231499e73cc974758ba768b358b9 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Wed, 6 Jan 2021 13:12:38 +0530 Subject: [PATCH 0523/1242] reverted islegacy changes --- configs/egov-persister/tradelicense-persister.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/configs/egov-persister/tradelicense-persister.yml b/configs/egov-persister/tradelicense-persister.yml index a3b6539d..b438d55b 100644 --- a/configs/egov-persister/tradelicense-persister.yml +++ b/configs/egov-persister/tradelicense-persister.yml @@ -7,7 +7,7 @@ serviceMaps: isTransaction: true queryMaps: - - query: INSERT INTO eg_tl_tradelicense( id, accountid,tenantid,tradeName, validfrom,validto,licensetype,applicationNumber, licenseNumber, oldlicensenumber, propertyid, oldpropertyid, applicationdate, commencementdate, financialyear, action, status, createdby, lastmodifiedby, createdtime, lastmodifiedtime, businessservice, applicationtype, workflowcode, islegacy) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ? , ?); + - query: INSERT INTO eg_tl_tradelicense( id, accountid,tenantid,tradeName, validfrom,validto,licensetype,applicationNumber, licenseNumber, oldlicensenumber, propertyid, oldpropertyid, applicationdate, commencementdate, financialyear, action, status, createdby, lastmodifiedby, createdtime, lastmodifiedtime, businessservice, applicationtype, workflowcode) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); basePath: Licenses.* jsonMaps: - jsonPath: $.Licenses.*.id @@ -57,9 +57,6 @@ serviceMaps: - jsonPath: $.Licenses.*.applicationType - jsonPath: $.Licenses.*.workflowCode - - - jsonPath: $.Licenses.*.isLegacy - - query: INSERT INTO eg_tl_tradelicensedetail( id, surveyno, subownershipcategory, channel, additionaldetail, tradelicenseid,structureType,operationalArea,noOfEmployees,adhocExemption,adhocPenalty,adhocExemptionReason,adhocPenaltyReason, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?, ?, ?, ?); basePath: Licenses.*.tradeLicenseDetail From 3ad9eeb4d1e7857e0bf723b5d6e0dbaaaa895be6 Mon Sep 17 00:00:00 2001 From: mohaarif007 <48949208+mohaarif007@users.noreply.github.com> Date: Fri, 8 Jan 2021 12:47:42 +0530 Subject: [PATCH 0524/1242] StatusReport_V2 in PT StatusReport_V2 in PT --- configs/reports/configs/pt-reports.yml | 110 +++++++++++++++++++++++++ 1 file changed, 110 insertions(+) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 52b62095..3840f0df 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -5240,3 +5240,113 @@ ReportDefinitions: left outer join fy2020 on fy2020.blockcode=blocks.blockcode where 1=1 orderby: order by blockname + +- reportName: StatusReport_V2 + decryptionPathId: StatusReport_V2 + summary: Status Report + version: 1.0.0 + moduleName: rainmaker-pt + additionalConfig: + print: + pdfPageSize: "A1" + sourceColumns: + - name: receiptnumber + label: reports.pt.receiptNo + type: string + source: pt + total: false + - name: receiptdate + label: reports.pt.receiptDate + type: string + source: pt + total: false + - name: amount + label: reports.pt.amount + type: string + source: pt + total: true + - name: pendingamount + label: reports.pt.pendingamount + type: string + source: pt + total: true + - name: consumercode + label: reports.pt.propertyId + type: string + source: pt + total: false + - name: usagetype + label: reports.pt.usagetype + type: string + source: pt + total: false + - name: instrumenttype + label: reports.pt.paymentMode + type: string + source: pt + total: false + - name: transactionnumber + label: reports.pt.ddChequeTransactionNo + type: string + source: pt + total: false + - name: transactiondate + label: reports.pt.ddChequeTransactionDate + type: string + source: pt + total: false + - name: collectorname + label: reports.pt.collectorname + type: string + source: pt + total: false + - name: financialyear + label: reports.pt.financialyear + type: string + source: pt + total: false + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: true + searchClause: AND pd.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: true + searchClause: AND pd.receiptdate <= $toDate + - name: financialyear + label: Financial Year + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name + source: pt + wrapper: true + isMandatory: false + searchClause: AND concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) = $financialyear + query: | + -- Use CTE to force query plan, compute & use CTE later + SELECT + pd.tenantid AS tenantid, + pd.id, + pt.propertyid as consumercode, + to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS receiptdate, + payment.ifsccode AS bankname, + receiptnumber, + payment.totalamountpaid as amount, + payment.paymentmode as instrumenttype, + payment.transactionnumber, + concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear, + to_char((To_timestamp(payment.transactiondate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, + payment.totaldue - payment.totalamountpaid AS pendingamount, + Initcap(case when pt.usagecategory like '%.%' then split_part(pt.usagecategory,'.',2) else pt.usagecategory end) as usagetype, + (case when eg_user.name is null then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else eg_user.name end) as collectorname, + (case when pt.status='ACTIVE' then 'APPROVED' else pt.status end) as status + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, + (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr + where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' + and pt_addr.propertyid=pt.id + orderby: ORDER BY pd.receiptdate DESC; From 158eb5130be2fd412142e18578463f6ba19aa0e5 Mon Sep 17 00:00:00 2001 From: mohaarif007 <48949208+mohaarif007@users.noreply.github.com> Date: Mon, 11 Jan 2021 09:49:17 +0530 Subject: [PATCH 0525/1242] Update StatusReport_V2 on UAT Update StatusReport_V2 on UAT --- configs/reports/configs/pt-reports.yml | 85 ++++++++------------------ 1 file changed, 26 insertions(+), 59 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 3840f0df..160dff0c 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -5250,58 +5250,48 @@ ReportDefinitions: print: pdfPageSize: "A1" sourceColumns: - - name: receiptnumber - label: reports.pt.receiptNo + - name: tenantid + label: reports.pt.tenantid type: string source: pt total: false - - name: receiptdate - label: reports.pt.receiptDate + - name: propertyid + label: reports.pt.propertyid type: string source: pt total: false - - name: amount - label: reports.pt.amount - type: string - source: pt - total: true - - name: pendingamount - label: reports.pt.pendingamount - type: string - source: pt - total: true - - name: consumercode - label: reports.pt.propertyId + - name: applicationnumber + label: reports.pt.applicationnumber type: string source: pt total: false - - name: usagetype - label: reports.pt.usagetype + - name: usagecategory + label: reports.pt.usagecategory type: string source: pt total: false - - name: instrumenttype - label: reports.pt.paymentMode + - name: source + label: reports.pt.source type: string source: pt total: false - - name: transactionnumber - label: reports.pt.ddChequeTransactionNo + - name: channel + label: reports.pt.channel type: string source: pt total: false - - name: transactiondate - label: reports.pt.ddChequeTransactionDate + - name: createdtime + label: reports.pt.createdtime type: string source: pt total: false - - name: collectorname - label: reports.pt.collectorname + - name: createdby + label: reports.pt.createdby type: string source: pt total: false - - name: financialyear - label: reports.pt.financialyear + - name: status + label: reports.pt.status type: string source: pt total: false @@ -5311,42 +5301,19 @@ ReportDefinitions: type: epoch source: pt isMandatory: true - searchClause: AND pd.receiptdate >= $fromDate + searchClause: AND pt.createdtime >= $fromDate - name: toDate label: reports.pt.toDate type: epoch source: pt isMandatory: true - searchClause: AND pd.receiptdate <= $toDate - - name: financialyear - label: Financial Year - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name - source: pt - wrapper: true - isMandatory: false - searchClause: AND concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) = $financialyear + searchClause: AND pt.createdtime <= $toDate query: | -- Use CTE to force query plan, compute & use CTE later SELECT - pd.tenantid AS tenantid, - pd.id, - pt.propertyid as consumercode, - to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS receiptdate, - payment.ifsccode AS bankname, - receiptnumber, - payment.totalamountpaid as amount, - payment.paymentmode as instrumenttype, - payment.transactionnumber, - concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear, - to_char((To_timestamp(payment.transactiondate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, - payment.totaldue - payment.totalamountpaid AS pendingamount, - Initcap(case when pt.usagecategory like '%.%' then split_part(pt.usagecategory,'.',2) else pt.usagecategory end) as usagetype, - (case when eg_user.name is null then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else eg_user.name end) as collectorname, - (case when pt.status='ACTIVE' then 'APPROVED' else pt.status end) as status - FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, - (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr - where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid - and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' - and pt_addr.propertyid=pt.id - orderby: ORDER BY pd.receiptdate DESC; + pt.tenantid AS tenantid, pt.propertyid, pt.acknowldgementnumber as applicationnumber, pt.usagecategory, pt.source, pt.channel, + to_char((To_timestamp(pt.createdtime/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS createdtime, + FROM eg_pt_property as pt + Left outer join eg_user on eg_user.uuid = pt.createdby + orderby: ORDER BY pt.createdtime DESC; + From 6b0071f38451c31a8bfd1f34fc7f76cfb14b00a8 Mon Sep 17 00:00:00 2001 From: mohaarif007 <48949208+mohaarif007@users.noreply.github.com> Date: Mon, 11 Jan 2021 10:11:07 +0530 Subject: [PATCH 0526/1242] Update StatusReport_V2 column Update StatusReport_V2 column --- configs/reports/configs/pt-reports.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 160dff0c..c87f3769 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -5301,19 +5301,20 @@ ReportDefinitions: type: epoch source: pt isMandatory: true - searchClause: AND pt.createdtime >= $fromDate + searchClause: AND propety.createdtime >= $fromDate - name: toDate label: reports.pt.toDate type: epoch source: pt isMandatory: true - searchClause: AND pt.createdtime <= $toDate + searchClause: AND propety.createdtime <= $toDate query: | -- Use CTE to force query plan, compute & use CTE later SELECT - pt.tenantid AS tenantid, pt.propertyid, pt.acknowldgementnumber as applicationnumber, pt.usagecategory, pt.source, pt.channel, - to_char((To_timestamp(pt.createdtime/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS createdtime, - FROM eg_pt_property as pt - Left outer join eg_user on eg_user.uuid = pt.createdby - orderby: ORDER BY pt.createdtime DESC; + propety.tenantid AS tenantid, propety.propertyid, propety.acknowldgementnumber as applicationnumber, propety.usagecategory, propety.source, propety.channel, + to_char((To_timestamp(propety.createdtime/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS createdtime, + (case when eg_user.name is null then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else eg_user.name end) as createdby, propety.status + FROM eg_pt_property as propety + Left outer join eg_user on eg_user.uuid = propety.createdby + orderby: ORDER BY propety.createdtime DESC; From d518ef37b1efbfb7c45cf7e1e8c091fa78f7ca8e Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 11 Jan 2021 11:13:15 +0530 Subject: [PATCH 0527/1242] Update pt-reports.yml --- configs/reports/configs/pt-reports.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index c87f3769..dc642852 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -5285,7 +5285,7 @@ ReportDefinitions: type: string source: pt total: false - - name: createdby + - name: collectorname label: reports.pt.createdby type: string source: pt @@ -5313,7 +5313,7 @@ ReportDefinitions: SELECT propety.tenantid AS tenantid, propety.propertyid, propety.acknowldgementnumber as applicationnumber, propety.usagecategory, propety.source, propety.channel, to_char((To_timestamp(propety.createdtime/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS createdtime, - (case when eg_user.name is null then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else eg_user.name end) as createdby, propety.status + (case when eg_user.name is null then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else eg_user.name end) as collectorname, propety.status FROM eg_pt_property as propety Left outer join eg_user on eg_user.uuid = propety.createdby orderby: ORDER BY propety.createdtime DESC; From 6ffd290bbab345b8bf1348eaa4d6578c6de56731 Mon Sep 17 00:00:00 2001 From: mohaarif007 <48949208+mohaarif007@users.noreply.github.com> Date: Mon, 11 Jan 2021 11:43:45 +0530 Subject: [PATCH 0528/1242] Update StatusReport_V2 Update StatusReport_V2 --- configs/reports/configs/pt-reports.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index dc642852..6976f58d 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -5316,5 +5316,6 @@ ReportDefinitions: (case when eg_user.name is null then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else eg_user.name end) as collectorname, propety.status FROM eg_pt_property as propety Left outer join eg_user on eg_user.uuid = propety.createdby + WHERE propety.tenantid=$tenantid AND propety.acknowldgementnumber NOTNULL orderby: ORDER BY propety.createdtime DESC; From c780e0fd3cea749cce65d228bc9c0e3b7b5f918c Mon Sep 17 00:00:00 2001 From: mohaarif007 <48949208+mohaarif007@users.noreply.github.com> Date: Mon, 11 Jan 2021 15:00:20 +0530 Subject: [PATCH 0529/1242] Update column in StatusReport_V2 Update column in StatusReport_V2 --- configs/reports/configs/pt-reports.yml | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 6976f58d..cf14666e 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -5250,11 +5250,6 @@ ReportDefinitions: print: pdfPageSize: "A1" sourceColumns: - - name: tenantid - label: reports.pt.tenantid - type: string - source: pt - total: false - name: propertyid label: reports.pt.propertyid type: string @@ -5270,11 +5265,6 @@ ReportDefinitions: type: string source: pt total: false - - name: source - label: reports.pt.source - type: string - source: pt - total: false - name: channel label: reports.pt.channel type: string @@ -5290,6 +5280,16 @@ ReportDefinitions: type: string source: pt total: false + - name: localitycode + label: reports.pt.localitycode + type: string + source: pt + total: false + - name: localityname + label: reports.pt.localityname + type: string + source: pt + total: false - name: status label: reports.pt.status type: string @@ -5311,11 +5311,13 @@ ReportDefinitions: query: | -- Use CTE to force query plan, compute & use CTE later SELECT - propety.tenantid AS tenantid, propety.propertyid, propety.acknowldgementnumber as applicationnumber, propety.usagecategory, propety.source, propety.channel, + propety.propertyid, propety.acknowldgementnumber as applicationnumber, propety.usagecategory, propety.channel, to_char((To_timestamp(propety.createdtime/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS createdtime, - (case when eg_user.name is null then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else eg_user.name end) as collectorname, propety.status + (case when eg_user.name is null then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else eg_user.name end) as collectorname, pta.locality as localitycode, localnames.localityname as localityname, propety.status FROM eg_pt_property as propety Left outer join eg_user on eg_user.uuid = propety.createdby + inner join eg_pt_address as pta on pta.propertyid = propety.id + left outer join eg_bndry_mohalla as localnames on pta.locality=localnames.localitycode WHERE propety.tenantid=$tenantid AND propety.acknowldgementnumber NOTNULL orderby: ORDER BY propety.createdtime DESC; From 89caeccef2de73cf0ff326b9f08855f67f005eb9 Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov <61416590+mahammadnizam-wt-eGov@users.noreply.github.com> Date: Mon, 11 Jan 2021 18:28:55 +0530 Subject: [PATCH 0530/1242] [PI-1170]-updated eg_fn_address table query --- configs/egov-persister/firenoc_persiter.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-persister/firenoc_persiter.yaml b/configs/egov-persister/firenoc_persiter.yaml index 58a718b9..e7a57fde 100644 --- a/configs/egov-persister/firenoc_persiter.yaml +++ b/configs/egov-persister/firenoc_persiter.yaml @@ -557,7 +557,7 @@ serviceMaps: - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.subDistrict - - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.id + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.id From 72ac4e39cdff1219fddf832246a9102fe4e2fe63 Mon Sep 17 00:00:00 2001 From: mohaarif007 <48949208+mohaarif007@users.noreply.github.com> Date: Thu, 14 Jan 2021 09:10:22 +0530 Subject: [PATCH 0531/1242] update column in StatusReport_V2 report update column in StatusReport_V2 report --- configs/reports/configs/pt-reports.yml | 34 ++++++++++++++++++++------ 1 file changed, 27 insertions(+), 7 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index cf14666e..7ab26eee 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -5265,8 +5265,8 @@ ReportDefinitions: type: string source: pt total: false - - name: channel - label: reports.pt.channel + - name: financialyear + label: reports.pt.financialyear type: string source: pt total: false @@ -5290,6 +5290,21 @@ ReportDefinitions: type: string source: pt total: false + - name: totalamount + label: reports.pt.totalamount + type: string + source: pt + total: false + - name: collectorname + label: reports.pt.approvedby + type: string + source: pt + total: false + - name: address + label: reports.pt.address + type: string + source: pt + total: false - name: status label: reports.pt.status type: string @@ -5312,12 +5327,17 @@ ReportDefinitions: -- Use CTE to force query plan, compute & use CTE later SELECT propety.propertyid, propety.acknowldgementnumber as applicationnumber, propety.usagecategory, propety.channel, - to_char((To_timestamp(propety.createdtime/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS createdtime, - (case when eg_user.name is null then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else eg_user.name end) as collectorname, pta.locality as localitycode, localnames.localityname as localityname, propety.status + to_char((To_timestamp(propety.createdtime/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS createdtime, + (case when eg_user.name is null then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else eg_user.name end) AS collectorname, + pta.locality AS localitycode, localnames.localityname as localityname, + REGEXP_REPLACE(REGEXP_REPLACE(CONCAT(pta.doorno, ',', pta.buildingname, ',',pta.street,',', pta.pincode), ',+', ','), '^,|,$', '') as "address", pt_detail.financialyear, propety.status, bill.totalamount, + (case when propety.status = 'INWORKFLOW' then 'null' else euser.name end) as collectorname FROM eg_pt_property as propety - Left outer join eg_user on eg_user.uuid = propety.createdby - inner join eg_pt_address as pta on pta.propertyid = propety.id - left outer join eg_bndry_mohalla as localnames on pta.locality=localnames.localitycode + Left outer join eg_user as eu on eu.uuid = propety.createdby + Left outer join eg_user as euser on euser.uuid = propety.lastmodifiedby + Left outer join eg_pt_address as pta on pta.propertyid = propety.id + Left outer join eg_pt_propertydetail_v2 pt_detail ON pt_detail.property = propety.propertyid + Left outer join egcl_bill as bill on bill.consumercode = propety.propertyid WHERE propety.tenantid=$tenantid AND propety.acknowldgementnumber NOTNULL orderby: ORDER BY propety.createdtime DESC; From 841284aa66fe8b2b9df21c77c40f3a180b544724 Mon Sep 17 00:00:00 2001 From: mohaarif007 <48949208+mohaarif007@users.noreply.github.com> Date: Thu, 14 Jan 2021 12:44:01 +0530 Subject: [PATCH 0532/1242] Update column in StatusReport_V2 Update column in StatusReport_V2 --- configs/reports/configs/pt-reports.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 7ab26eee..5be727e3 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -5295,7 +5295,7 @@ ReportDefinitions: type: string source: pt total: false - - name: collectorname + - name: approvedby label: reports.pt.approvedby type: string source: pt @@ -5328,16 +5328,17 @@ ReportDefinitions: SELECT propety.propertyid, propety.acknowldgementnumber as applicationnumber, propety.usagecategory, propety.channel, to_char((To_timestamp(propety.createdtime/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS createdtime, - (case when eg_user.name is null then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else eg_user.name end) AS collectorname, + (case when eu.name is null then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else eu.name end) AS collectorname, pta.locality AS localitycode, localnames.localityname as localityname, REGEXP_REPLACE(REGEXP_REPLACE(CONCAT(pta.doorno, ',', pta.buildingname, ',',pta.street,',', pta.pincode), ',+', ','), '^,|,$', '') as "address", pt_detail.financialyear, propety.status, bill.totalamount, - (case when propety.status = 'INWORKFLOW' then 'null' else euser.name end) as collectorname + (case when propety.status = 'INWORKFLOW' then 'null' else euser.name end) as approvedby FROM eg_pt_property as propety Left outer join eg_user as eu on eu.uuid = propety.createdby Left outer join eg_user as euser on euser.uuid = propety.lastmodifiedby - Left outer join eg_pt_address as pta on pta.propertyid = propety.id + Left outer join eg_pt_address as pta on pta.propertyid = propety.id Left outer join eg_pt_propertydetail_v2 pt_detail ON pt_detail.property = propety.propertyid Left outer join egcl_bill as bill on bill.consumercode = propety.propertyid + Left outer join eg_bndry_mohalla as localnames on pta.locality=localnames.localitycode WHERE propety.tenantid=$tenantid AND propety.acknowldgementnumber NOTNULL orderby: ORDER BY propety.createdtime DESC; From c693db9d25961f60816961bd16768e984d297a1d Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 14 Jan 2021 14:52:57 +0530 Subject: [PATCH 0533/1242] Update pt-reports.yml --- configs/reports/configs/pt-reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 5be727e3..846b7b4f 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -5328,7 +5328,7 @@ ReportDefinitions: SELECT propety.propertyid, propety.acknowldgementnumber as applicationnumber, propety.usagecategory, propety.channel, to_char((To_timestamp(propety.createdtime/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS createdtime, - (case when eu.name is null then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else eu.name end) AS collectorname, + (case when eu.name is null then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else eu.name end) AS createdby, pta.locality AS localitycode, localnames.localityname as localityname, REGEXP_REPLACE(REGEXP_REPLACE(CONCAT(pta.doorno, ',', pta.buildingname, ',',pta.street,',', pta.pincode), ',+', ','), '^,|,$', '') as "address", pt_detail.financialyear, propety.status, bill.totalamount, (case when propety.status = 'INWORKFLOW' then 'null' else euser.name end) as approvedby From 60f463831467c8698ab37f4a23c6028ccf8d6049 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 14 Jan 2021 14:55:55 +0530 Subject: [PATCH 0534/1242] Update pt-reports.yml --- configs/reports/configs/pt-reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 846b7b4f..0f8b9d2c 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -5275,7 +5275,7 @@ ReportDefinitions: type: string source: pt total: false - - name: collectorname + - name: createdby label: reports.pt.createdby type: string source: pt From e035494847505178519fe827533d304120f58e64 Mon Sep 17 00:00:00 2001 From: mohaarif007 <48949208+mohaarif007@users.noreply.github.com> Date: Fri, 15 Jan 2021 10:35:27 +0530 Subject: [PATCH 0535/1242] Update zone block in StatusReport_V2 Update zone block in StatusReport_V2 --- configs/reports/configs/pt-reports.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 0f8b9d2c..1c5ca505 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -5280,8 +5280,13 @@ ReportDefinitions: type: string source: pt total: false - - name: localitycode - label: reports.pt.localitycode + - name: zonecode + label: reports.pt.zonecode + type: string + source: pt + total: false + - name: blockcode + label: reports.pt.blockcode type: string source: pt total: false @@ -5329,7 +5334,7 @@ ReportDefinitions: propety.propertyid, propety.acknowldgementnumber as applicationnumber, propety.usagecategory, propety.channel, to_char((To_timestamp(propety.createdtime/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS createdtime, (case when eu.name is null then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else eu.name end) AS createdby, - pta.locality AS localitycode, localnames.localityname as localityname, + localnames.zonecode, localnames.blockcode, localnames.localityname, REGEXP_REPLACE(REGEXP_REPLACE(CONCAT(pta.doorno, ',', pta.buildingname, ',',pta.street,',', pta.pincode), ',+', ','), '^,|,$', '') as "address", pt_detail.financialyear, propety.status, bill.totalamount, (case when propety.status = 'INWORKFLOW' then 'null' else euser.name end) as approvedby FROM eg_pt_property as propety From 33f40e38b2fa39faa6289e945df39df522ec7320 Mon Sep 17 00:00:00 2001 From: mohaarif007 <48949208+mohaarif007@users.noreply.github.com> Date: Fri, 15 Jan 2021 10:54:12 +0530 Subject: [PATCH 0536/1242] Update StatusReport_V2 Update StatusReport_V2 --- configs/reports/configs/pt-reports.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 1c5ca505..4269f8f3 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -5280,13 +5280,13 @@ ReportDefinitions: type: string source: pt total: false - - name: zonecode - label: reports.pt.zonecode + - name: zone + label: reports.pt.zone type: string source: pt total: false - - name: blockcode - label: reports.pt.blockcode + - name: block + label: reports.pt.block type: string source: pt total: false @@ -5331,10 +5331,10 @@ ReportDefinitions: query: | -- Use CTE to force query plan, compute & use CTE later SELECT - propety.propertyid, propety.acknowldgementnumber as applicationnumber, propety.usagecategory, propety.channel, + propety.propertyid, propety.acknowldgementnumber as applicationnumber, propety.usagecategory, to_char((To_timestamp(propety.createdtime/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS createdtime, - (case when eu.name is null then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else eu.name end) AS createdby, - localnames.zonecode, localnames.blockcode, localnames.localityname, + (case when eu.name is null then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else eu.name end) AS createdby, + localnames.zonecode AS zone, localnames.blockcode AS block, localnames.localityname AS localityname, REGEXP_REPLACE(REGEXP_REPLACE(CONCAT(pta.doorno, ',', pta.buildingname, ',',pta.street,',', pta.pincode), ',+', ','), '^,|,$', '') as "address", pt_detail.financialyear, propety.status, bill.totalamount, (case when propety.status = 'INWORKFLOW' then 'null' else euser.name end) as approvedby FROM eg_pt_property as propety From c552f1a9dcd51927220b097f11b4229d6f8678ce Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 15 Jan 2021 11:45:54 +0530 Subject: [PATCH 0537/1242] updated null encrypted value --- configs/reports/configs/pt-reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 4269f8f3..c19c2059 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -5336,7 +5336,7 @@ ReportDefinitions: (case when eu.name is null then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else eu.name end) AS createdby, localnames.zonecode AS zone, localnames.blockcode AS block, localnames.localityname AS localityname, REGEXP_REPLACE(REGEXP_REPLACE(CONCAT(pta.doorno, ',', pta.buildingname, ',',pta.street,',', pta.pincode), ',+', ','), '^,|,$', '') as "address", pt_detail.financialyear, propety.status, bill.totalamount, - (case when propety.status = 'INWORKFLOW' then 'null' else euser.name end) as approvedby + (case when propety.status = 'INWORKFLOW' then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else euser.name end) as approvedby FROM eg_pt_property as propety Left outer join eg_user as eu on eu.uuid = propety.createdby Left outer join eg_user as euser on euser.uuid = propety.lastmodifiedby From d7336e9b5db51207e13ee4bb49e42d518c3d24e0 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 18 Jan 2021 10:59:27 +0530 Subject: [PATCH 0538/1242] V2 gissearch changes for 3rd vendor --- configs/egov-searcher/rainmaker-pt-gissearch.yml | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/configs/egov-searcher/rainmaker-pt-gissearch.yml b/configs/egov-searcher/rainmaker-pt-gissearch.yml index 6ff30e0b..3a4a0e2e 100644 --- a/configs/egov-searcher/rainmaker-pt-gissearch.yml +++ b/configs/egov-searcher/rainmaker-pt-gissearch.yml @@ -11,14 +11,13 @@ SearchDefinitions: select pt.propertyid as propertyid, pt.oldpropertyid as oldpropertyid, - rh.receiptnumber as receiptnumber, + pd.receiptnumber as receiptnumber, pt.tenantid as tenantid from - egcl_receiptheader AS rh - INNER JOIN eg_pt_property_v2 AS pt - ON pt.propertyid = split_part(rh.consumercode, ':', 1) - AND - pt.oldpropertyid IS NOT NULL + egcl_paymentdetail AS pd + INNER JOIN egcl_bill on pd.billid=egcl_bill.id + INNER JOIN eg_pt_property AS pt ON pt.propertyid = egcl_bill.consumercode + AND pt.oldpropertyid IS NOT NULL AND pt.oldpropertyid != '' $where) data groupBy: @@ -26,11 +25,11 @@ SearchDefinitions: searchParams: condition: AND params: - - name: rh.receiptdate + - name: pd.receiptdate isMandatory: true jsonPath: $.searchCriteria.fromDate operator: GE - - name: rh.receiptdate + - name: pd.receiptdate isMandatory: true jsonPath: $.searchCriteria.toDate operator: LE @@ -44,4 +43,3 @@ SearchDefinitions: jsonFormat: {"ResponseInfo": {}} outJsonPath: $.data responseInfoPath: $.ResponseInfo - From efde65e8dc2243724ee866efcdf2ae95d2afee82 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 18 Jan 2021 11:51:25 +0530 Subject: [PATCH 0539/1242] dates mandatory false --- configs/egov-searcher/rainmaker-pt-gissearch.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/egov-searcher/rainmaker-pt-gissearch.yml b/configs/egov-searcher/rainmaker-pt-gissearch.yml index 3a4a0e2e..b5c44bd0 100644 --- a/configs/egov-searcher/rainmaker-pt-gissearch.yml +++ b/configs/egov-searcher/rainmaker-pt-gissearch.yml @@ -26,11 +26,11 @@ SearchDefinitions: condition: AND params: - name: pd.receiptdate - isMandatory: true + isMandatory: false jsonPath: $.searchCriteria.fromDate operator: GE - name: pd.receiptdate - isMandatory: true + isMandatory: false jsonPath: $.searchCriteria.toDate operator: LE - name: pt.tenantid From 222fb4a7fd50ec86f2123e920cde5f19a4874e64 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 18 Jan 2021 13:06:22 +0530 Subject: [PATCH 0540/1242] Update rainmaker-pt-gissearch.yml --- configs/egov-searcher/rainmaker-pt-gissearch.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/egov-searcher/rainmaker-pt-gissearch.yml b/configs/egov-searcher/rainmaker-pt-gissearch.yml index b5c44bd0..eeecae38 100644 --- a/configs/egov-searcher/rainmaker-pt-gissearch.yml +++ b/configs/egov-searcher/rainmaker-pt-gissearch.yml @@ -25,11 +25,11 @@ SearchDefinitions: searchParams: condition: AND params: - - name: pd.receiptdate + - name: pd.receiptdate::varchar isMandatory: false jsonPath: $.searchCriteria.fromDate operator: GE - - name: pd.receiptdate + - name: pd.receiptdate::varchar isMandatory: false jsonPath: $.searchCriteria.toDate operator: LE From f5d633b5f8512120df7ad1977aca33410fb8b0bc Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 18 Jan 2021 13:14:52 +0530 Subject: [PATCH 0541/1242] Update rainmaker-pt-gissearch.yml --- configs/egov-searcher/rainmaker-pt-gissearch.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/configs/egov-searcher/rainmaker-pt-gissearch.yml b/configs/egov-searcher/rainmaker-pt-gissearch.yml index eeecae38..e91f6195 100644 --- a/configs/egov-searcher/rainmaker-pt-gissearch.yml +++ b/configs/egov-searcher/rainmaker-pt-gissearch.yml @@ -12,7 +12,8 @@ SearchDefinitions: pt.propertyid as propertyid, pt.oldpropertyid as oldpropertyid, pd.receiptnumber as receiptnumber, - pt.tenantid as tenantid + pt.tenantid as tenantid, + pd.receiptdate::varchar as receiptdate from egcl_paymentdetail AS pd INNER JOIN egcl_bill on pd.billid=egcl_bill.id @@ -25,11 +26,11 @@ SearchDefinitions: searchParams: condition: AND params: - - name: pd.receiptdate::varchar + - name: receiptdate isMandatory: false jsonPath: $.searchCriteria.fromDate operator: GE - - name: pd.receiptdate::varchar + - name: receiptdate isMandatory: false jsonPath: $.searchCriteria.toDate operator: LE From bdec8e7f5b852010e2248b9dfeee55a3091edb75 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 18 Jan 2021 13:31:53 +0530 Subject: [PATCH 0542/1242] Update rainmaker-pt-gissearch.yml --- configs/egov-searcher/rainmaker-pt-gissearch.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/egov-searcher/rainmaker-pt-gissearch.yml b/configs/egov-searcher/rainmaker-pt-gissearch.yml index e91f6195..8cefb17c 100644 --- a/configs/egov-searcher/rainmaker-pt-gissearch.yml +++ b/configs/egov-searcher/rainmaker-pt-gissearch.yml @@ -13,7 +13,7 @@ SearchDefinitions: pt.oldpropertyid as oldpropertyid, pd.receiptnumber as receiptnumber, pt.tenantid as tenantid, - pd.receiptdate::varchar as receiptdate + pd.receiptdate as receiptdate from egcl_paymentdetail AS pd INNER JOIN egcl_bill on pd.billid=egcl_bill.id @@ -26,11 +26,11 @@ SearchDefinitions: searchParams: condition: AND params: - - name: receiptdate + - name: pd.receiptdate isMandatory: false jsonPath: $.searchCriteria.fromDate operator: GE - - name: receiptdate + - name: pd.receiptdate isMandatory: false jsonPath: $.searchCriteria.toDate operator: LE From b29f7c43a3720d2c06623f1206871380d18f1578 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 19 Jan 2021 13:44:10 +0530 Subject: [PATCH 0543/1242] searchParamsUpdate --- configs/egov-searcher/rainmaker-pt-gissearch.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/egov-searcher/rainmaker-pt-gissearch.yml b/configs/egov-searcher/rainmaker-pt-gissearch.yml index 8cefb17c..e9af754e 100644 --- a/configs/egov-searcher/rainmaker-pt-gissearch.yml +++ b/configs/egov-searcher/rainmaker-pt-gissearch.yml @@ -26,11 +26,11 @@ SearchDefinitions: searchParams: condition: AND params: - - name: pd.receiptdate + - name: pd.receiptfromdate isMandatory: false jsonPath: $.searchCriteria.fromDate operator: GE - - name: pd.receiptdate + - name: pd.receipttodate isMandatory: false jsonPath: $.searchCriteria.toDate operator: LE From d952df69407fb9e8498d261f8ca32e7a129d8706 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 19 Jan 2021 13:56:31 +0530 Subject: [PATCH 0544/1242] Update rainmaker-pt-gissearch.yml --- configs/egov-searcher/rainmaker-pt-gissearch.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/egov-searcher/rainmaker-pt-gissearch.yml b/configs/egov-searcher/rainmaker-pt-gissearch.yml index e9af754e..8cefb17c 100644 --- a/configs/egov-searcher/rainmaker-pt-gissearch.yml +++ b/configs/egov-searcher/rainmaker-pt-gissearch.yml @@ -26,11 +26,11 @@ SearchDefinitions: searchParams: condition: AND params: - - name: pd.receiptfromdate + - name: pd.receiptdate isMandatory: false jsonPath: $.searchCriteria.fromDate operator: GE - - name: pd.receipttodate + - name: pd.receiptdate isMandatory: false jsonPath: $.searchCriteria.toDate operator: LE From eefc93851445ed40a57c6139b956da93b01122b9 Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov <61416590+mahammadnizam-wt-eGov@users.noreply.github.com> Date: Wed, 20 Jan 2021 14:33:22 +0530 Subject: [PATCH 0545/1242] Updated tenantt id in the firenoc details --- configs/egov-persister/firenoc_persiter.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-persister/firenoc_persiter.yaml b/configs/egov-persister/firenoc_persiter.yaml index e7a57fde..de974dc4 100644 --- a/configs/egov-persister/firenoc_persiter.yaml +++ b/configs/egov-persister/firenoc_persiter.yaml @@ -62,7 +62,7 @@ serviceMaps: - jsonPath: $.FireNOCs.*.fireNOCDetails.noOfBuildings - - jsonPath: $.FireNOCs.*.fireNOCDetails.tenantId + - jsonPath: $.FireNOCs.*.tenantId - jsonPath: $.FireNOCs.*.fireNOCDetails.additionalDetail type: JSON From 33a7ec495f06ad7228017414f109b9194d555457 Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov <61416590+mahammadnizam-wt-eGov@users.noreply.github.com> Date: Wed, 20 Jan 2021 14:49:22 +0530 Subject: [PATCH 0546/1242] Reverted tenantId in the firenoc details --- configs/egov-persister/firenoc_persiter.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-persister/firenoc_persiter.yaml b/configs/egov-persister/firenoc_persiter.yaml index de974dc4..e7a57fde 100644 --- a/configs/egov-persister/firenoc_persiter.yaml +++ b/configs/egov-persister/firenoc_persiter.yaml @@ -62,7 +62,7 @@ serviceMaps: - jsonPath: $.FireNOCs.*.fireNOCDetails.noOfBuildings - - jsonPath: $.FireNOCs.*.tenantId + - jsonPath: $.FireNOCs.*.fireNOCDetails.tenantId - jsonPath: $.FireNOCs.*.fireNOCDetails.additionalDetail type: JSON From 3122057dfb66371ca93109fafda6c7d3a15e4e85 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 21 Jan 2021 13:29:59 +0530 Subject: [PATCH 0547/1242] enabled search by blockcode --- .../egov-searcher/rainmaker-pt-gissearch.yml | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/configs/egov-searcher/rainmaker-pt-gissearch.yml b/configs/egov-searcher/rainmaker-pt-gissearch.yml index 8cefb17c..d803ef7d 100644 --- a/configs/egov-searcher/rainmaker-pt-gissearch.yml +++ b/configs/egov-searcher/rainmaker-pt-gissearch.yml @@ -13,14 +13,14 @@ SearchDefinitions: pt.oldpropertyid as oldpropertyid, pd.receiptnumber as receiptnumber, pt.tenantid as tenantid, - pd.receiptdate as receiptdate - from - egcl_paymentdetail AS pd + pd.receiptdate as receiptdate, + bn.blockname + from egcl_paymentdetail AS pd INNER JOIN egcl_bill on pd.billid=egcl_bill.id - INNER JOIN eg_pt_property AS pt ON pt.propertyid = egcl_bill.consumercode - AND pt.oldpropertyid IS NOT NULL - AND - pt.oldpropertyid != '' $where) data + INNER JOIN eg_pt_property AS pt ON pt.propertyid = egcl_bill.consumercode AND pt.oldpropertyid IS NOT NULL + AND pt.oldpropertyid != '' + INNER JOIN eg_pt_address As ad ON ad.propertyid=pt.id and ad.lastmodifiedtime in (select max(lastmodifiedtime) from eg_pt_address where propertyid=pt.id) + INNER JOIN eg_bndry_mohalla As bn ON ad.locality=bn.localitycode and ad.tenantid=bn.tenantid $where) data groupBy: orderBy: searchParams: @@ -38,6 +38,10 @@ SearchDefinitions: isMandatory: true jsonPath: $.searchCriteria.tenantId operator: = + - name: bn.blockname + isMandatory: false + jsonPath: $.searchCriteria.blockcode + operator: = output: From 3e8e191f970214b68c35f68da5106437559c1401 Mon Sep 17 00:00:00 2001 From: egovmis Date: Wed, 27 Jan 2021 15:37:00 +0530 Subject: [PATCH 0548/1242] Pi-8931 Addition of fields in Miscellaneous Receipt --- .../data-config/consolidatedreceipt.json | 21 ++ .../format-config/consolidatedreceipt.json | 182 +++++++++++++++++- 2 files changed, 202 insertions(+), 1 deletion(-) diff --git a/configs/pdf-service/data-config/consolidatedreceipt.json b/configs/pdf-service/data-config/consolidatedreceipt.json index c3ddd590..f9b67d19 100644 --- a/configs/pdf-service/data-config/consolidatedreceipt.json +++ b/configs/pdf-service/data-config/consolidatedreceipt.json @@ -67,6 +67,27 @@ "path": "$.paymentDetails[0].totalAmountPaid" } }, + { + "variable": "fieldFee", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'RT.LAND_RENT_FIELD_FEE')].amount" + } + }, { + "variable": "taxAmount", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'RT.LAND_RENT_TAX')].amount" + } + }, { + "variable": "cgst", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'RT.LAND_RENT_CGST')].amount" + } + }, { + "variable": "sgst", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'RT.LAND_RENT_SGST')].amount" + } + }, { "variable": "fromPeriod", diff --git a/configs/pdf-service/format-config/consolidatedreceipt.json b/configs/pdf-service/format-config/consolidatedreceipt.json index ee430f8e..937f8db2 100644 --- a/configs/pdf-service/format-config/consolidatedreceipt.json +++ b/configs/pdf-service/format-config/consolidatedreceipt.json @@ -334,7 +334,6 @@ "style": "receipt-table-value" }, { - "text": "{{paymentMode}}", "border": [ @@ -346,6 +345,97 @@ "style": "receipt-table" } ], + [ + { + "text": "Tax Amount", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "₹ {{taxAmount}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + + "text": "Field Fee", + + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + + "text": "{{fieldFee}}", + + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ],[ + { + "text": "CGST(if applicable)", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "₹ {{cgst}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + + "text": "SGST(if applicable)", + + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + + "text": "₹ {{sgst}}", + + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], [ { "text": "Cheque/DD/PO/Transaction No.", @@ -896,6 +986,96 @@ "text": "{{paymentMode}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], [ + { + "text": "Tax Amount", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "₹ {{taxAmount}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + + "text": "Field Fee", + + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + + "text": "{{fieldFee}}", + + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ],[ + { + "text": "CGST(if applicable)", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "₹ {{cgst}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + + "text": "SGST(if applicable)", + + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + + "text": "₹ {{sgst}}", + "border": [ false, false, From 6630f13d2a3ab09701a78a5bda31dbfc6c3eb244 Mon Sep 17 00:00:00 2001 From: egovmis Date: Wed, 27 Jan 2021 15:50:54 +0530 Subject: [PATCH 0549/1242] adjusted width of consolidated receipt --- .../pdf-service/format-config/consolidatedreceipt.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/pdf-service/format-config/consolidatedreceipt.json b/configs/pdf-service/format-config/consolidatedreceipt.json index 937f8db2..94c8ff5f 100644 --- a/configs/pdf-service/format-config/consolidatedreceipt.json +++ b/configs/pdf-service/format-config/consolidatedreceipt.json @@ -1381,7 +1381,7 @@ "bold": true, "margin": [ -27, - 5, + 3, -10, 0 ] @@ -1390,7 +1390,7 @@ "fontSize": 8, "margin": [ -27, - 5, + 3, -10, 0 ] @@ -1399,7 +1399,7 @@ "fontSize": 8, "margin": [ -27, - 5, + 3, -10, 0 ] @@ -1408,7 +1408,7 @@ "fontSize": 8, "margin": [ 2, - 2, + 1, 0, 0 ] From 8427ba4e8ff2b396d249795eed6b35cd60e71fe9 Mon Sep 17 00:00:00 2001 From: egovmis Date: Tue, 2 Feb 2021 12:52:25 +0530 Subject: [PATCH 0550/1242] changed value of tax heads --- configs/pdf-service/data-config/consolidatedreceipt.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/pdf-service/data-config/consolidatedreceipt.json b/configs/pdf-service/data-config/consolidatedreceipt.json index f9b67d19..e82d4e40 100644 --- a/configs/pdf-service/data-config/consolidatedreceipt.json +++ b/configs/pdf-service/data-config/consolidatedreceipt.json @@ -70,22 +70,22 @@ { "variable": "fieldFee", "value": { - "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'RT.LAND_RENT_FIELD_FEE')].amount" + "path": "$.paymentDetails[0].additionalDetails.fieldfee" } }, { "variable": "taxAmount", "value": { - "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'RT.LAND_RENT_TAX')].amount" + "path": "$.paymentDetails[0].additionalDetails.tax" } }, { "variable": "cgst", "value": { - "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'RT.LAND_RENT_CGST')].amount" + "path": "$.paymentDetails[0].additionalDetails.cgst" } }, { "variable": "sgst", "value": { - "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'RT.LAND_RENT_SGST')].amount" + "path": "$.paymentDetails[0].additionalDetails.sgst" } }, From b0c7b61503ef96e392e9a9ee189f74648a90de4a Mon Sep 17 00:00:00 2001 From: egovmis Date: Tue, 2 Feb 2021 13:00:35 +0530 Subject: [PATCH 0551/1242] removed disclaimer for employee copy --- .../format-config/consolidatedreceipt.json | 30 ++----------------- 1 file changed, 2 insertions(+), 28 deletions(-) diff --git a/configs/pdf-service/format-config/consolidatedreceipt.json b/configs/pdf-service/format-config/consolidatedreceipt.json index 94c8ff5f..bfb6e4d3 100644 --- a/configs/pdf-service/format-config/consolidatedreceipt.json +++ b/configs/pdf-service/format-config/consolidatedreceipt.json @@ -380,7 +380,7 @@ }, { - "text": "{{fieldFee}}", + "text": "₹ {{fieldFee}}", "border": [ false, @@ -622,32 +622,6 @@ } ] }, - { - "style": "pt-disclaimer", - "stack": [ - { - "text": "{{disclamer}}", - "bold": true, - "style": "pt-disclaimer-value" - }, - { - "text": "{{disclamer_1}}", - "bold": false, - "style": "pt-disclaimer-value" - }, - { - "text": "{{disclamer_2}}", - "bold": false, - "style": "pt-disclaimer-value" - }, - { - "text": "{{disclamer_3}}", - "bold": false, - "style": "pt-disclaimer-value" - }, { - "text":"Now log a complaint from WhatsApp, give a missed call on 8750975975 or send a Hi message on WhatsApp to this number", "bold": true, "fontSize": 8, "color": "blue", "decoration": "underline"} - ] - }, { "text":"---------------x------------------------------x-----------------------------x------------------------------x-----------------------x------------------x------", "style":"next-noc-table" @@ -1029,7 +1003,7 @@ }, { - "text": "{{fieldFee}}", + "text": "₹ {{fieldFee}}", "border": [ false, From 4a388b5712497639b2e745b0b20aba48a56eb57d Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Tue, 2 Feb 2021 17:09:18 +0530 Subject: [PATCH 0552/1242] Update tl-reports.yml PI-8952, updated trade license Reports Adding new Pendency Report --- configs/reports/configs/tl-reports.yml | 91 ++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) diff --git a/configs/reports/configs/tl-reports.yml b/configs/reports/configs/tl-reports.yml index f9148724..f1345df1 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -2484,3 +2484,94 @@ ReportDefinitions: ) tlown ON tlown.tradelicensedetailid = tld.id where validto < extract (epoch from NOW())*1000 and licensenumber is not null and licensenumber not in (select oldlicensenumber from eg_tl_tradelicense where oldlicensenumber is not null) and tenantid = $tenantid + + + +- reportName: TradeLicensePendencyReport_v2 + decryptionPathId: TradeLicensePendencyReport_v2 + summary: Trade License Pendency Report + version: 1.0.0 + moduleName: rainmaker-tl + sourceColumns: + - name: applicationnumber + label: report.tl.applicationnumber + type: string + source: tl + total: false + - name: tradename + label: report.tl.tradename + type: string + source: tl + total: false + - name: financialyear + label: report.tl.financialyear + type: string + source: tl + total: false + - name: licensetype + label: report.tl.licensetype + type: string + source: tl + total: false + - name: licensenumber + label: report.tl.licensenumber + type: string + source: tl + total: false + - name: name + label: report.tl.user.name + type: string + source: tl + total: false + - name: totalamount + label: report.tl.totalamount + type: string + source: tl + total: true + - name: status + label: report.tl.status + type: string + source: tl + total: false + - name: assignee + lable: report.tl.assignee + type: string + source: tl + total: false + searchParams: + - name: fromDate + label: reports.tl.fromDate + type: epoch + source: tl + isMandatory: false + searchClause: AND applicationdate >= $fromDate + - name: toDate + label: reports.tl.toDate + type: epoch + source: tl + isMandatory: false + searchClause: AND applicationdate <= $toDate + + query: | + SELECT + t.applicationnumber as applicationnumber, + t.tradeName as tradename, + financialyear, + (case when oldlicensenumber is null then 'New' else 'Renewal' end) AS licensetype, + licensenumber, + name, + paydetail.amountpaid as totalamount, + t.status as status, + W.assignee as assignee + FROM eg_tl_tradelicense t INNER JOIN eg_tl_tradelicensedetail td ON td.tradelicenseid = t.id + INNER JOIN + eg_tl_owner O ON O.tradelicensedetailid = td.id + INNER JOIN eg_user u ON u.uuid = O.id + LEFT OUTER JOIN egcl_bill bill ON bill.consumercode = t.applicationnumber + LEFT OUTER JOIN egcl_paymentdetail as paydetail on paydetail.billid=bill.id + INNER JOIN eg_wf_processinstance_v2 AS WFP ON WFP.businessid=t.applicationnumber and WFP.lastmodifiedtime + in (select max(lastmodifiedtime) from eg_wf_processinstance_v2 where businessid=t.applicationnumber) + INNER JOIN eg_wf_assignee_v2 as W ON W.processinstanceid=WFP.id + WHERE t.status NOT IN ('APPROVED','CANCELLED','REJECTED','PENDINGPAYMENT','INITIATED') + and t.tenantid=$tenantid + order by: ORDER BY t.applicationnumber DESC; From 6cdda9220ffff4c0f9176f4385713b72f646447f Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 3 Feb 2021 12:03:45 +0530 Subject: [PATCH 0553/1242] DecryptonKey removed from TLPendenecyReport --- configs/reports/configs/tl-reports.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/configs/reports/configs/tl-reports.yml b/configs/reports/configs/tl-reports.yml index f1345df1..9f4c445b 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -2487,8 +2487,7 @@ ReportDefinitions: -- reportName: TradeLicensePendencyReport_v2 - decryptionPathId: TradeLicensePendencyReport_v2 +- reportName: TradeLicensePendencyReport_v2 summary: Trade License Pendency Report version: 1.0.0 moduleName: rainmaker-tl From 4dabebbd8f299ac32e2303133fb82e5f652c536a Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Thu, 4 Feb 2021 17:30:10 +0530 Subject: [PATCH 0554/1242] update TL pendency report --- configs/reports/configs/tl-reports.yml | 39 +++++++++++++------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/configs/reports/configs/tl-reports.yml b/configs/reports/configs/tl-reports.yml index 9f4c445b..b7bf88cc 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -2550,27 +2550,26 @@ ReportDefinitions: source: tl isMandatory: false searchClause: AND applicationdate <= $toDate - query: | - SELECT - t.applicationnumber as applicationnumber, - t.tradeName as tradename, - financialyear, - (case when oldlicensenumber is null then 'New' else 'Renewal' end) AS licensetype, - licensenumber, - name, - paydetail.amountpaid as totalamount, - t.status as status, - W.assignee as assignee + SELECT + string_agg(DISTINCT t.applicationnumber,',')as applicationnumber, + string_agg(DISTINCT t.tradeName,',') as tradename, + string_agg(DISTINCT financialyear,',') as financialyear, + string_agg(DISTINCT(case when oldlicensenumber is null then 'New' else 'Renewal' end),',') AS licensetype, + string_agg(distinct licensenumber,',') as licensenumber, + split_part(string_agg(name,','),',',1) as name, -- string_agg(name,',') as name, + string_agg(distinct paydetail.amountpaid::varchar,',') as totalamount, + string_agg(distinct t.status,',') as status, + string_agg(distinct W.assignee,',') as assignee FROM eg_tl_tradelicense t INNER JOIN eg_tl_tradelicensedetail td ON td.tradelicenseid = t.id - INNER JOIN - eg_tl_owner O ON O.tradelicensedetailid = td.id - INNER JOIN eg_user u ON u.uuid = O.id - LEFT OUTER JOIN egcl_bill bill ON bill.consumercode = t.applicationnumber - LEFT OUTER JOIN egcl_paymentdetail as paydetail on paydetail.billid=bill.id - INNER JOIN eg_wf_processinstance_v2 AS WFP ON WFP.businessid=t.applicationnumber and WFP.lastmodifiedtime - in (select max(lastmodifiedtime) from eg_wf_processinstance_v2 where businessid=t.applicationnumber) - INNER JOIN eg_wf_assignee_v2 as W ON W.processinstanceid=WFP.id + INNER JOIN eg_tl_owner O ON O.tradelicensedetailid = td.id + INNER JOIN eg_user u ON u.uuid = O.id + LEFT OUTER JOIN egcl_bill bill ON bill.consumercode = t.applicationnumber + LEFT OUTER JOIN egcl_paymentdetail as paydetail on paydetail.billid=bill.id + INNER JOIN eg_wf_processinstance_v2 AS WFP ON WFP.businessid=t.applicationnumber and WFP.lastmodifiedtime + in (select max(lastmodifiedtime) from eg_wf_processinstance_v2 where businessid=t.applicationnumber) + INNER JOIN eg_wf_assignee_v2 as W ON W.processinstanceid=WFP.id WHERE t.status NOT IN ('APPROVED','CANCELLED','REJECTED','PENDINGPAYMENT','INITIATED') and t.tenantid=$tenantid - order by: ORDER BY t.applicationnumber DESC; + groupby: GROUP BY O.tradelicensedetailid + orderby: ORDER BY applicationnumber DESC; From 6ab0b953024cd84ee64cc71a87ea4c0ccb35898d Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Thu, 4 Feb 2021 17:50:12 +0530 Subject: [PATCH 0555/1242] added PT Pending Applications Report --- configs/reports/configs/pt-reports.yml | 62 ++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index c19c2059..4130f6fb 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -5347,3 +5347,65 @@ ReportDefinitions: WHERE propety.tenantid=$tenantid AND propety.acknowldgementnumber NOTNULL orderby: ORDER BY propety.createdtime DESC; +- reportName: PendingPTApplicationsReport + summary: ULB-wise PT Collection + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: tenantid + label: reports.pt.tenantid + type: string + source: pt + total: false + - name: propertyid + label: reports.pt.propertyid + type: string + source: pt + total: false + - name: applicationnumber + label: reports.pt.applicationnumber + type: string + source: pt + total: false + - name: oldpropertyid + label: reports.pt.oldpropertyid + type: string + source: pt + total: false + - name: status + label: reports.pt.status + type: string + source: pt + total: false + - name: propertytype + label: reports.pt.propertytype + type: string + source: pt + total: false + - name: usagecategory + label: reports.pt.usagecategory + type: string + source: pt + total: false + - name: channel + label: reports.pt.channel + type: string + source: pt + total: false + - name: createdon + label: reports.pt.createdon + type: string + source: pt + total: false + query: | + select + tenantid, + propertyid, + acknowldgementnumber as applicationnumber, + oldpropertyid, + status, + propertytype, + usagecategory, + channel, + to_char((To_timestamp(createdtime/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') as createdon + from eg_pt_property where status='INWORKFLOW' and tenantid=$tenantid From 2035e250d8773d3aabfc8c71c047047b951616f8 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 5 Feb 2021 10:08:31 +0530 Subject: [PATCH 0556/1242] added decryptionpath for StateDefaulterReport_v2 --- configs/reports/configs/tl-reports.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configs/reports/configs/tl-reports.yml b/configs/reports/configs/tl-reports.yml index b7bf88cc..3f52e9a0 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -2487,7 +2487,8 @@ ReportDefinitions: -- reportName: TradeLicensePendencyReport_v2 +- reportName: TradeLicensePendencyReport_v2 + decryptionPathId: TradeLicensePendencyReport_v2 summary: Trade License Pendency Report version: 1.0.0 moduleName: rainmaker-tl From 26bea155a8b735e1cf2997956244394db64e73ce Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Sat, 6 Feb 2021 21:55:32 +0530 Subject: [PATCH 0557/1242] Update tl-reports.yml --- configs/reports/configs/tl-reports.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/tl-reports.yml b/configs/reports/configs/tl-reports.yml index 3f52e9a0..d60edd40 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -2561,7 +2561,7 @@ ReportDefinitions: split_part(string_agg(name,','),',',1) as name, -- string_agg(name,',') as name, string_agg(distinct paydetail.amountpaid::varchar,',') as totalamount, string_agg(distinct t.status,',') as status, - string_agg(distinct W.assignee,',') as assignee + split_part(string_agg(distinct W.assignee,','),',',1) as assignee FROM eg_tl_tradelicense t INNER JOIN eg_tl_tradelicensedetail td ON td.tradelicenseid = t.id INNER JOIN eg_tl_owner O ON O.tradelicensedetailid = td.id INNER JOIN eg_user u ON u.uuid = O.id @@ -2573,4 +2573,4 @@ ReportDefinitions: WHERE t.status NOT IN ('APPROVED','CANCELLED','REJECTED','PENDINGPAYMENT','INITIATED') and t.tenantid=$tenantid groupby: GROUP BY O.tradelicensedetailid - orderby: ORDER BY applicationnumber DESC; + orderby: ORDER BY applicationnumber DESC From 89d87f98c973a93aaee6fbdab4d7806d0e3f4464 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Sat, 6 Feb 2021 22:09:35 +0530 Subject: [PATCH 0558/1242] removed decryption from pendencyReport --- configs/reports/configs/tl-reports.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/reports/configs/tl-reports.yml b/configs/reports/configs/tl-reports.yml index d60edd40..05a7c5b7 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -2488,7 +2488,6 @@ ReportDefinitions: - reportName: TradeLicensePendencyReport_v2 - decryptionPathId: TradeLicensePendencyReport_v2 summary: Trade License Pendency Report version: 1.0.0 moduleName: rainmaker-tl From 928e9cd933a748ffec78e955404ae91c322d9274 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Sat, 6 Feb 2021 22:12:41 +0530 Subject: [PATCH 0559/1242] added decryption --- configs/reports/configs/tl-reports.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/reports/configs/tl-reports.yml b/configs/reports/configs/tl-reports.yml index 05a7c5b7..d60edd40 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -2488,6 +2488,7 @@ ReportDefinitions: - reportName: TradeLicensePendencyReport_v2 + decryptionPathId: TradeLicensePendencyReport_v2 summary: Trade License Pendency Report version: 1.0.0 moduleName: rainmaker-tl From b78f0a5f774fa32d79fd14b183119ffdf802e511 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Sat, 6 Feb 2021 22:49:13 +0530 Subject: [PATCH 0560/1242] extracted user name as assignee instead of id --- configs/reports/configs/tl-reports.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/tl-reports.yml b/configs/reports/configs/tl-reports.yml index d60edd40..3892ac71 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -2558,10 +2558,10 @@ ReportDefinitions: string_agg(DISTINCT financialyear,',') as financialyear, string_agg(DISTINCT(case when oldlicensenumber is null then 'New' else 'Renewal' end),',') AS licensetype, string_agg(distinct licensenumber,',') as licensenumber, - split_part(string_agg(name,','),',',1) as name, -- string_agg(name,',') as name, + split_part(string_agg(u.name,','),',',1) as name, -- string_agg(name,',') as name, string_agg(distinct paydetail.amountpaid::varchar,',') as totalamount, string_agg(distinct t.status,',') as status, - split_part(string_agg(distinct W.assignee,','),',',1) as assignee + split_part(string_agg(distinct us.name,','),',',1) as assignee FROM eg_tl_tradelicense t INNER JOIN eg_tl_tradelicensedetail td ON td.tradelicenseid = t.id INNER JOIN eg_tl_owner O ON O.tradelicensedetailid = td.id INNER JOIN eg_user u ON u.uuid = O.id @@ -2570,6 +2570,7 @@ ReportDefinitions: INNER JOIN eg_wf_processinstance_v2 AS WFP ON WFP.businessid=t.applicationnumber and WFP.lastmodifiedtime in (select max(lastmodifiedtime) from eg_wf_processinstance_v2 where businessid=t.applicationnumber) INNER JOIN eg_wf_assignee_v2 as W ON W.processinstanceid=WFP.id + INNER JOIN eg_user us ON us.uuid = W.assignee WHERE t.status NOT IN ('APPROVED','CANCELLED','REJECTED','PENDINGPAYMENT','INITIATED') and t.tenantid=$tenantid groupby: GROUP BY O.tradelicensedetailid From ba164eacaf548bbce6579fbba58912ee4984b6b0 Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Mon, 8 Feb 2021 11:31:11 +0530 Subject: [PATCH 0561/1242] changes in assignee change in TL pendency report for assignee column --- configs/reports/configs/tl-reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/reports/configs/tl-reports.yml b/configs/reports/configs/tl-reports.yml index 3892ac71..7dd968db 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -2534,7 +2534,7 @@ ReportDefinitions: source: tl total: false - name: assignee - lable: report.tl.assignee + label: report.tl.assignee type: string source: tl total: false From 3020656214a54d0e7344a22ca8ac53e58c31ffbb Mon Sep 17 00:00:00 2001 From: mohaarif007 <48949208+mohaarif007@users.noreply.github.com> Date: Tue, 9 Feb 2021 11:31:39 +0530 Subject: [PATCH 0562/1242] Update StatusReport_V2 column Update StatusReport_V2 column --- configs/reports/configs/pt-reports.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 4130f6fb..4add29ff 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -5341,10 +5341,10 @@ ReportDefinitions: Left outer join eg_user as eu on eu.uuid = propety.createdby Left outer join eg_user as euser on euser.uuid = propety.lastmodifiedby Left outer join eg_pt_address as pta on pta.propertyid = propety.id - Left outer join eg_pt_propertydetail_v2 pt_detail ON pt_detail.property = propety.propertyid + INNER join eg_pt_propertydetail_v2 pt_detail ON pt_detail.property = propety.propertyid Left outer join egcl_bill as bill on bill.consumercode = propety.propertyid Left outer join eg_bndry_mohalla as localnames on pta.locality=localnames.localitycode - WHERE propety.tenantid=$tenantid AND propety.acknowldgementnumber NOTNULL + WHERE propety.tenantid=$tenantid AND propety.acknowldgementnumber NOTNULL AND propety.status='ACTIVE' orderby: ORDER BY propety.createdtime DESC; - reportName: PendingPTApplicationsReport From 2511c210f23be5316e88c5876f7e0aa00ea0d2dd Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Fri, 12 Feb 2021 14:11:49 +0530 Subject: [PATCH 0563/1242] added UID on PT receipt --- configs/pdf-service/data-config/property-receipt.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index 949b4826..f034ff13 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -683,6 +683,10 @@ "variable":"oldPropertyId", "value":"$.Properties[0].oldPropertyId" }, + { + "variable":"surveyId", + "value":"$.Properties[0].surveyId" + }, { "variable":"ownerMobileNumber", "value":"$.Properties[0].owners[0].mobileNumber" From d19fe95d5c3bf01bd831122793d6f481649d81f8 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Fri, 12 Feb 2021 14:13:01 +0530 Subject: [PATCH 0564/1242] added survey id for PT --- configs/pdf-service/format-config/property-receipt.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/pdf-service/format-config/property-receipt.json b/configs/pdf-service/format-config/property-receipt.json index 905c1109..f2e30415 100644 --- a/configs/pdf-service/format-config/property-receipt.json +++ b/configs/pdf-service/format-config/property-receipt.json @@ -196,7 +196,7 @@ "style": "receipt-table" }, { - "text": " ", + "text": "Survey Id/UID", "border": [ false, false, @@ -206,7 +206,7 @@ "style": "receipt-table-value" }, { - "text": " ", + "text": "{{surveyId}}", "border": [ false, false, From 06c389cb1f877672d7449a63b2325b649b0abf9b Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 12 Feb 2021 15:39:18 +0530 Subject: [PATCH 0565/1242] Defaulter Report to exclude ikon 2020-21 enteries --- configs/reports/configs/pt-reports.yml | 113 +++++++++++++++++++++++++ 1 file changed, 113 insertions(+) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 4add29ff..a4a25e53 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -5409,3 +5409,116 @@ ReportDefinitions: channel, to_char((To_timestamp(createdtime/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') as createdon from eg_pt_property where status='INWORKFLOW' and tenantid=$tenantid + +- reportName: ULBDEFAULTERPTREPORT_NEW_V2 + decryptionPathId: ULBDEFAULTERPTREPORT_V2 + summary: ULB Defaulter Pt report + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: propertytaxuniqueid + label: reports.pt.propertytaxuniqueid + type: string + source: pt + total: false + - name: existingpropertyid + label: reports.pt.existingpropertyid + type: string + source: pt + total: false + - name: amountcollected + label: reports.pt.amountcollected + type: string + source: pt + total: true + - name: ownername + label: reports.pt.ownername + type: string + source: pt + total: false + - name: propertytype + label: reports.pt.propertytype + type: string + source: pt + total: false + - name: mobileno + label: reports.pt.mobileno + type: string + source: pt + total: false + - name: address + label: reports.pt.address + type: string + source: pt + total: false + searchParams: + - name: localityArray + label: reports.pt.zoneList + type: boundarylist + source: pt + isMandatory: false + searchClause: AND pta.locality IN ($localityArray) + query: | + --S.no Service Name ULB Property Tax Unique ID Date Of Transcation Receipt Number Existing Property ID Type Of Property Mobile Number Address + with props as + (select + pt.propertyid as "propertytaxuniqueid", + string_agg(collection.finyear, ', ') as "financailyear" , + string_agg(collection.taxpaid::varchar, ', ') as "amountcollected" , + string_agg(pt.oldpropertyid,',') as "existingpropertyid", + split_part(string_agg(eu."name",','),',',1) as "ownername", + string_agg(pot.propertytype,',') as "propertytype", + split_part(string_agg(eu.mobilenumber,','),',',1) as "mobileno", + string_agg(distinct REGEXP_REPLACE(REGEXP_REPLACE(CONCAT(pta.doorno, ',', pta.buildingname, ',',pta.street,',',pta.localityname,',', pta.pincode), ',+', ','), '^,|,$', ''),',') as "address" + from eg_pt_property pt + inner join (select a.consumercode, to_char((To_timestamp(a.taxperiodfrom/1000) at time Zone 'Asia/Kolkata'),'YYYY')||'-'||to_char((To_timestamp(a.taxperiodfrom/1000) at time Zone 'Asia/Kolkata'),'YYYY')::int+1 as finyear, a.tax, a.taxpaid from (select d.consumercode, d.taxperiodfrom, sum(dd.taxamount) tax, sum(dd.collectionamount) as taxpaid + from egbs_demanddetail_v1 dd, egbs_demand_v1 d + where dd.demandid=d.id + and d.status!='CANCELLED' and dd.tenantid='pb.amritsar' and d.tenantid='pb.amritsar' + group by d.consumercode, d.taxperiodfrom + having sum(dd.taxamount - dd.collectionamount)=0) a, + (select d.consumercode, max(d.taxperiodfrom) maxperiod + from egbs_demanddetail_v1 dd, egbs_demand_v1 d + where dd.demandid=d.id + and d.status!='CANCELLED' and dd.tenantid='pb.amritsar' and d.tenantid='pb.amritsar' + group by d.consumercode + having sum(dd.taxamount - dd.collectionamount)=0) b + where a.consumercode=b.consumercode and a.taxperiodfrom=b.maxperiod + ) collection ON collection.consumercode = pt.propertyid + inner join (SELECT DISTINCT ON (propertyid) propertyid ,name as name , mobilenumber + FROM eg_pt_owner , eg_user + WHERE uuid = userid + AND status = 'ACTIVE' + AND active = true ) eu ON pt.id=eu.propertyid + inner join (SELECT propertyid , locality,doorno,street,buildingname,pincode,localityname, max(createdtime) + from eg_pt_address inner join eg_bndry_mohalla on eg_bndry_mohalla.localitycode=locality where eg_pt_address.tenantid='pb.amritsar' + group by propertyid, locality, doorno,street,buildingname,pincode,localityname) pta ON pt.id=pta.propertyid + inner join (select propertyid, + string_agg(distinct pu.occupancytype, ',') as occupancytype, + string_agg(distinct Initcap(case when usagecategory like '%.%' then split_part(usagecategory,'.',2) else usagecategory end),',') as propertytype + from eg_pt_unit as pu + where pu.tenantid = 'pb.amritsar' + group by propertyid) pot ON pot.propertyid = pt.id + where pt.tenantid = 'pb.amritsar' + and pt.status!='INACTIVE' + and pt.propertyid not in ( + select consumercode from egcl_bill + where tenantid='pb.amritsar' + and businessservice='PT' + and id in (select billid + from egcl_billdetial + where tenantid='pb.amritsar' and concat(to_char((To_timestamp(fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) ='2020-21')) + group by pt.propertyid + ), + prop2019 as + ( + select + oldpropertyid as oldpropertyid, + pt.propertyid as propertyid + from eg_pt_property pt + inner join eg_pt_assessment as assessment on assessment.propertyid=pt.propertyid and assessment.assessmentyear='2019-20' and assessment.tenantid='pb.amritsar' + where pt.tenantid='pb.amritsar' + group by pt.propertyid,oldpropertyid + ) + select * from props + where propertytaxuniqueid not in (select propertyid from prop2019 where oldpropertyid in (select concat('RID',previous_returnid) from amritsar_ikon_2020_21_non_migrated_records)) From 54dec45f8becb68e638acf26c5179b5408d0cc29 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 12 Feb 2021 15:54:05 +0530 Subject: [PATCH 0566/1242] removed locality search from pt defaulter report --- configs/reports/configs/pt-reports.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index a4a25e53..32cc55ff 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -5451,13 +5451,6 @@ ReportDefinitions: type: string source: pt total: false - searchParams: - - name: localityArray - label: reports.pt.zoneList - type: boundarylist - source: pt - isMandatory: false - searchClause: AND pta.locality IN ($localityArray) query: | --S.no Service Name ULB Property Tax Unique ID Date Of Transcation Receipt Number Existing Property ID Type Of Property Mobile Number Address with props as From 2105fcbe2a0eb2813b6c593642d4066443f3fca3 Mon Sep 17 00:00:00 2001 From: egovmis Date: Mon, 15 Feb 2021 13:21:12 +0530 Subject: [PATCH 0567/1242] added changes for approved by on PT receipt --- configs/pdf-service/data-config/property-receipt.json | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index f034ff13..7090e597 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -166,11 +166,6 @@ "value": { "path": "$.paymentDetails[0].bill.totalAmount" } - }, { - "variable": "approvedBy", - "value": { - "path": "$.paymentDetails[0].bill.additionalDetails.lastModifier" - } }, { "variable": "penaltyReason", "value": { @@ -621,7 +616,10 @@ { "variable":"vasikaNo", "value":"$.Properties[0].additionalDetails.vasikaNo" - }, { + }, { + "variable":"approvedBy", + "value":"$.Properties[0].additionalDetails.lastModifiedBy" + }, { "variable":"vasikaDate", "value":"$.Properties[0].additionalDetails.vasikaDate", "type":"date" From 21700d1db5e8189a92ae14affa3a3ffb37eb70e6 Mon Sep 17 00:00:00 2001 From: egovmis Date: Mon, 15 Feb 2021 15:55:25 +0530 Subject: [PATCH 0568/1242] reverted changes for approved by on PT receipt --- .../pdf-service/data-config/property-receipt.json | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index 7090e597..191ea5de 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -166,7 +166,14 @@ "value": { "path": "$.paymentDetails[0].bill.totalAmount" } - }, { + }, + { + "variable": "approvedBy", + "value": { + "path": "$.paymentDetails[0].bill.additionalDetails.lastModifier" + } + }, + { "variable": "penaltyReason", "value": { "path": "$.paymentDetails[0].bill.additionalDetails.adhocPenaltyReason" @@ -616,10 +623,7 @@ { "variable":"vasikaNo", "value":"$.Properties[0].additionalDetails.vasikaNo" - }, { - "variable":"approvedBy", - "value":"$.Properties[0].additionalDetails.lastModifiedBy" - }, { + },{ "variable":"vasikaDate", "value":"$.Properties[0].additionalDetails.vasikaDate", "type":"date" From fb514b356b3843158ae728d4cfa53e6fc717ff3b Mon Sep 17 00:00:00 2001 From: mohaarif007 <48949208+mohaarif007@users.noreply.github.com> Date: Tue, 16 Feb 2021 17:08:35 +0530 Subject: [PATCH 0569/1242] Add pg name RAZORPAY hard coded with amritsar Add pg name RAZORPAY hard coded with amritsar tenant --- rainmaker-custom-service/index.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/rainmaker-custom-service/index.js b/rainmaker-custom-service/index.js index 11462ade..6ab90cb3 100644 --- a/rainmaker-custom-service/index.js +++ b/rainmaker-custom-service/index.js @@ -1039,6 +1039,15 @@ router.post('/protected/punjab-pt/pre-hook/pg-service/transaction/v1/_create', a url_callback.pathname = '/customization/open/punjab-pt/payu/confirm'; request['Transaction']['callbackUrl'] = url.format(url_callback); + } + else if (request['Transaction']['tenantId'] == 'pb.amritsar') { + let original_callback = request['Transaction']['callbackUrl']; + request['Transaction']['gateway'] = 'RAZORPAY' + url_callback = url.parse(original_callback) + url_callback.query = url_callback.query || {}; + url_callback.query['original_callback'] = url_callback.path; + request['Transaction']['callbackUrl'] = url.format(url_callback); + } res.json(request); From 3d10c17c3ac6ac16e6fdc0fca2accec1ab6bdc40 Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov Date: Thu, 18 Feb 2021 13:26:22 +0530 Subject: [PATCH 0570/1242] [PI-1273]-Added egov.collection.payment-cancel topic in the indexer config --- configs/egov-indexer/payment-indexer.yml | 53 ++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/configs/egov-indexer/payment-indexer.yml b/configs/egov-indexer/payment-indexer.yml index 682c633f..1226edee 100644 --- a/configs/egov-indexer/payment-indexer.yml +++ b/configs/egov-indexer/payment-indexer.yml @@ -156,3 +156,56 @@ ServiceMaps: uriResponseMapping: - inJsonPath: $.MdmsRes.tenant.tenants outJsonPath: $.Data.tenantData + + - topic: egov.collection.payment-cancel + configKey: INDEX + indexes: + - name: paymentsindex-v1 + type: payments + id: $.id + isBulk: true + timeStampField: $.auditDetails.createdTime + jsonPath: $.Payments.* + customJsonMapping: + indexMapping: {"Data":{"tenantId":"","id":"","transactionNumber":"","transactionDate":1,"paymentMode":"","paymentStatus":"","payer":{"id":"","name":""},"paidBy":"","paymentDetails":{},"auditDetails":{},"additionalDetails":{},"tenantData":{},"@timestamp":"timestamp"}} + fieldMapping: + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.transactionNumber + outJsonPath: $.Data.transactionNumber + - inJsonPath: $.transactionDate + outJsonPath: $.Data.transactionDate + - inJsonPath: $.paymentMode + outJsonPath: $.Data.paymentMode + - inJsonPath: $.paymentStatus + outJsonPath: $.Data.paymentStatus + - inJsonPath: $.payerId + outJsonPath: $.Data.payer.id + - inJsonPath: $.payerName + outJsonPath: $.Data.payer.name + - inJsonPath: $.paidBy + outJsonPath: $.Data.paidBy + - inJsonPath: $.paymentDetails + outJsonPath: $.Data.paymentDetails + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - inJsonPath: $.additionalDetails + outJsonPath: $.Data.additionalDetails + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + mdmsMapping: + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData + + From cf17ac8ac80f669e8d17cf243acfa5546bc9a367 Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov Date: Thu, 18 Feb 2021 13:53:24 +0530 Subject: [PATCH 0571/1242] [PI-1273]-corrected egov.collection.payment-cancel topic in the indexer config --- configs/egov-indexer/payment-indexer.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/configs/egov-indexer/payment-indexer.yml b/configs/egov-indexer/payment-indexer.yml index 1226edee..d4cf09a8 100644 --- a/configs/egov-indexer/payment-indexer.yml +++ b/configs/egov-indexer/payment-indexer.yml @@ -112,7 +112,7 @@ ServiceMaps: - name: paymentsindex-v1 type: payments id: $.id - isBulk: true + isBulk: false timeStampField: $.auditDetails.createdTime jsonPath: $.Payments.* customJsonMapping: @@ -163,9 +163,9 @@ ServiceMaps: - name: paymentsindex-v1 type: payments id: $.id - isBulk: true + isBulk: false timeStampField: $.auditDetails.createdTime - jsonPath: $.Payments.* + jsonPath: $.Payment customJsonMapping: indexMapping: {"Data":{"tenantId":"","id":"","transactionNumber":"","transactionDate":1,"paymentMode":"","paymentStatus":"","payer":{"id":"","name":""},"paidBy":"","paymentDetails":{},"auditDetails":{},"additionalDetails":{},"tenantData":{},"@timestamp":"timestamp"}} fieldMapping: @@ -180,7 +180,7 @@ ServiceMaps: - inJsonPath: $.paymentMode outJsonPath: $.Data.paymentMode - inJsonPath: $.paymentStatus - outJsonPath: $.Data.paymentStatus + outJsonPath: $.Data.paymentStatus - inJsonPath: $.payerId outJsonPath: $.Data.payer.id - inJsonPath: $.payerName @@ -208,4 +208,5 @@ ServiceMaps: - inJsonPath: $.MdmsRes.tenant.tenants outJsonPath: $.Data.tenantData + From dea82025a7a7d16c6006048693760645131b882b Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Wed, 17 Mar 2021 10:22:27 +0530 Subject: [PATCH 0572/1242] added pie chart for payment modes --- .../MasterDashboardConfig.json | 87 ++++++++++++++----- 1 file changed, 66 insertions(+), 21 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json index a3e11fc1..78400ba5 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json @@ -22,7 +22,9 @@ "name": "DSS_TOTAL_COLLECTION_TODAY", "code": "", "chartType": "", - "filter": {"title": "TODAY"}, + "filter": { + "title": "TODAY" + }, "headers": [] }, { @@ -307,13 +309,14 @@ "isCollapsible": false, "label": "DSS_OVERVIEW", "charts": [ - { "id": "todaysCollection", "name": "DSS_TOTAL_COLLECTION_TODAY", "code": "", "chartType": "metric", - "filter": {"title": "TODAY"}, + "filter": { + "title": "TODAY" + }, "headers": [] }, { @@ -374,7 +377,7 @@ "name": "DSS_PT_TOP_3_PERFORMING_ULBS", "dimensions": { "height": 250, - "width": 4 + "width": 3 }, "vizType": "performing-metric", "noUnit": false, @@ -396,7 +399,7 @@ "name": "DSS_PT_BOTTOM_3_PERFORMING_ULBS", "dimensions": { "height": 250, - "width": 4 + "width": 3 }, "vizType": "performing-metric", "noUnit": false, @@ -417,7 +420,7 @@ "name": "DSS_PT_COLLECTION_BY_USAGE_TYPE", "dimensions": { "height": 250, - "width": 4 + "width": 3 }, "vizType": "chart", "noUnit": true, @@ -432,6 +435,27 @@ "headers": [] } ] + }, + { + "id": 224, + "name": "DSS_PT_COLLECTION_BY_PAYMENT_MODE", + "dimensions": { + "height": 250, + "width": 3 + }, + "vizType": "chart", + "noUnit": true, + "isCollapsible": false, + "charts": [ + { + "id": "collectionByPaymentMode", + "name": "DSS_PT_COLLECTION_BY_PAYMENT_MODE", + "code": "", + "chartType": "donut", + "filter": "", + "headers": [] + } + ] } ] }, @@ -698,7 +722,9 @@ "name": "DSS_TOTAL_COLLECTION_TODAY", "code": "", "chartType": "metric", - "filter": {"title": "TODAY"}, + "filter": { + "title": "TODAY" + }, "headers": [] }, { @@ -1037,7 +1063,6 @@ "filter": "", "headers": [], "tabName": "Boundary" - } ] } @@ -1237,7 +1262,6 @@ } ] } - ] }, { @@ -1517,7 +1541,6 @@ } ] }, - { "name": "DSS_PGR_DASHBOARD", "id": "ulb-pgr", @@ -1710,7 +1733,6 @@ } ] } - ] }, { @@ -1827,7 +1849,9 @@ "name": "DSS_TOTAL_COLLECTION_TODAY", "code": "", "chartType": "metric", - "filter": {"title": "TODAY"}, + "filter": { + "title": "TODAY" + }, "headers": [] }, { @@ -1888,7 +1912,7 @@ "name": "DSS_PT_TOP_3_PERFORMING_ULBS", "dimensions": { "height": 250, - "width": 4 + "width": 3 }, "vizType": "performing-metric", "noUnit": false, @@ -1910,7 +1934,7 @@ "name": "DSS_PT_BOTTOM_3_PERFORMING_ULBS", "dimensions": { "height": 250, - "width": 4 + "width": 3 }, "vizType": "performing-metric", "noUnit": false, @@ -1931,7 +1955,7 @@ "name": "DSS_PT_COLLECTION_BY_USAGE_TYPE", "dimensions": { "height": 250, - "width": 4 + "width": 3 }, "vizType": "chart", "noUnit": true, @@ -1946,6 +1970,27 @@ "headers": [] } ] + }, + { + "id": 224, + "name": "DSS_PT_COLLECTION_BY_PAYMENT_MODE", + "dimensions": { + "height": 250, + "width": 3 + }, + "vizType": "chart", + "noUnit": true, + "isCollapsible": false, + "charts": [ + { + "id": "collectionByPaymentMode", + "name": "DSS_PT_COLLECTION_BY_PAYMENT_MODE", + "code": "", + "chartType": "donut", + "filter": "", + "headers": [] + } + ] } ] }, @@ -2212,7 +2257,9 @@ "name": "DSS_TOTAL_COLLECTION_TODAY", "code": "", "chartType": "metric", - "filter": {"title": "TODAY"}, + "filter": { + "title": "TODAY" + }, "headers": [] }, { @@ -2551,7 +2598,6 @@ "filter": "", "headers": [], "tabName": "Boundary" - } ] } @@ -2580,7 +2626,9 @@ "name": "DSS_TOTAL_COLLECTION_TODAY", "code": "", "chartType": "", - "filter": {"title": "TODAY"}, + "filter": { + "title": "TODAY" + }, "headers": [] }, { @@ -3003,7 +3051,6 @@ } ] }, - { "name": "DSS_W&S_DASHBOARD", "id": "ws", @@ -3408,7 +3455,6 @@ } ] } - ] } ] @@ -3817,7 +3863,6 @@ } ] } - ] } ] From 6e0ba4524d9a782b557be6a190d958a0e1a56f7e Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Wed, 17 Mar 2021 11:13:56 +0530 Subject: [PATCH 0573/1242] added api config for payment mode chart --- .../dashboard-analytics/ChartApiConfig.json | 1004 ++++++++--------- 1 file changed, 500 insertions(+), 504 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 18434979..b61ba89d 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -1,6 +1,5 @@ { - - "_comment": "dss-collectionindex new queries ", + "_comment": "W&S charts below-----------------------------------------------------------------------", "totalCollection": { "chartName": "DSS_TOTAL_COLLECTION", "queries": [ @@ -28,13 +27,13 @@ "Total Collection" ], "insight": { - "chartResponseMap" : "totalCollection", - "action" : "differenceOfNumbers", - "upwardIndicator" : "positive", - "downwardIndicator" : "negative", - "textMessage" : "$indicator$value% than last $insightInterval", - "colorCode" : "#228B22", - "insightInterval" : "year" + "chartResponseMap": "totalCollection", + "action": "differenceOfNumbers", + "upwardIndicator": "positive", + "downwardIndicator": "negative", + "textMessage": "$indicator$value% than last $insightInterval", + "colorCode": "#228B22", + "insightInterval": "year" }, "_comment": " " }, @@ -59,8 +58,7 @@ ], "isCumulative": true, "interval": "month", - "insight": { - }, + "insight": {}, "_comment": " " }, "targetAchieved": { @@ -80,7 +78,6 @@ "indexName": "dss-collection_v2", "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" } - ], "chartType": "metric", "valueType": "percentage", @@ -92,13 +89,13 @@ "Actual collection" ], "insight": { - "chartResponseMap" : "targetAchieved", - "action" : "differenceOfNumbers", - "upwardIndicator" : "positive", - "downwardIndicator" : "negative", - "textMessage" : "$indicator$value% than last $insightInterval", - "colorCode" : "#228B22", - "insightInterval" : "year" + "chartResponseMap": "targetAchieved", + "action": "differenceOfNumbers", + "upwardIndicator": "positive", + "downwardIndicator": "negative", + "textMessage": "$indicator$value% than last $insightInterval", + "colorCode": "#228B22", + "insightInterval": "year" }, "_comment": " " }, @@ -128,8 +125,7 @@ "aggregationPaths": [ "Total Collection" ], - "insight": { - }, + "insight": {}, "_comment": " " }, "totalCollectionDeptWise": { @@ -151,8 +147,7 @@ "aggregationPaths": [ "Business Service" ], - "insight": { - }, + "insight": {}, "_comment": " " }, "topPerformingUlbs": { @@ -182,10 +177,10 @@ "order": "desc", "limit": 3, "aggregationPaths": [ - "Total Collection","Target Collection" + "Total Collection", + "Target Collection" ], - "insight": { - }, + "insight": {}, "_comment": " Top Performing Ulbs for target achieved" }, "bottomPerformingUlbs": { @@ -215,10 +210,10 @@ "order": "asc", "limit": 3, "aggregationPaths": [ - "Total Collection", "Target Collection" + "Total Collection", + "Target Collection" ], - "insight": { - }, + "insight": {}, "_comment": " Bottom Performing Ulbs for target achieved" }, "licenseByLicenseType": { @@ -240,12 +235,9 @@ "aggregationPaths": [ "License Instrument Type" ], - "insight": { - }, + "insight": {}, "_comment": " License Application which are issued by License Type" }, - - "_comment": "COMMON NON-COLLECTION CHARTS", "totalApplication": { "chartName": "DSS_TOTAL_APPLICATION", "queries": [ @@ -280,13 +272,13 @@ "Total Application" ], "insight": { - "chartResponseMap" : "totalApplication", - "action" : "differenceOfNumbers", - "upwardIndicator" : "positive", - "downwardIndicator" : "negative", - "textMessage" : "$indicator$value% than last $insightInterval", - "colorCode" : "#228B22", - "insightInterval" : "year" + "chartResponseMap": "totalApplication", + "action": "differenceOfNumbers", + "upwardIndicator": "positive", + "downwardIndicator": "negative", + "textMessage": "$indicator$value% than last $insightInterval", + "colorCode": "#228B22", + "insightInterval": "year" }, "_comment": " totalApplication is the chartId" }, @@ -324,13 +316,13 @@ "Applications Closed" ], "insight": { - "chartResponseMap" : "closedApplication", - "action" : "differenceOfNumbers", - "upwardIndicator" : "positive", - "downwardIndicator" : "negative", - "textMessage" : "$indicator$value% than last $insightInterval", - "colorCode" : "#228B22", - "insightInterval" : "year" + "chartResponseMap": "closedApplication", + "action": "differenceOfNumbers", + "upwardIndicator": "positive", + "downwardIndicator": "negative", + "textMessage": "$indicator$value% than last $insightInterval", + "colorCode": "#228B22", + "insightInterval": "year" }, "_comment": " totalApplication is the chartId" }, @@ -354,13 +346,13 @@ "Citizen Registered" ], "insight": { - "chartResponseMap" : "citizenRegistered", - "action" : "differenceOfNumbers", - "upwardIndicator" : "positive", - "downwardIndicator" : "negative", - "textMessage" : "$indicator$value% than last $insightInterval", - "colorCode" : "#228B22", - "insightInterval" : "year" + "chartResponseMap": "citizenRegistered", + "action": "differenceOfNumbers", + "upwardIndicator": "positive", + "downwardIndicator": "negative", + "textMessage": "$indicator$value% than last $insightInterval", + "colorCode": "#228B22", + "insightInterval": "year" }, "_comment": " totalApplication is the chartId" }, @@ -399,8 +391,7 @@ "Trade Licence", "PGR" ], - "insight": { - }, + "insight": {}, "_comment": " totalApplication is the chartId" }, "totalApplication&ClosedApplication": { @@ -419,7 +410,6 @@ "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \r\n \"district\" : \"Data.tenantData.city.districtCode\", \r\n\"tenantId\" : \"Data.tradelicense.tenantId.keyword\" \r\n}", "indexName": "tlindex-v1", "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tradelicense.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Total Application\":{\"date_histogram\":{\"field\":\"Data.tradelicense.applicationDate\",\"interval\":\"intervalvalue\"},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.tradelicense.applicationNumber.keyword\"}}}},\"Closed Application\":{\"date_histogram\":{\"field\":\"Data.tradelicense.applicationDate\",\"interval\":\"intervalvalue\"},\"aggs\":{\"Applications Closed\":{\"filter\":{\"bool\":{\"must\":[{\"terms\":{\"Data.status.keyword\":[\"closed\",\"resolved\"]}}]}},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.tradelicense.applicationNumber.keyword\"}}}}}}}}}}" - }, { "module": "PGR", @@ -427,7 +417,6 @@ "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\", \r\n \"district\" : \"Data.tenantData.city.districtCode\", \r\n\"tenantId\" : \"Data.tenantId\" \r\n}", "indexName": "pgrindex-v1", "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Total Application\":{\"date_histogram\":{\"field\":\"Data.dateOfComplaint\",\"interval\":\"intervalvalue\"},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}},\"Closed Application\":{\"date_histogram\":{\"field\":\"Data.dateOfComplaint\",\"interval\":\"intervalvalue\"},\"aggs\":{\"Applications Closed\":{\"filter\":{\"bool\":{\"must\":[{\"terms\":{\"Data.status.keyword\":[\"closed\",\"resolved\"]}}]}},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.dateOfComplaint\"}}}}}}}}}}" - } ], "chartType": "line", @@ -441,8 +430,7 @@ ], "isCumulative": false, "interval": "month", - "insight": { - }, + "insight": {}, "_comment": " " }, "topPerformingUlbsCompletionRate": { @@ -482,8 +470,7 @@ "Closed Application", "Total Application" ], - "insight": { - }, + "insight": {}, "_comment": " Top Performing Ulbs for Completion rate" }, "bottomPerformingUlbsCompletionRate": { @@ -523,12 +510,9 @@ "Closed Application", "Total Application" ], - "insight": { - }, + "insight": {}, "_comment": " Bottom Performing Ulbs for Completion rate" }, - - "_comment": "COMMON COLLECTION CHARTS", "targetCollection": { "chartName": "DSS_TARGET_COLLECTION", "queries": [ @@ -549,9 +533,8 @@ "Target Collection" ], "isDayUnit": true, - "postAggregationTheory" : "repsonseToDifferenceOfDates", - "insight": { - }, + "postAggregationTheory": "repsonseToDifferenceOfDates", + "insight": {}, "_comment": " " }, "collectionByUsageType": { @@ -562,7 +545,7 @@ "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Usage Type\":{\"terms\":{\"field\":\"domainObject.usageCategory.keyword\",\"size\":200}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Payment Mode Type\":{\"terms\":{\"field\":\"dataObject.paymentMode.keyword\",\"size\":200}}}}}}" } ], "chartType": "pie", @@ -571,14 +554,11 @@ "documentType": "_doc", "drillChart": "none", "aggregationPaths": [ - "Usage Type" + "Payment Mode" ], - "insight": { - }, - "_comment": " collection/amount per usage type" + "insight": {}, + "_comment": " collection/amount per payment mode" }, - - "_comment": "PT NON-COLLECTION CHARTS", "propertiesByUsageType": { "chartName": "DSS_PT_PROPERTIES_BY_USAGE_TYPE", "queries": [ @@ -598,8 +578,7 @@ "aggregationPaths": [ "Usage Type" ], - "insight": { - }, + "insight": {}, "_comment": " properties having assessmentNumber per usage type" }, "propertiesAssessed": { @@ -622,13 +601,13 @@ "Assessed Properties" ], "insight": { - "chartResponseMap" : "propertiesAssessed", - "action" : "differenceOfNumbers", - "upwardIndicator" : "positive", - "downwardIndicator" : "negative", - "textMessage" : "$indicator$value% than last $insightInterval", - "colorCode" : "#228B22", - "insightInterval" : "year" + "chartResponseMap": "propertiesAssessed", + "action": "differenceOfNumbers", + "upwardIndicator": "positive", + "downwardIndicator": "negative", + "textMessage": "$indicator$value% than last $insightInterval", + "colorCode": "#228B22", + "insightInterval": "year" }, "_comment": " totol properties having assessmentNumber " }, @@ -652,13 +631,13 @@ "Assessed Properties" ], "insight": { - "chartResponseMap" : "totalAssessment", - "action" : "differenceOfNumbers", - "upwardIndicator" : "positive", - "downwardIndicator" : "negative", - "textMessage" : "$indicator$value% than last $insightInterval", - "colorCode" : "#228B22", - "insightInterval" : "year" + "chartResponseMap": "totalAssessment", + "action": "differenceOfNumbers", + "upwardIndicator": "positive", + "downwardIndicator": "negative", + "textMessage": "$indicator$value% than last $insightInterval", + "colorCode": "#228B22", + "insightInterval": "year" }, "_comment": " totol properties having assessmentNumber " }, @@ -683,8 +662,7 @@ ], "isCumulative": true, "interval": "week", - "insight": { - }, + "insight": {}, "_comment": " totol properties having assessmentNumber " }, "activeUlbs": { @@ -714,20 +692,16 @@ "Active ULBs" ], "insight": { - "chartResponseMap" : "activeUlbs", - "action" : "differenceOfNumbers", - "upwardIndicator" : "positive", - "downwardIndicator" : "negative", - "textMessage" : "$indicator$value% than last $insightInterval", - "colorCode" : "#228B22", - "insightInterval" : "year" + "chartResponseMap": "activeUlbs", + "action": "differenceOfNumbers", + "upwardIndicator": "positive", + "downwardIndicator": "negative", + "textMessage": "$indicator$value% than last $insightInterval", + "colorCode": "#228B22", + "insightInterval": "year" }, "_comment": " total ULBs count" }, - - "_comment": "PT COLLECTION CHARTS (Tax heads)", - - "_comment": "PT COLLECTION CHARTS (Demands) ", "demandCollectionIndexDDRRevenue": { "chartName": "DSS_PT_KEY_FY_INDICATORS", "queries": [ @@ -748,7 +722,10 @@ ], "isMdmsEnabled": true, "filterKeys": [ - {"key": "tenantId", "column": "DDRs"} + { + "key": "tenantId", + "column": "DDRs" + } ], "chartType": "table", "valueType": "number", @@ -756,7 +733,7 @@ "action": "", "plotLabel": "DDRs", "isPostResponseHandler": true, - "postAggregationTheory" : "repsonseToDifferenceOfDates", + "postAggregationTheory": "repsonseToDifferenceOfDates", "aggregationPaths": [ "Total Collection", "Transactions", @@ -777,8 +754,7 @@ "Target Collection": "amount" } ], - "insight": { - }, + "insight": {}, "_comment": "" }, "demandCollectionIndexBoundaryRevenue": { @@ -800,9 +776,13 @@ } ], "filterKeys": [ - {"key": "tenantId", "column": "Boundary"} + { + "key": "tenantId", + "column": "Boundary" + } ], - "postAggregationTheory" : "repsonseToDifferenceOfDates", "chartType": "table", + "postAggregationTheory": "repsonseToDifferenceOfDates", + "chartType": "table", "valueType": "number", "drillChart": "boundaryDrillDown", "drillFields": [ @@ -832,8 +812,7 @@ "Target Collection": "amount" } ], - "insight": { - }, + "insight": {}, "_comment": "" }, "boundaryDrillDown": { @@ -874,13 +853,9 @@ "Target Collection": "amount" } ], - "insight": { - }, + "insight": {}, "_comment": "" }, - - - "_comment": " PT Nested Array related new queries", "taxHeadsBreakupDDRRevenue": { "chartName": "DSS_PT_TAX_HEAD_BREAKUP_REVENUE", "queries": [ @@ -894,8 +869,10 @@ ], "isMdmsEnabled": true, "filterKeys": [ - {"key": "tenantId", "column": "DDRs"} - + { + "key": "tenantId", + "column": "DDRs" + } ], "chartType": "xtable", "valueType": "number", @@ -910,19 +887,27 @@ "Cancer Cess", "Rebate", "Penalty", - "Time Interest","Round Off" + "Time Interest", + "Round Off" ], "computedFields": [ { - "postAggregationTheory" : "", + "postAggregationTheory": "", "actionName": "AdditiveComputedField", - "fields" : [ "PT Tax", "Fire Cess", "Cancer Cess", "Rebate", "Penalty", "Time Interest","Round Off"], - "newField" : "Total Amount", + "fields": [ + "PT Tax", + "Fire Cess", + "Cancer Cess", + "Rebate", + "Penalty", + "Time Interest", + "Round Off" + ], + "newField": "Total Amount", "_comments": "fields are field names picked from its aggregation query to use post aggregation newField value with given new field name " } ], - "insight": { - }, + "insight": {}, "_comment": "" }, "taxHeadsBreakupRevenue": { @@ -937,8 +922,10 @@ } ], "filterKeys": [ - {"key": "tenantId", "column": "Boundary"} - + { + "key": "tenantId", + "column": "Boundary" + } ], "chartType": "xtable", "valueType": "number", @@ -956,11 +943,11 @@ "Cancer Cess", "Rebate", "Penalty", - "Time Interest","Round Off", "Total Amount" + "Time Interest", + "Round Off", + "Total Amount" ], - - "insight": { - }, + "insight": {}, "_comment": "" }, "taxHeadsBreakupBoundaryDrill": { @@ -974,9 +961,7 @@ "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Ward \":{\"terms\":{\"field\":\"domainObject.ward.name.keyword\",\"size\":200},\"aggs\":{\"Total Amount\":{\"bucket_script\":{\"buckets_path\":{\"c1\":\"PT Tax>aggrFilter>amount\",\"c2\":\"Fire Cess>aggrFilter>amount\",\"c3\":\"Cancer Cess>aggrFilter>amount\",\"c4\":\"Rebate>aggrFilter>amount\",\"c5\":\"Penalty>aggrFilter>amount\",\"c6\":\"Time Interest>aggrFilter>amount\",\"c7\":\"Round Off>aggrFilter>amount\"},\"script\":{\"source\":\"params.c1+params.c2+params.c3+params.c4+params.c5+params.c6+params.c7\"}}},\"PT Tax\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TAX\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Fire Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_FIRE_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Cancer Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_CANCER_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Rebate\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_REBATE\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Penalty\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_PENALTY\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Time Interest\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_INTEREST\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Round Off\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_ROUNDOFF\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}}}}}}}}" } ], - "filterKeys": [ - - ], + "filterKeys": [], "chartType": "xtable", "valueType": "number", "drillChart": "", @@ -993,14 +978,14 @@ "Cancer Cess", "Rebate", "Penalty", - "Time Interest","Round Off","Total Amount" + "Time Interest", + "Round Off", + "Total Amount" ], - - "insight": { - }, + "insight": {}, "_comment": "" }, - "taxHeadsBreakupUsageMinor": { + "taxHeadsBreakupUsageMinor": { "chartName": "", "queries": [ { @@ -1012,7 +997,10 @@ } ], "filterKeys": [ - {"key": "minorUsageId", "column": "Minor Usage Type"} + { + "key": "minorUsageId", + "column": "Minor Usage Type" + } ], "chartType": "table", "valueType": "number", @@ -1048,8 +1036,7 @@ "Penalty": "amount" } ], - "insight": { - }, + "insight": {}, "_comment": "present we are not using, Need to check the taxAndPayments" }, "taxHeadsBreakupUsageSubMinor": { @@ -1100,8 +1087,7 @@ "Penalty": "amount" } ], - "insight": { - }, + "insight": {}, "_comment": "" }, "demandCollectionIndexUsageRevenue": { @@ -1116,9 +1102,7 @@ "aggrQuerybc": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Approved\"]}}]}},\"aggs\":{\"UsageType \":{\"terms\":{\"field\":\"domainObject.usageCategory.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.transactionNumber.keyword\"}},\"Assessed Properties\":{\"nested\":{\"path\":\"domainObject.assessmentsDetails\"},\"aggs\":{\"attr\":{\"cardinality\":{\"field\":\"domainObject.assessmentsDetails.assessmentNumber.keyword\"}}}}}}}}}}" } ], - "filterKeys": [ - - ], + "filterKeys": [], "chartType": "table", "valueType": "number", "drillChart": "", @@ -1133,7 +1117,6 @@ "Total Collection", "Transactions", "Assessed Properties" - ], "pathDataTypeMapping": [ { @@ -1146,8 +1129,7 @@ "Assessed Properties": "number" } ], - "insight": { - }, + "insight": {}, "_comment": "removed reverse_nested in aggrQuery" }, "usageRevenueDrillDownMinor": { @@ -1163,7 +1145,10 @@ } ], "filterKeys": [ - {"key": "minorUsageId", "column": "Minor Usage Type"} + { + "key": "minorUsageId", + "column": "Minor Usage Type" + } ], "chartType": "table", "valueType": "number", @@ -1187,8 +1172,7 @@ "Assessed Properties": "number" } ], - "insight": { - }, + "insight": {}, "_comment": "" }, "usageRevenueDrillDownSubMinor": { @@ -1203,9 +1187,7 @@ "aggrQuerybc": "{\"aggs\":{\"UsageType \":{\"terms\":{\"field\":\"domainObject.usageCategory.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.transactionNumber.keyword\"}},\"Assessed Properties\":{\"nested\":{\"path\":\"Data.propertyDetails\"},\"aggs\":{\"attr\":{\"cardinality\":{\"field\":\"Data.propertyDetails.assessmentNumber.keyword\"}}}}}}}}" } ], - "filterKeys": [ - - ], + "filterKeys": [], "chartType": "table", "valueType": "number", "drillChart": "none", @@ -1228,15 +1210,9 @@ "Assessed Properties": "number" } ], - "insight": { - }, + "insight": {}, "_comment": "" }, - - - - "_comment": "TL COLLECTION CHARTS", - "licenseIssuedDDRRevenue": { "chartName": "DSS_TL_KEY_FY_INDICATORS", "queries": [ @@ -1257,10 +1233,13 @@ ], "isMdmsEnabled": true, "filterKeys": [ - {"key": "tenantId", "column": "DDRs"} + { + "key": "tenantId", + "column": "DDRs" + } ], "isPostResponseHandler": true, - "postAggregationTheory" : "repsonseToDifferenceOfDates", + "postAggregationTheory": "repsonseToDifferenceOfDates", "chartType": "table", "valueType": "number", "drillChart": "licenseIssuedBoundaryRevenue", @@ -1287,8 +1266,7 @@ "Target Collection": "amount" } ], - "insight": { - }, + "insight": {}, "_comment": "" }, "licenseIssuedBoundaryRevenue": { @@ -1310,9 +1288,12 @@ } ], "filterKeys": [ - {"key": "tenantId", "column": "Boundary"} + { + "key": "tenantId", + "column": "Boundary" + } ], - "postAggregationTheory" : "repsonseToDifferenceOfDates", + "postAggregationTheory": "repsonseToDifferenceOfDates", "chartType": "table", "valueType": "number", "drillChart": "licenseIssuedBoundaryDrillDown", @@ -1339,8 +1320,7 @@ "Target Collection": "amount" } ], - "insight": { - }, + "insight": {}, "_comment": "" }, "licenseIssuedBoundaryDrillDown": { @@ -1354,7 +1334,7 @@ "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Ward \":{\"terms\":{\"field\":\"domainObject.ward.name.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.transactionNumber.keyword\"}},\"Total Licence Issued\":{\"value_count\":{\"field\":\"domainObject.tradelicense.licenseNumber.keyword\"}}}}}}}}" } ], - "postAggregationTheory" : "repsonseToDifferenceOfDates", + "postAggregationTheory": "repsonseToDifferenceOfDates", "chartType": "table", "valueType": "number", "drillChart": "", @@ -1381,12 +1361,9 @@ "Target Collection": "amount" } ], - "insight": { - }, + "insight": {}, "_comment": "" }, - - "_comment": " TL Nested Array related newer queries", "licenceTaxHeadsBreakupDDR": { "chartName": "DSS_TL_TAX_HEAD_BREAKUP_BOUNDARY", "queries": [ @@ -1400,7 +1377,10 @@ ], "isMdmsEnabled": true, "filterKeys": [ - {"key": "tenantId", "column": "DDRs"} + { + "key": "tenantId", + "column": "DDRs" + } ], "isPostResponseHandlerA": true, "chartType": "xtable", @@ -1416,16 +1396,18 @@ ], "computedFields": [ { - "postAggregationTheory" : "", + "postAggregationTheory": "", "actionName": "AdditiveComputedField", - "fields" : ["TL Tax", "Adhoc Penalty", "Adhoc Rebate"], - "newField" : "Total Amount", + "fields": [ + "TL Tax", + "Adhoc Penalty", + "Adhoc Rebate" + ], + "newField": "Total Amount", "_comments": "fields are field names picked from its aggregation query to use post aggregation newField value with given new field name " } ], - - "insight": { - }, + "insight": {}, "_comment": "" }, "taxHeadsBreakupUsage": { @@ -1439,9 +1421,7 @@ "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Usage \":{\"terms\":{\"field\":\"domainObject.usageCategory.keyword\",\"size\":200},\"aggs\":{\"Total Amount\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}},\"PT Tax\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TAX\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Fire Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_FIRE_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Cancer Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_CANCER_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Rebate\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_REBATE\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Penalty\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_PENALTY\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}}}}}}}}" } ], - "filterKeys": [ - - ], + "filterKeys": [], "chartType": "table", "valueType": "number", "drillChart": "", @@ -1476,8 +1456,7 @@ "Penalty": "amount" } ], - "insight": { - }, + "insight": {}, "_comment": "" }, "licenceTaxHeadsBreakupBoundary": { @@ -1492,7 +1471,10 @@ } ], "filterKeys": [ - {"key": "tenantId", "column": "Boundary"} + { + "key": "tenantId", + "column": "Boundary" + } ], "chartType": "xtable", "valueType": "number", @@ -1503,10 +1485,10 @@ "aggregationPaths": [ "TL Tax", "Adhoc Penalty", - "Adhoc Rebate","Total Amount" + "Adhoc Rebate", + "Total Amount" ], - "insight": { - }, + "insight": {}, "_comment": "" }, "licenceTaxHeadsBreakupWard": { @@ -1520,8 +1502,7 @@ "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"ULBs \":{\"terms\":{\"field\":\"dataObject.ward.name.keyword\",\"size\":200},\"aggs\":{\"Total Amount\":{\"bucket_script\":{\"buckets_path\":{\"c1\":\"TL Tax>aggrFilter>amount\",\"c2\":\"Adhoc Penalty>aggrFilter>amount\",\"c3\":\"Adhoc Rebate>aggrFilter>amount\"},\"script\":{\"source\":\"params.c1+params.c2+params.c3\"}}},\"TL Tax\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"TL_TAX\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Adhoc Penalty\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"TL_ADHOC_PENALTY\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Adhoc Rebate\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"TL_ADHOC_REBATE\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}}}}}}}}" } ], - "filterKeys": [ - ], + "filterKeys": [], "chartType": "xtable", "valueType": "number", "drillChart": "", @@ -1531,15 +1512,12 @@ "aggregationPaths": [ "TL Tax", "Adhoc Penalty", - "Adhoc Rebate", "Total Amount" + "Adhoc Rebate", + "Total Amount" ], - "insight": { - }, + "insight": {}, "_comment": "" }, - - - "_comment": "TL NON-COLLECTION CHARTS", "licenseIssued": { "chartName": "DSS_TL_LICENSE_ISSUED", "queries": [ @@ -1560,13 +1538,13 @@ "License Issued" ], "insight": { - "chartResponseMap" : "licenseIssued", - "action" : "differenceOfNumbers", - "upwardIndicator" : "positive", - "downwardIndicator" : "negative", - "textMessage" : "$indicator$value% than last $insightInterval", - "colorCode" : "#228B22", - "insightInterval" : "year" + "chartResponseMap": "licenseIssued", + "action": "differenceOfNumbers", + "upwardIndicator": "positive", + "downwardIndicator": "negative", + "textMessage": "$indicator$value% than last $insightInterval", + "colorCode": "#228B22", + "insightInterval": "year" }, "_comment": " licenseIssued is the Chart ID" }, @@ -1599,8 +1577,7 @@ ], "isCumulative": true, "interval": "month", - "insight": { - }, + "insight": {}, "_comment": " Total Number of License having issued" }, "licenseApplicationByStatus": { @@ -1623,8 +1600,7 @@ "aggregationPaths": [ "Status" ], - "insight": { - }, + "insight": {}, "_comment": " License Application which are issued by License Type" }, "slaAchieved": { @@ -1648,13 +1624,13 @@ "Total Application" ], "insight": { - "chartResponseMap" : "slaAchieved", - "action" : "differenceOfNumbers", - "upwardIndicator" : "positive", - "downwardIndicator" : "negative", - "textMessage" : "$indicator$value% than last $insightInterval", - "colorCode" : "#228B22", - "insightInterval" : "year" + "chartResponseMap": "slaAchieved", + "action": "differenceOfNumbers", + "upwardIndicator": "positive", + "downwardIndicator": "negative", + "textMessage": "$indicator$value% than last $insightInterval", + "colorCode": "#228B22", + "insightInterval": "year" }, "_comment": " SLA Achieved Percentage " }, @@ -1672,7 +1648,10 @@ ], "isMdmsEnabled": true, "filterKeys": [ - {"key": "tenantId", "column": "DDRs"} + { + "key": "tenantId", + "column": "DDRs" + } ], "chartType": "xtable", "valueType": "number", @@ -1723,8 +1702,7 @@ "Paid": "number" } ], - "insight": { - }, + "insight": {}, "_comment": "" }, "tlStatusByTenant": { @@ -1740,7 +1718,10 @@ } ], "filterKeys": [ - {"key": "tenantId", "column": "Boundary"} + { + "key": "tenantId", + "column": "Boundary" + } ], "chartType": "xtable", "valueType": "number", @@ -1751,14 +1732,9 @@ "documentType": "_doc", "action": "", "plotLabel": "ULBs", - "aggregationPaths": [ - - ], - "pathDataTypeMapping": [ - - ], - "insight": { - }, + "aggregationPaths": [], + "pathDataTypeMapping": [], + "insight": {}, "_comment": "" }, "tlStatusByTenantDrillDown": { @@ -1773,8 +1749,7 @@ "aggrQueryBc": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tradelicense.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Ward \":{\"terms\":{\"field\":\"Data.ward.name.keyword\",\"size\":1000},\"aggs\":{\"Status\":{\"filters\":{\"filters\":{\"Approved\":{\"match\":{\"Data.tradelicense.status.keyword\":\"APPROVED\"}},\"Initiated\":{\"match\":{\"Data.tradelicense.status.keyword\":\"INITIATED\"}},\"Applied\":{\"match\":{\"Data.tradelicense.status.keyword\":\"APPLIED\"}},\"Rejected\":{\"match\":{\"Data.tradelicense.status.keyword\":\"REJECTED\"}},\"Pending Approval\":{\"match\":{\"Data.tradelicense.status.keyword\":\"PENDINGAPPROVAL\"}},\"Field Inspection\":{\"match\":{\"Data.tradelicense.status.keyword\":\"FIELDINSPECTION\"}},\"Cancelled\":{\"match\":{\"Data.tradelicense.status.keyword\":\"CANCELLED\"}},\"Pending Payment\":{\"match\":{\"Data.tradelicense.status.keyword\":\"PENDINGPAYMENT\"}},\"Paid\":{\"match\":{\"Data.tradelicense.status.keyword\":\"PAID\"}}}}}}}}}}}" } ], - "filterKeys": [ - ], + "filterKeys": [], "chartType": "xtable", "valueType": "number", "drillChart": "", @@ -1824,12 +1799,9 @@ "Paid": "number" } ], - "insight": { - }, + "insight": {}, "_comment": "" }, - - "_comment": "Enhanced table charts..TODO: refactor to remove xtable type ", "xlicenseIssuedBoundaryRevenue": { "chartName": "DSS_TL_DEMAND_COLLECTION_BOUNDARY", "queries": [ @@ -1849,35 +1821,41 @@ } ], "filterKeys": [ - {"key": "tenantId", "column": "Boundary"} + { + "key": "tenantId", + "column": "Boundary" + } ], - "postAggregationTheory" : "repsonseToDifferenceOfDates", + "postAggregationTheory": "repsonseToDifferenceOfDates", "chartType": "xtable", "valueType": "number", "drillChart": "", "plotLabel": "Boundary", - "aggregationPaths": [ - ], + "aggregationPaths": [], "computedFields": [ { - "postAggregationTheory" : "repsonseToDifferenceOfDates", + "postAggregationTheory": "repsonseToDifferenceOfDates", "actionName": "PercentageComputedField", - "fields" : ["Target Collection", "Total Collection"], - "newField" : "Target Achieved", + "fields": [ + "Target Collection", + "Total Collection" + ], + "newField": "Target Achieved", "_comments": "fields are field names picked from its aggregation query to use post aggregation newField value with given new field name " }, { - "postAggregationTheory" : "repsonseToDifferenceOfDates", + "postAggregationTheory": "repsonseToDifferenceOfDates", "actionName": "PercentageComputedField", - "fields" : ["Target Collection", "Total Collection"], - "newField" : "Target Achieved", + "fields": [ + "Target Collection", + "Total Collection" + ], + "newField": "Target Achieved", "_comments": "fields are field names picked from its aggregation query to use post aggregation newField value with given new field name " } ], - "pathDataTypeMapping": [ - ], - "insight": { - }, + "pathDataTypeMapping": [], + "insight": {}, "_comment": "" }, "xptFyByDDR": { @@ -1900,14 +1878,16 @@ ], "isMdmsEnabled": true, "filterKeys": [ - {"key": "tenantId", "column": "DDRs"} + { + "key": "tenantId", + "column": "DDRs" + } ], "chartType": "xtable", "valueType": "number", "drillChart": "xptFyByTenant", "plotLabel": "DDRs", - "insight": { - }, + "insight": {}, "_comment": "" }, "xptFyByTenant": { @@ -1929,14 +1909,16 @@ } ], "filterKeys": [ - {"key": "tenantId", "column": "Boundary"} + { + "key": "tenantId", + "column": "Boundary" + } ], "chartType": "xtable", "valueType": "number", "drillChart": "xptFyByWard", "plotLabel": "Boundary", - "insight": { - }, + "insight": {}, "_comment": "" }, "xptFyByWard": { @@ -1957,17 +1939,14 @@ "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Ward \":{\"terms\":{\"field\":\"Data.ward.name.keyword\"},\"aggs\":{\"Total\":{\"value_count\":{\"field\":\"Data.assessmentNumber.keyword\"}}}}}}}}" } ], - "filterKeys": [ - ], + "filterKeys": [], "chartType": "xtable", "valueType": "number", "drillChart": "none", "plotLabel": "Wards", - "insight": { - }, + "insight": {}, "_comment": "" }, - "xpgrStatusByDDR": { "chartName": "DSS_PGR_STATUS_BY_TENANT", "queries": [ @@ -1981,31 +1960,41 @@ ], "isMdmsEnabled": true, "filterKeys": [ - {"key": "tenantId", "column": "DDRs"} + { + "key": "tenantId", + "column": "DDRs" + } ], "chartType": "xtable", "valueType": "number", "drillChart": "xpgrStatusByTenant", "plotLabel": "DDRs", - "excludedColumns": ["withinSLA"], + "excludedColumns": [ + "withinSLA" + ], "computedFields": [ { - "postAggregationTheory" : "", + "postAggregationTheory": "", "actionName": "PercentageComputedField", - "fields" : ["Closed Complaints", "Total Complaints"], - "newField" : "Completion Rate", + "fields": [ + "Closed Complaints", + "Total Complaints" + ], + "newField": "Completion Rate", "_comments": "fields are field names picked from its aggregation query to use post aggregation newField value with given new field name " }, { - "postAggregationTheory" : "", + "postAggregationTheory": "", "actionName": "PercentageComputedField", - "fields" : ["withinSLA","Total Complaints"], - "newField" : "Sla Achieved", + "fields": [ + "withinSLA", + "Total Complaints" + ], + "newField": "Sla Achieved", "_comments": "fields are field names picked from its aggregation query to use post aggregation newField value with given new field name " } ], - "insight": { - }, + "insight": {}, "_comment": "" }, "xpgrStatusByTenant": { @@ -2020,31 +2009,41 @@ } ], "filterKeys": [ - {"key": "tenantId", "column": "Boundary"} + { + "key": "tenantId", + "column": "Boundary" + } ], "chartType": "xtable", "valueType": "number", "drillChart": "xpgrStatusByWard", "plotLabel": "Boundary", - "excludedColumns": ["withinSLA"], + "excludedColumns": [ + "withinSLA" + ], "computedFields": [ { - "postAggregationTheory" : "", + "postAggregationTheory": "", "actionName": "PercentageComputedField", - "fields" : ["Closed Complaints", "Total Complaints"], - "newField" : "Completion Rate", + "fields": [ + "Closed Complaints", + "Total Complaints" + ], + "newField": "Completion Rate", "_comments": "fields are field names picked from its aggregation query to use post aggregation newField value with given new field name " }, { - "postAggregationTheory" : "", + "postAggregationTheory": "", "actionName": "PercentageComputedField", - "fields" : ["Total Complaints", "withinSLA"], - "newField" : "Sla Achieved", + "fields": [ + "Total Complaints", + "withinSLA" + ], + "newField": "Sla Achieved", "_comments": "fields are field names picked from its aggregation query to use post aggregation newField value with given new field name " } ], - "insight": { - }, + "insight": {}, "_comment": "" }, "xpgrStatusByWard": { @@ -2059,34 +2058,43 @@ } ], "filterKeys": [ - {"key": "tenantId", "column": "Boundary"} + { + "key": "tenantId", + "column": "Boundary" + } ], "chartType": "xtable", "valueType": "number", "drillChart": "none", - "documentType": "_doc", "action": "", "plotLabel": "Ward", - "excludedColumns": ["withinSLA"], + "excludedColumns": [ + "withinSLA" + ], "computedFields": [ { - "postAggregationTheory" : "", + "postAggregationTheory": "", "actionName": "PercentageComputedField", - "fields" : ["Closed Complaints", "Total Complaints"], - "newField" : "Completion Rate", + "fields": [ + "Closed Complaints", + "Total Complaints" + ], + "newField": "Completion Rate", "_comments": "fields are field names picked from its aggregation query to use post aggregation newField value with given new field name " }, { - "postAggregationTheory" : "", + "postAggregationTheory": "", "actionName": "PercentageComputedField", - "fields" : ["Total Complaints", "withinSLA"], - "newField" : "Sla Achieved", + "fields": [ + "Total Complaints", + "withinSLA" + ], + "newField": "Sla Achieved", "_comments": "fields are field names picked from its aggregation query to use post aggregation newField value with given new field name " } ], - "insight": { - }, + "insight": {}, "_comment": "" }, "xpgrStatusByDept": { @@ -2101,34 +2109,43 @@ } ], "filterKeys": [ - {"key": "departmentId", "column": "Department"} + { + "key": "departmentId", + "column": "Department" + } ], "chartType": "xtable", "valueType": "number", "drillChart": "xpgrStatusByCatagory", - "documentType": "_doc", "action": "", "plotLabel": "Department", - "excludedColumns": ["withinSLA"], + "excludedColumns": [ + "withinSLA" + ], "computedFields": [ { - "postAggregationTheory" : "", + "postAggregationTheory": "", "actionName": "PercentageComputedField", - "fields" : ["Closed Complaints", "Total Complaints"], - "newField" : "Completion Rate", + "fields": [ + "Closed Complaints", + "Total Complaints" + ], + "newField": "Completion Rate", "_comments": "fields are field names picked from its aggregation query to use post aggregation newField value with given new field name " }, { - "postAggregationTheory" : "", + "postAggregationTheory": "", "actionName": "PercentageComputedField", - "fields" : ["Total Complaints", "withinSLA"], - "newField" : "Sla Achieved", + "fields": [ + "Total Complaints", + "withinSLA" + ], + "newField": "Sla Achieved", "_comments": "fields are field names picked from its aggregation query to use post aggregation newField value with given new field name " } ], - "insight": { - }, + "insight": {}, "_comment": "" }, "xpgrStatusByCatagory": { @@ -2143,38 +2160,45 @@ } ], "filterKeys": [ - {"key": "departmentId", "column": "Department"} + { + "key": "departmentId", + "column": "Department" + } ], "chartType": "xtable", "valueType": "number", "drillChart": "none", - "documentType": "_doc", "action": "", "plotLabel": "Complaint Category", - "excludedColumns": ["withinSLA"], + "excludedColumns": [ + "withinSLA" + ], "computedFields": [ { - "postAggregationTheory" : "", + "postAggregationTheory": "", "actionName": "PercentageComputedField", - "fields" : ["Closed Complaints", "Total Complaints"], - "newField" : "Completion Rate", + "fields": [ + "Closed Complaints", + "Total Complaints" + ], + "newField": "Completion Rate", "_comments": "fields are field names picked from its aggregation query to use post aggregation newField value with given new field name " }, { - "postAggregationTheory" : "", + "postAggregationTheory": "", "actionName": "PercentageComputedField", - "fields" : ["Total Complaints", "withinSLA"], - "newField" : "Sla Achieved", + "fields": [ + "Total Complaints", + "withinSLA" + ], + "newField": "Sla Achieved", "_comments": "fields are field names picked from its aggregation query to use post aggregation newField value with given new field name " } ], - "insight": { - }, + "insight": {}, "_comment": "" }, - - "_comment": "PGR NON-COLLECTION CHARTS", "completionRate": { "chartName": "DSS_PGR_COMPLETION_RATE", "queries": [ @@ -2196,13 +2220,13 @@ "Total Complaints" ], "insight": { - "chartResponseMap" : "completionRate", - "action" : "differenceOfNumbers", - "upwardIndicator" : "positive", - "downwardIndicator" : "negative", - "textMessage" : "$indicator$value% than last $insightInterval", - "colorCode" : "#228B22", - "insightInterval" : "year" + "chartResponseMap": "completionRate", + "action": "differenceOfNumbers", + "upwardIndicator": "positive", + "downwardIndicator": "negative", + "textMessage": "$indicator$value% than last $insightInterval", + "colorCode": "#228B22", + "insightInterval": "year" }, "_comment": " Total Number of Complaints " }, @@ -2226,13 +2250,13 @@ "Total Complaints" ], "insight": { - "chartResponseMap" : "totalComplaints", - "action" : "differenceOfNumbers", - "upwardIndicator" : "positive", - "downwardIndicator" : "negative", - "textMessage" : "$indicator$value% than last $insightInterval", - "colorCode" : "#228B22", - "insightInterval" : "year" + "chartResponseMap": "totalComplaints", + "action": "differenceOfNumbers", + "upwardIndicator": "positive", + "downwardIndicator": "negative", + "textMessage": "$indicator$value% than last $insightInterval", + "colorCode": "#228B22", + "insightInterval": "year" }, "_comment": " Total Number of Complaints " }, @@ -2256,13 +2280,13 @@ "Closed Complaints" ], "insight": { - "chartResponseMap" : "closedComplaints", - "action" : "differenceOfNumbers", - "upwardIndicator" : "positive", - "downwardIndicator" : "negative", - "textMessage" : "$indicator$value% than last $insightInterval", - "colorCode" : "#228B22", - "insightInterval" : "year" + "chartResponseMap": "closedComplaints", + "action": "differenceOfNumbers", + "upwardIndicator": "positive", + "downwardIndicator": "negative", + "textMessage": "$indicator$value% than last $insightInterval", + "colorCode": "#228B22", + "insightInterval": "year" }, "_comment": " Total Number of Closed Complaints " }, @@ -2286,12 +2310,10 @@ "Closed Complaints", "Reopened Complaints", "Total Complaints" - ], "isCumulative": true, "interval": "month", - "insight": { - }, + "insight": {}, "_comment": " " }, "totalComplaintsbySource": { @@ -2318,8 +2340,7 @@ ], "isCumulative": false, "interval": "month", - "insight": { - }, + "insight": {}, "_comment": " " }, "totalComplaintsbyStatus": { @@ -2344,8 +2365,7 @@ ], "isCumulative": false, "interval": "month", - "insight": { - }, + "insight": {}, "_comment": " " }, "complaintsByStatus": { @@ -2367,8 +2387,7 @@ "aggregationPaths": [ "Complaints By Status" ], - "insight": { - }, + "insight": {}, "_comment": " Complaints By Their Statuses" }, "complaintsByChannel": { @@ -2390,8 +2409,7 @@ "aggregationPaths": [ "Complaints By Channels" ], - "insight": { - }, + "insight": {}, "_comment": " Top 3 Channels For Complaints" }, "complaintsByCategory": { @@ -2413,8 +2431,7 @@ "aggregationPaths": [ "Complaints By Category" ], - "insight": { - }, + "insight": {}, "_comment": " Top 3 Channels For Complaints" }, "complaintsByTenant": { @@ -2436,8 +2453,7 @@ "aggregationPaths": [ "Complaints By Tenant" ], - "insight": { - }, + "insight": {}, "_comment": " Complaints by Tenant" }, "complaintsByDistrict": { @@ -2459,8 +2475,7 @@ "aggregationPaths": [ "Complaints By District" ], - "insight": { - }, + "insight": {}, "_comment": " Complaints by District" }, "complaintsByDepartment": { @@ -2482,8 +2497,7 @@ "aggregationPaths": [ "Complaints By Department" ], - "insight": { - }, + "insight": {}, "_comment": " Complaints by Department" }, "pgrStatusByDDR": { @@ -2499,7 +2513,10 @@ ], "isMdmsEnabled": true, "filterKeys": [ - {"key": "tenantId", "column": "DDRs"} + { + "key": "tenantId", + "column": "DDRs" + } ], "chartType": "table", "valueType": "number", @@ -2542,8 +2559,7 @@ "ReassignRequested": "number" } ], - "insight": { - }, + "insight": {}, "_comment": "" }, "pgrStatusByTenant": { @@ -2558,7 +2574,10 @@ } ], "filterKeys": [ - {"key": "tenantId", "column": "Boundary"} + { + "key": "tenantId", + "column": "Boundary" + } ], "chartType": "table", "valueType": "number", @@ -2601,8 +2620,7 @@ "ReassignRequested": "number" } ], - "insight": { - }, + "insight": {}, "_comment": "" }, "pgrStatusWardDrillDown": { @@ -2616,8 +2634,7 @@ "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Ward \":{\"terms\":{\"field\":\"Data.complaintWard.name.keyword\",\"size\":1000},\"aggs\":{\"Closed Complaints\":{\"filters\":{\"filters\":{\"Open\":{\"match\":{\"Data.status.keyword\":\"open\"}},\"Reopen\":{\"match\":{\"Data.status.keyword\":\"reopen\"}},\"Assigned\":{\"match\":{\"Data.status.keyword\":\"assigned\"}},\"Closed\":{\"match\":{\"Data.status.keyword\":\"closed\"}},\"Resolved\":{\"match\":{\"Data.status.keyword\":\"resolved\"}},\"Rejected\":{\"match\":{\"Data.status.keyword\":\"rejected\"}},\"ReassignRequested\":{\"match\":{\"Data.status.keyword\":\"reassignrequested\"}}}}}}}}}}}" } ], - "filterKeys": [ - ], + "filterKeys": [], "chartType": "table", "valueType": "number", "drillChart": "", @@ -2659,8 +2676,7 @@ "ReassignRequested": "number" } ], - "insight": { - }, + "insight": {}, "_comment": "" }, "pgrStatusByDepartment": { @@ -2675,7 +2691,10 @@ } ], "filterKeys": [ - {"key": "departmentId", "column": "Department"} + { + "key": "departmentId", + "column": "Department" + } ], "chartType": "table", "valueType": "number", @@ -2715,8 +2734,7 @@ "ReassignRequested": "number" } ], - "insight": { - }, + "insight": {}, "_comment": "" }, "pgrStatusCategoryDrillDown": { @@ -2730,8 +2748,7 @@ "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Category \":{\"terms\":{\"field\":\"Data.complainCategory.keyword\",\"size\":1000},\"aggs\":{\"Closed Complaints\":{\"filters\":{\"filters\":{\"Open\":{\"match\":{\"Data.status.keyword\":\"open\"}},\"Reopen\":{\"match\":{\"Data.status.keyword\":\"reopen\"}},\"Assigned\":{\"match\":{\"Data.status.keyword\":\"assigned\"}},\"Closed\":{\"match\":{\"Data.status.keyword\":\"closed\"}},\"Resolved\":{\"match\":{\"Data.status.keyword\":\"resolved\"}},\"Rejected\":{\"match\":{\"Data.status.keyword\":\"rejected\"}},\"ReassignRequested\":{\"match\":{\"Data.status.keyword\":\"reassignrequested\"}}}}}}}}}}}" } ], - "filterKeys": [ - ], + "filterKeys": [], "chartType": "table", "valueType": "number", "drillChart": "", @@ -2773,8 +2790,7 @@ "ReassignRequested": "number" } ], - "insight": { - }, + "insight": {}, "_comment": "" }, "topFiveComplaints": { @@ -2796,8 +2812,7 @@ "aggregationPaths": [ "Complain Category" ], - "insight": { - }, + "insight": {}, "_comment": " Complaints By Their Statuses" }, "averageTurnAroundTime": { @@ -2822,20 +2837,21 @@ ], "computedFields": [ { - "postAggregationTheory" : "", + "postAggregationTheory": "", "actionName": "AverageComputedField", - "fields" : ["computedValueATA"], - "newField" : "ATA", + "fields": [ + "computedValueATA" + ], + "newField": "ATA", "_comments": "fields are field names picked from its aggregation query to use post aggregation newField value with given new field name " } ], "isCumulative": false, "interval": "month", - "insight": { - }, + "insight": {}, "_comment": " " }, -"pgrCitizenOnDateRange": { + "pgrCitizenOnDateRange": { "chartName": "DSS_PGR_CITIZEN", "queries": [ { @@ -2856,15 +2872,10 @@ ], "isCumulative": false, "interval": "month", - "insight": { - }, + "insight": {}, "_comment": " " }, - - - "_comment": "W&S charts below-----------------------------------------------------------------------", - - "wstodaysCollection": { + "wstodaysCollection": { "chartName": "DSS_W&S_TODAYS_COLLECTION", "queries": [ { @@ -2882,8 +2893,7 @@ "aggregationPaths": [ "Total Collection" ], - "insight": { - }, + "insight": {}, "_comment": "W&S todays collections " }, "wstotalCollection": { @@ -2905,8 +2915,7 @@ "aggregationPaths": [ "Total Collection" ], - "insight": { - }, + "insight": {}, "_comment": "W&S total collections " }, "wstargetCollection": { @@ -2929,9 +2938,8 @@ "Target Collection" ], "isDayUnit": true, - "postAggregationTheory" : "repsonseToDifferenceOfDates", - "insight": { - }, + "postAggregationTheory": "repsonseToDifferenceOfDates", + "insight": {}, "_comment": " " }, "wstargetAchieved": { @@ -2951,7 +2959,6 @@ "indexName": "receipts-consumers", "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"status\":\"Cancelled\"}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"totalamount\"}}}}}}" } - ], "translateTenantCode": true, "chartType": "metric", @@ -2964,13 +2971,13 @@ "Actual collection" ], "insight": { - "chartResponseMap" : "wstargetAchieved", - "action" : "differenceOfNumbers", - "upwardIndicator" : "positive", - "downwardIndicator" : "negative", - "textMessage" : "$indicator$value% than last $insightInterval", - "colorCode" : "#228B22", - "insightInterval" : "year" + "chartResponseMap": "wstargetAchieved", + "action": "differenceOfNumbers", + "upwardIndicator": "positive", + "downwardIndicator": "negative", + "textMessage": "$indicator$value% than last $insightInterval", + "colorCode": "#228B22", + "insightInterval": "year" }, "_comment": " " }, @@ -2996,11 +3003,9 @@ ], "isCumulative": true, "interval": "month", - "insight": { - }, + "insight": {}, "_comment": " " }, - "wstopPerformingUlbs": { "chartName": "DSS_W&S_TOP_3_PERFORMING_ULBS", "queries": [ @@ -3029,10 +3034,10 @@ "order": "desc", "limit": 3, "aggregationPaths": [ - "Total Collection","Target Collection" + "Total Collection", + "Target Collection" ], - "insight": { - }, + "insight": {}, "_comment": " Top Performing Ulbs for target achieved" }, "wsbottomPerformingUlbs": { @@ -3063,10 +3068,10 @@ "order": "asc", "limit": 3, "aggregationPaths": [ - "Total Collection", "Target Collection" + "Total Collection", + "Target Collection" ], - "insight": { - }, + "insight": {}, "_comment": " Bottom Performing Ulbs for target achieved" }, "wscollectionByUsage": { @@ -3089,11 +3094,9 @@ "aggregationPaths": [ "Usage Type" ], - "insight": { - }, + "insight": {}, "_comment": " " }, - "wscollectionByChannel": { "chartName": "DSS_W&S_COLLECTION_BY_CHANNEL", "queries": [ @@ -3114,11 +3117,9 @@ "aggregationPaths": [ "Usage Type" ], - "insight": { - }, + "insight": {}, "_comment": " " }, - "wsFinancialIndicatorDDR": { "chartName": "DSS_W&S_DEMAND_COLLECTION_BOUNDARY", "queries": [ @@ -3147,7 +3148,10 @@ "isMdmsEnabled": true, "translateTenantCode": true, "filterKeys": [ - {"key": "tenantId", "column": "DDRs"} + { + "key": "tenantId", + "column": "DDRs" + } ], "chartType": "table", "valueType": "number", @@ -3155,13 +3159,12 @@ "action": "", "plotLabel": "DDRs", "isPostResponseHandler": true, - "postAggregationTheory" : "", + "postAggregationTheory": "", "aggregationPaths": [ "Total Collection", "Total Receipt", "No of Bill", "Project Demand" - ], "pathDataTypeMapping": [ { @@ -3177,8 +3180,7 @@ "Project Demand": "amount" } ], - "insight": { - }, + "insight": {}, "_comment": "" }, "wsFinancialIndicatorUlb": { @@ -3209,7 +3211,10 @@ "isMdmsEnabled": false, "translateTenantCode": true, "filterKeys": [ - {"key": "tenantId", "column": "ULB"} + { + "key": "tenantId", + "column": "ULB" + } ], "chartType": "table", "valueType": "number", @@ -3217,13 +3222,12 @@ "action": "", "plotLabel": "ULB", "isPostResponseHandler": true, - "postAggregationTheory" : "", + "postAggregationTheory": "", "aggregationPaths": [ "Total Collection", "Total Receipt", "No of Bill", "Project Demand" - ], "pathDataTypeMapping": [ { @@ -3239,8 +3243,7 @@ "Project Demand": "amount" } ], - "insight": { - }, + "insight": {}, "_comment": "" }, "wsFinancialIndicatorWard": { @@ -3270,22 +3273,19 @@ ], "isMdmsEnabled": false, "translateTenantCode": true, - "filterKeys": [ - - ], + "filterKeys": [], "chartType": "table", "valueType": "number", "drillChart": "", "action": "", "plotLabel": "Ward", "isPostResponseHandler": true, - "postAggregationTheory" : "", + "postAggregationTheory": "", "aggregationPaths": [ "Total Collection", "Total Receipt", "No of Bill", "Project Demand" - ], "pathDataTypeMapping": [ { @@ -3301,11 +3301,9 @@ "Project Demand": "amount" } ], - "insight": { - }, + "insight": {}, "_comment": "" }, - "wsTaxHeadDDR": { "chartName": "DSS_W&S_TAX_HEAD_BOUNDARY", "queries": [ @@ -3327,14 +3325,17 @@ "translateTenantCode": true, "isMdmsEnabled": true, "filterKeys": [ - {"key": "tenantId", "column": "DDRs"} + { + "key": "tenantId", + "column": "DDRs" + } ], "chartType": "table", "valueType": "number", "drillChart": "wsTaxHeadUlb", "action": "", "plotLabel": "DDRs", - "postAggregationTheory" : "", + "postAggregationTheory": "", "aggregationPaths": [ "Total Collection", "Total Receipt", @@ -3344,7 +3345,6 @@ "Advance", "Current Charges", "Arrear Charges" - ], "pathDataTypeMapping": [ { @@ -3372,8 +3372,7 @@ "Arrear Charges": "amount" } ], - "insight": { - }, + "insight": {}, "_comment": "" }, "wsTaxHeadUlb": { @@ -3397,14 +3396,17 @@ "translateTenantCode": true, "isMdmsEnabled": false, "filterKeys": [ - {"key": "tenantId", "column": "ULB"} + { + "key": "tenantId", + "column": "ULB" + } ], "chartType": "table", "valueType": "number", "drillChart": "wsTaxHeadWard", "action": "", "plotLabel": "ULB", - "postAggregationTheory" : "", + "postAggregationTheory": "", "aggregationPaths": [ "Total Collection", "Total Receipt", @@ -3414,7 +3416,6 @@ "Advance", "Current Charges", "Arrear Charges" - ], "pathDataTypeMapping": [ { @@ -3442,8 +3443,7 @@ "Arrear Charges": "amount" } ], - "insight": { - }, + "insight": {}, "_comment": "" }, "wsTaxHeadWard": { @@ -3466,14 +3466,13 @@ ], "isMdmsEnabled": false, "translateTenantCode": true, - "filterKeys": [ - ], + "filterKeys": [], "chartType": "table", "valueType": "number", "drillChart": "", "action": "", "plotLabel": "Ward", - "postAggregationTheory" : "", + "postAggregationTheory": "", "aggregationPaths": [ "Total Collection", "Total Receipt", @@ -3483,7 +3482,6 @@ "Advance", "Current Charges", "Arrear Charges" - ], "pathDataTypeMapping": [ { @@ -3511,12 +3509,9 @@ "Arrear Charges": "amount" } ], - "insight": { - }, + "insight": {}, "_comment": "" }, - - "wstotalConnection": { "chartName": "DSS_W&S_CONNECTIONS", "queries": [ @@ -3536,8 +3531,7 @@ "aggregationPaths": [ "Total Connection" ], - "insight": { - }, + "insight": {}, "_comment": " " }, "wsActiveUlbs": { @@ -3559,8 +3553,7 @@ "aggregationPaths": [ "Active Ulbs" ], - "insight": { - }, + "insight": {}, "_comment": " " }, "wsNewWaterConnection": { @@ -3582,8 +3575,7 @@ "aggregationPaths": [ "Water Connections" ], - "insight": { - }, + "insight": {}, "_comment": " " }, "wsNewSewerageConnection": { @@ -3605,11 +3597,9 @@ "aggregationPaths": [ "Sewerage Connections" ], - "insight": { - }, + "insight": {}, "_comment": " " }, - "wscumulativeConnections": { "chartName": "DSS_W&S_CUMULATIVE_COLLECTION", "queries": [ @@ -3630,15 +3620,12 @@ "aggregationPaths": [ "Water Connections", "Sewerage Connections" - ], "isCumulative": true, "interval": "month", - "insight": { - }, + "insight": {}, "_comment": " " }, - "wsWaterConsumersByUsageType": { "chartName": "DSS_W&S_WATER_CONNECTION_BY_USAGE", "queries": [ @@ -3659,11 +3646,9 @@ "aggregationPaths": [ "Water Consumers by Usage Type" ], - "insight": { - }, + "insight": {}, "_comment": " " }, - "wsSewerageConsumersByUsageType": { "chartName": "DSS_W&S_SEWERAGE_CONNECTION_BY_USAGE", "queries": [ @@ -3684,11 +3669,9 @@ "aggregationPaths": [ "Sewerage Consumers by Usage Type" ], - "insight": { - }, + "insight": {}, "_comment": " " }, - "wsConsumersByChannel": { "chartName": "DSS_W&S_CONNECTION_BY_CHANNEL", "queries": [ @@ -3709,11 +3692,9 @@ "aggregationPaths": [ "W & S Consumers by Channel" ], - "insight": { - }, + "insight": {}, "_comment": " " }, - "wsConnectionAgeingDDR": { "chartName": "DSS_W&S_CONNECTION_AGEING", "queries": [ @@ -3728,7 +3709,10 @@ "isMdmsEnabled": true, "translateTenantCode": true, "filterKeys": [ - {"key": "tenantId", "column": "DDRs"} + { + "key": "tenantId", + "column": "DDRs" + } ], "chartType": "xtable", "valueType": "number", @@ -3736,7 +3720,7 @@ "action": "", "plotLabel": "DDRs", "isPostResponseHandler": true, - "postAggregationTheory" : "", + "postAggregationTheory": "", "aggregationPaths": [ "Pending from 0 to 3 days", "Pending from 3 to 7 days", @@ -3745,16 +3729,19 @@ ], "computedFields": [ { - "postAggregationTheory" : "", + "postAggregationTheory": "", "actionName": "AdditiveComputedField", - "fields" : [ "Pending from 0 to 3 days", "Pending from 3 to 7 days", "Pending from 7 to 15 days", "Pending more than 15 days"], - "newField" : "Total Pending", + "fields": [ + "Pending from 0 to 3 days", + "Pending from 3 to 7 days", + "Pending from 7 to 15 days", + "Pending more than 15 days" + ], + "newField": "Total Pending", "_comments": "fields are field names picked from its aggregation query to use post aggregation newField value with given new field name " } ], - - "insight": { - }, + "insight": {}, "_comment": "" }, "wsConnectionAgeingUlb": { @@ -3771,7 +3758,10 @@ "isMdmsEnabled": false, "translateTenantCode": true, "filterKeys": [ - {"key": "tenantId", "column": "ULB"} + { + "key": "tenantId", + "column": "ULB" + } ], "chartType": "xtable", "valueType": "number", @@ -3779,26 +3769,28 @@ "action": "", "plotLabel": "ULB", "isPostResponseHandler": true, - "postAggregationTheory" : "", + "postAggregationTheory": "", "aggregationPaths": [ "Pending from 0 to 3 days", "Pending from 3 to 7 days", "Pending from 7 to 15 days", "Pending more than 15 days" - ], "computedFields": [ { - "postAggregationTheory" : "", + "postAggregationTheory": "", "actionName": "AdditiveComputedField", - "fields" : [ "Pending from 0 to 3 days", "Pending from 3 to 7 days", "Pending from 7 to 15 days", "Pending more than 15 days"], - "newField" : "Total Pending", + "fields": [ + "Pending from 0 to 3 days", + "Pending from 3 to 7 days", + "Pending from 7 to 15 days", + "Pending more than 15 days" + ], + "newField": "Total Pending", "_comments": "fields are field names picked from its aggregation query to use post aggregation newField value with given new field name " } ], - - "insight": { - }, + "insight": {}, "_comment": "" }, "wsConnectionAgeingWard": { @@ -3815,7 +3807,10 @@ "isMdmsEnabled": false, "translateTenantCode": true, "filterKeys": [ - {"key": "tenantId", "column": "Ward"} + { + "key": "tenantId", + "column": "Ward" + } ], "chartType": "xtable", "valueType": "number", @@ -3823,27 +3818,28 @@ "action": "", "plotLabel": "Ward", "isPostResponseHandler": true, - "postAggregationTheory" : "", + "postAggregationTheory": "", "aggregationPaths": [ "Pending from 0 to 3 days", "Pending from 3 to 7 days", "Pending from 7 to 15 days", "Pending more than 15 days" - ], "computedFields": [ { - "postAggregationTheory" : "", + "postAggregationTheory": "", "actionName": "AdditiveComputedField", - "fields" : [ "Pending from 0 to 3 days", "Pending from 3 to 7 days", "Pending from 7 to 15 days", "Pending more than 15 days"], - "newField" : "Total Pending", + "fields": [ + "Pending from 0 to 3 days", + "Pending from 3 to 7 days", + "Pending from 7 to 15 days", + "Pending more than 15 days" + ], + "newField": "Total Pending", "_comments": "fields are field names picked from its aggregation query to use post aggregation newField value with given new field name " } ], - - "insight": { - }, + "insight": {}, "_comment": "" } - } From e1f5bf96b89ca5ee911b62c435a034668b39f5e3 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Wed, 17 Mar 2021 11:22:34 +0530 Subject: [PATCH 0574/1242] added configs for payment mode chart --- .../dashboard-analytics/ChartApiConfig.json | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index b61ba89d..bd6b6d3b 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -539,6 +539,28 @@ }, "collectionByUsageType": { "chartName": "DSS_PT_COLLECTION_BY_USAGE_TYPE", + "queries": [ + { + "module": "COMMON", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Usage Type\":{\"terms\":{\"field\":\"domainObject.usageCategory.keyword\",\"size\":200}}}}}}" + } + ], + "chartType": "pie", + "valueType": "amount", + "action": "", + "documentType": "_doc", + "drillChart": "none", + "aggregationPaths": [ + "Usage Type" + ], + "insight": {}, + "_comment": " collection/amount per usage type" + }, + "collectionByPaymentMode": { + "chartName": "DSS_PT_COLLECTION_BY_PAYMENT_MODE", "queries": [ { "module": "COMMON", From 4dfa8736fbe92222f7e23519de7156cb6dcdb8e4 Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov <61416590+mahammadnizam-wt-eGov@users.noreply.github.com> Date: Thu, 18 Mar 2021 16:06:54 +0530 Subject: [PATCH 0575/1242] updated tl index type to general --- configs/egov-indexer/rainmaker-tl-indexer.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/egov-indexer/rainmaker-tl-indexer.yml b/configs/egov-indexer/rainmaker-tl-indexer.yml index f8b21ab6..8a2ff674 100644 --- a/configs/egov-indexer/rainmaker-tl-indexer.yml +++ b/configs/egov-indexer/rainmaker-tl-indexer.yml @@ -6,7 +6,7 @@ ServiceMaps: configKey: INDEX indexes: - name: tlindex-v1 - type: licenses + type: general id: $.id, $.tenantId isBulk: true timeStampField: $.auditDetails.createdTime @@ -46,7 +46,7 @@ ServiceMaps: configKey: INDEX indexes: - name: tlindex-v1 - type: licenses + type: general id: $.id, $.tenantId isBulk: true timeStampField: $.auditDetails.createdTime @@ -86,7 +86,7 @@ ServiceMaps: configKey: LEGACYINDEX indexes: - name: tlindex-v1 - type: licenses + type: general id: $.id, $.tenantId isBulk: true timeStampField: $.auditDetails.createdTime From 8acd9e400b3303e8c6c8e9ed09f0a941d54c836e Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov <61416590+mahammadnizam-wt-eGov@users.noreply.github.com> Date: Thu, 18 Mar 2021 16:30:44 +0530 Subject: [PATCH 0576/1242] Updated tl index type to licenses --- configs/egov-indexer/rainmaker-tl-indexer.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/egov-indexer/rainmaker-tl-indexer.yml b/configs/egov-indexer/rainmaker-tl-indexer.yml index 8a2ff674..f8b21ab6 100644 --- a/configs/egov-indexer/rainmaker-tl-indexer.yml +++ b/configs/egov-indexer/rainmaker-tl-indexer.yml @@ -6,7 +6,7 @@ ServiceMaps: configKey: INDEX indexes: - name: tlindex-v1 - type: general + type: licenses id: $.id, $.tenantId isBulk: true timeStampField: $.auditDetails.createdTime @@ -46,7 +46,7 @@ ServiceMaps: configKey: INDEX indexes: - name: tlindex-v1 - type: general + type: licenses id: $.id, $.tenantId isBulk: true timeStampField: $.auditDetails.createdTime @@ -86,7 +86,7 @@ ServiceMaps: configKey: LEGACYINDEX indexes: - name: tlindex-v1 - type: general + type: licenses id: $.id, $.tenantId isBulk: true timeStampField: $.auditDetails.createdTime From 15bab80b7ab99dbe9cc1edd49213fd708b698bf6 Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov <61416590+mahammadnizam-wt-eGov@users.noreply.github.com> Date: Thu, 18 Mar 2021 16:43:33 +0530 Subject: [PATCH 0577/1242] Update rainmaker-tl-indexer.yml --- configs/egov-indexer/rainmaker-tl-indexer.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/egov-indexer/rainmaker-tl-indexer.yml b/configs/egov-indexer/rainmaker-tl-indexer.yml index f8b21ab6..8a2ff674 100644 --- a/configs/egov-indexer/rainmaker-tl-indexer.yml +++ b/configs/egov-indexer/rainmaker-tl-indexer.yml @@ -6,7 +6,7 @@ ServiceMaps: configKey: INDEX indexes: - name: tlindex-v1 - type: licenses + type: general id: $.id, $.tenantId isBulk: true timeStampField: $.auditDetails.createdTime @@ -46,7 +46,7 @@ ServiceMaps: configKey: INDEX indexes: - name: tlindex-v1 - type: licenses + type: general id: $.id, $.tenantId isBulk: true timeStampField: $.auditDetails.createdTime @@ -86,7 +86,7 @@ ServiceMaps: configKey: LEGACYINDEX indexes: - name: tlindex-v1 - type: licenses + type: general id: $.id, $.tenantId isBulk: true timeStampField: $.auditDetails.createdTime From 1e083ad1b6b3f8aff450653cd95d9f920fb1352b Mon Sep 17 00:00:00 2001 From: Rafeek Date: Wed, 7 Apr 2021 19:22:17 +0530 Subject: [PATCH 0578/1242] PI-1437:Digit 2.2 changes --- configs/egov-persister/hrms-employee-persister.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/configs/egov-persister/hrms-employee-persister.yml b/configs/egov-persister/hrms-employee-persister.yml index 74dbd194..e7856e12 100644 --- a/configs/egov-persister/hrms-employee-persister.yml +++ b/configs/egov-persister/hrms-employee-persister.yml @@ -7,7 +7,7 @@ serviceMaps: fromTopic: save-hrms-employee isTransaction: true queryMaps: - - query: INSERT INTO eg_hrms_employee(tenantid, id, uuid, code, dateOfAppointment, employeestatus, employeetype, active, createdby, createddate, lastmodifiedby, lastModifiedDate) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + - query: INSERT INTO eg_hrms_employee(tenantid, id, uuid, code, dateOfAppointment, employeestatus, employeetype, active, createdby, createddate, lastmodifiedby, lastModifiedDate,reactivateemployee) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?); basePath: Employees.* jsonMaps: @@ -37,6 +37,7 @@ serviceMaps: - jsonPath: $.Employees.*.auditDetails.lastModifiedDate + - jsonPath: $.Employees.*.reActivateEmployee - query: INSERT INTO eg_hrms_assignment(tenantid, uuid, position, department, designation, fromdate, todate, govtordernumber, reportingto, isHOD, iscurrentassignment, employeeid, createdby, createddate, lastmodifiedby, lastModifiedDate) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); @@ -247,7 +248,7 @@ serviceMaps: - jsonPath: $.Employees.*.uuid - - query: INSERT INTO eg_hrms_employee(tenantid, id, uuid, code, dateOfAppointment, employeestatus, employeetype, active, createdby, createddate, lastmodifiedby, lastModifiedDate) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + - query: INSERT INTO eg_hrms_employee(tenantid, id, uuid, code, dateOfAppointment, employeestatus, employeetype, active, createdby, createddate, lastmodifiedby, lastModifiedDate,reactivateemployee) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); basePath: Employees.* jsonMaps: @@ -277,6 +278,8 @@ serviceMaps: - jsonPath: $.Employees.*.auditDetails.lastModifiedDate + - jsonPath: $.Employees.*.reActivateEmployee + - query: INSERT INTO eg_hrms_assignment(tenantid, uuid, position, department, designation, fromdate, todate, govtordernumber, reportingto, isHOD, iscurrentassignment, employeeid, createdby, createddate, lastmodifiedby, lastModifiedDate) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); From 9d8d2f59e6afcc435ad9d5e6995216bfd2449398 Mon Sep 17 00:00:00 2001 From: egovmis Date: Sat, 10 Apr 2021 19:13:13 +0530 Subject: [PATCH 0579/1242] changes colection api url --- configs/pdf-service/data-config/ptmutationcertificate.json | 2 +- configs/pdf-service/data-config/tlcertificate.json | 2 +- configs/pdf-service/data-config/tlrenewalcertificate.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/pdf-service/data-config/ptmutationcertificate.json b/configs/pdf-service/data-config/ptmutationcertificate.json index 42326bdc..7f9f3af2 100644 --- a/configs/pdf-service/data-config/ptmutationcertificate.json +++ b/configs/pdf-service/data-config/ptmutationcertificate.json @@ -341,7 +341,7 @@ ] }, { - "path": "http://collection-services:8080/collection-services/payments/_search", + "path": "http://collection-services:8080/collection-services/payments/PT/_search", "queryParam": "tenantId=$.tenantId,consumerCodes=$.acknowldgementNumber,businessServices=PT.MUTATION", "apiRequest": null, "responseMapping":[ diff --git a/configs/pdf-service/data-config/tlcertificate.json b/configs/pdf-service/data-config/tlcertificate.json index f53de215..fb3170b5 100644 --- a/configs/pdf-service/data-config/tlcertificate.json +++ b/configs/pdf-service/data-config/tlcertificate.json @@ -668,7 +668,7 @@ ] }, { - "path": "http://collection-services:8080/collection-services/payments/_search", + "path": "http://collection-services:8080/collection-services/payments/TL/_search", "queryParam": "tenantId=$.tenantId,consumerCodes=$.applicationNumber,businessServices=TL", "apiRequest": null, "responseMapping":[ diff --git a/configs/pdf-service/data-config/tlrenewalcertificate.json b/configs/pdf-service/data-config/tlrenewalcertificate.json index 2cd370ed..92f21289 100644 --- a/configs/pdf-service/data-config/tlrenewalcertificate.json +++ b/configs/pdf-service/data-config/tlrenewalcertificate.json @@ -666,7 +666,7 @@ ] }, { - "path": "http://collection-services:8080/collection-services/payments/_search", + "path": "http://collection-services:8080/collection-services/payments/TL/_search", "queryParam": "tenantId=$.tenantId,consumerCodes=$.applicationNumber,businessServices=TL", "apiRequest": null, "responseMapping":[ From 3a264ae51c5fe00c288f1e03808218417a8ffee6 Mon Sep 17 00:00:00 2001 From: egovmis Date: Sat, 10 Apr 2021 19:24:51 +0530 Subject: [PATCH 0580/1242] PI-9384 added renewal penalty on receipt --- configs/pdf-service/data-config/tradelicense-receipt.json | 6 ++++++ configs/pdf-service/format-config/tradelicense-receipt.json | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/configs/pdf-service/data-config/tradelicense-receipt.json b/configs/pdf-service/data-config/tradelicense-receipt.json index 87903670..adfd3449 100644 --- a/configs/pdf-service/data-config/tradelicense-receipt.json +++ b/configs/pdf-service/data-config/tradelicense-receipt.json @@ -93,6 +93,12 @@ "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'TL_TAX')].amount" } }, + { + "variable": "renewalPenalty", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'TL_RENEWAL_PENALTY')].amount" + } + }, { "variable": "adhocRebate", "value": { diff --git a/configs/pdf-service/format-config/tradelicense-receipt.json b/configs/pdf-service/format-config/tradelicense-receipt.json index 104ad5d4..2554c088 100644 --- a/configs/pdf-service/format-config/tradelicense-receipt.json +++ b/configs/pdf-service/format-config/tradelicense-receipt.json @@ -457,7 +457,7 @@ "style": "receipt-table" }, { - "text": "Trade License Fee", + "text": "Trade License Fee, Renewal Penalty", "border": [ false, false, @@ -467,7 +467,7 @@ "style": "receipt-table-value" }, { - "text": "₹ {{tradeFee}}", + "text": "₹ {{tradeFee}}, ₹ {{renewalPenalty}}", "border": [ false, false, From 86aaf376e536507299e8a2c70fff73350f477f3d Mon Sep 17 00:00:00 2001 From: Rafeek Date: Mon, 19 Apr 2021 16:19:28 +0530 Subject: [PATCH 0581/1242] PI-1489:WnS custom config changes --- .../sewerage-bill-scheduler.yml | 33 ++ configs/egov-persister/sewerage-persist.yml | 290 ++++++++++++++--- .../egov-persister/water-bill-scheduler.yml | 33 ++ configs/egov-persister/water-meter.yml | 14 +- configs/egov-persister/water-persist.yml | 307 +++++++++++++++--- 5 files changed, 572 insertions(+), 105 deletions(-) create mode 100644 configs/egov-persister/sewerage-bill-scheduler.yml create mode 100644 configs/egov-persister/water-bill-scheduler.yml diff --git a/configs/egov-persister/sewerage-bill-scheduler.yml b/configs/egov-persister/sewerage-bill-scheduler.yml new file mode 100644 index 00000000..dc4d5209 --- /dev/null +++ b/configs/egov-persister/sewerage-bill-scheduler.yml @@ -0,0 +1,33 @@ +serviceMaps: + serviceName: Bill Generate Scheduler Service + mappings: + - version: 1.0 + name: BillGenerateScheduler + description: capture bill generation details for particular sewerage connection number + fromTopic: save-sw-bill-scheduler + isTransaction: true + queryMaps: + - query: INSERT INTO eg_sw_scheduler (id, tenantid, transactiontype,locality,billingcyclestartdate,billingcycleenddate,status, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?,?,?,?,?); + basePath: $.billScheduler + jsonMaps: + - jsonPath: $.billScheduler.id + + - jsonPath: $.billScheduler.tenantId + + - jsonPath: $.billScheduler.transactionType + + - jsonPath: $.billScheduler.locality + + - jsonPath: $.billScheduler.billingcycleStartdate + + - jsonPath: $.billScheduler.billingcycleEnddate + + - jsonPath: $.billScheduler.status + + - jsonPath: $.billScheduler.auditDetails.createdBy + + - jsonPath: $.billScheduler.auditDetails.lastModifiedBy + + - jsonPath: $.billScheduler.auditDetails.createdTime + + - jsonPath: $.billScheduler.auditDetails.lastModifiedTime \ No newline at end of file diff --git a/configs/egov-persister/sewerage-persist.yml b/configs/egov-persister/sewerage-persist.yml index 1cab6be3..8508c5b0 100644 --- a/configs/egov-persister/sewerage-persist.yml +++ b/configs/egov-persister/sewerage-persist.yml @@ -6,18 +6,18 @@ serviceMaps: description: create ConnectionDetails in connection and eg_sw_service fromTopic: save-sw-connection isTransaction: true - queryMaps: - - query: INSERT INTO eg_sw_connection (id, tenantid, property_id, applicationno, applicationstatus, status, connectionno, oldconnectionno,roadcuttingarea,action,roadtype, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?,?,?,?,?,?,?); + queryMaps: + - query: INSERT INTO eg_sw_connection (id, tenantid, property_id, applicationno, applicationstatus, status, connectionno, oldconnectionno,roadcuttingarea,action,roadtype, createdby, lastmodifiedby, createdtime, lastmodifiedtime, applicationtype, dateEffectiveFrom, locality, isoldapplication, additionaldetails) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?,?,?,?,?,?,?,?,?); basePath: $.SewerageConnection jsonMaps: - - jsonPath: $.SewerageConnection.id - + - jsonPath: $.SewerageConnection.id + - jsonPath: $.SewerageConnection.tenantId - + - jsonPath: $.SewerageConnection.propertyId - jsonPath: $.SewerageConnection.applicationNo - + - jsonPath: $.SewerageConnection.applicationStatus - jsonPath: $.SewerageConnection.status @@ -30,8 +30,8 @@ serviceMaps: - jsonPath: $.SewerageConnection.processInstance.action - - jsonPath: $.SewerageConnection.roadType - + - jsonPath: $.SewerageConnection.roadType + - jsonPath: $.SewerageConnection.auditDetails.createdBy - jsonPath: $.SewerageConnection.auditDetails.lastModifiedBy @@ -39,7 +39,20 @@ serviceMaps: - jsonPath: $.SewerageConnection.auditDetails.createdTime - jsonPath: $.SewerageConnection.auditDetails.lastModifiedTime + + - jsonPath: $.SewerageConnection.applicationType + + - jsonPath: $.SewerageConnection.dateEffectiveFrom + + - jsonPath: $.SewerageConnection.additionalDetails.locality + + - jsonPath: $.SewerageConnection.oldApplication + - jsonPath: $.SewerageConnection.additionalDetails + type: JSON + dbType: JSONB + + - query: INSERT INTO eg_sw_service(connection_id,connectionExecutionDate,noOfWaterClosets,noOfToilets,connectiontype,proposedWaterClosets,proposedToilets, appCreatedDate, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES(?,?,?,?,?,?,?,?,?,?,?,?); basePath: $.SewerageConnection jsonMaps: @@ -49,17 +62,17 @@ serviceMaps: - jsonPath: $.SewerageConnection.connectionExecutionDate - jsonPath: $.SewerageConnection.noOfWaterClosets - + - jsonPath: $.SewerageConnection.noOfToilets - + - jsonPath: $.SewerageConnection.connectionType - + - jsonPath: $.SewerageConnection.proposedWaterClosets - + - jsonPath: $.SewerageConnection.proposedToilets - + - jsonPath: $.SewerageConnection.additionalDetails.appCreatedDate - + - jsonPath: $.SewerageConnection.auditDetails.createdBy - jsonPath: $.SewerageConnection.auditDetails.lastModifiedBy @@ -67,18 +80,85 @@ serviceMaps: - jsonPath: $.SewerageConnection.auditDetails.createdTime - jsonPath: $.SewerageConnection.auditDetails.lastModifiedTime + + - query: INSERT INTO eg_sw_connectionholder(tenantid, connectionid, userid, status, isprimaryholder, connectionholdertype, holdershippercentage, relationship, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: $.SewerageConnection.connectionHolders.* + jsonMaps: + + - jsonPath: $.SewerageConnection.tenantId + + - jsonPath: $.SewerageConnection.id + + - jsonPath: $.SewerageConnection.connectionHolders.*.uuid + + - jsonPath: $.SewerageConnection.connectionHolders.*.status + + - jsonPath: $.SewerageConnection.connectionHolders.*.isPrimaryOwner + + - jsonPath: $.SewerageConnection.connectionHolders.*.ownerType + + - jsonPath: $.SewerageConnection.connectionHolders.*.ownerShipPercentage + + - jsonPath: $.SewerageConnection.connectionHolders.*.relationship + + - jsonPath: $.SewerageConnection.auditDetails.createdBy + + - jsonPath: $.SewerageConnection.auditDetails.createdTime + + - jsonPath: $.SewerageConnection.auditDetails.lastModifiedBy + + - jsonPath: $.SewerageConnection.auditDetails.lastModifiedTime + + - query: INSERT INTO eg_sw_roadcuttinginfo(id, tenantId, swid, active, roadtype, roadcuttingarea, createdBy, lastModifiedBy, createdTime, lastModifiedTime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET active = ?, roadtype =?, roadcuttingarea =?,lastmodifiedby =?, lastmodifiedtime =?; + basePath: $.SewerageConnection.roadCuttingInfo.* + jsonMaps: + + - jsonPath: $.SewerageConnection.roadCuttingInfo.*.id + + - jsonPath: $.SewerageConnection.tenantId + + - jsonPath: $.SewerageConnection.id + + - jsonPath: $.SewerageConnection.roadCuttingInfo.*.status + + - jsonPath: $.SewerageConnection.roadCuttingInfo.*.roadType + + - jsonPath: $.SewerageConnection.roadCuttingInfo.*.roadCuttingArea + - jsonPath: $.SewerageConnection.roadCuttingInfo.*.auditDetails.createdBy + + - jsonPath: $.SewerageConnection.roadCuttingInfo.*.auditDetails.lastModifiedBy + + - jsonPath: $.SewerageConnection.roadCuttingInfo.*.auditDetails.createdTime + + - jsonPath: $.SewerageConnection.roadCuttingInfo.*.auditDetails.lastModifiedTime + + - jsonPath: $.SewerageConnection.roadCuttingInfo.*.status + + - jsonPath: $.SewerageConnection.roadCuttingInfo.*.roadType + + - jsonPath: $.SewerageConnection.roadCuttingInfo.*.roadCuttingArea + + - jsonPath: $.SewerageConnection.roadCuttingInfo.*.auditDetails.lastModifiedBy + + - jsonPath: $.SewerageConnection.roadCuttingInfo.*.auditDetails.lastModifiedTime - version: 1.0 name: SewerageConnection description: update ConnectionDetails in connection and eg_sw_service fromTopic: update-sw-connection isTransaction: true - queryMaps: - - query: UPDATE eg_sw_connection SET applicationstatus=?, status=?, connectionno=?, oldconnectionno=?, action=?, roadCuttingArea=?, roadType=?, adhocpenalty=?, adhocrebate=?, adhocpenaltyreason=?, adhocpenaltycomment=?, adhocrebatereason=?, adhocrebatecomment=?, lastmodifiedby=?, lastmodifiedtime=? WHERE id=?; + queryMaps: + + - query: INSERT INTO eg_sw_connection_audit SELECT * FROM eg_sw_connection WHERE id = ?; basePath: $.SewerageConnection jsonMaps: + - jsonPath: $.SewerageConnection.id + - query: UPDATE eg_sw_connection SET applicationstatus=?, status=?, connectionno=?, oldconnectionno=?, action=?, roadCuttingArea=?, roadType=?, adhocpenalty=?, adhocrebate=?, adhocpenaltyreason=?, adhocpenaltycomment=?, adhocrebatereason=?, adhocrebatecomment=?, lastmodifiedby=?, lastmodifiedtime=?, dateEffectiveFrom=?, locality=?, isoldapplication=?, property_id=?, additionaldetails=? WHERE id=?; + basePath: $.SewerageConnection + jsonMaps: + - jsonPath: $.SewerageConnection.applicationStatus - jsonPath: $.SewerageConnection.status @@ -92,25 +172,42 @@ serviceMaps: - jsonPath: $.SewerageConnection.roadCuttingArea - jsonPath: $.SewerageConnection.roadType + + - jsonPath: $.SewerageConnection.additionalDetails.adhocPenalty - - jsonPath: $.SewerageConnection.additionalDetails.adhocPenalty - - - jsonPath: $.SewerageConnection.additionalDetails.adhocRebate - - - jsonPath: $.SewerageConnection.additionalDetails.adhocPenaltyReason + - jsonPath: $.SewerageConnection.additionalDetails.adhocRebate + + - jsonPath: $.SewerageConnection.additionalDetails.adhocPenaltyReason - jsonPath: $.SewerageConnection.additionalDetails.adhocPenaltyComment - - - jsonPath: $.SewerageConnection.additionalDetails.adhocRebateReason + + - jsonPath: $.SewerageConnection.additionalDetails.adhocRebateReason - jsonPath: $.SewerageConnection.additionalDetails.adhocRebateComment - + - jsonPath: $.SewerageConnection.auditDetails.lastModifiedBy - jsonPath: $.SewerageConnection.auditDetails.lastModifiedTime + + - jsonPath: $.SewerageConnection.dateEffectiveFrom - - jsonPath: $.SewerageConnection.id + - jsonPath: $.SewerageConnection.additionalDetails.locality + - jsonPath: $.SewerageConnection.oldApplication + + - jsonPath: $.SewerageConnection.propertyId + + - jsonPath: $.SewerageConnection.additionalDetails + type: JSON + dbType: JSONB + + - jsonPath: $.SewerageConnection.id + + - query: INSERT INTO eg_sw_service_audit SELECT * FROM eg_sw_service WHERE connection_id = ?; + basePath: $.SewerageConnection + jsonMaps: + - jsonPath: $.SewerageConnection.id + - query: UPDATE eg_sw_service SET connectionexecutiondate=?, noOfWaterClosets=?, noOfToilets=?, connectiontype=?, proposedWaterClosets=?, proposedToilets=?, detailsprovidedby = ?, estimationfileStoreId = ?, sanctionfileStoreId = ?, estimationLetterDate = ?, lastmodifiedby=?, lastmodifiedtime=? WHERE connection_id=?; basePath: $.SewerageConnection jsonMaps: @@ -118,34 +215,34 @@ serviceMaps: - jsonPath: $.SewerageConnection.connectionExecutionDate - jsonPath: $.SewerageConnection.noOfWaterClosets - + - jsonPath: $.SewerageConnection.noOfToilets - + - jsonPath: $.SewerageConnection.connectionType - + - jsonPath: $.SewerageConnection.proposedWaterClosets - + - jsonPath: $.SewerageConnection.proposedToilets - - - jsonPath: $.SewerageConnection.additionalDetails.detailsProvidedBy - + + - jsonPath: $.SewerageConnection.additionalDetails.detailsProvidedBy + - jsonPath: $.SewerageConnection.additionalDetails.estimationFileStoreId - + - jsonPath: $.SewerageConnection.additionalDetails.sanctionFileStoreId - + - jsonPath: $.SewerageConnection.additionalDetails.estimationLetterDate - + - jsonPath: $.SewerageConnection.auditDetails.lastModifiedBy - jsonPath: $.SewerageConnection.auditDetails.lastModifiedTime - + - jsonPath: $.SewerageConnection.id - query: INSERT INTO eg_sw_applicationDocument(id, tenantId, documenttype, filestoreid, swid, active, createdBy, lastModifiedBy, createdTime, lastModifiedTime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET active = ?, documenttype =?, filestoreid =?,lastmodifiedby =?, lastmodifiedtime =?; basePath: $.SewerageConnection.documents.* jsonMaps: - + - jsonPath: $.SewerageConnection.documents.*.id - jsonPath: $.SewerageConnection.tenantId @@ -175,15 +272,15 @@ serviceMaps: - jsonPath: $.SewerageConnection.documents.*.auditDetails.lastModifiedBy - jsonPath: $.SewerageConnection.documents.*.auditDetails.lastModifiedTime - + - query: INSERT INTO eg_sw_plumberinfo(id,tenantId, name, licenseno, mobilenumber, gender, fatherorhusbandname, correspondenceaddress, relationship, createdBy, lastModifiedBy, createdTime, lastModifiedTime, swid) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET name =?, licenseno =?,mobilenumber =?, gender =?, fatherorhusbandname =?, correspondenceaddress =?, relationship=?,lastmodifiedby =?, lastmodifiedtime =?; basePath: $.SewerageConnection.plumberInfo.* jsonMaps: - + - jsonPath: $.SewerageConnection.plumberInfo.*.id - + - jsonPath: $.SewerageConnection.tenantId - + - jsonPath: $.SewerageConnection.plumberInfo.*.name - jsonPath: $.SewerageConnection.plumberInfo.*.licenseNo @@ -197,7 +294,7 @@ serviceMaps: - jsonPath: $.SewerageConnection.plumberInfo.*.correspondenceAddress - jsonPath: $.SewerageConnection.plumberInfo.*.relationship - + - jsonPath: $.SewerageConnection.plumberInfo.*.auditDetails.createdBy - jsonPath: $.SewerageConnection.plumberInfo.*.auditDetails.lastModifiedBy @@ -205,9 +302,9 @@ serviceMaps: - jsonPath: $.SewerageConnection.plumberInfo.*.auditDetails.createdTime - jsonPath: $.SewerageConnection.plumberInfo.*.auditDetails.lastModifiedTime - - - jsonPath: $.SewerageConnection.id - + + - jsonPath: $.SewerageConnection.id + - jsonPath: $.SewerageConnection.plumberInfo.*.name - jsonPath: $.SewerageConnection.plumberInfo.*.licenseNo @@ -221,12 +318,90 @@ serviceMaps: - jsonPath: $.SewerageConnection.plumberInfo.*.correspondenceAddress - jsonPath: $.SewerageConnection.plumberInfo.*.relationship - + - jsonPath: $.SewerageConnection.plumberInfo.*.auditDetails.lastModifiedBy - jsonPath: $.SewerageConnection.plumberInfo.*.auditDetails.lastModifiedTime + + - query: INSERT INTO eg_sw_connectionholder(tenantid, connectionid, userid, status, isprimaryholder, connectionholdertype, holdershippercentage, relationship, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (connectionid) DO UPDATE SET tenantid =?, userid =?,status =?, isprimaryholder =?, connectionholdertype =?, holdershippercentage =?, relationship=?, lastmodifiedby =?, lastmodifiedtime =?; + basePath: $.SewerageConnection.connectionHolders.* + jsonMaps: + + - jsonPath: $.SewerageConnection.tenantId + + - jsonPath: $.SewerageConnection.id + + - jsonPath: $.SewerageConnection.connectionHolders.*.uuid + + - jsonPath: $.SewerageConnection.connectionHolders.*.status + + - jsonPath: $.SewerageConnection.connectionHolders.*.isPrimaryOwner + + - jsonPath: $.SewerageConnection.connectionHolders.*.ownerType + + - jsonPath: $.SewerageConnection.connectionHolders.*.ownerShipPercentage + + - jsonPath: $.SewerageConnection.connectionHolders.*.relationship + + - jsonPath: $.SewerageConnection.auditDetails.createdBy + + - jsonPath: $.SewerageConnection.auditDetails.createdTime + + - jsonPath: $.SewerageConnection.auditDetails.lastModifiedBy + + - jsonPath: $.SewerageConnection.auditDetails.lastModifiedTime + + - jsonPath: $.SewerageConnection.tenantId + - jsonPath: $.SewerageConnection.connectionHolders.*.uuid + - jsonPath: $.SewerageConnection.connectionHolders.*.status + + - jsonPath: $.SewerageConnection.connectionHolders.*.isPrimaryOwner + + - jsonPath: $.SewerageConnection.connectionHolders.*.ownerType + + - jsonPath: $.SewerageConnection.connectionHolders.*.ownerShipPercentage + + - jsonPath: $.SewerageConnection.connectionHolders.*.relationship + + - jsonPath: $.SewerageConnection.auditDetails.lastModifiedBy + + - jsonPath: $.SewerageConnection.auditDetails.lastModifiedTime + + - query: INSERT INTO eg_sw_roadcuttinginfo(id, tenantId, swid, active, roadtype, roadcuttingarea, createdBy, lastModifiedBy, createdTime, lastModifiedTime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET active = ?, roadtype =?, roadcuttingarea =?,lastmodifiedby =?, lastmodifiedtime =?; + basePath: $.SewerageConnection.roadCuttingInfo.* + jsonMaps: + + - jsonPath: $.SewerageConnection.roadCuttingInfo.*.id + + - jsonPath: $.SewerageConnection.tenantId + + - jsonPath: $.SewerageConnection.id + + - jsonPath: $.SewerageConnection.roadCuttingInfo.*.status + + - jsonPath: $.SewerageConnection.roadCuttingInfo.*.roadType + + - jsonPath: $.SewerageConnection.roadCuttingInfo.*.roadCuttingArea + + - jsonPath: $.SewerageConnection.roadCuttingInfo.*.auditDetails.createdBy + + - jsonPath: $.SewerageConnection.roadCuttingInfo.*.auditDetails.lastModifiedBy + + - jsonPath: $.SewerageConnection.roadCuttingInfo.*.auditDetails.createdTime + + - jsonPath: $.SewerageConnection.roadCuttingInfo.*.auditDetails.lastModifiedTime + + - jsonPath: $.SewerageConnection.roadCuttingInfo.*.status + + - jsonPath: $.SewerageConnection.roadCuttingInfo.*.roadType + + - jsonPath: $.SewerageConnection.roadCuttingInfo.*.roadCuttingArea + + - jsonPath: $.SewerageConnection.roadCuttingInfo.*.auditDetails.lastModifiedBy + + - jsonPath: $.SewerageConnection.roadCuttingInfo.*.auditDetails.lastModifiedTime - version: 1.0 name: SewerageConnection @@ -234,10 +409,15 @@ serviceMaps: fromTopic: update-sw-workflow isTransaction: true queryMaps: + - query: INSERT INTO eg_sw_connection_audit SELECT * FROM eg_sw_connection WHERE id = ?; + basePath: $.SewerageConnection + jsonMaps: + - jsonPath: $.SewerageConnection.id + - query: UPDATE eg_sw_connection SET applicationstatus=?, status=?, connectionno=?, action=?, lastModifiedBy=?, lastModifiedTime=? WHERE id=?; basePath: $.SewerageConnection jsonMaps: - + - jsonPath: $.SewerageConnection.applicationStatus - jsonPath: $.SewerageConnection.status @@ -245,19 +425,25 @@ serviceMaps: - jsonPath: $.SewerageConnection.connectionNo - jsonPath: $.SewerageConnection.processInstance.action - + - jsonPath: $.SewerageConnection.auditDetails.lastModifiedBy - jsonPath: $.SewerageConnection.auditDetails.lastModifiedTime - + - jsonPath: $.SewerageConnection.id - + - version: 1.0 name: SewerageConnection description: save filestore ids fromTopic: save-sw-filestoreids isTransaction: true - queryMaps: + queryMaps: + + - query: INSERT INTO eg_sw_service_audit SELECT * FROM eg_sw_service WHERE connection_id = ?; + basePath: $.SewerageConnection + jsonMaps: + - jsonPath: $.SewerageConnection.id + - query: UPDATE eg_sw_service SET estimationfileStoreId = ?, sanctionfileStoreId = ? WHERE connection_id=?; basePath: $.SewerageConnection jsonMaps: @@ -266,4 +452,4 @@ serviceMaps: - jsonPath: $.SewerageConnection.additionalDetails.sanctionFileStoreId - - jsonPath: $.SewerageConnection.id + - jsonPath: $.SewerageConnection.id \ No newline at end of file diff --git a/configs/egov-persister/water-bill-scheduler.yml b/configs/egov-persister/water-bill-scheduler.yml new file mode 100644 index 00000000..f3e299b4 --- /dev/null +++ b/configs/egov-persister/water-bill-scheduler.yml @@ -0,0 +1,33 @@ +serviceMaps: + serviceName: Bill Generate Scheduler Service + mappings: + - version: 1.0 + name: BillGenerateScheduler + description: capture bill generation details for particular connection number + fromTopic: save-ws-bill-scheduler + isTransaction: true + queryMaps: + - query: INSERT INTO eg_ws_scheduler (id, tenantid, transactiontype,locality,billingcyclestartdate,billingcycleenddate,status, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?,?,?,?,?); + basePath: $.billScheduler + jsonMaps: + - jsonPath: $.billScheduler.id + + - jsonPath: $.billScheduler.tenantId + + - jsonPath: $.billScheduler.transactionType + + - jsonPath: $.billScheduler.locality + + - jsonPath: $.billScheduler.billingcycleStartdate + + - jsonPath: $.billScheduler.billingcycleEnddate + + - jsonPath: $.billScheduler.status + + - jsonPath: $.billScheduler.auditDetails.createdBy + + - jsonPath: $.billScheduler.auditDetails.lastModifiedBy + + - jsonPath: $.billScheduler.auditDetails.createdTime + + - jsonPath: $.billScheduler.auditDetails.lastModifiedTime \ No newline at end of file diff --git a/configs/egov-persister/water-meter.yml b/configs/egov-persister/water-meter.yml index 776e5703..495c25da 100644 --- a/configs/egov-persister/water-meter.yml +++ b/configs/egov-persister/water-meter.yml @@ -7,29 +7,31 @@ serviceMaps: fromTopic: save-ws-meter isTransaction: true queryMaps: - - query: INSERT INTO eg_ws_meterreading (id,connectionNo, billingPeriod, meterStatus, lastReading, lastReadingDate, currentReading, currentReadingDate, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?,?,?,?,?,?); + - query: INSERT INTO eg_ws_meterreading (id, tenantid, connectionNo, billingPeriod, meterStatus, lastReading, lastReadingDate, currentReading, currentReadingDate, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?,?,?,?,?,?, ?); basePath: $.meterReadings jsonMaps: - jsonPath: $.meterReadings.id - + + - jsonPath: $.meterReadings.tenantId + - jsonPath: $.meterReadings.connectionNo - jsonPath: $.meterReadings.billingPeriod - + - jsonPath: $.meterReadings.meterStatus - jsonPath: $.meterReadings.lastReading - + - jsonPath: $.meterReadings.lastReadingDate - jsonPath: $.meterReadings.currentReading - jsonPath: $.meterReadings.currentReadingDate - + - jsonPath: $.meterReadings.auditDetails.createdBy - jsonPath: $.meterReadings.auditDetails.lastModifiedBy - jsonPath: $.meterReadings.auditDetails.createdTime - - jsonPath: $.meterReadings.auditDetails.lastModifiedTime + - jsonPath: $.meterReadings.auditDetails.lastModifiedTime \ No newline at end of file diff --git a/configs/egov-persister/water-persist.yml b/configs/egov-persister/water-persist.yml index 10209cb4..d95437ff 100644 --- a/configs/egov-persister/water-persist.yml +++ b/configs/egov-persister/water-persist.yml @@ -6,18 +6,18 @@ serviceMaps: description: create ConnectionDetails in connection and water_service_connection fromTopic: save-ws-connection isTransaction: true - queryMaps: - - query: INSERT INTO eg_ws_connection (id, tenantid, property_id, applicationno, applicationstatus, status, connectionno, oldconnectionno,roadcuttingarea,action,roadtype, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?,?,?,?,?,?,?); + queryMaps: + - query: INSERT INTO eg_ws_connection (id, tenantid, property_id, applicationno, applicationstatus, status, connectionno, oldconnectionno,roadcuttingarea,action,roadtype, createdby, lastmodifiedby, createdtime, lastmodifiedtime, applicationtype, dateEffectiveFrom, locality, isoldapplication,additionaldetails) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?,?,?,?,?,?,?,?,?); basePath: $.WaterConnection jsonMaps: - - jsonPath: $.WaterConnection.id + - jsonPath: $.WaterConnection.id - jsonPath: $.WaterConnection.tenantId - + - jsonPath: $.WaterConnection.propertyId - jsonPath: $.WaterConnection.applicationNo - + - jsonPath: $.WaterConnection.applicationStatus - jsonPath: $.WaterConnection.status @@ -25,13 +25,13 @@ serviceMaps: - jsonPath: $.WaterConnection.connectionNo - jsonPath: $.WaterConnection.oldConnectionNo - + - jsonPath: $.WaterConnection.roadCuttingArea - jsonPath: $.WaterConnection.processInstance.action - jsonPath: $.WaterConnection.roadType - + - jsonPath: $.WaterConnection.auditDetails.createdBy - jsonPath: $.WaterConnection.auditDetails.lastModifiedBy @@ -39,45 +39,131 @@ serviceMaps: - jsonPath: $.WaterConnection.auditDetails.createdTime - jsonPath: $.WaterConnection.auditDetails.lastModifiedTime + + - jsonPath: $.WaterConnection.applicationType + + - jsonPath: $.WaterConnection.dateEffectiveFrom + + - jsonPath: $.WaterConnection.additionalDetails.locality + + - jsonPath: $.WaterConnection.oldApplication + - jsonPath: $.WaterConnection.additionalDetails + type: JSON + dbType: JSONB - - query: INSERT INTO eg_ws_service(connection_id,connectionCategory,connectionType,waterSource,meterId,meterInstallationDate,pipeSize,noOfTaps,connectionexecutiondate,proposedPipeSize,proposedTaps, appCreatedDate) VALUES(?,?,?,?,?,?,?,?,?,?,?, ?); + + - query: INSERT INTO eg_ws_service(connection_id,connectionCategory,connectionType,waterSource,meterId,meterInstallationDate,pipeSize,noOfTaps,connectionexecutiondate,proposedPipeSize,proposedTaps, appCreatedDate, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?); basePath: $.WaterConnection jsonMaps: - jsonPath: $.WaterConnection.id - jsonPath: $.WaterConnection.connectionCategory - + - jsonPath: $.WaterConnection.connectionType - + - jsonPath: $.WaterConnection.waterSource - + - jsonPath: $.WaterConnection.meterId - + - jsonPath: $.WaterConnection.meterInstallationDate - jsonPath: $.WaterConnection.pipeSize - jsonPath: $.WaterConnection.noOfTaps - + - jsonPath: $.WaterConnection.connectionExecutionDate - + - jsonPath: $.WaterConnection.proposedPipeSize - + - jsonPath: $.WaterConnection.proposedTaps - + - jsonPath: $.WaterConnection.additionalDetails.appCreatedDate + + - jsonPath: $.WaterConnection.auditDetails.createdBy + + - jsonPath: $.WaterConnection.auditDetails.lastModifiedBy + - jsonPath: $.WaterConnection.auditDetails.createdTime + + - jsonPath: $.WaterConnection.auditDetails.lastModifiedTime + + + - query: INSERT INTO eg_ws_connectionholder(tenantid, connectionid, userid, status, isprimaryholder, connectionholdertype, holdershippercentage, relationship, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: $.WaterConnection.connectionHolders.* + jsonMaps: + + - jsonPath: $.WaterConnection.tenantId + + - jsonPath: $.WaterConnection.id + + - jsonPath: $.WaterConnection.connectionHolders.*.uuid + + - jsonPath: $.WaterConnection.connectionHolders.*.status + + - jsonPath: $.WaterConnection.connectionHolders.*.isPrimaryOwner + - jsonPath: $.WaterConnection.connectionHolders.*.ownerType + - jsonPath: $.WaterConnection.connectionHolders.*.ownerShipPercentage + + - jsonPath: $.WaterConnection.connectionHolders.*.relationship + + - jsonPath: $.WaterConnection.auditDetails.createdBy + + - jsonPath: $.WaterConnection.auditDetails.createdTime + + - jsonPath: $.WaterConnection.auditDetails.lastModifiedBy + + - jsonPath: $.WaterConnection.auditDetails.lastModifiedTime + + - query: INSERT INTO eg_ws_roadcuttinginfo(id, tenantId, wsid, active, roadtype, roadcuttingarea, createdBy, lastModifiedBy, createdTime, lastModifiedTime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET active = ?, roadtype =?, roadcuttingarea =?,lastmodifiedby =?, lastmodifiedtime =?; + basePath: $.WaterConnection.roadCuttingInfo.* + jsonMaps: + + - jsonPath: $.WaterConnection.roadCuttingInfo.*.id + + - jsonPath: $.WaterConnection.tenantId + + - jsonPath: $.WaterConnection.id + + - jsonPath: $.WaterConnection.roadCuttingInfo.*.status + + - jsonPath: $.WaterConnection.roadCuttingInfo.*.roadType + + - jsonPath: $.WaterConnection.roadCuttingInfo.*.roadCuttingArea + + - jsonPath: $.WaterConnection.roadCuttingInfo.*.auditDetails.createdBy + + - jsonPath: $.WaterConnection.roadCuttingInfo.*.auditDetails.lastModifiedBy + + - jsonPath: $.WaterConnection.roadCuttingInfo.*.auditDetails.createdTime + + - jsonPath: $.WaterConnection.roadCuttingInfo.*.auditDetails.lastModifiedTime + + - jsonPath: $.WaterConnection.roadCuttingInfo.*.status + + - jsonPath: $.WaterConnection.roadCuttingInfo.*.roadType + + - jsonPath: $.WaterConnection.roadCuttingInfo.*.roadCuttingArea + + - jsonPath: $.WaterConnection.roadCuttingInfo.*.auditDetails.lastModifiedBy + + - jsonPath: $.WaterConnection.roadCuttingInfo.*.auditDetails.lastModifiedTime - version: 1.0 name: WaterConnection description: update ConnectionDetails in eg_ws_connection and eg_ws_service fromTopic: update-ws-connection isTransaction: true - queryMaps: - - query: UPDATE eg_ws_connection SET applicationstatus=?, status=?, connectionno=?, oldconnectionno=?, action=?, roadCuttingArea=?, roadType=?, adhocpenalty=?, adhocrebate=?, adhocpenaltyreason=?, adhocpenaltycomment=?, adhocrebatereason=?, adhocrebatecomment=?, lastModifiedBy=?, lastModifiedTime=? WHERE id=?; + queryMaps: + + - query: INSERT INTO eg_ws_connection_audit SELECT * FROM eg_ws_connection WHERE id = ?; + basePath: $.WaterConnection + jsonMaps: + - jsonPath: $.WaterConnection.id + + - query: UPDATE eg_ws_connection SET applicationstatus=?, status=?, connectionno=?, oldconnectionno=?, action=?, roadCuttingArea=?, roadType=?, adhocpenalty=?, adhocrebate=?, adhocpenaltyreason=?, adhocpenaltycomment=?, adhocrebatereason=?, adhocrebatecomment=?, lastModifiedBy=?, lastModifiedTime=?, dateEffectiveFrom=?, locality=?, isoldapplication=?, property_id=?, additionaldetails=? WHERE id=?; basePath: $.WaterConnection jsonMaps: @@ -94,63 +180,86 @@ serviceMaps: - jsonPath: $.WaterConnection.roadCuttingArea - jsonPath: $.WaterConnection.roadType - - - jsonPath: $.WaterConnection.additionalDetails.adhocPenalty + + - jsonPath: $.WaterConnection.additionalDetails.adhocPenalty - jsonPath: $.WaterConnection.additionalDetails.adhocRebate - - - jsonPath: $.WaterConnection.additionalDetails.adhocPenaltyReason + + - jsonPath: $.WaterConnection.additionalDetails.adhocPenaltyReason - jsonPath: $.WaterConnection.additionalDetails.adhocPenaltyComment - - - jsonPath: $.WaterConnection.additionalDetails.adhocRebateReason + + - jsonPath: $.WaterConnection.additionalDetails.adhocRebateReason - jsonPath: $.WaterConnection.additionalDetails.adhocRebateComment - + - jsonPath: $.WaterConnection.auditDetails.lastModifiedBy - jsonPath: $.WaterConnection.auditDetails.lastModifiedTime + + - jsonPath: $.WaterConnection.dateEffectiveFrom - - jsonPath: $.WaterConnection.id + - jsonPath: $.WaterConnection.additionalDetails.locality + + - jsonPath: $.WaterConnection.oldApplication - - query: UPDATE eg_ws_service SET connectionCategory=?,connectionType=?,waterSource=?,meterId=?,meterInstallationDate=?,pipeSize=?,noOfTaps=?,proposedPipeSize=?,proposedTaps=?, initialmeterreading = ?, connectionexecutiondate = ?, detailsprovidedby = ?, estimationfileStoreId = ?, sanctionfileStoreId = ? WHERE connection_id=?; + - jsonPath: $.WaterConnection.propertyId + + - jsonPath: $.WaterConnection.additionalDetails + type: JSON + dbType: JSONB + + - jsonPath: $.WaterConnection.id + + - query: INSERT INTO eg_ws_service_audit SELECT * FROM eg_ws_service WHERE connection_id = ?; basePath: $.WaterConnection jsonMaps: + - jsonPath: $.WaterConnection.id + - query: UPDATE eg_ws_service SET connectionCategory=?,connectionType=?,waterSource=?,meterId=?,meterInstallationDate=?,pipeSize=?,noOfTaps=?,proposedPipeSize=?,proposedTaps=?, initialmeterreading = ?, connectionexecutiondate = ?, detailsprovidedby = ?, estimationfileStoreId = ?, sanctionfileStoreId = ?, estimationLetterDate = ?, lastModifiedBy=?, lastModifiedTime=? WHERE connection_id=?; + basePath: $.WaterConnection + jsonMaps: + - jsonPath: $.WaterConnection.connectionCategory - + - jsonPath: $.WaterConnection.connectionType - + - jsonPath: $.WaterConnection.waterSource - + - jsonPath: $.WaterConnection.meterId - + - jsonPath: $.WaterConnection.meterInstallationDate - jsonPath: $.WaterConnection.pipeSize - jsonPath: $.WaterConnection.noOfTaps - + - jsonPath: $.WaterConnection.proposedPipeSize - + - jsonPath: $.WaterConnection.proposedTaps - + - jsonPath: $.WaterConnection.additionalDetails.initialMeterReading - + - jsonPath: $.WaterConnection.connectionExecutionDate - + - jsonPath: $.WaterConnection.additionalDetails.detailsProvidedBy - + - jsonPath: $.WaterConnection.additionalDetails.estimationFileStoreId - jsonPath: $.WaterConnection.additionalDetails.sanctionFileStoreId + + - jsonPath: $.WaterConnection.additionalDetails.estimationLetterDate + + - jsonPath: $.WaterConnection.auditDetails.lastModifiedBy + + - jsonPath: $.WaterConnection.auditDetails.lastModifiedTime - jsonPath: $.WaterConnection.id - query: INSERT INTO eg_ws_applicationDocument(id, tenantId, documenttype, filestoreid, wsid, active, createdBy, lastModifiedBy, createdTime, lastModifiedTime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET active = ?, documenttype =?, filestoreid =?,lastmodifiedby =?, lastmodifiedtime =?; basePath: $.WaterConnection.documents.* jsonMaps: - + - jsonPath: $.WaterConnection.documents.*.id - jsonPath: $.WaterConnection.tenantId @@ -181,11 +290,13 @@ serviceMaps: - jsonPath: $.WaterConnection.documents.*.auditDetails.lastModifiedTime - - query: INSERT INTO eg_ws_plumberinfo(id, name, licenseno, mobilenumber, gender, fatherorhusbandname, correspondenceaddress, relationship, wsid) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET name =?, licenseno =?,mobilenumber =?, gender =?, fatherorhusbandname =?, correspondenceaddress =?, relationship=?; + - query: INSERT INTO eg_ws_plumberinfo(id, tenantId, name, licenseno, mobilenumber, gender, fatherorhusbandname, correspondenceaddress, relationship, createdBy, lastModifiedBy, createdTime, lastModifiedTime, wsid) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET name =?, licenseno =?,mobilenumber =?, gender =?, fatherorhusbandname =?, correspondenceaddress =?, relationship=?, lastmodifiedby =?, lastmodifiedtime =?; basePath: $.WaterConnection.plumberInfo.* jsonMaps: - + - jsonPath: $.WaterConnection.plumberInfo.*.id + + - jsonPath: $.WaterConnection.tenantId - jsonPath: $.WaterConnection.plumberInfo.*.name @@ -200,9 +311,17 @@ serviceMaps: - jsonPath: $.WaterConnection.plumberInfo.*.correspondenceAddress - jsonPath: $.WaterConnection.plumberInfo.*.relationship + + - jsonPath: $.WaterConnection.plumberInfo.*.auditDetails.createdBy - - jsonPath: $.WaterConnection.id + - jsonPath: $.WaterConnection.plumberInfo.*.auditDetails.lastModifiedBy + - jsonPath: $.WaterConnection.plumberInfo.*.auditDetails.createdTime + + - jsonPath: $.WaterConnection.plumberInfo.*.auditDetails.lastModifiedTime + + - jsonPath: $.WaterConnection.id + - jsonPath: $.WaterConnection.plumberInfo.*.name - jsonPath: $.WaterConnection.plumberInfo.*.licenseNo @@ -216,15 +335,103 @@ serviceMaps: - jsonPath: $.WaterConnection.plumberInfo.*.correspondenceAddress - jsonPath: $.WaterConnection.plumberInfo.*.relationship + + - jsonPath: $.WaterConnection.plumberInfo.*.auditDetails.lastModifiedBy + + - jsonPath: $.WaterConnection.plumberInfo.*.auditDetails.lastModifiedTime + + - query: INSERT INTO eg_ws_connectionholder(tenantid, connectionid, userid, status, isprimaryholder, connectionholdertype, holdershippercentage, relationship, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (connectionid) DO UPDATE SET tenantid =?, userid =?,status =?, isprimaryholder =?, connectionholdertype =?, holdershippercentage =?, relationship=?, lastmodifiedby =?, lastmodifiedtime =?; + basePath: $.WaterConnection.connectionHolders.* + jsonMaps: + + - jsonPath: $.WaterConnection.tenantId + + - jsonPath: $.WaterConnection.id + + - jsonPath: $.WaterConnection.connectionHolders.*.uuid + + - jsonPath: $.WaterConnection.connectionHolders.*.status + + - jsonPath: $.WaterConnection.connectionHolders.*.isPrimaryOwner + + - jsonPath: $.WaterConnection.connectionHolders.*.ownerType + + - jsonPath: $.WaterConnection.connectionHolders.*.ownerShipPercentage + + - jsonPath: $.WaterConnection.connectionHolders.*.relationship + + - jsonPath: $.WaterConnection.auditDetails.createdBy + + - jsonPath: $.WaterConnection.auditDetails.createdTime + + - jsonPath: $.WaterConnection.auditDetails.lastModifiedBy + + - jsonPath: $.WaterConnection.auditDetails.lastModifiedTime + + - jsonPath: $.WaterConnection.tenantId + + - jsonPath: $.WaterConnection.connectionHolders.*.uuid + + - jsonPath: $.WaterConnection.connectionHolders.*.status + - jsonPath: $.WaterConnection.connectionHolders.*.isPrimaryOwner + - jsonPath: $.WaterConnection.connectionHolders.*.ownerType + + - jsonPath: $.WaterConnection.connectionHolders.*.ownerShipPercentage + + - jsonPath: $.WaterConnection.connectionHolders.*.relationship + + - jsonPath: $.WaterConnection.auditDetails.lastModifiedBy + + - jsonPath: $.WaterConnection.auditDetails.lastModifiedTime + + - query: INSERT INTO eg_ws_roadcuttinginfo(id, tenantId, wsid, active, roadtype, roadcuttingarea, createdBy, lastModifiedBy, createdTime, lastModifiedTime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET active = ?, roadtype =?, roadcuttingarea =?,lastmodifiedby =?, lastmodifiedtime =?; + basePath: $.WaterConnection.roadCuttingInfo.* + jsonMaps: + + - jsonPath: $.WaterConnection.roadCuttingInfo.*.id + + - jsonPath: $.WaterConnection.tenantId + + - jsonPath: $.WaterConnection.id + + - jsonPath: $.WaterConnection.roadCuttingInfo.*.status + + - jsonPath: $.WaterConnection.roadCuttingInfo.*.roadType + + - jsonPath: $.WaterConnection.roadCuttingInfo.*.roadCuttingArea + + - jsonPath: $.WaterConnection.roadCuttingInfo.*.auditDetails.createdBy + + - jsonPath: $.WaterConnection.roadCuttingInfo.*.auditDetails.lastModifiedBy + + - jsonPath: $.WaterConnection.roadCuttingInfo.*.auditDetails.createdTime + + - jsonPath: $.WaterConnection.roadCuttingInfo.*.auditDetails.lastModifiedTime + + - jsonPath: $.WaterConnection.roadCuttingInfo.*.status + + - jsonPath: $.WaterConnection.roadCuttingInfo.*.roadType + + - jsonPath: $.WaterConnection.roadCuttingInfo.*.roadCuttingArea + + - jsonPath: $.WaterConnection.roadCuttingInfo.*.auditDetails.lastModifiedBy + + - jsonPath: $.WaterConnection.roadCuttingInfo.*.auditDetails.lastModifiedTime - version: 1.0 name: WaterConnection description: update ConnectionDetails in eg_ws_connection and eg_ws_service fromTopic: update-ws-workflow isTransaction: true - queryMaps: + queryMaps: + + - query: INSERT INTO eg_ws_connection_audit SELECT * FROM eg_ws_connection WHERE id = ?; + basePath: $.WaterConnection + jsonMaps: + - jsonPath: $.WaterConnection.id + - query: UPDATE eg_ws_connection SET applicationstatus=?, status=?, connectionno=?, action=?, lastModifiedBy=?, lastModifiedTime=? WHERE id=?; basePath: $.WaterConnection jsonMaps: @@ -235,20 +442,26 @@ serviceMaps: - jsonPath: $.WaterConnection.connectionNo - - jsonPath: $.WaterConnection.processInstance.action - + - jsonPath: $.WaterConnection.processInstance.action + - jsonPath: $.WaterConnection.auditDetails.lastModifiedBy - jsonPath: $.WaterConnection.auditDetails.lastModifiedTime - - jsonPath: $.WaterConnection.id - + - jsonPath: $.WaterConnection.id + - version: 1.0 name: WaterConnection description: save filestore ids fromTopic: save-ws-filestoreids isTransaction: true queryMaps: + + - query: INSERT INTO eg_ws_service_audit SELECT * FROM eg_ws_service WHERE connection_id = ?; + basePath: $.WaterConnection + jsonMaps: + - jsonPath: $.WaterConnection.id + - query: UPDATE eg_ws_service SET estimationfileStoreId = ?, sanctionfileStoreId = ? WHERE connection_id=?; basePath: $.WaterConnection jsonMaps: @@ -257,4 +470,4 @@ serviceMaps: - jsonPath: $.WaterConnection.additionalDetails.sanctionFileStoreId - - jsonPath: $.WaterConnection.id + - jsonPath: $.WaterConnection.id \ No newline at end of file From 8a60638b6ae69f40b83e36c765f77bd34b95af58 Mon Sep 17 00:00:00 2001 From: mohaarif007 <48949208+mohaarif007@users.noreply.github.com> Date: Tue, 20 Apr 2021 09:49:30 +0530 Subject: [PATCH 0582/1242] disable RAZORPAY disable RAZORPAY --- rainmaker-custom-service/index.js | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/rainmaker-custom-service/index.js b/rainmaker-custom-service/index.js index 6ab90cb3..83cc5436 100644 --- a/rainmaker-custom-service/index.js +++ b/rainmaker-custom-service/index.js @@ -1040,16 +1040,7 @@ router.post('/protected/punjab-pt/pre-hook/pg-service/transaction/v1/_create', a request['Transaction']['callbackUrl'] = url.format(url_callback); } - else if (request['Transaction']['tenantId'] == 'pb.amritsar') { - let original_callback = request['Transaction']['callbackUrl']; - request['Transaction']['gateway'] = 'RAZORPAY' - url_callback = url.parse(original_callback) - url_callback.query = url_callback.query || {}; - url_callback.query['original_callback'] = url_callback.path; - request['Transaction']['callbackUrl'] = url.format(url_callback); - - } - + res.json(request); }))); From 596d389fe368c35ff7d5a69fc365eae063dbfc52 Mon Sep 17 00:00:00 2001 From: mohaarif007 <48949208+mohaarif007@users.noreply.github.com> Date: Tue, 20 Apr 2021 12:45:30 +0530 Subject: [PATCH 0583/1242] Add RAZORPAY callback url Add RAZORPAY callback url --- rainmaker-custom-service/index.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/rainmaker-custom-service/index.js b/rainmaker-custom-service/index.js index 83cc5436..ba0e276f 100644 --- a/rainmaker-custom-service/index.js +++ b/rainmaker-custom-service/index.js @@ -1040,7 +1040,15 @@ router.post('/protected/punjab-pt/pre-hook/pg-service/transaction/v1/_create', a request['Transaction']['callbackUrl'] = url.format(url_callback); } - + else if (request['Transaction']['tenantId'] == 'pb.amritsar') { + let original_callback = request['Transaction']['callbackUrl']; + request['Transaction']['gateway'] = 'RAZORPAY' + url_callback = url.parse(original_callback) + url_callback.query = url_callback.query || {}; + url_callback.query['original_callback'] = url_callback.path; + request['Transaction']['callbackUrl'] = url.format(url_callback); + + } res.json(request); }))); From 96e106a1a55924633d147dff648c6e7533ef1a56 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 26 Apr 2021 11:47:16 +0530 Subject: [PATCH 0584/1242] Create ws-reports.yml --- configs/reports/configs/ws-reports.yml | 1601 ++++++++++++++++++++++++ 1 file changed, 1601 insertions(+) create mode 100644 configs/reports/configs/ws-reports.yml diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml new file mode 100644 index 00000000..e9e9181c --- /dev/null +++ b/configs/reports/configs/ws-reports.yml @@ -0,0 +1,1601 @@ +--- +ReportDefinitions: +- reportName: ReceiptRegisterSW + summary: Receipt Register + version: 1.0.0 + moduleName: rainmaker-ws + additionalConfig: + print: + pdfPageSize: "A1" + sourceColumns: + - name: receiptno + label: reports.ws.receiptno + type: string + source: ws + total: false + - name: receiptdate1 + label: reports.ws.receiptdate + type: string + source: ws + total: false + - name: service + label: reports.ws.serive + type: string + source: ws + total: false + - name: billnumber + label: reports.ws.billnumber + type: string + source: ws + total: false + - name: billdate1 + label: reports.ws.billdate + type: string + source: ws + total: false + - name: paidby + label: reports.ws.paidby + type: string + source: ws + total: false + - name: amountpaid + label: reports.ws.amountpaid + type: string + source: ws + total: true + - name: paymentmode + label: reports.ws.paymentmode + type: string + source: ws + total: false + - name: paymentstatus + label: reports.ws.paymentstatus + type: string + source: ws + total: false + - name: ownername + label: reports.ws.ownername + type: string + source: ws + total: false + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: true + searchClause: AND pd.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: true + searchClause: AND pd.receiptdate <= $toDate + - name: serviceType + label: serviceType + type: singlevaluelist + pattern: 'list://WS%:Water,SW%:Sewerage' + source: pt + isMandatory: true + searchClause: AND pd.businessservice like $serviceType + - name: receiptNumber + label: receiptNumber + type: string + source: pt + isMandatory: false + searchClause: AND pd.receiptnumber like $receiptNumber + - name: paymentStatus + label: paymentStatus + type: singlevaluelist + pattern: 'list://NEW:NEW,DEPOSITED:DEPOSITED' + source: pt + isMandatory: false + searchClause: AND payment.paymentstatus like $paymentStatus + - name: paymentMode + label: paymentMode + type: singlevaluelist + pattern: 'list://CASH:CASH,CHEQUE:CHEQUE,DD:DD,ONLINE:ONLINE,CARD:CARD,OFFLINE_NEFT:OFFLINE NEFT' + source: pt + isMandatory: false + searchClause: AND payment.paymentmode like $paymentMode + query: | + -- Use CTE to force query plan, compute & use CTE later + select + receiptnumber as receiptno, + to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') as receiptdate1, + bill.businessservice as service, + billnumber, + to_char((To_timestamp(bill.billdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') as billdate1, + paidby, + amountpaid, + paymentmode, + paymentstatus, + payername as ownername + from egcl_paymentdetail pd + inner join egcl_bill as bill on bill.id=pd.billid + inner join egcl_payment as payment on payment.id=pd.paymentid and payment.paymentstatus!='CANCELLED' + where payment.tenantid=$tenantid + orderby: order by pd.receiptdate desc + + +- reportName: ReceiptRegisterSW_OLD + summary: Receipt Register + version: 1.0.0 + moduleName: rainmaker-ws + additionalConfig: + print: + pdfPageSize: "A1" + sourceColumns: + - name: connectionno + label: reports.ws.connectionno + type: string + source: ws + total: false + - name: consumercode + label: reports.ws.consumercode + type: string + source: ws + total: false + - name: receiptdate + label: reports.ws.receiptdate + type: string + source: ws + total: false + - name: receiptnumber + label: reports.ws.receiptnumber + type: string + source: ws + total: false + - name: instrumenttype + label: reports.ws.instrumenttype + type: string + source: ws + total: false + - name: bankname + label: reports.ws.bankname + type: string + source: ws + total: false + - name: transactionnumber + label: reports.ws.transactionnumber + type: string + source: ws + total: false + - name: transactiondate + label: reports.ws.transactiondate + type: string + source: ws + total: false + - name: billperiod + label: reports.ws.billperiod + type: string + source: ws + total: false + - name: amount + label: reports.ws.amount + type: string + source: ws + total: true + - name: pendingamount + label: reports.ws.pendingamount + type: string + source: ws + total: true + - name: usagetype + label: reports.ws.usagetype + type: string + source: ws + total: false + - name: adhocpenalty + label: reports.ws.adhocpenalty + type: string + source: ws + total: true + - name: adhocrebate + label: reports.ws.adhocrebate + type: string + source: ws + total: true + - name: compositionfee + label: reports.ws.compositionfee + type: string + source: ws + total: true + - name: connectionfee + label: reports.ws.connectionfee + type: string + source: ws + total: true + - name: roundoff + label: reports.ws.roundoff + type: string + source: ws + total: true + - name: formfee + label: reports.ws.formfee + type: string + source: ws + total: true + - name: onetimefee + label: reports.ws.onetimefee + type: string + source: ws + total: true + - name: othercharge + label: reports.ws.othercharge + type: string + source: ws + total: true + - name: otherfee + label: reports.ws.otherfee + type: string + source: ws + total: true + - name: roadcuttingcharge + label: reports.ws.roadcuttingcharge + type: string + source: ws + total: true + - name: securityfee + label: reports.ws.securityfee + type: string + source: ws + total: true + - name: securitycharge + label: reports.ws.securitycharge + type: string + source: ws + total: true + - name: taxandcess + label: reports.ws.interest + type: string + source: ws + total: true + - name: usercharge + label: reports.ws.usercharge + type: string + source: ws + total: true + - name: g8issuedate + label: reports.ws.g8issuedate + type: string + source: ws + total: false + - name: g8receiptno + label: reports.ws.g8receiptno + type: string + source: ws + total: false + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: true + searchClause: AND pd.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: true + searchClause: AND pd.receiptdate <= $toDate + - name: connectionType + label: connectionType + type: singlevaluelist + pattern: 'list://WS%:Water,SW%:Sewerage' + source: pt + isMandatory: true + searchClause: AND pd.businessservice like $connectionType + query: | + -- Use CTE to force query plan, compute & use CTE later + WITH receipt_breakup AS + ( + SELECT + pd.id as pdid, + SUM(CASE WHEN taxheadcode LIKE 'SW_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, + SUM(CASE WHEN taxheadcode LIKE 'SW_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, + SUM(CASE WHEN taxheadcode LIKE 'SW_COMPOSITION_FEE' THEN adjustedamount ELSE 0 END) as compositionfee, + SUM(CASE WHEN taxheadcode LIKE 'SW_CONNECTION_FEE' THEN adjustedamount ELSE 0 END) as connectionfee, + SUM(CASE WHEN taxheadcode LIKE 'SW_FEE_ROUND_OFF' THEN adjustedamount ELSE 0 END) as roundoff, + SUM(CASE WHEN taxheadcode LIKE 'SW_FORM_FEE' THEN adjustedamount ELSE 0 END) as formfee, + SUM(CASE WHEN taxheadcode LIKE 'SW_ONE_TIME_FEE' THEN adjustedamount ELSE 0 END) as onetimefee, + SUM(CASE WHEN taxheadcode LIKE 'SW_OTHER_CHARGE' THEN bad.amount ELSE 0 END) as othercharge, + SUM(CASE WHEN taxheadcode LIKE 'SW_OTHER_FEE' THEN adjustedamount ELSE 0 END) as otherfee, + SUM(CASE WHEN taxheadcode LIKE 'SW_ROAD_CUTTING_CHARGE' THEN bad.amount ELSE 0 END) as roadcuttingcharge, + SUM(CASE WHEN taxheadcode LIKE 'SW_SCRUTINY_FEE' THEN bad.amount ELSE 0 END) as scrutinyfee, + SUM(CASE WHEN taxheadcode LIKE 'SW_SECURITY_CHARGE' THEN adjustedamount ELSE 0 END) as securitycharge, + SUM(CASE WHEN taxheadcode LIKE 'SW_TAX_AND_CESS' THEN adjustedamount ELSE 0 END) as taxandcess, + SUM(CASE WHEN taxheadcode LIKE 'SW_USER_CHARGE' THEN adjustedamount ELSE 0 END) as usercharge + FROM egcl_billaccountdetail as bad + INNER JOIN egcl_billdetial as bd on bd.id = bad.billdetailid + INNER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid + INNER JOIN egcl_payment as payment on pd.paymentid=payment.id + WHERE payment.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' + group by pdid + ) + SELECT + --count(*) + pd.tenantid AS tenantid, + pd.id, + pt.propertyid as consumercode, + to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS receiptdate, + payment.ifsccode AS bankname, + receiptnumber, + payment.totalamountpaid as amount, + payment.paymentmode as instrumenttype, + payment.transactionnumber, + concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY')) as billperiod, + to_char((To_timestamp(payment.transactiondate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, + payment.totaldue - payment.totalamountpaid AS pendingamount, + Initcap(case when pt.usagecategory like '%.%' then split_part(pt.usagecategory,'.',2) else pt.usagecategory end) as usagetype, + (case when eg_user.name is null then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else eg_user.name end) as collectorname, + receipt_breakup.*, + to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, + manualreceiptnumber as g8receiptno + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, receipt_breakup, egcl_bill bill, eg_sw_connection + --(select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr + where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice like $connectionType and payment.tenantid=$tenantid + and pt.id = eg_sw_connection.property_id + and receipt_breakup.pdid=pd.id + and pt.status!='INACTIVE' + --and pt_addr.propertyid=pt.id + --and pt.propertyid='PT-1012-978737' + --and receiptnumber='PT/1012/2020-21/001021' + orderby: ORDER BY pd.receiptdate DESC + + +- reportName: ReceiptRegisterReportSW + decryptionPathId: ReceiptRegisterShort_V2 + summary: Receipt Register + version: 1.0.0 + moduleName: rainmaker-ws + additionalConfig: + print: + pdfPageSize: "A1" + sourceColumns: + - name: receiptnumber + label: reports.ws.receiptnumber + type: string + source: ws + total: false + - name: receiptdate + label: reports.ws.receiptdate + type: string + source: ws + total: false + - name: service + label: reports.ws.service + type: string + source: ws + total: false + - name: collectorname + label: reports.ws.collectorname + type: string + source: ws + total: false + - name: online + label: reports.ws.online + type: string + source: ws + total: true + - name: cash + label: reports.ws.cash + type: string + source: ws + total: true + - name: cheque + label: reports.ws.cheque + type: string + source: ws + total: true + - name: dd + label: reports.ws.dd + type: string + source: ws + total: true + - name: cheque_dd_date + label: reports.ws.cheque_dd_date + type: string + source: ws + total: false + - name: cheque_dd_transaction_number + label: reports.ws.cheque_dd_transaction_number + type: string + source: ws + total: false + - name: card + label: reports.ws.card + type: string + source: ws + total: true + - name: rtgs + label: reports.ws.rtgs + type: string + source: ws + total: true + - name: neft + label: reports.ws.neft + type: string + source: ws + total: true + - name: po + label: reports.ws.po + type: string + source: ws + total: true + - name: paymentstatus + label: reports.ws.paymentstatus + type: string + source: ws + total: false + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: true + searchClause: AND pd.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: true + searchClause: AND pd.receiptdate <= $toDate + - name: connectionType + label: connectionType + type: singlevaluelist + pattern: 'list://WS%:Water,SW%:Sewerage' + source: pt + isMandatory: true + searchClause: AND pd.businessservice like $connectionType + query: | + -- Use CTE to force query plan, compute & use CTE later + select + receiptnumber, + to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') as receiptdate1, + businessservice as service, + (case when eg_user.name is null then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else eg_user.name end) as collectorname, + case when payment.paymentmode='ONLINE' then payment.totalamountpaid else 0 end as "online", + case when payment.paymentmode='CASH' then payment.totalamountpaid else 0 end as cash, + case when payment.paymentmode='CHEQUE' then payment.totalamountpaid else 0 end as cheque, + case when payment.paymentmode='DD' then payment.totalamountpaid else 0 end as dd, + to_char((To_timestamp(instrumentdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') as cheque_dd_date, + instrumentnumber as cheque_dd_transaction_number, + case when payment.paymentmode='CARD' then payment.totalamountpaid else 0 end as card, + case when payment.paymentmode='OFFLINE_RTGS' then payment.totalamountpaid else 0 end as rtgs, + case when payment.paymentmode='OFFLINE_NEFT' then payment.totalamountpaid else 0 end as neft, + case when payment.paymentmode='POTAL_ORDER' then payment.totalamountpaid else 0 end as po + from egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER + inner join egcl_payment payment on payment.id=pd.paymentid + where pd.tenantid=$tenantid + orderby: order by pd.receiptdate + + +- reportName: BaseRegisterReportWS + summary: Base Register Report WS + version: 1.0.0 + moduleName: rainmaker-ws + additionalConfig: + print: + pdfPageSize: "A1" + sourceColumns: + - name: connectionno + label: reports.ws.connectionno + type: string + source: ws + total: false + - name: plotsize + label: reports.ws.plotsize + type: string + source: ws + total: false + - name: applicationno + label: reports.ws.applicationno + type: string + source: ws + total: false + - name: propertyid + label: reports.ws.propertyid + type: string + source: ws + total: false + - name: connectionholdertype + label: reports.ws.connectionholdertype + type: string + source: ws + total: false + - name: applicationstatus + label: reports.ws.applicationstatus + type: string + source: ws + total: false + - name: connectionholder + label: reports.ws.connectionholder + type: string + source: ws + total: false + - name: name + label: reports.ws.ownername + type: string + source: ws + total: false + - name: address + label: reports.ws.address + type: string + source: ws + total: false + query: | + -- Use CTE to force query plan, compute & use CTE later + with ptowner as + ( + select split_part(string_agg(userid,','),',',1) as owneruserid, + propertyid + from eg_pt_owner + where tenantid=$tenantid and status='ACTIVE' + group by propertyid + ) + --, + -- ptaddress as + --( + -- select + -- split_part(string_agg(locality,','),',',1) as locality, + -- split_part(string_agg(concat(doorno,' ',plotno,' ',buildingname,' ',street,' ',city),'|'),'|',1) as address, + -- propertyid + -- from eg_pt_address + -- where tenantid=$tenantid + -- group by propertyid + --) + select + connectionno, + pt.landarea as plotsize, + oldconnectionno, + applicationno, + pt.propertyid, + ch.connectionholdertype, + wsconnection.applicationstatus, + users.name as connectionHolder, + userowner.name as name + --concat(address,' ',localityname) as address + from eg_ws_connection wsconnection + inner join eg_pt_property as pt on pt.id=wsconnection.property_id + left outer join eg_ws_connectionholder as ch on ch.connectionid=wsconnection.id + left outer join eg_user as users on ch.userid=users.uuid + inner join ptowner on ptowner.propertyid=pt.id + left outer join eg_user as userowner on ptowner.owneruserid=userowner.uuid + --inner join ptaddress on ptaddress.propertyid=pt.id + --INNER JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode=ptaddress.locality + +- reportName: FieldCollectionSearchReportWS + decryptionPathId: FieldCollectionSearchReportWS + summary: Field Collection Search Report WS + version: 1.0.0 + moduleName: rainmaker-ws + additionalConfig: + print: + pdfPageSize: "A1" + sourceColumns: + - name: receiptnumber + label: reports.ws.receiptnumber + type: string + source: ws + total: false + - name: receiptdate1 + label: reports.ws.receiptdate + type: string + source: ws + total: false + - name: businessservice + label: reports.ws.businessservice + type: string + source: ws + total: false + - name: amountpaid + label: reports.ws.amountpaid + type: string + source: ws + total: true + - name: consumercode + label: reports.ws.consumercode + type: string + source: ws + total: false + - name: paymentstatus + label: reports.ws.paymentstatus + type: string + source: ws + total: false + - name: paymentmode + label: reports.ws.paymentmode + type: string + source: ws + total: false + - name: name + label: reports.ws.name + type: string + source: ws + total: false + - name: mobilenumber + label: reports.ws.mobilenumber + type: string + source: ws + total: false + searchParams: + - name: connectionType + label: connectionType + type: singlevaluelist + pattern: 'list://WS%:Water,SW%:Sewerage' + source: pt + isMandatory: true + searchClause: AND pd.businessservice like $connectionType + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: false + searchClause: AND pd.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: false + searchClause: AND pd.receiptdate <= $toDate + query: | + -- Use CTE to force query plan, compute & use CTE later + select + receiptnumber, + to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS receiptdate1, + pd.businessservice, + pd.amountpaid, + consumercode, + paymentstatus, + paymentmode, + usr.name as name, + usr.mobilenumber as mobilenumber + from egcl_paymentdetail pd + inner join egcl_bill as bill on bill.id=pd.billid + INNER join egcl_payment as payment on payment.id=pd.paymentid + inner join eg_user as usr on usr.id=payment.createdby::integer + where pd.tenantid=$tenantid + orderby: ORDER BY pd.receiptdate DESC + +- reportName: FieldCollectionSearchReceiptWS + summary: Field Collection Search Receipt WS + version: 1.0.0 + moduleName: rainmaker-ws + additionalConfig: + print: + pdfPageSize: "A1" + sourceColumns: + - name: receiptnumber + label: reports.ws.receiptnumber + type: string + source: ws + total: false + - name: receiptdate1 + label: reports.ws.receiptdate + type: string + source: ws + total: false + - name: manualreceiptnumber + label: reports.ws.manualreceiptnumber + type: string + source: ws + total: false + - name: businessservice + label: reports.ws.businessservice + type: string + source: ws + total: false + - name: amountpaid + label: reports.ws.amountpaid + type: string + source: ws + total: true + - name: consumercode + label: reports.ws.consumercode + type: string + source: ws + total: false + - name: paymentstatus + label: reports.ws.paymentstatus + type: string + source: ws + total: false + - name: paymentmode + label: reports.ws.paymentmode + type: string + source: ws + total: false + - name: billnumber + label: reports.ws.billnumber + type: string + source: ws + total: false + - name: billdescription + label: reports.ws.billdescription + type: string + source: ws + total: false + searchParams: + - name: connectionType + label: connectionType + type: singlevaluelist + pattern: 'list://WS%:Water,SW%:Sewerage' + source: pt + isMandatory: true + searchClause: AND bill.businessservice like $connectionType + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: false + searchClause: AND pd.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: false + searchClause: AND pd.receiptdate <= $toDate + query: | + -- Use CTE to force query plan, compute & use CTE later + select + receiptnumber, + manualreceiptnumber, + to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS receiptdate1, + pd.businessservice as businessservice, + billnumber, + billdescription, + consumercode, + pd.amountpaid as amountpaid, + paymentmode, + paymentstatus + from egcl_paymentdetail pd + inner join egcl_bill as bill on bill.id=pd.billid + inner join egcl_billdetial as billd on billd.billid=pd.billid + INNER join egcl_payment as payment on payment.id=pd.paymentid + where 1=1 + orderby: ORDER BY pd.receiptdate DESC + + +- reportName: ChequeCollectionReportWS + summary: Cheque Collection Report WS + version: 1.0.0 + moduleName: rainmaker-ws + additionalConfig: + print: + pdfPageSize: "A1" + sourceColumns: + - name: consumercode + label: reports.ws.consumercode + type: string + source: ws + total: false + - name: connectionno + label: reports.ws.connectionno + type: string + source: ws + total: false + - name: oldconnectionno + label: reports.ws.oldconnectionno + type: string + source: ws + total: false + - name: receiptnumber + label: reports.ws.receiptnumber + type: string + source: ws + total: false + - name: receiptdate1 + label: reports.ws.receiptdate + type: string + source: ws + total: false + - name: manualreceiptnumber + label: reports.ws.manualreceiptnumber + type: string + source: ws + total: false + - name: manualreceiptdate + label: reports.ws.manualreceiptdate + type: string + source: ws + total: false + - name: cheque_dd_no + label: reports.ws.cheque_dd_no + type: string + source: ws + total: false + - name: cheque_dd_date + label: reports.ws.cheque_dd_date + type: string + source: ws + total: false + - name: paymentmode + label: reports.ws.paymentmode + type: string + source: ws + total: false + - name: paymentstatus + label: reports.ws.paymentstatus + type: string + source: ws + total: false + - name: bank_name + label: reports.ws.bank_name + type: string + source: ws + total: false + - name: branch + label: reports.ws.branch + type: string + source: ws + total: false + - name: amountpaid + label: reports.ws.amountpaid + type: string + source: ws + total: true + - name: businessservice + label: reports.ws.businessservice + type: string + source: ws + total: false + searchParams: + - name: connectionType + label: connectionType + type: singlevaluelist + pattern: 'list://WS%:Water,SW%:Sewerage' + source: pt + isMandatory: true + searchClause: AND bill.businessservice like $connectionType + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: false + searchClause: AND pd.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: false + searchClause: AND pd.receiptdate <= $toDate + query: | + -- Use CTE to force query plan, compute & use CTE later + select + consumercode, + wsconnection.connectionno, + wsconnection.oldconnectionno, + receiptnumber, + to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') as receiptdate1, + manualreceiptnumber, + to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') as manualreceiptdate, + transactionnumber as cheque_dd_no, + to_char((To_timestamp(transactiondate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') as cheque_dd_date, + paymentmode, + paymentstatus, + bank_name, + branch, + pd.amountpaid, + pd.businessservice + from egcl_paymentdetail pd + inner join egcl_payment payment on payment.id=pd.paymentid + left outer join bank_branches on bank_branches.ifsc=payment.ifsccode + inner join egcl_bill bill on bill.id=pd.billid + inner join eg_ws_connection wsconnection on wsconnection.connectionno=bill.consumercode + where payment.paymentmode='CHEQUE' and pd.tenantid=$tenantid and payment.paymentstatus!='CANCELLED' + orderby: ORDER BY pd.receiptdate DESC + +- reportName: SearchOnlineReceiptsWS + decryptionPathId: ReceiptRegisterShort_V2 + summary: Search Online Receipts WS + version: 1.0.0 + moduleName: rainmaker-ws + additionalConfig: + print: + pdfPageSize: "A1" + sourceColumns: + - name: billnumber + label: reports.ws.billnumber + type: string + source: ws + total: false + - name: consumercode + label: reports.ws.consumercode + type: string + source: ws + total: false + - name: receiptnumber + label: reports.ws.receiptnumber + type: string + source: ws + total: false + - name: receiptdate1 + label: reports.ws.receiptdate1 + type: string + source: ws + total: false + - name: amountpaid + label: reports.ws.amountpaid + type: string + source: ws + total: true + - name: transactionnumber + label: reports.ws.transactionnumber + type: string + source: ws + total: false + - name: transactiondate1 + label: reports.ws.transactiondate + type: string + source: ws + total: false + - name: businessservice + label: reports.ws.businessservice + type: string + source: ws + total: false + - name: paymentstatus + label: reports.ws.paymentstatus + type: string + source: ws + total: false + - name: paymentmode + label: reports.ws.paymentmode + type: string + source: ws + total: false + - name: collectorname + label: reports.ws.collectorname + type: string + source: ws + total: false + searchParams: + - name: connectionType + label: connectionType + type: singlevaluelist + pattern: 'list://WS%:Water,SW%:Sewerage' + source: pt + isMandatory: true + searchClause: AND bill.businessservice like $connectionType + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: false + searchClause: AND payment.transactiondate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: false + searchClause: AND payment.transactiondate <= $toDate + query: | + -- Use CTE to force query plan, compute & use CTE later + select + billnumber, + bill.consumercode as consumercode, + pd.receiptnumber as receiptnumber, + to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') as receiptate1, + pd.amountpaid, + pd.businessservice , + paymentstatus , + payment.transactionnumber , + to_char((To_timestamp(payment.transactiondate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') as transactiondate1, + paymentmode, + (case when eg_user.name is null then '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' else eg_user.name end) as collectorname + from egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER + inner join egcl_bill as bill on bill.id=pd.billid + INNER join egcl_payment as payment on payment.id=pd.paymentid + where paymentmode='ONLINE' and payment.tenantid=$tenantid + orderby: ORDER BY payment.transactiondate DESC + +- reportName: ReceiptCollections + summary: Receipt Collections + version: 1.0.0 + moduleName: rainmaker-ws + additionalConfig: + print: + pdfPageSize: "A1" + sourceColumns: + - name: receiptnumber + label: reports.ws.receiptnumber + type: string + source: ws + total: false + - name: receiptdate1 + label: reports.ws.receiptdate + type: string + source: ws + total: false + - name: businessservice + label: reports.ws.businessservice + type: string + source: ws + total: false + - name: amountpaid + label: reports.ws.amountpaid + type: string + source: ws + total: true + - name: consumercode + label: reports.ws.consumercode + type: string + source: ws + total: false + - name: paymentmode + label: reports.ws.paymentmode + type: string + source: ws + total: false + - name: billnumber + label: reports.ws.billnumber + type: string + source: ws + total: false + - name: paidby + label: reports.ws.paidby + type: string + source: ws + total: false + searchParams: + - name: connectionType + label: connectionType + type: singlevaluelist + pattern: 'list://WS%:Water,SW%:Sewerage' + source: pt + isMandatory: true + searchClause: AND pd.businessservice like $connectionType + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: false + searchClause: AND payment.transactiondate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: false + searchClause: AND payment.transactiondate <= $toDate + query: | + -- Use CTE to force query plan, compute & use CTE later + select + consumercode, + receiptnumber, + to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') as receiptdate1, + amountpaid, + paymentmode, + pd.businessservice, + bill.billnumber, + payment.paidby + from egcl_paymentdetail pd + inner join egcl_bill as bill on bill.id=pd.billid + inner join egcl_payment as payment on payment.id=pd.paymentid and payment.paymentstatus!='CANCELLED' + where pd.tenantid=$tenantid + orderby: ORDER BY pd.receiptdate DESC + +- reportName: JE_PendencyReport + decryptionPathId: JE_PendencyReport_WS + summary: JE_Pendency Report + version: 1.0.0 + moduleName: rainmaker-ws + additionalConfig: + print: + pdfPageSize: "A1" + sourceColumns: + - name: name + label: reports.ws.name + type: string + source: ws + total: false + - name: count + label: reports.ws.count + type: string + source: ws + total: true + query: | + -- Use CTE to force query plan, compute & use CTE later + select usr.name,count(*) + from eg_ws_connection con + inner join eg_user as usr on usr.uuid=con.createdby and usr.type='EMPLOYEE' + where applicationstatus not in ('INITIATED') and con.tenantid=$tenantid + groupby: GROUP BY con.createdby,usr.name + +- reportName: CashCollectionReport + decryptionPathId: ReceiptRegisterShort_V2 + summary: Cash Collection Report + version: 1.0.0 + moduleName: rainmaker-ws + additionalConfig: + print: + pdfPageSize: "A1" + sourceColumns: + - name: receiptnumber + label: reports.ws.receiptnumber + type: string + source: ws + total: false + - name: receiptdate1 + label: reports.ws.receiptdate + type: string + source: ws + total: false + - name: amountpaid + label: reports.ws.amountpaid + type: string + source: ws + total: true + - name: consumercode + label: reports.ws.consumercode + type: string + source: ws + total: false + - name: collectorname + label: reports.ws.collectorname + type: string + source: ws + total: false + searchParams: + - name: connectionType + label: connectionType + type: singlevaluelist + pattern: 'list://WS%:Water,SW%:Sewerage' + source: pt + isMandatory: true + searchClause: AND pd.businessservice like $connectionType + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: false + searchClause: AND pd.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: false + searchClause: AND pd.receiptdate <= $toDate + - name: collectorname + label: reports.pt.collectorname + type: singlevaluelist + pattern: http://egov-hrms:8080/egov-hrms/employees/_search?tenantId=$tenantid&roles=WS_CEMP,WS_CLERK,SW_CEMP,SW_CLERK|$.Employees[*].user.id|$.Employees[*].user.name + source: ws + wrapper: true + isMandatory: false + searchClause: AND eg_user.id = $collectorname::INTEGER + query: | + -- Use CTE to force query plan, compute & use CTE later + select + consumercode, + receiptnumber, + to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') as receiptdate1, + amountpaid, + (case when eg_user.name is null then '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' else eg_user.name end) as collectorname + from egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER + inner join egcl_bill as bill on bill.id=pd.billid + inner join egcl_payment as payment on payment.id=pd.paymentid and payment.paymentmode='CASH' and payment.paymentstatus!='CANCELLED' + where payment.tenantid=$tenantid + orderby: ORDER BY pd.receiptdate DESC + +- reportName: CollectionsSummaryHeadwiseReport + summary: Collections Summary Headwise Report + version: 1.0.0 + moduleName: rainmaker-ws + additionalConfig: + print: + pdfPageSize: "A1" + sourceColumns: + - name: taxheadcode + label: reports.ws.taxheadcode + type: string + source: ws + total: false + - name: totalamountpaid + label: reports.ws.totalamountpaid + type: string + source: ws + total: true + - name: totalassessments + label: reports.ws.totalassessments + type: string + source: ws + total: true + - name: totalonline + label: reports.ws.totalonline + type: string + source: ws + total: true + - name: countonline + label: reports.ws.countonline + type: string + source: ws + total: true + - name: totalcash + label: reports.ws.totalcash + type: string + source: ws + total: true + - name: countcash + label: reports.ws.countcash + type: string + source: ws + total: true + - name: totalcheque + label: reports.ws.totalcheque + type: string + source: ws + total: true + - name: totaldd + label: reports.ws.totaldd + type: string + source: ws + total: true + - name: countdd + label: reports.ws.countdd + type: string + source: ws + total: true + - name: totalcard + label: reports.ws.totalcard + type: string + source: ws + total: true + - name: countcard + label: reports.ws.countcard + type: string + source: ws + total: true + - name: totalrtgs + label: reports.ws.totalrtgs + type: string + source: ws + total: true + - name: totalneft + label: reports.ws.totalneft + type: string + source: ws + total: true + - name: countneft + label: reports.ws.countneft + type: string + source: ws + total: true + - name: totalPO + label: reports.ws.totalPO + type: string + source: ws + total: true + - name: countPO + label: reports.ws.countPO + type: string + source: ws + total: true + - name: countoffline + label: reports.ws.countoffline + type: string + source: ws + total: true + searchParams: + - name: connectionType + label: connectionType + type: singlevaluelist + pattern: 'list://WS%:Water,SW%:Sewerage' + source: pt + isMandatory: true + searchClause: AND pd.businessservice like $connectionType + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: false + searchClause: AND pd.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: false + searchClause: AND pd.receiptdate <= $toDate + query: | + -- Use CTE to force query plan, compute & use CTE later + SELECT + taxheadcode, + sum(payment.totalamountpaid) as totalamountpaid, + count(payment.totalamountpaid) as totalassessments, + sum(case when payment.paymentmode='ONLINE' then payment.totalamountpaid else 0 end) as "totalonline", + sum(case when payment.paymentmode='ONLINE' then 1 else 0 end) as "countonline", + sum(case when payment.paymentmode='CASH' then payment.totalamountpaid else 0 end) as totalcash, + sum(case when payment.paymentmode='CASH' then 1 else 0 end) as countcash, + sum(case when payment.paymentmode='CHEQUE' then payment.totalamountpaid else 0 end) as totalcheque, + sum(case when payment.paymentmode='CHEQUE' then 1 else 0 end) as countcheque, + sum(case when payment.paymentmode='DD' then payment.totalamountpaid else 0 end) as totalDD, + sum(case when payment.paymentmode='DD' then 1 else 0 end) as countDD, + sum(case when payment.paymentmode='CARD' then payment.totalamountpaid else 0 end) as totalcard, + sum(case when payment.paymentmode='CARD' then 1 else 0 end) as countcard, + sum(case when payment.paymentmode='OFFLINE_RTGS' then payment.totalamountpaid else 0 end) as totalRTGS, + sum(case when payment.paymentmode='OFFLINE_RTGS' then 1 else 0 end) as countRTGS, + sum(case when payment.paymentmode='OFFLINE_NEFT' then payment.totalamountpaid else 0 end) as totalNEFT, + sum(case when payment.paymentmode='OFFLINE_NEFT' then 1 else 0 end) as countNEFT, + sum(case when payment.paymentmode='POTAL_ORDER' then payment.totalamountpaid else 0 end) as "totalPO", + sum(case when payment.paymentmode='POTAL_ORDER' then 1 else 0 end) as "countPO", + sum(case when payment.paymentmode!='ONLINE' then 1 else 0 end) as "countoffline" + FROM egcl_paymentdetail pd + INNER join egcl_payment as payment on pd.paymentid=payment.id + INNER JOIN egcl_billdetial as bd on pd.billid = bd.billid + INNER JOIN egcl_billaccountdetail as bad on bad.billdetailid = bd.id + where payment.paymentstatus != 'CANCELLED' and payment.tenantid=$tenantid + groupby: GROUP BY taxheadcode + + +- reportName: ArrearReport + summary: Arrear Report + version: 1.0.0 + moduleName: rainmaker-ws + additionalConfig: + print: + pdfPageSize: "A1" + sourceColumns: + - name: consumercode + label: reports.ws.consumercode + type: string + source: ws + total: false + - name: totalamount + label: reports.ws.totalamount + type: string + source: ws + total: true + - name: amountpaid + label: reports.ws.amountpaid + type: string + source: ws + total: true + - name: dueamount + label: reports.ws.dueamount + type: string + source: ws + total: true + searchParams: + - name: connectionType + label: connectionType + type: singlevaluelist + pattern: 'list://WS%:Water,SW%:Sewerage' + source: pt + isMandatory: true + searchClause: AND businessservice like $connectionType + query: | + -- Use CTE to force query plan, compute & use CTE later + with demands as + ( + select demandid,sum(taxamount) as amount,sum(collectionamount) as collection,sum(taxamount-collectionamount) as arrear + from egbs_demanddetail_v1 where tenantid=$tenantid + group by demandid + having sum(taxamount-collectionamount)>0 + ) + select consumercode,sum(amount) as totalamount,sum(collection) as amountpaid,sum(arrear) as dueamount + from egbs_demand_v1 d + inner join demands on demands.demandid=d.id and status='ACTIVE' + where tenantid=$tenantid + groupby: group by consumercode + + +- reportName: SearchWaterChargeReport + summary: Search Water Charge Notice Report + version: 1.0.0 + moduleName: rainmaker-ws + additionalConfig: + print: + pdfPageSize: "A1" + sourceColumns: + - name: connectionno + label: reports.ws.connectionno + type: string + source: ws + total: false + - name: oldconnectionno + label: reports.ws.connectionno + type: string + source: ws + total: false + - name: ownername + label: reports.ws.connectionno + type: string + source: ws + total: false + - name: propertyid + label: reports.ws.propertyid + type: string + source: ws + total: false + - name: connectiontype + label: reports.ws.propertyid + type: string + source: ws + total: false + - name: billnumber + label: reports.ws.billno + type: string + source: ws + total: false + - name: fromdate + label: reports.ws.fromdate + type: string + source: ws + total: false + - name: todate + label: reports.ws.todate + type: string + source: ws + total: false + searchParams: + - name: fromDate + label: reports.ws.fromBillDate + type: epoch + source: ws + isMandatory: false + searchClause: AND bill.billdate >= $fromDate + - name: toDate + label: reports.ws.toBillDate + type: epoch + source: ws + isMandatory: false + searchClause: AND bill.billdate <= $toDate + - name: mobilenumber + label: reports.ws.mobilenumber + type: string + source: ws + isMandatory: false + searchClause: AND owners.mobilenumber=$mobilenumber + - name: connectionNumber + label: reports.ws.connectionNumber + type: string + source: ws + isMandatory: false + searchClause: AND connectionno=$connectionNumber + - name: oldConnectionNumber + label: reports.ws.oldConnectionNumber + type: string + source: ws + isMandatory: false + searchClause: AND oldconnectionno=$oldConnectionNumber + query: | + -- Use CTE to force query plan, compute & use CTE later + with owners as + ( + select + split_part(string_agg(name,','),',',1) as ownername, + split_part(string_agg(mobilenumber,','),',',1) as mobilenumber, + pt.propertyid as propertyid + from eg_user usr + inner join eg_pt_owner on eg_pt_owner.userid=usr.uuid + inner join eg_pt_property pt on eg_pt_owner.propertyid=pt.id and pt.status='ACTIVE' + where pt.tenantid=$tenantid + group by pt.propertyid + ) + select + connectionno, + oldconnectionno, + pt.propertyid, + ownername, + connectiontype, + bill.billnumber, + to_char((To_timestamp(bill.billdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') as billdate, + to_char((To_timestamp(bd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') fromperiod, + to_char((To_timestamp(bd.toperiod/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') toperiod, + bill.totalamount, + bill.businessservice + from eg_ws_connection wsconnection + inner join eg_pt_property pt on pt.id=wsconnection.property_id and pt.status='ACTIVE' + inner join eg_ws_service on eg_ws_service.connection_id=wsconnection.id + inner join egcl_bill bill on bill.consumercode=wsconnection.connectionno + inner join egcl_billdetial bd on bill.id=bd.billid + inner join owners on owners.propertyid=pt.propertyid + where wsconnection.tenantid=$tenantid and wsconnection.status='Active' and bill.businessservice like 'WS%' + orderby: order by bill.billdate desc + + +- reportName: SearchSewerageChargeReport + summary: Search Sewerage Charge Notice Report + version: 1.0.0 + moduleName: rainmaker-ws + additionalConfig: + print: + pdfPageSize: "A1" + sourceColumns: + - name: connectionno + label: reports.ws.connectionno + type: string + source: ws + total: false + - name: oldconnectionno + label: reports.ws.connectionno + type: string + source: ws + total: false + - name: ownername + label: reports.ws.connectionno + type: string + source: ws + total: false + - name: propertyid + label: reports.ws.propertyid + type: string + source: ws + total: false + - name: billnumber + label: reports.ws.billno + type: string + source: ws + total: false + - name: fromdate + label: reports.ws.fromdate + type: string + source: ws + total: false + - name: todate + label: reports.ws.todate + type: string + source: ws + total: false + searchParams: + - name: fromDate + label: reports.ws.fromBillDate + type: epoch + source: ws + isMandatory: false + searchClause: AND bill.billdate >= $fromDate + - name: toDate + label: reports.ws.toBillDate + type: epoch + source: ws + isMandatory: false + searchClause: AND bill.billdate <= $toDate + - name: mobilenumber + label: reports.ws.mobilenumber + type: string + source: ws + isMandatory: false + searchClause: AND owners.mobilenumber=$mobilenumber + - name: connectionNumber + label: reports.ws.connectionNumber + type: string + source: ws + isMandatory: false + searchClause: AND connectionno=$connectionNumber + - name: oldConnectionNumber + label: reports.ws.oldConnectionNumber + type: string + source: ws + isMandatory: false + searchClause: AND oldconnectionno=$oldConnectionNumber + query: | + -- Use CTE to force query plan, compute & use CTE later + with owners as + ( + select + split_part(string_agg(name,','),',',1) as ownername, + pt.propertyid as propertyid + from eg_user usr + inner join eg_pt_owner on eg_pt_owner.userid=usr.uuid + inner join eg_pt_property pt on eg_pt_owner.propertyid=pt.id and pt.status='ACTIVE' + where pt.tenantid=$tenantid + group by pt.propertyid + ) + select + connectionno, + oldconnectionno, + pt.propertyid, + ownername, + bill.billnumber, + to_char((To_timestamp(bill.billdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') as billdate, + to_char((To_timestamp(bd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') fromperiod, + to_char((To_timestamp(bd.toperiod/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') toperiod, + bill.totalamount, + bill.businessservice + from eg_sw_connection swconnection + inner join eg_pt_property pt on pt.id=swconnection.property_id and pt.status='ACTIVE' + inner join egcl_bill bill on bill.consumercode=swconnection.connectionno + inner join egcl_billdetial bd on bill.id=bd.billid + inner join owners on owners.propertyid=pt.propertyid + where swconnection.tenantid=$tenantid and swconnection.status='Active' and bill.businessservice like 'SW%' + orderby: order by bill.billdate desc From 11e264ef4bad0c9de89bfce0f8ddec74dc8cb578 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 26 Apr 2021 11:48:22 +0530 Subject: [PATCH 0585/1242] added config for ws-reports --- configs/reports/report.config | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/reports/report.config b/configs/reports/report.config index 19d53a92..e605e133 100644 --- a/configs/reports/report.config +++ b/configs/reports/report.config @@ -3,3 +3,4 @@ rainmaker-pt=file:///work-dir/punjab-rainmaker-customization/configs/reports/con rainmaker-tl=file:///work-dir/punjab-rainmaker-customization/configs/reports/configs/tl-reports.yml rainmaker-uc=file:///work-dir/punjab-rainmaker-customization/configs/reports/configs/uc-reports.yml rainmaker-noc=file:///work-dir/punjab-rainmaker-customization/configs/reports/configs/rainmaker-noc-reports.yml +rainmaker-ws=file:///work-dir/punjab-rainmaker-customization/configs/reports/configs/ws-reports.yml From 905ce34add60bf77da8c0d3ecebf6917cc105394 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 26 Apr 2021 11:52:36 +0530 Subject: [PATCH 0586/1242] synch with PROD_V2 --- configs/reports/configs/tl-reports.yml | 260 +++++++++++++++++++++++-- 1 file changed, 243 insertions(+), 17 deletions(-) diff --git a/configs/reports/configs/tl-reports.yml b/configs/reports/configs/tl-reports.yml index 7dd968db..aee9c789 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -2097,7 +2097,7 @@ ReportDefinitions: isMandatory: false searchClause: AND tl.tenantId = $ulb query: | - SELECT + SELECT tl.tenantId as tenantId, licensenumber, to_char((To_timestamp(issueddate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as formattedIssuedDate, @@ -2109,16 +2109,16 @@ ReportDefinitions: paydetail.amountpaid as totalamount, To_char((To_timestamp(paydetail.manualreceiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') AS g8issuedate, paydetail.manualreceiptnumber as g8receiptno - FROM eg_tl_tradelicense tl - INNER JOIN eg_tl_tradelicensedetail tld ON tld.tradelicenseid = tl.id - INNER JOIN eg_tl_owner tlowner ON tlowner.tradelicensedetailid = tld.id - INNER JOIN ( - SELECT tradelicensedetailid, array_to_string(array_agg(message.message),', ') as tradeTypeName FROM eg_tl_tradeunit - LEFT OUTER JOIN message ON code = CONCAT('TRADELICENSE_TRADETYPE_', REGEXP_REPLACE(tradetype, '[^A-Za-z0-9]','_','g')) AND message.locale = 'en_IN' GROUP BY 1) tlunit ON tlunit.tradelicensedetailid = tld.id - INNER JOIN eg_user tluser ON tluser.uuid = tlowner.id - LEFT OUTER JOIN egcl_bill as bill ON bill.consumercode = tl.applicationnumber - inner join egcl_paymentdetail as paydetail on paydetail.billid=bill.id - LEFT OUTER JOIN + FROM eg_tl_tradelicense tl + INNER JOIN eg_tl_tradelicensedetail tld ON tld.tradelicenseid = tl.id + INNER JOIN eg_tl_owner tlowner ON tlowner.tradelicensedetailid = tld.id + INNER JOIN ( + SELECT tradelicensedetailid, array_to_string(array_agg(message.message),', ') as tradeTypeName FROM eg_tl_tradeunit + LEFT OUTER JOIN message ON code = CONCAT('TRADELICENSE_TRADETYPE_', REGEXP_REPLACE(tradetype, '[^A-Za-z0-9]','_','g')) AND message.locale = 'en_IN' GROUP BY 1) tlunit ON tlunit.tradelicensedetailid = tld.id + INNER JOIN eg_user tluser ON tluser.uuid = tlowner.id + LEFT OUTER JOIN egcl_bill as bill ON bill.consumercode = tl.applicationnumber + inner join egcl_paymentdetail as paydetail on paydetail.billid=bill.id + LEFT OUTER JOIN ( SELECT tradelicensedetailid,array_to_string(array_agg(message.message),',') AS acc FROM eg_tl_accessory LEFT OUTER JOIN message ON code=CONCAT('TRADELICENSE_ACCESSORIESCATEGORY_', REGEXP_REPLACE(accessorycategory, '[^A-Za-z0-9]','_', 'g')) AND message.locale = 'en_IN' GROUP BY 1 ) tlacc ON tlacc.tradelicensedetailid = tld.id @@ -2282,6 +2282,16 @@ ReportDefinitions: type: string source: tl total: true + - name: zone + label: report.tl.zone + type: string + source: tl + total: false + - name: ward_block + label: report.tl.locality + type: string + source: tl + total: false - name: locality label: report.tl.locality type: string @@ -2310,11 +2320,13 @@ ReportDefinitions: type: boundarylist source: tl isMandatory: false - searchClause: AND localitycode IN ($localityArray) + searchClause: AND eg_tl_address.locality IN ($localityArray) query: | SELECT tl.applicationnumber as applicationnumber, locality_tlb.locality as locality, + eg_bndry_mohalla.blockcode as ward_block, + eg_bndry_mohalla.zonecode as zone, propertyid, financialyear, (case when oldlicensenumber is null then 'New' else 'Renewal' end) AS licensetype, @@ -2342,6 +2354,7 @@ ReportDefinitions: LEFT OUTER JOIN egcl_bill bill ON bill.consumercode = tl.applicationnumber LEFT OUTER JOIN egcl_paymentdetail as paydetail on paydetail.billid=bill.id INNER JOIN eg_tl_address ON eg_tl_address.tradelicensedetailid = tld.id + INNER JOIN eg_bndry_mohalla ON eg_bndry_mohalla.localitycode= eg_tl_address.locality LEFT OUTER JOIN ( SELECT tradelicensedetailid,array_to_string(array_agg(message.message),',') AS acc FROM eg_tl_accessory @@ -2484,9 +2497,151 @@ ReportDefinitions: ) tlown ON tlown.tradelicensedetailid = tld.id where validto < extract (epoch from NOW())*1000 and licensenumber is not null and licensenumber not in (select oldlicensenumber from eg_tl_tradelicense where oldlicensenumber is not null) and tenantid = $tenantid - - - + +- reportName: StateTradeLicenseDetailsReport_v2 + decryptionPathId: TradeLicenseDetailsReport_v2 + summary: State Trade License Details Report + version: 1.0.0 + moduleName: rainmaker-tl + sourceColumns: + - name: applicationnumber + label: report.tl.applicationnumber + type: string + source: tl + total: false + - name: propertyid + label: report.tl.propertyid + type: string + source: tl + total: false + - name: financialyear + label: report.tl.financialyear + type: string + source: tl + total: false + - name: licensetype + label: report.tl.licensetype + type: string + source: tl + total: false + - name: oldlicensenumber + label: report.tl.oldlicensenumber + type: string + source: tl + total: false + - name: licensenumber + label: report.tl.licensenumber + type: string + source: tl + total: false + - name: tradeName + label: report.tl.tradeName + type: string + source: tl + total: false + - name: name + label: report.tl.user.name + type: string + source: tl + total: false + - name: mobilenumber + label: report.tl.user.mobilenumber + type: string + source: tl + total: false + - name: formattedIssuedDate + label: report.tl.issueddate + type: string + source: tl + total: false + - name: tradeTypeName + label: report.tl.tradetype + type: string + source: tl + total: false + - name: acc + label: report.tl.accessorycategories + type: string + source: tl + total: false + - name: totalamount + label: report.tl.receipt.totalamount + type: string + source: tl + total: true + - name: tenantid + label: report.tl.tenantid + type: string + source: tl + total: false + - name: locality + label: report.tl.locality + type: string + source: tl + total: false + - name: status + label: report.tl.receipt.status + type: string + source: tl + total: false + searchParams: + - name: fromDate + label: reports.tl.fromDate + type: epoch + source: tl + isMandatory: false + searchClause: AND applicationdate >= $fromDate + - name: toDate + label: reports.tl.toDate + type: epoch + source: tl + isMandatory: false + searchClause: AND applicationdate <= $toDate + - name: localityArray + label: reports.tl.zoneList + type: boundarylist + source: tl + isMandatory: false + searchClause: AND localitycode IN ($localityArray) + query: | + SELECT + tl.applicationnumber as applicationnumber, + locality_tlb.locality as locality, + propertyid, + financialyear, + (case when oldlicensenumber is null then 'New' else 'Renewal' end) AS licensetype, + oldlicensenumber, + licensenumber, + to_char((To_timestamp(issueddate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as formattedIssuedDate, + tl.tradeName, + tl.tenantid, + tradeTypeName, + acc, + name, + mobilenumber, + paydetail.amountpaid as totalamount, + tl.status as status + FROM eg_tl_tradelicense tl + INNER JOIN eg_tl_tradelicensedetail tld ON tld.tradelicenseid = tl.id + INNER JOIN ( + select tradelicensedetailid, array_to_string(array_agg(message.message),', ') as locality,array_to_string(array_agg(locality),', ') as localitycode from eg_tl_address as tla + LEFT OUTER JOIN message on code=CONCAT(UPPER(REGEXP_REPLACE( '[^A-Za-z0-9]','_', 'g')),'_REVENUE_', REGEXP_REPLACE( locality , '[^A-Za-z0-9]','_', 'g')) + AND message.locale = 'en_IN' group by 1) locality_tlb ON locality_tlb.tradelicensedetailid = tld.id + INNER JOIN eg_tl_owner tlowner ON tlowner.tradelicensedetailid = tld.id + INNER JOIN ( + SELECT tradelicensedetailid, array_to_string(array_agg(message.message),', ') as tradeTypeName FROM eg_tl_tradeunit + LEFT OUTER JOIN message ON code = CONCAT('TRADELICENSE_TRADETYPE_', REGEXP_REPLACE(tradetype, '[^A-Za-z0-9]','_','g')) AND message.locale = 'en_IN' GROUP BY 1) tlunit ON tlunit.tradelicensedetailid = tld.id + INNER JOIN eg_user tluser ON tluser.uuid = tlowner.id + LEFT OUTER JOIN egcl_bill bill ON bill.consumercode = tl.applicationnumber + LEFT OUTER JOIN egcl_paymentdetail as paydetail on paydetail.billid=bill.id + INNER JOIN eg_tl_address ON eg_tl_address.tradelicensedetailid = tld.id + LEFT OUTER JOIN + ( + SELECT tradelicensedetailid,array_to_string(array_agg(message.message),',') AS acc FROM eg_tl_accessory + LEFT OUTER JOIN message ON code=CONCAT('TRADELICENSE_ACCESSORIESCATEGORY_', REGEXP_REPLACE(accessorycategory, '[^A-Za-z0-9]','_', 'g')) AND message.locale = 'en_IN' GROUP BY 1 ) tlacc ON tlacc.tradelicensedetailid = tld.id + WHERE tl.tenantid!='pb.testing' + orderby: order by tl.tenantid + - reportName: TradeLicensePendencyReport_v2 decryptionPathId: TradeLicensePendencyReport_v2 summary: Trade License Pendency Report @@ -2538,6 +2693,11 @@ ReportDefinitions: type: string source: tl total: false + - name: days + label: report.tl.days + type: string + source: tl + total: false searchParams: - name: fromDate label: reports.tl.fromDate @@ -2556,12 +2716,14 @@ ReportDefinitions: string_agg(DISTINCT t.applicationnumber,',')as applicationnumber, string_agg(DISTINCT t.tradeName,',') as tradename, string_agg(DISTINCT financialyear,',') as financialyear, + t.applicationdate, string_agg(DISTINCT(case when oldlicensenumber is null then 'New' else 'Renewal' end),',') AS licensetype, string_agg(distinct licensenumber,',') as licensenumber, split_part(string_agg(u.name,','),',',1) as name, -- string_agg(name,',') as name, string_agg(distinct paydetail.amountpaid::varchar,',') as totalamount, string_agg(distinct t.status,',') as status, - split_part(string_agg(distinct us.name,','),',',1) as assignee + split_part(string_agg(distinct us.name,','),',',1) as assignee, + CURRENT_DATE- to_timestamp(cast(t.applicationdate/1000 as bigint))::date as days FROM eg_tl_tradelicense t INNER JOIN eg_tl_tradelicensedetail td ON td.tradelicenseid = t.id INNER JOIN eg_tl_owner O ON O.tradelicensedetailid = td.id INNER JOIN eg_user u ON u.uuid = O.id @@ -2573,5 +2735,69 @@ ReportDefinitions: INNER JOIN eg_user us ON us.uuid = W.assignee WHERE t.status NOT IN ('APPROVED','CANCELLED','REJECTED','PENDINGPAYMENT','INITIATED') and t.tenantid=$tenantid - groupby: GROUP BY O.tradelicensedetailid + groupby: GROUP BY O.tradelicensedetailid,applicationdate orderby: ORDER BY applicationnumber DESC + +- reportName: EmployeeWiseCollectionTL_v2 + decryptionPathId: MiscReceiptULB_v2 + summary: Employee Wise Collection TL + version: 1.0.0 + moduleName: rainmaker-tl + additionalConfig: + print: + pdfPageSize: "A3" + sourceColumns: + - name: collectorname + label: reports.tl.collectorname + type: string + source: tl + total: false + - name: paymentmode + label: reports.tl.paymentmode + type: string + source: tl + total: false + - name: countofreceipts + label: reports.tl.countofreceipts + type: string + source: tl + total: true + - name: totalamount + label: reports.tl.totalamount + type: string + source: tl + total: true + searchParams: + - name: fromDate + label: reports.tl.fromDate + type: epoch + source: tl + isMandatory: false + searchClause: AND receipt.createddate >= $fromDate + - name: toDate + label: reports.tl.toDate + type: epoch + source: tl + isMandatory: false + searchClause: AND receipt.createddate <= $toDate + - name: collectorname + label: reports.tl.collectorname + type: singlevaluelist + pattern: http://egov-hrms:8080/egov-hrms/employees/_search?tenantId=$tenantid&roles=TL_CEMP|$.Employees[*].user.id|$.Employees[*].user.name + source: pt + wrapper: true + isMandatory: false + searchClause: AND eg_user.id = $collectorname::INTEGER + query: | + SELECT + eg_user.name as collectorname, + paymentmode as paymentmode, + count(paydetail.receiptnumber) as Countofreceipts, + Sum(payment.totalamountpaid) as totalamount + FROM egcl_payment AS payment + JOIN egcl_paymentdetail as paydetail on paydetail.paymentid=payment.id + JOIN eg_user ON payment.createdby::INTEGER=eg_user.id + WHERE payment.tenantid=$tenantid AND businessservice not in ('TL') and payment.paymentstatus != 'CANCELLED' + groupby: GROUP BY collectorname , paymentmode + + From a77c03e8c4cc93812d64f3127f5cfbf27ec1cb8c Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 26 Apr 2021 12:16:09 +0530 Subject: [PATCH 0587/1242] Synch with PROD_V2 --- configs/reports/configs/uc-reports.yml | 79 +++++++++++++++++++++++--- 1 file changed, 72 insertions(+), 7 deletions(-) diff --git a/configs/reports/configs/uc-reports.yml b/configs/reports/configs/uc-reports.yml index 5c972d18..66b9290e 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -948,7 +948,7 @@ ReportDefinitions: SUM(CASE WHEN taxheadcode LIKE '%_CGST' THEN adjustedamount ELSE 0 END) as cgst, SUM(CASE WHEN taxheadcode LIKE '%_TAX' THEN adjustedamount ELSE 0 END) as tax, SUM(CASE WHEN taxheadcode LIKE '%_SGST' THEN adjustedamount ELSE 0 END) as sgst, - SUM(CASE WHEN taxheadcode LIKE '%_FIELD_FEE' THEN adjustedamount ELSE 0 END) as fieldcollection + SUM(CASE WHEN taxheadcode LIKE '%_FEE' THEN adjustedamount ELSE 0 END) as fieldcollection FROM egcl_billaccountdetail inner join egcl_billdetial as billd on billd.id=egcl_billaccountdetail.billdetailid INNER JOIN egcl_bill as bill on bill.id = billd.billid @@ -1123,7 +1123,7 @@ ReportDefinitions: SUM(CASE WHEN taxheadcode LIKE '%_CGST' THEN adjustedamount ELSE 0 END) as cgst, SUM(CASE WHEN taxheadcode LIKE '%_TAX' THEN adjustedamount ELSE 0 END) as tax, SUM(CASE WHEN taxheadcode LIKE '%_SGST' THEN adjustedamount ELSE 0 END) as sgst, - SUM(CASE WHEN taxheadcode LIKE '%_FIELD_FEE' THEN adjustedamount ELSE 0 END) as fieldcollection + SUM(CASE WHEN taxheadcode LIKE '%_FEE' THEN adjustedamount ELSE 0 END) as fieldcollection FROM egcl_billaccountdetail INNER JOIN egcl_billdetial as billd on billd.id = egcl_billaccountdetail.billdetailid INNER JOIN egcl_bill as bill on bill.id=billd.billid @@ -1144,7 +1144,7 @@ ReportDefinitions: payment.totalamountpaid as totalamount, paymentmode as paymentmode, (case when paymentmode like 'CASH' then '' else transactionnumber end) as ddorchequenumber, - (case when paymentmode like 'DD' or paymentmode like 'CHEQUE' then To_char((To_timestamp(payment.transactiondate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') else '' end) as ddchequedate, + (case when paymentmode like 'DD' or paymentmode like 'CHEQUE' then To_char((To_timestamp(payment.instrumentdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') else '' end) as ddchequedate, 'System' as collectiontype, eg_user.name as collectorname, billd.additionaldetails->>'comment' as remarks @@ -1225,7 +1225,7 @@ ReportDefinitions: payment.tenantid as ulb, paydetail.businessservice as servicecategory, count(*) as receipts, - SUM(CASE WHEN taxheadcode LIKE '%_FIELD_FEE' THEN adjustedamount ELSE 0 END) as fieldcollection, + SUM(CASE WHEN taxheadcode LIKE '%_FEE' THEN adjustedamount ELSE 0 END) as fieldcollection, SUM(CASE WHEN taxheadcode LIKE '%_TAX' THEN adjustedamount ELSE 0 END) as tax, SUM(CASE WHEN taxheadcode LIKE '%_CGST' THEN adjustedamount ELSE 0 END) as cgst, SUM(CASE WHEN taxheadcode LIKE '%_SGST' THEN adjustedamount ELSE 0 END) as sgst, @@ -1306,7 +1306,7 @@ ReportDefinitions: SUM(CASE WHEN taxheadcode LIKE '%_TAX' THEN adjustedamount ELSE 0 END) as tax, SUM(CASE WHEN taxheadcode LIKE '%_CGST' THEN adjustedamount ELSE 0 END) as cgst, SUM(CASE WHEN taxheadcode LIKE '%_SGST' THEN adjustedamount ELSE 0 END) as sgst, - SUM(CASE WHEN taxheadcode LIKE '%_FIELD_FEE' THEN adjustedamount ELSE 0 END) as fieldcollection, + SUM(CASE WHEN taxheadcode LIKE '%_FEE' THEN adjustedamount ELSE 0 END) as fieldcollection, sum(adjustedamount) as totalamount from egcl_paymentdetail paydetail INNER JOIN egcl_bill as bill on bill.id = paydetail.billid @@ -1455,7 +1455,7 @@ ReportDefinitions: SUM(CASE WHEN taxheadcode LIKE '%_CGST' THEN adjustedamount ELSE 0 END) as cgst, SUM(CASE WHEN taxheadcode LIKE '%_TAX' THEN adjustedamount ELSE 0 END) as tax, SUM(CASE WHEN taxheadcode LIKE '%_SGST' THEN adjustedamount ELSE 0 END) as sgst, - SUM(CASE WHEN taxheadcode LIKE '%_FIELD_FEE' THEN adjustedamount ELSE 0 END) as fieldcollection, + SUM(CASE WHEN taxheadcode LIKE '%_FEE' THEN adjustedamount ELSE 0 END) as fieldcollection, SUM(adjustedamount) as totalcollection FROM egcl_billaccountdetail INNER JOIN egcl_billdetial as billd on billd.id = egcl_billaccountdetail.billdetailid @@ -1575,7 +1575,7 @@ ReportDefinitions: SUM(CASE WHEN taxheadcode LIKE '%_CGST' THEN adjustedamount ELSE 0 END) as cgst, SUM(CASE WHEN taxheadcode LIKE '%_TAX' THEN adjustedamount ELSE 0 END) as tax, SUM(CASE WHEN taxheadcode LIKE '%_SGST' THEN adjustedamount ELSE 0 END) as sgst, - SUM(CASE WHEN taxheadcode LIKE '%_FIELD_FEE' THEN adjustedamount ELSE 0 END) as fieldcollection + SUM(CASE WHEN taxheadcode LIKE '%_FEE' THEN adjustedamount ELSE 0 END) as fieldcollection FROM egcl_billaccountdetail INNER JOIN egcl_billdetial as billd on billd.id = egcl_billaccountdetail.billdetailid INNER JOIN egcl_bill as bill on bill.id=billd.billid @@ -1685,3 +1685,68 @@ ReportDefinitions: JOIN eg_user ON payment.createdby::INTEGER=eg_user.id WHERE paydetail.businessservice not in ('PT','TL','FIRENOC') and payment.paymentstatus != 'CANCELLED' and payment.tenantid =$tenantid orderby: ORDER BY paydetail.receiptdate DESC + + + - reportName: EmployeeWiseCollectionUC_v2 + decryptionPathId: MiscReceiptULB_v2 + summary: Employee Wise Collection UC + version: 1.0.0 + moduleName: rainmaker-uc + additionalConfig: + print: + pdfPageSize: "A3" + sourceColumns: + - name: collectorname + label: reports.uc.collectorname + type: string + source: uc + total: false + - name: paymentmode + label: reports.uc.paymentmode + type: string + source: uc + total: false + - name: countofreceipts + label: reports.uc.countofreceipts + type: string + source: uc + total: true + - name: totalamount + label: reports.uc.totalamount + type: string + source: uc + total: true + searchParams: + - name: fromDate + label: reports.uc.fromDate + type: epoch + source: uc + isMandatory: false + searchClause: AND paydetail.receiptdate >= $fromDate + - name: toDate + label: reports.uc.toDate + type: epoch + source: uc + isMandatory: false + searchClause: AND paydetail.receiptdate <= $toDate + - name: collectorname + label: reports.uc.collectorname + type: singlevaluelist + pattern: http://egov-hrms:8080/egov-hrms/employees/_search?tenantId=$tenantid&roles=UC_EMP|$.Employees[*].user.id|$.Employees[*].user.name + source: uc + wrapper: true + isMandatory: false + searchClause: AND eg_user.id = $collectorname::INTEGER + query: | + SELECT + eg_user.name as collectorname, + paymentmode as paymentmode, + count(paydetail.receiptnumber) as Countofreceipts, + Sum(payment.totalamountpaid) as totalamount + FROM egcl_payment AS payment + JOIN egcl_paymentdetail as paydetail on paydetail.paymentid=payment.id + JOIN eg_user ON payment.createdby::INTEGER=eg_user.id + WHERE payment.tenantid=$tenantid AND businessservice not in ('PT','TL','FIRENOC') and payment.paymentstatus != 'CANCELLED' + groupby: group by collectorname , paymentmode + + From 137a035e3269472719eec98cba7cb1e0aabb71fb Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 26 Apr 2021 12:22:12 +0530 Subject: [PATCH 0588/1242] updated cheque_dd_date --- configs/reports/configs/pt-reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 32cc55ff..737950f5 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2484,7 +2484,7 @@ ReportDefinitions: payment.paymentmode as instrumenttype, payment.transactionnumber, concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear, - to_char((To_timestamp(payment.transactiondate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, + to_char((To_timestamp(payment.instrumentdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, payment.totaldue - payment.totalamountpaid AS pendingamount, Initcap(case when pt.usagecategory like '%.%' then split_part(pt.usagecategory,'.',2) else pt.usagecategory end) as usagetype, (case when eg_user.name is null then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else eg_user.name end) as collectorname, From b221938a21663cd4aaafcd6a102d2c2d2955e867 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 26 Apr 2021 13:02:09 +0530 Subject: [PATCH 0589/1242] optimized receiptRegister_without_locality_v2 --- configs/reports/configs/pt-reports.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 737950f5..b4458ea1 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2470,6 +2470,7 @@ ReportDefinitions: INNER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid INNER JOIN egcl_payment as payment on pd.paymentid=payment.id WHERE payment.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' + AND pd.receiptdate >= $fromDate AND pd.receiptdate <= $toDate GROUP BY pdid ) SELECT From aaf724d54592d0d16bf7f4629743dc6e38d3114a Mon Sep 17 00:00:00 2001 From: ramakrishnaippili Date: Tue, 27 Apr 2021 20:52:43 +0530 Subject: [PATCH 0590/1242] bill genie search query from QA --- configs/egov-searcher/bill-genie.yml | 196 ++++++++++++++------------- 1 file changed, 101 insertions(+), 95 deletions(-) diff --git a/configs/egov-searcher/bill-genie.yml b/configs/egov-searcher/bill-genie.yml index ed06f02b..87339e86 100644 --- a/configs/egov-searcher/bill-genie.yml +++ b/configs/egov-searcher/bill-genie.yml @@ -6,47 +6,47 @@ SearchDefinitions: - name: billswithaddranduser isCustomerRowMapEnabled: true rowMapperKey: billsearch - query: - baseQuery: with bill_data as ( + query: + baseQuery: with bill_data as ( - SELECT b.id AS b_id, b.mobilenumber, - b.tenantid AS b_tenantid, b.payername AS b_payername, - b.payeraddress AS b_payeraddress, b.payeremail AS b_payeremail, - b.isactive AS b_isactive, b.iscancelled AS b_iscancelled, + SELECT b.id AS b_id, b.mobilenumber, + b.tenantid AS b_tenantid, b.payername AS b_payername, + b.payeraddress AS b_payeraddress, b.payeremail AS b_payeremail, + b.isactive AS b_isactive, b.iscancelled AS b_iscancelled, b.createdby AS b_createdby, b.status as b_status,b.filestoreid AS b_filestoreid, - b.createddate AS b_createddate, b.lastmodifiedby AS b_lastmodifiedby, - b.lastmodifieddate AS b_lastmodifieddate, bd.id AS bd_id, + b.createddate AS b_createddate, b.lastmodifiedby AS b_lastmodifiedby, + b.lastmodifieddate AS b_lastmodifieddate, bd.id AS bd_id, bd.billid AS bd_billid, bd.tenantid AS bd_tenantid, - bd.businessservice AS bd_businessservice, bd.demandid, - bd.fromperiod, bd.toperiod, - bd.billno AS bd_billno, bd.billdate AS bd_billdate, - bd.consumercode AS bd_consumercode, bd.consumertype AS bd_consumertype, - bd.billdescription AS bd_billdescription, bd.displaymessage AS bd_displaymessage, - bd.minimumamount AS bd_minimumamount, bd.totalamount AS bd_totalamount, - bd.callbackforapportioning AS bd_callbackforapportioning, bd.expirydate AS bd_expirydate, - bd.partpaymentallowed AS bd_partpaymentallowed, bd.isadvanceallowed as bd_isadvanceallowed, - bd.collectionmodesnotallowed AS bd_collectionmodesnotallowed, bd.createddate as bd_createddate, + bd.businessservice AS bd_businessservice, bd.demandid, + bd.fromperiod, bd.toperiod, + bd.billno AS bd_billno, bd.billdate AS bd_billdate, + bd.consumercode AS bd_consumercode, bd.consumertype AS bd_consumertype, + bd.billdescription AS bd_billdescription, bd.displaymessage AS bd_displaymessage, + bd.minimumamount AS bd_minimumamount, bd.totalamount AS bd_totalamount, + bd.callbackforapportioning AS bd_callbackforapportioning, bd.expirydate AS bd_expirydate, + bd.partpaymentallowed AS bd_partpaymentallowed, bd.isadvanceallowed as bd_isadvanceallowed, + bd.collectionmodesnotallowed AS bd_collectionmodesnotallowed, bd.createddate as bd_createddate, b.additionaldetails as b_additionaldetails, bd.additionaldetails as bd_additionaldetails, - ad.id AS ad_id, ad.tenantid AS ad_tenantid, - ad.billdetail AS ad_billdetail, ad.glcode AS ad_glcode, - ad.orderno AS ad_orderno, ad.accountdescription AS ad_accountdescription, - ad.amount AS ad_amount, ad.adjustedamount AS ad_adjustedamount, - ad.taxheadcode AS ad_taxheadcode, ad.demanddetailid, - ad.isactualdemand AS ad_isactualdemand, ad.purpose AS ad_purpose, + ad.id AS ad_id, ad.tenantid AS ad_tenantid, + ad.billdetail AS ad_billdetail, ad.glcode AS ad_glcode, + ad.orderno AS ad_orderno, ad.accountdescription AS ad_accountdescription, + ad.amount AS ad_amount, ad.adjustedamount AS ad_adjustedamount, + ad.taxheadcode AS ad_taxheadcode, ad.demanddetailid, + ad.isactualdemand AS ad_isactualdemand, ad.purpose AS ad_purpose, ad.additionaldetails as ad_additionaldetails, - ptadd.doorNo as ptadd_doorNo,ptadd.landmark as ptadd_landmark, - ptadd.city as ptadd_city, ptadd.pincode as ptadd_pincode, - ptadd.locality as ptadd_locality, ptown.userid as ptown_userid - - FROM egbs_bill_v1 b INNER JOIN egbs_billdetail_v1 bd ON b.id = bd.billid AND b.tenantid = bd.tenantid - INNER JOIN egbs_billaccountdetail_v1 ad ON bd.id = ad.billdetail AND bd.tenantid = ad.tenantid - LEFT OUTER JOIN eg_pt_property pt ON bd.consumercode = pt.propertyid + ptadd.doorNo as ptadd_doorNo,ptadd.landmark as ptadd_landmark, + ptadd.city as ptadd_city, ptadd.pincode as ptadd_pincode, + ptadd.locality as ptadd_locality, ptown.userid as ptown_userid + + FROM egbs_bill_v1 b INNER JOIN egbs_billdetail_v1 bd ON b.id = bd.billid AND b.tenantid = bd.tenantid + INNER JOIN egbs_billaccountdetail_v1 ad ON bd.id = ad.billdetail AND bd.tenantid = ad.tenantid + LEFT OUTER JOIN eg_pt_property pt ON bd.consumercode = pt.propertyid INNER JOIN eg_pt_address ptadd ON ptadd.propertyid = pt.id - INNER JOIN eg_pt_asmt_assessment ptdet ON ptdet.propertyid = pt.propertyid + INNER JOIN eg_pt_asmt_assessment ptdet ON ptdet.propertyid = pt.propertyid INNER JOIN eg_pt_owner ptown ON pt.id = ptown.propertyid $where ) select * from bill_data inner join (select max(b_createddate) as maxcreateddate, bd_consumercode from bill_data group by bd_consumercode) as max ON max.maxcreateddate=b_createddate - searchParams: + searchParams: condition: AND params: - name: b.tenantid @@ -55,6 +55,7 @@ SearchDefinitions: - name: bd.consumercode isMandatory: false jsonPath: $.searchCriteria.consumerCode + operator: ILIKE - name: bd.businessservice isMandatory: false jsonPath: $.searchCriteria.businesService @@ -63,6 +64,7 @@ SearchDefinitions: jsonPath: $.searchCriteria.mobileNumber - name: bd.billno isMandatory: false + operator: ILIKE jsonPath: $.searchCriteria.billNo - name: ptadd.locality isMandatory: false @@ -86,51 +88,51 @@ SearchDefinitions: jsonFormat: {"ResponseInfo": {},"Bills": []} outJsonPath: $.Bills responseInfoPath: $.ResponseInfo - + - name: waterbills isCustomerRowMapEnabled: true rowMapperKey: billsearch - query: - baseQuery: with bill_data as ( - SELECT b.id AS b_id, b.mobilenumber, - b.tenantid AS b_tenantid, b.payername AS b_payername, - b.payeraddress AS b_payeraddress, b.payeremail AS b_payeremail, - b.isactive AS b_isactive, b.iscancelled AS b_iscancelled, - b.createdby AS b_createdby, b.status as b_status, b.filestoreid AS b_filestoreid, - b.createddate AS b_createddate, b.lastmodifiedby AS b_lastmodifiedby, - b.lastmodifieddate AS b_lastmodifieddate, bd.id AS bd_id, + query: + baseQuery: with bill_data as ( + SELECT b.id AS b_id, b.mobilenumber, + b.tenantid AS b_tenantid, b.payername AS b_payername, + b.payeraddress AS b_payeraddress, b.payeremail AS b_payeremail, + b.isactive AS b_isactive, b.iscancelled AS b_iscancelled, + b.createdby AS b_createdby, b.status as b_status, b.filestoreid AS b_filestoreid, + b.createddate AS b_createddate, b.lastmodifiedby AS b_lastmodifiedby, + b.lastmodifieddate AS b_lastmodifieddate, bd.id AS bd_id, bd.billid AS bd_billid, bd.tenantid AS bd_tenantid, - bd.businessservice AS bd_businessservice, bd.demandid, - bd.fromperiod, bd.toperiod, - bd.billno AS bd_billno, bd.billdate AS bd_billdate, - bd.consumercode AS bd_consumercode, bd.consumertype AS bd_consumertype, - bd.billdescription AS bd_billdescription, bd.displaymessage AS bd_displaymessage, - bd.minimumamount AS bd_minimumamount, bd.totalamount AS bd_totalamount, - bd.callbackforapportioning AS bd_callbackforapportioning, bd.expirydate AS bd_expirydate, - bd.partpaymentallowed AS bd_partpaymentallowed, bd.isadvanceallowed as bd_isadvanceallowed, - bd.collectionmodesnotallowed AS bd_collectionmodesnotallowed, bd.createddate as bd_createddate, + bd.businessservice AS bd_businessservice, bd.demandid, + bd.fromperiod, bd.toperiod, + bd.billno AS bd_billno, bd.billdate AS bd_billdate, + bd.consumercode AS bd_consumercode, bd.consumertype AS bd_consumertype, + bd.billdescription AS bd_billdescription, bd.displaymessage AS bd_displaymessage, + bd.minimumamount AS bd_minimumamount, bd.totalamount AS bd_totalamount, + bd.callbackforapportioning AS bd_callbackforapportioning, bd.expirydate AS bd_expirydate, + bd.partpaymentallowed AS bd_partpaymentallowed, bd.isadvanceallowed as bd_isadvanceallowed, + bd.collectionmodesnotallowed AS bd_collectionmodesnotallowed, bd.createddate as bd_createddate, b.additionaldetails as b_additionaldetails, bd.additionaldetails as bd_additionaldetails, - ad.id AS ad_id, ad.tenantid AS ad_tenantid, - ad.billdetail AS ad_billdetail, ad.glcode AS ad_glcode, - ad.orderno AS ad_orderno, ad.accountdescription AS ad_accountdescription, - ad.amount AS ad_amount, ad.adjustedamount AS ad_adjustedamount, - ad.taxheadcode AS ad_taxheadcode, ad.demanddetailid, - ad.isactualdemand AS ad_isactualdemand, ad.purpose AS ad_purpose, + ad.id AS ad_id, ad.tenantid AS ad_tenantid, + ad.billdetail AS ad_billdetail, ad.glcode AS ad_glcode, + ad.orderno AS ad_orderno, ad.accountdescription AS ad_accountdescription, + ad.amount AS ad_amount, ad.adjustedamount AS ad_adjustedamount, + ad.taxheadcode AS ad_taxheadcode, ad.demanddetailid, + ad.isactualdemand AS ad_isactualdemand, ad.purpose AS ad_purpose, ad.additionaldetails as ad_additionaldetails, - ptadd.doorNo as ptadd_doorNo, ptadd.landmark as ptadd_landmark, - ptadd.city as ptadd_city, ptadd.pincode as ptadd_pincode, - ptadd.locality as ptadd_locality, ptown.userid as ptown_userid + ptadd.doorNo as ptadd_doorNo, ptadd.landmark as ptadd_landmark, + ptadd.city as ptadd_city, ptadd.pincode as ptadd_pincode, + ptadd.locality as ptadd_locality, ptown.userid as ptown_userid - FROM egbs_bill_v1 b INNER JOIN egbs_billdetail_v1 bd ON b.id = bd.billid AND b.tenantid = bd.tenantid + FROM egbs_bill_v1 b INNER JOIN egbs_billdetail_v1 bd ON b.id = bd.billid AND b.tenantid = bd.tenantid INNER JOIN egbs_billaccountdetail_v1 ad ON bd.id = ad.billdetail AND bd.tenantid = ad.tenantid INNER JOIN eg_ws_connection conn ON bd.consumercode = conn.connectionno INNER JOIN eg_pt_property pt ON conn.property_id = pt.id - INNER JOIN eg_pt_address ptadd ON ptadd.propertyid = pt.id + INNER JOIN eg_pt_address ptadd ON ptadd.propertyid = pt.id INNER JOIN eg_pt_owner ptown ON ptown.propertyid = pt.id $where ) select * from bill_data inner join (select max(b_createddate) as maxcreateddate, bd_consumercode from bill_data group by bd_consumercode) as max ON max.maxcreateddate=b_createddate - searchParams: + searchParams: condition: AND params: - name: b.tenantid @@ -139,6 +141,7 @@ SearchDefinitions: - name: bd.consumercode isMandatory: false jsonPath: $.searchCriteria.consumerCode + operator: ILIKE - name: bd.businessservice isMandatory: false jsonPath: $.searchCriteria.businesService @@ -147,6 +150,7 @@ SearchDefinitions: jsonPath: $.searchCriteria.mobileNumber - name: bd.billno isMandatory: false + operator: ILIKE jsonPath: $.searchCriteria.billNo - name: ptadd.locality isMandatory: false @@ -159,7 +163,7 @@ SearchDefinitions: isMandatory: false jsonPath: $.searchCriteria.toPeriod operator: GE - - name: b.isactive + - name: b.status isMandatory: false jsonPath: $.searchCriteria.billActive @@ -174,46 +178,46 @@ SearchDefinitions: - name: seweragebills isCustomerRowMapEnabled: true rowMapperKey: billsearch - query: - baseQuery: with bill_data as ( - SELECT b.id AS b_id, b.mobilenumber, - b.tenantid AS b_tenantid, b.payername AS b_payername, - b.payeraddress AS b_payeraddress, b.payeremail AS b_payeremail, - b.isactive AS b_isactive, b.iscancelled AS b_iscancelled, - b.createdby AS b_createdby, b.status as b_status, b.filestoreid AS b_filestoreid - b.createddate AS b_createddate, b.lastmodifiedby AS b_lastmodifiedby, - b.lastmodifieddate AS b_lastmodifieddate, bd.id AS bd_id, + query: + baseQuery: with bill_data as ( + SELECT b.id AS b_id, b.mobilenumber, + b.tenantid AS b_tenantid, b.payername AS b_payername, + b.payeraddress AS b_payeraddress, b.payeremail AS b_payeremail, + b.isactive AS b_isactive, b.iscancelled AS b_iscancelled, + b.createdby AS b_createdby, b.status as b_status, b.filestoreid AS b_filestoreid, + b.createddate AS b_createddate, b.lastmodifiedby AS b_lastmodifiedby, + b.lastmodifieddate AS b_lastmodifieddate, bd.id AS bd_id, bd.billid AS bd_billid, bd.tenantid AS bd_tenantid, - bd.businessservice AS bd_businessservice, bd.demandid, - bd.fromperiod, bd.toperiod, - bd.billno AS bd_billno, bd.billdate AS bd_billdate, - bd.consumercode AS bd_consumercode, bd.consumertype AS bd_consumertype, - bd.billdescription AS bd_billdescription, bd.displaymessage AS bd_displaymessage, - bd.minimumamount AS bd_minimumamount, bd.totalamount AS bd_totalamount, - bd.callbackforapportioning AS bd_callbackforapportioning, bd.expirydate AS bd_expirydate, - bd.partpaymentallowed AS bd_partpaymentallowed, bd.isadvanceallowed as bd_isadvanceallowed, - bd.collectionmodesnotallowed AS bd_collectionmodesnotallowed, bd.createddate as bd_createddate, + bd.businessservice AS bd_businessservice, bd.demandid, + bd.fromperiod, bd.toperiod, + bd.billno AS bd_billno, bd.billdate AS bd_billdate, + bd.consumercode AS bd_consumercode, bd.consumertype AS bd_consumertype, + bd.billdescription AS bd_billdescription, bd.displaymessage AS bd_displaymessage, + bd.minimumamount AS bd_minimumamount, bd.totalamount AS bd_totalamount, + bd.callbackforapportioning AS bd_callbackforapportioning, bd.expirydate AS bd_expirydate, + bd.partpaymentallowed AS bd_partpaymentallowed, bd.isadvanceallowed as bd_isadvanceallowed, + bd.collectionmodesnotallowed AS bd_collectionmodesnotallowed, bd.createddate as bd_createddate, b.additionaldetails as b_additionaldetails, bd.additionaldetails as bd_additionaldetails, - ad.id AS ad_id, ad.tenantid AS ad_tenantid, - ad.billdetail AS ad_billdetail, ad.glcode AS ad_glcode, - ad.orderno AS ad_orderno, ad.accountdescription AS ad_accountdescription, - ad.amount AS ad_amount, ad.adjustedamount AS ad_adjustedamount, - ad.taxheadcode AS ad_taxheadcode, ad.demanddetailid, - ad.isactualdemand AS ad_isactualdemand, ad.purpose AS ad_purpose, + ad.id AS ad_id, ad.tenantid AS ad_tenantid, + ad.billdetail AS ad_billdetail, ad.glcode AS ad_glcode, + ad.orderno AS ad_orderno, ad.accountdescription AS ad_accountdescription, + ad.amount AS ad_amount, ad.adjustedamount AS ad_adjustedamount, + ad.taxheadcode AS ad_taxheadcode, ad.demanddetailid, + ad.isactualdemand AS ad_isactualdemand, ad.purpose AS ad_purpose, ad.additionaldetails as ad_additionaldetails, - ptadd.doorNo as ptadd_doorNo, ptadd.landmark as ptadd_landmark, - ptadd.city as ptadd_city, ptadd.pincode as ptadd_pincode, - ptadd.locality as ptadd_locality, ptown.userid as ptown_userid + ptadd.doorNo as ptadd_doorNo, ptadd.landmark as ptadd_landmark, + ptadd.city as ptadd_city, ptadd.pincode as ptadd_pincode, + ptadd.locality as ptadd_locality, ptown.userid as ptown_userid - FROM egbs_bill_v1 b INNER JOIN egbs_billdetail_v1 bd ON b.id = bd.billid AND b.tenantid = bd.tenantid + FROM egbs_bill_v1 b INNER JOIN egbs_billdetail_v1 bd ON b.id = bd.billid AND b.tenantid = bd.tenantid INNER JOIN egbs_billaccountdetail_v1 ad ON bd.id = ad.billdetail AND bd.tenantid = ad.tenantid INNER JOIN eg_sw_connection conn ON bd.consumercode = conn.connectionno INNER JOIN eg_pt_property pt ON conn.property_id = pt.id - INNER JOIN eg_pt_address ptadd ON ptadd.propertyid = pt.id + INNER JOIN eg_pt_address ptadd ON ptadd.propertyid = pt.id INNER JOIN eg_pt_owner ptown ON ptown.propertyid = pt.id $where ) select * from bill_data inner join (select max(b_createddate) as maxcreateddate, bd_consumercode from bill_data group by bd_consumercode) as max ON max.maxcreateddate=b_createddate - searchParams: + searchParams: condition: AND params: - name: b.tenantid @@ -222,6 +226,7 @@ SearchDefinitions: - name: bd.consumercode isMandatory: false jsonPath: $.searchCriteria.consumerCode + operator: ILIKE - name: bd.businessservice isMandatory: false jsonPath: $.searchCriteria.businesService @@ -230,6 +235,7 @@ SearchDefinitions: jsonPath: $.searchCriteria.mobileNumber - name: bd.billno isMandatory: false + operator: ILIKE jsonPath: $.searchCriteria.billNo - name: ptadd.locality isMandatory: false @@ -242,7 +248,7 @@ SearchDefinitions: isMandatory: false jsonPath: $.searchCriteria.toPeriod operator: GE - - name: b.isactive + - name: b.status isMandatory: false jsonPath: $.searchCriteria.billActive From 81e6c679d147b23a2a1112e578ad13ba54884718 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Wed, 28 Apr 2021 16:19:51 +0530 Subject: [PATCH 0591/1242] Update ws-bill.json --- configs/pdf-service/data-config/ws-bill.json | 174 +++++++++++++++++-- 1 file changed, 156 insertions(+), 18 deletions(-) diff --git a/configs/pdf-service/data-config/ws-bill.json b/configs/pdf-service/data-config/ws-bill.json index 0ae6f850..c294a77a 100644 --- a/configs/pdf-service/data-config/ws-bill.json +++ b/configs/pdf-service/data-config/ws-bill.json @@ -180,6 +180,30 @@ "module": "rainmaker-common" } }, + { + "variable": "advanceAdjusted_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ADVANCEADJUSTED" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "advanceAvailable_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ADVANCEAVAILABLE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, { "variable": "charge_label", "value": { @@ -255,73 +279,73 @@ { "variable": "payment_received", "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PAYMENT_RECEIVED" + "path": "PDF_STATIC_LABEL_WS_BILL_PAYMENT_RECEIVED" }, "type": "label", "localisation": { "required": true, "prefix": null, - "module": "rainmaker-common" + "module": "rainmaker-ws" } }, { "variable": "this_document", "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_THIS_DOCUMENT" + "path": "PDF_STATIC_LABEL_WS_BILL_THIS_DOCUMENT" }, "type": "label", "localisation": { "required": true, "prefix": null, - "module": "rainmaker-common" + "module": "rainmaker-ws" } }, { "variable": "this_is_a", "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_THIS_IS" + "path": "PDF_STATIC_LABEL_WS_BILL_THIS_IS" }, "type": "label", "localisation": { "required": true, "prefix": null, - "module": "rainmaker-common" + "module": "rainmaker-ws" } }, { "variable": "assessment_payment", "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ASSESSSMENT_PAYMENT" + "path": "PDF_STATIC_LABEL_WS_BILL_ASSESSSMENT_PAYMENT" }, "type": "label", "localisation": { "required": true, "prefix": null, - "module": "rainmaker-common" + "module": "rainmaker-ws" } }, { "variable": "please_deposit", "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PLEASE_DEPOSIT" + "path": "PDF_STATIC_LABEL_WS_BILL_PLEASE_DEPOSIT" }, "type": "label", "localisation": { "required": true, "prefix": null, - "module": "rainmaker-common" + "module": "rainmaker-ws" } }, { "variable": "if_the_tax", "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_IF_THE_TAX" + "path": "PDF_STATIC_LABEL_WS_BILL_IF_THE_TAX" }, "type": "label", "localisation": { "required": true, "prefix": null, - "module": "rainmaker-common" + "module": "rainmaker-ws" } }, { @@ -438,6 +462,12 @@ "path": "$.payerAddress" } }, + { + "variable": "tenant", + "value": { + "path": "$.tenantId" + } + }, { "variable": "nameAddress", "value": { @@ -486,7 +516,7 @@ "type": "date" }, { - "variable": "propertyID", + "variable": "consumerCode", "value": { "path": "$.consumerCode" } @@ -560,7 +590,7 @@ { "variable": "waterCess", "value": { - "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'WS_WATER_CESS')].amount" + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'WS_WATER_CESS' || @.taxHeadCode == 'SW_SEWERAGE_CESS')].amount" } }, { @@ -584,7 +614,7 @@ { "variable": "carryForward", "value": { - "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_ADVANCE_CARRYFORWARD')].amount" + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'WS_ADVANCE_CARRYFORWARD' || @.taxHeadCode == 'SW_ADVANCE_CARRYFORWARD')].amount" } }, { @@ -612,6 +642,12 @@ "path": "$.arrearAmount" } }, + { + "variable": "WS_AdvanceAdjusted", + "value": { + "path": "$.AdvanceAdjustedValue" + } + }, { "variable": "scissorImage", "url": "http://www.pngall.com/wp-content/uploads/2016/03/Scissor-PNG-Clipart.png", @@ -623,7 +659,7 @@ "derived": [ { "variable": "charge", - "formula": "{{taxCharge}}+{{fees}}" + "formula": "{{ws_charge}}" }, { "variable": "penalty", @@ -634,12 +670,36 @@ "formula": "{{timeRebate}}+{{adhocRebate}}" }, { - "variable": "others", + "variable": "billOthers", "formula": "{{cancerCess}}+{{roundoff}}+{{timeInterest}}+{{ceilingDebit}}+{{ceilingCredit}}+{{firecess}}+{{waterCess}}" }, + { + "variable": "demandTotalAmount", + "formula": "{{ws_roundoff}}+{{ws_charge}}+{{ws_water_cess}}+{{ws_time_interest}}+{{ws_time_penalty}}" + }, + { + "variable": "billTotalAmount", + "formula": "{{total}}" + }, { "variable": "arrears", - "formula": "{{WS_arrears}}" + "formula": "{{billTotalAmount}}>{{demandTotalAmount}}?({{billTotalAmount}}-{{demandTotalAmount}}).toFixed(2):0" + }, + { + "variable": "advanceAdjusted", + "formula": "{{billTotalAmount}}>=0?({{billTotalAmount}}<{{demandTotalAmount}}?({{billTotalAmount}}-{{demandTotalAmount}}).toFixed(2):0):{{demandTotalAmount}} * -1" + }, + { + "variable": "advanceAvailable", + "formula": "{{billTotalAmount}}<0?{{billTotalAmount}}*-1:0" + }, + { + "variable": "others", + "formula": "({{ws_roundoff}}+{{ws_water_cess}}+{{ws_time_interest}}).toFixed(2)" + }, + { + "variable": "calculatedTotal", + "formula": "{{billTotalAmount}}>0?{{billTotalAmount}}:0" } ] }, @@ -681,6 +741,84 @@ } } ] + }, + { + "path": "http://billing-service:8080/billing-service/demand/_search", + "queryParam": "tenantId=$.tenantId,consumerCode=$.consumerCode,businessService=WS", + "apiRequest": null, + "responseMapping": [ + { + "variable": "ws_advanceAmount", + "value": "$.Demands[(@.length-1)].demandDetails[?(@.taxHeadMasterCode == 'WS_ADVANCE_CARRYFORWARD')].taxAmount" + }, + { + "variable": "ws_roundoff", + "value": "$.Demands[(@.length-1)].demandDetails[?(@.taxHeadMasterCode == 'WS_Round_Off')].taxAmount" + }, + { + "variable": "ws_charge", + "value": "$.Demands[(@.length-1)].demandDetails[?(@.taxHeadMasterCode == 'WS_CHARGE')].taxAmount" + }, + { + "variable": "ws_water_cess", + "value": "$.Demands[(@.length-1)].demandDetails[?(@.taxHeadMasterCode == 'WS_WATER_CESS')].taxAmount" + }, + { + "variable": "ws_time_interest", + "value": "$.Demands[(@.length-1)].demandDetails[?(@.taxHeadMasterCode == 'WS_TIME_INTEREST')].taxAmount" + }, + { + "variable": "ws_time_penalty", + "value": "$.Demands[(@.length-1)].demandDetails[?(@.taxHeadMasterCode == 'WS_TIME_PENALTY')].taxAmount" + } + ] + }, + { + "path": "http://ws-services:8080/ws-services/wc/_search", + "queryParam": "tenantId=$.tenantId,connectionNumber=$.consumerCode", + "apiRequest": null, + "responseMapping": [ + { + "variable": "oldConnectionNo", + "value": "$.WaterConection[0].additionalDetails.oldConnectionNo" + }, + { + "variable": "ledgerId", + "value": "$.WaterConection[0].additionalDetails.ledgerId" + } + ] + }, + { + "path": "http://property-services.egov:8080/property-services/property/_search", + "queryParam": "tenantId=$.tenantId,uuids=$.additionalDetails.propertyId", + "apiRequest": null, + "responseMapping": [ + { + "variable": "usageType", + "value": "$.Properties[0].usageCategory" + }, + { + "variable": "plotSize", + "value": "$.Properties[0].landArea" + }, + { + "variable": "houseNo", + "value": "$.Properties[0].address.doorNo" + }, + { + "variable": "streetName", + "value": "$.Properties[0].address.street" + }, + { + "variable": "locality", + "value": "$.Properties[0].address.locality.name" + }, + { + "variable": "landmark", + "value": "$.Properties[0].address.landmark" + } + + ] } ] } From 4f12303de8b927a6fc96c85477a0c32236372d86 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Wed, 28 Apr 2021 16:20:21 +0530 Subject: [PATCH 0592/1242] Update ws-sanctionletter.json --- configs/pdf-service/data-config/ws-sanctionletter.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/configs/pdf-service/data-config/ws-sanctionletter.json b/configs/pdf-service/data-config/ws-sanctionletter.json index f10eb83b..2d96f01f 100644 --- a/configs/pdf-service/data-config/ws-sanctionletter.json +++ b/configs/pdf-service/data-config/ws-sanctionletter.json @@ -272,9 +272,7 @@ }, { "variable": "sla", - "value": { - "path": "$.sla" - } + "value": "10" }, { "variable": "slaDate", From 2a305a366760ddcd72888afab5f4cc8cbd3c1d9b Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Thu, 29 Apr 2021 10:08:53 +0530 Subject: [PATCH 0593/1242] Create bill-amendment-note.json --- .../data-config/bill-amendment-note.json | 613 ++++++++++++++++++ 1 file changed, 613 insertions(+) create mode 100644 configs/pdf-service/data-config/bill-amendment-note.json diff --git a/configs/pdf-service/data-config/bill-amendment-note.json b/configs/pdf-service/data-config/bill-amendment-note.json new file mode 100644 index 00000000..cf1f0492 --- /dev/null +++ b/configs/pdf-service/data-config/bill-amendment-note.json @@ -0,0 +1,613 @@ +{ + "key": "bill-amendment-credit-note", + "DataConfigs": { + "serviceName": "rainmaker-common", + "version": "1.0.0", + "baseKeyPath": "$.Amendments.*", + "entityIdPath":"$.id", + "isCommonTableBorderRequired": true, + "mappings": [ + { + "topic": "common-pdf-generation-3", + "mappings": [ + { + "direct": [ + { + "variable": "payerName", + "value": { + "path": "$.payerName" + } + }, + { + "variable": "applicationNo", + "value": { + "path": "$.consumerCode" + } + }, + { + "variable": "user-name", + "value": { + "path": "$.additionalDetails.ownerName" + } + }, + { + "variable": "permanentAddress", + "value": { + "path": "$.additionalDetails.ownerAddress" + } + }, + { + "variable": "date", + "value": { + "path": "$.userInfo.createdDate" + }, + "type":"selectFromRequestInfo" + }, + { + "variable": "payerContact", + "value": { + "path": "$.mobileNumber" + } + }, + { + "variable": "paymentStatus", + "value": { + "path": "$.paymentStatus" + } + }, + { + "variable": "receiptNo", + "value": { + "path": "$.paymentDetails[0].receiptNumber" + } + }, + { + "variable": "serviceType", + "value": { + "path": "$.businessService" + }, + "localisation":{ + "required":true, + "prefix":"MODULE", + "module":"rainmaker-common" + } + }, + { + "variable": "waterTax", + "value": { + "path": "$.demandDetails[?(@.taxHeadMasterCode == 'OM.WATER_CONNECTION/DISCONNECTION_FEES_TAX')].taxAmount" + } + }, + { + "variable": "water_cess", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_WATER_CESS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "waterCess", + "value": { + "path": "$.demandDetails[?(@.taxHeadMasterCode == 'WS_WATER_CESS')].taxAmount" + } + }, + { + "variable": "interest", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_INTEREST" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "generated_by", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_GENERATED_BY" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "commissioner/eo", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_COMMISSIONER_EO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "interestAmount", + "value": { + "path": "$.demandDetails[?(@.taxHeadMasterCode == 'WS_TIME_INTEREST')].taxAmount" + } + }, + { + "variable": "no_signature", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_NO_SIGNATURE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "penalty", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_PENALTY" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "penaltyAmount", + "value": { + "path": "$.demandDetails[?(@.taxHeadMasterCode == 'WS_ADHOC_PENALTY')].taxAmount" + } + }, + { + "variable": "arrears", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_ARREARS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "arrearsAmount", + "value": { + "path": "$.demandDetails[?(@.taxHeadMasterCode == 'ARREARS_AMOUNT')].taxAmount" + } + }, + { + "variable": "total_amount", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_TOTAL_AMOUNT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "bill_amendment_application", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_APPLICATION" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "demand_revision_basis_details", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_DEM_REV_BAS_DET" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "demand_revision_basis", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_DEM_REV_BASIS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "court_order_no", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_COURT_ORDER_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "with_effect_from", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_WITH_EFFECT_FROM" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "demandRevisionBasis", + "value": { + "path": "$.amendmentReason" + } + }, + { + "variable": "courtOrderNo", + "value": { + "path": "$.reasonDocumentNumber" + } + }, + { + "variable": "withEffectFrom", + "value": { + "path": "$.effectiveFrom" + } + }, + { + "variable": "court_order", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_COURT_ORDER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "note_id", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_NOTE_ID" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "note_date", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_NOTE_DATE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "against", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_NOTE_AGAINST" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "adjustment_amount_details", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_NOTE_ADJUSTMENT_AMOUNT_DETAILS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "total_amount", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_NOTE_TOTAL_AMOUNT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "rs", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_NOTE_RS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "box_note", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_NOTE_BOX_NOTE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "box_validity", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_NOTE_BOX_VALIDITY" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "self_declaration", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_SELF_DECLARATION" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "past_bills", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_PAST_BILLS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "courtOrder", + "value": { + "path": "$.transactionNumber" + } + }, + { + "variable": "selfDeclaration", + "value": { + "path": "$.transactionNumber" + } + }, + { + "variable": "pastBills", + "value": { + "path": "$.transactionNumber" + } + }, + { + "variable": "applicationNo", + "value": { + "path": "$.consumerCode" + } + }, + { + "variable": "bill_amendment_application_number", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_APPLICATION_NUMBER" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "adjustment_amount_details", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_ADJUSTMENT_AMOUNT_DETAILS" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + + }, + { + "variable": "sl_no", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_SERIAL_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "tax_heads", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_TAX_HEADS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "reduced_amount", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_REDUCED_AMOUNT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "note_type", + "value": { + "path": "$.additionalDetails.noteType" + }, + "localisation": { + "required": true, + "prefix": "PDF_STATIC_LABEL_BILL_AMENDMENT", + "module": "rainmaker-common" + } + }, + { + "variable": "water_tax", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_WATER_TAX" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "Municipal_Corporation", + "value": { + "path": "PDF_STATIC_LABEL_MDMS_MUNICIPAL_CORPORATION" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + } + ] + }, + { + "derived": [ + { + "variable": "totalAmount", + "formula": "{{arrearsAmount}}+{{penaltyAmount}}+{{interestAmount}}+{{waterCess}}+{{waterTax}}" + } + ] + }, + { + "externalAPI": [ + { + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", + "apiRequest": null, + "responseMapping":[ + { + "variable":"address", + "value":"$.MdmsRes.tenant.tenants[0].address" + }, + { + "variable":"phoneNumber", + "value":"$.MdmsRes.tenant.tenants[0].contactNumber" + }, + { + "variable":"website", + "value":"$.MdmsRes.tenant.tenants[0].domainUrl" + }, + { + "variable":"email", + "value":"$.MdmsRes.tenant.tenants[0].emailId" + }, + { + "variable": "logoImage", + "value":"$.MdmsRes.tenant.tenants[0].logoId", + "type":"image" + }, + { + "variable": "logo-header", + "value":"$.MdmsRes.tenant.tenants[0].code", + "localisation":{ + "required":true, + "prefix": "TENANT_TENANTS", + "module":"rainmaker-common" + } + } + ] + }, + { + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "queryParam": "moduleName=tenant&masterName=footer&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}' %26%26 @.service=='{$.businessService}')%5D", + "apiRequest": null, + "responseMapping":[ + { + "variable": "variable11", + "value": "$.MdmsRes.tenant.footer[0].receiptFooterContent.*", + "type":"array", + "format":{ + "type":"string", + "scema":[ + { + "variable":"disclaimerContent", + "value":"disclaimer", + "type":"string", + "localisation":{ + "required":true, + "prefix": null, + "module": "rainmaker-common" + } + } + ] + } + } + ] + } + ] + } + ] + } + ] + } +} From e9cb2583ccb625fec367670bea29190e676bf7a6 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Thu, 29 Apr 2021 10:09:29 +0530 Subject: [PATCH 0594/1242] Create bill-amendment.json --- .../data-config/bill-amendment.json | 464 ++++++++++++++++++ 1 file changed, 464 insertions(+) create mode 100644 configs/pdf-service/data-config/bill-amendment.json diff --git a/configs/pdf-service/data-config/bill-amendment.json b/configs/pdf-service/data-config/bill-amendment.json new file mode 100644 index 00000000..154ffb86 --- /dev/null +++ b/configs/pdf-service/data-config/bill-amendment.json @@ -0,0 +1,464 @@ +{ + "key": "bill-amendment-summary", + "DataConfigs": { + "serviceName": "rainmaker-common", + "version": "1.0.0", + "baseKeyPath": "$.Amendments.*", + "entityIdPath":"$.id", + "isCommonTableBorderRequired": true, + "mappings": [ + { + "topic": "common-pdf-generation-3", + "mappings": [ + { + "direct": [ + { + "variable": "payerName", + "value": { + "path": "$.payerName" + } + }, + { + "variable": "user-name", + "value": { + "path": "$.userInfo.name" + }, + "type":"selectFromRequestInfo" + }, + { + "variable": "payerContact", + "value": { + "path": "$.mobileNumber" + } + }, + { + "variable": "paymentStatus", + "value": { + "path": "$.paymentStatus" + } + }, + { + "variable": "receiptNo", + "value": { + "path": "$.paymentDetails[0].receiptNumber" + } + }, + { + "variable": "bill_amendment_adjusted_amount", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_ADJUSTED_AMOUNT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "serviceType", + "value": { + "path": "$.businessService" + }, + "localisation":{ + "required":true, + "prefix":"MODULE", + "module":"rainmaker-common" + } + }, + { + "variable": "waterTax", + "value": { + "path": "$.demandDetails[?(@.taxHeadMasterCode == 'OM.WATER_CONNECTION/DISCONNECTION_FEES_TAX')].taxAmount" + } + }, + { + "variable": "water_cess", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_WATER_CESS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "waterCess", + "value": { + "path": "$.demandDetails[?(@.taxHeadMasterCode == 'WS_WATER_CESS')].taxAmount" + } + }, + { + "variable": "interest", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_INTEREST" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "interestAmount", + "value": { + "path": "$.demandDetails[?(@.taxHeadMasterCode == 'WS_TIME_INTEREST')].taxAmount" + } + }, + { + "variable": "penalty", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_PENALTY" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "penaltyAmount", + "value": { + "path": "$.demandDetails[?(@.taxHeadMasterCode == 'WS_ADHOC_PENALTY')].taxAmount" + } + }, + { + "variable": "arrears", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_ARREARS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "arrearsAmount", + "value": { + "path": "$.demandDetails[?(@.taxHeadMasterCode == 'ARREARS_AMOUNT')].taxAmount" + } + }, + { + "variable": "total_amount", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_TOTAL_AMOUNT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "bill_amendment_application", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_APPLICATION" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "demand_revision_basis_details", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_DEM_REV_BAS_DET" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "demand_revision_basis", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_DEM_REV_BASIS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "court_order_no", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_COURT_ORDER_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "with_effect_from", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_WITH_EFFECT_FROM" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "demandRevisionBasis", + "value": { + "path": "$.amendmentReason" + } + }, + { + "variable": "courtOrderNo", + "value": { + "path": "$.reasonDocumentNumber" + } + }, + { + "variable": "withEffectFrom", + "value": { + "path": "$.effectiveFrom" + } + }, + { + "variable": "court_order", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_COURT_ORDER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "self_declaration", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_SELF_DECLARATION" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "past_bills", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_PAST_BILLS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "courtOrder", + "value": { + "path": "$.transactionNumber" + } + }, + { + "variable": "selfDeclaration", + "value": { + "path": "$.transactionNumber" + } + }, + { + "variable": "pastBills", + "value": { + "path": "$.transactionNumber" + } + }, + { + "variable": "applicationNo", + "value": { + "path": "$.consumerCode" + } + }, + { + "variable": "bill_amendment_application_number", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_APPLICATION_NUMBER" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "adjustment_amount_details", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_ADJUSTMENT_AMOUNT_DETAILS" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + + }, + { + "variable": "sl_no", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_SERIAL_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "tax_heads", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_TAX_HEADS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "reduced_amount", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_REDUCED_AMOUNT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "water_tax", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_WATER_TAX" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "Municipal_Corporation", + "value": { + "path": "PDF_STATIC_LABEL_MDMS_MUNICIPAL_CORPORATION" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + } + ] + }, + { + "derived": [ + { + "variable": "totalAmount", + "formula": "{{arrearsAmount}}+{{penaltyAmount}}+{{interestAmount}}+{{waterCess}}+{{waterTax}}" + } + ] + }, + { + "externalAPI": [ + { + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", + "apiRequest": null, + "responseMapping":[ + { + "variable":"address", + "value":"$.MdmsRes.tenant.tenants[0].address" + }, + { + "variable":"phoneNumber", + "value":"$.MdmsRes.tenant.tenants[0].contactNumber" + }, + { + "variable":"website", + "value":"$.MdmsRes.tenant.tenants[0].domainUrl" + }, + { + "variable":"email", + "value":"$.MdmsRes.tenant.tenants[0].emailId" + }, + { + "variable": "logoImage", + "value":"$.MdmsRes.tenant.tenants[0].logoId", + "type":"image" + }, + { + "variable": "logo-header", + "value":"$.MdmsRes.tenant.tenants[0].code", + "localisation":{ + "required":true, + "prefix": "TENANT_TENANTS", + "module":"rainmaker-common" + } + } + ] + }, + { + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "queryParam": "moduleName=tenant&masterName=footer&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}' %26%26 @.service=='{$.businessService}')%5D", + "apiRequest": null, + "responseMapping":[ + { + "variable": "variable11", + "value": "$.MdmsRes.tenant.footer[0].receiptFooterContent.*", + "type":"array", + "format":{ + "type":"string", + "scema":[ + { + "variable":"disclaimerContent", + "value":"disclaimer", + "type":"string", + "localisation":{ + "required":true, + "prefix": null, + "module": "rainmaker-common" + } + } + ] + } + } + ] + } + ] + } + ] + } + ] + } +} From cd64656443df714567dd6f44b09d97c7e4fe6329 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Thu, 29 Apr 2021 10:10:03 +0530 Subject: [PATCH 0595/1242] Create sewerage-bill-amendment-note.json --- .../sewerage-bill-amendment-note.json | 613 ++++++++++++++++++ 1 file changed, 613 insertions(+) create mode 100644 configs/pdf-service/data-config/sewerage-bill-amendment-note.json diff --git a/configs/pdf-service/data-config/sewerage-bill-amendment-note.json b/configs/pdf-service/data-config/sewerage-bill-amendment-note.json new file mode 100644 index 00000000..7d4f6d78 --- /dev/null +++ b/configs/pdf-service/data-config/sewerage-bill-amendment-note.json @@ -0,0 +1,613 @@ +{ + "key": "sw-bill-amendment-credit-note", + "DataConfigs": { + "serviceName": "rainmaker-common", + "version": "1.0.0", + "baseKeyPath": "$.Amendments.*", + "entityIdPath":"$.id", + "isCommonTableBorderRequired": true, + "mappings": [ + { + "topic": "common-pdf-generation-3", + "mappings": [ + { + "direct": [ + { + "variable": "payerName", + "value": { + "path": "$.payerName" + } + }, + { + "variable": "applicationNo", + "value": { + "path": "$.consumerCode" + } + }, + { + "variable": "user-name", + "value": { + "path": "$.additionalDetails.ownerName" + } + }, + { + "variable": "permanentAddress", + "value": { + "path": "$.additionalDetails.ownerAddress" + } + }, + { + "variable": "date", + "value": { + "path": "$.userInfo.createdDate" + }, + "type":"selectFromRequestInfo" + }, + { + "variable": "payerContact", + "value": { + "path": "$.mobileNumber" + } + }, + { + "variable": "paymentStatus", + "value": { + "path": "$.paymentStatus" + } + }, + { + "variable": "receiptNo", + "value": { + "path": "$.paymentDetails[0].receiptNumber" + } + }, + { + "variable": "serviceType", + "value": { + "path": "$.businessService" + }, + "localisation":{ + "required":true, + "prefix":"MODULE", + "module":"rainmaker-common" + } + }, + { + "variable": "sewerageInterest", + "value": { + "path": "$.demandDetails[?(@.taxHeadMasterCode == 'SW_TIME_INTEREST')].taxAmount" + } + }, + { + "variable": "water_cess", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_WATER_CESS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "interest", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_INTEREST" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "generated_by", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_GENERATED_BY" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "commissioner/eo", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_COMMISSIONER_EO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "no_signature", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_NO_SIGNATURE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "penalty", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_PENALTY" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "sewerage_charge", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_SEWERAGE_CHARGE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "seweragePenalty", + "value": { + "path": "$.demandDetails[?(@.taxHeadMasterCode == 'SW_TIME_PENALTY')].taxAmount" + } + }, + { + "variable": "arrears", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_ARREARS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "sewerageCharge", + "value": { + "path": "$.demandDetails[?(@.taxHeadMasterCode == 'SW_CHARGE')].taxAmount" + } + }, + { + "variable": "total_amount", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_TOTAL_AMOUNT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "bill_amendment_application", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_APPLICATION" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "demand_revision_basis_details", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_DEM_REV_BAS_DET" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "demand_revision_basis", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_DEM_REV_BASIS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "court_order_no", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_COURT_ORDER_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "with_effect_from", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_WITH_EFFECT_FROM" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "demandRevisionBasis", + "value": { + "path": "$.amendmentReason" + } + }, + { + "variable": "courtOrderNo", + "value": { + "path": "$.reasonDocumentNumber" + } + }, + { + "variable": "withEffectFrom", + "value": { + "path": "$.effectiveFrom" + } + }, + { + "variable": "court_order", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_COURT_ORDER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "note_id", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_NOTE_ID" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "note_date", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_NOTE_DATE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "against", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_NOTE_AGAINST" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "adjustment_amount_details", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_NOTE_ADJUSTMENT_AMOUNT_DETAILS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "total_amount", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_NOTE_TOTAL_AMOUNT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "rs", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_NOTE_RS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "box_note", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_NOTE_BOX_NOTE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "box_validity", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_NOTE_BOX_VALIDITY" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "self_declaration", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_SELF_DECLARATION" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "past_bills", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_PAST_BILLS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "courtOrder", + "value": { + "path": "$.transactionNumber" + } + }, + { + "variable": "selfDeclaration", + "value": { + "path": "$.transactionNumber" + } + }, + { + "variable": "pastBills", + "value": { + "path": "$.transactionNumber" + } + }, + { + "variable": "applicationNo", + "value": { + "path": "$.consumerCode" + } + }, + { + "variable": "bill_amendment_application_number", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_APPLICATION_NUMBER" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "adjustment_amount_details", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_ADJUSTMENT_AMOUNT_DETAILS" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + + }, + { + "variable": "sl_no", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_SERIAL_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "tax_heads", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_TAX_HEADS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "reduced_amount", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_REDUCED_AMOUNT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "note_type", + "value": { + "path": "$.additionalDetails.noteType" + }, + "localisation": { + "required": true, + "prefix": "PDF_STATIC_LABEL_BILL_AMENDMENT", + "module": "rainmaker-common" + } + }, + { + "variable": "water_tax", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_WATER_TAX" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "Municipal_Corporation", + "value": { + "path": "PDF_STATIC_LABEL_MDMS_MUNICIPAL_CORPORATION" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + } + ] + }, + { + "derived": [ + { + "variable": "totalAmount", + "formula": "{{sewerageCharge}}+{{sewerageInterest}}+{{seweragePenalty}}" + } + ] + }, + { + "externalAPI": [ + { + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", + "apiRequest": null, + "responseMapping":[ + { + "variable":"address", + "value":"$.MdmsRes.tenant.tenants[0].address" + }, + { + "variable":"phoneNumber", + "value":"$.MdmsRes.tenant.tenants[0].contactNumber" + }, + { + "variable":"website", + "value":"$.MdmsRes.tenant.tenants[0].domainUrl" + }, + { + "variable":"email", + "value":"$.MdmsRes.tenant.tenants[0].emailId" + }, + { + "variable": "logoImage", + "value":"$.MdmsRes.tenant.tenants[0].logoId", + "type":"image" + }, + { + "variable": "logo-header", + "value":"$.MdmsRes.tenant.tenants[0].code", + "localisation":{ + "required":true, + "prefix": "TENANT_TENANTS", + "module":"rainmaker-common" + } + } + ] + }, + { + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "queryParam": "moduleName=tenant&masterName=footer&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}' %26%26 @.service=='{$.businessService}')%5D", + "apiRequest": null, + "responseMapping":[ + { + "variable": "variable11", + "value": "$.MdmsRes.tenant.footer[0].receiptFooterContent.*", + "type":"array", + "format":{ + "type":"string", + "scema":[ + { + "variable":"disclaimerContent", + "value":"disclaimer", + "type":"string", + "localisation":{ + "required":true, + "prefix": null, + "module": "rainmaker-common" + } + } + ] + } + } + ] + } + ] + } + ] + } + ] + } +} From e08a533bfadf162a1e9405880489570362cb1d3c Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Thu, 29 Apr 2021 10:13:23 +0530 Subject: [PATCH 0596/1242] Create sw-bill.json --- configs/pdf-service/data-config/sw-bill.json | 829 +++++++++++++++++++ 1 file changed, 829 insertions(+) create mode 100644 configs/pdf-service/data-config/sw-bill.json diff --git a/configs/pdf-service/data-config/sw-bill.json b/configs/pdf-service/data-config/sw-bill.json new file mode 100644 index 00000000..1be82a18 --- /dev/null +++ b/configs/pdf-service/data-config/sw-bill.json @@ -0,0 +1,829 @@ +{ + "key": "sw-bill", + "DataConfigs": { + "serviceName": "rainmaker-common", + "version": "1.0.0", + "baseKeyPath": "$.Bill.*", + "entityIdPath": "$.billNumber", + "isCommonTableBorderRequired": true, + "mappings": [ + { + "topic": "common-pdf-generation-1", + "staticConfigPath": "https://raw.githubusercontent.com/egovernments/egov-services/vishal-feature-filestore/core/egov-indexer/src/main/resources/rainmaker-pgr-indexer.yml", + "mappings": [ + { + "direct": [ + { + "variable": "total_amount_due", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_TOTAL_AMOUNT_DUE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "payer_name", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PAYER_NAME" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "Municipal_Corporation", + "value": { + "path": "PDF_STATIC_LABEL_MDMS_MUNICIPAL_CORPORATION" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "bill_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_BILL_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "Rs", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_RUPEE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "mobile_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_MOBILE_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "bill_period", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_BILL_PERIOD" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "payer_address", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PAYER_ADDRESS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "bill_issue_date", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ISSUE_DATE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "bill_due_date", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_BILL_DUE_DATE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "billing_summary_property_tax", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_BILLING_SUMMARY" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "serviceType", + "value": { + "path": "$.businessService" + }, + "localisation": { + "required": true, + "prefix": "MODULE", + "module": "rainmaker-common" + } + }, + { + "variable": "property_id", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PROPERTY_ID" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "arrears_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ARREARS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "advanceAdjusted_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ADVANCEADJUSTED" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "advanceAvailable_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ADVANCEAVAILABLE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "charge_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_CHARGE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "penalty_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PENALTY" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "rebate_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_REBATE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "others_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_OTHERS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "total_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_TOTAL" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "important_message", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_IMPORTANT_MESSAGE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "payment_received", + "value": { + "path": "PDF_STATIC_LABEL_WS_BILL_PAYMENT_RECEIVED" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-ws" + } + }, + { + "variable": "this_document", + "value": { + "path": "PDF_STATIC_LABEL_WS_BILL_THIS_DOCUMENT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-ws" + } + }, + { + "variable": "this_is_a", + "value": { + "path": "PDF_STATIC_LABEL_WS_BILL_THIS_IS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-ws" + } + }, + { + "variable": "assessment_payment", + "value": { + "path": "PDF_STATIC_LABEL_WS_BILL_ASSESSSMENT_PAYMENT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-ws" + } + }, + { + "variable": "please_deposit", + "value": { + "path": "PDF_STATIC_LABEL_WS_BILL_PLEASE_DEPOSIT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-ws" + } + }, + { + "variable": "if_the_tax", + "value": { + "path": "PDF_STATIC_LABEL_WS_BILL_IF_THE_TAX" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-ws" + } + }, + { + "variable": "acknowledgement_for", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ACKNOWLEDGEMENT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "date_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_DATE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "consumer_id", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_CONSUMER_ID" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "consumer_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_CONSUMER_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "name_address", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_NAME_ADDRESS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "total_payment", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_TOTAL_PAYMENT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "receivers_signature", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_RECEIVERS_SIGNATURE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "totalAmountDue", + "value": { + "path": "$.totalAmount" + } + }, + { + "variable": "total", + "value": { + "path": "$.totalAmount" + } + }, + { + "variable": "payerName", + "value": { + "path": "$.payerName" + } + }, + { + "variable": "mobileNo", + "value": { + "path": "$.mobileNumber" + } + }, + { + "variable": "payerAddress", + "value": { + "path": "$.payerAddress" + } + }, + { + "variable": "tenant", + "value": { + "path": "$.tenantId" + } + }, + { + "variable": "nameAddress", + "value": { + "path": "$.payerAddress" + } + }, + { + "variable": "billNo", + "value": { + "path": "$.billNumber" + } + }, + { + "variable": "fromPeriod", + "value": { + "path": "$.billDetails[0].fromPeriod" + }, + "type": "date" + }, + { + "variable": "toPeriod", + "value": { + "path": "$.billDetails[0].toPeriod" + }, + "type": "date" + }, + { + "variable": "billIssueDate", + "value": { + "path": "$.billDate" + }, + "type": "date" + }, + { + "variable": "billDueDate", + "value": { + "path": "$.billDetails[0].expiryDate" + }, + "type": "date" + }, + { + "variable": "billdate", + "value": { + "path": "$.billDate" + }, + "type": "date" + }, + { + "variable": "consumerCode", + "value": { + "path": "$.consumerCode" + } + }, + { + "variable": "taxCharge", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_TAX' || @.taxHeadCode == 'TL_TAX' || @.taxHeadCode == 'FIRENOC_TAXES' || @.taxHeadCode == 'WS_CHARGE' || @.taxHeadCode == 'SW_CHARGE' )].amount" + } + }, + { + "variable": "timeRebate", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_TIME_REBATE' || @.taxHeadCode == 'WS_TIME_REBATE' || @.taxHeadCode == 'SW_TIME_REBATE')].amount" + } + }, + { + "variable": "adhocRebate", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_ADHOC_REBATE' || @.taxHeadCode == 'TL_ADHOC_REBATE' || @.taxHeadCode == 'FIRENOC_ADHOC_REBATE')].amount" + } + }, + { + "variable": "timePenalty", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_TIME_PENALTY' || @.taxHeadCode == 'WS_TIME_PENALTY' || @.taxHeadCode == 'SW_TIME_PENALTY')].amount" + } + }, + { + "variable": "adhocPenalty", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_ADHOC_PENALTY' || @.taxHeadCode == 'TL_ADHOC_PENALTY' || @.taxHeadCode == 'FIRENOC_ADHOC_PENALTY')].amount" + } + }, + { + "variable": "firecess", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_FIRE_CESS')].amount" + } + }, + { + "variable": "usageExemption", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_UNIT_USAGE_EXEMPTION')].amount" + } + }, + { + "variable": "roundoff", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_ROUNDOFF' || @.taxHeadCode == 'TL_ROUNDOFF' || @.taxHeadCode == 'FIRENOC_ROUNDOFF' || @.taxHeadCode == 'WS_Round_Off' || @.taxHeadCode == 'SW_Round_Off')].amount" + } + }, + { + "variable": "fees", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'FIRENOC_FEES')].amount" + } + }, + { + "variable": "ownerExemption", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_OWNER_EXEMPTION')].amount" + } + }, + { + "variable": "cancerCess", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_CANCER_CESS')].amount" + } + }, + { + "variable": "waterCess", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'WS_WATER_CESS' || @.taxHeadCode == 'SW_SEWERAGE_CESS')].amount" + } + }, + { + "variable": "timeInterest", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_TIME_INTEREST' || @.taxHeadCode == 'WS_TIME_INTEREST' || @.taxHeadCode == 'SW_TIME_INTEREST')].amount" + } + }, + { + "variable": "ceilingDebit", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_DECIMAL_CEILING_DEBIT')].amount" + } + }, + { + "variable": "ceilingCredit", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_DECIMAL_CEILING_CREDIT')].amount" + } + }, + { + "variable": "carryForward", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'WS_ADVANCE_CARRYFORWARD' || @.taxHeadCode == 'SW_ADVANCE_CARRYFORWARD')].amount" + } + }, + { + "variable": "consumerID", + "value": { + "path": "$.consumerCode" + } + }, + { + "variable": "date", + "value": { + "path": "$.billDate" + }, + "type": "date" + }, + { + "variable": "totalPayment", + "value": { + "path": "$.billDetails[0].amountPaid" + } + }, + { + "variable": "WS_arrears", + "value": { + "path": "$.arrearAmount" + } + }, + { + "variable": "WS_AdvanceAdjusted", + "value": { + "path": "$.AdvanceAdjustedValue" + } + }, + { + "variable": "scissorImage", + "url": "http://www.pngall.com/wp-content/uploads/2016/03/Scissor-PNG-Clipart.png", + "type": "image" + } + ] + }, + { + "derived": [ + { + "variable": "charge", + "formula": "{{ws_charge}}" + }, + { + "variable": "penalty", + "formula": "{{timePenalty}}+{{adhocPenalty}}" + }, + { + "variable": "rebate", + "formula": "{{timeRebate}}+{{adhocRebate}}" + }, + { + "variable": "billOthers", + "formula": "{{cancerCess}}+{{roundoff}}+{{timeInterest}}+{{ceilingDebit}}+{{ceilingCredit}}+{{firecess}}+{{waterCess}}" + }, + { + "variable": "demandTotalAmount", + "formula": "{{ws_roundoff}}+{{ws_charge}}+{{ws_water_cess}}+{{ws_time_interest}}+{{ws_time_penalty}}" + }, + { + "variable": "billTotalAmount", + "formula": "{{total}}" + }, + { + "variable": "arrears", + "formula": "{{billTotalAmount}}>{{demandTotalAmount}}?({{billTotalAmount}}-{{demandTotalAmount}}).toFixed(2):0" + }, + { + "variable": "advanceAdjusted", + "formula": "{{billTotalAmount}}>=0?({{billTotalAmount}}<{{demandTotalAmount}}?({{billTotalAmount}}-{{demandTotalAmount}}).toFixed(2):0):{{demandTotalAmount}} * -1" + }, + { + "variable": "advanceAvailable", + "formula": "{{billTotalAmount}}<0?{{billTotalAmount}}*-1:0" + }, + { + "variable": "others", + "formula": "({{ws_roundoff}}+{{ws_water_cess}}+{{ws_time_interest}}).toFixed(2)" + }, + { + "variable": "calculatedTotal", + "formula": "{{billTotalAmount}}>0?{{billTotalAmount}}:0" + } + ] + }, + { + "externalAPI": [ + { + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", + "apiRequest": null, + "responseMapping": [ + { + "variable": "address", + "value": "$.MdmsRes.tenant.tenants[0].address" + }, + { + "variable": "phoneNumber", + "value": "$.MdmsRes.tenant.tenants[0].contactNumber" + }, + { + "variable": "website", + "value": "$.MdmsRes.tenant.tenants[0].domainUrl" + }, + { + "variable": "email", + "value": "$.MdmsRes.tenant.tenants[0].emailId" + }, + { + "variable": "logoImage", + "value": "$.MdmsRes.tenant.tenants[0].logoId", + "type": "image" + }, + { + "variable": "logo_header", + "value": "$.MdmsRes.tenant.tenants[0].code", + "localisation": { + "required": true, + "prefix": "TENANT_TENANTS", + "module": "rainmaker-common" + } + } + ] + }, + { + "path": "http://billing-service:8080/billing-service/demand/_search", + "queryParam": "tenantId=$.tenantId,consumerCode=$.consumerCode,businessService=WS", + "apiRequest": null, + "responseMapping": [ + { + "variable": "ws_advanceAmount", + "value": "$.Demands[(@.length-1)].demandDetails[?(@.taxHeadMasterCode == 'WS_ADVANCE_CARRYFORWARD')].taxAmount" + }, + { + "variable": "ws_roundoff", + "value": "$.Demands[(@.length-1)].demandDetails[?(@.taxHeadMasterCode == 'WS_Round_Off')].taxAmount" + }, + { + "variable": "ws_charge", + "value": "$.Demands[(@.length-1)].demandDetails[?(@.taxHeadMasterCode == 'WS_CHARGE')].taxAmount" + }, + { + "variable": "ws_water_cess", + "value": "$.Demands[(@.length-1)].demandDetails[?(@.taxHeadMasterCode == 'WS_WATER_CESS')].taxAmount" + }, + { + "variable": "ws_time_interest", + "value": "$.Demands[(@.length-1)].demandDetails[?(@.taxHeadMasterCode == 'WS_TIME_INTEREST')].taxAmount" + }, + { + "variable": "ws_time_penalty", + "value": "$.Demands[(@.length-1)].demandDetails[?(@.taxHeadMasterCode == 'WS_TIME_PENALTY')].taxAmount" + } + ] + }, + { + "path": "http://sw-services:8080/sw-services/swc/_search", + "queryParam": "tenantId=$.tenantId,connectionNumber=$.consumerCode", + "apiRequest": null, + "responseMapping": [ + { + "variable": "oldConnectionNo", + "value": "$.SewerageConnection[0].additionalDetails.oldConnectionNo" + }, + { + "variable": "ledgerId", + "value": "$.SewerageConnection[0].additionalDetails.ledgerId" + } + ] + }, + { + "path": "http://property-services.egov:8080/property-services/property/_search", + "queryParam": "tenantId=$.tenantId,uuids=$.additionalDetails.propertyId", + "apiRequest": null, + "responseMapping": [ + { + "variable": "usageType", + "value": "$.Properties[0].usageCategory" + }, + { + "variable": "plotSize", + "value": "$.Properties[0].landArea" + }, + { + "variable": "houseNo", + "value": "$.Properties[0].address.doorNo" + }, + { + "variable": "streetName", + "value": "$.Properties[0].address.street" + }, + { + "variable": "locality", + "value": "$.Properties[0].address.locality.name" + }, + { + "variable": "landmark", + "value": "$.Properties[0].address.landmark" + } + + ] + } + ] + } + ] + } + ] + } +} From b967c8a4e00ef2eb00170aa94aea2f8135c6e740 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Thu, 29 Apr 2021 10:16:27 +0530 Subject: [PATCH 0597/1242] Update ws-applicationsewerage.json From 2dea511e37f4bed384b83d400f10b8c639c99c64 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Thu, 29 Apr 2021 10:17:05 +0530 Subject: [PATCH 0598/1242] Update ws-applicationwater.json From 4474ca2ef318f82e82bd7c70178c06e20c6255b8 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Thu, 29 Apr 2021 10:17:37 +0530 Subject: [PATCH 0599/1242] Update ws-bill.json From 236c6639fabed83a127e6f35a8af35925789b097 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Thu, 29 Apr 2021 10:17:59 +0530 Subject: [PATCH 0600/1242] Update ws-consolidatedacknowlegment.json From 8a59704f17c180dac5b6d6f5d4b172d9ed7b3e4c Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Thu, 29 Apr 2021 10:18:21 +0530 Subject: [PATCH 0601/1242] Update ws-consolidatedsewerageconnection.json From d998dd99183915700140d7b9de269f09ff0b4454 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Thu, 29 Apr 2021 10:18:43 +0530 Subject: [PATCH 0602/1242] Update ws-estimationnotice.json --- configs/pdf-service/data-config/ws-estimationnotice.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/configs/pdf-service/data-config/ws-estimationnotice.json b/configs/pdf-service/data-config/ws-estimationnotice.json index 43b6de6d..6dc1de94 100644 --- a/configs/pdf-service/data-config/ws-estimationnotice.json +++ b/configs/pdf-service/data-config/ws-estimationnotice.json @@ -41,7 +41,12 @@ "variable": "usageType", "value": { "path": "$.property.usageCategory" - } + }, + "localisation":{ + "required":true, + "prefix": null, + "module": "rainmaker-common" + } }, { "variable": "houseNo", From 688ea826168ada32def45567e20d13c04579a628 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Thu, 29 Apr 2021 10:19:14 +0530 Subject: [PATCH 0603/1242] Update ws-onetime-receipt.json --- .../data-config/ws-onetime-receipt.json | 77 ++++++++++++++++++- 1 file changed, 76 insertions(+), 1 deletion(-) diff --git a/configs/pdf-service/data-config/ws-onetime-receipt.json b/configs/pdf-service/data-config/ws-onetime-receipt.json index 7b30715e..08f2e8f3 100644 --- a/configs/pdf-service/data-config/ws-onetime-receipt.json +++ b/configs/pdf-service/data-config/ws-onetime-receipt.json @@ -112,6 +112,53 @@ "path": "$.transactionNumber" } }, + { + "variable": "chequeDD", + "value": { + "path": "$.instrumentNumber" + } + }, + { + "variable": "chequeDDDate", + "value": { + "path": "$.instrumentDate" + }, + "type":"date" + }, + { + "variable": "bankName", + "value": { + "path": "$.additionalDetails[0].bankName" + } + }, { + "variable": "branchName", + "value": { + "path": "$.additionalDetails[0].branchName" + } + }, { + "variable": "ifsc", + "value": { + "path": "$.ifscCode" + } + }, + { + "variable": "var_paymentheads", + "value":{ + "path":"$.paymentDetails[0].additionalDetails.*"}, + "type":"array", + "format":{ + "type":"string", + "scema":[ + { + "variable":"taxheaddd", + "value": "taxhead" + }, + { + "variable":"amountt", + "value": "amount" + }] + } + }, { "variable": "dueAmount", "value": { @@ -226,6 +273,30 @@ "module": "rainmaker-common" } }, + { + "variable": "bill_amount", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_BILL_AMOUNT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "advance_amount", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_ADVANCE_AMOUNT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, { "variable": "pending_amount", "value": { @@ -424,7 +495,11 @@ "derived": [ { "variable": "pendingAmount", - "formula": "{{dueAmount}}-{{paidAmount}}" + "formula": "{{paidAmount}}>{{dueAmount}}?0:{{dueAmount}}-{{paidAmount}}" + }, + { + "variable": "advanceAmount", + "formula": "{{paidAmount}}>{{dueAmount}}?{{paidAmount}}-{{dueAmount}}:0" } ] }, From 809313be9a0d32b68b9aaef64991da9b730cce34 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Thu, 29 Apr 2021 10:19:50 +0530 Subject: [PATCH 0604/1242] Update ws-sanctionletter.json --- configs/pdf-service/data-config/ws-sanctionletter.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/configs/pdf-service/data-config/ws-sanctionletter.json b/configs/pdf-service/data-config/ws-sanctionletter.json index 2d96f01f..fc0637c8 100644 --- a/configs/pdf-service/data-config/ws-sanctionletter.json +++ b/configs/pdf-service/data-config/ws-sanctionletter.json @@ -270,10 +270,6 @@ "path": "$.plumberInfo[0].mobileNumber" } }, - { - "variable": "sla", - "value": "10" - }, { "variable": "slaDate", "value": { From addd4ff0dc9322acdce0045e1b28aeeefc8522de Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Thu, 29 Apr 2021 10:29:24 +0530 Subject: [PATCH 0605/1242] Update ws-applicationsewerage.json From f21386439ec023abdabf0146b9cb82957fb28f5c Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Thu, 29 Apr 2021 10:32:30 +0530 Subject: [PATCH 0606/1242] Update ws-bill.json From 3150aa615e755c4547705b685972080853132bb4 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Thu, 29 Apr 2021 11:04:23 +0530 Subject: [PATCH 0607/1242] Create bill-amendment-note.json --- .../format-config/bill-amendment-note.json | 549 ++++++++++++++++++ 1 file changed, 549 insertions(+) create mode 100644 configs/pdf-service/format-config/bill-amendment-note.json diff --git a/configs/pdf-service/format-config/bill-amendment-note.json b/configs/pdf-service/format-config/bill-amendment-note.json new file mode 100644 index 00000000..f2d6e04f --- /dev/null +++ b/configs/pdf-service/format-config/bill-amendment-note.json @@ -0,0 +1,549 @@ +{ + "key": "bill-amendment-credit-note", + "config": { + "defaultStyle": { + "font": "Cambay" + }, + + "content": [ + { + "style": "noc-head", + "table": { + "widths": [ + 60, + "*", + 120 + ], + "color":"#484848", + "body": [ + [ + { + "image": "{{logoImage}}", + "width": 50, + "height": 61.25 + }, + { + "stack": [ + { + "text": "{{logo-header}} {{Municipal_Corporation}}", + "style": "receipt-logo-header" + }, + { + "text": "{{note_type}}", + "style": "receipt-logo-sub-header" + } + ], + "alignment": "left", + "margin": [ + 0, + 10, + 0, + 0 + ] + }, + { + "stack": [ + { + "text": "{{address}}" + }, + { + "text": "{{phoneNumber}}" + }, + { + "text": "{{website}}" + }, + { + "text": "{{email}}" + } + ], + "alignment": "right", + "color": "#484848", + "margin": [ + -100, + 0, + -25, + 0 + ] + } + ] + ] + }, + "layout": "noBorders" + }, + + { + "style": "note-info", + "columns": [ + { + "text": [ + { + "text": "{{note_id}} ", + "bold": true + }, + { + "text": "{{applicationNo}}", + "bold": false + } + ], + "alignment": "left" + }, + { + "text": [ + { + "text": "{{note_date}}", + "bold": true + }, + { + "text": "{{date}}", + "bold": false + } + ], + "alignment": "right", + "margin": [ + 0, + 0, + -10, + 1 + ] + } + ] + }, + + { + "style": "header", + "columns": [ + { + "text": [ + { + "text": "{{against}}", + "bold": true + } + ], + "alignment": "left" + } + ] + }, + { + "style": "header-1", + "text": "{{user-name}}", + "alignment": "left" + }, + { + "style": "header-1", + "text": "{{permanentAddress}}", + "alignment": "left" + }, + { + "style": "header", + "text": " ", + "alignment": "left" + }, + + { + "style": "note-info-1", + "columns": [ + { + "text": [ + { + "text": "{{adjustment_amount_details}}", + "bold": true + } + ], + "alignment": "left" + }, + { + "text": [ + { + "text": "{{total_amount}}", + "bold": true + } + ], + "alignment": "right", + "margin": [ + 0, + 0, + -200, + 1 + ] + }, + { + "text": [ + { + "text": "{{rs}} {{totalAmount}}", + "bold": true + } + ], + "alignment": "right", + "fontSize": 20, + "margin": [ + 0, + 25, + -10, + 1 + ] + } + ] + }, + + { + "style": "ws-table", + "table": { + "widths": [ + "70%" + ], + "body": [ + [ + { + "table": { + "widths": [ + "10%", + "30%", + "30%" + ], + "body": [ + [ + { + "text": "{{sl_no}}", + "alignment": "center" + }, + { + "text": "{{tax_heads}}", + "alignment": "left" + }, + { + "text": "{{reduced_amount}}", + "alignment": "right" + } + ], + [ + { + "text": "1.", + "alignment": "center" + }, + { + "text": "{{water_tax}}", + "alignment": "left" + }, + { + "text": "{{waterTax}}", + "alignment": "right" + } + ], + [ + { + "text": "2.", + "alignment": "center" + }, + { + "text": "{{water_cess}}", + "alignment": "left" + }, + { + "text": "{{waterCess}}", + "alignment": "right" + } + ], + [ + { + "text": "3.", + "alignment": "center" + }, + { + "text": "{{interest}}", + "alignment": "left" + }, + { + "text": "{{interestAmount}}", + "alignment": "right" + } + ], + [ + { + "text": "4.", + "alignment": "center" + }, + { + "text": "{{penalty}}", + "alignment": "left" + }, + { + "text": "{{penaltyAmount}}", + "alignment": "right" + } + ], + [ + { + "text": "5.", + "alignment": "center" + }, + { + "text": "{{arrears}}", + "alignment": "left" + }, + { + "text": "{{arrearsAmount}}", + "alignment": "right" + } + ], + [ + { + "text": " " + }, + { + "text": "{{total_amount}}", + "alignment": "left" + }, + { + "text": "{{totalAmount}}", + "alignment": "right" + } + ] + ] + }, + "border": [ + false, + false, + false, + false + ] + } + ] + ] + }, + "layout": {} + }, + + { + "style": "ws-table-1", + "table": { + "widths": [ + "130%" + ], + "body": [ + [ + { + "table": { + "widths": [ + "120%" + ], + "body": [ + [ + { + "text": "{{box_note}}", + "alignment": "left" + } + ] + ] + }, + "border": [ + false, + false, + false, + false + ] + } + ] + ] + }, + "layout": {} + }, + + { + "style": "header", + "text": " ", + "alignment": "left" + }, + + { + "style": "receipt-approver", + "columns": [ + { + "text": [ + { + "text": "{{generated_by}}: ", + "bold": true + }, + { + "text": "{{user-name}}", + "bold": false + } + ], + "alignment": "left" + }, + { + "text": [ + { + "text": "{{commissioner/eo}}", + "bold": true + } + ], + "alignment": "right", + "margin": [ + 0, + 0, + -10, + 1 + ] + } + ] + }, + + { + "style": "no-signature", + "text": "{{no_signature}}" + }, + + { + "style": "no-signature", + "text": "{{box_validity}}" + } + ], + + "styles": { + "noc-head": { + "margin": [ + -30, + -30, + 0, + 1 + ] + }, + "ws-head": { + "margin": [ + -39, + -38, + -38, + 0 + ] + }, + "receipt-logo-header": { + "color": "#000000", + "fontSize": 14, + "bold": true, + "letterSpacing": 0.74, + "margin": [ + 0, + 0, + 0, + 5 + ] + }, + "ws-table": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -25, + 18, + -8, + 10 + ] + }, + "ws-table-1": { + "fontSize": 12, + "color": "#000000", + "margin": [ + 380, + -120, + 20, + 10 + ] + }, + "receipt-logo-sub-header": { + "color": "#000000", + "fontSize": 12, + "letterSpacing": 0.6 + }, + "receipt-table-value": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 8, + 8, + 0, + 8 + ] + }, + "receipt-table": { + "color": "#000000", + "bold": false, + "fontSize": 12, + "fontWeight": 400, + "margin": [ + -10, + 8, + 0, + 8 + ] + }, + "header": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + -25, + 15, + 0, + -10 + ] + }, + "header-1": { + "color": "#000000", + "bold": false, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + -25, + 15, + 0, + -10 + ] + }, + "receipt-approver": { + "fontSize": 12, + "bold": true, + "margin": [ + -27, + 50, + -10, + 0 + ], + "color": "#484848" + }, + "note-info": { + "fontSize": 12, + "bold": true, + "margin": [ + -27, + 10, + -10, + 0 + ], + "color": "#000000" + }, + "note-info-1": { + "fontSize": 12, + "bold": true, + "margin": [ + -27, + 10, + -10, + -45 + ], + "color": "#000000" + }, + "no-signature": { + "fontSize": 12, + "margin": [ + -27, + 10, + -10, + 0 + ], + "color": "#484848" + } + } + } +} From bebf82a63d338fef5f97facc00ce812396c6990b Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Thu, 29 Apr 2021 11:04:56 +0530 Subject: [PATCH 0608/1242] Create bill-amendment.json --- .../format-config/bill-amendment.json | 546 ++++++++++++++++++ 1 file changed, 546 insertions(+) create mode 100644 configs/pdf-service/format-config/bill-amendment.json diff --git a/configs/pdf-service/format-config/bill-amendment.json b/configs/pdf-service/format-config/bill-amendment.json new file mode 100644 index 00000000..e8cee60c --- /dev/null +++ b/configs/pdf-service/format-config/bill-amendment.json @@ -0,0 +1,546 @@ +{ + "key": "bill-amendment-summary", + "config": { + "defaultStyle": { + "font": "Cambay" + }, + + "content": [ + { + "style": "noc-head", + "table": { + "widths": [ + 60, + "*", + 120 + ], + "color":"#484848", + "body": [ + [ + { + "image": "{{logoImage}}", + "width": 50, + "height": 61.25 + }, + { + "stack": [ + { + "text": "{{logo-header}} {{Municipal_Corporation}}", + "style": "receipt-logo-header" + }, + { + "text": "{{serviceType}} department", + "style": "receipt-logo-sub-header" + } + ], + "alignment": "left", + "margin": [ + 0, + 10, + 0, + 0 + ] + }, + { + "stack": [ + { + "text": "{{address}}" + }, + { + "text": "{{phoneNumber}}" + }, + { + "text": "{{website}}" + }, + { + "text": "{{email}}" + } + ], + "alignment": "right", + "color": "#484848", + "margin": [ + -100, + 0, + -25, + 0 + ] + } + ] + ] + }, + "layout": "noBorders" + }, + + { + "columns": [ + { + "text": "{{bill_amendment_application}}", + "style": "ws-header", + "margin": [ + 0, + 0, + 10, + 10 + ] + }, + { + "text": "{{bill_amendment_application_number}}", + "alignment": "right", + "margin": [ + 0, + 0, + -50, + 10 + ] + }, + { + "text": "{{applicationNo}}", + "alignment": "right", + "bold": true, + "margin": [ + -150, + 0, + -20, + 0 + ] + } + ], + "margin": [ + -26, + 10, + 0, + 0 + ] + }, + + { + "columns": [ + { + "text": "{{adjustment_amount_details}}", + "style": "header" + } + ] + }, + + { + "style": "ws-table", + "table": { + "widths": [ + "102%" + ], + "body": [ + [ + { + "table": { + "widths": [ + "10%", + "45%", + "45%" + ], + "body": [ + [ + { + "text": "{{sl_no}}", + "alignment": "center" + }, + { + "text": "{{tax_heads}}", + "alignment": "center" + }, + { + "text": "{{reduced_amount}}", + "alignment": "center" + } + ], + [ + { + "text": "1.", + "alignment": "center" + }, + { + "text": "{{water_tax}}", + "alignment": "left" + }, + { + "text": "{{waterTax}}", + "alignment": "right" + } + ], + [ + { + "text": "2.", + "alignment": "center" + }, + { + "text": "{{water_cess}}", + "alignment": "left" + }, + { + "text": "{{waterCess}}", + "alignment": "right" + } + ], + [ + { + "text": "3.", + "alignment": "center" + }, + { + "text": "{{interest}}", + "alignment": "left" + }, + { + "text": "{{interestAmount}}", + "alignment": "right" + } + ], + [ + { + "text": "4.", + "alignment": "center" + }, + { + "text": "{{penalty}}", + "alignment": "left" + }, + { + "text": "{{penaltyAmount}}", + "alignment": "right" + } + ], + [ + { + "text": "5.", + "alignment": "center" + }, + { + "text": "{{arrears}}", + "alignment": "left" + }, + { + "text": "{{arrearsAmount}}", + "alignment": "right" + } + ], + [ + { + "text": " " + }, + { + "text": "{{total_amount}}", + "alignment": "left" + }, + { + "text": "{{totalAmount}}", + "alignment": "right" + } + ] + ] + }, + "border": [ + false, + false, + false, + false + ] + } + ] + ] + }, + "layout": {} + }, + { + "text": "{{demand_revision_basis_details}}", + "bold": true, + "alignment": "left", + "style": "header" + }, + { + "style": "ws-table", + "table": { + "widths": [ + "102%" + ], + "body": [ + [ + { + "table": { + "widths": [ + "33%", + "33%", + "33%" + ], + "body": [ + [ + { + "text": "{{demand_revision_basis}}", + "alignment": "center", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{court_order_no}}", + "alignment": "center", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{with_effect_from}}", + "alignment": "center", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + } + ], + [ + { + "text": "{{demandRevisionBasis}}", + "alignment": "center", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{courtOrderNo}}", + "alignment": "center", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{withEffectFrom}}", + "alignment": "center", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + } + ] + ] + }, + "border": [ + true, + true, + true, + true + ] + } + ] + ] + }, + "layout": {} + }, + { + "text": "Documents", + "style": "header" + }, + { + "style": "ws-table", + "table": { + "widths": [ + "102%" + ], + "body": [ + [ + { + "table": { + "widths": [ + "33%", + "33%", + "33%" + ], + "body": [ + [ + { + "text": "{{court_order}}", + "alignment": "center", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{self_declaration}}", + "alignment": "center", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{past_bills}}", + "alignment": "center", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + } + ], + [ + { + "text": "{{courtOrder}}", + "alignment": "center", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{selfDeclaration}}", + "alignment": "center", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{pastBills}}", + "alignment": "center", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + } + ] + ] + }, + "border": [ + true, + true, + true, + true + ] + } + ] + ] + }, + "layout": {} + } + ], + + "styles": { + "noc-head": { + "margin": [ + -30, + -30, + 0, + 1 + ] + }, + "ws-head": { + "margin": [ + -39, + -38, + -38, + 0 + ] + }, + "receipt-logo-header": { + "color": "#000000", + "fontSize": 14, + "bold": true, + "letterSpacing": 0.74, + "margin": [ + 0, + 0, + 0, + 5 + ] + }, + "ws-table": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -25, + 18, + -8, + 10 + ] + }, + "receipt-logo-sub-header": { + "color": "#000000", + "fontSize": 12, + "letterSpacing": 0.6 + }, + "receipt-table-value": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 8, + 8, + 0, + 8 + ] + }, + "receipt-table": { + "color": "#000000", + "bold": false, + "fontSize": 12, + "fontWeight": 400, + "margin": [ + -10, + 8, + 0, + 8 + ] + }, + "header": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + -25, + 15, + 0, + -10 + ] + } + } + } +} From 2b848dd2096e1dacc1c0a5d732c4c8b2199c4b01 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Thu, 29 Apr 2021 11:05:39 +0530 Subject: [PATCH 0609/1242] Create sewerage-bill-amendment-note.json --- .../sewerage-bill-amendment-note.json | 521 ++++++++++++++++++ 1 file changed, 521 insertions(+) create mode 100644 configs/pdf-service/format-config/sewerage-bill-amendment-note.json diff --git a/configs/pdf-service/format-config/sewerage-bill-amendment-note.json b/configs/pdf-service/format-config/sewerage-bill-amendment-note.json new file mode 100644 index 00000000..5524b7b3 --- /dev/null +++ b/configs/pdf-service/format-config/sewerage-bill-amendment-note.json @@ -0,0 +1,521 @@ +{ + "key": "sw-bill-amendment-credit-note", + "config": { + "defaultStyle": { + "font": "Cambay" + }, + + "content": [ + { + "style": "noc-head", + "table": { + "widths": [ + 60, + "*", + 120 + ], + "color":"#484848", + "body": [ + [ + { + "image": "{{logoImage}}", + "width": 50, + "height": 61.25 + }, + { + "stack": [ + { + "text": "{{logo-header}} {{Municipal_Corporation}}", + "style": "receipt-logo-header" + }, + { + "text": "{{note_type}}", + "style": "receipt-logo-sub-header" + } + ], + "alignment": "left", + "margin": [ + 0, + 10, + 0, + 0 + ] + }, + { + "stack": [ + { + "text": "{{address}}" + }, + { + "text": "{{phoneNumber}}" + }, + { + "text": "{{website}}" + }, + { + "text": "{{email}}" + } + ], + "alignment": "right", + "color": "#484848", + "margin": [ + -100, + 0, + -25, + 0 + ] + } + ] + ] + }, + "layout": "noBorders" + }, + + { + "style": "note-info", + "columns": [ + { + "text": [ + { + "text": "{{note_id}} ", + "bold": true + }, + { + "text": "{{applicationNo}}", + "bold": false + } + ], + "alignment": "left" + }, + { + "text": [ + { + "text": "{{note_date}}", + "bold": true + }, + { + "text": "{{date}}", + "bold": false + } + ], + "alignment": "right", + "margin": [ + 0, + 0, + -10, + 1 + ] + } + ] + }, + + { + "style": "header", + "columns": [ + { + "text": [ + { + "text": "{{against}}", + "bold": true + } + ], + "alignment": "left" + } + ] + }, + { + "style": "header-1", + "text": "{{user-name}}", + "alignment": "left" + }, + { + "style": "header-1", + "text": "{{permanentAddress}}", + "alignment": "left" + }, + { + "style": "header", + "text": " ", + "alignment": "left" + }, + + { + "style": "note-info-1", + "columns": [ + { + "text": [ + { + "text": "{{adjustment_amount_details}}", + "bold": true + } + ], + "alignment": "left" + }, + { + "text": [ + { + "text": "{{total_amount}}", + "bold": true + } + ], + "alignment": "right", + "margin": [ + 0, + 0, + -200, + 1 + ] + }, + { + "text": [ + { + "text": "{{rs}} {{totalAmount}}", + "bold": true + } + ], + "alignment": "right", + "fontSize": 20, + "margin": [ + 0, + 25, + -10, + 1 + ] + } + ] + }, + + { + "style": "ws-table", + "table": { + "widths": [ + "70%" + ], + "body": [ + [ + { + "table": { + "widths": [ + "10%", + "30%", + "30%" + ], + "body": [ + [ + { + "text": "{{sl_no}}", + "alignment": "center" + }, + { + "text": "{{tax_heads}}", + "alignment": "left" + }, + { + "text": "{{reduced_amount}}", + "alignment": "right" + } + ], + [ + { + "text": "1.", + "alignment": "center" + }, + { + "text": "{{sewerage_charge}}", + "alignment": "left" + }, + { + "text": "{{sewerageCharge}}", + "alignment": "right" + } + ], + [ + { + "text": "2.", + "alignment": "center" + }, + { + "text": "{{interest}}", + "alignment": "left" + }, + { + "text": "{{sewerageInterest}}", + "alignment": "right" + } + ], + [ + { + "text": "3.", + "alignment": "center" + }, + { + "text": "{{penalty}}", + "alignment": "left" + }, + { + "text": "{{seweragePenalty}}", + "alignment": "right" + } + ], + [ + { + "text": " " + }, + { + "text": "{{total_amount}}", + "alignment": "left" + }, + { + "text": "{{totalAmount}}", + "alignment": "right" + } + ] + ] + }, + "border": [ + false, + false, + false, + false + ] + } + ] + ] + }, + "layout": {} + }, + + { + "style": "ws-table-1", + "table": { + "widths": [ + "130%" + ], + "body": [ + [ + { + "table": { + "widths": [ + "120%" + ], + "body": [ + [ + { + "text": "{{box_note}}", + "alignment": "left" + } + ] + ] + }, + "border": [ + false, + false, + false, + false + ] + } + ] + ] + }, + "layout": {} + }, + + { + "style": "header", + "text": " ", + "alignment": "left" + }, + + { + "style": "receipt-approver", + "columns": [ + { + "text": [ + { + "text": "{{generated_by}}: ", + "bold": true + }, + { + "text": "{{user-name}}", + "bold": false + } + ], + "alignment": "left" + }, + { + "text": [ + { + "text": "{{commissioner/eo}}", + "bold": true + } + ], + "alignment": "right", + "margin": [ + 0, + 0, + -10, + 1 + ] + } + ] + }, + + { + "style": "no-signature", + "text": "{{no_signature}}" + }, + + { + "style": "no-signature", + "text": "{{box_validity}}" + } + ], + + "styles": { + "noc-head": { + "margin": [ + -30, + -30, + 0, + 1 + ] + }, + "ws-head": { + "margin": [ + -39, + -38, + -38, + 0 + ] + }, + "receipt-logo-header": { + "color": "#000000", + "fontSize": 14, + "bold": true, + "letterSpacing": 0.74, + "margin": [ + 0, + 0, + 0, + 5 + ] + }, + "ws-table": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -25, + 18, + -8, + 10 + ] + }, + "ws-table-1": { + "fontSize": 12, + "color": "#000000", + "margin": [ + 380, + -120, + 20, + 10 + ] + }, + "receipt-logo-sub-header": { + "color": "#000000", + "fontSize": 12, + "letterSpacing": 0.6 + }, + "receipt-table-value": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 8, + 8, + 0, + 8 + ] + }, + "receipt-table": { + "color": "#000000", + "bold": false, + "fontSize": 12, + "fontWeight": 400, + "margin": [ + -10, + 8, + 0, + 8 + ] + }, + "header": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + -25, + 15, + 0, + -10 + ] + }, + "header-1": { + "color": "#000000", + "bold": false, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + -25, + 15, + 0, + -10 + ] + }, + "receipt-approver": { + "fontSize": 12, + "bold": true, + "margin": [ + -27, + 50, + -10, + 0 + ], + "color": "#484848" + }, + "note-info": { + "fontSize": 12, + "bold": true, + "margin": [ + -27, + 10, + -10, + 0 + ], + "color": "#000000" + }, + "note-info-1": { + "fontSize": 12, + "bold": true, + "margin": [ + -27, + 10, + -10, + -45 + ], + "color": "#000000" + }, + "no-signature": { + "fontSize": 12, + "margin": [ + -27, + 10, + -10, + 0 + ], + "color": "#484848" + } + } + } +} From b76ed63e4828a8fc6b8682d59a625d231ce196ac Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Thu, 29 Apr 2021 11:06:14 +0530 Subject: [PATCH 0610/1242] Create sw-bill.json --- .../pdf-service/format-config/sw-bill.json | 1230 +++++++++++++++++ 1 file changed, 1230 insertions(+) create mode 100644 configs/pdf-service/format-config/sw-bill.json diff --git a/configs/pdf-service/format-config/sw-bill.json b/configs/pdf-service/format-config/sw-bill.json new file mode 100644 index 00000000..5e5374f8 --- /dev/null +++ b/configs/pdf-service/format-config/sw-bill.json @@ -0,0 +1,1230 @@ +{ + "key": "sw-bill", + "config": { + "defaultStyle": { + "font": "Cambay" + }, + "content": [ + { + "style": "noc-head", + "table": { + "widths": [ + 60, + "*", + 120 + ], + "body": [ + [ + { + "image": "{{logoImage}}", + "width": 45, + "height": 50 + }, + { + "stack": [ + { + "text": "{{logo_header}} {{Municipal_Corporation}}", + "style": "receipt-logo-header" + }, + { + "stack": [ + { + "text": "{{address}}" + }, + { + "text": "{{phoneNumber}}" + }, + { + "text": "{{website}}" + }, + { + "text": "{{email}}" + } + ] + } + ], + "alignment": "left", + "margin": [ + 0, + 1, + 0, + 0 + ] + }, + { + "stack": [ + { + "text": "{{total_amount_due}}" + }, + { + "text": "{{Rs}} {{totalAmountDue}}", + "style": "amount-due" + } + ], + "alignment": "right", + "color": "#484848", + "margin": [ + -150, + 1, + -20, + 0 + ] + } + ] + ] + }, + "layout": "noBorders" + }, + { + "style": "noc-table2", + "table": { + "widths": [ + "103%" + ], + "body": [ + [ + { + "text": "{{serviceType}} Bill for Period {{fromPeriod}} - {{toPeriod}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2", + "alignment":"center" + } + ] + ] + }, + "layout": {} + }, + { + "style": "noc-table2", + "table": { + "widths": [ + "103%" + ], + "body": [ + [ + { + "table": { + "widths": [ + "8%", + "22%", + "15%", + "21%", + "15%", + "21%" + ], + "body": [ + [ + { + "text": "{{bill_no}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{billNo}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{bill_issue_date}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{billIssueDate}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "Bill Due Date", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{billDueDate}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + } + ] + ] + }, + "border": [ + false, + true, + false, + true + ] + } + ] + + ] + }, + "layout": {} + }, + { + "style": "noc-table2", + "table": { + "widths": [ + "103%" + ], + "body": [ + [ + { + "table": { + "widths": [ + "17%", + "43%", + "15%", + "25%" + ], + "body": [ + [ + { + "text": "{{consumer_no}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "Old Consumer No.", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "House No.", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "Ledger Id", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + } + ], + [ + { + "text": "{{consumerCode}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{oldConnectionNo}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{houseNo}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text":"{{ledgerId}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + } + ], + [ + { + "text": "Plot Size", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "Consumer Name", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "Street Name", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "Locality", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + } + ], + [ + { + "text": "{{plotSize}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{payerName}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{streetName}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text":"{{locality}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + } + ], + [ + { + "text": "Usage Type", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "Mobile Number", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "Landmark", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "Address", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + } + ], + [ + { + "text": "{{usageType}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + + { + "text": "{{mobileNo}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text":"{{landmark}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{payerAddress}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + } + ] + ] + }, + "border": [ + true, + true, + true, + true + ] + } + ] + ] + }, + "layout": {} + }, + { + "style": "noc-table2", + "table": { + "widths": [ + "103%" + ], + "body": [ + [ + { + "text": "{{billing_summary_property_tax}} {{serviceType}}", + "border": [ + true, + true, + true, + false + ], + "style": "receipt-table-value" + } + ], + [ + { + "table": { + "widths": [ + "12%", + "23%", + "15%", + "10%", + "10%", + "10%", + "10%", + "*" + ], + "body": [ + [ + { + "text": "{{arrears_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{advanceAdjusted_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{advanceAvailable_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + },{ + "text": "{{charge_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{penalty_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{rebate_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{others_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{total_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + } + ], + [ + { + "text": "{{arrears}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text":"{{advanceAdjusted}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{advanceAvailable}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{charge}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{penalty}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{rebate}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{others}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{calculatedTotal}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2", + "bold": true + } + ] + ] + }, + "border": [ + true, + true, + true, + true + ] + } + ] + ] + }, + "layout": {} + }, + { + "style": "noc-table3", + "table": { + "widths": [ + "103%" + ], + "body": [ + [ + { + "text": "{{important_message}}", + "border": [ + true, + true, + true, + false + ], + "margin": [ + 9, + 1, + 0, + 1 + ], + "style": "receipt-table-value" + } + ], + [ + { + "text": "1. Online payment can be done for water charges payment.", + "border": [ + true, + false, + true, + false + ], + "margin": [ + 4, + 0, + 0, + 0.5 + ] + } + ], + [ + { + "text": "2. If last day to pay bill is a holiday. Kindly pay your bills either online or offline on previous working day to avoid penalty.", + "border": [ + true, + false, + true, + false + ], + "margin": [ + 4, + 0, + 0, + 0.5 + ] + } + ], + [ + { + "text": "3. Payment mode available: Cash/Cheque at office counter,Online: Credit/Debit Card/PayTM/FreeCharge/BBPS/Airtel/SewaKendra.", + "border": [ + true, + false, + true, + false + ], + "margin": [ + 4, + 0, + 0, + 0.5 + ] + } + ], + [ + { + "text": "4. Please bring this bill while making payment at office counter.", + "border": [ + true, + false, + true, + false + ], + "margin": [ + 4, + 0, + 0, + 0.5 + ] + } + ], + [ + { + "text": "5. Late payment charges will be applied after due date", + "border": [ + true, + false, + true, + false + ], + "margin": [ + 4, + 0, + 0, + 0.5 + ] + } + ], + [ + { + "text": "6. Interest & late payment charges calculated based on the payment date will reflect in next bill ", + "border": [ + true, + false, + true, + true + ], + "margin": [ + 4, + 0, + 0, + 0.5 + ] + } + ] + ] + }, + "layout": {} + }, + { + "canvas": [ + { + "type": "line", + "x1": -40, + "y1": 28, + "x2": 700, + "y2": 28, + "dash": { + "length": 10, + "space": 5 + } + } + ] + }, + { + "image": "{{scissorImage}}", + "width": 19, + "height": 19, + "margin": [ + -30, + -9.8, + 0, + 0 + ] + }, + { + "text": "{{acknowledgement_for}}", + "style": "footer-header" + }, + { + "style": "noc-table4", + "table": { + "widths": [ + "*", + "*", + "*", + "*" + ], + "body": [ + [ + { + "text": "{{date_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{billdate}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Bill Due Date", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{billDueDate}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{consumer_no}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{consumerID}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{bill_no}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{billNo}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{name_address}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerName}}, {{nameAddress}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{total_payment}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{total}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + } + ] + ] + } + }, + { + "text": "{{receivers_signature}}", + "style": "footer-bottom" + } + ], + "styles": { + "noc-head": { + "margin": [ + -25, + -30, + 0, + 1 + ] + }, + "receipt-logo-header": { + "color": "#484848", + "fontFamily": "Roboto", + "fontSize": 14, + "bold": true, + "letterSpacing": 0.74, + "margin": [ + 0, + -10, + 0, + 1 + ] + }, + "receipt-logo-sub-header": { + "color": "#484848", + "fontFamily": "Roboto", + "fontSize": 12, + "letterSpacing": 0.6 + }, + "noc-table": { + "fontSize": 10, + "color": "#484848", + "margin": [ + -25, + 13, + -8, + -8 + ] + }, + "noc-table4": { + "fontSize": 10, + "color": "#484848", + "margin": [ + -25, + 40, + -8, + -8 + ] + }, + "noc-table2": { + "fontSize": 10, + "color": "#484848", + "margin": [ + -25, + 8, + -8, + -8 + ] + }, + "noc-table3": { + "fontSize": 10, + "color": "#484848", + "margin": [ + -25, + 13, + -8, + -8 + ] + }, + "receipt-table-value": { + "color": "#000000", + "bold": true, + "fontSize": 10, + "fontWeight": 500, + "margin": [ + 8, + 1, + 0, + 0 + ] + }, + "receipt-table-value2": { + "color": "#000000", + "bold": true, + "fontSize": 10, + "fontWeight": 500, + "margin": [ + 3, + 1, + 0, + 0 + ] + }, + "receipt-table": { + "color": "#484848", + "bold": true, + "fontSize": 10, + "fontWeight": 400, + "margin": [ + -30, + 1, + 0, + 0 + ] + }, + "receipt-table2": { + "color": "#484848", + "bold": true, + "fontSize": 10, + "fontWeight": 400, + "margin": [ + 3, + 2, + 0, + 2 + ] + }, + "right-receipt-table": { + "color": "#000000", + "bold": true, + "fontSize": 10, + "fontWeight": 500, + "margin": [ + 8, + 5, + 0, + 10 + ] + }, + "right-receipt-table2": { + "color": "#484848", + "bold": true, + "fontSize": 10, + "fontWeight": 400, + "margin": [ + -30, + 5, + 0, + 0 + ] + }, + "receipt-approver": { + "fontSize": 10, + "bold": true, + "margin": [ + -27, + 30, + -10, + 0 + ], + "color": "#484848" + }, + "no-signature": { + "fontSize": 10, + "margin": [ + -27, + 25, + -10, + 0 + ], + "color": "#484848" + }, + "amount-due": { + "fontSize": 20, + "color": "#FC8019", + "bold": true, + "fontWeight": 700 + }, + "pt-disclaimer": { + "fontSize": 8, + "margin": [ + -27, + 20, + -10, + 0 + ], + "color": "#484848" + }, + "pt-disclaimer-value": { + "fontSize": 8, + "margin": [ + 0, + 2, + 0, + 0 + ], + "color": "#484848" + }, + "qr-text": { + "fontSize": 12, + "margin": [ + 40, + 0, + 0, + 0 + ], + "color": "#484848", + "alignment": "left" + }, + "qr-image": { + "margin": [ + -40, + -1, + -3, + 0 + ], + "color": "#484848", + "alignment": "right" + }, + "footer-header": { + "margin": [ + 0, + 2, + 0, + -40 + ], + "bold": true, + "color": "#000000", + "alignment": "center" + }, + "footer-bottom": { + "margin": [ + 0, + 20, + 0, + 0 + ], + "bold": true, + "color": "#000000", + "alignment": "right" + } + } + } +} From fb14048574b06cc5156527170240bf4b57d17297 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Thu, 29 Apr 2021 11:06:50 +0530 Subject: [PATCH 0611/1242] Update ws-applicationsewerage.json --- .../format-config/ws-applicationsewerage.json | 282 +++--------------- 1 file changed, 40 insertions(+), 242 deletions(-) diff --git a/configs/pdf-service/format-config/ws-applicationsewerage.json b/configs/pdf-service/format-config/ws-applicationsewerage.json index 6fc248c7..493d4a3e 100644 --- a/configs/pdf-service/format-config/ws-applicationsewerage.json +++ b/configs/pdf-service/format-config/ws-applicationsewerage.json @@ -17,13 +17,13 @@ [ { "image": "{{logoImage}}", - "width": 50, - "height": 61.25, + "width": 40, + "height": 43, "margin": [ 12, - 10, + 5, 12, - 10 + 5 ] }, { @@ -33,13 +33,14 @@ "style": "receipt-logo-header" }, { - "text": "{{logo_sub_header}}" + "text": "{{logo_sub_header}}", + "fontSize": 10 } ], "alignment": "left", "margin": [ 10, - 30, + 10, 0, 0 ] @@ -52,36 +53,16 @@ { "columns": [ { - "text": "{{sewerage_application}}", - "style": "ws-header" - }, - { - "text": "{{application_no}}", - "alignment": "right", + "text": "Sewerage Application No. : {{applicationNo}}", + "fontSize":10, + "alignment": "left", "margin": [ + -23, + 0, 0, - 2, - -50, - 0 - ] - }, - { - "text": "{{applicationNo}}", - "alignment": "right", - "bold": true, - "margin": [ - -150, - 2, - -20, 0 ] } - ], - "margin": [ - -26, - 10, - 0, - 0 ] }, { @@ -511,7 +492,7 @@ "25%" ], "body": [ - "{{#variable13}}[{\"text\":\"{{owner_name}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\" }, { \"text\":\"{{email_label}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\", \"fontSize\": 11 }, { \"text\":\"{{gender_label}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\" }, { \"text\":\"{{dob_label}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\" } ], [ { \"text\":\"{{ownerName}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" }, { \"text\":\"{{ownerEmailId}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" }, { \"text\":\"{{gender}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" }, { \"text\":\"{{ownerDob}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" } ], [ { \"text\":\"{{guardian_name}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\" }, { \"text\":\"{{relationship_label}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\", \"fontSize\": 11 }, { \"text\":\"{{correspondence_address}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\" }, { \"text\":\"{{special_applicant_category}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\" } ], [ { \"text\":\"{{guardianName}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" }, { \"text\":\"{{relationshipLabel}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" }, { \"text\":\"{{correspondenceAddress}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" }, { \"text\":\"{{specialApplicantCategory}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" } ]{{/variable13}}" + "{{#variable13}}[{\"text\":\"{{owner_name}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\" }, { \"text\":\"{{email_label}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\", \"fontSize\": 8 }, { \"text\":\"{{gender_label}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\" }, { \"text\":\"{{dob_label}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\" } ], [ { \"text\":\"{{ownerName}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" }, { \"text\":\"{{ownerEmailId}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" }, { \"text\":\"{{gender}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" }, { \"text\":\"{{ownerDob}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" } ], [ { \"text\":\"{{guardian_name}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\" }, { \"text\":\"{{relationship_label}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\", \"fontSize\": 8 }, { \"text\":\"{{correspondence_address}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\" }, { \"text\":\"{{special_applicant_category}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\" } ], [ { \"text\":\"{{guardianName}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" }, { \"text\":\"{{relationshipLabel}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" }, { \"text\":\"{{correspondenceAddress}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" }, { \"text\":\"{{specialApplicantCategory}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" } ]{{/variable13}}" ] }, "border": [ @@ -688,7 +669,7 @@ false ], "style": "ws-sub-table", - "fontSize": 11 + "fontSize": 8 }, { "text": "{{electricty_bill}}", @@ -699,7 +680,7 @@ false ], "style": "ws-sub-table", - "fontSize": 11 + "fontSize": 8 } ], [ @@ -733,27 +714,7 @@ ], "style": "ws-sub-table-value" } - ] - ] - }, - "border": [ - true, - true, - true, - false - ] - } - ], - [ - { - "table": { - "widths": [ - "33%", - "33%", - "33%", - "1%" - ], - "body": [ + ], [ { "text": "{{plumber_report}}", @@ -765,7 +726,7 @@ ], "style": "ws-sub-table" }, - { + { "text": "{{building_plan}}", "border": [ false, @@ -774,7 +735,7 @@ false ], "style": "ws-sub-table", - "fontSize": 11 + "fontSize": 8 }, { "text": "{{property_tax_reciept}}", @@ -785,7 +746,7 @@ false ], "style": "ws-sub-table", - "fontSize": 11 + "fontSize": 8 } ], [ @@ -822,140 +783,19 @@ ] ] }, - "border": [ + "border" : [ + true, true, - false, true, true ] } ] - ], - "unbreakable": true - }, - "layout": {} + ] + } } - ], - "unbreakable": true - }, - { - "text": "{{additional_connection_details_header}}", - "style": "header" - }, - { - "style": "ws-table", - "table": { - "widths": [ - "103%" - ], - "body": [ - [ - { - "table": { - "widths": [ - "25%", - "25%", - "25%", - "25%" - ], - "body": [ - [ - { - "text": "{{connection_type}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{no_of_water_closets}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{no_of_toilets}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": " ", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - } - ], - [ - { - "text": "{{connectionType}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{noOfWaterClosets}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{noOfToilets}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": " ", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - } - ] - ] - }, - "border": [ - true, - true, - true, - true - ] - } - ] - ] - }, - "layout": {} + ] + }, { "text": "{{plumber_details_header}}", @@ -1228,7 +1068,7 @@ "style": "ws-sub-table" }, { - "text": " ", + "text": "{{connectionExecutionDate}}", "border": [ false, false, @@ -1257,48 +1097,6 @@ ], "style": "ws-sub-table" } - ], - [ - { - "text": "{{connectionExecutionDate}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": " ", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": " ", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": " ", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - } ] ] }, @@ -1327,59 +1125,59 @@ "receipt-logo-header": { "color": "#000000", "fontFamily": "Cambay", - "fontSize": 14, + "fontSize": 10, "bold": true, - "letterSpacing": 0.74, + "letterSpacing": 0.5, "margin": [ 0, -10, 0, - 5 + 0 ] }, "ws-table": { - "fontSize": 12, + "fontSize": 9, "color": "#484848", "margin": [ -25, - 18, + 0, -8, - 10 + 0 ] }, "header": { "color": "#000000", "textTransform": "uppercase", "bold": true, - "fontSize": 12, + "fontSize": 9, "fontWeight": 500, "margin": [ -25, - 15, + 1, 0, - -10 + 1 ] }, "ws-sub-table-value": { "color": "#000000", "bold": true, - "fontSize": 12, + "fontSize": 9, "fontWeight": 500, "margin": [ 3, 0, 0, - 10 + 0 ] }, "ws-sub-table": { "color": "#484848", "bold": true, - "fontSize": 12, + "fontSize": 9, "fontWeight": 400, "margin": [ 3, - 8, + 0, 0, 0 ] @@ -1398,7 +1196,7 @@ "receipt-table-value-total": { "color": "#000000", "bold": true, - "fontSize": 12, + "fontSize": 9, "fontWeight": 500, "alignment": "right", "margin": [ From f51ad8ccf74e483d428644c1d2a7b86cceddaadf Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Thu, 29 Apr 2021 11:07:41 +0530 Subject: [PATCH 0612/1242] Update ws-applicationwater.json --- .../format-config/ws-applicationwater.json | 260 ++++-------------- 1 file changed, 55 insertions(+), 205 deletions(-) diff --git a/configs/pdf-service/format-config/ws-applicationwater.json b/configs/pdf-service/format-config/ws-applicationwater.json index 6979ce5e..fa9c5f87 100644 --- a/configs/pdf-service/format-config/ws-applicationwater.json +++ b/configs/pdf-service/format-config/ws-applicationwater.json @@ -17,13 +17,13 @@ [ { "image": "{{logoImage}}", - "width": 50, - "height": 61.25, + "width": 40, + "height": 43, "margin": [ 12, - 10, + 5, 12, - 10 + 5 ] }, { @@ -33,13 +33,15 @@ "style": "receipt-logo-header" }, { - "text": "{{logo_sub_header}}" + "text": "{{logo_sub_header}}", + "fontSize": 10 + } ], "alignment": "left", "margin": [ 10, - 30, + 10, 0, 0 ] @@ -52,36 +54,16 @@ { "columns": [ { - "text": "{{water_application}}", - "style": "ws-header" - }, - { - "text": "{{application_no}}", - "alignment": "right", + "text": "Water Application No. : {{applicationNo}}", + "fontSize":10, + "alignment": "left", "margin": [ + -23, + 0, 0, - 2, - -50, - 0 - ] - }, - { - "text": "{{applicationNo}}", - "alignment": "right", - "bold": true, - "margin": [ - -150, - 2, - -20, 0 ] } - ], - "margin": [ - -26, - 10, - 0, - 0 ] }, { @@ -511,7 +493,7 @@ "25%" ], "body": [ - "{{#variable13}}[{\"text\":\"{{owner_name}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\" }, { \"text\":\"{{email_label}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\", \"fontSize\": 11 }, { \"text\":\"{{gender_label}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\" }, { \"text\":\"{{dob_label}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\" } ], [ { \"text\":\"{{ownerName}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" }, { \"text\":\"{{ownerEmailId}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" }, { \"text\":\"{{gender}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" }, { \"text\":\"{{ownerDob}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" } ], [ { \"text\":\"{{guardian_name}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\" }, { \"text\":\"{{relationship_label}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\", \"fontSize\": 11 }, { \"text\":\"{{correspondence_address}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\" }, { \"text\":\"{{special_applicant_category}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\" } ], [ { \"text\":\"{{guardianName}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" }, { \"text\":\"{{relationshipLabel}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" }, { \"text\":\"{{correspondenceAddress}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" }, { \"text\":\"{{specialApplicantCategory}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" } ]{{/variable13}}" + "{{#variable13}}[{\"text\":\"{{owner_name}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\" }, { \"text\":\"{{email_label}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\", \"fontSize\": 8 }, { \"text\":\"{{gender_label}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\" }, { \"text\":\"{{dob_label}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\" } ], [ { \"text\":\"{{ownerName}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" }, { \"text\":\"{{ownerEmailId}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" }, { \"text\":\"{{gender}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" }, { \"text\":\"{{ownerDob}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" } ], [ { \"text\":\"{{guardian_name}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\" }, { \"text\":\"{{relationship_label}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\", \"fontSize\": 8 }, { \"text\":\"{{correspondence_address}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\" }, { \"text\":\"{{special_applicant_category}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\" } ], [ { \"text\":\"{{guardianName}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" }, { \"text\":\"{{relationshipLabel}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" }, { \"text\":\"{{correspondenceAddress}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" }, { \"text\":\"{{specialApplicantCategory}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" } ]{{/variable13}}" ] }, "border": [ @@ -650,9 +632,7 @@ "style": "header" }, { - "stack": [ - { - "style": "ws-table", + "style": "ws-table", "table": { "widths": [ "103%" @@ -688,7 +668,7 @@ false ], "style": "ws-sub-table", - "fontSize": 11 + "fontSize": 8 }, { "text": "{{electricty_bill}}", @@ -699,7 +679,7 @@ false ], "style": "ws-sub-table", - "fontSize": 11 + "fontSize": 8 } ], [ @@ -733,27 +713,7 @@ ], "style": "ws-sub-table-value" } - ] - ] - }, - "border": [ - true, - true, - true, - false - ] - } - ], - [ - { - "table": { - "widths": [ - "33%", - "33%", - "33%", - "1%" - ], - "body": [ + ], [ { "text": "{{plumber_report}}", @@ -765,7 +725,7 @@ ], "style": "ws-sub-table" }, - { + { "text": "{{building_plan}}", "border": [ false, @@ -774,7 +734,7 @@ false ], "style": "ws-sub-table", - "fontSize": 11 + "fontSize": 8 }, { "text": "{{property_tax_reciept}}", @@ -785,7 +745,7 @@ false ], "style": "ws-sub-table", - "fontSize": 11 + "fontSize": 8 } ], [ @@ -822,21 +782,16 @@ ] ] }, - "border": [ + "border" : [ + true, true, - false, true, true ] } ] - ], - "unbreakable": true - }, - "layout": {} - } - ], - "unbreakable": true + ] + } }, { "text": "{{additional_connection_details_header}}", @@ -853,10 +808,11 @@ { "table": { "widths": [ - "25%", - "25%", - "25%", - "25%" + "18%", + "18%", + "20%", + "18%", + "*" ], "body": [ [ @@ -899,95 +855,31 @@ false ], "style": "ws-sub-table" - } - ], - [ - { - "text": "{{connectionType}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{noOfTaps}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{waterSource}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" }, { - "text": "{{waterSubSource}}", + "text": "{{pipe_size}}", "border": [ false, false, false, false ], - "style": "ws-sub-table-value" + "style": "ws-sub-table" } ], [ { - "text": "{{pipe_size}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": " ", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": " ", + "text": "{{connectionType}}", "border": [ false, false, false, false ], - "style": "ws-sub-table" + "style": "ws-sub-table-value" }, { - "text": " ", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - } - ], - [ - { - "text": "{{pipeSize}}", + "text": "{{noOfTaps}}", "border": [ false, false, @@ -997,7 +889,7 @@ "style": "ws-sub-table-value" }, { - "text": " ", + "text": "{{waterSource}}", "border": [ false, false, @@ -1007,7 +899,7 @@ "style": "ws-sub-table-value" }, { - "text": " ", + "text": "{{waterSubSource}}", "border": [ false, false, @@ -1017,7 +909,7 @@ "style": "ws-sub-table-value" }, { - "text": " ", + "text": "{{pipeSize}}", "border": [ false, false, @@ -1193,17 +1085,7 @@ "style": "ws-sub-table" }, { - "text": "{{area_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": " ", + "text": "{{roadType}}", "border": [ false, false, @@ -1213,7 +1095,7 @@ "style": "ws-sub-table" }, { - "text": " ", + "text": "{{area_label}}", "border": [ false, false, @@ -1221,18 +1103,6 @@ false ], "style": "ws-sub-table" - } - ], - [ - { - "text": "{{roadType}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" }, { "text": "{{area}}", @@ -1242,27 +1112,7 @@ false, false ], - "style": "ws-sub-table-value" - }, - { - "text": " ", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": " ", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" + "style": "ws-sub-table" } ] ] @@ -1411,59 +1261,59 @@ "receipt-logo-header": { "color": "#000000", "fontFamily": "Cambay", - "fontSize": 14, + "fontSize": 10, "bold": true, - "letterSpacing": 0.74, + "letterSpacing": 0.5, "margin": [ 0, -10, 0, - 5 + 0 ] }, "ws-table": { - "fontSize": 12, + "fontSize": 9, "color": "#484848", "margin": [ -25, - 18, + 0, -8, - 10 + 0 ] }, "header": { "color": "#000000", "textTransform": "uppercase", "bold": true, - "fontSize": 12, + "fontSize": 9, "fontWeight": 500, "margin": [ -25, - 15, + 1, 0, - -10 + 1 ] }, "ws-sub-table-value": { "color": "#000000", "bold": true, - "fontSize": 12, + "fontSize": 9, "fontWeight": 500, "margin": [ 3, 0, 0, - 10 + 0 ] }, "ws-sub-table": { "color": "#484848", "bold": true, - "fontSize": 12, + "fontSize": 9, "fontWeight": 400, "margin": [ 3, - 8, + 0, 0, 0 ] @@ -1482,7 +1332,7 @@ "receipt-table-value-total": { "color": "#000000", "bold": true, - "fontSize": 12, + "fontSize": 9, "fontWeight": 500, "alignment": "right", "margin": [ From ccac9207fb3136bfaf29f900fc1928e2e11c8292 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Thu, 29 Apr 2021 11:08:11 +0530 Subject: [PATCH 0613/1242] Update ws-bill.json --- .../pdf-service/format-config/ws-bill.json | 850 +++++++++++------- 1 file changed, 534 insertions(+), 316 deletions(-) diff --git a/configs/pdf-service/format-config/ws-bill.json b/configs/pdf-service/format-config/ws-bill.json index 037ab46a..1b2a16bc 100644 --- a/configs/pdf-service/format-config/ws-bill.json +++ b/configs/pdf-service/format-config/ws-bill.json @@ -17,8 +17,8 @@ [ { "image": "{{logoImage}}", - "width": 50, - "height": 61.25 + "width": 45, + "height": 50 }, { "stack": [ @@ -46,7 +46,7 @@ "alignment": "left", "margin": [ 0, - 10, + 1, 0, 0 ] @@ -65,7 +65,7 @@ "color": "#484848", "margin": [ -150, - 2, + 1, -20, 0 ] @@ -74,220 +74,405 @@ ] }, "layout": "noBorders" - }, + }, { - "style": "noc-table", + "style": "noc-table2", "table": { "widths": [ - 130, - 130, - -2, - 130, - 130 + "103%" ], "body": [ [ { - "text": "{{payer_name}}", - "border": [ - true, - true, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{payerName}}", - "border": [ - false, - true, - true, - false - ], - "style": "receipt-table" - }, - { - "text": " ", + "text": "{{serviceType}} Bill for Period {{fromPeriod}} - {{toPeriod}}", "border": [ false, false, false, false - ] - }, - { - "text": "{{bill_no}}", - "border": [ - true, - true, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{billNo}}", - "border": [ - false, - true, - true, - false ], - "style": "receipt-table" + "style": "receipt-table-value2", + "alignment":"center" } - ], + ] + ] + }, + "layout": {} + }, + { + "style": "noc-table2", + "table": { + "widths": [ + "103%" + ], + "body": [ [ { - "text": "{{mobile_no}}", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{mobileNo}}", + "table": { + "widths": [ + "8%", + "22%", + "15%", + "21%", + "15%", + "21%" + ], + "body": [ + [ + { + "text": "{{bill_no}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{billNo}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{bill_issue_date}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{billIssueDate}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "Bill Due Date", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{billDueDate}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + } + ] + ] + }, "border": [ - false, false, true, - false - ], - "style": "receipt-table" - }, - { - "text": " ", - "border": [ - false, false, - false, - false + true ] - }, - { - "text": "{{bill_period}}", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{fromPeriod}} - {{toPeriod}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" } - ], + ] + + ] + }, + "layout": {} + }, + { + "style": "noc-table2", + "table": { + "widths": [ + "103%" + ], + "body": [ [ { - "text": "{{payer_address}}", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{payerAddress}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - }, - { - "text": " ", - "border": [ - false, - false, - false, - false - ] - }, - { - "text": "{{bill_issue_date}}", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{billIssueDate}}", + "table": { + "widths": [ + "17%", + "43%", + "15%", + "25%" + ], + "body": [ + [ + { + "text": "{{consumer_no}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "Old Consumer No.", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "House No.", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "Ledger Id", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + } + ], + [ + { + "text": "{{consumerCode}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{oldConnectionNo}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{houseNo}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text":"{{ledgerId}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + } + ], + [ + { + "text": "Plot Size", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "Consumer Name", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "Street Name", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "Locality", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + } + ], + [ + { + "text": "{{plotSize}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{payerName}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{streetName}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text":"{{locality}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + } + ], + [ + { + "text": "Usage Type", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "Mobile Number", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "Landmark", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "Address", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + } + ], + [ + { + "text": "{{usageType}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + + { + "text": "{{mobileNo}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text":"{{landmark}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{payerAddress}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + } + ] + ] + }, "border": [ - false, - false, true, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": " ", - "border": [ true, - false, - false, - true - ], - "style": "receipt-table-value" - }, - { - "text": " ", - "border": [ - false, - false, true, true - ], - "style": "receipt-table" - }, - { - "text": " ", - "border": [ - false, - false, - false, - false ] - }, - { - "text": "{{bill_due_date}}", - "border": [ - true, - false, - false, - true - ], - "style": "right-receipt-table" - }, - { - "text": "{{billDueDate}}", - "border": [ - false, - false, - true, - true - ], - "style": "right-receipt-table2" } ] ] @@ -317,19 +502,19 @@ { "table": { "widths": [ - "18%", - "26%", + "12%", + "23%", + "15%", + "10%", "10%", - "9%", "10%", - "9%", "10%", - "9%" + "*" ], "body": [ [ { - "text": "{{consumer_no}}", + "text": "{{arrears_label}}", "border": [ false, false, @@ -339,7 +524,7 @@ "style": "receipt-table-value2" }, { - "text": "{{bill_period}}", + "text": "{{advanceAdjusted_label}}", "border": [ false, false, @@ -349,7 +534,7 @@ "style": "receipt-table-value2" }, { - "text": "{{arrears_label}}", + "text": "{{advanceAvailable_label}}", "border": [ false, false, @@ -357,8 +542,7 @@ false ], "style": "receipt-table-value2" - }, - { + },{ "text": "{{charge_label}}", "border": [ false, @@ -411,7 +595,7 @@ ], [ { - "text": "{{propertyID}}", + "text": "{{arrears}}", "border": [ false, false, @@ -421,7 +605,7 @@ "style": "receipt-table2" }, { - "text": "{{fromPeriod}}-{{toPeriod}}", + "text":"{{advanceAdjusted}}", "border": [ false, false, @@ -431,7 +615,7 @@ "style": "receipt-table2" }, { - "text": "{{arrears}}", + "text": "{{advanceAvailable}}", "border": [ false, false, @@ -481,7 +665,7 @@ "style": "receipt-table2" }, { - "text": "{{total}}", + "text": "{{calculatedTotal}}", "border": [ false, false, @@ -496,7 +680,7 @@ }, "border": [ true, - false, + true, true, true ] @@ -524,78 +708,113 @@ ], "margin": [ 9, - 10, + 1, 0, - 5 + 1 ], "style": "receipt-table-value" } ], [ { - "ol": [ - { - "text": "{{payment_received}}", - "margin": [ - 8, - 0, - 0, - 3 - ] - }, - { - "text": "{{this_document}}", - "margin": [ - 8, - 0, - 0, - 3 - ] - }, - { - "text": "{{this_is_a}}", - "margin": [ - 8, - 0, - 0, - 3 - ] - }, - { - "text": "{{assessment_payment}}", - "margin": [ - 8, - 0, - 0, - 3 - ] - }, - { - "text": "{{please_deposit}}", - "margin": [ - 8, - 0, - 0, - 3 - ] - }, - { - "text": "{{if_the_tax}}", - "margin": [ - 8, - 0, - 0, - 5 - ] - } + "text": "1. Online payment can be done for water charges payment.", + "border": [ + true, + false, + true, + false + ], + "margin": [ + 4, + 0, + 0, + 0.5 + ] + } + ], + [ + { + "text": "2. If last day to pay bill is a holiday. Kindly pay your bills either online or offline on previous working day to avoid penalty.", + "border": [ + true, + false, + true, + false + ], + "margin": [ + 4, + 0, + 0, + 0.5 + ] + } + ], + [ + { + "text": "3. Payment mode available: Cash/Cheque at office counter,Online: Credit/Debit Card/PayTM/FreeCharge/BBPS/Airtel/SewaKendra.", + "border": [ + true, + false, + true, + false + ], + "margin": [ + 4, + 0, + 0, + 0.5 + ] + } + ], + [ + { + "text": "4. Please bring this bill while making payment at office counter.", + "border": [ + true, + false, + true, + false + ], + "margin": [ + 4, + 0, + 0, + 0.5 + ] + } + ], + [ + { + "text": "5. Late payment charges will be applied after due date", + "border": [ + true, + false, + true, + false ], + "margin": [ + 4, + 0, + 0, + 0.5 + ] + } + ], + [ + { + "text": "6. Interest & late payment charges calculated based on the payment date will reflect in next bill ", "border": [ true, false, true, true ], - "alignment": "left" + "margin": [ + 4, + 0, + 0, + 0.5 + ] } ] ] @@ -607,9 +826,9 @@ { "type": "line", "x1": -40, - "y1": 30, + "y1": 28, "x2": 700, - "y2": 30, + "y2": 28, "dash": { "length": 10, "space": 5 @@ -619,19 +838,18 @@ }, { "image": "{{scissorImage}}", - "width": 24, - "height": 24, + "width": 19, + "height": 19, "margin": [ -30, - -11.2, + -9.8, 0, 0 ] }, { "text": "{{acknowledgement_for}}", - "style": "footer-header", - "pageBreak": "before" + "style": "footer-header" }, { "style": "noc-table4", @@ -665,7 +883,7 @@ "style": "receipt-table" }, { - "text": " ", + "text": "Bill Due Date", "border": [ false, false, @@ -675,7 +893,7 @@ "style": "receipt-table-value" }, { - "text": " ", + "text": "{{billDueDate}}", "border": [ false, false, @@ -739,7 +957,7 @@ "style": "receipt-table-value" }, { - "text": "{{nameAddress}}", + "text": "{{payerName}}, {{nameAddress}}", "border": [ false, false, @@ -794,53 +1012,53 @@ "letterSpacing": 0.74, "margin": [ 0, - -10, + -10, 0, - 5 + 1 ] }, "receipt-logo-sub-header": { "color": "#484848", "fontFamily": "Roboto", - "fontSize": 13, + "fontSize": 12, "letterSpacing": 0.6 }, "noc-table": { - "fontSize": 12, + "fontSize": 10, "color": "#484848", "margin": [ - -25, - 10, + -25, + 13, -8, -8 ] }, "noc-table4": { - "fontSize": 12, + "fontSize": 10, "color": "#484848", "margin": [ - -25, - 75, + -25, + 40, -8, -8 ] }, "noc-table2": { - "fontSize": 12, + "fontSize": 10, "color": "#484848", "margin": [ - -25, - 18, + -25, + 8, -8, -8 ] }, "noc-table3": { - "fontSize": 12, + "fontSize": 10, "color": "#484848", "margin": [ - -25, - 30, + -25, + 13, -8, -8 ] @@ -848,11 +1066,11 @@ "receipt-table-value": { "color": "#000000", "bold": true, - "fontSize": 12, + "fontSize": 10, "fontWeight": 500, "margin": [ 8, - 5, + 1, 0, 0 ] @@ -860,11 +1078,11 @@ "receipt-table-value2": { "color": "#000000", "bold": true, - "fontSize": 12, + "fontSize": 10, "fontWeight": 500, "margin": [ 3, - 5, + 1, 0, 0 ] @@ -872,11 +1090,11 @@ "receipt-table": { "color": "#484848", "bold": true, - "fontSize": 12, + "fontSize": 10, "fontWeight": 400, "margin": [ - -30, - 5, + -30, + 1, 0, 0 ] @@ -884,19 +1102,19 @@ "receipt-table2": { "color": "#484848", "bold": true, - "fontSize": 11, + "fontSize": 10, "fontWeight": 400, "margin": [ 3, - 8, + 2, 0, - 10 + 2 ] }, "right-receipt-table": { "color": "#000000", "bold": true, - "fontSize": 12, + "fontSize": 10, "fontWeight": 500, "margin": [ 8, @@ -908,57 +1126,57 @@ "right-receipt-table2": { "color": "#484848", "bold": true, - "fontSize": 12, + "fontSize": 10, "fontWeight": 400, "margin": [ - -30, + -30, 5, 0, 0 ] }, "receipt-approver": { - "fontSize": 12, + "fontSize": 10, "bold": true, "margin": [ - -27, - 50, - -10, + -27, + 30, + -10, 0 ], "color": "#484848" }, "no-signature": { - "fontSize": 12, + "fontSize": 10, "margin": [ - -27, - 35, - -10, + -27, + 25, + -10, 0 ], "color": "#484848" }, "amount-due": { - "fontSize": 30, + "fontSize": 20, "color": "#FC8019", "bold": true, "fontWeight": 700 }, "pt-disclaimer": { - "fontSize": 12, + "fontSize": 8, "margin": [ - -27, - 30, - -10, + -27, + 20, + -10, 0 ], "color": "#484848" }, "pt-disclaimer-value": { - "fontSize": 12, + "fontSize": 8, "margin": [ 0, - 5, + 2, 0, 0 ], @@ -988,7 +1206,7 @@ "footer-header": { "margin": [ 0, - 15, + 2, 0, -40 ], @@ -999,7 +1217,7 @@ "footer-bottom": { "margin": [ 0, - 50, + 20, 0, 0 ], From 82c4dc4e2aba3b17a52a017929577b545288efe0 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Thu, 29 Apr 2021 11:08:39 +0530 Subject: [PATCH 0614/1242] Update ws-consolidatedacknowlegment.json --- .../ws-consolidatedacknowlegment.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/configs/pdf-service/format-config/ws-consolidatedacknowlegment.json b/configs/pdf-service/format-config/ws-consolidatedacknowlegment.json index a59f005c..95477f2d 100644 --- a/configs/pdf-service/format-config/ws-consolidatedacknowlegment.json +++ b/configs/pdf-service/format-config/ws-consolidatedacknowlegment.json @@ -105,7 +105,7 @@ ], "margin": [ -26, - 10, + 4, 0, 0 ] @@ -115,7 +115,7 @@ "style": "header" }, { - "style": "ws-table", + "style": "ws-table-property", "table": { "widths": [ "103%" @@ -689,7 +689,7 @@ "style": "header" }, { - "style": "ws-table", + "style": "ws-table-property", "table": { "widths": [ "103%" @@ -926,9 +926,9 @@ "color": "#484848", "margin": [ -25, - 18, + 8, -8, - 110 + 2 ] }, "header": { @@ -939,7 +939,7 @@ "fontWeight": 500, "margin": [ -25, - 15, + 5, 0, -10 ] @@ -953,7 +953,7 @@ 3, 0, 0, - 10 + 1 ] }, "ws-sub-table": { @@ -963,7 +963,7 @@ "fontWeight": 400, "margin": [ 3, - 8, + 1, 0, 0 ] From ab6ccbf38fa7aefa9000da7aa6920ae64bd01b9e Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Thu, 29 Apr 2021 11:09:02 +0530 Subject: [PATCH 0615/1242] Update ws-consolidatedsewerageconnection.json --- .../ws-consolidatedsewerageconnection.json | 33 ++++--------------- 1 file changed, 6 insertions(+), 27 deletions(-) diff --git a/configs/pdf-service/format-config/ws-consolidatedsewerageconnection.json b/configs/pdf-service/format-config/ws-consolidatedsewerageconnection.json index 595c280e..12eb8c7b 100644 --- a/configs/pdf-service/format-config/ws-consolidatedsewerageconnection.json +++ b/configs/pdf-service/format-config/ws-consolidatedsewerageconnection.json @@ -126,8 +126,7 @@ "table": { "widths": [ "25%", - "25%", - "25%", + "50%", "25%" ], "body": [ @@ -161,16 +160,6 @@ false ], "style": "ws-sub-table" - }, - { - "text": " ", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" } ], [ @@ -203,16 +192,6 @@ false ], "style": "ws-sub-table-value" - }, - { - "text": " ", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" } ] ] @@ -748,9 +727,9 @@ "color": "#484848", "margin": [ -25, - 18, + 8, -8, - 10 + 4 ] }, "header": { @@ -761,7 +740,7 @@ "fontWeight": 500, "margin": [ -25, - 15, + 12, 0, -10 ] @@ -775,7 +754,7 @@ 3, 0, 0, - 10 + 2 ] }, "ws-sub-table": { @@ -785,7 +764,7 @@ "fontWeight": 400, "margin": [ 3, - 8, + 2, 0, 0 ] From 6e056016a93dadac2629b7a87640f2eaad9b49ab Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Thu, 29 Apr 2021 11:09:27 +0530 Subject: [PATCH 0616/1242] Update ws-estimationnotice.json --- .../format-config/ws-estimationnotice.json | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/configs/pdf-service/format-config/ws-estimationnotice.json b/configs/pdf-service/format-config/ws-estimationnotice.json index bd671e53..bc0a575b 100644 --- a/configs/pdf-service/format-config/ws-estimationnotice.json +++ b/configs/pdf-service/format-config/ws-estimationnotice.json @@ -17,7 +17,7 @@ [ { "image": "{{logoImage}}", - "width": 50, + "width": 55, "height": 61.25, "margin": [ 12, @@ -68,9 +68,9 @@ "table": { "widths": [ "16%", - "34%", + "44%", "18%", - "32%" + "22%" ], "body": [ [ @@ -490,7 +490,7 @@ }, { "text": "{{approved_by}}", - "alignment": "center" + "alignment": "right" } ], "styles": { @@ -539,7 +539,7 @@ "color": "#000000", "textTransform": "uppercase", "bold": true, - "fontSize": 12, + "fontSize": 10, "fontWeight": 500, "margin": [ -25, @@ -550,13 +550,13 @@ }, "ws-sub-table-value": { "color": "#000000", - "fontSize": 12, + "fontSize": 10, "fontWeight": 500 }, "ws-sub-table": { "color": "#000000", "bold": true, - "fontSize": 12, + "fontSize": 10, "fontWeight": 400, "margin": [ 3, @@ -579,7 +579,7 @@ "receipt-table-value": { "color": "#000000", "bold": true, - "fontSize": 12, + "fontSize": 10, "fontWeight": 500, "margin": [ 5, @@ -591,7 +591,7 @@ "receipt-table-value-total": { "color": "#000000", "bold": true, - "fontSize": 12, + "fontSize": 10, "fontWeight": 500, "alignment": "right", "margin": [ @@ -604,7 +604,7 @@ "receipt-table-value-down": { "color": "#000000", "bold": false, - "fontSize": 12, + "fontSize": 10, "fontWeight": 400, "alignment": "left", "margin": [ @@ -617,7 +617,7 @@ "receipt-table-value2": { "color": "#000000", "bold": false, - "fontSize": 12, + "fontSize": 10, "fontWeight": 500, "margin": [ 3, @@ -629,7 +629,7 @@ "receipt-table-value-cont": { "color": "#000000", "bold": false, - "fontSize": 11, + "fontSize": 10, "fontWeight": 400, "margin": [ 3, @@ -641,7 +641,7 @@ "receipt-table": { "color": "#484848", "bold": true, - "fontSize": 12, + "fontSize": 10, "fontWeight": 400, "margin": [ -30, @@ -653,7 +653,7 @@ "receipt-table2": { "color": "#000000", "bold": true, - "fontSize": 12, + "fontSize": 10, "fontWeight": 500, "margin": [ 3, From b3a726914320b8bb3b72994a20da21f6f851d7d6 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Thu, 29 Apr 2021 11:10:29 +0530 Subject: [PATCH 0617/1242] Update ws-onetime-receipt.json --- .../format-config/ws-onetime-receipt.json | 527 +++++++++++++++--- 1 file changed, 459 insertions(+), 68 deletions(-) diff --git a/configs/pdf-service/format-config/ws-onetime-receipt.json b/configs/pdf-service/format-config/ws-onetime-receipt.json index e8ae01b9..ac25fea5 100644 --- a/configs/pdf-service/format-config/ws-onetime-receipt.json +++ b/configs/pdf-service/format-config/ws-onetime-receipt.json @@ -17,7 +17,7 @@ [ { "image": "{{logoImage}}", - "width": 50, + "width": 60, "height": 61.25 }, { @@ -27,14 +27,14 @@ "style": "receipt-logo-header" }, { - "text": "{{serviceType}} {{payment_receipt}}", + "text": "{{serviceType}} {{payment_receipt}}(Employee Copy)", "style": "receipt-logo-sub-header" } ], "alignment": "left", "margin": [ 0, - 10, + 7, 0, 0 ] @@ -72,10 +72,10 @@ "style": "noc-table", "table": { "widths": [ - "25%", - "25%", - "25%", - "25%" + "34%", + "16%", + "36%", + "14%" ], "body": [ [ @@ -171,12 +171,140 @@ true, false, false, - true + false ], "style": "receipt-table-value" }, { "text": "{{payerContact}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Payment Mode", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{paymentMode}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "Cheque/DD/PO/Transaction No.", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{chequeDD}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Cheque/DD/PO/Transaction Date", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{chequeDDDate}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + + } + ], + [ + { + "text": "Bank Name", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{bankName}},{{branchName}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "IFSC Code", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{ifsc}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + + } + ], + [ + { + "text": "{{g8_receipt_no}}.", + "border": [ + true, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{G8ReceiptNo}}", "border": [ false, false, @@ -186,7 +314,7 @@ "style": "receipt-table" }, { - "text": " ", + "text": "{{g8_receipt_date}}", "border": [ false, false, @@ -196,7 +324,7 @@ "style": "receipt-table-value" }, { - "text": " ", + "text": "{{G8ReceiptDate}}", "border": [ false, false, @@ -214,15 +342,156 @@ "style": "next-noc-table", "table": { "widths": [ - "25%", - "25%", - "25%", - "25%" + "65%", + "35%" + ], + "body": + [ + [ + { + "text": "Description Head of A/C", + "style": "receipt-table-value22" + },{ + "text": "Amount(in Rupees)", + "style": "receipt-table-value22" + } + ], + "{{#var_paymentheads}}[{\"text\":\"{{taxheaddd}}\",\"style\":\"receipt-tableee\",\"alignment\":\"left\"},{\"text\":\"{{amountt}}\",\"style\":\"receipt-tableee\",\"alignment\":\"right\"}]{{/var_paymentheads}}" + ] + + + }, + "layout": {} + }, + { + "style": "receipt-approver", + "columns": [ + { + "text": [ + { + "text": "{{generated_by}}: ", + "bold": true + }, + { + "text": "{{user-name}}", + "bold": false + } + ], + "alignment": "left" + }, + { + "text": [ + { + "text": "{{commissioner/eo}}", + "bold": true + } + ], + "alignment": "right", + "margin": [ + 0, + 0, + -10, + 1 + ] + } + ] + }, + { + "style": "no-signature", + "text": "{{no_signature}}" + }, + { + "text":"-----------------------------x-----------------------------x-----------------------------x-----------------------------x-----------------------------", + "style":"next-noc-table2", + "alignment":"center" + + }, + { + "text":" ", + "style":"next-noc-table2" + + }, + { + "text":" ", + "style":"next-noc-table2" + + }, + { + "style": "noc-head", + "table": { + "widths": [ + 60, + "*", + 120 ], "body": [ [ { - "text": "{{service_type}}", + "image": "{{logoImage}}", + "width": 60, + "height": 61.25 + }, + { + "stack": [ + { + "text": "{{logo-header}} {{Municipal_Corporation}}", + "style": "receipt-logo-header" + }, + { + "text": "{{serviceType}} {{payment_receipt}}(Citizen Copy)", + "style": "receipt-logo-sub-header" + } + ], + "alignment": "left", + "margin": [ + 13, + 7, + 0, + 0 + ] + }, + { + "stack": [ + { + "text": "{{address}}" + }, + { + "text": "{{phoneNumber}}" + }, + { + "text": "{{website}}" + }, + { + "text": "{{email}}" + } + ], + "alignment": "right", + "color": "#484848", + "margin": [ + -100, + 0, + -25, + -3 + ] + } + ] + ] + }, + "layout": "noBorders" + }, + { + "style": "noc-table", + "table": { + "widths": [ + "34%", + "16%", + "36%", + "14%" + ], + "body": [ + [ + { + "text": "{{receipt_no}}.", "border": [ true, true, @@ -232,17 +501,18 @@ "style": "receipt-table-value" }, { - "text": "{{serviceType}}", + "text": "{{receiptNo}}", "border": [ false, true, false, false ], - "style": "receipt-table" + "style": "receipt-table", + "font": "Roboto" }, { - "text": "{{billing_period}}", + "text": "{{consumer_id}}", "border": [ false, true, @@ -252,19 +522,20 @@ "style": "receipt-table-value" }, { - "text": "{{fromPeriod}} - {{toPeriod}}", + "text": "{{consumerID}}", "border": [ false, true, true, false ], - "style": "receipt-table" + "style": "receipt-table", + "font": "Roboto" } ], [ { - "text": "{{paid_amount}}", + "text": "{{payment_date}}", "border": [ true, false, @@ -274,7 +545,7 @@ "style": "receipt-table-value" }, { - "text": "₹ {{paidAmount}}", + "text": "{{paymentDate}}", "border": [ false, false, @@ -284,7 +555,7 @@ "style": "receipt-table" }, { - "text": "{{pending_amount}}", + "text": "{{payer_name}}", "border": [ false, false, @@ -294,7 +565,7 @@ "style": "receipt-table-value" }, { - "text": "₹ {{pendingAmount}}", + "text": "{{payerName}}", "border": [ false, false, @@ -306,7 +577,7 @@ ], [ { - "text": "{{payment_mode}}", + "text": "{{payer_contact}}", "border": [ true, false, @@ -316,7 +587,7 @@ "style": "receipt-table-value" }, { - "text": "{{paymentMode}}", + "text": "{{payerContact}}", "border": [ false, false, @@ -326,7 +597,7 @@ "style": "receipt-table" }, { - "text": "{{transaction_id}}", + "text": "Payment Mode", "border": [ false, false, @@ -336,18 +607,103 @@ "style": "receipt-table-value" }, { - "text": "{{transactionID}}", + "text": "{{paymentMode}}", "border": [ false, false, true, false ], - "style": "receipt-table", - "font": "Roboto" + "style": "receipt-table" } ], [ + { + "text": "Cheque/DD/PO/Transaction No.", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{chequeDD}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Cheque/DD/PO/Transaction Date", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{chequeDDDate}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + + } + ], + [ + { + "text": "Bank Name", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{bankName}},{{branchName}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "IFSC Code", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{ifsc}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + + } + ], + [ { "text": "{{g8_receipt_no}}.", "border": [ @@ -393,6 +749,31 @@ }, "layout": {} }, + { + "style": "next-noc-table", + "table": { + "widths": [ + "65%", + "35%" + ], + "body": + [ + [ + { + "text": "Description Head of A/C", + "style": "receipt-table-value22" + },{ + "text": "Amount(in Rupees)", + "style": "receipt-table-value22" + } + ], + "{{#var_paymentheads}}[{\"text\":\"{{taxheaddd}}\",\"style\":\"receipt-tableee\",\"alignment\":\"left\"},{\"text\":\"{{amountt}}\",\"style\":\"receipt-tableee\",\"alignment\":\"right\"}]{{/var_paymentheads}}" + ] + + + }, + "layout": {} + }, { "style": "receipt-approver", "columns": [ @@ -429,31 +810,6 @@ { "style": "no-signature", "text": "{{no_signature}}" - }, - { - "style": "pt-disclaimer", - "stack": [ - { - "text": "{{disclamer}}", - "bold": true, - "style": "pt-disclaimer-value" - }, - { - "text": "{{disclamer_1}}", - "bold": false, - "style": "pt-disclaimer-value" - }, - { - "text": "{{disclamer_2}}", - "bold": false, - "style": "pt-disclaimer-value" - }, - { - "text": "{{disclamer_3}}", - "bold": false, - "style": "pt-disclaimer-value" - } - ] } ], "styles": { @@ -462,7 +818,20 @@ -30, -30, 0, - 1 + 0 + ] + }, + "receipt-table-value22": { + "color": "#000000", + "bold": true, + "fontSize": 10, + "fontWeight": 500, + "backgroundColor": "#D3D3D3", + "margin": [ + 8, + 0, + 0, + 0 ] }, "receipt-logo-header": { @@ -474,7 +843,7 @@ 0, 0, 0, - 5 + 2 ] }, "receipt-logo-sub-header": { @@ -487,7 +856,7 @@ "color": "#000000", "margin": [ -25, - 45, + 7, -22, -8 ] @@ -497,51 +866,73 @@ "color": "#000000", "margin": [ -25, - 28, + 7, -22, -8 ] }, + "next-noc-table2": { + "fontSize": 8, + "color": "#000000", + "margin": [ + -25, + 0, + -22, + 0 + ] + }, "receipt-table-value": { "color": "#000000", "bold": true, - "fontSize": 12, + "fontSize": 10, "fontWeight": 500, "margin": [ 8, + 0, + 0, + 0 + ] + }, + "receipt-tableee": { + "color": "#000000", + "bold": false, + "fontSize": 10, + "fontWeight": 400, + "margin": [ 8, 0, - 8 + 0, + 0 ] }, "receipt-table": { "color": "#000000", "bold": false, - "fontSize": 12, + "fontSize": 10, "fontWeight": 400, "margin": [ -30, - 8, 0, - 8 + 0, + 0 ] }, "receipt-approver": { - "fontSize": 12, + "fontSize": 8, "bold": true, "margin": [ -27, - 50, + 10, -10, 0 ], "color": "#484848" }, "no-signature": { - "fontSize": 12, + "fontSize": 8, "margin": [ -27, - 35, + 1, -10, 0 ], From 082526cd81b471a4c96a0f7ac4a1edabeb4ae06b Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Thu, 29 Apr 2021 11:10:59 +0530 Subject: [PATCH 0618/1242] Update ws-sanctionletter.json --- configs/pdf-service/format-config/ws-sanctionletter.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/pdf-service/format-config/ws-sanctionletter.json b/configs/pdf-service/format-config/ws-sanctionletter.json index 584d2805..c3da6760 100644 --- a/configs/pdf-service/format-config/ws-sanctionletter.json +++ b/configs/pdf-service/format-config/ws-sanctionletter.json @@ -212,7 +212,7 @@ "columns": [ { "width": "100%", - "text": "{{order_message12}} {{plumberName}}{{order_message13}} {{licenceNo}}{{order_message14}} {{contactNo}}{{order_message10}} {{sla}} {{order_message15}} {{slaDate}}{{order_message11}}", + "text": "{{order_message12}} {{plumberName}}{{order_message13}} {{licenceNo}}{{order_message14}} {{contactNo}}{{order_message10}} 10 {{order_message15}} {{slaDate}}{{order_message11}}", "style": "receipt-value-down" } ], @@ -345,7 +345,7 @@ "text": ":" }, { - "width": "auto", + "width": "40%", "text": "{{applicationNumber}}", "style": "receipt-value-down-sub" } From 8aa9b33e9d2e3e341964d699775f23d9e9cea123 Mon Sep 17 00:00:00 2001 From: ramakrishnaippili Date: Sat, 1 May 2021 07:23:39 +0530 Subject: [PATCH 0619/1242] [PI-1527] corrected query to get locality for a WnS --- configs/egov-searcher/localitySearcher.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/egov-searcher/localitySearcher.yml b/configs/egov-searcher/localitySearcher.yml index 7673bcfb..33bb9d3c 100644 --- a/configs/egov-searcher/localitySearcher.yml +++ b/configs/egov-searcher/localitySearcher.yml @@ -152,7 +152,7 @@ SearchDefinitions: Select row_to_json(result) from ( select applicationno as referenceNumber,locality from eg_ws_connection conn - INNER JOIN eg_pt_property property ON property.id = conn.property_id + INNER JOIN eg_pt_property property ON property.propertyid = conn.property_id INNER JOIN eg_pt_address ptadd ON ptadd.propertyid = property.id ) result $where groupBy: @@ -175,7 +175,7 @@ SearchDefinitions: Select row_to_json(result) from ( select applicationno as referenceNumber,locality from eg_sw_connection conn - INNER JOIN eg_pt_property property ON property.id = conn.property_id + INNER JOIN eg_pt_property property ON property.propertyid = conn.property_id INNER JOIN eg_pt_address ptadd ON ptadd.propertyid = property.id ) result $where groupBy: From 896ad271b6dcd9dd8e78568c6ab870751e9d89cb Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Sat, 1 May 2021 20:35:47 +0530 Subject: [PATCH 0620/1242] Update sw-bill.json --- configs/pdf-service/data-config/sw-bill.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/pdf-service/data-config/sw-bill.json b/configs/pdf-service/data-config/sw-bill.json index 1be82a18..38cd8359 100644 --- a/configs/pdf-service/data-config/sw-bill.json +++ b/configs/pdf-service/data-config/sw-bill.json @@ -790,7 +790,7 @@ }, { "path": "http://property-services.egov:8080/property-services/property/_search", - "queryParam": "tenantId=$.tenantId,uuids=$.additionalDetails.propertyId", + "queryParam": "tenantId=$.tenantId,propertyIds=$.additionalDetails.propertyId", "apiRequest": null, "responseMapping": [ { From 8eff0dec4c5367e277bf02ac38f2db35f2afe5e8 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Sat, 1 May 2021 20:36:17 +0530 Subject: [PATCH 0621/1242] Update ws-bill.json --- configs/pdf-service/data-config/ws-bill.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/pdf-service/data-config/ws-bill.json b/configs/pdf-service/data-config/ws-bill.json index c294a77a..a8199529 100644 --- a/configs/pdf-service/data-config/ws-bill.json +++ b/configs/pdf-service/data-config/ws-bill.json @@ -790,7 +790,7 @@ }, { "path": "http://property-services.egov:8080/property-services/property/_search", - "queryParam": "tenantId=$.tenantId,uuids=$.additionalDetails.propertyId", + "queryParam": "tenantId=$.tenantId,propertyIds=$.additionalDetails.propertyId", "apiRequest": null, "responseMapping": [ { From e0e059b617f0f594ec790b288b330d5efed6f24e Mon Sep 17 00:00:00 2001 From: ramakrishnaippili Date: Sun, 2 May 2021 06:51:37 +0530 Subject: [PATCH 0622/1242] [PI-1527] corrected query to get locality for a WnS --- configs/egov-searcher/bill-genie.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/egov-searcher/bill-genie.yml b/configs/egov-searcher/bill-genie.yml index 87339e86..2a23afab 100644 --- a/configs/egov-searcher/bill-genie.yml +++ b/configs/egov-searcher/bill-genie.yml @@ -127,7 +127,7 @@ SearchDefinitions: FROM egbs_bill_v1 b INNER JOIN egbs_billdetail_v1 bd ON b.id = bd.billid AND b.tenantid = bd.tenantid INNER JOIN egbs_billaccountdetail_v1 ad ON bd.id = ad.billdetail AND bd.tenantid = ad.tenantid INNER JOIN eg_ws_connection conn ON bd.consumercode = conn.connectionno - INNER JOIN eg_pt_property pt ON conn.property_id = pt.id + INNER JOIN eg_pt_property pt ON conn.property_id = pt.propertyid INNER JOIN eg_pt_address ptadd ON ptadd.propertyid = pt.id INNER JOIN eg_pt_owner ptown ON ptown.propertyid = pt.id $where ) @@ -212,7 +212,7 @@ SearchDefinitions: FROM egbs_bill_v1 b INNER JOIN egbs_billdetail_v1 bd ON b.id = bd.billid AND b.tenantid = bd.tenantid INNER JOIN egbs_billaccountdetail_v1 ad ON bd.id = ad.billdetail AND bd.tenantid = ad.tenantid INNER JOIN eg_sw_connection conn ON bd.consumercode = conn.connectionno - INNER JOIN eg_pt_property pt ON conn.property_id = pt.id + INNER JOIN eg_pt_property pt ON conn.property_id = pt.propertyid INNER JOIN eg_pt_address ptadd ON ptadd.propertyid = pt.id INNER JOIN eg_pt_owner ptown ON ptown.propertyid = pt.id $where ) From 4d4ba6afdc1150755db0f855cfce3454fb39e440 Mon Sep 17 00:00:00 2001 From: egovmis Date: Mon, 3 May 2021 12:20:59 +0530 Subject: [PATCH 0623/1242] reverse merge --- configs/pdf-service/data-config/sw-bill.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/pdf-service/data-config/sw-bill.json b/configs/pdf-service/data-config/sw-bill.json index 38cd8359..794fa00f 100644 --- a/configs/pdf-service/data-config/sw-bill.json +++ b/configs/pdf-service/data-config/sw-bill.json @@ -706,7 +706,7 @@ { "externalAPI": [ { - "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "path": "http://localhost:8077/egov-mdms-service/v1/_get", "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", "apiRequest": null, "responseMapping": [ @@ -743,7 +743,7 @@ ] }, { - "path": "http://billing-service:8080/billing-service/demand/_search", + "path": "http://localhost:8078/billing-service/demand/_search", "queryParam": "tenantId=$.tenantId,consumerCode=$.consumerCode,businessService=WS", "apiRequest": null, "responseMapping": [ @@ -774,7 +774,7 @@ ] }, { - "path": "http://sw-services:8080/sw-services/swc/_search", + "path": "http://localhost:8079/sw-services/swc/_search", "queryParam": "tenantId=$.tenantId,connectionNumber=$.consumerCode", "apiRequest": null, "responseMapping": [ From b4f7a4d53e5cadff488d53880c9663cc17d3b3be Mon Sep 17 00:00:00 2001 From: egovmis Date: Mon, 3 May 2021 15:19:42 +0530 Subject: [PATCH 0624/1242] PI-9021 added heads for estimation notice --- .../data-config/ws-estimationnotice.json | 17 ++++++++- .../format-config/ws-estimationnotice.json | 36 +++++++++++++++++++ 2 files changed, 52 insertions(+), 1 deletion(-) diff --git a/configs/pdf-service/data-config/ws-estimationnotice.json b/configs/pdf-service/data-config/ws-estimationnotice.json index 6dc1de94..1c6bdb3c 100644 --- a/configs/pdf-service/data-config/ws-estimationnotice.json +++ b/configs/pdf-service/data-config/ws-estimationnotice.json @@ -87,7 +87,7 @@ { "variable": "otherCharge", "value": { - "path": "$.pdfTaxhead[?(@.taxHeadCode == 'OTHER_CHARGE')].estimateAmount" + "path": "$.pdfTaxhead[?(@.taxHeadCode == 'OTHER_FEE')].estimateAmount" } }, { @@ -113,6 +113,21 @@ "value": { "path": "$.pdfTaxhead[?(@.taxHeadCode == 'ONE_TIME_FEE')].estimateAmount" } + }, { + "variable": "connectionFee", + "value": { + "path": "$.pdfTaxhead[?(@.taxHeadCode == 'CONNECTION_FEE')].estimateAmount" + } + }, { + "variable": "compositionFee", + "value": { + "path": "$.pdfTaxhead[?(@.taxHeadCode == 'COMPOSITION_FEE')].estimateAmount" + } + },{ + "variable": "userCharges", + "value": { + "path": "$.pdfTaxhead[?(@.taxHeadCode == 'USER_CHARGE')].estimateAmount" + } }, { "variable": "penaltyAmount", diff --git a/configs/pdf-service/format-config/ws-estimationnotice.json b/configs/pdf-service/format-config/ws-estimationnotice.json index bc0a575b..ddc08e4f 100644 --- a/configs/pdf-service/format-config/ws-estimationnotice.json +++ b/configs/pdf-service/format-config/ws-estimationnotice.json @@ -448,6 +448,42 @@ "text": "{{rebateAmount}}", "alignment": "right" } + ], [ + { + "text": "10.", + "alignment": "center" + }, + { + "text": "Connection Fee" + }, + { + "text": "{{connectionFee}}", + "alignment": "right" + } + ],[ + { + "text": "11.", + "alignment": "center" + }, + { + "text": "Composition Fee" + }, + { + "text": "{{compositionFee}}", + "alignment": "right" + } + ],[ + { + "text": "12.", + "alignment": "center" + }, + { + "text": "User Charges" + }, + { + "text": "{{userCharges}}", + "alignment": "right" + } ], [ { From 5fb4f2cf7abf42fa224d77868770a06241d28918 Mon Sep 17 00:00:00 2001 From: egovmis Date: Tue, 4 May 2021 09:51:41 +0530 Subject: [PATCH 0625/1242] added sewerage related fields on bill --- configs/pdf-service/data-config/ws-bill.json | 15 +++++++++++++++ configs/pdf-service/format-config/ws-bill.json | 4 ++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/configs/pdf-service/data-config/ws-bill.json b/configs/pdf-service/data-config/ws-bill.json index a8199529..8ab60fd7 100644 --- a/configs/pdf-service/data-config/ws-bill.json +++ b/configs/pdf-service/data-config/ws-bill.json @@ -788,6 +788,21 @@ } ] }, + { + "path": "http://sw-services:8080/sw-services/swc/_search", + "queryParam": "tenantId=$.tenantId,connectionNumber=$.consumerCode", + "apiRequest": null, + "responseMapping": [ + { + "variable": "oldConnectionNoSew", + "value": "$.SewerageConnection[0].additionalDetails.oldConnectionNo" + }, + { + "variable": "ledgerIdSew", + "value": "$.SewerageConnection[0].additionalDetails.ledgerId" + } + ] + }, { "path": "http://property-services.egov:8080/property-services/property/_search", "queryParam": "tenantId=$.tenantId,propertyIds=$.additionalDetails.propertyId", diff --git a/configs/pdf-service/format-config/ws-bill.json b/configs/pdf-service/format-config/ws-bill.json index 1b2a16bc..46620297 100644 --- a/configs/pdf-service/format-config/ws-bill.json +++ b/configs/pdf-service/format-config/ws-bill.json @@ -266,7 +266,7 @@ "style": "receipt-table2" }, { - "text": "{{oldConnectionNo}}", + "text": "{{oldConnectionNo}} || {{oldConnectionNoSew}}", "border": [ false, false, @@ -286,7 +286,7 @@ "style": "receipt-table2" }, { - "text":"{{ledgerId}}", + "text":"{{ledgerId}} || {{ledgerIdSew}}", "border": [ false, false, From 64ed2a8d52d67be86ee80e21e047db8fb3ede359 Mon Sep 17 00:00:00 2001 From: egovmis Date: Tue, 4 May 2021 11:36:19 +0530 Subject: [PATCH 0626/1242] added sewerage related fields on bill --- configs/pdf-service/data-config/ws-bill.json | 4 ++-- configs/pdf-service/format-config/ws-bill.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/pdf-service/data-config/ws-bill.json b/configs/pdf-service/data-config/ws-bill.json index 8ab60fd7..f64ae171 100644 --- a/configs/pdf-service/data-config/ws-bill.json +++ b/configs/pdf-service/data-config/ws-bill.json @@ -780,7 +780,7 @@ "responseMapping": [ { "variable": "oldConnectionNo", - "value": "$.WaterConection[0].additionalDetails.oldConnectionNo" + "value": "$.WaterConection[0].oldConnectionNo" }, { "variable": "ledgerId", @@ -795,7 +795,7 @@ "responseMapping": [ { "variable": "oldConnectionNoSew", - "value": "$.SewerageConnection[0].additionalDetails.oldConnectionNo" + "value": "$.SewerageConnection[0].oldConnectionNo" }, { "variable": "ledgerIdSew", diff --git a/configs/pdf-service/format-config/ws-bill.json b/configs/pdf-service/format-config/ws-bill.json index 46620297..9a17990b 100644 --- a/configs/pdf-service/format-config/ws-bill.json +++ b/configs/pdf-service/format-config/ws-bill.json @@ -266,7 +266,7 @@ "style": "receipt-table2" }, { - "text": "{{oldConnectionNo}} || {{oldConnectionNoSew}}", + "text": "{{oldConnectionNo}}{{oldConnectionNoSew}}", "border": [ false, false, @@ -286,7 +286,7 @@ "style": "receipt-table2" }, { - "text":"{{ledgerId}} || {{ledgerIdSew}}", + "text":"{{ledgerId}}{{ledgerIdSew}}", "border": [ false, false, From d0b226f58d594c6c992fe02015a79e43b8c52312 Mon Sep 17 00:00:00 2001 From: egovmis Date: Tue, 4 May 2021 11:43:13 +0530 Subject: [PATCH 0627/1242] added sewerage related fields on bill --- configs/pdf-service/data-config/ws-bill.json | 4 ++-- configs/pdf-service/format-config/ws-bill.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/pdf-service/data-config/ws-bill.json b/configs/pdf-service/data-config/ws-bill.json index f64ae171..c8c34e0e 100644 --- a/configs/pdf-service/data-config/ws-bill.json +++ b/configs/pdf-service/data-config/ws-bill.json @@ -795,11 +795,11 @@ "responseMapping": [ { "variable": "oldConnectionNoSew", - "value": "$.SewerageConnection[0].oldConnectionNo" + "value": "$.SewerageConnections[0].oldConnectionNo" }, { "variable": "ledgerIdSew", - "value": "$.SewerageConnection[0].additionalDetails.ledgerId" + "value": "$.SewerageConnections[0].additionalDetails.ledgerId" } ] }, diff --git a/configs/pdf-service/format-config/ws-bill.json b/configs/pdf-service/format-config/ws-bill.json index 9a17990b..69c1b18f 100644 --- a/configs/pdf-service/format-config/ws-bill.json +++ b/configs/pdf-service/format-config/ws-bill.json @@ -266,7 +266,7 @@ "style": "receipt-table2" }, { - "text": "{{oldConnectionNo}}{{oldConnectionNoSew}}", + "text": "{{oldConnectionNo}}{{oldConnectionNoSew || ' '}}", "border": [ false, false, @@ -286,7 +286,7 @@ "style": "receipt-table2" }, { - "text":"{{ledgerId}}{{ledgerIdSew}}", + "text":"{{ledgerId}}{{ledgerIdSew || ' '}}", "border": [ false, false, From 4373afa07917788a40f90aaf50d74807ad50d9bf Mon Sep 17 00:00:00 2001 From: egovmis Date: Tue, 4 May 2021 12:39:34 +0530 Subject: [PATCH 0628/1242] added old consumer no and ledger id for bill --- configs/pdf-service/data-config/ws-bill.json | 42 ++++++------------- .../pdf-service/format-config/ws-bill.json | 12 +++--- 2 files changed, 18 insertions(+), 36 deletions(-) diff --git a/configs/pdf-service/data-config/ws-bill.json b/configs/pdf-service/data-config/ws-bill.json index c8c34e0e..bb5004ca 100644 --- a/configs/pdf-service/data-config/ws-bill.json +++ b/configs/pdf-service/data-config/ws-bill.json @@ -456,6 +456,18 @@ "path": "$.mobileNumber" } }, + { + "variable": "oldConnectionNo", + "value": { + "path": "$.additionalDetails.oldConnectionNo" + } + }, + { + "variable": "ledgerId", + "value": { + "path": "$.additionalDetails.ledgerId" + } + }, { "variable": "payerAddress", "value": { @@ -773,36 +785,6 @@ } ] }, - { - "path": "http://ws-services:8080/ws-services/wc/_search", - "queryParam": "tenantId=$.tenantId,connectionNumber=$.consumerCode", - "apiRequest": null, - "responseMapping": [ - { - "variable": "oldConnectionNo", - "value": "$.WaterConection[0].oldConnectionNo" - }, - { - "variable": "ledgerId", - "value": "$.WaterConection[0].additionalDetails.ledgerId" - } - ] - }, - { - "path": "http://sw-services:8080/sw-services/swc/_search", - "queryParam": "tenantId=$.tenantId,connectionNumber=$.consumerCode", - "apiRequest": null, - "responseMapping": [ - { - "variable": "oldConnectionNoSew", - "value": "$.SewerageConnections[0].oldConnectionNo" - }, - { - "variable": "ledgerIdSew", - "value": "$.SewerageConnections[0].additionalDetails.ledgerId" - } - ] - }, { "path": "http://property-services.egov:8080/property-services/property/_search", "queryParam": "tenantId=$.tenantId,propertyIds=$.additionalDetails.propertyId", diff --git a/configs/pdf-service/format-config/ws-bill.json b/configs/pdf-service/format-config/ws-bill.json index 69c1b18f..582082f9 100644 --- a/configs/pdf-service/format-config/ws-bill.json +++ b/configs/pdf-service/format-config/ws-bill.json @@ -206,10 +206,10 @@ { "table": { "widths": [ - "17%", - "43%", - "15%", - "25%" + "23%", + "25%", + "23%", + "*" ], "body": [ [ @@ -266,7 +266,7 @@ "style": "receipt-table2" }, { - "text": "{{oldConnectionNo}}{{oldConnectionNoSew || ' '}}", + "text": "{{oldConnectionNo}}", "border": [ false, false, @@ -286,7 +286,7 @@ "style": "receipt-table2" }, { - "text":"{{ledgerId}}{{ledgerIdSew || ' '}}", + "text":"{{ledgerId}}", "border": [ false, false, From a1c5fe006308157a160a335806aca243852ea98c Mon Sep 17 00:00:00 2001 From: mohaarif007 <48949208+mohaarif007@users.noreply.github.com> Date: Tue, 4 May 2021 17:07:31 +0530 Subject: [PATCH 0629/1242] Implements RAZORPAY for mohali tenant Implements RAZORPAY for mohali tenant --- rainmaker-custom-service/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rainmaker-custom-service/index.js b/rainmaker-custom-service/index.js index ba0e276f..75eec697 100644 --- a/rainmaker-custom-service/index.js +++ b/rainmaker-custom-service/index.js @@ -1040,7 +1040,7 @@ router.post('/protected/punjab-pt/pre-hook/pg-service/transaction/v1/_create', a request['Transaction']['callbackUrl'] = url.format(url_callback); } - else if (request['Transaction']['tenantId'] == 'pb.amritsar') { + else if (request['Transaction']['tenantId'] == 'pb.amritsar' || request['Transaction']['tenantId'] == 'pb.mohali') { let original_callback = request['Transaction']['callbackUrl']; request['Transaction']['gateway'] = 'RAZORPAY' url_callback = url.parse(original_callback) From 84068aceea2124c1e3365fecc08298ce20af0d36 Mon Sep 17 00:00:00 2001 From: ramakrishnaippili Date: Wed, 5 May 2021 16:55:31 +0530 Subject: [PATCH 0630/1242] Added business service filter --- configs/egov-searcher/bill-genie.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/egov-searcher/bill-genie.yml b/configs/egov-searcher/bill-genie.yml index 2a23afab..ad0594d0 100644 --- a/configs/egov-searcher/bill-genie.yml +++ b/configs/egov-searcher/bill-genie.yml @@ -131,7 +131,7 @@ SearchDefinitions: INNER JOIN eg_pt_address ptadd ON ptadd.propertyid = pt.id INNER JOIN eg_pt_owner ptown ON ptown.propertyid = pt.id $where ) - select * from bill_data inner join (select max(b_createddate) as maxcreateddate, bd_consumercode from bill_data group by bd_consumercode) as max ON max.maxcreateddate=b_createddate + select * from bill_data inner join (select max(b_createddate) as maxcreateddate, bd_consumercode from bill_data group by bd_consumercode) as max ON max.maxcreateddate=b_createddate where bd_businessservice='WS' searchParams: condition: AND params: @@ -216,7 +216,7 @@ SearchDefinitions: INNER JOIN eg_pt_address ptadd ON ptadd.propertyid = pt.id INNER JOIN eg_pt_owner ptown ON ptown.propertyid = pt.id $where ) - select * from bill_data inner join (select max(b_createddate) as maxcreateddate, bd_consumercode from bill_data group by bd_consumercode) as max ON max.maxcreateddate=b_createddate + select * from bill_data inner join (select max(b_createddate) as maxcreateddate, bd_consumercode from bill_data group by bd_consumercode) as max ON max.maxcreateddate=b_createddate where bd_businessservice='SW' searchParams: condition: AND params: From 1b15670d4ece3ff3a677dc45a115c9dad29c24fe Mon Sep 17 00:00:00 2001 From: mohammadrafeek-eGov Date: Thu, 6 May 2021 15:13:08 +0530 Subject: [PATCH 0631/1242] Reverted previous changes for testing --- configs/egov-searcher/bill-genie.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/egov-searcher/bill-genie.yml b/configs/egov-searcher/bill-genie.yml index ad0594d0..8ffc6c36 100644 --- a/configs/egov-searcher/bill-genie.yml +++ b/configs/egov-searcher/bill-genie.yml @@ -131,7 +131,7 @@ SearchDefinitions: INNER JOIN eg_pt_address ptadd ON ptadd.propertyid = pt.id INNER JOIN eg_pt_owner ptown ON ptown.propertyid = pt.id $where ) - select * from bill_data inner join (select max(b_createddate) as maxcreateddate, bd_consumercode from bill_data group by bd_consumercode) as max ON max.maxcreateddate=b_createddate where bd_businessservice='WS' + select * from bill_data inner join (select max(b_createddate) as maxcreateddate, bd_consumercode from bill_data group by bd_consumercode) as max ON max.maxcreateddate=b_createddate searchParams: condition: AND params: @@ -216,7 +216,7 @@ SearchDefinitions: INNER JOIN eg_pt_address ptadd ON ptadd.propertyid = pt.id INNER JOIN eg_pt_owner ptown ON ptown.propertyid = pt.id $where ) - select * from bill_data inner join (select max(b_createddate) as maxcreateddate, bd_consumercode from bill_data group by bd_consumercode) as max ON max.maxcreateddate=b_createddate where bd_businessservice='SW' + select * from bill_data inner join (select max(b_createddate) as maxcreateddate, bd_consumercode from bill_data group by bd_consumercode) as max ON max.maxcreateddate=b_createddate searchParams: condition: AND params: From 086dd47fd534078864cbac332990aeeb758b18eb Mon Sep 17 00:00:00 2001 From: mohammadrafeek-eGov Date: Thu, 6 May 2021 15:24:17 +0530 Subject: [PATCH 0632/1242] PI-1527:Updated locality reference for WnS --- configs/egov-searcher/localitySearcher.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/egov-searcher/localitySearcher.yml b/configs/egov-searcher/localitySearcher.yml index 33bb9d3c..e14bc752 100644 --- a/configs/egov-searcher/localitySearcher.yml +++ b/configs/egov-searcher/localitySearcher.yml @@ -151,7 +151,7 @@ SearchDefinitions: baseQuery: | Select row_to_json(result) from ( - select applicationno as referenceNumber,locality from eg_ws_connection conn + select applicationno as referenceNumber,conn.locality from eg_ws_connection conn INNER JOIN eg_pt_property property ON property.propertyid = conn.property_id INNER JOIN eg_pt_address ptadd ON ptadd.propertyid = property.id ) result $where @@ -174,7 +174,7 @@ SearchDefinitions: baseQuery: | Select row_to_json(result) from ( - select applicationno as referenceNumber,locality from eg_sw_connection conn + select applicationno as referenceNumber,conn.locality from eg_sw_connection conn INNER JOIN eg_pt_property property ON property.propertyid = conn.property_id INNER JOIN eg_pt_address ptadd ON ptadd.propertyid = property.id ) result $where From b40b07b07bb68a4a2a534ada940b6a5fa3849722 Mon Sep 17 00:00:00 2001 From: egovmis Date: Fri, 7 May 2021 15:46:04 +0530 Subject: [PATCH 0633/1242] added penalty rate on bill --- configs/pdf-service/data-config/ws-bill.json | 5 +++++ configs/pdf-service/format-config/ws-bill.json | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/configs/pdf-service/data-config/ws-bill.json b/configs/pdf-service/data-config/ws-bill.json index bb5004ca..8b040376 100644 --- a/configs/pdf-service/data-config/ws-bill.json +++ b/configs/pdf-service/data-config/ws-bill.json @@ -461,6 +461,11 @@ "value": { "path": "$.additionalDetails.oldConnectionNo" } + }, { + "variable": "rate", + "value": { + "path": "$.additionalDetails.penaltyRate" + } }, { "variable": "ledgerId", diff --git a/configs/pdf-service/format-config/ws-bill.json b/configs/pdf-service/format-config/ws-bill.json index 582082f9..d6bc1a15 100644 --- a/configs/pdf-service/format-config/ws-bill.json +++ b/configs/pdf-service/format-config/ws-bill.json @@ -717,7 +717,7 @@ ], [ { - "text": "1. Online payment can be done for water charges payment.", + "text": "1. Online payment can be done for {{serviceType}} charges payment. http://bit.ly/{{Municipal_Corporation}}{{serviceType}}", "border": [ true, false, @@ -785,7 +785,7 @@ ], [ { - "text": "5. Late payment charges will be applied after due date", + "text": "5. {{rate}}% Late payment charges will be applied after due date", "border": [ true, false, From 8da710cfd779aceeef3d5ab64dc985cd0205752e Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Fri, 7 May 2021 16:09:52 +0530 Subject: [PATCH 0634/1242] Update ws-bill.json --- configs/pdf-service/data-config/ws-bill.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configs/pdf-service/data-config/ws-bill.json b/configs/pdf-service/data-config/ws-bill.json index 8b040376..c3f66f6f 100644 --- a/configs/pdf-service/data-config/ws-bill.json +++ b/configs/pdf-service/data-config/ws-bill.json @@ -734,6 +734,9 @@ { "variable": "phoneNumber", "value": "$.MdmsRes.tenant.tenants[0].contactNumber" + }, { + "variable":"mcGrade", + "value":"$.MdmsRes.tenant.tenants[0].city.ulbType" }, { "variable": "website", From 818b8f5c2aa1250d58453a0ce01a720707cb894d Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Fri, 7 May 2021 16:10:40 +0530 Subject: [PATCH 0635/1242] Update ws-bill.json --- configs/pdf-service/format-config/ws-bill.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/pdf-service/format-config/ws-bill.json b/configs/pdf-service/format-config/ws-bill.json index d6bc1a15..c9a2934e 100644 --- a/configs/pdf-service/format-config/ws-bill.json +++ b/configs/pdf-service/format-config/ws-bill.json @@ -23,7 +23,7 @@ { "stack": [ { - "text": "{{logo_header}} {{Municipal_Corporation}}", + "text": "{{logo_header}} {{mcGrade}}", "style": "receipt-logo-header" }, { @@ -717,7 +717,7 @@ ], [ { - "text": "1. Online payment can be done for {{serviceType}} charges payment. http://bit.ly/{{Municipal_Corporation}}{{serviceType}}", + "text": "1. Online payment can be done for {{serviceType}} charges payment. http://bit.ly/{{logo_header}}{{serviceType}}", "border": [ true, false, From 48470fb6fa948851a7a8944a3628b6e4a0ff7ab1 Mon Sep 17 00:00:00 2001 From: mohaarif007 <48949208+mohaarif007@users.noreply.github.com> Date: Fri, 7 May 2021 16:52:57 +0530 Subject: [PATCH 0636/1242] Add some other ulb for RAZORPAY Add some other ulb for RAZORPAY --- rainmaker-custom-service/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rainmaker-custom-service/index.js b/rainmaker-custom-service/index.js index 75eec697..01a072e6 100644 --- a/rainmaker-custom-service/index.js +++ b/rainmaker-custom-service/index.js @@ -1040,7 +1040,7 @@ router.post('/protected/punjab-pt/pre-hook/pg-service/transaction/v1/_create', a request['Transaction']['callbackUrl'] = url.format(url_callback); } - else if (request['Transaction']['tenantId'] == 'pb.amritsar' || request['Transaction']['tenantId'] == 'pb.mohali') { + else if (request['Transaction']['tenantId'] == 'pb.amritsar' || request['Transaction']['tenantId'] == 'pb.mohali' || request['Transaction']['tenantId'] == 'pb.hoshiarpur' || request['Transaction']['tenantId'] == 'pb.kapurthala' || request['Transaction']['tenantId'] == 'pb.khanna' || request['Transaction']['tenantId'] == 'pb.moga') { let original_callback = request['Transaction']['callbackUrl']; request['Transaction']['gateway'] = 'RAZORPAY' url_callback = url.parse(original_callback) From 63ae12f1c28fc05307bc5df7a0ca0883bb7510ca Mon Sep 17 00:00:00 2001 From: mohammadrafeek-eGov Date: Mon, 10 May 2021 11:26:26 +0530 Subject: [PATCH 0637/1242] Updated water service indexer --- configs/egov-indexer/water-service.yml | 70 ++++++++++++++++---------- 1 file changed, 44 insertions(+), 26 deletions(-) diff --git a/configs/egov-indexer/water-service.yml b/configs/egov-indexer/water-service.yml index d2be3f51..48418063 100644 --- a/configs/egov-indexer/water-service.yml +++ b/configs/egov-indexer/water-service.yml @@ -7,11 +7,11 @@ ServiceMaps: indexes: - name: water-services type: general - id: $.id,$.property.tenantId + id: $.id,$.tenantId jsonPath: $.WaterConnection - timeStampField: $.additionalDetails.appCreatedDate + timeStampField: $.auditDetails.createdTime customJsonMapping: - indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"ownersmobileNos":[],"applicationNo":"","applicationStatus":"","status":"","connectionNo":"","oldConnectionNo":"","plumberInfo":[],"roadType":"","roadCuttingArea":"","connectionExecutionDate":"","connectionCategory":"","connectionType":"","additionalDetails":{},"id":"","propertyId":"","rainWaterHarvesting":"","waterSource":"","tenantId":"","meterId":"","meterInstallationDate":"","proposedPipeSize":"","proposedTaps":"","pipeSize":"","noOfTaps":"","history":{}}} + indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","applicationStatus":"","status":"","connectionNo":"","oldConnectionNo":"","plumberInfo":[],"roadCuttingInfo":[],"connectionHolders":[],"roadType":"","roadCuttingArea":"","connectionExecutionDate":"","connectionCategory":"","connectionType":"","additionalDetails":{},"id":"","propertyId":"","rainWaterHarvesting":"","waterSource":"","tenantId":"","meterId":"","meterInstallationDate":"","proposedPipeSize":"","proposedTaps":"","pipeSize":"","noOfTaps":"","applicationType":"","dateEffectiveFrom":"","history":{}}} fieldMapping: - inJsonPath: $.applicationStatus.state outJsonPath: $.Data.workflow.state @@ -19,8 +19,6 @@ ServiceMaps: outJsonPath: $.Data.workflow.action - inJsonPath: $.processInstance.assignes.*.uuid outJsonPath: $.Data.workflow.assignes - - inJsonPath: $.property.owners.*.mobileNumber - outJsonPath: $.Data.ownersmobileNos - inJsonPath: $.applicationNo outJsonPath: $.Data.applicationNo - inJsonPath: $.applicationStatus @@ -33,6 +31,10 @@ ServiceMaps: outJsonPath: $.Data.oldConnectionNo - inJsonPath: $.plumberInfo outJsonPath: $.Data.plumberInfo + - inJsonPath: $.roadCuttingInfo + outJsonPath: $.Data.roadCuttingInfo + - inJsonPath: $.connectionHolders + outJsonPath: $.Data.connectionHolders - inJsonPath: $.roadType outJsonPath: $.Data.roadType - inJsonPath: $.roadCuttingArea @@ -47,13 +49,13 @@ ServiceMaps: outJsonPath: $.Data.additionalDetails - inJsonPath: $.id outJsonPath: $.Data.id - - inJsonPath: $.property.propertyId + - inJsonPath: $.propertyId outJsonPath: $.Data.propertyId - inJsonPath: $.rainWaterHarvesting outJsonPath: $.Data.rainWaterHarvesting - inJsonPath: $.waterSource outJsonPath: $.Data.waterSource - - inJsonPath: $.property.tenantId + - inJsonPath: $.tenantId outJsonPath: $.Data.tenantId - inJsonPath: $.meterId outJsonPath: $.Data.meterId @@ -67,25 +69,29 @@ ServiceMaps: outJsonPath: $.Data.pipeSize - inJsonPath: $.noOfTaps outJsonPath: $.Data.noOfTaps + - inJsonPath: $.applicationType + outJsonPath: $.Data.applicationType + - inJsonPath: $.dateEffectiveFrom + outJsonPath: $.Data.dateEffectiveFrom externalUriMapping: - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search - queryParam: businessIds=$.applicationNo,history=true,tenantId=$.property.tenantId + queryParam: businessIds=$.applicationNo,history=true,tenantId=$.tenantId apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} uriResponseMapping: - inJsonPath: $.ProcessInstances outJsonPath: $.Data.history - + - topic: update-ws-connection configKey: INDEX indexes: - name: water-services type: general - id: $.id,$.property.tenantId + id: $.id,$.tenantId jsonPath: $.WaterConnection - timeStampField: $.additionalDetails.appCreatedDate + timeStampField: $.auditDetails.lastModifiedTime customJsonMapping: - indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"ownersmobileNos":[],"applicationNo":"","applicationStatus":"","status":"","connectionNo":"","oldConnectionNo":"","plumberInfo":[],"roadType":"","roadCuttingArea":"","connectionExecutionDate":"","connectionCategory":"","connectionType":"","additionalDetails":{},"id":"","propertyId":"","rainWaterHarvesting":"","waterSource":"","tenantId":"","meterId":"","meterInstallationDate":"","proposedPipeSize":"","proposedTaps":"","pipeSize":"","noOfTaps":"","history":{}}} + indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","applicationStatus":"","status":"","connectionNo":"","oldConnectionNo":"","plumberInfo":[],"roadCuttingInfo":[],"connectionHolders":[],"roadType":"","roadCuttingArea":"","connectionExecutionDate":"","connectionCategory":"","connectionType":"","additionalDetails":{},"id":"","propertyId":"","rainWaterHarvesting":"","waterSource":"","tenantId":"","meterId":"","meterInstallationDate":"","proposedPipeSize":"","proposedTaps":"","pipeSize":"","noOfTaps":"","applicationType":"","dateEffectiveFrom":"","history":{}}} fieldMapping: - inJsonPath: $.applicationStatus.state outJsonPath: $.Data.workflow.state @@ -93,8 +99,6 @@ ServiceMaps: outJsonPath: $.Data.workflow.action - inJsonPath: $.processInstance.assignes.*.uuid outJsonPath: $.Data.workflow.assignes - - inJsonPath: $.property.owners.*.mobileNumber - outJsonPath: $.Data.ownersmobileNos - inJsonPath: $.applicationNo outJsonPath: $.Data.applicationNo - inJsonPath: $.applicationStatus @@ -107,6 +111,10 @@ ServiceMaps: outJsonPath: $.Data.oldConnectionNo - inJsonPath: $.plumberInfo outJsonPath: $.Data.plumberInfo + - inJsonPath: $.roadCuttingInfo + outJsonPath: $.Data.roadCuttingInfo + - inJsonPath: $.connectionHolders + outJsonPath: $.Data.connectionHolders - inJsonPath: $.roadType outJsonPath: $.Data.roadType - inJsonPath: $.roadCuttingArea @@ -121,13 +129,13 @@ ServiceMaps: outJsonPath: $.Data.additionalDetails - inJsonPath: $.id outJsonPath: $.Data.id - - inJsonPath: $.property.propertyId + - inJsonPath: $.propertyId outJsonPath: $.Data.propertyId - inJsonPath: $.rainWaterHarvesting outJsonPath: $.Data.rainWaterHarvesting - inJsonPath: $.waterSource outJsonPath: $.Data.waterSource - - inJsonPath: $.property.tenantId + - inJsonPath: $.tenantId outJsonPath: $.Data.tenantId - inJsonPath: $.meterId outJsonPath: $.Data.meterId @@ -141,24 +149,28 @@ ServiceMaps: outJsonPath: $.Data.pipeSize - inJsonPath: $.noOfTaps outJsonPath: $.Data.noOfTaps + - inJsonPath: $.applicationType + outJsonPath: $.Data.applicationType + - inJsonPath: $.dateEffectiveFrom + outJsonPath: $.Data.dateEffectiveFrom externalUriMapping: - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search - queryParam: businessIds=$.applicationNo,history=true,tenantId=$.property.tenantId + queryParam: businessIds=$.applicationNo,history=true,tenantId=$.tenantId apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} uriResponseMapping: - inJsonPath: $.ProcessInstances outJsonPath: $.Data.history - + - topic: update-ws-workflow configKey: INDEX indexes: - name: water-services type: general - id: $.id,$.property.tenantId + id: $.id,$.tenantId jsonPath: $.WaterConnection - timeStampField: $.additionalDetails.appCreatedDate + timeStampField: $.auditDetails.lastModifiedTime customJsonMapping: - indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"ownersmobileNos":[],"applicationNo":"","applicationStatus":"","status":"","connectionNo":"","oldConnectionNo":"","plumberInfo":[],"roadType":"","roadCuttingArea":"","connectionExecutionDate":"","connectionCategory":"","connectionType":"","additionalDetails":{},"id":"","propertyId":"","rainWaterHarvesting":"","waterSource":"","tenantId":"","meterId":"","meterInstallationDate":"","proposedPipeSize":"","proposedTaps":"","pipeSize":"","noOfTaps":"","history":{}}} + indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","applicationStatus":"","status":"","connectionNo":"","oldConnectionNo":"","plumberInfo":[],"roadCuttingInfo":[],"connectionHolders":[],"roadType":"","roadCuttingArea":"","connectionExecutionDate":"","connectionCategory":"","connectionType":"","additionalDetails":{},"id":"","propertyId":"","rainWaterHarvesting":"","waterSource":"","tenantId":"","meterId":"","meterInstallationDate":"","proposedPipeSize":"","proposedTaps":"","pipeSize":"","noOfTaps":"","applicationType":"","dateEffectiveFrom":"","history":{}}} fieldMapping: - inJsonPath: $.applicationStatus.state outJsonPath: $.Data.workflow.state @@ -166,8 +178,6 @@ ServiceMaps: outJsonPath: $.Data.workflow.action - inJsonPath: $.processInstance.assignes.*.uuid outJsonPath: $.Data.workflow.assignes - - inJsonPath: $.property.owners.*.mobileNumber - outJsonPath: $.Data.ownersmobileNos - inJsonPath: $.applicationNo outJsonPath: $.Data.applicationNo - inJsonPath: $.applicationStatus @@ -180,6 +190,10 @@ ServiceMaps: outJsonPath: $.Data.oldConnectionNo - inJsonPath: $.plumberInfo outJsonPath: $.Data.plumberInfo + - inJsonPath: $.roadCuttingInfo + outJsonPath: $.Data.roadCuttingInfo + - inJsonPath: $.connectionHolders + outJsonPath: $.Data.connectionHolders - inJsonPath: $.roadType outJsonPath: $.Data.roadType - inJsonPath: $.roadCuttingArea @@ -194,13 +208,13 @@ ServiceMaps: outJsonPath: $.Data.additionalDetails - inJsonPath: $.id outJsonPath: $.Data.id - - inJsonPath: $.property.propertyId + - inJsonPath: $.propertyId outJsonPath: $.Data.propertyId - inJsonPath: $.rainWaterHarvesting outJsonPath: $.Data.rainWaterHarvesting - inJsonPath: $.waterSource outJsonPath: $.Data.waterSource - - inJsonPath: $.property.tenantId + - inJsonPath: $.tenantId outJsonPath: $.Data.tenantId - inJsonPath: $.meterId outJsonPath: $.Data.meterId @@ -214,9 +228,13 @@ ServiceMaps: outJsonPath: $.Data.pipeSize - inJsonPath: $.noOfTaps outJsonPath: $.Data.noOfTaps + - inJsonPath: $.applicationType + outJsonPath: $.Data.applicationType + - inJsonPath: $.dateEffectiveFrom + outJsonPath: $.Data.dateEffectiveFrom externalUriMapping: - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search - queryParam: businessIds=$.applicationNo,history=true,tenantId=$.property.tenantId + queryParam: businessIds=$.applicationNo,history=true,tenantId=$.tenantId apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} uriResponseMapping: - inJsonPath: $.ProcessInstances From d967834db89427cf495874ab3e56412fe5877153 Mon Sep 17 00:00:00 2001 From: mohammadrafeek-eGov Date: Mon, 10 May 2021 11:51:45 +0530 Subject: [PATCH 0638/1242] Updated sewerage service indexer yml --- configs/egov-indexer/sewerage-service.yml | 68 ++++++++++++++--------- 1 file changed, 43 insertions(+), 25 deletions(-) diff --git a/configs/egov-indexer/sewerage-service.yml b/configs/egov-indexer/sewerage-service.yml index 246dd2f9..5e973b87 100644 --- a/configs/egov-indexer/sewerage-service.yml +++ b/configs/egov-indexer/sewerage-service.yml @@ -7,11 +7,11 @@ ServiceMaps: indexes: - name: sewerage-services type: general - id: $.id,$.property.tenantId - timeStampField: $.additionalDetails.appCreatedDate + id: $.id,$.tenantId + timeStampField: $.auditDetails.createdTime jsonPath: $.SewerageConnection customJsonMapping: - indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"ownersmobileNos":[],"applicationNo":"","applicationStatus":"","status":"","connectionNo":"","oldConnectionNo":"","plumberInfo":[],"roadType":"","roadCuttingArea":"","connectionExecutionDate":"","connectionCategory":"","connectionType":"","additionalDetails":{},"id":"","propertyId":"","tenantId":"","proposedWaterClosets":"","proposedToilets":"","noOfWaterClosets":"","noOfToilets":"","history":{}}} + indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","applicationStatus":"","status":"","connectionNo":"","oldConnectionNo":"","plumberInfo":[],"roadCuttingInfo":[],"connectionHolders":[],"roadType":"","roadCuttingArea":"","connectionExecutionDate":"","connectionCategory":"","connectionType":"","additionalDetails":{},"id":"","propertyId":"","tenantId":"","proposedWaterClosets":"","proposedToilets":"","noOfWaterClosets":"","noOfToilets":"","applicationType":"","dateEffectiveFrom":"","history":{}}} fieldMapping: - inJsonPath: $.applicationStatus.state outJsonPath: $.Data.workflow.state @@ -19,8 +19,6 @@ ServiceMaps: outJsonPath: $.Data.workflow.action - inJsonPath: $.processInstance.assignes.*.uuid outJsonPath: $.Data.workflow.assignes - - inJsonPath: $.property.owners.*.mobileNumber - outJsonPath: $.Data.ownersmobileNos - inJsonPath: $.applicationNo outJsonPath: $.Data.applicationNo - inJsonPath: $.applicationStatus @@ -33,6 +31,10 @@ ServiceMaps: outJsonPath: $.Data.oldConnectionNo - inJsonPath: $.plumberInfo outJsonPath: $.Data.plumberInfo + - inJsonPath: $.roadCuttingInfo + outJsonPath: $.Data.roadCuttingInfo + - inJsonPath: $.connectionHolders + outJsonPath: $.Data.connectionHolders - inJsonPath: $.roadType outJsonPath: $.Data.roadType - inJsonPath: $.roadCuttingArea @@ -47,9 +49,9 @@ ServiceMaps: outJsonPath: $.Data.additionalDetails - inJsonPath: $.id outJsonPath: $.Data.id - - inJsonPath: $.property.propertyId + - inJsonPath: $.propertyId outJsonPath: $.Data.propertyId - - inJsonPath: $.property.tenantId + - inJsonPath: $.tenantId outJsonPath: $.Data.tenantId - inJsonPath: $.proposedWaterClosets outJsonPath: $.Data.proposedWaterClosets @@ -59,9 +61,13 @@ ServiceMaps: outJsonPath: $.Data.noOfWaterClosets - inJsonPath: $.noOfToilets outJsonPath: $.Data.noOfToilets + - inJsonPath: $.applicationType + outJsonPath: $.Data.applicationType + - inJsonPath: $.dateEffectiveFrom + outJsonPath: $.Data.dateEffectiveFrom externalUriMapping: - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search - queryParam: businessIds=$.applicationNo,history=true,tenantId=$.property.tenantId + queryParam: businessIds=$.applicationNo,history=true,tenantId=$.tenantId apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} uriResponseMapping: - inJsonPath: $.ProcessInstances @@ -72,11 +78,11 @@ ServiceMaps: indexes: - name: sewerage-services type: general - id: $.id,$.property.tenantId - timeStampField: $.additionalDetails.appCreatedDate + id: $.id,$.tenantId + timeStampField: $.auditDetails.lastModifiedTime jsonPath: $.SewerageConnection customJsonMapping: - indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"ownersmobileNos":[],"applicationNo":"","applicationStatus":"","status":"","connectionNo":"","oldConnectionNo":"","plumberInfo":[],"roadType":"","roadCuttingArea":"","connectionExecutionDate":"","connectionCategory":"","connectionType":"","additionalDetails":{},"id":"","propertyId":"","tenantId":"","proposedWaterClosets":"","proposedToilets":"","noOfWaterClosets":"","noOfToilets":"","history":{}}} + indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","applicationStatus":"","status":"","connectionNo":"","oldConnectionNo":"","plumberInfo":[],"roadCuttingInfo":[],"connectionHolders":[],"roadType":"","roadCuttingArea":"","connectionExecutionDate":"","connectionCategory":"","connectionType":"","additionalDetails":{},"id":"","propertyId":"","tenantId":"","proposedWaterClosets":"","proposedToilets":"","noOfWaterClosets":"","noOfToilets":"","applicationType":"","dateEffectiveFrom":"","history":{}}} fieldMapping: - inJsonPath: $.applicationStatus.state outJsonPath: $.Data.workflow.state @@ -84,8 +90,6 @@ ServiceMaps: outJsonPath: $.Data.workflow.action - inJsonPath: $.processInstance.assignes.*.uuid outJsonPath: $.Data.workflow.assignes - - inJsonPath: $.property.owners.*.mobileNumber - outJsonPath: $.Data.ownersmobileNos - inJsonPath: $.applicationNo outJsonPath: $.Data.applicationNo - inJsonPath: $.applicationStatus @@ -98,6 +102,10 @@ ServiceMaps: outJsonPath: $.Data.oldConnectionNo - inJsonPath: $.plumberInfo outJsonPath: $.Data.plumberInfo + - inJsonPath: $.roadCuttingInfo + outJsonPath: $.Data.roadCuttingInfo + - inJsonPath: $.connectionHolders + outJsonPath: $.Data.connectionHolders - inJsonPath: $.roadType outJsonPath: $.Data.roadType - inJsonPath: $.roadCuttingArea @@ -112,9 +120,9 @@ ServiceMaps: outJsonPath: $.Data.additionalDetails - inJsonPath: $.id outJsonPath: $.Data.id - - inJsonPath: $.property.propertyId + - inJsonPath: $.propertyId outJsonPath: $.Data.propertyId - - inJsonPath: $.property.tenantId + - inJsonPath: $.tenantId outJsonPath: $.Data.tenantId - inJsonPath: $.proposedWaterClosets outJsonPath: $.Data.proposedWaterClosets @@ -124,9 +132,13 @@ ServiceMaps: outJsonPath: $.Data.noOfWaterClosets - inJsonPath: $.noOfToilets outJsonPath: $.Data.noOfToilets + - inJsonPath: $.applicationType + outJsonPath: $.Data.applicationType + - inJsonPath: $.dateEffectiveFrom + outJsonPath: $.Data.dateEffectiveFrom externalUriMapping: - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search - queryParam: businessIds=$.applicationNo,history=true,tenantId=$.property.tenantId + queryParam: businessIds=$.applicationNo,history=true,tenantId=$.tenantId apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} uriResponseMapping: - inJsonPath: $.ProcessInstances @@ -138,11 +150,11 @@ ServiceMaps: indexes: - name: sewerage-services type: general - id: $.id,$.property.tenantId - timeStampField: $.additionalDetails.appCreatedDate + id: $.id,$.tenantId + timeStampField: $.auditDetails.lastModifiedTime jsonPath: $.SewerageConnection customJsonMapping: - indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"ownersmobileNos":[],"applicationNo":"","applicationStatus":"","status":"","connectionNo":"","oldConnectionNo":"","plumberInfo":[],"roadType":"","roadCuttingArea":"","connectionExecutionDate":"","connectionCategory":"","connectionType":"","additionalDetails":{},"id":"","propertyId":"","tenantId":"","proposedWaterClosets":"","proposedToilets":"","noOfWaterClosets":"","noOfToilets":"","history":{}}} + indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","applicationStatus":"","status":"","connectionNo":"","oldConnectionNo":"","plumberInfo":[],"roadCuttingInfo":[],"connectionHolders":[],"roadType":"","roadCuttingArea":"","connectionExecutionDate":"","connectionCategory":"","connectionType":"","additionalDetails":{},"id":"","propertyId":"","tenantId":"","proposedWaterClosets":"","proposedToilets":"","noOfWaterClosets":"","noOfToilets":"","applicationType":"","dateEffectiveFrom":"","history":{}}} fieldMapping: - inJsonPath: $.applicationStatus.state outJsonPath: $.Data.workflow.state @@ -150,8 +162,6 @@ ServiceMaps: outJsonPath: $.Data.workflow.action - inJsonPath: $.processInstance.assignes.*.uuid outJsonPath: $.Data.workflow.assignes - - inJsonPath: $.property.owners.*.mobileNumber - outJsonPath: $.Data.ownersmobileNos - inJsonPath: $.applicationNo outJsonPath: $.Data.applicationNo - inJsonPath: $.applicationStatus @@ -164,6 +174,10 @@ ServiceMaps: outJsonPath: $.Data.oldConnectionNo - inJsonPath: $.plumberInfo outJsonPath: $.Data.plumberInfo + - inJsonPath: $.roadCuttingInfo + outJsonPath: $.Data.roadCuttingInfo + - inJsonPath: $.connectionHolders + outJsonPath: $.Data.connectionHolders - inJsonPath: $.roadType outJsonPath: $.Data.roadType - inJsonPath: $.roadCuttingArea @@ -178,9 +192,9 @@ ServiceMaps: outJsonPath: $.Data.additionalDetails - inJsonPath: $.id outJsonPath: $.Data.id - - inJsonPath: $.property.propertyId + - inJsonPath: $.propertyId outJsonPath: $.Data.propertyId - - inJsonPath: $.property.tenantId + - inJsonPath: $.tenantId outJsonPath: $.Data.tenantId - inJsonPath: $.proposedWaterClosets outJsonPath: $.Data.proposedWaterClosets @@ -190,10 +204,14 @@ ServiceMaps: outJsonPath: $.Data.noOfWaterClosets - inJsonPath: $.noOfToilets outJsonPath: $.Data.noOfToilets + - inJsonPath: $.applicationType + outJsonPath: $.Data.applicationType + - inJsonPath: $.dateEffectiveFrom + outJsonPath: $.Data.dateEffectiveFrom externalUriMapping: - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search - queryParam: businessIds=$.applicationNo,history=true,tenantId=$.property.tenantId + queryParam: businessIds=$.applicationNo,history=true,tenantId=$.tenantId apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} uriResponseMapping: - inJsonPath: $.ProcessInstances - outJsonPath: $.Data.history + outJsonPath: $.Data.history From afff63b75a345ccd25244e87d7a24cfbaab8ce71 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Wed, 12 May 2021 12:04:13 +0530 Subject: [PATCH 0639/1242] reverted changes optimization -pgr search query --- .../rainmaker-pgr-v2-searcher.yml | 207 +----------------- 1 file changed, 2 insertions(+), 205 deletions(-) diff --git a/configs/egov-searcher/rainmaker-pgr-v2-searcher.yml b/configs/egov-searcher/rainmaker-pgr-v2-searcher.yml index fc055952..67f36740 100644 --- a/configs/egov-searcher/rainmaker-pgr-v2-searcher.yml +++ b/configs/egov-searcher/rainmaker-pgr-v2-searcher.yml @@ -5,210 +5,7 @@ SearchDefinitions: definitions: - name: serviceSearchWithDetails query: - # select array_to_json(array_agg(row_to_json(serviceRequests))) from (select (select (select (row_to_json(services)) from ( select *, (select (select row_to_json(auditDetails) from (select createdtime, lastmodifiedtime, createdby, lastmodifiedby from eg_pgr_service where svc.serviceRequestId=eg_pgr_service.serviceRequestId) auditDetails) as auditDetails), (select (select (row_to_json(addressDetail)) from (select * from eg_pgr_address where eg_pgr_address.uuid=eg_pgr_service.addressid) addressDetail) as addressDetail) from eg_pgr_service svc where svc.serviceRequestId=eg_pgr_service.serviceRequestId order by createdtime desc) services) as services),(select (select array_to_json(array_agg(row_to_json(actionHistory))) from ( select * from eg_pgr_action where businessKey=eg_pgr_service.serviceRequestId order by "when" desc) actionHistory) as actionHistory) from eg_pgr_service $where order by createdtime desc $pagination) serviceRequests - baseQuery: | - SELECT - coalesce( - json_agg( - "root" - ORDER BY - "root.pg.createdtime" DESC NULLS FIRST - ), - '[]' - ) AS "root" - FROM - ( - SELECT - row_to_json( - ( - SELECT - "_14_e" - FROM - ( - SELECT - "_9_root.or.self"."services" AS "services", - "_13_root.ar.root.actionhistory"."actionhistory" AS "actionhistory" - ) AS "_14_e" - ) - ) AS "root", - "_0_root.base"."createdtime" AS "root.pg.createdtime" - FROM - ( - SELECT - * - FROM - "public"."eg_pgr_service" - $where - ) AS "_0_root.base" - LEFT OUTER JOIN LATERAL ( - SELECT - row_to_json( - ( - SELECT - "_8_e" - FROM - ( - SELECT - "_1_root.or.self.base"."tenantid" AS "tenantid", - "_1_root.or.self.base"."servicecode" AS "servicecode", - "_1_root.or.self.base"."servicerequestid" AS "servicerequestid", - "_1_root.or.self.base"."description" AS "description", - "_1_root.or.self.base"."lat" AS "lat", - "_1_root.or.self.base"."long" AS "long", - "_1_root.or.self.base"."address" AS "address", - "_1_root.or.self.base"."addressid" AS "addressid", - "_1_root.or.self.base"."email" AS "email", - "_1_root.or.self.base"."deviceid" AS "deviceid", - "_1_root.or.self.base"."accountid" AS "accountid", - "_1_root.or.self.base"."firstname" AS "firstname", - "_1_root.or.self.base"."lastname" AS "lastname", - "_1_root.or.self.base"."phone" AS "phone", - "_1_root.or.self.base"."attributes" AS "attributes", - "_1_root.or.self.base"."status" AS "status", - "_1_root.or.self.base"."source" AS "source", - "_1_root.or.self.base"."expectedtime" AS "expectedtime", - "_1_root.or.self.base"."feedback" AS "feedback", - "_1_root.or.self.base"."rating" AS "rating", - "_1_root.or.self.base"."createdby" AS "createdby", - "_1_root.or.self.base"."createdtime" AS "createdtime", - "_1_root.or.self.base"."lastmodifiedby" AS "lastmodifiedby", - "_1_root.or.self.base"."lastmodifiedtime" AS "lastmodifiedtime", - "_1_root.or.self.base"."landmark" AS "landmark", - "_1_root.or.self.base"."active" AS "active", - "_4_root.or.self.or.self"."auditdetails" AS "auditdetails", - "_7_root.or.self.or.eg_pgr_address_id"."addressdetail" AS "addressdetail" - ) AS "_8_e" - ) - ) AS "services" - FROM - ( - SELECT - * - FROM - "public"."eg_pgr_service" - WHERE - ( - (("_0_root.base"."tenantid") = ("tenantid")) - AND ( - ("_0_root.base"."servicerequestid") = ("servicerequestid") - ) - ) - ) AS "_1_root.or.self.base" - LEFT OUTER JOIN LATERAL ( - SELECT - row_to_json( - ( - SELECT - "_3_e" - FROM - ( - SELECT - "_2_root.or.self.or.self.base"."createdby" AS "createdby", - "_2_root.or.self.or.self.base"."lastmodifiedby" AS "lastmodifiedby", - "_2_root.or.self.or.self.base"."createdtime" AS "createdtime", - "_2_root.or.self.or.self.base"."lastmodifiedtime" AS "lastmodifiedtime" - ) AS "_3_e" - ) - ) AS "auditdetails" - FROM - ( - SELECT - * - FROM - "public"."eg_pgr_service" - WHERE - ( - ( - ("_1_root.or.self.base"."tenantid") = ("tenantid") - ) - AND ( - ("_1_root.or.self.base"."servicerequestid") = ("servicerequestid") - ) - ) - ) AS "_2_root.or.self.or.self.base" - ) AS "_4_root.or.self.or.self" ON ('true') - LEFT OUTER JOIN LATERAL ( - SELECT - row_to_json( - ( - SELECT - "_6_e" - FROM - ( - SELECT - "_5_root.or.self.or.eg_pgr_address_id.base"."uuid" AS "uuid", - "_5_root.or.self.or.eg_pgr_address_id.base"."housenoandstreetname" AS "housenoandstreetname", - "_5_root.or.self.or.eg_pgr_address_id.base"."mohalla" AS "mohalla", - "_5_root.or.self.or.eg_pgr_address_id.base"."landmark" AS "landmark", - "_5_root.or.self.or.eg_pgr_address_id.base"."latitude" AS "latitude", - "_5_root.or.self.or.eg_pgr_address_id.base"."longitude" AS "longitude", - "_5_root.or.self.or.eg_pgr_address_id.base"."city" AS "city", - "_5_root.or.self.or.eg_pgr_address_id.base"."tenantid" AS "tenantid", - "_5_root.or.self.or.eg_pgr_address_id.base"."createdby" AS "createdby", - "_5_root.or.self.or.eg_pgr_address_id.base"."createdtime" AS "createdtime", - "_5_root.or.self.or.eg_pgr_address_id.base"."lastmodifiedby" AS "lastmodifiedby", - "_5_root.or.self.or.eg_pgr_address_id.base"."lastmodifiedtime" AS "lastmodifiedtime" - ) AS "_6_e" - ) - ) AS "addressdetail" - FROM - ( - SELECT - * - FROM - "public"."eg_pgr_address" - WHERE - (("_1_root.or.self.base"."addressid") = ("uuid")) - ) AS "_5_root.or.self.or.eg_pgr_address_id.base" - ) AS "_7_root.or.self.or.eg_pgr_address_id" ON ('true') - ) AS "_9_root.or.self" ON ('true') - LEFT OUTER JOIN LATERAL ( - SELECT - coalesce(json_agg("actionhistory"), '[]') AS "actionhistory" - FROM - ( - SELECT - row_to_json( - ( - SELECT - "_11_e" - FROM - ( - SELECT - "_10_root.ar.root.actionhistory.base"."uuid" AS "uuid", - "_10_root.ar.root.actionhistory.base"."tenantid" AS "tenantid", - "_10_root.ar.root.actionhistory.base"."by" AS "by", - "_10_root.ar.root.actionhistory.base"."isinternal" AS "isinternal", - "_10_root.ar.root.actionhistory.base"."when" AS "when", - "_10_root.ar.root.actionhistory.base"."businesskey" AS "businesskey", - "_10_root.ar.root.actionhistory.base"."status" AS "status", - "_10_root.ar.root.actionhistory.base"."assignee" AS "assignee", - "_10_root.ar.root.actionhistory.base"."media" AS "media", - "_10_root.ar.root.actionhistory.base"."comments" AS "comments", - "_10_root.ar.root.actionhistory.base"."action" AS "action" - ) AS "_11_e" - ) - ) AS "actionhistory" - FROM - ( - SELECT - * - FROM - "public"."eg_pgr_action" - WHERE - ( - (("_0_root.base"."tenantid") = ("tenantid")) - AND ( - ("_0_root.base"."servicerequestid") = ("businesskey") - ) - ) - ) AS "_10_root.ar.root.actionhistory.base" - ) AS "_12_root.ar.root.actionhistory" - ) AS "_13_root.ar.root.actionhistory" ON ('true') - ORDER BY - "root.pg.createdtime" DESC NULLS FIRST - $pagination - ) AS "_15_root" + baseQuery: select array_to_json(array_agg(row_to_json(serviceRequests))) from (select (select (select (row_to_json(services)) from ( select *, (select (select row_to_json(auditDetails) from (select createdtime, lastmodifiedtime, createdby, lastmodifiedby from eg_pgr_service where svc.serviceRequestId=eg_pgr_service.serviceRequestId) auditDetails) as auditDetails), (select (select (row_to_json(addressDetail)) from (select * from eg_pgr_address where eg_pgr_address.uuid=eg_pgr_service.addressid) addressDetail) as addressDetail) from eg_pgr_service svc where svc.serviceRequestId=eg_pgr_service.serviceRequestId order by createdtime desc) services) as services),(select (select array_to_json(array_agg(row_to_json(actionHistory))) from ( select * from eg_pgr_action where businessKey=eg_pgr_service.serviceRequestId order by "when" desc) actionHistory) as actionHistory) from eg_pgr_service $where order by createdtime desc $pagination) serviceRequests groupBy: orderBy: searchParams: @@ -262,7 +59,7 @@ SearchDefinitions: jsonFormat: {"ResponseInfo": {}} outJsonPath: $.services responseInfoPath: $.ResponseInfo - + - name: getServiceRequestsOnAssignedTo #select array_to_json(array_agg(row_to_json(servicesRequestIds))) from (select businessKey from eg_pgr_action $where AND eg_pgr_action.when IN (select max("when") from eg_pgr_action where assignee NOTNULL group by businessKey)) servicesRequestIds baseQuery: | query: From e6b88f83b412819b0eaf179f8d432b4772794048 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Wed, 12 May 2021 13:23:47 +0530 Subject: [PATCH 0640/1242] Update rainmaker-pgr-v2-searcher.yml --- .../rainmaker-pgr-v2-searcher.yml | 55 ++++++++++++++++++- 1 file changed, 54 insertions(+), 1 deletion(-) diff --git a/configs/egov-searcher/rainmaker-pgr-v2-searcher.yml b/configs/egov-searcher/rainmaker-pgr-v2-searcher.yml index 67f36740..ea97056f 100644 --- a/configs/egov-searcher/rainmaker-pgr-v2-searcher.yml +++ b/configs/egov-searcher/rainmaker-pgr-v2-searcher.yml @@ -59,7 +59,60 @@ SearchDefinitions: jsonFormat: {"ResponseInfo": {}} outJsonPath: $.services responseInfoPath: $.ResponseInfo - + + - name: serviceSearchWithDetailsCitizen + query: + baseQuery: select array_to_json(array_agg(row_to_json(serviceRequests))) from (select (select (select (row_to_json(services)) from ( select *, (select (select row_to_json(auditDetails) from (select createdtime, lastmodifiedtime, createdby, lastmodifiedby from eg_pgr_service where svc.serviceRequestId=eg_pgr_service.serviceRequestId) auditDetails) as auditDetails), (select (select (row_to_json(addressDetail)) from (select * from eg_pgr_address where eg_pgr_address.uuid=eg_pgr_service.addressid) addressDetail) as addressDetail) from eg_pgr_service svc where svc.serviceRequestId=eg_pgr_service.serviceRequestId order by createdtime desc) services) as services),(select (select array_to_json(array_agg(row_to_json(actionHistory))) from ( select * from eg_pgr_action where businessKey=eg_pgr_service.serviceRequestId order by "when" desc) actionHistory) as actionHistory) from eg_pgr_service $where order by createdtime desc $pagination) serviceRequests + groupBy: + orderBy: + searchParams: + condition: AND + params: + - name: servicerequestid + isMandatory: false + jsonPath: $.searchCriteria.serviceRequestId + - name: servicerequestid + isMandatory: false + jsonPath: $.searchCriteria.complaintId + operator: LIKE + - name: accountid + isMandatory: true + jsonPath: $.searchCriteria.accountId + - name: status + isMandatory: false + jsonPath: $.searchCriteria.status + - name: createdtime + isMandatory: false + operator: GE + jsonPath: $.searchCriteria.startDate + - name: createdtime + isMandatory: false + operator: LE + jsonPath: $.searchCriteria.endDate + - name: lastmodifiedtime + isMandatory: false + jsonPath: $.searchCriteria.lastUpdatedSince + - name: serviceCode + isMandatory: false + jsonPath: $.searchCriteria.serviceCodes + - name: phone + isMandatory: false + jsonPath: $.searchCriteria.phone + - name: createdby + isMandatory: false + jsonPath: $.searchCriteria.createdBy + - name: active + isMandatory: false + jsonPath: $.searchCriteria.active + pagination: + noOfRecords: $.searchCriteria.noOfRecords + offset: $.searchCriteria.offset + + output: + jsonFormat: {"ResponseInfo": {}} + outJsonPath: $.services + responseInfoPath: $.ResponseInfo + - name: getServiceRequestsOnAssignedTo #select array_to_json(array_agg(row_to_json(servicesRequestIds))) from (select businessKey from eg_pgr_action $where AND eg_pgr_action.when IN (select max("when") from eg_pgr_action where assignee NOTNULL group by businessKey)) servicesRequestIds baseQuery: | query: From 6cec09ae488573362db006da93b322f0b5b1829e Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Wed, 12 May 2021 13:36:21 +0530 Subject: [PATCH 0641/1242] Update rainmaker-pgr-v2-searcher.yml --- configs/egov-searcher/rainmaker-pgr-v2-searcher.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/egov-searcher/rainmaker-pgr-v2-searcher.yml b/configs/egov-searcher/rainmaker-pgr-v2-searcher.yml index ea97056f..63caa815 100644 --- a/configs/egov-searcher/rainmaker-pgr-v2-searcher.yml +++ b/configs/egov-searcher/rainmaker-pgr-v2-searcher.yml @@ -68,13 +68,13 @@ SearchDefinitions: searchParams: condition: AND params: - - name: servicerequestid + - name: tenantid isMandatory: false - jsonPath: $.searchCriteria.serviceRequestId + jsonPath: $.searchCriteria.tenantId + operator: LIKE - name: servicerequestid isMandatory: false - jsonPath: $.searchCriteria.complaintId - operator: LIKE + jsonPath: $.searchCriteria.serviceRequestId - name: accountid isMandatory: true jsonPath: $.searchCriteria.accountId From 97dfcdb76b4adc52a7e72ddf5e914bf08d5d9560 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Wed, 12 May 2021 14:09:18 +0530 Subject: [PATCH 0642/1242] Update rainmaker-pgr-v2-searcher.yml --- configs/egov-searcher/rainmaker-pgr-v2-searcher.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/egov-searcher/rainmaker-pgr-v2-searcher.yml b/configs/egov-searcher/rainmaker-pgr-v2-searcher.yml index 63caa815..d06ed329 100644 --- a/configs/egov-searcher/rainmaker-pgr-v2-searcher.yml +++ b/configs/egov-searcher/rainmaker-pgr-v2-searcher.yml @@ -78,6 +78,7 @@ SearchDefinitions: - name: accountid isMandatory: true jsonPath: $.searchCriteria.accountId + operator: = - name: status isMandatory: false jsonPath: $.searchCriteria.status From 3990e07960f973d831330ad617556d1ff55ea375 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Wed, 12 May 2021 14:13:09 +0530 Subject: [PATCH 0643/1242] Update rainmaker-pgr-v2-searcher.yml --- configs/egov-searcher/rainmaker-pgr-v2-searcher.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/egov-searcher/rainmaker-pgr-v2-searcher.yml b/configs/egov-searcher/rainmaker-pgr-v2-searcher.yml index d06ed329..153063f4 100644 --- a/configs/egov-searcher/rainmaker-pgr-v2-searcher.yml +++ b/configs/egov-searcher/rainmaker-pgr-v2-searcher.yml @@ -68,6 +68,10 @@ SearchDefinitions: searchParams: condition: AND params: + - name: accountid + isMandatory: true + jsonPath: $.searchCriteria.accountId + operator: = - name: tenantid isMandatory: false jsonPath: $.searchCriteria.tenantId @@ -75,10 +79,6 @@ SearchDefinitions: - name: servicerequestid isMandatory: false jsonPath: $.searchCriteria.serviceRequestId - - name: accountid - isMandatory: true - jsonPath: $.searchCriteria.accountId - operator: = - name: status isMandatory: false jsonPath: $.searchCriteria.status From 618b544b921011f96649b409937ca98e2664dabc Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 24 May 2021 11:10:39 +0530 Subject: [PATCH 0644/1242] added firenoc_billingslab_search --- .../egov-searcher/rainmaker-pt-gissearch.yml | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/configs/egov-searcher/rainmaker-pt-gissearch.yml b/configs/egov-searcher/rainmaker-pt-gissearch.yml index d803ef7d..fa30280e 100644 --- a/configs/egov-searcher/rainmaker-pt-gissearch.yml +++ b/configs/egov-searcher/rainmaker-pt-gissearch.yml @@ -48,3 +48,33 @@ SearchDefinitions: jsonFormat: {"ResponseInfo": {}} outJsonPath: $.data responseInfoPath: $.ResponseInfo + + - name: firenoc_billing_slab_search + query: + baseQuery: | + select array_to_json(array_agg(row_to_json(data))) from ( + SELECT * FROM eg_firenoc_billingslab + $where) data + groupBy: + orderBy: + searchParams: + condition: AND + params: + - name: heightfromuom + isMandatory: true + jsonPath: $.searchCriteria.height + operator: LE + - name: heighttouom + isMandatory: true + jsonPath: $.searchCriteria.height + operator: GE + - name: buildingusagetype + isMandatory: true + jsonPath: $.searchCriteria.usagetype + operator: = + + output: + jsonFormat: {"ResponseInfo": {}} + outJsonPath: $.data + responseInfoPath: $.ResponseInfo + From 0c8c6ac50ddf4e04821c4a0728aaaef65c251ba8 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 24 May 2021 11:48:59 +0530 Subject: [PATCH 0645/1242] updated table name for firenoc_billingslab --- configs/egov-searcher/rainmaker-pt-gissearch.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-searcher/rainmaker-pt-gissearch.yml b/configs/egov-searcher/rainmaker-pt-gissearch.yml index fa30280e..06e73e7d 100644 --- a/configs/egov-searcher/rainmaker-pt-gissearch.yml +++ b/configs/egov-searcher/rainmaker-pt-gissearch.yml @@ -53,7 +53,7 @@ SearchDefinitions: query: baseQuery: | select array_to_json(array_agg(row_to_json(data))) from ( - SELECT * FROM eg_firenoc_billingslab + SELECT * FROM eg_firenoc_state_billingslab $where) data groupBy: orderBy: From 9e6d501fd17dcddef96fc8fd6dd5180b532b618c Mon Sep 17 00:00:00 2001 From: egovmis Date: Tue, 25 May 2021 20:32:04 +0530 Subject: [PATCH 0646/1242] changed width of receipt number --- configs/pdf-service/format-config/ws-onetime-receipt.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/pdf-service/format-config/ws-onetime-receipt.json b/configs/pdf-service/format-config/ws-onetime-receipt.json index ac25fea5..badad73a 100644 --- a/configs/pdf-service/format-config/ws-onetime-receipt.json +++ b/configs/pdf-service/format-config/ws-onetime-receipt.json @@ -484,9 +484,9 @@ "table": { "widths": [ "34%", - "16%", + "18%", "36%", - "14%" + "12%" ], "body": [ [ From 67d6daa129aa8e82e3c9538aab45a47bc9202fb7 Mon Sep 17 00:00:00 2001 From: KarunaNidhan-egov <72540308+KarunaNidhan-egov@users.noreply.github.com> Date: Thu, 27 May 2021 16:21:32 +0530 Subject: [PATCH 0647/1242] added topic ws-services-legacyindex --- configs/egov-indexer/water-service.yml | 79 ++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) diff --git a/configs/egov-indexer/water-service.yml b/configs/egov-indexer/water-service.yml index 48418063..d517a72d 100644 --- a/configs/egov-indexer/water-service.yml +++ b/configs/egov-indexer/water-service.yml @@ -239,3 +239,82 @@ ServiceMaps: uriResponseMapping: - inJsonPath: $.ProcessInstances outJsonPath: $.Data.history + + - topic: ws-services-legacyindex + configKey: INDEX + indexes: + - name: water-services + type: general + id: $.id,$.tenantId + jsonPath: $.WaterConnection + timeStampField: $.auditDetails.createdTime + customJsonMapping: + indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","applicationStatus":"","status":"","connectionNo":"","oldConnectionNo":"","plumberInfo":[],"roadCuttingInfo":[],"connectionHolders":[],"roadType":"","roadCuttingArea":"","connectionExecutionDate":"","connectionCategory":"","connectionType":"","additionalDetails":{},"id":"","propertyId":"","rainWaterHarvesting":"","waterSource":"","tenantId":"","meterId":"","meterInstallationDate":"","proposedPipeSize":"","proposedTaps":"","pipeSize":"","noOfTaps":"","applicationType":"","dateEffectiveFrom":"","history":{}}} + fieldMapping: + - inJsonPath: $.applicationStatus.state + outJsonPath: $.Data.workflow.state + - inJsonPath: $.processInstance.action + outJsonPath: $.Data.workflow.action + - inJsonPath: $.processInstance.assignes.*.uuid + outJsonPath: $.Data.workflow.assignes + - inJsonPath: $.applicationNo + outJsonPath: $.Data.applicationNo + - inJsonPath: $.applicationStatus + outJsonPath: $.Data.applicationStatus + - inJsonPath: $.status + outJsonPath: $.Data.status + - inJsonPath: $.connectionNo + outJsonPath: $.Data.connectionNo + - inJsonPath: $.oldConnectionNo + outJsonPath: $.Data.oldConnectionNo + - inJsonPath: $.plumberInfo + outJsonPath: $.Data.plumberInfo + - inJsonPath: $.roadCuttingInfo + outJsonPath: $.Data.roadCuttingInfo + - inJsonPath: $.connectionHolders + outJsonPath: $.Data.connectionHolders + - inJsonPath: $.roadType + outJsonPath: $.Data.roadType + - inJsonPath: $.roadCuttingArea + outJsonPath: $.Data.roadCuttingArea + - inJsonPath: $.connectionExecutionDate + outJsonPath: $.Data.connectionExecutionDate + - inJsonPath: $.connectionCategory + outJsonPath: $.Data.connectionCategory + - inJsonPath: $.connectionType + outJsonPath: $.Data.connectionType + - inJsonPath: $.additionalDetails + outJsonPath: $.Data.additionalDetails + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.propertyId + outJsonPath: $.Data.propertyId + - inJsonPath: $.rainWaterHarvesting + outJsonPath: $.Data.rainWaterHarvesting + - inJsonPath: $.waterSource + outJsonPath: $.Data.waterSource + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.meterId + outJsonPath: $.Data.meterId + - inJsonPath: $.meterInstallationDate + outJsonPath: $.Data.meterInstallationDate + - inJsonPath: $.proposedPipeSize + outJsonPath: $.Data.proposedPipeSize + - inJsonPath: $.proposedTaps + outJsonPath: $.Data.proposedTaps + - inJsonPath: $.pipeSize + outJsonPath: $.Data.pipeSize + - inJsonPath: $.noOfTaps + outJsonPath: $.Data.noOfTaps + - inJsonPath: $.applicationType + outJsonPath: $.Data.applicationType + - inJsonPath: $.dateEffectiveFrom + outJsonPath: $.Data.dateEffectiveFrom + externalUriMapping: + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.applicationNo,history=true,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history From f3eb1d970c21a2bf40e3844faf337de2b99ae161 Mon Sep 17 00:00:00 2001 From: KarunaNidhan-egov <72540308+KarunaNidhan-egov@users.noreply.github.com> Date: Thu, 27 May 2021 16:51:56 +0530 Subject: [PATCH 0648/1242] added topic sw-services-legacyindex --- configs/egov-indexer/sewerage-service.yml | 73 ++++++++++++++++++++++- 1 file changed, 72 insertions(+), 1 deletion(-) diff --git a/configs/egov-indexer/sewerage-service.yml b/configs/egov-indexer/sewerage-service.yml index 5e973b87..bd9e479b 100644 --- a/configs/egov-indexer/sewerage-service.yml +++ b/configs/egov-indexer/sewerage-service.yml @@ -214,4 +214,75 @@ ServiceMaps: apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} uriResponseMapping: - inJsonPath: $.ProcessInstances - outJsonPath: $.Data.history + outJsonPath: $.Data.history + + - topic: sw-services-legacyindex + configKey: INDEX + indexes: + - name: sewerage-services + type: general + id: $.id,$.tenantId + timeStampField: $.auditDetails.lastModifiedTime + jsonPath: $.SewerageConnection + customJsonMapping: + indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","applicationStatus":"","status":"","connectionNo":"","oldConnectionNo":"","plumberInfo":[],"roadCuttingInfo":[],"connectionHolders":[],"roadType":"","roadCuttingArea":"","connectionExecutionDate":"","connectionCategory":"","connectionType":"","additionalDetails":{},"id":"","propertyId":"","tenantId":"","proposedWaterClosets":"","proposedToilets":"","noOfWaterClosets":"","noOfToilets":"","applicationType":"","dateEffectiveFrom":"","history":{}}} + fieldMapping: + - inJsonPath: $.applicationStatus.state + outJsonPath: $.Data.workflow.state + - inJsonPath: $.processInstance.action + outJsonPath: $.Data.workflow.action + - inJsonPath: $.processInstance.assignes.*.uuid + outJsonPath: $.Data.workflow.assignes + - inJsonPath: $.applicationNo + outJsonPath: $.Data.applicationNo + - inJsonPath: $.applicationStatus + outJsonPath: $.Data.applicationStatus + - inJsonPath: $.status + outJsonPath: $.Data.status + - inJsonPath: $.connectionNo + outJsonPath: $.Data.connectionNo + - inJsonPath: $.oldConnectionNo + outJsonPath: $.Data.oldConnectionNo + - inJsonPath: $.plumberInfo + outJsonPath: $.Data.plumberInfo + - inJsonPath: $.roadCuttingInfo + outJsonPath: $.Data.roadCuttingInfo + - inJsonPath: $.connectionHolders + outJsonPath: $.Data.connectionHolders + - inJsonPath: $.roadType + outJsonPath: $.Data.roadType + - inJsonPath: $.roadCuttingArea + outJsonPath: $.Data.roadCuttingArea + - inJsonPath: $.connectionExecutionDate + outJsonPath: $.Data.connectionExecutionDate + - inJsonPath: $.connectionCategory + outJsonPath: $.Data.connectionCategory + - inJsonPath: $.connectionType + outJsonPath: $.Data.connectionType + - inJsonPath: $.additionalDetails + outJsonPath: $.Data.additionalDetails + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.propertyId + outJsonPath: $.Data.propertyId + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.proposedWaterClosets + outJsonPath: $.Data.proposedWaterClosets + - inJsonPath: $.proposedToilets + outJsonPath: $.Data.proposedToilets + - inJsonPath: $.noOfWaterClosets + outJsonPath: $.Data.noOfWaterClosets + - inJsonPath: $.noOfToilets + outJsonPath: $.Data.noOfToilets + - inJsonPath: $.applicationType + outJsonPath: $.Data.applicationType + - inJsonPath: $.dateEffectiveFrom + outJsonPath: $.Data.dateEffectiveFrom + externalUriMapping: + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.applicationNo,history=true,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history From bfa833e7ff706a4b759f246a970d837586ea3959 Mon Sep 17 00:00:00 2001 From: ramakrishnaippili-eGov Date: Wed, 2 Jun 2021 16:14:30 +0530 Subject: [PATCH 0649/1242] Create covid-chatbot-telemetry.yaml covid chatbot indexer config. --- configs/egov-indexer/covid-chatbot-telemetry.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 configs/egov-indexer/covid-chatbot-telemetry.yaml diff --git a/configs/egov-indexer/covid-chatbot-telemetry.yaml b/configs/egov-indexer/covid-chatbot-telemetry.yaml new file mode 100644 index 00000000..3fd6fb43 --- /dev/null +++ b/configs/egov-indexer/covid-chatbot-telemetry.yaml @@ -0,0 +1,12 @@ +ServiceMaps: + serviceName: covid-chatbot-telemetry + version: 1.0.0 + mappings: + - topic: covid-chatbot-telemetry + configKey: INDEX + indexes: + - name: covid-chatbot-messages + type: general + id: $.id + timeStampField: $.date + fieldsToBeMasked: [ "$.data.user", "$.data.message.input", "$.data.message.output" ] From c58bac50ce7bda5eacb25da314bb73ea984d7191 Mon Sep 17 00:00:00 2001 From: egovmis Date: Thu, 3 Jun 2021 15:59:37 +0530 Subject: [PATCH 0650/1242] changes for payable amount year wise --- .../data-config/property-receipt.json | 62 +++++++++++++++++++ .../format-config/property-receipt.json | 61 +----------------- 2 files changed, 65 insertions(+), 58 deletions(-) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index 191ea5de..948c0fd2 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -531,6 +531,68 @@ "module":"rainmaker-common" } }, + { + "variable": "var_bills", + "value":{ + "path":"$.paymentDetails[0].additionalDetails.arrearArray.*" + }, + "type":"array", + "format":{ + "type":"string", + "scema":[ + { + "variable":"year", + "value": "year" + + },{ + "variable":"tax", + "value": "tax" + + },{ + "variable":"firecess", + "value": "firecess" + + },{ + "variable":"cancercess", + "value": "cancercess" + + },{ + "variable":"penalty", + "value": "penalty" + + },{ + "variable":"interest", + "value": "interest" + + },{ + "variable":"usage_exemption", + "value": "usage_exemption" + + },{ + "variable":"special_category_exemption", + "value": "special_category_exemption" + + },{ + "variable":"adhoc_penalty", + "value": "adhoc_penalty" + + },{ + "variable":"adhoc_rebate", + "value": "adhoc_rebate" + + },{ + "variable":"roundoff", + "value": "roundoff" + + },{ + "variable":"total", + "value": "total" + + } + ] + } + }, + { "variable": "Municipal_Corporation", "value": { diff --git a/configs/pdf-service/format-config/property-receipt.json b/configs/pdf-service/format-config/property-receipt.json index f2e30415..12dfe990 100644 --- a/configs/pdf-service/format-config/property-receipt.json +++ b/configs/pdf-service/format-config/property-receipt.json @@ -454,7 +454,7 @@ "table": { "widths": [ - "9%","8%","6%","7%","7%","7%","9%","9%","8%","8%","7%","7%","*" + "9%","8%","6%","7%","7%","7%","9%","9%","8%","8%","7%","*" ], "body": [ @@ -498,9 +498,6 @@ { "text": "Adhoc Rebate", "style": "amounts" - },{ - "text": "Arrears", - "style": "amounts" }, { "text": "Round Off", @@ -513,60 +510,8 @@ ], - [ - { - "text": "{{PropertyTax}}", - "style": "amountss" - }, - { - "text": "{{FireCess}}", - "style": "amountss" - }, - { - "text": "{{CancerCess}}", - "style": "amountss" - }, - { - "text": "{{Penalty}}", - "style": "amountss" - }, - { - "text": "{{Rebate}}", - "style": "amountss" - }, - { - "text": "{{Interest}}", - "style": "amountss" - }, - { - "text": "{{UsageExemption}}", - "style": "amountss" - }, - { - "text": "{{SpecialCategoryExemption}}", - "style": "amountss" - }, - { - "text": "{{adhocPenalty}}", - "style": "amountss" - }, - { - "text": "{{adhocRebate}}", - "style": "amountss" - },{ - "text": "{{Arrears}}", - "style": "amountss" - }, - { - "text": "{{RoundOff}}", - "style": "amountss" - }, - { - "text": "{{dueAmount}}", - "style": "amountss" - } - - ] + "{{#var_bills}}[{\"text\":\"{{year}}\",\"style\":\"receipt-table\"},{\"text\":\"{{tax}}\",\"style\":\"receipt-table\"},{\"text\":\"{{firecess}}\",\"style\":\"receipt-table\"},{\"text\":\"{{cancercess}}\",\"style\":\"receipt-table\"},{\"text\":\"{{penalty}}\",\"style\":\"receipt-table\"},{\"text\":\"{{interest}}\",\"style\":\"receipt-table\"},{\"text\":\"{{usage_exemption}}\",\"style\":\"receipt-table\"},{\"text\":\"{{special_category_exemption}}\",\"style\":\"receipt-table\"},{\"text\":\"{{adhoc_penalty}}\",\"style\":\"receipt-table\"},{\"text\":\"{{adhoc_rebate}}\",\"style\":\"receipt-table\"},{\"text\":\"{{roundoff}}\",\"style\":\"receipt-table\"},{\"text\":\"{{total}}\",\"style\":\"receipt-table\"}]{{/var_bills}}" + ] }, From 7caf3f69d3e271cdb8c1cde2a8f2c4ec0376bfa0 Mon Sep 17 00:00:00 2001 From: KarunaNidhan-egov <72540308+KarunaNidhan-egov@users.noreply.github.com> Date: Fri, 4 Jun 2021 13:32:49 +0530 Subject: [PATCH 0651/1242] added isBulk flag and changed the configkey of ws-services-legacyindex --- configs/egov-indexer/water-service.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configs/egov-indexer/water-service.yml b/configs/egov-indexer/water-service.yml index d517a72d..c9573871 100644 --- a/configs/egov-indexer/water-service.yml +++ b/configs/egov-indexer/water-service.yml @@ -241,10 +241,11 @@ ServiceMaps: outJsonPath: $.Data.history - topic: ws-services-legacyindex - configKey: INDEX + configKey: LEGACYINDEX indexes: - name: water-services type: general + isBulk: true id: $.id,$.tenantId jsonPath: $.WaterConnection timeStampField: $.auditDetails.createdTime From ecda0a164a60f0f4b2e8a04181e2385d4ab68b9f Mon Sep 17 00:00:00 2001 From: KarunaNidhan-egov <72540308+KarunaNidhan-egov@users.noreply.github.com> Date: Fri, 4 Jun 2021 13:55:27 +0530 Subject: [PATCH 0652/1242] added isbulk flag and updated config of sw-services-legacyindex --- configs/egov-indexer/sewerage-service.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configs/egov-indexer/sewerage-service.yml b/configs/egov-indexer/sewerage-service.yml index bd9e479b..cd02f810 100644 --- a/configs/egov-indexer/sewerage-service.yml +++ b/configs/egov-indexer/sewerage-service.yml @@ -217,10 +217,11 @@ ServiceMaps: outJsonPath: $.Data.history - topic: sw-services-legacyindex - configKey: INDEX + configKey: LEGACYINDEX indexes: - name: sewerage-services type: general + isBulk: true id: $.id,$.tenantId timeStampField: $.auditDetails.lastModifiedTime jsonPath: $.SewerageConnection From f6d8cebb55877d0f50025182299ddc929e87648c Mon Sep 17 00:00:00 2001 From: KarunaNidhan-egov <72540308+KarunaNidhan-egov@users.noreply.github.com> Date: Fri, 4 Jun 2021 16:03:34 +0530 Subject: [PATCH 0653/1242] updated timestamp field --- configs/egov-indexer/sewerage-service.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-indexer/sewerage-service.yml b/configs/egov-indexer/sewerage-service.yml index cd02f810..fdcd7a88 100644 --- a/configs/egov-indexer/sewerage-service.yml +++ b/configs/egov-indexer/sewerage-service.yml @@ -223,7 +223,7 @@ ServiceMaps: type: general isBulk: true id: $.id,$.tenantId - timeStampField: $.auditDetails.lastModifiedTime + timeStampField: $.auditDetails.createdTime jsonPath: $.SewerageConnection customJsonMapping: indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","applicationStatus":"","status":"","connectionNo":"","oldConnectionNo":"","plumberInfo":[],"roadCuttingInfo":[],"connectionHolders":[],"roadType":"","roadCuttingArea":"","connectionExecutionDate":"","connectionCategory":"","connectionType":"","additionalDetails":{},"id":"","propertyId":"","tenantId":"","proposedWaterClosets":"","proposedToilets":"","noOfWaterClosets":"","noOfToilets":"","applicationType":"","dateEffectiveFrom":"","history":{}}} From 607457d4fb4dab239badec262d73bee590e0dbf1 Mon Sep 17 00:00:00 2001 From: KarunaNidhan-egov <72540308+KarunaNidhan-egov@users.noreply.github.com> Date: Tue, 8 Jun 2021 16:41:19 +0530 Subject: [PATCH 0654/1242] changed connection to connections --- configs/egov-indexer/sewerage-service.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/egov-indexer/sewerage-service.yml b/configs/egov-indexer/sewerage-service.yml index fdcd7a88..48995ef4 100644 --- a/configs/egov-indexer/sewerage-service.yml +++ b/configs/egov-indexer/sewerage-service.yml @@ -9,7 +9,7 @@ ServiceMaps: type: general id: $.id,$.tenantId timeStampField: $.auditDetails.createdTime - jsonPath: $.SewerageConnection + jsonPath: $.SewerageConnections customJsonMapping: indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","applicationStatus":"","status":"","connectionNo":"","oldConnectionNo":"","plumberInfo":[],"roadCuttingInfo":[],"connectionHolders":[],"roadType":"","roadCuttingArea":"","connectionExecutionDate":"","connectionCategory":"","connectionType":"","additionalDetails":{},"id":"","propertyId":"","tenantId":"","proposedWaterClosets":"","proposedToilets":"","noOfWaterClosets":"","noOfToilets":"","applicationType":"","dateEffectiveFrom":"","history":{}}} fieldMapping: @@ -80,7 +80,7 @@ ServiceMaps: type: general id: $.id,$.tenantId timeStampField: $.auditDetails.lastModifiedTime - jsonPath: $.SewerageConnection + jsonPath: $.SewerageConnections customJsonMapping: indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","applicationStatus":"","status":"","connectionNo":"","oldConnectionNo":"","plumberInfo":[],"roadCuttingInfo":[],"connectionHolders":[],"roadType":"","roadCuttingArea":"","connectionExecutionDate":"","connectionCategory":"","connectionType":"","additionalDetails":{},"id":"","propertyId":"","tenantId":"","proposedWaterClosets":"","proposedToilets":"","noOfWaterClosets":"","noOfToilets":"","applicationType":"","dateEffectiveFrom":"","history":{}}} fieldMapping: @@ -152,7 +152,7 @@ ServiceMaps: type: general id: $.id,$.tenantId timeStampField: $.auditDetails.lastModifiedTime - jsonPath: $.SewerageConnection + jsonPath: $.SewerageConnections customJsonMapping: indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","applicationStatus":"","status":"","connectionNo":"","oldConnectionNo":"","plumberInfo":[],"roadCuttingInfo":[],"connectionHolders":[],"roadType":"","roadCuttingArea":"","connectionExecutionDate":"","connectionCategory":"","connectionType":"","additionalDetails":{},"id":"","propertyId":"","tenantId":"","proposedWaterClosets":"","proposedToilets":"","noOfWaterClosets":"","noOfToilets":"","applicationType":"","dateEffectiveFrom":"","history":{}}} fieldMapping: @@ -224,7 +224,7 @@ ServiceMaps: isBulk: true id: $.id,$.tenantId timeStampField: $.auditDetails.createdTime - jsonPath: $.SewerageConnection + jsonPath: $.SewerageConnections customJsonMapping: indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","applicationStatus":"","status":"","connectionNo":"","oldConnectionNo":"","plumberInfo":[],"roadCuttingInfo":[],"connectionHolders":[],"roadType":"","roadCuttingArea":"","connectionExecutionDate":"","connectionCategory":"","connectionType":"","additionalDetails":{},"id":"","propertyId":"","tenantId":"","proposedWaterClosets":"","proposedToilets":"","noOfWaterClosets":"","noOfToilets":"","applicationType":"","dateEffectiveFrom":"","history":{}}} fieldMapping: From ee2baf598598d0c3791ae6d4788e52b40ffe8b76 Mon Sep 17 00:00:00 2001 From: KarunaNidhan-egov <72540308+KarunaNidhan-egov@users.noreply.github.com> Date: Wed, 9 Jun 2021 15:28:20 +0530 Subject: [PATCH 0655/1242] Updated jsonPath for save and update topic --- configs/egov-indexer/sewerage-service.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/egov-indexer/sewerage-service.yml b/configs/egov-indexer/sewerage-service.yml index 48995ef4..9efa4243 100644 --- a/configs/egov-indexer/sewerage-service.yml +++ b/configs/egov-indexer/sewerage-service.yml @@ -9,7 +9,7 @@ ServiceMaps: type: general id: $.id,$.tenantId timeStampField: $.auditDetails.createdTime - jsonPath: $.SewerageConnections + jsonPath: $.SewerageConnection customJsonMapping: indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","applicationStatus":"","status":"","connectionNo":"","oldConnectionNo":"","plumberInfo":[],"roadCuttingInfo":[],"connectionHolders":[],"roadType":"","roadCuttingArea":"","connectionExecutionDate":"","connectionCategory":"","connectionType":"","additionalDetails":{},"id":"","propertyId":"","tenantId":"","proposedWaterClosets":"","proposedToilets":"","noOfWaterClosets":"","noOfToilets":"","applicationType":"","dateEffectiveFrom":"","history":{}}} fieldMapping: @@ -80,7 +80,7 @@ ServiceMaps: type: general id: $.id,$.tenantId timeStampField: $.auditDetails.lastModifiedTime - jsonPath: $.SewerageConnections + jsonPath: $.SewerageConnection customJsonMapping: indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","applicationStatus":"","status":"","connectionNo":"","oldConnectionNo":"","plumberInfo":[],"roadCuttingInfo":[],"connectionHolders":[],"roadType":"","roadCuttingArea":"","connectionExecutionDate":"","connectionCategory":"","connectionType":"","additionalDetails":{},"id":"","propertyId":"","tenantId":"","proposedWaterClosets":"","proposedToilets":"","noOfWaterClosets":"","noOfToilets":"","applicationType":"","dateEffectiveFrom":"","history":{}}} fieldMapping: @@ -152,7 +152,7 @@ ServiceMaps: type: general id: $.id,$.tenantId timeStampField: $.auditDetails.lastModifiedTime - jsonPath: $.SewerageConnections + jsonPath: $.SewerageConnection customJsonMapping: indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","applicationStatus":"","status":"","connectionNo":"","oldConnectionNo":"","plumberInfo":[],"roadCuttingInfo":[],"connectionHolders":[],"roadType":"","roadCuttingArea":"","connectionExecutionDate":"","connectionCategory":"","connectionType":"","additionalDetails":{},"id":"","propertyId":"","tenantId":"","proposedWaterClosets":"","proposedToilets":"","noOfWaterClosets":"","noOfToilets":"","applicationType":"","dateEffectiveFrom":"","history":{}}} fieldMapping: From b467b6a340dbe3cf617a8f4751fc7a2d62b0edb5 Mon Sep 17 00:00:00 2001 From: ramakrishnaippili Date: Wed, 9 Jun 2021 17:45:45 +0530 Subject: [PATCH 0656/1242] [PI-1622] Adding new report to pull --- configs/reports/configs/pt-reports.yml | 30 ++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index b4458ea1..89f04dd2 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -5516,3 +5516,33 @@ ReportDefinitions: ) select * from props where propertytaxuniqueid not in (select propertyid from prop2019 where oldpropertyid in (select concat('RID',previous_returnid) from amritsar_ikon_2020_21_non_migrated_records)) + +- reportName: ULBPTData + decryptionPathId: ReceiptRegister_V2 + summary: ULB-wise PT Data + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: propertyid + label: reports.pt.propertyId + type: string + source: pt + total: false + - name: propertyowner + label: reports.pt.ownername + type: string + source: pt + total: false + - name: guardianname + label: reports.pt.guardianname + type: string + source: pt + total: false + - name: useruuid + label: reports.pt.useruuid + type: string + source: pt + total: false + query: | + select pt.propertyid as propertyid, u.name as propertyowner, u.guardian as guardianname, u.mobilenumber as mobilenumber, u.uuid as useruuid from eg_pt_property pt, eg_pt_owner po, eg_user u where pt.id=po.propertyid and po.userid=u.uuid and pt.tenantid=$tenantid order by pt.propertyid + orderby: ORDER BY totalamountpaid DESC NULLS LAST From bc76c264d6abfb0347104d970939f2d542525ce7 Mon Sep 17 00:00:00 2001 From: rakesh-wt-egov <73687298+rakesh-wt-egov@users.noreply.github.com> Date: Thu, 10 Jun 2021 17:08:30 +0530 Subject: [PATCH 0657/1242] Update pt-reports.yml [PI-1622] Adding new report to pull --- configs/reports/configs/pt-reports.yml | 34 ++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 89f04dd2..12d657c4 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -5543,6 +5543,40 @@ ReportDefinitions: type: string source: pt total: false + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: true + searchClause: AND payd.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: true + searchClause: AND payd.receiptdate <= $toDate + - name: financialyear + label: Financial Year + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name + source: pt + wrapper: true + isMandatory: false + searchClause: AND concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) = $financialyear + - name: paymentMode + label: Payment Mode + type: singlevaluelist + pattern: 'list://CARD:Card,CASH:Cash,CHEQUE:Cheque,DD:DD,OFFLINE_NEFT:NEFT,OFFLINE_RTGS:RTGS,ONLINE:Online,POSTAL_ORDER:PostalOrder' + source: pt + isMandatory: false + searchClause: AND payment.paymentmode = $paymentMode + - name: localityArray + label: reports.pt.zoneList + type: boundarylist + source: pt + isMandatory: false + searchClause: AND pta.locality IN ($localityArray) query: | select pt.propertyid as propertyid, u.name as propertyowner, u.guardian as guardianname, u.mobilenumber as mobilenumber, u.uuid as useruuid from eg_pt_property pt, eg_pt_owner po, eg_user u where pt.id=po.propertyid and po.userid=u.uuid and pt.tenantid=$tenantid order by pt.propertyid orderby: ORDER BY totalamountpaid DESC NULLS LAST From 9e8277cefd498cb78a15bbc7bb6668738b6f8cc5 Mon Sep 17 00:00:00 2001 From: ramakrishnaippili Date: Thu, 10 Jun 2021 19:47:59 +0530 Subject: [PATCH 0658/1242] [PI-1622] Adding search params --- configs/reports/configs/pt-reports.yml | 29 ++++---------------------- 1 file changed, 4 insertions(+), 25 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 12d657c4..925ee774 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -5549,34 +5549,13 @@ ReportDefinitions: type: epoch source: pt isMandatory: true - searchClause: AND payd.receiptdate >= $fromDate + searchClause: AND pt.createdtime >= $fromDate - name: toDate label: reports.pt.toDate type: epoch source: pt isMandatory: true - searchClause: AND payd.receiptdate <= $toDate - - name: financialyear - label: Financial Year - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name - source: pt - wrapper: true - isMandatory: false - searchClause: AND concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) = $financialyear - - name: paymentMode - label: Payment Mode - type: singlevaluelist - pattern: 'list://CARD:Card,CASH:Cash,CHEQUE:Cheque,DD:DD,OFFLINE_NEFT:NEFT,OFFLINE_RTGS:RTGS,ONLINE:Online,POSTAL_ORDER:PostalOrder' - source: pt - isMandatory: false - searchClause: AND payment.paymentmode = $paymentMode - - name: localityArray - label: reports.pt.zoneList - type: boundarylist - source: pt - isMandatory: false - searchClause: AND pta.locality IN ($localityArray) + searchClause: AND pt.createdtime <= $toDate query: | - select pt.propertyid as propertyid, u.name as propertyowner, u.guardian as guardianname, u.mobilenumber as mobilenumber, u.uuid as useruuid from eg_pt_property pt, eg_pt_owner po, eg_user u where pt.id=po.propertyid and po.userid=u.uuid and pt.tenantid=$tenantid order by pt.propertyid - orderby: ORDER BY totalamountpaid DESC NULLS LAST + select pt.propertyid as propertyid, u.name as propertyowner, u.guardian as guardianname, u.mobilenumber as mobilenumber, u.uuid as useruuid from eg_pt_property pt, eg_pt_owner po, eg_user u where pt.id=po.propertyid and po.userid=u.uuid and pt.tenantid=$tenantid + orderby: ORDER BY pt.propertyid DESC NULLS LAST From c8ed63689d3a35016ab4a087c3c83c085e8ad90b Mon Sep 17 00:00:00 2001 From: ramakrishnaippili Date: Thu, 10 Jun 2021 20:25:31 +0530 Subject: [PATCH 0659/1242] [PI-1622] Adding search params --- configs/reports/configs/pt-reports.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 925ee774..5d059fae 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -5518,7 +5518,7 @@ ReportDefinitions: where propertytaxuniqueid not in (select propertyid from prop2019 where oldpropertyid in (select concat('RID',previous_returnid) from amritsar_ikon_2020_21_non_migrated_records)) - reportName: ULBPTData - decryptionPathId: ReceiptRegister_V2 + decryptionPathId: ULBPTDataDumpReport_V2 summary: ULB-wise PT Data version: 1.0.0 moduleName: rainmaker-pt @@ -5528,7 +5528,7 @@ ReportDefinitions: type: string source: pt total: false - - name: propertyowner + - name: ownername label: reports.pt.ownername type: string source: pt @@ -5538,6 +5538,11 @@ ReportDefinitions: type: string source: pt total: false + - name: mobileno + label: reports.pt.mobileno + type: string + source: pt + total: false - name: useruuid label: reports.pt.useruuid type: string @@ -5557,5 +5562,5 @@ ReportDefinitions: isMandatory: true searchClause: AND pt.createdtime <= $toDate query: | - select pt.propertyid as propertyid, u.name as propertyowner, u.guardian as guardianname, u.mobilenumber as mobilenumber, u.uuid as useruuid from eg_pt_property pt, eg_pt_owner po, eg_user u where pt.id=po.propertyid and po.userid=u.uuid and pt.tenantid=$tenantid + select pt.propertyid as propertyid, u.name as ownername, u.guardian as guardianname, u.mobilenumber as mobileno, u.uuid as useruuid from eg_pt_property pt, eg_pt_owner po, eg_user u where pt.id=po.propertyid and po.userid=u.uuid and pt.tenantid=$tenantid orderby: ORDER BY pt.propertyid DESC NULLS LAST From 293e19785dc47a4bc10509f8c9d8327982baddc4 Mon Sep 17 00:00:00 2001 From: Rafeek Date: Thu, 10 Jun 2021 21:56:39 +0530 Subject: [PATCH 0660/1242] PI-1624:Added additional details in unit. --- .../egov-persister/property-services-registry.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/configs/egov-persister/property-services-registry.yml b/configs/egov-persister/property-services-registry.yml index 4c48bb0f..4e1acc0f 100644 --- a/configs/egov-persister/property-services-registry.yml +++ b/configs/egov-persister/property-services-registry.yml @@ -238,7 +238,7 @@ serviceMaps: dbType: JSONB - - query: INSERT INTO eg_pt_unit(id, tenantid, propertyid, floorno, unittype, usagecategory, occupancytype, occupancydate, carpetarea, builtuparea, plintharea, superbuiltuparea, arv, constructiontype, constructiondate, dimensions, active, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + - query: INSERT INTO eg_pt_unit(id, tenantid, propertyid, floorno, unittype, usagecategory, occupancytype, occupancydate, carpetarea, builtuparea, plintharea, superbuiltuparea, arv, constructiontype, constructiondate, dimensions, active,additionaldetails, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); basePath: Property.units.* jsonMaps: @@ -286,6 +286,10 @@ serviceMaps: - jsonPath: $.Property.auditDetails.lastModifiedTime + - jsonPath: $.Property.units.*.additionalDetails + type: JSON + dbType: JSONB + - version: 1.0 description: Update property EG_PT_PROPERTY ltable fromTopic: update-property-registry @@ -497,7 +501,7 @@ serviceMaps: - jsonPath: $.Property.auditDetails.lastModifiedTime - - query: INSERT INTO eg_pt_unit(id, tenantid, propertyid, floorno, unittype, usagecategory, occupancytype, occupancydate, carpetarea, builtuparea, plintharea, superbuiltuparea, arv, constructiontype, constructiondate, dimensions, active, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET floorno=EXCLUDED.floorno, unittype=EXCLUDED.unittype, usagecategory=EXCLUDED.usagecategory, occupancytype=EXCLUDED.occupancytype, occupancydate=EXCLUDED.occupancydate, carpetarea=EXCLUDED.carpetarea, builtuparea=EXCLUDED.builtuparea, plintharea=EXCLUDED.plintharea, superbuiltuparea=EXCLUDED.superbuiltuparea, arv=EXCLUDED.arv, constructiontype=EXCLUDED.constructiontype, constructiondate=EXCLUDED.constructiondate, dimensions=excluded.dimensions, active=EXCLUDED.active, lastmodifiedby=EXCLUDED.lastmodifiedby, lastmodifiedtime=EXCLUDED.lastmodifiedtime; + - query: INSERT INTO eg_pt_unit(id, tenantid, propertyid, floorno, unittype, usagecategory, occupancytype, occupancydate, carpetarea, builtuparea, plintharea, superbuiltuparea, arv, constructiontype, constructiondate, dimensions, active,additionaldetails, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET floorno=EXCLUDED.floorno, unittype=EXCLUDED.unittype, usagecategory=EXCLUDED.usagecategory, occupancytype=EXCLUDED.occupancytype, occupancydate=EXCLUDED.occupancydate, carpetarea=EXCLUDED.carpetarea, builtuparea=EXCLUDED.builtuparea, plintharea=EXCLUDED.plintharea, superbuiltuparea=EXCLUDED.superbuiltuparea, arv=EXCLUDED.arv, constructiontype=EXCLUDED.constructiontype, constructiondate=EXCLUDED.constructiondate, dimensions=excluded.dimensions, active=EXCLUDED.active, lastmodifiedby=EXCLUDED.lastmodifiedby, lastmodifiedtime=EXCLUDED.lastmodifiedtime; basePath: Property.units.* jsonMaps: @@ -545,6 +549,10 @@ serviceMaps: - jsonPath: $.Property.auditDetails.lastModifiedTime + - jsonPath: $.Property.units.*.additionalDetails + type: JSON + dbType: JSONB + - version: 1.0 description: Update documents in EG_PT_PROPERTY ltable fromTopic: update-property-doc-registry From 08c8e5d39c3eb76a7ec57d508bc5d4b702a7c298 Mon Sep 17 00:00:00 2001 From: mohammadrafeek-eGov Date: Fri, 11 Jun 2021 10:31:25 +0530 Subject: [PATCH 0661/1242] PI-1624:Corrected additional details jsonpath position --- .../property-services-registry.yml | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/configs/egov-persister/property-services-registry.yml b/configs/egov-persister/property-services-registry.yml index 4e1acc0f..44a9ba60 100644 --- a/configs/egov-persister/property-services-registry.yml +++ b/configs/egov-persister/property-services-registry.yml @@ -277,6 +277,10 @@ serviceMaps: dbType: JSONB - jsonPath: $.Property.units.*.active + + - jsonPath: $.Property.units.*.additionalDetails + type: JSON + dbType: JSONB - jsonPath: $.Property.auditDetails.createdBy @@ -286,9 +290,7 @@ serviceMaps: - jsonPath: $.Property.auditDetails.lastModifiedTime - - jsonPath: $.Property.units.*.additionalDetails - type: JSON - dbType: JSONB + - version: 1.0 description: Update property EG_PT_PROPERTY ltable @@ -540,6 +542,10 @@ serviceMaps: dbType: JSONB - jsonPath: $.Property.units.*.active + + - jsonPath: $.Property.units.*.additionalDetails + type: JSON + dbType: JSONB - jsonPath: $.Property.auditDetails.createdBy @@ -549,9 +555,7 @@ serviceMaps: - jsonPath: $.Property.auditDetails.lastModifiedTime - - jsonPath: $.Property.units.*.additionalDetails - type: JSON - dbType: JSONB + - version: 1.0 description: Update documents in EG_PT_PROPERTY ltable @@ -584,4 +588,4 @@ serviceMaps: - jsonPath: $.Property.auditDetails.createdTime - - jsonPath: $.Property.auditDetails.lastModifiedTime \ No newline at end of file + - jsonPath: $.Property.auditDetails.lastModifiedTime From 6c0b2f789ad4681f3515286978fd4bca6fd3ac5c Mon Sep 17 00:00:00 2001 From: mohammadrafeek-eGov Date: Fri, 11 Jun 2021 11:39:09 +0530 Subject: [PATCH 0662/1242] PI-1623:Corrected the indentation --- configs/egov-persister/property-services-registry.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/egov-persister/property-services-registry.yml b/configs/egov-persister/property-services-registry.yml index 44a9ba60..9057d7c9 100644 --- a/configs/egov-persister/property-services-registry.yml +++ b/configs/egov-persister/property-services-registry.yml @@ -278,7 +278,7 @@ serviceMaps: - jsonPath: $.Property.units.*.active - - jsonPath: $.Property.units.*.additionalDetails + - jsonPath: $.Property.units.*.additionalDetails type: JSON dbType: JSONB @@ -543,7 +543,7 @@ serviceMaps: - jsonPath: $.Property.units.*.active - - jsonPath: $.Property.units.*.additionalDetails + - jsonPath: $.Property.units.*.additionalDetails type: JSON dbType: JSONB From 9cc1dedc5deb9640b3293032dd89f7c7981a49af Mon Sep 17 00:00:00 2001 From: Rafeek Date: Tue, 15 Jun 2021 11:36:52 +0530 Subject: [PATCH 0663/1242] eChallan persister config --- configs/egov-persister/echallan.yml | 122 ++++++++++++++++++++++++++++ 1 file changed, 122 insertions(+) create mode 100644 configs/egov-persister/echallan.yml diff --git a/configs/egov-persister/echallan.yml b/configs/egov-persister/echallan.yml new file mode 100644 index 00000000..5c0483f9 --- /dev/null +++ b/configs/egov-persister/echallan.yml @@ -0,0 +1,122 @@ +serviceMaps: + serviceName: echallan-services + mappings: + - version: 1.0.0 + description: Persists challan details in eg_echallan table + fromTopic: save-challan + isTransaction: true + queryMaps: + + - query: INSERT INTO eg_echallan( id, accountid, tenantid, challanNo, businessService, referenceId, applicationStatus,taxPeriodFrom,taxPeriodTo, additionalDetail, createdby, lastmodifiedby, createdtime, lastmodifiedtime,description,filestoreid) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?,?); + basePath: Challan + jsonMaps: + - jsonPath: $.Challan.id + + - jsonPath: $.Challan.citizen.uuid + + - jsonPath: $.Challan.tenantId + + - jsonPath: $.Challan.challanNo + + - jsonPath: $.Challan.businessService + + - jsonPath: $.Challan.referenceId + + - jsonPath: $.Challan.applicationStatus + + - jsonPath: $.Challan.taxPeriodFrom + + - jsonPath: $.Challan.taxPeriodTo + + - jsonPath: $.Challan.additionalDetail + type: JSON + dbType: JSONB + + - jsonPath: $.Challan.auditDetails.createdBy + + - jsonPath: $.Challan.auditDetails.lastModifiedBy + + - jsonPath: $.Challan.auditDetails.createdTime + + - jsonPath: $.Challan.auditDetails.lastModifiedTime + + - jsonPath: $.Challan.description + + - jsonPath: $.Challan.filestoreid + + - query: INSERT INTO eg_challan_address( id, tenantid, doorno,plotNo,street,buildingName, latitude,longitude,locality, district, landmark,city,pincode, region, state,country, detail, echallanId, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: Challan.address + jsonMaps: + - jsonPath: $.Challan.address.id + + - jsonPath: $.Challan.address.tenantId + + - jsonPath: $.Challan.address.doorNo + + - jsonPath: $.Challan.address.plotNo + + - jsonPath: $.Challan.address.street + + - jsonPath: $.Challan.address.buildingName + + - jsonPath: $.Challan.address.latitude + + - jsonPath: $.Challan.address.longitude + + - jsonPath: $.Challan.address.locality.code + + - jsonPath: $.Challan.address.district + + - jsonPath: $.Challan.address.landmark + + - jsonPath: $.Challan.address.city + + - jsonPath: $.Challan.address.pincode + + - jsonPath: $.Challan.address.region + + - jsonPath: $.Challan.address.state + + - jsonPath: $.Challan.address.country + + - jsonPath: $.Challan.address.detail + + - jsonPath: $.Challan.id + + - jsonPath: $.Challan.auditDetails.createdBy + + - jsonPath: $.Challan.auditDetails.lastModifiedBy + + - jsonPath: $.Challan.auditDetails.createdTime + + - jsonPath: $.Challan.auditDetails.lastModifiedTime + + - version: 1.0.0 + description: Update Challan details in eg_echallan table + fromTopic: update-challan + isTransaction: true + queryMaps: + + - query: UPDATE eg_echallan SET applicationStatus = ?, taxPeriodFrom = ?,taxPeriodTo = ?, lastmodifiedby = ?, lastmodifiedtime = ?,description = ?, additionalDetail = ?, filestoreid = ? WHERE id=?; + basePath: Challan + jsonMaps: + + - jsonPath: $.Challan.applicationStatus + + - jsonPath: $.Challan.taxPeriodFrom + + - jsonPath: $.Challan.taxPeriodTo + + - jsonPath: $.Challan.auditDetails.lastModifiedBy + + - jsonPath: $.Challan.auditDetails.lastModifiedTime + + - jsonPath: $.Challan.description + + - jsonPath: $.Challan.additionalDetail + type: JSON + dbType: JSONB + + - jsonPath: $.Challan.filestoreid + + - jsonPath: $.Challan.id \ No newline at end of file From 805404683f62ef701e8a57718e5481f4a40b805a Mon Sep 17 00:00:00 2001 From: Rafeek Date: Wed, 16 Jun 2021 12:00:30 +0530 Subject: [PATCH 0664/1242] PI-1628:echallan custom config --- configs/egov-searcher/bill-genie.yml | 80 ++ .../data-config/mcollect-bill.json | 674 ++++++++++++++ .../data-config/mcollect-challan.json | 707 +++++++++++++++ .../format-config/mcollect-bill.json | 775 ++++++++++++++++ .../format-config/mcollect-challan.json | 849 ++++++++++++++++++ 5 files changed, 3085 insertions(+) create mode 100644 configs/pdf-service/data-config/mcollect-bill.json create mode 100644 configs/pdf-service/data-config/mcollect-challan.json create mode 100644 configs/pdf-service/format-config/mcollect-bill.json create mode 100644 configs/pdf-service/format-config/mcollect-challan.json diff --git a/configs/egov-searcher/bill-genie.yml b/configs/egov-searcher/bill-genie.yml index 8ffc6c36..a9262fc0 100644 --- a/configs/egov-searcher/bill-genie.yml +++ b/configs/egov-searcher/bill-genie.yml @@ -256,3 +256,83 @@ SearchDefinitions: jsonFormat: {"ResponseInfo": {},"Bills": []} outJsonPath: $.Bills responseInfoPath: $.ResponseInfo + + - name: mcollectbills + isCustomerRowMapEnabled: true + rowMapperKey: billsearch + query: + baseQuery: with bill_data as ( + SELECT b.id AS b_id, b.mobilenumber, + b.tenantid AS b_tenantid, b.payername AS b_payername, + b.payeraddress AS b_payeraddress, b.payeremail AS b_payeremail, + b.isactive AS b_isactive, b.iscancelled AS b_iscancelled, + b.createdby AS b_createdby, b.status as b_status, b.filestoreid AS b_filestoreid, + b.createddate AS b_createddate, b.lastmodifiedby AS b_lastmodifiedby, + b.lastmodifieddate AS b_lastmodifieddate, bd.id AS bd_id, + bd.billid AS bd_billid, bd.tenantid AS bd_tenantid, + bd.businessservice AS bd_businessservice, bd.demandid, + bd.fromperiod, bd.toperiod, + bd.billno AS bd_billno, bd.billdate AS bd_billdate, + bd.consumercode AS bd_consumercode, bd.consumertype AS bd_consumertype, + bd.billdescription AS bd_billdescription, bd.displaymessage AS bd_displaymessage, + bd.minimumamount AS bd_minimumamount, bd.totalamount AS bd_totalamount, + bd.callbackforapportioning AS bd_callbackforapportioning, bd.expirydate AS bd_expirydate, + bd.partpaymentallowed AS bd_partpaymentallowed, bd.isadvanceallowed as bd_isadvanceallowed, + bd.collectionmodesnotallowed AS bd_collectionmodesnotallowed, bd.createddate as bd_createddate, + b.additionaldetails as b_additionaldetails, bd.additionaldetails as bd_additionaldetails, + ad.id AS ad_id, ad.tenantid AS ad_tenantid, + ad.billdetail AS ad_billdetail, ad.glcode AS ad_glcode, + ad.orderno AS ad_orderno, ad.accountdescription AS ad_accountdescription, + ad.amount AS ad_amount, ad.adjustedamount AS ad_adjustedamount, + ad.taxheadcode AS ad_taxheadcode, ad.demanddetailid, + ad.isactualdemand AS ad_isactualdemand, ad.purpose AS ad_purpose, + ad.additionaldetails as ad_additionaldetails, + challanadd.doorNo as ptadd_doorNo, challanadd.landmark as ptadd_landmark, + challanadd.city as ptadd_city, challanadd.pincode as ptadd_pincode, + challanadd.locality as ptadd_locality, challan.accountid as ptown_userid , challan.createdtime + + FROM egbs_bill_v1 b INNER JOIN egbs_billdetail_v1 bd ON b.id = bd.billid AND b.tenantid = bd.tenantid and bd.totalamount > 0 + INNER JOIN egbs_billaccountdetail_v1 ad ON bd.id = ad.billdetail AND bd.tenantid = ad.tenantid + INNER JOIN eg_echallan challan ON bd.consumercode = challan.challanno AND b.status!='CANCELLED' + INNER JOIN eg_challan_address challanadd ON challanadd.eChallanId = challan.id $where ) + + select * from bill_data inner join (select max(b_createddate) as maxcreateddate, bd_consumercode from bill_data group by bd_consumercode) as max ON max.maxcreateddate=b_createddate + searchParams: + condition: AND + params: + - name: b.tenantid + isMandatory: true + jsonPath: $.searchCriteria.tenantId + - name: bd.consumercode + isMandatory: false + jsonPath: $.searchCriteria.consumerCode + operator: ILIKE + - name: bd.businessservice + isMandatory: false + jsonPath: $.searchCriteria.businesService + - name: b.mobilenumber + isMandatory: false + jsonPath: $.searchCriteria.mobileNumber + - name: bd.billno + isMandatory: false + operator: ILIKE + jsonPath: $.searchCriteria.billNo + - name: ptadd.locality + isMandatory: false + jsonPath: $.searchCriteria.locality + - name: fromperiod + isMandatory: false + jsonPath: $.searchCriteria.fromPeriod + operator: LE + - name: toperiod + isMandatory: false + jsonPath: $.searchCriteria.toPeriod + operator: GE + - name: b.status + isMandatory: false + jsonPath: $.searchCriteria.billActive + + output: + jsonFormat: {"ResponseInfo": {},"Bills": []} + outJsonPath: $.Bills + responseInfoPath: $.ResponseInfo \ No newline at end of file diff --git a/configs/pdf-service/data-config/mcollect-bill.json b/configs/pdf-service/data-config/mcollect-bill.json new file mode 100644 index 00000000..131925bd --- /dev/null +++ b/configs/pdf-service/data-config/mcollect-bill.json @@ -0,0 +1,674 @@ +{ + "key": "mcollect-bill", + "DataConfigs": { + "serviceName": "rainmaker-common", + "version": "1.0.0", + "baseKeyPath": "$.Bill.*", + "entityIdPath": "$.id", + "isCommonTableBorderRequired": true, + "mappings": [ + { + "topic": "common-pdf-generation-3", + "mappings": [ + { + "direct": [ + { + "variable": "payerName", + "value": { + "path": "$.payerName" + } + }, + { + "variable": "payerContact", + "value": { + "path": "$.mobileNumber" + } + }, + { + "variable": "billNo", + "value": { + "path": "$.billNumber" + } + }, + { + "variable": "challanNo", + "value": { + "path": "$.consumerCode" + } + }, + { + "variable": "challan_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_CHALLAN_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-pdf" + } + }, + { + "variable": "challan", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_CHALLAN" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-pdf" + } + }, + { + "variable": "serviceType", + "value": { + "path": "$.businessService" + }, + "type": "splitString", + "localisation": { + "required": true, + "prefix": "BILLINGSERVICE_BUSINESSSERVICE", + "module": "rainmaker-uc", + "isCategoryRequired": true + } + }, + { + "variable": "fromPeriod", + "value": { + "path": "$.billDetails[0].fromPeriod" + }, + "type": "date" + }, + { + "variable": "toPeriod", + "value": { + "path": "$.billDetails[0].toPeriod" + }, + "type": "date" + }, + { + "variable": "letter-code", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_LETTER_CODE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-pdf" + } + }, + { + "variable": "address_label", + "value": { + "path": "PT_COMMON_COL_ADDRESS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-pdf" + } + }, + { + "variable": "letter-header", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_LETTER_HEAD" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-pdf" + } + }, + { + "variable": "letter-section", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_LETTER_SECTION_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-pdf" + } + }, + { + "variable": "cantonment-board", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_MUNICIPAL_CORPORATION" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-pdf" + } + }, + { + "variable": "form-number", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_LETTER_FORM_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-pdf" + } + }, + { + "variable": "rule-number", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_LETTER_RULENO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-pdf" + } + }, + { + "variable": "bill", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-pdf" + } + }, + { + "variable": "letter-code", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_MUNICIPAL_CORPORATION" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-pdf" + } + }, + { + "variable": "paymentMode", + "value": { + "path": "$.paymentMode" + }, + "localisation": { + "required": true, + "prefix": "COMMON_MASTERS_PAYMENTMODE", + "module": "rainmaker-pdf" + } + }, + { + "variable": "billDate", + "value": { + "path": "$.billDate" + }, + "type": "date" + }, + { + "variable": "city", + "value": { + "path": "$..tradeLicenseDetail.address.city" + }, + "localisation": { + "required": true, + "prefix": "TENANT_TENANTS", + "module": "rainmaker-common" + } + }, + { + "variable": "doorHouseNo", + "value": { + "path": "$.address.doorNo" + }, + "type": "setEmpty" + }, + { + "variable": "buildingColonyName", + "value": { + "path": "$.address.buildingName" + }, + "type": "setEmpty" + }, + { + "variable": "streetName", + "value": { + "path": "$.address.street" + }, + "type": "setEmpty" + }, + { + "variable": "buildingName", + "value": { + "path": "$.address.buildingName" + }, + "type": "setEmpty" + }, + { + "variable": "pinCode", + "value": { + "path": "$.address.pincode" + }, + "type": "setEmpty" + }, + { + "variable": "mohalla", + "value": { + "path": "$.address.locality" + }, + "localisation": { + "required": true, + "prefix": "TENANTS_MOHALLA", + "module": "rainmaker-pdf" + } + }, + { + "variable": "serviceCategory", + "value": { + "path": "$.businessService" + }, + "localisation": { + "required": true, + "prefix": "BILLINGSERVICE_BUSINESSSERVICE", + "module": "rainmaker-uc" + } + }, + { + "variable": "mcollect_comment", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_MCOLLECT_COMMENT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-pdf" + } + }, + { + "variable": "disclamer", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-pdf" + } + }, + { + "variable": "disclamer_1", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_FIRST_LINE_UC" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-pdf" + } + }, + { + "variable": "bill_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_BILL_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-pdf" + } + }, + { + "variable": "GL_Code", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_GL_CODE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "bill_date", + "value": { + "path": "ABG_COMMON_TABLE_COL_BILL_DATE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "consumer_Name", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_CONSUMER_NAME" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-pdf" + } + }, + { + "variable": "payer_contact", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_LICENSE_CORPORATION_CONTACT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-pdf" + } + }, + { + "variable": "service_category", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_SERVICE_CATEGORY" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-pdf" + } + }, + { + "variable": "validity_from", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_PASS_LICENSE_VALIDITY_FROM" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-pdf" + } + }, + { + "variable": "validity_to", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_PASS_LICENSE_VALIDITY_TO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-pdf" + } + }, + { + "variable": "paid_amount", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAID_AMOUNT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-pdf" + } + }, + { + "variable": "payment_mode", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_MODE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-pdf" + } + }, + { + "variable": "transaction_id", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_TRANSACTION_ID" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-pdf" + } + }, + { + "variable": "payment_receipt", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_RECEIPT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-pdf" + } + }, + { + "variable": "g8_receipt_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_G8_RECEIPT_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-pdf" + } + }, + { + "variable": "bank_transaction_no", + "value": { + "path": "NOC_PAYMENT_BANK_TRANSACTION_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-pdf" + } + }, + { + "variable": "g8_receipt_date", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_G8_RECEIPT_DATE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-pdf" + } + }, + { + "variable": "payer_Name", + "value": { + "path": "NOC_PAYMENT_PAYER_NAME_LABEL" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-pdf" + } + }, + { + "variable": "no_signature", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_NO_SIGNATURE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-pdf" + } + }, + { + "variable": "disclamer", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-pdf" + } + }, + { + "variable": "to", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_TO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-pdf" + } + }, + { + "variable": "service_type", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_SERVICE_TYPE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-pdf" + } + }, + { + "variable": "total_amount", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_TOTAL_AMOUNT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-pdf" + } + }, + { + "variable": "challan_date", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_CHALLAN_DATE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-pdf" + } + }, + { + "variable": "Rs", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_RUPEE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-pdf" + } + }, + { + "variable": "variable10", + "value": { + "path": "$.billDetails[0].billAccountDetails.*" + }, + "type": "array", + "format": { + "type": "string", + "scema": [ + { + "variable": "trade_license_tax", + "value": "taxHeadCode", + "type": "string", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-uc" + } + }, + { + "variable": "tradeLicenseTax", + "value": "amount" + } + ] + } + }, + { + "variable": "totalAmount", + "value": { + "path": "$.totalAmount" + } + } + ] + }, + { + "externalAPI": [ + { + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pg&filter=%5B?(@.code=='{$.tenantId}')%5D", + "apiRequest": null, + "responseMapping": [ + { + "variable": "cb-name", + "value": "$.MdmsRes.tenant.tenants[0].code", + "localisation": { + "required": true, + "prefix": "TENANT_TENANTS", + "module": "rainmaker-common" + } + } + ] + }, + { + "path": "http://echallan-services:8080/echallan-services/eChallan/v1/_search", + "queryParam": "challanNo=$.consumerCode,tenantId=$.tenantId", + "apiRequest": null, + "responseMapping": [ + { + "variable": "challanDate", + "value": "$.challans[0].auditDetails.lastModifiedTime", + "type": "date" + } + ] + } + ] + }, + { + "qrcodeConfig": [ + { + "variable": "qrcodeimage", + "value": "Payer Name : {{payerName}},BillNo: {{billNumber}}, Challan number: {{challanNo}}, Bill Date: {{billDate}}, Total Amount: {{totalAmount}}, Billing Period: {{fromPeriod}} to {{toPeriod}}" + } + ] + } + ] + } + ] + } +} \ No newline at end of file diff --git a/configs/pdf-service/data-config/mcollect-challan.json b/configs/pdf-service/data-config/mcollect-challan.json new file mode 100644 index 00000000..643b5eb3 --- /dev/null +++ b/configs/pdf-service/data-config/mcollect-challan.json @@ -0,0 +1,707 @@ +{ + "key": "mcollect-challan", + "DataConfigs": { + "serviceName": "rainmaker-common", + "version": "1.0.0", + "baseKeyPath": "$.Challan", + "entityIdPath": "$.id", + "isCommonTableBorderRequired": true, + "mappings": [ + { + "topic": "common-pdf-generation-3", + "mappings": [ + { + "direct": [ + { + "variable": "consumerName", + "value": { + "path": "$.citizen.name" + } + }, + { + "variable": "payerContact", + "value": { + "path": "$.mobileNumber" + } + }, + { + "variable": "challanNo", + "value": { + "path": "$.challanNo" + } + }, + { + "variable": "serviceType", + "value": { + "path": "$.businessService" + }, + "localisation": { + "required": true, + "prefix": "BILLINGSERVICE_BUSINESSSERVICE", + "module": "rainmaker-uc" + } + }, + { + "variable": "serviceCategory", + "value": { + "path": "$.serviceType" + }, + "localisation": { + "required": true, + "prefix": "BILLINGSERVICE_BUSINESSSERVICE", + "module": "rainmaker-uc" + } + }, + { + "variable": "fromPeriod", + "value": { + "path": "$.taxPeriodFrom" + }, + "type": "date" + }, + { + "variable": "billNo", + "value": { + "path": "$.billNo" + } + }, + { + "variable": "billDate", + "value": { + "path": "$.billDate" + }, + "type": "date" + }, + { + "variable": "toPeriod", + "value": { + "path": "$.taxPeriodTo" + }, + "type": "date" + }, + { + "variable": "bill", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-pdf" + } + }, + { + "variable": "bill_date", + "value": { + "path": "ABG_COMMON_TABLE_COL_BILL_DATE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "bill_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_BILL_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-pdf" + } + }, + { + "variable": "letter-code", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_LETTER_CODE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-pdf" + } + }, + { + "variable": "service_category", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_SERVICE_CATEGORY" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-pdf" + } + }, + { + "variable": "address_label", + "value": { + "path": "PT_COMMON_COL_ADDRESS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-pdf" + } + }, + { + "variable": "remarks_label", + "value": { + "path": "PT_COMMON_COL_REMARK" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-pdf" + } + }, + { + "variable": "letter-header", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_LETTER_HEAD" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-pdf" + } + }, + { + "variable": "letter-section", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_LETTER_SECTION_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-pdf" + } + }, + { + "variable": "cantonment-board", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_MUNICIPAL_CORPORATION" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-pdf" + } + }, + { + "variable": "form-number", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_CHALLAN_FORM_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-pdf" + } + }, + { + "variable": "rule-number", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_CHALLAN_RULE_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-pdf" + } + }, + { + "variable": "challan", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_CHALLAN" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-pdf" + } + }, + { + "variable": "letter-code", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_MUNICIPAL_CORPORATION" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-pdf" + } + }, + { + "variable": "application_no", + "value": { + "path": "NOC_COMMON_TABLE_COL_APP_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-pdf" + } + }, + { + "variable": "paymentMode", + "value": { + "path": "$.paymentMode" + }, + "localisation": { + "required": true, + "prefix": "COMMON_MASTERS_PAYMENTMODE", + "module": "rainmaker-pdf" + } + }, + { + "variable": "challanDate", + "value": { + "path": "$.auditDetails.lastModifiedTime" + }, + "type": "date" + }, + { + "variable": "city", + "value": { + "path": "$..tradeLicenseDetail.address.city" + }, + "localisation": { + "required": true, + "prefix": "TENANT_TENANTS", + "module": "rainmaker-common" + } + }, + { + "variable": "doorHouseNo", + "value": { + "path": "$.address.doorNo" + }, + "type": "setEmpty" + }, + { + "variable": "buildingColonyName", + "value": { + "path": "$.address.buildingName" + }, + "type": "setEmpty" + }, + { + "variable": "streetName", + "value": { + "path": "$.address.street" + }, + "type": "setEmpty" + }, + { + "variable": "buildingName", + "value": { + "path": "$.address.buildingName" + }, + "type": "setEmpty" + }, + { + "variable": "pinCode", + "value": { + "path": "$.address.pincode" + }, + "type": "setEmpty" + }, + { + "variable": "challanStatus", + "value": { + "path": "$.applicationStatus" + }, + "type": "challanStatus" + }, + { + "variable": "challanRemarks", + "value": { + "path": "$.additionalDetail.cancellComment" + }, + "type": "statusMessage" + }, + { + "variable": "mohalla", + "value": { + "path": "$.address.locality.code" + }, + "localisation": { + "required": true, + "prefix": "TENANTS_MOHALLA", + "module": "rainmaker-common", + "prefixCbName": true + }, + "type": "boundary" + }, + { + "variable": "mcollect_comment", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_MCOLLECT_COMMENT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-pdf" + } + }, + { + "variable": "disclamer", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-pdf" + } + }, + { + "variable": "disclamer_1", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_FIRST_LINE_UC" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-pdf" + } + }, + { + "variable": "challan_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_CHALLAN_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-pdf" + } + }, + { + "variable": "GL_Code", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_GL_CODE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-pdf" + } + }, + { + "variable": "challan_date", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_CHALLAN_DATE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-pdf" + } + }, + { + "variable": "payer_name", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYER_NAME" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-pdf" + } + }, + { + "variable": "payer_contact", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_LICENSE_CORPORATION_CONTACT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-pdf" + } + }, + { + "variable": "service_type", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_SERVICE_TYPE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-pdf" + } + }, + { + "variable": "validity_from", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_PASS_LICENSE_VALIDITY_FROM" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-pdf" + } + }, + { + "variable": "validity_to", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_PASS_LICENSE_VALIDITY_TO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-pdf" + } + }, + { + "variable": "paid_amount", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAID_AMOUNT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-pdf" + } + }, + { + "variable": "payment_mode", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_MODE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-pdf" + } + }, + { + "variable": "transaction_id", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_TRANSACTION_ID" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-pdf" + } + }, + { + "variable": "payment_receipt", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_RECEIPT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-pdf" + } + }, + { + "variable": "g8_receipt_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_G8_RECEIPT_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-pdf" + } + }, + { + "variable": "bank_transaction_no", + "value": { + "path": "NOC_PAYMENT_BANK_TRANSACTION_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-pdf" + } + }, + { + "variable": "g8_receipt_date", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_G8_RECEIPT_DATE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-pdf" + } + }, + { + "variable": "consumer_Name", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_CONSUMER_NAME" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-pdf" + } + }, + { + "variable": "no_signature", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_NO_SIGNATURE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-pdf" + } + }, + { + "variable": "disclamer", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-pdf" + } + }, + { + "variable": "to", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_TO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-pdf" + } + }, + { + "variable": "total_amount", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_TOTAL_AMOUNT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-pdf" + } + }, + { + "variable": "Rs", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_RUPEE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-pdf" + } + }, + { + "variable": "variable10", + "value": { + "path": "$.amount.*" + }, + "type": "array", + "format": { + "type": "string", + "scema": [ + { + "variable": "trade_license_tax", + "value": "taxHeadCode", + "type": "string", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-uc" + } + }, + { + "variable": "tradeLicenseTax", + "value": "amount" + } + ] + } + }, + { + "variable": "totalAmount", + "value": { + "path": "$.totalAmount" + } + } + ] + }, + { + "externalAPI": [ + { + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pg&filter=%5B?(@.code=='{$.tenantId}')%5D", + "apiRequest": null, + "responseMapping": [ + { + "variable": "cb-name", + "value": "$.MdmsRes.tenant.tenants[0].code", + "localisation": { + "required": true, + "prefix": "TENANT_TENANTS", + "module": "rainmaker-common" + } + } + ] + } + ] + }, + { + "qrcodeConfig": [ + { + "variable": "qrcodeimage", + "value": "Payer Name : {{consumnerName}},Challan number: {{challanNo}}, Challan Date: {{billDate}}, Total Amount: {{totalAmount}}, Billing Period: {{fromPeriod}} to {{toPeriod}}" + } + ] + } + ] + } + ] + } +} \ No newline at end of file diff --git a/configs/pdf-service/format-config/mcollect-bill.json b/configs/pdf-service/format-config/mcollect-bill.json new file mode 100644 index 00000000..9a8af3ff --- /dev/null +++ b/configs/pdf-service/format-config/mcollect-bill.json @@ -0,0 +1,775 @@ +{ + "key": "mcollect-bill", + "config": { + "defaultStyle": { + "font": "Cambay" + }, + "watermark": { + "text": "DIGIT UAT DIGIT UAT", + "color": "gery", + "opacity": 0.1, + "bold": true, + "italics": false + }, + "content": [ + { + "style": "noc-head", + "table": { + "widths": [ + "33%", + "33%", + "33%" + ], + "body": [ + [ + { + "text": "{{letter-code}}", + "style": "receipt-logo-header" + }, + { + "text": "{{letter-header}}", + "alignment": "center", + "style": "receipt-logo-header" + }, + { + "text": "{{letter-section}}", + "alignment": "right", + "color": "#484848", + "style": "receipt-logo-header", + "margin": [ + 0, + 0, + -30, + 0 + ] + } + ] + ] + }, + "layout": "noBorders" + }, + { + "canvas": [ + { + "type": "line", + "x1": -25, + "y1": -5, + "x2": 540, + "y2": -5, + "lineWidth": 0.1 + }, + { + "type": "line", + "x1": -25, + "y1": -2.5, + "x2": 540, + "y2": -2.5, + "lineWidth": 0.1 + } + ] + }, + { + "style": "noc-table2", + "table": { + "widths": [ + "*" + ], + "body": [ + [ + { + "stack": [ + { + "text": "{{cb-name}} {{cantonment-board}}", + "alignment": "center", + "style": "receipt-logo-title-name" + }, + { + "text": "{{form-number}}", + "alignment": "center", + "style": "receipt-logo-title" + }, + { + "text": "{{rule-number}}", + "alignment": "center", + "style": "receipt-logo-title" + }, + { + "text": "{{challan}} / {{bill}}", + "alignment": "center", + "style": "receipt-logo-title" + } + ], + "border": [ + true, + true, + true, + false + ] + } + ], + [ + { + "stack": [ + { + "table": { + "widths": [ + "20%", + "30%", + "20%", + "30%" + ], + "body": [ + [ + { + "text": "{{challan_no}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{challanNo}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value-down" + }, + { + "text": "{{challan_date}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{challanDate}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value-down", + "font": "Roboto" + } + ] + ] + } + }, + { + "table": { + "widths": [ + "20%", + "30%", + "20%", + "30%" + ], + "body": [ + [ + { + "text": "{{bill_no}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{billNo}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value-down" + }, + { + "text": "{{bill_date}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{billDate}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value-down", + "font": "Roboto" + } + ] + ] + } + }, + { + "table": { + "widths": [ + "20%", + "30%", + "20%", + "30%" + ], + "body": [ + [ + { + "text": "{{service_category}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{serviceCategory}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value-down" + }, + { + "text": "{{service_type}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{serviceType}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value-down" + } + ] + ] + } + }, + { + "table": { + "widths": [ + "20%", + "30%", + "20%", + "30%" + ], + "body": [ + [ + { + "text": "{{validity_from}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{fromPeriod}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value-down", + "font": "Roboto" + }, + { + "text": "{{validity_to}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{toPeriod}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value-down", + "font": "Roboto" + } + ] + ] + } + }, + { + "table": { + "widths": [ + "20%", + "30%", + "20%", + "30%" + ], + "body": [ + [ + { + "text": "{{consumer_Name}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerName}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value-down" + }, + { + "text": "{{payer_contact}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerContact}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value-down", + "font": "Roboto" + } + ] + ] + } + }, + { + "table": { + "widths": [ + "19%", + "81%" + ], + "body": [ + [ + { + "text": "{{address_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{doorHouseNo}}, {{buildingName}}, {{streetName}}, {{mohalla}}, {{pinCode}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value-down" + } + ] + ] + } + } + ] + } + ] + ] + }, + "layout": {} + }, + { + "style": "noc-table3", + "table": { + "widths": [ + "*" + ], + "body": [ + [ + { + "text": "{{total_amount}}", + "border": [ + true, + true, + true, + false + ], + "style": "receipt-table-value-total", + "bold": false + } + ], + [ + { + "text": "{{Rs}} {{totalAmount}}", + "border": [ + true, + false, + true, + false + ], + "style": "receipt-table-value-total", + "fontSize": 20 + } + ] + ] + }, + "layout": {} + }, + { + "style": "noc-table4", + "table": { + "widths": [ + "60%", + "30%", + "10%" + ], + "body": [ + "{{#variable10}}[{\"text\": \"{{trade_license_tax}}\",\"border\": [true,false,false,false], \"style\": \"receipt-table-value-down\"},{\"text\": \"{{tradeLicenseTax}}\", \"border\": [false,false,false,false], \"style\": \"receipt-table-value-down\"},{ \"text\": \" \",\"border\": [false,false,true, false ]}]{{/variable10}}" + ] + }, + "layout": {} + }, + { + "canvas": [ + { + "type": "line", + "x1": -25, + "y1": 0, + "x2": 345, + "y2": 0, + "lineWidth": 1 + } + ] + }, + { + "style": "noc-table4", + "table": { + "widths": [ + "60%", + "30%", + "10%" + ], + "body": [ + [ + { + "text": "{{total_amount}}", + "border": [ + true, + false, + false, + true + ], + "bold": true, + "style": "receipt-table-value-down" + }, + { + "text": "{{totalAmount}}", + "border": [ + false, + false, + false, + true + ], + "bold": true, + "style": "receipt-table-value-down" + }, + { + "image": "{{qrcodeimage}}", + "style": "receipt-table-value-total-Qr", + "border": [ + false, + false, + true, + true + ], + "width": 72, + "height": 72 + } + ] + ] + }, + "layout": {} + }, + { + "table": { + "widths": [ + "*" + ], + "body": [ + [ + { + "style": "no-signature", + "text": "{{no_signature}}" + } + ] + ] + }, + "layout": "noBorders" + } + ], + "styles": { + "noc-head": { + "margin": [ + -25, + -30, + 0, + 1 + ] + }, + "qr-head": { + "margin": [ + 0, + 30, + 0, + 1 + ] + }, + "noc-table3": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -25, + 15, + -25, + -0 + ] + }, + "noc-table4": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -25, + 0, + -25, + -0 + ] + }, + "no-signature": { + "fontSize": 12, + "margin": [ + -20, + 35, + -10, + 0 + ], + "color": "#484848" + }, + "receipt-approver": { + "fontSize": 12, + "bold": true, + "margin": [ + -27, + 50, + -10, + 0 + ], + "color": "#484848" + }, + "receipt-logo-title": { + "color": "#000000", + "bold": true, + "fontSize": 9, + "fontWeight": 500 + }, + "receipt-logo-title-name": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500 + }, + "receipt-logo-header": { + "color": "#484848", + "fontSize": 9, + "bold": false, + "letterSpacing": 0.74, + "margin": [ + 0, + 0, + 0, + 5 + ] + }, + "noc-table": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -25, + 45, + -8, + -8 + ] + }, + "noc-table2": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -25, + 18, + -25, + -8 + ] + }, + "receipt-table-value": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 3, + 5, + 0, + 5 + ] + }, + "receipt-table-value-total": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "alignment": "right", + "margin": [ + 0, + 5, + 30, + 0 + ] + }, + "receipt-table-value-total-Qr": { + "alignment": "right", + "margin": [ + 0, + -40, + 10, + 0 + ] + }, + "receipt-table-value-down": { + "color": "#000000", + "bold": false, + "fontSize": 12, + "fontWeight": 400, + "alignment": "left", + "margin": [ + 3, + 5, + 0, + 5 + ] + }, + "receipt-table-value2": { + "color": "#000000", + "bold": false, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 3, + 0, + 0, + 0 + ] + }, + "receipt-table-value-cont": { + "color": "#000000", + "bold": false, + "fontSize": 11, + "fontWeight": 400, + "margin": [ + 3, + 0, + 0, + 0 + ] + }, + "receipt-table": { + "color": "#484848", + "bold": true, + "fontSize": 12, + "fontWeight": 400, + "margin": [ + -30, + 5, + 0, + 0 + ] + }, + "receipt-table2": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 3, + 0, + 0, + 0 + ] + }, + "pt-disclaimer": { + "fontSize": 11, + "margin": [ + -27, + 0, + -10, + 0 + ], + "color": "#484848" + }, + "pt-disclaimer-value": { + "fontSize": 10, + "margin": [ + 2, + 5, + 0, + 0 + ], + "color": "#484848" + } + } + } +} \ No newline at end of file diff --git a/configs/pdf-service/format-config/mcollect-challan.json b/configs/pdf-service/format-config/mcollect-challan.json new file mode 100644 index 00000000..3f1cc2b9 --- /dev/null +++ b/configs/pdf-service/format-config/mcollect-challan.json @@ -0,0 +1,849 @@ +{ + "key": "mcollect-challan", + "config": { + "defaultStyle": { + "font": "Cambay" + }, + "watermark": { + "text": "DIGIT UAT DIGIT UAT", + "color": "gery", + "opacity": 0.1, + "bold": true, + "italics": false + }, + "content": [ + { + "style": "noc-head", + "table": { + "widths": [ + "33%", + "33%", + "33%" + ], + "body": [ + [ + { + "text": "{{letter-code}}", + "style": "receipt-logo-header" + }, + { + "text": "{{letter-header}}", + "alignment": "center", + "style": "receipt-logo-header" + }, + { + "text": "{{letter-section}}", + "alignment": "right", + "color": "#484848", + "style": "receipt-logo-header", + "margin": [ + 0, + 0, + -30, + 0 + ] + } + ] + ] + }, + "layout": "noBorders" + }, + { + "canvas": [ + { + "type": "line", + "x1": -25, + "y1": -5, + "x2": 540, + "y2": -5, + "lineWidth": 0.1 + }, + { + "type": "line", + "x1": -25, + "y1": -2.5, + "x2": 540, + "y2": -2.5, + "lineWidth": 0.1 + } + ] + }, + { + "style": "noc-table2", + "table": { + "widths": [ + "*" + ], + "body": [ + [ + { + "stack": [ + { + "text": "{{cb-name}} {{cantonment-board}}", + "alignment": "center", + "style": "receipt-logo-title-name" + }, + { + "text": "{{form-number}}", + "alignment": "center", + "style": "receipt-logo-title" + }, + { + "text": "{{challanStatus}}", + "style": "receipt-logo-title-status" + }, + { + "text": "{{rule-number}}", + "alignment": "center", + "style": "receipt-logo-title" + }, + { + "text": "{{challan}} / {{bill}}", + "alignment": "center", + "style": "receipt-logo-title" + } + ], + "border": [ + true, + true, + true, + false + ] + } + ], + [ + { + "stack": [ + { + "table": { + "widths": [ + "20%", + "30%", + "20%", + "30%" + ], + "body": [ + [ + { + "text": "{{challan_no}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{challanNo}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value-down" + }, + { + "text": "{{challan_date}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{challanDate}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value-down", + "font": "Roboto" + } + ] + ] + } + }, + { + "table": { + "widths": [ + "20%", + "30%", + "20%", + "30%" + ], + "body": [ + [ + { + "text": "{{bill_no}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{billNo}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value-down" + }, + { + "text": "{{bill_date}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{billDate}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value-down", + "font": "Roboto" + } + ] + ] + } + }, + { + "table": { + "widths": [ + "20%", + "30%", + "20%", + "30%" + ], + "body": [ + [ + { + "text": "{{service_category}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{serviceCategory}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value-down" + }, + { + "text": "{{service_type}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{serviceType}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value-down" + } + ] + ] + } + }, + { + "table": { + "widths": [ + "20%", + "30%", + "20%", + "30%" + ], + "body": [ + [ + { + "text": "{{validity_from}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{fromPeriod}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value-down", + "font": "Roboto" + }, + { + "text": "{{validity_to}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{toPeriod}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value-down", + "font": "Roboto" + } + ] + ] + } + }, + { + "table": { + "widths": [ + "20%", + "30%", + "20%", + "30%" + ], + "body": [ + [ + { + "text": "{{consumer_Name}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{consumerName}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value-down" + }, + { + "text": "{{payer_contact}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerContact}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value-down", + "font": "Roboto" + } + ] + ] + } + }, + { + "table": { + "widths": [ + "19%", + "81%" + ], + "body": [ + [ + { + "text": "{{address_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{doorHouseNo}}, {{buildingName}}, {{streetName}}, {{mohalla}}, {{pinCode}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value-down" + } + ] + ] + } + }, + { + "table": { + "widths": [ + "19%", + "81%" + ], + "body": [ + [ + { + "text": "{{remarks_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{challanRemarks}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-logo-title-remarks-new" + } + ] + ] + } + } + ] + } + ] + ] + }, + "layout": {} + }, + { + "style": "noc-table3", + "table": { + "widths": [ + "*" + ], + "body": [ + [ + { + "text": "{{total_amount}}", + "border": [ + true, + true, + true, + false + ], + "style": "receipt-table-value-total", + "bold": false + } + ], + [ + { + "text": "{{Rs}} {{totalAmount}}", + "border": [ + true, + false, + true, + false + ], + "style": "receipt-table-value-total", + "fontSize": 20 + } + ] + ] + }, + "layout": {} + }, + { + "style": "noc-table4", + "table": { + "widths": [ + "60%", + "30%", + "10%" + ], + "body": [ + "{{#variable10}}[{\"text\": \"{{trade_license_tax}}\",\"border\": [true,false,false,false], \"style\": \"receipt-table-value-down\"},{\"text\": \"{{tradeLicenseTax}}\", \"border\": [false,false,false,false], \"style\": \"receipt-table-value-down\"},{ \"text\": \" \",\"border\": [false,false,true, false ]}]{{/variable10}}" + ] + }, + "layout": {} + }, + { + "canvas": [ + { + "type": "line", + "x1": -25, + "y1": 0, + "x2": 345, + "y2": 0, + "lineWidth": 1 + } + ] + }, + { + "style": "noc-table4", + "table": { + "widths": [ + "60%", + "30%", + "10%" + ], + "body": [ + [ + { + "text": "{{total_amount}}", + "border": [ + true, + false, + false, + true + ], + "bold": true, + "style": "receipt-table-value-down" + }, + { + "text": "{{totalAmount}}", + "border": [ + false, + false, + false, + true + ], + "bold": true, + "style": "receipt-table-value-down" + }, + { + "image": "{{qrcodeimage}}", + "style": "receipt-table-value-total-Qr", + "border": [ + false, + false, + true, + true + ], + "width": 72, + "height": 72 + } + ] + ] + }, + "layout": {} + }, + { + "table": { + "widths": [ + "*" + ], + "body": [ + [ + { + "style": "no-signature", + "text": "{{no_signature}}" + } + ] + ] + }, + "layout": "noBorders" + } + ], + "styles": { + "noc-head": { + "margin": [ + -25, + -30, + 0, + 1 + ] + }, + "qr-head": { + "margin": [ + 0, + 30, + 0, + 1 + ] + }, + "noc-table3": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -25, + 15, + -25, + -0 + ] + }, + "noc-table4": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -25, + 0, + -25, + -0 + ] + }, + "no-signature": { + "fontSize": 12, + "margin": [ + -20, + 35, + -10, + 0 + ], + "color": "#484848" + }, + "receipt-approver": { + "fontSize": 12, + "bold": true, + "margin": [ + -27, + 50, + -10, + 0 + ], + "color": "#484848" + }, + "receipt-logo-title": { + "color": "#000000", + "bold": true, + "fontSize": 9, + "fontWeight": 500 + }, + "receipt-logo-title-name": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500 + }, + "receipt-logo-header": { + "color": "#484848", + "fontSize": 9, + "bold": false, + "letterSpacing": 0.74, + "margin": [ + 0, + 0, + 0, + 5 + ] + }, + "receipt-logo-title-status": { + "color": "#FF0000", + "alignment": "right", + "bold": true, + "fontSize": 13, + "fontWeight": 500, + "margin": [ + 0, + -22, + 60, + 0 + ] + }, + "receipt-logo-title-remarks": { + "color": "#000000", + "alignment": "right", + "bold": true, + "fontSize": 8, + "fontWeight": 500, + "margin": [ + 0, + -22, + 70, + -10 + ] + }, + "receipt-logo-title-remarks-new": { + "color": "#FF0000", + "bold": true, + "fontSize": 10, + "fontWeight": 500, + "margin": [ + 0, + 0, + 0, + 0 + ] + }, + "noc-table": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -25, + 45, + -8, + -8 + ] + }, + "noc-table2": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -25, + 18, + -25, + -8 + ] + }, + "receipt-table-value": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 3, + 5, + 0, + 5 + ] + }, + "receipt-table-value-total": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "alignment": "right", + "margin": [ + 0, + 5, + 30, + 0 + ] + }, + "receipt-table-value-total-Qr": { + "alignment": "right", + "margin": [ + 0, + -40, + 10, + 0 + ] + }, + "receipt-table-value-down": { + "color": "#000000", + "bold": false, + "fontSize": 12, + "fontWeight": 400, + "alignment": "left", + "margin": [ + 3, + 5, + 0, + 5 + ] + }, + "receipt-table-value2": { + "color": "#000000", + "bold": false, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 3, + 0, + 0, + 0 + ] + }, + "receipt-table-value-cont": { + "color": "#000000", + "bold": false, + "fontSize": 11, + "fontWeight": 400, + "margin": [ + 3, + 0, + 0, + 0 + ] + }, + "receipt-table": { + "color": "#484848", + "bold": true, + "fontSize": 12, + "fontWeight": 400, + "margin": [ + -30, + 5, + 0, + 0 + ] + }, + "receipt-table2": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 3, + 0, + 0, + 0 + ] + }, + "pt-disclaimer": { + "fontSize": 11, + "margin": [ + -27, + 0, + -10, + 0 + ], + "color": "#484848" + }, + "pt-disclaimer-value": { + "fontSize": 10, + "margin": [ + 2, + 5, + 0, + 0 + ], + "color": "#484848" + } + } + } +} \ No newline at end of file From 710c392a017029c33ae9fa5bfd659f66c3cf9b3b Mon Sep 17 00:00:00 2001 From: egovmis Date: Fri, 18 Jun 2021 13:40:30 +0530 Subject: [PATCH 0665/1242] added mobile number field for PT receipt --- .../pdf-service/data-config/property-receipt.json | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index 948c0fd2..b8b828da 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -751,10 +751,7 @@ "variable":"surveyId", "value":"$.Properties[0].surveyId" }, - { - "variable":"ownerMobileNumber", - "value":"$.Properties[0].owners[0].mobileNumber" - }, + { "variable": "var_owners", "value":"$.Properties[0].owners[?(@.active== true && @.status== 'ACTIVE')]", @@ -769,7 +766,12 @@ { "variable":"fatherOrHusbandName2", "value":"fatherOrHusbandName" - }] + }, + { + "variable":"ownerMobileNumber", + "value":"mobileNumber" + } + ] } }, { From cebddfba69af92361700f78136d89a059f2985fc Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Fri, 18 Jun 2021 15:05:35 +0530 Subject: [PATCH 0666/1242] search by 6 digit of complaint id --- configs/egov-searcher/rainmaker-pgr-v2-searcher.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/egov-searcher/rainmaker-pgr-v2-searcher.yml b/configs/egov-searcher/rainmaker-pgr-v2-searcher.yml index 153063f4..5614e17f 100644 --- a/configs/egov-searcher/rainmaker-pgr-v2-searcher.yml +++ b/configs/egov-searcher/rainmaker-pgr-v2-searcher.yml @@ -18,6 +18,7 @@ SearchDefinitions: - name: servicerequestid isMandatory: false jsonPath: $.searchCriteria.serviceRequestId + operator: LIKE - name: servicerequestid isMandatory: false jsonPath: $.searchCriteria.complaintId From d87229361e31a99cb13905698f9407c6c99fecc9 Mon Sep 17 00:00:00 2001 From: mohammadrafeek-eGov Date: Fri, 18 Jun 2021 15:26:08 +0530 Subject: [PATCH 0667/1242] PI-1628:Updated module name --- .../data-config/mcollect-bill.json | 76 +++++++++---------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/configs/pdf-service/data-config/mcollect-bill.json b/configs/pdf-service/data-config/mcollect-bill.json index 131925bd..c27d60ac 100644 --- a/configs/pdf-service/data-config/mcollect-bill.json +++ b/configs/pdf-service/data-config/mcollect-bill.json @@ -45,7 +45,7 @@ "localisation": { "required": true, "prefix": null, - "module": "rainmaker-pdf" + "module": "rainmaker-common" } }, { @@ -57,7 +57,7 @@ "localisation": { "required": true, "prefix": null, - "module": "rainmaker-pdf" + "module": "rainmaker-common" } }, { @@ -96,7 +96,7 @@ "localisation": { "required": true, "prefix": null, - "module": "rainmaker-pdf" + "module": "rainmaker-common" } }, { @@ -108,7 +108,7 @@ "localisation": { "required": true, "prefix": null, - "module": "rainmaker-pdf" + "module": "rainmaker-common" } }, { @@ -120,7 +120,7 @@ "localisation": { "required": true, "prefix": null, - "module": "rainmaker-pdf" + "module": "rainmaker-common" } }, { @@ -132,7 +132,7 @@ "localisation": { "required": true, "prefix": null, - "module": "rainmaker-pdf" + "module": "rainmaker-common" } }, { @@ -144,7 +144,7 @@ "localisation": { "required": true, "prefix": null, - "module": "rainmaker-pdf" + "module": "rainmaker-common" } }, { @@ -156,7 +156,7 @@ "localisation": { "required": true, "prefix": null, - "module": "rainmaker-pdf" + "module": "rainmaker-common" } }, { @@ -168,7 +168,7 @@ "localisation": { "required": true, "prefix": null, - "module": "rainmaker-pdf" + "module": "rainmaker-common" } }, { @@ -180,7 +180,7 @@ "localisation": { "required": true, "prefix": null, - "module": "rainmaker-pdf" + "module": "rainmaker-common" } }, { @@ -192,7 +192,7 @@ "localisation": { "required": true, "prefix": null, - "module": "rainmaker-pdf" + "module": "rainmaker-common" } }, { @@ -203,7 +203,7 @@ "localisation": { "required": true, "prefix": "COMMON_MASTERS_PAYMENTMODE", - "module": "rainmaker-pdf" + "module": "rainmaker-common" } }, { @@ -267,7 +267,7 @@ "localisation": { "required": true, "prefix": "TENANTS_MOHALLA", - "module": "rainmaker-pdf" + "module": "rainmaker-common" } }, { @@ -290,7 +290,7 @@ "localisation": { "required": true, "prefix": null, - "module": "rainmaker-pdf" + "module": "rainmaker-common" } }, { @@ -302,7 +302,7 @@ "localisation": { "required": true, "prefix": null, - "module": "rainmaker-pdf" + "module": "rainmaker-common" } }, { @@ -314,7 +314,7 @@ "localisation": { "required": true, "prefix": null, - "module": "rainmaker-pdf" + "module": "rainmaker-common" } }, { @@ -326,7 +326,7 @@ "localisation": { "required": true, "prefix": null, - "module": "rainmaker-pdf" + "module": "rainmaker-common" } }, { @@ -362,7 +362,7 @@ "localisation": { "required": true, "prefix": null, - "module": "rainmaker-pdf" + "module": "rainmaker-common" } }, { @@ -374,7 +374,7 @@ "localisation": { "required": true, "prefix": null, - "module": "rainmaker-pdf" + "module": "rainmaker-common" } }, { @@ -386,7 +386,7 @@ "localisation": { "required": true, "prefix": null, - "module": "rainmaker-pdf" + "module": "rainmaker-common" } }, { @@ -398,7 +398,7 @@ "localisation": { "required": true, "prefix": null, - "module": "rainmaker-pdf" + "module": "rainmaker-common" } }, { @@ -410,7 +410,7 @@ "localisation": { "required": true, "prefix": null, - "module": "rainmaker-pdf" + "module": "rainmaker-common" } }, { @@ -422,7 +422,7 @@ "localisation": { "required": true, "prefix": null, - "module": "rainmaker-pdf" + "module": "rainmaker-common" } }, { @@ -434,7 +434,7 @@ "localisation": { "required": true, "prefix": null, - "module": "rainmaker-pdf" + "module": "rainmaker-common" } }, { @@ -446,7 +446,7 @@ "localisation": { "required": true, "prefix": null, - "module": "rainmaker-pdf" + "module": "rainmaker-common" } }, { @@ -458,7 +458,7 @@ "localisation": { "required": true, "prefix": null, - "module": "rainmaker-pdf" + "module": "rainmaker-common" } }, { @@ -470,7 +470,7 @@ "localisation": { "required": true, "prefix": null, - "module": "rainmaker-pdf" + "module": "rainmaker-common" } }, { @@ -482,7 +482,7 @@ "localisation": { "required": true, "prefix": null, - "module": "rainmaker-pdf" + "module": "rainmaker-common" } }, { @@ -494,7 +494,7 @@ "localisation": { "required": true, "prefix": null, - "module": "rainmaker-pdf" + "module": "rainmaker-common" } }, { @@ -506,7 +506,7 @@ "localisation": { "required": true, "prefix": null, - "module": "rainmaker-pdf" + "module": "rainmaker-common" } }, { @@ -518,7 +518,7 @@ "localisation": { "required": true, "prefix": null, - "module": "rainmaker-pdf" + "module": "rainmaker-common" } }, { @@ -530,7 +530,7 @@ "localisation": { "required": true, "prefix": null, - "module": "rainmaker-pdf" + "module": "rainmaker-common" } }, { @@ -542,7 +542,7 @@ "localisation": { "required": true, "prefix": null, - "module": "rainmaker-pdf" + "module": "rainmaker-common" } }, { @@ -554,7 +554,7 @@ "localisation": { "required": true, "prefix": null, - "module": "rainmaker-pdf" + "module": "rainmaker-common" } }, { @@ -566,7 +566,7 @@ "localisation": { "required": true, "prefix": null, - "module": "rainmaker-pdf" + "module": "rainmaker-common" } }, { @@ -578,7 +578,7 @@ "localisation": { "required": true, "prefix": null, - "module": "rainmaker-pdf" + "module": "rainmaker-common" } }, { @@ -590,7 +590,7 @@ "localisation": { "required": true, "prefix": null, - "module": "rainmaker-pdf" + "module": "rainmaker-common" } }, { @@ -671,4 +671,4 @@ } ] } -} \ No newline at end of file +} From 51c47b4ae7a903fdf08e20b7c3b135252a4809c2 Mon Sep 17 00:00:00 2001 From: mohammadrafeek-eGov Date: Fri, 18 Jun 2021 15:26:27 +0530 Subject: [PATCH 0668/1242] PI-1628:Updated modulename --- .../data-config/mcollect-challan.json | 80 +++++++++---------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/configs/pdf-service/data-config/mcollect-challan.json b/configs/pdf-service/data-config/mcollect-challan.json index 643b5eb3..e167fe4c 100644 --- a/configs/pdf-service/data-config/mcollect-challan.json +++ b/configs/pdf-service/data-config/mcollect-challan.json @@ -88,7 +88,7 @@ "localisation": { "required": true, "prefix": null, - "module": "rainmaker-pdf" + "module":"rainmaker-common" } }, { @@ -112,7 +112,7 @@ "localisation": { "required": true, "prefix": null, - "module": "rainmaker-pdf" + "module":"rainmaker-common" } }, { @@ -124,7 +124,7 @@ "localisation": { "required": true, "prefix": null, - "module": "rainmaker-pdf" + "module":"rainmaker-common" } }, { @@ -136,7 +136,7 @@ "localisation": { "required": true, "prefix": null, - "module": "rainmaker-pdf" + "module":"rainmaker-common" } }, { @@ -148,7 +148,7 @@ "localisation": { "required": true, "prefix": null, - "module": "rainmaker-pdf" + "module":"rainmaker-common" } }, { @@ -160,7 +160,7 @@ "localisation": { "required": true, "prefix": null, - "module": "rainmaker-pdf" + "module":"rainmaker-common" } }, { @@ -172,7 +172,7 @@ "localisation": { "required": true, "prefix": null, - "module": "rainmaker-pdf" + "module":"rainmaker-common" } }, { @@ -184,7 +184,7 @@ "localisation": { "required": true, "prefix": null, - "module": "rainmaker-pdf" + "module":"rainmaker-common" } }, { @@ -196,7 +196,7 @@ "localisation": { "required": true, "prefix": null, - "module": "rainmaker-pdf" + "module":"rainmaker-common" } }, { @@ -208,7 +208,7 @@ "localisation": { "required": true, "prefix": null, - "module": "rainmaker-pdf" + "module":"rainmaker-common" } }, { @@ -220,7 +220,7 @@ "localisation": { "required": true, "prefix": null, - "module": "rainmaker-pdf" + "module":"rainmaker-common" } }, { @@ -232,7 +232,7 @@ "localisation": { "required": true, "prefix": null, - "module": "rainmaker-pdf" + "module":"rainmaker-common" } }, { @@ -244,7 +244,7 @@ "localisation": { "required": true, "prefix": null, - "module": "rainmaker-pdf" + "module":"rainmaker-common" } }, { @@ -256,7 +256,7 @@ "localisation": { "required": true, "prefix": null, - "module": "rainmaker-pdf" + "module":"rainmaker-common" } }, { @@ -267,7 +267,7 @@ "localisation": { "required": true, "prefix": "COMMON_MASTERS_PAYMENTMODE", - "module": "rainmaker-pdf" + "module":"rainmaker-common" } }, { @@ -359,7 +359,7 @@ "localisation": { "required": true, "prefix": null, - "module": "rainmaker-pdf" + "module":"rainmaker-common" } }, { @@ -371,7 +371,7 @@ "localisation": { "required": true, "prefix": null, - "module": "rainmaker-pdf" + "module":"rainmaker-common" } }, { @@ -383,7 +383,7 @@ "localisation": { "required": true, "prefix": null, - "module": "rainmaker-pdf" + "module":"rainmaker-common" } }, { @@ -395,7 +395,7 @@ "localisation": { "required": true, "prefix": null, - "module": "rainmaker-pdf" + "module":"rainmaker-common" } }, { @@ -407,7 +407,7 @@ "localisation": { "required": true, "prefix": null, - "module": "rainmaker-pdf" + "module":"rainmaker-common" } }, { @@ -419,7 +419,7 @@ "localisation": { "required": true, "prefix": null, - "module": "rainmaker-pdf" + "module":"rainmaker-common" } }, { @@ -431,7 +431,7 @@ "localisation": { "required": true, "prefix": null, - "module": "rainmaker-pdf" + "module":"rainmaker-common" } }, { @@ -443,7 +443,7 @@ "localisation": { "required": true, "prefix": null, - "module": "rainmaker-pdf" + "module":"rainmaker-common" } }, { @@ -455,7 +455,7 @@ "localisation": { "required": true, "prefix": null, - "module": "rainmaker-pdf" + "module":"rainmaker-common" } }, { @@ -467,7 +467,7 @@ "localisation": { "required": true, "prefix": null, - "module": "rainmaker-pdf" + "module":"rainmaker-common" } }, { @@ -479,7 +479,7 @@ "localisation": { "required": true, "prefix": null, - "module": "rainmaker-pdf" + "module":"rainmaker-common" } }, { @@ -491,7 +491,7 @@ "localisation": { "required": true, "prefix": null, - "module": "rainmaker-pdf" + "module":"rainmaker-common" } }, { @@ -503,7 +503,7 @@ "localisation": { "required": true, "prefix": null, - "module": "rainmaker-pdf" + "module":"rainmaker-common" } }, { @@ -515,7 +515,7 @@ "localisation": { "required": true, "prefix": null, - "module": "rainmaker-pdf" + "module":"rainmaker-common" } }, { @@ -527,7 +527,7 @@ "localisation": { "required": true, "prefix": null, - "module": "rainmaker-pdf" + "module":"rainmaker-common" } }, { @@ -539,7 +539,7 @@ "localisation": { "required": true, "prefix": null, - "module": "rainmaker-pdf" + "module":"rainmaker-common" } }, { @@ -551,7 +551,7 @@ "localisation": { "required": true, "prefix": null, - "module": "rainmaker-pdf" + "module":"rainmaker-common" } }, { @@ -563,7 +563,7 @@ "localisation": { "required": true, "prefix": null, - "module": "rainmaker-pdf" + "module":"rainmaker-common" } }, { @@ -575,7 +575,7 @@ "localisation": { "required": true, "prefix": null, - "module": "rainmaker-pdf" + "module":"rainmaker-common" } }, { @@ -587,7 +587,7 @@ "localisation": { "required": true, "prefix": null, - "module": "rainmaker-pdf" + "module":"rainmaker-common" } }, { @@ -599,7 +599,7 @@ "localisation": { "required": true, "prefix": null, - "module": "rainmaker-pdf" + "module":"rainmaker-common" } }, { @@ -611,7 +611,7 @@ "localisation": { "required": true, "prefix": null, - "module": "rainmaker-pdf" + "module":"rainmaker-common" } }, { @@ -623,7 +623,7 @@ "localisation": { "required": true, "prefix": null, - "module": "rainmaker-pdf" + "module":"rainmaker-common" } }, { @@ -635,7 +635,7 @@ "localisation": { "required": true, "prefix": null, - "module": "rainmaker-pdf" + "module":"rainmaker-common" } }, { @@ -704,4 +704,4 @@ } ] } -} \ No newline at end of file +} From 114517b1f0b1a012004affc4112ffc38392bafa3 Mon Sep 17 00:00:00 2001 From: ashok-eGov <57890337+ashok-eGov@users.noreply.github.com> Date: Thu, 24 Jun 2021 14:42:14 +0530 Subject: [PATCH 0669/1242] Update mcollect-challan.json correcting tenant id in externalAPI --- configs/pdf-service/data-config/mcollect-challan.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/pdf-service/data-config/mcollect-challan.json b/configs/pdf-service/data-config/mcollect-challan.json index e167fe4c..7a3cf788 100644 --- a/configs/pdf-service/data-config/mcollect-challan.json +++ b/configs/pdf-service/data-config/mcollect-challan.json @@ -676,7 +676,7 @@ "externalAPI": [ { "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", - "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pg&filter=%5B?(@.code=='{$.tenantId}')%5D", + "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", "apiRequest": null, "responseMapping": [ { From 3f60538f3db72fddb1cc0a8bc7660bf6253659ae Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov <61416590+mahammadnizam-wt-eGov@users.noreply.github.com> Date: Sat, 26 Jun 2021 08:40:54 +0530 Subject: [PATCH 0670/1242] [PI-1647]-Updated egov-payment-legacy-index topic isBulk true --- configs/egov-indexer/payment-indexer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-indexer/payment-indexer.yml b/configs/egov-indexer/payment-indexer.yml index d4cf09a8..85cd0583 100644 --- a/configs/egov-indexer/payment-indexer.yml +++ b/configs/egov-indexer/payment-indexer.yml @@ -112,7 +112,7 @@ ServiceMaps: - name: paymentsindex-v1 type: payments id: $.id - isBulk: false + isBulk: true timeStampField: $.auditDetails.createdTime jsonPath: $.Payments.* customJsonMapping: From dabdfb342075553d910d1967efdc2f0b2960cf30 Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Tue, 29 Jun 2021 10:37:20 +0530 Subject: [PATCH 0671/1242] [PI-9847] - Changes on uat Dashboard --- .../MasterDashboardConfig.json | 36 +++++++++++-------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json index 78400ba5..b919d88e 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json @@ -1,5 +1,5 @@ { - "_comment": "Master dashboard which holds all the possible visualisation. Note new dashboards/visualisations can be added", + "_comment": "Master dashboard which holds all the possible visualisation. Note new dashboards/visualisations can be added ", "dashboards": [ { "name": "DSS_OVERVIEW_DASHBOARD", @@ -414,9 +414,15 @@ "headers": [] } ] - }, + } + ] + }, + { + "row": 3, + "name": "DSS_REVENUE", + "vizArray": [ { - "id": 223, + "id": 231, "name": "DSS_PT_COLLECTION_BY_USAGE_TYPE", "dimensions": { "height": 250, @@ -437,7 +443,7 @@ ] }, { - "id": 224, + "id": 232, "name": "DSS_PT_COLLECTION_BY_PAYMENT_MODE", "dimensions": { "height": 250, @@ -460,11 +466,11 @@ ] }, { - "row": 3, + "row": 4, "name": "DSS_REVENUE", "vizArray": [ { - "id": 231, + "id": 241, "name": "DSS_PT_KEY_FY_INDICATORS", "dimensions": { "height": 350, @@ -497,11 +503,11 @@ ] }, { - "row": 4, + "row": 5, "name": "DSS_REVENUE", "vizArray": [ { - "id": 231, + "id": 251, "name": "DSS_PT_TAX_HEAD", "dimensions": { "height": 350, @@ -535,11 +541,11 @@ ] }, { - "row": 5, + "row": 6, "name": "DSS_SERVICE", "vizArray": [ { - "id": 241, + "id": 261, "name": "DSS_OVERVIEW", "dimensions": { "height": 350, @@ -576,7 +582,7 @@ ] }, { - "id": 242, + "id": 262, "name": "DSS_PT_CUMULATIVE_PROPERTIES_ASSESSED", "dimensions": { "height": 350, @@ -598,11 +604,11 @@ ] }, { - "row": 6, + "row": 7, "name": "DSS_SERVICE", "vizArray": [ { - "id": 251, + "id": 271, "name": "DSS_PT_TOP_3_PERFORMING_ULBS", "dimensions": { "height": 250, @@ -623,7 +629,7 @@ ] }, { - "id": 252, + "id": 272, "name": "DSS_PT_BOTTOM_3_PERFORMING_ULBS", "dimensions": { "height": 250, @@ -643,7 +649,7 @@ ] }, { - "id": 253, + "id": 273, "name": "DSS_PT_PROPERTIES_BY_USAGE_TYPE", "dimensions": { "height": 250, From 8346dd7e2c7c3731c26a892dd0df711bfd40434a Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Tue, 29 Jun 2021 11:25:21 +0530 Subject: [PATCH 0672/1242] adding emailid and address to StateTradeLicenseDetailsReport_v2 --- configs/reports/configs/tl-reports.yml | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/configs/reports/configs/tl-reports.yml b/configs/reports/configs/tl-reports.yml index aee9c789..2431377c 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -2574,8 +2574,13 @@ ReportDefinitions: type: string source: tl total: false - - name: locality - label: report.tl.locality + - name: address + label: report.tl.address + type: string + source: tl + total: false + - name: emailid + label: report.tl.emailid type: string source: tl total: false @@ -2606,7 +2611,6 @@ ReportDefinitions: query: | SELECT tl.applicationnumber as applicationnumber, - locality_tlb.locality as locality, propertyid, financialyear, (case when oldlicensenumber is null then 'New' else 'Renewal' end) AS licensetype, @@ -2619,14 +2623,15 @@ ReportDefinitions: acc, name, mobilenumber, + emailid, paydetail.amountpaid as totalamount, + string_agg(distinct REGEXP_REPLACE(REGEXP_REPLACE(CONCAT(tla.doorno, ',', tla.buildingname, ',',tla.street,',',tla.localityname,',', tla.pincode), ',+', ','), '^,|,$', ''),',') as "address", tl.status as status FROM eg_tl_tradelicense tl INNER JOIN eg_tl_tradelicensedetail tld ON tld.tradelicenseid = tl.id - INNER JOIN ( - select tradelicensedetailid, array_to_string(array_agg(message.message),', ') as locality,array_to_string(array_agg(locality),', ') as localitycode from eg_tl_address as tla - LEFT OUTER JOIN message on code=CONCAT(UPPER(REGEXP_REPLACE( '[^A-Za-z0-9]','_', 'g')),'_REVENUE_', REGEXP_REPLACE( locality , '[^A-Za-z0-9]','_', 'g')) - AND message.locale = 'en_IN' group by 1) locality_tlb ON locality_tlb.tradelicensedetailid = tld.id + inner join (SELECT tradelicensedetailid , locality,doorno,street,buildingname,pincode,localityname, max(createdtime) + from eg_tl_address inner join eg_bndry_mohalla on eg_bndry_mohalla.localitycode=locality where eg_tl_address.tenantid=$tenantid + group by tradelicensedetailid, locality, doorno,street,buildingname,pincode,localityname) tla ON tld.id=tla.tradelicensedetailid INNER JOIN eg_tl_owner tlowner ON tlowner.tradelicensedetailid = tld.id INNER JOIN ( SELECT tradelicensedetailid, array_to_string(array_agg(message.message),', ') as tradeTypeName FROM eg_tl_tradeunit From 6716daa453d32862cde23c9db4f2bb22ae2177c6 Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Tue, 29 Jun 2021 14:26:12 +0530 Subject: [PATCH 0673/1242] [PI-9847]-changing chart type from line to bar in PT dashboard --- .../dashboard-analytics/MasterDashboardConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json index b919d88e..d297a189 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json @@ -360,7 +360,7 @@ "id": "cumulativeCollection", "name": "Monthly", "code": "", - "chartType": "line", + "chartType": "bar", "filter": "", "headers": [] } From e2649199b33a4e4ced6014c1c8cab39e6752ba17 Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Tue, 29 Jun 2021 15:47:00 +0530 Subject: [PATCH 0674/1242] [PI-9847]-changing chart type from bar to line in PT dashboard --- .../dashboard-analytics/MasterDashboardConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json index d297a189..b919d88e 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json @@ -360,7 +360,7 @@ "id": "cumulativeCollection", "name": "Monthly", "code": "", - "chartType": "bar", + "chartType": "line", "filter": "", "headers": [] } From bb0725d6e896416a50b3dc1c9ab64b3fafeaf890 Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Tue, 29 Jun 2021 15:59:17 +0530 Subject: [PATCH 0675/1242] [PI-9847]-changing chart type from line to bar in PT dashboard --- .../dashboard-analytics/MasterDashboardConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json index b919d88e..d297a189 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json @@ -360,7 +360,7 @@ "id": "cumulativeCollection", "name": "Monthly", "code": "", - "chartType": "line", + "chartType": "bar", "filter": "", "headers": [] } From 15040327731e64b4bc9feb70796e3be9a236f83f Mon Sep 17 00:00:00 2001 From: egovmis Date: Tue, 29 Jun 2021 16:39:49 +0530 Subject: [PATCH 0676/1242] changed head for security deposit in water/swerage estimation notice --- configs/pdf-service/data-config/ws-estimationnotice.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/pdf-service/data-config/ws-estimationnotice.json b/configs/pdf-service/data-config/ws-estimationnotice.json index 1c6bdb3c..9d7a0742 100644 --- a/configs/pdf-service/data-config/ws-estimationnotice.json +++ b/configs/pdf-service/data-config/ws-estimationnotice.json @@ -93,7 +93,7 @@ { "variable": "securityCharge", "value": { - "path": "$.pdfTaxhead[?(@.taxHeadCode == 'SECURITY_CHARGE')].estimateAmount" + "path": "$.pdfTaxhead[?(@.taxHeadCode == 'SECURITY_DEPOSIT')].estimateAmount" } }, { From 1b1595cf06e15a6bea2f2cd02f5f3516bfcc3bb2 Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Tue, 6 Jul 2021 15:13:11 +0530 Subject: [PATCH 0677/1242] updated EmployeeWiseCollectionTL_v2 --- configs/reports/configs/tl-reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/reports/configs/tl-reports.yml b/configs/reports/configs/tl-reports.yml index 2431377c..c49ce9ab 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -2802,7 +2802,7 @@ ReportDefinitions: FROM egcl_payment AS payment JOIN egcl_paymentdetail as paydetail on paydetail.paymentid=payment.id JOIN eg_user ON payment.createdby::INTEGER=eg_user.id - WHERE payment.tenantid=$tenantid AND businessservice not in ('TL') and payment.paymentstatus != 'CANCELLED' + WHERE payment.tenantid=$tenantid AND businessservice in ('TL') and payment.paymentstatus != 'CANCELLED' groupby: GROUP BY collectorname , paymentmode From f4f45486f4a47ccacbc66ac5111597e42407a881 Mon Sep 17 00:00:00 2001 From: egovmis Date: Tue, 6 Jul 2021 17:00:09 +0530 Subject: [PATCH 0678/1242] added rebate on PT receipt --- configs/pdf-service/data-config/property-receipt.json | 5 +++++ configs/pdf-service/format-config/property-receipt.json | 9 ++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index b8b828da..d402165c 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -565,6 +565,11 @@ "value": "interest" },{ + "variable":"rebate", + "value": "rebate" + + }, + { "variable":"usage_exemption", "value": "usage_exemption" diff --git a/configs/pdf-service/format-config/property-receipt.json b/configs/pdf-service/format-config/property-receipt.json index 12dfe990..f30dc44b 100644 --- a/configs/pdf-service/format-config/property-receipt.json +++ b/configs/pdf-service/format-config/property-receipt.json @@ -454,11 +454,14 @@ "table": { "widths": [ - "9%","8%","6%","7%","7%","7%","9%","9%","8%","8%","7%","*" + "7%","7%","7%","5%","7%","6%","7%","8%","8%","8%","8%","7%","*" ], "body": [ - [ + [ { + "text": "Year", + "style": "amounts" + }, { "text": "Property Tax", "style": "amounts" @@ -510,7 +513,7 @@ ], - "{{#var_bills}}[{\"text\":\"{{year}}\",\"style\":\"receipt-table\"},{\"text\":\"{{tax}}\",\"style\":\"receipt-table\"},{\"text\":\"{{firecess}}\",\"style\":\"receipt-table\"},{\"text\":\"{{cancercess}}\",\"style\":\"receipt-table\"},{\"text\":\"{{penalty}}\",\"style\":\"receipt-table\"},{\"text\":\"{{interest}}\",\"style\":\"receipt-table\"},{\"text\":\"{{usage_exemption}}\",\"style\":\"receipt-table\"},{\"text\":\"{{special_category_exemption}}\",\"style\":\"receipt-table\"},{\"text\":\"{{adhoc_penalty}}\",\"style\":\"receipt-table\"},{\"text\":\"{{adhoc_rebate}}\",\"style\":\"receipt-table\"},{\"text\":\"{{roundoff}}\",\"style\":\"receipt-table\"},{\"text\":\"{{total}}\",\"style\":\"receipt-table\"}]{{/var_bills}}" + "{{#var_bills}}[{\"text\":\"{{year}}\",\"style\":\"receipt-table\"},{\"text\":\"{{tax}}\",\"style\":\"receipt-table\"},{\"text\":\"{{firecess}}\",\"style\":\"receipt-table\"},{\"text\":\"{{cancercess}}\",\"style\":\"receipt-table\"},{\"text\":\"{{penalty}}\",\"style\":\"receipt-table\"},{\"text\":\"{{rebate}}\",\"style\":\"receipt-table\"},{\"text\":\"{{interest}}\",\"style\":\"receipt-table\"},{\"text\":\"{{usage_exemption}}\",\"style\":\"receipt-table\"},{\"text\":\"{{special_category_exemption}}\",\"style\":\"receipt-table\"},{\"text\":\"{{adhoc_penalty}}\",\"style\":\"receipt-table\"},{\"text\":\"{{adhoc_rebate}}\",\"style\":\"receipt-table\"},{\"text\":\"{{roundoff}}\",\"style\":\"receipt-table\"},{\"text\":\"{{total}}\",\"style\":\"receipt-table\"}]{{/var_bills}}" ] From e980a064e47f2b06854b19c500db335dcef4b644 Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Fri, 9 Jul 2021 10:17:56 +0530 Subject: [PATCH 0679/1242] Create hrms-reports.yml --- configs/reports/configs/hrms-reports.yml | 1 + 1 file changed, 1 insertion(+) create mode 100644 configs/reports/configs/hrms-reports.yml diff --git a/configs/reports/configs/hrms-reports.yml b/configs/reports/configs/hrms-reports.yml new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/configs/reports/configs/hrms-reports.yml @@ -0,0 +1 @@ + From 7b2aaa66b28348b75c9818e90c8babcf67fd6a45 Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Fri, 9 Jul 2021 17:13:05 +0530 Subject: [PATCH 0680/1242] adding first report HRMSEmployeewiseReport in HRMS --- configs/reports/configs/hrms-reports.yml | 83 +++++++++++++++++++++++- 1 file changed, 82 insertions(+), 1 deletion(-) diff --git a/configs/reports/configs/hrms-reports.yml b/configs/reports/configs/hrms-reports.yml index 8b137891..6b7e1edb 100644 --- a/configs/reports/configs/hrms-reports.yml +++ b/configs/reports/configs/hrms-reports.yml @@ -1 +1,82 @@ - +--- +ReportDefinitions: +- reportName: HRMSEmployeewiseReport + summary: HRMS Employeewise Report + version: 1.0.0 + moduleName: rainmaker-hrms + sourceColumns: + - name: name + label: report.hrms.name + type: string + source: hrms + total: false + - name: mobilenumber + label: report.hrms.mobilenumber + type: string + source: hrms + total: false + - name: tenantid + label: report.hrms.tenantid + type: string + source: hrms + total: false + - name: role_codes + label: report.hrms.role_codes + type: string + source: hrms + total: true + - name: code + label: report.hrms.code + type: string + source: hrms + total: false + - name: departmentname + label: report.hrms.departmentname + type: string + source: hrms + total: false + - name: designationname + label: report.hrms.designationname + type: string + source: hrms + total: true + - name: active + label: reports.hrms.active + type: string + source: hrms + total: false + searchParams: + - name: ulb + label: ULB + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: hrms + wrapper: true + isMandatory: false + searchClause: AND tl.tenantId = $ulb + query: | + with userroles as + ( + select user_id,string_agg(role_code,',') as role_codes + from eg_userrole_v1 + group by user_id + ) + select + u.name, + u.mobilenumber, + u.tenantid, + r.role_codes, + e.code, + assign.department, + assign.designation, + msg.message as departmentname, + msg1.message as designationname, + u.active + from eg_user u + inner join userroles r on u.id=r.user_id inner join eg_hrms_employee e on u.id=e.id + inner join eg_hrms_assignment assign on e.uuid=assign.employeeid and assign.iscurrentassignment='true' + inner join message as msg on msg.code=concat('COMMON_MASTERS_DEPARTMENT_',assign.department) + inner join message as msg1 on msg1.code=concat('COMMON_MASTERS_DESIGNATION_',assign.designation) + where u.type!='CITIZEN' + groupby: GROUP BY rh.tenantId + orderby: ORDER BY rh.tenantId asc From dc9df0f68cd84e4ab6c26c1eaaffcc1e89de3f33 Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Mon, 12 Jul 2021 10:21:18 +0530 Subject: [PATCH 0681/1242] added config for hrms reports --- configs/reports/report.config | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/reports/report.config b/configs/reports/report.config index e605e133..d61eda0e 100644 --- a/configs/reports/report.config +++ b/configs/reports/report.config @@ -4,3 +4,4 @@ rainmaker-tl=file:///work-dir/punjab-rainmaker-customization/configs/reports/con rainmaker-uc=file:///work-dir/punjab-rainmaker-customization/configs/reports/configs/uc-reports.yml rainmaker-noc=file:///work-dir/punjab-rainmaker-customization/configs/reports/configs/rainmaker-noc-reports.yml rainmaker-ws=file:///work-dir/punjab-rainmaker-customization/configs/reports/configs/ws-reports.yml +rainmaker-hrms=file:///work-dir/punjab-rainmaker-customization/configs/reports/configs/hrms-reports.yml From 8db1b8a6d6b86845a85d21e2a5a7e3fa02dda1a3 Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Mon, 12 Jul 2021 11:14:54 +0530 Subject: [PATCH 0682/1242] Update hrms-reports.yml --- configs/reports/configs/hrms-reports.yml | 43 ++++++++++++------------ 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/configs/reports/configs/hrms-reports.yml b/configs/reports/configs/hrms-reports.yml index 6b7e1edb..28583434 100644 --- a/configs/reports/configs/hrms-reports.yml +++ b/configs/reports/configs/hrms-reports.yml @@ -1,4 +1,3 @@ ---- ReportDefinitions: - reportName: HRMSEmployeewiseReport summary: HRMS Employeewise Report @@ -56,27 +55,27 @@ ReportDefinitions: searchClause: AND tl.tenantId = $ulb query: | with userroles as - ( - select user_id,string_agg(role_code,',') as role_codes + ( + select user_id,string_agg(role_code,',') as role_codes from eg_userrole_v1 - group by user_id - ) - select - u.name, - u.mobilenumber, - u.tenantid, - r.role_codes, - e.code, - assign.department, - assign.designation, - msg.message as departmentname, - msg1.message as designationname, - u.active - from eg_user u - inner join userroles r on u.id=r.user_id inner join eg_hrms_employee e on u.id=e.id - inner join eg_hrms_assignment assign on e.uuid=assign.employeeid and assign.iscurrentassignment='true' - inner join message as msg on msg.code=concat('COMMON_MASTERS_DEPARTMENT_',assign.department) - inner join message as msg1 on msg1.code=concat('COMMON_MASTERS_DESIGNATION_',assign.designation) - where u.type!='CITIZEN' + group by user_id + ) + select + u.name, + u.mobilenumber, + u.tenantid, + r.role_codes, + e.code, + assign.department, + assign.designation, + msg.message as departmentname, + msg1.message as designationname, + u.active + from eg_user u + inner join userroles r on u.id=r.user_id inner join eg_hrms_employee e on u.id=e.id + inner join eg_hrms_assignment assign on e.uuid=assign.employeeid and assign.iscurrentassignment='true' + inner join message as msg on msg.code=concat('COMMON_MASTERS_DEPARTMENT_',assign.department) + inner join message as msg1 on msg1.code=concat('COMMON_MASTERS_DESIGNATION_',assign.designation) + where u.type!='CITIZEN' groupby: GROUP BY rh.tenantId orderby: ORDER BY rh.tenantId asc From 582e31e75b0f47695631d42c15462b2e9370fb05 Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov <61416590+mahammadnizam-wt-eGov@users.noreply.github.com> Date: Thu, 15 Jul 2021 15:01:48 +0530 Subject: [PATCH 0683/1242] [PI-1681]-Added chatbot-telemetry-v2 file for xstate-chatbot --- .../egov-indexer/chatbot-telemetry-v2.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 configs/egov-indexer/egov-indexer/chatbot-telemetry-v2.yaml diff --git a/configs/egov-indexer/egov-indexer/chatbot-telemetry-v2.yaml b/configs/egov-indexer/egov-indexer/chatbot-telemetry-v2.yaml new file mode 100644 index 00000000..20d0167a --- /dev/null +++ b/configs/egov-indexer/egov-indexer/chatbot-telemetry-v2.yaml @@ -0,0 +1,12 @@ +ServiceMaps: + serviceName: chatbot-messages + version: 1.0.0 + mappings: + - topic: chatbot-telemetry-v2 + configKey: INDEX + indexes: + - name: chatbot-messages-v2 + type: general + id: $.id + timeStampField: $.date + fieldsToBeMasked: [ "$.data.user", "$.data.message.input", "$.data.message.output" ] From e57d7812aff6a317e6ddf458aeea282c160b0c28 Mon Sep 17 00:00:00 2001 From: arorakamal <37300574+arorakamal@users.noreply.github.com> Date: Fri, 16 Jul 2021 13:41:42 +0530 Subject: [PATCH 0684/1242] add condition of mandi gobindgarh in link 1043 --- rainmaker-custom-service/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rainmaker-custom-service/index.js b/rainmaker-custom-service/index.js index 01a072e6..45271068 100644 --- a/rainmaker-custom-service/index.js +++ b/rainmaker-custom-service/index.js @@ -1040,7 +1040,7 @@ router.post('/protected/punjab-pt/pre-hook/pg-service/transaction/v1/_create', a request['Transaction']['callbackUrl'] = url.format(url_callback); } - else if (request['Transaction']['tenantId'] == 'pb.amritsar' || request['Transaction']['tenantId'] == 'pb.mohali' || request['Transaction']['tenantId'] == 'pb.hoshiarpur' || request['Transaction']['tenantId'] == 'pb.kapurthala' || request['Transaction']['tenantId'] == 'pb.khanna' || request['Transaction']['tenantId'] == 'pb.moga') { + else if (request['Transaction']['tenantId'] == 'pb.amritsar' || request['Transaction']['tenantId'] == 'pb.mohali' || request['Transaction']['tenantId'] == 'pb.hoshiarpur' || request['Transaction']['tenantId'] == 'pb.kapurthala' || request['Transaction']['tenantId'] == 'pb.khanna' || request['Transaction']['tenantId'] == 'pb.moga' || request['Transaction']['tenantId'] == 'pb.mandigobindgarh') { let original_callback = request['Transaction']['callbackUrl']; request['Transaction']['gateway'] = 'RAZORPAY' url_callback = url.parse(original_callback) From 3944dc9a49ed6a2093b025d947f5d3e5b2fa771a Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Fri, 16 Jul 2021 16:54:17 +0530 Subject: [PATCH 0685/1242] updates in hrms report --- configs/reports/configs/hrms-reports.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/configs/reports/configs/hrms-reports.yml b/configs/reports/configs/hrms-reports.yml index 28583434..dcc651f7 100644 --- a/configs/reports/configs/hrms-reports.yml +++ b/configs/reports/configs/hrms-reports.yml @@ -5,27 +5,27 @@ ReportDefinitions: moduleName: rainmaker-hrms sourceColumns: - name: name - label: report.hrms.name + label: reports.hrms.name type: string source: hrms total: false - name: mobilenumber - label: report.hrms.mobilenumber + label: reports.hrms.mobilenumber type: string source: hrms total: false - name: tenantid - label: report.hrms.tenantid + label: reports.hrms.tenantid type: string source: hrms total: false - name: role_codes - label: report.hrms.role_codes + label: reports.hrms.role_codes type: string source: hrms total: true - name: code - label: report.hrms.code + label: reports.hrms.code type: string source: hrms total: false @@ -35,7 +35,7 @@ ReportDefinitions: source: hrms total: false - name: designationname - label: report.hrms.designationname + label: reports.hrms.designationname type: string source: hrms total: true From 07e45ebc3fefbafc49437474c9de801cf2fa3913 Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Mon, 19 Jul 2021 11:43:30 +0530 Subject: [PATCH 0686/1242] Update hrms-reports.yml --- configs/reports/configs/hrms-reports.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configs/reports/configs/hrms-reports.yml b/configs/reports/configs/hrms-reports.yml index dcc651f7..b10a001c 100644 --- a/configs/reports/configs/hrms-reports.yml +++ b/configs/reports/configs/hrms-reports.yml @@ -1,3 +1,4 @@ +--- ReportDefinitions: - reportName: HRMSEmployeewiseReport summary: HRMS Employeewise Report @@ -49,7 +50,7 @@ ReportDefinitions: label: ULB type: singlevaluelist pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name - source: hrms + source: pt wrapper: true isMandatory: false searchClause: AND tl.tenantId = $ulb From 967bde13c356c296949a7f9e0480385e32acba6f Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Tue, 20 Jul 2021 11:10:19 +0530 Subject: [PATCH 0687/1242] adding decryption id to hrms report --- configs/reports/configs/hrms-reports.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/configs/reports/configs/hrms-reports.yml b/configs/reports/configs/hrms-reports.yml index b10a001c..c92c93c0 100644 --- a/configs/reports/configs/hrms-reports.yml +++ b/configs/reports/configs/hrms-reports.yml @@ -1,6 +1,7 @@ --- ReportDefinitions: - reportName: HRMSEmployeewiseReport + decryptionPathId: TradeLicenseDetailsReport_v2 summary: HRMS Employeewise Report version: 1.0.0 moduleName: rainmaker-hrms @@ -65,10 +66,10 @@ ReportDefinitions: u.name, u.mobilenumber, u.tenantid, - r.role_codes, - e.code, - assign.department, - assign.designation, + r.role_codes as role_assigned, + e.code as user_id, + --assign.department, + --assign.designation, msg.message as departmentname, msg1.message as designationname, u.active @@ -78,5 +79,4 @@ ReportDefinitions: inner join message as msg on msg.code=concat('COMMON_MASTERS_DEPARTMENT_',assign.department) inner join message as msg1 on msg1.code=concat('COMMON_MASTERS_DESIGNATION_',assign.designation) where u.type!='CITIZEN' - groupby: GROUP BY rh.tenantId - orderby: ORDER BY rh.tenantId asc + orderby: ORDER BY u.tenantId asc From 90f941baedb49b73a34907755497d52acda955c4 Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Tue, 20 Jul 2021 11:44:47 +0530 Subject: [PATCH 0688/1242] Update hrms-reports.yml --- configs/reports/configs/hrms-reports.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/reports/configs/hrms-reports.yml b/configs/reports/configs/hrms-reports.yml index c92c93c0..c5babd14 100644 --- a/configs/reports/configs/hrms-reports.yml +++ b/configs/reports/configs/hrms-reports.yml @@ -21,13 +21,13 @@ ReportDefinitions: type: string source: hrms total: false - - name: role_codes - label: reports.hrms.role_codes + - name: role_assigned + label: reports.hrms.role_assigned type: string source: hrms total: true - - name: code - label: reports.hrms.code + - name: user_id + label: reports.hrms.user_id type: string source: hrms total: false From 9043f4700e7b89553fa76e13692f875770367b6f Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Tue, 20 Jul 2021 14:50:27 +0530 Subject: [PATCH 0689/1242] Update hrms-reports.yml --- configs/reports/configs/hrms-reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/reports/configs/hrms-reports.yml b/configs/reports/configs/hrms-reports.yml index c5babd14..ec647835 100644 --- a/configs/reports/configs/hrms-reports.yml +++ b/configs/reports/configs/hrms-reports.yml @@ -54,7 +54,7 @@ ReportDefinitions: source: pt wrapper: true isMandatory: false - searchClause: AND tl.tenantId = $ulb + searchClause: AND u.tenantId = $ulb query: | with userroles as ( From 0919acccd0a175d94105c4ba6967cb1c495b54e7 Mon Sep 17 00:00:00 2001 From: KarunaNidhan-egov <72540308+KarunaNidhan-egov@users.noreply.github.com> Date: Mon, 26 Jul 2021 15:15:07 +0530 Subject: [PATCH 0690/1242] PI-1692: spelling correction --- configs/egov-dss-dashboards/dashboard-analytics/getchart.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/getchart.json b/configs/egov-dss-dashboards/dashboard-analytics/getchart.json index 9f9e5ef8..00678843 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/getchart.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/getchart.json @@ -31,7 +31,7 @@ "startDate":{ "type":"string" }, - "endData":{ + "endDate":{ "type":"string" } } @@ -40,4 +40,4 @@ "required": ["chartType","chartFormat", "serviceApi","dates"] } } -} \ No newline at end of file +} From e51d39443a6a0225fa9eb6e449b2089583274386 Mon Sep 17 00:00:00 2001 From: KarunaNidhan-egov <72540308+KarunaNidhan-egov@users.noreply.github.com> Date: Mon, 26 Jul 2021 15:50:12 +0530 Subject: [PATCH 0691/1242] PI-1692: dateRefField for DSS_TARGET_COLLECTIOn --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index bd6b6d3b..2911a7fe 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -519,7 +519,7 @@ { "module": "COMMON", "requestQueryMap": "{\"module\" : \"businessService.keyword\", \"tenantId\" : \"tenantIdForMunicipalCorporation.keyword\"}", - "dateRefField": "", + "dateRefField": "dataObject.dates.startDate", "indexName": "dss-target_v1", "aggrQuery": "{\"aggs\":{\"Target Collection\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}" } From 8cc50f8de0eea5acc8c0a8e1a1d886d373a4289b Mon Sep 17 00:00:00 2001 From: KarunaNidhan-egov <72540308+KarunaNidhan-egov@users.noreply.github.com> Date: Mon, 26 Jul 2021 16:25:01 +0530 Subject: [PATCH 0692/1242] PI-1692: updated dateRefField --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 2911a7fe..f0330394 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -519,7 +519,7 @@ { "module": "COMMON", "requestQueryMap": "{\"module\" : \"businessService.keyword\", \"tenantId\" : \"tenantIdForMunicipalCorporation.keyword\"}", - "dateRefField": "dataObject.dates.startDate", + "dateRefField": "@timestamp", "indexName": "dss-target_v1", "aggrQuery": "{\"aggs\":{\"Target Collection\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}" } From 09d5e68d78735f5f07f9365d576d60bb0e72bfce Mon Sep 17 00:00:00 2001 From: KarunaNidhan-egov <72540308+KarunaNidhan-egov@users.noreply.github.com> Date: Mon, 26 Jul 2021 16:40:49 +0530 Subject: [PATCH 0693/1242] PI-1692: update datereffield --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index f0330394..cd711b5d 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -519,7 +519,7 @@ { "module": "COMMON", "requestQueryMap": "{\"module\" : \"businessService.keyword\", \"tenantId\" : \"tenantIdForMunicipalCorporation.keyword\"}", - "dateRefField": "@timestamp", + "dateRefField": "Timestamp", "indexName": "dss-target_v1", "aggrQuery": "{\"aggs\":{\"Target Collection\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}" } From 5ada1a18a84205260e122a37cf42919fbf1582e0 Mon Sep 17 00:00:00 2001 From: KarunaNidhan-egov <72540308+KarunaNidhan-egov@users.noreply.github.com> Date: Mon, 26 Jul 2021 17:19:44 +0530 Subject: [PATCH 0694/1242] PI-1692: updated datereffield --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index cd711b5d..bd6b6d3b 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -519,7 +519,7 @@ { "module": "COMMON", "requestQueryMap": "{\"module\" : \"businessService.keyword\", \"tenantId\" : \"tenantIdForMunicipalCorporation.keyword\"}", - "dateRefField": "Timestamp", + "dateRefField": "", "indexName": "dss-target_v1", "aggrQuery": "{\"aggs\":{\"Target Collection\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}" } From c197cd7d2ce7f58fc3992243d1d1ccefda5f3c80 Mon Sep 17 00:00:00 2001 From: KarunaNidhan-egov <72540308+KarunaNidhan-egov@users.noreply.github.com> Date: Mon, 26 Jul 2021 17:28:50 +0530 Subject: [PATCH 0695/1242] PI-1692 --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index bd6b6d3b..93a7e84f 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -519,7 +519,7 @@ { "module": "COMMON", "requestQueryMap": "{\"module\" : \"businessService.keyword\", \"tenantId\" : \"tenantIdForMunicipalCorporation.keyword\"}", - "dateRefField": "", + "dateRefField": "@Timestamp", "indexName": "dss-target_v1", "aggrQuery": "{\"aggs\":{\"Target Collection\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}" } From 75ab9507ea07c5e723ff5523aa4602f910f7630d Mon Sep 17 00:00:00 2001 From: KarunaNidhan-egov <72540308+KarunaNidhan-egov@users.noreply.github.com> Date: Mon, 26 Jul 2021 18:45:23 +0530 Subject: [PATCH 0696/1242] PI-1692 --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 93a7e84f..ed1b7ded 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -519,7 +519,7 @@ { "module": "COMMON", "requestQueryMap": "{\"module\" : \"businessService.keyword\", \"tenantId\" : \"tenantIdForMunicipalCorporation.keyword\"}", - "dateRefField": "@Timestamp", + "dateRefField": "financialYear", "indexName": "dss-target_v1", "aggrQuery": "{\"aggs\":{\"Target Collection\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}" } From a6782f10d4e2083d5d4d6f49163d75e988bd2c1e Mon Sep 17 00:00:00 2001 From: KarunaNidhan-egov <72540308+KarunaNidhan-egov@users.noreply.github.com> Date: Mon, 26 Jul 2021 18:57:35 +0530 Subject: [PATCH 0697/1242] PI-1962 --- .../dashboard-analytics/ChartApiConfig.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index ed1b7ded..09382f65 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -519,9 +519,9 @@ { "module": "COMMON", "requestQueryMap": "{\"module\" : \"businessService.keyword\", \"tenantId\" : \"tenantIdForMunicipalCorporation.keyword\"}", - "dateRefField": "financialYear", + "dateRefField": "", "indexName": "dss-target_v1", - "aggrQuery": "{\"aggs\":{\"Target Collection\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}" + "aggrQuery": "{\"aggs\": {\"Target Collection\":{\"filter\":{\"bool\":{\"must\":[{\"terms\":{\"financialYear.keyword\":[\"financialYear\"]}}]}},\"aggs\":{\"target collection\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}}}" } ], "chartType": "metric", From 1943574e0546045f5b888427416d319ad12e6e7e Mon Sep 17 00:00:00 2001 From: KarunaNidhan-egov <72540308+KarunaNidhan-egov@users.noreply.github.com> Date: Tue, 27 Jul 2021 11:41:44 +0530 Subject: [PATCH 0698/1242] PI-1692 --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 09382f65..bd6b6d3b 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -521,7 +521,7 @@ "requestQueryMap": "{\"module\" : \"businessService.keyword\", \"tenantId\" : \"tenantIdForMunicipalCorporation.keyword\"}", "dateRefField": "", "indexName": "dss-target_v1", - "aggrQuery": "{\"aggs\": {\"Target Collection\":{\"filter\":{\"bool\":{\"must\":[{\"terms\":{\"financialYear.keyword\":[\"financialYear\"]}}]}},\"aggs\":{\"target collection\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}}}" + "aggrQuery": "{\"aggs\":{\"Target Collection\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}" } ], "chartType": "metric", From d177bca2b32d9949156dfbdc44df97fe967825dd Mon Sep 17 00:00:00 2001 From: KarunaNidhan-egov <72540308+KarunaNidhan-egov@users.noreply.github.com> Date: Tue, 27 Jul 2021 14:10:55 +0530 Subject: [PATCH 0699/1242] PI-1692 --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index bd6b6d3b..09e062f6 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -521,7 +521,7 @@ "requestQueryMap": "{\"module\" : \"businessService.keyword\", \"tenantId\" : \"tenantIdForMunicipalCorporation.keyword\"}", "dateRefField": "", "indexName": "dss-target_v1", - "aggrQuery": "{\"aggs\":{\"Target Collection\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}" + "aggrQuery": "{\"aggs\": {\"Fys\": {\"terms\": {\"field\": \"financialYear.keyword\"},\"aggs\": {\"sum\": {\"terms\": {\"field\": \"budgetProposedForMunicipalCorporation\"}}}}}}" } ], "chartType": "metric", From a466718b8f3aeba11ea35da7dc8835d06c5a0e35 Mon Sep 17 00:00:00 2001 From: KarunaNidhan-egov <72540308+KarunaNidhan-egov@users.noreply.github.com> Date: Tue, 27 Jul 2021 18:13:11 +0530 Subject: [PATCH 0700/1242] PI-1692 --- .../dashboard-analytics/ChartApiConfig.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 09e062f6..44c8e354 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -519,9 +519,9 @@ { "module": "COMMON", "requestQueryMap": "{\"module\" : \"businessService.keyword\", \"tenantId\" : \"tenantIdForMunicipalCorporation.keyword\"}", - "dateRefField": "", + "dateRefField": "startdate", "indexName": "dss-target_v1", - "aggrQuery": "{\"aggs\": {\"Fys\": {\"terms\": {\"field\": \"financialYear.keyword\"},\"aggs\": {\"sum\": {\"terms\": {\"field\": \"budgetProposedForMunicipalCorporation\"}}}}}}" + "aggrQuery": "{\"aggs\":{\"Target Collection\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}" } ], "chartType": "metric", From 33a08396f2596340d57cfee89fe17d37ab46c30b Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Wed, 28 Jul 2021 11:40:43 +0530 Subject: [PATCH 0701/1242] Update hrms-reports.yml --- configs/reports/configs/hrms-reports.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/hrms-reports.yml b/configs/reports/configs/hrms-reports.yml index ec647835..ac064ab7 100644 --- a/configs/reports/configs/hrms-reports.yml +++ b/configs/reports/configs/hrms-reports.yml @@ -25,7 +25,7 @@ ReportDefinitions: label: reports.hrms.role_assigned type: string source: hrms - total: true + total: false - name: user_id label: reports.hrms.user_id type: string @@ -40,7 +40,7 @@ ReportDefinitions: label: reports.hrms.designationname type: string source: hrms - total: true + total: false - name: active label: reports.hrms.active type: string From cce7f4a46184d0e8fb6035d1c87c01b96ebce6e9 Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Wed, 28 Jul 2021 11:52:56 +0530 Subject: [PATCH 0702/1242] adding case to report --- configs/reports/configs/hrms-reports.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/configs/reports/configs/hrms-reports.yml b/configs/reports/configs/hrms-reports.yml index ac064ab7..2e7a507d 100644 --- a/configs/reports/configs/hrms-reports.yml +++ b/configs/reports/configs/hrms-reports.yml @@ -41,8 +41,8 @@ ReportDefinitions: type: string source: hrms total: false - - name: active - label: reports.hrms.active + - name: status + label: reports.hrms.status type: string source: hrms total: false @@ -72,7 +72,10 @@ ReportDefinitions: --assign.designation, msg.message as departmentname, msg1.message as designationname, - u.active + case + when u.active='true' then 'Active' + when u.active='false' then 'Inactive' + as status from eg_user u inner join userroles r on u.id=r.user_id inner join eg_hrms_employee e on u.id=e.id inner join eg_hrms_assignment assign on e.uuid=assign.employeeid and assign.iscurrentassignment='true' From d7938c0ad6f0a4ad81537c057723572f765dd3cf Mon Sep 17 00:00:00 2001 From: KarunaNidhan-egov <72540308+KarunaNidhan-egov@users.noreply.github.com> Date: Wed, 28 Jul 2021 12:49:39 +0530 Subject: [PATCH 0703/1242] PI-1692 --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 44c8e354..23664810 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -518,7 +518,7 @@ "queries": [ { "module": "COMMON", - "requestQueryMap": "{\"module\" : \"businessService.keyword\", \"tenantId\" : \"tenantIdForMunicipalCorporation.keyword\"}", + "requestQueryMap": "{\"module\" : \"businessService.keyword\", \"tenantId\" : \"tenantIdForMunicipalCorporation.keyword\", \"financialYear\" : \"financialYear.keyword\"}", "dateRefField": "startdate", "indexName": "dss-target_v1", "aggrQuery": "{\"aggs\":{\"Target Collection\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}" From 9288d968fa310388bb1c29f74d6e69d9430bfb01 Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Wed, 28 Jul 2021 12:51:55 +0530 Subject: [PATCH 0704/1242] Update hrms-reports.yml --- configs/reports/configs/hrms-reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/reports/configs/hrms-reports.yml b/configs/reports/configs/hrms-reports.yml index 2e7a507d..5fd18265 100644 --- a/configs/reports/configs/hrms-reports.yml +++ b/configs/reports/configs/hrms-reports.yml @@ -75,7 +75,7 @@ ReportDefinitions: case when u.active='true' then 'Active' when u.active='false' then 'Inactive' - as status + end as status from eg_user u inner join userroles r on u.id=r.user_id inner join eg_hrms_employee e on u.id=e.id inner join eg_hrms_assignment assign on e.uuid=assign.employeeid and assign.iscurrentassignment='true' From 0557bc79903520b7394aacbeb7da25b18af1470c Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Wed, 28 Jul 2021 16:33:31 +0530 Subject: [PATCH 0705/1242] changes in hrms report --- configs/reports/configs/hrms-reports.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/hrms-reports.yml b/configs/reports/configs/hrms-reports.yml index 5fd18265..8543a37b 100644 --- a/configs/reports/configs/hrms-reports.yml +++ b/configs/reports/configs/hrms-reports.yml @@ -79,7 +79,7 @@ ReportDefinitions: from eg_user u inner join userroles r on u.id=r.user_id inner join eg_hrms_employee e on u.id=e.id inner join eg_hrms_assignment assign on e.uuid=assign.employeeid and assign.iscurrentassignment='true' - inner join message as msg on msg.code=concat('COMMON_MASTERS_DEPARTMENT_',assign.department) - inner join message as msg1 on msg1.code=concat('COMMON_MASTERS_DESIGNATION_',assign.designation) + inner join message as msg on msg.code=concat('COMMON_MASTERS_DEPARTMENT_',assign.department) and msg.locale=en_IN + inner join message as msg1 on msg1.code=concat('COMMON_MASTERS_DESIGNATION_',assign.designation) and msg1.locale=en_IN where u.type!='CITIZEN' orderby: ORDER BY u.tenantId asc From f6e70e45a9f6d20b30b6329351609b8f22861df5 Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Wed, 28 Jul 2021 16:36:17 +0530 Subject: [PATCH 0706/1242] Update hrms-reports.yml --- configs/reports/configs/hrms-reports.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/hrms-reports.yml b/configs/reports/configs/hrms-reports.yml index 8543a37b..aa3eeb5a 100644 --- a/configs/reports/configs/hrms-reports.yml +++ b/configs/reports/configs/hrms-reports.yml @@ -79,7 +79,7 @@ ReportDefinitions: from eg_user u inner join userroles r on u.id=r.user_id inner join eg_hrms_employee e on u.id=e.id inner join eg_hrms_assignment assign on e.uuid=assign.employeeid and assign.iscurrentassignment='true' - inner join message as msg on msg.code=concat('COMMON_MASTERS_DEPARTMENT_',assign.department) and msg.locale=en_IN - inner join message as msg1 on msg1.code=concat('COMMON_MASTERS_DESIGNATION_',assign.designation) and msg1.locale=en_IN + inner join message as msg on msg.code=concat('COMMON_MASTERS_DEPARTMENT_',assign.department) and msg.locale='en_IN' + inner join message as msg1 on msg1.code=concat('COMMON_MASTERS_DESIGNATION_',assign.designation) and msg1.locale='en_IN' where u.type!='CITIZEN' orderby: ORDER BY u.tenantId asc From 102e5adff6c42bff4b9e9b4535b37671b15f408b Mon Sep 17 00:00:00 2001 From: ramakrishnaippili Date: Fri, 30 Jul 2021 15:01:20 +0530 Subject: [PATCH 0707/1242] [PI-1708] Adding telemetry config for chatbot v2 --- configs/egov-indexer/chatbot-telemetry-v2.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 configs/egov-indexer/chatbot-telemetry-v2.yml diff --git a/configs/egov-indexer/chatbot-telemetry-v2.yml b/configs/egov-indexer/chatbot-telemetry-v2.yml new file mode 100644 index 00000000..20d0167a --- /dev/null +++ b/configs/egov-indexer/chatbot-telemetry-v2.yml @@ -0,0 +1,12 @@ +ServiceMaps: + serviceName: chatbot-messages + version: 1.0.0 + mappings: + - topic: chatbot-telemetry-v2 + configKey: INDEX + indexes: + - name: chatbot-messages-v2 + type: general + id: $.id + timeStampField: $.date + fieldsToBeMasked: [ "$.data.user", "$.data.message.input", "$.data.message.output" ] From f6aabd2528ff0ff4e6e29961fce5db1d311c7af4 Mon Sep 17 00:00:00 2001 From: ramakrishnaippili Date: Fri, 30 Jul 2021 15:06:52 +0530 Subject: [PATCH 0708/1242] [PI-1708] file rename --- .../{chatbot-telemetry-v2.yml => chatbot-telemetry-v2.yaml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename configs/egov-indexer/{chatbot-telemetry-v2.yml => chatbot-telemetry-v2.yaml} (100%) diff --git a/configs/egov-indexer/chatbot-telemetry-v2.yml b/configs/egov-indexer/chatbot-telemetry-v2.yaml similarity index 100% rename from configs/egov-indexer/chatbot-telemetry-v2.yml rename to configs/egov-indexer/chatbot-telemetry-v2.yaml From 8a2fe296f003b673600827d6367cdaed0212a42b Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Mon, 2 Aug 2021 15:51:32 +0530 Subject: [PATCH 0709/1242] Update bill-genie.yml --- configs/egov-searcher/bill-genie.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/egov-searcher/bill-genie.yml b/configs/egov-searcher/bill-genie.yml index a9262fc0..d3597137 100644 --- a/configs/egov-searcher/bill-genie.yml +++ b/configs/egov-searcher/bill-genie.yml @@ -95,7 +95,7 @@ SearchDefinitions: rowMapperKey: billsearch query: baseQuery: with bill_data as ( - SELECT b.id AS b_id, b.mobilenumber, + SELECT conn.property_id as pid,conn.oldConnectionNo as oldpid,conn.additionaldetails as conn_add,b.id AS b_id, b.mobilenumber, b.tenantid AS b_tenantid, b.payername AS b_payername, b.payeraddress AS b_payeraddress, b.payeremail AS b_payeremail, b.isactive AS b_isactive, b.iscancelled AS b_iscancelled, @@ -335,4 +335,4 @@ SearchDefinitions: output: jsonFormat: {"ResponseInfo": {},"Bills": []} outJsonPath: $.Bills - responseInfoPath: $.ResponseInfo \ No newline at end of file + responseInfoPath: $.ResponseInfo From 06cf0aaa41771595bbe2d7161dbbf83e5f5d8090 Mon Sep 17 00:00:00 2001 From: egovmis Date: Mon, 2 Aug 2021 15:53:34 +0530 Subject: [PATCH 0710/1242] changes for ws-bill-pdf --- configs/pdf-service/data-config/ws-bill.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/pdf-service/data-config/ws-bill.json b/configs/pdf-service/data-config/ws-bill.json index c3f66f6f..8a8db92c 100644 --- a/configs/pdf-service/data-config/ws-bill.json +++ b/configs/pdf-service/data-config/ws-bill.json @@ -459,7 +459,7 @@ { "variable": "oldConnectionNo", "value": { - "path": "$.additionalDetails.oldConnectionNo" + "path": "$.oldpid" } }, { "variable": "rate", @@ -470,7 +470,7 @@ { "variable": "ledgerId", "value": { - "path": "$.additionalDetails.ledgerId" + "path": "$.conn_add.ledgerId" } }, { @@ -795,7 +795,7 @@ }, { "path": "http://property-services.egov:8080/property-services/property/_search", - "queryParam": "tenantId=$.tenantId,propertyIds=$.additionalDetails.propertyId", + "queryParam": "tenantId=$.tenantId,propertyIds=$.pid", "apiRequest": null, "responseMapping": [ { From 7d455091864d4f188b2696f5a0f8c05ffefc7cc4 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 3 Aug 2021 10:12:17 +0530 Subject: [PATCH 0711/1242] added defaulter report using new report tables new report tables are added to store dump of properties and reports are tried to be fetched from those tables to enhance the report performance --- configs/reports/configs/pt-reports.yml | 114 +++++++++++++++++++++++++ 1 file changed, 114 insertions(+) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 5d059fae..6f881dd2 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -5564,3 +5564,117 @@ ReportDefinitions: query: | select pt.propertyid as propertyid, u.name as ownername, u.guardian as guardianname, u.mobilenumber as mobileno, u.uuid as useruuid from eg_pt_property pt, eg_pt_owner po, eg_user u where pt.id=po.propertyid and po.userid=u.uuid and pt.tenantid=$tenantid orderby: ORDER BY pt.propertyid DESC NULLS LAST + + +- reportName: PT_DEFAULTER_REPORT_V2 + decryptionPathId: ULBDEFAULTERPTREPORT_V2 + summary: ULB_PT_DEFAULTER + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: propertyid + label: reports.pt.propertyId + type: string + source: pt + total: false + - name: oldpropertyid + label: reports.pt.oldpropertyId + type: string + source: pt + total: false + - name: businessname + label: reports.pt.busnessname + type: string + source: pt + total: false + - name: financialyear + label: reports.pt.financialyear + type: string + source: pt + total: false + - name: latestfy + label: reports.pt.latestfy + type: string + source: pt + total: false + - name: max_pt_tax + label: reports.pt.max_pt_tax + type: string + source: pt + total: true + - name: max_paid + label: reports.pt.max_paid + type: string + source: pt + total: true + - name: propertytype + label: reports.pt.propertytype + type: string + source: pt + total: false + - name: propertyusagetype + label: reports.pt.propertyusagetype + type: string + source: pt + total: false + - name: address + label: reports.pt.address + type: string + source: pt + total: false + - name: block + label: reports.pt.block + type: string + source: pt + total: false + - name: ownername + label: reports.pt.ownername + type: string + source: pt + total: false + - name: mobileno + label: reports.pt.mobileno + type: string + source: pt + total: false + searchParams: + query: | + with assessments as + ( + select + propertyid, + string_agg(concat(assessmentyears,'(Rs.',totalamount,')'),',') as fy, + max(assessmentyears) as latest_fy, + max(totalamount) as maxtotal, + max(propertytax) as max_pt_tax + from report_assessments + where tenantid=$tenantid + and propertyid not in (select propertyid from report_assessments where tenantid='pb.hoshiarpur' and assessmentyears ='2020-21') + group by propertyid + ), + owners as + ( + select + split_part(string_agg(ownername,','),',',1) as ownername, + split_part(string_agg(mobileNumber,','),',',1) as mobileNumber, + propertyid + from report_owners + group by propertyid + ) + select + assessments.propertyid as propertyid, + props.oldpropertyid as oldpropertyid, + props.firmbusinessname as businessname, + assessments.fy as financialyear, + assessments.latest_fy as latestfy, + assessments.max_pt_tax as max_pt_tax, + assessments.maxtotal as max_paid, + props.propertytype as propertytype, + propertyusagetype as propertyusagetype, + concat(address,' ',localityname) as address, + blockcode as block, + owners.ownername as ownername, + owners.mobileNumber as mobileno + from report_properties props + inner join assessments on assessments.propertyid=props.propertyid + inner join owners on owners.propertyid=props.propertyid From 14d521652c781186f0120fadc1ef59f88eebdfe3 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 3 Aug 2021 15:05:55 +0530 Subject: [PATCH 0712/1242] Update pt-reports.yml --- configs/reports/configs/pt-reports.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 6f881dd2..21409303 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -5637,7 +5637,6 @@ ReportDefinitions: type: string source: pt total: false - searchParams: query: | with assessments as ( From 07bfc45dc12e7ad148b94583e874cd66ec093b1c Mon Sep 17 00:00:00 2001 From: egovmis Date: Tue, 3 Aug 2021 15:11:01 +0530 Subject: [PATCH 0713/1242] changes for wnS bill --- configs/pdf-service/data-config/ws-bill.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/pdf-service/data-config/ws-bill.json b/configs/pdf-service/data-config/ws-bill.json index 8a8db92c..520b4ef1 100644 --- a/configs/pdf-service/data-config/ws-bill.json +++ b/configs/pdf-service/data-config/ws-bill.json @@ -459,7 +459,7 @@ { "variable": "oldConnectionNo", "value": { - "path": "$.oldpid" + "path": "$.connection.oldConnectionNo" } }, { "variable": "rate", @@ -470,7 +470,7 @@ { "variable": "ledgerId", "value": { - "path": "$.conn_add.ledgerId" + "path": "$.connection.additionalDetails.ledgerId" } }, { @@ -795,7 +795,7 @@ }, { "path": "http://property-services.egov:8080/property-services/property/_search", - "queryParam": "tenantId=$.tenantId,propertyIds=$.pid", + "queryParam": "tenantId=$.tenantId,propertyIds=$.connection.propertyId", "apiRequest": null, "responseMapping": [ { From 3a0f629d3d70ff9257621a1428e6b2ffa195df34 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 3 Aug 2021 15:27:09 +0530 Subject: [PATCH 0714/1242] removed hardcoded pb.hoshiarpur --- configs/reports/configs/pt-reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 21409303..3eaa53cd 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -5648,7 +5648,7 @@ ReportDefinitions: max(propertytax) as max_pt_tax from report_assessments where tenantid=$tenantid - and propertyid not in (select propertyid from report_assessments where tenantid='pb.hoshiarpur' and assessmentyears ='2020-21') + and propertyid not in (select propertyid from report_assessments where tenantid=$tenantid and assessmentyears ='2020-21') group by propertyid ), owners as From e3d796521af4464394918fa639e0822160200d7c Mon Sep 17 00:00:00 2001 From: egovmis Date: Wed, 4 Aug 2021 13:36:58 +0530 Subject: [PATCH 0715/1242] mobile number for PT receipt --- .../pdf-service/data-config/property-receipt.json | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index d402165c..0952a0d7 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -752,11 +752,14 @@ "variable":"oldPropertyId", "value":"$.Properties[0].oldPropertyId" }, - { + { "variable":"surveyId", "value":"$.Properties[0].surveyId" }, - + { + "variable":"ownerMobileNumber", + "value":"$.Properties[0].owners[?(@.active== true && @.status== 'ACTIVE')].mobileNumber" + }, { "variable": "var_owners", "value":"$.Properties[0].owners[?(@.active== true && @.status== 'ACTIVE')]", @@ -771,11 +774,7 @@ { "variable":"fatherOrHusbandName2", "value":"fatherOrHusbandName" - }, - { - "variable":"ownerMobileNumber", - "value":"mobileNumber" - } + } ] } }, From 25d0c79cdfd2ccad67d9bd0c799ca9d8c21b8f3a Mon Sep 17 00:00:00 2001 From: egovmis Date: Wed, 4 Aug 2021 13:58:34 +0530 Subject: [PATCH 0716/1242] mobile number for PT receipt --- configs/pdf-service/data-config/property-receipt.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index 0952a0d7..b9e348c5 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -639,7 +639,7 @@ { "externalAPI": [ { - "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "path": "http://localhost:8077/egov-mdms-service/v1/_get", "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", "apiRequest": null, "responseMapping":[ @@ -680,7 +680,7 @@ ] }, { - "path": "http://property-services.egov:8080/property-services/property/_search", + "path": "http://localhost:8078/property-services/property/_search", "queryParam": "propertyIds=$.paymentDetails[0].bill.consumerCode,tenantId=$.tenantId", "apiRequest": null, "responseMapping":[ @@ -758,7 +758,7 @@ }, { "variable":"ownerMobileNumber", - "value":"$.Properties[0].owners[?(@.active== true && @.status== 'ACTIVE')].mobileNumber" + "value":"$.Properties[0].owners[?(@.status== 'ACTIVE')].mobileNumber" }, { "variable": "var_owners", @@ -838,7 +838,7 @@ ] }, { - "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "path": "http://localhost:8077/egov-mdms-service/v1/_get", "queryParam": "moduleName=tenant&masterName=footer&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}' %26%26 @.service=='{$.paymentDetails[0].businessService}')%5D", "apiRequest": null, "responseMapping":[ From 36bb2e28f1aa73b5adf69568126adf816ffcef7d Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Mon, 9 Aug 2021 10:17:56 +0530 Subject: [PATCH 0717/1242] Update property-receipt.json --- configs/pdf-service/data-config/property-receipt.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index b9e348c5..dd3dff6a 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -639,7 +639,7 @@ { "externalAPI": [ { - "path": "http://localhost:8077/egov-mdms-service/v1/_get", + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", "apiRequest": null, "responseMapping":[ @@ -680,7 +680,7 @@ ] }, { - "path": "http://localhost:8078/property-services/property/_search", + "path": "http://property-services.egov:8080/property-services/property/_search", "queryParam": "propertyIds=$.paymentDetails[0].bill.consumerCode,tenantId=$.tenantId", "apiRequest": null, "responseMapping":[ @@ -838,7 +838,7 @@ ] }, { - "path": "http://localhost:8077/egov-mdms-service/v1/_get", + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", "queryParam": "moduleName=tenant&masterName=footer&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}' %26%26 @.service=='{$.paymentDetails[0].businessService}')%5D", "apiRequest": null, "responseMapping":[ From f9ba0530e6b6111bd058f1e4cd48a2fad4a64517 Mon Sep 17 00:00:00 2001 From: egovmis Date: Mon, 16 Aug 2021 15:39:00 +0530 Subject: [PATCH 0718/1242] changes for bill periood on TL Receipt --- .../data-config/tradelicense-receipt.json | 24 ++++++++----------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/configs/pdf-service/data-config/tradelicense-receipt.json b/configs/pdf-service/data-config/tradelicense-receipt.json index adfd3449..68888dfb 100644 --- a/configs/pdf-service/data-config/tradelicense-receipt.json +++ b/configs/pdf-service/data-config/tradelicense-receipt.json @@ -116,20 +116,6 @@ "value": { "path": "$.paymentDetails[0].totalAmountPaid" } - }, - { - "variable": "fromPeriod", - "value": { - "path": "$.paymentDetails[0].bill.billDetails[0].fromPeriod" - }, - "type": "date" - }, - { - "variable": "toPeriod", - "value": { - "path": "$.paymentDetails[0].bill.billDetails[0].toPeriod" - }, - "type": "date" }, { "variable": "chequeNo", @@ -559,6 +545,16 @@ "variable":"financialYear", "value":"$.Licenses[0].financialYear" }, + { + "variable": "fromPeriod", + "value": "$.Licenses[0].validFrom", + "type": "date" + }, + { + "variable": "toPeriod", + "value": "$.Licenses[0].validTo", + "type": "date" + }, { "variable":"tradeName", "value":"$.Licenses[0].tradeName" From 42a4d79dbd1ed6db4f74660627288e87ea207dd7 Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov Date: Tue, 24 Aug 2021 11:08:12 +0530 Subject: [PATCH 0719/1242] [PI-1761]-W&S combined pdf feature from product --- configs/egov-searcher/bill-genie.yml | 7 ++++ configs/egov-searcher/sewerageopensearch.yml | 41 ++++++++++++++++++++ configs/egov-searcher/wateropensearch.yml | 41 ++++++++++++++++++++ 3 files changed, 89 insertions(+) create mode 100644 configs/egov-searcher/sewerageopensearch.yml create mode 100644 configs/egov-searcher/wateropensearch.yml diff --git a/configs/egov-searcher/bill-genie.yml b/configs/egov-searcher/bill-genie.yml index d3597137..ee71ee7a 100644 --- a/configs/egov-searcher/bill-genie.yml +++ b/configs/egov-searcher/bill-genie.yml @@ -166,6 +166,10 @@ SearchDefinitions: - name: b.status isMandatory: false jsonPath: $.searchCriteria.billActive + - name: conn.property_id + isMandatory: false + jsonPath: $.searchCriteria.propertyId + output: jsonFormat: {"ResponseInfo": {},"Bills": []} @@ -251,6 +255,9 @@ SearchDefinitions: - name: b.status isMandatory: false jsonPath: $.searchCriteria.billActive + - name: conn.property_id + isMandatory: false + jsonPath: $.searchCriteria.propertyId output: jsonFormat: {"ResponseInfo": {},"Bills": []} diff --git a/configs/egov-searcher/sewerageopensearch.yml b/configs/egov-searcher/sewerageopensearch.yml new file mode 100644 index 00000000..4644baeb --- /dev/null +++ b/configs/egov-searcher/sewerageopensearch.yml @@ -0,0 +1,41 @@ +SearchDefinitions: + moduleName: sewerage-services + summary: Sewerage Services Open API + version: 1.0.0 + definitions: + - name: sewerageopensearch + query: + baseQuery: Select row_to_json(result) from + ( + select sewerage.applicationtype, sewerage.applicationno, sewerage.connectionno, sewerage.locality, sewerage.createdtime, sewerage.applicationstatus, sewerage.status, sewerage.property_id from eg_sw_connection as sewerage + INNER JOIN eg_pt_property pt ON pt.propertyid = sewerage.property_id $where + ) result + groupBy: + orderBy: + searchParams: + condition: AND + params: + - name: sewerage.tenantid + isMandatory: true + jsonPath: $.searchCriteria.tenantId + - name: pt.propertyid + isMandatory: false + jsonPath: $.searchCriteria.propertyId + - name: sewerage.applicationno + isMandatory: false + jsonPath: $.searchCriteria.applicationno + - name: sewerage.connectionno + isMandatory: false + jsonPath: $.searchCriteria.connectionno + - name: sewerage.property_id + isMandatory: false + jsonPath: $.searchCriteria.uuid + - name: sewerage.locality + isMandatory: true + jsonPath: $.searchCriteria.locality + + + output: + jsonFormat: {"ResponseInfo": {},"SewerageConnections": []} + outJsonPath: $.SewerageConnections + responseInfoPath: $.ResponseInfo diff --git a/configs/egov-searcher/wateropensearch.yml b/configs/egov-searcher/wateropensearch.yml new file mode 100644 index 00000000..44c90862 --- /dev/null +++ b/configs/egov-searcher/wateropensearch.yml @@ -0,0 +1,41 @@ +SearchDefinitions: + moduleName: water-services + summary: Water Services Open API + version: 1.0.0 + definitions: + - name: wateropensearch + query: + baseQuery: Select row_to_json(result) from + ( + select water.applicationtype, water.applicationno, water.connectionno, water.locality, water.createdtime, water.applicationstatus, water.status, water.property_id from eg_ws_connection as water + INNER JOIN eg_pt_property pt ON pt.propertyid = water.property_id $where + ) result + groupBy: + orderBy: + searchParams: + condition: AND + params: + - name: water.tenantid + isMandatory: true + jsonPath: $.searchCriteria.tenantId + - name: pt.propertyid + isMandatory: false + jsonPath: $.searchCriteria.propertyId + - name: water.applicationno + isMandatory: false + jsonPath: $.searchCriteria.applicationno + - name: water.connectionno + isMandatory: false + jsonPath: $.searchCriteria.connectionno + - name: water.property_id + isMandatory: false + jsonPath: $.searchCriteria.uuid + - name: water.locality + isMandatory: true + jsonPath: $.searchCriteria.locality + + + output: + jsonFormat: {"ResponseInfo": {},"WaterConnection": []} + outJsonPath: $.WaterConnection + responseInfoPath: $.ResponseInfo From 0a66706435a314fa8664365c600081d9e5d19533 Mon Sep 17 00:00:00 2001 From: poonam1512 Date: Tue, 24 Aug 2021 12:31:46 +0530 Subject: [PATCH 0720/1242] Changes for Ownership percentage on PT receipt --- configs/pdf-service/data-config/property-receipt.json | 6 +++++- configs/pdf-service/format-config/property-receipt.json | 4 +++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index dd3dff6a..81f38503 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -774,7 +774,11 @@ { "variable":"fatherOrHusbandName2", "value":"fatherOrHusbandName" - } + }, + { + "variable":"ownerShipPercentage", + "value":"ownerShipPercentage" + } ] } }, diff --git a/configs/pdf-service/format-config/property-receipt.json b/configs/pdf-service/format-config/property-receipt.json index f30dc44b..4786b0ea 100644 --- a/configs/pdf-service/format-config/property-receipt.json +++ b/configs/pdf-service/format-config/property-receipt.json @@ -857,12 +857,14 @@ "style": "next-noc-table", "table": { "widths": [ + "*", + "*", "*", "*", "*", "*" ], - "body": ["{{#var_owners}}[{\"text\":\"Owner Name\",\"border\":[true,true,false,true],\"style\":\"receipt-table-key\"},{\"text\":\"{{name2}}\",\"border\":[false,true,true,true]},{\"text\":\"Father/Husband Name\",\"border\":[true,true,false,true],\"style\":\"receipt-table-key\"},{\"text\":\"{{fatherOrHusbandName2}}\",\"border\":[false,true,true,true]}]{{/var_owners}}"] + "body": ["{{#var_owners}}[{\"text\":\"Owner Name\",\"border\":[true,true,false,true],\"style\":\"receipt-table-key\"},{\"text\":\"{{name2}}\",\"border\":[false,true,true,true]},{\"text\":\"Father/Husband Name\",\"border\":[true,true,false,true],\"style\":\"receipt-table-key\"},{\"text\":\"{{fatherOrHusbandName2}}\",\"border\":[false,true,true,true]},{\"text\":\"Ownership Percentage\",\"border\":[true,true,false,true],\"style\":\"receipt-table-key\"},{\"text\":\"{{ownerShipPercentage}}\",\"border\":[false,true,true,true]}]{{/var_owners}}"] }, "layout": {} }, { From f1bff322fe0ff7c617e2aaafb1b77fca051d5d7b Mon Sep 17 00:00:00 2001 From: arorakamal <37300574+arorakamal@users.noreply.github.com> Date: Tue, 24 Aug 2021 15:49:24 +0530 Subject: [PATCH 0721/1242] Add pb.handiaya condition Razorpay in line 1043 --- rainmaker-custom-service/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rainmaker-custom-service/index.js b/rainmaker-custom-service/index.js index 45271068..b11aa20d 100644 --- a/rainmaker-custom-service/index.js +++ b/rainmaker-custom-service/index.js @@ -1040,7 +1040,7 @@ router.post('/protected/punjab-pt/pre-hook/pg-service/transaction/v1/_create', a request['Transaction']['callbackUrl'] = url.format(url_callback); } - else if (request['Transaction']['tenantId'] == 'pb.amritsar' || request['Transaction']['tenantId'] == 'pb.mohali' || request['Transaction']['tenantId'] == 'pb.hoshiarpur' || request['Transaction']['tenantId'] == 'pb.kapurthala' || request['Transaction']['tenantId'] == 'pb.khanna' || request['Transaction']['tenantId'] == 'pb.moga' || request['Transaction']['tenantId'] == 'pb.mandigobindgarh') { + else if (request['Transaction']['tenantId'] == 'pb.amritsar' || request['Transaction']['tenantId'] == 'pb.mohali' || request['Transaction']['tenantId'] == 'pb.hoshiarpur' || request['Transaction']['tenantId'] == 'pb.kapurthala' || request['Transaction']['tenantId'] == 'pb.khanna' || request['Transaction']['tenantId'] == 'pb.moga' || request['Transaction']['tenantId'] == 'pb.mandigobindgarh'|| request['Transaction']['tenantId'] == 'pb.handiaya') { let original_callback = request['Transaction']['callbackUrl']; request['Transaction']['gateway'] = 'RAZORPAY' url_callback = url.parse(original_callback) From 1b7d6a9391d896e15d6fcde1df86b43effc6f69d Mon Sep 17 00:00:00 2001 From: poonam1512 Date: Tue, 24 Aug 2021 16:57:32 +0530 Subject: [PATCH 0722/1242] Changes for Ownership percentage on PT receipt --- configs/pdf-service/data-config/property-receipt.json | 6 +++--- configs/pdf-service/format-config/property-receipt.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index 81f38503..7122d653 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -639,7 +639,7 @@ { "externalAPI": [ { - "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "path": "http://localhost:8087/egov-mdms-service/v1/_get", "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", "apiRequest": null, "responseMapping":[ @@ -680,7 +680,7 @@ ] }, { - "path": "http://property-services.egov:8080/property-services/property/_search", + "path": "http://localhost:8088/property-services/property/_search", "queryParam": "propertyIds=$.paymentDetails[0].bill.consumerCode,tenantId=$.tenantId", "apiRequest": null, "responseMapping":[ @@ -842,7 +842,7 @@ ] }, { - "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "path": "http://localhost:8087/egov-mdms-service/v1/_get", "queryParam": "moduleName=tenant&masterName=footer&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}' %26%26 @.service=='{$.paymentDetails[0].businessService}')%5D", "apiRequest": null, "responseMapping":[ diff --git a/configs/pdf-service/format-config/property-receipt.json b/configs/pdf-service/format-config/property-receipt.json index 4786b0ea..fc664222 100644 --- a/configs/pdf-service/format-config/property-receipt.json +++ b/configs/pdf-service/format-config/property-receipt.json @@ -864,7 +864,7 @@ "*", "*" ], - "body": ["{{#var_owners}}[{\"text\":\"Owner Name\",\"border\":[true,true,false,true],\"style\":\"receipt-table-key\"},{\"text\":\"{{name2}}\",\"border\":[false,true,true,true]},{\"text\":\"Father/Husband Name\",\"border\":[true,true,false,true],\"style\":\"receipt-table-key\"},{\"text\":\"{{fatherOrHusbandName2}}\",\"border\":[false,true,true,true]},{\"text\":\"Ownership Percentage\",\"border\":[true,true,false,true],\"style\":\"receipt-table-key\"},{\"text\":\"{{ownerShipPercentage}}\",\"border\":[false,true,true,true]}]{{/var_owners}}"] + "body": ["{{#var_owners}}[{\"text\":\"Owner Name\",\"border\":[true,true,false,true],\"style\":\"receipt-table-key\"},{\"text\":\"{{name2}}\",\"border\":[false,true,true,true]},{\"text\":\"Father/Husband Name\",\"border\":[true,true,false,true],\"style\":\"receipt-table-key\"},{\"text\":\"{{fatherOrHusbandName2}}\",\"border\":[false,true,true,true]},{\"text\":\"Ownership %\",\"border\":[true,true,false,true],\"style\":\"receipt-table-key\"},{\"text\":\"{{ownerShipPercentage}}\",\"border\":[false,true,true,true]}]{{/var_owners}}"] }, "layout": {} }, { From 1e9de2ea14acf0fe3086fe524ff6db545000ffc9 Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Wed, 25 Aug 2021 11:33:43 +0530 Subject: [PATCH 0723/1242] changing in PT receipt regarding change in ports of APIs --- configs/pdf-service/data-config/property-receipt.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index 7122d653..81f38503 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -639,7 +639,7 @@ { "externalAPI": [ { - "path": "http://localhost:8087/egov-mdms-service/v1/_get", + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", "apiRequest": null, "responseMapping":[ @@ -680,7 +680,7 @@ ] }, { - "path": "http://localhost:8088/property-services/property/_search", + "path": "http://property-services.egov:8080/property-services/property/_search", "queryParam": "propertyIds=$.paymentDetails[0].bill.consumerCode,tenantId=$.tenantId", "apiRequest": null, "responseMapping":[ @@ -842,7 +842,7 @@ ] }, { - "path": "http://localhost:8087/egov-mdms-service/v1/_get", + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", "queryParam": "moduleName=tenant&masterName=footer&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}' %26%26 @.service=='{$.paymentDetails[0].businessService}')%5D", "apiRequest": null, "responseMapping":[ From 7bf4bff6abeccab85a4ca13101bde36f9e216528 Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Wed, 25 Aug 2021 14:20:00 +0530 Subject: [PATCH 0724/1242] adding 5th row in dss overview --- .../MasterDashboardConfig.json | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json index d297a189..71e302ef 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json @@ -282,9 +282,47 @@ "headers": [] } ] + }, + { + "row": 5, + "name": "DSS_REVENUE", + "vizArray": [ + { + "id": 151, + "name": "DSS_PT_TAX_HEAD", + "dimensions": { + "height": 350, + "width": 12 + }, + "vizType": "chart", + "label": "", + "noUnit": false, + "isCollapsible": true, + "charts": [ + { + "id": "taxHeadsBreakupDDRRevenue", + "name": "DSS_PT_TAX_HEAD_BREAKUP_REVENUE", + "code": "", + "chartType": "table", + "filter": "", + "headers": [], + "tabName": "Boundary" + }, + { + "id": "taxHeadsBreakupUsage", + "name": "DSS_PT_TAX_HEAD_BREAKUP_USAGE", + "code": "", + "chartType": "table", + "filter": "", + "headers": [], + "tabName": "Usage" + } + ] } ] } + ] + } ] }, { From ce9bc33329d4dcb7cedc44592ec6d38a004e1607 Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Wed, 25 Aug 2021 14:50:31 +0530 Subject: [PATCH 0725/1242] removed 5th row from overview --- .../MasterDashboardConfig.json | 36 +------------------ 1 file changed, 1 insertion(+), 35 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json index 71e302ef..005e87d5 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json @@ -282,41 +282,7 @@ "headers": [] } ] - }, - { - "row": 5, - "name": "DSS_REVENUE", - "vizArray": [ - { - "id": 151, - "name": "DSS_PT_TAX_HEAD", - "dimensions": { - "height": 350, - "width": 12 - }, - "vizType": "chart", - "label": "", - "noUnit": false, - "isCollapsible": true, - "charts": [ - { - "id": "taxHeadsBreakupDDRRevenue", - "name": "DSS_PT_TAX_HEAD_BREAKUP_REVENUE", - "code": "", - "chartType": "table", - "filter": "", - "headers": [], - "tabName": "Boundary" - }, - { - "id": "taxHeadsBreakupUsage", - "name": "DSS_PT_TAX_HEAD_BREAKUP_USAGE", - "code": "", - "chartType": "table", - "filter": "", - "headers": [], - "tabName": "Usage" - } + } ] } ] From 7aa72e480dacef77176778fcf82a07f1e84ae2f6 Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Wed, 25 Aug 2021 16:16:28 +0530 Subject: [PATCH 0726/1242] Update MasterDashboardConfig.json --- .../MasterDashboardConfig.json | 128 +++++------------- 1 file changed, 37 insertions(+), 91 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json index 005e87d5..6b5c2d28 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json @@ -1,5 +1,5 @@ { - "_comment": "Master dashboard which holds all the possible visualisation. Note new dashboards/visualisations can be added ", + "_comment": "Master dashboard which holds all the possible visualisation. Note new dashboards/visualisations can be added", "dashboards": [ { "name": "DSS_OVERVIEW_DASHBOARD", @@ -22,9 +22,7 @@ "name": "DSS_TOTAL_COLLECTION_TODAY", "code": "", "chartType": "", - "filter": { - "title": "TODAY" - }, + "filter": {"title": "TODAY"}, "headers": [] }, { @@ -283,10 +281,6 @@ } ] } - ] - } - ] - } ] } ] @@ -313,14 +307,13 @@ "isCollapsible": false, "label": "DSS_OVERVIEW", "charts": [ + { "id": "todaysCollection", "name": "DSS_TOTAL_COLLECTION_TODAY", "code": "", "chartType": "metric", - "filter": { - "title": "TODAY" - }, + "filter": {"title": "TODAY"}, "headers": [] }, { @@ -364,7 +357,7 @@ "id": "cumulativeCollection", "name": "Monthly", "code": "", - "chartType": "bar", + "chartType": "line", "filter": "", "headers": [] } @@ -381,7 +374,7 @@ "name": "DSS_PT_TOP_3_PERFORMING_ULBS", "dimensions": { "height": 250, - "width": 3 + "width": 4 }, "vizType": "performing-metric", "noUnit": false, @@ -403,7 +396,7 @@ "name": "DSS_PT_BOTTOM_3_PERFORMING_ULBS", "dimensions": { "height": 250, - "width": 3 + "width": 4 }, "vizType": "performing-metric", "noUnit": false, @@ -418,19 +411,13 @@ "headers": [] } ] - } - ] - }, - { - "row": 3, - "name": "DSS_REVENUE", - "vizArray": [ + }, { - "id": 231, + "id": 223, "name": "DSS_PT_COLLECTION_BY_USAGE_TYPE", "dimensions": { "height": 250, - "width": 3 + "width": 4 }, "vizType": "chart", "noUnit": true, @@ -445,36 +432,15 @@ "headers": [] } ] - }, - { - "id": 232, - "name": "DSS_PT_COLLECTION_BY_PAYMENT_MODE", - "dimensions": { - "height": 250, - "width": 3 - }, - "vizType": "chart", - "noUnit": true, - "isCollapsible": false, - "charts": [ - { - "id": "collectionByPaymentMode", - "name": "DSS_PT_COLLECTION_BY_PAYMENT_MODE", - "code": "", - "chartType": "donut", - "filter": "", - "headers": [] - } - ] } ] }, { - "row": 4, + "row": 3, "name": "DSS_REVENUE", "vizArray": [ { - "id": 241, + "id": 231, "name": "DSS_PT_KEY_FY_INDICATORS", "dimensions": { "height": 350, @@ -507,11 +473,11 @@ ] }, { - "row": 5, + "row": 4, "name": "DSS_REVENUE", "vizArray": [ { - "id": 251, + "id": 231, "name": "DSS_PT_TAX_HEAD", "dimensions": { "height": 350, @@ -545,11 +511,11 @@ ] }, { - "row": 6, + "row": 5, "name": "DSS_SERVICE", "vizArray": [ { - "id": 261, + "id": 241, "name": "DSS_OVERVIEW", "dimensions": { "height": 350, @@ -586,7 +552,7 @@ ] }, { - "id": 262, + "id": 242, "name": "DSS_PT_CUMULATIVE_PROPERTIES_ASSESSED", "dimensions": { "height": 350, @@ -608,11 +574,11 @@ ] }, { - "row": 7, + "row": 6, "name": "DSS_SERVICE", "vizArray": [ { - "id": 271, + "id": 251, "name": "DSS_PT_TOP_3_PERFORMING_ULBS", "dimensions": { "height": 250, @@ -633,7 +599,7 @@ ] }, { - "id": 272, + "id": 252, "name": "DSS_PT_BOTTOM_3_PERFORMING_ULBS", "dimensions": { "height": 250, @@ -653,7 +619,7 @@ ] }, { - "id": 273, + "id": 253, "name": "DSS_PT_PROPERTIES_BY_USAGE_TYPE", "dimensions": { "height": 250, @@ -732,9 +698,7 @@ "name": "DSS_TOTAL_COLLECTION_TODAY", "code": "", "chartType": "metric", - "filter": { - "title": "TODAY" - }, + "filter": {"title": "TODAY"}, "headers": [] }, { @@ -1073,6 +1037,7 @@ "filter": "", "headers": [], "tabName": "Boundary" + } ] } @@ -1272,6 +1237,7 @@ } ] } + ] }, { @@ -1551,6 +1517,7 @@ } ] }, + { "name": "DSS_PGR_DASHBOARD", "id": "ulb-pgr", @@ -1743,6 +1710,7 @@ } ] } + ] }, { @@ -1859,9 +1827,7 @@ "name": "DSS_TOTAL_COLLECTION_TODAY", "code": "", "chartType": "metric", - "filter": { - "title": "TODAY" - }, + "filter": {"title": "TODAY"}, "headers": [] }, { @@ -1922,7 +1888,7 @@ "name": "DSS_PT_TOP_3_PERFORMING_ULBS", "dimensions": { "height": 250, - "width": 3 + "width": 4 }, "vizType": "performing-metric", "noUnit": false, @@ -1944,7 +1910,7 @@ "name": "DSS_PT_BOTTOM_3_PERFORMING_ULBS", "dimensions": { "height": 250, - "width": 3 + "width": 4 }, "vizType": "performing-metric", "noUnit": false, @@ -1965,7 +1931,7 @@ "name": "DSS_PT_COLLECTION_BY_USAGE_TYPE", "dimensions": { "height": 250, - "width": 3 + "width": 4 }, "vizType": "chart", "noUnit": true, @@ -1980,27 +1946,6 @@ "headers": [] } ] - }, - { - "id": 224, - "name": "DSS_PT_COLLECTION_BY_PAYMENT_MODE", - "dimensions": { - "height": 250, - "width": 3 - }, - "vizType": "chart", - "noUnit": true, - "isCollapsible": false, - "charts": [ - { - "id": "collectionByPaymentMode", - "name": "DSS_PT_COLLECTION_BY_PAYMENT_MODE", - "code": "", - "chartType": "donut", - "filter": "", - "headers": [] - } - ] } ] }, @@ -2267,9 +2212,7 @@ "name": "DSS_TOTAL_COLLECTION_TODAY", "code": "", "chartType": "metric", - "filter": { - "title": "TODAY" - }, + "filter": {"title": "TODAY"}, "headers": [] }, { @@ -2608,6 +2551,7 @@ "filter": "", "headers": [], "tabName": "Boundary" + } ] } @@ -2636,9 +2580,7 @@ "name": "DSS_TOTAL_COLLECTION_TODAY", "code": "", "chartType": "", - "filter": { - "title": "TODAY" - }, + "filter": {"title": "TODAY"}, "headers": [] }, { @@ -3061,6 +3003,7 @@ } ] }, + { "name": "DSS_W&S_DASHBOARD", "id": "ws", @@ -3465,6 +3408,7 @@ } ] } + ] } ] @@ -3873,9 +3817,11 @@ } ] } + ] } ] } ] } + From fe626c06656e914d53b2738786ad1559494291c1 Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Wed, 25 Aug 2021 16:47:14 +0530 Subject: [PATCH 0727/1242] Update MasterDashboardConfig.json --- .../MasterDashboardConfig.json | 40 ++++++++++++++++--- 1 file changed, 34 insertions(+), 6 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json index 6b5c2d28..4a059fe1 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json @@ -147,10 +147,38 @@ }, { "row": 3, + "name": "DSS_REVENUE", + "vizArray": [ + { + "id": 131, + "name": "DSS_TOP_PERFORMING_ULBS", + "dimensions": { + "height": 250, + "width": 4 + }, + "vizType": "performing-metric", + "noUnit": false, + "isCollapsible": false, + "label": "", + "charts": [ + { + "id": "topPerformingUlbs", + "name": "DSS_TOP_PERFORMING_ULBS", + "code": "", + "chartType": "bar", + "filter": "", + "headers": [] + } + ] + } + ] + }, + { + "row": 4, "name": "DSS_SERVICE", "vizArray": [ { - "id": 131, + "id": 141, "name": "DSS_OVERVIEW", "dimensions": { "height": 450, @@ -195,7 +223,7 @@ ] }, { - "id": 132, + "id": 142, "name": "DSS_TOTAL_APPLICATION_&_CLOSED_APPLICATION", "dimensions": { "height": 450, @@ -217,11 +245,11 @@ ] }, { - "row": 4, + "row": 5, "name": "DSS_SERVICE", "vizArray": [ { - "id": 141, + "id": 151, "name": "DSS_TOP_PERFORMING_ULBS", "dimensions": { "height": 250, @@ -242,7 +270,7 @@ ] }, { - "id": 142, + "id": 152, "name": "DSS_BOTTOM_PERFORMING_ULBS", "dimensions": { "height": 250, @@ -262,7 +290,7 @@ ] }, { - "id": 143, + "id": 153, "name": "DSS_TOTAL_APPLICATIONS:_DEPARTMENT_WISE", "dimensions": { "height": 250, From 43a1ffd91662a078b7d64ae1f8f8c0d8cbde3917 Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Thu, 26 Aug 2021 09:42:30 +0530 Subject: [PATCH 0728/1242] Update MasterDashboardConfig.json --- .../dashboard-analytics/MasterDashboardConfig.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json index 4a059fe1..b15bda06 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json @@ -108,7 +108,7 @@ "height": 250, "width": 4 }, - "vizType": "performing-metric", + "vizType": "chart", "noUnit": false, "isCollapsible": false, "charts": [ @@ -116,9 +116,10 @@ "id": "bottomPerformingUlbs", "name": "DSS_BOTTOM_PERFORMING_ULBS", "code": "", - "chartType": "bar", + "chartType": "table", "filter": "", - "headers": [] + "headers": [], + "tabName":"Boundary" } ] }, From 4c69ff1d641751e0484d5dec43cb65dd97a47e9f Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Thu, 26 Aug 2021 11:47:18 +0530 Subject: [PATCH 0729/1242] Update MasterDashboardConfig.json --- .../dashboard-analytics/MasterDashboardConfig.json | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json index b15bda06..4a059fe1 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json @@ -108,7 +108,7 @@ "height": 250, "width": 4 }, - "vizType": "chart", + "vizType": "performing-metric", "noUnit": false, "isCollapsible": false, "charts": [ @@ -116,10 +116,9 @@ "id": "bottomPerformingUlbs", "name": "DSS_BOTTOM_PERFORMING_ULBS", "code": "", - "chartType": "table", + "chartType": "bar", "filter": "", - "headers": [], - "tabName":"Boundary" + "headers": [] } ] }, From e84f0580258b9d8f12ffd76218901734b9534b9e Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Thu, 26 Aug 2021 15:10:58 +0530 Subject: [PATCH 0730/1242] Update MasterDashboardConfig.json --- .../MasterDashboardConfig.json | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json index 4a059fe1..826cf940 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json @@ -151,24 +151,24 @@ "vizArray": [ { "id": 131, - "name": "DSS_TOP_PERFORMING_ULBS", + "name": "DSS_PT_KEY_FY_INDICATORS", "dimensions": { - "height": 250, - "width": 4 + "height": 350, + "width": 12 }, - "vizType": "performing-metric", - "noUnit": false, - "isCollapsible": false, - "label": "", + "vizType": "chart", + "noUnit": false, + "isCollapsible": false, "charts": [ - { - "id": "topPerformingUlbs", - "name": "DSS_TOP_PERFORMING_ULBS", - "code": "", - "chartType": "bar", - "filter": "", - "headers": [] - } + { + "id": "demandCollectionIndexDDRRevenue", + "name": "DSS_PT_DEMAND_COLLECTION_BOUNDARY", + "code": "", + "chartType": "table", + "filter": "", + "headers": [], + "tabName": "Boundary" + } ] } ] From e4479a60a693dcbc397b115485f9784860bbfa08 Mon Sep 17 00:00:00 2001 From: Rahul Sharma Date: Tue, 31 Aug 2021 15:29:50 +0530 Subject: [PATCH 0731/1242] Update index.js testing 1043 line no --- rainmaker-custom-service/index.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/rainmaker-custom-service/index.js b/rainmaker-custom-service/index.js index b11aa20d..a77c07f9 100644 --- a/rainmaker-custom-service/index.js +++ b/rainmaker-custom-service/index.js @@ -1040,8 +1040,9 @@ router.post('/protected/punjab-pt/pre-hook/pg-service/transaction/v1/_create', a request['Transaction']['callbackUrl'] = url.format(url_callback); } - else if (request['Transaction']['tenantId'] == 'pb.amritsar' || request['Transaction']['tenantId'] == 'pb.mohali' || request['Transaction']['tenantId'] == 'pb.hoshiarpur' || request['Transaction']['tenantId'] == 'pb.kapurthala' || request['Transaction']['tenantId'] == 'pb.khanna' || request['Transaction']['tenantId'] == 'pb.moga' || request['Transaction']['tenantId'] == 'pb.mandigobindgarh'|| request['Transaction']['tenantId'] == 'pb.handiaya') { - let original_callback = request['Transaction']['callbackUrl']; + // else if (request['Transaction']['tenantId'] == 'pb.amritsar' || request['Transaction']['tenantId'] == 'pb.mohali' || request['Transaction']['tenantId'] == 'pb.hoshiarpur' || request['Transaction']['tenantId'] == 'pb.kapurthala' || request['Transaction']['tenantId'] == 'pb.khanna' || request['Transaction']['tenantId'] == 'pb.moga' || request['Transaction']['tenantId'] == 'pb.mandigobindgarh'|| request['Transaction']['tenantId'] == 'pb.handiaya') { + else { + let original_callback = request['Transaction']['callbackUrl']; request['Transaction']['gateway'] = 'RAZORPAY' url_callback = url.parse(original_callback) url_callback.query = url_callback.query || {}; From 85b094846955b9384a1f4cbca30b8612f237f28a Mon Sep 17 00:00:00 2001 From: poonam1512 Date: Thu, 2 Sep 2021 11:52:26 +0530 Subject: [PATCH 0732/1242] adding type of owner with percentage --- configs/pdf-service/data-config/property-receipt.json | 6 +++++- configs/pdf-service/format-config/property-receipt.json | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index 81f38503..adc8c40b 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -778,7 +778,11 @@ { "variable":"ownerShipPercentage", "value":"ownerShipPercentage" - } + }, + { + "variable":"ownerType", + "value":"ownerType" + } ] } }, diff --git a/configs/pdf-service/format-config/property-receipt.json b/configs/pdf-service/format-config/property-receipt.json index fc664222..dc29ca9f 100644 --- a/configs/pdf-service/format-config/property-receipt.json +++ b/configs/pdf-service/format-config/property-receipt.json @@ -864,7 +864,7 @@ "*", "*" ], - "body": ["{{#var_owners}}[{\"text\":\"Owner Name\",\"border\":[true,true,false,true],\"style\":\"receipt-table-key\"},{\"text\":\"{{name2}}\",\"border\":[false,true,true,true]},{\"text\":\"Father/Husband Name\",\"border\":[true,true,false,true],\"style\":\"receipt-table-key\"},{\"text\":\"{{fatherOrHusbandName2}}\",\"border\":[false,true,true,true]},{\"text\":\"Ownership %\",\"border\":[true,true,false,true],\"style\":\"receipt-table-key\"},{\"text\":\"{{ownerShipPercentage}}\",\"border\":[false,true,true,true]}]{{/var_owners}}"] + "body": ["{{#var_owners}}[{\"text\":\"Owner Name\",\"border\":[true,true,false,true],\"style\":\"receipt-table-key\"},{\"text\":\"{{name2}}\",\"border\":[false,true,true,true]},{\"text\":\"Father/Husband Name\",\"border\":[true,true,false,true],\"style\":\"receipt-table-key\"},{\"text\":\"{{fatherOrHusbandName2}}\",\"border\":[false,true,true,true]},{\"text\":\"Share % (Category)\",\"border\":[true,true,false,true],\"style\":\"receipt-table-key\"},{\"text\":\"{{ownerShipPercentage}} ({{ownerType}}) \",\"border\":[false,true,true,true]}]{{/var_owners}}"] }, "layout": {} }, { From f397e4a79a4f948b64f555552dc8b52c2a228521 Mon Sep 17 00:00:00 2001 From: poonam1512 Date: Thu, 2 Sep 2021 12:48:54 +0530 Subject: [PATCH 0733/1242] changing local=en_IN --- configs/pdf-service/data-config/property-receipt.json | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index adc8c40b..b70d7161 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -607,7 +607,8 @@ "localisation":{ "required":true, "prefix": null, - "module":"rainmaker-common" + "module":"rainmaker-common", + "locale":"en_IN" } }, { @@ -619,7 +620,8 @@ "localisation":{ "required":true, "prefix": null, - "module":"rainmaker-common" + "module":"rainmaker-common", + "locale":"en_IN" } } ] @@ -674,7 +676,8 @@ "localisation":{ "required":true, "prefix": "TENANT_TENANTS", - "module":"rainmaker-common" + "module":"rainmaker-common", + "locale":"en_IN" } } ] From e8148d333857fe9f23165ee99d4f9ef5514d1aa8 Mon Sep 17 00:00:00 2001 From: poonam1512 Date: Thu, 2 Sep 2021 15:09:00 +0530 Subject: [PATCH 0734/1242] localisation en_IN in pdf of PT --- .../data-config/property-receipt.json | 81 ++++++++++++------- 1 file changed, 54 insertions(+), 27 deletions(-) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index b70d7161..c4e8ec00 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -52,7 +52,8 @@ "localisation":{ "required":true, "prefix":"MODULE", - "module":"rainmaker-common" + "module":"rainmaker-common", + "locale":"en_IN" } }, { @@ -120,7 +121,8 @@ "localisation":{ "required":true, "prefix": "COMMON_MASTERS_PAYMENTMODE", - "module": "rainmaker-common" + "module": "rainmaker-common", + "locale":"en_IN" } }, { @@ -301,7 +303,8 @@ "localisation":{ "required":true, "prefix": null, - "module":"rainmaker-common" + "module":"rainmaker-common", + "locale":"en_IN" } }, { @@ -313,7 +316,8 @@ "localisation":{ "required":true, "prefix": null, - "module":"rainmaker-common" + "module":"rainmaker-common", + "locale":"en_IN" } }, { @@ -324,7 +328,8 @@ "localisation":{ "required":true, "prefix": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_CONSUMER_ID", - "module":"rainmaker-common" + "module":"rainmaker-common", + "locale":"en_IN" } }, { @@ -336,7 +341,8 @@ "localisation":{ "required":true, "prefix": null, - "module":"rainmaker-common" + "module":"rainmaker-common", + "locale":"en_IN" } }, { @@ -348,7 +354,8 @@ "localisation":{ "required":true, "prefix": null, - "module":"rainmaker-common" + "module":"rainmaker-common", + "locale":"en_IN" } }, { @@ -360,7 +367,8 @@ "localisation":{ "required":true, "prefix": null, - "module":"rainmaker-common" + "module":"rainmaker-common", + "locale":"en_IN" } }, { @@ -372,7 +380,8 @@ "localisation":{ "required":true, "prefix": null, - "module":"rainmaker-common" + "module":"rainmaker-common", + "locale":"en_IN" } }, { @@ -384,7 +393,8 @@ "localisation":{ "required":true, "prefix": null, - "module":"rainmaker-common" + "module":"rainmaker-common", + "locale":"en_IN" } }, { @@ -396,7 +406,8 @@ "localisation":{ "required":true, "prefix": null, - "module":"rainmaker-common" + "module":"rainmaker-common", + "locale":"en_IN" } }, { @@ -408,7 +419,8 @@ "localisation":{ "required":true, "prefix": null, - "module":"rainmaker-common" + "module":"rainmaker-common", + "locale":"en_IN" } }, { @@ -420,7 +432,8 @@ "localisation":{ "required":true, "prefix": null, - "module":"rainmaker-common" + "module":"rainmaker-common", + "locale":"en_IN" } }, { @@ -432,7 +445,8 @@ "localisation":{ "required":true, "prefix": null, - "module":"rainmaker-common" + "module":"rainmaker-common", + "locale":"en_IN" } }, { @@ -444,7 +458,8 @@ "localisation":{ "required":true, "prefix": null, - "module":"rainmaker-common" + "module":"rainmaker-common", + "locale":"en_IN" } }, { @@ -456,7 +471,8 @@ "localisation":{ "required":true, "prefix": null, - "module":"rainmaker-common" + "module":"rainmaker-common", + "locale":"en_IN" } }, { @@ -468,7 +484,8 @@ "localisation":{ "required":true, "prefix": null, - "module":"rainmaker-common" + "module":"rainmaker-common", + "locale":"en_IN" } }, { @@ -480,7 +497,8 @@ "localisation":{ "required":true, "prefix": null, - "module":"rainmaker-common" + "module":"rainmaker-common", + "locale":"en_IN" } }, { @@ -492,7 +510,8 @@ "localisation":{ "required":true, "prefix": null, - "module":"rainmaker-common" + "module":"rainmaker-common", + "locale":"en_IN" } }, { @@ -504,7 +523,8 @@ "localisation":{ "required":true, "prefix": null, - "module":"rainmaker-common" + "module":"rainmaker-common", + "locale":"en_IN" } }, { @@ -516,7 +536,8 @@ "localisation":{ "required":true, "prefix": null, - "module":"rainmaker-common" + "module":"rainmaker-common", + "locale":"en_IN" } }, { @@ -528,7 +549,8 @@ "localisation":{ "required":true, "prefix": null, - "module":"rainmaker-common" + "module":"rainmaker-common", + "locale":"en_IN" } }, { @@ -719,7 +741,8 @@ "localisation": { "required": true, "prefix": "COMMON_PROPUSGTYPE", - "module": "rainmaker-pt" + "module": "rainmaker-pt", + "locale":"en_IN" } }, { @@ -748,7 +771,8 @@ "localisation": { "required": true, "prefix": "WS_PROPTYPE", - "module": "rainmaker-ws" + "module": "rainmaker-ws", + "locale":"en_IN" } }, { @@ -802,7 +826,8 @@ "localisation": { "required": true, "prefix": "PROPERTYTAX_FLOOR", - "module": "rainmaker-pt" + "module": "rainmaker-pt", + "locale":"en_IN" } }, { @@ -811,7 +836,8 @@ "localisation": { "required": true, "prefix": "COMMON_PROPUSGTYPE", - "module": "rainmaker-pt" + "module": "rainmaker-pt", + "locale":"en_IN" } }, { @@ -821,7 +847,8 @@ "required": true, "prefix": "COMMON_PROPSUBUSGTYPE", "module": "rainmaker-pt", - "isSubTypeRequired":true + "isSubTypeRequired":true, + "locale":"en_IN" } }, { From f1baebc6006f62f3c76e44973f6b1c5ef8d2a469 Mon Sep 17 00:00:00 2001 From: poonam1512 Date: Mon, 6 Sep 2021 10:28:15 +0530 Subject: [PATCH 0735/1242] Adding sw-biil in data and format config --- configs/pdf-service/data-config/sw-bill.json | 43 +++++++++++-------- .../pdf-service/format-config/sw-bill.json | 14 +++--- 2 files changed, 31 insertions(+), 26 deletions(-) diff --git a/configs/pdf-service/data-config/sw-bill.json b/configs/pdf-service/data-config/sw-bill.json index 794fa00f..f1690ec8 100644 --- a/configs/pdf-service/data-config/sw-bill.json +++ b/configs/pdf-service/data-config/sw-bill.json @@ -456,6 +456,23 @@ "path": "$.mobileNumber" } }, + { + "variable": "oldConnectionNo", + "value": { + "path": "$.connection.oldConnectionNo" + } + }, { + "variable": "rate", + "value": { + "path": "$.additionalDetails.penaltyRate" + } + }, + { + "variable": "ledgerId", + "value": { + "path": "$.connection.additionalDetails.ledgerId" + } + }, { "variable": "payerAddress", "value": { @@ -706,7 +723,7 @@ { "externalAPI": [ { - "path": "http://localhost:8077/egov-mdms-service/v1/_get", + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", "apiRequest": null, "responseMapping": [ @@ -717,6 +734,9 @@ { "variable": "phoneNumber", "value": "$.MdmsRes.tenant.tenants[0].contactNumber" + }, { + "variable":"mcGrade", + "value":"$.MdmsRes.tenant.tenants[0].city.ulbType" }, { "variable": "website", @@ -743,8 +763,8 @@ ] }, { - "path": "http://localhost:8078/billing-service/demand/_search", - "queryParam": "tenantId=$.tenantId,consumerCode=$.consumerCode,businessService=WS", + "path": "http://billing-service:8080/billing-service/demand/_search", + "queryParam": "tenantId=$.tenantId,consumerCode=$.consumerCode,businessService=SW", "apiRequest": null, "responseMapping": [ { @@ -773,24 +793,9 @@ } ] }, - { - "path": "http://localhost:8079/sw-services/swc/_search", - "queryParam": "tenantId=$.tenantId,connectionNumber=$.consumerCode", - "apiRequest": null, - "responseMapping": [ - { - "variable": "oldConnectionNo", - "value": "$.SewerageConnection[0].additionalDetails.oldConnectionNo" - }, - { - "variable": "ledgerId", - "value": "$.SewerageConnection[0].additionalDetails.ledgerId" - } - ] - }, { "path": "http://property-services.egov:8080/property-services/property/_search", - "queryParam": "tenantId=$.tenantId,propertyIds=$.additionalDetails.propertyId", + "queryParam": "tenantId=$.tenantId,propertyIds=$.connection.propertyId", "apiRequest": null, "responseMapping": [ { diff --git a/configs/pdf-service/format-config/sw-bill.json b/configs/pdf-service/format-config/sw-bill.json index 5e5374f8..29047578 100644 --- a/configs/pdf-service/format-config/sw-bill.json +++ b/configs/pdf-service/format-config/sw-bill.json @@ -23,7 +23,7 @@ { "stack": [ { - "text": "{{logo_header}} {{Municipal_Corporation}}", + "text": "{{logo_header}} {{mcGrade}}", "style": "receipt-logo-header" }, { @@ -206,10 +206,10 @@ { "table": { "widths": [ - "17%", - "43%", - "15%", - "25%" + "23%", + "25%", + "23%", + "*" ], "body": [ [ @@ -717,7 +717,7 @@ ], [ { - "text": "1. Online payment can be done for water charges payment.", + "text": "1. Online payment can be done for {{serviceType}} charges payment. http://bit.ly/{{logo_header}}{{serviceType}}", "border": [ true, false, @@ -785,7 +785,7 @@ ], [ { - "text": "5. Late payment charges will be applied after due date", + "text": "5. {{rate}}% Late payment charges will be applied after due date", "border": [ true, false, From 206a1299eddedce48fbaed8ac8b389d11a838b30 Mon Sep 17 00:00:00 2001 From: poonam1512 Date: Mon, 6 Sep 2021 15:44:14 +0530 Subject: [PATCH 0736/1242] financial year removal from tl certificate --- .../format-config/tlcertificate.json | 22 ------------------- .../format-config/tlrenewalcertificate.json | 22 ------------------- 2 files changed, 44 deletions(-) diff --git a/configs/pdf-service/format-config/tlcertificate.json b/configs/pdf-service/format-config/tlcertificate.json index ebc70a71..860e5d5c 100644 --- a/configs/pdf-service/format-config/tlcertificate.json +++ b/configs/pdf-service/format-config/tlcertificate.json @@ -148,28 +148,6 @@ ] }, "layout":"noBorders" - }, - { - "style":"noc-head", - "table":{ - "widths":[ - "35%", - "65%" - ], - "body":[ - [ - { - "text":"{{financial_year}}", - "style":"receipt-sub-logo-sub-header" - }, - { - "text":"{{financialYear}}", - "style":"receipt-sub-logo-sub-header" - } - ] - ] - }, - "layout":"noBorders" }, { "style":"noc-head", diff --git a/configs/pdf-service/format-config/tlrenewalcertificate.json b/configs/pdf-service/format-config/tlrenewalcertificate.json index 6d730906..0bedee9c 100644 --- a/configs/pdf-service/format-config/tlrenewalcertificate.json +++ b/configs/pdf-service/format-config/tlrenewalcertificate.json @@ -148,28 +148,6 @@ ] }, "layout":"noBorders" - }, - { - "style":"noc-head", - "table":{ - "widths":[ - "35%", - "65%" - ], - "body":[ - [ - { - "text":"{{financial_year}}", - "style":"receipt-sub-logo-sub-header" - }, - { - "text":"{{financialYear}}", - "style":"receipt-sub-logo-sub-header" - } - ] - ] - }, - "layout":"noBorders" }, { "style":"noc-head", From c2871505f3f51bb7a7b6ce5564db6fa7db75b787 Mon Sep 17 00:00:00 2001 From: egovmis Date: Wed, 8 Sep 2021 15:43:16 +0530 Subject: [PATCH 0737/1242] changes for guardian name on Water bill --- configs/pdf-service/data-config/ws-bill.json | 9 +++++++++ configs/pdf-service/format-config/ws-bill.json | 10 +++++----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/configs/pdf-service/data-config/ws-bill.json b/configs/pdf-service/data-config/ws-bill.json index 520b4ef1..98ecad05 100644 --- a/configs/pdf-service/data-config/ws-bill.json +++ b/configs/pdf-service/data-config/ws-bill.json @@ -821,8 +821,17 @@ { "variable": "landmark", "value": "$.Properties[0].address.landmark" + }, + { + "variable": "ownerName", + "value": "$.Properties[0].owners[0].name" + }, + { + "variable": "guardianName", + "value": "$.Properties[0].owners[0].fatherOrHusbandName" } + ] } ] diff --git a/configs/pdf-service/format-config/ws-bill.json b/configs/pdf-service/format-config/ws-bill.json index c9a2934e..304e42df 100644 --- a/configs/pdf-service/format-config/ws-bill.json +++ b/configs/pdf-service/format-config/ws-bill.json @@ -318,7 +318,7 @@ "style": "receipt-table-value2" }, { - "text": "Street Name", + "text": "Guardian Name", "border": [ false, false, @@ -350,7 +350,7 @@ "style": "receipt-table2" }, { - "text": "{{payerName}}", + "text": "{{ownerName}}", "border": [ false, false, @@ -360,7 +360,7 @@ "style": "receipt-table2" }, { - "text": "{{streetName}}", + "text": "{{guardianName}}", "border": [ false, false, @@ -402,7 +402,7 @@ "style": "receipt-table-value2" }, { - "text": "Landmark", + "text": "Street Name/Landmark", "border": [ false, false, @@ -445,7 +445,7 @@ "style": "receipt-table2" }, { - "text":"{{landmark}}", + "text":"{{streetName}}{{landmark}}", "border": [ false, false, From 3781add897b073af461ba169da5dc2bb81d49480 Mon Sep 17 00:00:00 2001 From: poonam1512 Date: Thu, 9 Sep 2021 15:05:48 +0530 Subject: [PATCH 0738/1242] adding financial year again --- .../format-config/tlcertificate.json | 22 +++++++++++++++++++ .../format-config/tlrenewalcertificate.json | 22 +++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/configs/pdf-service/format-config/tlcertificate.json b/configs/pdf-service/format-config/tlcertificate.json index 860e5d5c..d2e0efd0 100644 --- a/configs/pdf-service/format-config/tlcertificate.json +++ b/configs/pdf-service/format-config/tlcertificate.json @@ -149,6 +149,28 @@ }, "layout":"noBorders" }, + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":"{{financial_year}}", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":"{{financialYear}}", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + }, { "style":"noc-head", "table":{ diff --git a/configs/pdf-service/format-config/tlrenewalcertificate.json b/configs/pdf-service/format-config/tlrenewalcertificate.json index 0bedee9c..00394afa 100644 --- a/configs/pdf-service/format-config/tlrenewalcertificate.json +++ b/configs/pdf-service/format-config/tlrenewalcertificate.json @@ -149,6 +149,28 @@ }, "layout":"noBorders" }, + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":"{{financial_year}}", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":"{{financialYear}}", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + }, { "style":"noc-head", "table":{ From 04146824b2e986f31384fbeef3ec8c2b730bb967 Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Thu, 9 Sep 2021 15:19:44 +0530 Subject: [PATCH 0739/1242] Update ChartApi.json --- .../dashboard-analytics/ChartApiConfig.json | 42 ++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 23664810..880fa652 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -3863,5 +3863,45 @@ ], "insight": {}, "_comment": "" - } + }, + "collectionByModule": { + "chartName": "COLLECTION_BY_MODULE", + "queries": [ + { + "module": "COMMON", + "requestQueryMap": "{\"tenantId\" : \"dataObject.tenantId\"}", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs":{\"AGGR":{\"filter":{\"bool":{\"must_not":[{\"term":{\"dataObject.tenantId.keyword":"pb.testing"}},{\"terms":{\"dataObject.paymentDetails.bill.status.keyword":["Cancelled"]}}]}},"aggs":{\"AGGR":{\"terms":{\"field":"dataObject.tenantId.keyword"},"aggs":{\"PT":{\"sum":{\"field":"dataObject.paymentDetails.totalAmountPaid"}},"TL":{\"value_count":{\"field":"dataObject.transactionNumber.keyword"}}}}}}}}" + } + ], + "isMdmsEnabled": true, + "filterKeys": [ + { + "key": "tenantId", + "column": "DDRs" + } + ], + "chartType": "table", + "valueType": "number", + "drillChart": "collectionByModule", + "action": "", + "plotLabel": "DDRs", + "isPostResponseHandler": true, + "postAggregationTheory": "repsonseToDifferenceOfDates", + "aggregationPaths": [ + "PT", + "TL" + ], + "pathDataTypeMapping": [ + { + "PT": "amount" + }, + { + "TL": "amount" + } + ], + "insight": {}, + "_comment": "" + }, } From cb750bb56ec81957fb1b4b43d82fb53b6ed7bfc8 Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Thu, 9 Sep 2021 15:21:32 +0530 Subject: [PATCH 0740/1242] update chartapi --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 880fa652..efbe5588 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -3903,5 +3903,5 @@ ], "insight": {}, "_comment": "" - }, + }, } From fcf1cbdd736fb91fb5e5fcfd862213e62e8cf73f Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Thu, 9 Sep 2021 15:22:47 +0530 Subject: [PATCH 0741/1242] Update Chartapi --- .../dashboard-analytics/ChartApiConfig.json | 44 +------------------ 1 file changed, 1 insertion(+), 43 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index efbe5588..da22c983 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -3862,46 +3862,4 @@ } ], "insight": {}, - "_comment": "" - }, - "collectionByModule": { - "chartName": "COLLECTION_BY_MODULE", - "queries": [ - { - "module": "COMMON", - "requestQueryMap": "{\"tenantId\" : \"dataObject.tenantId\"}", - "dateRefField": "dataObject.paymentDetails.receiptDate", - "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs":{\"AGGR":{\"filter":{\"bool":{\"must_not":[{\"term":{\"dataObject.tenantId.keyword":"pb.testing"}},{\"terms":{\"dataObject.paymentDetails.bill.status.keyword":["Cancelled"]}}]}},"aggs":{\"AGGR":{\"terms":{\"field":"dataObject.tenantId.keyword"},"aggs":{\"PT":{\"sum":{\"field":"dataObject.paymentDetails.totalAmountPaid"}},"TL":{\"value_count":{\"field":"dataObject.transactionNumber.keyword"}}}}}}}}" - } - ], - "isMdmsEnabled": true, - "filterKeys": [ - { - "key": "tenantId", - "column": "DDRs" - } - ], - "chartType": "table", - "valueType": "number", - "drillChart": "collectionByModule", - "action": "", - "plotLabel": "DDRs", - "isPostResponseHandler": true, - "postAggregationTheory": "repsonseToDifferenceOfDates", - "aggregationPaths": [ - "PT", - "TL" - ], - "pathDataTypeMapping": [ - { - "PT": "amount" - }, - { - "TL": "amount" - } - ], - "insight": {}, - "_comment": "" - }, -} + } From 401ac09174a9a12f45028b4e8efe50ff09146b80 Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Thu, 9 Sep 2021 15:24:15 +0530 Subject: [PATCH 0742/1242] Update chartapi --- .../dashboard-analytics/ChartApiConfig.json | 42 ++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index da22c983..8e896229 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -3862,4 +3862,44 @@ } ], "insight": {}, - } + }, + "collectionByModule": { + "chartName": "COLLECTION_BY_MODULE", + "queries": [ + { + "module": "COMMON", + "requestQueryMap": "{\"tenantId\" : \"dataObject.tenantId\"}", + "dateRefField": "", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs":{\"AGGR":{\"filter":{\"bool":{\"must_not":[{\"term":{\"dataObject.tenantId.keyword":"pb.testing"}},{\"terms":{\"dataObject.paymentDetails.bill.status.keyword": ["Cancelled"]}}]}},"aggs":{\"AGGR":{\"terms":{\"field":"dataObject.tenantId.keyword"},"aggs":{\"PT":{\"sum":{\"field":"dataObject.paymentDetails.totalAmountPaid"}},"TL":{\"value_count": {\"field":"dataObject.transactionNumber.keyword"}}}}}}}}" + } + ], + "isMdmsEnabled": true, + "filterKeys": [ + { + "key": "tenantId", + "column": "DDRs" + } + ], + "chartType": "table", + "valueType": "number", + "drillChart": "collectionByModule", + "action": "", + "plotLabel": "DDRs", + "isPostResponseHandler": true, + "postAggregationTheory": "repsonseToDifferenceOfDates", + "aggregationPaths": [ + "PT", + "TL" + ], + "pathDataTypeMapping": [ + { + "PT": "amount" + }, + { + "TL": "amount" + } + ], + "insight": {}, + "_comment": "" + } From 5c46cf8d4badeaaab6bef054e65375ecf83c4902 Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Thu, 9 Sep 2021 15:24:57 +0530 Subject: [PATCH 0743/1242] chartapi update --- .../dashboard-analytics/ChartApiConfig.json | 42 +------------------ 1 file changed, 1 insertion(+), 41 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 8e896229..da22c983 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -3862,44 +3862,4 @@ } ], "insight": {}, - }, - "collectionByModule": { - "chartName": "COLLECTION_BY_MODULE", - "queries": [ - { - "module": "COMMON", - "requestQueryMap": "{\"tenantId\" : \"dataObject.tenantId\"}", - "dateRefField": "", - "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs":{\"AGGR":{\"filter":{\"bool":{\"must_not":[{\"term":{\"dataObject.tenantId.keyword":"pb.testing"}},{\"terms":{\"dataObject.paymentDetails.bill.status.keyword": ["Cancelled"]}}]}},"aggs":{\"AGGR":{\"terms":{\"field":"dataObject.tenantId.keyword"},"aggs":{\"PT":{\"sum":{\"field":"dataObject.paymentDetails.totalAmountPaid"}},"TL":{\"value_count": {\"field":"dataObject.transactionNumber.keyword"}}}}}}}}" - } - ], - "isMdmsEnabled": true, - "filterKeys": [ - { - "key": "tenantId", - "column": "DDRs" - } - ], - "chartType": "table", - "valueType": "number", - "drillChart": "collectionByModule", - "action": "", - "plotLabel": "DDRs", - "isPostResponseHandler": true, - "postAggregationTheory": "repsonseToDifferenceOfDates", - "aggregationPaths": [ - "PT", - "TL" - ], - "pathDataTypeMapping": [ - { - "PT": "amount" - }, - { - "TL": "amount" - } - ], - "insight": {}, - "_comment": "" - } + } From 1078d98e8570e6537025307bd6997985b1e91261 Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Thu, 9 Sep 2021 15:36:55 +0530 Subject: [PATCH 0744/1242] update chartapi --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index da22c983..f2441551 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -3863,3 +3863,4 @@ ], "insight": {}, } +} From 8463e8cb3cbf7b56513c38bb9b857d34f5c483ef Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Thu, 9 Sep 2021 15:38:26 +0530 Subject: [PATCH 0745/1242] update chartapi --- .../dashboard-analytics/ChartApiConfig.json | 1027 ++++++++--------- 1 file changed, 505 insertions(+), 522 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index f2441551..f11e4ffc 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -1,5 +1,6 @@ { - "_comment": "W&S charts below-----------------------------------------------------------------------", + + "_comment": "dss-collectionindex new queries ", "totalCollection": { "chartName": "DSS_TOTAL_COLLECTION", "queries": [ @@ -27,13 +28,13 @@ "Total Collection" ], "insight": { - "chartResponseMap": "totalCollection", - "action": "differenceOfNumbers", - "upwardIndicator": "positive", - "downwardIndicator": "negative", - "textMessage": "$indicator$value% than last $insightInterval", - "colorCode": "#228B22", - "insightInterval": "year" + "chartResponseMap" : "totalCollection", + "action" : "differenceOfNumbers", + "upwardIndicator" : "positive", + "downwardIndicator" : "negative", + "textMessage" : "$indicator$value% than last $insightInterval", + "colorCode" : "#228B22", + "insightInterval" : "year" }, "_comment": " " }, @@ -58,7 +59,8 @@ ], "isCumulative": true, "interval": "month", - "insight": {}, + "insight": { + }, "_comment": " " }, "targetAchieved": { @@ -78,6 +80,7 @@ "indexName": "dss-collection_v2", "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" } + ], "chartType": "metric", "valueType": "percentage", @@ -89,13 +92,13 @@ "Actual collection" ], "insight": { - "chartResponseMap": "targetAchieved", - "action": "differenceOfNumbers", - "upwardIndicator": "positive", - "downwardIndicator": "negative", - "textMessage": "$indicator$value% than last $insightInterval", - "colorCode": "#228B22", - "insightInterval": "year" + "chartResponseMap" : "targetAchieved", + "action" : "differenceOfNumbers", + "upwardIndicator" : "positive", + "downwardIndicator" : "negative", + "textMessage" : "$indicator$value% than last $insightInterval", + "colorCode" : "#228B22", + "insightInterval" : "year" }, "_comment": " " }, @@ -125,7 +128,8 @@ "aggregationPaths": [ "Total Collection" ], - "insight": {}, + "insight": { + }, "_comment": " " }, "totalCollectionDeptWise": { @@ -147,7 +151,8 @@ "aggregationPaths": [ "Business Service" ], - "insight": {}, + "insight": { + }, "_comment": " " }, "topPerformingUlbs": { @@ -177,10 +182,10 @@ "order": "desc", "limit": 3, "aggregationPaths": [ - "Total Collection", - "Target Collection" + "Total Collection","Target Collection" ], - "insight": {}, + "insight": { + }, "_comment": " Top Performing Ulbs for target achieved" }, "bottomPerformingUlbs": { @@ -210,10 +215,10 @@ "order": "asc", "limit": 3, "aggregationPaths": [ - "Total Collection", - "Target Collection" + "Total Collection", "Target Collection" ], - "insight": {}, + "insight": { + }, "_comment": " Bottom Performing Ulbs for target achieved" }, "licenseByLicenseType": { @@ -235,9 +240,12 @@ "aggregationPaths": [ "License Instrument Type" ], - "insight": {}, + "insight": { + }, "_comment": " License Application which are issued by License Type" }, + + "_comment": "COMMON NON-COLLECTION CHARTS", "totalApplication": { "chartName": "DSS_TOTAL_APPLICATION", "queries": [ @@ -272,13 +280,13 @@ "Total Application" ], "insight": { - "chartResponseMap": "totalApplication", - "action": "differenceOfNumbers", - "upwardIndicator": "positive", - "downwardIndicator": "negative", - "textMessage": "$indicator$value% than last $insightInterval", - "colorCode": "#228B22", - "insightInterval": "year" + "chartResponseMap" : "totalApplication", + "action" : "differenceOfNumbers", + "upwardIndicator" : "positive", + "downwardIndicator" : "negative", + "textMessage" : "$indicator$value% than last $insightInterval", + "colorCode" : "#228B22", + "insightInterval" : "year" }, "_comment": " totalApplication is the chartId" }, @@ -316,13 +324,13 @@ "Applications Closed" ], "insight": { - "chartResponseMap": "closedApplication", - "action": "differenceOfNumbers", - "upwardIndicator": "positive", - "downwardIndicator": "negative", - "textMessage": "$indicator$value% than last $insightInterval", - "colorCode": "#228B22", - "insightInterval": "year" + "chartResponseMap" : "closedApplication", + "action" : "differenceOfNumbers", + "upwardIndicator" : "positive", + "downwardIndicator" : "negative", + "textMessage" : "$indicator$value% than last $insightInterval", + "colorCode" : "#228B22", + "insightInterval" : "year" }, "_comment": " totalApplication is the chartId" }, @@ -346,13 +354,13 @@ "Citizen Registered" ], "insight": { - "chartResponseMap": "citizenRegistered", - "action": "differenceOfNumbers", - "upwardIndicator": "positive", - "downwardIndicator": "negative", - "textMessage": "$indicator$value% than last $insightInterval", - "colorCode": "#228B22", - "insightInterval": "year" + "chartResponseMap" : "citizenRegistered", + "action" : "differenceOfNumbers", + "upwardIndicator" : "positive", + "downwardIndicator" : "negative", + "textMessage" : "$indicator$value% than last $insightInterval", + "colorCode" : "#228B22", + "insightInterval" : "year" }, "_comment": " totalApplication is the chartId" }, @@ -391,7 +399,8 @@ "Trade Licence", "PGR" ], - "insight": {}, + "insight": { + }, "_comment": " totalApplication is the chartId" }, "totalApplication&ClosedApplication": { @@ -410,6 +419,7 @@ "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \r\n \"district\" : \"Data.tenantData.city.districtCode\", \r\n\"tenantId\" : \"Data.tradelicense.tenantId.keyword\" \r\n}", "indexName": "tlindex-v1", "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tradelicense.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Total Application\":{\"date_histogram\":{\"field\":\"Data.tradelicense.applicationDate\",\"interval\":\"intervalvalue\"},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.tradelicense.applicationNumber.keyword\"}}}},\"Closed Application\":{\"date_histogram\":{\"field\":\"Data.tradelicense.applicationDate\",\"interval\":\"intervalvalue\"},\"aggs\":{\"Applications Closed\":{\"filter\":{\"bool\":{\"must\":[{\"terms\":{\"Data.status.keyword\":[\"closed\",\"resolved\"]}}]}},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.tradelicense.applicationNumber.keyword\"}}}}}}}}}}" + }, { "module": "PGR", @@ -417,6 +427,7 @@ "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\", \r\n \"district\" : \"Data.tenantData.city.districtCode\", \r\n\"tenantId\" : \"Data.tenantId\" \r\n}", "indexName": "pgrindex-v1", "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Total Application\":{\"date_histogram\":{\"field\":\"Data.dateOfComplaint\",\"interval\":\"intervalvalue\"},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}},\"Closed Application\":{\"date_histogram\":{\"field\":\"Data.dateOfComplaint\",\"interval\":\"intervalvalue\"},\"aggs\":{\"Applications Closed\":{\"filter\":{\"bool\":{\"must\":[{\"terms\":{\"Data.status.keyword\":[\"closed\",\"resolved\"]}}]}},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.dateOfComplaint\"}}}}}}}}}}" + } ], "chartType": "line", @@ -430,7 +441,8 @@ ], "isCumulative": false, "interval": "month", - "insight": {}, + "insight": { + }, "_comment": " " }, "topPerformingUlbsCompletionRate": { @@ -470,7 +482,8 @@ "Closed Application", "Total Application" ], - "insight": {}, + "insight": { + }, "_comment": " Top Performing Ulbs for Completion rate" }, "bottomPerformingUlbsCompletionRate": { @@ -510,15 +523,18 @@ "Closed Application", "Total Application" ], - "insight": {}, + "insight": { + }, "_comment": " Bottom Performing Ulbs for Completion rate" }, + + "_comment": "COMMON COLLECTION CHARTS", "targetCollection": { "chartName": "DSS_TARGET_COLLECTION", "queries": [ { "module": "COMMON", - "requestQueryMap": "{\"module\" : \"businessService.keyword\", \"tenantId\" : \"tenantIdForMunicipalCorporation.keyword\", \"financialYear\" : \"financialYear.keyword\"}", + "requestQueryMap": "{\"module\" : \"businessService.keyword\", \"tenantId\" : \"tenantIdForMunicipalCorporation.keyword\"}", "dateRefField": "startdate", "indexName": "dss-target_v1", "aggrQuery": "{\"aggs\":{\"Target Collection\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}" @@ -533,8 +549,9 @@ "Target Collection" ], "isDayUnit": true, - "postAggregationTheory": "repsonseToDifferenceOfDates", - "insight": {}, + "postAggregationTheory" : "repsonseToDifferenceOfDates", + "insight": { + }, "_comment": " " }, "collectionByUsageType": { @@ -556,31 +573,12 @@ "aggregationPaths": [ "Usage Type" ], - "insight": {}, + "insight": { + }, "_comment": " collection/amount per usage type" }, - "collectionByPaymentMode": { - "chartName": "DSS_PT_COLLECTION_BY_PAYMENT_MODE", - "queries": [ - { - "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", - "dateRefField": "dataObject.paymentDetails.receiptDate", - "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Payment Mode Type\":{\"terms\":{\"field\":\"dataObject.paymentMode.keyword\",\"size\":200}}}}}}" - } - ], - "chartType": "pie", - "valueType": "amount", - "action": "", - "documentType": "_doc", - "drillChart": "none", - "aggregationPaths": [ - "Payment Mode" - ], - "insight": {}, - "_comment": " collection/amount per payment mode" - }, + + "_comment": "PT NON-COLLECTION CHARTS", "propertiesByUsageType": { "chartName": "DSS_PT_PROPERTIES_BY_USAGE_TYPE", "queries": [ @@ -600,7 +598,8 @@ "aggregationPaths": [ "Usage Type" ], - "insight": {}, + "insight": { + }, "_comment": " properties having assessmentNumber per usage type" }, "propertiesAssessed": { @@ -623,13 +622,13 @@ "Assessed Properties" ], "insight": { - "chartResponseMap": "propertiesAssessed", - "action": "differenceOfNumbers", - "upwardIndicator": "positive", - "downwardIndicator": "negative", - "textMessage": "$indicator$value% than last $insightInterval", - "colorCode": "#228B22", - "insightInterval": "year" + "chartResponseMap" : "propertiesAssessed", + "action" : "differenceOfNumbers", + "upwardIndicator" : "positive", + "downwardIndicator" : "negative", + "textMessage" : "$indicator$value% than last $insightInterval", + "colorCode" : "#228B22", + "insightInterval" : "year" }, "_comment": " totol properties having assessmentNumber " }, @@ -653,13 +652,13 @@ "Assessed Properties" ], "insight": { - "chartResponseMap": "totalAssessment", - "action": "differenceOfNumbers", - "upwardIndicator": "positive", - "downwardIndicator": "negative", - "textMessage": "$indicator$value% than last $insightInterval", - "colorCode": "#228B22", - "insightInterval": "year" + "chartResponseMap" : "totalAssessment", + "action" : "differenceOfNumbers", + "upwardIndicator" : "positive", + "downwardIndicator" : "negative", + "textMessage" : "$indicator$value% than last $insightInterval", + "colorCode" : "#228B22", + "insightInterval" : "year" }, "_comment": " totol properties having assessmentNumber " }, @@ -684,7 +683,8 @@ ], "isCumulative": true, "interval": "week", - "insight": {}, + "insight": { + }, "_comment": " totol properties having assessmentNumber " }, "activeUlbs": { @@ -714,16 +714,20 @@ "Active ULBs" ], "insight": { - "chartResponseMap": "activeUlbs", - "action": "differenceOfNumbers", - "upwardIndicator": "positive", - "downwardIndicator": "negative", - "textMessage": "$indicator$value% than last $insightInterval", - "colorCode": "#228B22", - "insightInterval": "year" + "chartResponseMap" : "activeUlbs", + "action" : "differenceOfNumbers", + "upwardIndicator" : "positive", + "downwardIndicator" : "negative", + "textMessage" : "$indicator$value% than last $insightInterval", + "colorCode" : "#228B22", + "insightInterval" : "year" }, "_comment": " total ULBs count" }, + + "_comment": "PT COLLECTION CHARTS (Tax heads)", + + "_comment": "PT COLLECTION CHARTS (Demands) ", "demandCollectionIndexDDRRevenue": { "chartName": "DSS_PT_KEY_FY_INDICATORS", "queries": [ @@ -744,10 +748,7 @@ ], "isMdmsEnabled": true, "filterKeys": [ - { - "key": "tenantId", - "column": "DDRs" - } + {"key": "tenantId", "column": "DDRs"} ], "chartType": "table", "valueType": "number", @@ -755,7 +756,7 @@ "action": "", "plotLabel": "DDRs", "isPostResponseHandler": true, - "postAggregationTheory": "repsonseToDifferenceOfDates", + "postAggregationTheory" : "repsonseToDifferenceOfDates", "aggregationPaths": [ "Total Collection", "Transactions", @@ -776,7 +777,8 @@ "Target Collection": "amount" } ], - "insight": {}, + "insight": { + }, "_comment": "" }, "demandCollectionIndexBoundaryRevenue": { @@ -798,13 +800,9 @@ } ], "filterKeys": [ - { - "key": "tenantId", - "column": "Boundary" - } + {"key": "tenantId", "column": "Boundary"} ], - "postAggregationTheory": "repsonseToDifferenceOfDates", - "chartType": "table", + "postAggregationTheory" : "repsonseToDifferenceOfDates", "chartType": "table", "valueType": "number", "drillChart": "boundaryDrillDown", "drillFields": [ @@ -834,7 +832,8 @@ "Target Collection": "amount" } ], - "insight": {}, + "insight": { + }, "_comment": "" }, "boundaryDrillDown": { @@ -875,9 +874,13 @@ "Target Collection": "amount" } ], - "insight": {}, + "insight": { + }, "_comment": "" }, + + + "_comment": " PT Nested Array related new queries", "taxHeadsBreakupDDRRevenue": { "chartName": "DSS_PT_TAX_HEAD_BREAKUP_REVENUE", "queries": [ @@ -891,10 +894,8 @@ ], "isMdmsEnabled": true, "filterKeys": [ - { - "key": "tenantId", - "column": "DDRs" - } + {"key": "tenantId", "column": "DDRs"} + ], "chartType": "xtable", "valueType": "number", @@ -909,27 +910,19 @@ "Cancer Cess", "Rebate", "Penalty", - "Time Interest", - "Round Off" + "Time Interest","Round Off" ], "computedFields": [ { - "postAggregationTheory": "", + "postAggregationTheory" : "", "actionName": "AdditiveComputedField", - "fields": [ - "PT Tax", - "Fire Cess", - "Cancer Cess", - "Rebate", - "Penalty", - "Time Interest", - "Round Off" - ], - "newField": "Total Amount", + "fields" : [ "PT Tax", "Fire Cess", "Cancer Cess", "Rebate", "Penalty", "Time Interest","Round Off"], + "newField" : "Total Amount", "_comments": "fields are field names picked from its aggregation query to use post aggregation newField value with given new field name " } ], - "insight": {}, + "insight": { + }, "_comment": "" }, "taxHeadsBreakupRevenue": { @@ -944,10 +937,8 @@ } ], "filterKeys": [ - { - "key": "tenantId", - "column": "Boundary" - } + {"key": "tenantId", "column": "Boundary"} + ], "chartType": "xtable", "valueType": "number", @@ -965,11 +956,11 @@ "Cancer Cess", "Rebate", "Penalty", - "Time Interest", - "Round Off", - "Total Amount" + "Time Interest","Round Off", "Total Amount" ], - "insight": {}, + + "insight": { + }, "_comment": "" }, "taxHeadsBreakupBoundaryDrill": { @@ -983,7 +974,9 @@ "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Ward \":{\"terms\":{\"field\":\"domainObject.ward.name.keyword\",\"size\":200},\"aggs\":{\"Total Amount\":{\"bucket_script\":{\"buckets_path\":{\"c1\":\"PT Tax>aggrFilter>amount\",\"c2\":\"Fire Cess>aggrFilter>amount\",\"c3\":\"Cancer Cess>aggrFilter>amount\",\"c4\":\"Rebate>aggrFilter>amount\",\"c5\":\"Penalty>aggrFilter>amount\",\"c6\":\"Time Interest>aggrFilter>amount\",\"c7\":\"Round Off>aggrFilter>amount\"},\"script\":{\"source\":\"params.c1+params.c2+params.c3+params.c4+params.c5+params.c6+params.c7\"}}},\"PT Tax\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TAX\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Fire Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_FIRE_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Cancer Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_CANCER_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Rebate\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_REBATE\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Penalty\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_PENALTY\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Time Interest\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_INTEREST\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Round Off\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_ROUNDOFF\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}}}}}}}}" } ], - "filterKeys": [], + "filterKeys": [ + + ], "chartType": "xtable", "valueType": "number", "drillChart": "", @@ -1000,14 +993,14 @@ "Cancer Cess", "Rebate", "Penalty", - "Time Interest", - "Round Off", - "Total Amount" + "Time Interest","Round Off","Total Amount" ], - "insight": {}, + + "insight": { + }, "_comment": "" }, - "taxHeadsBreakupUsageMinor": { + "taxHeadsBreakupUsageMinor": { "chartName": "", "queries": [ { @@ -1019,10 +1012,7 @@ } ], "filterKeys": [ - { - "key": "minorUsageId", - "column": "Minor Usage Type" - } + {"key": "minorUsageId", "column": "Minor Usage Type"} ], "chartType": "table", "valueType": "number", @@ -1058,7 +1048,8 @@ "Penalty": "amount" } ], - "insight": {}, + "insight": { + }, "_comment": "present we are not using, Need to check the taxAndPayments" }, "taxHeadsBreakupUsageSubMinor": { @@ -1109,7 +1100,8 @@ "Penalty": "amount" } ], - "insight": {}, + "insight": { + }, "_comment": "" }, "demandCollectionIndexUsageRevenue": { @@ -1124,7 +1116,9 @@ "aggrQuerybc": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Approved\"]}}]}},\"aggs\":{\"UsageType \":{\"terms\":{\"field\":\"domainObject.usageCategory.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.transactionNumber.keyword\"}},\"Assessed Properties\":{\"nested\":{\"path\":\"domainObject.assessmentsDetails\"},\"aggs\":{\"attr\":{\"cardinality\":{\"field\":\"domainObject.assessmentsDetails.assessmentNumber.keyword\"}}}}}}}}}}" } ], - "filterKeys": [], + "filterKeys": [ + + ], "chartType": "table", "valueType": "number", "drillChart": "", @@ -1139,6 +1133,7 @@ "Total Collection", "Transactions", "Assessed Properties" + ], "pathDataTypeMapping": [ { @@ -1151,7 +1146,8 @@ "Assessed Properties": "number" } ], - "insight": {}, + "insight": { + }, "_comment": "removed reverse_nested in aggrQuery" }, "usageRevenueDrillDownMinor": { @@ -1167,10 +1163,7 @@ } ], "filterKeys": [ - { - "key": "minorUsageId", - "column": "Minor Usage Type" - } + {"key": "minorUsageId", "column": "Minor Usage Type"} ], "chartType": "table", "valueType": "number", @@ -1194,7 +1187,8 @@ "Assessed Properties": "number" } ], - "insight": {}, + "insight": { + }, "_comment": "" }, "usageRevenueDrillDownSubMinor": { @@ -1209,7 +1203,9 @@ "aggrQuerybc": "{\"aggs\":{\"UsageType \":{\"terms\":{\"field\":\"domainObject.usageCategory.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.transactionNumber.keyword\"}},\"Assessed Properties\":{\"nested\":{\"path\":\"Data.propertyDetails\"},\"aggs\":{\"attr\":{\"cardinality\":{\"field\":\"Data.propertyDetails.assessmentNumber.keyword\"}}}}}}}}" } ], - "filterKeys": [], + "filterKeys": [ + + ], "chartType": "table", "valueType": "number", "drillChart": "none", @@ -1232,9 +1228,15 @@ "Assessed Properties": "number" } ], - "insight": {}, + "insight": { + }, "_comment": "" }, + + + + "_comment": "TL COLLECTION CHARTS", + "licenseIssuedDDRRevenue": { "chartName": "DSS_TL_KEY_FY_INDICATORS", "queries": [ @@ -1255,13 +1257,10 @@ ], "isMdmsEnabled": true, "filterKeys": [ - { - "key": "tenantId", - "column": "DDRs" - } + {"key": "tenantId", "column": "DDRs"} ], "isPostResponseHandler": true, - "postAggregationTheory": "repsonseToDifferenceOfDates", + "postAggregationTheory" : "repsonseToDifferenceOfDates", "chartType": "table", "valueType": "number", "drillChart": "licenseIssuedBoundaryRevenue", @@ -1288,7 +1287,8 @@ "Target Collection": "amount" } ], - "insight": {}, + "insight": { + }, "_comment": "" }, "licenseIssuedBoundaryRevenue": { @@ -1310,12 +1310,9 @@ } ], "filterKeys": [ - { - "key": "tenantId", - "column": "Boundary" - } + {"key": "tenantId", "column": "Boundary"} ], - "postAggregationTheory": "repsonseToDifferenceOfDates", + "postAggregationTheory" : "repsonseToDifferenceOfDates", "chartType": "table", "valueType": "number", "drillChart": "licenseIssuedBoundaryDrillDown", @@ -1342,7 +1339,8 @@ "Target Collection": "amount" } ], - "insight": {}, + "insight": { + }, "_comment": "" }, "licenseIssuedBoundaryDrillDown": { @@ -1356,7 +1354,7 @@ "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Ward \":{\"terms\":{\"field\":\"domainObject.ward.name.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.transactionNumber.keyword\"}},\"Total Licence Issued\":{\"value_count\":{\"field\":\"domainObject.tradelicense.licenseNumber.keyword\"}}}}}}}}" } ], - "postAggregationTheory": "repsonseToDifferenceOfDates", + "postAggregationTheory" : "repsonseToDifferenceOfDates", "chartType": "table", "valueType": "number", "drillChart": "", @@ -1383,9 +1381,12 @@ "Target Collection": "amount" } ], - "insight": {}, + "insight": { + }, "_comment": "" }, + + "_comment": " TL Nested Array related newer queries", "licenceTaxHeadsBreakupDDR": { "chartName": "DSS_TL_TAX_HEAD_BREAKUP_BOUNDARY", "queries": [ @@ -1399,10 +1400,7 @@ ], "isMdmsEnabled": true, "filterKeys": [ - { - "key": "tenantId", - "column": "DDRs" - } + {"key": "tenantId", "column": "DDRs"} ], "isPostResponseHandlerA": true, "chartType": "xtable", @@ -1418,18 +1416,16 @@ ], "computedFields": [ { - "postAggregationTheory": "", + "postAggregationTheory" : "", "actionName": "AdditiveComputedField", - "fields": [ - "TL Tax", - "Adhoc Penalty", - "Adhoc Rebate" - ], - "newField": "Total Amount", + "fields" : ["TL Tax", "Adhoc Penalty", "Adhoc Rebate"], + "newField" : "Total Amount", "_comments": "fields are field names picked from its aggregation query to use post aggregation newField value with given new field name " } ], - "insight": {}, + + "insight": { + }, "_comment": "" }, "taxHeadsBreakupUsage": { @@ -1443,7 +1439,9 @@ "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Usage \":{\"terms\":{\"field\":\"domainObject.usageCategory.keyword\",\"size\":200},\"aggs\":{\"Total Amount\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}},\"PT Tax\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TAX\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Fire Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_FIRE_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Cancer Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_CANCER_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Rebate\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_REBATE\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Penalty\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_PENALTY\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}}}}}}}}" } ], - "filterKeys": [], + "filterKeys": [ + + ], "chartType": "table", "valueType": "number", "drillChart": "", @@ -1478,7 +1476,8 @@ "Penalty": "amount" } ], - "insight": {}, + "insight": { + }, "_comment": "" }, "licenceTaxHeadsBreakupBoundary": { @@ -1493,10 +1492,7 @@ } ], "filterKeys": [ - { - "key": "tenantId", - "column": "Boundary" - } + {"key": "tenantId", "column": "Boundary"} ], "chartType": "xtable", "valueType": "number", @@ -1507,10 +1503,10 @@ "aggregationPaths": [ "TL Tax", "Adhoc Penalty", - "Adhoc Rebate", - "Total Amount" + "Adhoc Rebate","Total Amount" ], - "insight": {}, + "insight": { + }, "_comment": "" }, "licenceTaxHeadsBreakupWard": { @@ -1524,7 +1520,8 @@ "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"ULBs \":{\"terms\":{\"field\":\"dataObject.ward.name.keyword\",\"size\":200},\"aggs\":{\"Total Amount\":{\"bucket_script\":{\"buckets_path\":{\"c1\":\"TL Tax>aggrFilter>amount\",\"c2\":\"Adhoc Penalty>aggrFilter>amount\",\"c3\":\"Adhoc Rebate>aggrFilter>amount\"},\"script\":{\"source\":\"params.c1+params.c2+params.c3\"}}},\"TL Tax\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"TL_TAX\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Adhoc Penalty\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"TL_ADHOC_PENALTY\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Adhoc Rebate\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"TL_ADHOC_REBATE\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}}}}}}}}" } ], - "filterKeys": [], + "filterKeys": [ + ], "chartType": "xtable", "valueType": "number", "drillChart": "", @@ -1534,12 +1531,15 @@ "aggregationPaths": [ "TL Tax", "Adhoc Penalty", - "Adhoc Rebate", - "Total Amount" + "Adhoc Rebate", "Total Amount" ], - "insight": {}, + "insight": { + }, "_comment": "" }, + + + "_comment": "TL NON-COLLECTION CHARTS", "licenseIssued": { "chartName": "DSS_TL_LICENSE_ISSUED", "queries": [ @@ -1560,13 +1560,13 @@ "License Issued" ], "insight": { - "chartResponseMap": "licenseIssued", - "action": "differenceOfNumbers", - "upwardIndicator": "positive", - "downwardIndicator": "negative", - "textMessage": "$indicator$value% than last $insightInterval", - "colorCode": "#228B22", - "insightInterval": "year" + "chartResponseMap" : "licenseIssued", + "action" : "differenceOfNumbers", + "upwardIndicator" : "positive", + "downwardIndicator" : "negative", + "textMessage" : "$indicator$value% than last $insightInterval", + "colorCode" : "#228B22", + "insightInterval" : "year" }, "_comment": " licenseIssued is the Chart ID" }, @@ -1599,7 +1599,8 @@ ], "isCumulative": true, "interval": "month", - "insight": {}, + "insight": { + }, "_comment": " Total Number of License having issued" }, "licenseApplicationByStatus": { @@ -1622,7 +1623,8 @@ "aggregationPaths": [ "Status" ], - "insight": {}, + "insight": { + }, "_comment": " License Application which are issued by License Type" }, "slaAchieved": { @@ -1646,13 +1648,13 @@ "Total Application" ], "insight": { - "chartResponseMap": "slaAchieved", - "action": "differenceOfNumbers", - "upwardIndicator": "positive", - "downwardIndicator": "negative", - "textMessage": "$indicator$value% than last $insightInterval", - "colorCode": "#228B22", - "insightInterval": "year" + "chartResponseMap" : "slaAchieved", + "action" : "differenceOfNumbers", + "upwardIndicator" : "positive", + "downwardIndicator" : "negative", + "textMessage" : "$indicator$value% than last $insightInterval", + "colorCode" : "#228B22", + "insightInterval" : "year" }, "_comment": " SLA Achieved Percentage " }, @@ -1670,10 +1672,7 @@ ], "isMdmsEnabled": true, "filterKeys": [ - { - "key": "tenantId", - "column": "DDRs" - } + {"key": "tenantId", "column": "DDRs"} ], "chartType": "xtable", "valueType": "number", @@ -1724,7 +1723,8 @@ "Paid": "number" } ], - "insight": {}, + "insight": { + }, "_comment": "" }, "tlStatusByTenant": { @@ -1740,10 +1740,7 @@ } ], "filterKeys": [ - { - "key": "tenantId", - "column": "Boundary" - } + {"key": "tenantId", "column": "Boundary"} ], "chartType": "xtable", "valueType": "number", @@ -1754,9 +1751,14 @@ "documentType": "_doc", "action": "", "plotLabel": "ULBs", - "aggregationPaths": [], - "pathDataTypeMapping": [], - "insight": {}, + "aggregationPaths": [ + + ], + "pathDataTypeMapping": [ + + ], + "insight": { + }, "_comment": "" }, "tlStatusByTenantDrillDown": { @@ -1771,7 +1773,8 @@ "aggrQueryBc": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tradelicense.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Ward \":{\"terms\":{\"field\":\"Data.ward.name.keyword\",\"size\":1000},\"aggs\":{\"Status\":{\"filters\":{\"filters\":{\"Approved\":{\"match\":{\"Data.tradelicense.status.keyword\":\"APPROVED\"}},\"Initiated\":{\"match\":{\"Data.tradelicense.status.keyword\":\"INITIATED\"}},\"Applied\":{\"match\":{\"Data.tradelicense.status.keyword\":\"APPLIED\"}},\"Rejected\":{\"match\":{\"Data.tradelicense.status.keyword\":\"REJECTED\"}},\"Pending Approval\":{\"match\":{\"Data.tradelicense.status.keyword\":\"PENDINGAPPROVAL\"}},\"Field Inspection\":{\"match\":{\"Data.tradelicense.status.keyword\":\"FIELDINSPECTION\"}},\"Cancelled\":{\"match\":{\"Data.tradelicense.status.keyword\":\"CANCELLED\"}},\"Pending Payment\":{\"match\":{\"Data.tradelicense.status.keyword\":\"PENDINGPAYMENT\"}},\"Paid\":{\"match\":{\"Data.tradelicense.status.keyword\":\"PAID\"}}}}}}}}}}}" } ], - "filterKeys": [], + "filterKeys": [ + ], "chartType": "xtable", "valueType": "number", "drillChart": "", @@ -1821,9 +1824,12 @@ "Paid": "number" } ], - "insight": {}, + "insight": { + }, "_comment": "" }, + + "_comment": "Enhanced table charts..TODO: refactor to remove xtable type ", "xlicenseIssuedBoundaryRevenue": { "chartName": "DSS_TL_DEMAND_COLLECTION_BOUNDARY", "queries": [ @@ -1843,41 +1849,35 @@ } ], "filterKeys": [ - { - "key": "tenantId", - "column": "Boundary" - } + {"key": "tenantId", "column": "Boundary"} ], - "postAggregationTheory": "repsonseToDifferenceOfDates", + "postAggregationTheory" : "repsonseToDifferenceOfDates", "chartType": "xtable", "valueType": "number", "drillChart": "", "plotLabel": "Boundary", - "aggregationPaths": [], + "aggregationPaths": [ + ], "computedFields": [ { - "postAggregationTheory": "repsonseToDifferenceOfDates", + "postAggregationTheory" : "repsonseToDifferenceOfDates", "actionName": "PercentageComputedField", - "fields": [ - "Target Collection", - "Total Collection" - ], - "newField": "Target Achieved", + "fields" : ["Target Collection", "Total Collection"], + "newField" : "Target Achieved", "_comments": "fields are field names picked from its aggregation query to use post aggregation newField value with given new field name " }, { - "postAggregationTheory": "repsonseToDifferenceOfDates", + "postAggregationTheory" : "repsonseToDifferenceOfDates", "actionName": "PercentageComputedField", - "fields": [ - "Target Collection", - "Total Collection" - ], - "newField": "Target Achieved", + "fields" : ["Target Collection", "Total Collection"], + "newField" : "Target Achieved", "_comments": "fields are field names picked from its aggregation query to use post aggregation newField value with given new field name " } ], - "pathDataTypeMapping": [], - "insight": {}, + "pathDataTypeMapping": [ + ], + "insight": { + }, "_comment": "" }, "xptFyByDDR": { @@ -1900,16 +1900,14 @@ ], "isMdmsEnabled": true, "filterKeys": [ - { - "key": "tenantId", - "column": "DDRs" - } + {"key": "tenantId", "column": "DDRs"} ], "chartType": "xtable", "valueType": "number", "drillChart": "xptFyByTenant", "plotLabel": "DDRs", - "insight": {}, + "insight": { + }, "_comment": "" }, "xptFyByTenant": { @@ -1931,16 +1929,14 @@ } ], "filterKeys": [ - { - "key": "tenantId", - "column": "Boundary" - } + {"key": "tenantId", "column": "Boundary"} ], "chartType": "xtable", "valueType": "number", "drillChart": "xptFyByWard", "plotLabel": "Boundary", - "insight": {}, + "insight": { + }, "_comment": "" }, "xptFyByWard": { @@ -1961,14 +1957,17 @@ "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Ward \":{\"terms\":{\"field\":\"Data.ward.name.keyword\"},\"aggs\":{\"Total\":{\"value_count\":{\"field\":\"Data.assessmentNumber.keyword\"}}}}}}}}" } ], - "filterKeys": [], + "filterKeys": [ + ], "chartType": "xtable", "valueType": "number", "drillChart": "none", "plotLabel": "Wards", - "insight": {}, + "insight": { + }, "_comment": "" }, + "xpgrStatusByDDR": { "chartName": "DSS_PGR_STATUS_BY_TENANT", "queries": [ @@ -1982,41 +1981,31 @@ ], "isMdmsEnabled": true, "filterKeys": [ - { - "key": "tenantId", - "column": "DDRs" - } + {"key": "tenantId", "column": "DDRs"} ], "chartType": "xtable", "valueType": "number", "drillChart": "xpgrStatusByTenant", "plotLabel": "DDRs", - "excludedColumns": [ - "withinSLA" - ], + "excludedColumns": ["withinSLA"], "computedFields": [ { - "postAggregationTheory": "", + "postAggregationTheory" : "", "actionName": "PercentageComputedField", - "fields": [ - "Closed Complaints", - "Total Complaints" - ], - "newField": "Completion Rate", + "fields" : ["Closed Complaints", "Total Complaints"], + "newField" : "Completion Rate", "_comments": "fields are field names picked from its aggregation query to use post aggregation newField value with given new field name " }, { - "postAggregationTheory": "", + "postAggregationTheory" : "", "actionName": "PercentageComputedField", - "fields": [ - "withinSLA", - "Total Complaints" - ], - "newField": "Sla Achieved", + "fields" : ["withinSLA","Total Complaints"], + "newField" : "Sla Achieved", "_comments": "fields are field names picked from its aggregation query to use post aggregation newField value with given new field name " } ], - "insight": {}, + "insight": { + }, "_comment": "" }, "xpgrStatusByTenant": { @@ -2031,41 +2020,31 @@ } ], "filterKeys": [ - { - "key": "tenantId", - "column": "Boundary" - } + {"key": "tenantId", "column": "Boundary"} ], "chartType": "xtable", "valueType": "number", "drillChart": "xpgrStatusByWard", "plotLabel": "Boundary", - "excludedColumns": [ - "withinSLA" - ], + "excludedColumns": ["withinSLA"], "computedFields": [ { - "postAggregationTheory": "", + "postAggregationTheory" : "", "actionName": "PercentageComputedField", - "fields": [ - "Closed Complaints", - "Total Complaints" - ], - "newField": "Completion Rate", + "fields" : ["Closed Complaints", "Total Complaints"], + "newField" : "Completion Rate", "_comments": "fields are field names picked from its aggregation query to use post aggregation newField value with given new field name " }, { - "postAggregationTheory": "", + "postAggregationTheory" : "", "actionName": "PercentageComputedField", - "fields": [ - "Total Complaints", - "withinSLA" - ], - "newField": "Sla Achieved", + "fields" : ["Total Complaints", "withinSLA"], + "newField" : "Sla Achieved", "_comments": "fields are field names picked from its aggregation query to use post aggregation newField value with given new field name " } ], - "insight": {}, + "insight": { + }, "_comment": "" }, "xpgrStatusByWard": { @@ -2080,43 +2059,34 @@ } ], "filterKeys": [ - { - "key": "tenantId", - "column": "Boundary" - } + {"key": "tenantId", "column": "Boundary"} ], "chartType": "xtable", "valueType": "number", "drillChart": "none", + "documentType": "_doc", "action": "", "plotLabel": "Ward", - "excludedColumns": [ - "withinSLA" - ], + "excludedColumns": ["withinSLA"], "computedFields": [ { - "postAggregationTheory": "", + "postAggregationTheory" : "", "actionName": "PercentageComputedField", - "fields": [ - "Closed Complaints", - "Total Complaints" - ], - "newField": "Completion Rate", + "fields" : ["Closed Complaints", "Total Complaints"], + "newField" : "Completion Rate", "_comments": "fields are field names picked from its aggregation query to use post aggregation newField value with given new field name " }, { - "postAggregationTheory": "", + "postAggregationTheory" : "", "actionName": "PercentageComputedField", - "fields": [ - "Total Complaints", - "withinSLA" - ], - "newField": "Sla Achieved", + "fields" : ["Total Complaints", "withinSLA"], + "newField" : "Sla Achieved", "_comments": "fields are field names picked from its aggregation query to use post aggregation newField value with given new field name " } ], - "insight": {}, + "insight": { + }, "_comment": "" }, "xpgrStatusByDept": { @@ -2131,43 +2101,34 @@ } ], "filterKeys": [ - { - "key": "departmentId", - "column": "Department" - } + {"key": "departmentId", "column": "Department"} ], "chartType": "xtable", "valueType": "number", "drillChart": "xpgrStatusByCatagory", + "documentType": "_doc", "action": "", "plotLabel": "Department", - "excludedColumns": [ - "withinSLA" - ], + "excludedColumns": ["withinSLA"], "computedFields": [ { - "postAggregationTheory": "", + "postAggregationTheory" : "", "actionName": "PercentageComputedField", - "fields": [ - "Closed Complaints", - "Total Complaints" - ], - "newField": "Completion Rate", + "fields" : ["Closed Complaints", "Total Complaints"], + "newField" : "Completion Rate", "_comments": "fields are field names picked from its aggregation query to use post aggregation newField value with given new field name " }, { - "postAggregationTheory": "", + "postAggregationTheory" : "", "actionName": "PercentageComputedField", - "fields": [ - "Total Complaints", - "withinSLA" - ], - "newField": "Sla Achieved", + "fields" : ["Total Complaints", "withinSLA"], + "newField" : "Sla Achieved", "_comments": "fields are field names picked from its aggregation query to use post aggregation newField value with given new field name " } ], - "insight": {}, + "insight": { + }, "_comment": "" }, "xpgrStatusByCatagory": { @@ -2182,45 +2143,38 @@ } ], "filterKeys": [ - { - "key": "departmentId", - "column": "Department" - } + {"key": "departmentId", "column": "Department"} ], "chartType": "xtable", "valueType": "number", "drillChart": "none", + "documentType": "_doc", "action": "", "plotLabel": "Complaint Category", - "excludedColumns": [ - "withinSLA" - ], + "excludedColumns": ["withinSLA"], "computedFields": [ { - "postAggregationTheory": "", + "postAggregationTheory" : "", "actionName": "PercentageComputedField", - "fields": [ - "Closed Complaints", - "Total Complaints" - ], - "newField": "Completion Rate", + "fields" : ["Closed Complaints", "Total Complaints"], + "newField" : "Completion Rate", "_comments": "fields are field names picked from its aggregation query to use post aggregation newField value with given new field name " }, { - "postAggregationTheory": "", + "postAggregationTheory" : "", "actionName": "PercentageComputedField", - "fields": [ - "Total Complaints", - "withinSLA" - ], - "newField": "Sla Achieved", + "fields" : ["Total Complaints", "withinSLA"], + "newField" : "Sla Achieved", "_comments": "fields are field names picked from its aggregation query to use post aggregation newField value with given new field name " } ], - "insight": {}, + "insight": { + }, "_comment": "" }, + + "_comment": "PGR NON-COLLECTION CHARTS", "completionRate": { "chartName": "DSS_PGR_COMPLETION_RATE", "queries": [ @@ -2242,13 +2196,13 @@ "Total Complaints" ], "insight": { - "chartResponseMap": "completionRate", - "action": "differenceOfNumbers", - "upwardIndicator": "positive", - "downwardIndicator": "negative", - "textMessage": "$indicator$value% than last $insightInterval", - "colorCode": "#228B22", - "insightInterval": "year" + "chartResponseMap" : "completionRate", + "action" : "differenceOfNumbers", + "upwardIndicator" : "positive", + "downwardIndicator" : "negative", + "textMessage" : "$indicator$value% than last $insightInterval", + "colorCode" : "#228B22", + "insightInterval" : "year" }, "_comment": " Total Number of Complaints " }, @@ -2272,13 +2226,13 @@ "Total Complaints" ], "insight": { - "chartResponseMap": "totalComplaints", - "action": "differenceOfNumbers", - "upwardIndicator": "positive", - "downwardIndicator": "negative", - "textMessage": "$indicator$value% than last $insightInterval", - "colorCode": "#228B22", - "insightInterval": "year" + "chartResponseMap" : "totalComplaints", + "action" : "differenceOfNumbers", + "upwardIndicator" : "positive", + "downwardIndicator" : "negative", + "textMessage" : "$indicator$value% than last $insightInterval", + "colorCode" : "#228B22", + "insightInterval" : "year" }, "_comment": " Total Number of Complaints " }, @@ -2302,13 +2256,13 @@ "Closed Complaints" ], "insight": { - "chartResponseMap": "closedComplaints", - "action": "differenceOfNumbers", - "upwardIndicator": "positive", - "downwardIndicator": "negative", - "textMessage": "$indicator$value% than last $insightInterval", - "colorCode": "#228B22", - "insightInterval": "year" + "chartResponseMap" : "closedComplaints", + "action" : "differenceOfNumbers", + "upwardIndicator" : "positive", + "downwardIndicator" : "negative", + "textMessage" : "$indicator$value% than last $insightInterval", + "colorCode" : "#228B22", + "insightInterval" : "year" }, "_comment": " Total Number of Closed Complaints " }, @@ -2332,10 +2286,12 @@ "Closed Complaints", "Reopened Complaints", "Total Complaints" + ], "isCumulative": true, "interval": "month", - "insight": {}, + "insight": { + }, "_comment": " " }, "totalComplaintsbySource": { @@ -2362,7 +2318,8 @@ ], "isCumulative": false, "interval": "month", - "insight": {}, + "insight": { + }, "_comment": " " }, "totalComplaintsbyStatus": { @@ -2387,7 +2344,8 @@ ], "isCumulative": false, "interval": "month", - "insight": {}, + "insight": { + }, "_comment": " " }, "complaintsByStatus": { @@ -2409,7 +2367,8 @@ "aggregationPaths": [ "Complaints By Status" ], - "insight": {}, + "insight": { + }, "_comment": " Complaints By Their Statuses" }, "complaintsByChannel": { @@ -2431,7 +2390,8 @@ "aggregationPaths": [ "Complaints By Channels" ], - "insight": {}, + "insight": { + }, "_comment": " Top 3 Channels For Complaints" }, "complaintsByCategory": { @@ -2453,7 +2413,8 @@ "aggregationPaths": [ "Complaints By Category" ], - "insight": {}, + "insight": { + }, "_comment": " Top 3 Channels For Complaints" }, "complaintsByTenant": { @@ -2475,7 +2436,8 @@ "aggregationPaths": [ "Complaints By Tenant" ], - "insight": {}, + "insight": { + }, "_comment": " Complaints by Tenant" }, "complaintsByDistrict": { @@ -2497,7 +2459,8 @@ "aggregationPaths": [ "Complaints By District" ], - "insight": {}, + "insight": { + }, "_comment": " Complaints by District" }, "complaintsByDepartment": { @@ -2519,7 +2482,8 @@ "aggregationPaths": [ "Complaints By Department" ], - "insight": {}, + "insight": { + }, "_comment": " Complaints by Department" }, "pgrStatusByDDR": { @@ -2535,10 +2499,7 @@ ], "isMdmsEnabled": true, "filterKeys": [ - { - "key": "tenantId", - "column": "DDRs" - } + {"key": "tenantId", "column": "DDRs"} ], "chartType": "table", "valueType": "number", @@ -2581,7 +2542,8 @@ "ReassignRequested": "number" } ], - "insight": {}, + "insight": { + }, "_comment": "" }, "pgrStatusByTenant": { @@ -2596,10 +2558,7 @@ } ], "filterKeys": [ - { - "key": "tenantId", - "column": "Boundary" - } + {"key": "tenantId", "column": "Boundary"} ], "chartType": "table", "valueType": "number", @@ -2642,7 +2601,8 @@ "ReassignRequested": "number" } ], - "insight": {}, + "insight": { + }, "_comment": "" }, "pgrStatusWardDrillDown": { @@ -2656,7 +2616,8 @@ "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Ward \":{\"terms\":{\"field\":\"Data.complaintWard.name.keyword\",\"size\":1000},\"aggs\":{\"Closed Complaints\":{\"filters\":{\"filters\":{\"Open\":{\"match\":{\"Data.status.keyword\":\"open\"}},\"Reopen\":{\"match\":{\"Data.status.keyword\":\"reopen\"}},\"Assigned\":{\"match\":{\"Data.status.keyword\":\"assigned\"}},\"Closed\":{\"match\":{\"Data.status.keyword\":\"closed\"}},\"Resolved\":{\"match\":{\"Data.status.keyword\":\"resolved\"}},\"Rejected\":{\"match\":{\"Data.status.keyword\":\"rejected\"}},\"ReassignRequested\":{\"match\":{\"Data.status.keyword\":\"reassignrequested\"}}}}}}}}}}}" } ], - "filterKeys": [], + "filterKeys": [ + ], "chartType": "table", "valueType": "number", "drillChart": "", @@ -2698,7 +2659,8 @@ "ReassignRequested": "number" } ], - "insight": {}, + "insight": { + }, "_comment": "" }, "pgrStatusByDepartment": { @@ -2713,10 +2675,7 @@ } ], "filterKeys": [ - { - "key": "departmentId", - "column": "Department" - } + {"key": "departmentId", "column": "Department"} ], "chartType": "table", "valueType": "number", @@ -2756,7 +2715,8 @@ "ReassignRequested": "number" } ], - "insight": {}, + "insight": { + }, "_comment": "" }, "pgrStatusCategoryDrillDown": { @@ -2770,7 +2730,8 @@ "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Category \":{\"terms\":{\"field\":\"Data.complainCategory.keyword\",\"size\":1000},\"aggs\":{\"Closed Complaints\":{\"filters\":{\"filters\":{\"Open\":{\"match\":{\"Data.status.keyword\":\"open\"}},\"Reopen\":{\"match\":{\"Data.status.keyword\":\"reopen\"}},\"Assigned\":{\"match\":{\"Data.status.keyword\":\"assigned\"}},\"Closed\":{\"match\":{\"Data.status.keyword\":\"closed\"}},\"Resolved\":{\"match\":{\"Data.status.keyword\":\"resolved\"}},\"Rejected\":{\"match\":{\"Data.status.keyword\":\"rejected\"}},\"ReassignRequested\":{\"match\":{\"Data.status.keyword\":\"reassignrequested\"}}}}}}}}}}}" } ], - "filterKeys": [], + "filterKeys": [ + ], "chartType": "table", "valueType": "number", "drillChart": "", @@ -2812,7 +2773,8 @@ "ReassignRequested": "number" } ], - "insight": {}, + "insight": { + }, "_comment": "" }, "topFiveComplaints": { @@ -2834,7 +2796,8 @@ "aggregationPaths": [ "Complain Category" ], - "insight": {}, + "insight": { + }, "_comment": " Complaints By Their Statuses" }, "averageTurnAroundTime": { @@ -2859,21 +2822,20 @@ ], "computedFields": [ { - "postAggregationTheory": "", + "postAggregationTheory" : "", "actionName": "AverageComputedField", - "fields": [ - "computedValueATA" - ], - "newField": "ATA", + "fields" : ["computedValueATA"], + "newField" : "ATA", "_comments": "fields are field names picked from its aggregation query to use post aggregation newField value with given new field name " } ], "isCumulative": false, "interval": "month", - "insight": {}, + "insight": { + }, "_comment": " " }, - "pgrCitizenOnDateRange": { +"pgrCitizenOnDateRange": { "chartName": "DSS_PGR_CITIZEN", "queries": [ { @@ -2894,10 +2856,15 @@ ], "isCumulative": false, "interval": "month", - "insight": {}, + "insight": { + }, "_comment": " " }, - "wstodaysCollection": { + + + "_comment": "W&S charts below-----------------------------------------------------------------------", + + "wstodaysCollection": { "chartName": "DSS_W&S_TODAYS_COLLECTION", "queries": [ { @@ -2915,7 +2882,8 @@ "aggregationPaths": [ "Total Collection" ], - "insight": {}, + "insight": { + }, "_comment": "W&S todays collections " }, "wstotalCollection": { @@ -2937,7 +2905,8 @@ "aggregationPaths": [ "Total Collection" ], - "insight": {}, + "insight": { + }, "_comment": "W&S total collections " }, "wstargetCollection": { @@ -2945,7 +2914,7 @@ "queries": [ { "module": "COMMON", - "requestQueryMap": "{\"module\" : \"businessService.keyword\", \"tenantId\" : \"ulbName.keyword\"}", + "requestQueryMap": "{\"module\" : \"businessService.keyword\", \"tenantId\" : \"tenantIdForMunicipalCorporation.keyword\"}", "dateRefField": "", "indexName": "dss-target_v1", "aggrQuery": "{\"aggs\":{\"Target Collection\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}" @@ -2960,8 +2929,9 @@ "Target Collection" ], "isDayUnit": true, - "postAggregationTheory": "repsonseToDifferenceOfDates", - "insight": {}, + "postAggregationTheory" : "repsonseToDifferenceOfDates", + "insight": { + }, "_comment": " " }, "wstargetAchieved": { @@ -2981,6 +2951,7 @@ "indexName": "receipts-consumers", "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"status\":\"Cancelled\"}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"totalamount\"}}}}}}" } + ], "translateTenantCode": true, "chartType": "metric", @@ -2993,13 +2964,13 @@ "Actual collection" ], "insight": { - "chartResponseMap": "wstargetAchieved", - "action": "differenceOfNumbers", - "upwardIndicator": "positive", - "downwardIndicator": "negative", - "textMessage": "$indicator$value% than last $insightInterval", - "colorCode": "#228B22", - "insightInterval": "year" + "chartResponseMap" : "wstargetAchieved", + "action" : "differenceOfNumbers", + "upwardIndicator" : "positive", + "downwardIndicator" : "negative", + "textMessage" : "$indicator$value% than last $insightInterval", + "colorCode" : "#228B22", + "insightInterval" : "year" }, "_comment": " " }, @@ -3025,9 +2996,11 @@ ], "isCumulative": true, "interval": "month", - "insight": {}, + "insight": { + }, "_comment": " " }, + "wstopPerformingUlbs": { "chartName": "DSS_W&S_TOP_3_PERFORMING_ULBS", "queries": [ @@ -3056,10 +3029,10 @@ "order": "desc", "limit": 3, "aggregationPaths": [ - "Total Collection", - "Target Collection" + "Total Collection","Target Collection" ], - "insight": {}, + "insight": { + }, "_comment": " Top Performing Ulbs for target achieved" }, "wsbottomPerformingUlbs": { @@ -3090,10 +3063,10 @@ "order": "asc", "limit": 3, "aggregationPaths": [ - "Total Collection", - "Target Collection" + "Total Collection", "Target Collection" ], - "insight": {}, + "insight": { + }, "_comment": " Bottom Performing Ulbs for target achieved" }, "wscollectionByUsage": { @@ -3116,9 +3089,11 @@ "aggregationPaths": [ "Usage Type" ], - "insight": {}, + "insight": { + }, "_comment": " " }, + "wscollectionByChannel": { "chartName": "DSS_W&S_COLLECTION_BY_CHANNEL", "queries": [ @@ -3139,9 +3114,11 @@ "aggregationPaths": [ "Usage Type" ], - "insight": {}, + "insight": { + }, "_comment": " " }, + "wsFinancialIndicatorDDR": { "chartName": "DSS_W&S_DEMAND_COLLECTION_BOUNDARY", "queries": [ @@ -3170,10 +3147,7 @@ "isMdmsEnabled": true, "translateTenantCode": true, "filterKeys": [ - { - "key": "tenantId", - "column": "DDRs" - } + {"key": "tenantId", "column": "DDRs"} ], "chartType": "table", "valueType": "number", @@ -3181,12 +3155,13 @@ "action": "", "plotLabel": "DDRs", "isPostResponseHandler": true, - "postAggregationTheory": "", + "postAggregationTheory" : "", "aggregationPaths": [ "Total Collection", "Total Receipt", "No of Bill", "Project Demand" + ], "pathDataTypeMapping": [ { @@ -3202,7 +3177,8 @@ "Project Demand": "amount" } ], - "insight": {}, + "insight": { + }, "_comment": "" }, "wsFinancialIndicatorUlb": { @@ -3233,10 +3209,7 @@ "isMdmsEnabled": false, "translateTenantCode": true, "filterKeys": [ - { - "key": "tenantId", - "column": "ULB" - } + {"key": "tenantId", "column": "ULB"} ], "chartType": "table", "valueType": "number", @@ -3244,12 +3217,13 @@ "action": "", "plotLabel": "ULB", "isPostResponseHandler": true, - "postAggregationTheory": "", + "postAggregationTheory" : "", "aggregationPaths": [ "Total Collection", "Total Receipt", "No of Bill", "Project Demand" + ], "pathDataTypeMapping": [ { @@ -3265,7 +3239,8 @@ "Project Demand": "amount" } ], - "insight": {}, + "insight": { + }, "_comment": "" }, "wsFinancialIndicatorWard": { @@ -3295,19 +3270,22 @@ ], "isMdmsEnabled": false, "translateTenantCode": true, - "filterKeys": [], + "filterKeys": [ + + ], "chartType": "table", "valueType": "number", "drillChart": "", "action": "", "plotLabel": "Ward", "isPostResponseHandler": true, - "postAggregationTheory": "", + "postAggregationTheory" : "", "aggregationPaths": [ "Total Collection", "Total Receipt", "No of Bill", "Project Demand" + ], "pathDataTypeMapping": [ { @@ -3323,9 +3301,11 @@ "Project Demand": "amount" } ], - "insight": {}, + "insight": { + }, "_comment": "" }, + "wsTaxHeadDDR": { "chartName": "DSS_W&S_TAX_HEAD_BOUNDARY", "queries": [ @@ -3347,17 +3327,14 @@ "translateTenantCode": true, "isMdmsEnabled": true, "filterKeys": [ - { - "key": "tenantId", - "column": "DDRs" - } + {"key": "tenantId", "column": "DDRs"} ], "chartType": "table", "valueType": "number", "drillChart": "wsTaxHeadUlb", "action": "", "plotLabel": "DDRs", - "postAggregationTheory": "", + "postAggregationTheory" : "", "aggregationPaths": [ "Total Collection", "Total Receipt", @@ -3367,6 +3344,7 @@ "Advance", "Current Charges", "Arrear Charges" + ], "pathDataTypeMapping": [ { @@ -3394,7 +3372,8 @@ "Arrear Charges": "amount" } ], - "insight": {}, + "insight": { + }, "_comment": "" }, "wsTaxHeadUlb": { @@ -3418,17 +3397,14 @@ "translateTenantCode": true, "isMdmsEnabled": false, "filterKeys": [ - { - "key": "tenantId", - "column": "ULB" - } + {"key": "tenantId", "column": "ULB"} ], "chartType": "table", "valueType": "number", "drillChart": "wsTaxHeadWard", "action": "", "plotLabel": "ULB", - "postAggregationTheory": "", + "postAggregationTheory" : "", "aggregationPaths": [ "Total Collection", "Total Receipt", @@ -3438,6 +3414,7 @@ "Advance", "Current Charges", "Arrear Charges" + ], "pathDataTypeMapping": [ { @@ -3465,7 +3442,8 @@ "Arrear Charges": "amount" } ], - "insight": {}, + "insight": { + }, "_comment": "" }, "wsTaxHeadWard": { @@ -3488,13 +3466,14 @@ ], "isMdmsEnabled": false, "translateTenantCode": true, - "filterKeys": [], + "filterKeys": [ + ], "chartType": "table", "valueType": "number", "drillChart": "", "action": "", "plotLabel": "Ward", - "postAggregationTheory": "", + "postAggregationTheory" : "", "aggregationPaths": [ "Total Collection", "Total Receipt", @@ -3504,6 +3483,7 @@ "Advance", "Current Charges", "Arrear Charges" + ], "pathDataTypeMapping": [ { @@ -3531,9 +3511,12 @@ "Arrear Charges": "amount" } ], - "insight": {}, + "insight": { + }, "_comment": "" }, + + "wstotalConnection": { "chartName": "DSS_W&S_CONNECTIONS", "queries": [ @@ -3553,7 +3536,8 @@ "aggregationPaths": [ "Total Connection" ], - "insight": {}, + "insight": { + }, "_comment": " " }, "wsActiveUlbs": { @@ -3575,7 +3559,8 @@ "aggregationPaths": [ "Active Ulbs" ], - "insight": {}, + "insight": { + }, "_comment": " " }, "wsNewWaterConnection": { @@ -3597,7 +3582,8 @@ "aggregationPaths": [ "Water Connections" ], - "insight": {}, + "insight": { + }, "_comment": " " }, "wsNewSewerageConnection": { @@ -3619,9 +3605,11 @@ "aggregationPaths": [ "Sewerage Connections" ], - "insight": {}, + "insight": { + }, "_comment": " " }, + "wscumulativeConnections": { "chartName": "DSS_W&S_CUMULATIVE_COLLECTION", "queries": [ @@ -3642,12 +3630,15 @@ "aggregationPaths": [ "Water Connections", "Sewerage Connections" + ], "isCumulative": true, "interval": "month", - "insight": {}, + "insight": { + }, "_comment": " " }, + "wsWaterConsumersByUsageType": { "chartName": "DSS_W&S_WATER_CONNECTION_BY_USAGE", "queries": [ @@ -3668,9 +3659,11 @@ "aggregationPaths": [ "Water Consumers by Usage Type" ], - "insight": {}, + "insight": { + }, "_comment": " " }, + "wsSewerageConsumersByUsageType": { "chartName": "DSS_W&S_SEWERAGE_CONNECTION_BY_USAGE", "queries": [ @@ -3691,9 +3684,11 @@ "aggregationPaths": [ "Sewerage Consumers by Usage Type" ], - "insight": {}, + "insight": { + }, "_comment": " " }, + "wsConsumersByChannel": { "chartName": "DSS_W&S_CONNECTION_BY_CHANNEL", "queries": [ @@ -3714,9 +3709,11 @@ "aggregationPaths": [ "W & S Consumers by Channel" ], - "insight": {}, + "insight": { + }, "_comment": " " }, + "wsConnectionAgeingDDR": { "chartName": "DSS_W&S_CONNECTION_AGEING", "queries": [ @@ -3731,10 +3728,7 @@ "isMdmsEnabled": true, "translateTenantCode": true, "filterKeys": [ - { - "key": "tenantId", - "column": "DDRs" - } + {"key": "tenantId", "column": "DDRs"} ], "chartType": "xtable", "valueType": "number", @@ -3742,7 +3736,7 @@ "action": "", "plotLabel": "DDRs", "isPostResponseHandler": true, - "postAggregationTheory": "", + "postAggregationTheory" : "", "aggregationPaths": [ "Pending from 0 to 3 days", "Pending from 3 to 7 days", @@ -3751,19 +3745,16 @@ ], "computedFields": [ { - "postAggregationTheory": "", + "postAggregationTheory" : "", "actionName": "AdditiveComputedField", - "fields": [ - "Pending from 0 to 3 days", - "Pending from 3 to 7 days", - "Pending from 7 to 15 days", - "Pending more than 15 days" - ], - "newField": "Total Pending", + "fields" : [ "Pending from 0 to 3 days", "Pending from 3 to 7 days", "Pending from 7 to 15 days", "Pending more than 15 days"], + "newField" : "Total Pending", "_comments": "fields are field names picked from its aggregation query to use post aggregation newField value with given new field name " } ], - "insight": {}, + + "insight": { + }, "_comment": "" }, "wsConnectionAgeingUlb": { @@ -3780,10 +3771,7 @@ "isMdmsEnabled": false, "translateTenantCode": true, "filterKeys": [ - { - "key": "tenantId", - "column": "ULB" - } + {"key": "tenantId", "column": "ULB"} ], "chartType": "xtable", "valueType": "number", @@ -3791,28 +3779,26 @@ "action": "", "plotLabel": "ULB", "isPostResponseHandler": true, - "postAggregationTheory": "", + "postAggregationTheory" : "", "aggregationPaths": [ "Pending from 0 to 3 days", "Pending from 3 to 7 days", "Pending from 7 to 15 days", "Pending more than 15 days" + ], "computedFields": [ { - "postAggregationTheory": "", + "postAggregationTheory" : "", "actionName": "AdditiveComputedField", - "fields": [ - "Pending from 0 to 3 days", - "Pending from 3 to 7 days", - "Pending from 7 to 15 days", - "Pending more than 15 days" - ], - "newField": "Total Pending", + "fields" : [ "Pending from 0 to 3 days", "Pending from 3 to 7 days", "Pending from 7 to 15 days", "Pending more than 15 days"], + "newField" : "Total Pending", "_comments": "fields are field names picked from its aggregation query to use post aggregation newField value with given new field name " } ], - "insight": {}, + + "insight": { + }, "_comment": "" }, "wsConnectionAgeingWard": { @@ -3829,10 +3815,7 @@ "isMdmsEnabled": false, "translateTenantCode": true, "filterKeys": [ - { - "key": "tenantId", - "column": "Ward" - } + {"key": "tenantId", "column": "Ward"} ], "chartType": "xtable", "valueType": "number", @@ -3840,27 +3823,27 @@ "action": "", "plotLabel": "Ward", "isPostResponseHandler": true, - "postAggregationTheory": "", + "postAggregationTheory" : "", "aggregationPaths": [ "Pending from 0 to 3 days", "Pending from 3 to 7 days", "Pending from 7 to 15 days", "Pending more than 15 days" + ], "computedFields": [ { - "postAggregationTheory": "", + "postAggregationTheory" : "", "actionName": "AdditiveComputedField", - "fields": [ - "Pending from 0 to 3 days", - "Pending from 3 to 7 days", - "Pending from 7 to 15 days", - "Pending more than 15 days" - ], - "newField": "Total Pending", + "fields" : [ "Pending from 0 to 3 days", "Pending from 3 to 7 days", "Pending from 7 to 15 days", "Pending more than 15 days"], + "newField" : "Total Pending", "_comments": "fields are field names picked from its aggregation query to use post aggregation newField value with given new field name " } ], - "insight": {}, - } + + "insight": { + }, + "_comment": "" + } + } From 6172be1ad3c6de6186db60032308c0f4120e261b Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Thu, 9 Sep 2021 16:45:08 +0530 Subject: [PATCH 0746/1242] added collectionByModule --- .../dashboard-analytics/ChartApiConfig.json | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index f11e4ffc..87a2f785 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -38,6 +38,46 @@ }, "_comment": " " }, + "collectionByModule": { + "chartName": "COLLECTION_BY_MODULE", + "queries": [ + { + "module": "COMMON", + "requestQueryMap": "{\"tenantId\" : \"dataObject.tenantId\"}", + "dateRefField": "", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs":{\"AGGR":{\"filter":{\"bool":{\"must_not":[{\"term":{\"dataObject.tenantId.keyword":"pb.testing"}},{\"terms":{\"dataObject.paymentDetails.bill.status.keyword": ["Cancelled"]}}]}},"aggs":{\"AGGR":{\"terms":{\"field":"dataObject.tenantId.keyword"},"aggs":{\"PT":{\"sum":{\"field":"dataObject.paymentDetails.totalAmountPaid"}},"TL":{\"value_count": {\"field":"dataObject.transactionNumber.keyword"}}}}}}}}" + } + ], + "isMdmsEnabled": true, + "filterKeys": [ + { + "key": "tenantId", + "column": "DDRs" + } + ], + "chartType": "table", + "valueType": "number", + "drillChart": "collectionByModule", + "action": "", + "plotLabel": "DDRs", + "isPostResponseHandler": true, + "postAggregationTheory": "repsonseToDifferenceOfDates", + "aggregationPaths": [ + "PT", + "TL" + ], + "pathDataTypeMapping": [ + { + "PT": "amount" + }, + { + "TL": "amount" + } + ], + "insight": {}, + "_comment": "" + }, "cumulativeCollection": { "chartName": "DSS_TOTAL_CUMULATIVE_COLLECTION", "queries": [ From b36088c7f936cbc097894632e826bf0c162eed3f Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Thu, 9 Sep 2021 16:47:25 +0530 Subject: [PATCH 0747/1242] removed collectionByModule --- .../dashboard-analytics/ChartApiConfig.json | 40 ------------------- 1 file changed, 40 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 87a2f785..f11e4ffc 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -38,46 +38,6 @@ }, "_comment": " " }, - "collectionByModule": { - "chartName": "COLLECTION_BY_MODULE", - "queries": [ - { - "module": "COMMON", - "requestQueryMap": "{\"tenantId\" : \"dataObject.tenantId\"}", - "dateRefField": "", - "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs":{\"AGGR":{\"filter":{\"bool":{\"must_not":[{\"term":{\"dataObject.tenantId.keyword":"pb.testing"}},{\"terms":{\"dataObject.paymentDetails.bill.status.keyword": ["Cancelled"]}}]}},"aggs":{\"AGGR":{\"terms":{\"field":"dataObject.tenantId.keyword"},"aggs":{\"PT":{\"sum":{\"field":"dataObject.paymentDetails.totalAmountPaid"}},"TL":{\"value_count": {\"field":"dataObject.transactionNumber.keyword"}}}}}}}}" - } - ], - "isMdmsEnabled": true, - "filterKeys": [ - { - "key": "tenantId", - "column": "DDRs" - } - ], - "chartType": "table", - "valueType": "number", - "drillChart": "collectionByModule", - "action": "", - "plotLabel": "DDRs", - "isPostResponseHandler": true, - "postAggregationTheory": "repsonseToDifferenceOfDates", - "aggregationPaths": [ - "PT", - "TL" - ], - "pathDataTypeMapping": [ - { - "PT": "amount" - }, - { - "TL": "amount" - } - ], - "insight": {}, - "_comment": "" - }, "cumulativeCollection": { "chartName": "DSS_TOTAL_CUMULATIVE_COLLECTION", "queries": [ From 30cf53ee49e49e9b7b58ea448f5176957e1572d9 Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Thu, 9 Sep 2021 11:00:02 -0400 Subject: [PATCH 0748/1242] update chartapi --- .../dashboard-analytics/ChartApiConfig.json | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index f11e4ffc..13e43b63 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -781,6 +781,46 @@ }, "_comment": "" }, + "collectionByModule": { + "chartName": "COLLECTION_BY_MODULE", + "queries": [ + { + "module": "COMMON", + "requestQueryMap": "{\"tenantId\" : \"dataObject.tenantId\"}", + "dateRefField": "", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"AGGR\":{\"terms\":{\"field\":\"dataObject.tenantId.keyword\"},\"aggs\":{\"PT\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"TL\":{\"value_count\":{\"field\":\"dataObject.transactionNumber.keyword\"}}}}}}}}" + } + ], + "isMdmsEnabled": true, + "filterKeys": [ + { + "key": "tenantId", + "column": "DDRs" + } + ], + "chartType": "table", + "valueType": "number", + "drillChart": "collectionByModule", + "action": "", + "plotLabel": "DDRs", + "isPostResponseHandler": true, + "postAggregationTheory": "repsonseToDifferenceOfDates", + "aggregationPaths": [ + "PT", + "TL" + ], + "pathDataTypeMapping": [ + { + "PT": "amount" + }, + { + "TL": "amount" + } + ], + "insight": {}, + "_comment": "" + }, "demandCollectionIndexBoundaryRevenue": { "chartName": "DSS_PT_DEMAND_COLLECTION_BOUNDARY", "queries": [ From 5a99e039ace0abd27886f84fbb6624baf66ff6df Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Thu, 9 Sep 2021 11:04:32 -0400 Subject: [PATCH 0749/1242] update masterdashboardconfig --- .../dashboard-analytics/MasterDashboardConfig.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json index 826cf940..0a664348 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json @@ -161,8 +161,8 @@ "isCollapsible": false, "charts": [ { - "id": "demandCollectionIndexDDRRevenue", - "name": "DSS_PT_DEMAND_COLLECTION_BOUNDARY", + "id": "collectionByModule", + "name": "COLLECTION_BY_MODULE", "code": "", "chartType": "table", "filter": "", From 9013a7d07025b985515a956d3e8bd9385fee83a8 Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Fri, 10 Sep 2021 15:32:04 +0530 Subject: [PATCH 0750/1242] removing tenantid from collectionbymodule --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 13e43b63..4ee8082e 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -786,7 +786,7 @@ "queries": [ { "module": "COMMON", - "requestQueryMap": "{\"tenantId\" : \"dataObject.tenantId\"}", + "requestQueryMap": "", "dateRefField": "", "indexName": "dss-collection_v2", "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"AGGR\":{\"terms\":{\"field\":\"dataObject.tenantId.keyword\"},\"aggs\":{\"PT\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"TL\":{\"value_count\":{\"field\":\"dataObject.transactionNumber.keyword\"}}}}}}}}" From b8a21cb39c56a82a8001a4c5669ab777d23b1d90 Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Fri, 10 Sep 2021 16:31:33 +0530 Subject: [PATCH 0751/1242] Update Chartapi size added --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 4ee8082e..39e4aaff 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -789,7 +789,7 @@ "requestQueryMap": "", "dateRefField": "", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"AGGR\":{\"terms\":{\"field\":\"dataObject.tenantId.keyword\"},\"aggs\":{\"PT\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"TL\":{\"value_count\":{\"field\":\"dataObject.transactionNumber.keyword\"}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"AGGR\":{\"terms\":{\"field\":\"dataObject.tenantId.keyword\",\"size\":\"200\"},\"aggs\":{\"PT\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"TL\":{\"value_count\":{\"field\":\"dataObject.transactionNumber.keyword\"}}}}}}}}" } ], "isMdmsEnabled": true, From 63212bdd0a11675bcee1ad81940fc0defd1ac5bd Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Fri, 10 Sep 2021 18:49:06 +0530 Subject: [PATCH 0752/1242] added request in collectionbymodule --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 39e4aaff..49a63af0 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -786,7 +786,7 @@ "queries": [ { "module": "COMMON", - "requestQueryMap": "", + "requestQueryMap":"{\"tenantId\" : \"dataObject.tenantId\"}", "dateRefField": "", "indexName": "dss-collection_v2", "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"AGGR\":{\"terms\":{\"field\":\"dataObject.tenantId.keyword\",\"size\":\"200\"},\"aggs\":{\"PT\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"TL\":{\"value_count\":{\"field\":\"dataObject.transactionNumber.keyword\"}}}}}}}}" From e2ee1fe0dd032f3bec7c83ecde7eb744838b8625 Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov <61416590+mahammadnizam-wt-eGov@users.noreply.github.com> Date: Fri, 10 Sep 2021 20:59:06 +0530 Subject: [PATCH 0753/1242] sum TL total amount in collection by module chart --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 49a63af0..b8b64d00 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -789,7 +789,7 @@ "requestQueryMap":"{\"tenantId\" : \"dataObject.tenantId\"}", "dateRefField": "", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"AGGR\":{\"terms\":{\"field\":\"dataObject.tenantId.keyword\",\"size\":\"200\"},\"aggs\":{\"PT\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"TL\":{\"value_count\":{\"field\":\"dataObject.transactionNumber.keyword\"}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"AGGR\":{\"terms\":{\"field\":\"dataObject.tenantId.keyword\",\"size\":\"200\"},\"aggs\":{\"PT\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"TL\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" } ], "isMdmsEnabled": true, From 4461e5ec6f7e5d6bd2ced5c04a3fb557bbc91df0 Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov <61416590+mahammadnizam-wt-eGov@users.noreply.github.com> Date: Fri, 10 Sep 2021 21:16:30 +0530 Subject: [PATCH 0754/1242] Removed tenants filter in the collection by module --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index b8b64d00..64beb92d 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -786,7 +786,7 @@ "queries": [ { "module": "COMMON", - "requestQueryMap":"{\"tenantId\" : \"dataObject.tenantId\"}", + "requestQueryMap":"", "dateRefField": "", "indexName": "dss-collection_v2", "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"AGGR\":{\"terms\":{\"field\":\"dataObject.tenantId.keyword\",\"size\":\"200\"},\"aggs\":{\"PT\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"TL\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" From 7ad4ce0adcde6df29d7376abcf0a6597bbdf696a Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Mon, 13 Sep 2021 09:19:48 -0400 Subject: [PATCH 0755/1242] added requestquery in collectionbymodule --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 64beb92d..95ab43c0 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -786,7 +786,7 @@ "queries": [ { "module": "COMMON", - "requestQueryMap":"", + "requestQueryMap":"\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\"", "dateRefField": "", "indexName": "dss-collection_v2", "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"AGGR\":{\"terms\":{\"field\":\"dataObject.tenantId.keyword\",\"size\":\"200\"},\"aggs\":{\"PT\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"TL\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" From eb5c0ad5852c0275a863748c5e0286ac701bf617 Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Mon, 13 Sep 2021 10:11:32 -0400 Subject: [PATCH 0756/1242] added datafilter in collectionbymodule --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 95ab43c0..dc477cb3 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -787,7 +787,7 @@ { "module": "COMMON", "requestQueryMap":"\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\"", - "dateRefField": "", + "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"AGGR\":{\"terms\":{\"field\":\"dataObject.tenantId.keyword\",\"size\":\"200\"},\"aggs\":{\"PT\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"TL\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" } From 2072bc44ca5d0c6f04c6393a623e21e1733ba964 Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Tue, 14 Sep 2021 09:17:46 +0530 Subject: [PATCH 0757/1242] update chartapi --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index dc477cb3..95ab43c0 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -787,7 +787,7 @@ { "module": "COMMON", "requestQueryMap":"\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\"", - "dateRefField": "dataObject.paymentDetails.receiptDate", + "dateRefField": "", "indexName": "dss-collection_v2", "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"AGGR\":{\"terms\":{\"field\":\"dataObject.tenantId.keyword\",\"size\":\"200\"},\"aggs\":{\"PT\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"TL\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" } From d038c12f8dc2ae4526acaaca6a4fc410612a2a57 Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Tue, 14 Sep 2021 10:25:33 +0530 Subject: [PATCH 0758/1242] update collectionbymodule --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 95ab43c0..77f093eb 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -786,7 +786,7 @@ "queries": [ { "module": "COMMON", - "requestQueryMap":"\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\"", + "requestQueryMap":"\"tenantId\" : \"dataObject.tenantId\"", "dateRefField": "", "indexName": "dss-collection_v2", "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"AGGR\":{\"terms\":{\"field\":\"dataObject.tenantId.keyword\",\"size\":\"200\"},\"aggs\":{\"PT\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"TL\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" From 3b4b68fb787193d5d469177e5156264fd2ad7a16 Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Tue, 14 Sep 2021 10:36:51 +0530 Subject: [PATCH 0759/1242] update chartapi --- .../dashboard-analytics/ChartApiConfig.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 77f093eb..f0c0d5be 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -786,7 +786,7 @@ "queries": [ { "module": "COMMON", - "requestQueryMap":"\"tenantId\" : \"dataObject.tenantId\"", + "requestQueryMap":"", "dateRefField": "", "indexName": "dss-collection_v2", "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"AGGR\":{\"terms\":{\"field\":\"dataObject.tenantId.keyword\",\"size\":\"200\"},\"aggs\":{\"PT\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"TL\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" @@ -805,7 +805,7 @@ "action": "", "plotLabel": "DDRs", "isPostResponseHandler": true, - "postAggregationTheory": "repsonseToDifferenceOfDates", + "postAggregationTheory": "", "aggregationPaths": [ "PT", "TL" From c1a0842d6ce5a0dafb8572601791e8dee6879897 Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Tue, 14 Sep 2021 10:57:09 +0530 Subject: [PATCH 0760/1242] update chartapi --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index f0c0d5be..b8988a05 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -789,7 +789,7 @@ "requestQueryMap":"", "dateRefField": "", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"AGGR\":{\"terms\":{\"field\":\"dataObject.tenantId.keyword\",\"size\":\"200\"},\"aggs\":{\"PT\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"TL\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"AGGR\":{\"terms\":{\"field\":\"dataObject.tenantId.keyword\",\"size\":\"200\"},\"aggs\":{\"PT\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" } ], "isMdmsEnabled": true, From fea6fed83f06dbfdd46703f201c4ef63b63cb6be Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Tue, 14 Sep 2021 11:24:10 +0530 Subject: [PATCH 0761/1242] update chartapi --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index b8988a05..157922f8 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -789,7 +789,7 @@ "requestQueryMap":"", "dateRefField": "", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"AGGR\":{\"terms\":{\"field\":\"dataObject.tenantId.keyword\",\"size\":\"200\"},\"aggs\":{\"PT\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"AGGR\":{\"terms\":{\"field\":\"dataObject.tenantId.keyword\",\"size\":\"200\"},\"aggs\":{\"PT\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\","TL\":{\"value_count\":{\"field\":\"dataObject.transactionNumber.keyword\"}}}}}}}}}}" } ], "isMdmsEnabled": true, From 25253b43a86e5ef1ae94478c85b52ba9b20dd6ff Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Tue, 14 Sep 2021 11:38:22 +0530 Subject: [PATCH 0762/1242] UPDATE JSON --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 157922f8..52cfa2bc 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -789,7 +789,7 @@ "requestQueryMap":"", "dateRefField": "", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"AGGR\":{\"terms\":{\"field\":\"dataObject.tenantId.keyword\",\"size\":\"200\"},\"aggs\":{\"PT\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\","TL\":{\"value_count\":{\"field\":\"dataObject.transactionNumber.keyword\"}}}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"AGGR\":{\"terms\":{\"field\":\"dataObject.tenantId.keyword\",\"size\":\"200\"},\"aggs\":{\"PT\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\",\"TL\":{\"value_count\":{\"field\":\"dataObject.transactionNumber.keyword\"}}}}}}}}}}" } ], "isMdmsEnabled": true, From 02fa09e6b9888ff2b38a1eddb025b0baf6f935a6 Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Tue, 14 Sep 2021 11:52:23 +0530 Subject: [PATCH 0763/1242] added postAggregationTheory --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 52cfa2bc..719136ce 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -805,7 +805,7 @@ "action": "", "plotLabel": "DDRs", "isPostResponseHandler": true, - "postAggregationTheory": "", + "postAggregationTheory": "repsonseToDifferenceOfDates", "aggregationPaths": [ "PT", "TL" From 49b361788d64fa8bf2bedd5fd16866352513779c Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov <61416590+mahammadnizam-wt-eGov@users.noreply.github.com> Date: Tue, 14 Sep 2021 15:26:02 +0530 Subject: [PATCH 0764/1242] Added TL sum in collection by module --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 719136ce..64beb92d 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -789,7 +789,7 @@ "requestQueryMap":"", "dateRefField": "", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"AGGR\":{\"terms\":{\"field\":\"dataObject.tenantId.keyword\",\"size\":\"200\"},\"aggs\":{\"PT\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\",\"TL\":{\"value_count\":{\"field\":\"dataObject.transactionNumber.keyword\"}}}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"AGGR\":{\"terms\":{\"field\":\"dataObject.tenantId.keyword\",\"size\":\"200\"},\"aggs\":{\"PT\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"TL\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" } ], "isMdmsEnabled": true, From 6f8c6725d7ac2f7875d79b454236b07c8dd016fe Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov <61416590+mahammadnizam-wt-eGov@users.noreply.github.com> Date: Tue, 14 Sep 2021 15:31:49 +0530 Subject: [PATCH 0765/1242] Changed DDRs to ULBs in the collection by module --- .../dashboard-analytics/ChartApiConfig.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 64beb92d..3335278a 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -786,7 +786,7 @@ "queries": [ { "module": "COMMON", - "requestQueryMap":"", + "requestQueryMap":"{\"tenantId\" : \"dataObject.tenantId\"}", "dateRefField": "", "indexName": "dss-collection_v2", "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"AGGR\":{\"terms\":{\"field\":\"dataObject.tenantId.keyword\",\"size\":\"200\"},\"aggs\":{\"PT\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"TL\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" @@ -796,14 +796,14 @@ "filterKeys": [ { "key": "tenantId", - "column": "DDRs" + "column": "ULBs" } ], "chartType": "table", "valueType": "number", "drillChart": "collectionByModule", "action": "", - "plotLabel": "DDRs", + "plotLabel": "ULBs", "isPostResponseHandler": true, "postAggregationTheory": "repsonseToDifferenceOfDates", "aggregationPaths": [ From f93bd3e31e50d16f0f5a0ccf30cf967bdc0f9bd0 Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov <61416590+mahammadnizam-wt-eGov@users.noreply.github.com> Date: Tue, 14 Sep 2021 15:47:37 +0530 Subject: [PATCH 0766/1242] Changed size to integer --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 3335278a..0e1d99ef 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -789,7 +789,7 @@ "requestQueryMap":"{\"tenantId\" : \"dataObject.tenantId\"}", "dateRefField": "", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"AGGR\":{\"terms\":{\"field\":\"dataObject.tenantId.keyword\",\"size\":\"200\"},\"aggs\":{\"PT\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"TL\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"AGGR\":{\"terms\":{\"field\":\"dataObject.tenantId.keyword\",\"size\":200},\"aggs\":{\"PT\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"TL\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" } ], "isMdmsEnabled": true, From ac4d15eeb50840a8ced2c1ef900e2f593595405a Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov <61416590+mahammadnizam-wt-eGov@users.noreply.github.com> Date: Wed, 15 Sep 2021 13:03:36 +0530 Subject: [PATCH 0767/1242] Added collections by module based on the DDR ulbs --- .../dashboard-analytics/ChartApiConfig.json | 42 ++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 0e1d99ef..9701679f 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -801,7 +801,47 @@ ], "chartType": "table", "valueType": "number", - "drillChart": "collectionByModule", + "drillChart": "collectionByModuleULBWise", + "action": "", + "plotLabel": "ULBs", + "isPostResponseHandler": true, + "postAggregationTheory": "repsonseToDifferenceOfDates", + "aggregationPaths": [ + "PT", + "TL" + ], + "pathDataTypeMapping": [ + { + "PT": "amount" + }, + { + "TL": "amount" + } + ], + "insight": {}, + "_comment": "" + }, + "collectionByModuleULBWise": { + "chartName": "COLLECTION_BY_MODULE", + "queries": [ + { + "module": "COMMON", + "requestQueryMap":"{\"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", + "dateRefField": "", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"AGGR\":{\"terms\":{\"field\":\"dataObject.tenantId.keyword\",\"size\":200},\"aggs\":{\"PT\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"TL\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" + } + ], + "isMdmsEnabled": true, + "filterKeys": [ + { + "key": "tenantId", + "column": "ULBs" + } + ], + "chartType": "table", + "valueType": "number", + "drillChart": "none", "action": "", "plotLabel": "ULBs", "isPostResponseHandler": true, From 291fb9d1c0b7ee8fd6b885375529c5466c2b6e43 Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov <61416590+mahammadnizam-wt-eGov@users.noreply.github.com> Date: Wed, 15 Sep 2021 13:13:55 +0530 Subject: [PATCH 0768/1242] disabled mdms for collection by module --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 9701679f..6b2c471a 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -792,7 +792,7 @@ "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"AGGR\":{\"terms\":{\"field\":\"dataObject.tenantId.keyword\",\"size\":200},\"aggs\":{\"PT\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"TL\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" } ], - "isMdmsEnabled": true, + "isMdmsEnabled": false, "filterKeys": [ { "key": "tenantId", From 08f8f89e004d8b57f7d0377787752c92c3e1e806 Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov <61416590+mahammadnizam-wt-eGov@users.noreply.github.com> Date: Wed, 15 Sep 2021 13:29:44 +0530 Subject: [PATCH 0769/1242] Removed collection by module for ULBs wise --- .../dashboard-analytics/ChartApiConfig.json | 40 ------------------- 1 file changed, 40 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 6b2c471a..cf34d43b 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -801,46 +801,6 @@ ], "chartType": "table", "valueType": "number", - "drillChart": "collectionByModuleULBWise", - "action": "", - "plotLabel": "ULBs", - "isPostResponseHandler": true, - "postAggregationTheory": "repsonseToDifferenceOfDates", - "aggregationPaths": [ - "PT", - "TL" - ], - "pathDataTypeMapping": [ - { - "PT": "amount" - }, - { - "TL": "amount" - } - ], - "insight": {}, - "_comment": "" - }, - "collectionByModuleULBWise": { - "chartName": "COLLECTION_BY_MODULE", - "queries": [ - { - "module": "COMMON", - "requestQueryMap":"{\"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", - "dateRefField": "", - "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"AGGR\":{\"terms\":{\"field\":\"dataObject.tenantId.keyword\",\"size\":200},\"aggs\":{\"PT\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"TL\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" - } - ], - "isMdmsEnabled": true, - "filterKeys": [ - { - "key": "tenantId", - "column": "ULBs" - } - ], - "chartType": "table", - "valueType": "number", "drillChart": "none", "action": "", "plotLabel": "ULBs", From f339767051d13124de7a09944c197ae50ce557f0 Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov <61416590+mahammadnizam-wt-eGov@users.noreply.github.com> Date: Wed, 15 Sep 2021 15:17:48 +0530 Subject: [PATCH 0770/1242] Added business service filter in the collection by module --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index cf34d43b..ebf88c1a 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -789,7 +789,7 @@ "requestQueryMap":"{\"tenantId\" : \"dataObject.tenantId\"}", "dateRefField": "", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"AGGR\":{\"terms\":{\"field\":\"dataObject.tenantId.keyword\",\"size\":200},\"aggs\":{\"PT\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"TL\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"AGGR\":{\"terms\":{\"field\":\"dataObject.tenantId.keyword\",\"size\":200},\"aggs\":{\"PT\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"dataObject.paymentDetails.businessService.keyword\":\"PT\"}}]}},\"aggs\":{\"AGGRS\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}},\"TL\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"dataObject.paymentDetails.businessService.keyword\":\"TL\"}}]}},\"aggs\":{\"AGGRS\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}}}" } ], "isMdmsEnabled": false, From 4b1d62d948ff59ba02e25512e770ab341ec1beb8 Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Sat, 18 Sep 2021 13:15:59 +0530 Subject: [PATCH 0771/1242] added WS in collectionbymodule --- .../dashboard-analytics/ChartApiConfig.json | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index ebf88c1a..f415bef3 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -789,7 +789,7 @@ "requestQueryMap":"{\"tenantId\" : \"dataObject.tenantId\"}", "dateRefField": "", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"AGGR\":{\"terms\":{\"field\":\"dataObject.tenantId.keyword\",\"size\":200},\"aggs\":{\"PT\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"dataObject.paymentDetails.businessService.keyword\":\"PT\"}}]}},\"aggs\":{\"AGGRS\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}},\"TL\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"dataObject.paymentDetails.businessService.keyword\":\"TL\"}}]}},\"aggs\":{\"AGGRS\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"AGGR\":{\"terms\":{\"field\":\"dataObject.tenantId.keyword\",\"size\":200},\"aggs\":{\"PT\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"dataObject.paymentDetails.businessService.keyword\":\"PT\"}}]}},\"aggs\":{\"AGGRS\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}},\"TL\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"dataObject.paymentDetails.businessService.keyword\":\"TL\"}}]}},\"aggs\":{\"AGGRS\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}},\"WS\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"dataObject.paymentDetails.businessService.keyword\":\"WS\"}}]}},\"aggs\":{\"AGGRS\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}}}" } ], "isMdmsEnabled": false, @@ -808,7 +808,8 @@ "postAggregationTheory": "repsonseToDifferenceOfDates", "aggregationPaths": [ "PT", - "TL" + "TL", + "WS" ], "pathDataTypeMapping": [ { @@ -816,6 +817,9 @@ }, { "TL": "amount" + }, + { + "WS": "amount" } ], "insight": {}, From cda98d2b5b837f472126b965282714ce024200a8 Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Sun, 19 Sep 2021 14:25:41 +0530 Subject: [PATCH 0772/1242] Added one More Table for ERP W&S on overview page --- .../MasterDashboardConfig.json | 44 +++++++++++++++---- 1 file changed, 36 insertions(+), 8 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json index 0a664348..a5ee49c8 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json @@ -172,13 +172,41 @@ ] } ] - }, - { + }, + { "row": 4, + "name": "DSS_REVENUE", + "vizArray": [ + { + "id": 141, + "name": "DSS_PT_KEY_FY_INDICATORS", + "dimensions": { + "height": 350, + "width": 12 + }, + "vizType": "chart", + "noUnit": false, + "isCollapsible": false, + "charts": [ + { + "id": "collectionByModule", + "name": "COLLECTION_BY_MODULE", + "code": "", + "chartType": "table", + "filter": "", + "headers": [], + "tabName": "Boundary" + } + ] + } + ] + }, + { + "row": 5, "name": "DSS_SERVICE", "vizArray": [ { - "id": 141, + "id": 151, "name": "DSS_OVERVIEW", "dimensions": { "height": 450, @@ -223,7 +251,7 @@ ] }, { - "id": 142, + "id": 152, "name": "DSS_TOTAL_APPLICATION_&_CLOSED_APPLICATION", "dimensions": { "height": 450, @@ -245,11 +273,11 @@ ] }, { - "row": 5, + "row": 6, "name": "DSS_SERVICE", "vizArray": [ { - "id": 151, + "id": 161, "name": "DSS_TOP_PERFORMING_ULBS", "dimensions": { "height": 250, @@ -270,7 +298,7 @@ ] }, { - "id": 152, + "id": 162, "name": "DSS_BOTTOM_PERFORMING_ULBS", "dimensions": { "height": 250, @@ -290,7 +318,7 @@ ] }, { - "id": 153, + "id": 163, "name": "DSS_TOTAL_APPLICATIONS:_DEPARTMENT_WISE", "dimensions": { "height": 250, From 72b59363cf942a8a2f92694952647644910c69a9 Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Sun, 19 Sep 2021 14:51:49 +0530 Subject: [PATCH 0773/1242] Update 141 id --- .../dashboard-analytics/MasterDashboardConfig.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json index a5ee49c8..5e2c20cb 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json @@ -179,7 +179,7 @@ "vizArray": [ { "id": 141, - "name": "DSS_PT_KEY_FY_INDICATORS", + "name": "DSS_W&S_TAX_HEAD_BOUNDARY", "dimensions": { "height": 350, "width": 12 @@ -189,8 +189,8 @@ "isCollapsible": false, "charts": [ { - "id": "collectionByModule", - "name": "COLLECTION_BY_MODULE", + "id": "wsTaxHeadDDR", + "name": "DSS_W&S_TAX_HEAD_BOUNDARY", "code": "", "chartType": "table", "filter": "", From c17efa566ee34d4d23e5b46974236b3625bd4f02 Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Sun, 19 Sep 2021 15:46:18 +0530 Subject: [PATCH 0774/1242] making isCollapsible as true for ERPWS --- .../dashboard-analytics/MasterDashboardConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json index 5e2c20cb..48056958 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json @@ -186,7 +186,7 @@ }, "vizType": "chart", "noUnit": false, - "isCollapsible": false, + "isCollapsible": true, "charts": [ { "id": "wsTaxHeadDDR", From 31ad7aaec79f4f76435c69c450eba2813d1ebd31 Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Sun, 19 Sep 2021 17:52:36 +0530 Subject: [PATCH 0775/1242] removed 'boundary' tab name collectionbymodule --- .../dashboard-analytics/MasterDashboardConfig.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json index 48056958..46999d25 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json @@ -167,7 +167,7 @@ "chartType": "table", "filter": "", "headers": [], - "tabName": "Boundary" + "tabName": "" } ] } @@ -186,7 +186,7 @@ }, "vizType": "chart", "noUnit": false, - "isCollapsible": true, + "isCollapsible": false, "charts": [ { "id": "wsTaxHeadDDR", @@ -195,7 +195,7 @@ "chartType": "table", "filter": "", "headers": [], - "tabName": "Boundary" + "tabName": "" } ] } From 26dc869ac1b0e7b142573d75268f3f86baef6529 Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Sun, 19 Sep 2021 17:56:22 +0530 Subject: [PATCH 0776/1242] renamed name for PT,TL,WS in collectionbymodule --- .../dashboard-analytics/MasterDashboardConfig.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json index 46999d25..37e2cbc5 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json @@ -151,7 +151,7 @@ "vizArray": [ { "id": 131, - "name": "DSS_PT_KEY_FY_INDICATORS", + "name": "PT & TL TOTAL COLLECTION ", "dimensions": { "height": 350, "width": 12 @@ -179,7 +179,7 @@ "vizArray": [ { "id": 141, - "name": "DSS_W&S_TAX_HEAD_BOUNDARY", + "name": "W&S TOTAL COLLECTION", "dimensions": { "height": 350, "width": 12 From 84ee8ff44f1ffd2704597439fee57e72ed48f053 Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Sun, 19 Sep 2021 18:01:31 +0530 Subject: [PATCH 0777/1242] update w&S --- .../dashboard-analytics/MasterDashboardConfig.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json index 37e2cbc5..26b8d4fe 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json @@ -151,7 +151,7 @@ "vizArray": [ { "id": 131, - "name": "PT & TL TOTAL COLLECTION ", + "name": "PT ,TL ,WS TOTAL COLLECTION ", "dimensions": { "height": 350, "width": 12 @@ -179,7 +179,7 @@ "vizArray": [ { "id": 141, - "name": "W&S TOTAL COLLECTION", + "name": "W&S ERP TOTAL COLLECTION", "dimensions": { "height": 350, "width": 12 From 6d91a7c413bf5e727ca63c4313e492240c7886e2 Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Sun, 19 Sep 2021 18:06:01 +0530 Subject: [PATCH 0778/1242] removing tabname in collectionbymodule --- .../dashboard-analytics/MasterDashboardConfig.json | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json index 26b8d4fe..0f3ea6b3 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json @@ -166,8 +166,7 @@ "code": "", "chartType": "table", "filter": "", - "headers": [], - "tabName": "" + "headers": [] } ] } @@ -194,8 +193,7 @@ "code": "", "chartType": "table", "filter": "", - "headers": [], - "tabName": "" + "headers": [] } ] } From 3fdf31f9ae505174777ba276efdd361613b8409e Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Sun, 19 Sep 2021 18:17:13 +0530 Subject: [PATCH 0779/1242] rempove header in collectionbymodule --- .../dashboard-analytics/MasterDashboardConfig.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json index 0f3ea6b3..87ededcb 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json @@ -165,8 +165,7 @@ "name": "COLLECTION_BY_MODULE", "code": "", "chartType": "table", - "filter": "", - "headers": [] + "filter": "" } ] } From 5653d22e8ed558d865db83d3bf00111abccc8224 Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Sun, 19 Sep 2021 18:18:26 +0530 Subject: [PATCH 0780/1242] added header in collectionbymodule --- .../dashboard-analytics/MasterDashboardConfig.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json index 87ededcb..0f3ea6b3 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json @@ -165,7 +165,8 @@ "name": "COLLECTION_BY_MODULE", "code": "", "chartType": "table", - "filter": "" + "filter": "", + "headers": [] } ] } From f54642bc364beea04b9f8e70f58c0c921a9132c3 Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Mon, 20 Sep 2021 10:37:43 +0530 Subject: [PATCH 0781/1242] aDDED DATE filter in collectionbymodule --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index f415bef3..4e1b6783 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -787,7 +787,7 @@ { "module": "COMMON", "requestQueryMap":"{\"tenantId\" : \"dataObject.tenantId\"}", - "dateRefField": "", + "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"AGGR\":{\"terms\":{\"field\":\"dataObject.tenantId.keyword\",\"size\":200},\"aggs\":{\"PT\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"dataObject.paymentDetails.businessService.keyword\":\"PT\"}}]}},\"aggs\":{\"AGGRS\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}},\"TL\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"dataObject.paymentDetails.businessService.keyword\":\"TL\"}}]}},\"aggs\":{\"AGGRS\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}},\"WS\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"dataObject.paymentDetails.businessService.keyword\":\"WS\"}}]}},\"aggs\":{\"AGGRS\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}}}" } From 213387dafb9d342a32624f7407f23a1065037aa0 Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov <61416590+mahammadnizam-wt-eGov@users.noreply.github.com> Date: Wed, 29 Sep 2021 18:10:38 +0530 Subject: [PATCH 0782/1242] [PI-1767]-Added indexer config file for whatsapp chatbot adoption data --- configs/egov-indexer/whatsapp-adoption-data | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 configs/egov-indexer/whatsapp-adoption-data diff --git a/configs/egov-indexer/whatsapp-adoption-data b/configs/egov-indexer/whatsapp-adoption-data new file mode 100644 index 00000000..df0c23f7 --- /dev/null +++ b/configs/egov-indexer/whatsapp-adoption-data @@ -0,0 +1,11 @@ +ServiceMaps: + serviceName: Collection Service + version: 1.0.0 + mappings: + - topic: whatsapp-adoption-data + configKey: INDEX + indexes: + - name: whatsapp-adoption-data + type: general + id: $.id + isBulk: true From cace71d90d7c39d5afd00dffdfdaad3ed639f578 Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov <61416590+mahammadnizam-wt-eGov@users.noreply.github.com> Date: Wed, 29 Sep 2021 18:12:37 +0530 Subject: [PATCH 0783/1242] Rename whatsapp-adoption-data to whatsapp-adoption-data.yaml --- .../{whatsapp-adoption-data => whatsapp-adoption-data.yaml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename configs/egov-indexer/{whatsapp-adoption-data => whatsapp-adoption-data.yaml} (100%) diff --git a/configs/egov-indexer/whatsapp-adoption-data b/configs/egov-indexer/whatsapp-adoption-data.yaml similarity index 100% rename from configs/egov-indexer/whatsapp-adoption-data rename to configs/egov-indexer/whatsapp-adoption-data.yaml From 395a143808afa230dc8f1cab9c47b828e7feb09f Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov <61416590+mahammadnizam-wt-eGov@users.noreply.github.com> Date: Wed, 29 Sep 2021 18:22:41 +0530 Subject: [PATCH 0784/1242] Update whatsapp-adoption-data.yaml --- configs/egov-indexer/whatsapp-adoption-data.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/egov-indexer/whatsapp-adoption-data.yaml b/configs/egov-indexer/whatsapp-adoption-data.yaml index df0c23f7..4f7b13c0 100644 --- a/configs/egov-indexer/whatsapp-adoption-data.yaml +++ b/configs/egov-indexer/whatsapp-adoption-data.yaml @@ -9,3 +9,4 @@ ServiceMaps: type: general id: $.id isBulk: true + jsonPath: $.* From acac0585ec9f55a89e6cfa2c348faaebab282d07 Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Thu, 30 Sep 2021 10:50:02 +0530 Subject: [PATCH 0785/1242] added wsTaxHeadDDROverview added wsTaxHeadDDROverview for overview page for erp W&S --- .../dashboard-analytics/ChartApiConfig.json | 52 +++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 4e1b6783..1e818dc8 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -3419,6 +3419,58 @@ "insight": { }, "_comment": "" + }, + "wsTaxHeadDDROverview": { + "chartName": "DSS_W&S_TAX_HEAD_BOUNDARY", + "queries": [ + { + "module": "W&S", + "requestQueryMap": "{\"tenantId\" : \"cityname.keyword\", \"wardId\" : \"block.keyword\" }", + "dateRefField": "receiptdate", + "indexName": "receipts-consumers", + "aggrQuery": "{\"aggs\":{\"Total Collection\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"status\":\"Cancelled\"}}]}},\"aggs\":{\"collection\":{\"sum\":{\"field\":\"totalamount\"}}}},\"Total Receipt\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"status\":\"Cancelled\"}}]}},\"aggs\":{\"receipt\":{\"value_count\":{\"field\":\"receiptnumber.keyword\"}}}}}}" + }, + { + "module": "W&S", + "requestQueryMap": "{\"tenantId\" : \"cityname.keyword\", \"wardId\" : \"block.keyword\" }", + "dateRefField": "billdate", + "indexName": "demandbillconsumers", + "aggrQuery": "{\"aggs\":{\"No of Bill\":{\"filter\":{\"term\":{\"billgenerated\":true}},\"aggs\":{\"approved\":{\"value_count\":{\"field\":\"installmentfrom.keyword\"}}}},\"Late charges\":{\"filter\":{\"term\":{\"billgenerated\":true}},\"aggs\":{\"penalty\":{\"sum\":{\"field\":\"penaltycollection\"}}}},\"Interest\":{\"filter\":{\"term\":{\"billgenerated\":true}},\"aggs\":{\"interest\":{\"sum\":{\"field\":\"interestcollection\"}}}},\"Advance\":{\"filter\":{\"term\":{\"billgenerated\":true}},\"aggs\":{\"advance\":{\"sum\":{\"field\":\"advancecollection\"}}}},\"Current Charges\":{\"filter\":{\"term\":{\"billgenerated\":true}},\"aggs\":{\"advance\":{\"sum\":{\"field\":\"currentcharges\"}}}},\"Arrear Charges\":{\"filter\":{\"term\":{\"billgenerated\":true}},\"aggs\":{\"advance\":{\"sum\":{\"field\":\"arrearcharges\"}}}}}}}" + } + ], + "translateTenantCode": true, + "isMdmsEnabled": true, + "filterKeys": [ + {"key": "tenantId", "column": "DDRs"} + ], + "chartType": "table", + "valueType": "number", + "drillChart": "wsTaxHeadUlb", + "action": "", + "plotLabel": "DDRs", + "postAggregationTheory" : "", + "aggregationPaths": [ + "Total Collection", + "Total Receipt", + "No of Bill", + "Late charges", + "Interest", + "Advance", + "Current Charges", + "Arrear Charges" + + ], + "pathDataTypeMapping": [ + { + "Total Collection": "amount" + }, + { + "Total Receipt": "number" + } + ], + "insight": { + }, + "_comment": "" }, "wsTaxHeadUlb": { "chartName": "DSS_W&S_TAX_HEAD_BOUNDARY", From 0ac8c89969363356334feebaa6524c7492391c16 Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Thu, 30 Sep 2021 10:51:01 +0530 Subject: [PATCH 0786/1242] chnage wsTaxHeadDDR to wsTaxHeadDDROverview for erp w&S on overview page --- .../dashboard-analytics/MasterDashboardConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json index 0f3ea6b3..edad091d 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json @@ -188,7 +188,7 @@ "isCollapsible": false, "charts": [ { - "id": "wsTaxHeadDDR", + "id": "wsTaxHeadDDROverview", "name": "DSS_W&S_TAX_HEAD_BOUNDARY", "code": "", "chartType": "table", From 6b53ab097abda4c2aa3ebd8a2f0359b4e9d04a2b Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Thu, 30 Sep 2021 11:09:38 +0530 Subject: [PATCH 0787/1242] update wsTaxHeadDDROverview --- .../dashboard-analytics/ChartApiConfig.json | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 1e818dc8..0f137787 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -3466,7 +3466,26 @@ }, { "Total Receipt": "number" + }, + { + "No of Bill": "number" + }, + { + "Late charges": "amount" + }, + { + "Interest": "amount" + }, + { + "Advance": "amount" + }, + { + "Current Charges": "amount" + }, + { + "Arrear Charges": "amount" } + ], "insight": { }, From 378821f5258a3370ac35dddfe6734131769022a8 Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Thu, 30 Sep 2021 11:30:16 +0530 Subject: [PATCH 0788/1242] update wsTaxHeadDDROverview removing unwanted parameter --- .../dashboard-analytics/ChartApiConfig.json | 30 ++----------------- 1 file changed, 2 insertions(+), 28 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 0f137787..5e4ddd16 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -3451,14 +3451,7 @@ "postAggregationTheory" : "", "aggregationPaths": [ "Total Collection", - "Total Receipt", - "No of Bill", - "Late charges", - "Interest", - "Advance", - "Current Charges", - "Arrear Charges" - + "Total Receipt" ], "pathDataTypeMapping": [ { @@ -3466,26 +3459,7 @@ }, { "Total Receipt": "number" - }, - { - "No of Bill": "number" - }, - { - "Late charges": "amount" - }, - { - "Interest": "amount" - }, - { - "Advance": "amount" - }, - { - "Current Charges": "amount" - }, - { - "Arrear Charges": "amount" - } - + } ], "insight": { }, From a5129e0a42107708d693f92afb1eb1d1de8eb291 Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Thu, 30 Sep 2021 15:01:32 +0530 Subject: [PATCH 0789/1242] changed DSS_PT_BOTTOM_3_PERFORMING_ULBS change DSS_PT_BOTTOM_3_PERFORMING_ULBS to collection by channel --- .../dashboard-analytics/MasterDashboardConfig.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json index edad091d..40e8e6e5 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json @@ -452,15 +452,15 @@ "height": 250, "width": 4 }, - "vizType": "performing-metric", - "noUnit": false, + "vizType": "chart", + "noUnit": true, "isCollapsible": false, "charts": [ { - "id": "bottomPerformingUlbs", + "id": "collectionByUsageType", "name": "DSS_PT_BOTTOM_3_PERFORMING_ULBS", "code": "", - "chartType": "bar", + "chartType": "donut", "filter": "", "headers": [] } From ff6ee4cc8484dd538d7507539dd4a101ae18a356 Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Thu, 30 Sep 2021 15:08:27 +0530 Subject: [PATCH 0790/1242] Removing header content from mcollect- challan --- .../format-config/mcollect-challan.json | 41 ++----------------- 1 file changed, 4 insertions(+), 37 deletions(-) diff --git a/configs/pdf-service/format-config/mcollect-challan.json b/configs/pdf-service/format-config/mcollect-challan.json index 3f1cc2b9..52f0c0a2 100644 --- a/configs/pdf-service/format-config/mcollect-challan.json +++ b/configs/pdf-service/format-config/mcollect-challan.json @@ -22,52 +22,19 @@ ], "body": [ [ - { - "text": "{{letter-code}}", - "style": "receipt-logo-header" - }, + { "text": "{{letter-header}}", "alignment": "center", "style": "receipt-logo-header" }, - { - "text": "{{letter-section}}", - "alignment": "right", - "color": "#484848", - "style": "receipt-logo-header", - "margin": [ - 0, - 0, - -30, - 0 - ] - } + ] ] }, "layout": "noBorders" }, - { - "canvas": [ - { - "type": "line", - "x1": -25, - "y1": -5, - "x2": 540, - "y2": -5, - "lineWidth": 0.1 - }, - { - "type": "line", - "x1": -25, - "y1": -2.5, - "x2": 540, - "y2": -2.5, - "lineWidth": 0.1 - } - ] - }, + { "style": "noc-table2", "table": { @@ -846,4 +813,4 @@ } } } -} \ No newline at end of file +} From 59438bccd295fd0f4acdd97102fac91433016ec4 Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Thu, 30 Sep 2021 15:54:49 +0530 Subject: [PATCH 0791/1242] added ptcollectionByPaymentMode --- .../dashboard-analytics/ChartApiConfig.json | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 5e4ddd16..2d44eacf 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -577,6 +577,29 @@ }, "_comment": " collection/amount per usage type" }, + "ptcollectionByPaymentMode": { + "chartName": "DSS_PT_COLLECTION_BY_PAYMENT_MODE", + "queries": [ + { + "module": "COMMON", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}],\"must\":[{\"term\":{\"dataObject.paymentDetails.businessService.keyword\":\"PT\"}}]}},\"aggs\":{\"Payment Mode\":{\"terms\":{\"field\":\"dataObject.paymentMode.keyword\",\"size\":200}}}}}}" + } + ], + "chartType": "pie", + "valueType": "amount", + "action": "", + "documentType": "_doc", + "drillChart": "none", + "aggregationPaths": [ + "Usage Type" + ], + "insight": { + }, + "_comment": " collection/amount per payment mode" + }, "_comment": "PT NON-COLLECTION CHARTS", "propertiesByUsageType": { From 7428d398f65b13658e1ebe32c90df73e5a698f84 Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Thu, 30 Sep 2021 15:56:33 +0530 Subject: [PATCH 0792/1242] update id-222 DSS_PT_COLLECTION_BY_PAYMENT_MODE and ptcollectionByPaymentMode --- .../dashboard-analytics/MasterDashboardConfig.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json index 40e8e6e5..69315fba 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json @@ -447,7 +447,7 @@ }, { "id": 222, - "name": "DSS_PT_BOTTOM_3_PERFORMING_ULBS", + "name": "DSS_PT_COLLECTION_BY_PAYMENT_MODE", "dimensions": { "height": 250, "width": 4 @@ -457,8 +457,8 @@ "isCollapsible": false, "charts": [ { - "id": "collectionByUsageType", - "name": "DSS_PT_BOTTOM_3_PERFORMING_ULBS", + "id": "ptcollectionByPaymentMode", + "name": "DSS_PT_COLLECTION_BY_PAYMENT_MODE", "code": "", "chartType": "donut", "filter": "", From 03828746ca08baafceb58f27a91cb39a2806944c Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Thu, 30 Sep 2021 16:32:43 +0530 Subject: [PATCH 0793/1242] change aggregationPaths --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 2d44eacf..700bc702 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -594,7 +594,7 @@ "documentType": "_doc", "drillChart": "none", "aggregationPaths": [ - "Usage Type" + "Payment Mode" ], "insight": { }, From 50b87aa40c56f12701985899010e29ffce8c3503 Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Fri, 1 Oct 2021 09:59:19 +0530 Subject: [PATCH 0794/1242] new change in mcollect-Challan --- .../format-config/mcollect-challan.json | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/configs/pdf-service/format-config/mcollect-challan.json b/configs/pdf-service/format-config/mcollect-challan.json index 52f0c0a2..740c632f 100644 --- a/configs/pdf-service/format-config/mcollect-challan.json +++ b/configs/pdf-service/format-config/mcollect-challan.json @@ -20,15 +20,29 @@ "33%", "33%" ], - "body": [ + "body": [ [ - + { + "text": " ", + "style": "receipt-logo-header" + }, { "text": "{{letter-header}}", "alignment": "center", "style": "receipt-logo-header" }, - + { + "text": " ", + "alignment": "right", + "color": "#484848", + "style": "receipt-logo-header", + "margin": [ + 0, + 0, + -30, + 0 + ] + } ] ] }, From 4762c4a377f1bd975053e09991601851609e5632 Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Fri, 1 Oct 2021 14:36:29 +0530 Subject: [PATCH 0795/1242] updating guardian name in sw-bill data config UAT_V2 --- configs/pdf-service/data-config/sw-bill.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/configs/pdf-service/data-config/sw-bill.json b/configs/pdf-service/data-config/sw-bill.json index f1690ec8..c4316789 100644 --- a/configs/pdf-service/data-config/sw-bill.json +++ b/configs/pdf-service/data-config/sw-bill.json @@ -821,6 +821,14 @@ { "variable": "landmark", "value": "$.Properties[0].address.landmark" + }, + { + "variable": "ownerName", + "value": "$.Properties[0].owners[0].name" + }, + { + "variable": "guardianName", + "value": "$.Properties[0].owners[0].fatherOrHusbandName" } ] From b1da7763df9a062f5d40b0a11f7f1c70be943b0f Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Fri, 1 Oct 2021 14:45:19 +0530 Subject: [PATCH 0796/1242] update ptcollectionByPaymentMode --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 700bc702..630847cb 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -583,7 +583,7 @@ { "module": "COMMON", "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", - "dateRefField": "dataObject.paymentDetails.receiptDate", + "dateRefField": "Data.@timestamp", "indexName": "dss-collection_v2", "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}],\"must\":[{\"term\":{\"dataObject.paymentDetails.businessService.keyword\":\"PT\"}}]}},\"aggs\":{\"Payment Mode\":{\"terms\":{\"field\":\"dataObject.paymentMode.keyword\",\"size\":200}}}}}}" } From fa5cdd1eec18d6527a49b0392494221021586f7c Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Fri, 1 Oct 2021 15:28:47 +0530 Subject: [PATCH 0797/1242] update ptcollectionByPaymentMode --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 630847cb..700bc702 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -583,7 +583,7 @@ { "module": "COMMON", "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", - "dateRefField": "Data.@timestamp", + "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}],\"must\":[{\"term\":{\"dataObject.paymentDetails.businessService.keyword\":\"PT\"}}]}},\"aggs\":{\"Payment Mode\":{\"terms\":{\"field\":\"dataObject.paymentMode.keyword\",\"size\":200}}}}}}" } From b39cad46f95c698640404f1da61ec9df19199526 Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Fri, 1 Oct 2021 16:28:54 +0530 Subject: [PATCH 0798/1242] changes for guardian name in sw.bill format config --- configs/pdf-service/format-config/sw-bill.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/configs/pdf-service/format-config/sw-bill.json b/configs/pdf-service/format-config/sw-bill.json index 29047578..020b5c8a 100644 --- a/configs/pdf-service/format-config/sw-bill.json +++ b/configs/pdf-service/format-config/sw-bill.json @@ -318,7 +318,7 @@ "style": "receipt-table-value2" }, { - "text": "Street Name", + "text": "Guardian Name", "border": [ false, false, @@ -350,7 +350,7 @@ "style": "receipt-table2" }, { - "text": "{{payerName}}", + "text": "{{ownerName}}", "border": [ false, false, @@ -360,7 +360,7 @@ "style": "receipt-table2" }, { - "text": "{{streetName}}", + "text": "{{guardianName}}", "border": [ false, false, @@ -402,7 +402,7 @@ "style": "receipt-table-value2" }, { - "text": "Landmark", + "text": "Street Name/Landmark", "border": [ false, false, @@ -445,7 +445,7 @@ "style": "receipt-table2" }, { - "text":"{{landmark}}", + "text":"{{streetName}}{{landmark}}", "border": [ false, false, From a5990e5704952c4d5b41f3291b54a04c456e8d62 Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Tue, 5 Oct 2021 10:37:50 +0530 Subject: [PATCH 0799/1242] update wsTaxHeadDDROverview --- .../dashboard-analytics/ChartApiConfig.json | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 700bc702..7c230006 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -3459,6 +3459,13 @@ "dateRefField": "billdate", "indexName": "demandbillconsumers", "aggrQuery": "{\"aggs\":{\"No of Bill\":{\"filter\":{\"term\":{\"billgenerated\":true}},\"aggs\":{\"approved\":{\"value_count\":{\"field\":\"installmentfrom.keyword\"}}}},\"Late charges\":{\"filter\":{\"term\":{\"billgenerated\":true}},\"aggs\":{\"penalty\":{\"sum\":{\"field\":\"penaltycollection\"}}}},\"Interest\":{\"filter\":{\"term\":{\"billgenerated\":true}},\"aggs\":{\"interest\":{\"sum\":{\"field\":\"interestcollection\"}}}},\"Advance\":{\"filter\":{\"term\":{\"billgenerated\":true}},\"aggs\":{\"advance\":{\"sum\":{\"field\":\"advancecollection\"}}}},\"Current Charges\":{\"filter\":{\"term\":{\"billgenerated\":true}},\"aggs\":{\"advance\":{\"sum\":{\"field\":\"currentcharges\"}}}},\"Arrear Charges\":{\"filter\":{\"term\":{\"billgenerated\":true}},\"aggs\":{\"advance\":{\"sum\":{\"field\":\"arrearcharges\"}}}}}}}" + }, + { + "module": "COMMON", + "requestQueryMap": "{\"module\" : \"businessService.keyword\", \"tenantId\" : \"tenantIdForMunicipalCorporation.keyword\"}", + "dateRefField": "", + "indexName": "dss-target_v1", + "aggrQuery": "{\"aggs\":{\"Target Collection\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}" } ], "translateTenantCode": true, @@ -3474,7 +3481,8 @@ "postAggregationTheory" : "", "aggregationPaths": [ "Total Collection", - "Total Receipt" + "Total Receipt", + "Target Collection" ], "pathDataTypeMapping": [ { @@ -3482,7 +3490,10 @@ }, { "Total Receipt": "number" - } + }, + { + "Target Collection": "number" + } ], "insight": { }, From ea5548a1aea897be612f742ec9677b30060ccb50 Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Tue, 5 Oct 2021 10:53:21 +0530 Subject: [PATCH 0800/1242] update wsTaxHeadDDROverview --- .../dashboard-analytics/ChartApiConfig.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 7c230006..44f50934 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -3461,8 +3461,8 @@ "aggrQuery": "{\"aggs\":{\"No of Bill\":{\"filter\":{\"term\":{\"billgenerated\":true}},\"aggs\":{\"approved\":{\"value_count\":{\"field\":\"installmentfrom.keyword\"}}}},\"Late charges\":{\"filter\":{\"term\":{\"billgenerated\":true}},\"aggs\":{\"penalty\":{\"sum\":{\"field\":\"penaltycollection\"}}}},\"Interest\":{\"filter\":{\"term\":{\"billgenerated\":true}},\"aggs\":{\"interest\":{\"sum\":{\"field\":\"interestcollection\"}}}},\"Advance\":{\"filter\":{\"term\":{\"billgenerated\":true}},\"aggs\":{\"advance\":{\"sum\":{\"field\":\"advancecollection\"}}}},\"Current Charges\":{\"filter\":{\"term\":{\"billgenerated\":true}},\"aggs\":{\"advance\":{\"sum\":{\"field\":\"currentcharges\"}}}},\"Arrear Charges\":{\"filter\":{\"term\":{\"billgenerated\":true}},\"aggs\":{\"advance\":{\"sum\":{\"field\":\"arrearcharges\"}}}}}}}" }, { - "module": "COMMON", - "requestQueryMap": "{\"module\" : \"businessService.keyword\", \"tenantId\" : \"tenantIdForMunicipalCorporation.keyword\"}", + "module": "W&S", + "requestQueryMap": "{\"tenantId\" : \"cityname.keyword\", \"wardId\" : \"block.keyword\" }", "dateRefField": "", "indexName": "dss-target_v1", "aggrQuery": "{\"aggs\":{\"Target Collection\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}" From 79cec38b76ef10c1b92e208c867f030890705f5f Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Tue, 5 Oct 2021 10:56:38 +0530 Subject: [PATCH 0801/1242] update wsTaxHeadDDROverview --- .../dashboard-analytics/ChartApiConfig.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 44f50934..7c230006 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -3461,8 +3461,8 @@ "aggrQuery": "{\"aggs\":{\"No of Bill\":{\"filter\":{\"term\":{\"billgenerated\":true}},\"aggs\":{\"approved\":{\"value_count\":{\"field\":\"installmentfrom.keyword\"}}}},\"Late charges\":{\"filter\":{\"term\":{\"billgenerated\":true}},\"aggs\":{\"penalty\":{\"sum\":{\"field\":\"penaltycollection\"}}}},\"Interest\":{\"filter\":{\"term\":{\"billgenerated\":true}},\"aggs\":{\"interest\":{\"sum\":{\"field\":\"interestcollection\"}}}},\"Advance\":{\"filter\":{\"term\":{\"billgenerated\":true}},\"aggs\":{\"advance\":{\"sum\":{\"field\":\"advancecollection\"}}}},\"Current Charges\":{\"filter\":{\"term\":{\"billgenerated\":true}},\"aggs\":{\"advance\":{\"sum\":{\"field\":\"currentcharges\"}}}},\"Arrear Charges\":{\"filter\":{\"term\":{\"billgenerated\":true}},\"aggs\":{\"advance\":{\"sum\":{\"field\":\"arrearcharges\"}}}}}}}" }, { - "module": "W&S", - "requestQueryMap": "{\"tenantId\" : \"cityname.keyword\", \"wardId\" : \"block.keyword\" }", + "module": "COMMON", + "requestQueryMap": "{\"module\" : \"businessService.keyword\", \"tenantId\" : \"tenantIdForMunicipalCorporation.keyword\"}", "dateRefField": "", "indexName": "dss-target_v1", "aggrQuery": "{\"aggs\":{\"Target Collection\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}" From ba13ee051146ba417da81ce98e1ac981184e9362 Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Tue, 5 Oct 2021 11:17:32 +0530 Subject: [PATCH 0802/1242] update wsTaxHeadDDROverview --- .../dashboard-analytics/ChartApiConfig.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 7c230006..59ab430f 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -3461,8 +3461,8 @@ "aggrQuery": "{\"aggs\":{\"No of Bill\":{\"filter\":{\"term\":{\"billgenerated\":true}},\"aggs\":{\"approved\":{\"value_count\":{\"field\":\"installmentfrom.keyword\"}}}},\"Late charges\":{\"filter\":{\"term\":{\"billgenerated\":true}},\"aggs\":{\"penalty\":{\"sum\":{\"field\":\"penaltycollection\"}}}},\"Interest\":{\"filter\":{\"term\":{\"billgenerated\":true}},\"aggs\":{\"interest\":{\"sum\":{\"field\":\"interestcollection\"}}}},\"Advance\":{\"filter\":{\"term\":{\"billgenerated\":true}},\"aggs\":{\"advance\":{\"sum\":{\"field\":\"advancecollection\"}}}},\"Current Charges\":{\"filter\":{\"term\":{\"billgenerated\":true}},\"aggs\":{\"advance\":{\"sum\":{\"field\":\"currentcharges\"}}}},\"Arrear Charges\":{\"filter\":{\"term\":{\"billgenerated\":true}},\"aggs\":{\"advance\":{\"sum\":{\"field\":\"arrearcharges\"}}}}}}}" }, { - "module": "COMMON", - "requestQueryMap": "{\"module\" : \"businessService.keyword\", \"tenantId\" : \"tenantIdForMunicipalCorporation.keyword\"}", + "module": "W&S", + "requestQueryMap": "{\"tenantId\" : \"cityname.keyword\", \"wardId\" : \"block.keyword\" }" "dateRefField": "", "indexName": "dss-target_v1", "aggrQuery": "{\"aggs\":{\"Target Collection\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}" From b5f6b469489dd8284c5b3ad2b6c324995f204c3d Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Tue, 5 Oct 2021 11:27:50 +0530 Subject: [PATCH 0803/1242] Update wsTaxHeadDDROverview --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 59ab430f..d9cfa3a4 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -3475,7 +3475,7 @@ ], "chartType": "table", "valueType": "number", - "drillChart": "wsTaxHeadUlb", + "drillChart": "none", "action": "", "plotLabel": "DDRs", "postAggregationTheory" : "", From 2fea78ff87c07d2837be6d58c991e32a04919c55 Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Tue, 5 Oct 2021 11:29:16 +0530 Subject: [PATCH 0804/1242] added ',' --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index d9cfa3a4..5a3fa7c0 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -3462,7 +3462,7 @@ }, { "module": "W&S", - "requestQueryMap": "{\"tenantId\" : \"cityname.keyword\", \"wardId\" : \"block.keyword\" }" + "requestQueryMap": "{\"tenantId\" : \"cityname.keyword\", \"wardId\" : \"block.keyword\" }", "dateRefField": "", "indexName": "dss-target_v1", "aggrQuery": "{\"aggs\":{\"Target Collection\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}" From f849874fbad40587025ea6be1439582813f4e2f5 Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Tue, 5 Oct 2021 13:02:28 +0530 Subject: [PATCH 0805/1242] update wsTaxHeadDDROverview --- .../dashboard-analytics/ChartApiConfig.json | 7 ------- 1 file changed, 7 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 5a3fa7c0..01110872 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -3452,13 +3452,6 @@ "dateRefField": "receiptdate", "indexName": "receipts-consumers", "aggrQuery": "{\"aggs\":{\"Total Collection\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"status\":\"Cancelled\"}}]}},\"aggs\":{\"collection\":{\"sum\":{\"field\":\"totalamount\"}}}},\"Total Receipt\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"status\":\"Cancelled\"}}]}},\"aggs\":{\"receipt\":{\"value_count\":{\"field\":\"receiptnumber.keyword\"}}}}}}" - }, - { - "module": "W&S", - "requestQueryMap": "{\"tenantId\" : \"cityname.keyword\", \"wardId\" : \"block.keyword\" }", - "dateRefField": "billdate", - "indexName": "demandbillconsumers", - "aggrQuery": "{\"aggs\":{\"No of Bill\":{\"filter\":{\"term\":{\"billgenerated\":true}},\"aggs\":{\"approved\":{\"value_count\":{\"field\":\"installmentfrom.keyword\"}}}},\"Late charges\":{\"filter\":{\"term\":{\"billgenerated\":true}},\"aggs\":{\"penalty\":{\"sum\":{\"field\":\"penaltycollection\"}}}},\"Interest\":{\"filter\":{\"term\":{\"billgenerated\":true}},\"aggs\":{\"interest\":{\"sum\":{\"field\":\"interestcollection\"}}}},\"Advance\":{\"filter\":{\"term\":{\"billgenerated\":true}},\"aggs\":{\"advance\":{\"sum\":{\"field\":\"advancecollection\"}}}},\"Current Charges\":{\"filter\":{\"term\":{\"billgenerated\":true}},\"aggs\":{\"advance\":{\"sum\":{\"field\":\"currentcharges\"}}}},\"Arrear Charges\":{\"filter\":{\"term\":{\"billgenerated\":true}},\"aggs\":{\"advance\":{\"sum\":{\"field\":\"arrearcharges\"}}}}}}}" }, { "module": "W&S", From 224e8109235def3c41c652033bc745746d6d43c8 Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Tue, 5 Oct 2021 13:34:21 +0530 Subject: [PATCH 0806/1242] update collectionByModule added target also --- .../dashboard-analytics/ChartApiConfig.json | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 01110872..ab580c5f 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -813,6 +813,13 @@ "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"AGGR\":{\"terms\":{\"field\":\"dataObject.tenantId.keyword\",\"size\":200},\"aggs\":{\"PT\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"dataObject.paymentDetails.businessService.keyword\":\"PT\"}}]}},\"aggs\":{\"AGGRS\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}},\"TL\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"dataObject.paymentDetails.businessService.keyword\":\"TL\"}}]}},\"aggs\":{\"AGGRS\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}},\"WS\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"dataObject.paymentDetails.businessService.keyword\":\"WS\"}}]}},\"aggs\":{\"AGGRS\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}}}" + }, + { + "module": "PT", + "requestQueryMap": "{\"module\" : \"businessService.keyword\", \"tenantId\" : \"tenantIdForMunicipalCorporation.keyword\"}", + "dateRefField": "startdate", + "indexName": "dss-target_v1", + "aggrQuery": "{\"aggs\":{\"Target Collection PT\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}" } ], "isMdmsEnabled": false, @@ -831,6 +838,7 @@ "postAggregationTheory": "repsonseToDifferenceOfDates", "aggregationPaths": [ "PT", + "Target Collection PT" "TL", "WS" ], @@ -838,6 +846,9 @@ { "PT": "amount" }, + { + "Target Collection PT": "amount" + } { "TL": "amount" }, From bc7c5be3b4dab190e2f606fe1b5ce6779b6d8d67 Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Tue, 5 Oct 2021 13:36:16 +0530 Subject: [PATCH 0807/1242] added ',' --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index ab580c5f..9cbeaa7d 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -848,7 +848,7 @@ }, { "Target Collection PT": "amount" - } + }, { "TL": "amount" }, From 3217f2362f86c5d3a87e1a28a55c3caa2ca2be7a Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Tue, 5 Oct 2021 13:47:50 +0530 Subject: [PATCH 0808/1242] update collectionByModule --- .../dashboard-analytics/ChartApiConfig.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 9cbeaa7d..7d46b854 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -819,7 +819,7 @@ "requestQueryMap": "{\"module\" : \"businessService.keyword\", \"tenantId\" : \"tenantIdForMunicipalCorporation.keyword\"}", "dateRefField": "startdate", "indexName": "dss-target_v1", - "aggrQuery": "{\"aggs\":{\"Target Collection PT\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}" + "aggrQuery": "{\"aggs\":{\"Target Collection\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}" } ], "isMdmsEnabled": false, @@ -838,7 +838,7 @@ "postAggregationTheory": "repsonseToDifferenceOfDates", "aggregationPaths": [ "PT", - "Target Collection PT" + "Target Collection" "TL", "WS" ], @@ -847,7 +847,7 @@ "PT": "amount" }, { - "Target Collection PT": "amount" + "Target Collection": "amount" }, { "TL": "amount" From b2093297f82cca26810f39cfa7eefc97c654504a Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Tue, 5 Oct 2021 14:23:10 +0530 Subject: [PATCH 0809/1242] update collectionByModule --- .../dashboard-analytics/ChartApiConfig.json | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 7d46b854..01110872 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -813,13 +813,6 @@ "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"AGGR\":{\"terms\":{\"field\":\"dataObject.tenantId.keyword\",\"size\":200},\"aggs\":{\"PT\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"dataObject.paymentDetails.businessService.keyword\":\"PT\"}}]}},\"aggs\":{\"AGGRS\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}},\"TL\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"dataObject.paymentDetails.businessService.keyword\":\"TL\"}}]}},\"aggs\":{\"AGGRS\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}},\"WS\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"dataObject.paymentDetails.businessService.keyword\":\"WS\"}}]}},\"aggs\":{\"AGGRS\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}}}" - }, - { - "module": "PT", - "requestQueryMap": "{\"module\" : \"businessService.keyword\", \"tenantId\" : \"tenantIdForMunicipalCorporation.keyword\"}", - "dateRefField": "startdate", - "indexName": "dss-target_v1", - "aggrQuery": "{\"aggs\":{\"Target Collection\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}" } ], "isMdmsEnabled": false, @@ -838,7 +831,6 @@ "postAggregationTheory": "repsonseToDifferenceOfDates", "aggregationPaths": [ "PT", - "Target Collection" "TL", "WS" ], @@ -846,9 +838,6 @@ { "PT": "amount" }, - { - "Target Collection": "amount" - }, { "TL": "amount" }, From c85881608aee70a51ecf168e0f95c92c133f70e0 Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Wed, 6 Oct 2021 09:35:07 +0530 Subject: [PATCH 0810/1242] update collectionbymodule --- .../dashboard-analytics/ChartApiConfig.json | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 01110872..7f35d9f9 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -804,7 +804,7 @@ }, "_comment": "" }, - "collectionByModule": { +"collectionByModule": { "chartName": "COLLECTION_BY_MODULE", "queries": [ { @@ -813,6 +813,13 @@ "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"AGGR\":{\"terms\":{\"field\":\"dataObject.tenantId.keyword\",\"size\":200},\"aggs\":{\"PT\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"dataObject.paymentDetails.businessService.keyword\":\"PT\"}}]}},\"aggs\":{\"AGGRS\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}},\"TL\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"dataObject.paymentDetails.businessService.keyword\":\"TL\"}}]}},\"aggs\":{\"AGGRS\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}},\"WS\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"dataObject.paymentDetails.businessService.keyword\":\"WS\"}}]}},\"aggs\":{\"AGGRS\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}}}" + }, + { + "module": "PT", + "requestQueryMap": "{\"module\" : \"businessService.keyword\", \"tenantId\" : \"tenantIdForMunicipalCorporation.keyword\"}", + "dateRefField": "startdate", + "indexName": "dss-target_v1", + "aggrQuery": "{\"aggs\":{\"Target Collection\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}" } ], "isMdmsEnabled": false, @@ -823,7 +830,7 @@ } ], "chartType": "table", - "valueType": "number", + "valueType": "amount", "drillChart": "none", "action": "", "plotLabel": "ULBs", @@ -831,6 +838,7 @@ "postAggregationTheory": "repsonseToDifferenceOfDates", "aggregationPaths": [ "PT", + "Target Collection", "TL", "WS" ], @@ -838,6 +846,9 @@ { "PT": "amount" }, + { + "Target Collection": "amount" + }, { "TL": "amount" }, From d0e1961a688a68d5e3cc15593c3fd7bc3bce3cdd Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Wed, 6 Oct 2021 11:32:01 +0530 Subject: [PATCH 0811/1242] update collectionbymodule --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 7f35d9f9..23719fdc 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -816,7 +816,7 @@ }, { "module": "PT", - "requestQueryMap": "{\"module\" : \"businessService.keyword\", \"tenantId\" : \"tenantIdForMunicipalCorporation.keyword\"}", + "requestQueryMap": "{\"tenantId\" : \"tenantIdForMunicipalCorporation.keyword\"}", "dateRefField": "startdate", "indexName": "dss-target_v1", "aggrQuery": "{\"aggs\":{\"Target Collection\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}" From a54f00c1b6e399603256f9d559c3591138de53d1 Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Wed, 6 Oct 2021 11:49:50 +0530 Subject: [PATCH 0812/1242] update collectionbymodule --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 23719fdc..46e4aeb7 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -816,7 +816,7 @@ }, { "module": "PT", - "requestQueryMap": "{\"tenantId\" : \"tenantIdForMunicipalCorporation.keyword\"}", + "requestQueryMap": "{\"tenantId\" : \"dataObject.tenantId\"}", "dateRefField": "startdate", "indexName": "dss-target_v1", "aggrQuery": "{\"aggs\":{\"Target Collection\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}" From be759542e694f59d4b0072b59c5a7d32ff01e1e0 Mon Sep 17 00:00:00 2001 From: poonam1512 Date: Wed, 6 Oct 2021 12:34:11 +0530 Subject: [PATCH 0813/1242] Regarding Comments not coming on receipt and challan of misc. --- .../data-config/consolidatedreceipt.json | 18 ++++++++++++------ .../data-config/mcollect-challan.json | 2 +- .../format-config/mcollect-challan.json | 1 + 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/configs/pdf-service/data-config/consolidatedreceipt.json b/configs/pdf-service/data-config/consolidatedreceipt.json index e82d4e40..fae46dd8 100644 --- a/configs/pdf-service/data-config/consolidatedreceipt.json +++ b/configs/pdf-service/data-config/consolidatedreceipt.json @@ -128,12 +128,7 @@ "path": "$.additionalDetails.comment" } }, - { - "variable": "comments", - "value": { - "path": "$.paymentDetails[0].bill.billDetails[0].additionalDetails.comment" - } - }, + { "variable": "paymentMode", "value": { @@ -569,6 +564,17 @@ } } ] + }, + { + "path": "http://echallan-services:8080/echallan-services/eChallan/v1/_search", + "queryParam": "tenantId=$.tenantId,offset=0,challanNo=$.paymentDetails[0].bill.consumerCode", + "apiRequest": null, + "responseMapping":[ + { + "variable":"comments", + "value":"$.challans[0].description" + } + ] } ] } diff --git a/configs/pdf-service/data-config/mcollect-challan.json b/configs/pdf-service/data-config/mcollect-challan.json index 7a3cf788..7af767ff 100644 --- a/configs/pdf-service/data-config/mcollect-challan.json +++ b/configs/pdf-service/data-config/mcollect-challan.json @@ -333,7 +333,7 @@ { "variable": "challanRemarks", "value": { - "path": "$.additionalDetail.cancellComment" + "path": "$.description" }, "type": "statusMessage" }, diff --git a/configs/pdf-service/format-config/mcollect-challan.json b/configs/pdf-service/format-config/mcollect-challan.json index 740c632f..bcf26a60 100644 --- a/configs/pdf-service/format-config/mcollect-challan.json +++ b/configs/pdf-service/format-config/mcollect-challan.json @@ -43,6 +43,7 @@ 0 ] } + ] ] }, From 1eb28fae04922fa96903e7b3861f679715cc7e69 Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Wed, 6 Oct 2021 13:02:02 +0530 Subject: [PATCH 0814/1242] update collectionbymodule --- .../dashboard-analytics/ChartApiConfig.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 46e4aeb7..7eccee6e 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -815,12 +815,12 @@ "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"AGGR\":{\"terms\":{\"field\":\"dataObject.tenantId.keyword\",\"size\":200},\"aggs\":{\"PT\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"dataObject.paymentDetails.businessService.keyword\":\"PT\"}}]}},\"aggs\":{\"AGGRS\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}},\"TL\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"dataObject.paymentDetails.businessService.keyword\":\"TL\"}}]}},\"aggs\":{\"AGGRS\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}},\"WS\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"dataObject.paymentDetails.businessService.keyword\":\"WS\"}}]}},\"aggs\":{\"AGGRS\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}}}" }, { - "module": "PT", - "requestQueryMap": "{\"tenantId\" : \"dataObject.tenantId\"}", + "module": "COMMON", + "requestQueryMap": "{\"tenantId\" : \"tenantIdForMunicipalCorporation.keyword\"}", "dateRefField": "startdate", "indexName": "dss-target_v1", - "aggrQuery": "{\"aggs\":{\"Target Collection\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}" - } + "aggrQuery": "{\"size\":0,\"query\":{\"bool\":{\"filter\":[{\"terms\":{\"businessService.keyword\":[\"PT\"],\"boost\":1}}],\"adjust_pure_negative\":true,\"boost\":1}},\"aggs\":{\"ULBs \":{\"terms\":{\"field\":\"tenantIdForMunicipalCorporation.keyword\",\"size\":200},\"aggs\":{\"Target Collection\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}}}" + }, ], "isMdmsEnabled": false, "filterKeys": [ From b2b3db135ea4075e9062cba4a613c13372fa24de Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Wed, 6 Oct 2021 14:14:28 +0530 Subject: [PATCH 0815/1242] removed ',' --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 7eccee6e..a979a3aa 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -820,7 +820,7 @@ "dateRefField": "startdate", "indexName": "dss-target_v1", "aggrQuery": "{\"size\":0,\"query\":{\"bool\":{\"filter\":[{\"terms\":{\"businessService.keyword\":[\"PT\"],\"boost\":1}}],\"adjust_pure_negative\":true,\"boost\":1}},\"aggs\":{\"ULBs \":{\"terms\":{\"field\":\"tenantIdForMunicipalCorporation.keyword\",\"size\":200},\"aggs\":{\"Target Collection\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}}}" - }, + } ], "isMdmsEnabled": false, "filterKeys": [ From 9aed860e5e4f7231ca73755cdabe9620d7f86b24 Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Wed, 6 Oct 2021 14:26:38 +0530 Subject: [PATCH 0816/1242] update collectionByModule --- .../dashboard-analytics/ChartApiConfig.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index a979a3aa..b1fe5e84 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -819,7 +819,7 @@ "requestQueryMap": "{\"tenantId\" : \"tenantIdForMunicipalCorporation.keyword\"}", "dateRefField": "startdate", "indexName": "dss-target_v1", - "aggrQuery": "{\"size\":0,\"query\":{\"bool\":{\"filter\":[{\"terms\":{\"businessService.keyword\":[\"PT\"],\"boost\":1}}],\"adjust_pure_negative\":true,\"boost\":1}},\"aggs\":{\"ULBs \":{\"terms\":{\"field\":\"tenantIdForMunicipalCorporation.keyword\",\"size\":200},\"aggs\":{\"Target Collection\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}}}" + "aggrQuery": "{\"size\":0,\"query\":{\"bool\":{\"filter\":[{\"terms\":{\"businessService.keyword\":[\"PT\"],\"boost\":1}}],\"adjust_pure_negative\":true,\"boost\":1}},\"aggs\":{\"ULBs \":{\"terms\":{\"field\":\"tenantIdForMunicipalCorporation.keyword\",\"size\":200},\"aggs\":{\"Target Collection PT\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}}}" } ], "isMdmsEnabled": false, @@ -838,7 +838,7 @@ "postAggregationTheory": "repsonseToDifferenceOfDates", "aggregationPaths": [ "PT", - "Target Collection", + "Target Collection PT", "TL", "WS" ], @@ -847,7 +847,7 @@ "PT": "amount" }, { - "Target Collection": "amount" + "Target Collection PT": "amount" }, { "TL": "amount" From 051950d187c777d14824daa52e5f2687b0cf5904 Mon Sep 17 00:00:00 2001 From: egovmis Date: Thu, 7 Oct 2021 14:54:09 +0530 Subject: [PATCH 0817/1242] added comments for misc receipt --- .../data-config/consolidatedreceipt.json | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/configs/pdf-service/data-config/consolidatedreceipt.json b/configs/pdf-service/data-config/consolidatedreceipt.json index e82d4e40..2e42a5c5 100644 --- a/configs/pdf-service/data-config/consolidatedreceipt.json +++ b/configs/pdf-service/data-config/consolidatedreceipt.json @@ -128,12 +128,6 @@ "path": "$.additionalDetails.comment" } }, - { - "variable": "comments", - "value": { - "path": "$.paymentDetails[0].bill.billDetails[0].additionalDetails.comment" - } - }, { "variable": "paymentMode", "value": { @@ -569,7 +563,19 @@ } } ] + }, + { + "path": "http://echallan-services:8080/echallan-services/eChallan/v1/_search?", + "queryParam": "tenantId=$.challans[0].tenantId&offset=0&challanNo=$.challans[0].challanNo", + "apiRequest": null, + "responseMapping":[ + { + "variable":"comments", + "value":"$.challans[0].description" + } + ] } + ] } ] From dfb2e002aab9faed96ed4e8a8a387b01258e7342 Mon Sep 17 00:00:00 2001 From: egovmis Date: Thu, 7 Oct 2021 15:03:54 +0530 Subject: [PATCH 0818/1242] added comments for misc receipt --- configs/pdf-service/data-config/consolidatedreceipt.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/pdf-service/data-config/consolidatedreceipt.json b/configs/pdf-service/data-config/consolidatedreceipt.json index 2e42a5c5..5409e8a3 100644 --- a/configs/pdf-service/data-config/consolidatedreceipt.json +++ b/configs/pdf-service/data-config/consolidatedreceipt.json @@ -566,7 +566,7 @@ }, { "path": "http://echallan-services:8080/echallan-services/eChallan/v1/_search?", - "queryParam": "tenantId=$.challans[0].tenantId&offset=0&challanNo=$.challans[0].challanNo", + "queryParam": "tenantId=$.tenantId&offset=0&challanNo=$.challanNo", "apiRequest": null, "responseMapping":[ { From bdb4ed6e01e47f88f6bbf8240583c2dc493a86c3 Mon Sep 17 00:00:00 2001 From: egovmis Date: Thu, 7 Oct 2021 15:12:19 +0530 Subject: [PATCH 0819/1242] added comments for misc receipt --- configs/pdf-service/data-config/consolidatedreceipt.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/pdf-service/data-config/consolidatedreceipt.json b/configs/pdf-service/data-config/consolidatedreceipt.json index 5409e8a3..44a12ef8 100644 --- a/configs/pdf-service/data-config/consolidatedreceipt.json +++ b/configs/pdf-service/data-config/consolidatedreceipt.json @@ -566,7 +566,7 @@ }, { "path": "http://echallan-services:8080/echallan-services/eChallan/v1/_search?", - "queryParam": "tenantId=$.tenantId&offset=0&challanNo=$.challanNo", + "queryParam": "tenantId=$.tenantId,challanNo=$.paymentDetails[0].bill.consumerCode", "apiRequest": null, "responseMapping":[ { From 7bde49185e28c8a673b2b429fb8376137639ab4f Mon Sep 17 00:00:00 2001 From: egovmis Date: Thu, 7 Oct 2021 15:19:50 +0530 Subject: [PATCH 0820/1242] added comments for misc receipt --- configs/pdf-service/data-config/consolidatedreceipt.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/pdf-service/data-config/consolidatedreceipt.json b/configs/pdf-service/data-config/consolidatedreceipt.json index 44a12ef8..d896575e 100644 --- a/configs/pdf-service/data-config/consolidatedreceipt.json +++ b/configs/pdf-service/data-config/consolidatedreceipt.json @@ -566,7 +566,7 @@ }, { "path": "http://echallan-services:8080/echallan-services/eChallan/v1/_search?", - "queryParam": "tenantId=$.tenantId,challanNo=$.paymentDetails[0].bill.consumerCode", + "queryParam": "tenantId=$.tenantId,challanNo=$.paymentDetails[0].bill.consumerCode,businessService=$.paymentDetails[0].businessService,offset=0", "apiRequest": null, "responseMapping":[ { From 66ef687fdb1b5d710f67a982b961a087870f7128 Mon Sep 17 00:00:00 2001 From: egovmis Date: Thu, 7 Oct 2021 15:31:25 +0530 Subject: [PATCH 0821/1242] added comments for misc receipt --- configs/pdf-service/data-config/consolidatedreceipt.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/pdf-service/data-config/consolidatedreceipt.json b/configs/pdf-service/data-config/consolidatedreceipt.json index d896575e..51cd07fc 100644 --- a/configs/pdf-service/data-config/consolidatedreceipt.json +++ b/configs/pdf-service/data-config/consolidatedreceipt.json @@ -566,7 +566,7 @@ }, { "path": "http://echallan-services:8080/echallan-services/eChallan/v1/_search?", - "queryParam": "tenantId=$.tenantId,challanNo=$.paymentDetails[0].bill.consumerCode,businessService=$.paymentDetails[0].businessService,offset=0", + "queryParam": "tenantId=$.tenantId&challanNo=$.paymentDetails[0].bill.consumerCode&businessService=$.paymentDetails[0].businessService&offset=0", "apiRequest": null, "responseMapping":[ { From a1eb162040fede536f50d301e53836f3ec04f94e Mon Sep 17 00:00:00 2001 From: egovmis Date: Thu, 7 Oct 2021 15:35:54 +0530 Subject: [PATCH 0822/1242] added comments for misc receipt --- configs/pdf-service/data-config/consolidatedreceipt.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/pdf-service/data-config/consolidatedreceipt.json b/configs/pdf-service/data-config/consolidatedreceipt.json index 51cd07fc..d896575e 100644 --- a/configs/pdf-service/data-config/consolidatedreceipt.json +++ b/configs/pdf-service/data-config/consolidatedreceipt.json @@ -566,7 +566,7 @@ }, { "path": "http://echallan-services:8080/echallan-services/eChallan/v1/_search?", - "queryParam": "tenantId=$.tenantId&challanNo=$.paymentDetails[0].bill.consumerCode&businessService=$.paymentDetails[0].businessService&offset=0", + "queryParam": "tenantId=$.tenantId,challanNo=$.paymentDetails[0].bill.consumerCode,businessService=$.paymentDetails[0].businessService,offset=0", "apiRequest": null, "responseMapping":[ { From aaf2a316fd0735d198c76a777f3a9c48637cdb87 Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Fri, 8 Oct 2021 09:04:23 +0530 Subject: [PATCH 0823/1242] update collectionByModule added TL tartget column --- .../dashboard-analytics/ChartApiConfig.json | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index b1fe5e84..6e77ec84 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -820,6 +820,13 @@ "dateRefField": "startdate", "indexName": "dss-target_v1", "aggrQuery": "{\"size\":0,\"query\":{\"bool\":{\"filter\":[{\"terms\":{\"businessService.keyword\":[\"PT\"],\"boost\":1}}],\"adjust_pure_negative\":true,\"boost\":1}},\"aggs\":{\"ULBs \":{\"terms\":{\"field\":\"tenantIdForMunicipalCorporation.keyword\",\"size\":200},\"aggs\":{\"Target Collection PT\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}}}" + }, + { + "module": "COMMON", + "requestQueryMap": "{\"tenantId\" : \"tenantIdForMunicipalCorporation.keyword\"}", + "dateRefField": "startdate", + "indexName": "dss-target_v1", + "aggrQuery": "{\"size\":0,\"query\":{\"bool\":{\"filter\":[{\"terms\":{\"businessService.keyword\":[\"TL\"],\"boost\":1}}],\"adjust_pure_negative\":true,\"boost\":1}},\"aggs\":{\"ULBs \":{\"terms\":{\"field\":\"tenantIdForMunicipalCorporation.keyword\",\"size\":200},\"aggs\":{\"Target Collection TL\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}}}" } ], "isMdmsEnabled": false, @@ -840,6 +847,7 @@ "PT", "Target Collection PT", "TL", + "Target Collection TL", "WS" ], "pathDataTypeMapping": [ @@ -852,6 +860,9 @@ { "TL": "amount" }, + { + "Target Collection TL":"amount" + }, { "WS": "amount" } From 3d663318cb026bc2e4345e0041384de8de77e8df Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Fri, 8 Oct 2021 10:42:07 +0530 Subject: [PATCH 0824/1242] added Target Collection WS --- .../dashboard-analytics/ChartApiConfig.json | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 6e77ec84..d9f5d3b9 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -819,14 +819,7 @@ "requestQueryMap": "{\"tenantId\" : \"tenantIdForMunicipalCorporation.keyword\"}", "dateRefField": "startdate", "indexName": "dss-target_v1", - "aggrQuery": "{\"size\":0,\"query\":{\"bool\":{\"filter\":[{\"terms\":{\"businessService.keyword\":[\"PT\"],\"boost\":1}}],\"adjust_pure_negative\":true,\"boost\":1}},\"aggs\":{\"ULBs \":{\"terms\":{\"field\":\"tenantIdForMunicipalCorporation.keyword\",\"size\":200},\"aggs\":{\"Target Collection PT\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}}}" - }, - { - "module": "COMMON", - "requestQueryMap": "{\"tenantId\" : \"tenantIdForMunicipalCorporation.keyword\"}", - "dateRefField": "startdate", - "indexName": "dss-target_v1", - "aggrQuery": "{\"size\":0,\"query\":{\"bool\":{\"filter\":[{\"terms\":{\"businessService.keyword\":[\"TL\"],\"boost\":1}}],\"adjust_pure_negative\":true,\"boost\":1}},\"aggs\":{\"ULBs \":{\"terms\":{\"field\":\"tenantIdForMunicipalCorporation.keyword\",\"size\":200},\"aggs\":{\"Target Collection TL\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}}}" + "aggrQuery": "{\"aggs":{\"AGGR":{\"terms\":{\"field\":\"tenantIdForMunicipalCorporation.keyword\",\"size\":200},\"aggs\":{\"Target Collection PT\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"businessService.keyword\":\"PT\"}}]}},\"aggs\":{\"AGGRS\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}},\"Target Collection TL\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"businessService.keyword\":\"TL\"}}]}},\"aggs\":{\"AGGRS\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}},\"Target Collection WS\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"businessService.keyword\":\"WS\"}}]}},\"aggs\":{\"AGGRS\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}}}}}" } ], "isMdmsEnabled": false, @@ -848,7 +841,8 @@ "Target Collection PT", "TL", "Target Collection TL", - "WS" + "WS", + "Target Collection WS", ], "pathDataTypeMapping": [ { @@ -865,6 +859,9 @@ }, { "WS": "amount" + }, + { + "Target Collection WS":"amount" } ], "insight": {}, From 860ac83c696738759f6e23ed2be7fd906b3a6382 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Fri, 8 Oct 2021 11:04:29 +0530 Subject: [PATCH 0825/1242] Update consolidatedreceipt.json --- configs/pdf-service/data-config/consolidatedreceipt.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/pdf-service/data-config/consolidatedreceipt.json b/configs/pdf-service/data-config/consolidatedreceipt.json index d896575e..bb210200 100644 --- a/configs/pdf-service/data-config/consolidatedreceipt.json +++ b/configs/pdf-service/data-config/consolidatedreceipt.json @@ -565,7 +565,7 @@ ] }, { - "path": "http://echallan-services:8080/echallan-services/eChallan/v1/_search?", + "path": "http://echallan-services:8080/echallan-services/eChallan/v1/_search", "queryParam": "tenantId=$.tenantId,challanNo=$.paymentDetails[0].bill.consumerCode,businessService=$.paymentDetails[0].businessService,offset=0", "apiRequest": null, "responseMapping":[ From 8c0eeea1e81fd62c4a7dd3ee263abec64ca0dbdc Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Fri, 8 Oct 2021 11:06:55 +0530 Subject: [PATCH 0826/1242] Update consolidatedreceipt.json --- .../data-config/consolidatedreceipt.json | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/configs/pdf-service/data-config/consolidatedreceipt.json b/configs/pdf-service/data-config/consolidatedreceipt.json index bb210200..cc26a2ea 100644 --- a/configs/pdf-service/data-config/consolidatedreceipt.json +++ b/configs/pdf-service/data-config/consolidatedreceipt.json @@ -572,7 +572,20 @@ { "variable":"comments", "value":"$.challans[0].description" - } + }, + { + "variable": "payerAddress", + "value": { + "path": "$.challans[0].address.locality.code" + }, + "localisation": { + "required": true, + "prefix": "TENANTS_MOHALLA", + "module": "rainmaker-common", + "prefixCbName": true + }, + "type": "boundary" + } ] } From 7421e3ed524933f21c2869af234c269a2f882d34 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Fri, 8 Oct 2021 11:11:43 +0530 Subject: [PATCH 0827/1242] Update consolidatedreceipt.json --- configs/pdf-service/data-config/consolidatedreceipt.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/configs/pdf-service/data-config/consolidatedreceipt.json b/configs/pdf-service/data-config/consolidatedreceipt.json index cc26a2ea..97c0083c 100644 --- a/configs/pdf-service/data-config/consolidatedreceipt.json +++ b/configs/pdf-service/data-config/consolidatedreceipt.json @@ -575,9 +575,7 @@ }, { "variable": "payerAddress", - "value": { - "path": "$.challans[0].address.locality.code" - }, + "value": "$.challans[0].address.locality.code", "localisation": { "required": true, "prefix": "TENANTS_MOHALLA", From 383f213e73e4e18e2d4d26160c3aa535c17cc0cd Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Fri, 8 Oct 2021 11:15:13 +0530 Subject: [PATCH 0828/1242] Update mcollect-challan.json --- configs/pdf-service/data-config/mcollect-challan.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/configs/pdf-service/data-config/mcollect-challan.json b/configs/pdf-service/data-config/mcollect-challan.json index 7a3cf788..ac3cee01 100644 --- a/configs/pdf-service/data-config/mcollect-challan.json +++ b/configs/pdf-service/data-config/mcollect-challan.json @@ -333,9 +333,8 @@ { "variable": "challanRemarks", "value": { - "path": "$.additionalDetail.cancellComment" - }, - "type": "statusMessage" + "path": "$.description" + } }, { "variable": "mohalla", From 5659866d0b61d24ec1d8cc6a7fed67ff4105a8a5 Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Fri, 8 Oct 2021 11:19:34 +0530 Subject: [PATCH 0829/1242] changing localisation for address --- .../pdf-service/data-config/mcollect-challan.json | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/configs/pdf-service/data-config/mcollect-challan.json b/configs/pdf-service/data-config/mcollect-challan.json index ac3cee01..2b55fc58 100644 --- a/configs/pdf-service/data-config/mcollect-challan.json +++ b/configs/pdf-service/data-config/mcollect-challan.json @@ -333,21 +333,23 @@ { "variable": "challanRemarks", "value": { - "path": "$.description" - } + "path": "$.additionalDetail.cancellComment" + }, + "type": "statusMessage" }, { "variable": "mohalla", "value": { "path": "$.address.locality.code" }, + "type": "label", "localisation": { "required": true, - "prefix": "TENANTS_MOHALLA", + "prefix": null, "module": "rainmaker-common", - "prefixCbName": true + }, - "type": "boundary" + }, { "variable": "mcollect_comment", From dc060a93fd1e61f8c1c4b6a87414ce0ab7c79bf6 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Fri, 8 Oct 2021 11:31:35 +0530 Subject: [PATCH 0830/1242] Update mcollect-challan.json --- configs/pdf-service/data-config/mcollect-challan.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/configs/pdf-service/data-config/mcollect-challan.json b/configs/pdf-service/data-config/mcollect-challan.json index 2b55fc58..688f91d4 100644 --- a/configs/pdf-service/data-config/mcollect-challan.json +++ b/configs/pdf-service/data-config/mcollect-challan.json @@ -333,9 +333,8 @@ { "variable": "challanRemarks", "value": { - "path": "$.additionalDetail.cancellComment" - }, - "type": "statusMessage" + "path": "$.description" + } }, { "variable": "mohalla", From e63b538ec5bc9697a49990537c621f5b7ee9c423 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Fri, 8 Oct 2021 11:37:54 +0530 Subject: [PATCH 0831/1242] Update mcollect-challan.json --- configs/pdf-service/data-config/mcollect-challan.json | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/configs/pdf-service/data-config/mcollect-challan.json b/configs/pdf-service/data-config/mcollect-challan.json index 688f91d4..1bc05f5c 100644 --- a/configs/pdf-service/data-config/mcollect-challan.json +++ b/configs/pdf-service/data-config/mcollect-challan.json @@ -345,10 +345,8 @@ "localisation": { "required": true, "prefix": null, - "module": "rainmaker-common", - - }, - + "module": "rainmaker-common" + } }, { "variable": "mcollect_comment", From ecfc8dd6d10f4e9c8eedf3419a21af4106f9fbdf Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Fri, 8 Oct 2021 12:36:29 +0530 Subject: [PATCH 0832/1242] UPDATE collectionByModule added WS & TL target on overview --- .../dashboard-analytics/ChartApiConfig.json | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 7f35d9f9..e7e1a753 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -815,11 +815,11 @@ "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"AGGR\":{\"terms\":{\"field\":\"dataObject.tenantId.keyword\",\"size\":200},\"aggs\":{\"PT\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"dataObject.paymentDetails.businessService.keyword\":\"PT\"}}]}},\"aggs\":{\"AGGRS\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}},\"TL\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"dataObject.paymentDetails.businessService.keyword\":\"TL\"}}]}},\"aggs\":{\"AGGRS\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}},\"WS\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"dataObject.paymentDetails.businessService.keyword\":\"WS\"}}]}},\"aggs\":{\"AGGRS\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}}}" }, { - "module": "PT", + "module": "COMMON", "requestQueryMap": "{\"module\" : \"businessService.keyword\", \"tenantId\" : \"tenantIdForMunicipalCorporation.keyword\"}", "dateRefField": "startdate", "indexName": "dss-target_v1", - "aggrQuery": "{\"aggs\":{\"Target Collection\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR":{\"terms\":{\"field\":\"tenantIdForMunicipalCorporation.keyword\",\"size\":200},\"aggs\":{\"Target Collection PT\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"businessService.keyword\":\"PT\"}}]}},\"aggs\":{\"AGGRS\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}},\"Target Collection TL\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"businessService.keyword\":\"TL\"}}]}},\"aggs\":{\"AGGRS\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}},\"Target Collection WS\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"businessService.keyword\":\"WS\"}}]}},\"aggs\":{\"AGGRS\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}}}}}" } ], "isMdmsEnabled": false, @@ -838,22 +838,30 @@ "postAggregationTheory": "repsonseToDifferenceOfDates", "aggregationPaths": [ "PT", - "Target Collection", + "Target Collection PT", "TL", - "WS" + "Target Collection TL", + "WS", + "Target Collection WS" ], "pathDataTypeMapping": [ { "PT": "amount" }, { - "Target Collection": "amount" + "Target Collection PT": "amount" }, { "TL": "amount" }, + { + "Target Collection TL": "amount" + }, { "WS": "amount" + }, + { + "Target Collection WS": "amount" } ], "insight": {}, From 7f8da1956bdedfc6a3eb45542251a83eee3463d6 Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Fri, 8 Oct 2021 12:37:24 +0530 Subject: [PATCH 0833/1242] added '\' --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index e7e1a753..8789cdca 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -819,7 +819,7 @@ "requestQueryMap": "{\"module\" : \"businessService.keyword\", \"tenantId\" : \"tenantIdForMunicipalCorporation.keyword\"}", "dateRefField": "startdate", "indexName": "dss-target_v1", - "aggrQuery": "{\"aggs\":{\"AGGR":{\"terms\":{\"field\":\"tenantIdForMunicipalCorporation.keyword\",\"size\":200},\"aggs\":{\"Target Collection PT\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"businessService.keyword\":\"PT\"}}]}},\"aggs\":{\"AGGRS\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}},\"Target Collection TL\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"businessService.keyword\":\"TL\"}}]}},\"aggs\":{\"AGGRS\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}},\"Target Collection WS\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"businessService.keyword\":\"WS\"}}]}},\"aggs\":{\"AGGRS\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"terms\":{\"field\":\"tenantIdForMunicipalCorporation.keyword\",\"size\":200},\"aggs\":{\"Target Collection PT\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"businessService.keyword\":\"PT\"}}]}},\"aggs\":{\"AGGRS\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}},\"Target Collection TL\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"businessService.keyword\":\"TL\"}}]}},\"aggs\":{\"AGGRS\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}},\"Target Collection WS\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"businessService.keyword\":\"WS\"}}]}},\"aggs\":{\"AGGRS\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}}}}}" } ], "isMdmsEnabled": false, From 3fb73978eb65ae6eb0ed27154f35995097332ec5 Mon Sep 17 00:00:00 2001 From: poonam1512 Date: Fri, 8 Oct 2021 13:01:11 +0530 Subject: [PATCH 0834/1242] adding egov location API for address --- configs/pdf-service/data-config/mcollect-challan.json | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/configs/pdf-service/data-config/mcollect-challan.json b/configs/pdf-service/data-config/mcollect-challan.json index 261385b7..aba49b6d 100644 --- a/configs/pdf-service/data-config/mcollect-challan.json +++ b/configs/pdf-service/data-config/mcollect-challan.json @@ -688,7 +688,16 @@ } } ] - } + }, + { + "path": "http://egov-location:8080/egov-location/location/v11/boundarys/_search", + "queryParam": "tenantId=$.tenantId,hierarchyTypeCode=ADMIN,boundaryType=Locality,codes=$.address.locality.code", + "apiRequest": null, + "responseMapping":[ + { + "variable":"mohalla", + "value":"$.address.locality.code" + } ] }, { From 5a72d24fc76dfeacd0285880cceb1157b6738f1e Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Fri, 8 Oct 2021 13:03:49 +0530 Subject: [PATCH 0835/1242] update collectionByModule --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 8789cdca..da0e556f 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -815,7 +815,7 @@ "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"AGGR\":{\"terms\":{\"field\":\"dataObject.tenantId.keyword\",\"size\":200},\"aggs\":{\"PT\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"dataObject.paymentDetails.businessService.keyword\":\"PT\"}}]}},\"aggs\":{\"AGGRS\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}},\"TL\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"dataObject.paymentDetails.businessService.keyword\":\"TL\"}}]}},\"aggs\":{\"AGGRS\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}},\"WS\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"dataObject.paymentDetails.businessService.keyword\":\"WS\"}}]}},\"aggs\":{\"AGGRS\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}}}" }, { - "module": "COMMON", + "module": "PT", "requestQueryMap": "{\"module\" : \"businessService.keyword\", \"tenantId\" : \"tenantIdForMunicipalCorporation.keyword\"}", "dateRefField": "startdate", "indexName": "dss-target_v1", From e737397d1a923429ad829ab2ae9241da16559c15 Mon Sep 17 00:00:00 2001 From: poonam1512 Date: Fri, 8 Oct 2021 13:26:35 +0530 Subject: [PATCH 0836/1242] added ulb grade on mcollect challan --- configs/pdf-service/data-config/mcollect-challan.json | 8 +++++++- configs/pdf-service/format-config/mcollect-challan.json | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/configs/pdf-service/data-config/mcollect-challan.json b/configs/pdf-service/data-config/mcollect-challan.json index aba49b6d..42bb2b82 100644 --- a/configs/pdf-service/data-config/mcollect-challan.json +++ b/configs/pdf-service/data-config/mcollect-challan.json @@ -686,7 +686,11 @@ "prefix": "TENANT_TENANTS", "module": "rainmaker-common" } - } + }, + { + "variable":"mcGrade", + "value":"$.MdmsRes.tenant.tenants[0].city.ulbType" + } ] }, { @@ -698,6 +702,8 @@ "variable":"mohalla", "value":"$.address.locality.code" } + ] + } ] }, { diff --git a/configs/pdf-service/format-config/mcollect-challan.json b/configs/pdf-service/format-config/mcollect-challan.json index bcf26a60..69b7d63f 100644 --- a/configs/pdf-service/format-config/mcollect-challan.json +++ b/configs/pdf-service/format-config/mcollect-challan.json @@ -61,7 +61,7 @@ { "stack": [ { - "text": "{{cb-name}} {{cantonment-board}}", + "text": "{{cb-name}} {{mcGrade}}", "alignment": "center", "style": "receipt-logo-title-name" }, From 82638e8f332f2fb043b3de23dc25841179cf0f8a Mon Sep 17 00:00:00 2001 From: poonam1512 Date: Fri, 8 Oct 2021 14:26:10 +0530 Subject: [PATCH 0837/1242] adding prefix in mcollect challan for boundary --- configs/pdf-service/data-config/mcollect-challan.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/configs/pdf-service/data-config/mcollect-challan.json b/configs/pdf-service/data-config/mcollect-challan.json index 42bb2b82..fa102fe8 100644 --- a/configs/pdf-service/data-config/mcollect-challan.json +++ b/configs/pdf-service/data-config/mcollect-challan.json @@ -345,8 +345,10 @@ "type": "label", "localisation": { "required": true, - "prefix": null, - "module": "rainmaker-common" + "prefix": "TENANTS_MOHALLA", + "module": "rainmaker-common", + "prefixCbName": true + } }, { From 4fb6879c8591a9c84e6dba559c173bf5b0cbe40c Mon Sep 17 00:00:00 2001 From: poonam1512 Date: Fri, 8 Oct 2021 15:17:00 +0530 Subject: [PATCH 0838/1242] removing mohalla from mCollect Challan --- configs/pdf-service/format-config/mcollect-challan.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/pdf-service/format-config/mcollect-challan.json b/configs/pdf-service/format-config/mcollect-challan.json index 69b7d63f..597bcb79 100644 --- a/configs/pdf-service/format-config/mcollect-challan.json +++ b/configs/pdf-service/format-config/mcollect-challan.json @@ -390,7 +390,7 @@ "style": "receipt-table-value" }, { - "text": "{{doorHouseNo}}, {{buildingName}}, {{streetName}}, {{mohalla}}, {{pinCode}}", + "text": "{{doorHouseNo}}, {{buildingName}}, {{streetName}},{{pinCode}}", "border": [ false, false, From 6e52e97d3573ada4d554c69edb642cce8f0e4609 Mon Sep 17 00:00:00 2001 From: egovmis Date: Fri, 8 Oct 2021 15:24:45 +0530 Subject: [PATCH 0839/1242] changes for address in Misc receipt --- .../data-config/consolidatedreceipt.json | 29 ++++++++++++------- .../format-config/consolidatedreceipt.json | 2 +- 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/configs/pdf-service/data-config/consolidatedreceipt.json b/configs/pdf-service/data-config/consolidatedreceipt.json index 518152b6..fc92ebcc 100644 --- a/configs/pdf-service/data-config/consolidatedreceipt.json +++ b/configs/pdf-service/data-config/consolidatedreceipt.json @@ -571,17 +571,24 @@ "responseMapping":[ { "variable":"comments", - "value":"$.challans[0].description" }, - { - "variable": "payerAddress", - "value": "$.challans[0].address.locality.code", - "localisation": { - "required": true, - "prefix": "TENANTS_MOHALLA", - "module": "rainmaker-common", - "prefixCbName": true - }, - "type": "boundary" + "value":"$.challans[0].description" + }, + { + "variable": "doorHouseNo", + "value": "$.challans[0].address.doorNo" + }, + { + "variable": "streetName", + "value": "$.challans[0].address.street" + + }, + { + "variable": "buildingName", + "value": "$.challans[0].address.buildingName" + }, + { + "variable": "pinCode", + "value":"$.challans[0].address.pincode" } ] } diff --git a/configs/pdf-service/format-config/consolidatedreceipt.json b/configs/pdf-service/format-config/consolidatedreceipt.json index bfb6e4d3..9efb17f4 100644 --- a/configs/pdf-service/format-config/consolidatedreceipt.json +++ b/configs/pdf-service/format-config/consolidatedreceipt.json @@ -836,7 +836,7 @@ "style": "receipt-table-value" }, { - "text": "{{payerAddress}}", + "text": "{{doorHouseNo}}, {{buildingName}}, {{streetName}},{{pinCode}}", "border": [ false, false, From e64ec88ee513c60ac1c571b3be9b759b402c531e Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Fri, 8 Oct 2021 15:29:06 +0530 Subject: [PATCH 0840/1242] update collectionbymodule --- .../dashboard-analytics/ChartApiConfig.json | 20 ------------------- 1 file changed, 20 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index da0e556f..d817df87 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -844,26 +844,6 @@ "WS", "Target Collection WS" ], - "pathDataTypeMapping": [ - { - "PT": "amount" - }, - { - "Target Collection PT": "amount" - }, - { - "TL": "amount" - }, - { - "Target Collection TL": "amount" - }, - { - "WS": "amount" - }, - { - "Target Collection WS": "amount" - } - ], "insight": {}, "_comment": "" }, From 5ff3654656fb146eb9e382cd899a02b583eb1dba Mon Sep 17 00:00:00 2001 From: egovmis Date: Fri, 8 Oct 2021 15:34:08 +0530 Subject: [PATCH 0841/1242] changes for address in Misc receipt --- configs/pdf-service/format-config/consolidatedreceipt.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/pdf-service/format-config/consolidatedreceipt.json b/configs/pdf-service/format-config/consolidatedreceipt.json index 9efb17f4..fdbc1916 100644 --- a/configs/pdf-service/format-config/consolidatedreceipt.json +++ b/configs/pdf-service/format-config/consolidatedreceipt.json @@ -214,7 +214,7 @@ "style": "receipt-table-value" }, { - "text": "{{payerAddress}}", + "text": "{{doorHouseNo}}, {{buildingName}}, {{streetName}},{{pinCode}}", "border": [ false, false, From 26de0e101e217aa76dab11f26a1eeac0a0169c9f Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Fri, 8 Oct 2021 15:40:27 +0530 Subject: [PATCH 0842/1242] update collectionbymodule --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index d817df87..82cd17d4 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -844,7 +844,6 @@ "WS", "Target Collection WS" ], - "insight": {}, "_comment": "" }, "demandCollectionIndexBoundaryRevenue": { From c14efcb76b5f8b2d6a69c1aeb8209fe65432b27f Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Fri, 8 Oct 2021 15:52:44 +0530 Subject: [PATCH 0843/1242] update collectionbymodule --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 82cd17d4..086e242f 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -844,6 +844,8 @@ "WS", "Target Collection WS" ], + "insight": { + }, "_comment": "" }, "demandCollectionIndexBoundaryRevenue": { From ffb247e61370feb94237c8e0b5f0f066f6df0025 Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Fri, 8 Oct 2021 15:58:53 +0530 Subject: [PATCH 0844/1242] update collectionbymodule --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 086e242f..82cd17d4 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -844,8 +844,6 @@ "WS", "Target Collection WS" ], - "insight": { - }, "_comment": "" }, "demandCollectionIndexBoundaryRevenue": { From 65d3ca9aad76ee23b57450987ffd8d259dee81ff Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Fri, 8 Oct 2021 16:09:43 +0530 Subject: [PATCH 0845/1242] update collectionbymodule --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 82cd17d4..eabd9a3e 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -844,6 +844,7 @@ "WS", "Target Collection WS" ], + "insight": { "_comment": "" }, "demandCollectionIndexBoundaryRevenue": { From a47bceb2bd3163114ccb57f57edaa3a3378cbb46 Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Fri, 8 Oct 2021 16:20:57 +0530 Subject: [PATCH 0846/1242] added ',' --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index eabd9a3e..c37197fa 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -845,6 +845,7 @@ "Target Collection WS" ], "insight": { + }, "_comment": "" }, "demandCollectionIndexBoundaryRevenue": { From 5472876f388365634adf6fd6ec4b581562aa34ef Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Fri, 8 Oct 2021 16:35:29 +0530 Subject: [PATCH 0847/1242] ADDED pathDataTypeMapping IN collectionbymodule --- .../dashboard-analytics/ChartApiConfig.json | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index c37197fa..6000f068 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -843,6 +843,26 @@ "Target Collection TL", "WS", "Target Collection WS" + ], + "pathDataTypeMapping": [ + { + "PT": "amount" + }, + { + "Target Collection PT": "amount" + }, + { + "TL": "amount" + }, + { + "Target Collection TL": "amount" + }, + { + "WS": "amount" + }, + { + "Target Collection WS": "amount" + } ], "insight": { }, From feba419242ce081b478f354084331a0bee68eee8 Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Fri, 8 Oct 2021 16:49:08 +0530 Subject: [PATCH 0848/1242] update valuetype of cllectionbymodule --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 6000f068..b41e1da6 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -830,7 +830,7 @@ } ], "chartType": "table", - "valueType": "amount", + "valueType": "", "drillChart": "none", "action": "", "plotLabel": "ULBs", From d71e0f61acabce42db65a4a9eb055a74cb05e5c5 Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Fri, 8 Oct 2021 17:00:56 +0530 Subject: [PATCH 0849/1242] added colorCode in collectionbymodule --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index b41e1da6..428e42a2 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -865,6 +865,7 @@ } ], "insight": { + "colorCode" : "#FFFFFF", }, "_comment": "" }, From 6d6a3913d9bff2fd975bc1dbcd84290c57db644a Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Mon, 11 Oct 2021 10:06:05 +0530 Subject: [PATCH 0850/1242] removed , --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 428e42a2..15234842 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -865,7 +865,7 @@ } ], "insight": { - "colorCode" : "#FFFFFF", + "colorCode" : "#FFFFFF" }, "_comment": "" }, From 2117f1ad6d8ac14333fa4364c27fd3d91920c4b3 Mon Sep 17 00:00:00 2001 From: poonam1512 Date: Mon, 11 Oct 2021 10:59:03 +0530 Subject: [PATCH 0851/1242] changes regarding payer name and NA in address --- .../pdf-service/data-config/consolidatedreceipt.json | 10 ++++------ .../pdf-service/format-config/consolidatedreceipt.json | 4 ++-- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/configs/pdf-service/data-config/consolidatedreceipt.json b/configs/pdf-service/data-config/consolidatedreceipt.json index fc92ebcc..4232de41 100644 --- a/configs/pdf-service/data-config/consolidatedreceipt.json +++ b/configs/pdf-service/data-config/consolidatedreceipt.json @@ -181,12 +181,6 @@ }, "type": "date" }, - { - "variable": "consumerID", - "value": { - "path": "$.paymentDetails[0].bill.consumerCode" - } - }, { "variable": "transactionID", "value": { @@ -573,6 +567,10 @@ "variable":"comments", "value":"$.challans[0].description" }, + { + "variable":"consumerID", + "value":"$.challans[0].citizen.name" + }, { "variable": "doorHouseNo", "value": "$.challans[0].address.doorNo" diff --git a/configs/pdf-service/format-config/consolidatedreceipt.json b/configs/pdf-service/format-config/consolidatedreceipt.json index fdbc1916..b3d7a2bc 100644 --- a/configs/pdf-service/format-config/consolidatedreceipt.json +++ b/configs/pdf-service/format-config/consolidatedreceipt.json @@ -214,7 +214,7 @@ "style": "receipt-table-value" }, { - "text": "{{doorHouseNo}}, {{buildingName}}, {{streetName}},{{pinCode}}", + "text": "{{doorHouseNo || ' '}} {{buildingName || ' '}} {{streetName || ' '}}{{pinCode || ' '}}", "border": [ false, false, @@ -836,7 +836,7 @@ "style": "receipt-table-value" }, { - "text": "{{doorHouseNo}}, {{buildingName}}, {{streetName}},{{pinCode}}", + "text": "{{doorHouseNo || ' '}} {{buildingName || ' '}} {{streetName || ' '}}{{pinCode || ' '}}", "border": [ false, false, From 558d19fc596396f8c22f3d9fd97a190a781cd921 Mon Sep 17 00:00:00 2001 From: egovmis Date: Mon, 11 Oct 2021 13:05:51 +0530 Subject: [PATCH 0852/1242] address on misc receipt --- configs/pdf-service/format-config/consolidatedreceipt.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/pdf-service/format-config/consolidatedreceipt.json b/configs/pdf-service/format-config/consolidatedreceipt.json index b3d7a2bc..3006a262 100644 --- a/configs/pdf-service/format-config/consolidatedreceipt.json +++ b/configs/pdf-service/format-config/consolidatedreceipt.json @@ -214,7 +214,7 @@ "style": "receipt-table-value" }, { - "text": "{{doorHouseNo || ' '}} {{buildingName || ' '}} {{streetName || ' '}}{{pinCode || ' '}}", + "text": "{{doorHouseNo || ' '}} {{buildingName || ''}} {{streetName || ''}} {{pinCode || ''}}", "border": [ false, false, @@ -836,7 +836,7 @@ "style": "receipt-table-value" }, { - "text": "{{doorHouseNo || ' '}} {{buildingName || ' '}} {{streetName || ' '}}{{pinCode || ' '}}", + "text": "{{doorHouseNo || ' '}} {{buildingName || ''}} {{streetName || ''}} {{pinCode || ''}}", "border": [ false, false, From d32cae2eb28eacefc9146a543b63702c08a941ef Mon Sep 17 00:00:00 2001 From: egovmis Date: Mon, 11 Oct 2021 15:04:11 +0530 Subject: [PATCH 0853/1242] consumer name changes on uc receipt --- configs/pdf-service/data-config/consolidatedreceipt.json | 8 +++++++- .../pdf-service/format-config/consolidatedreceipt.json | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/configs/pdf-service/data-config/consolidatedreceipt.json b/configs/pdf-service/data-config/consolidatedreceipt.json index 4232de41..d0b8aba8 100644 --- a/configs/pdf-service/data-config/consolidatedreceipt.json +++ b/configs/pdf-service/data-config/consolidatedreceipt.json @@ -187,6 +187,12 @@ "path": "$.transactionNumber" } }, + { + "variable": "consumerID", + "value": { + "path": "$.paymentDetails[0].bill.consumerCode" + } + }, { "variable": "dueAmount", "value": { @@ -568,7 +574,7 @@ "value":"$.challans[0].description" }, { - "variable":"consumerID", + "variable":"consumerName", "value":"$.challans[0].citizen.name" }, { diff --git a/configs/pdf-service/format-config/consolidatedreceipt.json b/configs/pdf-service/format-config/consolidatedreceipt.json index 3006a262..79d2fd6e 100644 --- a/configs/pdf-service/format-config/consolidatedreceipt.json +++ b/configs/pdf-service/format-config/consolidatedreceipt.json @@ -793,7 +793,7 @@ "style": "receipt-table-value" }, { - "text": "{{payerName}}", + "text": "{{consumerName}}", "border": [ false, false, From f5c72a7dd2b89255c32a0da96cb48b7c3c633e73 Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Mon, 11 Oct 2021 16:16:33 +0530 Subject: [PATCH 0854/1242] update propertiesAssessed --- .../dashboard-analytics/ChartApiConfig.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 15234842..32e1b279 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -630,9 +630,9 @@ "queries": [ { "module": "PT", - "indexName": "property-assessments", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Assessed Properties\":{\"value_count\":{\"field\":\"Data.assessmentNumber.keyword\"}}}}}}", - "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\",\"tenantId\" : \"Data.tenantId\" ,\"district\" : \"Data.tenantData.city.districtCode\"}", + "indexName": "property-services", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Total Application\":{\"value_count\":{\"field\":\"Data.propertyId.keyword\"}}}}}}", + "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \r\n \"district\" : \"Data.tenantData.city.districtCode\", \r\n\"tenantId\" : \"Data.tenantId\" \r\n}", "dateRefField": "Data.@timestamp" } ], @@ -642,7 +642,7 @@ "documentType": "_doc", "drillChart": "none", "aggregationPaths": [ - "Assessed Properties" + "Total Application" ], "insight": { "chartResponseMap" : "propertiesAssessed", From d3006cd6dc6fca6a7c51e636236462bb2c70dc93 Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Mon, 11 Oct 2021 16:25:41 +0530 Subject: [PATCH 0855/1242] update insight of collectionbymodule --- .../dashboard-analytics/ChartApiConfig.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 32e1b279..95cf85b3 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -865,7 +865,13 @@ } ], "insight": { - "colorCode" : "#FFFFFF" + "chartResponseMap" : "collectionByModule", + "action" : "differenceOfNumbers", + "upwardIndicator" : "positive", + "downwardIndicator" : "negative", + "textMessage" : "", + "colorCode" : "#FFFFFF", + "insightInterval" : "year" }, "_comment": "" }, From 03346e6f45d4833eb8e4b12b0c5f083213697770 Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Mon, 11 Oct 2021 16:28:08 +0530 Subject: [PATCH 0856/1242] update wsTaxHeadDDROverview --- .../dashboard-analytics/ChartApiConfig.json | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 95cf85b3..ca1b0654 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -3501,8 +3501,7 @@ "postAggregationTheory" : "", "aggregationPaths": [ "Total Collection", - "Total Receipt", - "Target Collection" + "Total Receipt" ], "pathDataTypeMapping": [ { @@ -3510,10 +3509,7 @@ }, { "Total Receipt": "number" - }, - { - "Target Collection": "number" - } + } ], "insight": { }, From e68bf18e9aeca5572f344a8f01bd3f1de9289305 Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Mon, 11 Oct 2021 16:39:58 +0530 Subject: [PATCH 0857/1242] update collectionbymodule --- .../dashboard-analytics/ChartApiConfig.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index ca1b0654..b08c5de6 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -866,11 +866,11 @@ ], "insight": { "chartResponseMap" : "collectionByModule", - "action" : "differenceOfNumbers", + "action" : "", "upwardIndicator" : "positive", "downwardIndicator" : "negative", "textMessage" : "", - "colorCode" : "#FFFFFF", + "colorCode" : "#F28000", "insightInterval" : "year" }, "_comment": "" From e7e54101f228eaa5b91a87cc48dfa0d3e55d013f Mon Sep 17 00:00:00 2001 From: egovmis Date: Mon, 11 Oct 2021 16:44:24 +0530 Subject: [PATCH 0858/1242] consumer name changes on uc receipt --- configs/pdf-service/format-config/consolidatedreceipt.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/pdf-service/format-config/consolidatedreceipt.json b/configs/pdf-service/format-config/consolidatedreceipt.json index 79d2fd6e..3064d335 100644 --- a/configs/pdf-service/format-config/consolidatedreceipt.json +++ b/configs/pdf-service/format-config/consolidatedreceipt.json @@ -171,7 +171,7 @@ "style": "receipt-table-value" }, { - "text": "{{payerName}}", + "text": "{{consumerName}}", "border": [ false, false, @@ -214,7 +214,7 @@ "style": "receipt-table-value" }, { - "text": "{{doorHouseNo || ' '}} {{buildingName || ''}} {{streetName || ''}} {{pinCode || ''}}", + "text": "{{doorHouseNo}} {{buildingName}} {{streetName}} {{pinCode}}", "border": [ false, false, @@ -836,7 +836,7 @@ "style": "receipt-table-value" }, { - "text": "{{doorHouseNo || ' '}} {{buildingName || ''}} {{streetName || ''}} {{pinCode || ''}}", + "text": "{{doorHouseNo}} {{buildingName}} {{streetName}} {{pinCode}}", "border": [ false, false, From 99a899976c7648daa00410f2e6d8774b868c06f2 Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Mon, 11 Oct 2021 16:49:00 +0530 Subject: [PATCH 0859/1242] update collectionbymodule --- .../dashboard-analytics/ChartApiConfig.json | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index b08c5de6..0507ff8d 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -865,14 +865,7 @@ } ], "insight": { - "chartResponseMap" : "collectionByModule", - "action" : "", - "upwardIndicator" : "positive", - "downwardIndicator" : "negative", - "textMessage" : "", - "colorCode" : "#F28000", - "insightInterval" : "year" - }, + }, "_comment": "" }, "demandCollectionIndexBoundaryRevenue": { From 3884b6b0f881ff1d4e324f29efe2e3aede3770b5 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 12 Oct 2021 12:26:25 +0530 Subject: [PATCH 0860/1242] added report for daily challan --- configs/reports/configs/pt-reports.yml | 151 ++++++++++++++++++++++++- 1 file changed, 150 insertions(+), 1 deletion(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 3eaa53cd..0234376f 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -5676,4 +5676,153 @@ ReportDefinitions: owners.mobileNumber as mobileno from report_properties props inner join assessments on assessments.propertyid=props.propertyid - inner join owners on owners.propertyid=props.propertyid + inner join owners on owners.propertyid=props.propertyid + +- reportName: DAILY_CHALLAN_REPORT + summary: Daily Challan Report + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: paymentmode + label: reports.pt.paymentmode + type: string + source: pt + total: false + - name: amount + label: reports.pt.amount + type: string + source: pt + total: true + - name: nos + label: reports.pt.nos + type: string + source: pt + total: true + - name: firecess + label: reports.pt.firecess + type: string + source: pt + total: true + - name: cancercess + label: reports.pt.cancercess + type: string + source: pt + total: true + searchParams: + - name: ulb + label: ULB + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: pt + wrapper: true + isMandatory: false + searchClause: AND tenantid = $ulb + query: | + --S.no Service Name ULB Property Tax Unique ID Date Of Transcation Receipt Number Existing Property ID Type Of Property Mobile Number Addr + with paidbills as + ( + SELECT + --sum(payment.totalamountpaid) as totalamount, + bd.billid as billid, + sum(bd.amountpaid) as totalamount, + count(distinct bd.billid) as totalcount, + sum(case when bad.taxheadcode='PT_FIRE_CESS' then bad.amount else 0 end) as "totalfirecess", + sum(case when bad.taxheadcode='PT_CANCER_CESS' then bad.amount else 0 end) as "totalcancercess", + sum(case when payment.paymentmode='ONLINE' then bd.amountpaid else 0 end) as "online", + sum(case when payment.paymentmode='ONLINE' and bad.taxheadcode='PT_FIRE_CESS' then bad.amount else 0 end) as "firecess_online", + sum(case when payment.paymentmode='ONLINE' and bad.taxheadcode='PT_CANCER_CESS' then bad.amount else 0 end) as "cancercess_online", + count(distinct case when payment.paymentmode='ONLINE' then bd.billid else NULL end) as "countonline", + sum(case when payment.paymentmode='CASH' then bd.amountpaid else 0 end) as "cash", + sum(case when payment.paymentmode='CASH' and bad.taxheadcode='PT_FIRE_CESS' then bad.amount else 0 end) as "firecess_cash", + sum(case when payment.paymentmode='CASH' and bad.taxheadcode='PT_CANCER_CESS' then bad.amount else 0 end) as "cancercess_cash", + count(distinct case when payment.paymentmode='CASH' then bd.billid else NULL end) as "countcash", + sum(case when payment.paymentmode='CHEQUE' then bd.amountpaid else 0 end) as "cheque", + sum(case when payment.paymentmode='CHEQUE' and bad.taxheadcode='PT_FIRE_CESS' then bad.amount else 0 end) as "firecess_cheque", + sum(case when payment.paymentmode='CHEQUE' and bad.taxheadcode='PT_CANCER_CESS' then bad.amount else 0 end) as "cancercess_cheque", + count(distinct case when payment.paymentmode='CHEQUE' then bd.billid else NULL end) as "countcheque", + sum(case when payment.paymentmode='DD' then bd.amountpaid else 0 end) as "dd", + sum(case when payment.paymentmode='DD' and bad.taxheadcode='PT_FIRE_CESS' then bad.amount else 0 end) as "firecess_dd", + sum(case when payment.paymentmode='DD' and bad.taxheadcode='PT_CANCER_CESS' then bad.amount else 0 end) as "cancercess_dd", + count(distinct case when payment.paymentmode='DD' then bd.billid else NULL end) as "countdd", + sum(case when payment.paymentmode='CARD' then bd.amountpaid else 0 end) as "card", + sum(case when payment.paymentmode='CARD' and bad.taxheadcode='PT_FIRE_CESS' then bad.amount else 0 end) as "firecess_card", + sum(case when payment.paymentmode='CARD' and bad.taxheadcode='PT_CANCER_CESS' then bad.amount else 0 end) as "cancercess_card", + count(distinct case when payment.paymentmode='CARD' then bd.billid else NULL end) as "countcard", + sum(case when payment.paymentmode='OFFLINE_RTGS' then bd.amountpaid else 0 end) as "rtgs", + sum(case when payment.paymentmode='OFFLINE_RTGS' and bad.taxheadcode='PT_FIRE_CESS' then bad.amount else 0 end) as "firecess_rtgs", + sum(case when payment.paymentmode='OFFLINE_RTGS' and bad.taxheadcode='PT_CANCER_CESS' then bad.amount else 0 end) as "cancercess_rtgs", + count(distinct case when payment.paymentmode='OFFLINE_RTGS' then bd.billid else NULL end) as "countrtgs", + sum(case when payment.paymentmode='OFFLINE_NEFT' then bd.amountpaid else 0 end) as "neft", + sum(case when payment.paymentmode='OFFLINE_NEFT' and bad.taxheadcode='PT_FIRE_CESS' then bad.amount else 0 end) as "firecess_neft", + sum(case when payment.paymentmode='OFFLINE_NEFT' and bad.taxheadcode='PT_CANCER_CESS' then bad.amount else 0 end) as "cancercess_neft", + count(distinct case when payment.paymentmode='OFFLINE_NEFT' then bd.billid else NULL end) as "countneft", + sum(case when payment.paymentmode='POSTAL_ORDER' then bd.amountpaid else 0 end) as "po", + sum(case when payment.paymentmode='POSTAL_ORDER' and bad.taxheadcode='PT_FIRE_CESS' then bad.amount else 0 end) as "firecess_po", + sum(case when payment.paymentmode='POSTAL_ORDER' and bad.taxheadcode='PT_CANCER_CESS' then bad.amount else 0 end) as "cancercess_po", + count(distinct case when payment.paymentmode='POTAL_ORDER' then bd.billid else NULL end) as "countpo" + FROM egcl_paymentdetail as pd + inner join egcl_payment payment on pd.paymentid=payment.id and payment.paymentstatus != 'CANCELLED' + inner join egcl_billdetial bd on bd.billid=pd.billid + inner join egcl_billaccountdetail bad on bad.billdetailid=bd.id + where pd.businessservice='PT' and payment.tenantid=$tenantid + group by bd.billid + ) + select + 'ONLINE' as paymentmode, + sum(online), + sum(countonline), + sum(firecess_online), + sum(cancercess_online) + from paidbills + union + select + 'CASH' as paymentmode, + sum(cash), + sum(countcash), + sum(firecess_cash), + sum(cancercess_cash) + from paidbills + union + select + 'DD' as paymentmode, + sum(dd), + sum(countdd), + sum(firecess_dd), + sum(cancercess_dd) + from paidbills + union + select 'CARD', + sum(card), + sum(countcard), + sum(firecess_card), + sum(cancercess_card) + from paidbills + union + select 'RTGS', + sum(rtgs), + sum(countrtgs), + sum(firecess_rtgs), + sum(cancercess_rtgs) + from paidbills + union + select'CHEQUE', + sum(cheque), + sum(countcheque), + sum(firecess_cheque), + sum(cancercess_cheque) + from paidbills + union + select 'NEFT', + sum(neft), + sum(countneft), + sum(firecess_neft), + sum(cancercess_neft) + from paidbills + union + select 'PO', + sum(po), + sum(countpo), + sum(firecess_po), + sum(cancercess_po) + from paidbills + From 89cd942a5f9e95767653c04f6d252df922a7475f Mon Sep 17 00:00:00 2001 From: egovmis1 <42794309+egovmis1@users.noreply.github.com> Date: Tue, 12 Oct 2021 12:29:22 +0530 Subject: [PATCH 0861/1242] update wstargetCollection --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 0507ff8d..c25544b3 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -3002,7 +3002,7 @@ { "module": "COMMON", "requestQueryMap": "{\"module\" : \"businessService.keyword\", \"tenantId\" : \"tenantIdForMunicipalCorporation.keyword\"}", - "dateRefField": "", + "dateRefField": "startdate", "indexName": "dss-target_v1", "aggrQuery": "{\"aggs\":{\"Target Collection\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}" } From 9729d1132360ccae628ba16634ed283d6e9e27d0 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 12 Oct 2021 12:35:29 +0530 Subject: [PATCH 0862/1242] applied date filters to daily challan report --- configs/reports/configs/pt-reports.yml | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 0234376f..418c2e8f 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -5709,14 +5709,18 @@ ReportDefinitions: source: pt total: true searchParams: - - name: ulb - label: ULB - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + - name: fromDate + label: reports.pt.fromDate + type: epoch source: pt - wrapper: true - isMandatory: false - searchClause: AND tenantid = $ulb + isMandatory: true + searchClause: AND 1=1 + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: true + searchClause: AND 1=1 query: | --S.no Service Name ULB Property Tax Unique ID Date Of Transcation Receipt Number Existing Property ID Type Of Property Mobile Number Addr with paidbills as @@ -5764,7 +5768,7 @@ ReportDefinitions: inner join egcl_payment payment on pd.paymentid=payment.id and payment.paymentstatus != 'CANCELLED' inner join egcl_billdetial bd on bd.billid=pd.billid inner join egcl_billaccountdetail bad on bad.billdetailid=bd.id - where pd.businessservice='PT' and payment.tenantid=$tenantid + where pd.businessservice='PT' and payment.tenantid=$tenantid and payment.createdtime>=$fromDate and payment.createdtime<=$toDate group by bd.billid ) select From 4e4433f78ccc8b7ac68f1a953292c6bfffe822ab Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 12 Oct 2021 14:28:18 +0530 Subject: [PATCH 0863/1242] where condition fix daily challan report --- configs/reports/configs/pt-reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 418c2e8f..f863a494 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -5828,5 +5828,5 @@ ReportDefinitions: sum(countpo), sum(firecess_po), sum(cancercess_po) - from paidbills + from paidbills where 1=1 From 0eccff188d812419cdebd35e67a840a22b30f5e0 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 12 Oct 2021 15:06:25 +0530 Subject: [PATCH 0864/1242] amount without firecess and cancercess --- configs/reports/configs/pt-reports.yml | 51 ++++++++++++++++---------- 1 file changed, 32 insertions(+), 19 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index f863a494..a73f999e 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -5707,7 +5707,12 @@ ReportDefinitions: label: reports.pt.cancercess type: string source: pt - total: true + total: true + - name: total + label: reports.pt.total + type: string + source: pt + total: true searchParams: - name: fromDate label: reports.pt.fromDate @@ -5773,60 +5778,68 @@ ReportDefinitions: ) select 'ONLINE' as paymentmode, - sum(online), - sum(countonline), - sum(firecess_online), - sum(cancercess_online) + sum(online)-sum(firecess_online)-sum(cancercess_online) as amount, + sum(countonline) as nos, + sum(firecess_online) as firecess, + sum(cancercess_online) as cancercess, + sum(online) as total from paidbills union select 'CASH' as paymentmode, - sum(cash), + sum(cash)-sum(firecess_cash)-sum(cancercess_cash), sum(countcash), sum(firecess_cash), - sum(cancercess_cash) + sum(cancercess_cash), + sum(cash) from paidbills union select 'DD' as paymentmode, - sum(dd), + sum(dd)-sum(firecess_dd)-sum(cancercess_dd), sum(countdd), sum(firecess_dd), - sum(cancercess_dd) + sum(cancercess_dd), + sum(dd) from paidbills union select 'CARD', - sum(card), + sum(card)-sum(firecess_card)-sum(cancercess_card), sum(countcard), sum(firecess_card), - sum(cancercess_card) + sum(cancercess_card), + sum(card) from paidbills union select 'RTGS', - sum(rtgs), + sum(rtgs)-sum(firecess_rtgs)-sum(cancercess_rtgs), sum(countrtgs), sum(firecess_rtgs), - sum(cancercess_rtgs) + sum(cancercess_rtgs), + sum(rtgs) from paidbills union select'CHEQUE', - sum(cheque), + sum(cheque)-sum(firecess_cheque)-sum(cancercess_cheque), sum(countcheque), sum(firecess_cheque), - sum(cancercess_cheque) + sum(cancercess_cheque), + sum(cheque) from paidbills union select 'NEFT', - sum(neft), + sum(neft)-sum(firecess_neft)-sum(cancercess_neft), sum(countneft), sum(firecess_neft), - sum(cancercess_neft) + sum(cancercess_neft), + sum(neft) from paidbills union select 'PO', - sum(po), + sum(po)-sum(firecess_po)-sum(cancercess_po), sum(countpo), sum(firecess_po), - sum(cancercess_po) + sum(cancercess_po), + sum(po) from paidbills where 1=1 From 9bd9fe9ec80318c3a582414fece8a5345ddc4f0c Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 12 Oct 2021 16:07:25 +0530 Subject: [PATCH 0865/1242] added cheque dd report for daily challan --- configs/reports/configs/pt-reports.yml | 121 +++++++++++++++++++++++++ 1 file changed, 121 insertions(+) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index a73f999e..13c41d6c 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -5843,3 +5843,124 @@ ReportDefinitions: sum(po) from paidbills where 1=1 +- reportName: CHEQUE_REPORT + summary: Cheque Report Register + version: 1.0.0 + moduleName: rainmaker-pt + additionalConfig: + print: + pdfPageSize: "A1" + sourceColumns: + - name: propertyid + label: reports.pt.propertyId + type: string + source: pt + total: false + - name: receiptnumber + label: reports.pt.receiptNo + type: string + source: pt + total: false + - name: receiptdate + label: reports.pt.receiptDate + type: string + source: pt + total: false + - name: instrumenttype + label: reports.pt.paymentMode + type: string + source: pt + total: false + - name: transactionnumber + label: reports.pt.ddChequeTransactionNo + type: string + source: pt + total: false + - name: transactiondate + label: reports.pt.ddChequeTransactionDate + type: string + source: pt + total: false + - name: bankname + label: reports.pt.bankName + type: string + source: pt + total: false + - name: tax_withoutcess + label: reports.pt.taxwithoutcess + type: string + source: pt + total: true + - name: firecess + label: reports.pt.fireCess + type: string + source: pt + total: true + - name: cancercess + label: reports.pt.cancerCess + type: string + source: pt + total: true + - name: amount + label: reports.pt.amount + type: string + source: pt + total: true + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: true + searchClause: AND pd.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: true + searchClause: AND pd.receiptdate <= $toDate + query: | + -- Use CTE to force query plan, compute & use CTE later + WITH receipt_breakup AS ( + SELECT + pd.id as pdid, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) + +SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) + +SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) + +SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) + +SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) + +SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN bad.amount ELSE 0 END) + --SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as paidpropertytax, + +SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN bad.amount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN bad.amount ELSE 0 END) + +SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END) as tax_withoutcess, + SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, + SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess + FROM egcl_billaccountdetail as bad + INNER JOIN egcl_billdetial as bd on bd.id = bad.billdetailid + INNER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid + INNER JOIN egcl_payment as payment on pd.paymentid=payment.id + WHERE payment.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' + AND pd.receiptdate >= $fromDate AND pd.receiptdate <= $toDate + GROUP BY pdid + ) + SELECT + pd.tenantid AS tenantid, + bill.consumercode as propertyid, + to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS receiptdate, + concat(bank_branches.bank_name,' ',bank_branches.branch) as bankname, + receiptnumber, + payment.paymentmode as instrumenttype, + payment.transactionnumber, + to_char((To_timestamp(payment.instrumentdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, + receipt_breakup.tax_withoutcess, + receipt_breakup.firecess, + receipt_breakup.cancercess, + payment.totalamountpaid as amount + FROM egcl_paymentdetail pd, egcl_payment payment left outer join bank_branches on bank_branches.ifsc=payment.ifsccode, receipt_breakup, egcl_bill bill + where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + and receipt_breakup.pdid=pd.id + and payment.paymentmode in ('CHEQUE','DD','OFFLINE_NEFT') + orderby: ORDER BY pd.receiptdate DESC From 924bd38614cd0658e75e91cd8f2d83852bc8313f Mon Sep 17 00:00:00 2001 From: Priyasharma7 <56343879+Priyasharma7@users.noreply.github.com> Date: Wed, 13 Oct 2021 13:21:21 +0530 Subject: [PATCH 0866/1242] eChallan Report added --- configs/reports/configs/uc-reports.yml | 55 ++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/configs/reports/configs/uc-reports.yml b/configs/reports/configs/uc-reports.yml index 66b9290e..acbbf98c 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -1748,5 +1748,60 @@ ReportDefinitions: JOIN eg_user ON payment.createdby::INTEGER=eg_user.id WHERE payment.tenantid=$tenantid AND businessservice not in ('PT','TL','FIRENOC') and payment.paymentstatus != 'CANCELLED' groupby: group by collectorname , paymentmode + + + - reportName: echallanReport_v2 + decryptionPathId: MiscReceiptULB_v2 + summary: Receipt Register Miscellaneous + version: 1.0.0 + moduleName: rainmaker-uc + additionalConfig: + print: + pdfPageSize: "A3" + sourceColumns: + - name: ulb + label: reports.uc.ulb + type: string + source: uc + total: false + - name: challanno + label: reports.uc.challanno + type: string + source: uc + total: false + - name: status + label: reports.uc.status + type: string + source: uc + total: false + - name: servicecategory + label: reports.uc.businessdetails + type: string + source: uc + total: false + - name: description + label: reports.uc.description + type: string + source: uc + total: false + searchParams: + - name: fromDate + label: reports.uc.fromDate + type: epoch + source: uc + isMandatory: false + searchClause: AND paydetail.receiptdate >= $fromDate + - name: toDate + label: reports.uc.toDate + type: epoch + source: uc + isMandatory: false + searchClause: AND paydetail.receiptdate <= $toDate + query: | + select b.status,b.tenantid,ch.challanno,ch.businessservice,ch.description + from eg_echallan AS ch + left JOIN egcl_bill AS b + ON ch.challanno=b.consumercode where b.tenantid='$tenantid' + From a2e3f634ab9e69020103c553eb679f919bb623a9 Mon Sep 17 00:00:00 2001 From: Priyasharma7 <56343879+Priyasharma7@users.noreply.github.com> Date: Wed, 13 Oct 2021 15:42:36 +0530 Subject: [PATCH 0867/1242] Updated eChallan Report --- configs/reports/configs/uc-reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/reports/configs/uc-reports.yml b/configs/reports/configs/uc-reports.yml index acbbf98c..9133b44e 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -1752,7 +1752,7 @@ ReportDefinitions: - reportName: echallanReport_v2 decryptionPathId: MiscReceiptULB_v2 - summary: Receipt Register Miscellaneous + summary: eChallan Report version: 1.0.0 moduleName: rainmaker-uc additionalConfig: From 2d7d0edce33041572fe7b558490278eac0017aec Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Thu, 14 Oct 2021 10:28:52 +0530 Subject: [PATCH 0868/1242] Modifying echallan report of UC --- configs/reports/configs/uc-reports.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/configs/reports/configs/uc-reports.yml b/configs/reports/configs/uc-reports.yml index 9133b44e..1cd85a4f 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -1784,21 +1784,26 @@ ReportDefinitions: type: string source: uc total: false + - name: applicationstatus + label: reports.uc.applicationstatus + type: string + source: uc + total: false searchParams: - name: fromDate label: reports.uc.fromDate type: epoch source: uc isMandatory: false - searchClause: AND paydetail.receiptdate >= $fromDate + searchClause: AND ch.createdtime >= $fromDate - name: toDate label: reports.uc.toDate type: epoch source: uc isMandatory: false - searchClause: AND paydetail.receiptdate <= $toDate + searchClause: AND ch.createdtime <= $toDate query: | - select b.status,b.tenantid,ch.challanno,ch.businessservice,ch.description + select b.status,b.tenantid,ch.challanno,ch.businessservice,ch.description,ch.applicationstatus from eg_echallan AS ch left JOIN egcl_bill AS b ON ch.challanno=b.consumercode where b.tenantid='$tenantid' From b0e8567b1bdf3e10520c3bc83be23f452f3a7531 Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Thu, 14 Oct 2021 11:02:02 +0530 Subject: [PATCH 0869/1242] modifying UC report of echallan --- configs/reports/configs/uc-reports.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/configs/reports/configs/uc-reports.yml b/configs/reports/configs/uc-reports.yml index 1cd85a4f..16e0ce9b 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -1774,8 +1774,8 @@ ReportDefinitions: type: string source: uc total: false - - name: servicecategory - label: reports.uc.businessdetails + - name: businessservice + label: reports.uc.businessservice type: string source: uc total: false @@ -1803,7 +1803,9 @@ ReportDefinitions: isMandatory: false searchClause: AND ch.createdtime <= $toDate query: | - select b.status,b.tenantid,ch.challanno,ch.businessservice,ch.description,ch.applicationstatus + -- Use CTE to force query plan, compute & use CTE later + SELECT + b.status,b.tenantid,ch.challanno,ch.businessservice,ch.description,ch.applicationstatus from eg_echallan AS ch left JOIN egcl_bill AS b ON ch.challanno=b.consumercode where b.tenantid='$tenantid' From 83a86e15a1ae437739904abe69de58447098cf6e Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 14 Oct 2021 11:43:29 +0530 Subject: [PATCH 0870/1242] Update uc-reports.yml --- configs/reports/configs/uc-reports.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/configs/reports/configs/uc-reports.yml b/configs/reports/configs/uc-reports.yml index 16e0ce9b..234bf107 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -1750,7 +1750,7 @@ ReportDefinitions: groupby: group by collectorname , paymentmode - - reportName: echallanReport_v2 + - reportName: echallanReport_v2 decryptionPathId: MiscReceiptULB_v2 summary: eChallan Report version: 1.0.0 @@ -1808,7 +1808,5 @@ ReportDefinitions: b.status,b.tenantid,ch.challanno,ch.businessservice,ch.description,ch.applicationstatus from eg_echallan AS ch left JOIN egcl_bill AS b - ON ch.challanno=b.consumercode where b.tenantid='$tenantid' - - + ON ch.challanno=b.consumercode where b.tenantid=$tenantid From 9d6039befc65780ef2eef10711eeeb2a259f0e36 Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Thu, 14 Oct 2021 13:12:43 +0530 Subject: [PATCH 0871/1242] updating echallan report of UC --- configs/reports/configs/uc-reports.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/uc-reports.yml b/configs/reports/configs/uc-reports.yml index 234bf107..0fc2dc0b 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -1807,6 +1807,7 @@ ReportDefinitions: SELECT b.status,b.tenantid,ch.challanno,ch.businessservice,ch.description,ch.applicationstatus from eg_echallan AS ch - left JOIN egcl_bill AS b - ON ch.challanno=b.consumercode where b.tenantid=$tenantid + inner JOIN egcl_bill AS b + ON ch.challanno=b.consumercode where ch.tenantid=$tenantid + orderby: ORDER BY ch.createdtime DESC From bcef671412013800cf806cc9502350b9a5cc3b47 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 14 Oct 2021 13:19:01 +0530 Subject: [PATCH 0872/1242] Update uc-reports.yml --- configs/reports/configs/uc-reports.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/configs/reports/configs/uc-reports.yml b/configs/reports/configs/uc-reports.yml index 0fc2dc0b..ae91b476 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -1809,5 +1809,7 @@ ReportDefinitions: from eg_echallan AS ch inner JOIN egcl_bill AS b ON ch.challanno=b.consumercode where ch.tenantid=$tenantid - orderby: ORDER BY ch.createdtime DESC + where 1=1 + orderby: ORDER BY ch.createdtime DESC + From 40595e23f06947e682bf486ec6dba30bc7a9a384 Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Thu, 14 Oct 2021 16:18:37 +0530 Subject: [PATCH 0873/1242] adding total amount in echallan Report --- configs/reports/configs/uc-reports.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/reports/configs/uc-reports.yml b/configs/reports/configs/uc-reports.yml index ae91b476..4d77961a 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -1759,11 +1759,11 @@ ReportDefinitions: print: pdfPageSize: "A3" sourceColumns: - - name: ulb - label: reports.uc.ulb + - name: totalamount + label: reports.uc.totalamount type: string source: uc - total: false + total: true - name: challanno label: reports.uc.challanno type: string @@ -1805,7 +1805,7 @@ ReportDefinitions: query: | -- Use CTE to force query plan, compute & use CTE later SELECT - b.status,b.tenantid,ch.challanno,ch.businessservice,ch.description,ch.applicationstatus + b.status,b.totalamount,ch.challanno,ch.businessservice,ch.description,ch.applicationstatus from eg_echallan AS ch inner JOIN egcl_bill AS b ON ch.challanno=b.consumercode where ch.tenantid=$tenantid From e9887ed20a466a6985df9f50986e5d0f1ea0c7ff Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Tue, 19 Oct 2021 10:49:28 +0530 Subject: [PATCH 0874/1242] creating new data config file for fire noc receipt --- .../data-config/firenocreceipt.json | 578 ++++++++++++++++++ 1 file changed, 578 insertions(+) create mode 100644 configs/pdf-service/data-config/firenocreceipt.json diff --git a/configs/pdf-service/data-config/firenocreceipt.json b/configs/pdf-service/data-config/firenocreceipt.json new file mode 100644 index 00000000..d09f83de --- /dev/null +++ b/configs/pdf-service/data-config/firenocreceipt.json @@ -0,0 +1,578 @@ +{ + "key": "consolidatedreceipt", + "documentType":"CONSOLIDATED_RECEIPT", + "DataConfigs": { + "moduleName": "rainmaker-common", + "version": "1.0.0", + "baseKeyPath": "$.Payments.*", + "entityIdPath":"$.id", + "isCommonTableBorderRequired": true, + "mappings": [ + { + "topic": "common-pdf-generation-3", + "mappings": [ + { + "direct": [ + { + "variable": "payerName", + "value": { + "path": "$.payerName" + } + }, + { + "variable": "PaidBy", + "value": { + "path": "$.paidBy" + } + }, + { + "variable": "chequeDD", + "value": { + "path": "$.instrumentNumber" + } + }, + { + "variable": "user-name", + "value": { + "path": "$.userInfo.name" + }, + "type":"selectFromRequestInfo" + }, + { + "variable": "payerContact", + "value": { + "path": "$.mobileNumber" + } + }, + { + "variable": "receiptNo", + "value": { + "path": "$.paymentDetails[0].receiptNumber" + } + }, + { + "variable": "serviceType", + "value": { + "path": "$.paymentDetails[0].businessService" + }, + "localisation":{ + "required":true, + "prefix":"MODULE", + "module":"rainmaker-common" + } + }, + { + "variable": "paidAmount", + "value": { + "path": "$.paymentDetails[0].totalAmountPaid" + } + }, + { + "variable": "fieldFee", + "value": { + "path": "$.paymentDetails[0].additionalDetails.fieldfee" + } + }, { + "variable": "taxAmount", + "value": { + "path": "$.paymentDetails[0].additionalDetails.tax" + } + }, { + "variable": "cgst", + "value": { + "path": "$.paymentDetails[0].additionalDetails.cgst" + } + }, { + "variable": "sgst", + "value": { + "path": "$.paymentDetails[0].additionalDetails.sgst" + } + }, + { + "variable": "fromPeriod", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].fromPeriod" + }, + "type": "date" + }, + { + "variable": "chequeDDDate", + "value": { + "path": "$.instrumentDate" + }, + "type":"date" + }, + { + "variable": "toPeriod", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].toPeriod" + }, + "type": "date" + }, + { + "variable": "payerAddress", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].additionalDetails.address" + } + }, + { + "variable": "oldPayerAddress", + "value": { + "path": "$.payerAddress" + } + }, + { + "variable": "oldComments", + "value": { + "path": "$.additionalDetails.comment" + } + }, + { + "variable": "comments", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].additionalDetails.comment" + } + }, + { + "variable": "paymentMode", + "value": { + "path": "$.paymentMode" + }, + "localisation":{ + "required":true, + "prefix": "COMMON_MASTERS_PAYMENTMODE", + "module": "rainmaker-common" + } + }, + { + "variable": "G8ReceiptNo", + "value": { + "path": "$.paymentDetails[0].manualReceiptNumber" + } + }, + { + "variable": "G8ReceiptDate", + "value": { + "path": "$.paymentDetails[0].manualReceiptDate" + }, + "type": "date" + }, + { + "variable": "ReceiptDate", + "value": { + "path": "$.paymentDetails[0].receiptDate" + }, + "type": "date" + }, { + "variable": "bankName", + "value": { + "path": "$.additionalDetails[0].bankName" + } + }, { + "variable": "branchName", + "value": { + "path": "$.additionalDetails[0].branchName" + } + }, { + "variable": "ifsc", + "value": { + "path": "$.ifscCode" + } + }, + { + "variable": "paymentDate", + "value": { + "path": "$.transactionDate" + }, + "type": "date" + }, + { + "variable": "consumerID", + "value": { + "path": "$.paymentDetails[0].bill.consumerCode" + } + }, + { + "variable": "transactionID", + "value": { + "path": "$.transactionNumber" + } + }, + { + "variable": "dueAmount", + "value": { + "path": "$.paymentDetails[0].totalDue" + } + }, + { + "variable": "payment_receipt", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_RECEIPT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "receipt_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_RECEIPT_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "consumer_id", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_CONSUMER_ID" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payment_date", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_DATE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payer_name", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYER_NAME" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payer_contact", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYER_CONTACT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "service_type", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_SERVICE_TYPE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "billing_period", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_BILLING_PERIOD" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "paid_amount", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAID_AMOUNT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "pending_amount", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PENDING_AMOUNT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payment_mode", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_MODE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "transaction_id", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_TRANSACTION_ID" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "g8_receipt_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_G8_RECEIPT_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "g8_receipt_date", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_G8_RECEIPT_DATE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "cheque_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_CHEQUE_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "generated_by", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_GENERATED_BY" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "commissioner/eo", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_COMMISSIONER_EO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "no_signature", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_NO_SIGNATURE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "disclamer", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "disclamer_1", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_FIRST_LINE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "disclamer_2", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_SECOND_LINE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "disclamer_3", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_THIRD_LINE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "disclamer_4", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_FOURTH_LINE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "disclamer_5", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_FIFTH_LINE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "to", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_TO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "Municipal_Corporation", + "value": { + "path": "PDF_STATIC_LABEL_MDMS_MUNICIPAL_CORPORATION" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + } + ] + }, + { + "derived": [ + { + "variable": "pendingAmount", + "formula": "{{dueAmount}}-{{paidAmount}}" + } + ] + }, + { + "externalAPI": [ + { + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", + "apiRequest": null, + "responseMapping":[ + { + "variable":"address", + "value":"$.MdmsRes.tenant.tenants[0].address" + }, + { + "variable":"phoneNumber", + "value":"$.MdmsRes.tenant.tenants[0].contactNumber" + }, + { + "variable":"website", + "value":"$.MdmsRes.tenant.tenants[0].domainUrl" + }, + { + "variable":"mcGrade", + "value":"$.MdmsRes.tenant.tenants[0].city.ulbType" + }, + { + "variable":"email", + "value":"$.MdmsRes.tenant.tenants[0].emailId" + }, + { + "variable": "logoImage", + "value":"$.MdmsRes.tenant.tenants[0].logoId", + "type":"image" + }, + { + "variable": "logo-header", + "value":"$.MdmsRes.tenant.tenants[0].code", + "localisation":{ + "required":true, + "prefix": "TENANT_TENANTS", + "module":"rainmaker-common" + } + } + ] +} + ] + } + ] + } + ] + } +} From 7182f00d316362d63dc2ea89b33ec308157b94fe Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Tue, 19 Oct 2021 10:53:33 +0530 Subject: [PATCH 0875/1242] adding firenoc receipt in format config --- .../format-config/firenocreceipt.json | 1370 +++++++++++++++++ 1 file changed, 1370 insertions(+) create mode 100644 configs/pdf-service/format-config/firenocreceipt.json diff --git a/configs/pdf-service/format-config/firenocreceipt.json b/configs/pdf-service/format-config/firenocreceipt.json new file mode 100644 index 00000000..523c1d16 --- /dev/null +++ b/configs/pdf-service/format-config/firenocreceipt.json @@ -0,0 +1,1370 @@ +{ + "key": "consolidatedreceipt", + "config": { + "defaultStyle": { + "font": "Cambay" + }, + "content": [ + { + "style": "noc-head", + "table": { + "widths": [ + 60, + "*", + 150 + ], + "body": [ + [ + { + "image": "{{logoImage}}", + "width": 50, + "height": 50 + }, + { + "stack": [ + { + "text": "{{logo-header}} {{mcGrade}}", + "style": "receipt-logo-header" + }, + { + "text": "{{serviceType}} {{payment_receipt}} (Employee Copy)", + "style": "receipt-logo-sub-header" + } + ], + "alignment": "left", + "margin": [ + 0, + 4, + 0, + 0 + ] + }, + { + "stack": [ + { + "text": "{{address}},{{phoneNumber}}", + "style": "receipt-logo-sub-header" + }, + { + "text": "{{website}},{{email}}", + "style": "receipt-logo-sub-header" + } + ], + "alignment": "right", + "color": "#484848", + "margin": [ + -100, + 0, + -25, + 0 + ] + } + ] + ] + }, + "layout": "noBorders" + }, + { + "style": "noc-table", + "table": { + "widths": [ + "30%", + "20%", + "30%", + "20%" + ], + "body": [ + [ + { + "text": "{{receipt_no}}.", + "border": [ + true, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{receiptNo}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{consumer_id}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{consumerID}}", + "border": [ + false, + true, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "Receipt Date", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{ReceiptDate}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Tax period", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{fromPeriod}} {{to}} {{toPeriod}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + + { + "text": "Consumer Name", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerName}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Contact No.", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerContact}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + + { + "text": "Address:", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerAddress}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Paid By", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{PaidBy}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ] + ] + }, + "layout": {} + }, + { + "style": "next-noc-table", + "table": { + "widths": [ + "30%", + "20%", + "30%", + "20%" + ], + "body": [ + [ + { + "text": "{{service_type}}", + "border": [ + true, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{serviceType}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{billing_period}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{fromPeriod}} {{to}} {{toPeriod}}", + "border": [ + false, + true, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{paid_amount}}", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "₹ {{paidAmount}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{payment_mode}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{paymentMode}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "Tax Amount", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "₹ {{taxAmount}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Field Fee", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "₹ {{fieldFee}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ],[ + { + "text": "CGST(if applicable)", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "₹ {{cgst}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "SGST(if applicable)", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "₹ {{sgst}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "Cheque/DD/PO/Transaction No.", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{chequeDD}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Cheque/DD/PO/Transaction Date", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{chequeDDDate}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + + } + ], [ + { + "text": "Bank Name", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{bankName}},{{branchName}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "IFSC Code", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{ifsc}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + + } + ], + [ + { + "text": "{{g8_receipt_no}}.", + "border": [ + true, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{G8ReceiptNo}}", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table" + }, + { + "text": "{{g8_receipt_date}}", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{G8ReceiptDate}}", + "border": [ + false, + false, + true, + true + ], + "style": "receipt-table" + } + ] + ] + }, + "layout": {} + }, + { + "style": "next-noc-table", + "table": { + "widths": [ + "10%", + "*" + ], + "body": [ + [ + { + "text":"Comments: ", + "border":[false, false, false, false] + }, + { + "text":"{{comments}}", + "border":[false, false, false, false] + } + ] + ], + "layout":"noBorders" + } + }, + { + "style": "receipt-approver", + "columns": [ + { + "text": [ + { + "text": "{{generated_by}}: ", + "bold": true + }, + { + "text": "{{user-name}}", + "bold": false + } + ], + "alignment": "left" + }, + { + "text": [ + { + "text": "Authorised Signatory", + "bold": true + } + ], + "alignment": "right", + "margin": [ + 0, + 0, + -10, + 1 + ] + } + ] + }, + { + "text":"---------------x------------------------------x-----------------------------x------------------------------x-----------------------x------------------x------", + "style":"next-noc-table" + + }, + { + "style": "noc-head-emp", + "table": { + "widths": [ + 60, + "*", + 120 + ], + "body": [ + [ + { + "image": "{{logoImage}}", + "width": 50, + "height": 50 + }, + { + "stack": [ + { + "text": "{{logo-header}} {{mcGrade}}", + "style": "receipt-logo-header" + }, + { + "text": "{{serviceType}} {{payment_receipt}} (Citizen Copy)", + "style": "receipt-logo-sub-header" + } + ], + "alignment": "left", + "margin": [ + 0, + 4, + 0, + 0 + ] + }, + { + "stack": [ + { + "text": "{{address}},{{phoneNumber}}", + "style": "receipt-logo-sub-header" + }, + { + "text": "{{website}},{{email}}", + "style": "receipt-logo-sub-header" + } + ], + "alignment": "right", + "color": "#484848", + "margin": [ + -100, + 0, + -25, + 0 + ] + } + ] + ] + }, + "layout": "noBorders" + }, + { + "style": "noc-table", + "table": { + "widths": [ + "30%", + "20%", + "30%", + "20%" + ], + "body": [ + [ + { + "text": "{{receipt_no}}.", + "border": [ + true, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{receiptNo}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{consumer_id}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{consumerID}}", + "border": [ + false, + true, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "Receipt Date", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{ReceiptDate}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Tax period", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{fromPeriod}} {{to}} {{toPeriod}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + + { + "text": "Consumer Name", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerName}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Contact No.", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerContact}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + + { + "text": "Address:", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerAddress}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Paid By", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{PaidBy}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ] + + ] + }, + "layout": {} + }, + { + "style": "next-noc-table", + "table": { + "widths": [ + "30%", + "20%", + "30%", + "20%" + ], + "body": [ + [ + { + "text": "{{service_type}}", + "border": [ + true, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{serviceType}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{billing_period}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{fromPeriod}} {{to}} {{toPeriod}}", + "border": [ + false, + true, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{paid_amount}}", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "₹ {{paidAmount}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{payment_mode}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{paymentMode}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], [ + { + "text": "Tax Amount", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "₹ {{taxAmount}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Field Fee", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "₹ {{fieldFee}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ],[ + { + "text": "CGST(if applicable)", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "₹ {{cgst}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "SGST(if applicable)", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "₹ {{sgst}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "Cheque/DD/PO/Transaction No.", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{chequeDD}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Cheque/DD/PO/Transaction Date", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{chequeDDDate}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + + } + ],[ + { + "text": "Bank Name", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{bankName}},{{branchName}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "IFSC Code", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{ifsc}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + + } + ], + [ + { + "text": "{{g8_receipt_no}}.", + "border": [ + true, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{G8ReceiptNo}}", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table" + }, + { + "text": "{{g8_receipt_date}}", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{G8ReceiptDate}}", + "border": [ + false, + false, + true, + true + ], + "style": "receipt-table" + } + ] + ] + }, + "layout": {} + }, + { + "style": "next-noc-table", + "table": { + "widths": [ + "10%", + "*" + ], + "body": [ + [ + { + "text":"Comments: ", + "border":[false, false, false, false] + }, + { + "text":"{{comments}}", + "border":[false, false, false, false] + } + ] + ], + "layout":"noBorders" + } + }, + { + "style": "receipt-approver", + "columns": [ + { + "text": [ + { + "text": "{{generated_by}}: ", + "bold": true + }, + { + "text": "{{user-name}}", + "bold": false + } + ], + "alignment": "left" + }, + { + "text": [ + { + "text": "Authorised Signatory", + "bold": true + } + ], + "alignment": "right", + "margin": [ + 0, + 0, + -10, + 1 + ] + } + ] + }, + { + "style": "pt-disclaimer", + "stack": [ + { + "text": "{{disclamer}}", + "bold": true, + "style": "pt-disclaimer-value" + }, + { + "text": "{{disclamer_1}}", + "bold": false, + "style": "pt-disclaimer-value" + }, + { + "text": "{{disclamer_2}}", + "bold": false, + "style": "pt-disclaimer-value" + }, + { + "text": "{{disclamer_3}}", + "bold": false, + "style": "pt-disclaimer-value" + }, { + "text":"Now log a complaint from WhatsApp, give a missed call on 8750975975 or send a Hi message on WhatsApp to this number", "bold": true, "fontSize": 8, "color": "blue", "decoration": "underline"} + ] + } + ], + "styles": { + "noc-head": { + "margin": [ + -30, + -30, + 0, + 1 + ] + }, + "noc-head-emp": { + "margin": [ + -30, + 10, + 0, + 1 + ] + }, + "receipt-logo-header": { + "color": "#000000", + "fontSize": 10, + "bold": true, + "letterSpacing": 0.74, + "margin": [ + 0, + 0, + 0, + 4 + ] + }, + "receipt-logo-sub-header": { + "color": "#000000", + "fontSize": 8, + "letterSpacing": 0.6 + }, + "noc-table": { + "fontSize": 8, + "color": "#000000", + "margin": [ + -25, + 10, + -22, + -8 + ] + }, + "next-noc-table": { + "fontSize": 8, + "color": "#000000", + "margin": [ + -25, + 6, + -22, + 0 + ] + }, + "receipt-table-value": { + "color": "#000000", + "bold": true, + "fontSize": 8, + "fontWeight": 500, + "margin": [ + 8, + 0, + 0, + 0 + ] + }, + "receipt-table": { + "color": "#000000", + "bold": false, + "fontSize": 8, + "fontWeight": 400, + "margin": [ + -30, + 0, + 0, + 0 + ] + }, + "receipt-approver": { + "fontSize": 8, + "bold": true, + "margin": [ + -27, + 3, + -10, + 0 + ] + }, + "no-signature": { + "fontSize": 8, + "margin": [ + -27, + 3, + -10, + 0 + ] + }, + "pt-disclaimer": { + "fontSize": 8, + "margin": [ + -27, + 3, + -10, + 0 + ] + }, + "pt-disclaimer-value": { + "fontSize": 8, + "margin": [ + 2, + 1, + 0, + 0 + ] + } + } + } +} + From f32f2efc416b85046cbfb98125e868b485555c92 Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Tue, 19 Oct 2021 15:51:19 +0530 Subject: [PATCH 0876/1242] changing consolidated receipt to old receipts --- .../format-config/consolidatedreceipt.json | 35 ++++--------------- 1 file changed, 7 insertions(+), 28 deletions(-) diff --git a/configs/pdf-service/format-config/consolidatedreceipt.json b/configs/pdf-service/format-config/consolidatedreceipt.json index 3064d335..9fb901c4 100644 --- a/configs/pdf-service/format-config/consolidatedreceipt.json +++ b/configs/pdf-service/format-config/consolidatedreceipt.json @@ -171,7 +171,7 @@ "style": "receipt-table-value" }, { - "text": "{{consumerName}}", + "text": "{{payerName}}", "border": [ false, false, @@ -214,7 +214,7 @@ "style": "receipt-table-value" }, { - "text": "{{doorHouseNo}} {{buildingName}} {{streetName}} {{pinCode}}", + "text": "{{payerAddress}}", "border": [ false, false, @@ -322,9 +322,7 @@ "style": "receipt-table" }, { - "text": "{{payment_mode}}", - "border": [ false, false, @@ -335,7 +333,6 @@ }, { "text": "{{paymentMode}}", - "border": [ false, false, @@ -367,9 +364,7 @@ "style": "receipt-table" }, { - "text": "Field Fee", - "border": [ false, false, @@ -379,9 +374,7 @@ "style": "receipt-table-value" }, { - "text": "₹ {{fieldFee}}", - "border": [ false, false, @@ -412,9 +405,7 @@ "style": "receipt-table" }, { - "text": "SGST(if applicable)", - "border": [ false, false, @@ -424,9 +415,7 @@ "style": "receipt-table-value" }, { - "text": "₹ {{sgst}}", - "border": [ false, false, @@ -793,7 +782,7 @@ "style": "receipt-table-value" }, { - "text": "{{consumerName}}", + "text": "{{payerName}}", "border": [ false, false, @@ -836,8 +825,8 @@ "style": "receipt-table-value" }, { - "text": "{{doorHouseNo}} {{buildingName}} {{streetName}} {{pinCode}}", - "border": [ + "text": "{{payerAddress}}", + "border": [ false, false, false, @@ -945,9 +934,7 @@ "style": "receipt-table" }, { - "text": "{{payment_mode}}", - "border": [ false, false, @@ -957,9 +944,7 @@ "style": "receipt-table-value" }, { - "text": "{{paymentMode}}", - "border": [ false, false, @@ -990,9 +975,7 @@ "style": "receipt-table" }, { - "text": "Field Fee", - "border": [ false, false, @@ -1002,9 +985,7 @@ "style": "receipt-table-value" }, { - "text": "₹ {{fieldFee}}", - "border": [ false, false, @@ -1035,9 +1016,7 @@ "style": "receipt-table" }, { - "text": "SGST(if applicable)", - "border": [ false, false, @@ -1047,9 +1026,7 @@ "style": "receipt-table-value" }, { - "text": "₹ {{sgst}}", - "border": [ false, false, @@ -1390,3 +1367,5 @@ } } } + + From 80dfa06023073a35e9d6de260f23859c1198a4fd Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Tue, 19 Oct 2021 15:53:35 +0530 Subject: [PATCH 0877/1242] changing consolidated receipt to old receipt From c82b067c3a0e3d1f6a1ed7b7223f7440de6df48b Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Thu, 21 Oct 2021 12:19:41 +0530 Subject: [PATCH 0878/1242] Update bill-genie.yml --- configs/egov-searcher/bill-genie.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-searcher/bill-genie.yml b/configs/egov-searcher/bill-genie.yml index ee71ee7a..2f1c4a55 100644 --- a/configs/egov-searcher/bill-genie.yml +++ b/configs/egov-searcher/bill-genie.yml @@ -184,7 +184,7 @@ SearchDefinitions: rowMapperKey: billsearch query: baseQuery: with bill_data as ( - SELECT b.id AS b_id, b.mobilenumber, + SELECT conn.property_id as pid,conn.oldConnectionNo as oldpid,conn.additionaldetails as conn_add,b.id AS b_id, b.mobilenumber, b.tenantid AS b_tenantid, b.payername AS b_payername, b.payeraddress AS b_payeraddress, b.payeremail AS b_payeremail, b.isactive AS b_isactive, b.iscancelled AS b_iscancelled, From 17c2c302b09b764c4fc2b321ec484f51200b8ca0 Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Fri, 22 Oct 2021 15:11:28 +0530 Subject: [PATCH 0879/1242] adding receipt number and receipt date to Challan report --- configs/reports/configs/uc-reports.yml | 30 ++++++++++++++++++++------ 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/configs/reports/configs/uc-reports.yml b/configs/reports/configs/uc-reports.yml index 4d77961a..0d1a2a50 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -1789,27 +1789,43 @@ ReportDefinitions: type: string source: uc total: false + - name: receiptnumber + label: reports.uc.receiptnumber + type: string + source: uc + total: false + - name: receiptdate + label: reports.uc.receiptdate + type: string + source: uc + total: false searchParams: - name: fromDate label: reports.uc.fromDate type: epoch source: uc isMandatory: false - searchClause: AND ch.createdtime >= $fromDate + searchClause: AND eg_echallan.createdtime >= $fromDate - name: toDate label: reports.uc.toDate type: epoch source: uc isMandatory: false - searchClause: AND ch.createdtime <= $toDate + searchClause: AND eg_echallan.createdtime <= $toDate query: | -- Use CTE to force query plan, compute & use CTE later SELECT - b.status,b.totalamount,ch.challanno,ch.businessservice,ch.description,ch.applicationstatus - from eg_echallan AS ch - inner JOIN egcl_bill AS b - ON ch.challanno=b.consumercode where ch.tenantid=$tenantid + egcl_bill.status, + egcl_bill.totalamount, + eg_echallan.challanno, + eg_echallan.businessservice, + eg_echallan.description, + eg_echallan.applicationstatus, + egcl_paymentdetail.receiptnumber, + To_char((To_timestamp(egcl_paymentdetail.receiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as receiptdate + from eg_echallan left JOIN egcl_bill ON eg_echallan.challanno=egcl_bill.consumercode left join egcl_paymentdetail on egcl_bill.id=egcl_paymentdetail.billid + where eg_echallan.tenantid=$tenantid where 1=1 - orderby: ORDER BY ch.createdtime DESC + orderby: ORDER BY eg_echallan.createdtime DESC From c3b838b9424324fa31cd237f5c9f984acacf9da9 Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Fri, 22 Oct 2021 15:47:36 +0530 Subject: [PATCH 0880/1242] Update eChallan Report --- configs/reports/configs/uc-reports.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/configs/reports/configs/uc-reports.yml b/configs/reports/configs/uc-reports.yml index 0d1a2a50..856ccf53 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -1814,7 +1814,7 @@ ReportDefinitions: searchClause: AND eg_echallan.createdtime <= $toDate query: | -- Use CTE to force query plan, compute & use CTE later - SELECT + SELECT egcl_bill.status, egcl_bill.totalamount, eg_echallan.challanno, @@ -1825,7 +1825,6 @@ ReportDefinitions: To_char((To_timestamp(egcl_paymentdetail.receiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as receiptdate from eg_echallan left JOIN egcl_bill ON eg_echallan.challanno=egcl_bill.consumercode left join egcl_paymentdetail on egcl_bill.id=egcl_paymentdetail.billid where eg_echallan.tenantid=$tenantid - where 1=1 orderby: ORDER BY eg_echallan.createdtime DESC From 208e9d4c127c91f2cd232cdf53e55fcf0121292e Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Mon, 25 Oct 2021 11:53:32 +0530 Subject: [PATCH 0881/1242] adding key for firenocreceipt in data config --- configs/pdf-service/data-config/firenocreceipt.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/pdf-service/data-config/firenocreceipt.json b/configs/pdf-service/data-config/firenocreceipt.json index d09f83de..f5c4258b 100644 --- a/configs/pdf-service/data-config/firenocreceipt.json +++ b/configs/pdf-service/data-config/firenocreceipt.json @@ -1,6 +1,6 @@ { - "key": "consolidatedreceipt", - "documentType":"CONSOLIDATED_RECEIPT", + "key": "firenocreceipt", + "documentType":"FIRENOC_RECEIPT", "DataConfigs": { "moduleName": "rainmaker-common", "version": "1.0.0", From b84a710da09cd3e38437c59d8714a0eb92507af6 Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Mon, 25 Oct 2021 11:54:37 +0530 Subject: [PATCH 0882/1242] adding key to firenoc receipt format config --- configs/pdf-service/format-config/firenocreceipt.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/pdf-service/format-config/firenocreceipt.json b/configs/pdf-service/format-config/firenocreceipt.json index 523c1d16..f3379075 100644 --- a/configs/pdf-service/format-config/firenocreceipt.json +++ b/configs/pdf-service/format-config/firenocreceipt.json @@ -1,5 +1,5 @@ { - "key": "consolidatedreceipt", + "key": "firenocreceipt", "config": { "defaultStyle": { "font": "Cambay" From 069e010223c2045265c7ecc272e26d32729cdd4c Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 28 Oct 2021 10:27:02 +0530 Subject: [PATCH 0883/1242] testing search by name support --- configs/reports/configs/tl-reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/reports/configs/tl-reports.yml b/configs/reports/configs/tl-reports.yml index c49ce9ab..21216fd4 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -2359,7 +2359,7 @@ ReportDefinitions: ( SELECT tradelicensedetailid,array_to_string(array_agg(message.message),',') AS acc FROM eg_tl_accessory LEFT OUTER JOIN message ON code=CONCAT('TRADELICENSE_ACCESSORIESCATEGORY_', REGEXP_REPLACE(accessorycategory, '[^A-Za-z0-9]','_', 'g')) AND message.locale = 'en_IN' GROUP BY 1 ) tlacc ON tlacc.tradelicensedetailid = tld.id - WHERE tl.tenantid=$tenantid + WHERE tl.tenantid=$tenantid and name like 'Karu%' - reportName: StateDefaulterReport_v2 From 2df7dd5e1f025f9e1391ac58016a79ab1500b5fe Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 28 Oct 2021 10:43:00 +0530 Subject: [PATCH 0884/1242] search by name not working as encrypted field --- configs/reports/configs/tl-reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/reports/configs/tl-reports.yml b/configs/reports/configs/tl-reports.yml index 21216fd4..399a734a 100644 --- a/configs/reports/configs/tl-reports.yml +++ b/configs/reports/configs/tl-reports.yml @@ -2359,7 +2359,7 @@ ReportDefinitions: ( SELECT tradelicensedetailid,array_to_string(array_agg(message.message),',') AS acc FROM eg_tl_accessory LEFT OUTER JOIN message ON code=CONCAT('TRADELICENSE_ACCESSORIESCATEGORY_', REGEXP_REPLACE(accessorycategory, '[^A-Za-z0-9]','_', 'g')) AND message.locale = 'en_IN' GROUP BY 1 ) tlacc ON tlacc.tradelicensedetailid = tld.id - WHERE tl.tenantid=$tenantid and name like 'Karu%' + WHERE tl.tenantid=$tenantid - reportName: StateDefaulterReport_v2 From 3f6d2ded1908df6e020e6e4746c955b881ee507b Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov <61416590+mahammadnizam-wt-eGov@users.noreply.github.com> Date: Thu, 28 Oct 2021 16:13:43 +0530 Subject: [PATCH 0885/1242] PI-1806: Total Cum. Properties Assessed Graph: The label says 'Collections'. It needs to change to 'Properties Assessed' --- .../dashboard-analytics/ChartApiConfig.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index c25544b3..7176b53e 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -691,7 +691,7 @@ { "module": "PT", "indexName": "property-assessments", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Collections\":{\"date_histogram\":{\"field\":\"Data.@timestamp\",\"interval\":\"intervalvalue\"},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.assessmentNumber.keyword\"}}}}}}}}", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Properties Assessed\":{\"date_histogram\":{\"field\":\"Data.@timestamp\",\"interval\":\"intervalvalue\"},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.assessmentNumber.keyword\"}}}}}}}}", "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \"tenantId\" : \"Data.tenantId\" ,\"district\" : \"Data.tenantData.city.districtCode\"}", "dateRefField": "Data.@timestamp" } @@ -702,7 +702,7 @@ "documentType": "_doc", "drillChart": "none", "aggregationPaths": [ - "Collections" + "Properties Assessed" ], "isCumulative": true, "interval": "week", From 768390e2b2cd7f166f08163922d593d84bea1721 Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov <61416590+mahammadnizam-wt-eGov@users.noreply.github.com> Date: Thu, 28 Oct 2021 16:28:13 +0530 Subject: [PATCH 0886/1242] PI-1806: Removed percentage for active ULbs --- .../dashboard-analytics/ChartApiConfig.json | 9 --------- 1 file changed, 9 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 7176b53e..0bde8f75 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -736,15 +736,6 @@ "aggregationPaths": [ "Active ULBs" ], - "insight": { - "chartResponseMap" : "activeUlbs", - "action" : "differenceOfNumbers", - "upwardIndicator" : "positive", - "downwardIndicator" : "negative", - "textMessage" : "$indicator$value% than last $insightInterval", - "colorCode" : "#228B22", - "insightInterval" : "year" - }, "_comment": " total ULBs count" }, From 0dc0aa820a950be29f868068d995aa690253e5b1 Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov <61416590+mahammadnizam-wt-eGov@users.noreply.github.com> Date: Fri, 29 Oct 2021 16:44:36 +0530 Subject: [PATCH 0887/1242] Removed WS and WS Target amount from collectionByModule --- .../dashboard-analytics/ChartApiConfig.json | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 0bde8f75..ee4855aa 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -831,9 +831,7 @@ "PT", "Target Collection PT", "TL", - "Target Collection TL", - "WS", - "Target Collection WS" + "Target Collection TL" ], "pathDataTypeMapping": [ { @@ -847,12 +845,6 @@ }, { "Target Collection TL": "amount" - }, - { - "WS": "amount" - }, - { - "Target Collection WS": "amount" } ], "insight": { From 0a1248c032153f02d740a1580d2e69309cd59e8f Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov <61416590+mahammadnizam-wt-eGov@users.noreply.github.com> Date: Fri, 29 Oct 2021 16:48:07 +0530 Subject: [PATCH 0888/1242] [PI-1806]-Removed WS from Overview->Service collection by module --- .../dashboard-analytics/MasterDashboardConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json index 69315fba..59e27ad3 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json @@ -151,7 +151,7 @@ "vizArray": [ { "id": 131, - "name": "PT ,TL ,WS TOTAL COLLECTION ", + "name": "PT ,TL TOTAL COLLECTION ", "dimensions": { "height": 350, "width": 12 From ce6a9d96feb8a26b391788303bed707774eeb0e8 Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Mon, 1 Nov 2021 12:12:58 +0530 Subject: [PATCH 0889/1242] Adding new misc. report NewMiscReceiptULB_v2 for challan number comments and transaction number --- configs/reports/configs/uc-reports.yml | 196 ++++++++++++++++++++++++- 1 file changed, 194 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/uc-reports.yml b/configs/reports/configs/uc-reports.yml index 856ccf53..b69e126b 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -1826,5 +1826,197 @@ ReportDefinitions: from eg_echallan left JOIN egcl_bill ON eg_echallan.challanno=egcl_bill.consumercode left join egcl_paymentdetail on egcl_bill.id=egcl_paymentdetail.billid where eg_echallan.tenantid=$tenantid orderby: ORDER BY eg_echallan.createdtime DESC - - + + - reportName: NewMiscReceiptULB_v2 + decryptionPathId: MiscReceiptULB_v2 + summary: Receipt Register Miscellaneous + version: 1.0.0 + moduleName: rainmaker-uc + additionalConfig: + print: + pdfPageSize: "A3" + sourceColumns: + - name: ulb + label: reports.uc.ulb + type: string + source: uc + total: false + - name: receiptnumber + label: reports.uc.receiptnumber + type: string + source: uc + total: false + - name: receiptdate + label: reports.uc.receiptdate + type: string + source: uc + total: false + - name: g8issuedate + label: reports.uc.g8issuedate + type: string + source: uc + total: false + - name: challanno + label: reports.uc.challanno + type: string + source: uc + total: false + - name: g8receiptno + label: reports.uc.g8receiptno + type: string + source: uc + total: false + - name: status + label: reports.uc.receiptstatus + type: string + source: uc + total: false + - name: servicecategory + label: reports.uc.businessdetails + type: string + source: uc + total: false + - name: cgst + label: reports.uc.cgst + type: string + source: uc + total: true + - name: tax + label: reports.uc.tax + type: string + source: uc + total: true + - name: fieldcollection + label: reports.uc.fieldcollection + type: string + source: uc + total: true + - name: sgst + label: reports.uc.sgst + type: string + source: uc + total: true + - name: ddorchequenumber + label: reports.uc.ddorchequenumber + type: string + source: uc + total: false + - name: ddchequedate + label: reports.uc.ddorchequedate + type: string + source: uc + total: false + - name: bankname + label: reports.uc.bankname + type: string + source: uc + total: false + - name: branchname + label: reports.uc.branchname + type: string + source: uc + total: false + - name: transactionnumber + label: reports.uc.transactionnumber + type: string + source: uc + total: false + - name: collectiontype + label: reports.uc.collectiontype + type: string + source: uc + total: false + - name: collectorname + label: reports.uc.collectorname + type: string + source: uc + total: false + - name: totalamount + label: reports.uc.totalamount + type: string + source: uc + total: true + - name: paymentmode + label: reports.uc.paymentmode + type: string + source: uc + total: false + - name: remarks + label: reports.uc.remarks + type: string + source: uc + total: false + searchParams: + - name: fromDate + label: reports.uc.fromDate + type: epoch + source: uc + isMandatory: true + searchClause: AND paydetail.receiptdate >= $fromDate + - name: toDate + label: reports.uc.toDate + type: epoch + source: uc + isMandatory: true + searchClause: AND paydetail.receiptdate <= $toDate + - name: businessservice + label: reports.uc.businessservice + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=BillingService&masterName=BusinessService&tenantId=$tenantid|$.MdmsRes.BillingService.BusinessService[*].code|$.MdmsRes.BillingService.BusinessService[*].code + source: uc + wrapper: true + isMandatory: false + searchClause: AND businessservice = $businessservice + - name: collectorname + label: reports.uc.collectorname + type: singlevaluelist + pattern: http://egov-hrms:8080/egov-hrms/employees/_search?tenantId=$tenantid&roles=UC_EMP|$.Employees[*].user.id|$.Employees[*].user.name + source: uc + wrapper: true + isMandatory: false + searchClause: AND eg_user.id = $collectorname::INTEGER + query: | + -- Use CTE to force query plan, compute & use CTE later + WITH receipt_breakup AS ( + SELECT + bill.id as bill_id, + SUM(CASE WHEN taxheadcode LIKE '%_CGST' THEN adjustedamount ELSE 0 END) as cgst, + SUM(CASE WHEN taxheadcode LIKE '%_TAX' THEN adjustedamount ELSE 0 END) as tax, + SUM(CASE WHEN taxheadcode LIKE '%_SGST' THEN adjustedamount ELSE 0 END) as sgst, + SUM(CASE WHEN taxheadcode LIKE '%_FEE' THEN adjustedamount ELSE 0 END) as fieldcollection + FROM egcl_billaccountdetail + INNER JOIN egcl_billdetial as billd on billd.id = egcl_billaccountdetail.billdetailid + INNER JOIN egcl_bill as bill on bill.id=billd.billid + WHERE billd.tenantid=$tenantid AND businessservice not in ('PT','TL','FIRENOC','WS','SW','WS.ONE_TIME_FEE') + GROUP BY billdetailid,bill.id + ) + SELECT + payment.tenantid as ulb, + paydetail.receiptnumber as receiptnumber, + To_char((To_timestamp(paydetail.receiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as receiptdate, + To_char((To_timestamp(paydetail.manualreceiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as g8issuedate, + paydetail.manualreceiptnumber as g8receiptno, + challan.challanno as challanno, + bank_branches.bank_name as bankname, + bank_branches.branch as branchname, + payment.transactionnumber as transactionnumber, + payment.paymentstatus as status, + bill.businessservice as servicecategory, + receipt_breakup.*, + payment.totalamountpaid as totalamount, + paymentmode as paymentmode, + (case when paymentmode like 'CASH' then '' else transactionnumber end) as ddorchequenumber, + (case when paymentmode like 'DD' or paymentmode like 'CHEQUE' then To_char((To_timestamp(payment.instrumentdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') else '' end) as ddchequedate, + 'System' as collectiontype, + eg_user.name as collectorname, + challan.description as remarks + FROM egcl_payment AS payment + JOIN egcl_paymentdetail as paydetail on paydetail.paymentid=payment.id + JOIN receipt_breakup ON paydetail.billid = receipt_breakup.bill_id + JOIN egcl_billdetial as billd on billd.billid=paydetail.billid + LEFT OUTER JOIN egcl_bill as bill on bill.id=paydetail.billid + LEFT OUTER JOIN eg_echallan as challan on challan.challanno=bill.consumercode + JOIN eg_user ON payment.createdby::INTEGER=eg_user.id + LEFT OUTER JOIN bank_branches on bank_branches.ifsc=payment.ifsccode + WHERE payment.tenantid=$tenantid AND bill.businessservice not in ('PT','TL','FIRENOC','WS','SW','WS.ONE_TIME_FEE') and payment.paymentstatus != 'CANCELLED' + orderby: ORDER BY paydetail.receiptdate DESC From a15cf34ee13159becbd909f158b7d88c0a387e33 Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov Date: Mon, 8 Nov 2021 14:34:51 +0530 Subject: [PATCH 0890/1242] PI-1806 Added PT--> SERVICE Total Properties Available --- .../dashboard-analytics/ChartApiConfig.json | 21 +++++++++++++++++++ .../MasterDashboardConfig.json | 10 ++++++++- 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index ee4855aa..ab5f6f4c 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -625,6 +625,27 @@ }, "_comment": " properties having assessmentNumber per usage type" }, + "totalProperties": { + "chartName": "DSS_PT_TOTAL_PROPERTIES", + "queries": [ + { + "module": "PT", + "indexName": "property-services", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Total Application\":{\"value_count\":{\"field\":\"Data.propertyId.keyword\"}}}}}}", + "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \r\n \"district\" : \"Data.tenantData.city.districtCode\", \r\n\"tenantId\" : \"Data.tenantId\" \r\n}", + "dateRefField": "" + } + ], + "chartType": "metric", + "valueType": "number", + "action": "", + "documentType": "_doc", + "drillChart": "none", + "aggregationPaths": [ + "Total Application" + ], + "_comment": " totol properties count" + }, "propertiesAssessed": { "chartName": "DSS_PT_TOTAL_PROPERTIES_ASSESSED", "queries": [ diff --git a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json index 59e27ad3..d7dbe939 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json @@ -172,7 +172,7 @@ } ] }, - { + { "row": 4, "name": "DSS_REVENUE", "vizArray": [ @@ -579,6 +579,14 @@ "isCollapsible": false, "label": "DSS_OVERVIEW", "charts": [ + { + "id": "totalProperties", + "name": "DSS_PT_TOTAL_PROPERTIES", + "code": "", + "chartType": "metric", + "filter": "", + "headers": [] + }, { "id": "propertiesAssessed", "name": "DSS_PT_TOTAL_PROPERTIES_ASSESSED", From 4b6315f45f921aecbdf21cbf136033e069bddb84 Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov Date: Mon, 8 Nov 2021 17:32:28 +0530 Subject: [PATCH 0891/1242] PI-1806-Changed index name for projected demands amount --- .../dashboard-analytics/ChartApiConfig.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index ab5f6f4c..e2f828d6 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -3231,8 +3231,8 @@ "module": "W&S", "requestQueryMap": "{ \"tenantId\" : \"cityname.keyword\", \"wardId\" : \"block.keyword\"}", "dateRefField": "@timestamp", - "indexName": "projecteddemand-consumers", - "aggrQuery": "{\"aggs\":{\"Project Demand\":{\"sum\":{\"field\":\"projecteddemand\"}}}}" + "indexName": "demandbillconsumers", + "aggrQuery": "{\"aggs\":{\"Project Demand\":{\"sum\":{\"field\":\"billamount\"}}}}" } ], "isMdmsEnabled": true, From fb8ec9fbb2b5119711bd10ff1c58b841829db4e1 Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov <61416590+mahammadnizam-wt-eGov@users.noreply.github.com> Date: Tue, 9 Nov 2021 14:13:36 +0530 Subject: [PATCH 0892/1242] PI1806: Updated DSL query for tlStatusByDDR --- .../dashboard-analytics/ChartApiConfig.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index e2f828d6..d43b98ef 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -1755,9 +1755,9 @@ { "module": "TL", "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \"tenantId\" : \"Data.tradelicense.tenantId.keyword\" }", - "dateRefField": "Data.tradelicense.issuedDate", + "dateRefField": "Data.tradelicense.applicationDate", "indexName": "tlindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tradelicense.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Status\":{\"terms\":{\"field\":\"Data.tradelicense.status.keyword\",\"size\":1000,\"min_doc_count\":0},\"aggs\":{\"License Issued\":{\"value_count\":{\"field\":\"Data.tradelicense.licenseNumber.keyword\"}}}}}}}}", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tradelicense.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Status\":{\"terms\":{\"field\":\"Data.tradelicense.status.keyword\",\"size\":1000,\"min_doc_count\":0},\"aggs\":{\"License Issued\":{\"value_count\":{\"field\":\"Data.tradelicense.applicationNumber.keyword\"}}}}}}}}", "aggrQueryBC": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tradelicense.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Status\":{\"filters\":{\"filters\":{\"Approved\":{\"match\":{\"Data.tradelicense.status.keyword\":\"APPROVED\"}},\"Initiated\":{\"match\":{\"Data.tradelicense.status.keyword\":\"INITIATED\"}},\"Applied\":{\"match\":{\"Data.tradelicense.status.keyword\":\"APPLIED\"}},\"Rejected\":{\"match\":{\"Data.tradelicense.status.keyword\":\"REJECTED\"}},\"Pending Approval\":{\"match\":{\"Data.tradelicense.status.keyword\":\"PENDINGAPPROVAL\"}},\"Field Inspection\":{\"match\":{\"Data.tradelicense.status.keyword\":\"FIELDINSPECTION\"}},\"Cancelled\":{\"match\":{\"Data.tradelicense.status.keyword\":\"CANCELLED\"}},\"Pending Payment\":{\"match\":{\"Data.tradelicense.status.keyword\":\"PENDINGPAYMENT\"}},\"Paid\":{\"match\":{\"Data.tradelicense.status.keyword\":\"PAID\"}}}}}}}}}" } ], From 7ae58665b48a21b78353021da0eb843011e3dca3 Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Thu, 11 Nov 2021 16:13:07 +0530 Subject: [PATCH 0893/1242] Adding search by businessservice category in misc. State Collection register --- configs/reports/configs/uc-reports.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/configs/reports/configs/uc-reports.yml b/configs/reports/configs/uc-reports.yml index b69e126b..75374011 100644 --- a/configs/reports/configs/uc-reports.yml +++ b/configs/reports/configs/uc-reports.yml @@ -1290,6 +1290,14 @@ ReportDefinitions: source: uc isMandatory: false searchClause: AND paydetail.receiptdate <= $toDate + - name: businessservice + label: reports.uc.businessservice + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=BillingService&masterName=BusinessService&tenantId=$tenantid|$.MdmsRes.BillingService.BusinessService[*].code|$.MdmsRes.BillingService.BusinessService[*].code + source: uc + wrapper: true + isMandatory: false + searchClause: AND paydetail.businessservice = $businessservice - name: ulb label: reports.uc.ulb type: singlevaluelist From 7cef1dfdc49cb711098227bce6efc278861c9c1f Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Fri, 12 Nov 2021 11:44:23 +0530 Subject: [PATCH 0894/1242] changing font color (Red from Black) of Remarks and Status of challan on header --- configs/pdf-service/format-config/mcollect-challan.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/pdf-service/format-config/mcollect-challan.json b/configs/pdf-service/format-config/mcollect-challan.json index 597bcb79..0326c09a 100644 --- a/configs/pdf-service/format-config/mcollect-challan.json +++ b/configs/pdf-service/format-config/mcollect-challan.json @@ -654,7 +654,7 @@ ] }, "receipt-logo-title-status": { - "color": "#FF0000", + "color": "#000000", "alignment": "right", "bold": true, "fontSize": 13, @@ -680,7 +680,7 @@ ] }, "receipt-logo-title-remarks-new": { - "color": "#FF0000", + "color": "#000000", "bold": true, "fontSize": 10, "fontWeight": 500, From 548844e9e594b100cbab94406fb3ead5a16fec5c Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov <61416590+mahammadnizam-wt-eGov@users.noreply.github.com> Date: Mon, 22 Nov 2021 12:16:03 +0530 Subject: [PATCH 0895/1242] Added date filter for the total properties available --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index d43b98ef..9297bc0d 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -633,7 +633,7 @@ "indexName": "property-services", "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Total Application\":{\"value_count\":{\"field\":\"Data.propertyId.keyword\"}}}}}}", "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \r\n \"district\" : \"Data.tenantData.city.districtCode\", \r\n\"tenantId\" : \"Data.tenantId\" \r\n}", - "dateRefField": "" + "dateRefField": "Data.@timestamp" } ], "chartType": "metric", From 67c7606f1c58e3f9b3d4bf4215fcc150e79dcd64 Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov <61416590+mahammadnizam-wt-eGov@users.noreply.github.com> Date: Mon, 22 Nov 2021 12:54:55 +0530 Subject: [PATCH 0896/1242] Removed date filter in total properties available --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 9297bc0d..d43b98ef 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -633,7 +633,7 @@ "indexName": "property-services", "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Total Application\":{\"value_count\":{\"field\":\"Data.propertyId.keyword\"}}}}}}", "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \r\n \"district\" : \"Data.tenantData.city.districtCode\", \r\n\"tenantId\" : \"Data.tenantId\" \r\n}", - "dateRefField": "Data.@timestamp" + "dateRefField": "" } ], "chartType": "metric", From a266bb3c0d1f3b9eb9fb9c23f86a7ac24b3ca8b1 Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov <61416590+mahammadnizam-wt-eGov@users.noreply.github.com> Date: Mon, 22 Nov 2021 15:00:25 +0530 Subject: [PATCH 0897/1242] Changed value type to amount in the licenseByLicenseType pie chart --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index d43b98ef..c37d9917 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -233,7 +233,7 @@ } ], "chartType": "pie", - "valueType": "number", + "valueType": "amount", "action": "", "documentType": "_doc", "drillChart": "none", From 44586c2f80f4e5de0e86d497717b135534f28cc7 Mon Sep 17 00:00:00 2001 From: mahammadnizam-wt-eGov <61416590+mahammadnizam-wt-eGov@users.noreply.github.com> Date: Mon, 22 Nov 2021 15:13:43 +0530 Subject: [PATCH 0898/1242] PI-1813: Changed value type to amount in the W&S collection by usage type and channel pie chart --- .../dashboard-analytics/ChartApiConfig.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index c37d9917..bf7ecb17 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -3173,7 +3173,7 @@ ], "translateTenantCode": true, "chartType": "pie", - "valueType": "number", + "valueType": "amount", "action": "", "documentType": "_doc", "drillChart": "none", @@ -3198,7 +3198,7 @@ ], "translateTenantCode": true, "chartType": "pie", - "valueType": "number", + "valueType": "amount", "action": "", "documentType": "_doc", "drillChart": "none", From 69eacd8f4055f7867142228b4ec554b02fa062c1 Mon Sep 17 00:00:00 2001 From: Anjalichhoker <85220077+Anjalichhoker@users.noreply.github.com> Date: Tue, 23 Nov 2021 10:42:45 +0530 Subject: [PATCH 0899/1242] UAT_V2 digit report pt --- configs/reports/configs/pt-reports.yml | 126 +++++++++++++++++++++++++ 1 file changed, 126 insertions(+) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 13c41d6c..a6250bcc 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -5964,3 +5964,129 @@ ReportDefinitions: and receipt_breakup.pdid=pd.id and payment.paymentmode in ('CHEQUE','DD','OFFLINE_NEFT') orderby: ORDER BY pd.receiptdate DESC + +- reportName: DigitData_PT + summary: Online DigitData_PT + version: 1.0.0 + moduleName: rainmaker-pt + additionalConfig: + print: + pdfPageSize: "A1" + sourceColumns: + - name: tenantid + label: reports.pt.tenant + type: string + source: pt + total: false + - name: amountpaid + label: reports.pt.amountpaid + type: string + source: pt + total: true + - name: receiptnumber + label: reports.pt.receiptnumber + type: string + source: pt + total: false + - name: receiptdate + label: reports.pt.receiptdate + type: string + source: pt + total: false + - name: businessservice + label: reports.pt.businessservice + type: string + source: pt + total: false + - name: transactionnumber + label: reports.pt.transactionnumber + type: string + source: pt + total: false + - name: paymentmode + label: reports.pt.paymentmode + type: string + source: pt + total: false + - name: instrumentnumber + label: reports.pt.instrumentnumber + type: string + source: pt + total: false + - name: paidby + label: reports.pt.paidby + type: string + source: pt + total: false + - name: txn id + label: reports.pt.txn_id + type: string + source: pt + total: false + - name: txn status + label: reports.pt.txn_status + type: string + source: pt + total: false + - name: txn status msg + label: reports.pt.txn_status_msg + type: string + source: pt + total: false + - name: gateway + label: reports.pt.gateway + type: string + source: pt + total: false + - name: product info + label: reports.pt.product_info + type: string + source: pt + total: false + - name: gatewaytxnid + label: reports.pt.gatewaytxnid + type: string + source: pt + total: false + - name: gateway payment mode + label: reports.pt.gateway_payment_mode + type: string + source: pt + total: false + - name: gateway status msg + label: reports.pt.gateway_status_msg + type: string + source: pt + total: false + searchParams: + - name: gateway + label: report.pt.gateway + type: singlevaluelist + pattern: 'list://Razorpay:Razorpay,Paytm:Paytm,Other:Other' + source: pt + isMandatory: true + query: | + ---Use CTE to force query plan, compute & use CTE later + select + txn.txn_id, + txn.txn_status, + txn.txn_status_msg, + txn.gateway, + txn.product_info, + txn.gateway_txn_id, + txn.gateway_payment_mode, + txn.gateway_status_msg, + pyd.tenantid, + pyd.amountpaid, + pyd.receiptnumber, + pyd.receiptdate, + pyd.businessservice, + to_char((To_timestamp(receiptdate/1000) at time Zone 'Asia/Kolkata'),'YYYY-MM-DD') as receiptdate, + egp.transactionnumber, + egp.paymentmode, + egp.instrumentnumber,egp.paidby + from eg_pg_transactions as txn + join egcl_payment as egp on egp.transactionnumber=txn.txn_id + join egcl_paymentdetail as pyd on pyd.paymentid=egp.id --pyd.receiptdate>=1625097660000 and pyd.receiptdate<=1627689660000 + where egp.paymentmode='ONLINE' and egp.tenantid= $tenantid + orderby: ORDER BY egp.transactiondate asc From e2b6615530199060a3c9beaa6d3cb159142bf7b3 Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Wed, 24 Nov 2021 09:39:17 +0530 Subject: [PATCH 0900/1242] Update pt-reports.yml --- configs/reports/configs/pt-reports.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index a6250bcc..a5896fc9 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -6078,10 +6078,9 @@ ReportDefinitions: txn.gateway_status_msg, pyd.tenantid, pyd.amountpaid, - pyd.receiptnumber, - pyd.receiptdate, + pyd.receiptnumber, pyd.businessservice, - to_char((To_timestamp(receiptdate/1000) at time Zone 'Asia/Kolkata'),'YYYY-MM-DD') as receiptdate, + to_char((To_timestamp(pyd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'YYYY-MM-DD') as receiptdate, egp.transactionnumber, egp.paymentmode, egp.instrumentnumber,egp.paidby From 0a69e3f710e5f1ebf62c8ced6f14d6c76a1cb768 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Tue, 4 Jan 2022 16:08:54 +0530 Subject: [PATCH 0901/1242] Create auto-escalation-persister.yml --- .../auto-escalation-persister.yml | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 configs/egov-persister/auto-escalation-persister.yml diff --git a/configs/egov-persister/auto-escalation-persister.yml b/configs/egov-persister/auto-escalation-persister.yml new file mode 100644 index 00000000..46ff6afa --- /dev/null +++ b/configs/egov-persister/auto-escalation-persister.yml @@ -0,0 +1,21 @@ +serviceMaps: + serviceName: update Escalation Status + mappings: + - version: 1.0 + description: Updates tl status for auto escalate + fromTopic: tl-auto-escalation + isTransaction: true + queryMaps: + + - query: UPDATE eg_tl_tradelicense SET applicationstatus=?, lastmodifiedby=?, lastmodifiedtime=? WHERE applicationnumber=? AND tenantId=?; + basePath: ProcessInstances.* + jsonMaps: + - jsonPath: $.ProcessInstances.*.state.applicationStatus + + - jsonPath: $.ProcessInstances.*.auditDetails.lastModifiedBy + + - jsonPath: $.ProcessInstances.*.auditDetails.lastModifiedTime + + - jsonPath: $.ProcessInstances.*.businessId + + - jsonPath: $.ProcessInstances.*.tenantId From 9ae62d416635c7d9b3744fece30ecd6eeae5887b Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Wed, 5 Jan 2022 13:56:27 +0530 Subject: [PATCH 0902/1242] added auto escalation persister --- .../egov-persister/tradelicense-persister.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/configs/egov-persister/tradelicense-persister.yml b/configs/egov-persister/tradelicense-persister.yml index b438d55b..656001eb 100644 --- a/configs/egov-persister/tradelicense-persister.yml +++ b/configs/egov-persister/tradelicense-persister.yml @@ -844,3 +844,22 @@ serviceMaps: - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime - jsonPath: $.Licenses.*.tradeLicenseDetail.id + + - version: 1.0 + description: Updates tl status for auto escalate + fromTopic: tl-auto-escalation + isTransaction: true + queryMaps: + + - query: UPDATE eg_tl_tradelicense SET applicationstatus=?, lastmodifiedby=?, lastmodifiedtime=? WHERE applicationnumber=? AND tenantId=?; + basePath: ProcessInstances.* + jsonMaps: + - jsonPath: $.ProcessInstances.*.state.applicationStatus + + - jsonPath: $.ProcessInstances.*.auditDetails.lastModifiedBy + + - jsonPath: $.ProcessInstances.*.auditDetails.lastModifiedTime + + - jsonPath: $.ProcessInstances.*.businessId + + - jsonPath: $.ProcessInstances.*.tenantId From 2088e9ffa785603c7c5034042ddff473d3186ed2 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Wed, 5 Jan 2022 15:44:24 +0530 Subject: [PATCH 0903/1242] Update tradelicense-persister.yml --- configs/egov-persister/tradelicense-persister.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-persister/tradelicense-persister.yml b/configs/egov-persister/tradelicense-persister.yml index 656001eb..03544ea4 100644 --- a/configs/egov-persister/tradelicense-persister.yml +++ b/configs/egov-persister/tradelicense-persister.yml @@ -851,7 +851,7 @@ serviceMaps: isTransaction: true queryMaps: - - query: UPDATE eg_tl_tradelicense SET applicationstatus=?, lastmodifiedby=?, lastmodifiedtime=? WHERE applicationnumber=? AND tenantId=?; + - query: UPDATE eg_tl_tradelicense SET status=?, lastmodifiedby=?, lastmodifiedtime=? WHERE applicationnumber=? AND tenantId=?; basePath: ProcessInstances.* jsonMaps: - jsonPath: $.ProcessInstances.*.state.applicationStatus From f1e4876629355515a7642363927254896a33cf2c Mon Sep 17 00:00:00 2001 From: shiva-eGov <97941850+shiva-eGov@users.noreply.github.com> Date: Fri, 11 Feb 2022 18:49:53 +0530 Subject: [PATCH 0904/1242] remove gro req param for testing remove gro req param for testing --- configs/egov-indexer/rainmaker-pgr-indexer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-indexer/rainmaker-pgr-indexer.yml b/configs/egov-indexer/rainmaker-pgr-indexer.yml index 94ad3eae..c7c4224a 100644 --- a/configs/egov-indexer/rainmaker-pgr-indexer.yml +++ b/configs/egov-indexer/rainmaker-pgr-indexer.yml @@ -261,7 +261,7 @@ ServiceMaps: - inJsonPath: $.Employees[0].user.name outJsonPath: $.Data.assignee - path: http://egov-hrms.egov:8080/egov-hrms/employees/_search - queryParam: tenantId=$.tenantId,ids=$.gro + queryParam: tenantId=$.tenantId apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", "authToken": "750d4aa9-2436-4bc4-a8f4-3796e3bfd465","userInfo":{"id":73}}} uriResponseMapping: From 89ed235ea52b221cc8e8b4a79cb16943b90c6ca9 Mon Sep 17 00:00:00 2001 From: shiva-eGov <97941850+shiva-eGov@users.noreply.github.com> Date: Thu, 17 Feb 2022 12:14:15 +0530 Subject: [PATCH 0905/1242] Removed the "Tot Appln: Service Wise "frm pie chat --- .../dashboard-analytics/ChartApiConfig.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index bf7ecb17..b968fe14 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -380,14 +380,14 @@ "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \r\n \"district\" : \"Data.tenantData.city.districtCode\", \r\n\"tenantId\" : \"Data.tenantId\" \r\n}", "indexName": "tlindex-v1", "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tradelicense.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Trade Licence\":{\"value_count\":{\"field\":\"Data.tradelicense.tenantId.keyword\"}}}}}}" - }, - { - "module": "PGR", - "dateRefField": "Data.@timestamp", - "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\", \r\n \"district\" : \"Data.tenantData.city.districtCode\", \r\n\"tenantId\" : \"Data.tenantId\" \r\n}", - "indexName": "pgrindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"PGR\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}}" } +# { +# "module": "PGR", +# "dateRefField": "Data.@timestamp", +# "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\", \r\n \"district\" : \"Data.tenantData.city.districtCode\", \r\n\"tenantId\" : \"Data.tenantId\" \r\n}", +# "indexName": "pgrindex-v1", +# "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"PGR\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}}" +# } ], "chartType": "pie", "valueType": "number", @@ -396,8 +396,8 @@ "drillChart": "none", "aggregationPaths": [ "Property Tax", - "Trade Licence", - "PGR" + "Trade Licence" + # "PGR" ], "insight": { }, From 43d445e36085f281fe42170acfc2dcd0f5427d5a Mon Sep 17 00:00:00 2001 From: shiva-eGov <97941850+shiva-eGov@users.noreply.github.com> Date: Thu, 17 Feb 2022 12:56:58 +0530 Subject: [PATCH 0906/1242] Reverted the changes of Service Wise pie chart --- .../dashboard-analytics/ChartApiConfig.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index b968fe14..b76a5d90 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -380,14 +380,14 @@ "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \r\n \"district\" : \"Data.tenantData.city.districtCode\", \r\n\"tenantId\" : \"Data.tenantId\" \r\n}", "indexName": "tlindex-v1", "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tradelicense.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Trade Licence\":{\"value_count\":{\"field\":\"Data.tradelicense.tenantId.keyword\"}}}}}}" + }, + { + "module": "PGR", + "dateRefField": "Data.@timestamp", + "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\", \r\n \"district\" : \"Data.tenantData.city.districtCode\", \r\n\"tenantId\" : \"Data.tenantId\" \r\n}", + "indexName": "pgrindex-v1", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"PGR\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}}" } -# { -# "module": "PGR", -# "dateRefField": "Data.@timestamp", -# "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\", \r\n \"district\" : \"Data.tenantData.city.districtCode\", \r\n\"tenantId\" : \"Data.tenantId\" \r\n}", -# "indexName": "pgrindex-v1", -# "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"PGR\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}}" -# } ], "chartType": "pie", "valueType": "number", @@ -397,7 +397,7 @@ "aggregationPaths": [ "Property Tax", "Trade Licence" - # "PGR" + "PGR" ], "insight": { }, From 6aacea80113952a62bae7302426947f97b0f5e68 Mon Sep 17 00:00:00 2001 From: shiva-eGov <97941850+shiva-eGov@users.noreply.github.com> Date: Thu, 17 Feb 2022 13:12:33 +0530 Subject: [PATCH 0907/1242] resolved the issues --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index b76a5d90..bf7ecb17 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -396,7 +396,7 @@ "drillChart": "none", "aggregationPaths": [ "Property Tax", - "Trade Licence" + "Trade Licence", "PGR" ], "insight": { From cc6aa7045b12bcd422ace532b6d5551aacd92ffb Mon Sep 17 00:00:00 2001 From: poonam1512 Date: Thu, 17 Feb 2022 16:50:11 +0530 Subject: [PATCH 0908/1242] incresing the font of PT pdf by 2 pts --- .../format-config/property-receipt.json | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/configs/pdf-service/format-config/property-receipt.json b/configs/pdf-service/format-config/property-receipt.json index dc29ca9f..86688dd7 100644 --- a/configs/pdf-service/format-config/property-receipt.json +++ b/configs/pdf-service/format-config/property-receipt.json @@ -1196,11 +1196,11 @@ {"text":"4. Assessment & Payment is subject to verification/Scrutiny by competitive authority."}, {"text":"5. Please deposit property tax dues for earlier years also. Ignore, if already paid."}, {"text":[{"text":"6. Citizen for Online Payments please refer to the link "}, - {"text": "https://mseva.lgpunjab.gov.in/", "bold": true, "fontSize": 8, "color": "blue", "decoration": "underline"} + {"text": "https://mseva.lgpunjab.gov.in/", "bold": true, "fontSize": 10, "color": "blue", "decoration": "underline"} ] }, { - "text":"Now log a complaint from WhatsApp, give a missed call on 8750975975 or send a Hi message on WhatsApp to this number", "bold": true, "fontSize": 8, "color": "blue", "decoration": "underline"} + "text":"Now log a complaint from WhatsApp, give a missed call on 8750975975 or send a Hi message on WhatsApp to this number", "bold": true, "fontSize": 10, "color": "blue", "decoration": "underline"} ] } ], @@ -1214,7 +1214,7 @@ ] }, "block-head": { - "fontSize": 7, + "fontSize": 9, "bold": true, "letterSpacing": 0.74, "margin": [ @@ -1225,7 +1225,7 @@ ] }, "pt-reciept-citizen-table": { - "fontSize": 7, + "fontSize": 9, "color": "#484848" }, "receipt-assess-table-header": { @@ -1235,7 +1235,7 @@ }, "receipt-logo-header": { "color": "#000000", - "fontSize": 8.5, + "fontSize": 10, "bold": true, "letterSpacing": 0.74, "margin": [ @@ -1247,11 +1247,11 @@ }, "receipt-logo-sub-header": { "color": "#000000", - "fontSize": 8.5, + "fontSize": 10, "letterSpacing": 0.6 }, "noc-table": { - "fontSize": 7, + "fontSize": 9, "color": "#000000", "margin": [ -25, @@ -1261,7 +1261,7 @@ ] }, "next-noc-table": { - "fontSize": 7, + "fontSize": 9, "color": "#000000", "margin": [ -25, @@ -1270,7 +1270,7 @@ -8 ] }, "next-noc-table2": { - "fontSize": 7, + "fontSize": 9, "color": "#000000", "margin": [ -25, @@ -1282,7 +1282,7 @@ "receipt-table-value": { "color": "#000000", "bold": true, - "fontSize": 7, + "fontSize": 9, "fontWeight": 500, "margin": [ 8, @@ -1294,7 +1294,7 @@ "receipt-table-value22": { "color": "#000000", "bold": true, - "fontSize": 7, + "fontSize": 9, "fontWeight": 500, "backgroundColor": "#D3D3D3", "margin": [ @@ -1307,7 +1307,7 @@ "receipt-table": { "color": "#000000", "bold": false, - "fontSize": 7, + "fontSize": 9, "fontWeight": 400, "margin": [ 0, @@ -1318,7 +1318,7 @@ },"receipt-tableee": { "color": "#000000", "bold": true, - "fontSize": 7, + "fontSize": 9, "fontWeight": 500, "margin": [ 0, @@ -1328,7 +1328,7 @@ ] }, "receipt-approver": { - "fontSize": 7, + "fontSize": 9, "bold": true, "margin": [ -27, @@ -1338,7 +1338,7 @@ ], "color": "#484848" },"receipt-approver2": { - "fontSize": 7, + "fontSize": 9, "bold": true, "margin": [ -27, @@ -1349,7 +1349,7 @@ "color": "#484848" }, "no-signature": { - "fontSize": 7, + "fontSize": 9, "margin": [ -27, 20, @@ -1359,7 +1359,7 @@ "color": "#484848" }, "pt-disclaimer": { - "fontSize": 8, + "fontSize": 10, "margin": [ -27, 10, @@ -1369,7 +1369,7 @@ "color": "#484848" }, "pt-disclaimer-value": { - "fontSize": 8, + "fontSize": 10, "margin": [ 2, 0, @@ -1380,12 +1380,12 @@ }, "amounts": { - "fontSize": 8, + "fontSize": 10, "backgroundColor": "#D3D3D3" }, "amountss": { - "fontSize": 8 + "fontSize": 10 } } } From 5e4fc484d4d99d8dcf060038cfe942e379e84041 Mon Sep 17 00:00:00 2001 From: shiva-eGov <97941850+shiva-eGov@users.noreply.github.com> Date: Thu, 17 Feb 2022 17:10:41 +0530 Subject: [PATCH 0909/1242] Removed the Service Wise pie chart of PGR block --- .../dashboard-analytics/ChartApiConfig.json | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index bf7ecb17..568fc921 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -380,13 +380,6 @@ "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \r\n \"district\" : \"Data.tenantData.city.districtCode\", \r\n\"tenantId\" : \"Data.tenantId\" \r\n}", "indexName": "tlindex-v1", "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tradelicense.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Trade Licence\":{\"value_count\":{\"field\":\"Data.tradelicense.tenantId.keyword\"}}}}}}" - }, - { - "module": "PGR", - "dateRefField": "Data.@timestamp", - "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\", \r\n \"district\" : \"Data.tenantData.city.districtCode\", \r\n\"tenantId\" : \"Data.tenantId\" \r\n}", - "indexName": "pgrindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"PGR\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}}" } ], "chartType": "pie", @@ -396,8 +389,7 @@ "drillChart": "none", "aggregationPaths": [ "Property Tax", - "Trade Licence", - "PGR" + "Trade Licence" ], "insight": { }, From 76074f0caa1f65418299cf0cdf5ee4b23a5d97ff Mon Sep 17 00:00:00 2001 From: shiva-eGov <97941850+shiva-eGov@users.noreply.github.com> Date: Tue, 22 Feb 2022 16:58:30 +0530 Subject: [PATCH 0910/1242] Added the address and ward for pt Assessment index Added the address and ward for pt Assessment index for Punjab. --- configs/egov-indexer/property-services.yml | 97 ++++++++++++++++++++-- 1 file changed, 92 insertions(+), 5 deletions(-) diff --git a/configs/egov-indexer/property-services.yml b/configs/egov-indexer/property-services.yml index 6f1c2522..8e507b4c 100644 --- a/configs/egov-indexer/property-services.yml +++ b/configs/egov-indexer/property-services.yml @@ -384,7 +384,7 @@ ServiceMaps: jsonPath: $.Assessment timeStampField: $.auditDetails.createdTime customJsonMapping: - indexMapping: {"Data":{"workflow":{"state":{},"action":"","assignes":[]},"id":"","tenantId":"","additionalDetails":"","assessmentNumber":"","financialYear":"","propertyId":"","assessmentDate":"","status":"","source":"","unitUsageList":{},"channel":"","auditDetails":{},"@timestamp":"timestamp"}} + indexMapping: {"Data":{"workflow":{"state":{},"action":"","assignes":[]},"id":"","tenantId":"","additionalDetails":"","assessmentNumber":"","financialYear":"","propertyId":"","assessmentDate":"","status":"","source":"","unitUsageList":{},"channel":"","auditDetails":{},"@timestamp":"timestamp","address":{},"ward":{},"tenantData":{}}} fieldMapping: - inJsonPath: $.workflow.state outJsonPath: $.Data.workflow.state @@ -418,7 +418,28 @@ ServiceMaps: outJsonPath: $.Data.additionalDetails - inJsonPath: $.@timestamp outJsonPath: $.Data.@timestamp - + - inJsonPath: $.address + outJsonPath: $.Data.address + externalUriMapping: + - path: http://egov-location:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + mdmsMapping: + - path: http://egov-mdms-service:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData - topic: update-pt-assessment configKey: INDEX @@ -429,7 +450,7 @@ ServiceMaps: jsonPath: $.Assessment timeStampField: $.auditDetails.createdTime customJsonMapping: - indexMapping: {"Data":{"workflow":{"state":{},"action":"","assignes":[]},"id":"","tenantId":"","additionalDetails":"","assessmentNumber":"","financialYear":"","propertyId":"","assessmentDate":"","status":"","source":"","unitUsageList":{},"channel":"","auditDetails":{},"@timestamp":"timestamp"}} + indexMapping: {"Data":{"workflow":{"state":{},"action":"","assignes":[]},"id":"","tenantId":"","additionalDetails":"","assessmentNumber":"","financialYear":"","propertyId":"","assessmentDate":"","status":"","source":"","unitUsageList":{},"channel":"","auditDetails":{},"@timestamp":"timestamp","address":{},"ward":{},"tenantData":{}}} fieldMapping: - inJsonPath: $.workflow.state outJsonPath: $.Data.workflow.state @@ -463,6 +484,28 @@ ServiceMaps: outJsonPath: $.Data.additionalDetails - inJsonPath: $.@timestamp outJsonPath: $.Data.@timestamp + - inJsonPath: $.address + outJsonPath: $.Data.address + externalUriMapping: + - path: http://egov-location:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + mdmsMapping: + - path: http://egov-mdms-service:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData - topic: cancel-property-assessment configKey: INDEX @@ -473,7 +516,7 @@ ServiceMaps: jsonPath: $.Assessment timeStampField: $.auditDetails.createdTime customJsonMapping: - indexMapping: {"Data":{"workflow":{"state":{},"action":"","assignes":[]},"id":"","tenantId":"","additionalDetails":"","assessmentNumber":"","financialYear":"","propertyId":"","assessmentDate":"","status":"","source":"","unitUsageList":{},"channel":"","auditDetails":{},"@timestamp":"timestamp"}} + indexMapping: {"Data":{"workflow":{"state":{},"action":"","assignes":[]},"id":"","tenantId":"","additionalDetails":"","assessmentNumber":"","financialYear":"","propertyId":"","assessmentDate":"","status":"","source":"","unitUsageList":{},"channel":"","auditDetails":{},"@timestamp":"timestamp","address":{},"ward":{},"tenantData":{}}} fieldMapping: - inJsonPath: $.workflow.state outJsonPath: $.Data.workflow.state @@ -507,6 +550,28 @@ ServiceMaps: outJsonPath: $.Data.additionalDetails - inJsonPath: $.@timestamp outJsonPath: $.Data.@timestamp + - inJsonPath: $.address + outJsonPath: $.Data.address + externalUriMapping: + - path: http://egov-location:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + mdmsMapping: + - path: http://egov-mdms-service:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData - topic: pt-assessment-legacyIndex configKey: LEGACYINDEX @@ -518,7 +583,7 @@ ServiceMaps: isBulk: true timeStampField: $.auditDetails.createdTime customJsonMapping: - indexMapping: {"Data":{"workflow":{"state":{},"action":"","assignes":[]},"id":"","tenantId":"","additionalDetails":"","assessmentNumber":"","financialYear":"","propertyId":"","assessmentDate":"","status":"","source":"","unitUsageList":{},"channel":"","auditDetails":{},"@timestamp":"timestamp"}} + indexMapping: {"Data":{"workflow":{"state":{},"action":"","assignes":[]},"id":"","tenantId":"","additionalDetails":"","assessmentNumber":"","financialYear":"","propertyId":"","assessmentDate":"","status":"","source":"","unitUsageList":{},"channel":"","auditDetails":{},"@timestamp":"timestamp","address":{},"ward":{},"tenantData":{}}} fieldMapping: - inJsonPath: $.workflow.state outJsonPath: $.Data.workflow.state @@ -552,3 +617,25 @@ ServiceMaps: outJsonPath: $.Data.additionalDetails - inJsonPath: $.@timestamp outJsonPath: $.Data.@timestamp + - inJsonPath: $.address + outJsonPath: $.Data.address + externalUriMapping: + - path: http://egov-location:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + mdmsMapping: + - path: http://egov-mdms-service:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData From f1b90d36e39f4d89ad269253036e7d96adc20451 Mon Sep 17 00:00:00 2001 From: shiva-eGov <97941850+shiva-eGov@users.noreply.github.com> Date: Tue, 22 Feb 2022 17:44:09 +0530 Subject: [PATCH 0911/1242] Added address fields for the indexing --- configs/egov-indexer/property-services.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-indexer/property-services.yml b/configs/egov-indexer/property-services.yml index 8e507b4c..a66e4a0e 100644 --- a/configs/egov-indexer/property-services.yml +++ b/configs/egov-indexer/property-services.yml @@ -484,7 +484,7 @@ ServiceMaps: outJsonPath: $.Data.additionalDetails - inJsonPath: $.@timestamp outJsonPath: $.Data.@timestamp - - inJsonPath: $.address + - inJsonPath: $.address outJsonPath: $.Data.address externalUriMapping: - path: http://egov-location:8080/egov-location/location/v11/boundarys/_search From b09b2783e2164c687f78313ebe5e3381b59a7215 Mon Sep 17 00:00:00 2001 From: shiva-eGov <97941850+shiva-eGov@users.noreply.github.com> Date: Wed, 23 Feb 2022 13:33:10 +0530 Subject: [PATCH 0912/1242] Added "tenantData":{} property first in mapping --- configs/egov-indexer/property-services.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/egov-indexer/property-services.yml b/configs/egov-indexer/property-services.yml index a66e4a0e..7b235801 100644 --- a/configs/egov-indexer/property-services.yml +++ b/configs/egov-indexer/property-services.yml @@ -384,7 +384,7 @@ ServiceMaps: jsonPath: $.Assessment timeStampField: $.auditDetails.createdTime customJsonMapping: - indexMapping: {"Data":{"workflow":{"state":{},"action":"","assignes":[]},"id":"","tenantId":"","additionalDetails":"","assessmentNumber":"","financialYear":"","propertyId":"","assessmentDate":"","status":"","source":"","unitUsageList":{},"channel":"","auditDetails":{},"@timestamp":"timestamp","address":{},"ward":{},"tenantData":{}}} + indexMapping: {"Data":{"workflow":{"state":{},"action":"","assignes":[]},"id":"","tenantId":"","additionalDetails":"","assessmentNumber":"","financialYear":"","propertyId":"","assessmentDate":"","status":"","source":"","unitUsageList":{},"channel":"","auditDetails":{},"@timestamp":"timestamp","tenantData":{},"address":{},"ward":{}}} fieldMapping: - inJsonPath: $.workflow.state outJsonPath: $.Data.workflow.state @@ -450,7 +450,7 @@ ServiceMaps: jsonPath: $.Assessment timeStampField: $.auditDetails.createdTime customJsonMapping: - indexMapping: {"Data":{"workflow":{"state":{},"action":"","assignes":[]},"id":"","tenantId":"","additionalDetails":"","assessmentNumber":"","financialYear":"","propertyId":"","assessmentDate":"","status":"","source":"","unitUsageList":{},"channel":"","auditDetails":{},"@timestamp":"timestamp","address":{},"ward":{},"tenantData":{}}} + indexMapping: {"Data":{"workflow":{"state":{},"action":"","assignes":[]},"id":"","tenantId":"","additionalDetails":"","assessmentNumber":"","financialYear":"","propertyId":"","assessmentDate":"","status":"","source":"","unitUsageList":{},"channel":"","auditDetails":{},"@timestamp":"timestamp","tenantData":{},"address":{},"ward":{}}} fieldMapping: - inJsonPath: $.workflow.state outJsonPath: $.Data.workflow.state @@ -516,7 +516,7 @@ ServiceMaps: jsonPath: $.Assessment timeStampField: $.auditDetails.createdTime customJsonMapping: - indexMapping: {"Data":{"workflow":{"state":{},"action":"","assignes":[]},"id":"","tenantId":"","additionalDetails":"","assessmentNumber":"","financialYear":"","propertyId":"","assessmentDate":"","status":"","source":"","unitUsageList":{},"channel":"","auditDetails":{},"@timestamp":"timestamp","address":{},"ward":{},"tenantData":{}}} + indexMapping: {"Data":{"workflow":{"state":{},"action":"","assignes":[]},"id":"","tenantId":"","additionalDetails":"","assessmentNumber":"","financialYear":"","propertyId":"","assessmentDate":"","status":"","source":"","unitUsageList":{},"channel":"","auditDetails":{},"@timestamp":"timestamp","tenantData":{},"address":{},"ward":{}}} fieldMapping: - inJsonPath: $.workflow.state outJsonPath: $.Data.workflow.state @@ -583,7 +583,7 @@ ServiceMaps: isBulk: true timeStampField: $.auditDetails.createdTime customJsonMapping: - indexMapping: {"Data":{"workflow":{"state":{},"action":"","assignes":[]},"id":"","tenantId":"","additionalDetails":"","assessmentNumber":"","financialYear":"","propertyId":"","assessmentDate":"","status":"","source":"","unitUsageList":{},"channel":"","auditDetails":{},"@timestamp":"timestamp","address":{},"ward":{},"tenantData":{}}} + indexMapping: {"Data":{"workflow":{"state":{},"action":"","assignes":[]},"id":"","tenantId":"","additionalDetails":"","assessmentNumber":"","financialYear":"","propertyId":"","assessmentDate":"","status":"","source":"","unitUsageList":{},"channel":"","auditDetails":{},"@timestamp":"timestamp","tenantData":{},"address":{},"ward":{}}} fieldMapping: - inJsonPath: $.workflow.state outJsonPath: $.Data.workflow.state From e5c75a36e375d6e4b2d1a4288528bff7b6d3e3cb Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Thu, 24 Feb 2022 10:58:26 +0530 Subject: [PATCH 0913/1242] reverting the last commit of fontsize --- .../format-config/property-receipt.json | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/configs/pdf-service/format-config/property-receipt.json b/configs/pdf-service/format-config/property-receipt.json index 86688dd7..dc29ca9f 100644 --- a/configs/pdf-service/format-config/property-receipt.json +++ b/configs/pdf-service/format-config/property-receipt.json @@ -1196,11 +1196,11 @@ {"text":"4. Assessment & Payment is subject to verification/Scrutiny by competitive authority."}, {"text":"5. Please deposit property tax dues for earlier years also. Ignore, if already paid."}, {"text":[{"text":"6. Citizen for Online Payments please refer to the link "}, - {"text": "https://mseva.lgpunjab.gov.in/", "bold": true, "fontSize": 10, "color": "blue", "decoration": "underline"} + {"text": "https://mseva.lgpunjab.gov.in/", "bold": true, "fontSize": 8, "color": "blue", "decoration": "underline"} ] }, { - "text":"Now log a complaint from WhatsApp, give a missed call on 8750975975 or send a Hi message on WhatsApp to this number", "bold": true, "fontSize": 10, "color": "blue", "decoration": "underline"} + "text":"Now log a complaint from WhatsApp, give a missed call on 8750975975 or send a Hi message on WhatsApp to this number", "bold": true, "fontSize": 8, "color": "blue", "decoration": "underline"} ] } ], @@ -1214,7 +1214,7 @@ ] }, "block-head": { - "fontSize": 9, + "fontSize": 7, "bold": true, "letterSpacing": 0.74, "margin": [ @@ -1225,7 +1225,7 @@ ] }, "pt-reciept-citizen-table": { - "fontSize": 9, + "fontSize": 7, "color": "#484848" }, "receipt-assess-table-header": { @@ -1235,7 +1235,7 @@ }, "receipt-logo-header": { "color": "#000000", - "fontSize": 10, + "fontSize": 8.5, "bold": true, "letterSpacing": 0.74, "margin": [ @@ -1247,11 +1247,11 @@ }, "receipt-logo-sub-header": { "color": "#000000", - "fontSize": 10, + "fontSize": 8.5, "letterSpacing": 0.6 }, "noc-table": { - "fontSize": 9, + "fontSize": 7, "color": "#000000", "margin": [ -25, @@ -1261,7 +1261,7 @@ ] }, "next-noc-table": { - "fontSize": 9, + "fontSize": 7, "color": "#000000", "margin": [ -25, @@ -1270,7 +1270,7 @@ -8 ] }, "next-noc-table2": { - "fontSize": 9, + "fontSize": 7, "color": "#000000", "margin": [ -25, @@ -1282,7 +1282,7 @@ "receipt-table-value": { "color": "#000000", "bold": true, - "fontSize": 9, + "fontSize": 7, "fontWeight": 500, "margin": [ 8, @@ -1294,7 +1294,7 @@ "receipt-table-value22": { "color": "#000000", "bold": true, - "fontSize": 9, + "fontSize": 7, "fontWeight": 500, "backgroundColor": "#D3D3D3", "margin": [ @@ -1307,7 +1307,7 @@ "receipt-table": { "color": "#000000", "bold": false, - "fontSize": 9, + "fontSize": 7, "fontWeight": 400, "margin": [ 0, @@ -1318,7 +1318,7 @@ },"receipt-tableee": { "color": "#000000", "bold": true, - "fontSize": 9, + "fontSize": 7, "fontWeight": 500, "margin": [ 0, @@ -1328,7 +1328,7 @@ ] }, "receipt-approver": { - "fontSize": 9, + "fontSize": 7, "bold": true, "margin": [ -27, @@ -1338,7 +1338,7 @@ ], "color": "#484848" },"receipt-approver2": { - "fontSize": 9, + "fontSize": 7, "bold": true, "margin": [ -27, @@ -1349,7 +1349,7 @@ "color": "#484848" }, "no-signature": { - "fontSize": 9, + "fontSize": 7, "margin": [ -27, 20, @@ -1359,7 +1359,7 @@ "color": "#484848" }, "pt-disclaimer": { - "fontSize": 10, + "fontSize": 8, "margin": [ -27, 10, @@ -1369,7 +1369,7 @@ "color": "#484848" }, "pt-disclaimer-value": { - "fontSize": 10, + "fontSize": 8, "margin": [ 2, 0, @@ -1380,12 +1380,12 @@ }, "amounts": { - "fontSize": 10, + "fontSize": 8, "backgroundColor": "#D3D3D3" }, "amountss": { - "fontSize": 10 + "fontSize": 8 } } } From 3a068b1f36a30ca61d7d8e019f2c8c628b8ec45d Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Thu, 24 Feb 2022 14:35:44 +0530 Subject: [PATCH 0914/1242] Update Query for "ptcollectionByPaymentMode" --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 568fc921..3f1463dd 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -577,7 +577,7 @@ "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}],\"must\":[{\"term\":{\"dataObject.paymentDetails.businessService.keyword\":\"PT\"}}]}},\"aggs\":{\"Payment Mode\":{\"terms\":{\"field\":\"dataObject.paymentMode.keyword\",\"size\":200}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}],\"must\":[{\"term\":{\"dataObject.paymentDetails.businessService.keyword\":\"PT\"}}]}},\"aggs\":{\"Payment Mode\":{\"terms\":{\"field\":\"dataObject.paymentMode.keyword\",\"size\": 200},\"aggs\":{\"Payment Mode\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" } ], "chartType": "pie", From bc6e93d1406aa0a2c8cf4d67a5841d2879f1abfd Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Thu, 24 Feb 2022 16:34:12 +0530 Subject: [PATCH 0915/1242] Update Query for "collectionByUsageType" --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 3f1463dd..b820c005 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -554,7 +554,7 @@ "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Usage Type\":{\"terms\":{\"field\":\"domainObject.usageCategory.keyword\",\"size\":200}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Usage Type\":{\"terms\":{\"field\":\"domainObject.usageCategory.keyword\",\"size\":200},\"aggs\":{\"Usage Type\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" } ], "chartType": "pie", From 5904694b89b76abbbec41889f73d27a0da71501d Mon Sep 17 00:00:00 2001 From: poonam1512 Date: Fri, 25 Feb 2022 16:48:28 +0530 Subject: [PATCH 0916/1242] Adding new table and resizing of PT receipt --- .../data-config/property-receipt.json | 66 +++++ .../format-config/property-receipt.json | 270 ++++++++---------- 2 files changed, 183 insertions(+), 153 deletions(-) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index c4e8ec00..79102e7a 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -619,6 +619,72 @@ ] } }, + { + "variable": "var_tax", + "value":{ + "path":"$.paymentDetails[0].additionalDetails.taxArray.*" + }, + "type":"array", + "format":{ + "type":"string", + "scema":[ + { + "variable":"year", + "value": "year" + + },{ + "variable":"tax", + "value": "tax" + + },{ + "variable":"firecess", + "value": "firecess" + + },{ + "variable":"cancercess", + "value": "cancercess" + + },{ + "variable":"penalty", + "value": "penalty" + + },{ + "variable":"interest", + "value": "interest" + + },{ + "variable":"rebate", + "value": "rebate" + + }, + { + "variable":"usage_exemption", + "value": "usage_exemption" + + },{ + "variable":"special_category_exemption", + "value": "special_category_exemption" + + },{ + "variable":"adhoc_penalty", + "value": "adhoc_penalty" + + },{ + "variable":"adhoc_rebate", + "value": "adhoc_rebate" + + },{ + "variable":"roundoff", + "value": "roundoff" + + },{ + "variable":"total", + "value": "total" + + } + ] + } + }, { "variable": "Municipal_Corporation", diff --git a/configs/pdf-service/format-config/property-receipt.json b/configs/pdf-service/format-config/property-receipt.json index dc29ca9f..d4269b2b 100644 --- a/configs/pdf-service/format-config/property-receipt.json +++ b/configs/pdf-service/format-config/property-receipt.json @@ -193,7 +193,7 @@ false, false ], - "style": "receipt-table" + "style": "receipt-tableee" }, { "text": "Survey Id/UID", @@ -213,7 +213,7 @@ true, false ], - "style": "receipt-table" + "style": "receipt-tableee" } ], [ @@ -235,7 +235,7 @@ false, true ], - "style": "receipt-table" + "style": "receipt-tableee" }, { "text" : "Payment Status", @@ -255,7 +255,7 @@ true, true ], - "style": "receipt-table" + "style": "receipt-tableee" } ] ] @@ -291,7 +291,7 @@ false, false ], - "style": "receipt-table" + "style": "receipt-tableee" }, { "text": "Building/Colony Name: ", @@ -311,7 +311,7 @@ true, false ], - "style": "receipt-table" + "style": "receipt-tableee" } ], [ @@ -333,7 +333,7 @@ false, false ], - "style": "receipt-table" + "style": "receipt-tableee" }, { "text": "Locality/Mohalla :", @@ -353,7 +353,7 @@ true, false ], - "style": "receipt-table" + "style": "receipt-tableee" } ], [ @@ -375,7 +375,7 @@ false, false ], - "style": "receipt-table" + "style": "receipt-tableee" }, { "text": "Property Type: ", @@ -395,7 +395,7 @@ true, false ], - "style": "receipt-table" + "style": "receipt-tableee" } ], [ @@ -418,7 +418,7 @@ false, true ], - "style": "receipt-table" + "style": "receipt-tableee" }, { "text": " ", @@ -438,7 +438,7 @@ true, true ], - "style": "receipt-table" + "style": "receipt-tableee" } ] ] @@ -487,11 +487,11 @@ "style": "amounts" }, { - "text": "Usage Exemption", + "text": "Usage Exemp.", "style": "amounts" }, { - "text": "Special Category Exemption", + "text": "Category Exemp.", "style": "amounts" }, { @@ -520,6 +520,81 @@ }, "layout":{} }, + { + "text":"ESTIMATED AMOUNT", + "style":"block-head" + }, + { + "style": "next-noc-table", + "table": { + "widths": [ + + "7%","7%","7%","5%","7%","6%","7%","8%","8%","8%","8%","7%","*" + ], + "body": [ + + [ { + "text": "Year", + "style": "amounts" + }, + { + "text": "Property Tax", + "style": "amounts" + }, + { + "text": "Fire Cess", + "style": "amounts" + }, + { + "text": "Cancer Cess", + "style": "amounts" + }, + { + "text": "Penalty", + "style": "amounts" + }, + { + "text": "Rebate", + "style": "amounts" + }, + { + "text": "Interest", + "style": "amounts" + }, + { + "text": "Usage Exemp.", + "style": "amounts" + }, + { + "text": "Category Exemp.", + "style": "amounts" + }, + { + "text": "Adhoc Penalty", + "style": "amounts" + }, + { + "text": "Adhoc Rebate", + "style": "amounts" + }, + { + "text": "Round Off", + "style": "amounts" + }, + { + "text": "Total", + "style": "amounts" + } + + ], + + "{{#var_tax}}[{\"text\":\"{{year}}\",\"style\":\"receipt-table\"},{\"text\":\"{{tax}}\",\"style\":\"receipt-table\"},{\"text\":\"{{firecess}}\",\"style\":\"receipt-table\"},{\"text\":\"{{cancercess}}\",\"style\":\"receipt-table\"},{\"text\":\"{{penalty}}\",\"style\":\"receipt-table\"},{\"text\":\"{{rebate}}\",\"style\":\"receipt-table\"},{\"text\":\"{{interest}}\",\"style\":\"receipt-table\"},{\"text\":\"{{usage_exemption}}\",\"style\":\"receipt-table\"},{\"text\":\"{{special_category_exemption}}\",\"style\":\"receipt-table\"},{\"text\":\"{{adhoc_penalty}}\",\"style\":\"receipt-table\"},{\"text\":\"{{adhoc_rebate}}\",\"style\":\"receipt-table\"},{\"text\":\"{{roundoff}}\",\"style\":\"receipt-table\"},{\"text\":\"{{total}}\",\"style\":\"receipt-table\"}]{{/var_tax}}" + + + ] + }, + "layout":{} + }, { "text":"PAYMENT INFORMATION", "style":"block-head" @@ -534,54 +609,12 @@ "25%" ], "body": [ - [ - { - "text": "{{service_type}}", - "border": [ - true, - true, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{serviceType}}", - "border": [ - false, - true, - false, - false - ], - "style": "receipt-table" - }, - { - "text": " ", - "border": [ - false, - true, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": " ", - "border": [ - false, - true, - true, - false - ], - "style": "receipt-table" - } - ], [ { "text": "Amount to be Paid", "border": [ true, - false, + true, false, false ], @@ -591,7 +624,7 @@ "text": "₹ {{dueAmount}}", "border": [ false, - false, + true, false, false ], @@ -601,7 +634,7 @@ "text": "{{paid_amount}}", "border": [ false, - false, + true, false, false ], @@ -610,9 +643,9 @@ { "text": "₹ {{paidAmount}}", "border": [ - false, false, true, + true, false ], "style": "receipt-table" @@ -750,7 +783,7 @@ true, false, false, - true + false ], "style": "receipt-table-value" }, @@ -760,7 +793,7 @@ false, false, false, - true + false ], "style": "receipt-table" }, @@ -770,7 +803,7 @@ false, false, false, - true + false ], "style": "receipt-table-value" }, @@ -780,35 +813,18 @@ false, false, true, - true + false ], "style": "receipt-table" } - ] - ] - }, - "layout": {} - },{ - "text":"ADDITIONAL REBATE/PENALTY REASON", - "style":"block-head" - }, - { - "style": "next-noc-table", - "table": { - "widths": [ - "25%", - "25%", - "25%", - "25%" - ], - "body": [ + ], [ { "text": "Penalty Reason", "border": [ - true, true, false, + false, true ], "style": "receipt-table-value" @@ -817,7 +833,7 @@ "text": "{{penaltyReason}}", "border": [ false, - true, + false, false, true ], @@ -827,7 +843,7 @@ "text": "Rebate Reason", "border": [ false, - true, + false, false, true ], @@ -837,12 +853,13 @@ "text": "{{rebateReason}}", "border": [ false, - true, + false, true, true ], "style": "receipt-table" } + ] ] }, @@ -956,7 +973,7 @@ "style": "receipt-table-value22" }, { - "text": "Built Area (Sq. Yard) / Total Annual Rent", + "text": "Built Area (Sq. Yard) /annual Rent", "style": "receipt-table-value22" } ], @@ -1112,26 +1129,13 @@ "layout": {} }, { - "text": "Mobile Number {{ownerMobileNumber}} Assessee Signature: ", + "text": "Mobile Number {{ownerMobileNumber}} Assessee Signature: {{generated_by}}: {{user-name}} Approved By: {{approvedBy}} ", "style": "receipt-approver" } , { "style": "receipt-approver", "columns": [ - { - "text": [ - { - "text": "{{generated_by}}: ", - "bold": true - }, - { - "text": "{{user-name}}", - "bold": false - } - ], - "alignment": "left" - }, { "text": [ { @@ -1148,57 +1152,17 @@ ] } ] - }, - { - "style": "receipt-approver2", - "columns": [ - { - "text": [ - { - "text": "Approved By ", - "bold": true - }, - { - "text": "{{approvedBy}}", - "bold": false - } - ], - "alignment": "left" - }, - { - "text": [ - { - "text": " ", - "bold": true - } - ], - "alignment": "right", - "margin": [ - 0, - 0, - 0, - 0 - ] - } - ] }, { "style": "pt-disclaimer", - "stack": [ + "stack": + [ { - "text": "{{disclamer}}", - "bold": true, - "style": "pt-disclaimer-value" - }, - { "text": "1. Payment received by cheque/demand draft shall be subject to realization."}, + "text": [{"text": "{{disclamer}} : Citizen for Online Payments please refer to the link ", "bold": true, "style": "pt-disclaimer-value"}, + {"text": "https://mseva.lgpunjab.gov.in/", "bold": true, "fontSize": 8, "color": "blue", "decoration": "underline"}]}, + { "text": "1. Payment received by cheque/demand draft shall be subject to realization, This is a computer generated document, hence requires no signature."}, {"text":"2. This document is not a proof of Property Ownership and regularization of unauthorized construction."}, - {"text":"3. This is a computer generated document, hence requires no signature."}, - {"text":"4. Assessment & Payment is subject to verification/Scrutiny by competitive authority."}, - {"text":"5. Please deposit property tax dues for earlier years also. Ignore, if already paid."}, - {"text":[{"text":"6. Citizen for Online Payments please refer to the link "}, - {"text": "https://mseva.lgpunjab.gov.in/", "bold": true, "fontSize": 8, "color": "blue", "decoration": "underline"} - ] - }, + {"text":"3. Assessment & Payment is subject to verification/Scrutiny by competitive authority.Also deposit property tax dues for earlier years. Ignore, if already paid."}, { "text":"Now log a complaint from WhatsApp, give a missed call on 8750975975 or send a Hi message on WhatsApp to this number", "bold": true, "fontSize": 8, "color": "blue", "decoration": "underline"} ] @@ -1265,7 +1229,7 @@ "color": "#000000", "margin": [ -25, - 10, + 7, -22, -8 ] @@ -1286,9 +1250,9 @@ "fontWeight": 500, "margin": [ 8, + 2, 0, - 0, - 0 + -5 ] }, "receipt-table-value22": { @@ -1298,7 +1262,7 @@ "fontWeight": 500, "backgroundColor": "#D3D3D3", "margin": [ - 8, + -4, 0, 0, 0 @@ -1322,9 +1286,9 @@ "fontWeight": 500, "margin": [ 0, + 2, 0, - 0, - 0 + -6 ] }, "receipt-approver": { From 9928e5d13975755b607212de2b72d7c5b6eb2904 Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Mon, 28 Feb 2022 12:54:26 +0530 Subject: [PATCH 0917/1242] Adding new pdf for old misc. receipts(consolidated receipt) --- .../data-config/consolidatedreceiptold.json | 579 ++++++++++++++++++ 1 file changed, 579 insertions(+) create mode 100644 configs/pdf-service/data-config/consolidatedreceiptold.json diff --git a/configs/pdf-service/data-config/consolidatedreceiptold.json b/configs/pdf-service/data-config/consolidatedreceiptold.json new file mode 100644 index 00000000..b754b62b --- /dev/null +++ b/configs/pdf-service/data-config/consolidatedreceiptold.json @@ -0,0 +1,579 @@ +{ + "key": "consolidatedreceiptold", + "documentType":"CONSOLIDATED_RECEIPT", + "DataConfigs": { + "moduleName": "rainmaker-common", + "version": "1.0.0", + "baseKeyPath": "$.Payments.*", + "entityIdPath":"$.id", + "isCommonTableBorderRequired": true, + "mappings": [ + { + "topic": "common-pdf-generation-3", + "mappings": [ + { + "direct": [ + { + "variable": "payerName", + "value": { + "path": "$.payerName" + } + }, + { + "variable": "PaidBy", + "value": { + "path": "$.paidBy" + } + }, + { + "variable": "chequeDD", + "value": { + "path": "$.instrumentNumber" + } + }, + { + "variable": "user-name", + "value": { + "path": "$.userInfo.name" + }, + "type":"selectFromRequestInfo" + }, + { + "variable": "payerContact", + "value": { + "path": "$.mobileNumber" + } + }, + { + "variable": "receiptNo", + "value": { + "path": "$.paymentDetails[0].receiptNumber" + } + }, + { + "variable": "serviceType", + "value": { + "path": "$.paymentDetails[0].businessService" + }, + "localisation":{ + "required":true, + "prefix":"MODULE", + "module":"rainmaker-common" + } + }, + { + "variable": "paidAmount", + "value": { + "path": "$.paymentDetails[0].totalAmountPaid" + } + }, + { + "variable": "fieldFee", + "value": { + "path": "$.paymentDetails[0].additionalDetails.fieldfee" + } + }, { + "variable": "taxAmount", + "value": { + "path": "$.paymentDetails[0].additionalDetails.tax" + } + }, { + "variable": "cgst", + "value": { + "path": "$.paymentDetails[0].additionalDetails.cgst" + } + }, { + "variable": "sgst", + "value": { + "path": "$.paymentDetails[0].additionalDetails.sgst" + } + }, + + { + "variable": "fromPeriod", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].fromPeriod" + }, + "type": "date" + }, + { + "variable": "chequeDDDate", + "value": { + "path": "$.instrumentDate" + }, + "type":"date" + }, + { + "variable": "toPeriod", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].toPeriod" + }, + "type": "date" + }, + { + "variable": "payerAddress", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].additionalDetails.address" + } + }, + { + "variable": "oldPayerAddress", + "value": { + "path": "$.payerAddress" + } + }, + { + "variable": "oldComments", + "value": { + "path": "$.additionalDetails.comment" + } + }, + { + "variable": "comments", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].additionalDetails.comment" + } + }, + { + "variable": "paymentMode", + "value": { + "path": "$.paymentMode" + }, + "localisation":{ + "required":true, + "prefix": "COMMON_MASTERS_PAYMENTMODE", + "module": "rainmaker-common" + } + }, + { + "variable": "G8ReceiptNo", + "value": { + "path": "$.paymentDetails[0].manualReceiptNumber" + } + }, + { + "variable": "G8ReceiptDate", + "value": { + "path": "$.paymentDetails[0].manualReceiptDate" + }, + "type": "date" + }, + { + "variable": "ReceiptDate", + "value": { + "path": "$.paymentDetails[0].receiptDate" + }, + "type": "date" + }, { + "variable": "bankName", + "value": { + "path": "$.additionalDetails[0].bankName" + } + }, { + "variable": "branchName", + "value": { + "path": "$.additionalDetails[0].branchName" + } + }, { + "variable": "ifsc", + "value": { + "path": "$.ifscCode" + } + }, + { + "variable": "paymentDate", + "value": { + "path": "$.transactionDate" + }, + "type": "date" + }, + { + "variable": "consumerID", + "value": { + "path": "$.paymentDetails[0].bill.consumerCode" + } + }, + { + "variable": "transactionID", + "value": { + "path": "$.transactionNumber" + } + }, + { + "variable": "dueAmount", + "value": { + "path": "$.paymentDetails[0].totalDue" + } + }, + { + "variable": "payment_receipt", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_RECEIPT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "receipt_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_RECEIPT_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "consumer_id", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_CONSUMER_ID" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payment_date", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_DATE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payer_name", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYER_NAME" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payer_contact", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYER_CONTACT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "service_type", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_SERVICE_TYPE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "billing_period", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_BILLING_PERIOD" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "paid_amount", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAID_AMOUNT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "pending_amount", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PENDING_AMOUNT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payment_mode", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_MODE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "transaction_id", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_TRANSACTION_ID" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "g8_receipt_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_G8_RECEIPT_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "g8_receipt_date", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_G8_RECEIPT_DATE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "cheque_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_CHEQUE_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "generated_by", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_GENERATED_BY" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "commissioner/eo", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_COMMISSIONER_EO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "no_signature", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_NO_SIGNATURE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "disclamer", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "disclamer_1", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_FIRST_LINE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "disclamer_2", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_SECOND_LINE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "disclamer_3", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_THIRD_LINE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "disclamer_4", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_FOURTH_LINE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "disclamer_5", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_FIFTH_LINE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "to", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_TO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "Municipal_Corporation", + "value": { + "path": "PDF_STATIC_LABEL_MDMS_MUNICIPAL_CORPORATION" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + } + ] + }, + { + "derived": [ + { + "variable": "pendingAmount", + "formula": "{{dueAmount}}-{{paidAmount}}" + } + ] + }, + { + "externalAPI": [ + { + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", + "apiRequest": null, + "responseMapping":[ + { + "variable":"address", + "value":"$.MdmsRes.tenant.tenants[0].address" + }, + { + "variable":"phoneNumber", + "value":"$.MdmsRes.tenant.tenants[0].contactNumber" + }, + { + "variable":"website", + "value":"$.MdmsRes.tenant.tenants[0].domainUrl" + }, + { + "variable":"mcGrade", + "value":"$.MdmsRes.tenant.tenants[0].city.ulbType" + }, + { + "variable":"email", + "value":"$.MdmsRes.tenant.tenants[0].emailId" + }, + { + "variable": "logoImage", + "value":"$.MdmsRes.tenant.tenants[0].logoId", + "type":"image" + }, + { + "variable": "logo-header", + "value":"$.MdmsRes.tenant.tenants[0].code", + "localisation":{ + "required":true, + "prefix": "TENANT_TENANTS", + "module":"rainmaker-common" + } + } + ] + } + ] + } + ] + } + ] + } +} From 6b80f509122af5138ab185999451af8795a38a78 Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Mon, 28 Feb 2022 12:56:31 +0530 Subject: [PATCH 0918/1242] adding new pdf for old consolidated receipt(misc receipts) --- .../format-config/consolidatedreceiptold.json | 1392 +++++++++++++++++ 1 file changed, 1392 insertions(+) create mode 100644 configs/pdf-service/format-config/consolidatedreceiptold.json diff --git a/configs/pdf-service/format-config/consolidatedreceiptold.json b/configs/pdf-service/format-config/consolidatedreceiptold.json new file mode 100644 index 00000000..ef1aad3f --- /dev/null +++ b/configs/pdf-service/format-config/consolidatedreceiptold.json @@ -0,0 +1,1392 @@ +{ + "key": "consolidatedreceiptold", + "config": { + "defaultStyle": { + "font": "Cambay" + }, + "content": [ + { + "style": "noc-head", + "table": { + "widths": [ + 60, + "*", + 150 + ], + "body": [ + [ + { + "image": "{{logoImage}}", + "width": 50, + "height": 50 + }, + { + "stack": [ + { + "text": "{{logo-header}} {{mcGrade}}", + "style": "receipt-logo-header" + }, + { + "text": "{{serviceType}} {{payment_receipt}} (Employee Copy)", + "style": "receipt-logo-sub-header" + } + ], + "alignment": "left", + "margin": [ + 0, + 4, + 0, + 0 + ] + }, + { + "stack": [ + { + "text": "{{address}},{{phoneNumber}}", + "style": "receipt-logo-sub-header" + }, + { + "text": "{{website}},{{email}}", + "style": "receipt-logo-sub-header" + } + ], + "alignment": "right", + "color": "#484848", + "margin": [ + -100, + 0, + -25, + 0 + ] + } + ] + ] + }, + "layout": "noBorders" + }, + { + "style": "noc-table", + "table": { + "widths": [ + "30%", + "20%", + "30%", + "20%" + ], + "body": [ + [ + { + "text": "{{receipt_no}}.", + "border": [ + true, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{receiptNo}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{consumer_id}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{consumerID}}", + "border": [ + false, + true, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "Receipt Date", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{ReceiptDate}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Tax period", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{fromPeriod}} {{to}} {{toPeriod}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + + { + "text": "Consumer Name", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerName}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Contact No.", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerContact}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + + { + "text": "Address:", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerAddress}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Paid By", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{PaidBy}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ] + ] + }, + "layout": {} + }, + { + "style": "next-noc-table", + "table": { + "widths": [ + "30%", + "20%", + "30%", + "20%" + ], + "body": [ + [ + { + "text": "{{service_type}}", + "border": [ + true, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{serviceType}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{billing_period}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{fromPeriod}} {{to}} {{toPeriod}}", + "border": [ + false, + true, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{paid_amount}}", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "₹ {{paidAmount}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + + "text": "{{payment_mode}}", + + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{paymentMode}}", + + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "Tax Amount", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "₹ {{taxAmount}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + + "text": "Field Fee", + + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + + "text": "₹ {{fieldFee}}", + + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ],[ + { + "text": "CGST(if applicable)", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "₹ {{cgst}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + + "text": "SGST(if applicable)", + + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + + "text": "₹ {{sgst}}", + + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "Cheque/DD/PO/Transaction No.", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{chequeDD}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Cheque/DD/PO/Transaction Date", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{chequeDDDate}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + + } + ], [ + { + "text": "Bank Name", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{bankName}},{{branchName}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "IFSC Code", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{ifsc}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + + } + ], + [ + { + "text": "{{g8_receipt_no}}.", + "border": [ + true, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{G8ReceiptNo}}", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table" + }, + { + "text": "{{g8_receipt_date}}", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{G8ReceiptDate}}", + "border": [ + false, + false, + true, + true + ], + "style": "receipt-table" + } + ] + ] + }, + "layout": {} + }, + { + "style": "next-noc-table", + "table": { + "widths": [ + "10%", + "*" + ], + "body": [ + [ + { + "text":"Comments: ", + "border":[false, false, false, false] + }, + { + "text":"{{comments}}", + "border":[false, false, false, false] + } + ] + ], + "layout":"noBorders" + } + }, + { + "style": "receipt-approver", + "columns": [ + { + "text": [ + { + "text": "{{generated_by}}: ", + "bold": true + }, + { + "text": "{{user-name}}", + "bold": false + } + ], + "alignment": "left" + }, + { + "text": [ + { + "text": "Authorised Signatory", + "bold": true + } + ], + "alignment": "right", + "margin": [ + 0, + 0, + -10, + 1 + ] + } + ] + }, + { + "text":"---------------x------------------------------x-----------------------------x------------------------------x-----------------------x------------------x------", + "style":"next-noc-table" + + }, + { + "style": "noc-head-emp", + "table": { + "widths": [ + 60, + "*", + 120 + ], + "body": [ + [ + { + "image": "{{logoImage}}", + "width": 50, + "height": 50 + }, + { + "stack": [ + { + "text": "{{logo-header}} {{mcGrade}}", + "style": "receipt-logo-header" + }, + { + "text": "{{serviceType}} {{payment_receipt}} (Citizen Copy)", + "style": "receipt-logo-sub-header" + } + ], + "alignment": "left", + "margin": [ + 0, + 4, + 0, + 0 + ] + }, + { + "stack": [ + { + "text": "{{address}},{{phoneNumber}}", + "style": "receipt-logo-sub-header" + }, + { + "text": "{{website}},{{email}}", + "style": "receipt-logo-sub-header" + } + ], + "alignment": "right", + "color": "#484848", + "margin": [ + -100, + 0, + -25, + 0 + ] + } + ] + ] + }, + "layout": "noBorders" + }, + { + "style": "noc-table", + "table": { + "widths": [ + "30%", + "20%", + "30%", + "20%" + ], + "body": [ + [ + { + "text": "{{receipt_no}}.", + "border": [ + true, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{receiptNo}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{consumer_id}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{consumerID}}", + "border": [ + false, + true, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "Receipt Date", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{ReceiptDate}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Tax period", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{fromPeriod}} {{to}} {{toPeriod}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + + { + "text": "Consumer Name", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerName}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Contact No.", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerContact}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + + { + "text": "Address:", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerAddress}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Paid By", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{PaidBy}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ] + + ] + }, + "layout": {} + }, + { + "style": "next-noc-table", + "table": { + "widths": [ + "30%", + "20%", + "30%", + "20%" + ], + "body": [ + [ + { + "text": "{{service_type}}", + "border": [ + true, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{serviceType}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{billing_period}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{fromPeriod}} {{to}} {{toPeriod}}", + "border": [ + false, + true, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{paid_amount}}", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "₹ {{paidAmount}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + + "text": "{{payment_mode}}", + + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + + "text": "{{paymentMode}}", + + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], [ + { + "text": "Tax Amount", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "₹ {{taxAmount}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + + "text": "Field Fee", + + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + + "text": "₹ {{fieldFee}}", + + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ],[ + { + "text": "CGST(if applicable)", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "₹ {{cgst}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + + "text": "SGST(if applicable)", + + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + + "text": "₹ {{sgst}}", + + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "Cheque/DD/PO/Transaction No.", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{chequeDD}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Cheque/DD/PO/Transaction Date", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{chequeDDDate}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + + } + ],[ + { + "text": "Bank Name", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{bankName}},{{branchName}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "IFSC Code", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{ifsc}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + + } + ], + [ + { + "text": "{{g8_receipt_no}}.", + "border": [ + true, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{G8ReceiptNo}}", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table" + }, + { + "text": "{{g8_receipt_date}}", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{G8ReceiptDate}}", + "border": [ + false, + false, + true, + true + ], + "style": "receipt-table" + } + ] + ] + }, + "layout": {} + }, + { + "style": "next-noc-table", + "table": { + "widths": [ + "10%", + "*" + ], + "body": [ + [ + { + "text":"Comments: ", + "border":[false, false, false, false] + }, + { + "text":"{{comments}}", + "border":[false, false, false, false] + } + ] + ], + "layout":"noBorders" + } + }, + { + "style": "receipt-approver", + "columns": [ + { + "text": [ + { + "text": "{{generated_by}}: ", + "bold": true + }, + { + "text": "{{user-name}}", + "bold": false + } + ], + "alignment": "left" + }, + { + "text": [ + { + "text": "Authorised Signatory", + "bold": true + } + ], + "alignment": "right", + "margin": [ + 0, + 0, + -10, + 1 + ] + } + ] + }, + { + "style": "pt-disclaimer", + "stack": [ + { + "text": "{{disclamer}}", + "bold": true, + "style": "pt-disclaimer-value" + }, + { + "text": "{{disclamer_1}}", + "bold": false, + "style": "pt-disclaimer-value" + }, + { + "text": "{{disclamer_2}}", + "bold": false, + "style": "pt-disclaimer-value" + }, + { + "text": "{{disclamer_3}}", + "bold": false, + "style": "pt-disclaimer-value" + }, { + "text":"Now log a complaint from WhatsApp, give a missed call on 8750975975 or send a Hi message on WhatsApp to this number", "bold": true, "fontSize": 8, "color": "blue", "decoration": "underline"} + ] + } + ], + "styles": { + "noc-head": { + "margin": [ + -30, + -30, + 0, + 1 + ] + }, + "noc-head-emp": { + "margin": [ + -30, + 10, + 0, + 1 + ] + }, + "receipt-logo-header": { + "color": "#000000", + "fontSize": 10, + "bold": true, + "letterSpacing": 0.74, + "margin": [ + 0, + 0, + 0, + 4 + ] + }, + "receipt-logo-sub-header": { + "color": "#000000", + "fontSize": 8, + "letterSpacing": 0.6 + }, + "noc-table": { + "fontSize": 8, + "color": "#000000", + "margin": [ + -25, + 10, + -22, + -8 + ] + }, + "next-noc-table": { + "fontSize": 8, + "color": "#000000", + "margin": [ + -25, + 6, + -22, + 0 + ] + }, + "receipt-table-value": { + "color": "#000000", + "bold": true, + "fontSize": 8, + "fontWeight": 500, + "margin": [ + 8, + 0, + 0, + 0 + ] + }, + "receipt-table": { + "color": "#000000", + "bold": false, + "fontSize": 8, + "fontWeight": 400, + "margin": [ + -30, + 0, + 0, + 0 + ] + }, + "receipt-approver": { + "fontSize": 8, + "bold": true, + "margin": [ + -27, + 3, + -10, + 0 + ] + }, + "no-signature": { + "fontSize": 8, + "margin": [ + -27, + 3, + -10, + 0 + ] + }, + "pt-disclaimer": { + "fontSize": 8, + "margin": [ + -27, + 3, + -10, + 0 + ] + }, + "pt-disclaimer-value": { + "fontSize": 8, + "margin": [ + 2, + 1, + 0, + 0 + ] + } + } + } +} From 78c50f3bc555f2f9e7873a9a02173a5632eef06b Mon Sep 17 00:00:00 2001 From: poonam1512 Date: Wed, 2 Mar 2022 13:26:45 +0530 Subject: [PATCH 0919/1242] adding new table for partial payment in Property receipt --- .../format-config/property-receipt.json | 154 +++++++++--------- 1 file changed, 77 insertions(+), 77 deletions(-) diff --git a/configs/pdf-service/format-config/property-receipt.json b/configs/pdf-service/format-config/property-receipt.json index d4269b2b..eeb10c58 100644 --- a/configs/pdf-service/format-config/property-receipt.json +++ b/configs/pdf-service/format-config/property-receipt.json @@ -446,7 +446,82 @@ "layout": {} }, { - "text":"PAYABLE AMOUNT", + "text":"AMOUNT TO BE PAID", + "style":"block-head" + }, + { + "style": "next-noc-table", + "table": { + "widths": [ + + "7%","9%","7%","7%","7%","7%","8%","8%","8%","8%","8%","7%","9%" + ], + "body": [ + + [ { + "text": "Year", + "style": "amounts" + }, + { + "text": "Property Tax", + "style": "amounts" + }, + { + "text": "Fire Cess", + "style": "amounts" + }, + { + "text": "Cancer Cess", + "style": "amounts" + }, + { + "text": "Penalty", + "style": "amounts" + }, + { + "text": "Rebate", + "style": "amounts" + }, + { + "text": "Interest", + "style": "amounts" + }, + { + "text": "Usage Exemp.", + "style": "amounts" + }, + { + "text": "Category Exemp.", + "style": "amounts" + }, + { + "text": "Adhoc Penalty", + "style": "amounts" + }, + { + "text": "Adhoc Rebate", + "style": "amounts" + }, + { + "text": "Round Off", + "style": "amounts" + }, + { + "text": "Total", + "style": "amounts" + } + + ], + + "{{#var_tax}}[{\"text\":\"{{year}}\",\"style\":\"receipt-table\"},{\"text\":\"{{tax}}\",\"style\":\"receipt-table\"},{\"text\":\"{{firecess}}\",\"style\":\"receipt-table\"},{\"text\":\"{{cancercess}}\",\"style\":\"receipt-table\"},{\"text\":\"{{penalty}}\",\"style\":\"receipt-table\"},{\"text\":\"{{rebate}}\",\"style\":\"receipt-table\"},{\"text\":\"{{interest}}\",\"style\":\"receipt-table\"},{\"text\":\"{{usage_exemption}}\",\"style\":\"receipt-table\"},{\"text\":\"{{special_category_exemption}}\",\"style\":\"receipt-table\"},{\"text\":\"{{adhoc_penalty}}\",\"style\":\"receipt-table\"},{\"text\":\"{{adhoc_rebate}}\",\"style\":\"receipt-table\"},{\"text\":\"{{roundoff}}\",\"style\":\"receipt-table\"},{\"text\":\"{{total}}\",\"style\":\"receipt-table\"}]{{/var_tax}}" + + + ] + }, + "layout":{} + }, + { + "text":"SUMMARY OF PAID AMOUNT", "style":"block-head" }, { @@ -454,7 +529,7 @@ "table": { "widths": [ - "7%","7%","7%","5%","7%","6%","7%","8%","8%","8%","8%","7%","*" + "7%","9%","7%","7%","7%","7%","8%","8%","8%","8%","8%","7%","9%" ], "body": [ @@ -520,81 +595,6 @@ }, "layout":{} }, - { - "text":"ESTIMATED AMOUNT", - "style":"block-head" - }, - { - "style": "next-noc-table", - "table": { - "widths": [ - - "7%","7%","7%","5%","7%","6%","7%","8%","8%","8%","8%","7%","*" - ], - "body": [ - - [ { - "text": "Year", - "style": "amounts" - }, - { - "text": "Property Tax", - "style": "amounts" - }, - { - "text": "Fire Cess", - "style": "amounts" - }, - { - "text": "Cancer Cess", - "style": "amounts" - }, - { - "text": "Penalty", - "style": "amounts" - }, - { - "text": "Rebate", - "style": "amounts" - }, - { - "text": "Interest", - "style": "amounts" - }, - { - "text": "Usage Exemp.", - "style": "amounts" - }, - { - "text": "Category Exemp.", - "style": "amounts" - }, - { - "text": "Adhoc Penalty", - "style": "amounts" - }, - { - "text": "Adhoc Rebate", - "style": "amounts" - }, - { - "text": "Round Off", - "style": "amounts" - }, - { - "text": "Total", - "style": "amounts" - } - - ], - - "{{#var_tax}}[{\"text\":\"{{year}}\",\"style\":\"receipt-table\"},{\"text\":\"{{tax}}\",\"style\":\"receipt-table\"},{\"text\":\"{{firecess}}\",\"style\":\"receipt-table\"},{\"text\":\"{{cancercess}}\",\"style\":\"receipt-table\"},{\"text\":\"{{penalty}}\",\"style\":\"receipt-table\"},{\"text\":\"{{rebate}}\",\"style\":\"receipt-table\"},{\"text\":\"{{interest}}\",\"style\":\"receipt-table\"},{\"text\":\"{{usage_exemption}}\",\"style\":\"receipt-table\"},{\"text\":\"{{special_category_exemption}}\",\"style\":\"receipt-table\"},{\"text\":\"{{adhoc_penalty}}\",\"style\":\"receipt-table\"},{\"text\":\"{{adhoc_rebate}}\",\"style\":\"receipt-table\"},{\"text\":\"{{roundoff}}\",\"style\":\"receipt-table\"},{\"text\":\"{{total}}\",\"style\":\"receipt-table\"}]{{/var_tax}}" - - - ] - }, - "layout":{} - }, { "text":"PAYMENT INFORMATION", "style":"block-head" From 5beb3d911f3561b8e54c53df6c8a39a9f4b16714 Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Thu, 3 Mar 2022 12:22:16 +0530 Subject: [PATCH 0920/1242] Update transform_tl_v1.json --- .../dashboard-ingest/transform_tl_v1.json | 43 ++++++++++--------- 1 file changed, 23 insertions(+), 20 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-ingest/transform_tl_v1.json b/configs/egov-dss-dashboards/dashboard-ingest/transform_tl_v1.json index 99c8df76..65d108ae 100644 --- a/configs/egov-dss-dashboards/dashboard-ingest/transform_tl_v1.json +++ b/configs/egov-dss-dashboards/dashboard-ingest/transform_tl_v1.json @@ -1,22 +1,25 @@ [ - { - "operation": "shift", - "spec": { - "tradelicense": { - "tenantId": "tenantId", - "calculation": "tradelicense.calculation", - "licenseNumber": "tradelicense.licenseNumber", - "commencementDate": "tradelicense.commencementDate", - "licenseType": "tradelicense.licenseType", - "financialYear": "tradelicense.financialYear", - "tradeName": "tradelicense.tradeName", - "applicationNumber": "tradelicense.applicationNumber", - "accountId": "tradelicense.accountId", - "applicationDate": "tradelicense.applicationDate", - "oldPropertyId": "tradelicense.oldPropertyId", - "action": "tradelicense.action" - }, - "ward": "ward" - } - } + { + "operation": "shift", + "spec": { + "tradelicense": { + "tenantId": "tenantId", + "calculation": "tradelicense.calculation", + "licenseNumber": "tradelicense.licenseNumber", + "commencementDate": "tradelicense.commencementDate", + "licenseType": "tradelicense.licenseType", + "financialYear": "tradelicense.financialYear", + "tradeName": "tradelicense.tradeName", + "applicationNumber": "tradelicense.applicationNumber", + "accountId": "tradelicense.accountId", + "applicationDate": "tradelicense.applicationDate", + "oldPropertyId": "tradelicense.oldPropertyId", + "action": "tradelicense.action", + "tradeLicenseDetail": "tradelicense.tradeLicenseDetail" + }, + "ward": "ward", + "tradeType": "tradeType" + + } + } ] From 87c743cf9e8caacbfb36677f2796238d1d115dcf Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Thu, 3 Mar 2022 12:32:07 +0530 Subject: [PATCH 0921/1242] Update "licenseByLicenseType" --- .../dashboard-analytics/ChartApiConfig.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index b820c005..29b7628b 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -224,12 +224,12 @@ "licenseByLicenseType": { "chartName": "DSS_TL_LICENSE_BY_TYPE", "queries": [ - { + { "module": "COMMON", - "requestQueryMap": "{\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\"}", + "requestQueryMap": "{\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantData.code\", \"district\" : \"dataObject.tenantData.city.districtCode\"}", "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"License Instrument Type\":{\"terms\":{\"field\":\"dataObject.paymentMode.keyword\"},\"aggs\":{\"Licens Issued\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Trade Type\":{\"terms\":{\"field\":\"domainObject.tradeType.keyword\",\"size\":200},\"aggs\":{\"Amount Paid\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" } ], "chartType": "pie", From 801c615c54963b6b156aa051e361d66a9d70c21d Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Thu, 3 Mar 2022 12:43:03 +0530 Subject: [PATCH 0922/1242] Update "licenseByLicenseType" --- .../dashboard-analytics/MasterDashboardConfig.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json index d7dbe939..aff567ab 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json @@ -861,7 +861,7 @@ } ] }, - { + { "id": 323, "name": "DSS_TL_LICENSE_BY_TYPE", "dimensions": { @@ -870,7 +870,7 @@ }, "vizType": "chart", "label": "", - "noUnit": false, + "noUnit": true, "isCollapsible": false, "charts": [ { @@ -2384,7 +2384,7 @@ }, "vizType": "chart", "label": "", - "noUnit": false, + "noUnit": true, "isCollapsible": false, "charts": [ { From 2e2c72fdf9f572aee65b7cae9079d83360834437 Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Thu, 3 Mar 2022 18:36:03 +0530 Subject: [PATCH 0923/1242] Update transform_tl_v1.json --- .../dashboard-ingest/transform_tl_v1.json | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-ingest/transform_tl_v1.json b/configs/egov-dss-dashboards/dashboard-ingest/transform_tl_v1.json index 65d108ae..20f710fe 100644 --- a/configs/egov-dss-dashboards/dashboard-ingest/transform_tl_v1.json +++ b/configs/egov-dss-dashboards/dashboard-ingest/transform_tl_v1.json @@ -15,11 +15,10 @@ "applicationDate": "tradelicense.applicationDate", "oldPropertyId": "tradelicense.oldPropertyId", "action": "tradelicense.action", - "tradeLicenseDetail": "tradelicense.tradeLicenseDetail" + "tradeLicenseDetail": "tradelicense.tradeLicenseDetail", + "tradeType": "tradelicense.tradeType" }, - "ward": "ward", - "tradeType": "tradeType" - + "ward": "ward" } } ] From 13d6e0b79f873953394349f89dc96a6d06a2a1bd Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 4 Mar 2022 10:47:51 +0530 Subject: [PATCH 0924/1242] state report descriptionv2 --- configs/reports/configs/pgr-reports.yml | 147 ++++++++++++++++++++++++ 1 file changed, 147 insertions(+) diff --git a/configs/reports/configs/pgr-reports.yml b/configs/reports/configs/pgr-reports.yml index dfaa4e4d..93568384 100644 --- a/configs/reports/configs/pgr-reports.yml +++ b/configs/reports/configs/pgr-reports.yml @@ -1904,3 +1904,150 @@ ReportDefinitions: WHERE tenantid != 'pb.testing' groupby: GROUP BY tenantid,servicecode orderby: ORDER BY tenantid,servicecode + + + + +- reportName: StateDescriptionReport_v2 + decryptionPathId: DescriptionReport_v2 + summary: Fetches state description wise reports + version: 1.0.0 + moduleName: rainmaker-pgr + externalService: + - entity: $.MdmsRes.RAINMAKER-PGR.ServiceDefs + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=RAINMAKER-PGR&masterName=ServiceDefs&tenantId=$tenantId + keyOrder: serviceCode,department,slaHours + tableName: tbl_dept + - entity: $.MdmsRes.common-masters.Department + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=common-masters&masterName=Department&tenantId=$tenantId + keyOrder: name,code + tableName: tbl_def_dept + - entity: $.TenantBoundary[0].boundary + apiURL: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search?hierarchyTypeCode=ADMIN&boundaryType=Locality&tenantId=$tenantId + keyOrder: name,code + tableName: tbl_boundary + sourceColumns: + - name: department + label: reports.rainmaker-pgr.department + type: string + source: eg_pgr_service + total: false + - name: servicecode + label: reports.rainmaker-pgr.servicecode + type: string + source: eg_pgr_service + total: false + - name: complaintNo + label: reports.rainmaker-pgr.complaintNo + type: string + source: eg_pgr_service + total: false + - name: date + label: reports.rainmaker-pgr.date + type: string + source: eg_pgr_service + total: false + - name: name + label: reports.rainmaker-pgr.name + type: string + source: eg_pgr_service + total: false + - name: phone + label: reports.rainmaker-pgr.phone + type: string + source: eg_pgr_service + total: false + - name: address + label: reports.rainmaker-pgr.address + type: string + source: eg_pgr_service + total: false + - name: locality + label: reports.rainmaker-pgr.locality + type: string + source: eg_pgr_service + total: false + - name: landmark + label: reports.rainmaker-pgr.landmark + type: string + source: eg_pgr_service + total: false + - name: description + label: reports.rainmaker-pgr.description + type: string + source: eg_pgr_service + total: false + - name: lastassignedto + label: reports.rainmaker-pgr.lastassignedto + type: string + source: eg_pgr_service + total: false + - name: status + label: reports.rainmaker-pgr.status + type: string + source: eg_pgr_service + total: false + - name: slahours + label: reports.rainmaker-pgr.slahours + type: string + source: eg_pgr_service + total: false + - name: actiondate + label: reports.rainmaker-pgr.actiondate + type: string + source: eg_pgr_service + total: false + - name: source + label: reports.rainmaker-pgr.source + type: string + source: eg_pgr_service + total: false + - name: tenantid + label: reports.rainmaker-pgr.tenantid + type: string + source: eg_pgr_service + total: false + searchParams: + - name: fromDate + label: reports.rainmaker-pgr.datefrom + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND eg_pgr_service.createdtime >= $fromDate + - name: toDate + label: reports.rainmaker-pgr.dateto + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND eg_pgr_service.createdtime <= $toDate + query: | + SELECT + DISTINCT ON (servicerequestid) + (case when ua.name is null then '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' else ua.name end) as lastassignedto, --value for Unassigned + (SELECT deptmap_def.name FROM (VALUES tbl_def_dept) AS deptmap_def(name,code) INNER JOIN (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) on deptmap.serviceCode = eg_pgr_service.servicecode and deptmap_def.code = deptmap.department) AS department, + regexp_replace(servicecode, '([a-z])([A-Z])', '\1 \2','g') AS servicecode, + (SELECT boundary_def.name FROM (VALUES tbl_boundary) AS boundary_def(name,code) where code=eg_pgr_address.mohalla) as locality, + servicerequestid AS complaintNo, + to_char(to_timestamp(TRUNC(CAST(eg_pgr_service.createdtime AS bigint) / 1000)), 'DD/MM/YYYY') AS date, + (case when eg_user.name is null then '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' else eg_user.name end) as name, --value for NULL + phone, + eg_pgr_address.landmark, + eg_pgr_address.housenoandstreetname as address, + description, + source, + eg_pgr_service.tenantid, + (SELECT (CASE WHEN (((SELECT deptmap.slaHours FROM (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) WHERE deptmap.serviceCode = eg_pgr_service.servicecode)::integer / 24) - (epa.when - eg_pgr_service.createdtime)::bigint/86400000) < 1 THEN CONCAT('Overdue by ', ((epa.when - eg_pgr_service.createdtime)::bigint/86400000) - ((SELECT deptmap.slaHours FROM (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) WHERE deptmap.serviceCode = eg_pgr_service.servicecode)::integer / 24), ' days') ELSE CONCAT(((SELECT deptmap.slaHours FROM (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) WHERE deptmap.serviceCode = eg_pgr_service.servicecode)::integer / 24) - (epa.when - eg_pgr_service.createdtime)::bigint/86400000, ' days remaining') END) as slaHours), + Initcap(eg_pgr_service.status) as status, + to_char((To_timestamp(epa.when/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS actiondate + FROM eg_pgr_service + left outer join eg_pgr_address on eg_pgr_address.uuid = eg_pgr_service.addressid + left outer join eg_user on eg_user.id = eg_pgr_service.accountid::int + left outer join eg_pgr_action as epa on epa.businesskey = eg_pgr_service.servicerequestid and epa.action in ('assign','reassign','resolve') + left outer join eg_user as ua on (ua.id = epa.assignee::int or ua.id = split_part(epa.by,':',1)::INTEGER) + WHERE + eg_pgr_service.tenantid!='pb.testing' + AND eg_pgr_address.uuid = eg_pgr_service.addressid + AND eg_pgr_service.status IN ('open','assigned','reassigrequested','rejected','closed','resolved') + orderby: ORDER BY servicerequestid, epa."when" desc + + From 32af4086f9dcfb4fcabd31f96f2ee0e32b7437a4 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 4 Mar 2022 11:49:13 +0530 Subject: [PATCH 0925/1242] state report description uat v2 --- configs/reports/configs/pgr-reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/reports/configs/pgr-reports.yml b/configs/reports/configs/pgr-reports.yml index 93568384..4c922fcb 100644 --- a/configs/reports/configs/pgr-reports.yml +++ b/configs/reports/configs/pgr-reports.yml @@ -2045,7 +2045,7 @@ ReportDefinitions: left outer join eg_pgr_action as epa on epa.businesskey = eg_pgr_service.servicerequestid and epa.action in ('assign','reassign','resolve') left outer join eg_user as ua on (ua.id = epa.assignee::int or ua.id = split_part(epa.by,':',1)::INTEGER) WHERE - eg_pgr_service.tenantid!='pb.testing' + eg_pgr_service.tenantid !='pb.testing' AND eg_pgr_address.uuid = eg_pgr_service.addressid AND eg_pgr_service.status IN ('open','assigned','reassigrequested','rejected','closed','resolved') orderby: ORDER BY servicerequestid, epa."when" desc From dd4fe24f0110e57254029ff1c6ade52e34da5d4e Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Fri, 4 Mar 2022 17:34:01 +0530 Subject: [PATCH 0926/1242] Update transform_tl_v1.json --- .../dashboard-ingest/transform_tl_v1.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-ingest/transform_tl_v1.json b/configs/egov-dss-dashboards/dashboard-ingest/transform_tl_v1.json index 20f710fe..086427af 100644 --- a/configs/egov-dss-dashboards/dashboard-ingest/transform_tl_v1.json +++ b/configs/egov-dss-dashboards/dashboard-ingest/transform_tl_v1.json @@ -15,10 +15,10 @@ "applicationDate": "tradelicense.applicationDate", "oldPropertyId": "tradelicense.oldPropertyId", "action": "tradelicense.action", - "tradeLicenseDetail": "tradelicense.tradeLicenseDetail", - "tradeType": "tradelicense.tradeType" + "tradeLicenseDetail": "tradelicense.tradeLicenseDetail" }, - "ward": "ward" + "ward": "ward", + "tradeType": "tradeType" } } ] From 2a186abd9ddffab826c5d3e1755b5bfc300e3f1e Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Sun, 6 Mar 2022 18:22:18 +0530 Subject: [PATCH 0927/1242] Update query for "licenseApplicationByStatus" --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 29b7628b..03e5b8d4 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -1695,7 +1695,7 @@ "dateRefField": "Data.tradelicense.issuedDate", "indexName": "tlindex-v1", "aggrQueryBc": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tradelicense.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Status\":{\"terms\":{\"field\":\"Data.tradelicense.status.keyword\"},\"aggs\":{\"License Issued\":{\"value_count\":{\"field\":\"Data.tradelicense.status.keyword\"}}}}}}}}", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tradelicense.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Status\":{\"terms\":{\"field\":\"Data.tradelicense.status.keyword\",\"size\":1000,\"min_doc_count\":0},\"aggs\":{\"License Issued\":{\"cardinality\":{\"field\":\"Data.tradelicense.licenseNumber.keyword\"}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tradelicense.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Status\":{\"terms\":{\"field\":\"Data.tradelicense.status.keyword\",\"size\":1000,\"min_doc_count\":0},\"aggs\":{\"Total Application\":{\"value_count\":{\"field\":\"Data.tradelicense.applicationNumber.keyword\"}}}}}}}}" } ], "chartType": "pie", From b419b394db88176786005982e848c80d40e492e4 Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Sun, 6 Mar 2022 21:53:19 +0530 Subject: [PATCH 0928/1242] Update query "licenseApplicationByStatus" --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 03e5b8d4..5c51e5f2 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -1695,7 +1695,7 @@ "dateRefField": "Data.tradelicense.issuedDate", "indexName": "tlindex-v1", "aggrQueryBc": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tradelicense.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Status\":{\"terms\":{\"field\":\"Data.tradelicense.status.keyword\"},\"aggs\":{\"License Issued\":{\"value_count\":{\"field\":\"Data.tradelicense.status.keyword\"}}}}}}}}", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tradelicense.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Status\":{\"terms\":{\"field\":\"Data.tradelicense.status.keyword\",\"size\":1000,\"min_doc_count\":0},\"aggs\":{\"Total Application\":{\"value_count\":{\"field\":\"Data.tradelicense.applicationNumber.keyword\"}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tradelicense.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Status\":{\"terms\":{\"field\":\"Data.tradelicense.status.keyword\",\"size\":200},\"aggs\":{\"Total Application\":{\"value_count\":{\"field\":\"Data.tradelicense.applicationNumber.keyword\"}}}}}}}}" } ], "chartType": "pie", From 2e8e708e31575ef2e043b2b11c0f6ba335ec9094 Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Tue, 8 Mar 2022 14:22:51 +0530 Subject: [PATCH 0929/1242] Update query for "licenseApplicationByStatus" --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 5c51e5f2..dd4b2805 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -1695,7 +1695,7 @@ "dateRefField": "Data.tradelicense.issuedDate", "indexName": "tlindex-v1", "aggrQueryBc": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tradelicense.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Status\":{\"terms\":{\"field\":\"Data.tradelicense.status.keyword\"},\"aggs\":{\"License Issued\":{\"value_count\":{\"field\":\"Data.tradelicense.status.keyword\"}}}}}}}}", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tradelicense.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Status\":{\"terms\":{\"field\":\"Data.tradelicense.status.keyword\",\"size\":200},\"aggs\":{\"Total Application\":{\"value_count\":{\"field\":\"Data.tradelicense.applicationNumber.keyword\"}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tradelicense.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Status\":{\"terms\":{\"field\":\"Data.tradelicense.status.keyword\",\"size\":200},\"aggs\":{\"Status\":{\"value_count\":{\"field\":\"Data.tradelicense.applicationNumber.keyword\"}}}}}}}}" } ], "chartType": "pie", From 681a70793340abbf4365e01811a743364666ac2e Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Tue, 8 Mar 2022 16:01:58 +0530 Subject: [PATCH 0930/1242] Update transform_tl_v1.json --- .../dashboard-ingest/transform_tl_v1.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-ingest/transform_tl_v1.json b/configs/egov-dss-dashboards/dashboard-ingest/transform_tl_v1.json index 086427af..27babc8d 100644 --- a/configs/egov-dss-dashboards/dashboard-ingest/transform_tl_v1.json +++ b/configs/egov-dss-dashboards/dashboard-ingest/transform_tl_v1.json @@ -15,10 +15,11 @@ "applicationDate": "tradelicense.applicationDate", "oldPropertyId": "tradelicense.oldPropertyId", "action": "tradelicense.action", - "tradeLicenseDetail": "tradelicense.tradeLicenseDetail" + "tradeLicenseDetail": "tradelicense.tradeLicenseDetail", + "tradeType": "tradelicense.tradeLicenseDetail.tradeUnits.tradeType" + }, - "ward": "ward", - "tradeType": "tradeType" + "ward": "ward" } } ] From bfa73499fd92cc9e2d496eb642195c1debc5e59f Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Tue, 8 Mar 2022 16:15:58 +0530 Subject: [PATCH 0931/1242] Update transform_tl_v1.json --- .../dashboard-ingest/transform_tl_v1.json | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-ingest/transform_tl_v1.json b/configs/egov-dss-dashboards/dashboard-ingest/transform_tl_v1.json index 27babc8d..b61e3e63 100644 --- a/configs/egov-dss-dashboards/dashboard-ingest/transform_tl_v1.json +++ b/configs/egov-dss-dashboards/dashboard-ingest/transform_tl_v1.json @@ -4,19 +4,19 @@ "spec": { "tradelicense": { "tenantId": "tenantId", - "calculation": "tradelicense.calculation", - "licenseNumber": "tradelicense.licenseNumber", - "commencementDate": "tradelicense.commencementDate", - "licenseType": "tradelicense.licenseType", - "financialYear": "tradelicense.financialYear", - "tradeName": "tradelicense.tradeName", - "applicationNumber": "tradelicense.applicationNumber", - "accountId": "tradelicense.accountId", - "applicationDate": "tradelicense.applicationDate", - "oldPropertyId": "tradelicense.oldPropertyId", - "action": "tradelicense.action", - "tradeLicenseDetail": "tradelicense.tradeLicenseDetail", - "tradeType": "tradelicense.tradeLicenseDetail.tradeUnits.tradeType" + "calculation": "Data.tradelicense.calculation", + "licenseNumber": "Data.tradelicense.licenseNumber", + "commencementDate": "Data.tradelicense.commencementDate", + "licenseType": "Data.tradelicense.licenseType", + "financialYear": "Data.tradelicense.financialYear", + "tradeName": "Data.tradelicense.tradeName", + "applicationNumber": "Data.tradelicense.applicationNumber", + "accountId": "Data.tradelicense.accountId", + "applicationDate": "Data.tradelicense.applicationDate", + "oldPropertyId": "Data.tradelicense.oldPropertyId", + "action": "Data.tradelicense.action", + "tradeLicenseDetail": "Data.tradelicense.tradeLicenseDetail", + "tradeType": "Data.tradelicense.tradeLicenseDetail.tradeUnits.tradeType" }, "ward": "ward" From 0803aa417a3af73aedff78f2fab8d30ef15b6b3e Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Tue, 8 Mar 2022 16:20:47 +0530 Subject: [PATCH 0932/1242] Update transform_tl_v1.json --- .../egov-dss-dashboards/dashboard-ingest/transform_tl_v1.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-ingest/transform_tl_v1.json b/configs/egov-dss-dashboards/dashboard-ingest/transform_tl_v1.json index b61e3e63..75e0bc52 100644 --- a/configs/egov-dss-dashboards/dashboard-ingest/transform_tl_v1.json +++ b/configs/egov-dss-dashboards/dashboard-ingest/transform_tl_v1.json @@ -3,7 +3,7 @@ "operation": "shift", "spec": { "tradelicense": { - "tenantId": "tenantId", + "tenantId": "Data.tradelicense.tenantId", "calculation": "Data.tradelicense.calculation", "licenseNumber": "Data.tradelicense.licenseNumber", "commencementDate": "Data.tradelicense.commencementDate", From 2475302861805ce7bf7033f5a6f32bf78cda3d2c Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Tue, 8 Mar 2022 17:56:12 +0530 Subject: [PATCH 0933/1242] Update transform_tl_v1.json --- .../dashboard-ingest/transform_tl_v1.json | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-ingest/transform_tl_v1.json b/configs/egov-dss-dashboards/dashboard-ingest/transform_tl_v1.json index 75e0bc52..210209d2 100644 --- a/configs/egov-dss-dashboards/dashboard-ingest/transform_tl_v1.json +++ b/configs/egov-dss-dashboards/dashboard-ingest/transform_tl_v1.json @@ -3,20 +3,20 @@ "operation": "shift", "spec": { "tradelicense": { - "tenantId": "Data.tradelicense.tenantId", - "calculation": "Data.tradelicense.calculation", - "licenseNumber": "Data.tradelicense.licenseNumber", - "commencementDate": "Data.tradelicense.commencementDate", - "licenseType": "Data.tradelicense.licenseType", - "financialYear": "Data.tradelicense.financialYear", - "tradeName": "Data.tradelicense.tradeName", - "applicationNumber": "Data.tradelicense.applicationNumber", - "accountId": "Data.tradelicense.accountId", - "applicationDate": "Data.tradelicense.applicationDate", - "oldPropertyId": "Data.tradelicense.oldPropertyId", - "action": "Data.tradelicense.action", - "tradeLicenseDetail": "Data.tradelicense.tradeLicenseDetail", - "tradeType": "Data.tradelicense.tradeLicenseDetail.tradeUnits.tradeType" + "tenantId": "tradelicense.tenantId", + "calculation": "tradelicense.calculation", + "licenseNumber": "tradelicense.licenseNumber", + "commencementDate": "tradelicense.commencementDate", + "licenseType": "tradelicense.licenseType", + "financialYear": "tradelicense.financialYear", + "tradeName": "tradelicense.tradeName", + "applicationNumber": "tradelicense.applicationNumber", + "accountId": "tradelicense.accountId", + "applicationDate": "tradelicense.applicationDate", + "oldPropertyId": "tradelicense.oldPropertyId", + "action": "tradelicense.action", + "tradeLicenseDetail": "tradelicense.tradeLicenseDetail", + "tradeType": "tradelicense.tradeLicenseDetail.tradeUnits[0].tradeType" }, "ward": "ward" From 5a4a8e04decfb7e364972abfe1a3b11940545465 Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Tue, 8 Mar 2022 18:30:44 +0530 Subject: [PATCH 0934/1242] Update transform_tl_v1.json --- .../dashboard-ingest/transform_tl_v1.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-ingest/transform_tl_v1.json b/configs/egov-dss-dashboards/dashboard-ingest/transform_tl_v1.json index 210209d2..18fe28ff 100644 --- a/configs/egov-dss-dashboards/dashboard-ingest/transform_tl_v1.json +++ b/configs/egov-dss-dashboards/dashboard-ingest/transform_tl_v1.json @@ -15,11 +15,11 @@ "applicationDate": "tradelicense.applicationDate", "oldPropertyId": "tradelicense.oldPropertyId", "action": "tradelicense.action", - "tradeLicenseDetail": "tradelicense.tradeLicenseDetail", - "tradeType": "tradelicense.tradeLicenseDetail.tradeUnits[0].tradeType" + "tradeLicenseDetail": "tradelicense.tradeLicenseDetail" }, - "ward": "ward" + "ward": "ward", + "tradeType": "tradeType" } } ] From d3e8edbb8827f14326a870c4ef0ca957d23e0584 Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Tue, 8 Mar 2022 19:21:01 +0530 Subject: [PATCH 0935/1242] Update transform_tl_v1.json --- .../egov-dss-dashboards/dashboard-ingest/transform_tl_v1.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-ingest/transform_tl_v1.json b/configs/egov-dss-dashboards/dashboard-ingest/transform_tl_v1.json index 18fe28ff..e25345f0 100644 --- a/configs/egov-dss-dashboards/dashboard-ingest/transform_tl_v1.json +++ b/configs/egov-dss-dashboards/dashboard-ingest/transform_tl_v1.json @@ -19,7 +19,7 @@ }, "ward": "ward", - "tradeType": "tradeType" + "tradeType": "tradelicense.tradeLicenseDetail.tradeUnits[0].tradeType" } } ] From 577b83965c2d6e9bf96ac3fea77e1375406bfaf0 Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Wed, 9 Mar 2022 19:34:17 +0530 Subject: [PATCH 0936/1242] Update query for "totalCollectionDeptWise" --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index dd4b2805..22cdc644 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -140,7 +140,7 @@ "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\"}", "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}],\"must\":[{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\"]}}]}},\"aggs\":{\"Business Service\":{\"terms\":{\"field\":\"dataObject.paymentDetails.businessService.keyword\"},\"aggs\":{\"total\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}],\"must\":[{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS\",\"SW\"]}}]}},\"aggs\":{\"Business Service\":{\"terms\":{\"field\":\"dataObject.paymentDetails.businessService.keyword\"},\"aggs\":{\"total\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" } ], "chartType": "pie", From 6825bae4096c1ab06b4b3761d7c1d784dabc777c Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Wed, 9 Mar 2022 19:58:43 +0530 Subject: [PATCH 0937/1242] Add "isRound" in "topPerformingUlbsCompletionRate" --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 22cdc644..dfef9329 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -470,6 +470,7 @@ "plotLabel": "DSS_COMPLETION_RATE", "order": "desc", "limit": 3, + "isRoundOff": true, "aggregationPaths": [ "Closed Application", "Total Application" From baccb8f47bb0263eb0affbb10eed65cff5f96ccc Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Wed, 9 Mar 2022 20:10:40 +0530 Subject: [PATCH 0938/1242] Add isRound in "bottomPerformingUlbsCompletionRat" --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index dfef9329..fe834345 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -512,6 +512,7 @@ "plotLabel": "DSS_COMPLETION_RATE", "order": "asc", "limit": 3, + "isRoundOff": true, "aggregationPaths": [ "Closed Application", "Total Application" From 564dc7d2565541f6005b436260577d73929d8a0d Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Thu, 10 Mar 2022 12:42:38 +0530 Subject: [PATCH 0939/1242] Added new file for "fireNoc" --- .../dashboard-ingest/transform_firenoc_v1.json | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 configs/egov-dss-dashboards/dashboard-ingest/transform_firenoc_v1.json diff --git a/configs/egov-dss-dashboards/dashboard-ingest/transform_firenoc_v1.json b/configs/egov-dss-dashboards/dashboard-ingest/transform_firenoc_v1.json new file mode 100644 index 00000000..fc556b58 --- /dev/null +++ b/configs/egov-dss-dashboards/dashboard-ingest/transform_firenoc_v1.json @@ -0,0 +1,10 @@ +[ + { + "operation": "shift", + "spec": { + "tenantId": "tenantId", + "Department": "Department", + "ward" : "ward" + } + } +] From bd6d2aafc3c2272bb45ec48139a3059f4eb99a53 Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Thu, 10 Mar 2022 15:16:31 +0530 Subject: [PATCH 0940/1242] Add firenoc in "DomainConfig.json" --- .../dashboard-ingest/DomainConfig.json | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json b/configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json index cb5249b7..af727599 100644 --- a/configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json +++ b/configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json @@ -79,6 +79,33 @@ "expression": "complainNumber" } ] + }, + { + "id": "4", + "domain": "FIRENOC", + "indexName": "firenoc-index", + "documentType": "", + "query": "{\"query\":{\"bool\":{\"must\":[{\"match_phrase\":{\"Data.fireNOCDetails.applicationNumber\":\"value\"}}]}}}}", + "targetReferences": [ + { + "fieldName": "applicationNumber", + "argument": "Data.fireNOCDetails.applicationNumber", + "dataType": "String", + "value": "$value", + "seperator": " ", + "expression": "applicationNumber" + } + ], + "sourceReferences": [ + { + "fieldName": "consumerCode", + "argument": "paymentDetails.bill.consumerCode", + "dataType": "String", + "value": "$value", + "seperator": " ", + "expression": "applicationNumber" + } + ] } ] } From 6d601614d12317e133b58d3ebe9779b591cb0a52 Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Thu, 10 Mar 2022 21:22:16 +0530 Subject: [PATCH 0941/1242] Update "DSS_TOTAL_APPLICATIONS:_DEPARTMENT_WISE" --- .../dashboard-analytics/ChartApiConfig.json | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index fe834345..2dabe11b 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -380,6 +380,19 @@ "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \r\n \"district\" : \"Data.tenantData.city.districtCode\", \r\n\"tenantId\" : \"Data.tenantId\" \r\n}", "indexName": "tlindex-v1", "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tradelicense.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Trade Licence\":{\"value_count\":{\"field\":\"Data.tradelicense.tenantId.keyword\"}}}}}}" + }, + "module": "WS", + "dateRefField": "Data.@timestamp", + "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \r\n \"district\" : \"Data.tenantData.city.districtCode\", \r\n\"tenantId\" : \"Data.tenantId\" \r\n}", + "indexName": "water-services", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Water Service\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}}" + }, + { + "module": "SW", + "dateRefField": "Data.@timestamp", + "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \r\n \"district\" : \"Data.tenantData.city.districtCode\", \r\n\"tenantId\" : \"Data.tenantId\" \r\n}", + "indexName": "sewerage-services", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Sewerage Service\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}}" } ], "chartType": "pie", From 99e9db26e37ab711d93cd4de5c19d878c7ba4b05 Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Fri, 11 Mar 2022 11:02:06 +0530 Subject: [PATCH 0942/1242] Update "DSS_TOTAL_APPLICATIONS:_DEPARTMENT_WISE" --- .../dashboard-analytics/ChartApiConfig.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 2dabe11b..d8680c75 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -381,13 +381,14 @@ "indexName": "tlindex-v1", "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tradelicense.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Trade Licence\":{\"value_count\":{\"field\":\"Data.tradelicense.tenantId.keyword\"}}}}}}" }, + { "module": "WS", "dateRefField": "Data.@timestamp", "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \r\n \"district\" : \"Data.tenantData.city.districtCode\", \r\n\"tenantId\" : \"Data.tenantId\" \r\n}", "indexName": "water-services", "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Water Service\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}}" }, - { + { "module": "SW", "dateRefField": "Data.@timestamp", "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \r\n \"district\" : \"Data.tenantData.city.districtCode\", \r\n\"tenantId\" : \"Data.tenantId\" \r\n}", From 17bcde07f385dc6ae0fd14f47afc2024ac6ef528 Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Fri, 11 Mar 2022 12:14:16 +0530 Subject: [PATCH 0943/1242] Updated the query for the firenoc #Updated the query for the firenoc --- .../egov-dss-dashboards/dashboard-ingest/DomainConfig.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json b/configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json index af727599..57177632 100644 --- a/configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json +++ b/configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json @@ -82,14 +82,14 @@ }, { "id": "4", - "domain": "FIRENOC", + "domain": "FireNOCs", "indexName": "firenoc-index", "documentType": "", - "query": "{\"query\":{\"bool\":{\"must\":[{\"match_phrase\":{\"Data.fireNOCDetails.applicationNumber\":\"value\"}}]}}}}", + "query": "{\"query\":{\"bool\":{\"must\":[{\"match_phrase\":{\"fireNOCDetails.applicationNumber\":\"value\"}}]}}}}", "targetReferences": [ { "fieldName": "applicationNumber", - "argument": "Data.fireNOCDetails.applicationNumber", + "argument": "fireNOCDetails.applicationNumber", "dataType": "String", "value": "$value", "seperator": " ", From ab243cfa15c20a9ae5948dd7acd4a0fb8cfa6734 Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Fri, 11 Mar 2022 14:57:08 +0530 Subject: [PATCH 0944/1242] Updated index mapping for fireNoc --- .../rainmaker-firenoc-indexer.yml | 319 ++++++++++++++++-- 1 file changed, 290 insertions(+), 29 deletions(-) diff --git a/configs/egov-indexer/rainmaker-firenoc-indexer.yml b/configs/egov-indexer/rainmaker-firenoc-indexer.yml index 711039d5..1321b562 100644 --- a/configs/egov-indexer/rainmaker-firenoc-indexer.yml +++ b/configs/egov-indexer/rainmaker-firenoc-indexer.yml @@ -1,43 +1,304 @@ ServiceMaps: - serviceName: Fire NOC + serviceName: Fire Noc Service - rainmaker version: 1.0.0 mappings: - topic: save-fn-firenoc configKey: INDEX indexes: - - name: firenoc-index - type: FireNOCs - id: $.id, $.tenantId - isBulk: true - timeStampField: $.auditDetails.createdTime - jsonPath: $.FireNOCs - + - name: firenoc-services + type: general + id: $.id,$.tenantId + isBulk: true + jsonPath: $.FireNOCs + timeStampField: $.auditDetails.createdTime + customJsonMapping: + indexMapping: {"Data":{"channel":"","id":"","tenantId":"","fireNOCDetails":{"status":"","action":"","firestationId":"","applicationNumber":"","fireNOCType":"","buildings":[],"propertyDetails":{},"additionalDetail":{},"applicantDetails":{}},"auditDetails":{},"@timestamp":"timestamp"}} + fieldMapping: + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.fireNOCDetails.channel + outJsonPath: $.Data.channel + - inJsonPath: $.fireNOCDetails.status + outJsonPath: $.Data.fireNOCDetails.status + - inJsonPath: $.fireNOCDetails.action + outJsonPath: $.Data.fireNOCDetails.action + - inJsonPath: $.fireNOCDetails.fireNOCType + outJsonPath: $.Data.fireNOCDetails.fireNOCType + - inJsonPath: $.fireNOCDetails.buildings + outJsonPath: $.Data.fireNOCDetails.buildings + - inJsonPath: $.fireNOCDetails.applicationNumber + outJsonPath: $.Data.fireNOCDetails.applicationNumber + - inJsonPath: $.fireNOCDetails.buildings + outJsonPath: $.Data.fireNOCDetails.buildings + - inJsonPath: $.fireNOCDetails.propertyDetails + outJsonPath: $.Data.fireNOCDetails.propertyDetails + - inJsonPath: $.fireNOCDetails.additionalDetail + outJsonPath: $.Data.fireNOCDetails.additionalDetail + - inJsonPath: $.fireNOCDetails.applicantDetails + outJsonPath: $.Data.fireNOCDetails.applicantDetails + - inJsonPath: $.fireNOCDetails.firestationId + outJsonPath: $.Data.fireNOCDetails.firestationId + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + externalUriMapping: + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.fireNOCDetails.applicationNumber,history=true,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history + - path: http://egov-localization.egov:8080/localization/messages/v1/_search + queryParam: locale=en_IN,tenantId=$.tenantId,codes=$.fireNOCDetails.firestationId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.messages[0].message + outJsonPath: $.Data.Department + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.fireNOCDetails.propertyDetails.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + mdmsMapping: + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData + + - topic: update-fn-firenoc configKey: INDEX indexes: - - name: firenoc-index - type: FireNOCs - id: $.id, $.tenantId - isBulk: true - timeStampField: $.auditDetails.createdTime - jsonPath: $.FireNOCs - + - name: firenoc-services + type: general + id: $.id,$.tenantId + isBulk: true + jsonPath: $.FireNOCs + timeStampField: $.auditDetails.lastModifiedTime + customJsonMapping: + indexMapping: {"Data":{"channel":"","id":"","tenantId":"","fireNOCDetails":{"status":"","action":"","firestationId":"","applicationNumber":"","fireNOCType":"","buildings":[],"propertyDetails":{},"additionalDetail":{},"applicantDetails":{}},"auditDetails":{},"@timestamp":"timestamp"}} + fieldMapping: + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.fireNOCDetails.channel + outJsonPath: $.Data.channel + - inJsonPath: $.fireNOCDetails.status + outJsonPath: $.Data.fireNOCDetails.status + - inJsonPath: $.fireNOCDetails.action + outJsonPath: $.Data.fireNOCDetails.action + - inJsonPath: $.fireNOCDetails.fireNOCType + outJsonPath: $.Data.fireNOCDetails.fireNOCType + - inJsonPath: $.fireNOCDetails.buildings + outJsonPath: $.Data.fireNOCDetails.buildings + - inJsonPath: $.fireNOCDetails.applicationNumber + outJsonPath: $.Data.fireNOCDetails.applicationNumber + - inJsonPath: $.fireNOCDetails.buildings + outJsonPath: $.Data.fireNOCDetails.buildings + - inJsonPath: $.fireNOCDetails.propertyDetails + outJsonPath: $.Data.fireNOCDetails.propertyDetails + - inJsonPath: $.fireNOCDetails.additionalDetail + outJsonPath: $.Data.fireNOCDetails.additionalDetail + - inJsonPath: $.fireNOCDetails.applicantDetails + outJsonPath: $.Data.fireNOCDetails.applicantDetails + - inJsonPath: $.fireNOCDetails.firestationId + outJsonPath: $.Data.fireNOCDetails.firestationId + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + externalUriMapping: + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.fireNOCDetails.applicationNumber,history=true,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history + - path: http://egov-localization.egov:8080/localization/messages/v1/_search + queryParam: locale=en_IN,tenantId=$.tenantId,codes=$.fireNOCDetails.firestationId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.messages[0].message + outJsonPath: $.Data.Department + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.fireNOCDetails.propertyDetails.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + mdmsMapping: + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData + - topic: update-fn-workflow configKey: INDEX indexes: - - name: firenoc-index - type: FireNOCs - id: $.id, $.tenantId - isBulk: true - timeStampField: $.auditDetails.createdTime - jsonPath: $.FireNOCs - - - topic: save-firenoc-legacyIndex + - name: firenoc-services + type: general + id: $.id,$.tenantId + isBulk: true + jsonPath: $.FireNOCs + timeStampField: $.auditDetails.lastModifiedTime + customJsonMapping: + indexMapping: {"Data":{"channel":"","id":"","tenantId":"","fireNOCDetails":{"status":"","action":"","firestationId":"","applicationNumber":"","fireNOCType":"","buildings":[],"propertyDetails":{},"additionalDetail":{},"applicantDetails":{}},"auditDetails":{},"@timestamp":"timestamp"}} + fieldMapping: + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.fireNOCDetails.channel + outJsonPath: $.Data.channel + - inJsonPath: $.fireNOCDetails.status + outJsonPath: $.Data.fireNOCDetails.status + - inJsonPath: $.fireNOCDetails.action + outJsonPath: $.Data.fireNOCDetails.action + - inJsonPath: $.fireNOCDetails.fireNOCType + outJsonPath: $.Data.fireNOCDetails.fireNOCType + - inJsonPath: $.fireNOCDetails.buildings + outJsonPath: $.Data.fireNOCDetails.buildings + - inJsonPath: $.fireNOCDetails.applicationNumber + outJsonPath: $.Data.fireNOCDetails.applicationNumber + - inJsonPath: $.fireNOCDetails.buildings + outJsonPath: $.Data.fireNOCDetails.buildings + - inJsonPath: $.fireNOCDetails.propertyDetails + outJsonPath: $.Data.fireNOCDetails.propertyDetails + - inJsonPath: $.fireNOCDetails.additionalDetail + outJsonPath: $.Data.fireNOCDetails.additionalDetail + - inJsonPath: $.fireNOCDetails.applicantDetails + outJsonPath: $.Data.fireNOCDetails.applicantDetails + - inJsonPath: $.fireNOCDetails.firestationId + outJsonPath: $.Data.fireNOCDetails.firestationId + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + externalUriMapping: + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.fireNOCDetails.applicationNumber,history=true,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history + - path: http://egov-localization.egov:8080/localization/messages/v1/_search + queryParam: locale=en_IN,tenantId=$.tenantId,codes=$.fireNOCDetails.firestationId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.messages[0].message + outJsonPath: $.Data.Department + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.fireNOCDetails.propertyDetails.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + mdmsMapping: + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData + + topic: save-firenoc-legacyIndex configKey: INDEX indexes: - - name: firenoc-index - type: FireNOCs - id: $.id, $.tenantId - isBulk: true - timeStampField: $.auditDetails.createdTime - jsonPath: $.FireNOCs + - name: firenoc-services + type: general + id: $.id,$.tenantId + isBulk: true + jsonPath: $.FireNOCs + timeStampField: $.auditDetails.lastModifiedTime + customJsonMapping: + indexMapping: {"Data":{"channel":"","id":"","tenantId":"","fireNOCDetails":{"status":"","action":"","firestationId":"","applicationNumber":"","fireNOCType":"","buildings":[],"propertyDetails":{},"additionalDetail":{},"applicantDetails":{}},"auditDetails":{},"@timestamp":"timestamp"}} + fieldMapping: + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.fireNOCDetails.channel + outJsonPath: $.Data.channel + - inJsonPath: $.fireNOCDetails.status + outJsonPath: $.Data.fireNOCDetails.status + - inJsonPath: $.fireNOCDetails.action + outJsonPath: $.Data.fireNOCDetails.action + - inJsonPath: $.fireNOCDetails.fireNOCType + outJsonPath: $.Data.fireNOCDetails.fireNOCType + - inJsonPath: $.fireNOCDetails.buildings + outJsonPath: $.Data.fireNOCDetails.buildings + - inJsonPath: $.fireNOCDetails.applicationNumber + outJsonPath: $.Data.fireNOCDetails.applicationNumber + - inJsonPath: $.fireNOCDetails.buildings + outJsonPath: $.Data.fireNOCDetails.buildings + - inJsonPath: $.fireNOCDetails.propertyDetails + outJsonPath: $.Data.fireNOCDetails.propertyDetails + - inJsonPath: $.fireNOCDetails.additionalDetail + outJsonPath: $.Data.fireNOCDetails.additionalDetail + - inJsonPath: $.fireNOCDetails.applicantDetails + outJsonPath: $.Data.fireNOCDetails.applicantDetails + - inJsonPath: $.fireNOCDetails.firestationId + outJsonPath: $.Data.fireNOCDetails.firestationId + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + externalUriMapping: + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.fireNOCDetails.applicationNumber,history=true,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history + - path: http://egov-localization.egov:8080/localization/messages/v1/_search + queryParam: locale=en_IN,tenantId=$.tenantId,codes=$.fireNOCDetails.firestationId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.messages[0].message + outJsonPath: $.Data.Department + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.fireNOCDetails.propertyDetails.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + mdmsMapping: + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData From e4d4c1abe6e90a85873609d6a2a759529312bdd4 Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Fri, 11 Mar 2022 15:26:40 +0530 Subject: [PATCH 0945/1242] Update type & name fore fireNoc --- .../egov-indexer/rainmaker-firenoc-indexer.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/configs/egov-indexer/rainmaker-firenoc-indexer.yml b/configs/egov-indexer/rainmaker-firenoc-indexer.yml index 1321b562..bc301a10 100644 --- a/configs/egov-indexer/rainmaker-firenoc-indexer.yml +++ b/configs/egov-indexer/rainmaker-firenoc-indexer.yml @@ -5,8 +5,8 @@ ServiceMaps: - topic: save-fn-firenoc configKey: INDEX indexes: - - name: firenoc-services - type: general + - name: firenoc-index + type: FireNOCs id: $.id,$.tenantId isBulk: true jsonPath: $.FireNOCs @@ -81,8 +81,8 @@ ServiceMaps: - topic: update-fn-firenoc configKey: INDEX indexes: - - name: firenoc-services - type: general + - name: firenoc-index + type: FireNOCs id: $.id,$.tenantId isBulk: true jsonPath: $.FireNOCs @@ -156,8 +156,8 @@ ServiceMaps: - topic: update-fn-workflow configKey: INDEX indexes: - - name: firenoc-services - type: general + - name: firenoc-index + type: FireNOCs id: $.id,$.tenantId isBulk: true jsonPath: $.FireNOCs @@ -231,8 +231,8 @@ ServiceMaps: topic: save-firenoc-legacyIndex configKey: INDEX indexes: - - name: firenoc-services - type: general + - name: firenoc-index + type: FireNOCs id: $.id,$.tenantId isBulk: true jsonPath: $.FireNOCs From b398b3177923a8d5c4e5a77ca6659a898b6a7602 Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Fri, 11 Mar 2022 16:06:55 +0530 Subject: [PATCH 0946/1242] Revert Changes for "rainmaker-firenoc-indexer.yml" --- .../rainmaker-firenoc-indexer.yml | 319 ++---------------- 1 file changed, 29 insertions(+), 290 deletions(-) diff --git a/configs/egov-indexer/rainmaker-firenoc-indexer.yml b/configs/egov-indexer/rainmaker-firenoc-indexer.yml index bc301a10..711039d5 100644 --- a/configs/egov-indexer/rainmaker-firenoc-indexer.yml +++ b/configs/egov-indexer/rainmaker-firenoc-indexer.yml @@ -1,304 +1,43 @@ ServiceMaps: - serviceName: Fire Noc Service - rainmaker + serviceName: Fire NOC version: 1.0.0 mappings: - topic: save-fn-firenoc configKey: INDEX indexes: - - name: firenoc-index - type: FireNOCs - id: $.id,$.tenantId - isBulk: true - jsonPath: $.FireNOCs - timeStampField: $.auditDetails.createdTime - customJsonMapping: - indexMapping: {"Data":{"channel":"","id":"","tenantId":"","fireNOCDetails":{"status":"","action":"","firestationId":"","applicationNumber":"","fireNOCType":"","buildings":[],"propertyDetails":{},"additionalDetail":{},"applicantDetails":{}},"auditDetails":{},"@timestamp":"timestamp"}} - fieldMapping: - - inJsonPath: $.id - outJsonPath: $.Data.id - - inJsonPath: $.tenantId - outJsonPath: $.Data.tenantId - - inJsonPath: $.fireNOCDetails.channel - outJsonPath: $.Data.channel - - inJsonPath: $.fireNOCDetails.status - outJsonPath: $.Data.fireNOCDetails.status - - inJsonPath: $.fireNOCDetails.action - outJsonPath: $.Data.fireNOCDetails.action - - inJsonPath: $.fireNOCDetails.fireNOCType - outJsonPath: $.Data.fireNOCDetails.fireNOCType - - inJsonPath: $.fireNOCDetails.buildings - outJsonPath: $.Data.fireNOCDetails.buildings - - inJsonPath: $.fireNOCDetails.applicationNumber - outJsonPath: $.Data.fireNOCDetails.applicationNumber - - inJsonPath: $.fireNOCDetails.buildings - outJsonPath: $.Data.fireNOCDetails.buildings - - inJsonPath: $.fireNOCDetails.propertyDetails - outJsonPath: $.Data.fireNOCDetails.propertyDetails - - inJsonPath: $.fireNOCDetails.additionalDetail - outJsonPath: $.Data.fireNOCDetails.additionalDetail - - inJsonPath: $.fireNOCDetails.applicantDetails - outJsonPath: $.Data.fireNOCDetails.applicantDetails - - inJsonPath: $.fireNOCDetails.firestationId - outJsonPath: $.Data.fireNOCDetails.firestationId - - inJsonPath: $.auditDetails - outJsonPath: $.Data.auditDetails - - inJsonPath: $.@timestamp - outJsonPath: $.Data.@timestamp - externalUriMapping: - - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search - queryParam: businessIds=$.fireNOCDetails.applicationNumber,history=true,tenantId=$.tenantId - apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} - uriResponseMapping: - - inJsonPath: $.ProcessInstances - outJsonPath: $.Data.history - - path: http://egov-localization.egov:8080/localization/messages/v1/_search - queryParam: locale=en_IN,tenantId=$.tenantId,codes=$.fireNOCDetails.firestationId - apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} - uriResponseMapping: - - inJsonPath: $.messages[0].message - outJsonPath: $.Data.Department - - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search - queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.fireNOCDetails.propertyDetails.address.locality.code,tenantId=$.tenantId - apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", - "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} - uriResponseMapping: - - inJsonPath: $.TenantBoundary[0].boundary[0] - outJsonPath: $.Data.ward - mdmsMapping: - - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search - moduleName: tenant - masterName: tenants - tenantId: pb - filter: "[?(@.code == $tenant)]" - filterMapping: - - variable: $tenant - valueJsonpath: $.tenantId - uriResponseMapping: - - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.Data.tenantData - - + - name: firenoc-index + type: FireNOCs + id: $.id, $.tenantId + isBulk: true + timeStampField: $.auditDetails.createdTime + jsonPath: $.FireNOCs + - topic: update-fn-firenoc configKey: INDEX indexes: - - name: firenoc-index - type: FireNOCs - id: $.id,$.tenantId - isBulk: true - jsonPath: $.FireNOCs - timeStampField: $.auditDetails.lastModifiedTime - customJsonMapping: - indexMapping: {"Data":{"channel":"","id":"","tenantId":"","fireNOCDetails":{"status":"","action":"","firestationId":"","applicationNumber":"","fireNOCType":"","buildings":[],"propertyDetails":{},"additionalDetail":{},"applicantDetails":{}},"auditDetails":{},"@timestamp":"timestamp"}} - fieldMapping: - - inJsonPath: $.id - outJsonPath: $.Data.id - - inJsonPath: $.tenantId - outJsonPath: $.Data.tenantId - - inJsonPath: $.fireNOCDetails.channel - outJsonPath: $.Data.channel - - inJsonPath: $.fireNOCDetails.status - outJsonPath: $.Data.fireNOCDetails.status - - inJsonPath: $.fireNOCDetails.action - outJsonPath: $.Data.fireNOCDetails.action - - inJsonPath: $.fireNOCDetails.fireNOCType - outJsonPath: $.Data.fireNOCDetails.fireNOCType - - inJsonPath: $.fireNOCDetails.buildings - outJsonPath: $.Data.fireNOCDetails.buildings - - inJsonPath: $.fireNOCDetails.applicationNumber - outJsonPath: $.Data.fireNOCDetails.applicationNumber - - inJsonPath: $.fireNOCDetails.buildings - outJsonPath: $.Data.fireNOCDetails.buildings - - inJsonPath: $.fireNOCDetails.propertyDetails - outJsonPath: $.Data.fireNOCDetails.propertyDetails - - inJsonPath: $.fireNOCDetails.additionalDetail - outJsonPath: $.Data.fireNOCDetails.additionalDetail - - inJsonPath: $.fireNOCDetails.applicantDetails - outJsonPath: $.Data.fireNOCDetails.applicantDetails - - inJsonPath: $.fireNOCDetails.firestationId - outJsonPath: $.Data.fireNOCDetails.firestationId - - inJsonPath: $.auditDetails - outJsonPath: $.Data.auditDetails - - inJsonPath: $.@timestamp - outJsonPath: $.Data.@timestamp - externalUriMapping: - - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search - queryParam: businessIds=$.fireNOCDetails.applicationNumber,history=true,tenantId=$.tenantId - apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} - uriResponseMapping: - - inJsonPath: $.ProcessInstances - outJsonPath: $.Data.history - - path: http://egov-localization.egov:8080/localization/messages/v1/_search - queryParam: locale=en_IN,tenantId=$.tenantId,codes=$.fireNOCDetails.firestationId - apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} - uriResponseMapping: - - inJsonPath: $.messages[0].message - outJsonPath: $.Data.Department - - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search - queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.fireNOCDetails.propertyDetails.address.locality.code,tenantId=$.tenantId - apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", - "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} - uriResponseMapping: - - inJsonPath: $.TenantBoundary[0].boundary[0] - outJsonPath: $.Data.ward - mdmsMapping: - - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search - moduleName: tenant - masterName: tenants - tenantId: pb - filter: "[?(@.code == $tenant)]" - filterMapping: - - variable: $tenant - valueJsonpath: $.tenantId - uriResponseMapping: - - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.Data.tenantData - + - name: firenoc-index + type: FireNOCs + id: $.id, $.tenantId + isBulk: true + timeStampField: $.auditDetails.createdTime + jsonPath: $.FireNOCs + - topic: update-fn-workflow configKey: INDEX indexes: - - name: firenoc-index - type: FireNOCs - id: $.id,$.tenantId - isBulk: true - jsonPath: $.FireNOCs - timeStampField: $.auditDetails.lastModifiedTime - customJsonMapping: - indexMapping: {"Data":{"channel":"","id":"","tenantId":"","fireNOCDetails":{"status":"","action":"","firestationId":"","applicationNumber":"","fireNOCType":"","buildings":[],"propertyDetails":{},"additionalDetail":{},"applicantDetails":{}},"auditDetails":{},"@timestamp":"timestamp"}} - fieldMapping: - - inJsonPath: $.id - outJsonPath: $.Data.id - - inJsonPath: $.tenantId - outJsonPath: $.Data.tenantId - - inJsonPath: $.fireNOCDetails.channel - outJsonPath: $.Data.channel - - inJsonPath: $.fireNOCDetails.status - outJsonPath: $.Data.fireNOCDetails.status - - inJsonPath: $.fireNOCDetails.action - outJsonPath: $.Data.fireNOCDetails.action - - inJsonPath: $.fireNOCDetails.fireNOCType - outJsonPath: $.Data.fireNOCDetails.fireNOCType - - inJsonPath: $.fireNOCDetails.buildings - outJsonPath: $.Data.fireNOCDetails.buildings - - inJsonPath: $.fireNOCDetails.applicationNumber - outJsonPath: $.Data.fireNOCDetails.applicationNumber - - inJsonPath: $.fireNOCDetails.buildings - outJsonPath: $.Data.fireNOCDetails.buildings - - inJsonPath: $.fireNOCDetails.propertyDetails - outJsonPath: $.Data.fireNOCDetails.propertyDetails - - inJsonPath: $.fireNOCDetails.additionalDetail - outJsonPath: $.Data.fireNOCDetails.additionalDetail - - inJsonPath: $.fireNOCDetails.applicantDetails - outJsonPath: $.Data.fireNOCDetails.applicantDetails - - inJsonPath: $.fireNOCDetails.firestationId - outJsonPath: $.Data.fireNOCDetails.firestationId - - inJsonPath: $.auditDetails - outJsonPath: $.Data.auditDetails - - inJsonPath: $.@timestamp - outJsonPath: $.Data.@timestamp - externalUriMapping: - - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search - queryParam: businessIds=$.fireNOCDetails.applicationNumber,history=true,tenantId=$.tenantId - apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} - uriResponseMapping: - - inJsonPath: $.ProcessInstances - outJsonPath: $.Data.history - - path: http://egov-localization.egov:8080/localization/messages/v1/_search - queryParam: locale=en_IN,tenantId=$.tenantId,codes=$.fireNOCDetails.firestationId - apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} - uriResponseMapping: - - inJsonPath: $.messages[0].message - outJsonPath: $.Data.Department - - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search - queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.fireNOCDetails.propertyDetails.address.locality.code,tenantId=$.tenantId - apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", - "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} - uriResponseMapping: - - inJsonPath: $.TenantBoundary[0].boundary[0] - outJsonPath: $.Data.ward - mdmsMapping: - - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search - moduleName: tenant - masterName: tenants - tenantId: pb - filter: "[?(@.code == $tenant)]" - filterMapping: - - variable: $tenant - valueJsonpath: $.tenantId - uriResponseMapping: - - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.Data.tenantData - - topic: save-firenoc-legacyIndex + - name: firenoc-index + type: FireNOCs + id: $.id, $.tenantId + isBulk: true + timeStampField: $.auditDetails.createdTime + jsonPath: $.FireNOCs + + - topic: save-firenoc-legacyIndex configKey: INDEX indexes: - - name: firenoc-index - type: FireNOCs - id: $.id,$.tenantId - isBulk: true - jsonPath: $.FireNOCs - timeStampField: $.auditDetails.lastModifiedTime - customJsonMapping: - indexMapping: {"Data":{"channel":"","id":"","tenantId":"","fireNOCDetails":{"status":"","action":"","firestationId":"","applicationNumber":"","fireNOCType":"","buildings":[],"propertyDetails":{},"additionalDetail":{},"applicantDetails":{}},"auditDetails":{},"@timestamp":"timestamp"}} - fieldMapping: - - inJsonPath: $.id - outJsonPath: $.Data.id - - inJsonPath: $.tenantId - outJsonPath: $.Data.tenantId - - inJsonPath: $.fireNOCDetails.channel - outJsonPath: $.Data.channel - - inJsonPath: $.fireNOCDetails.status - outJsonPath: $.Data.fireNOCDetails.status - - inJsonPath: $.fireNOCDetails.action - outJsonPath: $.Data.fireNOCDetails.action - - inJsonPath: $.fireNOCDetails.fireNOCType - outJsonPath: $.Data.fireNOCDetails.fireNOCType - - inJsonPath: $.fireNOCDetails.buildings - outJsonPath: $.Data.fireNOCDetails.buildings - - inJsonPath: $.fireNOCDetails.applicationNumber - outJsonPath: $.Data.fireNOCDetails.applicationNumber - - inJsonPath: $.fireNOCDetails.buildings - outJsonPath: $.Data.fireNOCDetails.buildings - - inJsonPath: $.fireNOCDetails.propertyDetails - outJsonPath: $.Data.fireNOCDetails.propertyDetails - - inJsonPath: $.fireNOCDetails.additionalDetail - outJsonPath: $.Data.fireNOCDetails.additionalDetail - - inJsonPath: $.fireNOCDetails.applicantDetails - outJsonPath: $.Data.fireNOCDetails.applicantDetails - - inJsonPath: $.fireNOCDetails.firestationId - outJsonPath: $.Data.fireNOCDetails.firestationId - - inJsonPath: $.auditDetails - outJsonPath: $.Data.auditDetails - - inJsonPath: $.@timestamp - outJsonPath: $.Data.@timestamp - externalUriMapping: - - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search - queryParam: businessIds=$.fireNOCDetails.applicationNumber,history=true,tenantId=$.tenantId - apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} - uriResponseMapping: - - inJsonPath: $.ProcessInstances - outJsonPath: $.Data.history - - path: http://egov-localization.egov:8080/localization/messages/v1/_search - queryParam: locale=en_IN,tenantId=$.tenantId,codes=$.fireNOCDetails.firestationId - apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} - uriResponseMapping: - - inJsonPath: $.messages[0].message - outJsonPath: $.Data.Department - - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search - queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.fireNOCDetails.propertyDetails.address.locality.code,tenantId=$.tenantId - apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", - "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} - uriResponseMapping: - - inJsonPath: $.TenantBoundary[0].boundary[0] - outJsonPath: $.Data.ward - mdmsMapping: - - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search - moduleName: tenant - masterName: tenants - tenantId: pb - filter: "[?(@.code == $tenant)]" - filterMapping: - - variable: $tenant - valueJsonpath: $.tenantId - uriResponseMapping: - - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.Data.tenantData + - name: firenoc-index + type: FireNOCs + id: $.id, $.tenantId + isBulk: true + timeStampField: $.auditDetails.createdTime + jsonPath: $.FireNOCs From 0544ac8460ad05130205bd942ff6028667eeee2f Mon Sep 17 00:00:00 2001 From: shiva-eGov <97941850+shiva-eGov@users.noreply.github.com> Date: Fri, 11 Mar 2022 17:33:48 +0530 Subject: [PATCH 0947/1242] Added ward , auditDetails details. Added ward , auditDetails details. --- configs/egov-indexer/water-service.yml | 133 ++++++++++++++++++++++++- 1 file changed, 128 insertions(+), 5 deletions(-) diff --git a/configs/egov-indexer/water-service.yml b/configs/egov-indexer/water-service.yml index c9573871..a83eb8ce 100644 --- a/configs/egov-indexer/water-service.yml +++ b/configs/egov-indexer/water-service.yml @@ -11,7 +11,7 @@ ServiceMaps: jsonPath: $.WaterConnection timeStampField: $.auditDetails.createdTime customJsonMapping: - indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","applicationStatus":"","status":"","connectionNo":"","oldConnectionNo":"","plumberInfo":[],"roadCuttingInfo":[],"connectionHolders":[],"roadType":"","roadCuttingArea":"","connectionExecutionDate":"","connectionCategory":"","connectionType":"","additionalDetails":{},"id":"","propertyId":"","rainWaterHarvesting":"","waterSource":"","tenantId":"","meterId":"","meterInstallationDate":"","proposedPipeSize":"","proposedTaps":"","pipeSize":"","noOfTaps":"","applicationType":"","dateEffectiveFrom":"","history":{}}} + indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","applicationStatus":"","status":"","connectionNo":"","oldConnectionNo":"","plumberInfo":[],"roadCuttingInfo":[],"connectionHolders":[],"roadType":"","roadCuttingArea":"","connectionExecutionDate":"","connectionCategory":"","connectionType":"","additionalDetails":{},"id":"","propertyId":"","propertyUsageType":"","rainWaterHarvesting":"","waterSource":"","tenantId":"","meterId":"","meterInstallationDate":"","proposedPipeSize":"","proposedTaps":"","pipeSize":"","noOfTaps":"","applicationType":"","dateEffectiveFrom":"","channel":"","@timestamp":"timestamp","auditDetails":{},"history":{}}} fieldMapping: - inJsonPath: $.applicationStatus.state outJsonPath: $.Data.workflow.state @@ -73,6 +73,12 @@ ServiceMaps: outJsonPath: $.Data.applicationType - inJsonPath: $.dateEffectiveFrom outJsonPath: $.Data.dateEffectiveFrom + - inJsonPath: $.channel + outJsonPath: $.Data.channel + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails externalUriMapping: - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search queryParam: businessIds=$.applicationNo,history=true,tenantId=$.tenantId @@ -80,6 +86,31 @@ ServiceMaps: uriResponseMapping: - inJsonPath: $.ProcessInstances outJsonPath: $.Data.history + - path: http://property-services.egov:8080/property-services/property/_search + queryParam: propertyIds=$.propertyId,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.Properties[0].usageCategory + outJsonPath: $.Data.propertyUsageType + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.additionalDetails.locality,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + mdmsMapping: + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData - topic: update-ws-connection @@ -91,7 +122,7 @@ ServiceMaps: jsonPath: $.WaterConnection timeStampField: $.auditDetails.lastModifiedTime customJsonMapping: - indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","applicationStatus":"","status":"","connectionNo":"","oldConnectionNo":"","plumberInfo":[],"roadCuttingInfo":[],"connectionHolders":[],"roadType":"","roadCuttingArea":"","connectionExecutionDate":"","connectionCategory":"","connectionType":"","additionalDetails":{},"id":"","propertyId":"","rainWaterHarvesting":"","waterSource":"","tenantId":"","meterId":"","meterInstallationDate":"","proposedPipeSize":"","proposedTaps":"","pipeSize":"","noOfTaps":"","applicationType":"","dateEffectiveFrom":"","history":{}}} + indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","applicationStatus":"","status":"","connectionNo":"","oldConnectionNo":"","plumberInfo":[],"roadCuttingInfo":[],"connectionHolders":[],"roadType":"","roadCuttingArea":"","connectionExecutionDate":"","connectionCategory":"","connectionType":"","additionalDetails":{},"id":"","propertyId":"","propertyUsageType":"","rainWaterHarvesting":"","waterSource":"","tenantId":"","meterId":"","meterInstallationDate":"","proposedPipeSize":"","proposedTaps":"","pipeSize":"","noOfTaps":"","applicationType":"","dateEffectiveFrom":"","channel":"","@timestamp":"timestamp","auditDetails":{},"history":{}}} fieldMapping: - inJsonPath: $.applicationStatus.state outJsonPath: $.Data.workflow.state @@ -153,6 +184,12 @@ ServiceMaps: outJsonPath: $.Data.applicationType - inJsonPath: $.dateEffectiveFrom outJsonPath: $.Data.dateEffectiveFrom + - inJsonPath: $.channel + outJsonPath: $.Data.channel + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails externalUriMapping: - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search queryParam: businessIds=$.applicationNo,history=true,tenantId=$.tenantId @@ -160,6 +197,31 @@ ServiceMaps: uriResponseMapping: - inJsonPath: $.ProcessInstances outJsonPath: $.Data.history + - path: http://property-services.egov:8080/property-services/property/_search + queryParam: propertyIds=$.propertyId,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.Properties[0].usageCategory + outJsonPath: $.Data.propertyUsageType + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.additionalDetails.locality,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + mdmsMapping: + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData - topic: update-ws-workflow configKey: INDEX @@ -170,7 +232,7 @@ ServiceMaps: jsonPath: $.WaterConnection timeStampField: $.auditDetails.lastModifiedTime customJsonMapping: - indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","applicationStatus":"","status":"","connectionNo":"","oldConnectionNo":"","plumberInfo":[],"roadCuttingInfo":[],"connectionHolders":[],"roadType":"","roadCuttingArea":"","connectionExecutionDate":"","connectionCategory":"","connectionType":"","additionalDetails":{},"id":"","propertyId":"","rainWaterHarvesting":"","waterSource":"","tenantId":"","meterId":"","meterInstallationDate":"","proposedPipeSize":"","proposedTaps":"","pipeSize":"","noOfTaps":"","applicationType":"","dateEffectiveFrom":"","history":{}}} + indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","applicationStatus":"","status":"","connectionNo":"","oldConnectionNo":"","plumberInfo":[],"roadCuttingInfo":[],"connectionHolders":[],"roadType":"","roadCuttingArea":"","connectionExecutionDate":"","connectionCategory":"","connectionType":"","additionalDetails":{},"id":"","propertyId":"","rainWaterHarvesting":"","waterSource":"","tenantId":"","meterId":"","meterInstallationDate":"","proposedPipeSize":"","proposedTaps":"","pipeSize":"","noOfTaps":"","applicationType":"","dateEffectiveFrom":"","channel":"","@timestamp":"timestamp","auditDetails":{},"history":{}}} fieldMapping: - inJsonPath: $.applicationStatus.state outJsonPath: $.Data.workflow.state @@ -232,6 +294,12 @@ ServiceMaps: outJsonPath: $.Data.applicationType - inJsonPath: $.dateEffectiveFrom outJsonPath: $.Data.dateEffectiveFrom + - inJsonPath: $.channel + outJsonPath: $.Data.channel + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails externalUriMapping: - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search queryParam: businessIds=$.applicationNo,history=true,tenantId=$.tenantId @@ -239,7 +307,31 @@ ServiceMaps: uriResponseMapping: - inJsonPath: $.ProcessInstances outJsonPath: $.Data.history - + - path: http://property-services.egov:8080/property-services/property/_search + queryParam: propertyIds=$.propertyId,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.Properties[0].usageCategory + outJsonPath: $.Data.propertyUsageType + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.additionalDetails.locality,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + mdmsMapping: + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData - topic: ws-services-legacyindex configKey: LEGACYINDEX indexes: @@ -250,7 +342,7 @@ ServiceMaps: jsonPath: $.WaterConnection timeStampField: $.auditDetails.createdTime customJsonMapping: - indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","applicationStatus":"","status":"","connectionNo":"","oldConnectionNo":"","plumberInfo":[],"roadCuttingInfo":[],"connectionHolders":[],"roadType":"","roadCuttingArea":"","connectionExecutionDate":"","connectionCategory":"","connectionType":"","additionalDetails":{},"id":"","propertyId":"","rainWaterHarvesting":"","waterSource":"","tenantId":"","meterId":"","meterInstallationDate":"","proposedPipeSize":"","proposedTaps":"","pipeSize":"","noOfTaps":"","applicationType":"","dateEffectiveFrom":"","history":{}}} + indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","applicationStatus":"","status":"","connectionNo":"","oldConnectionNo":"","plumberInfo":[],"roadCuttingInfo":[],"connectionHolders":[],"roadType":"","roadCuttingArea":"","connectionExecutionDate":"","connectionCategory":"","connectionType":"","additionalDetails":{},"id":"","propertyId":"","propertyUsageType":"","rainWaterHarvesting":"","waterSource":"","tenantId":"","meterId":"","meterInstallationDate":"","proposedPipeSize":"","proposedTaps":"","pipeSize":"","noOfTaps":"","applicationType":"","dateEffectiveFrom":"","channel":"","@timestamp":"timestamp","auditDetails":{},"history":{}}} fieldMapping: - inJsonPath: $.applicationStatus.state outJsonPath: $.Data.workflow.state @@ -312,6 +404,12 @@ ServiceMaps: outJsonPath: $.Data.applicationType - inJsonPath: $.dateEffectiveFrom outJsonPath: $.Data.dateEffectiveFrom + - inJsonPath: $.channel + outJsonPath: $.Data.channel + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails externalUriMapping: - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search queryParam: businessIds=$.applicationNo,history=true,tenantId=$.tenantId @@ -319,3 +417,28 @@ ServiceMaps: uriResponseMapping: - inJsonPath: $.ProcessInstances outJsonPath: $.Data.history + - path: http://property-services.egov:8080/property-services/property/_search + queryParam: propertyIds=$.propertyId,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.Properties[0].usageCategory + outJsonPath: $.Data.propertyUsageType + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.additionalDetails.locality,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + mdmsMapping: + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData From c9512683ed182dcae5677250eb0bc15ab1244c31 Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Fri, 11 Mar 2022 17:39:10 +0530 Subject: [PATCH 0948/1242] Update query for "licenseByLicenseType" --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index d8680c75..ff817bb2 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -229,7 +229,7 @@ "requestQueryMap": "{\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantData.code\", \"district\" : \"dataObject.tenantData.city.districtCode\"}", "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Trade Type\":{\"terms\":{\"field\":\"domainObject.tradeType.keyword\",\"size\":200},\"aggs\":{\"Amount Paid\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Trade Type\":{\"terms\":{\"field\":\"domainObject.tradelicense.tradeLicenseDetail.tradeUnits.tradeType.keyword\",\"size\":200},\"aggs\":{\"Amount Paid\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" } ], "chartType": "pie", From b9026acb74e5c9510a0a9a9d0ee24223c23b8e14 Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Fri, 11 Mar 2022 17:59:34 +0530 Subject: [PATCH 0949/1242] Update "rainmaker-firenoc-indexer.yml" --- .../rainmaker-firenoc-indexer.yml | 248 +++++++++++++++--- 1 file changed, 217 insertions(+), 31 deletions(-) diff --git a/configs/egov-indexer/rainmaker-firenoc-indexer.yml b/configs/egov-indexer/rainmaker-firenoc-indexer.yml index 711039d5..6fcb7c99 100644 --- a/configs/egov-indexer/rainmaker-firenoc-indexer.yml +++ b/configs/egov-indexer/rainmaker-firenoc-indexer.yml @@ -1,43 +1,229 @@ ServiceMaps: - serviceName: Fire NOC + serviceName: Fire Noc Service - rainmaker version: 1.0.0 mappings: - topic: save-fn-firenoc configKey: INDEX indexes: - - name: firenoc-index - type: FireNOCs - id: $.id, $.tenantId - isBulk: true - timeStampField: $.auditDetails.createdTime - jsonPath: $.FireNOCs - + - name: firenoc-services + type: general + id: $.id,$.tenantId + isBulk: true + jsonPath: $.FireNOCs + timeStampField: $.auditDetails.createdTime + customJsonMapping: + indexMapping: {"Data":{"channel":"","id":"","tenantId":"","fireNOCDetails":{"status":"","action":"","firestationId":"","applicationNumber":"","fireNOCType":"","buildings":[],"propertyDetails":{},"additionalDetail":{},"applicantDetails":{}},"auditDetails":{},"@timestamp":"timestamp"}} + fieldMapping: + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.fireNOCDetails.channel + outJsonPath: $.Data.channel + - inJsonPath: $.fireNOCDetails.status + outJsonPath: $.Data.fireNOCDetails.status + - inJsonPath: $.fireNOCDetails.action + outJsonPath: $.Data.fireNOCDetails.action + - inJsonPath: $.fireNOCDetails.fireNOCType + outJsonPath: $.Data.fireNOCDetails.fireNOCType + - inJsonPath: $.fireNOCDetails.buildings + outJsonPath: $.Data.fireNOCDetails.buildings + - inJsonPath: $.fireNOCDetails.applicationNumber + outJsonPath: $.Data.fireNOCDetails.applicationNumber + - inJsonPath: $.fireNOCDetails.buildings + outJsonPath: $.Data.fireNOCDetails.buildings + - inJsonPath: $.fireNOCDetails.propertyDetails + outJsonPath: $.Data.fireNOCDetails.propertyDetails + - inJsonPath: $.fireNOCDetails.additionalDetail + outJsonPath: $.Data.fireNOCDetails.additionalDetail + - inJsonPath: $.fireNOCDetails.applicantDetails + outJsonPath: $.Data.fireNOCDetails.applicantDetails + - inJsonPath: $.fireNOCDetails.firestationId + outJsonPath: $.Data.fireNOCDetails.firestationId + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + externalUriMapping: + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.fireNOCDetails.applicationNumber,history=true,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history + - path: http://egov-localization.egov:8080/localization/messages/v1/_search + queryParam: locale=en_IN,tenantId=$.tenantId,codes=$.fireNOCDetails.firestationId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.messages[0].message + outJsonPath: $.Data.Department + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.fireNOCDetails.propertyDetails.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + mdmsMapping: + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData + + - topic: update-fn-firenoc configKey: INDEX indexes: - - name: firenoc-index - type: FireNOCs - id: $.id, $.tenantId - isBulk: true - timeStampField: $.auditDetails.createdTime - jsonPath: $.FireNOCs - + - name: firenoc-services + type: general + id: $.id,$.tenantId + isBulk: true + jsonPath: $.FireNOCs + timeStampField: $.auditDetails.lastModifiedTime + customJsonMapping: + indexMapping: {"Data":{"channel":"","id":"","tenantId":"","fireNOCDetails":{"status":"","action":"","firestationId":"","applicationNumber":"","fireNOCType":"","buildings":[],"propertyDetails":{},"additionalDetail":{},"applicantDetails":{}},"auditDetails":{},"@timestamp":"timestamp"}} + fieldMapping: + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.fireNOCDetails.channel + outJsonPath: $.Data.channel + - inJsonPath: $.fireNOCDetails.status + outJsonPath: $.Data.fireNOCDetails.status + - inJsonPath: $.fireNOCDetails.action + outJsonPath: $.Data.fireNOCDetails.action + - inJsonPath: $.fireNOCDetails.fireNOCType + outJsonPath: $.Data.fireNOCDetails.fireNOCType + - inJsonPath: $.fireNOCDetails.buildings + outJsonPath: $.Data.fireNOCDetails.buildings + - inJsonPath: $.fireNOCDetails.applicationNumber + outJsonPath: $.Data.fireNOCDetails.applicationNumber + - inJsonPath: $.fireNOCDetails.buildings + outJsonPath: $.Data.fireNOCDetails.buildings + - inJsonPath: $.fireNOCDetails.propertyDetails + outJsonPath: $.Data.fireNOCDetails.propertyDetails + - inJsonPath: $.fireNOCDetails.additionalDetail + outJsonPath: $.Data.fireNOCDetails.additionalDetail + - inJsonPath: $.fireNOCDetails.applicantDetails + outJsonPath: $.Data.fireNOCDetails.applicantDetails + - inJsonPath: $.fireNOCDetails.firestationId + outJsonPath: $.Data.fireNOCDetails.firestationId + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + externalUriMapping: + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.fireNOCDetails.applicationNumber,history=true,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history + - path: http://egov-localization.egov:8080/localization/messages/v1/_search + queryParam: locale=en_IN,tenantId=$.tenantId,codes=$.fireNOCDetails.firestationId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.messages[0].message + outJsonPath: $.Data.Department + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.fireNOCDetails.propertyDetails.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + mdmsMapping: + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData + - topic: update-fn-workflow configKey: INDEX indexes: - - name: firenoc-index - type: FireNOCs - id: $.id, $.tenantId - isBulk: true - timeStampField: $.auditDetails.createdTime - jsonPath: $.FireNOCs - - - topic: save-firenoc-legacyIndex - configKey: INDEX - indexes: - - name: firenoc-index - type: FireNOCs - id: $.id, $.tenantId - isBulk: true - timeStampField: $.auditDetails.createdTime - jsonPath: $.FireNOCs + - name: firenoc-services + type: general + id: $.id,$.tenantId + isBulk: true + jsonPath: $.FireNOCs + timeStampField: $.auditDetails.lastModifiedTime + customJsonMapping: + indexMapping: {"Data":{"channel":"","id":"","tenantId":"","fireNOCDetails":{"status":"","action":"","firestationId":"","applicationNumber":"","fireNOCType":"","buildings":[],"propertyDetails":{},"additionalDetail":{},"applicantDetails":{}},"auditDetails":{},"@timestamp":"timestamp"}} + fieldMapping: + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.fireNOCDetails.channel + outJsonPath: $.Data.channel + - inJsonPath: $.fireNOCDetails.status + outJsonPath: $.Data.fireNOCDetails.status + - inJsonPath: $.fireNOCDetails.action + outJsonPath: $.Data.fireNOCDetails.action + - inJsonPath: $.fireNOCDetails.fireNOCType + outJsonPath: $.Data.fireNOCDetails.fireNOCType + - inJsonPath: $.fireNOCDetails.buildings + outJsonPath: $.Data.fireNOCDetails.buildings + - inJsonPath: $.fireNOCDetails.applicationNumber + outJsonPath: $.Data.fireNOCDetails.applicationNumber + - inJsonPath: $.fireNOCDetails.buildings + outJsonPath: $.Data.fireNOCDetails.buildings + - inJsonPath: $.fireNOCDetails.propertyDetails + outJsonPath: $.Data.fireNOCDetails.propertyDetails + - inJsonPath: $.fireNOCDetails.additionalDetail + outJsonPath: $.Data.fireNOCDetails.additionalDetail + - inJsonPath: $.fireNOCDetails.applicantDetails + outJsonPath: $.Data.fireNOCDetails.applicantDetails + - inJsonPath: $.fireNOCDetails.firestationId + outJsonPath: $.Data.fireNOCDetails.firestationId + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + externalUriMapping: + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.fireNOCDetails.applicationNumber,history=true,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history + - path: http://egov-localization.egov:8080/localization/messages/v1/_search + queryParam: locale=en_IN,tenantId=$.tenantId,codes=$.fireNOCDetails.firestationId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.messages[0].message + outJsonPath: $.Data.Department + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.fireNOCDetails.propertyDetails.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + mdmsMapping: + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData From 52ecb39269612c4597be990cdfd048df57918fce Mon Sep 17 00:00:00 2001 From: shiva-eGov <97941850+shiva-eGov@users.noreply.github.com> Date: Fri, 11 Mar 2022 19:03:07 +0530 Subject: [PATCH 0950/1242] Changes made for ward details Changes made for ward details --- configs/egov-indexer/sewerage-service.yml | 131 +++++++++++++++++++++- 1 file changed, 126 insertions(+), 5 deletions(-) diff --git a/configs/egov-indexer/sewerage-service.yml b/configs/egov-indexer/sewerage-service.yml index 9efa4243..a6d946fb 100644 --- a/configs/egov-indexer/sewerage-service.yml +++ b/configs/egov-indexer/sewerage-service.yml @@ -11,7 +11,7 @@ ServiceMaps: timeStampField: $.auditDetails.createdTime jsonPath: $.SewerageConnection customJsonMapping: - indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","applicationStatus":"","status":"","connectionNo":"","oldConnectionNo":"","plumberInfo":[],"roadCuttingInfo":[],"connectionHolders":[],"roadType":"","roadCuttingArea":"","connectionExecutionDate":"","connectionCategory":"","connectionType":"","additionalDetails":{},"id":"","propertyId":"","tenantId":"","proposedWaterClosets":"","proposedToilets":"","noOfWaterClosets":"","noOfToilets":"","applicationType":"","dateEffectiveFrom":"","history":{}}} + indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","applicationStatus":"","status":"","connectionNo":"","oldConnectionNo":"","plumberInfo":[],"roadCuttingInfo":[],"connectionHolders":[],"roadType":"","roadCuttingArea":"","connectionExecutionDate":"","connectionCategory":"","connectionType":"","additionalDetails":{},"auditDetails":{},"id":"","propertyId":"","propertyUsageType":"","tenantId":"","proposedWaterClosets":"","proposedToilets":"","noOfWaterClosets":"","noOfToilets":"","applicationType":"","dateEffectiveFrom":"","channel":"","history":{}}} fieldMapping: - inJsonPath: $.applicationStatus.state outJsonPath: $.Data.workflow.state @@ -65,6 +65,12 @@ ServiceMaps: outJsonPath: $.Data.applicationType - inJsonPath: $.dateEffectiveFrom outJsonPath: $.Data.dateEffectiveFrom + - inJsonPath: $.channel + outJsonPath: $.Data.channel + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails externalUriMapping: - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search queryParam: businessIds=$.applicationNo,history=true,tenantId=$.tenantId @@ -72,6 +78,31 @@ ServiceMaps: uriResponseMapping: - inJsonPath: $.ProcessInstances outJsonPath: $.Data.history + - path: http://property-services.egov:8080/property-services/property/_search + queryParam: propertyIds=$.propertyId,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.Properties[0].usageCategory + outJsonPath: $.Data.propertyUsageType + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.additionalDetails.locality,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + mdmsMapping: + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData - topic: update-sw-connection configKey: INDEX @@ -82,7 +113,7 @@ ServiceMaps: timeStampField: $.auditDetails.lastModifiedTime jsonPath: $.SewerageConnection customJsonMapping: - indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","applicationStatus":"","status":"","connectionNo":"","oldConnectionNo":"","plumberInfo":[],"roadCuttingInfo":[],"connectionHolders":[],"roadType":"","roadCuttingArea":"","connectionExecutionDate":"","connectionCategory":"","connectionType":"","additionalDetails":{},"id":"","propertyId":"","tenantId":"","proposedWaterClosets":"","proposedToilets":"","noOfWaterClosets":"","noOfToilets":"","applicationType":"","dateEffectiveFrom":"","history":{}}} + indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","applicationStatus":"","status":"","connectionNo":"","oldConnectionNo":"","plumberInfo":[],"roadCuttingInfo":[],"connectionHolders":[],"roadType":"","roadCuttingArea":"","connectionExecutionDate":"","connectionCategory":"","connectionType":"","additionalDetails":{},"auditDetails":{},"id":"","propertyId":"","propertyUsageType":"","tenantId":"","proposedWaterClosets":"","proposedToilets":"","noOfWaterClosets":"","noOfToilets":"","applicationType":"","dateEffectiveFrom":"","channel":"","@timestamp":"timestamp","history":{}}} fieldMapping: - inJsonPath: $.applicationStatus.state outJsonPath: $.Data.workflow.state @@ -136,6 +167,12 @@ ServiceMaps: outJsonPath: $.Data.applicationType - inJsonPath: $.dateEffectiveFrom outJsonPath: $.Data.dateEffectiveFrom + - inJsonPath: $.channel + outJsonPath: $.Data.channel + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails externalUriMapping: - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search queryParam: businessIds=$.applicationNo,history=true,tenantId=$.tenantId @@ -143,6 +180,31 @@ ServiceMaps: uriResponseMapping: - inJsonPath: $.ProcessInstances outJsonPath: $.Data.history + - path: http://property-services.egov:8080/property-services/property/_search + queryParam: propertyIds=$.propertyId,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.Properties[0].usageCategory + outJsonPath: $.Data.propertyUsageType + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.additionalDetails.locality,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + mdmsMapping: + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData - topic: update-sw-workflow @@ -154,7 +216,7 @@ ServiceMaps: timeStampField: $.auditDetails.lastModifiedTime jsonPath: $.SewerageConnection customJsonMapping: - indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","applicationStatus":"","status":"","connectionNo":"","oldConnectionNo":"","plumberInfo":[],"roadCuttingInfo":[],"connectionHolders":[],"roadType":"","roadCuttingArea":"","connectionExecutionDate":"","connectionCategory":"","connectionType":"","additionalDetails":{},"id":"","propertyId":"","tenantId":"","proposedWaterClosets":"","proposedToilets":"","noOfWaterClosets":"","noOfToilets":"","applicationType":"","dateEffectiveFrom":"","history":{}}} + indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","applicationStatus":"","status":"","connectionNo":"","oldConnectionNo":"","plumberInfo":[],"roadCuttingInfo":[],"connectionHolders":[],"roadType":"","roadCuttingArea":"","connectionExecutionDate":"","connectionCategory":"","connectionType":"","additionalDetails":{},"auditDetails":{},"id":"","propertyId":"","tenantId":"","proposedWaterClosets":"","proposedToilets":"","noOfWaterClosets":"","noOfToilets":"","applicationType":"","dateEffectiveFrom":"","channel":"","@timestamp":"timestamp","history":{}}} fieldMapping: - inJsonPath: $.applicationStatus.state outJsonPath: $.Data.workflow.state @@ -208,6 +270,10 @@ ServiceMaps: outJsonPath: $.Data.applicationType - inJsonPath: $.dateEffectiveFrom outJsonPath: $.Data.dateEffectiveFrom + - inJsonPath: $.channel + outJsonPath: $.Data.channel + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails externalUriMapping: - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search queryParam: businessIds=$.applicationNo,history=true,tenantId=$.tenantId @@ -215,7 +281,31 @@ ServiceMaps: uriResponseMapping: - inJsonPath: $.ProcessInstances outJsonPath: $.Data.history - + - path: http://property-services.egov:8080/property-services/property/_search + queryParam: propertyIds=$.propertyId,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.Properties[0].usageCategory + outJsonPath: $.Data.propertyUsageType + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.additionalDetails.locality,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + mdmsMapping: + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData - topic: sw-services-legacyindex configKey: LEGACYINDEX indexes: @@ -226,7 +316,7 @@ ServiceMaps: timeStampField: $.auditDetails.createdTime jsonPath: $.SewerageConnections customJsonMapping: - indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","applicationStatus":"","status":"","connectionNo":"","oldConnectionNo":"","plumberInfo":[],"roadCuttingInfo":[],"connectionHolders":[],"roadType":"","roadCuttingArea":"","connectionExecutionDate":"","connectionCategory":"","connectionType":"","additionalDetails":{},"id":"","propertyId":"","tenantId":"","proposedWaterClosets":"","proposedToilets":"","noOfWaterClosets":"","noOfToilets":"","applicationType":"","dateEffectiveFrom":"","history":{}}} + indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","applicationStatus":"","status":"","connectionNo":"","oldConnectionNo":"","plumberInfo":[],"roadCuttingInfo":[],"connectionHolders":[],"roadType":"","roadCuttingArea":"","connectionExecutionDate":"","connectionCategory":"","connectionType":"","additionalDetails":{},"auditDetails":{},"id":"","propertyId":"","propertyUsageType":"","tenantId":"","proposedWaterClosets":"","proposedToilets":"","noOfWaterClosets":"","noOfToilets":"","applicationType":"","dateEffectiveFrom":"","channel":"","history":{}}} fieldMapping: - inJsonPath: $.applicationStatus.state outJsonPath: $.Data.workflow.state @@ -280,6 +370,12 @@ ServiceMaps: outJsonPath: $.Data.applicationType - inJsonPath: $.dateEffectiveFrom outJsonPath: $.Data.dateEffectiveFrom + - inJsonPath: $.channel + outJsonPath: $.Data.channel + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails externalUriMapping: - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search queryParam: businessIds=$.applicationNo,history=true,tenantId=$.tenantId @@ -287,3 +383,28 @@ ServiceMaps: uriResponseMapping: - inJsonPath: $.ProcessInstances outJsonPath: $.Data.history + - path: http://property-services.egov:8080/property-services/property/_search + queryParam: propertyIds=$.propertyId,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.Properties[0].usageCategory + outJsonPath: $.Data.propertyUsageType + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.additionalDetails.locality,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + mdmsMapping: + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData From 4bec8c126e9ab76763dd2d4861735afa7ca259be Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Sat, 12 Mar 2022 15:29:19 +0530 Subject: [PATCH 0951/1242] Update "DSS_TOTAL_COLLECTION" in "totalCollection" --- .../dashboard-analytics/ChartApiConfig.json | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index ff817bb2..87f04b8a 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -17,6 +17,20 @@ "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\"}", "indexName": "dss-collection_v2", "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}],\"must\":[{\"term\":{\"dataObject.paymentDetails.businessService.keyword\":\"TL\"}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" + }, + { + "module": "WS", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\"}", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}],\"must\":[{\"term\":{\"dataObject.paymentDetails.businessService.keyword\":\"WS\"}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" + }, + { + "module": "SW", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\"}", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}],\"must\":[{\"term\":{\"dataObject.paymentDetails.businessService.keyword\":\"SW\"}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" } ], "chartType": "metric", From 5d78d5853e1363b635ec427abc32152f91324360 Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Sat, 12 Mar 2022 15:37:22 +0530 Subject: [PATCH 0952/1242] Update "DSS_TOTAL_COLLECTION" --- .../dashboard-analytics/ChartApiConfig.json | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 87f04b8a..ff817bb2 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -17,20 +17,6 @@ "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\"}", "indexName": "dss-collection_v2", "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}],\"must\":[{\"term\":{\"dataObject.paymentDetails.businessService.keyword\":\"TL\"}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" - }, - { - "module": "WS", - "dateRefField": "dataObject.paymentDetails.receiptDate", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\"}", - "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}],\"must\":[{\"term\":{\"dataObject.paymentDetails.businessService.keyword\":\"WS\"}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" - }, - { - "module": "SW", - "dateRefField": "dataObject.paymentDetails.receiptDate", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\"}", - "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}],\"must\":[{\"term\":{\"dataObject.paymentDetails.businessService.keyword\":\"SW\"}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" } ], "chartType": "metric", From abd7962bb9f2824e3db974a3c8d680258ed72c92 Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Sat, 12 Mar 2022 16:01:42 +0530 Subject: [PATCH 0953/1242] Update "DSS_TOTAL_COLLECTION" in "totalCollection" --- .../dashboard-analytics/ChartApiConfig.json | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index ff817bb2..77393d4c 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -17,6 +17,20 @@ "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\"}", "indexName": "dss-collection_v2", "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}],\"must\":[{\"term\":{\"dataObject.paymentDetails.businessService.keyword\":\"TL\"}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" + }, + { + "module": "WS", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\"}", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}],\"must\":[{\"term\":{\"dataObject.paymentDetails.businessService.keyword\":\"WS\"}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" + }, + { + "module": "SW", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\"}", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}],\"must\":[{\"term\":{\"dataObject.paymentDetails.businessService.keyword\":\"SW\"}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" } ], "chartType": "metric", From fdf3e404d92b68714afbf1da01ea594f5910bef4 Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Sat, 12 Mar 2022 23:24:17 +0530 Subject: [PATCH 0954/1242] Update "DSS_TOTAL_COLLECTION" --- .../dashboard-analytics/ChartApiConfig.json | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 77393d4c..ff817bb2 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -17,20 +17,6 @@ "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\"}", "indexName": "dss-collection_v2", "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}],\"must\":[{\"term\":{\"dataObject.paymentDetails.businessService.keyword\":\"TL\"}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" - }, - { - "module": "WS", - "dateRefField": "dataObject.paymentDetails.receiptDate", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\"}", - "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}],\"must\":[{\"term\":{\"dataObject.paymentDetails.businessService.keyword\":\"WS\"}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" - }, - { - "module": "SW", - "dateRefField": "dataObject.paymentDetails.receiptDate", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\"}", - "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}],\"must\":[{\"term\":{\"dataObject.paymentDetails.businessService.keyword\":\"SW\"}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" } ], "chartType": "metric", From cd407973d3a17820bfd424312403ab2f7a0c8e02 Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Sat, 12 Mar 2022 23:36:15 +0530 Subject: [PATCH 0955/1242] Update "DSS_TOTAL_APPLICATIONS:_DEPARTMENT_WISE" --- .../dashboard-analytics/ChartApiConfig.json | 7 ------- 1 file changed, 7 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index ff817bb2..e78e64b9 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -367,13 +367,6 @@ "totalApplicationDeptWise": { "chartName": "DSS_TOTAL_APPLICATIONS:_DEPARTMENT_WISE", "queries": [ - { - "module": "PT", - "dateRefField": "Data.@timestamp", - "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \r\n \"district\" : \"Data.tenantData.city.districtCode\", \r\n\"tenantId\" : \"Data.tenantId\" \r\n}", - "indexName": "property-services", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Property Tax\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}}" - }, { "module": "TL", "dateRefField": "Data.@timestamp", From f213df9206155fd56cbb65b9404c07298e147ce4 Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Sat, 12 Mar 2022 23:44:58 +0530 Subject: [PATCH 0956/1242] Upate "DSS_TOTAL_APPLICATIONS:_DEPARTMENT_WISE" --- .../dashboard-analytics/ChartApiConfig.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index e78e64b9..bbf02875 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -396,7 +396,9 @@ "drillChart": "none", "aggregationPaths": [ "Property Tax", - "Trade Licence" + "TL", + "WS", + "SW" ], "insight": { }, From a415c0efcb83e7375efdd12df2499057c450c828 Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Sat, 12 Mar 2022 23:57:20 +0530 Subject: [PATCH 0957/1242] Update "DSS_TOTAL_APPLICATIONS:_DEPARTMENT_WISE" --- .../dashboard-analytics/ChartApiConfig.json | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index bbf02875..c33e84db 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -367,7 +367,14 @@ "totalApplicationDeptWise": { "chartName": "DSS_TOTAL_APPLICATIONS:_DEPARTMENT_WISE", "queries": [ - { + { + "module": "PT", + "dateRefField": "Data.@timestamp", + "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \r\n \"district\" : \"Data.tenantData.city.districtCode\", \r\n\"tenantId\" : \"Data.tenantId\" \r\n}", + "indexName": "property-services", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Property Tax\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}}" + }, + { "module": "TL", "dateRefField": "Data.@timestamp", "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \r\n \"district\" : \"Data.tenantData.city.districtCode\", \r\n\"tenantId\" : \"Data.tenantId\" \r\n}", @@ -395,10 +402,10 @@ "documentType": "_doc", "drillChart": "none", "aggregationPaths": [ - "Property Tax", - "TL", - "WS", - "SW" + "Property Tax", + "Trade Licence", + "Water Service", + "Sewerage Service" ], "insight": { }, From f4748a5a9f658e1ff5102d6b68badca59511f76c Mon Sep 17 00:00:00 2001 From: shiva-eGov <97941850+shiva-eGov@users.noreply.github.com> Date: Sun, 13 Mar 2022 13:46:18 +0530 Subject: [PATCH 0958/1242] replaced the modulename from tenant to firenoc replaced the modulename from tenant to firenoc --- configs/egov-indexer/rainmaker-firenoc-indexer.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/egov-indexer/rainmaker-firenoc-indexer.yml b/configs/egov-indexer/rainmaker-firenoc-indexer.yml index 6fcb7c99..e987debe 100644 --- a/configs/egov-indexer/rainmaker-firenoc-indexer.yml +++ b/configs/egov-indexer/rainmaker-firenoc-indexer.yml @@ -66,7 +66,7 @@ ServiceMaps: outJsonPath: $.Data.ward mdmsMapping: - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search - moduleName: tenant + moduleName: firenoc masterName: tenants tenantId: pb filter: "[?(@.code == $tenant)]" @@ -142,7 +142,7 @@ ServiceMaps: outJsonPath: $.Data.ward mdmsMapping: - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search - moduleName: tenant + moduleName: firenoc masterName: tenants tenantId: pb filter: "[?(@.code == $tenant)]" @@ -217,7 +217,7 @@ ServiceMaps: outJsonPath: $.Data.ward mdmsMapping: - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search - moduleName: tenant + moduleName: firenoc masterName: tenants tenantId: pb filter: "[?(@.code == $tenant)]" From 8e32044937ab393dd9ef759ab52b189b3e4f1ed4 Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Sun, 13 Mar 2022 16:01:02 +0530 Subject: [PATCH 0959/1242] Update "licenseApplicationByStatus" --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index c33e84db..fe43ef8f 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -1712,7 +1712,7 @@ "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \"tenantId\" : \"Data.tenantData.code\", \"district\" : \"Data.tenantData.cityDistrictCode\"}", "dateRefField": "Data.tradelicense.issuedDate", "indexName": "tlindex-v1", - "aggrQueryBc": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tradelicense.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Status\":{\"terms\":{\"field\":\"Data.tradelicense.status.keyword\"},\"aggs\":{\"License Issued\":{\"value_count\":{\"field\":\"Data.tradelicense.status.keyword\"}}}}}}}}", + "aggrQueryBc": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tradelicense.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Status\":{\"terms\":{\"field\":\"Data.tradelicense.status.keyword\"},\"aggs\":{\"Status\":{\"value_count\":{\"field\":\"Data.tradelicense.status.keyword\"}}}}}}}}", "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tradelicense.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Status\":{\"terms\":{\"field\":\"Data.tradelicense.status.keyword\",\"size\":200},\"aggs\":{\"Status\":{\"value_count\":{\"field\":\"Data.tradelicense.applicationNumber.keyword\"}}}}}}}}" } ], From f4a786b639bb779d0241dd093372d92936012f44 Mon Sep 17 00:00:00 2001 From: shiva-eGov <97941850+shiva-eGov@users.noreply.github.com> Date: Mon, 14 Mar 2022 11:43:49 +0530 Subject: [PATCH 0960/1242] Added this file for ws for - NSS adapter --- .../dashboard-ingest/transform_sw_v1.json | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 configs/egov-dss-dashboards/dashboard-ingest/transform_sw_v1.json diff --git a/configs/egov-dss-dashboards/dashboard-ingest/transform_sw_v1.json b/configs/egov-dss-dashboards/dashboard-ingest/transform_sw_v1.json new file mode 100644 index 00000000..182bf44c --- /dev/null +++ b/configs/egov-dss-dashboards/dashboard-ingest/transform_sw_v1.json @@ -0,0 +1,17 @@ +[ + { + "operation": "shift", + "spec": { + "tenantId": "tenantId", + "propertyId": "propertyId", + "applicationNo": "applicationNo", + "additionalDetails": "additionalDetails", + "propertyUsageType": "propertyUsageType", + "applicationStatus":"applicationStatus", + "ward":"ward", + "connectionType":"connectionType", + "applicationType":"applicationType", + "channel":"channel" + } + } +] From 352f372f6c365b9b6f0a57623f4c9e1e6f53e22f Mon Sep 17 00:00:00 2001 From: shiva-eGov <97941850+shiva-eGov@users.noreply.github.com> Date: Mon, 14 Mar 2022 11:46:16 +0530 Subject: [PATCH 0961/1242] Added this file for sw one_time_fee transform_sw.one_time_fee_v1.json --- .../transform_sw.one_time_fee_v1.json | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 configs/egov-dss-dashboards/dashboard-ingest/transform_sw.one_time_fee_v1.json diff --git a/configs/egov-dss-dashboards/dashboard-ingest/transform_sw.one_time_fee_v1.json b/configs/egov-dss-dashboards/dashboard-ingest/transform_sw.one_time_fee_v1.json new file mode 100644 index 00000000..182bf44c --- /dev/null +++ b/configs/egov-dss-dashboards/dashboard-ingest/transform_sw.one_time_fee_v1.json @@ -0,0 +1,17 @@ +[ + { + "operation": "shift", + "spec": { + "tenantId": "tenantId", + "propertyId": "propertyId", + "applicationNo": "applicationNo", + "additionalDetails": "additionalDetails", + "propertyUsageType": "propertyUsageType", + "applicationStatus":"applicationStatus", + "ward":"ward", + "connectionType":"connectionType", + "applicationType":"applicationType", + "channel":"channel" + } + } +] From 59809b485fb85864cd298a4902cacb5b32517364 Mon Sep 17 00:00:00 2001 From: shiva-eGov <97941850+shiva-eGov@users.noreply.github.com> Date: Mon, 14 Mar 2022 11:47:55 +0530 Subject: [PATCH 0962/1242] Added this file to Water Service transform_ws_v1.json --- .../dashboard-ingest/transform_ws_v1.json | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 configs/egov-dss-dashboards/dashboard-ingest/transform_ws_v1.json diff --git a/configs/egov-dss-dashboards/dashboard-ingest/transform_ws_v1.json b/configs/egov-dss-dashboards/dashboard-ingest/transform_ws_v1.json new file mode 100644 index 00000000..182bf44c --- /dev/null +++ b/configs/egov-dss-dashboards/dashboard-ingest/transform_ws_v1.json @@ -0,0 +1,17 @@ +[ + { + "operation": "shift", + "spec": { + "tenantId": "tenantId", + "propertyId": "propertyId", + "applicationNo": "applicationNo", + "additionalDetails": "additionalDetails", + "propertyUsageType": "propertyUsageType", + "applicationStatus":"applicationStatus", + "ward":"ward", + "connectionType":"connectionType", + "applicationType":"applicationType", + "channel":"channel" + } + } +] From fae288a05e8e3c1bb40c56dd2e3675fe8672f11d Mon Sep 17 00:00:00 2001 From: shiva-eGov <97941850+shiva-eGov@users.noreply.github.com> Date: Mon, 14 Mar 2022 11:49:49 +0530 Subject: [PATCH 0963/1242] Added this file for ws one_time_fee_v1.json transform_ws.one_time_fee_v1.json --- .../transform_ws.one_time_fee_v1.json | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 configs/egov-dss-dashboards/dashboard-ingest/transform_ws.one_time_fee_v1.json diff --git a/configs/egov-dss-dashboards/dashboard-ingest/transform_ws.one_time_fee_v1.json b/configs/egov-dss-dashboards/dashboard-ingest/transform_ws.one_time_fee_v1.json new file mode 100644 index 00000000..182bf44c --- /dev/null +++ b/configs/egov-dss-dashboards/dashboard-ingest/transform_ws.one_time_fee_v1.json @@ -0,0 +1,17 @@ +[ + { + "operation": "shift", + "spec": { + "tenantId": "tenantId", + "propertyId": "propertyId", + "applicationNo": "applicationNo", + "additionalDetails": "additionalDetails", + "propertyUsageType": "propertyUsageType", + "applicationStatus":"applicationStatus", + "ward":"ward", + "connectionType":"connectionType", + "applicationType":"applicationType", + "channel":"channel" + } + } +] From 3c8672bc4b3ef475a9fee5849d6d494141f29f2f Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Mon, 14 Mar 2022 12:06:37 +0530 Subject: [PATCH 0964/1242] Update moduleName to "tenant" --- configs/egov-indexer/rainmaker-firenoc-indexer.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/egov-indexer/rainmaker-firenoc-indexer.yml b/configs/egov-indexer/rainmaker-firenoc-indexer.yml index e987debe..6fcb7c99 100644 --- a/configs/egov-indexer/rainmaker-firenoc-indexer.yml +++ b/configs/egov-indexer/rainmaker-firenoc-indexer.yml @@ -66,7 +66,7 @@ ServiceMaps: outJsonPath: $.Data.ward mdmsMapping: - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search - moduleName: firenoc + moduleName: tenant masterName: tenants tenantId: pb filter: "[?(@.code == $tenant)]" @@ -142,7 +142,7 @@ ServiceMaps: outJsonPath: $.Data.ward mdmsMapping: - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search - moduleName: firenoc + moduleName: tenant masterName: tenants tenantId: pb filter: "[?(@.code == $tenant)]" @@ -217,7 +217,7 @@ ServiceMaps: outJsonPath: $.Data.ward mdmsMapping: - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search - moduleName: firenoc + moduleName: tenant masterName: tenants tenantId: pb filter: "[?(@.code == $tenant)]" From 62c3a5396b52a02f58db594dfebff800e0113383 Mon Sep 17 00:00:00 2001 From: shiva-eGov <97941850+shiva-eGov@users.noreply.github.com> Date: Mon, 14 Mar 2022 12:22:53 +0530 Subject: [PATCH 0965/1242] Added the SW and WS domains Added the SW and WS domains --- .../dashboard-ingest/DomainConfig.json | 108 ++++++++++++++++++ 1 file changed, 108 insertions(+) diff --git a/configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json b/configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json index 57177632..e54671e0 100644 --- a/configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json +++ b/configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json @@ -106,6 +106,114 @@ "expression": "applicationNumber" } ] + }, + { + "id": "4", + "domain": "WS.ONE_TIME_FEE", + "indexName": "water-services", + "documentType": "", + "query": "{\"query\":{\"bool\":{\"must\":[{\"match_phrase\":{\"Data.applicationNo\":\"value\"}}]}}}", + "targetReferences": [ + { + "fieldName": "applicationNo", + "argument": "Data.applicationNo", + "dataType": "String", + "value": "$value", + "seperator": " ", + "expression": "applicationNo" + } + ], + "sourceReferences": [ + { + "fieldName": "consumerCode", + "argument": "paymentDetails.bill.consumerCode", + "dataType": "String", + "value": "$value", + "seperator": " ", + "expression": "applicationNo" + } + ] + }, + { + "id": "6", + "domain": "WS", + "indexName": "water-services", + "documentType": "", + "query": "{\"query\":{\"bool\":{\"must\":[{\"match_phrase\":{\"Data.applicationNo\":\"value\"}}]}}}", + "targetReferences": [ + { + "fieldName": "applicationNo", + "argument": "Data.applicationNo", + "dataType": "String", + "value": "$value", + "seperator": " ", + "expression": "applicationNo" + } + ], + "sourceReferences": [ + { + "fieldName": "consumerCode", + "argument": "paymentDetails.bill.consumerCode", + "dataType": "String", + "value": "$value", + "seperator": " ", + "expression": "applicationNo" + } + ] + }, + { + "id": "7", + "domain": "SW.ONE_TIME_FEE", + "indexName": "sewerage-services", + "documentType": "", + "query": "{\"query\":{\"bool\":{\"must\":[{\"match_phrase\":{\"Data.applicationNo\":\"value\"}}]}}}", + "targetReferences": [ + { + "fieldName": "applicationNo", + "argument": "Data.applicationNo", + "dataType": "String", + "value": "$value", + "seperator": " ", + "expression": "applicationNo" + } + ], + "sourceReferences": [ + { + "fieldName": "consumerCode", + "argument": "paymentDetails.bill.consumerCode", + "dataType": "String", + "value": "$value", + "seperator": " ", + "expression": "applicationNo" + } + ] + }, + { + "id": "8", + "domain": "SW", + "indexName": "sewerage-services", + "documentType": "", + "query": "{\"query\":{\"bool\":{\"must\":[{\"match_phrase\":{\"Data.applicationNo\":\"value\"}}]}}}", + "targetReferences": [ + { + "fieldName": "applicationNo", + "argument": "Data.applicationNo", + "dataType": "String", + "value": "$value", + "seperator": " ", + "expression": "applicationNo" + } + ], + "sourceReferences": [ + { + "fieldName": "consumerCode", + "argument": "paymentDetails.bill.consumerCode", + "dataType": "String", + "value": "$value", + "seperator": " ", + "expression": "applicationNo" + } + ] } ] } From f8447e7df39b83d4b0043b97f3d375db301ff182 Mon Sep 17 00:00:00 2001 From: shiva-eGov <97941850+shiva-eGov@users.noreply.github.com> Date: Mon, 14 Mar 2022 12:24:15 +0530 Subject: [PATCH 0966/1242] changes the Id of "domain": "WS.ONE_TIME_FEE", --- configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json b/configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json index e54671e0..0b829b3f 100644 --- a/configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json +++ b/configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json @@ -108,7 +108,7 @@ ] }, { - "id": "4", + "id": "5", "domain": "WS.ONE_TIME_FEE", "indexName": "water-services", "documentType": "", From e815918f16412aac883492cfe5ba86d420d426fb Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Mon, 14 Mar 2022 13:14:56 +0530 Subject: [PATCH 0967/1242] Update "rainmaker-firenoc-indexer.yml" --- .../rainmaker-firenoc-indexer.yml | 120 +++++++++--------- 1 file changed, 60 insertions(+), 60 deletions(-) diff --git a/configs/egov-indexer/rainmaker-firenoc-indexer.yml b/configs/egov-indexer/rainmaker-firenoc-indexer.yml index 6fcb7c99..f71ec04a 100644 --- a/configs/egov-indexer/rainmaker-firenoc-indexer.yml +++ b/configs/egov-indexer/rainmaker-firenoc-indexer.yml @@ -6,7 +6,7 @@ ServiceMaps: configKey: INDEX indexes: - name: firenoc-services - type: general + type: FireNOCs id: $.id,$.tenantId isBulk: true jsonPath: $.FireNOCs @@ -15,55 +15,55 @@ ServiceMaps: indexMapping: {"Data":{"channel":"","id":"","tenantId":"","fireNOCDetails":{"status":"","action":"","firestationId":"","applicationNumber":"","fireNOCType":"","buildings":[],"propertyDetails":{},"additionalDetail":{},"applicantDetails":{}},"auditDetails":{},"@timestamp":"timestamp"}} fieldMapping: - inJsonPath: $.id - outJsonPath: $.Data.id + outJsonPath: $.id - inJsonPath: $.tenantId - outJsonPath: $.Data.tenantId + outJsonPath: $.tenantId - inJsonPath: $.fireNOCDetails.channel - outJsonPath: $.Data.channel + outJsonPath: $.channel - inJsonPath: $.fireNOCDetails.status - outJsonPath: $.Data.fireNOCDetails.status + outJsonPath: $.fireNOCDetails.status - inJsonPath: $.fireNOCDetails.action - outJsonPath: $.Data.fireNOCDetails.action + outJsonPath: $.fireNOCDetails.action - inJsonPath: $.fireNOCDetails.fireNOCType - outJsonPath: $.Data.fireNOCDetails.fireNOCType + outJsonPath: $.fireNOCDetails.fireNOCType - inJsonPath: $.fireNOCDetails.buildings - outJsonPath: $.Data.fireNOCDetails.buildings + outJsonPath: $.fireNOCDetails.buildings - inJsonPath: $.fireNOCDetails.applicationNumber - outJsonPath: $.Data.fireNOCDetails.applicationNumber + outJsonPath: $.fireNOCDetails.applicationNumber - inJsonPath: $.fireNOCDetails.buildings - outJsonPath: $.Data.fireNOCDetails.buildings + outJsonPath: $.fireNOCDetails.buildings - inJsonPath: $.fireNOCDetails.propertyDetails - outJsonPath: $.Data.fireNOCDetails.propertyDetails + outJsonPath: $.fireNOCDetails.propertyDetails - inJsonPath: $.fireNOCDetails.additionalDetail - outJsonPath: $.Data.fireNOCDetails.additionalDetail + outJsonPath: $.fireNOCDetails.additionalDetail - inJsonPath: $.fireNOCDetails.applicantDetails - outJsonPath: $.Data.fireNOCDetails.applicantDetails + outJsonPath: $.fireNOCDetails.applicantDetails - inJsonPath: $.fireNOCDetails.firestationId - outJsonPath: $.Data.fireNOCDetails.firestationId + outJsonPath: $.fireNOCDetails.firestationId - inJsonPath: $.auditDetails - outJsonPath: $.Data.auditDetails + outJsonPath: $.auditDetails - inJsonPath: $.@timestamp - outJsonPath: $.Data.@timestamp + outJsonPath: $.@timestamp externalUriMapping: - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search queryParam: businessIds=$.fireNOCDetails.applicationNumber,history=true,tenantId=$.tenantId apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} uriResponseMapping: - inJsonPath: $.ProcessInstances - outJsonPath: $.Data.history + outJsonPath: $.history - path: http://egov-localization.egov:8080/localization/messages/v1/_search queryParam: locale=en_IN,tenantId=$.tenantId,codes=$.fireNOCDetails.firestationId apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} uriResponseMapping: - inJsonPath: $.messages[0].message - outJsonPath: $.Data.Department + outJsonPath: $.Department - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.fireNOCDetails.propertyDetails.address.locality.code,tenantId=$.tenantId apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} uriResponseMapping: - inJsonPath: $.TenantBoundary[0].boundary[0] - outJsonPath: $.Data.ward + outJsonPath: $.ward mdmsMapping: - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search moduleName: tenant @@ -75,14 +75,14 @@ ServiceMaps: valueJsonpath: $.tenantId uriResponseMapping: - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.Data.tenantData + outJsonPath: $.tenantData - topic: update-fn-firenoc configKey: INDEX indexes: - name: firenoc-services - type: general + type: FireNOCs id: $.id,$.tenantId isBulk: true jsonPath: $.FireNOCs @@ -91,55 +91,55 @@ ServiceMaps: indexMapping: {"Data":{"channel":"","id":"","tenantId":"","fireNOCDetails":{"status":"","action":"","firestationId":"","applicationNumber":"","fireNOCType":"","buildings":[],"propertyDetails":{},"additionalDetail":{},"applicantDetails":{}},"auditDetails":{},"@timestamp":"timestamp"}} fieldMapping: - inJsonPath: $.id - outJsonPath: $.Data.id + outJsonPath: $.id - inJsonPath: $.tenantId - outJsonPath: $.Data.tenantId + outJsonPath: $.tenantId - inJsonPath: $.fireNOCDetails.channel - outJsonPath: $.Data.channel + outJsonPath: $.channel - inJsonPath: $.fireNOCDetails.status - outJsonPath: $.Data.fireNOCDetails.status + outJsonPath: $.fireNOCDetails.status - inJsonPath: $.fireNOCDetails.action - outJsonPath: $.Data.fireNOCDetails.action + outJsonPath: $.fireNOCDetails.action - inJsonPath: $.fireNOCDetails.fireNOCType - outJsonPath: $.Data.fireNOCDetails.fireNOCType + outJsonPath: $.fireNOCDetails.fireNOCType - inJsonPath: $.fireNOCDetails.buildings - outJsonPath: $.Data.fireNOCDetails.buildings + outJsonPath: $.fireNOCDetails.buildings - inJsonPath: $.fireNOCDetails.applicationNumber - outJsonPath: $.Data.fireNOCDetails.applicationNumber + outJsonPath: $.fireNOCDetails.applicationNumber - inJsonPath: $.fireNOCDetails.buildings - outJsonPath: $.Data.fireNOCDetails.buildings + outJsonPath: $.fireNOCDetails.buildings - inJsonPath: $.fireNOCDetails.propertyDetails - outJsonPath: $.Data.fireNOCDetails.propertyDetails + outJsonPath: $.fireNOCDetails.propertyDetails - inJsonPath: $.fireNOCDetails.additionalDetail - outJsonPath: $.Data.fireNOCDetails.additionalDetail + outJsonPath: $.fireNOCDetails.additionalDetail - inJsonPath: $.fireNOCDetails.applicantDetails - outJsonPath: $.Data.fireNOCDetails.applicantDetails + outJsonPath: $.fireNOCDetails.applicantDetails - inJsonPath: $.fireNOCDetails.firestationId - outJsonPath: $.Data.fireNOCDetails.firestationId + outJsonPath: $.fireNOCDetails.firestationId - inJsonPath: $.auditDetails - outJsonPath: $.Data.auditDetails + outJsonPath: $.auditDetails - inJsonPath: $.@timestamp - outJsonPath: $.Data.@timestamp + outJsonPath: $.@timestamp externalUriMapping: - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search queryParam: businessIds=$.fireNOCDetails.applicationNumber,history=true,tenantId=$.tenantId apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} uriResponseMapping: - inJsonPath: $.ProcessInstances - outJsonPath: $.Data.history + outJsonPath: $.history - path: http://egov-localization.egov:8080/localization/messages/v1/_search queryParam: locale=en_IN,tenantId=$.tenantId,codes=$.fireNOCDetails.firestationId apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} uriResponseMapping: - inJsonPath: $.messages[0].message - outJsonPath: $.Data.Department + outJsonPath: $.Department - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.fireNOCDetails.propertyDetails.address.locality.code,tenantId=$.tenantId apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} uriResponseMapping: - inJsonPath: $.TenantBoundary[0].boundary[0] - outJsonPath: $.Data.ward + outJsonPath: $.ward mdmsMapping: - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search moduleName: tenant @@ -151,13 +151,13 @@ ServiceMaps: valueJsonpath: $.tenantId uriResponseMapping: - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.Data.tenantData + outJsonPath: $.tenantData - topic: update-fn-workflow configKey: INDEX indexes: - name: firenoc-services - type: general + type: FireNOCs id: $.id,$.tenantId isBulk: true jsonPath: $.FireNOCs @@ -166,55 +166,55 @@ ServiceMaps: indexMapping: {"Data":{"channel":"","id":"","tenantId":"","fireNOCDetails":{"status":"","action":"","firestationId":"","applicationNumber":"","fireNOCType":"","buildings":[],"propertyDetails":{},"additionalDetail":{},"applicantDetails":{}},"auditDetails":{},"@timestamp":"timestamp"}} fieldMapping: - inJsonPath: $.id - outJsonPath: $.Data.id + outJsonPath: $.id - inJsonPath: $.tenantId - outJsonPath: $.Data.tenantId + outJsonPath: $.tenantId - inJsonPath: $.fireNOCDetails.channel - outJsonPath: $.Data.channel + outJsonPath: $.channel - inJsonPath: $.fireNOCDetails.status - outJsonPath: $.Data.fireNOCDetails.status + outJsonPath: $.fireNOCDetails.status - inJsonPath: $.fireNOCDetails.action - outJsonPath: $.Data.fireNOCDetails.action + outJsonPath: $.fireNOCDetails.action - inJsonPath: $.fireNOCDetails.fireNOCType - outJsonPath: $.Data.fireNOCDetails.fireNOCType + outJsonPath: $.fireNOCDetails.fireNOCType - inJsonPath: $.fireNOCDetails.buildings - outJsonPath: $.Data.fireNOCDetails.buildings + outJsonPath: $.fireNOCDetails.buildings - inJsonPath: $.fireNOCDetails.applicationNumber - outJsonPath: $.Data.fireNOCDetails.applicationNumber + outJsonPath: $.fireNOCDetails.applicationNumber - inJsonPath: $.fireNOCDetails.buildings - outJsonPath: $.Data.fireNOCDetails.buildings + outJsonPath: $.fireNOCDetails.buildings - inJsonPath: $.fireNOCDetails.propertyDetails - outJsonPath: $.Data.fireNOCDetails.propertyDetails + outJsonPath: $.fireNOCDetails.propertyDetails - inJsonPath: $.fireNOCDetails.additionalDetail - outJsonPath: $.Data.fireNOCDetails.additionalDetail + outJsonPath: $.fireNOCDetails.additionalDetail - inJsonPath: $.fireNOCDetails.applicantDetails - outJsonPath: $.Data.fireNOCDetails.applicantDetails + outJsonPath: $.fireNOCDetails.applicantDetails - inJsonPath: $.fireNOCDetails.firestationId - outJsonPath: $.Data.fireNOCDetails.firestationId + outJsonPath: $.fireNOCDetails.firestationId - inJsonPath: $.auditDetails - outJsonPath: $.Data.auditDetails + outJsonPath: $.auditDetails - inJsonPath: $.@timestamp - outJsonPath: $.Data.@timestamp + outJsonPath: $.@timestamp externalUriMapping: - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search queryParam: businessIds=$.fireNOCDetails.applicationNumber,history=true,tenantId=$.tenantId apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} uriResponseMapping: - inJsonPath: $.ProcessInstances - outJsonPath: $.Data.history + outJsonPath: $.history - path: http://egov-localization.egov:8080/localization/messages/v1/_search queryParam: locale=en_IN,tenantId=$.tenantId,codes=$.fireNOCDetails.firestationId apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} uriResponseMapping: - inJsonPath: $.messages[0].message - outJsonPath: $.Data.Department + outJsonPath: $.Department - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.fireNOCDetails.propertyDetails.address.locality.code,tenantId=$.tenantId apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} uriResponseMapping: - inJsonPath: $.TenantBoundary[0].boundary[0] - outJsonPath: $.Data.ward + outJsonPath: $.ward mdmsMapping: - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search moduleName: tenant @@ -226,4 +226,4 @@ ServiceMaps: valueJsonpath: $.tenantId uriResponseMapping: - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.Data.tenantData + outJsonPath: $.tenantData From 3c405d74e5b4703056206b026a88a80b980e9b24 Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Mon, 14 Mar 2022 13:34:46 +0530 Subject: [PATCH 0968/1242] Update indexName for fireNOC --- configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json b/configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json index 0b829b3f..983018e1 100644 --- a/configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json +++ b/configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json @@ -83,7 +83,7 @@ { "id": "4", "domain": "FireNOCs", - "indexName": "firenoc-index", + "indexName": "firenoc-services", "documentType": "", "query": "{\"query\":{\"bool\":{\"must\":[{\"match_phrase\":{\"fireNOCDetails.applicationNumber\":\"value\"}}]}}}}", "targetReferences": [ From 2383dba72cc1044ab408ab8bdefaae6dc6bda227 Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Mon, 14 Mar 2022 16:21:17 +0530 Subject: [PATCH 0969/1242] Update "rainmaker-firenoc-indexer.yml" --- configs/egov-indexer/rainmaker-firenoc-indexer.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/configs/egov-indexer/rainmaker-firenoc-indexer.yml b/configs/egov-indexer/rainmaker-firenoc-indexer.yml index f71ec04a..497d432d 100644 --- a/configs/egov-indexer/rainmaker-firenoc-indexer.yml +++ b/configs/egov-indexer/rainmaker-firenoc-indexer.yml @@ -18,8 +18,8 @@ ServiceMaps: outJsonPath: $.id - inJsonPath: $.tenantId outJsonPath: $.tenantId - - inJsonPath: $.fireNOCDetails.channel - outJsonPath: $.channel + - inJsonPath: $.fireNOCDetails + outJsonPath: $.fireNOCDetails - inJsonPath: $.fireNOCDetails.status outJsonPath: $.fireNOCDetails.status - inJsonPath: $.fireNOCDetails.action @@ -94,8 +94,8 @@ ServiceMaps: outJsonPath: $.id - inJsonPath: $.tenantId outJsonPath: $.tenantId - - inJsonPath: $.fireNOCDetails.channel - outJsonPath: $.channel + - inJsonPath: $.fireNOCDetails + outJsonPath: $.fireNOCDetails - inJsonPath: $.fireNOCDetails.status outJsonPath: $.fireNOCDetails.status - inJsonPath: $.fireNOCDetails.action @@ -169,8 +169,8 @@ ServiceMaps: outJsonPath: $.id - inJsonPath: $.tenantId outJsonPath: $.tenantId - - inJsonPath: $.fireNOCDetails.channel - outJsonPath: $.channel + - inJsonPath: $.fireNOCDetails + outJsonPath: $.fireNOCDetails - inJsonPath: $.fireNOCDetails.status outJsonPath: $.fireNOCDetails.status - inJsonPath: $.fireNOCDetails.action From fe9e5ea5fd368dafb607c0b1ac6b13175adb618a Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Mon, 14 Mar 2022 18:12:08 +0530 Subject: [PATCH 0970/1242] Update "fireNOCDetails" --- .../dashboard-ingest/transform_firenoc_v1.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-ingest/transform_firenoc_v1.json b/configs/egov-dss-dashboards/dashboard-ingest/transform_firenoc_v1.json index fc556b58..c80db13d 100644 --- a/configs/egov-dss-dashboards/dashboard-ingest/transform_firenoc_v1.json +++ b/configs/egov-dss-dashboards/dashboard-ingest/transform_firenoc_v1.json @@ -4,7 +4,8 @@ "spec": { "tenantId": "tenantId", "Department": "Department", - "ward" : "ward" + "ward" : "ward", + "fireNOCDetails" : "fireNOCDetails" } } ] From 258c24200091f1f1bbd6c0a6ab5e13b4e12bed3c Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Mon, 14 Mar 2022 18:13:20 +0530 Subject: [PATCH 0971/1242] Update "DomainConfig.json" --- configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json b/configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json index 983018e1..e2bf88fd 100644 --- a/configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json +++ b/configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json @@ -82,7 +82,7 @@ }, { "id": "4", - "domain": "FireNOCs", + "domain": "FireNOC", "indexName": "firenoc-services", "documentType": "", "query": "{\"query\":{\"bool\":{\"must\":[{\"match_phrase\":{\"fireNOCDetails.applicationNumber\":\"value\"}}]}}}}", From d5f7db1c38160ef575e475fbc745d73b92178288 Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Mon, 14 Mar 2022 18:36:38 +0530 Subject: [PATCH 0972/1242] Update "DomainConfig.json" --- .../dashboard-ingest/DomainConfig.json | 33 ++++++++++--------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json b/configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json index e2bf88fd..441634f9 100644 --- a/configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json +++ b/configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json @@ -80,20 +80,21 @@ } ] }, - { + + { "id": "4", - "domain": "FireNOC", - "indexName": "firenoc-services", + "domain": "WS.ONE_TIME_FEE", + "indexName": "water-services", "documentType": "", - "query": "{\"query\":{\"bool\":{\"must\":[{\"match_phrase\":{\"fireNOCDetails.applicationNumber\":\"value\"}}]}}}}", + "query": "{\"query\":{\"bool\":{\"must\":[{\"match_phrase\":{\"Data.applicationNo\":\"value\"}}]}}}", "targetReferences": [ { - "fieldName": "applicationNumber", - "argument": "fireNOCDetails.applicationNumber", + "fieldName": "applicationNo", + "argument": "Data.applicationNo", "dataType": "String", "value": "$value", "seperator": " ", - "expression": "applicationNumber" + "expression": "applicationNo" } ], "sourceReferences": [ @@ -103,24 +104,24 @@ "dataType": "String", "value": "$value", "seperator": " ", - "expression": "applicationNumber" + "expression": "applicationNo" } ] }, - { + { "id": "5", - "domain": "WS.ONE_TIME_FEE", - "indexName": "water-services", + "domain": "FireNOC", + "indexName": "firenoc-services", "documentType": "", - "query": "{\"query\":{\"bool\":{\"must\":[{\"match_phrase\":{\"Data.applicationNo\":\"value\"}}]}}}", + "query": "{\"query\":{\"bool\":{\"must\":[{\"match_phrase\":{\"fireNOCDetails.applicationNumber\":\"value\"}}]}}}}", "targetReferences": [ { - "fieldName": "applicationNo", - "argument": "Data.applicationNo", + "fieldName": "applicationNumber", + "argument": "fireNOCDetails.applicationNumber", "dataType": "String", "value": "$value", "seperator": " ", - "expression": "applicationNo" + "expression": "applicationNumber" } ], "sourceReferences": [ @@ -130,7 +131,7 @@ "dataType": "String", "value": "$value", "seperator": " ", - "expression": "applicationNo" + "expression": "applicationNumber" } ] }, From 6514e11ac0456915f83d3400f84904bf575825d1 Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Mon, 14 Mar 2022 18:53:16 +0530 Subject: [PATCH 0973/1242] Update "transform_firenoc_v1.json" --- .../dashboard-ingest/transform_firenoc_v1.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-ingest/transform_firenoc_v1.json b/configs/egov-dss-dashboards/dashboard-ingest/transform_firenoc_v1.json index c80db13d..25bc9137 100644 --- a/configs/egov-dss-dashboards/dashboard-ingest/transform_firenoc_v1.json +++ b/configs/egov-dss-dashboards/dashboard-ingest/transform_firenoc_v1.json @@ -4,8 +4,8 @@ "spec": { "tenantId": "tenantId", "Department": "Department", - "ward" : "ward", "fireNOCDetails" : "fireNOCDetails" - } + }, + "ward" : "ward" } ] From 533719e3c86dbf3a5cd093e65da2413673fe6b80 Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Tue, 15 Mar 2022 10:24:07 +0530 Subject: [PATCH 0974/1242] Update "transform_firenoc_v1.json" --- .../dashboard-ingest/transform_firenoc_v1.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-ingest/transform_firenoc_v1.json b/configs/egov-dss-dashboards/dashboard-ingest/transform_firenoc_v1.json index 25bc9137..fc556b58 100644 --- a/configs/egov-dss-dashboards/dashboard-ingest/transform_firenoc_v1.json +++ b/configs/egov-dss-dashboards/dashboard-ingest/transform_firenoc_v1.json @@ -4,8 +4,7 @@ "spec": { "tenantId": "tenantId", "Department": "Department", - "fireNOCDetails" : "fireNOCDetails" - }, "ward" : "ward" + } } ] From cb88aaa07a62c1b73d468a9acd1d79e3a9bc4be2 Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Tue, 15 Mar 2022 10:25:12 +0530 Subject: [PATCH 0975/1242] Update "fireNOC" in DomainConfig.json --- .../dashboard-ingest/DomainConfig.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json b/configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json index 441634f9..9500cb1d 100644 --- a/configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json +++ b/configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json @@ -108,16 +108,16 @@ } ] }, - { + { "id": "5", - "domain": "FireNOC", + "domain": "FIRENOC", "indexName": "firenoc-services", "documentType": "", - "query": "{\"query\":{\"bool\":{\"must\":[{\"match_phrase\":{\"fireNOCDetails.applicationNumber\":\"value\"}}]}}}}", + "query": "{\"query\":{\"bool\":{\"must\":[{\"match_phrase\":{\"Data.fireNOCDetails.applicationNumber\":\"value\"}}]}}}}", "targetReferences": [ { "fieldName": "applicationNumber", - "argument": "fireNOCDetails.applicationNumber", + "argument": "Data.fireNOCDetails.applicationNumber", "dataType": "String", "value": "$value", "seperator": " ", From 4f95d5456ad114b7aec65fd4002bcc9e4422846b Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Tue, 15 Mar 2022 10:28:44 +0530 Subject: [PATCH 0976/1242] Update "rainmaker-firenoc-indexer.yml" --- .../rainmaker-firenoc-indexer.yml | 126 +++++++++--------- 1 file changed, 63 insertions(+), 63 deletions(-) diff --git a/configs/egov-indexer/rainmaker-firenoc-indexer.yml b/configs/egov-indexer/rainmaker-firenoc-indexer.yml index 497d432d..6fcb7c99 100644 --- a/configs/egov-indexer/rainmaker-firenoc-indexer.yml +++ b/configs/egov-indexer/rainmaker-firenoc-indexer.yml @@ -6,7 +6,7 @@ ServiceMaps: configKey: INDEX indexes: - name: firenoc-services - type: FireNOCs + type: general id: $.id,$.tenantId isBulk: true jsonPath: $.FireNOCs @@ -15,55 +15,55 @@ ServiceMaps: indexMapping: {"Data":{"channel":"","id":"","tenantId":"","fireNOCDetails":{"status":"","action":"","firestationId":"","applicationNumber":"","fireNOCType":"","buildings":[],"propertyDetails":{},"additionalDetail":{},"applicantDetails":{}},"auditDetails":{},"@timestamp":"timestamp"}} fieldMapping: - inJsonPath: $.id - outJsonPath: $.id + outJsonPath: $.Data.id - inJsonPath: $.tenantId - outJsonPath: $.tenantId - - inJsonPath: $.fireNOCDetails - outJsonPath: $.fireNOCDetails + outJsonPath: $.Data.tenantId + - inJsonPath: $.fireNOCDetails.channel + outJsonPath: $.Data.channel - inJsonPath: $.fireNOCDetails.status - outJsonPath: $.fireNOCDetails.status + outJsonPath: $.Data.fireNOCDetails.status - inJsonPath: $.fireNOCDetails.action - outJsonPath: $.fireNOCDetails.action + outJsonPath: $.Data.fireNOCDetails.action - inJsonPath: $.fireNOCDetails.fireNOCType - outJsonPath: $.fireNOCDetails.fireNOCType + outJsonPath: $.Data.fireNOCDetails.fireNOCType - inJsonPath: $.fireNOCDetails.buildings - outJsonPath: $.fireNOCDetails.buildings + outJsonPath: $.Data.fireNOCDetails.buildings - inJsonPath: $.fireNOCDetails.applicationNumber - outJsonPath: $.fireNOCDetails.applicationNumber + outJsonPath: $.Data.fireNOCDetails.applicationNumber - inJsonPath: $.fireNOCDetails.buildings - outJsonPath: $.fireNOCDetails.buildings + outJsonPath: $.Data.fireNOCDetails.buildings - inJsonPath: $.fireNOCDetails.propertyDetails - outJsonPath: $.fireNOCDetails.propertyDetails + outJsonPath: $.Data.fireNOCDetails.propertyDetails - inJsonPath: $.fireNOCDetails.additionalDetail - outJsonPath: $.fireNOCDetails.additionalDetail + outJsonPath: $.Data.fireNOCDetails.additionalDetail - inJsonPath: $.fireNOCDetails.applicantDetails - outJsonPath: $.fireNOCDetails.applicantDetails + outJsonPath: $.Data.fireNOCDetails.applicantDetails - inJsonPath: $.fireNOCDetails.firestationId - outJsonPath: $.fireNOCDetails.firestationId + outJsonPath: $.Data.fireNOCDetails.firestationId - inJsonPath: $.auditDetails - outJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails - inJsonPath: $.@timestamp - outJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp externalUriMapping: - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search queryParam: businessIds=$.fireNOCDetails.applicationNumber,history=true,tenantId=$.tenantId apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} uriResponseMapping: - inJsonPath: $.ProcessInstances - outJsonPath: $.history + outJsonPath: $.Data.history - path: http://egov-localization.egov:8080/localization/messages/v1/_search queryParam: locale=en_IN,tenantId=$.tenantId,codes=$.fireNOCDetails.firestationId apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} uriResponseMapping: - inJsonPath: $.messages[0].message - outJsonPath: $.Department + outJsonPath: $.Data.Department - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.fireNOCDetails.propertyDetails.address.locality.code,tenantId=$.tenantId apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} uriResponseMapping: - inJsonPath: $.TenantBoundary[0].boundary[0] - outJsonPath: $.ward + outJsonPath: $.Data.ward mdmsMapping: - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search moduleName: tenant @@ -75,14 +75,14 @@ ServiceMaps: valueJsonpath: $.tenantId uriResponseMapping: - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.tenantData + outJsonPath: $.Data.tenantData - topic: update-fn-firenoc configKey: INDEX indexes: - name: firenoc-services - type: FireNOCs + type: general id: $.id,$.tenantId isBulk: true jsonPath: $.FireNOCs @@ -91,55 +91,55 @@ ServiceMaps: indexMapping: {"Data":{"channel":"","id":"","tenantId":"","fireNOCDetails":{"status":"","action":"","firestationId":"","applicationNumber":"","fireNOCType":"","buildings":[],"propertyDetails":{},"additionalDetail":{},"applicantDetails":{}},"auditDetails":{},"@timestamp":"timestamp"}} fieldMapping: - inJsonPath: $.id - outJsonPath: $.id + outJsonPath: $.Data.id - inJsonPath: $.tenantId - outJsonPath: $.tenantId - - inJsonPath: $.fireNOCDetails - outJsonPath: $.fireNOCDetails + outJsonPath: $.Data.tenantId + - inJsonPath: $.fireNOCDetails.channel + outJsonPath: $.Data.channel - inJsonPath: $.fireNOCDetails.status - outJsonPath: $.fireNOCDetails.status + outJsonPath: $.Data.fireNOCDetails.status - inJsonPath: $.fireNOCDetails.action - outJsonPath: $.fireNOCDetails.action + outJsonPath: $.Data.fireNOCDetails.action - inJsonPath: $.fireNOCDetails.fireNOCType - outJsonPath: $.fireNOCDetails.fireNOCType + outJsonPath: $.Data.fireNOCDetails.fireNOCType - inJsonPath: $.fireNOCDetails.buildings - outJsonPath: $.fireNOCDetails.buildings + outJsonPath: $.Data.fireNOCDetails.buildings - inJsonPath: $.fireNOCDetails.applicationNumber - outJsonPath: $.fireNOCDetails.applicationNumber + outJsonPath: $.Data.fireNOCDetails.applicationNumber - inJsonPath: $.fireNOCDetails.buildings - outJsonPath: $.fireNOCDetails.buildings + outJsonPath: $.Data.fireNOCDetails.buildings - inJsonPath: $.fireNOCDetails.propertyDetails - outJsonPath: $.fireNOCDetails.propertyDetails + outJsonPath: $.Data.fireNOCDetails.propertyDetails - inJsonPath: $.fireNOCDetails.additionalDetail - outJsonPath: $.fireNOCDetails.additionalDetail + outJsonPath: $.Data.fireNOCDetails.additionalDetail - inJsonPath: $.fireNOCDetails.applicantDetails - outJsonPath: $.fireNOCDetails.applicantDetails + outJsonPath: $.Data.fireNOCDetails.applicantDetails - inJsonPath: $.fireNOCDetails.firestationId - outJsonPath: $.fireNOCDetails.firestationId + outJsonPath: $.Data.fireNOCDetails.firestationId - inJsonPath: $.auditDetails - outJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails - inJsonPath: $.@timestamp - outJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp externalUriMapping: - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search queryParam: businessIds=$.fireNOCDetails.applicationNumber,history=true,tenantId=$.tenantId apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} uriResponseMapping: - inJsonPath: $.ProcessInstances - outJsonPath: $.history + outJsonPath: $.Data.history - path: http://egov-localization.egov:8080/localization/messages/v1/_search queryParam: locale=en_IN,tenantId=$.tenantId,codes=$.fireNOCDetails.firestationId apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} uriResponseMapping: - inJsonPath: $.messages[0].message - outJsonPath: $.Department + outJsonPath: $.Data.Department - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.fireNOCDetails.propertyDetails.address.locality.code,tenantId=$.tenantId apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} uriResponseMapping: - inJsonPath: $.TenantBoundary[0].boundary[0] - outJsonPath: $.ward + outJsonPath: $.Data.ward mdmsMapping: - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search moduleName: tenant @@ -151,13 +151,13 @@ ServiceMaps: valueJsonpath: $.tenantId uriResponseMapping: - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.tenantData + outJsonPath: $.Data.tenantData - topic: update-fn-workflow configKey: INDEX indexes: - name: firenoc-services - type: FireNOCs + type: general id: $.id,$.tenantId isBulk: true jsonPath: $.FireNOCs @@ -166,55 +166,55 @@ ServiceMaps: indexMapping: {"Data":{"channel":"","id":"","tenantId":"","fireNOCDetails":{"status":"","action":"","firestationId":"","applicationNumber":"","fireNOCType":"","buildings":[],"propertyDetails":{},"additionalDetail":{},"applicantDetails":{}},"auditDetails":{},"@timestamp":"timestamp"}} fieldMapping: - inJsonPath: $.id - outJsonPath: $.id + outJsonPath: $.Data.id - inJsonPath: $.tenantId - outJsonPath: $.tenantId - - inJsonPath: $.fireNOCDetails - outJsonPath: $.fireNOCDetails + outJsonPath: $.Data.tenantId + - inJsonPath: $.fireNOCDetails.channel + outJsonPath: $.Data.channel - inJsonPath: $.fireNOCDetails.status - outJsonPath: $.fireNOCDetails.status + outJsonPath: $.Data.fireNOCDetails.status - inJsonPath: $.fireNOCDetails.action - outJsonPath: $.fireNOCDetails.action + outJsonPath: $.Data.fireNOCDetails.action - inJsonPath: $.fireNOCDetails.fireNOCType - outJsonPath: $.fireNOCDetails.fireNOCType + outJsonPath: $.Data.fireNOCDetails.fireNOCType - inJsonPath: $.fireNOCDetails.buildings - outJsonPath: $.fireNOCDetails.buildings + outJsonPath: $.Data.fireNOCDetails.buildings - inJsonPath: $.fireNOCDetails.applicationNumber - outJsonPath: $.fireNOCDetails.applicationNumber + outJsonPath: $.Data.fireNOCDetails.applicationNumber - inJsonPath: $.fireNOCDetails.buildings - outJsonPath: $.fireNOCDetails.buildings + outJsonPath: $.Data.fireNOCDetails.buildings - inJsonPath: $.fireNOCDetails.propertyDetails - outJsonPath: $.fireNOCDetails.propertyDetails + outJsonPath: $.Data.fireNOCDetails.propertyDetails - inJsonPath: $.fireNOCDetails.additionalDetail - outJsonPath: $.fireNOCDetails.additionalDetail + outJsonPath: $.Data.fireNOCDetails.additionalDetail - inJsonPath: $.fireNOCDetails.applicantDetails - outJsonPath: $.fireNOCDetails.applicantDetails + outJsonPath: $.Data.fireNOCDetails.applicantDetails - inJsonPath: $.fireNOCDetails.firestationId - outJsonPath: $.fireNOCDetails.firestationId + outJsonPath: $.Data.fireNOCDetails.firestationId - inJsonPath: $.auditDetails - outJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails - inJsonPath: $.@timestamp - outJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp externalUriMapping: - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search queryParam: businessIds=$.fireNOCDetails.applicationNumber,history=true,tenantId=$.tenantId apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} uriResponseMapping: - inJsonPath: $.ProcessInstances - outJsonPath: $.history + outJsonPath: $.Data.history - path: http://egov-localization.egov:8080/localization/messages/v1/_search queryParam: locale=en_IN,tenantId=$.tenantId,codes=$.fireNOCDetails.firestationId apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} uriResponseMapping: - inJsonPath: $.messages[0].message - outJsonPath: $.Department + outJsonPath: $.Data.Department - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.fireNOCDetails.propertyDetails.address.locality.code,tenantId=$.tenantId apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} uriResponseMapping: - inJsonPath: $.TenantBoundary[0].boundary[0] - outJsonPath: $.ward + outJsonPath: $.Data.ward mdmsMapping: - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search moduleName: tenant @@ -226,4 +226,4 @@ ServiceMaps: valueJsonpath: $.tenantId uriResponseMapping: - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.tenantData + outJsonPath: $.Data.tenantData From 66faf0cd38ecb271f605a62b091660c914ede2ce Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Tue, 15 Mar 2022 10:54:13 +0530 Subject: [PATCH 0977/1242] Add "save-firenoc-legacyIndex" --- .../rainmaker-firenoc-indexer.yml | 75 +++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/configs/egov-indexer/rainmaker-firenoc-indexer.yml b/configs/egov-indexer/rainmaker-firenoc-indexer.yml index 6fcb7c99..8722e090 100644 --- a/configs/egov-indexer/rainmaker-firenoc-indexer.yml +++ b/configs/egov-indexer/rainmaker-firenoc-indexer.yml @@ -227,3 +227,78 @@ ServiceMaps: uriResponseMapping: - inJsonPath: $.MdmsRes.tenant.tenants outJsonPath: $.Data.tenantData + + - topic: save-firenoc-legacyIndex + configKey: INDEX + indexes: + - name: firenoc-services + type: general + id: $.id,$.tenantId + isBulk: true + jsonPath: $.FireNOCs + timeStampField: $.auditDetails.lastModifiedTime + customJsonMapping: + indexMapping: {"Data":{"channel":"","id":"","tenantId":"","fireNOCDetails":{"status":"","action":"","firestationId":"","applicationNumber":"","fireNOCType":"","buildings":[],"propertyDetails":{},"additionalDetail":{},"applicantDetails":{}},"auditDetails":{},"@timestamp":"timestamp"}} + fieldMapping: + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.fireNOCDetails.channel + outJsonPath: $.Data.channel + - inJsonPath: $.fireNOCDetails.status + outJsonPath: $.Data.fireNOCDetails.status + - inJsonPath: $.fireNOCDetails.action + outJsonPath: $.Data.fireNOCDetails.action + - inJsonPath: $.fireNOCDetails.fireNOCType + outJsonPath: $.Data.fireNOCDetails.fireNOCType + - inJsonPath: $.fireNOCDetails.buildings + outJsonPath: $.Data.fireNOCDetails.buildings + - inJsonPath: $.fireNOCDetails.applicationNumber + outJsonPath: $.Data.fireNOCDetails.applicationNumber + - inJsonPath: $.fireNOCDetails.buildings + outJsonPath: $.Data.fireNOCDetails.buildings + - inJsonPath: $.fireNOCDetails.propertyDetails + outJsonPath: $.Data.fireNOCDetails.propertyDetails + - inJsonPath: $.fireNOCDetails.additionalDetail + outJsonPath: $.Data.fireNOCDetails.additionalDetail + - inJsonPath: $.fireNOCDetails.applicantDetails + outJsonPath: $.Data.fireNOCDetails.applicantDetails + - inJsonPath: $.fireNOCDetails.firestationId + outJsonPath: $.Data.fireNOCDetails.firestationId + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + externalUriMapping: + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.fireNOCDetails.applicationNumber,history=true,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history + - path: http://egov-localization.egov:8080/localization/messages/v1/_search + queryParam: locale=en_IN,tenantId=$.tenantId,codes=$.fireNOCDetails.firestationId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.messages[0].message + outJsonPath: $.Data.Department + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.fireNOCDetails.propertyDetails.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + mdmsMapping: + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData From 377dc13435a153d355d96a90684b22a50cb88968 Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Tue, 15 Mar 2022 16:51:39 +0530 Subject: [PATCH 0978/1242] Update "DSS_TOTAL_COLLECTION" --- .../dashboard-analytics/ChartApiConfig.json | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index fe43ef8f..5019116e 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -5,18 +5,11 @@ "chartName": "DSS_TOTAL_COLLECTION", "queries": [ { - "module": "PT", - "dateRefField": "dataObject.paymentDetails.receiptDate", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\"}", - "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}],\"must\":[{\"term\":{\"dataObject.paymentDetails.businessService.keyword\":\"PT\"}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" - }, - { - "module": "TL", + "module": "COMMON", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\r\n \"district\" : \"dataObject.tenantData.city.districtCode\", \"module\" : \"dataObject.paymentDetails.businessService.keyword\", \n\"tenantId\" : \"dataObject.tenantId\"}", "dateRefField": "dataObject.paymentDetails.receiptDate", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\"}", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}],\"must\":[{\"term\":{\"dataObject.paymentDetails.businessService.keyword\":\"TL\"}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must\":[{\"terms\":{\"dataObject.paymentDetails.bill.businessService.keyword\":[\"PT\",\"TL\",\"SW\",\"WS\"]}}],\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" } ], "chartType": "metric", From 32c70146bda123eeb9e9d61f7afb4d662ee27c14 Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Tue, 15 Mar 2022 20:05:28 +0530 Subject: [PATCH 0979/1242] Update "licenseApplicationByStatus" --- .../dashboard-analytics/ChartApiConfig.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 5019116e..90c16df9 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -1705,8 +1705,7 @@ "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \"tenantId\" : \"Data.tenantData.code\", \"district\" : \"Data.tenantData.cityDistrictCode\"}", "dateRefField": "Data.tradelicense.issuedDate", "indexName": "tlindex-v1", - "aggrQueryBc": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tradelicense.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Status\":{\"terms\":{\"field\":\"Data.tradelicense.status.keyword\"},\"aggs\":{\"Status\":{\"value_count\":{\"field\":\"Data.tradelicense.status.keyword\"}}}}}}}}", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tradelicense.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Status\":{\"terms\":{\"field\":\"Data.tradelicense.status.keyword\",\"size\":200},\"aggs\":{\"Status\":{\"value_count\":{\"field\":\"Data.tradelicense.applicationNumber.keyword\"}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tradelicense.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Status\":{\"terms\":{\"field\":\"Data.tradelicense.status.keyword\",\"size\":200}}}}}}" } ], "chartType": "pie", From 6d3de55e7404054ac72b88acf73e67c86ce43eaa Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Tue, 15 Mar 2022 20:14:01 +0530 Subject: [PATCH 0980/1242] Revert changes for "licenseApplicationByStatus" --- .../dashboard-analytics/ChartApiConfig.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 90c16df9..330277a6 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -1705,8 +1705,9 @@ "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \"tenantId\" : \"Data.tenantData.code\", \"district\" : \"Data.tenantData.cityDistrictCode\"}", "dateRefField": "Data.tradelicense.issuedDate", "indexName": "tlindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tradelicense.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Status\":{\"terms\":{\"field\":\"Data.tradelicense.status.keyword\",\"size\":200}}}}}}" - } + "aggrQueryBc": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tradelicense.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Status\":{\"terms\":{\"field\":\"Data.tradelicense.status.keyword\"},\"aggs\":{\"Status\":{\"value_count\":{\"field\":\"Data.tradelicense.status.keyword\"}}}}}}}}", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tradelicense.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Status\":{\"terms\":{\"field\":\"Data.tradelicense.status.keyword\",\"size\":200},\"aggs\":{\"Status\":{\"value_count\":{\"field\":\"Data.tradelicense.applicationNumber.keyword\"}}}}}}}}" + } ], "chartType": "pie", "valueType": "number", From e3a7285c9b70a752b03d0b2173edc7d803cedfcd Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Tue, 15 Mar 2022 20:36:30 +0530 Subject: [PATCH 0981/1242] Update "DSS_TOTAL_APPLICATIONS:_DEPARTMENT_WISE" --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 330277a6..ea2918b3 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -372,7 +372,7 @@ "dateRefField": "Data.@timestamp", "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \r\n \"district\" : \"Data.tenantData.city.districtCode\", \r\n\"tenantId\" : \"Data.tenantId\" \r\n}", "indexName": "tlindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tradelicense.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Trade Licence\":{\"value_count\":{\"field\":\"Data.tradelicense.tenantId.keyword\"}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tradelicense.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Trade Licence\":{\"value_count\":{\"field\":\"Data.tradelicense.applicationNumber.keyword\"}}}}}}" }, { "module": "WS", From 8567cf4298d69c78b4a8d1fd653d722c55c31b2b Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Tue, 15 Mar 2022 20:43:33 +0530 Subject: [PATCH 0982/1242] Update "DSS_TOTAL_APPLICATIONS:_DEPARTMENT_WISE" --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index ea2918b3..330277a6 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -372,7 +372,7 @@ "dateRefField": "Data.@timestamp", "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \r\n \"district\" : \"Data.tenantData.city.districtCode\", \r\n\"tenantId\" : \"Data.tenantId\" \r\n}", "indexName": "tlindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tradelicense.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Trade Licence\":{\"value_count\":{\"field\":\"Data.tradelicense.applicationNumber.keyword\"}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tradelicense.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Trade Licence\":{\"value_count\":{\"field\":\"Data.tradelicense.tenantId.keyword\"}}}}}}" }, { "module": "WS", From 273d7bc112d444c478089e0142d346c5abf8e187 Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Wed, 16 Mar 2022 12:02:05 +0530 Subject: [PATCH 0983/1242] Added new file "egov-echallan.yml" --- configs/egov-indexer/egov-echallan.yml | 244 +++++++++++++++++++++++++ 1 file changed, 244 insertions(+) create mode 100644 configs/egov-indexer/egov-echallan.yml diff --git a/configs/egov-indexer/egov-echallan.yml b/configs/egov-indexer/egov-echallan.yml new file mode 100644 index 00000000..4d9169ec --- /dev/null +++ b/configs/egov-indexer/egov-echallan.yml @@ -0,0 +1,244 @@ +ServiceMaps: + serviceName: echallan Service - rainmaker + version: 1.0.0 + mappings: + - topic: save-challan + configKey: INDEX + indexes: + - name: echallan-services + type: general + id: $.id,$.tenantId + jsonPath: $.Challan + timeStampField: $.auditDetails.createdTime + customJsonMapping: + indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","tenantId":"","businessService":"","challanNo":"","referenceId":"","description":"","accountId":"","additionalDetail":{},"source":"","taxPeriodFrom":"","taxPeriodTo":"","amount":[],"filestoreid":"","additionalDetails":{},"applicationStatus":"","vendor":"","typeOfExpense":"","billDate":"","billIssuedDate":"","paidDate":"","isBillPaid":"","vendorName":"","totalAmount":"","@timestamp":"timestamp","history":{},"ward":"" }} + fieldMapping: + - inJsonPath: $.applicationStatus.state + outJsonPath: $.Data.workflow.state + - inJsonPath: $.processInstance.action + outJsonPath: $.Data.workflow.action + - inJsonPath: $.processInstance.assignes.*.uuid + outJsonPath: $.Data.workflow.assignes + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.businessService + outJsonPath: $.Data.businessService + - inJsonPath: $.challanNo + outJsonPath: $.Data.challanNo + - inJsonPath: $.referenceId + outJsonPath: $.Data.referenceId + - inJsonPath: $.description + outJsonPath: $.Data.description + - inJsonPath: $.accountId + outJsonPath: $.Data.accountId + - inJsonPath: $.additionalDetail + outJsonPath: $.Data.additionalDetail + - inJsonPath: $.source + outJsonPath: $.Data.source + - inJsonPath: $.taxPeriodFrom + outJsonPath: $.Data.taxPeriodFrom + - inJsonPath: $.taxPeriodTo + outJsonPath: $.Data.taxPeriodTo + - inJsonPath: $.amount + outJsonPath: $.Data.amount + - inJsonPath: $.filestoreid + outJsonPath: $.Data.filestoreid + - inJsonPath: $.additionalDetails + outJsonPath: $.Data.additionalDetails + - inJsonPath: $.applicationStatus + outJsonPath: $.Data.applicationStatus + - inJsonPath: $.vendor + outJsonPath: $.Data.vendor + - inJsonPath: $.typeOfExpense + outJsonPath: $.Data.typeOfExpense + - inJsonPath: $.billDate + outJsonPath: $.Data.billDate + - inJsonPath: $.billIssuedDate + outJsonPath: $.Data.billIssuedDate + - inJsonPath: $.paidDate + outJsonPath: $.Data.paidDate + - inJsonPath: $.isBillPaid + outJsonPath: $.Data.isBillPaid + - inJsonPath: $.vendorName + outJsonPath: $.Data.vendorName + - inJsonPath: $.totalAmount + outJsonPath: $.Data.totalAmount + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + externalUriMapping: + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.acknowldgementNumber,history=true,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.echallan","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + + + - topic: update-challan + configKey: INDEX + indexes: + - name: echallan-services + type: general + id: $.id,$.tenantId + jsonPath: $.Challan + timeStampField: $.auditDetails.createdTime + customJsonMapping: + indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","tenantId":"","businessService":"","challanNo":"","referenceId":"","description":"","accountId":"","additionalDetail":{},"source":"","taxPeriodFrom":"","taxPeriodTo":"","amount":[],"filestoreid":"","additionalDetails":{},"applicationStatus":"","vendor":"","typeOfExpense":"","billDate":"","billIssuedDate":"","paidDate":"","isBillPaid":"","vendorName":"","totalAmount":"","@timestamp":"timestamp","history":{},"ward":"" }} + fieldMapping: + - inJsonPath: $.applicationStatus.state + outJsonPath: $.Data.workflow.state + - inJsonPath: $.processInstance.action + outJsonPath: $.Data.workflow.action + - inJsonPath: $.processInstance.assignes.*.uuid + outJsonPath: $.Data.workflow.assignes + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.businessService + outJsonPath: $.Data.businessService + - inJsonPath: $.challanNo + outJsonPath: $.Data.challanNo + - inJsonPath: $.referenceId + outJsonPath: $.Data.referenceId + - inJsonPath: $.description + outJsonPath: $.Data.description + - inJsonPath: $.accountId + outJsonPath: $.Data.accountId + - inJsonPath: $.additionalDetail + outJsonPath: $.Data.additionalDetail + - inJsonPath: $.source + outJsonPath: $.Data.source + - inJsonPath: $.taxPeriodFrom + outJsonPath: $.Data.taxPeriodFrom + - inJsonPath: $.taxPeriodTo + outJsonPath: $.Data.taxPeriodTo + - inJsonPath: $.amount + outJsonPath: $.Data.amount + - inJsonPath: $.filestoreid + outJsonPath: $.Data.filestoreid + - inJsonPath: $.additionalDetails + outJsonPath: $.Data.additionalDetails + - inJsonPath: $.applicationStatus + outJsonPath: $.Data.applicationStatus + - inJsonPath: $.vendor + outJsonPath: $.Data.vendor + - inJsonPath: $.typeOfExpense + outJsonPath: $.Data.typeOfExpense + - inJsonPath: $.billDate + outJsonPath: $.Data.billDate + - inJsonPath: $.billIssuedDate + outJsonPath: $.Data.billIssuedDate + - inJsonPath: $.paidDate + outJsonPath: $.Data.paidDate + - inJsonPath: $.isBillPaid + outJsonPath: $.Data.isBillPaid + - inJsonPath: $.vendorName + outJsonPath: $.Data.vendorName + - inJsonPath: $.totalAmount + outJsonPath: $.Data.totalAmount + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + externalUriMapping: + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.acknowldgementNumber,history=true,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.echallan","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + + + - topic: echallan-legacyIndex + configKey: LEGACYINDEX + indexes: + - name: echallan-services + type: general + isBulk: true + id: $.id,$.tenantId + jsonPath: $.challans.* + timeStampField: $.auditDetails.createdTime + customJsonMapping: + indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","tenantId":"","businessService":"","challanNo":"","referenceId":"","description":"","accountId":"","additionalDetail":{},"source":"","taxPeriodFrom":"","taxPeriodTo":"","amount":[],"filestoreid":"","additionalDetails":{},"applicationStatus":"","vendor":"","typeOfExpense":"","billDate":"","billIssuedDate":"","paidDate":"","isBillPaid":"","vendorName":"","totalAmount":"","@timestamp":"timestamp","history":{},"ward":"" }} + fieldMapping: + - inJsonPath: $.processInstance.action + outJsonPath: $.Data.workflow.action + - inJsonPath: $.processInstance.assignes.*.uuid + outJsonPath: $.Data.workflow.assignes + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.businessService + outJsonPath: $.Data.businessService + - inJsonPath: $.challanNo + outJsonPath: $.Data.challanNo + - inJsonPath: $.referenceId + outJsonPath: $.Data.referenceId + - inJsonPath: $.description + outJsonPath: $.Data.description + - inJsonPath: $.accountId + outJsonPath: $.Data.accountId + - inJsonPath: $.additionalDetail + outJsonPath: $.Data.additionalDetail + - inJsonPath: $.source + outJsonPath: $.Data.source + - inJsonPath: $.taxPeriodFrom + outJsonPath: $.Data.taxPeriodFrom + - inJsonPath: $.taxPeriodTo + outJsonPath: $.Data.taxPeriodTo + - inJsonPath: $.amount + outJsonPath: $.Data.amount + - inJsonPath: $.filestoreid + outJsonPath: $.Data.filestoreid + - inJsonPath: $.additionalDetails + outJsonPath: $.Data.additionalDetails + - inJsonPath: $.applicationStatus + outJsonPath: $.Data.applicationStatus + - inJsonPath: $.vendor + outJsonPath: $.Data.vendor + - inJsonPath: $.typeOfExpense + outJsonPath: $.Data.typeOfExpense + - inJsonPath: $.billDate + outJsonPath: $.Data.billDate + - inJsonPath: $.billIssuedDate + outJsonPath: $.Data.billIssuedDate + - inJsonPath: $.paidDate + outJsonPath: $.Data.paidDate + - inJsonPath: $.isBillPaid + outJsonPath: $.Data.isBillPaid + - inJsonPath: $.vendorName + outJsonPath: $.Data.vendorName + - inJsonPath: $.totalAmount + outJsonPath: $.Data.totalAmount + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + externalUriMapping: + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.acknowldgementNumber,history=true,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.echallan","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward From 5229c28d619618f8a2c3538c435931c2444295ad Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Wed, 16 Mar 2022 12:03:46 +0530 Subject: [PATCH 0984/1242] Added new file "transform_mcollect_v1.json" --- .../dashboard-ingest/transform_mcollect_v1.json | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 configs/egov-dss-dashboards/dashboard-ingest/transform_mcollect_v1.json diff --git a/configs/egov-dss-dashboards/dashboard-ingest/transform_mcollect_v1.json b/configs/egov-dss-dashboards/dashboard-ingest/transform_mcollect_v1.json new file mode 100644 index 00000000..e145de0a --- /dev/null +++ b/configs/egov-dss-dashboards/dashboard-ingest/transform_mcollect_v1.json @@ -0,0 +1,8 @@ +[ + { + "operation": "shift", + "spec": { + "ward" : "ward" + } + } +] From 21ac36ce1d5768e33bdbb448e50bc8ae47f4e9a9 Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Wed, 16 Mar 2022 12:08:42 +0530 Subject: [PATCH 0985/1242] Update "DomainConfig.json" --- .../dashboard-ingest/DomainConfig.json | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json b/configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json index 9500cb1d..98f905a2 100644 --- a/configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json +++ b/configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json @@ -215,6 +215,33 @@ "expression": "applicationNo" } ] + }, + { + "id": "9", + "domain": "MCOLLECT", + "indexName": "echallan-services", + "documentType": "", + "query": "{\"query\":{\"bool\":{\"must\":[{\"match_phrase\":{\"Data.challanNo\":\"value\"}}]}}}", + "targetReferences": [ + { + "fieldName": "challanNo", + "argument": "Data.challanNo", + "dataType": "String", + "value": "$value", + "seperator": " ", + "expression": "challanNo" + } + ], + "sourceReferences": [ + { + "fieldName": "consumerCode", + "argument": "paymentDetails.bill.consumerCode", + "dataType": "String", + "value": "$value", + "seperator": " ", + "expression": "challanNo" + } + ] } ] } From 40dc4c57f83dcd690553e6b539999a13ce1fb0f1 Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Wed, 16 Mar 2022 13:18:44 +0530 Subject: [PATCH 0986/1242] Delete file "egov-echallan.yml" --- configs/egov-indexer/egov-echallan.yml | 244 ------------------------- 1 file changed, 244 deletions(-) delete mode 100644 configs/egov-indexer/egov-echallan.yml diff --git a/configs/egov-indexer/egov-echallan.yml b/configs/egov-indexer/egov-echallan.yml deleted file mode 100644 index 4d9169ec..00000000 --- a/configs/egov-indexer/egov-echallan.yml +++ /dev/null @@ -1,244 +0,0 @@ -ServiceMaps: - serviceName: echallan Service - rainmaker - version: 1.0.0 - mappings: - - topic: save-challan - configKey: INDEX - indexes: - - name: echallan-services - type: general - id: $.id,$.tenantId - jsonPath: $.Challan - timeStampField: $.auditDetails.createdTime - customJsonMapping: - indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","tenantId":"","businessService":"","challanNo":"","referenceId":"","description":"","accountId":"","additionalDetail":{},"source":"","taxPeriodFrom":"","taxPeriodTo":"","amount":[],"filestoreid":"","additionalDetails":{},"applicationStatus":"","vendor":"","typeOfExpense":"","billDate":"","billIssuedDate":"","paidDate":"","isBillPaid":"","vendorName":"","totalAmount":"","@timestamp":"timestamp","history":{},"ward":"" }} - fieldMapping: - - inJsonPath: $.applicationStatus.state - outJsonPath: $.Data.workflow.state - - inJsonPath: $.processInstance.action - outJsonPath: $.Data.workflow.action - - inJsonPath: $.processInstance.assignes.*.uuid - outJsonPath: $.Data.workflow.assignes - - inJsonPath: $.id - outJsonPath: $.Data.id - - inJsonPath: $.tenantId - outJsonPath: $.Data.tenantId - - inJsonPath: $.businessService - outJsonPath: $.Data.businessService - - inJsonPath: $.challanNo - outJsonPath: $.Data.challanNo - - inJsonPath: $.referenceId - outJsonPath: $.Data.referenceId - - inJsonPath: $.description - outJsonPath: $.Data.description - - inJsonPath: $.accountId - outJsonPath: $.Data.accountId - - inJsonPath: $.additionalDetail - outJsonPath: $.Data.additionalDetail - - inJsonPath: $.source - outJsonPath: $.Data.source - - inJsonPath: $.taxPeriodFrom - outJsonPath: $.Data.taxPeriodFrom - - inJsonPath: $.taxPeriodTo - outJsonPath: $.Data.taxPeriodTo - - inJsonPath: $.amount - outJsonPath: $.Data.amount - - inJsonPath: $.filestoreid - outJsonPath: $.Data.filestoreid - - inJsonPath: $.additionalDetails - outJsonPath: $.Data.additionalDetails - - inJsonPath: $.applicationStatus - outJsonPath: $.Data.applicationStatus - - inJsonPath: $.vendor - outJsonPath: $.Data.vendor - - inJsonPath: $.typeOfExpense - outJsonPath: $.Data.typeOfExpense - - inJsonPath: $.billDate - outJsonPath: $.Data.billDate - - inJsonPath: $.billIssuedDate - outJsonPath: $.Data.billIssuedDate - - inJsonPath: $.paidDate - outJsonPath: $.Data.paidDate - - inJsonPath: $.isBillPaid - outJsonPath: $.Data.isBillPaid - - inJsonPath: $.vendorName - outJsonPath: $.Data.vendorName - - inJsonPath: $.totalAmount - outJsonPath: $.Data.totalAmount - - inJsonPath: $.@timestamp - outJsonPath: $.Data.@timestamp - externalUriMapping: - - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search - queryParam: businessIds=$.acknowldgementNumber,history=true,tenantId=$.tenantId - apiRequest: {"RequestInfo":{"apiId":"org.egov.echallan","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} - uriResponseMapping: - - inJsonPath: $.ProcessInstances - outJsonPath: $.Data.history - - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search - queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId - apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", - "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} - uriResponseMapping: - - inJsonPath: $.TenantBoundary[0].boundary[0] - outJsonPath: $.Data.ward - - - - topic: update-challan - configKey: INDEX - indexes: - - name: echallan-services - type: general - id: $.id,$.tenantId - jsonPath: $.Challan - timeStampField: $.auditDetails.createdTime - customJsonMapping: - indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","tenantId":"","businessService":"","challanNo":"","referenceId":"","description":"","accountId":"","additionalDetail":{},"source":"","taxPeriodFrom":"","taxPeriodTo":"","amount":[],"filestoreid":"","additionalDetails":{},"applicationStatus":"","vendor":"","typeOfExpense":"","billDate":"","billIssuedDate":"","paidDate":"","isBillPaid":"","vendorName":"","totalAmount":"","@timestamp":"timestamp","history":{},"ward":"" }} - fieldMapping: - - inJsonPath: $.applicationStatus.state - outJsonPath: $.Data.workflow.state - - inJsonPath: $.processInstance.action - outJsonPath: $.Data.workflow.action - - inJsonPath: $.processInstance.assignes.*.uuid - outJsonPath: $.Data.workflow.assignes - - inJsonPath: $.id - outJsonPath: $.Data.id - - inJsonPath: $.tenantId - outJsonPath: $.Data.tenantId - - inJsonPath: $.businessService - outJsonPath: $.Data.businessService - - inJsonPath: $.challanNo - outJsonPath: $.Data.challanNo - - inJsonPath: $.referenceId - outJsonPath: $.Data.referenceId - - inJsonPath: $.description - outJsonPath: $.Data.description - - inJsonPath: $.accountId - outJsonPath: $.Data.accountId - - inJsonPath: $.additionalDetail - outJsonPath: $.Data.additionalDetail - - inJsonPath: $.source - outJsonPath: $.Data.source - - inJsonPath: $.taxPeriodFrom - outJsonPath: $.Data.taxPeriodFrom - - inJsonPath: $.taxPeriodTo - outJsonPath: $.Data.taxPeriodTo - - inJsonPath: $.amount - outJsonPath: $.Data.amount - - inJsonPath: $.filestoreid - outJsonPath: $.Data.filestoreid - - inJsonPath: $.additionalDetails - outJsonPath: $.Data.additionalDetails - - inJsonPath: $.applicationStatus - outJsonPath: $.Data.applicationStatus - - inJsonPath: $.vendor - outJsonPath: $.Data.vendor - - inJsonPath: $.typeOfExpense - outJsonPath: $.Data.typeOfExpense - - inJsonPath: $.billDate - outJsonPath: $.Data.billDate - - inJsonPath: $.billIssuedDate - outJsonPath: $.Data.billIssuedDate - - inJsonPath: $.paidDate - outJsonPath: $.Data.paidDate - - inJsonPath: $.isBillPaid - outJsonPath: $.Data.isBillPaid - - inJsonPath: $.vendorName - outJsonPath: $.Data.vendorName - - inJsonPath: $.totalAmount - outJsonPath: $.Data.totalAmount - - inJsonPath: $.@timestamp - outJsonPath: $.Data.@timestamp - externalUriMapping: - - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search - queryParam: businessIds=$.acknowldgementNumber,history=true,tenantId=$.tenantId - apiRequest: {"RequestInfo":{"apiId":"org.egov.echallan","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} - uriResponseMapping: - - inJsonPath: $.ProcessInstances - outJsonPath: $.Data.history - - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search - queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId - apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", - "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} - uriResponseMapping: - - inJsonPath: $.TenantBoundary[0].boundary[0] - outJsonPath: $.Data.ward - - - - topic: echallan-legacyIndex - configKey: LEGACYINDEX - indexes: - - name: echallan-services - type: general - isBulk: true - id: $.id,$.tenantId - jsonPath: $.challans.* - timeStampField: $.auditDetails.createdTime - customJsonMapping: - indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","tenantId":"","businessService":"","challanNo":"","referenceId":"","description":"","accountId":"","additionalDetail":{},"source":"","taxPeriodFrom":"","taxPeriodTo":"","amount":[],"filestoreid":"","additionalDetails":{},"applicationStatus":"","vendor":"","typeOfExpense":"","billDate":"","billIssuedDate":"","paidDate":"","isBillPaid":"","vendorName":"","totalAmount":"","@timestamp":"timestamp","history":{},"ward":"" }} - fieldMapping: - - inJsonPath: $.processInstance.action - outJsonPath: $.Data.workflow.action - - inJsonPath: $.processInstance.assignes.*.uuid - outJsonPath: $.Data.workflow.assignes - - inJsonPath: $.id - outJsonPath: $.Data.id - - inJsonPath: $.tenantId - outJsonPath: $.Data.tenantId - - inJsonPath: $.businessService - outJsonPath: $.Data.businessService - - inJsonPath: $.challanNo - outJsonPath: $.Data.challanNo - - inJsonPath: $.referenceId - outJsonPath: $.Data.referenceId - - inJsonPath: $.description - outJsonPath: $.Data.description - - inJsonPath: $.accountId - outJsonPath: $.Data.accountId - - inJsonPath: $.additionalDetail - outJsonPath: $.Data.additionalDetail - - inJsonPath: $.source - outJsonPath: $.Data.source - - inJsonPath: $.taxPeriodFrom - outJsonPath: $.Data.taxPeriodFrom - - inJsonPath: $.taxPeriodTo - outJsonPath: $.Data.taxPeriodTo - - inJsonPath: $.amount - outJsonPath: $.Data.amount - - inJsonPath: $.filestoreid - outJsonPath: $.Data.filestoreid - - inJsonPath: $.additionalDetails - outJsonPath: $.Data.additionalDetails - - inJsonPath: $.applicationStatus - outJsonPath: $.Data.applicationStatus - - inJsonPath: $.vendor - outJsonPath: $.Data.vendor - - inJsonPath: $.typeOfExpense - outJsonPath: $.Data.typeOfExpense - - inJsonPath: $.billDate - outJsonPath: $.Data.billDate - - inJsonPath: $.billIssuedDate - outJsonPath: $.Data.billIssuedDate - - inJsonPath: $.paidDate - outJsonPath: $.Data.paidDate - - inJsonPath: $.isBillPaid - outJsonPath: $.Data.isBillPaid - - inJsonPath: $.vendorName - outJsonPath: $.Data.vendorName - - inJsonPath: $.totalAmount - outJsonPath: $.Data.totalAmount - - inJsonPath: $.@timestamp - outJsonPath: $.Data.@timestamp - externalUriMapping: - - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search - queryParam: businessIds=$.acknowldgementNumber,history=true,tenantId=$.tenantId - apiRequest: {"RequestInfo":{"apiId":"org.egov.echallan","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} - uriResponseMapping: - - inJsonPath: $.ProcessInstances - outJsonPath: $.Data.history - - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search - queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId - apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", - "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} - uriResponseMapping: - - inJsonPath: $.TenantBoundary[0].boundary[0] - outJsonPath: $.Data.ward From 6756114b01c603c040a7af9fa6b1c0163d80d2bb Mon Sep 17 00:00:00 2001 From: shiva-eGov <97941850+shiva-eGov@users.noreply.github.com> Date: Wed, 16 Mar 2022 13:41:57 +0530 Subject: [PATCH 0987/1242] removed spaces of - topic: save-firenoc-leg --- configs/egov-indexer/rainmaker-firenoc-indexer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-indexer/rainmaker-firenoc-indexer.yml b/configs/egov-indexer/rainmaker-firenoc-indexer.yml index 8722e090..ac0b4a51 100644 --- a/configs/egov-indexer/rainmaker-firenoc-indexer.yml +++ b/configs/egov-indexer/rainmaker-firenoc-indexer.yml @@ -228,7 +228,7 @@ ServiceMaps: - inJsonPath: $.MdmsRes.tenant.tenants outJsonPath: $.Data.tenantData - - topic: save-firenoc-legacyIndex + - topic: save-firenoc-legacyIndex configKey: INDEX indexes: - name: firenoc-services From 44efbd2e2f0c391cbcf95c503f6cd7f833dd4893 Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Wed, 16 Mar 2022 13:45:28 +0530 Subject: [PATCH 0988/1242] Added file "egov-echallan.yml" --- configs/egov-indexer/egov-echallan.yml | 244 +++++++++++++++++++++++++ 1 file changed, 244 insertions(+) create mode 100644 configs/egov-indexer/egov-echallan.yml diff --git a/configs/egov-indexer/egov-echallan.yml b/configs/egov-indexer/egov-echallan.yml new file mode 100644 index 00000000..4d9169ec --- /dev/null +++ b/configs/egov-indexer/egov-echallan.yml @@ -0,0 +1,244 @@ +ServiceMaps: + serviceName: echallan Service - rainmaker + version: 1.0.0 + mappings: + - topic: save-challan + configKey: INDEX + indexes: + - name: echallan-services + type: general + id: $.id,$.tenantId + jsonPath: $.Challan + timeStampField: $.auditDetails.createdTime + customJsonMapping: + indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","tenantId":"","businessService":"","challanNo":"","referenceId":"","description":"","accountId":"","additionalDetail":{},"source":"","taxPeriodFrom":"","taxPeriodTo":"","amount":[],"filestoreid":"","additionalDetails":{},"applicationStatus":"","vendor":"","typeOfExpense":"","billDate":"","billIssuedDate":"","paidDate":"","isBillPaid":"","vendorName":"","totalAmount":"","@timestamp":"timestamp","history":{},"ward":"" }} + fieldMapping: + - inJsonPath: $.applicationStatus.state + outJsonPath: $.Data.workflow.state + - inJsonPath: $.processInstance.action + outJsonPath: $.Data.workflow.action + - inJsonPath: $.processInstance.assignes.*.uuid + outJsonPath: $.Data.workflow.assignes + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.businessService + outJsonPath: $.Data.businessService + - inJsonPath: $.challanNo + outJsonPath: $.Data.challanNo + - inJsonPath: $.referenceId + outJsonPath: $.Data.referenceId + - inJsonPath: $.description + outJsonPath: $.Data.description + - inJsonPath: $.accountId + outJsonPath: $.Data.accountId + - inJsonPath: $.additionalDetail + outJsonPath: $.Data.additionalDetail + - inJsonPath: $.source + outJsonPath: $.Data.source + - inJsonPath: $.taxPeriodFrom + outJsonPath: $.Data.taxPeriodFrom + - inJsonPath: $.taxPeriodTo + outJsonPath: $.Data.taxPeriodTo + - inJsonPath: $.amount + outJsonPath: $.Data.amount + - inJsonPath: $.filestoreid + outJsonPath: $.Data.filestoreid + - inJsonPath: $.additionalDetails + outJsonPath: $.Data.additionalDetails + - inJsonPath: $.applicationStatus + outJsonPath: $.Data.applicationStatus + - inJsonPath: $.vendor + outJsonPath: $.Data.vendor + - inJsonPath: $.typeOfExpense + outJsonPath: $.Data.typeOfExpense + - inJsonPath: $.billDate + outJsonPath: $.Data.billDate + - inJsonPath: $.billIssuedDate + outJsonPath: $.Data.billIssuedDate + - inJsonPath: $.paidDate + outJsonPath: $.Data.paidDate + - inJsonPath: $.isBillPaid + outJsonPath: $.Data.isBillPaid + - inJsonPath: $.vendorName + outJsonPath: $.Data.vendorName + - inJsonPath: $.totalAmount + outJsonPath: $.Data.totalAmount + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + externalUriMapping: + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.acknowldgementNumber,history=true,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.echallan","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + + + - topic: update-challan + configKey: INDEX + indexes: + - name: echallan-services + type: general + id: $.id,$.tenantId + jsonPath: $.Challan + timeStampField: $.auditDetails.createdTime + customJsonMapping: + indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","tenantId":"","businessService":"","challanNo":"","referenceId":"","description":"","accountId":"","additionalDetail":{},"source":"","taxPeriodFrom":"","taxPeriodTo":"","amount":[],"filestoreid":"","additionalDetails":{},"applicationStatus":"","vendor":"","typeOfExpense":"","billDate":"","billIssuedDate":"","paidDate":"","isBillPaid":"","vendorName":"","totalAmount":"","@timestamp":"timestamp","history":{},"ward":"" }} + fieldMapping: + - inJsonPath: $.applicationStatus.state + outJsonPath: $.Data.workflow.state + - inJsonPath: $.processInstance.action + outJsonPath: $.Data.workflow.action + - inJsonPath: $.processInstance.assignes.*.uuid + outJsonPath: $.Data.workflow.assignes + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.businessService + outJsonPath: $.Data.businessService + - inJsonPath: $.challanNo + outJsonPath: $.Data.challanNo + - inJsonPath: $.referenceId + outJsonPath: $.Data.referenceId + - inJsonPath: $.description + outJsonPath: $.Data.description + - inJsonPath: $.accountId + outJsonPath: $.Data.accountId + - inJsonPath: $.additionalDetail + outJsonPath: $.Data.additionalDetail + - inJsonPath: $.source + outJsonPath: $.Data.source + - inJsonPath: $.taxPeriodFrom + outJsonPath: $.Data.taxPeriodFrom + - inJsonPath: $.taxPeriodTo + outJsonPath: $.Data.taxPeriodTo + - inJsonPath: $.amount + outJsonPath: $.Data.amount + - inJsonPath: $.filestoreid + outJsonPath: $.Data.filestoreid + - inJsonPath: $.additionalDetails + outJsonPath: $.Data.additionalDetails + - inJsonPath: $.applicationStatus + outJsonPath: $.Data.applicationStatus + - inJsonPath: $.vendor + outJsonPath: $.Data.vendor + - inJsonPath: $.typeOfExpense + outJsonPath: $.Data.typeOfExpense + - inJsonPath: $.billDate + outJsonPath: $.Data.billDate + - inJsonPath: $.billIssuedDate + outJsonPath: $.Data.billIssuedDate + - inJsonPath: $.paidDate + outJsonPath: $.Data.paidDate + - inJsonPath: $.isBillPaid + outJsonPath: $.Data.isBillPaid + - inJsonPath: $.vendorName + outJsonPath: $.Data.vendorName + - inJsonPath: $.totalAmount + outJsonPath: $.Data.totalAmount + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + externalUriMapping: + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.acknowldgementNumber,history=true,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.echallan","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + + + - topic: echallan-legacyIndex + configKey: LEGACYINDEX + indexes: + - name: echallan-services + type: general + isBulk: true + id: $.id,$.tenantId + jsonPath: $.challans.* + timeStampField: $.auditDetails.createdTime + customJsonMapping: + indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","tenantId":"","businessService":"","challanNo":"","referenceId":"","description":"","accountId":"","additionalDetail":{},"source":"","taxPeriodFrom":"","taxPeriodTo":"","amount":[],"filestoreid":"","additionalDetails":{},"applicationStatus":"","vendor":"","typeOfExpense":"","billDate":"","billIssuedDate":"","paidDate":"","isBillPaid":"","vendorName":"","totalAmount":"","@timestamp":"timestamp","history":{},"ward":"" }} + fieldMapping: + - inJsonPath: $.processInstance.action + outJsonPath: $.Data.workflow.action + - inJsonPath: $.processInstance.assignes.*.uuid + outJsonPath: $.Data.workflow.assignes + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.businessService + outJsonPath: $.Data.businessService + - inJsonPath: $.challanNo + outJsonPath: $.Data.challanNo + - inJsonPath: $.referenceId + outJsonPath: $.Data.referenceId + - inJsonPath: $.description + outJsonPath: $.Data.description + - inJsonPath: $.accountId + outJsonPath: $.Data.accountId + - inJsonPath: $.additionalDetail + outJsonPath: $.Data.additionalDetail + - inJsonPath: $.source + outJsonPath: $.Data.source + - inJsonPath: $.taxPeriodFrom + outJsonPath: $.Data.taxPeriodFrom + - inJsonPath: $.taxPeriodTo + outJsonPath: $.Data.taxPeriodTo + - inJsonPath: $.amount + outJsonPath: $.Data.amount + - inJsonPath: $.filestoreid + outJsonPath: $.Data.filestoreid + - inJsonPath: $.additionalDetails + outJsonPath: $.Data.additionalDetails + - inJsonPath: $.applicationStatus + outJsonPath: $.Data.applicationStatus + - inJsonPath: $.vendor + outJsonPath: $.Data.vendor + - inJsonPath: $.typeOfExpense + outJsonPath: $.Data.typeOfExpense + - inJsonPath: $.billDate + outJsonPath: $.Data.billDate + - inJsonPath: $.billIssuedDate + outJsonPath: $.Data.billIssuedDate + - inJsonPath: $.paidDate + outJsonPath: $.Data.paidDate + - inJsonPath: $.isBillPaid + outJsonPath: $.Data.isBillPaid + - inJsonPath: $.vendorName + outJsonPath: $.Data.vendorName + - inJsonPath: $.totalAmount + outJsonPath: $.Data.totalAmount + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + externalUriMapping: + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.acknowldgementNumber,history=true,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.echallan","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward From ac637d16124d168dcc454da6c9b2230282a26877 Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Wed, 16 Mar 2022 20:08:55 +0530 Subject: [PATCH 0989/1242] Added ward & external mapping --- configs/egov-indexer/payment-indexer.yml | 645 +++++++++++++++-------- 1 file changed, 433 insertions(+), 212 deletions(-) diff --git a/configs/egov-indexer/payment-indexer.yml b/configs/egov-indexer/payment-indexer.yml index 85cd0583..be08e84b 100644 --- a/configs/egov-indexer/payment-indexer.yml +++ b/configs/egov-indexer/payment-indexer.yml @@ -1,212 +1,433 @@ -ServiceMaps: - serviceName: Collection Services - version: 1.0.0 - mappings: - - topic: egov.collection.payment-create - configKey: INDEX - indexes: - - name: paymentsindex-v1 - type: payments - id: $.id - isBulk: false - timeStampField: $.auditDetails.createdTime - jsonPath: $.Payment - customJsonMapping: - indexMapping: {"Data":{"tenantId":"","id":"","transactionNumber":"","transactionDate":1,"paymentMode":"","paymentStatus":"","payer":{"id":"","name":""},"paidBy":"","paymentDetails":{},"auditDetails":{},"additionalDetails":{},"tenantData":{},"@timestamp":"timestamp"}} - fieldMapping: - - inJsonPath: $.tenantId - outJsonPath: $.Data.tenantId - - inJsonPath: $.id - outJsonPath: $.Data.id - - inJsonPath: $.transactionNumber - outJsonPath: $.Data.transactionNumber - - inJsonPath: $.transactionDate - outJsonPath: $.Data.transactionDate - - inJsonPath: $.paymentMode - outJsonPath: $.Data.paymentMode - - inJsonPath: $.paymentStatus - outJsonPath: $.Data.paymentStatus - - inJsonPath: $.payerId - outJsonPath: $.Data.payer.id - - inJsonPath: $.payerName - outJsonPath: $.Data.payer.name - - inJsonPath: $.paidBy - outJsonPath: $.Data.paidBy - - inJsonPath: $.paymentDetails - outJsonPath: $.Data.paymentDetails - - inJsonPath: $.auditDetails - outJsonPath: $.Data.auditDetails - - inJsonPath: $.additionalDetails - outJsonPath: $.Data.additionalDetails - - inJsonPath: $.@timestamp - outJsonPath: $.Data.@timestamp - mdmsMapping: - - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search - moduleName: tenant - masterName: tenants - tenantId: pb - filter: "[?(@.code == $tenant)]" - filterMapping: - - variable: $tenant - valueJsonpath: $.tenantId - uriResponseMapping: - - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.Data.tenantData - - - - topic: egov.collection.payment-update - configKey: INDEX - indexes: - - name: paymentsindex-v1 - type: payments - id: $.id - isBulk: false - timeStampField: $.auditDetails.createdTime - jsonPath: $.Payment - customJsonMapping: - indexMapping: {"Data":{"tenantId":"","id":"","transactionNumber":"","transactionDate":1,"paymentMode":"","paymentStatus":"","payer":{"id":"","name":""},"paidBy":"","paymentDetails":{},"auditDetails":{},"additionalDetails":{},"tenantData":{},"@timestamp":"timestamp"}} - fieldMapping: - - inJsonPath: $.tenantId - outJsonPath: $.Data.tenantId - - inJsonPath: $.id - outJsonPath: $.Data.id - - inJsonPath: $.transactionNumber - outJsonPath: $.Data.transactionNumber - - inJsonPath: $.transactionDate - outJsonPath: $.Data.transactionDate - - inJsonPath: $.paymentMode - outJsonPath: $.Data.paymentMode - - inJsonPath: $.paymentStatus - outJsonPath: $.Data.paymentStatus - - inJsonPath: $.payerId - outJsonPath: $.Data.payer.id - - inJsonPath: $.payerName - outJsonPath: $.Data.payer.name - - inJsonPath: $.paidBy - outJsonPath: $.Data.paidBy - - inJsonPath: $.paymentDetails - outJsonPath: $.Data.paymentDetails - - inJsonPath: $.auditDetails - outJsonPath: $.Data.auditDetails - - inJsonPath: $.additionalDetails - outJsonPath: $.Data.additionalDetails - - inJsonPath: $.@timestamp - outJsonPath: $.Data.@timestamp - mdmsMapping: - - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search - moduleName: tenant - masterName: tenants - tenantId: pb - filter: "[?(@.code == $tenant)]" - filterMapping: - - variable: $tenant - valueJsonpath: $.tenantId - uriResponseMapping: - - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.Data.tenantData - - - - topic: egov-payment-legacy-index - configKey: LEGACYINDEX - indexes: - - name: paymentsindex-v1 - type: payments - id: $.id - isBulk: true - timeStampField: $.auditDetails.createdTime - jsonPath: $.Payments.* - customJsonMapping: - indexMapping: {"Data":{"tenantId":"","id":"","transactionNumber":"","transactionDate":1,"paymentMode":"","paymentStatus":"","payer":{"id":"","name":""},"paidBy":"","paymentDetails":{},"auditDetails":{},"additionalDetails":{},"tenantData":{},"@timestamp":"timestamp"}} - fieldMapping: - - inJsonPath: $.tenantId - outJsonPath: $.Data.tenantId - - inJsonPath: $.id - outJsonPath: $.Data.id - - inJsonPath: $.transactionNumber - outJsonPath: $.Data.transactionNumber - - inJsonPath: $.transactionDate - outJsonPath: $.Data.transactionDate - - inJsonPath: $.paymentMode - outJsonPath: $.Data.paymentMode - - inJsonPath: $.paymentStatus - outJsonPath: $.Data.paymentStatus - - inJsonPath: $.payerId - outJsonPath: $.Data.payer.id - - inJsonPath: $.payerName - outJsonPath: $.Data.payer.name - - inJsonPath: $.paidBy - outJsonPath: $.Data.paidBy - - inJsonPath: $.paymentDetails - outJsonPath: $.Data.paymentDetails - - inJsonPath: $.auditDetails - outJsonPath: $.Data.auditDetails - - inJsonPath: $.additionalDetails - outJsonPath: $.Data.additionalDetails - - inJsonPath: $.@timestamp - outJsonPath: $.Data.@timestamp - mdmsMapping: - - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search - moduleName: tenant - masterName: tenants - tenantId: pb - filter: "[?(@.code == $tenant)]" - filterMapping: - - variable: $tenant - valueJsonpath: $.tenantId - uriResponseMapping: - - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.Data.tenantData - - - topic: egov.collection.payment-cancel - configKey: INDEX - indexes: - - name: paymentsindex-v1 - type: payments - id: $.id - isBulk: false - timeStampField: $.auditDetails.createdTime - jsonPath: $.Payment - customJsonMapping: - indexMapping: {"Data":{"tenantId":"","id":"","transactionNumber":"","transactionDate":1,"paymentMode":"","paymentStatus":"","payer":{"id":"","name":""},"paidBy":"","paymentDetails":{},"auditDetails":{},"additionalDetails":{},"tenantData":{},"@timestamp":"timestamp"}} - fieldMapping: - - inJsonPath: $.tenantId - outJsonPath: $.Data.tenantId - - inJsonPath: $.id - outJsonPath: $.Data.id - - inJsonPath: $.transactionNumber - outJsonPath: $.Data.transactionNumber - - inJsonPath: $.transactionDate - outJsonPath: $.Data.transactionDate - - inJsonPath: $.paymentMode - outJsonPath: $.Data.paymentMode - - inJsonPath: $.paymentStatus - outJsonPath: $.Data.paymentStatus - - inJsonPath: $.payerId - outJsonPath: $.Data.payer.id - - inJsonPath: $.payerName - outJsonPath: $.Data.payer.name - - inJsonPath: $.paidBy - outJsonPath: $.Data.paidBy - - inJsonPath: $.paymentDetails - outJsonPath: $.Data.paymentDetails - - inJsonPath: $.auditDetails - outJsonPath: $.Data.auditDetails - - inJsonPath: $.additionalDetails - outJsonPath: $.Data.additionalDetails - - inJsonPath: $.@timestamp - outJsonPath: $.Data.@timestamp - mdmsMapping: - - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search - moduleName: tenant - masterName: tenants - tenantId: pb - filter: "[?(@.code == $tenant)]" - filterMapping: - - variable: $tenant - valueJsonpath: $.tenantId - uriResponseMapping: - - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.Data.tenantData - - - +--- +ServiceMaps: + mappings: + - + configKey: INDEX + indexes: + - + customJsonMapping: + externalUriMapping: + - + apiRequest: + RequestInfo: + action: asd + apiId: org.egov.pt + authToken: 02dbe5be-28df-4d82-954f-3d27c56cca7d + did: "4354648646" + key: xyz + msgId: "654654" + requesterId: "61" + ts: 1502890899493 + userInfo: + id: 73 + ver: "1.0" + path: "http://egov-location:8080/egov-location/location/v11/boundarys/_search" + queryParam: "hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId" + uriResponseMapping: + - + inJsonPath: "$.TenantBoundary[0].boundary[0]" + outJsonPath: $.Data.ward + fieldMapping: + - + inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - + inJsonPath: $.id + outJsonPath: $.Data.id + - + inJsonPath: $.transactionNumber + outJsonPath: $.Data.transactionNumber + - + inJsonPath: $.transactionDate + outJsonPath: $.Data.transactionDate + - + inJsonPath: $.paymentMode + outJsonPath: $.Data.paymentMode + - + inJsonPath: $.paymentStatus + outJsonPath: $.Data.paymentStatus + - + inJsonPath: $.payerId + outJsonPath: $.Data.payer.id + - + inJsonPath: $.payerName + outJsonPath: $.Data.payer.name + - + inJsonPath: $.paidBy + outJsonPath: $.Data.paidBy + - + inJsonPath: $.paymentDetails + outJsonPath: $.Data.paymentDetails + - + inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - + inJsonPath: $.additionalDetails + outJsonPath: $.Data.additionalDetails + - + inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + indexMapping: + Data: + ? "@timestamp" + : timestamp + additionalDetails: {} + auditDetails: {} + id: "" + paidBy: "" + payer: + id: "" + name: "" + paymentDetails: {} + paymentMode: "" + paymentStatus: "" + tenantData: {} + tenantId: "" + transactionDate: 1 + transactionNumber: "" + ward: {} + mdmsMapping: + - + filter: "[?(@.code == $tenant)]" + filterMapping: + - + valueJsonpath: $.tenantId + variable: $tenant + masterName: tenants + moduleName: tenant + path: "http://egov-mdms-service:8080/egov-mdms-service/v1/_search" + tenantId: pb + uriResponseMapping: + - + inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData + id: $.id + isBulk: false + jsonPath: $.Payment + name: paymentsindex-v1 + timeStampField: $.auditDetails.createdTime + type: payments + topic: egov.collection.payment-create + - + configKey: INDEX + indexes: + - + customJsonMapping: + externalUriMapping: + - + apiRequest: + RequestInfo: + action: asd + apiId: org.egov.pt + authToken: 02dbe5be-28df-4d82-954f-3d27c56cca7d + did: "4354648646" + key: xyz + msgId: "654654" + requesterId: "61" + ts: 1502890899493 + userInfo: + id: 73 + ver: "1.0" + path: "http://egov-location:8080/egov-location/location/v11/boundarys/_search" + queryParam: "hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId" + uriResponseMapping: + - + inJsonPath: "$.TenantBoundary[0].boundary[0]" + outJsonPath: $.Data.ward + fieldMapping: + - + inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - + inJsonPath: $.id + outJsonPath: $.Data.id + - + inJsonPath: $.transactionNumber + outJsonPath: $.Data.transactionNumber + - + inJsonPath: $.transactionDate + outJsonPath: $.Data.transactionDate + - + inJsonPath: $.paymentMode + outJsonPath: $.Data.paymentMode + - + inJsonPath: $.paymentStatus + outJsonPath: $.Data.paymentStatus + - + inJsonPath: $.payerId + outJsonPath: $.Data.payer.id + - + inJsonPath: $.payerName + outJsonPath: $.Data.payer.name + - + inJsonPath: $.paidBy + outJsonPath: $.Data.paidBy + - + inJsonPath: $.paymentDetails + outJsonPath: $.Data.paymentDetails + - + inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - + inJsonPath: $.additionalDetails + outJsonPath: $.Data.additionalDetails + - + inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + indexMapping: + Data: + ? "@timestamp" + : timestamp + additionalDetails: {} + auditDetails: {} + id: "" + paidBy: "" + payer: + id: "" + name: "" + paymentDetails: {} + paymentMode: "" + paymentStatus: "" + tenantData: {} + tenantId: "" + transactionDate: 1 + transactionNumber: "" + ward: {} + mdmsMapping: + - + filter: "[?(@.code == $tenant)]" + filterMapping: + - + valueJsonpath: $.tenantId + variable: $tenant + masterName: tenants + moduleName: tenant + path: "http://egov-mdms-service:8080/egov-mdms-service/v1/_search" + tenantId: pb + uriResponseMapping: + - + inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData + id: $.id + isBulk: false + jsonPath: $.Payment + name: paymentsindex-v1 + timeStampField: $.auditDetails.createdTime + type: payments + topic: egov.collection.payment-update + - + configKey: LEGACYINDEX + indexes: + - + customJsonMapping: + externalUriMapping: + - + apiRequest: + RequestInfo: + action: asd + apiId: org.egov.pt + authToken: 02dbe5be-28df-4d82-954f-3d27c56cca7d + did: "4354648646" + key: xyz + msgId: "654654" + requesterId: "61" + ts: 1502890899493 + userInfo: + id: 73 + ver: "1.0" + path: "http://egov-location:8080/egov-location/location/v11/boundarys/_search" + queryParam: "hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId" + uriResponseMapping: + - + inJsonPath: "$.TenantBoundary[0].boundary[0]" + outJsonPath: $.Data.ward + fieldMapping: + - + inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - + inJsonPath: $.id + outJsonPath: $.Data.id + - + inJsonPath: $.transactionNumber + outJsonPath: $.Data.transactionNumber + - + inJsonPath: $.transactionDate + outJsonPath: $.Data.transactionDate + - + inJsonPath: $.paymentMode + outJsonPath: $.Data.paymentMode + - + inJsonPath: $.paymentStatus + outJsonPath: $.Data.paymentStatus + - + inJsonPath: $.payerId + outJsonPath: $.Data.payer.id + - + inJsonPath: $.payerName + outJsonPath: $.Data.payer.name + - + inJsonPath: $.paidBy + outJsonPath: $.Data.paidBy + - + inJsonPath: $.paymentDetails + outJsonPath: $.Data.paymentDetails + - + inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - + inJsonPath: $.additionalDetails + outJsonPath: $.Data.additionalDetails + - + inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + indexMapping: + Data: + ? "@timestamp" + : timestamp + additionalDetails: {} + auditDetails: {} + id: "" + paidBy: "" + payer: + id: "" + name: "" + paymentDetails: {} + paymentMode: "" + paymentStatus: "" + tenantData: {} + tenantId: "" + transactionDate: 1 + transactionNumber: "" + ward: {} + mdmsMapping: + - + filter: "[?(@.code == $tenant)]" + filterMapping: + - + valueJsonpath: $.tenantId + variable: $tenant + masterName: tenants + moduleName: tenant + path: "http://egov-mdms-service:8080/egov-mdms-service/v1/_search" + tenantId: pb + uriResponseMapping: + - + inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData + id: $.id + isBulk: true + jsonPath: $.Payments.* + name: paymentsindex-v1 + timeStampField: $.auditDetails.createdTime + type: payments + topic: egov-payment-legacy-index + - + configKey: INDEX + indexes: + - + customJsonMapping: + externalUriMapping: + - + apiRequest: + RequestInfo: + action: asd + apiId: org.egov.pt + authToken: 02dbe5be-28df-4d82-954f-3d27c56cca7d + did: "4354648646" + key: xyz + msgId: "654654" + requesterId: "61" + ts: 1502890899493 + userInfo: + id: 73 + ver: "1.0" + path: "http://egov-location:8080/egov-location/location/v11/boundarys/_search" + queryParam: "hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId" + uriResponseMapping: + - + inJsonPath: "$.TenantBoundary[0].boundary[0]" + outJsonPath: $.Data.ward + fieldMapping: + - + inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - + inJsonPath: $.id + outJsonPath: $.Data.id + - + inJsonPath: $.transactionNumber + outJsonPath: $.Data.transactionNumber + - + inJsonPath: $.transactionDate + outJsonPath: $.Data.transactionDate + - + inJsonPath: $.paymentMode + outJsonPath: $.Data.paymentMode + - + inJsonPath: $.paymentStatus + outJsonPath: $.Data.paymentStatus + - + inJsonPath: $.payerId + outJsonPath: $.Data.payer.id + - + inJsonPath: $.payerName + outJsonPath: $.Data.payer.name + - + inJsonPath: $.paidBy + outJsonPath: $.Data.paidBy + - + inJsonPath: $.paymentDetails + outJsonPath: $.Data.paymentDetails + - + inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - + inJsonPath: $.additionalDetails + outJsonPath: $.Data.additionalDetails + - + inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + indexMapping: + Data: + ? "@timestamp" + : timestamp + additionalDetails: {} + auditDetails: {} + id: "" + paidBy: "" + payer: + id: "" + name: "" + paymentDetails: {} + paymentMode: "" + paymentStatus: "" + tenantData: {} + tenantId: "" + transactionDate: 1 + transactionNumber: "" + ward: {} + mdmsMapping: + - + filter: "[?(@.code == $tenant)]" + filterMapping: + - + valueJsonpath: $.tenantId + variable: $tenant + masterName: tenants + moduleName: tenant + path: "http://egov-mdms-service:8080/egov-mdms-service/v1/_search" + tenantId: pb + uriResponseMapping: + - + inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData + id: $.id + isBulk: false + jsonPath: $.Payment + name: paymentsindex-v1 + timeStampField: $.auditDetails.createdTime + type: payments + topic: egov.collection.payment-cancel + serviceName: "Collection Services" + version: "1.0.0" From 2149b1cdcc64a777dc82c70d10c57eab9501397a Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Wed, 16 Mar 2022 20:14:24 +0530 Subject: [PATCH 0990/1242] Added ward & external mapping --- configs/egov-indexer/payment-indexer.yml | 678 ++++++++--------------- 1 file changed, 245 insertions(+), 433 deletions(-) diff --git a/configs/egov-indexer/payment-indexer.yml b/configs/egov-indexer/payment-indexer.yml index be08e84b..61b3e59a 100644 --- a/configs/egov-indexer/payment-indexer.yml +++ b/configs/egov-indexer/payment-indexer.yml @@ -1,433 +1,245 @@ ---- -ServiceMaps: - mappings: - - - configKey: INDEX - indexes: - - - customJsonMapping: - externalUriMapping: - - - apiRequest: - RequestInfo: - action: asd - apiId: org.egov.pt - authToken: 02dbe5be-28df-4d82-954f-3d27c56cca7d - did: "4354648646" - key: xyz - msgId: "654654" - requesterId: "61" - ts: 1502890899493 - userInfo: - id: 73 - ver: "1.0" - path: "http://egov-location:8080/egov-location/location/v11/boundarys/_search" - queryParam: "hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId" - uriResponseMapping: - - - inJsonPath: "$.TenantBoundary[0].boundary[0]" - outJsonPath: $.Data.ward - fieldMapping: - - - inJsonPath: $.tenantId - outJsonPath: $.Data.tenantId - - - inJsonPath: $.id - outJsonPath: $.Data.id - - - inJsonPath: $.transactionNumber - outJsonPath: $.Data.transactionNumber - - - inJsonPath: $.transactionDate - outJsonPath: $.Data.transactionDate - - - inJsonPath: $.paymentMode - outJsonPath: $.Data.paymentMode - - - inJsonPath: $.paymentStatus - outJsonPath: $.Data.paymentStatus - - - inJsonPath: $.payerId - outJsonPath: $.Data.payer.id - - - inJsonPath: $.payerName - outJsonPath: $.Data.payer.name - - - inJsonPath: $.paidBy - outJsonPath: $.Data.paidBy - - - inJsonPath: $.paymentDetails - outJsonPath: $.Data.paymentDetails - - - inJsonPath: $.auditDetails - outJsonPath: $.Data.auditDetails - - - inJsonPath: $.additionalDetails - outJsonPath: $.Data.additionalDetails - - - inJsonPath: $.@timestamp - outJsonPath: $.Data.@timestamp - indexMapping: - Data: - ? "@timestamp" - : timestamp - additionalDetails: {} - auditDetails: {} - id: "" - paidBy: "" - payer: - id: "" - name: "" - paymentDetails: {} - paymentMode: "" - paymentStatus: "" - tenantData: {} - tenantId: "" - transactionDate: 1 - transactionNumber: "" - ward: {} - mdmsMapping: - - - filter: "[?(@.code == $tenant)]" - filterMapping: - - - valueJsonpath: $.tenantId - variable: $tenant - masterName: tenants - moduleName: tenant - path: "http://egov-mdms-service:8080/egov-mdms-service/v1/_search" - tenantId: pb - uriResponseMapping: - - - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.Data.tenantData - id: $.id - isBulk: false - jsonPath: $.Payment - name: paymentsindex-v1 - timeStampField: $.auditDetails.createdTime - type: payments - topic: egov.collection.payment-create - - - configKey: INDEX - indexes: - - - customJsonMapping: - externalUriMapping: - - - apiRequest: - RequestInfo: - action: asd - apiId: org.egov.pt - authToken: 02dbe5be-28df-4d82-954f-3d27c56cca7d - did: "4354648646" - key: xyz - msgId: "654654" - requesterId: "61" - ts: 1502890899493 - userInfo: - id: 73 - ver: "1.0" - path: "http://egov-location:8080/egov-location/location/v11/boundarys/_search" - queryParam: "hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId" - uriResponseMapping: - - - inJsonPath: "$.TenantBoundary[0].boundary[0]" - outJsonPath: $.Data.ward - fieldMapping: - - - inJsonPath: $.tenantId - outJsonPath: $.Data.tenantId - - - inJsonPath: $.id - outJsonPath: $.Data.id - - - inJsonPath: $.transactionNumber - outJsonPath: $.Data.transactionNumber - - - inJsonPath: $.transactionDate - outJsonPath: $.Data.transactionDate - - - inJsonPath: $.paymentMode - outJsonPath: $.Data.paymentMode - - - inJsonPath: $.paymentStatus - outJsonPath: $.Data.paymentStatus - - - inJsonPath: $.payerId - outJsonPath: $.Data.payer.id - - - inJsonPath: $.payerName - outJsonPath: $.Data.payer.name - - - inJsonPath: $.paidBy - outJsonPath: $.Data.paidBy - - - inJsonPath: $.paymentDetails - outJsonPath: $.Data.paymentDetails - - - inJsonPath: $.auditDetails - outJsonPath: $.Data.auditDetails - - - inJsonPath: $.additionalDetails - outJsonPath: $.Data.additionalDetails - - - inJsonPath: $.@timestamp - outJsonPath: $.Data.@timestamp - indexMapping: - Data: - ? "@timestamp" - : timestamp - additionalDetails: {} - auditDetails: {} - id: "" - paidBy: "" - payer: - id: "" - name: "" - paymentDetails: {} - paymentMode: "" - paymentStatus: "" - tenantData: {} - tenantId: "" - transactionDate: 1 - transactionNumber: "" - ward: {} - mdmsMapping: - - - filter: "[?(@.code == $tenant)]" - filterMapping: - - - valueJsonpath: $.tenantId - variable: $tenant - masterName: tenants - moduleName: tenant - path: "http://egov-mdms-service:8080/egov-mdms-service/v1/_search" - tenantId: pb - uriResponseMapping: - - - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.Data.tenantData - id: $.id - isBulk: false - jsonPath: $.Payment - name: paymentsindex-v1 - timeStampField: $.auditDetails.createdTime - type: payments - topic: egov.collection.payment-update - - - configKey: LEGACYINDEX - indexes: - - - customJsonMapping: - externalUriMapping: - - - apiRequest: - RequestInfo: - action: asd - apiId: org.egov.pt - authToken: 02dbe5be-28df-4d82-954f-3d27c56cca7d - did: "4354648646" - key: xyz - msgId: "654654" - requesterId: "61" - ts: 1502890899493 - userInfo: - id: 73 - ver: "1.0" - path: "http://egov-location:8080/egov-location/location/v11/boundarys/_search" - queryParam: "hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId" - uriResponseMapping: - - - inJsonPath: "$.TenantBoundary[0].boundary[0]" - outJsonPath: $.Data.ward - fieldMapping: - - - inJsonPath: $.tenantId - outJsonPath: $.Data.tenantId - - - inJsonPath: $.id - outJsonPath: $.Data.id - - - inJsonPath: $.transactionNumber - outJsonPath: $.Data.transactionNumber - - - inJsonPath: $.transactionDate - outJsonPath: $.Data.transactionDate - - - inJsonPath: $.paymentMode - outJsonPath: $.Data.paymentMode - - - inJsonPath: $.paymentStatus - outJsonPath: $.Data.paymentStatus - - - inJsonPath: $.payerId - outJsonPath: $.Data.payer.id - - - inJsonPath: $.payerName - outJsonPath: $.Data.payer.name - - - inJsonPath: $.paidBy - outJsonPath: $.Data.paidBy - - - inJsonPath: $.paymentDetails - outJsonPath: $.Data.paymentDetails - - - inJsonPath: $.auditDetails - outJsonPath: $.Data.auditDetails - - - inJsonPath: $.additionalDetails - outJsonPath: $.Data.additionalDetails - - - inJsonPath: $.@timestamp - outJsonPath: $.Data.@timestamp - indexMapping: - Data: - ? "@timestamp" - : timestamp - additionalDetails: {} - auditDetails: {} - id: "" - paidBy: "" - payer: - id: "" - name: "" - paymentDetails: {} - paymentMode: "" - paymentStatus: "" - tenantData: {} - tenantId: "" - transactionDate: 1 - transactionNumber: "" - ward: {} - mdmsMapping: - - - filter: "[?(@.code == $tenant)]" - filterMapping: - - - valueJsonpath: $.tenantId - variable: $tenant - masterName: tenants - moduleName: tenant - path: "http://egov-mdms-service:8080/egov-mdms-service/v1/_search" - tenantId: pb - uriResponseMapping: - - - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.Data.tenantData - id: $.id - isBulk: true - jsonPath: $.Payments.* - name: paymentsindex-v1 - timeStampField: $.auditDetails.createdTime - type: payments - topic: egov-payment-legacy-index - - - configKey: INDEX - indexes: - - - customJsonMapping: - externalUriMapping: - - - apiRequest: - RequestInfo: - action: asd - apiId: org.egov.pt - authToken: 02dbe5be-28df-4d82-954f-3d27c56cca7d - did: "4354648646" - key: xyz - msgId: "654654" - requesterId: "61" - ts: 1502890899493 - userInfo: - id: 73 - ver: "1.0" - path: "http://egov-location:8080/egov-location/location/v11/boundarys/_search" - queryParam: "hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId" - uriResponseMapping: - - - inJsonPath: "$.TenantBoundary[0].boundary[0]" - outJsonPath: $.Data.ward - fieldMapping: - - - inJsonPath: $.tenantId - outJsonPath: $.Data.tenantId - - - inJsonPath: $.id - outJsonPath: $.Data.id - - - inJsonPath: $.transactionNumber - outJsonPath: $.Data.transactionNumber - - - inJsonPath: $.transactionDate - outJsonPath: $.Data.transactionDate - - - inJsonPath: $.paymentMode - outJsonPath: $.Data.paymentMode - - - inJsonPath: $.paymentStatus - outJsonPath: $.Data.paymentStatus - - - inJsonPath: $.payerId - outJsonPath: $.Data.payer.id - - - inJsonPath: $.payerName - outJsonPath: $.Data.payer.name - - - inJsonPath: $.paidBy - outJsonPath: $.Data.paidBy - - - inJsonPath: $.paymentDetails - outJsonPath: $.Data.paymentDetails - - - inJsonPath: $.auditDetails - outJsonPath: $.Data.auditDetails - - - inJsonPath: $.additionalDetails - outJsonPath: $.Data.additionalDetails - - - inJsonPath: $.@timestamp - outJsonPath: $.Data.@timestamp - indexMapping: - Data: - ? "@timestamp" - : timestamp - additionalDetails: {} - auditDetails: {} - id: "" - paidBy: "" - payer: - id: "" - name: "" - paymentDetails: {} - paymentMode: "" - paymentStatus: "" - tenantData: {} - tenantId: "" - transactionDate: 1 - transactionNumber: "" - ward: {} - mdmsMapping: - - - filter: "[?(@.code == $tenant)]" - filterMapping: - - - valueJsonpath: $.tenantId - variable: $tenant - masterName: tenants - moduleName: tenant - path: "http://egov-mdms-service:8080/egov-mdms-service/v1/_search" - tenantId: pb - uriResponseMapping: - - - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.Data.tenantData - id: $.id - isBulk: false - jsonPath: $.Payment - name: paymentsindex-v1 - timeStampField: $.auditDetails.createdTime - type: payments - topic: egov.collection.payment-cancel - serviceName: "Collection Services" - version: "1.0.0" +ServiceMaps: + serviceName: Collection Services + version: 1.0.0 + mappings: + - topic: egov.collection.payment-create + configKey: INDEX + indexes: + - name: paymentsindex-v1 + type: payments + id: $.id + isBulk: false + timeStampField: $.auditDetails.createdTime + jsonPath: $.Payment + customJsonMapping: + indexMapping: {"Data":{"tenantId":"","id":"","transactionNumber":"","transactionDate":1,"paymentMode":"","paymentStatus":"","payer":{"id":"","name":""},"paidBy":"","paymentDetails":{},"auditDetails":{},"additionalDetails":{},"tenantData":{},"@timestamp":"timestamp","ward":{}}} + fieldMapping: + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.transactionNumber + outJsonPath: $.Data.transactionNumber + - inJsonPath: $.transactionDate + outJsonPath: $.Data.transactionDate + - inJsonPath: $.paymentMode + outJsonPath: $.Data.paymentMode + - inJsonPath: $.paymentStatus + outJsonPath: $.Data.paymentStatus + - inJsonPath: $.payerId + outJsonPath: $.Data.payer.id + - inJsonPath: $.payerName + outJsonPath: $.Data.payer.name + - inJsonPath: $.paidBy + outJsonPath: $.Data.paidBy + - inJsonPath: $.paymentDetails + outJsonPath: $.Data.paymentDetails + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - inJsonPath: $.additionalDetails + outJsonPath: $.Data.additionalDetails + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + + externalUriMapping: + - path: http://egov-location:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + mdmsMapping: + - path: http://egov-mdms-service:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData + + + - topic: egov.collection.payment-update + configKey: INDEX + indexes: + - name: paymentsindex-v1 + type: payments + id: $.id + isBulk: false + timeStampField: $.auditDetails.createdTime + jsonPath: $.Payment + customJsonMapping: + indexMapping: {"Data":{"tenantId":"","id":"","transactionNumber":"","transactionDate":1,"paymentMode":"","paymentStatus":"","payer":{"id":"","name":""},"paidBy":"","paymentDetails":{},"auditDetails":{},"additionalDetails":{},"tenantData":{},"@timestamp":"timestamp","ward":{}}} + fieldMapping: + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.transactionNumber + outJsonPath: $.Data.transactionNumber + - inJsonPath: $.transactionDate + outJsonPath: $.Data.transactionDate + - inJsonPath: $.paymentMode + outJsonPath: $.Data.paymentMode + - inJsonPath: $.paymentStatus + outJsonPath: $.Data.paymentStatus + - inJsonPath: $.payerId + outJsonPath: $.Data.payer.id + - inJsonPath: $.payerName + outJsonPath: $.Data.payer.name + - inJsonPath: $.paidBy + outJsonPath: $.Data.paidBy + - inJsonPath: $.paymentDetails + outJsonPath: $.Data.paymentDetails + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - inJsonPath: $.additionalDetails + outJsonPath: $.Data.additionalDetails + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + externalUriMapping: + - path: http://egov-location:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + mdmsMapping: + - path: http://egov-mdms-service:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData + + + - topic: egov-payment-legacy-index + configKey: LEGACYINDEX + indexes: + - name: paymentsindex-v1 + type: payments + id: $.id + isBulk: true + timeStampField: $.auditDetails.createdTime + jsonPath: $.Payments.* + customJsonMapping: + indexMapping: {"Data":{"tenantId":"","id":"","transactionNumber":"","transactionDate":1,"paymentMode":"","paymentStatus":"","payer":{"id":"","name":""},"paidBy":"","paymentDetails":{},"auditDetails":{},"additionalDetails":{},"tenantData":{},"@timestamp":"timestamp","ward":{}}} + fieldMapping: + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.transactionNumber + outJsonPath: $.Data.transactionNumber + - inJsonPath: $.transactionDate + outJsonPath: $.Data.transactionDate + - inJsonPath: $.paymentMode + outJsonPath: $.Data.paymentMode + - inJsonPath: $.paymentStatus + outJsonPath: $.Data.paymentStatus + - inJsonPath: $.payerId + outJsonPath: $.Data.payer.id + - inJsonPath: $.payerName + outJsonPath: $.Data.payer.name + - inJsonPath: $.paidBy + outJsonPath: $.Data.paidBy + - inJsonPath: $.paymentDetails + outJsonPath: $.Data.paymentDetails + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - inJsonPath: $.additionalDetails + outJsonPath: $.Data.additionalDetails + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + externalUriMapping: + - path: http://egov-location:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + mdmsMapping: + - path: http://egov-mdms-service:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData + + - topic: egov.collection.payment-cancel + configKey: INDEX + indexes: + - name: paymentsindex-v1 + type: payments + id: $.id + isBulk: false + timeStampField: $.auditDetails.createdTime + jsonPath: $.Payment + customJsonMapping: + indexMapping: {"Data":{"tenantId":"","id":"","transactionNumber":"","transactionDate":1,"paymentMode":"","paymentStatus":"","payer":{"id":"","name":""},"paidBy":"","paymentDetails":{},"auditDetails":{},"additionalDetails":{},"tenantData":{},"@timestamp":"timestamp","ward":{}}} + fieldMapping: + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.transactionNumber + outJsonPath: $.Data.transactionNumber + - inJsonPath: $.transactionDate + outJsonPath: $.Data.transactionDate + - inJsonPath: $.paymentMode + outJsonPath: $.Data.paymentMode + - inJsonPath: $.paymentStatus + outJsonPath: $.Data.paymentStatus + - inJsonPath: $.payerId + outJsonPath: $.Data.payer.id + - inJsonPath: $.payerName + outJsonPath: $.Data.payer.name + - inJsonPath: $.paidBy + outJsonPath: $.Data.paidBy + - inJsonPath: $.paymentDetails + outJsonPath: $.Data.paymentDetails + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - inJsonPath: $.additionalDetails + outJsonPath: $.Data.additionalDetails + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + externalUriMapping: + - path: http://egov-location:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + mdmsMapping: + - path: http://egov-mdms-service:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData + + + From 3b0b28b433ff3d5df222fd4109f225bf00358f9a Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Wed, 16 Mar 2022 20:35:31 +0530 Subject: [PATCH 0991/1242] Added address field --- configs/egov-indexer/payment-indexer.yml | 261 ++++++++++++++++++++++- 1 file changed, 257 insertions(+), 4 deletions(-) diff --git a/configs/egov-indexer/payment-indexer.yml b/configs/egov-indexer/payment-indexer.yml index 61b3e59a..8a8862ec 100644 --- a/configs/egov-indexer/payment-indexer.yml +++ b/configs/egov-indexer/payment-indexer.yml @@ -12,7 +12,49 @@ ServiceMaps: timeStampField: $.auditDetails.createdTime jsonPath: $.Payment customJsonMapping: - indexMapping: {"Data":{"tenantId":"","id":"","transactionNumber":"","transactionDate":1,"paymentMode":"","paymentStatus":"","payer":{"id":"","name":""},"paidBy":"","paymentDetails":{},"auditDetails":{},"additionalDetails":{},"tenantData":{},"@timestamp":"timestamp","ward":{}}} + indexMapping: {"Data":{"tenantId":"","id":"","transactionNumber":"","transactionDate":1,"paymentMode":"","paymentStatus":"","payer":{"id":"","name":""},"paidBy":"","paymentDetails":{},"auditDetails":{},"additionalDetails":{},"tenantData":{},"@timestamp":"timestamp","address":{},"ward":{}}} + fieldMapping: + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.transactionNumber + outJsonPath: $.Data.transactionNumber + - inJsonPath: $.transactionDate + outJsonPath: $.Data.transactionDate + - inJsonPath: $.paymentMode + outJsonPath: $.Data.paymentMode + - inJsonPath: $.paymentStatus + outJsonPath: $.Data.paymentStatus + - inJsonPath: $.payerId + outJsonPath: $.Data.payer.id + - inJsonPath: $.payerName + outJsonPath: $.Data.payer.name + - inJsonPath: $.paidBy + outJsonPath: $.Data.paidBy + - inJsonPath: $.paymentDetails + outJsonPath: $.Data.paymentDetails + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - inJsonPath: $.additionalDetails + outJsonPath: $.Data.additionalDetails + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + ServiceMaps: + serviceName: Collection Services + version: 1.0.0 + mappings: + - topic: egov.collection.payment-create + configKey: INDEX + indexes: + - name: paymentsindex-v1 + type: payments + id: $.id + isBulk: false + timeStampField: $.auditDetails.createdTime + jsonPath: $.Payment + customJsonMapping: + indexMapping: {"Data":{"tenantId":"","id":"","transactionNumber":"","transactionDate":1,"paymentMode":"","paymentStatus":"","payer":{"id":"","name":""},"paidBy":"","paymentDetails":{},"auditDetails":{},"additionalDetails":{},"tenantData":{},"@timestamp":"timestamp","address":{},"ward":{}}} fieldMapping: - inJsonPath: $.tenantId outJsonPath: $.Data.tenantId @@ -73,7 +115,212 @@ ServiceMaps: timeStampField: $.auditDetails.createdTime jsonPath: $.Payment customJsonMapping: - indexMapping: {"Data":{"tenantId":"","id":"","transactionNumber":"","transactionDate":1,"paymentMode":"","paymentStatus":"","payer":{"id":"","name":""},"paidBy":"","paymentDetails":{},"auditDetails":{},"additionalDetails":{},"tenantData":{},"@timestamp":"timestamp","ward":{}}} + indexMapping: {"Data":{"tenantId":"","id":"","transactionNumber":"","transactionDate":1,"paymentMode":"","paymentStatus":"","payer":{"id":"","name":""},"paidBy":"","paymentDetails":{},"auditDetails":{},"additionalDetails":{},"tenantData":{},"@timestamp":"timestamp","address":{},"ward":{}}} + fieldMapping: + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.transactionNumber + outJsonPath: $.Data.transactionNumber + - inJsonPath: $.transactionDate + outJsonPath: $.Data.transactionDate + - inJsonPath: $.paymentMode + outJsonPath: $.Data.paymentMode + - inJsonPath: $.paymentStatus + outJsonPath: $.Data.paymentStatus + - inJsonPath: $.payerId + outJsonPath: $.Data.payer.id + - inJsonPath: $.payerName + outJsonPath: $.Data.payer.name + - inJsonPath: $.paidBy + outJsonPath: $.Data.paidBy + - inJsonPath: $.paymentDetails + outJsonPath: $.Data.paymentDetails + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - inJsonPath: $.additionalDetails + outJsonPath: $.Data.additionalDetails + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + - inJsonPath: $.address + outJsonPath: $.Data.address + externalUriMapping: + - path: http://egov-location:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + mdmsMapping: + - path: http://egov-mdms-service:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData + + + - topic: egov-payment-legacy-index + configKey: LEGACYINDEX + indexes: + - name: paymentsindex-v1 + type: payments + id: $.id + isBulk: true + timeStampField: $.auditDetails.createdTime + jsonPath: $.Payments.* + customJsonMapping: + indexMapping: {"Data":{"tenantId":"","id":"","transactionNumber":"","transactionDate":1,"paymentMode":"","paymentStatus":"","payer":{"id":"","name":""},"paidBy":"","paymentDetails":{},"auditDetails":{},"additionalDetails":{},"tenantData":{},"@timestamp":"timestamp","address":{},"ward":{}}} + fieldMapping: + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.transactionNumber + outJsonPath: $.Data.transactionNumber + - inJsonPath: $.transactionDate + outJsonPath: $.Data.transactionDate + - inJsonPath: $.paymentMode + outJsonPath: $.Data.paymentMode + - inJsonPath: $.paymentStatus + outJsonPath: $.Data.paymentStatus + - inJsonPath: $.payerId + outJsonPath: $.Data.payer.id + - inJsonPath: $.payerName + outJsonPath: $.Data.payer.name + - inJsonPath: $.paidBy + outJsonPath: $.Data.paidBy + - inJsonPath: $.paymentDetails + outJsonPath: $.Data.paymentDetails + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - inJsonPath: $.additionalDetails + outJsonPath: $.Data.additionalDetails + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + - inJsonPath: $.address + outJsonPath: $.Data.address + externalUriMapping: + - path: http://egov-location:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + mdmsMapping: + - path: http://egov-mdms-service:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData + + - topic: egov.collection.payment-cancel + configKey: INDEX + indexes: + - name: paymentsindex-v1 + type: payments + id: $.id + isBulk: false + timeStampField: $.auditDetails.createdTime + jsonPath: $.Payment + customJsonMapping: + indexMapping: {"Data":{"tenantId":"","id":"","transactionNumber":"","transactionDate":1,"paymentMode":"","paymentStatus":"","payer":{"id":"","name":""},"paidBy":"","paymentDetails":{},"auditDetails":{},"additionalDetails":{},"tenantData":{},"@timestamp":"timestamp","address":{},"ward":{}}} + fieldMapping: + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.transactionNumber + outJsonPath: $.Data.transactionNumber + - inJsonPath: $.transactionDate + outJsonPath: $.Data.transactionDate + - inJsonPath: $.paymentMode + outJsonPath: $.Data.paymentMode + - inJsonPath: $.paymentStatus + outJsonPath: $.Data.paymentStatus + - inJsonPath: $.payerId + outJsonPath: $.Data.payer.id + - inJsonPath: $.payerName + outJsonPath: $.Data.payer.name + - inJsonPath: $.paidBy + outJsonPath: $.Data.paidBy + - inJsonPath: $.paymentDetails + outJsonPath: $.Data.paymentDetails + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - inJsonPath: $.additionalDetails + outJsonPath: $.Data.additionalDetails + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + - inJsonPath: $.address + outJsonPath: $.Data.address + externalUriMapping: + - path: http://egov-location:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + mdmsMapping: + - path: http://egov-mdms-service:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData + externalUriMapping: + - path: http://egov-location:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + mdmsMapping: + - path: http://egov-mdms-service:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData + + + - topic: egov.collection.payment-update + configKey: INDEX + indexes: + - name: paymentsindex-v1 + type: payments + id: $.id + isBulk: false + timeStampField: $.auditDetails.createdTime + jsonPath: $.Payment + customJsonMapping: + indexMapping: {"Data":{"tenantId":"","id":"","transactionNumber":"","transactionDate":1,"paymentMode":"","paymentStatus":"","payer":{"id":"","name":""},"paidBy":"","paymentDetails":{},"auditDetails":{},"additionalDetails":{},"tenantData":{},"@timestamp":"timestamp","address":{},"ward":{}}} fieldMapping: - inJsonPath: $.tenantId outJsonPath: $.Data.tenantId @@ -101,6 +348,8 @@ ServiceMaps: outJsonPath: $.Data.additionalDetails - inJsonPath: $.@timestamp outJsonPath: $.Data.@timestamp + - inJsonPath: $.address + outJsonPath: $.Data.address externalUriMapping: - path: http://egov-location:8080/egov-location/location/v11/boundarys/_search queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId @@ -133,7 +382,7 @@ ServiceMaps: timeStampField: $.auditDetails.createdTime jsonPath: $.Payments.* customJsonMapping: - indexMapping: {"Data":{"tenantId":"","id":"","transactionNumber":"","transactionDate":1,"paymentMode":"","paymentStatus":"","payer":{"id":"","name":""},"paidBy":"","paymentDetails":{},"auditDetails":{},"additionalDetails":{},"tenantData":{},"@timestamp":"timestamp","ward":{}}} + indexMapping: {"Data":{"tenantId":"","id":"","transactionNumber":"","transactionDate":1,"paymentMode":"","paymentStatus":"","payer":{"id":"","name":""},"paidBy":"","paymentDetails":{},"auditDetails":{},"additionalDetails":{},"tenantData":{},"@timestamp":"timestamp","address":{},"ward":{}}} fieldMapping: - inJsonPath: $.tenantId outJsonPath: $.Data.tenantId @@ -161,6 +410,8 @@ ServiceMaps: outJsonPath: $.Data.additionalDetails - inJsonPath: $.@timestamp outJsonPath: $.Data.@timestamp + - inJsonPath: $.address + outJsonPath: $.Data.address externalUriMapping: - path: http://egov-location:8080/egov-location/location/v11/boundarys/_search queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId @@ -192,7 +443,7 @@ ServiceMaps: timeStampField: $.auditDetails.createdTime jsonPath: $.Payment customJsonMapping: - indexMapping: {"Data":{"tenantId":"","id":"","transactionNumber":"","transactionDate":1,"paymentMode":"","paymentStatus":"","payer":{"id":"","name":""},"paidBy":"","paymentDetails":{},"auditDetails":{},"additionalDetails":{},"tenantData":{},"@timestamp":"timestamp","ward":{}}} + indexMapping: {"Data":{"tenantId":"","id":"","transactionNumber":"","transactionDate":1,"paymentMode":"","paymentStatus":"","payer":{"id":"","name":""},"paidBy":"","paymentDetails":{},"auditDetails":{},"additionalDetails":{},"tenantData":{},"@timestamp":"timestamp","address":{},"ward":{}}} fieldMapping: - inJsonPath: $.tenantId outJsonPath: $.Data.tenantId @@ -220,6 +471,8 @@ ServiceMaps: outJsonPath: $.Data.additionalDetails - inJsonPath: $.@timestamp outJsonPath: $.Data.@timestamp + - inJsonPath: $.address + outJsonPath: $.Data.address externalUriMapping: - path: http://egov-location:8080/egov-location/location/v11/boundarys/_search queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId From f4ed9d6b1db00f3f3e336c63d6252b55ffd2a521 Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Wed, 16 Mar 2022 20:43:16 +0530 Subject: [PATCH 0992/1242] Revert changes for "payment-indexer.yml" --- configs/egov-indexer/payment-indexer.yml | 261 +---------------------- 1 file changed, 4 insertions(+), 257 deletions(-) diff --git a/configs/egov-indexer/payment-indexer.yml b/configs/egov-indexer/payment-indexer.yml index 8a8862ec..61b3e59a 100644 --- a/configs/egov-indexer/payment-indexer.yml +++ b/configs/egov-indexer/payment-indexer.yml @@ -12,49 +12,7 @@ ServiceMaps: timeStampField: $.auditDetails.createdTime jsonPath: $.Payment customJsonMapping: - indexMapping: {"Data":{"tenantId":"","id":"","transactionNumber":"","transactionDate":1,"paymentMode":"","paymentStatus":"","payer":{"id":"","name":""},"paidBy":"","paymentDetails":{},"auditDetails":{},"additionalDetails":{},"tenantData":{},"@timestamp":"timestamp","address":{},"ward":{}}} - fieldMapping: - - inJsonPath: $.tenantId - outJsonPath: $.Data.tenantId - - inJsonPath: $.id - outJsonPath: $.Data.id - - inJsonPath: $.transactionNumber - outJsonPath: $.Data.transactionNumber - - inJsonPath: $.transactionDate - outJsonPath: $.Data.transactionDate - - inJsonPath: $.paymentMode - outJsonPath: $.Data.paymentMode - - inJsonPath: $.paymentStatus - outJsonPath: $.Data.paymentStatus - - inJsonPath: $.payerId - outJsonPath: $.Data.payer.id - - inJsonPath: $.payerName - outJsonPath: $.Data.payer.name - - inJsonPath: $.paidBy - outJsonPath: $.Data.paidBy - - inJsonPath: $.paymentDetails - outJsonPath: $.Data.paymentDetails - - inJsonPath: $.auditDetails - outJsonPath: $.Data.auditDetails - - inJsonPath: $.additionalDetails - outJsonPath: $.Data.additionalDetails - - inJsonPath: $.@timestamp - outJsonPath: $.Data.@timestamp - ServiceMaps: - serviceName: Collection Services - version: 1.0.0 - mappings: - - topic: egov.collection.payment-create - configKey: INDEX - indexes: - - name: paymentsindex-v1 - type: payments - id: $.id - isBulk: false - timeStampField: $.auditDetails.createdTime - jsonPath: $.Payment - customJsonMapping: - indexMapping: {"Data":{"tenantId":"","id":"","transactionNumber":"","transactionDate":1,"paymentMode":"","paymentStatus":"","payer":{"id":"","name":""},"paidBy":"","paymentDetails":{},"auditDetails":{},"additionalDetails":{},"tenantData":{},"@timestamp":"timestamp","address":{},"ward":{}}} + indexMapping: {"Data":{"tenantId":"","id":"","transactionNumber":"","transactionDate":1,"paymentMode":"","paymentStatus":"","payer":{"id":"","name":""},"paidBy":"","paymentDetails":{},"auditDetails":{},"additionalDetails":{},"tenantData":{},"@timestamp":"timestamp","ward":{}}} fieldMapping: - inJsonPath: $.tenantId outJsonPath: $.Data.tenantId @@ -115,212 +73,7 @@ ServiceMaps: timeStampField: $.auditDetails.createdTime jsonPath: $.Payment customJsonMapping: - indexMapping: {"Data":{"tenantId":"","id":"","transactionNumber":"","transactionDate":1,"paymentMode":"","paymentStatus":"","payer":{"id":"","name":""},"paidBy":"","paymentDetails":{},"auditDetails":{},"additionalDetails":{},"tenantData":{},"@timestamp":"timestamp","address":{},"ward":{}}} - fieldMapping: - - inJsonPath: $.tenantId - outJsonPath: $.Data.tenantId - - inJsonPath: $.id - outJsonPath: $.Data.id - - inJsonPath: $.transactionNumber - outJsonPath: $.Data.transactionNumber - - inJsonPath: $.transactionDate - outJsonPath: $.Data.transactionDate - - inJsonPath: $.paymentMode - outJsonPath: $.Data.paymentMode - - inJsonPath: $.paymentStatus - outJsonPath: $.Data.paymentStatus - - inJsonPath: $.payerId - outJsonPath: $.Data.payer.id - - inJsonPath: $.payerName - outJsonPath: $.Data.payer.name - - inJsonPath: $.paidBy - outJsonPath: $.Data.paidBy - - inJsonPath: $.paymentDetails - outJsonPath: $.Data.paymentDetails - - inJsonPath: $.auditDetails - outJsonPath: $.Data.auditDetails - - inJsonPath: $.additionalDetails - outJsonPath: $.Data.additionalDetails - - inJsonPath: $.@timestamp - outJsonPath: $.Data.@timestamp - - inJsonPath: $.address - outJsonPath: $.Data.address - externalUriMapping: - - path: http://egov-location:8080/egov-location/location/v11/boundarys/_search - queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId - apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", - "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} - uriResponseMapping: - - inJsonPath: $.TenantBoundary[0].boundary[0] - outJsonPath: $.Data.ward - mdmsMapping: - - path: http://egov-mdms-service:8080/egov-mdms-service/v1/_search - moduleName: tenant - masterName: tenants - tenantId: pb - filter: "[?(@.code == $tenant)]" - filterMapping: - - variable: $tenant - valueJsonpath: $.tenantId - uriResponseMapping: - - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.Data.tenantData - - - - topic: egov-payment-legacy-index - configKey: LEGACYINDEX - indexes: - - name: paymentsindex-v1 - type: payments - id: $.id - isBulk: true - timeStampField: $.auditDetails.createdTime - jsonPath: $.Payments.* - customJsonMapping: - indexMapping: {"Data":{"tenantId":"","id":"","transactionNumber":"","transactionDate":1,"paymentMode":"","paymentStatus":"","payer":{"id":"","name":""},"paidBy":"","paymentDetails":{},"auditDetails":{},"additionalDetails":{},"tenantData":{},"@timestamp":"timestamp","address":{},"ward":{}}} - fieldMapping: - - inJsonPath: $.tenantId - outJsonPath: $.Data.tenantId - - inJsonPath: $.id - outJsonPath: $.Data.id - - inJsonPath: $.transactionNumber - outJsonPath: $.Data.transactionNumber - - inJsonPath: $.transactionDate - outJsonPath: $.Data.transactionDate - - inJsonPath: $.paymentMode - outJsonPath: $.Data.paymentMode - - inJsonPath: $.paymentStatus - outJsonPath: $.Data.paymentStatus - - inJsonPath: $.payerId - outJsonPath: $.Data.payer.id - - inJsonPath: $.payerName - outJsonPath: $.Data.payer.name - - inJsonPath: $.paidBy - outJsonPath: $.Data.paidBy - - inJsonPath: $.paymentDetails - outJsonPath: $.Data.paymentDetails - - inJsonPath: $.auditDetails - outJsonPath: $.Data.auditDetails - - inJsonPath: $.additionalDetails - outJsonPath: $.Data.additionalDetails - - inJsonPath: $.@timestamp - outJsonPath: $.Data.@timestamp - - inJsonPath: $.address - outJsonPath: $.Data.address - externalUriMapping: - - path: http://egov-location:8080/egov-location/location/v11/boundarys/_search - queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId - apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", - "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} - uriResponseMapping: - - inJsonPath: $.TenantBoundary[0].boundary[0] - outJsonPath: $.Data.ward - mdmsMapping: - - path: http://egov-mdms-service:8080/egov-mdms-service/v1/_search - moduleName: tenant - masterName: tenants - tenantId: pb - filter: "[?(@.code == $tenant)]" - filterMapping: - - variable: $tenant - valueJsonpath: $.tenantId - uriResponseMapping: - - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.Data.tenantData - - - topic: egov.collection.payment-cancel - configKey: INDEX - indexes: - - name: paymentsindex-v1 - type: payments - id: $.id - isBulk: false - timeStampField: $.auditDetails.createdTime - jsonPath: $.Payment - customJsonMapping: - indexMapping: {"Data":{"tenantId":"","id":"","transactionNumber":"","transactionDate":1,"paymentMode":"","paymentStatus":"","payer":{"id":"","name":""},"paidBy":"","paymentDetails":{},"auditDetails":{},"additionalDetails":{},"tenantData":{},"@timestamp":"timestamp","address":{},"ward":{}}} - fieldMapping: - - inJsonPath: $.tenantId - outJsonPath: $.Data.tenantId - - inJsonPath: $.id - outJsonPath: $.Data.id - - inJsonPath: $.transactionNumber - outJsonPath: $.Data.transactionNumber - - inJsonPath: $.transactionDate - outJsonPath: $.Data.transactionDate - - inJsonPath: $.paymentMode - outJsonPath: $.Data.paymentMode - - inJsonPath: $.paymentStatus - outJsonPath: $.Data.paymentStatus - - inJsonPath: $.payerId - outJsonPath: $.Data.payer.id - - inJsonPath: $.payerName - outJsonPath: $.Data.payer.name - - inJsonPath: $.paidBy - outJsonPath: $.Data.paidBy - - inJsonPath: $.paymentDetails - outJsonPath: $.Data.paymentDetails - - inJsonPath: $.auditDetails - outJsonPath: $.Data.auditDetails - - inJsonPath: $.additionalDetails - outJsonPath: $.Data.additionalDetails - - inJsonPath: $.@timestamp - outJsonPath: $.Data.@timestamp - - inJsonPath: $.address - outJsonPath: $.Data.address - externalUriMapping: - - path: http://egov-location:8080/egov-location/location/v11/boundarys/_search - queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId - apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", - "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} - uriResponseMapping: - - inJsonPath: $.TenantBoundary[0].boundary[0] - outJsonPath: $.Data.ward - mdmsMapping: - - path: http://egov-mdms-service:8080/egov-mdms-service/v1/_search - moduleName: tenant - masterName: tenants - tenantId: pb - filter: "[?(@.code == $tenant)]" - filterMapping: - - variable: $tenant - valueJsonpath: $.tenantId - uriResponseMapping: - - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.Data.tenantData - externalUriMapping: - - path: http://egov-location:8080/egov-location/location/v11/boundarys/_search - queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId - apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", - "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} - uriResponseMapping: - - inJsonPath: $.TenantBoundary[0].boundary[0] - outJsonPath: $.Data.ward - mdmsMapping: - - path: http://egov-mdms-service:8080/egov-mdms-service/v1/_search - moduleName: tenant - masterName: tenants - tenantId: pb - filter: "[?(@.code == $tenant)]" - filterMapping: - - variable: $tenant - valueJsonpath: $.tenantId - uriResponseMapping: - - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.Data.tenantData - - - - topic: egov.collection.payment-update - configKey: INDEX - indexes: - - name: paymentsindex-v1 - type: payments - id: $.id - isBulk: false - timeStampField: $.auditDetails.createdTime - jsonPath: $.Payment - customJsonMapping: - indexMapping: {"Data":{"tenantId":"","id":"","transactionNumber":"","transactionDate":1,"paymentMode":"","paymentStatus":"","payer":{"id":"","name":""},"paidBy":"","paymentDetails":{},"auditDetails":{},"additionalDetails":{},"tenantData":{},"@timestamp":"timestamp","address":{},"ward":{}}} + indexMapping: {"Data":{"tenantId":"","id":"","transactionNumber":"","transactionDate":1,"paymentMode":"","paymentStatus":"","payer":{"id":"","name":""},"paidBy":"","paymentDetails":{},"auditDetails":{},"additionalDetails":{},"tenantData":{},"@timestamp":"timestamp","ward":{}}} fieldMapping: - inJsonPath: $.tenantId outJsonPath: $.Data.tenantId @@ -348,8 +101,6 @@ ServiceMaps: outJsonPath: $.Data.additionalDetails - inJsonPath: $.@timestamp outJsonPath: $.Data.@timestamp - - inJsonPath: $.address - outJsonPath: $.Data.address externalUriMapping: - path: http://egov-location:8080/egov-location/location/v11/boundarys/_search queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId @@ -382,7 +133,7 @@ ServiceMaps: timeStampField: $.auditDetails.createdTime jsonPath: $.Payments.* customJsonMapping: - indexMapping: {"Data":{"tenantId":"","id":"","transactionNumber":"","transactionDate":1,"paymentMode":"","paymentStatus":"","payer":{"id":"","name":""},"paidBy":"","paymentDetails":{},"auditDetails":{},"additionalDetails":{},"tenantData":{},"@timestamp":"timestamp","address":{},"ward":{}}} + indexMapping: {"Data":{"tenantId":"","id":"","transactionNumber":"","transactionDate":1,"paymentMode":"","paymentStatus":"","payer":{"id":"","name":""},"paidBy":"","paymentDetails":{},"auditDetails":{},"additionalDetails":{},"tenantData":{},"@timestamp":"timestamp","ward":{}}} fieldMapping: - inJsonPath: $.tenantId outJsonPath: $.Data.tenantId @@ -410,8 +161,6 @@ ServiceMaps: outJsonPath: $.Data.additionalDetails - inJsonPath: $.@timestamp outJsonPath: $.Data.@timestamp - - inJsonPath: $.address - outJsonPath: $.Data.address externalUriMapping: - path: http://egov-location:8080/egov-location/location/v11/boundarys/_search queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId @@ -443,7 +192,7 @@ ServiceMaps: timeStampField: $.auditDetails.createdTime jsonPath: $.Payment customJsonMapping: - indexMapping: {"Data":{"tenantId":"","id":"","transactionNumber":"","transactionDate":1,"paymentMode":"","paymentStatus":"","payer":{"id":"","name":""},"paidBy":"","paymentDetails":{},"auditDetails":{},"additionalDetails":{},"tenantData":{},"@timestamp":"timestamp","address":{},"ward":{}}} + indexMapping: {"Data":{"tenantId":"","id":"","transactionNumber":"","transactionDate":1,"paymentMode":"","paymentStatus":"","payer":{"id":"","name":""},"paidBy":"","paymentDetails":{},"auditDetails":{},"additionalDetails":{},"tenantData":{},"@timestamp":"timestamp","ward":{}}} fieldMapping: - inJsonPath: $.tenantId outJsonPath: $.Data.tenantId @@ -471,8 +220,6 @@ ServiceMaps: outJsonPath: $.Data.additionalDetails - inJsonPath: $.@timestamp outJsonPath: $.Data.@timestamp - - inJsonPath: $.address - outJsonPath: $.Data.address externalUriMapping: - path: http://egov-location:8080/egov-location/location/v11/boundarys/_search queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId From 8e70850fbae990760eeb3eea11aaa6def39f0fa6 Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Wed, 16 Mar 2022 21:52:28 +0530 Subject: [PATCH 0993/1242] Update "totalApplicationDeptWise" for TL --- .../dashboard-analytics/ChartApiConfig.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 330277a6..9bda92cd 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -367,13 +367,13 @@ "indexName": "property-services", "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Property Tax\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}}" }, - { + { "module": "TL", - "dateRefField": "Data.@timestamp", - "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \r\n \"district\" : \"Data.tenantData.city.districtCode\", \r\n\"tenantId\" : \"Data.tenantId\" \r\n}", "indexName": "tlindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tradelicense.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Trade Licence\":{\"value_count\":{\"field\":\"Data.tradelicense.tenantId.keyword\"}}}}}}" - }, + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tradelicense.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"TL\":{\"value_count\":{\"field\":\"Data.tradelicense.applicationNumber.keyword\"}}}}}}" + "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \r\n \"district\" : \"Data.tenantData.city.districtCode\", \r\n\"tenantId\" : \"Data.tradelicense.tenantId.keyword\" \r\n}", + "dateRefField": "Data.tradelicense.applicationDate" + }, { "module": "WS", "dateRefField": "Data.@timestamp", @@ -396,9 +396,9 @@ "drillChart": "none", "aggregationPaths": [ "Property Tax", - "Trade Licence", - "Water Service", - "Sewerage Service" + "TL", + "Water Service", + "Sewerage Service" ], "insight": { }, From 5e0f17a1026a9ef9774d83426c972007682d9838 Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Wed, 16 Mar 2022 22:05:20 +0530 Subject: [PATCH 0994/1242] Revert changes in "totalApplicationDeptWise" in TL --- .../dashboard-analytics/ChartApiConfig.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 9bda92cd..06c8a497 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -369,11 +369,11 @@ }, { "module": "TL", + "dateRefField": "Data.@timestamp", + "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \r\n \"district\" : \"Data.tenantData.city.districtCode\", \r\n\"tenantId\" : \"Data.tenantId\" \r\n}", "indexName": "tlindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tradelicense.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"TL\":{\"value_count\":{\"field\":\"Data.tradelicense.applicationNumber.keyword\"}}}}}}" - "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \r\n \"district\" : \"Data.tenantData.city.districtCode\", \r\n\"tenantId\" : \"Data.tradelicense.tenantId.keyword\" \r\n}", - "dateRefField": "Data.tradelicense.applicationDate" - }, + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tradelicense.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Trade Licence\":{\"value_count\":{\"field\":\"Data.tradelicense.tenantId.keyword\"}}}}}}" + }, { "module": "WS", "dateRefField": "Data.@timestamp", @@ -396,7 +396,7 @@ "drillChart": "none", "aggregationPaths": [ "Property Tax", - "TL", + "Trade Licence", "Water Service", "Sewerage Service" ], From 9f4e443564eee769c5da5e9019d10411ff524315 Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Wed, 16 Mar 2022 22:19:43 +0530 Subject: [PATCH 0995/1242] Update "totalApplicationDeptWise for TL" --- .../dashboard-analytics/ChartApiConfig.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 06c8a497..52a2213e 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -369,11 +369,11 @@ }, { "module": "TL", - "dateRefField": "Data.@timestamp", - "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \r\n \"district\" : \"Data.tenantData.city.districtCode\", \r\n\"tenantId\" : \"Data.tenantId\" \r\n}", "indexName": "tlindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tradelicense.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Trade Licence\":{\"value_count\":{\"field\":\"Data.tradelicense.tenantId.keyword\"}}}}}}" - }, + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tradelicense.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"TL\":{\"value_count\":{\"field\":\"Data.tradelicense.applicationNumber.keyword\"}}}}}}", + "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \r\n \"district\" : \"Data.tenantData.city.districtCode\", \r\n\"tenantId\" : \"Data.tradelicense.tenantId.keyword\" \r\n}", + "dateRefField": "Data.tradelicense.applicationDate" + }, { "module": "WS", "dateRefField": "Data.@timestamp", @@ -396,7 +396,7 @@ "drillChart": "none", "aggregationPaths": [ "Property Tax", - "Trade Licence", + "TL", "Water Service", "Sewerage Service" ], From 3f6ee610dc33edcf18c23673f4a7956e3cb24099 Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Thu, 17 Mar 2022 14:24:05 +0530 Subject: [PATCH 0996/1242] Adding echallan indexes in "payment-indexer.yml" --- configs/egov-indexer/payment-indexer.yml | 240 +++++++++++++++++++++++ 1 file changed, 240 insertions(+) diff --git a/configs/egov-indexer/payment-indexer.yml b/configs/egov-indexer/payment-indexer.yml index 61b3e59a..ade19b67 100644 --- a/configs/egov-indexer/payment-indexer.yml +++ b/configs/egov-indexer/payment-indexer.yml @@ -241,5 +241,245 @@ ServiceMaps: - inJsonPath: $.MdmsRes.tenant.tenants outJsonPath: $.Data.tenantData + - topic: save-challan + configKey: INDEX + indexes: + - name: echallan-services + type: general + id: $.id,$.tenantId + jsonPath: $.Challan + timeStampField: $.auditDetails.createdTime + customJsonMapping: + indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","tenantId":"","businessService":"","challanNo":"","referenceId":"","description":"","accountId":"","additionalDetail":{},"source":"","taxPeriodFrom":"","taxPeriodTo":"","amount":[],"filestoreid":"","additionalDetails":{},"applicationStatus":"","vendor":"","typeOfExpense":"","billDate":"","billIssuedDate":"","paidDate":"","isBillPaid":"","vendorName":"","totalAmount":"","@timestamp":"timestamp","history":{},"ward":"" }} + fieldMapping: + - inJsonPath: $.applicationStatus.state + outJsonPath: $.Data.workflow.state + - inJsonPath: $.processInstance.action + outJsonPath: $.Data.workflow.action + - inJsonPath: $.processInstance.assignes.*.uuid + outJsonPath: $.Data.workflow.assignes + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.businessService + outJsonPath: $.Data.businessService + - inJsonPath: $.challanNo + outJsonPath: $.Data.challanNo + - inJsonPath: $.referenceId + outJsonPath: $.Data.referenceId + - inJsonPath: $.description + outJsonPath: $.Data.description + - inJsonPath: $.accountId + outJsonPath: $.Data.accountId + - inJsonPath: $.additionalDetail + outJsonPath: $.Data.additionalDetail + - inJsonPath: $.source + outJsonPath: $.Data.source + - inJsonPath: $.taxPeriodFrom + outJsonPath: $.Data.taxPeriodFrom + - inJsonPath: $.taxPeriodTo + outJsonPath: $.Data.taxPeriodTo + - inJsonPath: $.amount + outJsonPath: $.Data.amount + - inJsonPath: $.filestoreid + outJsonPath: $.Data.filestoreid + - inJsonPath: $.additionalDetails + outJsonPath: $.Data.additionalDetails + - inJsonPath: $.applicationStatus + outJsonPath: $.Data.applicationStatus + - inJsonPath: $.vendor + outJsonPath: $.Data.vendor + - inJsonPath: $.typeOfExpense + outJsonPath: $.Data.typeOfExpense + - inJsonPath: $.billDate + outJsonPath: $.Data.billDate + - inJsonPath: $.billIssuedDate + outJsonPath: $.Data.billIssuedDate + - inJsonPath: $.paidDate + outJsonPath: $.Data.paidDate + - inJsonPath: $.isBillPaid + outJsonPath: $.Data.isBillPaid + - inJsonPath: $.vendorName + outJsonPath: $.Data.vendorName + - inJsonPath: $.totalAmount + outJsonPath: $.Data.totalAmount + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + externalUriMapping: + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.acknowldgementNumber,history=true,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.echallan","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + + + - topic: update-challan + configKey: INDEX + indexes: + - name: echallan-services + type: general + id: $.id,$.tenantId + jsonPath: $.Challan + timeStampField: $.auditDetails.createdTime + customJsonMapping: + indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","tenantId":"","businessService":"","challanNo":"","referenceId":"","description":"","accountId":"","additionalDetail":{},"source":"","taxPeriodFrom":"","taxPeriodTo":"","amount":[],"filestoreid":"","additionalDetails":{},"applicationStatus":"","vendor":"","typeOfExpense":"","billDate":"","billIssuedDate":"","paidDate":"","isBillPaid":"","vendorName":"","totalAmount":"","@timestamp":"timestamp","history":{},"ward":"" }} + fieldMapping: + - inJsonPath: $.applicationStatus.state + outJsonPath: $.Data.workflow.state + - inJsonPath: $.processInstance.action + outJsonPath: $.Data.workflow.action + - inJsonPath: $.processInstance.assignes.*.uuid + outJsonPath: $.Data.workflow.assignes + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.businessService + outJsonPath: $.Data.businessService + - inJsonPath: $.challanNo + outJsonPath: $.Data.challanNo + - inJsonPath: $.referenceId + outJsonPath: $.Data.referenceId + - inJsonPath: $.description + outJsonPath: $.Data.description + - inJsonPath: $.accountId + outJsonPath: $.Data.accountId + - inJsonPath: $.additionalDetail + outJsonPath: $.Data.additionalDetail + - inJsonPath: $.source + outJsonPath: $.Data.source + - inJsonPath: $.taxPeriodFrom + outJsonPath: $.Data.taxPeriodFrom + - inJsonPath: $.taxPeriodTo + outJsonPath: $.Data.taxPeriodTo + - inJsonPath: $.amount + outJsonPath: $.Data.amount + - inJsonPath: $.filestoreid + outJsonPath: $.Data.filestoreid + - inJsonPath: $.additionalDetails + outJsonPath: $.Data.additionalDetails + - inJsonPath: $.applicationStatus + outJsonPath: $.Data.applicationStatus + - inJsonPath: $.vendor + outJsonPath: $.Data.vendor + - inJsonPath: $.typeOfExpense + outJsonPath: $.Data.typeOfExpense + - inJsonPath: $.billDate + outJsonPath: $.Data.billDate + - inJsonPath: $.billIssuedDate + outJsonPath: $.Data.billIssuedDate + - inJsonPath: $.paidDate + outJsonPath: $.Data.paidDate + - inJsonPath: $.isBillPaid + outJsonPath: $.Data.isBillPaid + - inJsonPath: $.vendorName + outJsonPath: $.Data.vendorName + - inJsonPath: $.totalAmount + outJsonPath: $.Data.totalAmount + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + externalUriMapping: + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.acknowldgementNumber,history=true,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.echallan","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + + + - topic: echallan-legacyIndex + configKey: LEGACYINDEX + indexes: + - name: echallan-services + type: general + isBulk: true + id: $.id,$.tenantId + jsonPath: $.challans.* + timeStampField: $.auditDetails.createdTime + customJsonMapping: + indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","tenantId":"","businessService":"","challanNo":"","referenceId":"","description":"","accountId":"","additionalDetail":{},"source":"","taxPeriodFrom":"","taxPeriodTo":"","amount":[],"filestoreid":"","additionalDetails":{},"applicationStatus":"","vendor":"","typeOfExpense":"","billDate":"","billIssuedDate":"","paidDate":"","isBillPaid":"","vendorName":"","totalAmount":"","@timestamp":"timestamp","history":{},"ward":"" }} + fieldMapping: + - inJsonPath: $.processInstance.action + outJsonPath: $.Data.workflow.action + - inJsonPath: $.processInstance.assignes.*.uuid + outJsonPath: $.Data.workflow.assignes + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.businessService + outJsonPath: $.Data.businessService + - inJsonPath: $.challanNo + outJsonPath: $.Data.challanNo + - inJsonPath: $.referenceId + outJsonPath: $.Data.referenceId + - inJsonPath: $.description + outJsonPath: $.Data.description + - inJsonPath: $.accountId + outJsonPath: $.Data.accountId + - inJsonPath: $.additionalDetail + outJsonPath: $.Data.additionalDetail + - inJsonPath: $.source + outJsonPath: $.Data.source + - inJsonPath: $.taxPeriodFrom + outJsonPath: $.Data.taxPeriodFrom + - inJsonPath: $.taxPeriodTo + outJsonPath: $.Data.taxPeriodTo + - inJsonPath: $.amount + outJsonPath: $.Data.amount + - inJsonPath: $.filestoreid + outJsonPath: $.Data.filestoreid + - inJsonPath: $.additionalDetails + outJsonPath: $.Data.additionalDetails + - inJsonPath: $.applicationStatus + outJsonPath: $.Data.applicationStatus + - inJsonPath: $.vendor + outJsonPath: $.Data.vendor + - inJsonPath: $.typeOfExpense + outJsonPath: $.Data.typeOfExpense + - inJsonPath: $.billDate + outJsonPath: $.Data.billDate + - inJsonPath: $.billIssuedDate + outJsonPath: $.Data.billIssuedDate + - inJsonPath: $.paidDate + outJsonPath: $.Data.paidDate + - inJsonPath: $.isBillPaid + outJsonPath: $.Data.isBillPaid + - inJsonPath: $.vendorName + outJsonPath: $.Data.vendorName + - inJsonPath: $.totalAmount + outJsonPath: $.Data.totalAmount + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + externalUriMapping: + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.acknowldgementNumber,history=true,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.echallan","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward From 0c12c263389df9428a1c949cd205ffa1f2a655c1 Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Thu, 17 Mar 2022 15:34:27 +0530 Subject: [PATCH 0997/1242] Revert changes for "payment-indexer.yml" --- configs/egov-indexer/payment-indexer.yml | 369 +++-------------------- 1 file changed, 48 insertions(+), 321 deletions(-) diff --git a/configs/egov-indexer/payment-indexer.yml b/configs/egov-indexer/payment-indexer.yml index ade19b67..85cd0583 100644 --- a/configs/egov-indexer/payment-indexer.yml +++ b/configs/egov-indexer/payment-indexer.yml @@ -12,7 +12,7 @@ ServiceMaps: timeStampField: $.auditDetails.createdTime jsonPath: $.Payment customJsonMapping: - indexMapping: {"Data":{"tenantId":"","id":"","transactionNumber":"","transactionDate":1,"paymentMode":"","paymentStatus":"","payer":{"id":"","name":""},"paidBy":"","paymentDetails":{},"auditDetails":{},"additionalDetails":{},"tenantData":{},"@timestamp":"timestamp","ward":{}}} + indexMapping: {"Data":{"tenantId":"","id":"","transactionNumber":"","transactionDate":1,"paymentMode":"","paymentStatus":"","payer":{"id":"","name":""},"paidBy":"","paymentDetails":{},"auditDetails":{},"additionalDetails":{},"tenantData":{},"@timestamp":"timestamp"}} fieldMapping: - inJsonPath: $.tenantId outJsonPath: $.Data.tenantId @@ -40,27 +40,18 @@ ServiceMaps: outJsonPath: $.Data.additionalDetails - inJsonPath: $.@timestamp outJsonPath: $.Data.@timestamp - - externalUriMapping: - - path: http://egov-location:8080/egov-location/location/v11/boundarys/_search - queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId - apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", - "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} - uriResponseMapping: - - inJsonPath: $.TenantBoundary[0].boundary[0] - outJsonPath: $.Data.ward mdmsMapping: - - path: http://egov-mdms-service:8080/egov-mdms-service/v1/_search - moduleName: tenant - masterName: tenants - tenantId: pb - filter: "[?(@.code == $tenant)]" - filterMapping: - - variable: $tenant - valueJsonpath: $.tenantId - uriResponseMapping: - - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.Data.tenantData + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData - topic: egov.collection.payment-update @@ -73,7 +64,7 @@ ServiceMaps: timeStampField: $.auditDetails.createdTime jsonPath: $.Payment customJsonMapping: - indexMapping: {"Data":{"tenantId":"","id":"","transactionNumber":"","transactionDate":1,"paymentMode":"","paymentStatus":"","payer":{"id":"","name":""},"paidBy":"","paymentDetails":{},"auditDetails":{},"additionalDetails":{},"tenantData":{},"@timestamp":"timestamp","ward":{}}} + indexMapping: {"Data":{"tenantId":"","id":"","transactionNumber":"","transactionDate":1,"paymentMode":"","paymentStatus":"","payer":{"id":"","name":""},"paidBy":"","paymentDetails":{},"auditDetails":{},"additionalDetails":{},"tenantData":{},"@timestamp":"timestamp"}} fieldMapping: - inJsonPath: $.tenantId outJsonPath: $.Data.tenantId @@ -101,26 +92,18 @@ ServiceMaps: outJsonPath: $.Data.additionalDetails - inJsonPath: $.@timestamp outJsonPath: $.Data.@timestamp - externalUriMapping: - - path: http://egov-location:8080/egov-location/location/v11/boundarys/_search - queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId - apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", - "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} - uriResponseMapping: - - inJsonPath: $.TenantBoundary[0].boundary[0] - outJsonPath: $.Data.ward mdmsMapping: - - path: http://egov-mdms-service:8080/egov-mdms-service/v1/_search - moduleName: tenant - masterName: tenants - tenantId: pb - filter: "[?(@.code == $tenant)]" - filterMapping: - - variable: $tenant - valueJsonpath: $.tenantId - uriResponseMapping: - - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.Data.tenantData + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData - topic: egov-payment-legacy-index @@ -133,7 +116,7 @@ ServiceMaps: timeStampField: $.auditDetails.createdTime jsonPath: $.Payments.* customJsonMapping: - indexMapping: {"Data":{"tenantId":"","id":"","transactionNumber":"","transactionDate":1,"paymentMode":"","paymentStatus":"","payer":{"id":"","name":""},"paidBy":"","paymentDetails":{},"auditDetails":{},"additionalDetails":{},"tenantData":{},"@timestamp":"timestamp","ward":{}}} + indexMapping: {"Data":{"tenantId":"","id":"","transactionNumber":"","transactionDate":1,"paymentMode":"","paymentStatus":"","payer":{"id":"","name":""},"paidBy":"","paymentDetails":{},"auditDetails":{},"additionalDetails":{},"tenantData":{},"@timestamp":"timestamp"}} fieldMapping: - inJsonPath: $.tenantId outJsonPath: $.Data.tenantId @@ -161,26 +144,18 @@ ServiceMaps: outJsonPath: $.Data.additionalDetails - inJsonPath: $.@timestamp outJsonPath: $.Data.@timestamp - externalUriMapping: - - path: http://egov-location:8080/egov-location/location/v11/boundarys/_search - queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId - apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", - "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} - uriResponseMapping: - - inJsonPath: $.TenantBoundary[0].boundary[0] - outJsonPath: $.Data.ward mdmsMapping: - - path: http://egov-mdms-service:8080/egov-mdms-service/v1/_search - moduleName: tenant - masterName: tenants - tenantId: pb - filter: "[?(@.code == $tenant)]" - filterMapping: - - variable: $tenant - valueJsonpath: $.tenantId - uriResponseMapping: - - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.Data.tenantData + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData - topic: egov.collection.payment-cancel configKey: INDEX @@ -192,7 +167,7 @@ ServiceMaps: timeStampField: $.auditDetails.createdTime jsonPath: $.Payment customJsonMapping: - indexMapping: {"Data":{"tenantId":"","id":"","transactionNumber":"","transactionDate":1,"paymentMode":"","paymentStatus":"","payer":{"id":"","name":""},"paidBy":"","paymentDetails":{},"auditDetails":{},"additionalDetails":{},"tenantData":{},"@timestamp":"timestamp","ward":{}}} + indexMapping: {"Data":{"tenantId":"","id":"","transactionNumber":"","transactionDate":1,"paymentMode":"","paymentStatus":"","payer":{"id":"","name":""},"paidBy":"","paymentDetails":{},"auditDetails":{},"additionalDetails":{},"tenantData":{},"@timestamp":"timestamp"}} fieldMapping: - inJsonPath: $.tenantId outJsonPath: $.Data.tenantId @@ -220,266 +195,18 @@ ServiceMaps: outJsonPath: $.Data.additionalDetails - inJsonPath: $.@timestamp outJsonPath: $.Data.@timestamp - externalUriMapping: - - path: http://egov-location:8080/egov-location/location/v11/boundarys/_search - queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId - apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", - "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} - uriResponseMapping: - - inJsonPath: $.TenantBoundary[0].boundary[0] - outJsonPath: $.Data.ward mdmsMapping: - - path: http://egov-mdms-service:8080/egov-mdms-service/v1/_search - moduleName: tenant - masterName: tenants - tenantId: pb - filter: "[?(@.code == $tenant)]" - filterMapping: - - variable: $tenant - valueJsonpath: $.tenantId - uriResponseMapping: - - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.Data.tenantData + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData - - topic: save-challan - configKey: INDEX - indexes: - - name: echallan-services - type: general - id: $.id,$.tenantId - jsonPath: $.Challan - timeStampField: $.auditDetails.createdTime - customJsonMapping: - indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","tenantId":"","businessService":"","challanNo":"","referenceId":"","description":"","accountId":"","additionalDetail":{},"source":"","taxPeriodFrom":"","taxPeriodTo":"","amount":[],"filestoreid":"","additionalDetails":{},"applicationStatus":"","vendor":"","typeOfExpense":"","billDate":"","billIssuedDate":"","paidDate":"","isBillPaid":"","vendorName":"","totalAmount":"","@timestamp":"timestamp","history":{},"ward":"" }} - fieldMapping: - - inJsonPath: $.applicationStatus.state - outJsonPath: $.Data.workflow.state - - inJsonPath: $.processInstance.action - outJsonPath: $.Data.workflow.action - - inJsonPath: $.processInstance.assignes.*.uuid - outJsonPath: $.Data.workflow.assignes - - inJsonPath: $.id - outJsonPath: $.Data.id - - inJsonPath: $.tenantId - outJsonPath: $.Data.tenantId - - inJsonPath: $.businessService - outJsonPath: $.Data.businessService - - inJsonPath: $.challanNo - outJsonPath: $.Data.challanNo - - inJsonPath: $.referenceId - outJsonPath: $.Data.referenceId - - inJsonPath: $.description - outJsonPath: $.Data.description - - inJsonPath: $.accountId - outJsonPath: $.Data.accountId - - inJsonPath: $.additionalDetail - outJsonPath: $.Data.additionalDetail - - inJsonPath: $.source - outJsonPath: $.Data.source - - inJsonPath: $.taxPeriodFrom - outJsonPath: $.Data.taxPeriodFrom - - inJsonPath: $.taxPeriodTo - outJsonPath: $.Data.taxPeriodTo - - inJsonPath: $.amount - outJsonPath: $.Data.amount - - inJsonPath: $.filestoreid - outJsonPath: $.Data.filestoreid - - inJsonPath: $.additionalDetails - outJsonPath: $.Data.additionalDetails - - inJsonPath: $.applicationStatus - outJsonPath: $.Data.applicationStatus - - inJsonPath: $.vendor - outJsonPath: $.Data.vendor - - inJsonPath: $.typeOfExpense - outJsonPath: $.Data.typeOfExpense - - inJsonPath: $.billDate - outJsonPath: $.Data.billDate - - inJsonPath: $.billIssuedDate - outJsonPath: $.Data.billIssuedDate - - inJsonPath: $.paidDate - outJsonPath: $.Data.paidDate - - inJsonPath: $.isBillPaid - outJsonPath: $.Data.isBillPaid - - inJsonPath: $.vendorName - outJsonPath: $.Data.vendorName - - inJsonPath: $.totalAmount - outJsonPath: $.Data.totalAmount - - inJsonPath: $.@timestamp - outJsonPath: $.Data.@timestamp - externalUriMapping: - - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search - queryParam: businessIds=$.acknowldgementNumber,history=true,tenantId=$.tenantId - apiRequest: {"RequestInfo":{"apiId":"org.egov.echallan","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} - uriResponseMapping: - - inJsonPath: $.ProcessInstances - outJsonPath: $.Data.history - - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search - queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId - apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", - "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} - uriResponseMapping: - - inJsonPath: $.TenantBoundary[0].boundary[0] - outJsonPath: $.Data.ward - - - - topic: update-challan - configKey: INDEX - indexes: - - name: echallan-services - type: general - id: $.id,$.tenantId - jsonPath: $.Challan - timeStampField: $.auditDetails.createdTime - customJsonMapping: - indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","tenantId":"","businessService":"","challanNo":"","referenceId":"","description":"","accountId":"","additionalDetail":{},"source":"","taxPeriodFrom":"","taxPeriodTo":"","amount":[],"filestoreid":"","additionalDetails":{},"applicationStatus":"","vendor":"","typeOfExpense":"","billDate":"","billIssuedDate":"","paidDate":"","isBillPaid":"","vendorName":"","totalAmount":"","@timestamp":"timestamp","history":{},"ward":"" }} - fieldMapping: - - inJsonPath: $.applicationStatus.state - outJsonPath: $.Data.workflow.state - - inJsonPath: $.processInstance.action - outJsonPath: $.Data.workflow.action - - inJsonPath: $.processInstance.assignes.*.uuid - outJsonPath: $.Data.workflow.assignes - - inJsonPath: $.id - outJsonPath: $.Data.id - - inJsonPath: $.tenantId - outJsonPath: $.Data.tenantId - - inJsonPath: $.businessService - outJsonPath: $.Data.businessService - - inJsonPath: $.challanNo - outJsonPath: $.Data.challanNo - - inJsonPath: $.referenceId - outJsonPath: $.Data.referenceId - - inJsonPath: $.description - outJsonPath: $.Data.description - - inJsonPath: $.accountId - outJsonPath: $.Data.accountId - - inJsonPath: $.additionalDetail - outJsonPath: $.Data.additionalDetail - - inJsonPath: $.source - outJsonPath: $.Data.source - - inJsonPath: $.taxPeriodFrom - outJsonPath: $.Data.taxPeriodFrom - - inJsonPath: $.taxPeriodTo - outJsonPath: $.Data.taxPeriodTo - - inJsonPath: $.amount - outJsonPath: $.Data.amount - - inJsonPath: $.filestoreid - outJsonPath: $.Data.filestoreid - - inJsonPath: $.additionalDetails - outJsonPath: $.Data.additionalDetails - - inJsonPath: $.applicationStatus - outJsonPath: $.Data.applicationStatus - - inJsonPath: $.vendor - outJsonPath: $.Data.vendor - - inJsonPath: $.typeOfExpense - outJsonPath: $.Data.typeOfExpense - - inJsonPath: $.billDate - outJsonPath: $.Data.billDate - - inJsonPath: $.billIssuedDate - outJsonPath: $.Data.billIssuedDate - - inJsonPath: $.paidDate - outJsonPath: $.Data.paidDate - - inJsonPath: $.isBillPaid - outJsonPath: $.Data.isBillPaid - - inJsonPath: $.vendorName - outJsonPath: $.Data.vendorName - - inJsonPath: $.totalAmount - outJsonPath: $.Data.totalAmount - - inJsonPath: $.@timestamp - outJsonPath: $.Data.@timestamp - externalUriMapping: - - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search - queryParam: businessIds=$.acknowldgementNumber,history=true,tenantId=$.tenantId - apiRequest: {"RequestInfo":{"apiId":"org.egov.echallan","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} - uriResponseMapping: - - inJsonPath: $.ProcessInstances - outJsonPath: $.Data.history - - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search - queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId - apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", - "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} - uriResponseMapping: - - inJsonPath: $.TenantBoundary[0].boundary[0] - outJsonPath: $.Data.ward - - - - topic: echallan-legacyIndex - configKey: LEGACYINDEX - indexes: - - name: echallan-services - type: general - isBulk: true - id: $.id,$.tenantId - jsonPath: $.challans.* - timeStampField: $.auditDetails.createdTime - customJsonMapping: - indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","tenantId":"","businessService":"","challanNo":"","referenceId":"","description":"","accountId":"","additionalDetail":{},"source":"","taxPeriodFrom":"","taxPeriodTo":"","amount":[],"filestoreid":"","additionalDetails":{},"applicationStatus":"","vendor":"","typeOfExpense":"","billDate":"","billIssuedDate":"","paidDate":"","isBillPaid":"","vendorName":"","totalAmount":"","@timestamp":"timestamp","history":{},"ward":"" }} - fieldMapping: - - inJsonPath: $.processInstance.action - outJsonPath: $.Data.workflow.action - - inJsonPath: $.processInstance.assignes.*.uuid - outJsonPath: $.Data.workflow.assignes - - inJsonPath: $.id - outJsonPath: $.Data.id - - inJsonPath: $.tenantId - outJsonPath: $.Data.tenantId - - inJsonPath: $.businessService - outJsonPath: $.Data.businessService - - inJsonPath: $.challanNo - outJsonPath: $.Data.challanNo - - inJsonPath: $.referenceId - outJsonPath: $.Data.referenceId - - inJsonPath: $.description - outJsonPath: $.Data.description - - inJsonPath: $.accountId - outJsonPath: $.Data.accountId - - inJsonPath: $.additionalDetail - outJsonPath: $.Data.additionalDetail - - inJsonPath: $.source - outJsonPath: $.Data.source - - inJsonPath: $.taxPeriodFrom - outJsonPath: $.Data.taxPeriodFrom - - inJsonPath: $.taxPeriodTo - outJsonPath: $.Data.taxPeriodTo - - inJsonPath: $.amount - outJsonPath: $.Data.amount - - inJsonPath: $.filestoreid - outJsonPath: $.Data.filestoreid - - inJsonPath: $.additionalDetails - outJsonPath: $.Data.additionalDetails - - inJsonPath: $.applicationStatus - outJsonPath: $.Data.applicationStatus - - inJsonPath: $.vendor - outJsonPath: $.Data.vendor - - inJsonPath: $.typeOfExpense - outJsonPath: $.Data.typeOfExpense - - inJsonPath: $.billDate - outJsonPath: $.Data.billDate - - inJsonPath: $.billIssuedDate - outJsonPath: $.Data.billIssuedDate - - inJsonPath: $.paidDate - outJsonPath: $.Data.paidDate - - inJsonPath: $.isBillPaid - outJsonPath: $.Data.isBillPaid - - inJsonPath: $.vendorName - outJsonPath: $.Data.vendorName - - inJsonPath: $.totalAmount - outJsonPath: $.Data.totalAmount - - inJsonPath: $.@timestamp - outJsonPath: $.Data.@timestamp - externalUriMapping: - - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search - queryParam: businessIds=$.acknowldgementNumber,history=true,tenantId=$.tenantId - apiRequest: {"RequestInfo":{"apiId":"org.egov.echallan","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} - uriResponseMapping: - - inJsonPath: $.ProcessInstances - outJsonPath: $.Data.history - - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search - queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId - apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", - "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} - uriResponseMapping: - - inJsonPath: $.TenantBoundary[0].boundary[0] - outJsonPath: $.Data.ward From cbb52ec2f7843acecdd213ef60434a0af4492db4 Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Thu, 17 Mar 2022 19:17:29 +0530 Subject: [PATCH 0998/1242] Update "DSS_TL_LICENSE_BY_STATUS" for TL --- .../dashboard-analytics/ChartApiConfig.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 52a2213e..036902a0 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -1702,11 +1702,11 @@ "queries": [ { "module": "TL", - "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \"tenantId\" : \"Data.tenantData.code\", \"district\" : \"Data.tenantData.cityDistrictCode\"}", - "dateRefField": "Data.tradelicense.issuedDate", + "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \r\n \"district\" : \"Data.tenantData.city.districtCode\", \r\n\"tenantId\" : \"Data.tradelicense.tenantId.keyword\" \r\n}", + "dateRefField": "Data.tradelicense.applicationDate", "indexName": "tlindex-v1", - "aggrQueryBc": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tradelicense.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Status\":{\"terms\":{\"field\":\"Data.tradelicense.status.keyword\"},\"aggs\":{\"Status\":{\"value_count\":{\"field\":\"Data.tradelicense.status.keyword\"}}}}}}}}", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tradelicense.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Status\":{\"terms\":{\"field\":\"Data.tradelicense.status.keyword\",\"size\":200},\"aggs\":{\"Status\":{\"value_count\":{\"field\":\"Data.tradelicense.applicationNumber.keyword\"}}}}}}}}" + "aggrQueryBc": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tradelicense.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"TL\":{\"terms\":{\"field\":\"Data.tradelicense.status.keyword\"},\"aggs\":{\"TL\":{\"value_count\":{\"field\":\"Data.tradelicense.status.keyword\"}}}}}}}}", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tradelicense.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"TL\":{\"terms\":{\"field\":\"Data.tradelicense.status.keyword\",\"size\":200},\"aggs\":{\"TL\":{\"value_count\":{\"field\":\"Data.tradelicense.applicationNumber.keyword\"}}}}}}}}", } ], "chartType": "pie", @@ -1715,7 +1715,7 @@ "documentType": "_doc", "drillChart": "none", "aggregationPaths": [ - "Status" + "TL" ], "insight": { }, From 300973a99d9ab3145cd05311641118b9c9b391d2 Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Thu, 17 Mar 2022 19:23:50 +0530 Subject: [PATCH 0999/1242] Update "licenseApplicationByStatus" for TL --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 036902a0..a44ac0ed 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -1706,7 +1706,7 @@ "dateRefField": "Data.tradelicense.applicationDate", "indexName": "tlindex-v1", "aggrQueryBc": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tradelicense.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"TL\":{\"terms\":{\"field\":\"Data.tradelicense.status.keyword\"},\"aggs\":{\"TL\":{\"value_count\":{\"field\":\"Data.tradelicense.status.keyword\"}}}}}}}}", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tradelicense.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"TL\":{\"terms\":{\"field\":\"Data.tradelicense.status.keyword\",\"size\":200},\"aggs\":{\"TL\":{\"value_count\":{\"field\":\"Data.tradelicense.applicationNumber.keyword\"}}}}}}}}", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tradelicense.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"TL\":{\"terms\":{\"field\":\"Data.tradelicense.status.keyword\",\"size\":200},\"aggs\":{\"TL\":{\"value_count\":{\"field\":\"Data.tradelicense.applicationNumber.keyword\"}}}}}}}}" } ], "chartType": "pie", From 410ef00516583be5a0135593d963856fd16345a3 Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Fri, 18 Mar 2022 03:05:01 +0530 Subject: [PATCH 1000/1242] Update aggregationPath in totalApplicationDeptWise --- .../dashboard-analytics/ChartApiConfig.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index a44ac0ed..917bf4e9 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -370,7 +370,7 @@ { "module": "TL", "indexName": "tlindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tradelicense.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"TL\":{\"value_count\":{\"field\":\"Data.tradelicense.applicationNumber.keyword\"}}}}}}", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tradelicense.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Trade License\":{\"value_count\":{\"field\":\"Data.tradelicense.applicationNumber.keyword\"}}}}}}", "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \r\n \"district\" : \"Data.tenantData.city.districtCode\", \r\n\"tenantId\" : \"Data.tradelicense.tenantId.keyword\" \r\n}", "dateRefField": "Data.tradelicense.applicationDate" }, @@ -396,7 +396,7 @@ "drillChart": "none", "aggregationPaths": [ "Property Tax", - "TL", + "Trade License", "Water Service", "Sewerage Service" ], From 6ab969b68302ef5953a40decf3f4a4ffb759791b Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Fri, 18 Mar 2022 21:34:27 +0530 Subject: [PATCH 1001/1242] Update aggPaths & Query for "licenseByLicenseType" --- .../dashboard-analytics/ChartApiConfig.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 917bf4e9..4b2a4af1 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -222,7 +222,7 @@ "requestQueryMap": "{\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantData.code\", \"district\" : \"dataObject.tenantData.city.districtCode\"}", "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Trade Type\":{\"terms\":{\"field\":\"domainObject.tradelicense.tradeLicenseDetail.tradeUnits.tradeType.keyword\",\"size\":200},\"aggs\":{\"Amount Paid\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Trade Type\":{\"terms\":{\"field\":\"domainObject.tradelicense.tradeLicenseDetail.tradeUnits.tradeType.keyword\",\"size\":200},\"aggs\":{\"Trade Type\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" } ], "chartType": "pie", @@ -231,7 +231,7 @@ "documentType": "_doc", "drillChart": "none", "aggregationPaths": [ - "License Instrument Type" + "Trade Type" ], "insight": { }, From 9530e85608d2c07ba956b7b3d338df108bb62cdf Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Mon, 21 Mar 2022 10:54:38 +0530 Subject: [PATCH 1002/1242] Added echallan indexes in "payment-indexer.yml" --- configs/egov-indexer/payment-indexer.yml | 369 ++++++++++++++++++++--- 1 file changed, 321 insertions(+), 48 deletions(-) diff --git a/configs/egov-indexer/payment-indexer.yml b/configs/egov-indexer/payment-indexer.yml index 85cd0583..ade19b67 100644 --- a/configs/egov-indexer/payment-indexer.yml +++ b/configs/egov-indexer/payment-indexer.yml @@ -12,7 +12,7 @@ ServiceMaps: timeStampField: $.auditDetails.createdTime jsonPath: $.Payment customJsonMapping: - indexMapping: {"Data":{"tenantId":"","id":"","transactionNumber":"","transactionDate":1,"paymentMode":"","paymentStatus":"","payer":{"id":"","name":""},"paidBy":"","paymentDetails":{},"auditDetails":{},"additionalDetails":{},"tenantData":{},"@timestamp":"timestamp"}} + indexMapping: {"Data":{"tenantId":"","id":"","transactionNumber":"","transactionDate":1,"paymentMode":"","paymentStatus":"","payer":{"id":"","name":""},"paidBy":"","paymentDetails":{},"auditDetails":{},"additionalDetails":{},"tenantData":{},"@timestamp":"timestamp","ward":{}}} fieldMapping: - inJsonPath: $.tenantId outJsonPath: $.Data.tenantId @@ -40,18 +40,27 @@ ServiceMaps: outJsonPath: $.Data.additionalDetails - inJsonPath: $.@timestamp outJsonPath: $.Data.@timestamp + + externalUriMapping: + - path: http://egov-location:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward mdmsMapping: - - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search - moduleName: tenant - masterName: tenants - tenantId: pb - filter: "[?(@.code == $tenant)]" - filterMapping: - - variable: $tenant - valueJsonpath: $.tenantId - uriResponseMapping: - - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.Data.tenantData + - path: http://egov-mdms-service:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData - topic: egov.collection.payment-update @@ -64,7 +73,7 @@ ServiceMaps: timeStampField: $.auditDetails.createdTime jsonPath: $.Payment customJsonMapping: - indexMapping: {"Data":{"tenantId":"","id":"","transactionNumber":"","transactionDate":1,"paymentMode":"","paymentStatus":"","payer":{"id":"","name":""},"paidBy":"","paymentDetails":{},"auditDetails":{},"additionalDetails":{},"tenantData":{},"@timestamp":"timestamp"}} + indexMapping: {"Data":{"tenantId":"","id":"","transactionNumber":"","transactionDate":1,"paymentMode":"","paymentStatus":"","payer":{"id":"","name":""},"paidBy":"","paymentDetails":{},"auditDetails":{},"additionalDetails":{},"tenantData":{},"@timestamp":"timestamp","ward":{}}} fieldMapping: - inJsonPath: $.tenantId outJsonPath: $.Data.tenantId @@ -92,18 +101,26 @@ ServiceMaps: outJsonPath: $.Data.additionalDetails - inJsonPath: $.@timestamp outJsonPath: $.Data.@timestamp + externalUriMapping: + - path: http://egov-location:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward mdmsMapping: - - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search - moduleName: tenant - masterName: tenants - tenantId: pb - filter: "[?(@.code == $tenant)]" - filterMapping: - - variable: $tenant - valueJsonpath: $.tenantId - uriResponseMapping: - - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.Data.tenantData + - path: http://egov-mdms-service:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData - topic: egov-payment-legacy-index @@ -116,7 +133,7 @@ ServiceMaps: timeStampField: $.auditDetails.createdTime jsonPath: $.Payments.* customJsonMapping: - indexMapping: {"Data":{"tenantId":"","id":"","transactionNumber":"","transactionDate":1,"paymentMode":"","paymentStatus":"","payer":{"id":"","name":""},"paidBy":"","paymentDetails":{},"auditDetails":{},"additionalDetails":{},"tenantData":{},"@timestamp":"timestamp"}} + indexMapping: {"Data":{"tenantId":"","id":"","transactionNumber":"","transactionDate":1,"paymentMode":"","paymentStatus":"","payer":{"id":"","name":""},"paidBy":"","paymentDetails":{},"auditDetails":{},"additionalDetails":{},"tenantData":{},"@timestamp":"timestamp","ward":{}}} fieldMapping: - inJsonPath: $.tenantId outJsonPath: $.Data.tenantId @@ -144,18 +161,26 @@ ServiceMaps: outJsonPath: $.Data.additionalDetails - inJsonPath: $.@timestamp outJsonPath: $.Data.@timestamp + externalUriMapping: + - path: http://egov-location:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward mdmsMapping: - - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search - moduleName: tenant - masterName: tenants - tenantId: pb - filter: "[?(@.code == $tenant)]" - filterMapping: - - variable: $tenant - valueJsonpath: $.tenantId - uriResponseMapping: - - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.Data.tenantData + - path: http://egov-mdms-service:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData - topic: egov.collection.payment-cancel configKey: INDEX @@ -167,7 +192,7 @@ ServiceMaps: timeStampField: $.auditDetails.createdTime jsonPath: $.Payment customJsonMapping: - indexMapping: {"Data":{"tenantId":"","id":"","transactionNumber":"","transactionDate":1,"paymentMode":"","paymentStatus":"","payer":{"id":"","name":""},"paidBy":"","paymentDetails":{},"auditDetails":{},"additionalDetails":{},"tenantData":{},"@timestamp":"timestamp"}} + indexMapping: {"Data":{"tenantId":"","id":"","transactionNumber":"","transactionDate":1,"paymentMode":"","paymentStatus":"","payer":{"id":"","name":""},"paidBy":"","paymentDetails":{},"auditDetails":{},"additionalDetails":{},"tenantData":{},"@timestamp":"timestamp","ward":{}}} fieldMapping: - inJsonPath: $.tenantId outJsonPath: $.Data.tenantId @@ -195,18 +220,266 @@ ServiceMaps: outJsonPath: $.Data.additionalDetails - inJsonPath: $.@timestamp outJsonPath: $.Data.@timestamp + externalUriMapping: + - path: http://egov-location:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward mdmsMapping: - - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search - moduleName: tenant - masterName: tenants - tenantId: pb - filter: "[?(@.code == $tenant)]" - filterMapping: - - variable: $tenant - valueJsonpath: $.tenantId - uriResponseMapping: - - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.Data.tenantData + - path: http://egov-mdms-service:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData + - topic: save-challan + configKey: INDEX + indexes: + - name: echallan-services + type: general + id: $.id,$.tenantId + jsonPath: $.Challan + timeStampField: $.auditDetails.createdTime + customJsonMapping: + indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","tenantId":"","businessService":"","challanNo":"","referenceId":"","description":"","accountId":"","additionalDetail":{},"source":"","taxPeriodFrom":"","taxPeriodTo":"","amount":[],"filestoreid":"","additionalDetails":{},"applicationStatus":"","vendor":"","typeOfExpense":"","billDate":"","billIssuedDate":"","paidDate":"","isBillPaid":"","vendorName":"","totalAmount":"","@timestamp":"timestamp","history":{},"ward":"" }} + fieldMapping: + - inJsonPath: $.applicationStatus.state + outJsonPath: $.Data.workflow.state + - inJsonPath: $.processInstance.action + outJsonPath: $.Data.workflow.action + - inJsonPath: $.processInstance.assignes.*.uuid + outJsonPath: $.Data.workflow.assignes + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.businessService + outJsonPath: $.Data.businessService + - inJsonPath: $.challanNo + outJsonPath: $.Data.challanNo + - inJsonPath: $.referenceId + outJsonPath: $.Data.referenceId + - inJsonPath: $.description + outJsonPath: $.Data.description + - inJsonPath: $.accountId + outJsonPath: $.Data.accountId + - inJsonPath: $.additionalDetail + outJsonPath: $.Data.additionalDetail + - inJsonPath: $.source + outJsonPath: $.Data.source + - inJsonPath: $.taxPeriodFrom + outJsonPath: $.Data.taxPeriodFrom + - inJsonPath: $.taxPeriodTo + outJsonPath: $.Data.taxPeriodTo + - inJsonPath: $.amount + outJsonPath: $.Data.amount + - inJsonPath: $.filestoreid + outJsonPath: $.Data.filestoreid + - inJsonPath: $.additionalDetails + outJsonPath: $.Data.additionalDetails + - inJsonPath: $.applicationStatus + outJsonPath: $.Data.applicationStatus + - inJsonPath: $.vendor + outJsonPath: $.Data.vendor + - inJsonPath: $.typeOfExpense + outJsonPath: $.Data.typeOfExpense + - inJsonPath: $.billDate + outJsonPath: $.Data.billDate + - inJsonPath: $.billIssuedDate + outJsonPath: $.Data.billIssuedDate + - inJsonPath: $.paidDate + outJsonPath: $.Data.paidDate + - inJsonPath: $.isBillPaid + outJsonPath: $.Data.isBillPaid + - inJsonPath: $.vendorName + outJsonPath: $.Data.vendorName + - inJsonPath: $.totalAmount + outJsonPath: $.Data.totalAmount + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + externalUriMapping: + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.acknowldgementNumber,history=true,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.echallan","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + + + - topic: update-challan + configKey: INDEX + indexes: + - name: echallan-services + type: general + id: $.id,$.tenantId + jsonPath: $.Challan + timeStampField: $.auditDetails.createdTime + customJsonMapping: + indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","tenantId":"","businessService":"","challanNo":"","referenceId":"","description":"","accountId":"","additionalDetail":{},"source":"","taxPeriodFrom":"","taxPeriodTo":"","amount":[],"filestoreid":"","additionalDetails":{},"applicationStatus":"","vendor":"","typeOfExpense":"","billDate":"","billIssuedDate":"","paidDate":"","isBillPaid":"","vendorName":"","totalAmount":"","@timestamp":"timestamp","history":{},"ward":"" }} + fieldMapping: + - inJsonPath: $.applicationStatus.state + outJsonPath: $.Data.workflow.state + - inJsonPath: $.processInstance.action + outJsonPath: $.Data.workflow.action + - inJsonPath: $.processInstance.assignes.*.uuid + outJsonPath: $.Data.workflow.assignes + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.businessService + outJsonPath: $.Data.businessService + - inJsonPath: $.challanNo + outJsonPath: $.Data.challanNo + - inJsonPath: $.referenceId + outJsonPath: $.Data.referenceId + - inJsonPath: $.description + outJsonPath: $.Data.description + - inJsonPath: $.accountId + outJsonPath: $.Data.accountId + - inJsonPath: $.additionalDetail + outJsonPath: $.Data.additionalDetail + - inJsonPath: $.source + outJsonPath: $.Data.source + - inJsonPath: $.taxPeriodFrom + outJsonPath: $.Data.taxPeriodFrom + - inJsonPath: $.taxPeriodTo + outJsonPath: $.Data.taxPeriodTo + - inJsonPath: $.amount + outJsonPath: $.Data.amount + - inJsonPath: $.filestoreid + outJsonPath: $.Data.filestoreid + - inJsonPath: $.additionalDetails + outJsonPath: $.Data.additionalDetails + - inJsonPath: $.applicationStatus + outJsonPath: $.Data.applicationStatus + - inJsonPath: $.vendor + outJsonPath: $.Data.vendor + - inJsonPath: $.typeOfExpense + outJsonPath: $.Data.typeOfExpense + - inJsonPath: $.billDate + outJsonPath: $.Data.billDate + - inJsonPath: $.billIssuedDate + outJsonPath: $.Data.billIssuedDate + - inJsonPath: $.paidDate + outJsonPath: $.Data.paidDate + - inJsonPath: $.isBillPaid + outJsonPath: $.Data.isBillPaid + - inJsonPath: $.vendorName + outJsonPath: $.Data.vendorName + - inJsonPath: $.totalAmount + outJsonPath: $.Data.totalAmount + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + externalUriMapping: + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.acknowldgementNumber,history=true,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.echallan","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + + + - topic: echallan-legacyIndex + configKey: LEGACYINDEX + indexes: + - name: echallan-services + type: general + isBulk: true + id: $.id,$.tenantId + jsonPath: $.challans.* + timeStampField: $.auditDetails.createdTime + customJsonMapping: + indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","tenantId":"","businessService":"","challanNo":"","referenceId":"","description":"","accountId":"","additionalDetail":{},"source":"","taxPeriodFrom":"","taxPeriodTo":"","amount":[],"filestoreid":"","additionalDetails":{},"applicationStatus":"","vendor":"","typeOfExpense":"","billDate":"","billIssuedDate":"","paidDate":"","isBillPaid":"","vendorName":"","totalAmount":"","@timestamp":"timestamp","history":{},"ward":"" }} + fieldMapping: + - inJsonPath: $.processInstance.action + outJsonPath: $.Data.workflow.action + - inJsonPath: $.processInstance.assignes.*.uuid + outJsonPath: $.Data.workflow.assignes + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.businessService + outJsonPath: $.Data.businessService + - inJsonPath: $.challanNo + outJsonPath: $.Data.challanNo + - inJsonPath: $.referenceId + outJsonPath: $.Data.referenceId + - inJsonPath: $.description + outJsonPath: $.Data.description + - inJsonPath: $.accountId + outJsonPath: $.Data.accountId + - inJsonPath: $.additionalDetail + outJsonPath: $.Data.additionalDetail + - inJsonPath: $.source + outJsonPath: $.Data.source + - inJsonPath: $.taxPeriodFrom + outJsonPath: $.Data.taxPeriodFrom + - inJsonPath: $.taxPeriodTo + outJsonPath: $.Data.taxPeriodTo + - inJsonPath: $.amount + outJsonPath: $.Data.amount + - inJsonPath: $.filestoreid + outJsonPath: $.Data.filestoreid + - inJsonPath: $.additionalDetails + outJsonPath: $.Data.additionalDetails + - inJsonPath: $.applicationStatus + outJsonPath: $.Data.applicationStatus + - inJsonPath: $.vendor + outJsonPath: $.Data.vendor + - inJsonPath: $.typeOfExpense + outJsonPath: $.Data.typeOfExpense + - inJsonPath: $.billDate + outJsonPath: $.Data.billDate + - inJsonPath: $.billIssuedDate + outJsonPath: $.Data.billIssuedDate + - inJsonPath: $.paidDate + outJsonPath: $.Data.paidDate + - inJsonPath: $.isBillPaid + outJsonPath: $.Data.isBillPaid + - inJsonPath: $.vendorName + outJsonPath: $.Data.vendorName + - inJsonPath: $.totalAmount + outJsonPath: $.Data.totalAmount + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + externalUriMapping: + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.acknowldgementNumber,history=true,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.echallan","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward From 82e4bf09c85cdcd9128c403a18ee1f8f2a8f6cfa Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Mon, 21 Mar 2022 11:08:45 +0530 Subject: [PATCH 1003/1242] Update ward with "Data.ward" --- .../dashboard-ingest/transform_mcollect_v1.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-ingest/transform_mcollect_v1.json b/configs/egov-dss-dashboards/dashboard-ingest/transform_mcollect_v1.json index e145de0a..5883f4c1 100644 --- a/configs/egov-dss-dashboards/dashboard-ingest/transform_mcollect_v1.json +++ b/configs/egov-dss-dashboards/dashboard-ingest/transform_mcollect_v1.json @@ -2,7 +2,7 @@ { "operation": "shift", "spec": { - "ward" : "ward" + "ward" : "Data.ward" } } ] From 4c3de987a9d3fd8692d922cea7de08622cce8cd2 Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Mon, 21 Mar 2022 13:11:47 +0530 Subject: [PATCH 1004/1242] Correction in PGR description State report --- configs/reports/configs/pgr-reports.yml | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/configs/reports/configs/pgr-reports.yml b/configs/reports/configs/pgr-reports.yml index 4c922fcb..dbbbaf17 100644 --- a/configs/reports/configs/pgr-reports.yml +++ b/configs/reports/configs/pgr-reports.yml @@ -1922,11 +1922,7 @@ ReportDefinitions: apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=common-masters&masterName=Department&tenantId=$tenantId keyOrder: name,code tableName: tbl_def_dept - - entity: $.TenantBoundary[0].boundary - apiURL: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search?hierarchyTypeCode=ADMIN&boundaryType=Locality&tenantId=$tenantId - keyOrder: name,code - tableName: tbl_boundary - sourceColumns: + sourceColumns: - name: department label: reports.rainmaker-pgr.department type: string @@ -1962,11 +1958,6 @@ ReportDefinitions: type: string source: eg_pgr_service total: false - - name: locality - label: reports.rainmaker-pgr.locality - type: string - source: eg_pgr_service - total: false - name: landmark label: reports.rainmaker-pgr.landmark type: string @@ -2026,7 +2017,7 @@ ReportDefinitions: (case when ua.name is null then '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' else ua.name end) as lastassignedto, --value for Unassigned (SELECT deptmap_def.name FROM (VALUES tbl_def_dept) AS deptmap_def(name,code) INNER JOIN (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) on deptmap.serviceCode = eg_pgr_service.servicecode and deptmap_def.code = deptmap.department) AS department, regexp_replace(servicecode, '([a-z])([A-Z])', '\1 \2','g') AS servicecode, - (SELECT boundary_def.name FROM (VALUES tbl_boundary) AS boundary_def(name,code) where code=eg_pgr_address.mohalla) as locality, + --(SELECT boundary_def.name FROM (VALUES tbl_boundary) AS boundary_def(name,code) where code=eg_pgr_address.mohalla) as locality, servicerequestid AS complaintNo, to_char(to_timestamp(TRUNC(CAST(eg_pgr_service.createdtime AS bigint) / 1000)), 'DD/MM/YYYY') AS date, (case when eg_user.name is null then '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' else eg_user.name end) as name, --value for NULL From 8b094df26673be396213448fff8772654068d7cf Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Mon, 21 Mar 2022 15:49:58 +0530 Subject: [PATCH 1005/1242] Update MCollect index as "id:1" --- .../dashboard-ingest/DomainConfig.json | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json b/configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json index 98f905a2..332b6138 100644 --- a/configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json +++ b/configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json @@ -1,19 +1,19 @@ { "domainConfig": [ - { + { "id": "1", - "domain": "PT", - "indexName": "property-services", + "domain": "MCOLLECT", + "indexName": "echallan-services", "documentType": "", - "query": "{\"query\":{\"bool\":{\"must\":[{\"match_phrase\":{\"Data.propertyId\":\"value\"}}]}}}", + "query": "{\"query\":{\"bool\":{\"must\":[{\"match_phrase\":{\"Data.challanNo\":\"value\"}}]}}}", "targetReferences": [ { - "fieldName": "propertyId", - "argument": "Data.propertyId", + "fieldName": "challanNo", + "argument": "Data.challanNo", "dataType": "String", "value": "$value", "seperator": " ", - "expression": "propertyId" + "expression": "challanNo" } ], "sourceReferences": [ @@ -23,7 +23,7 @@ "dataType": "String", "value": "$value", "seperator": " ", - "expression": "propertyId" + "expression": "challanNo" } ] }, @@ -218,18 +218,18 @@ }, { "id": "9", - "domain": "MCOLLECT", - "indexName": "echallan-services", + "domain": "PT", + "indexName": "property-services", "documentType": "", - "query": "{\"query\":{\"bool\":{\"must\":[{\"match_phrase\":{\"Data.challanNo\":\"value\"}}]}}}", + "query": "{\"query\":{\"bool\":{\"must\":[{\"match_phrase\":{\"Data.propertyId\":\"value\"}}]}}}", "targetReferences": [ { - "fieldName": "challanNo", - "argument": "Data.challanNo", + "fieldName": "propertyId", + "argument": "Data.propertyId", "dataType": "String", "value": "$value", "seperator": " ", - "expression": "challanNo" + "expression": "propertyId" } ], "sourceReferences": [ @@ -239,7 +239,7 @@ "dataType": "String", "value": "$value", "seperator": " ", - "expression": "challanNo" + "expression": "propertyId" } ] } From 890c5114c583a3c135fd372c230705038610a535 Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Mon, 21 Mar 2022 16:26:07 +0530 Subject: [PATCH 1006/1242] Revert changes for "DomainConfig.json" --- .../dashboard-ingest/DomainConfig.json | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json b/configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json index 332b6138..98f905a2 100644 --- a/configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json +++ b/configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json @@ -1,19 +1,19 @@ { "domainConfig": [ - { + { "id": "1", - "domain": "MCOLLECT", - "indexName": "echallan-services", + "domain": "PT", + "indexName": "property-services", "documentType": "", - "query": "{\"query\":{\"bool\":{\"must\":[{\"match_phrase\":{\"Data.challanNo\":\"value\"}}]}}}", + "query": "{\"query\":{\"bool\":{\"must\":[{\"match_phrase\":{\"Data.propertyId\":\"value\"}}]}}}", "targetReferences": [ { - "fieldName": "challanNo", - "argument": "Data.challanNo", + "fieldName": "propertyId", + "argument": "Data.propertyId", "dataType": "String", "value": "$value", "seperator": " ", - "expression": "challanNo" + "expression": "propertyId" } ], "sourceReferences": [ @@ -23,7 +23,7 @@ "dataType": "String", "value": "$value", "seperator": " ", - "expression": "challanNo" + "expression": "propertyId" } ] }, @@ -218,18 +218,18 @@ }, { "id": "9", - "domain": "PT", - "indexName": "property-services", + "domain": "MCOLLECT", + "indexName": "echallan-services", "documentType": "", - "query": "{\"query\":{\"bool\":{\"must\":[{\"match_phrase\":{\"Data.propertyId\":\"value\"}}]}}}", + "query": "{\"query\":{\"bool\":{\"must\":[{\"match_phrase\":{\"Data.challanNo\":\"value\"}}]}}}", "targetReferences": [ { - "fieldName": "propertyId", - "argument": "Data.propertyId", + "fieldName": "challanNo", + "argument": "Data.challanNo", "dataType": "String", "value": "$value", "seperator": " ", - "expression": "propertyId" + "expression": "challanNo" } ], "sourceReferences": [ @@ -239,7 +239,7 @@ "dataType": "String", "value": "$value", "seperator": " ", - "expression": "propertyId" + "expression": "challanNo" } ] } From e4516e57e746923b55053b2e3dac15987948a9f6 Mon Sep 17 00:00:00 2001 From: poonam1512 Date: Tue, 22 Mar 2022 10:21:48 +0530 Subject: [PATCH 1007/1242] adding 4th point in disclaimer --- configs/pdf-service/format-config/property-receipt.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/configs/pdf-service/format-config/property-receipt.json b/configs/pdf-service/format-config/property-receipt.json index eeb10c58..c0bf926c 100644 --- a/configs/pdf-service/format-config/property-receipt.json +++ b/configs/pdf-service/format-config/property-receipt.json @@ -866,7 +866,7 @@ "layout": {} }, { - "text":"OWNERSHIP INFORMATION", + "text":"OWNER/OCCUPIER INFORMATION", "style":"block-head" } , @@ -1162,7 +1162,8 @@ {"text": "https://mseva.lgpunjab.gov.in/", "bold": true, "fontSize": 8, "color": "blue", "decoration": "underline"}]}, { "text": "1. Payment received by cheque/demand draft shall be subject to realization, This is a computer generated document, hence requires no signature."}, {"text":"2. This document is not a proof of Property Ownership and regularization of unauthorized construction."}, - {"text":"3. Assessment & Payment is subject to verification/Scrutiny by competitive authority.Also deposit property tax dues for earlier years. Ignore, if already paid."}, + {"text":"3. Assessment & Payment is subject to verification/Scrutiny by competitive authority.Also deposit property tax dues for earlier years. Ignore, if already paid."}, + {"text":"4. Residential Property will not be considered Commercial even if Commercial property tax is paid."}, { "text":"Now log a complaint from WhatsApp, give a missed call on 8750975975 or send a Hi message on WhatsApp to this number", "bold": true, "fontSize": 8, "color": "blue", "decoration": "underline"} ] From efaeca6b86f5de23fa4cdb2373c51ad769e5e066 Mon Sep 17 00:00:00 2001 From: poonam1512 <56335644+poonam1512@users.noreply.github.com> Date: Tue, 22 Mar 2022 13:17:01 +0530 Subject: [PATCH 1008/1242] yml updated --- configs/reports/configs/pgr-reports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/reports/configs/pgr-reports.yml b/configs/reports/configs/pgr-reports.yml index dbbbaf17..b508059e 100644 --- a/configs/reports/configs/pgr-reports.yml +++ b/configs/reports/configs/pgr-reports.yml @@ -1922,7 +1922,7 @@ ReportDefinitions: apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=common-masters&masterName=Department&tenantId=$tenantId keyOrder: name,code tableName: tbl_def_dept - sourceColumns: + sourceColumns: - name: department label: reports.rainmaker-pgr.department type: string From a1c6df92deba4239f32f8a40445b91d8a99c4741 Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Tue, 22 Mar 2022 14:12:47 +0530 Subject: [PATCH 1009/1242] Revert changes for "transform_mcollect_v1.json" --- .../dashboard-ingest/transform_mcollect_v1.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-ingest/transform_mcollect_v1.json b/configs/egov-dss-dashboards/dashboard-ingest/transform_mcollect_v1.json index 5883f4c1..e145de0a 100644 --- a/configs/egov-dss-dashboards/dashboard-ingest/transform_mcollect_v1.json +++ b/configs/egov-dss-dashboards/dashboard-ingest/transform_mcollect_v1.json @@ -2,7 +2,7 @@ { "operation": "shift", "spec": { - "ward" : "Data.ward" + "ward" : "ward" } } ] From 83c78a3658f26805f2ae3d818b97fe3012f7faac Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Tue, 22 Mar 2022 14:22:06 +0530 Subject: [PATCH 1010/1242] Add "domainObject.ward" --- .../dashboard-ingest/transform_mcollect_v1.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-ingest/transform_mcollect_v1.json b/configs/egov-dss-dashboards/dashboard-ingest/transform_mcollect_v1.json index e145de0a..f70e67e4 100644 --- a/configs/egov-dss-dashboards/dashboard-ingest/transform_mcollect_v1.json +++ b/configs/egov-dss-dashboards/dashboard-ingest/transform_mcollect_v1.json @@ -2,7 +2,7 @@ { "operation": "shift", "spec": { - "ward" : "ward" + "ward" : "domainObject.ward" } } ] From 4575be0d36558c6353000f1e0867587a0e730e14 Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Tue, 22 Mar 2022 19:00:07 +0530 Subject: [PATCH 1011/1242] Added ,"Department":"NA" in save-fn-firenoc --- configs/egov-indexer/rainmaker-firenoc-indexer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-indexer/rainmaker-firenoc-indexer.yml b/configs/egov-indexer/rainmaker-firenoc-indexer.yml index ac0b4a51..afa74360 100644 --- a/configs/egov-indexer/rainmaker-firenoc-indexer.yml +++ b/configs/egov-indexer/rainmaker-firenoc-indexer.yml @@ -12,7 +12,7 @@ ServiceMaps: jsonPath: $.FireNOCs timeStampField: $.auditDetails.createdTime customJsonMapping: - indexMapping: {"Data":{"channel":"","id":"","tenantId":"","fireNOCDetails":{"status":"","action":"","firestationId":"","applicationNumber":"","fireNOCType":"","buildings":[],"propertyDetails":{},"additionalDetail":{},"applicantDetails":{}},"auditDetails":{},"@timestamp":"timestamp"}} + indexMapping: {"Data":{"channel":"","id":"","tenantId":"","fireNOCDetails":{"status":"","action":"","firestationId":"","applicationNumber":"","fireNOCType":"","buildings":[],"propertyDetails":{},"additionalDetail":{},"applicantDetails":{}},"auditDetails":{},"@timestamp":"timestamp","Department":"NA"}} fieldMapping: - inJsonPath: $.id outJsonPath: $.Data.id From a690b2a343e4581e4b3b8361b87969b3bd51d398 Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Tue, 22 Mar 2022 20:46:54 +0530 Subject: [PATCH 1012/1242] Revert changes for "transform_mcollect_v1.json" --- .../dashboard-ingest/transform_mcollect_v1.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-ingest/transform_mcollect_v1.json b/configs/egov-dss-dashboards/dashboard-ingest/transform_mcollect_v1.json index f70e67e4..e145de0a 100644 --- a/configs/egov-dss-dashboards/dashboard-ingest/transform_mcollect_v1.json +++ b/configs/egov-dss-dashboards/dashboard-ingest/transform_mcollect_v1.json @@ -2,7 +2,7 @@ { "operation": "shift", "spec": { - "ward" : "domainObject.ward" + "ward" : "ward" } } ] From 0bd188943530b0940d5a08fd1935882ec51880f1 Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Wed, 23 Mar 2022 10:47:26 +0530 Subject: [PATCH 1013/1242] Add "NA" in ward for "saveChallan" --- configs/egov-indexer/payment-indexer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-indexer/payment-indexer.yml b/configs/egov-indexer/payment-indexer.yml index ade19b67..c8d8f247 100644 --- a/configs/egov-indexer/payment-indexer.yml +++ b/configs/egov-indexer/payment-indexer.yml @@ -250,7 +250,7 @@ ServiceMaps: jsonPath: $.Challan timeStampField: $.auditDetails.createdTime customJsonMapping: - indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","tenantId":"","businessService":"","challanNo":"","referenceId":"","description":"","accountId":"","additionalDetail":{},"source":"","taxPeriodFrom":"","taxPeriodTo":"","amount":[],"filestoreid":"","additionalDetails":{},"applicationStatus":"","vendor":"","typeOfExpense":"","billDate":"","billIssuedDate":"","paidDate":"","isBillPaid":"","vendorName":"","totalAmount":"","@timestamp":"timestamp","history":{},"ward":"" }} + indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","tenantId":"","businessService":"","challanNo":"","referenceId":"","description":"","accountId":"","additionalDetail":{},"source":"","taxPeriodFrom":"","taxPeriodTo":"","amount":[],"filestoreid":"","additionalDetails":{},"applicationStatus":"","vendor":"","typeOfExpense":"","billDate":"","billIssuedDate":"","paidDate":"","isBillPaid":"","vendorName":"","totalAmount":"","@timestamp":"timestamp","history":{},"ward":"NA" }} fieldMapping: - inJsonPath: $.applicationStatus.state outJsonPath: $.Data.workflow.state From 10f508084860a547b5e049c5fd9c2704a5084185 Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Wed, 23 Mar 2022 15:01:28 +0530 Subject: [PATCH 1014/1242] Update ward in saveChallan index --- configs/egov-indexer/payment-indexer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-indexer/payment-indexer.yml b/configs/egov-indexer/payment-indexer.yml index c8d8f247..cfdc72d2 100644 --- a/configs/egov-indexer/payment-indexer.yml +++ b/configs/egov-indexer/payment-indexer.yml @@ -250,7 +250,7 @@ ServiceMaps: jsonPath: $.Challan timeStampField: $.auditDetails.createdTime customJsonMapping: - indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","tenantId":"","businessService":"","challanNo":"","referenceId":"","description":"","accountId":"","additionalDetail":{},"source":"","taxPeriodFrom":"","taxPeriodTo":"","amount":[],"filestoreid":"","additionalDetails":{},"applicationStatus":"","vendor":"","typeOfExpense":"","billDate":"","billIssuedDate":"","paidDate":"","isBillPaid":"","vendorName":"","totalAmount":"","@timestamp":"timestamp","history":{},"ward":"NA" }} + indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","tenantId":"","businessService":"","challanNo":"","referenceId":"","description":"","accountId":"","additionalDetail":{},"source":"","taxPeriodFrom":"","taxPeriodTo":"","amount":[],"filestoreid":"","additionalDetails":{},"applicationStatus":"","vendor":"","typeOfExpense":"","billDate":"","billIssuedDate":"","paidDate":"","isBillPaid":"","vendorName":"","totalAmount":"","@timestamp":"timestamp","history":{},"ward":"()" }} fieldMapping: - inJsonPath: $.applicationStatus.state outJsonPath: $.Data.workflow.state From 8b7c24cdfc9c61d4120d1fc7cebeb6ee38481483 Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Wed, 23 Mar 2022 15:40:08 +0530 Subject: [PATCH 1015/1242] Update ward in save-challan index --- configs/egov-indexer/payment-indexer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-indexer/payment-indexer.yml b/configs/egov-indexer/payment-indexer.yml index cfdc72d2..5dbcf4c4 100644 --- a/configs/egov-indexer/payment-indexer.yml +++ b/configs/egov-indexer/payment-indexer.yml @@ -250,7 +250,7 @@ ServiceMaps: jsonPath: $.Challan timeStampField: $.auditDetails.createdTime customJsonMapping: - indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","tenantId":"","businessService":"","challanNo":"","referenceId":"","description":"","accountId":"","additionalDetail":{},"source":"","taxPeriodFrom":"","taxPeriodTo":"","amount":[],"filestoreid":"","additionalDetails":{},"applicationStatus":"","vendor":"","typeOfExpense":"","billDate":"","billIssuedDate":"","paidDate":"","isBillPaid":"","vendorName":"","totalAmount":"","@timestamp":"timestamp","history":{},"ward":"()" }} + indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","tenantId":"","businessService":"","challanNo":"","referenceId":"","description":"","accountId":"","additionalDetail":{},"source":"","taxPeriodFrom":"","taxPeriodTo":"","amount":[],"filestoreid":"","additionalDetails":{},"applicationStatus":"","vendor":"","typeOfExpense":"","billDate":"","billIssuedDate":"","paidDate":"","isBillPaid":"","vendorName":"","totalAmount":"","@timestamp":"timestamp","history":{},"ward":{}}} fieldMapping: - inJsonPath: $.applicationStatus.state outJsonPath: $.Data.workflow.state From e557d40945e92c5e51cbae88e9e1e698b562d6ab Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Wed, 23 Mar 2022 15:54:01 +0530 Subject: [PATCH 1016/1242] Update ward with NA --- configs/egov-indexer/payment-indexer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-indexer/payment-indexer.yml b/configs/egov-indexer/payment-indexer.yml index 5dbcf4c4..91cf9525 100644 --- a/configs/egov-indexer/payment-indexer.yml +++ b/configs/egov-indexer/payment-indexer.yml @@ -250,7 +250,7 @@ ServiceMaps: jsonPath: $.Challan timeStampField: $.auditDetails.createdTime customJsonMapping: - indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","tenantId":"","businessService":"","challanNo":"","referenceId":"","description":"","accountId":"","additionalDetail":{},"source":"","taxPeriodFrom":"","taxPeriodTo":"","amount":[],"filestoreid":"","additionalDetails":{},"applicationStatus":"","vendor":"","typeOfExpense":"","billDate":"","billIssuedDate":"","paidDate":"","isBillPaid":"","vendorName":"","totalAmount":"","@timestamp":"timestamp","history":{},"ward":{}}} + indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","tenantId":"","businessService":"","challanNo":"","referenceId":"","description":"","accountId":"","additionalDetail":{},"source":"","taxPeriodFrom":"","taxPeriodTo":"","amount":[],"filestoreid":"","additionalDetails":{},"applicationStatus":"","vendor":"","typeOfExpense":"","billDate":"","billIssuedDate":"","paidDate":"","isBillPaid":"","vendorName":"","totalAmount":"","@timestamp":"timestamp","history":{},"ward":{NA}}} fieldMapping: - inJsonPath: $.applicationStatus.state outJsonPath: $.Data.workflow.state From 2ad9df3a0c17649f903be1bb3f6fbdaa9a88fce9 Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Wed, 23 Mar 2022 16:05:24 +0530 Subject: [PATCH 1017/1242] Update ward for save-challan index --- configs/egov-indexer/payment-indexer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-indexer/payment-indexer.yml b/configs/egov-indexer/payment-indexer.yml index 91cf9525..ba97064a 100644 --- a/configs/egov-indexer/payment-indexer.yml +++ b/configs/egov-indexer/payment-indexer.yml @@ -250,7 +250,7 @@ ServiceMaps: jsonPath: $.Challan timeStampField: $.auditDetails.createdTime customJsonMapping: - indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","tenantId":"","businessService":"","challanNo":"","referenceId":"","description":"","accountId":"","additionalDetail":{},"source":"","taxPeriodFrom":"","taxPeriodTo":"","amount":[],"filestoreid":"","additionalDetails":{},"applicationStatus":"","vendor":"","typeOfExpense":"","billDate":"","billIssuedDate":"","paidDate":"","isBillPaid":"","vendorName":"","totalAmount":"","@timestamp":"timestamp","history":{},"ward":{NA}}} + indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","tenantId":"","businessService":"","challanNo":"","referenceId":"","description":"","accountId":"","additionalDetail":{},"source":"","taxPeriodFrom":"","taxPeriodTo":"","amount":[],"filestoreid":"","additionalDetails":{},"applicationStatus":"","vendor":"","typeOfExpense":"","billDate":"","billIssuedDate":"","paidDate":"","isBillPaid":"","vendorName":"","totalAmount":"","@timestamp":"timestamp","history":{},"ward":{"code":"NA"}}} fieldMapping: - inJsonPath: $.applicationStatus.state outJsonPath: $.Data.workflow.state From c57e35ab4a1a59e8d5c3aa01a34afaafc4483e97 Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Wed, 23 Mar 2022 16:22:50 +0530 Subject: [PATCH 1018/1242] Update ward --- configs/egov-indexer/payment-indexer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-indexer/payment-indexer.yml b/configs/egov-indexer/payment-indexer.yml index ba97064a..c1443642 100644 --- a/configs/egov-indexer/payment-indexer.yml +++ b/configs/egov-indexer/payment-indexer.yml @@ -250,7 +250,7 @@ ServiceMaps: jsonPath: $.Challan timeStampField: $.auditDetails.createdTime customJsonMapping: - indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","tenantId":"","businessService":"","challanNo":"","referenceId":"","description":"","accountId":"","additionalDetail":{},"source":"","taxPeriodFrom":"","taxPeriodTo":"","amount":[],"filestoreid":"","additionalDetails":{},"applicationStatus":"","vendor":"","typeOfExpense":"","billDate":"","billIssuedDate":"","paidDate":"","isBillPaid":"","vendorName":"","totalAmount":"","@timestamp":"timestamp","history":{},"ward":{"code":"NA"}}} + indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","tenantId":"","businessService":"","challanNo":"","referenceId":"","description":"","accountId":"","additionalDetail":{},"source":"","taxPeriodFrom":"","taxPeriodTo":"","amount":[],"filestoreid":"","additionalDetails":{},"applicationStatus":"","vendor":"","typeOfExpense":"","billDate":"","billIssuedDate":"","paidDate":"","isBillPaid":"","vendorName":"","totalAmount":"","@timestamp":"timestamp","history":{},"ward":{code:"NA"}}} fieldMapping: - inJsonPath: $.applicationStatus.state outJsonPath: $.Data.workflow.state From d2bcd40937be8af4622bfc3065060573c2dedf2c Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Wed, 23 Mar 2022 16:35:23 +0530 Subject: [PATCH 1019/1242] Update ward for save-challan index --- configs/egov-indexer/payment-indexer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-indexer/payment-indexer.yml b/configs/egov-indexer/payment-indexer.yml index c1443642..5e766322 100644 --- a/configs/egov-indexer/payment-indexer.yml +++ b/configs/egov-indexer/payment-indexer.yml @@ -250,7 +250,7 @@ ServiceMaps: jsonPath: $.Challan timeStampField: $.auditDetails.createdTime customJsonMapping: - indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","tenantId":"","businessService":"","challanNo":"","referenceId":"","description":"","accountId":"","additionalDetail":{},"source":"","taxPeriodFrom":"","taxPeriodTo":"","amount":[],"filestoreid":"","additionalDetails":{},"applicationStatus":"","vendor":"","typeOfExpense":"","billDate":"","billIssuedDate":"","paidDate":"","isBillPaid":"","vendorName":"","totalAmount":"","@timestamp":"timestamp","history":{},"ward":{code:"NA"}}} + indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","tenantId":"","businessService":"","challanNo":"","referenceId":"","description":"","accountId":"","additionalDetail":{},"source":"","taxPeriodFrom":"","taxPeriodTo":"","amount":[],"filestoreid":"","additionalDetails":{},"applicationStatus":"","vendor":"","typeOfExpense":"","billDate":"","billIssuedDate":"","paidDate":"","isBillPaid":"","vendorName":"","totalAmount":"","@timestamp":"timestamp","history":{},"ward":{"NA"}}} fieldMapping: - inJsonPath: $.applicationStatus.state outJsonPath: $.Data.workflow.state From dc20531e1e11db4b49a9114bb2cadc68a85a6e1c Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Wed, 23 Mar 2022 16:47:21 +0530 Subject: [PATCH 1020/1242] Update ward for save-challan index --- configs/egov-indexer/payment-indexer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-indexer/payment-indexer.yml b/configs/egov-indexer/payment-indexer.yml index 5e766322..77a9067e 100644 --- a/configs/egov-indexer/payment-indexer.yml +++ b/configs/egov-indexer/payment-indexer.yml @@ -250,7 +250,7 @@ ServiceMaps: jsonPath: $.Challan timeStampField: $.auditDetails.createdTime customJsonMapping: - indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","tenantId":"","businessService":"","challanNo":"","referenceId":"","description":"","accountId":"","additionalDetail":{},"source":"","taxPeriodFrom":"","taxPeriodTo":"","amount":[],"filestoreid":"","additionalDetails":{},"applicationStatus":"","vendor":"","typeOfExpense":"","billDate":"","billIssuedDate":"","paidDate":"","isBillPaid":"","vendorName":"","totalAmount":"","@timestamp":"timestamp","history":{},"ward":{"NA"}}} + indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","tenantId":"","businessService":"","challanNo":"","referenceId":"","description":"","accountId":"","additionalDetail":{},"source":"","taxPeriodFrom":"","taxPeriodTo":"","amount":[],"filestoreid":"","additionalDetails":{},"applicationStatus":"","vendor":"","typeOfExpense":"","billDate":"","billIssuedDate":"","paidDate":"","isBillPaid":"","vendorName":"","totalAmount":"","@timestamp":"timestamp","history":{},"ward":{"code"}}} fieldMapping: - inJsonPath: $.applicationStatus.state outJsonPath: $.Data.workflow.state From f5a4a6a09db6ddceb55cd92a2c55f7aa5fb01bac Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Wed, 23 Mar 2022 17:04:28 +0530 Subject: [PATCH 1021/1242] Update ward for "save-fn-firenoc" index --- configs/egov-indexer/rainmaker-firenoc-indexer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-indexer/rainmaker-firenoc-indexer.yml b/configs/egov-indexer/rainmaker-firenoc-indexer.yml index afa74360..ebafd661 100644 --- a/configs/egov-indexer/rainmaker-firenoc-indexer.yml +++ b/configs/egov-indexer/rainmaker-firenoc-indexer.yml @@ -12,7 +12,7 @@ ServiceMaps: jsonPath: $.FireNOCs timeStampField: $.auditDetails.createdTime customJsonMapping: - indexMapping: {"Data":{"channel":"","id":"","tenantId":"","fireNOCDetails":{"status":"","action":"","firestationId":"","applicationNumber":"","fireNOCType":"","buildings":[],"propertyDetails":{},"additionalDetail":{},"applicantDetails":{}},"auditDetails":{},"@timestamp":"timestamp","Department":"NA"}} + indexMapping: {"Data":{"channel":"","id":"","tenantId":"","fireNOCDetails":{"status":"","action":"","firestationId":"","applicationNumber":"","fireNOCType":"","buildings":[],"propertyDetails":{},"additionalDetail":{},"applicantDetails":{}},"auditDetails":{},"@timestamp":"timestamp","Department":{"NA"}}} fieldMapping: - inJsonPath: $.id outJsonPath: $.Data.id From 3c32332fee8f001cc53d9ef7d738e836de8d7b22 Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Wed, 23 Mar 2022 17:12:17 +0530 Subject: [PATCH 1022/1242] Update Department for "save-fn-firenoc" --- configs/egov-indexer/rainmaker-firenoc-indexer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-indexer/rainmaker-firenoc-indexer.yml b/configs/egov-indexer/rainmaker-firenoc-indexer.yml index ebafd661..db150e50 100644 --- a/configs/egov-indexer/rainmaker-firenoc-indexer.yml +++ b/configs/egov-indexer/rainmaker-firenoc-indexer.yml @@ -12,7 +12,7 @@ ServiceMaps: jsonPath: $.FireNOCs timeStampField: $.auditDetails.createdTime customJsonMapping: - indexMapping: {"Data":{"channel":"","id":"","tenantId":"","fireNOCDetails":{"status":"","action":"","firestationId":"","applicationNumber":"","fireNOCType":"","buildings":[],"propertyDetails":{},"additionalDetail":{},"applicantDetails":{}},"auditDetails":{},"@timestamp":"timestamp","Department":{"NA"}}} + indexMapping: {"Data":{"channel":"","id":"","tenantId":"","fireNOCDetails":{"status":"","action":"","firestationId":"","applicationNumber":"","fireNOCType":"","buildings":[],"propertyDetails":{},"additionalDetail":{},"applicantDetails":{}},"auditDetails":{},"@timestamp":"timestamp","Department":" "}} fieldMapping: - inJsonPath: $.id outJsonPath: $.Data.id From d97f1cc8cf421166b53f92db7d6c53b810800c9d Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Wed, 23 Mar 2022 17:25:34 +0530 Subject: [PATCH 1023/1242] Update ward in "save-fn-firenoc" index --- configs/egov-indexer/rainmaker-firenoc-indexer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-indexer/rainmaker-firenoc-indexer.yml b/configs/egov-indexer/rainmaker-firenoc-indexer.yml index db150e50..afa74360 100644 --- a/configs/egov-indexer/rainmaker-firenoc-indexer.yml +++ b/configs/egov-indexer/rainmaker-firenoc-indexer.yml @@ -12,7 +12,7 @@ ServiceMaps: jsonPath: $.FireNOCs timeStampField: $.auditDetails.createdTime customJsonMapping: - indexMapping: {"Data":{"channel":"","id":"","tenantId":"","fireNOCDetails":{"status":"","action":"","firestationId":"","applicationNumber":"","fireNOCType":"","buildings":[],"propertyDetails":{},"additionalDetail":{},"applicantDetails":{}},"auditDetails":{},"@timestamp":"timestamp","Department":" "}} + indexMapping: {"Data":{"channel":"","id":"","tenantId":"","fireNOCDetails":{"status":"","action":"","firestationId":"","applicationNumber":"","fireNOCType":"","buildings":[],"propertyDetails":{},"additionalDetail":{},"applicantDetails":{}},"auditDetails":{},"@timestamp":"timestamp","Department":"NA"}} fieldMapping: - inJsonPath: $.id outJsonPath: $.Data.id From 088f1db96def4828784589c937a148e82808e43b Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Wed, 23 Mar 2022 17:35:55 +0530 Subject: [PATCH 1024/1242] Update ward in "save-fn-firenoc" --- configs/egov-indexer/rainmaker-firenoc-indexer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-indexer/rainmaker-firenoc-indexer.yml b/configs/egov-indexer/rainmaker-firenoc-indexer.yml index afa74360..db150e50 100644 --- a/configs/egov-indexer/rainmaker-firenoc-indexer.yml +++ b/configs/egov-indexer/rainmaker-firenoc-indexer.yml @@ -12,7 +12,7 @@ ServiceMaps: jsonPath: $.FireNOCs timeStampField: $.auditDetails.createdTime customJsonMapping: - indexMapping: {"Data":{"channel":"","id":"","tenantId":"","fireNOCDetails":{"status":"","action":"","firestationId":"","applicationNumber":"","fireNOCType":"","buildings":[],"propertyDetails":{},"additionalDetail":{},"applicantDetails":{}},"auditDetails":{},"@timestamp":"timestamp","Department":"NA"}} + indexMapping: {"Data":{"channel":"","id":"","tenantId":"","fireNOCDetails":{"status":"","action":"","firestationId":"","applicationNumber":"","fireNOCType":"","buildings":[],"propertyDetails":{},"additionalDetail":{},"applicantDetails":{}},"auditDetails":{},"@timestamp":"timestamp","Department":" "}} fieldMapping: - inJsonPath: $.id outJsonPath: $.Data.id From 150f06e4b64922f13ff2e914eb88cfe2c8171bf3 Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Thu, 24 Mar 2022 11:02:44 +0530 Subject: [PATCH 1025/1242] Update ward in save-challan index --- configs/egov-indexer/payment-indexer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-indexer/payment-indexer.yml b/configs/egov-indexer/payment-indexer.yml index 77a9067e..3fe74226 100644 --- a/configs/egov-indexer/payment-indexer.yml +++ b/configs/egov-indexer/payment-indexer.yml @@ -250,7 +250,7 @@ ServiceMaps: jsonPath: $.Challan timeStampField: $.auditDetails.createdTime customJsonMapping: - indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","tenantId":"","businessService":"","challanNo":"","referenceId":"","description":"","accountId":"","additionalDetail":{},"source":"","taxPeriodFrom":"","taxPeriodTo":"","amount":[],"filestoreid":"","additionalDetails":{},"applicationStatus":"","vendor":"","typeOfExpense":"","billDate":"","billIssuedDate":"","paidDate":"","isBillPaid":"","vendorName":"","totalAmount":"","@timestamp":"timestamp","history":{},"ward":{"code"}}} + indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","tenantId":"","businessService":"","challanNo":"","referenceId":"","description":"","accountId":"","additionalDetail":{},"source":"","taxPeriodFrom":"","taxPeriodTo":"","amount":[],"filestoreid":"","additionalDetails":{},"applicationStatus":"","vendor":"","typeOfExpense":"","billDate":"","billIssuedDate":"","paidDate":"","isBillPaid":"","vendorName":"","totalAmount":"","@timestamp":"timestamp","history":{},"ward":{"name": "NA"}}} fieldMapping: - inJsonPath: $.applicationStatus.state outJsonPath: $.Data.workflow.state From d4140a40a8ac4eff1a68fb77a4077008bf3e2c88 Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Thu, 24 Mar 2022 11:16:52 +0530 Subject: [PATCH 1026/1242] Update ward in all indexes for challan --- configs/egov-indexer/payment-indexer.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/egov-indexer/payment-indexer.yml b/configs/egov-indexer/payment-indexer.yml index 3fe74226..fd9cc521 100644 --- a/configs/egov-indexer/payment-indexer.yml +++ b/configs/egov-indexer/payment-indexer.yml @@ -331,7 +331,7 @@ ServiceMaps: jsonPath: $.Challan timeStampField: $.auditDetails.createdTime customJsonMapping: - indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","tenantId":"","businessService":"","challanNo":"","referenceId":"","description":"","accountId":"","additionalDetail":{},"source":"","taxPeriodFrom":"","taxPeriodTo":"","amount":[],"filestoreid":"","additionalDetails":{},"applicationStatus":"","vendor":"","typeOfExpense":"","billDate":"","billIssuedDate":"","paidDate":"","isBillPaid":"","vendorName":"","totalAmount":"","@timestamp":"timestamp","history":{},"ward":"" }} + indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","tenantId":"","businessService":"","challanNo":"","referenceId":"","description":"","accountId":"","additionalDetail":{},"source":"","taxPeriodFrom":"","taxPeriodTo":"","amount":[],"filestoreid":"","additionalDetails":{},"applicationStatus":"","vendor":"","typeOfExpense":"","billDate":"","billIssuedDate":"","paidDate":"","isBillPaid":"","vendorName":"","totalAmount":"","@timestamp":"timestamp","history":{},"ward":{"name": "NA"}}} fieldMapping: - inJsonPath: $.applicationStatus.state outJsonPath: $.Data.workflow.state @@ -413,7 +413,7 @@ ServiceMaps: jsonPath: $.challans.* timeStampField: $.auditDetails.createdTime customJsonMapping: - indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","tenantId":"","businessService":"","challanNo":"","referenceId":"","description":"","accountId":"","additionalDetail":{},"source":"","taxPeriodFrom":"","taxPeriodTo":"","amount":[],"filestoreid":"","additionalDetails":{},"applicationStatus":"","vendor":"","typeOfExpense":"","billDate":"","billIssuedDate":"","paidDate":"","isBillPaid":"","vendorName":"","totalAmount":"","@timestamp":"timestamp","history":{},"ward":"" }} + indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","tenantId":"","businessService":"","challanNo":"","referenceId":"","description":"","accountId":"","additionalDetail":{},"source":"","taxPeriodFrom":"","taxPeriodTo":"","amount":[],"filestoreid":"","additionalDetails":{},"applicationStatus":"","vendor":"","typeOfExpense":"","billDate":"","billIssuedDate":"","paidDate":"","isBillPaid":"","vendorName":"","totalAmount":"","@timestamp":"timestamp","history":{},"ward":{"name": "NA"}}} fieldMapping: - inJsonPath: $.processInstance.action outJsonPath: $.Data.workflow.action From cbbcf16caa819464278737c2a7e13e47ccc456a8 Mon Sep 17 00:00:00 2001 From: shiva-eGov <97941850+shiva-eGov@users.noreply.github.com> Date: Thu, 24 Mar 2022 11:18:30 +0530 Subject: [PATCH 1027/1242] changed the legacy indexer --- .../egov-indexer/rainmaker-pgr-indexer.yml | 26 +++++-------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/configs/egov-indexer/rainmaker-pgr-indexer.yml b/configs/egov-indexer/rainmaker-pgr-indexer.yml index c7c4224a..721fd421 100644 --- a/configs/egov-indexer/rainmaker-pgr-indexer.yml +++ b/configs/egov-indexer/rainmaker-pgr-indexer.yml @@ -246,31 +246,17 @@ ServiceMaps: - inJsonPath: $.@timestamp outJsonPath: $.Data.@timestamp externalUriMapping: - - path: http://egov-hrms.egov:8080/egov-hrms/employees/_search - queryParam: tenantId=$.tenantId,id=$.assignee - apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", - "authToken": "750d4aa9-2436-4bc4-a8f4-3796e3bfd465","userInfo":{"id":73}}} - uriResponseMapping: - - inJsonPath: $.Employee[0].name - outJsonPath: $.Data.assignee - - path: http://egov-hrms.egov:8080/egov-hrms/employees/_search - queryParam: tenantId=$.tenantId,ids=$.assignee - apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", - "authToken": "750d4aa9-2436-4bc4-a8f4-3796e3bfd465","userInfo":{"id":73}}} - uriResponseMapping: - - inJsonPath: $.Employees[0].user.name - outJsonPath: $.Data.assignee - - path: http://egov-hrms.egov:8080/egov-hrms/employees/_search - queryParam: tenantId=$.tenantId + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=ADMIN,boundaryType=locality,codes=$.addressDetail.mohalla,tenantId=$.tenantId apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", - "authToken": "750d4aa9-2436-4bc4-a8f4-3796e3bfd465","userInfo":{"id":73}}} + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} uriResponseMapping: - - inJsonPath: $.Employees[0].user.name - outJsonPath: $.Data.gro + - inJsonPath: $.TenantBoundary[0].boundary[0].name + outJsonPath: $.Data.addressDetail.locality - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search queryParam: hierarchyTypeCode=ADMIN,boundaryType=Block,codes=$.addressDetail.mohalla,tenantId=$.tenantId apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", - "authToken": "750d4aa9-2436-4bc4-a8f4-3796e3bfd465","userInfo":{"id":73}}} + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} uriResponseMapping: - inJsonPath: $.TenantBoundary[0].boundary[0] outJsonPath: $.Data.complaintWard From b2e6ba08ca58302b324724ca6cc3ac99094584c7 Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Thu, 24 Mar 2022 11:33:06 +0530 Subject: [PATCH 1028/1242] Update ward for all indexes --- configs/egov-indexer/rainmaker-firenoc-indexer.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/egov-indexer/rainmaker-firenoc-indexer.yml b/configs/egov-indexer/rainmaker-firenoc-indexer.yml index db150e50..f4bba84d 100644 --- a/configs/egov-indexer/rainmaker-firenoc-indexer.yml +++ b/configs/egov-indexer/rainmaker-firenoc-indexer.yml @@ -12,7 +12,7 @@ ServiceMaps: jsonPath: $.FireNOCs timeStampField: $.auditDetails.createdTime customJsonMapping: - indexMapping: {"Data":{"channel":"","id":"","tenantId":"","fireNOCDetails":{"status":"","action":"","firestationId":"","applicationNumber":"","fireNOCType":"","buildings":[],"propertyDetails":{},"additionalDetail":{},"applicantDetails":{}},"auditDetails":{},"@timestamp":"timestamp","Department":" "}} + indexMapping: {"Data":{"channel":"","id":"","tenantId":"","fireNOCDetails":{"status":"","action":"","firestationId":"","applicationNumber":"","fireNOCType":"","buildings":[],"propertyDetails":{},"additionalDetail":{},"applicantDetails":{}},"auditDetails":{},"@timestamp":"timestamp","Department": "NA"}} fieldMapping: - inJsonPath: $.id outJsonPath: $.Data.id @@ -88,7 +88,7 @@ ServiceMaps: jsonPath: $.FireNOCs timeStampField: $.auditDetails.lastModifiedTime customJsonMapping: - indexMapping: {"Data":{"channel":"","id":"","tenantId":"","fireNOCDetails":{"status":"","action":"","firestationId":"","applicationNumber":"","fireNOCType":"","buildings":[],"propertyDetails":{},"additionalDetail":{},"applicantDetails":{}},"auditDetails":{},"@timestamp":"timestamp"}} + indexMapping: {"Data":{"channel":"","id":"","tenantId":"","fireNOCDetails":{"status":"","action":"","firestationId":"","applicationNumber":"","fireNOCType":"","buildings":[],"propertyDetails":{},"additionalDetail":{},"applicantDetails":{}},"auditDetails":{},"@timestamp":"timestamp","Department": "NA"}} fieldMapping: - inJsonPath: $.id outJsonPath: $.Data.id @@ -163,7 +163,7 @@ ServiceMaps: jsonPath: $.FireNOCs timeStampField: $.auditDetails.lastModifiedTime customJsonMapping: - indexMapping: {"Data":{"channel":"","id":"","tenantId":"","fireNOCDetails":{"status":"","action":"","firestationId":"","applicationNumber":"","fireNOCType":"","buildings":[],"propertyDetails":{},"additionalDetail":{},"applicantDetails":{}},"auditDetails":{},"@timestamp":"timestamp"}} + indexMapping: {"Data":{"channel":"","id":"","tenantId":"","fireNOCDetails":{"status":"","action":"","firestationId":"","applicationNumber":"","fireNOCType":"","buildings":[],"propertyDetails":{},"additionalDetail":{},"applicantDetails":{}},"auditDetails":{},"@timestamp":"timestamp","Department": "NA"}} fieldMapping: - inJsonPath: $.id outJsonPath: $.Data.id @@ -238,7 +238,7 @@ ServiceMaps: jsonPath: $.FireNOCs timeStampField: $.auditDetails.lastModifiedTime customJsonMapping: - indexMapping: {"Data":{"channel":"","id":"","tenantId":"","fireNOCDetails":{"status":"","action":"","firestationId":"","applicationNumber":"","fireNOCType":"","buildings":[],"propertyDetails":{},"additionalDetail":{},"applicantDetails":{}},"auditDetails":{},"@timestamp":"timestamp"}} + indexMapping: {"Data":{"channel":"","id":"","tenantId":"","fireNOCDetails":{"status":"","action":"","firestationId":"","applicationNumber":"","fireNOCType":"","buildings":[],"propertyDetails":{},"additionalDetail":{},"applicantDetails":{}},"auditDetails":{},"@timestamp":"timestamp","Department": "NA"}} fieldMapping: - inJsonPath: $.id outJsonPath: $.Data.id From e8270fba0d00d4b17af4f95b8de954581649d0c6 Mon Sep 17 00:00:00 2001 From: shiva-eGov <97941850+shiva-eGov@users.noreply.github.com> Date: Thu, 24 Mar 2022 13:15:04 +0530 Subject: [PATCH 1029/1242] Removed the locality ext path for legacy --- configs/egov-indexer/rainmaker-pgr-indexer.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/configs/egov-indexer/rainmaker-pgr-indexer.yml b/configs/egov-indexer/rainmaker-pgr-indexer.yml index 721fd421..b4374979 100644 --- a/configs/egov-indexer/rainmaker-pgr-indexer.yml +++ b/configs/egov-indexer/rainmaker-pgr-indexer.yml @@ -217,7 +217,7 @@ ServiceMaps: fieldsToBeMasked: ["$.phone", "$.citizen.mobileNumber", "$.citizen.address", "$.citizen.aadhaarNumber", "$.citizen.pan", "$.citizen.emailId", "$.citizen.password"] timeStampField: $.auditDetails.createdTime customJsonMapping: - indexMapping: {"Data":{"serviceRequestId":"serviceRequestId","tenantId":"tenantId","complainCategory":"complainCategory","citizen":{},"phone":"phone","dateOfComplaint":null,"address":"","addressDetail":{},"status":"status","assignee":"assignee","gro":"gro","department":"department","complaintWard":{},"source":"source","description":"","slaHours":"slaHours","tenantData":{},"actionHistory":{},"@timestamp":"timestamp"}} + indexMapping: {"Data":{"serviceRequestId":"serviceRequestId","tenantId":"","complainCategory":"complainCategory","citizen":{},"phone":"phone","dateOfComplaint":null,"address":"","addressDetail":{},"status":"status","assignee":"assignee","gro":"gro","department":"department","complaintWard":{},"source":"source","description":"","slaHours":"slaHours","tenantData":{},"actionHistory":{},"@timestamp":"timestamp"}} fieldMapping: - inJsonPath: $.serviceRequestId outJsonPath: $.Data.serviceRequestId @@ -246,13 +246,6 @@ ServiceMaps: - inJsonPath: $.@timestamp outJsonPath: $.Data.@timestamp externalUriMapping: - - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search - queryParam: hierarchyTypeCode=ADMIN,boundaryType=locality,codes=$.addressDetail.mohalla,tenantId=$.tenantId - apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", - "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} - uriResponseMapping: - - inJsonPath: $.TenantBoundary[0].boundary[0].name - outJsonPath: $.Data.addressDetail.locality - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search queryParam: hierarchyTypeCode=ADMIN,boundaryType=Block,codes=$.addressDetail.mohalla,tenantId=$.tenantId apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", From b369a4c1fb15f71c653980589e930bc594f57248 Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Tue, 29 Mar 2022 12:05:06 +0530 Subject: [PATCH 1030/1242] Update "egov-echallan.yml" --- configs/egov-indexer/egov-echallan.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/configs/egov-indexer/egov-echallan.yml b/configs/egov-indexer/egov-echallan.yml index 4d9169ec..58502f05 100644 --- a/configs/egov-indexer/egov-echallan.yml +++ b/configs/egov-indexer/egov-echallan.yml @@ -2,7 +2,7 @@ ServiceMaps: serviceName: echallan Service - rainmaker version: 1.0.0 mappings: - - topic: save-challan + - topic: save-challan configKey: INDEX indexes: - name: echallan-services @@ -11,7 +11,7 @@ ServiceMaps: jsonPath: $.Challan timeStampField: $.auditDetails.createdTime customJsonMapping: - indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","tenantId":"","businessService":"","challanNo":"","referenceId":"","description":"","accountId":"","additionalDetail":{},"source":"","taxPeriodFrom":"","taxPeriodTo":"","amount":[],"filestoreid":"","additionalDetails":{},"applicationStatus":"","vendor":"","typeOfExpense":"","billDate":"","billIssuedDate":"","paidDate":"","isBillPaid":"","vendorName":"","totalAmount":"","@timestamp":"timestamp","history":{},"ward":"" }} + indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","tenantId":"","businessService":"","challanNo":"","referenceId":"","description":"","accountId":"","additionalDetail":{},"source":"","taxPeriodFrom":"","taxPeriodTo":"","amount":[],"filestoreid":"","additionalDetails":{},"applicationStatus":"","vendor":"","typeOfExpense":"","billDate":"","billIssuedDate":"","paidDate":"","isBillPaid":"","vendorName":"","totalAmount":"","@timestamp":"timestamp","history":{},"ward":{"name": "NA"}}} fieldMapping: - inJsonPath: $.applicationStatus.state outJsonPath: $.Data.workflow.state @@ -92,7 +92,7 @@ ServiceMaps: jsonPath: $.Challan timeStampField: $.auditDetails.createdTime customJsonMapping: - indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","tenantId":"","businessService":"","challanNo":"","referenceId":"","description":"","accountId":"","additionalDetail":{},"source":"","taxPeriodFrom":"","taxPeriodTo":"","amount":[],"filestoreid":"","additionalDetails":{},"applicationStatus":"","vendor":"","typeOfExpense":"","billDate":"","billIssuedDate":"","paidDate":"","isBillPaid":"","vendorName":"","totalAmount":"","@timestamp":"timestamp","history":{},"ward":"" }} + indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","tenantId":"","businessService":"","challanNo":"","referenceId":"","description":"","accountId":"","additionalDetail":{},"source":"","taxPeriodFrom":"","taxPeriodTo":"","amount":[],"filestoreid":"","additionalDetails":{},"applicationStatus":"","vendor":"","typeOfExpense":"","billDate":"","billIssuedDate":"","paidDate":"","isBillPaid":"","vendorName":"","totalAmount":"","@timestamp":"timestamp","history":{},"ward":{"name": "NA"}}} fieldMapping: - inJsonPath: $.applicationStatus.state outJsonPath: $.Data.workflow.state @@ -174,7 +174,7 @@ ServiceMaps: jsonPath: $.challans.* timeStampField: $.auditDetails.createdTime customJsonMapping: - indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","tenantId":"","businessService":"","challanNo":"","referenceId":"","description":"","accountId":"","additionalDetail":{},"source":"","taxPeriodFrom":"","taxPeriodTo":"","amount":[],"filestoreid":"","additionalDetails":{},"applicationStatus":"","vendor":"","typeOfExpense":"","billDate":"","billIssuedDate":"","paidDate":"","isBillPaid":"","vendorName":"","totalAmount":"","@timestamp":"timestamp","history":{},"ward":"" }} + indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","tenantId":"","businessService":"","challanNo":"","referenceId":"","description":"","accountId":"","additionalDetail":{},"source":"","taxPeriodFrom":"","taxPeriodTo":"","amount":[],"filestoreid":"","additionalDetails":{},"applicationStatus":"","vendor":"","typeOfExpense":"","billDate":"","billIssuedDate":"","paidDate":"","isBillPaid":"","vendorName":"","totalAmount":"","@timestamp":"timestamp","history":{},"ward":{"name": "NA"}}} fieldMapping: - inJsonPath: $.processInstance.action outJsonPath: $.Data.workflow.action @@ -242,3 +242,4 @@ ServiceMaps: uriResponseMapping: - inJsonPath: $.TenantBoundary[0].boundary[0] outJsonPath: $.Data.ward + From d07bf7fa6737c23101d5aba1a75d47f836892775 Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Tue, 29 Mar 2022 16:40:55 +0530 Subject: [PATCH 1031/1242] Update "cumulativeClosedComplaints" aggQuery --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 4b2a4af1..6ad88905 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -2368,7 +2368,7 @@ "dateRefField": "Data.dateOfComplaint", "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\",\"tenantId\" : \"Data.tenantId\"}", "indexName": "pgrindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Total Complaints\":{\"date_histogram\":{\"field\":\"Data.dateOfComplaint\",\"interval\":\"intervalvalue\"},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}},\"Closed Complaints\":{\"date_histogram\":{\"field\":\"Data.dateOfComplaint\",\"interval\":\"intervalvalue\"},\"aggs\":{\"Closed\":{\"filter\":{\"terms\":{\"Data.status.keyword\":[\"closed\",\"rejected\",\"resolved\"]}},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}},\"Reopened Complaints\":{\"date_histogram\":{\"field\":\"Data.dateOfComplaint\",\"interval\":\"intervalvalue\"},\"aggs\":{\"Reopened\":{\"filter\":{\"terms\":{\"Data.actionHistory.actions.action.keyword\":[\"reopen\"]}},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Total Complaints\":{\"date_histogram\":{\"field\":\"Data.dateOfComplaint\",\"interval\":\"month\"},\"aggs\":{\"Total\":{\"sum\":{\"field\":\"todaysComplaintsForCategory\"}}}},\"Closed Complaints\":{\"date_histogram\":{\"field\":\"Data.dateOfComplaint\",\"interval\":\"month\"},\"aggs\":{\"Closed_Complaints\":{\"sum\":{\"field\":\"todaysClosedComplaintsForDepartment\"}}}},\"Reopened Complaints\":{\"date_histogram\":{\"field\":\"Data.dateOfComplaint\",\"interval\":\"month\"},\"aggs\":{\"Reopened\":{\"sum\":{\"field\":\"todaysReopenedComplaintsForDepartment\"}}}}}}}}" } ], "chartType": "line", From ba230982d2d83c84147de0b6c6c021415ec3b53d Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Tue, 29 Mar 2022 17:08:27 +0530 Subject: [PATCH 1032/1242] Update "cumulativeClosedComplaints" for aggQuery --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 6ad88905..f185c9d1 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -2368,7 +2368,7 @@ "dateRefField": "Data.dateOfComplaint", "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\",\"tenantId\" : \"Data.tenantId\"}", "indexName": "pgrindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Total Complaints\":{\"date_histogram\":{\"field\":\"Data.dateOfComplaint\",\"interval\":\"month\"},\"aggs\":{\"Total\":{\"sum\":{\"field\":\"todaysComplaintsForCategory\"}}}},\"Closed Complaints\":{\"date_histogram\":{\"field\":\"Data.dateOfComplaint\",\"interval\":\"month\"},\"aggs\":{\"Closed_Complaints\":{\"sum\":{\"field\":\"todaysClosedComplaintsForDepartment\"}}}},\"Reopened Complaints\":{\"date_histogram\":{\"field\":\"Data.dateOfComplaint\",\"interval\":\"month\"},\"aggs\":{\"Reopened\":{\"sum\":{\"field\":\"todaysReopenedComplaintsForDepartment\"}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Total Complaints\":{\"date_histogram\":{\"field\":\"Data.dateOfComplaint\",\"interval\":\"month\"},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}},\"Closed Complaints\":{\"date_histogram\":{\"field\":\"Data.dateOfComplaint\",\"interval\":\"month\"},\"aggs\":{\"Closed\":{\"filter\":{\"terms\":{\"Data.status.keyword\":[\"closed\",\"rejected\",\"resolved\"]}},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}},\"Reopened Complaints\":{\"date_histogram\":{\"field\":\"Data.dateOfComplaint\",\"interval\":\"month\"},\"aggs\":{\"Reopened\":{\"filter\":{\"terms\":{\"Data.actionHistory.actions.action.keyword\":[\"reopen\"]}},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}}}}}}" } ], "chartType": "line", From 37d115fe4f58e4bccf4c3b870de3b570c4f70c15 Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Wed, 30 Mar 2022 10:26:05 +0530 Subject: [PATCH 1033/1242] Update aggQuery in "DSS_PGR_TOTAL_COMPLAINTS" --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index f185c9d1..eec1f389 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -2308,7 +2308,7 @@ "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\", \"tenantId\" : \"Data.tenantId\"}", "dateRefField": "Data.dateOfComplaint", "indexName": "pgrindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Total Complaints\":{\"value_count\":{\"field\":\"Data.dateOfComplaint\"}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{}},\"aggs\":{\"Total Complaints\":{\"value_count\":{\"field\":\"Data.dateOfComplaint\"}}}}}}" } ], "chartType": "metric", From 89e7ce11c2d8411fed9772aa90063e98970b5e66 Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Wed, 30 Mar 2022 10:40:48 +0530 Subject: [PATCH 1034/1242] Update "DSS_TOTAL_CUMULATIVE_CLOSED_COMPLAINTS" --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index eec1f389..2b8b5850 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -2368,7 +2368,7 @@ "dateRefField": "Data.dateOfComplaint", "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\",\"tenantId\" : \"Data.tenantId\"}", "indexName": "pgrindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Total Complaints\":{\"date_histogram\":{\"field\":\"Data.dateOfComplaint\",\"interval\":\"month\"},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}},\"Closed Complaints\":{\"date_histogram\":{\"field\":\"Data.dateOfComplaint\",\"interval\":\"month\"},\"aggs\":{\"Closed\":{\"filter\":{\"terms\":{\"Data.status.keyword\":[\"closed\",\"rejected\",\"resolved\"]}},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}},\"Reopened Complaints\":{\"date_histogram\":{\"field\":\"Data.dateOfComplaint\",\"interval\":\"month\"},\"aggs\":{\"Reopened\":{\"filter\":{\"terms\":{\"Data.actionHistory.actions.action.keyword\":[\"reopen\"]}},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{}},\"aggs\":{\"Total Complaints\":{\"date_histogram\":{\"field\":\"Data.dateOfComplaint\",\"interval\":\"month\"},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}},\"Closed Complaints\":{\"date_histogram\":{\"field\":\"Data.dateOfComplaint\",\"interval\":\"month\"},\"aggs\":{\"Closed\":{\"filter\":{\"terms\":{\"Data.status.keyword\":[\"closed\",\"rejected\",\"resolved\"]}},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}},\"Reopened Complaints\":{\"date_histogram\":{\"field\":\"Data.dateOfComplaint\",\"interval\":\"month\"},\"aggs\":{\"Reopened\":{\"filter\":{\"terms\":{\"Data.actionHistory.actions.action.keyword\":[\"reopen\"]}},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}}}}}}" } ], "chartType": "line", From 57ec40a1001c39192ea9e799faac9c1be24b1ece Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Wed, 30 Mar 2022 10:59:36 +0530 Subject: [PATCH 1035/1242] Update "cumulativeClosedComlaints","totalComplaints" --- .../dashboard-analytics/ChartApiConfig.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 2b8b5850..f185c9d1 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -2308,7 +2308,7 @@ "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\", \"tenantId\" : \"Data.tenantId\"}", "dateRefField": "Data.dateOfComplaint", "indexName": "pgrindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{}},\"aggs\":{\"Total Complaints\":{\"value_count\":{\"field\":\"Data.dateOfComplaint\"}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Total Complaints\":{\"value_count\":{\"field\":\"Data.dateOfComplaint\"}}}}}}" } ], "chartType": "metric", @@ -2368,7 +2368,7 @@ "dateRefField": "Data.dateOfComplaint", "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\",\"tenantId\" : \"Data.tenantId\"}", "indexName": "pgrindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{}},\"aggs\":{\"Total Complaints\":{\"date_histogram\":{\"field\":\"Data.dateOfComplaint\",\"interval\":\"month\"},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}},\"Closed Complaints\":{\"date_histogram\":{\"field\":\"Data.dateOfComplaint\",\"interval\":\"month\"},\"aggs\":{\"Closed\":{\"filter\":{\"terms\":{\"Data.status.keyword\":[\"closed\",\"rejected\",\"resolved\"]}},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}},\"Reopened Complaints\":{\"date_histogram\":{\"field\":\"Data.dateOfComplaint\",\"interval\":\"month\"},\"aggs\":{\"Reopened\":{\"filter\":{\"terms\":{\"Data.actionHistory.actions.action.keyword\":[\"reopen\"]}},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Total Complaints\":{\"date_histogram\":{\"field\":\"Data.dateOfComplaint\",\"interval\":\"month\"},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}},\"Closed Complaints\":{\"date_histogram\":{\"field\":\"Data.dateOfComplaint\",\"interval\":\"month\"},\"aggs\":{\"Closed\":{\"filter\":{\"terms\":{\"Data.status.keyword\":[\"closed\",\"rejected\",\"resolved\"]}},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}},\"Reopened Complaints\":{\"date_histogram\":{\"field\":\"Data.dateOfComplaint\",\"interval\":\"month\"},\"aggs\":{\"Reopened\":{\"filter\":{\"terms\":{\"Data.actionHistory.actions.action.keyword\":[\"reopen\"]}},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}}}}}}" } ], "chartType": "line", From 78d00c4b19d5bccd84fec822ce01a9b387eee68c Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 30 Mar 2022 11:18:14 +0530 Subject: [PATCH 1036/1242] receiptregister to show receipts for INACTIVE properties --- configs/reports/configs/pt-reports.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index a5896fc9..3d708679 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -2279,10 +2279,12 @@ ReportDefinitions: receipt_breakup.*, to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, manualreceiptnumber as g8receiptno - FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, receipt_breakup, egcl_bill bill, + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, + (select * from (select *,(row_number() over(partition by propertyid order by lastmodifiedtime desc)) as rw from eg_pt_property where tenantid=$tenantid) pts where rw=1) as pt, + receipt_breakup, egcl_bill bill, (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid - and pt.propertyid = bill.consumercode and receipt_breakup.pdid=pd.id and pt.status!='INACTIVE' + and pt.propertyid = bill.consumercode and receipt_breakup.pdid=pd.id --and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id --and pt.propertyid='PT-1012-978737' --and receiptnumber='PT/1012/2020-21/001021' @@ -2492,10 +2494,12 @@ ReportDefinitions: receipt_breakup.*, to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, manualreceiptnumber as g8receiptno - FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment left outer join bank_branches on bank_branches.ifsc=payment.ifsccode, eg_pt_property as pt, receipt_breakup, egcl_bill bill + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment left outer join bank_branches on bank_branches.ifsc=payment.ifsccode, + (select * from (select *,(row_number() over(partition by propertyid order by lastmodifiedtime desc)) as rw from eg_pt_property where tenantid=$tenantid) pts where rw=1) as pt, + receipt_breakup, egcl_bill bill --,(select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid - and pt.propertyid = bill.consumercode and receipt_breakup.pdid=pd.id and pt.status!='INACTIVE' + and pt.propertyid = bill.consumercode and receipt_breakup.pdid=pd.id --and pt.status!='INACTIVE' --and pt_addr.propertyid=pt.id orderby: ORDER BY pd.receiptdate DESC; From ccd584154118107a3b5f1761d173acbc9e438b7b Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Fri, 1 Apr 2022 15:31:32 +0530 Subject: [PATCH 1037/1242] #Updated code for lagacy indexing --- configs/egov-indexer/rainmaker-firenoc-indexer.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/configs/egov-indexer/rainmaker-firenoc-indexer.yml b/configs/egov-indexer/rainmaker-firenoc-indexer.yml index f4bba84d..0486efe8 100644 --- a/configs/egov-indexer/rainmaker-firenoc-indexer.yml +++ b/configs/egov-indexer/rainmaker-firenoc-indexer.yml @@ -228,17 +228,17 @@ ServiceMaps: - inJsonPath: $.MdmsRes.tenant.tenants outJsonPath: $.Data.tenantData - - topic: save-firenoc-legacyIndex - configKey: INDEX + - topic: legacy-fn-firenoc + configKey: LEGACYINDEX indexes: - name: firenoc-services type: general id: $.id,$.tenantId isBulk: true jsonPath: $.FireNOCs - timeStampField: $.auditDetails.lastModifiedTime + timeStampField: $.auditDetails.createdTime customJsonMapping: - indexMapping: {"Data":{"channel":"","id":"","tenantId":"","fireNOCDetails":{"status":"","action":"","firestationId":"","applicationNumber":"","fireNOCType":"","buildings":[],"propertyDetails":{},"additionalDetail":{},"applicantDetails":{}},"auditDetails":{},"@timestamp":"timestamp","Department": "NA"}} + indexMapping: {"Data":{"channel":"","id":"","tenantId":"","fireNOCDetails":{"status":"","action":"","firestationId":"","applicationNumber":"","fireNOCType":"","buildings":[],"propertyDetails":{},"additionalDetail":{},"applicantDetails":{}},"auditDetails":{},"@timestamp":"timestamp"}} fieldMapping: - inJsonPath: $.id outJsonPath: $.Data.id @@ -284,7 +284,7 @@ ServiceMaps: - inJsonPath: $.messages[0].message outJsonPath: $.Data.Department - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search - queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.fireNOCDetails.propertyDetails.address.locality.code,tenantId=$.tenantId + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} uriResponseMapping: From f2c3dc392228ac79aeb66483c38090838aadaf27 Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Mon, 4 Apr 2022 15:25:15 +0530 Subject: [PATCH 1038/1242] Updated the index for lagacy index Updated the index for lagacy index --- configs/egov-indexer/rainmaker-firenoc-indexer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-indexer/rainmaker-firenoc-indexer.yml b/configs/egov-indexer/rainmaker-firenoc-indexer.yml index 0486efe8..64f734ac 100644 --- a/configs/egov-indexer/rainmaker-firenoc-indexer.yml +++ b/configs/egov-indexer/rainmaker-firenoc-indexer.yml @@ -231,7 +231,7 @@ ServiceMaps: - topic: legacy-fn-firenoc configKey: LEGACYINDEX indexes: - - name: firenoc-services + - name: firenoc-services-enriched type: general id: $.id,$.tenantId isBulk: true From 056f0615bbe052ca550d92e9f55cbd1cc5304261 Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Mon, 4 Apr 2022 15:55:37 +0530 Subject: [PATCH 1039/1242] revert the index name --- configs/egov-indexer/rainmaker-firenoc-indexer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-indexer/rainmaker-firenoc-indexer.yml b/configs/egov-indexer/rainmaker-firenoc-indexer.yml index 64f734ac..0486efe8 100644 --- a/configs/egov-indexer/rainmaker-firenoc-indexer.yml +++ b/configs/egov-indexer/rainmaker-firenoc-indexer.yml @@ -231,7 +231,7 @@ ServiceMaps: - topic: legacy-fn-firenoc configKey: LEGACYINDEX indexes: - - name: firenoc-services-enriched + - name: firenoc-services type: general id: $.id,$.tenantId isBulk: true From 35a9219e123c978c57b43c8de99152b4a8f47a63 Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Mon, 4 Apr 2022 15:57:28 +0530 Subject: [PATCH 1040/1242] Updated config key --- configs/egov-indexer/rainmaker-firenoc-indexer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-indexer/rainmaker-firenoc-indexer.yml b/configs/egov-indexer/rainmaker-firenoc-indexer.yml index 0486efe8..c083f6ab 100644 --- a/configs/egov-indexer/rainmaker-firenoc-indexer.yml +++ b/configs/egov-indexer/rainmaker-firenoc-indexer.yml @@ -229,7 +229,7 @@ ServiceMaps: outJsonPath: $.Data.tenantData - topic: legacy-fn-firenoc - configKey: LEGACYINDEX + configKey: INDEX indexes: - name: firenoc-services type: general From 0a7230eba8286bf5dcfed14cb02f0b7c7d9e9bd1 Mon Sep 17 00:00:00 2001 From: poonam1512 Date: Tue, 5 Apr 2022 10:23:17 +0530 Subject: [PATCH 1041/1242] adding localisation of payment information --- .../pdf-service/data-config/property-receipt.json | 14 ++++++++++++++ .../format-config/property-receipt.json | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index 79102e7a..94bdb089 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -711,9 +711,23 @@ "module":"rainmaker-common", "locale":"en_IN" } + }, + { + "variable": "PAYMENT INFORMATION", + "value" : { + "path": "PDF_STATIC_LABEL_PROPERTY_RECEIPT_PAYMENT_INFORMATION" + }, + "type":"label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common", + "locale":"en_IN" + } } ] }, + { "derived": [ { diff --git a/configs/pdf-service/format-config/property-receipt.json b/configs/pdf-service/format-config/property-receipt.json index c0bf926c..00bd295a 100644 --- a/configs/pdf-service/format-config/property-receipt.json +++ b/configs/pdf-service/format-config/property-receipt.json @@ -596,7 +596,7 @@ "layout":{} }, { - "text":"PAYMENT INFORMATION", + "text":"{{PAYMENT INFORMATION}}", "style":"block-head" }, { From 77def27df6392269ddb0f82355ca68f212bed323 Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Tue, 5 Apr 2022 14:52:56 +0530 Subject: [PATCH 1042/1242] Add "temp" in index name --- configs/egov-indexer/egov-echallan.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/egov-indexer/egov-echallan.yml b/configs/egov-indexer/egov-echallan.yml index 58502f05..408e23c9 100644 --- a/configs/egov-indexer/egov-echallan.yml +++ b/configs/egov-indexer/egov-echallan.yml @@ -5,7 +5,7 @@ ServiceMaps: - topic: save-challan configKey: INDEX indexes: - - name: echallan-services + - name: echallan-services-temp type: general id: $.id,$.tenantId jsonPath: $.Challan @@ -86,7 +86,7 @@ ServiceMaps: - topic: update-challan configKey: INDEX indexes: - - name: echallan-services + - name: echallan-services-temp type: general id: $.id,$.tenantId jsonPath: $.Challan @@ -167,7 +167,7 @@ ServiceMaps: - topic: echallan-legacyIndex configKey: LEGACYINDEX indexes: - - name: echallan-services + - name: echallan-services-temp type: general isBulk: true id: $.id,$.tenantId From f00497e008fc7eafe6f5d2a23121528934572d25 Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Wed, 6 Apr 2022 05:35:06 +0530 Subject: [PATCH 1043/1242] Updated mcollect index --- configs/egov-indexer/payment-indexer.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/egov-indexer/payment-indexer.yml b/configs/egov-indexer/payment-indexer.yml index fd9cc521..81c3e5e7 100644 --- a/configs/egov-indexer/payment-indexer.yml +++ b/configs/egov-indexer/payment-indexer.yml @@ -244,7 +244,7 @@ ServiceMaps: - topic: save-challan configKey: INDEX indexes: - - name: echallan-services + - name: echallan-services-enriched type: general id: $.id,$.tenantId jsonPath: $.Challan @@ -325,7 +325,7 @@ ServiceMaps: - topic: update-challan configKey: INDEX indexes: - - name: echallan-services + - name: echallan-services-enriched type: general id: $.id,$.tenantId jsonPath: $.Challan @@ -406,7 +406,7 @@ ServiceMaps: - topic: echallan-legacyIndex configKey: LEGACYINDEX indexes: - - name: echallan-services + - name: echallan-services-enriched type: general isBulk: true id: $.id,$.tenantId From e9c43aeb74dd44a346b1d8b344d979658857a049 Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Wed, 6 Apr 2022 05:56:34 +0530 Subject: [PATCH 1044/1242] updated legay --- configs/egov-indexer/payment-indexer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-indexer/payment-indexer.yml b/configs/egov-indexer/payment-indexer.yml index 81c3e5e7..74f1dfb4 100644 --- a/configs/egov-indexer/payment-indexer.yml +++ b/configs/egov-indexer/payment-indexer.yml @@ -406,7 +406,7 @@ ServiceMaps: - topic: echallan-legacyIndex configKey: LEGACYINDEX indexes: - - name: echallan-services-enriched + - name: echallan-services type: general isBulk: true id: $.id,$.tenantId From 7f7237200f47a639e7634625e8ca0044840ab06c Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Wed, 6 Apr 2022 10:39:23 +0530 Subject: [PATCH 1045/1242] Updated the Indexname for mcollect --- configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json b/configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json index 98f905a2..52cf4788 100644 --- a/configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json +++ b/configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json @@ -219,7 +219,7 @@ { "id": "9", "domain": "MCOLLECT", - "indexName": "echallan-services", + "indexName": "echallan-services-enriched", "documentType": "", "query": "{\"query\":{\"bool\":{\"must\":[{\"match_phrase\":{\"Data.challanNo\":\"value\"}}]}}}", "targetReferences": [ From 15c2241cabc260ac8be1d8fc056b1674985739b0 Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Wed, 6 Apr 2022 11:52:24 +0530 Subject: [PATCH 1046/1242] Added index "update-tl-workflow" --- configs/egov-indexer/rainmaker-tl-indexer.yml | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/configs/egov-indexer/rainmaker-tl-indexer.yml b/configs/egov-indexer/rainmaker-tl-indexer.yml index 8a2ff674..2bd3a4a4 100644 --- a/configs/egov-indexer/rainmaker-tl-indexer.yml +++ b/configs/egov-indexer/rainmaker-tl-indexer.yml @@ -121,3 +121,44 @@ ServiceMaps: uriResponseMapping: - inJsonPath: $.MdmsRes.tenant.tenants outJsonPath: $.Data.tenantData + + - topic: update-tl-workflow + configKey: INDEX + indexes: + - name: tlindex-v1 + type: general + id: $.id, $.tenantId + isBulk: true + timeStampField: $.auditDetails.createdTime + jsonPath: $.Licenses + customJsonMapping: + indexMapping: {"Data":{"tradelicense":{},"ward":{},"tenantData":{}, "history":{}}} + fieldMapping: + - inJsonPath: $ + outJsonPath: $.Data.tradelicense + externalUriMapping: + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=locality,codes=$.tradeLicenseDetail.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.applicationNumber,history=true,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history + mdmsMapping: + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData + From cfd36490703a43a70f712dff593affa529b3907d Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Wed, 6 Apr 2022 12:09:54 +0530 Subject: [PATCH 1047/1242] Updated indexer --- configs/egov-indexer/payment-indexer.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/egov-indexer/payment-indexer.yml b/configs/egov-indexer/payment-indexer.yml index 74f1dfb4..fd9cc521 100644 --- a/configs/egov-indexer/payment-indexer.yml +++ b/configs/egov-indexer/payment-indexer.yml @@ -244,7 +244,7 @@ ServiceMaps: - topic: save-challan configKey: INDEX indexes: - - name: echallan-services-enriched + - name: echallan-services type: general id: $.id,$.tenantId jsonPath: $.Challan @@ -325,7 +325,7 @@ ServiceMaps: - topic: update-challan configKey: INDEX indexes: - - name: echallan-services-enriched + - name: echallan-services type: general id: $.id,$.tenantId jsonPath: $.Challan From 7d69d2bc3157c3620467339cf843a9bd7e359579 Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Wed, 6 Apr 2022 15:31:32 +0530 Subject: [PATCH 1048/1242] Updated LaGacy Index --- configs/egov-indexer/payment-indexer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-indexer/payment-indexer.yml b/configs/egov-indexer/payment-indexer.yml index fd9cc521..481d9d55 100644 --- a/configs/egov-indexer/payment-indexer.yml +++ b/configs/egov-indexer/payment-indexer.yml @@ -406,7 +406,7 @@ ServiceMaps: - topic: echallan-legacyIndex configKey: LEGACYINDEX indexes: - - name: echallan-services + - name: echallan-services-enriched type: general isBulk: true id: $.id,$.tenantId From 03a2802c306f628404dc1898641b540c083f16d1 Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Wed, 6 Apr 2022 15:41:36 +0530 Subject: [PATCH 1049/1242] Updated the chalan index --- configs/egov-indexer/payment-indexer.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/egov-indexer/payment-indexer.yml b/configs/egov-indexer/payment-indexer.yml index 481d9d55..81c3e5e7 100644 --- a/configs/egov-indexer/payment-indexer.yml +++ b/configs/egov-indexer/payment-indexer.yml @@ -244,7 +244,7 @@ ServiceMaps: - topic: save-challan configKey: INDEX indexes: - - name: echallan-services + - name: echallan-services-enriched type: general id: $.id,$.tenantId jsonPath: $.Challan @@ -325,7 +325,7 @@ ServiceMaps: - topic: update-challan configKey: INDEX indexes: - - name: echallan-services + - name: echallan-services-enriched type: general id: $.id,$.tenantId jsonPath: $.Challan From f4f4dc8fe8c458f22764b791f102d338404cda57 Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Wed, 6 Apr 2022 15:52:52 +0530 Subject: [PATCH 1050/1242] Updated challan indexer --- configs/egov-indexer/egov-echallan.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/egov-indexer/egov-echallan.yml b/configs/egov-indexer/egov-echallan.yml index 408e23c9..2e8fcd5f 100644 --- a/configs/egov-indexer/egov-echallan.yml +++ b/configs/egov-indexer/egov-echallan.yml @@ -5,7 +5,7 @@ ServiceMaps: - topic: save-challan configKey: INDEX indexes: - - name: echallan-services-temp + - name: echallan-services-enriched type: general id: $.id,$.tenantId jsonPath: $.Challan @@ -86,7 +86,7 @@ ServiceMaps: - topic: update-challan configKey: INDEX indexes: - - name: echallan-services-temp + - name: echallan-services-enriched type: general id: $.id,$.tenantId jsonPath: $.Challan @@ -167,7 +167,7 @@ ServiceMaps: - topic: echallan-legacyIndex configKey: LEGACYINDEX indexes: - - name: echallan-services-temp + - name: echallan-services-enriched type: general isBulk: true id: $.id,$.tenantId From ff28f981694f9513e6270713f8790a93e7f91de7 Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Wed, 6 Apr 2022 16:51:16 +0530 Subject: [PATCH 1051/1242] Deleted echallan-service.yml --- configs/egov-indexer/egov-echallan.yml | 245 ------------------------- 1 file changed, 245 deletions(-) delete mode 100644 configs/egov-indexer/egov-echallan.yml diff --git a/configs/egov-indexer/egov-echallan.yml b/configs/egov-indexer/egov-echallan.yml deleted file mode 100644 index 2e8fcd5f..00000000 --- a/configs/egov-indexer/egov-echallan.yml +++ /dev/null @@ -1,245 +0,0 @@ -ServiceMaps: - serviceName: echallan Service - rainmaker - version: 1.0.0 - mappings: - - topic: save-challan - configKey: INDEX - indexes: - - name: echallan-services-enriched - type: general - id: $.id,$.tenantId - jsonPath: $.Challan - timeStampField: $.auditDetails.createdTime - customJsonMapping: - indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","tenantId":"","businessService":"","challanNo":"","referenceId":"","description":"","accountId":"","additionalDetail":{},"source":"","taxPeriodFrom":"","taxPeriodTo":"","amount":[],"filestoreid":"","additionalDetails":{},"applicationStatus":"","vendor":"","typeOfExpense":"","billDate":"","billIssuedDate":"","paidDate":"","isBillPaid":"","vendorName":"","totalAmount":"","@timestamp":"timestamp","history":{},"ward":{"name": "NA"}}} - fieldMapping: - - inJsonPath: $.applicationStatus.state - outJsonPath: $.Data.workflow.state - - inJsonPath: $.processInstance.action - outJsonPath: $.Data.workflow.action - - inJsonPath: $.processInstance.assignes.*.uuid - outJsonPath: $.Data.workflow.assignes - - inJsonPath: $.id - outJsonPath: $.Data.id - - inJsonPath: $.tenantId - outJsonPath: $.Data.tenantId - - inJsonPath: $.businessService - outJsonPath: $.Data.businessService - - inJsonPath: $.challanNo - outJsonPath: $.Data.challanNo - - inJsonPath: $.referenceId - outJsonPath: $.Data.referenceId - - inJsonPath: $.description - outJsonPath: $.Data.description - - inJsonPath: $.accountId - outJsonPath: $.Data.accountId - - inJsonPath: $.additionalDetail - outJsonPath: $.Data.additionalDetail - - inJsonPath: $.source - outJsonPath: $.Data.source - - inJsonPath: $.taxPeriodFrom - outJsonPath: $.Data.taxPeriodFrom - - inJsonPath: $.taxPeriodTo - outJsonPath: $.Data.taxPeriodTo - - inJsonPath: $.amount - outJsonPath: $.Data.amount - - inJsonPath: $.filestoreid - outJsonPath: $.Data.filestoreid - - inJsonPath: $.additionalDetails - outJsonPath: $.Data.additionalDetails - - inJsonPath: $.applicationStatus - outJsonPath: $.Data.applicationStatus - - inJsonPath: $.vendor - outJsonPath: $.Data.vendor - - inJsonPath: $.typeOfExpense - outJsonPath: $.Data.typeOfExpense - - inJsonPath: $.billDate - outJsonPath: $.Data.billDate - - inJsonPath: $.billIssuedDate - outJsonPath: $.Data.billIssuedDate - - inJsonPath: $.paidDate - outJsonPath: $.Data.paidDate - - inJsonPath: $.isBillPaid - outJsonPath: $.Data.isBillPaid - - inJsonPath: $.vendorName - outJsonPath: $.Data.vendorName - - inJsonPath: $.totalAmount - outJsonPath: $.Data.totalAmount - - inJsonPath: $.@timestamp - outJsonPath: $.Data.@timestamp - externalUriMapping: - - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search - queryParam: businessIds=$.acknowldgementNumber,history=true,tenantId=$.tenantId - apiRequest: {"RequestInfo":{"apiId":"org.egov.echallan","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} - uriResponseMapping: - - inJsonPath: $.ProcessInstances - outJsonPath: $.Data.history - - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search - queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId - apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", - "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} - uriResponseMapping: - - inJsonPath: $.TenantBoundary[0].boundary[0] - outJsonPath: $.Data.ward - - - - topic: update-challan - configKey: INDEX - indexes: - - name: echallan-services-enriched - type: general - id: $.id,$.tenantId - jsonPath: $.Challan - timeStampField: $.auditDetails.createdTime - customJsonMapping: - indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","tenantId":"","businessService":"","challanNo":"","referenceId":"","description":"","accountId":"","additionalDetail":{},"source":"","taxPeriodFrom":"","taxPeriodTo":"","amount":[],"filestoreid":"","additionalDetails":{},"applicationStatus":"","vendor":"","typeOfExpense":"","billDate":"","billIssuedDate":"","paidDate":"","isBillPaid":"","vendorName":"","totalAmount":"","@timestamp":"timestamp","history":{},"ward":{"name": "NA"}}} - fieldMapping: - - inJsonPath: $.applicationStatus.state - outJsonPath: $.Data.workflow.state - - inJsonPath: $.processInstance.action - outJsonPath: $.Data.workflow.action - - inJsonPath: $.processInstance.assignes.*.uuid - outJsonPath: $.Data.workflow.assignes - - inJsonPath: $.id - outJsonPath: $.Data.id - - inJsonPath: $.tenantId - outJsonPath: $.Data.tenantId - - inJsonPath: $.businessService - outJsonPath: $.Data.businessService - - inJsonPath: $.challanNo - outJsonPath: $.Data.challanNo - - inJsonPath: $.referenceId - outJsonPath: $.Data.referenceId - - inJsonPath: $.description - outJsonPath: $.Data.description - - inJsonPath: $.accountId - outJsonPath: $.Data.accountId - - inJsonPath: $.additionalDetail - outJsonPath: $.Data.additionalDetail - - inJsonPath: $.source - outJsonPath: $.Data.source - - inJsonPath: $.taxPeriodFrom - outJsonPath: $.Data.taxPeriodFrom - - inJsonPath: $.taxPeriodTo - outJsonPath: $.Data.taxPeriodTo - - inJsonPath: $.amount - outJsonPath: $.Data.amount - - inJsonPath: $.filestoreid - outJsonPath: $.Data.filestoreid - - inJsonPath: $.additionalDetails - outJsonPath: $.Data.additionalDetails - - inJsonPath: $.applicationStatus - outJsonPath: $.Data.applicationStatus - - inJsonPath: $.vendor - outJsonPath: $.Data.vendor - - inJsonPath: $.typeOfExpense - outJsonPath: $.Data.typeOfExpense - - inJsonPath: $.billDate - outJsonPath: $.Data.billDate - - inJsonPath: $.billIssuedDate - outJsonPath: $.Data.billIssuedDate - - inJsonPath: $.paidDate - outJsonPath: $.Data.paidDate - - inJsonPath: $.isBillPaid - outJsonPath: $.Data.isBillPaid - - inJsonPath: $.vendorName - outJsonPath: $.Data.vendorName - - inJsonPath: $.totalAmount - outJsonPath: $.Data.totalAmount - - inJsonPath: $.@timestamp - outJsonPath: $.Data.@timestamp - externalUriMapping: - - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search - queryParam: businessIds=$.acknowldgementNumber,history=true,tenantId=$.tenantId - apiRequest: {"RequestInfo":{"apiId":"org.egov.echallan","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} - uriResponseMapping: - - inJsonPath: $.ProcessInstances - outJsonPath: $.Data.history - - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search - queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId - apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", - "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} - uriResponseMapping: - - inJsonPath: $.TenantBoundary[0].boundary[0] - outJsonPath: $.Data.ward - - - - topic: echallan-legacyIndex - configKey: LEGACYINDEX - indexes: - - name: echallan-services-enriched - type: general - isBulk: true - id: $.id,$.tenantId - jsonPath: $.challans.* - timeStampField: $.auditDetails.createdTime - customJsonMapping: - indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","tenantId":"","businessService":"","challanNo":"","referenceId":"","description":"","accountId":"","additionalDetail":{},"source":"","taxPeriodFrom":"","taxPeriodTo":"","amount":[],"filestoreid":"","additionalDetails":{},"applicationStatus":"","vendor":"","typeOfExpense":"","billDate":"","billIssuedDate":"","paidDate":"","isBillPaid":"","vendorName":"","totalAmount":"","@timestamp":"timestamp","history":{},"ward":{"name": "NA"}}} - fieldMapping: - - inJsonPath: $.processInstance.action - outJsonPath: $.Data.workflow.action - - inJsonPath: $.processInstance.assignes.*.uuid - outJsonPath: $.Data.workflow.assignes - - inJsonPath: $.id - outJsonPath: $.Data.id - - inJsonPath: $.tenantId - outJsonPath: $.Data.tenantId - - inJsonPath: $.businessService - outJsonPath: $.Data.businessService - - inJsonPath: $.challanNo - outJsonPath: $.Data.challanNo - - inJsonPath: $.referenceId - outJsonPath: $.Data.referenceId - - inJsonPath: $.description - outJsonPath: $.Data.description - - inJsonPath: $.accountId - outJsonPath: $.Data.accountId - - inJsonPath: $.additionalDetail - outJsonPath: $.Data.additionalDetail - - inJsonPath: $.source - outJsonPath: $.Data.source - - inJsonPath: $.taxPeriodFrom - outJsonPath: $.Data.taxPeriodFrom - - inJsonPath: $.taxPeriodTo - outJsonPath: $.Data.taxPeriodTo - - inJsonPath: $.amount - outJsonPath: $.Data.amount - - inJsonPath: $.filestoreid - outJsonPath: $.Data.filestoreid - - inJsonPath: $.additionalDetails - outJsonPath: $.Data.additionalDetails - - inJsonPath: $.applicationStatus - outJsonPath: $.Data.applicationStatus - - inJsonPath: $.vendor - outJsonPath: $.Data.vendor - - inJsonPath: $.typeOfExpense - outJsonPath: $.Data.typeOfExpense - - inJsonPath: $.billDate - outJsonPath: $.Data.billDate - - inJsonPath: $.billIssuedDate - outJsonPath: $.Data.billIssuedDate - - inJsonPath: $.paidDate - outJsonPath: $.Data.paidDate - - inJsonPath: $.isBillPaid - outJsonPath: $.Data.isBillPaid - - inJsonPath: $.vendorName - outJsonPath: $.Data.vendorName - - inJsonPath: $.totalAmount - outJsonPath: $.Data.totalAmount - - inJsonPath: $.@timestamp - outJsonPath: $.Data.@timestamp - externalUriMapping: - - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search - queryParam: businessIds=$.acknowldgementNumber,history=true,tenantId=$.tenantId - apiRequest: {"RequestInfo":{"apiId":"org.egov.echallan","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} - uriResponseMapping: - - inJsonPath: $.ProcessInstances - outJsonPath: $.Data.history - - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search - queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId - apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", - "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} - uriResponseMapping: - - inJsonPath: $.TenantBoundary[0].boundary[0] - outJsonPath: $.Data.ward - From 1dc1c9f2766e47b295a509125055b6dd3ac1081f Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Wed, 6 Apr 2022 17:12:51 +0530 Subject: [PATCH 1052/1242] #Updated index name for echallan --- configs/egov-indexer/payment-indexer.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/egov-indexer/payment-indexer.yml b/configs/egov-indexer/payment-indexer.yml index 81c3e5e7..fd9cc521 100644 --- a/configs/egov-indexer/payment-indexer.yml +++ b/configs/egov-indexer/payment-indexer.yml @@ -244,7 +244,7 @@ ServiceMaps: - topic: save-challan configKey: INDEX indexes: - - name: echallan-services-enriched + - name: echallan-services type: general id: $.id,$.tenantId jsonPath: $.Challan @@ -325,7 +325,7 @@ ServiceMaps: - topic: update-challan configKey: INDEX indexes: - - name: echallan-services-enriched + - name: echallan-services type: general id: $.id,$.tenantId jsonPath: $.Challan @@ -406,7 +406,7 @@ ServiceMaps: - topic: echallan-legacyIndex configKey: LEGACYINDEX indexes: - - name: echallan-services-enriched + - name: echallan-services type: general isBulk: true id: $.id,$.tenantId From 4948bf0afea5ab3aec78b614f5405d502ad0fe44 Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Wed, 6 Apr 2022 22:25:01 +0530 Subject: [PATCH 1053/1242] #Updated the mcollect index --- configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json b/configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json index 52cf4788..98f905a2 100644 --- a/configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json +++ b/configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json @@ -219,7 +219,7 @@ { "id": "9", "domain": "MCOLLECT", - "indexName": "echallan-services-enriched", + "indexName": "echallan-services", "documentType": "", "query": "{\"query\":{\"bool\":{\"must\":[{\"match_phrase\":{\"Data.challanNo\":\"value\"}}]}}}", "targetReferences": [ From a64c4e1ee46c3fbdd88710fccd40d50bb91705fe Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 7 Apr 2022 10:41:15 +0530 Subject: [PATCH 1054/1242] UlbPgrSlaReport_v2 ulb uat v2 report --- configs/reports/configs/pgr-reports.yml | 75 ++++++++++++++++++++++++- 1 file changed, 74 insertions(+), 1 deletion(-) diff --git a/configs/reports/configs/pgr-reports.yml b/configs/reports/configs/pgr-reports.yml index b508059e..727bdeb0 100644 --- a/configs/reports/configs/pgr-reports.yml +++ b/configs/reports/configs/pgr-reports.yml @@ -2041,4 +2041,77 @@ ReportDefinitions: AND eg_pgr_service.status IN ('open','assigned','reassigrequested','rejected','closed','resolved') orderby: ORDER BY servicerequestid, epa."when" desc - +- reportName: UlbPgrSlaReport_v2 + summary: Fetches Ulb employee sla + version: 1.0.0 + moduleName: rainmaker-pgr + sourceColumns: + - name: tenantid + label: reports.rainmaker-pgr.tenantid + type: string + source: eg_pgr_service + total: false + - name: complainttype + label: reports.rainmaker-pgr.complainttype + type: string + source: eg_pgr_service + total: false + - name: total + label: reports.rainmaker-pgr.total + type: string + source: eg_pgr_service + total: true + - name: pendinginsla + label: reports.rainmaker-pgr.pendinginsla + type: string + source: eg_pgr_service + total: true + - name: pendingoutsidesla + label: reports.rainmaker-pgr.pendingoutsidesla + type: string + source: eg_pgr_service + total: true + - name: resolvedinsla + label: reports.rainmaker-pgr.resolvedinsla + type: string + source: eg_pgr_service + total: true + - name: resolvedoutsidesla + label: reports.rainmaker-pgr.resolvedoutsidesla + type: string + source: eg_pgr_service + total: true + searchParams: + - name: fromDate + label: reports.rainmaker-pgr.datefrom + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND pgr_data.createdtime >= $fromDate + - name: toDate + label: reports.rainmaker-pgr.dateto + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND pgr_data.createdtime <= $toDate + query: | + with pgr_data as (select + servicerequestid, + servicecode, + createdtime, + status, + (select max("when") from eg_pgr_action where action='resolve' and businesskey = servicerequestid) as resolvedtime, + (select min("when") from eg_pgr_action where action='open' and businesskey = servicerequestid) as opentime + from eg_pgr_service as ps) + select + initcap(split_part(tenantid, '.', 2)) as tenantid, + regexp_replace(eg_pgr_service.servicecode, '([a-z])([A-Z])', '\1 \2','g') as complainttype, + count(eg_pgr_service.status) as total, + SUM (CASE WHEN eg_pgr_service.status in ('assigned', 'reassignrequested', 'open') and (extract(epoch from now()) * 1000 - opentime) < 14 * 86400 * 1000 THEN 1 ELSE 0 END) as pendinginsla, + SUM (CASE WHEN eg_pgr_service.status in ('assigned', 'reassignrequested', 'open') and (extract(epoch from now()) * 1000 - opentime) >= 14 * 86400 * 1000 THEN 1 ELSE 0 END) as pendingoutsidesla, + SUM (CASE WHEN eg_pgr_service.status in ('closed', 'resolved') and (resolvedtime - opentime) < 14 * 86400 * 1000 THEN 1 ELSE 0 END) as resolvedinsla, + SUM (CASE WHEN eg_pgr_service.status in ('closed', 'resolved') and (resolvedtime - opentime) >= 14 * 86400 * 1000 THEN 1 ELSE 0 END) as resolvedoutsidesla + from eg_pgr_service,pgr_data + WHERE tenantid = $tenantid and eg_pgr_service.servicerequestid=pgr_data.servicerequestid + groupby: GROUP BY tenantid,eg_pgr_service.servicecode + orderby: ORDER BY tenantid,eg_pgr_service.servicecode From 12feac51a528aa7de82fe450e1a3022d4dae550d Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Thu, 7 Apr 2022 10:59:34 +0530 Subject: [PATCH 1055/1242] UlbwisePgrSlaReport_v2 --- configs/reports/configs/pgr-reports.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/reports/configs/pgr-reports.yml b/configs/reports/configs/pgr-reports.yml index 727bdeb0..f76933bb 100644 --- a/configs/reports/configs/pgr-reports.yml +++ b/configs/reports/configs/pgr-reports.yml @@ -1654,7 +1654,7 @@ ReportDefinitions: - reportName: UlbPgrSlaReport_v2 - summary: Fetches employee sla + summary: Fetches employee sla for state version: 1.0.0 moduleName: rainmaker-pgr sourceColumns: @@ -2041,7 +2041,7 @@ ReportDefinitions: AND eg_pgr_service.status IN ('open','assigned','reassigrequested','rejected','closed','resolved') orderby: ORDER BY servicerequestid, epa."when" desc -- reportName: UlbPgrSlaReport_v2 +- reportName: UlbwisePgrSlaReport_v2 summary: Fetches Ulb employee sla version: 1.0.0 moduleName: rainmaker-pgr From 6961931eed7b9b780a774d7d239779c03f07df5d Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Thu, 7 Apr 2022 12:28:11 +0530 Subject: [PATCH 1056/1242] #Updated config key for lagacy indexing --- configs/egov-indexer/rainmaker-firenoc-indexer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-indexer/rainmaker-firenoc-indexer.yml b/configs/egov-indexer/rainmaker-firenoc-indexer.yml index c083f6ab..0486efe8 100644 --- a/configs/egov-indexer/rainmaker-firenoc-indexer.yml +++ b/configs/egov-indexer/rainmaker-firenoc-indexer.yml @@ -229,7 +229,7 @@ ServiceMaps: outJsonPath: $.Data.tenantData - topic: legacy-fn-firenoc - configKey: INDEX + configKey: LEGACYINDEX indexes: - name: firenoc-services type: general From bd3c824d98926a9e8ff8c2ab5e71d1c3c5bbcbcd Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Thu, 7 Apr 2022 13:56:18 +0530 Subject: [PATCH 1057/1242] #Updated lagacy topic fire-noc From 07efdea85f376eb30d1bbe647640806b57e78b2d Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Wed, 13 Apr 2022 11:32:14 +0530 Subject: [PATCH 1058/1242] Update property-services.yml --- configs/egov-indexer/property-services.yml | 409 ++++++++++++++++----- 1 file changed, 311 insertions(+), 98 deletions(-) diff --git a/configs/egov-indexer/property-services.yml b/configs/egov-indexer/property-services.yml index 7b235801..18d175e6 100644 --- a/configs/egov-indexer/property-services.yml +++ b/configs/egov-indexer/property-services.yml @@ -11,16 +11,16 @@ ServiceMaps: jsonPath: $.Property timeStampField: $.auditDetails.lastModifiedTime customJsonMapping: - indexMapping: {"Data":{"workflow":{"state":{},"action":"","assignes":[]},"owners":[],"acknowldgementNumber":"","propertyType":"","ownershipCategory":"","creationReason":"","usageCategory":"","noOfFloors":"","landArea":"","superBuiltUpArea":"","source":"","channel":"","units":{},"auditDetails":{},"id":"","propertyId":"","surveyId":"","linkedProperties":{},"tenantId":"","accountId":"","oldPropertyId":"","status":"","@timestamp":"timestamp"}} + indexMapping: {"Data":{"ownerNames":[],"doorNo":"","street":"","owners":[],"acknowldgementNumber":"","propertyType":"","ownershipCategory":"","creationReason":"","usageCategory":"","noOfFloors":"","landArea":"","superBuiltUpArea":"","source":"","channel":"","units":{},"auditDetails":{},"id":"","propertyId":"","surveyId":"","linkedProperties":{},"tenantId":"","accountId":"","oldPropertyId":"","status":"","@timestamp":"timestamp"}} fieldMapping: + - inJsonPath: $.owners[*][?(@.status=='ACTIVE')].name + outJsonPath: $.Data.ownerNames + - inJsonPath: $.address.doorNo + outJsonPath: $.Data.doorNo + - inJsonPath: $.address.street + outJsonPath: $.Data.street - inJsonPath: $.owners.*.uuid outJsonPath: $.Data.owners - - inJsonPath: $.workflow.state - outJsonPath: $.Data.workflow.state - - inJsonPath: $.workflow.action - outJsonPath: $.Data.workflow.action - - inJsonPath: $.workflow.assignes.*.uuid - outJsonPath: $.Data.workflow.assignes - inJsonPath: $.acknowldgementNumber outJsonPath: $.Data.acknowldgementNumber - inJsonPath: $.propertyType @@ -71,6 +71,12 @@ ServiceMaps: uriResponseMapping: - inJsonPath: $.TenantBoundary[0].boundary[0] outJsonPath: $.Data.ward + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.acknowldgementNumber,history=true,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history mdmsMapping: - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search moduleName: tenant @@ -93,7 +99,64 @@ ServiceMaps: valueJsonpath: $.usageCategory uriResponseMapping: - inJsonPath: $.MdmsRes.PropertyTax.UsageCategory[0].name - outJsonPath: $.Data.usageCategory + outJsonPath: $.Data.usageCategory + + - name: property-application + type: general + id: $.propertyId,$.acknowldgementNumber,$.tenantId + jsonPath: $.Property + timeStampField: $.auditDetails.lastModifiedTime + customJsonMapping: + indexMapping: {"Data":{"acknowldgementNumber":"","creationReason":"","auditDetails":{},"propertyId":"","tenantId":"","accountId":"","status":"","@timestamp":""}} + fieldMapping: + - inJsonPath: $.acknowldgementNumber + outJsonPath: $.Data.acknowldgementNumber + - inJsonPath: $.creationReason + outJsonPath: $.Data.creationReason + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - inJsonPath: $.propertyId + outJsonPath: $.Data.propertyId + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.accountId + outJsonPath: $.Data.accountId + - inJsonPath: $.status + outJsonPath: $.Data.status + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + externalUriMapping: + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + - inJsonPath: $.TenantBoundary[0].boundary[0].children + outJsonPath: $.Data.ward.children + filter: "[?(@.code == $locality)]" + filterMapping: + - variable: $locality + valueJsonpath: $.address.locality.code + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.acknowldgementNumber,history=true,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history + mdmsMapping: + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData - topic: update-property-registry configKey: INDEX @@ -104,16 +167,16 @@ ServiceMaps: jsonPath: $.Property timeStampField: $.auditDetails.lastModifiedTime customJsonMapping: - indexMapping: {"Data":{"workflow":{"state":{},"action":"","assignes":[]},"owners":[],"acknowldgementNumber":"","propertyType":"","ownershipCategory":"","creationReason":"","usageCategory":"","noOfFloors":"","landArea":"","superBuiltUpArea":"","source":"","channel":"","units":{},"auditDetails":{},"id":"","propertyId":"","surveyId":"","linkedProperties":{},"tenantId":"","accountId":"","oldPropertyId":"","status":"","@timestamp":"timestamp"}} + indexMapping: {"Data":{"ownerNames":[],"doorNo":"","street":"","owners":[],"acknowldgementNumber":"","propertyType":"","ownershipCategory":"","creationReason":"","usageCategory":"","noOfFloors":"","landArea":"","superBuiltUpArea":"","source":"","channel":"","units":{},"auditDetails":{},"id":"","propertyId":"","surveyId":"","linkedProperties":{},"tenantId":"","accountId":"","oldPropertyId":"","status":"","@timestamp":"timestamp"}} fieldMapping: + - inJsonPath: $.owners[*][?(@.status=='ACTIVE')].name + outJsonPath: $.Data.ownerNames + - inJsonPath: $.address.doorNo + outJsonPath: $.Data.doorNo + - inJsonPath: $.address.street + outJsonPath: $.Data.street - inJsonPath: $.owners.*.uuid outJsonPath: $.Data.owners - - inJsonPath: $.workflow.state - outJsonPath: $.Data.workflow.state - - inJsonPath: $.workflow.action - outJsonPath: $.Data.workflow.action - - inJsonPath: $.workflow.assignes.*.uuid - outJsonPath: $.Data.workflow.assignes - inJsonPath: $.acknowldgementNumber outJsonPath: $.Data.acknowldgementNumber - inJsonPath: $.propertyType @@ -164,6 +227,12 @@ ServiceMaps: uriResponseMapping: - inJsonPath: $.TenantBoundary[0].boundary[0] outJsonPath: $.Data.ward + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.acknowldgementNumber,history=true,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history mdmsMapping: - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search moduleName: tenant @@ -186,7 +255,64 @@ ServiceMaps: valueJsonpath: $.usageCategory uriResponseMapping: - inJsonPath: $.MdmsRes.PropertyTax.UsageCategory[0].name - outJsonPath: $.Data.usageCategory + outJsonPath: $.Data.usageCategory + + - name: property-application + type: general + id: $.propertyId,$.acknowldgementNumber,$.tenantId + jsonPath: $.Property + timeStampField: $.auditDetails.lastModifiedTime + customJsonMapping: + indexMapping: {"Data":{"acknowldgementNumber":"","creationReason":"","auditDetails":{},"propertyId":"","tenantId":"","accountId":"","status":"","@timestamp":""}} + fieldMapping: + - inJsonPath: $.acknowldgementNumber + outJsonPath: $.Data.acknowldgementNumber + - inJsonPath: $.creationReason + outJsonPath: $.Data.creationReason + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - inJsonPath: $.propertyId + outJsonPath: $.Data.propertyId + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.accountId + outJsonPath: $.Data.accountId + - inJsonPath: $.status + outJsonPath: $.Data.status + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + externalUriMapping: + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + - inJsonPath: $.TenantBoundary[0].boundary[0].children + outJsonPath: $.Data.ward.children + filter: "[?(@.code == $locality)]" + filterMapping: + - variable: $locality + valueJsonpath: $.address.locality.code + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.acknowldgementNumber,history=true,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history + mdmsMapping: + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData - topic: cancel-property-registry configKey: INDEX @@ -197,16 +323,10 @@ ServiceMaps: jsonPath: $.Property timeStampField: $.auditDetails.lastModifiedTime customJsonMapping: - indexMapping: {"Data":{"workflow":{"state":{},"action":"","assignes":[]},"owners":[],"acknowldgementNumber":"","propertyType":"","ownershipCategory":"","creationReason":"","usageCategory":"","noOfFloors":"","landArea":"","superBuiltUpArea":"","source":"","channel":"","units":{},"auditDetails":{},"id":"","propertyId":"","surveyId":"","linkedProperties":{},"tenantId":"","accountId":"","oldPropertyId":"","status":"","@timestamp":"timestamp"}} + indexMapping: {"Data":{"owners":[],"acknowldgementNumber":"","propertyType":"","ownershipCategory":"","creationReason":"","usageCategory":"","noOfFloors":"","landArea":"","superBuiltUpArea":"","source":"","channel":"","units":{},"auditDetails":{},"id":"","propertyId":"","surveyId":"","linkedProperties":{},"tenantId":"","accountId":"","oldPropertyId":"","status":"","@timestamp":"timestamp"}} fieldMapping: - inJsonPath: $.owners.*.uuid outJsonPath: $.Data.owners - - inJsonPath: $.workflow.state - outJsonPath: $.Data.workflow.state - - inJsonPath: $.workflow.action - outJsonPath: $.Data.workflow.action - - inJsonPath: $.workflow.assignes.*.uuid - outJsonPath: $.Data.workflow.assignes - inJsonPath: $.acknowldgementNumber outJsonPath: $.Data.acknowldgementNumber - inJsonPath: $.propertyType @@ -257,6 +377,12 @@ ServiceMaps: uriResponseMapping: - inJsonPath: $.TenantBoundary[0].boundary[0] outJsonPath: $.Data.ward + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.acknowldgementNumber,history=true,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history mdmsMapping: - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search moduleName: tenant @@ -268,7 +394,7 @@ ServiceMaps: valueJsonpath: $.tenantId uriResponseMapping: - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.Data.tenantData + outJsonPath: $.Data.tenantData - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search moduleName: PropertyTax masterName: UsageCategory @@ -280,6 +406,63 @@ ServiceMaps: uriResponseMapping: - inJsonPath: $.MdmsRes.PropertyTax.UsageCategory[0].name outJsonPath: $.Data.usageCategory + + - name: property-application + type: general + id: $.propertyId,$.acknowldgementNumber,$.tenantId + jsonPath: $.Property + timeStampField: $.auditDetails.lastModifiedTime + customJsonMapping: + indexMapping: {"Data":{"acknowldgementNumber":"","creationReason":"","auditDetails":{},"propertyId":"","tenantId":"","accountId":"","status":"","@timestamp":""}} + fieldMapping: + - inJsonPath: $.acknowldgementNumber + outJsonPath: $.Data.acknowldgementNumber + - inJsonPath: $.creationReason + outJsonPath: $.Data.creationReason + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - inJsonPath: $.propertyId + outJsonPath: $.Data.propertyId + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.accountId + outJsonPath: $.Data.accountId + - inJsonPath: $.status + outJsonPath: $.Data.status + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + externalUriMapping: + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + - inJsonPath: $.TenantBoundary[0].boundary[0].children + outJsonPath: $.Data.ward.children + filter: "[?(@.code == $locality)]" + filterMapping: + - variable: $locality + valueJsonpath: $.address.locality.code + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.acknowldgementNumber,history=true,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history + mdmsMapping: + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData - topic: property-registry-legacyIndex configKey: LEGACYINDEX @@ -291,16 +474,16 @@ ServiceMaps: jsonPath: $.Properties.* timeStampField: $.auditDetails.lastModifiedTime customJsonMapping: - indexMapping: {"Data":{"workflow":{"state":{},"action":"","assignes":[]},"owners":[],"acknowldgementNumber":"","propertyType":"","ownershipCategory":"","creationReason":"","usageCategory":"","noOfFloors":"","landArea":"","superBuiltUpArea":"","source":"","channel":"","units":{},"auditDetails":{},"id":"","propertyId":"","surveyId":"","linkedProperties":{},"tenantId":"","accountId":"","oldPropertyId":"","status":"","@timestamp":"timestamp"}} + indexMapping: {"Data":{"ownerNames":[],"doorNo":"","street":"","owners":[],"acknowldgementNumber":"","propertyType":"","ownershipCategory":"","creationReason":"","usageCategory":"","noOfFloors":"","landArea":"","superBuiltUpArea":"","source":"","channel":"","units":{},"auditDetails":{},"id":"","propertyId":"","surveyId":"","linkedProperties":{},"tenantId":"","accountId":"","oldPropertyId":"","status":"","@timestamp":"timestamp"}} fieldMapping: + - inJsonPath: $.owners.*.name + outJsonPath: $.Data.ownerNames + - inJsonPath: $.address.doorNo + outJsonPath: $.Data.doorNo + - inJsonPath: $.address.street + outJsonPath: $.Data.street - inJsonPath: $.owners.*.uuid outJsonPath: $.Data.owners - - inJsonPath: $.workflow.state - outJsonPath: $.Data.workflow.state - - inJsonPath: $.workflow.action - outJsonPath: $.Data.workflow.action - - inJsonPath: $.workflow.assignes.*.uuid - outJsonPath: $.Data.workflow.assignes - inJsonPath: $.acknowldgementNumber outJsonPath: $.Data.acknowldgementNumber - inJsonPath: $.propertyType @@ -351,6 +534,12 @@ ServiceMaps: uriResponseMapping: - inJsonPath: $.TenantBoundary[0].boundary[0] outJsonPath: $.Data.ward + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.acknowldgementNumber,history=true,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history mdmsMapping: - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search moduleName: tenant @@ -362,7 +551,7 @@ ServiceMaps: valueJsonpath: $.tenantId uriResponseMapping: - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.Data.tenantData + outJsonPath: $.Data.tenantData - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search moduleName: PropertyTax masterName: UsageCategory @@ -373,8 +562,69 @@ ServiceMaps: valueJsonpath: $.usageCategory uriResponseMapping: - inJsonPath: $.MdmsRes.PropertyTax.UsageCategory[0].name - outJsonPath: $.Data.usageCategory - + outJsonPath: $.Data.usageCategory + + - topic: property-application-legacyIndex + configKey: LEGACYINDEX + indexes: + - name: property-application + type: general + isBulk: true + id: $.propertyId,$.acknowldgementNumber,$.tenantId + jsonPath: $.Properties.* + timeStampField: $.auditDetails.lastModifiedTime + customJsonMapping: + indexMapping: {"Data":{"acknowldgementNumber":"","creationReason":"","auditDetails":{},"propertyId":"","tenantId":"","accountId":"","status":"","@timestamp":""}} + fieldMapping: + - inJsonPath: $.acknowldgementNumber + outJsonPath: $.Data.acknowldgementNumber + - inJsonPath: $.creationReason + outJsonPath: $.Data.creationReason + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - inJsonPath: $.propertyId + outJsonPath: $.Data.propertyId + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.accountId + outJsonPath: $.Data.accountId + - inJsonPath: $.status + outJsonPath: $.Data.status + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + externalUriMapping: + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + - inJsonPath: $.TenantBoundary[0].boundary[0].children + outJsonPath: $.Data.ward.children + filter: "[?(@.code == $locality)]" + filterMapping: + - variable: $locality + valueJsonpath: $.address.locality.code + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.acknowldgementNumber,history=true,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history + mdmsMapping: + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData + - topic: save-pt-assessment configKey: INDEX indexes: @@ -384,14 +634,8 @@ ServiceMaps: jsonPath: $.Assessment timeStampField: $.auditDetails.createdTime customJsonMapping: - indexMapping: {"Data":{"workflow":{"state":{},"action":"","assignes":[]},"id":"","tenantId":"","additionalDetails":"","assessmentNumber":"","financialYear":"","propertyId":"","assessmentDate":"","status":"","source":"","unitUsageList":{},"channel":"","auditDetails":{},"@timestamp":"timestamp","tenantData":{},"address":{},"ward":{}}} + indexMapping: {"Data":{"id":"","tenantId":"","additionalDetails":"","assessmentNumber":"","financialYear":"","propertyId":"","assessmentDate":"","status":"","source":"","unitUsageList":{},"channel":"","auditDetails":{},"@timestamp":"timestamp"}} fieldMapping: - - inJsonPath: $.workflow.state - outJsonPath: $.Data.workflow.state - - inJsonPath: $.workflow.action - outJsonPath: $.Data.workflow.action - - inJsonPath: $.workflow.assignes.*.uuid - outJsonPath: $.Data.workflow.assignes - inJsonPath: $.id outJsonPath: $.Data.id - inJsonPath: $.tenantId @@ -418,18 +662,15 @@ ServiceMaps: outJsonPath: $.Data.additionalDetails - inJsonPath: $.@timestamp outJsonPath: $.Data.@timestamp - - inJsonPath: $.address - outJsonPath: $.Data.address externalUriMapping: - - path: http://egov-location:8080/egov-location/location/v11/boundarys/_search - queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId - apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", - "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + - path: http://property-services.egov:8080/property-services/property/_search + queryParam: propertyIds=$.propertyId,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} uriResponseMapping: - - inJsonPath: $.TenantBoundary[0].boundary[0] + - inJsonPath: $.Properties[0].address outJsonPath: $.Data.ward mdmsMapping: - - path: http://egov-mdms-service:8080/egov-mdms-service/v1/_search + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search moduleName: tenant masterName: tenants tenantId: pb @@ -440,7 +681,6 @@ ServiceMaps: uriResponseMapping: - inJsonPath: $.MdmsRes.tenant.tenants outJsonPath: $.Data.tenantData - - topic: update-pt-assessment configKey: INDEX indexes: @@ -450,14 +690,8 @@ ServiceMaps: jsonPath: $.Assessment timeStampField: $.auditDetails.createdTime customJsonMapping: - indexMapping: {"Data":{"workflow":{"state":{},"action":"","assignes":[]},"id":"","tenantId":"","additionalDetails":"","assessmentNumber":"","financialYear":"","propertyId":"","assessmentDate":"","status":"","source":"","unitUsageList":{},"channel":"","auditDetails":{},"@timestamp":"timestamp","tenantData":{},"address":{},"ward":{}}} + indexMapping: {"Data":{"id":"","tenantId":"","additionalDetails":"","assessmentNumber":"","financialYear":"","propertyId":"","assessmentDate":"","status":"","source":"","unitUsageList":{},"channel":"","auditDetails":{},"@timestamp":"timestamp"}} fieldMapping: - - inJsonPath: $.workflow.state - outJsonPath: $.Data.workflow.state - - inJsonPath: $.workflow.action - outJsonPath: $.Data.workflow.action - - inJsonPath: $.workflow.assignes.*.uuid - outJsonPath: $.Data.workflow.assignes - inJsonPath: $.id outJsonPath: $.Data.id - inJsonPath: $.tenantId @@ -484,18 +718,15 @@ ServiceMaps: outJsonPath: $.Data.additionalDetails - inJsonPath: $.@timestamp outJsonPath: $.Data.@timestamp - - inJsonPath: $.address - outJsonPath: $.Data.address externalUriMapping: - - path: http://egov-location:8080/egov-location/location/v11/boundarys/_search - queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId - apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", - "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + - path: http://property-services.egov:8080/property-services/property/_search + queryParam: propertyIds=$.propertyId,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} uriResponseMapping: - - inJsonPath: $.TenantBoundary[0].boundary[0] + - inJsonPath: $.Properties[0].address outJsonPath: $.Data.ward mdmsMapping: - - path: http://egov-mdms-service:8080/egov-mdms-service/v1/_search + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search moduleName: tenant masterName: tenants tenantId: pb @@ -505,7 +736,7 @@ ServiceMaps: valueJsonpath: $.tenantId uriResponseMapping: - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.Data.tenantData + outJsonPath: $.Data.tenantData - topic: cancel-property-assessment configKey: INDEX @@ -516,14 +747,8 @@ ServiceMaps: jsonPath: $.Assessment timeStampField: $.auditDetails.createdTime customJsonMapping: - indexMapping: {"Data":{"workflow":{"state":{},"action":"","assignes":[]},"id":"","tenantId":"","additionalDetails":"","assessmentNumber":"","financialYear":"","propertyId":"","assessmentDate":"","status":"","source":"","unitUsageList":{},"channel":"","auditDetails":{},"@timestamp":"timestamp","tenantData":{},"address":{},"ward":{}}} + indexMapping: {"Data":{"id":"","tenantId":"","additionalDetails":"","assessmentNumber":"","financialYear":"","propertyId":"","assessmentDate":"","status":"","source":"","unitUsageList":{},"channel":"","auditDetails":{},"@timestamp":"timestamp"}} fieldMapping: - - inJsonPath: $.workflow.state - outJsonPath: $.Data.workflow.state - - inJsonPath: $.workflow.action - outJsonPath: $.Data.workflow.action - - inJsonPath: $.workflow.assignes.*.uuid - outJsonPath: $.Data.workflow.assignes - inJsonPath: $.id outJsonPath: $.Data.id - inJsonPath: $.tenantId @@ -550,18 +775,15 @@ ServiceMaps: outJsonPath: $.Data.additionalDetails - inJsonPath: $.@timestamp outJsonPath: $.Data.@timestamp - - inJsonPath: $.address - outJsonPath: $.Data.address externalUriMapping: - - path: http://egov-location:8080/egov-location/location/v11/boundarys/_search - queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId - apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", - "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + - path: http://property-services.egov:8080/property-services/property/_search + queryParam: propertyIds=$.propertyId,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} uriResponseMapping: - - inJsonPath: $.TenantBoundary[0].boundary[0] + - inJsonPath: $.Properties[0].address outJsonPath: $.Data.ward mdmsMapping: - - path: http://egov-mdms-service:8080/egov-mdms-service/v1/_search + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search moduleName: tenant masterName: tenants tenantId: pb @@ -571,7 +793,7 @@ ServiceMaps: valueJsonpath: $.tenantId uriResponseMapping: - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.Data.tenantData + outJsonPath: $.Data.tenantData - topic: pt-assessment-legacyIndex configKey: LEGACYINDEX @@ -583,14 +805,8 @@ ServiceMaps: isBulk: true timeStampField: $.auditDetails.createdTime customJsonMapping: - indexMapping: {"Data":{"workflow":{"state":{},"action":"","assignes":[]},"id":"","tenantId":"","additionalDetails":"","assessmentNumber":"","financialYear":"","propertyId":"","assessmentDate":"","status":"","source":"","unitUsageList":{},"channel":"","auditDetails":{},"@timestamp":"timestamp","tenantData":{},"address":{},"ward":{}}} + indexMapping: {"Data":{"id":"","tenantId":"","additionalDetails":"","assessmentNumber":"","financialYear":"","propertyId":"","assessmentDate":"","status":"","source":"","unitUsageList":{},"channel":"","auditDetails":{},"@timestamp":"timestamp"}} fieldMapping: - - inJsonPath: $.workflow.state - outJsonPath: $.Data.workflow.state - - inJsonPath: $.workflow.action - outJsonPath: $.Data.workflow.action - - inJsonPath: $.workflow.assignes.*.uuid - outJsonPath: $.Data.workflow.assignes - inJsonPath: $.id outJsonPath: $.Data.id - inJsonPath: $.tenantId @@ -617,18 +833,15 @@ ServiceMaps: outJsonPath: $.Data.additionalDetails - inJsonPath: $.@timestamp outJsonPath: $.Data.@timestamp - - inJsonPath: $.address - outJsonPath: $.Data.address externalUriMapping: - - path: http://egov-location:8080/egov-location/location/v11/boundarys/_search - queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId - apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", - "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + - path: http://property-services.egov:8080/property-services/property/_search + queryParam: propertyIds=$.propertyId,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} uriResponseMapping: - - inJsonPath: $.TenantBoundary[0].boundary[0] + - inJsonPath: $.Properties[0].address outJsonPath: $.Data.ward mdmsMapping: - - path: http://egov-mdms-service:8080/egov-mdms-service/v1/_search + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search moduleName: tenant masterName: tenants tenantId: pb @@ -638,4 +851,4 @@ ServiceMaps: valueJsonpath: $.tenantId uriResponseMapping: - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.Data.tenantData + outJsonPath: $.Data.tenantData From d3b1d1b9aaf86b5ca3c3a7e1960a40d25b21e446 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Tue, 19 Apr 2022 15:12:48 +0530 Subject: [PATCH 1059/1242] added connection status for Wns --- configs/egov-searcher/bill-genie.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/egov-searcher/bill-genie.yml b/configs/egov-searcher/bill-genie.yml index 2f1c4a55..6dd48121 100644 --- a/configs/egov-searcher/bill-genie.yml +++ b/configs/egov-searcher/bill-genie.yml @@ -95,7 +95,7 @@ SearchDefinitions: rowMapperKey: billsearch query: baseQuery: with bill_data as ( - SELECT conn.property_id as pid,conn.oldConnectionNo as oldpid,conn.additionaldetails as conn_add,b.id AS b_id, b.mobilenumber, + SELECT conn.status as conn_status,conn.property_id as pid,conn.oldConnectionNo as oldpid,conn.additionaldetails as conn_add,b.id AS b_id, b.mobilenumber, b.tenantid AS b_tenantid, b.payername AS b_payername, b.payeraddress AS b_payeraddress, b.payeremail AS b_payeremail, b.isactive AS b_isactive, b.iscancelled AS b_iscancelled, @@ -184,7 +184,7 @@ SearchDefinitions: rowMapperKey: billsearch query: baseQuery: with bill_data as ( - SELECT conn.property_id as pid,conn.oldConnectionNo as oldpid,conn.additionaldetails as conn_add,b.id AS b_id, b.mobilenumber, + SELECT conn.status as conn_status,conn.property_id as pid,conn.oldConnectionNo as oldpid,conn.additionaldetails as conn_add,b.id AS b_id, b.mobilenumber, b.tenantid AS b_tenantid, b.payername AS b_payername, b.payeraddress AS b_payeraddress, b.payeremail AS b_payeremail, b.isactive AS b_isactive, b.iscancelled AS b_iscancelled, From 4d89300109740900f3efa50b69607c4392972b69 Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Wed, 20 Apr 2022 17:18:17 +0530 Subject: [PATCH 1060/1242] Update ward for pt-assessment --- configs/egov-indexer/property-services.yml | 32 +++++++++++++++++++--- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/configs/egov-indexer/property-services.yml b/configs/egov-indexer/property-services.yml index 18d175e6..4dd3322b 100644 --- a/configs/egov-indexer/property-services.yml +++ b/configs/egov-indexer/property-services.yml @@ -667,8 +667,14 @@ ServiceMaps: queryParam: propertyIds=$.propertyId,tenantId=$.tenantId apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} uriResponseMapping: - - inJsonPath: $.Properties[0].address + - inJsonPath: $.TenantBoundary[0].boundary[0] outJsonPath: $.Data.ward + - inJsonPath: $.TenantBoundary[0].boundary[0].children + outJsonPath: $.Data.ward.children + filter: "[?(@.code == $locality)]" + filterMapping: + - variable: $locality + valueJsonpath: $.address.locality.code mdmsMapping: - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search moduleName: tenant @@ -723,8 +729,14 @@ ServiceMaps: queryParam: propertyIds=$.propertyId,tenantId=$.tenantId apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} uriResponseMapping: - - inJsonPath: $.Properties[0].address + - inJsonPath: $.TenantBoundary[0].boundary[0] outJsonPath: $.Data.ward + - inJsonPath: $.TenantBoundary[0].boundary[0].children + outJsonPath: $.Data.ward.children + filter: "[?(@.code == $locality)]" + filterMapping: + - variable: $locality + valueJsonpath: $.address.locality.code mdmsMapping: - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search moduleName: tenant @@ -780,8 +792,14 @@ ServiceMaps: queryParam: propertyIds=$.propertyId,tenantId=$.tenantId apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} uriResponseMapping: - - inJsonPath: $.Properties[0].address + - inJsonPath: $.TenantBoundary[0].boundary[0] outJsonPath: $.Data.ward + - inJsonPath: $.TenantBoundary[0].boundary[0].children + outJsonPath: $.Data.ward.children + filter: "[?(@.code == $locality)]" + filterMapping: + - variable: $locality + valueJsonpath: $.address.locality.code mdmsMapping: - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search moduleName: tenant @@ -838,8 +856,14 @@ ServiceMaps: queryParam: propertyIds=$.propertyId,tenantId=$.tenantId apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} uriResponseMapping: - - inJsonPath: $.Properties[0].address + - inJsonPath: $.TenantBoundary[0].boundary[0] outJsonPath: $.Data.ward + - inJsonPath: $.TenantBoundary[0].boundary[0].children + outJsonPath: $.Data.ward.children + filter: "[?(@.code == $locality)]" + filterMapping: + - variable: $locality + valueJsonpath: $.address.locality.code mdmsMapping: - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search moduleName: tenant From ffcbe597e35a649102737f088377ca04820d0577 Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Wed, 20 Apr 2022 17:28:57 +0530 Subject: [PATCH 1061/1242] Update ward for pt-assessment --- configs/egov-indexer/property-services.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/configs/egov-indexer/property-services.yml b/configs/egov-indexer/property-services.yml index 4dd3322b..c05e8078 100644 --- a/configs/egov-indexer/property-services.yml +++ b/configs/egov-indexer/property-services.yml @@ -667,14 +667,14 @@ ServiceMaps: queryParam: propertyIds=$.propertyId,tenantId=$.tenantId apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} uriResponseMapping: - - inJsonPath: $.TenantBoundary[0].boundary[0] + - inJsonPath: $.Properties[0].address outJsonPath: $.Data.ward - inJsonPath: $.TenantBoundary[0].boundary[0].children outJsonPath: $.Data.ward.children filter: "[?(@.code == $locality)]" filterMapping: - variable: $locality - valueJsonpath: $.address.locality.code + valueJsonpath: $.address.locality.code mdmsMapping: - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search moduleName: tenant @@ -729,14 +729,14 @@ ServiceMaps: queryParam: propertyIds=$.propertyId,tenantId=$.tenantId apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} uriResponseMapping: - - inJsonPath: $.TenantBoundary[0].boundary[0] + - inJsonPath: $.Properties[0].address outJsonPath: $.Data.ward - inJsonPath: $.TenantBoundary[0].boundary[0].children outJsonPath: $.Data.ward.children filter: "[?(@.code == $locality)]" filterMapping: - variable: $locality - valueJsonpath: $.address.locality.code + valueJsonpath: $.address.locality.code mdmsMapping: - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search moduleName: tenant @@ -792,14 +792,14 @@ ServiceMaps: queryParam: propertyIds=$.propertyId,tenantId=$.tenantId apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} uriResponseMapping: - - inJsonPath: $.TenantBoundary[0].boundary[0] + - inJsonPath: $.Properties[0].address outJsonPath: $.Data.ward - - inJsonPath: $.TenantBoundary[0].boundary[0].children + - inJsonPath: $.TenantBoundary[0].boundary[0].children outJsonPath: $.Data.ward.children filter: "[?(@.code == $locality)]" filterMapping: - variable: $locality - valueJsonpath: $.address.locality.code + valueJsonpath: $.address.locality.code mdmsMapping: - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search moduleName: tenant @@ -856,14 +856,14 @@ ServiceMaps: queryParam: propertyIds=$.propertyId,tenantId=$.tenantId apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} uriResponseMapping: - - inJsonPath: $.TenantBoundary[0].boundary[0] + - inJsonPath: $.Properties[0].address outJsonPath: $.Data.ward - inJsonPath: $.TenantBoundary[0].boundary[0].children outJsonPath: $.Data.ward.children filter: "[?(@.code == $locality)]" filterMapping: - variable: $locality - valueJsonpath: $.address.locality.code + valueJsonpath: $.address.locality.code mdmsMapping: - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search moduleName: tenant From 418b1acdf0877003efeb21826a72b193a1a55616 Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Wed, 20 Apr 2022 17:33:32 +0530 Subject: [PATCH 1062/1242] Revert changes for property-services.yml --- configs/egov-indexer/property-services.yml | 24 ---------------------- 1 file changed, 24 deletions(-) diff --git a/configs/egov-indexer/property-services.yml b/configs/egov-indexer/property-services.yml index c05e8078..18d175e6 100644 --- a/configs/egov-indexer/property-services.yml +++ b/configs/egov-indexer/property-services.yml @@ -669,12 +669,6 @@ ServiceMaps: uriResponseMapping: - inJsonPath: $.Properties[0].address outJsonPath: $.Data.ward - - inJsonPath: $.TenantBoundary[0].boundary[0].children - outJsonPath: $.Data.ward.children - filter: "[?(@.code == $locality)]" - filterMapping: - - variable: $locality - valueJsonpath: $.address.locality.code mdmsMapping: - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search moduleName: tenant @@ -731,12 +725,6 @@ ServiceMaps: uriResponseMapping: - inJsonPath: $.Properties[0].address outJsonPath: $.Data.ward - - inJsonPath: $.TenantBoundary[0].boundary[0].children - outJsonPath: $.Data.ward.children - filter: "[?(@.code == $locality)]" - filterMapping: - - variable: $locality - valueJsonpath: $.address.locality.code mdmsMapping: - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search moduleName: tenant @@ -794,12 +782,6 @@ ServiceMaps: uriResponseMapping: - inJsonPath: $.Properties[0].address outJsonPath: $.Data.ward - - inJsonPath: $.TenantBoundary[0].boundary[0].children - outJsonPath: $.Data.ward.children - filter: "[?(@.code == $locality)]" - filterMapping: - - variable: $locality - valueJsonpath: $.address.locality.code mdmsMapping: - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search moduleName: tenant @@ -858,12 +840,6 @@ ServiceMaps: uriResponseMapping: - inJsonPath: $.Properties[0].address outJsonPath: $.Data.ward - - inJsonPath: $.TenantBoundary[0].boundary[0].children - outJsonPath: $.Data.ward.children - filter: "[?(@.code == $locality)]" - filterMapping: - - variable: $locality - valueJsonpath: $.address.locality.code mdmsMapping: - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search moduleName: tenant From f2055510f895cec4b6dec194ebecaa384bc581ac Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Wed, 20 Apr 2022 17:38:51 +0530 Subject: [PATCH 1063/1242] Added ward info for pt-assessment --- configs/egov-indexer/property-services.yml | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/configs/egov-indexer/property-services.yml b/configs/egov-indexer/property-services.yml index 18d175e6..f7d9b8ee 100644 --- a/configs/egov-indexer/property-services.yml +++ b/configs/egov-indexer/property-services.yml @@ -669,6 +669,12 @@ ServiceMaps: uriResponseMapping: - inJsonPath: $.Properties[0].address outJsonPath: $.Data.ward + - inJsonPath: $.Properties[0].address.children + outJsonPath: $.Data.ward.children + filter: "[?(@.code == $locality)]" + filterMapping: + - variable: $locality + valueJsonpath: $.address.locality.code mdmsMapping: - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search moduleName: tenant @@ -725,6 +731,12 @@ ServiceMaps: uriResponseMapping: - inJsonPath: $.Properties[0].address outJsonPath: $.Data.ward + - inJsonPath: $.Properties[0].address.children + outJsonPath: $.Data.ward.children + filter: "[?(@.code == $locality)]" + filterMapping: + - variable: $locality + valueJsonpath: $.address.locality.code mdmsMapping: - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search moduleName: tenant @@ -782,6 +794,12 @@ ServiceMaps: uriResponseMapping: - inJsonPath: $.Properties[0].address outJsonPath: $.Data.ward + - inJsonPath: $.Properties[0].address.children + outJsonPath: $.Data.ward.children + filter: "[?(@.code == $locality)]" + filterMapping: + - variable: $locality + valueJsonpath: $.address.locality.code mdmsMapping: - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search moduleName: tenant @@ -840,6 +858,12 @@ ServiceMaps: uriResponseMapping: - inJsonPath: $.Properties[0].address outJsonPath: $.Data.ward + - inJsonPath: $.Properties[0].address.children + outJsonPath: $.Data.ward.children + filter: "[?(@.code == $locality)]" + filterMapping: + - variable: $locality + valueJsonpath: $.address.locality.code mdmsMapping: - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search moduleName: tenant From 8d77797c78d0d22a497baf7c818049cf28181527 Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Wed, 20 Apr 2022 17:42:39 +0530 Subject: [PATCH 1064/1242] Revert changes for property-services.yml --- configs/egov-indexer/property-services.yml | 24 ---------------------- 1 file changed, 24 deletions(-) diff --git a/configs/egov-indexer/property-services.yml b/configs/egov-indexer/property-services.yml index f7d9b8ee..18d175e6 100644 --- a/configs/egov-indexer/property-services.yml +++ b/configs/egov-indexer/property-services.yml @@ -669,12 +669,6 @@ ServiceMaps: uriResponseMapping: - inJsonPath: $.Properties[0].address outJsonPath: $.Data.ward - - inJsonPath: $.Properties[0].address.children - outJsonPath: $.Data.ward.children - filter: "[?(@.code == $locality)]" - filterMapping: - - variable: $locality - valueJsonpath: $.address.locality.code mdmsMapping: - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search moduleName: tenant @@ -731,12 +725,6 @@ ServiceMaps: uriResponseMapping: - inJsonPath: $.Properties[0].address outJsonPath: $.Data.ward - - inJsonPath: $.Properties[0].address.children - outJsonPath: $.Data.ward.children - filter: "[?(@.code == $locality)]" - filterMapping: - - variable: $locality - valueJsonpath: $.address.locality.code mdmsMapping: - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search moduleName: tenant @@ -794,12 +782,6 @@ ServiceMaps: uriResponseMapping: - inJsonPath: $.Properties[0].address outJsonPath: $.Data.ward - - inJsonPath: $.Properties[0].address.children - outJsonPath: $.Data.ward.children - filter: "[?(@.code == $locality)]" - filterMapping: - - variable: $locality - valueJsonpath: $.address.locality.code mdmsMapping: - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search moduleName: tenant @@ -858,12 +840,6 @@ ServiceMaps: uriResponseMapping: - inJsonPath: $.Properties[0].address outJsonPath: $.Data.ward - - inJsonPath: $.Properties[0].address.children - outJsonPath: $.Data.ward.children - filter: "[?(@.code == $locality)]" - filterMapping: - - variable: $locality - valueJsonpath: $.address.locality.code mdmsMapping: - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search moduleName: tenant From 873c3d855e1311d094be7f4a961018696c25a9b7 Mon Sep 17 00:00:00 2001 From: shiva-eGov <97941850+shiva-eGov@users.noreply.github.com> Date: Thu, 21 Apr 2022 11:06:19 +0530 Subject: [PATCH 1065/1242] made changes in external mapping for Assessment --- configs/egov-indexer/property-services.yml | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/configs/egov-indexer/property-services.yml b/configs/egov-indexer/property-services.yml index 18d175e6..c5b4df8a 100644 --- a/configs/egov-indexer/property-services.yml +++ b/configs/egov-indexer/property-services.yml @@ -834,12 +834,25 @@ ServiceMaps: - inJsonPath: $.@timestamp outJsonPath: $.Data.@timestamp externalUriMapping: - - path: http://property-services.egov:8080/property-services/property/_search - queryParam: propertyIds=$.propertyId,tenantId=$.tenantId - apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} uriResponseMapping: - - inJsonPath: $.Properties[0].address + - inJsonPath: $.TenantBoundary[0].boundary[0] outJsonPath: $.Data.ward + - inJsonPath: $.TenantBoundary[0].boundary[0].children + outJsonPath: $.Data.ward.children + filter: "[?(@.code == $locality)]" + filterMapping: + - variable: $locality + valueJsonpath: $.address.locality.code + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.acknowldgementNumber,history=true,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history mdmsMapping: - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search moduleName: tenant @@ -852,3 +865,4 @@ ServiceMaps: uriResponseMapping: - inJsonPath: $.MdmsRes.tenant.tenants outJsonPath: $.Data.tenantData + From 2dbae4c82dae5c0ee3eecbeab82de4a655626e57 Mon Sep 17 00:00:00 2001 From: shiva-eGov <97941850+shiva-eGov@users.noreply.github.com> Date: Thu, 21 Apr 2022 22:55:55 +0530 Subject: [PATCH 1066/1242] made changes for pt -assessment --- configs/egov-indexer/water-service.yml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/configs/egov-indexer/water-service.yml b/configs/egov-indexer/water-service.yml index a83eb8ce..c50660a7 100644 --- a/configs/egov-indexer/water-service.yml +++ b/configs/egov-indexer/water-service.yml @@ -431,6 +431,26 @@ ServiceMaps: - inJsonPath: $.TenantBoundary[0].boundary[0] outJsonPath: $.Data.ward mdmsMapping: + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.applicationNo,history=true,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history + - path: http://property-services.egov:8080/property-services/property/_search + queryParam: propertyIds=$.propertyId,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.Properties[0].usageCategory + outJsonPath: $.Data.propertyUsageType + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.additionalDetails.locality,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + mdmsMapping: - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search moduleName: tenant masterName: tenants @@ -442,3 +462,4 @@ ServiceMaps: uriResponseMapping: - inJsonPath: $.MdmsRes.tenant.tenants outJsonPath: $.Data.tenantData + From 1dcd1349dbc94124616143653cf8827340c40326 Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Fri, 22 Apr 2022 10:36:21 +0530 Subject: [PATCH 1067/1242] Revert changes for water-service.yml --- configs/egov-indexer/water-service.yml | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/configs/egov-indexer/water-service.yml b/configs/egov-indexer/water-service.yml index c50660a7..a83eb8ce 100644 --- a/configs/egov-indexer/water-service.yml +++ b/configs/egov-indexer/water-service.yml @@ -431,26 +431,6 @@ ServiceMaps: - inJsonPath: $.TenantBoundary[0].boundary[0] outJsonPath: $.Data.ward mdmsMapping: - - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search - queryParam: businessIds=$.applicationNo,history=true,tenantId=$.tenantId - apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} - uriResponseMapping: - - inJsonPath: $.ProcessInstances - outJsonPath: $.Data.history - - path: http://property-services.egov:8080/property-services/property/_search - queryParam: propertyIds=$.propertyId,tenantId=$.tenantId - apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} - uriResponseMapping: - - inJsonPath: $.Properties[0].usageCategory - outJsonPath: $.Data.propertyUsageType - - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search - queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.additionalDetails.locality,tenantId=$.tenantId - apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", - "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} - uriResponseMapping: - - inJsonPath: $.TenantBoundary[0].boundary[0] - outJsonPath: $.Data.ward - mdmsMapping: - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search moduleName: tenant masterName: tenants @@ -462,4 +442,3 @@ ServiceMaps: uriResponseMapping: - inJsonPath: $.MdmsRes.tenant.tenants outJsonPath: $.Data.tenantData - From 3626b53c2f5b64a6b2ba791426bb9d6d25a4bd77 Mon Sep 17 00:00:00 2001 From: shiva-eGov <97941850+shiva-eGov@users.noreply.github.com> Date: Fri, 22 Apr 2022 10:45:49 +0530 Subject: [PATCH 1068/1242] made changes for pt - assessment --- configs/egov-indexer/property-services.yml | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/configs/egov-indexer/property-services.yml b/configs/egov-indexer/property-services.yml index c5b4df8a..28614b15 100644 --- a/configs/egov-indexer/property-services.yml +++ b/configs/egov-indexer/property-services.yml @@ -834,8 +834,20 @@ ServiceMaps: - inJsonPath: $.@timestamp outJsonPath: $.Data.@timestamp externalUriMapping: + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.applicationNo,history=true,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history + - path: http://property-services.egov:8080/property-services/property/_search + queryParam: propertyIds=$.propertyId,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.Properties[0].usageCategory + outJsonPath: $.Data.propertyUsageType - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search - queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.additionalDetails.locality,tenantId=$.tenantId apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} uriResponseMapping: @@ -846,13 +858,7 @@ ServiceMaps: filter: "[?(@.code == $locality)]" filterMapping: - variable: $locality - valueJsonpath: $.address.locality.code - - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search - queryParam: businessIds=$.acknowldgementNumber,history=true,tenantId=$.tenantId - apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} - uriResponseMapping: - - inJsonPath: $.ProcessInstances - outJsonPath: $.Data.history + valueJsonpath: $.address.locality.code mdmsMapping: - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search moduleName: tenant From 7d2738b6871f7620f81462430c600b596d353ee9 Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Fri, 22 Apr 2022 11:44:28 +0530 Subject: [PATCH 1069/1242] Update rainmaker-tl-indexer.yml --- configs/egov-indexer/rainmaker-tl-indexer.yml | 58 +++++++++++++++++-- 1 file changed, 52 insertions(+), 6 deletions(-) diff --git a/configs/egov-indexer/rainmaker-tl-indexer.yml b/configs/egov-indexer/rainmaker-tl-indexer.yml index 2bd3a4a4..4c95afa4 100644 --- a/configs/egov-indexer/rainmaker-tl-indexer.yml +++ b/configs/egov-indexer/rainmaker-tl-indexer.yml @@ -12,7 +12,7 @@ ServiceMaps: timeStampField: $.auditDetails.createdTime jsonPath: $.Licenses customJsonMapping: - indexMapping: {"Data":{"tradelicense":{},"ward":{},"tenantData":{}, "history":{}}} + indexMapping: {"Data":{"tradelicense":{},"ward":{},"tenantData":{}, "history":{},"tradeType":{}}} fieldMapping: - inJsonPath: $ outJsonPath: $.Data.tradelicense @@ -41,6 +41,18 @@ ServiceMaps: uriResponseMapping: - inJsonPath: $.MdmsRes.tenant.tenants outJsonPath: $.Data.tenantData + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: TradeLicense + masterName: TradeType + tenantId: pb + filter: "[?(@.code == $TradeLicense)]" + filterMapping: + - variable: $TradeLicense + valueJsonpath: $.tradeLicenseDetail.tradeUnits[0].tradeType + uriResponseMapping: + - inJsonPath: $.MdmsRes.TradeLicense.TradeType[0].name + outJsonPath: $.Data.tradeType + - topic: update-tl-tradelicense configKey: INDEX @@ -52,7 +64,7 @@ ServiceMaps: timeStampField: $.auditDetails.createdTime jsonPath: $.Licenses customJsonMapping: - indexMapping: {"Data":{"tradelicense":{},"ward":{},"tenantData":{}, "history":{}}} + indexMapping: {"Data":{"tradelicense":{},"ward":{},"tenantData":{}, "history":{},"tradeType":{}}} fieldMapping: - inJsonPath: $ outJsonPath: $.Data.tradelicense @@ -81,6 +93,19 @@ ServiceMaps: uriResponseMapping: - inJsonPath: $.MdmsRes.tenant.tenants outJsonPath: $.Data.tenantData + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: TradeLicense + masterName: TradeType + tenantId: pb + filter: "[?(@.code == $TradeLicense)]" + filterMapping: + - variable: $TradeLicense + valueJsonpath: $.tradeLicenseDetail.tradeUnits[0].tradeType + uriResponseMapping: + - inJsonPath: $.MdmsRes.TradeLicense.TradeType[0].name + outJsonPath: $.Data.tradeType + + - topic: tradelicense-legacyindex configKey: LEGACYINDEX @@ -92,7 +117,7 @@ ServiceMaps: timeStampField: $.auditDetails.createdTime jsonPath: $.Licenses customJsonMapping: - indexMapping: {"Data":{"tradelicense":{},"ward":{},"tenantData":{}, "history":{}}} + indexMapping: {"Data":{"tradelicense":{},"ward":{},"tenantData":{}, "history":{},"tradeType":{}}} fieldMapping: - inJsonPath: $ outJsonPath: $.Data.tradelicense @@ -121,7 +146,18 @@ ServiceMaps: uriResponseMapping: - inJsonPath: $.MdmsRes.tenant.tenants outJsonPath: $.Data.tenantData - + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: TradeLicense + masterName: TradeType + tenantId: pb + filter: "[?(@.code == $TradeLicense)]" + filterMapping: + - variable: $TradeLicense + valueJsonpath: $.tradeLicenseDetail.tradeUnits[0].tradeType + uriResponseMapping: + - inJsonPath: $.MdmsRes.TradeLicense.TradeType[0].name + outJsonPath: $.Data.tradeType + - topic: update-tl-workflow configKey: INDEX indexes: @@ -132,7 +168,7 @@ ServiceMaps: timeStampField: $.auditDetails.createdTime jsonPath: $.Licenses customJsonMapping: - indexMapping: {"Data":{"tradelicense":{},"ward":{},"tenantData":{}, "history":{}}} + indexMapping: {"Data":{"tradelicense":{},"ward":{},"tenantData":{}, "history":{},"tradeType":{}}} fieldMapping: - inJsonPath: $ outJsonPath: $.Data.tradelicense @@ -161,4 +197,14 @@ ServiceMaps: uriResponseMapping: - inJsonPath: $.MdmsRes.tenant.tenants outJsonPath: $.Data.tenantData - + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: TradeLicense + masterName: TradeType + tenantId: pb + filter: "[?(@.code == $TradeLicense)]" + filterMapping: + - variable: $TradeLicense + valueJsonpath: $.tradeLicenseDetail.tradeUnits[0].tradeType + uriResponseMapping: + - inJsonPath: $.MdmsRes.TradeLicense.TradeType[0].name + outJsonPath: $.Data.tradeType From 6b9b77818d3b83dbe47d6c68d164c69179939567 Mon Sep 17 00:00:00 2001 From: shiva-eGov <97941850+shiva-eGov@users.noreply.github.com> Date: Fri, 22 Apr 2022 13:15:38 +0530 Subject: [PATCH 1070/1242] modified pt-assessment --- configs/egov-indexer/property-services.yml | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/configs/egov-indexer/property-services.yml b/configs/egov-indexer/property-services.yml index 28614b15..b88785b0 100644 --- a/configs/egov-indexer/property-services.yml +++ b/configs/egov-indexer/property-services.yml @@ -834,18 +834,6 @@ ServiceMaps: - inJsonPath: $.@timestamp outJsonPath: $.Data.@timestamp externalUriMapping: - - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search - queryParam: businessIds=$.applicationNo,history=true,tenantId=$.tenantId - apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} - uriResponseMapping: - - inJsonPath: $.ProcessInstances - outJsonPath: $.Data.history - - path: http://property-services.egov:8080/property-services/property/_search - queryParam: propertyIds=$.propertyId,tenantId=$.tenantId - apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} - uriResponseMapping: - - inJsonPath: $.Properties[0].usageCategory - outJsonPath: $.Data.propertyUsageType - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.additionalDetails.locality,tenantId=$.tenantId apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", @@ -858,7 +846,13 @@ ServiceMaps: filter: "[?(@.code == $locality)]" filterMapping: - variable: $locality - valueJsonpath: $.address.locality.code + valueJsonpath: $.address.locality.code + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.applicationNo,history=true,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history mdmsMapping: - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search moduleName: tenant From 8b5ffb920299a1eaa0285d14e885d8081f115476 Mon Sep 17 00:00:00 2001 From: shiva-eGov <97941850+shiva-eGov@users.noreply.github.com> Date: Fri, 22 Apr 2022 13:49:15 +0530 Subject: [PATCH 1071/1242] removed the child of legacy pt-Assessment --- configs/egov-indexer/property-services.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/configs/egov-indexer/property-services.yml b/configs/egov-indexer/property-services.yml index b88785b0..4a544bff 100644 --- a/configs/egov-indexer/property-services.yml +++ b/configs/egov-indexer/property-services.yml @@ -841,8 +841,6 @@ ServiceMaps: uriResponseMapping: - inJsonPath: $.TenantBoundary[0].boundary[0] outJsonPath: $.Data.ward - - inJsonPath: $.TenantBoundary[0].boundary[0].children - outJsonPath: $.Data.ward.children filter: "[?(@.code == $locality)]" filterMapping: - variable: $locality From 4af2d86dda454e0ee7010016e1dee9559e50099d Mon Sep 17 00:00:00 2001 From: shiva-eGov <97941850+shiva-eGov@users.noreply.github.com> Date: Fri, 22 Apr 2022 14:40:43 +0530 Subject: [PATCH 1072/1242] modified codes=$.address.locality.code of pt-Asses --- configs/egov-indexer/property-services.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-indexer/property-services.yml b/configs/egov-indexer/property-services.yml index 4a544bff..4209b4f8 100644 --- a/configs/egov-indexer/property-services.yml +++ b/configs/egov-indexer/property-services.yml @@ -835,7 +835,7 @@ ServiceMaps: outJsonPath: $.Data.@timestamp externalUriMapping: - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search - queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.additionalDetails.locality,tenantId=$.tenantId + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=codes=$.address.locality.code,tenantId=$.tenantId apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} uriResponseMapping: From 9820f84be7aa1223658cf180e553477f887254ef Mon Sep 17 00:00:00 2001 From: shiva-eGov <97941850+shiva-eGov@users.noreply.github.com> Date: Fri, 22 Apr 2022 14:53:34 +0530 Subject: [PATCH 1073/1242] modified the codes=$.address.locality.code --- configs/egov-indexer/property-services.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-indexer/property-services.yml b/configs/egov-indexer/property-services.yml index 4209b4f8..8af7604e 100644 --- a/configs/egov-indexer/property-services.yml +++ b/configs/egov-indexer/property-services.yml @@ -835,7 +835,7 @@ ServiceMaps: outJsonPath: $.Data.@timestamp externalUriMapping: - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search - queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=codes=$.address.locality.code,tenantId=$.tenantId + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} uriResponseMapping: From f2519714b795433f02e3e70d835a18ac13d91f73 Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Fri, 22 Apr 2022 16:11:54 +0530 Subject: [PATCH 1074/1242] Revert changes for rainmaker-tl-indexer.yml --- configs/egov-indexer/rainmaker-tl-indexer.yml | 57 ++----------------- 1 file changed, 5 insertions(+), 52 deletions(-) diff --git a/configs/egov-indexer/rainmaker-tl-indexer.yml b/configs/egov-indexer/rainmaker-tl-indexer.yml index 4c95afa4..00bf726d 100644 --- a/configs/egov-indexer/rainmaker-tl-indexer.yml +++ b/configs/egov-indexer/rainmaker-tl-indexer.yml @@ -12,7 +12,7 @@ ServiceMaps: timeStampField: $.auditDetails.createdTime jsonPath: $.Licenses customJsonMapping: - indexMapping: {"Data":{"tradelicense":{},"ward":{},"tenantData":{}, "history":{},"tradeType":{}}} + indexMapping: {"Data":{"tradelicense":{},"ward":{},"tenantData":{}, "history":{}}} fieldMapping: - inJsonPath: $ outJsonPath: $.Data.tradelicense @@ -41,18 +41,6 @@ ServiceMaps: uriResponseMapping: - inJsonPath: $.MdmsRes.tenant.tenants outJsonPath: $.Data.tenantData - - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search - moduleName: TradeLicense - masterName: TradeType - tenantId: pb - filter: "[?(@.code == $TradeLicense)]" - filterMapping: - - variable: $TradeLicense - valueJsonpath: $.tradeLicenseDetail.tradeUnits[0].tradeType - uriResponseMapping: - - inJsonPath: $.MdmsRes.TradeLicense.TradeType[0].name - outJsonPath: $.Data.tradeType - - topic: update-tl-tradelicense configKey: INDEX @@ -64,7 +52,7 @@ ServiceMaps: timeStampField: $.auditDetails.createdTime jsonPath: $.Licenses customJsonMapping: - indexMapping: {"Data":{"tradelicense":{},"ward":{},"tenantData":{}, "history":{},"tradeType":{}}} + indexMapping: {"Data":{"tradelicense":{},"ward":{},"tenantData":{}, "history":{}}} fieldMapping: - inJsonPath: $ outJsonPath: $.Data.tradelicense @@ -93,19 +81,6 @@ ServiceMaps: uriResponseMapping: - inJsonPath: $.MdmsRes.tenant.tenants outJsonPath: $.Data.tenantData - - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search - moduleName: TradeLicense - masterName: TradeType - tenantId: pb - filter: "[?(@.code == $TradeLicense)]" - filterMapping: - - variable: $TradeLicense - valueJsonpath: $.tradeLicenseDetail.tradeUnits[0].tradeType - uriResponseMapping: - - inJsonPath: $.MdmsRes.TradeLicense.TradeType[0].name - outJsonPath: $.Data.tradeType - - - topic: tradelicense-legacyindex configKey: LEGACYINDEX @@ -117,7 +92,7 @@ ServiceMaps: timeStampField: $.auditDetails.createdTime jsonPath: $.Licenses customJsonMapping: - indexMapping: {"Data":{"tradelicense":{},"ward":{},"tenantData":{}, "history":{},"tradeType":{}}} + indexMapping: {"Data":{"tradelicense":{},"ward":{},"tenantData":{}, "history":{}}} fieldMapping: - inJsonPath: $ outJsonPath: $.Data.tradelicense @@ -146,18 +121,7 @@ ServiceMaps: uriResponseMapping: - inJsonPath: $.MdmsRes.tenant.tenants outJsonPath: $.Data.tenantData - - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search - moduleName: TradeLicense - masterName: TradeType - tenantId: pb - filter: "[?(@.code == $TradeLicense)]" - filterMapping: - - variable: $TradeLicense - valueJsonpath: $.tradeLicenseDetail.tradeUnits[0].tradeType - uriResponseMapping: - - inJsonPath: $.MdmsRes.TradeLicense.TradeType[0].name - outJsonPath: $.Data.tradeType - + - topic: update-tl-workflow configKey: INDEX indexes: @@ -168,7 +132,7 @@ ServiceMaps: timeStampField: $.auditDetails.createdTime jsonPath: $.Licenses customJsonMapping: - indexMapping: {"Data":{"tradelicense":{},"ward":{},"tenantData":{}, "history":{},"tradeType":{}}} + indexMapping: {"Data":{"tradelicense":{},"ward":{},"tenantData":{}, "history":{}}} fieldMapping: - inJsonPath: $ outJsonPath: $.Data.tradelicense @@ -197,14 +161,3 @@ ServiceMaps: uriResponseMapping: - inJsonPath: $.MdmsRes.tenant.tenants outJsonPath: $.Data.tenantData - - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search - moduleName: TradeLicense - masterName: TradeType - tenantId: pb - filter: "[?(@.code == $TradeLicense)]" - filterMapping: - - variable: $TradeLicense - valueJsonpath: $.tradeLicenseDetail.tradeUnits[0].tradeType - uriResponseMapping: - - inJsonPath: $.MdmsRes.TradeLicense.TradeType[0].name - outJsonPath: $.Data.tradeType From ec38745a30df28a6e421a2e85f9d9581b716dc8e Mon Sep 17 00:00:00 2001 From: shiva-eGov <97941850+shiva-eGov@users.noreply.github.com> Date: Fri, 22 Apr 2022 18:33:46 +0530 Subject: [PATCH 1075/1242] modified for pt-assessment for ward --- configs/egov-indexer/property-services.yml | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/configs/egov-indexer/property-services.yml b/configs/egov-indexer/property-services.yml index 8af7604e..f8747416 100644 --- a/configs/egov-indexer/property-services.yml +++ b/configs/egov-indexer/property-services.yml @@ -834,17 +834,12 @@ ServiceMaps: - inJsonPath: $.@timestamp outJsonPath: $.Data.@timestamp externalUriMapping: - - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search - queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId - apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", - "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + - path: http://property-services.egov:8080/property-services/property/_search + queryParam: propertyIds=$.propertyId,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} uriResponseMapping: - - inJsonPath: $.TenantBoundary[0].boundary[0] + - inJsonPath: $.Properties[0].address outJsonPath: $.Data.ward - filter: "[?(@.code == $locality)]" - filterMapping: - - variable: $locality - valueJsonpath: $.address.locality.code - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search queryParam: businessIds=$.applicationNo,history=true,tenantId=$.tenantId apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} From d5502b8d3f0598218466336afb017744e5c89834 Mon Sep 17 00:00:00 2001 From: shiva-eGov <97941850+shiva-eGov@users.noreply.github.com> Date: Fri, 22 Apr 2022 19:28:58 +0530 Subject: [PATCH 1076/1242] added user info --- configs/egov-indexer/property-services.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-indexer/property-services.yml b/configs/egov-indexer/property-services.yml index f8747416..e3d5a8ca 100644 --- a/configs/egov-indexer/property-services.yml +++ b/configs/egov-indexer/property-services.yml @@ -778,7 +778,7 @@ ServiceMaps: externalUriMapping: - path: http://property-services.egov:8080/property-services/property/_search queryParam: propertyIds=$.propertyId,tenantId=$.tenantId - apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","userInfo": {"id": 23299,"uuid": "e721639b-c095-40b3-86e2-acecb2cb6efb","userName": "9337682030","name": "Abhilash Seth","type": "EMPLOYEE","mobileNumber": "9337682030","emailId": "abhilash.seth@gmail.com","roles": [{"id": 281,"name": "Employee"}]},"roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} uriResponseMapping: - inJsonPath: $.Properties[0].address outJsonPath: $.Data.ward From 07b2354fcae434372536e609f7e1a293023e42e9 Mon Sep 17 00:00:00 2001 From: shiva-eGov <97941850+shiva-eGov@users.noreply.github.com> Date: Tue, 26 Apr 2022 16:00:10 +0530 Subject: [PATCH 1077/1242] added location for accessment --- configs/egov-indexer/property-services.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/configs/egov-indexer/property-services.yml b/configs/egov-indexer/property-services.yml index e3d5a8ca..2fd32f13 100644 --- a/configs/egov-indexer/property-services.yml +++ b/configs/egov-indexer/property-services.yml @@ -834,11 +834,12 @@ ServiceMaps: - inJsonPath: $.@timestamp outJsonPath: $.Data.@timestamp externalUriMapping: - - path: http://property-services.egov:8080/property-services/property/_search - queryParam: propertyIds=$.propertyId,tenantId=$.tenantId - apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} uriResponseMapping: - - inJsonPath: $.Properties[0].address + - inJsonPath: $.TenantBoundary[0].boundary[0] outJsonPath: $.Data.ward - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search queryParam: businessIds=$.applicationNo,history=true,tenantId=$.tenantId From 6007178bc3014e913fcd3558506d3051abcec51e Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Wed, 27 Apr 2022 12:55:01 +0530 Subject: [PATCH 1078/1242] Update index for WnS totalColleection --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index f185c9d1..c683dd11 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -2985,7 +2985,7 @@ "queries": [ { "module": "W&S", - "indexName": "receipts-consumers", + "indexName": "water-services", "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"status\":\"Cancelled\"}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"totalamount\"}}}}}}", "requestQueryMap": "{\"tenantId\" : \"cityname.keyword\", \"wardId\" : \"block.keyword\"}", "dateRefField": "receiptdate" From 47573ae874717c98d71523d1fc9fedd0b0786f2f Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Wed, 27 Apr 2022 13:05:25 +0530 Subject: [PATCH 1079/1242] Revert changes for WnS --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index c683dd11..f185c9d1 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -2985,7 +2985,7 @@ "queries": [ { "module": "W&S", - "indexName": "water-services", + "indexName": "receipts-consumers", "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"status\":\"Cancelled\"}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"totalamount\"}}}}}}", "requestQueryMap": "{\"tenantId\" : \"cityname.keyword\", \"wardId\" : \"block.keyword\"}", "dateRefField": "receiptdate" From fde8a53ac94eec0ce26db8eac9062f68dae29164 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Thu, 5 May 2022 17:11:11 +0530 Subject: [PATCH 1080/1242] Update ws-bill.json --- configs/pdf-service/format-config/ws-bill.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/configs/pdf-service/format-config/ws-bill.json b/configs/pdf-service/format-config/ws-bill.json index 304e42df..f1f4a5c0 100644 --- a/configs/pdf-service/format-config/ws-bill.json +++ b/configs/pdf-service/format-config/ws-bill.json @@ -821,6 +821,10 @@ }, "layout": {} }, + { + "text": "Authorized Signatory", + "style": "footer-bottom" + }, { "canvas": [ { From 7a9ec8d402f53ebc5bad5ba5fc3c32b06c47bbb1 Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Wed, 11 May 2022 12:25:04 +0530 Subject: [PATCH 1081/1242] Update query for "totalComplaintsbySource" --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index f185c9d1..4b2a4af1 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -2368,7 +2368,7 @@ "dateRefField": "Data.dateOfComplaint", "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\",\"tenantId\" : \"Data.tenantId\"}", "indexName": "pgrindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Total Complaints\":{\"date_histogram\":{\"field\":\"Data.dateOfComplaint\",\"interval\":\"month\"},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}},\"Closed Complaints\":{\"date_histogram\":{\"field\":\"Data.dateOfComplaint\",\"interval\":\"month\"},\"aggs\":{\"Closed\":{\"filter\":{\"terms\":{\"Data.status.keyword\":[\"closed\",\"rejected\",\"resolved\"]}},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}},\"Reopened Complaints\":{\"date_histogram\":{\"field\":\"Data.dateOfComplaint\",\"interval\":\"month\"},\"aggs\":{\"Reopened\":{\"filter\":{\"terms\":{\"Data.actionHistory.actions.action.keyword\":[\"reopen\"]}},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Total Complaints\":{\"date_histogram\":{\"field\":\"Data.dateOfComplaint\",\"interval\":\"intervalvalue\"},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}},\"Closed Complaints\":{\"date_histogram\":{\"field\":\"Data.dateOfComplaint\",\"interval\":\"intervalvalue\"},\"aggs\":{\"Closed\":{\"filter\":{\"terms\":{\"Data.status.keyword\":[\"closed\",\"rejected\",\"resolved\"]}},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}},\"Reopened Complaints\":{\"date_histogram\":{\"field\":\"Data.dateOfComplaint\",\"interval\":\"intervalvalue\"},\"aggs\":{\"Reopened\":{\"filter\":{\"terms\":{\"Data.actionHistory.actions.action.keyword\":[\"reopen\"]}},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}}}}}}" } ], "chartType": "line", From cf54a0a7804763888ade6cfc22d6a2fc2e781e86 Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Wed, 11 May 2022 14:35:02 +0530 Subject: [PATCH 1082/1242] Update query for "DSS_PGR_TOTAL_COMPLAINTS" --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 4b2a4af1..48f58b22 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -2308,7 +2308,7 @@ "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\", \"tenantId\" : \"Data.tenantId\"}", "dateRefField": "Data.dateOfComplaint", "indexName": "pgrindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Total Complaints\":{\"value_count\":{\"field\":\"Data.dateOfComplaint\"}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{}},\"aggs\":{\"Total Complaints\":{\"value_count\":{\"field\":\"Data.dateOfComplaint\"}}}}}}" } ], "chartType": "metric", From 1bebaf93b5f6d0be5961cf2470c28e5799511eaf Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Wed, 11 May 2022 15:30:34 +0530 Subject: [PATCH 1083/1242] Update query for "DSS_PGR_CLOSED_COMPLAINTS" --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 48f58b22..1e992a49 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -2338,7 +2338,7 @@ "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\", \"tenantId\" : \"Data.tenantId\"}", "dateRefField": "Data.dateOfComplaint", "indexName": "pgrindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Closed Complaints\":{\"filters\":{\"filters\":{\"closed\":{\"match\":{\"Data.status.keyword\":\"closed\"}},\"resolved\":{\"match\":{\"Data.status.keyword\":\"resolved\"}},\"rejected\":{\"match\":{\"Data.status.keyword\":\"rejected\"}}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{}},\"aggs\":{\"Closed Complaints\":{\"filters\":{\"filters\":{\"closed\":{\"match\":{\"Data.status.keyword\":\"closed\"}},\"resolved\":{\"match\":{\"Data.status.keyword\":\"resolved\"}},\"rejected\":{\"match\":{\"Data.status.keyword\":\"rejected\"}}}}}}}}}" } ], "chartType": "metric", From 71b197517fb154f98b32f4a43d3eafb2d7221cb9 Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Wed, 11 May 2022 15:36:19 +0530 Subject: [PATCH 1084/1242] Update query for "DSS_PGR_CLOSED_COMPLAINTS" --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 1e992a49..b11a32fb 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -2338,7 +2338,7 @@ "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\", \"tenantId\" : \"Data.tenantId\"}", "dateRefField": "Data.dateOfComplaint", "indexName": "pgrindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{}},\"aggs\":{\"Closed Complaints\":{\"filters\":{\"filters\":{\"closed\":{\"match\":{\"Data.status.keyword\":\"closed\"}},\"resolved\":{\"match\":{\"Data.status.keyword\":\"resolved\"}},\"rejected\":{\"match\":{\"Data.status.keyword\":\"rejected\"}}}}}}}}}" + "aggrQuery":{"size":0,"query":{"bool":{"must":[{"range":{"Data.dateOfComplaint":{"from":"1617215400000","to":"1648751399000","include_lower":true,"include_upper":true,"boost":1.0}}}],"adjust_pure_negative":true,"boost":1.0}},"aggs":{"AGGR":{"filter":{"bool":{"must_not":[{"term":{"Data.tenantId.keyword":"pb.testing"}}]}},"aggs":{"Closed Complaints":{"filters":{"filters":{"closed":{"match":{"Data.status.keyword":"closed"}},"resolved":{"match":{"Data.status.keyword":"resolved"}},"rejected":{"match":{"Data.status.keyword":"rejected"}}}}}}}}} } ], "chartType": "metric", From b72c89d09733cd659585bb025ab76bf830f1d67a Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Wed, 11 May 2022 15:51:13 +0530 Subject: [PATCH 1085/1242] Update query for "DSS_PGR_CLOSED_COMPLAINTS" --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index b11a32fb..48f58b22 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -2338,7 +2338,7 @@ "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\", \"tenantId\" : \"Data.tenantId\"}", "dateRefField": "Data.dateOfComplaint", "indexName": "pgrindex-v1", - "aggrQuery":{"size":0,"query":{"bool":{"must":[{"range":{"Data.dateOfComplaint":{"from":"1617215400000","to":"1648751399000","include_lower":true,"include_upper":true,"boost":1.0}}}],"adjust_pure_negative":true,"boost":1.0}},"aggs":{"AGGR":{"filter":{"bool":{"must_not":[{"term":{"Data.tenantId.keyword":"pb.testing"}}]}},"aggs":{"Closed Complaints":{"filters":{"filters":{"closed":{"match":{"Data.status.keyword":"closed"}},"resolved":{"match":{"Data.status.keyword":"resolved"}},"rejected":{"match":{"Data.status.keyword":"rejected"}}}}}}}}} + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Closed Complaints\":{\"filters\":{\"filters\":{\"closed\":{\"match\":{\"Data.status.keyword\":\"closed\"}},\"resolved\":{\"match\":{\"Data.status.keyword\":\"resolved\"}},\"rejected\":{\"match\":{\"Data.status.keyword\":\"rejected\"}}}}}}}}}" } ], "chartType": "metric", From c441a1755ff47d1f718e715895ef85280e63c214 Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Wed, 11 May 2022 15:56:18 +0530 Subject: [PATCH 1086/1242] Update query for "DSS_PGR_CLOSED_COMPLAINTS" --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 48f58b22..d672ae95 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -2338,7 +2338,7 @@ "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\", \"tenantId\" : \"Data.tenantId\"}", "dateRefField": "Data.dateOfComplaint", "indexName": "pgrindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Closed Complaints\":{\"filters\":{\"filters\":{\"closed\":{\"match\":{\"Data.status.keyword\":\"closed\"}},\"resolved\":{\"match\":{\"Data.status.keyword\":\"resolved\"}},\"rejected\":{\"match\":{\"Data.status.keyword\":\"rejected\"}}}}}}}}}" +"aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{}},\"aggs\":{\"Closed Complaints\":{\"filters\":{\"filters\":{\"closed\":{\"match\":{\"Data.status.keyword\":\"closed\"}},\"resolved\":{\"match\":{\"Data.status.keyword\":\"resolved\"}},\"rejected\":{\"match\":{\"Data.status.keyword\":\"rejected\"}}}}}}}}}" } ], "chartType": "metric", From 0104066e686cb2ed732aa53548f4b0b0209c39d9 Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Wed, 11 May 2022 16:00:31 +0530 Subject: [PATCH 1087/1242] Update query for "DSS_SLA_ACHIEVED" --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index d672ae95..601a9828 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -1729,7 +1729,7 @@ "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\", \r\n \"module\" : \"businessService.keyword\", \n\"tenantId\" : \"Data.tenantId\"}", "dateRefField": "Data.dateOfComplaint", "indexName": "pgrindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Total Application\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}, \"withinSLA\":{\"range\":{\"script\":{\"lang\":\"painless\",\"source\":\"doc['Data.slaHours'].value\"},\"ranges\":[{\"key\":\"Within SLA\",\"from\":0,\"to\":360}]}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{}},\"aggs\":{\"Total Application\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}, \"withinSLA\":{\"range\":{\"script\":{\"lang\":\"painless\",\"source\":\"doc['Data.slaHours'].value\"},\"ranges\":[{\"key\":\"Within SLA\",\"from\":0,\"to\":360}]}}}}}}" } ], "chartType": "metric", From 3db473f09db17c6577af3a66404cc917119affb3 Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Wed, 11 May 2022 16:07:44 +0530 Subject: [PATCH 1088/1242] Update query for "DSS_PGR_COMPLETION_RATE" --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 601a9828..be26889d 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -2277,7 +2277,7 @@ "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\", \"tenantId\" : \"Data.tenantId\"}", "dateRefField": "Data.dateOfComplaint", "indexName": "pgrindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Total Complaints\":{\"value_count\":{\"field\":\"Data.dateOfComplaint\"}},\"Closed Complaints\":{\"filters\":{\"filters\":{\"closed\":{\"match\":{\"Data.status.keyword\":\"closed\"}},\"resolved\":{\"match\":{\"Data.status.keyword\":\"resolved\"}},\"rejected\":{\"match\":{\"Data.status.keyword\":\"rejected\"}}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{}},\"aggs\":{\"Total Complaints\":{\"value_count\":{\"field\":\"Data.dateOfComplaint\"}},\"Closed Complaints\":{\"filters\":{\"filters\":{\"closed\":{\"match\":{\"Data.status.keyword\":\"closed\"}},\"resolved\":{\"match\":{\"Data.status.keyword\":\"resolved\"}},\"rejected\":{\"match\":{\"Data.status.keyword\":\"rejected\"}}}}}}}}}" } ], "chartType": "metric", From 2e3486e87bac47a3887fed74d3a03b59552b31d5 Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Wed, 11 May 2022 16:11:57 +0530 Subject: [PATCH 1089/1242] Update "DSS_TOTAL_CUMULATIVE_CLOSED_COMPLAINTS" --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index be26889d..2592e3e3 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -2368,7 +2368,7 @@ "dateRefField": "Data.dateOfComplaint", "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\",\"tenantId\" : \"Data.tenantId\"}", "indexName": "pgrindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Total Complaints\":{\"date_histogram\":{\"field\":\"Data.dateOfComplaint\",\"interval\":\"intervalvalue\"},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}},\"Closed Complaints\":{\"date_histogram\":{\"field\":\"Data.dateOfComplaint\",\"interval\":\"intervalvalue\"},\"aggs\":{\"Closed\":{\"filter\":{\"terms\":{\"Data.status.keyword\":[\"closed\",\"rejected\",\"resolved\"]}},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}},\"Reopened Complaints\":{\"date_histogram\":{\"field\":\"Data.dateOfComplaint\",\"interval\":\"intervalvalue\"},\"aggs\":{\"Reopened\":{\"filter\":{\"terms\":{\"Data.actionHistory.actions.action.keyword\":[\"reopen\"]}},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{}},\"aggs\":{\"Total Complaints\":{\"date_histogram\":{\"field\":\"Data.dateOfComplaint\",\"interval\":\"intervalvalue\"},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}},\"Closed Complaints\":{\"date_histogram\":{\"field\":\"Data.dateOfComplaint\",\"interval\":\"intervalvalue\"},\"aggs\":{\"Closed\":{\"filter\":{\"terms\":{\"Data.status.keyword\":[\"closed\",\"rejected\",\"resolved\"]}},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}},\"Reopened Complaints\":{\"date_histogram\":{\"field\":\"Data.dateOfComplaint\",\"interval\":\"intervalvalue\"},\"aggs\":{\"Reopened\":{\"filter\":{\"terms\":{\"Data.actionHistory.actions.action.keyword\":[\"reopen\"]}},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}}}}}}" } ], "chartType": "line", From 2ba9aaebb841d2f9009df934c63d64c9835b5e6f Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Tue, 17 May 2022 14:41:13 +0530 Subject: [PATCH 1090/1242] Update Query for "DSS_PGR_TOTAL_COMPLAINTS" --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 2592e3e3..5d9a6923 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -2308,7 +2308,7 @@ "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\", \"tenantId\" : \"Data.tenantId\"}", "dateRefField": "Data.dateOfComplaint", "indexName": "pgrindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{}},\"aggs\":{\"Total Complaints\":{\"value_count\":{\"field\":\"Data.dateOfComplaint\"}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Total Complaints\":{\"value_count\":{\"field\":\"Data.dateOfComplaint\"}}}}}}" } ], "chartType": "metric", From 88fd3fce8b2741739120c88f727990da460121af Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Tue, 17 May 2022 15:51:52 +0530 Subject: [PATCH 1091/1242] Update query "DSS_PGR_COMPLAINTS_BY_STATUS" --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 5d9a6923..89047b1f 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -2450,7 +2450,7 @@ "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\",\"tenantId\" : \"Data.tenantId\"}", "dateRefField": "Data.dateOfComplaint", "indexName": "pgrindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Complaints By Status\":{\"terms\":{\"field\":\"Data.status.keyword\"},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.dateOfComplaint\"}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{}},\"aggs\":{\"Complaints By Status\":{\"terms\":{\"field\":\"Data.status.keyword\"},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.dateOfComplaint\"}}}}}}}}" } ], "chartType": "pie", From 85b31bdc1a89b83f7f66a7ff279b09225a402216 Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Tue, 24 May 2022 15:08:45 +0530 Subject: [PATCH 1092/1242] Update "DSS_PGR_CLOSED_COMPLAINTS" --- .../dashboard-analytics/ChartApiConfig.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 89047b1f..8cd52158 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -2338,8 +2338,7 @@ "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\", \"tenantId\" : \"Data.tenantId\"}", "dateRefField": "Data.dateOfComplaint", "indexName": "pgrindex-v1", -"aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{}},\"aggs\":{\"Closed Complaints\":{\"filters\":{\"filters\":{\"closed\":{\"match\":{\"Data.status.keyword\":\"closed\"}},\"resolved\":{\"match\":{\"Data.status.keyword\":\"resolved\"}},\"rejected\":{\"match\":{\"Data.status.keyword\":\"rejected\"}}}}}}}}}" - } +"aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Closed Complaints\":{\"filters\":{\"filters\":{\"closed\":{\"match\":{\"Data.status.keyword\":\"closed\"}},\"resolved\":{\"match\":{\"Data.status.keyword\":\"resolved\"}},\"rejected\":{\"match\":{\"Data.status.keyword\":\"rejected\"}}}}}}}}}" } ], "chartType": "metric", "valueType": "number", From 64eb755f06af547d85c41d38c385fee46f5177d7 Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Tue, 24 May 2022 15:58:48 +0530 Subject: [PATCH 1093/1242] Revert changes for PGR --- .../dashboard-analytics/ChartApiConfig.json | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 8cd52158..f185c9d1 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -1729,7 +1729,7 @@ "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\", \r\n \"module\" : \"businessService.keyword\", \n\"tenantId\" : \"Data.tenantId\"}", "dateRefField": "Data.dateOfComplaint", "indexName": "pgrindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{}},\"aggs\":{\"Total Application\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}, \"withinSLA\":{\"range\":{\"script\":{\"lang\":\"painless\",\"source\":\"doc['Data.slaHours'].value\"},\"ranges\":[{\"key\":\"Within SLA\",\"from\":0,\"to\":360}]}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Total Application\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}, \"withinSLA\":{\"range\":{\"script\":{\"lang\":\"painless\",\"source\":\"doc['Data.slaHours'].value\"},\"ranges\":[{\"key\":\"Within SLA\",\"from\":0,\"to\":360}]}}}}}}" } ], "chartType": "metric", @@ -2277,7 +2277,7 @@ "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\", \"tenantId\" : \"Data.tenantId\"}", "dateRefField": "Data.dateOfComplaint", "indexName": "pgrindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{}},\"aggs\":{\"Total Complaints\":{\"value_count\":{\"field\":\"Data.dateOfComplaint\"}},\"Closed Complaints\":{\"filters\":{\"filters\":{\"closed\":{\"match\":{\"Data.status.keyword\":\"closed\"}},\"resolved\":{\"match\":{\"Data.status.keyword\":\"resolved\"}},\"rejected\":{\"match\":{\"Data.status.keyword\":\"rejected\"}}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Total Complaints\":{\"value_count\":{\"field\":\"Data.dateOfComplaint\"}},\"Closed Complaints\":{\"filters\":{\"filters\":{\"closed\":{\"match\":{\"Data.status.keyword\":\"closed\"}},\"resolved\":{\"match\":{\"Data.status.keyword\":\"resolved\"}},\"rejected\":{\"match\":{\"Data.status.keyword\":\"rejected\"}}}}}}}}}" } ], "chartType": "metric", @@ -2338,7 +2338,8 @@ "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\", \"tenantId\" : \"Data.tenantId\"}", "dateRefField": "Data.dateOfComplaint", "indexName": "pgrindex-v1", -"aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Closed Complaints\":{\"filters\":{\"filters\":{\"closed\":{\"match\":{\"Data.status.keyword\":\"closed\"}},\"resolved\":{\"match\":{\"Data.status.keyword\":\"resolved\"}},\"rejected\":{\"match\":{\"Data.status.keyword\":\"rejected\"}}}}}}}}}" } + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Closed Complaints\":{\"filters\":{\"filters\":{\"closed\":{\"match\":{\"Data.status.keyword\":\"closed\"}},\"resolved\":{\"match\":{\"Data.status.keyword\":\"resolved\"}},\"rejected\":{\"match\":{\"Data.status.keyword\":\"rejected\"}}}}}}}}}" + } ], "chartType": "metric", "valueType": "number", @@ -2367,7 +2368,7 @@ "dateRefField": "Data.dateOfComplaint", "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\",\"tenantId\" : \"Data.tenantId\"}", "indexName": "pgrindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{}},\"aggs\":{\"Total Complaints\":{\"date_histogram\":{\"field\":\"Data.dateOfComplaint\",\"interval\":\"intervalvalue\"},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}},\"Closed Complaints\":{\"date_histogram\":{\"field\":\"Data.dateOfComplaint\",\"interval\":\"intervalvalue\"},\"aggs\":{\"Closed\":{\"filter\":{\"terms\":{\"Data.status.keyword\":[\"closed\",\"rejected\",\"resolved\"]}},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}},\"Reopened Complaints\":{\"date_histogram\":{\"field\":\"Data.dateOfComplaint\",\"interval\":\"intervalvalue\"},\"aggs\":{\"Reopened\":{\"filter\":{\"terms\":{\"Data.actionHistory.actions.action.keyword\":[\"reopen\"]}},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Total Complaints\":{\"date_histogram\":{\"field\":\"Data.dateOfComplaint\",\"interval\":\"month\"},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}},\"Closed Complaints\":{\"date_histogram\":{\"field\":\"Data.dateOfComplaint\",\"interval\":\"month\"},\"aggs\":{\"Closed\":{\"filter\":{\"terms\":{\"Data.status.keyword\":[\"closed\",\"rejected\",\"resolved\"]}},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}},\"Reopened Complaints\":{\"date_histogram\":{\"field\":\"Data.dateOfComplaint\",\"interval\":\"month\"},\"aggs\":{\"Reopened\":{\"filter\":{\"terms\":{\"Data.actionHistory.actions.action.keyword\":[\"reopen\"]}},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}}}}}}" } ], "chartType": "line", @@ -2449,7 +2450,7 @@ "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\",\"tenantId\" : \"Data.tenantId\"}", "dateRefField": "Data.dateOfComplaint", "indexName": "pgrindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{}},\"aggs\":{\"Complaints By Status\":{\"terms\":{\"field\":\"Data.status.keyword\"},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.dateOfComplaint\"}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Complaints By Status\":{\"terms\":{\"field\":\"Data.status.keyword\"},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.dateOfComplaint\"}}}}}}}}" } ], "chartType": "pie", From 6933246b341539c2738b4d216638bcae26df48e5 Mon Sep 17 00:00:00 2001 From: shiva-eGov <97941850+shiva-eGov@users.noreply.github.com> Date: Thu, 26 May 2022 17:03:54 +0530 Subject: [PATCH 1094/1242] updated this file from Prod_v2 --- .../egov-indexer/rainmaker-pgr-indexer.yml | 23 ++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/configs/egov-indexer/rainmaker-pgr-indexer.yml b/configs/egov-indexer/rainmaker-pgr-indexer.yml index b4374979..240e73f5 100644 --- a/configs/egov-indexer/rainmaker-pgr-indexer.yml +++ b/configs/egov-indexer/rainmaker-pgr-indexer.yml @@ -217,7 +217,7 @@ ServiceMaps: fieldsToBeMasked: ["$.phone", "$.citizen.mobileNumber", "$.citizen.address", "$.citizen.aadhaarNumber", "$.citizen.pan", "$.citizen.emailId", "$.citizen.password"] timeStampField: $.auditDetails.createdTime customJsonMapping: - indexMapping: {"Data":{"serviceRequestId":"serviceRequestId","tenantId":"","complainCategory":"complainCategory","citizen":{},"phone":"phone","dateOfComplaint":null,"address":"","addressDetail":{},"status":"status","assignee":"assignee","gro":"gro","department":"department","complaintWard":{},"source":"source","description":"","slaHours":"slaHours","tenantData":{},"actionHistory":{},"@timestamp":"timestamp"}} + indexMapping: {"Data":{"serviceRequestId":"serviceRequestId","tenantId":"tenantId","complainCategory":"complainCategory","citizen":{},"phone":"phone","dateOfComplaint":null,"address":"","addressDetail":{},"status":"status","assignee":"assignee","gro":"gro","department":"department","complaintWard":{},"source":"source","description":"","slaHours":"slaHours","tenantData":{},"actionHistory":{},"@timestamp":"timestamp"}} fieldMapping: - inJsonPath: $.serviceRequestId outJsonPath: $.Data.serviceRequestId @@ -246,6 +246,27 @@ ServiceMaps: - inJsonPath: $.@timestamp outJsonPath: $.Data.@timestamp externalUriMapping: + - path: http://egov-hrms.egov:8080/egov-hrms/employees/_search + queryParam: tenantId=$.tenantId,id=$.assignee + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "750d4aa9-2436-4bc4-a8f4-3796e3bfd465","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.Employee[0].name + outJsonPath: $.Data.assignee + - path: http://egov-hrms.egov:8080/egov-hrms/employees/_search + queryParam: tenantId=$.tenantId,ids=$.assignee + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "750d4aa9-2436-4bc4-a8f4-3796e3bfd465","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.Employees[0].user.name + outJsonPath: $.Data.assignee + - path: http://egov-hrms.egov:8080/egov-hrms/employees/_search + queryParam: tenantId=$.tenantId,ids=$.gro + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "750d4aa9-2436-4bc4-a8f4-3796e3bfd465","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.Employees[0].user.name + outJsonPath: $.Data.gro - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search queryParam: hierarchyTypeCode=ADMIN,boundaryType=Block,codes=$.addressDetail.mohalla,tenantId=$.tenantId apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", From 3488fd8e3524f57ce69cd152b817235e2eaf3707 Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Mon, 30 May 2022 16:27:34 +0530 Subject: [PATCH 1095/1242] Added startdate in "topPerformingUlbs" --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index f185c9d1..f26bddad 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -154,7 +154,7 @@ { "module": "COMMON", "requestQueryMap": "{\r\n \"module\" : \"businessService.keyword\", \n\"tenantId\" : \"tenantIdForMunicipalCorporation\"}", - "dateRefField": "", + "dateRefField": "startdate", "indexName": "dss-target_v1", "aggrQuery": "{\"aggs\":{\"Target Collection\":{\"terms\":{\"field\":\"tenantIdForMunicipalCorporation.keyword\",\"size\":\"200\",\"order\":{\"Sum\":\"desc\"}},\"aggs\":{\"Sum\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}}}" }, From 1497584c7f56a4320dd23fc968170bb23db3e28c Mon Sep 17 00:00:00 2001 From: Uday Singh <95569001+uday-eGov@users.noreply.github.com> Date: Mon, 30 May 2022 16:54:04 +0530 Subject: [PATCH 1096/1242] Removed startdate from "topPerformingUlbs" --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index f26bddad..f185c9d1 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -154,7 +154,7 @@ { "module": "COMMON", "requestQueryMap": "{\r\n \"module\" : \"businessService.keyword\", \n\"tenantId\" : \"tenantIdForMunicipalCorporation\"}", - "dateRefField": "startdate", + "dateRefField": "", "indexName": "dss-target_v1", "aggrQuery": "{\"aggs\":{\"Target Collection\":{\"terms\":{\"field\":\"tenantIdForMunicipalCorporation.keyword\",\"size\":\"200\",\"order\":{\"Sum\":\"desc\"}},\"aggs\":{\"Sum\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}}}" }, From 1994c5e359bba4f31837c058fbc18df5fbc5c747 Mon Sep 17 00:00:00 2001 From: Ramesh Kumar Date: Wed, 22 Jun 2022 11:29:05 +0530 Subject: [PATCH 1097/1242] Updated in Receipts --- .../data-config/ws-onetime-receipt.json | 44 +++++++++++++++++ .../format-config/ws-onetime-receipt.json | 48 +++++++++++++++++-- 2 files changed, 88 insertions(+), 4 deletions(-) diff --git a/configs/pdf-service/data-config/ws-onetime-receipt.json b/configs/pdf-service/data-config/ws-onetime-receipt.json index 08f2e8f3..4d74d3e0 100644 --- a/configs/pdf-service/data-config/ws-onetime-receipt.json +++ b/configs/pdf-service/data-config/ws-onetime-receipt.json @@ -49,6 +49,50 @@ "module": "rainmaker-common" } }, + { + "variable": "serviceType", + "value": { + "path": "$.paymentDetails[0].guardianName" + }, + "localisation": { + "required": true, + "prefix": "MODULE", + "module": "rainmaker-common" + } + }, + { + "variable": "propertyID", + "value": { + "path": "$.paymentDetails[0].propertyID" + }, + "localisation": { + "required": true, + "prefix": "MODULE", + "module": "rainmaker-common" + } + }, + { + "variable": "landMark", + "value": { + "path": "$.paymentDetails[0].landMark" + }, + "localisation": { + "required": true, + "prefix": "MODULE", + "module": "rainmaker-common" + } + }, + { + "variable": "communicationAddress", + "value": { + "path": "$.paymentDetails[0].communicationAddress" + }, + "localisation": { + "required": true, + "prefix": "MODULE", + "module": "rainmaker-common" + } + }, { "variable": "paidAmount", "value": { diff --git a/configs/pdf-service/format-config/ws-onetime-receipt.json b/configs/pdf-service/format-config/ws-onetime-receipt.json index badad73a..fe887276 100644 --- a/configs/pdf-service/format-config/ws-onetime-receipt.json +++ b/configs/pdf-service/format-config/ws-onetime-receipt.json @@ -73,9 +73,9 @@ "table": { "widths": [ "34%", - "16%", + "18%", "36%", - "14%" + "12%" ], "body": [ [ @@ -484,9 +484,9 @@ "table": { "widths": [ "34%", - "18%", + "16%", "36%", - "12%" + "14%" ], "body": [ [ @@ -564,6 +564,46 @@ ], "style": "receipt-table-value" }, + { + "text": "{{guardianName}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{propertyID}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{landMark}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{communicationAddress}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, { "text": "{{payerName}}", "border": [ From 9113294fd2b622c2d89dba451ad8230d8a82f648 Mon Sep 17 00:00:00 2001 From: Ramesh Kumar Date: Wed, 29 Jun 2022 15:19:48 +0530 Subject: [PATCH 1098/1242] Updated Printed By PDF --- configs/pdf-service/data-config/property-receipt.json | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index 94bdb089..d036736d 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -490,16 +490,7 @@ }, { "variable": "generated_by", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_GENERATED_BY" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common", - "locale":"en_IN" - } + "value": "Printed By" }, { "variable": "commissioner/eo", From 8e2776da85088f0bcc2e232b1d44f761a8b569c4 Mon Sep 17 00:00:00 2001 From: Ramesh Kumar Date: Fri, 15 Jul 2022 11:27:26 +0530 Subject: [PATCH 1099/1242] updated change printed_by --- configs/pdf-service/data-config/property-receipt.json | 2 +- configs/pdf-service/format-config/tradelicense-receipt.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index d036736d..04a3cbd5 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -489,7 +489,7 @@ } }, { - "variable": "generated_by", + "variable": "printed_by", "value": "Printed By" }, { diff --git a/configs/pdf-service/format-config/tradelicense-receipt.json b/configs/pdf-service/format-config/tradelicense-receipt.json index 2554c088..78558186 100644 --- a/configs/pdf-service/format-config/tradelicense-receipt.json +++ b/configs/pdf-service/format-config/tradelicense-receipt.json @@ -833,7 +833,7 @@ { "text": [ { - "text": "{{generated_by}}: ", + "text": "{{printed_by}}: ", "bold": true }, { From 0c45a151a6cb0571115971d8b72522621388333a Mon Sep 17 00:00:00 2001 From: shiva-eGov <97941850+shiva-eGov@users.noreply.github.com> Date: Fri, 29 Jul 2022 15:13:32 +0530 Subject: [PATCH 1100/1242] changed to additionalDetails.locality changed to additionalDetails.locality --- configs/egov-indexer/property-services.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-indexer/property-services.yml b/configs/egov-indexer/property-services.yml index 2fd32f13..419822ef 100644 --- a/configs/egov-indexer/property-services.yml +++ b/configs/egov-indexer/property-services.yml @@ -835,7 +835,7 @@ ServiceMaps: outJsonPath: $.Data.@timestamp externalUriMapping: - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search - queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.additionalDetails.locality,tenantId=$.tenantId apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} uriResponseMapping: From e91a7fe5de9d700599bea11818ac3f1bfb02393e Mon Sep 17 00:00:00 2001 From: shiva-eGov <97941850+shiva-eGov@users.noreply.github.com> Date: Fri, 29 Jul 2022 17:43:46 +0530 Subject: [PATCH 1101/1242] changes added --- configs/egov-indexer/property-services.yml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/configs/egov-indexer/property-services.yml b/configs/egov-indexer/property-services.yml index 419822ef..2e617ca9 100644 --- a/configs/egov-indexer/property-services.yml +++ b/configs/egov-indexer/property-services.yml @@ -834,13 +834,9 @@ ServiceMaps: - inJsonPath: $.@timestamp outJsonPath: $.Data.@timestamp externalUriMapping: - - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search - queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.additionalDetails.locality,tenantId=$.tenantId - apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", - "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} - uriResponseMapping: - - inJsonPath: $.TenantBoundary[0].boundary[0] - outJsonPath: $.Data.ward + - path: http://property-services.egov:8080/property-services/property/_search + queryParam: propertyIds=$.propertyId,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pg.citya","roles":[{"name":"Empl - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search queryParam: businessIds=$.applicationNo,history=true,tenantId=$.tenantId apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} From 0e9566770aec8095d55de8dd329de524c5f83b77 Mon Sep 17 00:00:00 2001 From: shiva-eGov <97941850+shiva-eGov@users.noreply.github.com> Date: Fri, 29 Jul 2022 17:52:35 +0530 Subject: [PATCH 1102/1242] Added the Ward info --- configs/egov-indexer/property-services.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/configs/egov-indexer/property-services.yml b/configs/egov-indexer/property-services.yml index 2e617ca9..81748ee0 100644 --- a/configs/egov-indexer/property-services.yml +++ b/configs/egov-indexer/property-services.yml @@ -836,7 +836,10 @@ ServiceMaps: externalUriMapping: - path: http://property-services.egov:8080/property-services/property/_search queryParam: propertyIds=$.propertyId,tenantId=$.tenantId - apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pg.citya","roles":[{"name":"Empl + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pg.citya","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pg.citya"}]}}} + uriResponseMapping: + - inJsonPath: $.Properties[0].address + outJsonPath: $.Data.ward - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search queryParam: businessIds=$.applicationNo,history=true,tenantId=$.tenantId apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} From bddaa96d3422439fb6c606295b4fbab73bdf4e22 Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Fri, 29 Jul 2022 18:58:56 +0530 Subject: [PATCH 1103/1242] #Updated firenoc lagecy indexing --- configs/egov-indexer/rainmaker-firenoc-indexer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-indexer/rainmaker-firenoc-indexer.yml b/configs/egov-indexer/rainmaker-firenoc-indexer.yml index 0486efe8..f1e3cc44 100644 --- a/configs/egov-indexer/rainmaker-firenoc-indexer.yml +++ b/configs/egov-indexer/rainmaker-firenoc-indexer.yml @@ -284,7 +284,7 @@ ServiceMaps: - inJsonPath: $.messages[0].message outJsonPath: $.Data.Department - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search - queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.fireNOCDetails.propertyDetails.address.locality.code,tenantId=$.tenantId apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} uriResponseMapping: From 914a86885aded4564f09b562cb40dc3f80449423 Mon Sep 17 00:00:00 2001 From: shiva-eGov <97941850+shiva-eGov@users.noreply.github.com> Date: Wed, 24 Aug 2022 19:03:29 +0530 Subject: [PATCH 1104/1242] Added dept in Legacy index --- configs/egov-indexer/rainmaker-firenoc-indexer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-indexer/rainmaker-firenoc-indexer.yml b/configs/egov-indexer/rainmaker-firenoc-indexer.yml index f1e3cc44..6ce42518 100644 --- a/configs/egov-indexer/rainmaker-firenoc-indexer.yml +++ b/configs/egov-indexer/rainmaker-firenoc-indexer.yml @@ -238,7 +238,7 @@ ServiceMaps: jsonPath: $.FireNOCs timeStampField: $.auditDetails.createdTime customJsonMapping: - indexMapping: {"Data":{"channel":"","id":"","tenantId":"","fireNOCDetails":{"status":"","action":"","firestationId":"","applicationNumber":"","fireNOCType":"","buildings":[],"propertyDetails":{},"additionalDetail":{},"applicantDetails":{}},"auditDetails":{},"@timestamp":"timestamp"}} + indexMapping: {"Data":{"channel":"","id":"","tenantId":"","fireNOCDetails":{"status":"","action":"","firestationId":"","applicationNumber":"","fireNOCType":"","buildings":[],"propertyDetails":{},"additionalDetail":{},"applicantDetails":{}},"auditDetails":{},"@timestamp":"timestamp","Department": "NA"}} fieldMapping: - inJsonPath: $.id outJsonPath: $.Data.id From e3fc75b30d82959e9c18e1150ed601660621bff4 Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Thu, 25 Aug 2022 01:33:52 +0530 Subject: [PATCH 1105/1242] Updated module in lagecy indexing --- configs/egov-indexer/rainmaker-firenoc-indexer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-indexer/rainmaker-firenoc-indexer.yml b/configs/egov-indexer/rainmaker-firenoc-indexer.yml index 6ce42518..4df63bf6 100644 --- a/configs/egov-indexer/rainmaker-firenoc-indexer.yml +++ b/configs/egov-indexer/rainmaker-firenoc-indexer.yml @@ -278,7 +278,7 @@ ServiceMaps: - inJsonPath: $.ProcessInstances outJsonPath: $.Data.history - path: http://egov-localization.egov:8080/localization/messages/v1/_search - queryParam: locale=en_IN,tenantId=$.tenantId,codes=$.fireNOCDetails.firestationId + queryParam: locale=en_IN,tenantId=$.tenantId,codes=$.fireNOCDetails.firestationId,module=rainmaker-noc apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} uriResponseMapping: - inJsonPath: $.messages[0].message From 8e87975883ac675d1fa925a05d0d69ec70a68363 Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Thu, 25 Aug 2022 11:41:50 +0530 Subject: [PATCH 1106/1242] Updated yml --- configs/egov-indexer/rainmaker-firenoc-indexer.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configs/egov-indexer/rainmaker-firenoc-indexer.yml b/configs/egov-indexer/rainmaker-firenoc-indexer.yml index 4df63bf6..18233e9d 100644 --- a/configs/egov-indexer/rainmaker-firenoc-indexer.yml +++ b/configs/egov-indexer/rainmaker-firenoc-indexer.yml @@ -282,7 +282,8 @@ ServiceMaps: apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} uriResponseMapping: - inJsonPath: $.messages[0].message - outJsonPath: $.Data.Department + ${{ if not($.messages[0].message==null) }}: + outJsonPath: $.Data.Department - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.fireNOCDetails.propertyDetails.address.locality.code,tenantId=$.tenantId apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", From f308ae1f5409a5b3579f78620d877c0000c0b390 Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Thu, 25 Aug 2022 12:00:25 +0530 Subject: [PATCH 1107/1242] Updated the yml for department --- configs/egov-indexer/rainmaker-firenoc-indexer.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/configs/egov-indexer/rainmaker-firenoc-indexer.yml b/configs/egov-indexer/rainmaker-firenoc-indexer.yml index 18233e9d..4df63bf6 100644 --- a/configs/egov-indexer/rainmaker-firenoc-indexer.yml +++ b/configs/egov-indexer/rainmaker-firenoc-indexer.yml @@ -282,8 +282,7 @@ ServiceMaps: apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} uriResponseMapping: - inJsonPath: $.messages[0].message - ${{ if not($.messages[0].message==null) }}: - outJsonPath: $.Data.Department + outJsonPath: $.Data.Department - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.fireNOCDetails.propertyDetails.address.locality.code,tenantId=$.tenantId apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", From 6b5f4dea05cbdeb35ed628731457c2111a5fc035 Mon Sep 17 00:00:00 2001 From: shiva-eGov <97941850+shiva-eGov@users.noreply.github.com> Date: Thu, 25 Aug 2022 12:52:39 +0530 Subject: [PATCH 1108/1242] Added the time zone for the date histogram --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index f185c9d1..5d232674 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -2937,7 +2937,7 @@ "dateRefField": "Data.@timestamp", "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\", \"tenantId\" : \"Data.tenantId\"}", "indexName": "pgrindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Citizens\":{\"date_histogram\":{\"field\":\"Data.@timestamp\",\"interval\":\"intervalvalue\"},\"aggs\":{\"count\":{\"cardinality\":{\"field\":\"Data.citizen.uuid.keyword\"}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Citizens\":{\"date_histogram\":{\"field\":\"Data.@timestamp\",\"interval\":\"intervalvalue\",\"time_zone\":\"+05:30\"},\"aggs\":{\"count\":{\"cardinality\":{\"field\":\"Data.citizen.uuid.keyword\"}}}}}}}}" } ], "chartType": "line", From 070dfd239683f138c2e8c230747819b624dfdca2 Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Thu, 25 Aug 2022 13:24:28 +0530 Subject: [PATCH 1109/1242] Updated Department and module for Department --- configs/egov-indexer/rainmaker-firenoc-indexer.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/egov-indexer/rainmaker-firenoc-indexer.yml b/configs/egov-indexer/rainmaker-firenoc-indexer.yml index 4df63bf6..81b50012 100644 --- a/configs/egov-indexer/rainmaker-firenoc-indexer.yml +++ b/configs/egov-indexer/rainmaker-firenoc-indexer.yml @@ -52,7 +52,7 @@ ServiceMaps: - inJsonPath: $.ProcessInstances outJsonPath: $.Data.history - path: http://egov-localization.egov:8080/localization/messages/v1/_search - queryParam: locale=en_IN,tenantId=$.tenantId,codes=$.fireNOCDetails.firestationId + queryParam: locale=en_IN,tenantId=$.tenantId,codes=$.fireNOCDetails.firestationId,module=rainmaker-noc apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} uriResponseMapping: - inJsonPath: $.messages[0].message @@ -128,7 +128,7 @@ ServiceMaps: - inJsonPath: $.ProcessInstances outJsonPath: $.Data.history - path: http://egov-localization.egov:8080/localization/messages/v1/_search - queryParam: locale=en_IN,tenantId=$.tenantId,codes=$.fireNOCDetails.firestationId + queryParam: locale=en_IN,tenantId=$.tenantId,codes=$.fireNOCDetails.firestationId,module=rainmaker-noc apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} uriResponseMapping: - inJsonPath: $.messages[0].message @@ -203,7 +203,7 @@ ServiceMaps: - inJsonPath: $.ProcessInstances outJsonPath: $.Data.history - path: http://egov-localization.egov:8080/localization/messages/v1/_search - queryParam: locale=en_IN,tenantId=$.tenantId,codes=$.fireNOCDetails.firestationId + queryParam: locale=en_IN,tenantId=$.tenantId,codes=$.fireNOCDetails.firestationId,module=rainmaker-noc apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} uriResponseMapping: - inJsonPath: $.messages[0].message From 747418edf1ffce23312165d2b447d289b27c87c5 Mon Sep 17 00:00:00 2001 From: shiva-eGov <97941850+shiva-eGov@users.noreply.github.com> Date: Fri, 26 Aug 2022 12:26:00 +0530 Subject: [PATCH 1110/1242] Added auditDetails for Save --- configs/egov-indexer/rainmaker-pgr-indexer.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/egov-indexer/rainmaker-pgr-indexer.yml b/configs/egov-indexer/rainmaker-pgr-indexer.yml index 240e73f5..fc587a5f 100644 --- a/configs/egov-indexer/rainmaker-pgr-indexer.yml +++ b/configs/egov-indexer/rainmaker-pgr-indexer.yml @@ -24,6 +24,8 @@ ServiceMaps: outJsonPath: $.Data.phone - inJsonPath: $.auditDetails.createdTime outJsonPath: $.Data.dateOfComplaint + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails - inJsonPath: $.description outJsonPath: $.Data.description - inJsonPath: $.address From ad2b4d75b1550eb0aeafcaa96da01ca399e665c3 Mon Sep 17 00:00:00 2001 From: egovmis <42794267+egovmis@users.noreply.github.com> Date: Tue, 20 Sep 2022 15:58:46 +0530 Subject: [PATCH 1111/1242] removed indicators for total colection --- .../dashboard-analytics/ChartApiConfig.json | 7 ------- 1 file changed, 7 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 5d232674..96621773 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -21,13 +21,6 @@ "Total Collection" ], "insight": { - "chartResponseMap" : "totalCollection", - "action" : "differenceOfNumbers", - "upwardIndicator" : "positive", - "downwardIndicator" : "negative", - "textMessage" : "$indicator$value% than last $insightInterval", - "colorCode" : "#228B22", - "insightInterval" : "year" }, "_comment": " " }, From b4531404223f998912eee7d1cc2900042de054e5 Mon Sep 17 00:00:00 2001 From: egovmis Date: Mon, 10 Oct 2022 13:18:52 +0530 Subject: [PATCH 1112/1242] Changes for PWSSB ULB Grade --- configs/pdf-service/data-config/bill-amendment-note.json | 4 ++++ configs/pdf-service/data-config/bill-amendment.json | 4 ++++ .../data-config/sewerage-bill-amendment-note.json | 4 ++++ configs/pdf-service/data-config/sw-bill.json | 2 +- configs/pdf-service/data-config/ws-applicationsewerage.json | 4 ++++ configs/pdf-service/data-config/ws-applicationwater.json | 4 ++++ configs/pdf-service/data-config/ws-bill.json | 2 +- .../data-config/ws-consolidatedacknowlegment.json | 5 +++++ .../data-config/ws-consolidatedsewerageconnection.json | 4 ++++ configs/pdf-service/data-config/ws-estimationnotice.json | 4 ++++ configs/pdf-service/data-config/ws-onetime-receipt.json | 4 ++++ configs/pdf-service/data-config/ws-sanctionletter.json | 4 ++++ configs/pdf-service/format-config/bill-amendment-note.json | 2 +- configs/pdf-service/format-config/bill-amendment.json | 2 +- .../format-config/sewerage-bill-amendment-note.json | 2 +- .../pdf-service/format-config/ws-applicationsewerage.json | 2 +- configs/pdf-service/format-config/ws-applicationwater.json | 2 +- .../format-config/ws-consolidatedacknowlegment.json | 2 +- .../format-config/ws-consolidatedsewerageconnection.json | 2 +- configs/pdf-service/format-config/ws-onetime-receipt.json | 2 +- configs/pdf-service/format-config/ws-sanctionletter.json | 2 +- 21 files changed, 52 insertions(+), 11 deletions(-) diff --git a/configs/pdf-service/data-config/bill-amendment-note.json b/configs/pdf-service/data-config/bill-amendment-note.json index cf1f0492..bb877f4d 100644 --- a/configs/pdf-service/data-config/bill-amendment-note.json +++ b/configs/pdf-service/data-config/bill-amendment-note.json @@ -553,6 +553,10 @@ "variable":"phoneNumber", "value":"$.MdmsRes.tenant.tenants[0].contactNumber" }, + { + "variable":"mcGrade", + "value":"$.MdmsRes.tenant.tenants[0].city.pwssbGrade" + }, { "variable":"website", "value":"$.MdmsRes.tenant.tenants[0].domainUrl" diff --git a/configs/pdf-service/data-config/bill-amendment.json b/configs/pdf-service/data-config/bill-amendment.json index 154ffb86..bbaa44be 100644 --- a/configs/pdf-service/data-config/bill-amendment.json +++ b/configs/pdf-service/data-config/bill-amendment.json @@ -404,6 +404,10 @@ "variable":"phoneNumber", "value":"$.MdmsRes.tenant.tenants[0].contactNumber" }, + { + "variable":"mcGrade", + "value":"$.MdmsRes.tenant.tenants[0].city.pwssbGrade" + }, { "variable":"website", "value":"$.MdmsRes.tenant.tenants[0].domainUrl" diff --git a/configs/pdf-service/data-config/sewerage-bill-amendment-note.json b/configs/pdf-service/data-config/sewerage-bill-amendment-note.json index 7d4f6d78..6123217b 100644 --- a/configs/pdf-service/data-config/sewerage-bill-amendment-note.json +++ b/configs/pdf-service/data-config/sewerage-bill-amendment-note.json @@ -553,6 +553,10 @@ "variable":"phoneNumber", "value":"$.MdmsRes.tenant.tenants[0].contactNumber" }, + { + "variable":"mcGrade", + "value":"$.MdmsRes.tenant.tenants[0].city.pwssbGrade" + }, { "variable":"website", "value":"$.MdmsRes.tenant.tenants[0].domainUrl" diff --git a/configs/pdf-service/data-config/sw-bill.json b/configs/pdf-service/data-config/sw-bill.json index c4316789..55725ace 100644 --- a/configs/pdf-service/data-config/sw-bill.json +++ b/configs/pdf-service/data-config/sw-bill.json @@ -736,7 +736,7 @@ "value": "$.MdmsRes.tenant.tenants[0].contactNumber" }, { "variable":"mcGrade", - "value":"$.MdmsRes.tenant.tenants[0].city.ulbType" + "value":"$.MdmsRes.tenant.tenants[0].city.pwssbGrade" }, { "variable": "website", diff --git a/configs/pdf-service/data-config/ws-applicationsewerage.json b/configs/pdf-service/data-config/ws-applicationsewerage.json index 6d5b8c69..b80149f9 100644 --- a/configs/pdf-service/data-config/ws-applicationsewerage.json +++ b/configs/pdf-service/data-config/ws-applicationsewerage.json @@ -1004,6 +1004,10 @@ "value": "$.MdmsRes.tenant.tenants[0].logoId", "type": "image" }, + { + "variable":"mcGrade", + "value":"$.MdmsRes.tenant.tenants[0].city.pwssbGrade" + }, { "variable": "logo_header", "value": "$.MdmsRes.tenant.tenants[0].code", diff --git a/configs/pdf-service/data-config/ws-applicationwater.json b/configs/pdf-service/data-config/ws-applicationwater.json index c6890135..e4a22eb3 100644 --- a/configs/pdf-service/data-config/ws-applicationwater.json +++ b/configs/pdf-service/data-config/ws-applicationwater.json @@ -1083,6 +1083,10 @@ "value": "$.MdmsRes.tenant.tenants[0].logoId", "type": "image" }, + { + "variable":"mcGrade", + "value":"$.MdmsRes.tenant.tenants[0].city.pwssbGrade" + }, { "variable": "logo_header", "value": "$.MdmsRes.tenant.tenants[0].code", diff --git a/configs/pdf-service/data-config/ws-bill.json b/configs/pdf-service/data-config/ws-bill.json index 98ecad05..1b9cee60 100644 --- a/configs/pdf-service/data-config/ws-bill.json +++ b/configs/pdf-service/data-config/ws-bill.json @@ -736,7 +736,7 @@ "value": "$.MdmsRes.tenant.tenants[0].contactNumber" }, { "variable":"mcGrade", - "value":"$.MdmsRes.tenant.tenants[0].city.ulbType" + "value":"$.MdmsRes.tenant.tenants[0].city.pwssbGrade" }, { "variable": "website", diff --git a/configs/pdf-service/data-config/ws-consolidatedacknowlegment.json b/configs/pdf-service/data-config/ws-consolidatedacknowlegment.json index 9e3ea1be..0a8bdb01 100644 --- a/configs/pdf-service/data-config/ws-consolidatedacknowlegment.json +++ b/configs/pdf-service/data-config/ws-consolidatedacknowlegment.json @@ -664,6 +664,11 @@ "value":"$.MdmsRes.tenant.tenants[0].logoId", "type": "image" }, + { + "variable":"mcGrade", + "value":"$.MdmsRes.tenant.tenants[0].city.pwssbGrade" + }, + { "variable": "logo_header", "value":"$.MdmsRes.tenant.tenants[0].code", diff --git a/configs/pdf-service/data-config/ws-consolidatedsewerageconnection.json b/configs/pdf-service/data-config/ws-consolidatedsewerageconnection.json index 53b42b6e..6e030551 100644 --- a/configs/pdf-service/data-config/ws-consolidatedsewerageconnection.json +++ b/configs/pdf-service/data-config/ws-consolidatedsewerageconnection.json @@ -551,6 +551,10 @@ "value":"$.MdmsRes.tenant.tenants[0].logoId", "type": "image" }, + { + "variable":"mcGrade", + "value":"$.MdmsRes.tenant.tenants[0].city.pwssbGrade" + }, { "variable": "logo_header", "value":"$.MdmsRes.tenant.tenants[0].code", diff --git a/configs/pdf-service/data-config/ws-estimationnotice.json b/configs/pdf-service/data-config/ws-estimationnotice.json index 9d7a0742..5900f99c 100644 --- a/configs/pdf-service/data-config/ws-estimationnotice.json +++ b/configs/pdf-service/data-config/ws-estimationnotice.json @@ -508,6 +508,10 @@ "value": "$.MdmsRes.tenant.tenants[0].logoId", "type": "image" }, + { + "variable":"mcGrade", + "value":"$.MdmsRes.tenant.tenants[0].city.pwssbGrade" + }, { "variable": "logo_header", "value": "$.MdmsRes.tenant.tenants[0].code", diff --git a/configs/pdf-service/data-config/ws-onetime-receipt.json b/configs/pdf-service/data-config/ws-onetime-receipt.json index 4d74d3e0..3fbff9ce 100644 --- a/configs/pdf-service/data-config/ws-onetime-receipt.json +++ b/configs/pdf-service/data-config/ws-onetime-receipt.json @@ -558,6 +558,10 @@ "variable": "address", "value": "$.MdmsRes.tenant.tenants[0].address" }, + { + "variable":"mcGrade", + "value":"$.MdmsRes.tenant.tenants[0].city.pwssbGrade" + }, { "variable": "phoneNumber", "value": "$.MdmsRes.tenant.tenants[0].contactNumber" diff --git a/configs/pdf-service/data-config/ws-sanctionletter.json b/configs/pdf-service/data-config/ws-sanctionletter.json index fc0637c8..13193703 100644 --- a/configs/pdf-service/data-config/ws-sanctionletter.json +++ b/configs/pdf-service/data-config/ws-sanctionletter.json @@ -949,6 +949,10 @@ "value": "$.MdmsRes.tenant.tenants[0].logoId", "type": "image" }, + { + "variable":"mcGrade", + "value":"$.MdmsRes.tenant.tenants[0].city.pwssbGrade" + }, { "variable": "logo_header", "value": "$.MdmsRes.tenant.tenants[0].code", diff --git a/configs/pdf-service/format-config/bill-amendment-note.json b/configs/pdf-service/format-config/bill-amendment-note.json index f2d6e04f..e6d16b50 100644 --- a/configs/pdf-service/format-config/bill-amendment-note.json +++ b/configs/pdf-service/format-config/bill-amendment-note.json @@ -25,7 +25,7 @@ { "stack": [ { - "text": "{{logo-header}} {{Municipal_Corporation}}", + "text": "{{logo-header}} {{mcGrade}}", "style": "receipt-logo-header" }, { diff --git a/configs/pdf-service/format-config/bill-amendment.json b/configs/pdf-service/format-config/bill-amendment.json index e8cee60c..700c7dd9 100644 --- a/configs/pdf-service/format-config/bill-amendment.json +++ b/configs/pdf-service/format-config/bill-amendment.json @@ -25,7 +25,7 @@ { "stack": [ { - "text": "{{logo-header}} {{Municipal_Corporation}}", + "text": "{{logo-header}} {{mcGrade}}", "style": "receipt-logo-header" }, { diff --git a/configs/pdf-service/format-config/sewerage-bill-amendment-note.json b/configs/pdf-service/format-config/sewerage-bill-amendment-note.json index 5524b7b3..2b021649 100644 --- a/configs/pdf-service/format-config/sewerage-bill-amendment-note.json +++ b/configs/pdf-service/format-config/sewerage-bill-amendment-note.json @@ -25,7 +25,7 @@ { "stack": [ { - "text": "{{logo-header}} {{Municipal_Corporation}}", + "text": "{{logo-header}} {{mcGrade}}", "style": "receipt-logo-header" }, { diff --git a/configs/pdf-service/format-config/ws-applicationsewerage.json b/configs/pdf-service/format-config/ws-applicationsewerage.json index 493d4a3e..63f1ffc1 100644 --- a/configs/pdf-service/format-config/ws-applicationsewerage.json +++ b/configs/pdf-service/format-config/ws-applicationsewerage.json @@ -29,7 +29,7 @@ { "stack": [ { - "text": "{{logo_header}} {{Municipal_Corporation}}", + "text": "{{logo_header}} {{mcGrade}}", "style": "receipt-logo-header" }, { diff --git a/configs/pdf-service/format-config/ws-applicationwater.json b/configs/pdf-service/format-config/ws-applicationwater.json index fa9c5f87..dd94db75 100644 --- a/configs/pdf-service/format-config/ws-applicationwater.json +++ b/configs/pdf-service/format-config/ws-applicationwater.json @@ -29,7 +29,7 @@ { "stack": [ { - "text": "{{logo_header}} {{Municipal_Corporation}}", + "text": "{{logo_header}} {{mcGrade}}", "style": "receipt-logo-header" }, { diff --git a/configs/pdf-service/format-config/ws-consolidatedacknowlegment.json b/configs/pdf-service/format-config/ws-consolidatedacknowlegment.json index 95477f2d..5e2e9c5f 100644 --- a/configs/pdf-service/format-config/ws-consolidatedacknowlegment.json +++ b/configs/pdf-service/format-config/ws-consolidatedacknowlegment.json @@ -29,7 +29,7 @@ { "stack": [ { - "text": "{{logo_header}} {{Municipal_Corporation}}", + "text": "{{logo_header}} {{mcGrade}}", "style": "receipt-logo-header" }, { diff --git a/configs/pdf-service/format-config/ws-consolidatedsewerageconnection.json b/configs/pdf-service/format-config/ws-consolidatedsewerageconnection.json index 12eb8c7b..1eed2e44 100644 --- a/configs/pdf-service/format-config/ws-consolidatedsewerageconnection.json +++ b/configs/pdf-service/format-config/ws-consolidatedsewerageconnection.json @@ -29,7 +29,7 @@ { "stack": [ { - "text": "{{logo_header}} {{Municipal_Corporation}}", + "text": "{{logo_header}} {{mcGrade}}", "style": "receipt-logo-header" }, { diff --git a/configs/pdf-service/format-config/ws-onetime-receipt.json b/configs/pdf-service/format-config/ws-onetime-receipt.json index fe887276..776d25a5 100644 --- a/configs/pdf-service/format-config/ws-onetime-receipt.json +++ b/configs/pdf-service/format-config/ws-onetime-receipt.json @@ -23,7 +23,7 @@ { "stack": [ { - "text": "{{logo-header}} {{Municipal_Corporation}}", + "text": "{{logo-header}} {{mcGrade}}", "style": "receipt-logo-header" }, { diff --git a/configs/pdf-service/format-config/ws-sanctionletter.json b/configs/pdf-service/format-config/ws-sanctionletter.json index c3da6760..06c5ee84 100644 --- a/configs/pdf-service/format-config/ws-sanctionletter.json +++ b/configs/pdf-service/format-config/ws-sanctionletter.json @@ -29,7 +29,7 @@ { "stack": [ { - "text": "{{municipalCouncil}}", + "text": "{{mcGrade}}", "style": "receipt-logo-header", "margin": [ 0, From 00a8cda04f78f6a2e9295fcddfdf71674976b148 Mon Sep 17 00:00:00 2001 From: shiva-eGov <97941850+shiva-eGov@users.noreply.github.com> Date: Mon, 14 Nov 2022 18:16:13 +0530 Subject: [PATCH 1113/1242] Added {mcGrade} @437 --- configs/pdf-service/format-config/ws-onetime-receipt.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/pdf-service/format-config/ws-onetime-receipt.json b/configs/pdf-service/format-config/ws-onetime-receipt.json index 776d25a5..8ab822af 100644 --- a/configs/pdf-service/format-config/ws-onetime-receipt.json +++ b/configs/pdf-service/format-config/ws-onetime-receipt.json @@ -434,7 +434,7 @@ { "stack": [ { - "text": "{{logo-header}} {{Municipal_Corporation}}", + "text": "{{logo-header}} {{mcGrade}}", "style": "receipt-logo-header" }, { From e36ddc95f2f33e3b07a00e10d14cd0557d807b37 Mon Sep 17 00:00:00 2001 From: shiva-eGov <97941850+shiva-eGov@users.noreply.github.com> Date: Mon, 14 Nov 2022 18:56:20 +0530 Subject: [PATCH 1114/1242] reverted back the changes --- configs/pdf-service/format-config/ws-onetime-receipt.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/pdf-service/format-config/ws-onetime-receipt.json b/configs/pdf-service/format-config/ws-onetime-receipt.json index 8ab822af..776d25a5 100644 --- a/configs/pdf-service/format-config/ws-onetime-receipt.json +++ b/configs/pdf-service/format-config/ws-onetime-receipt.json @@ -434,7 +434,7 @@ { "stack": [ { - "text": "{{logo-header}} {{mcGrade}}", + "text": "{{logo-header}} {{Municipal_Corporation}}", "style": "receipt-logo-header" }, { From 3d94da3f8180714befa1b35116059838c9d89f7d Mon Sep 17 00:00:00 2001 From: Rahul Sharma Date: Wed, 16 Nov 2022 21:43:05 +0530 Subject: [PATCH 1115/1242] table format corrected --- configs/pdf-service/format-config/ws-onetime-receipt.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/configs/pdf-service/format-config/ws-onetime-receipt.json b/configs/pdf-service/format-config/ws-onetime-receipt.json index 776d25a5..fdb7f8bf 100644 --- a/configs/pdf-service/format-config/ws-onetime-receipt.json +++ b/configs/pdf-service/format-config/ws-onetime-receipt.json @@ -23,7 +23,7 @@ { "stack": [ { - "text": "{{logo-header}} {{mcGrade}}", + "text": "{{logo-header}}", "style": "receipt-logo-header" }, { @@ -573,7 +573,9 @@ false ], "style": "receipt-table-value" - }, + } + ], + [ { "text": "{{propertyID}}", "border": [ From 884fc320ae4746da4e864039351777462fa8d3d9 Mon Sep 17 00:00:00 2001 From: shiva-eGov <97941850+shiva-eGov@users.noreply.github.com> Date: Tue, 13 Dec 2022 12:05:49 +0530 Subject: [PATCH 1116/1242] commented PAYMENT INFORMATION commented PAYMENT INFORMATION --- configs/pdf-service/data-config/property-receipt.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index 04a3cbd5..b1027296 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -702,7 +702,7 @@ "module":"rainmaker-common", "locale":"en_IN" } - }, + /** }, { "variable": "PAYMENT INFORMATION", "value" : { @@ -714,7 +714,7 @@ "prefix": null, "module":"rainmaker-common", "locale":"en_IN" - } + } */ } ] }, From 74a2a659e8c2c403ef8954b433006c842152b7ca Mon Sep 17 00:00:00 2001 From: shiva-eGov <97941850+shiva-eGov@users.noreply.github.com> Date: Tue, 13 Dec 2022 12:30:26 +0530 Subject: [PATCH 1117/1242] Replaced with Prod_V2 Replaced with Prod_V2 --- .../data-config/property-receipt.json | 27 ++++++++----------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index b1027296..79102e7a 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -489,8 +489,17 @@ } }, { - "variable": "printed_by", - "value": "Printed By" + "variable": "generated_by", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_GENERATED_BY" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common", + "locale":"en_IN" + } }, { "variable": "commissioner/eo", @@ -702,23 +711,9 @@ "module":"rainmaker-common", "locale":"en_IN" } - /** }, - { - "variable": "PAYMENT INFORMATION", - "value" : { - "path": "PDF_STATIC_LABEL_PROPERTY_RECEIPT_PAYMENT_INFORMATION" - }, - "type":"label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common", - "locale":"en_IN" - } */ } ] }, - { "derived": [ { From 42052afd5196030bc75bc94ea7f8bb5245950953 Mon Sep 17 00:00:00 2001 From: Rahul Sharma Date: Tue, 17 Jan 2023 16:38:25 +0530 Subject: [PATCH 1118/1242] added TL EODB Search applications searchTLApplicationsEODB --- .../egov-searcher/rainmaker-pt-gissearch.yml | 28 ++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/configs/egov-searcher/rainmaker-pt-gissearch.yml b/configs/egov-searcher/rainmaker-pt-gissearch.yml index 06e73e7d..a8338870 100644 --- a/configs/egov-searcher/rainmaker-pt-gissearch.yml +++ b/configs/egov-searcher/rainmaker-pt-gissearch.yml @@ -77,4 +77,30 @@ SearchDefinitions: jsonFormat: {"ResponseInfo": {}} outJsonPath: $.data responseInfoPath: $.ResponseInfo - + + + - name: searchTLApplicationsEODB + query: + baseQuery: | + select array_to_json(array_agg(row_to_json(data))) from ( + select + tl.applicationnumber, + tl.status,additionalDetail->>'IPIN' as iPin, + additionalDetail->>'APPID' as appId, + additionalDetail->>'mobileNo' as mobileNp + from eg_tl_tradelicense tl + inner join eg_tl_tradelicensedetail tld on tld.tradelicenseid=tl.id and tld.additionalDetail->>'CHANNEL'='EODB' $where) data + groupBy: + orderBy: + searchParams: + condition: AND + params: + - name: tl.tenantid + isMandatory: false + jsonPath: $.searchCriteria.tenantId + operator: = + + output: + jsonFormat: {"ResponseInfo": {}} + outJsonPath: $.data + responseInfoPath: $.ResponseInfo From 83526dc3f72cfe5f3129b713349d6a03ed7c23ba Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Tue, 17 Jan 2023 16:53:00 +0530 Subject: [PATCH 1119/1242] added additionalDetails TLApplicationEODB --- configs/egov-searcher/rainmaker-pt-gissearch.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/egov-searcher/rainmaker-pt-gissearch.yml b/configs/egov-searcher/rainmaker-pt-gissearch.yml index a8338870..03717a85 100644 --- a/configs/egov-searcher/rainmaker-pt-gissearch.yml +++ b/configs/egov-searcher/rainmaker-pt-gissearch.yml @@ -85,6 +85,7 @@ SearchDefinitions: select array_to_json(array_agg(row_to_json(data))) from ( select tl.applicationnumber, + tld.additionalDetail::text, tl.status,additionalDetail->>'IPIN' as iPin, additionalDetail->>'APPID' as appId, additionalDetail->>'mobileNo' as mobileNp From 83204fbd10b0eb08bf3532cff5a42830abf3502c Mon Sep 17 00:00:00 2001 From: Rahul Sharma Date: Wed, 18 Jan 2023 11:22:59 +0530 Subject: [PATCH 1120/1242] where condition in TLApplicationsEODB --- configs/egov-searcher/rainmaker-pt-gissearch.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-searcher/rainmaker-pt-gissearch.yml b/configs/egov-searcher/rainmaker-pt-gissearch.yml index 03717a85..52069f35 100644 --- a/configs/egov-searcher/rainmaker-pt-gissearch.yml +++ b/configs/egov-searcher/rainmaker-pt-gissearch.yml @@ -90,7 +90,7 @@ SearchDefinitions: additionalDetail->>'APPID' as appId, additionalDetail->>'mobileNo' as mobileNp from eg_tl_tradelicense tl - inner join eg_tl_tradelicensedetail tld on tld.tradelicenseid=tl.id and tld.additionalDetail->>'CHANNEL'='EODB' $where) data + inner join eg_tl_tradelicensedetail tld on tld.tradelicenseid=tl.id and tld.additionalDetail->>'CHANNEL'='EODB' where 1=1 $where) data groupBy: orderBy: searchParams: From 617312577e8628283dcbcc8a9d58e8683463b175 Mon Sep 17 00:00:00 2001 From: Rahul Sharma Date: Wed, 18 Jan 2023 11:29:46 +0530 Subject: [PATCH 1121/1242] removd condition from TLApplicationsEODB --- configs/egov-searcher/rainmaker-pt-gissearch.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/configs/egov-searcher/rainmaker-pt-gissearch.yml b/configs/egov-searcher/rainmaker-pt-gissearch.yml index 52069f35..d7f08aa3 100644 --- a/configs/egov-searcher/rainmaker-pt-gissearch.yml +++ b/configs/egov-searcher/rainmaker-pt-gissearch.yml @@ -90,16 +90,13 @@ SearchDefinitions: additionalDetail->>'APPID' as appId, additionalDetail->>'mobileNo' as mobileNp from eg_tl_tradelicense tl - inner join eg_tl_tradelicensedetail tld on tld.tradelicenseid=tl.id and tld.additionalDetail->>'CHANNEL'='EODB' where 1=1 $where) data + inner join eg_tl_tradelicensedetail tld on tld.tradelicenseid=tl.id and tld.additionalDetail->>'CHANNEL'='EODB' ) data groupBy: orderBy: searchParams: condition: AND params: - - name: tl.tenantid - isMandatory: false - jsonPath: $.searchCriteria.tenantId - operator: = + output: jsonFormat: {"ResponseInfo": {}} From 216fabb1fb417a7e916872d09e44dfb2f8ec7f11 Mon Sep 17 00:00:00 2001 From: chinmoy-eGov Date: Mon, 30 Jan 2023 10:23:27 +0530 Subject: [PATCH 1122/1242] UM-5403 --- .../MasterDashboardConfig.json | 59 +++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json index aff567ab..c1f51bd1 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json @@ -1574,6 +1574,65 @@ "headers": [] } ] + }, + { + "id": 329, + "name": "DSS_MCOLLECT", + "vizType": "module", + "ref": { + "url": "mCollect", + "logoUrl": "", + "type": "internal" + }, + "label": "", + "charts": [ + { + "id": "mcTotalCollection", + "name": "DSS_MC_TOTAL_COLLECTION", + "code": "", + "chartType": "metric", + "filter": "", + "headers": [] + }, + { + "id": "mcTotalReceipts", + "name": "DSS_MC_TOTAL_RECEIPTS", + "code": "", + "chartType": "metric", + "filter": "", + "headers": [] + } + ] + }, + { + "id": 201, + "name": "DSS_FIRENOC_OVERVIEW", + "vizType": "module", + "moduleLevel": "FIRENOC", + "ref": { + "url": "noc", + "logoUrl": "", + "type": "internal" + }, + "label": "", + "charts": [ + { + "id": "nocTotalCollection", + "name": "DSS_NOC_TOTAL_COLLECTION", + "code": "", + "chartType": "metric", + "filter": "", + "headers": [] + }, + { + "id": "nocTotalNocsIssued", + "name": "DSS_NOC_TOTAL_NOCS_ISSUED", + "code": "", + "chartType": "metric", + "filter": "", + "headers": [] + } + ] } ] } From c965ec34738c55de683140f6c87095175f2e9db7 Mon Sep 17 00:00:00 2001 From: chinmoy-eGov Date: Mon, 30 Jan 2023 15:49:54 +0530 Subject: [PATCH 1123/1242] UM-5403 --- .../dashboard-analytics/ChartApiConfig.json | 123 ++++++++++++++++++ 1 file changed, 123 insertions(+) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 96621773..f8f1579a 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -3976,6 +3976,129 @@ "insight": { }, "_comment": "" + }, + "mcTotalCollection": { + "chartName": "DSS_TOTAL_COLLECTION", + "queries": [ + { + "module": "COMMON", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\"}", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pg.testing\",\"pg\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"FSM.TRIP_CHARGES\",\"PT.MUTATION\",\"SW\",\"BPA.LOW_RISK_PERMIT_FEE\",\"BPA.NC_SAN_FEE\",\"BPA.NC_APP_FEE\",\"BPA.NC_OC_APP_FEE\"]}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" + } + ], + "chartType": "metric", + "valueType": "Amount", + "drillChart": "none", + "documentType": "_doc", + "action": "", + "aggregationPaths": [ + "Total Collection" + ], + "insight": { + "chartResponseMap" : "mcTotalCollection", + "action" : "differenceOfNumbers", + "upwardIndicator" : "positive", + "downwardIndicator" : "negative", + "textMessage" : "$indicator$value% than last $insightInterval", + "colorCode" : "#228B22", + "insightInterval" : "year", + "isRoundOff": true + + }, + "_comment": " " + }, + "mcTotalReceipts": { + "chartName": "DSS_MC_TOTAL_RECEIPTS", + "queries": [ + { + "module": "COMMON", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.Bill.billDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.cityDistrictCode\"}", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pg.testing\",\"pg\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"FSM.TRIP_CHARGES\",\"PT.MUTATION\",\"SW\",\"BPA.LOW_RISK_PERMIT_FEE\",\"BPA.NC_SAN_FEE\",\"BPA.NC_APP_FEE\",\"BPA.NC_OC_APP_FEE\"]}}]}},\"aggs\":{\"Total Receipts\":{\"value_count\":{\"field\":\"dataObject.paymentDetails.receiptNumber.keyword\"}}}}}}" + } + ], + "chartType": "metric", + "valueType": "number", + "drillChart": "none", + "documentType": "_doc", + "action": "", + "aggregationPaths": [ + "Total Receipts" + ], + "insight": { + "chartResponseMap" : "mcTotalReceipts", + "action" : "differenceOfNumbers", + "upwardIndicator" : "positive", + "downwardIndicator" : "negative", + "textMessage" : "$indicator$value% than last $insightInterval", + "colorCode" : "#228B22", + "insightInterval" : "year", + "isRoundOff": true + }, + "_comment": " " + }, + "nocTotalCollection": { + "chartName": "DSS_NOC_TOTAL_COLLECTION", + "queries": [ + { + "module": "FIRENOC", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must\":[{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"FIRENOC\"]}}],\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pg.testing\"}},{\"term\":{\"dataObject.paymentStatus.keyword\":\"Cancelled\"}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}", + "requestQueryMap": "{\"wardId\" : \"dataObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\",\"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", + "dateRefField": "dataObject.paymentDetails.receiptDate" + } + ], + "chartType": "metric", + "valueType": "amount", + "action": "", + "drillChart": "none", + "aggregationPaths": [ + "Total Collection" + ], + "insight": { + "chartResponseMap" : "nocTotalCollection", + "action" : "differenceOfNumbers", + "upwardIndicator" : "positive", + "downwardIndicator" : "negative", + "textMessage" : "$indicator$value% than last $insightInterval", + "colorCode" : "#228B22", + "insightInterval" : "year", + "isRoundOff": true + }, + "_comment": "FIRE NOC total collections " + }, + "nocTotalNocsIssued": { + "chartName": "DSS_NOC_TOTAL_NOCS_ISSUED", + "queries": [ + { + "module": "FIRENOC", + "indexName": "firenoc-services", + "aggrQuery": "{\"aggs\":{\"FireNOC\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pg.testing\"}}],\"must\":[{\"terms\":{\"Data.fireNOCDetails.status.keyword\":[\"APPROVED\"]}}]}},\"aggs\":{\"Total Nocs Issued\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}}", + "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\",\"tenantId\" : \"Data.tenantId\", \"district\" : \"Data.tenantData.city.districtCode\"}", + "dateRefField": "Data.auditDetails.createdTime" + } + ], + "chartType": "metric", + "valueType": "number", + "action": "", + "drillChart": "none", + "aggregationPaths": [ + "Total Nocs Issued" + ], + "insight": { + "chartResponseMap" : "nocTotalNocsIssued", + "action" : "differenceOfNumbers", + "upwardIndicator" : "positive", + "downwardIndicator" : "negative", + "textMessage" : "$indicator$value% than last $insightInterval", + "colorCode" : "#228B22", + "insightInterval" : "year", + "isRoundOff": true + }, + "_comment": "FIRE NOC total nocs issued " } } From 8cea941cbf72da35a704c11ba30d1d49240a1151 Mon Sep 17 00:00:00 2001 From: chinmoy-eGov Date: Mon, 30 Jan 2023 16:34:32 +0530 Subject: [PATCH 1124/1242] UM-5403 removed round off --- .../dashboard-analytics/ChartApiConfig.json | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index f8f1579a..1ad58a7d 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -4003,9 +4003,7 @@ "downwardIndicator" : "negative", "textMessage" : "$indicator$value% than last $insightInterval", "colorCode" : "#228B22", - "insightInterval" : "year", - "isRoundOff": true - + "insightInterval" : "year" }, "_comment": " " }, @@ -4035,8 +4033,7 @@ "downwardIndicator" : "negative", "textMessage" : "$indicator$value% than last $insightInterval", "colorCode" : "#228B22", - "insightInterval" : "year", - "isRoundOff": true + "insightInterval" : "year" }, "_comment": " " }, @@ -4065,8 +4062,7 @@ "downwardIndicator" : "negative", "textMessage" : "$indicator$value% than last $insightInterval", "colorCode" : "#228B22", - "insightInterval" : "year", - "isRoundOff": true + "insightInterval" : "year" }, "_comment": "FIRE NOC total collections " }, @@ -4095,8 +4091,7 @@ "downwardIndicator" : "negative", "textMessage" : "$indicator$value% than last $insightInterval", "colorCode" : "#228B22", - "insightInterval" : "year", - "isRoundOff": true + "insightInterval" : "year" }, "_comment": "FIRE NOC total nocs issued " } From bbdb7df379893d15b2d9df36ee9590ebed8e1e82 Mon Sep 17 00:00:00 2001 From: chinmoy-eGov Date: Tue, 31 Jan 2023 13:39:24 +0530 Subject: [PATCH 1125/1242] UM-5403 --- .../MasterDashboardConfig.json | 619 ++++++++++++++++++ 1 file changed, 619 insertions(+) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json index c1f51bd1..970a4506 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json @@ -3942,6 +3942,625 @@ ] } ] + }, + { + "name": "DSS_M_COLLECT_DASHBOARD", + "id": "mCollect", + "title": "From Apr 01, 2022 to Jan 31, 2023", + "visualizations": [ + { + "row": 1, + "name": "DSS_REVENUE", + "vizArray": [ + { + "id": 311, + "name": "DSS_MCOLLECT_STATE_OVERVIEW", + "dimensions": { + "height": 350, + "width": 5 + }, + "vizType": "metric-collection", + "label": "DSS_MCOLLECT_STATE_OVERVIEW", + "noUnit": true, + "isCollapsible": false, + "charts": [ + { + "id": "mcTodaysCollection", + "name": "DSS_TOTAL_COLLECTION_TODAY", + "code": "", + "chartType": "metric", + "filter": { + "title": "TODAY" + }, + "headers": [] + }, + { + "id": "mcTotalCollection", + "name": "DSS_TOTAL_COLLECTION", + "code": "", + "chartType": "metric", + "filter": "", + "headers": [] + }, + { + "id": "mcTotalChallans", + "name": "DSS_MC_TOTAL_CHALLANS", + "code": "", + "chartType": "metric", + "filter": "", + "headers": [] + }, + { + "id": "mcTotalReceipts", + "name": "DSS_MC_TOTAL_RECEIPTS", + "code": "", + "chartType": "metric", + "filter": "", + "headers": [] + }, + { + "id": "mcTotalCategories", + "name": "DSS_MC_TOTAL_CATEGORIES", + "code": "", + "chartType": "metric", + "filter": "", + "headers": [] + } + ] + }, + { + "id": 312, + "name": "Total Cumulative Collection", + "dimensions": { + "height": 350, + "width": 7 + }, + "vizType": "chart", + "label": "", + "noUnit": true, + "isCollapsible": false, + "charts": [ + { + "id": "mcCumulativeCollection", + "name": "Monthly", + "code": "", + "chartType": "line", + "filter": "", + "headers": [] + } + ] + } + ] + }, + { + "row": 2, + "name": "DSS_REVENUE", + "vizArray": [ + { + "id": 234, + "name": "DSS_MC_RECEIPTS_BY_PAYMENTMODE", + "dimensions": { + "height": 250, + "width": 4 + }, + "vizType": "chart", + "noUnit": false, + "isCollapsible": false, + "charts": [ + { + "id": "mcReceiptsByPaymentMode", + "name": "DSS_MC_RECEIPTS_BY_PAYMENTMODE", + "code": "", + "chartType": "donut", + "filter": "", + "headers": [] + } + ] + }, + { + "id": 323, + "name": "DSS_MC_COLLECTION_BY_PAYMENT_TYPE", + "dimensions": { + "height": 250, + "width": 4 + }, + "vizType": "chart", + "label": "", + "noUnit": false, + "isCollapsible": false, + "charts": [ + { + "id": "mcCollectionByPaymentType", + "name": "DSS_MC_COLLECTION_BY_PAYMENT_TYPE", + "code": "", + "chartType": "donut", + "filter": "", + "headers": [] + } + ] + } + ] + }, + { + "row": 3, + "name": "DSS_REVENUE", + "vizArray": [ + { + "id": 235, + "name": "DSS_MC_CHALLAN_COUNT_BY_STATUS", + "dimensions": { + "height": 250, + "width": 4 + }, + "vizType": "chart", + "noUnit": false, + "isCollapsible": false, + "charts": [ + { + "id": "mcChallanCountByStatus", + "name": "DSS_MC_CHALLAN_COUNT_BY_STATUS", + "code": "", + "chartType": "donut", + "filter": "", + "headers": [] + } + ] + }, + { + "id": 233, + "name": "DSS_MC_RECEIPTS_BY_STATUS", + "dimensions": { + "height": 250, + "width": 4 + }, + "vizType": "chart", + "noUnit": false, + "isCollapsible": false, + "charts": [ + { + "id": "mcReceiptsByStatus", + "name": "DSS_MC_RECEIPTS_BY_STATUS", + "code": "", + "chartType": "donut", + "filter": "", + "headers": [] + } + ] + }, + { + "id": 232, + "name": "DSS_MC_COLLECTION_BY_STATUS", + "dimensions": { + "height": 250, + "width": 4 + }, + "vizType": "chart", + "noUnit": false, + "isCollapsible": false, + "charts": [ + { + "id": "mcCollectionByStatus", + "name": "DSS_MC_COLLECTION_BY_STATUS", + "code": "", + "chartType": "donut", + "filter": "", + "headers": [] + } + ] + } + ] + }, + { + "row": 4, + "name": "DSS_REVENUE", + "vizArray": [ + { + "id": 123, + "name": "DSS_MC_COLLECTION_CATEGORY_WISE", + "dimensions": { + "height": 250, + "width": 4 + }, + "vizType": "chart", + "noUnit": false, + "isCollapsible": false, + "charts": [ + { + "id": "mcTotalCollectionCategoryWise", + "name": "DSS_MC_COLLECTION_CATEGORY_WISE", + "code": "", + "chartType": "horizontalBar", + "filter": "", + "headers": [] + } + ] + }, + { + "id": 124, + "name": "DSS_MC_MONTHLY_REPORT", + "dimensions": { + "height": 250, + "width": 4 + }, + "vizType": "chart", + "noUnit": false, + "isCollapsible": false, + "charts": [ + { + "id": "mcMonthlyCollectionReport", + "name": "DSS_MC_MONTHLY_REPORT", + "code": "", + "chartType": "bar", + "filter": "", + "headers": [] + } + ] + } + ] + }, + { + "row": 5, + "name": "DSS_REVENUE", + "vizArray": [ + { + "id": 236, + "name": "DSS_MC_REPORT_BY_TENANT", + "dimensions": { + "height": 250, + "width": 4 + }, + "vizType": "chart", + "noUnit": false, + "isCollapsible": false, + "charts": [ + { + "id": "mcReportByDDRv2", + "name": "DSS_MC_REPORT_BY_TENANT", + "code": "", + "chartType": "table", + "filter": "", + "headers": [], + "tabName": "Region" + }, + { + "id": "mcReportByCategoryv2", + "name": "DSS_MC_REPORT_BY_CATEGORY", + "code": "", + "chartType": "table", + "filter": "", + "headers": [], + "tabName": "Category" + } + ] + } + ] + } + ] + }, + { + "name": "DSS_FIRE_NOC_DASHBOARD", + "id": "noc", + "title": "From Apr 01, 2022 to Jan 31, 2023", + "visualizations": [ + { + "row": 1, + "name": "DSS_OVERVIEW", + "vizArray": [ + { + "id": 341, + "name": "DSS_NOC_REVENUE", + "dimensions": { + "height": 400, + "width": 5 + }, + "vizType": "metric-collection", + "label": "DSS_NOC_REVENUE", + "noUnit": true, + "isCollapsible": false, + "charts": [ + { + "id": "nocTodaysCollection", + "name": "DSS_NOC_TODAYS_COLLECTION", + "code": "", + "chartType": "metric", + "filter": { + "title": "TODAY" + }, + "headers": [] + }, + { + "id": "nocTotalCollection", + "name": "DSS_NOC_TOTAL_COLLECTION", + "code": "", + "chartType": "metric", + "filter": "", + "headers": [] + } + ] + }, + { + "id": 342, + "name": "DSS_NOC_TOTAL_CUMULATIVE_COLLECTION", + "dimensions": { + "height": 190, + "width": 7 + }, + "vizType": "chart", + "label": "", + "noUnit": true, + "isCollapsible": false, + "charts": [ + { + "id": "nocCumulativeCollection", + "name": "Monthly", + "code": "", + "chartType": "line", + "filter": "", + "headers": [] + } + ] + } + ] + }, + { + "row": 2, + "name": "DSS_OVERVIEW", + "vizArray": [ + { + "id": 341, + "name": "DSS_NOC_OVERVIEW", + "dimensions": { + "height": 400, + "width": 5 + }, + "vizType": "metric-collection", + "label": "DSS_NOC_OVERVIEW", + "noUnit": true, + "isCollapsible": false, + "charts": [ + { + "id": "nocTotalApplications", + "name": "DSS_NOC_TOTAL_APPLICATIONS", + "code": "", + "chartType": "metric", + "filter": "", + "headers": [] + }, + { + "id": "nocProvisionalIssued", + "name": "DSS_NOC_PROVISIONAL_ISSUED", + "code": "", + "chartType": "metric", + "filter": "", + "headers": [] + }, + { + "id": "nocActualIssued", + "name": "DSS_NOC_ACTUAL_ISSUED", + "code": "", + "chartType": "metric", + "filter": "", + "headers": [] + }, + { + "id": "nocSLAComplianceProvisional", + "name": "DSS_NOC_SLA_COMPLIANCE_PROVISIONAL", + "code": "", + "chartType": "metric", + "filter": "", + "headers": [] + }, + { + "id": "nocSLAComplianceActual", + "name": "DSS_NOC_SLA_COMPLIANCE_ACTUAL", + "code": "", + "chartType": "metric", + "filter": "", + "headers": [] + } + ] + }, + { + "id": 343, + "name": "DSS_APPLICATION_VS_PROVISIONAL_VS_ACTUAL", + "dimensions": { + "height": 190, + "width": 7 + }, + "vizType": "chart", + "isCollapsible": false, + "label": "", + "charts": [ + { + "id": "nocApplicationVsProvisionalVsActual", + "name": "Monthly", + "code": "", + "chartType": "line", + "filter": "", + "headers": [] + } + ] + } + ] + }, + { + "row": 3, + "name": "DSS_OVERVIEW", + "vizArray": [ + { + "id": 210, + "name": "DSS_NOC_COLLECTION_BY_PAYMENT_MODE", + "dimensions": { + "height": 250, + "width": 4 + }, + "vizType": "chart", + "label": "", + "noUnit": false, + "isCollapsible": false, + "charts": [ + { + "id": "nocCollectionByPaymentMode", + "name": "DSS_NOC_COLLECTION_BY_PAYMENT_MODE", + "code": "", + "chartType": "donut", + "filter": "", + "headers": [] + } + ] + }, + { + "id": 211, + "name": "DSS_TOTAL_NOC_ISSUED_TYPE", + "dimensions": { + "height": 250, + "width": 4 + }, + "vizType": "chart", + "noUnit": false, + "isCollapsible": false, + "charts": [ + { + "id": "totalNocIssuedByType", + "name": "DSS_TOTAL_NOC_ISSUED_TYPE", + "code": "", + "chartType": "donut", + "filter": "", + "headers": [] + } + ] + }, + { + "id": 212, + "name": "DSS_ACTUAL_NOC_ISSUED_USAGETYPE", + "dimensions": { + "height": 250, + "width": 4 + }, + "vizType": "chart", + "noUnit": false, + "isCollapsible": false, + "charts": [ + { + "id": "actualNocIssuedByUsageType", + "name": "DSS_ACTUAL_NOC_ISSUED_USAGETYPE", + "code": "", + "chartType": "donut", + "filter": "", + "headers": [] + } + ] + } + ] + }, + { + "row": 4, + "name": "DSS_OVERVIEW", + "vizArray": [ + { + "id": 321, + "name": "DSS_NOC_TOP_3_PERFORMING_ULBS", + "dimensions": { + "height": 250, + "width": 4 + }, + "vizType": "performing-metric", + "label": "", + "noUnit": false, + "isCollapsible": false, + "charts": [ + { + "id": "nocActualTopPerformingUlbs", + "name": "DSS_NOC_ACTUAL_TOP_3_PERFORMING_ULBS", + "code": "", + "chartType": "bar", + "filter": "", + "headers": [], + "tabName": "Actual" + }, + { + "id": "nocProvisionalTopPerformingUlbs", + "name": "DSS_NOC_PROVISIONAL_TOP_3_PERFORMING_ULBS", + "code": "", + "chartType": "bar", + "filter": "", + "headers": [], + "tabName": "Provisional" + } + ] + }, + { + "id": 322, + "name": "DSS_NOC_BOTTOM_3_PERFORMING_ULBS", + "dimensions": { + "height": 250, + "width": 4 + }, + "vizType": "performing-metric", + "label": "", + "noUnit": false, + "isCollapsible": false, + "charts": [ + { + "id": "nocActualBottomPerformingUlbs", + "name": "DSS_NOC_ACTUAL_BOTTOM_3_PERFORMING_ULBS", + "code": "", + "chartType": "bar", + "filter": "", + "headers": [], + "tabName": "Actual" + }, + { + "id": "nocProvisionalBottomPerformingUlbs", + "name": "DSS_NOC_PROVISIONAL_BOTTOM_3_PERFORMING_ULBS", + "code": "", + "chartType": "bar", + "filter": "", + "headers": [], + "tabName": "Provisional" + } + ] + } + ] + }, + { + "row": 5, + "name": "DSS_OVERVIEW", + "vizArray": [ + { + "id": 231, + "name": "Service Report", + "dimensions": { + "height": 350, + "width": 12 + }, + "vizType": "chart", + "noUnit": false, + "isCollapsible": false, + "charts": [ + { + "id": "nocServiceReportByRegion", + "name": "DSS_NOC_SERVICE_REPORT_REGION", + "code": "", + "chartType": "table", + "filter": "", + "headers": [], + "tabName": "Region" + }, + { + "id": "nocServiceReportByDepartment", + "name": "DSS_NOC_SERVICE_REPORT_DEPARTMENT", + "code": "", + "chartType": "table", + "filter": "", + "headers": [], + "tabName": "Department" + } + ] + } + ] + } + ] } ] } From 74b39ab81280dd43f2be9d6ba27d8b0fdd097024 Mon Sep 17 00:00:00 2001 From: chinmoy-eGov Date: Tue, 31 Jan 2023 14:27:28 +0530 Subject: [PATCH 1126/1242] UM-5403 --- .../MasterDashboardConfig.json | 950 ++++++++++++++++++ 1 file changed, 950 insertions(+) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json index c1f51bd1..bdce93ef 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json @@ -3942,6 +3942,956 @@ ] } ] + }, + { + "name": "DSS_M_COLLECT_DASHBOARD", + "id": "mCollect", + "isActive": "", + "style": "linear", + "visualizations": [ + { + "row": 1, + "name": "DSS_REVENUE", + "vizArray": [ + { + "id": 311, + "name": "DSS_MCOLLECT_STATE_OVERVIEW", + "dimensions": { + "height": 350, + "width": 5 + }, + "vizType": "metric-collection", + "label": "DSS_MCOLLECT_STATE_OVERVIEW", + "noUnit": true, + "isCollapsible": false, + "charts": [ + { + "id": "mcTodaysCollection", + "name": "DSS_TOTAL_COLLECTION_TODAY", + "code": "", + "chartType": "metric", + "filter": { + "title": "TODAY" + }, + "headers": [] + }, + { + "id": "mcTotalCollection", + "name": "DSS_TOTAL_COLLECTION", + "code": "", + "chartType": "metric", + "filter": "", + "headers": [] + }, + { + "id": "mcTotalChallans", + "name": "DSS_MC_TOTAL_CHALLANS", + "code": "", + "chartType": "metric", + "filter": "", + "headers": [] + }, + { + "id": "mcTotalReceipts", + "name": "DSS_MC_TOTAL_RECEIPTS", + "code": "", + "chartType": "metric", + "filter": "", + "headers": [] + }, + { + "id": "mcTotalCategories", + "name": "DSS_MC_TOTAL_CATEGORIES", + "code": "", + "chartType": "metric", + "filter": "", + "headers": [] + } + ] + }, + { + "id": 312, + "name": "Total Cumulative Collection", + "dimensions": { + "height": 350, + "width": 7 + }, + "vizType": "chart", + "label": "", + "noUnit": true, + "isCollapsible": false, + "charts": [ + { + "id": "mcCumulativeCollection", + "name": "Monthly", + "code": "", + "chartType": "line", + "filter": "", + "headers": [] + } + ] + } + ] + }, + { + "row": 2, + "name": "DSS_REVENUE", + "vizArray": [ + + { + "id": 234, + "name": "DSS_MC_RECEIPTS_BY_PAYMENTMODE", + "dimensions": { + "height": 250, + "width": 4 + }, + "vizType": "chart", + "noUnit": false, + "isCollapsible": false, + "charts": [ + { + "id": "mcReceiptsByPaymentMode", + "name": "DSS_MC_RECEIPTS_BY_PAYMENTMODE", + "code": "", + "chartType": "donut", + "filter": "", + "headers": [] + } + ] + }, + { + "id": 323, + "name": "DSS_MC_COLLECTION_BY_PAYMENT_TYPE", + "dimensions": { + "height": 250, + "width": 4 + }, + "vizType": "chart", + "label": "", + "noUnit": false, + "isCollapsible": false, + "charts": [ + { + "id": "mcCollectionByPaymentType", + "name": "DSS_MC_COLLECTION_BY_PAYMENT_TYPE", + "code": "", + "chartType": "donut", + "filter": "", + "headers": [] + } + ] + } + ] + }, + { + "row": 3, + "name": "DSS_REVENUE", + "vizArray": [ + + { + "id": 235, + "name": "DSS_MC_CHALLAN_COUNT_BY_STATUS", + "dimensions": { + "height": 250, + "width": 4 + }, + "vizType": "chart", + "noUnit": false, + "isCollapsible": false, + "charts": [ + { + "id": "mcChallanCountByStatus", + "name": "DSS_MC_CHALLAN_COUNT_BY_STATUS", + "code": "", + "chartType": "donut", + "filter": "", + "headers": [] + } + ] + }, + { + "id": 233, + "name": "DSS_MC_RECEIPTS_BY_STATUS", + "dimensions": { + "height": 250, + "width": 4 + }, + "vizType": "chart", + "noUnit": false, + "isCollapsible": false, + "charts": [ + { + "id": "mcReceiptsByStatus", + "name": "DSS_MC_RECEIPTS_BY_STATUS", + "code": "", + "chartType": "donut", + "filter": "", + "headers": [] + } + ] + }, + { + "id": 232, + "name": "DSS_MC_COLLECTION_BY_STATUS", + "dimensions": { + "height": 250, + "width": 4 + }, + "vizType": "chart", + "noUnit": false, + "isCollapsible": false, + "charts": [ + { + "id": "mcCollectionByStatus", + "name": "DSS_MC_COLLECTION_BY_STATUS", + "code": "", + "chartType": "donut", + "filter": "", + "headers": [] + } + ] + } + ] + }, + + { + "row": 4, + "name": "DSS_REVENUE", + "vizArray": [ + + { + "id": 123, + "name": "DSS_MC_COLLECTION_CATEGORY_WISE", + "dimensions": { + "height": 250, + "width": 4 + }, + "vizType": "chart", + "noUnit": false, + "isCollapsible": false, + "charts": [ + { + "id": "mcTotalCollectionCategoryWise", + "name": "DSS_MC_COLLECTION_CATEGORY_WISE", + "code": "", + "chartType": "horizontalBar", + "filter": "", + "headers": [] + } + ] + }, + { + "id": 124, + "name": "DSS_MC_MONTHLY_REPORT", + "dimensions": { + "height": 250, + "width": 4 + }, + "vizType": "chart", + "noUnit": false, + "isCollapsible": false, + "charts": [ + { + "id": "mcMonthlyCollectionReport", + "name": "DSS_MC_MONTHLY_REPORT", + "code": "", + "chartType": "bar", + "filter": "", + "headers": [] + } + ] + } + ] + }, + { + "row": 5, + "name": "DSS_REVENUE", + "vizArray": [ + + { + "id": 236, + "name": "DSS_MC_REPORT_BY_TENANT", + "dimensions": { + "height": 250, + "width": 4 + }, + "vizType": "chart", + "noUnit": false, + "isCollapsible": false, + "charts": [ + { + "id": "mcReportByDDRv2", + "name": "DSS_MC_REPORT_BY_TENANT", + "code": "", + "chartType": "table", + "filter": "", + "headers": [], + "tabName": "Region" + }, + { + "id": "mcReportByCategoryv2", + "name": "DSS_MC_REPORT_BY_CATEGORY", + "code": "", + "chartType": "table", + "filter": "", + "headers": [], + "tabName": "Category" + } + ] + } + ] + } + ] + }, + { + "name": "DSS_FIRE_NOC_DASHBOARD", + "id": "noc", + "isActive": "", + "style": "linear", + "visualizations": [ + { + "row": 1, + "name": "DSS_OVERVIEW", + "vizArray": [ + { + "id": 341, + "name": "DSS_NOC_REVENUE", + "dimensions": { + "height": 400, + "width": 5 + }, + "vizType": "metric-collection", + "label": "DSS_NOC_REVENUE", + "noUnit": true, + "isCollapsible": false, + "charts": [ + { + "id": "nocTodaysCollection", + "name": "DSS_NOC_TODAYS_COLLECTION", + "code": "", + "chartType": "metric", + "filter": { + "title": "TODAY" + }, + "headers": [] + }, + { + "id": "nocTotalCollection", + "name": "DSS_NOC_TOTAL_COLLECTION", + "code": "", + "chartType": "metric", + "filter": "", + "headers": [] + } + ] + }, + { + "id": 342, + "name": "DSS_NOC_TOTAL_CUMULATIVE_COLLECTION", + "dimensions": { + "height": 190, + "width": 7 + }, + "vizType": "chart", + "label": "", + "noUnit": true, + "isCollapsible": false, + "charts": [ + { + "id": "nocCumulativeCollection", + "name": "Monthly", + "code": "", + "chartType": "line", + "filter": "", + "headers": [] + } + ] + } + ] + }, + { + "row": 2, + "name": "DSS_OVERVIEW", + "vizArray": [ + { + "id": 341, + "name": "DSS_NOC_OVERVIEW", + "dimensions": { + "height": 400, + "width": 5 + }, + "vizType": "metric-collection", + "label": "DSS_NOC_OVERVIEW", + "noUnit": true, + "isCollapsible": false, + "charts": [ + { + "id": "nocTotalApplications", + "name": "DSS_NOC_TOTAL_APPLICATIONS", + "code": "", + "chartType": "metric", + "filter": "", + "headers": [] + }, + { + "id": "nocProvisionalIssued", + "name": "DSS_NOC_PROVISIONAL_ISSUED", + "code": "", + "chartType": "metric", + "filter": "", + "headers": [] + }, + { + "id": "nocActualIssued", + "name": "DSS_NOC_ACTUAL_ISSUED", + "code": "", + "chartType": "metric", + "filter": "", + "headers": [] + }, + { + "id": "nocSLAComplianceProvisional", + "name": "DSS_NOC_SLA_COMPLIANCE_PROVISIONAL", + "code": "", + "chartType": "metric", + "filter": "", + "headers": [] + }, + { + "id": "nocSLAComplianceActual", + "name": "DSS_NOC_SLA_COMPLIANCE_ACTUAL", + "code": "", + "chartType": "metric", + "filter": "", + "headers": [] + } + ] + }, + { + "id": 343, + "name": "DSS_APPLICATION_VS_PROVISIONAL_VS_ACTUAL", + "dimensions": { + "height": 190, + "width": 7 + }, + "vizType": "chart", + "isCollapsible": false, + "label": "", + "charts": [ + { + "id": "nocApplicationVsProvisionalVsActual", + "name": "Monthly", + "code": "", + "chartType": "line", + "filter": "", + "headers": [] + } + ] + } + ] + }, + { + "row": 3, + "name": "DSS_OVERVIEW", + "vizArray": [ + { + "id": 210, + "name": "DSS_NOC_COLLECTION_BY_PAYMENT_MODE", + "dimensions": { + "height": 250, + "width": 4 + }, + "vizType": "chart", + "label": "", + "noUnit": false, + "isCollapsible": false, + "charts": [ + { + "id": "nocCollectionByPaymentMode", + "name": "DSS_NOC_COLLECTION_BY_PAYMENT_MODE", + "code": "", + "chartType": "donut", + "filter": "", + "headers": [] + } + ] + }, + { + "id": 211, + "name": "DSS_TOTAL_NOC_ISSUED_TYPE", + "dimensions": { + "height": 250, + "width": 4 + }, + "vizType": "chart", + "noUnit": false, + "isCollapsible": false, + "charts": [ + { + "id": "totalNocIssuedByType", + "name": "DSS_TOTAL_NOC_ISSUED_TYPE", + "code": "", + "chartType": "donut", + "filter": "", + "headers": [] + } + ] + }, + { + "id": 212, + "name": "DSS_ACTUAL_NOC_ISSUED_USAGETYPE", + "dimensions": { + "height": 250, + "width": 4 + }, + "vizType": "chart", + "noUnit": false, + "isCollapsible": false, + "charts": [ + { + "id": "actualNocIssuedByUsageType", + "name": "DSS_ACTUAL_NOC_ISSUED_USAGETYPE", + "code": "", + "chartType": "donut", + "filter": "", + "headers": [] + } + ] + } + ] + }, + { + "row": 4, + "name": "DSS_OVERVIEW", + "vizArray": [ + { + "id": 321, + "name": "DSS_NOC_TOP_3_PERFORMING_ULBS", + "dimensions": { + "height": 250, + "width": 4 + }, + "vizType": "performing-metric", + "label": "", + "noUnit": false, + "isCollapsible": false, + "charts": [ + { + "id": "nocActualTopPerformingUlbs", + "name": "DSS_NOC_ACTUAL_TOP_3_PERFORMING_ULBS", + "code": "", + "chartType": "bar", + "filter": "", + "headers": [], + "tabName":"Actual" + }, + { + "id": "nocProvisionalTopPerformingUlbs", + "name": "DSS_NOC_PROVISIONAL_TOP_3_PERFORMING_ULBS", + "code": "", + "chartType": "bar", + "filter": "", + "headers": [], + "tabName":"Provisional" + } + ] + }, + { + "id": 322, + "name": "DSS_NOC_BOTTOM_3_PERFORMING_ULBS", + "dimensions": { + "height": 250, + "width": 4 + }, + "vizType": "performing-metric", + "label": "", + "noUnit": false, + "isCollapsible": false, + "charts": [ + { + "id": "nocActualBottomPerformingUlbs", + "name": "DSS_NOC_ACTUAL_BOTTOM_3_PERFORMING_ULBS", + "code": "", + "chartType": "bar", + "filter": "", + "headers": [], + "tabName":"Actual" + }, + { + "id": "nocProvisionalBottomPerformingUlbs", + "name": "DSS_NOC_PROVISIONAL_BOTTOM_3_PERFORMING_ULBS", + "code": "", + "chartType": "bar", + "filter": "", + "headers": [], + "tabName":"Provisional" + } + ] + } + ] + }, + { + "row": 5, + "name": "DSS_OVERVIEW", + "vizArray": [ + { + "id": 231, + "name": "Service Report", + "dimensions": { + "height": 350, + "width": 12 + }, + "vizType": "chart", + "noUnit": false, + "isCollapsible": false, + "charts": [ + { + "id": "nocServiceReportByRegion", + "name": "DSS_NOC_SERVICE_REPORT_REGION", + "code": "", + "chartType": "table", + "filter": "", + "headers": [], + "tabName": "Region" + }, + { + "id": "nocServiceReportByDepartment", + "name": "DSS_NOC_SERVICE_REPORT_DEPARTMENT", + "code": "", + "chartType": "table", + "filter": "", + "headers": [], + "tabName": "Department" + } + ] + } + ] + } + ] + }, + { + "name":"DSS_BUILDING_PLANNING_DASHBOARD", + "id":"obps", + "isActive":"", + "style":"linear", + "visualizations":[ + { + "row": 1, + "name": "DSS_BUILDING_PLANNING", + "vizArray": [ + { + "id": 111, + "name": "DSS_OVERVIEW_REVENUE", + "dimensions": { + "height": 350, + "width": 5 + }, + "vizType": "metric-collection", + "noUnit": true, + "isCollapsible": false, + "label": "DSS_OVERVIEW_REVENUE", + "charts": [ + { + "id": "bpaTodaysCollection", + "name": "DSS_BPA_TODAYS_COLLECTION", + "code": "", + "chartType": "metric", + "filter": "", + "headers": [] + }, + { + "id": "bpaTotalCollection", + "name": "DSS_BPA_TOTAL_COLLECTION", + "code": "", + "chartType": "metric", + "filter": "", + "headers": [] + } + ] + } + ,{ + "id": 112, + "name": "DSS_BPA_TOTAL_CUMULATIVE_COLLECTION", + "dimensions": { + "height": 350, + "width": 7 + }, + "vizType": "chart", + "noUnit": true, + "isCollapsible": false, + "charts": [ + { + "id": "bpaCumulativeCollections", + "name": "Monthly", + "code": "", + "chartType": "line", + "filter": "", + "headers": [] + } + ] + } + ] + }, + { + "row":2, + "name":"DSS_BUILDING_PLANNING", + "vizArray":[ + { + "id": 210, + "name": "DSS_OVERVIEW_SERVICES", + "dimensions": { + "height": 350, + "width": 5 + }, + "vizType": "metric-collection", + "noUnit": true, + "isCollapsible": false, + "label": "DSS_OVERVIEW_SERVICES", + "charts": [ + { + "id": "bpaTotalPlansScrutinized", + "name": "DSS_BPA_TOTAL_PLANS_SCRUTINIZED", + "code": "", + "chartType": "metric", + "filter": "", + "headers": [] + }, + { + "id": "bpaTotalPermitsIssued", + "name": "DSS_BPA_TOTAL_PERMITS_ISSUED", + "code": "", + "chartType": "metric", + "filter": "", + "headers": [] + }, + { + "id": "bpaTotalOCIssued", + "name": "DSS_BPA_TOTAL_OC_ISSUED", + "code": "", + "chartType": "metric", + "filter": "", + "headers": [] + }, + { + "id": "bpaTotalLandApplied", + "name": "DSS_BPA_TOTAL_LAND_APPLIED", + "code": "", + "chartType": "metric", + "filter": "", + "headers": [] + }, + { + "id": "bpaAverageDaysToIssuePermit", + "name": "DSS_BPA_AVERAGE_DAYS_ISSUE_PERMIT", + "code": "", + "chartType": "metric", + "filter": "", + "headers": [] + }, + { + "id": "bpaSLACompliance", + "name": "DSS_BPA_SLA_COMPLIANCE", + "code": "", + "chartType": "metric", + "filter": "", + "headers": [] + }, + { + "id": "bpaAverageDaysToIssueOC", + "name": "DSS_BPA_AVERAGE_DAYS_ISSUE_OC", + "code": "", + "chartType": "metric", + "filter": "", + "headers": [] + }, + { + "id": "bpaSLAComplianceOC", + "name": "DSS_BPA_SLA_COMPLIANCE_OC", + "code": "", + "chartType": "metric", + "filter": "", + "headers": [] + } + ] + }, + { + "id": 211, + "name": "DSS_TOTAL_PERMIT_ISSUED_VS_TOTAL_OC_ISSUED_VS_TOTAL_OC_SUBMITTED", + "dimensions": { + "height": 250, + "width": 7 + }, + "vizType": "chart", + "isCollapsible": false, + "label": "", + "charts": [ + { + "id": "permitsandOCissued", + "name": "Monthly", + "code": "", + "chartType": "line", + "filter": "", + "headers": [] + } + ] + } + ] + }, + { + "row": 3, + "name": "DSS_BUILDING_PLANNING", + "vizArray": [ + { + "id": 323, + "name": "DSS_OBPS_COLLECTION_BY_USAGE_TYPE", + "dimensions": { + "height": 250, + "width": 4 + }, + "vizType": "chart", + "label": "", + "noUnit": false, + "isCollapsible": false, + "charts": [ + { + "id": "obpsCollectionByPaymentMode", + "name": "DSS_OBPS_COLLECTION_BY_PAYMENT_MODE", + "code": "", + "chartType": "donut", + "filter": "", + "headers": [] + } + ] + }, + { + "id": 321, + "name": "DSS_OBPS_TOP_ULB_BY_PERFORMANCE", + "dimensions": { + "height": 250, + "width": 3 + }, + "vizType": "performing-metric", + "label": "", + "noUnit": false, + "isCollapsible": false, + "charts": [ + { + "id": "obpsTopUlbByPerformance", + "name": "Monthly", + "code": "", + "chartType": "bar", + "filter": "", + "headers": [] + } + ] + }, + { + "id": 322, + "name": "DSS_OBPS_BOTTOM_ULB_BY_PERFORMANCE", + "dimensions": { + "height": 250, + "width": 3 + }, + "vizType": "performing-metric", + "label": "", + "noUnit": false, + "isCollapsible": false, + "charts": [ + { + "id": "obpsBottomUlbByPerformance", + "name": "Monthly", + "code": "", + "chartType": "bar", + "filter": "", + "headers": [] + } + ] + } + + ] + }, + { + "row":4, + "name":"DSS_BUILDING_PLANNING", + "vizArray":[ + { + "id":311, + "name":"DSS_BPA_PERMIT_ISSUED_BY_RISK_TYPE", + "dimensions":{ + "height":250, + "width":4 + }, + "vizType":"chart", + "noUnit": false, + "isCollapsible":false, + "charts":[ + { + "id":"permitIssuedByRiskType", + "name":"DSS_BPA_PERMIT_ISSUED_BY_RISK_TYPE", + "code":"", + "chartType":"donut", + "filter":"", + "headers":[ + + ] + } + ] + }, + { + "id":312, + "name":"DSS_BPA_PERMIT_ISSUED_BY_OCCUPANCY_TYPE", + "dimensions":{ + "height":250, + "width":4 + }, + "vizType":"chart", + "noUnit": false, + "isCollapsible":false, + "charts":[ + { + "id":"permitIssuedByOccupancyType", + "name":"DSS_BPA_PERMIT_ISSUED_BY_OCCUPANCY_TYPE", + "code":"", + "chartType":"donut", + "filter":"", + "headers":[ + + ] + } + ] + } + + ] + }, + { + "row": 5, + "name": "DSS_BUILDING_PLANNING", + "vizArray": [ + { + "id": 231, + "name": "DSS_OBPS_SERVICE_REPORT", + "dimensions": { + "height": 350, + "width": 12 + }, + "vizType": "chart", + "noUnit": false, + "isCollapsible": false, + "charts": [ + { + "id": "obpsServiceReport", + "name": "DSS_OBPS_SERVICE_REPORT", + "code": "", + "chartType": "table", + "filter": "", + "headers": [] + } + + ] + } + ] + } + ] } ] } From 83b8957f079c82340d9fb5c5a212b74c493b63d2 Mon Sep 17 00:00:00 2001 From: chinmoy-eGov Date: Thu, 2 Feb 2023 15:33:24 +0530 Subject: [PATCH 1127/1242] UM-5403 --- .../dashboard-analytics/ChartApiConfig.json | 1512 ++++++++++++++++- 1 file changed, 1507 insertions(+), 5 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 1ad58a7d..70ebd524 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -2947,10 +2947,6 @@ }, "_comment": " " }, - - - "_comment": "W&S charts below-----------------------------------------------------------------------", - "wstodaysCollection": { "chartName": "DSS_W&S_TODAYS_COLLECTION", "queries": [ @@ -4094,6 +4090,1512 @@ "insightInterval" : "year" }, "_comment": "FIRE NOC total nocs issued " - } + }, + "mcTodaysCollection": { + "chartName": "DSS_TOTAL_COLLECTION_TODAY", + "queries": [ + { + "module": "COMMON", + "dateRefField": "", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\"}", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pg.testing\",\"pg\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"FSM.TRIP_CHARGES\",\"PT.MUTATION\",\"SW\",\"BPA.LOW_RISK_PERMIT_FEE\",\"BPA.NC_SAN_FEE\",\"BPA.NC_APP_FEE\",\"BPA.NC_OC_APP_FEE\"]}}],\"must\":[{\"range\":{\"dataObject.paymentDetails.receiptDate\":{\"gte\":\"now-1d\",\"lte\":\"now\"}}}]}},\"aggs\":{\"Todays Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" + } + ], + "chartType": "metric", + "valueType": "Amount", + "drillChart": "none", + "documentType": "_doc", + "action": "", + "aggregationPaths": [ + "Todays Collection" + ], + "insight": {}, + "_comment": " " + }, + "mcTotalChallans": { + "chartName": "DSS_MC_TOTAL_CHALLANS", + "queries": [ + { + "module": "CHALLAN", + "dateRefField": "Data.taxPeriodFrom", + "requestQueryMap": "{\"module\" : \"Data.businessService\", \"tenantId\" : \"Data.tenantId\"}", + "indexName": "echallan-services", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pg.testing\"}}]}},\"aggs\":{\"Total Challans\":{\"value_count\":{\"field\":\"Data.challanNo.keyword\"}}}}}}" + } + ], + "chartType": "metric", + "valueType": "number", + "drillChart": "none", + "documentType": "_doc", + "action": "", + "aggregationPaths": [ + "Total Challans" + ], + "insight": { + "chartResponseMap" : "mcTotalChallans", + "action" : "differenceOfNumbers", + "upwardIndicator" : "positive", + "downwardIndicator" : "negative", + "textMessage" : "$indicator$value% than last $insightInterval", + "colorCode" : "#228B22", + "insightInterval" : "year" + }, + "_comment": " " + }, + "mcTotalCategories": { + "chartName": "DSS_MC_TOTAL_CATEGORIES", + "queries": [ + { + "module": "COMMON", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.Bill.billDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.cityDistrictCode\"}", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pg.testing\",\"pg\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"FSM.TRIP_CHARGES\",\"PT.MUTATION\",\"SW\",\"BPA.LOW_RISK_PERMIT_FEE\",\"BPA.NC_SAN_FEE\",\"BPA.NC_APP_FEE\",\"BPA.NC_OC_APP_FEE\"]}}]}},\"aggs\":{\"Total Categories\":{\"cardinality\":{\"field\":\"dataObject.paymentDetails.businessService.keyword\"}}}}}}" + } + ], + "chartType": "metric", + "valueType": "number", + "drillChart": "none", + "documentType": "_doc", + "action": "", + "aggregationPaths": [ + "Total Categories" + ], + "insight": { + + }, + "_comment": " " + }, + "mcCumulativeCollection": { + "chartName": "DSS_TOTAL_CUMULATIVE_COLLECTION", + "queries": [ + { + "module": "COMMON", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\r\n \"module\" : \"dataObject.paymentDetails.businessService.keyword\", \n\"tenantId\" : \"dataObject.tenantId\"}", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pg.testing\",\"pg\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"FSM.TRIP_CHARGES\",\"PT.MUTATION\",\"SW\",\"BPA.LOW_RISK_PERMIT_FEE\",\"BPA.NC_SAN_FEE\",\"BPA.NC_APP_FEE\",\"BPA.NC_OC_APP_FEE\"]}}]}},\"aggs\":{\"Collections\":{\"date_histogram\":{\"field\":\"dataObject.paymentDetails.receiptDate\",\"interval\":\"intervalvalue\"},\"aggs\":{\"Sum\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" + } + ], + "chartType": "line", + "valueType": "amount", + "action": "", + "drillChart": "none", + "documentType": "_doc", + "aggregationPaths": [ + "Collections" + ], + "isCumulative": true, + "interval": "month", + "insight": {}, + "_comment": " " + }, + "mcTargetAchieved": { + "chartName": "DSS_TARGET_ACHIEVED", + "queries": [ + { + "module": "COMMON", + "requestQueryMap": "{\r\n \"module\" : \"businessService.keyword\", \n\"tenantId\" : \"tenantIdForMunicipalCorporation\"}", + "dateRefField": "", + "indexName": "dss-target_v1", + "aggrQuery": "{\"aggs\":{\"Actual collection\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}" + }, + { + "module": "COMMON", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\r\n \"district\" : \"dataObject.tenantData.city.districtCode\", \"module\" : \"dataObject.paymentDetails.businessService.keyword\", \n\"tenantId\" : \"dataObject.tenantId\"}", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pg.testing\",\"pg\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"TL\",\"PT\"]}}]}},\"aggs\":{\"Total Collection3\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" + } + ], + "chartType": "metric", + "valueType": "percentage", + "drillChart": "none", + "isRoundOff": true, + "documentType": "_doc", + "action": "percentage", + "aggregationPaths": [ + "Total Collection3", + "Actual collection" + ], + "insight": { + "chartResponseMap": "targetAchieved", + "action": "differenceOfNumbers", + "upwardIndicator": "positive", + "downwardIndicator": "negative", + "textMessage": "$indicator$value% than last $insightInterval", + "colorCode": "#228B22", + "insightInterval": "month", + }, + "_comment": " " + }, + "mcReceiptsByPaymentMode":{ + "chartName": "DSS_MC_RECEIPTS_BY_PAYMENTMODE", + "queries": [ + { + "module": "COMMON", + "requestQueryMap": "{\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\"}", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pg.testing\",\"pg\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"FSM.TRIP_CHARGES\",\"PT.MUTATION\",\"SW\",\"BPA.LOW_RISK_PERMIT_FEE\",\"BPA.NC_SAN_FEE\",\"BPA.NC_APP_FEE\",\"BPA.NC_OC_APP_FEE\"]}}]}},\"aggs\":{\"Payment Mode\":{\"terms\":{\"field\":\"dataObject.paymentMode.keyword\"},\"aggs\":{\"Total Receipts\":{\"value_count\":{\"field\":\"dataObject.paymentDetails.receiptNumber.keyword\"}}}}}}}}" + } + ], + "chartType": "pie", + "valueType": "number", + "action": "", + "documentType": "_doc", + "drillChart": "none", + "aggregationPaths": [ + "Payment Mode" + ], + "insight": { + }, + "_comment": " Receipts count by payment mode" + }, + "mcCollectionByPaymentType": { + "chartName": "DSS_MC_COLLECTION_BY_PAYMENT_TYPE", + "queries": [ + { + "module": "COMMON", + "requestQueryMap": "{\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\"}", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pg.testing\",\"pg\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"FSM.TRIP_CHARGES\",\"PT.MUTATION\",\"SW\",\"BPA.LOW_RISK_PERMIT_FEE\",\"BPA.NC_SAN_FEE\",\"BPA.NC_APP_FEE\",\"BPA.NC_OC_APP_FEE\"]}}]}},\"aggs\":{\"Payment Mode\":{\"terms\":{\"field\":\"dataObject.paymentMode.keyword\"},\"aggs\":{\"Total collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" + } + ], + "chartType": "pie", + "valueType": "amount", + "action": "", + "documentType": "_doc", + "drillChart": "none", + "aggregationPaths": [ + "Payment Mode" + ], + "insight": {}, + "_comment": "" + }, + "mcChallanCountByStatus": { + "chartName": "DSS_MC_CHALLAN_COUNT_BY_STATUS", + "queries": [ + { + "module": "CHALLAN", + "dateRefField": "Data.taxPeriodFrom", + "requestQueryMap": "{\"module\" : \"Data.businessService\", \"tenantId\" : \"Data.tenantId\"}", + "indexName": "echallan-services", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pg.testing\"}}]}},\"aggs\":{\"Status\":{\"terms\":{\"field\":\"Data.applicationStatus.keyword\"},\"aggs\":{\"Challan Count\":{\"cardinality\":{\"field\":\"Data.challanNo.keyword\"}}}}}}}}" + } + ], + "chartType": "pie", + "valueType": "number", + "action": "", + "drillChart": "none", + "documentType": "_doc", + "aggregationPaths": [ + "Status" + ], + "insight": { + }, + "_comment": " " + }, + "mcReceiptsByStatus":{ + "chartName": "DSS_MC_RECEIPTS_BY_STATUS", + "queries": [ + { + "module": "COMMON", + "requestQueryMap": "{\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\"}", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pg.testing\",\"pg\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"FSM.TRIP_CHARGES\",\"PT.MUTATION\",\"SW\",\"BPA.LOW_RISK_PERMIT_FEE\",\"BPA.NC_SAN_FEE\",\"BPA.NC_APP_FEE\",\"BPA.NC_OC_APP_FEE\"]}}]}},\"aggs\":{\"Payment Status\":{\"terms\":{\"field\":\"dataObject.paymentStatus.keyword\"},\"aggs\":{\"Total Receipts\":{\"value_count\":{\"field\":\"dataObject.paymentDetails.receiptNumber.keyword\"}}}}}}}}" + } + ], + "chartType": "pie", + "valueType": "number", + "action": "", + "documentType": "_doc", + "drillChart": "none", + "aggregationPaths": [ + "Payment Status" + ], + "insight": { + }, + "_comment": " Receipts count by status" + }, + "mcCollectionByStatus":{ + "chartName": "DSS_MC_COLLECTION_BY_STATUS", + "queries": [ + { + "module": "COMMON", + "requestQueryMap": "{\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\"}", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pg.testing\",\"pg\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"FSM.TRIP_CHARGES\",\"PT.MUTATION\",\"SW\",\"BPA.LOW_RISK_PERMIT_FEE\",\"BPA.NC_SAN_FEE\",\"BPA.NC_APP_FEE\",\"BPA.NC_OC_APP_FEE\"]}}]}},\"aggs\":{\"Payment Status\":{\"terms\":{\"field\":\"dataObject.paymentStatus.keyword\"},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" + } + ], + "chartType": "pie", + "valueType": "amount", + "action": "", + "documentType": "_doc", + "drillChart": "none", + "aggregationPaths": [ + "Payment Status" + ], + "insight": { + }, + "_comment": " collection/amount by status" + }, + "mcTotalCollectionCategoryWise": { + "chartName": "DSS_MC_COLLECTION_CATEGORY_WISE", + "queries": [ + { + "module": "COMMON", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.cityDistrictCode\"}", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pg.testing\",\"pg\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"FSM.TRIP_CHARGES\",\"PT.MUTATION\",\"SW\",\"BPA.LOW_RISK_PERMIT_FEE\",\"BPA.NC_SAN_FEE\",\"BPA.NC_APP_FEE\",\"BPA.NC_OC_APP_FEE\"]}}]}},\"aggs\":{\"Business Service\":{\"terms\":{\"field\":\"dataObject.paymentDetails.businessService.keyword\",\"order\":{\"total\":\"desc\"}},\"aggs\":{\"total\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" + } + ], + "chartType": "pie", + "valueType": "amount", + "action": "", + "documentType": "_doc", + "drillChart": "none", + "aggregationPaths": [ + "Business Service" + ], + "insight": {}, + "_comment": " " + }, + "mcMonthlyCollectionReport": { + "chartName": "DSS_MC_MONTHLY_REPORT", + "queries": [ + { + "module": "COMMON", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.Bill.billDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.cityDistrictCode\" }", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pg.testing\",\"pg\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"FSM.TRIP_CHARGES\",\"PT.MUTATION\",\"SW\",\"BPA.LOW_RISK_PERMIT_FEE\",\"BPA.NC_SAN_FEE\",\"BPA.NC_APP_FEE\",\"BPA.NC_OC_APP_FEE\"]}}]}},\"aggs\":{\"Collections\":{\"date_histogram\":{\"field\":\"dataObject.paymentDetails.receiptDate\",\"interval\":\"month\"},\"aggs\":{\"Sum\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}},\"Receipts\":{\"date_histogram\":{\"field\":\"dataObject.paymentDetails.receiptDate\",\"interval\":\"month\"},\"aggs\":{\"Total Receipts\":{\"value_count\":{\"field\":\"dataObject.paymentDetails.receiptNumber.keyword\"}}}}}}}}" + } + ], + "chartType": "line", + "valueType": "amount", + "action": "", + "drillChart": "none", + "documentType": "_doc", + "aggregationPaths": [ + "Collections", + "Receipts" + ], + "pathDataTypeMapping": [ + { + "Collections": "amount" + }, + { + "Receipts": "number" + } + ], + "isCumulative": false, + "interval": "month", + "insight": { + }, + "_comment": " " + }, + "mcReportByDDRv2": { + "chartName": "DSS_MC_REPORT_BY_TENANT", + "queries": [ + { + "module": "COMMON", + "requestQueryMap": "{\"tenantId\" : \"dataObject.tenantId.keyword\"}", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pg.testing\",\"pg\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"FSM.TRIP_CHARGES\",\"PT.MUTATION\",\"SW\",\"BPA.LOW_RISK_PERMIT_FEE\",\"BPA.NC_SAN_FEE\",\"BPA.NC_APP_FEE\",\"BPA.NC_OC_APP_FEE\"]}}]}},\"aggs\":{\"Total_Receipts\":{\"value_count\":{\"field\":\"dataObject.paymentDetails.receiptNumber.keyword\"}},\"MC_TOTAL_COLLECTION\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" + }, + + { + "module": "CHALLAN", + "requestQueryMap": "{\"tenantId\" : \"Data.tenantId.keyword\"}", + "dateRefField": "Data.taxPeriodFrom", + "indexName": "echallan-services", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pg.testing\"}},{\"terms\":{\"Data.businessService.keyword\":[\"TL\",\"PT\"]}}]}},\"aggs\":{\"Total_Challans\":{\"value_count\":{\"field\":\"Data.challanNo.keyword\"}}}}}}" + } + ], + "isMdmsEnabled": true, + "filterKeys": [ + {"key": "tenantId", "column": "DDRs"} + ], + "chartType": "xtable", + "drillChart": "mcReportByTenant", + "plotLabel": "DDRs", + "aggregationPaths": [ + "MC_TOTAL_COLLECTION", + "Total_Challans", + "Total_Receipts" + ], + "pathDataTypeMapping": [ + { + "MC_TOTAL_COLLECTION": "amount" + }, + { + "Total_Challans": "number" + }, + { + "Total_Receipts": "number" + } + ], + + "insight": { + }, + "_comment": "" + }, + "nocTodaysCollection": { + "chartName": "DSS_NOC_TODAYS_COLLECTION", + "queries": [ + { + "module": "FIRENOC", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must\":[{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"FIRENOC\"]}},{\"range\":{\"dataObject.paymentDetails.receiptDate\":{\"gte\":\"now-24h\",\"lte\":\"now\"}}}],\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pg.testing\"}},{\"term\":{\"dataObject.paymentStatus.keyword\":\"Cancelled\"}}]}},\"aggs\":{\"Todays Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}", + "requestQueryMap": "{\"wardId\" : \"dataObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\",\"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", + "dateRefField": "" + } + ], + "chartType": "metric", + "valueType": "amount", + "action": "", + "drillChart": "none", + "aggregationPaths": [ + "Todays Collection" + ], + "insight": { + }, + "_comment": "FIRE NOC todays collections " + }, + "nocCumulativeCollection": { + "chartName": "DSS_NOC_TOTAL_CUMULATIVE_COLLECTION", + "queries": [ + { + "module": "FIRENOC", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\r\n \"module\" : \"dataObject.paymentDetails.businessService.keyword\", \n\"tenantId\" : \"dataObject.tenantId\"}", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must\":[{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"FIRENOC\"]}}],\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pg.testing\"}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"NOC Cumulative Collections\":{\"date_histogram\":{\"field\":\"dataObject.paymentDetails.receiptDate\",\"interval\":\"intervalvalue\"},\"aggs\":{\"Sum\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" + } + ], + "chartType": "line", + "valueType": "amount", + "action": "", + "drillChart": "none", + "documentType": "_doc", + "aggregationPaths": [ + "NOC Cumulative Collections" + ], + "isCumulative": true, + "interval": "month", + "insight": {}, + "_comment": "" + }, + "nocTotalApplications": { + "chartName": "DSS_NOC_TOTAL_APPLICATIONS", + "queries": [ + { + "module": "FIRENOC", + "indexName": "firenoc-services", + "aggrQuery": "{\"aggs\":{\"FireNOC\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pg.testing\"}}]}},\"aggs\":{\"Total Applications\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}}", + "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\",\"tenantId\" : \"Data.tenantId\", \"district\" : \"Data.tenantData.city.districtCode\"}", + "dateRefField": "Data.auditDetails.createdTime" + } + ], + "chartType": "metric", + "valueType": "number", + "action": "", + "drillChart": "none", + "aggregationPaths": [ + "Total Applications" + ], + "insight": { + "chartResponseMap" : "nocTotalApplications", + "action" : "differenceOfNumbers", + "upwardIndicator" : "positive", + "downwardIndicator" : "negative", + "textMessage" : "$indicator$value% than last $insightInterval", + "colorCode" : "#228B22", + "insightInterval" : "year" + }, + "_comment": "FIRE NOC total applications " + }, + "nocProvisionalIssued": { + "chartName": "DSS_NOC_PROVISIONAL_ISSUED", + "queries": [ + { + "module": "FIRENOC", + "indexName": "firenoc-services", + "aggrQuery": "{\"aggs\":{\"FireNOC\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pg.testing\"}}]}},\"aggs\":{\"Provisional Fire Nocs issued\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"Data.fireNOCDetails.fireNOCType.keyword\":\"PROVISIONAL\"}}]}}}}}}}", + "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\",\"tenantId\" : \"Data.tenantId\", \"district\" : \"Data.tenantData.city.districtCode\"}", + "dateRefField": "Data.auditDetails.createdTime" + } + ], + "chartType": "metric", + "valueType": "number", + "action": "", + "drillChart": "none", + "aggregationPaths": [ + "Provisional Fire Nocs issued" + ], + "insight": { + "chartResponseMap" : "nocProvisionalIssued", + "action" : "differenceOfNumbers", + "upwardIndicator" : "positive", + "downwardIndicator" : "negative", + "textMessage" : "$indicator$value% than last $insightInterval", + "colorCode" : "#228B22", + "insightInterval" : "year" + }, + "_comment": "FIRE NOC Provisional Issued" + }, + "nocActualIssued": { + "chartName": "DSS_NOC_ACTUAL_ISSUED", + "queries": [ + { + "module": "FIRENOC", + "indexName": "firenoc-services", + "aggrQuery": "{\"aggs\":{\"FireNOC\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pg.testing\"}}]}},\"aggs\":{\"Actual Fire Nocs issued\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"Data.fireNOCDetails.fireNOCType.keyword\":\"NEW\"}}]}}}}}}}", + "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\",\"tenantId\" : \"Data.tenantId\", \"district\" : \"Data.tenantData.city.districtCode\"}", + "dateRefField": "Data.auditDetails.createdTime" + } + ], + "chartType": "metric", + "valueType": "number", + "action": "", + "drillChart": "none", + "aggregationPaths": [ + "Actual Fire Nocs issued" + ], + "insight": { + "chartResponseMap" : "nocActualIssued", + "action" : "differenceOfNumbers", + "upwardIndicator" : "positive", + "downwardIndicator" : "negative", + "textMessage" : "$indicator$value% than last $insightInterval", + "colorCode" : "#228B22", + "insightInterval" : "year" + }, + "_comment": "Actual fire nocs Issued" + }, + "nocSLAComplianceProvisional": { + "chartName": "DSS_NOC_SLA_COMPLIANCE_PROVISIONAL", + "queries": [ + { + "module": "FIRENOC", + "indexName": "firenoc-services", + "aggrQuery": "{\"aggs\":{\"FireNOC\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pg.testing\"}}]}},\"aggs\":{\"SLA Compliance (Provisional NOC)\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"Data.fireNOCDetails.fireNOCType.keyword\":\"PROVISIONAL\"}},{\"term\":{\"Data.fireNOCDetails.status.keyword\":\"APPROVED\"}},{\"script\":{\"script\":{\"source\":\"doc['Data.auditDetails.lastModifiedTime'].value-doc['Data.auditDetails.createdTime'].value Date: Thu, 2 Feb 2023 15:43:09 +0530 Subject: [PATCH 1128/1242] UM-5403 --- .../dashboard-analytics/ChartApiConfig.json | 589 +----------------- 1 file changed, 1 insertion(+), 588 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 70ebd524..0cd9c848 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -5007,595 +5007,8 @@ "insight": { }, "_comment": "" - }, - "bpaTodaysCollection": { - "chartName": "DSS_BPA_TODAYS_COLLECTION", - "queries": [ - { - "module": "BPA", - "indexName": "dss-collection_v2", - "aggrQuery": "{ \"aggs\": { \"AGGR\": { \"filter\": { \"bool\": { \"must\": [ { \"range\": { \"dataObject.paymentDetails.receiptDate\": { \"gte\": \"now-24h\", \"lte\": \"now\" } } }, { \"terms\": { \"dataObject.paymentDetails.businessService.keyword\": [ \"BPA.LOW_RISK_PERMIT_FEE\",\"BPA.NC_APP_FEE\",\"BPA.NC_SAN_FEE\",\"BPA.NC_OC_APP_FEE\" ] } } ], \"must_not\": [ { \"term\": { \"dataObject.tenantId.keyword\": \"pg.testing\" } }, { \"term\": { \"dataObject.paymentStatus.keyword\": \"Cancelled\" } } ] } }, \"aggs\": { \"Today's Collection\": { \"sum\": { \"field\": \"dataObject.paymentDetails.totalAmountPaid\" } } } } } }", - "requestQueryMap":"{\"wardId\" : \"dataObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\",\"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", - "dateRefField": "" - } - ], - "chartType": "metric", - "valueType": "amount", - "action": "", - "drillChart": "none", - "aggregationPaths": [ - "Today's Collection" - ], - "insight": { - - }, - "_comment": "BPA Today's collections " - }, - "bpaTotalCollection": { - "chartName": "DSS_BPA_TOTAL_COLLECTION", - "queries": [ - { - "module": "OBPS", - "indexName": "dss-collection_v2", - "aggrQuery": " { \"aggs\": { \"AGGR\": { \"filter\": { \"bool\": { \"must\": [ { \"terms\": { \"dataObject.paymentDetails.businessService.keyword\": [ \"BPA.LOW_RISK_PERMIT_FEE\",\"BPA.NC_APP_FEE\",\"BPA.NC_SAN_FEE\",\"BPA.NC_OC_APP_FEE\" ] } } ], \"must_not\": [ { \"term\": { \"dataObject.tenantId.keyword\": \"pg.testing\" } }, { \"term\": { \"dataObject.paymentStatus.keyword\": \"Cancelled\" } } ] } }, \"aggs\": { \"Total Collection\": { \"sum\": { \"field\": \"dataObject.paymentDetails.totalAmountPaid\" } } } } } } ", - "requestQueryMap":"{\"wardId\" : \"dataObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\",\"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", - "dateRefField": "dataObject.paymentDetails.receiptDate" - } - ], - "translateTenantCode": false, - "chartType": "metric", - "valueType": "amount", - "action": "", - "drillChart": "none", - "aggregationPaths": [ - "Total Collection" - ], - "insight": { - "chartResponseMap" : "bpaTotalCollection", - "action" : "differenceOfNumbers", - "upwardIndicator" : "positive", - "downwardIndicator" : "negative", - "textMessage" : "$indicator$value% than last $insightInterval", - "colorCode" : "#228B22", - "insightInterval" : "year" - }, - "_comment": "BPA total collections " - }, - "bpaCumulativeCollections": { - "chartName": "DSS_BPA_TOTAL_CUMULATIVE_COLLECTION", - "queries": [ - { - "module": "OBPS", - "dateRefField": "dataObject.paymentDetails.receiptDate", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\r\n \"module\" : \"dataObject.paymentDetails.businessService.keyword\", \n\"tenantId\" : \"dataObject.tenantId\"}", - "indexName": "dss-collection_v2", - "aggrQuery": "{ \"aggs\": { \"AGGR\": { \"filter\": { \"bool\": { \"must\": [ { \"terms\": { \"dataObject.paymentStatus.keyword\": [ \"DEPOSITED\", \"NEW\" ] } }, { \"terms\": { \"dataObject.paymentDetails.businessService.keyword\": [ \"BPA.LOW_RISK_PERMIT_FEE\",\"BPA.NC_APP_FEE\",\"BPA.NC_SAN_FEE\",\"BPA.NC_OC_APP_FEE\" ] } } ], \"must_not\": [ { \"term\": { \"dataObject.tenantId.keyword\": \"pg.testing\" } }, { \"terms\": { \"dataObject.bill.status.keyword\": [ \"Cancelled\" ] } } ] } }, \"aggs\": { \"BPA Cumulative Collections\": { \"date_histogram\": { \"field\": \"dataObject.paymentDetails.receiptDate\", \"interval\": \"intervalvalue\" }, \"aggs\": { \"Sum\": { \"sum\": { \"field\": \"dataObject.paymentDetails.totalAmountPaid\" } } } } } } } }" } - ], - "translateTenantCode": false, - "chartType": "line", - "valueType": "amount", - "action": "", - "drillChart": "none", - "documentType": "_doc", - "aggregationPaths": [ - "BPA Cumulative Collections" - ], - "isCumulative": true, - "interval": "month", - "insight": { - }, - "_comment": "Total Cumulative Collection" - }, - "bpaTotalPlansScrutinized": { - "chartName": "DSS_BPA_TOTAL_PLANS_SCRUTINIZED", - "queries": [ - { - "module": "OBPS", - "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\",\"tenantId\" : \"Data.tenantId\" \r\n}", - "dateRefField": "Data.@timestamp", - "indexName": "edcr-index", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pg.testing\"}}],\"must\":[{\"terms\":{\"Data.applicationType.keyword\":[\"PERMIT\",\"OCCUPANCY_CERTIFICATE\"]}}]}},\"aggs\":{\"Total Plans Scrutnized\":{\"value_count\":{\"field\":\"Data.dcrNumber.keyword\"}}}}}}" - } - ], - "chartType": "metric", - "valueType": "number", - "drillChart": "none", - "documentType": "_doc", - "action": "", - "aggregationPaths": [ - "Total Plans Scrutnized" - ], - "insight": { - "chartResponseMap" : "bpaTotalPlansScrutinized", - "action" : "differenceOfNumbers", - "upwardIndicator" : "positive", - "downwardIndicator" : "negative", - "textMessage" : "$indicator$value% than last $insightInterval", - "colorCode" : "#228B22", - "insightInterval" : "year" - }, - "_comment": " Total Number of Complaints " - }, - "bpaTotalPermitsIssued": { - "chartName": "DSS_BPA_TOTAL_PERMITS_ISSUED", - "queries": [ - { - "module": "OBPS", - "indexName": "bpa-index", - "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\",\"tenantId\" : \"Data.tenantId\" \r\n}", - "aggrQuery": "{ \"aggs\": { \"AGGR\": { \"filter\": { \"bool\": { \"must_not\": [ { \"term\": { \"Data.tenantId.keyword\": \"pg.testing\" } } ], \"must\": [ { \"term\": { \"Data.status.keyword\": \"APPROVED\" } }, { \"terms\": { \"Data.businessService.keyword\": [\"BPA\",\"BPA_LOW\"] } } ] } }, \"aggs\": { \"Total Permits Issued\": { \"value_count\": { \"field\": \"Data.applicationNo.keyword\" } } } } } }", - "dateRefField": "Data.@timestamp" - } - ], - "translateTenantCode": false, - "chartType": "metric", - "valueType": "number", - "action": "", - "drillChart": "none", - "aggregationPaths": [ - "Total Permits Issued" - ], - "insight": { - "chartResponseMap" : "bpaTotalPermitsIssued", - "action" : "differenceOfNumbers", - "upwardIndicator" : "positive", - "downwardIndicator" : "negative", - "textMessage" : "$indicator$value% than last $insightInterval", - "colorCode" : "#228B22", - "insightInterval" : "year", - }, - "_comment": "Total Permits Issued" - }, - "bpaTotalOCIssued": { - "chartName": "DSS_BPA_TOTAL_OC_ISSUED", - "queries": [ - { - "module": "OBPS", - "indexName": "bpa-index", - "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\",\"tenantId\" : \"Data.tenantId\" \r\n}", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pg.testing\"}}],\"must\":[{\"term\":{\"Data.status.keyword\":\"APPROVED\"}},{\"terms\":{\"Data.businessService.keyword\":[\"BPA_OC\"]}}]}},\"aggs\":{\"Total OC Issued\":{\"value_count\":{\"field\":\"Data.applicationNo.keyword\"}}}}}}", - "dateRefField": "Data.@timestamp" - } - ], - "translateTenantCode": false, - "chartType": "metric", - "valueType": "number", - "action": "", - "drillChart": "none", - "aggregationPaths": [ - "Total OC Issued" - ], - "insight": { - "chartResponseMap" : "bpaTotalOCIssued", - "action" : "differenceOfNumbers", - "upwardIndicator" : "positive", - "downwardIndicator" : "negative", - "textMessage" : "$indicator$value% than last $insightInterval", - "colorCode" : "#228B22", - "insightInterval" : "year" - }, - "_comment": "Total OC Issued" - }, - "bpaTotalLandApplied": { - "chartName": "DSS_BPA_TOTAL_LAND_APPLIED", - "queries": [ - { - "module": "OBPS", - "indexName": "bpa-index", - "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\",\"tenantId\" : \"Data.tenantId\" \r\n}", - "aggrQuery":"{ \"aggs\": { \"AGGR\": { \"filter\": { \"bool\": { \"must_not\": [ { \"term\": { \"Data.tenantId.keyword\": \"pg.testing\" } } ], \"must\": [ { \"terms\": { \"Data.businessService.keyword\": [\"BPA\",\"BPA_LOW\",\"BPA_OC\"] } } ] } }, \"aggs\": { \"Total Land Applied\": { \"sum\": { \"field\": \"Data.plotArea\" } } } } } }", - "dateRefField": "Data.@timestamp" - } - ], - "translateTenantCode": false, - "chartType": "metric", - "valueType": "number", - "action": "", - "drillChart": "none", - "aggregationPaths": [ - "Total Land Applied" - ], - "insight": { - "chartResponseMap" : "bpaTotalLandApplied", - "action" : "differenceOfNumbers", - "upwardIndicator" : "positive", - "downwardIndicator" : "negative", - "textMessage" : "$indicator$value% than last $insightInterval", - "colorCode" : "#228B22", - "insightInterval" : "year" - }, - "_comment": "Total Land Applied" - }, - - "bpaAverageDaysToIssuePermit": { - "chartName": "DSS_BPA_AVERAGE_DAYS_ISSUE_PERMIT", - "queries": [ - { - "module": "OBPS", - "indexName": "bpa-index", - "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\",\"tenantId\" : \"Data.tenantId\" \r\n}", - "aggrQuery":"{ \"aggs\": { \"BPA\": { \"filter\": { \"bool\": { \"must_not\": [ { \"term\": { \"Data.tenantId.keyword\": \"pg.testing\" } } ] } }, \"aggs\": { \"Average days to issue Permit\": { \"filter\": { \"bool\": { \"must\": [ { \"terms\": { \"Data.businessService.keyword\": [\"BPA\",\"BPA_LOW\"] } }, { \"term\": { \"Data.status.keyword\": \"APPROVED\" } } ] } }, \"aggs\": { \"average_days\": { \"avg\": { \"script\": { \"source\": \"(doc['Data.auditDetails.lastModifiedTime'].value-doc['Data.auditDetails.createdTime'].value)/(86400*1000)\" } } } } } } } } }", - "dateRefField": "Data.@timestamp" - } - ], - "translateTenantCode": false, - "chartType": "metric", - "valueType": "number", - "action": "", - "drillChart": "none", - "aggregationPaths": [ - "Average days to issue Permit" - ], - "insight": { - "chartResponseMap" : "bpaAverageDaysToIssuePermit", - "action" : "differenceOfNumbers", - "upwardIndicator" : "positive", - "downwardIndicator" : "negative", - "textMessage" : "$indicator$value% than last $insightInterval", - "colorCode" : "#228B22", - "insightInterval" : "year" - }, - "_comment": "Average days to issue Permit" - }, - "bpaSLACompliance": { - "chartName": "DSS_BPA_SLA_COMPLIANCE", - "queries": [ - { - "module": "OBPS", - "indexName": "bpa-index", - "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\",\"tenantId\" : \"Data.tenantId\" \r\n}", - "aggrQuery":"{ \"aggs\": { \"BPA\": { \"filter\": { \"bool\": { \"must_not\": [ { \"term\": { \"Data.tenantId.keyword\": \"pg.testing\" } } ] } }, \"aggs\": { \"SLA Compliance Permit\": { \"filter\": { \"bool\": { \"must\": [ { \"terms\": { \"Data.businessService.keyword\": [\"BPA\",\"BPA_LOW\"] } }, { \"term\": { \"Data.status.keyword\": \"APPROVED\" } }, { \"script\": { \"script\": { \"source\": \"doc['Data.auditDetails.lastModifiedTime'].value-doc['Data.auditDetails.createdTime'].value Date: Fri, 3 Feb 2023 17:00:57 +0530 Subject: [PATCH 1129/1242] UM-5403 Removed FSM and BPA from aggrQuery --- .../dashboard-analytics/ChartApiConfig.json | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 0cd9c848..a78ed15a 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -3981,7 +3981,7 @@ "dateRefField": "dataObject.paymentDetails.receiptDate", "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\"}", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pg.testing\",\"pg\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"FSM.TRIP_CHARGES\",\"PT.MUTATION\",\"SW\",\"BPA.LOW_RISK_PERMIT_FEE\",\"BPA.NC_SAN_FEE\",\"BPA.NC_APP_FEE\",\"BPA.NC_OC_APP_FEE\"]}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pg.testing\",\"pg\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"PT.MUTATION\",\"SW\"]}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" } ], "chartType": "metric", @@ -4011,7 +4011,7 @@ "dateRefField": "dataObject.paymentDetails.receiptDate", "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.Bill.billDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.cityDistrictCode\"}", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pg.testing\",\"pg\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"FSM.TRIP_CHARGES\",\"PT.MUTATION\",\"SW\",\"BPA.LOW_RISK_PERMIT_FEE\",\"BPA.NC_SAN_FEE\",\"BPA.NC_APP_FEE\",\"BPA.NC_OC_APP_FEE\"]}}]}},\"aggs\":{\"Total Receipts\":{\"value_count\":{\"field\":\"dataObject.paymentDetails.receiptNumber.keyword\"}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pg.testing\",\"pg\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"PT.MUTATION\",\"SW\"]}}]}},\"aggs\":{\"Total Receipts\":{\"value_count\":{\"field\":\"dataObject.paymentDetails.receiptNumber.keyword\"}}}}}}" } ], "chartType": "metric", @@ -4099,7 +4099,7 @@ "dateRefField": "", "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\"}", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pg.testing\",\"pg\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"FSM.TRIP_CHARGES\",\"PT.MUTATION\",\"SW\",\"BPA.LOW_RISK_PERMIT_FEE\",\"BPA.NC_SAN_FEE\",\"BPA.NC_APP_FEE\",\"BPA.NC_OC_APP_FEE\"]}}],\"must\":[{\"range\":{\"dataObject.paymentDetails.receiptDate\":{\"gte\":\"now-1d\",\"lte\":\"now\"}}}]}},\"aggs\":{\"Todays Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pg.testing\",\"pg\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"PT.MUTATION\",\"SW\"]}}],\"must\":[{\"range\":{\"dataObject.paymentDetails.receiptDate\":{\"gte\":\"now-1d\",\"lte\":\"now\"}}}]}},\"aggs\":{\"Todays Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" } ], "chartType": "metric", @@ -4151,7 +4151,7 @@ "dateRefField": "dataObject.paymentDetails.receiptDate", "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.Bill.billDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.cityDistrictCode\"}", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pg.testing\",\"pg\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"FSM.TRIP_CHARGES\",\"PT.MUTATION\",\"SW\",\"BPA.LOW_RISK_PERMIT_FEE\",\"BPA.NC_SAN_FEE\",\"BPA.NC_APP_FEE\",\"BPA.NC_OC_APP_FEE\"]}}]}},\"aggs\":{\"Total Categories\":{\"cardinality\":{\"field\":\"dataObject.paymentDetails.businessService.keyword\"}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pg.testing\",\"pg\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"PT.MUTATION\",\"SW\"]}}]}},\"aggs\":{\"Total Categories\":{\"cardinality\":{\"field\":\"dataObject.paymentDetails.businessService.keyword\"}}}}}}" } ], "chartType": "metric", @@ -4175,7 +4175,7 @@ "dateRefField": "dataObject.paymentDetails.receiptDate", "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\r\n \"module\" : \"dataObject.paymentDetails.businessService.keyword\", \n\"tenantId\" : \"dataObject.tenantId\"}", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pg.testing\",\"pg\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"FSM.TRIP_CHARGES\",\"PT.MUTATION\",\"SW\",\"BPA.LOW_RISK_PERMIT_FEE\",\"BPA.NC_SAN_FEE\",\"BPA.NC_APP_FEE\",\"BPA.NC_OC_APP_FEE\"]}}]}},\"aggs\":{\"Collections\":{\"date_histogram\":{\"field\":\"dataObject.paymentDetails.receiptDate\",\"interval\":\"intervalvalue\"},\"aggs\":{\"Sum\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pg.testing\",\"pg\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"PT.MUTATION\",\"SW\"]}}]}},\"aggs\":{\"Collections\":{\"date_histogram\":{\"field\":\"dataObject.paymentDetails.receiptDate\",\"interval\":\"intervalvalue\"},\"aggs\":{\"Sum\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" } ], "chartType": "line", @@ -4238,7 +4238,7 @@ "requestQueryMap": "{\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\"}", "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pg.testing\",\"pg\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"FSM.TRIP_CHARGES\",\"PT.MUTATION\",\"SW\",\"BPA.LOW_RISK_PERMIT_FEE\",\"BPA.NC_SAN_FEE\",\"BPA.NC_APP_FEE\",\"BPA.NC_OC_APP_FEE\"]}}]}},\"aggs\":{\"Payment Mode\":{\"terms\":{\"field\":\"dataObject.paymentMode.keyword\"},\"aggs\":{\"Total Receipts\":{\"value_count\":{\"field\":\"dataObject.paymentDetails.receiptNumber.keyword\"}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pg.testing\",\"pg\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"PT.MUTATION\",\"SW\",]}}]}},\"aggs\":{\"Payment Mode\":{\"terms\":{\"field\":\"dataObject.paymentMode.keyword\"},\"aggs\":{\"Total Receipts\":{\"value_count\":{\"field\":\"dataObject.paymentDetails.receiptNumber.keyword\"}}}}}}}}" } ], "chartType": "pie", @@ -4261,7 +4261,7 @@ "requestQueryMap": "{\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\"}", "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pg.testing\",\"pg\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"FSM.TRIP_CHARGES\",\"PT.MUTATION\",\"SW\",\"BPA.LOW_RISK_PERMIT_FEE\",\"BPA.NC_SAN_FEE\",\"BPA.NC_APP_FEE\",\"BPA.NC_OC_APP_FEE\"]}}]}},\"aggs\":{\"Payment Mode\":{\"terms\":{\"field\":\"dataObject.paymentMode.keyword\"},\"aggs\":{\"Total collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pg.testing\",\"pg\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"PT.MUTATION\",\"SW\"]}}]}},\"aggs\":{\"Payment Mode\":{\"terms\":{\"field\":\"dataObject.paymentMode.keyword\"},\"aggs\":{\"Total collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" } ], "chartType": "pie", @@ -4306,7 +4306,7 @@ "requestQueryMap": "{\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\"}", "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pg.testing\",\"pg\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"FSM.TRIP_CHARGES\",\"PT.MUTATION\",\"SW\",\"BPA.LOW_RISK_PERMIT_FEE\",\"BPA.NC_SAN_FEE\",\"BPA.NC_APP_FEE\",\"BPA.NC_OC_APP_FEE\"]}}]}},\"aggs\":{\"Payment Status\":{\"terms\":{\"field\":\"dataObject.paymentStatus.keyword\"},\"aggs\":{\"Total Receipts\":{\"value_count\":{\"field\":\"dataObject.paymentDetails.receiptNumber.keyword\"}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pg.testing\",\"pg\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"PT.MUTATION\",\"SW\"]}}]}},\"aggs\":{\"Payment Status\":{\"terms\":{\"field\":\"dataObject.paymentStatus.keyword\"},\"aggs\":{\"Total Receipts\":{\"value_count\":{\"field\":\"dataObject.paymentDetails.receiptNumber.keyword\"}}}}}}}}" } ], "chartType": "pie", @@ -4329,7 +4329,7 @@ "requestQueryMap": "{\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\"}", "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pg.testing\",\"pg\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"FSM.TRIP_CHARGES\",\"PT.MUTATION\",\"SW\",\"BPA.LOW_RISK_PERMIT_FEE\",\"BPA.NC_SAN_FEE\",\"BPA.NC_APP_FEE\",\"BPA.NC_OC_APP_FEE\"]}}]}},\"aggs\":{\"Payment Status\":{\"terms\":{\"field\":\"dataObject.paymentStatus.keyword\"},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pg.testing\",\"pg\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"PT.MUTATION\",\"SW\"]}}]}},\"aggs\":{\"Payment Status\":{\"terms\":{\"field\":\"dataObject.paymentStatus.keyword\"},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" } ], "chartType": "pie", @@ -4352,7 +4352,7 @@ "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.cityDistrictCode\"}", "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pg.testing\",\"pg\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"FSM.TRIP_CHARGES\",\"PT.MUTATION\",\"SW\",\"BPA.LOW_RISK_PERMIT_FEE\",\"BPA.NC_SAN_FEE\",\"BPA.NC_APP_FEE\",\"BPA.NC_OC_APP_FEE\"]}}]}},\"aggs\":{\"Business Service\":{\"terms\":{\"field\":\"dataObject.paymentDetails.businessService.keyword\",\"order\":{\"total\":\"desc\"}},\"aggs\":{\"total\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pg.testing\",\"pg\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"PT.MUTATION\",\"SW\"]}}]}},\"aggs\":{\"Business Service\":{\"terms\":{\"field\":\"dataObject.paymentDetails.businessService.keyword\",\"order\":{\"total\":\"desc\"}},\"aggs\":{\"total\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" } ], "chartType": "pie", @@ -4374,7 +4374,7 @@ "dateRefField": "dataObject.paymentDetails.receiptDate", "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.Bill.billDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.cityDistrictCode\" }", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pg.testing\",\"pg\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"FSM.TRIP_CHARGES\",\"PT.MUTATION\",\"SW\",\"BPA.LOW_RISK_PERMIT_FEE\",\"BPA.NC_SAN_FEE\",\"BPA.NC_APP_FEE\",\"BPA.NC_OC_APP_FEE\"]}}]}},\"aggs\":{\"Collections\":{\"date_histogram\":{\"field\":\"dataObject.paymentDetails.receiptDate\",\"interval\":\"month\"},\"aggs\":{\"Sum\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}},\"Receipts\":{\"date_histogram\":{\"field\":\"dataObject.paymentDetails.receiptDate\",\"interval\":\"month\"},\"aggs\":{\"Total Receipts\":{\"value_count\":{\"field\":\"dataObject.paymentDetails.receiptNumber.keyword\"}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pg.testing\",\"pg\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"PT.MUTATION\",\"SW\"]}}]}},\"aggs\":{\"Collections\":{\"date_histogram\":{\"field\":\"dataObject.paymentDetails.receiptDate\",\"interval\":\"month\"},\"aggs\":{\"Sum\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}},\"Receipts\":{\"date_histogram\":{\"field\":\"dataObject.paymentDetails.receiptDate\",\"interval\":\"month\"},\"aggs\":{\"Total Receipts\":{\"value_count\":{\"field\":\"dataObject.paymentDetails.receiptNumber.keyword\"}}}}}}}}" } ], "chartType": "line", @@ -4408,7 +4408,7 @@ "requestQueryMap": "{\"tenantId\" : \"dataObject.tenantId.keyword\"}", "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pg.testing\",\"pg\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"FSM.TRIP_CHARGES\",\"PT.MUTATION\",\"SW\",\"BPA.LOW_RISK_PERMIT_FEE\",\"BPA.NC_SAN_FEE\",\"BPA.NC_APP_FEE\",\"BPA.NC_OC_APP_FEE\"]}}]}},\"aggs\":{\"Total_Receipts\":{\"value_count\":{\"field\":\"dataObject.paymentDetails.receiptNumber.keyword\"}},\"MC_TOTAL_COLLECTION\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pg.testing\",\"pg\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"PT.MUTATION\",\"SW\"]}}]}},\"aggs\":{\"Total_Receipts\":{\"value_count\":{\"field\":\"dataObject.paymentDetails.receiptNumber.keyword\"}},\"MC_TOTAL_COLLECTION\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" }, { From f516e993d82fef18dede47111d6bf49e2a80f542 Mon Sep 17 00:00:00 2001 From: chinmoy-eGov Date: Wed, 8 Feb 2023 11:56:26 +0530 Subject: [PATCH 1130/1242] UM-5403 --- .../dashboard-analytics/ChartApiConfig.json | 562 +----------------- 1 file changed, 1 insertion(+), 561 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index a78ed15a..54282aa0 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -4447,567 +4447,7 @@ }, "_comment": "" }, - "nocTodaysCollection": { - "chartName": "DSS_NOC_TODAYS_COLLECTION", - "queries": [ - { - "module": "FIRENOC", - "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must\":[{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"FIRENOC\"]}},{\"range\":{\"dataObject.paymentDetails.receiptDate\":{\"gte\":\"now-24h\",\"lte\":\"now\"}}}],\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pg.testing\"}},{\"term\":{\"dataObject.paymentStatus.keyword\":\"Cancelled\"}}]}},\"aggs\":{\"Todays Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}", - "requestQueryMap": "{\"wardId\" : \"dataObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\",\"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", - "dateRefField": "" - } - ], - "chartType": "metric", - "valueType": "amount", - "action": "", - "drillChart": "none", - "aggregationPaths": [ - "Todays Collection" - ], - "insight": { - }, - "_comment": "FIRE NOC todays collections " - }, - "nocCumulativeCollection": { - "chartName": "DSS_NOC_TOTAL_CUMULATIVE_COLLECTION", - "queries": [ - { - "module": "FIRENOC", - "dateRefField": "dataObject.paymentDetails.receiptDate", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\r\n \"module\" : \"dataObject.paymentDetails.businessService.keyword\", \n\"tenantId\" : \"dataObject.tenantId\"}", - "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must\":[{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"FIRENOC\"]}}],\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pg.testing\"}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"NOC Cumulative Collections\":{\"date_histogram\":{\"field\":\"dataObject.paymentDetails.receiptDate\",\"interval\":\"intervalvalue\"},\"aggs\":{\"Sum\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" - } - ], - "chartType": "line", - "valueType": "amount", - "action": "", - "drillChart": "none", - "documentType": "_doc", - "aggregationPaths": [ - "NOC Cumulative Collections" - ], - "isCumulative": true, - "interval": "month", - "insight": {}, - "_comment": "" - }, - "nocTotalApplications": { - "chartName": "DSS_NOC_TOTAL_APPLICATIONS", - "queries": [ - { - "module": "FIRENOC", - "indexName": "firenoc-services", - "aggrQuery": "{\"aggs\":{\"FireNOC\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pg.testing\"}}]}},\"aggs\":{\"Total Applications\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}}", - "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\",\"tenantId\" : \"Data.tenantId\", \"district\" : \"Data.tenantData.city.districtCode\"}", - "dateRefField": "Data.auditDetails.createdTime" - } - ], - "chartType": "metric", - "valueType": "number", - "action": "", - "drillChart": "none", - "aggregationPaths": [ - "Total Applications" - ], - "insight": { - "chartResponseMap" : "nocTotalApplications", - "action" : "differenceOfNumbers", - "upwardIndicator" : "positive", - "downwardIndicator" : "negative", - "textMessage" : "$indicator$value% than last $insightInterval", - "colorCode" : "#228B22", - "insightInterval" : "year" - }, - "_comment": "FIRE NOC total applications " - }, - "nocProvisionalIssued": { - "chartName": "DSS_NOC_PROVISIONAL_ISSUED", - "queries": [ - { - "module": "FIRENOC", - "indexName": "firenoc-services", - "aggrQuery": "{\"aggs\":{\"FireNOC\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pg.testing\"}}]}},\"aggs\":{\"Provisional Fire Nocs issued\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"Data.fireNOCDetails.fireNOCType.keyword\":\"PROVISIONAL\"}}]}}}}}}}", - "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\",\"tenantId\" : \"Data.tenantId\", \"district\" : \"Data.tenantData.city.districtCode\"}", - "dateRefField": "Data.auditDetails.createdTime" - } - ], - "chartType": "metric", - "valueType": "number", - "action": "", - "drillChart": "none", - "aggregationPaths": [ - "Provisional Fire Nocs issued" - ], - "insight": { - "chartResponseMap" : "nocProvisionalIssued", - "action" : "differenceOfNumbers", - "upwardIndicator" : "positive", - "downwardIndicator" : "negative", - "textMessage" : "$indicator$value% than last $insightInterval", - "colorCode" : "#228B22", - "insightInterval" : "year" - }, - "_comment": "FIRE NOC Provisional Issued" - }, - "nocActualIssued": { - "chartName": "DSS_NOC_ACTUAL_ISSUED", - "queries": [ - { - "module": "FIRENOC", - "indexName": "firenoc-services", - "aggrQuery": "{\"aggs\":{\"FireNOC\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pg.testing\"}}]}},\"aggs\":{\"Actual Fire Nocs issued\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"Data.fireNOCDetails.fireNOCType.keyword\":\"NEW\"}}]}}}}}}}", - "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\",\"tenantId\" : \"Data.tenantId\", \"district\" : \"Data.tenantData.city.districtCode\"}", - "dateRefField": "Data.auditDetails.createdTime" - } - ], - "chartType": "metric", - "valueType": "number", - "action": "", - "drillChart": "none", - "aggregationPaths": [ - "Actual Fire Nocs issued" - ], - "insight": { - "chartResponseMap" : "nocActualIssued", - "action" : "differenceOfNumbers", - "upwardIndicator" : "positive", - "downwardIndicator" : "negative", - "textMessage" : "$indicator$value% than last $insightInterval", - "colorCode" : "#228B22", - "insightInterval" : "year" - }, - "_comment": "Actual fire nocs Issued" - }, - "nocSLAComplianceProvisional": { - "chartName": "DSS_NOC_SLA_COMPLIANCE_PROVISIONAL", - "queries": [ - { - "module": "FIRENOC", - "indexName": "firenoc-services", - "aggrQuery": "{\"aggs\":{\"FireNOC\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pg.testing\"}}]}},\"aggs\":{\"SLA Compliance (Provisional NOC)\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"Data.fireNOCDetails.fireNOCType.keyword\":\"PROVISIONAL\"}},{\"term\":{\"Data.fireNOCDetails.status.keyword\":\"APPROVED\"}},{\"script\":{\"script\":{\"source\":\"doc['Data.auditDetails.lastModifiedTime'].value-doc['Data.auditDetails.createdTime'].value Date: Wed, 8 Feb 2023 12:08:18 +0530 Subject: [PATCH 1131/1242] UM-5403 --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 54282aa0..b363b7ff 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -4446,7 +4446,7 @@ "insight": { }, "_comment": "" - }, + } From 621684e02748c7c67875623f77fa3f67d3ea37ea Mon Sep 17 00:00:00 2001 From: chinmoy-eGov Date: Wed, 8 Feb 2023 12:17:33 +0530 Subject: [PATCH 1132/1242] UM-5403 --- .../dashboard-analytics/ChartApiConfig.json | 359 ------------------ 1 file changed, 359 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index b363b7ff..5e644274 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -4090,365 +4090,6 @@ "insightInterval" : "year" }, "_comment": "FIRE NOC total nocs issued " - }, - "mcTodaysCollection": { - "chartName": "DSS_TOTAL_COLLECTION_TODAY", - "queries": [ - { - "module": "COMMON", - "dateRefField": "", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\"}", - "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pg.testing\",\"pg\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"PT.MUTATION\",\"SW\"]}}],\"must\":[{\"range\":{\"dataObject.paymentDetails.receiptDate\":{\"gte\":\"now-1d\",\"lte\":\"now\"}}}]}},\"aggs\":{\"Todays Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" - } - ], - "chartType": "metric", - "valueType": "Amount", - "drillChart": "none", - "documentType": "_doc", - "action": "", - "aggregationPaths": [ - "Todays Collection" - ], - "insight": {}, - "_comment": " " - }, - "mcTotalChallans": { - "chartName": "DSS_MC_TOTAL_CHALLANS", - "queries": [ - { - "module": "CHALLAN", - "dateRefField": "Data.taxPeriodFrom", - "requestQueryMap": "{\"module\" : \"Data.businessService\", \"tenantId\" : \"Data.tenantId\"}", - "indexName": "echallan-services", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pg.testing\"}}]}},\"aggs\":{\"Total Challans\":{\"value_count\":{\"field\":\"Data.challanNo.keyword\"}}}}}}" - } - ], - "chartType": "metric", - "valueType": "number", - "drillChart": "none", - "documentType": "_doc", - "action": "", - "aggregationPaths": [ - "Total Challans" - ], - "insight": { - "chartResponseMap" : "mcTotalChallans", - "action" : "differenceOfNumbers", - "upwardIndicator" : "positive", - "downwardIndicator" : "negative", - "textMessage" : "$indicator$value% than last $insightInterval", - "colorCode" : "#228B22", - "insightInterval" : "year" - }, - "_comment": " " - }, - "mcTotalCategories": { - "chartName": "DSS_MC_TOTAL_CATEGORIES", - "queries": [ - { - "module": "COMMON", - "dateRefField": "dataObject.paymentDetails.receiptDate", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.Bill.billDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.cityDistrictCode\"}", - "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pg.testing\",\"pg\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"PT.MUTATION\",\"SW\"]}}]}},\"aggs\":{\"Total Categories\":{\"cardinality\":{\"field\":\"dataObject.paymentDetails.businessService.keyword\"}}}}}}" - } - ], - "chartType": "metric", - "valueType": "number", - "drillChart": "none", - "documentType": "_doc", - "action": "", - "aggregationPaths": [ - "Total Categories" - ], - "insight": { - - }, - "_comment": " " - }, - "mcCumulativeCollection": { - "chartName": "DSS_TOTAL_CUMULATIVE_COLLECTION", - "queries": [ - { - "module": "COMMON", - "dateRefField": "dataObject.paymentDetails.receiptDate", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\r\n \"module\" : \"dataObject.paymentDetails.businessService.keyword\", \n\"tenantId\" : \"dataObject.tenantId\"}", - "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pg.testing\",\"pg\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"PT.MUTATION\",\"SW\"]}}]}},\"aggs\":{\"Collections\":{\"date_histogram\":{\"field\":\"dataObject.paymentDetails.receiptDate\",\"interval\":\"intervalvalue\"},\"aggs\":{\"Sum\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" - } - ], - "chartType": "line", - "valueType": "amount", - "action": "", - "drillChart": "none", - "documentType": "_doc", - "aggregationPaths": [ - "Collections" - ], - "isCumulative": true, - "interval": "month", - "insight": {}, - "_comment": " " - }, - "mcTargetAchieved": { - "chartName": "DSS_TARGET_ACHIEVED", - "queries": [ - { - "module": "COMMON", - "requestQueryMap": "{\r\n \"module\" : \"businessService.keyword\", \n\"tenantId\" : \"tenantIdForMunicipalCorporation\"}", - "dateRefField": "", - "indexName": "dss-target_v1", - "aggrQuery": "{\"aggs\":{\"Actual collection\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}" - }, - { - "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\r\n \"district\" : \"dataObject.tenantData.city.districtCode\", \"module\" : \"dataObject.paymentDetails.businessService.keyword\", \n\"tenantId\" : \"dataObject.tenantId\"}", - "dateRefField": "dataObject.paymentDetails.receiptDate", - "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pg.testing\",\"pg\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"TL\",\"PT\"]}}]}},\"aggs\":{\"Total Collection3\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" - } - ], - "chartType": "metric", - "valueType": "percentage", - "drillChart": "none", - "isRoundOff": true, - "documentType": "_doc", - "action": "percentage", - "aggregationPaths": [ - "Total Collection3", - "Actual collection" - ], - "insight": { - "chartResponseMap": "targetAchieved", - "action": "differenceOfNumbers", - "upwardIndicator": "positive", - "downwardIndicator": "negative", - "textMessage": "$indicator$value% than last $insightInterval", - "colorCode": "#228B22", - "insightInterval": "month", - }, - "_comment": " " - }, - "mcReceiptsByPaymentMode":{ - "chartName": "DSS_MC_RECEIPTS_BY_PAYMENTMODE", - "queries": [ - { - "module": "COMMON", - "requestQueryMap": "{\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\"}", - "dateRefField": "dataObject.paymentDetails.receiptDate", - "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pg.testing\",\"pg\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"PT.MUTATION\",\"SW\",]}}]}},\"aggs\":{\"Payment Mode\":{\"terms\":{\"field\":\"dataObject.paymentMode.keyword\"},\"aggs\":{\"Total Receipts\":{\"value_count\":{\"field\":\"dataObject.paymentDetails.receiptNumber.keyword\"}}}}}}}}" - } - ], - "chartType": "pie", - "valueType": "number", - "action": "", - "documentType": "_doc", - "drillChart": "none", - "aggregationPaths": [ - "Payment Mode" - ], - "insight": { - }, - "_comment": " Receipts count by payment mode" - }, - "mcCollectionByPaymentType": { - "chartName": "DSS_MC_COLLECTION_BY_PAYMENT_TYPE", - "queries": [ - { - "module": "COMMON", - "requestQueryMap": "{\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\"}", - "dateRefField": "dataObject.paymentDetails.receiptDate", - "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pg.testing\",\"pg\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"PT.MUTATION\",\"SW\"]}}]}},\"aggs\":{\"Payment Mode\":{\"terms\":{\"field\":\"dataObject.paymentMode.keyword\"},\"aggs\":{\"Total collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" - } - ], - "chartType": "pie", - "valueType": "amount", - "action": "", - "documentType": "_doc", - "drillChart": "none", - "aggregationPaths": [ - "Payment Mode" - ], - "insight": {}, - "_comment": "" - }, - "mcChallanCountByStatus": { - "chartName": "DSS_MC_CHALLAN_COUNT_BY_STATUS", - "queries": [ - { - "module": "CHALLAN", - "dateRefField": "Data.taxPeriodFrom", - "requestQueryMap": "{\"module\" : \"Data.businessService\", \"tenantId\" : \"Data.tenantId\"}", - "indexName": "echallan-services", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pg.testing\"}}]}},\"aggs\":{\"Status\":{\"terms\":{\"field\":\"Data.applicationStatus.keyword\"},\"aggs\":{\"Challan Count\":{\"cardinality\":{\"field\":\"Data.challanNo.keyword\"}}}}}}}}" - } - ], - "chartType": "pie", - "valueType": "number", - "action": "", - "drillChart": "none", - "documentType": "_doc", - "aggregationPaths": [ - "Status" - ], - "insight": { - }, - "_comment": " " - }, - "mcReceiptsByStatus":{ - "chartName": "DSS_MC_RECEIPTS_BY_STATUS", - "queries": [ - { - "module": "COMMON", - "requestQueryMap": "{\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\"}", - "dateRefField": "dataObject.paymentDetails.receiptDate", - "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pg.testing\",\"pg\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"PT.MUTATION\",\"SW\"]}}]}},\"aggs\":{\"Payment Status\":{\"terms\":{\"field\":\"dataObject.paymentStatus.keyword\"},\"aggs\":{\"Total Receipts\":{\"value_count\":{\"field\":\"dataObject.paymentDetails.receiptNumber.keyword\"}}}}}}}}" - } - ], - "chartType": "pie", - "valueType": "number", - "action": "", - "documentType": "_doc", - "drillChart": "none", - "aggregationPaths": [ - "Payment Status" - ], - "insight": { - }, - "_comment": " Receipts count by status" - }, - "mcCollectionByStatus":{ - "chartName": "DSS_MC_COLLECTION_BY_STATUS", - "queries": [ - { - "module": "COMMON", - "requestQueryMap": "{\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\"}", - "dateRefField": "dataObject.paymentDetails.receiptDate", - "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pg.testing\",\"pg\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"PT.MUTATION\",\"SW\"]}}]}},\"aggs\":{\"Payment Status\":{\"terms\":{\"field\":\"dataObject.paymentStatus.keyword\"},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" - } - ], - "chartType": "pie", - "valueType": "amount", - "action": "", - "documentType": "_doc", - "drillChart": "none", - "aggregationPaths": [ - "Payment Status" - ], - "insight": { - }, - "_comment": " collection/amount by status" - }, - "mcTotalCollectionCategoryWise": { - "chartName": "DSS_MC_COLLECTION_CATEGORY_WISE", - "queries": [ - { - "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.cityDistrictCode\"}", - "dateRefField": "dataObject.paymentDetails.receiptDate", - "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pg.testing\",\"pg\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"PT.MUTATION\",\"SW\"]}}]}},\"aggs\":{\"Business Service\":{\"terms\":{\"field\":\"dataObject.paymentDetails.businessService.keyword\",\"order\":{\"total\":\"desc\"}},\"aggs\":{\"total\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" - } - ], - "chartType": "pie", - "valueType": "amount", - "action": "", - "documentType": "_doc", - "drillChart": "none", - "aggregationPaths": [ - "Business Service" - ], - "insight": {}, - "_comment": " " - }, - "mcMonthlyCollectionReport": { - "chartName": "DSS_MC_MONTHLY_REPORT", - "queries": [ - { - "module": "COMMON", - "dateRefField": "dataObject.paymentDetails.receiptDate", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.Bill.billDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.cityDistrictCode\" }", - "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pg.testing\",\"pg\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"PT.MUTATION\",\"SW\"]}}]}},\"aggs\":{\"Collections\":{\"date_histogram\":{\"field\":\"dataObject.paymentDetails.receiptDate\",\"interval\":\"month\"},\"aggs\":{\"Sum\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}},\"Receipts\":{\"date_histogram\":{\"field\":\"dataObject.paymentDetails.receiptDate\",\"interval\":\"month\"},\"aggs\":{\"Total Receipts\":{\"value_count\":{\"field\":\"dataObject.paymentDetails.receiptNumber.keyword\"}}}}}}}}" - } - ], - "chartType": "line", - "valueType": "amount", - "action": "", - "drillChart": "none", - "documentType": "_doc", - "aggregationPaths": [ - "Collections", - "Receipts" - ], - "pathDataTypeMapping": [ - { - "Collections": "amount" - }, - { - "Receipts": "number" - } - ], - "isCumulative": false, - "interval": "month", - "insight": { - }, - "_comment": " " - }, - "mcReportByDDRv2": { - "chartName": "DSS_MC_REPORT_BY_TENANT", - "queries": [ - { - "module": "COMMON", - "requestQueryMap": "{\"tenantId\" : \"dataObject.tenantId.keyword\"}", - "dateRefField": "dataObject.paymentDetails.receiptDate", - "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pg.testing\",\"pg\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"PT.MUTATION\",\"SW\"]}}]}},\"aggs\":{\"Total_Receipts\":{\"value_count\":{\"field\":\"dataObject.paymentDetails.receiptNumber.keyword\"}},\"MC_TOTAL_COLLECTION\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" - }, - - { - "module": "CHALLAN", - "requestQueryMap": "{\"tenantId\" : \"Data.tenantId.keyword\"}", - "dateRefField": "Data.taxPeriodFrom", - "indexName": "echallan-services", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pg.testing\"}},{\"terms\":{\"Data.businessService.keyword\":[\"TL\",\"PT\"]}}]}},\"aggs\":{\"Total_Challans\":{\"value_count\":{\"field\":\"Data.challanNo.keyword\"}}}}}}" - } - ], - "isMdmsEnabled": true, - "filterKeys": [ - {"key": "tenantId", "column": "DDRs"} - ], - "chartType": "xtable", - "drillChart": "mcReportByTenant", - "plotLabel": "DDRs", - "aggregationPaths": [ - "MC_TOTAL_COLLECTION", - "Total_Challans", - "Total_Receipts" - ], - "pathDataTypeMapping": [ - { - "MC_TOTAL_COLLECTION": "amount" - }, - { - "Total_Challans": "number" - }, - { - "Total_Receipts": "number" - } - ], - - "insight": { - }, - "_comment": "" } - - - } From 71f398cf0ae812f29e941932186b47a277fd59e1 Mon Sep 17 00:00:00 2001 From: chinmoy-eGov Date: Wed, 8 Feb 2023 12:32:59 +0530 Subject: [PATCH 1133/1242] UM-5403 --- .../dashboard-analytics/ChartApiConfig.json | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 5e644274..27f82f14 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -4090,6 +4090,28 @@ "insightInterval" : "year" }, "_comment": "FIRE NOC total nocs issued " + }, + "mcTodaysCollection": { + "chartName": "DSS_TOTAL_COLLECTION_TODAY", + "queries": [ + { + "module": "COMMON", + "dateRefField": "", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\"}", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pg.testing\",\"pg\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"PT.MUTATION\",\"SW\"]}}],\"must\":[{\"range\":{\"dataObject.paymentDetails.receiptDate\":{\"gte\":\"now-1d\",\"lte\":\"now\"}}}]}},\"aggs\":{\"Todays Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" + } + ], + "chartType": "metric", + "valueType": "Amount", + "drillChart": "none", + "documentType": "_doc", + "action": "", + "aggregationPaths": [ + "Todays Collection" + ], + "insight": {}, + "_comment": " " } } From 03040435255b90df59b1cb7175edc8e127971d2b Mon Sep 17 00:00:00 2001 From: chinmoy-eGov Date: Wed, 8 Feb 2023 12:41:58 +0530 Subject: [PATCH 1134/1242] UM-5403 --- .../dashboard-analytics/ChartApiConfig.json | 54 +++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 27f82f14..bd1aa8d3 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -4112,6 +4112,60 @@ ], "insight": {}, "_comment": " " + }, + "mcTotalChallans": { + "chartName": "DSS_MC_TOTAL_CHALLANS", + "queries": [ + { + "module": "CHALLAN", + "dateRefField": "Data.taxPeriodFrom", + "requestQueryMap": "{\"module\" : \"Data.businessService\", \"tenantId\" : \"Data.tenantId\"}", + "indexName": "echallan-services", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pg.testing\"}}]}},\"aggs\":{\"Total Challans\":{\"value_count\":{\"field\":\"Data.challanNo.keyword\"}}}}}}" + } + ], + "chartType": "metric", + "valueType": "number", + "drillChart": "none", + "documentType": "_doc", + "action": "", + "aggregationPaths": [ + "Total Challans" + ], + "insight": { + "chartResponseMap" : "mcTotalChallans", + "action" : "differenceOfNumbers", + "upwardIndicator" : "positive", + "downwardIndicator" : "negative", + "textMessage" : "$indicator$value% than last $insightInterval", + "colorCode" : "#228B22", + "insightInterval" : "year" + }, + "_comment": " " + }, + "mcTotalCategories": { + "chartName": "DSS_MC_TOTAL_CATEGORIES", + "queries": [ + { + "module": "COMMON", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.Bill.billDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.cityDistrictCode\"}", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pg.testing\",\"pg\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"PT.MUTATION\",\"SW\"]}}]}},\"aggs\":{\"Total Categories\":{\"cardinality\":{\"field\":\"dataObject.paymentDetails.businessService.keyword\"}}}}}}" + } + ], + "chartType": "metric", + "valueType": "number", + "drillChart": "none", + "documentType": "_doc", + "action": "", + "aggregationPaths": [ + "Total Categories" + ], + "insight": { + + }, + "_comment": " " } } From f1c69da4333be322783feb600722ccb221ac185b Mon Sep 17 00:00:00 2001 From: chinmoy-eGov Date: Wed, 8 Feb 2023 13:15:52 +0530 Subject: [PATCH 1135/1242] UM-5403 --- .../dashboard-analytics/ChartApiConfig.json | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index bd1aa8d3..b00c0c11 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -4166,6 +4166,30 @@ }, "_comment": " " + }, + "mcCumulativeCollection": { + "chartName": "DSS_TOTAL_CUMULATIVE_COLLECTION", + "queries": [ + { + "module": "COMMON", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\r\n \"module\" : \"dataObject.paymentDetails.businessService.keyword\", \n\"tenantId\" : \"dataObject.tenantId\"}", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pg.testing\",\"pg\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"PT.MUTATION\",\"SW\"]}}]}},\"aggs\":{\"Collections\":{\"date_histogram\":{\"field\":\"dataObject.paymentDetails.receiptDate\",\"interval\":\"intervalvalue\"},\"aggs\":{\"Sum\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" + } + ], + "chartType": "line", + "valueType": "amount", + "action": "", + "drillChart": "none", + "documentType": "_doc", + "aggregationPaths": [ + "Collections" + ], + "isCumulative": true, + "interval": "month", + "insight": {}, + "_comment": " " } } From 241252434a90467ef3a77eace6cc2ca8015e3168 Mon Sep 17 00:00:00 2001 From: chinmoy-eGov Date: Wed, 8 Feb 2023 15:35:41 +0530 Subject: [PATCH 1136/1242] UM-5403 --- .../dashboard-analytics/ChartApiConfig.json | 171 ++++++++++++++++++ 1 file changed, 171 insertions(+) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index b00c0c11..9ee266a4 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -4190,6 +4190,177 @@ "interval": "month", "insight": {}, "_comment": " " + }, + "nocTotalApplications": { + "chartName": "DSS_NOC_TOTAL_APPLICATIONS", + "queries": [ + { + "module": "FIRENOC", + "indexName": "firenoc-services", + "aggrQuery": "{\"aggs\":{\"FireNOC\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pg.testing\"}}]}},\"aggs\":{\"Total Applications\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}}", + "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\",\"tenantId\" : \"Data.tenantId\", \"district\" : \"Data.tenantData.city.districtCode\"}", + "dateRefField": "Data.auditDetails.createdTime" + } + ], + "chartType": "metric", + "valueType": "number", + "action": "", + "drillChart": "none", + "aggregationPaths": [ + "Total Applications" + ], + "insight": { + "chartResponseMap" : "nocTotalApplications", + "action" : "differenceOfNumbers", + "upwardIndicator" : "positive", + "downwardIndicator" : "negative", + "textMessage" : "$indicator$value% than last $insightInterval", + "colorCode" : "#228B22", + "insightInterval" : "year" + }, + "_comment": "FIRE NOC total applications " + }, + "nocProvisionalIssued": { + "chartName": "DSS_NOC_PROVISIONAL_ISSUED", + "queries": [ + { + "module": "FIRENOC", + "indexName": "firenoc-services", + "aggrQuery": "{\"aggs\":{\"FireNOC\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pg.testing\"}}]}},\"aggs\":{\"Provisional Fire Nocs issued\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"Data.fireNOCDetails.fireNOCType.keyword\":\"PROVISIONAL\"}}]}}}}}}}", + "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\",\"tenantId\" : \"Data.tenantId\", \"district\" : \"Data.tenantData.city.districtCode\"}", + "dateRefField": "Data.auditDetails.createdTime" + } + ], + "chartType": "metric", + "valueType": "number", + "action": "", + "drillChart": "none", + "aggregationPaths": [ + "Provisional Fire Nocs issued" + ], + "insight": { + "chartResponseMap" : "nocProvisionalIssued", + "action" : "differenceOfNumbers", + "upwardIndicator" : "positive", + "downwardIndicator" : "negative", + "textMessage" : "$indicator$value% than last $insightInterval", + "colorCode" : "#228B22", + "insightInterval" : "year" + }, + "_comment": "FIRE NOC Provisional Issued" + }, + "nocActualIssued": { + "chartName": "DSS_NOC_ACTUAL_ISSUED", + "queries": [ + { + "module": "FIRENOC", + "indexName": "firenoc-services", + "aggrQuery": "{\"aggs\":{\"FireNOC\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pg.testing\"}}]}},\"aggs\":{\"Actual Fire Nocs issued\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"Data.fireNOCDetails.fireNOCType.keyword\":\"NEW\"}}]}}}}}}}", + "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\",\"tenantId\" : \"Data.tenantId\", \"district\" : \"Data.tenantData.city.districtCode\"}", + "dateRefField": "Data.auditDetails.createdTime" + } + ], + "chartType": "metric", + "valueType": "number", + "action": "", + "drillChart": "none", + "aggregationPaths": [ + "Actual Fire Nocs issued" + ], + "insight": { + "chartResponseMap" : "nocActualIssued", + "action" : "differenceOfNumbers", + "upwardIndicator" : "positive", + "downwardIndicator" : "negative", + "textMessage" : "$indicator$value% than last $insightInterval", + "colorCode" : "#228B22", + "insightInterval" : "year" + }, + "_comment": "Actual fire nocs Issued" + }, + "nocSLAComplianceProvisional": { + "chartName": "DSS_NOC_SLA_COMPLIANCE_PROVISIONAL", + "queries": [ + { + "module": "FIRENOC", + "indexName": "firenoc-services", + "aggrQuery": "{\"aggs\":{\"FireNOC\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pg.testing\"}}]}},\"aggs\":{\"SLA Compliance (Provisional NOC)\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"Data.fireNOCDetails.fireNOCType.keyword\":\"PROVISIONAL\"}},{\"term\":{\"Data.fireNOCDetails.status.keyword\":\"APPROVED\"}},{\"script\":{\"script\":{\"source\":\"doc['Data.auditDetails.lastModifiedTime'].value-doc['Data.auditDetails.createdTime'].value Date: Wed, 8 Feb 2023 15:42:01 +0530 Subject: [PATCH 1137/1242] UM-5403 --- .../dashboard-analytics/ChartApiConfig.json | 67 +++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 9ee266a4..94661ec0 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -4361,6 +4361,73 @@ "insight": { }, "_comment": "" + }, + "nocCollectionByPaymentMode": { + "chartName": "DSS_NOC_COLLECTION_BY_PAYMENT_MODE", + "queries": [ + { + "module": "FIRENOC", + "requestQueryMap": "{\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\"}", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must\":[{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"FIRENOC\"]}}],\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pg.testing\"}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"NOC Payment Mode\":{\"terms\":{\"field\":\"dataObject.paymentMode.keyword\"},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" + } + ], + "chartType": "pie", + "valueType": "amount", + "action": "", + "documentType": "_doc", + "drillChart": "none", + "aggregationPaths": [ + "NOC Payment Mode" + ], + "insight": {}, + "_comment": "" + },"totalNocIssuedByType": { + "chartName": "DSS_TOTAL_NOC_ISSUED_TYPE", + "queries": [ + { + "module": "FIRENOC", + "indexName": "firenoc-services", + "aggrQuery": "{\"aggs\":{\"FireNOC\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pg.testing\"}}]}},\"aggs\": {\"fireNOC Issued\": {\"terms\": {\"field\": \"Data.fireNOCDetails.fireNOCType.keyword\"},\"aggs\": {\"total_nocs_by_type\": {\"cardinality\": {\"field\": \"_id\"}}}}}}}}", + "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\",\"tenantId\" : \"Data.tenantId\" \r\n}", + "dateRefField": "Data.auditDetails.createdTime" + } + ], + "chartType": "pie", + "valueType": "number", + "action": "", + "documentType": "_doc", + "drillChart": "none", + "aggregationPaths": [ + "fireNOC Issued" + ], + "insight": { + }, + "_comment": "Total NOCs issued by Type" + }, + "actualNocIssuedByUsageType": { + "chartName": "DSS_ACTUAL_NOC_ISSUED_USAGETYPE", + "queries": [ + { + "module": "FIRENOC", + "indexName": "firenoc-services", + "aggrQuery": "{\"aggs\":{\"FireNOC\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pg.testing\"}}],\"must\":[{\"term\":{\"Data.fireNOCDetails.fireNOCType.keyword\":\"NEW\"}}]}},\"aggs\":{\"actualNOC Issued\":{\"terms\":{\"field\":\"Data.fireNOCDetails.buildings.usageType.keyword\"},\"aggs\":{\"actual_nocs_by_usagetype\":{\"cardinality\":{\"field\":\"_id\"}}}}}}}}", + "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\",\"tenantId\" : \"Data.tenantId\" \r\n}", + "dateRefField": "Data.auditDetails.createdTime" + } + ], + "chartType": "pie", + "valueType": "number", + "action": "", + "documentType": "_doc", + "drillChart": "none", + "aggregationPaths": [ + "actualNOC Issued" + ], + "insight": { + }, + "_comment": "Actual NOCs Issued by usageType." } } From 0a646311aeccc2ba2cef2a5dacc6128a8ce69e2f Mon Sep 17 00:00:00 2001 From: chinmoy-eGov Date: Wed, 8 Feb 2023 15:52:29 +0530 Subject: [PATCH 1138/1242] UM-5403 --- .../dashboard-analytics/ChartApiConfig.json | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 94661ec0..eb945cc1 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -4428,6 +4428,51 @@ "insight": { }, "_comment": "Actual NOCs Issued by usageType." + }, + "mcReceiptsByPaymentMode":{ + "chartName": "DSS_MC_RECEIPTS_BY_PAYMENTMODE", + "queries": [ + { + "module": "COMMON", + "requestQueryMap": "{\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\"}", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pg.testing\",\"pg\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"FSM.TRIP_CHARGES\",\"PT.MUTATION\",\"SW\",\"BPA.LOW_RISK_PERMIT_FEE\",\"BPA.NC_SAN_FEE\",\"BPA.NC_APP_FEE\",\"BPA.NC_OC_APP_FEE\"]}}]}},\"aggs\":{\"Payment Mode\":{\"terms\":{\"field\":\"dataObject.paymentMode.keyword\"},\"aggs\":{\"Total Receipts\":{\"value_count\":{\"field\":\"dataObject.paymentDetails.receiptNumber.keyword\"}}}}}}}}" + } + ], + "chartType": "pie", + "valueType": "number", + "action": "", + "documentType": "_doc", + "drillChart": "none", + "aggregationPaths": [ + "Payment Mode" + ], + "insight": { + }, + "_comment": " Receipts count by payment mode" + }, + "mcCollectionByPaymentType": { + "chartName": "DSS_MC_COLLECTION_BY_PAYMENT_TYPE", + "queries": [ + { + "module": "COMMON", + "requestQueryMap": "{\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\"}", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pg.testing\",\"pg\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"FSM.TRIP_CHARGES\",\"PT.MUTATION\",\"SW\",\"BPA.LOW_RISK_PERMIT_FEE\",\"BPA.NC_SAN_FEE\",\"BPA.NC_APP_FEE\",\"BPA.NC_OC_APP_FEE\"]}}]}},\"aggs\":{\"Payment Mode\":{\"terms\":{\"field\":\"dataObject.paymentMode.keyword\"},\"aggs\":{\"Total collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" + } + ], + "chartType": "pie", + "valueType": "amount", + "action": "", + "documentType": "_doc", + "drillChart": "none", + "aggregationPaths": [ + "Payment Mode" + ], + "insight": {}, + "_comment": "" } } From 9f0d0bc8bfd09101e46787c3c7df8a5753102949 Mon Sep 17 00:00:00 2001 From: chinmoy-eGov Date: Wed, 8 Feb 2023 16:56:12 +0530 Subject: [PATCH 1139/1242] UM-5403 --- .../dashboard-analytics/ChartApiConfig.json | 69 +++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index eb945cc1..5ff2098c 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -4473,6 +4473,75 @@ ], "insight": {}, "_comment": "" + }, + "mcCollectionByPaymentType": { + "chartName": "DSS_MC_COLLECTION_BY_PAYMENT_TYPE", + "queries": [ + { + "module": "COMMON", + "requestQueryMap": "{\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\"}", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pg.testing\",\"pg\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"FSM.TRIP_CHARGES\",\"PT.MUTATION\",\"SW\",\"BPA.LOW_RISK_PERMIT_FEE\",\"BPA.NC_SAN_FEE\",\"BPA.NC_APP_FEE\",\"BPA.NC_OC_APP_FEE\"]}}]}},\"aggs\":{\"Payment Mode\":{\"terms\":{\"field\":\"dataObject.paymentMode.keyword\"},\"aggs\":{\"Total collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" + } + ], + "chartType": "pie", + "valueType": "amount", + "action": "", + "documentType": "_doc", + "drillChart": "none", + "aggregationPaths": [ + "Payment Mode" + ], + "insight": {}, + "_comment": "" + }, + "mcReceiptsByStatus":{ + "chartName": "DSS_MC_RECEIPTS_BY_STATUS", + "queries": [ + { + "module": "COMMON", + "requestQueryMap": "{\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\"}", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pg.testing\",\"pg\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"FSM.TRIP_CHARGES\",\"PT.MUTATION\",\"SW\",\"BPA.LOW_RISK_PERMIT_FEE\",\"BPA.NC_SAN_FEE\",\"BPA.NC_APP_FEE\",\"BPA.NC_OC_APP_FEE\"]}}]}},\"aggs\":{\"Payment Status\":{\"terms\":{\"field\":\"dataObject.paymentStatus.keyword\"},\"aggs\":{\"Total Receipts\":{\"value_count\":{\"field\":\"dataObject.paymentDetails.receiptNumber.keyword\"}}}}}}}}" + } + ], + "chartType": "pie", + "valueType": "number", + "action": "", + "documentType": "_doc", + "drillChart": "none", + "aggregationPaths": [ + "Payment Status" + ], + "insight": { + }, + "_comment": " Receipts count by status" + }, + "mcCollectionByStatus":{ + "chartName": "DSS_MC_COLLECTION_BY_STATUS", + "queries": [ + { + "module": "COMMON", + "requestQueryMap": "{\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\"}", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pg.testing\",\"pg\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"FSM.TRIP_CHARGES\",\"PT.MUTATION\",\"SW\",\"BPA.LOW_RISK_PERMIT_FEE\",\"BPA.NC_SAN_FEE\",\"BPA.NC_APP_FEE\",\"BPA.NC_OC_APP_FEE\"]}}]}},\"aggs\":{\"Payment Status\":{\"terms\":{\"field\":\"dataObject.paymentStatus.keyword\"},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" + } + ], + "chartType": "pie", + "valueType": "amount", + "action": "", + "documentType": "_doc", + "drillChart": "none", + "aggregationPaths": [ + "Payment Status" + ], + "insight": { + }, + "_comment": " collection/amount by status" } + } From ab0a3197f180b47fde93796b639fdfe376fd9863 Mon Sep 17 00:00:00 2001 From: chinmoy-eGov Date: Wed, 8 Feb 2023 17:00:26 +0530 Subject: [PATCH 1140/1242] UM-5403 --- .../dashboard-analytics/ChartApiConfig.json | 59 ++++++++++++++++++- 1 file changed, 58 insertions(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 5ff2098c..0e156507 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -4541,7 +4541,64 @@ "insight": { }, "_comment": " collection/amount by status" - } + }, + "mcTotalCollectionCategoryWise": { + "chartName": "DSS_MC_COLLECTION_CATEGORY_WISE", + "queries": [ + { + "module": "COMMON", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.cityDistrictCode\"}", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pg.testing\",\"pg\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"FSM.TRIP_CHARGES\",\"PT.MUTATION\",\"SW\",\"BPA.LOW_RISK_PERMIT_FEE\",\"BPA.NC_SAN_FEE\",\"BPA.NC_APP_FEE\",\"BPA.NC_OC_APP_FEE\"]}}]}},\"aggs\":{\"Business Service\":{\"terms\":{\"field\":\"dataObject.paymentDetails.businessService.keyword\",\"order\":{\"total\":\"desc\"}},\"aggs\":{\"total\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" + } + ], + "chartType": "pie", + "valueType": "amount", + "action": "", + "documentType": "_doc", + "drillChart": "none", + "aggregationPaths": [ + "Business Service" + ], + "insight": {}, + "_comment": " " + }, + "mcMonthlyCollectionReport": { + "chartName": "DSS_MC_MONTHLY_REPORT", + "queries": [ + { + "module": "COMMON", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.Bill.billDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.cityDistrictCode\" }", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pg.testing\",\"pg\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"FSM.TRIP_CHARGES\",\"PT.MUTATION\",\"SW\",\"BPA.LOW_RISK_PERMIT_FEE\",\"BPA.NC_SAN_FEE\",\"BPA.NC_APP_FEE\",\"BPA.NC_OC_APP_FEE\"]}}]}},\"aggs\":{\"Collections\":{\"date_histogram\":{\"field\":\"dataObject.paymentDetails.receiptDate\",\"interval\":\"month\"},\"aggs\":{\"Sum\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}},\"Receipts\":{\"date_histogram\":{\"field\":\"dataObject.paymentDetails.receiptDate\",\"interval\":\"month\"},\"aggs\":{\"Total Receipts\":{\"value_count\":{\"field\":\"dataObject.paymentDetails.receiptNumber.keyword\"}}}}}}}}" + } + ], + "chartType": "line", + "valueType": "amount", + "action": "", + "drillChart": "none", + "documentType": "_doc", + "aggregationPaths": [ + "Collections", + "Receipts" + ], + "pathDataTypeMapping": [ + { + "Collections": "amount" + }, + { + "Receipts": "number" + } + ], + "isCumulative": false, + "interval": "month", + "insight": { + }, + "_comment": " " + }, + } From d72918d57e1444b4a97a248924b0e9aeea8cdff7 Mon Sep 17 00:00:00 2001 From: chinmoy-eGov Date: Wed, 8 Feb 2023 17:00:42 +0530 Subject: [PATCH 1141/1242] UM-5403 --- .../dashboard-analytics/ChartApiConfig.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 0e156507..ea128fe7 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -4597,8 +4597,8 @@ "insight": { }, "_comment": " " - }, - + } + } From c5c530ed8d84e017c5beaf1972c834a6230f86e1 Mon Sep 17 00:00:00 2001 From: chinmoy-eGov Date: Wed, 8 Feb 2023 17:04:51 +0530 Subject: [PATCH 1142/1242] UM-5403 --- .../dashboard-analytics/ChartApiConfig.json | 34 ------------------- 1 file changed, 34 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index ea128fe7..26cf98c3 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -4563,40 +4563,6 @@ ], "insight": {}, "_comment": " " - }, - "mcMonthlyCollectionReport": { - "chartName": "DSS_MC_MONTHLY_REPORT", - "queries": [ - { - "module": "COMMON", - "dateRefField": "dataObject.paymentDetails.receiptDate", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.Bill.billDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.cityDistrictCode\" }", - "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pg.testing\",\"pg\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"FSM.TRIP_CHARGES\",\"PT.MUTATION\",\"SW\",\"BPA.LOW_RISK_PERMIT_FEE\",\"BPA.NC_SAN_FEE\",\"BPA.NC_APP_FEE\",\"BPA.NC_OC_APP_FEE\"]}}]}},\"aggs\":{\"Collections\":{\"date_histogram\":{\"field\":\"dataObject.paymentDetails.receiptDate\",\"interval\":\"month\"},\"aggs\":{\"Sum\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}},\"Receipts\":{\"date_histogram\":{\"field\":\"dataObject.paymentDetails.receiptDate\",\"interval\":\"month\"},\"aggs\":{\"Total Receipts\":{\"value_count\":{\"field\":\"dataObject.paymentDetails.receiptNumber.keyword\"}}}}}}}}" - } - ], - "chartType": "line", - "valueType": "amount", - "action": "", - "drillChart": "none", - "documentType": "_doc", - "aggregationPaths": [ - "Collections", - "Receipts" - ], - "pathDataTypeMapping": [ - { - "Collections": "amount" - }, - { - "Receipts": "number" - } - ], - "isCumulative": false, - "interval": "month", - "insight": { - }, - "_comment": " " } From 084e468abc8b43c244ea3a0dc0342a18181cd40f Mon Sep 17 00:00:00 2001 From: Ramesh Kumar Date: Wed, 8 Feb 2023 17:20:44 +0530 Subject: [PATCH 1143/1242] Changed text trade_license_certificate --- configs/pdf-service/data-config/tlcertificate.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/pdf-service/data-config/tlcertificate.json b/configs/pdf-service/data-config/tlcertificate.json index fb3170b5..2756e470 100644 --- a/configs/pdf-service/data-config/tlcertificate.json +++ b/configs/pdf-service/data-config/tlcertificate.json @@ -433,7 +433,7 @@ } }, { - "variable": "trade_license_certifcate", + "variable": "trade_license_certificate", "value": { "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_LICENSE_CERTIFICATE" }, From 531ff91f231e090fc0a6d0321bfcb7a6eada3a99 Mon Sep 17 00:00:00 2001 From: Ramesh Kumar Date: Thu, 9 Feb 2023 14:57:58 +0530 Subject: [PATCH 1144/1242] change certifcate text --- configs/pdf-service/data-config/tlcertificate.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/pdf-service/data-config/tlcertificate.json b/configs/pdf-service/data-config/tlcertificate.json index 2756e470..fb3170b5 100644 --- a/configs/pdf-service/data-config/tlcertificate.json +++ b/configs/pdf-service/data-config/tlcertificate.json @@ -433,7 +433,7 @@ } }, { - "variable": "trade_license_certificate", + "variable": "trade_license_certifcate", "value": { "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_LICENSE_CERTIFICATE" }, From c920add5e964924a45909ecb008b619c0cfb8b40 Mon Sep 17 00:00:00 2001 From: chinmoy-eGov Date: Thu, 9 Feb 2023 15:01:22 +0530 Subject: [PATCH 1145/1242] UM-5403 --- .../dashboard-analytics/ChartApiConfig.json | 46 +++++++++---------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 26cf98c3..5e9cc865 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -3981,7 +3981,7 @@ "dateRefField": "dataObject.paymentDetails.receiptDate", "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\"}", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pg.testing\",\"pg\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"PT.MUTATION\",\"SW\"]}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pb.testing\",\"pb\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"PT.MUTATION\",\"SW\"]}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" } ], "chartType": "metric", @@ -4011,7 +4011,7 @@ "dateRefField": "dataObject.paymentDetails.receiptDate", "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.Bill.billDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.cityDistrictCode\"}", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pg.testing\",\"pg\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"PT.MUTATION\",\"SW\"]}}]}},\"aggs\":{\"Total Receipts\":{\"value_count\":{\"field\":\"dataObject.paymentDetails.receiptNumber.keyword\"}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pb.testing\",\"pb\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"PT.MUTATION\",\"SW\"]}}]}},\"aggs\":{\"Total Receipts\":{\"value_count\":{\"field\":\"dataObject.paymentDetails.receiptNumber.keyword\"}}}}}}" } ], "chartType": "metric", @@ -4039,7 +4039,7 @@ { "module": "FIRENOC", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must\":[{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"FIRENOC\"]}}],\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pg.testing\"}},{\"term\":{\"dataObject.paymentStatus.keyword\":\"Cancelled\"}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must\":[{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"FIRENOC\"]}}],\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"term\":{\"dataObject.paymentStatus.keyword\":\"Cancelled\"}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}", "requestQueryMap": "{\"wardId\" : \"dataObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\",\"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", "dateRefField": "dataObject.paymentDetails.receiptDate" } @@ -4068,7 +4068,7 @@ { "module": "FIRENOC", "indexName": "firenoc-services", - "aggrQuery": "{\"aggs\":{\"FireNOC\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pg.testing\"}}],\"must\":[{\"terms\":{\"Data.fireNOCDetails.status.keyword\":[\"APPROVED\"]}}]}},\"aggs\":{\"Total Nocs Issued\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}}", + "aggrQuery": "{\"aggs\":{\"FireNOC\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}],\"must\":[{\"terms\":{\"Data.fireNOCDetails.status.keyword\":[\"APPROVED\"]}}]}},\"aggs\":{\"Total Nocs Issued\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}}", "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\",\"tenantId\" : \"Data.tenantId\", \"district\" : \"Data.tenantData.city.districtCode\"}", "dateRefField": "Data.auditDetails.createdTime" } @@ -4099,7 +4099,7 @@ "dateRefField": "", "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\"}", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pg.testing\",\"pg\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"PT.MUTATION\",\"SW\"]}}],\"must\":[{\"range\":{\"dataObject.paymentDetails.receiptDate\":{\"gte\":\"now-1d\",\"lte\":\"now\"}}}]}},\"aggs\":{\"Todays Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pb.testing\",\"pb\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"PT.MUTATION\",\"SW\"]}}],\"must\":[{\"range\":{\"dataObject.paymentDetails.receiptDate\":{\"gte\":\"now-1d\",\"lte\":\"now\"}}}]}},\"aggs\":{\"Todays Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" } ], "chartType": "metric", @@ -4121,7 +4121,7 @@ "dateRefField": "Data.taxPeriodFrom", "requestQueryMap": "{\"module\" : \"Data.businessService\", \"tenantId\" : \"Data.tenantId\"}", "indexName": "echallan-services", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pg.testing\"}}]}},\"aggs\":{\"Total Challans\":{\"value_count\":{\"field\":\"Data.challanNo.keyword\"}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Total Challans\":{\"value_count\":{\"field\":\"Data.challanNo.keyword\"}}}}}}" } ], "chartType": "metric", @@ -4151,7 +4151,7 @@ "dateRefField": "dataObject.paymentDetails.receiptDate", "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.Bill.billDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.cityDistrictCode\"}", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pg.testing\",\"pg\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"PT.MUTATION\",\"SW\"]}}]}},\"aggs\":{\"Total Categories\":{\"cardinality\":{\"field\":\"dataObject.paymentDetails.businessService.keyword\"}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pb.testing\",\"pb\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"PT.MUTATION\",\"SW\"]}}]}},\"aggs\":{\"Total Categories\":{\"cardinality\":{\"field\":\"dataObject.paymentDetails.businessService.keyword\"}}}}}}" } ], "chartType": "metric", @@ -4175,7 +4175,7 @@ "dateRefField": "dataObject.paymentDetails.receiptDate", "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\r\n \"module\" : \"dataObject.paymentDetails.businessService.keyword\", \n\"tenantId\" : \"dataObject.tenantId\"}", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pg.testing\",\"pg\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"PT.MUTATION\",\"SW\"]}}]}},\"aggs\":{\"Collections\":{\"date_histogram\":{\"field\":\"dataObject.paymentDetails.receiptDate\",\"interval\":\"intervalvalue\"},\"aggs\":{\"Sum\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pb.testing\",\"pb\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"PT.MUTATION\",\"SW\"]}}]}},\"aggs\":{\"Collections\":{\"date_histogram\":{\"field\":\"dataObject.paymentDetails.receiptDate\",\"interval\":\"intervalvalue\"},\"aggs\":{\"Sum\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" } ], "chartType": "line", @@ -4197,7 +4197,7 @@ { "module": "FIRENOC", "indexName": "firenoc-services", - "aggrQuery": "{\"aggs\":{\"FireNOC\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pg.testing\"}}]}},\"aggs\":{\"Total Applications\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}}", + "aggrQuery": "{\"aggs\":{\"FireNOC\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Total Applications\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}}", "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\",\"tenantId\" : \"Data.tenantId\", \"district\" : \"Data.tenantData.city.districtCode\"}", "dateRefField": "Data.auditDetails.createdTime" } @@ -4226,7 +4226,7 @@ { "module": "FIRENOC", "indexName": "firenoc-services", - "aggrQuery": "{\"aggs\":{\"FireNOC\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pg.testing\"}}]}},\"aggs\":{\"Provisional Fire Nocs issued\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"Data.fireNOCDetails.fireNOCType.keyword\":\"PROVISIONAL\"}}]}}}}}}}", + "aggrQuery": "{\"aggs\":{\"FireNOC\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Provisional Fire Nocs issued\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"Data.fireNOCDetails.fireNOCType.keyword\":\"PROVISIONAL\"}}]}}}}}}}", "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\",\"tenantId\" : \"Data.tenantId\", \"district\" : \"Data.tenantData.city.districtCode\"}", "dateRefField": "Data.auditDetails.createdTime" } @@ -4255,7 +4255,7 @@ { "module": "FIRENOC", "indexName": "firenoc-services", - "aggrQuery": "{\"aggs\":{\"FireNOC\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pg.testing\"}}]}},\"aggs\":{\"Actual Fire Nocs issued\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"Data.fireNOCDetails.fireNOCType.keyword\":\"NEW\"}}]}}}}}}}", + "aggrQuery": "{\"aggs\":{\"FireNOC\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Actual Fire Nocs issued\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"Data.fireNOCDetails.fireNOCType.keyword\":\"NEW\"}}]}}}}}}}", "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\",\"tenantId\" : \"Data.tenantId\", \"district\" : \"Data.tenantData.city.districtCode\"}", "dateRefField": "Data.auditDetails.createdTime" } @@ -4284,7 +4284,7 @@ { "module": "FIRENOC", "indexName": "firenoc-services", - "aggrQuery": "{\"aggs\":{\"FireNOC\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pg.testing\"}}]}},\"aggs\":{\"SLA Compliance (Provisional NOC)\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"Data.fireNOCDetails.fireNOCType.keyword\":\"PROVISIONAL\"}},{\"term\":{\"Data.fireNOCDetails.status.keyword\":\"APPROVED\"}},{\"script\":{\"script\":{\"source\":\"doc['Data.auditDetails.lastModifiedTime'].value-doc['Data.auditDetails.createdTime'].value Date: Fri, 10 Feb 2023 13:06:14 +0530 Subject: [PATCH 1146/1242] UM-5403 --- .../MasterDashboardConfig.json | 215 +----------------- 1 file changed, 7 insertions(+), 208 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json index bdce93ef..6bf0fd6a 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json @@ -3943,6 +3943,9 @@ } ] }, + + + { "name": "DSS_M_COLLECT_DASHBOARD", "id": "mCollect", @@ -4032,217 +4035,13 @@ ] } ] - }, - { - "row": 2, - "name": "DSS_REVENUE", - "vizArray": [ - - { - "id": 234, - "name": "DSS_MC_RECEIPTS_BY_PAYMENTMODE", - "dimensions": { - "height": 250, - "width": 4 - }, - "vizType": "chart", - "noUnit": false, - "isCollapsible": false, - "charts": [ - { - "id": "mcReceiptsByPaymentMode", - "name": "DSS_MC_RECEIPTS_BY_PAYMENTMODE", - "code": "", - "chartType": "donut", - "filter": "", - "headers": [] - } - ] - }, - { - "id": 323, - "name": "DSS_MC_COLLECTION_BY_PAYMENT_TYPE", - "dimensions": { - "height": 250, - "width": 4 - }, - "vizType": "chart", - "label": "", - "noUnit": false, - "isCollapsible": false, - "charts": [ - { - "id": "mcCollectionByPaymentType", - "name": "DSS_MC_COLLECTION_BY_PAYMENT_TYPE", - "code": "", - "chartType": "donut", - "filter": "", - "headers": [] - } - ] - } - ] - }, - { - "row": 3, - "name": "DSS_REVENUE", - "vizArray": [ - - { - "id": 235, - "name": "DSS_MC_CHALLAN_COUNT_BY_STATUS", - "dimensions": { - "height": 250, - "width": 4 - }, - "vizType": "chart", - "noUnit": false, - "isCollapsible": false, - "charts": [ - { - "id": "mcChallanCountByStatus", - "name": "DSS_MC_CHALLAN_COUNT_BY_STATUS", - "code": "", - "chartType": "donut", - "filter": "", - "headers": [] - } - ] - }, - { - "id": 233, - "name": "DSS_MC_RECEIPTS_BY_STATUS", - "dimensions": { - "height": 250, - "width": 4 - }, - "vizType": "chart", - "noUnit": false, - "isCollapsible": false, - "charts": [ - { - "id": "mcReceiptsByStatus", - "name": "DSS_MC_RECEIPTS_BY_STATUS", - "code": "", - "chartType": "donut", - "filter": "", - "headers": [] - } - ] - }, - { - "id": 232, - "name": "DSS_MC_COLLECTION_BY_STATUS", - "dimensions": { - "height": 250, - "width": 4 - }, - "vizType": "chart", - "noUnit": false, - "isCollapsible": false, - "charts": [ - { - "id": "mcCollectionByStatus", - "name": "DSS_MC_COLLECTION_BY_STATUS", - "code": "", - "chartType": "donut", - "filter": "", - "headers": [] - } - ] - } - ] - }, - - { - "row": 4, - "name": "DSS_REVENUE", - "vizArray": [ - - { - "id": 123, - "name": "DSS_MC_COLLECTION_CATEGORY_WISE", - "dimensions": { - "height": 250, - "width": 4 - }, - "vizType": "chart", - "noUnit": false, - "isCollapsible": false, - "charts": [ - { - "id": "mcTotalCollectionCategoryWise", - "name": "DSS_MC_COLLECTION_CATEGORY_WISE", - "code": "", - "chartType": "horizontalBar", - "filter": "", - "headers": [] - } - ] - }, - { - "id": 124, - "name": "DSS_MC_MONTHLY_REPORT", - "dimensions": { - "height": 250, - "width": 4 - }, - "vizType": "chart", - "noUnit": false, - "isCollapsible": false, - "charts": [ - { - "id": "mcMonthlyCollectionReport", - "name": "DSS_MC_MONTHLY_REPORT", - "code": "", - "chartType": "bar", - "filter": "", - "headers": [] - } - ] - } - ] - }, - { - "row": 5, - "name": "DSS_REVENUE", - "vizArray": [ - - { - "id": 236, - "name": "DSS_MC_REPORT_BY_TENANT", - "dimensions": { - "height": 250, - "width": 4 - }, - "vizType": "chart", - "noUnit": false, - "isCollapsible": false, - "charts": [ - { - "id": "mcReportByDDRv2", - "name": "DSS_MC_REPORT_BY_TENANT", - "code": "", - "chartType": "table", - "filter": "", - "headers": [], - "tabName": "Region" - }, - { - "id": "mcReportByCategoryv2", - "name": "DSS_MC_REPORT_BY_CATEGORY", - "code": "", - "chartType": "table", - "filter": "", - "headers": [], - "tabName": "Category" - } - ] - } - ] } ] }, + + + + { "name": "DSS_FIRE_NOC_DASHBOARD", "id": "noc", From a3e967e4d6b6bab00e1671b740f5d1ac84d95b09 Mon Sep 17 00:00:00 2001 From: chinmoy-eGov Date: Mon, 13 Feb 2023 13:04:27 +0530 Subject: [PATCH 1147/1242] UM-5403 --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 5e9cc865..b377d9ba 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -4096,7 +4096,7 @@ "queries": [ { "module": "COMMON", - "dateRefField": "", + "dateRefField": "dataObject.paymentDetails.receiptDate", "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\"}", "indexName": "dss-collection_v2", "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pb.testing\",\"pb\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"PT.MUTATION\",\"SW\"]}}],\"must\":[{\"range\":{\"dataObject.paymentDetails.receiptDate\":{\"gte\":\"now-1d\",\"lte\":\"now\"}}}]}},\"aggs\":{\"Todays Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" From c3506dd0d9ef99649f9115ec724d1b0a4522d296 Mon Sep 17 00:00:00 2001 From: vinothrallapalli-eGov Date: Mon, 13 Feb 2023 16:57:54 +0530 Subject: [PATCH 1148/1242] Update RoleDashboardMappingsConf.json --- .../RoleDashboardMappingsConf.json | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/RoleDashboardMappingsConf.json b/configs/egov-dss-dashboards/dashboard-analytics/RoleDashboardMappingsConf.json index 1fd49332..26ff89ce 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/RoleDashboardMappingsConf.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/RoleDashboardMappingsConf.json @@ -30,6 +30,14 @@ }, { "id": "ws" + }, + { + "name": "Misc Collect", + "id": "mCollect" + }, + { + "name": "Fire Noc", + "id": "noc" } ] }, @@ -57,6 +65,12 @@ }, { "id": "ulb-ws" + }, + { + "id": "ulb-mCollect" + }, + { + "id": "ulb-noc" } ] } From 2e07d748dcd7d8154ab7b5a67fd5ae0142f9b2ae Mon Sep 17 00:00:00 2001 From: chinmoy-eGov Date: Mon, 13 Feb 2023 17:33:08 +0530 Subject: [PATCH 1149/1242] UM-5403 --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index b377d9ba..5e9cc865 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -4096,7 +4096,7 @@ "queries": [ { "module": "COMMON", - "dateRefField": "dataObject.paymentDetails.receiptDate", + "dateRefField": "", "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\"}", "indexName": "dss-collection_v2", "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pb.testing\",\"pb\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"PT.MUTATION\",\"SW\"]}}],\"must\":[{\"range\":{\"dataObject.paymentDetails.receiptDate\":{\"gte\":\"now-1d\",\"lte\":\"now\"}}}]}},\"aggs\":{\"Todays Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" From 8aded138595d8e083a2009662b9090ad4f5c1170 Mon Sep 17 00:00:00 2001 From: chinmoy-eGov Date: Mon, 13 Feb 2023 17:37:33 +0530 Subject: [PATCH 1150/1242] UM-5403 --- .../dashboard-analytics/ChartApiConfig.json | 644 +++++++++++++++++- .../MasterDashboardConfig.json | 213 +++++- 2 files changed, 851 insertions(+), 6 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 5e9cc865..53928f1d 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -4563,8 +4563,650 @@ ], "insight": {}, "_comment": " " - } + }, + "mcMonthlyCollectionReport": { + "chartName": "DSS_MC_MONTHLY_REPORT", + "queries": [ + { + "module": "COMMON", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.Bill.billDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.cityDistrictCode\" }", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pg.testing\",\"pg\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"PT.MUTATION\",\"SW\"]}}]}},\"aggs\":{\"Collections\":{\"date_histogram\":{\"field\":\"dataObject.paymentDetails.receiptDate\",\"interval\":\"month\"},\"aggs\":{\"Sum\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}},\"Receipts\":{\"date_histogram\":{\"field\":\"dataObject.paymentDetails.receiptDate\",\"interval\":\"month\"},\"aggs\":{\"Total Receipts\":{\"value_count\":{\"field\":\"dataObject.paymentDetails.receiptNumber.keyword\"}}}}}}}}" + } + ], + "chartType": "line", + "valueType": "amount", + "action": "", + "drillChart": "none", + "documentType": "_doc", + "aggregationPaths": [ + "Collections", + "Receipts" + ], + "pathDataTypeMapping": [ + { + "Collections": "amount" + }, + { + "Receipts": "number" + } + ], + "isCumulative": false, + "interval": "month", + "insight": { + }, + "_comment": " " + }, + "mcReportByDDRv2": { + "chartName": "DSS_MC_REPORT_BY_TENANT", + "queries": [ + { + "module": "COMMON", + "requestQueryMap": "{\"tenantId\" : \"dataObject.tenantId.keyword\"}", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pg.testing\",\"pg\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"PT.MUTATION\",\"SW\"]}}]}},\"aggs\":{\"Total_Receipts\":{\"value_count\":{\"field\":\"dataObject.paymentDetails.receiptNumber.keyword\"}},\"MC_TOTAL_COLLECTION\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" + }, + + { + "module": "CHALLAN", + "requestQueryMap": "{\"tenantId\" : \"Data.tenantId.keyword\"}", + "dateRefField": "Data.taxPeriodFrom", + "indexName": "echallan-services", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pg.testing\"}},{\"terms\":{\"Data.businessService.keyword\":[\"TL\",\"PT\"]}}]}},\"aggs\":{\"Total_Challans\":{\"value_count\":{\"field\":\"Data.challanNo.keyword\"}}}}}}" + } + ], + "isMdmsEnabled": true, + "filterKeys": [ + {"key": "tenantId", "column": "DDRs"} + ], + "chartType": "xtable", + "drillChart": "mcReportByTenant", + "plotLabel": "DDRs", + "aggregationPaths": [ + "MC_TOTAL_COLLECTION", + "Total_Challans", + "Total_Receipts" + ], + "pathDataTypeMapping": [ + { + "MC_TOTAL_COLLECTION": "amount" + }, + { + "Total_Challans": "number" + }, + { + "Total_Receipts": "number" + } + ], + + "insight": { + }, + "_comment": "" + }, + "nocTodaysCollection": { + "chartName": "DSS_NOC_TODAYS_COLLECTION", + "queries": [ + { + "module": "FIRENOC", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must\":[{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"FIRENOC\"]}},{\"range\":{\"dataObject.paymentDetails.receiptDate\":{\"gte\":\"now-24h\",\"lte\":\"now\"}}}],\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pg.testing\"}},{\"term\":{\"dataObject.paymentStatus.keyword\":\"Cancelled\"}}]}},\"aggs\":{\"Todays Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}", + "requestQueryMap": "{\"wardId\" : \"dataObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\",\"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", + "dateRefField": "" + } + ], + "chartType": "metric", + "valueType": "amount", + "action": "", + "drillChart": "none", + "aggregationPaths": [ + "Todays Collection" + ], + "insight": { + }, + "_comment": "FIRE NOC todays collections " + }, + "nocCumulativeCollection": { + "chartName": "DSS_NOC_TOTAL_CUMULATIVE_COLLECTION", + "queries": [ + { + "module": "FIRENOC", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\r\n \"module\" : \"dataObject.paymentDetails.businessService.keyword\", \n\"tenantId\" : \"dataObject.tenantId\"}", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must\":[{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"FIRENOC\"]}}],\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pg.testing\"}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"NOC Cumulative Collections\":{\"date_histogram\":{\"field\":\"dataObject.paymentDetails.receiptDate\",\"interval\":\"intervalvalue\"},\"aggs\":{\"Sum\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" + } + ], + "chartType": "line", + "valueType": "amount", + "action": "", + "drillChart": "none", + "documentType": "_doc", + "aggregationPaths": [ + "NOC Cumulative Collections" + ], + "isCumulative": true, + "interval": "month", + "insight": {}, + "_comment": "" + }, + "nocTotalApplications": { + "chartName": "DSS_NOC_TOTAL_APPLICATIONS", + "queries": [ + { + "module": "FIRENOC", + "indexName": "firenoc-services", + "aggrQuery": "{\"aggs\":{\"FireNOC\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pg.testing\"}}]}},\"aggs\":{\"Total Applications\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}}", + "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\",\"tenantId\" : \"Data.tenantId\", \"district\" : \"Data.tenantData.city.districtCode\"}", + "dateRefField": "Data.auditDetails.createdTime" + } + ], + "chartType": "metric", + "valueType": "number", + "action": "", + "drillChart": "none", + "aggregationPaths": [ + "Total Applications" + ], + "insight": { + "chartResponseMap" : "nocTotalApplications", + "action" : "differenceOfNumbers", + "upwardIndicator" : "positive", + "downwardIndicator" : "negative", + "textMessage" : "$indicator$value% than last $insightInterval", + "colorCode" : "#228B22", + "insightInterval" : "year" + }, + "_comment": "FIRE NOC total applications " + }, + "nocProvisionalIssued": { + "chartName": "DSS_NOC_PROVISIONAL_ISSUED", + "queries": [ + { + "module": "FIRENOC", + "indexName": "firenoc-services", + "aggrQuery": "{\"aggs\":{\"FireNOC\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pg.testing\"}}]}},\"aggs\":{\"Provisional Fire Nocs issued\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"Data.fireNOCDetails.fireNOCType.keyword\":\"PROVISIONAL\"}}]}}}}}}}", + "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\",\"tenantId\" : \"Data.tenantId\", \"district\" : \"Data.tenantData.city.districtCode\"}", + "dateRefField": "Data.auditDetails.createdTime" + } + ], + "chartType": "metric", + "valueType": "number", + "action": "", + "drillChart": "none", + "aggregationPaths": [ + "Provisional Fire Nocs issued" + ], + "insight": { + "chartResponseMap" : "nocProvisionalIssued", + "action" : "differenceOfNumbers", + "upwardIndicator" : "positive", + "downwardIndicator" : "negative", + "textMessage" : "$indicator$value% than last $insightInterval", + "colorCode" : "#228B22", + "insightInterval" : "year" + }, + "_comment": "FIRE NOC Provisional Issued" + }, + "nocActualIssued": { + "chartName": "DSS_NOC_ACTUAL_ISSUED", + "queries": [ + { + "module": "FIRENOC", + "indexName": "firenoc-services", + "aggrQuery": "{\"aggs\":{\"FireNOC\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pg.testing\"}}]}},\"aggs\":{\"Actual Fire Nocs issued\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"Data.fireNOCDetails.fireNOCType.keyword\":\"NEW\"}}]}}}}}}}", + "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\",\"tenantId\" : \"Data.tenantId\", \"district\" : \"Data.tenantData.city.districtCode\"}", + "dateRefField": "Data.auditDetails.createdTime" + } + ], + "chartType": "metric", + "valueType": "number", + "action": "", + "drillChart": "none", + "aggregationPaths": [ + "Actual Fire Nocs issued" + ], + "insight": { + "chartResponseMap" : "nocActualIssued", + "action" : "differenceOfNumbers", + "upwardIndicator" : "positive", + "downwardIndicator" : "negative", + "textMessage" : "$indicator$value% than last $insightInterval", + "colorCode" : "#228B22", + "insightInterval" : "year" + }, + "_comment": "Actual fire nocs Issued" + }, + "nocSLAComplianceProvisional": { + "chartName": "DSS_NOC_SLA_COMPLIANCE_PROVISIONAL", + "queries": [ + { + "module": "FIRENOC", + "indexName": "firenoc-services", + "aggrQuery": "{\"aggs\":{\"FireNOC\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pg.testing\"}}]}},\"aggs\":{\"SLA Compliance (Provisional NOC)\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"Data.fireNOCDetails.fireNOCType.keyword\":\"PROVISIONAL\"}},{\"term\":{\"Data.fireNOCDetails.status.keyword\":\"APPROVED\"}},{\"script\":{\"script\":{\"source\":\"doc['Data.auditDetails.lastModifiedTime'].value-doc['Data.auditDetails.createdTime'].value Date: Tue, 14 Feb 2023 12:30:59 +0530 Subject: [PATCH 1151/1242] UM-5403 --- .../dashboard-analytics/ChartApiConfig.json | 94 +++++-------------- 1 file changed, 24 insertions(+), 70 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 53928f1d..eed50fa8 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -5070,76 +5070,7 @@ }, "_comment": "Bottom Performing Ulbs for provisional nocs issued" }, - "nocServiceReportByRegion": { - "chartName": "DSS_NOC_SERVICE_REPORT_REGION", - "queries": [ - { - "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"dataObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\",\"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", - "dateRefField": "dataObject.paymentDetails.receiptDate", - "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"FireNOC\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pg.testing\"}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}}],\"must\":[{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"FIRENOC\"]}}]}},\"aggs\":{\"firenoc_Total_Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" - }, - { - "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\",\"tenantId\" : \"Data.tenantId\", \"district\" : \"Data.tenantData.city.districtCode\"}", - "dateRefField": "Data.auditDetails.createdTime", - "indexName": "firenoc-services", - "aggrQuery": "{\"aggs\":{\"FireNOC\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pg.testing\"}}]}},\"aggs\":{\"Total_Applications\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}},\"Provisional_Fire_Nocs_issued\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"Data.fireNOCDetails.fireNOCType.keyword\":\"PROVISIONAL\"}}]}}},\"Actual_Fire_Nocs_issued\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"Data.fireNOCDetails.fireNOCType.keyword\":\"NEW\"}}]}}},\"Average_days_to_issue_Provisional_NOC\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"Data.fireNOCDetails.fireNOCType.keyword\":\"PROVISIONAL\"}},{\"term\":{\"Data.fireNOCDetails.status.keyword\":\"APPROVED\"}}]}},\"aggs\":{\"average_days\":{\"avg\":{\"script\":{\"source\":\"(doc['Data.auditDetails.lastModifiedTime'].value-doc['Data.auditDetails.createdTime'].value)\/(86400*1000)\"}}}}},\"Average_days_to_issue_Actual_NOC\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"Data.fireNOCDetails.fireNOCType.keyword\":\"NEW\"}},{\"term\":{\"Data.fireNOCDetails.status.keyword\":\"APPROVED\"}}]}},\"aggs\":{\"average_days\":{\"avg\":{\"script\":{\"source\":\"(doc['Data.auditDetails.lastModifiedTime'].value-doc['Data.auditDetails.createdTime'].value)\/(86400*1000)\"}}}}},\"SLA_Compliance(Actual_NOC)\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"Data.fireNOCDetails.fireNOCType.keyword\":\"NEW\"}},{\"term\":{\"Data.fireNOCDetails.status.keyword\":\"APPROVED\"}},{\"script\":{\"script\":{\"source\":\"doc['Data.auditDetails.lastModifiedTime'].value-doc['Data.auditDetails.createdTime'].value Date: Tue, 14 Feb 2023 12:41:58 +0530 Subject: [PATCH 1152/1242] UM-5403 --- .../dashboard-analytics/ChartApiConfig.json | 71 ++++++++++++++++++- 1 file changed, 70 insertions(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index eed50fa8..53c6d868 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -5070,7 +5070,76 @@ }, "_comment": "Bottom Performing Ulbs for provisional nocs issued" }, - + "nocServiceReportByRegion": { + "chartName": "DSS_NOC_SERVICE_REPORT_REGION", + "queries": [ + { + "module": "COMMON", + "requestQueryMap": "{\"wardId\" : \"dataObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\",\"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"FireNOC\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pg.testing\"}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}}],\"must\":[{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"FIRENOC\"]}}]}},\"aggs\":{\"firenoc_Total_Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" + }, + { + "module": "COMMON", + "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\",\"tenantId\" : \"Data.tenantId\", \"district\" : \"Data.tenantData.city.districtCode\"}", + "dateRefField": "Data.auditDetails.createdTime", + "indexName": "firenoc-services", + "aggrQuery": "{\"aggs\":{\"FireNOC\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pg.testing\"}}]}},\"aggs\":{\"Total_Applications\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}},\"Provisional_Fire_Nocs_issued\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"Data.fireNOCDetails.fireNOCType.keyword\":\"PROVISIONAL\"}}]}}},\"Actual_Fire_Nocs_issued\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"Data.fireNOCDetails.fireNOCType.keyword\":\"NEW\"}}]}}},\"Average_days_to_issue_Provisional_NOC\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"Data.fireNOCDetails.fireNOCType.keyword\":\"PROVISIONAL\"}},{\"term\":{\"Data.fireNOCDetails.status.keyword\":\"APPROVED\"}}]}},\"aggs\":{\"average_days\":{\"avg\":{\"script\":{\"source\":\"(doc['Data.auditDetails.lastModifiedTime'].value-doc['Data.auditDetails.createdTime'].value)\/(86400*1000)\"}}}}},\"Average_days_to_issue_Actual_NOC\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"Data.fireNOCDetails.fireNOCType.keyword\":\"NEW\"}},{\"term\":{\"Data.fireNOCDetails.status.keyword\":\"APPROVED\"}}]}},\"aggs\":{\"average_days\":{\"avg\":{\"script\":{\"source\":\"(doc['Data.auditDetails.lastModifiedTime'].value-doc['Data.auditDetails.createdTime'].value)\/(86400*1000)\"}}}}},\"SLA_Compliance(Actual_NOC)\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"Data.fireNOCDetails.fireNOCType.keyword\":\"NEW\"}},{\"term\":{\"Data.fireNOCDetails.status.keyword\":\"APPROVED\"}},{\"script\":{\"script\":{\"source\":\"doc['Data.auditDetails.lastModifiedTime'].value-doc['Data.auditDetails.createdTime'].value Date: Tue, 14 Feb 2023 12:51:05 +0530 Subject: [PATCH 1153/1242] UM-5403 --- .../MasterDashboardConfig.json | 40 +------------------ 1 file changed, 2 insertions(+), 38 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json index e74dee63..628c4a05 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json @@ -4532,44 +4532,8 @@ ] } ] - }, - { - "row": 5, - "name": "DSS_OVERVIEW", - "vizArray": [ - { - "id": 231, - "name": "Service Report", - "dimensions": { - "height": 350, - "width": 12 - }, - "vizType": "chart", - "noUnit": false, - "isCollapsible": false, - "charts": [ - { - "id": "nocServiceReportByRegion", - "name": "DSS_NOC_SERVICE_REPORT_REGION", - "code": "", - "chartType": "table", - "filter": "", - "headers": [], - "tabName": "Region" - }, - { - "id": "nocServiceReportByDepartment", - "name": "DSS_NOC_SERVICE_REPORT_DEPARTMENT", - "code": "", - "chartType": "table", - "filter": "", - "headers": [], - "tabName": "Department" - } - ] - } - ] - } + } + ] }, { From a147bd2220407a46c29eab415cb7e520c508673c Mon Sep 17 00:00:00 2001 From: chinmoy-eGov Date: Tue, 14 Feb 2023 12:56:45 +0530 Subject: [PATCH 1154/1242] UM-5403 --- .../MasterDashboardConfig.json | 40 ++++++++++++++++++- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json index 628c4a05..e74dee63 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json @@ -4532,8 +4532,44 @@ ] } ] - } - + }, + { + "row": 5, + "name": "DSS_OVERVIEW", + "vizArray": [ + { + "id": 231, + "name": "Service Report", + "dimensions": { + "height": 350, + "width": 12 + }, + "vizType": "chart", + "noUnit": false, + "isCollapsible": false, + "charts": [ + { + "id": "nocServiceReportByRegion", + "name": "DSS_NOC_SERVICE_REPORT_REGION", + "code": "", + "chartType": "table", + "filter": "", + "headers": [], + "tabName": "Region" + }, + { + "id": "nocServiceReportByDepartment", + "name": "DSS_NOC_SERVICE_REPORT_DEPARTMENT", + "code": "", + "chartType": "table", + "filter": "", + "headers": [], + "tabName": "Department" + } + ] + } + ] + } ] }, { From de467f7547a39cf59f429ab0a63a541c7946424b Mon Sep 17 00:00:00 2001 From: chinmoy-eGov Date: Tue, 14 Feb 2023 16:11:06 +0530 Subject: [PATCH 1155/1242] UM-5403 --- .../dashboard-analytics/MasterDashboardConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json index e74dee63..e49ceb48 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json @@ -4542,7 +4542,7 @@ "name": "Service Report", "dimensions": { "height": 350, - "width": 12 + "width": 4 }, "vizType": "chart", "noUnit": false, From 6439274e23e0669140817de397655a6210cf7a2b Mon Sep 17 00:00:00 2001 From: chinmoy-eGov Date: Tue, 14 Feb 2023 16:19:33 +0530 Subject: [PATCH 1156/1242] UM-5403 --- .../dashboard-analytics/MasterDashboardConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json index e49ceb48..ee041901 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json @@ -4541,7 +4541,7 @@ "id": 231, "name": "Service Report", "dimensions": { - "height": 350, + "height": 250, "width": 4 }, "vizType": "chart", From d0d00ce3a4ff8daa44b60af7af017c53953a48e2 Mon Sep 17 00:00:00 2001 From: chinmoy-eGov Date: Tue, 14 Feb 2023 16:39:18 +0530 Subject: [PATCH 1157/1242] UM-5403 --- .../MasterDashboardConfig.json | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json index ee041901..6c84c7e0 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json @@ -4535,11 +4535,12 @@ }, { "row": 5, - "name": "DSS_OVERVIEW", + "name": "DSS_REVENUE", "vizArray": [ + { - "id": 231, - "name": "Service Report", + "id": 236, + "name": "DSS_MC_REPORT_BY_TENANT", "dimensions": { "height": 250, "width": 4 @@ -4549,8 +4550,8 @@ "isCollapsible": false, "charts": [ { - "id": "nocServiceReportByRegion", - "name": "DSS_NOC_SERVICE_REPORT_REGION", + "id": "mcReportByDDRv2", + "name": "DSS_MC_REPORT_BY_TENANT", "code": "", "chartType": "table", "filter": "", @@ -4558,13 +4559,13 @@ "tabName": "Region" }, { - "id": "nocServiceReportByDepartment", - "name": "DSS_NOC_SERVICE_REPORT_DEPARTMENT", + "id": "mcReportByCategoryv2", + "name": "DSS_MC_REPORT_BY_CATEGORY", "code": "", "chartType": "table", "filter": "", "headers": [], - "tabName": "Department" + "tabName": "Category" } ] } From 74b796c29909eb0412becc219beacc59647f756c Mon Sep 17 00:00:00 2001 From: chinmoy-eGov Date: Tue, 14 Feb 2023 16:43:49 +0530 Subject: [PATCH 1158/1242] UM-5403 --- .../MasterDashboardConfig.json | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json index 6c84c7e0..ee041901 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json @@ -4535,12 +4535,11 @@ }, { "row": 5, - "name": "DSS_REVENUE", + "name": "DSS_OVERVIEW", "vizArray": [ - { - "id": 236, - "name": "DSS_MC_REPORT_BY_TENANT", + "id": 231, + "name": "Service Report", "dimensions": { "height": 250, "width": 4 @@ -4550,8 +4549,8 @@ "isCollapsible": false, "charts": [ { - "id": "mcReportByDDRv2", - "name": "DSS_MC_REPORT_BY_TENANT", + "id": "nocServiceReportByRegion", + "name": "DSS_NOC_SERVICE_REPORT_REGION", "code": "", "chartType": "table", "filter": "", @@ -4559,13 +4558,13 @@ "tabName": "Region" }, { - "id": "mcReportByCategoryv2", - "name": "DSS_MC_REPORT_BY_CATEGORY", + "id": "nocServiceReportByDepartment", + "name": "DSS_NOC_SERVICE_REPORT_DEPARTMENT", "code": "", "chartType": "table", "filter": "", "headers": [], - "tabName": "Category" + "tabName": "Department" } ] } From a857f2a148441f6b2fdd81f3aa703309024c29b2 Mon Sep 17 00:00:00 2001 From: chinmoy-eGov Date: Wed, 15 Feb 2023 15:16:41 +0530 Subject: [PATCH 1159/1242] UM-5403 --- .../dashboard-analytics/ChartApiConfig.json | 54 +++++++++---------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 53c6d868..011466b9 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -4572,7 +4572,7 @@ "dateRefField": "dataObject.paymentDetails.receiptDate", "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.Bill.billDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.cityDistrictCode\" }", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pg.testing\",\"pg\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"PT.MUTATION\",\"SW\"]}}]}},\"aggs\":{\"Collections\":{\"date_histogram\":{\"field\":\"dataObject.paymentDetails.receiptDate\",\"interval\":\"month\"},\"aggs\":{\"Sum\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}},\"Receipts\":{\"date_histogram\":{\"field\":\"dataObject.paymentDetails.receiptDate\",\"interval\":\"month\"},\"aggs\":{\"Total Receipts\":{\"value_count\":{\"field\":\"dataObject.paymentDetails.receiptNumber.keyword\"}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pb.testing\",\"pb\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"PT.MUTATION\",\"SW\"]}}]}},\"aggs\":{\"Collections\":{\"date_histogram\":{\"field\":\"dataObject.paymentDetails.receiptDate\",\"interval\":\"month\"},\"aggs\":{\"Sum\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}},\"Receipts\":{\"date_histogram\":{\"field\":\"dataObject.paymentDetails.receiptDate\",\"interval\":\"month\"},\"aggs\":{\"Total Receipts\":{\"value_count\":{\"field\":\"dataObject.paymentDetails.receiptNumber.keyword\"}}}}}}}}" } ], "chartType": "line", @@ -4606,7 +4606,7 @@ "requestQueryMap": "{\"tenantId\" : \"dataObject.tenantId.keyword\"}", "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pg.testing\",\"pg\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"PT.MUTATION\",\"SW\"]}}]}},\"aggs\":{\"Total_Receipts\":{\"value_count\":{\"field\":\"dataObject.paymentDetails.receiptNumber.keyword\"}},\"MC_TOTAL_COLLECTION\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pb.testing\",\"pb\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"PT.MUTATION\",\"SW\"]}}]}},\"aggs\":{\"Total_Receipts\":{\"value_count\":{\"field\":\"dataObject.paymentDetails.receiptNumber.keyword\"}},\"MC_TOTAL_COLLECTION\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" }, { @@ -4614,7 +4614,7 @@ "requestQueryMap": "{\"tenantId\" : \"Data.tenantId.keyword\"}", "dateRefField": "Data.taxPeriodFrom", "indexName": "echallan-services", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pg.testing\"}},{\"terms\":{\"Data.businessService.keyword\":[\"TL\",\"PT\"]}}]}},\"aggs\":{\"Total_Challans\":{\"value_count\":{\"field\":\"Data.challanNo.keyword\"}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"Data.businessService.keyword\":[\"TL\",\"PT\"]}}]}},\"aggs\":{\"Total_Challans\":{\"value_count\":{\"field\":\"Data.challanNo.keyword\"}}}}}}" } ], "isMdmsEnabled": true, @@ -4651,7 +4651,7 @@ { "module": "FIRENOC", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must\":[{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"FIRENOC\"]}},{\"range\":{\"dataObject.paymentDetails.receiptDate\":{\"gte\":\"now-24h\",\"lte\":\"now\"}}}],\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pg.testing\"}},{\"term\":{\"dataObject.paymentStatus.keyword\":\"Cancelled\"}}]}},\"aggs\":{\"Todays Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must\":[{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"FIRENOC\"]}},{\"range\":{\"dataObject.paymentDetails.receiptDate\":{\"gte\":\"now-24h\",\"lte\":\"now\"}}}],\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"term\":{\"dataObject.paymentStatus.keyword\":\"Cancelled\"}}]}},\"aggs\":{\"Todays Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}", "requestQueryMap": "{\"wardId\" : \"dataObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\",\"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", "dateRefField": "" } @@ -4675,7 +4675,7 @@ "dateRefField": "dataObject.paymentDetails.receiptDate", "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\r\n \"module\" : \"dataObject.paymentDetails.businessService.keyword\", \n\"tenantId\" : \"dataObject.tenantId\"}", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must\":[{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"FIRENOC\"]}}],\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pg.testing\"}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"NOC Cumulative Collections\":{\"date_histogram\":{\"field\":\"dataObject.paymentDetails.receiptDate\",\"interval\":\"intervalvalue\"},\"aggs\":{\"Sum\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must\":[{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"FIRENOC\"]}}],\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"NOC Cumulative Collections\":{\"date_histogram\":{\"field\":\"dataObject.paymentDetails.receiptDate\",\"interval\":\"intervalvalue\"},\"aggs\":{\"Sum\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" } ], "chartType": "line", @@ -4697,7 +4697,7 @@ { "module": "FIRENOC", "indexName": "firenoc-services", - "aggrQuery": "{\"aggs\":{\"FireNOC\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pg.testing\"}}]}},\"aggs\":{\"Total Applications\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}}", + "aggrQuery": "{\"aggs\":{\"FireNOC\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Total Applications\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}}", "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\",\"tenantId\" : \"Data.tenantId\", \"district\" : \"Data.tenantData.city.districtCode\"}", "dateRefField": "Data.auditDetails.createdTime" } @@ -4726,7 +4726,7 @@ { "module": "FIRENOC", "indexName": "firenoc-services", - "aggrQuery": "{\"aggs\":{\"FireNOC\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pg.testing\"}}]}},\"aggs\":{\"Provisional Fire Nocs issued\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"Data.fireNOCDetails.fireNOCType.keyword\":\"PROVISIONAL\"}}]}}}}}}}", + "aggrQuery": "{\"aggs\":{\"FireNOC\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Provisional Fire Nocs issued\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"Data.fireNOCDetails.fireNOCType.keyword\":\"PROVISIONAL\"}}]}}}}}}}", "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\",\"tenantId\" : \"Data.tenantId\", \"district\" : \"Data.tenantData.city.districtCode\"}", "dateRefField": "Data.auditDetails.createdTime" } @@ -4755,7 +4755,7 @@ { "module": "FIRENOC", "indexName": "firenoc-services", - "aggrQuery": "{\"aggs\":{\"FireNOC\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pg.testing\"}}]}},\"aggs\":{\"Actual Fire Nocs issued\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"Data.fireNOCDetails.fireNOCType.keyword\":\"NEW\"}}]}}}}}}}", + "aggrQuery": "{\"aggs\":{\"FireNOC\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Actual Fire Nocs issued\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"Data.fireNOCDetails.fireNOCType.keyword\":\"NEW\"}}]}}}}}}}", "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\",\"tenantId\" : \"Data.tenantId\", \"district\" : \"Data.tenantData.city.districtCode\"}", "dateRefField": "Data.auditDetails.createdTime" } @@ -4784,7 +4784,7 @@ { "module": "FIRENOC", "indexName": "firenoc-services", - "aggrQuery": "{\"aggs\":{\"FireNOC\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pg.testing\"}}]}},\"aggs\":{\"SLA Compliance (Provisional NOC)\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"Data.fireNOCDetails.fireNOCType.keyword\":\"PROVISIONAL\"}},{\"term\":{\"Data.fireNOCDetails.status.keyword\":\"APPROVED\"}},{\"script\":{\"script\":{\"source\":\"doc['Data.auditDetails.lastModifiedTime'].value-doc['Data.auditDetails.createdTime'].value Date: Thu, 16 Feb 2023 10:11:45 +0530 Subject: [PATCH 1160/1242] UM-5403 --- .../dashboard-analytics/MasterDashboardConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json index ee041901..8102ed10 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json @@ -4541,7 +4541,7 @@ "id": 231, "name": "Service Report", "dimensions": { - "height": 250, + "height": 150, "width": 4 }, "vizType": "chart", From 8008fa606b4db604bd8aca23d6e0950e67b6674c Mon Sep 17 00:00:00 2001 From: Ramesh Kumar Date: Thu, 16 Feb 2023 17:04:47 +0530 Subject: [PATCH 1161/1242] fixed issues in approve --- configs/pdf-service/data-config/tlcertificate.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/pdf-service/data-config/tlcertificate.json b/configs/pdf-service/data-config/tlcertificate.json index fb3170b5..cdfea59c 100644 --- a/configs/pdf-service/data-config/tlcertificate.json +++ b/configs/pdf-service/data-config/tlcertificate.json @@ -433,7 +433,7 @@ } }, { - "variable": "trade_license_certifcate", + "variable": "trade_license_certificate", "value": { "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_LICENSE_CERTIFICATE" }, @@ -715,7 +715,7 @@ "responseMapping":[ { "variable":"approvedBy", - "value":"$.ProcessInstances[?(@.action == 'APPROVE')].assigner.name" + "value":"$.ProcessInstances[?(@.action == 'APPROVE')].assigner.name==null?'SYSTEM': $.ProcessInstances[?(@.action == 'APPROVE')].assigner.name" } ] From eb14a82c04caddb2ba5aa762ff9a50a94c49b703 Mon Sep 17 00:00:00 2001 From: Ramesh Kumar Date: Thu, 16 Feb 2023 17:07:21 +0530 Subject: [PATCH 1162/1242] Fixed issues approved --- configs/pdf-service/data-config/tlcertificate.json | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/pdf-service/data-config/tlcertificate.json b/configs/pdf-service/data-config/tlcertificate.json index cdfea59c..88e64785 100644 --- a/configs/pdf-service/data-config/tlcertificate.json +++ b/configs/pdf-service/data-config/tlcertificate.json @@ -717,7 +717,6 @@ "variable":"approvedBy", "value":"$.ProcessInstances[?(@.action == 'APPROVE')].assigner.name==null?'SYSTEM': $.ProcessInstances[?(@.action == 'APPROVE')].assigner.name" } - ] } From 75aee7cfbbd47ae52b09624476dc30387f07c143 Mon Sep 17 00:00:00 2001 From: chinmoy-eGov Date: Thu, 16 Feb 2023 17:33:04 +0530 Subject: [PATCH 1163/1242] UM-5403 --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 011466b9..8edca326 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -4099,7 +4099,7 @@ "dateRefField": "", "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\"}", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pb.testing\",\"pb\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"PT.MUTATION\",\"SW\"]}}],\"must\":[{\"range\":{\"dataObject.paymentDetails.receiptDate\":{\"gte\":\"now-1d\",\"lte\":\"now\"}}}]}},\"aggs\":{\"Todays Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pb.testing\",\"pb\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"PT.MUTATION\",\"SW\"]}}],\"must\":[{\"range\":{\"dataObject.paymentDetails.receiptDate\":{\"gte\":\"now\",\"lte\":\"now\"}}}]}},\"aggs\":{\"Todays Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" } ], "chartType": "metric", From 343b9cce693d2c896d0c9cd6581ac5e2073ce068 Mon Sep 17 00:00:00 2001 From: chinmoy-eGov Date: Thu, 16 Feb 2023 17:37:12 +0530 Subject: [PATCH 1164/1242] UM-5403 --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 8edca326..011466b9 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -4099,7 +4099,7 @@ "dateRefField": "", "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\"}", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pb.testing\",\"pb\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"PT.MUTATION\",\"SW\"]}}],\"must\":[{\"range\":{\"dataObject.paymentDetails.receiptDate\":{\"gte\":\"now\",\"lte\":\"now\"}}}]}},\"aggs\":{\"Todays Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pb.testing\",\"pb\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"PT.MUTATION\",\"SW\"]}}],\"must\":[{\"range\":{\"dataObject.paymentDetails.receiptDate\":{\"gte\":\"now-1d\",\"lte\":\"now\"}}}]}},\"aggs\":{\"Todays Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" } ], "chartType": "metric", From 6c7308d829539f60f3c4f3cbb845a750a13a6305 Mon Sep 17 00:00:00 2001 From: Ramesh Kumar Date: Fri, 17 Feb 2023 09:37:46 +0530 Subject: [PATCH 1165/1242] Syntex error fixed NA --- configs/pdf-service/data-config/tlcertificate.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/pdf-service/data-config/tlcertificate.json b/configs/pdf-service/data-config/tlcertificate.json index 88e64785..21456f6c 100644 --- a/configs/pdf-service/data-config/tlcertificate.json +++ b/configs/pdf-service/data-config/tlcertificate.json @@ -715,7 +715,7 @@ "responseMapping":[ { "variable":"approvedBy", - "value":"$.ProcessInstances[?(@.action == 'APPROVE')].assigner.name==null?'SYSTEM': $.ProcessInstances[?(@.action == 'APPROVE')].assigner.name" + "value":"$.ProcessInstances[?(@.action == 'APPROVE')].assigner.name == NA ?'SYSTEM': $.ProcessInstances[?(@.action == 'APPROVE')].assigner.name" } ] } From 79c0fba221a7c7976ce8daa5a8cdd9eb2ce8388a Mon Sep 17 00:00:00 2001 From: Ramesh Kumar Date: Mon, 20 Feb 2023 12:44:41 +0530 Subject: [PATCH 1166/1242] Change tlcertificate --- configs/pdf-service/data-config/tlcertificate.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/pdf-service/data-config/tlcertificate.json b/configs/pdf-service/data-config/tlcertificate.json index 21456f6c..16663a81 100644 --- a/configs/pdf-service/data-config/tlcertificate.json +++ b/configs/pdf-service/data-config/tlcertificate.json @@ -715,7 +715,7 @@ "responseMapping":[ { "variable":"approvedBy", - "value":"$.ProcessInstances[?(@.action == 'APPROVE')].assigner.name == NA ?'SYSTEM': $.ProcessInstances[?(@.action == 'APPROVE')].assigner.name" + "value":"($.ProcessInstances[?(@.action == 'APPROVE')].assigner.name == 'NA') ?'SYSTEM': ($.ProcessInstances[?(@.action == 'APPROVE')].assigner.name)" } ] } From 6e3e1f2a4a64629ae1d9703cba9ac663a569ebab Mon Sep 17 00:00:00 2001 From: Ramesh Kumar Date: Mon, 20 Feb 2023 16:02:13 +0530 Subject: [PATCH 1167/1242] changes tl service --- configs/pdf-service/data-config/tlcertificate.json | 7 ++++++- configs/pdf-service/format-config/tlcertificate.json | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/configs/pdf-service/data-config/tlcertificate.json b/configs/pdf-service/data-config/tlcertificate.json index 16663a81..8c7ba354 100644 --- a/configs/pdf-service/data-config/tlcertificate.json +++ b/configs/pdf-service/data-config/tlcertificate.json @@ -715,8 +715,13 @@ "responseMapping":[ { "variable":"approvedBy", - "value":"($.ProcessInstances[?(@.action == 'APPROVE')].assigner.name == 'NA') ?'SYSTEM': ($.ProcessInstances[?(@.action == 'APPROVE')].assigner.name)" + "value":"$.ProcessInstances[?(@.action == 'APPROVE')].assigner.name" + }, + { + "variable":"approvedByNone", + "value":"SYSTEM" } + ] } diff --git a/configs/pdf-service/format-config/tlcertificate.json b/configs/pdf-service/format-config/tlcertificate.json index d2e0efd0..642c5b45 100644 --- a/configs/pdf-service/format-config/tlcertificate.json +++ b/configs/pdf-service/format-config/tlcertificate.json @@ -496,7 +496,7 @@ "bold": true }, { - "text":" {{approvedBy}}", + "text":" {{approvedBy}}=='NA'?{{approvedByNone}}:{{approvedBy}}", "bold": false } ], From f72d589fa5cb4f084a8810cfac76b79536cb3349 Mon Sep 17 00:00:00 2001 From: Ramesh Kumar Date: Mon, 20 Feb 2023 16:42:14 +0530 Subject: [PATCH 1168/1242] again changes tl service --- configs/pdf-service/data-config/tlcertificate.json | 6 +----- configs/pdf-service/format-config/tlcertificate.json | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/configs/pdf-service/data-config/tlcertificate.json b/configs/pdf-service/data-config/tlcertificate.json index 8c7ba354..6b75e723 100644 --- a/configs/pdf-service/data-config/tlcertificate.json +++ b/configs/pdf-service/data-config/tlcertificate.json @@ -715,11 +715,7 @@ "responseMapping":[ { "variable":"approvedBy", - "value":"$.ProcessInstances[?(@.action == 'APPROVE')].assigner.name" - }, - { - "variable":"approvedByNone", - "value":"SYSTEM" + "value":"=if($.ProcessInstances[?(@.action == 'APPROVE')].assigner.name=='NA','SYSTEM',$.ProcessInstances[?(@.action == 'APPROVE')].assigner.name)" } ] diff --git a/configs/pdf-service/format-config/tlcertificate.json b/configs/pdf-service/format-config/tlcertificate.json index 642c5b45..8bc1cc77 100644 --- a/configs/pdf-service/format-config/tlcertificate.json +++ b/configs/pdf-service/format-config/tlcertificate.json @@ -496,7 +496,7 @@ "bold": true }, { - "text":" {{approvedBy}}=='NA'?{{approvedByNone}}:{{approvedBy}}", + "text":"{{approvedBy}}", "bold": false } ], From 071fabb7d0f90fa892e813755ce7b3e29f56c538 Mon Sep 17 00:00:00 2001 From: Ramesh Kumar Date: Tue, 21 Feb 2023 10:43:24 +0530 Subject: [PATCH 1169/1242] Updated Water mark in trade licence --- configs/pdf-service/format-config/tl-receipt.json | 7 +++++++ configs/pdf-service/format-config/tlapplication.json | 7 +++++++ configs/pdf-service/format-config/tlcertificate.json | 8 +++++++- .../pdf-service/format-config/tlrenewalcertificate.json | 8 +++++++- configs/pdf-service/format-config/tradelicense-bill.json | 7 +++++++ .../pdf-service/format-config/tradelicense-receipt.json | 7 +++++++ 6 files changed, 42 insertions(+), 2 deletions(-) diff --git a/configs/pdf-service/format-config/tl-receipt.json b/configs/pdf-service/format-config/tl-receipt.json index b11b6fb8..836ec825 100644 --- a/configs/pdf-service/format-config/tl-receipt.json +++ b/configs/pdf-service/format-config/tl-receipt.json @@ -1,6 +1,13 @@ { "key":"tl-receipt", "config":{ + "watermark": { + "text": "DIGIT UAT DIGIT UAT", + "color": "gery", + "opacity": 0.1, + "bold": true, + "italics": false + }, "content": [ { "style": "tl-head", diff --git a/configs/pdf-service/format-config/tlapplication.json b/configs/pdf-service/format-config/tlapplication.json index 5fc7b2ab..ed6df3c1 100644 --- a/configs/pdf-service/format-config/tlapplication.json +++ b/configs/pdf-service/format-config/tlapplication.json @@ -4,6 +4,13 @@ "defaultStyle": { "font": "Cambay" }, + "watermark": { + "text": "DIGIT UAT DIGIT UAT", + "color": "gery", + "opacity": 0.1, + "bold": true, + "italics": false + }, "content": [ { "style": "noc-head", diff --git a/configs/pdf-service/format-config/tlcertificate.json b/configs/pdf-service/format-config/tlcertificate.json index 8bc1cc77..e9b22a51 100644 --- a/configs/pdf-service/format-config/tlcertificate.json +++ b/configs/pdf-service/format-config/tlcertificate.json @@ -4,7 +4,13 @@ "defaultStyle": { "font": "Cambay" }, - + "watermark": { + "text": "DIGIT UAT DIGIT UAT", + "color": "gery", + "opacity": 0.1, + "bold": true, + "italics": false + }, "content": [ { "style":"noc-head", diff --git a/configs/pdf-service/format-config/tlrenewalcertificate.json b/configs/pdf-service/format-config/tlrenewalcertificate.json index 00394afa..cc63c60b 100644 --- a/configs/pdf-service/format-config/tlrenewalcertificate.json +++ b/configs/pdf-service/format-config/tlrenewalcertificate.json @@ -4,7 +4,13 @@ "defaultStyle": { "font": "Cambay" }, - + "watermark": { + "text": "DIGIT UAT DIGIT UAT", + "color": "gery", + "opacity": 0.1, + "bold": true, + "italics": false + }, "content": [ { "style":"noc-head", diff --git a/configs/pdf-service/format-config/tradelicense-bill.json b/configs/pdf-service/format-config/tradelicense-bill.json index 93131e26..07927192 100644 --- a/configs/pdf-service/format-config/tradelicense-bill.json +++ b/configs/pdf-service/format-config/tradelicense-bill.json @@ -4,6 +4,13 @@ "defaultStyle": { "font": "Cambay" }, + "watermark": { + "text": "DIGIT UAT DIGIT UAT", + "color": "gery", + "opacity": 0.1, + "bold": true, + "italics": false + }, "content": [ { "style": "noc-head", diff --git a/configs/pdf-service/format-config/tradelicense-receipt.json b/configs/pdf-service/format-config/tradelicense-receipt.json index 78558186..64c97611 100644 --- a/configs/pdf-service/format-config/tradelicense-receipt.json +++ b/configs/pdf-service/format-config/tradelicense-receipt.json @@ -4,6 +4,13 @@ "defaultStyle": { "font": "Cambay" }, + "watermark": { + "text": "DIGIT UAT DIGIT UAT", + "color": "gery", + "opacity": 0.1, + "bold": true, + "italics": false + }, "content": [ { "style": "noc-head", From 754701bc93b6cffb6c7244701e5730c685808f0f Mon Sep 17 00:00:00 2001 From: Ramesh Kumar Date: Tue, 21 Feb 2023 10:54:18 +0530 Subject: [PATCH 1170/1242] Updated property tx watermark --- configs/pdf-service/format-config/property-bill.json | 7 +++++++ configs/pdf-service/format-config/property-receipt.json | 7 +++++++ configs/pdf-service/format-config/pt-receipt.json | 8 +++++++- .../pdf-service/format-config/ptmutationcertificate.json | 7 +++++++ 4 files changed, 28 insertions(+), 1 deletion(-) diff --git a/configs/pdf-service/format-config/property-bill.json b/configs/pdf-service/format-config/property-bill.json index 140463f7..06f85152 100644 --- a/configs/pdf-service/format-config/property-bill.json +++ b/configs/pdf-service/format-config/property-bill.json @@ -4,6 +4,13 @@ "defaultStyle": { "font": "Cambay" }, + "watermark": { + "text": "DIGIT UAT DIGIT UAT", + "color": "gery", + "opacity": 0.1, + "bold": true, + "italics": false + }, "content": [ { "style": "noc-head", diff --git a/configs/pdf-service/format-config/property-receipt.json b/configs/pdf-service/format-config/property-receipt.json index 00bd295a..49e0972d 100644 --- a/configs/pdf-service/format-config/property-receipt.json +++ b/configs/pdf-service/format-config/property-receipt.json @@ -4,6 +4,13 @@ "defaultStyle": { "font": "Cambay" }, + "watermark": { + "text": "DIGIT UAT DIGIT UAT", + "color": "gery", + "opacity": 0.1, + "bold": true, + "italics": false + }, "content": [ { "style": "noc-head", diff --git a/configs/pdf-service/format-config/pt-receipt.json b/configs/pdf-service/format-config/pt-receipt.json index 4a1b0797..eca90b07 100644 --- a/configs/pdf-service/format-config/pt-receipt.json +++ b/configs/pdf-service/format-config/pt-receipt.json @@ -1,7 +1,13 @@ { "key":"pt-receipt", "config":{ - + "watermark": { + "text": "DIGIT UAT DIGIT UAT", + "color": "gery", + "opacity": 0.1, + "bold": true, + "italics": false + }, "content":[ { "style": "pt-reciept-citizen-table", diff --git a/configs/pdf-service/format-config/ptmutationcertificate.json b/configs/pdf-service/format-config/ptmutationcertificate.json index 07b8fe6d..7ed429fb 100644 --- a/configs/pdf-service/format-config/ptmutationcertificate.json +++ b/configs/pdf-service/format-config/ptmutationcertificate.json @@ -4,6 +4,13 @@ "defaultStyle": { "font": "Cambay" }, + "watermark": { + "text": "DIGIT UAT DIGIT UAT", + "color": "gery", + "opacity": 0.1, + "bold": true, + "italics": false + }, "content": [ { "style": "noc-head", From 59e227d6977256ca4383a8475bf36bb7ce09b3b7 Mon Sep 17 00:00:00 2001 From: Ramesh Kumar Date: Tue, 21 Feb 2023 11:20:18 +0530 Subject: [PATCH 1171/1242] Updated watermark --- configs/pdf-service/format-config/property-bill.json | 2 +- configs/pdf-service/format-config/property-receipt.json | 2 +- configs/pdf-service/format-config/pt-receipt.json | 2 +- configs/pdf-service/format-config/ptmutationcertificate.json | 2 +- configs/pdf-service/format-config/tl-receipt.json | 2 +- configs/pdf-service/format-config/tlapplication.json | 2 +- configs/pdf-service/format-config/tlcertificate.json | 2 +- configs/pdf-service/format-config/tlrenewalcertificate.json | 2 +- configs/pdf-service/format-config/tradelicense-bill.json | 2 +- configs/pdf-service/format-config/tradelicense-receipt.json | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/configs/pdf-service/format-config/property-bill.json b/configs/pdf-service/format-config/property-bill.json index 06f85152..7618cc00 100644 --- a/configs/pdf-service/format-config/property-bill.json +++ b/configs/pdf-service/format-config/property-bill.json @@ -30,7 +30,7 @@ { "stack": [ { - "text": "{{logo_header}} {{Municipal_Corporation}}", + "text": "{{logo_header}} {{Municipal_Corporation}} (DIGIT UAT)", "style": "receipt-logo-header" }, { diff --git a/configs/pdf-service/format-config/property-receipt.json b/configs/pdf-service/format-config/property-receipt.json index 49e0972d..0a563488 100644 --- a/configs/pdf-service/format-config/property-receipt.json +++ b/configs/pdf-service/format-config/property-receipt.json @@ -30,7 +30,7 @@ { "stack": [ { - "text": "{{logo-header}} {{mcGrade}}", + "text": "{{logo-header}} {{mcGrade}} (DIGIT UAT)", "style": "receipt-logo-header" }, { diff --git a/configs/pdf-service/format-config/pt-receipt.json b/configs/pdf-service/format-config/pt-receipt.json index eca90b07..462765c4 100644 --- a/configs/pdf-service/format-config/pt-receipt.json +++ b/configs/pdf-service/format-config/pt-receipt.json @@ -38,7 +38,7 @@ { "stack": [ { - "text": "{{variable35}} NAGAR PANCHAYAT", + "text": "{{variable35}} NAGAR PANCHAYAT (DIGIT UAT)", "style": "receipt-logo-header" }, { diff --git a/configs/pdf-service/format-config/ptmutationcertificate.json b/configs/pdf-service/format-config/ptmutationcertificate.json index 7ed429fb..dd7fe279 100644 --- a/configs/pdf-service/format-config/ptmutationcertificate.json +++ b/configs/pdf-service/format-config/ptmutationcertificate.json @@ -37,7 +37,7 @@ { "stack": [ { - "text": "{{ULB_CITY}} {{municipal_corportaion}}", + "text": "{{ULB_CITY}} {{municipal_corportaion}} (DIGIT UAT) ", "style": "receipt-logo-header" }, { diff --git a/configs/pdf-service/format-config/tl-receipt.json b/configs/pdf-service/format-config/tl-receipt.json index 836ec825..845053b1 100644 --- a/configs/pdf-service/format-config/tl-receipt.json +++ b/configs/pdf-service/format-config/tl-receipt.json @@ -33,7 +33,7 @@ { "stack": [ { - "text": "{{variable30}} Nagar Panchayat", + "text": "{{variable30}} Nagar Panchayat (DIGIT UAT)", "style": "receipt-logo-header" }, { diff --git a/configs/pdf-service/format-config/tlapplication.json b/configs/pdf-service/format-config/tlapplication.json index ed6df3c1..17a57f0e 100644 --- a/configs/pdf-service/format-config/tlapplication.json +++ b/configs/pdf-service/format-config/tlapplication.json @@ -23,7 +23,7 @@ "body": [ [ { - "text":"{{trade_license_application}}", + "text":"{{trade_license_application}} (DIGIT UAT)", "style": "receipt-logo-header" }, { diff --git a/configs/pdf-service/format-config/tlcertificate.json b/configs/pdf-service/format-config/tlcertificate.json index e9b22a51..db6fb57a 100644 --- a/configs/pdf-service/format-config/tlcertificate.json +++ b/configs/pdf-service/format-config/tlcertificate.json @@ -41,7 +41,7 @@ "stack": [ { - "text":"{{mcGrade}},{{city}}", + "text":"{{mcGrade}},{{city}} (DIGIT UAT)", "style":"receipt-logo-header" }, { diff --git a/configs/pdf-service/format-config/tlrenewalcertificate.json b/configs/pdf-service/format-config/tlrenewalcertificate.json index cc63c60b..ce984607 100644 --- a/configs/pdf-service/format-config/tlrenewalcertificate.json +++ b/configs/pdf-service/format-config/tlrenewalcertificate.json @@ -41,7 +41,7 @@ "stack": [ { - "text":"{{mcGrade}},{{city}}", + "text":"{{mcGrade}},{{city}} (DIGIT UAT)", "style":"receipt-logo-header" }, { diff --git a/configs/pdf-service/format-config/tradelicense-bill.json b/configs/pdf-service/format-config/tradelicense-bill.json index 07927192..60f5b451 100644 --- a/configs/pdf-service/format-config/tradelicense-bill.json +++ b/configs/pdf-service/format-config/tradelicense-bill.json @@ -30,7 +30,7 @@ { "stack": [ { - "text": "{{logo_header}} {{Municipal_Corporation}}", + "text": "{{logo_header}} {{Municipal_Corporation}} (DIGIT UAT)", "style": "receipt-logo-header" }, { diff --git a/configs/pdf-service/format-config/tradelicense-receipt.json b/configs/pdf-service/format-config/tradelicense-receipt.json index 64c97611..145583c5 100644 --- a/configs/pdf-service/format-config/tradelicense-receipt.json +++ b/configs/pdf-service/format-config/tradelicense-receipt.json @@ -30,7 +30,7 @@ { "stack": [ { - "text": "{{logo-header}} {{mcGrade}}", + "text": "{{logo-header}} {{mcGrade}} (DIGIT UAT)", "style": "receipt-logo-header" }, { From cbb5d73be736e342b22e72e957437d6838eb9834 Mon Sep 17 00:00:00 2001 From: Ramesh Kumar Date: Tue, 21 Feb 2023 12:30:44 +0530 Subject: [PATCH 1172/1242] Updated watermark all services in UAT bill and recipts --- .../format-config/bill-amendment-note.json | 10 ++++++++-- configs/pdf-service/format-config/bill-amendment.json | 10 ++++++++-- configs/pdf-service/format-config/bpa-revocation.json | 9 ++++++++- .../pdf-service/format-config/buildingpermit-low.json | 9 ++++++++- configs/pdf-service/format-config/buildingpermit.json | 9 ++++++++- .../pdf-service/format-config/consolidated-pdf1.json | 7 +++++++ .../pdf-service/format-config/consolidated-pdf2.json | 7 +++++++ .../pdf-service/format-config/consolidatedbill.json | 9 ++++++++- .../format-config/consolidatedreceipt.json | 9 ++++++++- .../format-config/consolidatedreceiptold.json | 9 ++++++++- .../pdf-service/format-config/firenoc-receipt.json | 7 +++++++ configs/pdf-service/format-config/firenocreceipt.json | 9 ++++++++- configs/pdf-service/format-config/mcollect-bill.json | 2 +- .../pdf-service/format-config/mcollect-challan.json | 2 +- configs/pdf-service/format-config/misc-receipt.json | 9 ++++++++- .../format-config/passvehicle-certificate.json | 8 ++++++++ .../format-config/sewerage-bill-amendment-note.json | 10 ++++++++-- configs/pdf-service/format-config/sw-bill.json | 9 ++++++++- .../format-config/testconsolidatedreceipt.json | 9 ++++++++- .../format-config/testlocalconsolidatedbill.json | 9 ++++++++- .../format-config/testlocalconsolidatedreceipt.json | 9 ++++++++- .../format-config/ws-applicationsewerage.json | 9 ++++++++- .../format-config/ws-applicationwater.json | 9 ++++++++- configs/pdf-service/format-config/ws-bill.json | 9 ++++++++- .../format-config/ws-consolidatedacknowlegment.json | 9 ++++++++- .../ws-consolidatedsewerageconnection.json | 9 ++++++++- .../format-config/ws-estimationnotice.json | 9 ++++++++- .../pdf-service/format-config/ws-onetime-receipt.json | 9 ++++++++- .../pdf-service/format-config/ws-sanctionletter.json | 11 +++++++++-- 29 files changed, 216 insertions(+), 29 deletions(-) diff --git a/configs/pdf-service/format-config/bill-amendment-note.json b/configs/pdf-service/format-config/bill-amendment-note.json index e6d16b50..b8e76059 100644 --- a/configs/pdf-service/format-config/bill-amendment-note.json +++ b/configs/pdf-service/format-config/bill-amendment-note.json @@ -4,7 +4,13 @@ "defaultStyle": { "font": "Cambay" }, - + "watermark": { + "text": "DIGIT UAT DIGIT UAT", + "color": "gery", + "opacity": 0.1, + "bold": true, + "italics": false + }, "content": [ { "style": "noc-head", @@ -25,7 +31,7 @@ { "stack": [ { - "text": "{{logo-header}} {{mcGrade}}", + "text": "{{logo-header}} {{mcGrade}} (Digit UAT)", "style": "receipt-logo-header" }, { diff --git a/configs/pdf-service/format-config/bill-amendment.json b/configs/pdf-service/format-config/bill-amendment.json index 700c7dd9..01e77a67 100644 --- a/configs/pdf-service/format-config/bill-amendment.json +++ b/configs/pdf-service/format-config/bill-amendment.json @@ -4,7 +4,13 @@ "defaultStyle": { "font": "Cambay" }, - + "watermark": { + "text": "DIGIT UAT DIGIT UAT", + "color": "gery", + "opacity": 0.1, + "bold": true, + "italics": false + }, "content": [ { "style": "noc-head", @@ -25,7 +31,7 @@ { "stack": [ { - "text": "{{logo-header}} {{mcGrade}}", + "text": "{{logo-header}} {{mcGrade}} (DIGIT UAT)", "style": "receipt-logo-header" }, { diff --git a/configs/pdf-service/format-config/bpa-revocation.json b/configs/pdf-service/format-config/bpa-revocation.json index 43731998..962afcd7 100644 --- a/configs/pdf-service/format-config/bpa-revocation.json +++ b/configs/pdf-service/format-config/bpa-revocation.json @@ -4,6 +4,13 @@ "defaultStyle": { "font": "Cambay" }, + "watermark": { + "text": "DIGIT UAT DIGIT UAT", + "color": "gery", + "opacity": 0.1, + "bold": true, + "italics": false + }, "content": [ { "columns": [ @@ -16,7 +23,7 @@ { "stack": [ { - "text": "{{tenantName}} {{Muncipal_Council}}", + "text": "{{tenantName}} {{Muncipal_Council}} (Digit UAT)", "style": "header" }, { diff --git a/configs/pdf-service/format-config/buildingpermit-low.json b/configs/pdf-service/format-config/buildingpermit-low.json index f565545f..ff08ecef 100644 --- a/configs/pdf-service/format-config/buildingpermit-low.json +++ b/configs/pdf-service/format-config/buildingpermit-low.json @@ -4,6 +4,13 @@ "defaultStyle": { "font": "Cambay" }, + "watermark": { + "text": "DIGIT UAT DIGIT UAT", + "color": "gery", + "opacity": 0.1, + "bold": true, + "italics": false + }, "content": [ { "text" : "{{GENERATED_ON}} : ", @@ -30,7 +37,7 @@ { "stack": [ { - "text": "{{tenantName}} {{Muncipal_Council}}", + "text": "{{tenantName}} {{Muncipal_Council}} (Digit UAT)", "style": "header" }, { diff --git a/configs/pdf-service/format-config/buildingpermit.json b/configs/pdf-service/format-config/buildingpermit.json index 0bb95339..76439020 100644 --- a/configs/pdf-service/format-config/buildingpermit.json +++ b/configs/pdf-service/format-config/buildingpermit.json @@ -4,6 +4,13 @@ "defaultStyle": { "font": "Cambay" }, + "watermark": { + "text": "DIGIT UAT DIGIT UAT", + "color": "gery", + "opacity": 0.1, + "bold": true, + "italics": false + }, "content": [ { "text" : "{{GENERATED_ON}} : ", @@ -30,7 +37,7 @@ { "stack": [ { - "text": "{{tenantName}} {{Muncipal_Council}}", + "text": "{{tenantName}} {{Muncipal_Council}} (Digit UAT)", "style": "header" }, { diff --git a/configs/pdf-service/format-config/consolidated-pdf1.json b/configs/pdf-service/format-config/consolidated-pdf1.json index d9197f53..1c106159 100644 --- a/configs/pdf-service/format-config/consolidated-pdf1.json +++ b/configs/pdf-service/format-config/consolidated-pdf1.json @@ -1,6 +1,13 @@ { "key": "consolidated-pdf1", "config": { + "watermark": { + "text": "DIGIT UAT DIGIT UAT", + "color": "gery", + "opacity": 0.1, + "bold": true, + "italics": false + }, "content": [ { "style": "noc-head", diff --git a/configs/pdf-service/format-config/consolidated-pdf2.json b/configs/pdf-service/format-config/consolidated-pdf2.json index f41c0de5..3dfe0657 100644 --- a/configs/pdf-service/format-config/consolidated-pdf2.json +++ b/configs/pdf-service/format-config/consolidated-pdf2.json @@ -1,6 +1,13 @@ { "key": "consolidated-pdf2", "config": { + "watermark": { + "text": "DIGIT UAT DIGIT UAT", + "color": "gery", + "opacity": 0.1, + "bold": true, + "italics": false + }, "content": [ { "style": "noc-head", diff --git a/configs/pdf-service/format-config/consolidatedbill.json b/configs/pdf-service/format-config/consolidatedbill.json index 992700b0..76a359ce 100644 --- a/configs/pdf-service/format-config/consolidatedbill.json +++ b/configs/pdf-service/format-config/consolidatedbill.json @@ -4,6 +4,13 @@ "defaultStyle": { "font": "Cambay" }, + "watermark": { + "text": "DIGIT UAT DIGIT UAT", + "color": "gery", + "opacity": 0.1, + "bold": true, + "italics": false + }, "content": [ { "style": "noc-head", @@ -23,7 +30,7 @@ { "stack": [ { - "text": "{{logo_header}} {{Municipal_Corporation}}", + "text": "{{logo_header}} {{Municipal_Corporation}} (Digit UAT)", "style": "receipt-logo-header" }, { diff --git a/configs/pdf-service/format-config/consolidatedreceipt.json b/configs/pdf-service/format-config/consolidatedreceipt.json index 9fb901c4..e0b756ca 100644 --- a/configs/pdf-service/format-config/consolidatedreceipt.json +++ b/configs/pdf-service/format-config/consolidatedreceipt.json @@ -4,6 +4,13 @@ "defaultStyle": { "font": "Cambay" }, + "watermark": { + "text": "DIGIT UAT DIGIT UAT", + "color": "gery", + "opacity": 0.1, + "bold": true, + "italics": false + }, "content": [ { "style": "noc-head", @@ -23,7 +30,7 @@ { "stack": [ { - "text": "{{logo-header}} {{mcGrade}}", + "text": "{{logo-header}} {{mcGrade}} (Digit UAT)", "style": "receipt-logo-header" }, { diff --git a/configs/pdf-service/format-config/consolidatedreceiptold.json b/configs/pdf-service/format-config/consolidatedreceiptold.json index ef1aad3f..49236651 100644 --- a/configs/pdf-service/format-config/consolidatedreceiptold.json +++ b/configs/pdf-service/format-config/consolidatedreceiptold.json @@ -4,6 +4,13 @@ "defaultStyle": { "font": "Cambay" }, + "watermark": { + "text": "DIGIT UAT DIGIT UAT", + "color": "gery", + "opacity": 0.1, + "bold": true, + "italics": false + }, "content": [ { "style": "noc-head", @@ -23,7 +30,7 @@ { "stack": [ { - "text": "{{logo-header}} {{mcGrade}}", + "text": "{{logo-header}} {{mcGrade}} (Digit UAT)", "style": "receipt-logo-header" }, { diff --git a/configs/pdf-service/format-config/firenoc-receipt.json b/configs/pdf-service/format-config/firenoc-receipt.json index 623f282e..142e8a68 100644 --- a/configs/pdf-service/format-config/firenoc-receipt.json +++ b/configs/pdf-service/format-config/firenoc-receipt.json @@ -1,6 +1,13 @@ { "key":"firenoc-receipt", "config":{ + "watermark": { + "text": "DIGIT UAT DIGIT UAT", + "color": "gery", + "opacity": 0.1, + "bold": true, + "italics": false + }, "content": [ { "style": "noc-head", diff --git a/configs/pdf-service/format-config/firenocreceipt.json b/configs/pdf-service/format-config/firenocreceipt.json index f3379075..ca18aad7 100644 --- a/configs/pdf-service/format-config/firenocreceipt.json +++ b/configs/pdf-service/format-config/firenocreceipt.json @@ -4,6 +4,13 @@ "defaultStyle": { "font": "Cambay" }, + "watermark": { + "text": "DIGIT UAT DIGIT UAT", + "color": "gery", + "opacity": 0.1, + "bold": true, + "italics": false + }, "content": [ { "style": "noc-head", @@ -23,7 +30,7 @@ { "stack": [ { - "text": "{{logo-header}} {{mcGrade}}", + "text": "{{logo-header}} {{mcGrade}} (Digit UAT)", "style": "receipt-logo-header" }, { diff --git a/configs/pdf-service/format-config/mcollect-bill.json b/configs/pdf-service/format-config/mcollect-bill.json index 9a8af3ff..eee45482 100644 --- a/configs/pdf-service/format-config/mcollect-bill.json +++ b/configs/pdf-service/format-config/mcollect-bill.json @@ -23,7 +23,7 @@ "body": [ [ { - "text": "{{letter-code}}", + "text": "{{letter-code}} (Digit UAT)", "style": "receipt-logo-header" }, { diff --git a/configs/pdf-service/format-config/mcollect-challan.json b/configs/pdf-service/format-config/mcollect-challan.json index 0326c09a..abdd15a1 100644 --- a/configs/pdf-service/format-config/mcollect-challan.json +++ b/configs/pdf-service/format-config/mcollect-challan.json @@ -61,7 +61,7 @@ { "stack": [ { - "text": "{{cb-name}} {{mcGrade}}", + "text": "{{cb-name}} {{mcGrade}} (Digit UAT)", "alignment": "center", "style": "receipt-logo-title-name" }, diff --git a/configs/pdf-service/format-config/misc-receipt.json b/configs/pdf-service/format-config/misc-receipt.json index babaa3eb..fb2f7cf7 100644 --- a/configs/pdf-service/format-config/misc-receipt.json +++ b/configs/pdf-service/format-config/misc-receipt.json @@ -4,6 +4,13 @@ "defaultStyle": { "font": "Cambay" }, + "watermark": { + "text": "DIGIT UAT DIGIT UAT", + "color": "gery", + "opacity": 0.1, + "bold": true, + "italics": false + }, "content": [ { "style": "noc-head", @@ -28,7 +35,7 @@ { "stack": [ { - "text": "{{logo-header}}", + "text": "{{logo-header}} (Digit UAT)", "style": "receipt-logo-header" }, { diff --git a/configs/pdf-service/format-config/passvehicle-certificate.json b/configs/pdf-service/format-config/passvehicle-certificate.json index dcbb8d75..160fc4ab 100644 --- a/configs/pdf-service/format-config/passvehicle-certificate.json +++ b/configs/pdf-service/format-config/passvehicle-certificate.json @@ -4,6 +4,14 @@ "defaultStyle": { "font": "Cambay" }, + "watermark": { + "text": "DIGIT UAT DIGIT UAT", + "color": "gery", + "opacity": 0.1, + "bold": true, + "italics": false + }, + "content": [ { diff --git a/configs/pdf-service/format-config/sewerage-bill-amendment-note.json b/configs/pdf-service/format-config/sewerage-bill-amendment-note.json index 2b021649..09ddbdc7 100644 --- a/configs/pdf-service/format-config/sewerage-bill-amendment-note.json +++ b/configs/pdf-service/format-config/sewerage-bill-amendment-note.json @@ -4,7 +4,13 @@ "defaultStyle": { "font": "Cambay" }, - + "watermark": { + "text": "DIGIT UAT DIGIT UAT", + "color": "gery", + "opacity": 0.1, + "bold": true, + "italics": false + }, "content": [ { "style": "noc-head", @@ -25,7 +31,7 @@ { "stack": [ { - "text": "{{logo-header}} {{mcGrade}}", + "text": "{{logo-header}} {{mcGrade}} (Digit UAT)", "style": "receipt-logo-header" }, { diff --git a/configs/pdf-service/format-config/sw-bill.json b/configs/pdf-service/format-config/sw-bill.json index 020b5c8a..2fb27238 100644 --- a/configs/pdf-service/format-config/sw-bill.json +++ b/configs/pdf-service/format-config/sw-bill.json @@ -4,6 +4,13 @@ "defaultStyle": { "font": "Cambay" }, + "watermark": { + "text": "DIGIT UAT DIGIT UAT", + "color": "gery", + "opacity": 0.1, + "bold": true, + "italics": false + }, "content": [ { "style": "noc-head", @@ -23,7 +30,7 @@ { "stack": [ { - "text": "{{logo_header}} {{mcGrade}}", + "text": "{{logo_header}} {{mcGrade}} (Digit UAT)", "style": "receipt-logo-header" }, { diff --git a/configs/pdf-service/format-config/testconsolidatedreceipt.json b/configs/pdf-service/format-config/testconsolidatedreceipt.json index bb9d7d72..9f1f86f6 100644 --- a/configs/pdf-service/format-config/testconsolidatedreceipt.json +++ b/configs/pdf-service/format-config/testconsolidatedreceipt.json @@ -4,6 +4,13 @@ "defaultStyle": { "font": "Cambay" }, + "watermark": { + "text": "DIGIT UAT DIGIT UAT", + "color": "gery", + "opacity": 0.1, + "bold": true, + "italics": false + }, "content": [ { "style": "noc-head", @@ -23,7 +30,7 @@ { "stack": [ { - "text": "{{logo-header}} {{Municipal_Corporation}}", + "text": "{{logo-header}} {{Municipal_Corporation}} (Digit UAT)", "style": "receipt-logo-header" }, { diff --git a/configs/pdf-service/format-config/testlocalconsolidatedbill.json b/configs/pdf-service/format-config/testlocalconsolidatedbill.json index 2d7fde53..639a4ca0 100644 --- a/configs/pdf-service/format-config/testlocalconsolidatedbill.json +++ b/configs/pdf-service/format-config/testlocalconsolidatedbill.json @@ -4,6 +4,13 @@ "defaultStyle": { "font": "Cambay" }, + "watermark": { + "text": "DIGIT UAT DIGIT UAT", + "color": "gery", + "opacity": 0.1, + "bold": true, + "italics": false + }, "content": [ { "style": "noc-head", @@ -23,7 +30,7 @@ { "stack": [ { - "text": "{{logo_header}}", + "text": "{{logo_header}} (Digit UAT)", "style": "receipt-logo-header" }, { diff --git a/configs/pdf-service/format-config/testlocalconsolidatedreceipt.json b/configs/pdf-service/format-config/testlocalconsolidatedreceipt.json index 6aecca7b..14c0e79f 100644 --- a/configs/pdf-service/format-config/testlocalconsolidatedreceipt.json +++ b/configs/pdf-service/format-config/testlocalconsolidatedreceipt.json @@ -4,6 +4,13 @@ "defaultStyle": { "font": "Cambay" }, + "watermark": { + "text": "DIGIT UAT DIGIT UAT", + "color": "gery", + "opacity": 0.1, + "bold": true, + "italics": false + }, "content": [ { "style": "noc-head", @@ -27,7 +34,7 @@ "style": "receipt-logo-header" }, { - "text": "{{serviceType}} {{payment_receipt}}", + "text": "{{serviceType}} {{payment_receipt}} (Digit UAT)", "style": "receipt-logo-sub-header" } ], diff --git a/configs/pdf-service/format-config/ws-applicationsewerage.json b/configs/pdf-service/format-config/ws-applicationsewerage.json index 63f1ffc1..6c854d1e 100644 --- a/configs/pdf-service/format-config/ws-applicationsewerage.json +++ b/configs/pdf-service/format-config/ws-applicationsewerage.json @@ -4,6 +4,13 @@ "defaultStyle": { "font": "Cambay" }, + "watermark": { + "text": "DIGIT UAT DIGIT UAT", + "color": "gery", + "opacity": 0.1, + "bold": true, + "italics": false + }, "content": [ { "style": "ws-head", @@ -29,7 +36,7 @@ { "stack": [ { - "text": "{{logo_header}} {{mcGrade}}", + "text": "{{logo_header}} {{mcGrade}} (Digit UAT)", "style": "receipt-logo-header" }, { diff --git a/configs/pdf-service/format-config/ws-applicationwater.json b/configs/pdf-service/format-config/ws-applicationwater.json index dd94db75..5a9e1260 100644 --- a/configs/pdf-service/format-config/ws-applicationwater.json +++ b/configs/pdf-service/format-config/ws-applicationwater.json @@ -4,6 +4,13 @@ "defaultStyle": { "font": "Cambay" }, + "watermark": { + "text": "DIGIT UAT DIGIT UAT", + "color": "gery", + "opacity": 0.1, + "bold": true, + "italics": false + }, "content": [ { "style": "ws-head", @@ -29,7 +36,7 @@ { "stack": [ { - "text": "{{logo_header}} {{mcGrade}}", + "text": "{{logo_header}} {{mcGrade}} (Digit UAT)", "style": "receipt-logo-header" }, { diff --git a/configs/pdf-service/format-config/ws-bill.json b/configs/pdf-service/format-config/ws-bill.json index f1f4a5c0..9c23e462 100644 --- a/configs/pdf-service/format-config/ws-bill.json +++ b/configs/pdf-service/format-config/ws-bill.json @@ -4,6 +4,13 @@ "defaultStyle": { "font": "Cambay" }, + "watermark": { + "text": "DIGIT UAT DIGIT UAT", + "color": "gery", + "opacity": 0.1, + "bold": true, + "italics": false + }, "content": [ { "style": "noc-head", @@ -23,7 +30,7 @@ { "stack": [ { - "text": "{{logo_header}} {{mcGrade}}", + "text": "{{logo_header}} {{mcGrade}} (Digit UAT)", "style": "receipt-logo-header" }, { diff --git a/configs/pdf-service/format-config/ws-consolidatedacknowlegment.json b/configs/pdf-service/format-config/ws-consolidatedacknowlegment.json index 5e2e9c5f..d4fe6da6 100644 --- a/configs/pdf-service/format-config/ws-consolidatedacknowlegment.json +++ b/configs/pdf-service/format-config/ws-consolidatedacknowlegment.json @@ -4,6 +4,13 @@ "defaultStyle": { "font": "Cambay" }, + "watermark": { + "text": "DIGIT UAT DIGIT UAT", + "color": "gery", + "opacity": 0.1, + "bold": true, + "italics": false + }, "content": [ { "style": "ws-head", @@ -29,7 +36,7 @@ { "stack": [ { - "text": "{{logo_header}} {{mcGrade}}", + "text": "{{logo_header}} {{mcGrade}} (Digit UAT)", "style": "receipt-logo-header" }, { diff --git a/configs/pdf-service/format-config/ws-consolidatedsewerageconnection.json b/configs/pdf-service/format-config/ws-consolidatedsewerageconnection.json index 1eed2e44..e22da0a5 100644 --- a/configs/pdf-service/format-config/ws-consolidatedsewerageconnection.json +++ b/configs/pdf-service/format-config/ws-consolidatedsewerageconnection.json @@ -4,6 +4,13 @@ "defaultStyle": { "font": "Cambay" }, + "watermark": { + "text": "DIGIT UAT DIGIT UAT", + "color": "gery", + "opacity": 0.1, + "bold": true, + "italics": false + }, "content": [ { "style": "ws-head", @@ -29,7 +36,7 @@ { "stack": [ { - "text": "{{logo_header}} {{mcGrade}}", + "text": "{{logo_header}} {{mcGrade}} (Digit UAT)", "style": "receipt-logo-header" }, { diff --git a/configs/pdf-service/format-config/ws-estimationnotice.json b/configs/pdf-service/format-config/ws-estimationnotice.json index ddc08e4f..dc487c6d 100644 --- a/configs/pdf-service/format-config/ws-estimationnotice.json +++ b/configs/pdf-service/format-config/ws-estimationnotice.json @@ -4,6 +4,13 @@ "defaultStyle": { "font": "Cambay" }, + "watermark": { + "text": "DIGIT UAT DIGIT UAT", + "color": "gery", + "opacity": 0.1, + "bold": true, + "italics": false + }, "content": [ { "style": "ws-head", @@ -29,7 +36,7 @@ { "stack": [ { - "text": "{{tenantName}} - {{UAT}}", + "text": "{{tenantName}} - {{UAT}} (Digit UAT)", "style": "receipt-logo-header", "margin": [ 0, diff --git a/configs/pdf-service/format-config/ws-onetime-receipt.json b/configs/pdf-service/format-config/ws-onetime-receipt.json index fdb7f8bf..89b411a6 100644 --- a/configs/pdf-service/format-config/ws-onetime-receipt.json +++ b/configs/pdf-service/format-config/ws-onetime-receipt.json @@ -4,6 +4,13 @@ "defaultStyle": { "font": "Cambay" }, + "watermark": { + "text": "DIGIT UAT DIGIT UAT", + "color": "gery", + "opacity": 0.1, + "bold": true, + "italics": false + }, "content": [ { "style": "noc-head", @@ -23,7 +30,7 @@ { "stack": [ { - "text": "{{logo-header}}", + "text": "{{logo-header}} (Digit UAT)", "style": "receipt-logo-header" }, { diff --git a/configs/pdf-service/format-config/ws-sanctionletter.json b/configs/pdf-service/format-config/ws-sanctionletter.json index 06c5ee84..b16169c3 100644 --- a/configs/pdf-service/format-config/ws-sanctionletter.json +++ b/configs/pdf-service/format-config/ws-sanctionletter.json @@ -4,6 +4,13 @@ "defaultStyle": { "font": "Cambay" }, + "watermark": { + "text": "DIGIT UAT DIGIT UAT", + "color": "gery", + "opacity": 0.1, + "bold": true, + "italics": false + }, "content": [ { "style": "ws-head", @@ -29,7 +36,7 @@ { "stack": [ { - "text": "{{mcGrade}}", + "text": "{{mcGrade}} (Digit UAT)", "style": "receipt-logo-header", "margin": [ 0, @@ -39,7 +46,7 @@ ] }, { - "text": "{{tenantName}}", + "text": "{{tenantName}} (Digit UAT)", "style": "receipt-logo-header" }, { From 4d9c3ddde9bcc776529f02d7852a6d5d2ab8195c Mon Sep 17 00:00:00 2001 From: chinmoy-eGov Date: Thu, 23 Feb 2023 12:17:50 +0530 Subject: [PATCH 1173/1242] UM-5403 adding finance card to dashboard --- .../dashboard-analytics/ChartApiConfig.json | 60 +++++++++ .../MasterDashboardConfig.json | 119 ++++++++++++++++++ 2 files changed, 179 insertions(+) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 011466b9..25542f74 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -5228,6 +5228,66 @@ "insight": { }, "_comment": " " + }, + "financeTotalBillsGenerated": { + "chartName": "DSS_FINANCE_TOTAL_BILLS_GENERATED", + "queries": [ + { + "module": "FINANCE", + "dateRefField": "", + "requestQueryMap": "{\"region\" : \"regionname.keyword\",\"district\" : \"districtname.keyword\", \"tenantId\" : \"ulbname.keyword\"}", + "indexName": "financeindex-v1", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[],\"must\":[]}},\"aggs\":{\"Bills Generated\":{\"sum\":{\"field\":\"numberofbills\"}}}}}}" + } + ], + "chartType": "metric", + "valueType": "number", + "drillChart": "none", + "documentType": "_doc", + "action": "", + "aggregationPaths": [ + "Bills Generated" + ], + "insight": { + "chartResponseMap" : "financeTotalBillsGenerated", + "action" : "differenceOfNumbers", + "upwardIndicator" : "positive", + "downwardIndicator" : "negative", + "textMessage" : "$indicator$value% than last $insightInterval", + "colorCode" : "#228B22", + "insightInterval" : "month" + }, + "_comment": " " + }, + "financeTotalPayments": { + "chartName": "DSS_FINANCE_TOTAL_PAYMENTS", + "queries": [ + { + "module": "FINANCE", + "dateRefField": "", + "requestQueryMap": "{\"region\" : \"regionname.keyword\",\"district\" : \"districtname.keyword\", \"tenantId\" : \"ulbname.keyword\"}", + "indexName": "financeindex-v1", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[],\"must\":[]}},\"aggs\":{\"Total Payments\":{\"sum\":{\"field\":\"numberofpayments\"}}}}}}" + } + ], + "chartType": "metric", + "valueType": "number", + "drillChart": "none", + "documentType": "_doc", + "action": "", + "aggregationPaths": [ + "Total Payments" + ], + "insight": { + "chartResponseMap" : "financeTotalPayments", + "action" : "differenceOfNumbers", + "upwardIndicator" : "positive", + "downwardIndicator" : "negative", + "textMessage" : "$indicator$value% than last $insightInterval", + "colorCode" : "#228B22", + "insightInterval" : "month" + }, + "_comment": " " } diff --git a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json index 8102ed10..f2a230cc 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json @@ -1635,6 +1635,42 @@ ] } ] + }, + { + "row": 3, + "name": "DSS_OVERVIEW", + "vizArray": [ + { + "id": 153, + "name": "DSS_FINANCE", + "vizType": "module", + "moduleLevel": "FINANCE", + "ref": { + "url": "finance", + "logoUrl": "", + "type": "internal" + }, + "label": "", + "charts": [ + { + "id": "financeTotalBillsGenerated", + "name": "DSS_FINANCE_TOTAL_BILLS_GENERATED", + "code": "", + "chartType": "metric", + "filter": "", + "headers": [] + }, + { + "id": "financeTotalPayments", + "name": "DSS_FINANCE_TOTAL_PAYMENTS", + "code": "", + "chartType": "metric", + "filter": "", + "headers": [] + } + ] + } + ] } ] }, @@ -4572,6 +4608,89 @@ } ] }, + { + "name": "DSS_FINANCE_DASHBOARD", + "id": "finance", + "isActive": "", + "style": "linear", + "visualizations": [ + { + "row": 1, + "name": "DSS_FINANCE", + "vizArray": [ + { + "id": 411, + "name": "DSS_FINANCE_OVERVIEW", + "dimensions": { + "height": 200, + "width": 12 + }, + "vizType": "collection", + "label": "DSS_FINANCE_OVERVIEW", + "noUnit": true, + "isCollapsible": false, + "charts": [ + { + "id": "financeTotalCollection", + "name": "DSS_FINANCE_TOTAL_COLLECTION", + "code": "", + "chartType": "metric", + "filter": "", + "headers": [] + }, + { + "id": "financeTotalBillAmount", + "name": "DSS_FINANCE_TOTAL_BILL_AMOUNT", + "code": "", + "chartType": "metric", + "filter": "", + "headers": [] + }, + { + "id": "financeTotalPaidAmount", + "name": "DSS_FINANCE_TOTAL_PAID_AMOUNT", + "code": "", + "chartType": "metric", + "filter": "", + "headers": [] + } + ] + } + ] + }, + { + "row": 2, + "name": "DSS_FINANCE", + "vizArray": [ + { + "id": 423, + "name": "DSS_FINANCE_INSIGHTS", + "dimensions": { + "height": 350, + "width": 12 + }, + "vizType": "chart", + "label": "", + "noUnit": false, + "isCollapsible": false, + "charts": [ + { + + "id": "financeInsights", + "name": "DSS_FINANCE_BOUNDARY", + "code": "", + "chartType": "table", + "filter": "", + "headers": [], + "tabName": "Boundary" + + } + ] + } + ] + } + ] + }, { "name":"DSS_BUILDING_PLANNING_DASHBOARD", "id":"obps", From a39ed4bc3c09f682e3cb4de6c79d6ea9a9259887 Mon Sep 17 00:00:00 2001 From: chinmoy-eGov Date: Thu, 23 Feb 2023 12:54:34 +0530 Subject: [PATCH 1174/1242] UM-5403 adding finance card to dashboard --- .../dashboard-analytics/ChartApiConfig.json | 165 ++++++++++++++++++ 1 file changed, 165 insertions(+) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 25542f74..10059045 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -5288,7 +5288,172 @@ "insightInterval" : "month" }, "_comment": " " + }, + "financeTotalPayments": { + "chartName": "DSS_FINANCE_TOTAL_PAYMENTS", + "queries": [ + { + "module": "FINANCE", + "dateRefField": "", + "requestQueryMap": "{\"region\" : \"regionname.keyword\",\"district\" : \"districtname.keyword\", \"tenantId\" : \"ulbname.keyword\"}", + "indexName": "financeindex-v1", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[],\"must\":[]}},\"aggs\":{\"Total Payments\":{\"sum\":{\"field\":\"numberofpayments\"}}}}}}" + } + ], + "chartType": "metric", + "valueType": "number", + "drillChart": "none", + "documentType": "_doc", + "action": "", + "aggregationPaths": [ + "Total Payments" + ], + "insight": { + "chartResponseMap" : "financeTotalPayments", + "action" : "differenceOfNumbers", + "upwardIndicator" : "positive", + "downwardIndicator" : "negative", + "textMessage" : "$indicator$value% than last $insightInterval", + "colorCode" : "#228B22", + "insightInterval" : "month" + }, + "_comment": " " + }, + "financeTotalBillAmount": { + "chartName": "DSS_FINANCE_TOTAL_BILL_AMOUNT", + "queries": [ + { + "module": "FINANCE", + "dateRefField": "", + "requestQueryMap": "{\"region\" : \"regionname.keyword\",\"district\" : \"districtname.keyword\", \"tenantId\" : \"ulbname.keyword\"}", + "indexName": "financeindex-v1", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[],\"must\":[]}},\"aggs\":{\"Total Bill Amount\":{\"sum\":{\"field\":\"totalbillamounts\"}}}}}}" + } + ], + "translateTenantCode": true, + "chartType": "metric", + "valueType": "amount", + "drillChart": "none", + "documentType": "_doc", + "action": "", + "aggregationPaths": [ + "Total Bill Amount" + ], + "insight": { + "chartResponseMap" : "financeTotalBillAmount", + "action" : "differenceOfNumbers", + "upwardIndicator" : "positive", + "downwardIndicator" : "negative", + "textMessage" : "$indicator$value% than last $insightInterval", + "colorCode" : "#228B22", + "insightInterval" : "month" + }, + "_comment": " " + }, + "financeTotalPaidAmount": { + "chartName": "DSS_FINANCE_TOTAL_PAID_AMOUNT", + "queries": [ + { + "module": "FINANCE", + "dateRefField": "", + "requestQueryMap": "{\"region\" : \"regionname.keyword\",\"district\" : \"districtname.keyword\", \"tenantId\" : \"ulbname.keyword\"}", + "indexName": "financeindex-v1", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[],\"must\":[]}},\"aggs\":{\"Total Paid Amount\":{\"sum\":{\"field\":\"totalpaymentamounts\"}}}}}}" + } + ], + "translateTenantCode": true, + "chartType": "metric", + "valueType": "amount", + "drillChart": "none", + "documentType": "_doc", + "action": "", + "aggregationPaths": [ + "Total Paid Amount" + ], + "insight": { + "chartResponseMap" : "financeTotalPaidAmount", + "action" : "differenceOfNumbers", + "upwardIndicator" : "positive", + "downwardIndicator" : "negative", + "textMessage" : "$indicator$value% than last $insightInterval", + "colorCode" : "#228B22", + "insightInterval" : "month" + }, + "_comment": " " + },"financeInsights": { + "chartName": "DSS_FINANCE_BOUNDARY", + "queries": [ + { + "module": "FINANCE", + "dateRefField": "", + "requestQueryMap": "{\"region\" : \"regionname.keyword\",\"district\" : \"districtname.keyword\", \"tenantId\" : \"ulbname.keyword\"}", + "indexName": "financeindex-v1", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[]}},\"aggs\":{\"City Name\":{\"terms\":{\"field\":\"ulbname.keyword\"}},\"Total Bills Generated\":{\"sum\":{\"field\":\"numberofbills\"}},\"Total Vouchers Generated\":{\"sum\":{\"field\":\"numberofvouchersforbill\"}},\"Total Billed Amount\":{\"sum\":{\"field\":\"totalbillamounts\"}},\"Bills Paid\":{\"sum\":{\"field\":\"numberofbillspaid\"}},\"Payments Done\":{\"sum\":{\"field\":\"numberofpayments\"}},\"Bill Amount Paid\":{\"sum\":{\"field\":\"billamountpaid\"}},\"Receipt Vouchers Passed\":{\"sum\":{\"field\":\"numberofreceiptvoucher\"}},\"Vendors\":{\"sum\":{\"field\":\"numberofcontractorsuppliers\"}},\"Bank Accounts\":{\"sum\":{\"field\":\"numberofbankaccounts\"}},\"Finance Collection\":{\"sum\":{\"field\":\"totalreceiptvoucheramounts\"}}}}}}" + } + ], + "isMdmsEnabled": true, + "translateTenantCode": true, + "filterKeys": [ + {"key": "tenantId", "column": "DDRs"} + ], + "chartType": "xtable", + "valueType": "number", + "action": "", + "plotLabel": "DDRs", + "isPostResponseHandler": true, + "postAggregationTheory" : "repsonseToDifferenceOfDates", + "documentType": "_doc", + "drillChart": "financeInsightsUlbDrilldown", + "aggregationPaths": [ + "Total Bills Generated", + "Total Vouchers Generated", + "Total Billed Amount", + "Bills Paid", + "Payments Done", + "Bill Amount Paid", + "Receipt Vouchers Passed", + "Finance Collection", + "Vendors", + "Bank Accounts" + ], + "pathDataTypeMapping": [ + { + "Total Bills Generated": "number" + }, + { + "Total Vouchers Generated": "number" + }, + { + "Total Billed Amount": "amount" + }, + { + "Bills Paid": "number" + }, + { + "Payments Done": "number" + }, + { + "Bill Amount Paid": "amount" + }, + { + "Receipt Vouchers Passed": "number" + }, + { + "Finance Collection": "amount" + }, + { + "Vendors": "number" + }, + { + "Bank Accounts": "number" + } + ], + "insight": {}, + "_comment": "" } + + + From 3b1225f829ed8892aedb8e5d2980e61b4a0bc0ef Mon Sep 17 00:00:00 2001 From: chinmoy-eGov Date: Thu, 23 Feb 2023 18:50:09 +0530 Subject: [PATCH 1175/1242] UM-5403 adding finance card to dashboard --- .../dashboard-analytics/ChartApiConfig.json | 121 ++++++++++++++---- 1 file changed, 97 insertions(+), 24 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 10059045..6931d228 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -5289,27 +5289,28 @@ }, "_comment": " " }, - "financeTotalPayments": { - "chartName": "DSS_FINANCE_TOTAL_PAYMENTS", + "financeTotalBillAmount": { + "chartName": "DSS_FINANCE_TOTAL_BILL_AMOUNT", "queries": [ { "module": "FINANCE", "dateRefField": "", "requestQueryMap": "{\"region\" : \"regionname.keyword\",\"district\" : \"districtname.keyword\", \"tenantId\" : \"ulbname.keyword\"}", "indexName": "financeindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[],\"must\":[]}},\"aggs\":{\"Total Payments\":{\"sum\":{\"field\":\"numberofpayments\"}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[],\"must\":[]}},\"aggs\":{\"Total Bill Amount\":{\"sum\":{\"field\":\"totalbillamounts\"}}}}}}" } ], + "translateTenantCode": true, "chartType": "metric", - "valueType": "number", + "valueType": "amount", "drillChart": "none", "documentType": "_doc", "action": "", "aggregationPaths": [ - "Total Payments" + "Total Bill Amount" ], "insight": { - "chartResponseMap" : "financeTotalPayments", + "chartResponseMap" : "financeTotalBillAmount", "action" : "differenceOfNumbers", "upwardIndicator" : "positive", "downwardIndicator" : "negative", @@ -5319,15 +5320,15 @@ }, "_comment": " " }, - "financeTotalBillAmount": { - "chartName": "DSS_FINANCE_TOTAL_BILL_AMOUNT", + "financeTotalPaidAmount": { + "chartName": "DSS_FINANCE_TOTAL_PAID_AMOUNT", "queries": [ { "module": "FINANCE", "dateRefField": "", "requestQueryMap": "{\"region\" : \"regionname.keyword\",\"district\" : \"districtname.keyword\", \"tenantId\" : \"ulbname.keyword\"}", "indexName": "financeindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[],\"must\":[]}},\"aggs\":{\"Total Bill Amount\":{\"sum\":{\"field\":\"totalbillamounts\"}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[],\"must\":[]}},\"aggs\":{\"Total Paid Amount\":{\"sum\":{\"field\":\"totalpaymentamounts\"}}}}}}" } ], "translateTenantCode": true, @@ -5337,10 +5338,10 @@ "documentType": "_doc", "action": "", "aggregationPaths": [ - "Total Bill Amount" + "Total Paid Amount" ], "insight": { - "chartResponseMap" : "financeTotalBillAmount", + "chartResponseMap" : "financeTotalPaidAmount", "action" : "differenceOfNumbers", "upwardIndicator" : "positive", "downwardIndicator" : "negative", @@ -5350,15 +5351,86 @@ }, "_comment": " " }, - "financeTotalPaidAmount": { - "chartName": "DSS_FINANCE_TOTAL_PAID_AMOUNT", + "financeInsights": { + "chartName": "DSS_FINANCE_BOUNDARY", "queries": [ { "module": "FINANCE", "dateRefField": "", "requestQueryMap": "{\"region\" : \"regionname.keyword\",\"district\" : \"districtname.keyword\", \"tenantId\" : \"ulbname.keyword\"}", "indexName": "financeindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[],\"must\":[]}},\"aggs\":{\"Total Paid Amount\":{\"sum\":{\"field\":\"totalpaymentamounts\"}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[]}},\"aggs\":{\"City Name\":{\"terms\":{\"field\":\"ulbname.keyword\"}},\"Total Bills Generated\":{\"sum\":{\"field\":\"numberofbills\"}},\"Total Vouchers Generated\":{\"sum\":{\"field\":\"numberofvouchersforbill\"}},\"Total Billed Amount\":{\"sum\":{\"field\":\"totalbillamounts\"}},\"Bills Paid\":{\"sum\":{\"field\":\"numberofbillspaid\"}},\"Payments Done\":{\"sum\":{\"field\":\"numberofpayments\"}},\"Bill Amount Paid\":{\"sum\":{\"field\":\"billamountpaid\"}},\"Receipt Vouchers Passed\":{\"sum\":{\"field\":\"numberofreceiptvoucher\"}},\"Vendors\":{\"sum\":{\"field\":\"numberofcontractorsuppliers\"}},\"Bank Accounts\":{\"sum\":{\"field\":\"numberofbankaccounts\"}},\"Finance Collection\":{\"sum\":{\"field\":\"totalreceiptvoucheramounts\"}}}}}}" + } + ], + "isMdmsEnabled": true, + "translateTenantCode": true, + "filterKeys": [ + {"key": "tenantId", "column": "DDRs"} + ], + "chartType": "xtable", + "valueType": "number", + "action": "", + "plotLabel": "DDRs", + "isPostResponseHandler": true, + "postAggregationTheory" : "repsonseToDifferenceOfDates", + "documentType": "_doc", + "drillChart": "financeInsightsUlbDrilldown", + "aggregationPaths": [ + "Total Bills Generated", + "Total Vouchers Generated", + "Total Billed Amount", + "Bills Paid", + "Payments Done", + "Bill Amount Paid", + "Receipt Vouchers Passed", + "Finance Collection", + "Vendors", + "Bank Accounts" + ], + "pathDataTypeMapping": [ + { + "Total Bills Generated": "number" + }, + { + "Total Vouchers Generated": "number" + }, + { + "Total Billed Amount": "amount" + }, + { + "Bills Paid": "number" + }, + { + "Payments Done": "number" + }, + { + "Bill Amount Paid": "amount" + }, + { + "Receipt Vouchers Passed": "number" + }, + { + "Finance Collection": "amount" + }, + { + "Vendors": "number" + }, + { + "Bank Accounts": "number" + } + ], + "insight": {}, + "_comment": "" + }, + "financeTotalCollection": { + "chartName": "DSS_FINANCE_TOTAL_COLLECTION", + "queries": [ + { + "module": "FINANCE", + "dateRefField": "", + "requestQueryMap": "{\"region\" : \"regionname.keyword\",\"district\" : \"districtname.keyword\", \"tenantId\" : \"ulbname.keyword\"}", + "indexName": "financeindex-v1", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[],\"must\":[]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"totalreceiptvoucheramounts\"}}}}}}" } ], "translateTenantCode": true, @@ -5368,10 +5440,10 @@ "documentType": "_doc", "action": "", "aggregationPaths": [ - "Total Paid Amount" + "Total Collection" ], "insight": { - "chartResponseMap" : "financeTotalPaidAmount", + "chartResponseMap" : "financeTotalCollection", "action" : "differenceOfNumbers", "upwardIndicator" : "positive", "downwardIndicator" : "negative", @@ -5380,30 +5452,31 @@ "insightInterval" : "month" }, "_comment": " " - },"financeInsights": { - "chartName": "DSS_FINANCE_BOUNDARY", + }, + "financeInsightsUlbDrilldown": { + "chartName": "DSS_FINANCE_BOUNDARY_ULB_DRILLDOWN", "queries": [ { "module": "FINANCE", "dateRefField": "", "requestQueryMap": "{\"region\" : \"regionname.keyword\",\"district\" : \"districtname.keyword\", \"tenantId\" : \"ulbname.keyword\"}", "indexName": "financeindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[]}},\"aggs\":{\"City Name\":{\"terms\":{\"field\":\"ulbname.keyword\"}},\"Total Bills Generated\":{\"sum\":{\"field\":\"numberofbills\"}},\"Total Vouchers Generated\":{\"sum\":{\"field\":\"numberofvouchersforbill\"}},\"Total Billed Amount\":{\"sum\":{\"field\":\"totalbillamounts\"}},\"Bills Paid\":{\"sum\":{\"field\":\"numberofbillspaid\"}},\"Payments Done\":{\"sum\":{\"field\":\"numberofpayments\"}},\"Bill Amount Paid\":{\"sum\":{\"field\":\"billamountpaid\"}},\"Receipt Vouchers Passed\":{\"sum\":{\"field\":\"numberofreceiptvoucher\"}},\"Vendors\":{\"sum\":{\"field\":\"numberofcontractorsuppliers\"}},\"Bank Accounts\":{\"sum\":{\"field\":\"numberofbankaccounts\"}},\"Finance Collection\":{\"sum\":{\"field\":\"totalreceiptvoucheramounts\"}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[]}},\"aggs\":{\"ULBs\":{\"terms\":{\"field\":\"ulbname.keyword\"},\"aggs\":{\"City Name\":{\"terms\":{\"field\":\"ulbname.keyword\"}},\"Total Bills Generated\":{\"sum\":{\"field\":\"numberofbills\"}},\"Total Vouchers Generated\":{\"sum\":{\"field\":\"numberofvouchersforbill\"}},\"Total Billed Amount\":{\"sum\":{\"field\":\"totalbillamounts\"}},\"Bills Paid\":{\"sum\":{\"field\":\"numberofbillspaid\"}},\"Payments Done\":{\"sum\":{\"field\":\"numberofpayments\"}},\"Bill Amount Paid\":{\"sum\":{\"field\":\"billamountpaid\"}},\"Receipt Vouchers Passed\":{\"sum\":{\"field\":\"numberofreceiptvoucher\"}},\"Vendors\":{\"sum\":{\"field\":\"numberofcontractorsuppliers\"}},\"Bank Accounts\":{\"sum\":{\"field\":\"numberofbankaccounts\"}},\"Finance Collection\":{\"sum\":{\"field\":\"totalreceiptvoucheramounts\"}}}}}}}}" } ], - "isMdmsEnabled": true, + "isMdmsEnabled": false, "translateTenantCode": true, "filterKeys": [ - {"key": "tenantId", "column": "DDRs"} + {"key": "tenantId", "column": "ULBs"} ], - "chartType": "xtable", + "chartType": "table", "valueType": "number", "action": "", - "plotLabel": "DDRs", + "plotLabel": "ULBs", "isPostResponseHandler": true, "postAggregationTheory" : "repsonseToDifferenceOfDates", "documentType": "_doc", - "drillChart": "financeInsightsUlbDrilldown", + "drillChart": "none", "aggregationPaths": [ "Total Bills Generated", "Total Vouchers Generated", From c5163b7f7f473e8f99534c8787a50fd75c1881bf Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Thu, 2 Mar 2023 15:28:15 +0530 Subject: [PATCH 1176/1242] Updated missing ulb mappings --- .../dashboard-analytics/TenantCodeNameMappings.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/TenantCodeNameMappings.json b/configs/egov-dss-dashboards/dashboard-analytics/TenantCodeNameMappings.json index 8db7aa0c..a5ce480c 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/TenantCodeNameMappings.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/TenantCodeNameMappings.json @@ -544,6 +544,18 @@ { "tenantCode":"pb.mamdot", "tenantValue":"Mamdot" + }, + { + "tenantCode":"pb.zirakpur", + "tenantValue":"Zirakpur" + }, + { + "tenantCode":"pb.jalandhar", + "tenantValue":"Jalandhar" + }, + { + "tenantCode":"pb.patiala", + "tenantValue":"Patiala" } ] } From bbfeec6e697b8c99082cd3330004fe9e6d290856 Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Fri, 3 Mar 2023 16:47:12 +0530 Subject: [PATCH 1177/1242] Updated the MCtodaysCollection --- .../dashboard-analytics/ChartApiConfig.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 6931d228..4bccc7bb 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -4096,10 +4096,10 @@ "queries": [ { "module": "COMMON", - "dateRefField": "", + "dateRefField": "dataObject.paymentDetails.receiptDate", "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\"}", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pb.testing\",\"pb\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"PT.MUTATION\",\"SW\"]}}],\"must\":[{\"range\":{\"dataObject.paymentDetails.receiptDate\":{\"gte\":\"now-1d\",\"lte\":\"now\"}}}]}},\"aggs\":{\"Todays Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pb.testing\",\"pb\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"PT.MUTATION\",\"SW\"]}}]}},\"aggs\":{\"Todays Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" } ], "chartType": "metric", From f064c6789a440b9befd68ff14b3ebd2c659da295 Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Fri, 3 Mar 2023 17:04:53 +0530 Subject: [PATCH 1178/1242] Updated Noc Todays collection --- .../dashboard-analytics/ChartApiConfig.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 4bccc7bb..7dd77320 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -4651,9 +4651,9 @@ { "module": "FIRENOC", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must\":[{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"FIRENOC\"]}},{\"range\":{\"dataObject.paymentDetails.receiptDate\":{\"gte\":\"now-24h\",\"lte\":\"now\"}}}],\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"term\":{\"dataObject.paymentStatus.keyword\":\"Cancelled\"}}]}},\"aggs\":{\"Todays Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must\":[{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"FIRENOC\"]}}],\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"term\":{\"dataObject.paymentStatus.keyword\":\"Cancelled\"}}]}},\"aggs\":{\"Todays Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}", "requestQueryMap": "{\"wardId\" : \"dataObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\",\"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", - "dateRefField": "" + "dateRefField": "dataObject.paymentDetails.receiptDate" } ], "chartType": "metric", From f935bdd44300430e948e931d0133a41b733fa392 Mon Sep 17 00:00:00 2001 From: ABHISHEK RANA <121286986+abhirana04@users.noreply.github.com> Date: Mon, 6 Mar 2023 10:29:40 +0530 Subject: [PATCH 1179/1242] removed UAT watermark to check ws bill download issue --- configs/pdf-service/format-config/ws-bill.json | 7 ------- 1 file changed, 7 deletions(-) diff --git a/configs/pdf-service/format-config/ws-bill.json b/configs/pdf-service/format-config/ws-bill.json index 9c23e462..868353fb 100644 --- a/configs/pdf-service/format-config/ws-bill.json +++ b/configs/pdf-service/format-config/ws-bill.json @@ -4,13 +4,6 @@ "defaultStyle": { "font": "Cambay" }, - "watermark": { - "text": "DIGIT UAT DIGIT UAT", - "color": "gery", - "opacity": 0.1, - "bold": true, - "italics": false - }, "content": [ { "style": "noc-head", From 12366c7ae382f2c10019cccf6aaeb6d6e5f51b93 Mon Sep 17 00:00:00 2001 From: chinmoy-eGov <115543497+chinmoy-eGov@users.noreply.github.com> Date: Tue, 7 Mar 2023 15:34:56 +0530 Subject: [PATCH 1180/1242] UM-5403 Changes in todaycollection --- .../dashboard-analytics/ChartApiConfig.json | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 7dd77320..422e7bbb 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -104,6 +104,20 @@ "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\"}", "indexName": "dss-collection_v2", "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}],\"must\":[{\"term\":{\"dataObject.paymentDetails.businessService.keyword\":\"TL\"}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" + }, + { + "module": "FIRENOC", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must\":[{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"FIRENOC\"]}},{\"range\":{\"dataObject.paymentDetails.receiptDate\":{\"gte\":\"now-24h\",\"lte\":\"now\"}}}],\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pg.testing\"}},{\"term\":{\"dataObject.paymentStatus.keyword\":\"Cancelled\"}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}", + "requestQueryMap": "{\"wardId\" : \"dataObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\",\"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", + "dateRefField": "dataObject.paymentDetails.receiptDate" + }, + { + "module": "MCOLLECT", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\"}", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pg.testing\",\"pg\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"FSM.TRIP_CHARGES\",\"PT.MUTATION\",\"SW\",\"BPA.LOW_RISK_PERMIT_FEE\",\"BPA.NC_SAN_FEE\",\"BPA.NC_APP_FEE\",\"BPA.NC_OC_APP_FEE\"]}}],\"must\":[{\"range\":{\"dataObject.paymentDetails.receiptDate\":{\"gte\":\"now-1d\",\"lte\":\"now\"}}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" } ], "chartType": "metric", From 5abd7c8d14ff85ca7d0be8aef86ba21f09feb53e Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Fri, 10 Mar 2023 16:30:57 +0530 Subject: [PATCH 1181/1242] Updated the mcTotal collection --- .../dashboard-analytics/ChartApiConfig.json | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 422e7bbb..22c42781 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -10,7 +10,14 @@ "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must\":[{\"terms\":{\"dataObject.paymentDetails.bill.businessService.keyword\":[\"PT\",\"TL\",\"SW\",\"WS\"]}}],\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" - } + }, + { + "module": "COMMON", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\"}", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pg.testing\",\"pg\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"FSM.TRIP_CHARGES\",\"PT.MUTATION\",\"SW\",\"BPA.LOW_RISK_PERMIT_FEE\",\"BPA.NC_SAN_FEE\",\"BPA.NC_APP_FEE\",\"BPA.NC_OC_APP_FEE\"]}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" + }, ], "chartType": "metric", "valueType": "Amount", From acde17aa2de493c96e2853fae11a4b57430552e7 Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Fri, 10 Mar 2023 16:49:30 +0530 Subject: [PATCH 1182/1242] Updated module name --- .../dashboard-analytics/ChartApiConfig.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 22c42781..a6fbee5e 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -3998,11 +3998,11 @@ "chartName": "DSS_TOTAL_COLLECTION", "queries": [ { - "module": "COMMON", + "module": "MCOLLECT", "dateRefField": "dataObject.paymentDetails.receiptDate", "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\"}", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pb.testing\",\"pb\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"PT.MUTATION\",\"SW\"]}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pg.testing\",\"pg\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"FSM.TRIP_CHARGES\",\"PT.MUTATION\",\"SW\",\"BPA.LOW_RISK_PERMIT_FEE\",\"BPA.NC_SAN_FEE\",\"BPA.NC_APP_FEE\",\"BPA.NC_OC_APP_FEE\"]}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" } ], "chartType": "metric", From b6e966f403a686b0222b5cf97dedebc8d512d347 Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Fri, 10 Mar 2023 16:54:35 +0530 Subject: [PATCH 1183/1242] removed extra query --- .../dashboard-analytics/ChartApiConfig.json | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index a6fbee5e..b0bb909b 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -10,14 +10,7 @@ "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must\":[{\"terms\":{\"dataObject.paymentDetails.bill.businessService.keyword\":[\"PT\",\"TL\",\"SW\",\"WS\"]}}],\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" - }, - { - "module": "COMMON", - "dateRefField": "dataObject.paymentDetails.receiptDate", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\"}", - "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pg.testing\",\"pg\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"FSM.TRIP_CHARGES\",\"PT.MUTATION\",\"SW\",\"BPA.LOW_RISK_PERMIT_FEE\",\"BPA.NC_SAN_FEE\",\"BPA.NC_APP_FEE\",\"BPA.NC_OC_APP_FEE\"]}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" - }, + } ], "chartType": "metric", "valueType": "Amount", @@ -4002,8 +3995,9 @@ "dateRefField": "dataObject.paymentDetails.receiptDate", "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\"}", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pg.testing\",\"pg\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"FSM.TRIP_CHARGES\",\"PT.MUTATION\",\"SW\",\"BPA.LOW_RISK_PERMIT_FEE\",\"BPA.NC_SAN_FEE\",\"BPA.NC_APP_FEE\",\"BPA.NC_OC_APP_FEE\"]}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" - } + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pg.testing\",\"pg\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"FSM.TRIP_CHARGES\",\"PT.MUTATION\",\"SW\",\"BPA.LOW_RISK_PERMIT_FEE\",\"BPA.NC_SAN_FEE\",\"BPA.NC_APP_FEE\",\"BPA.NC_OC_APP_FEE\"]}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" + + } ], "chartType": "metric", "valueType": "Amount", From 152c28cc7f17ce273fce4092383e52c9704aa73a Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Fri, 10 Mar 2023 17:17:29 +0530 Subject: [PATCH 1184/1242] Updated the total Receipt kpi for mcollect --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index b0bb909b..0d51a847 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -4022,7 +4022,7 @@ "chartName": "DSS_MC_TOTAL_RECEIPTS", "queries": [ { - "module": "COMMON", + "module":"MCOLLECT", "dateRefField": "dataObject.paymentDetails.receiptDate", "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.Bill.billDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.cityDistrictCode\"}", "indexName": "dss-collection_v2", From 580c7d544ef4652110db69d520ed07c59f204490 Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Fri, 10 Mar 2023 17:30:06 +0530 Subject: [PATCH 1185/1242] Updated The mouduel for Mcollect totalCategories --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 0d51a847..c3840309 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -4162,7 +4162,7 @@ "chartName": "DSS_MC_TOTAL_CATEGORIES", "queries": [ { - "module": "COMMON", + "module": "MCOLLECT", "dateRefField": "dataObject.paymentDetails.receiptDate", "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.Bill.billDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.cityDistrictCode\"}", "indexName": "dss-collection_v2", From 83ba13d622b7d7f1f895d5e11c12b532a08172b6 Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Fri, 10 Mar 2023 17:44:05 +0530 Subject: [PATCH 1186/1242] Updated the mcCumulativeCollection --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index c3840309..c5cd676c 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -4186,7 +4186,7 @@ "chartName": "DSS_TOTAL_CUMULATIVE_COLLECTION", "queries": [ { - "module": "COMMON", + "module": "MCOLLECT", "dateRefField": "dataObject.paymentDetails.receiptDate", "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\r\n \"module\" : \"dataObject.paymentDetails.businessService.keyword\", \n\"tenantId\" : \"dataObject.tenantId\"}", "indexName": "dss-collection_v2", From bc5fca772cf1add9e28d239703c34eeb26a88203 Mon Sep 17 00:00:00 2001 From: chinmoy-eGov Date: Fri, 10 Mar 2023 17:52:35 +0530 Subject: [PATCH 1187/1242] UM-5403 Changes in module type --- .../dashboard-analytics/ChartApiConfig.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index c5cd676c..4c5909e7 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -4448,7 +4448,7 @@ "chartName": "DSS_MC_RECEIPTS_BY_PAYMENTMODE", "queries": [ { - "module": "COMMON", + "module": "MCOLLECT", "requestQueryMap": "{\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\"}", "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", @@ -4471,7 +4471,7 @@ "chartName": "DSS_MC_COLLECTION_BY_PAYMENT_TYPE", "queries": [ { - "module": "COMMON", + "module": "MCOLLECT", "requestQueryMap": "{\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\"}", "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", @@ -4493,7 +4493,7 @@ "chartName": "DSS_MC_COLLECTION_BY_PAYMENT_TYPE", "queries": [ { - "module": "COMMON", + "module": "MCOLLECT", "requestQueryMap": "{\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\"}", "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", @@ -4515,7 +4515,7 @@ "chartName": "DSS_MC_RECEIPTS_BY_STATUS", "queries": [ { - "module": "COMMON", + "module": "MCOLLECT", "requestQueryMap": "{\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\"}", "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", @@ -4538,7 +4538,7 @@ "chartName": "DSS_MC_COLLECTION_BY_STATUS", "queries": [ { - "module": "COMMON", + "module": "MCOLLECT", "requestQueryMap": "{\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\"}", "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", @@ -4561,7 +4561,7 @@ "chartName": "DSS_MC_COLLECTION_CATEGORY_WISE", "queries": [ { - "module": "COMMON", + "module": "MCOLLECT", "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.cityDistrictCode\"}", "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", @@ -4583,7 +4583,7 @@ "chartName": "DSS_MC_MONTHLY_REPORT", "queries": [ { - "module": "COMMON", + "module": "MCOLLECT", "dateRefField": "dataObject.paymentDetails.receiptDate", "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.Bill.billDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.cityDistrictCode\" }", "indexName": "dss-collection_v2", @@ -5225,7 +5225,7 @@ "chartName": "DSS_MC_CHALLAN_COUNT_BY_STATUS", "queries": [ { - "module": "CHALLAN", + "module": "MCOLLECT", "dateRefField": "Data.taxPeriodFrom", "requestQueryMap": "{\"module\" : \"Data.businessService\", \"tenantId\" : \"Data.tenantId\"}", "indexName": "echallan-services", From 2aee043c982d25648e7aba0d0322b7560502c5e1 Mon Sep 17 00:00:00 2001 From: chinmoy-eGov <115543497+chinmoy-eGov@users.noreply.github.com> Date: Mon, 13 Mar 2023 15:56:09 +0530 Subject: [PATCH 1188/1242] UM-5403 --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 4c5909e7..79712abf 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -4132,7 +4132,7 @@ "chartName": "DSS_MC_TOTAL_CHALLANS", "queries": [ { - "module": "CHALLAN", + "module": "MCOLLECT", "dateRefField": "Data.taxPeriodFrom", "requestQueryMap": "{\"module\" : \"Data.businessService\", \"tenantId\" : \"Data.tenantId\"}", "indexName": "echallan-services", From cd26193e081c0cb81f35ee7eaac7721d6479387f Mon Sep 17 00:00:00 2001 From: chinmoy-eGov <115543497+chinmoy-eGov@users.noreply.github.com> Date: Tue, 14 Mar 2023 17:44:04 +0530 Subject: [PATCH 1189/1242] UM-5403 change in module type --- .../dashboard-analytics/ChartApiConfig.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 79712abf..8aa2d531 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -4617,7 +4617,7 @@ "chartName": "DSS_MC_REPORT_BY_TENANT", "queries": [ { - "module": "COMMON", + "module": "MCOLLECT", "requestQueryMap": "{\"tenantId\" : \"dataObject.tenantId.keyword\"}", "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", @@ -4625,7 +4625,7 @@ }, { - "module": "CHALLAN", + "module": "MCOLLECT", "requestQueryMap": "{\"tenantId\" : \"Data.tenantId.keyword\"}", "dateRefField": "Data.taxPeriodFrom", "indexName": "echallan-services", From 3ecfb58016ea4014d52b59b4a89e28d3d2d06f04 Mon Sep 17 00:00:00 2001 From: chinmoy-eGov Date: Tue, 14 Mar 2023 17:51:10 +0530 Subject: [PATCH 1190/1242] UM-5403 Changes in module type --- .../dashboard-analytics/ChartApiConfig.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 8aa2d531..6832da98 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -4617,11 +4617,11 @@ "chartName": "DSS_MC_REPORT_BY_TENANT", "queries": [ { - "module": "MCOLLECT", + "module": "COMMON", "requestQueryMap": "{\"tenantId\" : \"dataObject.tenantId.keyword\"}", "dateRefField": "dataObject.paymentDetails.receiptDate", "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pb.testing\",\"pb\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"PT.MUTATION\",\"SW\"]}}]}},\"aggs\":{\"Total_Receipts\":{\"value_count\":{\"field\":\"dataObject.paymentDetails.receiptNumber.keyword\"}},\"MC_TOTAL_COLLECTION\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pg.testing\",\"pg\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"FSM.TRIP_CHARGES\",\"PT.MUTATION\",\"SW\",\"BPA.LOW_RISK_PERMIT_FEE\",\"BPA.NC_SAN_FEE\",\"BPA.NC_APP_FEE\",\"BPA.NC_OC_APP_FEE\"]}}]}},\"aggs\":{\"ULBs\":{\"terms\":{\"field\":\"dataObject.tenantId.keyword\",\"size\":1000},\"aggs\":{\"Total_Receipts\":{\"value_count\":{\"field\":\"dataObject.paymentDetails.receiptNumber.keyword\"}},\"MC_TOTAL_COLLECTION\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" }, { @@ -4629,7 +4629,7 @@ "requestQueryMap": "{\"tenantId\" : \"Data.tenantId.keyword\"}", "dateRefField": "Data.taxPeriodFrom", "indexName": "echallan-services", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"Data.businessService.keyword\":[\"TL\",\"PT\"]}}]}},\"aggs\":{\"Total_Challans\":{\"value_count\":{\"field\":\"Data.challanNo.keyword\"}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pg.testing\"}},{\"terms\":{\"Data.businessService.keyword\":[\"TL\",\"PT\"]}}]}},\"aggs\":{\"ULBs\":{\"terms\":{\"field\":\"Data.tenantId.keyword\",\"size\":1000},\"aggs\":{\"Total_Challans\":{\"value_count\":{\"field\":\"Data.challanNo.keyword\"}}}}}}}}" } ], "isMdmsEnabled": true, From bb7bba764df2e44eb89e2dd0bd3a92fd56903fcf Mon Sep 17 00:00:00 2001 From: chinmoy-eGov <115543497+chinmoy-eGov@users.noreply.github.com> Date: Tue, 14 Mar 2023 21:22:37 +0530 Subject: [PATCH 1191/1242] UM-5403 addition of mcReportByTenant --- .../dashboard-analytics/ChartApiConfig.json | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 6832da98..fba81c45 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -4612,6 +4612,52 @@ "insight": { }, "_comment": " " + }, + "mcReportByTenant": { + "chartName": "DSS_MC_REPORT_BY_TENANT", + "queries": [ + { + "module": "COMMON", + "requestQueryMap": "{\"tenantId\" : \"dataObject.tenantId.keyword\"}", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pg.testing\",\"pg\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"FSM.TRIP_CHARGES\",\"PT.MUTATION\",\"SW\",\"BPA.LOW_RISK_PERMIT_FEE\",\"BPA.NC_SAN_FEE\",\"BPA.NC_APP_FEE\",\"BPA.NC_OC_APP_FEE\"]}}]}},\"aggs\":{\"ULBs\":{\"terms\":{\"field\":\"dataObject.tenantId.keyword\",\"size\":1000},\"aggs\":{\"Total_Receipts\":{\"value_count\":{\"field\":\"dataObject.paymentDetails.receiptNumber.keyword\"}},\"MC_TOTAL_COLLECTION\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" + }, + + { + "module": "CHALLAN", + "requestQueryMap": "{\"tenantId\" : \"Data.tenantId.keyword\"}", + "dateRefField": "Data.taxPeriodFrom", + "indexName": "echallan-services", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pg.testing\"}},{\"terms\":{\"Data.businessService.keyword\":[\"TL\",\"PT\"]}}]}},\"aggs\":{\"ULBs\":{\"terms\":{\"field\":\"Data.tenantId.keyword\",\"size\":1000},\"aggs\":{\"Total_Challans\":{\"value_count\":{\"field\":\"Data.challanNo.keyword\"}}}}}}}}" + } + ], + "filterKeys": [ + {"key": "tenantId", "column": "ULB"} + ], + "chartType": "xtable", + "drillChart": "mcReportByWard", + "plotLabel": "ULB", + "aggregationPaths": [ + "MC_TOTAL_COLLECTION", + "Total_Challans", + "Total_Receipts" + ], + "pathDataTypeMapping": [ + { + "MC_TOTAL_COLLECTION": "amount" + }, + { + "Total_Challans": "number" + }, + { + "Total_Receipts": "number" + } + ], + + "insight": { + }, + "_comment": "" }, "mcReportByDDRv2": { "chartName": "DSS_MC_REPORT_BY_TENANT", From 1024f1a8d352fb6895dccd53effb567c0d1b7cb1 Mon Sep 17 00:00:00 2001 From: Ramesh Kumar Date: Wed, 15 Mar 2023 12:09:28 +0530 Subject: [PATCH 1192/1242] Replace text TL PDF --- configs/pdf-service/format-config/tlcertificate.json | 3 ++- configs/pdf-service/format-config/tradelicense-receipt.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/configs/pdf-service/format-config/tlcertificate.json b/configs/pdf-service/format-config/tlcertificate.json index db6fb57a..a72b5aff 100644 --- a/configs/pdf-service/format-config/tlcertificate.json +++ b/configs/pdf-service/format-config/tlcertificate.json @@ -530,7 +530,8 @@ "This Trade License is issued under rule 10.39 of the Municipal Account Code 2017 with condition that the applicant shall obtain relevant NOC from concerned departments like Punjab Pollution control board / Fire Ofce /Health Department/ Excise Department/Deputy Commissioner (under Explosive Act) whichever applicable.", "The Municipal Council/Corporation reserves the right to cancel this Trade License for Breach of any condition in accordance with law.", "This is a computer generated document, hence requires no signature.", - "The grant of Trade License is not approval to any violation of building by laws, town planning scheme." + "The grant of Trade License is not approval to any violation of building by laws, town planning scheme.", + "This license is issued subject to the self declaration of the applicant." ], "style":"disclaimer" diff --git a/configs/pdf-service/format-config/tradelicense-receipt.json b/configs/pdf-service/format-config/tradelicense-receipt.json index 145583c5..fd0e7611 100644 --- a/configs/pdf-service/format-config/tradelicense-receipt.json +++ b/configs/pdf-service/format-config/tradelicense-receipt.json @@ -869,7 +869,7 @@ }, { "style": "no-signature", - "text": "{{no_signature}}" + "text": "This is a computer generted recepit hence requires no signature." }, { "style": "pt-disclaimer", @@ -881,6 +881,7 @@ }, { + "ol": [ "Payment received by Cheque/DD shall be subject to realization", From 84e914a9c30aeb3e8cbd59943d0b5f49961649b4 Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Wed, 15 Mar 2023 17:35:29 +0530 Subject: [PATCH 1193/1242] removed the time zon from unique citezen pgr --- .../egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index fba81c45..1ea7328d 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -2944,7 +2944,7 @@ "dateRefField": "Data.@timestamp", "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\", \"tenantId\" : \"Data.tenantId\"}", "indexName": "pgrindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Citizens\":{\"date_histogram\":{\"field\":\"Data.@timestamp\",\"interval\":\"intervalvalue\",\"time_zone\":\"+05:30\"},\"aggs\":{\"count\":{\"cardinality\":{\"field\":\"Data.citizen.uuid.keyword\"}}}}}}}}" + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Citizens\":{\"date_histogram\":{\"field\":\"Data.@timestamp\",\"interval\":\"intervalvalue\"},\"aggs\":{\"count\":{\"cardinality\":{\"field\":\"Data.citizen.uuid.keyword\"}}}}}}}}" } ], "chartType": "line", From 6463ef3ea7703d1fd19f20da4fe295961ebb322f Mon Sep 17 00:00:00 2001 From: manastanmay-eGov Date: Fri, 24 Mar 2023 14:25:48 +0530 Subject: [PATCH 1194/1242] Updated msewa logo in footer --- .../pdf-service/data-config/ws-estimationnotice.json | 5 +++++ .../format-config/ws-estimationnotice.json | 12 ++++++++++++ 2 files changed, 17 insertions(+) diff --git a/configs/pdf-service/data-config/ws-estimationnotice.json b/configs/pdf-service/data-config/ws-estimationnotice.json index 5900f99c..506e751f 100644 --- a/configs/pdf-service/data-config/ws-estimationnotice.json +++ b/configs/pdf-service/data-config/ws-estimationnotice.json @@ -493,6 +493,11 @@ "prefix": null, "module": "rainmaker-common" } + }, + { + "variable": "footerLogoImage", + "url": "https://pb-egov-assets.s3.ap-south-1.amazonaws.com/mseva-logo-colored.png", + "type": "image" } ] }, diff --git a/configs/pdf-service/format-config/ws-estimationnotice.json b/configs/pdf-service/format-config/ws-estimationnotice.json index dc487c6d..3a3f464b 100644 --- a/configs/pdf-service/format-config/ws-estimationnotice.json +++ b/configs/pdf-service/format-config/ws-estimationnotice.json @@ -309,6 +309,18 @@ "style": "receipt-logo-header", "alignment": "center" }, + { + "image": "{{footerLogoImage}}", + "width": 55, + "height": 61.25, + "margin": [ + 12, + 10, + 12, + 10 + ], + "alignment": "center" + }, { "style": "ws-table-property", "table": { From 3188e51bbe2c68d9b3b7840ba872d3dd7459d429 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 24 Mar 2023 17:18:51 +0530 Subject: [PATCH 1195/1242] Name user --- configs/reports/configs/pt-reports.yml | 11960 ++++++++++++----------- 1 file changed, 6106 insertions(+), 5854 deletions(-) diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml index 3d708679..a31a733d 100644 --- a/configs/reports/configs/pt-reports.yml +++ b/configs/reports/configs/pt-reports.yml @@ -1,180 +1,181 @@ --- ReportDefinitions: -- reportName: ReceiptRegister - decryptionPathId: ReceiptRegister - summary: Receipt Register - version: 1.0.0 - moduleName: rainmaker-pt - additionalConfig: - print: - pdfPageSize: "A1" - sourceColumns: - - name: receiptnumber - label: reports.pt.receiptNo - type: string - source: pt - total: false - - name: receiptdate - label: reports.pt.receiptDate - type: string - source: pt - total: false - - name: g8issuedate - label: reports.pt.g8issuedate - type: string - source: pt - total: false - - name: g8receiptno - label: reports.pt.g8receiptno - type: string - source: pt - total: false - - name: amount - label: reports.pt.amount - type: string - source: pt - total: true - - name: propertytax - label: reports.pt.propertyTax - type: string - source: pt - total: true - - name: firecess - label: reports.pt.fireCess - type: string - source: pt - total: true - - name: cancercess - label: reports.pt.cancerCess - type: string - source: pt - total: true - - name: rebate - label: reports.pt.rebate - type: string - source: pt - total: true - - name: adhocrebate - label: reports.pt.adhocrebate - type: string - source: pt - total: true - - name: penalty - label: reports.pt.penalty - type: string - source: pt - total: true - - name: adhocpenalty - label: reports.pt.adhocpenalty - type: string - source: pt - total: true - - name: interest - label: reports.pt.interest - type: string - source: pt - total: true - - name: exemption - label: reports.pt.exemption - type: string - source: pt - total: true - - name: adjustment - label: reports.pt.roundoff - type: string - source: pt - total: true - - name: pendingamount - label: reports.pt.pendingamount - type: string - source: pt - total: true - - name: propertyid - label: reports.pt.propertyId - type: string - source: pt - total: false - - name: usagetype - label: reports.pt.usagetype - type: string - source: pt - total: false - - name: assessmentnumber - label: reports.pt.assessmentNo - type: string - source: pt - total: false - - name: financialyear - label: reports.pt.financialYear - type: string - source: pt - total: false - - name: instrumenttype - label: reports.pt.paymentMode - type: string - source: pt - total: false - - name: transactionnumber - label: reports.pt.ddChequeTransactionNo - type: string - source: pt - total: false - - name: transactiondate - label: reports.pt.ddChequeTransactionDate - type: string - source: pt - total: false - - name: bankname - label: reports.pt.bankName - type: string - source: pt - total: false - - name: collectorname - label: reports.pt.collectorname - type: string - source: pt - total: false - - name: remarks - label: reports.pt.remarks - type: string - source: pt - total: false - searchParams: - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: true - searchClause: AND rh.receiptdate >= $fromDate - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: true - searchClause: AND rh.receiptdate <= $toDate - - name: paymentMode - label: Payment Mode - type: singlevaluelist - pattern: 'list://Cash:Cash,Online:Online,Card:Card,DD:DD,Cheque:Cheque' - source: pt - isMandatory: false - searchClause: AND instrumenttype = $paymentMode - - name: financialyear - label: Financial Year - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name - source: pt - wrapper: true - isMandatory: false - searchClause: AND financialyear = $financialyear - - name: localityArray - label: reports.pt.zoneList - type: boundarylist - source: pt - isMandatory: false - searchClause: AND pt_addr.locality IN ($localityArray) - query: | + - reportName: ReceiptRegister + decryptionPathId: ReceiptRegister + summary: Receipt Register + version: 1.0.0 + moduleName: rainmaker-pt + additionalConfig: + print: + pdfPageSize: A1 + sourceColumns: + - name: receiptnumber + label: reports.pt.receiptNo + type: string + source: pt + total: false + - name: receiptdate + label: reports.pt.receiptDate + type: string + source: pt + total: false + - name: g8issuedate + label: reports.pt.g8issuedate + type: string + source: pt + total: false + - name: g8receiptno + label: reports.pt.g8receiptno + type: string + source: pt + total: false + - name: amount + label: reports.pt.amount + type: string + source: pt + total: true + - name: propertytax + label: reports.pt.propertyTax + type: string + source: pt + total: true + - name: firecess + label: reports.pt.fireCess + type: string + source: pt + total: true + - name: cancercess + label: reports.pt.cancerCess + type: string + source: pt + total: true + - name: rebate + label: reports.pt.rebate + type: string + source: pt + total: true + - name: adhocrebate + label: reports.pt.adhocrebate + type: string + source: pt + total: true + - name: penalty + label: reports.pt.penalty + type: string + source: pt + total: true + - name: adhocpenalty + label: reports.pt.adhocpenalty + type: string + source: pt + total: true + - name: interest + label: reports.pt.interest + type: string + source: pt + total: true + - name: exemption + label: reports.pt.exemption + type: string + source: pt + total: true + - name: adjustment + label: reports.pt.roundoff + type: string + source: pt + total: true + - name: pendingamount + label: reports.pt.pendingamount + type: string + source: pt + total: true + - name: propertyid + label: reports.pt.propertyId + type: string + source: pt + total: false + - name: usagetype + label: reports.pt.usagetype + type: string + source: pt + total: false + - name: assessmentnumber + label: reports.pt.assessmentNo + type: string + source: pt + total: false + - name: financialyear + label: reports.pt.financialYear + type: string + source: pt + total: false + - name: instrumenttype + label: reports.pt.paymentMode + type: string + source: pt + total: false + - name: transactionnumber + label: reports.pt.ddChequeTransactionNo + type: string + source: pt + total: false + - name: transactiondate + label: reports.pt.ddChequeTransactionDate + type: string + source: pt + total: false + - name: bankname + label: reports.pt.bankName + type: string + source: pt + total: false + - name: collectorname + label: reports.pt.collectorname + type: string + source: pt + total: false + - name: remarks + label: reports.pt.remarks + type: string + source: pt + total: false + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: true + searchClause: AND rh.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: true + searchClause: AND rh.receiptdate <= $toDate + - name: paymentMode + label: Payment Mode + type: singlevaluelist + pattern: list://Cash:Cash,Online:Online,Card:Card,DD:DD,Cheque:Cheque + source: pt + isMandatory: false + searchClause: AND instrumenttype = $paymentMode + - name: financialyear + label: Financial Year + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name + source: pt + wrapper: true + isMandatory: false + searchClause: AND financialyear = $financialyear + - name: localityArray + label: reports.pt.zoneList + type: boundarylist + source: pt + isMandatory: false + searchClause: AND pt_addr.locality IN ($localityArray) + query: > -- Use CTE to force query plan, compute & use CTE later + WITH receipt_breakup AS ( SELECT receiptheader, @@ -196,6 +197,7 @@ ReportDefinitions: WHERE rd.tenantid = $tenantid and rh.status != 'Cancelled' and businessdetails='PT' GROUP BY rd.receiptheader ) + SELECT rh.tenantid AS tenantid, rh.id, @@ -218,174 +220,181 @@ ReportDefinitions: (case when eg_user.name is null then '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' else eg_user.name end) as collectorname, pt_detail.additionaldetails->>'remarks' as "remarks" FROM egcl_receiptheader_v1 AS rh + JOIN egcl_receiptinstrument_v1 AS ri ON rh.id = ri.receiptheader + JOIN egcl_instrumentheader_v1 AS ih ON ih.id = ri.instrumentheader + JOIN receipt_breakup ON rh.id = receipt_breakup.receiptheader + JOIN eg_pt_propertydetail_v2 pt_detail ON (pt_detail.property || ':' || pt_detail.assessmentnumber) = rh.consumercode + JOIN eg_pt_address_v2 pt_addr ON pt_detail.property = pt_addr.property + LEFT OUTER JOIN eg_user ON eg_user.id = rh.createdby::INTEGER + WHERE rh.tenantid = $tenantid and rh.status != 'Cancelled' and businessdetails='PT' - orderby: ORDER BY rh.receiptdate DESC - -- reportName: CancelledReceiptRegister - summary: Receipt Register for cancelled Receipts - version: 1.0.0 - moduleName: rainmaker-pt - additionalConfig: - print: - pdfPageSize: "A1" - sourceColumns: - - name: receiptnumber - label: reports.pt.receiptNo - type: string - source: pt - total: false - - name: status - label: reports.pt.status - type: string - source: pt - total: false - - name: transactiondate - label: reports.pt.receiptDate - type: string - source: pt - total: false - - name: g8issuedate - label: reports.pt.g8issuedate - type: string - source: pt - total: false - - name: g8receiptno - label: reports.pt.g8receiptno - type: string - source: pt - total: false - - name: amount - label: reports.pt.amount - type: string - source: pt - total: true - - name: propertytax - label: reports.pt.propertyTax - type: string - source: pt - total: true - - name: firecess - label: reports.pt.fireCess - type: string - source: pt - total: true - - name: cancercess - label: reports.pt.cancerCess - type: string - source: pt - total: true - - name: rebate - label: reports.pt.rebate - type: string - source: pt - total: true - - name: adhocrebate - label: reports.pt.adhocrebate - type: string - source: pt - total: true - - name: penalty - label: reports.pt.penalty - type: string - source: pt - total: true - - name: adhocpenalty - label: reports.pt.adhocpenalty - type: string - source: pt - total: true - - name: interest - label: reports.pt.interest - type: string - source: pt - total: true - - name: exemption - label: reports.pt.exemption - type: string - source: pt - total: true - - name: adjustment - label: reports.pt.roundoff - type: string - source: pt - total: true - - name: propertyid - label: reports.pt.propertyId - type: string - source: pt - total: false - - name: usagetype - label: reports.pt.usagetype - type: string - source: pt - total: false - - name: assessmentnumber - label: reports.pt.assessmentNo - type: string - source: pt - total: false - - name: financialyear - label: reports.pt.financialYear - type: string - source: pt - total: false - - name: instrumenttype - label: reports.pt.paymentMode - type: string - source: pt - total: false - - name: transactionnumber - label: reports.pt.ddChequeTransactionNo - type: string - source: pt - total: false - - name: bankname - label: reports.pt.bankName - type: string - source: pt - total: false - searchParams: - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: false - searchClause: AND rh.receiptdate >= $fromDate - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: false - searchClause: AND rh.receiptdate <= $toDate - - name: paymentMode - label: Payment Mode - type: singlevaluelist - pattern: 'list://Cash:Cash,Online:Online,Card:Card,DD:DD,Cheque:Cheque' - source: pt - isMandatory: false - searchClause: AND instrumenttype = $paymentMode - - name: financialyear - label: Financial Year - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name - source: pt - wrapper: true - isMandatory: false - searchClause: AND financialyear = $financialyear - - name: localityArray - label: reports.pt.zoneList - type: boundarylist - source: pt - isMandatory: false - searchClause: AND pt_addr.locality IN ($localityArray) - query: | + orderby: ORDER BY rh.receiptdate DESC + - reportName: CancelledReceiptRegister + summary: Receipt Register for cancelled Receipts + version: 1.0.0 + moduleName: rainmaker-pt + additionalConfig: + print: + pdfPageSize: A1 + sourceColumns: + - name: receiptnumber + label: reports.pt.receiptNo + type: string + source: pt + total: false + - name: status + label: reports.pt.status + type: string + source: pt + total: false + - name: transactiondate + label: reports.pt.receiptDate + type: string + source: pt + total: false + - name: g8issuedate + label: reports.pt.g8issuedate + type: string + source: pt + total: false + - name: g8receiptno + label: reports.pt.g8receiptno + type: string + source: pt + total: false + - name: amount + label: reports.pt.amount + type: string + source: pt + total: true + - name: propertytax + label: reports.pt.propertyTax + type: string + source: pt + total: true + - name: firecess + label: reports.pt.fireCess + type: string + source: pt + total: true + - name: cancercess + label: reports.pt.cancerCess + type: string + source: pt + total: true + - name: rebate + label: reports.pt.rebate + type: string + source: pt + total: true + - name: adhocrebate + label: reports.pt.adhocrebate + type: string + source: pt + total: true + - name: penalty + label: reports.pt.penalty + type: string + source: pt + total: true + - name: adhocpenalty + label: reports.pt.adhocpenalty + type: string + source: pt + total: true + - name: interest + label: reports.pt.interest + type: string + source: pt + total: true + - name: exemption + label: reports.pt.exemption + type: string + source: pt + total: true + - name: adjustment + label: reports.pt.roundoff + type: string + source: pt + total: true + - name: propertyid + label: reports.pt.propertyId + type: string + source: pt + total: false + - name: usagetype + label: reports.pt.usagetype + type: string + source: pt + total: false + - name: assessmentnumber + label: reports.pt.assessmentNo + type: string + source: pt + total: false + - name: financialyear + label: reports.pt.financialYear + type: string + source: pt + total: false + - name: instrumenttype + label: reports.pt.paymentMode + type: string + source: pt + total: false + - name: transactionnumber + label: reports.pt.ddChequeTransactionNo + type: string + source: pt + total: false + - name: bankname + label: reports.pt.bankName + type: string + source: pt + total: false + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: false + searchClause: AND rh.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: false + searchClause: AND rh.receiptdate <= $toDate + - name: paymentMode + label: Payment Mode + type: singlevaluelist + pattern: list://Cash:Cash,Online:Online,Card:Card,DD:DD,Cheque:Cheque + source: pt + isMandatory: false + searchClause: AND instrumenttype = $paymentMode + - name: financialyear + label: Financial Year + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name + source: pt + wrapper: true + isMandatory: false + searchClause: AND financialyear = $financialyear + - name: localityArray + label: reports.pt.zoneList + type: boundarylist + source: pt + isMandatory: false + searchClause: AND pt_addr.locality IN ($localityArray) + query: > -- Use CTE to force query plan, compute & use CTE later + WITH receipt_breakup AS ( SELECT receiptheader, @@ -407,6 +416,7 @@ ReportDefinitions: WHERE rd.tenantid = $tenantid and rh.status = 'Cancelled' and businessdetails='PT' GROUP BY rd.receiptheader ) + SELECT rh.tenantid AS tenantid, rh.id, @@ -428,740 +438,234 @@ ReportDefinitions: Initcap(COALESCE(pt_detail.usagecategoryminor, pt_detail.usagecategorymajor)) as usagetype, manualreceiptnumber as g8receiptno FROM egcl_receiptheader_v1 AS rh + JOIN egcl_receiptinstrument_v1 AS ri ON rh.id = ri.receiptheader + JOIN egcl_instrumentheader_v1 AS ih ON ih.id = ri.instrumentheader + JOIN receipt_breakup ON rh.id = receipt_breakup.receiptheader + JOIN eg_pt_propertydetail_v2 pt_detail ON (pt_detail.property || ':' || pt_detail.assessmentnumber) = rh.consumercode + JOIN eg_pt_address_v2 pt_addr ON pt_detail.property = pt_addr.property + WHERE rh.tenantid = $tenantid and rh.status = 'Cancelled' and businessdetails='PT' - orderby: ORDER BY rh.receiptdate DESC - -- reportName: OldUlbWisePtCollection - summary: ULB-wise PT Collection - version: 1.0.0 - moduleName: rainmaker-pt - sourceColumns: - - name: totalassessments - label: reports.pt.totalassessments - type: string - source: pt - total: true - - name: totalamountpaid - label: reports.pt.totalamountpaid - type: string - source: pt - total: true - - name: totalamountdue - label: reports.pt.totalamountdue - type: string - source: pt - total: true - searchParams: - - name: financialyear - label: Financial Year - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name - source: pt - wrapper: true - isMandatory: false - searchClause: AND financialyear = $financialyear - - name: usage - label: Usage - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=PropertyTax&masterName=UsageCategoryMajor|$..code|$..name - source: pt - wrapper: true - isMandatory: false - searchClause: AND usagecategorymajor = $usage - query: | - SELECT - tenantid, - COUNT(*) AS totalassessments, - SUM(totalamount) AS totalamount, - SUM(amount) AS totalamountpaid, - (SUM(totalamount) - SUM(amount)) AS totalamountdue - FROM eg_pt_propertydetail_v2 AS pd - LEFT OUTER JOIN - (SELECT consumercode, totalamount, amount FROM egcl_receiptheader_v1 AS rh - LEFT OUTER JOIN egcl_receiptinstrument_v1 AS ri ON rh.id = ri.receiptheader - LEFT OUTER JOIN egcl_instrumentheader_v1 AS ih ON ri.instrumentheader = ih.id - and ih.instrumentstatus != 'CANCELLED' - where rh.status != 'Cancelled' - ) AS instrument_data ON (pd.property || ':' || pd.assessmentnumber) = instrument_data.consumercode - WHERE tenantid = $tenantid - groupby: GROUP BY tenantid - orderby: ORDER BY tenantid, totalamountpaid DESC NULLS LAST - -- reportName: StateCancelledReceiptRegister - summary: Receipt Register for cancelled Receipts State - version: 1.0.0 - moduleName: rainmaker-pt - additionalConfig: - print: - pdfPageSize: "A1" - sourceColumns: - - name: tenantid - label: reports.pt.ulbName - type: string - source: pt - total: false - - name: receiptnumber - label: reports.pt.receiptNo - type: string - source: pt - total: false - - name: status - label: reports.pt.status - type: string - source: pt - total: false - - name: transactiondate - label: reports.pt.receiptDate - type: string - source: pt - total: false - - name: g8issuedate - label: reports.pt.g8issuedate - type: string - source: pt - total: false - - name: g8receiptno - label: reports.pt.g8receiptno - type: string - source: pt - total: false - - name: amount - label: reports.pt.amount - type: string - source: pt - total: true - - name: propertytax - label: reports.pt.propertyTax - type: string - source: pt - total: true - - name: firecess - label: reports.pt.fireCess - type: string - source: pt - total: true - - name: cancercess - label: reports.pt.cancerCess - type: string - source: pt - total: true - - name: rebate - label: reports.pt.rebate - type: string - source: pt - total: true - - name: adhocrebate - label: reports.pt.adhocrebate - type: string - source: pt - total: true - - name: penalty - label: reports.pt.penalty - type: string - source: pt - total: true - - name: adhocpenalty - label: reports.pt.adhocpenalty - type: string - source: pt - total: true - - name: interest - label: reports.pt.interest - type: string - source: pt - total: true - - name: exemption - label: reports.pt.exemption - type: string - source: pt - total: true - - name: adjustment - label: reports.pt.roundoff - type: string - source: pt - total: true - - name: propertyid - label: reports.pt.propertyId - type: string - source: pt - total: false - - name: usagetype - label: reports.pt.usagetype - type: string - source: pt - total: false - - name: assessmentnumber - label: reports.pt.assessmentNo - type: string - source: pt - total: false - - name: financialyear - label: reports.pt.financialYear - type: string - source: pt - total: false - - name: instrumenttype - label: reports.pt.paymentMode - type: string - source: pt - total: false - - name: transactionnumber - label: reports.pt.ddChequeTransactionNo - type: string - source: pt - total: false - - name: bankname - label: reports.pt.bankName - type: string - source: pt - total: false - searchParams: - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: false - searchClause: AND rh.receiptdate >= $fromDate - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: false - searchClause: AND rh.receiptdate <= $toDate - - name: paymentMode - label: Payment Mode - type: singlevaluelist - pattern: 'list://Cash:Cash,Online:Online,Card:Card,DD:DD,Cheque:Cheque' - source: pt - isMandatory: false - searchClause: AND instrumenttype = $paymentMode - - name: financialyear - label: Financial Year - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name - source: pt - wrapper: true - isMandatory: false - searchClause: AND financialyear = $financialyear - query: | - -- Use CTE to force query plan, compute & use CTE later - WITH receipt_breakup AS ( - SELECT - receiptheader, - SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, - SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, - SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, - SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, - SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as propertytax, - (SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN adjustedamount ELSE 0 END) )as exemption, - ( SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END)) as adjustment - FROM egcl_receiptdetails_v1 as rd - INNER JOIN egcl_receiptheader_v1 as rh on rh.id = rd.receiptheader - WHERE rd.tenantid !='pb.testing' and rh.status = 'Cancelled' and businessdetails='PT' - GROUP BY rd.receiptheader - ) + orderby: ORDER BY rh.receiptdate DESC + - reportName: OldUlbWisePtCollection + summary: ULB-wise PT Collection + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: totalassessments + label: reports.pt.totalassessments + type: string + source: pt + total: true + - name: totalamountpaid + label: reports.pt.totalamountpaid + type: string + source: pt + total: true + - name: totalamountdue + label: reports.pt.totalamountdue + type: string + source: pt + total: true + searchParams: + - name: financialyear + label: Financial Year + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name + source: pt + wrapper: true + isMandatory: false + searchClause: AND financialyear = $financialyear + - name: usage + label: Usage + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=PropertyTax&masterName=UsageCategoryMajor|$..code|$..name + source: pt + wrapper: true + isMandatory: false + searchClause: AND usagecategorymajor = $usage + query: > SELECT - rh.tenantid AS tenantid, - rh.id, - Substring(rh.consumercode, '(.*):') AS propertyid, - Substring(rh.consumercode, ':(.*)') AS assessmentnumber, - rh.status, - rh.consumercode, - rh.receiptdate, - to_char((To_timestamp(rh.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, - bankid AS bankname, - receiptnumber, - amount, - instrumenttype, - transactionnumber, - receipt_breakup.*, - rh.totalamount - ih.amount AS pendingamount, - pt_detail.financialyear, - to_char((To_timestamp(rh.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, - Initcap(COALESCE(pt_detail.usagecategoryminor, pt_detail.usagecategorymajor)) as usagetype, - manualreceiptnumber as g8receiptno - FROM egcl_receiptheader_v1 AS rh - JOIN egcl_receiptinstrument_v1 AS ri ON rh.id = ri.receiptheader - JOIN egcl_instrumentheader_v1 AS ih ON ih.id = ri.instrumentheader - JOIN receipt_breakup ON rh.id = receipt_breakup.receiptheader - JOIN eg_pt_propertydetail_v2 pt_detail ON (pt_detail.property || ':' || pt_detail.assessmentnumber) = rh.consumercode - JOIN eg_pt_address_v2 pt_addr ON pt_detail.property = pt_addr.property - WHERE rh.tenantid != 'pb.testing' and rh.status = 'Cancelled' and businessdetails='PT' - orderby: ORDER BY rh.receiptdate DESC - -- reportName: StateWidePtCollection - summary: State Wide PT Collection - version: 1.0.0 - moduleName: rainmaker-pt - sourceColumns: - - name: tenantid - label: reports.pt.ulbName - type: string - source: pt - total: false - - name: totalassessments - label: reports.pt.totalassessments - type: string - source: pt - total: true - - name: totalamountpaid - label: reports.pt.totalamountpaid - type: string - source: pt - total: true - - name: totaloffline - label: reports.pt.totaloffline - type: string - source: pt - total: true - - name: totalonline - label: reports.pt.totalonline - type: string - source: pt - total: true - - name: totalamountdue - label: reports.pt.totalamountdue - type: string - source: pt - total: true - searchParams: - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: false - searchClause: AND receiptdate >= $fromDate - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: false - searchClause: AND receiptdate <= $toDate - - name: ulb - label: ULB - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name - source: pt - wrapper: true - isMandatory: false - searchClause: AND tenantid = $ulb - - name: financialyear - label: Financial Year - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name - source: pt - wrapper: true - isMandatory: false - searchClause: AND financialyear = $financialyear - - name: usage - label: Usage - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=PropertyTax&masterName=UsageCategoryMajor|$..code|$..name - source: pt - wrapper: true - isMandatory: false - searchClause: AND usagecategorymajor = $usage - query: | - SELECT - initcap(split_part(tenantid, '.', 2)) as tenantid, - COUNT(*) AS totalassessments, - SUM(totalamount) AS totalamount, - SUM(amount) AS totalamountpaid, - SUM(CASE WHEN collectiontype LIKE 'ONLINE' THEN amount ELSE 0 END) AS totalonline, - SUM(CASE WHEN collectiontype LIKE 'COUNTER' THEN amount ELSE 0 END) AS totaloffline, - (SUM(totalamount) - SUM(amount)) AS totalamountdue - FROM eg_pt_propertydetail_v2 AS pd - LEFT OUTER JOIN (SELECT consumercode, totalamount, amount, collectiontype, receiptdate FROM egcl_receiptheader_v1 AS rh - LEFT OUTER JOIN egcl_receiptinstrument_v1 AS ri ON rh.id = ri.receiptheader - LEFT OUTER JOIN egcl_instrumentheader_v1 AS ih ON ri.instrumentheader = ih.id and ih.instrumentstatus != 'CANCELLED' - where rh.status != 'Cancelled' and rh.tenantid != 'pb.testing' and businessdetails='PT' - ) AS tbl_amounts ON (pd.property || ':' || pd.assessmentnumber) = tbl_amounts.consumercode - WHERE tenantid not in ('pb.testing','pb.ludhiana_legacy') - groupby: GROUP BY tenantid - orderby: ORDER BY tenantid, totalamountpaid DESC NULLS LAST - -- reportName: UlbWisePtCollection - summary: State Wide PT Collection - version: 1.0.0 - moduleName: rainmaker-pt - sourceColumns: - - name: totalassessments - label: reports.pt.totalassessments - type: string - source: pt - total: true - - name: totalamountpaid - label: reports.pt.totalamountpaid - type: string - source: pt - total: true - - name: totaloffline - label: reports.pt.totaloffline - type: string - source: pt - total: true - - name: countoffline - label: reports.pt.countoffline - type: string - source: pt - total: true - - name: totalonline - label: reports.pt.totalonline - type: string - source: pt - total: true - - name: countonline - label: reports.pt.countonline - type: string - source: pt - total: true - - name: totalamountdue - label: reports.pt.totalamountdue - type: string - source: pt - total: true - searchParams: - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: false - searchClause: AND receiptdate >= $fromDate - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: false - searchClause: AND receiptdate <= $toDate - - name: financialyear - label: Financial Year - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name - source: pt - wrapper: true - isMandatory: false - searchClause: AND financialyear = $financialyear - - name: usage - label: Usage - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=PropertyTax&masterName=UsageCategoryMajor|$..code|$..name - source: pt - wrapper: true - isMandatory: false - searchClause: AND usagecategorymajor = $usage - query: | - SELECT - initcap(split_part(tenantid, '.', 2)) as tenantid, - COUNT(collectiontype) AS totalassessments, - SUM(totalamount) AS totalamount, - SUM(amount) AS totalamountpaid, - SUM(CASE WHEN collectiontype LIKE 'ONLINE' THEN amount ELSE 0 END) AS totalonline, - SUM(CASE WHEN collectiontype LIKE 'ONLINE' THEN 1 ELSE 0 END) AS countonline, - SUM(CASE WHEN collectiontype LIKE 'COUNTER' THEN amount ELSE 0 END) AS totaloffline, - SUM(CASE WHEN collectiontype LIKE 'COUNTER' THEN 1 ELSE 0 END) AS countoffline, - (SUM(totalamount) - SUM(amount)) AS totalamountdue + tenantid, + COUNT(*) AS totalassessments, + SUM(totalamount) AS totalamount, + SUM(amount) AS totalamountpaid, + (SUM(totalamount) - SUM(amount)) AS totalamountdue FROM eg_pt_propertydetail_v2 AS pd - LEFT OUTER JOIN (SELECT consumercode, totalamount, amount, collectiontype, receiptdate FROM egcl_receiptheader_v1 AS rh - LEFT OUTER JOIN egcl_receiptinstrument_v1 AS ri ON rh.id = ri.receiptheader - LEFT OUTER JOIN egcl_instrumentheader_v1 AS ih ON ri.instrumentheader = ih.id and ih.instrumentstatus != 'CANCELLED' - where rh.status != 'Cancelled' - ) AS tbl_amounts ON (pd.property || ':' || pd.assessmentnumber) = tbl_amounts.consumercode - WHERE tenantid LIKE CONCAT(SPLIT_PART($tenantid, '.', 1), '%') and tenantid = $tenantid - groupby: GROUP BY tenantid - orderby: ORDER BY tenantid, totalamountpaid DESC NULLS LAST - - -- reportName: ULBPTDataDumpReportOld - summary: ULB level report - version: 1.0.0 - moduleName: rainmaker-pt - sourceColumns: - - name: ulb - label: reports.pt.ulb - type: string - source: pt - total: false - - name: propertytaxuniqueid - label: reports.pt.propertytaxuniqueid - type: string - source: pt - total: false - - name: transcationdate - label: reports.pt.transcationdate - type: string - source: pt - total: false - - name: receiptnumber - label: reports.pt.receiptnumber - type: string - source: pt - total: false - - name: existingpropertyid - label: reports.pt.existingpropertyid - type: string - source: pt - total: false - - name: financialyear - label: reports.pt.financialYear - type: string - source: pt - total: false - - name: ownername - label: reports.pt.ownername - type: string - source: pt - total: false - - name: guardianname - label: reports.pt.guardianname - type: string - source: pt - total: false - - name: totalarea - label: reports.pt.totalarea - type: string - source: pt - total: false - - name: builtarea - label: reports.pt.builtarea - type: string - source: pt - total: false - - name: floors - label: reports.pt.floors - type: string - source: pt - total: false - - name: occupancy - label: reports.pt.occupancy - type: string - source: pt - total: false - - name: propertytype - label: reports.pt.propertytype - type: string - source: pt - total: false - - name: mobileno - label: reports.pt.mobileno - type: string - source: pt - total: false - - name: transcationmode - label: reports.pt.transcationmode - type: string - source: pt - total: false - - name: paymentamount - label: reports.pt.paymentamount - type: string - source: pt - total: true - - name: paymentdate - label: reports.pt.paymentdate - type: string - source: pt - total: false - - name: emailid - label: reports.pt.emailid - type: string - source: pt - total: false - - name: address - label: reports.pt.address - type: string - source: pt - total: false - - name: remarks - label: reports.pt.remarks - type: string - source: pt - total: false - - name: businessname - label: reports.pt.businessname - type: string - source: pt - total: false - searchParams: - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: true - searchClause: AND rh.receiptdate >= $fromDate - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: true - searchClause: AND rh.receiptdate <= $toDate - query: | - --S.no Service Name ULB Property Tax Unique ID Date Of Transcation Receipt Number Existing Property ID Owner Name Guardian Name Total Area (SQ.YARD) Covered Area/Built Area (SQ.FEET) Floors Occupancy (Rented,Self /Unoccupied) Type Of Property Mobile Number Transcation Mode of Payment Payment Amount Payment Date Email Id Address - with eg_pt_unit_v2_ot as ( - select - propertydetail, - string_agg(distinct pu.occupancytype, ',') as occupancytype, - string_agg(distinct coalesce(usagecategoryminor, usagecategorymajor), ',') as propertytype - from eg_pt_unit_v2 as pu - where pu.tenantid = $tenantid - group by propertydetail - ) - select - distinct on (rh.receiptnumber) - initcap(split_part(rh.tenantid, '.', 2)) as "ulb", - split_part(consumercode, ':', 1) as "propertytaxuniqueid", - to_char((To_timestamp(receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS "transcationdate", - receiptnumber as "receiptnumber", - pt.oldpropertyid as "existingpropertyid", - pd.financialyear as "financialyear", - eu."name" as "ownername", - eu.guardian as "guardianname", - pd.landarea as "totalarea", - pd.builduparea * 9 as "builtarea", - pd.nooffloors as "floors", - pot.occupancytype as "occupancy", - pot.propertytype as "propertytype", - eu.mobilenumber as "mobileno", - instrumenttype as "transcationmode", - ih.amount as "paymentamount", - to_char((To_timestamp(ih.transactiondate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS "paymentdate", - eu.emailid as "emailid" , - REGEXP_REPLACE(REGEXP_REPLACE(CONCAT(pta.doorno, ',', pta.addressline1, ',', pta.addressline2, ',', pta.buildingname, ',', pta.pincode), ',+', ','), '^,|,$', '') as "address", - pd.additionaldetails->>'remarks' as "remarks", - pt.additionaldetails->>'FirmBusinessName' as "businessname" - from egcl_receiptheader_v1 as rh - inner join egcl_receiptinstrument_v1 as ri on ri.receiptheader = rh.id - inner join egcl_instrumentheader_v1 as ih on ih.id = ri.instrumentheader - inner join eg_pt_property_v2 as pt on pt.propertyid = split_part(consumercode, ':', 1) - inner join eg_pt_propertydetail_v2 as pd on pd.assessmentnumber = split_part(consumercode, ':', 2) - inner join eg_pt_owner_v2 as po on po.propertydetail = pd.assessmentnumber - inner join eg_user as eu on eu.uuid = po.userid - inner join eg_pt_address_v2 as pta on pta.property = pt.propertyid - left outer join eg_pt_unit_v2_ot as pot on pot.propertydetail = pd.assessmentnumber - where rh.tenantid = $tenantid and rh.status != 'Cancelled' - -- reportName: ReceiptRegisterShort - summary: Receipt Register - version: 1.0.0 - moduleName: rainmaker-pt - additionalConfig: - print: - pdfPageSize: "Legal" - sourceColumns: - - name: receiptnumber - label: reports.pt.receiptNo - type: string - source: pt - total: false - - name: transactiondate - label: reports.pt.receiptDate - type: string - source: pt - total: false - - name: g8receiptno - label: reports.pt.g8book - type: string - source: pt - total: false - - name: g8issuedate - label: reports.pt.g8dated - type: string - source: pt - total: false - - name: propertyid - label: reports.pt.ptrId - type: string - source: pt - total: false - - name: financialyear - label: reports.pt.financialYear - type: string - source: pt - total: false - - name: instrumenttype - label: reports.pt.paymentMode - type: string - source: pt - total: false - - name: amount - label: reports.pt.taxamount - type: string - source: pt - total: true - - name: transactionnumber - label: reports.pt.ddChequeNo - type: string - source: pt - total: false - - name: bankname - label: reports.pt.bankName - type: string - source: pt - total: false - - name: collectorname - label: reports.pt.collectorname - type: string - source: pt - total: false - - name: remarks - label: reports.pt.remarks - type: string - source: pt - total: false - searchParams: - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: true - searchClause: AND rh.receiptdate >= $fromDate - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: true - searchClause: AND rh.receiptdate <= $toDate - - name: paymentMode - label: Payment Mode - type: singlevaluelist - pattern: 'list://Cash:Cash,Online:Online,Card:Card,DD:DD,Cheque:Cheque' - source: pt - isMandatory: false - searchClause: AND instrumenttype = $paymentMode - - name: financialyear - label: Financial Year - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name - source: pt - wrapper: true - isMandatory: false - searchClause: AND financialyear = $financialyear - - name: localityArray - label: reports.pt.zoneList - type: boundarylist - source: pt - isMandatory: false - searchClause: AND pt_addr.locality IN ($localityArray) - - name: collectorname - label: reports.pt.collectorname - type: singlevaluelist - pattern: http://egov-hrms:8080/egov-hrms/employees/_search?tenantId=$tenantid&roles=PTCEMP|$.Employees[*].user.id|$.Employees[*].user.name - source: pt - wrapper: true - isMandatory: false - searchClause: AND eg_user.id = $collectorname::INTEGER - query: | + + LEFT OUTER JOIN + (SELECT consumercode, totalamount, amount FROM egcl_receiptheader_v1 AS rh + LEFT OUTER JOIN egcl_receiptinstrument_v1 AS ri ON rh.id = ri.receiptheader + LEFT OUTER JOIN egcl_instrumentheader_v1 AS ih ON ri.instrumentheader = ih.id + and ih.instrumentstatus != 'CANCELLED' + where rh.status != 'Cancelled' + ) AS instrument_data ON (pd.property || ':' || pd.assessmentnumber) = instrument_data.consumercode + WHERE tenantid = $tenantid + groupby: GROUP BY tenantid + orderby: ORDER BY tenantid, totalamountpaid DESC NULLS LAST + - reportName: StateCancelledReceiptRegister + summary: Receipt Register for cancelled Receipts State + version: 1.0.0 + moduleName: rainmaker-pt + additionalConfig: + print: + pdfPageSize: A1 + sourceColumns: + - name: tenantid + label: reports.pt.ulbName + type: string + source: pt + total: false + - name: receiptnumber + label: reports.pt.receiptNo + type: string + source: pt + total: false + - name: status + label: reports.pt.status + type: string + source: pt + total: false + - name: transactiondate + label: reports.pt.receiptDate + type: string + source: pt + total: false + - name: g8issuedate + label: reports.pt.g8issuedate + type: string + source: pt + total: false + - name: g8receiptno + label: reports.pt.g8receiptno + type: string + source: pt + total: false + - name: amount + label: reports.pt.amount + type: string + source: pt + total: true + - name: propertytax + label: reports.pt.propertyTax + type: string + source: pt + total: true + - name: firecess + label: reports.pt.fireCess + type: string + source: pt + total: true + - name: cancercess + label: reports.pt.cancerCess + type: string + source: pt + total: true + - name: rebate + label: reports.pt.rebate + type: string + source: pt + total: true + - name: adhocrebate + label: reports.pt.adhocrebate + type: string + source: pt + total: true + - name: penalty + label: reports.pt.penalty + type: string + source: pt + total: true + - name: adhocpenalty + label: reports.pt.adhocpenalty + type: string + source: pt + total: true + - name: interest + label: reports.pt.interest + type: string + source: pt + total: true + - name: exemption + label: reports.pt.exemption + type: string + source: pt + total: true + - name: adjustment + label: reports.pt.roundoff + type: string + source: pt + total: true + - name: propertyid + label: reports.pt.propertyId + type: string + source: pt + total: false + - name: usagetype + label: reports.pt.usagetype + type: string + source: pt + total: false + - name: assessmentnumber + label: reports.pt.assessmentNo + type: string + source: pt + total: false + - name: financialyear + label: reports.pt.financialYear + type: string + source: pt + total: false + - name: instrumenttype + label: reports.pt.paymentMode + type: string + source: pt + total: false + - name: transactionnumber + label: reports.pt.ddChequeTransactionNo + type: string + source: pt + total: false + - name: bankname + label: reports.pt.bankName + type: string + source: pt + total: false + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: false + searchClause: AND rh.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: false + searchClause: AND rh.receiptdate <= $toDate + - name: paymentMode + label: Payment Mode + type: singlevaluelist + pattern: list://Cash:Cash,Online:Online,Card:Card,DD:DD,Cheque:Cheque + source: pt + isMandatory: false + searchClause: AND instrumenttype = $paymentMode + - name: financialyear + label: Financial Year + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name + source: pt + wrapper: true + isMandatory: false + searchClause: AND financialyear = $financialyear + query: > -- Use CTE to force query plan, compute & use CTE later + WITH receipt_breakup AS ( SELECT receiptheader, @@ -1174,23 +678,25 @@ ReportDefinitions: SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as propertytax, (SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN adjustedamount ELSE 0 END) )as exemption, + + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN adjustedamount ELSE 0 END) )as exemption, ( SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END)) as adjustment FROM egcl_receiptdetails_v1 as rd INNER JOIN egcl_receiptheader_v1 as rh on rh.id = rd.receiptheader - WHERE rd.tenantid = $tenantid and rh.status != 'Cancelled' and businessdetails ='PT' + WHERE rd.tenantid !='pb.testing' and rh.status = 'Cancelled' and businessdetails='PT' GROUP BY rd.receiptheader ) + SELECT rh.tenantid AS tenantid, rh.id, Substring(rh.consumercode, '(.*):') AS propertyid, Substring(rh.consumercode, ':(.*)') AS assessmentnumber, + rh.status, rh.consumercode, rh.receiptdate, - to_char((To_timestamp(rh.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, + to_char((To_timestamp(rh.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, bankid AS bankname, receiptnumber, amount, @@ -1201,4876 +707,5590 @@ ReportDefinitions: pt_detail.financialyear, to_char((To_timestamp(rh.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, Initcap(COALESCE(pt_detail.usagecategoryminor, pt_detail.usagecategorymajor)) as usagetype, - manualreceiptnumber as g8receiptno, - (CASE WHEN collectiontype='COUNTER' THEN eg_user.name ELSE '' END) as collectorname, - pt_detail.additionaldetails->>'remarks' as "remarks" + manualreceiptnumber as g8receiptno FROM egcl_receiptheader_v1 AS rh + JOIN egcl_receiptinstrument_v1 AS ri ON rh.id = ri.receiptheader + JOIN egcl_instrumentheader_v1 AS ih ON ih.id = ri.instrumentheader + JOIN receipt_breakup ON rh.id = receipt_breakup.receiptheader + JOIN eg_pt_propertydetail_v2 pt_detail ON (pt_detail.property || ':' || pt_detail.assessmentnumber) = rh.consumercode + JOIN eg_pt_address_v2 pt_addr ON pt_detail.property = pt_addr.property - LEFT OUTER JOIN eg_user ON eg_user.id = rh.createdby::INTEGER - WHERE rh.tenantid = $tenantid and rh.status != 'Cancelled' and businessdetails ='PT' - orderby: ORDER BY rh.receiptdate DESC - - -- reportName: ULBPTDataDumpReport - summary: ULB level report - version: 1.0.0 - moduleName: rainmaker-pt - sourceColumns: - - name: ulb - label: reports.pt.ulb - type: string - source: pt - total: false - - name: propertytaxuniqueid - label: reports.pt.propertytaxuniqueid - type: string - source: pt - total: false - - name: transcationdate - label: reports.pt.transcationdate - type: string - source: pt - total: false - - name: receiptnumber - label: reports.pt.receiptnumber - type: string - source: pt - total: false - - name: existingpropertyid - label: reports.pt.existingpropertyid - type: string - source: pt - total: false - - name: financialyear - label: reports.pt.financialYear - type: string - source: pt - total: false - - name: ownername - label: reports.pt.ownername - type: string - source: pt - total: false - - name: guardianname - label: reports.pt.guardianname - type: string - source: pt - total: false - - name: totalarea - label: reports.pt.totalarea - type: string - source: pt - total: false - - name: builtarea - label: reports.pt.builtarea - type: string - source: pt - total: false - - name: floors - label: reports.pt.floors - type: string - source: pt - total: false - - name: occupancy - label: reports.pt.occupancy - type: string - source: pt - total: false - - name: propertytype - label: reports.pt.propertytype - type: string - source: pt - total: false - - name: mobileno - label: reports.pt.mobileno - type: string - source: pt - total: false - - name: transcationmode - label: reports.pt.transcationmode - type: string - source: pt - total: false - - name: paymentamount - label: reports.pt.paymentamount - type: string - source: pt - total: true - - name: paymentdate - label: reports.pt.paymentdate - type: string - source: pt - total: false - - name: emailid - label: reports.pt.emailid - type: string - source: pt - total: false - - name: address - label: reports.pt.address - type: string - source: pt - total: false - - name: payeraddress - label: reports.pt.payeraddress - type: string - source: pt - total: false - - name: remarks - label: reports.pt.remarks - type: string - source: pt - total: false - - name: businessname - label: reports.pt.businessname - type: string - source: pt - total: false - - name: localitycode - label: reports.pt.localitycode - type: string - source: pt - total: false - searchParams: - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: true - searchClause: AND rh.receiptdate >= $fromDate - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: true - searchClause: AND rh.receiptdate <= $toDate - - name: financialyear - label: Financial Year - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name - source: pt - wrapper: true - isMandatory: false - searchClause: AND pd.financialyear = $financialyear - - name: localityArray - label: reports.pt.zoneList - type: boundarylist - source: pt - isMandatory: false - searchClause: AND pta.locality IN ($localityArray) - query: | - --S.no Service Name ULB Property Tax Unique ID Date Of Transcation Receipt Number Existing Property ID Owner Name Guardian Name Total Area (SQ.YARD) Covered Area/Built Area (SQ.FEET) Floors Occupancy (Rented,Self /Unoccupied) Type Of Property Mobile Number Transcation Mode of Payment Payment Amount Payment Date Email Id Address - with eg_pt_unit_v2_ot as ( - select - propertydetail, - string_agg(distinct pu.occupancytype, ',') as occupancytype, - string_agg(distinct coalesce(usagecategoryminor, usagecategorymajor), ',') as propertytype - from eg_pt_unit_v2 as pu - where pu.tenantid = $tenantid - group by propertydetail - ) - select - distinct on (rh.receiptnumber) - initcap(split_part(rh.tenantid, '.', 2)) as "ulb", - split_part(consumercode, ':', 1) as "propertytaxuniqueid", - to_char((To_timestamp(receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS "transcationdate", - receiptnumber as "receiptnumber", - pt.oldpropertyid as "existingpropertyid", - pd.financialyear as "financialyear", - eu."name" as "ownername", - eu.guardian as "guardianname", - pd.landarea as "totalarea", - pd.builduparea * 9 as "builtarea", - pd.nooffloors as "floors", - pot.occupancytype as "occupancy", - pot.propertytype as "propertytype", - eu.mobilenumber as "mobileno", - instrumenttype as "transcationmode", - ih.amount as "paymentamount", - to_char((To_timestamp(ih.transactiondate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS "paymentdate", - eu.emailid as "emailid", - REGEXP_REPLACE(REGEXP_REPLACE(CONCAT(pta.doorno, ',', pta.addressline1, ',', pta.addressline2, ',', pta.buildingname, ',', pta.pincode), ',+', ','), '^,|,$', '') as "address", - rh.payeraddress as "payeraddress", - pd.additionaldetails->>'remarks' as "remarks", - pt.additionaldetails->>'FirmBusinessName' as "businessname", - pta.locality as "localitycode" - from egcl_receiptheader_v1 as rh - inner join egcl_receiptinstrument_v1 as ri on ri.receiptheader = rh.id - inner join egcl_instrumentheader_v1 as ih on ih.id = ri.instrumentheader - inner join eg_pt_property_v2 as pt on pt.propertyid = split_part(consumercode, ':', 1) - inner join eg_pt_propertydetail_v2 as pd on pd.assessmentnumber = split_part(consumercode, ':', 2) - inner join eg_pt_owner_v2 as po on po.propertydetail = pd.assessmentnumber - inner join eg_user as eu on eu.uuid = po.userid - inner join eg_pt_address_v2 as pta on pta.property = pt.propertyid - left outer join eg_pt_unit_v2_ot as pot on pot.propertydetail = pd.assessmentnumber - where rh.tenantid = $tenantid and rh.status != 'Cancelled' and businessdetails ='PT' - -- reportName: Sewa_Kendra_ReceiptRegister - summary: Sewa Kendra Receipt Register - version: 1.0.0 - moduleName: rainmaker-pt - additionalConfig: - print: - pdfPageSize: "A1" - sourceColumns: - - name: receiptnumber - label: reports.pt.receiptNo - type: string - source: pt - total: false - - name: receiptdate - label: reports.pt.receiptDate - type: string - source: pt - total: false - - name: g8issuedate - label: reports.pt.g8issuedate - type: string - source: pt - total: false - - name: g8receiptno - label: reports.pt.g8receiptno - type: string - source: pt - total: false - - name: amount - label: reports.pt.amount - type: string - source: pt - total: true - - name: propertytax - label: reports.pt.propertyTax - type: string - source: pt - total: true - - name: firecess - label: reports.pt.fireCess - type: string - source: pt - total: true - - name: cancercess - label: reports.pt.cancerCess - type: string - source: pt - total: true - - name: rebate - label: reports.pt.rebate - type: string - source: pt - total: true - - name: adhocrebate - label: reports.pt.adhocrebate - type: string - source: pt - total: true - - name: penalty - label: reports.pt.penalty - type: string - source: pt - total: true - - name: adhocpenalty - label: reports.pt.adhocpenalty - type: string - source: pt - total: true - - name: interest - label: reports.pt.interest - type: string - source: pt - total: true - - name: exemption - label: reports.pt.exemption - type: string - source: pt - total: true - - name: adjustment - label: reports.pt.roundoff - type: string - source: pt - total: true - - name: pendingamount - label: reports.pt.pendingamount - type: string - source: pt - total: true - - name: propertyid - label: reports.pt.propertyId - type: string - source: pt - total: false - - name: usagetype - label: reports.pt.usagetype - type: string - source: pt - total: false - - name: assessmentnumber - label: reports.pt.assessmentNo - type: string - source: pt - total: false - - name: financialyear - label: reports.pt.financialYear - type: string - source: pt - total: false - - name: instrumenttype - label: reports.pt.paymentMode - type: string - source: pt - total: false - - name: transactionnumber - label: reports.pt.ddChequeTransactionNo - type: string - source: pt - total: false - - name: transactiondate - label: reports.pt.ddChequeTransactionDate - type: string - source: pt - total: false - - name: bankname - label: reports.pt.bankName - type: string - source: pt - total: false - - name: collectorname - label: reports.pt.collectorname - type: string - source: pt - total: false - - name: remarks - label: reports.pt.remarks - type: string - source: pt - total: false - searchParams: - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: true - searchClause: AND rh.receiptdate >= $fromDate - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: true - searchClause: AND rh.receiptdate <= $toDate - - name: paymentMode - label: Payment Mode - type: singlevaluelist - pattern: 'list://Cash:Cash,Online:Online,Card:Card,DD:DD,Cheque:Cheque' - source: pt - isMandatory: false - searchClause: AND instrumenttype = $paymentMode - - name: financialyear - label: Financial Year - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name - source: pt - wrapper: true - isMandatory: false - searchClause: AND financialyear = $financialyear - - name: localityArray - label: reports.pt.zoneList - type: boundarylist - source: pt - isMandatory: false - searchClause: AND pt_addr.locality IN ($localityArray) - query: | - -- Use CTE to force query plan, compute & use CTE later - WITH receipt_breakup AS ( - SELECT - receiptheader, - SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, - SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, - SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, - SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, - SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as propertytax, - (SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN adjustedamount ELSE 0 END) )as exemption, - ( SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END)) as adjustment - FROM egcl_receiptdetails_v1 as rd - INNER JOIN egcl_receiptheader_v1 as rh on rh.id = rd.receiptheader - WHERE rd.tenantid = $tenantid and rh.status != 'Cancelled' and businessdetails='PT' and rh.createdby::INTEGER in (select user_id from eg_userrole_v1 where role_code ='SEVA_KENDRA_EMP') - GROUP BY rd.receiptheader - ) + + WHERE rh.tenantid != 'pb.testing' and rh.status = 'Cancelled' and businessdetails='PT' + orderby: ORDER BY rh.receiptdate DESC + - reportName: StateWidePtCollection + summary: State Wide PT Collection + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: tenantid + label: reports.pt.ulbName + type: string + source: pt + total: false + - name: totalassessments + label: reports.pt.totalassessments + type: string + source: pt + total: true + - name: totalamountpaid + label: reports.pt.totalamountpaid + type: string + source: pt + total: true + - name: totaloffline + label: reports.pt.totaloffline + type: string + source: pt + total: true + - name: totalonline + label: reports.pt.totalonline + type: string + source: pt + total: true + - name: totalamountdue + label: reports.pt.totalamountdue + type: string + source: pt + total: true + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: false + searchClause: AND receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: false + searchClause: AND receiptdate <= $toDate + - name: ulb + label: ULB + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: pt + wrapper: true + isMandatory: false + searchClause: AND tenantid = $ulb + - name: financialyear + label: Financial Year + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name + source: pt + wrapper: true + isMandatory: false + searchClause: AND financialyear = $financialyear + - name: usage + label: Usage + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=PropertyTax&masterName=UsageCategoryMajor|$..code|$..name + source: pt + wrapper: true + isMandatory: false + searchClause: AND usagecategorymajor = $usage + query: > SELECT - rh.tenantid AS tenantid, - rh.id, - Substring(rh.consumercode, '(.*):') AS propertyid, - Substring(rh.consumercode, ':(.*)') AS assessmentnumber, - rh.consumercode, - to_char((To_timestamp(rh.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS receiptdate, - bankid AS bankname, - receiptnumber, - amount, - instrumenttype, - transactionnumber, - to_char((To_timestamp(transactiondate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, - receipt_breakup.*, - rh.totalamount - ih.amount AS pendingamount, - pt_detail.financialyear, - to_char((To_timestamp(rh.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, - Initcap(COALESCE(pt_detail.usagecategoryminor, pt_detail.usagecategorymajor)) as usagetype, - manualreceiptnumber as g8receiptno, - (case when eg_user.name is null then '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' else eg_user.name end) as collectorname, - pt_detail.additionaldetails->>'remarks' as "remarks" - FROM egcl_receiptheader_v1 AS rh - JOIN egcl_receiptinstrument_v1 AS ri ON rh.id = ri.receiptheader - JOIN egcl_instrumentheader_v1 AS ih ON ih.id = ri.instrumentheader - JOIN receipt_breakup ON rh.id = receipt_breakup.receiptheader - JOIN eg_pt_propertydetail_v2 pt_detail ON (pt_detail.property || ':' || pt_detail.assessmentnumber) = rh.consumercode - JOIN eg_pt_address_v2 pt_addr ON pt_detail.property = pt_addr.property - LEFT OUTER JOIN eg_user ON eg_user.id = rh.createdby::INTEGER - WHERE rh.tenantid = $tenantid and rh.status != 'Cancelled' and businessdetails='PT' and rh.createdby::INTEGER in - (select user_id from eg_userrole_v1 where role_code ='SEVA_KENDRA_EMP') - orderby: ORDER BY rh.receiptdate DESC - -- reportName: ReceiptRegisterSummary - summary: Receipt Register Summary - version: 1.0.0 - moduleName: rainmaker-pt - additionalConfig: - print: - pdfPageSize: "A1" - sourceColumns: - - name: ulb - label: reports.pt.ulb - type: string - source: pt - total: false - - name: adhocpenalty - label: reports.pt.adhocpenalty - type: string - source: pt - total: true - - name: adhocrebate - label: reports.pt.adhocrebate - type: string - source: pt - total: true - - name: firecess - label: reports.pt.firecess - type: string - source: pt - total: true - - name: cancercess - label: reports.pt.cancercess - type: string - source: pt - total: true - - name: interest - label: reports.pt.interest - type: string - source: pt - total: true - - name: penalty - label: reports.pt.penalty - type: string - source: pt - total: true - - name: rebate - label: reports.pt.rebate - type: string - source: pt - total: true - - name: propertytax - label: reports.pt.propertytax - type: string - source: pt - total: true - - name: exemption - label: reports.pt.exemption - type: string - source: pt - total: true - - name: adjustment - label: reports.pt.adjustment - type: string - source: pt - total: true - - name: adhocrebate - label: reports.pt.adhocrebate - type: string - source: pt - total: true - - name: noofassessments - label: reports.pt.noofassessments - type: string - source: pt - total: true - - name: collectorname - label: reports.pt.collectorname - type: string - source: pt - total: false - searchParams: - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: true - searchClause: AND rh.receiptdate >= $fromDate - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: true - searchClause: AND rh.receiptdate <= $toDate - - name: collectorname - label: reports.pt.collectorname - type: singlevaluelist - pattern: http://egov-hrms:8080/egov-hrms/employees/_search?tenantId=$tenantid&roles=PTCEMP|$.Employees[*].user.id|$.Employees[*].user.name - source: pt - wrapper: true - isMandatory: false - searchClause: AND eg_user.id = $collectorname::INTEGER - query: | - -- Use CTE to force query plan, compute & use CTE later - SELECT - split_part(rd.tenantid,'.',2) as ulb, - Count (*)/8 noofassessments, - SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, - SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, - SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, - SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, - SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as propertytax, - (SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN adjustedamount ELSE 0 END) )as exemption, - ( SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END)) as adjustment, - (CASE WHEN collectiontype='COUNTER' THEN eg_user.name ELSE 'Online' END) as collectorname - FROM egcl_receiptdetails_v1 as rd - INNER JOIN egcl_receiptheader_v1 as rh on rh.id = rd.receiptheader - LEFT OUTER JOIN eg_user ON eg_user.id = rh.createdby::INTEGER - WHERE rd.tenantid = $tenantid and rh.status != 'Cancelled' and businessdetails='PT' - groupby: group by rd.tenantid,collectorname - -- reportName: StateReceiptRegisterSummary - summary: Receipt Register Summary - version: 1.0.0 - moduleName: rainmaker-pt - additionalConfig: - print: - pdfPageSize: "A1" - sourceColumns: - - name: ulb - label: reports.pt.ulb - type: string - source: pt - total: false - - name: adhocpenalty - label: reports.pt.adhocpenalty - type: string - source: pt - total: true - - name: adhocrebate - label: reports.pt.adhocrebate - type: string - source: pt - total: true - - name: firecess - label: reports.pt.firecess - type: string - source: pt - total: true - - name: cancercess - label: reports.pt.cancercess - type: string - source: pt - total: true - - name: interest - label: reports.pt.interest - type: string - source: pt - total: true - - name: penalty - label: reports.pt.penalty - type: string - source: pt - total: true - - name: rebate - label: reports.pt.rebate - type: string - source: pt - total: true - - name: propertytax - label: reports.pt.propertytax - type: string - source: pt - total: true - - name: exemption - label: reports.pt.exemption - type: string - source: pt - total: true - - name: adjustment - label: reports.pt.adjustment - type: string - source: pt - total: true - searchParams: - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: false - searchClause: AND rh.receiptdate >= $fromDate - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: false - searchClause: AND rh.receiptdate <= $toDate - - name: ulb - label: ULB - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name - source: pt - wrapper: true - isMandatory: false - searchClause: AND rd.tenantid = $ulb - query: | - -- Use CTE to force query plan, compute & use CTE later - SELECT - split_part(rd.tenantid,'.',2) as ulb, - SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, - SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, - SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, - SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, - SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as propertytax, - (SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN adjustedamount ELSE 0 END) )as exemption, - ( SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END)) as adjustment - FROM egcl_receiptdetails_v1 as rd - INNER JOIN egcl_receiptheader_v1 as rh on rh.id = rd.receiptheader - WHERE rd.tenantid != 'pb.testing' and rh.status != 'Cancelled' and businessdetails='PT' - groupby: group by rd.tenantid - orderby: order by rd.tenantid - -- reportName: FYCollectionsReport - summary: FY Collections - version: 1.0.0 - moduleName: rainmaker-pt - additionalConfig: - print: - pdfPageSize: "Legal" - sourceColumns: - - name: financialyear - label: reports.pt.financialyear - type: string - source: pt - total: false - - name: residential - label: reports.pt.residential - type: string - source: pt - total: true - - name: nonresidential - label: reports.pt.nonresidential - type: string - source: pt - total: true - - name: mixed - label: reports.pt.mixed - type: string - source: pt - total: true - - name: totalamount - label: reports.pt.totalamount - type: string - source: pt - total: true - - name: online - label: reports.pt.online - type: string - source: pt - total: true - - name: cash - label: reports.pt.cash - type: string - source: pt - total: true - - name: cheque - label: reports.pt.cheque - type: string - source: pt - total: true - - name: dd - label: reports.pt.dd - type: string - source: pt - total: true - searchParams: - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: false - searchClause: AND rh.receiptdate >= $fromDate - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: false - searchClause: AND rh.receiptdate <= $toDate - - name: localityArray - label: reports.pt.zoneList - type: boundarylist - source: pt - isMandatory: false - searchClause: AND pt_addr.locality IN ($localityArray) - query: | - -- Use CTE to force query plan, compute & use CTE later - SELECT - financialyear, - sum(case when usagecategorymajor='RESIDENTIAL' then amount else 0 end) as "residential", - sum(case when usagecategorymajor='RESIDENTIAL' then 1 else 0 end) as "countresidential", - sum(case when usagecategorymajor='NONRESIDENTIAL' then amount else 0 end) as "nonresidential", - sum(case when usagecategorymajor='NONRESIDENTIAL' then 1 else 0 end) as "countnonresidential", - sum(case when usagecategorymajor='MIXED' then amount else 0 end) as "mixed", - sum(case when usagecategorymajor='MIXED' then 1 else 0 end) as "countmixed", - sum(amount) as totalamount, - count(amount) as totalcount, - sum(case when instrumenttype='Online' then amount else 0 end) as "online", - sum(case when instrumenttype='Cash' then amount else 0 end) as "cash", - sum(case when instrumenttype='Cheque' then amount else 0 end) as "cheque", - sum(case when instrumenttype='DD' then amount else 0 end) as "dd" - FROM egcl_receiptheader_v1 AS rh - JOIN egcl_receiptinstrument_v1 AS ri ON rh.id = ri.receiptheader - JOIN egcl_instrumentheader_v1 AS ih ON ih.id = ri.instrumentheader - JOIN eg_pt_propertydetail_v2 pt_detail ON (pt_detail.property || ':' || pt_detail.assessmentnumber) = rh.consumercode - JOIN eg_pt_address_v2 pt_addr ON pt_detail.property = pt_addr.property - LEFT OUTER JOIN eg_user ON eg_user.id = rh.createdby::INTEGER - WHERE rh.tenantid = $tenantid and rh.status != 'Cancelled' - groupby: GROUP BY financialyear - orderby: ORDER BY financialyear - -- reportName: ULBDEFAULTERPTREPORT - summary: ULB Defaulter Pt report - version: 1.0.0 - moduleName: rainmaker-pt - sourceColumns: - - name: ulb - label: reports.pt.ulb - type: string - source: pt - total: false - - name: propertytaxuniqueid - label: reports.pt.propertytaxuniqueid - type: string - source: pt - total: false - - name: transcationdate - label: reports.pt.transcationdate - type: string - source: pt - total: false - - name: receiptnumber - label: reports.pt.receiptnumber - type: string - source: pt - total: false - - name: existingpropertyid - label: reports.pt.existingpropertyid - type: string - source: pt - total: false - - name: financialyear - label: reports.pt.financialYear - type: string - source: pt - total: false - - name: ownername - label: reports.pt.ownername - type: string - source: pt - total: false - - name: guardianname - label: reports.pt.guardianname - type: string - source: pt - total: false - - name: propertytype - label: reports.pt.propertytype - type: string - source: pt - total: false - - name: mobileno - label: reports.pt.mobileno - type: string - source: pt - total: false - - name: address - label: reports.pt.address - type: string - source: pt - total: false - - name: payeraddress - label: reports.pt.payeraddress - type: string - source: pt - total: false - searchParams: - - name: localityArray - label: reports.pt.zoneList - type: boundarylist - source: pt - isMandatory: true - searchClause: AND pta.locality IN ($localityArray) - query: | - --S.no Service Name ULB Property Tax Unique ID Date Of Transcation Receipt Number Existing Property ID Type Of Property Mobile Number Address - with eg_pt_unit_v2_ot as ( - select - propertydetail, - string_agg(distinct pu.occupancytype, ',') as occupancytype, - string_agg(distinct coalesce(usagecategoryminor, usagecategorymajor), ',') as propertytype - from eg_pt_unit_v2 as pu - where pu.tenantid =$tenantid - group by propertydetail - ) - select - distinct on (rh.receiptnumber) - initcap(split_part(rh.tenantid, '.', 2)) as "ulb", - split_part(consumercode, ':', 1) as "propertytaxuniqueid", - to_char((To_timestamp(receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS "transcationdate", - receiptnumber as "receiptnumber", - pt.oldpropertyid as "existingpropertyid", - pd.financialyear as "financialyear", - eu."name" as "ownername", - eu.guardian as "guardianname", - pot.propertytype as "propertytype", - eu.mobilenumber as "mobileno", - REGEXP_REPLACE(REGEXP_REPLACE(CONCAT(pta.doorno, ',', pta.addressline1, ',', pta.addressline2, ',', pta.buildingname, ',', pta.pincode), ',+', ','), '^,|,$', '') as "address" - from egcl_receiptheader_v1 as rh - inner join egcl_receiptinstrument_v1 as ri on ri.receiptheader = rh.id - inner join egcl_instrumentheader_v1 as ih on ih.id = ri.instrumentheader - inner join eg_pt_property_v2 as pt on pt.propertyid = split_part(consumercode, ':', 1) - inner join eg_pt_propertydetail_v2 as pd on pd.assessmentnumber = split_part(consumercode, ':', 2) - inner join eg_pt_owner_v2 as po on po.propertydetail = pd.assessmentnumber - inner join eg_user as eu on eu.uuid = po.userid - inner join eg_pt_address_v2 as pta on pta.property = pt.propertyid - left outer join eg_pt_unit_v2_ot as pot on pot.propertydetail = pd.assessmentnumber - where rh.tenantid =$tenantid and pd.property not in (select property from eg_pt_propertydetail_v2 where financialyear in ('2019-20')) - -- reportName: ReceiptRegister_V2 - decryptionPathId: ReceiptRegister_V2 - summary: Receipt Register - version: 1.0.0 - moduleName: rainmaker-pt - additionalConfig: - print: - pdfPageSize: "A1" - sourceColumns: - - name: receiptnumber - label: reports.pt.receiptNo - type: string - source: pt - total: false - - name: receiptdate - label: reports.pt.receiptDate - type: string - source: pt - total: false - - name: g8issuedate - label: reports.pt.g8issuedate - type: string - source: pt - total: false - - name: g8receiptno - label: reports.pt.g8receiptno - type: string - source: pt - total: false - - name: amount - label: reports.pt.amount - type: string - source: pt - total: true - - name: propertytax - label: reports.pt.propertyTax - type: string - source: pt - total: true - - name: firecess - label: reports.pt.fireCess - type: string - source: pt - total: true - - name: cancercess - label: reports.pt.cancerCess - type: string - source: pt - total: true - - name: rebate - label: reports.pt.rebate - type: string - source: pt - total: true - - name: adhocrebate - label: reports.pt.adhocrebate - type: string - source: pt - total: true - - name: penalty - label: reports.pt.penalty - type: string - source: pt - total: true - - name: adhocpenalty - label: reports.pt.adhocpenalty - type: string - source: pt - total: true - - name: interest - label: reports.pt.interest - type: string - source: pt - total: true - - name: exemption - label: reports.pt.exemption - type: string - source: pt - total: true - - name: adjustment - label: reports.pt.roundoff - type: string - source: pt - total: true - - name: pendingamount - label: reports.pt.pendingamount - type: string - source: pt - total: true - - name: consumercode - label: reports.pt.propertyId - type: string - source: pt - total: false - - name: usagetype - label: reports.pt.usagetype - type: string - source: pt - total: false - - name: instrumenttype - label: reports.pt.paymentMode - type: string - source: pt - total: false - - name: transactionnumber - label: reports.pt.ddChequeTransactionNo - type: string - source: pt - total: false - - name: transactiondate - label: reports.pt.ddChequeTransactionDate - type: string - source: pt - total: false - - name: bankname - label: reports.pt.bankName - type: string - source: pt - total: false - - name: collectorname - label: reports.pt.collectorname - type: string - source: pt - total: false - - name: financialyear - label: reports.pt.financialyear - type: string - source: pt - total: false - searchParams: - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: true - searchClause: AND pd.receiptdate >= $fromDate - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: true - searchClause: AND pd.receiptdate <= $toDate - - name: financialyear - label: Financial Year - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name - source: pt - wrapper: true - isMandatory: false - searchClause: AND concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) = $financialyear - - name: paymentMode - label: Payment Mode - type: singlevaluelist - pattern: 'list://CARD:Card,CASH:Cash,CHEQUE:Cheque,DD:DD,OFFLINE_NEFT:NEFT,OFFLINE_RTGS:RTGS,ONLINE:Online,POSTAL_ORDER:PostalOrder' - source: pt - isMandatory: false - searchClause: AND payment.paymentmode = $paymentMode - - name: localityArray - label: reports.pt.zoneList - type: boundarylist - source: pt - isMandatory: false - searchClause: AND pt_addr.locality IN ($localityArray) - query: | - -- Use CTE to force query plan, compute & use CTE later - WITH receipt_breakup AS ( - SELECT - pd.id as pdid, - SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, - SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, - SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, - SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, - SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN bad.amount ELSE 0 END) as propertytax, - SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as paidpropertytax, - (SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN bad.amount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN bad.amount ELSE 0 END) ) as exemption, - (SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END)) as adjustment - FROM egcl_billaccountdetail as bad - INNER JOIN egcl_billdetial as bd on bd.id = bad.billdetailid - INNER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid - INNER JOIN egcl_payment as payment on pd.paymentid=payment.id - WHERE payment.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' - GROUP BY pdid - ) - SELECT - pd.tenantid AS tenantid, - pd.id, - pt.propertyid as consumercode, - to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS receiptdate, - payment.ifsccode AS bankname, - receiptnumber, - payment.totalamountpaid as amount, - payment.paymentmode as instrumenttype, - payment.transactionnumber, - getfinancialyear(pd.billid) as financialyear, - to_char((To_timestamp(payment.transactiondate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, - payment.totaldue - payment.totalamountpaid AS pendingamount, - Initcap(case when pt.usagecategory like '%.%' then split_part(pt.usagecategory,'.',2) else pt.usagecategory end) as usagetype, - (case when eg_user.name is null then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else eg_user.name end) as collectorname, - receipt_breakup.*, - to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, - manualreceiptnumber as g8receiptno - FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, - (select * from (select *,(row_number() over(partition by propertyid order by lastmodifiedtime desc)) as rw from eg_pt_property where tenantid=$tenantid) pts where rw=1) as pt, - receipt_breakup, egcl_bill bill, - (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr - where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid - and pt.propertyid = bill.consumercode and receipt_breakup.pdid=pd.id --and pt.status!='INACTIVE' - and pt_addr.propertyid=pt.id - --and pt.propertyid='PT-1012-978737' - --and receiptnumber='PT/1012/2020-21/001021' - orderby: ORDER BY pd.receiptdate DESC; - - -- reportName: ReceiptRegister_without_locality_V2 - decryptionPathId: ReceiptRegister_V2 - summary: Receipt Register - version: 1.0.0 - moduleName: rainmaker-pt - additionalConfig: - print: - pdfPageSize: "A1" - sourceColumns: - - name: receiptnumber - label: reports.pt.receiptNo - type: string - source: pt - total: false - - name: receiptdate - label: reports.pt.receiptDate - type: string - source: pt - total: false - - name: g8issuedate - label: reports.pt.g8issuedate - type: string - source: pt - total: false - - name: g8receiptno - label: reports.pt.g8receiptno - type: string - source: pt - total: false - - name: amount - label: reports.pt.amount - type: string - source: pt - total: true - - name: propertytax - label: reports.pt.propertyTax - type: string - source: pt - total: true - - name: firecess - label: reports.pt.fireCess - type: string - source: pt - total: true - - name: cancercess - label: reports.pt.cancerCess - type: string - source: pt - total: true - - name: rebate - label: reports.pt.rebate - type: string - source: pt - total: true - - name: adhocrebate - label: reports.pt.adhocrebate - type: string - source: pt - total: true - - name: penalty - label: reports.pt.penalty - type: string - source: pt - total: true - - name: adhocpenalty - label: reports.pt.adhocpenalty - type: string - source: pt - total: true - - name: interest - label: reports.pt.interest - type: string - source: pt - total: true - - name: exemption - label: reports.pt.exemption - type: string - source: pt - total: true - - name: adjustment - label: reports.pt.roundoff - type: string - source: pt - total: true - - name: pendingamount - label: reports.pt.pendingamount - type: string - source: pt - total: true - - name: consumercode - label: reports.pt.propertyId - type: string - source: pt - total: false - - name: usagetype - label: reports.pt.usagetype - type: string - source: pt - total: false - - name: instrumenttype - label: reports.pt.paymentMode - type: string - source: pt - total: false - - name: transactionnumber - label: reports.pt.ddChequeTransactionNo - type: string - source: pt - total: false - - name: transactiondate - label: reports.pt.ddChequeTransactionDate - type: string - source: pt - total: false - - name: bankname - label: reports.pt.bankName - type: string - source: pt - total: false - - name: collectorname - label: reports.pt.collectorname - type: string - source: pt - total: false - - name: financialyear - label: reports.pt.financialyear - type: string - source: pt - total: false - searchParams: - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: true - searchClause: AND pd.receiptdate >= $fromDate - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: true - searchClause: AND pd.receiptdate <= $toDate - - name: financialyear - label: Financial Year - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name - source: pt - wrapper: true - isMandatory: false - searchClause: AND concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) = $financialyear - - name: paymentMode - label: Payment Mode - type: singlevaluelist - pattern: 'list://CARD:Card,CASH:Cash,CHEQUE:Cheque,DD:DD,OFFLINE_NEFT:NEFT,OFFLINE_RTGS:RTGS,ONLINE:Online,POSTAL_ORDER:PostalOrder' - source: pt - isMandatory: false - searchClause: AND payment.paymentmode = $paymentMode - query: | - -- Use CTE to force query plan, compute & use CTE later - WITH receipt_breakup AS ( - SELECT - pd.id as pdid, - SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, - SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, - SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, - SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, - SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN bad.amount ELSE 0 END) as propertytax, - SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as paidpropertytax, - (SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN bad.amount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN bad.amount ELSE 0 END) ) as exemption, - (SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END)) as adjustment - FROM egcl_billaccountdetail as bad - INNER JOIN egcl_billdetial as bd on bd.id = bad.billdetailid - INNER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid - INNER JOIN egcl_payment as payment on pd.paymentid=payment.id - WHERE payment.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' - AND pd.receiptdate >= $fromDate AND pd.receiptdate <= $toDate - GROUP BY pdid - ) - SELECT - pd.tenantid AS tenantid, - pd.id, - pt.propertyid as consumercode, - to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS receiptdate, - --payment.ifsccode AS bankname, - concat(bank_branches.bank_name,' ',bank_branches.branch) as bankname, - receiptnumber, - payment.totalamountpaid as amount, - payment.paymentmode as instrumenttype, - payment.transactionnumber, - concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear, - to_char((To_timestamp(payment.instrumentdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, - payment.totaldue - payment.totalamountpaid AS pendingamount, - Initcap(case when pt.usagecategory like '%.%' then split_part(pt.usagecategory,'.',2) else pt.usagecategory end) as usagetype, - (case when eg_user.name is null then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else eg_user.name end) as collectorname, - receipt_breakup.*, - to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, - manualreceiptnumber as g8receiptno - FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment left outer join bank_branches on bank_branches.ifsc=payment.ifsccode, - (select * from (select *,(row_number() over(partition by propertyid order by lastmodifiedtime desc)) as rw from eg_pt_property where tenantid=$tenantid) pts where rw=1) as pt, - receipt_breakup, egcl_bill bill - --,(select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr - where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid - and pt.propertyid = bill.consumercode and receipt_breakup.pdid=pd.id --and pt.status!='INACTIVE' - --and pt_addr.propertyid=pt.id - orderby: ORDER BY pd.receiptdate DESC; - - -- reportName: CancelledReceiptRegister_V2 - decryptionPathId: CancelledReceiptRegister_V2 - summary: Receipt Register for cancelled Receipts - version: 1.0.0 - moduleName: rainmaker-pt - additionalConfig: - print: - pdfPageSize: "A1" - sourceColumns: - - name: receiptnumber - label: reports.pt.receiptNo - type: string - source: pt - total: false - - name: receiptdate - label: reports.pt.receiptDate - type: string - source: pt - total: false - - name: g8issuedate - label: reports.pt.g8issuedate - type: string - source: pt - total: false - - name: g8receiptno - label: reports.pt.g8receiptno - type: string - source: pt - total: false - - name: amount - label: reports.pt.amount - type: string - source: pt - total: true - - name: propertytax - label: reports.pt.propertyTax - type: string - source: pt - total: true - - name: firecess - label: reports.pt.fireCess - type: string - source: pt - total: true - - name: cancercess - label: reports.pt.cancerCess - type: string - source: pt - total: true - - name: rebate - label: reports.pt.rebate - type: string - source: pt - total: true - - name: adhocrebate - label: reports.pt.adhocrebate - type: string - source: pt - total: true - - name: penalty - label: reports.pt.penalty - type: string - source: pt - total: true - - name: adhocpenalty - label: reports.pt.adhocpenalty - type: string - source: pt - total: true - - name: interest - label: reports.pt.interest - type: string - source: pt - total: true - - name: exemption - label: reports.pt.exemption - type: string - source: pt - total: true - - name: adjustment - label: reports.pt.roundoff - type: string - source: pt - total: true - - name: pendingamount - label: reports.pt.pendingamount - type: string - source: pt - total: true - - name: consumercode - label: reports.pt.propertyId - type: string - source: pt - total: false - - name: usagetype - label: reports.pt.usagetype - type: string - source: pt - total: false - - name: instrumenttype - label: reports.pt.paymentMode - type: string - source: pt - total: false - - name: transactionnumber - label: reports.pt.ddChequeTransactionNo - type: string - source: pt - total: false - - name: transactiondate - label: reports.pt.ddChequeTransactionDate - type: string - source: pt - total: false - - name: bankname - label: reports.pt.bankName - type: string - source: pt - total: false - - name: collectorname - label: reports.pt.collectorname - type: string - source: pt - total: false - - name: financialyear - label: reports.pt.financialyear - type: string - source: pt - total: false - - name: paymentstatus - label: reports.pt.paymentstatus - type: string - source: pt - total: false - searchParams: - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: true - searchClause: AND pd.receiptdate >= $fromDate - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: true - searchClause: AND pd.receiptdate <= $toDate - - name: financialyear - label: Financial Year - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name - source: pt - wrapper: true - isMandatory: false - searchClause: AND concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) = $financialyear - - name: paymentMode - label: Payment Mode - type: singlevaluelist - pattern: 'list://CARD:Card,CASH:Cash,CHEQUE:Cheque,DD:DD,OFFLINE_NEFT:NEFT,OFFLINE_RTGS:RTGS,ONLINE:Online,POSTAL_ORDER:PostalOrder' - source: pt - isMandatory: false - searchClause: AND payment.paymentmode = $paymentMode - query: | - -- Use CTE to force query plan, compute & use CTE later - WITH receipt_breakup AS ( - SELECT - pd.id as pdid, - SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, - SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, - SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, - SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, - SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN bad.amount ELSE 0 END) as propertytax, - SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as paidpropertytax, - (SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN bad.amount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN bad.amount ELSE 0 END) ) as exemption, - (SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END)) as adjustment - FROM egcl_billaccountdetail as bad - INNER JOIN egcl_billdetial as bd on bd.id = bad.billdetailid - INNER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid - INNER JOIN egcl_payment as payment on pd.paymentid=payment.id - WHERE payment.tenantid = $tenantid and payment.paymentstatus = 'CANCELLED' and pd.businessservice='PT' - GROUP BY pdid - ) - SELECT - pd.tenantid AS tenantid, - pd.id, - pt.propertyid as consumercode, - to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS receiptdate, - --payment.ifsccode AS bankname, - concat(bank_branches.bank_name,' ',bank_branches.branch) as bankname, - receiptnumber, - payment.totalamountpaid as amount, - payment.paymentmode as instrumenttype, - payment.transactionnumber, - concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear, - to_char((To_timestamp(payment.transactiondate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, - payment.totaldue - payment.totalamountpaid AS pendingamount, - Initcap(case when pt.usagecategory like '%.%' then split_part(pt.usagecategory,'.',2) else pt.usagecategory end) as usagetype, - (case when eg_user.name is null then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else eg_user.name end) as collectorname, - receipt_breakup.*, - to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, - manualreceiptnumber as g8receiptno - FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment left outer join bank_branches on bank_branches.ifsc=payment.ifsccode, eg_pt_property as pt, receipt_breakup, egcl_bill bill - --,(select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr - where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus = 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid - and pt.propertyid = bill.consumercode and receipt_breakup.pdid=pd.id and pt.status!='INACTIVE' - --and pt_addr.propertyid=pt.id - orderby: ORDER BY pd.receiptdate DESC; - -- reportName: OldUlbWisePtCollection_V2 - summary: ULB-wise PT Collection - version: 1.0.0 - moduleName: rainmaker-pt - sourceColumns: - - name: totalassessments - label: reports.pt.totalassessments - type: string - source: pt - total: true - - name: totalamountpaid - label: reports.pt.totalamountpaid - type: string - source: pt - total: true - - name: totalamountdue - label: reports.pt.totalamountdue - type: string - source: pt - total: true - searchParams: - - name: financialyear - label: Financial Year - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name - source: pt - wrapper: true - isMandatory: false - searchClause: AND financialyear = $financialyear - - name: usage - label: Usage - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=PropertyTax&masterName=UsageCategoryMajor|$..code|$..name - source: pt - wrapper: true - isMandatory: false - searchClause: AND usagecategorymajor = $usage - query: | - SELECT - tenantid, + + initcap(split_part(tenantid, '.', 2)) as tenantid, + COUNT(*) AS totalassessments, + SUM(totalamount) AS totalamount, + SUM(amount) AS totalamountpaid, + + SUM(CASE WHEN collectiontype LIKE 'ONLINE' THEN amount ELSE 0 END) AS totalonline, + + SUM(CASE WHEN collectiontype LIKE 'COUNTER' THEN amount ELSE 0 END) AS totaloffline, + (SUM(totalamount) - SUM(amount)) AS totalamountdue - FROM eg_pt_propertydetail_v2 AS pd - LEFT OUTER JOIN - (SELECT consumercode, totalamount, amount FROM egcl_receiptheader_v1 AS rh - LEFT OUTER JOIN egcl_receiptinstrument_v1 AS ri ON rh.id = ri.receiptheader - LEFT OUTER JOIN egcl_instrumentheader_v1 AS ih ON ri.instrumentheader = ih.id - and ih.instrumentstatus != 'CANCELLED' - where rh.status != 'Cancelled' - ) AS instrument_data ON (pd.property || ':' || pd.assessmentnumber) = instrument_data.consumercode - WHERE tenantid = $tenantid - groupby: GROUP BY tenantid - orderby: ORDER BY tenantid, totalamountpaid DESC NULLS LAST - -- reportName: StateCancelledReceiptRegister_V2 - decryptionPathId: CancelledReceiptRegister_V2 - summary: Receipt Register for cancelled Receipts state - version: 1.0.0 - moduleName: rainmaker-pt - additionalConfig: - print: - pdfPageSize: "A1" - sourceColumns: - - name: tenantid - label: reports.pt.ulb - type: string - source: pt - total: false - - name: receiptnumber - label: reports.pt.receiptNo - type: string - source: pt - total: false - - name: receiptdate - label: reports.pt.receiptDate - type: string - source: pt - total: false - - name: g8issuedate - label: reports.pt.g8issuedate - type: string - source: pt - total: false - - name: g8receiptno - label: reports.pt.g8receiptno - type: string - source: pt - total: false - - name: amount - label: reports.pt.amount - type: string - source: pt - total: true - - name: paystatus - label: reports.pt.paymentstatus - type: string - source: pt - total: false - - name: propertytax - label: reports.pt.propertyTax - type: string - source: pt - total: true - - name: firecess - label: reports.pt.fireCess - type: string - source: pt - total: true - - name: cancercess - label: reports.pt.cancerCess - type: string - source: pt - total: true - - name: rebate - label: reports.pt.rebate - type: string - source: pt - total: true - - name: adhocrebate - label: reports.pt.adhocrebate - type: string - source: pt - total: true - - name: penalty - label: reports.pt.penalty - type: string - source: pt - total: true - - name: adhocpenalty - label: reports.pt.adhocpenalty - type: string - source: pt - total: true - - name: interest - label: reports.pt.interest - type: string - source: pt - total: true - - name: exemption - label: reports.pt.exemption - type: string - source: pt - total: true - - name: adjustment - label: reports.pt.roundoff - type: string - source: pt - total: true - - name: pendingamount - label: reports.pt.pendingamount - type: string - source: pt - total: true - - name: consumercode - label: reports.pt.propertyId - type: string - source: pt - total: false - - name: usagetype - label: reports.pt.usagetype - type: string - source: pt - total: false - - name: instrumenttype - label: reports.pt.paymentMode - type: string - source: pt - total: false - - name: transactionnumber - label: reports.pt.ddChequeTransactionNo - type: string - source: pt - total: false - - name: transactiondate - label: reports.pt.ddChequeTransactionDate - type: string - source: pt - total: false - - name: bankname - label: reports.pt.bankName - type: string - source: pt - total: false - - name: collectorname - label: reports.pt.collectorname - type: string - source: pt - total: false - - name: financialyear - label: reports.pt.financialyear - type: string - source: pt - total: false - searchParams: - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: true - searchClause: AND pd.receiptdate >= $fromDate - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: true - searchClause: AND pd.receiptdate <= $toDate - - name: paymentMode - label: Payment Mode - type: singlevaluelist - pattern: 'list://CARD:Card,CASH:Cash,CHEQUE:Cheque,DD:DD,OFFLINE_NEFT:NEFT,OFFLINE_RTGS:RTGS,ONLINE:Online,POSTAL_ORDER:PostalOrder' - source: pt - isMandatory: false - searchClause: AND payment.paymentmode = $paymentMode - query: | - -- Use CTE to force query plan, compute & use CTE later - WITH receipt_breakup AS ( - SELECT - pd.id as pdid, - SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, - SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, - SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, - SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, - SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as propertytax, - (SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN adjustedamount ELSE 0 END) )as exemption, - ( SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END)) as adjustment - FROM egcl_billaccountdetail as bad - INNER JOIN egcl_billdetial as bd on bd.id = bad.billdetailid - INNER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid - INNER JOIN egcl_payment as payment on pd.paymentid=payment.id - WHERE bad.tenantid not in ('pb.testing','pb.ludhiana_legacy') and payment.paymentstatus = 'CANCELLED' and pd.businessservice='PT' - GROUP BY pdid - ) - SELECT - pd.tenantid AS tenantid, - pd.id, - bill.consumercode, - to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS receiptdate, - payment.ifsccode AS bankname, - receiptnumber, - payment.totalamountpaid as amount, - payment.paymentmode as instrumenttype, - payment.transactionnumber, - concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear, - to_char((To_timestamp(payment.transactiondate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, - pd.due AS pendingamount, - Initcap(case when pt.usagecategory like '%.%' then split_part(pt.usagecategory,'.',2) else pt.usagecategory end) as usagetype, - (CASE WHEN billd.collectiontype='COUNTER' THEN eg_user.name ELSE '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' END) as collectorname, - receipt_breakup.*, - to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, manualreceiptnumber as g8receiptno, - payment.paymentstatus as paystatus - FROM egcl_paymentdetail pd, eg_user, eg_pt_property as pt, egcl_billdetial as billd, egcl_payment payment,receipt_breakup, egcl_bill bill, (select bill.id as billid, min(bd.fromperiod) fromperiod, max(bd.toperiod) toperiod from egcl_billdetial bd, egcl_bill bill where bill.id=bd.billid group by bill.id) bd - WHERE pd.paymentid=payment.id and eg_user.id = pd.createdby::INTEGER and pt.propertyid = bill.consumercode and bill.id=pd.billid and bill.id=billd.billid and bd.billid=bill.id and payment.paymentstatus = 'CANCELLED' and pd.businessservice='PT' and payment.tenantid not in ('pb.testing','pb.ludhiana_legacy') and receipt_breakup.pdid=pd.id - orderby: ORDER BY pd.receiptdate DESC; - -- reportName: StateWidePtCollection_V2 - summary: State Wide PT Collection - version: 1.0.0 - moduleName: rainmaker-pt - sourceColumns: - - name: tenantid - label: reports.pt.tenantid - type: string - source: pt - total: false - - name: totalamountpaid - label: reports.pt.totalamountpaid - type: string - source: pt - total: true - - name: totalassessments - label: reports.pt.totalassessments - type: string - source: pt - total: true - - name: totaloffline - label: reports.pt.totaloffline - type: string - source: pt - total: true - - name: countoffline - label: reports.pt.countoffline - type: string - source: pt - total: true - - name: totalonline - label: reports.pt.totalonline - type: string - source: pt - total: true - - name: countonline - label: reports.pt.countonline - type: string - source: pt - total: true - searchParams: - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: false - searchClause: AND pd.receiptdate >= $fromDate - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: false - searchClause: AND pd.receiptdate <= $toDate - - name: financialyear - label: Financial Year - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name - source: pt - wrapper: true - isMandatory: false - searchClause: AND concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) = $financialyear - - name: usage - label: Usage - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=PropertyTax&masterName=UsageCategoryMajor|$..code|$..name - source: pt - wrapper: true - isMandatory: false - searchClause: AND pt.usagecategory = $usage - query: | - SELECT - initcap(split_part(payment.tenantid, '.', 2)) as tenantid, - sum(payment.totalamountpaid) as totalamountpaid, - count(payment.totalamountpaid) as totalassessments, - sum(case when payment.paymentmode='ONLINE' then payment.totalamountpaid else 0 end) as "totalonline", - sum(case when payment.paymentmode='ONLINE' then 1 else 0 end) as "countonline", - sum(case when payment.paymentmode='CASH' then payment.totalamountpaid else 0 end) + - sum(case when payment.paymentmode='CHEQUE' then payment.totalamountpaid else 0 end) + - sum(case when payment.paymentmode='DD' then payment.totalamountpaid else 0 end) + - sum(case when payment.paymentmode='CARD' then payment.totalamountpaid else 0 end) + - sum(case when payment.paymentmode='OFFLINE_RTGS' then payment.totalamountpaid else 0 end) + - sum(case when payment.paymentmode='OFFLINE_NEFT' then payment.totalamountpaid else 0 end) + - sum(case when payment.paymentmode='POTAL_ORDER' then payment.totalamountpaid else 0 end) as "totaloffline", - sum(case when payment.paymentmode!='ONLINE' then 1 else 0 end) as "countoffline" - --concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear - FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, - (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid!='pb.testing' group by propertyid ) pt_addr - where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid!='pb.testing' - and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id - groupby: GROUP BY payment.tenantid - orderby: ORDER BY payment.tenantid, totalamountpaid DESC NULLS LAST - - -- reportName: UlbWisePtCollection_V2 - summary: ULB Wide PT Collection - version: 1.0.0 - moduleName: rainmaker-pt - sourceColumns: - - name: totalamountpaid - label: reports.pt.totalamountpaid - type: string - source: pt - total: true - - name: totalassessments - label: reports.pt.totalassessments - type: string - source: pt - total: true - - name: totaloffline - label: reports.pt.totaloffline - type: string - source: pt - total: true - - name: countoffline - label: reports.pt.countoffline - type: string - source: pt - total: true - - name: totalonline - label: reports.pt.totalonline - type: string - source: pt - total: true - - name: countonline - label: reports.pt.countonline - type: string - source: pt - total: true - searchParams: - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: false - searchClause: AND pd.receiptdate >= $fromDate - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: false - searchClause: AND pd.receiptdate <= $toDate - - name: financialyear - label: Financial Year - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name - source: pt - wrapper: true - isMandatory: false - searchClause: AND concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) = $financialyear - - name: usage - label: Usage - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=PropertyTax&masterName=UsageCategoryMajor|$..code|$..name - source: pt - wrapper: true - isMandatory: false - searchClause: AND pt.usagecategory = $usage - query: | - SELECT - --initcap(split_part(payment.tenantid, '.', 2)) as tenantid, - sum(payment.totalamountpaid) as totalamountpaid, - count(payment.totalamountpaid) as totalassessments, - sum(case when payment.paymentmode='ONLINE' then payment.totalamountpaid else 0 end) as "totalonline", - sum(case when payment.paymentmode='ONLINE' then 1 else 0 end) as "countonline", - sum(case when payment.paymentmode='CASH' then payment.totalamountpaid else 0 end) + - sum(case when payment.paymentmode='CHEQUE' then payment.totalamountpaid else 0 end) + - sum(case when payment.paymentmode='DD' then payment.totalamountpaid else 0 end) + - sum(case when payment.paymentmode='CARD' then payment.totalamountpaid else 0 end) + - sum(case when payment.paymentmode='OFFLINE_RTGS' then payment.totalamountpaid else 0 end) + - sum(case when payment.paymentmode='OFFLINE_NEFT' then payment.totalamountpaid else 0 end) + - sum(case when payment.paymentmode='POTAL_ORDER' then payment.totalamountpaid else 0 end) as "totaloffline", - sum(case when payment.paymentmode!='ONLINE' then 1 else 0 end) as "countoffline" - --concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear - FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, - (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr - where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid - and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id + FROM eg_pt_propertydetail_v2 AS pd -- reportName: ReceiptRegisterShort_V2 - decryptionPathId: ReceiptRegisterShort_V2 - summary: Receipt Register - version: 1.0.0 - moduleName: rainmaker-pt - additionalConfig: - print: - pdfPageSize: "Legal" - sourceColumns: - - name: receiptnumber - label: reports.pt.receiptNo - type: string - source: pt - total: false - - name: transactiondate - label: reports.pt.receiptDate - type: string - source: pt - total: false - - name: g8receiptno - label: reports.pt.g8book - type: string - source: pt - total: false - - name: g8issuedate - label: reports.pt.g8dated - type: string - source: pt - total: false - - name: propertyid - label: reports.pt.ptrId - type: string - source: pt - total: false - - name: financialyear - label: reports.pt.financialYear - type: string - source: pt - total: false - - name: instrumenttype - label: reports.pt.paymentMode - type: string - source: pt - total: false - - name: amount - label: reports.pt.taxamount - type: string - source: pt - total: true - - name: transactionnumber - label: reports.pt.ddChequeNo - type: string - source: pt - total: false - - name: bankname - label: reports.pt.bankName - type: string - source: pt - total: false - - name: collectorname - label: reports.pt.collectorname - type: string - source: pt - total: false - - name: remarks - label: reports.pt.remarks - type: string - source: pt - total: false - searchParams: - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: true - searchClause: AND pd.receiptdate >= $fromDate - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: true - searchClause: AND pd.receiptdate <= $toDate - - name: paymentMode - label: Payment Mode - type: singlevaluelist - pattern: 'list://CARD:Card,CASH:Cash,CHEQUE:Cheque,DD:DD,OFFLINE_NEFT:NEFT,OFFLINE_RTGS:RTGS,ONLINE:Online,POSTAL_ORDER:PostalOrder' - source: pt - isMandatory: false - searchClause: AND payment.paymentmode = $paymentMode - - name: financialyear - label: Financial Year - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name - source: pt - wrapper: true - isMandatory: false - searchClause: AND concat(to_char((To_timestamp(bd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(bd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) = $financialyear - - name: localityArray - label: reports.pt.zoneList - type: boundarylist - source: pt - isMandatory: false - searchClause: AND pt_addr.locality IN ($localityArray) - - name: collectorname - label: reports.pt.collectorname - type: singlevaluelist - pattern: http://egov-hrms:8080/egov-hrms/employees/_search?tenantId=$tenantid&roles=PTCEMP|$.Employees[*].user.id|$.Employees[*].user.name - source: pt - wrapper: true - isMandatory: false - searchClause: AND eg_user.id = $collectorname::INTEGER - query: | - -- Use CTE to force query plan, compute & use CTE later - SELECT - pt.propertyid as propertyid, - to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') as transactiondate, - payment.ifsccode AS bankname, - receiptnumber, - payment.totalamountpaid as amount, - payment.paymentmode as instrumenttype, - payment.transactionnumber as transactionnumber, - --concat(to_char((To_timestamp(bd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(bd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY')) AS financialyear, - concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear, - (case when eg_user.name is null then '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' else eg_user.name end) as collectorname, - --receipt_breakup.*, - to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, - manualreceiptnumber as g8receiptno, - 'NA' as remarks - FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, - (select bill.id as billid, bill.consumercode as consumercodei, min(bd.fromperiod) fromperiod, max(bd.toperiod) toperiod from egcl_billdetial bd, egcl_bill bill - where bill.id=bd.billid and bill.tenantid = $tenantid group by bill.id) bd, - (select string_agg(distinct propertyid,',') as propertyid,string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr - where pd.paymentid=payment.id and bd.billid=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid - and pt.propertyid = bd.consumercodei and pt.status!='INACTIVE' - and pt_addr.propertyid=pt.id - orderby: ORDER BY pd.receiptdate DESC; - - -- reportName: ReceiptRegisterShort_WithoutLocality_V2 - decryptionPathId: ReceiptRegisterShort_V2 - summary: Receipt Register - version: 1.0.0 - moduleName: rainmaker-pt - additionalConfig: - print: - pdfPageSize: "Legal" - sourceColumns: - - name: receiptnumber - label: reports.pt.receiptNo - type: string - source: pt - total: false - - name: transactiondate - label: reports.pt.receiptDate - type: string - source: pt - total: false - - name: g8receiptno - label: reports.pt.g8book - type: string - source: pt - total: false - - name: g8issuedate - label: reports.pt.g8dated - type: string - source: pt - total: false - - name: propertyid - label: reports.pt.ptrId - type: string - source: pt - total: false - - name: financialyear - label: reports.pt.financialYear - type: string - source: pt - total: false - - name: instrumenttype - label: reports.pt.paymentMode - type: string - source: pt - total: false - - name: amount - label: reports.pt.taxamount - type: string - source: pt - total: true - - name: transactionnumber - label: reports.pt.ddChequeNo - type: string - source: pt - total: false - - name: bankname - label: reports.pt.bankName - type: string - source: pt - total: false - - name: collectorname - label: reports.pt.collectorname - type: string - source: pt - total: false - - name: remarks - label: reports.pt.remarks - type: string - source: pt - total: false - searchParams: - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: true - searchClause: AND pd.receiptdate >= $fromDate - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: true - searchClause: AND pd.receiptdate <= $toDate - - name: paymentMode - label: Payment Mode - type: singlevaluelist - pattern: 'list://CARD:Card,CASH:Cash,CHEQUE:Cheque,DD:DD,OFFLINE_NEFT:NEFT,OFFLINE_RTGS:RTGS,ONLINE:Online,POSTAL_ORDER:PostalOrder' - source: pt - isMandatory: false - searchClause: AND payment.paymentmode = $paymentMode - - name: financialyear - label: Financial Year - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name - source: pt - wrapper: true - isMandatory: false - searchClause: AND concat(to_char((To_timestamp(bd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(bd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) = $financialyear - - name: collectorname - label: reports.pt.collectorname - type: singlevaluelist - pattern: http://egov-hrms:8080/egov-hrms/employees/_search?tenantId=$tenantid&roles=PTCEMP|$.Employees[*].user.id|$.Employees[*].user.name - source: pt - wrapper: true - isMandatory: false - searchClause: AND eg_user.id = $collectorname::INTEGER - query: | - -- Use CTE to force query plan, compute & use CTE later - SELECT - pt.propertyid as propertyid, - to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') as transactiondate, - payment.ifsccode AS bankname, - receiptnumber, - payment.totalamountpaid as amount, - payment.paymentmode as instrumenttype, - payment.transactionnumber as transactionnumber, - --concat(to_char((To_timestamp(bd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(bd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY')) AS financialyear, - concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear, - (case when eg_user.name is null then '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' else eg_user.name end) as collectorname, - --receipt_breakup.*, - to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, - manualreceiptnumber as g8receiptno, - 'NA' as remarks - FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, - (select bill.id as billid, bill.consumercode as consumercodei, min(bd.fromperiod) fromperiod, max(bd.toperiod) toperiod from egcl_billdetial bd, egcl_bill bill - where bill.id=bd.billid and bill.tenantid = $tenantid group by bill.id) bd - where pd.paymentid=payment.id and bd.billid=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid - and pt.propertyid = bd.consumercodei and pt.status!='INACTIVE' - orderby: ORDER BY pd.receiptdate DESC; - - -- reportName: ULBPTDataDumpReport_V2 - decryptionPathId: ULBPTDataDumpReport_V2 - summary: ULB level report - version: 1.0.0 - moduleName: rainmaker-pt - sourceColumns: - - name: ulb - label: reports.pt.ulb - type: string - source: pt - total: false - - name: propertytaxuniqueid - label: reports.pt.propertytaxuniqueid - type: string - source: pt - total: false - - name: transcationdate - label: reports.pt.transcationdate - type: string - source: pt - total: false - - name: receiptnumber - label: reports.pt.receiptnumber - type: string - source: pt - total: false - - name: existingpropertyid - label: reports.pt.existingpropertyid - type: string - source: pt - total: false - - name: financialyear - label: reports.pt.financialYear - type: string - source: pt - total: false - - name: ownername - label: reports.pt.ownername - type: string - source: pt - total: false - - name: guardianname - label: reports.pt.guardianname - type: string - source: pt - total: false - - name: totalarea - label: reports.pt.totalarea - type: string - source: pt - total: false - - name: builtarea - label: reports.pt.builtarea - type: string - source: pt - total: false - - name: floors - label: reports.pt.floors - type: string - source: pt - total: false - - name: occupancy - label: reports.pt.occupancy - type: string - source: pt - total: false - - name: propertytype - label: reports.pt.propertytype - type: string - source: pt - total: false - - name: mobileno - label: reports.pt.mobileno - type: string - source: pt - total: false - - name: transcationmode - label: reports.pt.transcationmode - type: string - source: pt - total: false - - name: paymentamount - label: reports.pt.paymentamount - type: string - source: pt - total: true - - name: paymentdate - label: reports.pt.paymentdate - type: string - source: pt - total: false - - name: emailid - label: reports.pt.emailid - type: string - source: pt - total: false - - name: address - label: reports.pt.address - type: string - source: pt - total: false - - name: payeraddress - label: reports.pt.payeraddress - type: string - source: pt - total: false - - name: remarks - label: reports.pt.remarks - type: string - source: pt - total: false - - name: businessname - label: reports.pt.businessname - type: string - source: pt - total: false - - name: localitycode - label: reports.pt.localitycode - type: string - source: pt - total: false - - name: localityname - label: reports.pt.localityname - type: string - source: pt - total: false - searchParams: - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: true - searchClause: AND payd.receiptdate >= $fromDate - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: true - searchClause: AND payd.receiptdate <= $toDate - - name: financialyear - label: Financial Year - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name - source: pt - wrapper: true - isMandatory: false - searchClause: AND concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) = $financialyear - - name: paymentMode - label: Payment Mode - type: singlevaluelist - pattern: 'list://CARD:Card,CASH:Cash,CHEQUE:Cheque,DD:DD,OFFLINE_NEFT:NEFT,OFFLINE_RTGS:RTGS,ONLINE:Online,POSTAL_ORDER:PostalOrder' - source: pt - isMandatory: false - searchClause: AND payment.paymentmode = $paymentMode - - name: localityArray - label: reports.pt.zoneList - type: boundarylist - source: pt - isMandatory: false - searchClause: AND pta.locality IN ($localityArray) - query: | - --S.no Service Name ULB Property Tax Unique ID Date Of Transcation Receipt Number Existing Property ID Owner Name Guardian Name Total Area (SQ.YARD) Covered Area/Built Area (SQ.FEET) Floors Occupancy (Rented,Self /Unoccupied) Type Of Property Mobile Number Transcation Mode of Payment Payment Amount Payment Date Email Id Address - with eg_pt_unit_v2_ot as ( - select - propertyid, - string_agg(distinct pu.occupancytype, ',') as occupancytype, - string_agg(distinct Initcap(case when usagecategory like '%.%' then split_part(usagecategory,'.',2) else usagecategory end),',') as propertytype - from eg_pt_unit as pu - where pu.tenantid = $tenantid - group by propertyid + LEFT OUTER JOIN (SELECT consumercode, totalamount, amount, collectiontype, receiptdate FROM egcl_receiptheader_v1 AS rh + + LEFT OUTER JOIN egcl_receiptinstrument_v1 AS ri ON rh.id = ri.receiptheader + + LEFT OUTER JOIN egcl_instrumentheader_v1 AS ih ON ri.instrumentheader = ih.id and ih.instrumentstatus != 'CANCELLED' + + where rh.status != 'Cancelled' and rh.tenantid != 'pb.testing' and businessdetails='PT' + + ) AS tbl_amounts ON (pd.property || ':' || pd.assessmentnumber) = tbl_amounts.consumercode + + WHERE tenantid not in ('pb.testing','pb.ludhiana_legacy') + groupby: GROUP BY tenantid + orderby: ORDER BY tenantid, totalamountpaid DESC NULLS LAST + - reportName: UlbWisePtCollection + summary: State Wide PT Collection + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: totalassessments + label: reports.pt.totalassessments + type: string + source: pt + total: true + - name: totalamountpaid + label: reports.pt.totalamountpaid + type: string + source: pt + total: true + - name: totaloffline + label: reports.pt.totaloffline + type: string + source: pt + total: true + - name: countoffline + label: reports.pt.countoffline + type: string + source: pt + total: true + - name: totalonline + label: reports.pt.totalonline + type: string + source: pt + total: true + - name: countonline + label: reports.pt.countonline + type: string + source: pt + total: true + - name: totalamountdue + label: reports.pt.totalamountdue + type: string + source: pt + total: true + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: false + searchClause: AND receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: false + searchClause: AND receiptdate <= $toDate + - name: financialyear + label: Financial Year + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name + source: pt + wrapper: true + isMandatory: false + searchClause: AND financialyear = $financialyear + - name: usage + label: Usage + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=PropertyTax&masterName=UsageCategoryMajor|$..code|$..name + source: pt + wrapper: true + isMandatory: false + searchClause: AND usagecategorymajor = $usage + query: > + SELECT + + initcap(split_part(tenantid, '.', 2)) as tenantid, + + COUNT(collectiontype) AS totalassessments, + + SUM(totalamount) AS totalamount, + + SUM(amount) AS totalamountpaid, + + SUM(CASE WHEN collectiontype LIKE 'ONLINE' THEN amount ELSE 0 END) AS totalonline, + + SUM(CASE WHEN collectiontype LIKE 'ONLINE' THEN 1 ELSE 0 END) AS countonline, + + SUM(CASE WHEN collectiontype LIKE 'COUNTER' THEN amount ELSE 0 END) AS totaloffline, + + SUM(CASE WHEN collectiontype LIKE 'COUNTER' THEN 1 ELSE 0 END) AS countoffline, + + (SUM(totalamount) - SUM(amount)) AS totalamountdue + + FROM eg_pt_propertydetail_v2 AS pd + + LEFT OUTER JOIN (SELECT consumercode, totalamount, amount, collectiontype, receiptdate FROM egcl_receiptheader_v1 AS rh + + LEFT OUTER JOIN egcl_receiptinstrument_v1 AS ri ON rh.id = ri.receiptheader + + LEFT OUTER JOIN egcl_instrumentheader_v1 AS ih ON ri.instrumentheader = ih.id and ih.instrumentstatus != 'CANCELLED' + + where rh.status != 'Cancelled' + + ) AS tbl_amounts ON (pd.property || ':' || pd.assessmentnumber) = tbl_amounts.consumercode + + WHERE tenantid LIKE CONCAT(SPLIT_PART($tenantid, '.', 1), '%') and tenantid = $tenantid + groupby: GROUP BY tenantid + orderby: ORDER BY tenantid, totalamountpaid DESC NULLS LAST + - reportName: ULBPTDataDumpReportOld + summary: ULB level report + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: ulb + label: reports.pt.ulb + type: string + source: pt + total: false + - name: propertytaxuniqueid + label: reports.pt.propertytaxuniqueid + type: string + source: pt + total: false + - name: transcationdate + label: reports.pt.transcationdate + type: string + source: pt + total: false + - name: receiptnumber + label: reports.pt.receiptnumber + type: string + source: pt + total: false + - name: existingpropertyid + label: reports.pt.existingpropertyid + type: string + source: pt + total: false + - name: financialyear + label: reports.pt.financialYear + type: string + source: pt + total: false + - name: ownername + label: reports.pt.ownername + type: string + source: pt + total: false + - name: guardianname + label: reports.pt.guardianname + type: string + source: pt + total: false + - name: totalarea + label: reports.pt.totalarea + type: string + source: pt + total: false + - name: builtarea + label: reports.pt.builtarea + type: string + source: pt + total: false + - name: floors + label: reports.pt.floors + type: string + source: pt + total: false + - name: occupancy + label: reports.pt.occupancy + type: string + source: pt + total: false + - name: propertytype + label: reports.pt.propertytype + type: string + source: pt + total: false + - name: mobileno + label: reports.pt.mobileno + type: string + source: pt + total: false + - name: transcationmode + label: reports.pt.transcationmode + type: string + source: pt + total: false + - name: paymentamount + label: reports.pt.paymentamount + type: string + source: pt + total: true + - name: paymentdate + label: reports.pt.paymentdate + type: string + source: pt + total: false + - name: emailid + label: reports.pt.emailid + type: string + source: pt + total: false + - name: address + label: reports.pt.address + type: string + source: pt + total: false + - name: remarks + label: reports.pt.remarks + type: string + source: pt + total: false + - name: businessname + label: reports.pt.businessname + type: string + source: pt + total: false + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: true + searchClause: AND rh.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: true + searchClause: AND rh.receiptdate <= $toDate + query: > + --S.no Service Name ULB Property Tax Unique ID Date Of + Transcation Receipt Number Existing Property ID Owner + Name Guardian Name Total Area (SQ.YARD) Covered Area/Built Area + (SQ.FEET) Floors Occupancy (Rented,Self /Unoccupied) Type Of + Property Mobile Number Transcation Mode of Payment Payment + Amount Payment Date Email Id Address + + with eg_pt_unit_v2_ot as ( + select + propertydetail, + string_agg(distinct pu.occupancytype, ',') as occupancytype, + string_agg(distinct coalesce(usagecategoryminor, usagecategorymajor), ',') as propertytype + from eg_pt_unit_v2 as pu + where pu.tenantid = $tenantid + group by propertydetail ) + select - distinct on (payd.receiptnumber) - initcap(split_part(payd.tenantid, '.', 2)) as "ulb", - split_part(consumercode, ':', 1) as "propertytaxuniqueid", - to_char((To_timestamp(receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS "transcationdate", - receiptnumber as "receiptnumber", - pt.oldpropertyid as "existingpropertyid", - concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) AS "financialyear", - eu."name" as "ownername", - eu.guardian as "guardianname", - pt.landarea as "totalarea", - pt.superbuiltuparea * 9 as "builtarea", - pt.nooffloors as "floors", - eu.mobilenumber as "mobileno", - paymentmode as "transcationmode", - payment.totalamountpaid as "paymentamount", - to_char((To_timestamp(payment.transactiondate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS "paymentdate", - eu.emailid as "emailid", - REGEXP_REPLACE(REGEXP_REPLACE(CONCAT(pta.doorno, ',', pta.buildingname, ',',pta.street,',', pta.pincode), ',+', ','), '^,|,$', '') as "address", - payment.payeraddress as "payeraddress", - pt.additionaldetails->>'remarks' as "remarks", - pt.additionaldetails->>'FirmBusinessName' as "businessname", - pot.occupancytype as occupancy, - pot.propertytype as propertytype, - pta.locality as "localitycode", - localnames.localityname as localityname - from egcl_paymentdetail as payd - inner join egcl_payment as payment on payment.id = payd.paymentid - inner join egcl_bill as bill on bill.id = payd.billid - inner join egcl_billdetial as billd on billd.billid=bill.id - inner join eg_pt_property as pt on pt.propertyid = bill.consumercode - inner join eg_pt_owner as po on po.propertyid = pt.id and po.status='ACTIVE' - inner join eg_user as eu on eu.uuid = po.userid - inner join eg_pt_address as pta on pta.propertyid = pt.id - left outer join eg_bndry_mohalla as localnames on pta.locality=localnames.localitycode - left outer join eg_pt_unit_v2_ot as pot on pot.propertyid = pt.id - where payd.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and payd.businessservice='PT' and pt.status!='INACTIVE' - - -- reportName: Sewa_Kendra_ReceiptRegister_V2 - summary: Sewa Kendra Receipt Register - version: 1.0.0 - moduleName: rainmaker-pt - additionalConfig: - print: - pdfPageSize: "A1" - sourceColumns: - - name: receiptnumber - label: reports.pt.receiptNo - type: string - source: pt - total: false - - name: receiptdate - label: reports.pt.receiptDate - type: string - source: pt - total: false - - name: g8issuedate - label: reports.pt.g8issuedate - type: string - source: pt - total: false - - name: g8receiptno - label: reports.pt.g8receiptno - type: string - source: pt - total: false - - name: amount - label: reports.pt.amount - type: string - source: pt - total: true - - name: propertytax - label: reports.pt.propertyTax - type: string - source: pt - total: true - - name: firecess - label: reports.pt.fireCess - type: string - source: pt - total: true - - name: cancercess - label: reports.pt.cancerCess - type: string - source: pt - total: true - - name: rebate - label: reports.pt.rebate - type: string - source: pt - total: true - - name: adhocrebate - label: reports.pt.adhocrebate - type: string - source: pt - total: true - - name: penalty - label: reports.pt.penalty - type: string - source: pt - total: true - - name: adhocpenalty - label: reports.pt.adhocpenalty - type: string - source: pt - total: true - - name: interest - label: reports.pt.interest - type: string - source: pt - total: true - - name: exemption - label: reports.pt.exemption - type: string - source: pt - total: true - - name: adjustment - label: reports.pt.roundoff - type: string - source: pt - total: true - - name: pendingamount - label: reports.pt.pendingamount - type: string - source: pt - total: true - - name: propertyid - label: reports.pt.propertyId - type: string - source: pt - total: false - - name: usagetype - label: reports.pt.usagetype - type: string - source: pt - total: false - - name: assessmentnumber - label: reports.pt.assessmentNo - type: string - source: pt - total: false - - name: financialyear - label: reports.pt.financialYear - type: string - source: pt - total: false - - name: instrumenttype - label: reports.pt.paymentMode - type: string - source: pt - total: false - - name: transactionnumber - label: reports.pt.ddChequeTransactionNo - type: string - source: pt - total: false - - name: transactiondate - label: reports.pt.ddChequeTransactionDate - type: string - source: pt - total: false - - name: bankname - label: reports.pt.bankName - type: string - source: pt - total: false - - name: collectorname - label: reports.pt.collectorname - type: string - source: pt - total: false - - name: remarks - label: reports.pt.remarks - type: string - source: pt - total: false - searchParams: - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: true - searchClause: AND rh.receiptdate >= $fromDate - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: true - searchClause: AND rh.receiptdate <= $toDate - - name: paymentMode - label: Payment Mode - type: singlevaluelist - pattern: 'list://CARD:Card,CASH:Cash,CHEQUE:Cheque,DD:DD,OFFLINE_NEFT:NEFT,OFFLINE_RTGS:RTGS,ONLINE:Online,POSTAL_ORDER:PostalOrder' - source: pt - isMandatory: false - searchClause: AND instrumenttype = $paymentMode - - name: financialyear - label: Financial Year - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name - source: pt - wrapper: true - isMandatory: false - searchClause: AND financialyear = $financialyear - - name: localityArray - label: reports.pt.zoneList - type: boundarylist - source: pt - isMandatory: false - searchClause: AND pt_addr.locality IN ($localityArray) - query: | - -- Use CTE to force query plan, compute & use CTE later - WITH receipt_breakup AS ( - SELECT - receiptnumber, - SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, - SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, - SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, - SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, - SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as propertytax, - (SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN adjustedamount ELSE 0 END) )as exemption, - ( SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END)) as adjustment - FROM egcl_billaccountdetail as bad - INNER JOIN egcl_billdetial as bd on bd.id = bad.billdetailid - INNER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid - INNER JOIN egcl_payment as payment on pd.paymentid=payment.id - WHERE bd.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' - and pd.createdby::INTEGER in (select user_id from eg_userrole_v1 where role_code ='SEVA_KENDRA_EMP') - GROUP BY pd.receiptnumber - ) - SELECT - bill.tenantid AS tenantid, - bill.id, - pt_detail.property AS propertyid, - pt_detail.assessmentnumber AS assessmentnumber, - bill.consumercode, - pd.receiptdate, - to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, - payment.ifsccode AS bankname, - pd.receiptnumber, - payment.totalamountpaid as amount, - payment.paymentmode as instrumenttype, - payment.transactionnumber, - receipt_breakup.*, - pd.due AS pendingamount, - pt_detail.financialyear, - to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, - Initcap(COALESCE(pt_detail.usagecategoryminor, pt_detail.usagecategorymajor)) as usagetype, - manualreceiptnumber as g8receiptno, - (CASE WHEN collectiontype='COUNTER' THEN eg_user.name ELSE '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' END) as collectorname, - pt_detail.additionaldetails->>'remarks' as "remarks" - FROM egcl_bill AS bill - INNER JOIN egcl_billdetial as bd on bd.billid = bill.id - LEFT OUTER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid - LEFT OUTER JOIN egcl_payment as payment on pd.paymentid=payment.id - JOIN eg_pt_propertydetail_v2 pt_detail ON pt_detail.property = bill.consumercode - JOIN eg_pt_address_v2 pt_addr ON pt_detail.property = pt_addr.property - JOIN receipt_breakup ON receipt_breakup.receiptnumber = pd.receiptnumber - LEFT OUTER JOIN eg_user ON eg_user.id = pd.createdby::INTEGER - WHERE bd.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and pd.createdby::INTEGER in (select user_id - FROM eg_userrole_v1 where role_code ='SEVA_KENDRA_EMP') - orderby: ORDER BY pd.receiptdate DESC - - -- reportName: ReceiptRegisterSummary_V2 - decryptionPathId: ReceiptRegisterShort_V2 - summary: Receipt Register Summary - version: 1.0.0 - moduleName: rainmaker-pt - additionalConfig: - print: - pdfPageSize: "A1" - sourceColumns: - - name: ulb - label: reports.pt.ulb - type: string - source: pt - total: false - - name: adhocpenalty - label: reports.pt.adhocpenalty - type: string - source: pt - total: true - - name: adhocrebate - label: reports.pt.adhocrebate - type: string - source: pt - total: true - - name: firecess - label: reports.pt.firecess - type: string - source: pt - total: true - - name: cancercess - label: reports.pt.cancercess - type: string - source: pt - total: true - - name: interest - label: reports.pt.interest - type: string - source: pt - total: true - - name: penalty - label: reports.pt.penalty - type: string - source: pt - total: true - - name: rebate - label: reports.pt.rebate - type: string - source: pt - total: true - - name: propertytax - label: reports.pt.propertytax - type: string - source: pt - total: true - - name: exemption - label: reports.pt.exemption - type: string - source: pt - total: true - - name: adjustment - label: reports.pt.adjustment - type: string - source: pt - total: true - - name: noofassessments - label: reports.pt.noofassessments - type: string - source: pt - total: true - - name: sumcash - label: reports.pt.sumcash - type: string - source: pt - total: true - - name: sumcheque - label: reports.pt.sumcheque - type: string - source: pt - total: true - - name: countcheque - label: reports.pt.countcheque - type: string - source: pt - total: true - - name: sumonline - label: reports.pt.sumonline - type: string - source: pt - total: true - - name: totalamount - label: reports.pt.totalamount - type: string - source: pt - total: true - - name: collectorname - label: reports.pt.collectorname - type: string - source: pt - total: false - searchParams: - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: true - searchClause: AND pd.receiptdate >= $fromDate - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: true - searchClause: AND pd.receiptdate <= $toDate - - name: collectorname - label: reports.pt.collectorname - type: singlevaluelist - pattern: http://egov-hrms:8080/egov-hrms/employees/_search?tenantId=$tenantid&roles=PTCEMP|$.Employees[*].user.id|$.Employees[*].user.name - source: pt - wrapper: true - isMandatory: false - searchClause: AND eg_user.id = $collectorname::INTEGER - query: | - -- Use CTE to force query plan, compute & use CTE later - SELECT - split_part(bd.tenantid,'.',2) as ulb, - Count (distinct pd.paymentid) as noofassessments, - SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, - SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, - SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, - SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, - SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as propertytax, - (SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN adjustedamount ELSE 0 END) )as exemption, - ( SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END)) as adjustment, - sum(case when payment.paymentmode='CASH' then bad.adjustedamount else 0 end) as sumcash, - sum(case when payment.paymentmode='CHEQUE' then bad.adjustedamount else 0 end) as sumcheque, - count (distinct case when payment.paymentmode='CHEQUE' then concat(payment.paymentmode) end) as countcheque, - sum(case when payment.paymentmode='ONLINE' then bad.adjustedamount else 0 end) as sumonline, - (CASE WHEN collectiontype='COUNTER' THEN eg_user.name ELSE '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' END) as collectorname, --for Online collecion show None as collectorname - sum(adjustedamount) as totalamount - FROM egcl_billaccountdetail as bad - INNER JOIN egcl_billdetial as bd on bd.id = bad.billdetailid - INNER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid - INNER JOIN egcl_payment as payment on pd.paymentid=payment.id - LEFT OUTER JOIN eg_user ON eg_user.id = pd.createdby::INTEGER - WHERE bd.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' - groupby: group by collectorname,bd.tenantid - -- reportName: StateReceiptRegisterSummary_V2 - summary: Receipt Register Summary - version: 1.0.0 - moduleName: rainmaker-pt - additionalConfig: - print: - pdfPageSize: "A1" - sourceColumns: - - name: ulb - label: reports.pt.ulb - type: string - source: pt - total: false - - name: adhocpenalty - label: reports.pt.adhocpenalty - type: string - source: pt - total: true - - name: adhocrebate - label: reports.pt.adhocrebate - type: string - source: pt - total: true - - name: firecess - label: reports.pt.firecess - type: string - source: pt - total: true - - name: cancercess - label: reports.pt.cancercess - type: string - source: pt - total: true - - name: interest - label: reports.pt.interest - type: string - source: pt - total: true - - name: penalty - label: reports.pt.penalty - type: string - source: pt - total: true - - name: rebate - label: reports.pt.rebate - type: string - source: pt - total: true - - name: propertytax - label: reports.pt.propertytax - type: string - source: pt - total: true - - name: exemption - label: reports.pt.exemption - type: string - source: pt - total: true - - name: adjustment - label: reports.pt.adjustment - type: string - source: pt - total: true - searchParams: - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: false - searchClause: AND pd.receiptdate >= $fromDate - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: false - searchClause: AND pd.receiptdate <= $toDate - - name: ulb - label: ULB - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name - source: pt - wrapper: true - isMandatory: false - searchClause: AND bd.tenantid = $ulb - query: | - -- Use CTE to force query plan, compute & use CTE later - SELECT - split_part(bd.tenantid,'.',2) as ulb, - SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, - SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, - SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, - SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, - SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as propertytax, - (SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN adjustedamount ELSE 0 END) )as exemption, - ( SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END)) as adjustment - FROM egcl_billaccountdetail as bad - INNER JOIN egcl_billdetial as bd on bd.id = bad.billdetailid - INNER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid - WHERE bd.tenantid != 'pb.testing' and pd.businessservice='PT' - groupby: group by bd.tenantid - orderby: order by bd.tenantid - -- reportName: FYCollectionsReport_V2 - summary: FY Collections - version: 1.0.0 - moduleName: rainmaker-pt - additionalConfig: - print: - pdfPageSize: "Legal" - sourceColumns: - - name: financialyear - label: reports.pt.financialyear - type: string - source: pt - total: false - - name: residential - label: reports.pt.residential - type: string - source: pt - total: true - - name: countresidential - label: reports.pt.countresidential - type: string - source: pt - total: true - - name: nonresidential - label: reports.pt.nonresidential - type: string - source: pt - total: true - - name: countnonresidential - label: reports.pt.countnonresidential - type: string - source: pt - total: true - - name: mixed - label: reports.pt.mixed - type: string - source: pt - total: true - - name: countmixed - label: reports.pt.countmixed - type: string - source: pt - total: true - - name: totalamount - label: reports.pt.totalamount - type: string - source: pt - total: true - - name: totalcount - label: reports.pt.totalcount - type: string - source: pt - total: true - - name: online - label: reports.pt.online - type: string - source: pt - total: true - - name: cash - label: reports.pt.cash - type: string - source: pt - total: true - - name: cheque - label: reports.pt.cheque - type: string - source: pt - total: true - - name: dd - label: reports.pt.dd - type: string - source: pt - total: true - - name: card - label: reports.pt.card - type: string - source: pt - total: true - - name: neft - label: reports.pt.neft - type: string - source: pt - total: true - - name: rtgs - label: reports.pt.rtgs - type: string - source: pt - total: true - - name: po - label: reports.pt.po - type: string - source: pt - total: true - searchParams: - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: false - searchClause: AND pd.receiptdate >= $fromDate - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: false - searchClause: AND pd.receiptdate <= $toDate - - name: localityArray - label: reports.pt.zoneList - type: boundarylist - source: pt - isMandatory: false - searchClause: AND pt_addr.locality IN ($localityArray) - query: | - -- Use CTE to force query plan, compute & use CTE later - SELECT - sum(payment.totalamountpaid) as totalamount, - count(payment.totalamountpaid) as totalcount, - sum(case when payment.paymentmode='ONLINE' then payment.totalamountpaid else 0 end) as "online", - sum(case when payment.paymentmode='CASH' then payment.totalamountpaid else 0 end) as "cash", - sum(case when payment.paymentmode='CHEQUE' then payment.totalamountpaid else 0 end) as "cheque", - sum(case when payment.paymentmode='DD' then payment.totalamountpaid else 0 end) as "dd", - sum(case when payment.paymentmode='CARD' then payment.totalamountpaid else 0 end) as "card", - sum(case when payment.paymentmode='OFFLINE_RTGS' then payment.totalamountpaid else 0 end) as "rtgs", - sum(case when payment.paymentmode='OFFLINE_NEFT' then payment.totalamountpaid else 0 end) as "neft", - sum(case when payment.paymentmode='POTAL_ORDER' then payment.totalamountpaid else 0 end) as "po", - sum(case when split_part(pt.usagecategory, '.', 1)='RESIDENTIAL' then payment.totalamountpaid else 0 end) as "residential", - sum(case when split_part(pt.usagecategory, '.', 1)='RESIDENTIAL' then 1 else 0 end) as "countresidential", - sum(case when split_part(pt.usagecategory, '.', 1) = 'NONRESIDENTIAL' then payment.totalamountpaid else 0 end) as "nonresidential", - sum(case when pt.usagecategory like 'NONRESIDENTIAL%' then 1 else 0 end) as "countnonresidential", - sum(case when pt.usagecategory='MIXED' then payment.totalamountpaid else 0 end) as "mixed", - sum(case when pt.usagecategory='MIXED' then 1 else 0 end) as "countmixed", - concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear - FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, - (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr - where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid - and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id - groupby: GROUP BY financialyear - orderby: ORDER BY financialyear - -- reportName: FYCollectionsReport_WithoutLocality_V2 - summary: FY Collections - version: 1.0.0 - moduleName: rainmaker-pt - additionalConfig: - print: - pdfPageSize: "Legal" - sourceColumns: - - name: financialyear - label: reports.pt.financialyear - type: string - source: pt - total: false - - name: residential - label: reports.pt.residential - type: string - source: pt - total: true - - name: countresidential - label: reports.pt.countresidential - type: string - source: pt - total: true - - name: nonresidential - label: reports.pt.nonresidential - type: string - source: pt - total: true - - name: countnonresidential - label: reports.pt.countnonresidential - type: string - source: pt - total: true - - name: mixed - label: reports.pt.mixed - type: string - source: pt - total: true - - name: countmixed - label: reports.pt.countmixed - type: string - source: pt - total: true - - name: totalamount - label: reports.pt.totalamount - type: string - source: pt - total: true - - name: totalcount - label: reports.pt.totalcount - type: string - source: pt - total: true - - name: online - label: reports.pt.online - type: string - source: pt - total: true - - name: cash - label: reports.pt.cash - type: string - source: pt - total: true - - name: cheque - label: reports.pt.cheque - type: string - source: pt - total: true - - name: dd - label: reports.pt.dd - type: string - source: pt - total: true - - name: card - label: reports.pt.card - type: string - source: pt - total: true - - name: neft - label: reports.pt.neft - type: string - source: pt - total: true - - name: rtgs - label: reports.pt.rtgs - type: string - source: pt - total: true - - name: po - label: reports.pt.po - type: string - source: pt - total: true - searchParams: - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: false - searchClause: AND pd.receiptdate >= $fromDate - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: false - searchClause: AND pd.receiptdate <= $toDate - query: | + distinct on (rh.receiptnumber) + initcap(split_part(rh.tenantid, '.', 2)) as "ulb", + split_part(consumercode, ':', 1) as "propertytaxuniqueid", + to_char((To_timestamp(receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS "transcationdate", + receiptnumber as "receiptnumber", + pt.oldpropertyid as "existingpropertyid", + pd.financialyear as "financialyear", + eu."name" as "ownername", + eu.guardian as "guardianname", + pd.landarea as "totalarea", + pd.builduparea * 9 as "builtarea", + pd.nooffloors as "floors", + pot.occupancytype as "occupancy", + pot.propertytype as "propertytype", + eu.mobilenumber as "mobileno", + instrumenttype as "transcationmode", + ih.amount as "paymentamount", + to_char((To_timestamp(ih.transactiondate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS "paymentdate", + eu.emailid as "emailid" , + REGEXP_REPLACE(REGEXP_REPLACE(CONCAT(pta.doorno, ',', pta.addressline1, ',', pta.addressline2, ',', pta.buildingname, ',', pta.pincode), ',+', ','), '^,|,$', '') as "address", + pd.additionaldetails->>'remarks' as "remarks", + pt.additionaldetails->>'FirmBusinessName' as "businessname" + from egcl_receiptheader_v1 as rh + + inner join egcl_receiptinstrument_v1 as ri on ri.receiptheader = rh.id + + inner join egcl_instrumentheader_v1 as ih on ih.id = ri.instrumentheader + + inner join eg_pt_property_v2 as pt on pt.propertyid = split_part(consumercode, ':', 1) + + inner join eg_pt_propertydetail_v2 as pd on pd.assessmentnumber = split_part(consumercode, ':', 2) + + inner join eg_pt_owner_v2 as po on po.propertydetail = pd.assessmentnumber + + inner join eg_user as eu on eu.uuid = po.userid + + inner join eg_pt_address_v2 as pta on pta.property = pt.propertyid + + left outer join eg_pt_unit_v2_ot as pot on pot.propertydetail = pd.assessmentnumber + + where rh.tenantid = $tenantid and rh.status != 'Cancelled' + - reportName: ReceiptRegisterShort + summary: Receipt Register + version: 1.0.0 + moduleName: rainmaker-pt + additionalConfig: + print: + pdfPageSize: Legal + sourceColumns: + - name: receiptnumber + label: reports.pt.receiptNo + type: string + source: pt + total: false + - name: transactiondate + label: reports.pt.receiptDate + type: string + source: pt + total: false + - name: g8receiptno + label: reports.pt.g8book + type: string + source: pt + total: false + - name: g8issuedate + label: reports.pt.g8dated + type: string + source: pt + total: false + - name: propertyid + label: reports.pt.ptrId + type: string + source: pt + total: false + - name: financialyear + label: reports.pt.financialYear + type: string + source: pt + total: false + - name: instrumenttype + label: reports.pt.paymentMode + type: string + source: pt + total: false + - name: amount + label: reports.pt.taxamount + type: string + source: pt + total: true + - name: transactionnumber + label: reports.pt.ddChequeNo + type: string + source: pt + total: false + - name: bankname + label: reports.pt.bankName + type: string + source: pt + total: false + - name: collectorname + label: reports.pt.collectorname + type: string + source: pt + total: false + - name: remarks + label: reports.pt.remarks + type: string + source: pt + total: false + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: true + searchClause: AND rh.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: true + searchClause: AND rh.receiptdate <= $toDate + - name: paymentMode + label: Payment Mode + type: singlevaluelist + pattern: list://Cash:Cash,Online:Online,Card:Card,DD:DD,Cheque:Cheque + source: pt + isMandatory: false + searchClause: AND instrumenttype = $paymentMode + - name: financialyear + label: Financial Year + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name + source: pt + wrapper: true + isMandatory: false + searchClause: AND financialyear = $financialyear + - name: localityArray + label: reports.pt.zoneList + type: boundarylist + source: pt + isMandatory: false + searchClause: AND pt_addr.locality IN ($localityArray) + - name: collectorname + label: reports.pt.collectorname + type: singlevaluelist + pattern: http://egov-hrms:8080/egov-hrms/employees/_search?tenantId=$tenantid&roles=PTCEMP|$.Employees[*].user.id|$.Employees[*].user.name + source: pt + wrapper: true + isMandatory: false + searchClause: AND eg_user.id = $collectorname::INTEGER + query: > -- Use CTE to force query plan, compute & use CTE later - SELECT - sum(payment.totalamountpaid) as totalamount, - count(payment.totalamountpaid) as totalcount, - sum(case when payment.paymentmode='ONLINE' then payment.totalamountpaid else 0 end) as "online", - sum(case when payment.paymentmode='CASH' then payment.totalamountpaid else 0 end) as "cash", - sum(case when payment.paymentmode='CHEQUE' then payment.totalamountpaid else 0 end) as "cheque", - sum(case when payment.paymentmode='DD' then payment.totalamountpaid else 0 end) as "dd", - sum(case when payment.paymentmode='CARD' then payment.totalamountpaid else 0 end) as "card", - sum(case when payment.paymentmode='OFFLINE_RTGS' then payment.totalamountpaid else 0 end) as "rtgs", - sum(case when payment.paymentmode='OFFLINE_NEFT' then payment.totalamountpaid else 0 end) as "neft", - sum(case when payment.paymentmode='POTAL_ORDER' then payment.totalamountpaid else 0 end) as "po", - sum(case when split_part(pt.usagecategory, '.', 1)='RESIDENTIAL' then payment.totalamountpaid else 0 end) as "residential", - sum(case when split_part(pt.usagecategory, '.', 1)='RESIDENTIAL' then 1 else 0 end) as "countresidential", - sum(case when split_part(pt.usagecategory, '.', 1) = 'NONRESIDENTIAL' then payment.totalamountpaid else 0 end) as "nonresidential", - sum(case when pt.usagecategory like 'NONRESIDENTIAL%' then 1 else 0 end) as "countnonresidential", - sum(case when pt.usagecategory='MIXED' then payment.totalamountpaid else 0 end) as "mixed", - sum(case when pt.usagecategory='MIXED' then 1 else 0 end) as "countmixed", - concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear - FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill - where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid - and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' - groupby: GROUP BY financialyear - orderby: ORDER BY financialyear - -- reportName: ULBDEFAULTERPTREPORT_V2 - decryptionPathId: ULBDEFAULTERPTREPORT_V2 - summary: ULB Defaulter Pt report - version: 1.0.0 - moduleName: rainmaker-pt - sourceColumns: - - name: ulb - label: reports.pt.ulb - type: string - source: pt - total: false - - name: propertytaxuniqueid - label: reports.pt.propertytaxuniqueid - type: string - source: pt - total: false - - name: transcationdate - label: reports.pt.transcationdate - type: string - source: pt - total: false - - name: receiptnumber - label: reports.pt.receiptnumber - type: string - source: pt - total: false - - name: existingpropertyid - label: reports.pt.existingpropertyid - type: string - source: pt - total: false - - name: financialyear - label: reports.pt.financialYear - type: string - source: pt - total: false - - name: ownername - label: reports.pt.ownername - type: string - source: pt - total: false - - name: guardianname - label: reports.pt.guardianname - type: string - source: pt - total: false - - name: propertytype - label: reports.pt.propertytype - type: string - source: pt - total: false - - name: mobileno - label: reports.pt.mobileno - type: string - source: pt - total: false - - name: address - label: reports.pt.address - type: string - source: pt - total: false - - name: payeraddress - label: reports.pt.payeraddress - type: string - source: pt - total: false - searchParams: - - name: localityArray - label: reports.pt.zoneList - type: boundarylist - source: pt - isMandatory: false - searchClause: AND pta.locality IN ($localityArray) - query: | - --S.no Service Name ULB Property Tax Unique ID Date Of Transcation Receipt Number Existing Property ID Type Of Property Mobile Number Address - with eg_pt_unit_v2_ot as ( - select - propertyid, - string_agg(distinct pu.occupancytype, ',') as occupancytype, - --string_agg(distinct coalesce(usagecategory), ',') as propertytype - string_agg(distinct Initcap(case when usagecategory like '%.%' then split_part(usagecategory,'.',2) else usagecategory end),',') as propertytype - from eg_pt_unit as pu - where pu.tenantid = $tenantid - group by propertyid - ) - select - distinct on (payd.receiptnumber) - initcap(split_part(payd.tenantid, '.', 2)) as "ulb", - split_part(consumercode, ':', 1) as "propertytaxuniqueid", - to_char((To_timestamp(payd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS "transcationdate", - payd.receiptnumber as "receiptnumber", - pt.oldpropertyid as "existingpropertyid", - concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) AS "financialyear", - eu."name" as "ownername", - eu.guardian as "guardianname", - pot.propertytype as "propertytype", - eu.mobilenumber as "mobileno", - REGEXP_REPLACE(REGEXP_REPLACE(CONCAT(pta.doorno, ',', pta.buildingname, ',',pta.street,',', pta.pincode), ',+', ','), '^,|,$', '') as "address" - from egcl_paymentdetail as payd - inner join egcl_payment as payment on payment.id = payd.paymentid - inner join egcl_bill as bill on bill.id = payd.billid - inner join egcl_billdetial as billd on billd.billid=bill.id - inner join eg_pt_property as pt on pt.propertyid = bill.consumercode - inner join eg_pt_owner as po on po.propertyid = pt.id and po.status='ACTIVE' - inner join eg_user as eu on eu.uuid = po.userid - inner join eg_pt_address as pta on pta.propertyid = pt.id - left outer join eg_pt_unit_v2_ot as pot on pot.propertyid = pt.id - where payd.tenantid = $tenantid - and bill.consumercode not in (select consumercode from egcl_bill where tenantid=$tenantid and businessservice='PT' and id in (select billid from egcl_billdetial where tenantid=$tenantid and concat(to_char((To_timestamp(fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) ='2020-21')) - and pt.status!='INACTIVE' - -- reportName: ULBDEFAULTERPTREPORT_NEW_V2 - decryptionPathId: ULBDEFAULTERPTREPORT_V2 - summary: ULB Defaulter Pt report - version: 1.0.0 - moduleName: rainmaker-pt - sourceColumns: - - name: propertytaxuniqueid - label: reports.pt.propertytaxuniqueid - type: string - source: pt - total: false - - name: existingpropertyid - label: reports.pt.existingpropertyid - type: string - source: pt - total: false - - name: ownername - label: reports.pt.ownername - type: string - source: pt - total: false - - name: propertytype - label: reports.pt.propertytype - type: string - source: pt - total: false - - name: mobileno - label: reports.pt.mobileno - type: string - source: pt - total: false - - name: address - label: reports.pt.address - type: string - source: pt - total: false - searchParams: - - name: localityArray - label: reports.pt.zoneList - type: boundarylist - source: pt - isMandatory: false - searchClause: AND pta.locality IN ($localityArray) - query: | - --S.no Service Name ULB Property Tax Unique ID Date Of Transcation Receipt Number Existing Property ID Type Of Property Mobile Number Address - with eg_pt_unit_v2_ot as ( - select - propertyid, - string_agg(distinct pu.occupancytype, ',') as occupancytype, - --string_agg(distinct coalesce(usagecategory), ',') as propertytype - string_agg(distinct Initcap(case when usagecategory like '%.%' then split_part(usagecategory,'.',2) else usagecategory end),',') as propertytype - from eg_pt_unit as pu - where pu.tenantid = $tenantid - group by propertyid - ) - select - --distinct on (payd.receiptnumber) - --initcap(split_part(payd.tenantid, '.', 2)) as "ulb", - --split_part(consumercode, ':', 1) as "propertytaxuniqueid", - --to_char((To_timestamp(payd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS "transcationdate", - --payd.receiptnumber as "receiptnumber", - pt.propertyid as "propertytaxuniqueid", - string_agg(pt.oldpropertyid,',') as "existingpropertyid", - --concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) AS "financialyear", - split_part(string_agg(eu."name",','),',',1) as "ownername", --first owner - --eu.guardian as "guardianname", - string_agg(pot.propertytype,',') as "propertytype", - split_part(string_agg(eu.mobilenumber,','),',',1) as "mobileno", - --string_agg(distinct REGEXP_REPLACE(REGEXP_REPLACE(CONCAT(pta.doorno, ',', pta.buildingname, ',',pta.street,',', pta.pincode), ',+', ','), '^,|,$', ''),',') as "address", - string_agg(distinct concat(pta.doorno,',',pta.plotno,',',pta.buildingname,',',pta.street,',',pta.landmark,',',eg_bndry_mohalla.localityname,',',pta.city),',') as "address" - from eg_pt_property pt - --inner join egcl_payment as payment on payment.id = payd.paymentid - --inner join egcl_bill as bill on bill.id = payd.billid - --inner join egcl_billdetial as billd on billd.billid=bill.id - --inner join as pt on pt.propertyid = bill.consumercode - inner join eg_pt_owner as po on po.propertyid = pt.id and po.status='ACTIVE' - inner join eg_user as eu on eu.uuid = po.userid - inner join eg_pt_address as pta on pta.propertyid = pt.id - inner join eg_pt_unit_v2_ot as pot on pot.propertyid = pt.id - inner join eg_bndry_mohalla on eg_bndry_mohalla.localitycode=pta.locality - where pt.tenantid = $tenantid - --and bill.consumercode not in (select consumercode from egcl_bill where tenantid=$tenantid and businessservice='PT' and id in (select billid from egcl_billdetial where tenantid=$tenantid and concat(to_char((To_timestamp(fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) ='2020-21')) - and pt.status!='INACTIVE' - and pt.propertyid not in (select consumercode from egcl_bill where tenantid=$tenantid and businessservice='PT' and id in (select billid from egcl_billdetial where tenantid=$tenantid and concat(to_char((To_timestamp(fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) ='2020-21')) - groupby: group by pt.propertyid - -- reportName: ULBDEFAULTERPTREPORT_MINI_STATE_V2 - decryptionPathId: ULBDEFAULTERPTREPORT_V2 - summary: ULB Defaulter Pt report - version: 1.0.0 - moduleName: rainmaker-pt - sourceColumns: - - name: propertytaxuniqueid - label: reports.pt.propertytaxuniqueid - type: string - source: pt - total: false - - name: existingpropertyid - label: reports.pt.existingpropertyid - type: string - source: pt - total: false - - name: ownername - label: reports.pt.ownername - type: string - source: pt - total: false - - name: propertytype - label: reports.pt.propertytype - type: string - source: pt - total: false - - name: mobileno - label: reports.pt.mobileno - type: string - source: pt - total: false - - name: address - label: reports.pt.address - type: string - source: pt - total: false - searchParams: - - name: ulb - label: ULB - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name - source: pt - wrapper: true - isMandatory: false - searchClause: AND tenantid = $ulb - query: | - --S.no Service Name ULB Property Tax Unique ID Date Of Transcation Receipt Number Existing Property ID Type Of Property Mobile Number Address - with eg_pt_unit_v2_ot as ( - select - propertyid, - string_agg(distinct pu.occupancytype, ',') as occupancytype, - --string_agg(distinct coalesce(usagecategory), ',') as propertytype - string_agg(distinct Initcap(case when usagecategory like '%.%' then split_part(usagecategory,'.',2) else usagecategory end),',') as propertytype - from eg_pt_unit as pu - where pu.tenantid = $ulb - group by propertyid + + WITH receipt_breakup AS ( + SELECT + receiptheader, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, + SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as propertytax, + (SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN adjustedamount ELSE 0 END) )as exemption, + ( SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END)) as adjustment + FROM egcl_receiptdetails_v1 as rd + INNER JOIN egcl_receiptheader_v1 as rh on rh.id = rd.receiptheader + WHERE rd.tenantid = $tenantid and rh.status != 'Cancelled' and businessdetails ='PT' + GROUP BY rd.receiptheader ) - select - --distinct on (payd.receiptnumber) - --initcap(split_part(payd.tenantid, '.', 2)) as "ulb", - --split_part(consumercode, ':', 1) as "propertytaxuniqueid", - --to_char((To_timestamp(payd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS "transcationdate", - --payd.receiptnumber as "receiptnumber", - pt.propertyid as "propertytaxuniqueid", - string_agg(pt.oldpropertyid,',') as "existingpropertyid", - --concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) AS "financialyear", - split_part(string_agg(eu."name",','),',',1) as "ownername", - --eu.guardian as "guardianname", - string_agg(pot.propertytype,',') as "propertytype", - split_part(string_agg(eu.mobilenumber,','),',',1) as "mobileno", - string_agg(distinct REGEXP_REPLACE(REGEXP_REPLACE(CONCAT(pta.doorno, ',', pta.buildingname, ',',pta.street,',', pta.pincode), ',+', ','), '^,|,$', ''),',') as "address" - from eg_pt_property pt - --inner join egcl_payment as payment on payment.id = payd.paymentid - --inner join egcl_bill as bill on bill.id = payd.billid - --inner join egcl_billdetial as billd on billd.billid=bill.id - --inner join as pt on pt.propertyid = bill.consumercode - inner join eg_pt_owner as po on po.propertyid = pt.id and po.status='ACTIVE' - inner join eg_user as eu on eu.uuid = po.userid - inner join eg_pt_address as pta on pta.propertyid = pt.id - inner join eg_pt_unit_v2_ot as pot on pot.propertyid = pt.id - where pt.tenantid = $ulb - --and bill.consumercode not in (select consumercode from egcl_bill where tenantid=$ulb and businessservice='PT' and id in (select billid from egcl_billdetial where tenantid=$ulb and concat(to_char((To_timestamp(fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) ='2020-21')) - and pt.status!='INACTIVE' - and pt.propertyid not in (select consumercode from egcl_bill where tenantid=$ulb and businessservice='PT' and id in (select billid from egcl_billdetial where tenantid=$ulb and concat(to_char((To_timestamp(fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) ='2020-21')) - groupby: group by pt.propertyid - -- reportName: ZoneFYReport_V2 - summary: Zone FY Collection - version: 1.0.0 - moduleName: rainmaker-pt - sourceColumns: - - name: zonecode - label: reports.pt.zonename - type: string - source: pt - total: false - - name: 2013_14PTR - label: reports.pt.2013_14_PTR - type: string - source: pt - total: true - - name: 2013_14Collection - label: reports.pt.2013_14Collection - type: string - source: pt - total: true - - name: 2014_15PTR - label: reports.pt.2014_15_PTR - type: string - source: pt - total: true - - name: 2014_15Collection - label: reports.pt.2014_15Collection - type: string - source: pt - total: true - - name: 2015_16PTR - label: reports.pt.2015_16_PTR - type: string - source: pt - total: true - - name: 2015_16Collection - label: reports.pt.2015_16Collection - type: string - source: pt - total: true - - name: 2016_17PTR - label: reports.pt.2016_17_PTR - type: string - source: pt - total: true - - name: 2016_17Collection - label: reports.pt.2016_17Collection - type: string - source: pt - total: true - - name: 2017_18PTR - label: reports.pt.2017_18_PTR - type: string - source: pt - total: true - - name: 2017_18Collection - label: reports.pt.2017_18Collection - type: string - source: pt - total: true - - name: 2018_19PTR - label: reports.pt.2018_19_PTR - type: string - source: pt - total: true - - name: 2018_19Collection - label: reports.pt.2018_19Collection - type: string - source: pt - total: true - - name: 2019_20PTR - label: reports.pt.2019_20_PTR - type: string - source: pt - total: true - - name: 2019_20Collection - label: reports.pt.2019_20Collection - type: string - source: pt - total: true - - name: 2020_21PTR - label: reports.pt.2020_21_PTR - type: string - source: pt - total: true - - name: 2020_21Collection - label: reports.pt.2020_21Collection - type: string - source: pt - total: true - - name: totalptr - label: reports.pt.totalptr - type: string - source: pt - total: true - - name: totalcollection - label: reports.pt.totalcollection - type: string - source: pt - total: true - searchParams: - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: true - searchClause: AND 1=1 - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: true - searchClause: AND 1=1 - query: | - --S.no Service Name ULB Property Tax Unique ID Date Of Transcation Receipt Number Existing Property ID Type Of Property Mobile Number Address - with fy2013 as - ( - SELECT - zonecode, - sum(payment.totalamountpaid) as amount, - count(payment.totalamountpaid) as totalcount, - concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear - FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, - (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr - INNER JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality and eg_bndry_mohalla.tenantid=$tenantid - where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid - and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id - and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY'))='2013-14' - and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate - GROUP BY financialyear,zonecode - - ), - fy2014 as - ( - SELECT - zonecode, - sum(payment.totalamountpaid) as amount, - count(payment.totalamountpaid) as totalcount, - concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear - FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, - (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr - INNER JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality and eg_bndry_mohalla.tenantid=$tenantid - where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid - and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id - and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY'))='2014-15' - and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate - GROUP BY financialyear,zonecode - ), - fy2015 as - ( - SELECT - zonecode, - sum(payment.totalamountpaid) as amount, - count(payment.totalamountpaid) as totalcount, - concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear - FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, - (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr - INNER JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality and eg_bndry_mohalla.tenantid=$tenantid - where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid - and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id - and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY'))='2015-16' - and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate - GROUP BY financialyear,zonecode - ), - fy2016 as - ( - SELECT - zonecode, - sum(payment.totalamountpaid) as amount, - count(payment.totalamountpaid) as totalcount, - concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear - FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, - (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr - inner JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality - where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid - and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id - and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY'))='2016-17' - and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate - GROUP BY financialyear,zonecode - ), - fy2017 as - ( - SELECT - zonecode, - sum(payment.totalamountpaid) as amount, - count(payment.totalamountpaid) as totalcount, - concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear - FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, - (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr - INNER JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality and eg_bndry_mohalla.tenantid=$tenantid - where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid - and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id - and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY'))='2017-18' - and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate - GROUP BY financialyear,zonecode - ), - fy2018 as - ( - SELECT - zonecode, - sum(payment.totalamountpaid) as amount, - count(payment.totalamountpaid) as totalcount, - concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear - FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, - (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr - INNER JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality and eg_bndry_mohalla.tenantid=$tenantid - where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid - and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id - and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY'))='2018-19' - and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate - GROUP BY financialyear,zonecode - ), - fy2019 as - ( - SELECT - zonecode, - sum(payment.totalamountpaid) as amount, - count(payment.totalamountpaid) as totalcount, - concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear - FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, - (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr - INNER JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality and eg_bndry_mohalla.tenantid=$tenantid - where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid - and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id - and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY'))='2019-20' - and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate - GROUP BY financialyear,zonecode - ), - fy2020 as - ( + SELECT - zonecode, - sum(payment.totalamountpaid) as amount, - count(payment.totalamountpaid) as totalcount, - concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear - FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, - (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr - INNER JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality and eg_bndry_mohalla.tenantid=$tenantid - where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid - and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id - and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY'))='2020-21' - and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate - GROUP BY financialyear,zonecode - ), - zones as - ( - select zonecode,string_agg(distinct zonename,',') as zname from eg_bndry_mohalla where tenantid=$tenantid group by zonecode - ) - SELECT - zones.zonecode as zonecode, - zones.zname as zonename, - coalesce(fy2013.totalcount,0) as "2013_14PTR", - coalesce(fy2013.amount,0) as "2013_14Collection", - coalesce(fy2014.totalcount,0) as "2014_15PTR", - coalesce(fy2014.amount,0) as "2014_15Collection", - coalesce(fy2015.totalcount,0) as "2015_16PTR", - coalesce(fy2015.amount,0) as "2015_16Collection", - coalesce(fy2016.totalcount,0) as "2016_17PTR", - coalesce(fy2016.amount,0) as "2016_17Collection", - coalesce(fy2017.totalcount,0) as "2017_18PTR", - coalesce(fy2017.amount,0) as "2017_18Collection", - coalesce(fy2018.totalcount,0) as "2018_19PTR", - coalesce(fy2018.amount,0) as "2018_19Collection", - coalesce(fy2019.totalcount,0) as "2019_20PTR", - coalesce(fy2019.amount,0) as "2019_20Collection", - coalesce(fy2020.totalcount,0) as "2020_21PTR", - coalesce(fy2020.amount,0) as "2020_21Collection", - coalesce(fy2013.totalcount,0)+coalesce(fy2014.totalcount,0)+coalesce(fy2015.totalcount,0)+coalesce(fy2016.totalcount,0)+coalesce(fy2017.totalcount,0)+coalesce(fy2018.totalcount,0)+coalesce(fy2019.totalcount,0)+coalesce(fy2020.totalcount,0) as "totalptr", - coalesce(fy2013.amount,0)+coalesce(fy2014.amount,0)+coalesce(fy2015.amount,0)+coalesce(fy2016.amount,0)+coalesce(fy2017.amount,0)+coalesce(fy2018.amount,0)+coalesce(fy2019.amount,0)+coalesce(fy2020.amount,0) as "totalcollection" - from zones - left outer join fy2013 on fy2013.zonecode=zones.zonecode - left outer join fy2014 on fy2014.zonecode=zones.zonecode - left outer join fy2015 on fy2015.zonecode=zones.zonecode - left outer join fy2016 on fy2016.zonecode=zones.zonecode - left outer join fy2017 on fy2017.zonecode=zones.zonecode - left outer join fy2018 on fy2018.zonecode=zones.zonecode - left outer join fy2019 on fy2019.zonecode=zones.zonecode - left outer join fy2020 on fy2020.zonecode=zones.zonecode - where 1=1 - orderby: order by zonename - - -- reportName: BlockFYReport_V2 - summary: Block FY Collection - version: 1.0.0 - moduleName: rainmaker-pt - sourceColumns: - - name: blockname - label: reports.pt.blockname - type: string - source: pt - total: false - - name: 2013_14PTR - label: reports.pt.2013_14_PTR - type: string - source: pt - total: true - - name: 2013_14Collection - label: reports.pt.2013_14Collection - type: string - source: pt - total: true - - name: 2014_15PTR - label: reports.pt.2014_15_PTR - type: string - source: pt - total: true - - name: 2014_15Collection - label: reports.pt.2014_15Collection - type: string - source: pt - total: true - - name: 2015_16PTR - label: reports.pt.2015_16_PTR - type: string - source: pt - total: true - - name: 2015_16Collection - label: reports.pt.2015_16Collection - type: string - source: pt - total: true - - name: 2016_17PTR - label: reports.pt.2016_17_PTR - type: string - source: pt - total: true - - name: 2016_17Collection - label: reports.pt.2016_17Collection - type: string - source: pt - total: true - - name: 2017_18PTR - label: reports.pt.2017_18_PTR - type: string - source: pt - total: true - - name: 2017_18Collection - label: reports.pt.2017_18Collection - type: string - source: pt - total: true - - name: 2018_19PTR - label: reports.pt.2018_19_PTR - type: string - source: pt - total: true - - name: 2018_19Collection - label: reports.pt.2018_19Collection - type: string - source: pt - total: true - - name: 2019_20PTR - label: reports.pt.2019_20_PTR - type: string - source: pt - total: true - - name: 2019_20Collection - label: reports.pt.2019_20Collection - type: string - source: pt - total: true - - name: 2020_21PTR - label: reports.pt.2020_21_PTR - type: string - source: pt - total: true - - name: 2020_21Collection - label: reports.pt.2020_21Collection - type: string - source: pt - total: true - - name: totalptr - label: reports.pt.totalptr - type: string - source: pt - total: true - - name: totalcollection - label: reports.pt.totalcollection - type: string - source: pt - total: true - searchParams: - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: true - searchClause: AND 1=1 - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: true - searchClause: AND 1=1 - query: | - --S.no Service Name ULB Property Tax Unique ID Date Of Transcation Receipt Number Existing Property ID Type Of Property Mobile Number Address - with fy2013 as - ( - SELECT - blockcode, - sum(payment.totalamountpaid) as amount, - count(payment.totalamountpaid) as totalcount, - concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY')) as financialyear - FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, - (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr - INNER JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality and eg_bndry_mohalla.tenantid=$tenantid - where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid - and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id - and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY'))='2013-14' - and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate - GROUP BY financialyear,blockcode - - ), - fy2014 as - ( - SELECT - blockcode, - sum(payment.totalamountpaid) as amount, - count(payment.totalamountpaid) as totalcount, - concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY')) as financialyear - FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, - (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr - INNER JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality and eg_bndry_mohalla.tenantid=$tenantid - where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid - and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id - and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY'))='2014-15' - and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate - GROUP BY financialyear,blockcode - ), - fy2015 as - ( - SELECT - blockcode, - sum(payment.totalamountpaid) as amount, - count(payment.totalamountpaid) as totalcount, - concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY')) as financialyear - FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, - (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr - INNER JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality and eg_bndry_mohalla.tenantid=$tenantid - where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid - and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id - and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY'))='2015-16' - and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate - GROUP BY financialyear,blockcode - ), - fy2016 as - ( - SELECT - blockcode, - sum(payment.totalamountpaid) as amount, - count(payment.totalamountpaid) as totalcount, - concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY')) as financialyear - FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, - (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr - inner JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality - where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid - and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id - and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY'))='2016-17' - and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate - GROUP BY financialyear,blockcode - ), - fy2017 as - ( - SELECT - blockcode, - sum(payment.totalamountpaid) as amount, - count(payment.totalamountpaid) as totalcount, - concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY')) as financialyear - FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, - (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr - INNER JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality and eg_bndry_mohalla.tenantid=$tenantid - where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid - and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id - and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY'))='2017-18' - and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate - GROUP BY financialyear,blockcode - ), - fy2018 as - ( - SELECT - blockcode, - sum(payment.totalamountpaid) as amount, - count(payment.totalamountpaid) as totalcount, - concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY')) as financialyear - FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, - (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr - INNER JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality and eg_bndry_mohalla.tenantid=$tenantid - where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid - and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id - and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY'))='2018-19' - and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate - GROUP BY financialyear,blockcode - ), - fy2019 as - ( - SELECT - blockcode, - sum(payment.totalamountpaid) as amount, - count(payment.totalamountpaid) as totalcount, - concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY')) as financialyear - FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, - (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr - INNER JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality and eg_bndry_mohalla.tenantid=$tenantid - where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid - and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id - and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY'))='2019-20' - and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate - GROUP BY financialyear,blockcode - ), - fy2020 as - ( - SELECT - blockcode, - sum(payment.totalamountpaid) as amount, - count(payment.totalamountpaid) as totalcount, - concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY')) as financialyear - FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, - (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr - INNER JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality and eg_bndry_mohalla.tenantid=$tenantid - where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid - and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id - and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY'))='2020-21' - and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate - GROUP BY financialyear,blockcode - ), - blocks as - ( - select blockcode,string_agg(distinct blockname,',') as zname from eg_bndry_mohalla where tenantid=$tenantid group by blockcode - ) - SELECT - blocks.blockcode as blockcode, - blocks.zname as blockname, - coalesce(fy2013.totalcount,0) as "2013_14PTR", - coalesce(fy2013.amount,0) as "2013_14Collection", - coalesce(fy2014.totalcount,0) as "2014_15PTR", - coalesce(fy2014.amount,0) as "2014_15Collection", - coalesce(fy2015.totalcount,0) as "2015_16PTR", - coalesce(fy2015.amount,0) as "2015_16Collection", - coalesce(fy2016.totalcount,0) as "2016_17PTR", - coalesce(fy2016.amount,0) as "2016_17Collection", - coalesce(fy2017.totalcount,0) as "2017_18PTR", - coalesce(fy2017.amount,0) as "2017_18Collection", - coalesce(fy2018.totalcount,0) as "2018_19PTR", - coalesce(fy2018.amount,0) as "2018_19Collection", - coalesce(fy2019.totalcount,0) as "2019_20PTR", - coalesce(fy2019.amount,0) as "2019_20Collection", - coalesce(fy2020.totalcount,0) as "2020_21PTR", - coalesce(fy2020.amount,0) as "2020_21Collection", - coalesce(fy2013.totalcount,0)+coalesce(fy2014.totalcount,0)+coalesce(fy2015.totalcount,0)+coalesce(fy2016.totalcount,0)+coalesce(fy2017.totalcount,0)+coalesce(fy2018.totalcount,0)+coalesce(fy2019.totalcount,0)+coalesce(fy2020.totalcount,0) as "totalptr", - coalesce(fy2013.amount,0)+coalesce(fy2014.amount,0)+coalesce(fy2015.amount,0)+coalesce(fy2016.amount,0)+coalesce(fy2017.amount,0)+coalesce(fy2018.amount,0)+coalesce(fy2019.amount,0)+coalesce(fy2020.amount,0) as "totalcollection" - from blocks - left outer join fy2013 on fy2013.blockcode=blocks.blockcode - left outer join fy2014 on fy2014.blockcode=blocks.blockcode - left outer join fy2015 on fy2015.blockcode=blocks.blockcode - left outer join fy2016 on fy2016.blockcode=blocks.blockcode - left outer join fy2017 on fy2017.blockcode=blocks.blockcode - left outer join fy2018 on fy2018.blockcode=blocks.blockcode - left outer join fy2019 on fy2019.blockcode=blocks.blockcode - left outer join fy2020 on fy2020.blockcode=blocks.blockcode - where 1=1 - orderby: order by blockname - -- reportName: StatusReport_V2 - decryptionPathId: StatusReport_V2 - summary: Status Report - version: 1.0.0 - moduleName: rainmaker-pt - additionalConfig: - print: - pdfPageSize: "A1" - sourceColumns: - - name: propertyid - label: reports.pt.propertyid - type: string - source: pt - total: false - - name: applicationnumber - label: reports.pt.applicationnumber - type: string - source: pt - total: false - - name: usagecategory - label: reports.pt.usagecategory - type: string - source: pt - total: false - - name: financialyear - label: reports.pt.financialyear - type: string - source: pt - total: false - - name: createdtime - label: reports.pt.createdtime - type: string - source: pt - total: false - - name: createdby - label: reports.pt.createdby - type: string - source: pt - total: false - - name: zone - label: reports.pt.zone - type: string - source: pt - total: false - - name: block - label: reports.pt.block - type: string - source: pt - total: false - - name: localityname - label: reports.pt.localityname - type: string - source: pt - total: false - - name: totalamount - label: reports.pt.totalamount - type: string - source: pt - total: false - - name: approvedby - label: reports.pt.approvedby - type: string - source: pt - total: false - - name: address - label: reports.pt.address - type: string - source: pt - total: false - - name: status - label: reports.pt.status - type: string - source: pt - total: false - searchParams: - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: true - searchClause: AND propety.createdtime >= $fromDate - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: true - searchClause: AND propety.createdtime <= $toDate - query: | - -- Use CTE to force query plan, compute & use CTE later - SELECT - propety.propertyid, propety.acknowldgementnumber as applicationnumber, propety.usagecategory, - to_char((To_timestamp(propety.createdtime/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS createdtime, - (case when eu.name is null then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else eu.name end) AS createdby, - localnames.zonecode AS zone, localnames.blockcode AS block, localnames.localityname AS localityname, - REGEXP_REPLACE(REGEXP_REPLACE(CONCAT(pta.doorno, ',', pta.buildingname, ',',pta.street,',', pta.pincode), ',+', ','), '^,|,$', '') as "address", pt_detail.financialyear, propety.status, bill.totalamount, - (case when propety.status = 'INWORKFLOW' then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else euser.name end) as approvedby - FROM eg_pt_property as propety - Left outer join eg_user as eu on eu.uuid = propety.createdby - Left outer join eg_user as euser on euser.uuid = propety.lastmodifiedby - Left outer join eg_pt_address as pta on pta.propertyid = propety.id - INNER join eg_pt_propertydetail_v2 pt_detail ON pt_detail.property = propety.propertyid - Left outer join egcl_bill as bill on bill.consumercode = propety.propertyid - Left outer join eg_bndry_mohalla as localnames on pta.locality=localnames.localitycode - WHERE propety.tenantid=$tenantid AND propety.acknowldgementnumber NOTNULL AND propety.status='ACTIVE' - orderby: ORDER BY propety.createdtime DESC; - -- reportName: PendingPTApplicationsReport - summary: ULB-wise PT Collection - version: 1.0.0 - moduleName: rainmaker-pt - sourceColumns: - - name: tenantid - label: reports.pt.tenantid - type: string - source: pt - total: false - - name: propertyid - label: reports.pt.propertyid - type: string - source: pt - total: false - - name: applicationnumber - label: reports.pt.applicationnumber - type: string - source: pt - total: false - - name: oldpropertyid - label: reports.pt.oldpropertyid - type: string - source: pt - total: false - - name: status - label: reports.pt.status - type: string - source: pt - total: false - - name: propertytype - label: reports.pt.propertytype - type: string - source: pt - total: false - - name: usagecategory - label: reports.pt.usagecategory - type: string - source: pt - total: false - - name: channel - label: reports.pt.channel - type: string - source: pt - total: false - - name: createdon - label: reports.pt.createdon - type: string - source: pt - total: false - query: | - select - tenantid, - propertyid, - acknowldgementnumber as applicationnumber, - oldpropertyid, - status, - propertytype, - usagecategory, - channel, - to_char((To_timestamp(createdtime/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') as createdon - from eg_pt_property where status='INWORKFLOW' and tenantid=$tenantid - -- reportName: ULBDEFAULTERPTREPORT_NEW_V2 - decryptionPathId: ULBDEFAULTERPTREPORT_V2 - summary: ULB Defaulter Pt report - version: 1.0.0 - moduleName: rainmaker-pt - sourceColumns: - - name: propertytaxuniqueid - label: reports.pt.propertytaxuniqueid - type: string - source: pt - total: false - - name: existingpropertyid - label: reports.pt.existingpropertyid - type: string - source: pt - total: false - - name: amountcollected - label: reports.pt.amountcollected - type: string - source: pt - total: true - - name: ownername - label: reports.pt.ownername - type: string - source: pt - total: false - - name: propertytype - label: reports.pt.propertytype - type: string - source: pt - total: false - - name: mobileno - label: reports.pt.mobileno - type: string - source: pt - total: false - - name: address - label: reports.pt.address - type: string - source: pt - total: false - query: | - --S.no Service Name ULB Property Tax Unique ID Date Of Transcation Receipt Number Existing Property ID Type Of Property Mobile Number Address - with props as - (select - pt.propertyid as "propertytaxuniqueid", - string_agg(collection.finyear, ', ') as "financailyear" , - string_agg(collection.taxpaid::varchar, ', ') as "amountcollected" , - string_agg(pt.oldpropertyid,',') as "existingpropertyid", - split_part(string_agg(eu."name",','),',',1) as "ownername", - string_agg(pot.propertytype,',') as "propertytype", - split_part(string_agg(eu.mobilenumber,','),',',1) as "mobileno", - string_agg(distinct REGEXP_REPLACE(REGEXP_REPLACE(CONCAT(pta.doorno, ',', pta.buildingname, ',',pta.street,',',pta.localityname,',', pta.pincode), ',+', ','), '^,|,$', ''),',') as "address" - from eg_pt_property pt - inner join (select a.consumercode, to_char((To_timestamp(a.taxperiodfrom/1000) at time Zone 'Asia/Kolkata'),'YYYY')||'-'||to_char((To_timestamp(a.taxperiodfrom/1000) at time Zone 'Asia/Kolkata'),'YYYY')::int+1 as finyear, a.tax, a.taxpaid from (select d.consumercode, d.taxperiodfrom, sum(dd.taxamount) tax, sum(dd.collectionamount) as taxpaid - from egbs_demanddetail_v1 dd, egbs_demand_v1 d - where dd.demandid=d.id - and d.status!='CANCELLED' and dd.tenantid='pb.amritsar' and d.tenantid='pb.amritsar' - group by d.consumercode, d.taxperiodfrom - having sum(dd.taxamount - dd.collectionamount)=0) a, - (select d.consumercode, max(d.taxperiodfrom) maxperiod - from egbs_demanddetail_v1 dd, egbs_demand_v1 d - where dd.demandid=d.id - and d.status!='CANCELLED' and dd.tenantid='pb.amritsar' and d.tenantid='pb.amritsar' - group by d.consumercode - having sum(dd.taxamount - dd.collectionamount)=0) b - where a.consumercode=b.consumercode and a.taxperiodfrom=b.maxperiod - ) collection ON collection.consumercode = pt.propertyid - inner join (SELECT DISTINCT ON (propertyid) propertyid ,name as name , mobilenumber - FROM eg_pt_owner , eg_user - WHERE uuid = userid - AND status = 'ACTIVE' - AND active = true ) eu ON pt.id=eu.propertyid - inner join (SELECT propertyid , locality,doorno,street,buildingname,pincode,localityname, max(createdtime) - from eg_pt_address inner join eg_bndry_mohalla on eg_bndry_mohalla.localitycode=locality where eg_pt_address.tenantid='pb.amritsar' - group by propertyid, locality, doorno,street,buildingname,pincode,localityname) pta ON pt.id=pta.propertyid - inner join (select propertyid, - string_agg(distinct pu.occupancytype, ',') as occupancytype, - string_agg(distinct Initcap(case when usagecategory like '%.%' then split_part(usagecategory,'.',2) else usagecategory end),',') as propertytype - from eg_pt_unit as pu - where pu.tenantid = 'pb.amritsar' - group by propertyid) pot ON pot.propertyid = pt.id - where pt.tenantid = 'pb.amritsar' - and pt.status!='INACTIVE' - and pt.propertyid not in ( - select consumercode from egcl_bill - where tenantid='pb.amritsar' - and businessservice='PT' - and id in (select billid - from egcl_billdetial - where tenantid='pb.amritsar' and concat(to_char((To_timestamp(fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) ='2020-21')) - group by pt.propertyid - ), - prop2019 as - ( - select - oldpropertyid as oldpropertyid, - pt.propertyid as propertyid - from eg_pt_property pt - inner join eg_pt_assessment as assessment on assessment.propertyid=pt.propertyid and assessment.assessmentyear='2019-20' and assessment.tenantid='pb.amritsar' - where pt.tenantid='pb.amritsar' - group by pt.propertyid,oldpropertyid - ) - select * from props - where propertytaxuniqueid not in (select propertyid from prop2019 where oldpropertyid in (select concat('RID',previous_returnid) from amritsar_ikon_2020_21_non_migrated_records)) - -- reportName: ULBPTData - decryptionPathId: ULBPTDataDumpReport_V2 - summary: ULB-wise PT Data - version: 1.0.0 - moduleName: rainmaker-pt - sourceColumns: - - name: propertyid - label: reports.pt.propertyId - type: string - source: pt - total: false - - name: ownername - label: reports.pt.ownername - type: string - source: pt - total: false - - name: guardianname - label: reports.pt.guardianname - type: string - source: pt - total: false - - name: mobileno - label: reports.pt.mobileno - type: string - source: pt - total: false - - name: useruuid - label: reports.pt.useruuid - type: string - source: pt - total: false - searchParams: - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: true - searchClause: AND pt.createdtime >= $fromDate - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: true - searchClause: AND pt.createdtime <= $toDate - query: | - select pt.propertyid as propertyid, u.name as ownername, u.guardian as guardianname, u.mobilenumber as mobileno, u.uuid as useruuid from eg_pt_property pt, eg_pt_owner po, eg_user u where pt.id=po.propertyid and po.userid=u.uuid and pt.tenantid=$tenantid - orderby: ORDER BY pt.propertyid DESC NULLS LAST - - -- reportName: PT_DEFAULTER_REPORT_V2 - decryptionPathId: ULBDEFAULTERPTREPORT_V2 - summary: ULB_PT_DEFAULTER - version: 1.0.0 - moduleName: rainmaker-pt - sourceColumns: - - name: propertyid - label: reports.pt.propertyId - type: string - source: pt - total: false - - name: oldpropertyid - label: reports.pt.oldpropertyId - type: string - source: pt - total: false - - name: businessname - label: reports.pt.busnessname - type: string - source: pt - total: false - - name: financialyear - label: reports.pt.financialyear - type: string - source: pt - total: false - - name: latestfy - label: reports.pt.latestfy - type: string - source: pt - total: false - - name: max_pt_tax - label: reports.pt.max_pt_tax - type: string - source: pt - total: true - - name: max_paid - label: reports.pt.max_paid - type: string - source: pt - total: true - - name: propertytype - label: reports.pt.propertytype - type: string - source: pt - total: false - - name: propertyusagetype - label: reports.pt.propertyusagetype - type: string - source: pt - total: false - - name: address - label: reports.pt.address - type: string - source: pt - total: false - - name: block - label: reports.pt.block - type: string - source: pt - total: false - - name: ownername - label: reports.pt.ownername - type: string - source: pt - total: false - - name: mobileno - label: reports.pt.mobileno - type: string - source: pt - total: false - query: | - with assessments as - ( - select - propertyid, - string_agg(concat(assessmentyears,'(Rs.',totalamount,')'),',') as fy, - max(assessmentyears) as latest_fy, - max(totalamount) as maxtotal, - max(propertytax) as max_pt_tax - from report_assessments - where tenantid=$tenantid - and propertyid not in (select propertyid from report_assessments where tenantid=$tenantid and assessmentyears ='2020-21') - group by propertyid - ), - owners as - ( + rh.tenantid AS tenantid, + rh.id, + Substring(rh.consumercode, '(.*):') AS propertyid, + Substring(rh.consumercode, ':(.*)') AS assessmentnumber, + rh.consumercode, + rh.receiptdate, + to_char((To_timestamp(rh.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, + bankid AS bankname, + receiptnumber, + amount, + instrumenttype, + transactionnumber, + receipt_breakup.*, + rh.totalamount - ih.amount AS pendingamount, + pt_detail.financialyear, + to_char((To_timestamp(rh.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, + Initcap(COALESCE(pt_detail.usagecategoryminor, pt_detail.usagecategorymajor)) as usagetype, + manualreceiptnumber as g8receiptno, + (CASE WHEN collectiontype='COUNTER' THEN eg_user.name ELSE '' END) as collectorname, + pt_detail.additionaldetails->>'remarks' as "remarks" + FROM egcl_receiptheader_v1 AS rh + + JOIN egcl_receiptinstrument_v1 AS ri ON rh.id = ri.receiptheader + + JOIN egcl_instrumentheader_v1 AS ih ON ih.id = ri.instrumentheader + + JOIN receipt_breakup ON rh.id = receipt_breakup.receiptheader + + JOIN eg_pt_propertydetail_v2 pt_detail ON (pt_detail.property || ':' || pt_detail.assessmentnumber) = rh.consumercode + + JOIN eg_pt_address_v2 pt_addr ON pt_detail.property = pt_addr.property + + LEFT OUTER JOIN eg_user ON eg_user.id = rh.createdby::INTEGER + + WHERE rh.tenantid = $tenantid and rh.status != 'Cancelled' and businessdetails ='PT' + orderby: ORDER BY rh.receiptdate DESC + - reportName: ULBPTDataDumpReport + summary: ULB level report + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: ulb + label: reports.pt.ulb + type: string + source: pt + total: false + - name: propertytaxuniqueid + label: reports.pt.propertytaxuniqueid + type: string + source: pt + total: false + - name: transcationdate + label: reports.pt.transcationdate + type: string + source: pt + total: false + - name: receiptnumber + label: reports.pt.receiptnumber + type: string + source: pt + total: false + - name: existingpropertyid + label: reports.pt.existingpropertyid + type: string + source: pt + total: false + - name: financialyear + label: reports.pt.financialYear + type: string + source: pt + total: false + - name: ownername + label: reports.pt.ownername + type: string + source: pt + total: false + - name: guardianname + label: reports.pt.guardianname + type: string + source: pt + total: false + - name: totalarea + label: reports.pt.totalarea + type: string + source: pt + total: false + - name: builtarea + label: reports.pt.builtarea + type: string + source: pt + total: false + - name: floors + label: reports.pt.floors + type: string + source: pt + total: false + - name: occupancy + label: reports.pt.occupancy + type: string + source: pt + total: false + - name: propertytype + label: reports.pt.propertytype + type: string + source: pt + total: false + - name: mobileno + label: reports.pt.mobileno + type: string + source: pt + total: false + - name: transcationmode + label: reports.pt.transcationmode + type: string + source: pt + total: false + - name: paymentamount + label: reports.pt.paymentamount + type: string + source: pt + total: true + - name: paymentdate + label: reports.pt.paymentdate + type: string + source: pt + total: false + - name: emailid + label: reports.pt.emailid + type: string + source: pt + total: false + - name: address + label: reports.pt.address + type: string + source: pt + total: false + - name: payeraddress + label: reports.pt.payeraddress + type: string + source: pt + total: false + - name: remarks + label: reports.pt.remarks + type: string + source: pt + total: false + - name: businessname + label: reports.pt.businessname + type: string + source: pt + total: false + - name: localitycode + label: reports.pt.localitycode + type: string + source: pt + total: false + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: true + searchClause: AND rh.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: true + searchClause: AND rh.receiptdate <= $toDate + - name: financialyear + label: Financial Year + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name + source: pt + wrapper: true + isMandatory: false + searchClause: AND pd.financialyear = $financialyear + - name: localityArray + label: reports.pt.zoneList + type: boundarylist + source: pt + isMandatory: false + searchClause: AND pta.locality IN ($localityArray) + query: > + --S.no Service Name ULB Property Tax Unique ID Date Of + Transcation Receipt Number Existing Property ID Owner + Name Guardian Name Total Area (SQ.YARD) Covered Area/Built Area + (SQ.FEET) Floors Occupancy (Rented,Self /Unoccupied) Type Of + Property Mobile Number Transcation Mode of Payment Payment + Amount Payment Date Email Id Address + + with eg_pt_unit_v2_ot as ( select - split_part(string_agg(ownername,','),',',1) as ownername, - split_part(string_agg(mobileNumber,','),',',1) as mobileNumber, - propertyid - from report_owners - group by propertyid - ) - select - assessments.propertyid as propertyid, - props.oldpropertyid as oldpropertyid, - props.firmbusinessname as businessname, - assessments.fy as financialyear, - assessments.latest_fy as latestfy, - assessments.max_pt_tax as max_pt_tax, - assessments.maxtotal as max_paid, - props.propertytype as propertytype, - propertyusagetype as propertyusagetype, - concat(address,' ',localityname) as address, - blockcode as block, - owners.ownername as ownername, - owners.mobileNumber as mobileno - from report_properties props - inner join assessments on assessments.propertyid=props.propertyid - inner join owners on owners.propertyid=props.propertyid - -- reportName: DAILY_CHALLAN_REPORT - summary: Daily Challan Report - version: 1.0.0 - moduleName: rainmaker-pt - sourceColumns: - - name: paymentmode - label: reports.pt.paymentmode - type: string - source: pt - total: false - - name: amount - label: reports.pt.amount - type: string - source: pt - total: true - - name: nos - label: reports.pt.nos - type: string - source: pt - total: true - - name: firecess - label: reports.pt.firecess - type: string - source: pt - total: true - - name: cancercess - label: reports.pt.cancercess - type: string - source: pt - total: true - - name: total - label: reports.pt.total - type: string - source: pt - total: true - searchParams: - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: true - searchClause: AND 1=1 - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: true - searchClause: AND 1=1 - query: | - --S.no Service Name ULB Property Tax Unique ID Date Of Transcation Receipt Number Existing Property ID Type Of Property Mobile Number Addr - with paidbills as - ( - SELECT - --sum(payment.totalamountpaid) as totalamount, - bd.billid as billid, - sum(bd.amountpaid) as totalamount, - count(distinct bd.billid) as totalcount, - sum(case when bad.taxheadcode='PT_FIRE_CESS' then bad.amount else 0 end) as "totalfirecess", - sum(case when bad.taxheadcode='PT_CANCER_CESS' then bad.amount else 0 end) as "totalcancercess", - sum(case when payment.paymentmode='ONLINE' then bd.amountpaid else 0 end) as "online", - sum(case when payment.paymentmode='ONLINE' and bad.taxheadcode='PT_FIRE_CESS' then bad.amount else 0 end) as "firecess_online", - sum(case when payment.paymentmode='ONLINE' and bad.taxheadcode='PT_CANCER_CESS' then bad.amount else 0 end) as "cancercess_online", - count(distinct case when payment.paymentmode='ONLINE' then bd.billid else NULL end) as "countonline", - sum(case when payment.paymentmode='CASH' then bd.amountpaid else 0 end) as "cash", - sum(case when payment.paymentmode='CASH' and bad.taxheadcode='PT_FIRE_CESS' then bad.amount else 0 end) as "firecess_cash", - sum(case when payment.paymentmode='CASH' and bad.taxheadcode='PT_CANCER_CESS' then bad.amount else 0 end) as "cancercess_cash", - count(distinct case when payment.paymentmode='CASH' then bd.billid else NULL end) as "countcash", - sum(case when payment.paymentmode='CHEQUE' then bd.amountpaid else 0 end) as "cheque", - sum(case when payment.paymentmode='CHEQUE' and bad.taxheadcode='PT_FIRE_CESS' then bad.amount else 0 end) as "firecess_cheque", - sum(case when payment.paymentmode='CHEQUE' and bad.taxheadcode='PT_CANCER_CESS' then bad.amount else 0 end) as "cancercess_cheque", - count(distinct case when payment.paymentmode='CHEQUE' then bd.billid else NULL end) as "countcheque", - sum(case when payment.paymentmode='DD' then bd.amountpaid else 0 end) as "dd", - sum(case when payment.paymentmode='DD' and bad.taxheadcode='PT_FIRE_CESS' then bad.amount else 0 end) as "firecess_dd", - sum(case when payment.paymentmode='DD' and bad.taxheadcode='PT_CANCER_CESS' then bad.amount else 0 end) as "cancercess_dd", - count(distinct case when payment.paymentmode='DD' then bd.billid else NULL end) as "countdd", - sum(case when payment.paymentmode='CARD' then bd.amountpaid else 0 end) as "card", - sum(case when payment.paymentmode='CARD' and bad.taxheadcode='PT_FIRE_CESS' then bad.amount else 0 end) as "firecess_card", - sum(case when payment.paymentmode='CARD' and bad.taxheadcode='PT_CANCER_CESS' then bad.amount else 0 end) as "cancercess_card", - count(distinct case when payment.paymentmode='CARD' then bd.billid else NULL end) as "countcard", - sum(case when payment.paymentmode='OFFLINE_RTGS' then bd.amountpaid else 0 end) as "rtgs", - sum(case when payment.paymentmode='OFFLINE_RTGS' and bad.taxheadcode='PT_FIRE_CESS' then bad.amount else 0 end) as "firecess_rtgs", - sum(case when payment.paymentmode='OFFLINE_RTGS' and bad.taxheadcode='PT_CANCER_CESS' then bad.amount else 0 end) as "cancercess_rtgs", - count(distinct case when payment.paymentmode='OFFLINE_RTGS' then bd.billid else NULL end) as "countrtgs", - sum(case when payment.paymentmode='OFFLINE_NEFT' then bd.amountpaid else 0 end) as "neft", - sum(case when payment.paymentmode='OFFLINE_NEFT' and bad.taxheadcode='PT_FIRE_CESS' then bad.amount else 0 end) as "firecess_neft", - sum(case when payment.paymentmode='OFFLINE_NEFT' and bad.taxheadcode='PT_CANCER_CESS' then bad.amount else 0 end) as "cancercess_neft", - count(distinct case when payment.paymentmode='OFFLINE_NEFT' then bd.billid else NULL end) as "countneft", - sum(case when payment.paymentmode='POSTAL_ORDER' then bd.amountpaid else 0 end) as "po", - sum(case when payment.paymentmode='POSTAL_ORDER' and bad.taxheadcode='PT_FIRE_CESS' then bad.amount else 0 end) as "firecess_po", - sum(case when payment.paymentmode='POSTAL_ORDER' and bad.taxheadcode='PT_CANCER_CESS' then bad.amount else 0 end) as "cancercess_po", - count(distinct case when payment.paymentmode='POTAL_ORDER' then bd.billid else NULL end) as "countpo" - FROM egcl_paymentdetail as pd - inner join egcl_payment payment on pd.paymentid=payment.id and payment.paymentstatus != 'CANCELLED' - inner join egcl_billdetial bd on bd.billid=pd.billid - inner join egcl_billaccountdetail bad on bad.billdetailid=bd.id - where pd.businessservice='PT' and payment.tenantid=$tenantid and payment.createdtime>=$fromDate and payment.createdtime<=$toDate - group by bd.billid - ) - select - 'ONLINE' as paymentmode, - sum(online)-sum(firecess_online)-sum(cancercess_online) as amount, - sum(countonline) as nos, - sum(firecess_online) as firecess, - sum(cancercess_online) as cancercess, - sum(online) as total - from paidbills - union - select - 'CASH' as paymentmode, - sum(cash)-sum(firecess_cash)-sum(cancercess_cash), - sum(countcash), - sum(firecess_cash), - sum(cancercess_cash), - sum(cash) - from paidbills - union - select - 'DD' as paymentmode, - sum(dd)-sum(firecess_dd)-sum(cancercess_dd), - sum(countdd), - sum(firecess_dd), - sum(cancercess_dd), - sum(dd) - from paidbills - union - select 'CARD', - sum(card)-sum(firecess_card)-sum(cancercess_card), - sum(countcard), - sum(firecess_card), - sum(cancercess_card), - sum(card) - from paidbills - union - select 'RTGS', - sum(rtgs)-sum(firecess_rtgs)-sum(cancercess_rtgs), - sum(countrtgs), - sum(firecess_rtgs), - sum(cancercess_rtgs), - sum(rtgs) - from paidbills - union - select'CHEQUE', - sum(cheque)-sum(firecess_cheque)-sum(cancercess_cheque), - sum(countcheque), - sum(firecess_cheque), - sum(cancercess_cheque), - sum(cheque) - from paidbills - union - select 'NEFT', - sum(neft)-sum(firecess_neft)-sum(cancercess_neft), - sum(countneft), - sum(firecess_neft), - sum(cancercess_neft), - sum(neft) - from paidbills - union - select 'PO', - sum(po)-sum(firecess_po)-sum(cancercess_po), - sum(countpo), - sum(firecess_po), - sum(cancercess_po), - sum(po) - from paidbills where 1=1 - -- reportName: CHEQUE_REPORT - summary: Cheque Report Register - version: 1.0.0 - moduleName: rainmaker-pt - additionalConfig: - print: - pdfPageSize: "A1" - sourceColumns: - - name: propertyid - label: reports.pt.propertyId - type: string - source: pt - total: false - - name: receiptnumber - label: reports.pt.receiptNo - type: string - source: pt - total: false - - name: receiptdate - label: reports.pt.receiptDate - type: string - source: pt - total: false - - name: instrumenttype - label: reports.pt.paymentMode - type: string - source: pt - total: false - - name: transactionnumber - label: reports.pt.ddChequeTransactionNo - type: string - source: pt - total: false - - name: transactiondate - label: reports.pt.ddChequeTransactionDate - type: string - source: pt - total: false - - name: bankname - label: reports.pt.bankName - type: string - source: pt - total: false - - name: tax_withoutcess - label: reports.pt.taxwithoutcess - type: string - source: pt - total: true - - name: firecess - label: reports.pt.fireCess - type: string - source: pt - total: true - - name: cancercess - label: reports.pt.cancerCess - type: string - source: pt - total: true - - name: amount - label: reports.pt.amount - type: string - source: pt - total: true - searchParams: - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: true - searchClause: AND pd.receiptdate >= $fromDate - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: true - searchClause: AND pd.receiptdate <= $toDate - query: | - -- Use CTE to force query plan, compute & use CTE later - WITH receipt_breakup AS ( - SELECT - pd.id as pdid, - SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) - +SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) - +SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) - +SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) - +SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) - +SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN bad.amount ELSE 0 END) - --SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as paidpropertytax, - +SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN bad.amount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN bad.amount ELSE 0 END) - +SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END) as tax_withoutcess, - SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, - SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess - FROM egcl_billaccountdetail as bad - INNER JOIN egcl_billdetial as bd on bd.id = bad.billdetailid - INNER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid - INNER JOIN egcl_payment as payment on pd.paymentid=payment.id - WHERE payment.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' - AND pd.receiptdate >= $fromDate AND pd.receiptdate <= $toDate - GROUP BY pdid + propertydetail, + string_agg(distinct pu.occupancytype, ',') as occupancytype, + string_agg(distinct coalesce(usagecategoryminor, usagecategorymajor), ',') as propertytype + from eg_pt_unit_v2 as pu + where pu.tenantid = $tenantid + group by propertydetail ) - SELECT - pd.tenantid AS tenantid, - bill.consumercode as propertyid, - to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS receiptdate, - concat(bank_branches.bank_name,' ',bank_branches.branch) as bankname, - receiptnumber, - payment.paymentmode as instrumenttype, - payment.transactionnumber, - to_char((To_timestamp(payment.instrumentdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, - receipt_breakup.tax_withoutcess, - receipt_breakup.firecess, - receipt_breakup.cancercess, - payment.totalamountpaid as amount - FROM egcl_paymentdetail pd, egcl_payment payment left outer join bank_branches on bank_branches.ifsc=payment.ifsccode, receipt_breakup, egcl_bill bill - where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid - and receipt_breakup.pdid=pd.id - and payment.paymentmode in ('CHEQUE','DD','OFFLINE_NEFT') - orderby: ORDER BY pd.receiptdate DESC - -- reportName: DigitData_PT - summary: Online DigitData_PT + + select + distinct on (rh.receiptnumber) + initcap(split_part(rh.tenantid, '.', 2)) as "ulb", + split_part(consumercode, ':', 1) as "propertytaxuniqueid", + to_char((To_timestamp(receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS "transcationdate", + receiptnumber as "receiptnumber", + pt.oldpropertyid as "existingpropertyid", + pd.financialyear as "financialyear", + eu."name" as "ownername", + eu.guardian as "guardianname", + pd.landarea as "totalarea", + pd.builduparea * 9 as "builtarea", + pd.nooffloors as "floors", + pot.occupancytype as "occupancy", + pot.propertytype as "propertytype", + eu.mobilenumber as "mobileno", + instrumenttype as "transcationmode", + ih.amount as "paymentamount", + to_char((To_timestamp(ih.transactiondate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS "paymentdate", + eu.emailid as "emailid", + REGEXP_REPLACE(REGEXP_REPLACE(CONCAT(pta.doorno, ',', pta.addressline1, ',', pta.addressline2, ',', pta.buildingname, ',', pta.pincode), ',+', ','), '^,|,$', '') as "address", + rh.payeraddress as "payeraddress", + pd.additionaldetails->>'remarks' as "remarks", + pt.additionaldetails->>'FirmBusinessName' as "businessname", + pta.locality as "localitycode" + from egcl_receiptheader_v1 as rh + + inner join egcl_receiptinstrument_v1 as ri on ri.receiptheader = rh.id + + inner join egcl_instrumentheader_v1 as ih on ih.id = ri.instrumentheader + + inner join eg_pt_property_v2 as pt on pt.propertyid = split_part(consumercode, ':', 1) + + inner join eg_pt_propertydetail_v2 as pd on pd.assessmentnumber = split_part(consumercode, ':', 2) + + inner join eg_pt_owner_v2 as po on po.propertydetail = pd.assessmentnumber + + inner join eg_user as eu on eu.uuid = po.userid + + inner join eg_pt_address_v2 as pta on pta.property = pt.propertyid + + left outer join eg_pt_unit_v2_ot as pot on pot.propertydetail = pd.assessmentnumber + + where rh.tenantid = $tenantid and rh.status != 'Cancelled' and businessdetails ='PT' + - reportName: Sewa_Kendra_ReceiptRegister + summary: Sewa Kendra Receipt Register + version: 1.0.0 + moduleName: rainmaker-pt + additionalConfig: + print: + pdfPageSize: A1 + sourceColumns: + - name: receiptnumber + label: reports.pt.receiptNo + type: string + source: pt + total: false + - name: receiptdate + label: reports.pt.receiptDate + type: string + source: pt + total: false + - name: g8issuedate + label: reports.pt.g8issuedate + type: string + source: pt + total: false + - name: g8receiptno + label: reports.pt.g8receiptno + type: string + source: pt + total: false + - name: amount + label: reports.pt.amount + type: string + source: pt + total: true + - name: propertytax + label: reports.pt.propertyTax + type: string + source: pt + total: true + - name: firecess + label: reports.pt.fireCess + type: string + source: pt + total: true + - name: cancercess + label: reports.pt.cancerCess + type: string + source: pt + total: true + - name: rebate + label: reports.pt.rebate + type: string + source: pt + total: true + - name: adhocrebate + label: reports.pt.adhocrebate + type: string + source: pt + total: true + - name: penalty + label: reports.pt.penalty + type: string + source: pt + total: true + - name: adhocpenalty + label: reports.pt.adhocpenalty + type: string + source: pt + total: true + - name: interest + label: reports.pt.interest + type: string + source: pt + total: true + - name: exemption + label: reports.pt.exemption + type: string + source: pt + total: true + - name: adjustment + label: reports.pt.roundoff + type: string + source: pt + total: true + - name: pendingamount + label: reports.pt.pendingamount + type: string + source: pt + total: true + - name: propertyid + label: reports.pt.propertyId + type: string + source: pt + total: false + - name: usagetype + label: reports.pt.usagetype + type: string + source: pt + total: false + - name: assessmentnumber + label: reports.pt.assessmentNo + type: string + source: pt + total: false + - name: financialyear + label: reports.pt.financialYear + type: string + source: pt + total: false + - name: instrumenttype + label: reports.pt.paymentMode + type: string + source: pt + total: false + - name: transactionnumber + label: reports.pt.ddChequeTransactionNo + type: string + source: pt + total: false + - name: transactiondate + label: reports.pt.ddChequeTransactionDate + type: string + source: pt + total: false + - name: bankname + label: reports.pt.bankName + type: string + source: pt + total: false + - name: collectorname + label: reports.pt.collectorname + type: string + source: pt + total: false + - name: remarks + label: reports.pt.remarks + type: string + source: pt + total: false + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: true + searchClause: AND rh.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: true + searchClause: AND rh.receiptdate <= $toDate + - name: paymentMode + label: Payment Mode + type: singlevaluelist + pattern: list://Cash:Cash,Online:Online,Card:Card,DD:DD,Cheque:Cheque + source: pt + isMandatory: false + searchClause: AND instrumenttype = $paymentMode + - name: financialyear + label: Financial Year + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name + source: pt + wrapper: true + isMandatory: false + searchClause: AND financialyear = $financialyear + - name: localityArray + label: reports.pt.zoneList + type: boundarylist + source: pt + isMandatory: false + searchClause: AND pt_addr.locality IN ($localityArray) + query: > + -- Use CTE to force query plan, compute & use CTE later + + WITH receipt_breakup AS ( + SELECT + receiptheader, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, + SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as propertytax, + (SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN adjustedamount ELSE 0 END) )as exemption, + ( SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END)) as adjustment + FROM egcl_receiptdetails_v1 as rd + INNER JOIN egcl_receiptheader_v1 as rh on rh.id = rd.receiptheader + WHERE rd.tenantid = $tenantid and rh.status != 'Cancelled' and businessdetails='PT' and rh.createdby::INTEGER in (select user_id from eg_userrole_v1 where role_code ='SEVA_KENDRA_EMP') + GROUP BY rd.receiptheader + ) + + SELECT + rh.tenantid AS tenantid, + rh.id, + Substring(rh.consumercode, '(.*):') AS propertyid, + Substring(rh.consumercode, ':(.*)') AS assessmentnumber, + rh.consumercode, + to_char((To_timestamp(rh.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS receiptdate, + bankid AS bankname, + receiptnumber, + amount, + instrumenttype, + transactionnumber, + to_char((To_timestamp(transactiondate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, + receipt_breakup.*, + rh.totalamount - ih.amount AS pendingamount, + pt_detail.financialyear, + to_char((To_timestamp(rh.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, + Initcap(COALESCE(pt_detail.usagecategoryminor, pt_detail.usagecategorymajor)) as usagetype, + manualreceiptnumber as g8receiptno, + (case when eg_user.name is null then '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' else eg_user.name end) as collectorname, + pt_detail.additionaldetails->>'remarks' as "remarks" + FROM egcl_receiptheader_v1 AS rh + + JOIN egcl_receiptinstrument_v1 AS ri ON rh.id = ri.receiptheader + + JOIN egcl_instrumentheader_v1 AS ih ON ih.id = ri.instrumentheader + + JOIN receipt_breakup ON rh.id = receipt_breakup.receiptheader + + JOIN eg_pt_propertydetail_v2 pt_detail ON (pt_detail.property || ':' || pt_detail.assessmentnumber) = rh.consumercode + + JOIN eg_pt_address_v2 pt_addr ON pt_detail.property = pt_addr.property + + LEFT OUTER JOIN eg_user ON eg_user.id = rh.createdby::INTEGER + + WHERE rh.tenantid = $tenantid and rh.status != 'Cancelled' and businessdetails='PT' and rh.createdby::INTEGER in + + (select user_id from eg_userrole_v1 where role_code ='SEVA_KENDRA_EMP') + orderby: ORDER BY rh.receiptdate DESC + - reportName: ReceiptRegisterSummary + summary: Receipt Register Summary + version: 1.0.0 + moduleName: rainmaker-pt + additionalConfig: + print: + pdfPageSize: A1 + sourceColumns: + - name: ulb + label: reports.pt.ulb + type: string + source: pt + total: false + - name: adhocpenalty + label: reports.pt.adhocpenalty + type: string + source: pt + total: true + - name: adhocrebate + label: reports.pt.adhocrebate + type: string + source: pt + total: true + - name: firecess + label: reports.pt.firecess + type: string + source: pt + total: true + - name: cancercess + label: reports.pt.cancercess + type: string + source: pt + total: true + - name: interest + label: reports.pt.interest + type: string + source: pt + total: true + - name: penalty + label: reports.pt.penalty + type: string + source: pt + total: true + - name: rebate + label: reports.pt.rebate + type: string + source: pt + total: true + - name: propertytax + label: reports.pt.propertytax + type: string + source: pt + total: true + - name: exemption + label: reports.pt.exemption + type: string + source: pt + total: true + - name: adjustment + label: reports.pt.adjustment + type: string + source: pt + total: true + - name: adhocrebate + label: reports.pt.adhocrebate + type: string + source: pt + total: true + - name: noofassessments + label: reports.pt.noofassessments + type: string + source: pt + total: true + - name: collectorname + label: reports.pt.collectorname + type: string + source: pt + total: false + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: true + searchClause: AND rh.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: true + searchClause: AND rh.receiptdate <= $toDate + - name: collectorname + label: reports.pt.collectorname + type: singlevaluelist + pattern: http://egov-hrms:8080/egov-hrms/employees/_search?tenantId=$tenantid&roles=PTCEMP|$.Employees[*].user.id|$.Employees[*].user.name + source: pt + wrapper: true + isMandatory: false + searchClause: AND eg_user.id = $collectorname::INTEGER + query: > + -- Use CTE to force query plan, compute & use CTE later + + SELECT + split_part(rd.tenantid,'.',2) as ulb, + Count (*)/8 noofassessments, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, + SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as propertytax, + (SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN adjustedamount ELSE 0 END) )as exemption, + ( SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END)) as adjustment, + (CASE WHEN collectiontype='COUNTER' THEN eg_user.name ELSE 'Online' END) as collectorname + FROM egcl_receiptdetails_v1 as rd + + INNER JOIN egcl_receiptheader_v1 as rh on rh.id = rd.receiptheader + + LEFT OUTER JOIN eg_user ON eg_user.id = rh.createdby::INTEGER + + WHERE rd.tenantid = $tenantid and rh.status != 'Cancelled' and businessdetails='PT' + groupby: group by rd.tenantid,collectorname + - reportName: StateReceiptRegisterSummary + summary: Receipt Register Summary + version: 1.0.0 + moduleName: rainmaker-pt + additionalConfig: + print: + pdfPageSize: A1 + sourceColumns: + - name: ulb + label: reports.pt.ulb + type: string + source: pt + total: false + - name: adhocpenalty + label: reports.pt.adhocpenalty + type: string + source: pt + total: true + - name: adhocrebate + label: reports.pt.adhocrebate + type: string + source: pt + total: true + - name: firecess + label: reports.pt.firecess + type: string + source: pt + total: true + - name: cancercess + label: reports.pt.cancercess + type: string + source: pt + total: true + - name: interest + label: reports.pt.interest + type: string + source: pt + total: true + - name: penalty + label: reports.pt.penalty + type: string + source: pt + total: true + - name: rebate + label: reports.pt.rebate + type: string + source: pt + total: true + - name: propertytax + label: reports.pt.propertytax + type: string + source: pt + total: true + - name: exemption + label: reports.pt.exemption + type: string + source: pt + total: true + - name: adjustment + label: reports.pt.adjustment + type: string + source: pt + total: true + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: false + searchClause: AND rh.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: false + searchClause: AND rh.receiptdate <= $toDate + - name: ulb + label: ULB + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: pt + wrapper: true + isMandatory: false + searchClause: AND rd.tenantid = $ulb + query: > + -- Use CTE to force query plan, compute & use CTE later + + SELECT + split_part(rd.tenantid,'.',2) as ulb, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, + SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as propertytax, + (SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN adjustedamount ELSE 0 END) )as exemption, + ( SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END)) as adjustment + FROM egcl_receiptdetails_v1 as rd + + INNER JOIN egcl_receiptheader_v1 as rh on rh.id = rd.receiptheader + + WHERE rd.tenantid != 'pb.testing' and rh.status != 'Cancelled' and businessdetails='PT' + groupby: group by rd.tenantid + orderby: order by rd.tenantid + - reportName: FYCollectionsReport + summary: FY Collections + version: 1.0.0 + moduleName: rainmaker-pt + additionalConfig: + print: + pdfPageSize: Legal + sourceColumns: + - name: financialyear + label: reports.pt.financialyear + type: string + source: pt + total: false + - name: residential + label: reports.pt.residential + type: string + source: pt + total: true + - name: nonresidential + label: reports.pt.nonresidential + type: string + source: pt + total: true + - name: mixed + label: reports.pt.mixed + type: string + source: pt + total: true + - name: totalamount + label: reports.pt.totalamount + type: string + source: pt + total: true + - name: online + label: reports.pt.online + type: string + source: pt + total: true + - name: cash + label: reports.pt.cash + type: string + source: pt + total: true + - name: cheque + label: reports.pt.cheque + type: string + source: pt + total: true + - name: dd + label: reports.pt.dd + type: string + source: pt + total: true + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: false + searchClause: AND rh.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: false + searchClause: AND rh.receiptdate <= $toDate + - name: localityArray + label: reports.pt.zoneList + type: boundarylist + source: pt + isMandatory: false + searchClause: AND pt_addr.locality IN ($localityArray) + query: > + -- Use CTE to force query plan, compute & use CTE later + + SELECT + financialyear, + sum(case when usagecategorymajor='RESIDENTIAL' then amount else 0 end) as "residential", + sum(case when usagecategorymajor='RESIDENTIAL' then 1 else 0 end) as "countresidential", + sum(case when usagecategorymajor='NONRESIDENTIAL' then amount else 0 end) as "nonresidential", + sum(case when usagecategorymajor='NONRESIDENTIAL' then 1 else 0 end) as "countnonresidential", + sum(case when usagecategorymajor='MIXED' then amount else 0 end) as "mixed", + sum(case when usagecategorymajor='MIXED' then 1 else 0 end) as "countmixed", + sum(amount) as totalamount, + count(amount) as totalcount, + sum(case when instrumenttype='Online' then amount else 0 end) as "online", + sum(case when instrumenttype='Cash' then amount else 0 end) as "cash", + sum(case when instrumenttype='Cheque' then amount else 0 end) as "cheque", + sum(case when instrumenttype='DD' then amount else 0 end) as "dd" + FROM egcl_receiptheader_v1 AS rh + + JOIN egcl_receiptinstrument_v1 AS ri ON rh.id = ri.receiptheader + + JOIN egcl_instrumentheader_v1 AS ih ON ih.id = ri.instrumentheader + + JOIN eg_pt_propertydetail_v2 pt_detail ON (pt_detail.property || ':' || pt_detail.assessmentnumber) = rh.consumercode + + JOIN eg_pt_address_v2 pt_addr ON pt_detail.property = pt_addr.property + + LEFT OUTER JOIN eg_user ON eg_user.id = rh.createdby::INTEGER + + WHERE rh.tenantid = $tenantid and rh.status != 'Cancelled' + groupby: GROUP BY financialyear + orderby: ORDER BY financialyear + - reportName: ULBDEFAULTERPTREPORT + summary: ULB Defaulter Pt report + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: ulb + label: reports.pt.ulb + type: string + source: pt + total: false + - name: propertytaxuniqueid + label: reports.pt.propertytaxuniqueid + type: string + source: pt + total: false + - name: transcationdate + label: reports.pt.transcationdate + type: string + source: pt + total: false + - name: receiptnumber + label: reports.pt.receiptnumber + type: string + source: pt + total: false + - name: existingpropertyid + label: reports.pt.existingpropertyid + type: string + source: pt + total: false + - name: financialyear + label: reports.pt.financialYear + type: string + source: pt + total: false + - name: ownername + label: reports.pt.ownername + type: string + source: pt + total: false + - name: guardianname + label: reports.pt.guardianname + type: string + source: pt + total: false + - name: propertytype + label: reports.pt.propertytype + type: string + source: pt + total: false + - name: mobileno + label: reports.pt.mobileno + type: string + source: pt + total: false + - name: address + label: reports.pt.address + type: string + source: pt + total: false + - name: payeraddress + label: reports.pt.payeraddress + type: string + source: pt + total: false + searchParams: + - name: localityArray + label: reports.pt.zoneList + type: boundarylist + source: pt + isMandatory: true + searchClause: AND pta.locality IN ($localityArray) + query: > + --S.no Service Name ULB Property Tax Unique ID Date Of + Transcation Receipt Number Existing Property ID Type Of + Property Mobile Number Address + with eg_pt_unit_v2_ot as ( + select + propertydetail, + string_agg(distinct pu.occupancytype, ',') as occupancytype, + string_agg(distinct coalesce(usagecategoryminor, usagecategorymajor), ',') as propertytype + from eg_pt_unit_v2 as pu + where pu.tenantid =$tenantid + group by propertydetail + ) + + select + distinct on (rh.receiptnumber) + initcap(split_part(rh.tenantid, '.', 2)) as "ulb", + split_part(consumercode, ':', 1) as "propertytaxuniqueid", + to_char((To_timestamp(receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS "transcationdate", + receiptnumber as "receiptnumber", + pt.oldpropertyid as "existingpropertyid", + pd.financialyear as "financialyear", + eu."name" as "ownername", + eu.guardian as "guardianname", + pot.propertytype as "propertytype", + eu.mobilenumber as "mobileno", + REGEXP_REPLACE(REGEXP_REPLACE(CONCAT(pta.doorno, ',', pta.addressline1, ',', pta.addressline2, ',', pta.buildingname, ',', pta.pincode), ',+', ','), '^,|,$', '') as "address" + from egcl_receiptheader_v1 as rh + + inner join egcl_receiptinstrument_v1 as ri on ri.receiptheader = rh.id + + inner join egcl_instrumentheader_v1 as ih on ih.id = ri.instrumentheader + + inner join eg_pt_property_v2 as pt on pt.propertyid = split_part(consumercode, ':', 1) + + inner join eg_pt_propertydetail_v2 as pd on pd.assessmentnumber = split_part(consumercode, ':', 2) + + inner join eg_pt_owner_v2 as po on po.propertydetail = pd.assessmentnumber + + inner join eg_user as eu on eu.uuid = po.userid + + inner join eg_pt_address_v2 as pta on pta.property = pt.propertyid + + left outer join eg_pt_unit_v2_ot as pot on pot.propertydetail = pd.assessmentnumber + + where rh.tenantid =$tenantid and pd.property not in (select property from eg_pt_propertydetail_v2 where financialyear in ('2019-20')) + - reportName: ReceiptRegister_V2 + decryptionPathId: ReceiptRegister_V2 + summary: Receipt Register + version: 1.0.0 + moduleName: rainmaker-pt + additionalConfig: + print: + pdfPageSize: A1 + sourceColumns: + - name: receiptnumber + label: reports.pt.receiptNo + type: string + source: pt + total: false + - name: receiptdate + label: reports.pt.receiptDate + type: string + source: pt + total: false + - name: g8issuedate + label: reports.pt.g8issuedate + type: string + source: pt + total: false + - name: g8receiptno + label: reports.pt.g8receiptno + type: string + source: pt + total: false + - name: amount + label: reports.pt.amount + type: string + source: pt + total: true + - name: propertytax + label: reports.pt.propertyTax + type: string + source: pt + total: true + - name: firecess + label: reports.pt.fireCess + type: string + source: pt + total: true + - name: cancercess + label: reports.pt.cancerCess + type: string + source: pt + total: true + - name: rebate + label: reports.pt.rebate + type: string + source: pt + total: true + - name: adhocrebate + label: reports.pt.adhocrebate + type: string + source: pt + total: true + - name: penalty + label: reports.pt.penalty + type: string + source: pt + total: true + - name: adhocpenalty + label: reports.pt.adhocpenalty + type: string + source: pt + total: true + - name: interest + label: reports.pt.interest + type: string + source: pt + total: true + - name: exemption + label: reports.pt.exemption + type: string + source: pt + total: true + - name: adjustment + label: reports.pt.roundoff + type: string + source: pt + total: true + - name: pendingamount + label: reports.pt.pendingamount + type: string + source: pt + total: true + - name: consumercode + label: reports.pt.propertyId + type: string + source: pt + total: false + - name: usagetype + label: reports.pt.usagetype + type: string + source: pt + total: false + - name: instrumenttype + label: reports.pt.paymentMode + type: string + source: pt + total: false + - name: transactionnumber + label: reports.pt.ddChequeTransactionNo + type: string + source: pt + total: false + - name: transactiondate + label: reports.pt.ddChequeTransactionDate + type: string + source: pt + total: false + - name: bankname + label: reports.pt.bankName + type: string + source: pt + total: false + - name: collectorname + label: reports.pt.collectorname + type: string + source: pt + total: false + - name: financialyear + label: reports.pt.financialyear + type: string + source: pt + total: false + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: true + searchClause: AND pd.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: true + searchClause: AND pd.receiptdate <= $toDate + - name: financialyear + label: Financial Year + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name + source: pt + wrapper: true + isMandatory: false + searchClause: AND concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) + at time Zone 'Asia/Kolkata'),'YYYY'),'-', + to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone + 'Asia/Kolkata'),'YY')) = $financialyear + - name: paymentMode + label: Payment Mode + type: singlevaluelist + pattern: list://CARD:Card,CASH:Cash,CHEQUE:Cheque,DD:DD,OFFLINE_NEFT:NEFT,OFFLINE_RTGS:RTGS,ONLINE:Online,POSTAL_ORDER:PostalOrder + source: pt + isMandatory: false + searchClause: AND payment.paymentmode = $paymentMode + - name: localityArray + label: reports.pt.zoneList + type: boundarylist + source: pt + isMandatory: false + searchClause: AND pt_addr.locality IN ($localityArray) + query: > + -- Use CTE to force query plan, compute & use CTE later + + WITH receipt_breakup AS ( + SELECT + pd.id as pdid, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, + SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN bad.amount ELSE 0 END) as propertytax, + SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as paidpropertytax, + (SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN bad.amount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN bad.amount ELSE 0 END) ) as exemption, + (SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END)) as adjustment + FROM egcl_billaccountdetail as bad + INNER JOIN egcl_billdetial as bd on bd.id = bad.billdetailid + INNER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid + INNER JOIN egcl_payment as payment on pd.paymentid=payment.id + WHERE payment.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' + GROUP BY pdid + ) + + SELECT + pd.tenantid AS tenantid, + pd.id, + pt.propertyid as consumercode, + to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS receiptdate, + payment.ifsccode AS bankname, + receiptnumber, + payment.totalamountpaid as amount, + payment.paymentmode as instrumenttype, + payment.transactionnumber, + getfinancialyear(pd.billid) as financialyear, + to_char((To_timestamp(payment.transactiondate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, + payment.totaldue - payment.totalamountpaid AS pendingamount, + Initcap(case when pt.usagecategory like '%.%' then split_part(pt.usagecategory,'.',2) else pt.usagecategory end) as usagetype, + (case when eg_user.name is null then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else eg_user.name end) as collectorname, + receipt_breakup.*, + to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, + manualreceiptnumber as g8receiptno + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, + + (select * from (select *,(row_number() over(partition by propertyid order by lastmodifiedtime desc)) as rw from eg_pt_property where tenantid=$tenantid) pts where rw=1) as pt, + + receipt_breakup, egcl_bill bill, + + (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr + + where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + + and pt.propertyid = bill.consumercode and receipt_breakup.pdid=pd.id --and pt.status!='INACTIVE' + + and pt_addr.propertyid=pt.id + + --and pt.propertyid='PT-1012-978737' + + --and receiptnumber='PT/1012/2020-21/001021' + orderby: ORDER BY pd.receiptdate DESC; + - reportName: ReceiptRegister_without_locality_V2 + decryptionPathId: ReceiptRegister_V2 + summary: Receipt Register + version: 1.0.0 + moduleName: rainmaker-pt + additionalConfig: + print: + pdfPageSize: A1 + sourceColumns: + - name: receiptnumber + label: reports.pt.receiptNo + type: string + source: pt + total: false + - name: receiptdate + label: reports.pt.receiptDate + type: string + source: pt + total: false + - name: g8issuedate + label: reports.pt.g8issuedate + type: string + source: pt + total: false + - name: g8receiptno + label: reports.pt.g8receiptno + type: string + source: pt + total: false + - name: amount + label: reports.pt.amount + type: string + source: pt + total: true + - name: propertytax + label: reports.pt.propertyTax + type: string + source: pt + total: true + - name: firecess + label: reports.pt.fireCess + type: string + source: pt + total: true + - name: cancercess + label: reports.pt.cancerCess + type: string + source: pt + total: true + - name: rebate + label: reports.pt.rebate + type: string + source: pt + total: true + - name: adhocrebate + label: reports.pt.adhocrebate + type: string + source: pt + total: true + - name: penalty + label: reports.pt.penalty + type: string + source: pt + total: true + - name: adhocpenalty + label: reports.pt.adhocpenalty + type: string + source: pt + total: true + - name: interest + label: reports.pt.interest + type: string + source: pt + total: true + - name: exemption + label: reports.pt.exemption + type: string + source: pt + total: true + - name: adjustment + label: reports.pt.roundoff + type: string + source: pt + total: true + - name: pendingamount + label: reports.pt.pendingamount + type: string + source: pt + total: true + - name: consumercode + label: reports.pt.propertyId + type: string + source: pt + total: false + - name: usagetype + label: reports.pt.usagetype + type: string + source: pt + total: false + - name: instrumenttype + label: reports.pt.paymentMode + type: string + source: pt + total: false + - name: transactionnumber + label: reports.pt.ddChequeTransactionNo + type: string + source: pt + total: false + - name: transactiondate + label: reports.pt.ddChequeTransactionDate + type: string + source: pt + total: false + - name: bankname + label: reports.pt.bankName + type: string + source: pt + total: false + - name: collectorname + label: reports.pt.collectorname + type: string + source: pt + total: false + - name: financialyear + label: reports.pt.financialyear + type: string + source: pt + total: false + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: true + searchClause: AND pd.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: true + searchClause: AND pd.receiptdate <= $toDate + - name: financialyear + label: Financial Year + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name + source: pt + wrapper: true + isMandatory: false + searchClause: AND concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) + at time Zone 'Asia/Kolkata'),'YYYY'),'-', + to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone + 'Asia/Kolkata'),'YY')) = $financialyear + - name: paymentMode + label: Payment Mode + type: singlevaluelist + pattern: list://CARD:Card,CASH:Cash,CHEQUE:Cheque,DD:DD,OFFLINE_NEFT:NEFT,OFFLINE_RTGS:RTGS,ONLINE:Online,POSTAL_ORDER:PostalOrder + source: pt + isMandatory: false + searchClause: AND payment.paymentmode = $paymentMode + query: > + -- Use CTE to force query plan, compute & use CTE later + + WITH receipt_breakup AS ( + SELECT + pd.id as pdid, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, + SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN bad.amount ELSE 0 END) as propertytax, + SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as paidpropertytax, + (SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN bad.amount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN bad.amount ELSE 0 END) ) as exemption, + (SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END)) as adjustment + FROM egcl_billaccountdetail as bad + INNER JOIN egcl_billdetial as bd on bd.id = bad.billdetailid + INNER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid + INNER JOIN egcl_payment as payment on pd.paymentid=payment.id + WHERE payment.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' + AND pd.receiptdate >= $fromDate AND pd.receiptdate <= $toDate + GROUP BY pdid + ) + + SELECT + pd.tenantid AS tenantid, + pd.id, + pt.propertyid as consumercode, + to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS receiptdate, + --payment.ifsccode AS bankname, + concat(bank_branches.bank_name,' ',bank_branches.branch) as bankname, + receiptnumber, + payment.totalamountpaid as amount, + payment.paymentmode as instrumenttype, + payment.transactionnumber, + concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear, + to_char((To_timestamp(payment.instrumentdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, + payment.totaldue - payment.totalamountpaid AS pendingamount, + Initcap(case when pt.usagecategory like '%.%' then split_part(pt.usagecategory,'.',2) else pt.usagecategory end) as usagetype, + (case when eg_user.name is null then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else eg_user.name end) as collectorname, + receipt_breakup.*, + to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, + manualreceiptnumber as g8receiptno + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment left outer join bank_branches on bank_branches.ifsc=payment.ifsccode, + + (select * from (select *,(row_number() over(partition by propertyid order by lastmodifiedtime desc)) as rw from eg_pt_property where tenantid=$tenantid) pts where rw=1) as pt, + + receipt_breakup, egcl_bill bill + + --,(select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr + + where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + + and pt.propertyid = bill.consumercode and receipt_breakup.pdid=pd.id --and pt.status!='INACTIVE' + + --and pt_addr.propertyid=pt.id + orderby: ORDER BY pd.receiptdate DESC; + - reportName: CancelledReceiptRegister_V2 + decryptionPathId: CancelledReceiptRegister_V2 + summary: Receipt Register for cancelled Receipts + version: 1.0.0 + moduleName: rainmaker-pt + additionalConfig: + print: + pdfPageSize: A1 + sourceColumns: + - name: receiptnumber + label: reports.pt.receiptNo + type: string + source: pt + total: false + - name: receiptdate + label: reports.pt.receiptDate + type: string + source: pt + total: false + - name: g8issuedate + label: reports.pt.g8issuedate + type: string + source: pt + total: false + - name: g8receiptno + label: reports.pt.g8receiptno + type: string + source: pt + total: false + - name: amount + label: reports.pt.amount + type: string + source: pt + total: true + - name: propertytax + label: reports.pt.propertyTax + type: string + source: pt + total: true + - name: firecess + label: reports.pt.fireCess + type: string + source: pt + total: true + - name: cancercess + label: reports.pt.cancerCess + type: string + source: pt + total: true + - name: rebate + label: reports.pt.rebate + type: string + source: pt + total: true + - name: adhocrebate + label: reports.pt.adhocrebate + type: string + source: pt + total: true + - name: penalty + label: reports.pt.penalty + type: string + source: pt + total: true + - name: adhocpenalty + label: reports.pt.adhocpenalty + type: string + source: pt + total: true + - name: interest + label: reports.pt.interest + type: string + source: pt + total: true + - name: exemption + label: reports.pt.exemption + type: string + source: pt + total: true + - name: adjustment + label: reports.pt.roundoff + type: string + source: pt + total: true + - name: pendingamount + label: reports.pt.pendingamount + type: string + source: pt + total: true + - name: consumercode + label: reports.pt.propertyId + type: string + source: pt + total: false + - name: usagetype + label: reports.pt.usagetype + type: string + source: pt + total: false + - name: instrumenttype + label: reports.pt.paymentMode + type: string + source: pt + total: false + - name: transactionnumber + label: reports.pt.ddChequeTransactionNo + type: string + source: pt + total: false + - name: transactiondate + label: reports.pt.ddChequeTransactionDate + type: string + source: pt + total: false + - name: bankname + label: reports.pt.bankName + type: string + source: pt + total: false + - name: collectorname + label: reports.pt.collectorname + type: string + source: pt + total: false + - name: financialyear + label: reports.pt.financialyear + type: string + source: pt + total: false + - name: paymentstatus + label: reports.pt.paymentstatus + type: string + source: pt + total: false + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: true + searchClause: AND pd.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: true + searchClause: AND pd.receiptdate <= $toDate + - name: financialyear + label: Financial Year + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name + source: pt + wrapper: true + isMandatory: false + searchClause: AND concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) + at time Zone 'Asia/Kolkata'),'YYYY'),'-', + to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone + 'Asia/Kolkata'),'YY')) = $financialyear + - name: paymentMode + label: Payment Mode + type: singlevaluelist + pattern: list://CARD:Card,CASH:Cash,CHEQUE:Cheque,DD:DD,OFFLINE_NEFT:NEFT,OFFLINE_RTGS:RTGS,ONLINE:Online,POSTAL_ORDER:PostalOrder + source: pt + isMandatory: false + searchClause: AND payment.paymentmode = $paymentMode + query: > + -- Use CTE to force query plan, compute & use CTE later + + WITH receipt_breakup AS ( + SELECT + pd.id as pdid, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, + SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN bad.amount ELSE 0 END) as propertytax, + SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as paidpropertytax, + (SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN bad.amount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN bad.amount ELSE 0 END) ) as exemption, + (SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END)) as adjustment + FROM egcl_billaccountdetail as bad + INNER JOIN egcl_billdetial as bd on bd.id = bad.billdetailid + INNER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid + INNER JOIN egcl_payment as payment on pd.paymentid=payment.id + WHERE payment.tenantid = $tenantid and payment.paymentstatus = 'CANCELLED' and pd.businessservice='PT' + GROUP BY pdid + ) + + SELECT + pd.tenantid AS tenantid, + pd.id, + pt.propertyid as consumercode, + to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS receiptdate, + --payment.ifsccode AS bankname, + concat(bank_branches.bank_name,' ',bank_branches.branch) as bankname, + receiptnumber, + payment.totalamountpaid as amount, + payment.paymentmode as instrumenttype, + payment.transactionnumber, + concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear, + to_char((To_timestamp(payment.transactiondate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, + payment.totaldue - payment.totalamountpaid AS pendingamount, + Initcap(case when pt.usagecategory like '%.%' then split_part(pt.usagecategory,'.',2) else pt.usagecategory end) as usagetype, + (case when eg_user.name is null then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else eg_user.name end) as collectorname, + receipt_breakup.*, + to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, + manualreceiptnumber as g8receiptno + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment left outer join bank_branches on bank_branches.ifsc=payment.ifsccode, eg_pt_property as pt, receipt_breakup, egcl_bill bill + + --,(select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr + + where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus = 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + + and pt.propertyid = bill.consumercode and receipt_breakup.pdid=pd.id and pt.status!='INACTIVE' + + --and pt_addr.propertyid=pt.id + orderby: ORDER BY pd.receiptdate DESC; + - reportName: OldUlbWisePtCollection_V2 + summary: ULB-wise PT Collection + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: totalassessments + label: reports.pt.totalassessments + type: string + source: pt + total: true + - name: totalamountpaid + label: reports.pt.totalamountpaid + type: string + source: pt + total: true + - name: totalamountdue + label: reports.pt.totalamountdue + type: string + source: pt + total: true + searchParams: + - name: financialyear + label: Financial Year + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name + source: pt + wrapper: true + isMandatory: false + searchClause: AND financialyear = $financialyear + - name: usage + label: Usage + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=PropertyTax&masterName=UsageCategoryMajor|$..code|$..name + source: pt + wrapper: true + isMandatory: false + searchClause: AND usagecategorymajor = $usage + query: > + SELECT + tenantid, + COUNT(*) AS totalassessments, + SUM(totalamount) AS totalamount, + SUM(amount) AS totalamountpaid, + (SUM(totalamount) - SUM(amount)) AS totalamountdue + FROM eg_pt_propertydetail_v2 AS pd + + LEFT OUTER JOIN + (SELECT consumercode, totalamount, amount FROM egcl_receiptheader_v1 AS rh + LEFT OUTER JOIN egcl_receiptinstrument_v1 AS ri ON rh.id = ri.receiptheader + LEFT OUTER JOIN egcl_instrumentheader_v1 AS ih ON ri.instrumentheader = ih.id + and ih.instrumentstatus != 'CANCELLED' + where rh.status != 'Cancelled' + ) AS instrument_data ON (pd.property || ':' || pd.assessmentnumber) = instrument_data.consumercode + WHERE tenantid = $tenantid + groupby: GROUP BY tenantid + orderby: ORDER BY tenantid, totalamountpaid DESC NULLS LAST + - reportName: StateCancelledReceiptRegister_V2 + decryptionPathId: CancelledReceiptRegister_V2 + summary: Receipt Register for cancelled Receipts state + version: 1.0.0 + moduleName: rainmaker-pt + additionalConfig: + print: + pdfPageSize: A1 + sourceColumns: + - name: tenantid + label: reports.pt.ulb + type: string + source: pt + total: false + - name: receiptnumber + label: reports.pt.receiptNo + type: string + source: pt + total: false + - name: receiptdate + label: reports.pt.receiptDate + type: string + source: pt + total: false + - name: g8issuedate + label: reports.pt.g8issuedate + type: string + source: pt + total: false + - name: g8receiptno + label: reports.pt.g8receiptno + type: string + source: pt + total: false + - name: amount + label: reports.pt.amount + type: string + source: pt + total: true + - name: paystatus + label: reports.pt.paymentstatus + type: string + source: pt + total: false + - name: propertytax + label: reports.pt.propertyTax + type: string + source: pt + total: true + - name: firecess + label: reports.pt.fireCess + type: string + source: pt + total: true + - name: cancercess + label: reports.pt.cancerCess + type: string + source: pt + total: true + - name: rebate + label: reports.pt.rebate + type: string + source: pt + total: true + - name: adhocrebate + label: reports.pt.adhocrebate + type: string + source: pt + total: true + - name: penalty + label: reports.pt.penalty + type: string + source: pt + total: true + - name: adhocpenalty + label: reports.pt.adhocpenalty + type: string + source: pt + total: true + - name: interest + label: reports.pt.interest + type: string + source: pt + total: true + - name: exemption + label: reports.pt.exemption + type: string + source: pt + total: true + - name: adjustment + label: reports.pt.roundoff + type: string + source: pt + total: true + - name: pendingamount + label: reports.pt.pendingamount + type: string + source: pt + total: true + - name: consumercode + label: reports.pt.propertyId + type: string + source: pt + total: false + - name: usagetype + label: reports.pt.usagetype + type: string + source: pt + total: false + - name: instrumenttype + label: reports.pt.paymentMode + type: string + source: pt + total: false + - name: transactionnumber + label: reports.pt.ddChequeTransactionNo + type: string + source: pt + total: false + - name: transactiondate + label: reports.pt.ddChequeTransactionDate + type: string + source: pt + total: false + - name: bankname + label: reports.pt.bankName + type: string + source: pt + total: false + - name: collectorname + label: reports.pt.collectorname + type: string + source: pt + total: false + - name: financialyear + label: reports.pt.financialyear + type: string + source: pt + total: false + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: true + searchClause: AND pd.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: true + searchClause: AND pd.receiptdate <= $toDate + - name: paymentMode + label: Payment Mode + type: singlevaluelist + pattern: list://CARD:Card,CASH:Cash,CHEQUE:Cheque,DD:DD,OFFLINE_NEFT:NEFT,OFFLINE_RTGS:RTGS,ONLINE:Online,POSTAL_ORDER:PostalOrder + source: pt + isMandatory: false + searchClause: AND payment.paymentmode = $paymentMode + query: > + -- Use CTE to force query plan, compute & use CTE later + + WITH receipt_breakup AS ( + SELECT + pd.id as pdid, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, + SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as propertytax, + (SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN adjustedamount ELSE 0 END) )as exemption, + ( SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END)) as adjustment + FROM egcl_billaccountdetail as bad + INNER JOIN egcl_billdetial as bd on bd.id = bad.billdetailid + INNER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid + INNER JOIN egcl_payment as payment on pd.paymentid=payment.id + WHERE bad.tenantid not in ('pb.testing','pb.ludhiana_legacy') and payment.paymentstatus = 'CANCELLED' and pd.businessservice='PT' + GROUP BY pdid + ) + + SELECT + pd.tenantid AS tenantid, + pd.id, + bill.consumercode, + to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS receiptdate, + payment.ifsccode AS bankname, + receiptnumber, + payment.totalamountpaid as amount, + payment.paymentmode as instrumenttype, + payment.transactionnumber, + concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear, + to_char((To_timestamp(payment.transactiondate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, + pd.due AS pendingamount, + Initcap(case when pt.usagecategory like '%.%' then split_part(pt.usagecategory,'.',2) else pt.usagecategory end) as usagetype, + (CASE WHEN billd.collectiontype='COUNTER' THEN eg_user.name ELSE '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' END) as collectorname, + receipt_breakup.*, + to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, manualreceiptnumber as g8receiptno, + payment.paymentstatus as paystatus + FROM egcl_paymentdetail pd, eg_user, eg_pt_property as pt, egcl_billdetial as billd, egcl_payment payment,receipt_breakup, egcl_bill bill, (select bill.id as billid, min(bd.fromperiod) fromperiod, max(bd.toperiod) toperiod from egcl_billdetial bd, egcl_bill bill where bill.id=bd.billid group by bill.id) bd + + WHERE pd.paymentid=payment.id and eg_user.id = pd.createdby::INTEGER and pt.propertyid = bill.consumercode and bill.id=pd.billid and bill.id=billd.billid and bd.billid=bill.id and payment.paymentstatus = 'CANCELLED' and pd.businessservice='PT' and payment.tenantid not in ('pb.testing','pb.ludhiana_legacy') and receipt_breakup.pdid=pd.id + orderby: ORDER BY pd.receiptdate DESC; + - reportName: StateWidePtCollection_V2 + summary: State Wide PT Collection + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: tenantid + label: reports.pt.tenantid + type: string + source: pt + total: false + - name: totalamountpaid + label: reports.pt.totalamountpaid + type: string + source: pt + total: true + - name: totalassessments + label: reports.pt.totalassessments + type: string + source: pt + total: true + - name: totaloffline + label: reports.pt.totaloffline + type: string + source: pt + total: true + - name: countoffline + label: reports.pt.countoffline + type: string + source: pt + total: true + - name: totalonline + label: reports.pt.totalonline + type: string + source: pt + total: true + - name: countonline + label: reports.pt.countonline + type: string + source: pt + total: true + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: false + searchClause: AND pd.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: false + searchClause: AND pd.receiptdate <= $toDate + - name: financialyear + label: Financial Year + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name + source: pt + wrapper: true + isMandatory: false + searchClause: AND concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) + at time Zone 'Asia/Kolkata'),'YYYY'),'-', + to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone + 'Asia/Kolkata'),'YY')) = $financialyear + - name: usage + label: Usage + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=PropertyTax&masterName=UsageCategoryMajor|$..code|$..name + source: pt + wrapper: true + isMandatory: false + searchClause: AND pt.usagecategory = $usage + query: > + SELECT + initcap(split_part(payment.tenantid, '.', 2)) as tenantid, + sum(payment.totalamountpaid) as totalamountpaid, + count(payment.totalamountpaid) as totalassessments, + sum(case when payment.paymentmode='ONLINE' then payment.totalamountpaid else 0 end) as "totalonline", + sum(case when payment.paymentmode='ONLINE' then 1 else 0 end) as "countonline", + sum(case when payment.paymentmode='CASH' then payment.totalamountpaid else 0 end) + + sum(case when payment.paymentmode='CHEQUE' then payment.totalamountpaid else 0 end) + + sum(case when payment.paymentmode='DD' then payment.totalamountpaid else 0 end) + + sum(case when payment.paymentmode='CARD' then payment.totalamountpaid else 0 end) + + sum(case when payment.paymentmode='OFFLINE_RTGS' then payment.totalamountpaid else 0 end) + + sum(case when payment.paymentmode='OFFLINE_NEFT' then payment.totalamountpaid else 0 end) + + sum(case when payment.paymentmode='POTAL_ORDER' then payment.totalamountpaid else 0 end) as "totaloffline", + sum(case when payment.paymentmode!='ONLINE' then 1 else 0 end) as "countoffline" + --concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, + (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid!='pb.testing' group by propertyid ) pt_addr + where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid!='pb.testing' + and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id + groupby: GROUP BY payment.tenantid + orderby: ORDER BY payment.tenantid, totalamountpaid DESC NULLS LAST + - reportName: UlbWisePtCollection_V2 + summary: ULB Wide PT Collection + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: totalamountpaid + label: reports.pt.totalamountpaid + type: string + source: pt + total: true + - name: totalassessments + label: reports.pt.totalassessments + type: string + source: pt + total: true + - name: totaloffline + label: reports.pt.totaloffline + type: string + source: pt + total: true + - name: countoffline + label: reports.pt.countoffline + type: string + source: pt + total: true + - name: totalonline + label: reports.pt.totalonline + type: string + source: pt + total: true + - name: countonline + label: reports.pt.countonline + type: string + source: pt + total: true + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: false + searchClause: AND pd.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: false + searchClause: AND pd.receiptdate <= $toDate + - name: financialyear + label: Financial Year + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name + source: pt + wrapper: true + isMandatory: false + searchClause: AND concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) + at time Zone 'Asia/Kolkata'),'YYYY'),'-', + to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone + 'Asia/Kolkata'),'YY')) = $financialyear + - name: usage + label: Usage + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=PropertyTax&masterName=UsageCategoryMajor|$..code|$..name + source: pt + wrapper: true + isMandatory: false + searchClause: AND pt.usagecategory = $usage + query: > + SELECT + --initcap(split_part(payment.tenantid, '.', 2)) as tenantid, + sum(payment.totalamountpaid) as totalamountpaid, + count(payment.totalamountpaid) as totalassessments, + sum(case when payment.paymentmode='ONLINE' then payment.totalamountpaid else 0 end) as "totalonline", + sum(case when payment.paymentmode='ONLINE' then 1 else 0 end) as "countonline", + sum(case when payment.paymentmode='CASH' then payment.totalamountpaid else 0 end) + + sum(case when payment.paymentmode='CHEQUE' then payment.totalamountpaid else 0 end) + + sum(case when payment.paymentmode='DD' then payment.totalamountpaid else 0 end) + + sum(case when payment.paymentmode='CARD' then payment.totalamountpaid else 0 end) + + sum(case when payment.paymentmode='OFFLINE_RTGS' then payment.totalamountpaid else 0 end) + + sum(case when payment.paymentmode='OFFLINE_NEFT' then payment.totalamountpaid else 0 end) + + sum(case when payment.paymentmode='POTAL_ORDER' then payment.totalamountpaid else 0 end) as "totaloffline", + sum(case when payment.paymentmode!='ONLINE' then 1 else 0 end) as "countoffline" + --concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, + (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr + where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id + - reportName: ReceiptRegisterShort_V2 + decryptionPathId: ReceiptRegisterShort_V2 + summary: Receipt Register + version: 1.0.0 + moduleName: rainmaker-pt + additionalConfig: + print: + pdfPageSize: Legal + sourceColumns: + - name: receiptnumber + label: reports.pt.receiptNo + type: string + source: pt + total: false + - name: transactiondate + label: reports.pt.receiptDate + type: string + source: pt + total: false + - name: g8receiptno + label: reports.pt.g8book + type: string + source: pt + total: false + - name: g8issuedate + label: reports.pt.g8dated + type: string + source: pt + total: false + - name: propertyid + label: reports.pt.ptrId + type: string + source: pt + total: false + - name: financialyear + label: reports.pt.financialYear + type: string + source: pt + total: false + - name: instrumenttype + label: reports.pt.paymentMode + type: string + source: pt + total: false + - name: amount + label: reports.pt.taxamount + type: string + source: pt + total: true + - name: transactionnumber + label: reports.pt.ddChequeNo + type: string + source: pt + total: false + - name: bankname + label: reports.pt.bankName + type: string + source: pt + total: false + - name: collectorname + label: reports.pt.collectorname + type: string + source: pt + total: false + - name: remarks + label: reports.pt.remarks + type: string + source: pt + total: false + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: true + searchClause: AND pd.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: true + searchClause: AND pd.receiptdate <= $toDate + - name: paymentMode + label: Payment Mode + type: singlevaluelist + pattern: list://CARD:Card,CASH:Cash,CHEQUE:Cheque,DD:DD,OFFLINE_NEFT:NEFT,OFFLINE_RTGS:RTGS,ONLINE:Online,POSTAL_ORDER:PostalOrder + source: pt + isMandatory: false + searchClause: AND payment.paymentmode = $paymentMode + - name: financialyear + label: Financial Year + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name + source: pt + wrapper: true + isMandatory: false + searchClause: AND concat(to_char((To_timestamp(bd.fromperiod/1000) at time Zone + 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(bd.toperiod/1000) + at time Zone 'Asia/Kolkata'),'YY')) = $financialyear + - name: localityArray + label: reports.pt.zoneList + type: boundarylist + source: pt + isMandatory: false + searchClause: AND pt_addr.locality IN ($localityArray) + - name: collectorname + label: reports.pt.collectorname + type: singlevaluelist + pattern: http://egov-hrms:8080/egov-hrms/employees/_search?tenantId=$tenantid&roles=PTCEMP|$.Employees[*].user.id|$.Employees[*].user.name + source: pt + wrapper: true + isMandatory: false + searchClause: AND eg_user.id = $collectorname::INTEGER + query: > + -- Use CTE to force query plan, compute & use CTE later + + SELECT + pt.propertyid as propertyid, + to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') as transactiondate, + payment.ifsccode AS bankname, + receiptnumber, + payment.totalamountpaid as amount, + payment.paymentmode as instrumenttype, + payment.transactionnumber as transactionnumber, + --concat(to_char((To_timestamp(bd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(bd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY')) AS financialyear, + concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear, + (case when eg_user.name is null then '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' else eg_user.name end) as collectorname, + --receipt_breakup.*, + to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, + manualreceiptnumber as g8receiptno, + 'NA' as remarks + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, + + (select bill.id as billid, bill.consumercode as consumercodei, min(bd.fromperiod) fromperiod, max(bd.toperiod) toperiod from egcl_billdetial bd, egcl_bill bill + + where bill.id=bd.billid and bill.tenantid = $tenantid group by bill.id) bd, + + (select string_agg(distinct propertyid,',') as propertyid,string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr + + where pd.paymentid=payment.id and bd.billid=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + + and pt.propertyid = bd.consumercodei and pt.status!='INACTIVE' + + and pt_addr.propertyid=pt.id + orderby: ORDER BY pd.receiptdate DESC; + - reportName: ReceiptRegisterShort_WithoutLocality_V2 + decryptionPathId: ReceiptRegisterShort_V2 + summary: Receipt Register + version: 1.0.0 + moduleName: rainmaker-pt + additionalConfig: + print: + pdfPageSize: Legal + sourceColumns: + - name: receiptnumber + label: reports.pt.receiptNo + type: string + source: pt + total: false + - name: transactiondate + label: reports.pt.receiptDate + type: string + source: pt + total: false + - name: g8receiptno + label: reports.pt.g8book + type: string + source: pt + total: false + - name: g8issuedate + label: reports.pt.g8dated + type: string + source: pt + total: false + - name: propertyid + label: reports.pt.ptrId + type: string + source: pt + total: false + - name: financialyear + label: reports.pt.financialYear + type: string + source: pt + total: false + - name: instrumenttype + label: reports.pt.paymentMode + type: string + source: pt + total: false + - name: amount + label: reports.pt.taxamount + type: string + source: pt + total: true + - name: transactionnumber + label: reports.pt.ddChequeNo + type: string + source: pt + total: false + - name: bankname + label: reports.pt.bankName + type: string + source: pt + total: false + - name: collectorname + label: reports.pt.collectorname + type: string + source: pt + total: false + - name: remarks + label: reports.pt.remarks + type: string + source: pt + total: false + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: true + searchClause: AND pd.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: true + searchClause: AND pd.receiptdate <= $toDate + - name: paymentMode + label: Payment Mode + type: singlevaluelist + pattern: list://CARD:Card,CASH:Cash,CHEQUE:Cheque,DD:DD,OFFLINE_NEFT:NEFT,OFFLINE_RTGS:RTGS,ONLINE:Online,POSTAL_ORDER:PostalOrder + source: pt + isMandatory: false + searchClause: AND payment.paymentmode = $paymentMode + - name: financialyear + label: Financial Year + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name + source: pt + wrapper: true + isMandatory: false + searchClause: AND concat(to_char((To_timestamp(bd.fromperiod/1000) at time Zone + 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(bd.toperiod/1000) + at time Zone 'Asia/Kolkata'),'YY')) = $financialyear + - name: collectorname + label: reports.pt.collectorname + type: singlevaluelist + pattern: http://egov-hrms:8080/egov-hrms/employees/_search?tenantId=$tenantid&roles=PTCEMP|$.Employees[*].user.id|$.Employees[*].user.name + source: pt + wrapper: true + isMandatory: false + searchClause: AND eg_user.id = $collectorname::INTEGER + query: > + -- Use CTE to force query plan, compute & use CTE later + + SELECT + pt.propertyid as propertyid, + to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') as transactiondate, + payment.ifsccode AS bankname, + receiptnumber, + payment.totalamountpaid as amount, + payment.paymentmode as instrumenttype, + payment.transactionnumber as transactionnumber, + --concat(to_char((To_timestamp(bd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(bd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY')) AS financialyear, + concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear, + (case when eg_user.name is null then '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' else eg_user.name end) as collectorname, + --receipt_breakup.*, + to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, + manualreceiptnumber as g8receiptno, + 'NA' as remarks + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, + + (select bill.id as billid, bill.consumercode as consumercodei, min(bd.fromperiod) fromperiod, max(bd.toperiod) toperiod from egcl_billdetial bd, egcl_bill bill + + where bill.id=bd.billid and bill.tenantid = $tenantid group by bill.id) bd + + where pd.paymentid=payment.id and bd.billid=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + + and pt.propertyid = bd.consumercodei and pt.status!='INACTIVE' + orderby: ORDER BY pd.receiptdate DESC; + - reportName: ULBPTDataDumpReport_V2 + decryptionPathId: ULBPTDataDumpReport_V2 + summary: ULB level report + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: ulb + label: reports.pt.ulb + type: string + source: pt + total: false + - name: propertytaxuniqueid + label: reports.pt.propertytaxuniqueid + type: string + source: pt + total: false + - name: transcationdate + label: reports.pt.transcationdate + type: string + source: pt + total: false + - name: receiptnumber + label: reports.pt.receiptnumber + type: string + source: pt + total: false + - name: existingpropertyid + label: reports.pt.existingpropertyid + type: string + source: pt + total: false + - name: financialyear + label: reports.pt.financialYear + type: string + source: pt + total: false + - name: ownername + label: reports.pt.ownername + type: string + source: pt + total: false + - name: guardianname + label: reports.pt.guardianname + type: string + source: pt + total: false + - name: totalarea + label: reports.pt.totalarea + type: string + source: pt + total: false + - name: builtarea + label: reports.pt.builtarea + type: string + source: pt + total: false + - name: floors + label: reports.pt.floors + type: string + source: pt + total: false + - name: occupancy + label: reports.pt.occupancy + type: string + source: pt + total: false + - name: propertytype + label: reports.pt.propertytype + type: string + source: pt + total: false + - name: mobileno + label: reports.pt.mobileno + type: string + source: pt + total: false + - name: transcationmode + label: reports.pt.transcationmode + type: string + source: pt + total: false + - name: paymentamount + label: reports.pt.paymentamount + type: string + source: pt + total: true + - name: paymentdate + label: reports.pt.paymentdate + type: string + source: pt + total: false + - name: emailid + label: reports.pt.emailid + type: string + source: pt + total: false + - name: address + label: reports.pt.address + type: string + source: pt + total: false + - name: payeraddress + label: reports.pt.payeraddress + type: string + source: pt + total: false + - name: remarks + label: reports.pt.remarks + type: string + source: pt + total: false + - name: businessname + label: reports.pt.businessname + type: string + source: pt + total: false + - name: localitycode + label: reports.pt.localitycode + type: string + source: pt + total: false + - name: localityname + label: reports.pt.localityname + type: string + source: pt + total: false + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: true + searchClause: AND payd.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: true + searchClause: AND payd.receiptdate <= $toDate + - name: financialyear + label: Financial Year + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name + source: pt + wrapper: true + isMandatory: false + searchClause: AND concat(to_char((To_timestamp(billd.fromperiod/1000) at time + Zone 'Asia/Kolkata'),'YYYY'),'-', + to_char((To_timestamp(billd.toperiod/1000) at time Zone + 'Asia/Kolkata'),'YY')) = $financialyear + - name: paymentMode + label: Payment Mode + type: singlevaluelist + pattern: list://CARD:Card,CASH:Cash,CHEQUE:Cheque,DD:DD,OFFLINE_NEFT:NEFT,OFFLINE_RTGS:RTGS,ONLINE:Online,POSTAL_ORDER:PostalOrder + source: pt + isMandatory: false + searchClause: AND payment.paymentmode = $paymentMode + - name: localityArray + label: reports.pt.zoneList + type: boundarylist + source: pt + isMandatory: false + searchClause: AND pta.locality IN ($localityArray) + query: > + --S.no Service Name ULB Property Tax Unique ID Date Of + Transcation Receipt Number Existing Property ID Owner + Name Guardian Name Total Area (SQ.YARD) Covered Area/Built Area + (SQ.FEET) Floors Occupancy (Rented,Self /Unoccupied) Type Of + Property Mobile Number Transcation Mode of Payment Payment + Amount Payment Date Email Id Address + + with eg_pt_unit_v2_ot as ( + select + propertyid, + string_agg(distinct pu.occupancytype, ',') as occupancytype, + string_agg(distinct Initcap(case when usagecategory like '%.%' then split_part(usagecategory,'.',2) else usagecategory end),',') as propertytype + from eg_pt_unit as pu + where pu.tenantid = $tenantid + group by propertyid + ) + select + distinct on (payd.receiptnumber) + initcap(split_part(payd.tenantid, '.', 2)) as "ulb", + split_part(consumercode, ':', 1) as "propertytaxuniqueid", + to_char((To_timestamp(receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS "transcationdate", + receiptnumber as "receiptnumber", + pt.oldpropertyid as "existingpropertyid", + concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) AS "financialyear", + eu."name" as "ownername", + eu.guardian as "guardianname", + pt.landarea as "totalarea", + pt.superbuiltuparea * 9 as "builtarea", + pt.nooffloors as "floors", + eu.mobilenumber as "mobileno", + paymentmode as "transcationmode", + payment.totalamountpaid as "paymentamount", + to_char((To_timestamp(payment.transactiondate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS "paymentdate", + eu.emailid as "emailid", + REGEXP_REPLACE(REGEXP_REPLACE(CONCAT(pta.doorno, ',', pta.buildingname, ',',pta.street,',', pta.pincode), ',+', ','), '^,|,$', '') as "address", + payment.payeraddress as "payeraddress", + pt.additionaldetails->>'remarks' as "remarks", + pt.additionaldetails->>'FirmBusinessName' as "businessname", + pot.occupancytype as occupancy, + pot.propertytype as propertytype, + pta.locality as "localitycode", + localnames.localityname as localityname + from egcl_paymentdetail as payd + + inner join egcl_payment as payment on payment.id = payd.paymentid + + inner join egcl_bill as bill on bill.id = payd.billid + + inner join egcl_billdetial as billd on billd.billid=bill.id + + inner join eg_pt_property as pt on pt.propertyid = bill.consumercode + + inner join eg_pt_owner as po on po.propertyid = pt.id and po.status='ACTIVE' + + inner join eg_user as eu on eu.uuid = po.userid + + inner join eg_pt_address as pta on pta.propertyid = pt.id + + left outer join eg_bndry_mohalla as localnames on pta.locality=localnames.localitycode + + left outer join eg_pt_unit_v2_ot as pot on pot.propertyid = pt.id + + where payd.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and payd.businessservice='PT' and pt.status!='INACTIVE' + - reportName: Sewa_Kendra_ReceiptRegister_V2 + summary: Sewa Kendra Receipt Register + version: 1.0.0 + moduleName: rainmaker-pt + additionalConfig: + print: + pdfPageSize: A1 + sourceColumns: + - name: receiptnumber + label: reports.pt.receiptNo + type: string + source: pt + total: false + - name: receiptdate + label: reports.pt.receiptDate + type: string + source: pt + total: false + - name: g8issuedate + label: reports.pt.g8issuedate + type: string + source: pt + total: false + - name: g8receiptno + label: reports.pt.g8receiptno + type: string + source: pt + total: false + - name: amount + label: reports.pt.amount + type: string + source: pt + total: true + - name: propertytax + label: reports.pt.propertyTax + type: string + source: pt + total: true + - name: firecess + label: reports.pt.fireCess + type: string + source: pt + total: true + - name: cancercess + label: reports.pt.cancerCess + type: string + source: pt + total: true + - name: rebate + label: reports.pt.rebate + type: string + source: pt + total: true + - name: adhocrebate + label: reports.pt.adhocrebate + type: string + source: pt + total: true + - name: penalty + label: reports.pt.penalty + type: string + source: pt + total: true + - name: adhocpenalty + label: reports.pt.adhocpenalty + type: string + source: pt + total: true + - name: interest + label: reports.pt.interest + type: string + source: pt + total: true + - name: exemption + label: reports.pt.exemption + type: string + source: pt + total: true + - name: adjustment + label: reports.pt.roundoff + type: string + source: pt + total: true + - name: pendingamount + label: reports.pt.pendingamount + type: string + source: pt + total: true + - name: propertyid + label: reports.pt.propertyId + type: string + source: pt + total: false + - name: usagetype + label: reports.pt.usagetype + type: string + source: pt + total: false + - name: assessmentnumber + label: reports.pt.assessmentNo + type: string + source: pt + total: false + - name: financialyear + label: reports.pt.financialYear + type: string + source: pt + total: false + - name: instrumenttype + label: reports.pt.paymentMode + type: string + source: pt + total: false + - name: transactionnumber + label: reports.pt.ddChequeTransactionNo + type: string + source: pt + total: false + - name: transactiondate + label: reports.pt.ddChequeTransactionDate + type: string + source: pt + total: false + - name: bankname + label: reports.pt.bankName + type: string + source: pt + total: false + - name: collectorname + label: reports.pt.collectorname + type: string + source: pt + total: false + - name: remarks + label: reports.pt.remarks + type: string + source: pt + total: false + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: true + searchClause: AND rh.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: true + searchClause: AND rh.receiptdate <= $toDate + - name: paymentMode + label: Payment Mode + type: singlevaluelist + pattern: list://CARD:Card,CASH:Cash,CHEQUE:Cheque,DD:DD,OFFLINE_NEFT:NEFT,OFFLINE_RTGS:RTGS,ONLINE:Online,POSTAL_ORDER:PostalOrder + source: pt + isMandatory: false + searchClause: AND instrumenttype = $paymentMode + - name: financialyear + label: Financial Year + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name + source: pt + wrapper: true + isMandatory: false + searchClause: AND financialyear = $financialyear + - name: localityArray + label: reports.pt.zoneList + type: boundarylist + source: pt + isMandatory: false + searchClause: AND pt_addr.locality IN ($localityArray) + query: > + -- Use CTE to force query plan, compute & use CTE later + WITH receipt_breakup AS ( + SELECT + receiptnumber, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, + SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as propertytax, + (SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN adjustedamount ELSE 0 END) )as exemption, + ( SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END)) as adjustment + FROM egcl_billaccountdetail as bad + INNER JOIN egcl_billdetial as bd on bd.id = bad.billdetailid + INNER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid + INNER JOIN egcl_payment as payment on pd.paymentid=payment.id + WHERE bd.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' + and pd.createdby::INTEGER in (select user_id from eg_userrole_v1 where role_code ='SEVA_KENDRA_EMP') + GROUP BY pd.receiptnumber + ) + + SELECT + bill.tenantid AS tenantid, + bill.id, + pt_detail.property AS propertyid, + pt_detail.assessmentnumber AS assessmentnumber, + bill.consumercode, + pd.receiptdate, + to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, + payment.ifsccode AS bankname, + pd.receiptnumber, + payment.totalamountpaid as amount, + payment.paymentmode as instrumenttype, + payment.transactionnumber, + receipt_breakup.*, + pd.due AS pendingamount, + pt_detail.financialyear, + to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, + Initcap(COALESCE(pt_detail.usagecategoryminor, pt_detail.usagecategorymajor)) as usagetype, + manualreceiptnumber as g8receiptno, + (CASE WHEN collectiontype='COUNTER' THEN eg_user.name ELSE '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' END) as collectorname, + pt_detail.additionaldetails->>'remarks' as "remarks" + FROM egcl_bill AS bill + + INNER JOIN egcl_billdetial as bd on bd.billid = bill.id + + LEFT OUTER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid + + LEFT OUTER JOIN egcl_payment as payment on pd.paymentid=payment.id + + JOIN eg_pt_propertydetail_v2 pt_detail ON pt_detail.property = bill.consumercode + + JOIN eg_pt_address_v2 pt_addr ON pt_detail.property = pt_addr.property + + JOIN receipt_breakup ON receipt_breakup.receiptnumber = pd.receiptnumber + + LEFT OUTER JOIN eg_user ON eg_user.id = pd.createdby::INTEGER + + WHERE bd.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and pd.createdby::INTEGER in (select user_id + + FROM eg_userrole_v1 where role_code ='SEVA_KENDRA_EMP') + orderby: ORDER BY pd.receiptdate DESC + - reportName: ReceiptRegisterSummary_V2 + decryptionPathId: ReceiptRegisterShort_V2 + summary: Receipt Register Summary + version: 1.0.0 + moduleName: rainmaker-pt + additionalConfig: + print: + pdfPageSize: A1 + sourceColumns: + - name: ulb + label: reports.pt.ulb + type: string + source: pt + total: false + - name: adhocpenalty + label: reports.pt.adhocpenalty + type: string + source: pt + total: true + - name: adhocrebate + label: reports.pt.adhocrebate + type: string + source: pt + total: true + - name: firecess + label: reports.pt.firecess + type: string + source: pt + total: true + - name: cancercess + label: reports.pt.cancercess + type: string + source: pt + total: true + - name: interest + label: reports.pt.interest + type: string + source: pt + total: true + - name: penalty + label: reports.pt.penalty + type: string + source: pt + total: true + - name: rebate + label: reports.pt.rebate + type: string + source: pt + total: true + - name: propertytax + label: reports.pt.propertytax + type: string + source: pt + total: true + - name: exemption + label: reports.pt.exemption + type: string + source: pt + total: true + - name: adjustment + label: reports.pt.adjustment + type: string + source: pt + total: true + - name: noofassessments + label: reports.pt.noofassessments + type: string + source: pt + total: true + - name: sumcash + label: reports.pt.sumcash + type: string + source: pt + total: true + - name: sumcheque + label: reports.pt.sumcheque + type: string + source: pt + total: true + - name: countcheque + label: reports.pt.countcheque + type: string + source: pt + total: true + - name: sumonline + label: reports.pt.sumonline + type: string + source: pt + total: true + - name: totalamount + label: reports.pt.totalamount + type: string + source: pt + total: true + - name: collectorname + label: reports.pt.collectorname + type: string + source: pt + total: false + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: true + searchClause: AND pd.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: true + searchClause: AND pd.receiptdate <= $toDate + - name: collectorname + label: reports.pt.collectorname + type: singlevaluelist + pattern: http://egov-hrms:8080/egov-hrms/employees/_search?tenantId=$tenantid&roles=PTCEMP|$.Employees[*].user.id|$.Employees[*].user.name + source: pt + wrapper: true + isMandatory: false + searchClause: AND eg_user.id = $collectorname::INTEGER + query: > + -- Use CTE to force query plan, compute & use CTE later + + SELECT + split_part(bd.tenantid,'.',2) as ulb, + Count (distinct pd.paymentid) as noofassessments, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, + SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as propertytax, + (SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN adjustedamount ELSE 0 END) )as exemption, + ( SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END)) as adjustment, + sum(case when payment.paymentmode='CASH' then bad.adjustedamount else 0 end) as sumcash, + sum(case when payment.paymentmode='CHEQUE' then bad.adjustedamount else 0 end) as sumcheque, + count (distinct case when payment.paymentmode='CHEQUE' then concat(payment.paymentmode) end) as countcheque, + sum(case when payment.paymentmode='ONLINE' then bad.adjustedamount else 0 end) as sumonline, + (CASE WHEN collectiontype='COUNTER' THEN eg_user.name ELSE '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' END) as collectorname, --for Online collecion show None as collectorname + sum(adjustedamount) as totalamount + FROM egcl_billaccountdetail as bad + + INNER JOIN egcl_billdetial as bd on bd.id = bad.billdetailid + + INNER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid + + INNER JOIN egcl_payment as payment on pd.paymentid=payment.id + + LEFT OUTER JOIN eg_user ON eg_user.id = pd.createdby::INTEGER + + WHERE bd.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' + groupby: group by collectorname,bd.tenantid + - reportName: StateReceiptRegisterSummary_V2 + summary: Receipt Register Summary + version: 1.0.0 + moduleName: rainmaker-pt + additionalConfig: + print: + pdfPageSize: A1 + sourceColumns: + - name: ulb + label: reports.pt.ulb + type: string + source: pt + total: false + - name: adhocpenalty + label: reports.pt.adhocpenalty + type: string + source: pt + total: true + - name: adhocrebate + label: reports.pt.adhocrebate + type: string + source: pt + total: true + - name: firecess + label: reports.pt.firecess + type: string + source: pt + total: true + - name: cancercess + label: reports.pt.cancercess + type: string + source: pt + total: true + - name: interest + label: reports.pt.interest + type: string + source: pt + total: true + - name: penalty + label: reports.pt.penalty + type: string + source: pt + total: true + - name: rebate + label: reports.pt.rebate + type: string + source: pt + total: true + - name: propertytax + label: reports.pt.propertytax + type: string + source: pt + total: true + - name: exemption + label: reports.pt.exemption + type: string + source: pt + total: true + - name: adjustment + label: reports.pt.adjustment + type: string + source: pt + total: true + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: false + searchClause: AND pd.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: false + searchClause: AND pd.receiptdate <= $toDate + - name: ulb + label: ULB + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: pt + wrapper: true + isMandatory: false + searchClause: AND bd.tenantid = $ulb + query: > + -- Use CTE to force query plan, compute & use CTE later + + SELECT + split_part(bd.tenantid,'.',2) as ulb, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, + SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as propertytax, + (SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN adjustedamount ELSE 0 END) )as exemption, + ( SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END)) as adjustment + FROM egcl_billaccountdetail as bad + + INNER JOIN egcl_billdetial as bd on bd.id = bad.billdetailid + + INNER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid + + WHERE bd.tenantid != 'pb.testing' and pd.businessservice='PT' + groupby: group by bd.tenantid + orderby: order by bd.tenantid + - reportName: FYCollectionsReport_V2 + summary: FY Collections + version: 1.0.0 + moduleName: rainmaker-pt + additionalConfig: + print: + pdfPageSize: Legal + sourceColumns: + - name: financialyear + label: reports.pt.financialyear + type: string + source: pt + total: false + - name: residential + label: reports.pt.residential + type: string + source: pt + total: true + - name: countresidential + label: reports.pt.countresidential + type: string + source: pt + total: true + - name: nonresidential + label: reports.pt.nonresidential + type: string + source: pt + total: true + - name: countnonresidential + label: reports.pt.countnonresidential + type: string + source: pt + total: true + - name: mixed + label: reports.pt.mixed + type: string + source: pt + total: true + - name: countmixed + label: reports.pt.countmixed + type: string + source: pt + total: true + - name: totalamount + label: reports.pt.totalamount + type: string + source: pt + total: true + - name: totalcount + label: reports.pt.totalcount + type: string + source: pt + total: true + - name: online + label: reports.pt.online + type: string + source: pt + total: true + - name: cash + label: reports.pt.cash + type: string + source: pt + total: true + - name: cheque + label: reports.pt.cheque + type: string + source: pt + total: true + - name: dd + label: reports.pt.dd + type: string + source: pt + total: true + - name: card + label: reports.pt.card + type: string + source: pt + total: true + - name: neft + label: reports.pt.neft + type: string + source: pt + total: true + - name: rtgs + label: reports.pt.rtgs + type: string + source: pt + total: true + - name: po + label: reports.pt.po + type: string + source: pt + total: true + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: false + searchClause: AND pd.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: false + searchClause: AND pd.receiptdate <= $toDate + - name: localityArray + label: reports.pt.zoneList + type: boundarylist + source: pt + isMandatory: false + searchClause: AND pt_addr.locality IN ($localityArray) + query: > + -- Use CTE to force query plan, compute & use CTE later + + SELECT + sum(payment.totalamountpaid) as totalamount, + count(payment.totalamountpaid) as totalcount, + sum(case when payment.paymentmode='ONLINE' then payment.totalamountpaid else 0 end) as "online", + sum(case when payment.paymentmode='CASH' then payment.totalamountpaid else 0 end) as "cash", + sum(case when payment.paymentmode='CHEQUE' then payment.totalamountpaid else 0 end) as "cheque", + sum(case when payment.paymentmode='DD' then payment.totalamountpaid else 0 end) as "dd", + sum(case when payment.paymentmode='CARD' then payment.totalamountpaid else 0 end) as "card", + sum(case when payment.paymentmode='OFFLINE_RTGS' then payment.totalamountpaid else 0 end) as "rtgs", + sum(case when payment.paymentmode='OFFLINE_NEFT' then payment.totalamountpaid else 0 end) as "neft", + sum(case when payment.paymentmode='POTAL_ORDER' then payment.totalamountpaid else 0 end) as "po", + sum(case when split_part(pt.usagecategory, '.', 1)='RESIDENTIAL' then payment.totalamountpaid else 0 end) as "residential", + sum(case when split_part(pt.usagecategory, '.', 1)='RESIDENTIAL' then 1 else 0 end) as "countresidential", + sum(case when split_part(pt.usagecategory, '.', 1) = 'NONRESIDENTIAL' then payment.totalamountpaid else 0 end) as "nonresidential", + sum(case when pt.usagecategory like 'NONRESIDENTIAL%' then 1 else 0 end) as "countnonresidential", + sum(case when pt.usagecategory='MIXED' then payment.totalamountpaid else 0 end) as "mixed", + sum(case when pt.usagecategory='MIXED' then 1 else 0 end) as "countmixed", + concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, + + (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr + + where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + + and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id + groupby: GROUP BY financialyear + orderby: ORDER BY financialyear + - reportName: FYCollectionsReport_WithoutLocality_V2 + summary: FY Collections + version: 1.0.0 + moduleName: rainmaker-pt + additionalConfig: + print: + pdfPageSize: Legal + sourceColumns: + - name: financialyear + label: reports.pt.financialyear + type: string + source: pt + total: false + - name: residential + label: reports.pt.residential + type: string + source: pt + total: true + - name: countresidential + label: reports.pt.countresidential + type: string + source: pt + total: true + - name: nonresidential + label: reports.pt.nonresidential + type: string + source: pt + total: true + - name: countnonresidential + label: reports.pt.countnonresidential + type: string + source: pt + total: true + - name: mixed + label: reports.pt.mixed + type: string + source: pt + total: true + - name: countmixed + label: reports.pt.countmixed + type: string + source: pt + total: true + - name: totalamount + label: reports.pt.totalamount + type: string + source: pt + total: true + - name: totalcount + label: reports.pt.totalcount + type: string + source: pt + total: true + - name: online + label: reports.pt.online + type: string + source: pt + total: true + - name: cash + label: reports.pt.cash + type: string + source: pt + total: true + - name: cheque + label: reports.pt.cheque + type: string + source: pt + total: true + - name: dd + label: reports.pt.dd + type: string + source: pt + total: true + - name: card + label: reports.pt.card + type: string + source: pt + total: true + - name: neft + label: reports.pt.neft + type: string + source: pt + total: true + - name: rtgs + label: reports.pt.rtgs + type: string + source: pt + total: true + - name: po + label: reports.pt.po + type: string + source: pt + total: true + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: false + searchClause: AND pd.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: false + searchClause: AND pd.receiptdate <= $toDate + query: > + -- Use CTE to force query plan, compute & use CTE later + + SELECT + sum(payment.totalamountpaid) as totalamount, + count(payment.totalamountpaid) as totalcount, + sum(case when payment.paymentmode='ONLINE' then payment.totalamountpaid else 0 end) as "online", + sum(case when payment.paymentmode='CASH' then payment.totalamountpaid else 0 end) as "cash", + sum(case when payment.paymentmode='CHEQUE' then payment.totalamountpaid else 0 end) as "cheque", + sum(case when payment.paymentmode='DD' then payment.totalamountpaid else 0 end) as "dd", + sum(case when payment.paymentmode='CARD' then payment.totalamountpaid else 0 end) as "card", + sum(case when payment.paymentmode='OFFLINE_RTGS' then payment.totalamountpaid else 0 end) as "rtgs", + sum(case when payment.paymentmode='OFFLINE_NEFT' then payment.totalamountpaid else 0 end) as "neft", + sum(case when payment.paymentmode='POTAL_ORDER' then payment.totalamountpaid else 0 end) as "po", + sum(case when split_part(pt.usagecategory, '.', 1)='RESIDENTIAL' then payment.totalamountpaid else 0 end) as "residential", + sum(case when split_part(pt.usagecategory, '.', 1)='RESIDENTIAL' then 1 else 0 end) as "countresidential", + sum(case when split_part(pt.usagecategory, '.', 1) = 'NONRESIDENTIAL' then payment.totalamountpaid else 0 end) as "nonresidential", + sum(case when pt.usagecategory like 'NONRESIDENTIAL%' then 1 else 0 end) as "countnonresidential", + sum(case when pt.usagecategory='MIXED' then payment.totalamountpaid else 0 end) as "mixed", + sum(case when pt.usagecategory='MIXED' then 1 else 0 end) as "countmixed", + concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill + + where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + + and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' + groupby: GROUP BY financialyear + orderby: ORDER BY financialyear + - reportName: ULBDEFAULTERPTREPORT_V2 + decryptionPathId: ULBDEFAULTERPTREPORT_V2 + summary: ULB Defaulter Pt report + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: ulb + label: reports.pt.ulb + type: string + source: pt + total: false + - name: propertytaxuniqueid + label: reports.pt.propertytaxuniqueid + type: string + source: pt + total: false + - name: transcationdate + label: reports.pt.transcationdate + type: string + source: pt + total: false + - name: receiptnumber + label: reports.pt.receiptnumber + type: string + source: pt + total: false + - name: existingpropertyid + label: reports.pt.existingpropertyid + type: string + source: pt + total: false + - name: financialyear + label: reports.pt.financialYear + type: string + source: pt + total: false + - name: ownername + label: reports.pt.ownername + type: string + source: pt + total: false + - name: guardianname + label: reports.pt.guardianname + type: string + source: pt + total: false + - name: propertytype + label: reports.pt.propertytype + type: string + source: pt + total: false + - name: mobileno + label: reports.pt.mobileno + type: string + source: pt + total: false + - name: address + label: reports.pt.address + type: string + source: pt + total: false + - name: payeraddress + label: reports.pt.payeraddress + type: string + source: pt + total: false + searchParams: + - name: localityArray + label: reports.pt.zoneList + type: boundarylist + source: pt + isMandatory: false + searchClause: AND pta.locality IN ($localityArray) + query: >+ + --S.no Service Name ULB Property Tax Unique ID Date Of + Transcation Receipt Number Existing Property ID Type Of + Property Mobile Number Address + + with eg_pt_unit_v2_ot as ( + select + propertyid, + string_agg(distinct pu.occupancytype, ',') as occupancytype, + --string_agg(distinct coalesce(usagecategory), ',') as propertytype + string_agg(distinct Initcap(case when usagecategory like '%.%' then split_part(usagecategory,'.',2) else usagecategory end),',') as propertytype + from eg_pt_unit as pu + where pu.tenantid = $tenantid + group by propertyid + ) + select + distinct on (payd.receiptnumber) + initcap(split_part(payd.tenantid, '.', 2)) as "ulb", + split_part(consumercode, ':', 1) as "propertytaxuniqueid", + to_char((To_timestamp(payd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS "transcationdate", + payd.receiptnumber as "receiptnumber", + pt.oldpropertyid as "existingpropertyid", + concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) AS "financialyear", + eu."name" as "ownername", + eu.guardian as "guardianname", + pot.propertytype as "propertytype", + eu.mobilenumber as "mobileno", + REGEXP_REPLACE(REGEXP_REPLACE(CONCAT(pta.doorno, ',', pta.buildingname, ',',pta.street,',', pta.pincode), ',+', ','), '^,|,$', '') as "address" + from egcl_paymentdetail as payd + inner join egcl_payment as payment on payment.id = payd.paymentid + inner join egcl_bill as bill on bill.id = payd.billid + inner join egcl_billdetial as billd on billd.billid=bill.id + inner join eg_pt_property as pt on pt.propertyid = bill.consumercode + inner join eg_pt_owner as po on po.propertyid = pt.id and po.status='ACTIVE' + inner join eg_user as eu on eu.uuid = po.userid + inner join eg_pt_address as pta on pta.propertyid = pt.id + left outer join eg_pt_unit_v2_ot as pot on pot.propertyid = pt.id + where payd.tenantid = $tenantid + and bill.consumercode not in (select consumercode from egcl_bill where tenantid=$tenantid and businessservice='PT' and id in (select billid from egcl_billdetial where tenantid=$tenantid and concat(to_char((To_timestamp(fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) ='2020-21')) + and pt.status!='INACTIVE' + + - reportName: ULBDEFAULTERPTREPORT_NEW_V2 + decryptionPathId: ULBDEFAULTERPTREPORT_V2 + summary: ULB Defaulter Pt report + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: propertytaxuniqueid + label: reports.pt.propertytaxuniqueid + type: string + source: pt + total: false + - name: existingpropertyid + label: reports.pt.existingpropertyid + type: string + source: pt + total: false + - name: ownername + label: reports.pt.ownername + type: string + source: pt + total: false + - name: propertytype + label: reports.pt.propertytype + type: string + source: pt + total: false + - name: mobileno + label: reports.pt.mobileno + type: string + source: pt + total: false + - name: address + label: reports.pt.address + type: string + source: pt + total: false + searchParams: + - name: localityArray + label: reports.pt.zoneList + type: boundarylist + source: pt + isMandatory: false + searchClause: AND pta.locality IN ($localityArray) + query: > + --S.no Service Name ULB Property Tax Unique ID Date Of + Transcation Receipt Number Existing Property ID Type Of + Property Mobile Number Address + with eg_pt_unit_v2_ot as ( + select + propertyid, + string_agg(distinct pu.occupancytype, ',') as occupancytype, + --string_agg(distinct coalesce(usagecategory), ',') as propertytype + string_agg(distinct Initcap(case when usagecategory like '%.%' then split_part(usagecategory,'.',2) else usagecategory end),',') as propertytype + from eg_pt_unit as pu + where pu.tenantid = $tenantid + group by propertyid + ) + select + --distinct on (payd.receiptnumber) + --initcap(split_part(payd.tenantid, '.', 2)) as "ulb", + --split_part(consumercode, ':', 1) as "propertytaxuniqueid", + --to_char((To_timestamp(payd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS "transcationdate", + --payd.receiptnumber as "receiptnumber", + pt.propertyid as "propertytaxuniqueid", + string_agg(pt.oldpropertyid,',') as "existingpropertyid", + --concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) AS "financialyear", + split_part(string_agg(eu."name",','),',',1) as "ownername", --first owner + --eu.guardian as "guardianname", + string_agg(pot.propertytype,',') as "propertytype", + split_part(string_agg(eu.mobilenumber,','),',',1) as "mobileno", + --string_agg(distinct REGEXP_REPLACE(REGEXP_REPLACE(CONCAT(pta.doorno, ',', pta.buildingname, ',',pta.street,',', pta.pincode), ',+', ','), '^,|,$', ''),',') as "address", + string_agg(distinct concat(pta.doorno,',',pta.plotno,',',pta.buildingname,',',pta.street,',',pta.landmark,',',eg_bndry_mohalla.localityname,',',pta.city),',') as "address" + from eg_pt_property pt + --inner join egcl_payment as payment on payment.id = payd.paymentid + --inner join egcl_bill as bill on bill.id = payd.billid + --inner join egcl_billdetial as billd on billd.billid=bill.id + --inner join as pt on pt.propertyid = bill.consumercode + inner join eg_pt_owner as po on po.propertyid = pt.id and po.status='ACTIVE' + inner join eg_user as eu on eu.uuid = po.userid + inner join eg_pt_address as pta on pta.propertyid = pt.id + inner join eg_pt_unit_v2_ot as pot on pot.propertyid = pt.id + inner join eg_bndry_mohalla on eg_bndry_mohalla.localitycode=pta.locality + where pt.tenantid = $tenantid + --and bill.consumercode not in (select consumercode from egcl_bill where tenantid=$tenantid and businessservice='PT' and id in (select billid from egcl_billdetial where tenantid=$tenantid and concat(to_char((To_timestamp(fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) ='2020-21')) + and pt.status!='INACTIVE' + and pt.propertyid not in (select consumercode from egcl_bill where tenantid=$tenantid and businessservice='PT' and id in (select billid from egcl_billdetial where tenantid=$tenantid and concat(to_char((To_timestamp(fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) ='2020-21')) + groupby: group by pt.propertyid + - reportName: ULBDEFAULTERPTREPORT_MINI_STATE_V2 + decryptionPathId: ULBDEFAULTERPTREPORT_V2 + summary: ULB Defaulter Pt report + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: propertytaxuniqueid + label: reports.pt.propertytaxuniqueid + type: string + source: pt + total: false + - name: existingpropertyid + label: reports.pt.existingpropertyid + type: string + source: pt + total: false + - name: ownername + label: reports.pt.ownername + type: string + source: pt + total: false + - name: propertytype + label: reports.pt.propertytype + type: string + source: pt + total: false + - name: mobileno + label: reports.pt.mobileno + type: string + source: pt + total: false + - name: address + label: reports.pt.address + type: string + source: pt + total: false + searchParams: + - name: ulb + label: ULB + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: pt + wrapper: true + isMandatory: false + searchClause: AND tenantid = $ulb + query: > + --S.no Service Name ULB Property Tax Unique ID Date Of + Transcation Receipt Number Existing Property ID Type Of + Property Mobile Number Address + with eg_pt_unit_v2_ot as ( + select + propertyid, + string_agg(distinct pu.occupancytype, ',') as occupancytype, + --string_agg(distinct coalesce(usagecategory), ',') as propertytype + string_agg(distinct Initcap(case when usagecategory like '%.%' then split_part(usagecategory,'.',2) else usagecategory end),',') as propertytype + from eg_pt_unit as pu + where pu.tenantid = $ulb + group by propertyid + ) + select + --distinct on (payd.receiptnumber) + --initcap(split_part(payd.tenantid, '.', 2)) as "ulb", + --split_part(consumercode, ':', 1) as "propertytaxuniqueid", + --to_char((To_timestamp(payd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS "transcationdate", + --payd.receiptnumber as "receiptnumber", + pt.propertyid as "propertytaxuniqueid", + string_agg(pt.oldpropertyid,',') as "existingpropertyid", + --concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) AS "financialyear", + split_part(string_agg(eu."name",','),',',1) as "ownername", + --eu.guardian as "guardianname", + string_agg(pot.propertytype,',') as "propertytype", + split_part(string_agg(eu.mobilenumber,','),',',1) as "mobileno", + string_agg(distinct REGEXP_REPLACE(REGEXP_REPLACE(CONCAT(pta.doorno, ',', pta.buildingname, ',',pta.street,',', pta.pincode), ',+', ','), '^,|,$', ''),',') as "address" + from eg_pt_property pt + --inner join egcl_payment as payment on payment.id = payd.paymentid + --inner join egcl_bill as bill on bill.id = payd.billid + --inner join egcl_billdetial as billd on billd.billid=bill.id + --inner join as pt on pt.propertyid = bill.consumercode + inner join eg_pt_owner as po on po.propertyid = pt.id and po.status='ACTIVE' + inner join eg_user as eu on eu.uuid = po.userid + inner join eg_pt_address as pta on pta.propertyid = pt.id + inner join eg_pt_unit_v2_ot as pot on pot.propertyid = pt.id + where pt.tenantid = $ulb + --and bill.consumercode not in (select consumercode from egcl_bill where tenantid=$ulb and businessservice='PT' and id in (select billid from egcl_billdetial where tenantid=$ulb and concat(to_char((To_timestamp(fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) ='2020-21')) + and pt.status!='INACTIVE' + and pt.propertyid not in (select consumercode from egcl_bill where tenantid=$ulb and businessservice='PT' and id in (select billid from egcl_billdetial where tenantid=$ulb and concat(to_char((To_timestamp(fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) ='2020-21')) + groupby: group by pt.propertyid + - reportName: ZoneFYReport_V2 + summary: Zone FY Collection + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: zonecode + label: reports.pt.zonename + type: string + source: pt + total: false + - name: 2013_14PTR + label: reports.pt.2013_14_PTR + type: string + source: pt + total: true + - name: 2013_14Collection + label: reports.pt.2013_14Collection + type: string + source: pt + total: true + - name: 2014_15PTR + label: reports.pt.2014_15_PTR + type: string + source: pt + total: true + - name: 2014_15Collection + label: reports.pt.2014_15Collection + type: string + source: pt + total: true + - name: 2015_16PTR + label: reports.pt.2015_16_PTR + type: string + source: pt + total: true + - name: 2015_16Collection + label: reports.pt.2015_16Collection + type: string + source: pt + total: true + - name: 2016_17PTR + label: reports.pt.2016_17_PTR + type: string + source: pt + total: true + - name: 2016_17Collection + label: reports.pt.2016_17Collection + type: string + source: pt + total: true + - name: 2017_18PTR + label: reports.pt.2017_18_PTR + type: string + source: pt + total: true + - name: 2017_18Collection + label: reports.pt.2017_18Collection + type: string + source: pt + total: true + - name: 2018_19PTR + label: reports.pt.2018_19_PTR + type: string + source: pt + total: true + - name: 2018_19Collection + label: reports.pt.2018_19Collection + type: string + source: pt + total: true + - name: 2019_20PTR + label: reports.pt.2019_20_PTR + type: string + source: pt + total: true + - name: 2019_20Collection + label: reports.pt.2019_20Collection + type: string + source: pt + total: true + - name: 2020_21PTR + label: reports.pt.2020_21_PTR + type: string + source: pt + total: true + - name: 2020_21Collection + label: reports.pt.2020_21Collection + type: string + source: pt + total: true + - name: totalptr + label: reports.pt.totalptr + type: string + source: pt + total: true + - name: totalcollection + label: reports.pt.totalcollection + type: string + source: pt + total: true + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: true + searchClause: AND 1=1 + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: true + searchClause: AND 1=1 + query: > + --S.no Service Name ULB Property Tax Unique ID Date Of + Transcation Receipt Number Existing Property ID Type Of Property + Mobile Number Address + with fy2013 as + ( + SELECT + zonecode, + sum(payment.totalamountpaid) as amount, + count(payment.totalamountpaid) as totalcount, + concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, + (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr + INNER JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality and eg_bndry_mohalla.tenantid=$tenantid + where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id + and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY'))='2013-14' + and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate + GROUP BY financialyear,zonecode + + ), + fy2014 as + ( + SELECT + zonecode, + sum(payment.totalamountpaid) as amount, + count(payment.totalamountpaid) as totalcount, + concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, + (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr + INNER JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality and eg_bndry_mohalla.tenantid=$tenantid + where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id + and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY'))='2014-15' + and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate + GROUP BY financialyear,zonecode + ), + fy2015 as + ( + SELECT + zonecode, + sum(payment.totalamountpaid) as amount, + count(payment.totalamountpaid) as totalcount, + concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, + (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr + INNER JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality and eg_bndry_mohalla.tenantid=$tenantid + where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id + and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY'))='2015-16' + and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate + GROUP BY financialyear,zonecode + ), + fy2016 as + ( + SELECT + zonecode, + sum(payment.totalamountpaid) as amount, + count(payment.totalamountpaid) as totalcount, + concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, + (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr + inner JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality + where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id + and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY'))='2016-17' + and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate + GROUP BY financialyear,zonecode + ), + fy2017 as + ( + SELECT + zonecode, + sum(payment.totalamountpaid) as amount, + count(payment.totalamountpaid) as totalcount, + concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, + (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr + INNER JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality and eg_bndry_mohalla.tenantid=$tenantid + where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id + and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY'))='2017-18' + and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate + GROUP BY financialyear,zonecode + ), + fy2018 as + ( + SELECT + zonecode, + sum(payment.totalamountpaid) as amount, + count(payment.totalamountpaid) as totalcount, + concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, + (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr + INNER JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality and eg_bndry_mohalla.tenantid=$tenantid + where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id + and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY'))='2018-19' + and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate + GROUP BY financialyear,zonecode + ), + fy2019 as + ( + SELECT + zonecode, + sum(payment.totalamountpaid) as amount, + count(payment.totalamountpaid) as totalcount, + concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, + (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr + INNER JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality and eg_bndry_mohalla.tenantid=$tenantid + where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id + and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY'))='2019-20' + and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate + GROUP BY financialyear,zonecode + ), + fy2020 as + ( + SELECT + zonecode, + sum(payment.totalamountpaid) as amount, + count(payment.totalamountpaid) as totalcount, + concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, + (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr + INNER JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality and eg_bndry_mohalla.tenantid=$tenantid + where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id + and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY'))='2020-21' + and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate + GROUP BY financialyear,zonecode + ), + zones as + ( + select zonecode,string_agg(distinct zonename,',') as zname from eg_bndry_mohalla where tenantid=$tenantid group by zonecode + ) + SELECT + zones.zonecode as zonecode, + zones.zname as zonename, + coalesce(fy2013.totalcount,0) as "2013_14PTR", + coalesce(fy2013.amount,0) as "2013_14Collection", + coalesce(fy2014.totalcount,0) as "2014_15PTR", + coalesce(fy2014.amount,0) as "2014_15Collection", + coalesce(fy2015.totalcount,0) as "2015_16PTR", + coalesce(fy2015.amount,0) as "2015_16Collection", + coalesce(fy2016.totalcount,0) as "2016_17PTR", + coalesce(fy2016.amount,0) as "2016_17Collection", + coalesce(fy2017.totalcount,0) as "2017_18PTR", + coalesce(fy2017.amount,0) as "2017_18Collection", + coalesce(fy2018.totalcount,0) as "2018_19PTR", + coalesce(fy2018.amount,0) as "2018_19Collection", + coalesce(fy2019.totalcount,0) as "2019_20PTR", + coalesce(fy2019.amount,0) as "2019_20Collection", + coalesce(fy2020.totalcount,0) as "2020_21PTR", + coalesce(fy2020.amount,0) as "2020_21Collection", + coalesce(fy2013.totalcount,0)+coalesce(fy2014.totalcount,0)+coalesce(fy2015.totalcount,0)+coalesce(fy2016.totalcount,0)+coalesce(fy2017.totalcount,0)+coalesce(fy2018.totalcount,0)+coalesce(fy2019.totalcount,0)+coalesce(fy2020.totalcount,0) as "totalptr", + coalesce(fy2013.amount,0)+coalesce(fy2014.amount,0)+coalesce(fy2015.amount,0)+coalesce(fy2016.amount,0)+coalesce(fy2017.amount,0)+coalesce(fy2018.amount,0)+coalesce(fy2019.amount,0)+coalesce(fy2020.amount,0) as "totalcollection" + from zones + left outer join fy2013 on fy2013.zonecode=zones.zonecode + left outer join fy2014 on fy2014.zonecode=zones.zonecode + left outer join fy2015 on fy2015.zonecode=zones.zonecode + left outer join fy2016 on fy2016.zonecode=zones.zonecode + left outer join fy2017 on fy2017.zonecode=zones.zonecode + left outer join fy2018 on fy2018.zonecode=zones.zonecode + left outer join fy2019 on fy2019.zonecode=zones.zonecode + left outer join fy2020 on fy2020.zonecode=zones.zonecode + where 1=1 + orderby: order by zonename + - reportName: BlockFYReport_V2 + summary: Block FY Collection + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: blockname + label: reports.pt.blockname + type: string + source: pt + total: false + - name: 2013_14PTR + label: reports.pt.2013_14_PTR + type: string + source: pt + total: true + - name: 2013_14Collection + label: reports.pt.2013_14Collection + type: string + source: pt + total: true + - name: 2014_15PTR + label: reports.pt.2014_15_PTR + type: string + source: pt + total: true + - name: 2014_15Collection + label: reports.pt.2014_15Collection + type: string + source: pt + total: true + - name: 2015_16PTR + label: reports.pt.2015_16_PTR + type: string + source: pt + total: true + - name: 2015_16Collection + label: reports.pt.2015_16Collection + type: string + source: pt + total: true + - name: 2016_17PTR + label: reports.pt.2016_17_PTR + type: string + source: pt + total: true + - name: 2016_17Collection + label: reports.pt.2016_17Collection + type: string + source: pt + total: true + - name: 2017_18PTR + label: reports.pt.2017_18_PTR + type: string + source: pt + total: true + - name: 2017_18Collection + label: reports.pt.2017_18Collection + type: string + source: pt + total: true + - name: 2018_19PTR + label: reports.pt.2018_19_PTR + type: string + source: pt + total: true + - name: 2018_19Collection + label: reports.pt.2018_19Collection + type: string + source: pt + total: true + - name: 2019_20PTR + label: reports.pt.2019_20_PTR + type: string + source: pt + total: true + - name: 2019_20Collection + label: reports.pt.2019_20Collection + type: string + source: pt + total: true + - name: 2020_21PTR + label: reports.pt.2020_21_PTR + type: string + source: pt + total: true + - name: 2020_21Collection + label: reports.pt.2020_21Collection + type: string + source: pt + total: true + - name: totalptr + label: reports.pt.totalptr + type: string + source: pt + total: true + - name: totalcollection + label: reports.pt.totalcollection + type: string + source: pt + total: true + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: true + searchClause: AND 1=1 + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: true + searchClause: AND 1=1 + query: > + --S.no Service Name ULB Property Tax Unique ID Date Of + Transcation Receipt Number Existing Property ID Type Of Property + Mobile Number Address + with fy2013 as + ( + SELECT + blockcode, + sum(payment.totalamountpaid) as amount, + count(payment.totalamountpaid) as totalcount, + concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY')) as financialyear + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, + (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr + INNER JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality and eg_bndry_mohalla.tenantid=$tenantid + where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id + and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY'))='2013-14' + and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate + GROUP BY financialyear,blockcode + + ), + fy2014 as + ( + SELECT + blockcode, + sum(payment.totalamountpaid) as amount, + count(payment.totalamountpaid) as totalcount, + concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY')) as financialyear + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, + (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr + INNER JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality and eg_bndry_mohalla.tenantid=$tenantid + where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id + and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY'))='2014-15' + and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate + GROUP BY financialyear,blockcode + ), + fy2015 as + ( + SELECT + blockcode, + sum(payment.totalamountpaid) as amount, + count(payment.totalamountpaid) as totalcount, + concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY')) as financialyear + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, + (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr + INNER JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality and eg_bndry_mohalla.tenantid=$tenantid + where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id + and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY'))='2015-16' + and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate + GROUP BY financialyear,blockcode + ), + fy2016 as + ( + SELECT + blockcode, + sum(payment.totalamountpaid) as amount, + count(payment.totalamountpaid) as totalcount, + concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY')) as financialyear + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, + (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr + inner JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality + where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id + and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY'))='2016-17' + and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate + GROUP BY financialyear,blockcode + ), + fy2017 as + ( + SELECT + blockcode, + sum(payment.totalamountpaid) as amount, + count(payment.totalamountpaid) as totalcount, + concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY')) as financialyear + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, + (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr + INNER JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality and eg_bndry_mohalla.tenantid=$tenantid + where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id + and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY'))='2017-18' + and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate + GROUP BY financialyear,blockcode + ), + fy2018 as + ( + SELECT + blockcode, + sum(payment.totalamountpaid) as amount, + count(payment.totalamountpaid) as totalcount, + concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY')) as financialyear + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, + (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr + INNER JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality and eg_bndry_mohalla.tenantid=$tenantid + where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id + and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY'))='2018-19' + and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate + GROUP BY financialyear,blockcode + ), + fy2019 as + ( + SELECT + blockcode, + sum(payment.totalamountpaid) as amount, + count(payment.totalamountpaid) as totalcount, + concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY')) as financialyear + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, + (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr + INNER JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality and eg_bndry_mohalla.tenantid=$tenantid + where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id + and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY'))='2019-20' + and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate + GROUP BY financialyear,blockcode + ), + fy2020 as + ( + SELECT + blockcode, + sum(payment.totalamountpaid) as amount, + count(payment.totalamountpaid) as totalcount, + concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY')) as financialyear + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, + (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr + INNER JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality and eg_bndry_mohalla.tenantid=$tenantid + where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id + and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY'))='2020-21' + and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate + GROUP BY financialyear,blockcode + ), + blocks as + ( + select blockcode,string_agg(distinct blockname,',') as zname from eg_bndry_mohalla where tenantid=$tenantid group by blockcode + ) + SELECT + blocks.blockcode as blockcode, + blocks.zname as blockname, + coalesce(fy2013.totalcount,0) as "2013_14PTR", + coalesce(fy2013.amount,0) as "2013_14Collection", + coalesce(fy2014.totalcount,0) as "2014_15PTR", + coalesce(fy2014.amount,0) as "2014_15Collection", + coalesce(fy2015.totalcount,0) as "2015_16PTR", + coalesce(fy2015.amount,0) as "2015_16Collection", + coalesce(fy2016.totalcount,0) as "2016_17PTR", + coalesce(fy2016.amount,0) as "2016_17Collection", + coalesce(fy2017.totalcount,0) as "2017_18PTR", + coalesce(fy2017.amount,0) as "2017_18Collection", + coalesce(fy2018.totalcount,0) as "2018_19PTR", + coalesce(fy2018.amount,0) as "2018_19Collection", + coalesce(fy2019.totalcount,0) as "2019_20PTR", + coalesce(fy2019.amount,0) as "2019_20Collection", + coalesce(fy2020.totalcount,0) as "2020_21PTR", + coalesce(fy2020.amount,0) as "2020_21Collection", + coalesce(fy2013.totalcount,0)+coalesce(fy2014.totalcount,0)+coalesce(fy2015.totalcount,0)+coalesce(fy2016.totalcount,0)+coalesce(fy2017.totalcount,0)+coalesce(fy2018.totalcount,0)+coalesce(fy2019.totalcount,0)+coalesce(fy2020.totalcount,0) as "totalptr", + coalesce(fy2013.amount,0)+coalesce(fy2014.amount,0)+coalesce(fy2015.amount,0)+coalesce(fy2016.amount,0)+coalesce(fy2017.amount,0)+coalesce(fy2018.amount,0)+coalesce(fy2019.amount,0)+coalesce(fy2020.amount,0) as "totalcollection" + from blocks + left outer join fy2013 on fy2013.blockcode=blocks.blockcode + left outer join fy2014 on fy2014.blockcode=blocks.blockcode + left outer join fy2015 on fy2015.blockcode=blocks.blockcode + left outer join fy2016 on fy2016.blockcode=blocks.blockcode + left outer join fy2017 on fy2017.blockcode=blocks.blockcode + left outer join fy2018 on fy2018.blockcode=blocks.blockcode + left outer join fy2019 on fy2019.blockcode=blocks.blockcode + left outer join fy2020 on fy2020.blockcode=blocks.blockcode + where 1=1 + orderby: order by blockname + - reportName: StatusReport_V2 + decryptionPathId: StatusReport_V2 + summary: Status Report + version: 1.0.0 + moduleName: rainmaker-pt + additionalConfig: + print: + pdfPageSize: A1 + sourceColumns: + - name: propertyid + label: reports.pt.propertyid + type: string + source: pt + total: false + - name: applicationnumber + label: reports.pt.applicationnumber + type: string + source: pt + total: false + - name: usagecategory + label: reports.pt.usagecategory + type: string + source: pt + total: false + - name: financialyear + label: reports.pt.financialyear + type: string + source: pt + total: false + - name: createdtime + label: reports.pt.createdtime + type: string + source: pt + total: false + - name: createdby + label: reports.pt.createdby + type: string + source: pt + total: false + - name: zone + label: reports.pt.zone + type: string + source: pt + total: false + - name: block + label: reports.pt.block + type: string + source: pt + total: false + - name: localityname + label: reports.pt.localityname + type: string + source: pt + total: false + - name: totalamount + label: reports.pt.totalamount + type: string + source: pt + total: false + - name: approvedby + label: reports.pt.approvedby + type: string + source: pt + total: false + - name: address + label: reports.pt.address + type: string + source: pt + total: false + - name: status + label: reports.pt.status + type: string + source: pt + total: false + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: true + searchClause: AND propety.createdtime >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: true + searchClause: AND propety.createdtime <= $toDate + query: > + -- Use CTE to force query plan, compute & use CTE later + + SELECT + propety.propertyid, propety.acknowldgementnumber as applicationnumber, propety.usagecategory, + to_char((To_timestamp(propety.createdtime/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS createdtime, + (case when eu.name is null then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else eu.name end) AS createdby, + localnames.zonecode AS zone, localnames.blockcode AS block, localnames.localityname AS localityname, + REGEXP_REPLACE(REGEXP_REPLACE(CONCAT(pta.doorno, ',', pta.buildingname, ',',pta.street,',', pta.pincode), ',+', ','), '^,|,$', '') as "address", pt_detail.financialyear, propety.status, bill.totalamount, + (case when propety.status = 'INWORKFLOW' then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else euser.name end) as approvedby + FROM eg_pt_property as propety + Left outer join eg_user as eu on eu.uuid = propety.createdby + Left outer join eg_user as euser on euser.uuid = propety.lastmodifiedby + Left outer join eg_pt_address as pta on pta.propertyid = propety.id + INNER join eg_pt_propertydetail_v2 pt_detail ON pt_detail.property = propety.propertyid + Left outer join egcl_bill as bill on bill.consumercode = propety.propertyid + Left outer join eg_bndry_mohalla as localnames on pta.locality=localnames.localitycode + WHERE propety.tenantid=$tenantid AND propety.acknowldgementnumber NOTNULL AND propety.status='ACTIVE' + orderby: ORDER BY propety.createdtime DESC; + - reportName: PendingPTApplicationsReport + summary: ULB-wise PT Collection version: 1.0.0 moduleName: rainmaker-pt - additionalConfig: - print: - pdfPageSize: "A1" sourceColumns: - name: tenantid - label: reports.pt.tenant + label: reports.pt.tenantid + type: string + source: pt + total: false + - name: propertyid + label: reports.pt.propertyid + type: string + source: pt + total: false + - name: applicationnumber + label: reports.pt.applicationnumber + type: string + source: pt + total: false + - name: oldpropertyid + label: reports.pt.oldpropertyid + type: string + source: pt + total: false + - name: status + label: reports.pt.status + type: string + source: pt + total: false + - name: propertytype + label: reports.pt.propertytype + type: string + source: pt + total: false + - name: usagecategory + label: reports.pt.usagecategory + type: string + source: pt + total: false + - name: channel + label: reports.pt.channel + type: string + source: pt + total: false + - name: createdon + label: reports.pt.createdon + type: string + source: pt + total: false + query: > + select + tenantid, + propertyid, + acknowldgementnumber as applicationnumber, + oldpropertyid, + status, + propertytype, + usagecategory, + channel, + to_char((To_timestamp(createdtime/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') as createdon + from eg_pt_property where status='INWORKFLOW' and tenantid=$tenantid + - reportName: ULBDEFAULTERPTREPORT_NEW_V2 + decryptionPathId: ULBDEFAULTERPTREPORT_V2 + summary: ULB Defaulter Pt report + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: propertytaxuniqueid + label: reports.pt.propertytaxuniqueid + type: string + source: pt + total: false + - name: existingpropertyid + label: reports.pt.existingpropertyid type: string source: pt total: false - - name: amountpaid - label: reports.pt.amountpaid + - name: amountcollected + label: reports.pt.amountcollected type: string source: pt total: true - - name: receiptnumber - label: reports.pt.receiptnumber + - name: ownername + label: reports.pt.ownername type: string source: pt total: false - - name: receiptdate - label: reports.pt.receiptdate + - name: propertytype + label: reports.pt.propertytype type: string source: pt total: false - - name: businessservice - label: reports.pt.businessservice + - name: mobileno + label: reports.pt.mobileno type: string source: pt total: false - - name: transactionnumber - label: reports.pt.transactionnumber + - name: address + label: reports.pt.address type: string source: pt total: false - - name: paymentmode - label: reports.pt.paymentmode + query: > + --S.no Service Name ULB Property Tax Unique ID Date Of + Transcation Receipt Number Existing Property ID Type Of + Property Mobile Number Address + + with props as + (select + pt.propertyid as "propertytaxuniqueid", + string_agg(collection.finyear, ', ') as "financailyear" , + string_agg(collection.taxpaid::varchar, ', ') as "amountcollected" , + string_agg(pt.oldpropertyid,',') as "existingpropertyid", + split_part(string_agg(eu."name",','),',',1) as "ownername", + string_agg(pot.propertytype,',') as "propertytype", + split_part(string_agg(eu.mobilenumber,','),',',1) as "mobileno", + string_agg(distinct REGEXP_REPLACE(REGEXP_REPLACE(CONCAT(pta.doorno, ',', pta.buildingname, ',',pta.street,',',pta.localityname,',', pta.pincode), ',+', ','), '^,|,$', ''),',') as "address" + from eg_pt_property pt + inner join (select a.consumercode, to_char((To_timestamp(a.taxperiodfrom/1000) at time Zone 'Asia/Kolkata'),'YYYY')||'-'||to_char((To_timestamp(a.taxperiodfrom/1000) at time Zone 'Asia/Kolkata'),'YYYY')::int+1 as finyear, a.tax, a.taxpaid from (select d.consumercode, d.taxperiodfrom, sum(dd.taxamount) tax, sum(dd.collectionamount) as taxpaid + from egbs_demanddetail_v1 dd, egbs_demand_v1 d + where dd.demandid=d.id + and d.status!='CANCELLED' and dd.tenantid='pb.amritsar' and d.tenantid='pb.amritsar' + group by d.consumercode, d.taxperiodfrom + having sum(dd.taxamount - dd.collectionamount)=0) a, + (select d.consumercode, max(d.taxperiodfrom) maxperiod + from egbs_demanddetail_v1 dd, egbs_demand_v1 d + where dd.demandid=d.id + and d.status!='CANCELLED' and dd.tenantid='pb.amritsar' and d.tenantid='pb.amritsar' + group by d.consumercode + having sum(dd.taxamount - dd.collectionamount)=0) b + where a.consumercode=b.consumercode and a.taxperiodfrom=b.maxperiod + ) collection ON collection.consumercode = pt.propertyid + inner join (SELECT DISTINCT ON (propertyid) propertyid ,name as name , mobilenumber + FROM eg_pt_owner , eg_user + WHERE uuid = userid + AND status = 'ACTIVE' + AND active = true ) eu ON pt.id=eu.propertyid + inner join (SELECT propertyid , locality,doorno,street,buildingname,pincode,localityname, max(createdtime) + from eg_pt_address inner join eg_bndry_mohalla on eg_bndry_mohalla.localitycode=locality where eg_pt_address.tenantid='pb.amritsar' + group by propertyid, locality, doorno,street,buildingname,pincode,localityname) pta ON pt.id=pta.propertyid + inner join (select propertyid, + string_agg(distinct pu.occupancytype, ',') as occupancytype, + string_agg(distinct Initcap(case when usagecategory like '%.%' then split_part(usagecategory,'.',2) else usagecategory end),',') as propertytype + from eg_pt_unit as pu + where pu.tenantid = 'pb.amritsar' + group by propertyid) pot ON pot.propertyid = pt.id + where pt.tenantid = 'pb.amritsar' + and pt.status!='INACTIVE' + and pt.propertyid not in ( + select consumercode from egcl_bill + where tenantid='pb.amritsar' + and businessservice='PT' + and id in (select billid + from egcl_billdetial + where tenantid='pb.amritsar' and concat(to_char((To_timestamp(fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) ='2020-21')) + group by pt.propertyid + ), + prop2019 as + ( + select + oldpropertyid as oldpropertyid, + pt.propertyid as propertyid + from eg_pt_property pt + inner join eg_pt_assessment as assessment on assessment.propertyid=pt.propertyid and assessment.assessmentyear='2019-20' and assessment.tenantid='pb.amritsar' + where pt.tenantid='pb.amritsar' + group by pt.propertyid,oldpropertyid + ) + select * from props + where propertytaxuniqueid not in (select propertyid from prop2019 where oldpropertyid in (select concat('RID',previous_returnid) from amritsar_ikon_2020_21_non_migrated_records)) + - reportName: ULBPTData + decryptionPathId: ULBPTDataDumpReport_V2 + summary: ULB-wise PT Data + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: propertyid + label: reports.pt.propertyId + type: string + source: pt + total: false + - name: ownername + label: reports.pt.ownername + type: string + source: pt + total: false + - name: guardianname + label: reports.pt.guardianname + type: string + source: pt + total: false + - name: mobileno + label: reports.pt.mobileno + type: string + source: pt + total: false + - name: useruuid + label: reports.pt.useruuid + type: string + source: pt + total: false + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: true + searchClause: AND pt.createdtime >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: true + searchClause: AND pt.createdtime <= $toDate + query: > + select pt.propertyid as propertyid, u.name as ownername, u.guardian as + guardianname, u.mobilenumber as mobileno, u.uuid as useruuid from + eg_pt_property pt, eg_pt_owner po, eg_user u where pt.id=po.propertyid and + po.userid=u.uuid and pt.tenantid=$tenantid + orderby: ORDER BY pt.propertyid DESC NULLS LAST + - reportName: PT_DEFAULTER_REPORT_V2 + decryptionPathId: ULBDEFAULTERPTREPORT_V2 + summary: ULB_PT_DEFAULTER + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: propertyid + label: reports.pt.propertyId + type: string + source: pt + total: false + - name: oldpropertyid + label: reports.pt.oldpropertyId + type: string + source: pt + total: false + - name: businessname + label: reports.pt.busnessname + type: string + source: pt + total: false + - name: financialyear + label: reports.pt.financialyear + type: string + source: pt + total: false + - name: latestfy + label: reports.pt.latestfy + type: string + source: pt + total: false + - name: max_pt_tax + label: reports.pt.max_pt_tax + type: string + source: pt + total: true + - name: max_paid + label: reports.pt.max_paid + type: string + source: pt + total: true + - name: propertytype + label: reports.pt.propertytype + type: string + source: pt + total: false + - name: propertyusagetype + label: reports.pt.propertyusagetype + type: string + source: pt + total: false + - name: address + label: reports.pt.address + type: string + source: pt + total: false + - name: block + label: reports.pt.block type: string source: pt total: false - - name: instrumentnumber - label: reports.pt.instrumentnumber + - name: ownername + label: reports.pt.ownername type: string source: pt total: false - - name: paidby - label: reports.pt.paidby + - name: mobileno + label: reports.pt.mobileno type: string source: pt total: false - - name: txn id - label: reports.pt.txn_id + query: > + with assessments as + + ( + select + propertyid, + string_agg(concat(assessmentyears,'(Rs.',totalamount,')'),',') as fy, + max(assessmentyears) as latest_fy, + max(totalamount) as maxtotal, + max(propertytax) as max_pt_tax + from report_assessments + where tenantid=$tenantid + and propertyid not in (select propertyid from report_assessments where tenantid=$tenantid and assessmentyears ='2020-21') + group by propertyid + ), + + owners as + + ( + select + split_part(string_agg(ownername,','),',',1) as ownername, + split_part(string_agg(mobileNumber,','),',',1) as mobileNumber, + propertyid + from report_owners + group by propertyid + ) + + select + assessments.propertyid as propertyid, + props.oldpropertyid as oldpropertyid, + props.firmbusinessname as businessname, + assessments.fy as financialyear, + assessments.latest_fy as latestfy, + assessments.max_pt_tax as max_pt_tax, + assessments.maxtotal as max_paid, + props.propertytype as propertytype, + propertyusagetype as propertyusagetype, + concat(address,' ',localityname) as address, + blockcode as block, + owners.ownername as ownername, + owners.mobileNumber as mobileno + from report_properties props + + inner join assessments on assessments.propertyid=props.propertyid + + inner join owners on owners.propertyid=props.propertyid + - reportName: DAILY_CHALLAN_REPORT + summary: Daily Challan Report + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: paymentmode + label: reports.pt.paymentmode type: string source: pt total: false - - name: txn status - label: reports.pt.txn_status + - name: amount + label: reports.pt.amount + type: string + source: pt + total: true + - name: nos + label: reports.pt.nos + type: string + source: pt + total: true + - name: firecess + label: reports.pt.firecess + type: string + source: pt + total: true + - name: cancercess + label: reports.pt.cancercess + type: string + source: pt + total: true + - name: total + label: reports.pt.total + type: string + source: pt + total: true + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: true + searchClause: AND 1=1 + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: true + searchClause: AND 1=1 + query: > + --S.no Service Name ULB Property Tax Unique ID Date Of + Transcation Receipt Number Existing Property ID Type Of + Property Mobile Number Addr + + with paidbills as + + ( + SELECT + --sum(payment.totalamountpaid) as totalamount, + bd.billid as billid, + sum(bd.amountpaid) as totalamount, + count(distinct bd.billid) as totalcount, + sum(case when bad.taxheadcode='PT_FIRE_CESS' then bad.amount else 0 end) as "totalfirecess", + sum(case when bad.taxheadcode='PT_CANCER_CESS' then bad.amount else 0 end) as "totalcancercess", + sum(case when payment.paymentmode='ONLINE' then bd.amountpaid else 0 end) as "online", + sum(case when payment.paymentmode='ONLINE' and bad.taxheadcode='PT_FIRE_CESS' then bad.amount else 0 end) as "firecess_online", + sum(case when payment.paymentmode='ONLINE' and bad.taxheadcode='PT_CANCER_CESS' then bad.amount else 0 end) as "cancercess_online", + count(distinct case when payment.paymentmode='ONLINE' then bd.billid else NULL end) as "countonline", + sum(case when payment.paymentmode='CASH' then bd.amountpaid else 0 end) as "cash", + sum(case when payment.paymentmode='CASH' and bad.taxheadcode='PT_FIRE_CESS' then bad.amount else 0 end) as "firecess_cash", + sum(case when payment.paymentmode='CASH' and bad.taxheadcode='PT_CANCER_CESS' then bad.amount else 0 end) as "cancercess_cash", + count(distinct case when payment.paymentmode='CASH' then bd.billid else NULL end) as "countcash", + sum(case when payment.paymentmode='CHEQUE' then bd.amountpaid else 0 end) as "cheque", + sum(case when payment.paymentmode='CHEQUE' and bad.taxheadcode='PT_FIRE_CESS' then bad.amount else 0 end) as "firecess_cheque", + sum(case when payment.paymentmode='CHEQUE' and bad.taxheadcode='PT_CANCER_CESS' then bad.amount else 0 end) as "cancercess_cheque", + count(distinct case when payment.paymentmode='CHEQUE' then bd.billid else NULL end) as "countcheque", + sum(case when payment.paymentmode='DD' then bd.amountpaid else 0 end) as "dd", + sum(case when payment.paymentmode='DD' and bad.taxheadcode='PT_FIRE_CESS' then bad.amount else 0 end) as "firecess_dd", + sum(case when payment.paymentmode='DD' and bad.taxheadcode='PT_CANCER_CESS' then bad.amount else 0 end) as "cancercess_dd", + count(distinct case when payment.paymentmode='DD' then bd.billid else NULL end) as "countdd", + sum(case when payment.paymentmode='CARD' then bd.amountpaid else 0 end) as "card", + sum(case when payment.paymentmode='CARD' and bad.taxheadcode='PT_FIRE_CESS' then bad.amount else 0 end) as "firecess_card", + sum(case when payment.paymentmode='CARD' and bad.taxheadcode='PT_CANCER_CESS' then bad.amount else 0 end) as "cancercess_card", + count(distinct case when payment.paymentmode='CARD' then bd.billid else NULL end) as "countcard", + sum(case when payment.paymentmode='OFFLINE_RTGS' then bd.amountpaid else 0 end) as "rtgs", + sum(case when payment.paymentmode='OFFLINE_RTGS' and bad.taxheadcode='PT_FIRE_CESS' then bad.amount else 0 end) as "firecess_rtgs", + sum(case when payment.paymentmode='OFFLINE_RTGS' and bad.taxheadcode='PT_CANCER_CESS' then bad.amount else 0 end) as "cancercess_rtgs", + count(distinct case when payment.paymentmode='OFFLINE_RTGS' then bd.billid else NULL end) as "countrtgs", + sum(case when payment.paymentmode='OFFLINE_NEFT' then bd.amountpaid else 0 end) as "neft", + sum(case when payment.paymentmode='OFFLINE_NEFT' and bad.taxheadcode='PT_FIRE_CESS' then bad.amount else 0 end) as "firecess_neft", + sum(case when payment.paymentmode='OFFLINE_NEFT' and bad.taxheadcode='PT_CANCER_CESS' then bad.amount else 0 end) as "cancercess_neft", + count(distinct case when payment.paymentmode='OFFLINE_NEFT' then bd.billid else NULL end) as "countneft", + sum(case when payment.paymentmode='POSTAL_ORDER' then bd.amountpaid else 0 end) as "po", + sum(case when payment.paymentmode='POSTAL_ORDER' and bad.taxheadcode='PT_FIRE_CESS' then bad.amount else 0 end) as "firecess_po", + sum(case when payment.paymentmode='POSTAL_ORDER' and bad.taxheadcode='PT_CANCER_CESS' then bad.amount else 0 end) as "cancercess_po", + count(distinct case when payment.paymentmode='POTAL_ORDER' then bd.billid else NULL end) as "countpo" + FROM egcl_paymentdetail as pd + inner join egcl_payment payment on pd.paymentid=payment.id and payment.paymentstatus != 'CANCELLED' + inner join egcl_billdetial bd on bd.billid=pd.billid + inner join egcl_billaccountdetail bad on bad.billdetailid=bd.id + where pd.businessservice='PT' and payment.tenantid=$tenantid and payment.createdtime>=$fromDate and payment.createdtime<=$toDate + group by bd.billid + ) + select + 'ONLINE' as paymentmode, + sum(online)-sum(firecess_online)-sum(cancercess_online) as amount, + sum(countonline) as nos, + sum(firecess_online) as firecess, + sum(cancercess_online) as cancercess, + sum(online) as total + from paidbills + union + select + 'CASH' as paymentmode, + sum(cash)-sum(firecess_cash)-sum(cancercess_cash), + sum(countcash), + sum(firecess_cash), + sum(cancercess_cash), + sum(cash) + from paidbills + union + select + 'DD' as paymentmode, + sum(dd)-sum(firecess_dd)-sum(cancercess_dd), + sum(countdd), + sum(firecess_dd), + sum(cancercess_dd), + sum(dd) + from paidbills + union + select 'CARD', + sum(card)-sum(firecess_card)-sum(cancercess_card), + sum(countcard), + sum(firecess_card), + sum(cancercess_card), + sum(card) + from paidbills + union + select 'RTGS', + sum(rtgs)-sum(firecess_rtgs)-sum(cancercess_rtgs), + sum(countrtgs), + sum(firecess_rtgs), + sum(cancercess_rtgs), + sum(rtgs) + from paidbills + union + select'CHEQUE', + sum(cheque)-sum(firecess_cheque)-sum(cancercess_cheque), + sum(countcheque), + sum(firecess_cheque), + sum(cancercess_cheque), + sum(cheque) + from paidbills + union + select 'NEFT', + sum(neft)-sum(firecess_neft)-sum(cancercess_neft), + sum(countneft), + sum(firecess_neft), + sum(cancercess_neft), + sum(neft) + from paidbills + union + select 'PO', + sum(po)-sum(firecess_po)-sum(cancercess_po), + sum(countpo), + sum(firecess_po), + sum(cancercess_po), + sum(po) + from paidbills where 1=1 + - reportName: CHEQUE_REPORT + summary: Cheque Report Register + version: 1.0.0 + moduleName: rainmaker-pt + additionalConfig: + print: + pdfPageSize: A1 + sourceColumns: + - name: propertyid + label: reports.pt.propertyId type: string source: pt total: false - - name: txn status msg - label: reports.pt.txn_status_msg + - name: receiptnumber + label: reports.pt.receiptNo type: string source: pt total: false - - name: gateway - label: reports.pt.gateway + - name: receiptdate + label: reports.pt.receiptDate type: string source: pt total: false - - name: product info - label: reports.pt.product_info + - name: instrumenttype + label: reports.pt.paymentMode type: string source: pt total: false - - name: gatewaytxnid - label: reports.pt.gatewaytxnid + - name: transactionnumber + label: reports.pt.ddChequeTransactionNo type: string source: pt total: false - - name: gateway payment mode - label: reports.pt.gateway_payment_mode + - name: transactiondate + label: reports.pt.ddChequeTransactionDate type: string source: pt total: false - - name: gateway status msg - label: reports.pt.gateway_status_msg + - name: bankname + label: reports.pt.bankName type: string source: pt total: false + - name: tax_withoutcess + label: reports.pt.taxwithoutcess + type: string + source: pt + total: true + - name: firecess + label: reports.pt.fireCess + type: string + source: pt + total: true + - name: cancercess + label: reports.pt.cancerCess + type: string + source: pt + total: true + - name: amount + label: reports.pt.amount + type: string + source: pt + total: true searchParams: - - name: gateway - label: report.pt.gateway - type: singlevaluelist - pattern: 'list://Razorpay:Razorpay,Paytm:Paytm,Other:Other' + - name: fromDate + label: reports.pt.fromDate + type: epoch source: pt isMandatory: true - query: | + searchClause: AND pd.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: true + searchClause: AND pd.receiptdate <= $toDate + query: > + -- Use CTE to force query plan, compute & use CTE later + + WITH receipt_breakup AS ( + SELECT + pd.id as pdid, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) + +SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) + +SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) + +SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) + +SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) + +SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN bad.amount ELSE 0 END) + --SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as paidpropertytax, + +SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN bad.amount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN bad.amount ELSE 0 END) + +SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END) as tax_withoutcess, + SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, + SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess + FROM egcl_billaccountdetail as bad + INNER JOIN egcl_billdetial as bd on bd.id = bad.billdetailid + INNER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid + INNER JOIN egcl_payment as payment on pd.paymentid=payment.id + WHERE payment.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' + AND pd.receiptdate >= $fromDate AND pd.receiptdate <= $toDate + GROUP BY pdid + ) + + SELECT + pd.tenantid AS tenantid, + bill.consumercode as propertyid, + to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS receiptdate, + concat(bank_branches.bank_name,' ',bank_branches.branch) as bankname, + receiptnumber, + payment.paymentmode as instrumenttype, + payment.transactionnumber, + to_char((To_timestamp(payment.instrumentdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, + receipt_breakup.tax_withoutcess, + receipt_breakup.firecess, + receipt_breakup.cancercess, + payment.totalamountpaid as amount + FROM egcl_paymentdetail pd, egcl_payment payment left outer join bank_branches on bank_branches.ifsc=payment.ifsccode, receipt_breakup, egcl_bill bill + + where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + + and receipt_breakup.pdid=pd.id + + and payment.paymentmode in ('CHEQUE','DD','OFFLINE_NEFT') + orderby: ORDER BY pd.receiptdate DESC + - reportName: DigitData_PT + summary: Online DigitData_PT + version: 1.0.0 + moduleName: rainmaker-pt + additionalConfig: + print: + pdfPageSize: A1 + sourceColumns: + - name: tenantid + label: reports.pt.tenant + type: string + source: pt + total: false + - name: amountpaid + label: reports.pt.amountpaid + type: string + source: pt + total: true + - name: receiptnumber + label: reports.pt.receiptnumber + type: string + source: pt + total: false + - name: receiptdate + label: reports.pt.receiptdate + type: string + source: pt + total: false + - name: businessservice + label: reports.pt.businessservice + type: string + source: pt + total: false + - name: transactionnumber + label: reports.pt.transactionnumber + type: string + source: pt + total: false + - name: paymentmode + label: reports.pt.paymentmode + type: string + source: pt + total: false + - name: instrumentnumber + label: reports.pt.instrumentnumber + type: string + source: pt + total: false + - name: paidby + label: reports.pt.paidby + type: string + source: pt + total: false + - name: txn id + label: reports.pt.txn_id + type: string + source: pt + total: false + - name: txn status + label: reports.pt.txn_status + type: string + source: pt + total: false + - name: txn status msg + label: reports.pt.txn_status_msg + type: string + source: pt + total: false + - name: gateway + label: reports.pt.gateway + type: string + source: pt + total: false + - name: product info + label: reports.pt.product_info + type: string + source: pt + total: false + - name: gatewaytxnid + label: reports.pt.gatewaytxnid + type: string + source: pt + total: false + - name: gateway payment mode + label: reports.pt.gateway_payment_mode + type: string + source: pt + total: false + - name: gateway status msg + label: reports.pt.gateway_status_msg + type: string + source: pt + total: false + searchParams: + - name: gateway + label: report.pt.gateway + type: singlevaluelist + pattern: list://Razorpay:Razorpay,Paytm:Paytm,Other:Other + source: pt + isMandatory: true + query: > ---Use CTE to force query plan, compute & use CTE later + select txn.txn_id, txn.txn_status, @@ -6090,6 +6310,38 @@ ReportDefinitions: egp.instrumentnumber,egp.paidby from eg_pg_transactions as txn join egcl_payment as egp on egp.transactionnumber=txn.txn_id + join egcl_paymentdetail as pyd on pyd.paymentid=egp.id --pyd.receiptdate>=1625097660000 and pyd.receiptdate<=1627689660000 + where egp.paymentmode='ONLINE' and egp.tenantid= $tenantid - orderby: ORDER BY egp.transactiondate asc + orderby: ORDER BY egp.transactiondate asc + - reportName: USERNAME_PT + decryptionPathId: ULBDEFAULTERPTREPORT_V2 + summary: Name User + version: 1.0.0 + moduleName: rainmaker-pt + additionalConfig: + print: + pdfPageSize: Legal + sourceColumns: + - name: ownername + label: reports.pt.ownername + type: string + source: pt + total: false + - name: guardian + label: reports.pt.guardian + type: string + source: pt + total: false + - name: mobileno + label: reports.pt.mobileno + type: string + source: pt + total: false + query: | + -- Use CTE to force query plan, compute & use CTE later + SELECT + name as ownername, + guardian, + mobilenumber as mobileno from eg_user where lower(name) like '%gurp%' From 358d9022a3876e4952fff5456a7da7416f28fdcb Mon Sep 17 00:00:00 2001 From: manastanmay-eGov Date: Tue, 28 Mar 2023 02:21:27 +0530 Subject: [PATCH 1196/1242] Updated msewa logo in all the pdfs and bills --- .../data-config/bill-amendment-note.json | 5 +++++ .../pdf-service/data-config/bill-amendment.json | 5 +++++ .../pdf-service/data-config/bpa-revocation.json | 5 +++++ .../data-config/buildingpermit-low.json | 5 +++++ .../pdf-service/data-config/buildingpermit.json | 5 +++++ .../pdf-service/data-config/consolidated-pdf1.json | 5 +++++ .../pdf-service/data-config/consolidated-pdf2.json | 5 +++++ .../pdf-service/data-config/consolidatedbill.json | 5 +++++ .../data-config/consolidatedreceipt.json | 9 +++++++-- .../data-config/consolidatedreceiptold.json | 5 +++++ .../pdf-service/data-config/firenoc-receipt.json | 7 ++++++- .../pdf-service/data-config/firenocreceipt.json | 5 +++++ configs/pdf-service/data-config/mcollect-bill.json | 5 +++++ .../pdf-service/data-config/mcollect-challan.json | 5 +++++ configs/pdf-service/data-config/misc-receipt.json | 5 +++++ .../data-config/passvehicle-certificate.json | 9 +++++++-- configs/pdf-service/data-config/property-bill.json | 5 +++++ .../pdf-service/data-config/property-receipt.json | 5 +++++ configs/pdf-service/data-config/pt-receipt.json | 7 ++++++- .../data-config/ptmutationcertificate.json | 9 +++++++-- .../data-config/sewerage-bill-amendment-note.json | 5 +++++ configs/pdf-service/data-config/sw-bill.json | 5 +++++ .../data-config/testconsolidatedreceipt.json | 5 +++++ .../data-config/testlocalconsolidatedbill.json | 5 +++++ .../data-config/testlocalconsolidatedreceipt.json | 5 +++++ configs/pdf-service/data-config/tl-receipt.json | 9 +++++++-- configs/pdf-service/data-config/tlapplication.json | 10 ++++++---- configs/pdf-service/data-config/tlcertificate.json | 7 ++++++- .../data-config/tlrenewalcertificate.json | 7 ++++++- .../pdf-service/data-config/tradelicense-bill.json | 5 +++++ .../data-config/tradelicense-receipt.json | 5 +++++ .../data-config/ws-applicationsewerage.json | 5 +++++ .../data-config/ws-applicationwater.json | 5 +++++ configs/pdf-service/data-config/ws-bill.json | 5 +++++ .../data-config/ws-consolidatedacknowlegment.json | 5 +++++ .../ws-consolidatedsewerageconnection.json | 5 +++++ .../data-config/ws-onetime-receipt.json | 5 +++++ .../pdf-service/data-config/ws-sanctionletter.json | 5 +++++ .../format-config/bill-amendment-note.json | 12 ++++++++++++ .../pdf-service/format-config/bill-amendment.json | 12 ++++++++++++ .../pdf-service/format-config/bpa-revocation.json | 12 ++++++++++++ .../format-config/buildingpermit-low.json | 12 ++++++++++++ .../pdf-service/format-config/buildingpermit.json | 12 ++++++++++++ .../format-config/consolidated-pdf1.json | 12 ++++++++++++ .../format-config/consolidated-pdf2.json | 12 ++++++++++++ .../format-config/consolidatedbill.json | 12 ++++++++++++ .../format-config/consolidatedreceipt.json | 12 ++++++++++++ .../format-config/consolidatedreceiptold.json | 12 ++++++++++++ .../pdf-service/format-config/firenoc-receipt.json | 12 ++++++++++++ .../pdf-service/format-config/firenocreceipt.json | 12 ++++++++++++ .../pdf-service/format-config/mcollect-bill.json | 12 ++++++++++++ .../format-config/mcollect-challan.json | 12 ++++++++++++ .../pdf-service/format-config/misc-receipt.json | 12 ++++++++++++ .../format-config/passvehicle-certificate.json | 12 ++++++++++++ .../pdf-service/format-config/property-bill.json | 12 ++++++++++++ .../format-config/property-receipt.json | 12 ++++++++++++ configs/pdf-service/format-config/pt-receipt.json | 12 ++++++++++++ .../format-config/ptmutationcertificate.json | 14 +++++++++++++- .../sewerage-bill-amendment-note.json | 12 ++++++++++++ configs/pdf-service/format-config/sw-bill.json | 12 ++++++++++++ .../format-config/testconsolidatedreceipt.json | 12 ++++++++++++ .../format-config/testlocalconsolidatedbill.json | 12 ++++++++++++ .../testlocalconsolidatedreceipt.json | 12 ++++++++++++ configs/pdf-service/format-config/tl-receipt.json | 12 ++++++++++++ .../pdf-service/format-config/tlapplication.json | 14 +++++++++++++- .../pdf-service/format-config/tlcertificate.json | 14 +++++++++++++- .../format-config/tlrenewalcertificate.json | 14 +++++++++++++- .../format-config/tradelicense-bill.json | 12 ++++++++++++ .../format-config/tradelicense-receipt.json | 12 ++++++++++++ .../format-config/ws-applicationsewerage.json | 12 ++++++++++++ .../format-config/ws-applicationwater.json | 12 ++++++++++++ configs/pdf-service/format-config/ws-bill.json | 12 ++++++++++++ .../ws-consolidatedacknowlegment.json | 12 ++++++++++++ .../ws-consolidatedsewerageconnection.json | 12 ++++++++++++ .../format-config/ws-estimationnotice.json | 12 ++++++++++++ .../format-config/ws-onetime-receipt.json | 12 ++++++++++++ .../format-config/ws-sanctionletter.json | 12 ++++++++++++ 77 files changed, 675 insertions(+), 20 deletions(-) diff --git a/configs/pdf-service/data-config/bill-amendment-note.json b/configs/pdf-service/data-config/bill-amendment-note.json index bb877f4d..77d8ee1f 100644 --- a/configs/pdf-service/data-config/bill-amendment-note.json +++ b/configs/pdf-service/data-config/bill-amendment-note.json @@ -527,6 +527,11 @@ "prefix": null, "module":"rainmaker-common" } + }, + { + "variable": "footerLogoImage", + "url": "https://pb-egov-assets.s3.ap-south-1.amazonaws.com/mseva-logo-colored.png", + "type": "image" } ] }, diff --git a/configs/pdf-service/data-config/bill-amendment.json b/configs/pdf-service/data-config/bill-amendment.json index bbaa44be..c87b9ea8 100644 --- a/configs/pdf-service/data-config/bill-amendment.json +++ b/configs/pdf-service/data-config/bill-amendment.json @@ -378,6 +378,11 @@ "prefix": null, "module":"rainmaker-common" } + }, + { + "variable": "footerLogoImage", + "url": "https://pb-egov-assets.s3.ap-south-1.amazonaws.com/mseva-logo-colored.png", + "type": "image" } ] }, diff --git a/configs/pdf-service/data-config/bpa-revocation.json b/configs/pdf-service/data-config/bpa-revocation.json index edab8053..c8b0b5e4 100644 --- a/configs/pdf-service/data-config/bpa-revocation.json +++ b/configs/pdf-service/data-config/bpa-revocation.json @@ -207,6 +207,11 @@ "prefix": null, "module": "rainmaker-bpa" } + }, + { + "variable": "footerLogoImage", + "url": "https://pb-egov-assets.s3.ap-south-1.amazonaws.com/mseva-logo-colored.png", + "type": "image" } ] }, diff --git a/configs/pdf-service/data-config/buildingpermit-low.json b/configs/pdf-service/data-config/buildingpermit-low.json index c3e298cb..bceb414a 100644 --- a/configs/pdf-service/data-config/buildingpermit-low.json +++ b/configs/pdf-service/data-config/buildingpermit-low.json @@ -567,6 +567,11 @@ "value": { "path": "$.edcrDetail[0].planDetail.planInformation.khataNo" } + }, + { + "variable": "footerLogoImage", + "url": "https://pb-egov-assets.s3.ap-south-1.amazonaws.com/mseva-logo-colored.png", + "type": "image" } ] }, diff --git a/configs/pdf-service/data-config/buildingpermit.json b/configs/pdf-service/data-config/buildingpermit.json index ddbb4eaa..323c4c88 100644 --- a/configs/pdf-service/data-config/buildingpermit.json +++ b/configs/pdf-service/data-config/buildingpermit.json @@ -567,6 +567,11 @@ "value": { "path": "$.edcrDetail[0].planDetail.planInformation.khataNo" } + }, + { + "variable": "footerLogoImage", + "url": "https://pb-egov-assets.s3.ap-south-1.amazonaws.com/mseva-logo-colored.png", + "type": "image" } ] }, diff --git a/configs/pdf-service/data-config/consolidated-pdf1.json b/configs/pdf-service/data-config/consolidated-pdf1.json index 14d85ad1..d70a7755 100644 --- a/configs/pdf-service/data-config/consolidated-pdf1.json +++ b/configs/pdf-service/data-config/consolidated-pdf1.json @@ -106,6 +106,11 @@ "variable": "variable16", "url":"https://raw.githubusercontent.com/egovernments/egov-web-app/master/web/rainmaker/dev-packages/egov-ui-kit-dev/src/assets/images/pblogo.png", "type":"image" + }, + { + "variable": "footerLogoImage", + "url": "https://pb-egov-assets.s3.ap-south-1.amazonaws.com/mseva-logo-colored.png", + "type": "image" } ] }, diff --git a/configs/pdf-service/data-config/consolidated-pdf2.json b/configs/pdf-service/data-config/consolidated-pdf2.json index ef1fb938..fa20ca23 100644 --- a/configs/pdf-service/data-config/consolidated-pdf2.json +++ b/configs/pdf-service/data-config/consolidated-pdf2.json @@ -106,6 +106,11 @@ "value": { "path": "$.Bill[0].billDetails[0].amountPaid" } + }, + { + "variable": "footerLogoImage", + "url": "https://pb-egov-assets.s3.ap-south-1.amazonaws.com/mseva-logo-colored.png", + "type": "image" } ] }, diff --git a/configs/pdf-service/data-config/consolidatedbill.json b/configs/pdf-service/data-config/consolidatedbill.json index 0944cf75..98b8d197 100644 --- a/configs/pdf-service/data-config/consolidatedbill.json +++ b/configs/pdf-service/data-config/consolidatedbill.json @@ -627,6 +627,11 @@ "variable":"scissorImage", "url":"http://www.pngall.com/wp-content/uploads/2016/03/Scissor-PNG-Clipart.png", "type":"image" + }, + { + "variable": "footerLogoImage", + "url": "https://uat.digit.org/pg-egov-assets/mseva-logo-colored.png", + "type": "image" } ] }, diff --git a/configs/pdf-service/data-config/consolidatedreceipt.json b/configs/pdf-service/data-config/consolidatedreceipt.json index d0b8aba8..9ad3b164 100644 --- a/configs/pdf-service/data-config/consolidatedreceipt.json +++ b/configs/pdf-service/data-config/consolidatedreceipt.json @@ -510,6 +510,11 @@ "prefix": null, "module":"rainmaker-common" } + }, + { + "variable": "footerLogoImage", + "url": "https://pb-egov-assets.s3.ap-south-1.amazonaws.com/mseva-logo-colored.png", + "type": "image" } ] }, @@ -524,7 +529,7 @@ { "externalAPI": [ { - "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "path": "http://localhost:8091/egov-mdms-service/v1/_get", "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", "apiRequest": null, "responseMapping":[ @@ -565,7 +570,7 @@ ] }, { - "path": "http://echallan-services:8080/echallan-services/eChallan/v1/_search", + "path": "http://localhost:8092/echallan-services/eChallan/v1/_search", "queryParam": "tenantId=$.tenantId,challanNo=$.paymentDetails[0].bill.consumerCode,businessService=$.paymentDetails[0].businessService,offset=0", "apiRequest": null, "responseMapping":[ diff --git a/configs/pdf-service/data-config/consolidatedreceiptold.json b/configs/pdf-service/data-config/consolidatedreceiptold.json index b754b62b..86dee464 100644 --- a/configs/pdf-service/data-config/consolidatedreceiptold.json +++ b/configs/pdf-service/data-config/consolidatedreceiptold.json @@ -516,6 +516,11 @@ "prefix": null, "module":"rainmaker-common" } + }, + { + "variable": "footerLogoImage", + "url": "https://pb-egov-assets.s3.ap-south-1.amazonaws.com/mseva-logo-colored.png", + "type": "image" } ] }, diff --git a/configs/pdf-service/data-config/firenoc-receipt.json b/configs/pdf-service/data-config/firenoc-receipt.json index 9a89b2e5..e13b75ae 100644 --- a/configs/pdf-service/data-config/firenoc-receipt.json +++ b/configs/pdf-service/data-config/firenoc-receipt.json @@ -124,12 +124,17 @@ } ] }, + { + "variable": "footerLogoImage", + "url": "https://pb-egov-assets.s3.ap-south-1.amazonaws.com/mseva-logo-colored.png", + "type": "image" + }, { "externalAPI": [ { - "path": "http://collection-services:8080/collection-services/receipts/_search", + "path": "http://localhost:8091/collection-services/receipts/_search", "queryParam": "consumerCode=$.fireNOCDetails.applicationNumber", "apiRequest": null, diff --git a/configs/pdf-service/data-config/firenocreceipt.json b/configs/pdf-service/data-config/firenocreceipt.json index f5c4258b..8bbda995 100644 --- a/configs/pdf-service/data-config/firenocreceipt.json +++ b/configs/pdf-service/data-config/firenocreceipt.json @@ -515,6 +515,11 @@ "prefix": null, "module":"rainmaker-common" } + }, + { + "variable": "footerLogoImage", + "url": "https://pb-egov-assets.s3.ap-south-1.amazonaws.com/mseva-logo-colored.png", + "type": "image" } ] }, diff --git a/configs/pdf-service/data-config/mcollect-bill.json b/configs/pdf-service/data-config/mcollect-bill.json index c27d60ac..48414a45 100644 --- a/configs/pdf-service/data-config/mcollect-bill.json +++ b/configs/pdf-service/data-config/mcollect-bill.json @@ -624,6 +624,11 @@ "value": { "path": "$.totalAmount" } + }, + { + "variable": "footerLogoImage", + "url": "https://uat.digit.org/pg-egov-assets/mseva-logo-colored.png", + "type": "image" } ] }, diff --git a/configs/pdf-service/data-config/mcollect-challan.json b/configs/pdf-service/data-config/mcollect-challan.json index fa102fe8..c05d9783 100644 --- a/configs/pdf-service/data-config/mcollect-challan.json +++ b/configs/pdf-service/data-config/mcollect-challan.json @@ -670,6 +670,11 @@ "value": { "path": "$.totalAmount" } + }, + { + "variable": "footerLogoImage", + "url": "https://pb-egov-assets.s3.ap-south-1.amazonaws.com/mseva-logo-colored.png", + "type": "image" } ] }, diff --git a/configs/pdf-service/data-config/misc-receipt.json b/configs/pdf-service/data-config/misc-receipt.json index c0fd312b..79b94c1f 100644 --- a/configs/pdf-service/data-config/misc-receipt.json +++ b/configs/pdf-service/data-config/misc-receipt.json @@ -452,6 +452,11 @@ "prefix": null, "module":"rainmaker-common" } + }, + { + "variable": "footerLogoImage", + "url": "https://pb-egov-assets.s3.ap-south-1.amazonaws.com/mseva-logo-colored.png", + "type": "image" } ] }, diff --git a/configs/pdf-service/data-config/passvehicle-certificate.json b/configs/pdf-service/data-config/passvehicle-certificate.json index 38f83596..20a7a091 100644 --- a/configs/pdf-service/data-config/passvehicle-certificate.json +++ b/configs/pdf-service/data-config/passvehicle-certificate.json @@ -519,8 +519,13 @@ "value": { "path": "$.tenantId" } - } - ] + }, + { + "variable": "footerLogoImage", + "url": "https://pb-egov-assets.s3.ap-south-1.amazonaws.com/mseva-logo-colored.png", + "type": "image" + } + ] }, { "externalAPI": [ diff --git a/configs/pdf-service/data-config/property-bill.json b/configs/pdf-service/data-config/property-bill.json index 1ed8778d..0b22fd2c 100644 --- a/configs/pdf-service/data-config/property-bill.json +++ b/configs/pdf-service/data-config/property-bill.json @@ -746,6 +746,11 @@ "prefix": null, "module":"rainmaker-common" } + }, + { + "variable": "footerLogoImage", + "url": "https://uat.digit.org/pg-egov-assets/mseva-logo-colored.png", + "type": "image" } ] }, diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json index 79102e7a..ca1fb104 100644 --- a/configs/pdf-service/data-config/property-receipt.json +++ b/configs/pdf-service/data-config/property-receipt.json @@ -711,6 +711,11 @@ "module":"rainmaker-common", "locale":"en_IN" } + }, + { + "variable": "footerLogoImage", + "url": "https://pb-egov-assets.s3.ap-south-1.amazonaws.com/mseva-logo-colored.png", + "type": "image" } ] }, diff --git a/configs/pdf-service/data-config/pt-receipt.json b/configs/pdf-service/data-config/pt-receipt.json index 56e0706e..30cceb74 100644 --- a/configs/pdf-service/data-config/pt-receipt.json +++ b/configs/pdf-service/data-config/pt-receipt.json @@ -164,7 +164,12 @@ "key":"unitArea" }] } - } + }, + { + "variable": "footerLogoImage", + "url": "https://pb-egov-assets.s3.ap-south-1.amazonaws.com/mseva-logo-colored.png", + "type": "image" + } ] }, { diff --git a/configs/pdf-service/data-config/ptmutationcertificate.json b/configs/pdf-service/data-config/ptmutationcertificate.json index 7f9f3af2..6c22a095 100644 --- a/configs/pdf-service/data-config/ptmutationcertificate.json +++ b/configs/pdf-service/data-config/ptmutationcertificate.json @@ -303,8 +303,13 @@ "value": { "path": "$.owners[?(@.status == 'ACTIVE')].permanentCity" } - } - ] + }, + { + "variable": "footerLogoImage", + "url": "https://pb-egov-assets.s3.ap-south-1.amazonaws.com/mseva-logo-colored.png", + "type": "image" + } + ] }, { "externalAPI": [ diff --git a/configs/pdf-service/data-config/sewerage-bill-amendment-note.json b/configs/pdf-service/data-config/sewerage-bill-amendment-note.json index 6123217b..3fcdd62d 100644 --- a/configs/pdf-service/data-config/sewerage-bill-amendment-note.json +++ b/configs/pdf-service/data-config/sewerage-bill-amendment-note.json @@ -527,6 +527,11 @@ "prefix": null, "module":"rainmaker-common" } + }, + { + "variable": "footerLogoImage", + "url": "https://pb-egov-assets.s3.ap-south-1.amazonaws.com/mseva-logo-colored.png", + "type": "image" } ] }, diff --git a/configs/pdf-service/data-config/sw-bill.json b/configs/pdf-service/data-config/sw-bill.json index 55725ace..a2f6b9a8 100644 --- a/configs/pdf-service/data-config/sw-bill.json +++ b/configs/pdf-service/data-config/sw-bill.json @@ -669,6 +669,11 @@ "variable": "scissorImage", "url": "http://www.pngall.com/wp-content/uploads/2016/03/Scissor-PNG-Clipart.png", "type": "image" + }, + { + "variable": "footerLogoImage", + "url": "https://uat.digit.org/pg-egov-assets/mseva-logo-colored.png", + "type": "image" } ] }, diff --git a/configs/pdf-service/data-config/testconsolidatedreceipt.json b/configs/pdf-service/data-config/testconsolidatedreceipt.json index 7e996bb4..d19bf671 100644 --- a/configs/pdf-service/data-config/testconsolidatedreceipt.json +++ b/configs/pdf-service/data-config/testconsolidatedreceipt.json @@ -417,6 +417,11 @@ "prefix": null, "module":"rainmaker-common" } + }, + { + "variable": "footerLogoImage", + "url": "https://pb-egov-assets.s3.ap-south-1.amazonaws.com/mseva-logo-colored.png", + "type": "image" } ] }, diff --git a/configs/pdf-service/data-config/testlocalconsolidatedbill.json b/configs/pdf-service/data-config/testlocalconsolidatedbill.json index a9d8bf77..4e21050a 100644 --- a/configs/pdf-service/data-config/testlocalconsolidatedbill.json +++ b/configs/pdf-service/data-config/testlocalconsolidatedbill.json @@ -517,6 +517,11 @@ "variable":"scissorImage", "url":"https://raw.githubusercontent.com/egovernments/egov-web-app/master/web/rainmaker/dev-packages/egov-ui-kit-dev/src/assets/images/pblogo.png", "type":"image" + }, + { + "variable": "footerLogoImage", + "url": "https://pb-egov-assets.s3.ap-south-1.amazonaws.com/mseva-logo-colored.png", + "type": "image" } ] }, diff --git a/configs/pdf-service/data-config/testlocalconsolidatedreceipt.json b/configs/pdf-service/data-config/testlocalconsolidatedreceipt.json index 1c5af18a..26915191 100644 --- a/configs/pdf-service/data-config/testlocalconsolidatedreceipt.json +++ b/configs/pdf-service/data-config/testlocalconsolidatedreceipt.json @@ -412,6 +412,11 @@ "prefix": null, "module":"rainmaker-common" } + }, + { + "variable": "footerLogoImage", + "url": "https://pb-egov-assets.s3.ap-south-1.amazonaws.com/mseva-logo-colored.png", + "type": "image" } ] }, diff --git a/configs/pdf-service/data-config/tl-receipt.json b/configs/pdf-service/data-config/tl-receipt.json index a97933bd..c9c6177d 100644 --- a/configs/pdf-service/data-config/tl-receipt.json +++ b/configs/pdf-service/data-config/tl-receipt.json @@ -146,7 +146,12 @@ "key":"mobileNumber" }] } - } + } , + { + "variable": "footerLogoImage", + "url": "https://pb-egov-assets.s3.ap-south-1.amazonaws.com/mseva-logo-colored.png", + "type": "image" + } ] }, { @@ -162,7 +167,7 @@ { - "path": "http://collection-services:8080/collection-services/receipts/_search", + "path": "http://localhost:8091/collection-services/receipts/_search", "queryParam": "consumerCode=$.applicationNumber", diff --git a/configs/pdf-service/data-config/tlapplication.json b/configs/pdf-service/data-config/tlapplication.json index 7673bf3f..801ff4b7 100644 --- a/configs/pdf-service/data-config/tlapplication.json +++ b/configs/pdf-service/data-config/tlapplication.json @@ -1018,10 +1018,12 @@ ] } - } - - - + }, + { + "variable": "footerLogoImage", + "url": "https://pb-egov-assets.s3.ap-south-1.amazonaws.com/mseva-logo-colored.png", + "type": "image" + } ] }, { diff --git a/configs/pdf-service/data-config/tlcertificate.json b/configs/pdf-service/data-config/tlcertificate.json index 6b75e723..5c5bb80b 100644 --- a/configs/pdf-service/data-config/tlcertificate.json +++ b/configs/pdf-service/data-config/tlcertificate.json @@ -635,8 +635,13 @@ "prefix": null, "module":"rainmaker-common" } + }, + { + "variable": "footerLogoImage", + "url": "https://pb-egov-assets.s3.ap-south-1.amazonaws.com/mseva-logo-colored.png", + "type": "image" } - ] + ] }, { "externalAPI": [ diff --git a/configs/pdf-service/data-config/tlrenewalcertificate.json b/configs/pdf-service/data-config/tlrenewalcertificate.json index 92f21289..f481e893 100644 --- a/configs/pdf-service/data-config/tlrenewalcertificate.json +++ b/configs/pdf-service/data-config/tlrenewalcertificate.json @@ -633,8 +633,13 @@ "prefix": null, "module":"rainmaker-common" } + }, + { + "variable": "footerLogoImage", + "url": "https://pb-egov-assets.s3.ap-south-1.amazonaws.com/mseva-logo-colored.png", + "type": "image" } - ] + ] }, { "externalAPI": [ diff --git a/configs/pdf-service/data-config/tradelicense-bill.json b/configs/pdf-service/data-config/tradelicense-bill.json index 0e012f7d..50c4713b 100644 --- a/configs/pdf-service/data-config/tradelicense-bill.json +++ b/configs/pdf-service/data-config/tradelicense-bill.json @@ -546,6 +546,11 @@ "variable":"scissorImage", "url":"http://www.pngall.com/wp-content/uploads/2016/03/Scissor-PNG-Clipart.png", "type":"image" + }, + { + "variable": "footerLogoImage", + "url": "https://uat.digit.org/pg-egov-assets/mseva-logo-colored.png", + "type": "image" } ] }, diff --git a/configs/pdf-service/data-config/tradelicense-receipt.json b/configs/pdf-service/data-config/tradelicense-receipt.json index 68888dfb..0140f3ea 100644 --- a/configs/pdf-service/data-config/tradelicense-receipt.json +++ b/configs/pdf-service/data-config/tradelicense-receipt.json @@ -430,6 +430,11 @@ "prefix": null, "module":"rainmaker-common" } + }, + { + "variable": "footerLogoImage", + "url": "https://pb-egov-assets.s3.ap-south-1.amazonaws.com/mseva-logo-colored.png", + "type": "image" } ] }, diff --git a/configs/pdf-service/data-config/ws-applicationsewerage.json b/configs/pdf-service/data-config/ws-applicationsewerage.json index b80149f9..e921e4ff 100644 --- a/configs/pdf-service/data-config/ws-applicationsewerage.json +++ b/configs/pdf-service/data-config/ws-applicationsewerage.json @@ -989,6 +989,11 @@ "prefix": null, "module": "rainmaker-common" } + }, + { + "variable": "footerLogoImage", + "url": "https://pb-egov-assets.s3.ap-south-1.amazonaws.com/mseva-logo-colored.png", + "type": "image" } ] }, diff --git a/configs/pdf-service/data-config/ws-applicationwater.json b/configs/pdf-service/data-config/ws-applicationwater.json index e4a22eb3..d9b5f9a2 100644 --- a/configs/pdf-service/data-config/ws-applicationwater.json +++ b/configs/pdf-service/data-config/ws-applicationwater.json @@ -1068,6 +1068,11 @@ "prefix": null, "module": "rainmaker-common" } + }, + { + "variable": "footerLogoImage", + "url": "https://pb-egov-assets.s3.ap-south-1.amazonaws.com/mseva-logo-colored.png", + "type": "image" } ] }, diff --git a/configs/pdf-service/data-config/ws-bill.json b/configs/pdf-service/data-config/ws-bill.json index 1b9cee60..3f6d0a77 100644 --- a/configs/pdf-service/data-config/ws-bill.json +++ b/configs/pdf-service/data-config/ws-bill.json @@ -669,6 +669,11 @@ "variable": "scissorImage", "url": "http://www.pngall.com/wp-content/uploads/2016/03/Scissor-PNG-Clipart.png", "type": "image" + }, + { + "variable": "footerLogoImage", + "url": "https://uat.digit.org/pg-egov-assets/mseva-logo-colored.png", + "type": "image" } ] }, diff --git a/configs/pdf-service/data-config/ws-consolidatedacknowlegment.json b/configs/pdf-service/data-config/ws-consolidatedacknowlegment.json index 0a8bdb01..0a011572 100644 --- a/configs/pdf-service/data-config/ws-consolidatedacknowlegment.json +++ b/configs/pdf-service/data-config/ws-consolidatedacknowlegment.json @@ -649,6 +649,11 @@ "prefix": null, "module": "rainmaker-common" } + }, + { + "variable": "footerLogoImage", + "url": "https://uat.digit.org/pg-egov-assets/mseva-logo-colored.png", + "type": "image" } ] }, diff --git a/configs/pdf-service/data-config/ws-consolidatedsewerageconnection.json b/configs/pdf-service/data-config/ws-consolidatedsewerageconnection.json index 6e030551..2f630eef 100644 --- a/configs/pdf-service/data-config/ws-consolidatedsewerageconnection.json +++ b/configs/pdf-service/data-config/ws-consolidatedsewerageconnection.json @@ -536,6 +536,11 @@ "prefix": null, "module": "rainmaker-common" } + }, + { + "variable": "footerLogoImage", + "url": "https://uat.digit.org/pg-egov-assets/mseva-logo-colored.png", + "type": "image" } ] }, diff --git a/configs/pdf-service/data-config/ws-onetime-receipt.json b/configs/pdf-service/data-config/ws-onetime-receipt.json index 3fbff9ce..226ede8b 100644 --- a/configs/pdf-service/data-config/ws-onetime-receipt.json +++ b/configs/pdf-service/data-config/ws-onetime-receipt.json @@ -532,6 +532,11 @@ "prefix": null, "module": "rainmaker-common" } + }, + { + "variable": "footerLogoImage", + "url": "https://uat.digit.org/pg-egov-assets/mseva-logo-colored.png", + "type": "image" } ] }, diff --git a/configs/pdf-service/data-config/ws-sanctionletter.json b/configs/pdf-service/data-config/ws-sanctionletter.json index 13193703..7a70fb75 100644 --- a/configs/pdf-service/data-config/ws-sanctionletter.json +++ b/configs/pdf-service/data-config/ws-sanctionletter.json @@ -934,6 +934,11 @@ "prefix": null, "module": "rainmaker-common" } + }, + { + "variable": "footerLogoImage", + "url": "https://uat.digit.org/pg-egov-assets/mseva-logo-colored.png", + "type": "image" } ] }, diff --git a/configs/pdf-service/format-config/bill-amendment-note.json b/configs/pdf-service/format-config/bill-amendment-note.json index b8e76059..67e3c31a 100644 --- a/configs/pdf-service/format-config/bill-amendment-note.json +++ b/configs/pdf-service/format-config/bill-amendment-note.json @@ -402,6 +402,18 @@ { "style": "no-signature", "text": "{{box_validity}}" + }, + { + "image": "{{footerLogoImage}}", + "width": 95, + "height": 30, + "margin": [ + 12, + 10, + 12, + 10 + ], + "alignment": "center" } ], diff --git a/configs/pdf-service/format-config/bill-amendment.json b/configs/pdf-service/format-config/bill-amendment.json index 01e77a67..a8fc90a8 100644 --- a/configs/pdf-service/format-config/bill-amendment.json +++ b/configs/pdf-service/format-config/bill-amendment.json @@ -464,6 +464,18 @@ ] }, "layout": {} + }, + { + "image": "{{footerLogoImage}}", + "width": 95, + "height": 30, + "margin": [ + 12, + 10, + 12, + 10 + ], + "alignment": "center" } ], diff --git a/configs/pdf-service/format-config/bpa-revocation.json b/configs/pdf-service/format-config/bpa-revocation.json index 962afcd7..bf78d6b1 100644 --- a/configs/pdf-service/format-config/bpa-revocation.json +++ b/configs/pdf-service/format-config/bpa-revocation.json @@ -141,6 +141,18 @@ ], "alignment": "right", "style": "top-margin" + }, + { + "image": "{{footerLogoImage}}", + "width": 95, + "height": 30, + "margin": [ + 12, + 10, + 12, + 10 + ], + "alignment": "center" } ], "styles": { diff --git a/configs/pdf-service/format-config/buildingpermit-low.json b/configs/pdf-service/format-config/buildingpermit-low.json index ff08ecef..0e92a2ce 100644 --- a/configs/pdf-service/format-config/buildingpermit-low.json +++ b/configs/pdf-service/format-config/buildingpermit-low.json @@ -298,6 +298,18 @@ "alignment": "right", "width": 100, "height": 100 + }, + { + "image": "{{footerLogoImage}}", + "width": 95, + "height": 30, + "margin": [ + 12, + 10, + 12, + 10 + ], + "alignment": "center" } ], "styles": { diff --git a/configs/pdf-service/format-config/buildingpermit.json b/configs/pdf-service/format-config/buildingpermit.json index 76439020..06fd79dd 100644 --- a/configs/pdf-service/format-config/buildingpermit.json +++ b/configs/pdf-service/format-config/buildingpermit.json @@ -310,6 +310,18 @@ "alignment": "right", "width": 100, "height": 100 + }, + { + "image": "{{footerLogoImage}}", + "width": 95, + "height": 30, + "margin": [ + 12, + 10, + 12, + 10 + ], + "alignment": "center" } ], "footer": "(function(currentPage, pageCount) { return currentPage.toString() + ' of ' + pageCount; })", diff --git a/configs/pdf-service/format-config/consolidated-pdf1.json b/configs/pdf-service/format-config/consolidated-pdf1.json index 1c106159..93c49c99 100644 --- a/configs/pdf-service/format-config/consolidated-pdf1.json +++ b/configs/pdf-service/format-config/consolidated-pdf1.json @@ -448,6 +448,18 @@ "style": "pt-disclaimer-value" } ] + }, + { + "image": "{{footerLogoImage}}", + "width": 95, + "height": 30, + "margin": [ + 12, + 10, + 12, + 10 + ], + "alignment": "center" } ], "styles": { diff --git a/configs/pdf-service/format-config/consolidated-pdf2.json b/configs/pdf-service/format-config/consolidated-pdf2.json index 3dfe0657..57d79266 100644 --- a/configs/pdf-service/format-config/consolidated-pdf2.json +++ b/configs/pdf-service/format-config/consolidated-pdf2.json @@ -823,6 +823,18 @@ ] ] } + }, + { + "image": "{{footerLogoImage}}", + "width": 95, + "height": 30, + "margin": [ + 12, + 10, + 12, + 10 + ], + "alignment": "center" } ], "styles": { diff --git a/configs/pdf-service/format-config/consolidatedbill.json b/configs/pdf-service/format-config/consolidatedbill.json index 76a359ce..b8c1f522 100644 --- a/configs/pdf-service/format-config/consolidatedbill.json +++ b/configs/pdf-service/format-config/consolidatedbill.json @@ -784,6 +784,18 @@ { "text": "{{receivers_signature}}", "style": "footer-bottom" + }, + { + "image": "{{footerLogoImage}}", + "width": 95, + "height": 30, + "margin": [ + 12, + 10, + 12, + 10 + ], + "alignment": "center" } ], "styles": { diff --git a/configs/pdf-service/format-config/consolidatedreceipt.json b/configs/pdf-service/format-config/consolidatedreceipt.json index e0b756ca..1de63aa5 100644 --- a/configs/pdf-service/format-config/consolidatedreceipt.json +++ b/configs/pdf-service/format-config/consolidatedreceipt.json @@ -1254,6 +1254,18 @@ }, { "text":"Now log a complaint from WhatsApp, give a missed call on 8750975975 or send a Hi message on WhatsApp to this number", "bold": true, "fontSize": 8, "color": "blue", "decoration": "underline"} ] + }, + { + "image": "{{footerLogoImage}}", + "width": 95, + "height": 30, + "margin": [ + 12, + 10, + 12, + 10 + ], + "alignment": "center" } ], "styles": { diff --git a/configs/pdf-service/format-config/consolidatedreceiptold.json b/configs/pdf-service/format-config/consolidatedreceiptold.json index 49236651..945a3b2e 100644 --- a/configs/pdf-service/format-config/consolidatedreceiptold.json +++ b/configs/pdf-service/format-config/consolidatedreceiptold.json @@ -1277,6 +1277,18 @@ }, { "text":"Now log a complaint from WhatsApp, give a missed call on 8750975975 or send a Hi message on WhatsApp to this number", "bold": true, "fontSize": 8, "color": "blue", "decoration": "underline"} ] + }, + { + "image": "{{footerLogoImage}}", + "width": 95, + "height": 30, + "margin": [ + 12, + 10, + 12, + 10 + ], + "alignment": "center" } ], "styles": { diff --git a/configs/pdf-service/format-config/firenoc-receipt.json b/configs/pdf-service/format-config/firenoc-receipt.json index 142e8a68..f6dc5009 100644 --- a/configs/pdf-service/format-config/firenoc-receipt.json +++ b/configs/pdf-service/format-config/firenoc-receipt.json @@ -354,6 +354,18 @@ } ] + }, + { + "image": "{{footerLogoImage}}", + "width": 95, + "height": 30, + "margin": [ + 12, + 10, + 12, + 10 + ], + "alignment": "center" } ], "footer": [], diff --git a/configs/pdf-service/format-config/firenocreceipt.json b/configs/pdf-service/format-config/firenocreceipt.json index ca18aad7..4870cfcb 100644 --- a/configs/pdf-service/format-config/firenocreceipt.json +++ b/configs/pdf-service/format-config/firenocreceipt.json @@ -1254,6 +1254,18 @@ }, { "text":"Now log a complaint from WhatsApp, give a missed call on 8750975975 or send a Hi message on WhatsApp to this number", "bold": true, "fontSize": 8, "color": "blue", "decoration": "underline"} ] + }, + { + "image": "{{footerLogoImage}}", + "width": 95, + "height": 30, + "margin": [ + 12, + 10, + 12, + 10 + ], + "alignment": "center" } ], "styles": { diff --git a/configs/pdf-service/format-config/mcollect-bill.json b/configs/pdf-service/format-config/mcollect-bill.json index eee45482..a5095cb1 100644 --- a/configs/pdf-service/format-config/mcollect-bill.json +++ b/configs/pdf-service/format-config/mcollect-bill.json @@ -551,6 +551,18 @@ ] }, "layout": "noBorders" + }, + { + "image": "{{footerLogoImage}}", + "width": 55, + "height": 61.25, + "margin": [ + 12, + 10, + 12, + 10 + ], + "alignment": "center" } ], "styles": { diff --git a/configs/pdf-service/format-config/mcollect-challan.json b/configs/pdf-service/format-config/mcollect-challan.json index abdd15a1..6a64328c 100644 --- a/configs/pdf-service/format-config/mcollect-challan.json +++ b/configs/pdf-service/format-config/mcollect-challan.json @@ -569,6 +569,18 @@ ] }, "layout": "noBorders" + }, + { + "image": "{{footerLogoImage}}", + "width": 95, + "height": 30, + "margin": [ + 12, + 10, + 12, + 10 + ], + "alignment": "center" } ], "styles": { diff --git a/configs/pdf-service/format-config/misc-receipt.json b/configs/pdf-service/format-config/misc-receipt.json index fb2f7cf7..c90ac4a1 100644 --- a/configs/pdf-service/format-config/misc-receipt.json +++ b/configs/pdf-service/format-config/misc-receipt.json @@ -480,6 +480,18 @@ "style": "pt-disclaimer-value" } ] + }, + { + "image": "{{footerLogoImage}}", + "width": 95, + "height": 30, + "margin": [ + 12, + 10, + 12, + 10 + ], + "alignment": "center" } ], "styles": { diff --git a/configs/pdf-service/format-config/passvehicle-certificate.json b/configs/pdf-service/format-config/passvehicle-certificate.json index 160fc4ab..eb90ec89 100644 --- a/configs/pdf-service/format-config/passvehicle-certificate.json +++ b/configs/pdf-service/format-config/passvehicle-certificate.json @@ -396,6 +396,18 @@ 0, 0 ] + }, + { + "image": "{{footerLogoImage}}", + "width": 95, + "height": 30, + "margin": [ + 12, + 10, + 12, + 10 + ], + "alignment": "center" } ], "styles": { diff --git a/configs/pdf-service/format-config/property-bill.json b/configs/pdf-service/format-config/property-bill.json index 7618cc00..c6f3932f 100644 --- a/configs/pdf-service/format-config/property-bill.json +++ b/configs/pdf-service/format-config/property-bill.json @@ -948,6 +948,18 @@ { "text": "{{receivers_signature}}", "style": "footer-bottom" + }, + { + "image": "{{footerLogoImage}}", + "width": 55, + "height": 61.25, + "margin": [ + 12, + 10, + 12, + 10 + ], + "alignment": "center" } ], "styles": { diff --git a/configs/pdf-service/format-config/property-receipt.json b/configs/pdf-service/format-config/property-receipt.json index 0a563488..98109abf 100644 --- a/configs/pdf-service/format-config/property-receipt.json +++ b/configs/pdf-service/format-config/property-receipt.json @@ -1174,6 +1174,18 @@ { "text":"Now log a complaint from WhatsApp, give a missed call on 8750975975 or send a Hi message on WhatsApp to this number", "bold": true, "fontSize": 8, "color": "blue", "decoration": "underline"} ] + }, + { + "image": "{{footerLogoImage}}", + "width": 95, + "height": 30, + "margin": [ + 12, + 10, + 12, + 10 + ], + "alignment": "center" } ], "styles": { diff --git a/configs/pdf-service/format-config/pt-receipt.json b/configs/pdf-service/format-config/pt-receipt.json index 462765c4..ee5f0cad 100644 --- a/configs/pdf-service/format-config/pt-receipt.json +++ b/configs/pdf-service/format-config/pt-receipt.json @@ -736,6 +736,18 @@ ], "alignment": "left", "style": "receipt-footer" + }, + { + "image": "{{footerLogoImage}}", + "width": 95, + "height": 30, + "margin": [ + 12, + 10, + 12, + 10 + ], + "alignment": "center" } ], "styles": { diff --git a/configs/pdf-service/format-config/ptmutationcertificate.json b/configs/pdf-service/format-config/ptmutationcertificate.json index dd7fe279..e84cde07 100644 --- a/configs/pdf-service/format-config/ptmutationcertificate.json +++ b/configs/pdf-service/format-config/ptmutationcertificate.json @@ -377,7 +377,19 @@ "alignment": "right" } ] - } + }, + { + "image": "{{footerLogoImage}}", + "width": 95, + "height": 30, + "margin": [ + 12, + 10, + 12, + 10 + ], + "alignment": "center" + } ], "styles": { "noc-head": { diff --git a/configs/pdf-service/format-config/sewerage-bill-amendment-note.json b/configs/pdf-service/format-config/sewerage-bill-amendment-note.json index 09ddbdc7..f581ab4f 100644 --- a/configs/pdf-service/format-config/sewerage-bill-amendment-note.json +++ b/configs/pdf-service/format-config/sewerage-bill-amendment-note.json @@ -374,6 +374,18 @@ { "style": "no-signature", "text": "{{box_validity}}" + }, + { + "image": "{{footerLogoImage}}", + "width": 95, + "height": 30, + "margin": [ + 12, + 10, + 12, + 10 + ], + "alignment": "center" } ], diff --git a/configs/pdf-service/format-config/sw-bill.json b/configs/pdf-service/format-config/sw-bill.json index 2fb27238..b6ae768e 100644 --- a/configs/pdf-service/format-config/sw-bill.json +++ b/configs/pdf-service/format-config/sw-bill.json @@ -1000,6 +1000,18 @@ { "text": "{{receivers_signature}}", "style": "footer-bottom" + }, + { + "image": "{{footerLogoImage}}", + "width": 55, + "height": 61.25, + "margin": [ + 12, + 10, + 12, + 10 + ], + "alignment": "center" } ], "styles": { diff --git a/configs/pdf-service/format-config/testconsolidatedreceipt.json b/configs/pdf-service/format-config/testconsolidatedreceipt.json index 9f1f86f6..06b39018 100644 --- a/configs/pdf-service/format-config/testconsolidatedreceipt.json +++ b/configs/pdf-service/format-config/testconsolidatedreceipt.json @@ -461,6 +461,18 @@ "style": "pt-disclaimer-value" } ] + }, + { + "image": "{{footerLogoImage}}", + "width": 95, + "height": 30, + "margin": [ + 12, + 10, + 12, + 10 + ], + "alignment": "center" } ], "styles": { diff --git a/configs/pdf-service/format-config/testlocalconsolidatedbill.json b/configs/pdf-service/format-config/testlocalconsolidatedbill.json index 639a4ca0..a26f96c5 100644 --- a/configs/pdf-service/format-config/testlocalconsolidatedbill.json +++ b/configs/pdf-service/format-config/testlocalconsolidatedbill.json @@ -781,6 +781,18 @@ { "text": "{{receivers_signature}}", "style": "footer-bottom" + }, + { + "image": "{{footerLogoImage}}", + "width": 95, + "height": 30, + "margin": [ + 12, + 10, + 12, + 10 + ], + "alignment": "center" } ], "styles": { diff --git a/configs/pdf-service/format-config/testlocalconsolidatedreceipt.json b/configs/pdf-service/format-config/testlocalconsolidatedreceipt.json index 14c0e79f..40521fc9 100644 --- a/configs/pdf-service/format-config/testlocalconsolidatedreceipt.json +++ b/configs/pdf-service/format-config/testlocalconsolidatedreceipt.json @@ -468,6 +468,18 @@ "style": "pt-disclaimer-value" } ] + }, + { + "image": "{{footerLogoImage}}", + "width": 95, + "height": 30, + "margin": [ + 12, + 10, + 12, + 10 + ], + "alignment": "center" } ], "styles": { diff --git a/configs/pdf-service/format-config/tl-receipt.json b/configs/pdf-service/format-config/tl-receipt.json index 845053b1..c3276421 100644 --- a/configs/pdf-service/format-config/tl-receipt.json +++ b/configs/pdf-service/format-config/tl-receipt.json @@ -783,6 +783,18 @@ "alignment": "right" } ] + }, + { + "image": "{{footerLogoImage}}", + "width": 95, + "height": 30, + "margin": [ + 12, + 10, + 12, + 10 + ], + "alignment": "center" } ], "footer": [ diff --git a/configs/pdf-service/format-config/tlapplication.json b/configs/pdf-service/format-config/tlapplication.json index 17a57f0e..d6560a11 100644 --- a/configs/pdf-service/format-config/tlapplication.json +++ b/configs/pdf-service/format-config/tlapplication.json @@ -1255,7 +1255,19 @@ } ], "unbreakable": true - } + }, + { + "image": "{{footerLogoImage}}", + "width": 95, + "height": 30, + "margin": [ + 12, + 10, + 12, + 10 + ], + "alignment": "center" + } ], "styles": { diff --git a/configs/pdf-service/format-config/tlcertificate.json b/configs/pdf-service/format-config/tlcertificate.json index db6fb57a..7363dc18 100644 --- a/configs/pdf-service/format-config/tlcertificate.json +++ b/configs/pdf-service/format-config/tlcertificate.json @@ -534,7 +534,19 @@ ], "style":"disclaimer" - } + }, + { + "image": "{{footerLogoImage}}", + "width": 95, + "height": 30, + "margin": [ + 12, + 10, + 12, + 10 + ], + "alignment": "center" + } ], diff --git a/configs/pdf-service/format-config/tlrenewalcertificate.json b/configs/pdf-service/format-config/tlrenewalcertificate.json index ce984607..5cba81c5 100644 --- a/configs/pdf-service/format-config/tlrenewalcertificate.json +++ b/configs/pdf-service/format-config/tlrenewalcertificate.json @@ -534,7 +534,19 @@ ], "style":"disclaimer" - } + }, + { + "image": "{{footerLogoImage}}", + "width": 95, + "height": 30, + "margin": [ + 12, + 10, + 12, + 10 + ], + "alignment": "center" + } ], diff --git a/configs/pdf-service/format-config/tradelicense-bill.json b/configs/pdf-service/format-config/tradelicense-bill.json index 60f5b451..246e46f1 100644 --- a/configs/pdf-service/format-config/tradelicense-bill.json +++ b/configs/pdf-service/format-config/tradelicense-bill.json @@ -691,6 +691,18 @@ { "text": "{{receivers_signature}}", "style": "footer-bottom" + }, + { + "image": "{{footerLogoImage}}", + "width": 55, + "height": 61.25, + "margin": [ + 12, + 10, + 12, + 10 + ], + "alignment": "center" } ], "styles": { diff --git a/configs/pdf-service/format-config/tradelicense-receipt.json b/configs/pdf-service/format-config/tradelicense-receipt.json index 145583c5..3921a5d4 100644 --- a/configs/pdf-service/format-config/tradelicense-receipt.json +++ b/configs/pdf-service/format-config/tradelicense-receipt.json @@ -890,6 +890,18 @@ { "text":"Now log a complaint from WhatsApp, give a missed call on 8750975975 or send a Hi message on WhatsApp to this number", "bold": true, "fontSize": 8, "color": "blue", "decoration": "underline"} ] + }, + { + "image": "{{footerLogoImage}}", + "width": 95, + "height": 30, + "margin": [ + 12, + 10, + 12, + 10 + ], + "alignment": "center" } ], "styles": { diff --git a/configs/pdf-service/format-config/ws-applicationsewerage.json b/configs/pdf-service/format-config/ws-applicationsewerage.json index 6c854d1e..a9fa9569 100644 --- a/configs/pdf-service/format-config/ws-applicationsewerage.json +++ b/configs/pdf-service/format-config/ws-applicationsewerage.json @@ -1118,6 +1118,18 @@ ] }, "layout": {} + }, + { + "image": "{{footerLogoImage}}", + "width": 95, + "height": 30, + "margin": [ + 12, + 10, + 12, + 10 + ], + "alignment": "center" } ], "styles": { diff --git a/configs/pdf-service/format-config/ws-applicationwater.json b/configs/pdf-service/format-config/ws-applicationwater.json index 5a9e1260..3c8efb97 100644 --- a/configs/pdf-service/format-config/ws-applicationwater.json +++ b/configs/pdf-service/format-config/ws-applicationwater.json @@ -1254,6 +1254,18 @@ ] }, "layout": {} + }, + { + "image": "{{footerLogoImage}}", + "width": 95, + "height": 30, + "margin": [ + 12, + 10, + 12, + 10 + ], + "alignment": "center" } ], "styles": { diff --git a/configs/pdf-service/format-config/ws-bill.json b/configs/pdf-service/format-config/ws-bill.json index 868353fb..104b7174 100644 --- a/configs/pdf-service/format-config/ws-bill.json +++ b/configs/pdf-service/format-config/ws-bill.json @@ -997,6 +997,18 @@ { "text": "{{receivers_signature}}", "style": "footer-bottom" + }, + { + "image": "{{footerLogoImage}}", + "width": 55, + "height": 61.25, + "margin": [ + 12, + 10, + 12, + 10 + ], + "alignment": "center" } ], "styles": { diff --git a/configs/pdf-service/format-config/ws-consolidatedacknowlegment.json b/configs/pdf-service/format-config/ws-consolidatedacknowlegment.json index d4fe6da6..b32157cb 100644 --- a/configs/pdf-service/format-config/ws-consolidatedacknowlegment.json +++ b/configs/pdf-service/format-config/ws-consolidatedacknowlegment.json @@ -893,6 +893,18 @@ ] }, "layout": {} + }, + { + "image": "{{footerLogoImage}}", + "width": 95, + "height": 30, + "margin": [ + 12, + 10, + 12, + 10 + ], + "alignment": "center" } ], "styles": { diff --git a/configs/pdf-service/format-config/ws-consolidatedsewerageconnection.json b/configs/pdf-service/format-config/ws-consolidatedsewerageconnection.json index e22da0a5..69f390ef 100644 --- a/configs/pdf-service/format-config/ws-consolidatedsewerageconnection.json +++ b/configs/pdf-service/format-config/ws-consolidatedsewerageconnection.json @@ -704,6 +704,18 @@ ] }, "layout": {} + }, + { + "image": "{{footerLogoImage}}", + "width": 95, + "height": 30, + "margin": [ + 12, + 10, + 12, + 10 + ], + "alignment": "center" } ], "styles": { diff --git a/configs/pdf-service/format-config/ws-estimationnotice.json b/configs/pdf-service/format-config/ws-estimationnotice.json index 3a3f464b..8f401ffb 100644 --- a/configs/pdf-service/format-config/ws-estimationnotice.json +++ b/configs/pdf-service/format-config/ws-estimationnotice.json @@ -546,6 +546,18 @@ { "text": "{{approved_by}}", "alignment": "right" + }, + { + "image": "{{footerLogoImage}}", + "width": 95, + "height": 30, + "margin": [ + 12, + 10, + 12, + 10 + ], + "alignment": "center" } ], "styles": { diff --git a/configs/pdf-service/format-config/ws-onetime-receipt.json b/configs/pdf-service/format-config/ws-onetime-receipt.json index 89b411a6..3d99f4ab 100644 --- a/configs/pdf-service/format-config/ws-onetime-receipt.json +++ b/configs/pdf-service/format-config/ws-onetime-receipt.json @@ -859,6 +859,18 @@ { "style": "no-signature", "text": "{{no_signature}}" + }, + { + "image": "{{footerLogoImage}}", + "width": 95, + "height": 30, + "margin": [ + 12, + 10, + 12, + 10 + ], + "alignment": "center" } ], "styles": { diff --git a/configs/pdf-service/format-config/ws-sanctionletter.json b/configs/pdf-service/format-config/ws-sanctionletter.json index b16169c3..ca576cba 100644 --- a/configs/pdf-service/format-config/ws-sanctionletter.json +++ b/configs/pdf-service/format-config/ws-sanctionletter.json @@ -388,6 +388,18 @@ "text": "{{approved_by}}", "alignment": "center", "style": "receipt-down-footer" + }, + { + "image": "{{footerLogoImage}}", + "width": 95, + "height": 30, + "margin": [ + 12, + 10, + 12, + 10 + ], + "alignment": "center" } ], "styles": { From 391ca6d6765043093179b9f236cb5e81f312c7e3 Mon Sep 17 00:00:00 2001 From: manastanmay-eGov Date: Wed, 5 Apr 2023 12:44:58 +0530 Subject: [PATCH 1197/1242] Updated margin for ws receipt --- configs/pdf-service/format-config/ws-onetime-receipt.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/pdf-service/format-config/ws-onetime-receipt.json b/configs/pdf-service/format-config/ws-onetime-receipt.json index 3d99f4ab..16e8fbc6 100644 --- a/configs/pdf-service/format-config/ws-onetime-receipt.json +++ b/configs/pdf-service/format-config/ws-onetime-receipt.json @@ -865,9 +865,9 @@ "width": 95, "height": 30, "margin": [ - 12, + 5, 10, - 12, + 5, 10 ], "alignment": "center" From 9e3dbf9b774d87e86803b4288338692a9b22d628 Mon Sep 17 00:00:00 2001 From: manastanmay-eGov Date: Wed, 5 Apr 2023 13:19:20 +0530 Subject: [PATCH 1198/1242] Updated margin for ws receipt --- configs/pdf-service/format-config/ws-onetime-receipt.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/pdf-service/format-config/ws-onetime-receipt.json b/configs/pdf-service/format-config/ws-onetime-receipt.json index 16e8fbc6..d2f76c6e 100644 --- a/configs/pdf-service/format-config/ws-onetime-receipt.json +++ b/configs/pdf-service/format-config/ws-onetime-receipt.json @@ -865,9 +865,9 @@ "width": 95, "height": 30, "margin": [ - 5, + 0, 10, - 5, + -12, 10 ], "alignment": "center" From 4c3ec66d56f1a84c93b927f2bf1036aa63c24801 Mon Sep 17 00:00:00 2001 From: manastanmay-eGov Date: Wed, 5 Apr 2023 14:12:53 +0530 Subject: [PATCH 1199/1242] Updated margin for ws receipt --- .../pdf-service/format-config/ws-onetime-receipt.json | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/configs/pdf-service/format-config/ws-onetime-receipt.json b/configs/pdf-service/format-config/ws-onetime-receipt.json index d2f76c6e..49ec42a2 100644 --- a/configs/pdf-service/format-config/ws-onetime-receipt.json +++ b/configs/pdf-service/format-config/ws-onetime-receipt.json @@ -862,14 +862,8 @@ }, { "image": "{{footerLogoImage}}", - "width": 95, - "height": 30, - "margin": [ - 0, - 10, - -12, - 10 - ], + "width": 90, + "height": 20, "alignment": "center" } ], From 64943d200573f4aed21b38a9d5404be8ebd16348 Mon Sep 17 00:00:00 2001 From: manastanmay-eGov Date: Mon, 10 Apr 2023 10:21:48 +0530 Subject: [PATCH 1200/1242] Updated margin and size of mseva logo. --- .../format-config/bill-amendment-note.json | 16 ++++++++-------- .../format-config/bill-amendment.json | 16 ++++++++-------- .../format-config/bpa-revocation.json | 16 ++++++++-------- .../format-config/buildingpermit-low.json | 16 ++++++++-------- .../format-config/buildingpermit.json | 16 ++++++++-------- .../format-config/consolidated-pdf1.json | 16 ++++++++-------- .../format-config/consolidated-pdf2.json | 16 ++++++++-------- .../format-config/consolidatedbill.json | 16 ++++++++-------- .../format-config/consolidatedreceipt.json | 16 ++++++++-------- .../format-config/consolidatedreceiptold.json | 16 ++++++++-------- .../format-config/firenoc-receipt.json | 16 ++++++++-------- .../format-config/firenocreceipt.json | 16 ++++++++-------- .../pdf-service/format-config/mcollect-bill.json | 16 ++++++++-------- .../format-config/mcollect-challan.json | 16 ++++++++-------- .../pdf-service/format-config/misc-receipt.json | 16 ++++++++-------- .../format-config/passvehicle-certificate.json | 16 ++++++++-------- .../pdf-service/format-config/property-bill.json | 16 ++++++++-------- .../format-config/property-receipt.json | 16 ++++++++-------- .../pdf-service/format-config/pt-receipt.json | 16 ++++++++-------- .../format-config/ptmutationcertificate.json | 16 ++++++++-------- .../sewerage-bill-amendment-note.json | 16 ++++++++-------- configs/pdf-service/format-config/sw-bill.json | 16 ++++++++-------- .../format-config/testconsolidatedreceipt.json | 16 ++++++++-------- .../format-config/testlocalconsolidatedbill.json | 16 ++++++++-------- .../testlocalconsolidatedreceipt.json | 16 ++++++++-------- .../pdf-service/format-config/tl-receipt.json | 16 ++++++++-------- .../pdf-service/format-config/tlapplication.json | 16 ++++++++-------- .../pdf-service/format-config/tlcertificate.json | 16 ++++++++-------- .../format-config/tlrenewalcertificate.json | 16 ++++++++-------- .../format-config/tradelicense-bill.json | 16 ++++++++-------- .../format-config/tradelicense-receipt.json | 16 ++++++++-------- .../format-config/ws-applicationsewerage.json | 16 ++++++++-------- .../format-config/ws-applicationwater.json | 16 ++++++++-------- configs/pdf-service/format-config/ws-bill.json | 16 ++++++++-------- .../ws-consolidatedacknowlegment.json | 16 ++++++++-------- .../ws-consolidatedsewerageconnection.json | 16 ++++++++-------- .../format-config/ws-estimationnotice.json | 16 ++++++++-------- .../format-config/ws-onetime-receipt.json | 12 +++++++++--- .../format-config/ws-sanctionletter.json | 16 ++++++++-------- 39 files changed, 313 insertions(+), 307 deletions(-) diff --git a/configs/pdf-service/format-config/bill-amendment-note.json b/configs/pdf-service/format-config/bill-amendment-note.json index 67e3c31a..786c464c 100644 --- a/configs/pdf-service/format-config/bill-amendment-note.json +++ b/configs/pdf-service/format-config/bill-amendment-note.json @@ -405,15 +405,15 @@ }, { "image": "{{footerLogoImage}}", - "width": 95, - "height": 30, + "width": 90, + "height": 20, + "alignment": "center", "margin": [ - 12, - 10, - 12, - 10 - ], - "alignment": "center" + -12, + -10, + -230, + 0 + ] } ], diff --git a/configs/pdf-service/format-config/bill-amendment.json b/configs/pdf-service/format-config/bill-amendment.json index a8fc90a8..f86c7df9 100644 --- a/configs/pdf-service/format-config/bill-amendment.json +++ b/configs/pdf-service/format-config/bill-amendment.json @@ -467,15 +467,15 @@ }, { "image": "{{footerLogoImage}}", - "width": 95, - "height": 30, + "width": 90, + "height": 20, + "alignment": "center", "margin": [ - 12, - 10, - 12, - 10 - ], - "alignment": "center" + -12, + -10, + -230, + 0 + ] } ], diff --git a/configs/pdf-service/format-config/bpa-revocation.json b/configs/pdf-service/format-config/bpa-revocation.json index bf78d6b1..1eadce02 100644 --- a/configs/pdf-service/format-config/bpa-revocation.json +++ b/configs/pdf-service/format-config/bpa-revocation.json @@ -144,15 +144,15 @@ }, { "image": "{{footerLogoImage}}", - "width": 95, - "height": 30, + "width": 90, + "height": 20, + "alignment": "center", "margin": [ - 12, - 10, - 12, - 10 - ], - "alignment": "center" + -12, + -10, + -230, + 0 + ] } ], "styles": { diff --git a/configs/pdf-service/format-config/buildingpermit-low.json b/configs/pdf-service/format-config/buildingpermit-low.json index 0e92a2ce..305293c0 100644 --- a/configs/pdf-service/format-config/buildingpermit-low.json +++ b/configs/pdf-service/format-config/buildingpermit-low.json @@ -301,15 +301,15 @@ }, { "image": "{{footerLogoImage}}", - "width": 95, - "height": 30, + "width": 90, + "height": 20, + "alignment": "center", "margin": [ - 12, - 10, - 12, - 10 - ], - "alignment": "center" + -12, + -10, + -230, + 0 + ] } ], "styles": { diff --git a/configs/pdf-service/format-config/buildingpermit.json b/configs/pdf-service/format-config/buildingpermit.json index 06fd79dd..c5207e51 100644 --- a/configs/pdf-service/format-config/buildingpermit.json +++ b/configs/pdf-service/format-config/buildingpermit.json @@ -313,15 +313,15 @@ }, { "image": "{{footerLogoImage}}", - "width": 95, - "height": 30, + "width": 90, + "height": 20, + "alignment": "center", "margin": [ - 12, - 10, - 12, - 10 - ], - "alignment": "center" + -12, + -10, + -230, + 0 + ] } ], "footer": "(function(currentPage, pageCount) { return currentPage.toString() + ' of ' + pageCount; })", diff --git a/configs/pdf-service/format-config/consolidated-pdf1.json b/configs/pdf-service/format-config/consolidated-pdf1.json index 93c49c99..d084e922 100644 --- a/configs/pdf-service/format-config/consolidated-pdf1.json +++ b/configs/pdf-service/format-config/consolidated-pdf1.json @@ -451,15 +451,15 @@ }, { "image": "{{footerLogoImage}}", - "width": 95, - "height": 30, + "width": 90, + "height": 20, + "alignment": "center", "margin": [ - 12, - 10, - 12, - 10 - ], - "alignment": "center" + -12, + -10, + -230, + 0 + ] } ], "styles": { diff --git a/configs/pdf-service/format-config/consolidated-pdf2.json b/configs/pdf-service/format-config/consolidated-pdf2.json index 57d79266..ea4c2736 100644 --- a/configs/pdf-service/format-config/consolidated-pdf2.json +++ b/configs/pdf-service/format-config/consolidated-pdf2.json @@ -826,15 +826,15 @@ }, { "image": "{{footerLogoImage}}", - "width": 95, - "height": 30, + "width": 90, + "height": 20, + "alignment": "center", "margin": [ - 12, - 10, - 12, - 10 - ], - "alignment": "center" + -12, + -10, + -230, + 0 + ] } ], "styles": { diff --git a/configs/pdf-service/format-config/consolidatedbill.json b/configs/pdf-service/format-config/consolidatedbill.json index b8c1f522..9718079a 100644 --- a/configs/pdf-service/format-config/consolidatedbill.json +++ b/configs/pdf-service/format-config/consolidatedbill.json @@ -787,15 +787,15 @@ }, { "image": "{{footerLogoImage}}", - "width": 95, - "height": 30, + "width": 90, + "height": 20, + "alignment": "center", "margin": [ - 12, - 10, - 12, - 10 - ], - "alignment": "center" + -12, + -10, + -230, + 0 + ] } ], "styles": { diff --git a/configs/pdf-service/format-config/consolidatedreceipt.json b/configs/pdf-service/format-config/consolidatedreceipt.json index 1de63aa5..3d160bab 100644 --- a/configs/pdf-service/format-config/consolidatedreceipt.json +++ b/configs/pdf-service/format-config/consolidatedreceipt.json @@ -1257,15 +1257,15 @@ }, { "image": "{{footerLogoImage}}", - "width": 95, - "height": 30, + "width": 90, + "height": 20, + "alignment": "center", "margin": [ - 12, - 10, - 12, - 10 - ], - "alignment": "center" + -12, + -10, + -230, + 0 + ] } ], "styles": { diff --git a/configs/pdf-service/format-config/consolidatedreceiptold.json b/configs/pdf-service/format-config/consolidatedreceiptold.json index 945a3b2e..9b3ba866 100644 --- a/configs/pdf-service/format-config/consolidatedreceiptold.json +++ b/configs/pdf-service/format-config/consolidatedreceiptold.json @@ -1280,15 +1280,15 @@ }, { "image": "{{footerLogoImage}}", - "width": 95, - "height": 30, + "width": 90, + "height": 20, + "alignment": "center", "margin": [ - 12, - 10, - 12, - 10 - ], - "alignment": "center" + -12, + -10, + -230, + 0 + ] } ], "styles": { diff --git a/configs/pdf-service/format-config/firenoc-receipt.json b/configs/pdf-service/format-config/firenoc-receipt.json index f6dc5009..7675741a 100644 --- a/configs/pdf-service/format-config/firenoc-receipt.json +++ b/configs/pdf-service/format-config/firenoc-receipt.json @@ -357,15 +357,15 @@ }, { "image": "{{footerLogoImage}}", - "width": 95, - "height": 30, + "width": 90, + "height": 20, + "alignment": "center", "margin": [ - 12, - 10, - 12, - 10 - ], - "alignment": "center" + -12, + -10, + -230, + 0 + ] } ], "footer": [], diff --git a/configs/pdf-service/format-config/firenocreceipt.json b/configs/pdf-service/format-config/firenocreceipt.json index 4870cfcb..d127bbab 100644 --- a/configs/pdf-service/format-config/firenocreceipt.json +++ b/configs/pdf-service/format-config/firenocreceipt.json @@ -1257,15 +1257,15 @@ }, { "image": "{{footerLogoImage}}", - "width": 95, - "height": 30, + "width": 90, + "height": 20, + "alignment": "center", "margin": [ - 12, - 10, - 12, - 10 - ], - "alignment": "center" + -12, + -10, + -230, + 0 + ] } ], "styles": { diff --git a/configs/pdf-service/format-config/mcollect-bill.json b/configs/pdf-service/format-config/mcollect-bill.json index a5095cb1..09c8cb60 100644 --- a/configs/pdf-service/format-config/mcollect-bill.json +++ b/configs/pdf-service/format-config/mcollect-bill.json @@ -554,15 +554,15 @@ }, { "image": "{{footerLogoImage}}", - "width": 55, - "height": 61.25, + "width": 90, + "height": 20, + "alignment": "center", "margin": [ - 12, - 10, - 12, - 10 - ], - "alignment": "center" + -12, + -10, + -230, + 0 + ] } ], "styles": { diff --git a/configs/pdf-service/format-config/mcollect-challan.json b/configs/pdf-service/format-config/mcollect-challan.json index 6a64328c..c81a2df4 100644 --- a/configs/pdf-service/format-config/mcollect-challan.json +++ b/configs/pdf-service/format-config/mcollect-challan.json @@ -572,15 +572,15 @@ }, { "image": "{{footerLogoImage}}", - "width": 95, - "height": 30, + "width": 90, + "height": 20, + "alignment": "center", "margin": [ - 12, - 10, - 12, - 10 - ], - "alignment": "center" + -12, + -10, + -230, + 0 + ] } ], "styles": { diff --git a/configs/pdf-service/format-config/misc-receipt.json b/configs/pdf-service/format-config/misc-receipt.json index c90ac4a1..d4f3c3cc 100644 --- a/configs/pdf-service/format-config/misc-receipt.json +++ b/configs/pdf-service/format-config/misc-receipt.json @@ -483,15 +483,15 @@ }, { "image": "{{footerLogoImage}}", - "width": 95, - "height": 30, + "width": 90, + "height": 20, + "alignment": "center", "margin": [ - 12, - 10, - 12, - 10 - ], - "alignment": "center" + -12, + -10, + -230, + 0 + ] } ], "styles": { diff --git a/configs/pdf-service/format-config/passvehicle-certificate.json b/configs/pdf-service/format-config/passvehicle-certificate.json index eb90ec89..8ebdcb9d 100644 --- a/configs/pdf-service/format-config/passvehicle-certificate.json +++ b/configs/pdf-service/format-config/passvehicle-certificate.json @@ -399,15 +399,15 @@ }, { "image": "{{footerLogoImage}}", - "width": 95, - "height": 30, + "width": 90, + "height": 20, + "alignment": "center", "margin": [ - 12, - 10, - 12, - 10 - ], - "alignment": "center" + -12, + -10, + -230, + 0 + ] } ], "styles": { diff --git a/configs/pdf-service/format-config/property-bill.json b/configs/pdf-service/format-config/property-bill.json index c6f3932f..7770c0d4 100644 --- a/configs/pdf-service/format-config/property-bill.json +++ b/configs/pdf-service/format-config/property-bill.json @@ -951,15 +951,15 @@ }, { "image": "{{footerLogoImage}}", - "width": 55, - "height": 61.25, + "width": 90, + "height": 20, + "alignment": "center", "margin": [ - 12, - 10, - 12, - 10 - ], - "alignment": "center" + -12, + -10, + -230, + 0 + ] } ], "styles": { diff --git a/configs/pdf-service/format-config/property-receipt.json b/configs/pdf-service/format-config/property-receipt.json index 98109abf..674100ea 100644 --- a/configs/pdf-service/format-config/property-receipt.json +++ b/configs/pdf-service/format-config/property-receipt.json @@ -1177,15 +1177,15 @@ }, { "image": "{{footerLogoImage}}", - "width": 95, - "height": 30, + "width": 90, + "height": 20, + "alignment": "center", "margin": [ - 12, - 10, - 12, - 10 - ], - "alignment": "center" + -12, + -10, + -230, + 0 + ] } ], "styles": { diff --git a/configs/pdf-service/format-config/pt-receipt.json b/configs/pdf-service/format-config/pt-receipt.json index ee5f0cad..44a8e52e 100644 --- a/configs/pdf-service/format-config/pt-receipt.json +++ b/configs/pdf-service/format-config/pt-receipt.json @@ -739,15 +739,15 @@ }, { "image": "{{footerLogoImage}}", - "width": 95, - "height": 30, + "width": 90, + "height": 20, + "alignment": "center", "margin": [ - 12, - 10, - 12, - 10 - ], - "alignment": "center" + -12, + -10, + -230, + 0 + ] } ], "styles": { diff --git a/configs/pdf-service/format-config/ptmutationcertificate.json b/configs/pdf-service/format-config/ptmutationcertificate.json index e84cde07..9ed060a7 100644 --- a/configs/pdf-service/format-config/ptmutationcertificate.json +++ b/configs/pdf-service/format-config/ptmutationcertificate.json @@ -380,15 +380,15 @@ }, { "image": "{{footerLogoImage}}", - "width": 95, - "height": 30, + "width": 90, + "height": 20, + "alignment": "center", "margin": [ - 12, - 10, - 12, - 10 - ], - "alignment": "center" + -12, + -10, + -230, + 0 + ] } ], "styles": { diff --git a/configs/pdf-service/format-config/sewerage-bill-amendment-note.json b/configs/pdf-service/format-config/sewerage-bill-amendment-note.json index f581ab4f..5dfc0f30 100644 --- a/configs/pdf-service/format-config/sewerage-bill-amendment-note.json +++ b/configs/pdf-service/format-config/sewerage-bill-amendment-note.json @@ -377,15 +377,15 @@ }, { "image": "{{footerLogoImage}}", - "width": 95, - "height": 30, + "width": 90, + "height": 20, + "alignment": "center", "margin": [ - 12, - 10, - 12, - 10 - ], - "alignment": "center" + -12, + -10, + -230, + 0 + ] } ], diff --git a/configs/pdf-service/format-config/sw-bill.json b/configs/pdf-service/format-config/sw-bill.json index b6ae768e..95fd3362 100644 --- a/configs/pdf-service/format-config/sw-bill.json +++ b/configs/pdf-service/format-config/sw-bill.json @@ -1003,15 +1003,15 @@ }, { "image": "{{footerLogoImage}}", - "width": 55, - "height": 61.25, + "width": 90, + "height": 20, + "alignment": "center", "margin": [ - 12, - 10, - 12, - 10 - ], - "alignment": "center" + -12, + -10, + -230, + 0 + ] } ], "styles": { diff --git a/configs/pdf-service/format-config/testconsolidatedreceipt.json b/configs/pdf-service/format-config/testconsolidatedreceipt.json index 06b39018..a7d52895 100644 --- a/configs/pdf-service/format-config/testconsolidatedreceipt.json +++ b/configs/pdf-service/format-config/testconsolidatedreceipt.json @@ -464,15 +464,15 @@ }, { "image": "{{footerLogoImage}}", - "width": 95, - "height": 30, + "width": 90, + "height": 20, + "alignment": "center", "margin": [ - 12, - 10, - 12, - 10 - ], - "alignment": "center" + -12, + -10, + -230, + 0 + ] } ], "styles": { diff --git a/configs/pdf-service/format-config/testlocalconsolidatedbill.json b/configs/pdf-service/format-config/testlocalconsolidatedbill.json index a26f96c5..0586ce12 100644 --- a/configs/pdf-service/format-config/testlocalconsolidatedbill.json +++ b/configs/pdf-service/format-config/testlocalconsolidatedbill.json @@ -784,15 +784,15 @@ }, { "image": "{{footerLogoImage}}", - "width": 95, - "height": 30, + "width": 90, + "height": 20, + "alignment": "center", "margin": [ - 12, - 10, - 12, - 10 - ], - "alignment": "center" + -12, + -10, + -230, + 0 + ] } ], "styles": { diff --git a/configs/pdf-service/format-config/testlocalconsolidatedreceipt.json b/configs/pdf-service/format-config/testlocalconsolidatedreceipt.json index 40521fc9..fabe9961 100644 --- a/configs/pdf-service/format-config/testlocalconsolidatedreceipt.json +++ b/configs/pdf-service/format-config/testlocalconsolidatedreceipt.json @@ -471,15 +471,15 @@ }, { "image": "{{footerLogoImage}}", - "width": 95, - "height": 30, + "width": 90, + "height": 20, + "alignment": "center", "margin": [ - 12, - 10, - 12, - 10 - ], - "alignment": "center" + -12, + -10, + -230, + 0 + ] } ], "styles": { diff --git a/configs/pdf-service/format-config/tl-receipt.json b/configs/pdf-service/format-config/tl-receipt.json index c3276421..b925cbc1 100644 --- a/configs/pdf-service/format-config/tl-receipt.json +++ b/configs/pdf-service/format-config/tl-receipt.json @@ -786,15 +786,15 @@ }, { "image": "{{footerLogoImage}}", - "width": 95, - "height": 30, + "width": 90, + "height": 20, + "alignment": "center", "margin": [ - 12, - 10, - 12, - 10 - ], - "alignment": "center" + -12, + -10, + -230, + 0 + ] } ], "footer": [ diff --git a/configs/pdf-service/format-config/tlapplication.json b/configs/pdf-service/format-config/tlapplication.json index d6560a11..6a560709 100644 --- a/configs/pdf-service/format-config/tlapplication.json +++ b/configs/pdf-service/format-config/tlapplication.json @@ -1258,15 +1258,15 @@ }, { "image": "{{footerLogoImage}}", - "width": 95, - "height": 30, + "width": 90, + "height": 20, + "alignment": "center", "margin": [ - 12, - 10, - 12, - 10 - ], - "alignment": "center" + -12, + -10, + -230, + 0 + ] } ], diff --git a/configs/pdf-service/format-config/tlcertificate.json b/configs/pdf-service/format-config/tlcertificate.json index 7363dc18..353946c3 100644 --- a/configs/pdf-service/format-config/tlcertificate.json +++ b/configs/pdf-service/format-config/tlcertificate.json @@ -537,15 +537,15 @@ }, { "image": "{{footerLogoImage}}", - "width": 95, - "height": 30, + "width": 90, + "height": 20, + "alignment": "center", "margin": [ - 12, - 10, - 12, - 10 - ], - "alignment": "center" + -12, + -10, + -230, + 0 + ] } ], diff --git a/configs/pdf-service/format-config/tlrenewalcertificate.json b/configs/pdf-service/format-config/tlrenewalcertificate.json index 5cba81c5..9297cbd2 100644 --- a/configs/pdf-service/format-config/tlrenewalcertificate.json +++ b/configs/pdf-service/format-config/tlrenewalcertificate.json @@ -537,15 +537,15 @@ }, { "image": "{{footerLogoImage}}", - "width": 95, - "height": 30, + "width": 90, + "height": 20, + "alignment": "center", "margin": [ - 12, - 10, - 12, - 10 - ], - "alignment": "center" + -12, + -10, + -230, + 0 + ] } ], diff --git a/configs/pdf-service/format-config/tradelicense-bill.json b/configs/pdf-service/format-config/tradelicense-bill.json index 246e46f1..af2dae1d 100644 --- a/configs/pdf-service/format-config/tradelicense-bill.json +++ b/configs/pdf-service/format-config/tradelicense-bill.json @@ -694,15 +694,15 @@ }, { "image": "{{footerLogoImage}}", - "width": 55, - "height": 61.25, + "width": 90, + "height": 20, + "alignment": "center", "margin": [ - 12, - 10, - 12, - 10 - ], - "alignment": "center" + -12, + -10, + -230, + 0 + ] } ], "styles": { diff --git a/configs/pdf-service/format-config/tradelicense-receipt.json b/configs/pdf-service/format-config/tradelicense-receipt.json index 3921a5d4..46134816 100644 --- a/configs/pdf-service/format-config/tradelicense-receipt.json +++ b/configs/pdf-service/format-config/tradelicense-receipt.json @@ -893,15 +893,15 @@ }, { "image": "{{footerLogoImage}}", - "width": 95, - "height": 30, + "width": 90, + "height": 20, + "alignment": "center", "margin": [ - 12, - 10, - 12, - 10 - ], - "alignment": "center" + -12, + -10, + -230, + 0 + ] } ], "styles": { diff --git a/configs/pdf-service/format-config/ws-applicationsewerage.json b/configs/pdf-service/format-config/ws-applicationsewerage.json index a9fa9569..fa6036a5 100644 --- a/configs/pdf-service/format-config/ws-applicationsewerage.json +++ b/configs/pdf-service/format-config/ws-applicationsewerage.json @@ -1121,15 +1121,15 @@ }, { "image": "{{footerLogoImage}}", - "width": 95, - "height": 30, + "width": 90, + "height": 20, + "alignment": "center", "margin": [ - 12, - 10, - 12, - 10 - ], - "alignment": "center" + -12, + -10, + -230, + 0 + ] } ], "styles": { diff --git a/configs/pdf-service/format-config/ws-applicationwater.json b/configs/pdf-service/format-config/ws-applicationwater.json index 3c8efb97..ad785bb4 100644 --- a/configs/pdf-service/format-config/ws-applicationwater.json +++ b/configs/pdf-service/format-config/ws-applicationwater.json @@ -1257,15 +1257,15 @@ }, { "image": "{{footerLogoImage}}", - "width": 95, - "height": 30, + "width": 90, + "height": 20, + "alignment": "center", "margin": [ - 12, - 10, - 12, - 10 - ], - "alignment": "center" + -12, + -10, + -230, + 0 + ] } ], "styles": { diff --git a/configs/pdf-service/format-config/ws-bill.json b/configs/pdf-service/format-config/ws-bill.json index 104b7174..aec2dd96 100644 --- a/configs/pdf-service/format-config/ws-bill.json +++ b/configs/pdf-service/format-config/ws-bill.json @@ -1000,15 +1000,15 @@ }, { "image": "{{footerLogoImage}}", - "width": 55, - "height": 61.25, + "width": 90, + "height": 20, + "alignment": "center", "margin": [ - 12, - 10, - 12, - 10 - ], - "alignment": "center" + -12, + -10, + -230, + 0 + ] } ], "styles": { diff --git a/configs/pdf-service/format-config/ws-consolidatedacknowlegment.json b/configs/pdf-service/format-config/ws-consolidatedacknowlegment.json index b32157cb..2a7ab35d 100644 --- a/configs/pdf-service/format-config/ws-consolidatedacknowlegment.json +++ b/configs/pdf-service/format-config/ws-consolidatedacknowlegment.json @@ -896,15 +896,15 @@ }, { "image": "{{footerLogoImage}}", - "width": 95, - "height": 30, + "width": 90, + "height": 20, + "alignment": "center", "margin": [ - 12, - 10, - 12, - 10 - ], - "alignment": "center" + -12, + -10, + -230, + 0 + ] } ], "styles": { diff --git a/configs/pdf-service/format-config/ws-consolidatedsewerageconnection.json b/configs/pdf-service/format-config/ws-consolidatedsewerageconnection.json index 69f390ef..89a98c24 100644 --- a/configs/pdf-service/format-config/ws-consolidatedsewerageconnection.json +++ b/configs/pdf-service/format-config/ws-consolidatedsewerageconnection.json @@ -707,15 +707,15 @@ }, { "image": "{{footerLogoImage}}", - "width": 95, - "height": 30, + "width": 90, + "height": 20, + "alignment": "center", "margin": [ - 12, - 10, - 12, - 10 - ], - "alignment": "center" + -12, + -10, + -230, + 0 + ] } ], "styles": { diff --git a/configs/pdf-service/format-config/ws-estimationnotice.json b/configs/pdf-service/format-config/ws-estimationnotice.json index 8f401ffb..6a03a58c 100644 --- a/configs/pdf-service/format-config/ws-estimationnotice.json +++ b/configs/pdf-service/format-config/ws-estimationnotice.json @@ -549,15 +549,15 @@ }, { "image": "{{footerLogoImage}}", - "width": 95, - "height": 30, + "width": 90, + "height": 20, + "alignment": "center", "margin": [ - 12, - 10, - 12, - 10 - ], - "alignment": "center" + -12, + -10, + -230, + 0 + ] } ], "styles": { diff --git a/configs/pdf-service/format-config/ws-onetime-receipt.json b/configs/pdf-service/format-config/ws-onetime-receipt.json index 49ec42a2..f047520c 100644 --- a/configs/pdf-service/format-config/ws-onetime-receipt.json +++ b/configs/pdf-service/format-config/ws-onetime-receipt.json @@ -862,9 +862,15 @@ }, { "image": "{{footerLogoImage}}", - "width": 90, - "height": 20, - "alignment": "center" + "width": 75, + "height": 10, + "alignment": "center", + "margin": [ + -12, + -10, + -230, + 0 + ] } ], "styles": { diff --git a/configs/pdf-service/format-config/ws-sanctionletter.json b/configs/pdf-service/format-config/ws-sanctionletter.json index ca576cba..d8ca7659 100644 --- a/configs/pdf-service/format-config/ws-sanctionletter.json +++ b/configs/pdf-service/format-config/ws-sanctionletter.json @@ -391,15 +391,15 @@ }, { "image": "{{footerLogoImage}}", - "width": 95, - "height": 30, + "width": 90, + "height": 20, + "alignment": "center", "margin": [ - 12, - 10, - 12, - 10 - ], - "alignment": "center" + -12, + -10, + -230, + 0 + ] } ], "styles": { From fc133c0f82148bfec5ce6bc2e440e0ee04ec8ff0 Mon Sep 17 00:00:00 2001 From: manastanmay-eGov Date: Mon, 10 Apr 2023 15:36:58 +0530 Subject: [PATCH 1201/1242] Updated size for mseva logo --- configs/pdf-service/format-config/bill-amendment-note.json | 4 ++-- configs/pdf-service/format-config/bill-amendment.json | 4 ++-- configs/pdf-service/format-config/bpa-revocation.json | 4 ++-- configs/pdf-service/format-config/buildingpermit-low.json | 4 ++-- configs/pdf-service/format-config/buildingpermit.json | 4 ++-- configs/pdf-service/format-config/consolidated-pdf1.json | 4 ++-- configs/pdf-service/format-config/consolidated-pdf2.json | 4 ++-- configs/pdf-service/format-config/consolidatedbill.json | 4 ++-- configs/pdf-service/format-config/consolidatedreceipt.json | 4 ++-- configs/pdf-service/format-config/consolidatedreceiptold.json | 4 ++-- configs/pdf-service/format-config/firenoc-receipt.json | 4 ++-- configs/pdf-service/format-config/firenocreceipt.json | 4 ++-- configs/pdf-service/format-config/mcollect-bill.json | 4 ++-- configs/pdf-service/format-config/mcollect-challan.json | 4 ++-- configs/pdf-service/format-config/misc-receipt.json | 4 ++-- .../pdf-service/format-config/passvehicle-certificate.json | 4 ++-- configs/pdf-service/format-config/property-bill.json | 4 ++-- configs/pdf-service/format-config/property-receipt.json | 4 ++-- configs/pdf-service/format-config/pt-receipt.json | 4 ++-- configs/pdf-service/format-config/ptmutationcertificate.json | 4 ++-- .../format-config/sewerage-bill-amendment-note.json | 4 ++-- configs/pdf-service/format-config/sw-bill.json | 4 ++-- .../pdf-service/format-config/testconsolidatedreceipt.json | 4 ++-- .../pdf-service/format-config/testlocalconsolidatedbill.json | 4 ++-- .../format-config/testlocalconsolidatedreceipt.json | 4 ++-- configs/pdf-service/format-config/tl-receipt.json | 4 ++-- configs/pdf-service/format-config/tlapplication.json | 4 ++-- configs/pdf-service/format-config/tlcertificate.json | 4 ++-- configs/pdf-service/format-config/tlrenewalcertificate.json | 4 ++-- configs/pdf-service/format-config/tradelicense-bill.json | 4 ++-- configs/pdf-service/format-config/tradelicense-receipt.json | 4 ++-- configs/pdf-service/format-config/ws-applicationsewerage.json | 4 ++-- configs/pdf-service/format-config/ws-applicationwater.json | 4 ++-- configs/pdf-service/format-config/ws-bill.json | 4 ++-- .../format-config/ws-consolidatedacknowlegment.json | 4 ++-- .../format-config/ws-consolidatedsewerageconnection.json | 4 ++-- configs/pdf-service/format-config/ws-estimationnotice.json | 4 ++-- configs/pdf-service/format-config/ws-sanctionletter.json | 4 ++-- 38 files changed, 76 insertions(+), 76 deletions(-) diff --git a/configs/pdf-service/format-config/bill-amendment-note.json b/configs/pdf-service/format-config/bill-amendment-note.json index 786c464c..e3c7504b 100644 --- a/configs/pdf-service/format-config/bill-amendment-note.json +++ b/configs/pdf-service/format-config/bill-amendment-note.json @@ -405,8 +405,8 @@ }, { "image": "{{footerLogoImage}}", - "width": 90, - "height": 20, + "width": 75, + "height": 10, "alignment": "center", "margin": [ -12, diff --git a/configs/pdf-service/format-config/bill-amendment.json b/configs/pdf-service/format-config/bill-amendment.json index f86c7df9..5a433c4a 100644 --- a/configs/pdf-service/format-config/bill-amendment.json +++ b/configs/pdf-service/format-config/bill-amendment.json @@ -467,8 +467,8 @@ }, { "image": "{{footerLogoImage}}", - "width": 90, - "height": 20, + "width": 75, + "height": 10, "alignment": "center", "margin": [ -12, diff --git a/configs/pdf-service/format-config/bpa-revocation.json b/configs/pdf-service/format-config/bpa-revocation.json index 1eadce02..a6ff99f5 100644 --- a/configs/pdf-service/format-config/bpa-revocation.json +++ b/configs/pdf-service/format-config/bpa-revocation.json @@ -144,8 +144,8 @@ }, { "image": "{{footerLogoImage}}", - "width": 90, - "height": 20, + "width": 75, + "height": 10, "alignment": "center", "margin": [ -12, diff --git a/configs/pdf-service/format-config/buildingpermit-low.json b/configs/pdf-service/format-config/buildingpermit-low.json index 305293c0..7eb8d271 100644 --- a/configs/pdf-service/format-config/buildingpermit-low.json +++ b/configs/pdf-service/format-config/buildingpermit-low.json @@ -301,8 +301,8 @@ }, { "image": "{{footerLogoImage}}", - "width": 90, - "height": 20, + "width": 75, + "height": 10, "alignment": "center", "margin": [ -12, diff --git a/configs/pdf-service/format-config/buildingpermit.json b/configs/pdf-service/format-config/buildingpermit.json index c5207e51..f42622ab 100644 --- a/configs/pdf-service/format-config/buildingpermit.json +++ b/configs/pdf-service/format-config/buildingpermit.json @@ -313,8 +313,8 @@ }, { "image": "{{footerLogoImage}}", - "width": 90, - "height": 20, + "width": 75, + "height": 10, "alignment": "center", "margin": [ -12, diff --git a/configs/pdf-service/format-config/consolidated-pdf1.json b/configs/pdf-service/format-config/consolidated-pdf1.json index d084e922..c6fb9037 100644 --- a/configs/pdf-service/format-config/consolidated-pdf1.json +++ b/configs/pdf-service/format-config/consolidated-pdf1.json @@ -451,8 +451,8 @@ }, { "image": "{{footerLogoImage}}", - "width": 90, - "height": 20, + "width": 75, + "height": 10, "alignment": "center", "margin": [ -12, diff --git a/configs/pdf-service/format-config/consolidated-pdf2.json b/configs/pdf-service/format-config/consolidated-pdf2.json index ea4c2736..e9334b83 100644 --- a/configs/pdf-service/format-config/consolidated-pdf2.json +++ b/configs/pdf-service/format-config/consolidated-pdf2.json @@ -826,8 +826,8 @@ }, { "image": "{{footerLogoImage}}", - "width": 90, - "height": 20, + "width": 75, + "height": 10, "alignment": "center", "margin": [ -12, diff --git a/configs/pdf-service/format-config/consolidatedbill.json b/configs/pdf-service/format-config/consolidatedbill.json index 9718079a..c5f8282e 100644 --- a/configs/pdf-service/format-config/consolidatedbill.json +++ b/configs/pdf-service/format-config/consolidatedbill.json @@ -787,8 +787,8 @@ }, { "image": "{{footerLogoImage}}", - "width": 90, - "height": 20, + "width": 75, + "height": 10, "alignment": "center", "margin": [ -12, diff --git a/configs/pdf-service/format-config/consolidatedreceipt.json b/configs/pdf-service/format-config/consolidatedreceipt.json index 3d160bab..7a20a751 100644 --- a/configs/pdf-service/format-config/consolidatedreceipt.json +++ b/configs/pdf-service/format-config/consolidatedreceipt.json @@ -1257,8 +1257,8 @@ }, { "image": "{{footerLogoImage}}", - "width": 90, - "height": 20, + "width": 75, + "height": 10, "alignment": "center", "margin": [ -12, diff --git a/configs/pdf-service/format-config/consolidatedreceiptold.json b/configs/pdf-service/format-config/consolidatedreceiptold.json index 9b3ba866..869c08ce 100644 --- a/configs/pdf-service/format-config/consolidatedreceiptold.json +++ b/configs/pdf-service/format-config/consolidatedreceiptold.json @@ -1280,8 +1280,8 @@ }, { "image": "{{footerLogoImage}}", - "width": 90, - "height": 20, + "width": 75, + "height": 10, "alignment": "center", "margin": [ -12, diff --git a/configs/pdf-service/format-config/firenoc-receipt.json b/configs/pdf-service/format-config/firenoc-receipt.json index 7675741a..f1fd6a8f 100644 --- a/configs/pdf-service/format-config/firenoc-receipt.json +++ b/configs/pdf-service/format-config/firenoc-receipt.json @@ -357,8 +357,8 @@ }, { "image": "{{footerLogoImage}}", - "width": 90, - "height": 20, + "width": 75, + "height": 10, "alignment": "center", "margin": [ -12, diff --git a/configs/pdf-service/format-config/firenocreceipt.json b/configs/pdf-service/format-config/firenocreceipt.json index d127bbab..fc1fb90c 100644 --- a/configs/pdf-service/format-config/firenocreceipt.json +++ b/configs/pdf-service/format-config/firenocreceipt.json @@ -1257,8 +1257,8 @@ }, { "image": "{{footerLogoImage}}", - "width": 90, - "height": 20, + "width": 75, + "height": 10, "alignment": "center", "margin": [ -12, diff --git a/configs/pdf-service/format-config/mcollect-bill.json b/configs/pdf-service/format-config/mcollect-bill.json index 09c8cb60..93c01196 100644 --- a/configs/pdf-service/format-config/mcollect-bill.json +++ b/configs/pdf-service/format-config/mcollect-bill.json @@ -554,8 +554,8 @@ }, { "image": "{{footerLogoImage}}", - "width": 90, - "height": 20, + "width": 75, + "height": 10, "alignment": "center", "margin": [ -12, diff --git a/configs/pdf-service/format-config/mcollect-challan.json b/configs/pdf-service/format-config/mcollect-challan.json index c81a2df4..068e9c86 100644 --- a/configs/pdf-service/format-config/mcollect-challan.json +++ b/configs/pdf-service/format-config/mcollect-challan.json @@ -572,8 +572,8 @@ }, { "image": "{{footerLogoImage}}", - "width": 90, - "height": 20, + "width": 75, + "height": 10, "alignment": "center", "margin": [ -12, diff --git a/configs/pdf-service/format-config/misc-receipt.json b/configs/pdf-service/format-config/misc-receipt.json index d4f3c3cc..aac39bee 100644 --- a/configs/pdf-service/format-config/misc-receipt.json +++ b/configs/pdf-service/format-config/misc-receipt.json @@ -483,8 +483,8 @@ }, { "image": "{{footerLogoImage}}", - "width": 90, - "height": 20, + "width": 75, + "height": 10, "alignment": "center", "margin": [ -12, diff --git a/configs/pdf-service/format-config/passvehicle-certificate.json b/configs/pdf-service/format-config/passvehicle-certificate.json index 8ebdcb9d..9ddaeddd 100644 --- a/configs/pdf-service/format-config/passvehicle-certificate.json +++ b/configs/pdf-service/format-config/passvehicle-certificate.json @@ -399,8 +399,8 @@ }, { "image": "{{footerLogoImage}}", - "width": 90, - "height": 20, + "width": 75, + "height": 10, "alignment": "center", "margin": [ -12, diff --git a/configs/pdf-service/format-config/property-bill.json b/configs/pdf-service/format-config/property-bill.json index 7770c0d4..981085bd 100644 --- a/configs/pdf-service/format-config/property-bill.json +++ b/configs/pdf-service/format-config/property-bill.json @@ -951,8 +951,8 @@ }, { "image": "{{footerLogoImage}}", - "width": 90, - "height": 20, + "width": 75, + "height": 10, "alignment": "center", "margin": [ -12, diff --git a/configs/pdf-service/format-config/property-receipt.json b/configs/pdf-service/format-config/property-receipt.json index 674100ea..096a61a2 100644 --- a/configs/pdf-service/format-config/property-receipt.json +++ b/configs/pdf-service/format-config/property-receipt.json @@ -1177,8 +1177,8 @@ }, { "image": "{{footerLogoImage}}", - "width": 90, - "height": 20, + "width": 75, + "height": 10, "alignment": "center", "margin": [ -12, diff --git a/configs/pdf-service/format-config/pt-receipt.json b/configs/pdf-service/format-config/pt-receipt.json index 44a8e52e..14b38f83 100644 --- a/configs/pdf-service/format-config/pt-receipt.json +++ b/configs/pdf-service/format-config/pt-receipt.json @@ -739,8 +739,8 @@ }, { "image": "{{footerLogoImage}}", - "width": 90, - "height": 20, + "width": 75, + "height": 10, "alignment": "center", "margin": [ -12, diff --git a/configs/pdf-service/format-config/ptmutationcertificate.json b/configs/pdf-service/format-config/ptmutationcertificate.json index 9ed060a7..68483536 100644 --- a/configs/pdf-service/format-config/ptmutationcertificate.json +++ b/configs/pdf-service/format-config/ptmutationcertificate.json @@ -380,8 +380,8 @@ }, { "image": "{{footerLogoImage}}", - "width": 90, - "height": 20, + "width": 75, + "height": 10, "alignment": "center", "margin": [ -12, diff --git a/configs/pdf-service/format-config/sewerage-bill-amendment-note.json b/configs/pdf-service/format-config/sewerage-bill-amendment-note.json index 5dfc0f30..89e61c78 100644 --- a/configs/pdf-service/format-config/sewerage-bill-amendment-note.json +++ b/configs/pdf-service/format-config/sewerage-bill-amendment-note.json @@ -377,8 +377,8 @@ }, { "image": "{{footerLogoImage}}", - "width": 90, - "height": 20, + "width": 75, + "height": 10, "alignment": "center", "margin": [ -12, diff --git a/configs/pdf-service/format-config/sw-bill.json b/configs/pdf-service/format-config/sw-bill.json index 95fd3362..d83f6517 100644 --- a/configs/pdf-service/format-config/sw-bill.json +++ b/configs/pdf-service/format-config/sw-bill.json @@ -1003,8 +1003,8 @@ }, { "image": "{{footerLogoImage}}", - "width": 90, - "height": 20, + "width": 75, + "height": 10, "alignment": "center", "margin": [ -12, diff --git a/configs/pdf-service/format-config/testconsolidatedreceipt.json b/configs/pdf-service/format-config/testconsolidatedreceipt.json index a7d52895..2e889894 100644 --- a/configs/pdf-service/format-config/testconsolidatedreceipt.json +++ b/configs/pdf-service/format-config/testconsolidatedreceipt.json @@ -464,8 +464,8 @@ }, { "image": "{{footerLogoImage}}", - "width": 90, - "height": 20, + "width": 75, + "height": 10, "alignment": "center", "margin": [ -12, diff --git a/configs/pdf-service/format-config/testlocalconsolidatedbill.json b/configs/pdf-service/format-config/testlocalconsolidatedbill.json index 0586ce12..311e2c1c 100644 --- a/configs/pdf-service/format-config/testlocalconsolidatedbill.json +++ b/configs/pdf-service/format-config/testlocalconsolidatedbill.json @@ -784,8 +784,8 @@ }, { "image": "{{footerLogoImage}}", - "width": 90, - "height": 20, + "width": 75, + "height": 10, "alignment": "center", "margin": [ -12, diff --git a/configs/pdf-service/format-config/testlocalconsolidatedreceipt.json b/configs/pdf-service/format-config/testlocalconsolidatedreceipt.json index fabe9961..615c37f8 100644 --- a/configs/pdf-service/format-config/testlocalconsolidatedreceipt.json +++ b/configs/pdf-service/format-config/testlocalconsolidatedreceipt.json @@ -471,8 +471,8 @@ }, { "image": "{{footerLogoImage}}", - "width": 90, - "height": 20, + "width": 75, + "height": 10, "alignment": "center", "margin": [ -12, diff --git a/configs/pdf-service/format-config/tl-receipt.json b/configs/pdf-service/format-config/tl-receipt.json index b925cbc1..6db555c7 100644 --- a/configs/pdf-service/format-config/tl-receipt.json +++ b/configs/pdf-service/format-config/tl-receipt.json @@ -786,8 +786,8 @@ }, { "image": "{{footerLogoImage}}", - "width": 90, - "height": 20, + "width": 75, + "height": 10, "alignment": "center", "margin": [ -12, diff --git a/configs/pdf-service/format-config/tlapplication.json b/configs/pdf-service/format-config/tlapplication.json index 6a560709..f35ed3e5 100644 --- a/configs/pdf-service/format-config/tlapplication.json +++ b/configs/pdf-service/format-config/tlapplication.json @@ -1258,8 +1258,8 @@ }, { "image": "{{footerLogoImage}}", - "width": 90, - "height": 20, + "width": 75, + "height": 10, "alignment": "center", "margin": [ -12, diff --git a/configs/pdf-service/format-config/tlcertificate.json b/configs/pdf-service/format-config/tlcertificate.json index 353946c3..c6fcdf8f 100644 --- a/configs/pdf-service/format-config/tlcertificate.json +++ b/configs/pdf-service/format-config/tlcertificate.json @@ -537,8 +537,8 @@ }, { "image": "{{footerLogoImage}}", - "width": 90, - "height": 20, + "width": 75, + "height": 10, "alignment": "center", "margin": [ -12, diff --git a/configs/pdf-service/format-config/tlrenewalcertificate.json b/configs/pdf-service/format-config/tlrenewalcertificate.json index 9297cbd2..0ca3425a 100644 --- a/configs/pdf-service/format-config/tlrenewalcertificate.json +++ b/configs/pdf-service/format-config/tlrenewalcertificate.json @@ -537,8 +537,8 @@ }, { "image": "{{footerLogoImage}}", - "width": 90, - "height": 20, + "width": 75, + "height": 10, "alignment": "center", "margin": [ -12, diff --git a/configs/pdf-service/format-config/tradelicense-bill.json b/configs/pdf-service/format-config/tradelicense-bill.json index af2dae1d..32703aa4 100644 --- a/configs/pdf-service/format-config/tradelicense-bill.json +++ b/configs/pdf-service/format-config/tradelicense-bill.json @@ -694,8 +694,8 @@ }, { "image": "{{footerLogoImage}}", - "width": 90, - "height": 20, + "width": 75, + "height": 10, "alignment": "center", "margin": [ -12, diff --git a/configs/pdf-service/format-config/tradelicense-receipt.json b/configs/pdf-service/format-config/tradelicense-receipt.json index 46134816..464527c9 100644 --- a/configs/pdf-service/format-config/tradelicense-receipt.json +++ b/configs/pdf-service/format-config/tradelicense-receipt.json @@ -893,8 +893,8 @@ }, { "image": "{{footerLogoImage}}", - "width": 90, - "height": 20, + "width": 75, + "height": 10, "alignment": "center", "margin": [ -12, diff --git a/configs/pdf-service/format-config/ws-applicationsewerage.json b/configs/pdf-service/format-config/ws-applicationsewerage.json index fa6036a5..149b4cba 100644 --- a/configs/pdf-service/format-config/ws-applicationsewerage.json +++ b/configs/pdf-service/format-config/ws-applicationsewerage.json @@ -1121,8 +1121,8 @@ }, { "image": "{{footerLogoImage}}", - "width": 90, - "height": 20, + "width": 75, + "height": 10, "alignment": "center", "margin": [ -12, diff --git a/configs/pdf-service/format-config/ws-applicationwater.json b/configs/pdf-service/format-config/ws-applicationwater.json index ad785bb4..ad4ef7de 100644 --- a/configs/pdf-service/format-config/ws-applicationwater.json +++ b/configs/pdf-service/format-config/ws-applicationwater.json @@ -1257,8 +1257,8 @@ }, { "image": "{{footerLogoImage}}", - "width": 90, - "height": 20, + "width": 75, + "height": 10, "alignment": "center", "margin": [ -12, diff --git a/configs/pdf-service/format-config/ws-bill.json b/configs/pdf-service/format-config/ws-bill.json index aec2dd96..03048b2a 100644 --- a/configs/pdf-service/format-config/ws-bill.json +++ b/configs/pdf-service/format-config/ws-bill.json @@ -1000,8 +1000,8 @@ }, { "image": "{{footerLogoImage}}", - "width": 90, - "height": 20, + "width": 75, + "height": 10, "alignment": "center", "margin": [ -12, diff --git a/configs/pdf-service/format-config/ws-consolidatedacknowlegment.json b/configs/pdf-service/format-config/ws-consolidatedacknowlegment.json index 2a7ab35d..6dcb9884 100644 --- a/configs/pdf-service/format-config/ws-consolidatedacknowlegment.json +++ b/configs/pdf-service/format-config/ws-consolidatedacknowlegment.json @@ -896,8 +896,8 @@ }, { "image": "{{footerLogoImage}}", - "width": 90, - "height": 20, + "width": 75, + "height": 10, "alignment": "center", "margin": [ -12, diff --git a/configs/pdf-service/format-config/ws-consolidatedsewerageconnection.json b/configs/pdf-service/format-config/ws-consolidatedsewerageconnection.json index 89a98c24..460887c5 100644 --- a/configs/pdf-service/format-config/ws-consolidatedsewerageconnection.json +++ b/configs/pdf-service/format-config/ws-consolidatedsewerageconnection.json @@ -707,8 +707,8 @@ }, { "image": "{{footerLogoImage}}", - "width": 90, - "height": 20, + "width": 75, + "height": 10, "alignment": "center", "margin": [ -12, diff --git a/configs/pdf-service/format-config/ws-estimationnotice.json b/configs/pdf-service/format-config/ws-estimationnotice.json index 6a03a58c..58ff0307 100644 --- a/configs/pdf-service/format-config/ws-estimationnotice.json +++ b/configs/pdf-service/format-config/ws-estimationnotice.json @@ -549,8 +549,8 @@ }, { "image": "{{footerLogoImage}}", - "width": 90, - "height": 20, + "width": 75, + "height": 10, "alignment": "center", "margin": [ -12, diff --git a/configs/pdf-service/format-config/ws-sanctionletter.json b/configs/pdf-service/format-config/ws-sanctionletter.json index d8ca7659..24ea98ec 100644 --- a/configs/pdf-service/format-config/ws-sanctionletter.json +++ b/configs/pdf-service/format-config/ws-sanctionletter.json @@ -391,8 +391,8 @@ }, { "image": "{{footerLogoImage}}", - "width": 90, - "height": 20, + "width": 75, + "height": 10, "alignment": "center", "margin": [ -12, From 7fdb79400fadb8902f59a2d6a32aafc0152a5db2 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 3 May 2023 08:45:18 +0530 Subject: [PATCH 1202/1242] GetTenantConfig for mandatroy surveyid from frontend --- .../egov-searcher/rainmaker-pt-gissearch.yml | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/configs/egov-searcher/rainmaker-pt-gissearch.yml b/configs/egov-searcher/rainmaker-pt-gissearch.yml index d7f08aa3..f65e9f18 100644 --- a/configs/egov-searcher/rainmaker-pt-gissearch.yml +++ b/configs/egov-searcher/rainmaker-pt-gissearch.yml @@ -102,3 +102,27 @@ SearchDefinitions: jsonFormat: {"ResponseInfo": {}} outJsonPath: $.data responseInfoPath: $.ResponseInfo + + + - name: GetTenantConfig + query: + baseQuery: | + select array_to_json(array_agg(row_to_json(data))) from ( + select id,tenantid,locality,issurveyidmandatory + from eg_tenant_config + $where + ) data + groupBy: + orderBy: + searchParams: + condition: AND + params: + - name: tenantid + isMandatory: true + jsonPath: $.searchCriteria.tenantId + operator: = + + output: + jsonFormat: {"ResponseInfo": {}} + outJsonPath: $.data + responseInfoPath: $.ResponseInfo From 0f541939d93007f81930552f668c804a54dc69a9 Mon Sep 17 00:00:00 2001 From: palak-egov <86659286+palak-egov@users.noreply.github.com> Date: Fri, 12 May 2023 17:21:59 +0530 Subject: [PATCH 1203/1242] [UM-6095] correct query param for uc group bills --- configs/egov-searcher/bill-genie.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-searcher/bill-genie.yml b/configs/egov-searcher/bill-genie.yml index 6dd48121..cffaccb7 100644 --- a/configs/egov-searcher/bill-genie.yml +++ b/configs/egov-searcher/bill-genie.yml @@ -324,7 +324,7 @@ SearchDefinitions: isMandatory: false operator: ILIKE jsonPath: $.searchCriteria.billNo - - name: ptadd.locality + - name: challanadd.locality isMandatory: false jsonPath: $.searchCriteria.locality - name: fromperiod From a592a2cb3ad9039676313d0c4a4eee2e98b72bb8 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Fri, 26 May 2023 00:13:07 +0530 Subject: [PATCH 1204/1242] added GetAllowedRoles to control HRMS employee during assigning roles --- .../egov-searcher/rainmaker-pt-gissearch.yml | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/configs/egov-searcher/rainmaker-pt-gissearch.yml b/configs/egov-searcher/rainmaker-pt-gissearch.yml index f65e9f18..a524e7ff 100644 --- a/configs/egov-searcher/rainmaker-pt-gissearch.yml +++ b/configs/egov-searcher/rainmaker-pt-gissearch.yml @@ -126,3 +126,26 @@ SearchDefinitions: jsonFormat: {"ResponseInfo": {}} outJsonPath: $.data responseInfoPath: $.ResponseInfo + + - name: GetAllowedRoles + query: + baseQuery: | + select array_to_json(array_agg(row_to_json(data))) from ( + select tenantid,allowedrole,active + from eg_hrms_role_control + $where + ) data + groupBy: + orderBy: + searchParams: + condition: AND + params: + - name: hrmsrole + isMandatory: true + jsonPath: $.searchCriteria.rolecode + operator: = + + output: + jsonFormat: {"ResponseInfo": {}} + outJsonPath: $.data + responseInfoPath: $.ResponseInfo From 653c0fa90f23d503451ba7761166e53f85edd1c2 Mon Sep 17 00:00:00 2001 From: Ramesh Kumar Date: Fri, 2 Jun 2023 09:11:44 +0530 Subject: [PATCH 1205/1242] remove G8 recipt date --- .../data-config/ws-onetime-receipt.json | 15 +------ .../format-config/ws-onetime-receipt.json | 43 +------------------ 2 files changed, 2 insertions(+), 56 deletions(-) diff --git a/configs/pdf-service/data-config/ws-onetime-receipt.json b/configs/pdf-service/data-config/ws-onetime-receipt.json index 226ede8b..ed2248c3 100644 --- a/configs/pdf-service/data-config/ws-onetime-receipt.json +++ b/configs/pdf-service/data-config/ws-onetime-receipt.json @@ -124,19 +124,6 @@ "module": "rainmaker-common" } }, - { - "variable": "G8ReceiptNo", - "value": { - "path": "$.paymentDetails[0].manualReceiptNumber" - } - }, - { - "variable": "G8ReceiptDate", - "value": { - "path": "$.paymentDetails[0].manualReceiptDate" - }, - "type": "date" - }, { "variable": "paymentDate", "value": { @@ -236,7 +223,7 @@ { "variable": "consumer_id", "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_CONSUMER_NO" + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_CONSUMER_NOAPP" }, "type": "label", "localisation": { diff --git a/configs/pdf-service/format-config/ws-onetime-receipt.json b/configs/pdf-service/format-config/ws-onetime-receipt.json index f047520c..2c4752c1 100644 --- a/configs/pdf-service/format-config/ws-onetime-receipt.json +++ b/configs/pdf-service/format-config/ws-onetime-receipt.json @@ -298,49 +298,8 @@ "style": "receipt-table" } - ], - [ - { - "text": "{{g8_receipt_no}}.", - "border": [ - true, - false, - false, - true - ], - "style": "receipt-table-value" - }, - { - "text": "{{G8ReceiptNo}}", - "border": [ - false, - false, - false, - true - ], - "style": "receipt-table" - }, - { - "text": "{{g8_receipt_date}}", - "border": [ - false, - false, - false, - true - ], - "style": "receipt-table-value" - }, - { - "text": "{{G8ReceiptDate}}", - "border": [ - false, - false, - true, - true - ], - "style": "receipt-table" - } ] + ] }, "layout": {} From da87cad37287a1cd136ee5e100942b90f73899a6 Mon Sep 17 00:00:00 2001 From: Ramesh Kumar Date: Fri, 2 Jun 2023 10:51:39 +0530 Subject: [PATCH 1206/1242] removed g8 receipt --- .../data-config/ws-onetime-receipt.json | 24 ---------- .../format-config/ws-onetime-receipt.json | 44 +------------------ 2 files changed, 1 insertion(+), 67 deletions(-) diff --git a/configs/pdf-service/data-config/ws-onetime-receipt.json b/configs/pdf-service/data-config/ws-onetime-receipt.json index ed2248c3..29435e79 100644 --- a/configs/pdf-service/data-config/ws-onetime-receipt.json +++ b/configs/pdf-service/data-config/ws-onetime-receipt.json @@ -364,30 +364,6 @@ "module": "rainmaker-common" } }, - { - "variable": "g8_receipt_no", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_G8_RECEIPT_NO" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "g8_receipt_date", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_G8_RECEIPT_DATE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, { "variable": "generated_by", "value": { diff --git a/configs/pdf-service/format-config/ws-onetime-receipt.json b/configs/pdf-service/format-config/ws-onetime-receipt.json index 2c4752c1..17962ddd 100644 --- a/configs/pdf-service/format-config/ws-onetime-receipt.json +++ b/configs/pdf-service/format-config/ws-onetime-receipt.json @@ -710,49 +710,7 @@ "style": "receipt-table" } - ], - [ - { - "text": "{{g8_receipt_no}}.", - "border": [ - true, - false, - false, - true - ], - "style": "receipt-table-value" - }, - { - "text": "{{G8ReceiptNo}}", - "border": [ - false, - false, - false, - true - ], - "style": "receipt-table" - }, - { - "text": "{{g8_receipt_date}}", - "border": [ - false, - false, - false, - true - ], - "style": "receipt-table-value" - }, - { - "text": "{{G8ReceiptDate}}", - "border": [ - false, - false, - true, - true - ], - "style": "receipt-table" - } - ] + ] ] }, "layout": {} From b1dce912ebfd26dad5dec8ef30f53b70773fd53a Mon Sep 17 00:00:00 2001 From: jitendra-eGov <100871838+jitendra-eGov@users.noreply.github.com> Date: Mon, 5 Jun 2023 15:42:53 +0530 Subject: [PATCH 1207/1242] Update removed water and severages --- .../MasterDashboardConfig.json | 30 ------------------- 1 file changed, 30 deletions(-) diff --git a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json index f2a230cc..3a17f084 100644 --- a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json +++ b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json @@ -1545,36 +1545,6 @@ } ] }, - { - "id": 142, - "name": "DSS_WATER_SEWERAGE", - "vizType": "module", - "moduleLevel": "W&S", - "ref": { - "url": "ws", - "logoUrl": "", - "type": "internal" - }, - "label": "", - "charts": [ - { - "id": "wstotalCollection", - "name": "DSS_WS_TOTAL_COLLECTION", - "code": "", - "chartType": "metric", - "filter": "", - "headers": [] - }, - { - "id": "wstotalConnection", - "name": "DSS_WS_TOTAL_CONNECTIONS", - "code": "", - "chartType": "metric", - "filter": "", - "headers": [] - } - ] - }, { "id": 329, "name": "DSS_MCOLLECT", From a2576ff807f7fc97b8349fd6123eb3328d6f3663 Mon Sep 17 00:00:00 2001 From: Ramesh Kumar Date: Tue, 6 Jun 2023 08:01:18 +0530 Subject: [PATCH 1208/1242] Changed water payment receipt --- configs/pdf-service/data-config/ws-onetime-receipt.json | 2 +- configs/pdf-service/format-config/ws-onetime-receipt.json | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/configs/pdf-service/data-config/ws-onetime-receipt.json b/configs/pdf-service/data-config/ws-onetime-receipt.json index 29435e79..faf61981 100644 --- a/configs/pdf-service/data-config/ws-onetime-receipt.json +++ b/configs/pdf-service/data-config/ws-onetime-receipt.json @@ -391,7 +391,7 @@ { "variable": "no_signature", "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_NO_SIGNATURE" + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_NO_SIGNATURE_WATER" }, "type": "label", "localisation": { diff --git a/configs/pdf-service/format-config/ws-onetime-receipt.json b/configs/pdf-service/format-config/ws-onetime-receipt.json index 17962ddd..7d2dbff1 100644 --- a/configs/pdf-service/format-config/ws-onetime-receipt.json +++ b/configs/pdf-service/format-config/ws-onetime-receipt.json @@ -215,7 +215,7 @@ ], [ { - "text": "Cheque/DD/PO/Transaction No.", + "text": "Cheque/DD/PO/Txn No.", "border": [ true, false, @@ -235,7 +235,7 @@ "style": "receipt-table" }, { - "text": "Cheque/DD/PO/Transaction Date", + "text": "Cheque/DD/PO/Txn Date", "border": [ false, false, @@ -627,7 +627,7 @@ ], [ { - "text": "Cheque/DD/PO/Transaction No.", + "text": "Cheque/DD/PO/Txn No.", "border": [ true, false, @@ -647,7 +647,7 @@ "style": "receipt-table" }, { - "text": "Cheque/DD/PO/Transaction Date", + "text": "Cheque/DD/PO/Txn Date", "border": [ false, false, From b69430d3ef2ecb119dc299e871a281822ed000c5 Mon Sep 17 00:00:00 2001 From: Ramesh Kumar Date: Tue, 6 Jun 2023 08:14:14 +0530 Subject: [PATCH 1209/1242] Changed cheque --- configs/pdf-service/format-config/ws-onetime-receipt.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/pdf-service/format-config/ws-onetime-receipt.json b/configs/pdf-service/format-config/ws-onetime-receipt.json index 7d2dbff1..a4c79405 100644 --- a/configs/pdf-service/format-config/ws-onetime-receipt.json +++ b/configs/pdf-service/format-config/ws-onetime-receipt.json @@ -215,7 +215,7 @@ ], [ { - "text": "Cheque/DD/PO/Txn No.", + "text": "Chq/DD/PO/Txn No.", "border": [ true, false, @@ -235,7 +235,7 @@ "style": "receipt-table" }, { - "text": "Cheque/DD/PO/Txn Date", + "text": "Chq/DD/PO/Txn Date", "border": [ false, false, @@ -627,7 +627,7 @@ ], [ { - "text": "Cheque/DD/PO/Txn No.", + "text": "Chq/DD/PO/Txn No.", "border": [ true, false, @@ -647,7 +647,7 @@ "style": "receipt-table" }, { - "text": "Cheque/DD/PO/Txn Date", + "text": "Chq/DD/PO/Txn Date", "border": [ false, false, From faf775672d194764bc63d5d40f333a80e42900a0 Mon Sep 17 00:00:00 2001 From: Ramesh Kumar Date: Wed, 7 Jun 2023 08:16:11 +0530 Subject: [PATCH 1210/1242] Change genrated eSewa --- configs/pdf-service/data-config/ws-onetime-receipt.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/pdf-service/data-config/ws-onetime-receipt.json b/configs/pdf-service/data-config/ws-onetime-receipt.json index faf61981..ff0577ef 100644 --- a/configs/pdf-service/data-config/ws-onetime-receipt.json +++ b/configs/pdf-service/data-config/ws-onetime-receipt.json @@ -223,7 +223,7 @@ { "variable": "consumer_id", "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_CONSUMER_NOAPP" + "path": "Application No" }, "type": "label", "localisation": { @@ -391,7 +391,7 @@ { "variable": "no_signature", "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_NO_SIGNATURE_WATER" + "path": "This is Computer genrated eSewa. Signature is not required" }, "type": "label", "localisation": { From 3df65c87bb84c6bc10223d80ab40162cbcb5f111 Mon Sep 17 00:00:00 2001 From: ABHISHEK RANA <121286986+abhirana04@users.noreply.github.com> Date: Mon, 7 Aug 2023 10:54:29 +0530 Subject: [PATCH 1211/1242] updating fn_owner in uat for owner conflict --- configs/egov-persister/firenoc_persiter.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-persister/firenoc_persiter.yaml b/configs/egov-persister/firenoc_persiter.yaml index e7a57fde..e3f70472 100644 --- a/configs/egov-persister/firenoc_persiter.yaml +++ b/configs/egov-persister/firenoc_persiter.yaml @@ -467,7 +467,7 @@ serviceMaps: - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings.*.uoms[*].id)].auditDetails.lastModifiedTime - - query: INSERT INTO eg_fn_owner(uuid, tenantid, firenocdetailsuuid, isactive, isprimaryowner, ownertype, ownershippercentage, relationship, active, institutionid, createdby, createdtime, lastmodifiedby, lastmodifiedtime,useruuid) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?) ON CONFLICT ON CONSTRAINT pk_eg_fn_owner DO UPDATE SET active = ?, isprimaryowner = ?, ownertype = ?, ownershippercentage = ?, relationship = ?,useruuid=?, lastmodifiedby = ?, lastmodifiedtime = ?; + - query: INSERT INTO eg_fn_owner(uuid, tenantid, firenocdetailsuuid, isactive, isprimaryowner, ownertype, ownershippercentage, relationship, active, institutionid, createdby, createdtime, lastmodifiedby, lastmodifiedtime,useruuid) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?) ON CONFLICT ON CONSTRAINT pk_eg_fn_owner DO NOTHING; basePath: FireNOCs.*.fireNOCDetails.applicantDetails.owners.* jsonMaps: - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.owners.*.ownerUUID From 46e9fb4a2a900bd5951ee3953a4f398fee35515a Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Mon, 7 Aug 2023 12:41:29 +0530 Subject: [PATCH 1212/1242] reverted the changes for updating user --- configs/egov-persister/firenoc_persiter.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/egov-persister/firenoc_persiter.yaml b/configs/egov-persister/firenoc_persiter.yaml index e3f70472..e7a57fde 100644 --- a/configs/egov-persister/firenoc_persiter.yaml +++ b/configs/egov-persister/firenoc_persiter.yaml @@ -467,7 +467,7 @@ serviceMaps: - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings.*.uoms[*].id)].auditDetails.lastModifiedTime - - query: INSERT INTO eg_fn_owner(uuid, tenantid, firenocdetailsuuid, isactive, isprimaryowner, ownertype, ownershippercentage, relationship, active, institutionid, createdby, createdtime, lastmodifiedby, lastmodifiedtime,useruuid) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?) ON CONFLICT ON CONSTRAINT pk_eg_fn_owner DO NOTHING; + - query: INSERT INTO eg_fn_owner(uuid, tenantid, firenocdetailsuuid, isactive, isprimaryowner, ownertype, ownershippercentage, relationship, active, institutionid, createdby, createdtime, lastmodifiedby, lastmodifiedtime,useruuid) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?) ON CONFLICT ON CONSTRAINT pk_eg_fn_owner DO UPDATE SET active = ?, isprimaryowner = ?, ownertype = ?, ownershippercentage = ?, relationship = ?,useruuid=?, lastmodifiedby = ?, lastmodifiedtime = ?; basePath: FireNOCs.*.fireNOCDetails.applicantDetails.owners.* jsonMaps: - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.owners.*.ownerUUID From 631eac64a54a36e1bd5d1c4d0c822783d12311b8 Mon Sep 17 00:00:00 2001 From: Ramesh Kumar Date: Wed, 13 Sep 2023 15:46:02 +0530 Subject: [PATCH 1213/1242] Updated onetime receipt ws --- .../data-config/ws-onetime-receipt.json | 14 ++-- .../format-config/ws-onetime-receipt.json | 76 ++----------------- 2 files changed, 13 insertions(+), 77 deletions(-) diff --git a/configs/pdf-service/data-config/ws-onetime-receipt.json b/configs/pdf-service/data-config/ws-onetime-receipt.json index ff0577ef..9502c79b 100644 --- a/configs/pdf-service/data-config/ws-onetime-receipt.json +++ b/configs/pdf-service/data-config/ws-onetime-receipt.json @@ -50,7 +50,7 @@ } }, { - "variable": "serviceType", + "variable": "serviceTypeTemp", "value": { "path": "$.paymentDetails[0].guardianName" }, @@ -223,7 +223,7 @@ { "variable": "consumer_id", "value": { - "path": "Application No" + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_CONSUMER_NO_APP" }, "type": "label", "localisation": { @@ -364,6 +364,7 @@ "module": "rainmaker-common" } }, + { "variable": "generated_by", "value": { @@ -391,7 +392,7 @@ { "variable": "no_signature", "value": { - "path": "This is Computer genrated eSewa. Signature is not required" + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_NO_SIGNATURE_WATER" }, "type": "label", "localisation": { @@ -495,12 +496,7 @@ "prefix": null, "module": "rainmaker-common" } - }, - { - "variable": "footerLogoImage", - "url": "https://uat.digit.org/pg-egov-assets/mseva-logo-colored.png", - "type": "image" - } + } ] }, { diff --git a/configs/pdf-service/format-config/ws-onetime-receipt.json b/configs/pdf-service/format-config/ws-onetime-receipt.json index a4c79405..8e957540 100644 --- a/configs/pdf-service/format-config/ws-onetime-receipt.json +++ b/configs/pdf-service/format-config/ws-onetime-receipt.json @@ -4,13 +4,6 @@ "defaultStyle": { "font": "Cambay" }, - "watermark": { - "text": "DIGIT UAT DIGIT UAT", - "color": "gery", - "opacity": 0.1, - "bold": true, - "italics": false - }, "content": [ { "style": "noc-head", @@ -30,7 +23,7 @@ { "stack": [ { - "text": "{{logo-header}} (Digit UAT)", + "text": "{{logo-header}}{{mcGrade}}", "style": "receipt-logo-header" }, { @@ -215,7 +208,7 @@ ], [ { - "text": "Chq/DD/PO/Txn No.", + "text": "Chq/DD/PO/Txn Date", "border": [ true, false, @@ -299,7 +292,7 @@ } ] - + ] }, "layout": {} @@ -530,48 +523,6 @@ ], "style": "receipt-table-value" }, - { - "text": "{{guardianName}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - } - ], - [ - { - "text": "{{propertyID}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{landMark}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{communicationAddress}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, { "text": "{{payerName}}", "border": [ @@ -582,8 +533,8 @@ ], "style": "receipt-table" } - ], - [ + ], + [ { "text": "{{payer_contact}}", "border": [ @@ -627,7 +578,7 @@ ], [ { - "text": "Chq/DD/PO/Txn No.", + "text": "Chq/DD/PO/Txn Date", "border": [ true, false, @@ -710,7 +661,8 @@ "style": "receipt-table" } - ] + ] + ] }, "layout": {} @@ -776,18 +728,6 @@ { "style": "no-signature", "text": "{{no_signature}}" - }, - { - "image": "{{footerLogoImage}}", - "width": 75, - "height": 10, - "alignment": "center", - "margin": [ - -12, - -10, - -230, - 0 - ] } ], "styles": { From 7056e436e9fc7182164d8919727c267b14980128 Mon Sep 17 00:00:00 2001 From: erramesh000 Date: Thu, 21 Dec 2023 12:25:00 +0530 Subject: [PATCH 1214/1242] removed files --- build/build-config.yml | 15 - build/maven/Dockerfile | 9 - build/maven/start.sh | 11 - .../dashboard-analytics/ChartApiConfig.json | 5594 --------------- .../MasterDashboardConfig.json | 4989 ------------- .../RoleDashboardConfig.json | 562 -- .../RoleDashboardMappingsConf.json | 79 - .../TenantCodeNameMappings.json | 561 -- .../dashboard-analytics/getchart.json | 43 - .../CollectionDomainConfig.json | 51 - .../dashboard-ingest/DigressionPoints.json | 8 - .../dashboard-ingest/DomainConfig.json | 247 - .../dashboard-ingest/EnhanceDomainConfig.json | 31 - .../TopicContextConfiguration.json | 14 - .../dashboard-ingest/config.properties | 18 - .../enrichment_transaction_v1.json | 49 - .../transform_collection_v1.json | 100 - .../transform_firenoc_v1.json | 10 - .../transform_mcollect_v1.json | 8 - .../dashboard-ingest/transform_pgr_v1.json | 12 - .../transform_pt_enhance_v1.json | 12 - .../dashboard-ingest/transform_pt_v1.json | 13 - .../transform_sw.one_time_fee_v1.json | 17 - .../dashboard-ingest/transform_sw_v1.json | 17 - .../dashboard-ingest/transform_target_v1.json | 20 - .../dashboard-ingest/transform_tl_v1.json | 25 - .../transform_transaction_v1.json | 29 - .../transform_ws.one_time_fee_v1.json | 17 - .../dashboard-ingest/transform_ws_v1.json | 17 - .../validator_transaction_v1.json | 32 - .../egov-indexer/billingservices-indexer.yml | 21 - .../egov-indexer/chatbot-telemetry-v2.yaml | 12 - configs/egov-indexer/chatbot-telemetry.yaml | 12 - configs/egov-indexer/collection-indexer.yml | 165 - .../egov-indexer/covid-chatbot-telemetry.yaml | 12 - configs/egov-indexer/egov-bpa-indexer.yml | 133 - .../egov-indexer/chatbot-telemetry-v2.yaml | 12 - .../egov-indexer/egov-telemetry-indexer.yml | 35 - .../egov-indexer/egov-uploader-indexer.yml | 28 - configs/egov-indexer/error-queue.yml | 27 - .../finance-rolloutadoption-indexer.yml | 31 - .../payment-indexer-migration.yml | 54 - configs/egov-indexer/payment-indexer.yml | 485 -- .../property-services-migration-temp.yml | 775 -- .../property-services-migration.yml | 134 - configs/egov-indexer/property-services.yml | 861 --- .../rainmaker-bpastakeholder-indexer.yml | 24 - .../rainmaker-firenoc-indexer.yml | 304 - .../egov-indexer/rainmaker-pgr-indexer.yml | 322 - configs/egov-indexer/rainmaker-pt-indexer.yml | 207 - configs/egov-indexer/rainmaker-tl-indexer.yml | 163 - configs/egov-indexer/sewerage-service.yml | 410 -- configs/egov-indexer/tradelicense-indexer.yml | 21 - configs/egov-indexer/water-service.yml | 444 -- configs/egov-indexer/water-services-meter.yml | 28 - .../egov-indexer/whatsapp-adoption-data.yaml | 12 - .../mdms-masters-config.json | 715 -- .../egov-persister/apportion-persister.yml | 81 - .../assessment-persister-migration-temp.yml | 228 - .../egov-persister/assessment-persister.yml | 228 - .../auto-escalation-persister.yml | 21 - .../billing-services-persist.yml | 274 - configs/egov-persister/chatbot.yml | 77 - .../collection-migration-count.yml | 23 - .../collection-migration-persister.yml | 240 - configs/egov-persister/echallan.yml | 122 - configs/egov-persister/egf-bill.yaml | 338 - .../egov-user-event-persister.yml | 154 - .../egov-workflow-v2-persister.yml | 272 - .../firenoc-calculator-persister.yml | 92 - configs/egov-persister/firenoc_persiter.yaml | 643 -- .../hrms-employee-persister.yml | 504 -- .../egov-persister/indexer-job-persister.yml | 68 - .../migration-batch-count-persister.yml | 27 - .../egov-persister/pdf-filestoreid-update.yml | 30 - configs/egov-persister/pdf-generator.yml | 41 - .../egov-persister/pg-service-persister.yml | 147 - configs/egov-persister/pgr-v3-persister.yml | 211 - configs/egov-persister/pgr.yml | 203 - ...roperty-services-migration-temp-config.yml | 418 -- .../property-services-persister.yml | 784 -- .../property-services-registry.yml | 591 -- configs/egov-persister/property-services.yml | 819 --- .../pt-calculator-v2-persister.yml | 118 - .../egov-persister/pt-drafts-persister.yml | 65 - .../pt-mutation-calculator-persister.yml | 87 - configs/egov-persister/pt-persist.yml | 582 -- .../sewerage-bill-scheduler.yml | 33 - configs/egov-persister/sewerage-persist.yml | 455 -- .../tl-billing-slab-persister.yml | 81 - .../tl-calculation-persister.yml | 53 - .../egov-persister/tradelicense-persister.yml | 865 --- configs/egov-persister/tradelicense.yml | 846 --- configs/egov-persister/uploader-persister.yml | 75 - .../egov-persister/water-bill-scheduler.yml | 33 - configs/egov-persister/water-meter.yml | 37 - configs/egov-persister/water-persist.yml | 473 -- .../egov-searcher/PTDemandBasedSearcher.yml | 45 - configs/egov-searcher/bill-genie.yml | 345 - configs/egov-searcher/localitySearcher.yml | 194 - configs/egov-searcher/propertyopensearch.yml | 42 - .../rainmaker-pgr-v2-searcher.yml | 263 - .../rainmaker-pt-customsearch-punjab.yml | 108 - .../egov-searcher/rainmaker-pt-gissearch.yml | 151 - configs/egov-searcher/rainmaker-tl.yml | 26 - configs/egov-searcher/sewerageopensearch.yml | 41 - configs/egov-searcher/wateropensearch.yml | 41 - .../weekly-impact-emailer-searcher.yml | 132 - .../CollectionReceiptWorkflow.json | 67 - .../egov-uploader/localization-upload.json | 61 - configs/egov-uploader/property-upload.json | 20 - configs/egov-zuul/post-hook.json | 8 - configs/egov-zuul/pre-hook.json | 3 - .../kube-cluster-dashboard.json | 6024 ---------------- .../nginx-ingress-dashboard.json | 1463 ---- .../data-config/bill-amendment-note.json | 622 -- .../data-config/bill-amendment.json | 473 -- .../data-config/bpa-revocation.json | 242 - .../data-config/buildingpermit-low.json | 628 -- .../data-config/buildingpermit.json | 647 -- .../data-config/consolidated-pdf1.json | 129 - .../data-config/consolidated-pdf2.json | 129 - .../data-config/consolidatedbill.json | 707 -- .../data-config/consolidatedreceipt.json | 611 -- .../data-config/consolidatedreceiptold.json | 584 -- .../data-config/firenoc-receipt.json | 250 - .../data-config/firenocreceipt.json | 583 -- .../data-config/mcollect-bill.json | 679 -- .../data-config/mcollect-challan.json | 728 -- .../pdf-service/data-config/misc-receipt.json | 516 -- .../data-config/passvehicle-certificate.json | 560 -- .../data-config/property-bill.json | 893 --- .../data-config/property-receipt.json | 982 --- .../pdf-service/data-config/pt-receipt.json | 278 - .../data-config/ptmutationcertificate.json | 385 - .../sewerage-bill-amendment-note.json | 622 -- configs/pdf-service/data-config/sw-bill.json | 847 --- .../data-config/testconsolidatedreceipt.json | 481 -- .../testlocalconsolidatedbill.json | 540 -- .../testlocalconsolidatedreceipt.json | 462 -- .../pdf-service/data-config/tl-receipt.json | 241 - .../data-config/tlapplication.json | 1075 --- .../data-config/tlcertificate.json | 736 -- .../data-config/tlrenewalcertificate.json | 734 -- .../data-config/tradelicense-bill.json | 649 -- .../data-config/tradelicense-receipt.json | 745 -- .../data-config/ws-applicationsewerage.json | 1033 --- .../data-config/ws-applicationwater.json | 1112 --- configs/pdf-service/data-config/ws-bill.json | 848 --- .../ws-consolidatedacknowlegment.json | 694 -- .../ws-consolidatedsewerageconnection.json | 580 -- .../data-config/ws-estimationnotice.json | 537 -- .../data-config/ws-onetime-receipt.json | 563 -- .../data-config/ws-sanctionletter.json | 978 --- .../format-config/bill-amendment-note.json | 567 -- .../format-config/bill-amendment.json | 564 -- .../format-config/bpa-revocation.json | 190 - .../format-config/buildingpermit-low.json | 347 - .../format-config/buildingpermit.json | 360 - .../format-config/consolidated-pdf1.json | 580 -- .../format-config/consolidated-pdf2.json | 1049 --- .../format-config/consolidatedbill.json | 1033 --- .../format-config/consolidatedreceipt.json | 1390 ---- .../format-config/consolidatedreceiptold.json | 1411 ---- .../format-config/firenoc-receipt.json | 491 -- .../format-config/firenocreceipt.json | 1389 ---- .../format-config/mcollect-bill.json | 787 -- .../format-config/mcollect-challan.json | 843 --- .../format-config/misc-receipt.json | 611 -- .../passvehicle-certificate.json | 520 -- .../format-config/property-bill.json | 1231 ---- .../format-config/property-receipt.json | 1376 ---- .../pdf-service/format-config/pt-receipt.json | 826 --- .../format-config/ptmutationcertificate.json | 537 -- .../sewerage-bill-amendment-note.json | 539 -- .../pdf-service/format-config/sw-bill.json | 1249 ---- .../testconsolidatedreceipt.json | 592 -- .../testlocalconsolidatedbill.json | 1018 --- .../testlocalconsolidatedreceipt.json | 598 -- .../pdf-service/format-config/tl-receipt.json | 921 --- .../format-config/tlapplication.json | 1414 ---- .../format-config/tlcertificate.json | 721 -- .../format-config/tlrenewalcertificate.json | 720 -- .../format-config/tradelicense-bill.json | 974 --- .../format-config/tradelicense-receipt.json | 1026 --- .../format-config/ws-applicationsewerage.json | 1230 ---- .../format-config/ws-applicationwater.json | 1366 ---- .../pdf-service/format-config/ws-bill.json | 1246 ---- .../ws-consolidatedacknowlegment.json | 1003 --- .../ws-consolidatedsewerageconnection.json | 804 --- .../format-config/ws-estimationnotice.json | 734 -- .../format-config/ws-onetime-receipt.json | 881 --- .../format-config/ws-sanctionletter.json | 655 -- configs/reports/configs/asset-reports.yml | 1522 ---- configs/reports/configs/citizen-reports.yml | 49 - configs/reports/configs/common-reports.yml | 68 - configs/reports/configs/e-pass-reports.yml | 96 - configs/reports/configs/finance-reports.yml | 177 - configs/reports/configs/hrms-reports.yml | 85 - configs/reports/configs/inventoryReport.yml | 1090 --- configs/reports/configs/lcms-reports.yml | 891 --- configs/reports/configs/pgr-reports.yml | 2117 ------ configs/reports/configs/pt-reports.yml | 6347 ----------------- .../configs/rainmaker-common-reports.yml | 127 - .../reports/configs/rainmaker-noc-reports.yml | 831 --- .../reports/configs/rainmaker-pgr-reports.yml | 727 -- .../reports/configs/rainmaker-pt-reports.yml | 987 --- .../reports/configs/rainmaker-tl-reports.yml | 781 -- configs/reports/configs/swm-reports.yml | 135 - configs/reports/configs/tl-reports.yml | 2808 -------- configs/reports/configs/uc-reports.yml | 2030 ------ configs/reports/configs/works-reports.yml | 565 -- configs/reports/configs/ws-reports.yml | 1601 ----- configs/reports/report.config | 7 - .../collection_receipt_workflow_template.xls | Bin 9728 -> 0 bytes .../localization_template.xls | Bin 6144 -> 0 bytes .../property-residential.xlsx | Bin 40176 -> 0 bytes 217 files changed, 118467 deletions(-) delete mode 100644 build/build-config.yml delete mode 100644 build/maven/Dockerfile delete mode 100644 build/maven/start.sh delete mode 100644 configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json delete mode 100644 configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json delete mode 100644 configs/egov-dss-dashboards/dashboard-analytics/RoleDashboardConfig.json delete mode 100644 configs/egov-dss-dashboards/dashboard-analytics/RoleDashboardMappingsConf.json delete mode 100644 configs/egov-dss-dashboards/dashboard-analytics/TenantCodeNameMappings.json delete mode 100644 configs/egov-dss-dashboards/dashboard-analytics/getchart.json delete mode 100644 configs/egov-dss-dashboards/dashboard-ingest/CollectionDomainConfig.json delete mode 100644 configs/egov-dss-dashboards/dashboard-ingest/DigressionPoints.json delete mode 100644 configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json delete mode 100644 configs/egov-dss-dashboards/dashboard-ingest/EnhanceDomainConfig.json delete mode 100644 configs/egov-dss-dashboards/dashboard-ingest/TopicContextConfiguration.json delete mode 100644 configs/egov-dss-dashboards/dashboard-ingest/config.properties delete mode 100644 configs/egov-dss-dashboards/dashboard-ingest/enrichment_transaction_v1.json delete mode 100644 configs/egov-dss-dashboards/dashboard-ingest/transform_collection_v1.json delete mode 100644 configs/egov-dss-dashboards/dashboard-ingest/transform_firenoc_v1.json delete mode 100644 configs/egov-dss-dashboards/dashboard-ingest/transform_mcollect_v1.json delete mode 100644 configs/egov-dss-dashboards/dashboard-ingest/transform_pgr_v1.json delete mode 100644 configs/egov-dss-dashboards/dashboard-ingest/transform_pt_enhance_v1.json delete mode 100644 configs/egov-dss-dashboards/dashboard-ingest/transform_pt_v1.json delete mode 100644 configs/egov-dss-dashboards/dashboard-ingest/transform_sw.one_time_fee_v1.json delete mode 100644 configs/egov-dss-dashboards/dashboard-ingest/transform_sw_v1.json delete mode 100644 configs/egov-dss-dashboards/dashboard-ingest/transform_target_v1.json delete mode 100644 configs/egov-dss-dashboards/dashboard-ingest/transform_tl_v1.json delete mode 100644 configs/egov-dss-dashboards/dashboard-ingest/transform_transaction_v1.json delete mode 100644 configs/egov-dss-dashboards/dashboard-ingest/transform_ws.one_time_fee_v1.json delete mode 100644 configs/egov-dss-dashboards/dashboard-ingest/transform_ws_v1.json delete mode 100644 configs/egov-dss-dashboards/dashboard-ingest/validator_transaction_v1.json delete mode 100644 configs/egov-indexer/billingservices-indexer.yml delete mode 100644 configs/egov-indexer/chatbot-telemetry-v2.yaml delete mode 100644 configs/egov-indexer/chatbot-telemetry.yaml delete mode 100644 configs/egov-indexer/collection-indexer.yml delete mode 100644 configs/egov-indexer/covid-chatbot-telemetry.yaml delete mode 100644 configs/egov-indexer/egov-bpa-indexer.yml delete mode 100644 configs/egov-indexer/egov-indexer/chatbot-telemetry-v2.yaml delete mode 100644 configs/egov-indexer/egov-telemetry-indexer.yml delete mode 100644 configs/egov-indexer/egov-uploader-indexer.yml delete mode 100644 configs/egov-indexer/error-queue.yml delete mode 100644 configs/egov-indexer/finance-rolloutadoption-indexer.yml delete mode 100644 configs/egov-indexer/payment-indexer-migration.yml delete mode 100644 configs/egov-indexer/payment-indexer.yml delete mode 100644 configs/egov-indexer/property-services-migration-temp.yml delete mode 100644 configs/egov-indexer/property-services-migration.yml delete mode 100644 configs/egov-indexer/property-services.yml delete mode 100644 configs/egov-indexer/rainmaker-bpastakeholder-indexer.yml delete mode 100644 configs/egov-indexer/rainmaker-firenoc-indexer.yml delete mode 100644 configs/egov-indexer/rainmaker-pgr-indexer.yml delete mode 100644 configs/egov-indexer/rainmaker-pt-indexer.yml delete mode 100644 configs/egov-indexer/rainmaker-tl-indexer.yml delete mode 100644 configs/egov-indexer/sewerage-service.yml delete mode 100644 configs/egov-indexer/tradelicense-indexer.yml delete mode 100644 configs/egov-indexer/water-service.yml delete mode 100644 configs/egov-indexer/water-services-meter.yml delete mode 100644 configs/egov-indexer/whatsapp-adoption-data.yaml delete mode 100644 configs/egov-mdms-service/mdms-masters-config.json delete mode 100644 configs/egov-persister/apportion-persister.yml delete mode 100644 configs/egov-persister/assessment-persister-migration-temp.yml delete mode 100644 configs/egov-persister/assessment-persister.yml delete mode 100644 configs/egov-persister/auto-escalation-persister.yml delete mode 100644 configs/egov-persister/billing-services-persist.yml delete mode 100644 configs/egov-persister/chatbot.yml delete mode 100644 configs/egov-persister/collection-migration-count.yml delete mode 100644 configs/egov-persister/collection-migration-persister.yml delete mode 100644 configs/egov-persister/echallan.yml delete mode 100644 configs/egov-persister/egf-bill.yaml delete mode 100644 configs/egov-persister/egov-user-event-persister.yml delete mode 100644 configs/egov-persister/egov-workflow-v2-persister.yml delete mode 100644 configs/egov-persister/firenoc-calculator-persister.yml delete mode 100644 configs/egov-persister/firenoc_persiter.yaml delete mode 100644 configs/egov-persister/hrms-employee-persister.yml delete mode 100644 configs/egov-persister/indexer-job-persister.yml delete mode 100644 configs/egov-persister/migration-batch-count-persister.yml delete mode 100644 configs/egov-persister/pdf-filestoreid-update.yml delete mode 100644 configs/egov-persister/pdf-generator.yml delete mode 100644 configs/egov-persister/pg-service-persister.yml delete mode 100644 configs/egov-persister/pgr-v3-persister.yml delete mode 100644 configs/egov-persister/pgr.yml delete mode 100644 configs/egov-persister/property-services-migration-temp-config.yml delete mode 100644 configs/egov-persister/property-services-persister.yml delete mode 100644 configs/egov-persister/property-services-registry.yml delete mode 100644 configs/egov-persister/property-services.yml delete mode 100644 configs/egov-persister/pt-calculator-v2-persister.yml delete mode 100644 configs/egov-persister/pt-drafts-persister.yml delete mode 100644 configs/egov-persister/pt-mutation-calculator-persister.yml delete mode 100644 configs/egov-persister/pt-persist.yml delete mode 100644 configs/egov-persister/sewerage-bill-scheduler.yml delete mode 100644 configs/egov-persister/sewerage-persist.yml delete mode 100644 configs/egov-persister/tl-billing-slab-persister.yml delete mode 100644 configs/egov-persister/tl-calculation-persister.yml delete mode 100644 configs/egov-persister/tradelicense-persister.yml delete mode 100644 configs/egov-persister/tradelicense.yml delete mode 100644 configs/egov-persister/uploader-persister.yml delete mode 100644 configs/egov-persister/water-bill-scheduler.yml delete mode 100644 configs/egov-persister/water-meter.yml delete mode 100644 configs/egov-persister/water-persist.yml delete mode 100644 configs/egov-searcher/PTDemandBasedSearcher.yml delete mode 100644 configs/egov-searcher/bill-genie.yml delete mode 100644 configs/egov-searcher/localitySearcher.yml delete mode 100644 configs/egov-searcher/propertyopensearch.yml delete mode 100644 configs/egov-searcher/rainmaker-pgr-v2-searcher.yml delete mode 100644 configs/egov-searcher/rainmaker-pt-customsearch-punjab.yml delete mode 100644 configs/egov-searcher/rainmaker-pt-gissearch.yml delete mode 100644 configs/egov-searcher/rainmaker-tl.yml delete mode 100644 configs/egov-searcher/sewerageopensearch.yml delete mode 100644 configs/egov-searcher/wateropensearch.yml delete mode 100644 configs/egov-searcher/weekly-impact-emailer-searcher.yml delete mode 100644 configs/egov-uploader/CollectionReceiptWorkflow.json delete mode 100644 configs/egov-uploader/localization-upload.json delete mode 100644 configs/egov-uploader/property-upload.json delete mode 100644 configs/egov-zuul/post-hook.json delete mode 100644 configs/egov-zuul/pre-hook.json delete mode 100644 configs/monitoring-dashboards/kube-cluster-dashboard.json delete mode 100644 configs/monitoring-dashboards/nginx-ingress-dashboard.json delete mode 100644 configs/pdf-service/data-config/bill-amendment-note.json delete mode 100644 configs/pdf-service/data-config/bill-amendment.json delete mode 100644 configs/pdf-service/data-config/bpa-revocation.json delete mode 100644 configs/pdf-service/data-config/buildingpermit-low.json delete mode 100644 configs/pdf-service/data-config/buildingpermit.json delete mode 100644 configs/pdf-service/data-config/consolidated-pdf1.json delete mode 100644 configs/pdf-service/data-config/consolidated-pdf2.json delete mode 100644 configs/pdf-service/data-config/consolidatedbill.json delete mode 100644 configs/pdf-service/data-config/consolidatedreceipt.json delete mode 100644 configs/pdf-service/data-config/consolidatedreceiptold.json delete mode 100644 configs/pdf-service/data-config/firenoc-receipt.json delete mode 100644 configs/pdf-service/data-config/firenocreceipt.json delete mode 100644 configs/pdf-service/data-config/mcollect-bill.json delete mode 100644 configs/pdf-service/data-config/mcollect-challan.json delete mode 100644 configs/pdf-service/data-config/misc-receipt.json delete mode 100644 configs/pdf-service/data-config/passvehicle-certificate.json delete mode 100644 configs/pdf-service/data-config/property-bill.json delete mode 100644 configs/pdf-service/data-config/property-receipt.json delete mode 100644 configs/pdf-service/data-config/pt-receipt.json delete mode 100644 configs/pdf-service/data-config/ptmutationcertificate.json delete mode 100644 configs/pdf-service/data-config/sewerage-bill-amendment-note.json delete mode 100644 configs/pdf-service/data-config/sw-bill.json delete mode 100644 configs/pdf-service/data-config/testconsolidatedreceipt.json delete mode 100644 configs/pdf-service/data-config/testlocalconsolidatedbill.json delete mode 100644 configs/pdf-service/data-config/testlocalconsolidatedreceipt.json delete mode 100644 configs/pdf-service/data-config/tl-receipt.json delete mode 100644 configs/pdf-service/data-config/tlapplication.json delete mode 100644 configs/pdf-service/data-config/tlcertificate.json delete mode 100644 configs/pdf-service/data-config/tlrenewalcertificate.json delete mode 100644 configs/pdf-service/data-config/tradelicense-bill.json delete mode 100644 configs/pdf-service/data-config/tradelicense-receipt.json delete mode 100644 configs/pdf-service/data-config/ws-applicationsewerage.json delete mode 100644 configs/pdf-service/data-config/ws-applicationwater.json delete mode 100644 configs/pdf-service/data-config/ws-bill.json delete mode 100644 configs/pdf-service/data-config/ws-consolidatedacknowlegment.json delete mode 100644 configs/pdf-service/data-config/ws-consolidatedsewerageconnection.json delete mode 100644 configs/pdf-service/data-config/ws-estimationnotice.json delete mode 100644 configs/pdf-service/data-config/ws-onetime-receipt.json delete mode 100644 configs/pdf-service/data-config/ws-sanctionletter.json delete mode 100644 configs/pdf-service/format-config/bill-amendment-note.json delete mode 100644 configs/pdf-service/format-config/bill-amendment.json delete mode 100644 configs/pdf-service/format-config/bpa-revocation.json delete mode 100644 configs/pdf-service/format-config/buildingpermit-low.json delete mode 100644 configs/pdf-service/format-config/buildingpermit.json delete mode 100644 configs/pdf-service/format-config/consolidated-pdf1.json delete mode 100644 configs/pdf-service/format-config/consolidated-pdf2.json delete mode 100644 configs/pdf-service/format-config/consolidatedbill.json delete mode 100644 configs/pdf-service/format-config/consolidatedreceipt.json delete mode 100644 configs/pdf-service/format-config/consolidatedreceiptold.json delete mode 100644 configs/pdf-service/format-config/firenoc-receipt.json delete mode 100644 configs/pdf-service/format-config/firenocreceipt.json delete mode 100644 configs/pdf-service/format-config/mcollect-bill.json delete mode 100644 configs/pdf-service/format-config/mcollect-challan.json delete mode 100644 configs/pdf-service/format-config/misc-receipt.json delete mode 100644 configs/pdf-service/format-config/passvehicle-certificate.json delete mode 100644 configs/pdf-service/format-config/property-bill.json delete mode 100644 configs/pdf-service/format-config/property-receipt.json delete mode 100644 configs/pdf-service/format-config/pt-receipt.json delete mode 100644 configs/pdf-service/format-config/ptmutationcertificate.json delete mode 100644 configs/pdf-service/format-config/sewerage-bill-amendment-note.json delete mode 100644 configs/pdf-service/format-config/sw-bill.json delete mode 100644 configs/pdf-service/format-config/testconsolidatedreceipt.json delete mode 100644 configs/pdf-service/format-config/testlocalconsolidatedbill.json delete mode 100644 configs/pdf-service/format-config/testlocalconsolidatedreceipt.json delete mode 100644 configs/pdf-service/format-config/tl-receipt.json delete mode 100644 configs/pdf-service/format-config/tlapplication.json delete mode 100644 configs/pdf-service/format-config/tlcertificate.json delete mode 100644 configs/pdf-service/format-config/tlrenewalcertificate.json delete mode 100644 configs/pdf-service/format-config/tradelicense-bill.json delete mode 100644 configs/pdf-service/format-config/tradelicense-receipt.json delete mode 100644 configs/pdf-service/format-config/ws-applicationsewerage.json delete mode 100644 configs/pdf-service/format-config/ws-applicationwater.json delete mode 100644 configs/pdf-service/format-config/ws-bill.json delete mode 100644 configs/pdf-service/format-config/ws-consolidatedacknowlegment.json delete mode 100644 configs/pdf-service/format-config/ws-consolidatedsewerageconnection.json delete mode 100644 configs/pdf-service/format-config/ws-estimationnotice.json delete mode 100644 configs/pdf-service/format-config/ws-onetime-receipt.json delete mode 100644 configs/pdf-service/format-config/ws-sanctionletter.json delete mode 100644 configs/reports/configs/asset-reports.yml delete mode 100644 configs/reports/configs/citizen-reports.yml delete mode 100644 configs/reports/configs/common-reports.yml delete mode 100644 configs/reports/configs/e-pass-reports.yml delete mode 100644 configs/reports/configs/finance-reports.yml delete mode 100644 configs/reports/configs/hrms-reports.yml delete mode 100644 configs/reports/configs/inventoryReport.yml delete mode 100644 configs/reports/configs/lcms-reports.yml delete mode 100644 configs/reports/configs/pgr-reports.yml delete mode 100644 configs/reports/configs/pt-reports.yml delete mode 100644 configs/reports/configs/rainmaker-common-reports.yml delete mode 100644 configs/reports/configs/rainmaker-noc-reports.yml delete mode 100644 configs/reports/configs/rainmaker-pgr-reports.yml delete mode 100644 configs/reports/configs/rainmaker-pt-reports.yml delete mode 100644 configs/reports/configs/rainmaker-tl-reports.yml delete mode 100644 configs/reports/configs/swm-reports.yml delete mode 100644 configs/reports/configs/tl-reports.yml delete mode 100644 configs/reports/configs/uc-reports.yml delete mode 100644 configs/reports/configs/works-reports.yml delete mode 100644 configs/reports/configs/ws-reports.yml delete mode 100644 configs/reports/report.config delete mode 100644 configs/upload-templates/collection_receipt_workflow_template.xls delete mode 100644 configs/upload-templates/localization_template.xls delete mode 100644 configs/upload-templates/property-residential.xlsx diff --git a/build/build-config.yml b/build/build-config.yml deleted file mode 100644 index 08a376d4..00000000 --- a/build/build-config.yml +++ /dev/null @@ -1,15 +0,0 @@ -# -# config: -# - name: < Name of the job, foo/bar would create job named bar inside folder foo > -# build: -# - work-dir: < Working directory of the app to be built > -# dockerfile: < Path to the dockerfile, optional, assumes dockerfile in working directory if not provided > -# image-name: < Docker image name > -# - -# - -config: - - name: "builds/punjab-rainmaker-customization/rainmaker-custom-service" - build: - - work-dir: "rainmaker-custom-service" - image-name: "rainmaker-custom-service" - dockerfile: "rainmaker-custom-service/Dockerfile" diff --git a/build/maven/Dockerfile b/build/maven/Dockerfile deleted file mode 100644 index c7c85163..00000000 --- a/build/maven/Dockerfile +++ /dev/null @@ -1,9 +0,0 @@ -FROM node:8.12-alpine -RUN npm install -g yarn -RUN mkdir /opt/app -COPY package.json yarn.lock /opt/app/ -WORKDIR /opt/app -RUN yarn install -COPY . /opt/app -CMD ["node", "index.js"] - diff --git a/build/maven/start.sh b/build/maven/start.sh deleted file mode 100644 index 08bdd8de..00000000 --- a/build/maven/start.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -if [[ -z "${JAVA_OPTS}" ]];then - export JAVA_OPTS="-Xmx64m -Xms64m" -fi - -if [ x"${JAVA_ENABLE_DEBUG}" != x ] && [ "${JAVA_ENABLE_DEBUG}" != "false" ]; then - java_debug_args="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=${JAVA_DEBUG_PORT:-5005}" -fi - -exec java ${java_debug_args} ${JAVA_OPTS} ${JAVA_ARGS} -jar /opt/egov/*.jar \ No newline at end of file diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json deleted file mode 100644 index 1ea7328d..00000000 --- a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ /dev/null @@ -1,5594 +0,0 @@ -{ - - "_comment": "dss-collectionindex new queries ", - "totalCollection": { - "chartName": "DSS_TOTAL_COLLECTION", - "queries": [ - { - "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\r\n \"district\" : \"dataObject.tenantData.city.districtCode\", \"module\" : \"dataObject.paymentDetails.businessService.keyword\", \n\"tenantId\" : \"dataObject.tenantId\"}", - "dateRefField": "dataObject.paymentDetails.receiptDate", - "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must\":[{\"terms\":{\"dataObject.paymentDetails.bill.businessService.keyword\":[\"PT\",\"TL\",\"SW\",\"WS\"]}}],\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" - } - ], - "chartType": "metric", - "valueType": "Amount", - "drillChart": "none", - "documentType": "_doc", - "action": "", - "aggregationPaths": [ - "Total Collection" - ], - "insight": { - }, - "_comment": " " - }, - "cumulativeCollection": { - "chartName": "DSS_TOTAL_CUMULATIVE_COLLECTION", - "queries": [ - { - "module": "COMMON", - "dateRefField": "dataObject.paymentDetails.receiptDate", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\r\n \"module\" : \"dataObject.paymentDetails.businessService.keyword\", \n\"tenantId\" : \"dataObject.tenantId\"}", - "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}],\"must\":[{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\"]}}]}},\"aggs\":{\"Collections\":{\"date_histogram\":{\"field\":\"dataObject.paymentDetails.receiptDate\",\"interval\":\"intervalvalue\"},\"aggs\":{\"Sum\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" - } - ], - "chartType": "line", - "valueType": "amount", - "action": "", - "drillChart": "none", - "documentType": "_doc", - "aggregationPaths": [ - "Collections" - ], - "isCumulative": true, - "interval": "month", - "insight": { - }, - "_comment": " " - }, - "targetAchieved": { - "chartName": "DSS_TARGET_ACHIEVED", - "queries": [ - { - "module": "COMMON", - "requestQueryMap": "{\r\n \"module\" : \"businessService.keyword\", \n\"tenantId\" : \"tenantIdForMunicipalCorporation\"}", - "dateRefField": "", - "indexName": "dss-target_v1", - "aggrQuery": "{\"aggs\":{\"Actual collection\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}" - }, - { - "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\r\n \"district\" : \"dataObject.tenantData.city.districtCode\", \"module\" : \"dataObject.paymentDetails.businessService.keyword\", \n\"tenantId\" : \"dataObject.tenantId\"}", - "dateRefField": "dataObject.paymentDetails.receiptDate", - "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" - } - - ], - "chartType": "metric", - "valueType": "percentage", - "drillChart": "none", - "documentType": "_doc", - "action": "percentage", - "aggregationPaths": [ - "Total Collection", - "Actual collection" - ], - "insight": { - "chartResponseMap" : "targetAchieved", - "action" : "differenceOfNumbers", - "upwardIndicator" : "positive", - "downwardIndicator" : "negative", - "textMessage" : "$indicator$value% than last $insightInterval", - "colorCode" : "#228B22", - "insightInterval" : "year" - }, - "_comment": " " - }, - "todaysCollection": { - "chartName": "DSS_TOTAL_COLLECTION", - "queries": [ - { - "module": "PT", - "dateRefField": "dataObject.paymentDetails.receiptDate", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\"}", - "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}],\"must\":[{\"term\":{\"dataObject.paymentDetails.businessService.keyword\":\"PT\"}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" - }, - { - "module": "TL", - "dateRefField": "dataObject.paymentDetails.receiptDate", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\"}", - "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}],\"must\":[{\"term\":{\"dataObject.paymentDetails.businessService.keyword\":\"TL\"}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" - }, - { - "module": "FIRENOC", - "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must\":[{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"FIRENOC\"]}},{\"range\":{\"dataObject.paymentDetails.receiptDate\":{\"gte\":\"now-24h\",\"lte\":\"now\"}}}],\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pg.testing\"}},{\"term\":{\"dataObject.paymentStatus.keyword\":\"Cancelled\"}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}", - "requestQueryMap": "{\"wardId\" : \"dataObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\",\"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", - "dateRefField": "dataObject.paymentDetails.receiptDate" - }, - { - "module": "MCOLLECT", - "dateRefField": "dataObject.paymentDetails.receiptDate", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\"}", - "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pg.testing\",\"pg\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"FSM.TRIP_CHARGES\",\"PT.MUTATION\",\"SW\",\"BPA.LOW_RISK_PERMIT_FEE\",\"BPA.NC_SAN_FEE\",\"BPA.NC_APP_FEE\",\"BPA.NC_OC_APP_FEE\"]}}],\"must\":[{\"range\":{\"dataObject.paymentDetails.receiptDate\":{\"gte\":\"now-1d\",\"lte\":\"now\"}}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" - } - ], - "chartType": "metric", - "valueType": "Amount", - "drillChart": "none", - "documentType": "_doc", - "action": "", - "aggregationPaths": [ - "Total Collection" - ], - "insight": { - }, - "_comment": " " - }, - "totalCollectionDeptWise": { - "chartName": "DSS_TOTAL_CUMULATIVE_COLLECTION:_DEPARTMENT_WISE", - "queries": [ - { - "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\"}", - "dateRefField": "dataObject.paymentDetails.receiptDate", - "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}],\"must\":[{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS\",\"SW\"]}}]}},\"aggs\":{\"Business Service\":{\"terms\":{\"field\":\"dataObject.paymentDetails.businessService.keyword\"},\"aggs\":{\"total\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" - } - ], - "chartType": "pie", - "valueType": "Amount", - "drillChart": "none", - "documentType": "_doc", - "action": "", - "aggregationPaths": [ - "Business Service" - ], - "insight": { - }, - "_comment": " " - }, - "topPerformingUlbs": { - "chartName": "DSS_PT_TOP_3_PERFORMING_ULBS", - "queries": [ - { - "module": "COMMON", - "requestQueryMap": "{\r\n \"module\" : \"businessService.keyword\", \n\"tenantId\" : \"tenantIdForMunicipalCorporation\"}", - "dateRefField": "", - "indexName": "dss-target_v1", - "aggrQuery": "{\"aggs\":{\"Target Collection\":{\"terms\":{\"field\":\"tenantIdForMunicipalCorporation.keyword\",\"size\":\"200\",\"order\":{\"Sum\":\"desc\"}},\"aggs\":{\"Sum\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}}}" - }, - { - "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\r\n \"module\" : \"dataObject.paymentDetails.businessService.keyword\", \n\"tenantId\" : \"dataObject.tenantId\"}", - "dateRefField": "dataObject.paymentDetails.receiptDate", - "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Total Collection\":{\"terms\":{\"field\":\"dataObject.tenantId.keyword\",\"size\":\"200\",\"order\":{\"Sum\":\"desc\"}},\"aggs\":{\"Sum\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" - } - ], - "chartType": "perform", - "valueType": "percentage", - "drillChart": "none", - "documentType": "_doc", - "action": "percentage", - "plotLabel": "DSS_TARGET_ACHIEVED", - "order": "desc", - "limit": 3, - "aggregationPaths": [ - "Total Collection","Target Collection" - ], - "insight": { - }, - "_comment": " Top Performing Ulbs for target achieved" - }, - "bottomPerformingUlbs": { - "chartName": "DSS_PT_BOTTOM_3_PERFORMING_ULBS", - "queries": [ - { - "module": "COMMON", - "requestQueryMap": "{\"module\" : \"businessService.keyword\",\"tenantId\" : \"tenantIdForMunicipalCorporation\" }", - "dateRefField": "", - "indexName": "dss-target_v1", - "aggrQuery": "{\"aggs\":{\"Target Collection\":{\"terms\":{\"field\":\"tenantIdForMunicipalCorporation.keyword\",\"size\":\"200\",\"order\":{\"Sum\":\"asc\"}},\"aggs\":{\"Sum\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}}}" - }, - { - "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\" }", - "dateRefField": "dataObject.paymentDetails.receiptDate", - "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Total Collection\":{\"terms\":{\"field\":\"dataObject.tenantId.keyword\",\"size\":\"200\",\"order\":{\"Sum\":\"asc\"}},\"aggs\":{\"Sum\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" - } - ], - "chartType": "perform", - "valueType": "percentage", - "drillChart": "none", - "documentType": "_doc", - "action": "percentage", - "plotLabel": "DSS_TARGET_ACHIEVED", - "order": "asc", - "limit": 3, - "aggregationPaths": [ - "Total Collection", "Target Collection" - ], - "insight": { - }, - "_comment": " Bottom Performing Ulbs for target achieved" - }, - "licenseByLicenseType": { - "chartName": "DSS_TL_LICENSE_BY_TYPE", - "queries": [ - { - "module": "COMMON", - "requestQueryMap": "{\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantData.code\", \"district\" : \"dataObject.tenantData.city.districtCode\"}", - "dateRefField": "dataObject.paymentDetails.receiptDate", - "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Trade Type\":{\"terms\":{\"field\":\"domainObject.tradelicense.tradeLicenseDetail.tradeUnits.tradeType.keyword\",\"size\":200},\"aggs\":{\"Trade Type\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" - } - ], - "chartType": "pie", - "valueType": "amount", - "action": "", - "documentType": "_doc", - "drillChart": "none", - "aggregationPaths": [ - "Trade Type" - ], - "insight": { - }, - "_comment": " License Application which are issued by License Type" - }, - - "_comment": "COMMON NON-COLLECTION CHARTS", - "totalApplication": { - "chartName": "DSS_TOTAL_APPLICATION", - "queries": [ - { - "module": "PT", - "indexName": "property-services", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Total Application\":{\"value_count\":{\"field\":\"Data.propertyId.keyword\"}}}}}}", - "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \r\n \"district\" : \"Data.tenantData.city.districtCode\", \r\n\"tenantId\" : \"Data.tenantId\" \r\n}", - "dateRefField": "Data.@timestamp" - }, - { - "module": "TL", - "indexName": "tlindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tradelicense.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Total Application\":{\"value_count\":{\"field\":\"Data.tradelicense.applicationNumber.keyword\"}}}}}}", - "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \r\n \"district\" : \"Data.tenantData.city.districtCode\", \r\n\"tenantId\" : \"Data.tradelicense.tenantId.keyword\" \r\n}", - "dateRefField": "Data.tradelicense.applicationDate" - }, - { - "module": "PGR", - "indexName": "pgrindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Total Application\":{\"value_count\":{\"field\":\"Data.dateOfComplaint\"}}}}}}", - "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\", \r\n \"district\" : \"Data.tenantData.city.districtCode\", \r\n\"tenantId\" : \"Data.tenantId\" \r\n}", - "dateRefField": "Data.dateOfComplaint" - } - ], - "chartType": "metric", - "valueType": "number", - "action": "", - "documentType": "_doc", - "drillChart": "none", - "aggregationPaths": [ - "Total Application" - ], - "insight": { - "chartResponseMap" : "totalApplication", - "action" : "differenceOfNumbers", - "upwardIndicator" : "positive", - "downwardIndicator" : "negative", - "textMessage" : "$indicator$value% than last $insightInterval", - "colorCode" : "#228B22", - "insightInterval" : "year" - }, - "_comment": " totalApplication is the chartId" - }, - "closedApplication": { - "chartName": "DSS_CLOSED_APPLICATION", - "queries": [ - { - "module": "PT", - "dateRefField": "Data.@timestamp", - "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \r\n \"district\" : \"Data.tenantData.city.districtCode\", \r\n\"tenantId\" : \"Data.tenantId\" \r\n}", - "indexName": "property-services", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Applications Closed\":{\"filter\":{\"bool\":{\"must\":[{\"terms\":{\"Data.status.keyword\":[\"closed\",\"resolved\"]}}]}},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.propertyId.keyword\"}}}}}}}}" - }, - { - "module": "TL", - "dateRefField": "Data.tradelicense.applicationDate", - "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \r\n \"district\" : \"Data.tenantData.city.districtCode\", \r\n\"tenantId\" : \"Data.tradelicense.tenantId.keyword\" \r\n}", - "indexName": "tlindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tradelicense.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Applications Closed\":{\"filter\":{\"bool\":{\"must\":[{\"terms\":{\"Data.status.keyword\":[\"closed\",\"resolved\"]}}]}},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.tradelicense.applicationNumber.keyword\"}}}}}}}}" - }, - { - "module": "PGR", - "dateRefField": "Data.dateOfComplaint", - "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\", \r\n \"district\" : \"Data.tenantData.city.districtCode\", \r\n\"tenantId\" : \"Data.tenantId\" \r\n}", - "indexName": "pgrindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Applications Closed\":{\"filter\":{\"bool\":{\"must\":[{\"terms\":{\"Data.status.keyword\":[\"closed\",\"resolved\"]}}]}},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.dateOfComplaint\"}}}}}}}}" - } - ], - "chartType": "metric", - "valueType": "number", - "action": "", - "documentType": "_doc", - "drillChart": "none", - "aggregationPaths": [ - "Applications Closed" - ], - "insight": { - "chartResponseMap" : "closedApplication", - "action" : "differenceOfNumbers", - "upwardIndicator" : "positive", - "downwardIndicator" : "negative", - "textMessage" : "$indicator$value% than last $insightInterval", - "colorCode" : "#228B22", - "insightInterval" : "year" - }, - "_comment": " totalApplication is the chartId" - }, - "citizenRegistered": { - "chartName": "DSS_CITIZEN_REGISTERED", - "queries": [ - { - "module": "PGR", - "indexName": "pgrindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Citizen Registered\":{\"terms\":{\"field\":\"Data.citizen.uuid.keyword\"},\"aggs\":{\"type_count\":{\"cardinality\":{\"field\":\"Data.citizen.uuid.keyword\"}}}}}}}}", - "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\", \"district\" : \"Data.tenantData.city.districtCode\", \"tenantId\" : \"Data.tenantId\", \"status\" : \"Data.status\"}", - "dateRefField": "Data.dateOfComplaint" - } - ], - "chartType": "metric", - "valueType": "number", - "action": "", - "documentType": "_doc", - "drillChart": "none", - "aggregationPaths": [ - "Citizen Registered" - ], - "insight": { - "chartResponseMap" : "citizenRegistered", - "action" : "differenceOfNumbers", - "upwardIndicator" : "positive", - "downwardIndicator" : "negative", - "textMessage" : "$indicator$value% than last $insightInterval", - "colorCode" : "#228B22", - "insightInterval" : "year" - }, - "_comment": " totalApplication is the chartId" - }, - "totalApplicationDeptWise": { - "chartName": "DSS_TOTAL_APPLICATIONS:_DEPARTMENT_WISE", - "queries": [ - { - "module": "PT", - "dateRefField": "Data.@timestamp", - "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \r\n \"district\" : \"Data.tenantData.city.districtCode\", \r\n\"tenantId\" : \"Data.tenantId\" \r\n}", - "indexName": "property-services", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Property Tax\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}}" - }, - { - "module": "TL", - "indexName": "tlindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tradelicense.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Trade License\":{\"value_count\":{\"field\":\"Data.tradelicense.applicationNumber.keyword\"}}}}}}", - "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \r\n \"district\" : \"Data.tenantData.city.districtCode\", \r\n\"tenantId\" : \"Data.tradelicense.tenantId.keyword\" \r\n}", - "dateRefField": "Data.tradelicense.applicationDate" - }, - { - "module": "WS", - "dateRefField": "Data.@timestamp", - "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \r\n \"district\" : \"Data.tenantData.city.districtCode\", \r\n\"tenantId\" : \"Data.tenantId\" \r\n}", - "indexName": "water-services", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Water Service\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}}" - }, - { - "module": "SW", - "dateRefField": "Data.@timestamp", - "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \r\n \"district\" : \"Data.tenantData.city.districtCode\", \r\n\"tenantId\" : \"Data.tenantId\" \r\n}", - "indexName": "sewerage-services", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Sewerage Service\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}}" - } - ], - "chartType": "pie", - "valueType": "number", - "action": "", - "documentType": "_doc", - "drillChart": "none", - "aggregationPaths": [ - "Property Tax", - "Trade License", - "Water Service", - "Sewerage Service" - ], - "insight": { - }, - "_comment": " totalApplication is the chartId" - }, - "totalApplication&ClosedApplication": { - "chartName": "DSS_TOTAL_APPLICATION_&_CLOSED_APPLICATION", - "queries": [ - { - "module": "PT", - "dateRefField": "Data.@timestamp", - "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \r\n \"district\" : \"Data.tenantData.city.districtCode\", \r\n\"tenantId\" : \"Data.tenantId.keyword\" \r\n}", - "indexName": "property-services", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Total Application\":{\"date_histogram\":{\"field\":\"Data.@timestamp\",\"interval\":\"intervalvalue\"},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.propertyId.keyword\"}}}},\"Closed Application\":{\"date_histogram\":{\"field\":\"Data.@timestamp\",\"interval\":\"intervalvalue\"},\"aggs\":{\"Applications Closed\":{\"filter\":{\"bool\":{\"must\":[{\"terms\":{\"Data.status.keyword\":[\"closed\",\"resolved\"]}}]}},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.propertyId.keyword\"}}}}}}}}}}" - }, - { - "module": "TL", - "dateRefField": "Data.tradelicense.applicationDate", - "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \r\n \"district\" : \"Data.tenantData.city.districtCode\", \r\n\"tenantId\" : \"Data.tradelicense.tenantId.keyword\" \r\n}", - "indexName": "tlindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tradelicense.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Total Application\":{\"date_histogram\":{\"field\":\"Data.tradelicense.applicationDate\",\"interval\":\"intervalvalue\"},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.tradelicense.applicationNumber.keyword\"}}}},\"Closed Application\":{\"date_histogram\":{\"field\":\"Data.tradelicense.applicationDate\",\"interval\":\"intervalvalue\"},\"aggs\":{\"Applications Closed\":{\"filter\":{\"bool\":{\"must\":[{\"terms\":{\"Data.status.keyword\":[\"closed\",\"resolved\"]}}]}},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.tradelicense.applicationNumber.keyword\"}}}}}}}}}}" - - }, - { - "module": "PGR", - "dateRefField": "Data.dateOfComplaint", - "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\", \r\n \"district\" : \"Data.tenantData.city.districtCode\", \r\n\"tenantId\" : \"Data.tenantId\" \r\n}", - "indexName": "pgrindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Total Application\":{\"date_histogram\":{\"field\":\"Data.dateOfComplaint\",\"interval\":\"intervalvalue\"},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}},\"Closed Application\":{\"date_histogram\":{\"field\":\"Data.dateOfComplaint\",\"interval\":\"intervalvalue\"},\"aggs\":{\"Applications Closed\":{\"filter\":{\"bool\":{\"must\":[{\"terms\":{\"Data.status.keyword\":[\"closed\",\"resolved\"]}}]}},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.dateOfComplaint\"}}}}}}}}}}" - - } - ], - "chartType": "line", - "valueType": "number", - "action": "", - "drillChart": "none", - "documentType": "_doc", - "aggregationPaths": [ - "Total Application", - "Closed Application" - ], - "isCumulative": false, - "interval": "month", - "insight": { - }, - "_comment": " " - }, - "topPerformingUlbsCompletionRate": { - "chartName": "DSS_PT_TOP_3_PERFORMING_ULBS", - "queries": [ - { - "module": "PGR", - "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\", \"module\" : \"businessService.keyword\",\"tenantId\" : \"Data.tenantId\" , \"district\" : \"Data.tenantData.city.districtCode\"}", - "dateRefField": "Data.@timestamp", - "indexName": "pgrindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Closed Application\":{\"filter\":{\"term\":{\"Data.status.keyword\":\"resolved\"}},\"aggs\":{\"count\":{\"terms\":{\"field\":\"Data.tenantId.keyword\",\"order\":{\"_key\":\"asc\"},\"size\":100},\"aggs\":{\"tenant_count\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}},\"Total Application\":{\"terms\":{\"field\":\"Data.tenantId.keyword\",\"order\":{\"_key\":\"asc\"},\"size\":100},\"aggs\":{\"tenant_count\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}}}}" - }, - { - "module": "PT", - "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \"module\" : \"businessService.keyword\",\"tenantId\" : \"Data.tenantId\" , \"district\" : \"Data.tenantData.city.districtCode\"}", - "dateRefField": "Data.@timestamp", - "indexName": "property-services", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Closed Application\":{\"filter\":{\"exists\":{\"field\":\"Data.propertyId.keyword\"}},\"aggs\":{\"count\":{\"terms\":{\"field\":\"Data.tenantId.keyword\"},\"aggs\":{\"tenant_count\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}},\"Total Application\":{\"terms\":{\"field\":\"Data.tenantId.keyword\"},\"aggs\":{\"tenant_count\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}}}}" - }, - { - "module": "TL", - "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \"module\" : \"businessService.keyword\",\"tenantId\" : \"Data.tenantData.code\" , \"district\" : \"Data.tenantData.city.districtCode\"}", - "dateRefField": "Data.tradelicense.applicationDate", - "indexName": "tlindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tradelicense.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Closed Application\":{\"filter\":{\"exists\":{\"field\":\"Data.tradelicense.issuedDate\"}},\"aggs\":{\"count\":{\"terms\":{\"field\":\"Data.tenantData.code.keyword\"},\"aggs\":{\"tenant_count\":{\"value_count\":{\"field\":\"Data.tenantData.code.keyword\"}}}}}},\"Total Application\":{\"filter\":{\"exists\":{\"field\":\"Data.tradelicense.applicationDate\"}},\"aggs\":{\"count\":{\"terms\":{\"field\":\"Data.tenantData.code.keyword\"},\"aggs\":{\"tenant_count\":{\"value_count\":{\"field\":\"Data.tenantData.code.keyword\"}}}}}}}}}}" - } - ], - "chartType": "perform", - "valueType": "percentage", - "drillChart": "none", - "documentType": "_doc", - "action": "percentage", - "plotLabel": "DSS_COMPLETION_RATE", - "order": "desc", - "limit": 3, - "isRoundOff": true, - "aggregationPaths": [ - "Closed Application", - "Total Application" - ], - "insight": { - }, - "_comment": " Top Performing Ulbs for Completion rate" - }, - "bottomPerformingUlbsCompletionRate": { - "chartName": "DSS_PT_BOTTOM_3_PERFORMING_ULBS", - "queries": [ - { - "module": "PGR", - "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\", \"module\" : \"businessService.keyword\",\"tenantId\" : \"Data.tenantId\" , \"district\" : \"Data.tenantData.city.districtCode\"}", - "dateRefField": "Data.@timestamp", - "indexName": "pgrindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Closed Application\":{\"filter\":{\"term\":{\"Data.status.keyword\":\"resolved\"}},\"aggs\":{\"count\":{\"terms\":{\"field\":\"Data.tenantId.keyword\"},\"aggs\":{\"tenant_count\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}},\"Total Application\":{\"terms\":{\"field\":\"Data.tenantId.keyword\"},\"aggs\":{\"tenant_count\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}}}}" - }, - { - "module": "PT", - "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \"module\" : \"businessService.keyword\",\"tenantId\" : \"Data.tenantId\" ,\"district\" : \"Data.tenantData.city.districtCode\"}", - "dateRefField": "Data.@timestamp", - "indexName": "property-services", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Closed Application\":{\"filter\":{\"exists\":{\"field\":\"Data.propertyId.keyword\"}},\"aggs\":{\"count\":{\"terms\":{\"field\":\"Data.tenantId.keyword\"},\"aggs\":{\"tenant_count\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}},\"Total Application\":{\"terms\":{\"field\":\"Data.tenantId.keyword\"},\"aggs\":{\"tenant_count\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}}}}" - }, - { - "module": "TL", - "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \"module\" : \"businessService.keyword\",\"tenantId\" : \"Data.tenantData.code\" , \"district\" : \"Data.tenantData.city.districtCode\"}", - "dateRefField": "Data.tradelicense.applicationDate", - "indexName": "tlindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tradelicense.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Closed Application\":{\"filter\":{\"exists\":{\"field\":\"Data.tradelicense.issuedDate\"}},\"aggs\":{\"count\":{\"terms\":{\"field\":\"Data.tenantData.code.keyword\"},\"aggs\":{\"tenant_count\":{\"value_count\":{\"field\":\"Data.tenantData.code.keyword\"}}}}}},\"Total Application\":{\"filter\":{\"exists\":{\"field\":\"Data.tradelicense.applicationDate\"}},\"aggs\":{\"count\":{\"terms\":{\"field\":\"Data.tenantData.code.keyword\"},\"aggs\":{\"tenant_count\":{\"value_count\":{\"field\":\"Data.tenantData.code.keyword\"}}}}}}}}}}" - } - ], - "chartType": "perform", - "valueType": "percentage", - "drillChart": "none", - "documentType": "_doc", - "action": "percentage", - "plotLabel": "DSS_COMPLETION_RATE", - "order": "asc", - "limit": 3, - "isRoundOff": true, - "aggregationPaths": [ - "Closed Application", - "Total Application" - ], - "insight": { - }, - "_comment": " Bottom Performing Ulbs for Completion rate" - }, - - "_comment": "COMMON COLLECTION CHARTS", - "targetCollection": { - "chartName": "DSS_TARGET_COLLECTION", - "queries": [ - { - "module": "COMMON", - "requestQueryMap": "{\"module\" : \"businessService.keyword\", \"tenantId\" : \"tenantIdForMunicipalCorporation.keyword\"}", - "dateRefField": "startdate", - "indexName": "dss-target_v1", - "aggrQuery": "{\"aggs\":{\"Target Collection\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}" - } - ], - "chartType": "metric", - "valueType": "amount", - "action": "", - "drillChart": "none", - "documentType": "_doc", - "aggregationPaths": [ - "Target Collection" - ], - "isDayUnit": true, - "postAggregationTheory" : "repsonseToDifferenceOfDates", - "insight": { - }, - "_comment": " " - }, - "collectionByUsageType": { - "chartName": "DSS_PT_COLLECTION_BY_USAGE_TYPE", - "queries": [ - { - "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", - "dateRefField": "dataObject.paymentDetails.receiptDate", - "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Usage Type\":{\"terms\":{\"field\":\"domainObject.usageCategory.keyword\",\"size\":200},\"aggs\":{\"Usage Type\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" - } - ], - "chartType": "pie", - "valueType": "amount", - "action": "", - "documentType": "_doc", - "drillChart": "none", - "aggregationPaths": [ - "Usage Type" - ], - "insight": { - }, - "_comment": " collection/amount per usage type" - }, - "ptcollectionByPaymentMode": { - "chartName": "DSS_PT_COLLECTION_BY_PAYMENT_MODE", - "queries": [ - { - "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", - "dateRefField": "dataObject.paymentDetails.receiptDate", - "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}],\"must\":[{\"term\":{\"dataObject.paymentDetails.businessService.keyword\":\"PT\"}}]}},\"aggs\":{\"Payment Mode\":{\"terms\":{\"field\":\"dataObject.paymentMode.keyword\",\"size\": 200},\"aggs\":{\"Payment Mode\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" - } - ], - "chartType": "pie", - "valueType": "amount", - "action": "", - "documentType": "_doc", - "drillChart": "none", - "aggregationPaths": [ - "Payment Mode" - ], - "insight": { - }, - "_comment": " collection/amount per payment mode" - }, - - "_comment": "PT NON-COLLECTION CHARTS", - "propertiesByUsageType": { - "chartName": "DSS_PT_PROPERTIES_BY_USAGE_TYPE", - "queries": [ - { - "module": "PT", - "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\",\"module\" : \"Data.businessService.keyword\", \"tenantId\" : \"Data.tenantId\", \"district\" : \"Data.tenantData.city.districtCode\"}", - "dateRefField": "Data.@timestamp", - "indexName": "property-services", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Usage Type\":{\"terms\":{\"field\":\"Data.usageCategory.keyword\"}}}}}}" - } - ], - "chartType": "pie", - "valueType": "number", - "action": "", - "documentType": "_doc", - "drillChart": "none", - "aggregationPaths": [ - "Usage Type" - ], - "insight": { - }, - "_comment": " properties having assessmentNumber per usage type" - }, - "totalProperties": { - "chartName": "DSS_PT_TOTAL_PROPERTIES", - "queries": [ - { - "module": "PT", - "indexName": "property-services", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Total Application\":{\"value_count\":{\"field\":\"Data.propertyId.keyword\"}}}}}}", - "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \r\n \"district\" : \"Data.tenantData.city.districtCode\", \r\n\"tenantId\" : \"Data.tenantId\" \r\n}", - "dateRefField": "" - } - ], - "chartType": "metric", - "valueType": "number", - "action": "", - "documentType": "_doc", - "drillChart": "none", - "aggregationPaths": [ - "Total Application" - ], - "_comment": " totol properties count" - }, - "propertiesAssessed": { - "chartName": "DSS_PT_TOTAL_PROPERTIES_ASSESSED", - "queries": [ - { - "module": "PT", - "indexName": "property-services", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Total Application\":{\"value_count\":{\"field\":\"Data.propertyId.keyword\"}}}}}}", - "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \r\n \"district\" : \"Data.tenantData.city.districtCode\", \r\n\"tenantId\" : \"Data.tenantId\" \r\n}", - "dateRefField": "Data.@timestamp" - } - ], - "chartType": "metric", - "valueType": "number", - "action": "", - "documentType": "_doc", - "drillChart": "none", - "aggregationPaths": [ - "Total Application" - ], - "insight": { - "chartResponseMap" : "propertiesAssessed", - "action" : "differenceOfNumbers", - "upwardIndicator" : "positive", - "downwardIndicator" : "negative", - "textMessage" : "$indicator$value% than last $insightInterval", - "colorCode" : "#228B22", - "insightInterval" : "year" - }, - "_comment": " totol properties having assessmentNumber " - }, - "totalAssessment": { - "chartName": "DSS_PT_TOTAL_ASSESSMENTS", - "queries": [ - { - "module": "PT", - "indexName": "property-assessments", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Assessed Properties\":{\"value_count\":{\"field\":\"Data.assessmentNumber.keyword\"}}}}}}", - "requestQueryMap": "{\"wardId\" : \"Data.tenantData.city.districtCode.keyword\", \"tenantId\" : \"Data.tenantId\" ,\"district\" : \"Data.tenantData.city.districtCode\"}", - "dateRefField": "Data.@timestamp" - } - ], - "chartType": "metric", - "valueType": "number", - "action": "", - "documentType": "_doc", - "drillChart": "none", - "aggregationPaths": [ - "Assessed Properties" - ], - "insight": { - "chartResponseMap" : "totalAssessment", - "action" : "differenceOfNumbers", - "upwardIndicator" : "positive", - "downwardIndicator" : "negative", - "textMessage" : "$indicator$value% than last $insightInterval", - "colorCode" : "#228B22", - "insightInterval" : "year" - }, - "_comment": " totol properties having assessmentNumber " - }, - "cumulativePropertiesAssessed": { - "chartName": "DSS_PT_CUMULATIVE_PROPERTIES_ASSESSED", - "queries": [ - { - "module": "PT", - "indexName": "property-assessments", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Properties Assessed\":{\"date_histogram\":{\"field\":\"Data.@timestamp\",\"interval\":\"intervalvalue\"},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.assessmentNumber.keyword\"}}}}}}}}", - "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \"tenantId\" : \"Data.tenantId\" ,\"district\" : \"Data.tenantData.city.districtCode\"}", - "dateRefField": "Data.@timestamp" - } - ], - "chartType": "line", - "valueType": "number", - "action": "", - "documentType": "_doc", - "drillChart": "none", - "aggregationPaths": [ - "Properties Assessed" - ], - "isCumulative": true, - "interval": "week", - "insight": { - }, - "_comment": " totol properties having assessmentNumber " - }, - "activeUlbs": { - "chartName": "DSS_PT_TOTAL_ACTIVE_ULBS", - "queries": [ - { - "module": "PT", - "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \"tenantId\" : \"Data.tenantId\"}", - "dateRefField": "Data.@timestamp", - "indexName": "property-services", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Active ULBs\":{\"cardinality\":{\"field\":\"Data.tenantId.keyword\"}}}}}}" - }, - { - "module": "TL", - "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \"tenantId\" : \"Data.tenantData.code\"}", - "dateRefField": "Data.tradelicense.@timestamp", - "indexName": "tlindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantData.code.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Active ULBs\":{\"cardinality\":{\"field\":\"Data.tenantData.code.keyword\"}}}}}}" - } - ], - "chartType": "metric", - "valueType": "number", - "action": "", - "documentType": "_doc", - "drillChart": "none", - "aggregationPaths": [ - "Active ULBs" - ], - "_comment": " total ULBs count" - }, - - "_comment": "PT COLLECTION CHARTS (Tax heads)", - - "_comment": "PT COLLECTION CHARTS (Demands) ", - "demandCollectionIndexDDRRevenue": { - "chartName": "DSS_PT_KEY_FY_INDICATORS", - "queries": [ - { - "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"usageId\" : \"domainObject.usageCategory.keyword\",\"minorUsageId\" : \"domainObject.usageCategory.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", - "dateRefField": "dataObject.paymentDetails.receiptDate", - "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.transactionNumber.keyword\"}},\"Assessed Properties\":{\"nested\":{\"path\":\"domainObject.assessmentsDetails\"},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"domainObject.assessmentsDetails.assessmentNumber.keyword\"}}}}}}}}" - }, - { - "module": "COMMON", - "requestQueryMap": "{\"module\" : \"businessService.keyword\", \"tenantId\" : \"tenantIdForMunicipalCorporation.keyword\"}", - "dateRefField": "", - "indexName": "dss-target_v1", - "aggrQuery": "{\"aggs\":{\"Target Collection\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}}}" - } - ], - "isMdmsEnabled": true, - "filterKeys": [ - {"key": "tenantId", "column": "DDRs"} - ], - "chartType": "table", - "valueType": "number", - "drillChart": "demandCollectionIndexBoundaryRevenue", - "action": "", - "plotLabel": "DDRs", - "isPostResponseHandler": true, - "postAggregationTheory" : "repsonseToDifferenceOfDates", - "aggregationPaths": [ - "Total Collection", - "Transactions", - "Assessed Properties", - "Target Collection" - ], - "pathDataTypeMapping": [ - { - "Total Collection": "amount" - }, - { - "Transactions": "number" - }, - { - "Assessed Properties": "number" - }, - { - "Target Collection": "amount" - } - ], - "insight": { - }, - "_comment": "" - }, -"collectionByModule": { - "chartName": "COLLECTION_BY_MODULE", - "queries": [ - { - "module": "COMMON", - "requestQueryMap":"{\"tenantId\" : \"dataObject.tenantId\"}", - "dateRefField": "dataObject.paymentDetails.receiptDate", - "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"AGGR\":{\"terms\":{\"field\":\"dataObject.tenantId.keyword\",\"size\":200},\"aggs\":{\"PT\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"dataObject.paymentDetails.businessService.keyword\":\"PT\"}}]}},\"aggs\":{\"AGGRS\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}},\"TL\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"dataObject.paymentDetails.businessService.keyword\":\"TL\"}}]}},\"aggs\":{\"AGGRS\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}},\"WS\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"dataObject.paymentDetails.businessService.keyword\":\"WS\"}}]}},\"aggs\":{\"AGGRS\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}}}" - }, - { - "module": "PT", - "requestQueryMap": "{\"module\" : \"businessService.keyword\", \"tenantId\" : \"tenantIdForMunicipalCorporation.keyword\"}", - "dateRefField": "startdate", - "indexName": "dss-target_v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"terms\":{\"field\":\"tenantIdForMunicipalCorporation.keyword\",\"size\":200},\"aggs\":{\"Target Collection PT\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"businessService.keyword\":\"PT\"}}]}},\"aggs\":{\"AGGRS\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}},\"Target Collection TL\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"businessService.keyword\":\"TL\"}}]}},\"aggs\":{\"AGGRS\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}},\"Target Collection WS\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"businessService.keyword\":\"WS\"}}]}},\"aggs\":{\"AGGRS\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}}}}}" - } - ], - "isMdmsEnabled": false, - "filterKeys": [ - { - "key": "tenantId", - "column": "ULBs" - } - ], - "chartType": "table", - "valueType": "", - "drillChart": "none", - "action": "", - "plotLabel": "ULBs", - "isPostResponseHandler": true, - "postAggregationTheory": "repsonseToDifferenceOfDates", - "aggregationPaths": [ - "PT", - "Target Collection PT", - "TL", - "Target Collection TL" - ], - "pathDataTypeMapping": [ - { - "PT": "amount" - }, - { - "Target Collection PT": "amount" - }, - { - "TL": "amount" - }, - { - "Target Collection TL": "amount" - } - ], - "insight": { - }, - "_comment": "" - }, - "demandCollectionIndexBoundaryRevenue": { - "chartName": "DSS_PT_DEMAND_COLLECTION_BOUNDARY", - "queries": [ - { - "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"usageId\" : \"domainObject.usageCategory.keyword\",\"minorUsageId\" : \"domainObject.usageCategory.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", - "dateRefField": "dataObject.paymentDetails.receiptDate", - "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"ULBs \":{\"terms\":{\"field\":\"domainObject.tenantId.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.transactionNumber.keyword\"}},\"Assessed Properties\":{\"nested\":{\"path\":\"domainObject.assessmentsDetails\"},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"domainObject.assessmentsDetails.assessmentNumber.keyword\"}}}}}}}}}}" - }, - { - "module": "COMMON", - "requestQueryMap": "{\"module\" : \"businessService.keyword\", \"tenantId\" : \"tenantIdForMunicipalCorporation.keyword\"}", - "dateRefField": "", - "indexName": "dss-target_v1", - "aggrQuery": "{\"aggs\":{\"ULBs \":{\"terms\":{\"field\":\"tenantIdForMunicipalCorporation.keyword\",\"size\":1000},\"aggs\":{\"Target Collection\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}}}" - } - ], - "filterKeys": [ - {"key": "tenantId", "column": "Boundary"} - ], - "postAggregationTheory" : "repsonseToDifferenceOfDates", "chartType": "table", - "valueType": "number", - "drillChart": "boundaryDrillDown", - "drillFields": [ - "Ward", - "" - ], - "documentType": "_doc", - "action": "", - "plotLabel": "Boundary", - "aggregationPaths": [ - "Total Collection", - "Transactions", - "Assessed Properties", - "Target Collection" - ], - "pathDataTypeMapping": [ - { - "Total Collection": "amount" - }, - { - "Transactions": "number" - }, - { - "Assessed Properties": "number" - }, - { - "Target Collection": "amount" - } - ], - "insight": { - }, - "_comment": "" - }, - "boundaryDrillDown": { - "kind": "drillDown", - "chartName": "Boundary", - "queries": [ - { - "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"usageId\" : \"domainObject.usageCategory.keyword\",\"minorUsageId\" : \"domainObject.usageCategory.keyword\",\"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", - "dateRefField": "dataObject.paymentDetails.receiptDate", - "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Ward \":{\"terms\":{\"field\":\"domainObject.ward.name.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.transactionNumber.keyword\"}},\"Assessed Properties\":{\"nested\":{\"path\":\"domainObject.assessmentsDetails\"},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"domainObject.assessmentsDetails.assessmentNumber.keyword\"}}}}}}}}}}" - } - ], - "chartType": "table", - "valueType": "number", - "drillChart": "none", - "documentType": "_doc", - "action": "", - "plotLabel": "Ward", - "aggregationPaths": [ - "Total Collection", - "Transactions", - "Assessed Properties", - "Target Collection" - ], - "pathDataTypeMapping": [ - { - "Total Collection": "amount" - }, - { - "Transactions": "number" - }, - { - "Assessed Properties": "number" - }, - { - "Target Collection": "amount" - } - ], - "insight": { - }, - "_comment": "" - }, - - - "_comment": " PT Nested Array related new queries", - "taxHeadsBreakupDDRRevenue": { - "chartName": "DSS_PT_TAX_HEAD_BREAKUP_REVENUE", - "queries": [ - { - "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"usageId\" : \"domainObject.usageCategory.keyword\",\"minorUsageId\" : \"domainObject.usageCategory.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", - "dateRefField": "dataObject.paymentDetails.receiptDate", - "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Total Amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.totalAmount\"}},\"PT Tax\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TAX\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Fire Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_FIRE_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Cancer Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_CANCER_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Rebate\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_REBATE\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Penalty\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_PENALTY\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Time Interest\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_INTEREST\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Round Off\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_ROUNDOFF\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}}}}}}" - } - ], - "isMdmsEnabled": true, - "filterKeys": [ - {"key": "tenantId", "column": "DDRs"} - - ], - "chartType": "xtable", - "valueType": "number", - "drillChart": "taxHeadsBreakupRevenue", - "isPostResponseHandler": true, - "documentType": "_doc", - "action": "", - "plotLabel": "DDRs", - "aggregationPaths": [ - "PT Tax", - "Fire Cess", - "Cancer Cess", - "Rebate", - "Penalty", - "Time Interest","Round Off" - ], - "computedFields": [ - { - "postAggregationTheory" : "", - "actionName": "AdditiveComputedField", - "fields" : [ "PT Tax", "Fire Cess", "Cancer Cess", "Rebate", "Penalty", "Time Interest","Round Off"], - "newField" : "Total Amount", - "_comments": "fields are field names picked from its aggregation query to use post aggregation newField value with given new field name " - } - ], - "insight": { - }, - "_comment": "" - }, - "taxHeadsBreakupRevenue": { - "chartName": "DSS_PT_TAX_HEAD_BREAKUP_REVENUE", - "queries": [ - { - "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"usageId\" : \"domainObject.usageCategory.keyword\",\"minorUsageId\" : \"domainObject.usageCategory.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", - "dateRefField": "dataObject.paymentDetails.receiptDate", - "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"ULBs \":{\"terms\":{\"field\":\"dataObject.tenantId.keyword\",\"size\":200},\"aggs\":{\"Total Amount\":{\"bucket_script\":{\"buckets_path\":{\"c1\":\"PT Tax>aggrFilter>amount\",\"c2\":\"Fire Cess>aggrFilter>amount\",\"c3\":\"Cancer Cess>aggrFilter>amount\",\"c4\":\"Rebate>aggrFilter>amount\",\"c5\":\"Penalty>aggrFilter>amount\",\"c6\":\"Time Interest>aggrFilter>amount\",\"c7\":\"Round Off>aggrFilter>amount\"},\"script\":{\"source\":\"params.c1+params.c2+params.c3+params.c4+params.c5+params.c6+params.c7\"}}},\"PT Tax\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TAX\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Fire Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_FIRE_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Cancer Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_CANCER_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Rebate\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_REBATE\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Penalty\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_PENALTY\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Time Interest\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_INTEREST\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Round Off\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_ROUNDOFF\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}}}}}}}}" - } - ], - "filterKeys": [ - {"key": "tenantId", "column": "Boundary"} - - ], - "chartType": "xtable", - "valueType": "number", - "drillChart": "taxHeadsBreakupBoundaryDrill", - "drillFields": [ - "Ward", - "" - ], - "documentType": "_doc", - "action": "", - "plotLabel": "Boundary", - "aggregationPaths": [ - "PT Tax", - "Fire Cess", - "Cancer Cess", - "Rebate", - "Penalty", - "Time Interest","Round Off", "Total Amount" - ], - - "insight": { - }, - "_comment": "" - }, - "taxHeadsBreakupBoundaryDrill": { - "chartName": "Tax head Breakup boundary", - "queries": [ - { - "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"usageId\" : \"domainObject.usageCategory.keyword\",\"minorUsageId\" : \"domainObject.usageCategory.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", - "dateRefField": "dataObject.paymentDetails.receiptDate", - "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Ward \":{\"terms\":{\"field\":\"domainObject.ward.name.keyword\",\"size\":200},\"aggs\":{\"Total Amount\":{\"bucket_script\":{\"buckets_path\":{\"c1\":\"PT Tax>aggrFilter>amount\",\"c2\":\"Fire Cess>aggrFilter>amount\",\"c3\":\"Cancer Cess>aggrFilter>amount\",\"c4\":\"Rebate>aggrFilter>amount\",\"c5\":\"Penalty>aggrFilter>amount\",\"c6\":\"Time Interest>aggrFilter>amount\",\"c7\":\"Round Off>aggrFilter>amount\"},\"script\":{\"source\":\"params.c1+params.c2+params.c3+params.c4+params.c5+params.c6+params.c7\"}}},\"PT Tax\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TAX\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Fire Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_FIRE_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Cancer Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_CANCER_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Rebate\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_REBATE\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Penalty\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_PENALTY\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Time Interest\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_INTEREST\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Round Off\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_ROUNDOFF\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}}}}}}}}" - } - ], - "filterKeys": [ - - ], - "chartType": "xtable", - "valueType": "number", - "drillChart": "", - "drillFields": [ - "Ward", - "" - ], - "documentType": "_doc", - "action": "", - "plotLabel": "Boundary", - "aggregationPaths": [ - "PT Tax", - "Fire Cess", - "Cancer Cess", - "Rebate", - "Penalty", - "Time Interest","Round Off","Total Amount" - ], - - "insight": { - }, - "_comment": "" - }, - "taxHeadsBreakupUsageMinor": { - "chartName": "", - "queries": [ - { - "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"usageId\" : \"domainObject.usageCategory.keyword\",\"minorUsageId\" : \"domainObject.usageCategory.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", - "dateRefField": "dataObject.paymentDetails.receiptDate", - "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\": {\"Usage \":{\"terms\":{\"field\":\"domainObject.usageCategory.keyword\",\"size\":200},\"aggs\":{\"Total Amount\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"PT Tax\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TAX\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Fire Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_FIRE_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Cancer Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_CANCER_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Rebate\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_REBATE\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Penalty\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_PENALTY\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}}}}}}}}" - } - ], - "filterKeys": [ - {"key": "minorUsageId", "column": "Minor Usage Type"} - ], - "chartType": "table", - "valueType": "number", - "drillChart": "taxHeadsBreakupUsageSubMinor", - "documentType": "_doc", - "action": "", - "plotLabel": "Minor Usage Type", - "aggregationPaths": [ - "Total Amount", - "PT Tax", - "Fire Cess", - "Cancer Cess", - "Rebate", - "Penalty" - ], - "pathDataTypeMapping": [ - { - "Total Amount": "amount" - }, - { - "PT Tax": "amount" - }, - { - "Fire Cess": "amount" - }, - { - "Cancer Cess": "amount" - }, - { - "Rebate": "amount" - }, - { - "Penalty": "amount" - } - ], - "insight": { - }, - "_comment": "present we are not using, Need to check the taxAndPayments" - }, - "taxHeadsBreakupUsageSubMinor": { - "chartName": "", - "queries": [ - { - "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"usageId\" : \"domainObject.usageCategory.keyword\",\"minorUsageId\" : \"domainObject.usageCategory.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", - "dateRefField": "dataObject.paymentDetails.receiptDate", - "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Usage \":{\"terms\":{\"field\":\"domainObject.usageCategory.keyword\",\"size\":200},\"aggs\":{\"Total Amount\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.taxAndPayments.taxAmount\"}}}}}},\"PT Tax\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TAX\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Fire Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_FIRE_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Cancer Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_CANCER_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Rebate\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_REBATE\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Penalty\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_PENALTY\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}}}}}}}}" - } - ], - "filterKeys": [ - "" - ], - "chartType": "table", - "valueType": "number", - "drillChart": "", - "documentType": "_doc", - "action": "", - "plotLabel": "Sub Minor Usage Type", - "aggregationPaths": [ - "Total Amount", - "PT Tax", - "Fire Cess", - "Cancer Cess", - "Rebate", - "Penalty" - ], - "pathDataTypeMapping": [ - { - "Total Amount": "amount" - }, - { - "PT Tax": "amount" - }, - { - "Fire Cess": "amount" - }, - { - "Cancer Cess": "amount" - }, - { - "Rebate": "amount" - }, - { - "Penalty": "amount" - } - ], - "insight": { - }, - "_comment": "" - }, - "demandCollectionIndexUsageRevenue": { - "chartName": "DSS_PT_DEMAND_COLLECTION_USAGETYPE", - "queries": [ - { - "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\",\"usageId\" : \"domainObject.usageCategory.keyword\",\"minorUsageId\" : \"domainObject.usageCategory.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", - "dateRefField": "dataObject.paymentDetails.receiptDate", - "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"UsageType \":{\"terms\":{\"field\":\"domainObject.usageCategory.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.transactionNumber.keyword\"}},\"Assessed Properties\":{\"nested\":{\"path\":\"domainObject.assessmentsDetails\"},\"aggs\":{\"attr\":{\"cardinality\":{\"field\":\"domainObject.assessmentsDetails.assessmentNumber.keyword\"}}}}}}}}}}", - "aggrQuerybc": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Approved\"]}}]}},\"aggs\":{\"UsageType \":{\"terms\":{\"field\":\"domainObject.usageCategory.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.transactionNumber.keyword\"}},\"Assessed Properties\":{\"nested\":{\"path\":\"domainObject.assessmentsDetails\"},\"aggs\":{\"attr\":{\"cardinality\":{\"field\":\"domainObject.assessmentsDetails.assessmentNumber.keyword\"}}}}}}}}}}" - } - ], - "filterKeys": [ - - ], - "chartType": "table", - "valueType": "number", - "drillChart": "", - "drillFields": [ - "Ward", - "" - ], - "documentType": "_doc", - "action": "", - "plotLabel": "Usage Type", - "aggregationPaths": [ - "Total Collection", - "Transactions", - "Assessed Properties" - - ], - "pathDataTypeMapping": [ - { - "Total Collection": "amount" - }, - { - "Transactions": "number" - }, - { - "Assessed Properties": "number" - } - ], - "insight": { - }, - "_comment": "removed reverse_nested in aggrQuery" - }, - "usageRevenueDrillDownMinor": { - "chartName": "", - "queries": [ - { - "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"usageId\" : \"domainObject.usageCategory.keyword\",\"minorUsageId\" : \"domainObject.usageCategory.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", - "dateRefField": "dataObject.paymentDetails.receiptDate", - "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"UsageType \":{\"terms\":{\"field\":\"domainObject.usageCategory.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.transactionNumber.keyword\"}},\"Assessed Properties\":{\"nested\":{\"path\":\"domainObject.assessmentsDetails\"},\"aggs\":{\"attr\":{\"cardinality\":{\"field\":\"domainObject.assessmentsDetails.assessmentNumber.keyword\"}}}}}}}}}}", - "aggrQuerybc": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Approved\"]}}]}},\"aggs\":{\"UsageType \":{\"terms\":{\"field\":\"domainObject.usageCategory.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.transactionNumber.keyword\"}},\"Assessed Properties\":{\"nested\":{\"path\":\"domainObject.assessmentsDetails\"},\"aggs\":{\"attr\":{\"cardinality\":{\"field\":\"domainObject.assessmentsDetails.assessmentNumber.keyword\"}}}}}}}}}}" - } - ], - "filterKeys": [ - {"key": "minorUsageId", "column": "Minor Usage Type"} - ], - "chartType": "table", - "valueType": "number", - "drillChart": "usageRevenueDrillDownSubMinor", - "documentType": "_doc", - "action": "", - "plotLabel": "Minor Usage Type", - "aggregationPaths": [ - "Total Collection", - "Transactions", - "Assessed Properties" - ], - "pathDataTypeMapping": [ - { - "Total Collection": "amount" - }, - { - "Transactions": "number" - }, - { - "Assessed Properties": "number" - } - ], - "insight": { - }, - "_comment": "" - }, - "usageRevenueDrillDownSubMinor": { - "chartName": "", - "queries": [ - { - "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"usageId\" : \"domainObject.usageCategory.keyword\",\"minorUsageId\" : \"domainObject.usageCategory.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", - "dateRefField": "dataObject.paymentDetails.receiptDate", - "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"UsageType \":{\"terms\":{\"field\":\"domainObject.usageCategory.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.transactionNumber.keyword\"}},\"Assessed Properties\":{\"nested\":{\"path\":\"domainObject.assessmentsDetails\"},\"aggs\":{\"attr\":{\"cardinality\":{\"field\":\"domainObject.assessmentsDetails.assessmentNumber.keyword\"}}}}}}}}}}", - "aggrQuerybc": "{\"aggs\":{\"UsageType \":{\"terms\":{\"field\":\"domainObject.usageCategory.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.transactionNumber.keyword\"}},\"Assessed Properties\":{\"nested\":{\"path\":\"Data.propertyDetails\"},\"aggs\":{\"attr\":{\"cardinality\":{\"field\":\"Data.propertyDetails.assessmentNumber.keyword\"}}}}}}}}" - } - ], - "filterKeys": [ - - ], - "chartType": "table", - "valueType": "number", - "drillChart": "none", - "documentType": "_doc", - "action": "", - "plotLabel": "Sub Minor Usage Type", - "aggregationPaths": [ - "Total Collection", - "Transactions", - "Assessed Properties" - ], - "pathDataTypeMapping": [ - { - "Total Collection": "amount" - }, - { - "Transactions": "number" - }, - { - "Assessed Properties": "number" - } - ], - "insight": { - }, - "_comment": "" - }, - - - - "_comment": "TL COLLECTION CHARTS", - - "licenseIssuedDDRRevenue": { - "chartName": "DSS_TL_KEY_FY_INDICATORS", - "queries": [ - { - "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", - "dateRefField": "dataObject.paymentDetails.receiptDate", - "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.transactionNumber.keyword\"}},\"Total Licence Issued\":{\"value_count\":{\"field\":\"domainObject.tradelicense.licenseNumber.keyword\"}}}}}}" - }, - { - "module": "COMMON", - "requestQueryMap": "{\"module\" : \"businessService.keyword\", \"tenantId\" : \"tenantIdForMunicipalCorporation.keyword\"}", - "dateRefField": "", - "indexName": "dss-target_v1", - "aggrQuery": "{\"aggs\":{\"Target Collection\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}}}" - } - ], - "isMdmsEnabled": true, - "filterKeys": [ - {"key": "tenantId", "column": "DDRs"} - ], - "isPostResponseHandler": true, - "postAggregationTheory" : "repsonseToDifferenceOfDates", - "chartType": "table", - "valueType": "number", - "drillChart": "licenseIssuedBoundaryRevenue", - "documentType": "_doc", - "action": "", - "plotLabel": "DDRs", - "aggregationPaths": [ - "Total Collection", - "Transactions", - "Total Licence Issued", - "Target Collection" - ], - "pathDataTypeMapping": [ - { - "Total Collection": "amount" - }, - { - "Transactions": "number" - }, - { - "Total Licence Issued": "number" - }, - { - "Target Collection": "amount" - } - ], - "insight": { - }, - "_comment": "" - }, - "licenseIssuedBoundaryRevenue": { - "chartName": "DSS_TL_DEMAND_COLLECTION_BOUNDARY", - "queries": [ - { - "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", - "dateRefField": "dataObject.paymentDetails.receiptDate", - "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"ULBs \":{\"terms\":{\"field\":\"dataObject.tenantId.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.transactionNumber.keyword\"}},\"Total Licence Issued\":{\"value_count\":{\"field\":\"domainObject.tradelicense.licenseNumber.keyword\"}}}}}}}}" - }, - { - "module": "COMMON", - "requestQueryMap": "{\"module\" : \"businessService.keyword\", \"tenantId\" : \"tenantIdForMunicipalCorporation.keyword\"}", - "dateRefField": "", - "indexName": "dss-target_v1", - "aggrQuery": "{\"aggs\":{\"ULBs \":{\"terms\":{\"field\":\"tenantIdForMunicipalCorporation.keyword\",\"size\":1000},\"aggs\":{\"Target Collection\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}}}" - } - ], - "filterKeys": [ - {"key": "tenantId", "column": "Boundary"} - ], - "postAggregationTheory" : "repsonseToDifferenceOfDates", - "chartType": "table", - "valueType": "number", - "drillChart": "licenseIssuedBoundaryDrillDown", - "documentType": "_doc", - "action": "", - "plotLabel": "Boundary", - "aggregationPaths": [ - "Total Collection", - "Transactions", - "Total Licence Issued", - "Target Collection" - ], - "pathDataTypeMapping": [ - { - "Total Collection": "amount" - }, - { - "Transactions": "number" - }, - { - "Total Licence Issued": "number" - }, - { - "Target Collection": "amount" - } - ], - "insight": { - }, - "_comment": "" - }, - "licenseIssuedBoundaryDrillDown": { - "chartName": "", - "queries": [ - { - "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", - "dateRefField": "dataObject.paymentDetails.receiptDate", - "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Ward \":{\"terms\":{\"field\":\"domainObject.ward.name.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.transactionNumber.keyword\"}},\"Total Licence Issued\":{\"value_count\":{\"field\":\"domainObject.tradelicense.licenseNumber.keyword\"}}}}}}}}" - } - ], - "postAggregationTheory" : "repsonseToDifferenceOfDates", - "chartType": "table", - "valueType": "number", - "drillChart": "", - "documentType": "_doc", - "action": "", - "plotLabel": "Ward", - "aggregationPaths": [ - "Total Collection", - "Transactions", - "Total Licence Issued", - "Target Collection" - ], - "pathDataTypeMapping": [ - { - "Total Collection": "amount" - }, - { - "Transactions": "number" - }, - { - "Total Licence Issued": "number" - }, - { - "Target Collection": "amount" - } - ], - "insight": { - }, - "_comment": "" - }, - - "_comment": " TL Nested Array related newer queries", - "licenceTaxHeadsBreakupDDR": { - "chartName": "DSS_TL_TAX_HEAD_BREAKUP_BOUNDARY", - "queries": [ - { - "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", - "dateRefField": "dataObject.paymentDetails.receiptDate", - "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Total Amount\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"TL\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"TL Tax\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"TL_TAX\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Adhoc Penalty\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"TL_ADHOC_PENALTY\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Adhoc Rebate\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"TL_ADHOC_REBATE\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}}}}}}" - } - ], - "isMdmsEnabled": true, - "filterKeys": [ - {"key": "tenantId", "column": "DDRs"} - ], - "isPostResponseHandlerA": true, - "chartType": "xtable", - "valueType": "number", - "drillChart": "licenceTaxHeadsBreakupBoundary", - "documentType": "_doc", - "action": "", - "plotLabel": "DDRs", - "aggregationPaths": [ - "TL Tax", - "Adhoc Penalty", - "Adhoc Rebate" - ], - "computedFields": [ - { - "postAggregationTheory" : "", - "actionName": "AdditiveComputedField", - "fields" : ["TL Tax", "Adhoc Penalty", "Adhoc Rebate"], - "newField" : "Total Amount", - "_comments": "fields are field names picked from its aggregation query to use post aggregation newField value with given new field name " - } - ], - - "insight": { - }, - "_comment": "" - }, - "taxHeadsBreakupUsage": { - "chartName": "DSS_PT_TAX_HEAD_BREAKUP_USAGE", - "queries": [ - { - "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", - "dateRefField": "dataObject.paymentDetails.receiptDate", - "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Usage \":{\"terms\":{\"field\":\"domainObject.usageCategory.keyword\",\"size\":200},\"aggs\":{\"Total Amount\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}},\"PT Tax\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TAX\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Fire Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_FIRE_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Cancer Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_CANCER_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Rebate\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_REBATE\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Penalty\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_PENALTY\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}}}}}}}}" - } - ], - "filterKeys": [ - - ], - "chartType": "table", - "valueType": "number", - "drillChart": "", - "documentType": "_doc", - "action": "", - "plotLabel": "Usage Type", - "aggregationPaths": [ - "Total Amount", - "PT Tax", - "Fire Cess", - "Cancer Cess", - "Rebate", - "Penalty" - ], - "pathDataTypeMapping": [ - { - "Total Amount": "amount" - }, - { - "PT Tax": "amount" - }, - { - "Fire Cess": "amount" - }, - { - "Cancer Cess": "amount" - }, - { - "Rebate": "amount" - }, - { - "Penalty": "amount" - } - ], - "insight": { - }, - "_comment": "" - }, - "licenceTaxHeadsBreakupBoundary": { - "chartName": "DSS_TL_TAX_HEAD_BREAKUP_BOUNDARY", - "queries": [ - { - "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", - "dateRefField": "dataObject.paymentDetails.receiptDate", - "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"ULBs \":{\"terms\":{\"field\":\"dataObject.tenantId.keyword\",\"size\":200},\"aggs\":{\"Total Amount\":{\"bucket_script\":{\"buckets_path\":{\"c1\":\"TL Tax>aggrFilter>amount\",\"c2\":\"Adhoc Penalty>aggrFilter>amount\",\"c3\":\"Adhoc Rebate>aggrFilter>amount\"},\"script\":{\"source\":\"params.c1+params.c2+params.c3\"}}},\"TL Tax\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"TL_TAX\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Adhoc Penalty\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"TL_ADHOC_PENALTY\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Adhoc Rebate\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"TL_ADHOC_REBATE\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}}}}}}}}" - } - ], - "filterKeys": [ - {"key": "tenantId", "column": "Boundary"} - ], - "chartType": "xtable", - "valueType": "number", - "drillChart": "licenceTaxHeadsBreakupWard", - "documentType": "_doc", - "action": "", - "plotLabel": "Boundary", - "aggregationPaths": [ - "TL Tax", - "Adhoc Penalty", - "Adhoc Rebate","Total Amount" - ], - "insight": { - }, - "_comment": "" - }, - "licenceTaxHeadsBreakupWard": { - "chartName": "DSS_TL_TAX_HEAD_BREAKUP_BOUNDARY", - "queries": [ - { - "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", - "dateRefField": "dataObject.paymentDetails.receiptDate", - "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"ULBs \":{\"terms\":{\"field\":\"dataObject.ward.name.keyword\",\"size\":200},\"aggs\":{\"Total Amount\":{\"bucket_script\":{\"buckets_path\":{\"c1\":\"TL Tax>aggrFilter>amount\",\"c2\":\"Adhoc Penalty>aggrFilter>amount\",\"c3\":\"Adhoc Rebate>aggrFilter>amount\"},\"script\":{\"source\":\"params.c1+params.c2+params.c3\"}}},\"TL Tax\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"TL_TAX\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Adhoc Penalty\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"TL_ADHOC_PENALTY\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}},\"Adhoc Rebate\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"TL_ADHOC_REBATE\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.amount\"}}}}}}}}}}}}" - } - ], - "filterKeys": [ - ], - "chartType": "xtable", - "valueType": "number", - "drillChart": "", - "documentType": "_doc", - "action": "", - "plotLabel": "Boundary", - "aggregationPaths": [ - "TL Tax", - "Adhoc Penalty", - "Adhoc Rebate", "Total Amount" - ], - "insight": { - }, - "_comment": "" - }, - - - "_comment": "TL NON-COLLECTION CHARTS", - "licenseIssued": { - "chartName": "DSS_TL_LICENSE_ISSUED", - "queries": [ - { - "module": "TL", - "indexName": "tlindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tradelicense.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\": {\"License Issued\": {\"value_count\": {\"field\": \"Data.tradelicense.licenseNumber.keyword\"}}}}}}", - "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \r\n \"district\" : \"Data.tenantData.city.districtCode\", \r\n\"tenantId\" : \"Data.tradelicense.tenantid\" \r\n, \r\n\"businessService\" : \"dataObject.Bill.billDetails.businessServices\" \r\n}", - "dateRefField": "Data.tradelicense.issuedDate" - } - ], - "chartType": "metric", - "valueType": "number", - "action": "", - "documentType": "_doc", - "drillChart": "none", - "aggregationPaths": [ - "License Issued" - ], - "insight": { - "chartResponseMap" : "licenseIssued", - "action" : "differenceOfNumbers", - "upwardIndicator" : "positive", - "downwardIndicator" : "negative", - "textMessage" : "$indicator$value% than last $insightInterval", - "colorCode" : "#228B22", - "insightInterval" : "year" - }, - "_comment": " licenseIssued is the Chart ID" - }, - "cumulativeLicenseIssued": { - "chartName": "DSS_TL_CUMULATIVE_LICENSE_ISSUED", - "queries": [ - { - "module": "TL", - "indexName": "tlindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tradelicense.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Trade Licence Issued\":{\"date_histogram\":{\"field\":\"Data.tradelicense.issuedDate\",\"interval\":\"intervalvalue\"},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.tradelicense.licenseNumber.keyword\"}}}}}}}}", - "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \"tenantId\" : \"Data.tenantData.code\" ,\"district\" : \"Data.tenantData.city.districtCode\"}", - "dateRefField": "Data.tradelicense.issuedDate" - }, - { - "module": "TL", - "indexName": "tlindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tradelicense.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Total Application\":{\"date_histogram\":{\"field\":\"Data.tradelicense.applicationDate\",\"interval\":\"intervalvalue\"},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.tradelicense.applicationNumber.keyword\"}}}}}}}}", - "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \"tenantId\" : \"Data.tenantData.code\" ,\"district\" : \"Data.tenantData.city.districtCode\"}", - "dateRefField": "Data.tradelicense.applicationDate" - } - ], - "chartType": "line", - "valueType": "number", - "action": "", - "documentType": "_doc", - "drillChart": "none", - "aggregationPaths": [ - "Trade Licence Issued", - "Total Application" - ], - "isCumulative": true, - "interval": "month", - "insight": { - }, - "_comment": " Total Number of License having issued" - }, - "licenseApplicationByStatus": { - "chartName": "DSS_TL_LICENSE_BY_STATUS", - "queries": [ - { - "module": "TL", - "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \r\n \"district\" : \"Data.tenantData.city.districtCode\", \r\n\"tenantId\" : \"Data.tradelicense.tenantId.keyword\" \r\n}", - "dateRefField": "Data.tradelicense.applicationDate", - "indexName": "tlindex-v1", - "aggrQueryBc": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tradelicense.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"TL\":{\"terms\":{\"field\":\"Data.tradelicense.status.keyword\"},\"aggs\":{\"TL\":{\"value_count\":{\"field\":\"Data.tradelicense.status.keyword\"}}}}}}}}", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tradelicense.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"TL\":{\"terms\":{\"field\":\"Data.tradelicense.status.keyword\",\"size\":200},\"aggs\":{\"TL\":{\"value_count\":{\"field\":\"Data.tradelicense.applicationNumber.keyword\"}}}}}}}}" - } - ], - "chartType": "pie", - "valueType": "number", - "action": "", - "documentType": "_doc", - "drillChart": "none", - "aggregationPaths": [ - "TL" - ], - "insight": { - }, - "_comment": " License Application which are issued by License Type" - }, - "slaAchieved": { - "chartName": "DSS_SLA_ACHIEVED", - "queries": [ - { - "module": "PGR", - "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\", \r\n \"module\" : \"businessService.keyword\", \n\"tenantId\" : \"Data.tenantId\"}", - "dateRefField": "Data.dateOfComplaint", - "indexName": "pgrindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Total Application\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}, \"withinSLA\":{\"range\":{\"script\":{\"lang\":\"painless\",\"source\":\"doc['Data.slaHours'].value\"},\"ranges\":[{\"key\":\"Within SLA\",\"from\":0,\"to\":360}]}}}}}}" - } - ], - "chartType": "metric", - "valueType": "percentage", - "drillChart": "none", - "documentType": "_doc", - "action": "percentage", - "aggregationPaths": [ - "withinSLA", - "Total Application" - ], - "insight": { - "chartResponseMap" : "slaAchieved", - "action" : "differenceOfNumbers", - "upwardIndicator" : "positive", - "downwardIndicator" : "negative", - "textMessage" : "$indicator$value% than last $insightInterval", - "colorCode" : "#228B22", - "insightInterval" : "year" - }, - "_comment": " SLA Achieved Percentage " - }, - "tlStatusByDDR": { - "chartName": "DSS_TL_STATUS_BY_DDR", - "queries": [ - { - "module": "TL", - "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \"tenantId\" : \"Data.tradelicense.tenantId.keyword\" }", - "dateRefField": "Data.tradelicense.applicationDate", - "indexName": "tlindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tradelicense.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Status\":{\"terms\":{\"field\":\"Data.tradelicense.status.keyword\",\"size\":1000,\"min_doc_count\":0},\"aggs\":{\"License Issued\":{\"value_count\":{\"field\":\"Data.tradelicense.applicationNumber.keyword\"}}}}}}}}", - "aggrQueryBC": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tradelicense.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Status\":{\"filters\":{\"filters\":{\"Approved\":{\"match\":{\"Data.tradelicense.status.keyword\":\"APPROVED\"}},\"Initiated\":{\"match\":{\"Data.tradelicense.status.keyword\":\"INITIATED\"}},\"Applied\":{\"match\":{\"Data.tradelicense.status.keyword\":\"APPLIED\"}},\"Rejected\":{\"match\":{\"Data.tradelicense.status.keyword\":\"REJECTED\"}},\"Pending Approval\":{\"match\":{\"Data.tradelicense.status.keyword\":\"PENDINGAPPROVAL\"}},\"Field Inspection\":{\"match\":{\"Data.tradelicense.status.keyword\":\"FIELDINSPECTION\"}},\"Cancelled\":{\"match\":{\"Data.tradelicense.status.keyword\":\"CANCELLED\"}},\"Pending Payment\":{\"match\":{\"Data.tradelicense.status.keyword\":\"PENDINGPAYMENT\"}},\"Paid\":{\"match\":{\"Data.tradelicense.status.keyword\":\"PAID\"}}}}}}}}}" - } - ], - "isMdmsEnabled": true, - "filterKeys": [ - {"key": "tenantId", "column": "DDRs"} - ], - "chartType": "xtable", - "valueType": "number", - "drillChart": "tlStatusByTenant", - "drillFields": [ - "" - ], - "documentType": "_doc", - "action": "", - "plotLabel": "DDRs", - "aggregationPathsA": [ - "Approved", - "Initiated", - "Applied", - "Rejected", - "Pending Approval", - "Field Inspection", - "Cancelled", - "Pending Payment", - "Paid" - ], - "pathDataTypeMappingA": [ - { - "Approved": "number" - }, - { - "Initiated": "number" - }, - { - "Applied": "number" - }, - { - "Rejected": "number" - }, - { - "Pending Approval": "number" - }, - { - "Field Inspection": "number" - }, - { - "Cancelled": "number" - }, - { - "Pending Payment": "number" - }, - { - "Paid": "number" - } - ], - "insight": { - }, - "_comment": "" - }, - "tlStatusByTenant": { - "chartName": "DSS_TL_STATUS_BY_TENANT", - "queries": [ - { - "module": "TL", - "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \"tenantId\" : \"Data.tradelicense.tenantId.keyword\" }", - "dateRefField": "Data.tradelicense.issuedDate", - "indexName": "tlindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tradelicense.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"ULBs \":{\"terms\":{\"field\":\"Data.tradelicense.tenantId.keyword\",\"size\":1000},\"aggs\":{\"Status\":{\"terms\":{\"field\":\"Data.tradelicense.status.keyword\",\"size\":1000,\"min_doc_count\":0},\"aggs\":{\"License Issued\":{\"value_count\":{\"field\":\"Data.tradelicense.licenseNumber.keyword\"}}}}}}}}}}", - "aggrQueryBc": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tradelicense.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"ULBs \":{\"terms\":{\"field\":\"Data.tradelicense.tenantId.keyword\",\"size\":1000},\"aggs\":{\"Status\":{\"filters\":{\"filters\":{\"Approved\":{\"match\":{\"Data.tradelicense.status.keyword\":\"APPROVED\"}},\"Initiated\":{\"match\":{\"Data.tradelicense.status.keyword\":\"INITIATED\"}},\"Applied\":{\"match\":{\"Data.tradelicense.status.keyword\":\"APPLIED\"}},\"Rejected\":{\"match\":{\"Data.tradelicense.status.keyword\":\"REJECTED\"}},\"Pending Approval\":{\"match\":{\"Data.tradelicense.status.keyword\":\"PENDINGAPPROVAL\"}},\"Field Inspection\":{\"match\":{\"Data.tradelicense.status.keyword\":\"FIELDINSPECTION\"}},\"Cancelled\":{\"match\":{\"Data.tradelicense.status.keyword\":\"CANCELLED\"}},\"Pending Payment\":{\"match\":{\"Data.tradelicense.status.keyword\":\"PENDINGPAYMENT\"}},\"Paid\":{\"match\":{\"Data.tradelicense.status.keyword\":\"PAID\"}}}}}}}}}}}" - } - ], - "filterKeys": [ - {"key": "tenantId", "column": "Boundary"} - ], - "chartType": "xtable", - "valueType": "number", - "drillChart": "tlStatusByTenantDrillDown", - "drillFields": [ - "" - ], - "documentType": "_doc", - "action": "", - "plotLabel": "ULBs", - "aggregationPaths": [ - - ], - "pathDataTypeMapping": [ - - ], - "insight": { - }, - "_comment": "" - }, - "tlStatusByTenantDrillDown": { - "chartName": "DSS_TL_STATUS_BY_WARD", - "queries": [ - { - "module": "TL", - "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \"tenantId\" : \"Data.tradelicense.tenantId.keyword\" }", - "dateRefField": "Data.tradelicense.issuedDate", - "indexName": "tlindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tradelicense.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Ward \":{\"terms\":{\"field\":\"Data.ward.name.keyword\",\"size\":1000},\"aggs\":{\"Status\":{\"terms\":{\"field\":\"Data.tradelicense.status.keyword\",\"size\":1000,\"min_doc_count\":0},\"aggs\":{\"License Issued\":{\"value_count\":{\"field\":\"Data.tradelicense.licenseNumber.keyword\"}}}}}}}}}}", - "aggrQueryBc": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tradelicense.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Ward \":{\"terms\":{\"field\":\"Data.ward.name.keyword\",\"size\":1000},\"aggs\":{\"Status\":{\"filters\":{\"filters\":{\"Approved\":{\"match\":{\"Data.tradelicense.status.keyword\":\"APPROVED\"}},\"Initiated\":{\"match\":{\"Data.tradelicense.status.keyword\":\"INITIATED\"}},\"Applied\":{\"match\":{\"Data.tradelicense.status.keyword\":\"APPLIED\"}},\"Rejected\":{\"match\":{\"Data.tradelicense.status.keyword\":\"REJECTED\"}},\"Pending Approval\":{\"match\":{\"Data.tradelicense.status.keyword\":\"PENDINGAPPROVAL\"}},\"Field Inspection\":{\"match\":{\"Data.tradelicense.status.keyword\":\"FIELDINSPECTION\"}},\"Cancelled\":{\"match\":{\"Data.tradelicense.status.keyword\":\"CANCELLED\"}},\"Pending Payment\":{\"match\":{\"Data.tradelicense.status.keyword\":\"PENDINGPAYMENT\"}},\"Paid\":{\"match\":{\"Data.tradelicense.status.keyword\":\"PAID\"}}}}}}}}}}}" - } - ], - "filterKeys": [ - ], - "chartType": "xtable", - "valueType": "number", - "drillChart": "", - "drillFields": [ - "" - ], - "documentType": "_doc", - "action": "", - "plotLabel": "Ward", - "aggregationPathsA": [ - "Approved", - "Initiated", - "Applied", - "Rejected", - "Pending Approval", - "Field Inspection", - "Cancelled", - "Pending Payment", - "Paid" - ], - "pathDataTypeMappingA": [ - { - "Approved": "number" - }, - { - "Initiated": "number" - }, - { - "Applied": "number" - }, - { - "Rejected": "number" - }, - { - "Pending Approval": "number" - }, - { - "Field Inspection": "number" - }, - { - "Cancelled": "number" - }, - { - "Pending Payment": "number" - }, - { - "Paid": "number" - } - ], - "insight": { - }, - "_comment": "" - }, - - "_comment": "Enhanced table charts..TODO: refactor to remove xtable type ", - "xlicenseIssuedBoundaryRevenue": { - "chartName": "DSS_TL_DEMAND_COLLECTION_BOUNDARY", - "queries": [ - { - "module": "COMMON", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", - "dateRefField": "dataObject.paymentDetails.receiptDate", - "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"ULBs \":{\"terms\":{\"field\":\"dataObject.tenantId.keyword\",\"size\":200,\"min_doc_count\":0},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.transactionNumber.keyword\"}},\"Total Licence Issued\":{\"value_count\":{\"field\":\"domainObject.tradelicense.licenseNumber.keyword\"}}}}}}}}" - }, - { - "module": "COMMON", - "requestQueryMap": "{\"module\" : \"businessService.keyword\", \"tenantId\" : \"tenantIdForMunicipalCorporation.keyword\"}", - "dateRefField": "", - "indexName": "dss-target_v1", - "aggrQuery": "{\"aggs\":{\"ULBs \":{\"terms\":{\"field\":\"tenantIdForMunicipalCorporation.keyword\",\"size\":1000,\"min_doc_count\":0},\"aggs\":{\"Target Collection\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}}}" - } - ], - "filterKeys": [ - {"key": "tenantId", "column": "Boundary"} - ], - "postAggregationTheory" : "repsonseToDifferenceOfDates", - "chartType": "xtable", - "valueType": "number", - "drillChart": "", - "plotLabel": "Boundary", - "aggregationPaths": [ - ], - "computedFields": [ - { - "postAggregationTheory" : "repsonseToDifferenceOfDates", - "actionName": "PercentageComputedField", - "fields" : ["Target Collection", "Total Collection"], - "newField" : "Target Achieved", - "_comments": "fields are field names picked from its aggregation query to use post aggregation newField value with given new field name " - }, - { - "postAggregationTheory" : "repsonseToDifferenceOfDates", - "actionName": "PercentageComputedField", - "fields" : ["Target Collection", "Total Collection"], - "newField" : "Target Achieved", - "_comments": "fields are field names picked from its aggregation query to use post aggregation newField value with given new field name " - } - ], - "pathDataTypeMapping": [ - ], - "insight": { - }, - "_comment": "" - }, - "xptFyByDDR": { - "chartName": "DSS_TL_STATUS_BY_TENANT", - "queries": [ - { - "module": "PT", - "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\",\"tenantId\" : \"Data.tenantId.keyword\" }", - "dateRefField": "Data.@timestamp", - "indexName": "property-assessments", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Fys\":{\"terms\":{\"field\":\"Data.financialYear.keyword\",\"min_doc_count\":0}}}}}}" - }, - { - "module": "PT", - "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \"tenantId\" : \"Data.tenantId.keyword\" }", - "dateRefField": "Data.@timestamp", - "indexName": "property-assessments", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Total\":{\"value_count\":{\"field\":\"Data.assessmentNumber.keyword\"}}}}}}}}" - } - ], - "isMdmsEnabled": true, - "filterKeys": [ - {"key": "tenantId", "column": "DDRs"} - ], - "chartType": "xtable", - "valueType": "number", - "drillChart": "xptFyByTenant", - "plotLabel": "DDRs", - "insight": { - }, - "_comment": "" - }, - "xptFyByTenant": { - "chartName": "DSS_TL_STATUS_BY_TENANT", - "queries": [ - { - "module": "PT", - "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\",\"tenantId\" : \"Data.tenantId.keyword\" }", - "dateRefField": "Data.@timestamp", - "indexName": "property-assessments", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"ULBS \":{\"terms\":{\"field\":\"Data.tenantId.keyword\"},\"aggs\":{\"Fys\":{\"terms\":{\"field\":\"Data.financialYear.keyword\",\"min_doc_count\":0}}}}}}}}" - }, - { - "module": "PT", - "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\",\"tenantId\" : \"Data.tenantId.keyword\" }", - "dateRefField": "Data.@timestamp", - "indexName": "property-assessments", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"ULBS \":{\"terms\":{\"field\":\"Data.tenantId.keyword\"},\"aggs\":{\"Total\":{\"value_count\":{\"field\":\"Data.assessmentNumber.keyword\"}}}}}}}}" - } - ], - "filterKeys": [ - {"key": "tenantId", "column": "Boundary"} - ], - "chartType": "xtable", - "valueType": "number", - "drillChart": "xptFyByWard", - "plotLabel": "Boundary", - "insight": { - }, - "_comment": "" - }, - "xptFyByWard": { - "chartName": "DSS_TL_STATUS_BY_TENANT", - "queries": [ - { - "module": "PT", - "requestQueryMap": "{\"tenantId\" : \"Data.tenantId.keyword\" , \"wardId\" : \"Data.ward.name.keyword\"}", - "dateRefField": "Data.@timestamp", - "indexName": "property-assessments", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Ward \":{\"terms\":{\"field\":\"Data.ward.name.keyword\"},\"aggs\":{\"Fys\":{\"terms\":{\"field\":\"Data.financialYear.keyword\",\"min_doc_count\":0}}}}}}}}" - }, - { - "module": "PT", - "requestQueryMap": "{\"tenantId\" : \"Data.tenantId.keyword\" , \"wardId\" : \"Data.ward.name.keyword\"}", - "dateRefField": "Data.@timestamp", - "indexName": "property-assessments", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Ward \":{\"terms\":{\"field\":\"Data.ward.name.keyword\"},\"aggs\":{\"Total\":{\"value_count\":{\"field\":\"Data.assessmentNumber.keyword\"}}}}}}}}" - } - ], - "filterKeys": [ - ], - "chartType": "xtable", - "valueType": "number", - "drillChart": "none", - "plotLabel": "Wards", - "insight": { - }, - "_comment": "" - }, - - "xpgrStatusByDDR": { - "chartName": "DSS_PGR_STATUS_BY_TENANT", - "queries": [ - { - "module": "PGR", - "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\", \"tenantId\" : \"Data.tenantId.keyword\" , \"departmentId\" : \"Data.department.keyword\"}", - "dateRefField": "Data.dateOfComplaint", - "indexName": "pgrindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"withinSLA\":{\"range\":{\"script\":{\"lang\":\"painless\",\"source\":\"doc['Data.slaHours'].value\"},\"ranges\":[{\"key\":\"withinSLA\",\"from\":0,\"to\":360}]}},\"Total Complaints\":{\"value_count\":{\"field\":\"Data.dateOfComplaint\"}},\"Closed_Complaints\":{\"filter\":{\"terms\":{\"Data.status.keyword\":[\"closed\",\"rejected\",\"resolved\"]}},\"aggs\":{\"Closed Complaints\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}},\"Open_Complaints\":{\"filter\":{\"terms\":{\"Data.status.keyword\":[\"open\"]}},\"aggs\":{\"Open Complaints\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}},\"Reopened_Complaints\":{\"filter\":{\"terms\":{\"Data.actionHistory.actions.action.keyword\":[\"reopen\"]}},\"aggs\":{\"Reopened Complaints\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}}}}" - } - ], - "isMdmsEnabled": true, - "filterKeys": [ - {"key": "tenantId", "column": "DDRs"} - ], - "chartType": "xtable", - "valueType": "number", - "drillChart": "xpgrStatusByTenant", - "plotLabel": "DDRs", - "excludedColumns": ["withinSLA"], - "computedFields": [ - { - "postAggregationTheory" : "", - "actionName": "PercentageComputedField", - "fields" : ["Closed Complaints", "Total Complaints"], - "newField" : "Completion Rate", - "_comments": "fields are field names picked from its aggregation query to use post aggregation newField value with given new field name " - }, - { - "postAggregationTheory" : "", - "actionName": "PercentageComputedField", - "fields" : ["withinSLA","Total Complaints"], - "newField" : "Sla Achieved", - "_comments": "fields are field names picked from its aggregation query to use post aggregation newField value with given new field name " - } - ], - "insight": { - }, - "_comment": "" - }, - "xpgrStatusByTenant": { - "chartName": "DSS_PGR_STATUS_BY_TENANT", - "queries": [ - { - "module": "PGR", - "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\", \"tenantId\" : \"Data.tenantId.keyword\" , \"departmentId\" : \"Data.department.keyword\"}", - "dateRefField": "Data.dateOfComplaint", - "indexName": "pgrindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"ULBs \":{\"terms\":{\"field\":\"Data.tenantId.keyword\",\"size\":1000},\"aggs\":{\"withinSLA\":{\"range\":{\"script\":{\"lang\":\"painless\",\"source\":\"doc['Data.slaHours'].value\"},\"ranges\":[{\"key\":\"withinSLA\",\"from\":0,\"to\":360}]}},\"Total Complaints\":{\"value_count\":{\"field\":\"Data.dateOfComplaint\"}},\"Closed_Complaints\":{\"filter\":{\"terms\":{\"Data.status.keyword\":[\"closed\",\"rejected\",\"resolved\"]}},\"aggs\":{\"Closed Complaints\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}},\"Open_Complaints\":{\"filter\":{\"terms\":{\"Data.status.keyword\":[\"open\"]}},\"aggs\":{\"Open Complaints\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}},\"Reopened_Complaints\":{\"filter\":{\"terms\":{\"Data.actionHistory.actions.action.keyword\":[\"reopen\"]}},\"aggs\":{\"Reopened Complaints\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}}}}}}" - } - ], - "filterKeys": [ - {"key": "tenantId", "column": "Boundary"} - ], - "chartType": "xtable", - "valueType": "number", - "drillChart": "xpgrStatusByWard", - "plotLabel": "Boundary", - "excludedColumns": ["withinSLA"], - "computedFields": [ - { - "postAggregationTheory" : "", - "actionName": "PercentageComputedField", - "fields" : ["Closed Complaints", "Total Complaints"], - "newField" : "Completion Rate", - "_comments": "fields are field names picked from its aggregation query to use post aggregation newField value with given new field name " - }, - { - "postAggregationTheory" : "", - "actionName": "PercentageComputedField", - "fields" : ["Total Complaints", "withinSLA"], - "newField" : "Sla Achieved", - "_comments": "fields are field names picked from its aggregation query to use post aggregation newField value with given new field name " - } - ], - "insight": { - }, - "_comment": "" - }, - "xpgrStatusByWard": { - "chartName": "DSS_PGR_STATUS_BY_TENANT", - "queries": [ - { - "module": "PGR", - "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\", \"tenantId\" : \"Data.tenantId.keyword\" , \"departmentId\" : \"Data.department.keyword\"}", - "dateRefField": "Data.dateOfComplaint", - "indexName": "pgrindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Ward \":{\"terms\":{\"field\":\"Data.complaintWard.name.keyword\",\"size\":1000},\"aggs\":{\"withinSLA\":{\"range\":{\"script\":{\"lang\":\"painless\",\"source\":\"doc['Data.slaHours'].value\"},\"ranges\":[{\"key\":\"withinSLA\",\"from\":0,\"to\":360}]}},\"Total Complaints\":{\"value_count\":{\"field\":\"Data.dateOfComplaint\"}},\"Closed_Complaints\":{\"filter\":{\"terms\":{\"Data.status.keyword\":[\"closed\",\"rejected\",\"resolved\"]}},\"aggs\":{\"Closed Complaints\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}},\"Open_Complaints\":{\"filter\":{\"terms\":{\"Data.status.keyword\":[\"open\"]}},\"aggs\":{\"Open Complaints\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}},\"Reopened_Complaints\":{\"filter\":{\"terms\":{\"Data.actionHistory.actions.action.keyword\":[\"reopen\"]}},\"aggs\":{\"Reopened Complaints\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}}}}}}" - } - ], - "filterKeys": [ - {"key": "tenantId", "column": "Boundary"} - ], - "chartType": "xtable", - "valueType": "number", - "drillChart": "none", - - "documentType": "_doc", - "action": "", - "plotLabel": "Ward", - "excludedColumns": ["withinSLA"], - "computedFields": [ - { - "postAggregationTheory" : "", - "actionName": "PercentageComputedField", - "fields" : ["Closed Complaints", "Total Complaints"], - "newField" : "Completion Rate", - "_comments": "fields are field names picked from its aggregation query to use post aggregation newField value with given new field name " - }, - { - "postAggregationTheory" : "", - "actionName": "PercentageComputedField", - "fields" : ["Total Complaints", "withinSLA"], - "newField" : "Sla Achieved", - "_comments": "fields are field names picked from its aggregation query to use post aggregation newField value with given new field name " - } - ], - "insight": { - }, - "_comment": "" - }, - "xpgrStatusByDept": { - "chartName": "DSS_PGR_STATUS_BY_TENANT", - "queries": [ - { - "module": "PGR", - "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\",\"tenantId\" : \"Data.tenantId.keyword\" , \"departmentId\" : \"Data.department.keyword\"}", - "dateRefField": "Data.dateOfComplaint", - "indexName": "pgrindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Department \":{\"terms\":{\"field\":\"Data.department.keyword\",\"size\":1000},\"aggs\":{\"withinSLA\":{\"range\":{\"script\":{\"lang\":\"painless\",\"source\":\"doc['Data.slaHours'].value\"},\"ranges\":[{\"key\":\"withinSLA\",\"from\":0,\"to\":360}]}},\"Total Complaints\":{\"value_count\":{\"field\":\"Data.dateOfComplaint\"}},\"Closed_Complaints\":{\"filter\":{\"terms\":{\"Data.status.keyword\":[\"closed\",\"rejected\",\"resolved\"]}},\"aggs\":{\"Closed Complaints\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}},\"Open_Complaints\":{\"filter\":{\"terms\":{\"Data.status.keyword\":[\"open\"]}},\"aggs\":{\"Open Complaints\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}},\"Reopened_Complaints\":{\"filter\":{\"terms\":{\"Data.actionHistory.actions.action.keyword\":[\"reopen\"]}},\"aggs\":{\"Reopened Complaints\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}}}}}}" - } - ], - "filterKeys": [ - {"key": "departmentId", "column": "Department"} - ], - "chartType": "xtable", - "valueType": "number", - "drillChart": "xpgrStatusByCatagory", - - "documentType": "_doc", - "action": "", - "plotLabel": "Department", - "excludedColumns": ["withinSLA"], - "computedFields": [ - { - "postAggregationTheory" : "", - "actionName": "PercentageComputedField", - "fields" : ["Closed Complaints", "Total Complaints"], - "newField" : "Completion Rate", - "_comments": "fields are field names picked from its aggregation query to use post aggregation newField value with given new field name " - }, - { - "postAggregationTheory" : "", - "actionName": "PercentageComputedField", - "fields" : ["Total Complaints", "withinSLA"], - "newField" : "Sla Achieved", - "_comments": "fields are field names picked from its aggregation query to use post aggregation newField value with given new field name " - } - ], - "insight": { - }, - "_comment": "" - }, - "xpgrStatusByCatagory": { - "chartName": "DSS_PGR_STATUS_BY_TENANT", - "queries": [ - { - "module": "PGR", - "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\", \"tenantId\" : \"Data.tenantId.keyword\" , \"departmentId\" : \"Data.department.keyword\"}", - "dateRefField": "Data.dateOfComplaint", - "indexName": "pgrindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Category \":{\"terms\":{\"field\":\"Data.complainCategory.keyword\",\"size\":1000},\"aggs\":{\"withinSLA\":{\"range\":{\"script\":{\"lang\":\"painless\",\"source\":\"doc['Data.slaHours'].value\"},\"ranges\":[{\"key\":\"withinSLA\",\"from\":0,\"to\":360}]}},\"Total Complaints\":{\"value_count\":{\"field\":\"Data.dateOfComplaint\"}},\"Closed_Complaints\":{\"filter\":{\"terms\":{\"Data.status.keyword\":[\"closed\",\"rejected\",\"resolved\"]}},\"aggs\":{\"Closed Complaints\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}},\"Open_Complaints\":{\"filter\":{\"terms\":{\"Data.status.keyword\":[\"open\"]}},\"aggs\":{\"Open Complaints\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}},\"Reopened_Complaints\":{\"filter\":{\"terms\":{\"Data.actionHistory.actions.action.keyword\":[\"reopen\"]}},\"aggs\":{\"Reopened Complaints\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}}}}}}" - } - ], - "filterKeys": [ - {"key": "departmentId", "column": "Department"} - ], - "chartType": "xtable", - "valueType": "number", - "drillChart": "none", - - "documentType": "_doc", - "action": "", - "plotLabel": "Complaint Category", - "excludedColumns": ["withinSLA"], - "computedFields": [ - { - "postAggregationTheory" : "", - "actionName": "PercentageComputedField", - "fields" : ["Closed Complaints", "Total Complaints"], - "newField" : "Completion Rate", - "_comments": "fields are field names picked from its aggregation query to use post aggregation newField value with given new field name " - }, - { - "postAggregationTheory" : "", - "actionName": "PercentageComputedField", - "fields" : ["Total Complaints", "withinSLA"], - "newField" : "Sla Achieved", - "_comments": "fields are field names picked from its aggregation query to use post aggregation newField value with given new field name " - } - ], - "insight": { - }, - "_comment": "" - }, - - "_comment": "PGR NON-COLLECTION CHARTS", - "completionRate": { - "chartName": "DSS_PGR_COMPLETION_RATE", - "queries": [ - { - "module": "PGR", - "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\", \"tenantId\" : \"Data.tenantId\"}", - "dateRefField": "Data.dateOfComplaint", - "indexName": "pgrindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Total Complaints\":{\"value_count\":{\"field\":\"Data.dateOfComplaint\"}},\"Closed Complaints\":{\"filters\":{\"filters\":{\"closed\":{\"match\":{\"Data.status.keyword\":\"closed\"}},\"resolved\":{\"match\":{\"Data.status.keyword\":\"resolved\"}},\"rejected\":{\"match\":{\"Data.status.keyword\":\"rejected\"}}}}}}}}}" - } - ], - "chartType": "metric", - "valueType": "percentage", - "drillChart": "none", - "documentType": "_doc", - "action": "percentage", - "aggregationPaths": [ - "Closed Complaints", - "Total Complaints" - ], - "insight": { - "chartResponseMap" : "completionRate", - "action" : "differenceOfNumbers", - "upwardIndicator" : "positive", - "downwardIndicator" : "negative", - "textMessage" : "$indicator$value% than last $insightInterval", - "colorCode" : "#228B22", - "insightInterval" : "year" - }, - "_comment": " Total Number of Complaints " - }, - "totalComplaints": { - "chartName": "DSS_PGR_TOTAL_COMPLAINTS", - "queries": [ - { - "module": "PGR", - "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\", \"tenantId\" : \"Data.tenantId\"}", - "dateRefField": "Data.dateOfComplaint", - "indexName": "pgrindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Total Complaints\":{\"value_count\":{\"field\":\"Data.dateOfComplaint\"}}}}}}" - } - ], - "chartType": "metric", - "valueType": "number", - "drillChart": "none", - "documentType": "_doc", - "action": "", - "aggregationPaths": [ - "Total Complaints" - ], - "insight": { - "chartResponseMap" : "totalComplaints", - "action" : "differenceOfNumbers", - "upwardIndicator" : "positive", - "downwardIndicator" : "negative", - "textMessage" : "$indicator$value% than last $insightInterval", - "colorCode" : "#228B22", - "insightInterval" : "year" - }, - "_comment": " Total Number of Complaints " - }, - "closedComplaints": { - "chartName": "DSS_PGR_CLOSED_COMPLAINTS", - "queries": [ - { - "module": "PGR", - "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\", \"tenantId\" : \"Data.tenantId\"}", - "dateRefField": "Data.dateOfComplaint", - "indexName": "pgrindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Closed Complaints\":{\"filters\":{\"filters\":{\"closed\":{\"match\":{\"Data.status.keyword\":\"closed\"}},\"resolved\":{\"match\":{\"Data.status.keyword\":\"resolved\"}},\"rejected\":{\"match\":{\"Data.status.keyword\":\"rejected\"}}}}}}}}}" - } - ], - "chartType": "metric", - "valueType": "number", - "drillChart": "none", - "documentType": "_doc", - "action": "", - "aggregationPaths": [ - "Closed Complaints" - ], - "insight": { - "chartResponseMap" : "closedComplaints", - "action" : "differenceOfNumbers", - "upwardIndicator" : "positive", - "downwardIndicator" : "negative", - "textMessage" : "$indicator$value% than last $insightInterval", - "colorCode" : "#228B22", - "insightInterval" : "year" - }, - "_comment": " Total Number of Closed Complaints " - }, - "cumulativeClosedComplaints": { - "chartName": "DSS_TOTAL_CUMULATIVE_CLOSED_COMPLAINTS", - "queries": [ - { - "module": "PGR", - "dateRefField": "Data.dateOfComplaint", - "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\",\"tenantId\" : \"Data.tenantId\"}", - "indexName": "pgrindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Total Complaints\":{\"date_histogram\":{\"field\":\"Data.dateOfComplaint\",\"interval\":\"month\"},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}},\"Closed Complaints\":{\"date_histogram\":{\"field\":\"Data.dateOfComplaint\",\"interval\":\"month\"},\"aggs\":{\"Closed\":{\"filter\":{\"terms\":{\"Data.status.keyword\":[\"closed\",\"rejected\",\"resolved\"]}},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}},\"Reopened Complaints\":{\"date_histogram\":{\"field\":\"Data.dateOfComplaint\",\"interval\":\"month\"},\"aggs\":{\"Reopened\":{\"filter\":{\"terms\":{\"Data.actionHistory.actions.action.keyword\":[\"reopen\"]}},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}}}}}}" - } - ], - "chartType": "line", - "valueType": "number", - "action": "", - "drillChart": "none", - "documentType": "_doc", - "aggregationPaths": [ - "Closed Complaints", - "Reopened Complaints", - "Total Complaints" - - ], - "isCumulative": true, - "interval": "month", - "insight": { - }, - "_comment": " " - }, - "totalComplaintsbySource": { - "chartName": "DSS_PGR_TOTAL_COMPLAINTS_BY_SOURCE", - "queries": [ - { - "module": "PGR", - "dateRefField": "Data.dateOfComplaint", - "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\", \"tenantId\" : \"Data.tenantId\"}", - "indexName": "pgrindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Ivr\":{\"date_histogram\":{\"field\":\"Data.dateOfComplaint\",\"interval\":\"intervalvalue\"},\"aggs\":{\"ivr\":{\"filter\":{\"terms\":{\"Data.source.keyword\":[\"ivr\"]}},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.dateOfComplaint\"}}}}}},\"Web\":{\"date_histogram\":{\"field\":\"Data.dateOfComplaint\",\"interval\":\"intervalvalue\"},\"aggs\":{\"web\":{\"filter\":{\"terms\":{\"Data.source.keyword\":[\"web\"]}},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.dateOfComplaint\"}}}}}},\"Whatsapp\":{\"date_histogram\":{\"field\":\"Data.dateOfComplaint\",\"interval\":\"intervalvalue\"},\"aggs\":{\"whatapp\":{\"filter\":{\"terms\":{\"Data.source.keyword\":[\"whatsapp\"]}},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.dateOfComplaint\"}}}}}},\"Mobileapp\":{\"date_histogram\":{\"field\":\"Data.dateOfComplaint\",\"interval\":\"intervalvalue\"},\"aggs\":{\"mobileapp\":{\"filter\":{\"terms\":{\"Data.source.keyword\":[\"mobileapp\"]}},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.dateOfComplaint\"}}}}}}}}}}" - } - ], - "chartType": "line", - "valueType": "number", - "action": "", - "drillChart": "none", - "documentType": "_doc", - "aggregationPaths": [ - "Ivr", - "Web", - "Whatsapp", - "Mobileapp" - ], - "isCumulative": false, - "interval": "month", - "insight": { - }, - "_comment": " " - }, - "totalComplaintsbyStatus": { - "chartName": "DSS_PGR_TOTAL_COMPLAINTS_BY_STATUS", - "queries": [ - { - "module": "PGR", - "dateRefField": "Data.dateOfComplaint", - "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\",\"tenantId\" : \"Data.tenantId\"}", - "indexName": "pgrindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Open\":{\"date_histogram\":{\"field\":\"Data.dateOfComplaint\",\"interval\":\"intervalvalue\"},\"aggs\":{\"open\":{\"filter\":{\"terms\":{\"Data.status.keyword\":[\"open\"]}},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.dateOfComplaint\"}}}}}},\"Closed\":{\"date_histogram\":{\"field\":\"Data.dateOfComplaint\",\"interval\":\"intervalvalue\"},\"aggs\":{\"closed\":{\"filter\":{\"terms\":{\"Data.status.keyword\":[\"closed\"]}},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.dateOfComplaint\"}}}}}}}}}}" - } - ], - "chartType": "line", - "valueType": "number", - "action": "", - "drillChart": "none", - "documentType": "_doc", - "aggregationPaths": [ - "Open", - "Closed" - ], - "isCumulative": false, - "interval": "month", - "insight": { - }, - "_comment": " " - }, - "complaintsByStatus": { - "chartName": "DSS_PGR_COMPLAINTS_BY_STATUS", - "queries": [ - { - "module": "PGR", - "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\",\"tenantId\" : \"Data.tenantId\"}", - "dateRefField": "Data.dateOfComplaint", - "indexName": "pgrindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Complaints By Status\":{\"terms\":{\"field\":\"Data.status.keyword\"},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.dateOfComplaint\"}}}}}}}}" - } - ], - "chartType": "pie", - "valueType": "number", - "action": "", - "documentType": "_doc", - "drillChart": "none", - "aggregationPaths": [ - "Complaints By Status" - ], - "insight": { - }, - "_comment": " Complaints By Their Statuses" - }, - "complaintsByChannel": { - "chartName": "DSS_PGR_COMPLAINTS_BY_CHANNELS", - "queries": [ - { - "module": "PGR", - "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\", \"tenantId\" : \"Data.tenantId\"}", - "dateRefField": "Data.dateOfComplaint", - "indexName": "pgrindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Complaints By Channels\":{\"terms\":{\"field\":\"Data.source.keyword\"},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.dateOfComplaint\"}}}}}}}}" - } - ], - "chartType": "pie", - "valueType": "number", - "action": "", - "documentType": "_doc", - "drillChart": "none", - "aggregationPaths": [ - "Complaints By Channels" - ], - "insight": { - }, - "_comment": " Top 3 Channels For Complaints" - }, - "complaintsByCategory": { - "chartName": "DSS_PGR_COMPLAINTS_BY_CATEGORY", - "queries": [ - { - "module": "PGR", - "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\",\"tenantId\" : \"Data.tenantId\"}", - "dateRefField": "Data.dateOfComplaint", - "indexName": "pgrindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Complaints By Category\":{\"terms\":{\"field\":\"Data.complainCategory.keyword\"},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.dateOfComplaint\"}}}}}}}}" - } - ], - "chartType": "pie", - "valueType": "number", - "action": "", - "documentType": "_doc", - "drillChart": "none", - "aggregationPaths": [ - "Complaints By Category" - ], - "insight": { - }, - "_comment": " Top 3 Channels For Complaints" - }, - "complaintsByTenant": { - "chartName": "DSS_PGR_COMPLAINTS_BY_TENANT", - "queries": [ - { - "module": "PGR", - "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\", \"tenantId\" : \"Data.tenantId\"}", - "dateRefField": "Data.dateOfComplaint", - "indexName": "pgrindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Complaints By Tenant\":{\"terms\":{\"field\":\"Data.tenantId.keyword\"},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.dateOfComplaint\"}}}}}}}}" - } - ], - "chartType": "pie", - "valueType": "number", - "action": "", - "documentType": "_doc", - "drillChart": "none", - "aggregationPaths": [ - "Complaints By Tenant" - ], - "insight": { - }, - "_comment": " Complaints by Tenant" - }, - "complaintsByDistrict": { - "chartName": "DSS_PGR_COMPLAINTS_BY_DISTRICT", - "queries": [ - { - "module": "PGR", - "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\", \"tenantId\" : \"Data.tenantId\"}", - "dateRefField": "Data.dateOfComplaint", - "indexName": "pgrindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Complaints By District\":{\"terms\":{\"field\":\"Data.tenantData.city.districtName.keyword\"},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.dateOfComplaint\"}}}}}}}}" - } - ], - "chartType": "pie", - "valueType": "number", - "action": "", - "documentType": "_doc", - "drillChart": "none", - "aggregationPaths": [ - "Complaints By District" - ], - "insight": { - }, - "_comment": " Complaints by District" - }, - "complaintsByDepartment": { - "chartName": "DSS_PGR_COMPLAINTS_BY_DEPARTMENT", - "queries": [ - { - "module": "PGR", - "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\", \"tenantId\" : \"Data.tenantId\"}", - "dateRefField": "Data.dateOfComplaint", - "indexName": "pgrindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Complaints By Department\":{\"terms\":{\"field\":\"Data.department.keyword\"},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.dateOfComplaint\"}}}}}}}}" - } - ], - "chartType": "pie", - "valueType": "number", - "action": "", - "documentType": "_doc", - "drillChart": "none", - "aggregationPaths": [ - "Complaints By Department" - ], - "insight": { - }, - "_comment": " Complaints by Department" - }, - "pgrStatusByDDR": { - "chartName": "DSS_PGR_STATUS_BY_DDR", - "queries": [ - { - "module": "PGR", - "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\",\"tenantId\" : \"Data.tenantId.keyword\" , \"departmentId\" : \"Data.department.keyword\"}", - "dateRefField": "Data.dateOfComplaint", - "indexName": "pgrindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Closed Complaints\":{\"filters\":{\"filters\":{\"Open\":{\"match\":{\"Data.status.keyword\":\"open\"}},\"Reopen\":{\"match\":{\"Data.status.keyword\":\"reopen\"}},\"Assigned\":{\"match\":{\"Data.status.keyword\":\"assigned\"}},\"Closed\":{\"match\":{\"Data.status.keyword\":\"closed\"}},\"Resolved\":{\"match\":{\"Data.status.keyword\":\"resolved\"}},\"Rejected\":{\"match\":{\"Data.status.keyword\":\"rejected\"}},\"ReassignRequested\":{\"match\":{\"Data.status.keyword\":\"reassignrequested\"}}}}}}}}}" - } - ], - "isMdmsEnabled": true, - "filterKeys": [ - {"key": "tenantId", "column": "DDRs"} - ], - "chartType": "table", - "valueType": "number", - "drillChart": "pgrStatusByTenant", - "drillFields": [ - "" - ], - "documentType": "_doc", - "action": "", - "plotLabel": "DDRs", - "aggregationPaths": [ - "Open", - "Reopen", - "Assigned", - "Closed", - "Resolved", - "Rejected", - "ReassignRequested" - ], - "pathDataTypeMapping": [ - { - "Open": "number" - }, - { - "Reopen": "number" - }, - { - "Assigned": "number" - }, - { - "Closed": "number" - }, - { - "Resolved": "number" - }, - { - "Rejected": "number" - }, - { - "ReassignRequested": "number" - } - ], - "insight": { - }, - "_comment": "" - }, - "pgrStatusByTenant": { - "chartName": "DSS_PGR_STATUS_BY_TENANT", - "queries": [ - { - "module": "PGR", - "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\", \"tenantId\" : \"Data.tenantId.keyword\" , \"departmentId\" : \"Data.department.keyword\"}", - "dateRefField": "Data.dateOfComplaint", - "indexName": "pgrindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"ULBs \":{\"terms\":{\"field\":\"Data.tenantId.keyword\",\"size\":1000},\"aggs\":{\"Closed Complaints\":{\"filters\":{\"filters\":{\"Open\":{\"match\":{\"Data.status.keyword\":\"open\"}},\"Reopen\":{\"match\":{\"Data.status.keyword\":\"reopen\"}},\"Assigned\":{\"match\":{\"Data.status.keyword\":\"assigned\"}},\"Closed\":{\"match\":{\"Data.status.keyword\":\"closed\"}},\"Resolved\":{\"match\":{\"Data.status.keyword\":\"resolved\"}},\"Rejected\":{\"match\":{\"Data.status.keyword\":\"rejected\"}},\"ReassignRequested\":{\"match\":{\"Data.status.keyword\":\"reassignrequested\"}}}}}}}}}}}" - } - ], - "filterKeys": [ - {"key": "tenantId", "column": "Boundary"} - ], - "chartType": "table", - "valueType": "number", - "drillChart": "pgrStatusWardDrillDown", - "drillFields": [ - "" - ], - "documentType": "_doc", - "action": "", - "plotLabel": "Boundary", - "aggregationPaths": [ - "Open", - "Reopen", - "Assigned", - "Closed", - "Resolved", - "Rejected", - "ReassignRequested" - ], - "pathDataTypeMapping": [ - { - "Open": "number" - }, - { - "Reopen": "number" - }, - { - "Assigned": "number" - }, - { - "Closed": "number" - }, - { - "Resolved": "number" - }, - { - "Rejected": "number" - }, - { - "ReassignRequested": "number" - } - ], - "insight": { - }, - "_comment": "" - }, - "pgrStatusWardDrillDown": { - "chartName": "", - "queries": [ - { - "module": "PGR", - "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\", \"tenantId\" : \"Data.tenantId.keyword\" , \"departmentId\" : \"Data.department.keyword\"}", - "dateRefField": "Data.dateOfComplaint", - "indexName": "pgrindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Ward \":{\"terms\":{\"field\":\"Data.complaintWard.name.keyword\",\"size\":1000},\"aggs\":{\"Closed Complaints\":{\"filters\":{\"filters\":{\"Open\":{\"match\":{\"Data.status.keyword\":\"open\"}},\"Reopen\":{\"match\":{\"Data.status.keyword\":\"reopen\"}},\"Assigned\":{\"match\":{\"Data.status.keyword\":\"assigned\"}},\"Closed\":{\"match\":{\"Data.status.keyword\":\"closed\"}},\"Resolved\":{\"match\":{\"Data.status.keyword\":\"resolved\"}},\"Rejected\":{\"match\":{\"Data.status.keyword\":\"rejected\"}},\"ReassignRequested\":{\"match\":{\"Data.status.keyword\":\"reassignrequested\"}}}}}}}}}}}" - } - ], - "filterKeys": [ - ], - "chartType": "table", - "valueType": "number", - "drillChart": "", - "drillFields": [ - "" - ], - "documentType": "_doc", - "action": "", - "plotLabel": "Complaint Ward", - "aggregationPaths": [ - "Open", - "Reopen", - "Assigned", - "Closed", - "Resolved", - "Rejected", - "ReassignRequested" - ], - "pathDataTypeMapping": [ - { - "Open": "number" - }, - { - "Reopen": "number" - }, - { - "Assigned": "number" - }, - { - "Closed": "number" - }, - { - "Resolved": "number" - }, - { - "Rejected": "number" - }, - { - "ReassignRequested": "number" - } - ], - "insight": { - }, - "_comment": "" - }, - "pgrStatusByDepartment": { - "chartName": "DSS_PGR_STATUS_BY_DEPARTMENT", - "queries": [ - { - "module": "PGR", - "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\", \"tenantId\" : \"Data.tenantId.keyword\" }", - "dateRefField": "Data.dateOfComplaint", - "indexName": "pgrindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Department \":{\"terms\":{\"field\":\"Data.department.keyword\",\"size\":1000},\"aggs\":{\"Closed Complaints\":{\"filters\":{\"filters\":{\"Open\":{\"match\":{\"Data.status.keyword\":\"open\"}},\"Reopen\":{\"match\":{\"Data.status.keyword\":\"reopen\"}},\"Assigned\":{\"match\":{\"Data.status.keyword\":\"assigned\"}},\"Closed\":{\"match\":{\"Data.status.keyword\":\"closed\"}},\"Resolved\":{\"match\":{\"Data.status.keyword\":\"resolved\"}},\"Rejected\":{\"match\":{\"Data.status.keyword\":\"rejected\"}},\"ReassignRequested\":{\"match\":{\"Data.status.keyword\":\"reassignrequested\"}}}}}}}}}}}" - } - ], - "filterKeys": [ - {"key": "departmentId", "column": "Department"} - ], - "chartType": "table", - "valueType": "number", - "drillChart": "pgrStatusCategoryDrillDown", - "documentType": "_doc", - "action": "", - "plotLabel": "Department", - "aggregationPaths": [ - "Open", - "Reopen", - "Assigned", - "Closed", - "Resolved", - "Rejected", - "ReassignRequested" - ], - "pathDataTypeMapping": [ - { - "Open": "number" - }, - { - "Reopen": "number" - }, - { - "Assigned": "number" - }, - { - "Closed": "number" - }, - { - "Resolved": "number" - }, - { - "Rejected": "number" - }, - { - "ReassignRequested": "number" - } - ], - "insight": { - }, - "_comment": "" - }, - "pgrStatusCategoryDrillDown": { - "chartName": "", - "queries": [ - { - "module": "PGR", - "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\", \"tenantId\" : \"Data.tenantId.keyword\" , \"departmentId\" : \"Data.department.keyword\"}", - "dateRefField": "Data.dateOfComplaint", - "indexName": "pgrindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Category \":{\"terms\":{\"field\":\"Data.complainCategory.keyword\",\"size\":1000},\"aggs\":{\"Closed Complaints\":{\"filters\":{\"filters\":{\"Open\":{\"match\":{\"Data.status.keyword\":\"open\"}},\"Reopen\":{\"match\":{\"Data.status.keyword\":\"reopen\"}},\"Assigned\":{\"match\":{\"Data.status.keyword\":\"assigned\"}},\"Closed\":{\"match\":{\"Data.status.keyword\":\"closed\"}},\"Resolved\":{\"match\":{\"Data.status.keyword\":\"resolved\"}},\"Rejected\":{\"match\":{\"Data.status.keyword\":\"rejected\"}},\"ReassignRequested\":{\"match\":{\"Data.status.keyword\":\"reassignrequested\"}}}}}}}}}}}" - } - ], - "filterKeys": [ - ], - "chartType": "table", - "valueType": "number", - "drillChart": "", - "drillFields": [ - "" - ], - "documentType": "_doc", - "action": "", - "plotLabel": "Complaint Category", - "aggregationPaths": [ - "Open", - "Reopen", - "Assigned", - "Closed", - "Resolved", - "Rejected", - "ReassignRequested" - ], - "pathDataTypeMapping": [ - { - "Open": "number" - }, - { - "Reopen": "number" - }, - { - "Assigned": "number" - }, - { - "Closed": "number" - }, - { - "Resolved": "number" - }, - { - "Rejected": "number" - }, - { - "ReassignRequested": "number" - } - ], - "insight": { - }, - "_comment": "" - }, - "topFiveComplaints": { - "chartName": "DSS_PGR_TOP_COMPLAINTS", - "queries": [ - { - "module": "PGR", - "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\", \"tenantId\" : \"Data.tenantId\"}", - "dateRefField": "Data.dateOfComplaint", - "indexName": "pgrindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Complain Category\":{\"terms\":{\"field\":\"Data.complainCategory.keyword\",\"size\":6,\"order\":{\"Count\":\"desc\"}},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.complainCategory.keyword\"}}}}}}}}" - } - ], - "chartType": "pie", - "valueType": "number", - "action": "", - "documentType": "_doc", - "drillChart": "none", - "aggregationPaths": [ - "Complain Category" - ], - "insight": { - }, - "_comment": " Complaints By Their Statuses" - }, - "averageTurnAroundTime": { - "chartName": "DSS_AVERAGE_TURN_AROUND_TIME", - "queries": [ - { - "module": "PGR", - "dateRefField": "Data.@timestamp", - "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\", \"tenantId\" : \"Data.tenantId\"}", - "indexName": "pgrindex-v1", - "aggrQuery": "{\"aggs\":{\"Complaints Average Turn Around Time (in Days)\":{\"date_histogram\":{\"field\":\"Data.@timestamp\",\"interval\":\"intervalvalue\"},\"aggs\":{\"each_open\":{\"terms\":{\"field\":\"_id\",\"min_doc_count\":0, \"size\":200},\"aggs\":{\"Open_Complaints\":{\"nested\":{\"path\":\"Data.actionHistory.actions\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"Data.actionHistory.actions.status.keyword\":[\"open\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"Data.actionHistory.actions.when\"}}}}}},\"Closed_Complaints\":{\"nested\":{\"path\":\"Data.actionHistory.actions\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"Data.actionHistory.actions.status.keyword\":[\"closed\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"Data.actionHistory.actions.when\"}}}}}},\"computedValueATA\":{\"bucket_script\":{\"buckets_path\":{\"max\":\"Closed_Complaints>aggrFilter>amount\",\"min\":\"Open_Complaints>aggrFilter>amount\"},\"script\":{\"source\":\"params.max-params.min\"}}}}}}}}}", - "aggrQuerybc": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Complaints Average Turn Around Time (in Days)\":{\"date_histogram\":{\"field\":\"Data.@timestamp\",\"interval\":\"intervalvalue\"},\"aggs\":{\"each_open\":{\"terms\":{\"field\":\"_id\",\"min_doc_count\":0},\"aggs\":{\"Open_Complaints\":{\"min\":{\"field\":\"Data.actionHistory.actions.when\"}},\"Closed_Complaints\":{\"max\":{\"field\":\"Data.actionHistory.actions.when\"}},\"computedValueATA\":{\"bucket_script\":{\"buckets_path\":{\"max\":\"Closed_Complaints\",\"min\":\"Open_Complaints\"},\"script\":{\"source\":\"if(params.max == null && params.min == null) {0} else {params.max-params.min}\"}}}}}}}}}}}" - } - ], - "chartType": "line", - "valueType": "days", - "action": "", - "drillChart": "none", - "documentType": "_doc", - "aggregationPaths": [ - "Complaints Average Turn Around Time (in Days)" - ], - "computedFields": [ - { - "postAggregationTheory" : "", - "actionName": "AverageComputedField", - "fields" : ["computedValueATA"], - "newField" : "ATA", - "_comments": "fields are field names picked from its aggregation query to use post aggregation newField value with given new field name " - } - ], - "isCumulative": false, - "interval": "month", - "insight": { - }, - "_comment": " " - }, -"pgrCitizenOnDateRange": { - "chartName": "DSS_PGR_CITIZEN", - "queries": [ - { - "module": "PGR", - "dateRefField": "Data.@timestamp", - "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\", \"tenantId\" : \"Data.tenantId\"}", - "indexName": "pgrindex-v1", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Citizens\":{\"date_histogram\":{\"field\":\"Data.@timestamp\",\"interval\":\"intervalvalue\"},\"aggs\":{\"count\":{\"cardinality\":{\"field\":\"Data.citizen.uuid.keyword\"}}}}}}}}" - } - ], - "chartType": "line", - "valueType": "number", - "action": "", - "drillChart": "none", - "documentType": "_doc", - "aggregationPaths": [ - "Citizens" - ], - "isCumulative": false, - "interval": "month", - "insight": { - }, - "_comment": " " - }, - "wstodaysCollection": { - "chartName": "DSS_W&S_TODAYS_COLLECTION", - "queries": [ - { - "module": "W&S", - "indexName": "receipts-consumers", - "aggrQuery": "{\"aggs\": {\"AGGR\": {\"filter\": {\"bool\": {\"must_not\": [{\"term\": {\"status\": \"Cancelled\"}}]}},\"aggs\": {\"Total Collection\": {\"sum\": {\"field\": \"totalamount\"}}}}}}", - "requestQueryMap": "{\"tenantId\" : \"cityname.keyword\", \"wardId\" : \"block.keyword\"}", - "dateRefField": "receiptdate" - } - ], - "chartType": "metric", - "valueType": "amount", - "action": "", - "drillChart": "none", - "aggregationPaths": [ - "Total Collection" - ], - "insight": { - }, - "_comment": "W&S todays collections " - }, - "wstotalCollection": { - "chartName": "DSS_W&S_TOTAL_COLLECTION", - "queries": [ - { - "module": "W&S", - "indexName": "receipts-consumers", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"status\":\"Cancelled\"}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"totalamount\"}}}}}}", - "requestQueryMap": "{\"tenantId\" : \"cityname.keyword\", \"wardId\" : \"block.keyword\"}", - "dateRefField": "receiptdate" - } - ], - "translateTenantCode": true, - "chartType": "metric", - "valueType": "amount", - "action": "", - "drillChart": "none", - "aggregationPaths": [ - "Total Collection" - ], - "insight": { - }, - "_comment": "W&S total collections " - }, - "wstargetCollection": { - "chartName": "DSS_W&S_TARGET_COLLECTION", - "queries": [ - { - "module": "COMMON", - "requestQueryMap": "{\"module\" : \"businessService.keyword\", \"tenantId\" : \"tenantIdForMunicipalCorporation.keyword\"}", - "dateRefField": "startdate", - "indexName": "dss-target_v1", - "aggrQuery": "{\"aggs\":{\"Target Collection\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}" - } - ], - "chartType": "metric", - "valueType": "amount", - "action": "", - "drillChart": "none", - "documentType": "_doc", - "aggregationPaths": [ - "Target Collection" - ], - "isDayUnit": true, - "postAggregationTheory" : "repsonseToDifferenceOfDates", - "insight": { - }, - "_comment": " " - }, - "wstargetAchieved": { - "chartName": "DSS_W&S_TARGET_ACHIEVED", - "queries": [ - { - "module": "COMMON", - "requestQueryMap": "{\r\n \"module\" : \"businessService.keyword\", \n\"tenantId\" : \"ulbName.keyword\"}", - "dateRefField": "", - "indexName": "dss-target_v1", - "aggrQuery": "{\"aggs\":{\"Actual collection\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}" - }, - { - "module": "W&S", - "requestQueryMap": "{\"tenantId\" : \"cityname.keyword\", \"wardId\" : \"block.keyword\"}", - "dateRefField": "receiptdate", - "indexName": "receipts-consumers", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"status\":\"Cancelled\"}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"totalamount\"}}}}}}" - } - - ], - "translateTenantCode": true, - "chartType": "metric", - "valueType": "percentage", - "drillChart": "none", - "documentType": "_doc", - "action": "percentage", - "aggregationPaths": [ - "Total Collection", - "Actual collection" - ], - "insight": { - "chartResponseMap" : "wstargetAchieved", - "action" : "differenceOfNumbers", - "upwardIndicator" : "positive", - "downwardIndicator" : "negative", - "textMessage" : "$indicator$value% than last $insightInterval", - "colorCode" : "#228B22", - "insightInterval" : "year" - }, - "_comment": " " - }, - "wscumulativeCollections": { - "chartName": "DSS_W&S_TOTAL_CUMULATIVE_COLLECTION", - "queries": [ - { - "module": "W&S", - "dateRefField": "receiptdate", - "requestQueryMap": "{\"tenantId\" : \"cityname.keyword\", \"wardId\" : \"block.keyword\"}", - "indexName": "receipts-consumers", - "aggrQuery": "{\"aggs\":{\"Water Sewerage\":{\"date_histogram\":{\"field\":\"receiptdate\",\"interval\":\"intervalvalue\"},\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"status\":[\"Cancelled\"]}}]}},\"aggs\":{\"approved\":{\"sum\":{\"field\":\"totalamount\"}}}}}}}}" - } - ], - "translateTenantCode": true, - "chartType": "line", - "valueType": "amount", - "action": "", - "drillChart": "none", - "documentType": "_doc", - "aggregationPaths": [ - "Water Sewerage" - ], - "isCumulative": true, - "interval": "month", - "insight": { - }, - "_comment": " " - }, - - "wstopPerformingUlbs": { - "chartName": "DSS_W&S_TOP_3_PERFORMING_ULBS", - "queries": [ - { - "module": "COMMON", - "requestQueryMap": "{\r\n \"module\" : \"businessService.keyword\", \n\"tenantId\" : \"ulbName.keyword\"}", - "dateRefField": "", - "indexName": "dss-target_v1", - "aggrQuery": "{\"aggs\":{\"Target Collection\":{\"terms\":{\"field\":\"ulbName.keyword\",\"size\":\"200\",\"order\":{\"Sum\":\"desc\"}},\"aggs\":{\"Sum\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}}}" - }, - { - "module": "W&S", - "requestQueryMap": "{\"tenantId\" : \"cityname.keyword\", \"wardId\" : \"block.keyword\"}", - "dateRefField": "receiptdate", - "indexName": "receipts-consumers", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"status\":\"Cancelled\"}}]}},\"aggs\":{\"Total Collection\":{\"terms\":{\"field\":\"cityname.keyword\",\"size\":\"200\",\"order\":{\"Sum\":\"desc\"}},\"aggs\":{\"Sum\":{\"sum\":{\"field\":\"totalamount\"}}}}}}}}" - } - ], - "translateTenantCode": true, - "chartType": "perform", - "valueType": "percentage", - "drillChart": "none", - "documentType": "_doc", - "action": "percentage", - "plotLabel": "DSS_TARGET_ACHIEVED", - "order": "desc", - "limit": 3, - "aggregationPaths": [ - "Total Collection","Target Collection" - ], - "insight": { - }, - "_comment": " Top Performing Ulbs for target achieved" - }, - "wsbottomPerformingUlbs": { - "chartName": "DSS_W&S_BOTTOM_3_PERFORMING_ULBS", - "queries": [ - { - "module": "COMMON", - "requestQueryMap": "{\"module\" : \"businessService.keyword\",\"tenantId\" : \"ulbName.keyword\" }", - "dateRefField": "", - "indexName": "dss-target_v1", - "aggrQuery": "{\"aggs\":{\"Target Collection\":{\"terms\":{\"field\":\"ulbName.keyword\",\"size\":\"200\",\"order\":{\"Sum\":\"asc\"}},\"aggs\":{\"Sum\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}}}" - }, - { - "module": "W&S", - "requestQueryMap": "{\"tenantId\" : \"cityname.keyword\", \"wardId\" : \"block.keyword\"}", - "dateRefField": "receiptdate", - "indexName": "receipts-consumers", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"status\":\"Cancelled\"}}]}},\"aggs\":{\"Total Collection\":{\"terms\":{\"field\":\"cityname.keyword\",\"size\":\"200\",\"order\":{\"Sum\":\"asc\"}},\"aggs\":{\"Sum\":{\"sum\":{\"field\":\"totalamount\"}}}}}}}}" - } - ], - "translateTenantCode": true, - "chartType": "perform", - "valueType": "percentage", - "drillChart": "none", - "documentType": "_doc", - "action": "percentage", - "plotLabel": "DSS_TARGET_ACHIEVED", - "order": "asc", - "limit": 3, - "aggregationPaths": [ - "Total Collection", "Target Collection" - ], - "insight": { - }, - "_comment": " Bottom Performing Ulbs for target achieved" - }, - "wscollectionByUsage": { - "chartName": "DSS_W&S_COLLECTION_BY_USAGE", - "queries": [ - { - "module": "W&S", - "dateRefField": "receiptdate", - "requestQueryMap": "{\"tenantId\" : \"cityname.keyword\", \"wardId\" : \"block.keyword\"}", - "indexName": "receipts-consumers", - "aggrQuery": "{\"aggs\":{\"Usage Type\":{\"terms\":{\"field\":\"consumertype.keyword\"},\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"status\":\"Cancelled\"}}]}},\"aggs\":{\"approved\":{\"sum\":{\"field\":\"totalamount\"}}}}}}}}" - } - ], - "translateTenantCode": true, - "chartType": "pie", - "valueType": "amount", - "action": "", - "documentType": "_doc", - "drillChart": "none", - "aggregationPaths": [ - "Usage Type" - ], - "insight": { - }, - "_comment": " " - }, - - "wscollectionByChannel": { - "chartName": "DSS_W&S_COLLECTION_BY_CHANNEL", - "queries": [ - { - "module": "W&S", - "dateRefField": "receiptdate", - "requestQueryMap": "{\"tenantId\" : \"cityname.keyword\", \"wardId\" : \"block.keyword\"}", - "indexName": "receipts-consumers", - "aggrQuery": "{\"aggs\":{\"Usage Type\":{\"terms\":{\"field\":\"channel.keyword\"},\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"status\":\"Cancelled\"}}]}},\"aggs\":{\"approved\":{\"sum\":{\"field\":\"totalamount\"}}}}}}}}" - } - ], - "translateTenantCode": true, - "chartType": "pie", - "valueType": "amount", - "action": "", - "documentType": "_doc", - "drillChart": "none", - "aggregationPaths": [ - "Usage Type" - ], - "insight": { - }, - "_comment": " " - }, - - "wsFinancialIndicatorDDR": { - "chartName": "DSS_W&S_DEMAND_COLLECTION_BOUNDARY", - "queries": [ - { - "module": "W&S", - "requestQueryMap": "{\"tenantId\" : \"cityname.keyword\", \"wardId\" : \"block.keyword\" }", - "dateRefField": "receiptdate", - "indexName": "receipts-consumers", - "aggrQuery": "{\"aggs\":{\"Total Collection\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"status\":\"Cancelled\"}}]}},\"aggs\":{\"collection\":{\"sum\":{\"field\":\"totalamount\"}}}},\"Total Receipt\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"status\":\"Cancelled\"}}]}},\"aggs\":{\"receipt\":{\"value_count\":{\"field\":\"receiptnumber.keyword\"}}}}}}" - }, - { - "module": "W&S", - "requestQueryMap": "{ \"tenantId\" : \"cityname.keyword\", \"wardId\" : \"block.keyword\"}", - "dateRefField": "billdate", - "indexName": "demandbillconsumers", - "aggrQuery": "{\"aggs\":{\"No of Bill\":{\"filter\":{\"term\":{\"billgenerated\":true}},\"aggs\":{\"approved\":{\"value_count\":{\"field\":\"installmentfrom.keyword\"}}}}}}" - }, - { - "module": "W&S", - "requestQueryMap": "{ \"tenantId\" : \"cityname.keyword\", \"wardId\" : \"block.keyword\"}", - "dateRefField": "@timestamp", - "indexName": "demandbillconsumers", - "aggrQuery": "{\"aggs\":{\"Project Demand\":{\"sum\":{\"field\":\"billamount\"}}}}" - } - ], - "isMdmsEnabled": true, - "translateTenantCode": true, - "filterKeys": [ - {"key": "tenantId", "column": "DDRs"} - ], - "chartType": "table", - "valueType": "number", - "drillChart": "wsFinancialIndicatorUlb", - "action": "", - "plotLabel": "DDRs", - "isPostResponseHandler": true, - "postAggregationTheory" : "", - "aggregationPaths": [ - "Total Collection", - "Total Receipt", - "No of Bill", - "Project Demand" - - ], - "pathDataTypeMapping": [ - { - "Total Collection": "amount" - }, - { - "Total Receipt": "number" - }, - { - "No of Bill": "number" - }, - { - "Project Demand": "amount" - } - ], - "insight": { - }, - "_comment": "" - }, - "wsFinancialIndicatorUlb": { - "chartName": "DSS_W&S_DEMAND_COLLECTION_BOUNDARY", - "queries": [ - { - "module": "W&S", - "requestQueryMap": "{\"tenantId\" : \"cityname.keyword\", \"wardId\" : \"block.keyword\" }", - "dateRefField": "receiptdate", - "indexName": "receipts-consumers", - "aggrQuery": "{\"aggs\":{\"ULB\":{\"terms\":{\"field\":\"cityname.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"status\":\"Cancelled\"}}]}},\"aggs\":{\"collection\":{\"sum\":{\"field\":\"totalamount\"}}}},\"Total Receipt\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"status\":\"Cancelled\"}}]}},\"aggs\":{\"receipt\":{\"value_count\":{\"field\":\"receiptnumber.keyword\"}}}}}}}}" - }, - { - "module": "W&S", - "requestQueryMap": "{ \"tenantId\" : \"cityname.keyword\", \"wardId\" : \"block.keyword\"}", - "dateRefField": "billdate", - "indexName": "demandbillconsumers", - "aggrQuery": "{\"aggs\":{\"ULB\":{\"terms\":{\"field\":\"cityname.keyword\",\"size\":200},\"aggs\":{\"No of Bill\":{\"filter\":{\"term\":{\"billgenerated\":true}},\"aggs\":{\"approved\":{\"value_count\":{\"field\":\"installmentfrom.keyword\"}}}}}}}}" - }, - { - "module": "W&S", - "requestQueryMap": "{ \"tenantId\" : \"cityname.keyword\", \"wardId\" : \"block.keyword\"}", - "dateRefField": "@timestamp", - "indexName": "projecteddemand-consumers", - "aggrQuery": "{\"aggs\":{\"ULB\":{\"terms\":{\"field\":\"cityname.keyword\",\"size\":200},\"aggs\":{\"Project Demand\":{\"sum\":{\"field\":\"projecteddemand\"}}}}}}" - } - ], - "isMdmsEnabled": false, - "translateTenantCode": true, - "filterKeys": [ - {"key": "tenantId", "column": "ULB"} - ], - "chartType": "table", - "valueType": "number", - "drillChart": "wsFinancialIndicatorWard", - "action": "", - "plotLabel": "ULB", - "isPostResponseHandler": true, - "postAggregationTheory" : "", - "aggregationPaths": [ - "Total Collection", - "Total Receipt", - "No of Bill", - "Project Demand" - - ], - "pathDataTypeMapping": [ - { - "Total Collection": "amount" - }, - { - "Total Receipt": "number" - }, - { - "No of Bill": "number" - }, - { - "Project Demand": "amount" - } - ], - "insight": { - }, - "_comment": "" - }, - "wsFinancialIndicatorWard": { - "chartName": "DSS_W&S_DEMAND_COLLECTION_BOUNDARY", - "queries": [ - { - "module": "W&S", - "requestQueryMap": "{ \"tenantId\" : \"cityname.keyword\", \"wardId\" : \"block.keyword\" }", - "dateRefField": "receiptdate", - "indexName": "receipts-consumers", - "aggrQuery": "{\"aggs\":{\"Ward\":{\"terms\":{\"field\":\"block\",\"size\":200},\"aggs\":{\"Total Collection\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"status\":\"Cancelled\"}}]}},\"aggs\":{\"collection\":{\"sum\":{\"field\":\"totalamount\"}}}},\"Total Receipt\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"status\":\"Cancelled\"}}]}},\"aggs\":{\"receipt\":{\"value_count\":{\"field\":\"receiptnumber.keyword\"}}}}}}}}" - }, - { - "module": "W&S", - "requestQueryMap": "{ \"tenantId\" : \"cityname.keyword\", \"wardId\" : \"block.keyword\" }", - "dateRefField": "billdate", - "indexName": "demandbillconsumers", - "aggrQuery": "{\"aggs\":{\"Ward\":{\"terms\":{\"field\":\"block.keyword\",\"size\":200},\"aggs\":{\"No of Bill\":{\"filter\":{\"term\":{\"billgenerated\":true}},\"aggs\":{\"approved\":{\"value_count\":{\"field\":\"installmentfrom.keyword\"}}}}}}}}" - }, - { - "module": "W&S", - "requestQueryMap": "{ \"tenantId\" : \"cityname.keyword\", \"wardId\" : \"block.keyword\" }", - "dateRefField": "@timestamp", - "indexName": "projecteddemand-consumers", - "aggrQuery": "{\"aggs\":{\"Ward\":{\"terms\":{\"field\":\"block.keyword\",\"size\":200},\"aggs\":{\"Project Demand\":{\"sum\":{\"field\":\"projecteddemand\"}}}}}}" - } - ], - "isMdmsEnabled": false, - "translateTenantCode": true, - "filterKeys": [ - - ], - "chartType": "table", - "valueType": "number", - "drillChart": "", - "action": "", - "plotLabel": "Ward", - "isPostResponseHandler": true, - "postAggregationTheory" : "", - "aggregationPaths": [ - "Total Collection", - "Total Receipt", - "No of Bill", - "Project Demand" - - ], - "pathDataTypeMapping": [ - { - "Total Collection": "amount" - }, - { - "Total Receipt": "number" - }, - { - "No of Bill": "number" - }, - { - "Project Demand": "amount" - } - ], - "insight": { - }, - "_comment": "" - }, - - "wsTaxHeadDDR": { - "chartName": "DSS_W&S_TAX_HEAD_BOUNDARY", - "queries": [ - { - "module": "W&S", - "requestQueryMap": "{\"tenantId\" : \"cityname.keyword\", \"wardId\" : \"block.keyword\" }", - "dateRefField": "receiptdate", - "indexName": "receipts-consumers", - "aggrQuery": "{\"aggs\":{\"Total Collection\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"status\":\"Cancelled\"}}]}},\"aggs\":{\"collection\":{\"sum\":{\"field\":\"totalamount\"}}}},\"Total Receipt\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"status\":\"Cancelled\"}}]}},\"aggs\":{\"receipt\":{\"value_count\":{\"field\":\"receiptnumber.keyword\"}}}}}}" - }, - { - "module": "W&S", - "requestQueryMap": "{\"tenantId\" : \"cityname.keyword\", \"wardId\" : \"block.keyword\" }", - "dateRefField": "billdate", - "indexName": "demandbillconsumers", - "aggrQuery": "{\"aggs\":{\"No of Bill\":{\"filter\":{\"term\":{\"billgenerated\":true}},\"aggs\":{\"approved\":{\"value_count\":{\"field\":\"installmentfrom.keyword\"}}}},\"Late charges\":{\"filter\":{\"term\":{\"billgenerated\":true}},\"aggs\":{\"penalty\":{\"sum\":{\"field\":\"penaltycollection\"}}}},\"Interest\":{\"filter\":{\"term\":{\"billgenerated\":true}},\"aggs\":{\"interest\":{\"sum\":{\"field\":\"interestcollection\"}}}},\"Advance\":{\"filter\":{\"term\":{\"billgenerated\":true}},\"aggs\":{\"advance\":{\"sum\":{\"field\":\"advancecollection\"}}}},\"Current Charges\":{\"filter\":{\"term\":{\"billgenerated\":true}},\"aggs\":{\"advance\":{\"sum\":{\"field\":\"currentcharges\"}}}},\"Arrear Charges\":{\"filter\":{\"term\":{\"billgenerated\":true}},\"aggs\":{\"advance\":{\"sum\":{\"field\":\"arrearcharges\"}}}}}}}" - } - ], - "translateTenantCode": true, - "isMdmsEnabled": true, - "filterKeys": [ - {"key": "tenantId", "column": "DDRs"} - ], - "chartType": "table", - "valueType": "number", - "drillChart": "wsTaxHeadUlb", - "action": "", - "plotLabel": "DDRs", - "postAggregationTheory" : "", - "aggregationPaths": [ - "Total Collection", - "Total Receipt", - "No of Bill", - "Late charges", - "Interest", - "Advance", - "Current Charges", - "Arrear Charges" - - ], - "pathDataTypeMapping": [ - { - "Total Collection": "amount" - }, - { - "Total Receipt": "number" - }, - { - "No of Bill": "number" - }, - { - "Late charges": "amount" - }, - { - "Interest": "amount" - }, - { - "Advance": "amount" - }, - { - "Current Charges": "amount" - }, - { - "Arrear Charges": "amount" - } - ], - "insight": { - }, - "_comment": "" - }, - "wsTaxHeadDDROverview": { - "chartName": "DSS_W&S_TAX_HEAD_BOUNDARY", - "queries": [ - { - "module": "W&S", - "requestQueryMap": "{\"tenantId\" : \"cityname.keyword\", \"wardId\" : \"block.keyword\" }", - "dateRefField": "receiptdate", - "indexName": "receipts-consumers", - "aggrQuery": "{\"aggs\":{\"Total Collection\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"status\":\"Cancelled\"}}]}},\"aggs\":{\"collection\":{\"sum\":{\"field\":\"totalamount\"}}}},\"Total Receipt\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"status\":\"Cancelled\"}}]}},\"aggs\":{\"receipt\":{\"value_count\":{\"field\":\"receiptnumber.keyword\"}}}}}}" - }, - { - "module": "W&S", - "requestQueryMap": "{\"tenantId\" : \"cityname.keyword\", \"wardId\" : \"block.keyword\" }", - "dateRefField": "", - "indexName": "dss-target_v1", - "aggrQuery": "{\"aggs\":{\"Target Collection\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}" - } - ], - "translateTenantCode": true, - "isMdmsEnabled": true, - "filterKeys": [ - {"key": "tenantId", "column": "DDRs"} - ], - "chartType": "table", - "valueType": "number", - "drillChart": "none", - "action": "", - "plotLabel": "DDRs", - "postAggregationTheory" : "", - "aggregationPaths": [ - "Total Collection", - "Total Receipt" - ], - "pathDataTypeMapping": [ - { - "Total Collection": "amount" - }, - { - "Total Receipt": "number" - } - ], - "insight": { - }, - "_comment": "" - }, - "wsTaxHeadUlb": { - "chartName": "DSS_W&S_TAX_HEAD_BOUNDARY", - "queries": [ - { - "module": "W&S", - "requestQueryMap": "{\"tenantId\" : \"cityname.keyword\", \"wardId\" : \"block.keyword\" }", - "dateRefField": "receiptdate", - "indexName": "receipts-consumers", - "aggrQuery": "{\"aggs\":{\"ULB\":{\"terms\":{\"field\":\"cityname.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"status\":\"Cancelled\"}}]}},\"aggs\":{\"collection\":{\"sum\":{\"field\":\"totalamount\"}}}},\"Total Reciept\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"status\":\"Cancelled\"}}]}},\"aggs\":{\"reciept\":{\"value_count\":{\"field\":\"receiptnumber.keyword\"}}}}}}}}" - }, - { - "module": "W&S", - "requestQueryMap": "{\"tenantId\" : \"cityname.keyword\", \"wardId\" : \"block.keyword\" }", - "dateRefField": "billdate", - "indexName": "demandbillconsumers", - "aggrQuery": "{\"aggs\":{\"ULB\":{\"terms\":{\"field\":\"cityname.keyword\",\"size\":200},\"aggs\":{\"No of Bill\":{\"filter\":{\"term\":{\"billgenerated\":true}},\"aggs\":{\"approved\":{\"value_count\":{\"field\":\"installmentfrom.keyword\"}}}},\"Late charges\":{\"filter\":{\"term\":{\"billgenerated\":true}},\"aggs\":{\"penalty\":{\"sum\":{\"field\":\"penaltycollection\"}}}},\"Interest\":{\"filter\":{\"term\":{\"billgenerated\":true}},\"aggs\":{\"interest\":{\"sum\":{\"field\":\"interestcollection\"}}}},\"Advance\":{\"filter\":{\"term\":{\"billgenerated\":true}},\"aggs\":{\"advance\":{\"sum\":{\"field\":\"advancecollection\"}}}},\"Current Charges\":{\"filter\":{\"term\":{\"billgenerated\":true}},\"aggs\":{\"advance\":{\"sum\":{\"field\":\"currentcharges\"}}}},\"Arrear Charges\":{\"filter\":{\"term\":{\"billgenerated\":true}},\"aggs\":{\"advance\":{\"sum\":{\"field\":\"arrearcharges\"}}}}}}}}" - } - ], - "translateTenantCode": true, - "isMdmsEnabled": false, - "filterKeys": [ - {"key": "tenantId", "column": "ULB"} - ], - "chartType": "table", - "valueType": "number", - "drillChart": "wsTaxHeadWard", - "action": "", - "plotLabel": "ULB", - "postAggregationTheory" : "", - "aggregationPaths": [ - "Total Collection", - "Total Receipt", - "No of Bill", - "Late charges", - "Interest", - "Advance", - "Current Charges", - "Arrear Charges" - - ], - "pathDataTypeMapping": [ - { - "Total Collection": "amount" - }, - { - "Total Receipt": "number" - }, - { - "No of Bill": "number" - }, - { - "Late charges": "amount" - }, - { - "Interest": "amount" - }, - { - "Advance": "amount" - }, - { - "Current Charges": "amount" - }, - { - "Arrear Charges": "amount" - } - ], - "insight": { - }, - "_comment": "" - }, - "wsTaxHeadWard": { - "chartName": "DSS_W&S_TAX_HEAD_BOUNDARY", - "queries": [ - { - "module": "W&S", - "requestQueryMap": "{\"tenantId\" : \"cityname.keyword\", \"wardId\" : \"block.keyword\" }", - "dateRefField": "receiptdate", - "indexName": "receipts-consumers", - "aggrQuery": "{\"aggs\":{\"Ward\":{\"terms\":{\"field\":\"block\",\"size\":200},\"aggs\":{\"Total Collection\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"status\":\"Cancelled\"}}]}},\"aggs\":{\"collection\":{\"sum\":{\"field\":\"totalamount\"}}}},\"Total Reciept\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"status\":\"Cancelled\"}}]}},\"aggs\":{\"reciept\":{\"value_count\":{\"field\":\"receiptnumber.keyword\"}}}}}}}}" - }, - { - "module": "W&S", - "requestQueryMap": "{\"tenantId\" : \"cityname.keyword\", \"wardId\" : \"block.keyword\" }", - "dateRefField": "billdate", - "indexName": "demandbillconsumers", - "aggrQuery": "{\"aggs\":{\"Ward\":{\"terms\":{\"field\":\"block.keyword\",\"size\":200},\"aggs\":{\"No of Bill\":{\"filter\":{\"term\":{\"billgenerated\":true}},\"aggs\":{\"approved\":{\"value_count\":{\"field\":\"installmentfrom.keyword\"}}}},\"Late charges\":{\"filter\":{\"term\":{\"billgenerated\":true}},\"aggs\":{\"penalty\":{\"sum\":{\"field\":\"penaltycollection\"}}}},\"Interest\":{\"filter\":{\"term\":{\"billgenerated\":true}},\"aggs\":{\"interest\":{\"sum\":{\"field\":\"interestcollection\"}}}},\"Advance\":{\"filter\":{\"term\":{\"billgenerated\":true}},\"aggs\":{\"advance\":{\"sum\":{\"field\":\"advancecollection\"}}}},\"Current Charges\":{\"filter\":{\"term\":{\"billgenerated\":true}},\"aggs\":{\"advance\":{\"sum\":{\"field\":\"currentcharges\"}}}},\"Arrear Charges\":{\"filter\":{\"term\":{\"billgenerated\":true}},\"aggs\":{\"advance\":{\"sum\":{\"field\":\"arrearcharges\"}}}}}}}}" - } - ], - "isMdmsEnabled": false, - "translateTenantCode": true, - "filterKeys": [ - ], - "chartType": "table", - "valueType": "number", - "drillChart": "", - "action": "", - "plotLabel": "Ward", - "postAggregationTheory" : "", - "aggregationPaths": [ - "Total Collection", - "Total Receipt", - "No of Bill", - "Late charges", - "Interest", - "Advance", - "Current Charges", - "Arrear Charges" - - ], - "pathDataTypeMapping": [ - { - "Total Collection": "amount" - }, - { - "Total Receipt": "number" - }, - { - "No of Bill": "number" - }, - { - "Late charges": "amount" - }, - { - "Interest": "amount" - }, - { - "Advance": "amount" - }, - { - "Current Charges": "amount" - }, - { - "Arrear Charges": "amount" - } - ], - "insight": { - }, - "_comment": "" - }, - - - "wstotalConnection": { - "chartName": "DSS_W&S_CONNECTIONS", - "queries": [ - { - "module": "W&S", - "indexName": "wsapplications", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"applicationstatus.keyword\":\"Cancelled\"}}],\"must\":[{\"terms\":{\"servicetype.keyword\":[\"Water Charges\",\"Sewerage Charges\"]}},{\"terms\":{\"connectionstatus.keyword\":[\"ACTIVE\"]}}]}},\"aggs\":{\"Total Connection\":{\"value_count\":{\"field\":\"id.keyword\"}}}}}}", - "requestQueryMap": "{\"tenantId\" : \"cityname.keyword\", \"wardId\" : \"block.keyword\"}", - "dateRefField": "createddate" - } - ], - "translateTenantCode": true, - "chartType": "metric", - "valueType": "number", - "action": "", - "drillChart": "none", - "aggregationPaths": [ - "Total Connection" - ], - "insight": { - }, - "_comment": " " - }, - "wsActiveUlbs": { - "chartName": "DSS_W&S_ACTIVE_ULBS", - "queries": [ - { - "module": "W&S", - "indexName": "receipts-consumers", - "aggrQuery": "{\"aggs\":{\"Active Ulbs\":{\"cardinality\":{\"field\":\"cityname.keyword\"}}}}", - "requestQueryMap": "{\"tenantId\" : \"cityname.keyword\", \"wardId\" : \"block.keyword\"}", - "dateRefField": "receiptdate" - } - ], - "translateTenantCode": true, - "chartType": "metric", - "valueType": "number", - "action": "", - "drillChart": "none", - "aggregationPaths": [ - "Active Ulbs" - ], - "insight": { - }, - "_comment": " " - }, - "wsNewWaterConnection": { - "chartName": "DSS_W&S_WATER_CONNECTIONS", - "queries": [ - { - "module": "W&S", - "indexName": "wsapplications", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"applicationstatus.keyword\":\"Cancelled\"}}],\"must\":[{\"terms\":{\"servicetype.keyword\":[\"Water Charges\"]}},{\"terms\":{\"connectionstatus.keyword\":[\"ACTIVE\"]}}]}},\"aggs\":{\"Water Connections\":{\"value_count\":{\"field\":\"id.keyword\"}}}}}}", - "requestQueryMap": "{\"tenantId\" : \"cityname.keyword\", \"wardId\" : \"block.keyword\"}", - "dateRefField": "createddate" - } - ], - "translateTenantCode": true, - "chartType": "metric", - "valueType": "number", - "action": "", - "drillChart": "none", - "aggregationPaths": [ - "Water Connections" - ], - "insight": { - }, - "_comment": " " - }, - "wsNewSewerageConnection": { - "chartName": "DSS_W&S_SEWERAGE_CONNECTIONS", - "queries": [ - { - "module": "W&S", - "indexName": "wsapplications", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"applicationstatus.keyword\":\"Cancelled\"}}],\"must\":[{\"terms\":{\"servicetype.keyword\":[\"Sewerage Charges\"]}},{\"terms\":{\"connectionstatus.keyword\":[\"ACTIVE\"]}}]}},\"aggs\":{\"Sewerage Connections\":{\"value_count\":{\"field\":\"id.keyword\"}}}}}}", - "requestQueryMap": "{\"tenantId\" : \"cityname.keyword\", \"wardId\" : \"block.keyword\"}", - "dateRefField": "createddate" - } - ], - "translateTenantCode": true, - "chartType": "metric", - "valueType": "number", - "action": "", - "drillChart": "none", - "aggregationPaths": [ - "Sewerage Connections" - ], - "insight": { - }, - "_comment": " " - }, - - "wscumulativeConnections": { - "chartName": "DSS_W&S_CUMULATIVE_COLLECTION", - "queries": [ - { - "module": "W&S", - "dateRefField": "createddate", - "requestQueryMap": "{\"tenantId\" : \"cityname.keyword\", \"wardId\" : \"block.keyword\"}", - "indexName": "wsapplications", - "aggrQuery": "{\"aggs\":{\"Water Connections\":{\"date_histogram\":{\"field\":\"@timestamp\",\"interval\":\"intervalvalue\"},\"aggs\":{\"Water\":{\"filter\":{\"bool\":{\"must\":[{\"terms\":{\"servicetype.keyword\":[\"Water Charges\"]}}],\"must_not\":[{\"terms\":{\"applicationstatus.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"id.keyword\"}}}}}},\"Sewerage Connections\":{\"date_histogram\":{\"field\":\"@timestamp\",\"interval\":\"intervalvalue\"},\"aggs\":{\"Water\":{\"filter\":{\"bool\":{\"must\":[{\"terms\":{\"servicetype.keyword\":[\"Sewerage Charges\"]}}],\"must_not\":[{\"terms\":{\"applicationstatus.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"id.keyword\"}}}}}}}}" - } - ], - "translateTenantCode": true, - "chartType": "line", - "valueType": "number", - "action": "", - "drillChart": "none", - "documentType": "_doc", - "aggregationPaths": [ - "Water Connections", - "Sewerage Connections" - - ], - "isCumulative": true, - "interval": "month", - "insight": { - }, - "_comment": " " - }, - - "wsWaterConsumersByUsageType": { - "chartName": "DSS_W&S_WATER_CONNECTION_BY_USAGE", - "queries": [ - { - "module": "W&S", - "indexName": "wsapplications", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"applicationstatus.keyword\":\"Cancelled\"}}],\"must\":[{\"terms\":{\"servicetype.keyword\":[\"Water Charges\"]}},{\"terms\":{\"connectionstatus.keyword\":[\"ACTIVE\"]}}]}},\"aggs\":{\"Water Consumers by Usage Type\":{\"terms\":{\"field\":\"usage.keyword\"}}}}}}", - "requestQueryMap": "{\"tenantId\" : \"cityname.keyword\", \"wardId\" : \"block.keyword\"}", - "dateRefField": "createddate" - } - ], - "translateTenantCode": true, - "chartType": "pie", - "valueType": "number", - "action": "", - "documentType": "_doc", - "drillChart": "none", - "aggregationPaths": [ - "Water Consumers by Usage Type" - ], - "insight": { - }, - "_comment": " " - }, - - "wsSewerageConsumersByUsageType": { - "chartName": "DSS_W&S_SEWERAGE_CONNECTION_BY_USAGE", - "queries": [ - { - "module": "W&S", - "indexName": "wsapplications", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"applicationstatus.keyword\":\"Cancelled\"}}],\"must\":[{\"terms\":{\"servicetype.keyword\":[\"Sewerage Charges\"]}},{\"terms\":{\"connectionstatus.keyword\":[\"ACTIVE\"]}}]}},\"aggs\":{\"Sewerage Consumers by Usage Type\":{\"terms\":{\"field\":\"usage.keyword\"}}}}}}", - "requestQueryMap": "{\"tenantId\" : \"cityname.keyword\", \"wardId\" : \"block.keyword\"}", - "dateRefField": "createddate" - } - ], - "translateTenantCode": true, - "chartType": "pie", - "valueType": "number", - "action": "", - "documentType": "_doc", - "drillChart": "none", - "aggregationPaths": [ - "Sewerage Consumers by Usage Type" - ], - "insight": { - }, - "_comment": " " - }, - - "wsConsumersByChannel": { - "chartName": "DSS_W&S_CONNECTION_BY_CHANNEL", - "queries": [ - { - "module": "W&S", - "dateRefField": "createddate", - "requestQueryMap": "{\"tenantId\" : \"cityname.keyword\", \"wardId\" : \"block.keyword\"}", - "indexName": "wsapplications", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"applicationstatus.keyword\":\"Cancelled\"}}],\"must\":[{\"terms\":{\"servicetype.keyword\":[\"Water Charges\",\"Sewerage Charges\"]}},{\"terms\":{\"connectionstatus.keyword\":[\"ACTIVE\"]}}]}},\"aggs\":{\"W & S Consumers by Channel\":{\"terms\":{\"field\":\"channel.keyword\"}}}}}}" - } - ], - "translateTenantCode": true, - "chartType": "pie", - "valueType": "number", - "action": "", - "documentType": "_doc", - "drillChart": "none", - "aggregationPaths": [ - "W & S Consumers by Channel" - ], - "insight": { - }, - "_comment": " " - }, - - "wsConnectionAgeingDDR": { - "chartName": "DSS_W&S_CONNECTION_AGEING", - "queries": [ - { - "module": "W&S", - "requestQueryMap": "{\"tenantId\" : \"cityname.keyword\", \"wardId\" : \"block.keyword\" }", - "dateRefField": "createddate", - "indexName": "wsapplications", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must\":[{\"terms\":{\"servicetype.keyword\":[\"Water Charges\",\"Sewerage Charges\"]}},{\"terms\":{\"applicationstatus.keyword\":[\"Created\",\"Rejected\",\"Verified\",\"verified\"]}}]}},\"aggs\":{\"Pending from 0 to 3 days\":{\"date_range\":{\"field\":\"applicationdate\",\"ranges\":[{\"from\":\"now-3d/d\",\"to\":\"now\"}]}},\"Pending from 3 to 7 days\":{\"date_range\":{\"field\":\"applicationdate\",\"ranges\":[{\"from\":\"now-1w\",\"to\":\"now-3d/d\"}]}},\"Pending from 7 to 15 days\":{\"date_range\":{\"field\":\"applicationdate\",\"ranges\":[{\"from\":\"now-15d\",\"to\":\"now-1w\"}]}},\"Pending more than 15 days\":{\"date_range\":{\"field\":\"applicationdate\",\"ranges\":[{\"from\":\"now-2y\",\"to\":\"now-15d\"}]}}}}}}" - } - ], - "isMdmsEnabled": true, - "translateTenantCode": true, - "filterKeys": [ - {"key": "tenantId", "column": "DDRs"} - ], - "chartType": "xtable", - "valueType": "number", - "drillChart": "wsConnectionAgeingUlb", - "action": "", - "plotLabel": "DDRs", - "isPostResponseHandler": true, - "postAggregationTheory" : "", - "aggregationPaths": [ - "Pending from 0 to 3 days", - "Pending from 3 to 7 days", - "Pending from 7 to 15 days", - "Pending more than 15 days" - ], - "computedFields": [ - { - "postAggregationTheory" : "", - "actionName": "AdditiveComputedField", - "fields" : [ "Pending from 0 to 3 days", "Pending from 3 to 7 days", "Pending from 7 to 15 days", "Pending more than 15 days"], - "newField" : "Total Pending", - "_comments": "fields are field names picked from its aggregation query to use post aggregation newField value with given new field name " - } - ], - - "insight": { - }, - "_comment": "" - }, - "wsConnectionAgeingUlb": { - "chartName": "DSS_W&S_CONNECTION_AGEING", - "queries": [ - { - "module": "W&S", - "requestQueryMap": "{\"tenantId\" : \"cityname.keyword\", \"wardId\" : \"block.keyword\" }", - "dateRefField": "createddate", - "indexName": "wsapplications", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must\":[{\"terms\":{\"servicetype.keyword\":[\"Water Charges\",\"Sewerage Charges\"]}},{\"terms\":{\"applicationstatus.keyword\":[\"Created\",\"Rejected\",\"Verified\",\"verified\"]}}]}},\"aggs\":{\"2\":{\"terms\":{\"field\":\"cityname.keyword\",\"size\":170,\"order\":{\"_key\":\"asc\"}},\"aggs\":{\"Pending from 0 to 3 days\":{\"date_range\":{\"field\":\"applicationdate\",\"ranges\":[{\"from\":\"now-3d/d\",\"to\":\"now\"}]}},\"Pending from 3 to 7 days\":{\"date_range\":{\"field\":\"applicationdate\",\"ranges\":[{\"from\":\"now-1w\",\"to\":\"now-3d/d\"}]}},\"Pending from 7 to 15 days\":{\"date_range\":{\"field\":\"applicationdate\",\"ranges\":[{\"from\":\"now-15d\",\"to\":\"now-1w\"}]}},\"Pending more than 15 days\":{\"date_range\":{\"field\":\"applicationdate\",\"ranges\":[{\"from\":\"now-2y\",\"to\":\"now-15d\"}]}}}}}}}}" - } - ], - "isMdmsEnabled": false, - "translateTenantCode": true, - "filterKeys": [ - {"key": "tenantId", "column": "ULB"} - ], - "chartType": "xtable", - "valueType": "number", - "drillChart": "wsConnectionAgeingWard", - "action": "", - "plotLabel": "ULB", - "isPostResponseHandler": true, - "postAggregationTheory" : "", - "aggregationPaths": [ - "Pending from 0 to 3 days", - "Pending from 3 to 7 days", - "Pending from 7 to 15 days", - "Pending more than 15 days" - - ], - "computedFields": [ - { - "postAggregationTheory" : "", - "actionName": "AdditiveComputedField", - "fields" : [ "Pending from 0 to 3 days", "Pending from 3 to 7 days", "Pending from 7 to 15 days", "Pending more than 15 days"], - "newField" : "Total Pending", - "_comments": "fields are field names picked from its aggregation query to use post aggregation newField value with given new field name " - } - ], - - "insight": { - }, - "_comment": "" - }, - "wsConnectionAgeingWard": { - "chartName": "DSS_W&S_CONNECTION_AGEING", - "queries": [ - { - "module": "W&S", - "requestQueryMap": "{\"tenantId\" : \"cityname.keyword\", \"wardId\" : \"block.keyword\" }", - "dateRefField": "createddate", - "indexName": "wsapplications", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must\":[{\"terms\":{\"servicetype.keyword\":[\"Water Charges\",\"Sewerage Charges\"]}},{\"terms\":{\"applicationstatus.keyword\":[\"Created\",\"Rejected\",\"Verified\",\"verified\"]}}]}},\"aggs\":{\"2\":{\"terms\":{\"field\":\"block.keyword\",\"size\":170,\"order\":{\"_key\":\"asc\"}},\"aggs\":{\"Pending from 0 to 3 days\":{\"date_range\":{\"field\":\"applicationdate\",\"ranges\":[{\"from\":\"now-3d/d\",\"to\":\"now\"}]}},\"Pending from 3 to 7 days\":{\"date_range\":{\"field\":\"applicationdate\",\"ranges\":[{\"from\":\"now-1w\",\"to\":\"now-3d/d\"}]}},\"Pending from 7 to 15 days\":{\"date_range\":{\"field\":\"applicationdate\",\"ranges\":[{\"from\":\"now-15d\",\"to\":\"now-1w\"}]}},\"Pending more than 15 days\":{\"date_range\":{\"field\":\"applicationdate\",\"ranges\":[{\"from\":\"now-2y\",\"to\":\"now-15d\"}]}}}}}}}}" - } - ], - "isMdmsEnabled": false, - "translateTenantCode": true, - "filterKeys": [ - {"key": "tenantId", "column": "Ward"} - ], - "chartType": "xtable", - "valueType": "number", - "drillChart": "", - "action": "", - "plotLabel": "Ward", - "isPostResponseHandler": true, - "postAggregationTheory" : "", - "aggregationPaths": [ - "Pending from 0 to 3 days", - "Pending from 3 to 7 days", - "Pending from 7 to 15 days", - "Pending more than 15 days" - - ], - "computedFields": [ - { - "postAggregationTheory" : "", - "actionName": "AdditiveComputedField", - "fields" : [ "Pending from 0 to 3 days", "Pending from 3 to 7 days", "Pending from 7 to 15 days", "Pending more than 15 days"], - "newField" : "Total Pending", - "_comments": "fields are field names picked from its aggregation query to use post aggregation newField value with given new field name " - } - ], - - "insight": { - }, - "_comment": "" - }, - "mcTotalCollection": { - "chartName": "DSS_TOTAL_COLLECTION", - "queries": [ - { - "module": "MCOLLECT", - "dateRefField": "dataObject.paymentDetails.receiptDate", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\"}", - "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pg.testing\",\"pg\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"FSM.TRIP_CHARGES\",\"PT.MUTATION\",\"SW\",\"BPA.LOW_RISK_PERMIT_FEE\",\"BPA.NC_SAN_FEE\",\"BPA.NC_APP_FEE\",\"BPA.NC_OC_APP_FEE\"]}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" - - } - ], - "chartType": "metric", - "valueType": "Amount", - "drillChart": "none", - "documentType": "_doc", - "action": "", - "aggregationPaths": [ - "Total Collection" - ], - "insight": { - "chartResponseMap" : "mcTotalCollection", - "action" : "differenceOfNumbers", - "upwardIndicator" : "positive", - "downwardIndicator" : "negative", - "textMessage" : "$indicator$value% than last $insightInterval", - "colorCode" : "#228B22", - "insightInterval" : "year" - }, - "_comment": " " - }, - "mcTotalReceipts": { - "chartName": "DSS_MC_TOTAL_RECEIPTS", - "queries": [ - { - "module":"MCOLLECT", - "dateRefField": "dataObject.paymentDetails.receiptDate", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.Bill.billDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.cityDistrictCode\"}", - "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pb.testing\",\"pb\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"PT.MUTATION\",\"SW\"]}}]}},\"aggs\":{\"Total Receipts\":{\"value_count\":{\"field\":\"dataObject.paymentDetails.receiptNumber.keyword\"}}}}}}" - } - ], - "chartType": "metric", - "valueType": "number", - "drillChart": "none", - "documentType": "_doc", - "action": "", - "aggregationPaths": [ - "Total Receipts" - ], - "insight": { - "chartResponseMap" : "mcTotalReceipts", - "action" : "differenceOfNumbers", - "upwardIndicator" : "positive", - "downwardIndicator" : "negative", - "textMessage" : "$indicator$value% than last $insightInterval", - "colorCode" : "#228B22", - "insightInterval" : "year" - }, - "_comment": " " - }, - "nocTotalCollection": { - "chartName": "DSS_NOC_TOTAL_COLLECTION", - "queries": [ - { - "module": "FIRENOC", - "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must\":[{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"FIRENOC\"]}}],\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"term\":{\"dataObject.paymentStatus.keyword\":\"Cancelled\"}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}", - "requestQueryMap": "{\"wardId\" : \"dataObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\",\"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", - "dateRefField": "dataObject.paymentDetails.receiptDate" - } - ], - "chartType": "metric", - "valueType": "amount", - "action": "", - "drillChart": "none", - "aggregationPaths": [ - "Total Collection" - ], - "insight": { - "chartResponseMap" : "nocTotalCollection", - "action" : "differenceOfNumbers", - "upwardIndicator" : "positive", - "downwardIndicator" : "negative", - "textMessage" : "$indicator$value% than last $insightInterval", - "colorCode" : "#228B22", - "insightInterval" : "year" - }, - "_comment": "FIRE NOC total collections " - }, - "nocTotalNocsIssued": { - "chartName": "DSS_NOC_TOTAL_NOCS_ISSUED", - "queries": [ - { - "module": "FIRENOC", - "indexName": "firenoc-services", - "aggrQuery": "{\"aggs\":{\"FireNOC\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}],\"must\":[{\"terms\":{\"Data.fireNOCDetails.status.keyword\":[\"APPROVED\"]}}]}},\"aggs\":{\"Total Nocs Issued\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}}", - "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\",\"tenantId\" : \"Data.tenantId\", \"district\" : \"Data.tenantData.city.districtCode\"}", - "dateRefField": "Data.auditDetails.createdTime" - } - ], - "chartType": "metric", - "valueType": "number", - "action": "", - "drillChart": "none", - "aggregationPaths": [ - "Total Nocs Issued" - ], - "insight": { - "chartResponseMap" : "nocTotalNocsIssued", - "action" : "differenceOfNumbers", - "upwardIndicator" : "positive", - "downwardIndicator" : "negative", - "textMessage" : "$indicator$value% than last $insightInterval", - "colorCode" : "#228B22", - "insightInterval" : "year" - }, - "_comment": "FIRE NOC total nocs issued " - }, - "mcTodaysCollection": { - "chartName": "DSS_TOTAL_COLLECTION_TODAY", - "queries": [ - { - "module": "COMMON", - "dateRefField": "dataObject.paymentDetails.receiptDate", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\"}", - "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pb.testing\",\"pb\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"PT.MUTATION\",\"SW\"]}}]}},\"aggs\":{\"Todays Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" - } - ], - "chartType": "metric", - "valueType": "Amount", - "drillChart": "none", - "documentType": "_doc", - "action": "", - "aggregationPaths": [ - "Todays Collection" - ], - "insight": {}, - "_comment": " " - }, - "mcTotalChallans": { - "chartName": "DSS_MC_TOTAL_CHALLANS", - "queries": [ - { - "module": "MCOLLECT", - "dateRefField": "Data.taxPeriodFrom", - "requestQueryMap": "{\"module\" : \"Data.businessService\", \"tenantId\" : \"Data.tenantId\"}", - "indexName": "echallan-services", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Total Challans\":{\"value_count\":{\"field\":\"Data.challanNo.keyword\"}}}}}}" - } - ], - "chartType": "metric", - "valueType": "number", - "drillChart": "none", - "documentType": "_doc", - "action": "", - "aggregationPaths": [ - "Total Challans" - ], - "insight": { - "chartResponseMap" : "mcTotalChallans", - "action" : "differenceOfNumbers", - "upwardIndicator" : "positive", - "downwardIndicator" : "negative", - "textMessage" : "$indicator$value% than last $insightInterval", - "colorCode" : "#228B22", - "insightInterval" : "year" - }, - "_comment": " " - }, - "mcTotalCategories": { - "chartName": "DSS_MC_TOTAL_CATEGORIES", - "queries": [ - { - "module": "MCOLLECT", - "dateRefField": "dataObject.paymentDetails.receiptDate", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.Bill.billDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.cityDistrictCode\"}", - "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pb.testing\",\"pb\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"PT.MUTATION\",\"SW\"]}}]}},\"aggs\":{\"Total Categories\":{\"cardinality\":{\"field\":\"dataObject.paymentDetails.businessService.keyword\"}}}}}}" - } - ], - "chartType": "metric", - "valueType": "number", - "drillChart": "none", - "documentType": "_doc", - "action": "", - "aggregationPaths": [ - "Total Categories" - ], - "insight": { - - }, - "_comment": " " - }, - "mcCumulativeCollection": { - "chartName": "DSS_TOTAL_CUMULATIVE_COLLECTION", - "queries": [ - { - "module": "MCOLLECT", - "dateRefField": "dataObject.paymentDetails.receiptDate", - "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\r\n \"module\" : \"dataObject.paymentDetails.businessService.keyword\", \n\"tenantId\" : \"dataObject.tenantId\"}", - "indexName": "dss-collection_v2", - "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pb.testing\",\"pb\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"PT.MUTATION\",\"SW\"]}}]}},\"aggs\":{\"Collections\":{\"date_histogram\":{\"field\":\"dataObject.paymentDetails.receiptDate\",\"interval\":\"intervalvalue\"},\"aggs\":{\"Sum\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" - } - ], - "chartType": "line", - "valueType": "amount", - "action": "", - "drillChart": "none", - "documentType": "_doc", - "aggregationPaths": [ - "Collections" - ], - "isCumulative": true, - "interval": "month", - "insight": {}, - "_comment": " " - }, - "nocTotalApplications": { - "chartName": "DSS_NOC_TOTAL_APPLICATIONS", - "queries": [ - { - "module": "FIRENOC", - "indexName": "firenoc-services", - "aggrQuery": "{\"aggs\":{\"FireNOC\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Total Applications\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}}", - "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\",\"tenantId\" : \"Data.tenantId\", \"district\" : \"Data.tenantData.city.districtCode\"}", - "dateRefField": "Data.auditDetails.createdTime" - } - ], - "chartType": "metric", - "valueType": "number", - "action": "", - "drillChart": "none", - "aggregationPaths": [ - "Total Applications" - ], - "insight": { - "chartResponseMap" : "nocTotalApplications", - "action" : "differenceOfNumbers", - "upwardIndicator" : "positive", - "downwardIndicator" : "negative", - "textMessage" : "$indicator$value% than last $insightInterval", - "colorCode" : "#228B22", - "insightInterval" : "year" - }, - "_comment": "FIRE NOC total applications " - }, - "nocProvisionalIssued": { - "chartName": "DSS_NOC_PROVISIONAL_ISSUED", - "queries": [ - { - "module": "FIRENOC", - "indexName": "firenoc-services", - "aggrQuery": "{\"aggs\":{\"FireNOC\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Provisional Fire Nocs issued\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"Data.fireNOCDetails.fireNOCType.keyword\":\"PROVISIONAL\"}}]}}}}}}}", - "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\",\"tenantId\" : \"Data.tenantId\", \"district\" : \"Data.tenantData.city.districtCode\"}", - "dateRefField": "Data.auditDetails.createdTime" - } - ], - "chartType": "metric", - "valueType": "number", - "action": "", - "drillChart": "none", - "aggregationPaths": [ - "Provisional Fire Nocs issued" - ], - "insight": { - "chartResponseMap" : "nocProvisionalIssued", - "action" : "differenceOfNumbers", - "upwardIndicator" : "positive", - "downwardIndicator" : "negative", - "textMessage" : "$indicator$value% than last $insightInterval", - "colorCode" : "#228B22", - "insightInterval" : "year" - }, - "_comment": "FIRE NOC Provisional Issued" - }, - "nocActualIssued": { - "chartName": "DSS_NOC_ACTUAL_ISSUED", - "queries": [ - { - "module": "FIRENOC", - "indexName": "firenoc-services", - "aggrQuery": "{\"aggs\":{\"FireNOC\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Actual Fire Nocs issued\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"Data.fireNOCDetails.fireNOCType.keyword\":\"NEW\"}}]}}}}}}}", - "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\",\"tenantId\" : \"Data.tenantId\", \"district\" : \"Data.tenantData.city.districtCode\"}", - "dateRefField": "Data.auditDetails.createdTime" - } - ], - "chartType": "metric", - "valueType": "number", - "action": "", - "drillChart": "none", - "aggregationPaths": [ - "Actual Fire Nocs issued" - ], - "insight": { - "chartResponseMap" : "nocActualIssued", - "action" : "differenceOfNumbers", - "upwardIndicator" : "positive", - "downwardIndicator" : "negative", - "textMessage" : "$indicator$value% than last $insightInterval", - "colorCode" : "#228B22", - "insightInterval" : "year" - }, - "_comment": "Actual fire nocs Issued" - }, - "nocSLAComplianceProvisional": { - "chartName": "DSS_NOC_SLA_COMPLIANCE_PROVISIONAL", - "queries": [ - { - "module": "FIRENOC", - "indexName": "firenoc-services", - "aggrQuery": "{\"aggs\":{\"FireNOC\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"SLA Compliance (Provisional NOC)\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"Data.fireNOCDetails.fireNOCType.keyword\":\"PROVISIONAL\"}},{\"term\":{\"Data.fireNOCDetails.status.keyword\":\"APPROVED\"}},{\"script\":{\"script\":{\"source\":\"doc['Data.auditDetails.lastModifiedTime'].value-doc['Data.auditDetails.createdTime'].value egovtelemetryreindex -#configKey=INDEX: Index that currently receives live data from the services -#configKey=REINDEX: Configuration for reindexing that will be enabled only during reindexing activity. diff --git a/configs/egov-indexer/egov-uploader-indexer.yml b/configs/egov-indexer/egov-uploader-indexer.yml deleted file mode 100644 index c4202ea3..00000000 --- a/configs/egov-indexer/egov-uploader-indexer.yml +++ /dev/null @@ -1,28 +0,0 @@ -ServiceMaps: - serviceName: Uploader - version: 1.0.0 - mappings: - - topic: save-upload-jobs - configKey: INDEX - indexes: - - name: uploaderindex-v1 - type: jobs - id: $.code - isBulk: false - jsonPath: $.UploadJob - timeStampField: $.auditDetails.createdTime - - - topic: update-upload-jobs - configKey: INDEX - indexes: - - name: uploaderindex-v1 - type: jobs - id: $.code - isBulk: false - jsonPath: $.UploadJob - timeStampField: $.auditDetails.createdTime - - -#JOURNEY: egovtelemetry -> egovtelemetryreindex -#configKey=INDEX: Index that currently receives live data from the services -#configKey=REINDEX: Configuration for reindexing that will be enabled only during reindexing activity. diff --git a/configs/egov-indexer/error-queue.yml b/configs/egov-indexer/error-queue.yml deleted file mode 100644 index c8b550b5..00000000 --- a/configs/egov-indexer/error-queue.yml +++ /dev/null @@ -1,27 +0,0 @@ -ServiceMaps: - serviceName: Tracer - version: 1.0.0 - mappings: - - topic: tracer-error-queue-index - configKey: INDEX - indexes: - - name: egovtracer - type: errors - id: $.id - isBulk: false - timeStampField: $.ts - - - topic: tracer-error-queue-reindex - configKey: REINDEX - indexes: - - name: egovtracerreindex - type: errors - id: $.id - isBulk: true - jsonPath: $.hits - timeStampField: $.ts - - -#JOURNEY: egovtracer -#configKey=INDEX: Index that currently receives live data from the services -#configKey=REINDEX: Configuration for reindexing that will be enabled only during reindexing activity. diff --git a/configs/egov-indexer/finance-rolloutadoption-indexer.yml b/configs/egov-indexer/finance-rolloutadoption-indexer.yml deleted file mode 100644 index 9c8befa6..00000000 --- a/configs/egov-indexer/finance-rolloutadoption-indexer.yml +++ /dev/null @@ -1,31 +0,0 @@ -ServiceMaps: - serviceName: FinanceAdoption - version: 2.0.0 - mappings: - - topic: finance-adoption-topic - configKey: INDEX - indexes: - - name: financeindex-v1 - type: rolloutadoption - id: $.id - isBulk: false - timeStampField: $.timestamp - jsonPath: $.rollOutAdoptionData - - topic: finance-bill-topic - configKey: INDEX - indexes: - - name: financebill-v1 - type: billregister - id: $.id - isBulk: true - timeStampField: $.timestamp - jsonPath: $.egBillRegisterData - - topic: finance-voucher-topic - configKey: INDEX - indexes: - - name: financevoucher-v1 - type: voucher - id: $.id - isBulk: true - timeStampField: $.timestamp - jsonPath: $.voucherHeaderData diff --git a/configs/egov-indexer/payment-indexer-migration.yml b/configs/egov-indexer/payment-indexer-migration.yml deleted file mode 100644 index f2b0a305..00000000 --- a/configs/egov-indexer/payment-indexer-migration.yml +++ /dev/null @@ -1,54 +0,0 @@ -ServiceMaps: - serviceName: Collection Services - version: 1.0.0 - mappings: - - topic: egov-collection-migration-batch - configKey: INDEX - indexes: - - name: paymentsindex-v1 - type: payments - id: $.id - isBulk: true - timeStampField: $.auditDetails.createdTime - jsonPath: $.Payments.* - customJsonMapping: - indexMapping: {"Data":{"tenantId":"","id":"","transactionNumber":"","transactionDate":1,"paymentMode":"","paymentStatus":"","payer":{"id":"","name":""},"paidBy":"","paymentDetails":{},"auditDetails":{},"additionalDetails":{},"tenantData":{},"@timestamp":"timestamp"}} - fieldMapping: - - inJsonPath: $.tenantId - outJsonPath: $.Data.tenantId - - inJsonPath: $.id - outJsonPath: $.Data.id - - inJsonPath: $.transactionNumber - outJsonPath: $.Data.transactionNumber - - inJsonPath: $.transactionDate - outJsonPath: $.Data.transactionDate - - inJsonPath: $.paymentMode - outJsonPath: $.Data.paymentMode - - inJsonPath: $.paymentStatus - outJsonPath: $.Data.paymentStatus - - inJsonPath: $.payerId - outJsonPath: $.Data.payer.id - - inJsonPath: $.payerName - outJsonPath: $.Data.payer.name - - inJsonPath: $.paidBy - outJsonPath: $.Data.paidBy - - inJsonPath: $.paymentDetails - outJsonPath: $.Data.paymentDetails - - inJsonPath: $.auditDetails - outJsonPath: $.Data.auditDetails - - inJsonPath: $.additionalDetails - outJsonPath: $.Data.additionalDetails - - inJsonPath: $.@timestamp - outJsonPath: $.Data.@timestamp - mdmsMapping: - - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search - moduleName: tenant - masterName: tenants - tenantId: pb - filter: "[?(@.code == $tenant)]" - filterMapping: - - variable: $tenant - valueJsonpath: $.tenantId - uriResponseMapping: - - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.Data.tenantData diff --git a/configs/egov-indexer/payment-indexer.yml b/configs/egov-indexer/payment-indexer.yml deleted file mode 100644 index fd9cc521..00000000 --- a/configs/egov-indexer/payment-indexer.yml +++ /dev/null @@ -1,485 +0,0 @@ -ServiceMaps: - serviceName: Collection Services - version: 1.0.0 - mappings: - - topic: egov.collection.payment-create - configKey: INDEX - indexes: - - name: paymentsindex-v1 - type: payments - id: $.id - isBulk: false - timeStampField: $.auditDetails.createdTime - jsonPath: $.Payment - customJsonMapping: - indexMapping: {"Data":{"tenantId":"","id":"","transactionNumber":"","transactionDate":1,"paymentMode":"","paymentStatus":"","payer":{"id":"","name":""},"paidBy":"","paymentDetails":{},"auditDetails":{},"additionalDetails":{},"tenantData":{},"@timestamp":"timestamp","ward":{}}} - fieldMapping: - - inJsonPath: $.tenantId - outJsonPath: $.Data.tenantId - - inJsonPath: $.id - outJsonPath: $.Data.id - - inJsonPath: $.transactionNumber - outJsonPath: $.Data.transactionNumber - - inJsonPath: $.transactionDate - outJsonPath: $.Data.transactionDate - - inJsonPath: $.paymentMode - outJsonPath: $.Data.paymentMode - - inJsonPath: $.paymentStatus - outJsonPath: $.Data.paymentStatus - - inJsonPath: $.payerId - outJsonPath: $.Data.payer.id - - inJsonPath: $.payerName - outJsonPath: $.Data.payer.name - - inJsonPath: $.paidBy - outJsonPath: $.Data.paidBy - - inJsonPath: $.paymentDetails - outJsonPath: $.Data.paymentDetails - - inJsonPath: $.auditDetails - outJsonPath: $.Data.auditDetails - - inJsonPath: $.additionalDetails - outJsonPath: $.Data.additionalDetails - - inJsonPath: $.@timestamp - outJsonPath: $.Data.@timestamp - - externalUriMapping: - - path: http://egov-location:8080/egov-location/location/v11/boundarys/_search - queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId - apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", - "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} - uriResponseMapping: - - inJsonPath: $.TenantBoundary[0].boundary[0] - outJsonPath: $.Data.ward - mdmsMapping: - - path: http://egov-mdms-service:8080/egov-mdms-service/v1/_search - moduleName: tenant - masterName: tenants - tenantId: pb - filter: "[?(@.code == $tenant)]" - filterMapping: - - variable: $tenant - valueJsonpath: $.tenantId - uriResponseMapping: - - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.Data.tenantData - - - - topic: egov.collection.payment-update - configKey: INDEX - indexes: - - name: paymentsindex-v1 - type: payments - id: $.id - isBulk: false - timeStampField: $.auditDetails.createdTime - jsonPath: $.Payment - customJsonMapping: - indexMapping: {"Data":{"tenantId":"","id":"","transactionNumber":"","transactionDate":1,"paymentMode":"","paymentStatus":"","payer":{"id":"","name":""},"paidBy":"","paymentDetails":{},"auditDetails":{},"additionalDetails":{},"tenantData":{},"@timestamp":"timestamp","ward":{}}} - fieldMapping: - - inJsonPath: $.tenantId - outJsonPath: $.Data.tenantId - - inJsonPath: $.id - outJsonPath: $.Data.id - - inJsonPath: $.transactionNumber - outJsonPath: $.Data.transactionNumber - - inJsonPath: $.transactionDate - outJsonPath: $.Data.transactionDate - - inJsonPath: $.paymentMode - outJsonPath: $.Data.paymentMode - - inJsonPath: $.paymentStatus - outJsonPath: $.Data.paymentStatus - - inJsonPath: $.payerId - outJsonPath: $.Data.payer.id - - inJsonPath: $.payerName - outJsonPath: $.Data.payer.name - - inJsonPath: $.paidBy - outJsonPath: $.Data.paidBy - - inJsonPath: $.paymentDetails - outJsonPath: $.Data.paymentDetails - - inJsonPath: $.auditDetails - outJsonPath: $.Data.auditDetails - - inJsonPath: $.additionalDetails - outJsonPath: $.Data.additionalDetails - - inJsonPath: $.@timestamp - outJsonPath: $.Data.@timestamp - externalUriMapping: - - path: http://egov-location:8080/egov-location/location/v11/boundarys/_search - queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId - apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", - "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} - uriResponseMapping: - - inJsonPath: $.TenantBoundary[0].boundary[0] - outJsonPath: $.Data.ward - mdmsMapping: - - path: http://egov-mdms-service:8080/egov-mdms-service/v1/_search - moduleName: tenant - masterName: tenants - tenantId: pb - filter: "[?(@.code == $tenant)]" - filterMapping: - - variable: $tenant - valueJsonpath: $.tenantId - uriResponseMapping: - - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.Data.tenantData - - - - topic: egov-payment-legacy-index - configKey: LEGACYINDEX - indexes: - - name: paymentsindex-v1 - type: payments - id: $.id - isBulk: true - timeStampField: $.auditDetails.createdTime - jsonPath: $.Payments.* - customJsonMapping: - indexMapping: {"Data":{"tenantId":"","id":"","transactionNumber":"","transactionDate":1,"paymentMode":"","paymentStatus":"","payer":{"id":"","name":""},"paidBy":"","paymentDetails":{},"auditDetails":{},"additionalDetails":{},"tenantData":{},"@timestamp":"timestamp","ward":{}}} - fieldMapping: - - inJsonPath: $.tenantId - outJsonPath: $.Data.tenantId - - inJsonPath: $.id - outJsonPath: $.Data.id - - inJsonPath: $.transactionNumber - outJsonPath: $.Data.transactionNumber - - inJsonPath: $.transactionDate - outJsonPath: $.Data.transactionDate - - inJsonPath: $.paymentMode - outJsonPath: $.Data.paymentMode - - inJsonPath: $.paymentStatus - outJsonPath: $.Data.paymentStatus - - inJsonPath: $.payerId - outJsonPath: $.Data.payer.id - - inJsonPath: $.payerName - outJsonPath: $.Data.payer.name - - inJsonPath: $.paidBy - outJsonPath: $.Data.paidBy - - inJsonPath: $.paymentDetails - outJsonPath: $.Data.paymentDetails - - inJsonPath: $.auditDetails - outJsonPath: $.Data.auditDetails - - inJsonPath: $.additionalDetails - outJsonPath: $.Data.additionalDetails - - inJsonPath: $.@timestamp - outJsonPath: $.Data.@timestamp - externalUriMapping: - - path: http://egov-location:8080/egov-location/location/v11/boundarys/_search - queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId - apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", - "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} - uriResponseMapping: - - inJsonPath: $.TenantBoundary[0].boundary[0] - outJsonPath: $.Data.ward - mdmsMapping: - - path: http://egov-mdms-service:8080/egov-mdms-service/v1/_search - moduleName: tenant - masterName: tenants - tenantId: pb - filter: "[?(@.code == $tenant)]" - filterMapping: - - variable: $tenant - valueJsonpath: $.tenantId - uriResponseMapping: - - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.Data.tenantData - - - topic: egov.collection.payment-cancel - configKey: INDEX - indexes: - - name: paymentsindex-v1 - type: payments - id: $.id - isBulk: false - timeStampField: $.auditDetails.createdTime - jsonPath: $.Payment - customJsonMapping: - indexMapping: {"Data":{"tenantId":"","id":"","transactionNumber":"","transactionDate":1,"paymentMode":"","paymentStatus":"","payer":{"id":"","name":""},"paidBy":"","paymentDetails":{},"auditDetails":{},"additionalDetails":{},"tenantData":{},"@timestamp":"timestamp","ward":{}}} - fieldMapping: - - inJsonPath: $.tenantId - outJsonPath: $.Data.tenantId - - inJsonPath: $.id - outJsonPath: $.Data.id - - inJsonPath: $.transactionNumber - outJsonPath: $.Data.transactionNumber - - inJsonPath: $.transactionDate - outJsonPath: $.Data.transactionDate - - inJsonPath: $.paymentMode - outJsonPath: $.Data.paymentMode - - inJsonPath: $.paymentStatus - outJsonPath: $.Data.paymentStatus - - inJsonPath: $.payerId - outJsonPath: $.Data.payer.id - - inJsonPath: $.payerName - outJsonPath: $.Data.payer.name - - inJsonPath: $.paidBy - outJsonPath: $.Data.paidBy - - inJsonPath: $.paymentDetails - outJsonPath: $.Data.paymentDetails - - inJsonPath: $.auditDetails - outJsonPath: $.Data.auditDetails - - inJsonPath: $.additionalDetails - outJsonPath: $.Data.additionalDetails - - inJsonPath: $.@timestamp - outJsonPath: $.Data.@timestamp - externalUriMapping: - - path: http://egov-location:8080/egov-location/location/v11/boundarys/_search - queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId - apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", - "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} - uriResponseMapping: - - inJsonPath: $.TenantBoundary[0].boundary[0] - outJsonPath: $.Data.ward - mdmsMapping: - - path: http://egov-mdms-service:8080/egov-mdms-service/v1/_search - moduleName: tenant - masterName: tenants - tenantId: pb - filter: "[?(@.code == $tenant)]" - filterMapping: - - variable: $tenant - valueJsonpath: $.tenantId - uriResponseMapping: - - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.Data.tenantData - - - topic: save-challan - configKey: INDEX - indexes: - - name: echallan-services - type: general - id: $.id,$.tenantId - jsonPath: $.Challan - timeStampField: $.auditDetails.createdTime - customJsonMapping: - indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","tenantId":"","businessService":"","challanNo":"","referenceId":"","description":"","accountId":"","additionalDetail":{},"source":"","taxPeriodFrom":"","taxPeriodTo":"","amount":[],"filestoreid":"","additionalDetails":{},"applicationStatus":"","vendor":"","typeOfExpense":"","billDate":"","billIssuedDate":"","paidDate":"","isBillPaid":"","vendorName":"","totalAmount":"","@timestamp":"timestamp","history":{},"ward":{"name": "NA"}}} - fieldMapping: - - inJsonPath: $.applicationStatus.state - outJsonPath: $.Data.workflow.state - - inJsonPath: $.processInstance.action - outJsonPath: $.Data.workflow.action - - inJsonPath: $.processInstance.assignes.*.uuid - outJsonPath: $.Data.workflow.assignes - - inJsonPath: $.id - outJsonPath: $.Data.id - - inJsonPath: $.tenantId - outJsonPath: $.Data.tenantId - - inJsonPath: $.businessService - outJsonPath: $.Data.businessService - - inJsonPath: $.challanNo - outJsonPath: $.Data.challanNo - - inJsonPath: $.referenceId - outJsonPath: $.Data.referenceId - - inJsonPath: $.description - outJsonPath: $.Data.description - - inJsonPath: $.accountId - outJsonPath: $.Data.accountId - - inJsonPath: $.additionalDetail - outJsonPath: $.Data.additionalDetail - - inJsonPath: $.source - outJsonPath: $.Data.source - - inJsonPath: $.taxPeriodFrom - outJsonPath: $.Data.taxPeriodFrom - - inJsonPath: $.taxPeriodTo - outJsonPath: $.Data.taxPeriodTo - - inJsonPath: $.amount - outJsonPath: $.Data.amount - - inJsonPath: $.filestoreid - outJsonPath: $.Data.filestoreid - - inJsonPath: $.additionalDetails - outJsonPath: $.Data.additionalDetails - - inJsonPath: $.applicationStatus - outJsonPath: $.Data.applicationStatus - - inJsonPath: $.vendor - outJsonPath: $.Data.vendor - - inJsonPath: $.typeOfExpense - outJsonPath: $.Data.typeOfExpense - - inJsonPath: $.billDate - outJsonPath: $.Data.billDate - - inJsonPath: $.billIssuedDate - outJsonPath: $.Data.billIssuedDate - - inJsonPath: $.paidDate - outJsonPath: $.Data.paidDate - - inJsonPath: $.isBillPaid - outJsonPath: $.Data.isBillPaid - - inJsonPath: $.vendorName - outJsonPath: $.Data.vendorName - - inJsonPath: $.totalAmount - outJsonPath: $.Data.totalAmount - - inJsonPath: $.@timestamp - outJsonPath: $.Data.@timestamp - externalUriMapping: - - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search - queryParam: businessIds=$.acknowldgementNumber,history=true,tenantId=$.tenantId - apiRequest: {"RequestInfo":{"apiId":"org.egov.echallan","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} - uriResponseMapping: - - inJsonPath: $.ProcessInstances - outJsonPath: $.Data.history - - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search - queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId - apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", - "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} - uriResponseMapping: - - inJsonPath: $.TenantBoundary[0].boundary[0] - outJsonPath: $.Data.ward - - - - topic: update-challan - configKey: INDEX - indexes: - - name: echallan-services - type: general - id: $.id,$.tenantId - jsonPath: $.Challan - timeStampField: $.auditDetails.createdTime - customJsonMapping: - indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","tenantId":"","businessService":"","challanNo":"","referenceId":"","description":"","accountId":"","additionalDetail":{},"source":"","taxPeriodFrom":"","taxPeriodTo":"","amount":[],"filestoreid":"","additionalDetails":{},"applicationStatus":"","vendor":"","typeOfExpense":"","billDate":"","billIssuedDate":"","paidDate":"","isBillPaid":"","vendorName":"","totalAmount":"","@timestamp":"timestamp","history":{},"ward":{"name": "NA"}}} - fieldMapping: - - inJsonPath: $.applicationStatus.state - outJsonPath: $.Data.workflow.state - - inJsonPath: $.processInstance.action - outJsonPath: $.Data.workflow.action - - inJsonPath: $.processInstance.assignes.*.uuid - outJsonPath: $.Data.workflow.assignes - - inJsonPath: $.id - outJsonPath: $.Data.id - - inJsonPath: $.tenantId - outJsonPath: $.Data.tenantId - - inJsonPath: $.businessService - outJsonPath: $.Data.businessService - - inJsonPath: $.challanNo - outJsonPath: $.Data.challanNo - - inJsonPath: $.referenceId - outJsonPath: $.Data.referenceId - - inJsonPath: $.description - outJsonPath: $.Data.description - - inJsonPath: $.accountId - outJsonPath: $.Data.accountId - - inJsonPath: $.additionalDetail - outJsonPath: $.Data.additionalDetail - - inJsonPath: $.source - outJsonPath: $.Data.source - - inJsonPath: $.taxPeriodFrom - outJsonPath: $.Data.taxPeriodFrom - - inJsonPath: $.taxPeriodTo - outJsonPath: $.Data.taxPeriodTo - - inJsonPath: $.amount - outJsonPath: $.Data.amount - - inJsonPath: $.filestoreid - outJsonPath: $.Data.filestoreid - - inJsonPath: $.additionalDetails - outJsonPath: $.Data.additionalDetails - - inJsonPath: $.applicationStatus - outJsonPath: $.Data.applicationStatus - - inJsonPath: $.vendor - outJsonPath: $.Data.vendor - - inJsonPath: $.typeOfExpense - outJsonPath: $.Data.typeOfExpense - - inJsonPath: $.billDate - outJsonPath: $.Data.billDate - - inJsonPath: $.billIssuedDate - outJsonPath: $.Data.billIssuedDate - - inJsonPath: $.paidDate - outJsonPath: $.Data.paidDate - - inJsonPath: $.isBillPaid - outJsonPath: $.Data.isBillPaid - - inJsonPath: $.vendorName - outJsonPath: $.Data.vendorName - - inJsonPath: $.totalAmount - outJsonPath: $.Data.totalAmount - - inJsonPath: $.@timestamp - outJsonPath: $.Data.@timestamp - externalUriMapping: - - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search - queryParam: businessIds=$.acknowldgementNumber,history=true,tenantId=$.tenantId - apiRequest: {"RequestInfo":{"apiId":"org.egov.echallan","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} - uriResponseMapping: - - inJsonPath: $.ProcessInstances - outJsonPath: $.Data.history - - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search - queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId - apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", - "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} - uriResponseMapping: - - inJsonPath: $.TenantBoundary[0].boundary[0] - outJsonPath: $.Data.ward - - - - topic: echallan-legacyIndex - configKey: LEGACYINDEX - indexes: - - name: echallan-services - type: general - isBulk: true - id: $.id,$.tenantId - jsonPath: $.challans.* - timeStampField: $.auditDetails.createdTime - customJsonMapping: - indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","tenantId":"","businessService":"","challanNo":"","referenceId":"","description":"","accountId":"","additionalDetail":{},"source":"","taxPeriodFrom":"","taxPeriodTo":"","amount":[],"filestoreid":"","additionalDetails":{},"applicationStatus":"","vendor":"","typeOfExpense":"","billDate":"","billIssuedDate":"","paidDate":"","isBillPaid":"","vendorName":"","totalAmount":"","@timestamp":"timestamp","history":{},"ward":{"name": "NA"}}} - fieldMapping: - - inJsonPath: $.processInstance.action - outJsonPath: $.Data.workflow.action - - inJsonPath: $.processInstance.assignes.*.uuid - outJsonPath: $.Data.workflow.assignes - - inJsonPath: $.id - outJsonPath: $.Data.id - - inJsonPath: $.tenantId - outJsonPath: $.Data.tenantId - - inJsonPath: $.businessService - outJsonPath: $.Data.businessService - - inJsonPath: $.challanNo - outJsonPath: $.Data.challanNo - - inJsonPath: $.referenceId - outJsonPath: $.Data.referenceId - - inJsonPath: $.description - outJsonPath: $.Data.description - - inJsonPath: $.accountId - outJsonPath: $.Data.accountId - - inJsonPath: $.additionalDetail - outJsonPath: $.Data.additionalDetail - - inJsonPath: $.source - outJsonPath: $.Data.source - - inJsonPath: $.taxPeriodFrom - outJsonPath: $.Data.taxPeriodFrom - - inJsonPath: $.taxPeriodTo - outJsonPath: $.Data.taxPeriodTo - - inJsonPath: $.amount - outJsonPath: $.Data.amount - - inJsonPath: $.filestoreid - outJsonPath: $.Data.filestoreid - - inJsonPath: $.additionalDetails - outJsonPath: $.Data.additionalDetails - - inJsonPath: $.applicationStatus - outJsonPath: $.Data.applicationStatus - - inJsonPath: $.vendor - outJsonPath: $.Data.vendor - - inJsonPath: $.typeOfExpense - outJsonPath: $.Data.typeOfExpense - - inJsonPath: $.billDate - outJsonPath: $.Data.billDate - - inJsonPath: $.billIssuedDate - outJsonPath: $.Data.billIssuedDate - - inJsonPath: $.paidDate - outJsonPath: $.Data.paidDate - - inJsonPath: $.isBillPaid - outJsonPath: $.Data.isBillPaid - - inJsonPath: $.vendorName - outJsonPath: $.Data.vendorName - - inJsonPath: $.totalAmount - outJsonPath: $.Data.totalAmount - - inJsonPath: $.@timestamp - outJsonPath: $.Data.@timestamp - externalUriMapping: - - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search - queryParam: businessIds=$.acknowldgementNumber,history=true,tenantId=$.tenantId - apiRequest: {"RequestInfo":{"apiId":"org.egov.echallan","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} - uriResponseMapping: - - inJsonPath: $.ProcessInstances - outJsonPath: $.Data.history - - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search - queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId - apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", - "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} - uriResponseMapping: - - inJsonPath: $.TenantBoundary[0].boundary[0] - outJsonPath: $.Data.ward - - diff --git a/configs/egov-indexer/property-services-migration-temp.yml b/configs/egov-indexer/property-services-migration-temp.yml deleted file mode 100644 index ee91c294..00000000 --- a/configs/egov-indexer/property-services-migration-temp.yml +++ /dev/null @@ -1,775 +0,0 @@ -ServiceMaps: - serviceName: Property Tax - rainmaker - version: 1.0.0 - mappings: - - topic: save-property-registry-batch - configKey: INDEX - indexes: - - name: property-services-test - type: general - id: $.propertyId,$.tenantId - jsonPath: $.Property - timeStampField: $.auditDetails.lastModifiedTime - customJsonMapping: - indexMapping: {"Data":{"owners":[],"acknowldgementNumber":"","propertyType":"","ownershipCategory":"","creationReason":"","usageCategory":"","noOfFloors":"","landArea":"","superBuiltUpArea":"","source":"","channel":"","units":{},"auditDetails":{},"id":"","propertyId":"","surveyId":"","linkedProperties":{},"tenantId":"","accountId":"","oldPropertyId":"","status":"","@timestamp":"timestamp"}} - fieldMapping: - - inJsonPath: $.owners.*.uuid - outJsonPath: $.Data.owners - - inJsonPath: $.acknowldgementNumber - outJsonPath: $.Data.acknowldgementNumber - - inJsonPath: $.propertyType - outJsonPath: $.Data.propertyType - - inJsonPath: $.ownershipCategory - outJsonPath: $.Data.ownershipCategory - - inJsonPath: $.creationReason - outJsonPath: $.Data.creationReason - - inJsonPath: $.usageCategory - outJsonPath: $.Data.usageCategory - - inJsonPath: $.noOfFloors - outJsonPath: $.Data.noOfFloors - - inJsonPath: $.landArea - outJsonPath: $.Data.landArea - - inJsonPath: $.superBuiltUpArea - outJsonPath: $.Data.superBuiltUpArea - - inJsonPath: $.source - outJsonPath: $.Data.source - - inJsonPath: $.channel - outJsonPath: $.Data.channel - - inJsonPath: $.units - outJsonPath: $.Data.units - - inJsonPath: $.auditDetails - outJsonPath: $.Data.auditDetails - - inJsonPath: $.id - outJsonPath: $.Data.id - - inJsonPath: $.propertyId - outJsonPath: $.Data.propertyId - - inJsonPath: $.surveyId - outJsonPath: $.Data.surveyId - - inJsonPath: $.linkedProperties - outJsonPath: $.Data.linkedProperties - - inJsonPath: $.tenantId - outJsonPath: $.Data.tenantId - - inJsonPath: $.accountId - outJsonPath: $.Data.accountId - - inJsonPath: $.oldPropertyId - outJsonPath: $.Data.oldPropertyId - - inJsonPath: $.status - outJsonPath: $.Data.status - - inJsonPath: $.@timestamp - outJsonPath: $.Data.@timestamp - externalUriMapping: - - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search - queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId - apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", - "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} - uriResponseMapping: - - inJsonPath: $.TenantBoundary[0].boundary[0] - outJsonPath: $.Data.ward - - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search - queryParam: businessIds=$.acknowldgementNumber,history=true,tenantId=$.tenantId - apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} - uriResponseMapping: - - inJsonPath: $.ProcessInstances - outJsonPath: $.Data.history - mdmsMapping: - - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search - moduleName: tenant - masterName: tenants - tenantId: pb - filter: "[?(@.code == $tenant)]" - filterMapping: - - variable: $tenant - valueJsonpath: $.tenantId - uriResponseMapping: - - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.Data.tenantData - - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search - moduleName: PropertyTax - masterName: UsageCategory - tenantId: pb - filter: "[?(@.code == $usageCategory)]" - filterMapping: - - variable: $usageCategory - valueJsonpath: $.usageCategory - uriResponseMapping: - - inJsonPath: $.MdmsRes.PropertyTax.UsageCategory[0].name - outJsonPath: $.Data.usageCategory - - - name: property-application - type: general - id: $.propertyId,$.acknowldgementNumber,$.tenantId - jsonPath: $.Property - timeStampField: $.auditDetails.lastModifiedTime - customJsonMapping: - indexMapping: {"Data":{"acknowldgementNumber":"","creationReason":"","auditDetails":{},"propertyId":"","tenantId":"","accountId":"","status":"","@timestamp":""}} - fieldMapping: - - inJsonPath: $.acknowldgementNumber - outJsonPath: $.Data.acknowldgementNumber - - inJsonPath: $.creationReason - outJsonPath: $.Data.creationReason - - inJsonPath: $.auditDetails - outJsonPath: $.Data.auditDetails - - inJsonPath: $.propertyId - outJsonPath: $.Data.propertyId - - inJsonPath: $.tenantId - outJsonPath: $.Data.tenantId - - inJsonPath: $.accountId - outJsonPath: $.Data.accountId - - inJsonPath: $.status - outJsonPath: $.Data.status - - inJsonPath: $.@timestamp - outJsonPath: $.Data.@timestamp - externalUriMapping: - - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search - queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId - apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", - "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} - uriResponseMapping: - - inJsonPath: $.TenantBoundary[0].boundary[0] - outJsonPath: $.Data.ward - - inJsonPath: $.TenantBoundary[0].boundary[0].children - outJsonPath: $.Data.ward.children - filter: "[?(@.code == $locality)]" - filterMapping: - - variable: $locality - valueJsonpath: $.address.locality.code - - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search - queryParam: businessIds=$.acknowldgementNumber,history=true,tenantId=$.tenantId - apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} - uriResponseMapping: - - inJsonPath: $.ProcessInstances - outJsonPath: $.Data.history - mdmsMapping: - - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search - moduleName: PropertyTax - masterName: UsageCategory - tenantId: pb - filter: "[?(@.code == $usageCategory)]" - filterMapping: - - variable: $usageCategory - valueJsonpath: $.usageCategory - uriResponseMapping: - - inJsonPath: $.MdmsRes.PropertyTax.UsageCategory[0].name - outJsonPath: $.Data.usageCategory - - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search - moduleName: tenant - masterName: tenants - tenantId: pb - filter: "[?(@.code == $tenant)]" - filterMapping: - - variable: $tenant - valueJsonpath: $.tenantId - uriResponseMapping: - - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.Data.tenantData - - - - - - topic: update-property-registry - configKey: INDEX - indexes: - - name: property-services - type: general - id: $.propertyId,$.tenantId - jsonPath: $.Property - timeStampField: $.auditDetails.lastModifiedTime - customJsonMapping: - indexMapping: {"Data":{"owners":[],"acknowldgementNumber":"","propertyType":"","ownershipCategory":"","creationReason":"","usageCategory":"","noOfFloors":"","landArea":"","superBuiltUpArea":"","source":"","channel":"","units":{},"auditDetails":{},"id":"","propertyId":"","surveyId":"","linkedProperties":{},"tenantId":"","accountId":"","oldPropertyId":"","status":"","@timestamp":"timestamp"}} - fieldMapping: - - inJsonPath: $.owners.*.uuid - outJsonPath: $.Data.owners - - inJsonPath: $.acknowldgementNumber - outJsonPath: $.Data.acknowldgementNumber - - inJsonPath: $.propertyType - outJsonPath: $.Data.propertyType - - inJsonPath: $.ownershipCategory - outJsonPath: $.Data.ownershipCategory - - inJsonPath: $.creationReason - outJsonPath: $.Data.creationReason - - inJsonPath: $.usageCategory - outJsonPath: $.Data.usageCategory - - inJsonPath: $.noOfFloors - outJsonPath: $.Data.noOfFloors - - inJsonPath: $.landArea - outJsonPath: $.Data.landArea - - inJsonPath: $.superBuiltUpArea - outJsonPath: $.Data.superBuiltUpArea - - inJsonPath: $.source - outJsonPath: $.Data.source - - inJsonPath: $.channel - outJsonPath: $.Data.channel - - inJsonPath: $.units - outJsonPath: $.Data.units - - inJsonPath: $.auditDetails - outJsonPath: $.Data.auditDetails - - inJsonPath: $.id - outJsonPath: $.Data.id - - inJsonPath: $.propertyId - outJsonPath: $.Data.propertyId - - inJsonPath: $.surveyId - outJsonPath: $.Data.surveyId - - inJsonPath: $.linkedProperties - outJsonPath: $.Data.linkedProperties - - inJsonPath: $.tenantId - outJsonPath: $.Data.tenantId - - inJsonPath: $.accountId - outJsonPath: $.Data.accountId - - inJsonPath: $.oldPropertyId - outJsonPath: $.Data.oldPropertyId - - inJsonPath: $.status - outJsonPath: $.Data.status - - inJsonPath: $.@timestamp - outJsonPath: $.Data.@timestamp - externalUriMapping: - - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search - queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId - apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", - "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} - uriResponseMapping: - - inJsonPath: $.TenantBoundary[0].boundary[0] - outJsonPath: $.Data.ward - - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search - queryParam: businessIds=$.acknowldgementNumber,history=true,tenantId=$.tenantId - apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} - uriResponseMapping: - - inJsonPath: $.ProcessInstances - outJsonPath: $.Data.history - mdmsMapping: - - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search - moduleName: tenant - masterName: tenants - tenantId: pb - filter: "[?(@.code == $tenant)]" - filterMapping: - - variable: $tenant - valueJsonpath: $.tenantId - uriResponseMapping: - - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.Data.tenantData - - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search - moduleName: PropertyTax - masterName: UsageCategory - tenantId: pb - filter: "[?(@.code == $usageCategory)]" - filterMapping: - - variable: $usageCategory - valueJsonpath: $.usageCategory - uriResponseMapping: - - inJsonPath: $.MdmsRes.PropertyTax.UsageCategory[0].name - outJsonPath: $.Data.usageCategory - - - name: property-application - type: general - id: $.propertyId,$.acknowldgementNumber,$.tenantId - jsonPath: $.Property - timeStampField: $.auditDetails.lastModifiedTime - customJsonMapping: - indexMapping: {"Data":{"acknowldgementNumber":"","creationReason":"","auditDetails":{},"propertyId":"","tenantId":"","accountId":"","status":"","@timestamp":""}} - fieldMapping: - - inJsonPath: $.acknowldgementNumber - outJsonPath: $.Data.acknowldgementNumber - - inJsonPath: $.creationReason - outJsonPath: $.Data.creationReason - - inJsonPath: $.auditDetails - outJsonPath: $.Data.auditDetails - - inJsonPath: $.propertyId - outJsonPath: $.Data.propertyId - - inJsonPath: $.tenantId - outJsonPath: $.Data.tenantId - - inJsonPath: $.accountId - outJsonPath: $.Data.accountId - - inJsonPath: $.status - outJsonPath: $.Data.status - - inJsonPath: $.@timestamp - outJsonPath: $.Data.@timestamp - externalUriMapping: - - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search - queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId - apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", - "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} - uriResponseMapping: - - inJsonPath: $.TenantBoundary[0].boundary[0] - outJsonPath: $.Data.ward - - inJsonPath: $.TenantBoundary[0].boundary[0].children - outJsonPath: $.Data.ward.children - filter: "[?(@.code == $locality)]" - filterMapping: - - variable: $locality - valueJsonpath: $.address.locality.code - - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search - queryParam: businessIds=$.acknowldgementNumber,history=true,tenantId=$.tenantId - apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} - uriResponseMapping: - - inJsonPath: $.ProcessInstances - outJsonPath: $.Data.history - mdmsMapping: - - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search - moduleName: tenant - masterName: tenants - tenantId: pb - filter: "[?(@.code == $tenant)]" - filterMapping: - - variable: $tenant - valueJsonpath: $.tenantId - uriResponseMapping: - - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.Data.tenantData - - - topic: cancel-property-registry - configKey: INDEX - indexes: - - name: property-services - type: general - id: $.propertyId,$.tenantId - jsonPath: $.Property - timeStampField: $.auditDetails.lastModifiedTime - customJsonMapping: - indexMapping: {"Data":{"owners":[],"acknowldgementNumber":"","propertyType":"","ownershipCategory":"","creationReason":"","usageCategory":"","noOfFloors":"","landArea":"","superBuiltUpArea":"","source":"","channel":"","units":{},"auditDetails":{},"id":"","propertyId":"","surveyId":"","linkedProperties":{},"tenantId":"","accountId":"","oldPropertyId":"","status":"","@timestamp":"timestamp"}} - fieldMapping: - - inJsonPath: $.owners.*.uuid - outJsonPath: $.Data.owners - - inJsonPath: $.acknowldgementNumber - outJsonPath: $.Data.acknowldgementNumber - - inJsonPath: $.propertyType - outJsonPath: $.Data.propertyType - - inJsonPath: $.ownershipCategory - outJsonPath: $.Data.ownershipCategory - - inJsonPath: $.creationReason - outJsonPath: $.Data.creationReason - - inJsonPath: $.usageCategory - outJsonPath: $.Data.usageCategory - - inJsonPath: $.noOfFloors - outJsonPath: $.Data.noOfFloors - - inJsonPath: $.landArea - outJsonPath: $.Data.landArea - - inJsonPath: $.superBuiltUpArea - outJsonPath: $.Data.superBuiltUpArea - - inJsonPath: $.source - outJsonPath: $.Data.source - - inJsonPath: $.channel - outJsonPath: $.Data.channel - - inJsonPath: $.units - outJsonPath: $.Data.units - - inJsonPath: $.auditDetails - outJsonPath: $.Data.auditDetails - - inJsonPath: $.id - outJsonPath: $.Data.id - - inJsonPath: $.propertyId - outJsonPath: $.Data.propertyId - - inJsonPath: $.surveyId - outJsonPath: $.Data.surveyId - - inJsonPath: $.linkedProperties - outJsonPath: $.Data.linkedProperties - - inJsonPath: $.tenantId - outJsonPath: $.Data.tenantId - - inJsonPath: $.accountId - outJsonPath: $.Data.accountId - - inJsonPath: $.oldPropertyId - outJsonPath: $.Data.oldPropertyId - - inJsonPath: $.status - outJsonPath: $.Data.status - - inJsonPath: $.@timestamp - outJsonPath: $.Data.@timestamp - externalUriMapping: - - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search - queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId - apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", - "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} - uriResponseMapping: - - inJsonPath: $.TenantBoundary[0].boundary[0] - outJsonPath: $.Data.ward - - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search - queryParam: businessIds=$.acknowldgementNumber,history=true,tenantId=$.tenantId - apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} - uriResponseMapping: - - inJsonPath: $.ProcessInstances - outJsonPath: $.Data.history - mdmsMapping: - - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search - moduleName: tenant - masterName: tenants - tenantId: pb - filter: "[?(@.code == $tenant)]" - filterMapping: - - variable: $tenant - valueJsonpath: $.tenantId - uriResponseMapping: - - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.Data.tenantData - - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search - moduleName: PropertyTax - masterName: UsageCategory - tenantId: pb - filter: "[?(@.code == $usageCategory)]" - filterMapping: - - variable: $usageCategory - valueJsonpath: $.usageCategory - uriResponseMapping: - - inJsonPath: $.MdmsRes.PropertyTax.UsageCategory[0].name - outJsonPath: $.Data.usageCategory - - - name: property-application - type: general - id: $.propertyId,$.acknowldgementNumber,$.tenantId - jsonPath: $.Property - timeStampField: $.auditDetails.lastModifiedTime - customJsonMapping: - indexMapping: {"Data":{"acknowldgementNumber":"","creationReason":"","auditDetails":{},"propertyId":"","tenantId":"","accountId":"","status":"","@timestamp":""}} - fieldMapping: - - inJsonPath: $.acknowldgementNumber - outJsonPath: $.Data.acknowldgementNumber - - inJsonPath: $.creationReason - outJsonPath: $.Data.creationReason - - inJsonPath: $.auditDetails - outJsonPath: $.Data.auditDetails - - inJsonPath: $.propertyId - outJsonPath: $.Data.propertyId - - inJsonPath: $.tenantId - outJsonPath: $.Data.tenantId - - inJsonPath: $.accountId - outJsonPath: $.Data.accountId - - inJsonPath: $.status - outJsonPath: $.Data.status - - inJsonPath: $.@timestamp - outJsonPath: $.Data.@timestamp - externalUriMapping: - - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search - queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId - apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", - "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} - uriResponseMapping: - - inJsonPath: $.TenantBoundary[0].boundary[0] - outJsonPath: $.Data.ward - - inJsonPath: $.TenantBoundary[0].boundary[0].children - outJsonPath: $.Data.ward.children - filter: "[?(@.code == $locality)]" - filterMapping: - - variable: $locality - valueJsonpath: $.address.locality.code - - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search - queryParam: businessIds=$.acknowldgementNumber,history=true,tenantId=$.tenantId - apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} - uriResponseMapping: - - inJsonPath: $.ProcessInstances - outJsonPath: $.Data.history - mdmsMapping: - - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search - moduleName: tenant - masterName: tenants - tenantId: pb - filter: "[?(@.code == $tenant)]" - filterMapping: - - variable: $tenant - valueJsonpath: $.tenantId - uriResponseMapping: - - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.Data.tenantData - - - topic: property-registry-legacyIndex - configKey: LEGACYINDEX - indexes: - - name: property-services - type: general - isBulk: true - id: $.propertyId,$.tenantId - jsonPath: $.Properties.* - timeStampField: $.auditDetails.lastModifiedTime - customJsonMapping: - indexMapping: {"Data":{"owners":[],"acknowldgementNumber":"","propertyType":"","ownershipCategory":"","creationReason":"","usageCategory":"","noOfFloors":"","landArea":"","superBuiltUpArea":"","source":"","channel":"","units":{},"auditDetails":{},"id":"","propertyId":"","surveyId":"","linkedProperties":{},"tenantId":"","accountId":"","oldPropertyId":"","status":"","@timestamp":"timestamp"}} - fieldMapping: - - inJsonPath: $.owners.*.uuid - outJsonPath: $.Data.owners - - inJsonPath: $.acknowldgementNumber - outJsonPath: $.Data.acknowldgementNumber - - inJsonPath: $.propertyType - outJsonPath: $.Data.propertyType - - inJsonPath: $.ownershipCategory - outJsonPath: $.Data.ownershipCategory - - inJsonPath: $.creationReason - outJsonPath: $.Data.creationReason - - inJsonPath: $.usageCategory - outJsonPath: $.Data.usageCategory - - inJsonPath: $.noOfFloors - outJsonPath: $.Data.noOfFloors - - inJsonPath: $.landArea - outJsonPath: $.Data.landArea - - inJsonPath: $.superBuiltUpArea - outJsonPath: $.Data.superBuiltUpArea - - inJsonPath: $.source - outJsonPath: $.Data.source - - inJsonPath: $.channel - outJsonPath: $.Data.channel - - inJsonPath: $.units - outJsonPath: $.Data.units - - inJsonPath: $.auditDetails - outJsonPath: $.Data.auditDetails - - inJsonPath: $.id - outJsonPath: $.Data.id - - inJsonPath: $.propertyId - outJsonPath: $.Data.propertyId - - inJsonPath: $.surveyId - outJsonPath: $.Data.surveyId - - inJsonPath: $.linkedProperties - outJsonPath: $.Data.linkedProperties - - inJsonPath: $.tenantId - outJsonPath: $.Data.tenantId - - inJsonPath: $.accountId - outJsonPath: $.Data.accountId - - inJsonPath: $.oldPropertyId - outJsonPath: $.Data.oldPropertyId - - inJsonPath: $.status - outJsonPath: $.Data.status - - inJsonPath: $.@timestamp - outJsonPath: $.Data.@timestamp - externalUriMapping: - - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search - queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId - apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", - "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} - uriResponseMapping: - - inJsonPath: $.TenantBoundary[0].boundary[0] - outJsonPath: $.Data.ward - - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search - queryParam: businessIds=$.acknowldgementNumber,history=true,tenantId=$.tenantId - apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} - uriResponseMapping: - - inJsonPath: $.ProcessInstances - outJsonPath: $.Data.history - mdmsMapping: - - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search - moduleName: tenant - masterName: tenants - tenantId: pb - filter: "[?(@.code == $tenant)]" - filterMapping: - - variable: $tenant - valueJsonpath: $.tenantId - uriResponseMapping: - - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.Data.tenantData - - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search - moduleName: PropertyTax - masterName: UsageCategory - tenantId: pb - filter: "[?(@.code == $usageCategory)]" - filterMapping: - - variable: $usageCategory - valueJsonpath: $.usageCategory - uriResponseMapping: - - inJsonPath: $.MdmsRes.PropertyTax.UsageCategory[0].name - outJsonPath: $.Data.usageCategory - - - topic: property-application-legacyIndex - configKey: LEGACYINDEX - indexes: - - name: property-application - type: general - isBulk: true - id: $.propertyId,$.acknowldgementNumber,$.tenantId - jsonPath: $.Properties.* - timeStampField: $.auditDetails.lastModifiedTime - customJsonMapping: - indexMapping: {"Data":{"acknowldgementNumber":"","creationReason":"","auditDetails":{},"propertyId":"","tenantId":"","accountId":"","status":"","@timestamp":""}} - fieldMapping: - - inJsonPath: $.acknowldgementNumber - outJsonPath: $.Data.acknowldgementNumber - - inJsonPath: $.creationReason - outJsonPath: $.Data.creationReason - - inJsonPath: $.auditDetails - outJsonPath: $.Data.auditDetails - - inJsonPath: $.propertyId - outJsonPath: $.Data.propertyId - - inJsonPath: $.tenantId - outJsonPath: $.Data.tenantId - - inJsonPath: $.accountId - outJsonPath: $.Data.accountId - - inJsonPath: $.status - outJsonPath: $.Data.status - - inJsonPath: $.@timestamp - outJsonPath: $.Data.@timestamp - externalUriMapping: - - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search - queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId - apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", - "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} - uriResponseMapping: - - inJsonPath: $.TenantBoundary[0].boundary[0] - outJsonPath: $.Data.ward - - inJsonPath: $.TenantBoundary[0].boundary[0].children - outJsonPath: $.Data.ward.children - filter: "[?(@.code == $locality)]" - filterMapping: - - variable: $locality - valueJsonpath: $.address.locality.code - - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search - queryParam: businessIds=$.acknowldgementNumber,history=true,tenantId=$.tenantId - apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} - uriResponseMapping: - - inJsonPath: $.ProcessInstances - outJsonPath: $.Data.history - mdmsMapping: - - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search - moduleName: tenant - masterName: tenants - tenantId: pb - filter: "[?(@.code == $tenant)]" - filterMapping: - - variable: $tenant - valueJsonpath: $.tenantId - uriResponseMapping: - - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.Data.tenantData - - - topic: save-pt-assessment-batch - configKey: INDEX - indexes: - - name: property-assessments-test - type: general - id: $.assessmentNumber, $.tenantId - jsonPath: $.Assessment - timeStampField: $.auditDetails.createdTime - customJsonMapping: - indexMapping: {"Data":{"id":"","tenantId":"","additionalDetails":"","assessmentNumber":"","financialYear":"","propertyId":"","assessmentDate":"","status":"","source":"","unitUsageList":{},"channel":"","auditDetails":{},"@timestamp":"timestamp"}} - fieldMapping: - - inJsonPath: $.id - outJsonPath: $.Data.id - - inJsonPath: $.tenantId - outJsonPath: $.Data.tenantId - - inJsonPath: $.assessmentNumber - outJsonPath: $.Data.assessmentNumber - - inJsonPath: $.financialYear - outJsonPath: $.Data.financialYear - - inJsonPath: $.propertyId - outJsonPath: $.Data.propertyId - - inJsonPath: $.assessmentDate - outJsonPath: $.Data.assessmentDate - - inJsonPath: $.status - outJsonPath: $.Data.status - - inJsonPath: $.source - outJsonPath: $.Data.source - - inJsonPath: $.unitUsageList - outJsonPath: $.Data.unitUsageList - - inJsonPath: $.channel - outJsonPath: $.Data.channel - - inJsonPath: $.auditDetails - outJsonPath: $.Data.auditDetails - - inJsonPath: $.additionalDetails - outJsonPath: $.Data.additionalDetails - - inJsonPath: $.@timestamp - outJsonPath: $.Data.@timestamp - - - topic: update-pt-assessment - configKey: INDEX - indexes: - - name: property-assessments - type: general - id: $.assessmentNumber, $.tenantId - jsonPath: $.Assessment - timeStampField: $.auditDetails.createdTime - customJsonMapping: - indexMapping: {"Data":{"id":"","tenantId":"","additionalDetails":"","assessmentNumber":"","financialYear":"","propertyId":"","assessmentDate":"","status":"","source":"","unitUsageList":{},"channel":"","auditDetails":{},"@timestamp":"timestamp"}} - fieldMapping: - - inJsonPath: $.id - outJsonPath: $.Data.id - - inJsonPath: $.tenantId - outJsonPath: $.Data.tenantId - - inJsonPath: $.assessmentNumber - outJsonPath: $.Data.assessmentNumber - - inJsonPath: $.financialYear - outJsonPath: $.Data.financialYear - - inJsonPath: $.propertyId - outJsonPath: $.Data.propertyId - - inJsonPath: $.assessmentDate - outJsonPath: $.Data.assessmentDate - - inJsonPath: $.status - outJsonPath: $.Data.status - - inJsonPath: $.source - outJsonPath: $.Data.source - - inJsonPath: $.unitUsageList - outJsonPath: $.Data.unitUsageList - - inJsonPath: $.channel - outJsonPath: $.Data.channel - - inJsonPath: $.auditDetails - outJsonPath: $.Data.auditDetails - - inJsonPath: $.additionalDetails - outJsonPath: $.Data.additionalDetails - - inJsonPath: $.@timestamp - outJsonPath: $.Data.@timestamp - - - topic: cancel-property-assessment - configKey: INDEX - indexes: - - name: property-assessments - type: general - id: $.assessmentNumber, $.tenantId - jsonPath: $.Assessment - timeStampField: $.auditDetails.createdTime - customJsonMapping: - indexMapping: {"Data":{"id":"","tenantId":"","additionalDetails":"","assessmentNumber":"","financialYear":"","propertyId":"","assessmentDate":"","status":"","source":"","unitUsageList":{},"channel":"","auditDetails":{},"@timestamp":"timestamp"}} - fieldMapping: - - inJsonPath: $.id - outJsonPath: $.Data.id - - inJsonPath: $.tenantId - outJsonPath: $.Data.tenantId - - inJsonPath: $.assessmentNumber - outJsonPath: $.Data.assessmentNumber - - inJsonPath: $.financialYear - outJsonPath: $.Data.financialYear - - inJsonPath: $.propertyId - outJsonPath: $.Data.propertyId - - inJsonPath: $.assessmentDate - outJsonPath: $.Data.assessmentDate - - inJsonPath: $.status - outJsonPath: $.Data.status - - inJsonPath: $.source - outJsonPath: $.Data.source - - inJsonPath: $.unitUsageList - outJsonPath: $.Data.unitUsageList - - inJsonPath: $.channel - outJsonPath: $.Data.channel - - inJsonPath: $.auditDetails - outJsonPath: $.Data.auditDetails - - inJsonPath: $.additionalDetails - outJsonPath: $.Data.additionalDetails - - inJsonPath: $.@timestamp - outJsonPath: $.Data.@timestamp - - - topic: pt-assessment-legacyIndex - configKey: LEGACYINDEX - indexes: - - name: property-assessments - type: general - id: $.assessmentNumber, $.tenantId - jsonPath: $.Assessments.* - isBulk: true - timeStampField: $.auditDetails.createdTime - customJsonMapping: - indexMapping: {"Data":{"id":"","tenantId":"","additionalDetails":"","assessmentNumber":"","financialYear":"","propertyId":"","assessmentDate":"","status":"","source":"","unitUsageList":{},"channel":"","auditDetails":{},"@timestamp":"timestamp"}} - fieldMapping: - - inJsonPath: $.id - outJsonPath: $.Data.id - - inJsonPath: $.tenantId - outJsonPath: $.Data.tenantId - - inJsonPath: $.assessmentNumber - outJsonPath: $.Data.assessmentNumber - - inJsonPath: $.financialYear - outJsonPath: $.Data.financialYear - - inJsonPath: $.propertyId - outJsonPath: $.Data.propertyId - - inJsonPath: $.assessmentDate - outJsonPath: $.Data.assessmentDate - - inJsonPath: $.status - outJsonPath: $.Data.status - - inJsonPath: $.source - outJsonPath: $.Data.source - - inJsonPath: $.unitUsageList - outJsonPath: $.Data.unitUsageList - - inJsonPath: $.channel - outJsonPath: $.Data.channel - - inJsonPath: $.auditDetails - outJsonPath: $.Data.auditDetails - - inJsonPath: $.additionalDetails - outJsonPath: $.Data.additionalDetails - - inJsonPath: $.@timestamp - outJsonPath: $.Data.@timestamp diff --git a/configs/egov-indexer/property-services-migration.yml b/configs/egov-indexer/property-services-migration.yml deleted file mode 100644 index dc720213..00000000 --- a/configs/egov-indexer/property-services-migration.yml +++ /dev/null @@ -1,134 +0,0 @@ -ServiceMaps: - serviceName: Property Tax - rainmaker - version: 1.0.0 - mappings: - - topic: save-property-registry-batch - configKey: INDEX - indexes: - - name: property-services - type: general - id: $.propertyId,$.tenantId - jsonPath: $.Property - timeStampField: $.auditDetails.lastModifiedTime - customJsonMapping: - indexMapping: {"Data":{"owners":[],"acknowldgementNumber":"","propertyType":"","ownershipCategory":"","creationReason":"","usageCategory":"","noOfFloors":"","landArea":"","superBuiltUpArea":"","source":"","channel":"","units":{},"auditDetails":{},"id":"","propertyId":"","surveyId":"","linkedProperties":{},"tenantId":"","accountId":"","oldPropertyId":"","status":"","@timestamp":"timestamp"}} - fieldMapping: - - inJsonPath: $.owners.*.uuid - outJsonPath: $.Data.owners - - inJsonPath: $.acknowldgementNumber - outJsonPath: $.Data.acknowldgementNumber - - inJsonPath: $.propertyType - outJsonPath: $.Data.propertyType - - inJsonPath: $.ownershipCategory - outJsonPath: $.Data.ownershipCategory - - inJsonPath: $.creationReason - outJsonPath: $.Data.creationReason - - inJsonPath: $.usageCategory - outJsonPath: $.Data.usageCategory - - inJsonPath: $.noOfFloors - outJsonPath: $.Data.noOfFloors - - inJsonPath: $.landArea - outJsonPath: $.Data.landArea - - inJsonPath: $.superBuiltUpArea - outJsonPath: $.Data.superBuiltUpArea - - inJsonPath: $.source - outJsonPath: $.Data.source - - inJsonPath: $.channel - outJsonPath: $.Data.channel - - inJsonPath: $.units - outJsonPath: $.Data.units - - inJsonPath: $.auditDetails - outJsonPath: $.Data.auditDetails - - inJsonPath: $.id - outJsonPath: $.Data.id - - inJsonPath: $.propertyId - outJsonPath: $.Data.propertyId - - inJsonPath: $.surveyId - outJsonPath: $.Data.surveyId - - inJsonPath: $.linkedProperties - outJsonPath: $.Data.linkedProperties - - inJsonPath: $.tenantId - outJsonPath: $.Data.tenantId - - inJsonPath: $.accountId - outJsonPath: $.Data.accountId - - inJsonPath: $.oldPropertyId - outJsonPath: $.Data.oldPropertyId - - inJsonPath: $.status - outJsonPath: $.Data.status - - inJsonPath: $.@timestamp - outJsonPath: $.Data.@timestamp - externalUriMapping: - - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search - queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId - apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", - "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} - uriResponseMapping: - - inJsonPath: $.TenantBoundary[0].boundary[0] - outJsonPath: $.Data.ward - - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search - queryParam: businessIds=$.acknowldgementNumber,history=true,tenantId=$.tenantId - apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} - uriResponseMapping: - - inJsonPath: $.ProcessInstances - outJsonPath: $.Data.history - mdmsMapping: - - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search - moduleName: tenant - masterName: tenants - tenantId: pb - filter: "[?(@.code == $tenant)]" - filterMapping: - - variable: $tenant - valueJsonpath: $.tenantId - uriResponseMapping: - - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.Data.tenantData - - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search - moduleName: PropertyTax - masterName: UsageCategory - tenantId: pb - filter: "[?(@.code == $usageCategory)]" - filterMapping: - - variable: $usageCategory - valueJsonpath: $.usageCategory - uriResponseMapping: - - inJsonPath: $.MdmsRes.PropertyTax.UsageCategory[0].name - outJsonPath: $.Data.usageCategory - - - topic: save-pt-assessment-batch - configKey: INDEX - indexes: - - name: property-assessments - type: general - id: $.assessmentNumber, $.tenantId - jsonPath: $.Assessment - timeStampField: $.auditDetails.createdTime - customJsonMapping: - indexMapping: {"Data":{"id":"","tenantId":"","additionalDetails":"","assessmentNumber":"","financialYear":"","propertyId":"","assessmentDate":"","status":"","source":"","unitUsageList":{},"channel":"","auditDetails":{},"@timestamp":"timestamp"}} - fieldMapping: - - inJsonPath: $.id - outJsonPath: $.Data.id - - inJsonPath: $.tenantId - outJsonPath: $.Data.tenantId - - inJsonPath: $.assessmentNumber - outJsonPath: $.Data.assessmentNumber - - inJsonPath: $.financialYear - outJsonPath: $.Data.financialYear - - inJsonPath: $.propertyId - outJsonPath: $.Data.propertyId - - inJsonPath: $.assessmentDate - outJsonPath: $.Data.assessmentDate - - inJsonPath: $.status - outJsonPath: $.Data.status - - inJsonPath: $.source - outJsonPath: $.Data.source - - inJsonPath: $.unitUsageList - outJsonPath: $.Data.unitUsageList - - inJsonPath: $.channel - outJsonPath: $.Data.channel - - inJsonPath: $.auditDetails - outJsonPath: $.Data.auditDetails - - inJsonPath: $.additionalDetails - outJsonPath: $.Data.additionalDetails - - inJsonPath: $.@timestamp - outJsonPath: $.Data.@timestamp diff --git a/configs/egov-indexer/property-services.yml b/configs/egov-indexer/property-services.yml deleted file mode 100644 index 81748ee0..00000000 --- a/configs/egov-indexer/property-services.yml +++ /dev/null @@ -1,861 +0,0 @@ -ServiceMaps: - serviceName: Property Tax - rainmaker - version: 1.0.0 - mappings: - - topic: save-property-registry - configKey: INDEX - indexes: - - name: property-services - type: general - id: $.propertyId,$.tenantId - jsonPath: $.Property - timeStampField: $.auditDetails.lastModifiedTime - customJsonMapping: - indexMapping: {"Data":{"ownerNames":[],"doorNo":"","street":"","owners":[],"acknowldgementNumber":"","propertyType":"","ownershipCategory":"","creationReason":"","usageCategory":"","noOfFloors":"","landArea":"","superBuiltUpArea":"","source":"","channel":"","units":{},"auditDetails":{},"id":"","propertyId":"","surveyId":"","linkedProperties":{},"tenantId":"","accountId":"","oldPropertyId":"","status":"","@timestamp":"timestamp"}} - fieldMapping: - - inJsonPath: $.owners[*][?(@.status=='ACTIVE')].name - outJsonPath: $.Data.ownerNames - - inJsonPath: $.address.doorNo - outJsonPath: $.Data.doorNo - - inJsonPath: $.address.street - outJsonPath: $.Data.street - - inJsonPath: $.owners.*.uuid - outJsonPath: $.Data.owners - - inJsonPath: $.acknowldgementNumber - outJsonPath: $.Data.acknowldgementNumber - - inJsonPath: $.propertyType - outJsonPath: $.Data.propertyType - - inJsonPath: $.ownershipCategory - outJsonPath: $.Data.ownershipCategory - - inJsonPath: $.creationReason - outJsonPath: $.Data.creationReason - - inJsonPath: $.usageCategory - outJsonPath: $.Data.usageCategory - - inJsonPath: $.noOfFloors - outJsonPath: $.Data.noOfFloors - - inJsonPath: $.landArea - outJsonPath: $.Data.landArea - - inJsonPath: $.superBuiltUpArea - outJsonPath: $.Data.superBuiltUpArea - - inJsonPath: $.source - outJsonPath: $.Data.source - - inJsonPath: $.channel - outJsonPath: $.Data.channel - - inJsonPath: $.units - outJsonPath: $.Data.units - - inJsonPath: $.auditDetails - outJsonPath: $.Data.auditDetails - - inJsonPath: $.id - outJsonPath: $.Data.id - - inJsonPath: $.propertyId - outJsonPath: $.Data.propertyId - - inJsonPath: $.surveyId - outJsonPath: $.Data.surveyId - - inJsonPath: $.linkedProperties - outJsonPath: $.Data.linkedProperties - - inJsonPath: $.tenantId - outJsonPath: $.Data.tenantId - - inJsonPath: $.accountId - outJsonPath: $.Data.accountId - - inJsonPath: $.oldPropertyId - outJsonPath: $.Data.oldPropertyId - - inJsonPath: $.status - outJsonPath: $.Data.status - - inJsonPath: $.@timestamp - outJsonPath: $.Data.@timestamp - externalUriMapping: - - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search - queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId - apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", - "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} - uriResponseMapping: - - inJsonPath: $.TenantBoundary[0].boundary[0] - outJsonPath: $.Data.ward - - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search - queryParam: businessIds=$.acknowldgementNumber,history=true,tenantId=$.tenantId - apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} - uriResponseMapping: - - inJsonPath: $.ProcessInstances - outJsonPath: $.Data.history - mdmsMapping: - - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search - moduleName: tenant - masterName: tenants - tenantId: pb - filter: "[?(@.code == $tenant)]" - filterMapping: - - variable: $tenant - valueJsonpath: $.tenantId - uriResponseMapping: - - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.Data.tenantData - - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search - moduleName: PropertyTax - masterName: UsageCategory - tenantId: pb - filter: "[?(@.code == $usageCategory)]" - filterMapping: - - variable: $usageCategory - valueJsonpath: $.usageCategory - uriResponseMapping: - - inJsonPath: $.MdmsRes.PropertyTax.UsageCategory[0].name - outJsonPath: $.Data.usageCategory - - - name: property-application - type: general - id: $.propertyId,$.acknowldgementNumber,$.tenantId - jsonPath: $.Property - timeStampField: $.auditDetails.lastModifiedTime - customJsonMapping: - indexMapping: {"Data":{"acknowldgementNumber":"","creationReason":"","auditDetails":{},"propertyId":"","tenantId":"","accountId":"","status":"","@timestamp":""}} - fieldMapping: - - inJsonPath: $.acknowldgementNumber - outJsonPath: $.Data.acknowldgementNumber - - inJsonPath: $.creationReason - outJsonPath: $.Data.creationReason - - inJsonPath: $.auditDetails - outJsonPath: $.Data.auditDetails - - inJsonPath: $.propertyId - outJsonPath: $.Data.propertyId - - inJsonPath: $.tenantId - outJsonPath: $.Data.tenantId - - inJsonPath: $.accountId - outJsonPath: $.Data.accountId - - inJsonPath: $.status - outJsonPath: $.Data.status - - inJsonPath: $.@timestamp - outJsonPath: $.Data.@timestamp - externalUriMapping: - - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search - queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId - apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", - "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} - uriResponseMapping: - - inJsonPath: $.TenantBoundary[0].boundary[0] - outJsonPath: $.Data.ward - - inJsonPath: $.TenantBoundary[0].boundary[0].children - outJsonPath: $.Data.ward.children - filter: "[?(@.code == $locality)]" - filterMapping: - - variable: $locality - valueJsonpath: $.address.locality.code - - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search - queryParam: businessIds=$.acknowldgementNumber,history=true,tenantId=$.tenantId - apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} - uriResponseMapping: - - inJsonPath: $.ProcessInstances - outJsonPath: $.Data.history - mdmsMapping: - - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search - moduleName: tenant - masterName: tenants - tenantId: pb - filter: "[?(@.code == $tenant)]" - filterMapping: - - variable: $tenant - valueJsonpath: $.tenantId - uriResponseMapping: - - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.Data.tenantData - - - topic: update-property-registry - configKey: INDEX - indexes: - - name: property-services - type: general - id: $.propertyId,$.tenantId - jsonPath: $.Property - timeStampField: $.auditDetails.lastModifiedTime - customJsonMapping: - indexMapping: {"Data":{"ownerNames":[],"doorNo":"","street":"","owners":[],"acknowldgementNumber":"","propertyType":"","ownershipCategory":"","creationReason":"","usageCategory":"","noOfFloors":"","landArea":"","superBuiltUpArea":"","source":"","channel":"","units":{},"auditDetails":{},"id":"","propertyId":"","surveyId":"","linkedProperties":{},"tenantId":"","accountId":"","oldPropertyId":"","status":"","@timestamp":"timestamp"}} - fieldMapping: - - inJsonPath: $.owners[*][?(@.status=='ACTIVE')].name - outJsonPath: $.Data.ownerNames - - inJsonPath: $.address.doorNo - outJsonPath: $.Data.doorNo - - inJsonPath: $.address.street - outJsonPath: $.Data.street - - inJsonPath: $.owners.*.uuid - outJsonPath: $.Data.owners - - inJsonPath: $.acknowldgementNumber - outJsonPath: $.Data.acknowldgementNumber - - inJsonPath: $.propertyType - outJsonPath: $.Data.propertyType - - inJsonPath: $.ownershipCategory - outJsonPath: $.Data.ownershipCategory - - inJsonPath: $.creationReason - outJsonPath: $.Data.creationReason - - inJsonPath: $.usageCategory - outJsonPath: $.Data.usageCategory - - inJsonPath: $.noOfFloors - outJsonPath: $.Data.noOfFloors - - inJsonPath: $.landArea - outJsonPath: $.Data.landArea - - inJsonPath: $.superBuiltUpArea - outJsonPath: $.Data.superBuiltUpArea - - inJsonPath: $.source - outJsonPath: $.Data.source - - inJsonPath: $.channel - outJsonPath: $.Data.channel - - inJsonPath: $.units - outJsonPath: $.Data.units - - inJsonPath: $.auditDetails - outJsonPath: $.Data.auditDetails - - inJsonPath: $.id - outJsonPath: $.Data.id - - inJsonPath: $.propertyId - outJsonPath: $.Data.propertyId - - inJsonPath: $.surveyId - outJsonPath: $.Data.surveyId - - inJsonPath: $.linkedProperties - outJsonPath: $.Data.linkedProperties - - inJsonPath: $.tenantId - outJsonPath: $.Data.tenantId - - inJsonPath: $.accountId - outJsonPath: $.Data.accountId - - inJsonPath: $.oldPropertyId - outJsonPath: $.Data.oldPropertyId - - inJsonPath: $.status - outJsonPath: $.Data.status - - inJsonPath: $.@timestamp - outJsonPath: $.Data.@timestamp - externalUriMapping: - - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search - queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId - apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", - "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} - uriResponseMapping: - - inJsonPath: $.TenantBoundary[0].boundary[0] - outJsonPath: $.Data.ward - - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search - queryParam: businessIds=$.acknowldgementNumber,history=true,tenantId=$.tenantId - apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} - uriResponseMapping: - - inJsonPath: $.ProcessInstances - outJsonPath: $.Data.history - mdmsMapping: - - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search - moduleName: tenant - masterName: tenants - tenantId: pb - filter: "[?(@.code == $tenant)]" - filterMapping: - - variable: $tenant - valueJsonpath: $.tenantId - uriResponseMapping: - - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.Data.tenantData - - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search - moduleName: PropertyTax - masterName: UsageCategory - tenantId: pb - filter: "[?(@.code == $usageCategory)]" - filterMapping: - - variable: $usageCategory - valueJsonpath: $.usageCategory - uriResponseMapping: - - inJsonPath: $.MdmsRes.PropertyTax.UsageCategory[0].name - outJsonPath: $.Data.usageCategory - - - name: property-application - type: general - id: $.propertyId,$.acknowldgementNumber,$.tenantId - jsonPath: $.Property - timeStampField: $.auditDetails.lastModifiedTime - customJsonMapping: - indexMapping: {"Data":{"acknowldgementNumber":"","creationReason":"","auditDetails":{},"propertyId":"","tenantId":"","accountId":"","status":"","@timestamp":""}} - fieldMapping: - - inJsonPath: $.acknowldgementNumber - outJsonPath: $.Data.acknowldgementNumber - - inJsonPath: $.creationReason - outJsonPath: $.Data.creationReason - - inJsonPath: $.auditDetails - outJsonPath: $.Data.auditDetails - - inJsonPath: $.propertyId - outJsonPath: $.Data.propertyId - - inJsonPath: $.tenantId - outJsonPath: $.Data.tenantId - - inJsonPath: $.accountId - outJsonPath: $.Data.accountId - - inJsonPath: $.status - outJsonPath: $.Data.status - - inJsonPath: $.@timestamp - outJsonPath: $.Data.@timestamp - externalUriMapping: - - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search - queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId - apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", - "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} - uriResponseMapping: - - inJsonPath: $.TenantBoundary[0].boundary[0] - outJsonPath: $.Data.ward - - inJsonPath: $.TenantBoundary[0].boundary[0].children - outJsonPath: $.Data.ward.children - filter: "[?(@.code == $locality)]" - filterMapping: - - variable: $locality - valueJsonpath: $.address.locality.code - - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search - queryParam: businessIds=$.acknowldgementNumber,history=true,tenantId=$.tenantId - apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} - uriResponseMapping: - - inJsonPath: $.ProcessInstances - outJsonPath: $.Data.history - mdmsMapping: - - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search - moduleName: tenant - masterName: tenants - tenantId: pb - filter: "[?(@.code == $tenant)]" - filterMapping: - - variable: $tenant - valueJsonpath: $.tenantId - uriResponseMapping: - - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.Data.tenantData - - - topic: cancel-property-registry - configKey: INDEX - indexes: - - name: property-services - type: general - id: $.propertyId,$.tenantId - jsonPath: $.Property - timeStampField: $.auditDetails.lastModifiedTime - customJsonMapping: - indexMapping: {"Data":{"owners":[],"acknowldgementNumber":"","propertyType":"","ownershipCategory":"","creationReason":"","usageCategory":"","noOfFloors":"","landArea":"","superBuiltUpArea":"","source":"","channel":"","units":{},"auditDetails":{},"id":"","propertyId":"","surveyId":"","linkedProperties":{},"tenantId":"","accountId":"","oldPropertyId":"","status":"","@timestamp":"timestamp"}} - fieldMapping: - - inJsonPath: $.owners.*.uuid - outJsonPath: $.Data.owners - - inJsonPath: $.acknowldgementNumber - outJsonPath: $.Data.acknowldgementNumber - - inJsonPath: $.propertyType - outJsonPath: $.Data.propertyType - - inJsonPath: $.ownershipCategory - outJsonPath: $.Data.ownershipCategory - - inJsonPath: $.creationReason - outJsonPath: $.Data.creationReason - - inJsonPath: $.usageCategory - outJsonPath: $.Data.usageCategory - - inJsonPath: $.noOfFloors - outJsonPath: $.Data.noOfFloors - - inJsonPath: $.landArea - outJsonPath: $.Data.landArea - - inJsonPath: $.superBuiltUpArea - outJsonPath: $.Data.superBuiltUpArea - - inJsonPath: $.source - outJsonPath: $.Data.source - - inJsonPath: $.channel - outJsonPath: $.Data.channel - - inJsonPath: $.units - outJsonPath: $.Data.units - - inJsonPath: $.auditDetails - outJsonPath: $.Data.auditDetails - - inJsonPath: $.id - outJsonPath: $.Data.id - - inJsonPath: $.propertyId - outJsonPath: $.Data.propertyId - - inJsonPath: $.surveyId - outJsonPath: $.Data.surveyId - - inJsonPath: $.linkedProperties - outJsonPath: $.Data.linkedProperties - - inJsonPath: $.tenantId - outJsonPath: $.Data.tenantId - - inJsonPath: $.accountId - outJsonPath: $.Data.accountId - - inJsonPath: $.oldPropertyId - outJsonPath: $.Data.oldPropertyId - - inJsonPath: $.status - outJsonPath: $.Data.status - - inJsonPath: $.@timestamp - outJsonPath: $.Data.@timestamp - externalUriMapping: - - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search - queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId - apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", - "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} - uriResponseMapping: - - inJsonPath: $.TenantBoundary[0].boundary[0] - outJsonPath: $.Data.ward - - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search - queryParam: businessIds=$.acknowldgementNumber,history=true,tenantId=$.tenantId - apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} - uriResponseMapping: - - inJsonPath: $.ProcessInstances - outJsonPath: $.Data.history - mdmsMapping: - - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search - moduleName: tenant - masterName: tenants - tenantId: pb - filter: "[?(@.code == $tenant)]" - filterMapping: - - variable: $tenant - valueJsonpath: $.tenantId - uriResponseMapping: - - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.Data.tenantData - - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search - moduleName: PropertyTax - masterName: UsageCategory - tenantId: pb - filter: "[?(@.code == $usageCategory)]" - filterMapping: - - variable: $usageCategory - valueJsonpath: $.usageCategory - uriResponseMapping: - - inJsonPath: $.MdmsRes.PropertyTax.UsageCategory[0].name - outJsonPath: $.Data.usageCategory - - - name: property-application - type: general - id: $.propertyId,$.acknowldgementNumber,$.tenantId - jsonPath: $.Property - timeStampField: $.auditDetails.lastModifiedTime - customJsonMapping: - indexMapping: {"Data":{"acknowldgementNumber":"","creationReason":"","auditDetails":{},"propertyId":"","tenantId":"","accountId":"","status":"","@timestamp":""}} - fieldMapping: - - inJsonPath: $.acknowldgementNumber - outJsonPath: $.Data.acknowldgementNumber - - inJsonPath: $.creationReason - outJsonPath: $.Data.creationReason - - inJsonPath: $.auditDetails - outJsonPath: $.Data.auditDetails - - inJsonPath: $.propertyId - outJsonPath: $.Data.propertyId - - inJsonPath: $.tenantId - outJsonPath: $.Data.tenantId - - inJsonPath: $.accountId - outJsonPath: $.Data.accountId - - inJsonPath: $.status - outJsonPath: $.Data.status - - inJsonPath: $.@timestamp - outJsonPath: $.Data.@timestamp - externalUriMapping: - - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search - queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId - apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", - "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} - uriResponseMapping: - - inJsonPath: $.TenantBoundary[0].boundary[0] - outJsonPath: $.Data.ward - - inJsonPath: $.TenantBoundary[0].boundary[0].children - outJsonPath: $.Data.ward.children - filter: "[?(@.code == $locality)]" - filterMapping: - - variable: $locality - valueJsonpath: $.address.locality.code - - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search - queryParam: businessIds=$.acknowldgementNumber,history=true,tenantId=$.tenantId - apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} - uriResponseMapping: - - inJsonPath: $.ProcessInstances - outJsonPath: $.Data.history - mdmsMapping: - - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search - moduleName: tenant - masterName: tenants - tenantId: pb - filter: "[?(@.code == $tenant)]" - filterMapping: - - variable: $tenant - valueJsonpath: $.tenantId - uriResponseMapping: - - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.Data.tenantData - - - topic: property-registry-legacyIndex - configKey: LEGACYINDEX - indexes: - - name: property-services - type: general - isBulk: true - id: $.propertyId,$.tenantId - jsonPath: $.Properties.* - timeStampField: $.auditDetails.lastModifiedTime - customJsonMapping: - indexMapping: {"Data":{"ownerNames":[],"doorNo":"","street":"","owners":[],"acknowldgementNumber":"","propertyType":"","ownershipCategory":"","creationReason":"","usageCategory":"","noOfFloors":"","landArea":"","superBuiltUpArea":"","source":"","channel":"","units":{},"auditDetails":{},"id":"","propertyId":"","surveyId":"","linkedProperties":{},"tenantId":"","accountId":"","oldPropertyId":"","status":"","@timestamp":"timestamp"}} - fieldMapping: - - inJsonPath: $.owners.*.name - outJsonPath: $.Data.ownerNames - - inJsonPath: $.address.doorNo - outJsonPath: $.Data.doorNo - - inJsonPath: $.address.street - outJsonPath: $.Data.street - - inJsonPath: $.owners.*.uuid - outJsonPath: $.Data.owners - - inJsonPath: $.acknowldgementNumber - outJsonPath: $.Data.acknowldgementNumber - - inJsonPath: $.propertyType - outJsonPath: $.Data.propertyType - - inJsonPath: $.ownershipCategory - outJsonPath: $.Data.ownershipCategory - - inJsonPath: $.creationReason - outJsonPath: $.Data.creationReason - - inJsonPath: $.usageCategory - outJsonPath: $.Data.usageCategory - - inJsonPath: $.noOfFloors - outJsonPath: $.Data.noOfFloors - - inJsonPath: $.landArea - outJsonPath: $.Data.landArea - - inJsonPath: $.superBuiltUpArea - outJsonPath: $.Data.superBuiltUpArea - - inJsonPath: $.source - outJsonPath: $.Data.source - - inJsonPath: $.channel - outJsonPath: $.Data.channel - - inJsonPath: $.units - outJsonPath: $.Data.units - - inJsonPath: $.auditDetails - outJsonPath: $.Data.auditDetails - - inJsonPath: $.id - outJsonPath: $.Data.id - - inJsonPath: $.propertyId - outJsonPath: $.Data.propertyId - - inJsonPath: $.surveyId - outJsonPath: $.Data.surveyId - - inJsonPath: $.linkedProperties - outJsonPath: $.Data.linkedProperties - - inJsonPath: $.tenantId - outJsonPath: $.Data.tenantId - - inJsonPath: $.accountId - outJsonPath: $.Data.accountId - - inJsonPath: $.oldPropertyId - outJsonPath: $.Data.oldPropertyId - - inJsonPath: $.status - outJsonPath: $.Data.status - - inJsonPath: $.@timestamp - outJsonPath: $.Data.@timestamp - externalUriMapping: - - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search - queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId - apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", - "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} - uriResponseMapping: - - inJsonPath: $.TenantBoundary[0].boundary[0] - outJsonPath: $.Data.ward - - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search - queryParam: businessIds=$.acknowldgementNumber,history=true,tenantId=$.tenantId - apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} - uriResponseMapping: - - inJsonPath: $.ProcessInstances - outJsonPath: $.Data.history - mdmsMapping: - - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search - moduleName: tenant - masterName: tenants - tenantId: pb - filter: "[?(@.code == $tenant)]" - filterMapping: - - variable: $tenant - valueJsonpath: $.tenantId - uriResponseMapping: - - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.Data.tenantData - - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search - moduleName: PropertyTax - masterName: UsageCategory - tenantId: pb - filter: "[?(@.code == $usageCategory)]" - filterMapping: - - variable: $usageCategory - valueJsonpath: $.usageCategory - uriResponseMapping: - - inJsonPath: $.MdmsRes.PropertyTax.UsageCategory[0].name - outJsonPath: $.Data.usageCategory - - - topic: property-application-legacyIndex - configKey: LEGACYINDEX - indexes: - - name: property-application - type: general - isBulk: true - id: $.propertyId,$.acknowldgementNumber,$.tenantId - jsonPath: $.Properties.* - timeStampField: $.auditDetails.lastModifiedTime - customJsonMapping: - indexMapping: {"Data":{"acknowldgementNumber":"","creationReason":"","auditDetails":{},"propertyId":"","tenantId":"","accountId":"","status":"","@timestamp":""}} - fieldMapping: - - inJsonPath: $.acknowldgementNumber - outJsonPath: $.Data.acknowldgementNumber - - inJsonPath: $.creationReason - outJsonPath: $.Data.creationReason - - inJsonPath: $.auditDetails - outJsonPath: $.Data.auditDetails - - inJsonPath: $.propertyId - outJsonPath: $.Data.propertyId - - inJsonPath: $.tenantId - outJsonPath: $.Data.tenantId - - inJsonPath: $.accountId - outJsonPath: $.Data.accountId - - inJsonPath: $.status - outJsonPath: $.Data.status - - inJsonPath: $.@timestamp - outJsonPath: $.Data.@timestamp - externalUriMapping: - - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search - queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId - apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", - "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} - uriResponseMapping: - - inJsonPath: $.TenantBoundary[0].boundary[0] - outJsonPath: $.Data.ward - - inJsonPath: $.TenantBoundary[0].boundary[0].children - outJsonPath: $.Data.ward.children - filter: "[?(@.code == $locality)]" - filterMapping: - - variable: $locality - valueJsonpath: $.address.locality.code - - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search - queryParam: businessIds=$.acknowldgementNumber,history=true,tenantId=$.tenantId - apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} - uriResponseMapping: - - inJsonPath: $.ProcessInstances - outJsonPath: $.Data.history - mdmsMapping: - - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search - moduleName: tenant - masterName: tenants - tenantId: pb - filter: "[?(@.code == $tenant)]" - filterMapping: - - variable: $tenant - valueJsonpath: $.tenantId - uriResponseMapping: - - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.Data.tenantData - - - topic: save-pt-assessment - configKey: INDEX - indexes: - - name: property-assessments - type: general - id: $.assessmentNumber, $.tenantId - jsonPath: $.Assessment - timeStampField: $.auditDetails.createdTime - customJsonMapping: - indexMapping: {"Data":{"id":"","tenantId":"","additionalDetails":"","assessmentNumber":"","financialYear":"","propertyId":"","assessmentDate":"","status":"","source":"","unitUsageList":{},"channel":"","auditDetails":{},"@timestamp":"timestamp"}} - fieldMapping: - - inJsonPath: $.id - outJsonPath: $.Data.id - - inJsonPath: $.tenantId - outJsonPath: $.Data.tenantId - - inJsonPath: $.assessmentNumber - outJsonPath: $.Data.assessmentNumber - - inJsonPath: $.financialYear - outJsonPath: $.Data.financialYear - - inJsonPath: $.propertyId - outJsonPath: $.Data.propertyId - - inJsonPath: $.assessmentDate - outJsonPath: $.Data.assessmentDate - - inJsonPath: $.status - outJsonPath: $.Data.status - - inJsonPath: $.source - outJsonPath: $.Data.source - - inJsonPath: $.unitUsageList - outJsonPath: $.Data.unitUsageList - - inJsonPath: $.channel - outJsonPath: $.Data.channel - - inJsonPath: $.auditDetails - outJsonPath: $.Data.auditDetails - - inJsonPath: $.additionalDetails - outJsonPath: $.Data.additionalDetails - - inJsonPath: $.@timestamp - outJsonPath: $.Data.@timestamp - externalUriMapping: - - path: http://property-services.egov:8080/property-services/property/_search - queryParam: propertyIds=$.propertyId,tenantId=$.tenantId - apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} - uriResponseMapping: - - inJsonPath: $.Properties[0].address - outJsonPath: $.Data.ward - mdmsMapping: - - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search - moduleName: tenant - masterName: tenants - tenantId: pb - filter: "[?(@.code == $tenant)]" - filterMapping: - - variable: $tenant - valueJsonpath: $.tenantId - uriResponseMapping: - - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.Data.tenantData - - topic: update-pt-assessment - configKey: INDEX - indexes: - - name: property-assessments - type: general - id: $.assessmentNumber, $.tenantId - jsonPath: $.Assessment - timeStampField: $.auditDetails.createdTime - customJsonMapping: - indexMapping: {"Data":{"id":"","tenantId":"","additionalDetails":"","assessmentNumber":"","financialYear":"","propertyId":"","assessmentDate":"","status":"","source":"","unitUsageList":{},"channel":"","auditDetails":{},"@timestamp":"timestamp"}} - fieldMapping: - - inJsonPath: $.id - outJsonPath: $.Data.id - - inJsonPath: $.tenantId - outJsonPath: $.Data.tenantId - - inJsonPath: $.assessmentNumber - outJsonPath: $.Data.assessmentNumber - - inJsonPath: $.financialYear - outJsonPath: $.Data.financialYear - - inJsonPath: $.propertyId - outJsonPath: $.Data.propertyId - - inJsonPath: $.assessmentDate - outJsonPath: $.Data.assessmentDate - - inJsonPath: $.status - outJsonPath: $.Data.status - - inJsonPath: $.source - outJsonPath: $.Data.source - - inJsonPath: $.unitUsageList - outJsonPath: $.Data.unitUsageList - - inJsonPath: $.channel - outJsonPath: $.Data.channel - - inJsonPath: $.auditDetails - outJsonPath: $.Data.auditDetails - - inJsonPath: $.additionalDetails - outJsonPath: $.Data.additionalDetails - - inJsonPath: $.@timestamp - outJsonPath: $.Data.@timestamp - externalUriMapping: - - path: http://property-services.egov:8080/property-services/property/_search - queryParam: propertyIds=$.propertyId,tenantId=$.tenantId - apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} - uriResponseMapping: - - inJsonPath: $.Properties[0].address - outJsonPath: $.Data.ward - mdmsMapping: - - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search - moduleName: tenant - masterName: tenants - tenantId: pb - filter: "[?(@.code == $tenant)]" - filterMapping: - - variable: $tenant - valueJsonpath: $.tenantId - uriResponseMapping: - - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.Data.tenantData - - - topic: cancel-property-assessment - configKey: INDEX - indexes: - - name: property-assessments - type: general - id: $.assessmentNumber, $.tenantId - jsonPath: $.Assessment - timeStampField: $.auditDetails.createdTime - customJsonMapping: - indexMapping: {"Data":{"id":"","tenantId":"","additionalDetails":"","assessmentNumber":"","financialYear":"","propertyId":"","assessmentDate":"","status":"","source":"","unitUsageList":{},"channel":"","auditDetails":{},"@timestamp":"timestamp"}} - fieldMapping: - - inJsonPath: $.id - outJsonPath: $.Data.id - - inJsonPath: $.tenantId - outJsonPath: $.Data.tenantId - - inJsonPath: $.assessmentNumber - outJsonPath: $.Data.assessmentNumber - - inJsonPath: $.financialYear - outJsonPath: $.Data.financialYear - - inJsonPath: $.propertyId - outJsonPath: $.Data.propertyId - - inJsonPath: $.assessmentDate - outJsonPath: $.Data.assessmentDate - - inJsonPath: $.status - outJsonPath: $.Data.status - - inJsonPath: $.source - outJsonPath: $.Data.source - - inJsonPath: $.unitUsageList - outJsonPath: $.Data.unitUsageList - - inJsonPath: $.channel - outJsonPath: $.Data.channel - - inJsonPath: $.auditDetails - outJsonPath: $.Data.auditDetails - - inJsonPath: $.additionalDetails - outJsonPath: $.Data.additionalDetails - - inJsonPath: $.@timestamp - outJsonPath: $.Data.@timestamp - externalUriMapping: - - path: http://property-services.egov:8080/property-services/property/_search - queryParam: propertyIds=$.propertyId,tenantId=$.tenantId - apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","userInfo": {"id": 23299,"uuid": "e721639b-c095-40b3-86e2-acecb2cb6efb","userName": "9337682030","name": "Abhilash Seth","type": "EMPLOYEE","mobileNumber": "9337682030","emailId": "abhilash.seth@gmail.com","roles": [{"id": 281,"name": "Employee"}]},"roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} - uriResponseMapping: - - inJsonPath: $.Properties[0].address - outJsonPath: $.Data.ward - mdmsMapping: - - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search - moduleName: tenant - masterName: tenants - tenantId: pb - filter: "[?(@.code == $tenant)]" - filterMapping: - - variable: $tenant - valueJsonpath: $.tenantId - uriResponseMapping: - - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.Data.tenantData - - - topic: pt-assessment-legacyIndex - configKey: LEGACYINDEX - indexes: - - name: property-assessments - type: general - id: $.assessmentNumber, $.tenantId - jsonPath: $.Assessments.* - isBulk: true - timeStampField: $.auditDetails.createdTime - customJsonMapping: - indexMapping: {"Data":{"id":"","tenantId":"","additionalDetails":"","assessmentNumber":"","financialYear":"","propertyId":"","assessmentDate":"","status":"","source":"","unitUsageList":{},"channel":"","auditDetails":{},"@timestamp":"timestamp"}} - fieldMapping: - - inJsonPath: $.id - outJsonPath: $.Data.id - - inJsonPath: $.tenantId - outJsonPath: $.Data.tenantId - - inJsonPath: $.assessmentNumber - outJsonPath: $.Data.assessmentNumber - - inJsonPath: $.financialYear - outJsonPath: $.Data.financialYear - - inJsonPath: $.propertyId - outJsonPath: $.Data.propertyId - - inJsonPath: $.assessmentDate - outJsonPath: $.Data.assessmentDate - - inJsonPath: $.status - outJsonPath: $.Data.status - - inJsonPath: $.source - outJsonPath: $.Data.source - - inJsonPath: $.unitUsageList - outJsonPath: $.Data.unitUsageList - - inJsonPath: $.channel - outJsonPath: $.Data.channel - - inJsonPath: $.auditDetails - outJsonPath: $.Data.auditDetails - - inJsonPath: $.additionalDetails - outJsonPath: $.Data.additionalDetails - - inJsonPath: $.@timestamp - outJsonPath: $.Data.@timestamp - externalUriMapping: - - path: http://property-services.egov:8080/property-services/property/_search - queryParam: propertyIds=$.propertyId,tenantId=$.tenantId - apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pg.citya","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pg.citya"}]}}} - uriResponseMapping: - - inJsonPath: $.Properties[0].address - outJsonPath: $.Data.ward - - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search - queryParam: businessIds=$.applicationNo,history=true,tenantId=$.tenantId - apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} - uriResponseMapping: - - inJsonPath: $.ProcessInstances - outJsonPath: $.Data.history - mdmsMapping: - - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search - moduleName: tenant - masterName: tenants - tenantId: pb - filter: "[?(@.code == $tenant)]" - filterMapping: - - variable: $tenant - valueJsonpath: $.tenantId - uriResponseMapping: - - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.Data.tenantData - diff --git a/configs/egov-indexer/rainmaker-bpastakeholder-indexer.yml b/configs/egov-indexer/rainmaker-bpastakeholder-indexer.yml deleted file mode 100644 index 14faf199..00000000 --- a/configs/egov-indexer/rainmaker-bpastakeholder-indexer.yml +++ /dev/null @@ -1,24 +0,0 @@ -ServiceMaps: - serviceName: BPA - rainmaker - version: 1.0.0 - mappings: - - topic: save-tl-tradelicense - configKey: INDEX - indexes: - - name: bpastakeholderindex-v1 - type: stakeholder - id: $.id, $.tenantId - isBulk: true - jsonPath: $.Licenses - timeStampField: $.auditDetails.createdTime - fieldsToBeMasked: ["$.tradeLicenseDetail.owners[0].userName","$.tradeLicenseDetail.owners[0].password","$.tradeLicenseDetail.owners[0].mobileNumber","$.tradeLicenseDetail.owners[0].emailId","$.tradeLicenseDetail.owners[0].altContactNumber","$.tradeLicenseDetail.owners[0].pan","$.tradeLicenseDetail.owners[0].aadhaarNumber"] - customJsonMapping: - indexMapping: {"Data":{"owners":{},"tradeUnits": {},"@timestamp":"timestamp"}} - fieldMapping: - - inJsonPath: $.tradeLicenseDetail.owners - outJsonPath: $.Data.owners - - inJsonPath: $.tradeLicenseDetail.tradeUnits - outJsonPath: $.Data.tradeUnits - - inJsonPath: $.@timestamp - outJsonPath: $.Data.@timestamp - diff --git a/configs/egov-indexer/rainmaker-firenoc-indexer.yml b/configs/egov-indexer/rainmaker-firenoc-indexer.yml deleted file mode 100644 index 81b50012..00000000 --- a/configs/egov-indexer/rainmaker-firenoc-indexer.yml +++ /dev/null @@ -1,304 +0,0 @@ -ServiceMaps: - serviceName: Fire Noc Service - rainmaker - version: 1.0.0 - mappings: - - topic: save-fn-firenoc - configKey: INDEX - indexes: - - name: firenoc-services - type: general - id: $.id,$.tenantId - isBulk: true - jsonPath: $.FireNOCs - timeStampField: $.auditDetails.createdTime - customJsonMapping: - indexMapping: {"Data":{"channel":"","id":"","tenantId":"","fireNOCDetails":{"status":"","action":"","firestationId":"","applicationNumber":"","fireNOCType":"","buildings":[],"propertyDetails":{},"additionalDetail":{},"applicantDetails":{}},"auditDetails":{},"@timestamp":"timestamp","Department": "NA"}} - fieldMapping: - - inJsonPath: $.id - outJsonPath: $.Data.id - - inJsonPath: $.tenantId - outJsonPath: $.Data.tenantId - - inJsonPath: $.fireNOCDetails.channel - outJsonPath: $.Data.channel - - inJsonPath: $.fireNOCDetails.status - outJsonPath: $.Data.fireNOCDetails.status - - inJsonPath: $.fireNOCDetails.action - outJsonPath: $.Data.fireNOCDetails.action - - inJsonPath: $.fireNOCDetails.fireNOCType - outJsonPath: $.Data.fireNOCDetails.fireNOCType - - inJsonPath: $.fireNOCDetails.buildings - outJsonPath: $.Data.fireNOCDetails.buildings - - inJsonPath: $.fireNOCDetails.applicationNumber - outJsonPath: $.Data.fireNOCDetails.applicationNumber - - inJsonPath: $.fireNOCDetails.buildings - outJsonPath: $.Data.fireNOCDetails.buildings - - inJsonPath: $.fireNOCDetails.propertyDetails - outJsonPath: $.Data.fireNOCDetails.propertyDetails - - inJsonPath: $.fireNOCDetails.additionalDetail - outJsonPath: $.Data.fireNOCDetails.additionalDetail - - inJsonPath: $.fireNOCDetails.applicantDetails - outJsonPath: $.Data.fireNOCDetails.applicantDetails - - inJsonPath: $.fireNOCDetails.firestationId - outJsonPath: $.Data.fireNOCDetails.firestationId - - inJsonPath: $.auditDetails - outJsonPath: $.Data.auditDetails - - inJsonPath: $.@timestamp - outJsonPath: $.Data.@timestamp - externalUriMapping: - - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search - queryParam: businessIds=$.fireNOCDetails.applicationNumber,history=true,tenantId=$.tenantId - apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} - uriResponseMapping: - - inJsonPath: $.ProcessInstances - outJsonPath: $.Data.history - - path: http://egov-localization.egov:8080/localization/messages/v1/_search - queryParam: locale=en_IN,tenantId=$.tenantId,codes=$.fireNOCDetails.firestationId,module=rainmaker-noc - apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} - uriResponseMapping: - - inJsonPath: $.messages[0].message - outJsonPath: $.Data.Department - - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search - queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.fireNOCDetails.propertyDetails.address.locality.code,tenantId=$.tenantId - apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", - "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} - uriResponseMapping: - - inJsonPath: $.TenantBoundary[0].boundary[0] - outJsonPath: $.Data.ward - mdmsMapping: - - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search - moduleName: tenant - masterName: tenants - tenantId: pb - filter: "[?(@.code == $tenant)]" - filterMapping: - - variable: $tenant - valueJsonpath: $.tenantId - uriResponseMapping: - - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.Data.tenantData - - - - topic: update-fn-firenoc - configKey: INDEX - indexes: - - name: firenoc-services - type: general - id: $.id,$.tenantId - isBulk: true - jsonPath: $.FireNOCs - timeStampField: $.auditDetails.lastModifiedTime - customJsonMapping: - indexMapping: {"Data":{"channel":"","id":"","tenantId":"","fireNOCDetails":{"status":"","action":"","firestationId":"","applicationNumber":"","fireNOCType":"","buildings":[],"propertyDetails":{},"additionalDetail":{},"applicantDetails":{}},"auditDetails":{},"@timestamp":"timestamp","Department": "NA"}} - fieldMapping: - - inJsonPath: $.id - outJsonPath: $.Data.id - - inJsonPath: $.tenantId - outJsonPath: $.Data.tenantId - - inJsonPath: $.fireNOCDetails.channel - outJsonPath: $.Data.channel - - inJsonPath: $.fireNOCDetails.status - outJsonPath: $.Data.fireNOCDetails.status - - inJsonPath: $.fireNOCDetails.action - outJsonPath: $.Data.fireNOCDetails.action - - inJsonPath: $.fireNOCDetails.fireNOCType - outJsonPath: $.Data.fireNOCDetails.fireNOCType - - inJsonPath: $.fireNOCDetails.buildings - outJsonPath: $.Data.fireNOCDetails.buildings - - inJsonPath: $.fireNOCDetails.applicationNumber - outJsonPath: $.Data.fireNOCDetails.applicationNumber - - inJsonPath: $.fireNOCDetails.buildings - outJsonPath: $.Data.fireNOCDetails.buildings - - inJsonPath: $.fireNOCDetails.propertyDetails - outJsonPath: $.Data.fireNOCDetails.propertyDetails - - inJsonPath: $.fireNOCDetails.additionalDetail - outJsonPath: $.Data.fireNOCDetails.additionalDetail - - inJsonPath: $.fireNOCDetails.applicantDetails - outJsonPath: $.Data.fireNOCDetails.applicantDetails - - inJsonPath: $.fireNOCDetails.firestationId - outJsonPath: $.Data.fireNOCDetails.firestationId - - inJsonPath: $.auditDetails - outJsonPath: $.Data.auditDetails - - inJsonPath: $.@timestamp - outJsonPath: $.Data.@timestamp - externalUriMapping: - - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search - queryParam: businessIds=$.fireNOCDetails.applicationNumber,history=true,tenantId=$.tenantId - apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} - uriResponseMapping: - - inJsonPath: $.ProcessInstances - outJsonPath: $.Data.history - - path: http://egov-localization.egov:8080/localization/messages/v1/_search - queryParam: locale=en_IN,tenantId=$.tenantId,codes=$.fireNOCDetails.firestationId,module=rainmaker-noc - apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} - uriResponseMapping: - - inJsonPath: $.messages[0].message - outJsonPath: $.Data.Department - - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search - queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.fireNOCDetails.propertyDetails.address.locality.code,tenantId=$.tenantId - apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", - "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} - uriResponseMapping: - - inJsonPath: $.TenantBoundary[0].boundary[0] - outJsonPath: $.Data.ward - mdmsMapping: - - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search - moduleName: tenant - masterName: tenants - tenantId: pb - filter: "[?(@.code == $tenant)]" - filterMapping: - - variable: $tenant - valueJsonpath: $.tenantId - uriResponseMapping: - - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.Data.tenantData - - - topic: update-fn-workflow - configKey: INDEX - indexes: - - name: firenoc-services - type: general - id: $.id,$.tenantId - isBulk: true - jsonPath: $.FireNOCs - timeStampField: $.auditDetails.lastModifiedTime - customJsonMapping: - indexMapping: {"Data":{"channel":"","id":"","tenantId":"","fireNOCDetails":{"status":"","action":"","firestationId":"","applicationNumber":"","fireNOCType":"","buildings":[],"propertyDetails":{},"additionalDetail":{},"applicantDetails":{}},"auditDetails":{},"@timestamp":"timestamp","Department": "NA"}} - fieldMapping: - - inJsonPath: $.id - outJsonPath: $.Data.id - - inJsonPath: $.tenantId - outJsonPath: $.Data.tenantId - - inJsonPath: $.fireNOCDetails.channel - outJsonPath: $.Data.channel - - inJsonPath: $.fireNOCDetails.status - outJsonPath: $.Data.fireNOCDetails.status - - inJsonPath: $.fireNOCDetails.action - outJsonPath: $.Data.fireNOCDetails.action - - inJsonPath: $.fireNOCDetails.fireNOCType - outJsonPath: $.Data.fireNOCDetails.fireNOCType - - inJsonPath: $.fireNOCDetails.buildings - outJsonPath: $.Data.fireNOCDetails.buildings - - inJsonPath: $.fireNOCDetails.applicationNumber - outJsonPath: $.Data.fireNOCDetails.applicationNumber - - inJsonPath: $.fireNOCDetails.buildings - outJsonPath: $.Data.fireNOCDetails.buildings - - inJsonPath: $.fireNOCDetails.propertyDetails - outJsonPath: $.Data.fireNOCDetails.propertyDetails - - inJsonPath: $.fireNOCDetails.additionalDetail - outJsonPath: $.Data.fireNOCDetails.additionalDetail - - inJsonPath: $.fireNOCDetails.applicantDetails - outJsonPath: $.Data.fireNOCDetails.applicantDetails - - inJsonPath: $.fireNOCDetails.firestationId - outJsonPath: $.Data.fireNOCDetails.firestationId - - inJsonPath: $.auditDetails - outJsonPath: $.Data.auditDetails - - inJsonPath: $.@timestamp - outJsonPath: $.Data.@timestamp - externalUriMapping: - - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search - queryParam: businessIds=$.fireNOCDetails.applicationNumber,history=true,tenantId=$.tenantId - apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} - uriResponseMapping: - - inJsonPath: $.ProcessInstances - outJsonPath: $.Data.history - - path: http://egov-localization.egov:8080/localization/messages/v1/_search - queryParam: locale=en_IN,tenantId=$.tenantId,codes=$.fireNOCDetails.firestationId,module=rainmaker-noc - apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} - uriResponseMapping: - - inJsonPath: $.messages[0].message - outJsonPath: $.Data.Department - - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search - queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.fireNOCDetails.propertyDetails.address.locality.code,tenantId=$.tenantId - apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", - "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} - uriResponseMapping: - - inJsonPath: $.TenantBoundary[0].boundary[0] - outJsonPath: $.Data.ward - mdmsMapping: - - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search - moduleName: tenant - masterName: tenants - tenantId: pb - filter: "[?(@.code == $tenant)]" - filterMapping: - - variable: $tenant - valueJsonpath: $.tenantId - uriResponseMapping: - - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.Data.tenantData - - - topic: legacy-fn-firenoc - configKey: LEGACYINDEX - indexes: - - name: firenoc-services - type: general - id: $.id,$.tenantId - isBulk: true - jsonPath: $.FireNOCs - timeStampField: $.auditDetails.createdTime - customJsonMapping: - indexMapping: {"Data":{"channel":"","id":"","tenantId":"","fireNOCDetails":{"status":"","action":"","firestationId":"","applicationNumber":"","fireNOCType":"","buildings":[],"propertyDetails":{},"additionalDetail":{},"applicantDetails":{}},"auditDetails":{},"@timestamp":"timestamp","Department": "NA"}} - fieldMapping: - - inJsonPath: $.id - outJsonPath: $.Data.id - - inJsonPath: $.tenantId - outJsonPath: $.Data.tenantId - - inJsonPath: $.fireNOCDetails.channel - outJsonPath: $.Data.channel - - inJsonPath: $.fireNOCDetails.status - outJsonPath: $.Data.fireNOCDetails.status - - inJsonPath: $.fireNOCDetails.action - outJsonPath: $.Data.fireNOCDetails.action - - inJsonPath: $.fireNOCDetails.fireNOCType - outJsonPath: $.Data.fireNOCDetails.fireNOCType - - inJsonPath: $.fireNOCDetails.buildings - outJsonPath: $.Data.fireNOCDetails.buildings - - inJsonPath: $.fireNOCDetails.applicationNumber - outJsonPath: $.Data.fireNOCDetails.applicationNumber - - inJsonPath: $.fireNOCDetails.buildings - outJsonPath: $.Data.fireNOCDetails.buildings - - inJsonPath: $.fireNOCDetails.propertyDetails - outJsonPath: $.Data.fireNOCDetails.propertyDetails - - inJsonPath: $.fireNOCDetails.additionalDetail - outJsonPath: $.Data.fireNOCDetails.additionalDetail - - inJsonPath: $.fireNOCDetails.applicantDetails - outJsonPath: $.Data.fireNOCDetails.applicantDetails - - inJsonPath: $.fireNOCDetails.firestationId - outJsonPath: $.Data.fireNOCDetails.firestationId - - inJsonPath: $.auditDetails - outJsonPath: $.Data.auditDetails - - inJsonPath: $.@timestamp - outJsonPath: $.Data.@timestamp - externalUriMapping: - - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search - queryParam: businessIds=$.fireNOCDetails.applicationNumber,history=true,tenantId=$.tenantId - apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} - uriResponseMapping: - - inJsonPath: $.ProcessInstances - outJsonPath: $.Data.history - - path: http://egov-localization.egov:8080/localization/messages/v1/_search - queryParam: locale=en_IN,tenantId=$.tenantId,codes=$.fireNOCDetails.firestationId,module=rainmaker-noc - apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} - uriResponseMapping: - - inJsonPath: $.messages[0].message - outJsonPath: $.Data.Department - - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search - queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.fireNOCDetails.propertyDetails.address.locality.code,tenantId=$.tenantId - apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", - "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} - uriResponseMapping: - - inJsonPath: $.TenantBoundary[0].boundary[0] - outJsonPath: $.Data.ward - mdmsMapping: - - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search - moduleName: tenant - masterName: tenants - tenantId: pb - filter: "[?(@.code == $tenant)]" - filterMapping: - - variable: $tenant - valueJsonpath: $.tenantId - uriResponseMapping: - - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.Data.tenantData diff --git a/configs/egov-indexer/rainmaker-pgr-indexer.yml b/configs/egov-indexer/rainmaker-pgr-indexer.yml deleted file mode 100644 index fc587a5f..00000000 --- a/configs/egov-indexer/rainmaker-pgr-indexer.yml +++ /dev/null @@ -1,322 +0,0 @@ -ServiceMaps: - serviceName: PGR - rainmaker - version: 1.0.0 - mappings: - - - topic: save-pgr-index-service - configKey: INDEX - indexes: - - name: pgrindex-v1 - type: grievances - id: $.serviceRequestId, $.tenantId - isBulk: true - jsonPath: $.serviceRequests - timeStampField: $.auditDetails.createdTime - fieldsToBeMasked: ["$.phone", "$.citizen.mobileNumber", "$.citizen.address", "$.citizen.aadhaarNumber", "$.citizen.pan", "$.citizen.emailId", "$.citizen.password"] - customJsonMapping: - indexMapping: {"Data":{"serviceRequestId":"serviceRequestId","tenantId":"tenantId","complainCategory":"complainCategory","citizen":{},"phone":"phone","dateOfComplaint":null,"address":"","addressDetail":{},"status":"status","assignee":"assignee","gro":"gro","department":"department","complaintWard":{},"source":"source","description":"","slaHours":"slaHours","tenantData":{},"actionHistory":{},"@timestamp":"timestamp"}} - fieldMapping: - - inJsonPath: $.serviceRequestId - outJsonPath: $.Data.serviceRequestId - - inJsonPath: $.tenantId - outJsonPath: $.Data.tenantId - - inJsonPath: $.phone - outJsonPath: $.Data.phone - - inJsonPath: $.auditDetails.createdTime - outJsonPath: $.Data.dateOfComplaint - - inJsonPath: $.auditDetails - outJsonPath: $.Data.auditDetails - - inJsonPath: $.description - outJsonPath: $.Data.description - - inJsonPath: $.address - outJsonPath: $.Data.address - - inJsonPath: $.addressDetail - outJsonPath: $.Data.addressDetail - - inJsonPath: $.status - outJsonPath: $.Data.status - - inJsonPath: $.complaintCategory - outJsonPath: $.Data.complainCategory - - inJsonPath: $.source - outJsonPath: $.Data.source - - inJsonPath: $.actionHistory - outJsonPath: $.Data.actionHistory - - inJsonPath: $.citizen - outJsonPath: $.Data.citizen - - inJsonPath: $.@timestamp - outJsonPath: $.Data.@timestamp - externalUriMapping: - - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search - queryParam: hierarchyTypeCode=ADMIN,boundaryType=locality,codes=$.addressDetail.mohalla,tenantId=$.tenantId - apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", - "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} - uriResponseMapping: - - inJsonPath: $.TenantBoundary[0].boundary[0].name - outJsonPath: $.Data.addressDetail.locality - - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search - queryParam: hierarchyTypeCode=ADMIN,boundaryType=Block,codes=$.addressDetail.mohalla,tenantId=$.tenantId - apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", - "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} - uriResponseMapping: - - inJsonPath: $.TenantBoundary[0].boundary[0] - outJsonPath: $.Data.complaintWard - mdmsMapping: - - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search - moduleName: common-masters - masterName: Department - tenantId: pb - filter: "[?(@.code == $department)]" - filterMapping: - - variable: $department - valueJsonpath: $.department - uriResponseMapping: - - inJsonPath: $.MdmsRes.common-masters.Department.*.name - outJsonPath: $.Data.department - - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search - moduleName: RAINMAKER-PGR - masterName: ServiceDefs - tenantId: pb - filter: "[?((@.serviceCode == $servicecode) && (@.active == true))]" - filterMapping: - - variable: $servicecode - valueJsonpath: $.serviceCode - uriResponseMapping: - - inJsonPath: $.MdmsRes.RAINMAKER-PGR.ServiceDefs.*.slaHours - outJsonPath: $.Data.slaHours - - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search - moduleName: tenant - masterName: tenants - tenantId: pb - filter: "[?(@.code == $tenant)]" - filterMapping: - - variable: $tenant - valueJsonpath: $.tenantId - uriResponseMapping: - - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.Data.tenantData - - - - topic: update-pgr-index-service - configKey: INDEX - indexes: - - name: pgrindex-v1 - type: grievances - id: $.serviceRequestId, $.tenantId - isBulk: true - jsonPath: $.serviceRequests - timeStampField: $.auditDetails.createdTime - fieldsToBeMasked: ["$.phone", "$.citizen.mobileNumber", "$.citizen.address", "$.citizen.aadhaarNumber", "$.citizen.pan", "$.citizen.emailId", "$.citizen.password"] - customJsonMapping: - indexMapping: {"Data":{"serviceRequestId":"serviceRequestId","tenantId":"tenantId","complainCategory":"complainCategory","citizen":{},"phone":"phone","dateOfComplaint":null,"address":"","addressDetail":{},"status":"status","assignee":"assignee","gro":"gro","department":"department","complaintWard":{},"source":"source","description":"","slaHours":"slaHours","tenantData":{},"actionHistory":{},"@timestamp":"timestamp"}} - fieldMapping: - - inJsonPath: $.serviceRequestId - outJsonPath: $.Data.serviceRequestId - - inJsonPath: $.tenantId - outJsonPath: $.Data.tenantId - - inJsonPath: $.phone - outJsonPath: $.Data.phone - - inJsonPath: $.auditDetails.createdTime - outJsonPath: $.Data.dateOfComplaint - - inJsonPath: $.description - outJsonPath: $.Data.description - - inJsonPath: $.address - outJsonPath: $.Data.address - - inJsonPath: $.addressDetail - outJsonPath: $.Data.addressDetail - - inJsonPath: $.status - outJsonPath: $.Data.status - - inJsonPath: $.complaintCategory - outJsonPath: $.Data.complainCategory - - inJsonPath: $.source - outJsonPath: $.Data.source - - inJsonPath: $.actionHistory - outJsonPath: $.Data.actionHistory - - inJsonPath: $.citizen - outJsonPath: $.Data.citizen - - inJsonPath: $.@timestamp - outJsonPath: $.Data.@timestamp - externalUriMapping: - - path: http://egov-hrms.egov:8080/egov-hrms/employees/_search - queryParam: tenantId=$.tenantId,ids=$.assignee - apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", - "authToken": "750d4aa9-2436-4bc4-a8f4-3796e3bfd465","userInfo":{"id":73}}} - uriResponseMapping: - - inJsonPath: $.Employees[0].user.name - outJsonPath: $.Data.assignee - - path: http://egov-hrms.egov:8080/egov-hrms/employees/_search - queryParam: tenantId=$.tenantId,ids=$.gro - apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", - "authToken": "750d4aa9-2436-4bc4-a8f4-3796e3bfd465","userInfo":{"id":73}}} - uriResponseMapping: - - inJsonPath: $.Employees[0].user.name - outJsonPath: $.Data.gro - - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search - queryParam: hierarchyTypeCode=ADMIN,boundaryType=locality,codes=$.addressDetail.mohalla,tenantId=$.tenantId - apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", - "authToken": "750d4aa9-2436-4bc4-a8f4-3796e3bfd465","userInfo":{"id":73}}} - uriResponseMapping: - - inJsonPath: $.TenantBoundary[0].boundary[0].name - outJsonPath: $.Data.addressDetail.locality - - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search - queryParam: hierarchyTypeCode=ADMIN,boundaryType=Block,codes=$.addressDetail.mohalla,tenantId=$.tenantId - apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", - "authToken": "750d4aa9-2436-4bc4-a8f4-3796e3bfd465","userInfo":{"id":73}}} - uriResponseMapping: - - inJsonPath: $.TenantBoundary[0].boundary[0] - outJsonPath: $.Data.complaintWard - mdmsMapping: - - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search - moduleName: common-masters - masterName: Department - tenantId: pb - filter: "[?(@.code == $department)]" - filterMapping: - - variable: $department - valueJsonpath: $.department - uriResponseMapping: - - inJsonPath: $.MdmsRes.common-masters.Department.*.name - outJsonPath: $.Data.department - - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search - moduleName: RAINMAKER-PGR - masterName: ServiceDefs - tenantId: pb - filter: "[?((@.serviceCode == $servicecode) && (@.active == true))]" - filterMapping: - - variable: $servicecode - valueJsonpath: $.serviceCode - uriResponseMapping: - - inJsonPath: $.MdmsRes.RAINMAKER-PGR.ServiceDefs.*.slaHours - outJsonPath: $.Data.slaHours - - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search - moduleName: tenant - masterName: tenants - tenantId: pb - filter: "[?(@.code == $tenant)]" - filterMapping: - - variable: $tenant - valueJsonpath: $.tenantId - uriResponseMapping: - - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.Data.tenantData - - - topic: pgr-service-reindex - configKey: REINDEX - indexes: - - name: pgrreindex-v1 - type: grievances - id: $.Data.serviceRequestId, $.Data.tenantId - isBulk: true - jsonPath: $.hits - timeStampField: $.Data.auditDetails.createdTime - - - topic: pgr-service-legacyindex - configKey: LEGACYINDEX - indexes: - - name: pgrindex-v1 - type: grievances - id: $.serviceRequestId, $.tenantId - isBulk: true - jsonPath: $.serviceRequests - fieldsToBeMasked: ["$.phone", "$.citizen.mobileNumber", "$.citizen.address", "$.citizen.aadhaarNumber", "$.citizen.pan", "$.citizen.emailId", "$.citizen.password"] - timeStampField: $.auditDetails.createdTime - customJsonMapping: - indexMapping: {"Data":{"serviceRequestId":"serviceRequestId","tenantId":"tenantId","complainCategory":"complainCategory","citizen":{},"phone":"phone","dateOfComplaint":null,"address":"","addressDetail":{},"status":"status","assignee":"assignee","gro":"gro","department":"department","complaintWard":{},"source":"source","description":"","slaHours":"slaHours","tenantData":{},"actionHistory":{},"@timestamp":"timestamp"}} - fieldMapping: - - inJsonPath: $.serviceRequestId - outJsonPath: $.Data.serviceRequestId - - inJsonPath: $.tenantId - outJsonPath: $.Data.tenantId - - inJsonPath: $.phone - outJsonPath: $.Data.phone - - inJsonPath: $.auditDetails.createdTime - outJsonPath: $.Data.dateOfComplaint - - inJsonPath: $.description - outJsonPath: $.Data.description - - inJsonPath: $.address - outJsonPath: $.Data.address - - inJsonPath: $.addressDetail - outJsonPath: $.Data.addressDetail - - inJsonPath: $.status - outJsonPath: $.Data.status - - inJsonPath: $.complaintCategory - outJsonPath: $.Data.complainCategory - - inJsonPath: $.source - outJsonPath: $.Data.source - - inJsonPath: $.actionHistory - outJsonPath: $.Data.actionHistory - - inJsonPath: $.citizen - outJsonPath: $.Data.citizen - - inJsonPath: $.@timestamp - outJsonPath: $.Data.@timestamp - externalUriMapping: - - path: http://egov-hrms.egov:8080/egov-hrms/employees/_search - queryParam: tenantId=$.tenantId,id=$.assignee - apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", - "authToken": "750d4aa9-2436-4bc4-a8f4-3796e3bfd465","userInfo":{"id":73}}} - uriResponseMapping: - - inJsonPath: $.Employee[0].name - outJsonPath: $.Data.assignee - - path: http://egov-hrms.egov:8080/egov-hrms/employees/_search - queryParam: tenantId=$.tenantId,ids=$.assignee - apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", - "authToken": "750d4aa9-2436-4bc4-a8f4-3796e3bfd465","userInfo":{"id":73}}} - uriResponseMapping: - - inJsonPath: $.Employees[0].user.name - outJsonPath: $.Data.assignee - - path: http://egov-hrms.egov:8080/egov-hrms/employees/_search - queryParam: tenantId=$.tenantId,ids=$.gro - apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", - "authToken": "750d4aa9-2436-4bc4-a8f4-3796e3bfd465","userInfo":{"id":73}}} - uriResponseMapping: - - inJsonPath: $.Employees[0].user.name - outJsonPath: $.Data.gro - - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search - queryParam: hierarchyTypeCode=ADMIN,boundaryType=Block,codes=$.addressDetail.mohalla,tenantId=$.tenantId - apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", - "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} - uriResponseMapping: - - inJsonPath: $.TenantBoundary[0].boundary[0] - outJsonPath: $.Data.complaintWard - mdmsMapping: - - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search - moduleName: common-masters - masterName: Department - tenantId: pb - filter: "[?(@.code == $department)]" - filterMapping: - - variable: $department - valueJsonpath: $.department - uriResponseMapping: - - inJsonPath: $.MdmsRes.common-masters.Department.*.name - outJsonPath: $.Data.department - - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search - moduleName: RAINMAKER-PGR - masterName: ServiceDefs - tenantId: pb - filter: "[?((@.serviceCode == $servicecode) && (@.active == true))]" - filterMapping: - - variable: $servicecode - valueJsonpath: $.serviceCode - uriResponseMapping: - - inJsonPath: $.MdmsRes.RAINMAKER-PGR.ServiceDefs.*.slaHours - outJsonPath: $.Data.slaHours - - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search - moduleName: tenant - masterName: tenants - tenantId: pb - filter: "[?(@.code == $tenant)]" - filterMapping: - - variable: $tenant - valueJsonpath: $.tenantId - uriResponseMapping: - - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.Data.tenantData - - -#JOURNEY: rainmakerpgr -> pgrreindextest -> pgrreindex -> pgrnew -#configKey=INDEX: Index that currently receives live data from the services -#configKey=REINDEX: Configuration for reindexing that will be enabled only during reindexing activity. -#configKey=LEGACYINDEX: Configuration for reindexing the database to es that will be enabled only during reindexing activity. - - - -#there was custom mapping config for this index, that needs to be redesigned so has been removed for now. Take from any commit before 22/11/2018. diff --git a/configs/egov-indexer/rainmaker-pt-indexer.yml b/configs/egov-indexer/rainmaker-pt-indexer.yml deleted file mode 100644 index 83e5ae16..00000000 --- a/configs/egov-indexer/rainmaker-pt-indexer.yml +++ /dev/null @@ -1,207 +0,0 @@ -ServiceMaps: - serviceName: Property Tax - rainmaker - version: 1.0.0 - mappings: - - topic: save-pt-property - configKey: INDEX - indexes: - - name: ptindex-v1 - type: property - id: $.propertyId, $.tenantId - isBulk: true - timeStampField: $.auditDetails.createdTime - jsonPath: $.Properties.* - customJsonMapping: - indexMapping: {"Data":{"propertyId":"","tenantId":"","propertyDetails":{},"address":{},"ward":{},"tenantData":{},"@timestamp":"timestamp"}} - fieldMapping: - - inJsonPath: $.propertyId - outJsonPath: $.Data.propertyId - - inJsonPath: $.tenantId - outJsonPath: $.Data.tenantId - - inJsonPath: $.propertyDetails - outJsonPath: $.Data.propertyDetails - - inJsonPath: $.address - outJsonPath: $.Data.address - - inJsonPath: $.@timestamp - outJsonPath: $.Data.@timestamp - externalUriMapping: - - path: http://egov-location:8080/egov-location/location/v11/boundarys/_search - queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId - apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", - "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} - uriResponseMapping: - - inJsonPath: $.TenantBoundary[0].boundary[0] - outJsonPath: $.Data.ward - mdmsMapping: - - path: http://egov-mdms-service:8080/egov-mdms-service/v1/_search - moduleName: tenant - masterName: tenants - tenantId: pb - filter: "[?(@.code == $tenant)]" - filterMapping: - - variable: $tenant - valueJsonpath: $.tenantId - uriResponseMapping: - - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.Data.tenantData - - - - topic: update-pt-property - configKey: INDEX - indexes: - - name: ptindex-v1 - type: property - id: $.propertyId, $.tenantId - isBulk: true - timeStampField: $.auditDetails.createdTime - jsonPath: $.Properties.* - customJsonMapping: - indexMapping: {"Data":{"propertyId":"","tenantId":"","propertyDetails":{},"address":{},"ward":{},"tenantData":{},"@timestamp":"timestamp"}} - fieldMapping: - - inJsonPath: $.propertyId - outJsonPath: $.Data.propertyId - - inJsonPath: $.tenantId - outJsonPath: $.Data.tenantId - - inJsonPath: $.propertyDetails - outJsonPath: $.Data.propertyDetails - - inJsonPath: $.address - outJsonPath: $.Data.address - - inJsonPath: $.@timestamp - outJsonPath: $.Data.@timestamp - externalUriMapping: - - path: http://egov-location:8080/egov-location/location/v11/boundarys/_search - queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId - apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", - "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} - uriResponseMapping: - - inJsonPath: $.TenantBoundary[0].boundary[0] - outJsonPath: $.Data.ward - mdmsMapping: - - path: http://egov-mdms-service:8080/egov-mdms-service/v1/_search - moduleName: tenant - masterName: tenants - tenantId: pb - filter: "[?(@.code == $tenant)]" - filterMapping: - - variable: $tenant - valueJsonpath: $.tenantId - uriResponseMapping: - - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.Data.tenantData - - - topic: pt-property-reindex - configKey: REINDEX - indexes: - - name: ptreindex-v1 - type: property - id: $.propertyId, $.tenantId - isBulk: true - timeStampField: $.auditDetails.createdTime - jsonPath: $.hits.* - - - topic: pt-property-legacyindex - configKey: LEGACYINDEX - indexes: - - name: ptindex-v1 - type: property - id: $.propertyId, $.tenantId - isBulk: true - timeStampField: $.auditDetails.createdTime - jsonPath: $.Properties.* - customJsonMapping: - indexMapping: {"Data":{"propertyId":"","tenantId":"","propertyDetails":{},"address":{},"ward":{},"tenantData":{},"@timestamp":"timestamp"}} - fieldMapping: - - inJsonPath: $.propertyId - outJsonPath: $.Data.propertyId - - inJsonPath: $.tenantId - outJsonPath: $.Data.tenantId - - inJsonPath: $.propertyDetails - outJsonPath: $.Data.propertyDetails - - inJsonPath: $.address - outJsonPath: $.Data.address - - inJsonPath: $.@timestamp - outJsonPath: $.Data.@timestamp - externalUriMapping: - - path: http://egov-location:8080/egov-location/location/v11/boundarys/_search - queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId - apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", - "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} - uriResponseMapping: - - inJsonPath: $.TenantBoundary[0].boundary[0] - outJsonPath: $.Data.ward - mdmsMapping: - - path: http://egov-mdms-service:8080/egov-mdms-service/v1/_search - moduleName: tenant - masterName: tenants - tenantId: pb - filter: "[?(@.code == $tenant)]" - filterMapping: - - variable: $tenant - valueJsonpath: $.tenantId - uriResponseMapping: - - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.Data.tenantData - - - - topic: save-pt-property-dcb - configKey: INDEX - indexes: - - name: ptindex-dcb-v1 - type: property - id: $.propertyId, $.tenantId - isBulk: true - timeStampField: $.auditDetails.createdTime - jsonPath: $.Properties.* - customJsonMapping: - indexMapping: {"Data":{"propertyId":"","tenantId":"","propertyDetails":{},"address":{},"ward":{},"tenantData":{},"collections":{},"demands":{},"@timestamp":"timestamp"}} - fieldMapping: - - inJsonPath: $.propertyId - outJsonPath: $.Data.propertyId - - inJsonPath: $.tenantId - outJsonPath: $.Data.tenantId - - inJsonPath: $.propertyDetails - outJsonPath: $.Data.propertyDetails - - inJsonPath: $.address - outJsonPath: $.Data.address - - inJsonPath: $.@timestamp - outJsonPath: $.Data.@timestamp - externalUriMapping: - - path: http://egov-location:8080/egov-location/location/v11/boundarys/_search - queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId - apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", - "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} - uriResponseMapping: - - inJsonPath: $.TenantBoundary[0].boundary[0] - outJsonPath: $.Data.ward - - path: http://collection-services:8080/collection-services/receipts/_search - queryParam: consumerCode=$.consumerCodes - apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", - "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} - uriResponseMapping: - - inJsonPath: $.Receipt - outJsonPath: $.Data.collections - - path: http://billing-service:8080/billing-service/demand//_search - queryParam: consumerCode=$.consumerCodes,tenantId=$.propertyDetails[0].tenantId - apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", - "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} - uriResponseMapping: - - inJsonPath: $.Demands - outJsonPath: $.Data.demands - mdmsMapping: - - path: http://egov-mdms-service:8080/egov-mdms-service/v1/_search - moduleName: tenant - masterName: tenants - tenantId: pb - filter: "[?(@.code == $tenant)]" - filterMapping: - - variable: $tenant - valueJsonpath: $.tenantId - uriResponseMapping: - - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.Data.tenantData - - -#JOURNEY: rainmakerpt -> rainmakerptlegacyindex -#configKey=INDEX: Index that currently receives live data from the services -#configKey=REINDEX: Configuration for reindexing that will be enabled only during reindexing activity. -#configKey=LEGACYINDEX: Configuration for reindexing the database to es that will be enabled only during reindexing activity. diff --git a/configs/egov-indexer/rainmaker-tl-indexer.yml b/configs/egov-indexer/rainmaker-tl-indexer.yml deleted file mode 100644 index 00bf726d..00000000 --- a/configs/egov-indexer/rainmaker-tl-indexer.yml +++ /dev/null @@ -1,163 +0,0 @@ -ServiceMaps: - serviceName: Trade License - version: 1.0.0 - mappings: - - topic: save-tl-tradelicense - configKey: INDEX - indexes: - - name: tlindex-v1 - type: general - id: $.id, $.tenantId - isBulk: true - timeStampField: $.auditDetails.createdTime - jsonPath: $.Licenses - customJsonMapping: - indexMapping: {"Data":{"tradelicense":{},"ward":{},"tenantData":{}, "history":{}}} - fieldMapping: - - inJsonPath: $ - outJsonPath: $.Data.tradelicense - externalUriMapping: - - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search - queryParam: hierarchyTypeCode=REVENUE,boundaryType=locality,codes=$.tradeLicenseDetail.address.locality.code,tenantId=$.tenantId - apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} - uriResponseMapping: - - inJsonPath: $.TenantBoundary[0].boundary[0] - outJsonPath: $.Data.ward - - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search - queryParam: businessIds=$.applicationNumber,history=true,tenantId=$.tenantId - apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} - uriResponseMapping: - - inJsonPath: $.ProcessInstances - outJsonPath: $.Data.history - mdmsMapping: - - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search - moduleName: tenant - masterName: tenants - tenantId: pb - filter: "[?(@.code == $tenant)]" - filterMapping: - - variable: $tenant - valueJsonpath: $.tenantId - uriResponseMapping: - - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.Data.tenantData - - - topic: update-tl-tradelicense - configKey: INDEX - indexes: - - name: tlindex-v1 - type: general - id: $.id, $.tenantId - isBulk: true - timeStampField: $.auditDetails.createdTime - jsonPath: $.Licenses - customJsonMapping: - indexMapping: {"Data":{"tradelicense":{},"ward":{},"tenantData":{}, "history":{}}} - fieldMapping: - - inJsonPath: $ - outJsonPath: $.Data.tradelicense - externalUriMapping: - - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search - queryParam: hierarchyTypeCode=REVENUE,boundaryType=locality,codes=$.tradeLicenseDetail.address.locality.code,tenantId=$.tenantId - apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} - uriResponseMapping: - - inJsonPath: $.TenantBoundary[0].boundary[0] - outJsonPath: $.Data.ward - - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search - queryParam: businessIds=$.applicationNumber,history=true,tenantId=$.tenantId - apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} - uriResponseMapping: - - inJsonPath: $.ProcessInstances - outJsonPath: $.Data.history - mdmsMapping: - - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search - moduleName: tenant - masterName: tenants - tenantId: pb - filter: "[?(@.code == $tenant)]" - filterMapping: - - variable: $tenant - valueJsonpath: $.tenantId - uriResponseMapping: - - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.Data.tenantData - - - topic: tradelicense-legacyindex - configKey: LEGACYINDEX - indexes: - - name: tlindex-v1 - type: general - id: $.id, $.tenantId - isBulk: true - timeStampField: $.auditDetails.createdTime - jsonPath: $.Licenses - customJsonMapping: - indexMapping: {"Data":{"tradelicense":{},"ward":{},"tenantData":{}, "history":{}}} - fieldMapping: - - inJsonPath: $ - outJsonPath: $.Data.tradelicense - externalUriMapping: - - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search - queryParam: hierarchyTypeCode=REVENUE,boundaryType=locality,codes=$.tradeLicenseDetail.address.locality.code,tenantId=$.tenantId - apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} - uriResponseMapping: - - inJsonPath: $.TenantBoundary[0].boundary[0] - outJsonPath: $.Data.ward - - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search - queryParam: businessIds=$.applicationNumber,history=true,tenantId=$.tenantId - apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} - uriResponseMapping: - - inJsonPath: $.ProcessInstances - outJsonPath: $.Data.history - mdmsMapping: - - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search - moduleName: tenant - masterName: tenants - tenantId: pb - filter: "[?(@.code == $tenant)]" - filterMapping: - - variable: $tenant - valueJsonpath: $.tenantId - uriResponseMapping: - - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.Data.tenantData - - - topic: update-tl-workflow - configKey: INDEX - indexes: - - name: tlindex-v1 - type: general - id: $.id, $.tenantId - isBulk: true - timeStampField: $.auditDetails.createdTime - jsonPath: $.Licenses - customJsonMapping: - indexMapping: {"Data":{"tradelicense":{},"ward":{},"tenantData":{}, "history":{}}} - fieldMapping: - - inJsonPath: $ - outJsonPath: $.Data.tradelicense - externalUriMapping: - - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search - queryParam: hierarchyTypeCode=REVENUE,boundaryType=locality,codes=$.tradeLicenseDetail.address.locality.code,tenantId=$.tenantId - apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} - uriResponseMapping: - - inJsonPath: $.TenantBoundary[0].boundary[0] - outJsonPath: $.Data.ward - - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search - queryParam: businessIds=$.applicationNumber,history=true,tenantId=$.tenantId - apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} - uriResponseMapping: - - inJsonPath: $.ProcessInstances - outJsonPath: $.Data.history - mdmsMapping: - - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search - moduleName: tenant - masterName: tenants - tenantId: pb - filter: "[?(@.code == $tenant)]" - filterMapping: - - variable: $tenant - valueJsonpath: $.tenantId - uriResponseMapping: - - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.Data.tenantData diff --git a/configs/egov-indexer/sewerage-service.yml b/configs/egov-indexer/sewerage-service.yml deleted file mode 100644 index a6d946fb..00000000 --- a/configs/egov-indexer/sewerage-service.yml +++ /dev/null @@ -1,410 +0,0 @@ -ServiceMaps: - serviceName: Sewerage Service - rainmaker - version: 1.0.0 - mappings: - - topic: save-sw-connection - configKey: INDEX - indexes: - - name: sewerage-services - type: general - id: $.id,$.tenantId - timeStampField: $.auditDetails.createdTime - jsonPath: $.SewerageConnection - customJsonMapping: - indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","applicationStatus":"","status":"","connectionNo":"","oldConnectionNo":"","plumberInfo":[],"roadCuttingInfo":[],"connectionHolders":[],"roadType":"","roadCuttingArea":"","connectionExecutionDate":"","connectionCategory":"","connectionType":"","additionalDetails":{},"auditDetails":{},"id":"","propertyId":"","propertyUsageType":"","tenantId":"","proposedWaterClosets":"","proposedToilets":"","noOfWaterClosets":"","noOfToilets":"","applicationType":"","dateEffectiveFrom":"","channel":"","history":{}}} - fieldMapping: - - inJsonPath: $.applicationStatus.state - outJsonPath: $.Data.workflow.state - - inJsonPath: $.processInstance.action - outJsonPath: $.Data.workflow.action - - inJsonPath: $.processInstance.assignes.*.uuid - outJsonPath: $.Data.workflow.assignes - - inJsonPath: $.applicationNo - outJsonPath: $.Data.applicationNo - - inJsonPath: $.applicationStatus - outJsonPath: $.Data.applicationStatus - - inJsonPath: $.status - outJsonPath: $.Data.status - - inJsonPath: $.connectionNo - outJsonPath: $.Data.connectionNo - - inJsonPath: $.oldConnectionNo - outJsonPath: $.Data.oldConnectionNo - - inJsonPath: $.plumberInfo - outJsonPath: $.Data.plumberInfo - - inJsonPath: $.roadCuttingInfo - outJsonPath: $.Data.roadCuttingInfo - - inJsonPath: $.connectionHolders - outJsonPath: $.Data.connectionHolders - - inJsonPath: $.roadType - outJsonPath: $.Data.roadType - - inJsonPath: $.roadCuttingArea - outJsonPath: $.Data.roadCuttingArea - - inJsonPath: $.connectionExecutionDate - outJsonPath: $.Data.connectionExecutionDate - - inJsonPath: $.connectionCategory - outJsonPath: $.Data.connectionCategory - - inJsonPath: $.connectionType - outJsonPath: $.Data.connectionType - - inJsonPath: $.additionalDetails - outJsonPath: $.Data.additionalDetails - - inJsonPath: $.id - outJsonPath: $.Data.id - - inJsonPath: $.propertyId - outJsonPath: $.Data.propertyId - - inJsonPath: $.tenantId - outJsonPath: $.Data.tenantId - - inJsonPath: $.proposedWaterClosets - outJsonPath: $.Data.proposedWaterClosets - - inJsonPath: $.proposedToilets - outJsonPath: $.Data.proposedToilets - - inJsonPath: $.noOfWaterClosets - outJsonPath: $.Data.noOfWaterClosets - - inJsonPath: $.noOfToilets - outJsonPath: $.Data.noOfToilets - - inJsonPath: $.applicationType - outJsonPath: $.Data.applicationType - - inJsonPath: $.dateEffectiveFrom - outJsonPath: $.Data.dateEffectiveFrom - - inJsonPath: $.channel - outJsonPath: $.Data.channel - - inJsonPath: $.@timestamp - outJsonPath: $.Data.@timestamp - - inJsonPath: $.auditDetails - outJsonPath: $.Data.auditDetails - externalUriMapping: - - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search - queryParam: businessIds=$.applicationNo,history=true,tenantId=$.tenantId - apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} - uriResponseMapping: - - inJsonPath: $.ProcessInstances - outJsonPath: $.Data.history - - path: http://property-services.egov:8080/property-services/property/_search - queryParam: propertyIds=$.propertyId,tenantId=$.tenantId - apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} - uriResponseMapping: - - inJsonPath: $.Properties[0].usageCategory - outJsonPath: $.Data.propertyUsageType - - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search - queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.additionalDetails.locality,tenantId=$.tenantId - apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", - "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} - uriResponseMapping: - - inJsonPath: $.TenantBoundary[0].boundary[0] - outJsonPath: $.Data.ward - mdmsMapping: - - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search - moduleName: tenant - masterName: tenants - tenantId: pb - filter: "[?(@.code == $tenant)]" - filterMapping: - - variable: $tenant - valueJsonpath: $.tenantId - uriResponseMapping: - - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.Data.tenantData - - - topic: update-sw-connection - configKey: INDEX - indexes: - - name: sewerage-services - type: general - id: $.id,$.tenantId - timeStampField: $.auditDetails.lastModifiedTime - jsonPath: $.SewerageConnection - customJsonMapping: - indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","applicationStatus":"","status":"","connectionNo":"","oldConnectionNo":"","plumberInfo":[],"roadCuttingInfo":[],"connectionHolders":[],"roadType":"","roadCuttingArea":"","connectionExecutionDate":"","connectionCategory":"","connectionType":"","additionalDetails":{},"auditDetails":{},"id":"","propertyId":"","propertyUsageType":"","tenantId":"","proposedWaterClosets":"","proposedToilets":"","noOfWaterClosets":"","noOfToilets":"","applicationType":"","dateEffectiveFrom":"","channel":"","@timestamp":"timestamp","history":{}}} - fieldMapping: - - inJsonPath: $.applicationStatus.state - outJsonPath: $.Data.workflow.state - - inJsonPath: $.processInstance.action - outJsonPath: $.Data.workflow.action - - inJsonPath: $.processInstance.assignes.*.uuid - outJsonPath: $.Data.workflow.assignes - - inJsonPath: $.applicationNo - outJsonPath: $.Data.applicationNo - - inJsonPath: $.applicationStatus - outJsonPath: $.Data.applicationStatus - - inJsonPath: $.status - outJsonPath: $.Data.status - - inJsonPath: $.connectionNo - outJsonPath: $.Data.connectionNo - - inJsonPath: $.oldConnectionNo - outJsonPath: $.Data.oldConnectionNo - - inJsonPath: $.plumberInfo - outJsonPath: $.Data.plumberInfo - - inJsonPath: $.roadCuttingInfo - outJsonPath: $.Data.roadCuttingInfo - - inJsonPath: $.connectionHolders - outJsonPath: $.Data.connectionHolders - - inJsonPath: $.roadType - outJsonPath: $.Data.roadType - - inJsonPath: $.roadCuttingArea - outJsonPath: $.Data.roadCuttingArea - - inJsonPath: $.connectionExecutionDate - outJsonPath: $.Data.connectionExecutionDate - - inJsonPath: $.connectionCategory - outJsonPath: $.Data.connectionCategory - - inJsonPath: $.connectionType - outJsonPath: $.Data.connectionType - - inJsonPath: $.additionalDetails - outJsonPath: $.Data.additionalDetails - - inJsonPath: $.id - outJsonPath: $.Data.id - - inJsonPath: $.propertyId - outJsonPath: $.Data.propertyId - - inJsonPath: $.tenantId - outJsonPath: $.Data.tenantId - - inJsonPath: $.proposedWaterClosets - outJsonPath: $.Data.proposedWaterClosets - - inJsonPath: $.proposedToilets - outJsonPath: $.Data.proposedToilets - - inJsonPath: $.noOfWaterClosets - outJsonPath: $.Data.noOfWaterClosets - - inJsonPath: $.noOfToilets - outJsonPath: $.Data.noOfToilets - - inJsonPath: $.applicationType - outJsonPath: $.Data.applicationType - - inJsonPath: $.dateEffectiveFrom - outJsonPath: $.Data.dateEffectiveFrom - - inJsonPath: $.channel - outJsonPath: $.Data.channel - - inJsonPath: $.@timestamp - outJsonPath: $.Data.@timestamp - - inJsonPath: $.auditDetails - outJsonPath: $.Data.auditDetails - externalUriMapping: - - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search - queryParam: businessIds=$.applicationNo,history=true,tenantId=$.tenantId - apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} - uriResponseMapping: - - inJsonPath: $.ProcessInstances - outJsonPath: $.Data.history - - path: http://property-services.egov:8080/property-services/property/_search - queryParam: propertyIds=$.propertyId,tenantId=$.tenantId - apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} - uriResponseMapping: - - inJsonPath: $.Properties[0].usageCategory - outJsonPath: $.Data.propertyUsageType - - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search - queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.additionalDetails.locality,tenantId=$.tenantId - apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", - "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} - uriResponseMapping: - - inJsonPath: $.TenantBoundary[0].boundary[0] - outJsonPath: $.Data.ward - mdmsMapping: - - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search - moduleName: tenant - masterName: tenants - tenantId: pb - filter: "[?(@.code == $tenant)]" - filterMapping: - - variable: $tenant - valueJsonpath: $.tenantId - uriResponseMapping: - - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.Data.tenantData - - - - topic: update-sw-workflow - configKey: INDEX - indexes: - - name: sewerage-services - type: general - id: $.id,$.tenantId - timeStampField: $.auditDetails.lastModifiedTime - jsonPath: $.SewerageConnection - customJsonMapping: - indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","applicationStatus":"","status":"","connectionNo":"","oldConnectionNo":"","plumberInfo":[],"roadCuttingInfo":[],"connectionHolders":[],"roadType":"","roadCuttingArea":"","connectionExecutionDate":"","connectionCategory":"","connectionType":"","additionalDetails":{},"auditDetails":{},"id":"","propertyId":"","tenantId":"","proposedWaterClosets":"","proposedToilets":"","noOfWaterClosets":"","noOfToilets":"","applicationType":"","dateEffectiveFrom":"","channel":"","@timestamp":"timestamp","history":{}}} - fieldMapping: - - inJsonPath: $.applicationStatus.state - outJsonPath: $.Data.workflow.state - - inJsonPath: $.processInstance.action - outJsonPath: $.Data.workflow.action - - inJsonPath: $.processInstance.assignes.*.uuid - outJsonPath: $.Data.workflow.assignes - - inJsonPath: $.applicationNo - outJsonPath: $.Data.applicationNo - - inJsonPath: $.applicationStatus - outJsonPath: $.Data.applicationStatus - - inJsonPath: $.status - outJsonPath: $.Data.status - - inJsonPath: $.connectionNo - outJsonPath: $.Data.connectionNo - - inJsonPath: $.oldConnectionNo - outJsonPath: $.Data.oldConnectionNo - - inJsonPath: $.plumberInfo - outJsonPath: $.Data.plumberInfo - - inJsonPath: $.roadCuttingInfo - outJsonPath: $.Data.roadCuttingInfo - - inJsonPath: $.connectionHolders - outJsonPath: $.Data.connectionHolders - - inJsonPath: $.roadType - outJsonPath: $.Data.roadType - - inJsonPath: $.roadCuttingArea - outJsonPath: $.Data.roadCuttingArea - - inJsonPath: $.connectionExecutionDate - outJsonPath: $.Data.connectionExecutionDate - - inJsonPath: $.connectionCategory - outJsonPath: $.Data.connectionCategory - - inJsonPath: $.connectionType - outJsonPath: $.Data.connectionType - - inJsonPath: $.additionalDetails - outJsonPath: $.Data.additionalDetails - - inJsonPath: $.id - outJsonPath: $.Data.id - - inJsonPath: $.propertyId - outJsonPath: $.Data.propertyId - - inJsonPath: $.tenantId - outJsonPath: $.Data.tenantId - - inJsonPath: $.proposedWaterClosets - outJsonPath: $.Data.proposedWaterClosets - - inJsonPath: $.proposedToilets - outJsonPath: $.Data.proposedToilets - - inJsonPath: $.noOfWaterClosets - outJsonPath: $.Data.noOfWaterClosets - - inJsonPath: $.noOfToilets - outJsonPath: $.Data.noOfToilets - - inJsonPath: $.applicationType - outJsonPath: $.Data.applicationType - - inJsonPath: $.dateEffectiveFrom - outJsonPath: $.Data.dateEffectiveFrom - - inJsonPath: $.channel - outJsonPath: $.Data.channel - - inJsonPath: $.auditDetails - outJsonPath: $.Data.auditDetails - externalUriMapping: - - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search - queryParam: businessIds=$.applicationNo,history=true,tenantId=$.tenantId - apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} - uriResponseMapping: - - inJsonPath: $.ProcessInstances - outJsonPath: $.Data.history - - path: http://property-services.egov:8080/property-services/property/_search - queryParam: propertyIds=$.propertyId,tenantId=$.tenantId - apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} - uriResponseMapping: - - inJsonPath: $.Properties[0].usageCategory - outJsonPath: $.Data.propertyUsageType - - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search - queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.additionalDetails.locality,tenantId=$.tenantId - apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", - "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} - uriResponseMapping: - - inJsonPath: $.TenantBoundary[0].boundary[0] - outJsonPath: $.Data.ward - mdmsMapping: - - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search - moduleName: tenant - masterName: tenants - tenantId: pb - filter: "[?(@.code == $tenant)]" - filterMapping: - - variable: $tenant - valueJsonpath: $.tenantId - uriResponseMapping: - - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.Data.tenantData - - topic: sw-services-legacyindex - configKey: LEGACYINDEX - indexes: - - name: sewerage-services - type: general - isBulk: true - id: $.id,$.tenantId - timeStampField: $.auditDetails.createdTime - jsonPath: $.SewerageConnections - customJsonMapping: - indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","applicationStatus":"","status":"","connectionNo":"","oldConnectionNo":"","plumberInfo":[],"roadCuttingInfo":[],"connectionHolders":[],"roadType":"","roadCuttingArea":"","connectionExecutionDate":"","connectionCategory":"","connectionType":"","additionalDetails":{},"auditDetails":{},"id":"","propertyId":"","propertyUsageType":"","tenantId":"","proposedWaterClosets":"","proposedToilets":"","noOfWaterClosets":"","noOfToilets":"","applicationType":"","dateEffectiveFrom":"","channel":"","history":{}}} - fieldMapping: - - inJsonPath: $.applicationStatus.state - outJsonPath: $.Data.workflow.state - - inJsonPath: $.processInstance.action - outJsonPath: $.Data.workflow.action - - inJsonPath: $.processInstance.assignes.*.uuid - outJsonPath: $.Data.workflow.assignes - - inJsonPath: $.applicationNo - outJsonPath: $.Data.applicationNo - - inJsonPath: $.applicationStatus - outJsonPath: $.Data.applicationStatus - - inJsonPath: $.status - outJsonPath: $.Data.status - - inJsonPath: $.connectionNo - outJsonPath: $.Data.connectionNo - - inJsonPath: $.oldConnectionNo - outJsonPath: $.Data.oldConnectionNo - - inJsonPath: $.plumberInfo - outJsonPath: $.Data.plumberInfo - - inJsonPath: $.roadCuttingInfo - outJsonPath: $.Data.roadCuttingInfo - - inJsonPath: $.connectionHolders - outJsonPath: $.Data.connectionHolders - - inJsonPath: $.roadType - outJsonPath: $.Data.roadType - - inJsonPath: $.roadCuttingArea - outJsonPath: $.Data.roadCuttingArea - - inJsonPath: $.connectionExecutionDate - outJsonPath: $.Data.connectionExecutionDate - - inJsonPath: $.connectionCategory - outJsonPath: $.Data.connectionCategory - - inJsonPath: $.connectionType - outJsonPath: $.Data.connectionType - - inJsonPath: $.additionalDetails - outJsonPath: $.Data.additionalDetails - - inJsonPath: $.id - outJsonPath: $.Data.id - - inJsonPath: $.propertyId - outJsonPath: $.Data.propertyId - - inJsonPath: $.tenantId - outJsonPath: $.Data.tenantId - - inJsonPath: $.proposedWaterClosets - outJsonPath: $.Data.proposedWaterClosets - - inJsonPath: $.proposedToilets - outJsonPath: $.Data.proposedToilets - - inJsonPath: $.noOfWaterClosets - outJsonPath: $.Data.noOfWaterClosets - - inJsonPath: $.noOfToilets - outJsonPath: $.Data.noOfToilets - - inJsonPath: $.applicationType - outJsonPath: $.Data.applicationType - - inJsonPath: $.dateEffectiveFrom - outJsonPath: $.Data.dateEffectiveFrom - - inJsonPath: $.channel - outJsonPath: $.Data.channel - - inJsonPath: $.@timestamp - outJsonPath: $.Data.@timestamp - - inJsonPath: $.auditDetails - outJsonPath: $.Data.auditDetails - externalUriMapping: - - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search - queryParam: businessIds=$.applicationNo,history=true,tenantId=$.tenantId - apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} - uriResponseMapping: - - inJsonPath: $.ProcessInstances - outJsonPath: $.Data.history - - path: http://property-services.egov:8080/property-services/property/_search - queryParam: propertyIds=$.propertyId,tenantId=$.tenantId - apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} - uriResponseMapping: - - inJsonPath: $.Properties[0].usageCategory - outJsonPath: $.Data.propertyUsageType - - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search - queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.additionalDetails.locality,tenantId=$.tenantId - apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", - "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} - uriResponseMapping: - - inJsonPath: $.TenantBoundary[0].boundary[0] - outJsonPath: $.Data.ward - mdmsMapping: - - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search - moduleName: tenant - masterName: tenants - tenantId: pb - filter: "[?(@.code == $tenant)]" - filterMapping: - - variable: $tenant - valueJsonpath: $.tenantId - uriResponseMapping: - - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.Data.tenantData diff --git a/configs/egov-indexer/tradelicense-indexer.yml b/configs/egov-indexer/tradelicense-indexer.yml deleted file mode 100644 index 0b836b18..00000000 --- a/configs/egov-indexer/tradelicense-indexer.yml +++ /dev/null @@ -1,21 +0,0 @@ -ServiceMaps: - serviceName: Trade License - version: 1.0.0 - mappings: - - topic: save-tl-tradelicense - configKey: INDEX - indexes: - - name: tl-index - type: tradelicenses - id: $.id, $.tenantId - isBulk: true - jsonPath: $.Licenses - - - topic: update-tl-tradelicense - configKey: INDEX - indexes: - - name: tl-index - type: tradelicenses - id: $.id, $.tenantId - isBulk: true - jsonPath: $.Licenses diff --git a/configs/egov-indexer/water-service.yml b/configs/egov-indexer/water-service.yml deleted file mode 100644 index a83eb8ce..00000000 --- a/configs/egov-indexer/water-service.yml +++ /dev/null @@ -1,444 +0,0 @@ -ServiceMaps: - serviceName: Water Service - rainmaker - version: 1.0.0 - mappings: - - topic: save-ws-connection - configKey: INDEX - indexes: - - name: water-services - type: general - id: $.id,$.tenantId - jsonPath: $.WaterConnection - timeStampField: $.auditDetails.createdTime - customJsonMapping: - indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","applicationStatus":"","status":"","connectionNo":"","oldConnectionNo":"","plumberInfo":[],"roadCuttingInfo":[],"connectionHolders":[],"roadType":"","roadCuttingArea":"","connectionExecutionDate":"","connectionCategory":"","connectionType":"","additionalDetails":{},"id":"","propertyId":"","propertyUsageType":"","rainWaterHarvesting":"","waterSource":"","tenantId":"","meterId":"","meterInstallationDate":"","proposedPipeSize":"","proposedTaps":"","pipeSize":"","noOfTaps":"","applicationType":"","dateEffectiveFrom":"","channel":"","@timestamp":"timestamp","auditDetails":{},"history":{}}} - fieldMapping: - - inJsonPath: $.applicationStatus.state - outJsonPath: $.Data.workflow.state - - inJsonPath: $.processInstance.action - outJsonPath: $.Data.workflow.action - - inJsonPath: $.processInstance.assignes.*.uuid - outJsonPath: $.Data.workflow.assignes - - inJsonPath: $.applicationNo - outJsonPath: $.Data.applicationNo - - inJsonPath: $.applicationStatus - outJsonPath: $.Data.applicationStatus - - inJsonPath: $.status - outJsonPath: $.Data.status - - inJsonPath: $.connectionNo - outJsonPath: $.Data.connectionNo - - inJsonPath: $.oldConnectionNo - outJsonPath: $.Data.oldConnectionNo - - inJsonPath: $.plumberInfo - outJsonPath: $.Data.plumberInfo - - inJsonPath: $.roadCuttingInfo - outJsonPath: $.Data.roadCuttingInfo - - inJsonPath: $.connectionHolders - outJsonPath: $.Data.connectionHolders - - inJsonPath: $.roadType - outJsonPath: $.Data.roadType - - inJsonPath: $.roadCuttingArea - outJsonPath: $.Data.roadCuttingArea - - inJsonPath: $.connectionExecutionDate - outJsonPath: $.Data.connectionExecutionDate - - inJsonPath: $.connectionCategory - outJsonPath: $.Data.connectionCategory - - inJsonPath: $.connectionType - outJsonPath: $.Data.connectionType - - inJsonPath: $.additionalDetails - outJsonPath: $.Data.additionalDetails - - inJsonPath: $.id - outJsonPath: $.Data.id - - inJsonPath: $.propertyId - outJsonPath: $.Data.propertyId - - inJsonPath: $.rainWaterHarvesting - outJsonPath: $.Data.rainWaterHarvesting - - inJsonPath: $.waterSource - outJsonPath: $.Data.waterSource - - inJsonPath: $.tenantId - outJsonPath: $.Data.tenantId - - inJsonPath: $.meterId - outJsonPath: $.Data.meterId - - inJsonPath: $.meterInstallationDate - outJsonPath: $.Data.meterInstallationDate - - inJsonPath: $.proposedPipeSize - outJsonPath: $.Data.proposedPipeSize - - inJsonPath: $.proposedTaps - outJsonPath: $.Data.proposedTaps - - inJsonPath: $.pipeSize - outJsonPath: $.Data.pipeSize - - inJsonPath: $.noOfTaps - outJsonPath: $.Data.noOfTaps - - inJsonPath: $.applicationType - outJsonPath: $.Data.applicationType - - inJsonPath: $.dateEffectiveFrom - outJsonPath: $.Data.dateEffectiveFrom - - inJsonPath: $.channel - outJsonPath: $.Data.channel - - inJsonPath: $.@timestamp - outJsonPath: $.Data.@timestamp - - inJsonPath: $.auditDetails - outJsonPath: $.Data.auditDetails - externalUriMapping: - - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search - queryParam: businessIds=$.applicationNo,history=true,tenantId=$.tenantId - apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} - uriResponseMapping: - - inJsonPath: $.ProcessInstances - outJsonPath: $.Data.history - - path: http://property-services.egov:8080/property-services/property/_search - queryParam: propertyIds=$.propertyId,tenantId=$.tenantId - apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} - uriResponseMapping: - - inJsonPath: $.Properties[0].usageCategory - outJsonPath: $.Data.propertyUsageType - - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search - queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.additionalDetails.locality,tenantId=$.tenantId - apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", - "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} - uriResponseMapping: - - inJsonPath: $.TenantBoundary[0].boundary[0] - outJsonPath: $.Data.ward - mdmsMapping: - - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search - moduleName: tenant - masterName: tenants - tenantId: pb - filter: "[?(@.code == $tenant)]" - filterMapping: - - variable: $tenant - valueJsonpath: $.tenantId - uriResponseMapping: - - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.Data.tenantData - - - - topic: update-ws-connection - configKey: INDEX - indexes: - - name: water-services - type: general - id: $.id,$.tenantId - jsonPath: $.WaterConnection - timeStampField: $.auditDetails.lastModifiedTime - customJsonMapping: - indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","applicationStatus":"","status":"","connectionNo":"","oldConnectionNo":"","plumberInfo":[],"roadCuttingInfo":[],"connectionHolders":[],"roadType":"","roadCuttingArea":"","connectionExecutionDate":"","connectionCategory":"","connectionType":"","additionalDetails":{},"id":"","propertyId":"","propertyUsageType":"","rainWaterHarvesting":"","waterSource":"","tenantId":"","meterId":"","meterInstallationDate":"","proposedPipeSize":"","proposedTaps":"","pipeSize":"","noOfTaps":"","applicationType":"","dateEffectiveFrom":"","channel":"","@timestamp":"timestamp","auditDetails":{},"history":{}}} - fieldMapping: - - inJsonPath: $.applicationStatus.state - outJsonPath: $.Data.workflow.state - - inJsonPath: $.processInstance.action - outJsonPath: $.Data.workflow.action - - inJsonPath: $.processInstance.assignes.*.uuid - outJsonPath: $.Data.workflow.assignes - - inJsonPath: $.applicationNo - outJsonPath: $.Data.applicationNo - - inJsonPath: $.applicationStatus - outJsonPath: $.Data.applicationStatus - - inJsonPath: $.status - outJsonPath: $.Data.status - - inJsonPath: $.connectionNo - outJsonPath: $.Data.connectionNo - - inJsonPath: $.oldConnectionNo - outJsonPath: $.Data.oldConnectionNo - - inJsonPath: $.plumberInfo - outJsonPath: $.Data.plumberInfo - - inJsonPath: $.roadCuttingInfo - outJsonPath: $.Data.roadCuttingInfo - - inJsonPath: $.connectionHolders - outJsonPath: $.Data.connectionHolders - - inJsonPath: $.roadType - outJsonPath: $.Data.roadType - - inJsonPath: $.roadCuttingArea - outJsonPath: $.Data.roadCuttingArea - - inJsonPath: $.connectionExecutionDate - outJsonPath: $.Data.connectionExecutionDate - - inJsonPath: $.connectionCategory - outJsonPath: $.Data.connectionCategory - - inJsonPath: $.connectionType - outJsonPath: $.Data.connectionType - - inJsonPath: $.additionalDetails - outJsonPath: $.Data.additionalDetails - - inJsonPath: $.id - outJsonPath: $.Data.id - - inJsonPath: $.propertyId - outJsonPath: $.Data.propertyId - - inJsonPath: $.rainWaterHarvesting - outJsonPath: $.Data.rainWaterHarvesting - - inJsonPath: $.waterSource - outJsonPath: $.Data.waterSource - - inJsonPath: $.tenantId - outJsonPath: $.Data.tenantId - - inJsonPath: $.meterId - outJsonPath: $.Data.meterId - - inJsonPath: $.meterInstallationDate - outJsonPath: $.Data.meterInstallationDate - - inJsonPath: $.proposedPipeSize - outJsonPath: $.Data.proposedPipeSize - - inJsonPath: $.proposedTaps - outJsonPath: $.Data.proposedTaps - - inJsonPath: $.pipeSize - outJsonPath: $.Data.pipeSize - - inJsonPath: $.noOfTaps - outJsonPath: $.Data.noOfTaps - - inJsonPath: $.applicationType - outJsonPath: $.Data.applicationType - - inJsonPath: $.dateEffectiveFrom - outJsonPath: $.Data.dateEffectiveFrom - - inJsonPath: $.channel - outJsonPath: $.Data.channel - - inJsonPath: $.@timestamp - outJsonPath: $.Data.@timestamp - - inJsonPath: $.auditDetails - outJsonPath: $.Data.auditDetails - externalUriMapping: - - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search - queryParam: businessIds=$.applicationNo,history=true,tenantId=$.tenantId - apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} - uriResponseMapping: - - inJsonPath: $.ProcessInstances - outJsonPath: $.Data.history - - path: http://property-services.egov:8080/property-services/property/_search - queryParam: propertyIds=$.propertyId,tenantId=$.tenantId - apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} - uriResponseMapping: - - inJsonPath: $.Properties[0].usageCategory - outJsonPath: $.Data.propertyUsageType - - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search - queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.additionalDetails.locality,tenantId=$.tenantId - apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", - "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} - uriResponseMapping: - - inJsonPath: $.TenantBoundary[0].boundary[0] - outJsonPath: $.Data.ward - mdmsMapping: - - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search - moduleName: tenant - masterName: tenants - tenantId: pb - filter: "[?(@.code == $tenant)]" - filterMapping: - - variable: $tenant - valueJsonpath: $.tenantId - uriResponseMapping: - - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.Data.tenantData - - - topic: update-ws-workflow - configKey: INDEX - indexes: - - name: water-services - type: general - id: $.id,$.tenantId - jsonPath: $.WaterConnection - timeStampField: $.auditDetails.lastModifiedTime - customJsonMapping: - indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","applicationStatus":"","status":"","connectionNo":"","oldConnectionNo":"","plumberInfo":[],"roadCuttingInfo":[],"connectionHolders":[],"roadType":"","roadCuttingArea":"","connectionExecutionDate":"","connectionCategory":"","connectionType":"","additionalDetails":{},"id":"","propertyId":"","rainWaterHarvesting":"","waterSource":"","tenantId":"","meterId":"","meterInstallationDate":"","proposedPipeSize":"","proposedTaps":"","pipeSize":"","noOfTaps":"","applicationType":"","dateEffectiveFrom":"","channel":"","@timestamp":"timestamp","auditDetails":{},"history":{}}} - fieldMapping: - - inJsonPath: $.applicationStatus.state - outJsonPath: $.Data.workflow.state - - inJsonPath: $.processInstance.action - outJsonPath: $.Data.workflow.action - - inJsonPath: $.processInstance.assignes.*.uuid - outJsonPath: $.Data.workflow.assignes - - inJsonPath: $.applicationNo - outJsonPath: $.Data.applicationNo - - inJsonPath: $.applicationStatus - outJsonPath: $.Data.applicationStatus - - inJsonPath: $.status - outJsonPath: $.Data.status - - inJsonPath: $.connectionNo - outJsonPath: $.Data.connectionNo - - inJsonPath: $.oldConnectionNo - outJsonPath: $.Data.oldConnectionNo - - inJsonPath: $.plumberInfo - outJsonPath: $.Data.plumberInfo - - inJsonPath: $.roadCuttingInfo - outJsonPath: $.Data.roadCuttingInfo - - inJsonPath: $.connectionHolders - outJsonPath: $.Data.connectionHolders - - inJsonPath: $.roadType - outJsonPath: $.Data.roadType - - inJsonPath: $.roadCuttingArea - outJsonPath: $.Data.roadCuttingArea - - inJsonPath: $.connectionExecutionDate - outJsonPath: $.Data.connectionExecutionDate - - inJsonPath: $.connectionCategory - outJsonPath: $.Data.connectionCategory - - inJsonPath: $.connectionType - outJsonPath: $.Data.connectionType - - inJsonPath: $.additionalDetails - outJsonPath: $.Data.additionalDetails - - inJsonPath: $.id - outJsonPath: $.Data.id - - inJsonPath: $.propertyId - outJsonPath: $.Data.propertyId - - inJsonPath: $.rainWaterHarvesting - outJsonPath: $.Data.rainWaterHarvesting - - inJsonPath: $.waterSource - outJsonPath: $.Data.waterSource - - inJsonPath: $.tenantId - outJsonPath: $.Data.tenantId - - inJsonPath: $.meterId - outJsonPath: $.Data.meterId - - inJsonPath: $.meterInstallationDate - outJsonPath: $.Data.meterInstallationDate - - inJsonPath: $.proposedPipeSize - outJsonPath: $.Data.proposedPipeSize - - inJsonPath: $.proposedTaps - outJsonPath: $.Data.proposedTaps - - inJsonPath: $.pipeSize - outJsonPath: $.Data.pipeSize - - inJsonPath: $.noOfTaps - outJsonPath: $.Data.noOfTaps - - inJsonPath: $.applicationType - outJsonPath: $.Data.applicationType - - inJsonPath: $.dateEffectiveFrom - outJsonPath: $.Data.dateEffectiveFrom - - inJsonPath: $.channel - outJsonPath: $.Data.channel - - inJsonPath: $.@timestamp - outJsonPath: $.Data.@timestamp - - inJsonPath: $.auditDetails - outJsonPath: $.Data.auditDetails - externalUriMapping: - - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search - queryParam: businessIds=$.applicationNo,history=true,tenantId=$.tenantId - apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} - uriResponseMapping: - - inJsonPath: $.ProcessInstances - outJsonPath: $.Data.history - - path: http://property-services.egov:8080/property-services/property/_search - queryParam: propertyIds=$.propertyId,tenantId=$.tenantId - apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} - uriResponseMapping: - - inJsonPath: $.Properties[0].usageCategory - outJsonPath: $.Data.propertyUsageType - - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search - queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.additionalDetails.locality,tenantId=$.tenantId - apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", - "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} - uriResponseMapping: - - inJsonPath: $.TenantBoundary[0].boundary[0] - outJsonPath: $.Data.ward - mdmsMapping: - - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search - moduleName: tenant - masterName: tenants - tenantId: pb - filter: "[?(@.code == $tenant)]" - filterMapping: - - variable: $tenant - valueJsonpath: $.tenantId - uriResponseMapping: - - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.Data.tenantData - - topic: ws-services-legacyindex - configKey: LEGACYINDEX - indexes: - - name: water-services - type: general - isBulk: true - id: $.id,$.tenantId - jsonPath: $.WaterConnection - timeStampField: $.auditDetails.createdTime - customJsonMapping: - indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","applicationStatus":"","status":"","connectionNo":"","oldConnectionNo":"","plumberInfo":[],"roadCuttingInfo":[],"connectionHolders":[],"roadType":"","roadCuttingArea":"","connectionExecutionDate":"","connectionCategory":"","connectionType":"","additionalDetails":{},"id":"","propertyId":"","propertyUsageType":"","rainWaterHarvesting":"","waterSource":"","tenantId":"","meterId":"","meterInstallationDate":"","proposedPipeSize":"","proposedTaps":"","pipeSize":"","noOfTaps":"","applicationType":"","dateEffectiveFrom":"","channel":"","@timestamp":"timestamp","auditDetails":{},"history":{}}} - fieldMapping: - - inJsonPath: $.applicationStatus.state - outJsonPath: $.Data.workflow.state - - inJsonPath: $.processInstance.action - outJsonPath: $.Data.workflow.action - - inJsonPath: $.processInstance.assignes.*.uuid - outJsonPath: $.Data.workflow.assignes - - inJsonPath: $.applicationNo - outJsonPath: $.Data.applicationNo - - inJsonPath: $.applicationStatus - outJsonPath: $.Data.applicationStatus - - inJsonPath: $.status - outJsonPath: $.Data.status - - inJsonPath: $.connectionNo - outJsonPath: $.Data.connectionNo - - inJsonPath: $.oldConnectionNo - outJsonPath: $.Data.oldConnectionNo - - inJsonPath: $.plumberInfo - outJsonPath: $.Data.plumberInfo - - inJsonPath: $.roadCuttingInfo - outJsonPath: $.Data.roadCuttingInfo - - inJsonPath: $.connectionHolders - outJsonPath: $.Data.connectionHolders - - inJsonPath: $.roadType - outJsonPath: $.Data.roadType - - inJsonPath: $.roadCuttingArea - outJsonPath: $.Data.roadCuttingArea - - inJsonPath: $.connectionExecutionDate - outJsonPath: $.Data.connectionExecutionDate - - inJsonPath: $.connectionCategory - outJsonPath: $.Data.connectionCategory - - inJsonPath: $.connectionType - outJsonPath: $.Data.connectionType - - inJsonPath: $.additionalDetails - outJsonPath: $.Data.additionalDetails - - inJsonPath: $.id - outJsonPath: $.Data.id - - inJsonPath: $.propertyId - outJsonPath: $.Data.propertyId - - inJsonPath: $.rainWaterHarvesting - outJsonPath: $.Data.rainWaterHarvesting - - inJsonPath: $.waterSource - outJsonPath: $.Data.waterSource - - inJsonPath: $.tenantId - outJsonPath: $.Data.tenantId - - inJsonPath: $.meterId - outJsonPath: $.Data.meterId - - inJsonPath: $.meterInstallationDate - outJsonPath: $.Data.meterInstallationDate - - inJsonPath: $.proposedPipeSize - outJsonPath: $.Data.proposedPipeSize - - inJsonPath: $.proposedTaps - outJsonPath: $.Data.proposedTaps - - inJsonPath: $.pipeSize - outJsonPath: $.Data.pipeSize - - inJsonPath: $.noOfTaps - outJsonPath: $.Data.noOfTaps - - inJsonPath: $.applicationType - outJsonPath: $.Data.applicationType - - inJsonPath: $.dateEffectiveFrom - outJsonPath: $.Data.dateEffectiveFrom - - inJsonPath: $.channel - outJsonPath: $.Data.channel - - inJsonPath: $.@timestamp - outJsonPath: $.Data.@timestamp - - inJsonPath: $.auditDetails - outJsonPath: $.Data.auditDetails - externalUriMapping: - - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search - queryParam: businessIds=$.applicationNo,history=true,tenantId=$.tenantId - apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} - uriResponseMapping: - - inJsonPath: $.ProcessInstances - outJsonPath: $.Data.history - - path: http://property-services.egov:8080/property-services/property/_search - queryParam: propertyIds=$.propertyId,tenantId=$.tenantId - apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} - uriResponseMapping: - - inJsonPath: $.Properties[0].usageCategory - outJsonPath: $.Data.propertyUsageType - - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search - queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.additionalDetails.locality,tenantId=$.tenantId - apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", - "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} - uriResponseMapping: - - inJsonPath: $.TenantBoundary[0].boundary[0] - outJsonPath: $.Data.ward - mdmsMapping: - - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search - moduleName: tenant - masterName: tenants - tenantId: pb - filter: "[?(@.code == $tenant)]" - filterMapping: - - variable: $tenant - valueJsonpath: $.tenantId - uriResponseMapping: - - inJsonPath: $.MdmsRes.tenant.tenants - outJsonPath: $.Data.tenantData diff --git a/configs/egov-indexer/water-services-meter.yml b/configs/egov-indexer/water-services-meter.yml deleted file mode 100644 index dd17bf31..00000000 --- a/configs/egov-indexer/water-services-meter.yml +++ /dev/null @@ -1,28 +0,0 @@ -ServiceMaps: - serviceName: Meter Connection - rainmaker - version: 1.0.0 - mappings: - - topic: save-ws-meter - configKey: INDEX - indexes: - - name: meter-services - type: general - id: $.id,$.connectionNo - jsonPath: $.meterReadings - customJsonMapping: - indexMapping: {"Data":{"connectionNo":"","meterStatus":"","currentReadingDate":"","currentReading":"","lastReading":"","billingPeriod":"","lastReadingDate":""}} - fieldMapping: - - inJsonPath: $.connectionNo - outJsonPath: $.Data.connectionNo - - inJsonPath: $.meterStatus - outJsonPath: $.Data.meterStatus - - inJsonPath: $.currentReadingDate - outJsonPath: $.Data.currentReadingDate - - inJsonPath: $.currentReading - outJsonPath: $.Data.currentReading - - inJsonPath: $.lastReading - outJsonPath: $.Data.lastReading - - inJsonPath: $.billingPeriod - outJsonPath: $.Data.billingPeriod - - inJsonPath: $.lastReadingDate - outJsonPath: $.Data.lastReadingDate diff --git a/configs/egov-indexer/whatsapp-adoption-data.yaml b/configs/egov-indexer/whatsapp-adoption-data.yaml deleted file mode 100644 index 4f7b13c0..00000000 --- a/configs/egov-indexer/whatsapp-adoption-data.yaml +++ /dev/null @@ -1,12 +0,0 @@ -ServiceMaps: - serviceName: Collection Service - version: 1.0.0 - mappings: - - topic: whatsapp-adoption-data - configKey: INDEX - indexes: - - name: whatsapp-adoption-data - type: general - id: $.id - isBulk: true - jsonPath: $.* diff --git a/configs/egov-mdms-service/mdms-masters-config.json b/configs/egov-mdms-service/mdms-masters-config.json deleted file mode 100644 index 14070c28..00000000 --- a/configs/egov-mdms-service/mdms-masters-config.json +++ /dev/null @@ -1,715 +0,0 @@ -{ - "ACCESSCONTROL-ACTIONS-TEST": { - "actions-test": { - "masterName": "actions-test", - "isStateLevel": true, - "uniqueKeys": [ - "$.id" - ] - } - }, - "ACCESSCONTROL-ROLES": { - "roles": { - "masterName": "roles", - "isStateLevel": true, - "uniqueKeys": [ - "$.code" - ] - } - }, - "ACCESSCONTROL-ROLEACTIONS": { - "roleactions": { - "masterName": "roleactions", - "uniqueKeys": [ - "$.rolecode", - "$.actionid", - "$.tenantid" - ] - } - }, - "ASSET": { - "AssetCategory": { - "masterName": "AssetCategory", - "moduleDefinition": null, - "isStateLevel": true, - "uniqueKeys": [ - "$.id", - "$.tenantId" - ] - }, - "LayerType": { - "masterName": "LayerType", - "moduleDefinition": "null", - "isStateLevel": true, - "uniqueKeys": [ - "$.name", - "$.tenantId" - ] - }, - "Assetconfiguration": { - "masterName": "Assetconfiguration", - "moduleDefinition": "null", - "isStateLevel": true, - "uniqueKeys": [ - "$.keyname", - "$.tenantId" - ] - }, - "ModeOfAcquisition": { - "masterName": "ModeOfAcquisition", - "moduleDefinition": "null", - "isStateLevel": true, - "uniqueKeys": [ - "$.code", - "$.tenantId" - ] - }, - "NewTestMaster": { - "masterName": "NewMaster", - "moduleDefinition": "null", - "isStateLevel": true, - "uniqueKeys": [ - "$.id" - ] - } - }, - "common-masters": { - "IdFormat": { - "masterName": "IdFormat", - "moduleDefinition": null, - "isStateLevel": true, - "uniqueKeys": [ - "$.idname" - ] - }, - "OwnerShipCategory": { - "masterName": "OwnerShipCategory", - "moduleDefinition": null, - "isStateLevel": true, - "uniqueKeys": [ - "$.code" - ] - }, - "OwnerType": { - "masterName": "OwnerType", - "moduleDefinition": null, - "isStateLevel": true, - "uniqueKeys": [ - "$.code" - ] - }, - "UOM": { - "masterName": "UOM", - "moduleDefinition": null, - "isStateLevel": true, - "uniqueKeys": [ - "$.code" - ] - }, - "StructureType": { - "masterName": "StructureType", - "moduleDefinition": null, - "isStateLevel": true, - "uniqueKeys": [ - "$.code" - ] - }, - "DocumentType": { - "masterName": "StructureType", - "moduleDefinition": null, - "isStateLevel": true, - "uniqueKeys": [ - "$.code" - ] - }, - "Department": { - "masterName": "Department", - "moduleDefinition": null, - "isStateLevel": true, - "uniqueKeys": [ - "$.code", - "$.tenantId" - ] - }, - "CensusYear": { - "masterName": "CensusYear", - "moduleDefinition": null, - "isStateLevel": true, - "uniqueKeys": [ - "$.code", - "$.tenantId" - ] - }, - "Designation": { - "masterName": "Designation", - "moduleDefinition": null, - "isStateLevel": true, - "uniqueKeys": [ - "$.code" - ] - } - }, - "egf-master": { - "Fund": { - "masterName": "Fund", - "moduleDefinition": null, - "isStateLevel": true, - "uniqueKeys": [ - "$.code", - "$.tenantId" - ] - }, - "FinancialYear": { - "masterName": "FinancialYear", - "moduleDefinition": null, - "isStateLevel": true, - "uniqueKeys": [ - "$.code", - "$.tenantId" - ] - } - }, - "lcms": { - "court": { - "masterName": "court", - "moduleDefinition": null, - "uniqueKeys": [ - "$.code", - "$.tenantId" - ] - }, - "side": { - "masterName": "side", - "moduleDefinition": null, - "uniqueKeys": [ - "$.code", - "$.tenantId" - ] - }, - "caseType": { - "masterName": "caseType", - "moduleDefinition": null, - "uniqueKeys": [ - "$.code", - "$.tenantId" - ] - }, - "caseCategory": { - "masterName": "caseCategory", - "moduleDefinition": null, - "uniqueKeys": [ - "$.code", - "$.tenantId" - ] - }, - "bench": { - "masterName": "bench", - "moduleDefinition": null, - "uniqueKeys": [ - "$.code", - "$.tenantId" - ] - }, - "caseStatus": { - "masterName": "caseStatus", - "moduleDefinition": null, - "uniqueKeys": [ - "$.code", - "$.tenantId" - ] - } - }, - "swm": { - "VehicleType": { - "masterName": "VehicleType", - "moduleDefinition": null, - "isStateLevel": true, - "uniqueKeys": [ - "$.code", - "$.tenantId" - ] - }, - "FuelType": { - "masterName": "FuelType", - "moduleDefinition": null, - "isStateLevel": true, - "uniqueKeys": [ - "$.code", - "$.tenantId" - ] - }, - "OilCompany": { - "masterName": "OilCompany", - "moduleDefinition": null, - "isStateLevel": true, - "uniqueKeys": [ - "$.code", - "$.tenantId" - ] - }, - "WasteType": { - "masterName": "WasteType", - "moduleDefinition": null, - "isStateLevel": true, - "uniqueKeys": [ - "$.code", - "$.tenantId" - ] - }, - "WasteSubType": { - "masterName": "WasteSubType", - "moduleDefinition": null, - "isStateLevel": true, - "uniqueKeys": [ - "$.code", - "$.tenantId" - ] - }, - "DumpingGround": { - "masterName": "DumpingGround", - "moduleDefinition": null, - "isStateLevel": true, - "uniqueKeys": [ - "$.code", - "$.tenantId" - ] - }, - "ProcessingSite": { - "masterName": "ProcessingSite", - "moduleDefinition": null, - "isStateLevel": true, - "uniqueKeys": [ - "$.code", - "$.tenantId" - ] - }, - "ShiftType": { - "masterName": "ShiftType", - "moduleDefinition": null, - "isStateLevel": true, - "uniqueKeys": [ - "$.code", - "$.tenantId" - ] - }, - "Shift": { - "masterName": "Shift", - "moduleDefinition": null, - "uniqueKeys": [ - "$.code", - "$.tenantId" - ] - }, - "CollectionType": { - "masterName": "CollectionType", - "moduleDefinition": null, - "isStateLevel": true, - "uniqueKeys": [ - "$.code", - "$.tenantId" - ] - }, - "Population": { - "masterName": "Population", - "moduleDefinition": null, - "uniqueKeys": [ - "$.code", - "$.tenantId" - ] - }, - "Toilet": { - "masterName": "Toilet", - "moduleDefinition": null, - "uniqueKeys": [ - "$.code", - "$.tenantId" - ] - }, - "ToiletType": { - "masterName": "ToiletType", - "isStateLevel": true, - "moduleDefinition": null, - "uniqueKeys": [ - "$.code", - "$.tenantId" - ] - }, - "SwmProcess": { - "masterName": "SwmProcess", - "moduleDefinition": null, - "isStateLevel": true, - "uniqueKeys": [ - "$.code", - "$.tenantId" - ] - }, - "PaymentTerms": { - "masterName": "PaymentTerms", - "moduleDefinition": null, - "isStateLevel": true, - "uniqueKeys": [ - "$.label", - "$.tenantId" - ] - } - }, - "PM": { - "KpiCategory": { - "masterName": "KpiCategory", - "moduleDefinition": null, - "isStateLevel": true, - "uniqueKeys": [ - "$.code" - ] - } - }, - "inventory": { - "Material": { - "masterName": "Material", - "isStateLevel": true, - "moduleDefinition": null, - "uniqueKeys": [ - "$.code", - "$.tenantId" - ] - }, - "MaterialType": { - "masterName": "MaterialType", - "isStateLevel": true, - "moduleDefinition": null, - "uniqueKeys": [ - "$.code", - "$.tenantId" - ] - } - }, - "tenant": { - "tenants": { - "masterName": "tenants", - "isStateLevel": true, - "moduleDefinition": null, - "uniqueKeys": [ - "$.code" - ] - }, - "citymodule": { - "masterName": "citymodule", - "isStateLevel": true, - "moduleDefinition": null, - "uniqueKeys": [ - "$.code" - ] - } - }, - "works": { - "ScheduleCategory": { - "masterName": "ScheduleCategory", - "isStateLevel": true, - "moduleDefinition": null, - "uniqueKeys": [ - "$.code", - "$.tenantId" - ] - }, - "TypeOfWork": { - "masterName": "TypeOfWork", - "isStateLevel": true, - "moduleDefinition": null, - "uniqueKeys": [ - "$.code", - "$.tenantId" - ] - }, - "Overhead": { - "masterName": "Overhead", - "isStateLevel": true, - "moduleDefinition": null, - "uniqueKeys": [ - "$.code", - "$.tenantId" - ] - }, - "ContractorClass": { - "masterName": "ContractorClass", - "isStateLevel": true, - "moduleDefinition": null, - "uniqueKeys": [ - "$.class", - "$.tenantId" - ] - }, - "BudgetGroup": { - "masterName": "BudgetGroup", - "isStateLevel": true, - "moduleDefinition": null, - "uniqueKeys": [ - "$.name", - "$.tenantId" - ] - }, - "WorksStatus": { - "masterName": "WorksStatus", - "isStateLevel": true, - "moduleDefinition": null, - "uniqueKeys": [ - "$.code", - "$.tenantId" - ] - } - }, - "RAINMAKER-PGR": { - "ServiceDefs": { - "masterName": "ServiceDefs", - "isStateLevel": true, - "uniqueKeys": [ - "$.code" - ] - } - }, - "PropertyTax": { - "ConstructionType": { - "masterName": "ConstructionType", - "isStateLevel": true, - "uniqueKeys": [ - "$.code" - ] - }, - "ConstructionSubType": { - "masterName": "ConstructionSubType", - "isStateLevel": true, - "uniqueKeys": [ - "$.code" - ] - }, - "FireCess": { - "masterName": "FireCess", - "isStateLevel": false, - "uniqueKeys": [] - }, - "Floor": { - "masterName": "Floor", - "isStateLevel": true, - "uniqueKeys": [ - "$.code" - ] - }, - "Interest": { - "masterName": "Interest", - "isStateLevel": true, - "uniqueKeys": [ - "$.fromFY" - ] - }, - "PropertyType": { - "masterName": "PropertyType", - "isStateLevel": true, - "uniqueKeys": [ - "$.code" - ] - }, - "PropertySubType": { - "masterName": "PropertySubType", - "isStateLevel": true, - "uniqueKeys": [ - "$.code" - ] - }, - "OwnerShipCategory": { - "masterName": "OwnerShipCategory", - "isStateLevel": true, - "uniqueKeys": [ - "$.code" - ] - }, - "OwnerTypeDocument": { - "masterName": "OwnerTypeDocument", - "isStateLevel": true, - "uniqueKeys": [ - "$.code" - ] - }, - "SubOwnerShipCategory": { - "masterName": "SubOwnerShipCategory", - "isStateLevel": true, - "uniqueKeys": [ - "$.code" - ] - }, - "OccupancyType": { - "masterName": "OccupancyType", - "isStateLevel": true, - "uniqueKeys": [ - "$.code" - ] - }, - "UsageCategoryMajor": { - "masterName": "UsageCategoryMajor", - "isStateLevel": true, - "uniqueKeys": [ - "$.code" - ] - }, - "UsageCategoryMinor": { - "masterName": "UsageCategoryMinor", - "isStateLevel": true, - "uniqueKeys": [ - "$.code" - ] - }, - "UsageCategorySubMinor": { - "masterName": "UsageCategorySubMinor", - "isStateLevel": true, - "uniqueKeys": [ - "$.code" - ] - }, - "UsageCategoryDetail": { - "masterName": "UsageCategoryDetail", - "isStateLevel": true, - "uniqueKeys": [ - "$.code" - ] - }, - "OwnerType": { - "masterName": "OwnerType", - "isStateLevel": true, - "uniqueKeys": [ - "$.code" - ] - }, - "Rebate": { - "masterName": "Rebate", - "isStateLevel": true, - "uniqueKeys": [ - "$.fromFY" - ] - }, - "Penalty": { - "masterName": "Penalty", - "isStateLevel": true, - "uniqueKeys": [ - "$.fromFY" - ] - }, - "CancerCess": { - "masterName": "CancerCess", - "isStateLevel": true, - "uniqueKeys": [] - } - }, - "TradeLicense": { - "ApplicationType": { - "masterName": "ApplicationType", - "isStateLevel": true, - "uniqueKeys": [ - "$.code" - ] - }, - "TradeType": { - "masterName": "TradeType", - "isStateLevel": true, - "uniqueKeys": [ - "$.code" - ] - }, - "AccessoriesCategory": { - "masterName": "AccessoriesCategory", - "isStateLevel": true, - "uniqueKeys": [ - "$.code" - ] - } - }, - "egov-hrms": { - "EmployeeStatus": { - "masterName": "EmployeeStatus", - "isStateLevel": true, - "uniqueKeys": [ - "$.code" - ] - }, - "EmployeeType": { - "masterName": "EmployeeType", - "isStateLevel": true, - "uniqueKeys": [ - "$.code" - ] - }, - "Degree": { - "masterName": "Degree", - "isStateLevel": true, - "uniqueKeys": [ - "$.code" - ] - }, - "Specalization": { - "masterName": "Specalization", - "isStateLevel": true, - "uniqueKeys": [ - "$.code" - ] - }, - "DeactivationReason": { - "masterName": "DeactivationReason", - "isStateLevel": true, - "uniqueKeys": [ - "$.code" - ] - }, - "EmploymentTest": { - "masterName": "EmploymentTest", - "isStateLevel": true, - "uniqueKeys": [ - "$.code" - ] - } - }, - "BillingService": { - "BusinessService": { - "masterName": "BusinessService", - "isStateLevel": true, - "uniqueKeys": [] - }, - "TaxHeadMaster": { - "masterName": "TaxHeadMaster", - "isStateLevel": true, - "uniqueKeys": [] - }, - "TaxPeriod": { - "masterName": "TaxPeriod", - "isStateLevel": true, - "uniqueKeys": [] - } - }, - "FinanceModule": { - "BusinessServiceMapping": { - "masterName": "BusinessServiceMapping", - "isStateLevel": true, - "uniqueKeys": [ - "$.code" - ] - }, - "TaxHeadMasterGlCodeMapping": { - "masterName": "TaxHeadMasterGlCodeMapping", - "isStateLevel": true, - "uniqueKeys": [ - "$.billingservicecode", - "$.taxhead" - ] - }, - "InstrumentGLcodeMapping": { - "masterName": "InstrumentGLcodeMapping", - "isStateLevel": true, - "uniqueKeys": [ - "$.instrumenttype" - ] - }, - "FinanceInstrumentStatusMapping": { - "masterName": "FinanceInstrumentStatusMapping", - "isStateLevel": true, - "uniqueKeys": [ - "$.code" - ] - } - } -} diff --git a/configs/egov-persister/apportion-persister.yml b/configs/egov-persister/apportion-persister.yml deleted file mode 100644 index 43f29b85..00000000 --- a/configs/egov-persister/apportion-persister.yml +++ /dev/null @@ -1,81 +0,0 @@ -serviceMaps: - serviceName: apportion-services - mappings: - - version: 1.0 - description: Persists apportioning request - fromTopic: save-apportion-request - 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 - - - jsonPath: $.Bills.*.tenantId - - - jsonPath: $.Bills.*.mobileNumber - - - jsonPath: $.Bills.*.payerName - - - jsonPath: $.Bills.*.payerAddress - - - jsonPath: $.Bills.*.payerEmail - - - jsonPath: $.Bills.*.paidBy - - - jsonPath: $.Bills.*.taxAndPayments - type: JSON - dbType: JSONB - - - jsonPath: $.Bills.*.isActive - - - jsonPath: $.Bills.*.isCancelled - - - jsonPath: $.Bills.*.billDetails - type: JSON - dbType: JSONB - - - jsonPath: $.Bills.*.auditDetails.createdBy - - - jsonPath: $.Bills.*.auditDetails.createdTime - - - - version: 1.0 - description: Persists apportioning response - fromTopic: save-apportion-response - isTransaction: true - 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 - - - jsonPath: $.Bills.*.tenantId - - - jsonPath: $.Bills.*.mobileNumber - - - jsonPath: $.Bills.*.payerName - - - jsonPath: $.Bills.*.payerAddress - - - jsonPath: $.Bills.*.payerEmail - - - jsonPath: $.Bills.*.paidBy - - - jsonPath: $.Bills.*.taxAndPayments - type: JSON - dbType: JSONB - - - jsonPath: $.Bills.*.isActive - - - jsonPath: $.Bills.*.isCancelled - - - jsonPath: $.Bills.*.billDetails - type: JSON - dbType: JSONB - - - jsonPath: $.Bills.*.auditDetails.createdBy - - - jsonPath: $.Bills.*.auditDetails.createdTime diff --git a/configs/egov-persister/assessment-persister-migration-temp.yml b/configs/egov-persister/assessment-persister-migration-temp.yml deleted file mode 100644 index 26cb84ed..00000000 --- a/configs/egov-persister/assessment-persister-migration-temp.yml +++ /dev/null @@ -1,228 +0,0 @@ -serviceMaps: - serviceName: property-services - mappings: - - version: 1.0 - description: Persists assessment details to eg_pt_asmt_assessment table - fromTopic: save-pt-assessment-batch - isTransaction: true - queryMaps: - - - query: INSERT INTO eg_pt_asmt_assessment(id, tenantid, assessmentnumber, financialyear, propertyid, status, source, channel, assessmentdate, additionaldetails, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - basePath: Assessment - jsonMaps: - - - jsonPath: $.Assessment.id - - - jsonPath: $.Assessment.tenantId - - - jsonPath: $.Assessment.assessmentNumber - - - jsonPath: $.Assessment.financialYear - - - jsonPath: $.Assessment.propertyId - - - jsonPath: $.Assessment.status - - - jsonPath: $.Assessment.source - - - jsonPath: $.Assessment.channel - - - jsonPath: $.Assessment.assessmentDate - - - jsonPath: $.Assessment.additionalDetails - type: JSON - dbType: JSONB - - - jsonPath: $.Assessment.auditDetails.createdBy - - - jsonPath: $.Assessment.auditDetails.createdTime - - - jsonPath: $.Assessment.auditDetails.lastModifiedBy - - - jsonPath: $.Assessment.auditDetails.lastModifiedTime - - - - - query: INSERT INTO eg_pt_asmt_unitusage (tenantid, id, assessmentid, unitid, usagecategory, occupancytype, occupancydate, active, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - basePath: Assessment.unitUsageList.* - jsonMaps: - - - jsonPath: $.Assessment.unitUsageList.*.tenantId - - - jsonPath: $.Assessment.unitUsageList.*.id - - - jsonPath: $.Assessment[?({id} in @.unitUsageList[*].id)].id - - - jsonPath: $.Assessment.unitUsageList.*.unitId - - - jsonPath: $.Assessment.unitUsageList.*.usageCategory - - - jsonPath: $.Assessment.unitUsageList.*.occupancyType - - - jsonPath: $.Assessment.unitUsageList.*.occupancyDate - - - jsonPath: $.Assessment.unitUsageList.*.active - - - jsonPath: $.Assessment.unitUsageList.*.auditDetails.createdBy - - - jsonPath: $.Assessment.unitUsageList.*.auditDetails.createdTime - - - jsonPath: $.Assessment.unitUsageList.*.auditDetails.lastModifiedBy - - - jsonPath: $.Assessment.unitUsageList.*.auditDetails.lastModifiedTime - - - - - query: INSERT INTO eg_pt_asmt_document (id, tenantid, entityid, documenttype, filestoreid, documentuid, status, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - basePath: $.Assessment.documents.* - jsonMaps: - - - jsonPath: $.Assessment.documents.*.id - - - jsonPath: $.Assessment.tenantId - - - jsonPath: $.Assessment.id - - - jsonPath: $.Assessment.documents.*.documentType - - - jsonPath: $.Assessment.documents.*.fileStoreId - - - jsonPath: $.Assessment.documents.*.documentUid - - - jsonPath: $.Assessment.documents.*.status - - - jsonPath: $.Assessment.documents.*.auditDetails.createdBy - - - jsonPath: $.Assessment.documents.*.auditDetails.lastModifiedBy - - - jsonPath: $.Assessment.documents.*.auditDetails.createdTime - - - jsonPath: $.Assessment.documents.*.auditDetails.lastModifiedTime - - - - - version: 1.0 - description: Updates assessment details to eg_pt_asmt_assessment table - fromTopic: update-pt-assessment - isTransaction: true - queryMaps: - - - query: INSERT INTO eg_pt_asmt_assessment_audit SELECT *, (SELECT extract(epoch from now())) FROM eg_pt_asmt_assessment WHERE id = ?; - basePath: Assessment - jsonMaps: - - - jsonPath: $.Assessment.id - - - - query: INSERT INTO eg_pt_asmt_unitusage_audit SELECT *, (SELECT extract(epoch from now())) FROM eg_pt_asmt_unitusage WHERE id = ?; - basePath: Assessment.unitUsageList.* - jsonMaps: - - - jsonPath: $.Assessment.unitUsageList.*.id - - - - query: UPDATE eg_pt_asmt_assessment SET financialyear = ?, status = ?, source = ?, assessmentDate = ?, additionaldetails = ?, lastmodifiedby = ?, lastmodifiedtime = ? WHERE id = ?; - basePath: Assessment - jsonMaps: - - - jsonPath: $.Assessment.financialYear - - - jsonPath: $.Assessment.status - - - jsonPath: $.Assessment.source - - - jsonPath: $.Assessment.assessmentDate - - - jsonPath: $.Assessment.additionalDetails - type: JSON - dbType: JSONB - - - jsonPath: $.Assessment.auditDetails.lastModifiedBy - - - jsonPath: $.Assessment.auditDetails.lastModifiedTime - - - jsonPath: $.Assessment.id - - - - - - query: INSERT INTO eg_pt_asmt_unitusage (tenantid, id, assessmentId, unitid, usageCategory, occupancyType, occupancyDate, active, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET usageCategory = ?, occupancyType = ?, occupancyDate = ?, active = ?, lastmodifiedby = ?, lastmodifiedtime = ?; - basePath: Assessment.unitUsageList.* - jsonMaps: - - - jsonPath: $.Assessment.unitUsageList.*.tenantId - - - jsonPath: $.Assessment.unitUsageList.*.id - - - jsonPath: $.Assessment[?({id} in @.unitUsageList[*].id)].id - - - jsonPath: $.Assessment.unitUsageList.*.unitId - - - jsonPath: $.Assessment.unitUsageList.*.usageCategory - - - jsonPath: $.Assessment.unitUsageList.*.occupancyType - - - jsonPath: $.Assessment.unitUsageList.*.occupancyDate - - - jsonPath: $.Assessment.unitUsageList.*.active - - - jsonPath: $.Assessment.unitUsageList.*.auditDetails.createdBy - - - jsonPath: $.Assessment.unitUsageList.*.auditDetails.createdTime - - - jsonPath: $.Assessment.unitUsageList.*.auditDetails.lastModifiedBy - - - jsonPath: $.Assessment.unitUsageList.*.auditDetails.lastModifiedTime - - - jsonPath: $.Assessment.unitUsageList.*.usageCategory - - - jsonPath: $.Assessment.unitUsageList.*.occupancyType - - - jsonPath: $.Assessment.unitUsageList.*.occupancyDate - - - jsonPath: $.Assessment.unitUsageList.*.active - - - jsonPath: $.Assessment.unitUsageList.*.auditDetails.lastModifiedBy - - - jsonPath: $.Assessment.unitUsageList.*.auditDetails.lastModifiedTime - - - - - - query: INSERT INTO eg_pt_asmt_document (id, tenantid, entityid, documenttype, filestoreid, documentuid, status, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE documenttype = ?, documentuid = ?, status = ?, lastmodifiedby = ?, lastmodifiedtime = ?; - basePath: $.Assessment.documents.* - jsonMaps: - - - jsonPath: $.Assessment.documents.*.id - - - jsonPath: $.Assessment.tenantId - - - jsonPath: $.Assessment.id - - - jsonPath: $.Assessment.documents.*.documentType - - - jsonPath: $.Assessment.documents.*.fileStoreId - - - jsonPath: $.Assessment.documents.*.documentUid - - - jsonPath: $.Assessment.documents.*.status - - - jsonPath: $.Assessment.documents.*.auditDetails.createdBy - - - jsonPath: $.Assessment.documents.*.auditDetails.lastModifiedBy - - - jsonPath: $.Assessment.documents.*.auditDetails.createdTime - - - jsonPath: $.Assessment.documents.*.auditDetails.lastModifiedTime - - - jsonPath: $.Assessment.documents.*.documentType - - - jsonPath: $.Assessment.documents.*.documentUid - - - jsonPath: $.Assessment.documents.*.status - - - jsonPath: $.Assessment.documents.*.auditDetails.lastModifiedBy - - - jsonPath: $.Assessment.documents.*.auditDetails.lastModifiedTime - - diff --git a/configs/egov-persister/assessment-persister.yml b/configs/egov-persister/assessment-persister.yml deleted file mode 100644 index 677f54ac..00000000 --- a/configs/egov-persister/assessment-persister.yml +++ /dev/null @@ -1,228 +0,0 @@ -serviceMaps: - serviceName: property-services - mappings: - - version: 1.0 - description: Persists assessment details to eg_pt_asmt_assessment table - fromTopic: save-pt-assessment - isTransaction: true - queryMaps: - - - query: INSERT INTO eg_pt_asmt_assessment(id, tenantid, assessmentnumber, financialyear, propertyid, status, source, channel, assessmentdate, additionaldetails, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - basePath: Assessment - jsonMaps: - - - jsonPath: $.Assessment.id - - - jsonPath: $.Assessment.tenantId - - - jsonPath: $.Assessment.assessmentNumber - - - jsonPath: $.Assessment.financialYear - - - jsonPath: $.Assessment.propertyId - - - jsonPath: $.Assessment.status - - - jsonPath: $.Assessment.source - - - jsonPath: $.Assessment.channel - - - jsonPath: $.Assessment.assessmentDate - - - jsonPath: $.Assessment.additionalDetails - type: JSON - dbType: JSONB - - - jsonPath: $.Assessment.auditDetails.createdBy - - - jsonPath: $.Assessment.auditDetails.createdTime - - - jsonPath: $.Assessment.auditDetails.lastModifiedBy - - - jsonPath: $.Assessment.auditDetails.lastModifiedTime - - - - - query: INSERT INTO eg_pt_asmt_unitusage (tenantid, id, assessmentid, unitid, usagecategory, occupancytype, occupancydate, active, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - basePath: Assessment.unitUsageList.* - jsonMaps: - - - jsonPath: $.Assessment.unitUsageList.*.tenantId - - - jsonPath: $.Assessment.unitUsageList.*.id - - - jsonPath: $.Assessment[?({id} in @.unitUsageList[*].id)].id - - - jsonPath: $.Assessment.unitUsageList.*.unitId - - - jsonPath: $.Assessment.unitUsageList.*.usageCategory - - - jsonPath: $.Assessment.unitUsageList.*.occupancyType - - - jsonPath: $.Assessment.unitUsageList.*.occupancyDate - - - jsonPath: $.Assessment.unitUsageList.*.active - - - jsonPath: $.Assessment.unitUsageList.*.auditDetails.createdBy - - - jsonPath: $.Assessment.unitUsageList.*.auditDetails.createdTime - - - jsonPath: $.Assessment.unitUsageList.*.auditDetails.lastModifiedBy - - - jsonPath: $.Assessment.unitUsageList.*.auditDetails.lastModifiedTime - - - - - query: INSERT INTO eg_pt_asmt_document (id, tenantid, entityid, documenttype, filestoreid, documentuid, status, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - basePath: $.Assessment.documents.* - jsonMaps: - - - jsonPath: $.Assessment.documents.*.id - - - jsonPath: $.Assessment.tenantId - - - jsonPath: $.Assessment.id - - - jsonPath: $.Assessment.documents.*.documentType - - - jsonPath: $.Assessment.documents.*.fileStoreId - - - jsonPath: $.Assessment.documents.*.documentUid - - - jsonPath: $.Assessment.documents.*.status - - - jsonPath: $.Assessment.documents.*.auditDetails.createdBy - - - jsonPath: $.Assessment.documents.*.auditDetails.lastModifiedBy - - - jsonPath: $.Assessment.documents.*.auditDetails.createdTime - - - jsonPath: $.Assessment.documents.*.auditDetails.lastModifiedTime - - - - - version: 1.0 - description: Updates assessment details to eg_pt_asmt_assessment table - fromTopic: update-pt-assessment - isTransaction: true - queryMaps: - - - query: INSERT INTO eg_pt_asmt_assessment_audit SELECT *, (SELECT extract(epoch from now())) FROM eg_pt_asmt_assessment WHERE id = ?; - basePath: Assessment - jsonMaps: - - - jsonPath: $.Assessment.id - - - - query: INSERT INTO eg_pt_asmt_unitusage_audit SELECT *, (SELECT extract(epoch from now())) FROM eg_pt_asmt_unitusage WHERE id = ?; - basePath: Assessment.unitUsageList.* - jsonMaps: - - - jsonPath: $.Assessment.unitUsageList.*.id - - - - query: UPDATE eg_pt_asmt_assessment SET financialyear = ?, status = ?, source = ?, assessmentDate = ?, additionaldetails = ?, lastmodifiedby = ?, lastmodifiedtime = ? WHERE id = ?; - basePath: Assessment - jsonMaps: - - - jsonPath: $.Assessment.financialYear - - - jsonPath: $.Assessment.status - - - jsonPath: $.Assessment.source - - - jsonPath: $.Assessment.assessmentDate - - - jsonPath: $.Assessment.additionalDetails - type: JSON - dbType: JSONB - - - jsonPath: $.Assessment.auditDetails.lastModifiedBy - - - jsonPath: $.Assessment.auditDetails.lastModifiedTime - - - jsonPath: $.Assessment.id - - - - - - query: INSERT INTO eg_pt_asmt_unitusage (tenantid, id, assessmentId, unitid, usageCategory, occupancyType, occupancyDate, active, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET usageCategory = ?, occupancyType = ?, occupancyDate = ?, active = ?, lastmodifiedby = ?, lastmodifiedtime = ?; - basePath: Assessment.unitUsageList.* - jsonMaps: - - - jsonPath: $.Assessment.unitUsageList.*.tenantId - - - jsonPath: $.Assessment.unitUsageList.*.id - - - jsonPath: $.Assessment[?({id} in @.unitUsageList[*].id)].id - - - jsonPath: $.Assessment.unitUsageList.*.unitId - - - jsonPath: $.Assessment.unitUsageList.*.usageCategory - - - jsonPath: $.Assessment.unitUsageList.*.occupancyType - - - jsonPath: $.Assessment.unitUsageList.*.occupancyDate - - - jsonPath: $.Assessment.unitUsageList.*.active - - - jsonPath: $.Assessment.unitUsageList.*.auditDetails.createdBy - - - jsonPath: $.Assessment.unitUsageList.*.auditDetails.createdTime - - - jsonPath: $.Assessment.unitUsageList.*.auditDetails.lastModifiedBy - - - jsonPath: $.Assessment.unitUsageList.*.auditDetails.lastModifiedTime - - - jsonPath: $.Assessment.unitUsageList.*.usageCategory - - - jsonPath: $.Assessment.unitUsageList.*.occupancyType - - - jsonPath: $.Assessment.unitUsageList.*.occupancyDate - - - jsonPath: $.Assessment.unitUsageList.*.active - - - jsonPath: $.Assessment.unitUsageList.*.auditDetails.lastModifiedBy - - - jsonPath: $.Assessment.unitUsageList.*.auditDetails.lastModifiedTime - - - - - - query: INSERT INTO eg_pt_asmt_document (id, tenantid, entityid, documenttype, filestoreid, documentuid, status, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE documenttype = ?, documentuid = ?, status = ?, lastmodifiedby = ?, lastmodifiedtime = ?; - basePath: $.Assessment.documents.* - jsonMaps: - - - jsonPath: $.Assessment.documents.*.id - - - jsonPath: $.Assessment.tenantId - - - jsonPath: $.Assessment.id - - - jsonPath: $.Assessment.documents.*.documentType - - - jsonPath: $.Assessment.documents.*.fileStoreId - - - jsonPath: $.Assessment.documents.*.documentUid - - - jsonPath: $.Assessment.documents.*.status - - - jsonPath: $.Assessment.documents.*.auditDetails.createdBy - - - jsonPath: $.Assessment.documents.*.auditDetails.lastModifiedBy - - - jsonPath: $.Assessment.documents.*.auditDetails.createdTime - - - jsonPath: $.Assessment.documents.*.auditDetails.lastModifiedTime - - - jsonPath: $.Assessment.documents.*.documentType - - - jsonPath: $.Assessment.documents.*.documentUid - - - jsonPath: $.Assessment.documents.*.status - - - jsonPath: $.Assessment.documents.*.auditDetails.lastModifiedBy - - - jsonPath: $.Assessment.documents.*.auditDetails.lastModifiedTime - - diff --git a/configs/egov-persister/auto-escalation-persister.yml b/configs/egov-persister/auto-escalation-persister.yml deleted file mode 100644 index 46ff6afa..00000000 --- a/configs/egov-persister/auto-escalation-persister.yml +++ /dev/null @@ -1,21 +0,0 @@ -serviceMaps: - serviceName: update Escalation Status - mappings: - - version: 1.0 - description: Updates tl status for auto escalate - fromTopic: tl-auto-escalation - isTransaction: true - queryMaps: - - - query: UPDATE eg_tl_tradelicense SET applicationstatus=?, lastmodifiedby=?, lastmodifiedtime=? WHERE applicationnumber=? AND tenantId=?; - basePath: ProcessInstances.* - jsonMaps: - - jsonPath: $.ProcessInstances.*.state.applicationStatus - - - jsonPath: $.ProcessInstances.*.auditDetails.lastModifiedBy - - - jsonPath: $.ProcessInstances.*.auditDetails.lastModifiedTime - - - jsonPath: $.ProcessInstances.*.businessId - - - jsonPath: $.ProcessInstances.*.tenantId diff --git a/configs/egov-persister/billing-services-persist.yml b/configs/egov-persister/billing-services-persist.yml deleted file mode 100644 index f720d59e..00000000 --- a/configs/egov-persister/billing-services-persist.yml +++ /dev/null @@ -1,274 +0,0 @@ -serviceMaps: - serviceName: User Service - mappings: - - version: 1.0 - name: bill create - description: create bill in egbs_bill - fromTopic: save-bill-db - queryMaps: - - query: INSERT into egbs_bill (id, tenantid, payeename, payeeaddress, payeeemail, isactive, iscancelled, createdby, createddate, lastmodifiedby, lastmodifieddate) values(?,?,?,?,?,?,?,?,?,?,?) - basePath: $.Bills.* - jsonMaps: - - - jsonPath: $.Bills.*.id - - - jsonPath: $.Bills.*.tenantId - - - jsonPath: $.Bills.*.payeeName - - - jsonPath: $.Bills.*.payeeAddress - - - jsonPath: $.Bills.*.payeeEmail - - - jsonPath: $.Bills.*.isActive - type: BOOLEAN - - - jsonPath: $.Bills.*.isCancelled - type: BOOLEAN - - - jsonPath: $.RequestInfo.userInfo.id - type: LONG - - - type: CURRENTDATE - dbType: LONG - - - jsonPath: $.RequestInfo.userInfo.id - - - type: CURRENTDATE - dbType: LONG - - - query: INSERT into egbs_billdetail (id, tenantid, billid, businessservice, billno, billdate, consumercode, consumertype, billdescription, displaymessage, minimumamount, totalamount, callbackforapportioning, partpaymentallowed, collectionmodesnotallowed, createdby, createddate, lastmodifiedby, lastmodifieddate) values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?); - basePath: $.Bills.*.billDetails.* - jsonMaps: - - jsonPath: $.Bills.*.billDetails.*.id - - - jsonPath: $.Bills.*.billDetails.*.tenantId - - - jsonPath: $.Bills[?({id} in @.billDetails[*].id)].id - - - jsonPath: $.Bills.*.billDetails.*.businessService - type: DOUBLE - - - jsonPath: $.Bills.*.billDetails.*.billNumber - type: DOUBLE - - - jsonPath: $.Bills.*.billDetails.*.billDate - type: LONG - - - jsonPath: $.Bills.*.billDetails.*.consumerCode - - - jsonPath: $.Bills.*.billDetails.*.consumerType - - - jsonPath: $.Bills.*.billDetails.*.billDescription - - - jsonPath: $.Bills.*.billDetails.*.displayMessage - - - jsonPath: $.Bills.*.billDetails.*.minimumAmount - type: DOUBLE - - - jsonPath: $.Bills.*.billDetails.*.totalAmount - type: DOUBLE - - - jsonPath: $.Bills.*.billDetails.*.callBackForApportioning - type: BOOLEAN - - - jsonPath: $.Bills.*.billDetails.*.partPaymentAllowed - type: BOOLEAN - - - jsonPath: $.Bills.*.billDetails.*.collectionModesNotAllowed - type: ARRAY - dbType: STRING - - - jsonPath: $.RequestInfo.userInfo.id - type: LONG - - - type: CURRENTDATE - dbType: LONG - - - jsonPath: $.RequestInfo.userInfo.id - - - type: CURRENTDATE - dbType: LONG - - - query: INSERT into egbs_billaccountdetail(id, tenantid, billdetail, glcode, orderno, accountdescription, cramounttobepaid, creditamount, debitamount, isactualdemand, purpose, createdby, createddate, lastmodifiedby, lastmodifieddate) values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?); - basePath: $.Bills.*.billDetails.*.billAccountDetails.* - jsonMaps: - - jsonPath: $.Bills.*.billDetails.*.billAccountDetails.*.id - - - jsonPath: $.Bills.*.billDetails.*.billAccountDetails.*.tenantId - - - jsonPath: $.Bills[*].billDetails[?({id} in @.billAccountDetails[*].id)].id - - - jsonPath: $.Bills.*.billDetails.*.billAccountDetails.*.glcode - - - jsonPath: $.Bills.*.billDetails.*.billAccountDetails.*.order - type: INT - - - jsonPath: $.Bills.*.billDetails.*.billAccountDetails.*.accountDescription - - - jsonPath: $.Bills.*.billDetails.*.billAccountDetails.*.crAmountToBePaid - type: DOUBLE - - - jsonPath: $.Bills.*.billDetails.*.billAccountDetails.*.creditAmount - type: DOUBLE - - - jsonPath: $.Bills.*.billDetails.*.billAccountDetails.*.debitAmount - type: DOUBLE - - - jsonPath: $.Bills.*.billDetails.*.billAccountDetails.*.isActualDemand - type: BOOLEAN - - - jsonPath: $.Bills.*.billDetails.*.billAccountDetails.*.purpose - - - jsonPath: $.RequestInfo.userInfo.id - type: LONG - - - type: CURRENTDATE - dbType: LONG - - - jsonPath: $.RequestInfo.userInfo.id - - - type: CURRENTDATE - dbType: LONG - - - version: 1.0 - name: demand create - description: create demand in egbs_demand - fromTopic: save-demand - isTransaction: true - queryMaps: - - query: INSERT INTO egbs_demand (id,consumerCode,consumerType,businessService,owner,taxPeriodFrom,taxPeriodTo,minimumAmountPayable,createdby,lastModifiedby,createdtime,lastModifiedtime,tenantid) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?); - basePath: $.Demands.* - jsonMaps: - - - jsonPath: $.Demands.*.id - type: STRING - - - jsonPath: $.Demands.*.consumerCode - type: STRING - - - jsonPath: $.Demands.*.consumerType - type: STRING - - - jsonPath: $.Demands.*.businessService - type: STRING - - - jsonPath: $.Demands.*.owner.id - type: STRING - - - jsonPath: $.Demands.*.taxPeriodFrom - type: LONG - - - jsonPath: $.Demands.*.taxPeriodTo - type: LONG - - - jsonPath: $.Demands.*.minimumAmountPayable - type: DOUBLE - - - jsonPath: $.Demands.*.auditDetail.createdBy - type: STRING - - - jsonPath: $.Demands.*.auditDetail.lastModifiedBy - type: STRING - - - jsonPath: $.Demands.*.auditDetail.createdTime - type: LONG - - - jsonPath: $.Demands.*.auditDetail.lastModifiedTime - type: LONG - - - jsonPath: $.Demands.*.tenantId - type: STRING - - - query: INSERT INTO egbs_demanddetail (id,demandid,taxHeadCode,taxamount,collectionamount,createdby,lastModifiedby,createdtime,lastModifiedtime,tenantid) VALUES (?,?,?,?,?,?,?,?,?,?); - basePath: $.Demands.*.demandDetails.* - jsonMaps: - - jsonPath: $.Demands.*.demandDetails.*.id - type: STRING - - - jsonPath: $.Demands.*.demandDetails.*.demandId - type: STRING - - - jsonPath: $.Demands.*.demandDetails.*.taxHeadMasterCode - type: STRING - - - jsonPath: $.Demands.*.demandDetails.*.taxAmount - type: DOUBLE - - - jsonPath: $.Demands.*.demandDetails.*.collectionAmount - type: DOUBLE - - - jsonPath: $.Demands.*.demandDetails.*.auditDetail.createdBy - type: STRING - - - jsonPath: $.Demands.*.demandDetails.*.auditDetail.lastModifiedBy - type: STRING - - - jsonPath: $.Demands.*.demandDetails.*.auditDetail.createdTime - type: LONG - - - jsonPath: $.Demands.*.demandDetails.*.auditDetail.lastModifiedTime - type: LONG - - - jsonPath: $.Demands.*.demandDetails.*.tenantId - type: STRING - - - - version: 1.0 - name: demand update - description: update demand in egbs_demand - fromTopic: update-demand - isTransaction: true - queryMaps: - - query: UPDATE egbs_demand SET consumerCode=?,consumerType=?,businessService=?,owner=?,taxPeriodFrom=?,taxPeriodTo=?,minimumAmountPayable=?,lastModifiedby=?,lastModifiedtime=? WHERE id=? AND tenantid=?; - basePath: $.Demands.* - jsonMaps: - - - jsonPath: $.Demands.*.consumerCode - - - jsonPath: $.Demands.*.consumerType - - - jsonPath: $.Demands.*.businessService - - - jsonPath: $.Demands.*.owner.id - - - jsonPath: $.Demands.*.taxPeriodFrom - type: LONG - - - jsonPath: $.Demands.*.taxPeriodTo - type: LONG - - - jsonPath: $.Demands.*.minimumAmountPayable - type: DOUBLE - - - jsonPath: $.Demands.*.auditDetail.lastModifiedBy - - - jsonPath: $.Demands.*.auditDetail.lastModifiedTime - type: LONG - - - jsonPath: $.Demands.*.id - - - jsonPath: $.Demands.*.tenantId - - - query: UPDATE egbs_demanddetail SET demandid=?,taxHeadCode=?,taxamount=?,collectionamount=?,lastModifiedby=?,lastModifiedtime=? WHERE id=? AND tenantid=?; - basePath: $.Demands.*.demandDetails.* - jsonMaps: - - - jsonPath: $.Demands.*.demandDetails.*.demandId - - - jsonPath: $.Demands.*.demandDetails.*.taxHeadMasterCode - - - jsonPath: $.Demands.*.demandDetails.*.taxAmount - type: DOUBLE - - - jsonPath: $.Demands.*.demandDetails.*.collectionAmount - type: DOUBLE - - - jsonPath: $.Demands.*.demandDetails.*.auditDetail.lastModifiedBy - - - jsonPath: $.Demands.*.demandDetails.*.auditDetail.lastModifiedTime - type: LONG - - - jsonPath: $.Demands.*.demandDetails.*.id - - - jsonPath: $.Demands.*.demandDetails.*.tenantId diff --git a/configs/egov-persister/chatbot.yml b/configs/egov-persister/chatbot.yml deleted file mode 100644 index 5cd87288..00000000 --- a/configs/egov-persister/chatbot.yml +++ /dev/null @@ -1,77 +0,0 @@ -serviceMaps: - serviceName: Chatbot Persister - mappings: - - version: 1.0 - name: chatbot-persister - description: Insert new conversationState to database - fromTopic: chatbot-conversation-state-insert - isTransaction: true - queryMaps: - - query: INSERT INTO eg_chat_conversation_state (conversation_id, user_id, active, locale) VALUES (?, ?, ?, ?); - basePath: $ - jsonMaps: - - - jsonPath: $.conversationId - - - jsonPath: $.userId - - - jsonPath: $.active - - - jsonPath: $.locale - - - version: 1.0 - name: chatbot-persister - description: Update conversationState - fromTopic: chatbot-conversation-state-update - isTransaction: true - queryMaps: - - query: UPDATE eg_chat_conversation_state SET active_node_id=?, question_details=?, last_modified_time=? WHERE conversation_id=?; - basePath: $ - jsonMaps: - - - jsonPath: $.activeNodeId - - - jsonPath: $.questionDetails - type: JSON - dbType: JSONB - - - jsonPath: $.lastModifiedTime - - - jsonPath: $.conversationId - - - version: 1.0 - name: chatbot-persister - description: Mark conversationState inactive - fromTopic: chatbot-conversation-state-deactivate - isTransaction: true - queryMaps: - - query: UPDATE eg_chat_conversation_state SET active=FALSE WHERE conversation_id=?; - basePath: $ - jsonMaps: - - - jsonPath: $.conversationId - - - - version: 1.0 - name: chatbot-persister - description: Save chatbot message - fromTopic: chatbot-message-insert - isTransaction: true - queryMaps: - - query: INSERT INTO eg_chat_message (message_id, conversation_id, node_id, raw_input, message_content, content_type, is_valid) VALUES (?, ?, ?, ?, ?, ?, ?); - basePath: $ - jsonMaps: - - - jsonPath: $.messageId - - - jsonPath: $.conversationId - - - jsonPath: $.nodeId - - - jsonPath: $.rawInput - - - jsonPath: $.messageContent - - - jsonPath: $.contentType - - - jsonPath: $.valid diff --git a/configs/egov-persister/collection-migration-count.yml b/configs/egov-persister/collection-migration-count.yml deleted file mode 100644 index ce6c394c..00000000 --- a/configs/egov-persister/collection-migration-count.yml +++ /dev/null @@ -1,23 +0,0 @@ -serviceMaps: - serviceName: collection-services-migration-count - mappings: - - version: 1.0 - description: Persists property details in egcl_payment_migration table - fromTopic: collection-migartion-batch-count - isTransaction: true - queryMaps: - - - - query: INSERT INTO egcl_payment_migration (id,batch,batchsize,createdtime,tenantid,recordCount) VALUES (?,?,?,(SELECT extract(epoch from CURRENT_TIMESTAMP)*1000),?,?); - basePath: MigrationCount - jsonMaps: - - - jsonPath: $.MigrationCount.id - - - jsonPath: $.MigrationCount.offset - - - jsonPath: $.MigrationCount.limit - - - jsonPath: $.MigrationCount.tenantid - - - jsonPath: $.MigrationCount.recordCount \ No newline at end of file diff --git a/configs/egov-persister/collection-migration-persister.yml b/configs/egov-persister/collection-migration-persister.yml deleted file mode 100644 index c1106a59..00000000 --- a/configs/egov-persister/collection-migration-persister.yml +++ /dev/null @@ -1,240 +0,0 @@ -serviceMaps: - serviceName: Payment Service - mappings: - - version: 1.0 - name: collection migration - description: Inserting payment details into egcl_payment - fromTopic: egov-collection-migration-batch - queryMaps: - - - query: INSERT into egcl_payment (id, tenantid, totaldue, totalamountpaid, transactionnumber, transactiondate, paymentmode, instrumentdate, instrumentnumber, instrumentstatus, ifsccode, additionaldetails, paidby, mobilenumber, payername, payeraddress, payeremail, payerid, paymentstatus, createdby, createdtime, lastmodifiedby, lastmodifiedtime) values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) - basePath: $.Payments.* - jsonMaps: - - jsonPath: $.Payments.*.id - - - jsonPath: $.Payments.*.tenantId - - - jsonPath: $.Payments.*.totalDue - type: DOUBLE - - - jsonPath: $.Payments.*.totalAmountPaid - type: Double - - - jsonPath: $.Payments.*.transactionNumber - - - jsonPath: $.Payments.*.transactionDate - type: LONG - - - jsonPath: $.Payments.*.paymentMode - - - jsonPath: $.Payments.*.instrumentDate - type: LONG - - - jsonPath: $.Payments.*.instrumentNumber - - - jsonPath: $.Payments.*.instrumentStatus - - - jsonPath: $.Payments.*.ifscCode - - - jsonPath: $.Payments.*.additionalDetails - type: JSON - dbType: JSONB - - - jsonPath: $.Payments.*.paidBy - - - jsonPath: $.Payments.*.mobileNumber - - - jsonPath: $.Payments.*.payerName - - - jsonPath: $.Payments.*.payerAddress - - - jsonPath: $.Payments.*.payerEmail - - - jsonPath: $.Payments.*.payerId - - - jsonPath: $.Payments.*.paymentStatus - - - jsonPath: $.Payments.*.auditDetails.createdBy - - - jsonPath: $.Payments.*.auditDetails.createdTime - type: LONG - - - jsonPath: $.Payments.*.auditDetails.lastModifiedBy - - - jsonPath: $.Payments.*.auditDetails.lastModifiedTime - type: LONG - - - - - - query: INSERT into egcl_paymentdetail (id, tenantid, paymentid, due, amountpaid, receiptnumber, receiptdate, receipttype, businessservice, billid, additionaldetails, createdby, createdtime, lastmodifiedby, lastmodifiedtime, manualreceiptnumber, manualreceiptdate) values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) - basePath: $.Payments.*.paymentDetails.* - jsonMaps: - - jsonPath: $.Payments.*.paymentDetails.*.id - - - jsonPath: $.Payments.*.paymentDetails.*.tenantId - - - jsonPath: $.Payments.*.paymentDetails.*.paymentId - - - jsonPath: $.Payments.*.paymentDetails.*.totalDue - type: DOUBLE - - - jsonPath: $.Payments.*.paymentDetails.*.totalAmountPaid - type: DOUBLE - - - jsonPath: $.Payments.*.paymentDetails.*.receiptNumber - - - jsonPath: $.Payments.*.paymentDetails.*.receiptDate - type: LONG - - - jsonPath: $.Payments.*.paymentDetails.*.receiptType - - - jsonPath: $.Payments.*.paymentDetails.*.businessService - - - jsonPath: $.Payments.*.paymentDetails.*.billId - - - jsonPath: $.Payments.*.paymentDetails.*.additionalDetails - type: JSON - dbType: JSONB - - - jsonPath: $.Payments.*.paymentDetails.*.auditDetails.createdBy - - - jsonPath: $.Payments.*.paymentDetails.*.auditDetails.createdTime - type: LONG - - - jsonPath: $.Payments.*.paymentDetails.*.auditDetails.lastModifiedBy - - - jsonPath: $.Payments.*.paymentDetails.*.auditDetails.lastModifiedTime - type: LONG - - - jsonPath: $.Payments.*.paymentDetails.*.manualReceiptNumber - - - jsonPath: $.Payments.*.paymentDetails.*.manualReceiptDate - type: LONG - - - - query: INSERT into egcl_bill (id, status, iscancelled, additionaldetails, tenantid, collectionmodesnotallowed, partpaymentallowed, isadvanceallowed, minimumamounttobepaid, businessservice, totalamount, consumercode, billnumber, billdate, reasonforcancellation, createdby, createdtime, lastmodifiedby, lastmodifiedtime) values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) - basePath: $.Payments.*.paymentDetails.*.bill - jsonMaps: - - jsonPath: $.Payments.*.paymentDetails.*.bill.id - - - jsonPath: $.Payments.*.paymentDetails.*.bill.status - - - jsonPath: $.Payments.*.paymentDetails.*.bill.isCancelled - type: BOOLEAN - - - jsonPath: $.Payments.*.paymentDetails.*.bill.additionalDetails - type: JSON - dbType: JSONB - - - jsonPath: $.Payments.*.paymentDetails.*.bill.tenantId - - - jsonPath: $.Payments.*.paymentDetails.*.bill.collectionModesNotAllowed[0] - - - jsonPath: $.Payments.*.paymentDetails.*.bill.partPaymentAllowed - type: BOOLEAN - - - jsonPath: $.Payments.*.paymentDetails.*.bill.isAdvanceAllowed - type: BOOLEAN - - - jsonPath: $.Payments.*.paymentDetails.*.bill.minimumAmountToBePaid - type: DOUBLE - - - jsonPath: $.Payments.*.paymentDetails.*.bill.businessService - - - jsonPath: $.Payments.*.paymentDetails.*.bill.totalAmount - type: DOUBLE - - - jsonPath: $.Payments.*.paymentDetails.*.bill.consumerCode - - - jsonPath: $.Payments.*.paymentDetails.*.bill.billNumber - - - jsonPath: $.Payments.*.paymentDetails.*.bill.billDate - type: LONG - - - jsonPath: $.Payments.*.paymentDetails.*.bill.reasonForCancellation - - - jsonPath: $.Payments.*.paymentDetails.*.bill.auditDetails.createdBy - - - jsonPath: $.Payments.*.paymentDetails.*.bill.auditDetails.createdTime - type: LONG - - - jsonPath: $.Payments.*.paymentDetails.*.bill.auditDetails.lastModifiedBy - - - jsonPath: $.Payments.*.paymentDetails.*.bill.auditDetails.lastModifiedTime - type: LONG - - - - query: INSERT into egcl_billdetail (id, tenantid, demandid, billid, amount, amountpaid, fromperiod, toperiod, additionaldetails, channel, voucherheader, boundary, collectiontype, billdescription, expirydate, displaymessage, callbackforapportioning, cancellationremarks) values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) - basePath: $.Payments.*.paymentDetails.*.bill.billDetails.* - jsonMaps: - - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.id - - - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.tenantId - - - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.demandId - - - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.billId - - - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.amount - type: DOUBLE - - - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.amountPaid - type: DOUBLE - - - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.fromPeriod - type: LONG - - - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.toPeriod - type: LONG - - - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.additionalDetails - type: JSON - dbType: JSONB - - - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.channel - - - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.voucherHeader - - - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.boundary - - - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.collectionType - - - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.billDescription - - - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.expiryDate - - - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.displayMessage - - - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.callBackForApportioning - - - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.cancellationRemarks - - - - query: INSERT into egcl_billaccountdetail (id, tenantid, billdetailid, demanddetailid, "order", amount, adjustedamount, isactualdemand, taxheadcode, additionaldetails) values(?,?,?,?,?,?,?,?,?,?) - basePath: $.Payments.*.paymentDetails.*.bill.billDetails.*.billAccountDetails.* - jsonMaps: - - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.billAccountDetails.*.id - - - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.billAccountDetails.*.tenantId - - - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.billAccountDetails.*.billDetailId - - - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.billAccountDetails.*.demandDetailId - - - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.billAccountDetails.*.order - - - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.billAccountDetails.*.amount - type: DOUBLE - - - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.billAccountDetails.*.adjustedAmount - type: DOUBLE - - - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.billAccountDetails.*.isActualDemand - type: BOOLEAN - - - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.billAccountDetails.*.taxHeadCode - - - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.billAccountDetails.*.additionalDetails - type: JSON - dbType: JSONB \ No newline at end of file diff --git a/configs/egov-persister/echallan.yml b/configs/egov-persister/echallan.yml deleted file mode 100644 index 5c0483f9..00000000 --- a/configs/egov-persister/echallan.yml +++ /dev/null @@ -1,122 +0,0 @@ -serviceMaps: - serviceName: echallan-services - mappings: - - version: 1.0.0 - description: Persists challan details in eg_echallan table - fromTopic: save-challan - isTransaction: true - queryMaps: - - - query: INSERT INTO eg_echallan( id, accountid, tenantid, challanNo, businessService, referenceId, applicationStatus,taxPeriodFrom,taxPeriodTo, additionalDetail, createdby, lastmodifiedby, createdtime, lastmodifiedtime,description,filestoreid) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?,?); - basePath: Challan - jsonMaps: - - jsonPath: $.Challan.id - - - jsonPath: $.Challan.citizen.uuid - - - jsonPath: $.Challan.tenantId - - - jsonPath: $.Challan.challanNo - - - jsonPath: $.Challan.businessService - - - jsonPath: $.Challan.referenceId - - - jsonPath: $.Challan.applicationStatus - - - jsonPath: $.Challan.taxPeriodFrom - - - jsonPath: $.Challan.taxPeriodTo - - - jsonPath: $.Challan.additionalDetail - type: JSON - dbType: JSONB - - - jsonPath: $.Challan.auditDetails.createdBy - - - jsonPath: $.Challan.auditDetails.lastModifiedBy - - - jsonPath: $.Challan.auditDetails.createdTime - - - jsonPath: $.Challan.auditDetails.lastModifiedTime - - - jsonPath: $.Challan.description - - - jsonPath: $.Challan.filestoreid - - - query: INSERT INTO eg_challan_address( id, tenantid, doorno,plotNo,street,buildingName, latitude,longitude,locality, district, landmark,city,pincode, region, state,country, detail, echallanId, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - basePath: Challan.address - jsonMaps: - - jsonPath: $.Challan.address.id - - - jsonPath: $.Challan.address.tenantId - - - jsonPath: $.Challan.address.doorNo - - - jsonPath: $.Challan.address.plotNo - - - jsonPath: $.Challan.address.street - - - jsonPath: $.Challan.address.buildingName - - - jsonPath: $.Challan.address.latitude - - - jsonPath: $.Challan.address.longitude - - - jsonPath: $.Challan.address.locality.code - - - jsonPath: $.Challan.address.district - - - jsonPath: $.Challan.address.landmark - - - jsonPath: $.Challan.address.city - - - jsonPath: $.Challan.address.pincode - - - jsonPath: $.Challan.address.region - - - jsonPath: $.Challan.address.state - - - jsonPath: $.Challan.address.country - - - jsonPath: $.Challan.address.detail - - - jsonPath: $.Challan.id - - - jsonPath: $.Challan.auditDetails.createdBy - - - jsonPath: $.Challan.auditDetails.lastModifiedBy - - - jsonPath: $.Challan.auditDetails.createdTime - - - jsonPath: $.Challan.auditDetails.lastModifiedTime - - - version: 1.0.0 - description: Update Challan details in eg_echallan table - fromTopic: update-challan - isTransaction: true - queryMaps: - - - query: UPDATE eg_echallan SET applicationStatus = ?, taxPeriodFrom = ?,taxPeriodTo = ?, lastmodifiedby = ?, lastmodifiedtime = ?,description = ?, additionalDetail = ?, filestoreid = ? WHERE id=?; - basePath: Challan - jsonMaps: - - - jsonPath: $.Challan.applicationStatus - - - jsonPath: $.Challan.taxPeriodFrom - - - jsonPath: $.Challan.taxPeriodTo - - - jsonPath: $.Challan.auditDetails.lastModifiedBy - - - jsonPath: $.Challan.auditDetails.lastModifiedTime - - - jsonPath: $.Challan.description - - - jsonPath: $.Challan.additionalDetail - type: JSON - dbType: JSONB - - - jsonPath: $.Challan.filestoreid - - - jsonPath: $.Challan.id \ No newline at end of file diff --git a/configs/egov-persister/egf-bill.yaml b/configs/egov-persister/egf-bill.yaml deleted file mode 100644 index c8453a0e..00000000 --- a/configs/egov-persister/egf-bill.yaml +++ /dev/null @@ -1,338 +0,0 @@ -serviceMaps: - serviceName: Financial Bill Service - mappings: - - version: 1.0 - name: bill create - description: create bills in egf_billregister - fromTopic: egf-bill-billregister-save-topic - queryMaps: - - query: INSERT INTO egf_billregister( tenantid, billtype, billsubtype, billnumber, billdate, billamount, passedamount, modulename, status, fund, function, fundsource, scheme, subscheme, functionary, location, department, sourcepath, budgetcheckrequired, budgetappropriationno, partybillnumber, partybilldate, description, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - basePath: $.billRegisters.* - jsonMaps: - - - jsonPath: $.billRegisters.*.tenantId - - - jsonPath: $.billRegisters.*.billType - - - jsonPath: $.billRegisters.*.billSubType - - - jsonPath: $.billRegisters.*.billNumber - - - jsonPath: $.billRegisters.*.billDate - dbType: LONG - - - jsonPath: $.billRegisters.*.billAmount - dbType: DOUBLE - - - jsonPath: $.billRegisters.*.passedAmount - dbType: DOUBLE - - - jsonPath: $.billRegisters.*.moduleName - - - jsonPath: $.billRegisters.*.status.code - - - jsonPath: $.billRegisters.*.fund.code - - - jsonPath: $.billRegisters.*.function.code - - - jsonPath: $.billRegisters.*.fundsource.code - - - jsonPath: $.billRegisters.*.scheme.code - - - jsonPath: $.billRegisters.*.subScheme.code - - - jsonPath: $.billRegisters.*.functionary.code - - - jsonPath: $.billRegisters.*.location.code - - - jsonPath: $.billRegisters.*.department.code - - - jsonPath: $.billRegisters.*.sourcePath - - - jsonPath: $.billRegisters.*.budgetCheckRequired - - - jsonPath: $.billRegisters.*.budgetAppropriationNo - - - jsonPath: $.billRegisters.*.partyBillNumber - - - jsonPath: $.billRegisters.*.partyBillDate - dbType: LONG - - - jsonPath: $.billRegisters.*.description - - - jsonPath: $.billRegisters.*.auditDetails.createdBy - - - jsonPath: $.billRegisters.*.auditDetails.lastModifiedBy - - - jsonPath: $.billRegisters.*.auditDetails.createdTime - dbType: LONG - - - jsonPath: $.billRegisters.*.auditDetails.lastModifiedTime - dbType: LONG - - - query: INSERT INTO egf_billdetail(tenantId, id, orderid, chartofaccount, debitamount, creditamount, function, bill, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - basePath: $.billRegisters.*.billDetails.* - jsonMaps: - - - jsonPath: $.billRegisters.*.billDetails.*.tenantId - - - jsonPath: $.billRegisters.*.billDetails.*.id - - - jsonPath: $.billRegisters.*.billDetails.*.orderId - dbType: INTEGER - - - jsonPath: $.billRegisters.*.billDetails.*.chartOfAccount.glcode - - - jsonPath: $.billRegisters.*.billDetails.*.debitAmount - dbType: DOUBLE - - - jsonPath: $.billRegisters.*.billDetails.*.creditAmount - dbType: DOUBLE - - - jsonPath: $.billRegisters.*.billDetails.*.function.code - - - jsonPath: $.billRegisters[?({id} in @.billDetails[*].id)].billNumber - - - jsonPath: $.billRegisters.*.billDetails.*.auditDetails.createdBy - - - jsonPath: $.billRegisters.*.billDetails.*.auditDetails.lastModifiedBy - - - jsonPath: $.billRegisters.*.billDetails.*.auditDetails.createdTime - dbType: LONG - - - jsonPath: $.billRegisters.*.billDetails.*.auditDetails.lastModifiedTime - dbType: LONG - - - query: INSERT INTO egf_billpayeedetail(tenantId, id, accountdetailtype, accountdetailkey, amount, billdetail, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - basePath: $.billRegisters.*.billDetails.*.billPayeeDetails.* - jsonMaps: - - - jsonPath: $.billRegisters.*.billDetails.*.billPayeeDetails.*.tenantId - - - jsonPath: $.billRegisters.*.billDetails.*.billPayeeDetails.*.id - - - jsonPath: $.billRegisters.*.billDetails.*.billPayeeDetails.*.accountDetailType.id - - - jsonPath: $.billRegisters.*.billDetails.*.billPayeeDetails.*.accountDetailKey.id - - - jsonPath: $.billRegisters.*.billDetails.*.billPayeeDetails.*.amount - dbType: DOUBLE - - - jsonPath: $.billRegisters.*.billDetails[?({id} in @.billPayeeDetails[*].id)].id - - - jsonPath: $.billRegisters.*.billDetails.*.billPayeeDetails.*.auditDetails.createdBy - - - jsonPath: $.billRegisters.*.billDetails.*.billPayeeDetails.*.auditDetails.lastModifiedBy - - - jsonPath: $.billRegisters.*.billDetails.*.billPayeeDetails.*.auditDetails.createdTime - dbType: LONG - - - jsonPath: $.billRegisters.*.billDetails.*.billPayeeDetails.*.auditDetails.lastModifiedTime - dbType: LONG - - - query: INSERT INTO egf_billchecklist(tenantId, id, bill, checklist, checklistvalue, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?); - basePath: $.billRegisters.*.checkLists.* - jsonMaps: - - - jsonPath: $.billRegisters.*.checkLists.*.tenantId - - - jsonPath: $.billRegisters.*.checkLists.*.id - - - jsonPath: $.billRegisters[?({id} in @.checkLists[*].id)].billNumber - - - jsonPath: $.billRegisters.*.checkLists.*.checklist.code - - - jsonPath: $.billRegisters.*.checkLists.*.checklistValue - - - jsonPath: $.billRegisters.*.checkLists.*.auditDetails.createdBy - - - jsonPath: $.billRegisters.*.checkLists.*.auditDetails.lastModifiedBy - - - jsonPath: $.billRegisters.*.checkLists.*.auditDetails.createdTime - dbType: LONG - - - jsonPath: $.billRegisters.*.checkLists.*.auditDetails.lastModifiedTime - dbType: LONG - - - - version: 1.0 - name: bill update - description: update bills in egf_billregister - fromTopic: egf-bill-billregister-update-topic - queryMaps: - - query: update egf_billregister set billtype=? , billsubtype=? , billdate=? , billamount=? , passedamount=? , modulename=? , status=? , fund=? , function=? , fundsource=? , scheme=? , subscheme=? , functionary=? , location=? , department=? , sourcepath=? , budgetcheckrequired=? , budgetappropriationno=? , partybillnumber=? , partybilldate=? , description=? ,lastmodifiedby=? , lastmodifiedtime=? where tenantId=? and billNumber=?; - basePath: $.billRegisters.* - jsonMaps: - - - jsonPath: $.billRegisters.*.billType - - - jsonPath: $.billRegisters.*.billSubType - - - jsonPath: $.billRegisters.*.billDate - dbType: LONG - - - jsonPath: $.billRegisters.*.billAmount - dbType: DOUBLE - - - jsonPath: $.billRegisters.*.passedAmount - dbType: DOUBLE - - - jsonPath: $.billRegisters.*.moduleName - - - jsonPath: $.billRegisters.*.status.code - - - jsonPath: $.billRegisters.*.fund.code - - - jsonPath: $.billRegisters.*.function.code - - - jsonPath: $.billRegisters.*.fundsource.code - - - jsonPath: $.billRegisters.*.scheme.code - - - jsonPath: $.billRegisters.*.subScheme.code - - - jsonPath: $.billRegisters.*.functionary.code - - - jsonPath: $.billRegisters.*.location.code - - - jsonPath: $.billRegisters.*.department.code - - - jsonPath: $.billRegisters.*.sourcePath - - - jsonPath: $.billRegisters.*.budgetCheckRequired - - - jsonPath: $.billRegisters.*.budgetAppropriationNo - - - jsonPath: $.billRegisters.*.partyBillNumber - - - jsonPath: $.billRegisters.*.partyBillDate - dbType: LONG - - - jsonPath: $.billRegisters.*.description - - - jsonPath: $.billRegisters.*.auditDetails.lastModifiedBy - - - jsonPath: $.billRegisters.*.auditDetails.lastModifiedTime - dbType: LONG - - - jsonPath: $.billRegisters.*.tenantId - - - jsonPath: $.billRegisters.*.billNumber - - - query: INSERT INTO egf_billdetail(tenantId, id, orderid, chartofaccount, debitamount, creditamount, function, bill, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - basePath: $.billRegisters.*.billDetails.* - jsonMaps: - - - jsonPath: $.billRegisters.*.billDetails.*.tenantId - - - jsonPath: $.billRegisters.*.billDetails.*.id - - - jsonPath: $.billRegisters.*.billDetails.*.orderId - dbType: INTEGER - - - jsonPath: $.billRegisters.*.billDetails.*.chartOfAccount.glcode - - - jsonPath: $.billRegisters.*.billDetails.*.debitAmount - dbType: DOUBLE - - - jsonPath: $.billRegisters.*.billDetails.*.creditAmount - dbType: DOUBLE - - - jsonPath: $.billRegisters.*.billDetails.*.function.code - - - jsonPath: $.billRegisters[?({id} in @.billDetails[*].id)].billNumber - - - jsonPath: $.billRegisters.*.billDetails.*.auditDetails.createdBy - - - jsonPath: $.billRegisters.*.billDetails.*.auditDetails.lastModifiedBy - - - jsonPath: $.billRegisters.*.billDetails.*.auditDetails.createdTime - dbType: LONG - - - jsonPath: $.billRegisters.*.billDetails.*.auditDetails.lastModifiedTime - dbType: LONG - - - query: INSERT INTO egf_billpayeedetail(tenantId, id, accountdetailtype, accountdetailkey, amount, billdetail, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - basePath: $.billRegisters.*.billDetails.*.billPayeeDetails.* - jsonMaps: - - - jsonPath: $.billRegisters.*.billDetails.*.billPayeeDetails.*.tenantId - - - jsonPath: $.billRegisters.*.billDetails.*.billPayeeDetails.*.id - - - jsonPath: $.billRegisters.*.billDetails.*.billPayeeDetails.*.accountDetailType.id - - - jsonPath: $.billRegisters.*.billDetails.*.billPayeeDetails.*.accountDetailKey.id - - - jsonPath: $.billRegisters.*.billDetails.*.billPayeeDetails.*.amount - dbType: DOUBLE - - - jsonPath: $.billRegisters.*.billDetails[?({id} in @.billPayeeDetails[*].id)].id - - - jsonPath: $.billRegisters.*.billDetails.*.billPayeeDetails.*.auditDetails.createdBy - - - jsonPath: $.billRegisters.*.billDetails.*.billPayeeDetails.*.auditDetails.lastModifiedBy - - - jsonPath: $.billRegisters.*.billDetails.*.billPayeeDetails.*.auditDetails.createdTime - dbType: LONG - - - jsonPath: $.billRegisters.*.billDetails.*.billPayeeDetails.*.auditDetails.lastModifiedTime - dbType: LONG - - - version: 1.0 - name: checklist create - description: create checklists in egf_checklist - fromTopic: egf-bill-checklist-save-topic - queryMaps: - - query: INSERT INTO egf_checklist(code, type, subType, key, description, createdby, lastmodifiedby, createdtime, lastmodifiedtime, tenantId) VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - basePath: $.checklists.* - jsonMaps: - - - jsonPath: $.checklists.*.code - - - jsonPath: $.checklists.*.type - - - jsonPath: $.checklists.*.subType - - - jsonPath: $.checklists.*.key - - - jsonPath: $.checklists.*.description - - - jsonPath: $.checklists.*.auditDetails.createdBy - - - jsonPath: $.checklists.*.auditDetails.lastModifiedBy - - - jsonPath: $.checklists.*.auditDetails.createdTime - dbType: LONG - - - jsonPath: $.checklists.*.auditDetails.lastModifiedTime - dbType: LONG - - - jsonPath: $.checklists.*.tenantId - - - - version: 1.0 - name: checklist update - description: update checklists in egf_checklist - fromTopic: egf-bill-checklist-update-topic - queryMaps: - - query: update egf_checklist set type=?, subType=?, key=?, description=?, lastmodifiedby=?, lastmodifiedtime=? where code=? and tenantId=?; - basePath: $.checklists.* - jsonMaps: - - - jsonPath: $.checklists.*.type - - - jsonPath: $.checklists.*.subType - - - jsonPath: $.checklists.*.key - - - jsonPath: $.checklists.*.description - - - jsonPath: $.checklists.*.auditDetails.lastModifiedBy - - - jsonPath: $.checklists.*.auditDetails.lastModifiedTime - dbType: LONG - - - jsonPath: $.checklists.*.code - - - jsonPath: $.checklists.*.tenantId diff --git a/configs/egov-persister/egov-user-event-persister.yml b/configs/egov-persister/egov-user-event-persister.yml deleted file mode 100644 index 8132b8c8..00000000 --- a/configs/egov-persister/egov-user-event-persister.yml +++ /dev/null @@ -1,154 +0,0 @@ -serviceMaps: - serviceName: mSeva Event Notification - mappings: - - version: 1.0 - name: mSeva - description: Persists events into the table - fromTopic: save-user-events - isTransaction: true - queryMaps: - - query: INSERT INTO eg_usrevents_events(tenantid, id, source, eventtype, category, name, postedby, referenceid, description, status, eventdetails, actions, recepient, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - - basePath: events.* - jsonMaps: - - - - jsonPath: $.events.*.tenantId - - - jsonPath: $.events.*.id - - - jsonPath: $.events.*.source - - - jsonPath: $.events.*.eventType - - - jsonPath: $.events.*.eventCategory - - - jsonPath: $.events.*.name - - - jsonPath: $.events.*.postedBy - - - jsonPath: $.events.*.referenceId - - - jsonPath: $.events.*.description - - - jsonPath: $.events.*.status - - - jsonPath: $.events.*.eventDetails - type: JSON - dbType: JSONB - - - jsonPath: $.events.*.actions - type: JSON - dbType: JSONB - - - jsonPath: $.events.*.recepient - type: JSON - dbType: JSONB - - - jsonPath: $.events.*.auditDetails.createdBy - - - jsonPath: $.events.*.auditDetails.createdTime - - - jsonPath: $.events.*.auditDetails.lastModifiedBy - - - jsonPath: $.events.*.auditDetails.lastModifiedTime - - - - - query: INSERT INTO eg_usrevents_recepnt_event_registry(recepient, eventid) VALUES (?, ?); - - basePath: events.*.recepientEventMap.* - jsonMaps: - - - - jsonPath: $.events.*.recepientEventMap.*.recepient - - - jsonPath: $.events.*.recepientEventMap.*.eventId - - - - - - - version: 1.0 - name: mSeva - description: Updates event details in the table - fromTopic: update-user-events - isTransaction: true - queryMaps: - - query: UPDATE eg_usrevents_events SET description = ?, status = ?, name = ?, category = ?, eventdetails = ?, actions = ?, recepient = ? , lastmodifiedby = ?, lastmodifiedtime = ? WHERE id = ?; - - basePath: events.* - jsonMaps: - - - jsonPath: $.events.*.description - - - jsonPath: $.events.*.status - - - jsonPath: $.events.*.name - - - jsonPath: $.events.*.eventCategory - - - jsonPath: $.events.*.eventDetails - type: JSON - dbType: JSONB - - - jsonPath: $.events.*.actions - type: JSON - dbType: JSONB - - - jsonPath: $.events.*.recepient - type: JSON - dbType: JSONB - - - jsonPath: $.events.*.auditDetails.lastModifiedBy - - - jsonPath: $.events.*.auditDetails.lastModifiedTime - - - jsonPath: $.events.*.id - - - - - query: DELETE FROM eg_usrevents_recepnt_event_registry WHERE eventid = ?; - - basePath: events.* - jsonMaps: - - - jsonPath: $.events.*.id - - - - - query: INSERT INTO eg_usrevents_recepnt_event_registry(recepient, eventid) VALUES (?, ?); - - basePath: events.*.recepientEventMap.* - jsonMaps: - - - - jsonPath: $.events.*.recepientEventMap.*.recepient - - - jsonPath: $.events.*.recepientEventMap.*.eventId - - - - - - - version: 1.0 - name: mSeva - description: Persists user last login details - fromTopic: user-events-lat - isTransaction: true - queryMaps: - - query: INSERT INTO eg_usrevents_user_lat(userid, lastaccesstime) VALUES (?, ?) ON CONFLICT (userid) DO UPDATE SET lastaccesstime = ?; - - basePath: lastAccessDetails - jsonMaps: - - - - jsonPath: $.lastAccessDetails.userId - - - jsonPath: $.lastAccessDetails.lastAccessTime - - - jsonPath: $.lastAccessDetails.lastAccessTime - - - - diff --git a/configs/egov-persister/egov-workflow-v2-persister.yml b/configs/egov-persister/egov-workflow-v2-persister.yml deleted file mode 100644 index 97412d3e..00000000 --- a/configs/egov-persister/egov-workflow-v2-persister.yml +++ /dev/null @@ -1,272 +0,0 @@ -serviceMaps: - serviceName: egov-workflow-v2 - mappings: - - version: 1.0 - description: Persists workflow processInstanceFromRequest details in eg_workflow_v2 table - fromTopic: save-wf-transitions - isTransaction: true - queryMaps: - - - query: INSERT INTO eg_wf_processinstance_v2( id,tenantid,businessService,businessId,moduleName,action,status,comment, assigner, stateSla,businessServiceSla, previousStatus, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - basePath: ProcessInstances.* - jsonMaps: - - jsonPath: $.ProcessInstances.*.id - - - jsonPath: $.ProcessInstances.*.tenantId - - - jsonPath: $.ProcessInstances.*.businessService - - - jsonPath: $.ProcessInstances.*.businessId - - - jsonPath: $.ProcessInstances.*.moduleName - - - jsonPath: $.ProcessInstances.*.action - - - jsonPath: $.ProcessInstances.*.state.uuid - - - jsonPath: $.ProcessInstances.*.comment - - - jsonPath: $.ProcessInstances.*.assigner.uuid - - - jsonPath: $.ProcessInstances.*.stateSla - - - jsonPath: $.ProcessInstances.*.businesssServiceSla - - - jsonPath: $.ProcessInstances.*.previousStatus - - - jsonPath: $.ProcessInstances.*.auditDetails.createdBy - - - jsonPath: $.ProcessInstances.*.auditDetails.lastModifiedBy - - - jsonPath: $.ProcessInstances.*.auditDetails.createdTime - - - jsonPath: $.ProcessInstances.*.auditDetails.lastModifiedTime - - - - - - query: INSERT INTO eg_wf_document_v2( id, tenantid, active, documenttype,documentUid, processinstanceid, filestoreid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - basePath: ProcessInstances.*.documents.* - jsonMaps: - - jsonPath: $.ProcessInstances.documents.*.id - - - jsonPath: $.ProcessInstances.documents.*.tenantId - - - jsonPath: $.ProcessInstances.documents.*.active - - - jsonPath: $.ProcessInstances.documents.*.documentType - - - jsonPath: $.ProcessInstances.documents.*.documentUid - - - jsonPath: $.ProcessInstances[*][?({id} in @.documents[*].id)].id - - - jsonPath: $.ProcessInstances.documents.*.fileStoreId - - - jsonPath: $.ProcessInstances.documents.*.auditDetails.createdBy - - - jsonPath: $.ProcessInstances.documents.*.auditDetails.lastModifiedBy - - - jsonPath: $.ProcessInstances.documents.*.auditDetails.createdTime - - - jsonPath: $.ProcessInstances.documents.*.auditDetails.lastModifiedTime - - - - query: INSERT INTO eg_wf_assignee_v2(processinstanceid, tenantid, assignee, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?); - basePath: ProcessInstances.*.assignes.* - jsonMaps: - - jsonPath: $.ProcessInstances[*][?({uuid} in @.assignes[*].uuid)].id - - - jsonPath: $.ProcessInstances[*][?({uuid} in @.assignes[*].uuid)].tenantId - - - jsonPath: $.ProcessInstances.*.assignes.*.uuid - - - jsonPath: $.ProcessInstances[*][?({uuid} in @.assignes[*].uuid)].auditDetails.createdBy - - - jsonPath: $.ProcessInstances[*][?({uuid} in @.assignes[*].uuid)].auditDetails.lastModifiedBy - - - jsonPath: $.ProcessInstances[*][?({uuid} in @.assignes[*].uuid)].auditDetails.createdTime - - - jsonPath: $.ProcessInstances[*][?({uuid} in @.assignes[*].uuid)].auditDetails.lastModifiedTime - - - - - - version: 1.0 - description: Persists BusinessService in the table - fromTopic: save-wf-businessservice - isTransaction: true - queryMaps: - - - query: INSERT INTO eg_wf_businessservice_v2(businessServiceSla, businessservice, business, tenantid, uuid, geturi, posturi, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - basePath: BusinessServices.* - jsonMaps: - - jsonPath: $.BusinessServices.*.businessServiceSla - - - jsonPath: $.BusinessServices.*.businessService - - - jsonPath: $.BusinessServices.*.business - - - jsonPath: $.BusinessServices.*.tenantId - - - jsonPath: $.BusinessServices.*.uuid - - - jsonPath: $.BusinessServices.*.geturi - - - jsonPath: $.BusinessServices.*.posturi - - - jsonPath: $.BusinessServices.*.auditDetails.createdBy - - - jsonPath: $.BusinessServices.*.auditDetails.createdTime - - - jsonPath: $.BusinessServices.*.auditDetails.lastModifiedBy - - - jsonPath: $.BusinessServices.*.auditDetails.lastModifiedTime - - - - - - query: INSERT INTO eg_wf_state_v2(seq, uuid, tenantid, businessserviceid, state,applicationStatus,sla,docuploadrequired, isstartstate, isterminatestate,isStateUpdatable, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (nextval('seq_eg_wf_state_v2'),? , ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - basePath: BusinessServices.*.states.* - jsonMaps: - - jsonPath: $.BusinessServices.*.states.*.uuid - - - jsonPath: $.BusinessServices.*.states.*.tenantId - - - jsonPath: $.BusinessServices[*][?({uuid} in @.states[*].uuid)].uuid - - - jsonPath: $.BusinessServices.*.states.*.state - - - jsonPath: $.BusinessServices.*.states.*.applicationStatus - - - jsonPath: $.BusinessServices.*.states.*.sla - - - jsonPath: $.BusinessServices.*.states.*.docUploadRequired - - - jsonPath: $.BusinessServices.*.states.*.isStartState - - - jsonPath: $.BusinessServices.*.states.*.isTerminateState - - - jsonPath: $.BusinessServices.*.states.*.isStateUpdatable - - - jsonPath: $.BusinessServices.*.states.*.auditDetails.createdBy - - - jsonPath: $.BusinessServices.*.states.*.auditDetails.createdTime - - - jsonPath: $.BusinessServices.*.states.*.auditDetails.lastModifiedBy - - - jsonPath: $.BusinessServices.*.states.*.auditDetails.lastModifiedTime - - - - - query: INSERT INTO eg_wf_action_v2( uuid,tenantId, currentState, action, nextstate, roles, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - basePath: BusinessServices.*.states.*.actions.* - jsonMaps: - - jsonPath: $.BusinessServices.*.states.*.actions.*.uuid - - - jsonPath: $.BusinessServices.*.states.*.actions.*.tenantId - - - jsonPath: $.BusinessServices.*.states[*][?({uuid} in @.actions[*].uuid)].uuid - - - jsonPath: $.BusinessServices.*.states.*.actions.*.action - - - jsonPath: $.BusinessServices.*.states.*.actions.*.nextState - - - jsonPath: $.BusinessServices.*.states.*.actions.*.roles - type: ARRAY - dbType: STRING - - - jsonPath: $.BusinessServices.*.states.*.actions.*.auditDetails.createdBy - - - jsonPath: $.BusinessServices.*.states.*.actions.*.auditDetails.createdTime - - - jsonPath: $.BusinessServices.*.states.*.actions.*.auditDetails.lastModifiedBy - - - jsonPath: $.BusinessServices.*.states.*.actions.*.auditDetails.lastModifiedTime - - - - - version: 1.0 - description: Persists BusinessService in the table - fromTopic: update-wf-businessservice - isTransaction: true - queryMaps: - - - query: UPDATE eg_wf_businessservice_v2 SET businessservicesla=?,businessservice=?, business=?, geturi=?, posturi=?, lastmodifiedby=?, lastmodifiedtime=? WHERE uuid=?; - basePath: BusinessServices.* - jsonMaps: - - jsonPath: $.BusinessServices.*.businessServiceSla - - - jsonPath: $.BusinessServices.*.businessService - - - jsonPath: $.BusinessServices.*.business - - - jsonPath: $.BusinessServices.*.geturi - - - jsonPath: $.BusinessServices.*.posturi - - - jsonPath: $.BusinessServices.*.auditDetails.lastModifiedBy - - - jsonPath: $.BusinessServices.*.auditDetails.lastModifiedTime - - - jsonPath: $.BusinessServices.*.uuid - - - - - - query: INSERT INTO eg_wf_state_v2(seq, uuid, tenantid, businessserviceid, state,applicationStatus,sla,docuploadrequired, isstartstate, isterminatestate,isStateUpdatable, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (nextval('seq_eg_wf_state_v2'), ?,?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (uuid) DO UPDATE SET state=EXCLUDED.state,sla=EXCLUDED.sla,docuploadrequired=EXCLUDED.docuploadrequired,isstartstate=EXCLUDED.isstartstate, isterminatestate=EXCLUDED.isterminatestate,isStateUpdatable=EXCLUDED.isStateUpdatable, lastmodifiedby=EXCLUDED.lastmodifiedby, lastmodifiedtime=EXCLUDED.lastmodifiedtime; - basePath: BusinessServices.*.states.* - jsonMaps: - - - jsonPath: $.BusinessServices.*.states.*.uuid - - - jsonPath: $.BusinessServices.*.states.*.tenantId - - - jsonPath: $.BusinessServices[*][?({uuid} in @.states[*].uuid)].uuid - - - jsonPath: $.BusinessServices.*.states.*.state - - - jsonPath: $.BusinessServices.*.states.*.applicationStatus - - - jsonPath: $.BusinessServices.*.states.*.sla - - - jsonPath: $.BusinessServices.*.states.*.docUploadRequired - - - jsonPath: $.BusinessServices.*.states.*.isStartState - - - jsonPath: $.BusinessServices.*.states.*.isTerminateState - - - jsonPath: $.BusinessServices.*.states.*.isStateUpdatable - - - jsonPath: $.BusinessServices.*.states.*.auditDetails.createdBy - - - jsonPath: $.BusinessServices.*.states.*.auditDetails.createdTime - - - jsonPath: $.BusinessServices.*.states.*.auditDetails.lastModifiedBy - - - jsonPath: $.BusinessServices.*.states.*.auditDetails.lastModifiedTime - - - query: INSERT INTO eg_wf_action_v2( uuid,tenantId, currentState, action, nextstate, roles, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (uuid) DO UPDATE SET action=EXCLUDED.action, nextstate=EXCLUDED.nextstate, roles=EXCLUDED.roles, lastmodifiedby=EXCLUDED.lastmodifiedby, lastmodifiedtime=EXCLUDED.lastmodifiedtime; - basePath: BusinessServices.*.states.*.actions.* - jsonMaps: - - - jsonPath: $.BusinessServices.*.states.*.actions.*.uuid - - - jsonPath: $.BusinessServices.*.states.*.actions.*.tenantId - - - jsonPath: $.BusinessServices.*.states[*][?({uuid} in @.actions[*].uuid)].uuid - - - jsonPath: $.BusinessServices.*.states.*.actions.*.action - - - jsonPath: $.BusinessServices.*.states.*.actions.*.nextState - - - jsonPath: $.BusinessServices.*.states.*.actions.*.roles - type: ARRAY - dbType: STRING - - - jsonPath: $.BusinessServices.*.states.*.actions.*.auditDetails.createdBy - - - jsonPath: $.BusinessServices.*.states.*.actions.*.auditDetails.createdTime - - - jsonPath: $.BusinessServices.*.states.*.actions.*.auditDetails.lastModifiedBy - - - jsonPath: $.BusinessServices.*.states.*.actions.*.auditDetails.lastModifiedTime diff --git a/configs/egov-persister/firenoc-calculator-persister.yml b/configs/egov-persister/firenoc-calculator-persister.yml deleted file mode 100644 index 12773dd6..00000000 --- a/configs/egov-persister/firenoc-calculator-persister.yml +++ /dev/null @@ -1,92 +0,0 @@ -serviceMaps: - serviceName: FIRENOC_CALCULATOR - mappings: - - version: 1.0 - name: firenoc-calculator - description: Persists billing slab details in the table - fromTopic: save-firenoc-calculator-billingslab - isTransaction: true - queryMaps: - - query: INSERT INTO eg_firenoc_billingslab (id, tenantid, isactive , firenoctype, buildingusagetype, calculationtype, uom, fromuom, touom, fromdate, todate, rate, createdby, createddate, lastmodifiedby, lastModifiedDate) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?); - - basePath: BillingSlabs.* - jsonMaps: - - jsonPath: $.BillingSlabs.*.id - - - jsonPath: $.BillingSlabs.*.tenantId - - - jsonPath: $.BillingSlabs.*.isActive - - - jsonPath: $.BillingSlabs.*.fireNOCType - - - jsonPath: $.BillingSlabs.*.buildingUsageType - - - jsonPath: $.BillingSlabs.*.calculationType - - - jsonPath: $.BillingSlabs.*.uom - - - jsonPath: $.BillingSlabs.*.fromUom - - - jsonPath: $.BillingSlabs.*.toUom - - - jsonPath: $.BillingSlabs.*.fromDate - - - jsonPath: $.BillingSlabs.*.toDate - - - jsonPath: $.BillingSlabs.*.rate - - - jsonPath: $.BillingSlabs.*.auditDetails.createdBy - - - jsonPath: $.BillingSlabs.*.auditDetails.createdDate - - - jsonPath: $.BillingSlabs.*.auditDetails.lastModifiedBy - - - jsonPath: $.BillingSlabs.*.auditDetails.lastModifiedDate - - - version: 1.0 - name: firenoc-calculator - description: Persists billing slab details in the table - fromTopic: update-firenoc-calculator-billingslab - isTransaction: true - queryMaps: - - query: DELETE FROM eg_firenoc_billingslab - - basePath: BillingSlabs.* - jsonMaps: - - jsonPath: $.BillingSlabs.*.id - - - query: INSERT INTO eg_firenoc_billingslab (id, tenantid, isactive , firenoctype, buildingusagetype, calculationtype, uom, fromuom, touom, fromdate, todate, rate, createdby, createddate, lastmodifiedby, lastModifiedDate) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?); - - basePath: BillingSlabs.* - jsonMaps: - - jsonPath: $.BillingSlabs.*.id - - - jsonPath: $.BillingSlabs.*.tenantId - - - jsonPath: $.BillingSlabs.*.isActive - - - jsonPath: $.BillingSlabs.*.fireNOCType - - - jsonPath: $.BillingSlabs.*.buildingUsageType - - - jsonPath: $.BillingSlabs.*.calculationType - - - jsonPath: $.BillingSlabs.*.uom - - - jsonPath: $.BillingSlabs.*.fromUom - - - jsonPath: $.BillingSlabs.*.toUom - - - jsonPath: $.BillingSlabs.*.fromDate - - - jsonPath: $.BillingSlabs.*.toDate - - - jsonPath: $.BillingSlabs.*.rate - - - jsonPath: $.BillingSlabs.*.auditDetails.createdBy - - - jsonPath: $.BillingSlabs.*.auditDetails.createdDate - - - jsonPath: $.BillingSlabs.*.auditDetails.lastModifiedBy - - - jsonPath: $.BillingSlabs.*.auditDetails.lastModifiedDate diff --git a/configs/egov-persister/firenoc_persiter.yaml b/configs/egov-persister/firenoc_persiter.yaml deleted file mode 100644 index e7a57fde..00000000 --- a/configs/egov-persister/firenoc_persiter.yaml +++ /dev/null @@ -1,643 +0,0 @@ -serviceMaps: - serviceName: fn-services - mappings: - - version: 1.0 - description: Persists fireNOC details in eg_fn_firenoc table - fromTopic: save-fn-firenoc - isTransaction: true - queryMaps: - - - query: INSERT INTO eg_fn_firenoc(uuid, tenantid, firenocnumber, provisionfirenocnumber, oldfirenocnumber, dateofapplied, createdby, lastmodifiedby, createdtime, lastmodifiedtime,islegacy) VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?); - basePath: FireNOCs.* - jsonMaps: - - jsonPath: $.FireNOCs.*.id - - - jsonPath: $.FireNOCs.*.tenantId - - - jsonPath: $.FireNOCs.*.firenocnumber - - - jsonPath: $.FireNOCs.*.provisionfirenocnumber - - - jsonPath: $.FireNOCs.*.oldfirenocnumber - - - jsonPath: $.FireNOCs.*.dateofapplied - - - jsonPath: $.FireNOCs.*.auditDetails.createdBy - - - jsonPath: $.FireNOCs.*.auditDetails.lastModifiedBy - - - jsonPath: $.FireNOCs.*.auditDetails.createdTime - - - jsonPath: $.FireNOCs.*.auditDetails.lastModifiedTime - - - jsonPath: $.FireNOCs.*.islegacy - - - - query: INSERT INTO eg_fn_firenocdetail(uuid, firenocuuid, applicationnumber, firenoctype, firestationid, applicationdate, financialyear, issueddate, validfrom, validto, action,channel, noofbuildings, tenantid, additionaldetail, createdby, lastmodifiedby, createdtime, lastmodifiedtime, propertyid,status) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?); - basePath: FireNOCs.*.fireNOCDetails - jsonMaps: - - jsonPath: $.FireNOCs.*.fireNOCDetails.id - - - jsonPath: $.FireNOCs.*.id - - - jsonPath: $.FireNOCs.*.fireNOCDetails.applicationNumber - - - jsonPath: $.FireNOCs.*.fireNOCDetails.fireNOCType - - - jsonPath: $.FireNOCs.*.fireNOCDetails.firestationId - - - jsonPath: $.FireNOCs.*.fireNOCDetails.applicationDate - - - jsonPath: $.FireNOCs.*.fireNOCDetails.financialYear - - - jsonPath: $.FireNOCs.*.fireNOCDetails.issuedDate - - - jsonPath: $.FireNOCs.*.fireNOCDetails.validFrom - - - jsonPath: $.FireNOCs.*.fireNOCDetails.validTo - - - jsonPath: $.FireNOCs.*.fireNOCDetails.action - - - jsonPath: $.FireNOCs.*.fireNOCDetails.channel - - - jsonPath: $.FireNOCs.*.fireNOCDetails.noOfBuildings - - - jsonPath: $.FireNOCs.*.fireNOCDetails.tenantId - - - jsonPath: $.FireNOCs.*.fireNOCDetails.additionalDetail - type: JSON - dbType: JSONB - - - jsonPath: $.FireNOCs.*.auditDetails.createdBy - - - jsonPath: $.FireNOCs.*.auditDetails.lastModifiedBy - - - jsonPath: $.FireNOCs.*.auditDetails.createdTime - - - jsonPath: $.FireNOCs.*.auditDetails.lastModifiedTime - - - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.propertyid - - - jsonPath: $.FireNOCs.*.fireNOCDetails.status - - - - query: INSERT INTO eg_fn_owner(uuid, tenantid, firenocdetailsuuid, isactive, isprimaryowner, ownertype, ownershippercentage, relationship, active, institutionid, createdby, createdtime, lastmodifiedby, lastmodifiedtime,useruuid) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?); - basePath: FireNOCs.*.fireNOCDetails.applicantDetails.owners.* - jsonMaps: - - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.owners.*.ownerUUID - - - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.owners.*.tenantId - - - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.applicantDetails.owners[*].id)].fireNOCDetails.id - - - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.owners.*.isActive - - - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.owners.*.isPrimaryOwner - - - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.applicantDetails.owners[*].id)].fireNOCDetails.applicantDetails.ownerShipType - - - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.owners.*.ownerShipPercentage - - - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.owners.*.relationship - - - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.owners.*.active - - - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.applicantDetails.owners[*].id)].fireNOCDetails.applicantDetails.additionalDetail.id - - - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.applicantDetails.owners[*].id)].auditDetails.createdBy - - - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.applicantDetails.owners[*].id)].auditDetails.createdTime - - - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.applicantDetails.owners[*].id)].auditDetails.lastModifiedBy - - - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.applicantDetails.owners[*].id)].auditDetails.lastModifiedTime - - - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.owners.*.uuid - - - query: INSERT INTO public.eg_fn_address(uuid, tenantid, doorno, latitude, longitude, buildingname, addressid, addressnumber, type, addressline1, addressline2, landmark, street, city, locality, pincode, detail, firenocdetailsuuid, createdby, lastmodifiedby, createdtime, lastmodifiedtime,areatype,subdistrict) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?,?); - basePath: FireNOCs.*.fireNOCDetails.propertyDetails.address - jsonMaps: - - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.id - - - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.tenantId - - - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.doorNo - - - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.latitude - - - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.longitude - - - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.buildingName - - - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.addressId - - - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.addressNumber - - - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.type - - - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.addressLine1 - - - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.addressLine2 - - - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.landmark - - - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.street - - - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.city - - - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.locality.code - - - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.pincode - - - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.detail - - - jsonPath: $.FireNOCs.*.fireNOCDetails.id - - - jsonPath: $.FireNOCs.*.auditDetails.createdBy - - - jsonPath: $.FireNOCs.*.auditDetails.lastModifiedBy - - - jsonPath: $.FireNOCs.*.auditDetails.createdTime - - - jsonPath: $.FireNOCs.*.auditDetails.lastModifiedTime - - - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.areaType - - - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.subDistrict - - - query: INSERT INTO public.eg_fn_institution(uuid, tenantid, firenocdetailsuuid, name, type, designation, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - basePath: FireNOCs.*.fireNOCDetails.applicantDetails.additionalDetail - jsonMaps: - - - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.additionalDetail.id - - - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.additionalDetail.tenantId - - - jsonPath: $.FireNOCs.*.fireNOCDetails.id - - - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.additionalDetail.name - - - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.additionalDetail.type - - - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.additionalDetail.designation - - - jsonPath: $.FireNOCs.*.auditDetails.createdBy - - - jsonPath: $.FireNOCs.*.auditDetails.createdTime - - - jsonPath: $.FireNOCs.*.auditDetails.lastModifiedBy - - - jsonPath: $.FireNOCs.*.auditDetails.lastModifiedTime - - - query: INSERT INTO eg_fn_buidlings(uuid, firenocdetailsuuid, tenantid, name, createdby, lastmodifiedby, createdtime, lastmodifiedtime, usagetype,usagesubtype,leftsurrounding,rightsurrounding,frontsurrounding,backsurrounding,landarea,totalcoveredarea,parkingarea) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?,?,?,?,?,?,?,?,?); - basePath: FireNOCs.*.fireNOCDetails.buildings.* - jsonMaps: - - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.id - - - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings[*].id)].fireNOCDetails.id - - - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.tenantId - - - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.name - - - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings[*].id)].auditDetails.createdBy - - - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings[*].id)].auditDetails.lastModifiedBy - - - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings[*].id)].auditDetails.createdTime - - - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings[*].id)].auditDetails.lastModifiedTime - - - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.usageType - - - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.usageSubType - - - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.leftSurrounding - - - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.rightSurrounding - - - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.frontSurrounding - - - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.backSurrounding - - - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.landArea - - - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.totalCoveredArea - - - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.parkingArea - - - - - - - query: INSERT INTO eg_fn_buildingdocuments(uuid, tenantid, documenttype, filestoreid, active, documentuid, createdby, createdtime, lastmodifiedby, lastmodifiedtime, buildinguuid) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - basePath: FireNOCs.*.fireNOCDetails.buildings.*.applicationDocuments.* - jsonMaps: - - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.applicationDocuments.*.id - - - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings.*.applicationDocuments[*].id)].tenantId - - - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.applicationDocuments.*.documentType - - - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.applicationDocuments.*.fileStoreId - - - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.applicationDocuments.*.active - - - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.applicationDocuments.*.documentUid - - - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings.*.applicationDocuments[*].id)].auditDetails.createdBy - - - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings.*.applicationDocuments[*].id)].auditDetails.createdTime - - - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings.*.applicationDocuments[*].id)].auditDetails.lastModifiedBy - - - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings.*.applicationDocuments[*].id)].auditDetails.lastModifiedTime - - - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings[*][?({id} in @.applicationDocuments[*].id)].id - - - query: INSERT INTO eg_fn_buildinguoms(uuid, code, activeuom, active, createdby, lastmodifiedby, createdtime, lastmodifiedtime, buildinguuid,value) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?,?); - basePath: FireNOCs.*.fireNOCDetails.buildings.*.uoms.* - jsonMaps: - - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.uoms.*.id - - - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.uoms.*.code - - - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.uoms.*.isActiveUom - - - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.uoms.*.active - - - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings.*.uoms[*].id)].auditDetails.createdBy - - - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings.*.uoms[*].id)].auditDetails.lastModifiedBy - - - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings.*.uoms[*].id)].auditDetails.createdTime - - - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings.*.uoms[*].id)].auditDetails.lastModifiedTime - - - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings[*][?({id} in @.uoms[*].id)].id - - - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.uoms.*.value - - - version: 1.0 - description: Update fire NOC details in eg_fn_firenoc table - fromTopic: update-fn-firenoc - isTransaction: true - queryMaps: - - - query: UPDATE eg_fn_firenoc SET provisionFireNOCNumber = ?,oldFireNOCNumber = ?,lastmodifiedby = ?, lastmodifiedtime = ? WHERE uuid=?; - basePath: FireNOCs.* - jsonMaps: - - jsonPath: $.FireNOCs.*.provisionFireNOCNumber - - - jsonPath: $.FireNOCs.*.oldFireNOCNumber - - - jsonPath: $.FireNOCs.*.auditDetails.lastModifiedBy - - - jsonPath: $.FireNOCs.*.auditDetails.lastModifiedTime - - - jsonPath: $.FireNOCs.*.id - - - - query: UPDATE eg_fn_firenocdetail SET fireNOCType = ?, firestationId = ?, additionaldetail = ?,financialYear = ?,action = ?,status=?,channel = ?,noOfBuildings = ?,propertyId = ?,lastmodifiedby = ?, lastmodifiedtime = ? WHERE uuid = ?; - basePath: FireNOCs.*.fireNOCDetails - jsonMaps: - - - jsonPath: $.FireNOCs.*.fireNOCDetails.fireNOCType - - - jsonPath: $.FireNOCs.*.fireNOCDetails.firestationId - - - jsonPath: $.FireNOCs.*.fireNOCDetails.additionalDetail - type: JSON - dbType: JSONB - - - jsonPath: $.FireNOCs.*.fireNOCDetails.financialYear - - - jsonPath: $.FireNOCs.*.fireNOCDetails.action - - - jsonPath: $.FireNOCs.*.fireNOCDetails.status - - - jsonPath: $.FireNOCs.*.fireNOCDetails.channel - - - jsonPath: $.FireNOCs.*.fireNOCDetails.noOfBuildings - - - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.propertyId - - - jsonPath: $.FireNOCs.*.auditDetails.lastModifiedBy - - - jsonPath: $.FireNOCs.*.auditDetails.lastModifiedTime - - - jsonPath: $.FireNOCs.*.fireNOCDetails.id - - - - query: INSERT INTO eg_fn_buidlings(uuid, tenantid, name, usagetype, firenocdetailsuuid, createdby, lastmodifiedby, createdtime, lastmodifiedtime,usagesubtype,leftsurrounding,rightsurrounding,frontsurrounding,backsurrounding,landarea,totalcoveredarea,parkingarea) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?,?,?,?,?,?,?,?,?) ON CONFLICT (uuid) DO UPDATE SET active = ?, name = ?, usageType = ?, lastmodifiedby = ?, lastmodifiedtime = ?,usagesubtype=?, leftsurrounding=?, rightsurrounding=?, frontsurrounding=?, backsurrounding=?, landarea=?,totalcoveredarea=?,parkingArea=?; - basePath: FireNOCs.*.fireNOCDetails.buildings.* - jsonMaps: - - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.id - - - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.tenantId - - - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.name - - - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.usageType - - - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings[*].id)].fireNOCDetails.id - - - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings[*].id)].auditDetails.createdBy - - - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings[*].id)].auditDetails.lastModifiedBy - - - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings[*].id)].auditDetails.createdTime - - - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings[*].id)].auditDetails.lastModifiedTime - - - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.usageSubType - - - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.leftSurrounding - - - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.rightSurrounding - - - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.frontSurrounding - - - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.backSurrounding - - - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.landArea - - - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.totalCoveredArea - - - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.parkingArea - - - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.active - - - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.name - - - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.usageType - - - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings[*].id)].auditDetails.lastModifiedBy - - - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings[*].id)].auditDetails.lastModifiedTime - - - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.usageSubType - - - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.leftSurrounding - - - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.rightSurrounding - - - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.frontSurrounding - - - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.backSurrounding - - - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.landArea - - - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.totalCoveredArea - - - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.parkingArea - - - - - query: INSERT INTO eg_fn_buildingdocuments(uuid, tenantid, documenttype, filestoreid, active, documentuid, createdby, createdtime, lastmodifiedby, lastmodifiedtime, buildinguuid) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (uuid) DO UPDATE SET active = ?,documentType = ?, fileStoreId = ?, documentUid=?,lastmodifiedby = ?, lastmodifiedtime = ?; - basePath: FireNOCs.*.fireNOCDetails.buildings.*.applicationDocuments.* - jsonMaps: - - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.applicationDocuments.*.id - - - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings.*.applicationDocuments[*].id)].tenantId - - - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.applicationDocuments.*.documentType - - - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.applicationDocuments.*.fileStoreId - - - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.applicationDocuments.*.active - - - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.applicationDocuments.*.documentUid - - - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings.*.applicationDocuments[*].id)].auditDetails.createdBy - - - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings.*.applicationDocuments[*].id)].auditDetails.createdTime - - - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings.*.applicationDocuments[*].id)].auditDetails.lastModifiedBy - - - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings.*.applicationDocuments[*].id)].auditDetails.lastModifiedTime - - - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings[*][?({id} in @.applicationDocuments[*].id)].id - - - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.applicationDocuments.*.active - - - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.applicationDocuments.*.documentType - - - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.applicationDocuments.*.fileStoreId - - - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.applicationDocuments.*.documentUid - - - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings.*.applicationDocuments[*].id)].auditDetails.lastModifiedBy - - - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings.*.applicationDocuments[*].id)].auditDetails.lastModifiedTime - - - query: INSERT INTO eg_fn_buildinguoms(uuid, code, activeuom, active, createdby, lastmodifiedby, createdtime, lastmodifiedtime, buildinguuid,value) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?,?) ON CONFLICT (uuid) DO UPDATE SET active = ?,code = ?, activeuom = ?, value=?,lastmodifiedby = ?, lastmodifiedtime = ?; - basePath: FireNOCs.*.fireNOCDetails.buildings.*.uoms.* - jsonMaps: - - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.uoms.*.id - - - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.uoms.*.code - - - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.uoms.*.isActiveUom - - - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.uoms.*.active - - - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings.*.uoms[*].id)].auditDetails.createdBy - - - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings.*.uoms[*].id)].auditDetails.lastModifiedBy - - - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings.*.uoms[*].id)].auditDetails.createdTime - - - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings.*.uoms[*].id)].auditDetails.lastModifiedTime - - - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings[*][?({id} in @.uoms[*].id)].id - - - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.uoms.*.value - - - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.uoms.*.active - - - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.uoms.*.code - - - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.uoms.*.isActiveUom - - - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.uoms.*.value - - - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings.*.uoms[*].id)].auditDetails.lastModifiedBy - - - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings.*.uoms[*].id)].auditDetails.lastModifiedTime - - - - query: INSERT INTO eg_fn_owner(uuid, tenantid, firenocdetailsuuid, isactive, isprimaryowner, ownertype, ownershippercentage, relationship, active, institutionid, createdby, createdtime, lastmodifiedby, lastmodifiedtime,useruuid) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?) ON CONFLICT ON CONSTRAINT pk_eg_fn_owner DO UPDATE SET active = ?, isprimaryowner = ?, ownertype = ?, ownershippercentage = ?, relationship = ?,useruuid=?, lastmodifiedby = ?, lastmodifiedtime = ?; - basePath: FireNOCs.*.fireNOCDetails.applicantDetails.owners.* - jsonMaps: - - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.owners.*.ownerUUID - - - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.owners.*.tenantId - - - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.applicantDetails.owners[*].id)].fireNOCDetails.id - - - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.owners.*.userActive - - - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.owners.*.isPrimaryOwner - - - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.applicantDetails.owners[*].id)].fireNOCDetails.applicantDetails.ownerShipType - - - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.owners.*.ownerShipPercentage - - - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.owners.*.relationship - - - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.owners.*.active - - - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.applicantDetails.owners[*].id)].fireNOCDetails.applicantDetails.additionalDetail.id - - - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.applicantDetails.owners[*].id)].auditDetails.createdBy - - - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.applicantDetails.owners[*].id)].auditDetails.createdTime - - - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.applicantDetails.owners[*].id)].auditDetails.lastModifiedBy - - - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.applicantDetails.owners[*].id)].auditDetails.lastModifiedTime - - - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.owners.*.uuid - - - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.owners.*.userActive - - - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.owners.*.isPrimaryOwner - - - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.applicantDetails.owners[*].id)].fireNOCDetails.applicantDetails.ownerShipType - - - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.owners.*.ownerShipPercentage - - - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.owners.*.relationship - - - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.owners.*.uuid - - - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.applicantDetails.owners[*].id)].auditDetails.lastModifiedBy - - - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.applicantDetails.owners[*].id)].auditDetails.lastModifiedTime - - - query: UPDATE eg_fn_address SET doorno =?,street = ?,buildingName = ?, latitude =?, longitude =?, addressid =?, addressnumber =?,locality =?, type =?, addressline1 =?, addressline2 =?, landmark =?, city =?, pincode =?, detail =?,lastmodifiedby =?, lastmodifiedtime =?, areatype=?, subdistrict=? WHERE uuid =?; - basePath: FireNOCs.*.fireNOCDetails.propertyDetails.address - jsonMaps: - - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.doorNo - - - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.street - - - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.buildingName - - - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.latitude - - - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.longitude - - - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.addressId - - - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.addressNumber - - - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.locality.code - - - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.type - - - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.addressLine1 - - - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.addressLine2 - - - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.landmark - - - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.city - - - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.pincode - - - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.detail - - - jsonPath: $.FireNOCs.*.auditDetails.lastModifiedBy - - - jsonPath: $.FireNOCs.*.auditDetails.lastModifiedTime - - - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.areaType - - - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.subDistrict - - - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.id - - - - - - query: INSERT INTO eg_fn_institution(tenantId,uuid, firenocdetailsuuid, name, type,designation, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (uuid) DO UPDATE SET active = ?,name = ?,type = ?,designation = ?, lastmodifiedby = ?,lastmodifiedtime = ?; - basePath: FireNOCs.*.fireNOCDetails.applicantDetails.additionalDetail - jsonMaps: - - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.additionalDetail.tenantId - - - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.additionalDetail.id - - - jsonPath: $.FireNOCs.*.fireNOCDetails.id - - - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.additionalDetail.name - - - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.additionalDetail.type - - - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.additionalDetail.designation - - - jsonPath: $.FireNOCs.*.auditDetails.createdBy - - - jsonPath: $.FireNOCs.*.auditDetails.lastModifiedBy - - - jsonPath: $.FireNOCs.*.auditDetails.createdTime - - - jsonPath: $.FireNOCs.*.auditDetails.lastModifiedTime - - - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.additionalDetail.active - - - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.additionalDetail.name - - - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.additionalDetail.type - - - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.additionalDetail.designation - - - jsonPath: $.FireNOCs.*.auditDetails.lastModifiedBy - - - jsonPath: $.FireNOCs.*.auditDetails.lastModifiedTime - - - - version: 1.0 - description: Persists tradeLicense details in eg_fn_firenoc table - fromTopic: update-fn-workflow - isTransaction: true - queryMaps: - - - query: UPDATE eg_fn_firenoc SET fireNOCNumber = ?, lastmodifiedby = ?, lastmodifiedtime = ? WHERE uuid=?; - basePath: FireNOCs.* - jsonMaps: - - - jsonPath: $.FireNOCs.*.fireNOCNumber - - - jsonPath: $.FireNOCs.*.auditDetails.lastModifiedBy - - - jsonPath: $.FireNOCs.*.auditDetails.lastModifiedTime - - - jsonPath: $.FireNOCs.*.id - - - - query: UPDATE eg_fn_firenocdetail SET validFrom=?,validTo=?,issueddate = ?, action = ?,status=?, additionaldetail = ?,lastmodifiedby = ?, lastmodifiedtime = ? WHERE uuid = ?; - basePath: FireNOCs.*.fireNOCDetails - jsonMaps: - - - jsonPath: $.FireNOCs.*.fireNOCDetails.validFrom - - - jsonPath: $.FireNOCs.*.fireNOCDetails.validTo - - - jsonPath: $.FireNOCs.*.fireNOCDetails.issuedDate - - - jsonPath: $.FireNOCs.*.fireNOCDetails.action - - - jsonPath: $.FireNOCs.*.fireNOCDetails.status - - - jsonPath: $.FireNOCs.*.fireNOCDetails.additionalDetail - type: JSON - dbType: JSONB - - - jsonPath: $.FireNOCs.*.auditDetails.lastModifiedBy - - - jsonPath: $.FireNOCs.*.auditDetails.lastModifiedTime - - - jsonPath: $.FireNOCs.*.fireNOCDetails.id - diff --git a/configs/egov-persister/hrms-employee-persister.yml b/configs/egov-persister/hrms-employee-persister.yml deleted file mode 100644 index e7856e12..00000000 --- a/configs/egov-persister/hrms-employee-persister.yml +++ /dev/null @@ -1,504 +0,0 @@ -serviceMaps: - serviceName: HRMS - mappings: - - version: 1.0 - name: hrms - description: Persists employee details in the table - fromTopic: save-hrms-employee - isTransaction: true - queryMaps: - - query: INSERT INTO eg_hrms_employee(tenantid, id, uuid, code, dateOfAppointment, employeestatus, employeetype, active, createdby, createddate, lastmodifiedby, lastModifiedDate,reactivateemployee) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?); - - basePath: Employees.* - jsonMaps: - - - - jsonPath: $.Employees.*.tenantId - - - jsonPath: $.Employees.*.id - - - jsonPath: $.Employees.*.uuid - - - jsonPath: $.Employees.*.code - - - jsonPath: $.Employees.*.dateOfAppointment - - - jsonPath: $.Employees.*.employeeStatus - - - jsonPath: $.Employees.*.employeeType - - - jsonPath: $.Employees.*.isActive - - - jsonPath: $.Employees.*.auditDetails.createdBy - - - jsonPath: $.Employees.*.auditDetails.createdDate - - - jsonPath: $.Employees.*.auditDetails.lastModifiedBy - - - jsonPath: $.Employees.*.auditDetails.lastModifiedDate - - - jsonPath: $.Employees.*.reActivateEmployee - - - - query: INSERT INTO eg_hrms_assignment(tenantid, uuid, position, department, designation, fromdate, todate, govtordernumber, reportingto, isHOD, iscurrentassignment, employeeid, createdby, createddate, lastmodifiedby, lastModifiedDate) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - - basePath: Employees.*.assignments.* - jsonMaps: - - - - jsonPath: $.Employees[*][?({id} in @.assignments[*].id)].tenantId - - - jsonPath: $.Employees.*.assignments.*.id - - - jsonPath: $.Employees.*.assignments.*.position - - - jsonPath: $.Employees.*.assignments.*.department - - - jsonPath: $.Employees.*.assignments.*.designation - - - jsonPath: $.Employees.*.assignments.*.fromDate - - - jsonPath: $.Employees.*.assignments.*.toDate - - - jsonPath: $.Employees.*.assignments.*.govtOrderNumber - - - jsonPath: $.Employees.*.assignments.*.reportingTo - - - jsonPath: $.Employees.*.assignments.*.isHOD - - - jsonPath: $.Employees.*.assignments.*.isCurrentAssignment - - - jsonPath: $.Employees[*][?({id} in @.assignments[*].id)].uuid - - - jsonPath: $.Employees.*.assignments.*.auditDetails.createdBy - - - jsonPath: $.Employees.*.assignments.*.auditDetails.createdDate - - - jsonPath: $.Employees.*.assignments.*.auditDetails.lastModifiedBy - - - jsonPath: $.Employees.*.assignments.*.auditDetails.lastModifiedDate - - - - - - query: INSERT INTO eg_hrms_educationaldetails(tenantid, uuid, employeeid, qualification, stream, yearofpassing, university, remarks, isactive, createdby, createddate, lastmodifiedby, lastModifiedDate) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - - basePath: Employees.*.education.* - jsonMaps: - - - - jsonPath: $.Employees[*][?({id} in @.education[*].id)].tenantId - - - jsonPath: $.Employees.*.education.*.id - - - jsonPath: $.Employees[*][?({id} in @.education[*].id)].uuid - - - jsonPath: $.Employees.*.education.*.qualification - - - jsonPath: $.Employees.*.education.*.stream - - - jsonPath: $.Employees.*.education.*.yearOfPassing - - - jsonPath: $.Employees.*.education.*.university - - - jsonPath: $.Employees.*.education.*.remarks - - - jsonPath: $.Employees.*.education.*.isActive - - - jsonPath: $.Employees.*.education.*.auditDetails.createdBy - - - jsonPath: $.Employees.*.education.*.auditDetails.createdDate - - - jsonPath: $.Employees.*.education.*.auditDetails.lastModifiedBy - - - jsonPath: $.Employees.*.education.*.auditDetails.lastModifiedDate - - - - query: INSERT INTO eg_hrms_departmentaltests(tenantid, uuid, employeeid, test, yearofpassing, remarks, isactive, createdby, createddate, lastmodifiedby, lastModifiedDate) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - - basePath: Employees.*.tests.* - jsonMaps: - - - - jsonPath: $.Employees[*][?({id} in @.tests[*].id)].tenantId - - - jsonPath: $.Employees.*.tests.*.id - - - jsonPath: $.Employees[*][?({id} in @.tests[*].id)].uuid - - - jsonPath: $.Employees.*.tests.*.test - - - jsonPath: $.Employees.*.tests.*.yearOfPassing - - - jsonPath: $.Employees.*.tests.*.remarks - - - jsonPath: $.Employees.*.tests.*.isActive - - - jsonPath: $.Employees.*.tests.*.auditDetails.createdBy - - - jsonPath: $.Employees.*.tests.*.auditDetails.createdDate - - - jsonPath: $.Employees.*.tests.*.auditDetails.lastModifiedBy - - - jsonPath: $.Employees.*.tests.*.auditDetails.lastModifiedDate - - - - query: INSERT INTO eg_hrms_empdocuments(tenantid, uuid, employeeid, documentid, documentname, referencetype, referenceid, createdby, createddate, lastmodifiedby, lastModifiedDate) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - - basePath: Employees.*.documents.* - jsonMaps: - - - - jsonPath: $.Employees[*][?({id} in @.documents[*].id)].tenantId - - - jsonPath: $.Employees.*.documents.*.id - - - jsonPath: $.Employees[*][?({id} in @.documents[*].id)].uuid - - - jsonPath: $.Employees.*.documents.*.documentId - - - jsonPath: $.Employees.*.documents.*.documentName - - - jsonPath: $.Employees.*.documents.*.referenceType - - - jsonPath: $.Employees.*.documents.*.referenceId - - - jsonPath: $.Employees.*.documents.*.auditDetails.createdBy - - - jsonPath: $.Employees.*.documents.*.auditDetails.createdDate - - - jsonPath: $.Employees.*.documents.*.auditDetails.lastModifiedBy - - - jsonPath: $.Employees.*.documents.*.auditDetails.lastModifiedDate - - - - query: INSERT INTO eg_hrms_servicehistory(tenantid, uuid, employeeid, servicestatus, servicefrom, serviceto, ordernumber, isCurrentPosition, location, createdby, createddate, lastmodifiedby, lastModifiedDate) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - - basePath: Employees.*.serviceHistory.* - jsonMaps: - - - - jsonPath: $.Employees[*][?({id} in @.serviceHistory[*].id)].tenantId - - - jsonPath: $.Employees.*.serviceHistory.*.id - - - jsonPath: $.Employees[*][?({id} in @.serviceHistory[*].id)].uuid - - - jsonPath: $.Employees.*.serviceHistory.*.serviceStatus - - - jsonPath: $.Employees.*.serviceHistory.*.serviceFrom - - - jsonPath: $.Employees.*.serviceHistory.*.serviceTo - - - jsonPath: $.Employees.*.serviceHistory.*.orderNo - - - jsonPath: $.Employees.*.serviceHistory.*.isCurrentPosition - - - jsonPath: $.Employees.*.serviceHistory.*.location - - - jsonPath: $.Employees.*.serviceHistory.*.auditDetails.createdBy - - - jsonPath: $.Employees.*.serviceHistory.*.auditDetails.createdDate - - - jsonPath: $.Employees.*.serviceHistory.*.auditDetails.lastModifiedBy - - - jsonPath: $.Employees.*.serviceHistory.*.auditDetails.lastModifiedDate - - - - query: INSERT INTO eg_hrms_jurisdiction (uuid, employeeid, hierarchy, boundarytype, boundary, tenantid, isActive, createdby, createddate, lastmodifiedby, lastModifiedDate) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - - basePath: Employees.*.jurisdictions.* - jsonMaps: - - - jsonPath: $.Employees.*.jurisdictions.*.id - - - jsonPath: $.Employees[*][?({id} in @.jurisdictions[*].id)].uuid - - - jsonPath: $.Employees.*.jurisdictions.*.hierarchy - - - jsonPath: $.Employees.*.jurisdictions.*.boundaryType - - - jsonPath: $.Employees.*.jurisdictions.*.boundary - - - jsonPath: $.Employees[*][?({id} in @.jurisdictions[*].id)].tenantId - - - jsonPath: $.Employees.*.jurisdictions.*.isActive - - - jsonPath: $.Employees.*.jurisdictions.*.auditDetails.createdBy - - - jsonPath: $.Employees.*.jurisdictions.*.auditDetails.createdDate - - - jsonPath: $.Employees.*.jurisdictions.*.auditDetails.lastModifiedBy - - - jsonPath: $.Employees.*.jurisdictions.*.auditDetails.lastModifiedDate - - - - - - version: 1.0 - name: hrms - description: Persists employee details in the table - fromTopic: update-hrms-employee - isTransaction: true - queryMaps: - - query: DELETE from eg_hrms_employee WHERE uuid=? - - basePath: Employees.* - jsonMaps: - - - jsonPath: $.Employees.*.uuid - - - query: INSERT INTO eg_hrms_employee(tenantid, id, uuid, code, dateOfAppointment, employeestatus, employeetype, active, createdby, createddate, lastmodifiedby, lastModifiedDate,reactivateemployee) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - - basePath: Employees.* - jsonMaps: - - - - jsonPath: $.Employees.*.tenantId - - - jsonPath: $.Employees.*.id - - - jsonPath: $.Employees.*.uuid - - - jsonPath: $.Employees.*.code - - - jsonPath: $.Employees.*.dateOfAppointment - - - jsonPath: $.Employees.*.employeeStatus - - - jsonPath: $.Employees.*.employeeType - - - jsonPath: $.Employees.*.isActive - - - jsonPath: $.Employees.*.auditDetails.createdBy - - - jsonPath: $.Employees.*.auditDetails.createdDate - - - jsonPath: $.Employees.*.auditDetails.lastModifiedBy - - - jsonPath: $.Employees.*.auditDetails.lastModifiedDate - - - jsonPath: $.Employees.*.reActivateEmployee - - - - - query: INSERT INTO eg_hrms_assignment(tenantid, uuid, position, department, designation, fromdate, todate, govtordernumber, reportingto, isHOD, iscurrentassignment, employeeid, createdby, createddate, lastmodifiedby, lastModifiedDate) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - - basePath: Employees.*.assignments.* - jsonMaps: - - - - jsonPath: $.Employees[*][?({id} in @.assignments[*].id)].tenantId - - - jsonPath: $.Employees.*.assignments.*.id - - - jsonPath: $.Employees.*.assignments.*.position - - - jsonPath: $.Employees.*.assignments.*.department - - - jsonPath: $.Employees.*.assignments.*.designation - - - jsonPath: $.Employees.*.assignments.*.fromDate - - - jsonPath: $.Employees.*.assignments.*.toDate - - - jsonPath: $.Employees.*.assignments.*.govtOrderNumber - - - jsonPath: $.Employees.*.assignments.*.reportingTo - - - jsonPath: $.Employees.*.assignments.*.isHOD - - - jsonPath: $.Employees.*.assignments.*.isCurrentAssignment - - - jsonPath: $.Employees[*][?({id} in @.assignments[*].id)].uuid - - - jsonPath: $.Employees.*.assignments.*.auditDetails.createdBy - - - jsonPath: $.Employees.*.assignments.*.auditDetails.createdDate - - - jsonPath: $.Employees.*.assignments.*.auditDetails.lastModifiedBy - - - jsonPath: $.Employees.*.assignments.*.auditDetails.lastModifiedDate - - - - - - query: INSERT INTO eg_hrms_educationaldetails(tenantid, uuid, employeeid, qualification, stream, yearofpassing, university, remarks, isactive, createdby, createddate, lastmodifiedby, lastModifiedDate) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - - basePath: Employees.*.education.* - jsonMaps: - - - - jsonPath: $.Employees[*][?({id} in @.education[*].id)].tenantId - - - jsonPath: $.Employees.*.education.*.id - - - jsonPath: $.Employees[*][?({id} in @.education[*].id)].uuid - - - jsonPath: $.Employees.*.education.*.qualification - - - jsonPath: $.Employees.*.education.*.stream - - - jsonPath: $.Employees.*.education.*.yearOfPassing - - - jsonPath: $.Employees.*.education.*.university - - - jsonPath: $.Employees.*.education.*.remarks - - - jsonPath: $.Employees.*.education.*.isActive - - - jsonPath: $.Employees.*.education.*.auditDetails.createdBy - - - jsonPath: $.Employees.*.education.*.auditDetails.createdDate - - - jsonPath: $.Employees.*.education.*.auditDetails.lastModifiedBy - - - jsonPath: $.Employees.*.education.*.auditDetails.lastModifiedDate - - - - query: INSERT INTO eg_hrms_departmentaltests(tenantid, uuid, employeeid, test, yearofpassing, remarks, isactive, createdby, createddate, lastmodifiedby, lastModifiedDate) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - - basePath: Employees.*.tests.* - jsonMaps: - - - - jsonPath: $.Employees[*][?({id} in @.tests[*].id)].tenantId - - - jsonPath: $.Employees.*.tests.*.id - - - jsonPath: $.Employees[*][?({id} in @.tests[*].id)].uuid - - - jsonPath: $.Employees.*.tests.*.test - - - jsonPath: $.Employees.*.tests.*.yearOfPassing - - - jsonPath: $.Employees.*.tests.*.remarks - - - jsonPath: $.Employees.*.tests.*.isActive - - - jsonPath: $.Employees.*.tests.*.auditDetails.createdBy - - - jsonPath: $.Employees.*.tests.*.auditDetails.createdDate - - - jsonPath: $.Employees.*.tests.*.auditDetails.lastModifiedBy - - - jsonPath: $.Employees.*.tests.*.auditDetails.lastModifiedDate - - - - query: INSERT INTO eg_hrms_empdocuments(tenantid, uuid, employeeid, documentid, documentname, referencetype, referenceid, createdby, createddate, lastmodifiedby, lastModifiedDate) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - - basePath: Employees.*.documents.* - jsonMaps: - - - - jsonPath: $.Employees[*][?({id} in @.documents[*].id)].tenantId - - - jsonPath: $.Employees.*.documents.*.id - - - jsonPath: $.Employees[*][?({id} in @.documents[*].id)].uuid - - - jsonPath: $.Employees.*.documents.*.documentId - - - jsonPath: $.Employees.*.documents.*.documentName - - - jsonPath: $.Employees.*.documents.*.referenceType - - - jsonPath: $.Employees.*.documents.*.referenceId - - - jsonPath: $.Employees.*.documents.*.auditDetails.createdBy - - - jsonPath: $.Employees.*.documents.*.auditDetails.createdDate - - - jsonPath: $.Employees.*.documents.*.auditDetails.lastModifiedBy - - - jsonPath: $.Employees.*.documents.*.auditDetails.lastModifiedDate - - - - query: INSERT INTO eg_hrms_servicehistory(tenantid, uuid, employeeid, servicestatus, servicefrom, serviceto, ordernumber, isCurrentPosition, location, createdby, createddate, lastmodifiedby, lastModifiedDate) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - - basePath: Employees.*.serviceHistory.* - jsonMaps: - - - - jsonPath: $.Employees[*][?({id} in @.serviceHistory[*].id)].tenantId - - - jsonPath: $.Employees.*.serviceHistory.*.id - - - jsonPath: $.Employees[*][?({id} in @.serviceHistory[*].id)].uuid - - - jsonPath: $.Employees.*.serviceHistory.*.serviceStatus - - - jsonPath: $.Employees.*.serviceHistory.*.serviceFrom - - - jsonPath: $.Employees.*.serviceHistory.*.serviceTo - - - jsonPath: $.Employees.*.serviceHistory.*.orderNo - - - jsonPath: $.Employees.*.serviceHistory.*.isCurrentPosition - - - jsonPath: $.Employees.*.serviceHistory.*.location - - - jsonPath: $.Employees.*.serviceHistory.*.auditDetails.createdBy - - - jsonPath: $.Employees.*.serviceHistory.*.auditDetails.createdDate - - - jsonPath: $.Employees.*.serviceHistory.*.auditDetails.lastModifiedBy - - - jsonPath: $.Employees.*.serviceHistory.*.auditDetails.lastModifiedDate - - - - query: INSERT INTO eg_hrms_jurisdiction (uuid, employeeid, hierarchy, boundarytype, boundary, tenantid, isActive, createdby, createddate, lastmodifiedby, lastModifiedDate) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - - basePath: Employees.*.jurisdictions.* - jsonMaps: - - - jsonPath: $.Employees.*.jurisdictions.*.id - - - jsonPath: $.Employees[*][?({id} in @.jurisdictions[*].id)].uuid - - - jsonPath: $.Employees.*.jurisdictions.*.hierarchy - - - jsonPath: $.Employees.*.jurisdictions.*.boundaryType - - - jsonPath: $.Employees.*.jurisdictions.*.boundary - - - jsonPath: $.Employees[*][?({id} in @.jurisdictions[*].id)].tenantId - - - jsonPath: $.Employees.*.jurisdictions.*.isActive - - - jsonPath: $.Employees.*.jurisdictions.*.auditDetails.createdBy - - - jsonPath: $.Employees.*.jurisdictions.*.auditDetails.createdDate - - - jsonPath: $.Employees.*.jurisdictions.*.auditDetails.lastModifiedBy - - - jsonPath: $.Employees.*.jurisdictions.*.auditDetails.lastModifiedDate - - - - - query: INSERT INTO eg_hrms_deactivationdetails(uuid, employeeid, reasonfordeactivation, effectivefrom, ordernumber, remarks, tenantid, createdby, createddate, lastmodifiedby, lastModifiedDate) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - - basePath: Employees.*.deactivationDetails.* - jsonMaps: - - - jsonPath: $.Employees.*.deactivationDetails.*.id - - - jsonPath: $.Employees[*][?({id} in @.deactivationDetails[*].id)].uuid - - - jsonPath: $.Employees.*.deactivationDetails.*.reasonForDeactivation - - - jsonPath: $.Employees.*.deactivationDetails.*.effectiveFrom - - - jsonPath: $.Employees.*.deactivationDetails.*.orderNo - - - jsonPath: $.Employees.*.deactivationDetails.*.remarks - - - jsonPath: $.Employees[*][?({id} in @.deactivationDetails[*].id)].tenantId - - - jsonPath: $.Employees.*.deactivationDetails.*.auditDetails.createdBy - - - jsonPath: $.Employees.*.deactivationDetails.*.auditDetails.createdDate - - - jsonPath: $.Employees.*.deactivationDetails.*.auditDetails.lastModifiedBy - - - jsonPath: $.Employees.*.deactivationDetails.*.auditDetails.lastModifiedDate diff --git a/configs/egov-persister/indexer-job-persister.yml b/configs/egov-persister/indexer-job-persister.yml deleted file mode 100644 index 46ce7b3e..00000000 --- a/configs/egov-persister/indexer-job-persister.yml +++ /dev/null @@ -1,68 +0,0 @@ -serviceMaps: - serviceName: Indexer - mappings: - - version: 1.0 - name: Indexer - description: Persists index jobs to table - fromTopic: save-index-jobs - isTransaction: true - queryMaps: - - query: INSERT INTO eg_indexer_job(tenantid, jobid, requesterid, typeofjob, oldindex, newindex, jobstatus, totaltimetakeninms, recordstobeindexed, totalrecordsindexed, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - basePath: job - jsonMaps: - - - - jsonPath: $.job.tenantId - - - jsonPath: $.job.jobId - - - jsonPath: $.job.requesterId - - - jsonPath: $.job.typeOfJob - - - jsonPath: $.job.oldIndex - - - jsonPath: $.job.newIndex - - - jsonPath: $.job.jobStatus - - - jsonPath: $.job.totalTimeTakenInMS - - - jsonPath: $.job.recordsToBeIndexed - - - jsonPath: $.job.totalRecordsIndexed - - - jsonPath: $.job.auditDetails.createdBy - - - jsonPath: $.job.auditDetails.createdTime - - - jsonPath: $.job.auditDetails.lastModifiedBy - - - jsonPath: $.job.auditDetails.lastModifiedTime - - - - - version: 1.0 - name: Indexer - description: Updates index jobs in the table - fromTopic: update-index-jobs - isTransaction: true - queryMaps: - - query: UPDATE eg_indexer_job SET jobStatus = ?, totalTimeTakenInMS = ?, totalrecordsindexed = ?, lastmodifiedby = ?, lastmodifiedtime = ? WHERE jobid = ? - basePath: job - jsonMaps: - - - - jsonPath: $.job.jobStatus - - - jsonPath: $.job.totalTimeTakenInMS - - - jsonPath: $.job.totalRecordsIndexed - - - jsonPath: $.job.auditDetails.lastModifiedBy - - - jsonPath: $.job.auditDetails.lastModifiedTime - - - jsonPath: $.job.jobId - - \ No newline at end of file diff --git a/configs/egov-persister/migration-batch-count-persister.yml b/configs/egov-persister/migration-batch-count-persister.yml deleted file mode 100644 index 46295c65..00000000 --- a/configs/egov-persister/migration-batch-count-persister.yml +++ /dev/null @@ -1,27 +0,0 @@ -serviceMaps: - serviceName: property-services - mappings: - - version: 1.0 - description: Persists property details in EG_PT_PROPERTY table - fromTopic: migartion-batch-count - isTransaction: true - queryMaps: - - - - query: INSERT INTO eg_pt_property_migration (id,batch,batchsize,createdtime,tenantid,recordCount) VALUES (?,?,?,?,?,?); - basePath: MigrationCount - jsonMaps: - - - jsonPath: $.MigrationCount.id - - - jsonPath: $.MigrationCount.offset - - - jsonPath: $.MigrationCount.limit - - - jsonPath: $.MigrationCount.createdTime - - - jsonPath: $.MigrationCount.tenantid - - - jsonPath: $.MigrationCount.recordCount - - \ No newline at end of file diff --git a/configs/egov-persister/pdf-filestoreid-update.yml b/configs/egov-persister/pdf-filestoreid-update.yml deleted file mode 100644 index 1549d28d..00000000 --- a/configs/egov-persister/pdf-filestoreid-update.yml +++ /dev/null @@ -1,30 +0,0 @@ -serviceMaps: - serviceName: pdf-service - mappings: - - version: 1.0 - description: Update fileStoreIds - fromTopic: PDF_GEN_CREATE - isTransaction: true - queryMaps: - - - - query: UPDATE eg_tl_tradelicense SET filestoreid=? WHERE id = ? - basePath: jobs.* - jsonMaps: - - - jsonPath: $.jobs.*.filestoreids - type: ARRAY - dbType: STRING - - - jsonPath: $.jobs.*.entityid - - - - query: UPDATE egbs_bill_v1 SET filestoreid=? WHERE id = ? - basePath: jobs.* - jsonMaps: - - - jsonPath: $.jobs.*.filestoreids - type: ARRAY - dbType: STRING - - - jsonPath: $.jobs.*.entityid diff --git a/configs/egov-persister/pdf-generator.yml b/configs/egov-persister/pdf-generator.yml deleted file mode 100644 index 9bb8c94a..00000000 --- a/configs/egov-persister/pdf-generator.yml +++ /dev/null @@ -1,41 +0,0 @@ -serviceMaps: - serviceName: PDF Generation Service - mappings: - - version: 1.0 - name: PDF create - description: create PDF - fromTopic: PDF_GEN_CREATE - queryMaps: - - query: INSERT INTO egov_pdf_gen(jobid,filestoreids,tenantid,createdtime,endtime,totalcount,entityid,isconsolidated,id,createdby,modifiedby,key,documenttype,modulename) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - basePath: $.jobs.* - jsonMaps: - - - jsonPath: $.jobs.*.jobid - - - jsonPath: $.jobs.*.filestoreids - type: JSON - dbType: JSONB - - - jsonPath: $.jobs.*.tenantId - - - jsonPath: $.jobs.*.createdtime - - - jsonPath: $.jobs.*.endtime - - - jsonPath: $.jobs.*.totalcount - - - jsonPath: $.jobs.*.entityid - - - jsonPath: $.jobs.*.isconsolidated - - - jsonPath: $.jobs.*.id - - - jsonPath: $.jobs.*.createdby - - - jsonPath: $.jobs.*.modifiedby - - - jsonPath: $.jobs.*.key - - - jsonPath: $.jobs.*.documentType - - - jsonPath: $.jobs.*.moduleName diff --git a/configs/egov-persister/pg-service-persister.yml b/configs/egov-persister/pg-service-persister.yml deleted file mode 100644 index 341954f9..00000000 --- a/configs/egov-persister/pg-service-persister.yml +++ /dev/null @@ -1,147 +0,0 @@ -serviceMaps: - serviceName: PaymentGateway - mappings: - - version: 1.0 - name: pg-service - description: Persists transactions - fromTopic: save-pg-txns - isTransaction: true - queryMaps: - - query: INSERT INTO eg_pg_transactions (txn_id, txn_amount, txn_status, txn_status_msg, gateway, consumer_code, bill_id, product_info, user_uuid, user_name, mobile_number, email_id, name, user_tenant_id, tenant_id, gateway_txn_id, gateway_payment_mode, gateway_status_code, gateway_status_msg, receipt, additional_details, created_by, created_time, last_modified_by, last_modified_time) VALUES (?, ?::numeric, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - - basePath: Transaction - jsonMaps: - - - jsonPath: $.Transaction.txnId - - - jsonPath: $.Transaction.txnAmount - - - jsonPath: $.Transaction.txnStatus - - - jsonPath: $.Transaction.txnStatusMsg - - - jsonPath: $.Transaction.gateway - - - jsonPath: $.Transaction.consumerCode - - - jsonPath: $.Transaction.billId - - - jsonPath: $.Transaction.productInfo - - - jsonPath: $.Transaction.user.uuid - - - jsonPath: $.Transaction.user.userName - - - jsonPath: $.Transaction.user.mobileNumber - - - jsonPath: $.Transaction.user.emailId - - - jsonPath: $.Transaction.user.name - - - jsonPath: $.Transaction.user.tenantId - - - jsonPath: $.Transaction.tenantId - - - jsonPath: $.Transaction.gatewayTxnId - - - jsonPath: $.Transaction.gatewayPaymentMode - - - jsonPath: $.Transaction.gatewayStatusCode - - - jsonPath: $.Transaction.gatewayStatusMsg - - - jsonPath: $.Transaction.receipt - - - jsonPath: $.Transaction.additionalDetails - type: JSON - dbType: JSONB - - - jsonPath: $.Transaction.auditDetails.createdBy - - - jsonPath: $.Transaction.auditDetails.createdTime - - - jsonPath: $.Transaction.auditDetails.lastModifiedBy - - - jsonPath: $.Transaction.auditDetails.lastModifiedTime - - - - - version: 1.0 - name: pg-service - description: Persists transaction requests / response to and from gateways - fromTopic: save-pg-txns-dump - isTransaction: true - queryMaps: - - - query: INSERT INTO eg_pg_transactions_dump (txn_id, txn_request, txn_response, created_by, created_time, last_modified_by, last_modified_time) VALUES (?, ?, ?, ?, ?, ?, ?); - - basePath: TransactionDump - jsonMaps: - - - jsonPath: $.TransactionDump.txnId - - - jsonPath: $.TransactionDump.txnRequest - - - jsonPath: $.TransactionDump.txnResponse - type: JSON - dbType: JSONB - - - jsonPath: $.TransactionDump.auditDetails.createdBy - - - jsonPath: $.TransactionDump.auditDetails.createdTime - - - jsonPath: $.TransactionDump.auditDetails.lastModifiedBy - - - jsonPath: $.TransactionDump.auditDetails.lastModifiedTime - - - version: 1.0 - description: Update transaction - fromTopic: update-pg-txns - isTransaction: true - queryMaps: - - - query: UPDATE eg_pg_transactions SET txn_status=?, txn_status_msg=?, gateway_txn_id=?,gateway_payment_mode=?,gateway_status_code=?, gateway_status_msg=?, receipt=?, last_modified_by=?, last_modified_time=? where txn_id=? AND tenant_id=?; - basePath: Transaction - jsonMaps: - - - jsonPath: $.Transaction.txnStatus - - - jsonPath: $.Transaction.txnStatusMsg - - - jsonPath: $.Transaction.gatewayTxnId - - - jsonPath: $.Transaction.gatewayPaymentMode - - - jsonPath: $.Transaction.gatewayStatusCode - - - jsonPath: $.Transaction.gatewayStatusMsg - - - jsonPath: $.Transaction.receipt - - - jsonPath: $.Transaction.auditDetails.lastModifiedBy - - - jsonPath: $.Transaction.auditDetails.lastModifiedTime - - - jsonPath: $.Transaction.txnId - - - jsonPath: $.Transaction.tenantId - - - version: 1.0 - description: Update transaction dump - fromTopic: update-pg-txns-dump - isTransaction: true - queryMaps: - - - query: UPDATE eg_pg_transactions_dump SET txn_response=?, last_modified_by=?, last_modified_time=? where txn_id=? ; - basePath: TransactionDump - jsonMaps: - - - jsonPath: $.TransactionDump.txnResponse - type: JSON - dbType: JSONB - - - jsonPath: $.TransactionDump.auditDetails.lastModifiedBy - - - jsonPath: $.TransactionDump.auditDetails.lastModifiedTime - - - jsonPath: $.TransactionDump.txnId \ No newline at end of file diff --git a/configs/egov-persister/pgr-v3-persister.yml b/configs/egov-persister/pgr-v3-persister.yml deleted file mode 100644 index 3690c374..00000000 --- a/configs/egov-persister/pgr-v3-persister.yml +++ /dev/null @@ -1,211 +0,0 @@ -serviceMaps: - serviceName: User Service - mappings: - - version: 1.0 - name: PGR - description: Persists grievance details in service table - fromTopic: save-pgr-service - isTransaction: true - queryMaps: - - query: INSERT INTO eg_pgr_service(tenantid, servicecode, servicerequestid, description, lat, "long", addressid, address, email, deviceid, accountid, firstname, lastname, phone, attributes, status, source, expectedtime, rating, feedback, landmark, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - - basePath: services.* - jsonMaps: - - - - jsonPath: $.services.*.tenantId - - - jsonPath: $.services.*.serviceCode - - - jsonPath: $.services.*.serviceRequestId - - - jsonPath: $.services.*.description - - - jsonPath: $.services.*.lat - - - jsonPath: $.services.*.long - - - jsonPath: $.services.*.addressId - - - jsonPath: $.services.*.address - - - jsonPath: $.services.*.email - - - jsonPath: $.services.*.deviceId - - - jsonPath: $.services.*.accountId - - - jsonPath: $.services.*.firstName - - - jsonPath: $.services.*.lastName - - - jsonPath: $.services.*.phone - - - jsonPath: $.services.*.attributes - type: JSON - dbType: JSONB - - - jsonPath: $.services.*.status - - - jsonPath: $.services.*.source - - - jsonPath: $.services.*.expectedTime - - - jsonPath: $.services.*.rating - - - jsonPath: $.services.*.feedback - - - jsonPath: $.services.*.landmark - - - jsonPath: $.services.*.auditDetails.createdBy - - - jsonPath: $.services.*.auditDetails.createdTime - - - jsonPath: $.services.*.auditDetails.lastModifiedBy - - - jsonPath: $.services.*.auditDetails.lastModifiedTime - - - - query: INSERT INTO eg_pgr_action(uuid, by, "when", action, status, comments, media, assignee, isinternal, tenantid, businesskey) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - - basePath: actionInfo.* - jsonMaps: - - - jsonPath: $.actionInfo.*.uuid - - - jsonPath: $.actionInfo.*.by - - - jsonPath: $.actionInfo.*.when - - - jsonPath: $.actionInfo.*.action - - - jsonPath: $.actionInfo.*.status - - - jsonPath: $.actionInfo.*.comments - - - jsonPath: $.actionInfo.*.media - type: JSON - dbType: JSONB - - - jsonPath: $.actionInfo.*.assignee - - - jsonPath: $.actionInfo.*.isInternal - - - jsonPath: $.actionInfo.*.tenantId - - - jsonPath: $.actionInfo.*.businessKey - - - - query: INSERT INTO eg_pgr_address(uuid, housenoandstreetname, mohalla, landmark, latitude, longitude, city, tenantid, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - - basePath: services.* - jsonMaps: - - - jsonPath: $.services.*.addressDetail.uuid - - - jsonPath: $.services.*.addressDetail.houseNoAndStreetName - - - jsonPath: $.services.*.addressDetail.mohalla - - - jsonPath: $.services.*.addressDetail.landmark - - - jsonPath: $.services.*.addressDetail.latitude - - - jsonPath: $.services.*.addressDetail.longitude - - - jsonPath: $.services.*.addressDetail.city - - - jsonPath: $.services.*.addressDetail.tenantId - - - jsonPath: $.services.*.addressDetail.auditDetails.createdBy - - - jsonPath: $.services.*.addressDetail.auditDetails.createdTime - - - jsonPath: $.services.*.addressDetail.auditDetails.lastModifiedBy - - - jsonPath: $.services.*.addressDetail.auditDetails.lastModifiedTime - - - - version: 1.0 - name: Asset - description: Persists asset details in eg_asset table - fromTopic: update-pgr-service - isTransaction: true - queryMaps: - - - query: UPDATE eg_pgr_service SET servicecode=?, description=?,lat=?, "long"=?, email=?, deviceid=?, firstname=?, lastname=?, phone=?, attributes=?, status=?, source=?, expectedtime=?, feedback=?, rating=?, landmark=?, lastmodifiedby=?, lastmodifiedtime=? WHERE tenantid=? AND servicerequestid=?; - - basePath: services.* - jsonMaps: - - - jsonPath: $.services.*.serviceCode - - - jsonPath: $.services.*.description - - - jsonPath: $.services.*.lat - - - jsonPath: $.services.*.long - - - jsonPath: $.services.*.email - - - jsonPath: $.services.*.deviceId - - - jsonPath: $.services.*.firstName - - - jsonPath: $.services.*.lastName - - - jsonPath: $.services.*.phone - - - jsonPath: $.services.*.attributes - type: JSON - dbType: JSONB - - - jsonPath: $.services.*.status - - - jsonPath: $.services.*.source - - - jsonPath: $.services.*.expectedTime - - - jsonPath: $.services.*.feedback - - - jsonPath: $.services.*.rating - - - jsonPath: $.services.*.landmark - - - jsonPath: $.services.*.auditDetails.lastModifiedBy - - - jsonPath: $.services.*.auditDetails.lastModifiedTime - - - jsonPath: $.services.*.tenantId - - - jsonPath: $.services.*.serviceRequestId - - - - query: INSERT INTO eg_pgr_action(uuid, by, "when", action, status, comments, media, assignee, isinternal, tenantid, businesskey) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - - basePath: actionInfo.* - jsonMaps: - - - jsonPath: $.actionInfo.*.uuid - - - jsonPath: $.actionInfo.*.by - - - jsonPath: $.actionInfo.*.when - - - jsonPath: $.actionInfo.*.action - - - jsonPath: $.actionInfo.*.status - - - jsonPath: $.actionInfo.*.comments - - - jsonPath: $.actionInfo.*.media - type: JSON - dbType: JSONB - - - jsonPath: $.actionInfo.*.assignee - - - jsonPath: $.actionInfo.*.isInternal - - - jsonPath: $.actionInfo.*.tenantId - - - jsonPath: $.actionInfo.*.businessKey \ No newline at end of file diff --git a/configs/egov-persister/pgr.yml b/configs/egov-persister/pgr.yml deleted file mode 100644 index fda7078f..00000000 --- a/configs/egov-persister/pgr.yml +++ /dev/null @@ -1,203 +0,0 @@ -serviceMaps: - serviceName: User Service - mappings: - - version: 1.0 - name: Asset - description: Persists asset details in eg_asset table - fromTopic: save-pgr-servicereq - isTransaction: true - queryMaps: - - query: INSERT INTO eg_pgr_servicereq(tenantId,serviceCode,serviceRequestId,description,lat,long,address,addressId,email,deviceId,accountId,firstName,lastName,phone,attributes,status,assignedTo,source,expectedTime,createdby,createdtime,lastmodifiedby,lastmodifiedtime) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?); - - basePath: serviceReq.* - jsonMaps: - - - - jsonPath: $.serviceReq.*.tenantId - - - jsonPath: $.serviceReq.*.serviceCode - - - jsonPath: $.serviceReq.*.serviceRequestId - - - jsonPath: $.serviceReq.*.description - - - jsonPath: $.serviceReq.*.lat - - - jsonPath: $.serviceReq.*._long - - - jsonPath: $.serviceReq.*.address - - - jsonPath: $.serviceReq.*.addressId - - - jsonPath: $.serviceReq.*.email - - - jsonPath: $.serviceReq.*.deviceId - - - jsonPath: $.serviceReq.*.accountId - - - jsonPath: $.serviceReq.*.firstName - - - jsonPath: $.serviceReq.*.lastName - - - jsonPath: $.serviceReq.*.phone - - - jsonPath: $.serviceReq.*.attributes - type: JSON - dbType: JSONB - - - jsonPath: $.serviceReq.*.status - - - jsonPath: $.serviceReq.*.assignedTo - - - jsonPath: $.serviceReq.*.source - - - jsonPath: $.serviceReq.*.expectedTime - - - jsonPath: $.serviceReq.*.auditDetails.createdBy - - - jsonPath: $.serviceReq.*.auditDetails.createdTime - - - jsonPath: $.serviceReq.*.auditDetails.lastModifiedBy - - - jsonPath: $.serviceReq.*.auditDetails.lastModifiedTime - - - - query: INSERT INTO eg_pgr_media(id, by, "when",url, tenantId,serviceRequestId) VALUES (?,?,?,?,?,?); - - basePath: serviceReq.*.media.* - jsonMaps: - - - jsonPath: $.serviceReq.*.media.*.id - - - jsonPath: $.serviceReq.*.media.*.by - - - jsonPath: $.serviceReq[?({id} in @.media[*].id)].auditDetails.createdTime - - - jsonPath: $.serviceReq.*.media.*.url - - - jsonPath: $.serviceReq[?({id} in @.media[*].id)].tenantId - - - jsonPath: $.serviceReq[?({id} in @.media[*].id)].serviceRequestId - - - - query: INSERT INTO eg_pgr_comment(id, by, "when", message, tenantId,serviceRequestId, isInternal) VALUES (?,?,?,?,?,?,?); - - basePath: serviceReq.*.comments.* - jsonMaps: - - - jsonPath: $.serviceReq.*.comments.*.id - - - jsonPath: $.serviceReq.*.comments.*.by - - - jsonPath: $.serviceReq[?({id} in @.comments[*].id)].auditDetails.createdTime - - - jsonPath: $.serviceReq.*.comments.*.message - - - jsonPath: $.serviceReq[?({id} in @.comments[*].id)].tenantId - - - jsonPath: $.serviceReq[?({id} in @.comments[*].id)].serviceRequestId - - - jsonPath: $.serviceReq.*.comments.*.isInternal - - - - version: 1.0 - name: Asset - description: Persists asset details in eg_asset table - fromTopic: update-pgr-servicereq - isTransaction: true - queryMaps: - - query: INSERT INTO eg_pgr_servicereq_audit (tenantid, servicecode, servicerequestid, description, lat, "long", address, addressid, email, deviceid, accountid, firstname,lastname, phone, attributes, status, assignedto, source, expectedtime, createdby, createdtime,auditcreatedtime) SELECT tenantid, servicecode, servicerequestid, description, lat, "long", address, addressid, email, deviceid, accountid,firstname, lastname, phone, attributes, status, assignedto, source, expectedtime,lastmodifiedby,lastmodifiedtime,(select extract (EPOCH from now())*1000) FROM eg_pgr_servicereq where tenantId=? AND servicerequestid=?; - - basePath: serviceReq.* - jsonMaps: - - - jsonPath: $.serviceReq.*.tenantId - - - jsonPath: $.serviceReq.*.serviceRequestId - - - - query: UPDATE eg_pgr_servicereq SET description=?, lat=?, long=?,address=?, addressid=?, email=?, deviceid=?, accountid=?, firstname=?, lastname=?, phone=?, attributes=?, status=?, assignedto=?, source=?, expectedtime=?, lastmodifiedby=?, lastmodifiedtime=? WHERE tenantid=? AND servicerequestid=?; - - basePath: serviceReq.* - jsonMaps: - - - jsonPath: $.serviceReq.*.description - - - jsonPath: $.serviceReq.*.lat - - - jsonPath: $.serviceReq.*._long - - - jsonPath: $.serviceReq.*.address - - - jsonPath: $.serviceReq.*.addressId - - - jsonPath: $.serviceReq.*.email - - - jsonPath: $.serviceReq.*.deviceId - - - jsonPath: $.serviceReq.*.accountId - - - jsonPath: $.serviceReq.*.firstName - - - jsonPath: $.serviceReq.*.lastName - - - jsonPath: $.serviceReq.*.phone - - - jsonPath: $.serviceReq.*.attributes - type: JSON - dbType: JSONB - - - jsonPath: $.serviceReq.*.status - - - jsonPath: $.serviceReq.*.assignedTo - - - jsonPath: $.serviceReq.*.source - - - jsonPath: $.serviceReq.*.expectedTime - - - jsonPath: $.serviceReq.*.auditDetails.lastModifiedBy - - - jsonPath: $.serviceReq.*.auditDetails.lastModifiedTime - - - jsonPath: $.serviceReq.*.tenantId - - - jsonPath: $.serviceReq.*.serviceRequestId - - - - - query: INSERT INTO eg_pgr_media(id, by, "when",url, tenantId,serviceRequestId) VALUES (?,?,?,?,?,?) ON CONFLICT (id,TenantId) DO NOTHING; - - basePath: serviceReq.*.media.* - jsonMaps: - - - jsonPath: $.serviceReq.*.media.*.id - - - jsonPath: $.serviceReq.*.media.*.by - - - jsonPath: $.serviceReq[?({id} in @.media[*].id)].auditDetails.lastModifiedTime - - - jsonPath: $.serviceReq.*.media.*.url - - - jsonPath: $.serviceReq[?({id} in @.media[*].id)].tenantId - - - jsonPath: $.serviceReq[?({id} in @.media[*].id)].serviceRequestId - - - - query: INSERT INTO eg_pgr_comment(id, by, "when", message, tenantId,serviceRequestId, isInternal) VALUES (?,?,?,?,?,?,?) ON CONFLICT (id,tenantId) DO NOTHING; - - basePath: serviceReq.*.comments.* - jsonMaps: - - - jsonPath: $.serviceReq.*.comments.*.id - - - jsonPath: $.serviceReq.*.comments.*.by - - - jsonPath: $.serviceReq[?({id} in @.comments[*].id)].auditDetails.lastModifiedTime - - - jsonPath: $.serviceReq.*.comments.*.message - - - jsonPath: $.serviceReq[?({id} in @.comments[*].id)].tenantId - - - jsonPath: $.serviceReq[?({id} in @.comments[*].id)].serviceRequestId - - - jsonPath: $.serviceReq.*.comments.*.isInternal diff --git a/configs/egov-persister/property-services-migration-temp-config.yml b/configs/egov-persister/property-services-migration-temp-config.yml deleted file mode 100644 index fa057f50..00000000 --- a/configs/egov-persister/property-services-migration-temp-config.yml +++ /dev/null @@ -1,418 +0,0 @@ -serviceMaps: - serviceName: property-services - mappings: - - version: 1.0 - description: Persists property details in EG_PT_PROPERTY table - fromTopic: save-property-registry-batch - isTransaction: true - queryMaps: - - - - query: INSERT INTO eg_pt_property_audit (audituuid, propertyid, property, auditcreatedtime) VALUES ((select nextval('seq_eg_pt_registry_audit')), ?, ?, (SELECT extract(epoch from now()))); - basePath: Property - jsonMaps: - - - jsonPath: $.Property.propertyId - - - jsonPath: $.Property - type: JSON - dbType: JSONB - - - query: INSERT INTO eg_pt_property (id, propertyid, tenantid, surveyid, accountid, oldpropertyid, status, acknowldgementnumber, propertytype, ownershipcategory, usagecategory, creationreason, nooffloors, landarea, superbuiltuparea, source, channel, createdby, createdtime, lastmodifiedby, lastmodifiedtime, additionaldetails) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT(id) DO NOTHING; - basePath: Property - jsonMaps: - - - jsonPath: $.Property.id - - - jsonPath: $.Property.propertyId - - - jsonPath: $.Property.tenantId - - - jsonPath: $.Property.surveyId - - - jsonPath: $.Property.accountId - - - jsonPath: $.Property.oldPropertyId - - - jsonPath: $.Property.status - - - jsonPath: $.Property.acknowldgementNumber - - - jsonPath: $.Property.propertyType - - - jsonPath: $.Property.ownershipCategory - - - jsonPath: $.Property.usageCategory - - - jsonPath: $.Property.creationReason - - - jsonPath: $.Property.noOfFloors - - - jsonPath: $.Property.landArea - - - jsonPath: $.Property.superBuiltUpArea - - - jsonPath: $.Property.source - - - jsonPath: $.Property.channel - - - jsonPath: $.Property.auditDetails.createdBy - - - jsonPath: $.Property.auditDetails.createdTime - - - jsonPath: $.Property.auditDetails.lastModifiedBy - - - jsonPath: $.Property.auditDetails.lastModifiedTime - - - jsonPath: $.Property.additionalDetails - type: JSON - dbType: JSONB - - - query: INSERT INTO eg_pt_address(tenantid, id, propertyid, doorno, plotno, buildingname, street, landmark, city, pincode, locality, district, region, state, country, latitude, longitude, createdby, createdtime, lastmodifiedby, lastmodifiedtime, additionaldetails) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT(id) DO NOTHING; - basePath: Property.address - jsonMaps: - - - jsonPath: $.Property.address.tenantId - - - jsonPath: $.Property.address.id - - - jsonPath: $.Property.id - - - jsonPath: $.Property.address.doorNo - - - jsonPath: $.Property.address.plotNo - - - jsonPath: $.Property.address.buildingName - - - jsonPath: $.Property.address.street - - - jsonPath: $.Property.address.landmark - - - jsonPath: $.Property.address.city - - - jsonPath: $.Property.address.pincode - - - jsonPath: $.Property.address.locality.code - - - jsonPath: $.Property.address.district - - - jsonPath: $.Property.address.region - - - jsonPath: $.Property.address.state - - - jsonPath: $.Property.address.country - - - jsonPath: $.Property.address.geoLocation.latitude - - - jsonPath: $.Property.address.geoLocation.longitude - - - jsonPath: $.Property.auditDetails.createdBy - - - jsonPath: $.Property.auditDetails.createdTime - - - jsonPath: $.Property.auditDetails.lastModifiedBy - - - jsonPath: $.Property.auditDetails.lastModifiedTime - - - jsonPath: $.Property.address.additionalDetails - type: JSON - dbType: JSONB - - - - query: INSERT INTO eg_pt_unit(id, tenantid, propertyid, floorno, unittype, usagecategory, occupancytype, occupancydate, carpetarea, builtuparea, plintharea, superbuiltuparea, arv, constructiontype, constructiondate, dimensions, active, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT(id) DO NOTHING; - basePath: Property.units.* - jsonMaps: - - - jsonPath: $.Property.units.*.id - - - jsonPath: $.Property.tenantId - - - jsonPath: $.Property.id - - - jsonPath: $.Property.units.*.floorNo - - - jsonPath: $.Property.units.*.unitType - - - jsonPath: $.Property.units.*.usageCategory - - - jsonPath: $.Property.units.*.occupancyType - - - jsonPath: $.Property.units.*.occupancyDate - - - jsonPath: $.Property.units.*.constructionDetail.carpetArea - - - jsonPath: $.Property.units.*.constructionDetail.builtUpArea - - - jsonPath: $.Property.units.*.constructionDetail.plinthArea - - - jsonPath: $.Property.units.*.constructionDetail.superBuiltUpArea - - - jsonPath: $.Property.units.*.arv - - - jsonPath: $.Property.units.*.constructionDetail.constructionType - - - jsonPath: $.Property.units.*.constructionDetail.constructionDate - - - jsonPath: $.Property.units.*.constructionDetail.dimensions - type: JSON - dbType: JSONB - - - jsonPath: $.Property.units.*.active - - - jsonPath: $.Property.auditDetails.createdBy - - - jsonPath: $.Property.auditDetails.createdTime - - - jsonPath: $.Property.auditDetails.lastModifiedBy - - - jsonPath: $.Property.auditDetails.lastModifiedTime - - - query: UPDATE eg_pt_property SET propertyid=?, surveyid=?, accountid=?, oldpropertyid=?, status=?, propertytype=?, ownershipcategory=?, usagecategory=?, nooffloors=?, landarea=?, superbuiltuparea=?, lastmodifiedby=?, lastmodifiedtime=?, additionaldetails=? WHERE Id=? AND tenantId=?; - basePath: Property - jsonMaps: - - - jsonPath: $.Property.propertyId - - - jsonPath: $.Property.surveyId - - - jsonPath: $.Property.accountId - - - jsonPath: $.Property.oldPropertyId - - - jsonPath: $.Property.status - - - jsonPath: $.Property.propertyType - - - jsonPath: $.Property.ownershipCategory - - - jsonPath: $.Property.usageCategory - - - jsonPath: $.Property.noOfFloors - - - jsonPath: $.Property.landArea - - - jsonPath: $.Property.superBuiltUpArea - - - jsonPath: $.Property.auditDetails.lastModifiedBy - - - jsonPath: $.Property.auditDetails.lastModifiedTime - - - jsonPath: $.Property.additionalDetails - type: JSON - dbType: JSONB - - - jsonPath: $.Property.id - - - jsonPath: $.Property.tenantId - - - - query: INSERT INTO eg_pt_owner (ownerinfouuid, tenantid, propertyid, userid, status, isprimaryowner, ownertype, ownershippercentage, institutionid, relationship, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (userid, propertyid) DO UPDATE SET status=EXCLUDED.status, isprimaryowner=EXCLUDED.isprimaryowner, ownertype=EXCLUDED.ownertype, ownershippercentage=EXCLUDED.ownershippercentage, institutionid=EXCLUDED.institutionid, relationship=EXCLUDED.relationship, lastmodifiedby=EXCLUDED.lastModifiedby, lastmodifiedtime=EXCLUDED.lastmodifiedtime; - basePath: Property.owners.* - jsonMaps: - - - jsonPath: $.Property.owners.*.ownerInfoUuid - - - jsonPath: $.Property.tenantId - - - jsonPath: $.Property.id - - - jsonPath: $.Property.owners.*.uuid - - - jsonPath: $.Property.owners.*.status - - - jsonPath: $.Property.owners.*.isPrimaryOwner - - - jsonPath: $.Property.owners.*.ownerType - - - jsonPath: $.Property.owners.*.ownerShipPercentage - - - jsonPath: $.Property.owners.*.institutionId - - - jsonPath: $.Property.owners.*.relationship - - - jsonPath: $.Property.auditDetails.createdBy - - - jsonPath: $.Property.auditDetails.createdTime - - - jsonPath: $.Property.auditDetails.lastModifiedBy - - - jsonPath: $.Property.auditDetails.lastModifiedTime - - - query: INSERT INTO eg_pt_document (id, tenantid, entityid, documenttype, filestoreid, documentuid, status, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET documenttype = EXCLUDED.documenttype,fileStoreid = EXCLUDED.filestoreid, documentuid=EXCLUDED.documentuid, status=EXCLUDED.status, lastmodifiedby = EXCLUDED.lastModifiedby, lastmodifiedtime = EXCLUDED.lastmodifiedtime; - basePath: $.Property.documents.* - jsonMaps: - - - jsonPath: $.Property.documents.*.id - - - jsonPath: $.Property.tenantId - - - jsonPath: $.Property.id - - - jsonPath: $.Property.documents.*.documentType - - - jsonPath: $.Property.documents.*.fileStoreId - - - jsonPath: $.Property.documents.*.documentUid - - - jsonPath: $.Property.documents.*.status - - - jsonPath: $.Property.auditDetails.createdBy - - - jsonPath: $.Property.auditDetails.lastModifiedBy - - - jsonPath: $.Property.auditDetails.createdTime - - - jsonPath: $.Property.auditDetails.lastModifiedTime - - - query: INSERT INTO eg_pt_document (id, tenantid, entityid, documenttype, filestoreid, documentuid, status, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET documenttype = EXCLUDED.documenttype,fileStoreid = EXCLUDED.filestoreid, documentuid=EXCLUDED.documentuid, status=EXCLUDED.status, lastmodifiedby = EXCLUDED.lastModifiedby, lastmodifiedtime = EXCLUDED.lastmodifiedtime; - basePath: $.Property.owners.*.documents.* - jsonMaps: - - - jsonPath: $.Property.owners.*.documents.*.id - - - jsonPath: $.Property.tenantId - - - jsonPath: $.Property.owners[*][?({id} in @.documents[*].id)].ownerInfoUuid - - - jsonPath: $.Property.owners.*.documents.*.documentType - - - jsonPath: $.Property.owners.*.documents.*.fileStoreId - - - jsonPath: $.Property.owners.*.documents.*.documentUid - - - jsonPath: $.Property.owners.*.documents.*.status - - - jsonPath: $.Property.auditDetails.createdBy - - - jsonPath: $.Property.auditDetails.lastModifiedBy - - - jsonPath: $.Property.auditDetails.createdTime - - - jsonPath: $.Property.auditDetails.lastModifiedTime - - - query: UPDATE eg_pt_address SET doorno=?, plotno=?, buildingname=?, street=?, landmark=?, city=?, pincode=?, locality=?, district=?, region=?, state=?, country=?, latitude=?, longitude=?, lastmodifiedby=?, lastmodifiedtime=?, additionaldetails=? WHERE id=?; - basePath: Property.address - jsonMaps: - - - jsonPath: $.Property.address.doorNo - - - jsonPath: $.Property.address.plotNo - - - jsonPath: $.Property.address.buildingName - - - jsonPath: $.Property.address.street - - - jsonPath: $.Property.address.landmark - - - jsonPath: $.Property.address.city - - - jsonPath: $.Property.address.pincode - - - jsonPath: $.Property.address.locality.code - - - jsonPath: $.Property.address.district - - - jsonPath: $.Property.address.region - - - jsonPath: $.Property.address.state - - - jsonPath: $.Property.address.country - - - jsonPath: $.Property.address.geoLocation.latitude - - - jsonPath: $.Property.address.geoLocation.longitude - - - jsonPath: $.Property.auditDetails.lastModifiedBy - - - jsonPath: $.Property.auditDetails.lastModifiedTime - - - jsonPath: $.Property.address.additionalDetails - type: JSON - dbType: JSONB - - - jsonPath: $.Property.address.id - - - query: INSERT INTO eg_pt_institution (id, propertyid, tenantid, name, nameofauthorizedperson, type, designation, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET name=EXCLUDED.name, type=EXCLUDED.type, designation=EXCLUDED.designation, lastmodifiedby=EXCLUDED.lastModifiedby, lastmodifiedtime=EXCLUDED.lastmodifiedtime; - basePath: $.Property.institution - jsonMaps: - - - jsonPath: $.Property.institution.id - - - jsonPath: $.Property.id - - - jsonPath: $.Property.tenantId - - - jsonPath: $.Property.institution.name - - - jsonPath: $.Property.institution.nameOfAuthorizedPerson - - - jsonPath: $.Property.institution.type - - - jsonPath: $.Property.institution.designation - - - jsonPath: $.Property.auditDetails.createdBy - - - jsonPath: $.Property.auditDetails.createdTime - - - jsonPath: $.Property.auditDetails.lastModifiedBy - - - jsonPath: $.Property.auditDetails.lastModifiedTime - - - - query: UPDATE eg_pt_unit SET floorno=?, unittype=?, usagecategory=?, occupancytype=?, occupancydate=?, carpetarea=?, builtuparea=?, plintharea=?, superbuiltuparea=?, arv=?, constructiontype=?, constructiondate=?, dimensions=?, active=?, lastmodifiedby=?, lastmodifiedtime=? WHERE id=?; - basePath: Property.units.* - jsonMaps: - - - jsonPath: $.Property.units.*.floorNo - - - jsonPath: $.Property.units.*.unitType - - - jsonPath: $.Property.units.*.usageCategory - - - jsonPath: $.Property.units.*.occupancyType - - - jsonPath: $.Property.units.*.occupancyDate - - - jsonPath: $.Property.units.*.constructionDetail.carpetArea - - - jsonPath: $.Property.units.*.constructionDetail.builtUpArea - - - jsonPath: $.Property.units.*.constructionDetail.plinthArea - - - jsonPath: $.Property.units.*.constructionDetail.superBuiltUpArea - - - jsonPath: $.Property.units.*.arv - - - jsonPath: $.Property.units.*.constructionDetail.constructionType - - - jsonPath: $.Property.units.*.constructionDetail.constructionDate - - - jsonPath: $.Property.units.*.constructionDetail.dimensions - type: JSON - dbType: JSONB - - - jsonPath: $.Property.units.*.active - - - jsonPath: $.Property.auditDetails.lastModifiedBy - - - jsonPath: $.Property.auditDetails.lastModifiedTime - - - jsonPath: $.Property.units.*.id - - - - query: UPDATE eg_pt_unit SET active=false WHERE propertyid=? AND createdtime < (SELECT MAXTIME FROM (SELECT propertyid,MAX(createdtime) AS MAXTIME FROM eg_pt_unit GROUP BY propertyid) AS UNIT WHERE propertyid=?); - basePath: Property - jsonMaps: - - - jsonPath: $.Property.id - - - jsonPath: $.Property.id - - - - query: UPDATE eg_pt_owner SET status='INACTIVE' WHERE propertyid=? AND createdtime < (SELECT MAXTIME FROM (SELECT propertyid,MAX(createdtime) AS MAXTIME FROM eg_pt_owner GROUP BY propertyid) AS OWNER WHERE propertyid=?); - basePath: Property - jsonMaps: - - - jsonPath: $.Property.id - - - jsonPath: $.Property.id diff --git a/configs/egov-persister/property-services-persister.yml b/configs/egov-persister/property-services-persister.yml deleted file mode 100644 index 0076f358..00000000 --- a/configs/egov-persister/property-services-persister.yml +++ /dev/null @@ -1,784 +0,0 @@ -serviceMaps: - serviceName: property-services - mappings: - - version: 1.0 - description: Persists property details in EG_PT_PROPERTY table - fromTopic: save-pt-property - isTransaction: true - queryMaps: - - - query: INSERT INTO eg_pt_property_v2(tenantId,propertyId, status,acknowldgementNumber, oldPropertyId, creationReason, occupancyDate,additionalDetails ,createdBy,createdTime,lastModifiedBy,lastModifiedTime ) VALUES (?,?,?,?,?,?,?,?,?,?,?,?); - basePath: Properties.* - jsonMaps: - - jsonPath: $.Properties.*.tenantId - - - jsonPath: $.Properties.*.propertyId - - - jsonPath: $.Properties.*.status - - - jsonPath: $.Properties.*.acknowldgementNumber - - - jsonPath: $.Properties.*.oldPropertyId - - - jsonPath: $.Properties.*.creationReason - - - jsonPath: $.Properties.*.occupancyDate - - - jsonPath: $.Properties.*.additionalDetails - type: JSON - dbType: JSONB - - - jsonPath: $.Properties.*.auditDetails.createdBy - - - jsonPath: $.Properties.*.auditDetails.createdTime - - - jsonPath: $.Properties.*.auditDetails.lastModifiedBy - - - jsonPath: $.Properties.*.auditDetails.lastModifiedTime - - - - query: INSERT INTO eg_pt_propertydetail_v2(tenantId,assessmentNumber,property,accountId,ownershipCategory,subOwnershipCategory,source,usage,noOfFloors,landArea,buildUpArea,additionalDetails,channel,financialYear,propertyType,propertySubType,usageCategoryMajor,usageCategoryMinor,assessmentDate,adhocExemption,adhocPenalty,adhocExemptionReason,adhocPenaltyReason,createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?); - basePath: Properties.*.propertyDetails.* - jsonMaps: - - - jsonPath: $.Properties[*][?({assessmentNumber} in @.propertyDetails[*].assessmentNumber)].tenantId - - - jsonPath: $.Properties.*.propertyDetails.*.assessmentNumber - - - jsonPath: $.Properties[*][?({assessmentNumber} in @.propertyDetails[*].assessmentNumber)].propertyId - - - jsonPath: $.Properties.*.propertyDetails.*.citizenInfo.uuid - - - jsonPath: $.Properties.*.propertyDetails.*.ownershipCategory - - - jsonPath: $.Properties.*.propertyDetails.*.subOwnershipCategory - - - jsonPath: $.Properties.*.propertyDetails.*.source - - - jsonPath: $.Properties.*.propertyDetails.*.usage - - - jsonPath: $.Properties.*.propertyDetails.*.noOfFloors - - - jsonPath: $.Properties.*.propertyDetails.*.landArea - - - jsonPath: $.Properties.*.propertyDetails.*.buildUpArea - - - jsonPath: $.Properties.*.propertyDetails.*.additionalDetails - type: JSON - dbType: JSONB - - - jsonPath: $.Properties.*.propertyDetails.*.channel - - - jsonPath: $.Properties.*.propertyDetails.*.financialYear - - - jsonPath: $.Properties.*.propertyDetails.*.propertyType - - - jsonPath: $.Properties.*.propertyDetails.*.propertySubType - - - jsonPath: $.Properties.*.propertyDetails.*.usageCategoryMajor - - - jsonPath: $.Properties.*.propertyDetails.*.usageCategoryMinor - - - jsonPath: $.Properties.*.propertyDetails.*.assessmentDate - - - jsonPath: $.Properties.*.propertyDetails.*.adhocExemption - - - jsonPath: $.Properties.*.propertyDetails.*.adhocPenalty - - - jsonPath: $.Properties.*.propertyDetails.*.adhocExemptionReason - - - jsonPath: $.Properties.*.propertyDetails.*.adhocPenaltyReason - - - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.createdBy - - - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.lastModifiedBy - - - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.createdTime - - - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.lastModifiedTime - - - query: INSERT INTO eg_pt_owner_v2(tenantId,propertyDetail, userid, isactive,isPrimaryOwner,ownerShipPercentage, ownerType,institutionId,relationship,createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - basePath: Properties.*.propertyDetails.*.owners.* - jsonMaps: - - - jsonPath: $.Properties[*][?({uuid} in @.propertyDetails.*.owners[*].uuid)].tenantId - - - jsonPath: $.Properties.*.propertyDetails[*][?({uuid} in @.owners[*].uuid)].assessmentNumber - - - jsonPath: $.Properties.*.propertyDetails.*.owners.*.uuid - - - jsonPath: $.Properties.*.propertyDetails.*.owners.*.isActive - - - jsonPath: $.Properties.*.propertyDetails.*.owners.*.isPrimaryOwner - - - jsonPath: $.Properties.*.propertyDetails.*.owners.*.ownerShipPercentage - - - jsonPath: $.Properties.*.propertyDetails.*.owners.*.ownerType - - - jsonPath: $.Properties.*.propertyDetails.*.owners.*.institutionId - - - jsonPath: $.Properties.*.propertyDetails.*.owners.*.relationship - - - jsonPath: $.Properties.*.propertyDetails[*][?({uuid} in @.owners[*].uuid)].auditDetails.createdBy - - - jsonPath: $.Properties.*.propertyDetails[*][?({uuid} in @.owners[*].uuid)].auditDetails.lastModifiedBy - - - jsonPath: $.Properties.*.propertyDetails[*][?({uuid} in @.owners[*].uuid)].auditDetails.createdTime - - - jsonPath: $.Properties.*.propertyDetails[*][?({uuid} in @.owners[*].uuid)].auditDetails.lastModifiedTime - - - - - query: INSERT INTO eg_pt_document_propertydetail_v2(tenantId,id, propertydetail, documenttype, fileStore,documentuid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?,?,?, ?, ?, ?, ?, ?, ?, ?); - basePath: $.Properties.*.propertyDetails.*.documents.* - jsonMaps: - - - jsonPath: $.Properties[*][?({id} in @.propertyDetails.*.documents[*].id)].tenantId - - - jsonPath: $.Properties.*.propertyDetails.*.documents.*.id - - - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.documents[*].id)].assessmentNumber - - - jsonPath: $.Properties.*.propertyDetails.*.documents.*.documentType - - - jsonPath: $.Properties.*.propertyDetails.*.documents.*.fileStore - - - jsonPath: $.Properties.*.propertyDetails.*.documents.*.documentUid - - - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.documents[*].id)].auditDetails.createdBy - - - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.documents[*].id)].auditDetails.lastModifiedBy - - - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.documents[*].id)].auditDetails.createdTime - - - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.documents[*].id)].auditDetails.lastModifiedTime - - - - query: INSERT INTO eg_pt_document_owner_v2(tenantId,id,userid, propertydetail, documenttype, fileStore,documentuid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?,?,?,?, ?, ?, ?, ?, ?, ?, ?); - basePath: $.Properties.*.propertyDetails.*.owners.*.documents.* - jsonMaps: - - - jsonPath: $.Properties[*][?({id} in @.propertyDetails.*.owners.*.documents[*].id)].tenantId - - - jsonPath: $.Properties.*.propertyDetails.*.owners.*.documents.*.id - - - jsonPath: $.Properties.*.propertyDetails.*.owners[*][?({id} in @.documents[*].id)].uuid - - - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.owners.*.documents[*].id)].assessmentNumber - - - jsonPath: $.Properties.*.propertyDetails.*.owners.*.documents.*.documentType - - - jsonPath: $.Properties.*.propertyDetails.*.owners.*.documents.*.fileStore - - - jsonPath: $.Properties.*.propertyDetails.*.owners.*.documents.*.documentUid - - - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.owners.*.documents[*].id)].auditDetails.createdBy - - - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.owners.*.documents[*].id)].auditDetails.lastModifiedBy - - - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.owners.*.documents[*].id)].auditDetails.createdTime - - - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.owners.*.documents[*].id)].auditDetails.lastModifiedTime - - - - - query: INSERT INTO eg_pt_address_v2(tenantId, id, property,doorNo, latitude,longitude, addressid, addressnumber, type, addressline1, addressline2, landmark, city, pincode, detail,buildingName,street, locality, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?,?,?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - basePath: Properties.*.address - jsonMaps: - - - jsonPath: $.Properties.*.tenantId - - - jsonPath: $.Properties.*.address.id - - - jsonPath: $.Properties.*.propertyId - - - jsonPath: $.Properties.*.address.doorNo - - - jsonPath: $.Properties.*.address.latitude - - - jsonPath: $.Properties.*.address.longitude - - - jsonPath: $.Properties.*.address.addressId - - - jsonPath: $.Properties.*.address.addressNumber - - - jsonPath: $.Properties.*.address.type - - - jsonPath: $.Properties.*.address.addressLine1 - - - jsonPath: $.Properties.*.address.addressLine2 - - - jsonPath: $.Properties.*.address.landmark - - - jsonPath: $.Properties.*.address.city - - - jsonPath: $.Properties.*.address.pincode - - - jsonPath: $.Properties.*.address.detail - - - jsonPath: $.Properties.*.address.buildingName - - - jsonPath: $.Properties.*.address.street - - - jsonPath: $.Properties.*.address.locality.code - - - jsonPath: $.Properties.*.auditDetails.createdBy - - - jsonPath: $.Properties.*.auditDetails.lastModifiedBy - - - jsonPath: $.Properties.*.auditDetails.createdTime - - - jsonPath: $.Properties.*.auditDetails.lastModifiedTime - - - - query: INSERT INTO eg_pt_unit_v2(tenantId,id,propertyDetail,floorNo,unitType,unitArea,usageCategoryMajor,usageCategoryMinor,usageCategorySubMinor,usageCategoryDetail,occupancyType,occupancyDate,constructionType,constructionSubType,arv,createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?); - basePath: Properties.*.propertyDetails.*.units.* - jsonMaps: - - - jsonPath: $.Properties[*][?({id} in @.propertyDetails.*.units[*].id)].tenantId - - - jsonPath: $.Properties.*.propertyDetails.*.units.*.id - - - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.units[*].id)].assessmentNumber - - - jsonPath: $.Properties.*.propertyDetails.*.units.*.floorNo - - - jsonPath: $.Properties.*.propertyDetails.*.units.*.unitType - - - jsonPath: $.Properties.*.propertyDetails.*.units.*.unitArea - - - jsonPath: $.Properties.*.propertyDetails.*.units.*.usageCategoryMajor - - - jsonPath: $.Properties.*.propertyDetails.*.units.*.usageCategoryMinor - - - jsonPath: $.Properties.*.propertyDetails.*.units.*.usageCategorySubMinor - - - jsonPath: $.Properties.*.propertyDetails.*.units.*.usageCategoryDetail - - - jsonPath: $.Properties.*.propertyDetails.*.units.*.occupancyType - - - jsonPath: $.Properties.*.propertyDetails.*.units.*.occupancyDate - - - jsonPath: $.Properties.*.propertyDetails.*.units.*.constructionType - - - jsonPath: $.Properties.*.propertyDetails.*.units.*.constructionSubType - - - jsonPath: $.Properties.*.propertyDetails.*.units.*.arv - - - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.units[*].id)].auditDetails.createdBy - - - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.units[*].id)].auditDetails.lastModifiedBy - - - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.units[*].id)].auditDetails.createdTime - - - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.units[*].id)].auditDetails.lastModifiedTime - - - query: INSERT INTO eg_pt_institution_v2(tenantId,id, propertyDetail, name, type,designation, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?,?,?, ?, ?, ?, ?, ?, ?,?) ON CONFLICT ON CONSTRAINT pk_eg_pt_institution_v2 DO NOTHING; - basePath: $.Properties.*.propertyDetails.*.institution - jsonMaps: - - - jsonPath: $.Properties.*.propertyDetails.*.tenantId - - - jsonPath: $.Properties.*.propertyDetails.*.institution.id - - - jsonPath: $.Properties.*.propertyDetails.*.assessmentNumber - - - jsonPath: $.Properties.*.propertyDetails.*.institution.name - - - jsonPath: $.Properties.*.propertyDetails.*.institution.type - - - jsonPath: $.Properties.*.propertyDetails.*.institution.designation - - - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.createdBy - - - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.lastModifiedBy - - - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.createdTime - - - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.lastModifiedTime - - - - - - - version: 1.0 - description: Update property details in EG_PT_PROPERTY table - fromTopic: update-pt-property - isTransaction: true - queryMaps: - - - - query: INSERT INTO eg_pt_property_audit_v2 SELECT * FROM eg_pt_property_v2 WHERE propertyid = ?; - basePath: Properties.* - jsonMaps: - - - jsonPath: $.Properties.*.propertyId - - - - query: INSERT INTO eg_pt_address_audit_v2 SELECT * FROM eg_pt_address_v2 WHERE id = ?; - basePath: Properties.*.address - jsonMaps: - - - jsonPath: $.Properties.*.address.id - - - - - query: UPDATE eg_pt_property_v2 SET additionalDetails=?,status=?,acknowldgementNumber=?,oldPropertyId=?,creationReason=?, occupancyDate=?,lastModifiedBy=?, lastModifiedTime=? where propertyId=? AND tenantId=?; - basePath: Properties.* - jsonMaps: - - - jsonPath: $.Properties.*.additionalDetails - type: JSON - dbType: JSONB - - - jsonPath: $.Properties.*.status - - - jsonPath: $.Properties.*.acknowldgementNumber - - - jsonPath: $.Properties.*.oldPropertyId - - - jsonPath: $.Properties.*.creationReason - - - jsonPath: $.Properties.*.occupancyDate - - - jsonPath: $.Properties.*.auditDetails.lastModifiedBy - - - jsonPath: $.Properties.*.auditDetails.lastModifiedTime - - - jsonPath: $.Properties.*.propertyId - - - jsonPath: $.Properties.*.tenantId - - - - - - query: INSERT INTO eg_pt_propertydetail_v2(tenantId,assessmentNumber,property,accountId,ownershipCategory,subOwnershipCategory,source,usage,noOfFloors,landArea,buildUpArea,additionalDetails,channel,financialYear,propertyType,propertySubType,usageCategoryMajor,usageCategoryMinor,assessmentDate,adhocExemption,adhocPenalty,adhocExemptionReason,adhocPenaltyReason,createdby, lastmodifiedby, createdtime,lastmodifiedtime) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) ON CONFLICT (assessmentNumber) DO UPDATE SET accountId=?,financialYear=?, propertyType=?, propertySubType=?,usageCategoryMajor=?,usageCategoryMinor=?, assessmentDate=?,ownershipCategory=?,subOwnershipCategory=?,source=?,usage=?,noOfFloors=?,landArea=?,buildUpArea=?,additionalDetails=?,channel=?,adhocExemption=?,adhocPenalty=?,adhocExemptionReason=?,adhocPenaltyReason=?,lastModifiedBy=?, lastModifiedTime=?; - basePath: Properties.*.propertyDetails.* - jsonMaps: - - - jsonPath: $.Properties[*][?({assessmentNumber} in @.propertyDetails[*].assessmentNumber)].tenantId - - - jsonPath: $.Properties.*.propertyDetails.*.assessmentNumber - - - jsonPath: $.Properties[*][?({assessmentNumber} in @.propertyDetails[*].assessmentNumber)].propertyId - - - jsonPath: $.Properties.*.propertyDetails.*.citizenInfo.uuid - - - jsonPath: $.Properties.*.propertyDetails.*.ownershipCategory - - - jsonPath: $.Properties.*.propertyDetails.*.subOwnershipCategory - - - jsonPath: $.Properties.*.propertyDetails.*.source - - - jsonPath: $.Properties.*.propertyDetails.*.usage - - - jsonPath: $.Properties.*.propertyDetails.*.noOfFloors - - - jsonPath: $.Properties.*.propertyDetails.*.landArea - - - jsonPath: $.Properties.*.propertyDetails.*.buildUpArea - - - jsonPath: $.Properties.*.propertyDetails.*.additionalDetails - type: JSON - dbType: JSONB - - - jsonPath: $.Properties.*.propertyDetails.*.channel - - - jsonPath: $.Properties.*.propertyDetails.*.financialYear - - - jsonPath: $.Properties.*.propertyDetails.*.propertyType - - - jsonPath: $.Properties.*.propertyDetails.*.propertySubType - - - jsonPath: $.Properties.*.propertyDetails.*.usageCategoryMajor - - - jsonPath: $.Properties.*.propertyDetails.*.usageCategoryMinor - - - jsonPath: $.Properties.*.propertyDetails.*.assessmentDate - - - jsonPath: $.Properties.*.propertyDetails.*.adhocExemption - - - jsonPath: $.Properties.*.propertyDetails.*.adhocPenalty - - - jsonPath: $.Properties.*.propertyDetails.*.adhocExemptionReason - - - jsonPath: $.Properties.*.propertyDetails.*.adhocPenaltyReason - - - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.createdBy - - - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.lastModifiedBy - - - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.createdTime - - - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.lastModifiedTime - - - jsonPath: $.Properties.*.propertyDetails.*.citizenInfo.uuid - - - jsonPath: $.Properties.*.propertyDetails.*.financialYear - - - jsonPath: $.Properties.*.propertyDetails.*.propertyType - - - jsonPath: $.Properties.*.propertyDetails.*.propertySubType - - - jsonPath: $.Properties.*.propertyDetails.*.usageCategoryMajor - - - jsonPath: $.Properties.*.propertyDetails.*.usageCategoryMinor - - - jsonPath: $.Properties.*.propertyDetails.*.assessmentDate - - - jsonPath: $.Properties.*.propertyDetails.*.ownershipCategory - - - jsonPath: $.Properties.*.propertyDetails.*.subOwnershipCategory - - - jsonPath: $.Properties.*.propertyDetails.*.source - - - jsonPath: $.Properties.*.propertyDetails.*.usage - - - jsonPath: $.Properties.*.propertyDetails.*.noOfFloors - - - jsonPath: $.Properties.*.propertyDetails.*.landArea - - - jsonPath: $.Properties.*.propertyDetails.*.buildUpArea - - - jsonPath: $.Properties.*.propertyDetails.*.additionalDetails - type: JSON - dbType: JSONB - - - jsonPath: $.Properties.*.propertyDetails.*.channel - - - jsonPath: $.Properties.*.propertyDetails.*.adhocExemption - - - jsonPath: $.Properties.*.propertyDetails.*.adhocPenalty - - - jsonPath: $.Properties.*.propertyDetails.*.adhocExemptionReason - - - jsonPath: $.Properties.*.propertyDetails.*.adhocPenaltyReason - - - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.lastModifiedBy - - - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.lastModifiedTime - - - - - query: INSERT INTO eg_pt_owner_v2(tenantId,propertyDetail, userid, isActive,isPrimaryOwner,ownerShipPercentage, ownerType,institutionId,relationship, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT ON CONSTRAINT pk_eg_pt_owner_v2 DO UPDATE SET isActive =?,isPrimaryOwner=?,ownerShipPercentage=?,ownerType=?,institutionId=?,relationship=?,lastmodifiedby =?,lastmodifiedtime =?; - basePath: Properties.*.propertyDetails.*.owners.* - jsonMaps: - - - jsonPath: $.Properties[*][?({uuid} in @.propertyDetails.*.owners[*].uuid)].tenantId - - - jsonPath: $.Properties.*.propertyDetails[*][?({uuid} in @.owners[*].uuid)].assessmentNumber - - - jsonPath: $.Properties.*.propertyDetails.*.owners.*.uuid - - - jsonPath: $.Properties.*.propertyDetails.*.owners.*.isActive - - - jsonPath: $.Properties.*.propertyDetails.*.owners.*.isPrimaryOwner - - - jsonPath: $.Properties.*.propertyDetails.*.owners.*.ownerShipPercentage - - - jsonPath: $.Properties.*.propertyDetails.*.owners.*.ownerType - - - jsonPath: $.Properties.*.propertyDetails.*.owners.*.institutionId - - - jsonPath: $.Properties.*.propertyDetails.*.owners.*.relationship - - - jsonPath: $.Properties.*.propertyDetails[*][?({uuid} in @.owners[*].uuid)].auditDetails.lastModifiedBy - - - jsonPath: $.Properties.*.propertyDetails[*][?({uuid} in @.owners[*].uuid)].auditDetails.lastModifiedBy - - - jsonPath: $.Properties.*.propertyDetails[*][?({uuid} in @.owners[*].uuid)].auditDetails.lastModifiedTime - - - jsonPath: $.Properties.*.propertyDetails[*][?({uuid} in @.owners[*].uuid)].auditDetails.lastModifiedTime - - - jsonPath: $.Properties.*.propertyDetails.*.owners.*.isActive - - - jsonPath: $.Properties.*.propertyDetails.*.owners.*.isPrimaryOwner - - - jsonPath: $.Properties.*.propertyDetails.*.owners.*.ownerShipPercentage - - - jsonPath: $.Properties.*.propertyDetails.*.owners.*.ownerType - - - jsonPath: $.Properties.*.propertyDetails.*.owners.*.institutionId - - - jsonPath: $.Properties.*.propertyDetails.*.owners.*.relationship - - - jsonPath: $.Properties.*.propertyDetails[*][?({uuid} in @.owners[*].uuid)].auditDetails.lastModifiedBy - - - jsonPath: $.Properties.*.propertyDetails[*][?({uuid} in @.owners[*].uuid)].auditDetails.lastModifiedTime - - - - query: INSERT INTO eg_pt_document_propertydetail_v2(tenantId,id, propertydetail, documenttype, fileStore,documentuid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?,?) ON CONFLICT (id) DO UPDATE SET documenttype = ?, fileStore = ?,documentuid=?, lastmodifiedby = ?, lastmodifiedtime = ?; - basePath: $.Properties.*.propertyDetails.*.documents.* - jsonMaps: - - - jsonPath: $.Properties[*][?({id} in @.propertyDetails.*.documents[*].id)].tenantId - - - jsonPath: $.Properties.*.propertyDetails.*.documents.*.id - - - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.documents[*].id)].assessmentNumber - - - jsonPath: $.Properties.*.propertyDetails.*.documents.*.documentType - - - jsonPath: $.Properties.*.propertyDetails.*.documents.*.fileStore - - - jsonPath: $.Properties.*.propertyDetails.*.documents.*.documentUid - - - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.documents[*].id)].auditDetails.lastModifiedBy - - - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.documents[*].id)].auditDetails.lastModifiedBy - - - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.documents[*].id)].auditDetails.lastModifiedTime - - - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.documents[*].id)].auditDetails.lastModifiedTime - - - jsonPath: $.Properties.*.propertyDetails.documents.*.documentType - - - jsonPath: $.Properties.*.propertyDetails.*.documents.*.fileStore - - - jsonPath: $.Properties.*.propertyDetails.*.documents.*.documentUid - - - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.documents[*].id)].auditDetails.lastModifiedBy - - - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.documents[*].id)].auditDetails.lastModifiedTime - - - - query: INSERT INTO eg_pt_document_owner_v2(tenantId,id, userid,propertydetail, documenttype, fileStore,documentuid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?) ON CONFLICT (userid,propertydetail) DO UPDATE SET documenttype = ?, fileStore = ?,documentuid=?, lastmodifiedby = ?, lastmodifiedtime = ?; - basePath: $.Properties.*.propertyDetails.*.owners.*.documents.* - jsonMaps: - - - jsonPath: $.Properties[*][?({id} in @.propertyDetails.*.owners.*.documents[*].id)].tenantId - - - jsonPath: $.Properties.*.propertyDetails.*.owners.*.documents.*.id - - - jsonPath: $.Properties.*.propertyDetails.*.owners[*][?({id} in @.documents[*].id)].uuid - - - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.owners.*.documents[*].id)].assessmentNumber - - - jsonPath: $.Properties.*.propertyDetails.*.owners.*.documents.*.documentType - - - jsonPath: $.Properties.*.propertyDetails.*.owners.*.documents.*.fileStore - - - jsonPath: $.Properties.*.propertyDetails.*.owners.*.documents.*.documentUid - - - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.owners.*.documents[*].id)].auditDetails.createdBy - - - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.owners.*.documents[*].id)].auditDetails.lastModifiedBy - - - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.owners.*.documents[*].id)].auditDetails.createdTime - - - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.owners.*.documents[*].id)].auditDetails.lastModifiedTime - - - jsonPath: $.Properties.*.propertyDetails.*.owners.*.documents.*.documentType - - - jsonPath: $.Properties.*.propertyDetails.*.owners.*.documents.*.fileStore - - - jsonPath: $.Properties.*.propertyDetails.*.owners.*.documents.*.documentUid - - - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.owners.*.documents[*].id)].auditDetails.lastModifiedBy - - - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.owners.*.documents[*].id)].auditDetails.lastModifiedTime - - - - - query: INSERT INTO eg_pt_unit_v2(tenantId,id,propertyDetail,floorNo,unitType,unitArea,usageCategoryMajor,usageCategoryMinor,usageCategorySubMinor,usageCategoryDetail,occupancyType,occupancyDate,constructionType,constructionSubType,arv,createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) ON CONFLICT (id) DO UPDATE SET floorNo=?,unitType=?,unitArea=?,usageCategoryMajor=?,usageCategoryMinor=?,usageCategorySubMinor=?,usageCategoryDetail=?,occupancyType=?,occupancyDate=?,constructionType=?,constructionSubType=?,arv=?,lastmodifiedby=?,lastmodifiedtime=?; - basePath: Properties.*.propertyDetails.*.units.* - jsonMaps: - - - jsonPath: $.Properties[*][?({id} in @.propertyDetails.*.units[*].id)].tenantId - - - jsonPath: $.Properties.*.propertyDetails.*.units.*.id - - - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.units[*].id)].assessmentNumber - - - jsonPath: $.Properties.*.propertyDetails.*.units.*.floorNo - - - jsonPath: $.Properties.*.propertyDetails.*.units.*.unitType - - - jsonPath: $.Properties.*.propertyDetails.*.units.*.unitArea - - - jsonPath: $.Properties.*.propertyDetails.*.units.*.usageCategoryMajor - - - jsonPath: $.Properties.*.propertyDetails.*.units.*.usageCategoryMinor - - - jsonPath: $.Properties.*.propertyDetails.*.units.*.usageCategorySubMinor - - - jsonPath: $.Properties.*.propertyDetails.*.units.*.usageCategoryDetail - - - jsonPath: $.Properties.*.propertyDetails.*.units.*.occupancyType - - - jsonPath: $.Properties.*.propertyDetails.*.units.*.occupancyDate - - - jsonPath: $.Properties.*.propertyDetails.*.units.*.constructionType - - - jsonPath: $.Properties.*.propertyDetails.*.units.*.constructionSubType - - - jsonPath: $.Properties.*.propertyDetails.*.units.*.arv - - - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.units[*].id)].auditDetails.lastModifiedBy - - - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.units[*].id)].auditDetails.lastModifiedBy - - - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.units[*].id)].auditDetails.lastModifiedTime - - - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.units[*].id)].auditDetails.lastModifiedTime - - - jsonPath: $.Properties.*.propertyDetails.*.units.*.floorNo - - - jsonPath: $.Properties.*.propertyDetails.*.units.*.unitType - - - jsonPath: $.Properties.*.propertyDetails.*.units.*.unitArea - - - jsonPath: $.Properties.*.propertyDetails.*.units.*.usageCategoryMajor - - - jsonPath: $.Properties.*.propertyDetails.*.units.*.usageCategoryMinor - - - jsonPath: $.Properties.*.propertyDetails.*.units.*.usageCategorySubMinor - - - jsonPath: $.Properties.*.propertyDetails.*.units.*.usageCategoryDetail - - - jsonPath: $.Properties.*.propertyDetails.*.units.*.occupancyType - - - jsonPath: $.Properties.*.propertyDetails.*.units.*.occupancyDate - - - jsonPath: $.Properties.*.propertyDetails.*.units.*.constructionType - - - jsonPath: $.Properties.*.propertyDetails.*.units.*.constructionSubType - - - jsonPath: $.Properties.*.propertyDetails.*.units.*.arv - - - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.units[*].id)].auditDetails.lastModifiedBy - - - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.units[*].id)].auditDetails.lastModifiedTime - - - - - query: UPDATE eg_pt_address_v2 SET doorNo=?,latitude=?,longitude=?, addressid=?, addressnumber=?, type=?, addressline1=?, addressline2=?, landmark=?, city=?, pincode=?, detail=?,buildingName=?,street=?, locality=?, lastmodifiedby=?, lastmodifiedtime=? where id=?; - basePath: Properties.*.address - jsonMaps: - - - jsonPath: $.Properties.*.address.doorNo - - - jsonPath: $.Properties.*.address.latitude - - - jsonPath: $.Properties.*.address.longitude - - - jsonPath: $.Properties.*.address.addressId - - - jsonPath: $.Properties.*.address.addressNumber - - - jsonPath: $.Properties.*.address.type - - - jsonPath: $.Properties.*.address.addressLine1 - - - jsonPath: $.Properties.*.address.addressLine2 - - - jsonPath: $.Properties.*.address.landmark - - - jsonPath: $.Properties.*.address.city - - - jsonPath: $.Properties.*.address.pincode - - - jsonPath: $.Properties.*.address.detail - - - jsonPath: $.Properties.*.address.buildingName - - - jsonPath: $.Properties.*.address.street - - - jsonPath: $.Properties.*.address.locality.code - - - jsonPath: $.Properties.*.auditDetails.lastModifiedBy - - - jsonPath: $.Properties.*.auditDetails.lastModifiedTime - - - jsonPath: $.Properties.*.address.id - - - - query: INSERT INTO eg_pt_institution_v2(tenantId,id, propertyDetail, name, type,designation, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?,?,?, ?, ?, ?, ?, ?, ?,?) ON CONFLICT (id) DO UPDATE SET name=?,type=?,designation=?,lastmodifiedby=?,lastmodifiedtime=?; - basePath: $.Properties.*.propertyDetails.*.institution - jsonMaps: - - - jsonPath: $.Properties.*.propertyDetails.*.tenantId - - - jsonPath: $.Properties.*.propertyDetails.*.institution.id - - - jsonPath: $.Properties.*.propertyDetails.*.assessmentNumber - - - jsonPath: $.Properties.*.propertyDetails.*.institution.name - - - jsonPath: $.Properties.*.propertyDetails.*.institution.type - - - jsonPath: $.Properties.*.propertyDetails.*.institution.designation - - - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.createdBy - - - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.lastModifiedBy - - - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.createdTime - - - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.lastModifiedTime - - - jsonPath: $.Properties.*.propertyDetails.*.institution.name - - - jsonPath: $.Properties.*.propertyDetails.*.institution.type - - - jsonPath: $.Properties.*.propertyDetails.*.institution.designation - - - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.lastModifiedBy - - - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.lastModifiedTime - - version: 1.0 - description: Cancel property details in eg_pt_propertydetail_v2 table - fromTopic: cancel-pt-propertyDetail - isTransaction: true - queryMaps: - - query: UPDATE eg_pt_assessment SET active=(CASE ? WHEN 'ACTIVE' THEN true ELSE false END) where propertyid=? AND assessmentNumber=? AND tenantId=?; - basePath: Properties.*.propertyDetails.* - jsonMaps: - - - jsonPath: $.Properties.*.propertyDetails.*.status - - - jsonPath: $.Properties[*][?({assessmentNumber} in @.propertyDetails[*].assessmentNumber)].propertyId - - - jsonPath: $.Properties.*.propertyDetails.*.assessmentNumber - - - jsonPath: $.Properties[*][?({assessmentNumber} in @.propertyDetails[*].assessmentNumber)].tenantId - - - query: UPDATE eg_pt_propertydetail_v2 SET status=? where property=? AND assessmentNumber=? AND tenantId=?; - basePath: Properties.*.propertyDetails.* - jsonMaps: - - - jsonPath: $.Properties.*.propertyDetails.*.status - - - jsonPath: $.Properties[*][?({assessmentNumber} in @.propertyDetails[*].assessmentNumber)].propertyId - - - jsonPath: $.Properties.*.propertyDetails.*.assessmentNumber - - - jsonPath: $.Properties[*][?({assessmentNumber} in @.propertyDetails[*].assessmentNumber)].tenantId - - - version: 1.0 - description: Cancel property in eg_pt_property_v2 table - fromTopic: cancel-pt-property - isTransaction: true - queryMaps: - - - query: UPDATE eg_pt_property_v2 SET status=? where propertyId=? AND tenantId=?; - basePath: Properties.* - jsonMaps: - - - jsonPath: $.Properties.*.status - - - jsonPath: $.Properties.*.propertyId - - - jsonPath: $.Properties.*.tenantId - - - query: UPDATE eg_pt_propertydetail_v2 SET status=? where property=? AND assessmentNumber=? AND tenantId=?; - basePath: Properties.*.propertyDetails.* - jsonMaps: - - - jsonPath: $.Properties.*.propertyDetails.*.status - - - jsonPath: $.Properties[*][?({assessmentNumber} in @.propertyDetails[*].assessmentNumber)].propertyId - - - jsonPath: $.Properties.*.propertyDetails.*.assessmentNumber - - - jsonPath: $.Properties[*][?({assessmentNumber} in @.propertyDetails[*].assessmentNumber)].tenantId diff --git a/configs/egov-persister/property-services-registry.yml b/configs/egov-persister/property-services-registry.yml deleted file mode 100644 index 9057d7c9..00000000 --- a/configs/egov-persister/property-services-registry.yml +++ /dev/null @@ -1,591 +0,0 @@ -serviceMaps: - serviceName: property-services - mappings: - - version: 1.0 - description: Persists property details in EG_PT_PROPERTY table - fromTopic: save-property-registry - isTransaction: true - queryMaps: - - - - query: INSERT INTO eg_pt_property_audit (audituuid, propertyid, property, auditcreatedtime) VALUES ((select nextval('seq_eg_pt_registry_audit')), ?, ?, (SELECT extract(epoch from now()))*1000); - basePath: Property - jsonMaps: - - - jsonPath: $.Property.propertyId - - - jsonPath: $.Property - type: JSON - dbType: JSONB - - - query: INSERT INTO eg_pt_property (id, propertyid, tenantid, surveyid, accountid, oldpropertyid, status, acknowldgementnumber, propertytype, ownershipcategory, usagecategory, creationreason, nooffloors, landarea, superbuiltuparea, linkedproperties, source, channel, createdby, createdtime, lastmodifiedby, lastmodifiedtime, additionaldetails) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - basePath: Property - jsonMaps: - - - jsonPath: $.Property.id - - - jsonPath: $.Property.propertyId - - - jsonPath: $.Property.tenantId - - - jsonPath: $.Property.surveyId - - - jsonPath: $.Property.accountId - - - jsonPath: $.Property.oldPropertyId - - - jsonPath: $.Property.status - - - jsonPath: $.Property.acknowldgementNumber - - - jsonPath: $.Property.propertyType - - - jsonPath: $.Property.ownershipCategory - - - jsonPath: $.Property.usageCategory - - - jsonPath: $.Property.creationReason - - - jsonPath: $.Property.noOfFloors - - - jsonPath: $.Property.landArea - - - jsonPath: $.Property.superBuiltUpArea - - - jsonPath: $.Property.linkedProperties - type: ARRAY - dbType: STRING - - - jsonPath: $.Property.source - - - jsonPath: $.Property.channel - - - jsonPath: $.Property.auditDetails.createdBy - - - jsonPath: $.Property.auditDetails.createdTime - - - jsonPath: $.Property.auditDetails.lastModifiedBy - - - jsonPath: $.Property.auditDetails.lastModifiedTime - - - jsonPath: $.Property.additionalDetails - type: JSON - dbType: JSONB - - - - query: INSERT INTO eg_pt_owner(ownerinfouuid, tenantid, propertyid, userid, status, isprimaryowner, ownertype, ownershippercentage, institutionid, relationship, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - basePath: Property.owners.* - jsonMaps: - - - jsonPath: $.Property.owners.*.ownerInfoUuid - - - jsonPath: $.Property.tenantId - - - jsonPath: $.Property.id - - - jsonPath: $.Property.owners.*.uuid - - - jsonPath: $.Property.owners.*.status - - - jsonPath: $.Property.owners.*.isPrimaryOwner - - - jsonPath: $.Property.owners.*.ownerType - - - jsonPath: $.Property.owners.*.ownerShipPercentage - - - jsonPath: $.Property.owners.*.institutionId - - - jsonPath: $.Property.owners.*.relationship - - - jsonPath: $.Property.auditDetails.createdBy - - - jsonPath: $.Property.auditDetails.createdTime - - - jsonPath: $.Property.auditDetails.lastModifiedBy - - - jsonPath: $.Property.auditDetails.lastModifiedTime - - - - query: INSERT INTO eg_pt_document (id, tenantid, entityid, documenttype, filestoreid, documentuid, status, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - basePath: $.Property.documents.* - jsonMaps: - - - jsonPath: $.Property.documents.*.id - - - jsonPath: $.Property.tenantId - - - jsonPath: $.Property.id - - - jsonPath: $.Property.documents.*.documentType - - - jsonPath: $.Property.documents.*.fileStoreId - - - jsonPath: $.Property.documents.*.documentUid - - - jsonPath: $.Property.documents.*.status - - - jsonPath: $.Property.auditDetails.createdBy - - - jsonPath: $.Property.auditDetails.lastModifiedBy - - - jsonPath: $.Property.auditDetails.createdTime - - - jsonPath: $.Property.auditDetails.lastModifiedTime - - - - query: INSERT INTO eg_pt_document (id, tenantid, entityid, documenttype, filestoreid, documentuid, status, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - basePath: $.Property.owners.*.documents.* - jsonMaps: - - - jsonPath: $.Property.owners.*.documents.*.id - - - jsonPath: $.Property.tenantId - - - jsonPath: $.Property.owners[*][?({id} in @.documents[*].id)].ownerInfoUuid - - - jsonPath: $.Property.owners.*.documents.*.documentType - - - jsonPath: $.Property.owners.*.documents.*.fileStoreId - - - jsonPath: $.Property.owners.*.documents.*.documentUid - - - jsonPath: $.Property.documents.*.status - - - jsonPath: $.Property.auditDetails.createdBy - - - jsonPath: $.Property.auditDetails.lastModifiedBy - - - jsonPath: $.Property.auditDetails.createdTime - - - jsonPath: $.Property.auditDetails.lastModifiedTime - - - - query: INSERT INTO eg_pt_institution (id, propertyid, tenantid, name, nameofauthorizedperson, type, designation, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - basePath: $.Property.institution - jsonMaps: - - - jsonPath: $.Property.institution.id - - - jsonPath: $.Property.id - - - jsonPath: $.Property.tenantId - - - jsonPath: $.Property.institution.name - - - jsonPath: $.Property.institution.nameOfAuthorizedPerson - - - jsonPath: $.Property.institution.type - - - jsonPath: $.Property.institution.designation - - - jsonPath: $.Property.auditDetails.createdBy - - - jsonPath: $.Property.auditDetails.createdTime - - - jsonPath: $.Property.auditDetails.lastModifiedBy - - - jsonPath: $.Property.auditDetails.lastModifiedTime - - - - query: INSERT INTO eg_pt_address(tenantid, id, propertyid, doorno, plotno, buildingname, street, landmark, city, pincode, locality, district, region, state, country, latitude, longitude, createdby, createdtime, lastmodifiedby, lastmodifiedtime, additionaldetails) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - basePath: Property.address - jsonMaps: - - - jsonPath: $.Property.tenantId - - - jsonPath: $.Property.address.id - - - jsonPath: $.Property.id - - - jsonPath: $.Property.address.doorNo - - - jsonPath: $.Property.address.plotNo - - - jsonPath: $.Property.address.buildingName - - - jsonPath: $.Property.address.street - - - jsonPath: $.Property.address.landmark - - - jsonPath: $.Property.address.city - - - jsonPath: $.Property.address.pincode - - - jsonPath: $.Property.address.locality.code - - - jsonPath: $.Property.address.district - - - jsonPath: $.Property.address.region - - - jsonPath: $.Property.address.state - - - jsonPath: $.Property.address.country - - - jsonPath: $.Property.address.geoLocation.latitude - - - jsonPath: $.Property.address.geoLocation.longitude - - - jsonPath: $.Property.auditDetails.createdBy - - - jsonPath: $.Property.auditDetails.createdTime - - - jsonPath: $.Property.auditDetails.lastModifiedBy - - - jsonPath: $.Property.auditDetails.lastModifiedTime - - - jsonPath: $.Property.address.additionalDetails - type: JSON - dbType: JSONB - - - - query: INSERT INTO eg_pt_unit(id, tenantid, propertyid, floorno, unittype, usagecategory, occupancytype, occupancydate, carpetarea, builtuparea, plintharea, superbuiltuparea, arv, constructiontype, constructiondate, dimensions, active,additionaldetails, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - basePath: Property.units.* - jsonMaps: - - - jsonPath: $.Property.units.*.id - - - jsonPath: $.Property.tenantId - - - jsonPath: $.Property.id - - - jsonPath: $.Property.units.*.floorNo - - - jsonPath: $.Property.units.*.unitType - - - jsonPath: $.Property.units.*.usageCategory - - - jsonPath: $.Property.units.*.occupancyType - - - jsonPath: $.Property.units.*.occupancyDate - - - jsonPath: $.Property.units.*.constructionDetail.carpetArea - - - jsonPath: $.Property.units.*.constructionDetail.builtUpArea - - - jsonPath: $.Property.units.*.constructionDetail.plinthArea - - - jsonPath: $.Property.units.*.constructionDetail.superBuiltUpArea - - - jsonPath: $.Property.units.*.arv - - - jsonPath: $.Property.units.*.constructionDetail.constructionType - - - jsonPath: $.Property.units.*.constructionDetail.constructionDate - - - jsonPath: $.Property.units.*.constructionDetail.dimensions - type: JSON - dbType: JSONB - - - jsonPath: $.Property.units.*.active - - - jsonPath: $.Property.units.*.additionalDetails - type: JSON - dbType: JSONB - - - jsonPath: $.Property.auditDetails.createdBy - - - jsonPath: $.Property.auditDetails.createdTime - - - jsonPath: $.Property.auditDetails.lastModifiedBy - - - jsonPath: $.Property.auditDetails.lastModifiedTime - - - - - version: 1.0 - description: Update property EG_PT_PROPERTY ltable - fromTopic: update-property-registry - isTransaction: true - queryMaps: - - - - query: INSERT INTO eg_pt_property_audit (audituuid, propertyid, property, auditcreatedtime) VALUES ((select nextval('seq_eg_pt_registry_audit')), ?, ?, (SELECT extract(epoch from now()))*1000); - basePath: Property - jsonMaps: - - - jsonPath: $.Property.propertyId - - - jsonPath: $.Property - type: JSON - dbType: JSONB - - - query: UPDATE eg_pt_property SET propertyid=?, surveyid=?, accountid=?, oldpropertyid=?, status=?, propertytype=?, ownershipcategory=?, usagecategory=?, nooffloors=?, landarea=?, superbuiltuparea=?, linkedproperties=?, lastmodifiedby=?, lastmodifiedtime=?, additionaldetails=? WHERE Id=? AND tenantId=?; - basePath: Property - jsonMaps: - - - jsonPath: $.Property.propertyId - - - jsonPath: $.Property.surveyId - - - jsonPath: $.Property.accountId - - - jsonPath: $.Property.oldPropertyId - - - jsonPath: $.Property.status - - - jsonPath: $.Property.propertyType - - - jsonPath: $.Property.ownershipCategory - - - jsonPath: $.Property.usageCategory - - - jsonPath: $.Property.noOfFloors - - - jsonPath: $.Property.landArea - - - jsonPath: $.Property.superBuiltUpArea - - - jsonPath: $.Property.linkedProperties - - - jsonPath: $.Property.auditDetails.lastModifiedBy - - - jsonPath: $.Property.auditDetails.lastModifiedTime - - - jsonPath: $.Property.additionalDetails - type: JSON - dbType: JSONB - - - jsonPath: $.Property.id - - - jsonPath: $.Property.tenantId - - - - query: INSERT INTO eg_pt_owner (ownerinfouuid, tenantid, propertyid, userid, status, isprimaryowner, ownertype, ownershippercentage, institutionid, relationship, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (userid, propertyid) DO UPDATE SET status=EXCLUDED.status, isprimaryowner=EXCLUDED.isprimaryowner, ownertype=EXCLUDED.ownertype, ownershippercentage=EXCLUDED.ownershippercentage, institutionid=EXCLUDED.institutionid, relationship=EXCLUDED.relationship, lastmodifiedby=EXCLUDED.lastModifiedby, lastmodifiedtime=EXCLUDED.lastmodifiedtime; - basePath: Property.owners.* - jsonMaps: - - - jsonPath: $.Property.owners.*.ownerInfoUuid - - - jsonPath: $.Property.tenantId - - - jsonPath: $.Property.id - - - jsonPath: $.Property.owners.*.uuid - - - jsonPath: $.Property.owners.*.status - - - jsonPath: $.Property.owners.*.isPrimaryOwner - - - jsonPath: $.Property.owners.*.ownerType - - - jsonPath: $.Property.owners.*.ownerShipPercentage - - - jsonPath: $.Property.owners.*.institutionId - - - jsonPath: $.Property.owners.*.relationship - - - jsonPath: $.Property.auditDetails.createdBy - - - jsonPath: $.Property.auditDetails.createdTime - - - jsonPath: $.Property.auditDetails.lastModifiedBy - - - jsonPath: $.Property.auditDetails.lastModifiedTime - - - query: INSERT INTO eg_pt_document (id, tenantid, entityid, documenttype, filestoreid, documentuid, status, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET documenttype = EXCLUDED.documenttype,fileStoreid = EXCLUDED.filestoreid, documentuid=EXCLUDED.documentuid, status=EXCLUDED.status, lastmodifiedby = EXCLUDED.lastModifiedby, lastmodifiedtime = EXCLUDED.lastmodifiedtime; - basePath: $.Property.documents.* - jsonMaps: - - - jsonPath: $.Property.documents.*.id - - - jsonPath: $.Property.tenantId - - - jsonPath: $.Property.id - - - jsonPath: $.Property.documents.*.documentType - - - jsonPath: $.Property.documents.*.fileStoreId - - - jsonPath: $.Property.documents.*.documentUid - - - jsonPath: $.Property.documents.*.status - - - jsonPath: $.Property.auditDetails.createdBy - - - jsonPath: $.Property.auditDetails.lastModifiedBy - - - jsonPath: $.Property.auditDetails.createdTime - - - jsonPath: $.Property.auditDetails.lastModifiedTime - - - query: INSERT INTO eg_pt_document (id, tenantid, entityid, documenttype, filestoreid, documentuid, status, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET documenttype = EXCLUDED.documenttype,fileStoreid = EXCLUDED.filestoreid, documentuid=EXCLUDED.documentuid, status=EXCLUDED.status, lastmodifiedby = EXCLUDED.lastModifiedby, lastmodifiedtime = EXCLUDED.lastmodifiedtime; - basePath: $.Property.owners.*.documents.* - jsonMaps: - - - jsonPath: $.Property.owners.*.documents.*.id - - - jsonPath: $.Property.tenantId - - - jsonPath: $.Property.owners[*][?({id} in @.documents[*].id)].ownerInfoUuid - - - jsonPath: $.Property.owners.*.documents.*.documentType - - - jsonPath: $.Property.owners.*.documents.*.fileStoreId - - - jsonPath: $.Property.owners.*.documents.*.documentUid - - - jsonPath: $.Property.owners.*.documents.*.status - - - jsonPath: $.Property.auditDetails.createdBy - - - jsonPath: $.Property.auditDetails.lastModifiedBy - - - jsonPath: $.Property.auditDetails.createdTime - - - jsonPath: $.Property.auditDetails.lastModifiedTime - - - query: UPDATE eg_pt_address SET doorno=?, plotno=?, buildingname=?, street=?, landmark=?, city=?, pincode=?, locality=?, district=?, region=?, state=?, country=?, latitude=?, longitude=?, lastmodifiedby=?, lastmodifiedtime=?, additionaldetails=? WHERE id=?; - basePath: Property.address - jsonMaps: - - - jsonPath: $.Property.address.doorNo - - - jsonPath: $.Property.address.plotNo - - - jsonPath: $.Property.address.buildingName - - - jsonPath: $.Property.address.street - - - jsonPath: $.Property.address.landmark - - - jsonPath: $.Property.address.city - - - jsonPath: $.Property.address.pincode - - - jsonPath: $.Property.address.locality.code - - - jsonPath: $.Property.address.district - - - jsonPath: $.Property.address.region - - - jsonPath: $.Property.address.state - - - jsonPath: $.Property.address.country - - - jsonPath: $.Property.address.geoLocation.latitude - - - jsonPath: $.Property.address.geoLocation.longitude - - - jsonPath: $.Property.auditDetails.lastModifiedBy - - - jsonPath: $.Property.auditDetails.lastModifiedTime - - - jsonPath: $.Property.address.additionalDetails - type: JSON - dbType: JSONB - - - jsonPath: $.Property.address.id - - - query: INSERT INTO eg_pt_institution (id, propertyid, tenantid, name, nameofauthorizedperson, type, designation, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET name=EXCLUDED.name, type=EXCLUDED.type, designation=EXCLUDED.designation, lastmodifiedby=EXCLUDED.lastModifiedby, lastmodifiedtime=EXCLUDED.lastmodifiedtime; - basePath: $.Property.institution - jsonMaps: - - - jsonPath: $.Property.institution.id - - - jsonPath: $.Property.id - - - jsonPath: $.Property.tenantId - - - jsonPath: $.Property.institution.name - - - jsonPath: $.Property.institution.nameOfAuthorizedPerson - - - jsonPath: $.Property.institution.type - - - jsonPath: $.Property.institution.designation - - - jsonPath: $.Property.auditDetails.createdBy - - - jsonPath: $.Property.auditDetails.createdTime - - - jsonPath: $.Property.auditDetails.lastModifiedBy - - - jsonPath: $.Property.auditDetails.lastModifiedTime - - - - query: INSERT INTO eg_pt_unit(id, tenantid, propertyid, floorno, unittype, usagecategory, occupancytype, occupancydate, carpetarea, builtuparea, plintharea, superbuiltuparea, arv, constructiontype, constructiondate, dimensions, active,additionaldetails, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET floorno=EXCLUDED.floorno, unittype=EXCLUDED.unittype, usagecategory=EXCLUDED.usagecategory, occupancytype=EXCLUDED.occupancytype, occupancydate=EXCLUDED.occupancydate, carpetarea=EXCLUDED.carpetarea, builtuparea=EXCLUDED.builtuparea, plintharea=EXCLUDED.plintharea, superbuiltuparea=EXCLUDED.superbuiltuparea, arv=EXCLUDED.arv, constructiontype=EXCLUDED.constructiontype, constructiondate=EXCLUDED.constructiondate, dimensions=excluded.dimensions, active=EXCLUDED.active, lastmodifiedby=EXCLUDED.lastmodifiedby, lastmodifiedtime=EXCLUDED.lastmodifiedtime; - basePath: Property.units.* - jsonMaps: - - - jsonPath: $.Property.units.*.id - - - jsonPath: $.Property.tenantId - - - jsonPath: $.Property.id - - - jsonPath: $.Property.units.*.floorNo - - - jsonPath: $.Property.units.*.unitType - - - jsonPath: $.Property.units.*.usageCategory - - - jsonPath: $.Property.units.*.occupancyType - - - jsonPath: $.Property.units.*.occupancyDate - - - jsonPath: $.Property.units.*.constructionDetail.carpetArea - - - jsonPath: $.Property.units.*.constructionDetail.builtUpArea - - - jsonPath: $.Property.units.*.constructionDetail.plinthArea - - - jsonPath: $.Property.units.*.constructionDetail.superBuiltUpArea - - - jsonPath: $.Property.units.*.arv - - - jsonPath: $.Property.units.*.constructionDetail.constructionType - - - jsonPath: $.Property.units.*.constructionDetail.constructionDate - - - jsonPath: $.Property.units.*.constructionDetail.dimensions - type: JSON - dbType: JSONB - - - jsonPath: $.Property.units.*.active - - - jsonPath: $.Property.units.*.additionalDetails - type: JSON - dbType: JSONB - - - jsonPath: $.Property.auditDetails.createdBy - - - jsonPath: $.Property.auditDetails.createdTime - - - jsonPath: $.Property.auditDetails.lastModifiedBy - - - jsonPath: $.Property.auditDetails.lastModifiedTime - - - - - version: 1.0 - description: Update documents in EG_PT_PROPERTY ltable - fromTopic: update-property-doc-registry - isTransaction: true - queryMaps: - - - - query: INSERT INTO eg_pt_document (id, tenantid, entityid, documenttype, filestoreid, documentuid, status, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET documenttype = EXCLUDED.documenttype,fileStoreid = EXCLUDED.filestoreid, documentuid=EXCLUDED.documentuid, status=EXCLUDED.status, lastmodifiedby = EXCLUDED.lastModifiedby, lastmodifiedtime = EXCLUDED.lastmodifiedtime; - basePath: $.Property.documents.* - jsonMaps: - - - jsonPath: $.Property.documents.*.id - - - jsonPath: $.Property.tenantId - - - jsonPath: $.Property.id - - - jsonPath: $.Property.documents.*.documentType - - - jsonPath: $.Property.documents.*.fileStoreId - - - jsonPath: $.Property.documents.*.documentUid - - - jsonPath: $.Property.documents.*.status - - - jsonPath: $.Property.auditDetails.createdBy - - - jsonPath: $.Property.auditDetails.lastModifiedBy - - - jsonPath: $.Property.auditDetails.createdTime - - - jsonPath: $.Property.auditDetails.lastModifiedTime diff --git a/configs/egov-persister/property-services.yml b/configs/egov-persister/property-services.yml deleted file mode 100644 index 0e4514f5..00000000 --- a/configs/egov-persister/property-services.yml +++ /dev/null @@ -1,819 +0,0 @@ -serviceMaps: - serviceName: property-services - mappings: - - version: 1.0 - description: Persists property details in EG_PT_PROPERTY table - fromTopic: save-pt-property - isTransaction: true - queryMaps: - - - query: INSERT INTO eg_pt_property_v2(tenantId,propertyId, status,acknowldgementNumber, oldPropertyId, creationReason, occupancyDate,additionalDetails ,createdBy,createdTime,lastModifiedBy,lastModifiedTime ) VALUES (?,?,?,?,?,?,?,?,?,?,?,?); - basePath: Properties.* - jsonMaps: - - jsonPath: $.Properties.*.tenantId - - - jsonPath: $.Properties.*.propertyId - - - jsonPath: $.Properties.*.status - - - jsonPath: $.Properties.*.acknowldgementNumber - - - jsonPath: $.Properties.*.oldPropertyId - - - jsonPath: $.Properties.*.creationReason - - - jsonPath: $.Properties.*.occupancyDate - - - jsonPath: $.Properties.*.additionalDetails - type: JSON - dbType: JSONB - - - jsonPath: $.Properties.*.auditDetails.createdBy - - - jsonPath: $.Properties.*.auditDetails.createdTime - - - jsonPath: $.Properties.*.auditDetails.lastModifiedBy - - - jsonPath: $.Properties.*.auditDetails.lastModifiedTime - - - - query: INSERT INTO eg_pt_propertydetail_v2(tenantId,assessmentNumber,property,accountId,ownershipCategory,subOwnershipCategory,source,usage,noOfFloors,landArea,buildUpArea,additionalDetails,channel,financialYear,propertyType,propertySubType,usageCategoryMajor,usageCategoryMinor,assessmentDate,adhocExemption,adhocPenalty,adhocExemptionReason,adhocPenaltyReason,createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?); - basePath: Properties.*.propertyDetails.* - jsonMaps: - - - jsonPath: $.Properties[*][?({assessmentNumber} in @.propertyDetails[*].assessmentNumber)].tenantId - - - jsonPath: $.Properties.*.propertyDetails.*.assessmentNumber - - - jsonPath: $.Properties[*][?({assessmentNumber} in @.propertyDetails[*].assessmentNumber)].propertyId - - - jsonPath: $.Properties.*.propertyDetails.*.citizenInfo.uuid - - - jsonPath: $.Properties.*.propertyDetails.*.ownershipCategory - - - jsonPath: $.Properties.*.propertyDetails.*.subOwnershipCategory - - - jsonPath: $.Properties.*.propertyDetails.*.source - - - jsonPath: $.Properties.*.propertyDetails.*.usage - - - jsonPath: $.Properties.*.propertyDetails.*.noOfFloors - - - jsonPath: $.Properties.*.propertyDetails.*.landArea - - - jsonPath: $.Properties.*.propertyDetails.*.buildUpArea - - - jsonPath: $.Properties.*.propertyDetails.*.additionalDetails - type: JSON - dbType: JSONB - - - jsonPath: $.Properties.*.propertyDetails.*.channel - - - jsonPath: $.Properties.*.propertyDetails.*.financialYear - - - jsonPath: $.Properties.*.propertyDetails.*.propertyType - - - jsonPath: $.Properties.*.propertyDetails.*.propertySubType - - - jsonPath: $.Properties.*.propertyDetails.*.usageCategoryMajor - - - jsonPath: $.Properties.*.propertyDetails.*.usageCategoryMinor - - - jsonPath: $.Properties.*.propertyDetails.*.assessmentDate - - - jsonPath: $.Properties.*.propertyDetails.*.adhocExemption - - - jsonPath: $.Properties.*.propertyDetails.*.adhocPenalty - - - jsonPath: $.Properties.*.propertyDetails.*.adhocExemptionReason - - - jsonPath: $.Properties.*.propertyDetails.*.adhocPenaltyReason - - - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.createdBy - - - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.lastModifiedBy - - - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.createdTime - - - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.lastModifiedTime - - - query: INSERT INTO eg_pt_owner_v2(tenantId,propertyDetail, userid,additionalDetails, isactive,isPrimaryOwner,ownerShipPercentage, ownerType,institutionId,relationship,createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - basePath: Properties.*.propertyDetails.*.owners.* - jsonMaps: - - - jsonPath: $.Properties[*][?({uuid} in @.propertyDetails.*.owners[*].uuid)].tenantId - - - jsonPath: $.Properties.*.propertyDetails[*][?({persisterRefId} in @.owners[*].persisterRefId)].assessmentNumber - - - jsonPath: $.Properties.*.propertyDetails.*.owners.*.uuid - - - jsonPath: $.Properties.*.propertyDetails.*.owners.*.additionalDetails - type: JSON - dbType: JSONB - - - jsonPath: $.Properties.*.propertyDetails.*.owners.*.isActive - - - jsonPath: $.Properties.*.propertyDetails.*.owners.*.isPrimaryOwner - - - jsonPath: $.Properties.*.propertyDetails.*.owners.*.ownerShipPercentage - - - jsonPath: $.Properties.*.propertyDetails.*.owners.*.ownerType - - - jsonPath: $.Properties.*.propertyDetails.*.owners.*.institutionId - - - jsonPath: $.Properties.*.propertyDetails.*.owners.*.relationship - - - jsonPath: $.Properties.*.propertyDetails[*][?({uuid} in @.owners[*].uuid)].auditDetails.createdBy - - - jsonPath: $.Properties.*.propertyDetails[*][?({uuid} in @.owners[*].uuid)].auditDetails.lastModifiedBy - - - jsonPath: $.Properties.*.propertyDetails[*][?({uuid} in @.owners[*].uuid)].auditDetails.createdTime - - - jsonPath: $.Properties.*.propertyDetails[*][?({uuid} in @.owners[*].uuid)].auditDetails.lastModifiedTime - - - - - query: INSERT INTO eg_pt_document_propertydetail_v2(tenantId,id, propertydetail, documenttype, fileStore,documentuid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?,?,?, ?, ?, ?, ?, ?, ?, ?); - basePath: $.Properties.*.propertyDetails.*.documents.* - jsonMaps: - - - jsonPath: $.Properties[*][?({id} in @.propertyDetails.*.documents[*].id)].tenantId - - - jsonPath: $.Properties.*.propertyDetails.*.documents.*.id - - - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.documents[*].id)].assessmentNumber - - - jsonPath: $.Properties.*.propertyDetails.*.documents.*.documentType - - - jsonPath: $.Properties.*.propertyDetails.*.documents.*.fileStore - - - jsonPath: $.Properties.*.propertyDetails.*.documents.*.documentUid - - - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.documents[*].id)].auditDetails.createdBy - - - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.documents[*].id)].auditDetails.lastModifiedBy - - - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.documents[*].id)].auditDetails.createdTime - - - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.documents[*].id)].auditDetails.lastModifiedTime - - - - query: INSERT INTO eg_pt_document_owner_v2(tenantId,id,userid, propertydetail, documenttype, fileStore,documentuid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?,?,?,?, ?, ?, ?, ?, ?, ?, ?); - basePath: $.Properties.*.propertyDetails.*.owners.*.documents.* - jsonMaps: - - - jsonPath: $.Properties[*][?({id} in @.propertyDetails.*.owners.*.documents[*].id)].tenantId - - - jsonPath: $.Properties.*.propertyDetails.*.owners.*.documents.*.id - - - jsonPath: $.Properties.*.propertyDetails.*.owners[*][?({id} in @.documents[*].id)].uuid - - - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.owners.*.documents[*].id)].assessmentNumber - - - jsonPath: $.Properties.*.propertyDetails.*.owners.*.documents.*.documentType - - - jsonPath: $.Properties.*.propertyDetails.*.owners.*.documents.*.fileStore - - - jsonPath: $.Properties.*.propertyDetails.*.owners.*.documents.*.documentUid - - - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.owners.*.documents[*].id)].auditDetails.createdBy - - - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.owners.*.documents[*].id)].auditDetails.lastModifiedBy - - - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.owners.*.documents[*].id)].auditDetails.createdTime - - - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.owners.*.documents[*].id)].auditDetails.lastModifiedTime - - - - - query: INSERT INTO eg_pt_address_v2(tenantId, id, property,additionalDetails,doorNo, latitude,longitude, addressid, addressnumber, type, addressline1, addressline2, landmark, city, pincode, detail,buildingName,street, locality, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ? , ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - basePath: Properties.*.address - jsonMaps: - - - jsonPath: $.Properties.*.tenantId - - - jsonPath: $.Properties.*.address.id - - - jsonPath: $.Properties.*.propertyId - - - jsonPath: $.Properties.*.address.additionalDetails - type: JSON - dbType: JSONB - - - jsonPath: $.Properties.*.address.doorNo - - - jsonPath: $.Properties.*.address.latitude - - - jsonPath: $.Properties.*.address.longitude - - - jsonPath: $.Properties.*.address.addressId - - - jsonPath: $.Properties.*.address.addressNumber - - - jsonPath: $.Properties.*.address.type - - - jsonPath: $.Properties.*.address.addressLine1 - - - jsonPath: $.Properties.*.address.addressLine2 - - - jsonPath: $.Properties.*.address.landmark - - - jsonPath: $.Properties.*.address.city - - - jsonPath: $.Properties.*.address.pincode - - - jsonPath: $.Properties.*.address.detail - - - jsonPath: $.Properties.*.address.buildingName - - - jsonPath: $.Properties.*.address.street - - - jsonPath: $.Properties.*.address.locality.code - - - jsonPath: $.Properties.*.auditDetails.createdBy - - - jsonPath: $.Properties.*.auditDetails.lastModifiedBy - - - jsonPath: $.Properties.*.auditDetails.createdTime - - - jsonPath: $.Properties.*.auditDetails.lastModifiedTime - - - - query: INSERT INTO eg_pt_unit_v2(tenantId,id,propertyDetail,additionalDetails,floorNo,unitType,unitArea,usageCategoryMajor,usageCategoryMinor,usageCategorySubMinor,usageCategoryDetail,occupancyType,occupancyDate,constructionType,constructionSubType,arv,createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?); - basePath: Properties.*.propertyDetails.*.units.* - jsonMaps: - - - jsonPath: $.Properties[*][?({id} in @.propertyDetails.*.units[*].id)].tenantId - - - jsonPath: $.Properties.*.propertyDetails.*.units.*.id - - - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.units[*].id)].assessmentNumber - - - jsonPath: $.Properties.*.propertyDetails.*.units.*.additionalDetails - type: JSON - dbType: JSONB - - - jsonPath: $.Properties.*.propertyDetails.*.units.*.floorNo - - - jsonPath: $.Properties.*.propertyDetails.*.units.*.unitType - - - jsonPath: $.Properties.*.propertyDetails.*.units.*.unitArea - - - jsonPath: $.Properties.*.propertyDetails.*.units.*.usageCategoryMajor - - - jsonPath: $.Properties.*.propertyDetails.*.units.*.usageCategoryMinor - - - jsonPath: $.Properties.*.propertyDetails.*.units.*.usageCategorySubMinor - - - jsonPath: $.Properties.*.propertyDetails.*.units.*.usageCategoryDetail - - - jsonPath: $.Properties.*.propertyDetails.*.units.*.occupancyType - - - jsonPath: $.Properties.*.propertyDetails.*.units.*.occupancyDate - - - jsonPath: $.Properties.*.propertyDetails.*.units.*.constructionType - - - jsonPath: $.Properties.*.propertyDetails.*.units.*.constructionSubType - - - jsonPath: $.Properties.*.propertyDetails.*.units.*.arv - - - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.units[*].id)].auditDetails.createdBy - - - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.units[*].id)].auditDetails.lastModifiedBy - - - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.units[*].id)].auditDetails.createdTime - - - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.units[*].id)].auditDetails.lastModifiedTime - - - query: INSERT INTO eg_pt_institution_v2(tenantId,id, propertyDetail,additionalDetails, name, type,designation, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT ON CONSTRAINT pk_eg_pt_institution_v2 DO NOTHING; - basePath: $.Properties.*.propertyDetails.*.institution - jsonMaps: - - - jsonPath: $.Properties.*.propertyDetails.*.tenantId - - - jsonPath: $.Properties.*.propertyDetails.*.institution.id - - - jsonPath: $.Properties.*.propertyDetails.*.assessmentNumber - - - jsonPath: $.Properties.*.propertyDetails.*.institution.additionalDetails - type: JSON - dbType: JSONB - - - jsonPath: $.Properties.*.propertyDetails.*.institution.name - - - jsonPath: $.Properties.*.propertyDetails.*.institution.type - - - jsonPath: $.Properties.*.propertyDetails.*.institution.designation - - - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.createdBy - - - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.lastModifiedBy - - - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.createdTime - - - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.lastModifiedTime - - - - - - - version: 1.0 - description: Update property details in EG_PT_PROPERTY table - fromTopic: update-pt-property - isTransaction: true - queryMaps: - - - - query: INSERT INTO eg_pt_property_audit_v2 SELECT * FROM eg_pt_property_v2 WHERE propertyid = ?; - basePath: Properties.* - jsonMaps: - - - jsonPath: $.Properties.*.propertyId - - - - query: INSERT INTO eg_pt_address_audit_v2 SELECT * FROM eg_pt_address_v2 WHERE id = ?; - basePath: Properties.*.address - jsonMaps: - - - jsonPath: $.Properties.*.address.id - - - - - query: UPDATE eg_pt_property_v2 SET additionalDetails=?,status=?,acknowldgementNumber=?,oldPropertyId=?,creationReason=?, occupancyDate=?,lastModifiedBy=?, lastModifiedTime=? where propertyId=? AND tenantId=?; - basePath: Properties.* - jsonMaps: - - - jsonPath: $.Properties.*.additionalDetails - type: JSON - dbType: JSONB - - - jsonPath: $.Properties.*.status - - - jsonPath: $.Properties.*.acknowldgementNumber - - - jsonPath: $.Properties.*.oldPropertyId - - - jsonPath: $.Properties.*.creationReason - - - jsonPath: $.Properties.*.occupancyDate - - - jsonPath: $.Properties.*.auditDetails.lastModifiedBy - - - jsonPath: $.Properties.*.auditDetails.lastModifiedTime - - - jsonPath: $.Properties.*.propertyId - - - jsonPath: $.Properties.*.tenantId - - - - - - query: INSERT INTO eg_pt_propertydetail_v2(tenantId,assessmentNumber,property,accountId,ownershipCategory,subOwnershipCategory,source,usage,noOfFloors,landArea,buildUpArea,additionalDetails,channel,financialYear,propertyType,propertySubType,usageCategoryMajor,usageCategoryMinor,assessmentDate,adhocExemption,adhocPenalty,adhocExemptionReason,adhocPenaltyReason,createdby, lastmodifiedby, createdtime,lastmodifiedtime) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) ON CONFLICT (assessmentNumber) DO UPDATE SET accountId=?,financialYear=?, propertyType=?, propertySubType=?,usageCategoryMajor=?,usageCategoryMinor=?, assessmentDate=?,ownershipCategory=?,subOwnershipCategory=?,source=?,usage=?,noOfFloors=?,landArea=?,buildUpArea=?,additionalDetails=?,channel=?,adhocExemption=?,adhocPenalty=?,adhocExemptionReason=?,adhocPenaltyReason=?,lastModifiedBy=?, lastModifiedTime=?; - basePath: Properties.*.propertyDetails.* - jsonMaps: - - - jsonPath: $.Properties[*][?({assessmentNumber} in @.propertyDetails[*].assessmentNumber)].tenantId - - - jsonPath: $.Properties.*.propertyDetails.*.assessmentNumber - - - jsonPath: $.Properties[*][?({assessmentNumber} in @.propertyDetails[*].assessmentNumber)].propertyId - - - jsonPath: $.Properties.*.propertyDetails.*.citizenInfo.uuid - - - jsonPath: $.Properties.*.propertyDetails.*.ownershipCategory - - - jsonPath: $.Properties.*.propertyDetails.*.subOwnershipCategory - - - jsonPath: $.Properties.*.propertyDetails.*.source - - - jsonPath: $.Properties.*.propertyDetails.*.usage - - - jsonPath: $.Properties.*.propertyDetails.*.noOfFloors - - - jsonPath: $.Properties.*.propertyDetails.*.landArea - - - jsonPath: $.Properties.*.propertyDetails.*.buildUpArea - - - jsonPath: $.Properties.*.propertyDetails.*.additionalDetails - type: JSON - dbType: JSONB - - - jsonPath: $.Properties.*.propertyDetails.*.channel - - - jsonPath: $.Properties.*.propertyDetails.*.financialYear - - - jsonPath: $.Properties.*.propertyDetails.*.propertyType - - - jsonPath: $.Properties.*.propertyDetails.*.propertySubType - - - jsonPath: $.Properties.*.propertyDetails.*.usageCategoryMajor - - - jsonPath: $.Properties.*.propertyDetails.*.usageCategoryMinor - - - jsonPath: $.Properties.*.propertyDetails.*.assessmentDate - - - jsonPath: $.Properties.*.propertyDetails.*.adhocExemption - - - jsonPath: $.Properties.*.propertyDetails.*.adhocPenalty - - - jsonPath: $.Properties.*.propertyDetails.*.adhocExemptionReason - - - jsonPath: $.Properties.*.propertyDetails.*.adhocPenaltyReason - - - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.createdBy - - - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.lastModifiedBy - - - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.createdTime - - - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.lastModifiedTime - - - jsonPath: $.Properties.*.propertyDetails.*.citizenInfo.uuid - - - jsonPath: $.Properties.*.propertyDetails.*.financialYear - - - jsonPath: $.Properties.*.propertyDetails.*.propertyType - - - jsonPath: $.Properties.*.propertyDetails.*.propertySubType - - - jsonPath: $.Properties.*.propertyDetails.*.usageCategoryMajor - - - jsonPath: $.Properties.*.propertyDetails.*.usageCategoryMinor - - - jsonPath: $.Properties.*.propertyDetails.*.assessmentDate - - - jsonPath: $.Properties.*.propertyDetails.*.ownershipCategory - - - jsonPath: $.Properties.*.propertyDetails.*.subOwnershipCategory - - - jsonPath: $.Properties.*.propertyDetails.*.source - - - jsonPath: $.Properties.*.propertyDetails.*.usage - - - jsonPath: $.Properties.*.propertyDetails.*.noOfFloors - - - jsonPath: $.Properties.*.propertyDetails.*.landArea - - - jsonPath: $.Properties.*.propertyDetails.*.buildUpArea - - - jsonPath: $.Properties.*.propertyDetails.*.additionalDetails - type: JSON - dbType: JSONB - - - jsonPath: $.Properties.*.propertyDetails.*.channel - - - jsonPath: $.Properties.*.propertyDetails.*.adhocExemption - - - jsonPath: $.Properties.*.propertyDetails.*.adhocPenalty - - - jsonPath: $.Properties.*.propertyDetails.*.adhocExemptionReason - - - jsonPath: $.Properties.*.propertyDetails.*.adhocPenaltyReason - - - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.lastModifiedBy - - - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.lastModifiedTime - - - - - query: INSERT INTO eg_pt_owner_v2(tenantId,propertyDetail, userid,additionalDetails, isActive,isPrimaryOwner,ownerShipPercentage, ownerType,institutionId,relationship, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT ON CONSTRAINT pk_eg_pt_owner_v2 DO UPDATE SET additionalDetails=?,isActive =?,isPrimaryOwner=?,ownerShipPercentage=?,ownerType=?,institutionId=?,relationship=?,lastmodifiedby =?,lastmodifiedtime =?; - basePath: Properties.*.propertyDetails.*.owners.* - jsonMaps: - - - jsonPath: $.Properties[*][?({uuid} in @.propertyDetails.*.owners[*].uuid)].tenantId - - - jsonPath: $.Properties.*.propertyDetails[*][?({persisterRefId} in @.owners[*].persisterRefId)].assessmentNumber - - - jsonPath: $.Properties.*.propertyDetails.*.owners.*.uuid - - - jsonPath: $.Properties.*.propertyDetails.*.owners.*.additionalDetails - type: JSON - dbType: JSONB - - - jsonPath: $.Properties.*.propertyDetails.*.owners.*.isActive - - - jsonPath: $.Properties.*.propertyDetails.*.owners.*.isPrimaryOwner - - - jsonPath: $.Properties.*.propertyDetails.*.owners.*.ownerShipPercentage - - - jsonPath: $.Properties.*.propertyDetails.*.owners.*.ownerType - - - jsonPath: $.Properties.*.propertyDetails.*.owners.*.institutionId - - - jsonPath: $.Properties.*.propertyDetails.*.owners.*.relationship - - - jsonPath: $.Properties.*.propertyDetails[*][?({persisterRefId} in @.owners[*].persisterRefId)].auditDetails.lastModifiedBy - - - jsonPath: $.Properties.*.propertyDetails[*][?({persisterRefId} in @.owners[*].persisterRefId)].auditDetails.lastModifiedBy - - - jsonPath: $.Properties.*.propertyDetails[*][?({persisterRefId} in @.owners[*].persisterRefId)].auditDetails.lastModifiedTime - - - jsonPath: $.Properties.*.propertyDetails[*][?({persisterRefId} in @.owners[*].persisterRefId)].auditDetails.lastModifiedTime - - - jsonPath: $.Properties.*.propertyDetails.*.owners.*.additionalDetails - type: JSON - dbType: JSONB - - - jsonPath: $.Properties.*.propertyDetails.*.owners.*.isActive - - - jsonPath: $.Properties.*.propertyDetails.*.owners.*.isPrimaryOwner - - - jsonPath: $.Properties.*.propertyDetails.*.owners.*.ownerShipPercentage - - - jsonPath: $.Properties.*.propertyDetails.*.owners.*.ownerType - - - jsonPath: $.Properties.*.propertyDetails.*.owners.*.institutionId - - - jsonPath: $.Properties.*.propertyDetails.*.owners.*.relationship - - - jsonPath: $.Properties.*.propertyDetails[*][?({persisterRefId} in @.owners[*].persisterRefId)].auditDetails.lastModifiedBy - - - jsonPath: $.Properties.*.propertyDetails[*][?({persisterRefId} in @.owners[*].persisterRefId)].auditDetails.lastModifiedTime - - - - query: INSERT INTO eg_pt_document_propertydetail_v2(tenantId,id, propertydetail, documenttype, fileStore,documentuid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?,?) ON CONFLICT (id) DO UPDATE SET documenttype = ?, fileStore = ?,documentuid=?, lastmodifiedby = ?, lastmodifiedtime = ?; - basePath: $.Properties.*.propertyDetails.*.documents.* - jsonMaps: - - - jsonPath: $.Properties[*][?({id} in @.propertyDetails.*.documents[*].id)].tenantId - - - jsonPath: $.Properties.*.propertyDetails.*.documents.*.id - - - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.documents[*].id)].assessmentNumber - - - jsonPath: $.Properties.*.propertyDetails.*.documents.*.documentType - - - jsonPath: $.Properties.*.propertyDetails.*.documents.*.fileStore - - - jsonPath: $.Properties.*.propertyDetails.*.documents.*.documentUid - - - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.documents[*].id)].auditDetails.lastModifiedBy - - - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.documents[*].id)].auditDetails.lastModifiedBy - - - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.documents[*].id)].auditDetails.lastModifiedTime - - - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.documents[*].id)].auditDetails.lastModifiedTime - - - jsonPath: $.Properties.*.propertyDetails.documents.*.documentType - - - jsonPath: $.Properties.*.propertyDetails.*.documents.*.fileStore - - - jsonPath: $.Properties.*.propertyDetails.*.documents.*.documentUid - - - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.documents[*].id)].auditDetails.lastModifiedBy - - - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.documents[*].id)].auditDetails.lastModifiedTime - - - - query: INSERT INTO eg_pt_document_owner_v2(tenantId,id, userid,propertydetail, documenttype, fileStore,documentuid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?) ON CONFLICT (userid,propertydetail) DO UPDATE SET documenttype = ?, fileStore = ?,documentuid=?, lastmodifiedby = ?, lastmodifiedtime = ?; - basePath: $.Properties.*.propertyDetails.*.owners.*.documents.* - jsonMaps: - - - jsonPath: $.Properties[*][?({id} in @.propertyDetails.*.owners.*.documents[*].id)].tenantId - - - jsonPath: $.Properties.*.propertyDetails.*.owners.*.documents.*.id - - - jsonPath: $.Properties.*.propertyDetails.*.owners[*][?({id} in @.documents[*].id)].uuid - - - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.owners.*.documents[*].id)].assessmentNumber - - - jsonPath: $.Properties.*.propertyDetails.*.owners.*.documents.*.documentType - - - jsonPath: $.Properties.*.propertyDetails.*.owners.*.documents.*.fileStore - - - jsonPath: $.Properties.*.propertyDetails.*.owners.*.documents.*.documentUid - - - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.owners.*.documents[*].id)].auditDetails.createdBy - - - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.owners.*.documents[*].id)].auditDetails.lastModifiedBy - - - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.owners.*.documents[*].id)].auditDetails.createdTime - - - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.owners.*.documents[*].id)].auditDetails.lastModifiedTime - - - jsonPath: $.Properties.*.propertyDetails.*.owners.*.documents.*.documentType - - - jsonPath: $.Properties.*.propertyDetails.*.owners.*.documents.*.fileStore - - - jsonPath: $.Properties.*.propertyDetails.*.owners.*.documents.*.documentUid - - - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.owners.*.documents[*].id)].auditDetails.lastModifiedBy - - - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.owners.*.documents[*].id)].auditDetails.lastModifiedTime - - - - - query: INSERT INTO eg_pt_unit_v2(tenantId,id,propertyDetail,additionalDetails,floorNo,unitType,unitArea,usageCategoryMajor,usageCategoryMinor,usageCategorySubMinor,usageCategoryDetail,occupancyType,occupancyDate,constructionType,constructionSubType,arv,createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) ON CONFLICT (id) DO UPDATE SET additionalDetails=?,floorNo=?,unitType=?,unitArea=?,usageCategoryMajor=?,usageCategoryMinor=?,usageCategorySubMinor=?,usageCategoryDetail=?,occupancyType=?,occupancyDate=?,constructionType=?,constructionSubType=?,arv=?,lastmodifiedby=?,lastmodifiedtime=?; - basePath: Properties.*.propertyDetails.*.units.* - jsonMaps: - - - jsonPath: $.Properties[*][?({id} in @.propertyDetails.*.units[*].id)].tenantId - - - jsonPath: $.Properties.*.propertyDetails.*.units.*.id - - - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.units[*].id)].assessmentNumber - - - jsonPath: $.Properties.*.propertyDetails.*.units.*.additionalDetails - type: JSON - dbType: JSONB - - - jsonPath: $.Properties.*.propertyDetails.*.units.*.floorNo - - - jsonPath: $.Properties.*.propertyDetails.*.units.*.unitType - - - jsonPath: $.Properties.*.propertyDetails.*.units.*.unitArea - - - jsonPath: $.Properties.*.propertyDetails.*.units.*.usageCategoryMajor - - - jsonPath: $.Properties.*.propertyDetails.*.units.*.usageCategoryMinor - - - jsonPath: $.Properties.*.propertyDetails.*.units.*.usageCategorySubMinor - - - jsonPath: $.Properties.*.propertyDetails.*.units.*.usageCategoryDetail - - - jsonPath: $.Properties.*.propertyDetails.*.units.*.occupancyType - - - jsonPath: $.Properties.*.propertyDetails.*.units.*.occupancyDate - - - jsonPath: $.Properties.*.propertyDetails.*.units.*.constructionType - - - jsonPath: $.Properties.*.propertyDetails.*.units.*.constructionSubType - - - jsonPath: $.Properties.*.propertyDetails.*.units.*.arv - - - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.units[*].id)].auditDetails.lastModifiedBy - - - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.units[*].id)].auditDetails.lastModifiedBy - - - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.units[*].id)].auditDetails.lastModifiedTime - - - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.units[*].id)].auditDetails.lastModifiedTime - - - jsonPath: $.Properties.*.propertyDetails.*.units.*.additionalDetails - type: JSON - dbType: JSONB - - - jsonPath: $.Properties.*.propertyDetails.*.units.*.floorNo - - - jsonPath: $.Properties.*.propertyDetails.*.units.*.unitType - - - jsonPath: $.Properties.*.propertyDetails.*.units.*.unitArea - - - jsonPath: $.Properties.*.propertyDetails.*.units.*.usageCategoryMajor - - - jsonPath: $.Properties.*.propertyDetails.*.units.*.usageCategoryMinor - - - jsonPath: $.Properties.*.propertyDetails.*.units.*.usageCategorySubMinor - - - jsonPath: $.Properties.*.propertyDetails.*.units.*.usageCategoryDetail - - - jsonPath: $.Properties.*.propertyDetails.*.units.*.occupancyType - - - jsonPath: $.Properties.*.propertyDetails.*.units.*.occupancyDate - - - jsonPath: $.Properties.*.propertyDetails.*.units.*.constructionType - - - jsonPath: $.Properties.*.propertyDetails.*.units.*.constructionSubType - - - jsonPath: $.Properties.*.propertyDetails.*.units.*.arv - - - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.units[*].id)].auditDetails.lastModifiedBy - - - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.units[*].id)].auditDetails.lastModifiedTime - - - - - query: UPDATE eg_pt_address_v2 SET additionalDetails=?,doorNo=?,latitude=?,longitude=?, addressid=?, addressnumber=?, type=?, addressline1=?, addressline2=?, landmark=?, city=?, pincode=?, detail=?,buildingName=?,street=?, locality=?, lastmodifiedby=?, lastmodifiedtime=? where id=?; - basePath: Properties.*.address - jsonMaps: - - - jsonPath: $.Properties.*.address.additionalDetails - type: JSON - dbType: JSONB - - - jsonPath: $.Properties.*.address.doorNo - - - jsonPath: $.Properties.*.address.latitude - - - jsonPath: $.Properties.*.address.longitude - - - jsonPath: $.Properties.*.address.addressId - - - jsonPath: $.Properties.*.address.addressNumber - - - jsonPath: $.Properties.*.address.type - - - jsonPath: $.Properties.*.address.addressLine1 - - - jsonPath: $.Properties.*.address.addressLine2 - - - jsonPath: $.Properties.*.address.landmark - - - jsonPath: $.Properties.*.address.city - - - jsonPath: $.Properties.*.address.pincode - - - jsonPath: $.Properties.*.address.detail - - - jsonPath: $.Properties.*.address.buildingName - - - jsonPath: $.Properties.*.address.street - - - jsonPath: $.Properties.*.address.locality.code - - - jsonPath: $.Properties.*.auditDetails.lastModifiedBy - - - jsonPath: $.Properties.*.auditDetails.lastModifiedTime - - - jsonPath: $.Properties.*.address.id - - - - query: INSERT INTO eg_pt_institution_v2(tenantId,id, propertyDetail,additionalDetails, name, type,designation, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?) ON CONFLICT (id) DO UPDATE SET additionalDetails=?,name=?,type=?,designation=?,lastmodifiedby=?,lastmodifiedtime=?; - basePath: $.Properties.*.propertyDetails.*.institution - jsonMaps: - - - jsonPath: $.Properties.*.propertyDetails.*.tenantId - - - jsonPath: $.Properties.*.propertyDetails.*.institution.id - - - jsonPath: $.Properties.*.propertyDetails.*.assessmentNumber - - - jsonPath: $.Properties.*.propertyDetails.*.institution.additionalDetails - type: JSON - dbType: JSONB - - - jsonPath: $.Properties.*.propertyDetails.*.institution.name - - - jsonPath: $.Properties.*.propertyDetails.*.institution.type - - - jsonPath: $.Properties.*.propertyDetails.*.institution.designation - - - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.createdBy - - - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.lastModifiedBy - - - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.createdTime - - - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.lastModifiedTime - - - jsonPath: $.Properties.*.propertyDetails.*.institution.additionalDetails - type: JSON - dbType: JSONB - - - jsonPath: $.Properties.*.propertyDetails.*.institution.name - - - jsonPath: $.Properties.*.propertyDetails.*.institution.type - - - jsonPath: $.Properties.*.propertyDetails.*.institution.designation - - - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.lastModifiedBy - - - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.lastModifiedTime - - - - version: 1.0 - description: Cancel property details in eg_pt_propertydetail_v2 table - fromTopic: cancel-pt-propertyDetail - isTransaction: true - queryMaps: - - - query: UPDATE eg_pt_propertydetail_v2 SET status=? where propertyId=? AND assessmentNumber=? AND tenantId=?; - basePath: Properties.*.propertyDetails.* - jsonMaps: - - - jsonPath: $.Properties.*.propertyDetails.*.status - - - jsonPath: $.Properties[*][?({assessmentNumber} in @.propertyDetails[*].assessmentNumber)].propertyId - - - jsonPath: $.Properties.*.propertyDetails.*.assessmentNumber - - - jsonPath: $.Properties[*][?({assessmentNumber} in @.propertyDetails[*].assessmentNumber)].tenantId - - - version: 1.0 - description: Cancel property in eg_pt_property_v2 table - fromTopic: cancel-pt-property - isTransaction: true - queryMaps: - - - query: UPDATE eg_pt_property_v2 SET status=? where propertyId=? AND tenantId=?; - basePath: Properties.* - jsonMaps: - - - jsonPath: $.Properties.*.status - - - jsonPath: $.Properties.*.propertyId - - - jsonPath: $.Properties.*.tenantId - - - query: UPDATE eg_pt_propertydetail_v2 SET status=? where propertyId=? AND assessmentNumber=? AND tenantId=?; - basePath: Properties.*.propertyDetails.* - jsonMaps: - - - jsonPath: $.Properties.*.propertyDetails.*.status - - - jsonPath: $.Properties[*][?({assessmentNumber} in @.propertyDetails[*].assessmentNumber)].propertyId - - - jsonPath: $.Properties.*.propertyDetails.*.assessmentNumber - - - jsonPath: $.Properties[*][?({assessmentNumber} in @.propertyDetails[*].assessmentNumber)].tenantId diff --git a/configs/egov-persister/pt-calculator-v2-persister.yml b/configs/egov-persister/pt-calculator-v2-persister.yml deleted file mode 100644 index 5cef6585..00000000 --- a/configs/egov-persister/pt-calculator-v2-persister.yml +++ /dev/null @@ -1,118 +0,0 @@ -serviceMaps: - serviceName: PropertyTax Calculator - mappings: - - version: 1.0 - name: pt-calculator - description: Persists the pt-calculator related records to db - fromTopic: save-pt-billingslab - isTransaction: true - queryMaps: - - query: INSERT INTO eg_pt_Billingslab_v2(id, tenantid, propertyType, propertySubType, usageCategoryMajor, usageCategoryMinor, usageCategorySubMinor, usageCategoryDetail, ownerShipCategory, subOwnerShipCategory, fromFloor, toFloor, areaType, fromPlotSize, toPlotSize, occupancyType, unitRate, unbuiltunitrate, arvpercent, isPropertyMultiFloored, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, cast(? as double precision), cast(? as double precision), ?, ?, cast(? as double precision), ?, ?, ?, ?, ?, ?, ?, ?, ?); - - basePath: BillingSlab.* - jsonMaps: - - - jsonPath: $.BillingSlab.*.id - - - jsonPath: $.BillingSlab.*.tenantId - - - jsonPath: $.BillingSlab.*.propertyType - - - jsonPath: $.BillingSlab.*.propertySubType - - - jsonPath: $.BillingSlab.*.usageCategoryMajor - - - jsonPath: $.BillingSlab.*.usageCategoryMinor - - - jsonPath: $.BillingSlab.*.usageCategorySubMinor - - - jsonPath: $.BillingSlab.*.usageCategoryDetail - - - jsonPath: $.BillingSlab.*.ownerShipCategory - - - jsonPath: $.BillingSlab.*.subOwnerShipCategory - - - jsonPath: $.BillingSlab.*.fromFloor - - - jsonPath: $.BillingSlab.*.toFloor - - - jsonPath: $.BillingSlab.*.areaType - - - jsonPath: $.BillingSlab.*.fromPlotSize - - - jsonPath: $.BillingSlab.*.toPlotSize - - - jsonPath: $.BillingSlab.*.occupancyType - - - jsonPath: $.BillingSlab.*.unitRate - - - jsonPath: $.BillingSlab.*.unBuiltUnitRate - - - jsonPath: $.BillingSlab.*.arvPercent - - - jsonPath: $.BillingSlab.*.isPropertyMultiFloored - - - jsonPath: $.BillingSlab.*.auditDetails.createdBy - - - jsonPath: $.BillingSlab.*.auditDetails.createdTime - - - jsonPath: $.BillingSlab.*.auditDetails.lastmodifiedBy - - - jsonPath: $.BillingSlab.*.auditDetails.lastmodifiedTime - - - - version: 1.0 - name: pt-calculator - description: Persists the pt-calculator related records to db - fromTopic: update-pt-billingslab - isTransaction: true - queryMaps: - - - query: UPDATE eg_pt_Billingslab_v2 SET propertyType=?, propertySubType=?, usageCategoryMajor=?, usageCategoryMinor=?, usageCategorySubMinor=?, usageCategoryDetail=?, ownerShipCategory=?, subOwnerShipCategory=?, fromFloor=cast(? as double precision), toFloor=cast(? as double precision), areaType=?, fromPlotSize=?, toPlotSize=cast(? as double precision), occupancyType=?, unitRate=?, unbuiltunitrate=?, arvpercent=?, isPropertyMultiFloored=?, lastmodifiedby=?, lastmodifiedtime=? WHERE tenantid=? AND id=?; - - basePath: BillingSlab.* - jsonMaps: - - - jsonPath: $.BillingSlab.*.propertyType - - - jsonPath: $.BillingSlab.*.propertySubType - - - jsonPath: $.BillingSlab.*.usageCategoryMajor - - - jsonPath: $.BillingSlab.*.usageCategoryMinor - - - jsonPath: $.BillingSlab.*.usageCategorySubMinor - - - jsonPath: $.BillingSlab.*.usageCategoryDetail - - - jsonPath: $.BillingSlab.*.ownerShipCategory - - - jsonPath: $.BillingSlab.*.subOwnerShipCategory - - - jsonPath: $.BillingSlab.*.fromFloor - - - jsonPath: $.BillingSlab.*.toFloor - - - jsonPath: $.BillingSlab.*.areaType - - - jsonPath: $.BillingSlab.*.fromPlotSize - - - jsonPath: $.BillingSlab.*.toPlotSize - - - jsonPath: $.BillingSlab.*.occupancyType - - - jsonPath: $.BillingSlab.*.unitRate - - - jsonPath: $.BillingSlab.*.unBuiltUnitRate - - - jsonPath: $.BillingSlab.*.arvPercent - - - jsonPath: $.BillingSlab.*.isPropertyMultiFloored - - - jsonPath: $.BillingSlab.*.auditDetails.lastmodifiedBy - - - jsonPath: $.BillingSlab.*.auditDetails.lastmodifiedTime - - - jsonPath: $.BillingSlab.*.tenantId - - - jsonPath: $.BillingSlab.*.id diff --git a/configs/egov-persister/pt-drafts-persister.yml b/configs/egov-persister/pt-drafts-persister.yml deleted file mode 100644 index 0c5422b1..00000000 --- a/configs/egov-persister/pt-drafts-persister.yml +++ /dev/null @@ -1,65 +0,0 @@ -serviceMaps: - serviceName: PropertyTax - mappings: - - version: 1.0 - name: pt-service-v2 - description: Persists the property tax requests - fromTopic: save-pt-drafts - isTransaction: true - queryMaps: - - query: INSERT INTO eg_pt_drafts_v2(id, userid, tenantid, draft, isActive, createdBy, createdTime, lastModifiedBy, lastModifiedTime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?); - - basePath: draft - jsonMaps: - - - jsonPath: $.draft.id - - - jsonPath: $.draft.userId - - - jsonPath: $.draft.tenantId - - - jsonPath: $.draft.draftRecord - type: JSON - dbType: JSONB - - - jsonPath: $.draft.isActive - - - jsonPath: $.draft.auditDetails.createdBy - - - jsonPath: $.draft.auditDetails.createdTime - - - jsonPath: $.draft.auditDetails.lastModifiedBy - - - jsonPath: $.draft.auditDetails.lastModifiedTime - - - - version: 1.0 - name: pt-service-v2 - description: Persists asset details in eg_asset table - fromTopic: update-pt-drafts - isTransaction: true - queryMaps: - - - query: UPDATE eg_pt_drafts_v2 SET userid=?, tenantid=?, draft=?, isActive=?, assessmentNumber=? ,lastModifiedBy = ?, lastModifiedTime = ? WHERE id=?; - - basePath: draft - jsonMaps: - - - jsonPath: $.draft.userId - - - jsonPath: $.draft.tenantId - - - jsonPath: $.draft.draftRecord - type: JSON - dbType: JSONB - - - jsonPath: $.draft.isActive - - - jsonPath: $.draft.assessmentNumber - - - jsonPath: $.draft.auditDetails.lastModifiedBy - - - jsonPath: $.draft.auditDetails.lastModifiedTime - - - jsonPath: $.draft.id - diff --git a/configs/egov-persister/pt-mutation-calculator-persister.yml b/configs/egov-persister/pt-mutation-calculator-persister.yml deleted file mode 100644 index 42b72687..00000000 --- a/configs/egov-persister/pt-mutation-calculator-persister.yml +++ /dev/null @@ -1,87 +0,0 @@ -serviceMaps: - serviceName: Property Mutation Calculator - mappings: - - version: 1.0 - name: pt-mutation-calculator - description: Persists the pt-mutation-calculator related records to db - fromTopic: save-pt-mutation-billingslab - isTransaction: true - queryMaps: - - query: INSERT INTO eg_pt_mutation_billingslab(id, tenantid, propertyType, propertySubType, usageCategoryMajor, usageCategoryMinor, usageCategorySubMinor, usageCategoryDetail, ownershipCategory, subOwnershipCategory, minMarketValue, maxMarketValue, fixedAmount, rate, method) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, cast(? as double precision), cast(? as double precision), cast(? as double precision), cast(? as double precision), ?); - - basePath: MutationBillingSlab.* - jsonMaps: - - - jsonPath: $.MutationMutationBillingSlab.*.id - - - jsonPath: $.MutationMutationBillingSlab.*.tenantId - - - jsonPath: $.MutationBillingSlab.*.propertyType - - - jsonPath: $.MutationBillingSlab.*.propertySubType - - - jsonPath: $.MutationBillingSlab.*.usageCategoryMajor - - - jsonPath: $.MutationBillingSlab.*.usageCategoryMinor - - - jsonPath: $.MutationBillingSlab.*.usageCategorySubMinor - - - jsonPath: $.MutationBillingSlab.*.usageCategoryDetail - - - jsonPath: $.MutationBillingSlab.*.ownerShipCategory - - - jsonPath: $.MutationBillingSlab.*.subOwnerShipCategory - - - jsonPath: $.MutationBillingSlab.*.minMarketValue - - - jsonPath: $.MutationBillingSlab.*.maxMarketValue - - - jsonPath: $.MutationBillingSlab.*.fixedAmount - - - jsonPath: $.MutationBillingSlab.*.rate - - - jsonPath: $.MutationBillingSlab.*.type - - - - - version: 1.0 - name: pt-mutation-calculator - description: Persists the pt-mutation-calculator related records to db - fromTopic: update-pt-mutation-billingslab - isTransaction: true - queryMaps: - - - query: UPDATE eg_pt_mutation_billingslab SET propertyType=?, propertySubType=?, usageCategoryMajor=?, usageCategoryMinor=?, usageCategorySubMinor=?, usageCategoryDetail=?, ownershipCategory=?, subOwnershipCategory=?, minMarketValue=cast(? as double precision), maxMarketValue=cast(? as double precision), fixedAmount=cast(? as double precision), rate=cast(? as double precision), method=? WHERE tenantid=? AND id=?; - - basePath: MutationBillingSlab.* - jsonMaps: - - - jsonPath: $.MutationBillingSlab.*.propertyType - - - jsonPath: $.MutationBillingSlab.*.propertySubType - - - jsonPath: $.MutationBillingSlab.*.usageCategoryMajor - - - jsonPath: $.MutationBillingSlab.*.usageCategoryMinor - - - jsonPath: $.MutationBillingSlab.*.usageCategorySubMinor - - - jsonPath: $.MutationBillingSlab.*.usageCategoryDetail - - - jsonPath: $.MutationBillingSlab.*.ownerShipCategory - - - jsonPath: $.MutationBillingSlab.*.subOwnerShipCategory - - - jsonPath: $.MutationBillingSlab.*.minMarketValue - - - jsonPath: $.MutationBillingSlab.*.maxMarketValue - - - jsonPath: $.MutationBillingSlab.*.fixedAmount - - - jsonPath: $.MutationBillingSlab.*.rate - - - jsonPath: $.MutationBillingSlab.*.type - - - jsonPath: $.MutationBillingSlab.*.tenantId - - - jsonPath: $.MutationBillingSlab.*.id diff --git a/configs/egov-persister/pt-persist.yml b/configs/egov-persister/pt-persist.yml deleted file mode 100644 index 5efedcc5..00000000 --- a/configs/egov-persister/pt-persist.yml +++ /dev/null @@ -1,582 +0,0 @@ -serviceMaps: - serviceName: Property Tax Service - mappings: - - version: 1.0 - name: property tax create - description: create property tax in egpt_property - fromTopic: property-create-validated - queryMaps: - - query: INSERT INTO egpt_property (id,tenantId, upicNumber, oldUpicNumber, vltUpicNumber,creationReason, assessmentDate,occupancyDate, gisRefNo,isAuthorised, isUnderWorkflow, channel, createdBy,lastModifiedBy, createdTime,lastModifiedTime,sequenceNo,demands,oldestUpicNumber)VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?); - basePath: $.properties.* - jsonMaps: - - - jsonPath: $.properties.*.id - - - jsonPath: $.properties.*.tenantId - - - jsonPath: $.properties.*.upicNumber - - - jsonPath: $.properties.*.oldUpicNumber - - - jsonPath: $.properties.*.vltUpicNumber - - - jsonPath: $.properties.*.creationReason - - - jsonPath: $.properties.*.assessmentDate - type: DATE - dbType: DATE - - - jsonPath: $.properties.*.occupancyDate - type: DATE - dbType: DATE - - - jsonPath: $.properties.*.gisRefNo - - - jsonPath: $.properties.*.isAuthorised - type: BOOLEAN - - - jsonPath: $.properties.*.isUnderWorkflow - type: BOOLEAN - - - jsonPath: $.properties.*.channel - - - jsonPath: $.properties.*.auditDetails.createdBy - - - jsonPath: $.properties.*.auditDetails.lastModifiedBy - - - jsonPath: $.properties.*.auditDetails.createdTime - type: LONG - - - jsonPath: $.properties.*.auditDetails.lastModifiedTime - type: LONG - - - jsonPath: $.properties.*.sequenceNo - type: INT - - - jsonPath: $.properties.*.demandsJsonObject - type: JSON - dbType: JSONB - - - jsonPath: $.properties.*.oldestUpicNumber - - - query: INSERT INTO egpt_propertydetails (id, source, regdDocNo, regdDocDate,reason, status, isVerified,verificationDate, isExempted, exemptionReason, propertyType, category, usage,department, apartment, siteLength, siteBreadth, sitalArea,totalBuiltupArea, undividedShare, noOfFloors, isSuperStructure, landOwner, floorType,woodType, roofType, wallType, stateId, applicationNo, createdBy, lastModifiedBy,createdTime, lastModifiedTime, property, taxCalculations,factors,assessmentDates,builderDetails,bpaNo,bpaDate,subUsage)VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?); - basePath: $.properties.*.propertyDetail - jsonMaps: - - jsonPath: $.properties.*.propertyDetail.id - - - jsonPath: $.properties.*.propertyDetail.source - - - jsonPath: $.properties.*.propertyDetail.regdDocNo - - - jsonPath: $.properties.*.propertyDetail.regdDocDate - type: DATE - dbType: DATE - - - jsonPath: $.properties.*.propertyDetail.reason - - - jsonPath: $.properties.*.propertyDetail.status - - - jsonPath: $.properties.*.propertyDetail.isVerified - type: BOOLEAN - - - jsonPath: $.properties.*.propertyDetail.verificationDate - type: DATE - dbType: DATE - - - jsonPath: $.properties.*.propertyDetail.isExempted - type: BOOLEAN - - - jsonPath: $.properties.*.propertyDetail.exemptionReason - - - jsonPath: $.properties.*.propertyDetail.propertyType - - - jsonPath: $.properties.*.propertyDetail.category - - - jsonPath: $.properties.*.propertyDetail.usage - - - jsonPath: $.properties.*.propertyDetail.department - - - jsonPath: $.properties.*.propertyDetail.apartment - - - jsonPath: $.properties.*.propertyDetail.siteLength - type: DOUBLE - - - jsonPath: $.properties.*.propertyDetail.siteBreadth - type: DOUBLE - - - jsonPath: $.properties.*.propertyDetail.sitalArea - type: DOUBLE - - - jsonPath: $.properties.*.propertyDetail.totalBuiltupArea - type: DOUBLE - - - jsonPath: $.properties.*.propertyDetail.undividedShare - type: DOUBLE - - - jsonPath: $.properties.*.propertyDetail.noOfFloors - type: LONG - - - jsonPath: $.properties.*.propertyDetail.isSuperStructure - type: BOOLEAN - - - jsonPath: $.properties.*.propertyDetail.landOwner - - - jsonPath: $.properties.*.propertyDetail.floorType - - - jsonPath: $.properties.*.propertyDetail.woodType - - - jsonPath: $.properties.*.propertyDetail.roofType - - - jsonPath: $.properties.*.propertyDetail.wallType - - - jsonPath: $.properties.*.propertyDetail.stateId - - - jsonPath: $.properties.*.propertyDetail.applicationNo - - - jsonPath: $.properties.*.propertyDetail.auditDetails.createdBy - - - jsonPath: $.properties.*.propertyDetail.auditDetails.lastModifiedBy - - - jsonPath: $.properties.*.propertyDetail.auditDetails.createdTime - type: LONG - - - jsonPath: $.properties.*.propertyDetail.auditDetails.lastModifiedTime - type: LONG - - - jsonPath: $.properties.*.id - - - jsonPath: $.properties.*.propertyDetail.taxCalculations - type: JSON - dbType: JSONB - - - jsonPath: $.properties.*.propertyDetail.factors - type: JSON - dbType: JSONB - - - jsonPath: $.properties.*.propertyDetail.assessmentDates - type: JSON - dbType: JSONB - - - jsonPath: $.properties.*.propertyDetail.builderDetails - type: JSON - dbType: JSONB - - - jsonPath: $.properties.*.propertyDetail.bpaNo - - - jsonPath: $.properties.*.propertyDetail.bpaDate - - - jsonPath: $.properties.*.propertyDetail.subUsage - - - - query: INSERT INTO egpt_Address (id, tenantId, latitude, longitude, addressNumber, addressLine1, addressLine2, landmark, city, pincode, detail,createdBy, lastModifiedBy, createdTime, lastModifiedTime, property, surveyNo, plotNo )VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?); - basePath: $.properties.*.address - jsonMaps: - - - jsonPath: $.properties.*.address.id - - - jsonPath: $.properties.*.address.tenantId - - - jsonPath: $.properties.*.address.latitude - type: DOUBLE - - - jsonPath: $.properties.*.address.longitude - type: DOUBLE - - - jsonPath: $.properties.*.address.addressNumber - - - jsonPath: $.properties.*.address.addressLine1 - - - jsonPath: $.properties.*.address.addressLine2 - - - jsonPath: $.properties.*.address.landmark - - - jsonPath: $.properties.*.address.city - - - jsonPath: $.properties.*.address.pincode - - - jsonPath: $.properties.*.address.detail - - - jsonPath: $.properties.*.address.auditDetails.createdBy - - - jsonPath: $.properties.*.address.auditDetails.lastModifiedBy - - - jsonPath: $.properties.*.address.auditDetails.createdTime - type: LONG - - - jsonPath: $.properties.*.address.auditDetails.lastModifiedTime - type: LONG - - - jsonPath: $.properties.*.id - type: LONG - - - jsonPath: $.properties.*.address.surveyNo - - - jsonPath: $.properties.*.address.plotNo - - - - query: INSERT INTO egpt_floors (id,floorNo,createdBy, lastModifiedBy, createdTime, lastModifiedTime, propertydetails)VALUES(?,?,?,?,?,?,?); - basePath: $.properties.*.propertyDetail.floors.* - jsonMaps: - - - jsonPath: $.properties.*.propertyDetail.floors.*.id - - - jsonPath: $.properties.*.propertyDetail.floors.*.floorNo - - - jsonPath: $.properties.*.propertyDetail.floors.*.auditDetails.createdBy - - - jsonPath: $.properties.*.propertyDetail.floors.*.auditDetails.lastModifiedBy - - - jsonPath: $.properties.*.propertyDetail.floors.*.auditDetails.createdTime - type: LONG - - - jsonPath: $.properties.*.propertyDetail.floors.*.auditDetails.lastModifiedTime - type: LONG - - - jsonPath: $.properties.*.propertyDetail[?( {id} in @.floors[*].id)].id - - - query: INSERT INTO egpt_unit (id, unitNo, unitType, length,width,builtupArea,assessableArea,bpaBuiltupArea,bpaNo,bpaDate,usage,occupancytype,occupierName,firmName,rentCollected, structure, age,exemptionReason, isStructured, occupancyDate, constCompletionDate, manualArv, arv,electricMeterNo, waterMeterNo, createdBy, lastModifiedBy, createdTime, lastModifiedTime,floor,isAuthorised,constructionStartDate,landCost,buildingCost,subusage,carpetArea,exemptionArea,rv) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?); - basePath: $.properties.*.propertyDetail.floors.*.units.* - jsonMaps: - - - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.id - - - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.unitNo - - - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.unitType - - - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.length - type: DOUBLE - - - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.width - type: DOUBLE - - - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.builtupArea - type: DOUBLE - - - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.assessableArea - type: DOUBLE - - - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.bpaBuiltupArea - type: DOUBLE - - - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.bpaNo - - - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.bpaDate - - - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.usage - - - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.occupancyType - - - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.occupierName - - - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.firmName - - - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.rentCollected - type: DOUBLE - - - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.structure - - - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.age - - - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.exemptionReason - - - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.isStructured - type: BOOLEAN - - - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.occupancyDate - type: DATE - dbType: DATE - - - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.constCompletionDate - type: DATE - dbType: DATE - - - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.manualArv - type: DOUBLE - - - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.arv - type: DOUBLE - - - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.electricMeterNo - - - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.waterMeterNo - - - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.auditDetails.createdBy - - - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.auditDetails.lastModifiedBy - type: LONG - - - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.auditDetails.createdTime - type: LONG - - - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.auditDetails.lastModifiedTime - type: LONG - - - jsonPath: $.properties.*.propertyDetail.floors[?( {id} in @.units[*].id)].id - - - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.isAuthorised - type: BOOLEAN - - - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.constructionStartDate - type: DATE - dbType: DATE - - - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.landCost - type: DOUBLE - - - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.buildingCost - type: DOUBLE - - - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.subUsage - - - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.carpetArea - type: DOUBLE - - - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.exemptionArea - type: DOUBLE - - - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.rv - type: DOUBLE - - - query: INSERT INTO egpt_unit (id, unitNo, unitType, length,width,builtupArea,assessableArea,bpaBuiltupArea,bpaNo,bpaDate,usage,occupancytype,occupierName,firmName,rentCollected, structure, age,exemptionReason, isStructured, occupancyDate, constCompletionDate, manualArv, arv,electricMeterNo, waterMeterNo, createdBy, lastModifiedBy, createdTime, lastModifiedTime,floor,parentid,isAuthorised,constructionStartDate,landCost,buildingCost,subusage,carpetArea,exemptionArea,rv) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?); - basePath: $.properties.*.propertyDetail.floors.*.units.*.units.* - jsonMaps: - - - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.id - - - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.unitNo - - - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.unitType - - - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.length - type: DOUBLE - - - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.width - type: DOUBLE - - - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.builtupArea - type: DOUBLE - - - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.assessableArea - type: DOUBLE - - - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.bpaBuiltupArea - type: DOUBLE - - - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.bpaNo - - - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.bpaDate - - - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.usage - - - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.occupancyType - - - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.occupierName - - - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.firmName - - - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.rentCollected - type: DOUBLE - - - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.structure - - - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.age - - - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.exemptionReason - - - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.isStructured - type: BOOLEAN - - - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.occupancyDate - type: DATE - dbType: DATE - - - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.constCompletionDate - type: DATE - dbType: DATE - - - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.manualArv - type: DOUBLE - - - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.arv - type: DOUBLE - - - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.electricMeterNo - - - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.waterMeterNo - - - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.auditDetails.createdBy - - - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.auditDetails.lastModifiedBy - type: LONG - - - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.auditDetails.createdTime - type: LONG - - - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.auditDetails.lastModifiedTime - type: LONG - - - jsonPath: $.properties.*.propertyDetail.floors[?( {id} in @.units[*].id)].id - - - jsonPath: $.properties.*.propertyDetail.floors.*.units[?( {id} in @.units[*].id)].id - - - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.isAuthorised - type: BOOLEAN - - - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.constructionStartDate - type: DATE - dbType: DATE - - - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.landCost - type: DOUBLE - - - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.buildingCost - type: DOUBLE - - - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.subUsage - - - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.carpetArea - type: DOUBLE - - - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.exemptionArea - type: DOUBLE - - - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.rv - type: DOUBLE - - - query: INSERT INTO egpt_document (id, fileStore, createdBy, lastModifiedBy, createdTime, lastModifiedTime,propertydetails,documenttype) VALUES(?,?,?,?,?,?,?,?); - basePath: $.properties.*.propertyDetail.documents.* - jsonMaps: - - - jsonPath: $.properties.*.propertyDetail.documents.*.id - - - jsonPath: $.properties.*.propertyDetail.documents.*.fileStore - - - jsonPath: $.properties.*.propertyDetail.documents.*.auditDetails.createdBy - - - jsonPath: $.properties.*.propertyDetail.documents.*.auditDetails.lastModifiedBy - - - jsonPath: $.properties.*.propertyDetail.documents.*.auditDetails.createdTime - type: LONG - - - jsonPath: $.properties.*.propertyDetail.documents.*.auditDetails.lastModifiedTime - type: LONG - - - jsonPath: $.properties.*.propertyDetail[?({id} in @.documents[*].id)].id - - - jsonPath: $.properties.*.propertyDetail.documents.*.documentType - - - - query: INSERT INTO egpt_vacantland (id,surveyNumber,pattaNumber, marketValue,capitalValue,layoutApprovedAuth,layoutPermissionNo,layoutPermissionDate, resdPlotArea,nonResdPlotArea,createdBy, lastModifiedBy, createdTime,lastModifiedTime, property) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?); - basePath: $.properties.*.vacantLand - jsonMaps: - - - jsonPath: $.properties.*.vacantLand.id - - - jsonPath: $.properties.*.vacantLand.surveyNumber - - - jsonPath: $.properties.*.vacantLand.pattaNumber - - - jsonPath: $.properties.*.vacantLand.marketValue - type: DOUBLE - - - jsonPath: $.properties.*.vacantLand.capitalValue - type: DOUBLE - - - jsonPath: $.properties.*.vacantLand.layoutApprovedAuth - - - jsonPath: $.properties.*.vacantLand.layoutPermissionNo - - - jsonPath: $.properties.*.vacantLand.layoutPermissionDate - - - jsonPath: $.properties.*.vacantLand.resdPlotArea - type: DOUBLE - - - jsonPath: $.properties.*.vacantLand.nonResdPlotArea - type: DOUBLE - - - jsonPath: $.properties.*.vacantLand.auditDetails.createdBy - - - jsonPath: $.properties.*.vacantLand.auditDetails.lastModifiedBy - - - jsonPath: $.properties.*.vacantLand.auditDetails.createdTime - type: LONG - - - jsonPath: $.properties.*.vacantLand.auditDetails.lastModifiedTime - type: LONG - - - jsonPath: $.properties.*.id - type: LONG - - - - query: INSERT INTO egpt_propertylocation (id,revenueBoundary, locationBoundary, adminBoundary, northBoundedBy,eastBoundedBy, westBoundedBy, southBoundedBy,createdBy, lastModifiedBy, createdTime,lastModifiedTime,property,guidanceValueBoundary) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?); - basePath: $.properties.*.boundary - jsonMaps: - - - jsonPath: $.properties.*.boundary.id - - - jsonPath: $.properties.*.boundary.revenueBoundary.id - type: LONG - - - jsonPath: $.properties.*.boundary.locationBoundary.id - type: LONG - - - jsonPath: $.properties.*.boundary.adminBoundary.id - type: BOOLEAN - - - jsonPath: $.properties.*.boundary.northBoundedBy - - - jsonPath: $.properties.*.boundary.eastBoundedBy - - - jsonPath: $.properties.*.boundary.westBoundedBy - - - jsonPath: $.properties.*.boundary.southBoundedBy - - - jsonPath: $.properties.*.boundary.auditDetails.createdBy - - - jsonPath: $.properties.*.boundary.auditDetails.lastModifiedBy - - - jsonPath: $.properties.*.boundary.auditDetails.createdTime - type: LONG - - - jsonPath: $.properties.*.boundary.auditDetails.lastModifiedTime - type: LONG - - - jsonPath: $.properties.*.id - type: LONG - - - jsonPath: $.properties.*.boundary.guidanceValueBoundary - type: LONG - - - query: INSERT INTO egpt_property_owner (id, owner,property,isPrimaryOwner, isSecondaryOwner,ownerShipPercentage, ownerType,createdBy, lastModifiedBy, createdTime, lastModifiedTime ) VALUES(?,?,?,?,?,?,?,?,?,?,?); - basePath: $.properties.*.owners.* - jsonMaps: - - - - jsonPath: $.properties.*.owners.*.id - - - jsonPath: $.properties.*.owners.*.owner - type: LONG - - - jsonPath: $.properties[?({id} in @.owners[*].id)].id - - - jsonPath: $.properties.*.owners.*.isPrimaryOwner - type: BOOLEAN - - - jsonPath: $.properties.*.owners.*.isSecondaryOwner - type: BOOLEAN - - - jsonPath: $.properties.*.owners.*.ownerShipPercentage - type: DOUBLE - - - jsonPath: $.properties.*.owners.*.ownerType - - - jsonPath: $.properties.*.owners.*.auditDetails.createdBy - - - jsonPath: $.properties.*.owners.*.auditDetails.lastModifiedBy - - - jsonPath: $.properties.*.owners.*.auditDetails.createdTime - type: LONG - - - jsonPath: $.properties.*.owners.*.auditDetails.lastModifiedTime - type: LONG diff --git a/configs/egov-persister/sewerage-bill-scheduler.yml b/configs/egov-persister/sewerage-bill-scheduler.yml deleted file mode 100644 index dc4d5209..00000000 --- a/configs/egov-persister/sewerage-bill-scheduler.yml +++ /dev/null @@ -1,33 +0,0 @@ -serviceMaps: - serviceName: Bill Generate Scheduler Service - mappings: - - version: 1.0 - name: BillGenerateScheduler - description: capture bill generation details for particular sewerage connection number - fromTopic: save-sw-bill-scheduler - isTransaction: true - queryMaps: - - query: INSERT INTO eg_sw_scheduler (id, tenantid, transactiontype,locality,billingcyclestartdate,billingcycleenddate,status, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?,?,?,?,?); - basePath: $.billScheduler - jsonMaps: - - jsonPath: $.billScheduler.id - - - jsonPath: $.billScheduler.tenantId - - - jsonPath: $.billScheduler.transactionType - - - jsonPath: $.billScheduler.locality - - - jsonPath: $.billScheduler.billingcycleStartdate - - - jsonPath: $.billScheduler.billingcycleEnddate - - - jsonPath: $.billScheduler.status - - - jsonPath: $.billScheduler.auditDetails.createdBy - - - jsonPath: $.billScheduler.auditDetails.lastModifiedBy - - - jsonPath: $.billScheduler.auditDetails.createdTime - - - jsonPath: $.billScheduler.auditDetails.lastModifiedTime \ No newline at end of file diff --git a/configs/egov-persister/sewerage-persist.yml b/configs/egov-persister/sewerage-persist.yml deleted file mode 100644 index 8508c5b0..00000000 --- a/configs/egov-persister/sewerage-persist.yml +++ /dev/null @@ -1,455 +0,0 @@ -serviceMaps: - serviceName: Sewerage Connection Service - mappings: - - version: 1.0 - name: SewerageConnection - description: create ConnectionDetails in connection and eg_sw_service - fromTopic: save-sw-connection - isTransaction: true - queryMaps: - - query: INSERT INTO eg_sw_connection (id, tenantid, property_id, applicationno, applicationstatus, status, connectionno, oldconnectionno,roadcuttingarea,action,roadtype, createdby, lastmodifiedby, createdtime, lastmodifiedtime, applicationtype, dateEffectiveFrom, locality, isoldapplication, additionaldetails) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?,?,?,?,?,?,?,?,?); - basePath: $.SewerageConnection - jsonMaps: - - jsonPath: $.SewerageConnection.id - - - jsonPath: $.SewerageConnection.tenantId - - - jsonPath: $.SewerageConnection.propertyId - - - jsonPath: $.SewerageConnection.applicationNo - - - jsonPath: $.SewerageConnection.applicationStatus - - - jsonPath: $.SewerageConnection.status - - - jsonPath: $.SewerageConnection.connectionNo - - - jsonPath: $.SewerageConnection.oldConnectionNo - - - jsonPath: $.SewerageConnection.roadCuttingArea - - - jsonPath: $.SewerageConnection.processInstance.action - - - jsonPath: $.SewerageConnection.roadType - - - jsonPath: $.SewerageConnection.auditDetails.createdBy - - - jsonPath: $.SewerageConnection.auditDetails.lastModifiedBy - - - jsonPath: $.SewerageConnection.auditDetails.createdTime - - - jsonPath: $.SewerageConnection.auditDetails.lastModifiedTime - - - jsonPath: $.SewerageConnection.applicationType - - - jsonPath: $.SewerageConnection.dateEffectiveFrom - - - jsonPath: $.SewerageConnection.additionalDetails.locality - - - jsonPath: $.SewerageConnection.oldApplication - - - jsonPath: $.SewerageConnection.additionalDetails - type: JSON - dbType: JSONB - - - - query: INSERT INTO eg_sw_service(connection_id,connectionExecutionDate,noOfWaterClosets,noOfToilets,connectiontype,proposedWaterClosets,proposedToilets, appCreatedDate, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES(?,?,?,?,?,?,?,?,?,?,?,?); - basePath: $.SewerageConnection - jsonMaps: - - - jsonPath: $.SewerageConnection.id - - - jsonPath: $.SewerageConnection.connectionExecutionDate - - - jsonPath: $.SewerageConnection.noOfWaterClosets - - - jsonPath: $.SewerageConnection.noOfToilets - - - jsonPath: $.SewerageConnection.connectionType - - - jsonPath: $.SewerageConnection.proposedWaterClosets - - - jsonPath: $.SewerageConnection.proposedToilets - - - jsonPath: $.SewerageConnection.additionalDetails.appCreatedDate - - - jsonPath: $.SewerageConnection.auditDetails.createdBy - - - jsonPath: $.SewerageConnection.auditDetails.lastModifiedBy - - - jsonPath: $.SewerageConnection.auditDetails.createdTime - - - jsonPath: $.SewerageConnection.auditDetails.lastModifiedTime - - - query: INSERT INTO eg_sw_connectionholder(tenantid, connectionid, userid, status, isprimaryholder, connectionholdertype, holdershippercentage, relationship, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - basePath: $.SewerageConnection.connectionHolders.* - jsonMaps: - - - jsonPath: $.SewerageConnection.tenantId - - - jsonPath: $.SewerageConnection.id - - - jsonPath: $.SewerageConnection.connectionHolders.*.uuid - - - jsonPath: $.SewerageConnection.connectionHolders.*.status - - - jsonPath: $.SewerageConnection.connectionHolders.*.isPrimaryOwner - - - jsonPath: $.SewerageConnection.connectionHolders.*.ownerType - - - jsonPath: $.SewerageConnection.connectionHolders.*.ownerShipPercentage - - - jsonPath: $.SewerageConnection.connectionHolders.*.relationship - - - jsonPath: $.SewerageConnection.auditDetails.createdBy - - - jsonPath: $.SewerageConnection.auditDetails.createdTime - - - jsonPath: $.SewerageConnection.auditDetails.lastModifiedBy - - - jsonPath: $.SewerageConnection.auditDetails.lastModifiedTime - - - query: INSERT INTO eg_sw_roadcuttinginfo(id, tenantId, swid, active, roadtype, roadcuttingarea, createdBy, lastModifiedBy, createdTime, lastModifiedTime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET active = ?, roadtype =?, roadcuttingarea =?,lastmodifiedby =?, lastmodifiedtime =?; - basePath: $.SewerageConnection.roadCuttingInfo.* - jsonMaps: - - - jsonPath: $.SewerageConnection.roadCuttingInfo.*.id - - - jsonPath: $.SewerageConnection.tenantId - - - jsonPath: $.SewerageConnection.id - - - jsonPath: $.SewerageConnection.roadCuttingInfo.*.status - - - jsonPath: $.SewerageConnection.roadCuttingInfo.*.roadType - - - jsonPath: $.SewerageConnection.roadCuttingInfo.*.roadCuttingArea - - - jsonPath: $.SewerageConnection.roadCuttingInfo.*.auditDetails.createdBy - - - jsonPath: $.SewerageConnection.roadCuttingInfo.*.auditDetails.lastModifiedBy - - - jsonPath: $.SewerageConnection.roadCuttingInfo.*.auditDetails.createdTime - - - jsonPath: $.SewerageConnection.roadCuttingInfo.*.auditDetails.lastModifiedTime - - - jsonPath: $.SewerageConnection.roadCuttingInfo.*.status - - - jsonPath: $.SewerageConnection.roadCuttingInfo.*.roadType - - - jsonPath: $.SewerageConnection.roadCuttingInfo.*.roadCuttingArea - - - jsonPath: $.SewerageConnection.roadCuttingInfo.*.auditDetails.lastModifiedBy - - - jsonPath: $.SewerageConnection.roadCuttingInfo.*.auditDetails.lastModifiedTime - - - version: 1.0 - name: SewerageConnection - description: update ConnectionDetails in connection and eg_sw_service - fromTopic: update-sw-connection - isTransaction: true - queryMaps: - - - query: INSERT INTO eg_sw_connection_audit SELECT * FROM eg_sw_connection WHERE id = ?; - basePath: $.SewerageConnection - jsonMaps: - - jsonPath: $.SewerageConnection.id - - - query: UPDATE eg_sw_connection SET applicationstatus=?, status=?, connectionno=?, oldconnectionno=?, action=?, roadCuttingArea=?, roadType=?, adhocpenalty=?, adhocrebate=?, adhocpenaltyreason=?, adhocpenaltycomment=?, adhocrebatereason=?, adhocrebatecomment=?, lastmodifiedby=?, lastmodifiedtime=?, dateEffectiveFrom=?, locality=?, isoldapplication=?, property_id=?, additionaldetails=? WHERE id=?; - basePath: $.SewerageConnection - jsonMaps: - - - jsonPath: $.SewerageConnection.applicationStatus - - - jsonPath: $.SewerageConnection.status - - - jsonPath: $.SewerageConnection.connectionNo - - - jsonPath: $.SewerageConnection.oldConnectionNo - - - jsonPath: $.SewerageConnection.processInstance.action - - - jsonPath: $.SewerageConnection.roadCuttingArea - - - jsonPath: $.SewerageConnection.roadType - - - jsonPath: $.SewerageConnection.additionalDetails.adhocPenalty - - - jsonPath: $.SewerageConnection.additionalDetails.adhocRebate - - - jsonPath: $.SewerageConnection.additionalDetails.adhocPenaltyReason - - - jsonPath: $.SewerageConnection.additionalDetails.adhocPenaltyComment - - - jsonPath: $.SewerageConnection.additionalDetails.adhocRebateReason - - - jsonPath: $.SewerageConnection.additionalDetails.adhocRebateComment - - - jsonPath: $.SewerageConnection.auditDetails.lastModifiedBy - - - jsonPath: $.SewerageConnection.auditDetails.lastModifiedTime - - - jsonPath: $.SewerageConnection.dateEffectiveFrom - - - jsonPath: $.SewerageConnection.additionalDetails.locality - - - jsonPath: $.SewerageConnection.oldApplication - - - jsonPath: $.SewerageConnection.propertyId - - - jsonPath: $.SewerageConnection.additionalDetails - type: JSON - dbType: JSONB - - - jsonPath: $.SewerageConnection.id - - - query: INSERT INTO eg_sw_service_audit SELECT * FROM eg_sw_service WHERE connection_id = ?; - basePath: $.SewerageConnection - jsonMaps: - - jsonPath: $.SewerageConnection.id - - - query: UPDATE eg_sw_service SET connectionexecutiondate=?, noOfWaterClosets=?, noOfToilets=?, connectiontype=?, proposedWaterClosets=?, proposedToilets=?, detailsprovidedby = ?, estimationfileStoreId = ?, sanctionfileStoreId = ?, estimationLetterDate = ?, lastmodifiedby=?, lastmodifiedtime=? WHERE connection_id=?; - basePath: $.SewerageConnection - jsonMaps: - - - jsonPath: $.SewerageConnection.connectionExecutionDate - - - jsonPath: $.SewerageConnection.noOfWaterClosets - - - jsonPath: $.SewerageConnection.noOfToilets - - - jsonPath: $.SewerageConnection.connectionType - - - jsonPath: $.SewerageConnection.proposedWaterClosets - - - jsonPath: $.SewerageConnection.proposedToilets - - - jsonPath: $.SewerageConnection.additionalDetails.detailsProvidedBy - - - jsonPath: $.SewerageConnection.additionalDetails.estimationFileStoreId - - - jsonPath: $.SewerageConnection.additionalDetails.sanctionFileStoreId - - - jsonPath: $.SewerageConnection.additionalDetails.estimationLetterDate - - - jsonPath: $.SewerageConnection.auditDetails.lastModifiedBy - - - jsonPath: $.SewerageConnection.auditDetails.lastModifiedTime - - - jsonPath: $.SewerageConnection.id - - - - query: INSERT INTO eg_sw_applicationDocument(id, tenantId, documenttype, filestoreid, swid, active, createdBy, lastModifiedBy, createdTime, lastModifiedTime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET active = ?, documenttype =?, filestoreid =?,lastmodifiedby =?, lastmodifiedtime =?; - basePath: $.SewerageConnection.documents.* - jsonMaps: - - - jsonPath: $.SewerageConnection.documents.*.id - - - jsonPath: $.SewerageConnection.tenantId - - - jsonPath: $.SewerageConnection.documents.*.documentType - - - jsonPath: $.SewerageConnection.documents.*.fileStoreId - - - jsonPath: $.SewerageConnection.id - - - jsonPath: $.SewerageConnection.documents.*.status - - - jsonPath: $.SewerageConnection.documents.*.auditDetails.createdBy - - - jsonPath: $.SewerageConnection.documents.*.auditDetails.lastModifiedBy - - - jsonPath: $.SewerageConnection.documents.*.auditDetails.createdTime - - - jsonPath: $.SewerageConnection.documents.*.auditDetails.lastModifiedTime - - - jsonPath: $.SewerageConnection.documents.*.status - - - jsonPath: $.SewerageConnection.documents.*.documentType - - - jsonPath: $.SewerageConnection.documents.*.fileStoreId - - - jsonPath: $.SewerageConnection.documents.*.auditDetails.lastModifiedBy - - - jsonPath: $.SewerageConnection.documents.*.auditDetails.lastModifiedTime - - - query: INSERT INTO eg_sw_plumberinfo(id,tenantId, name, licenseno, mobilenumber, gender, fatherorhusbandname, correspondenceaddress, relationship, createdBy, lastModifiedBy, createdTime, lastModifiedTime, swid) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET name =?, licenseno =?,mobilenumber =?, gender =?, fatherorhusbandname =?, correspondenceaddress =?, relationship=?,lastmodifiedby =?, lastmodifiedtime =?; - basePath: $.SewerageConnection.plumberInfo.* - jsonMaps: - - - jsonPath: $.SewerageConnection.plumberInfo.*.id - - - jsonPath: $.SewerageConnection.tenantId - - - jsonPath: $.SewerageConnection.plumberInfo.*.name - - - jsonPath: $.SewerageConnection.plumberInfo.*.licenseNo - - - jsonPath: $.SewerageConnection.plumberInfo.*.mobileNumber - - - jsonPath: $.SewerageConnection.plumberInfo.*.gender - - - jsonPath: $.SewerageConnection.plumberInfo.*.fatherOrHusbandName - - - jsonPath: $.SewerageConnection.plumberInfo.*.correspondenceAddress - - - jsonPath: $.SewerageConnection.plumberInfo.*.relationship - - - jsonPath: $.SewerageConnection.plumberInfo.*.auditDetails.createdBy - - - jsonPath: $.SewerageConnection.plumberInfo.*.auditDetails.lastModifiedBy - - - jsonPath: $.SewerageConnection.plumberInfo.*.auditDetails.createdTime - - - jsonPath: $.SewerageConnection.plumberInfo.*.auditDetails.lastModifiedTime - - - jsonPath: $.SewerageConnection.id - - - jsonPath: $.SewerageConnection.plumberInfo.*.name - - - jsonPath: $.SewerageConnection.plumberInfo.*.licenseNo - - - jsonPath: $.SewerageConnection.plumberInfo.*.mobileNumber - - - jsonPath: $.SewerageConnection.plumberInfo.*.gender - - - jsonPath: $.SewerageConnection.plumberInfo.*.fatherOrHusbandName - - - jsonPath: $.SewerageConnection.plumberInfo.*.correspondenceAddress - - - jsonPath: $.SewerageConnection.plumberInfo.*.relationship - - - jsonPath: $.SewerageConnection.plumberInfo.*.auditDetails.lastModifiedBy - - - jsonPath: $.SewerageConnection.plumberInfo.*.auditDetails.lastModifiedTime - - - query: INSERT INTO eg_sw_connectionholder(tenantid, connectionid, userid, status, isprimaryholder, connectionholdertype, holdershippercentage, relationship, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (connectionid) DO UPDATE SET tenantid =?, userid =?,status =?, isprimaryholder =?, connectionholdertype =?, holdershippercentage =?, relationship=?, lastmodifiedby =?, lastmodifiedtime =?; - basePath: $.SewerageConnection.connectionHolders.* - jsonMaps: - - - jsonPath: $.SewerageConnection.tenantId - - - jsonPath: $.SewerageConnection.id - - - jsonPath: $.SewerageConnection.connectionHolders.*.uuid - - - jsonPath: $.SewerageConnection.connectionHolders.*.status - - - jsonPath: $.SewerageConnection.connectionHolders.*.isPrimaryOwner - - - jsonPath: $.SewerageConnection.connectionHolders.*.ownerType - - - jsonPath: $.SewerageConnection.connectionHolders.*.ownerShipPercentage - - - jsonPath: $.SewerageConnection.connectionHolders.*.relationship - - - jsonPath: $.SewerageConnection.auditDetails.createdBy - - - jsonPath: $.SewerageConnection.auditDetails.createdTime - - - jsonPath: $.SewerageConnection.auditDetails.lastModifiedBy - - - jsonPath: $.SewerageConnection.auditDetails.lastModifiedTime - - - jsonPath: $.SewerageConnection.tenantId - - - jsonPath: $.SewerageConnection.connectionHolders.*.uuid - - - jsonPath: $.SewerageConnection.connectionHolders.*.status - - - jsonPath: $.SewerageConnection.connectionHolders.*.isPrimaryOwner - - - jsonPath: $.SewerageConnection.connectionHolders.*.ownerType - - - jsonPath: $.SewerageConnection.connectionHolders.*.ownerShipPercentage - - - jsonPath: $.SewerageConnection.connectionHolders.*.relationship - - - jsonPath: $.SewerageConnection.auditDetails.lastModifiedBy - - - jsonPath: $.SewerageConnection.auditDetails.lastModifiedTime - - - query: INSERT INTO eg_sw_roadcuttinginfo(id, tenantId, swid, active, roadtype, roadcuttingarea, createdBy, lastModifiedBy, createdTime, lastModifiedTime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET active = ?, roadtype =?, roadcuttingarea =?,lastmodifiedby =?, lastmodifiedtime =?; - basePath: $.SewerageConnection.roadCuttingInfo.* - jsonMaps: - - - jsonPath: $.SewerageConnection.roadCuttingInfo.*.id - - - jsonPath: $.SewerageConnection.tenantId - - - jsonPath: $.SewerageConnection.id - - - jsonPath: $.SewerageConnection.roadCuttingInfo.*.status - - - jsonPath: $.SewerageConnection.roadCuttingInfo.*.roadType - - - jsonPath: $.SewerageConnection.roadCuttingInfo.*.roadCuttingArea - - - jsonPath: $.SewerageConnection.roadCuttingInfo.*.auditDetails.createdBy - - - jsonPath: $.SewerageConnection.roadCuttingInfo.*.auditDetails.lastModifiedBy - - - jsonPath: $.SewerageConnection.roadCuttingInfo.*.auditDetails.createdTime - - - jsonPath: $.SewerageConnection.roadCuttingInfo.*.auditDetails.lastModifiedTime - - - jsonPath: $.SewerageConnection.roadCuttingInfo.*.status - - - jsonPath: $.SewerageConnection.roadCuttingInfo.*.roadType - - - jsonPath: $.SewerageConnection.roadCuttingInfo.*.roadCuttingArea - - - jsonPath: $.SewerageConnection.roadCuttingInfo.*.auditDetails.lastModifiedBy - - - jsonPath: $.SewerageConnection.roadCuttingInfo.*.auditDetails.lastModifiedTime - - - version: 1.0 - name: SewerageConnection - description: update ConnectionDetails in eg_sw_connection and eg_sw_service - fromTopic: update-sw-workflow - isTransaction: true - queryMaps: - - query: INSERT INTO eg_sw_connection_audit SELECT * FROM eg_sw_connection WHERE id = ?; - basePath: $.SewerageConnection - jsonMaps: - - jsonPath: $.SewerageConnection.id - - - query: UPDATE eg_sw_connection SET applicationstatus=?, status=?, connectionno=?, action=?, lastModifiedBy=?, lastModifiedTime=? WHERE id=?; - basePath: $.SewerageConnection - jsonMaps: - - - jsonPath: $.SewerageConnection.applicationStatus - - - jsonPath: $.SewerageConnection.status - - - jsonPath: $.SewerageConnection.connectionNo - - - jsonPath: $.SewerageConnection.processInstance.action - - - jsonPath: $.SewerageConnection.auditDetails.lastModifiedBy - - - jsonPath: $.SewerageConnection.auditDetails.lastModifiedTime - - - jsonPath: $.SewerageConnection.id - - - version: 1.0 - name: SewerageConnection - description: save filestore ids - fromTopic: save-sw-filestoreids - isTransaction: true - queryMaps: - - - query: INSERT INTO eg_sw_service_audit SELECT * FROM eg_sw_service WHERE connection_id = ?; - basePath: $.SewerageConnection - jsonMaps: - - jsonPath: $.SewerageConnection.id - - - query: UPDATE eg_sw_service SET estimationfileStoreId = ?, sanctionfileStoreId = ? WHERE connection_id=?; - basePath: $.SewerageConnection - jsonMaps: - - - jsonPath: $.SewerageConnection.additionalDetails.estimationFileStoreId - - - jsonPath: $.SewerageConnection.additionalDetails.sanctionFileStoreId - - - jsonPath: $.SewerageConnection.id \ No newline at end of file diff --git a/configs/egov-persister/tl-billing-slab-persister.yml b/configs/egov-persister/tl-billing-slab-persister.yml deleted file mode 100644 index 2483c8fb..00000000 --- a/configs/egov-persister/tl-billing-slab-persister.yml +++ /dev/null @@ -1,81 +0,0 @@ -serviceMaps: - serviceName: tradelicense Calculator - mappings: - - version: 1.0 - name: tl-calculator - description: Persists the billing slabs of tl into db - fromTopic: save-tl-billingslab - isTransaction: true - queryMaps: - - query: INSERT INTO eg_tl_billingSlab(id, tenantid, licensetype, structuretype, tradetype, accessorycategory, type, uom, fromUom, toUom, rate, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, cast(? as double precision), cast(? as double precision), ?, ?, ?, ?, ?); - - basePath: billingSlab.* - jsonMaps: - - - jsonPath: $.billingSlab.*.id - - - jsonPath: $.billingSlab.*.tenantId - - - jsonPath: $.billingSlab.*.licenseType - - - jsonPath: $.billingSlab.*.structureType - - - jsonPath: $.billingSlab.*.tradeType - - - jsonPath: $.billingSlab.*.accessoryCategory - - - jsonPath: $.billingSlab.*.type - - - jsonPath: $.billingSlab.*.uom - - - jsonPath: $.billingSlab.*.fromUom - - - jsonPath: $.billingSlab.*.toUom - - - jsonPath: $.billingSlab.*.rate - - - jsonPath: $.billingSlab.*.auditDetails.createdBy - - - jsonPath: $.billingSlab.*.auditDetails.createdTime - - - jsonPath: $.billingSlab.*.auditDetails.lastModifiedBy - - - jsonPath: $.billingSlab.*.auditDetails.lastModifiedTime - - - - version: 1.0 - name: tl-calculator - description: Updates the billing slabs of tl into db - fromTopic: update-tl-billingslab - isTransaction: true - queryMaps: - - query: UPDATE eg_tl_billingSlab SET licensetype=?, structuretype=?, tradetype=?, accessorycategory=?, type=?, uom=?, fromUom=cast(? as double precision), toUom=cast(? as double precision), rate=?, lastmodifiedby=?, lastmodifiedtime=? WHERE id=? AND tenantid=?; - - basePath: billingSlab.* - jsonMaps: - - - jsonPath: $.billingSlab.*.licenseType - - - jsonPath: $.billingSlab.*.structureType - - - jsonPath: $.billingSlab.*.tradeType - - - jsonPath: $.billingSlab.*.accessoryCategory - - - jsonPath: $.billingSlab.*.type - - - jsonPath: $.billingSlab.*.uom - - - jsonPath: $.billingSlab.*.fromUom - - - jsonPath: $.billingSlab.*.toUom - - - jsonPath: $.billingSlab.*.rate - - - jsonPath: $.billingSlab.*.auditDetails.lastModifiedBy - - - jsonPath: $.billingSlab.*.auditDetails.lastModifiedTime - - - jsonPath: $.billingSlab.*.id - - - jsonPath: $.billingSlab.*.tenantId diff --git a/configs/egov-persister/tl-calculation-persister.yml b/configs/egov-persister/tl-calculation-persister.yml deleted file mode 100644 index 85adc65e..00000000 --- a/configs/egov-persister/tl-calculation-persister.yml +++ /dev/null @@ -1,53 +0,0 @@ -serviceMaps: - serviceName: tl-calculator - mappings: - - version: 1.0 - description: Persists tradeLicense calculation details in EG_TL_CALCULATION table - fromTopic: save-tl-calculation - isTransaction: true - queryMaps: - - - query: INSERT INTO eg_tl_calculator_tradetype(id,tenantId,consumercode,tradeTypeFeeAndBillingSlabIds,createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES ( ?, ?, ?, ?, ?, ?, ?, ?); - basePath: Calculations.*.tradeLicense - jsonMaps: - - jsonPath: $.Calculations.*.tradeTypeBillingIds.id - - - jsonPath: $.Calculations.*.tradeLicense.tenantId - - - jsonPath: $.Calculations.*.tradeLicense.applicationNumber - - - jsonPath: $.Calculations.*.tradeTypeBillingIds - type: JSON - dbType: JSONB - - - jsonPath: $.Calculations.*.tradeLicense.auditDetails.createdBy - - - jsonPath: $.Calculations.*.tradeLicense.auditDetails.lastModifiedBy - - - jsonPath: $.Calculations.*.tradeLicense.auditDetails.createdTime - - - jsonPath: $.Calculations.*.tradeLicense.auditDetails.lastModifiedTime - - - - query: INSERT INTO eg_tl_calculator_accessory(id,tenantId,consumercode,accessoryFeeAndBillingSlabIds,createdby,lastmodifiedby, createdtime, lastmodifiedtime) SELECT * FROM (VALUES ( ?, ?, ?, ?::JSONB, ?, ?, ?::BIGINT, ?::BIGINT)) AS t WHERE (NOT (SELECT coalesce(field, '') = '' FROM (VALUES (?))sub(field))); - basePath: Calculations.*.tradeLicense - jsonMaps: - - jsonPath: $.Calculations.*.accessoryBillingIds.id - - - jsonPath: $.Calculations.*.tradeLicense.tenantId - - - jsonPath: $.Calculations.*.tradeLicense.applicationNumber - - - jsonPath: $.Calculations.*.accessoryBillingIds - type: JSON - dbType: JSONB - - - jsonPath: $.Calculations.*.tradeLicense.auditDetails.createdBy - - - jsonPath: $.Calculations.*.tradeLicense.auditDetails.lastModifiedBy - - - jsonPath: $.Calculations.*.tradeLicense.auditDetails.createdTime - - - jsonPath: $.Calculations.*.tradeLicense.auditDetails.lastModifiedTime - - - jsonPath: $.Calculations.*.accessoryBillingIds.id diff --git a/configs/egov-persister/tradelicense-persister.yml b/configs/egov-persister/tradelicense-persister.yml deleted file mode 100644 index 03544ea4..00000000 --- a/configs/egov-persister/tradelicense-persister.yml +++ /dev/null @@ -1,865 +0,0 @@ -serviceMaps: - serviceName: tl-services - mappings: - - version: 1.0 - description: Persists tradeLicense details in EG_TL_TradeLicense table - fromTopic: save-tl-tradelicense - isTransaction: true - queryMaps: - - - query: INSERT INTO eg_tl_tradelicense( id, accountid,tenantid,tradeName, validfrom,validto,licensetype,applicationNumber, licenseNumber, oldlicensenumber, propertyid, oldpropertyid, applicationdate, commencementdate, financialyear, action, status, createdby, lastmodifiedby, createdtime, lastmodifiedtime, businessservice, applicationtype, workflowcode) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - basePath: Licenses.* - jsonMaps: - - jsonPath: $.Licenses.*.id - - - jsonPath: $.Licenses.*.accountId - - - jsonPath: $.Licenses.*.tenantId - - - jsonPath: $.Licenses.*.tradeName - - - jsonPath: $.Licenses.*.validFrom - - - jsonPath: $.Licenses.*.validTo - - - jsonPath: $.Licenses.*.licenseType - - - jsonPath: $.Licenses.*.applicationNumber - - - jsonPath: $.Licenses.*.licenseNumber - - - jsonPath: $.Licenses.*.oldLicenseNumber - - - jsonPath: $.Licenses.*.propertyId - - - jsonPath: $.Licenses.*.oldPropertyId - - - jsonPath: $.Licenses.*.applicationDate - - - jsonPath: $.Licenses.*.commencementDate - - - jsonPath: $.Licenses.*.financialYear - - - jsonPath: $.Licenses.*.action - - - jsonPath: $.Licenses.*.status - - - jsonPath: $.Licenses.*.auditDetails.createdBy - - - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy - - - jsonPath: $.Licenses.*.auditDetails.createdTime - - - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime - - - jsonPath: $.Licenses.*.businessService - - - jsonPath: $.Licenses.*.applicationType - - - jsonPath: $.Licenses.*.workflowCode - - - query: INSERT INTO eg_tl_tradelicensedetail( id, surveyno, subownershipcategory, channel, additionaldetail, tradelicenseid,structureType,operationalArea,noOfEmployees,adhocExemption,adhocPenalty,adhocExemptionReason,adhocPenaltyReason, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?, ?, ?, ?); - basePath: Licenses.*.tradeLicenseDetail - jsonMaps: - - jsonPath: $.Licenses.*.tradeLicenseDetail.id - - - jsonPath: $.Licenses.*.tradeLicenseDetail.surveyNo - - - jsonPath: $.Licenses.*.tradeLicenseDetail.subOwnerShipCategory - - - jsonPath: $.Licenses.*.tradeLicenseDetail.channel - - - jsonPath: $.Licenses.*.tradeLicenseDetail.additionalDetail - type: JSON - dbType: JSONB - - - jsonPath: $.Licenses.*.id - - - jsonPath: $.Licenses.*.tradeLicenseDetail.structureType - - - jsonPath: $.Licenses.*.tradeLicenseDetail.operationalArea - - - jsonPath: $.Licenses.*.tradeLicenseDetail.noOfEmployees - - - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocExemption - - - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocPenalty - - - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocExemptionReason - - - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocPenaltyReason - - - jsonPath: $.Licenses.*.auditDetails.createdBy - - - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy - - - jsonPath: $.Licenses.*.auditDetails.createdTime - - - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime - - - - - query: INSERT INTO eg_tl_tradeunit( id, tenantid,active, tradetype, uom, uomvalue, tradelicensedetailid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?,?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - basePath: Licenses.*.tradeLicenseDetail.tradeUnits.* - jsonMaps: - - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.id - - - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.tenantId - - - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.active - - - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.tradeType - - - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.uom - - - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.uomValue - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].tradeLicenseDetail.id - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.createdBy - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.lastModifiedBy - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.createdTime - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.lastModifiedTime - - - - - query: INSERT INTO eg_tl_accessory( id, tenantid,active, accessoryCategory, uom, uomvalue, count, tradelicensedetailid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?,?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - basePath: Licenses.*.tradeLicenseDetail.accessories.* - jsonMaps: - - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.id - - - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.tenantId - - - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.active - - - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.accessoryCategory - - - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.uom - - - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.uomValue - - - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.count - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].tradeLicenseDetail.id - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.createdBy - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.lastModifiedBy - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.createdTime - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.lastModifiedTime - - - - query: INSERT INTO eg_tl_owner( id,tenantid,active,institutionid, tradelicensedetailid, isprimaryowner, ownertype, ownershippercentage, relationship, createdby,lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - basePath: Licenses.*.tradeLicenseDetail.owners.* - jsonMaps: - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.uuid - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.tenantId - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.userActive - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.institutionId - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].tradeLicenseDetail.id - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.isPrimaryOwner - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.ownerType - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.ownerShipPercentage - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.relationship - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.createdBy - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.lastModifiedBy - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.createdTime - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.lastModifiedTime - - - - - query: INSERT INTO eg_tl_document_owner(id,tenantId,userid,active, tradeLicenseDetailId, documenttype, fileStoreId,documentuid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ? ,? ,?, ?, ?, ?, ?, ?, ?, ?); - basePath: Licenses.*.tradeLicenseDetail.owners.*.documents.* - jsonMaps: - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.id - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].tenantId - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners[*][?({id} in @.documents[*].id)].uuid - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.active - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].tradeLicenseDetail.id - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.documentType - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.fileStoreId - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.documentUid - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.createdBy - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.lastModifiedBy - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.createdTime - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.lastModifiedTime - - - - - query: INSERT INTO eg_tl_applicationdocument( id, tenantid, active, documenttype, tradecategorydetail, filestoreid, tradelicensedetailid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - basePath: Licenses.*.tradeLicenseDetail.applicationDocuments.* - jsonMaps: - - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.id - - - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.tenantId - - - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.active - - - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.documentType - - - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.tradecategorydetail - - - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.fileStoreId - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].tradeLicenseDetail.id - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.createdBy - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.lastModifiedBy - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.createdTime - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.lastModifiedTime - - - - query: INSERT INTO eg_tl_address( id, tenantid, doorno,street,buildingName, latitude,longitude, addressid, addressnumber,locality, type, addressline1, addressline2, landmark, city, pincode, detail, tradelicensedetailid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - basePath: Licenses.*.tradeLicenseDetail.address - jsonMaps: - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.id - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.tenantId - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.doorNo - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.street - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.buildingName - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.latitude - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.longitude - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.addressId - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.addressNumber - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.locality.code - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.type - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.addressLine1 - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.addressline2 - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.landmark - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.city - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.pincode - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.detail - - - jsonPath: $.Licenses.*.tradeLicenseDetail.id - - - jsonPath: $.Licenses.*.auditDetails.createdBy - - - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy - - - jsonPath: $.Licenses.*.auditDetails.createdTime - - - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime - - - - query: INSERT INTO eg_tl_institution(tenantId,active,id,instituionName,contactNo,organisationRegistrationNo,address, tradelicensedetailid, name, type,designation, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ; - basePath: Licenses.*.tradeLicenseDetail.institution - jsonMaps: - - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.tenantId - - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.active - - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.id - - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.instituionName - - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.contactNo - - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.organisationRegistrationNo - - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.address - - - jsonPath: $.Licenses.*.tradeLicenseDetail.id - - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.name - - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.type - - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.designation - - - jsonPath: $.Licenses.*.auditDetails.createdBy - - - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy - - - jsonPath: $.Licenses.*.auditDetails.createdTime - - - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime - - - - - - - - version: 1.0 - description: Update tradeLicense details in EG_TL_TradeLicense table - fromTopic: update-tl-tradelicense - isTransaction: true - queryMaps: - - - - query: INSERT INTO eg_tl_tradelicense_audit SELECT * FROM eg_tl_tradelicense WHERE id = ?; - basePath: Licenses.* - jsonMaps: - - jsonPath: $.Licenses.*.id - - - - query: UPDATE eg_tl_tradelicense SET tradeName = ?,licenseNumber = ?,licensetype = ?, oldlicensenumber = ?, propertyid = ?, oldpropertyid = ?, commencementdate = ?, issueddate = ?, financialyear = ?, validfrom = ?, validto = ?, action = ?, status = ?, lastmodifiedby = ?, lastmodifiedtime = ?, businessservice = ?, applicationtype = ?, workflowcode = ? WHERE id=?; - basePath: Licenses.* - jsonMaps: - - jsonPath: $.Licenses.*.tradeName - - - jsonPath: $.Licenses.*.licenseNumber - - - jsonPath: $.Licenses.*.licenseType - - - jsonPath: $.Licenses.*.oldLicenseNumber - - - jsonPath: $.Licenses.*.propertyId - - - jsonPath: $.Licenses.*.oldPropertyId - - - jsonPath: $.Licenses.*.commencementDate - - - jsonPath: $.Licenses.*.issuedDate - - - jsonPath: $.Licenses.*.financialYear - - - jsonPath: $.Licenses.*.validFrom - - - jsonPath: $.Licenses.*.validTo - - - jsonPath: $.Licenses.*.action - - - jsonPath: $.Licenses.*.status - - - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy - - - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime - - - jsonPath: $.Licenses.*.businessService - - - jsonPath: $.Licenses.*.applicationType - - - jsonPath: $.Licenses.*.workflowCode - - - jsonPath: $.Licenses.*.id - - - query: INSERT INTO eg_tl_tradelicensedetail_audit SELECT * FROM eg_tl_tradelicensedetail WHERE id = ?; - basePath: Licenses.*.tradeLicenseDetail - jsonMaps: - - jsonPath: $.Licenses.*.tradeLicenseDetail.id - - - - - query: UPDATE eg_tl_tradelicensedetail SET surveyno = ?, subownershipcategory = ?, channel = ?, additionaldetail = ?,operationalArea = ?,noOfEmployees = ?,structureType = ?,adhocExemption = ?,adhocPenalty = ?,adhocExemptionReason = ?,adhocPenaltyReason = ?,lastmodifiedby = ?, lastmodifiedtime = ? WHERE id = ?; - basePath: Licenses.*.tradeLicenseDetail - jsonMaps: - - jsonPath: $.Licenses.*.tradeLicenseDetail.surveyNo - - - jsonPath: $.Licenses.*.tradeLicenseDetail.subOwnerShipCategory - - - jsonPath: $.Licenses.*.tradeLicenseDetail.channel - - - jsonPath: $.Licenses.*.tradeLicenseDetail.additionalDetail - type: JSON - dbType: JSONB - - - jsonPath: $.Licenses.*.tradeLicenseDetail.operationalArea - - - jsonPath: $.Licenses.*.tradeLicenseDetail.noOfEmployees - - - jsonPath: $.Licenses.*.tradeLicenseDetail.structureType - - - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocExemption - - - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocPenalty - - - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocExemptionReason - - - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocPenaltyReason - - - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy - - - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime - - - jsonPath: $.Licenses.*.tradeLicenseDetail.id - - - - query: INSERT INTO eg_tl_tradeunit(id, tenantid, active, tradetype, uom, uomvalue, tradelicensedetailid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET active = ?, tradetype = ?, uom = ?, uomvalue = ?, lastmodifiedby = ?, lastmodifiedtime = ?; - basePath: Licenses.*.tradeLicenseDetail.tradeUnits.* - jsonMaps: - - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.id - - - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.tenantId - - - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.active - - - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.tradeType - - - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.uom - - - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.uomValue - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].tradeLicenseDetail.id - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.createdBy - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.lastModifiedBy - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.createdTime - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.lastModifiedTime - - - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.active - - - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.tradeType - - - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.uom - - - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.uomValue - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.lastModifiedBy - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.lastModifiedTime - - - - query: INSERT INTO eg_tl_accessory(id, tenantid, active, accessoryCategory, uom, uomvalue, count, tradelicensedetailid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET active = ?,accessoryCategory = ?, uom = ?, uomvalue = ?,count =?, lastmodifiedby = ?, lastmodifiedtime = ?; - basePath: Licenses.*.tradeLicenseDetail.accessories.* - jsonMaps: - - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.id - - - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.tenantId - - - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.active - - - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.accessoryCategory - - - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.uom - - - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.uomValue - - - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.count - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].tradeLicenseDetail.id - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.createdBy - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.lastModifiedBy - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.createdTime - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.lastModifiedTime - - - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.active - - - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.accessoryCategory - - - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.uom - - - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.uomValue - - - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.count - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.lastModifiedBy - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.lastModifiedTime - - - - - query: INSERT INTO eg_tl_owner( id, tenantid, active, tradelicensedetailid, isprimaryowner, ownertype, ownershippercentage, relationship, createdby,lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT ON CONSTRAINT pk_eg_tl_owner DO UPDATE SET active = ?, isprimaryowner = ?, ownertype = ?, ownershippercentage = ?, relationship = ?, lastmodifiedby = ?, lastmodifiedtime = ?; - basePath: Licenses.*.tradeLicenseDetail.owners.* - jsonMaps: - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.uuid - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.tenantId - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.userActive - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].tradeLicenseDetail.id - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.isPrimaryOwner - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.ownerType - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.ownerShipPercentage - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.relationship - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.createdBy - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.lastModifiedBy - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.createdTime - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.lastModifiedTime - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.userActive - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.isPrimaryOwner - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.ownerType - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.ownerShipPercentage - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.relationship - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.lastModifiedBy - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.lastModifiedTime - - - - query: INSERT INTO eg_tl_document_owner(id,tenantId,active,userid, tradeLicenseDetailId, documenttype, fileStoreId,documentuid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT ON CONSTRAINT pk_eg_tl_document_owner DO UPDATE SET active = ?, documenttype = ?, fileStoreId = ?,documentuid = ?, lastmodifiedby = ?, lastmodifiedtime = ?; - basePath: Licenses.*.tradeLicenseDetail.owners.*.documents.* - jsonMaps: - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.id - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].tenantId - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.active - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners[*][?({id} in @.documents[*].id)].uuid - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].tradeLicenseDetail.id - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.documentType - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.fileStoreId - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.documentUid - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.createdBy - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.lastModifiedBy - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.createdTime - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.lastModifiedTime - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.active - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.documentType - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.fileStoreId - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.documentUid - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.lastModifiedBy - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.lastModifiedTime - - - - - query: INSERT INTO eg_tl_applicationdocument( id, tenantid, active, documenttype, tradecategorydetail, filestoreid, tradelicensedetailid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET active = ?, documenttype =?, tradecategorydetail =?, filestoreid =?,lastmodifiedby =?, lastmodifiedtime =?; - basePath: Licenses.*.tradeLicenseDetail.applicationDocuments.* - jsonMaps: - - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.id - - - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.tenantId - - - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.active - - - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.documentType - - - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.tradecategorydetail - - - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.fileStoreId - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].tradeLicenseDetail.id - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.createdBy - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.lastModifiedBy - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.createdTime - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.lastModifiedTime - - - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.active - - - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.documentType - - - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.tradecategorydetail - - - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.fileStoreId - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.lastModifiedBy - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.lastModifiedTime - - - - - query: UPDATE eg_tl_address SET doorno =?,street = ?,buildingName = ?, latitude =?, longitude =?, addressid =?, addressnumber =?,locality =?, type =?, addressline1 =?, addressline2 =?, landmark =?, city =?, pincode =?, detail =?,lastmodifiedby =?, lastmodifiedtime =? WHERE id =?; - basePath: Licenses.*.tradeLicenseDetail.address - jsonMaps: - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.doorNo - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.street - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.buildingName - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.latitude - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.longitude - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.addressId - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.addressNumber - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.locality.code - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.type - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.addressline1 - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.addressline2 - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.landmark - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.city - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.pincode - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.detail - - - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy - - - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.id - - - - query: INSERT INTO eg_tl_institution(tenantId, active, id, instituionName, contactNo, organisationRegistrationNo, address, tradelicensedetailid, name, type,designation, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET active = ?,name = ?,type = ?,designation = ?, lastmodifiedby = ?,lastmodifiedtime = ?, instituionName = ?, contactNo = ?, organisationRegistrationNo = ?, address = ?; - basePath: Licenses.*.tradeLicenseDetail.institution - jsonMaps: - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.tenantId - - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.active - - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.id - - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.instituionName - - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.contactNo - - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.organisationRegistrationNo - - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.address - - - jsonPath: $.Licenses.*.tradeLicenseDetail.id - - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.name - - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.type - - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.designation - - - jsonPath: $.Licenses.*.auditDetails.createdBy - - - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy - - - jsonPath: $.Licenses.*.auditDetails.createdTime - - - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime - - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.active - - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.name - - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.type - - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.designation - - - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy - - - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime - - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.instituionName - - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.contactNo - - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.organisationRegistrationNo - - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.address - - - - - - version: 1.0 - description: Persists tradeLicense details in EG_TL_TradeLicense table - fromTopic: update-tl-workflow - isTransaction: true - queryMaps: - - - query: INSERT INTO eg_tl_tradelicense_audit SELECT * FROM eg_tl_tradelicense WHERE id = ?; - basePath: Licenses.* - jsonMaps: - - jsonPath: $.Licenses.*.id - - - - - query: INSERT INTO eg_tl_tradelicensedetail_audit SELECT * FROM eg_tl_tradelicensedetail WHERE id = ?; - basePath: Licenses.*.tradeLicenseDetail - jsonMaps: - - jsonPath: $.Licenses.*.tradeLicenseDetail.id - - - - - query: INSERT INTO eg_tl_verificationdocument( id, tenantid, active, documenttype, tradecategorydetail, filestoreid,tradelicensedetailid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET active = ?,documenttype =?, tradecategorydetail =?, filestoreid =?, lastmodifiedby =?, lastmodifiedtime =?; - basePath: Licenses.*.tradeLicenseDetail.verificationDocuments.* - jsonMaps: - - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.id - - - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.tenantId - - - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.active - - - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.documentType - - - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.tradecategorydetail - - - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.fileStoreId - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.verificationDocuments[*].id)].tradeLicenseDetail.id - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.verificationDocuments[*].id)].auditDetails.createdBy - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.verificationDocuments[*].id)].auditDetails.lastModifiedBy - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.verificationDocuments[*].id)].auditDetails.createdTime - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.verificationDocuments[*].id)].auditDetails.lastModifiedTime - - - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.active - - - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.documentType - - - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.tradecategorydetail - - - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.fileStoreId - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.verificationDocuments[*].id)].auditDetails.lastModifiedBy - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.verificationDocuments[*].id)].auditDetails.lastModifiedTime - - - - query: UPDATE eg_tl_tradelicense SET validfrom = ?,validto = ?,licenseNumber =?, issueddate = ?, action = ?, status = ?, lastmodifiedby = ?, lastmodifiedtime = ? WHERE id=?; - basePath: Licenses.* - jsonMaps: - - jsonPath: $.Licenses.*.validFrom - - - jsonPath: $.Licenses.*.validTo - - - jsonPath: $.Licenses.*.licenseNumber - - - jsonPath: $.Licenses.*.issuedDate - - - jsonPath: $.Licenses.*.action - - - jsonPath: $.Licenses.*.status - - - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy - - - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime - - - jsonPath: $.Licenses.*.id - - - - query: UPDATE eg_tl_tradelicensedetail SET additionaldetail = ?,lastmodifiedby = ?, lastmodifiedtime = ? WHERE id = ?; - basePath: Licenses.*.tradeLicenseDetail - jsonMaps: - - jsonPath: $.Licenses.*.tradeLicenseDetail.additionalDetail - type: JSON - dbType: JSONB - - - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy - - - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime - - - jsonPath: $.Licenses.*.tradeLicenseDetail.id - - - - - version: 1.0 - description: Update adhocDetails - fromTopic: update-tl-adhoc-tradelicense - isTransaction: true - queryMaps: - - - - query: UPDATE eg_tl_tradelicensedetail SET additionaldetail = ?, adhocExemption = ?,adhocPenalty = ?,adhocExemptionReason = ?,adhocPenaltyReason = ?,lastmodifiedby = ?, lastmodifiedtime = ? WHERE id = ?; - basePath: Licenses.*.tradeLicenseDetail - jsonMaps: - - - jsonPath: $.Licenses.*.tradeLicenseDetail.additionalDetail - type: JSON - dbType: JSONB - - - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocExemption - - - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocPenalty - - - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocExemptionReason - - - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocPenaltyReason - - - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy - - - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime - - - jsonPath: $.Licenses.*.tradeLicenseDetail.id - - - version: 1.0 - description: Updates tl status for auto escalate - fromTopic: tl-auto-escalation - isTransaction: true - queryMaps: - - - query: UPDATE eg_tl_tradelicense SET status=?, lastmodifiedby=?, lastmodifiedtime=? WHERE applicationnumber=? AND tenantId=?; - basePath: ProcessInstances.* - jsonMaps: - - jsonPath: $.ProcessInstances.*.state.applicationStatus - - - jsonPath: $.ProcessInstances.*.auditDetails.lastModifiedBy - - - jsonPath: $.ProcessInstances.*.auditDetails.lastModifiedTime - - - jsonPath: $.ProcessInstances.*.businessId - - - jsonPath: $.ProcessInstances.*.tenantId diff --git a/configs/egov-persister/tradelicense.yml b/configs/egov-persister/tradelicense.yml deleted file mode 100644 index e1559b7d..00000000 --- a/configs/egov-persister/tradelicense.yml +++ /dev/null @@ -1,846 +0,0 @@ -serviceMaps: - serviceName: tl-services - mappings: - - version: 1.0 - description: Persists tradeLicense details in EG_TL_TradeLicense table - fromTopic: save-tl-tradelicense - isTransaction: true - queryMaps: - - - query: INSERT INTO eg_tl_tradelicense( id, accountid,tenantid,tradeName, validfrom,validto,licensetype,applicationNumber, licenseNumber, oldlicensenumber, propertyid, oldpropertyid, applicationdate, commencementdate, financialyear, action, status, createdby, lastmodifiedby, createdtime, lastmodifiedtime, businessservice, applicationtype, workflowcode) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - basePath: Licenses.* - jsonMaps: - - jsonPath: $.Licenses.*.id - - - jsonPath: $.Licenses.*.accountId - - - jsonPath: $.Licenses.*.tenantId - - - jsonPath: $.Licenses.*.tradeName - - - jsonPath: $.Licenses.*.validFrom - - - jsonPath: $.Licenses.*.validTo - - - jsonPath: $.Licenses.*.licenseType - - - jsonPath: $.Licenses.*.applicationNumber - - - jsonPath: $.Licenses.*.licenseNumber - - - jsonPath: $.Licenses.*.oldLicenseNumber - - - jsonPath: $.Licenses.*.propertyId - - - jsonPath: $.Licenses.*.oldPropertyId - - - jsonPath: $.Licenses.*.applicationDate - - - jsonPath: $.Licenses.*.commencementDate - - - jsonPath: $.Licenses.*.financialYear - - - jsonPath: $.Licenses.*.action - - - jsonPath: $.Licenses.*.status - - - jsonPath: $.Licenses.*.auditDetails.createdBy - - - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy - - - jsonPath: $.Licenses.*.auditDetails.createdTime - - - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime - - - jsonPath: $.Licenses.*.businessService - - - jsonPath: $.Licenses.*.applicationType - - - jsonPath: $.Licenses.*.workflowCode - - - query: INSERT INTO eg_tl_tradelicensedetail( id, surveyno, subownershipcategory, channel, additionaldetail, tradelicenseid,structureType,operationalArea,noOfEmployees,adhocExemption,adhocPenalty,adhocExemptionReason,adhocPenaltyReason, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?, ?, ?, ?); - basePath: Licenses.*.tradeLicenseDetail - jsonMaps: - - jsonPath: $.Licenses.*.tradeLicenseDetail.id - - - jsonPath: $.Licenses.*.tradeLicenseDetail.surveyNo - - - jsonPath: $.Licenses.*.tradeLicenseDetail.subOwnerShipCategory - - - jsonPath: $.Licenses.*.tradeLicenseDetail.channel - - - jsonPath: $.Licenses.*.tradeLicenseDetail.additionalDetail - type: JSON - dbType: JSONB - - - jsonPath: $.Licenses.*.id - - - jsonPath: $.Licenses.*.tradeLicenseDetail.structureType - - - jsonPath: $.Licenses.*.tradeLicenseDetail.operationalArea - - - jsonPath: $.Licenses.*.tradeLicenseDetail.noOfEmployees - - - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocExemption - - - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocPenalty - - - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocExemptionReason - - - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocPenaltyReason - - - jsonPath: $.Licenses.*.auditDetails.createdBy - - - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy - - - jsonPath: $.Licenses.*.auditDetails.createdTime - - - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime - - - - - query: INSERT INTO eg_tl_tradeunit( id, tenantid,active, tradetype, uom, uomvalue, tradelicensedetailid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?,?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - basePath: Licenses.*.tradeLicenseDetail.tradeUnits.* - jsonMaps: - - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.id - - - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.tenantId - - - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.active - - - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.tradeType - - - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.uom - - - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.uomValue - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].tradeLicenseDetail.id - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.createdBy - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.lastModifiedBy - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.createdTime - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.lastModifiedTime - - - - - query: INSERT INTO eg_tl_accessory( id, tenantid,active, accessoryCategory, uom, uomvalue, count, tradelicensedetailid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?,?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - basePath: Licenses.*.tradeLicenseDetail.accessories.* - jsonMaps: - - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.id - - - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.tenantId - - - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.active - - - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.accessoryCategory - - - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.uom - - - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.uomValue - - - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.count - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].tradeLicenseDetail.id - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.createdBy - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.lastModifiedBy - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.createdTime - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.lastModifiedTime - - - - query: INSERT INTO eg_tl_owner( id,tenantid,active,institutionid, tradelicensedetailid, isprimaryowner, ownertype, ownershippercentage, relationship, createdby,lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - basePath: Licenses.*.tradeLicenseDetail.owners.* - jsonMaps: - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.uuid - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.tenantId - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.userActive - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.institutionId - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].tradeLicenseDetail.id - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.isPrimaryOwner - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.ownerType - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.ownerShipPercentage - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.relationship - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.createdBy - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.lastModifiedBy - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.createdTime - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.lastModifiedTime - - - - - query: INSERT INTO eg_tl_document_owner(id,tenantId,userid,active, tradeLicenseDetailId, documenttype, fileStoreId,documentuid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ? ,? ,?, ?, ?, ?, ?, ?, ?, ?); - basePath: Licenses.*.tradeLicenseDetail.owners.*.documents.* - jsonMaps: - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.id - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].tenantId - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners[*][?({id} in @.documents[*].id)].uuid - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.active - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].tradeLicenseDetail.id - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.documentType - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.fileStoreId - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.documentUid - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.createdBy - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.lastModifiedBy - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.createdTime - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.lastModifiedTime - - - - - query: INSERT INTO eg_tl_applicationdocument( id, tenantid, active, documenttype, tradecategorydetail, filestoreid, tradelicensedetailid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - basePath: Licenses.*.tradeLicenseDetail.applicationDocuments.* - jsonMaps: - - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.id - - - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.tenantId - - - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.active - - - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.documentType - - - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.tradecategorydetail - - - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.fileStoreId - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].tradeLicenseDetail.id - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.createdBy - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.lastModifiedBy - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.createdTime - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.lastModifiedTime - - - - query: INSERT INTO eg_tl_address( id, tenantid, doorno,street,buildingName, latitude,longitude, addressid, addressnumber,locality, type, addressline1, addressline2, landmark, city, pincode, detail, tradelicensedetailid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - basePath: Licenses.*.tradeLicenseDetail.address - jsonMaps: - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.id - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.tenantId - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.doorNo - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.street - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.buildingName - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.latitude - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.longitude - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.addressId - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.addressNumber - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.locality.code - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.type - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.addressLine1 - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.addressline2 - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.landmark - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.city - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.pincode - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.detail - - - jsonPath: $.Licenses.*.tradeLicenseDetail.id - - - jsonPath: $.Licenses.*.auditDetails.createdBy - - - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy - - - jsonPath: $.Licenses.*.auditDetails.createdTime - - - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime - - - - query: INSERT INTO eg_tl_institution(tenantId,active,id,instituionName,contactNo,organisationRegistrationNo,address, tradelicensedetailid, name, type,designation, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ; - basePath: Licenses.*.tradeLicenseDetail.institution - jsonMaps: - - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.tenantId - - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.active - - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.id - - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.instituionName - - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.contactNo - - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.organisationRegistrationNo - - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.address - - - jsonPath: $.Licenses.*.tradeLicenseDetail.id - - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.name - - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.type - - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.designation - - - jsonPath: $.Licenses.*.auditDetails.createdBy - - - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy - - - jsonPath: $.Licenses.*.auditDetails.createdTime - - - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime - - - - - - - - version: 1.0 - description: Update tradeLicense details in EG_TL_TradeLicense table - fromTopic: update-tl-tradelicense - isTransaction: true - queryMaps: - - - - query: INSERT INTO eg_tl_tradelicense_audit SELECT * FROM eg_tl_tradelicense WHERE id = ?; - basePath: Licenses.* - jsonMaps: - - jsonPath: $.Licenses.*.id - - - - query: UPDATE eg_tl_tradelicense SET tradeName = ?,licenseNumber = ?,licensetype = ?, oldlicensenumber = ?, propertyid = ?, oldpropertyid = ?, commencementdate = ?, issueddate = ?, financialyear = ?, validfrom = ?, validto = ?, action = ?, status = ?, lastmodifiedby = ?, lastmodifiedtime = ?, businessservice = ?, applicationtype = ?, workflowcode = ? WHERE id=?; - basePath: Licenses.* - jsonMaps: - - jsonPath: $.Licenses.*.tradeName - - - jsonPath: $.Licenses.*.licenseNumber - - - jsonPath: $.Licenses.*.licenseType - - - jsonPath: $.Licenses.*.oldLicenseNumber - - - jsonPath: $.Licenses.*.propertyId - - - jsonPath: $.Licenses.*.oldPropertyId - - - jsonPath: $.Licenses.*.commencementDate - - - jsonPath: $.Licenses.*.issuedDate - - - jsonPath: $.Licenses.*.financialYear - - - jsonPath: $.Licenses.*.validFrom - - - jsonPath: $.Licenses.*.validTo - - - jsonPath: $.Licenses.*.action - - - jsonPath: $.Licenses.*.status - - - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy - - - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime - - - jsonPath: $.Licenses.*.businessService - - - jsonPath: $.Licenses.*.applicationType - - - jsonPath: $.Licenses.*.workflowCode - - - jsonPath: $.Licenses.*.id - - - query: INSERT INTO eg_tl_tradelicensedetail_audit SELECT * FROM eg_tl_tradelicensedetail WHERE id = ?; - basePath: Licenses.*.tradeLicenseDetail - jsonMaps: - - jsonPath: $.Licenses.*.tradeLicenseDetail.id - - - - - query: UPDATE eg_tl_tradelicensedetail SET surveyno = ?, subownershipcategory = ?, channel = ?, additionaldetail = ?,operationalArea = ?,noOfEmployees = ?,structureType = ?,adhocExemption = ?,adhocPenalty = ?,adhocExemptionReason = ?,adhocPenaltyReason = ?,lastmodifiedby = ?, lastmodifiedtime = ? WHERE id = ?; - basePath: Licenses.*.tradeLicenseDetail - jsonMaps: - - jsonPath: $.Licenses.*.tradeLicenseDetail.surveyNo - - - jsonPath: $.Licenses.*.tradeLicenseDetail.subOwnerShipCategory - - - jsonPath: $.Licenses.*.tradeLicenseDetail.channel - - - jsonPath: $.Licenses.*.tradeLicenseDetail.additionalDetail - type: JSON - dbType: JSONB - - - jsonPath: $.Licenses.*.tradeLicenseDetail.operationalArea - - - jsonPath: $.Licenses.*.tradeLicenseDetail.noOfEmployees - - - jsonPath: $.Licenses.*.tradeLicenseDetail.structureType - - - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocExemption - - - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocPenalty - - - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocExemptionReason - - - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocPenaltyReason - - - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy - - - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime - - - jsonPath: $.Licenses.*.tradeLicenseDetail.id - - - - query: INSERT INTO eg_tl_tradeunit(id, tenantid, active, tradetype, uom, uomvalue, tradelicensedetailid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET active = ?, tradetype = ?, uom = ?, uomvalue = ?, lastmodifiedby = ?, lastmodifiedtime = ?; - basePath: Licenses.*.tradeLicenseDetail.tradeUnits.* - jsonMaps: - - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.id - - - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.tenantId - - - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.active - - - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.tradeType - - - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.uom - - - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.uomValue - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].tradeLicenseDetail.id - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.createdBy - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.lastModifiedBy - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.createdTime - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.lastModifiedTime - - - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.active - - - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.tradeType - - - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.uom - - - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.uomValue - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.lastModifiedBy - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.lastModifiedTime - - - - query: INSERT INTO eg_tl_accessory(id, tenantid, active, accessoryCategory, uom, uomvalue, count, tradelicensedetailid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET active = ?,accessoryCategory = ?, uom = ?, uomvalue = ?,count =?, lastmodifiedby = ?, lastmodifiedtime = ?; - basePath: Licenses.*.tradeLicenseDetail.accessories.* - jsonMaps: - - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.id - - - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.tenantId - - - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.active - - - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.accessoryCategory - - - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.uom - - - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.uomValue - - - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.count - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].tradeLicenseDetail.id - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.createdBy - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.lastModifiedBy - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.createdTime - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.lastModifiedTime - - - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.active - - - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.accessoryCategory - - - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.uom - - - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.uomValue - - - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.count - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.lastModifiedBy - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.lastModifiedTime - - - - - query: INSERT INTO eg_tl_owner( id, tenantid, active, tradelicensedetailid, isprimaryowner, ownertype, ownershippercentage, relationship, createdby,lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT ON CONSTRAINT pk_eg_tl_owner DO UPDATE SET active = ?, isprimaryowner = ?, ownertype = ?, ownershippercentage = ?, relationship = ?, lastmodifiedby = ?, lastmodifiedtime = ?; - basePath: Licenses.*.tradeLicenseDetail.owners.* - jsonMaps: - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.uuid - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.tenantId - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.userActive - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].tradeLicenseDetail.id - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.isPrimaryOwner - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.ownerType - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.ownerShipPercentage - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.relationship - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.createdBy - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.lastModifiedBy - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.createdTime - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.lastModifiedTime - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.userActive - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.isPrimaryOwner - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.ownerType - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.ownerShipPercentage - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.relationship - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.lastModifiedBy - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.lastModifiedTime - - - - query: INSERT INTO eg_tl_document_owner(id,tenantId,active,userid, tradeLicenseDetailId, documenttype, fileStoreId,documentuid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT ON CONSTRAINT pk_eg_tl_document_owner DO UPDATE SET active = ?, documenttype = ?, fileStoreId = ?,documentuid = ?, lastmodifiedby = ?, lastmodifiedtime = ?; - basePath: Licenses.*.tradeLicenseDetail.owners.*.documents.* - jsonMaps: - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.id - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].tenantId - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.active - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners[*][?({id} in @.documents[*].id)].uuid - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].tradeLicenseDetail.id - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.documentType - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.fileStoreId - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.documentUid - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.createdBy - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.lastModifiedBy - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.createdTime - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.lastModifiedTime - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.active - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.documentType - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.fileStoreId - - - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.documentUid - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.lastModifiedBy - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.lastModifiedTime - - - - - query: INSERT INTO eg_tl_applicationdocument( id, tenantid, active, documenttype, tradecategorydetail, filestoreid, tradelicensedetailid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET active = ?, documenttype =?, tradecategorydetail =?, filestoreid =?,lastmodifiedby =?, lastmodifiedtime =?; - basePath: Licenses.*.tradeLicenseDetail.applicationDocuments.* - jsonMaps: - - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.id - - - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.tenantId - - - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.active - - - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.documentType - - - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.tradecategorydetail - - - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.fileStoreId - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].tradeLicenseDetail.id - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.createdBy - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.lastModifiedBy - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.createdTime - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.lastModifiedTime - - - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.active - - - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.documentType - - - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.tradecategorydetail - - - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.fileStoreId - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.lastModifiedBy - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.lastModifiedTime - - - - - query: UPDATE eg_tl_address SET doorno =?,street = ?,buildingName = ?, latitude =?, longitude =?, addressid =?, addressnumber =?,locality =?, type =?, addressline1 =?, addressline2 =?, landmark =?, city =?, pincode =?, detail =?,lastmodifiedby =?, lastmodifiedtime =? WHERE id =?; - basePath: Licenses.*.tradeLicenseDetail.address - jsonMaps: - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.doorNo - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.street - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.buildingName - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.latitude - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.longitude - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.addressId - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.addressNumber - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.locality.code - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.type - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.addressline1 - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.addressline2 - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.landmark - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.city - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.pincode - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.detail - - - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy - - - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime - - - jsonPath: $.Licenses.*.tradeLicenseDetail.address.id - - - - query: INSERT INTO eg_tl_institution(tenantId, active, id, instituionName, contactNo, organisationRegistrationNo, address, tradelicensedetailid, name, type,designation, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET active = ?,name = ?,type = ?,designation = ?, lastmodifiedby = ?,lastmodifiedtime = ?, instituionName = ?, contactNo = ?, organisationRegistrationNo = ?, address = ?; - basePath: Licenses.*.tradeLicenseDetail.institution - jsonMaps: - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.tenantId - - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.active - - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.id - - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.instituionName - - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.contactNo - - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.organisationRegistrationNo - - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.address - - - jsonPath: $.Licenses.*.tradeLicenseDetail.id - - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.name - - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.type - - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.designation - - - jsonPath: $.Licenses.*.auditDetails.createdBy - - - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy - - - jsonPath: $.Licenses.*.auditDetails.createdTime - - - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime - - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.active - - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.name - - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.type - - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.designation - - - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy - - - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime - - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.instituionName - - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.contactNo - - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.organisationRegistrationNo - - - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.address - - - - - - version: 1.0 - description: Persists tradeLicense details in EG_TL_TradeLicense table - fromTopic: update-tl-workflow - isTransaction: true - queryMaps: - - - query: INSERT INTO eg_tl_tradelicense_audit SELECT * FROM eg_tl_tradelicense WHERE id = ?; - basePath: Licenses.* - jsonMaps: - - jsonPath: $.Licenses.*.id - - - - - query: INSERT INTO eg_tl_tradelicensedetail_audit SELECT * FROM eg_tl_tradelicensedetail WHERE id = ?; - basePath: Licenses.*.tradeLicenseDetail - jsonMaps: - - jsonPath: $.Licenses.*.tradeLicenseDetail.id - - - - - query: INSERT INTO eg_tl_verificationdocument( id, tenantid, active, documenttype, tradecategorydetail, filestoreid,tradelicensedetailid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET active = ?,documenttype =?, tradecategorydetail =?, filestoreid =?, lastmodifiedby =?, lastmodifiedtime =?; - basePath: Licenses.*.tradeLicenseDetail.verificationDocuments.* - jsonMaps: - - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.id - - - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.tenantId - - - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.active - - - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.documentType - - - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.tradecategorydetail - - - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.fileStoreId - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.verificationDocuments[*].id)].tradeLicenseDetail.id - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.verificationDocuments[*].id)].auditDetails.createdBy - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.verificationDocuments[*].id)].auditDetails.lastModifiedBy - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.verificationDocuments[*].id)].auditDetails.createdTime - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.verificationDocuments[*].id)].auditDetails.lastModifiedTime - - - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.active - - - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.documentType - - - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.tradecategorydetail - - - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.fileStoreId - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.verificationDocuments[*].id)].auditDetails.lastModifiedBy - - - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.verificationDocuments[*].id)].auditDetails.lastModifiedTime - - - - query: UPDATE eg_tl_tradelicense SET validfrom = ?,validto = ?,licenseNumber =?, issueddate = ?, action = ?, status = ?, lastmodifiedby = ?, lastmodifiedtime = ? WHERE id=?; - basePath: Licenses.* - jsonMaps: - - jsonPath: $.Licenses.*.validFrom - - - jsonPath: $.Licenses.*.validTo - - - jsonPath: $.Licenses.*.licenseNumber - - - jsonPath: $.Licenses.*.issuedDate - - - jsonPath: $.Licenses.*.action - - - jsonPath: $.Licenses.*.status - - - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy - - - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime - - - jsonPath: $.Licenses.*.id - - - - query: UPDATE eg_tl_tradelicensedetail SET additionaldetail = ?,lastmodifiedby = ?, lastmodifiedtime = ? WHERE id = ?; - basePath: Licenses.*.tradeLicenseDetail - jsonMaps: - - jsonPath: $.Licenses.*.tradeLicenseDetail.additionalDetail - type: JSON - dbType: JSONB - - - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy - - - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime - - - jsonPath: $.Licenses.*.tradeLicenseDetail.id - - - - - version: 1.0 - description: Update adhocDetails - fromTopic: update-tl-adhoc-tradelicense - isTransaction: true - queryMaps: - - - - query: UPDATE eg_tl_tradelicensedetail SET additionaldetail = ?, adhocExemption = ?,adhocPenalty = ?,adhocExemptionReason = ?,adhocPenaltyReason = ?,lastmodifiedby = ?, lastmodifiedtime = ? WHERE id = ?; - basePath: Licenses.*.tradeLicenseDetail - jsonMaps: - - - jsonPath: $.Licenses.*.tradeLicenseDetail.additionalDetail - type: JSON - dbType: JSONB - - - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocExemption - - - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocPenalty - - - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocExemptionReason - - - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocPenaltyReason - - - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy - - - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime - - - jsonPath: $.Licenses.*.tradeLicenseDetail.id diff --git a/configs/egov-persister/uploader-persister.yml b/configs/egov-persister/uploader-persister.yml deleted file mode 100644 index 32fdc3df..00000000 --- a/configs/egov-persister/uploader-persister.yml +++ /dev/null @@ -1,75 +0,0 @@ -serviceMaps: - serviceName: Uploader - mappings: - - version: 1.0 - name: Uploader - description: Persists upload jobs to table - fromTopic: save-upload-jobs - isTransaction: true - queryMaps: - - query: Insert into EGDU_UPLOADREGISTRY(CODE, TENANTID, REQUESTFILE_PATH, MODULE_NAME, DEF_NAME, REQUESTER_NAME, STATUS,FILE_NAME,CREATEDBY,CREATEDDATE,LASTMODIFIEDBY,LASTMODIFIEDDATE) VALUES(?,?,?,?,?,?,?,?,?,?,?,?); - basePath: UploadJob - jsonMaps: - - - - jsonPath: $.UploadJob.code - - - jsonPath: $.UploadJob.tenantId - - - jsonPath: $.UploadJob.requestFilePath - - - jsonPath: $.UploadJob.moduleName - - - jsonPath: $.UploadJob.defName - - - jsonPath: $.UploadJob.requesterName - - - jsonPath: $.UploadJob.status - - - jsonPath: $.UploadJob.requestFileName - - - jsonPath: $.UploadJob.auditDetails.createdBy - - - jsonPath: $.UploadJob.auditDetails.createdTime - - - jsonPath: $.UploadJob.auditDetails.lastModifiedBy - - - jsonPath: $.UploadJob.auditDetails.lastModifiedTime - - - - - version: 1.0 - name: Uploader - description: Updates upload jobs in the table - fromTopic: update-upload-jobs - isTransaction: true - queryMaps: - - query: Update EGDU_UPLOADREGISTRY set START_TIME=?, END_TIME=?, TOTAL_ROWS=?, SUCCESS_ROWS=?, FAILED_ROWS=?, RESPONSEFILE_PATH=?, STATUS=?, REASON_FOR_FAILURE = ?, LASTMODIFIEDBY=?, LASTMODIFIEDDATE=? where CODE=? AND TENANTID=? - basePath: UploadJobs - jsonMaps: - - - - jsonPath: $.UploadJob.startTime - - - jsonPath: $.UploadJob.endTime - - - jsonPath: $.UploadJob.totalRows - - - jsonPath: $.UploadJob.successfulRows - - - jsonPath: $.UploadJob.failedRows - - - jsonPath: $.UploadJob.responseFilePath - - - jsonPath: $.UploadJob.status - - - jsonPath: $.UploadJob.reasonForFailure - - - jsonPath: $.UploadJob.auditDetails.lastModifiedBy - - - jsonPath: $.UploadJob.auditDetails.lastModifiedTime - - - jsonPath: $.UploadJob.code - - - jsonPath: $.UploadJob.tenantId - diff --git a/configs/egov-persister/water-bill-scheduler.yml b/configs/egov-persister/water-bill-scheduler.yml deleted file mode 100644 index f3e299b4..00000000 --- a/configs/egov-persister/water-bill-scheduler.yml +++ /dev/null @@ -1,33 +0,0 @@ -serviceMaps: - serviceName: Bill Generate Scheduler Service - mappings: - - version: 1.0 - name: BillGenerateScheduler - description: capture bill generation details for particular connection number - fromTopic: save-ws-bill-scheduler - isTransaction: true - queryMaps: - - query: INSERT INTO eg_ws_scheduler (id, tenantid, transactiontype,locality,billingcyclestartdate,billingcycleenddate,status, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?,?,?,?,?); - basePath: $.billScheduler - jsonMaps: - - jsonPath: $.billScheduler.id - - - jsonPath: $.billScheduler.tenantId - - - jsonPath: $.billScheduler.transactionType - - - jsonPath: $.billScheduler.locality - - - jsonPath: $.billScheduler.billingcycleStartdate - - - jsonPath: $.billScheduler.billingcycleEnddate - - - jsonPath: $.billScheduler.status - - - jsonPath: $.billScheduler.auditDetails.createdBy - - - jsonPath: $.billScheduler.auditDetails.lastModifiedBy - - - jsonPath: $.billScheduler.auditDetails.createdTime - - - jsonPath: $.billScheduler.auditDetails.lastModifiedTime \ No newline at end of file diff --git a/configs/egov-persister/water-meter.yml b/configs/egov-persister/water-meter.yml deleted file mode 100644 index 495c25da..00000000 --- a/configs/egov-persister/water-meter.yml +++ /dev/null @@ -1,37 +0,0 @@ -serviceMaps: - serviceName: Meter Connection Service - mappings: - - version: 1.0 - name: MeterConnection - description: create meter reading for particular connection number - fromTopic: save-ws-meter - isTransaction: true - queryMaps: - - query: INSERT INTO eg_ws_meterreading (id, tenantid, connectionNo, billingPeriod, meterStatus, lastReading, lastReadingDate, currentReading, currentReadingDate, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?,?,?,?,?,?, ?); - basePath: $.meterReadings - jsonMaps: - - jsonPath: $.meterReadings.id - - - jsonPath: $.meterReadings.tenantId - - - jsonPath: $.meterReadings.connectionNo - - - jsonPath: $.meterReadings.billingPeriod - - - jsonPath: $.meterReadings.meterStatus - - - jsonPath: $.meterReadings.lastReading - - - jsonPath: $.meterReadings.lastReadingDate - - - jsonPath: $.meterReadings.currentReading - - - jsonPath: $.meterReadings.currentReadingDate - - - jsonPath: $.meterReadings.auditDetails.createdBy - - - jsonPath: $.meterReadings.auditDetails.lastModifiedBy - - - jsonPath: $.meterReadings.auditDetails.createdTime - - - jsonPath: $.meterReadings.auditDetails.lastModifiedTime \ No newline at end of file diff --git a/configs/egov-persister/water-persist.yml b/configs/egov-persister/water-persist.yml deleted file mode 100644 index d95437ff..00000000 --- a/configs/egov-persister/water-persist.yml +++ /dev/null @@ -1,473 +0,0 @@ -serviceMaps: - serviceName: Water Connection Service - mappings: - - version: 1.0 - name: WaterConnection - description: create ConnectionDetails in connection and water_service_connection - fromTopic: save-ws-connection - isTransaction: true - queryMaps: - - query: INSERT INTO eg_ws_connection (id, tenantid, property_id, applicationno, applicationstatus, status, connectionno, oldconnectionno,roadcuttingarea,action,roadtype, createdby, lastmodifiedby, createdtime, lastmodifiedtime, applicationtype, dateEffectiveFrom, locality, isoldapplication,additionaldetails) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?,?,?,?,?,?,?,?,?); - basePath: $.WaterConnection - jsonMaps: - - jsonPath: $.WaterConnection.id - - - jsonPath: $.WaterConnection.tenantId - - - jsonPath: $.WaterConnection.propertyId - - - jsonPath: $.WaterConnection.applicationNo - - - jsonPath: $.WaterConnection.applicationStatus - - - jsonPath: $.WaterConnection.status - - - jsonPath: $.WaterConnection.connectionNo - - - jsonPath: $.WaterConnection.oldConnectionNo - - - jsonPath: $.WaterConnection.roadCuttingArea - - - jsonPath: $.WaterConnection.processInstance.action - - - jsonPath: $.WaterConnection.roadType - - - jsonPath: $.WaterConnection.auditDetails.createdBy - - - jsonPath: $.WaterConnection.auditDetails.lastModifiedBy - - - jsonPath: $.WaterConnection.auditDetails.createdTime - - - jsonPath: $.WaterConnection.auditDetails.lastModifiedTime - - - jsonPath: $.WaterConnection.applicationType - - - jsonPath: $.WaterConnection.dateEffectiveFrom - - - jsonPath: $.WaterConnection.additionalDetails.locality - - - jsonPath: $.WaterConnection.oldApplication - - - jsonPath: $.WaterConnection.additionalDetails - type: JSON - dbType: JSONB - - - - query: INSERT INTO eg_ws_service(connection_id,connectionCategory,connectionType,waterSource,meterId,meterInstallationDate,pipeSize,noOfTaps,connectionexecutiondate,proposedPipeSize,proposedTaps, appCreatedDate, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?); - basePath: $.WaterConnection - jsonMaps: - - - jsonPath: $.WaterConnection.id - - jsonPath: $.WaterConnection.connectionCategory - - - jsonPath: $.WaterConnection.connectionType - - - jsonPath: $.WaterConnection.waterSource - - - jsonPath: $.WaterConnection.meterId - - - jsonPath: $.WaterConnection.meterInstallationDate - - - jsonPath: $.WaterConnection.pipeSize - - - jsonPath: $.WaterConnection.noOfTaps - - - jsonPath: $.WaterConnection.connectionExecutionDate - - - jsonPath: $.WaterConnection.proposedPipeSize - - - jsonPath: $.WaterConnection.proposedTaps - - - jsonPath: $.WaterConnection.additionalDetails.appCreatedDate - - - jsonPath: $.WaterConnection.auditDetails.createdBy - - - jsonPath: $.WaterConnection.auditDetails.lastModifiedBy - - - jsonPath: $.WaterConnection.auditDetails.createdTime - - - jsonPath: $.WaterConnection.auditDetails.lastModifiedTime - - - - query: INSERT INTO eg_ws_connectionholder(tenantid, connectionid, userid, status, isprimaryholder, connectionholdertype, holdershippercentage, relationship, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); - basePath: $.WaterConnection.connectionHolders.* - jsonMaps: - - - jsonPath: $.WaterConnection.tenantId - - - jsonPath: $.WaterConnection.id - - - jsonPath: $.WaterConnection.connectionHolders.*.uuid - - - jsonPath: $.WaterConnection.connectionHolders.*.status - - - jsonPath: $.WaterConnection.connectionHolders.*.isPrimaryOwner - - - jsonPath: $.WaterConnection.connectionHolders.*.ownerType - - - jsonPath: $.WaterConnection.connectionHolders.*.ownerShipPercentage - - - jsonPath: $.WaterConnection.connectionHolders.*.relationship - - - jsonPath: $.WaterConnection.auditDetails.createdBy - - - jsonPath: $.WaterConnection.auditDetails.createdTime - - - jsonPath: $.WaterConnection.auditDetails.lastModifiedBy - - - jsonPath: $.WaterConnection.auditDetails.lastModifiedTime - - - query: INSERT INTO eg_ws_roadcuttinginfo(id, tenantId, wsid, active, roadtype, roadcuttingarea, createdBy, lastModifiedBy, createdTime, lastModifiedTime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET active = ?, roadtype =?, roadcuttingarea =?,lastmodifiedby =?, lastmodifiedtime =?; - basePath: $.WaterConnection.roadCuttingInfo.* - jsonMaps: - - - jsonPath: $.WaterConnection.roadCuttingInfo.*.id - - - jsonPath: $.WaterConnection.tenantId - - - jsonPath: $.WaterConnection.id - - - jsonPath: $.WaterConnection.roadCuttingInfo.*.status - - - jsonPath: $.WaterConnection.roadCuttingInfo.*.roadType - - - jsonPath: $.WaterConnection.roadCuttingInfo.*.roadCuttingArea - - - jsonPath: $.WaterConnection.roadCuttingInfo.*.auditDetails.createdBy - - - jsonPath: $.WaterConnection.roadCuttingInfo.*.auditDetails.lastModifiedBy - - - jsonPath: $.WaterConnection.roadCuttingInfo.*.auditDetails.createdTime - - - jsonPath: $.WaterConnection.roadCuttingInfo.*.auditDetails.lastModifiedTime - - - jsonPath: $.WaterConnection.roadCuttingInfo.*.status - - - jsonPath: $.WaterConnection.roadCuttingInfo.*.roadType - - - jsonPath: $.WaterConnection.roadCuttingInfo.*.roadCuttingArea - - - jsonPath: $.WaterConnection.roadCuttingInfo.*.auditDetails.lastModifiedBy - - - jsonPath: $.WaterConnection.roadCuttingInfo.*.auditDetails.lastModifiedTime - - - version: 1.0 - name: WaterConnection - description: update ConnectionDetails in eg_ws_connection and eg_ws_service - fromTopic: update-ws-connection - isTransaction: true - queryMaps: - - - query: INSERT INTO eg_ws_connection_audit SELECT * FROM eg_ws_connection WHERE id = ?; - basePath: $.WaterConnection - jsonMaps: - - jsonPath: $.WaterConnection.id - - - query: UPDATE eg_ws_connection SET applicationstatus=?, status=?, connectionno=?, oldconnectionno=?, action=?, roadCuttingArea=?, roadType=?, adhocpenalty=?, adhocrebate=?, adhocpenaltyreason=?, adhocpenaltycomment=?, adhocrebatereason=?, adhocrebatecomment=?, lastModifiedBy=?, lastModifiedTime=?, dateEffectiveFrom=?, locality=?, isoldapplication=?, property_id=?, additionaldetails=? WHERE id=?; - basePath: $.WaterConnection - jsonMaps: - - - jsonPath: $.WaterConnection.applicationStatus - - - jsonPath: $.WaterConnection.status - - - jsonPath: $.WaterConnection.connectionNo - - - jsonPath: $.WaterConnection.oldConnectionNo - - - jsonPath: $.WaterConnection.processInstance.action - - - jsonPath: $.WaterConnection.roadCuttingArea - - - jsonPath: $.WaterConnection.roadType - - - jsonPath: $.WaterConnection.additionalDetails.adhocPenalty - - - jsonPath: $.WaterConnection.additionalDetails.adhocRebate - - - jsonPath: $.WaterConnection.additionalDetails.adhocPenaltyReason - - - jsonPath: $.WaterConnection.additionalDetails.adhocPenaltyComment - - - jsonPath: $.WaterConnection.additionalDetails.adhocRebateReason - - - jsonPath: $.WaterConnection.additionalDetails.adhocRebateComment - - - jsonPath: $.WaterConnection.auditDetails.lastModifiedBy - - - jsonPath: $.WaterConnection.auditDetails.lastModifiedTime - - - jsonPath: $.WaterConnection.dateEffectiveFrom - - - jsonPath: $.WaterConnection.additionalDetails.locality - - - jsonPath: $.WaterConnection.oldApplication - - - jsonPath: $.WaterConnection.propertyId - - - jsonPath: $.WaterConnection.additionalDetails - type: JSON - dbType: JSONB - - - jsonPath: $.WaterConnection.id - - - query: INSERT INTO eg_ws_service_audit SELECT * FROM eg_ws_service WHERE connection_id = ?; - basePath: $.WaterConnection - jsonMaps: - - jsonPath: $.WaterConnection.id - - - query: UPDATE eg_ws_service SET connectionCategory=?,connectionType=?,waterSource=?,meterId=?,meterInstallationDate=?,pipeSize=?,noOfTaps=?,proposedPipeSize=?,proposedTaps=?, initialmeterreading = ?, connectionexecutiondate = ?, detailsprovidedby = ?, estimationfileStoreId = ?, sanctionfileStoreId = ?, estimationLetterDate = ?, lastModifiedBy=?, lastModifiedTime=? WHERE connection_id=?; - basePath: $.WaterConnection - jsonMaps: - - - jsonPath: $.WaterConnection.connectionCategory - - - jsonPath: $.WaterConnection.connectionType - - - jsonPath: $.WaterConnection.waterSource - - - jsonPath: $.WaterConnection.meterId - - - jsonPath: $.WaterConnection.meterInstallationDate - - - jsonPath: $.WaterConnection.pipeSize - - - jsonPath: $.WaterConnection.noOfTaps - - - jsonPath: $.WaterConnection.proposedPipeSize - - - jsonPath: $.WaterConnection.proposedTaps - - - jsonPath: $.WaterConnection.additionalDetails.initialMeterReading - - - jsonPath: $.WaterConnection.connectionExecutionDate - - - jsonPath: $.WaterConnection.additionalDetails.detailsProvidedBy - - - jsonPath: $.WaterConnection.additionalDetails.estimationFileStoreId - - - jsonPath: $.WaterConnection.additionalDetails.sanctionFileStoreId - - - jsonPath: $.WaterConnection.additionalDetails.estimationLetterDate - - - jsonPath: $.WaterConnection.auditDetails.lastModifiedBy - - - jsonPath: $.WaterConnection.auditDetails.lastModifiedTime - - - jsonPath: $.WaterConnection.id - - - query: INSERT INTO eg_ws_applicationDocument(id, tenantId, documenttype, filestoreid, wsid, active, createdBy, lastModifiedBy, createdTime, lastModifiedTime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET active = ?, documenttype =?, filestoreid =?,lastmodifiedby =?, lastmodifiedtime =?; - basePath: $.WaterConnection.documents.* - jsonMaps: - - - jsonPath: $.WaterConnection.documents.*.id - - - jsonPath: $.WaterConnection.tenantId - - - jsonPath: $.WaterConnection.documents.*.documentType - - - jsonPath: $.WaterConnection.documents.*.fileStoreId - - - jsonPath: $.WaterConnection.id - - - jsonPath: $.WaterConnection.documents.*.status - - - jsonPath: $.WaterConnection.documents.*.auditDetails.createdBy - - - jsonPath: $.WaterConnection.documents.*.auditDetails.lastModifiedBy - - - jsonPath: $.WaterConnection.documents.*.auditDetails.createdTime - - - jsonPath: $.WaterConnection.documents.*.auditDetails.lastModifiedTime - - - jsonPath: $.WaterConnection.documents.*.status - - - jsonPath: $.WaterConnection.documents.*.documentType - - - jsonPath: $.WaterConnection.documents.*.fileStoreId - - - jsonPath: $.WaterConnection.documents.*.auditDetails.lastModifiedBy - - - jsonPath: $.WaterConnection.documents.*.auditDetails.lastModifiedTime - - - query: INSERT INTO eg_ws_plumberinfo(id, tenantId, name, licenseno, mobilenumber, gender, fatherorhusbandname, correspondenceaddress, relationship, createdBy, lastModifiedBy, createdTime, lastModifiedTime, wsid) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET name =?, licenseno =?,mobilenumber =?, gender =?, fatherorhusbandname =?, correspondenceaddress =?, relationship=?, lastmodifiedby =?, lastmodifiedtime =?; - basePath: $.WaterConnection.plumberInfo.* - jsonMaps: - - - jsonPath: $.WaterConnection.plumberInfo.*.id - - - jsonPath: $.WaterConnection.tenantId - - - jsonPath: $.WaterConnection.plumberInfo.*.name - - - jsonPath: $.WaterConnection.plumberInfo.*.licenseNo - - - jsonPath: $.WaterConnection.plumberInfo.*.mobileNumber - - - jsonPath: $.WaterConnection.plumberInfo.*.gender - - - jsonPath: $.WaterConnection.plumberInfo.*.fatherOrHusbandName - - - jsonPath: $.WaterConnection.plumberInfo.*.correspondenceAddress - - - jsonPath: $.WaterConnection.plumberInfo.*.relationship - - - jsonPath: $.WaterConnection.plumberInfo.*.auditDetails.createdBy - - - jsonPath: $.WaterConnection.plumberInfo.*.auditDetails.lastModifiedBy - - - jsonPath: $.WaterConnection.plumberInfo.*.auditDetails.createdTime - - - jsonPath: $.WaterConnection.plumberInfo.*.auditDetails.lastModifiedTime - - - jsonPath: $.WaterConnection.id - - - jsonPath: $.WaterConnection.plumberInfo.*.name - - - jsonPath: $.WaterConnection.plumberInfo.*.licenseNo - - - jsonPath: $.WaterConnection.plumberInfo.*.mobileNumber - - - jsonPath: $.WaterConnection.plumberInfo.*.gender - - - jsonPath: $.WaterConnection.plumberInfo.*.fatherOrHusbandName - - - jsonPath: $.WaterConnection.plumberInfo.*.correspondenceAddress - - - jsonPath: $.WaterConnection.plumberInfo.*.relationship - - - jsonPath: $.WaterConnection.plumberInfo.*.auditDetails.lastModifiedBy - - - jsonPath: $.WaterConnection.plumberInfo.*.auditDetails.lastModifiedTime - - - query: INSERT INTO eg_ws_connectionholder(tenantid, connectionid, userid, status, isprimaryholder, connectionholdertype, holdershippercentage, relationship, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (connectionid) DO UPDATE SET tenantid =?, userid =?,status =?, isprimaryholder =?, connectionholdertype =?, holdershippercentage =?, relationship=?, lastmodifiedby =?, lastmodifiedtime =?; - basePath: $.WaterConnection.connectionHolders.* - jsonMaps: - - - jsonPath: $.WaterConnection.tenantId - - - jsonPath: $.WaterConnection.id - - - jsonPath: $.WaterConnection.connectionHolders.*.uuid - - - jsonPath: $.WaterConnection.connectionHolders.*.status - - - jsonPath: $.WaterConnection.connectionHolders.*.isPrimaryOwner - - - jsonPath: $.WaterConnection.connectionHolders.*.ownerType - - - jsonPath: $.WaterConnection.connectionHolders.*.ownerShipPercentage - - - jsonPath: $.WaterConnection.connectionHolders.*.relationship - - - jsonPath: $.WaterConnection.auditDetails.createdBy - - - jsonPath: $.WaterConnection.auditDetails.createdTime - - - jsonPath: $.WaterConnection.auditDetails.lastModifiedBy - - - jsonPath: $.WaterConnection.auditDetails.lastModifiedTime - - - jsonPath: $.WaterConnection.tenantId - - - jsonPath: $.WaterConnection.connectionHolders.*.uuid - - - jsonPath: $.WaterConnection.connectionHolders.*.status - - - jsonPath: $.WaterConnection.connectionHolders.*.isPrimaryOwner - - - jsonPath: $.WaterConnection.connectionHolders.*.ownerType - - - jsonPath: $.WaterConnection.connectionHolders.*.ownerShipPercentage - - - jsonPath: $.WaterConnection.connectionHolders.*.relationship - - - jsonPath: $.WaterConnection.auditDetails.lastModifiedBy - - - jsonPath: $.WaterConnection.auditDetails.lastModifiedTime - - - query: INSERT INTO eg_ws_roadcuttinginfo(id, tenantId, wsid, active, roadtype, roadcuttingarea, createdBy, lastModifiedBy, createdTime, lastModifiedTime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET active = ?, roadtype =?, roadcuttingarea =?,lastmodifiedby =?, lastmodifiedtime =?; - basePath: $.WaterConnection.roadCuttingInfo.* - jsonMaps: - - - jsonPath: $.WaterConnection.roadCuttingInfo.*.id - - - jsonPath: $.WaterConnection.tenantId - - - jsonPath: $.WaterConnection.id - - - jsonPath: $.WaterConnection.roadCuttingInfo.*.status - - - jsonPath: $.WaterConnection.roadCuttingInfo.*.roadType - - - jsonPath: $.WaterConnection.roadCuttingInfo.*.roadCuttingArea - - - jsonPath: $.WaterConnection.roadCuttingInfo.*.auditDetails.createdBy - - - jsonPath: $.WaterConnection.roadCuttingInfo.*.auditDetails.lastModifiedBy - - - jsonPath: $.WaterConnection.roadCuttingInfo.*.auditDetails.createdTime - - - jsonPath: $.WaterConnection.roadCuttingInfo.*.auditDetails.lastModifiedTime - - - jsonPath: $.WaterConnection.roadCuttingInfo.*.status - - - jsonPath: $.WaterConnection.roadCuttingInfo.*.roadType - - - jsonPath: $.WaterConnection.roadCuttingInfo.*.roadCuttingArea - - - jsonPath: $.WaterConnection.roadCuttingInfo.*.auditDetails.lastModifiedBy - - - jsonPath: $.WaterConnection.roadCuttingInfo.*.auditDetails.lastModifiedTime - - - version: 1.0 - name: WaterConnection - description: update ConnectionDetails in eg_ws_connection and eg_ws_service - fromTopic: update-ws-workflow - isTransaction: true - queryMaps: - - - query: INSERT INTO eg_ws_connection_audit SELECT * FROM eg_ws_connection WHERE id = ?; - basePath: $.WaterConnection - jsonMaps: - - jsonPath: $.WaterConnection.id - - - query: UPDATE eg_ws_connection SET applicationstatus=?, status=?, connectionno=?, action=?, lastModifiedBy=?, lastModifiedTime=? WHERE id=?; - basePath: $.WaterConnection - jsonMaps: - - - jsonPath: $.WaterConnection.applicationStatus - - - jsonPath: $.WaterConnection.status - - - jsonPath: $.WaterConnection.connectionNo - - - jsonPath: $.WaterConnection.processInstance.action - - - jsonPath: $.WaterConnection.auditDetails.lastModifiedBy - - - jsonPath: $.WaterConnection.auditDetails.lastModifiedTime - - - jsonPath: $.WaterConnection.id - - - version: 1.0 - name: WaterConnection - description: save filestore ids - fromTopic: save-ws-filestoreids - isTransaction: true - queryMaps: - - - query: INSERT INTO eg_ws_service_audit SELECT * FROM eg_ws_service WHERE connection_id = ?; - basePath: $.WaterConnection - jsonMaps: - - jsonPath: $.WaterConnection.id - - - query: UPDATE eg_ws_service SET estimationfileStoreId = ?, sanctionfileStoreId = ? WHERE connection_id=?; - basePath: $.WaterConnection - jsonMaps: - - - jsonPath: $.WaterConnection.additionalDetails.estimationFileStoreId - - - jsonPath: $.WaterConnection.additionalDetails.sanctionFileStoreId - - - jsonPath: $.WaterConnection.id \ No newline at end of file diff --git a/configs/egov-searcher/PTDemandBasedSearcher.yml b/configs/egov-searcher/PTDemandBasedSearcher.yml deleted file mode 100644 index 0930f192..00000000 --- a/configs/egov-searcher/PTDemandBasedSearcher.yml +++ /dev/null @@ -1,45 +0,0 @@ -SearchDefinitions: - moduleName: rainmaker-pt-demandbased - summary: Searcher configuration for demand based search - version: 1.0.0 - definitions: - - - name: searchAssessmentsToUpdate - query: - baseQuery: | - select row_to_json(data) from ( - WITH summary AS ( - SELECT ptdl.property, - ptdl.assessmentnumber, - ptdl.financialYear, - pt.tenantId, - address.locality, - ROW_NUMBER() OVER(PARTITION BY ptdl.property - ORDER BY ptdl.financialyear DESC,ptdl.createdtime DESC ) AS rk - FROM eg_pt_property_v2 pt INNER JOIN eg_pt_propertydetail_v2 ptdl ON pt.propertyid = ptdl.property INNER JOIN eg_pt_address_v2 address on address.property=pt.propertyid) - SELECT s.* - FROM summary s - WHERE s.rk = 1) data $where - groupBy: - orderBy: - searchParams: - condition: AND - params: - - name: data.locality - isMandatory: true - jsonPath: $.searchCriteria.locality - operator: = - - name: data.tenantid - isMandatory: true - jsonPath: $.searchCriteria.tenantId - operator: = - - name: data.financialYear - isMandatory: true - jsonPath: $.searchCriteria.financialYear - operator: NE - - - output: - jsonFormat: {"ResponseInfo": {}} - outJsonPath: $.DemandBasedAssessments - responseInfoPath: $.ResponseInfo diff --git a/configs/egov-searcher/bill-genie.yml b/configs/egov-searcher/bill-genie.yml deleted file mode 100644 index cffaccb7..00000000 --- a/configs/egov-searcher/bill-genie.yml +++ /dev/null @@ -1,345 +0,0 @@ -SearchDefinitions: - moduleName: bill-genie - summary: Search configs for bill-genie - version: 1.0.0 - definitions: - - name: billswithaddranduser - isCustomerRowMapEnabled: true - rowMapperKey: billsearch - query: - baseQuery: with bill_data as ( - - SELECT b.id AS b_id, b.mobilenumber, - b.tenantid AS b_tenantid, b.payername AS b_payername, - b.payeraddress AS b_payeraddress, b.payeremail AS b_payeremail, - b.isactive AS b_isactive, b.iscancelled AS b_iscancelled, - b.createdby AS b_createdby, b.status as b_status,b.filestoreid AS b_filestoreid, - b.createddate AS b_createddate, b.lastmodifiedby AS b_lastmodifiedby, - b.lastmodifieddate AS b_lastmodifieddate, bd.id AS bd_id, - bd.billid AS bd_billid, bd.tenantid AS bd_tenantid, - bd.businessservice AS bd_businessservice, bd.demandid, - bd.fromperiod, bd.toperiod, - bd.billno AS bd_billno, bd.billdate AS bd_billdate, - bd.consumercode AS bd_consumercode, bd.consumertype AS bd_consumertype, - bd.billdescription AS bd_billdescription, bd.displaymessage AS bd_displaymessage, - bd.minimumamount AS bd_minimumamount, bd.totalamount AS bd_totalamount, - bd.callbackforapportioning AS bd_callbackforapportioning, bd.expirydate AS bd_expirydate, - bd.partpaymentallowed AS bd_partpaymentallowed, bd.isadvanceallowed as bd_isadvanceallowed, - bd.collectionmodesnotallowed AS bd_collectionmodesnotallowed, bd.createddate as bd_createddate, - b.additionaldetails as b_additionaldetails, bd.additionaldetails as bd_additionaldetails, - ad.id AS ad_id, ad.tenantid AS ad_tenantid, - ad.billdetail AS ad_billdetail, ad.glcode AS ad_glcode, - ad.orderno AS ad_orderno, ad.accountdescription AS ad_accountdescription, - ad.amount AS ad_amount, ad.adjustedamount AS ad_adjustedamount, - ad.taxheadcode AS ad_taxheadcode, ad.demanddetailid, - ad.isactualdemand AS ad_isactualdemand, ad.purpose AS ad_purpose, - ad.additionaldetails as ad_additionaldetails, - ptadd.doorNo as ptadd_doorNo,ptadd.landmark as ptadd_landmark, - ptadd.city as ptadd_city, ptadd.pincode as ptadd_pincode, - ptadd.locality as ptadd_locality, ptown.userid as ptown_userid - - FROM egbs_bill_v1 b INNER JOIN egbs_billdetail_v1 bd ON b.id = bd.billid AND b.tenantid = bd.tenantid - INNER JOIN egbs_billaccountdetail_v1 ad ON bd.id = ad.billdetail AND bd.tenantid = ad.tenantid - LEFT OUTER JOIN eg_pt_property pt ON bd.consumercode = pt.propertyid - INNER JOIN eg_pt_address ptadd ON ptadd.propertyid = pt.id - INNER JOIN eg_pt_asmt_assessment ptdet ON ptdet.propertyid = pt.propertyid - INNER JOIN eg_pt_owner ptown ON pt.id = ptown.propertyid $where ) - - select * from bill_data inner join (select max(b_createddate) as maxcreateddate, bd_consumercode from bill_data group by bd_consumercode) as max ON max.maxcreateddate=b_createddate - searchParams: - condition: AND - params: - - name: b.tenantid - isMandatory: true - jsonPath: $.searchCriteria.tenantId - - name: bd.consumercode - isMandatory: false - jsonPath: $.searchCriteria.consumerCode - operator: ILIKE - - name: bd.businessservice - isMandatory: false - jsonPath: $.searchCriteria.businesService - - name: b.mobilenumber - isMandatory: false - jsonPath: $.searchCriteria.mobileNumber - - name: bd.billno - isMandatory: false - operator: ILIKE - jsonPath: $.searchCriteria.billNo - - name: ptadd.locality - isMandatory: false - jsonPath: $.searchCriteria.locality - - name: ptdet.financialyear - isMandatory: false - jsonPath: $.searchCriteria.financialYear - - name: fromperiod - isMandatory: false - jsonPath: $.searchCriteria.fromPeriod - operator: LE - - name: toperiod - isMandatory: false - jsonPath: $.searchCriteria.toPeriod - operator: GE - - name: b.status - isMandatory: false - jsonPath: $.searchCriteria.billActive - - output: - jsonFormat: {"ResponseInfo": {},"Bills": []} - outJsonPath: $.Bills - responseInfoPath: $.ResponseInfo - - - - name: waterbills - isCustomerRowMapEnabled: true - rowMapperKey: billsearch - query: - baseQuery: with bill_data as ( - SELECT conn.status as conn_status,conn.property_id as pid,conn.oldConnectionNo as oldpid,conn.additionaldetails as conn_add,b.id AS b_id, b.mobilenumber, - b.tenantid AS b_tenantid, b.payername AS b_payername, - b.payeraddress AS b_payeraddress, b.payeremail AS b_payeremail, - b.isactive AS b_isactive, b.iscancelled AS b_iscancelled, - b.createdby AS b_createdby, b.status as b_status, b.filestoreid AS b_filestoreid, - b.createddate AS b_createddate, b.lastmodifiedby AS b_lastmodifiedby, - b.lastmodifieddate AS b_lastmodifieddate, bd.id AS bd_id, - bd.billid AS bd_billid, bd.tenantid AS bd_tenantid, - bd.businessservice AS bd_businessservice, bd.demandid, - bd.fromperiod, bd.toperiod, - bd.billno AS bd_billno, bd.billdate AS bd_billdate, - bd.consumercode AS bd_consumercode, bd.consumertype AS bd_consumertype, - bd.billdescription AS bd_billdescription, bd.displaymessage AS bd_displaymessage, - bd.minimumamount AS bd_minimumamount, bd.totalamount AS bd_totalamount, - bd.callbackforapportioning AS bd_callbackforapportioning, bd.expirydate AS bd_expirydate, - bd.partpaymentallowed AS bd_partpaymentallowed, bd.isadvanceallowed as bd_isadvanceallowed, - bd.collectionmodesnotallowed AS bd_collectionmodesnotallowed, bd.createddate as bd_createddate, - b.additionaldetails as b_additionaldetails, bd.additionaldetails as bd_additionaldetails, - ad.id AS ad_id, ad.tenantid AS ad_tenantid, - ad.billdetail AS ad_billdetail, ad.glcode AS ad_glcode, - ad.orderno AS ad_orderno, ad.accountdescription AS ad_accountdescription, - ad.amount AS ad_amount, ad.adjustedamount AS ad_adjustedamount, - ad.taxheadcode AS ad_taxheadcode, ad.demanddetailid, - ad.isactualdemand AS ad_isactualdemand, ad.purpose AS ad_purpose, - ad.additionaldetails as ad_additionaldetails, - ptadd.doorNo as ptadd_doorNo, ptadd.landmark as ptadd_landmark, - ptadd.city as ptadd_city, ptadd.pincode as ptadd_pincode, - ptadd.locality as ptadd_locality, ptown.userid as ptown_userid - - FROM egbs_bill_v1 b INNER JOIN egbs_billdetail_v1 bd ON b.id = bd.billid AND b.tenantid = bd.tenantid - INNER JOIN egbs_billaccountdetail_v1 ad ON bd.id = ad.billdetail AND bd.tenantid = ad.tenantid - INNER JOIN eg_ws_connection conn ON bd.consumercode = conn.connectionno - INNER JOIN eg_pt_property pt ON conn.property_id = pt.propertyid - INNER JOIN eg_pt_address ptadd ON ptadd.propertyid = pt.id - INNER JOIN eg_pt_owner ptown ON ptown.propertyid = pt.id $where ) - - select * from bill_data inner join (select max(b_createddate) as maxcreateddate, bd_consumercode from bill_data group by bd_consumercode) as max ON max.maxcreateddate=b_createddate - searchParams: - condition: AND - params: - - name: b.tenantid - isMandatory: true - jsonPath: $.searchCriteria.tenantId - - name: bd.consumercode - isMandatory: false - jsonPath: $.searchCriteria.consumerCode - operator: ILIKE - - name: bd.businessservice - isMandatory: false - jsonPath: $.searchCriteria.businesService - - name: b.mobilenumber - isMandatory: false - jsonPath: $.searchCriteria.mobileNumber - - name: bd.billno - isMandatory: false - operator: ILIKE - jsonPath: $.searchCriteria.billNo - - name: ptadd.locality - isMandatory: false - jsonPath: $.searchCriteria.locality - - name: fromperiod - isMandatory: false - jsonPath: $.searchCriteria.fromPeriod - operator: LE - - name: toperiod - isMandatory: false - jsonPath: $.searchCriteria.toPeriod - operator: GE - - name: b.status - isMandatory: false - jsonPath: $.searchCriteria.billActive - - name: conn.property_id - isMandatory: false - jsonPath: $.searchCriteria.propertyId - - - output: - jsonFormat: {"ResponseInfo": {},"Bills": []} - outJsonPath: $.Bills - responseInfoPath: $.ResponseInfo - - - - - - name: seweragebills - isCustomerRowMapEnabled: true - rowMapperKey: billsearch - query: - baseQuery: with bill_data as ( - SELECT conn.status as conn_status,conn.property_id as pid,conn.oldConnectionNo as oldpid,conn.additionaldetails as conn_add,b.id AS b_id, b.mobilenumber, - b.tenantid AS b_tenantid, b.payername AS b_payername, - b.payeraddress AS b_payeraddress, b.payeremail AS b_payeremail, - b.isactive AS b_isactive, b.iscancelled AS b_iscancelled, - b.createdby AS b_createdby, b.status as b_status, b.filestoreid AS b_filestoreid, - b.createddate AS b_createddate, b.lastmodifiedby AS b_lastmodifiedby, - b.lastmodifieddate AS b_lastmodifieddate, bd.id AS bd_id, - bd.billid AS bd_billid, bd.tenantid AS bd_tenantid, - bd.businessservice AS bd_businessservice, bd.demandid, - bd.fromperiod, bd.toperiod, - bd.billno AS bd_billno, bd.billdate AS bd_billdate, - bd.consumercode AS bd_consumercode, bd.consumertype AS bd_consumertype, - bd.billdescription AS bd_billdescription, bd.displaymessage AS bd_displaymessage, - bd.minimumamount AS bd_minimumamount, bd.totalamount AS bd_totalamount, - bd.callbackforapportioning AS bd_callbackforapportioning, bd.expirydate AS bd_expirydate, - bd.partpaymentallowed AS bd_partpaymentallowed, bd.isadvanceallowed as bd_isadvanceallowed, - bd.collectionmodesnotallowed AS bd_collectionmodesnotallowed, bd.createddate as bd_createddate, - b.additionaldetails as b_additionaldetails, bd.additionaldetails as bd_additionaldetails, - ad.id AS ad_id, ad.tenantid AS ad_tenantid, - ad.billdetail AS ad_billdetail, ad.glcode AS ad_glcode, - ad.orderno AS ad_orderno, ad.accountdescription AS ad_accountdescription, - ad.amount AS ad_amount, ad.adjustedamount AS ad_adjustedamount, - ad.taxheadcode AS ad_taxheadcode, ad.demanddetailid, - ad.isactualdemand AS ad_isactualdemand, ad.purpose AS ad_purpose, - ad.additionaldetails as ad_additionaldetails, - ptadd.doorNo as ptadd_doorNo, ptadd.landmark as ptadd_landmark, - ptadd.city as ptadd_city, ptadd.pincode as ptadd_pincode, - ptadd.locality as ptadd_locality, ptown.userid as ptown_userid - - FROM egbs_bill_v1 b INNER JOIN egbs_billdetail_v1 bd ON b.id = bd.billid AND b.tenantid = bd.tenantid - INNER JOIN egbs_billaccountdetail_v1 ad ON bd.id = ad.billdetail AND bd.tenantid = ad.tenantid - INNER JOIN eg_sw_connection conn ON bd.consumercode = conn.connectionno - INNER JOIN eg_pt_property pt ON conn.property_id = pt.propertyid - INNER JOIN eg_pt_address ptadd ON ptadd.propertyid = pt.id - INNER JOIN eg_pt_owner ptown ON ptown.propertyid = pt.id $where ) - - select * from bill_data inner join (select max(b_createddate) as maxcreateddate, bd_consumercode from bill_data group by bd_consumercode) as max ON max.maxcreateddate=b_createddate - searchParams: - condition: AND - params: - - name: b.tenantid - isMandatory: true - jsonPath: $.searchCriteria.tenantId - - name: bd.consumercode - isMandatory: false - jsonPath: $.searchCriteria.consumerCode - operator: ILIKE - - name: bd.businessservice - isMandatory: false - jsonPath: $.searchCriteria.businesService - - name: b.mobilenumber - isMandatory: false - jsonPath: $.searchCriteria.mobileNumber - - name: bd.billno - isMandatory: false - operator: ILIKE - jsonPath: $.searchCriteria.billNo - - name: ptadd.locality - isMandatory: false - jsonPath: $.searchCriteria.locality - - name: fromperiod - isMandatory: false - jsonPath: $.searchCriteria.fromPeriod - operator: LE - - name: toperiod - isMandatory: false - jsonPath: $.searchCriteria.toPeriod - operator: GE - - name: b.status - isMandatory: false - jsonPath: $.searchCriteria.billActive - - name: conn.property_id - isMandatory: false - jsonPath: $.searchCriteria.propertyId - - output: - jsonFormat: {"ResponseInfo": {},"Bills": []} - outJsonPath: $.Bills - responseInfoPath: $.ResponseInfo - - - name: mcollectbills - isCustomerRowMapEnabled: true - rowMapperKey: billsearch - query: - baseQuery: with bill_data as ( - SELECT b.id AS b_id, b.mobilenumber, - b.tenantid AS b_tenantid, b.payername AS b_payername, - b.payeraddress AS b_payeraddress, b.payeremail AS b_payeremail, - b.isactive AS b_isactive, b.iscancelled AS b_iscancelled, - b.createdby AS b_createdby, b.status as b_status, b.filestoreid AS b_filestoreid, - b.createddate AS b_createddate, b.lastmodifiedby AS b_lastmodifiedby, - b.lastmodifieddate AS b_lastmodifieddate, bd.id AS bd_id, - bd.billid AS bd_billid, bd.tenantid AS bd_tenantid, - bd.businessservice AS bd_businessservice, bd.demandid, - bd.fromperiod, bd.toperiod, - bd.billno AS bd_billno, bd.billdate AS bd_billdate, - bd.consumercode AS bd_consumercode, bd.consumertype AS bd_consumertype, - bd.billdescription AS bd_billdescription, bd.displaymessage AS bd_displaymessage, - bd.minimumamount AS bd_minimumamount, bd.totalamount AS bd_totalamount, - bd.callbackforapportioning AS bd_callbackforapportioning, bd.expirydate AS bd_expirydate, - bd.partpaymentallowed AS bd_partpaymentallowed, bd.isadvanceallowed as bd_isadvanceallowed, - bd.collectionmodesnotallowed AS bd_collectionmodesnotallowed, bd.createddate as bd_createddate, - b.additionaldetails as b_additionaldetails, bd.additionaldetails as bd_additionaldetails, - ad.id AS ad_id, ad.tenantid AS ad_tenantid, - ad.billdetail AS ad_billdetail, ad.glcode AS ad_glcode, - ad.orderno AS ad_orderno, ad.accountdescription AS ad_accountdescription, - ad.amount AS ad_amount, ad.adjustedamount AS ad_adjustedamount, - ad.taxheadcode AS ad_taxheadcode, ad.demanddetailid, - ad.isactualdemand AS ad_isactualdemand, ad.purpose AS ad_purpose, - ad.additionaldetails as ad_additionaldetails, - challanadd.doorNo as ptadd_doorNo, challanadd.landmark as ptadd_landmark, - challanadd.city as ptadd_city, challanadd.pincode as ptadd_pincode, - challanadd.locality as ptadd_locality, challan.accountid as ptown_userid , challan.createdtime - - FROM egbs_bill_v1 b INNER JOIN egbs_billdetail_v1 bd ON b.id = bd.billid AND b.tenantid = bd.tenantid and bd.totalamount > 0 - INNER JOIN egbs_billaccountdetail_v1 ad ON bd.id = ad.billdetail AND bd.tenantid = ad.tenantid - INNER JOIN eg_echallan challan ON bd.consumercode = challan.challanno AND b.status!='CANCELLED' - INNER JOIN eg_challan_address challanadd ON challanadd.eChallanId = challan.id $where ) - - select * from bill_data inner join (select max(b_createddate) as maxcreateddate, bd_consumercode from bill_data group by bd_consumercode) as max ON max.maxcreateddate=b_createddate - searchParams: - condition: AND - params: - - name: b.tenantid - isMandatory: true - jsonPath: $.searchCriteria.tenantId - - name: bd.consumercode - isMandatory: false - jsonPath: $.searchCriteria.consumerCode - operator: ILIKE - - name: bd.businessservice - isMandatory: false - jsonPath: $.searchCriteria.businesService - - name: b.mobilenumber - isMandatory: false - jsonPath: $.searchCriteria.mobileNumber - - name: bd.billno - isMandatory: false - operator: ILIKE - jsonPath: $.searchCriteria.billNo - - name: challanadd.locality - isMandatory: false - jsonPath: $.searchCriteria.locality - - name: fromperiod - isMandatory: false - jsonPath: $.searchCriteria.fromPeriod - operator: LE - - name: toperiod - isMandatory: false - jsonPath: $.searchCriteria.toPeriod - operator: GE - - name: b.status - isMandatory: false - jsonPath: $.searchCriteria.billActive - - output: - jsonFormat: {"ResponseInfo": {},"Bills": []} - outJsonPath: $.Bills - responseInfoPath: $.ResponseInfo diff --git a/configs/egov-searcher/localitySearcher.yml b/configs/egov-searcher/localitySearcher.yml deleted file mode 100644 index e14bc752..00000000 --- a/configs/egov-searcher/localitySearcher.yml +++ /dev/null @@ -1,194 +0,0 @@ -SearchDefinitions: - moduleName: locality - summary: Searcher configuration for searching locality in workflow inbox - version: 1.0.0 - definitions: - - - name: tl-services - query: - baseQuery: | - Select row_to_json(result) from - ( - select applicationNumber as referenceNumber,locality from eg_tl_tradelicense tl - INNER JOIN eg_tl_TradeLicenseDetail tld ON tld.tradelicenseId = tl.id - INNER JOIN eg_tl_address ad ON ad.tradeLicenseDetailId = tld.id - ) result $where - groupBy: - orderBy: - searchParams: - condition: AND - params: - - name: result.referenceNumber - isMandatory: true - jsonPath: $.searchCriteria.referenceNumber - operator: - - output: - jsonFormat: {"ResponseInfo": {}} - outJsonPath: $.Localities - responseInfoPath: $.ResponseInfo - - - name: fireNoc - query: - baseQuery: | - Select row_to_json(result) from - ( - select fnd.applicationnumber as referenceNumber,locality from eg_fn_firenoc fn - INNER JOIN eg_fn_firenocDetail fnd ON fnd.firenocuuid = fn.uuid - INNER JOIN eg_fn_address ad ON ad.firenocdetailsuuid = fnd.uuid - ) result $where - groupBy: - orderBy: - searchParams: - condition: AND - params: - - name: result.referenceNumber - isMandatory: true - jsonPath: $.searchCriteria.referenceNumber - operator: - - output: - jsonFormat: {"ResponseInfo": {}} - outJsonPath: $.Localities - responseInfoPath: $.ResponseInfo - - - - name: BPAREG - query: - baseQuery: | - Select row_to_json(result) from - ( - select applicationNumber as referenceNumber,locality from eg_tl_tradelicense tl - INNER JOIN eg_tl_TradeLicenseDetail tld ON tld.tradelicenseId = tl.id - INNER JOIN eg_tl_address ad ON ad.tradeLicenseDetailId = tld.id - ) result $where - groupBy: - orderBy: - searchParams: - condition: AND - params: - - name: result.referenceNumber - isMandatory: true - jsonPath: $.searchCriteria.referenceNumber - operator: - - output: - jsonFormat: {"ResponseInfo": {}} - outJsonPath: $.Localities - responseInfoPath: $.ResponseInfo - - - name: bpa-services - query: - baseQuery: | - Select row_to_json(result) from - ( - select applicationNo as referenceNumber,locality from eg_bpa_buildingplan bpa - INNER JOIN eg_land_Address ad ON ad.landInfoId = bpa.landid - ) result $where - groupBy: - orderBy: - searchParams: - condition: AND - params: - - name: result.referenceNumber - isMandatory: true - jsonPath: $.searchCriteria.referenceNumber - operator: - - output: - jsonFormat: {"ResponseInfo": {}} - outJsonPath: $.Localities - responseInfoPath: $.ResponseInfo - - - name: pt-services - query: - baseQuery: | - Select row_to_json(result) from - ( - select property.propertyid as referenceNumber,locality from eg_pt_property property - INNER JOIN eg_pt_address ptadd ON ptadd.propertyid = property.id - ) result $where - groupBy: - orderBy: - searchParams: - condition: AND - params: - - name: result.referenceNumber - isMandatory: true - jsonPath: $.searchCriteria.referenceNumber - operator: - - output: - jsonFormat: {"ResponseInfo": {}} - outJsonPath: $.Localities - responseInfoPath: $.ResponseInfo - - - name: PT - query: - baseQuery: | - Select row_to_json(result) from - ( - select property.acknowldgementnumber as referenceNumber,locality from eg_pt_property property - INNER JOIN eg_pt_address ptadd ON ptadd.propertyid = property.id - ) result $where - groupBy: - orderBy: - searchParams: - condition: AND - params: - - name: result.referenceNumber - isMandatory: true - jsonPath: $.searchCriteria.referenceNumber - operator: - - output: - jsonFormat: {"ResponseInfo": {}} - outJsonPath: $.Localities - responseInfoPath: $.ResponseInfo - - - name: ws-services - query: - baseQuery: | - Select row_to_json(result) from - ( - select applicationno as referenceNumber,conn.locality from eg_ws_connection conn - INNER JOIN eg_pt_property property ON property.propertyid = conn.property_id - INNER JOIN eg_pt_address ptadd ON ptadd.propertyid = property.id - ) result $where - groupBy: - orderBy: - searchParams: - condition: AND - params: - - name: result.referenceNumber - isMandatory: true - jsonPath: $.searchCriteria.referenceNumber - operator: - - output: - jsonFormat: {"ResponseInfo": {}} - outJsonPath: $.Localities - responseInfoPath: $.ResponseInfo - - name: sw-services - query: - baseQuery: | - Select row_to_json(result) from - ( - select applicationno as referenceNumber,conn.locality from eg_sw_connection conn - INNER JOIN eg_pt_property property ON property.propertyid = conn.property_id - INNER JOIN eg_pt_address ptadd ON ptadd.propertyid = property.id - ) result $where - groupBy: - orderBy: - searchParams: - condition: AND - params: - - name: result.referenceNumber - isMandatory: true - jsonPath: $.searchCriteria.referenceNumber - operator: - - output: - jsonFormat: {"ResponseInfo": {}} - outJsonPath: $.Localities - responseInfoPath: $.ResponseInfo diff --git a/configs/egov-searcher/propertyopensearch.yml b/configs/egov-searcher/propertyopensearch.yml deleted file mode 100644 index 84fed5ac..00000000 --- a/configs/egov-searcher/propertyopensearch.yml +++ /dev/null @@ -1,42 +0,0 @@ -SearchDefinitions: - moduleName: property-services - summary: Property Services Open API - version: 1.0.0 - definitions: - - name: propertyopensearch - query: - baseQuery: Select row_to_json(result) from - ( - select property.tenantid, property.propertyid, surveyid, oldpropertyid, property.createdtime, locality, owner.userid as owneruuid from eg_pt_property as property - INNER JOIN eg_pt_address ptadd ON ptadd.propertyid = property.id - INNER JOIN eg_pt_owner owner ON owner.propertyid=property.id $where - ) result - groupBy: - orderBy: createdtime,desc - searchParams: - condition: AND - params: - - name: property.tenantid - isMandatory: true - jsonPath: $.searchCriteria.tenantId - - name: property.propertyId - isMandatory: false - jsonPath: $.searchCriteria.propertyId - - name: property.surveyId - isMandatory: false - jsonPath: $.searchCriteria.surveyId - - name: property.oldPropertyId - isMandatory: false - jsonPath: $.searchCriteria.oldPropertyId - - name: ptadd.doorNo - isMandatory: false - jsonPath: $.searchCriteria.doorNo - - name: ptadd.locality - isMandatory: true - jsonPath: $.searchCriteria.locality - - - output: - jsonFormat: {"ResponseInfo": {},"Properties": []} - outJsonPath: $.Properties - responseInfoPath: $.ResponseInfo diff --git a/configs/egov-searcher/rainmaker-pgr-v2-searcher.yml b/configs/egov-searcher/rainmaker-pgr-v2-searcher.yml deleted file mode 100644 index 5614e17f..00000000 --- a/configs/egov-searcher/rainmaker-pgr-v2-searcher.yml +++ /dev/null @@ -1,263 +0,0 @@ -SearchDefinitions: - moduleName: rainmaker-pgr-V2 - summary: PGR resolver for Rainmaker - version: 1.0.0 - definitions: - - name: serviceSearchWithDetails - query: - baseQuery: select array_to_json(array_agg(row_to_json(serviceRequests))) from (select (select (select (row_to_json(services)) from ( select *, (select (select row_to_json(auditDetails) from (select createdtime, lastmodifiedtime, createdby, lastmodifiedby from eg_pgr_service where svc.serviceRequestId=eg_pgr_service.serviceRequestId) auditDetails) as auditDetails), (select (select (row_to_json(addressDetail)) from (select * from eg_pgr_address where eg_pgr_address.uuid=eg_pgr_service.addressid) addressDetail) as addressDetail) from eg_pgr_service svc where svc.serviceRequestId=eg_pgr_service.serviceRequestId order by createdtime desc) services) as services),(select (select array_to_json(array_agg(row_to_json(actionHistory))) from ( select * from eg_pgr_action where businessKey=eg_pgr_service.serviceRequestId order by "when" desc) actionHistory) as actionHistory) from eg_pgr_service $where order by createdtime desc $pagination) serviceRequests - groupBy: - orderBy: - searchParams: - condition: AND - params: - - name: tenantid - isMandatory: true - jsonPath: $.searchCriteria.tenantId - operator: LIKE - - name: servicerequestid - isMandatory: false - jsonPath: $.searchCriteria.serviceRequestId - operator: LIKE - - name: servicerequestid - isMandatory: false - jsonPath: $.searchCriteria.complaintId - operator: LIKE - - name: accountid - isMandatory: false - jsonPath: $.searchCriteria.accountId - - name: status - isMandatory: false - jsonPath: $.searchCriteria.status - - name: createdtime - isMandatory: false - operator: GE - jsonPath: $.searchCriteria.startDate - - name: createdtime - isMandatory: false - operator: LE - jsonPath: $.searchCriteria.endDate - - name: lastmodifiedtime - isMandatory: false - jsonPath: $.searchCriteria.lastUpdatedSince - - name: serviceCode - isMandatory: false - jsonPath: $.searchCriteria.serviceCodes - - name: phone - isMandatory: false - jsonPath: $.searchCriteria.phone - - name: createdby - isMandatory: false - jsonPath: $.searchCriteria.createdBy - - name: active - isMandatory: false - jsonPath: $.searchCriteria.active - pagination: - noOfRecords: $.searchCriteria.noOfRecords - offset: $.searchCriteria.offset - - output: - jsonFormat: {"ResponseInfo": {}} - outJsonPath: $.services - responseInfoPath: $.ResponseInfo - - - name: serviceSearchWithDetailsCitizen - query: - baseQuery: select array_to_json(array_agg(row_to_json(serviceRequests))) from (select (select (select (row_to_json(services)) from ( select *, (select (select row_to_json(auditDetails) from (select createdtime, lastmodifiedtime, createdby, lastmodifiedby from eg_pgr_service where svc.serviceRequestId=eg_pgr_service.serviceRequestId) auditDetails) as auditDetails), (select (select (row_to_json(addressDetail)) from (select * from eg_pgr_address where eg_pgr_address.uuid=eg_pgr_service.addressid) addressDetail) as addressDetail) from eg_pgr_service svc where svc.serviceRequestId=eg_pgr_service.serviceRequestId order by createdtime desc) services) as services),(select (select array_to_json(array_agg(row_to_json(actionHistory))) from ( select * from eg_pgr_action where businessKey=eg_pgr_service.serviceRequestId order by "when" desc) actionHistory) as actionHistory) from eg_pgr_service $where order by createdtime desc $pagination) serviceRequests - groupBy: - orderBy: - searchParams: - condition: AND - params: - - name: accountid - isMandatory: true - jsonPath: $.searchCriteria.accountId - operator: = - - name: tenantid - isMandatory: false - jsonPath: $.searchCriteria.tenantId - operator: LIKE - - name: servicerequestid - isMandatory: false - jsonPath: $.searchCriteria.serviceRequestId - - name: status - isMandatory: false - jsonPath: $.searchCriteria.status - - name: createdtime - isMandatory: false - operator: GE - jsonPath: $.searchCriteria.startDate - - name: createdtime - isMandatory: false - operator: LE - jsonPath: $.searchCriteria.endDate - - name: lastmodifiedtime - isMandatory: false - jsonPath: $.searchCriteria.lastUpdatedSince - - name: serviceCode - isMandatory: false - jsonPath: $.searchCriteria.serviceCodes - - name: phone - isMandatory: false - jsonPath: $.searchCriteria.phone - - name: createdby - isMandatory: false - jsonPath: $.searchCriteria.createdBy - - name: active - isMandatory: false - jsonPath: $.searchCriteria.active - pagination: - noOfRecords: $.searchCriteria.noOfRecords - offset: $.searchCriteria.offset - - output: - jsonFormat: {"ResponseInfo": {}} - outJsonPath: $.services - responseInfoPath: $.ResponseInfo - - - name: getServiceRequestsOnAssignedTo - #select array_to_json(array_agg(row_to_json(servicesRequestIds))) from (select businessKey from eg_pgr_action $where AND eg_pgr_action.when IN (select max("when") from eg_pgr_action where assignee NOTNULL group by businessKey)) servicesRequestIds baseQuery: | - query: - baseQuery: | - select - array_to_json(array_agg(row_to_json(servicesRequestIds))) - from - ( - select - businessKey - from - eg_pgr_action $where - - AND eg_pgr_action.when IN ( - select - max("when") - from - eg_pgr_action - $where - and assignee NOTNULL - group by - businessKey - ) - ) servicesRequestIds - groupBy: - orderBy: - searchParams: - condition: AND - params: - - name: tenantid - isMandatory: true - jsonPath: $.searchCriteria.tenantId - - name: assignee - isMandatory: true - jsonPath: $.searchCriteria.assignedTo - - output: - jsonFormat: {"ResponseInfo": {}} - outJsonPath: $.servicesRequestIds - responseInfoPath: $.ResponseInfo - - - - name: count - query: - baseQuery: select (row_to_json(services)) from ( select count(*) from eg_pgr_service $where) as services - groupBy: - orderBy: - searchParams: - condition: AND - params: - - name: tenantid - isMandatory: true - jsonPath: $.searchCriteria.tenantId - operator: LIKE - - name: servicerequestid - isMandatory: false - jsonPath: $.searchCriteria.serviceRequestId - operator: LIKE - - name: accountid - isMandatory: false - jsonPath: $.searchCriteria.accountId - - name: status - isMandatory: false - jsonPath: $.searchCriteria.status - - name: createdtime - isMandatory: false - operator: GE - jsonPath: $.searchCriteria.startDate - - name: createdtime - isMandatory: false - operator: LE - jsonPath: $.searchCriteria.endDate - - name: lastmodifiedtime - isMandatory: false - jsonPath: $.searchCriteria.lastUpdatedSince - - name: serviceCode - isMandatory: false - jsonPath: $.searchCriteria.serviceCodes - - name: phone - isMandatory: false - jsonPath: $.searchCriteria.phone - - name: active - isMandatory: false - jsonPath: $.searchCriteria.active - - output: - jsonFormat: {"ResponseInfo": {}} - outJsonPath: $.count - responseInfoPath: $.ResponseInfo - - - name: plainSearch - query: - baseQuery: SELECT Array_to_json(Array_agg(Row_to_json(servicerequests))) FROM (SELECT (SELECT (SELECT ( Row_to_json(services) )FROM (SELECT *, (SELECT (SELECT Row_to_json(auditdetails) FROM (SELECT createdtime FROM eg_pgr_service WHERE svc.servicerequestid = eg_pgr_service.servicerequestid) auditDetails) AS auditDetails), (SELECT (SELECT ( Row_to_json( addressdetail) ) FROM (SELECT * FROM eg_pgr_address WHERE eg_pgr_address.uuid = eg_pgr_service.addressid) addressDetail) AS addressDetail) FROM eg_pgr_service svc WHERE svc.servicerequestid = eg_pgr_service.servicerequestid ORDER BY createdtime DESC) services) AS services), (SELECT (SELECT Array_to_json(Array_agg(Row_to_json(actionhistory))) FROM (SELECT * FROM eg_pgr_action WHERE businesskey = eg_pgr_service.servicerequestid ORDER BY "when" DESC) actionHistory) AS actionHistory) FROM eg_pgr_service $where AND servicerequestid in (Select servicerequestid from eg_pgr_service ORDER BY createdtime ASC $pagination) ORDER BY createdtime ASC) serviceRequests; - groupBy: - orderBy: - searchParams: - condition: AND - params: - - name: tenantid - isMandatory: true - jsonPath: $.searchCriteria.tenantId - operator: LIKE - - name: servicerequestid - isMandatory: false - jsonPath: $.searchCriteria.serviceRequestId - - name: servicerequestid - isMandatory: false - jsonPath: $.searchCriteria.complaintId - operator: LIKE - - name: accountid - isMandatory: false - jsonPath: $.searchCriteria.accountId - - name: status - isMandatory: false - jsonPath: $.searchCriteria.status - - name: createdtime - isMandatory: false - operator: GE - jsonPath: $.searchCriteria.startDate - - name: createdtime - isMandatory: false - operator: LE - jsonPath: $.searchCriteria.endDate - - name: lastmodifiedtime - isMandatory: false - jsonPath: $.searchCriteria.lastUpdatedSince - - name: serviceCode - isMandatory: false - jsonPath: $.searchCriteria.serviceCodes - - name: phone - isMandatory: false - jsonPath: $.searchCriteria.phone - - name: createdby - isMandatory: false - jsonPath: $.searchCriteria.createdBy - - name: active - isMandatory: false - jsonPath: $.searchCriteria.active - pagination: - noOfRecords: $.searchCriteria.noOfRecords - offset: $.searchCriteria.offset - - output: - jsonFormat: {"ResponseInfo": {}} - outJsonPath: $.services - responseInfoPath: $.ResponseInfo diff --git a/configs/egov-searcher/rainmaker-pt-customsearch-punjab.yml b/configs/egov-searcher/rainmaker-pt-customsearch-punjab.yml deleted file mode 100644 index 93d41f2e..00000000 --- a/configs/egov-searcher/rainmaker-pt-customsearch-punjab.yml +++ /dev/null @@ -1,108 +0,0 @@ -SearchDefinitions: - moduleName: rainmaker-pt-customsearch-punjab - summary: Vasika number search for punjab - version: 1.0.0 - definitions: - - name: searchPropertyIDByVasikaNo - query: - baseQuery: | - select - array_to_json(array_agg(row_to_json(vasika_results))) - from (select propertyid from eg_pt_property_v2 - $where and - additionaldetails is not null and additionaldetails !='null' - ) vasika_results - groupBy: - orderBy: - searchParams: - condition: AND - params: - - name: tenantid - isMandatory: false - jsonPath: $.searchCriteria.tenantId - - name: additionaldetails->>'vasikaNo' - isMandatory: true - jsonPath: $.searchCriteria.vasikaNo - - name: propertyid - isMandatory: false - jsonPath: $.searchCriteria.propertyId - - output: - jsonFormat: {"ResponseInfo": {}} - outJsonPath: $.services - responseInfoPath: $.ResponseInfo - - name: searchLocalitiesUsedInRevenue - query: - baseQuery: | - select - array_to_json(array_agg(localities)) - from ( - select distinct locality from eg_tl_address $where - union - select distinct locality from eg_pt_address_v2 $where - ) as localities - groupBy: - orderBy: - searchParams: - condition: AND - params: - - name: tenantid - isMandatory: true - jsonPath: $.searchCriteria.tenantId - - output: - jsonFormat: {"ResponseInfo": {}} - outJsonPath: $.services - responseInfoPath: $.ResponseInfo - - name: searchLocalitiesUsedInAdmin - query: - baseQuery: | - select - array_to_json(array_agg(localities)) - from ( - select distinct eg_pgr_address.mohalla from eg_pgr_address $where - ) as localities - groupBy: - orderBy: - searchParams: - condition: AND - params: - - name: tenantid - isMandatory: true - jsonPath: $.searchCriteria.tenantId - - output: - jsonFormat: {"ResponseInfo": {}} - outJsonPath: $.services - responseInfoPath: $.ResponseInfo - - name: propertyidSearch - query: - baseQuery: | - select array_to_json(array_agg(row_to_json(data))) from ( - select - property as propertyid, - assessmentnumber, - receiptnumber, - amount, - pt_detail.financialyear - from eg_pt_propertydetail_v2 as pt_detail - left outer join egcl_receiptheader rh ON CONCAT(pt_detail.property, ':', pt_detail.assessmentnumber) = rh.consumercode - left outer JOIN egcl_receiptinstrument_v1 AS ri ON rh.id = ri.receiptheader - left outer JOIN egcl_instrumentheader_v1 AS ih ON ih.id = ri.instrumentheader $where) data - groupBy: - orderBy: - searchParams: - condition: AND - params: - - name: pt_detail.property - isMandatory: true - jsonPath: $.searchCriteria.propertyid - operator: = - - output: - jsonFormat: {"ResponseInfo": {}} - outJsonPath: $.data - responseInfoPath: $.ResponseInfo - - - diff --git a/configs/egov-searcher/rainmaker-pt-gissearch.yml b/configs/egov-searcher/rainmaker-pt-gissearch.yml deleted file mode 100644 index a524e7ff..00000000 --- a/configs/egov-searcher/rainmaker-pt-gissearch.yml +++ /dev/null @@ -1,151 +0,0 @@ -SearchDefinitions: - moduleName: rainmaker-pt-gissearch - summary: Searcher configuration for Adhoc Requirment - version: 1.0.0 - definitions: - - - name: searchNewTaxPayments - query: - baseQuery: | - select array_to_json(array_agg(row_to_json(data))) from ( - select - pt.propertyid as propertyid, - pt.oldpropertyid as oldpropertyid, - pd.receiptnumber as receiptnumber, - pt.tenantid as tenantid, - pd.receiptdate as receiptdate, - bn.blockname - from egcl_paymentdetail AS pd - INNER JOIN egcl_bill on pd.billid=egcl_bill.id - INNER JOIN eg_pt_property AS pt ON pt.propertyid = egcl_bill.consumercode AND pt.oldpropertyid IS NOT NULL - AND pt.oldpropertyid != '' - INNER JOIN eg_pt_address As ad ON ad.propertyid=pt.id and ad.lastmodifiedtime in (select max(lastmodifiedtime) from eg_pt_address where propertyid=pt.id) - INNER JOIN eg_bndry_mohalla As bn ON ad.locality=bn.localitycode and ad.tenantid=bn.tenantid $where) data - groupBy: - orderBy: - searchParams: - condition: AND - params: - - name: pd.receiptdate - isMandatory: false - jsonPath: $.searchCriteria.fromDate - operator: GE - - name: pd.receiptdate - isMandatory: false - jsonPath: $.searchCriteria.toDate - operator: LE - - name: pt.tenantid - isMandatory: true - jsonPath: $.searchCriteria.tenantId - operator: = - - name: bn.blockname - isMandatory: false - jsonPath: $.searchCriteria.blockcode - operator: = - - - output: - jsonFormat: {"ResponseInfo": {}} - outJsonPath: $.data - responseInfoPath: $.ResponseInfo - - - name: firenoc_billing_slab_search - query: - baseQuery: | - select array_to_json(array_agg(row_to_json(data))) from ( - SELECT * FROM eg_firenoc_state_billingslab - $where) data - groupBy: - orderBy: - searchParams: - condition: AND - params: - - name: heightfromuom - isMandatory: true - jsonPath: $.searchCriteria.height - operator: LE - - name: heighttouom - isMandatory: true - jsonPath: $.searchCriteria.height - operator: GE - - name: buildingusagetype - isMandatory: true - jsonPath: $.searchCriteria.usagetype - operator: = - - output: - jsonFormat: {"ResponseInfo": {}} - outJsonPath: $.data - responseInfoPath: $.ResponseInfo - - - - name: searchTLApplicationsEODB - query: - baseQuery: | - select array_to_json(array_agg(row_to_json(data))) from ( - select - tl.applicationnumber, - tld.additionalDetail::text, - tl.status,additionalDetail->>'IPIN' as iPin, - additionalDetail->>'APPID' as appId, - additionalDetail->>'mobileNo' as mobileNp - from eg_tl_tradelicense tl - inner join eg_tl_tradelicensedetail tld on tld.tradelicenseid=tl.id and tld.additionalDetail->>'CHANNEL'='EODB' ) data - groupBy: - orderBy: - searchParams: - condition: AND - params: - - - output: - jsonFormat: {"ResponseInfo": {}} - outJsonPath: $.data - responseInfoPath: $.ResponseInfo - - - - name: GetTenantConfig - query: - baseQuery: | - select array_to_json(array_agg(row_to_json(data))) from ( - select id,tenantid,locality,issurveyidmandatory - from eg_tenant_config - $where - ) data - groupBy: - orderBy: - searchParams: - condition: AND - params: - - name: tenantid - isMandatory: true - jsonPath: $.searchCriteria.tenantId - operator: = - - output: - jsonFormat: {"ResponseInfo": {}} - outJsonPath: $.data - responseInfoPath: $.ResponseInfo - - - name: GetAllowedRoles - query: - baseQuery: | - select array_to_json(array_agg(row_to_json(data))) from ( - select tenantid,allowedrole,active - from eg_hrms_role_control - $where - ) data - groupBy: - orderBy: - searchParams: - condition: AND - params: - - name: hrmsrole - isMandatory: true - jsonPath: $.searchCriteria.rolecode - operator: = - - output: - jsonFormat: {"ResponseInfo": {}} - outJsonPath: $.data - responseInfoPath: $.ResponseInfo diff --git a/configs/egov-searcher/rainmaker-tl.yml b/configs/egov-searcher/rainmaker-tl.yml deleted file mode 100644 index d5ac3adc..00000000 --- a/configs/egov-searcher/rainmaker-tl.yml +++ /dev/null @@ -1,26 +0,0 @@ -SearchDefinitions: - moduleName: tlservice-indexer - summary: Searcher for TradeLicense - version: 1.0.0 - definitions: - - name: serviceTradelicense - query: - baseQuery: select array_to_json(array_agg(row_to_json(result))) from ( select id,tenantid,licensetype,licensenumber,applicationnumber,oldlicensenumber,propertyid,oldpropertyid,accountid, tradename,applicationdate,commencementdate,issueddate,financialyear,validfrom,validto,action, null as assignee, null as wfdocuments,status, applicationdate,commencementdate, (select row_to_json(tltradelicensedetail) from (select id,surveyno,subownershipcategory,structuretype,operationalarea,noofemployees,adhocexemption, adhocpenalty,adhocexemptionreason,adhocpenaltyreason, (select array_to_json(array_agg(row_to_json(tlowner))) from (select isprimaryowner,ownershippercentage,ownertype, institutionid,(select array_to_json(array_agg(row_to_json(tlownerdoc))) from (select * from eg_tl_document_owner) tlownerdoc where tlownerdoc.userid = tlowner.id) documents,tlowner.active as useractive,relationship,urid id,uuid,username,password,salutation,name,(CASE gender WHEN 1 THEN 'FEMALE' WHEN 2 THEN 'MALE' ELSE 'OTHERS' END) AS gender,mobilenumber,emailid, altcontactnumber, pan, aadhaarnumber, permanentaddress, permanentcity, permanentpincode, correspondencecity, correspondencepincode, correspondenceaddress, u.active, TRUNC(EXTRACT(EPOCH FROM dob::timestamp AT time zone 'Asia/Kolkata'))*1000 dob, TRUNC(EXTRACT(EPOCH FROM pwdexpirydate::timestamp AT time zone 'Asia/Kolkata'))*1000 pwdexpirydate, locale,utype as type,signature,accountlocked,Roles,guardian as fatherorhusbandname, (CASE bloodgroup WHEN '' THEN null ELSE bloodgroup END) bloodgroup, identificationmark,photo, (CASE WHEN ucreatedby is null THEN 0 ELSE ucreatedby END)::text createdby, TRUNC(EXTRACT(EPOCH FROM ucreateddate::timestamp AT time zone 'Asia/Kolkata'))*1000 createddate, (CASE WHEN ulastmodifiedby is null THEN 0 ELSE ulastmodifiedby END)::text lastmodifiedby, TRUNC(EXTRACT(EPOCH FROM ulastmodifieddate::timestamp AT time zone 'Asia/Kolkata'))*1000 lastmodifieddate, null as otpreference,utenantid tenantid from eg_tl_owner tlowner left join ( select *,users.id urid,users.type utype, users.createdby ucreatedby, users.createddate ucreateddate, users.lastmodifiedby ulastmodifiedby, users.lastmodifieddate ulastmodifieddate, users.tenantid utenantid, addr1.address as permanentaddress, addr1.city as permanentcity, addr1.pincode as permanentpincode, addr2.address as correspondenceaddress, addr2.city as correspondencecity, addr2.pincode as correspondencepincode,(select array_to_json(array_agg(row_to_json(rolejson))) from (select null as id,role_code code from eg_userrole_v1 roles where roles.user_id=users.id) rolejson) Roles from eg_user users left outer join eg_user_address addr1 ON users.id = addr1.userid and addr1.type='PERMANENT' left outer join eg_user_address addr2 ON users.id = addr2.userid and addr2.type='CORRESPONDANCE') u on tlowner.id=u.uuid where tradelicensedetailid = tld.id) tlowner ) owners, null as channel, (select row_to_json(tladdress) from (select id,tenantid,doorno,latitude,longitude, addressid,addressnumber,type,addressline1,addressline2,landmark,city,pincode,detail,buildingname,street, (select row_to_json(loc) from (select locality as code from eg_tl_address addr where addr.tradelicensedetailid = tld.id) loc) locality from eg_tl_address addr where addr.tradelicensedetailid = tld.id) tladdress) address, (select array_to_json(array_agg(row_to_json(tlunit))) from (select id,tenantid,active,tradetype,uom,uomvalue, null as auditdetails from eg_tl_tradeunit trunit where trunit.tradelicensedetailid = tld.id) tlunit ) tradeunits, (select array_to_json(array_agg(row_to_json(tlacc))) from (select id,tenantid,active,accessorycategory, uom,uomvalue,null as count,null as auditdetails from eg_tl_accessory where tradelicensedetailid = tld.id) tlacc ) accessories, (select array_to_json(array_agg(row_to_json(tlapldoc))) from (select id,active,tenantid,documenttype,filestoreid, null as documentuid, null as auditdetails from eg_tl_applicationdocument where tradelicensedetailid = tld.id) tlapldoc ) applicationdocuments, (select array_to_json(array_agg(row_to_json(tlverdoc))) from (select * from eg_tl_verificationdocument) tlverdoc where tlverdoc.tradelicensedetailid = tld.id) verificationdocuments, additionaldetail, (select array_to_json(array_agg(row_to_json(tlinsti))) from (select * from eg_tl_institution) tlinsti where tlinsti.tradelicensedetailid = tld.id) institution, (select row_to_json(audit) from (select tld.createdBy,tld.lastModifiedBy,tld.createdTime,tld.createdTime as lastModifiedTime) as audit) as auditdetails from eg_tl_tradelicensedetail tld where tld.tradelicenseid=tl.id) tltradelicensedetail ) tradelicensedetail, null as calculation, (select row_to_json(audit) from (select tl.createdBy,tl.lastModifiedBy,tl.createdTime,tl.lastModifiedTime) as audit) as auditdetails,null as comment from eg_tl_tradelicense tl $where AND tl.id in (select id from eg_tl_tradelicense order by createdtime ASC $pagination)) result - groupBy: - orderBy: - searchParams: - condition: AND - params: - - name: tenantid - isMandatory: true - jsonPath: $.searchCriteria.tenantId - operator: LIKE - pagination: - noOfRecords: $.searchCriteria.noOfRecords - offset: $.searchCriteria.offset - - output: - jsonFormat: {"ResponseInfo": {}} - outJsonPath: $.Licenses - responseInfoPath: $.ResponseInfo - diff --git a/configs/egov-searcher/sewerageopensearch.yml b/configs/egov-searcher/sewerageopensearch.yml deleted file mode 100644 index 4644baeb..00000000 --- a/configs/egov-searcher/sewerageopensearch.yml +++ /dev/null @@ -1,41 +0,0 @@ -SearchDefinitions: - moduleName: sewerage-services - summary: Sewerage Services Open API - version: 1.0.0 - definitions: - - name: sewerageopensearch - query: - baseQuery: Select row_to_json(result) from - ( - select sewerage.applicationtype, sewerage.applicationno, sewerage.connectionno, sewerage.locality, sewerage.createdtime, sewerage.applicationstatus, sewerage.status, sewerage.property_id from eg_sw_connection as sewerage - INNER JOIN eg_pt_property pt ON pt.propertyid = sewerage.property_id $where - ) result - groupBy: - orderBy: - searchParams: - condition: AND - params: - - name: sewerage.tenantid - isMandatory: true - jsonPath: $.searchCriteria.tenantId - - name: pt.propertyid - isMandatory: false - jsonPath: $.searchCriteria.propertyId - - name: sewerage.applicationno - isMandatory: false - jsonPath: $.searchCriteria.applicationno - - name: sewerage.connectionno - isMandatory: false - jsonPath: $.searchCriteria.connectionno - - name: sewerage.property_id - isMandatory: false - jsonPath: $.searchCriteria.uuid - - name: sewerage.locality - isMandatory: true - jsonPath: $.searchCriteria.locality - - - output: - jsonFormat: {"ResponseInfo": {},"SewerageConnections": []} - outJsonPath: $.SewerageConnections - responseInfoPath: $.ResponseInfo diff --git a/configs/egov-searcher/wateropensearch.yml b/configs/egov-searcher/wateropensearch.yml deleted file mode 100644 index 44c90862..00000000 --- a/configs/egov-searcher/wateropensearch.yml +++ /dev/null @@ -1,41 +0,0 @@ -SearchDefinitions: - moduleName: water-services - summary: Water Services Open API - version: 1.0.0 - definitions: - - name: wateropensearch - query: - baseQuery: Select row_to_json(result) from - ( - select water.applicationtype, water.applicationno, water.connectionno, water.locality, water.createdtime, water.applicationstatus, water.status, water.property_id from eg_ws_connection as water - INNER JOIN eg_pt_property pt ON pt.propertyid = water.property_id $where - ) result - groupBy: - orderBy: - searchParams: - condition: AND - params: - - name: water.tenantid - isMandatory: true - jsonPath: $.searchCriteria.tenantId - - name: pt.propertyid - isMandatory: false - jsonPath: $.searchCriteria.propertyId - - name: water.applicationno - isMandatory: false - jsonPath: $.searchCriteria.applicationno - - name: water.connectionno - isMandatory: false - jsonPath: $.searchCriteria.connectionno - - name: water.property_id - isMandatory: false - jsonPath: $.searchCriteria.uuid - - name: water.locality - isMandatory: true - jsonPath: $.searchCriteria.locality - - - output: - jsonFormat: {"ResponseInfo": {},"WaterConnection": []} - outJsonPath: $.WaterConnection - responseInfoPath: $.ResponseInfo diff --git a/configs/egov-searcher/weekly-impact-emailer-searcher.yml b/configs/egov-searcher/weekly-impact-emailer-searcher.yml deleted file mode 100644 index 3d5b2045..00000000 --- a/configs/egov-searcher/weekly-impact-emailer-searcher.yml +++ /dev/null @@ -1,132 +0,0 @@ - SearchDefinitions: - moduleName: impactemailer - summary: Weekly impact emailer cron - version: 1.0.0 - definitions: - - name: stateWideData - query: - baseQuery: select array_to_json(array_agg(row_to_json(stateWideReports))) from ((SELECT (SELECT count(*) FROM ((SELECT DISTINCT tenantid FROM eg_pt_property WHERE (createdtime/1000) <= (extract(epoch from NOW())) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_tl_tradelicense WHERE (createdtime/1000) <= (extract(epoch from NOW())) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_pgr_service WHERE (createdtime/1000) <= (extract(epoch from NOW())) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_fn_firenoc WHERE (createdtime/1000) <= (extract(epoch from NOW())) AND tenantid != 'pb.testing')) AS tenants) as ulbCovered,(SELECT TRUNC((SELECT SUM(payment.totalamountpaid) FROM egcl_payment payment INNER JOIN egcl_paymentdetail paymentdetail ON payment.id = paymentdetail.paymentid INNER JOIN egcl_bill bill ON paymentdetail.billid =bill.id WHERE (paymentdetail.receiptdate/1000) <= (extract(epoch from NOW())) AND payment.tenantid != 'pb.testing' AND payment.paymentstatus != 'CANCELLED') / 10000000, 3)) as revenueCollected,(SELECT (SELECT count(*) FROM eg_pt_property WHERE (createdtime/1000) <= (extract(epoch from NOW())) AND tenantid != 'pb.testing') + (SELECT count(*) FROM eg_tl_tradelicense WHERE (createdtime/1000) <= (extract(epoch from NOW())) AND tenantid != 'pb.testing')+ (SELECT count(*) FROM eg_fn_firenoc WHERE (createdtime/1000) <= (extract(epoch from NOW())) AND tenantid != 'pb.testing')) as servicesApplied, (SELECT count(*) FROM eg_user WHERE (createddate <= NOW()) AND tenantid != 'pb.testing' AND type = 'CITIZEN') as noOfUsersRegistered, 'Week0' as day) UNION (SELECT (SELECT count(*) FROM ((SELECT DISTINCT tenantid FROM eg_pt_property WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_tl_tradelicense WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_fn_firenoc WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing')) AS tenants) as ulbCovered,(SELECT TRUNC((SELECT SUM(payment.totalamountpaid) FROM egcl_payment payment INNER JOIN egcl_paymentdetail paymentdetail ON payment.id = paymentdetail.paymentid INNER JOIN egcl_bill bill ON paymentdetail.billid =bill.id WHERE (paymentdetail.receiptdate/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND payment.tenantid != 'pb.testing' AND payment.paymentstatus != 'CANCELLED') / 10000000, 3)) as revenueCollected,(SELECT (SELECT count(*) FROM eg_pt_property WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing') + (SELECT count(*) FROM eg_tl_tradelicense WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing')+(SELECT count(*) FROM eg_fn_firenocdetail WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing')) as servicesApplied, (SELECT count(*) FROM eg_user WHERE createddate <= to_timestamp((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing' AND type = 'CITIZEN') as noOfUsersRegistered, 'Week1' as day) UNION (SELECT (SELECT count(*) FROM ((SELECT DISTINCT tenantid FROM eg_pt_property WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_tl_tradelicense WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_fn_firenocdetail WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing')) AS tenants) as ulbCovered,(SELECT TRUNC((SELECT SUM(payment.totalamountpaid) FROM egcl_payment payment INNER JOIN egcl_paymentdetail paymentdetail ON payment.id = paymentdetail.paymentid INNER JOIN egcl_bill bill ON paymentdetail.billid =bill.id WHERE (paymentdetail.receiptdate/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND payment.tenantid != 'pb.testing' AND payment.paymentstatus != 'CANCELLED') / 10000000, 3)) as revenueCollected,(SELECT (SELECT count(*) FROM eg_pt_property WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing') + (SELECT count(*) FROM eg_tl_tradelicense WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing')) as servicesApplied, (SELECT count(*) FROM eg_user WHERE createddate <= to_timestamp((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing' AND type = 'CITIZEN') as noOfUsersRegistered, 'Week2' as day) UNION (SELECT (SELECT count(*) FROM ((SELECT DISTINCT tenantid FROM eg_pt_property WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_tl_tradelicense WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing')) AS tenants) as ulbCovered,(SELECT TRUNC(((SELECT SUM(payment.totalamountpaid) FROM egcl_payment payment INNER JOIN egcl_paymentdetail paymentdetail ON payment.id = paymentdetail.paymentid INNER JOIN egcl_bill bill ON paymentdetail.billid =bill.id WHERE (paymentdetail.receiptdate/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND payment.tenantid != 'pb.testing' AND payment.paymentstatus != 'CANCELLED')) / 10000000, 3)) as revenueCollected,(SELECT (SELECT count(*) FROM eg_pt_property WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing') + (SELECT count(*) FROM eg_tl_tradelicense WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing')+(SELECT count(*) FROM eg_fn_firenocdetail WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing')) as servicesApplied, (SELECT count(*) FROM eg_user WHERE createddate <= to_timestamp((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing' AND type = 'CITIZEN') as noOfUsersRegistered, 'Week3' as day) UNION (SELECT (SELECT count(*) FROM ((SELECT DISTINCT tenantid FROM eg_pt_property WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_tl_tradelicense WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_fn_firenoc WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing')) AS tenants) as ulbCovered,(SELECT TRUNC((SELECT SUM(payment.totalamountpaid) FROM egcl_payment payment INNER JOIN egcl_paymentdetail paymentdetail ON payment.id = paymentdetail.paymentid INNER JOIN egcl_bill bill ON paymentdetail.billid =bill.id WHERE (paymentdetail.receiptdate/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND payment.tenantid != 'pb.testing' AND payment.paymentstatus != 'CANCELLED') / 10000000, 3)) as revenueCollected,(SELECT (SELECT count(*) FROM eg_pt_property WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing') + (SELECT count(*) FROM eg_tl_tradelicense WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing')+ (SELECT count(*) FROM eg_fn_firenocdetail WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing')) as servicesApplied, (SELECT count(*) FROM eg_user WHERE createddate <= to_timestamp((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing' AND type = 'CITIZEN') as noOfUsersRegistered, 'Week4' as day) UNION (SELECT (SELECT count(*) FROM ((SELECT DISTINCT tenantid FROM eg_pt_property WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_tl_tradelicense WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing')UNION (SELECT DISTINCT tenantid FROM eg_fn_firenocdetail WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing')) AS tenants) as ulbCovered,(SELECT TRUNC((SELECT SUM(payment.totalamountpaid) FROM egcl_payment payment INNER JOIN egcl_paymentdetail paymentdetail ON payment.id = paymentdetail.paymentid INNER JOIN egcl_bill bill ON paymentdetail.billid =bill.id WHERE (paymentdetail.receiptdate/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND payment.tenantid != 'pb.testing' AND payment.paymentstatus != 'CANCELLED')/ 10000000, 3)) as revenueCollected, (SELECT (SELECT count(*) FROM eg_pt_property WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing') + (SELECT count(*) FROM eg_tl_tradelicense WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing')+ (SELECT count(*) FROM eg_fn_firenocdetail WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing')) as servicesApplied, (SELECT count(*) FROM eg_user WHERE createddate <= to_timestamp((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing' AND type = 'CITIZEN') as noOfUsersRegistered, 'Week5' as day)) stateWideReports - searchParams: - condition: AND - params: - - name: intervalinsecs - isMandatory: true - jsonPath: $.searchCriteria.intervalinsecs - - output: - jsonFormat: {"ResponseInfo": {}} - outJsonPath: $.data - responseInfoPath: $.ResponseInfo - - - - - name: pgrData - query: - baseQuery: select array_to_json(array_agg(row_to_json(pgrReports))) from ((SELECT (SELECT count(DISTINCT tenantid) as ulbCovered FROM eg_pgr_service WHERE (createdtime/1000) <= (extract (epoch from NOW())) AND tenantid != 'pb.testing'), count(*) as totalComplaints, (SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= (extract (epoch from NOW())) AND tenantid != 'pb.testing') != 0) THEN CONCAT(((SELECT count(*) FROM eg_pgr_service WHERE status = 'closed' OR status = 'resolved' AND (createdtime/1000) <= (extract (epoch from NOW())) AND tenantid != 'pb.testing') * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= (extract (epoch from NOW())) AND tenantid != 'pb.testing')), '%') ELSE '0%' END) as redressal), 'Week0' as day FROM eg_pgr_service WHERE (createdtime/1000) <= (extract (epoch from NOW())) AND tenantid != 'pb.testing') UNION (SELECT (SELECT count(DISTINCT tenantid) as ulbCovered FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing'), count(*) as totalComplaints, (SELECT (CASE WHEN (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing') != 0 THEN CONCAT(((SELECT count(*) FROM eg_pgr_service WHERE status = 'closed' OR status = 'resolved' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing') * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing')), '%') ELSE '0%' END) as redressal), 'Week1' as day FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing') UNION (SELECT (SELECT count(DISTINCT tenantid) as ulbCovered FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing'), count(*) as totalComplaints, (SELECT (CASE WHEN (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing') != 0 THEN CONCAT(((SELECT count(*) FROM eg_pgr_service WHERE status = 'closed' OR status = 'resolved' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing') * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing')), '%') ELSE '0%' END) as redressal), 'Week2' as day FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing') UNION (SELECT (SELECT count(DISTINCT tenantid) as ulbCovered FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing'), count(*) as totalComplaints, (SELECT (CASE WHEN (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing') != 0 THEN CONCAT(((SELECT count(*) FROM eg_pgr_service WHERE status = 'closed' OR status = 'resolved' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing') * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing')), '%') ELSE '0%' END) as redressal), 'Week3' as day FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing') UNION (SELECT (SELECT count(DISTINCT tenantid) as ulbCovered FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing'), count(*) as totalComplaints, (SELECT (CASE WHEN (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing') != 0 THEN CONCAT(((SELECT count(*) FROM eg_pgr_service WHERE status = 'closed' OR status = 'resolved' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing') * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing')), '%') ELSE '0%' END) as redressal), 'Week4' as day FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing') UNION (SELECT (SELECT count(DISTINCT tenantid) as ulbCovered FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing'), count(*) as totalComplaints, (SELECT (CASE WHEN (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing') != 0 THEN CONCAT(((SELECT count(*) FROM eg_pgr_service WHERE status = 'closed' OR status = 'resolved' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing') * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing')), '%') ELSE '0%' END) as redressal), 'Week5' as day FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing')) pgrReports - searchParams: - condition: AND - params: - - name: intervalinsecs - isMandatory: true - jsonPath: $.searchCriteria.intervalinsecs - - output: - jsonFormat: {"ResponseInfo": {}} - outJsonPath: $.data - responseInfoPath: $.ResponseInfo - - - - name: pgrChannelData - query: - baseQuery: select array_to_json(array_agg(row_to_json(pgrChannel))) from ((SELECT (SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= (extract (epoch from NOW())) AND tenantid != 'pb.testing') != 0) THEN CONCAT(round(((SELECT count(*) FROM eg_pgr_service WHERE source = 'ivr' AND (createdtime/1000) <= (extract (epoch from NOW())) AND tenantid != 'pb.testing')::numeric * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= (extract (epoch from NOW())) AND tenantid != 'pb.testing'))::numeric, 2), '%') ELSE '0%' END) as ivr), (SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= (extract (epoch from NOW())) AND tenantid != 'pb.testing') != 0) THEN CONCAT(round(((SELECT count(*) FROM eg_pgr_service WHERE source = 'web' AND (createdtime/1000) <= (extract (epoch from NOW())) AND tenantid != 'pb.testing')::numeric * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= (extract (epoch from NOW())) AND tenantid != 'pb.testing'))::numeric, 2), '%') ELSE '0%' END) as webapp),(SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= (extract (epoch from NOW())) AND tenantid != 'pb.testing') != 0) THEN CONCAT(round(((SELECT count(*) FROM eg_pgr_service WHERE source = 'mobileapp' AND (createdtime/1000) <= (extract (epoch from NOW())) AND tenantid != 'pb.testing')::numeric * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= (extract (epoch from NOW())) AND tenantid != 'pb.testing'))::numeric, 2), '%') ELSE '0%' END) as mobileapp), (SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= (extract (epoch from NOW())) AND tenantid != 'pb.testing') != 0) THEN CONCAT(round(((SELECT count(*) FROM eg_pgr_service WHERE source = 'whatsapp' AND (createdtime/1000) <= (extract (epoch from NOW())) AND tenantid != 'pb.testing')::numeric * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= (extract (epoch from NOW())) AND tenantid != 'pb.testing'))::numeric, 2), '%') ELSE '0%' END) as whatsapp), 'Week0' as day FROM eg_pgr_service LIMIT 1) UNION (SELECT (SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing') != 0) THEN CONCAT(round(((SELECT count(*) FROM eg_pgr_service WHERE source = 'ivr' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing')::numeric * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing'))::numeric, 2), '%') ELSE '0%' END) as redressal), (SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing') != 0) THEN CONCAT(round(((SELECT count(*) FROM eg_pgr_service WHERE source = 'web' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing')::numeric * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing'))::numeric, 2), '%') ELSE '0%' END) as redressal),(SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing') != 0) THEN CONCAT(round(((SELECT count(*) FROM eg_pgr_service WHERE source = 'mobileapp' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing')::numeric * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing'))::numeric, 2), '%') ELSE '0%' END) as redressal), (SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing') != 0) THEN CONCAT(round(((SELECT count(*) FROM eg_pgr_service WHERE source = 'whatsapp' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing')::numeric * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing'))::numeric, 2), '%') ELSE '0%' END) as redressal), 'Week1' as day FROM eg_pgr_service LIMIT 1) UNION (SELECT (SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing') != 0) THEN CONCAT(round(((SELECT count(*) FROM eg_pgr_service WHERE source = 'ivr' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing')::numeric * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing'))::numeric, 2), '%') ELSE '0%' END) as redressal), (SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing') != 0) THEN CONCAT(round(((SELECT count(*) FROM eg_pgr_service WHERE source = 'web' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing')::numeric * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing'))::numeric, 2), '%') ELSE '0%' END) as redressal),(SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing') != 0) THEN CONCAT(round(((SELECT count(*) FROM eg_pgr_service WHERE source = 'mobileapp' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing')::numeric * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing'))::numeric, 2), '%') ELSE '0%' END) as redressal), (SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing') != 0) THEN CONCAT(round(((SELECT count(*) FROM eg_pgr_service WHERE source = 'whatsapp' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing')::numeric * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing'))::numeric, 2), '%') ELSE '0%' END) as redressal), 'Week2' as day FROM eg_pgr_service LIMIT 1) UNION (SELECT (SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing') != 0) THEN CONCAT(round(((SELECT count(*) FROM eg_pgr_service WHERE source = 'ivr' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing')::numeric * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing'))::numeric, 2), '%') ELSE '0%' END) as redressal), (SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing') != 0) THEN CONCAT(round(((SELECT count(*) FROM eg_pgr_service WHERE source = 'web' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing')::numeric * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing'))::numeric, 2), '%') ELSE '0%' END) as redressal), (SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing') != 0) THEN CONCAT(round(((SELECT count(*) FROM eg_pgr_service WHERE source = 'mobileapp' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing')::numeric * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing'))::numeric, 2), '%') ELSE '0%' END) as redressal), (SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing') != 0) THEN CONCAT(round(((SELECT count(*) FROM eg_pgr_service WHERE source = 'whatsapp' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing')::numeric * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing'))::numeric, 2), '%') ELSE '0%' END) as redressal), 'Week3' as day FROM eg_pgr_service LIMIT 1) UNION (SELECT (SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing') != 0) THEN CONCAT(round(((SELECT count(*) FROM eg_pgr_service WHERE source = 'ivr' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing')::numeric * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing'))::numeric, 2), '%') ELSE '0%' END) as redressal), (SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing') != 0) THEN CONCAT(round(((SELECT count(*) FROM eg_pgr_service WHERE source = 'web' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing')::numeric * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing'))::numeric, 2), '%') ELSE '0%' END) as redressal), (SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing') != 0) THEN CONCAT(round(((SELECT count(*) FROM eg_pgr_service WHERE source = 'mobileapp' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing')::numeric * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing'))::numeric, 2), '%') ELSE '0%' END) as redressal), (SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing') != 0) THEN CONCAT(round(((SELECT count(*) FROM eg_pgr_service WHERE source = 'whatsapp' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing')::numeric * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing'))::numeric, 2), '%') ELSE '0%' END) as redressal), 'Week4' as day FROM eg_pgr_service LIMIT 1) UNION (SELECT (SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing') != 0) THEN CONCAT(round(((SELECT count(*) FROM eg_pgr_service WHERE source = 'ivr' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing')::numeric * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing'))::numeric, 2), '%') ELSE '0%' END) as redressal), (SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing') != 0) THEN CONCAT(round(((SELECT count(*) FROM eg_pgr_service WHERE source = 'web' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing')::numeric * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing'))::numeric, 2), '%') ELSE '0%' END) as redressal), (SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing') != 0) THEN CONCAT(round(((SELECT count(*) FROM eg_pgr_service WHERE source = 'mobileapp' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing')::numeric * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing'))::numeric, 2), '%') ELSE '0%' END) as redressal), (SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing') != 0) THEN CONCAT(round(((SELECT count(*) FROM eg_pgr_service WHERE source = 'whatsapp' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing')::numeric * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing'))::numeric, 2), '%') ELSE '0%' END) as redressal), 'Week5' as day FROM eg_pgr_service LIMIT 1)) pgrChannel - searchParams: - condition: AND - params: - - name: intervalinsecs - isMandatory: true - jsonPath: $.searchCriteria.intervalinsecs - - output: - jsonFormat: {"ResponseInfo": {}} - outJsonPath: $.data - responseInfoPath: $.ResponseInfo - - - - - name: ptData - query: - baseQuery: select array_to_json(array_agg(row_to_json(ptReports))) from ((SELECT (SELECT count(DISTINCT tenantid) as ulbCovered FROM eg_pt_property WHERE (createdtime/1000) <= (extract (epoch from NOW())) AND tenantid != 'pb.testing'), TRUNC(SUM(payment.totalamountpaid) / 10000000, 3) as revenuecollected, CONCAT((count(DISTINCT pt.propertyid) / 1000), '.', MOD(count(DISTINCT pt.propertyid), 1000)) as noofpropertiescreated, 'Week0' as day FROM eg_pt_property pt INNER JOIN egcl_bill bill ON pt.propertyid = bill.consumercode INNER JOIN egcl_paymentdetail paymentdetail ON bill.id = paymentdetail.billid INNER JOIN egcl_payment payment ON paymentdetail.paymentid =payment.id WHERE (paymentdetail.receiptdate/1000) <= (extract(epoch from NOW())) AND pt.tenantid != 'pb.testing' AND payment.tenantid != 'pb.testing' AND payment.paymentstatus != 'CANCELLED') UNION (SELECT (SELECT count(DISTINCT tenantid) as ulbCovered FROM eg_pt_property WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing'), TRUNC(SUM(payment.totalamountpaid) / 10000000, 3) as revenuecollected, CONCAT((count(DISTINCT pt.propertyid) / 1000), '.', MOD(count(DISTINCT pt.propertyid), 1000)) as noofpropertiescreated, 'Week1' as day FROM eg_pt_property pt INNER JOIN egcl_bill bill ON pt.propertyid = bill.consumercode INNER JOIN egcl_paymentdetail paymentdetail ON bill.id = paymentdetail.billid INNER JOIN egcl_payment payment ON paymentdetail.paymentid =payment.id WHERE (paymentdetail.receiptdate/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND pt.tenantid != 'pb.testing' AND payment.paymentstatus != 'CANCELLED') UNION (SELECT (SELECT count(DISTINCT tenantid) as ulbCovered FROM eg_pt_property WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing'), TRUNC(SUM(payment.totalamountpaid) / 10000000, 3) as revenuecollected, CONCAT((count(DISTINCT pt.propertyid) / 1000), '.', MOD(count(DISTINCT pt.propertyid), 1000)) as noofpropertiescreated, 'Week2' as day FROM eg_pt_property pt INNER JOIN egcl_bill bill ON pt.propertyid = bill.consumercode INNER JOIN egcl_paymentdetail paymentdetail ON bill.id = paymentdetail.billid INNER JOIN egcl_payment payment ON paymentdetail.paymentid =payment.id WHERE (paymentdetail.receiptdate/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND pt.tenantid != 'pb.testing' AND payment.paymentstatus != 'CANCELLED') UNION (SELECT (SELECT count(DISTINCT tenantid) as ulbCovered FROM eg_pt_property WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing'), TRUNC(SUM(payment.totalamountpaid) / 10000000, 3) as revenuecollected, CONCAT((count(DISTINCT pt.propertyid) / 1000), '.', MOD(count(DISTINCT pt.propertyid), 1000)) as noofpropertiescreated, 'Week3' as day FROM eg_pt_property pt INNER JOIN egcl_bill bill ON pt.propertyid = bill.consumercode INNER JOIN egcl_paymentdetail paymentdetail ON bill.id = paymentdetail.billid INNER JOIN egcl_payment payment ON paymentdetail.paymentid =payment.id WHERE (paymentdetail.receiptdate/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND pt.tenantid != 'pb.testing' AND payment.paymentstatus != 'CANCELLED') UNION (SELECT (SELECT count(DISTINCT tenantid) as ulbCovered FROM eg_pt_property WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing'), TRUNC(SUM(payment.totalamountpaid) / 10000000, 3) as revenuecollected, CONCAT((count(DISTINCT pt.propertyid) / 1000), '.', MOD(count(DISTINCT pt.propertyid), 1000)) as noofpropertiescreated, 'Week4' as day FROM eg_pt_property pt INNER JOIN egcl_bill bill ON pt.propertyid = bill.consumercode INNER JOIN egcl_paymentdetail paymentdetail ON bill.id = paymentdetail.billid INNER JOIN egcl_payment payment ON paymentdetail.paymentid =payment.id WHERE (paymentdetail.receiptdate/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND pt.tenantid != 'pb.testing' AND payment.paymentstatus != 'CANCELLED') UNION (SELECT (SELECT count(DISTINCT tenantid) as ulbCovered FROM eg_pt_property WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing'), TRUNC(SUM(payment.totalamountpaid) / 10000000, 3) as revenuecollected, CONCAT((count(DISTINCT pt.propertyid) / 1000), '.', MOD(count(DISTINCT pt.propertyid), 1000)) as noofpropertiescreated, 'Week5' as day FROM eg_pt_property pt INNER JOIN egcl_bill bill ON pt.propertyid = bill.consumercode INNER JOIN egcl_paymentdetail paymentdetail ON bill.id = paymentdetail.billid INNER JOIN egcl_payment payment ON paymentdetail.paymentid =payment.id WHERE (paymentdetail.receiptdate/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND pt.tenantid != 'pb.testing' AND payment.paymentstatus != 'CANCELLED')) ptReports - searchParams: - condition: AND - params: - - name: intervalinsecs - isMandatory: true - jsonPath: $.searchCriteria.intervalinsecs - - output: - jsonFormat: {"ResponseInfo": {}} - outJsonPath: $.data - responseInfoPath: $.ResponseInfo - - - - - name: tlData - query: - baseQuery: select array_to_json(array_agg(row_to_json(tlReports))) from (SELECT count(DISTINCT tl.tenantid) as ulbCovered , count(*) as licenseIssued,TRUNC(SUM(payment.totalamountpaid) / 10000000, 3) as revenuecollected, 'Week0' as day FROM eg_tl_tradelicense as tl INNER JOIN egcl_bill bill ON tl.applicationnumber = bill.consumercode INNER JOIN egcl_paymentdetail paymentdetail ON bill.id = paymentdetail.billid INNER JOIN egcl_payment payment ON paymentdetail.paymentid =payment.id WHERE (paymentdetail.receiptdate/1000) <= (extract(epoch from NOW())) AND tl.tenantid != 'pb.testing' AND payment.paymentstatus != 'CANCELLED' AND tl.status='APPROVED' UNION SELECT count(DISTINCT tl.tenantid) as ulbCovered , count(*) as licenseIssued, TRUNC(SUM(payment.totalamountpaid) / 10000000, 3) as revenuecollected,'Week1' as day FROM eg_tl_tradelicense tl INNER JOIN egcl_bill bill ON tl.applicationnumber = bill.consumercode INNER JOIN egcl_paymentdetail paymentdetail ON bill.id = paymentdetail.billid INNER JOIN egcl_payment payment ON paymentdetail.paymentid =payment.id WHERE (paymentdetail.receiptdate/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tl.tenantid != 'pb.testing' AND payment.paymentstatus != 'CANCELLED' AND tl.status='APPROVED' UNION SELECT count(DISTINCT tl.tenantid) as ulbCovered , count(*) as licenseIssued,TRUNC(SUM(payment.totalamountpaid) / 10000000, 3) as revenuecollected, 'Week2' as day FROM eg_tl_tradelicense tl INNER JOIN egcl_bill bill ON tl.applicationnumber = bill.consumercode INNER JOIN egcl_paymentdetail paymentdetail ON bill.id = paymentdetail.billid INNER JOIN egcl_payment payment ON paymentdetail.paymentid =payment.id WHERE (paymentdetail.receiptdate/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800*2) AND tl.tenantid != 'pb.testing' AND payment.paymentstatus != 'CANCELLED' AND tl.status='APPROVED' UNION SELECT count(DISTINCT tl.tenantid) as ulbCovered , count(*) as licenseIssued,TRUNC(SUM(payment.totalamountpaid) / 10000000, 3) as revenuecollected, 'Week3' as day FROM eg_tl_tradelicense tl INNER JOIN egcl_bill bill ON tl.applicationnumber = bill.consumercode INNER JOIN egcl_paymentdetail paymentdetail ON bill.id = paymentdetail.billid INNER JOIN egcl_payment payment ON paymentdetail.paymentid =payment.id WHERE (paymentdetail.receiptdate/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800*3) AND tl.tenantid != 'pb.testing' AND payment.paymentstatus != 'CANCELLED' AND tl.status='APPROVED' UNION SELECT count(DISTINCT tl.tenantid) as ulbCovered , count(*) as licenseIssued,TRUNC(SUM(payment.totalamountpaid) / 10000000, 3) as revenuecollected, 'Week4' as day FROM eg_tl_tradelicense tl INNER JOIN egcl_bill bill ON tl.applicationnumber = bill.consumercode INNER JOIN egcl_paymentdetail paymentdetail ON bill.id = paymentdetail.billid INNER JOIN egcl_payment payment ON paymentdetail.paymentid =payment.id WHERE (paymentdetail.receiptdate/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800*4) AND tl.tenantid != 'pb.testing' AND payment.paymentstatus != 'CANCELLED' AND tl.status='APPROVED' UNION SELECT count(DISTINCT tl.tenantid) as ulbCovered , count(*) as licenseIssued,TRUNC(SUM(payment.totalamountpaid) / 10000000, 3) as revenuecollected, 'Week5' as day FROM eg_tl_tradelicense tl INNER JOIN egcl_bill bill ON tl.applicationnumber = bill.consumercode INNER JOIN egcl_paymentdetail paymentdetail ON bill.id = paymentdetail.billid INNER JOIN egcl_payment payment ON paymentdetail.paymentid =payment.id WHERE (paymentdetail.receiptdate/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800*5) AND tl.tenantid != 'pb.testing' AND payment.paymentstatus != 'CANCELLED' AND tl.status='APPROVED') tlReports - - searchParams: - condition: AND - params: - - name: intervalinsecs - isMandatory: true - jsonPath: $.searchCriteria.intervalinsecs - - output: - jsonFormat: {"ResponseInfo": {}} - outJsonPath: $.data - responseInfoPath: $.ResponseInfo - - - - - name: miscCollections - query: - baseQuery: select array_to_json(array_agg(row_to_json(misccollections))) from ((SELECT COUNT(*) as receiptscreated, TRUNC(SUM(payment.totalamountpaid) / 10000000, 3) as revenuecollected, 'Week0' as day FROM egcl_payment payment LEFT JOIN egcl_paymentdetail paymentdetail ON payment.id = paymentdetail.paymentid $where AND (paymentdetail.receiptdate/1000) <= (extract(epoch from NOW()))) UNION (SELECT COUNT(*) as receiptscreated, TRUNC(SUM(payment.totalamountpaid) / 10000000, 3) as revenuecollected, 'Week1' as day FROM egcl_payment payment LEFT JOIN egcl_paymentdetail paymentdetail ON payment.id = paymentdetail.paymentid $where AND (paymentdetail.receiptdate/1000) <= ((extract(epoch from NOW())) - 604800)) UNION (SELECT COUNT(*) as receiptscreated, TRUNC(SUM(payment.totalamountpaid) / 10000000, 3) as revenuecollected, 'Week2' as day FROM egcl_payment payment LEFT JOIN egcl_paymentdetail paymentdetail ON payment.id = paymentdetail.paymentid $where AND (paymentdetail.receiptdate/1000) <= ((extract(epoch from NOW())) - 604800 * 2)) UNION (SELECT COUNT(*) as receiptscreated, TRUNC(SUM(payment.totalamountpaid) / 10000000, 3) as revenuecollected, 'Week3' as day FROM egcl_payment payment LEFT JOIN egcl_paymentdetail paymentdetail ON payment.id = paymentdetail.paymentid $where AND (paymentdetail.receiptdate/1000) <= ((extract(epoch from NOW())) - 604800 * 3)) UNION (SELECT COUNT(*) as receiptscreated, TRUNC(SUM(payment.totalamountpaid) / 10000000, 3) as revenuecollected, 'Week4' as day FROM egcl_payment payment LEFT JOIN egcl_paymentdetail paymentdetail ON payment.id = paymentdetail.paymentid $where AND (paymentdetail.receiptdate/1000) <= ((extract(epoch from NOW())) - 604800 * 4)) UNION (SELECT COUNT(*) as receiptscreated, TRUNC(SUM(payment.totalamountpaid) / 10000000, 3) as revenuecollected, 'Week5' as day FROM egcl_payment payment LEFT JOIN egcl_paymentdetail paymentdetail ON payment.id = paymentdetail.paymentid $where AND (paymentdetail.receiptdate/1000) <= ((extract(epoch from NOW())) - 604800 * 5))) misccollections - searchParams: - condition: AND - params: - - name: payment.tenantid - isMandatory: true - operator: NE - jsonPath: $.searchCriteria.ignoreTenant - - name: paymentdetail.businessservice - isMandatory: false - operator: IN - jsonPath: $.searchCriteria.taxHeads - - name: paymentdetail.businessservice - isMandatory: false - operator: NOT IN - jsonPath: $.searchCriteria.ignoreTaxHeads - - name: payment.paymentstatus - isMandatory: true - operator: NE - jsonPath: $.searchCriteria.ignoreStatus - - output: - jsonFormat: {"ResponseInfo": {}} - outJsonPath: $.data - responseInfoPath: $.ResponseInfo - - - name: firenocData - query: - baseQuery: select array_to_json(array_agg(row_to_json(firenocReports))) from (SELECT count(DISTINCT fn.tenantid) as ulbCovered , count(*) as certificatesIssued,COALESCE(TRUNC(SUM(payment.totalamountpaid) / 10000000, 3),0) as revenuecollected, 'Week0' as day FROM eg_fn_firenocdetail as fn INNER JOIN egcl_bill bill ON fn.applicationnumber = bill.consumercode INNER JOIN egcl_paymentdetail paymentdetail ON bill.id = paymentdetail.billid INNER JOIN egcl_payment payment ON paymentdetail.paymentid =payment.id WHERE (paymentdetail.receiptdate/1000) <= (extract(epoch from NOW())) AND fn.tenantid != 'pb.testing' AND payment.paymentstatus!='CANCELLED' AND fn.status='APPROVED' UNION SELECT count(DISTINCT fn.tenantid) as ulbCovered , count(*) as certficatesIssued, COALESCE(TRUNC(SUM(payment.totalamountpaid) / 10000000, 3),0) as revenuecollected,'Week1' as day FROM eg_fn_firenocdetail fn INNER JOIN egcl_bill bill ON fn.applicationnumber = bill.consumercode INNER JOIN egcl_paymentdetail paymentdetail ON bill.id = paymentdetail.billid INNER JOIN egcl_payment payment ON paymentdetail.paymentid =payment.id WHERE (paymentdetail.receiptdate/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND fn.tenantid != 'pb.testing' AND payment.paymentstatus!='CANCELLED' AND fn.status='APPROVED' UNION SELECT count(DISTINCT fn.tenantid) as ulbCovered , count(*) as certficatesIssued,COALESCE(TRUNC(SUM(payment.totalamountpaid) / 10000000, 3),0) as revenuecollected, 'Week2' as day FROM eg_fn_firenocdetail fn INNER JOIN egcl_bill bill ON fn.applicationnumber = bill.consumercode INNER JOIN egcl_paymentdetail paymentdetail ON bill.id = paymentdetail.billid INNER JOIN egcl_payment payment ON paymentdetail.paymentid =payment.id WHERE (paymentdetail.receiptdate/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800*2) AND fn.tenantid != 'pb.testing' AND payment.paymentstatus!='CANCELLED' AND fn.status='APPROVED' UNION SELECT count(DISTINCT fn.tenantid) as ulbCovered , count(*) as certificatesIssued,COALESCE(TRUNC(SUM(payment.totalamountpaid) / 10000000, 3),0) as revenuecollected, 'Week3' as day FROM eg_fn_firenocdetail fn INNER JOIN egcl_bill bill ON fn.applicationnumber = bill.consumercode INNER JOIN egcl_paymentdetail paymentdetail ON bill.id = paymentdetail.billid INNER JOIN egcl_payment payment ON paymentdetail.paymentid =payment.id WHERE (paymentdetail.receiptdate/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800*3) AND fn.tenantid != 'pb.testing' AND payment.paymentstatus!='CANCELLED' AND fn.status='APPROVED' UNION SELECT count(DISTINCT fn.tenantid) as ulbCovered , count(*) as certficatesIssued,COALESCE(TRUNC(SUM(payment.totalamountpaid) / 10000000, 3),0) as revenuecollected, 'Week4' as day FROM eg_fn_firenocdetail fn INNER JOIN egcl_bill bill ON fn.applicationnumber = bill.consumercode INNER JOIN egcl_paymentdetail paymentdetail ON bill.id = paymentdetail.billid INNER JOIN egcl_payment payment ON paymentdetail.paymentid =payment.id WHERE (paymentdetail.receiptdate/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800*4) AND fn.tenantid != 'pb.testing' AND payment.paymentstatus!='CANCELLED' AND fn.status='APPROVED' UNION SELECT count(DISTINCT fn.tenantid) as ulbCovered , count(*) as certficatesIssued,COALESCE(TRUNC(SUM(payment.totalamountpaid) / 10000000, 3),0) as revenuecollected, 'Week5' as day FROM eg_fn_firenocdetail fn INNER JOIN egcl_bill bill ON fn.applicationnumber = bill.consumercode INNER JOIN egcl_paymentdetail paymentdetail ON bill.id = paymentdetail.billid INNER JOIN egcl_payment payment ON paymentdetail.paymentid =payment.id WHERE (paymentdetail.receiptdate/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800*5) AND fn.tenantid != 'pb.testing' AND payment.paymentstatus!='CANCELLED' AND fn.status='APPROVED') firenocReports - searchParams: - condition: AND - params: - - name: intervalinsecs - isMandatory: true - jsonPath: $.searchCriteria.intervalinsecs - - output: - jsonFormat: {"ResponseInfo": {}} - outJsonPath: $.data - responseInfoPath: $.ResponseInfo \ No newline at end of file diff --git a/configs/egov-uploader/CollectionReceiptWorkflow.json b/configs/egov-uploader/CollectionReceiptWorkflow.json deleted file mode 100644 index 068a9b27..00000000 --- a/configs/egov-uploader/CollectionReceiptWorkflow.json +++ /dev/null @@ -1,67 +0,0 @@ -{ - "moduleName": "Collections", - "Definitions": [ - { - "name": "Upload-Receipt-Workflow-Data", - "uniqueParentKeys": [], - "templateFileName": "collection_receipt_workflow_template.xls", - "isParentChild": false, - "requests": [ - { - "apiRequest": { - "ReceiptWorkflow": [ - { - "consumerCode": "", - "receiptNumber": "", - "action": "", - "reason": "", - "additionalDetails": { - "temp": "" - } - } - ], - "RequestInfo": { - "apiId": "Rainmaker", - "ver": ".01", - "ts": 0, - "action": "_create", - "did": "1", - "key": "", - "msgId": "20170310130900|en_IN", - "authToken": "8040b93b-03ea-4532-81b7-164538cee9d4", - "correlationId": "a2e4642e-8cb5-483b-8ea2-827cbe822c5f", - "userInfo": { - "id": 1 - } - } - }, - "excelHeadersToRequestMap": { - "consumerCode": [ - "$.ReceiptWorkflow.*.consumerCode" - ], - "receiptNumber": [ - "$.ReceiptWorkflow.*.receiptNumber" - ], - "action": [ - "$.ReceiptWorkflow.*.action" - ], - "reason": [ - "$.ReceiptWorkflow.*.reason" - ], - "additionalDetails": [ - "$.ReceiptWorkflow.*.additionalDetails" - ] - }, - "arrayPath": "$.ReceiptWorkflow.*", - "tenantIdPaths": [ - "$.ReceiptWorkflow.*.tenantId" - ], - "url": "http://collection-services:8080/collection-services/receipts/_workflow", - "additionalResFields": { - "$.ReceiptWorkflow.*.code[0]": "Response" - } - } - ] - } - ] -} diff --git a/configs/egov-uploader/localization-upload.json b/configs/egov-uploader/localization-upload.json deleted file mode 100644 index f73c0181..00000000 --- a/configs/egov-uploader/localization-upload.json +++ /dev/null @@ -1,61 +0,0 @@ -{ - "moduleName": "Localization", - "Definitions": [ - { - "name": "Upload-Localization-Messages", - "uniqueParentKeys": [], - "templateFileName": "localization_template.xls", - "isParentChild": false, - "requests": [ - { - "apiRequest": { - "RequestInfo": { - "apiId": "localization", - "ver": null, - "ts": null, - "action": null, - "did": null, - "key": null, - "msgId": "search with from and to values", - "authToken": "cdc03e03-8b26-49ca-9c15-3ccc9c91c1ec" - }, - "tenantId": "pb", - "messages": [ - { - "code": "SERVICEDEFS.DAMAGEDGARBAGEBIN", - "message": "Damaged Garbage Bin", - "module": "rainmaker-pgr", - "locale": "en_IN" - } - ] - }, - "excelHeadersToRequestMap": { - "Code": [ - "$.messages.*.code" - ], - "Locale": [ - "$.messages.*.locale" - ], - "Message": [ - "$.messages.*.message" - ], - "Module": [ - "$.messages.*.module" - ], - "TenantId": [ - "$.tenantId" - ] - }, - "arrayPath": "$.messages.*", - "tenantIdPaths": [ - "$.messages.*.tenantId" - ], - "url": "http://egov-localization:8080/localization/messages/v1/_create", - "additionalResFields":{ - "$.messages.*.code[0]":"Response" - } - } - ] - } - ] -} diff --git a/configs/egov-uploader/property-upload.json b/configs/egov-uploader/property-upload.json deleted file mode 100644 index 1417113c..00000000 --- a/configs/egov-uploader/property-upload.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "moduleName": "property-upload", - "Definitions": [ - { - "name": "property-residential-create", - "templateFileName": "property-residential.xlsx", - "uniqueParentKeys": [], - "isParentChild": false, - "requests": [ - { - "url": "", - "apiRequest": {}, - "excelHeadersToRequestMap": {}, - "additionalResFields": {}, - "tenantIdPaths": [] - } - ] - } - ] -} diff --git a/configs/egov-zuul/post-hook.json b/configs/egov-zuul/post-hook.json deleted file mode 100644 index 567d3f37..00000000 --- a/configs/egov-zuul/post-hook.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "/pt-services-v2/property/_create":"http://rainmaker-custom-service:8000/customization/protected/punjab-pt/property/_create", - "/pt-services-v2/property/_update":"http://rainmaker-custom-service:8000/customization/protected/punjab-pt/property/_create", - "/pt-calculator-v2/propertytax/_estimate":"http://rainmaker-custom-service:8000/customization/protected/punjab-pt/pt-calculator-v2/_estimate", - "/pt-calculator-v2/propertytax/v2/_estimate":"http://rainmaker-custom-service:8000/customization/protected/punjab-pt/pt-calculator-v2/_estimate", - "/property-services/assessment/_create":"http://rainmaker-custom-service:8000/customization/protected/punjab-pt/assessment/_create", - "/property-services/assessment/_update":"http://rainmaker-custom-service:8000/customization/protected/punjab-pt/assessment/_update" -} \ No newline at end of file diff --git a/configs/egov-zuul/pre-hook.json b/configs/egov-zuul/pre-hook.json deleted file mode 100644 index ee0ed854..00000000 --- a/configs/egov-zuul/pre-hook.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "/pg-service/transaction/v1/_create": "http://rainmaker-custom-service:8000/customization/protected/punjab-pt/pre-hook/pg-service/transaction/v1/_create" -} \ No newline at end of file diff --git a/configs/monitoring-dashboards/kube-cluster-dashboard.json b/configs/monitoring-dashboards/kube-cluster-dashboard.json deleted file mode 100644 index 94872619..00000000 --- a/configs/monitoring-dashboards/kube-cluster-dashboard.json +++ /dev/null @@ -1,6024 +0,0 @@ -{ - "annotations": { - "list": [ - { - "builtIn": 1, - "datasource": "-- Grafana --", - "enable": true, - "hide": true, - "iconColor": "rgba(0, 211, 255, 1)", - "name": "Annotations & Alerts", - "type": "dashboard" - } - ] - }, - "description": "This dashboard can help troubleshooting issue in k8s cluster at cluster, node and namespace level.", - "editable": true, - "gnetId": 11802, - "graphTooltip": 0, - "iteration": 1597248957829, - "links": [], - "panels": [ - { - "collapsed": true, - "datasource": "Prometheus", - "gridPos": { - "h": 1, - "w": 24, - "x": 0, - "y": 0 - }, - "id": 37, - "panels": [ - { - "cacheTimeout": null, - "datasource": "Prometheus", - "fieldConfig": { - "defaults": { - "custom": {}, - "mappings": [], - "noValue": "N/A", - "nullValueMode": "connected", - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - } - ] - }, - "unit": "s" - }, - "overrides": [] - }, - "gridPos": { - "h": 3, - "w": 5, - "x": 0, - "y": 1 - }, - "id": 98, - "interval": null, - "links": [], - "maxDataPoints": 100, - "options": { - "colorMode": "value", - "fieldOptions": { - "calcs": [ - "lastNotNull" - ] - }, - "graphMode": "none", - "justifyMode": "auto", - "orientation": "horizontal", - "reduceOptions": { - "calcs": [ - "mean" - ], - "fields": "", - "values": false - } - }, - "pluginVersion": "7.0.5", - "targets": [ - { - "expr": "sum(time() - kube_service_created{namespace=\"default\",service=\"kubernetes\"})", - "hide": false, - "instant": true, - "interval": "", - "legendFormat": "", - "refId": "B" - } - ], - "timeFrom": null, - "timeShift": null, - "title": "Cluster age", - "transformations": [], - "transparent": true, - "type": "stat" - }, - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": false, - "colors": [ - "#299c46", - "#37872D", - "#d44a3a" - ], - "datasource": "Prometheus", - "description": "", - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, - "format": "none", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": false, - "thresholdLabels": false, - "thresholdMarkers": true - }, - "gridPos": { - "h": 3, - "w": 3, - "x": 5, - "y": 1 - }, - "id": 131, - "interval": null, - "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], - "maxDataPoints": 100, - "nullPointMode": "connected", - "nullText": null, - "postfix": "", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "50%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": false, - "lineColor": "rgb(31, 120, 193)", - "show": true, - "ymax": null, - "ymin": null - }, - "tableColumn": "", - "targets": [ - { - "expr": " count(kube_namespace_created)", - "hide": false, - "instant": false, - "interval": "", - "legendFormat": "{{pod}}", - "refId": "A" - }, - { - "expr": "", - "hide": true, - "refId": "B" - } - ], - "thresholds": "", - "timeFrom": null, - "timeShift": null, - "title": "Namespaces ", - "transparent": true, - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ - { - "op": "=", - "text": "N/A", - "value": "null" - } - ], - "valueName": "current" - }, - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": false, - "colors": [ - "#299c46", - "#37872D", - "#d44a3a" - ], - "datasource": "Prometheus", - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, - "format": "none", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": false, - "thresholdLabels": false, - "thresholdMarkers": true - }, - "gridPos": { - "h": 3, - "w": 3, - "x": 8, - "y": 1 - }, - "id": 76, - "interval": null, - "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], - "maxDataPoints": 100, - "nullPointMode": "connected", - "nullText": null, - "postfix": "", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "50%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": false, - "lineColor": "rgb(31, 120, 193)", - "show": true, - "ymax": null, - "ymin": null - }, - "tableColumn": "", - "targets": [ - { - "expr": " count(count by (pod)(container_spec_memory_reservation_limit_bytes{pod!=\"\"}))", - "hide": false, - "instant": false, - "legendFormat": "{{pod}}", - "refId": "A" - }, - { - "expr": "", - "hide": true, - "refId": "B" - } - ], - "thresholds": "", - "timeFrom": null, - "timeShift": null, - "title": "Total pods", - "transparent": true, - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ - { - "op": "=", - "text": "N/A", - "value": "null" - } - ], - "valueName": "current" - }, - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": true, - "colors": [ - "#299c46", - "#37872D", - "#d44a3a" - ], - "datasource": "Prometheus", - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, - "format": "none", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": false, - "thresholdLabels": false, - "thresholdMarkers": true - }, - "gridPos": { - "h": 3, - "w": 3, - "x": 11, - "y": 1 - }, - "id": 60, - "interval": null, - "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], - "maxDataPoints": 100, - "nullPointMode": "connected", - "nullText": null, - "postfix": "", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "50%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": false, - "lineColor": "rgb(31, 120, 193)", - "show": true, - "ymax": null, - "ymin": null - }, - "tableColumn": "", - "targets": [ - { - "expr": "count(kube_pod_container_status_waiting !=0 ) or vector(0)", - "hide": false, - "instant": false, - "interval": "", - "legendFormat": "{{pod}}", - "refId": "A" - }, - { - "expr": "", - "hide": true, - "refId": "B" - } - ], - "thresholds": "0,1", - "timeFrom": null, - "timeShift": null, - "title": "Waiting pods", - "transparent": true, - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ - { - "op": "=", - "text": "N/A", - "value": "null" - } - ], - "valueName": "current" - }, - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": true, - "colors": [ - "#299c46", - "#37872D", - "#d44a3a" - ], - "datasource": "Prometheus", - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, - "format": "none", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": false, - "thresholdLabels": false, - "thresholdMarkers": true - }, - "gridPos": { - "h": 3, - "w": 3, - "x": 14, - "y": 1 - }, - "id": 61, - "interval": null, - "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], - "maxDataPoints": 100, - "nullPointMode": "connected", - "nullText": null, - "postfix": "", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "50%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": false, - "lineColor": "rgb(31, 120, 193)", - "show": true, - "ymax": null, - "ymin": null - }, - "tableColumn": "", - "targets": [ - { - "expr": "count(kube_pod_container_status_terminated_reason{reason!=\"Completed\"} !=0 ) or vector(0)", - "hide": false, - "instant": false, - "legendFormat": "{{pod}}", - "refId": "A" - }, - { - "expr": "", - "hide": true, - "refId": "B" - } - ], - "thresholds": "0,1", - "timeFrom": null, - "timeShift": null, - "title": "Terminated pods", - "transparent": true, - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ - { - "op": "=", - "text": "N/A", - "value": "null" - } - ], - "valueName": "current" - }, - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": false, - "colors": [ - "#299c46", - "#37872D", - "#d44a3a" - ], - "datasource": "Prometheus", - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, - "format": "none", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": false, - "thresholdLabels": false, - "thresholdMarkers": true - }, - "gridPos": { - "h": 3, - "w": 3, - "x": 17, - "y": 1 - }, - "id": 74, - "interval": null, - "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], - "maxDataPoints": 100, - "nullPointMode": "connected", - "nullText": null, - "postfix": "", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "50%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": false, - "lineColor": "rgb(31, 120, 193)", - "show": true, - "ymax": null, - "ymin": null - }, - "tableColumn": "", - "targets": [ - { - "expr": "sum(count by (pod)(container_spec_memory_reservation_limit_bytes{id=~\".*.burstable.*\",id!~\".*.scope\",pod!=\"\"}))", - "hide": false, - "instant": false, - "interval": "", - "legendFormat": "{{pod}}", - "refId": "A" - }, - { - "expr": "", - "hide": true, - "refId": "B" - } - ], - "thresholds": "0,1", - "timeFrom": null, - "timeShift": null, - "title": "burstable pods", - "transparent": true, - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ - { - "op": "=", - "text": "N/A", - "value": "null" - } - ], - "valueName": "current" - }, - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": false, - "colors": [ - "#299c46", - "#37872D", - "#d44a3a" - ], - "datasource": "Prometheus", - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, - "format": "none", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": false, - "thresholdLabels": false, - "thresholdMarkers": true - }, - "gridPos": { - "h": 3, - "w": 2, - "x": 20, - "y": 1 - }, - "id": 73, - "interval": null, - "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], - "maxDataPoints": 100, - "nullPointMode": "connected", - "nullText": null, - "postfix": "", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "50%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": false, - "lineColor": "rgb(31, 120, 193)", - "show": true, - "ymax": null, - "ymin": null - }, - "tableColumn": "", - "targets": [ - { - "expr": "count(count by (pod)(container_spec_memory_reservation_limit_bytes{id=~\".*.besteffort.*\",id!~\".*.scope\",pod!=\"\"}))", - "hide": false, - "instant": false, - "interval": "", - "legendFormat": "{{pod}}", - "refId": "A" - }, - { - "expr": "", - "hide": true, - "refId": "B" - } - ], - "thresholds": "0,1", - "timeFrom": null, - "timeShift": null, - "title": "Besteffort pods", - "transparent": true, - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ - { - "op": "=", - "text": "N/A", - "value": "null" - } - ], - "valueName": "current" - }, - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": false, - "colors": [ - "#299c46", - "#37872D", - "#d44a3a" - ], - "datasource": "Prometheus", - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, - "format": "none", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": false, - "thresholdLabels": false, - "thresholdMarkers": true - }, - "gridPos": { - "h": 3, - "w": 2, - "x": 22, - "y": 1 - }, - "id": 59, - "interval": null, - "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], - "maxDataPoints": 100, - "nullPointMode": "connected", - "nullText": null, - "postfix": "", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "50%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": false, - "lineColor": "rgb(31, 120, 193)", - "show": false, - "ymax": null, - "ymin": null - }, - "tableColumn": "", - "targets": [ - { - "expr": "count(kube_persistentvolumeclaim_info) ", - "hide": false, - "instant": false, - "legendFormat": "{{pod}}", - "refId": "A" - }, - { - "expr": "", - "hide": true, - "refId": "B" - } - ], - "thresholds": "0", - "timeFrom": null, - "timeShift": null, - "title": "PVCs", - "transparent": true, - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ - { - "op": "=", - "text": "N/A", - "value": "null" - } - ], - "valueName": "current" - }, - { - "datasource": "Prometheus", - "fieldConfig": { - "defaults": { - "custom": { - "align": null - }, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - }, - { - "color": "red", - "value": 80 - } - ] - } - }, - "overrides": [ - { - "matcher": { - "id": "byName", - "options": "osVersion" - }, - "properties": [ - { - "id": "custom.width", - "value": 360 - } - ] - }, - { - "matcher": { - "id": "byName", - "options": "Docker version" - }, - "properties": [ - { - "id": "custom.width", - "value": 120 - } - ] - }, - { - "matcher": { - "id": "byName", - "options": "Node name" - }, - "properties": [ - { - "id": "custom.width", - "value": 213 - } - ] - }, - { - "matcher": { - "id": "byName", - "options": "No. of pods" - }, - "properties": [ - { - "id": "custom.width", - "value": 104 - } - ] - }, - { - "matcher": { - "id": "byName", - "options": "dockerVersion" - }, - "properties": [ - { - "id": "custom.width", - "value": 123 - } - ] - }, - { - "matcher": { - "id": "byName", - "options": "instance" - }, - "properties": [ - { - "id": "custom.width", - "value": 147 - } - ] - }, - { - "matcher": { - "id": "byName", - "options": "Memory used" - }, - "properties": [ - { - "id": "custom.width", - "value": 109 - }, - { - "id": "unit", - "value": "percentunit" - }, - { - "id": "thresholds", - "value": { - "mode": "percentage", - "steps": [ - { - "color": "green", - "value": null - }, - { - "color": "red", - "value": 80 - } - ] - } - }, - { - "id": "custom.displayMode", - "value": "lcd-gauge" - } - ] - }, - { - "matcher": { - "id": "byName", - "options": "kernelVersion" - }, - "properties": [ - { - "id": "custom.width", - "value": 140 - } - ] - }, - { - "matcher": { - "id": "byName", - "options": "node" - }, - "properties": [ - { - "id": "custom.width", - "value": 204 - } - ] - }, - { - "matcher": { - "id": "byName", - "options": "Pod capacity used" - }, - "properties": [ - { - "id": "custom.width", - "value": 142 - }, - { - "id": "unit", - "value": "none" - }, - { - "id": "custom.displayMode", - "value": "auto" - } - ] - }, - { - "matcher": { - "id": "byName", - "options": "CPU usage" - }, - "properties": [ - { - "id": "custom.width", - "value": 91 - }, - { - "id": "unit", - "value": "percentunit" - }, - { - "id": "thresholds", - "value": { - "mode": "percentage", - "steps": [ - { - "color": "green", - "value": null - }, - { - "color": "red", - "value": 80 - } - ] - } - }, - { - "id": "custom.displayMode", - "value": "lcd-gauge" - } - ] - }, - { - "matcher": { - "id": "byName", - "options": "K8s version" - }, - "properties": [ - { - "id": "custom.width", - "value": 105 - } - ] - }, - { - "matcher": { - "id": "byName", - "options": "OS version" - }, - "properties": [ - { - "id": "custom.width", - "value": 178 - } - ] - }, - { - "matcher": { - "id": "byName", - "options": "pod_cidr" - }, - "properties": [ - { - "id": "custom.width", - "value": 122 - } - ] - }, - { - "matcher": { - "id": "byName", - "options": "Kernel version" - }, - "properties": [ - { - "id": "custom.width", - "value": 122 - } - ] - }, - { - "matcher": { - "id": "byName", - "options": "Pod count" - }, - "properties": [ - { - "id": "custom.width", - "value": 88 - } - ] - }, - { - "matcher": { - "id": "byName", - "options": "role" - }, - "properties": [ - { - "id": "custom.width", - "value": 72 - } - ] - } - ] - }, - "gridPos": { - "h": 10, - "w": 8, - "x": 0, - "y": 4 - }, - "id": 64, - "options": { - "angular": { - "decimals": 0, - "defaultColor": "#37872D", - "format": "none", - "linkIndex": "0", - "linkVars": [], - "mathColorValue": "data[end]", - "mathDisplayValue": "data[end]", - "mathScratchPad": "data = size(data)[1] == 0 ? [NaN] : data", - "options": {}, - "radius": "25px", - "thresholds": [ - { - "color": "#37872D", - "value": "1" - }, - { - "color": "#C4162A", - "value": "0" - } - ] - }, - "frameIndex": 0, - "showHeader": true - }, - "pluginVersion": "7.0.5", - "targets": [ - { - "expr": "kube_node_info", - "format": "table", - "hide": false, - "instant": true, - "interval": "", - "legendFormat": "{{node}}", - "refId": "A" - }, - { - "expr": " (count by (node)(container_spec_memory_reservation_limit_bytes{pod!=\"\"}))", - "format": "table", - "hide": false, - "instant": true, - "interval": "", - "legendFormat": "", - "refId": "B" - }, - { - "expr": "((label_replace((node_memory_MemTotal_bytes + on(instance) group_left(nodename) \nnode_uname_info),\"node\",\"$1\",\"nodename\", \"(.+)\")) - (label_replace((node_memory_MemAvailable_bytes + on(instance) group_left(nodename) \nnode_uname_info),\"node\",\"$1\",\"nodename\", \"(.+)\"))) / (label_replace((node_memory_MemTotal_bytes + on(instance) group_left(nodename) \nnode_uname_info),\"node\",\"$1\",\"nodename\", \"(.+)\")) ", - "format": "table", - "instant": true, - "interval": "", - "legendFormat": "", - "refId": "C" - }, - { - "expr": "max\n by(node) (max by(instance) (kubelet_running_pod_count{job=\"kubelet\",metrics_path=\"/metrics\"})\n * on(instance) group_left(node) kubelet_node_name{job=\"kubelet\",metrics_path=\"/metrics\"})\n", - "format": "table", - "instant": true, - "interval": "", - "legendFormat": "", - "refId": "D" - }, - { - "expr": "sum by (node)(label_replace(instance:node_cpu:ratio + on(instance) group_left(nodename) \nnode_uname_info,\"node\",\"$1\",\"nodename\", \"(.+)\") ) / sum by (node)(kube_node_status_capacity{resource=\"cpu\"})", - "format": "table", - "instant": true, - "interval": "", - "legendFormat": "", - "refId": "E" - }, - { - "expr": "kube_node_role", - "format": "table", - "interval": "", - "legendFormat": "", - "refId": "F" - } - ], - "timeFrom": null, - "timeShift": null, - "title": "cluster node details", - "transformations": [ - { - "id": "filterFieldsByName", - "options": { - "include": { - "names": [ - "container_runtime_version", - "kernel_version", - "kubelet_version", - "node", - "os_image", - "pod_cidr", - "provider_id", - "Value #C", - "Value #D", - "Value #E", - "role" - ] - } - } - }, - { - "id": "seriesToColumns", - "options": { - "byField": "node" - } - }, - { - "id": "organize", - "options": { - "excludeByName": {}, - "indexByName": { - "Value #C": 2, - "Value #D": 4, - "Value #E": 3, - "container_runtime_version": 9, - "kernel_version": 7, - "kubelet_version": 5, - "node": 0, - "os_image": 8, - "pod_cidr": 6, - "provider_id": 10, - "role": 1 - }, - "renameByName": { - "Value #C": "Memory used", - "Value #D": "Pod count", - "Value #E": "CPU usage", - "container_runtime_version": "Docker version", - "kernel_version": "Kernel version", - "kubelet_version": "K8s version", - "node": "Node name", - "os_image": "OS version", - "provider_id": "" - } - } - } - ], - "transparent": true, - "type": "table" - }, - { - "aliasColors": {}, - "bars": false, - "cacheTimeout": null, - "dashLength": 10, - "dashes": false, - "datasource": "Prometheus", - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, - "fill": 0, - "fillGradient": 0, - "gridPos": { - "h": 10, - "w": 8, - "x": 8, - "y": 4 - }, - "hiddenSeries": false, - "id": 68, - "legend": { - "avg": false, - "current": false, - "hideEmpty": true, - "hideZero": true, - "max": true, - "min": false, - "show": true, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 1, - "links": [], - "nullPointMode": "null", - "options": { - "dataLinks": [] - }, - "percentage": false, - "pluginVersion": "6.5.2", - "pointradius": 2, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "sort(sum by (node)(container_memory_usage_bytes{pod!=\"POD\",namespace!=\"\"}))", - "hide": true, - "legendFormat": "{{node}}", - "refId": "A" - }, - { - "expr": "(sum by (namespace)(container_memory_usage_bytes{pod!=\"POD\",namespace!=\"\"}))", - "legendFormat": "{{namespace}}", - "refId": "B" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Memory usage by namespace in cluster", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "transparent": true, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "decbytes", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "cacheTimeout": null, - "dashLength": 10, - "dashes": false, - "datasource": "Prometheus", - "description": "", - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, - "fill": 0, - "fillGradient": 0, - "gridPos": { - "h": 9, - "w": 8, - "x": 16, - "y": 4 - }, - "hiddenSeries": false, - "id": 121, - "legend": { - "avg": false, - "current": false, - "hideEmpty": true, - "hideZero": false, - "max": false, - "min": false, - "rightSide": false, - "show": true, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 1, - "links": [], - "nullPointMode": "null as zero", - "options": { - "dataLinks": [] - }, - "percentage": false, - "pluginVersion": "6.5.2", - "pointradius": 2, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": " histogram_quantile(0.99,\n sum by(instance, le) (rate(kubelet_pod_worker_duration_seconds_bucket{job=\"kubelet\",metrics_path=\"/metrics\"}[10m])))\n * on(instance) group_left(node) kubelet_node_name{job=\"kubelet\",metrics_path=\"/metrics\"}", - "instant": false, - "interval": "", - "legendFormat": "{{node}} ", - "refId": "A" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Pod startup latency", - "tooltip": { - "shared": true, - "sort": 2, - "value_type": "individual" - }, - "transparent": true, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "decimals": null, - "format": "s", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": false - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - } - ], - "title": "Overall cluster status", - "type": "row" - }, - { - "collapsed": true, - "datasource": null, - "gridPos": { - "h": 1, - "w": 24, - "x": 0, - "y": 1 - }, - "id": 140, - "panels": [ - { - "datasource": null, - "fieldConfig": { - "defaults": { - "custom": { - "align": "center" - }, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - }, - { - "color": "red", - "value": 80 - } - ] - } - }, - "overrides": [ - { - "matcher": { - "id": "byName", - "options": "Lag" - }, - "properties": [ - { - "id": "custom.displayMode", - "value": "color-text" - } - ] - } - ] - }, - "gridPos": { - "h": 8, - "w": 12, - "x": 0, - "y": 2 - }, - "id": 137, - "options": { - "frameIndex": 1, - "showHeader": true, - "sortBy": [ - { - "desc": true, - "displayName": "Value #B" - } - ] - }, - "pluginVersion": "7.0.5", - "targets": [ - { - "expr": "sort_desc(sum(kafka_consumergroup_lag_sum) by (consumergroup, topic))", - "format": "table", - "instant": true, - "interval": "", - "legendFormat": "Lag", - "refId": "A" - } - ], - "timeFrom": null, - "timeShift": null, - "title": "Consumer Group Lag", - "transformations": [ - { - "id": "organize", - "options": { - "excludeByName": { - "Time": true, - "__name__": true, - "consumergroup": false, - "endpoint": true, - "instance": true, - "job": true, - "namespace": true, - "pod": true, - "service": true - }, - "indexByName": {}, - "renameByName": { - "Value": "Lag", - "consumergroup": "", - "topic": "" - } - } - }, - { - "id": "organize", - "options": {} - } - ], - "type": "table" - }, - { - "datasource": null, - "fieldConfig": { - "defaults": { - "custom": { - "align": "center" - }, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - }, - { - "color": "red", - "value": 80 - } - ] - } - }, - "overrides": [] - }, - "gridPos": { - "h": 8, - "w": 12, - "x": 12, - "y": 2 - }, - "id": 138, - "options": { - "frameIndex": 1, - "showHeader": true, - "sortBy": [] - }, - "pluginVersion": "7.0.5", - "targets": [ - { - "expr": "sort_desc(sum(delta(kafka_consumergroup_current_offset[10m])) by (consumergroup, topic))", - "format": "table", - "instant": true, - "interval": "", - "legendFormat": "Lag", - "refId": "A" - } - ], - "timeFrom": null, - "timeShift": null, - "title": "Consumption Rate", - "transformations": [ - { - "id": "organize", - "options": { - "excludeByName": { - "Time": true, - "__name__": true, - "consumergroup": false, - "endpoint": true, - "instance": true, - "job": true, - "namespace": true, - "pod": true, - "service": true - }, - "indexByName": {}, - "renameByName": { - "Value": "Messages/5min", - "consumergroup": "", - "topic": "" - } - } - }, - { - "id": "organize", - "options": {} - } - ], - "type": "table" - }, - { - "datasource": null, - "fieldConfig": { - "defaults": { - "custom": { - "align": "center" - }, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - }, - { - "color": "red", - "value": 80 - } - ] - } - }, - "overrides": [ - { - "matcher": { - "id": "byName", - "options": "Dead Letters" - }, - "properties": [ - { - "id": "custom.displayMode", - "value": "color-text" - } - ] - } - ] - }, - "gridPos": { - "h": 9, - "w": 12, - "x": 0, - "y": 10 - }, - "id": 143, - "options": { - "frameIndex": 1, - "showHeader": true, - "sortBy": [ - { - "desc": true, - "displayName": "Value #B" - } - ] - }, - "pluginVersion": "7.0.5", - "targets": [ - { - "expr": "sort_desc(sum(kafka_topic_partition_current_offset{topic=~\".*deadletter\"}) by (topic))", - "format": "table", - "instant": true, - "interval": "", - "legendFormat": "Lag", - "refId": "A" - } - ], - "timeFrom": null, - "timeShift": null, - "title": "Dead Letters", - "transformations": [ - { - "id": "organize", - "options": { - "excludeByName": { - "Time": true, - "__name__": true, - "consumergroup": false, - "endpoint": true, - "instance": true, - "job": true, - "namespace": true, - "pod": true, - "service": true - }, - "indexByName": {}, - "renameByName": { - "Value": "Dead Letters", - "consumergroup": "", - "topic": "" - } - } - }, - { - "id": "organize", - "options": {} - } - ], - "type": "table" - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "Prometheus", - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, - "fill": 0, - "fillGradient": 0, - "gridPos": { - "h": 9, - "w": 12, - "x": 12, - "y": 10 - }, - "hiddenSeries": false, - "id": 142, - "legend": { - "alignAsTable": true, - "avg": false, - "current": false, - "max": false, - "min": false, - "rightSide": false, - "show": true, - "sideWidth": 480, - "sort": "current", - "sortDesc": true, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 1, - "links": [], - "nullPointMode": "connected", - "options": { - "dataLinks": [] - }, - "percentage": false, - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "sum(kafka_consumergroup_current_offset) by (consumergroup, topic)", - "format": "time_series", - "interval": "", - "intervalFactor": 1, - "legendFormat": "{{consumergroup}} (topic: {{topic}})", - "refId": "A" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Message Consumption", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "$$hashKey": "object:169", - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "$$hashKey": "object:170", - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - } - ], - "title": "Kafka Consumer Groups", - "type": "row" - }, - { - "collapsed": true, - "datasource": null, - "gridPos": { - "h": 1, - "w": 24, - "x": 0, - "y": 2 - }, - "id": 135, - "panels": [ - { - "cacheTimeout": null, - "datasource": "Prometheus", - "fieldConfig": { - "defaults": { - "custom": { - "align": "left" - }, - "mappings": [ - { - "id": 0, - "op": "=", - "text": "0", - "type": 1, - "value": "null" - } - ], - "nullValueMode": "connected", - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "#299c46", - "value": null - }, - { - "color": "#37872D", - "value": 0 - }, - { - "color": "#d44a3a" - } - ] - }, - "unit": "percentunit" - }, - "overrides": [] - }, - "gridPos": { - "h": 6, - "w": 10, - "x": 0, - "y": 2 - }, - "id": 133, - "interval": null, - "links": [], - "maxDataPoints": 100, - "options": { - "displayMode": "lcd", - "orientation": "horizontal", - "reduceOptions": { - "calcs": [ - "mean" - ], - "fields": "", - "values": false - }, - "showUnfilled": true - }, - "pluginVersion": "7.0.5", - "targets": [ - { - "expr": "kubelet_volume_stats_available_bytes{job=\"kubelet\",metrics_path=\"/metrics\",namespace=\"$namespace\"}\n / kubelet_volume_stats_capacity_bytes{job=\"kubelet\",metrics_path=\"/metrics\",namespace=\"$namespace\"}\n ", - "format": "time_series", - "hide": false, - "instant": true, - "interval": "", - "legendFormat": "{{persistentvolumeclaim}}", - "refId": "A" - }, - { - "expr": "", - "hide": true, - "refId": "B" - } - ], - "timeFrom": null, - "timeShift": null, - "title": "PVCs available capacity in namespacee $namespace", - "transparent": true, - "type": "bargauge" - }, - { - "aliasColors": { - "ReadOnly::k8s-aboutmckinsey-intranet-aboutmckinsey-prod-pvc-0::intranet-aboutmckinsey-prod-85c4d8fcd6-cq4vv": "dark-red", - "Total": "dark-red" - }, - "bars": false, - "cacheTimeout": null, - "dashLength": 10, - "dashes": false, - "datasource": "Prometheus", - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, - "fill": 0, - "fillGradient": 0, - "gridPos": { - "h": 6, - "w": 10, - "x": 10, - "y": 2 - }, - "hiddenSeries": false, - "id": 50, - "legend": { - "avg": false, - "current": false, - "max": false, - "min": false, - "rightSide": false, - "show": true, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 1, - "links": [], - "nullPointMode": "null", - "options": { - "dataLinks": [] - }, - "percentage": false, - "pointradius": 2, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "(kube_persistentvolumeclaim_access_mode{namespace=\"$namespace\"})", - "format": "time_series", - "hide": false, - "legendFormat": "{{access_mode}}::{{persistentvolumeclaim}}", - "refId": "B" - }, - { - "expr": "kube_persistentvolumeclaim_status_phase{namespace=\"$namespace\",phase=\"Bound\"}", - "legendFormat": "Bound::{{persistentvolumeclaim}}", - "refId": "A" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "persistentvolumeclaim status in namespace $namespace", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "transparent": true, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "none", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": false - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "cacheTimeout": null, - "datasource": "Prometheus", - "fieldConfig": { - "defaults": { - "custom": {}, - "mappings": [ - { - "id": 0, - "op": "=", - "text": "0", - "type": 1, - "value": "null" - } - ], - "nullValueMode": "connected", - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "#299c46", - "value": null - }, - { - "color": "#37872D", - "value": 0 - }, - { - "color": "#d44a3a" - } - ] - }, - "unit": "none" - }, - "overrides": [] - }, - "gridPos": { - "h": 6, - "w": 2, - "x": 20, - "y": 2 - }, - "id": 106, - "interval": null, - "links": [], - "maxDataPoints": 100, - "options": { - "colorMode": "value", - "fieldOptions": { - "calcs": [ - "lastNotNull" - ] - }, - "graphMode": "none", - "justifyMode": "auto", - "orientation": "horizontal", - "reduceOptions": { - "calcs": [ - "mean" - ], - "fields": "", - "values": true - } - }, - "pluginVersion": "7.0.5", - "targets": [ - { - "expr": "count(kube_persistentvolume_status_phase{job=\"kube-state-metrics\",phase=\"Failed\",namespace=\"$namespace\"} != 0) ", - "hide": false, - "instant": true, - "interval": "", - "legendFormat": "", - "refId": "A" - } - ], - "timeFrom": null, - "timeShift": null, - "title": "PVCs Failed", - "transparent": true, - "type": "stat" - }, - { - "cacheTimeout": null, - "datasource": "Prometheus", - "fieldConfig": { - "defaults": { - "custom": {}, - "mappings": [ - { - "id": 0, - "op": "=", - "text": "0", - "type": 1, - "value": "null" - } - ], - "nullValueMode": "connected", - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "#299c46", - "value": null - }, - { - "color": "#37872D", - "value": 0 - }, - { - "color": "#d44a3a" - } - ] - }, - "unit": "none" - }, - "overrides": [] - }, - "gridPos": { - "h": 6, - "w": 2, - "x": 22, - "y": 2 - }, - "id": 107, - "interval": null, - "links": [], - "maxDataPoints": 100, - "options": { - "colorMode": "value", - "fieldOptions": { - "calcs": [ - "lastNotNull" - ] - }, - "graphMode": "none", - "justifyMode": "auto", - "orientation": "horizontal", - "reduceOptions": { - "calcs": [ - "mean" - ], - "fields": "", - "values": true - } - }, - "pluginVersion": "7.0.5", - "targets": [ - { - "expr": "count(kube_persistentvolume_status_phase{job=\"kube-state-metrics\",phase=\"Pending\",namespace=\"$namespace\"} != 0)", - "hide": false, - "instant": true, - "interval": "", - "legendFormat": "", - "refId": "A" - } - ], - "timeFrom": null, - "timeShift": null, - "title": "PVCs Pending", - "transparent": true, - "type": "stat" - } - ], - "title": "Persistence Volumes", - "type": "row" - }, - { - "collapsed": true, - "datasource": "Prometheus", - "gridPos": { - "h": 1, - "w": 24, - "x": 0, - "y": 3 - }, - "id": 41, - "panels": [ - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": false, - "colors": [ - "#299c46", - "#37872D", - "#d44a3a" - ], - "datasource": "Prometheus", - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, - "format": "none", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": false, - "thresholdLabels": false, - "thresholdMarkers": true - }, - "gridPos": { - "h": 3, - "w": 3, - "x": 0, - "y": 21 - }, - "id": 53, - "interval": null, - "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], - "maxDataPoints": 100, - "nullPointMode": "connected", - "nullText": null, - "postfix": "", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "50%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": false, - "lineColor": "rgb(31, 120, 193)", - "show": true, - "ymax": null, - "ymin": null - }, - "tableColumn": "", - "targets": [ - { - "expr": "count(kube_deployment_created{namespace=\"$namespace\"})", - "hide": false, - "instant": false, - "legendFormat": "{{deployment}}", - "refId": "A" - }, - { - "expr": "", - "hide": true, - "refId": "B" - } - ], - "thresholds": "0,1", - "timeFrom": null, - "timeShift": null, - "title": "Deployments", - "transparent": true, - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ - { - "op": "=", - "text": "N/A", - "value": "null" - } - ], - "valueName": "current" - }, - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": false, - "colors": [ - "#299c46", - "rgba(237, 129, 40, 0.89)", - "#d44a3a" - ], - "datasource": "Prometheus", - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, - "format": "none", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": false, - "thresholdLabels": false, - "thresholdMarkers": true - }, - "gridPos": { - "h": 3, - "w": 3, - "x": 3, - "y": 21 - }, - "id": 44, - "interval": null, - "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], - "maxDataPoints": 100, - "nullPointMode": "connected", - "nullText": null, - "postfix": "", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "50%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": false, - "lineColor": "rgb(31, 120, 193)", - "show": true, - "ymax": null, - "ymin": null - }, - "tableColumn": "", - "targets": [ - { - "expr": "count(kube_pod_container_status_ready{namespace=\"$namespace\"} !=0 ) or vector(0)", - "hide": false, - "instant": false, - "interval": "", - "legendFormat": "{{pod}}", - "refId": "A" - }, - { - "expr": "", - "hide": true, - "refId": "B" - } - ], - "thresholds": "", - "timeFrom": null, - "timeShift": null, - "title": "Ready pods", - "transparent": true, - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ - { - "op": "=", - "text": "N/A", - "value": "null" - } - ], - "valueName": "current" - }, - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": true, - "colors": [ - "#299c46", - "#37872D", - "#d44a3a" - ], - "datasource": "Prometheus", - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, - "format": "none", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": false, - "thresholdLabels": false, - "thresholdMarkers": true - }, - "gridPos": { - "h": 3, - "w": 3, - "x": 6, - "y": 21 - }, - "id": 42, - "interval": null, - "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], - "maxDataPoints": 100, - "nullPointMode": "connected", - "nullText": null, - "postfix": "", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "50%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": false, - "lineColor": "rgb(31, 120, 193)", - "show": true, - "ymax": null, - "ymin": null - }, - "tableColumn": "", - "targets": [ - { - "expr": "count(kube_pod_container_status_terminated{namespace=\"$namespace\"} !=0 ) or vector(0)", - "hide": false, - "instant": false, - "legendFormat": "{{pod}}", - "refId": "A" - }, - { - "expr": "", - "hide": true, - "refId": "B" - } - ], - "thresholds": "0,1", - "timeFrom": null, - "timeShift": null, - "title": "Terminated pods", - "transparent": true, - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ - { - "op": "=", - "text": "N/A", - "value": "null" - } - ], - "valueName": "current" - }, - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": true, - "colors": [ - "#299c46", - "#37872D", - "#d44a3a" - ], - "datasource": "Prometheus", - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, - "format": "none", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": false, - "thresholdLabels": false, - "thresholdMarkers": true - }, - "gridPos": { - "h": 3, - "w": 3, - "x": 9, - "y": 21 - }, - "id": 45, - "interval": null, - "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], - "maxDataPoints": 100, - "nullPointMode": "connected", - "nullText": null, - "postfix": "", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "50%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": false, - "lineColor": "rgb(31, 120, 193)", - "show": true, - "ymax": null, - "ymin": null - }, - "tableColumn": "", - "targets": [ - { - "expr": "count(kube_pod_container_status_waiting{namespace=\"$namespace\"} !=0 ) or vector(0)", - "hide": false, - "instant": false, - "legendFormat": "{{pod}}", - "refId": "A" - }, - { - "expr": "", - "hide": true, - "refId": "B" - } - ], - "thresholds": "0,1", - "timeFrom": null, - "timeShift": null, - "title": "Waiting pods", - "transparent": true, - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ - { - "op": "=", - "text": "N/A", - "value": "null" - } - ], - "valueName": "current" - }, - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": false, - "colors": [ - "#299c46", - "#37872D", - "#d44a3a" - ], - "datasource": "Prometheus", - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, - "format": "none", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": false, - "thresholdLabels": false, - "thresholdMarkers": true - }, - "gridPos": { - "h": 3, - "w": 3, - "x": 12, - "y": 21 - }, - "id": 92, - "interval": null, - "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], - "maxDataPoints": 100, - "nullPointMode": "connected", - "nullText": null, - "postfix": "", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "50%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": false, - "lineColor": "rgb(31, 120, 193)", - "show": true, - "ymax": null, - "ymin": null - }, - "tableColumn": "", - "targets": [ - { - "expr": "count(container_spec_memory_reservation_limit_bytes{namespace=\"$namespace\",container=\"POD\",id!~\".*.burstable.*|.*.besteffort.*\",id!~\".*.scope\",pod!=\"\"})", - "hide": false, - "instant": false, - "interval": "", - "legendFormat": "{{pod}}", - "refId": "A" - }, - { - "expr": "", - "hide": true, - "refId": "B" - } - ], - "thresholds": "0,1", - "timeFrom": null, - "timeShift": null, - "title": "Guaranteed pods", - "transparent": true, - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ - { - "op": "=", - "text": "N/A", - "value": "null" - } - ], - "valueName": "current" - }, - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": false, - "colors": [ - "#299c46", - "#37872D", - "#d44a3a" - ], - "datasource": "Prometheus", - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, - "format": "none", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": false, - "thresholdLabels": false, - "thresholdMarkers": true - }, - "gridPos": { - "h": 3, - "w": 3, - "x": 15, - "y": 21 - }, - "id": 91, - "interval": null, - "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], - "maxDataPoints": 100, - "nullPointMode": "connected", - "nullText": null, - "postfix": "", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "50%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": false, - "lineColor": "rgb(31, 120, 193)", - "show": true, - "ymax": null, - "ymin": null - }, - "tableColumn": "", - "targets": [ - { - "expr": "sum(count by (pod)(container_spec_memory_reservation_limit_bytes{namespace=\"$namespace\",container=\"POD\"}))", - "hide": false, - "instant": false, - "interval": "", - "legendFormat": "", - "refId": "A" - }, - { - "expr": "", - "hide": true, - "refId": "B" - } - ], - "thresholds": "0,1", - "timeFrom": null, - "timeShift": null, - "title": "total pods", - "transparent": true, - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ - { - "op": "=", - "text": "N/A", - "value": "null" - } - ], - "valueName": "current" - }, - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": false, - "colors": [ - "#299c46", - "#37872D", - "#d44a3a" - ], - "datasource": "Prometheus", - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, - "format": "none", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": false, - "thresholdLabels": false, - "thresholdMarkers": true - }, - "gridPos": { - "h": 3, - "w": 3, - "x": 18, - "y": 21 - }, - "id": 89, - "interval": null, - "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], - "maxDataPoints": 100, - "nullPointMode": "connected", - "nullText": null, - "postfix": "", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "50%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": false, - "lineColor": "rgb(31, 120, 193)", - "show": true, - "ymax": null, - "ymin": null - }, - "tableColumn": "", - "targets": [ - { - "expr": "count(count by (pod)(container_spec_memory_reservation_limit_bytes{id=~\".*.besteffort.*\",id!~\".*.scope\",pod!=\"\",namespace=\"$namespace\"}))", - "hide": false, - "instant": false, - "interval": "", - "legendFormat": "{{pod}}", - "refId": "A" - }, - { - "expr": "", - "hide": true, - "refId": "B" - } - ], - "thresholds": "0,1", - "timeFrom": null, - "timeShift": null, - "title": "Besteffort pods", - "transparent": true, - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ - { - "op": "=", - "text": "N/A", - "value": "null" - } - ], - "valueName": "current" - }, - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": false, - "colors": [ - "#299c46", - "#37872D", - "#d44a3a" - ], - "datasource": "Prometheus", - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, - "format": "none", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": false, - "thresholdLabels": false, - "thresholdMarkers": true - }, - "gridPos": { - "h": 3, - "w": 3, - "x": 21, - "y": 21 - }, - "id": 94, - "interval": null, - "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], - "maxDataPoints": 100, - "nullPointMode": "connected", - "nullText": null, - "postfix": "", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "50%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": false, - "lineColor": "rgb(31, 120, 193)", - "show": true, - "ymax": null, - "ymin": null - }, - "tableColumn": "", - "targets": [ - { - "expr": "sum(count by (pod)(container_spec_memory_reservation_limit_bytes{id=~\".*.burstable.*\",id!~\".*.scope\",pod!=\"\",namespace=\"$namespace\",container=\"POD\"}))", - "hide": false, - "instant": false, - "interval": "", - "legendFormat": "", - "refId": "A" - }, - { - "expr": "", - "hide": true, - "refId": "B" - } - ], - "thresholds": "0,1", - "timeFrom": null, - "timeShift": null, - "title": "burstable pods", - "transparent": true, - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ - { - "op": "=", - "text": "N/A", - "value": "null" - } - ], - "valueName": "current" - }, - { - "cacheTimeout": null, - "datasource": "Prometheus", - "fieldConfig": { - "defaults": { - "custom": { - "align": "left", - "displayMode": "color-text" - }, - "mappings": [], - "noValue": "--", - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "dark-green", - "value": null - } - ] - }, - "unit": "decbytes" - }, - "overrides": [ - { - "matcher": { - "id": "byName", - "options": "pod" - }, - "properties": [ - { - "id": "custom.width", - "value": 366 - } - ] - }, - { - "matcher": { - "id": "byName", - "options": "host_ip" - }, - "properties": [ - { - "id": "custom.width", - "value": 104 - } - ] - }, - { - "matcher": { - "id": "byName", - "options": "pod_ip" - }, - "properties": [ - { - "id": "custom.width", - "value": 111 - } - ] - }, - { - "matcher": { - "id": "byName", - "options": "node" - }, - "properties": [ - { - "id": "custom.width", - "value": 202 - } - ] - }, - { - "matcher": { - "id": "byName", - "options": "Memory usage" - }, - "properties": [ - { - "id": "custom.width", - "value": null - } - ] - }, - { - "matcher": { - "id": "byName", - "options": "Status" - }, - "properties": [ - { - "id": "custom.width", - "value": 68 - }, - { - "id": "mappings", - "value": [ - { - "from": "", - "id": 0, - "operator": "", - "text": "Up", - "to": "", - "type": 1, - "value": "1" - }, - { - "from": "", - "id": 1, - "operator": "", - "text": "Down", - "to": "", - "type": 1, - "value": "0" - } - ] - }, - { - "id": "thresholds", - "value": { - "mode": "absolute", - "steps": [ - { - "color": "dark-red", - "value": null - }, - { - "color": "dark-green", - "value": 1 - } - ] - } - } - ] - }, - { - "matcher": { - "id": "byName", - "options": "Age" - }, - "properties": [ - { - "id": "custom.width", - "value": 92 - }, - { - "id": "unit", - "value": "s" - } - ] - }, - { - "matcher": { - "id": "byName", - "options": "Restarts" - }, - "properties": [ - { - "id": "custom.width", - "value": null - }, - { - "id": "unit", - "value": "none" - } - ] - }, - { - "matcher": { - "id": "byName", - "options": "CPU Usage" - }, - "properties": [ - { - "id": "custom.width", - "value": 247 - }, - { - "id": "unit" - } - ] - }, - { - "matcher": { - "id": "byName", - "options": "CPU Usage [95th Percentile]" - }, - "properties": [ - { - "id": "custom.width", - "value": 253 - }, - { - "id": "unit", - "value": "none" - } - ] - } - ] - }, - "gridPos": { - "h": 8, - "w": 24, - "x": 0, - "y": 24 - }, - "id": 104, - "links": [], - "options": { - "angular": { - "columns": [], - "fontSize": "100%", - "options": {}, - "pageSize": null, - "showHeader": true, - "sort": { - "col": 0, - "desc": true - }, - "styles": [ - { - "alias": "Time", - "align": "auto", - "dateFormat": "YYYY-MM-DD HH:mm:ss", - "pattern": "Time", - "type": "hidden" - }, - { - "alias": "", - "align": "auto", - "colorMode": null, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "decimals": 2, - "pattern": "/pod.*/", - "thresholds": [], - "type": "string", - "unit": "short" - }, - { - "alias": "", - "align": "auto", - "colorMode": null, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "dateFormat": "YYYY-MM-DD HH:mm:ss", - "decimals": 2, - "mappingType": 1, - "pattern": "node", - "thresholds": [], - "type": "string", - "unit": "short" - }, - { - "alias": "", - "align": "auto", - "colorMode": null, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "dateFormat": "YYYY-MM-DD HH:mm:ss", - "decimals": 2, - "mappingType": 1, - "pattern": "__name__", - "thresholds": [], - "type": "hidden", - "unit": "short" - }, - { - "alias": "", - "align": "auto", - "colorMode": null, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "dateFormat": "YYYY-MM-DD HH:mm:ss", - "decimals": 2, - "mappingType": 1, - "pattern": "/created.*/", - "thresholds": [], - "type": "hidden", - "unit": "short" - }, - { - "alias": "", - "align": "auto", - "colorMode": null, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "dateFormat": "YYYY-MM-DD HH:mm:ss", - "decimals": 2, - "mappingType": 1, - "pattern": "/prom.*/", - "thresholds": [], - "type": "hidden", - "unit": "short" - }, - { - "alias": "", - "align": "auto", - "colorMode": null, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "dateFormat": "YYYY-MM-DD HH:mm:ss", - "decimals": 2, - "mappingType": 1, - "pattern": "/job/", - "thresholds": [], - "type": "hidden", - "unit": "short" - }, - { - "alias": "", - "align": "auto", - "colorMode": null, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "dateFormat": "YYYY-MM-DD HH:mm:ss", - "decimals": 2, - "mappingType": 1, - "pattern": "service", - "thresholds": [], - "type": "hidden", - "unit": "short" - }, - { - "alias": "", - "align": "auto", - "colorMode": null, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "dateFormat": "YYYY-MM-DD HH:mm:ss", - "decimals": 2, - "mappingType": 1, - "pattern": "instance", - "thresholds": [], - "type": "hidden", - "unit": "short" - }, - { - "alias": "", - "align": "auto", - "colorMode": null, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "dateFormat": "YYYY-MM-DD HH:mm:ss", - "decimals": 2, - "mappingType": 1, - "pattern": "endpoint", - "thresholds": [], - "type": "hidden", - "unit": "short" - }, - { - "alias": "", - "align": "auto", - "colorMode": null, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "dateFormat": "YYYY-MM-DD HH:mm:ss", - "decimals": 2, - "mappingType": 1, - "pattern": "uid", - "thresholds": [], - "type": "hidden", - "unit": "short" - }, - { - "alias": "", - "align": "auto", - "colorMode": null, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "dateFormat": "YYYY-MM-DD HH:mm:ss", - "decimals": 2, - "mappingType": 1, - "pattern": "", - "thresholds": [], - "type": "number", - "unit": "short" - }, - { - "alias": "", - "align": "auto", - "colorMode": null, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "dateFormat": "YYYY-MM-DD HH:mm:ss", - "decimals": 2, - "mappingType": 1, - "pattern": "namespace", - "thresholds": [], - "type": "hidden", - "unit": "short" - }, - { - "alias": "", - "align": "auto", - "colorMode": null, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "dateFormat": "YYYY-MM-DD HH:mm:ss", - "decimals": 2, - "mappingType": 1, - "pattern": "Value", - "thresholds": [], - "type": "string", - "unit": "short", - "valueMaps": [] - } - ], - "transform": "table" - }, - "frameIndex": 0, - "showHeader": true, - "sortBy": [ - { - "desc": false, - "displayName": "pod" - } - ] - }, - "pluginVersion": "7.0.5", - "targets": [ - { - "expr": "kube_pod_container_status_ready{namespace=\"$namespace\"}", - "format": "table", - "hide": false, - "instant": true, - "interval": "", - "legendFormat": "", - "refId": "A" - }, - { - "expr": "sum\r\n by(pod) (container_memory_usage_bytes{container!=\"POD\",image!=\"\",job=\"kubelet\",metrics_path=\"/metrics/cadvisor\",namespace=\"$namespace\"})", - "format": "table", - "hide": false, - "instant": true, - "interval": "", - "legendFormat": "Memory usage", - "refId": "B" - }, - { - "expr": "kube_pod_info{namespace=\"$namespace\"}", - "format": "table", - "interval": "", - "legendFormat": "", - "refId": "C" - }, - { - "expr": "sum by(pod) (kube_pod_container_status_restarts_total{namespace=\"$namespace\"})", - "format": "table", - "hide": false, - "instant": true, - "interval": "", - "legendFormat": "", - "refId": "E" - }, - { - "expr": "quantile_over_time(0.95,\r\n sum by (pod) (\r\n rate(container_cpu_usage_seconds_total{namespace=\"$namespace\", container_name!=\"POD\"}[10m])\r\n )[2d:]\r\n)", - "format": "table", - "instant": true, - "interval": "", - "legendFormat": "CPU Usage [95th Percentile]", - "refId": "D" - } - ], - "timeFrom": null, - "timeShift": null, - "title": "pods running in $namespace", - "transformations": [ - { - "id": "filterFieldsByName", - "options": { - "include": { - "names": [ - "pod", - "Value #A", - "Value #B", - "host_ip", - "node", - "pod_ip", - "Value #E", - "Value #D" - ] - } - } - }, - { - "id": "seriesToColumns", - "options": { - "byField": "pod" - } - }, - { - "id": "organize", - "options": { - "excludeByName": {}, - "indexByName": { - "Value #A": 3, - "Value #B": 2, - "Value #D": 1, - "Value #E": 4, - "host_ip": 6, - "node": 7, - "pod": 0, - "pod_ip": 5 - }, - "renameByName": { - "Value #A": "Status", - "Value #B": "Memory usage", - "Value #C": "Age", - "Value #D": "CPU Usage [95th Percentile]", - "Value #E": "Restarts" - } - } - } - ], - "transparent": true, - "type": "table" - }, - { - "aliasColors": {}, - "bars": false, - "cacheTimeout": null, - "dashLength": 10, - "dashes": false, - "datasource": "Prometheus", - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, - "fill": 1, - "fillGradient": 0, - "gridPos": { - "h": 9, - "w": 11, - "x": 0, - "y": 32 - }, - "hiddenSeries": false, - "id": 78, - "legend": { - "avg": false, - "current": false, - "max": false, - "min": false, - "show": true, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 1, - "links": [], - "nullPointMode": "null", - "options": { - "dataLinks": [] - }, - "percentage": false, - "pointradius": 2, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "sum\n by(namespace) (rate(container_cpu_usage_seconds_total{container!=\"POD\",image!=\"\",job=\"kubelet\",metrics_path=\"/metrics/cadvisor\",namespace=\"$namespace\"}[10m]))", - "format": "time_series", - "hide": false, - "instant": false, - "interval": "", - "legendFormat": "{{namespace}}", - "refId": "A" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Total CPU usage in $namespace namespace", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "transparent": true, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "none", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "cacheTimeout": null, - "dashLength": 10, - "dashes": false, - "datasource": "Prometheus", - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, - "fill": 1, - "fillGradient": 0, - "gridPos": { - "h": 9, - "w": 13, - "x": 11, - "y": 32 - }, - "hiddenSeries": false, - "id": 101, - "legend": { - "avg": false, - "current": false, - "max": false, - "min": false, - "show": true, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 1, - "links": [], - "nullPointMode": "null", - "options": { - "dataLinks": [] - }, - "percentage": false, - "pointradius": 2, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "sum\n by(pod) (rate(container_cpu_usage_seconds_total{container!=\"POD\",image!=\"\",job=\"kubelet\",metrics_path=\"/metrics/cadvisor\",namespace=\"$namespace\"}[10m]))", - "format": "time_series", - "hide": false, - "instant": false, - "interval": "", - "legendFormat": "{{pod}}", - "refId": "A" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": " CPU usage by pod in $namespace namespace", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "transparent": true, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "none", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "Prometheus", - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, - "fill": 1, - "fillGradient": 0, - "gridPos": { - "h": 9, - "w": 10, - "x": 0, - "y": 41 - }, - "hiddenSeries": false, - "id": 48, - "legend": { - "avg": false, - "current": false, - "hideEmpty": true, - "hideZero": true, - "max": true, - "min": false, - "show": true, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 1, - "nullPointMode": "null", - "options": { - "dataLinks": [] - }, - "percentage": false, - "pluginVersion": "6.5.2", - "pointradius": 2, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "sum\n by(namespace) (container_memory_usage_bytes{container!=\"POD\",image!=\"\",job=\"kubelet\",metrics_path=\"/metrics/cadvisor\",namespace=\"$namespace\"})", - "hide": false, - "interval": "", - "legendFormat": "{{namespace}}", - "refId": "A" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Total memory usage by pods in $namespace", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "transparent": true, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "bytes", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": false - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "Prometheus", - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, - "fill": 1, - "fillGradient": 0, - "gridPos": { - "h": 8, - "w": 13, - "x": 11, - "y": 41 - }, - "hiddenSeries": false, - "id": 100, - "legend": { - "avg": true, - "current": false, - "hideEmpty": true, - "hideZero": true, - "max": true, - "min": true, - "show": true, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 1, - "nullPointMode": "null", - "options": { - "dataLinks": [] - }, - "percentage": false, - "pluginVersion": "6.5.2", - "pointradius": 2, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "sum\n by(pod) (container_memory_usage_bytes{container!=\"POD\",image!=\"\",job=\"kubelet\",metrics_path=\"/metrics/cadvisor\",namespace=\"$namespace\"})", - "hide": false, - "interval": "", - "legendFormat": "{{pod}}", - "refId": "A" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "memory usage by pods in $namespace", - "tooltip": { - "shared": true, - "sort": 2, - "value_type": "individual" - }, - "transparent": true, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "bytes", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": false - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - } - ], - "title": "Namespace $namespace details", - "type": "row" - }, - { - "collapsed": true, - "datasource": "Prometheus", - "gridPos": { - "h": 1, - "w": 24, - "x": 0, - "y": 4 - }, - "id": 39, - "panels": [ - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "Prometheus", - "description": "This panel shows the NotReady state of nodes. If any node goes in NotReady state, graph value will go from 1 to 0.", - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, - "fill": 0, - "fillGradient": 0, - "gridPos": { - "h": 6, - "w": 6, - "x": 0, - "y": 4 - }, - "hiddenSeries": false, - "id": 2, - "legend": { - "avg": false, - "current": false, - "max": false, - "min": false, - "show": true, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 1, - "nullPointMode": "null", - "options": { - "dataLinks": [] - }, - "percentage": false, - "pointradius": 2, - "points": false, - "renderer": "flot", - "scopedVars": { - "node": { - "selected": true, - "text": "ip-10-0-75-112.ap-south-1.compute.internal", - "value": "ip-10-0-75-112.ap-south-1.compute.internal" - } - }, - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "(kube_node_status_condition{status=\"true\",condition=\"Ready\",node=\"$node\"}) ", - "legendFormat": "{{node}}", - "refId": "A" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Node readiness for $node ", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "Prometheus", - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, - "fill": 1, - "fillGradient": 0, - "gridPos": { - "h": 6, - "w": 6, - "x": 6, - "y": 4 - }, - "hiddenSeries": false, - "id": 9, - "legend": { - "avg": false, - "current": false, - "max": false, - "min": false, - "show": true, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 1, - "nullPointMode": "null", - "options": { - "dataLinks": [] - }, - "percentage": false, - "pointradius": 2, - "points": false, - "renderer": "flot", - "scopedVars": { - "node": { - "selected": true, - "text": "ip-10-0-75-112.ap-south-1.compute.internal", - "value": "ip-10-0-75-112.ap-south-1.compute.internal" - } - }, - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "(kube_node_status_condition{status=\"true\",condition=~\"MemoryPressure|PIDPressure|DiskPressure\",node=\"$node\"})", - "interval": "", - "legendFormat": "{{condition}}", - "refId": "A" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "node $node Memory/Disk/PID Pressure", - "tooltip": { - "shared": true, - "sort": 1, - "value_type": "individual" - }, - "transformations": [], - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": false - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": false, - "colors": [ - "#299c46", - "rgba(237, 129, 40, 0.89)", - "#d44a3a" - ], - "datasource": "Prometheus", - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, - "format": "none", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": false, - "thresholdLabels": false, - "thresholdMarkers": true - }, - "gridPos": { - "h": 3, - "w": 3, - "x": 12, - "y": 4 - }, - "id": 10, - "interval": null, - "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], - "maxDataPoints": 100, - "nullPointMode": "connected", - "nullText": null, - "postfix": "", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "50%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "scopedVars": { - "node": { - "selected": true, - "text": "ip-10-0-75-112.ap-south-1.compute.internal", - "value": "ip-10-0-75-112.ap-south-1.compute.internal" - } - }, - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": true, - "lineColor": "rgb(31, 120, 193)", - "show": true, - "ymax": null, - "ymin": null - }, - "tableColumn": "", - "targets": [ - { - "expr": " count(count by (pod)(container_spec_memory_reservation_limit_bytes{node=\"$node\",pod!=\"\"}))", - "instant": false, - "interval": "", - "legendFormat": "{{node}}", - "refId": "A" - } - ], - "thresholds": "", - "timeFrom": null, - "timeShift": null, - "title": "pod count", - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ - { - "op": "=", - "text": "N/A", - "value": "null" - } - ], - "valueName": "current" - }, - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": false, - "colors": [ - "#299c46", - "rgba(237, 129, 40, 0.89)", - "#d44a3a" - ], - "datasource": "Prometheus", - "decimals": 0, - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, - "format": "none", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": false, - "thresholdLabels": false, - "thresholdMarkers": true - }, - "gridPos": { - "h": 3, - "w": 2, - "x": 15, - "y": 4 - }, - "id": 27, - "interval": null, - "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], - "maxDataPoints": 100, - "nullPointMode": "connected", - "nullText": null, - "postfix": "", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "50%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "scopedVars": { - "node": { - "selected": true, - "text": "ip-10-0-75-112.ap-south-1.compute.internal", - "value": "ip-10-0-75-112.ap-south-1.compute.internal" - } - }, - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": true, - "lineColor": "rgb(31, 120, 193)", - "show": true, - "ymax": null, - "ymin": null - }, - "tableColumn": "", - "targets": [ - { - "expr": "count(count by (pod)(container_spec_memory_reservation_limit_bytes{id=~\".*.besteffort.*\",container=\"POD\",node=\"$node\"}))", - "instant": false, - "interval": "", - "legendFormat": "", - "refId": "A" - } - ], - "thresholds": "", - "timeFrom": null, - "timeShift": null, - "title": "besteffort pods", - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ - { - "op": "=", - "text": "N/A", - "value": "null" - } - ], - "valueName": "avg" - }, - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": false, - "colors": [ - "#299c46", - "rgba(237, 129, 40, 0.89)", - "#d44a3a" - ], - "datasource": "Prometheus", - "decimals": 0, - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, - "format": "none", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": false, - "thresholdLabels": false, - "thresholdMarkers": true - }, - "gridPos": { - "h": 3, - "w": 2, - "x": 17, - "y": 4 - }, - "id": 93, - "interval": null, - "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], - "maxDataPoints": 100, - "nullPointMode": "connected", - "nullText": null, - "postfix": "", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "50%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "scopedVars": { - "node": { - "selected": true, - "text": "ip-10-0-75-112.ap-south-1.compute.internal", - "value": "ip-10-0-75-112.ap-south-1.compute.internal" - } - }, - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": true, - "lineColor": "rgb(31, 120, 193)", - "show": true, - "ymax": null, - "ymin": null - }, - "tableColumn": "", - "targets": [ - { - "expr": "sum(count by (pod)(container_spec_memory_reservation_limit_bytes{container=\"POD\",id=~\".*.burstable.*\",node=\"$node\"}))", - "instant": false, - "interval": "", - "legendFormat": "", - "refId": "A" - } - ], - "thresholds": "", - "timeFrom": null, - "timeShift": null, - "title": "burstable pods", - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ - { - "op": "=", - "text": "N/A", - "value": "null" - } - ], - "valueName": "avg" - }, - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": false, - "colors": [ - "#299c46", - "rgba(237, 129, 40, 0.89)", - "#d44a3a" - ], - "datasource": "Prometheus", - "decimals": 0, - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, - "format": "none", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": false, - "thresholdLabels": false, - "thresholdMarkers": true - }, - "gridPos": { - "h": 3, - "w": 2, - "x": 19, - "y": 4 - }, - "id": 26, - "interval": null, - "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], - "maxDataPoints": 100, - "nullPointMode": "connected", - "nullText": null, - "postfix": "", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "50%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "scopedVars": { - "node": { - "selected": true, - "text": "ip-10-0-75-112.ap-south-1.compute.internal", - "value": "ip-10-0-75-112.ap-south-1.compute.internal" - } - }, - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": true, - "lineColor": "rgb(31, 120, 193)", - "show": true, - "ymax": null, - "ymin": null - }, - "tableColumn": "", - "targets": [ - { - "expr": "sum(count by (pod)(container_spec_memory_reservation_limit_bytes{container=\"POD\",id!~\".*.burstable.*\",id!~\".*.besteffort.*\",node=\"$node\"}))", - "instant": false, - "interval": "", - "legendFormat": "", - "refId": "A" - } - ], - "thresholds": "", - "timeFrom": null, - "timeShift": null, - "title": "guaranteed pods", - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ - { - "op": "=", - "text": "N/A", - "value": "null" - } - ], - "valueName": "avg" - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "Prometheus", - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, - "fill": 0, - "fillGradient": 0, - "gridPos": { - "h": 6, - "w": 6, - "x": 12, - "y": 7 - }, - "hiddenSeries": false, - "id": 77, - "legend": { - "avg": false, - "current": true, - "max": false, - "min": false, - "show": true, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 1, - "nullPointMode": "null", - "options": { - "dataLinks": [] - }, - "percentage": false, - "pointradius": 2, - "points": false, - "renderer": "flot", - "scopedVars": { - "node": { - "selected": true, - "text": "ip-10-0-75-112.ap-south-1.compute.internal", - "value": "ip-10-0-75-112.ap-south-1.compute.internal" - } - }, - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "count by (namespace)(container_memory_working_set_bytes{image!=\"\",node=\"$node\"})", - "legendFormat": "{{namespace}}", - "refId": "A" - }, - { - "expr": "", - "refId": "B" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Pod count by namespace on $node ", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "decimals": 0, - "format": "short", - "label": "", - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": false - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "Prometheus", - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, - "fill": 0, - "fillGradient": 0, - "gridPos": { - "h": 6, - "w": 6, - "x": 18, - "y": 7 - }, - "hiddenSeries": false, - "id": 126, - "legend": { - "avg": false, - "current": true, - "max": false, - "min": false, - "show": true, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 1, - "nullPointMode": "null", - "options": { - "dataLinks": [] - }, - "percentage": false, - "pointradius": 2, - "points": false, - "renderer": "flot", - "scopedVars": { - "node": { - "selected": true, - "text": "ip-10-0-75-112.ap-south-1.compute.internal", - "value": "ip-10-0-75-112.ap-south-1.compute.internal" - } - }, - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": " histogram_quantile(0.99,\n sum by(instance, le) (rate(kubelet_pod_worker_duration_seconds_bucket{job=\"kubelet\",metrics_path=\"/metrics\",node=\"$node\"}[10m])))\n * on(instance) group_left(node) kubelet_node_name{job=\"kubelet\",metrics_path=\"/metrics\",node=\"$node\"}", - "interval": "", - "legendFormat": "{{node}}", - "refId": "A" - }, - { - "expr": "", - "refId": "B" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Pod startup latency ", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "decimals": 0, - "format": "µs", - "label": "", - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": false - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": { - "Total CPU": "dark-red" - }, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "Prometheus", - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, - "fill": 0, - "fillGradient": 0, - "gridPos": { - "h": 6, - "w": 6, - "x": 0, - "y": 10 - }, - "hiddenSeries": false, - "id": 7, - "legend": { - "avg": false, - "current": false, - "max": false, - "min": false, - "show": true, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 1, - "nullPointMode": "null", - "options": { - "dataLinks": [] - }, - "percentage": false, - "pointradius": 2, - "points": false, - "renderer": "flot", - "scopedVars": { - "node": { - "selected": true, - "text": "ip-10-0-75-112.ap-south-1.compute.internal", - "value": "ip-10-0-75-112.ap-south-1.compute.internal" - } - }, - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "node_load5 + on(instance) group_left(nodename) \nnode_uname_info{nodename=\"$node\"}", - "hide": false, - "interval": "", - "legendFormat": "{{nodename}}", - "refId": "A" - }, - { - "expr": "kube_node_status_capacity_cpu_cores{node=\"$node\"}", - "interval": "", - "legendFormat": "Total CPU", - "refId": "B" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Node $node load", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": false - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": { - "Total CPU": "dark-red" - }, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "Prometheus", - "description": "record: instance:node_cpu_utilisation:rate1m\nexpr: 1\n - avg without(cpu, mode) (rate(node_cpu_seconds_total{job=\"node-exporter\",mode=\"idle\"}[1m]))", - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, - "fill": 0, - "fillGradient": 0, - "gridPos": { - "h": 6, - "w": 6, - "x": 6, - "y": 10 - }, - "hiddenSeries": false, - "id": 4, - "legend": { - "avg": false, - "current": false, - "max": false, - "min": false, - "show": true, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 1, - "nullPointMode": "null", - "options": { - "dataLinks": [] - }, - "percentage": false, - "pointradius": 2, - "points": false, - "renderer": "flot", - "scopedVars": { - "node": { - "selected": true, - "text": "ip-10-0-75-112.ap-south-1.compute.internal", - "value": "ip-10-0-75-112.ap-south-1.compute.internal" - } - }, - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "\n((sum by (instance) (instance:node_cpu_utilisation:rate1m)) + on(instance) group_left(nodename) \nnode_uname_info{nodename=\"$node\"})", - "hide": false, - "interval": "", - "legendFormat": "{{nodename}}", - "refId": "A" - }, - { - "expr": "kube_node_status_capacity{node=\"$node\",resource=\"cpu\"}", - "interval": "", - "legendFormat": "Total CPU", - "refId": "B" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Node $node CPU usage", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": false - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": { - "Total CPU": "dark-red" - }, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "Prometheus", - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, - "fill": 0, - "fillGradient": 0, - "gridPos": { - "h": 6, - "w": 6, - "x": 12, - "y": 13 - }, - "hiddenSeries": false, - "id": 18, - "legend": { - "avg": false, - "current": false, - "max": false, - "min": false, - "show": true, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 1, - "nullPointMode": "null", - "options": { - "dataLinks": [] - }, - "percentage": false, - "pointradius": 2, - "points": false, - "renderer": "flot", - "scopedVars": { - "node": { - "selected": true, - "text": "ip-10-0-75-112.ap-south-1.compute.internal", - "value": "ip-10-0-75-112.ap-south-1.compute.internal" - } - }, - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "sum by (node)(kube_pod_container_resource_requests_cpu_cores{node=\"$node\"})", - "legendFormat": "requests", - "refId": "A" - }, - { - "expr": "kube_node_status_capacity{node=\"$node\",resource=\"cpu\"}", - "legendFormat": "Total CPU", - "refId": "B" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Total CPU requests on $node", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "decimals": 0, - "format": "none", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": false - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": { - "Total CPU": "dark-red" - }, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "Prometheus", - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, - "fill": 0, - "fillGradient": 0, - "gridPos": { - "h": 6, - "w": 6, - "x": 18, - "y": 13 - }, - "hiddenSeries": false, - "id": 20, - "legend": { - "avg": false, - "current": false, - "max": false, - "min": false, - "show": true, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 1, - "nullPointMode": "null", - "options": { - "dataLinks": [] - }, - "percentage": false, - "pointradius": 2, - "points": false, - "renderer": "flot", - "scopedVars": { - "node": { - "selected": true, - "text": "ip-10-0-75-112.ap-south-1.compute.internal", - "value": "ip-10-0-75-112.ap-south-1.compute.internal" - } - }, - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "sum by (node)(kube_pod_container_resource_limits_cpu_cores{node=\"$node\"})", - "interval": "", - "legendFormat": "total limits", - "refId": "A" - }, - { - "expr": "kube_node_status_capacity{node=\"$node\",resource=\"cpu\"}", - "hide": false, - "legendFormat": "Total CPU", - "refId": "B" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Total CPU limits on $node", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": false - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": { - "Total memory": "dark-red" - }, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "Prometheus", - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, - "fill": 0, - "fillGradient": 0, - "gridPos": { - "h": 6, - "w": 6, - "x": 0, - "y": 16 - }, - "hiddenSeries": false, - "id": 6, - "legend": { - "avg": false, - "current": false, - "max": false, - "min": false, - "show": true, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 1, - "nullPointMode": "null", - "options": { - "dataLinks": [] - }, - "percentage": false, - "pointradius": 2, - "points": false, - "renderer": "flot", - "scopedVars": { - "node": { - "selected": true, - "text": "ip-10-0-75-112.ap-south-1.compute.internal", - "value": "ip-10-0-75-112.ap-south-1.compute.internal" - } - }, - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "(node_memory_MemTotal_bytes + on(instance) group_left(nodename) \nnode_uname_info{nodename=\"$node\"}) - (node_memory_MemAvailable_bytes + on(instance) group_left(nodename) \nnode_uname_info{nodename=\"$node\"})", - "hide": false, - "interval": "", - "legendFormat": "{{nodename}}", - "refId": "A" - }, - { - "expr": "kube_node_status_capacity{node=\"$node\",resource=\"memory\"}", - "legendFormat": "Total memory", - "refId": "B" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Node $node memory usage", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "decbytes", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": { - "Total memory": "dark-red" - }, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "Prometheus", - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, - "fill": 0, - "fillGradient": 0, - "gridPos": { - "h": 6, - "w": 6, - "x": 6, - "y": 16 - }, - "hiddenSeries": false, - "id": 19, - "legend": { - "avg": false, - "current": false, - "max": false, - "min": false, - "show": true, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 1, - "nullPointMode": "null", - "options": { - "dataLinks": [] - }, - "percentage": false, - "pointradius": 2, - "points": false, - "renderer": "flot", - "scopedVars": { - "node": { - "selected": true, - "text": "ip-10-0-75-112.ap-south-1.compute.internal", - "value": "ip-10-0-75-112.ap-south-1.compute.internal" - } - }, - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "sum by (node)(kube_pod_container_resource_requests_memory_bytes{node=\"$node\"})", - "legendFormat": "requests", - "refId": "A" - }, - { - "expr": "kube_node_status_capacity{node=\"$node\",resource=\"memory\"}", - "legendFormat": "Total memory", - "refId": "B" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Total memory requests on $node", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "decbytes", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": false - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": { - "Total": "dark-red", - "Total memory": "dark-red" - }, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "Prometheus", - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, - "fill": 0, - "fillGradient": 0, - "gridPos": { - "h": 9, - "w": 6, - "x": 12, - "y": 19 - }, - "hiddenSeries": false, - "id": 21, - "legend": { - "avg": false, - "current": false, - "max": false, - "min": false, - "show": true, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 1, - "nullPointMode": "null", - "options": { - "dataLinks": [] - }, - "percentage": false, - "pointradius": 2, - "points": false, - "renderer": "flot", - "scopedVars": { - "node": { - "selected": true, - "text": "ip-10-0-75-112.ap-south-1.compute.internal", - "value": "ip-10-0-75-112.ap-south-1.compute.internal" - } - }, - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "sum by (node)(kube_pod_container_resource_limits_memory_bytes{node=\"$node\"})", - "legendFormat": "total liimits ", - "refId": "A" - }, - { - "expr": "kube_node_status_capacity{node=\"$node\",resource=\"memory\"}", - "legendFormat": "Total memory", - "refId": "B" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Total Memory limits on $node", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "decbytes", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": false - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "Prometheus", - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, - "fill": 0, - "fillGradient": 0, - "gridPos": { - "h": 9, - "w": 6, - "x": 18, - "y": 19 - }, - "hiddenSeries": false, - "id": 8, - "legend": { - "avg": false, - "current": true, - "max": true, - "min": false, - "show": true, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 1, - "nullPointMode": "null", - "options": { - "dataLinks": [] - }, - "percentage": false, - "pointradius": 2, - "points": false, - "renderer": "flot", - "scopedVars": { - "node": { - "selected": true, - "text": "ip-10-0-75-112.ap-south-1.compute.internal", - "value": "ip-10-0-75-112.ap-south-1.compute.internal" - } - }, - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "histogram_quantile(0.9, sum by (node,le) (rate(kubelet_pleg_relist_duration_seconds_bucket{node=\"$node\"}[10m])))", - "legendFormat": "{{node}}", - "refId": "A" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "kubelet_pleg_relist_duration_seconds_bucket", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "s", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": false - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "Prometheus", - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, - "fill": 0, - "fillGradient": 0, - "gridPos": { - "h": 6, - "w": 6, - "x": 0, - "y": 22 - }, - "hiddenSeries": false, - "id": 67, - "legend": { - "avg": false, - "current": false, - "max": false, - "min": false, - "show": true, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 1, - "nullPointMode": "null", - "options": { - "dataLinks": [] - }, - "percentage": false, - "pointradius": 2, - "points": false, - "renderer": "flot", - "scopedVars": { - "node": { - "selected": true, - "text": "ip-10-0-75-112.ap-south-1.compute.internal", - "value": "ip-10-0-75-112.ap-south-1.compute.internal" - } - }, - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": " sort(topk(5, container_memory_working_set_bytes{image!=\"\",node=\"$node\"}))", - "legendFormat": "{{pod}}", - "refId": "A" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Top 5 memory guzzling pods on $node", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "decbytes", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": false - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "Prometheus", - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, - "fill": 0, - "fillGradient": 0, - "gridPos": { - "h": 6, - "w": 6, - "x": 6, - "y": 22 - }, - "hiddenSeries": false, - "id": 117, - "legend": { - "avg": false, - "current": false, - "max": false, - "min": false, - "show": true, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 1, - "nullPointMode": "null", - "options": { - "dataLinks": [] - }, - "percentage": false, - "pointradius": 2, - "points": false, - "renderer": "flot", - "scopedVars": { - "node": { - "selected": true, - "text": "ip-10-0-75-112.ap-south-1.compute.internal", - "value": "ip-10-0-75-112.ap-south-1.compute.internal" - } - }, - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": " sort(topk(5, container_memory_working_set_bytes{image!=\"\",node=\"$node\"}))", - "legendFormat": "{{pod}}", - "refId": "A" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Top 5 memory guzzling pods on $node", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "decbytes", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": false - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - } - ], - "repeat": "node", - "scopedVars": { - "node": { - "selected": true, - "text": "ip-10-0-75-112.ap-south-1.compute.internal", - "value": "ip-10-0-75-112.ap-south-1.compute.internal" - } - }, - "title": "$node Node details", - "type": "row" - } - ], - "refresh": false, - "schemaVersion": 25, - "style": "dark", - "tags": [ - "kubernetes", - "k8s", - "namespace" - ], - "templating": { - "list": [ - { - "allValue": "", - "current": { - "selected": false, - "text": "ip-10-0-75-112.ap-south-1.compute.internal", - "value": "ip-10-0-75-112.ap-south-1.compute.internal" - }, - "datasource": "Prometheus", - "definition": "label_values(kube_node_created,node)", - "hide": 0, - "includeAll": false, - "label": null, - "multi": false, - "name": "node", - "options": [], - "query": "label_values(kube_node_created,node)", - "refresh": 1, - "regex": "", - "skipUrlSync": false, - "sort": 5, - "tagValuesQuery": "", - "tags": [], - "tagsQuery": "", - "type": "query", - "useTags": false - }, - { - "allValue": null, - "current": { - "selected": false, - "text": "monitoring", - "value": "monitoring" - }, - "datasource": "Prometheus", - "definition": "query_result(kube_namespace_labels)", - "hide": 0, - "includeAll": false, - "label": null, - "multi": false, - "name": "namespace", - "options": [], - "query": "query_result(kube_namespace_labels)", - "refresh": 1, - "regex": "/.*namespace=\"([^\"]*).*/", - "skipUrlSync": false, - "sort": 0, - "tagValuesQuery": "", - "tags": [], - "tagsQuery": "", - "type": "query", - "useTags": false - }, - { - "allValue": null, - "current": { - "selected": false, - "text": "alertmanager", - "value": "alertmanager" - }, - "datasource": "Prometheus", - "definition": "kube_pod_container_info{namespace=\"$namespace\"}", - "hide": 0, - "includeAll": false, - "label": null, - "multi": false, - "name": "container", - "options": [], - "query": "kube_pod_container_info{namespace=\"$namespace\"}", - "refresh": 1, - "regex": "/.*container=\"([^\"]*).*/", - "skipUrlSync": false, - "sort": 0, - "tagValuesQuery": "", - "tags": [], - "tagsQuery": "", - "type": "query", - "useTags": false - }, - { - "allValue": null, - "current": { - "selected": true, - "text": "6h", - "value": "6h" - }, - "hide": 0, - "includeAll": false, - "label": null, - "multi": false, - "name": "duration", - "options": [ - { - "selected": false, - "text": "10m", - "value": "10m" - }, - { - "selected": false, - "text": "30m", - "value": "30m" - }, - { - "selected": false, - "text": "1h", - "value": "1h" - }, - { - "selected": false, - "text": "2h", - "value": "2h" - }, - { - "selected": true, - "text": "6h", - "value": "6h" - }, - { - "selected": false, - "text": "12h", - "value": "12h" - }, - { - "selected": false, - "text": "1d", - "value": "1d" - }, - { - "selected": false, - "text": "2d", - "value": "2d" - }, - { - "selected": false, - "text": "5d", - "value": "5d" - }, - { - "selected": false, - "text": "14d", - "value": "14d" - }, - { - "selected": false, - "text": "30d", - "value": "30d" - } - ], - "query": "10m,30m,1h,2h,6h,12h,1d,2d,5d,14d,30d", - "queryValue": "", - "skipUrlSync": false, - "type": "custom" - } - ] - }, - "time": { - "from": "now-2d", - "to": "now" - }, - "timepicker": { - "refresh_intervals": [ - "30s", - "1m", - "5m", - "15m", - "30m", - "1h", - "2h", - "1d" - ] - }, - "timezone": "", - "title": "1 Kubernetes cluster overview(कुबरनेटेस)", - "uid": "N9uZBy8Wz", - "version": 1 -} diff --git a/configs/monitoring-dashboards/nginx-ingress-dashboard.json b/configs/monitoring-dashboards/nginx-ingress-dashboard.json deleted file mode 100644 index 7aa9811e..00000000 --- a/configs/monitoring-dashboards/nginx-ingress-dashboard.json +++ /dev/null @@ -1,1463 +0,0 @@ -{ - "annotations": { - "list": [ - { - "builtIn": 1, - "datasource": "-- Grafana --", - "enable": true, - "hide": true, - "iconColor": "rgba(0, 211, 255, 1)", - "name": "Annotations & Alerts", - "type": "dashboard" - }, - { - "datasource": "Prometheus", - "enable": true, - "expr": "sum(changes(nginx_ingress_controller_config_last_reload_successful_timestamp_seconds{instance!=\"unknown\",controller_class=~\"$controller_class\",namespace=~\"$namespace\"}[30s])) by (controller_class)", - "hide": false, - "iconColor": "rgba(255, 96, 96, 1)", - "limit": 100, - "name": "Config Reloads", - "showIn": 0, - "step": "30s", - "tagKeys": "controller_class", - "tags": [], - "titleFormat": "Config Reloaded", - "type": "tags" - } - ] - }, - "description": "This Dashboard contains metrics visualization of Nginx Ingress Controller Running in Kubernetes Using Prometheus as Datasource.", - "editable": true, - "gnetId": 12575, - "graphTooltip": 0, - "id": 1, - "iteration": 1595328866350, - "links": [], - "panels": [ - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": false, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "datasource": "Prometheus", - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, - "format": "ops", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": false, - "thresholdLabels": false, - "thresholdMarkers": true - }, - "id": 20, - "interval": null, - "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], - "maxDataPoints": 100, - "nullPointMode": "connected", - "nullText": null, - "postfix": "", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "50%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": true, - "lineColor": "rgb(31, 120, 193)", - "show": true - }, - "tableColumn": "", - "targets": [ - { - "expr": "round(sum(irate(nginx_ingress_controller_requests{controller_pod=~\"$controller\",controller_class=~\"$controller_class\",namespace=~\"$namespace\"}[$__range])), 0.001)", - "format": "time_series", - "intervalFactor": 1, - "refId": "A", - "step": 4 - } - ], - "thresholds": "", - "title": "Controller Request Volume", - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ - { - "op": "=", - "text": "N/A", - "value": "null" - } - ], - "valueName": "avg" - }, - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": false, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "datasource": "Prometheus", - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, - "format": "none", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": false, - "thresholdLabels": false, - "thresholdMarkers": true - }, - "gridPos": { - "h": 3, - "w": 6, - "x": 6, - "y": 0 - }, - "id": 82, - "interval": null, - "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], - "maxDataPoints": 100, - "nullPointMode": "connected", - "nullText": null, - "postfix": "", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "50%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": true, - "lineColor": "rgb(31, 120, 193)", - "show": true - }, - "tableColumn": "", - "targets": [ - { - "expr": "sum(avg_over_time(nginx_ingress_controller_nginx_process_connections{controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\"}[$__range]))", - "format": "time_series", - "instant": false, - "intervalFactor": 1, - "refId": "A", - "step": 4 - } - ], - "thresholds": "", - "title": "Controller Connections", - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ - { - "op": "=", - "text": "N/A", - "value": "null" - } - ], - "valueName": "avg" - }, - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": false, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "datasource": "Prometheus", - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, - "format": "percentunit", - "gauge": { - "maxValue": 100, - "minValue": 80, - "show": false, - "thresholdLabels": false, - "thresholdMarkers": false - }, - "gridPos": { - "h": 3, - "w": 6, - "x": 12, - "y": 0 - }, - "id": 21, - "interval": null, - "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], - "maxDataPoints": 100, - "nullPointMode": "connected", - "nullText": null, - "postfix": "", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "50%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": true, - "lineColor": "rgb(31, 120, 193)", - "show": true - }, - "tableColumn": "", - "targets": [ - { - "expr": "sum(rate(nginx_ingress_controller_requests{controller_pod=~\"$controller\",controller_class=~\"$controller_class\",namespace=~\"$namespace\",status!~\"[4-5].*\"}[$__range])) / sum(rate(nginx_ingress_controller_requests{controller_pod=~\"$controller\",controller_class=~\"$controller_class\",namespace=~\"$namespace\"}[$__range]))", - "format": "time_series", - "intervalFactor": 1, - "refId": "A", - "step": 4 - } - ], - "thresholds": "95, 99, 99.5", - "title": "Controller Success Rate (non-4|5xx responses)", - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ - { - "op": "=", - "text": "N/A", - "value": "null" - } - ], - "valueName": "avg" - }, - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": false, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "datasource": "Prometheus", - "decimals": 0, - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, - "format": "none", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": false, - "thresholdLabels": false, - "thresholdMarkers": true - }, - "gridPos": { - "h": 3, - "w": 3, - "x": 18, - "y": 0 - }, - "id": 81, - "interval": null, - "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], - "maxDataPoints": 100, - "nullPointMode": "connected", - "nullText": null, - "postfix": "", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "50%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": true, - "lineColor": "rgb(31, 120, 193)", - "show": true - }, - "tableColumn": "", - "targets": [ - { - "expr": "avg(irate(nginx_ingress_controller_success{controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\"}[$__range])) * 60", - "format": "time_series", - "instant": false, - "intervalFactor": 1, - "refId": "A", - "step": 4 - } - ], - "thresholds": "", - "title": "Config Reloads", - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ - { - "op": "=", - "text": "N/A", - "value": "null" - } - ], - "valueName": "total" - }, - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": false, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "datasource": "Prometheus", - "decimals": 0, - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, - "format": "none", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": false, - "thresholdLabels": false, - "thresholdMarkers": true - }, - "gridPos": { - "h": 3, - "w": 3, - "x": 21, - "y": 0 - }, - "id": 83, - "interval": null, - "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], - "maxDataPoints": 100, - "nullPointMode": "connected", - "nullText": null, - "postfix": "", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "50%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": true, - "lineColor": "rgb(31, 120, 193)", - "show": true - }, - "tableColumn": "", - "targets": [ - { - "expr": "count(nginx_ingress_controller_config_last_reload_successful{controller_pod=~\"$controller\",controller_namespace=~\"$namespace\"} == 0)", - "format": "time_series", - "instant": true, - "intervalFactor": 1, - "refId": "A", - "step": 4 - } - ], - "thresholds": "", - "title": "Last Config Failed", - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ - { - "op": "=", - "text": "N/A", - "value": "null" - } - ], - "valueName": "avg" - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "Prometheus", - "decimals": 2, - "editable": true, - "error": false, - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, - "fill": 1, - "fillGradient": 0, - "grid": {}, - "gridPos": { - "h": 7, - "w": 12, - "x": 0, - "y": 3 - }, - "height": "200px", - "hiddenSeries": false, - "id": 86, - "isNew": true, - "legend": { - "alignAsTable": true, - "avg": true, - "current": false, - "hideEmpty": false, - "hideZero": true, - "max": false, - "min": false, - "rightSide": true, - "show": true, - "sideWidth": 300, - "sort": "current", - "sortDesc": true, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 2, - "links": [], - "nullPointMode": "connected", - "options": { - "dataLinks": [] - }, - "percentage": false, - "pointradius": 5, - "points": false, - "renderer": "flot", - "repeat": null, - "repeatDirection": "h", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "round(sum(irate(nginx_ingress_controller_requests{controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\",ingress=~\"$ingress\"}[$__range])) by (ingress), 0.001)", - "format": "time_series", - "hide": false, - "instant": false, - "interval": "", - "intervalFactor": 1, - "legendFormat": "{{ ingress }}", - "metric": "network", - "refId": "A", - "step": 10 - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Ingress Request Volume", - "tooltip": { - "msResolution": false, - "shared": true, - "sort": 2, - "value_type": "cumulative" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "reqps", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "Bps", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": false - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": { - "max - istio-proxy": "#890f02", - "max - master": "#bf1b00", - "max - prometheus": "#bf1b00" - }, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "Prometheus", - "decimals": 2, - "editable": false, - "error": false, - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, - "fill": 0, - "fillGradient": 0, - "grid": {}, - "gridPos": { - "h": 7, - "w": 12, - "x": 12, - "y": 3 - }, - "hiddenSeries": false, - "id": 87, - "isNew": true, - "legend": { - "alignAsTable": true, - "avg": true, - "current": false, - "hideEmpty": true, - "hideZero": false, - "max": false, - "min": false, - "rightSide": true, - "show": true, - "sideWidth": 300, - "sort": "avg", - "sortDesc": true, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 2, - "links": [], - "nullPointMode": "connected", - "options": { - "dataLinks": [] - }, - "percentage": false, - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "sum(rate(nginx_ingress_controller_requests{controller_pod=~\"$controller\",controller_class=~\"$controller_class\",namespace=~\"$namespace\",ingress=~\"$ingress\",status!~\"[4-5].*\"}[5m])) by (ingress) / sum(rate(nginx_ingress_controller_requests{controller_pod=~\"$controller\",controller_class=~\"$controller_class\",namespace=~\"$namespace\",ingress=~\"$ingress\"}[5m])) by (ingress)", - "format": "time_series", - "instant": false, - "interval": "10s", - "intervalFactor": 1, - "legendFormat": "{{ ingress }}", - "metric": "container_memory_usage:sort_desc", - "refId": "A", - "step": 10 - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Ingress Success Rate (non-4|5xx responses)", - "tooltip": { - "msResolution": false, - "shared": true, - "sort": 1, - "value_type": "cumulative" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "percentunit", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": false - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "columns": [], - "datasource": "Prometheus", - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, - "fontSize": "100%", - "gridPos": { - "h": 8, - "w": 24, - "x": 0, - "y": 10 - }, - "hideTimeOverride": false, - "id": 75, - "links": [], - "pageSize": 7, - "repeat": null, - "repeatDirection": "h", - "scroll": true, - "showHeader": true, - "sort": { - "col": 1, - "desc": true - }, - "styles": [ - { - "alias": "Ingress", - "align": "auto", - "colorMode": null, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "dateFormat": "YYYY-MM-DD HH:mm:ss", - "decimals": 2, - "pattern": "ingress", - "preserveFormat": false, - "sanitize": false, - "thresholds": [], - "type": "string", - "unit": "short" - }, - { - "alias": "Requests", - "align": "auto", - "colorMode": null, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "dateFormat": "YYYY-MM-DD HH:mm:ss", - "decimals": 2, - "pattern": "Value #A", - "thresholds": [ - "" - ], - "type": "number", - "unit": "ops" - }, - { - "alias": "Errors", - "align": "auto", - "colorMode": null, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "dateFormat": "YYYY-MM-DD HH:mm:ss", - "decimals": 2, - "pattern": "Value #B", - "thresholds": [], - "type": "number", - "unit": "ops" - }, - { - "alias": "P50 Latency", - "align": "auto", - "colorMode": null, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "dateFormat": "YYYY-MM-DD HH:mm:ss", - "decimals": 0, - "link": false, - "pattern": "Value #C", - "thresholds": [], - "type": "number", - "unit": "dtdurations" - }, - { - "alias": "P90 Latency", - "align": "auto", - "colorMode": null, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "dateFormat": "YYYY-MM-DD HH:mm:ss", - "decimals": 0, - "pattern": "Value #D", - "thresholds": [], - "type": "number", - "unit": "dtdurations" - }, - { - "alias": "P99 Latency", - "align": "auto", - "colorMode": null, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "dateFormat": "YYYY-MM-DD HH:mm:ss", - "decimals": 0, - "pattern": "Value #E", - "thresholds": [], - "type": "number", - "unit": "dtdurations" - }, - { - "alias": "IN", - "align": "auto", - "colorMode": null, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "dateFormat": "YYYY-MM-DD HH:mm:ss", - "decimals": 2, - "pattern": "Value #F", - "thresholds": [ - "" - ], - "type": "number", - "unit": "Bps" - }, - { - "alias": "", - "align": "auto", - "colorMode": null, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "dateFormat": "YYYY-MM-DD HH:mm:ss", - "decimals": 2, - "pattern": "Time", - "thresholds": [], - "type": "hidden", - "unit": "short" - }, - { - "alias": "OUT", - "align": "auto", - "colorMode": null, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "dateFormat": "YYYY-MM-DD HH:mm:ss", - "decimals": 2, - "mappingType": 1, - "pattern": "Value #G", - "thresholds": [], - "type": "number", - "unit": "Bps" - } - ], - "targets": [ - { - "expr": "histogram_quantile(0.50, sum(rate(nginx_ingress_controller_request_duration_seconds_bucket{ingress!=\"\",controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\",ingress=~\"$ingress\"}[$__range])) by (le, ingress))", - "format": "table", - "hide": false, - "instant": true, - "intervalFactor": 1, - "legendFormat": "{{ ingress }}", - "refId": "C" - }, - { - "expr": "histogram_quantile(0.90, sum(rate(nginx_ingress_controller_request_duration_seconds_bucket{ingress!=\"\",controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\",ingress=~\"$ingress\"}[$__range])) by (le, ingress))", - "format": "table", - "hide": false, - "instant": true, - "intervalFactor": 1, - "legendFormat": "{{ ingress }}", - "refId": "D" - }, - { - "expr": "histogram_quantile(0.99, sum(rate(nginx_ingress_controller_request_duration_seconds_bucket{ingress!=\"\",controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\",ingress=~\"$ingress\"}[$__range])) by (le, ingress))", - "format": "table", - "hide": false, - "instant": true, - "intervalFactor": 1, - "legendFormat": "{{ destination_service }}", - "refId": "E" - }, - { - "expr": "sum(irate(nginx_ingress_controller_request_size_sum{ingress!=\"\",controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\",ingress=~\"$ingress\"}[$__range])) by (ingress)", - "format": "table", - "hide": false, - "instant": true, - "interval": "", - "intervalFactor": 1, - "legendFormat": "{{ ingress }}", - "refId": "F" - }, - { - "expr": "sum(irate(nginx_ingress_controller_response_size_sum{ingress!=\"\",controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\",ingress=~\"$ingress\"}[$__range])) by (ingress)", - "format": "table", - "instant": true, - "intervalFactor": 1, - "legendFormat": "{{ ingress }}", - "refId": "G" - } - ], - "timeFrom": null, - "title": "Ingress Percentile Response Times and Transfer Rates", - "transform": "table", - "type": "table-old" - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "Prometheus", - "decimals": 2, - "editable": true, - "error": false, - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, - "fill": 1, - "fillGradient": 0, - "grid": {}, - "gridPos": { - "h": 6, - "w": 8, - "x": 0, - "y": 18 - }, - "height": "200px", - "hiddenSeries": false, - "id": 32, - "isNew": true, - "legend": { - "alignAsTable": false, - "avg": true, - "current": true, - "max": false, - "min": false, - "rightSide": false, - "show": false, - "sideWidth": 200, - "sort": "current", - "sortDesc": true, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 2, - "links": [], - "nullPointMode": "connected", - "options": { - "dataLinks": [] - }, - "percentage": false, - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "sum (irate (nginx_ingress_controller_request_size_sum{controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\"}[5m]))", - "format": "time_series", - "instant": false, - "interval": "10s", - "intervalFactor": 1, - "legendFormat": "Received", - "metric": "network", - "refId": "A", - "step": 10 - }, - { - "expr": "- sum (irate (nginx_ingress_controller_response_size_sum{controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\"}[5m]))", - "format": "time_series", - "hide": false, - "interval": "10s", - "intervalFactor": 1, - "legendFormat": "Sent", - "metric": "network", - "refId": "B", - "step": 10 - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Network I/O pressure", - "tooltip": { - "msResolution": false, - "shared": true, - "sort": 0, - "value_type": "cumulative" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "Bps", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "Bps", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": false - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": { - "max - istio-proxy": "#890f02", - "max - master": "#bf1b00", - "max - prometheus": "#bf1b00" - }, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "Prometheus", - "decimals": 2, - "editable": false, - "error": false, - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, - "fill": 0, - "fillGradient": 0, - "grid": {}, - "gridPos": { - "h": 6, - "w": 8, - "x": 8, - "y": 18 - }, - "hiddenSeries": false, - "id": 77, - "isNew": true, - "legend": { - "alignAsTable": true, - "avg": true, - "current": true, - "max": false, - "min": false, - "rightSide": false, - "show": false, - "sideWidth": 200, - "sort": "current", - "sortDesc": true, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 2, - "links": [], - "nullPointMode": "connected", - "options": { - "dataLinks": [] - }, - "percentage": false, - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "avg(nginx_ingress_controller_nginx_process_resident_memory_bytes{controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\"}) ", - "format": "time_series", - "instant": false, - "interval": "10s", - "intervalFactor": 1, - "legendFormat": "nginx", - "metric": "container_memory_usage:sort_desc", - "refId": "A", - "step": 10 - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Average Memory Usage", - "tooltip": { - "msResolution": false, - "shared": true, - "sort": 2, - "value_type": "cumulative" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "bytes", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": false - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": { - "max - istio-proxy": "#890f02", - "max - master": "#bf1b00" - }, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "Prometheus", - "decimals": 3, - "editable": false, - "error": false, - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, - "fill": 0, - "fillGradient": 0, - "grid": {}, - "gridPos": { - "h": 6, - "w": 8, - "x": 16, - "y": 18 - }, - "height": "", - "hiddenSeries": false, - "id": 79, - "isNew": true, - "legend": { - "alignAsTable": true, - "avg": true, - "current": true, - "max": false, - "min": false, - "rightSide": false, - "show": false, - "sort": null, - "sortDesc": null, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 2, - "links": [], - "nullPointMode": "connected", - "options": { - "dataLinks": [] - }, - "percentage": false, - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "sum (rate (nginx_ingress_controller_nginx_process_cpu_seconds_total{controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\"}[5m])) ", - "format": "time_series", - "interval": "10s", - "intervalFactor": 1, - "legendFormat": "nginx", - "metric": "container_cpu", - "refId": "A", - "step": 10 - } - ], - "thresholds": [ - { - "colorMode": "critical", - "fill": true, - "line": true, - "op": "gt" - } - ], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Average CPU Usage", - "tooltip": { - "msResolution": true, - "shared": true, - "sort": 2, - "value_type": "cumulative" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "none", - "label": "cores", - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - } - ], - "refresh": "30s", - "schemaVersion": 25, - "style": "dark", - "tags": [ - "nginx" - ], - "templating": { - "list": [ - { - "current": { - "selected": false, - "text": "Prometheus", - "value": "Prometheus" - }, - "hide": 0, - "includeAll": false, - "label": "datasource", - "multi": false, - "name": "DS_PROMETHEUS", - "options": [], - "query": "prometheus", - "refresh": 1, - "regex": "", - "skipUrlSync": false, - "type": "datasource" - }, - { - "allValue": ".*", - "current": { - "selected": false, - "text": "All", - "value": "$__all" - }, - "datasource": "Prometheus", - "definition": "label_values(kube_service_status_load_balancer_ingress, namespace)", - "hide": 0, - "includeAll": true, - "label": "Namespace", - "multi": false, - "name": "namespace", - "options": [], - "query": "label_values(kube_service_status_load_balancer_ingress, namespace)", - "refresh": 1, - "regex": "", - "skipUrlSync": false, - "sort": 0, - "tagValuesQuery": "", - "tags": [], - "tagsQuery": "", - "type": "query", - "useTags": false - }, - { - "allValue": ".*", - "current": { - "selected": false, - "text": "All", - "value": "$__all" - }, - "datasource": "Prometheus", - "definition": "label_values(kube_service_status_load_balancer_ingress{namespace=~\"$namespace\"}, service)", - "hide": 0, - "includeAll": true, - "label": "Controller Class", - "multi": false, - "name": "controller_class", - "options": [], - "query": "label_values(kube_service_status_load_balancer_ingress{namespace=~\"$namespace\"}, service)", - "refresh": 1, - "regex": "", - "skipUrlSync": false, - "sort": 0, - "tagValuesQuery": "", - "tags": [], - "tagsQuery": "", - "type": "query", - "useTags": false - }, - { - "allValue": ".*", - "current": { - "selected": false, - "text": "All", - "value": "$__all" - }, - "datasource": "Prometheus", - "definition": "label_values(kube_service_status_load_balancer_ingress{namespace=~\"$namespace\",service=~\"$controller_class\"}, pod) ", - "hide": 0, - "includeAll": true, - "label": "Controller", - "multi": false, - "name": "controller", - "options": [], - "query": "label_values(kube_service_status_load_balancer_ingress{namespace=~\"$namespace\",service=~\"$controller_class\"}, pod) ", - "refresh": 1, - "regex": "", - "skipUrlSync": false, - "sort": 0, - "tagValuesQuery": "", - "tags": [], - "tagsQuery": "", - "type": "query", - "useTags": false - }, - { - "allValue": ".*", - "current": { - "selected": false, - "text": "All", - "value": "$__all" - }, - "datasource": "Prometheus", - "definition": "label_values(kube_service_status_load_balancer_ingress{namespace=~\"$namespace\",service=~\"$controller_class\",pod=~\"$controller\"}, ingress) ", - "hide": 0, - "includeAll": true, - "label": "Ingress", - "multi": false, - "name": "ingress", - "options": [], - "query": "label_values(kube_service_status_load_balancer_ingress{namespace=~\"$namespace\",service=~\"$controller_class\",pod=~\"$controller\"}, ingress) ", - "refresh": 1, - "regex": "", - "skipUrlSync": false, - "sort": 2, - "tagValuesQuery": "", - "tags": [], - "tagsQuery": "", - "type": "query", - "useTags": false - } - ] - }, - "time": { - "from": "now-30m", - "to": "now" - }, - "timepicker": { - "refresh_intervals": [ - "30s", - "1m", - "2m", - "5m", - "15m", - "30m", - "1h", - "2h", - "1d" - ], - "time_options": [ - "5m", - "15m", - "1h", - "6h", - "12h", - "24h", - "2d", - "7d", - "30d" - ] - }, - "timezone": "browser", - "title": "Kubernetes Ingress Controller Dashboard", - "uid": "nginx", - "version": 1 -} \ No newline at end of file diff --git a/configs/pdf-service/data-config/bill-amendment-note.json b/configs/pdf-service/data-config/bill-amendment-note.json deleted file mode 100644 index 77d8ee1f..00000000 --- a/configs/pdf-service/data-config/bill-amendment-note.json +++ /dev/null @@ -1,622 +0,0 @@ -{ - "key": "bill-amendment-credit-note", - "DataConfigs": { - "serviceName": "rainmaker-common", - "version": "1.0.0", - "baseKeyPath": "$.Amendments.*", - "entityIdPath":"$.id", - "isCommonTableBorderRequired": true, - "mappings": [ - { - "topic": "common-pdf-generation-3", - "mappings": [ - { - "direct": [ - { - "variable": "payerName", - "value": { - "path": "$.payerName" - } - }, - { - "variable": "applicationNo", - "value": { - "path": "$.consumerCode" - } - }, - { - "variable": "user-name", - "value": { - "path": "$.additionalDetails.ownerName" - } - }, - { - "variable": "permanentAddress", - "value": { - "path": "$.additionalDetails.ownerAddress" - } - }, - { - "variable": "date", - "value": { - "path": "$.userInfo.createdDate" - }, - "type":"selectFromRequestInfo" - }, - { - "variable": "payerContact", - "value": { - "path": "$.mobileNumber" - } - }, - { - "variable": "paymentStatus", - "value": { - "path": "$.paymentStatus" - } - }, - { - "variable": "receiptNo", - "value": { - "path": "$.paymentDetails[0].receiptNumber" - } - }, - { - "variable": "serviceType", - "value": { - "path": "$.businessService" - }, - "localisation":{ - "required":true, - "prefix":"MODULE", - "module":"rainmaker-common" - } - }, - { - "variable": "waterTax", - "value": { - "path": "$.demandDetails[?(@.taxHeadMasterCode == 'OM.WATER_CONNECTION/DISCONNECTION_FEES_TAX')].taxAmount" - } - }, - { - "variable": "water_cess", - "value": { - "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_WATER_CESS" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "waterCess", - "value": { - "path": "$.demandDetails[?(@.taxHeadMasterCode == 'WS_WATER_CESS')].taxAmount" - } - }, - { - "variable": "interest", - "value": { - "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_INTEREST" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "generated_by", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_GENERATED_BY" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "commissioner/eo", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_COMMISSIONER_EO" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "interestAmount", - "value": { - "path": "$.demandDetails[?(@.taxHeadMasterCode == 'WS_TIME_INTEREST')].taxAmount" - } - }, - { - "variable": "no_signature", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_NO_SIGNATURE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "penalty", - "value": { - "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_PENALTY" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "penaltyAmount", - "value": { - "path": "$.demandDetails[?(@.taxHeadMasterCode == 'WS_ADHOC_PENALTY')].taxAmount" - } - }, - { - "variable": "arrears", - "value": { - "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_ARREARS" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "arrearsAmount", - "value": { - "path": "$.demandDetails[?(@.taxHeadMasterCode == 'ARREARS_AMOUNT')].taxAmount" - } - }, - { - "variable": "total_amount", - "value": { - "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_TOTAL_AMOUNT" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "bill_amendment_application", - "value": { - "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_APPLICATION" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "demand_revision_basis_details", - "value": { - "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_DEM_REV_BAS_DET" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "demand_revision_basis", - "value": { - "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_DEM_REV_BASIS" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "court_order_no", - "value": { - "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_COURT_ORDER_NO" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "with_effect_from", - "value": { - "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_WITH_EFFECT_FROM" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "demandRevisionBasis", - "value": { - "path": "$.amendmentReason" - } - }, - { - "variable": "courtOrderNo", - "value": { - "path": "$.reasonDocumentNumber" - } - }, - { - "variable": "withEffectFrom", - "value": { - "path": "$.effectiveFrom" - } - }, - { - "variable": "court_order", - "value": { - "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_COURT_ORDER" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "note_id", - "value": { - "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_NOTE_ID" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "note_date", - "value": { - "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_NOTE_DATE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "against", - "value": { - "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_NOTE_AGAINST" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "adjustment_amount_details", - "value": { - "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_NOTE_ADJUSTMENT_AMOUNT_DETAILS" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "total_amount", - "value": { - "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_NOTE_TOTAL_AMOUNT" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "rs", - "value": { - "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_NOTE_RS" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "box_note", - "value": { - "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_NOTE_BOX_NOTE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "box_validity", - "value": { - "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_NOTE_BOX_VALIDITY" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "self_declaration", - "value": { - "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_SELF_DECLARATION" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "past_bills", - "value": { - "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_PAST_BILLS" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "courtOrder", - "value": { - "path": "$.transactionNumber" - } - }, - { - "variable": "selfDeclaration", - "value": { - "path": "$.transactionNumber" - } - }, - { - "variable": "pastBills", - "value": { - "path": "$.transactionNumber" - } - }, - { - "variable": "applicationNo", - "value": { - "path": "$.consumerCode" - } - }, - { - "variable": "bill_amendment_application_number", - "value": { - "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_APPLICATION_NUMBER" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "adjustment_amount_details", - "value": { - "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_ADJUSTMENT_AMOUNT_DETAILS" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - - }, - { - "variable": "sl_no", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_SERIAL_NO" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "tax_heads", - "value": { - "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_TAX_HEADS" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "reduced_amount", - "value": { - "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_REDUCED_AMOUNT" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "note_type", - "value": { - "path": "$.additionalDetails.noteType" - }, - "localisation": { - "required": true, - "prefix": "PDF_STATIC_LABEL_BILL_AMENDMENT", - "module": "rainmaker-common" - } - }, - { - "variable": "water_tax", - "value": { - "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_WATER_TAX" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "Municipal_Corporation", - "value": { - "path": "PDF_STATIC_LABEL_MDMS_MUNICIPAL_CORPORATION" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "footerLogoImage", - "url": "https://pb-egov-assets.s3.ap-south-1.amazonaws.com/mseva-logo-colored.png", - "type": "image" - } - ] - }, - { - "derived": [ - { - "variable": "totalAmount", - "formula": "{{arrearsAmount}}+{{penaltyAmount}}+{{interestAmount}}+{{waterCess}}+{{waterTax}}" - } - ] - }, - { - "externalAPI": [ - { - "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", - "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", - "apiRequest": null, - "responseMapping":[ - { - "variable":"address", - "value":"$.MdmsRes.tenant.tenants[0].address" - }, - { - "variable":"phoneNumber", - "value":"$.MdmsRes.tenant.tenants[0].contactNumber" - }, - { - "variable":"mcGrade", - "value":"$.MdmsRes.tenant.tenants[0].city.pwssbGrade" - }, - { - "variable":"website", - "value":"$.MdmsRes.tenant.tenants[0].domainUrl" - }, - { - "variable":"email", - "value":"$.MdmsRes.tenant.tenants[0].emailId" - }, - { - "variable": "logoImage", - "value":"$.MdmsRes.tenant.tenants[0].logoId", - "type":"image" - }, - { - "variable": "logo-header", - "value":"$.MdmsRes.tenant.tenants[0].code", - "localisation":{ - "required":true, - "prefix": "TENANT_TENANTS", - "module":"rainmaker-common" - } - } - ] - }, - { - "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", - "queryParam": "moduleName=tenant&masterName=footer&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}' %26%26 @.service=='{$.businessService}')%5D", - "apiRequest": null, - "responseMapping":[ - { - "variable": "variable11", - "value": "$.MdmsRes.tenant.footer[0].receiptFooterContent.*", - "type":"array", - "format":{ - "type":"string", - "scema":[ - { - "variable":"disclaimerContent", - "value":"disclaimer", - "type":"string", - "localisation":{ - "required":true, - "prefix": null, - "module": "rainmaker-common" - } - } - ] - } - } - ] - } - ] - } - ] - } - ] - } -} diff --git a/configs/pdf-service/data-config/bill-amendment.json b/configs/pdf-service/data-config/bill-amendment.json deleted file mode 100644 index c87b9ea8..00000000 --- a/configs/pdf-service/data-config/bill-amendment.json +++ /dev/null @@ -1,473 +0,0 @@ -{ - "key": "bill-amendment-summary", - "DataConfigs": { - "serviceName": "rainmaker-common", - "version": "1.0.0", - "baseKeyPath": "$.Amendments.*", - "entityIdPath":"$.id", - "isCommonTableBorderRequired": true, - "mappings": [ - { - "topic": "common-pdf-generation-3", - "mappings": [ - { - "direct": [ - { - "variable": "payerName", - "value": { - "path": "$.payerName" - } - }, - { - "variable": "user-name", - "value": { - "path": "$.userInfo.name" - }, - "type":"selectFromRequestInfo" - }, - { - "variable": "payerContact", - "value": { - "path": "$.mobileNumber" - } - }, - { - "variable": "paymentStatus", - "value": { - "path": "$.paymentStatus" - } - }, - { - "variable": "receiptNo", - "value": { - "path": "$.paymentDetails[0].receiptNumber" - } - }, - { - "variable": "bill_amendment_adjusted_amount", - "value": { - "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_ADJUSTED_AMOUNT" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "serviceType", - "value": { - "path": "$.businessService" - }, - "localisation":{ - "required":true, - "prefix":"MODULE", - "module":"rainmaker-common" - } - }, - { - "variable": "waterTax", - "value": { - "path": "$.demandDetails[?(@.taxHeadMasterCode == 'OM.WATER_CONNECTION/DISCONNECTION_FEES_TAX')].taxAmount" - } - }, - { - "variable": "water_cess", - "value": { - "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_WATER_CESS" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "waterCess", - "value": { - "path": "$.demandDetails[?(@.taxHeadMasterCode == 'WS_WATER_CESS')].taxAmount" - } - }, - { - "variable": "interest", - "value": { - "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_INTEREST" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "interestAmount", - "value": { - "path": "$.demandDetails[?(@.taxHeadMasterCode == 'WS_TIME_INTEREST')].taxAmount" - } - }, - { - "variable": "penalty", - "value": { - "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_PENALTY" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "penaltyAmount", - "value": { - "path": "$.demandDetails[?(@.taxHeadMasterCode == 'WS_ADHOC_PENALTY')].taxAmount" - } - }, - { - "variable": "arrears", - "value": { - "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_ARREARS" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "arrearsAmount", - "value": { - "path": "$.demandDetails[?(@.taxHeadMasterCode == 'ARREARS_AMOUNT')].taxAmount" - } - }, - { - "variable": "total_amount", - "value": { - "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_TOTAL_AMOUNT" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "bill_amendment_application", - "value": { - "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_APPLICATION" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "demand_revision_basis_details", - "value": { - "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_DEM_REV_BAS_DET" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "demand_revision_basis", - "value": { - "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_DEM_REV_BASIS" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "court_order_no", - "value": { - "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_COURT_ORDER_NO" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "with_effect_from", - "value": { - "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_WITH_EFFECT_FROM" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "demandRevisionBasis", - "value": { - "path": "$.amendmentReason" - } - }, - { - "variable": "courtOrderNo", - "value": { - "path": "$.reasonDocumentNumber" - } - }, - { - "variable": "withEffectFrom", - "value": { - "path": "$.effectiveFrom" - } - }, - { - "variable": "court_order", - "value": { - "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_COURT_ORDER" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "self_declaration", - "value": { - "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_SELF_DECLARATION" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "past_bills", - "value": { - "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_PAST_BILLS" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "courtOrder", - "value": { - "path": "$.transactionNumber" - } - }, - { - "variable": "selfDeclaration", - "value": { - "path": "$.transactionNumber" - } - }, - { - "variable": "pastBills", - "value": { - "path": "$.transactionNumber" - } - }, - { - "variable": "applicationNo", - "value": { - "path": "$.consumerCode" - } - }, - { - "variable": "bill_amendment_application_number", - "value": { - "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_APPLICATION_NUMBER" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "adjustment_amount_details", - "value": { - "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_ADJUSTMENT_AMOUNT_DETAILS" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - - }, - { - "variable": "sl_no", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_SERIAL_NO" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "tax_heads", - "value": { - "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_TAX_HEADS" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "reduced_amount", - "value": { - "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_REDUCED_AMOUNT" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "water_tax", - "value": { - "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_WATER_TAX" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "Municipal_Corporation", - "value": { - "path": "PDF_STATIC_LABEL_MDMS_MUNICIPAL_CORPORATION" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "footerLogoImage", - "url": "https://pb-egov-assets.s3.ap-south-1.amazonaws.com/mseva-logo-colored.png", - "type": "image" - } - ] - }, - { - "derived": [ - { - "variable": "totalAmount", - "formula": "{{arrearsAmount}}+{{penaltyAmount}}+{{interestAmount}}+{{waterCess}}+{{waterTax}}" - } - ] - }, - { - "externalAPI": [ - { - "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", - "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", - "apiRequest": null, - "responseMapping":[ - { - "variable":"address", - "value":"$.MdmsRes.tenant.tenants[0].address" - }, - { - "variable":"phoneNumber", - "value":"$.MdmsRes.tenant.tenants[0].contactNumber" - }, - { - "variable":"mcGrade", - "value":"$.MdmsRes.tenant.tenants[0].city.pwssbGrade" - }, - { - "variable":"website", - "value":"$.MdmsRes.tenant.tenants[0].domainUrl" - }, - { - "variable":"email", - "value":"$.MdmsRes.tenant.tenants[0].emailId" - }, - { - "variable": "logoImage", - "value":"$.MdmsRes.tenant.tenants[0].logoId", - "type":"image" - }, - { - "variable": "logo-header", - "value":"$.MdmsRes.tenant.tenants[0].code", - "localisation":{ - "required":true, - "prefix": "TENANT_TENANTS", - "module":"rainmaker-common" - } - } - ] - }, - { - "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", - "queryParam": "moduleName=tenant&masterName=footer&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}' %26%26 @.service=='{$.businessService}')%5D", - "apiRequest": null, - "responseMapping":[ - { - "variable": "variable11", - "value": "$.MdmsRes.tenant.footer[0].receiptFooterContent.*", - "type":"array", - "format":{ - "type":"string", - "scema":[ - { - "variable":"disclaimerContent", - "value":"disclaimer", - "type":"string", - "localisation":{ - "required":true, - "prefix": null, - "module": "rainmaker-common" - } - } - ] - } - } - ] - } - ] - } - ] - } - ] - } -} diff --git a/configs/pdf-service/data-config/bpa-revocation.json b/configs/pdf-service/data-config/bpa-revocation.json deleted file mode 100644 index c8b0b5e4..00000000 --- a/configs/pdf-service/data-config/bpa-revocation.json +++ /dev/null @@ -1,242 +0,0 @@ -{ - "key": "bpa-revocation", - "DataConfigs": { - "serviceName": "rainmaker-bpa", - "version": "1.0.0", - "baseKeyPath": "$.Bpa.*", - "entityIdPath": "$.applicationNo", - "isCommonTableBorderRequired": true, - "mappings": [ - { - "mappings": [ - { - "direct": [ - { - "variable": "logoImage", - "url": "https://raw.githubusercontent.com/egovernments/egov-web-app/master/web/rainmaker/dev-packages/egov-ui-kit-dev/src/assets/images/pblogo.png", - "type": "image" - }, - { - "variable": "applicationNo", - "value": { - "path": "$.applicationNo" - } - }, - { - "variable": "planPermissionNo", - "value": { - "path": "$.permitOrderNo" - } - }, - { - "variable": "tenantName", - "value": { - "path": "$.tenantId" - }, - "localisation": { - "required": true, - "prefix": "TENANT_TENANTS", - "module": "rainmaker-common" - } - }, - { - "variable": "createdDate", - "value": { - "path": "$.auditDetails.createdTime" - }, - "type": "date" - }, - { - "variable": "ownerName", - "value": { - "path": "$.owners.*.name" - } - }, - { - "variable": "Muncipal_Council", - "value": { - "path": "BPA_PDF_MUNCIPAL" - }, - "type" : "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "Revocation_Title", - "value": { - "path": "BPA_PDF_BPA_REVOCATION_TITLE" - }, - "type" : "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "Dated", - "value": { - "path": "BPA_PDF_DATED" - }, - "type" : "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "SALUTATION", - "value": { - "path": "BPA_PDF_SALUTATION" - }, - "type" : "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "Permision_Issued", - "value": { - "path": "BPA_PDF_PERMISSION_ISSUED" - }, - "type" : "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "WRT_APPNO", - "value": { - "path": "BPA_PDF_WRT_APPNO" - }, - "type" : "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "dated", - "value": { - "path": "BPA_PDF_DATED_SMALL" - }, - "type" : "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "isRevocated", - "value": { - "path": "BPA_PDF_IS_REVOCATED" - }, - "type" : "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "revocationReasonIs", - "value": { - "path": "BPA_PDF_REASON_REVOCATION_TXT" - }, - "type" : "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "noAuthText", - "value": { - "path": "BPA_PDF_NOT_AUTH_TXT" - }, - "type" : "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "contactULB", - "value": { - "path": "BPA_PDF_CONTACT_ULB" - }, - "type" : "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "BY_ORDER", - "value": { - "path": "BPA_PDF_BY_ORDER" - }, - "type" : "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "AUTH_OFFICER", - "value": { - "path": "BPA_PDF_AUTH_OFFICER" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "footerLogoImage", - "url": "https://pb-egov-assets.s3.ap-south-1.amazonaws.com/mseva-logo-colored.png", - "type": "image" - } - ] - }, - { - "externalAPI": [ - { - "path": "http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search", - "queryParam": "tenantId=$.tenantId,businessIds=$.applicationNo,history=true", - "apiRequest": null, - "responseMapping": [ - { - "variable": "revocatedBy", - "value": "$.ProcessInstances[?(@.action=='REVOCATE')].assigner.name", - "isUpperCaseRequired": true - }, - { - "variable": "revocationReason", - "value": "$.ProcessInstances[?(@.action=='REVOCATE')].comment" - } - ] - } - ] - } - ] - } - ] - } -} diff --git a/configs/pdf-service/data-config/buildingpermit-low.json b/configs/pdf-service/data-config/buildingpermit-low.json deleted file mode 100644 index bceb414a..00000000 --- a/configs/pdf-service/data-config/buildingpermit-low.json +++ /dev/null @@ -1,628 +0,0 @@ -{ - "key": "buildingpermit-low", - "DataConfigs": { - "serviceName": "rainmaker-bpa", - "version": "1.0.0", - "baseKeyPath": "$.Bpa.*", - "entityIdPath": "$.applicationNo", - "isCommonTableBorderRequired": true, - "mappings": [ - { - "mappings": [ - { - "direct": [ - { - "variable": "logoImage", - "url": "https://raw.githubusercontent.com/egovernments/egov-web-app/master/web/rainmaker/dev-packages/egov-ui-kit-dev/src/assets/images/pblogo.png", - "type": "image" - }, - { - "variable": "applicationNo", - "value": { - "path": "$.applicationNo" - } - }, - { - "variable": "planPermissionNo", - "value": { - "path": "$.permitOrderNo" - } - }, - { - "variable": "edcrNo", - "value": { - "path": "$.edcrNumber" - } - }, - { - "variable": "createdDate", - "value": { - "path": "$.auditDetails.createdTime" - }, - "type": "date" - }, - { - "variable": "favourOf", - "value": { - "path": "$.owners.*.name" - } - }, - { - "variable": "holdingNo", - "value": { - "path": "$.holdingNo" - } - }, - { - "variable": "validityDate", - "value": { - "path": "$.validityDate" - }, - "type": "date" - }, - { - "variable": "conditions", - "value": { - "path": "$.additionalDetails" - }, - "type": "array-column", - "format": { - "scema": [ - { - "key": "pendingapproval", - "type" : "array-orderedlist" - } - ] - } - }, - { - "variable": "reServeyPlotNo", - "value": { - "path": "$.additionalDetails.reSurveyPlotNo" - } - }, - { - "variable": "townPlanningScheme", - "value": { - "path": "$.additionalDetails.townPlanningScheme" - } - }, - { - "variable": "proposedLandUse", - "value": { - "path": "$.additionalDetails.proposedLandUse" - } - }, - { - "variable": "WRT_TXT", - "value": { - "path": "BOA_PDF_WRT_TXT" - }, - "type" : "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "tenantName", - "value": { - "path": "$.tenantId" - }, - "localisation": { - "required": true, - "prefix": "TENANT_TENANTS", - "module": "rainmaker-common" - } - }, - { - "variable": "GENERATED_ON", - "value": { - "path": "BPA_PDF_GENERATED_ON" - }, - "type" : "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "orderGeneratedOn", - "value": { - "path": "$.orderGeneratedDate" - }, - "type": "date" - }, - { - "variable": "Muncipal_Council", - "value": { - "path": "BPA_PDF_MUNCIPAL" - }, - "type" : "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "BPA_FORM", - "value": { - "path": "BPA_PDF_FORM" - }, - "type" : "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "BPA_FORM_APPROVAL", - "value": { - "path": "BPA_PDF_FORM_APPROVAL_TXT" - }, - "type" : "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "BPA_BYELAWS", - "value": { - "path": "BPA_PDF_BYELAWS" - }, - "type" : "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "PLAN_PERMISION_NO", - "value": { - "path": "BPA_PDF_PLANPERMISSION_NO" - }, - "type" : "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "Dated", - "value": { - "path": "BPA_PDF_DATED" - }, - "type" : "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "dated", - "value": { - "path": "BPA_PDF_DATED_SMALL" - }, - "type" : "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "PERMISSION_GRANT_TXT", - "value": { - "path": "BPA_PDF_PERMISSION_GRANT_TXT" - }, - "type" : "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "SALUTATION", - "value": { - "path": "BPA_PDF_SALUTATION" - }, - "type" : "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "FOR", - "value": { - "path": "BPA_PDF_FOR" - }, - "type" : "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "DSCR1", - "value": { - "path": "BPA_PDF_DSCR" - }, - "type" : "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "PLOT_NO", - "value": { - "path": "BPA_PDF_PLOTNO_TXT" - }, - "type" : "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "CS_PLOT", - "value": { - "path": "BPA_PDF_CS_PLOT" - }, - "type" : "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "MSP_PLOT", - "value": { - "path": "BPA_PDF_MSP_PLOT" - }, - "type" : "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "KHATA_NO", - "value": { - "path": "BPA_PDF_KHATANO_TXT" - }, - "type" : "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "HOLDING_NO", - "value": { - "path": "BPA_PDF_HOLDINGNO_TXT" - }, - "type" : "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "SERVEY_NO", - "value": { - "path": "BPA_PDF_SERVEYNO_TXT" - }, - "type" : "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "TOWNPLANNING_TXT", - "value": { - "path": "BPA_PDF_TOWN_PLANNING_TXT" - }, - "type" : "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "PROPOSE_LAND", - "value": { - "path": "BPA_PDF_PROPOSE_LAND" - }, - "type" : "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "OF", - "value": { - "path": "BPA_PDF_OF" - }, - "type" : "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "CONDNS_TXT", - "value": { - "path": "BPA_PDF_CONDNS_TXT" - }, - "type" : "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "PERMIT_DETAILS_TXT", - "value": { - "path": "BPA_PDF_PERMITFEE_DETAILS_TXT" - }, - "type" : "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "FEE_DSCR", - "value": { - "path": "BPA_PDF_FEE_DSCR" - }, - "type" : "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "AMOUNT", - "value": { - "path": "BPA_PDF_AMOUNT_TXT" - }, - "type" : "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "TOTAL", - "value": { - "path": "BPA_PDF_TOTAL" - }, - "type" : "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "BY_ORDER", - "value": { - "path": "BPA_PDF_BY_ORDER" - }, - "type" : "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "AUTH_OFFICER", - "value": { - "path": "BPA_PDF_COMMISSIONER" - }, - "type" : "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "VALIDITY_DSCR", - "value": { - "path": "BPA_PDF_VALIDITY_DSCR" - }, - "type" : "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "ONLY", - "value": { - "path": "BPA_PDF_ONLY" - }, - "type" : "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "NOTE", - "value": { - "path": "BPA_PDF_NOTE" - }, - "type" : "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "SUMMARY1", - "value": { - "path": "BPA_PDF_SUMMARY1" - }, - "type" : "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "SUMMARY2", - "value": { - "path": "BPA_PDF_SUMMARY2" - }, - "type" : "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "AUTH_DSCR", - "value": { - "path": "BPA_PDF_AUTH_DSCR" - }, - "type" : "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "Bihar_Tenant", - "value": { - "path": "BIHAR_TENANT" - }, - "type" : "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "applicantName", - "value": { - "path": "$.edcrDetail[0].planDetail.planInformation.applicantName" - } - }, - { - "variable": "applicationDate", - "value": { - "path": "$.edcrDetail[0].planDetail.applicationDate" - }, - "type": "date" - }, - { - "variable": "plotNo", - "value": { - "path": "$.edcrDetail[0].planDetail.planInformation.plotNo" - } - }, - { - "variable": "khataNo", - "value": { - "path": "$.edcrDetail[0].planDetail.planInformation.khataNo" - } - }, - { - "variable": "footerLogoImage", - "url": "https://pb-egov-assets.s3.ap-south-1.amazonaws.com/mseva-logo-colored.png", - "type": "image" - } - ] - }, - { - "externalAPI": [ - { - "path": "http://collection-services:8080/collection-services/payments/_search", - "queryParam": "tenantId=$.tenantId,consumerCodes=$.applicationNo", - "apiRequest": null, - "responseMapping": [ - { - "variable": "paymentDetails", - "value": "$.Payments[0].paymentDetails[0].bill.billDetails[0].billAccountDetails.*", - "type" : "array", - "format":{ - "type":"string", - "scema":[ - { - "variable": "headCode", - "value":"taxHeadCode", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "amnt", - "value":"amount" - } - ] - } - }, - { - "variable" : "totalDue", - "value" : "$.Payments[0].paymentDetails[0].bill.billDetails[0].amount" - } - ] - } - ] - }, - { - "qrcodeConfig": [ - { - "variable": "qrCode", - "value": "Applicant Name: {{favourOf}}, Permit Order Number : {{planPermissionNo}}, Permit Order Date : {{orderGeneratedOn}}, eDCR Scrutiny Number: {{edcrNo}}" - } - ] - } - ] - } - ] - } -} diff --git a/configs/pdf-service/data-config/buildingpermit.json b/configs/pdf-service/data-config/buildingpermit.json deleted file mode 100644 index 323c4c88..00000000 --- a/configs/pdf-service/data-config/buildingpermit.json +++ /dev/null @@ -1,647 +0,0 @@ -{ - "key": "buildingpermit", - "DataConfigs": { - "serviceName": "rainmaker-bpa", - "version": "1.0.0", - "baseKeyPath": "$.Bpa.*", - "entityIdPath": "$.applicationNo", - "isCommonTableBorderRequired": true, - "mappings": [ - { - "mappings": [ - { - "direct": [ - { - "variable": "logoImage", - "url": "https://raw.githubusercontent.com/egovernments/egov-web-app/master/web/rainmaker/dev-packages/egov-ui-kit-dev/src/assets/images/pblogo.png", - "type": "image" - }, - { - "variable": "applicationNo", - "value": { - "path": "$.applicationNo" - } - }, - { - "variable": "planPermissionNo", - "value": { - "path": "$.permitOrderNo" - } - }, - { - "variable": "edcrNo", - "value": { - "path": "$.edcrNumber" - } - }, - { - "variable": "createdDate", - "value": { - "path": "$.auditDetails.createdTime" - }, - "type": "date" - }, - { - "variable": "favourOf", - "value": { - "path": "$.owners.*.name" - } - }, - { - "variable": "holdingNo", - "value": { - "path": "$.holdingNo" - } - }, - { - "variable": "validityDate", - "value": { - "path": "$.validityDate" - }, - "type": "date" - }, - { - "variable": "conditions", - "value": { - "path": "$.additionalDetails" - }, - "type": "array-column", - "format": { - "scema": [ - { - "key": "pendingapproval", - "type" : "array-orderedlist" - } - ] - } - }, - { - "variable": "reServeyPlotNo", - "value": { - "path": "$.additionalDetails.reSurveyPlotNo" - } - }, - { - "variable": "townPlanningScheme", - "value": { - "path": "$.additionalDetails.townPlanningScheme" - } - }, - { - "variable": "proposedLandUse", - "value": { - "path": "$.additionalDetails.proposedLandUse" - } - }, - { - "variable": "WRT_TXT", - "value": { - "path": "BOA_PDF_WRT_TXT" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "tenantName", - "value": { - "path": "$.tenantId" - }, - "localisation": { - "required": true, - "prefix": "TENANT_TENANTS", - "module": "rainmaker-common" - } - }, - { - "variable": "GENERATED_ON", - "value": { - "path": "BPA_PDF_GENERATED_ON" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "orderGeneratedOn", - "value": { - "path": "$.orderGeneratedDate" - }, - "type": "date" - }, - { - "variable": "Muncipal_Council", - "value": { - "path": "BPA_PDF_MUNCIPAL" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "BPA_FORM", - "value": { - "path": "BPA_PDF_FORM" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "BPA_FORM_APPROVAL", - "value": { - "path": "BPA_PDF_FORM_APPROVAL_TXT" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "BPA_BYELAWS", - "value": { - "path": "BPA_PDF_BYELAWS" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "PLAN_PERMISION_NO", - "value": { - "path": "BPA_PDF_PLANPERMISSION_NO" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "Dated", - "value": { - "path": "BPA_PDF_DATED" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "dated", - "value": { - "path": "BPA_PDF_DATED_SMALL" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "PERMISSION_GRANT_TXT", - "value": { - "path": "BPA_PDF_PERMISSION_GRANT_TXT" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "SALUTATION", - "value": { - "path": "BPA_PDF_SALUTATION" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "FOR", - "value": { - "path": "BPA_PDF_FOR" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "DSCR1", - "value": { - "path": "BPA_PDF_DSCR" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "PLOT_NO", - "value": { - "path": "BPA_PDF_PLOTNO_TXT" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "CS_PLOT", - "value": { - "path": "BPA_PDF_CS_PLOT" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "MSP_PLOT", - "value": { - "path": "BPA_PDF_MSP_PLOT" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "KHATA_NO", - "value": { - "path": "BPA_PDF_KHATANO_TXT" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "HOLDING_NO", - "value": { - "path": "BPA_PDF_HOLDINGNO_TXT" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "SERVEY_NO", - "value": { - "path": "BPA_PDF_SERVEYNO_TXT" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "TOWNPLANNING_TXT", - "value": { - "path": "BPA_PDF_TOWN_PLANNING_TXT" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "PROPOSE_LAND", - "value": { - "path": "BPA_PDF_PROPOSE_LAND" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "OF", - "value": { - "path": "BPA_PDF_OF" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "CONDNS_TXT", - "value": { - "path": "BPA_PDF_CONDNS_TXT" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "PERMIT_DETAILS_TXT", - "value": { - "path": "BPA_PDF_PERMITFEE_DETAILS_TXT" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "FEE_DSCR", - "value": { - "path": "BPA_PDF_FEE_DSCR" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "AMOUNT", - "value": { - "path": "BPA_PDF_AMOUNT_TXT" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "TOTAL", - "value": { - "path": "BPA_PDF_TOTAL" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "BY_ORDER", - "value": { - "path": "BPA_PDF_BY_ORDER" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "AUTH_OFFICER", - "value": { - "path": "BPA_PDF_AUTH_OFFICER" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "VALIDITY_DSCR", - "value": { - "path": "BPA_PDF_VALIDITY_DSCR" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "ONLY", - "value": { - "path": "BPA_PDF_ONLY" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "NOTE", - "value": { - "path": "BPA_PDF_NOTE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "SUMMARY1", - "value": { - "path": "BPA_PDF_SUMMARY1" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "SUMMARY2", - "value": { - "path": "BPA_PDF_SUMMARY2" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "AUTH_DSCR", - "value": { - "path": "BPA_PDF_AUTH_DSCR" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "Bihar_Tenant", - "value": { - "path": "BIHAR_TENANT" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-bpa" - } - }, - { - "variable": "applicantName", - "value": { - "path": "$.edcrDetail[0].planDetail.planInformation.applicantName" - } - }, - { - "variable": "applicationDate", - "value": { - "path": "$.edcrDetail[0].planDetail.applicationDate" - }, - "type": "date" - }, - { - "variable": "plotNo", - "value": { - "path": "$.edcrDetail[0].planDetail.planInformation.plotNo" - } - }, - { - "variable": "khataNo", - "value": { - "path": "$.edcrDetail[0].planDetail.planInformation.khataNo" - } - }, - { - "variable": "footerLogoImage", - "url": "https://pb-egov-assets.s3.ap-south-1.amazonaws.com/mseva-logo-colored.png", - "type": "image" - } - ] - }, - { - "externalAPI": [ - { - "path": "http://collection-services:8080/collection-services/payments/_search", - "queryParam": "tenantId=$.tenantId,consumerCodes=$.applicationNo", - "apiRequest": null, - "responseMapping": [ - { - "variable": "sanHeadCode", - "value": "$.Payments[0].paymentDetails[0].bill.billDetails[0].billAccountDetails[0].taxHeadCode", - "localisation": { - "required": true, - "prefix": "BPA", - "module": "rainmaker-bpa" - } - }, - { - "variable": "sanFee", - "value": "$.Payments[0].paymentDetails[0].bill.billDetails[0].billAccountDetails[0].amount" - }, - { - "variable": "appHeadCode", - "value": "$.Payments[1].paymentDetails[0].bill.billDetails[0].billAccountDetails[0].taxHeadCode", - "localisation": { - "required": true, - "prefix": "BPA", - "module": "rainmaker-bpa" - } - }, - { - "variable": "appFee", - "value": "$.Payments[1].paymentDetails[0].bill.billDetails[0].billAccountDetails[0].amount" - } - ] - }, - { - "path": "http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search", - "queryParam": "tenantId=$.tenantId,businessIds=$.applicationNo,history=true", - "apiRequest": null, - "responseMapping": [ - { - "variable": "approvedBy", - "value": "$.ProcessInstances[?(@.action=='APPROVE')].assigner.name", - "isUpperCaseRequired": true - } - ] - } - ] - }, - { - "derived": [ - { - "variable": "totalDue", - "formula": "{{sanFee}}+{{appFee}}" - } - ] - }, - { - "qrcodeConfig": [ - { - "variable": "qrCode", - "value": "Applicant Name: {{favourOf}}, Permit Order Number : {{planPermissionNo}}, Permit Order Date : {{orderGeneratedOn}}, eDCR Scrutiny Number: {{edcrNo}}, Approver Name : {{approvedBy}}" - } - ] - } - ] - } - ] - } -} diff --git a/configs/pdf-service/data-config/consolidated-pdf1.json b/configs/pdf-service/data-config/consolidated-pdf1.json deleted file mode 100644 index d70a7755..00000000 --- a/configs/pdf-service/data-config/consolidated-pdf1.json +++ /dev/null @@ -1,129 +0,0 @@ -{ - "key": "consolidated-pdf1", - "DataConfigs": { - "serviceName": "rainmaker-common", - "version": "1.0.0", - "baseKeyPath": "$.Receipt.*", - "isCommonTableBorderRequired": true, - "mappings": [ - { - "topic": "common-pdf-generation-1", - "staticConfigPath": "https://raw.githubusercontent.com/egovernments/egov-services/vishal-feature-filestore/core/egov-indexer/src/main/resources/rainmaker-pgr-indexer.yml", - "mappings": [ - { - "direct": [ - { - "variable": "variable1", - "value": { - "path": "$.Bill[0].payerName" - } - }, - { - "variable": "variable2", - "value": { - "path": "$.Bill[0].mobileNumber" - } - }, - { - "variable": "variable3", - "value": { - "path": "$.Bill[0].billDetails[0].receiptNumber" - } - }, - { - "variable": "variable4", - "value": { - "path": "$.Bill[0].taxAndPayments[0].businessService" - } - }, - { - "variable": "variable5", - "value": { - "path": "$.Bill[0].taxAndPayments[0].amountPaid" - } - }, - { - "variable": "variable6", - "value": { - "path": "$.Bill[0].billDetails[0].fromPeriod" - } - }, - { - "variable": "variable7", - "value": { - "path": "$.Bill[0].billDetails[0].toPeriod" - } - }, - { - "variable": "variable8", - "value": { - "path": "$.Bill[0].billDetails[0].billDate" - } - }, - { - "variable": "variable9", - "value": { - "path": "$.instrument.instrumentType.name" - } - }, - { - "variable": "variable10", - "value": { - "path": "$.Bill[0].billDetails[0].manualReceiptNumber" - } - }, - { - "variable": "variable11", - "value": { - "path": "$.Bill[0].billDetails[0].manualReceiptDate" - } - }, - { - "variable": "variable12", - "value": { - "path": "$.Bill[0].billDetails[0].totalAmount" - } - }, - { - "variable": "variable13", - "value": { - "path": "$.Receipt[0].instrument.transactionDateInput" - } - }, - { - "variable": "variable14", - "value": { - "path": "$.consumerCode" - } - }, - { - "variable": "variable15", - "value": { - "path": "$.transactionId" - } - }, - { - "variable": "variable16", - "url":"https://raw.githubusercontent.com/egovernments/egov-web-app/master/web/rainmaker/dev-packages/egov-ui-kit-dev/src/assets/images/pblogo.png", - "type":"image" - }, - { - "variable": "footerLogoImage", - "url": "https://pb-egov-assets.s3.ap-south-1.amazonaws.com/mseva-logo-colored.png", - "type": "image" - } - ] - }, - { - "derived": [ - { - "variable": "variable19", - "formula": "{{variable12}}-{{variable5}}" - } - ] - } - ] - } - ] - } -} diff --git a/configs/pdf-service/data-config/consolidated-pdf2.json b/configs/pdf-service/data-config/consolidated-pdf2.json deleted file mode 100644 index fa20ca23..00000000 --- a/configs/pdf-service/data-config/consolidated-pdf2.json +++ /dev/null @@ -1,129 +0,0 @@ -{ - "key": "consolidated-pdf2", - "DataConfigs": { - "serviceName": "rainmaker-common", - "version": "1.0.0", - "baseKeyPath": "$.Receipt.*", - "isCommonTableBorderRequired": true, - "mappings": [ - { - "topic": "common-pdf-generation-1", - "staticConfigPath": "https://raw.githubusercontent.com/egovernments/egov-services/vishal-feature-filestore/core/egov-indexer/src/main/resources/rainmaker-pgr-indexer.yml", - "mappings": [ - { - "direct": [ - { - "variable": "variable1", - "url": "https://raw.githubusercontent.com/egovernments/egov-web-app/master/web/rainmaker/dev-packages/egov-ui-kit-dev/src/assets/images/pblogo.png", - "type": "image" - }, - { - "variable": "variable2", - "value": { - "path": "$.Bill[0].payerName" - } - }, - { - "variable": "variable3", - "value": { - "path": "$.Bill[0].mobileNumber" - } - }, - { - "variable": "variable4", - "value": { - "path": "$.Bill[0].payerAddress" - } - }, - { - "variable": "variable5", - "value": { - "path": "$.Bill[0].billDetails[0].billNumber" - } - }, - { - "variable": "variable6", - "value": { - "path": "$.Bill[0].billDetails[0].fromPeriod" - } - }, - { - "variable": "variable7", - "value": { - "path": "$.Bill[0].billDetails[0].toPeriod" - } - }, - { - "variable": "variable8", - "value": { - "path": "$.Bill[0].billDetails[0].billDate" - } - }, - { - "variable": "variable9", - "value": { - "path": "$.Bill[0].billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_TIME_PENALTY')].amount" - } - }, - { - "variable": "variable10", - "value": { - "path": "$.Bill[0].billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_TIME_REBATE')].amount" - } - }, - { - "variable": "variable11", - "value": { - "path": "$.Bill[0].billDetails[0].totalAmount" - } - }, - { - "variable": "variable12", - "value": { - "path": "$.transactionId" - } - }, - { - "variable": "variable13", - "value": { - "path": "$.Bill[0].billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_TIME_REBATE')].amount" - } - }, - { - "variable": "variable14", - "value": { - "path": "$.Receipt[0].Bill[0].billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_TAX')].amount" - } - }, - { - "variable": "variable15", - "value": { - "path": "$.consumerCode" - } - }, - { - "variable": "variable16", - "value": { - "path": "$.Bill[0].billDetails[0].amountPaid" - } - }, - { - "variable": "footerLogoImage", - "url": "https://pb-egov-assets.s3.ap-south-1.amazonaws.com/mseva-logo-colored.png", - "type": "image" - } - ] - }, - { - "derived": [ - { - "variable": "variable19", - "formula": "{{variable16}}-{{variable17}}" - } - ] - } - ] - } - ] - } -} diff --git a/configs/pdf-service/data-config/consolidatedbill.json b/configs/pdf-service/data-config/consolidatedbill.json deleted file mode 100644 index 98b8d197..00000000 --- a/configs/pdf-service/data-config/consolidatedbill.json +++ /dev/null @@ -1,707 +0,0 @@ -{ - "key": "consolidatedbill", - "DataConfigs": { - "serviceName": "rainmaker-common", - "version": "1.0.0", - "baseKeyPath": "$.Bill.*", - "entityIdPath":"$.billNumber", - "isCommonTableBorderRequired": true, - "mappings": [ - { - "topic": "common-pdf-generation-1", - "staticConfigPath": "https://raw.githubusercontent.com/egovernments/egov-services/vishal-feature-filestore/core/egov-indexer/src/main/resources/rainmaker-pgr-indexer.yml", - "mappings": [ - { - "direct": [ - { - "variable": "total_amount_due", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_TOTAL_AMOUNT_DUE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "payer_name", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PAYER_NAME" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "Municipal_Corporation", - "value": { - "path": "PDF_STATIC_LABEL_MDMS_MUNICIPAL_CORPORATION" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "bill_no", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_BILL_NO" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "Rs", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_RUPEE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "mobile_no", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_MOBILE_NO" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "bill_period", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_BILL_PERIOD" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "payer_address", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PAYER_ADDRESS" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - - { - "variable": "bill_issue_date", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ISSUE_DATE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "bill_due_date", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_BILL_DUE_DATE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "billing_summary_property_tax", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_BILLING_SUMMARY" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "serviceType", - "value": { - "path": "$.businessService" - }, - "localisation":{ - "required":true, - "prefix":"MODULE", - "module":"rainmaker-common" - } - }, - { - "variable": "property_id", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PROPERTY_ID" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "arrears_label", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ARREARS" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "charge_label", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_CHARGE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - - { - "variable": "penalty_label", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PENALTY" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "rebate_label", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_REBATE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "others_label", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_OTHERS" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "total_label", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_TOTAL" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "important_message", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_IMPORTANT_MESSAGE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "payment_received", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PAYMENT_RECEIVED" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "this_document", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_THIS_DOCUMENT" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "this_is_a", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_THIS_IS" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "assessment_payment", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ASSESSSMENT_PAYMENT" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "please_deposit", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PLEASE_DEPOSIT" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "if_the_tax", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_IF_THE_TAX" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "acknowledgement_for", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ACKNOWLEDGEMENT" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "date_label", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_DATE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "consumer_id", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_CONSUMER_ID" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "consumer_no", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_CONSUMER_NO" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "name_address", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_NAME_ADDRESS" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "total_payment", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_TOTAL_PAYMENT" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "receivers_signature", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_RECEIVERS_SIGNATURE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "totalAmountDue", - "value": { - "path": "$.totalAmount" - } - }, - { - "variable": "total", - "value": { - "path": "$.totalAmount" - } - }, - - { - "variable": "payerName", - "value": { - "path": "$.payerName" - } - }, - - { - "variable": "mobileNo", - "value": { - "path": "$.mobileNumber" - } - }, - - { - "variable": "payerAddress", - "value": { - "path": "$.payerAddress" - } - }, - { - "variable": "nameAddress", - "value": { - "path": "$.payerAddress" - } - }, - - { - "variable": "billNo", - "value": { - "path": "$.billNumber" - } - }, - { - "variable": "fromPeriod", - "value": { - "path": "$.billDetails[0].fromPeriod" - }, - "type": "date" - }, - { - "variable": "toPeriod", - "value": { - "path": "$.billDetails[0].toPeriod" - }, - "type": "date" - }, - - { - "variable": "billIssueDate", - "value": { - "path": "$.billDate" - }, - "type": "date" - }, - - { - "variable": "billDueDate", - "value": { - "path": "$.billDetails[0].expiryDate" - }, - "type": "date" - }, - { - "variable": "billdate", - "value": { - "path": "$.billDate" - }, - "type": "date" - }, - - { - "variable": "propertyID", - "value": { - "path": "$.consumerCode" - } - }, - { - "variable": "taxCharge", - "value": { - "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_TAX' || @.taxHeadCode == 'TL_TAX' || @.taxHeadCode == 'FIRENOC_TAXES' || @.taxHeadCode == 'WS_CHARGE' || @.taxHeadCode == 'SW_CHARGE' )].amount" - } - }, - { - "variable": "timeRebate", - "value": { - "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_TIME_REBATE' || @.taxHeadCode == 'WS_TIME_REBATE' || @.taxHeadCode == 'SW_TIME_REBATE')].amount" - } - }, - { - "variable": "adhocRebate", - "value": { - "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_ADHOC_REBATE' || @.taxHeadCode == 'TL_ADHOC_REBATE' || @.taxHeadCode == 'FIRENOC_ADHOC_REBATE')].amount" - } - }, - - { - "variable": "timePenalty", - "value": { - "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_TIME_PENALTY' || @.taxHeadCode == 'WS_TIME_PENALTY' || @.taxHeadCode == 'SW_TIME_PENALTY')].amount" - } - }, - { - "variable": "adhocPenalty", - "value": { - "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_ADHOC_PENALTY' || @.taxHeadCode == 'TL_ADHOC_PENALTY' || @.taxHeadCode == 'FIRENOC_ADHOC_PENALTY')].amount" - } - }, - { - "variable": "firecess", - "value": { - "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_FIRE_CESS')].amount" - } - }, - { - "variable": "usageExemption", - "value": { - "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_UNIT_USAGE_EXEMPTION')].amount" - } - }, - { - "variable": "roundoff", - "value": { - "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_ROUNDOFF' || @.taxHeadCode == 'TL_ROUNDOFF' || @.taxHeadCode == 'FIRENOC_ROUNDOFF' || @.taxHeadCode == 'WS_Round_Off' || @.taxHeadCode == 'SW_Round_Off')].amount" - } - }, - { - "variable": "fees", - "value": { - "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'FIRENOC_FEES')].amount" - } - }, - { - "variable": "ownerExemption", - "value": { - "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_OWNER_EXEMPTION')].amount" - } - }, - { - "variable": "cancerCess", - "value": { - "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_CANCER_CESS')].amount" - } - }, - { - "variable": "waterCess", - "value": { - "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'WS_WATER_CESS')].amount" - } - }, - { - "variable": "timeInterest", - "value": { - "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_TIME_INTEREST' || @.taxHeadCode == 'WS_TIME_INTEREST' || @.taxHeadCode == 'SW_TIME_INTEREST')].amount" - } - }, - { - "variable": "ceilingDebit", - "value": { - "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_DECIMAL_CEILING_DEBIT')].amount" - } - }, - { - "variable": "ceilingCredit", - "value": { - "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_DECIMAL_CEILING_CREDIT')].amount" - } - }, - { - "variable": "carryForward", - "value": { - "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_ADVANCE_CARRYFORWARD')].amount" - } - }, - - { - "variable": "consumerID", - "value": { - "path": "$.consumerCode" - } - }, - { - "variable": "date", - "value": { - "path": "$.billDate" - }, - "type": "date" - }, - { - "variable": "totalPayment", - "value": { - "path": "$.billDetails[0].amountPaid" - } - }, - { - "variable": "WS_arrears", - "value":{ - "path": "$.arrearAmount" - } - }, - { - "variable":"scissorImage", - "url":"http://www.pngall.com/wp-content/uploads/2016/03/Scissor-PNG-Clipart.png", - "type":"image" - }, - { - "variable": "footerLogoImage", - "url": "https://uat.digit.org/pg-egov-assets/mseva-logo-colored.png", - "type": "image" - } - ] - }, - { - "derived": [ - { - "variable": "charge", - "formula": "{{taxCharge}}+{{fees}}" - }, - { - "variable": "penalty", - "formula": "{{timePenalty}}+{{adhocPenalty}}" - }, - { - "variable": "rebate", - "formula": "{{timeRebate}}+{{adhocRebate}}" - }, - { - "variable": "others", - "formula": "{{cancerCess}}+{{roundoff}}+{{timeInterest}}+{{ceilingDebit}}+{{ceilingCredit}}+{{firecess}}+{{waterCess}}" - }, - { - "variable": "arrears", - "formula": "{{WS_arrears}}" - } - ] - }, - { - "externalAPI": [ - { - "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", - "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", - "apiRequest": null, - "responseMapping":[ - { - "variable":"address", - "value":"$.MdmsRes.tenant.tenants[0].address" - }, - { - "variable":"phoneNumber", - "value":"$.MdmsRes.tenant.tenants[0].contactNumber" - }, - { - "variable":"website", - "value":"$.MdmsRes.tenant.tenants[0].domainUrl" - }, - { - "variable":"email", - "value":"$.MdmsRes.tenant.tenants[0].emailId" - }, - { - "variable": "logoImage", - "value":"$.MdmsRes.tenant.tenants[0].logoId", - "type": "image" - }, - { - "variable": "logo_header", - "value":"$.MdmsRes.tenant.tenants[0].code", - "localisation":{ - "required":true, - "prefix": "TENANT_TENANTS", - "module":"rainmaker-common" - } - } - ] - } - ] - } - ] - } - ] - } -} diff --git a/configs/pdf-service/data-config/consolidatedreceipt.json b/configs/pdf-service/data-config/consolidatedreceipt.json deleted file mode 100644 index 9ad3b164..00000000 --- a/configs/pdf-service/data-config/consolidatedreceipt.json +++ /dev/null @@ -1,611 +0,0 @@ -{ - "key": "consolidatedreceipt", - "documentType":"CONSOLIDATED_RECEIPT", - "DataConfigs": { - "moduleName": "rainmaker-common", - "version": "1.0.0", - "baseKeyPath": "$.Payments.*", - "entityIdPath":"$.id", - "isCommonTableBorderRequired": true, - "mappings": [ - { - "topic": "common-pdf-generation-3", - "mappings": [ - { - "direct": [ - { - "variable": "payerName", - "value": { - "path": "$.payerName" - } - }, - { - "variable": "PaidBy", - "value": { - "path": "$.paidBy" - } - }, - { - "variable": "chequeDD", - "value": { - "path": "$.instrumentNumber" - } - }, - { - "variable": "user-name", - "value": { - "path": "$.userInfo.name" - }, - "type":"selectFromRequestInfo" - }, - { - "variable": "payerContact", - "value": { - "path": "$.mobileNumber" - } - }, - { - "variable": "receiptNo", - "value": { - "path": "$.paymentDetails[0].receiptNumber" - } - }, - { - "variable": "serviceType", - "value": { - "path": "$.paymentDetails[0].businessService" - }, - "localisation":{ - "required":true, - "prefix":"MODULE", - "module":"rainmaker-common" - } - }, - { - "variable": "paidAmount", - "value": { - "path": "$.paymentDetails[0].totalAmountPaid" - } - }, - { - "variable": "fieldFee", - "value": { - "path": "$.paymentDetails[0].additionalDetails.fieldfee" - } - }, { - "variable": "taxAmount", - "value": { - "path": "$.paymentDetails[0].additionalDetails.tax" - } - }, { - "variable": "cgst", - "value": { - "path": "$.paymentDetails[0].additionalDetails.cgst" - } - }, { - "variable": "sgst", - "value": { - "path": "$.paymentDetails[0].additionalDetails.sgst" - } - }, - - { - "variable": "fromPeriod", - "value": { - "path": "$.paymentDetails[0].bill.billDetails[0].fromPeriod" - }, - "type": "date" - }, - { - "variable": "chequeDDDate", - "value": { - "path": "$.instrumentDate" - }, - "type":"date" - }, - { - "variable": "toPeriod", - "value": { - "path": "$.paymentDetails[0].bill.billDetails[0].toPeriod" - }, - "type": "date" - }, - { - "variable": "payerAddress", - "value": { - "path": "$.paymentDetails[0].bill.billDetails[0].additionalDetails.address" - } - }, - { - "variable": "oldPayerAddress", - "value": { - "path": "$.payerAddress" - } - }, - { - "variable": "oldComments", - "value": { - "path": "$.additionalDetails.comment" - } - }, - { - "variable": "paymentMode", - "value": { - "path": "$.paymentMode" - }, - "localisation":{ - "required":true, - "prefix": "COMMON_MASTERS_PAYMENTMODE", - "module": "rainmaker-common" - } - }, - { - "variable": "G8ReceiptNo", - "value": { - "path": "$.paymentDetails[0].manualReceiptNumber" - } - }, - { - "variable": "G8ReceiptDate", - "value": { - "path": "$.paymentDetails[0].manualReceiptDate" - }, - "type": "date" - }, - { - "variable": "ReceiptDate", - "value": { - "path": "$.paymentDetails[0].receiptDate" - }, - "type": "date" - }, { - "variable": "bankName", - "value": { - "path": "$.additionalDetails[0].bankName" - } - }, { - "variable": "branchName", - "value": { - "path": "$.additionalDetails[0].branchName" - } - }, { - "variable": "ifsc", - "value": { - "path": "$.ifscCode" - } - }, - { - "variable": "paymentDate", - "value": { - "path": "$.transactionDate" - }, - "type": "date" - }, - { - "variable": "transactionID", - "value": { - "path": "$.transactionNumber" - } - }, - { - "variable": "consumerID", - "value": { - "path": "$.paymentDetails[0].bill.consumerCode" - } - }, - { - "variable": "dueAmount", - "value": { - "path": "$.paymentDetails[0].totalDue" - } - }, - { - "variable": "payment_receipt", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_RECEIPT" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "receipt_no", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_RECEIPT_NO" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "consumer_id", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_CONSUMER_ID" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "payment_date", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_DATE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "payer_name", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYER_NAME" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "payer_contact", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYER_CONTACT" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "service_type", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_SERVICE_TYPE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "billing_period", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_BILLING_PERIOD" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "paid_amount", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAID_AMOUNT" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "pending_amount", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PENDING_AMOUNT" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "payment_mode", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_MODE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "transaction_id", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_TRANSACTION_ID" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "g8_receipt_no", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_G8_RECEIPT_NO" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "g8_receipt_date", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_G8_RECEIPT_DATE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "cheque_no", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_CHEQUE_NO" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "generated_by", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_GENERATED_BY" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "commissioner/eo", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_COMMISSIONER_EO" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "no_signature", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_NO_SIGNATURE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "disclamer", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "disclamer_1", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_FIRST_LINE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "disclamer_2", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_SECOND_LINE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "disclamer_3", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_THIRD_LINE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "disclamer_4", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_FOURTH_LINE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "disclamer_5", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_FIFTH_LINE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "to", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_TO" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "Municipal_Corporation", - "value": { - "path": "PDF_STATIC_LABEL_MDMS_MUNICIPAL_CORPORATION" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "footerLogoImage", - "url": "https://pb-egov-assets.s3.ap-south-1.amazonaws.com/mseva-logo-colored.png", - "type": "image" - } - ] - }, - { - "derived": [ - { - "variable": "pendingAmount", - "formula": "{{dueAmount}}-{{paidAmount}}" - } - ] - }, - { - "externalAPI": [ - { - "path": "http://localhost:8091/egov-mdms-service/v1/_get", - "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", - "apiRequest": null, - "responseMapping":[ - { - "variable":"address", - "value":"$.MdmsRes.tenant.tenants[0].address" - }, - { - "variable":"phoneNumber", - "value":"$.MdmsRes.tenant.tenants[0].contactNumber" - }, - { - "variable":"website", - "value":"$.MdmsRes.tenant.tenants[0].domainUrl" - }, - { - "variable":"mcGrade", - "value":"$.MdmsRes.tenant.tenants[0].city.ulbType" - }, - { - "variable":"email", - "value":"$.MdmsRes.tenant.tenants[0].emailId" - }, - { - "variable": "logoImage", - "value":"$.MdmsRes.tenant.tenants[0].logoId", - "type":"image" - }, - { - "variable": "logo-header", - "value":"$.MdmsRes.tenant.tenants[0].code", - "localisation":{ - "required":true, - "prefix": "TENANT_TENANTS", - "module":"rainmaker-common" - } - } - ] - }, - { - "path": "http://localhost:8092/echallan-services/eChallan/v1/_search", - "queryParam": "tenantId=$.tenantId,challanNo=$.paymentDetails[0].bill.consumerCode,businessService=$.paymentDetails[0].businessService,offset=0", - "apiRequest": null, - "responseMapping":[ - { - "variable":"comments", - "value":"$.challans[0].description" - }, - { - "variable":"consumerName", - "value":"$.challans[0].citizen.name" - }, - { - "variable": "doorHouseNo", - "value": "$.challans[0].address.doorNo" - }, - { - "variable": "streetName", - "value": "$.challans[0].address.street" - - }, - { - "variable": "buildingName", - "value": "$.challans[0].address.buildingName" - }, - { - "variable": "pinCode", - "value":"$.challans[0].address.pincode" - } - ] - } - - ] - } - ] - } - ] - } -} diff --git a/configs/pdf-service/data-config/consolidatedreceiptold.json b/configs/pdf-service/data-config/consolidatedreceiptold.json deleted file mode 100644 index 86dee464..00000000 --- a/configs/pdf-service/data-config/consolidatedreceiptold.json +++ /dev/null @@ -1,584 +0,0 @@ -{ - "key": "consolidatedreceiptold", - "documentType":"CONSOLIDATED_RECEIPT", - "DataConfigs": { - "moduleName": "rainmaker-common", - "version": "1.0.0", - "baseKeyPath": "$.Payments.*", - "entityIdPath":"$.id", - "isCommonTableBorderRequired": true, - "mappings": [ - { - "topic": "common-pdf-generation-3", - "mappings": [ - { - "direct": [ - { - "variable": "payerName", - "value": { - "path": "$.payerName" - } - }, - { - "variable": "PaidBy", - "value": { - "path": "$.paidBy" - } - }, - { - "variable": "chequeDD", - "value": { - "path": "$.instrumentNumber" - } - }, - { - "variable": "user-name", - "value": { - "path": "$.userInfo.name" - }, - "type":"selectFromRequestInfo" - }, - { - "variable": "payerContact", - "value": { - "path": "$.mobileNumber" - } - }, - { - "variable": "receiptNo", - "value": { - "path": "$.paymentDetails[0].receiptNumber" - } - }, - { - "variable": "serviceType", - "value": { - "path": "$.paymentDetails[0].businessService" - }, - "localisation":{ - "required":true, - "prefix":"MODULE", - "module":"rainmaker-common" - } - }, - { - "variable": "paidAmount", - "value": { - "path": "$.paymentDetails[0].totalAmountPaid" - } - }, - { - "variable": "fieldFee", - "value": { - "path": "$.paymentDetails[0].additionalDetails.fieldfee" - } - }, { - "variable": "taxAmount", - "value": { - "path": "$.paymentDetails[0].additionalDetails.tax" - } - }, { - "variable": "cgst", - "value": { - "path": "$.paymentDetails[0].additionalDetails.cgst" - } - }, { - "variable": "sgst", - "value": { - "path": "$.paymentDetails[0].additionalDetails.sgst" - } - }, - - { - "variable": "fromPeriod", - "value": { - "path": "$.paymentDetails[0].bill.billDetails[0].fromPeriod" - }, - "type": "date" - }, - { - "variable": "chequeDDDate", - "value": { - "path": "$.instrumentDate" - }, - "type":"date" - }, - { - "variable": "toPeriod", - "value": { - "path": "$.paymentDetails[0].bill.billDetails[0].toPeriod" - }, - "type": "date" - }, - { - "variable": "payerAddress", - "value": { - "path": "$.paymentDetails[0].bill.billDetails[0].additionalDetails.address" - } - }, - { - "variable": "oldPayerAddress", - "value": { - "path": "$.payerAddress" - } - }, - { - "variable": "oldComments", - "value": { - "path": "$.additionalDetails.comment" - } - }, - { - "variable": "comments", - "value": { - "path": "$.paymentDetails[0].bill.billDetails[0].additionalDetails.comment" - } - }, - { - "variable": "paymentMode", - "value": { - "path": "$.paymentMode" - }, - "localisation":{ - "required":true, - "prefix": "COMMON_MASTERS_PAYMENTMODE", - "module": "rainmaker-common" - } - }, - { - "variable": "G8ReceiptNo", - "value": { - "path": "$.paymentDetails[0].manualReceiptNumber" - } - }, - { - "variable": "G8ReceiptDate", - "value": { - "path": "$.paymentDetails[0].manualReceiptDate" - }, - "type": "date" - }, - { - "variable": "ReceiptDate", - "value": { - "path": "$.paymentDetails[0].receiptDate" - }, - "type": "date" - }, { - "variable": "bankName", - "value": { - "path": "$.additionalDetails[0].bankName" - } - }, { - "variable": "branchName", - "value": { - "path": "$.additionalDetails[0].branchName" - } - }, { - "variable": "ifsc", - "value": { - "path": "$.ifscCode" - } - }, - { - "variable": "paymentDate", - "value": { - "path": "$.transactionDate" - }, - "type": "date" - }, - { - "variable": "consumerID", - "value": { - "path": "$.paymentDetails[0].bill.consumerCode" - } - }, - { - "variable": "transactionID", - "value": { - "path": "$.transactionNumber" - } - }, - { - "variable": "dueAmount", - "value": { - "path": "$.paymentDetails[0].totalDue" - } - }, - { - "variable": "payment_receipt", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_RECEIPT" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "receipt_no", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_RECEIPT_NO" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "consumer_id", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_CONSUMER_ID" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "payment_date", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_DATE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "payer_name", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYER_NAME" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "payer_contact", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYER_CONTACT" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "service_type", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_SERVICE_TYPE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "billing_period", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_BILLING_PERIOD" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "paid_amount", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAID_AMOUNT" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "pending_amount", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PENDING_AMOUNT" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "payment_mode", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_MODE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "transaction_id", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_TRANSACTION_ID" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "g8_receipt_no", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_G8_RECEIPT_NO" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "g8_receipt_date", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_G8_RECEIPT_DATE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "cheque_no", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_CHEQUE_NO" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "generated_by", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_GENERATED_BY" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "commissioner/eo", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_COMMISSIONER_EO" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "no_signature", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_NO_SIGNATURE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "disclamer", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "disclamer_1", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_FIRST_LINE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "disclamer_2", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_SECOND_LINE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "disclamer_3", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_THIRD_LINE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "disclamer_4", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_FOURTH_LINE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "disclamer_5", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_FIFTH_LINE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "to", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_TO" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "Municipal_Corporation", - "value": { - "path": "PDF_STATIC_LABEL_MDMS_MUNICIPAL_CORPORATION" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "footerLogoImage", - "url": "https://pb-egov-assets.s3.ap-south-1.amazonaws.com/mseva-logo-colored.png", - "type": "image" - } - ] - }, - { - "derived": [ - { - "variable": "pendingAmount", - "formula": "{{dueAmount}}-{{paidAmount}}" - } - ] - }, - { - "externalAPI": [ - { - "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", - "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", - "apiRequest": null, - "responseMapping":[ - { - "variable":"address", - "value":"$.MdmsRes.tenant.tenants[0].address" - }, - { - "variable":"phoneNumber", - "value":"$.MdmsRes.tenant.tenants[0].contactNumber" - }, - { - "variable":"website", - "value":"$.MdmsRes.tenant.tenants[0].domainUrl" - }, - { - "variable":"mcGrade", - "value":"$.MdmsRes.tenant.tenants[0].city.ulbType" - }, - { - "variable":"email", - "value":"$.MdmsRes.tenant.tenants[0].emailId" - }, - { - "variable": "logoImage", - "value":"$.MdmsRes.tenant.tenants[0].logoId", - "type":"image" - }, - { - "variable": "logo-header", - "value":"$.MdmsRes.tenant.tenants[0].code", - "localisation":{ - "required":true, - "prefix": "TENANT_TENANTS", - "module":"rainmaker-common" - } - } - ] - } - ] - } - ] - } - ] - } -} diff --git a/configs/pdf-service/data-config/firenoc-receipt.json b/configs/pdf-service/data-config/firenoc-receipt.json deleted file mode 100644 index e13b75ae..00000000 --- a/configs/pdf-service/data-config/firenoc-receipt.json +++ /dev/null @@ -1,250 +0,0 @@ -{ - "key":"firenoc-receipt", - "DataConfigs": { - "serviceName": "rainmaker-noc", - "version": "1.0.0", - "baseKeyPath": "$.FireNOCs.*", - "entityIdPath":"$.fireNOCNumber", - "isCommonTableBorderRequired":true, - "mappings": [ - { - "topic": "noc-pdf-generation", - "staticConfigPath": "https://raw.githubusercontent.com/egovernments/egov-services/vishal-feature-filestore/core/egov-indexer/src/main/resources/rainmaker-pgr-indexer.yml", - "mappings": [ - { - "direct": [ - { - "variable": "variable1", - "value": { - "path":"$.fireNOCDetails.applicationNumber" - } - }, - { - "variable": "variable32", - "url":"https://s3.ap-south-1.amazonaws.com/pb-egov-assets/pb.amritsar/logo.png", - "type":"image" - }, - { - "variable": "variable3", - "value": { - "path":"$.fireNOCDetails.applicantDetails.ownerShipType" - }, - "type":"function", - "format":"return type.startsWith('INSTITUTION')" - }, - { - "variable": "variable21", - "value": { - "path":"$.fireNOCDetails.applicantDetails.ownerShipType" - }, - "localisation":{ - "required":true, - "prefix":"COMMON_MASTERS_OWNERSHIPCATEGORY", - "module":"rainmaker-common" - } - }, - { - "variable": "variable22", - "value": { - "path":"$.fireNOCDetails.applicantDetails.additionalDetail.institutionName" - } - }, - { - "variable": "variable23", - "value": { - "path":"$.fireNOCDetails.applicantDetails.additionalDetail.telephoneNumber" - } - }, - { - "variable": "variable24", - "value": { - "path":"$.fireNOCDetails.applicantDetails.owners[0].name" - } - }, - { - "variable": "variable25", - "value": { - "path":"$.fireNOCDetails.applicantDetails.additionalDetail.institutionDesignation" - } - }, - { - "variable": "variable26", - "value": { - "path":"$.fireNOCDetails.applicantDetails.owners[0].mobileNumber" - } - }, - { - "variable": "variable27", - "value": { - "path":"$.fireNOCDetails.applicantDetails.owners[0].emailId" - } - }, - { - "variable": "variable28", - "value": { - "path":"$.fireNOCDetails.applicantDetails.owners[0].correspondenceAddress" - } - }, - { - "variable": "variable20", - "value": { - "path":"$.tenantId" - }, - "localisation":{ - "required":true, - "prefix":"TENANT_TENANTS", - "module":"rainmaker-common" - }, - "isUpperCaseRequired":true - }, - { - "variable": "variable2", - "value":{ - "path":"$.fireNOCDetails.applicantDetails.owners.*" - }, - "type":"array", - "format":{ - "type":"string", - "scema":[ - { - "key":"name" - }, - { - "key":"mobileNumber" - }] - } - } - ] - }, - { - "derived": [ - { - "variable": "variable31", - "formula": "{{variable29}}+{{variable30}}" - } - ] - }, - { - "variable": "footerLogoImage", - "url": "https://pb-egov-assets.s3.ap-south-1.amazonaws.com/mseva-logo-colored.png", - "type": "image" - }, - { - "externalAPI": [ - - { - - "path": "http://localhost:8091/collection-services/receipts/_search", - "queryParam": "consumerCode=$.fireNOCDetails.applicationNumber", - "apiRequest": null, - - "responseMapping":[ - { - "variable":"variable6", - "value":"$.Receipt[0].instrument.transactionDateInput" - }, - { - "variable":"variable7", - "value":"$.Receipt[0].receiptNumber" - }, - { - "variable":"variable8", - "value":"$.Receipt[0].Bill[0].billDetails[0].billAccountDetails[?(@.taxHeadCode=='FIRENOC_FEES')].amount" - }, - { - "variable":"variable9", - "value":"$.Receipt[0].Bill[0].billDetails[0].billAccountDetails[?(@.taxHeadCode=='FIRENOC_TAXES')].amount" - }, - { - "variable":"variable29", - "value":"$.Receipt[0].Bill[0].billDetails[0].billAccountDetails[?(@.taxHeadCode=='FIRENOC_ADHOC_PENALTY')].amount" - }, - { - "variable":"variable30", - "value":"$.Receipt[0].Bill[0].billDetails[0].billAccountDetails[?(@.taxHeadCode=='FIRENOC_ADHOC_REBATE')].amount" - }, - { - "variable":"variable10", - "value":"$.Receipt[0].Bill[0].billDetails[0].totalAmount" - }, - { - "variable":"variable11", - "value":"$.Receipt[0].instrument.transactionType" - }, - { - "variable":"variable12", - "value":"$.Receipt[0].transactionId" - }, - { - "variable":"variable13", - "value":"$.Receipt[0].instrument.bank.name" - }, - { - "variable":"variable15", - "value":"$.Receipt[0].Bill[0].billDetails[0].receiptNumber" - }, - { - "variable":"variable16", - "value":"$.Receipt[0].Bill[0].billDetails[0].receiptDate" - }, - { - "variable":"variable17", - "value":"$.Receipt[0].Bill[0].billDetails[0].amountPaid" - }, - { - "variable":"variable18", - "value":"$.Receipt[0].instrument.instrumentType.name" - }, - { - "variable":"variable19", - "value":"$.Receipt[0].instrument.transactionNumber" - } - ] - } - ] - }, - { - "qrcodeConfig": [ - { - "variable": "variable14", - "value":"Application: {{variable1}}, Receipt number: {{variable15}}, Date of payment: {{variable16}}, Fees Paid: {{variable17}}, Payment mode: {{variable18}}, Transaction ID: {{variable19}}" - } - ] - }, - { - "mdmsDenormalization": [ - { - "variable": "$variable", - "moduleName": "common-masters", - "masterName": "Department", - "tenantId": "pb", - "filter": "[?(@.code == $department)]", - "filterMapping": [ - { - "variable": "$department", - "valueJsonpath": "$.department" - } - ], - "valueJsonPath": "$.TenantBoundary[0].boundary[0].name" - }, - { - "variable": "$variable", - "moduleName": "common-masters", - "masterName": "Department", - "tenantId": "pb", - "filter": "[?(@.code == $department)]", - "filterMapping": [ - { - "variable": "$department", - "valueJsonpath": "$.department" - } - ], - "valueJsonPath": "$.TenantBoundary[0].boundary[0].name" - } - ] - } - ] - } - ] - } - } diff --git a/configs/pdf-service/data-config/firenocreceipt.json b/configs/pdf-service/data-config/firenocreceipt.json deleted file mode 100644 index 8bbda995..00000000 --- a/configs/pdf-service/data-config/firenocreceipt.json +++ /dev/null @@ -1,583 +0,0 @@ -{ - "key": "firenocreceipt", - "documentType":"FIRENOC_RECEIPT", - "DataConfigs": { - "moduleName": "rainmaker-common", - "version": "1.0.0", - "baseKeyPath": "$.Payments.*", - "entityIdPath":"$.id", - "isCommonTableBorderRequired": true, - "mappings": [ - { - "topic": "common-pdf-generation-3", - "mappings": [ - { - "direct": [ - { - "variable": "payerName", - "value": { - "path": "$.payerName" - } - }, - { - "variable": "PaidBy", - "value": { - "path": "$.paidBy" - } - }, - { - "variable": "chequeDD", - "value": { - "path": "$.instrumentNumber" - } - }, - { - "variable": "user-name", - "value": { - "path": "$.userInfo.name" - }, - "type":"selectFromRequestInfo" - }, - { - "variable": "payerContact", - "value": { - "path": "$.mobileNumber" - } - }, - { - "variable": "receiptNo", - "value": { - "path": "$.paymentDetails[0].receiptNumber" - } - }, - { - "variable": "serviceType", - "value": { - "path": "$.paymentDetails[0].businessService" - }, - "localisation":{ - "required":true, - "prefix":"MODULE", - "module":"rainmaker-common" - } - }, - { - "variable": "paidAmount", - "value": { - "path": "$.paymentDetails[0].totalAmountPaid" - } - }, - { - "variable": "fieldFee", - "value": { - "path": "$.paymentDetails[0].additionalDetails.fieldfee" - } - }, { - "variable": "taxAmount", - "value": { - "path": "$.paymentDetails[0].additionalDetails.tax" - } - }, { - "variable": "cgst", - "value": { - "path": "$.paymentDetails[0].additionalDetails.cgst" - } - }, { - "variable": "sgst", - "value": { - "path": "$.paymentDetails[0].additionalDetails.sgst" - } - }, - { - "variable": "fromPeriod", - "value": { - "path": "$.paymentDetails[0].bill.billDetails[0].fromPeriod" - }, - "type": "date" - }, - { - "variable": "chequeDDDate", - "value": { - "path": "$.instrumentDate" - }, - "type":"date" - }, - { - "variable": "toPeriod", - "value": { - "path": "$.paymentDetails[0].bill.billDetails[0].toPeriod" - }, - "type": "date" - }, - { - "variable": "payerAddress", - "value": { - "path": "$.paymentDetails[0].bill.billDetails[0].additionalDetails.address" - } - }, - { - "variable": "oldPayerAddress", - "value": { - "path": "$.payerAddress" - } - }, - { - "variable": "oldComments", - "value": { - "path": "$.additionalDetails.comment" - } - }, - { - "variable": "comments", - "value": { - "path": "$.paymentDetails[0].bill.billDetails[0].additionalDetails.comment" - } - }, - { - "variable": "paymentMode", - "value": { - "path": "$.paymentMode" - }, - "localisation":{ - "required":true, - "prefix": "COMMON_MASTERS_PAYMENTMODE", - "module": "rainmaker-common" - } - }, - { - "variable": "G8ReceiptNo", - "value": { - "path": "$.paymentDetails[0].manualReceiptNumber" - } - }, - { - "variable": "G8ReceiptDate", - "value": { - "path": "$.paymentDetails[0].manualReceiptDate" - }, - "type": "date" - }, - { - "variable": "ReceiptDate", - "value": { - "path": "$.paymentDetails[0].receiptDate" - }, - "type": "date" - }, { - "variable": "bankName", - "value": { - "path": "$.additionalDetails[0].bankName" - } - }, { - "variable": "branchName", - "value": { - "path": "$.additionalDetails[0].branchName" - } - }, { - "variable": "ifsc", - "value": { - "path": "$.ifscCode" - } - }, - { - "variable": "paymentDate", - "value": { - "path": "$.transactionDate" - }, - "type": "date" - }, - { - "variable": "consumerID", - "value": { - "path": "$.paymentDetails[0].bill.consumerCode" - } - }, - { - "variable": "transactionID", - "value": { - "path": "$.transactionNumber" - } - }, - { - "variable": "dueAmount", - "value": { - "path": "$.paymentDetails[0].totalDue" - } - }, - { - "variable": "payment_receipt", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_RECEIPT" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "receipt_no", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_RECEIPT_NO" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "consumer_id", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_CONSUMER_ID" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "payment_date", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_DATE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "payer_name", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYER_NAME" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "payer_contact", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYER_CONTACT" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "service_type", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_SERVICE_TYPE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "billing_period", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_BILLING_PERIOD" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "paid_amount", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAID_AMOUNT" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "pending_amount", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PENDING_AMOUNT" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "payment_mode", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_MODE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "transaction_id", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_TRANSACTION_ID" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "g8_receipt_no", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_G8_RECEIPT_NO" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "g8_receipt_date", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_G8_RECEIPT_DATE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "cheque_no", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_CHEQUE_NO" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "generated_by", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_GENERATED_BY" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "commissioner/eo", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_COMMISSIONER_EO" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "no_signature", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_NO_SIGNATURE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "disclamer", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "disclamer_1", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_FIRST_LINE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "disclamer_2", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_SECOND_LINE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "disclamer_3", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_THIRD_LINE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "disclamer_4", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_FOURTH_LINE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "disclamer_5", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_FIFTH_LINE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "to", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_TO" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "Municipal_Corporation", - "value": { - "path": "PDF_STATIC_LABEL_MDMS_MUNICIPAL_CORPORATION" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "footerLogoImage", - "url": "https://pb-egov-assets.s3.ap-south-1.amazonaws.com/mseva-logo-colored.png", - "type": "image" - } - ] - }, - { - "derived": [ - { - "variable": "pendingAmount", - "formula": "{{dueAmount}}-{{paidAmount}}" - } - ] - }, - { - "externalAPI": [ - { - "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", - "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", - "apiRequest": null, - "responseMapping":[ - { - "variable":"address", - "value":"$.MdmsRes.tenant.tenants[0].address" - }, - { - "variable":"phoneNumber", - "value":"$.MdmsRes.tenant.tenants[0].contactNumber" - }, - { - "variable":"website", - "value":"$.MdmsRes.tenant.tenants[0].domainUrl" - }, - { - "variable":"mcGrade", - "value":"$.MdmsRes.tenant.tenants[0].city.ulbType" - }, - { - "variable":"email", - "value":"$.MdmsRes.tenant.tenants[0].emailId" - }, - { - "variable": "logoImage", - "value":"$.MdmsRes.tenant.tenants[0].logoId", - "type":"image" - }, - { - "variable": "logo-header", - "value":"$.MdmsRes.tenant.tenants[0].code", - "localisation":{ - "required":true, - "prefix": "TENANT_TENANTS", - "module":"rainmaker-common" - } - } - ] -} - ] - } - ] - } - ] - } -} diff --git a/configs/pdf-service/data-config/mcollect-bill.json b/configs/pdf-service/data-config/mcollect-bill.json deleted file mode 100644 index 48414a45..00000000 --- a/configs/pdf-service/data-config/mcollect-bill.json +++ /dev/null @@ -1,679 +0,0 @@ -{ - "key": "mcollect-bill", - "DataConfigs": { - "serviceName": "rainmaker-common", - "version": "1.0.0", - "baseKeyPath": "$.Bill.*", - "entityIdPath": "$.id", - "isCommonTableBorderRequired": true, - "mappings": [ - { - "topic": "common-pdf-generation-3", - "mappings": [ - { - "direct": [ - { - "variable": "payerName", - "value": { - "path": "$.payerName" - } - }, - { - "variable": "payerContact", - "value": { - "path": "$.mobileNumber" - } - }, - { - "variable": "billNo", - "value": { - "path": "$.billNumber" - } - }, - { - "variable": "challanNo", - "value": { - "path": "$.consumerCode" - } - }, - { - "variable": "challan_no", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_CHALLAN_NO" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "challan", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_CHALLAN" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "serviceType", - "value": { - "path": "$.businessService" - }, - "type": "splitString", - "localisation": { - "required": true, - "prefix": "BILLINGSERVICE_BUSINESSSERVICE", - "module": "rainmaker-uc", - "isCategoryRequired": true - } - }, - { - "variable": "fromPeriod", - "value": { - "path": "$.billDetails[0].fromPeriod" - }, - "type": "date" - }, - { - "variable": "toPeriod", - "value": { - "path": "$.billDetails[0].toPeriod" - }, - "type": "date" - }, - { - "variable": "letter-code", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_LETTER_CODE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "address_label", - "value": { - "path": "PT_COMMON_COL_ADDRESS" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "letter-header", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_LETTER_HEAD" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "letter-section", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_LETTER_SECTION_NO" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "cantonment-board", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_MUNICIPAL_CORPORATION" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "form-number", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_LETTER_FORM_NO" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "rule-number", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_LETTER_RULENO" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "bill", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "letter-code", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_MUNICIPAL_CORPORATION" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "paymentMode", - "value": { - "path": "$.paymentMode" - }, - "localisation": { - "required": true, - "prefix": "COMMON_MASTERS_PAYMENTMODE", - "module": "rainmaker-common" - } - }, - { - "variable": "billDate", - "value": { - "path": "$.billDate" - }, - "type": "date" - }, - { - "variable": "city", - "value": { - "path": "$..tradeLicenseDetail.address.city" - }, - "localisation": { - "required": true, - "prefix": "TENANT_TENANTS", - "module": "rainmaker-common" - } - }, - { - "variable": "doorHouseNo", - "value": { - "path": "$.address.doorNo" - }, - "type": "setEmpty" - }, - { - "variable": "buildingColonyName", - "value": { - "path": "$.address.buildingName" - }, - "type": "setEmpty" - }, - { - "variable": "streetName", - "value": { - "path": "$.address.street" - }, - "type": "setEmpty" - }, - { - "variable": "buildingName", - "value": { - "path": "$.address.buildingName" - }, - "type": "setEmpty" - }, - { - "variable": "pinCode", - "value": { - "path": "$.address.pincode" - }, - "type": "setEmpty" - }, - { - "variable": "mohalla", - "value": { - "path": "$.address.locality" - }, - "localisation": { - "required": true, - "prefix": "TENANTS_MOHALLA", - "module": "rainmaker-common" - } - }, - { - "variable": "serviceCategory", - "value": { - "path": "$.businessService" - }, - "localisation": { - "required": true, - "prefix": "BILLINGSERVICE_BUSINESSSERVICE", - "module": "rainmaker-uc" - } - }, - { - "variable": "mcollect_comment", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_MCOLLECT_COMMENT" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "disclamer", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "disclamer_1", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_FIRST_LINE_UC" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "bill_no", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_BILL_NO" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "GL_Code", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_GL_CODE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "bill_date", - "value": { - "path": "ABG_COMMON_TABLE_COL_BILL_DATE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "consumer_Name", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_CONSUMER_NAME" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "payer_contact", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_LICENSE_CORPORATION_CONTACT" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "service_category", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_SERVICE_CATEGORY" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "validity_from", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_PASS_LICENSE_VALIDITY_FROM" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "validity_to", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_PASS_LICENSE_VALIDITY_TO" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "paid_amount", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAID_AMOUNT" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "payment_mode", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_MODE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "transaction_id", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_TRANSACTION_ID" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "payment_receipt", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_RECEIPT" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "g8_receipt_no", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_G8_RECEIPT_NO" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "bank_transaction_no", - "value": { - "path": "NOC_PAYMENT_BANK_TRANSACTION_NO" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "g8_receipt_date", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_G8_RECEIPT_DATE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "payer_Name", - "value": { - "path": "NOC_PAYMENT_PAYER_NAME_LABEL" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "no_signature", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_NO_SIGNATURE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "disclamer", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "to", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_TO" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "service_type", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_SERVICE_TYPE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "total_amount", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_TOTAL_AMOUNT" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "challan_date", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_CHALLAN_DATE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "Rs", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_RUPEE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "variable10", - "value": { - "path": "$.billDetails[0].billAccountDetails.*" - }, - "type": "array", - "format": { - "type": "string", - "scema": [ - { - "variable": "trade_license_tax", - "value": "taxHeadCode", - "type": "string", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-uc" - } - }, - { - "variable": "tradeLicenseTax", - "value": "amount" - } - ] - } - }, - { - "variable": "totalAmount", - "value": { - "path": "$.totalAmount" - } - }, - { - "variable": "footerLogoImage", - "url": "https://uat.digit.org/pg-egov-assets/mseva-logo-colored.png", - "type": "image" - } - ] - }, - { - "externalAPI": [ - { - "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", - "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pg&filter=%5B?(@.code=='{$.tenantId}')%5D", - "apiRequest": null, - "responseMapping": [ - { - "variable": "cb-name", - "value": "$.MdmsRes.tenant.tenants[0].code", - "localisation": { - "required": true, - "prefix": "TENANT_TENANTS", - "module": "rainmaker-common" - } - } - ] - }, - { - "path": "http://echallan-services:8080/echallan-services/eChallan/v1/_search", - "queryParam": "challanNo=$.consumerCode,tenantId=$.tenantId", - "apiRequest": null, - "responseMapping": [ - { - "variable": "challanDate", - "value": "$.challans[0].auditDetails.lastModifiedTime", - "type": "date" - } - ] - } - ] - }, - { - "qrcodeConfig": [ - { - "variable": "qrcodeimage", - "value": "Payer Name : {{payerName}},BillNo: {{billNumber}}, Challan number: {{challanNo}}, Bill Date: {{billDate}}, Total Amount: {{totalAmount}}, Billing Period: {{fromPeriod}} to {{toPeriod}}" - } - ] - } - ] - } - ] - } -} diff --git a/configs/pdf-service/data-config/mcollect-challan.json b/configs/pdf-service/data-config/mcollect-challan.json deleted file mode 100644 index c05d9783..00000000 --- a/configs/pdf-service/data-config/mcollect-challan.json +++ /dev/null @@ -1,728 +0,0 @@ -{ - "key": "mcollect-challan", - "DataConfigs": { - "serviceName": "rainmaker-common", - "version": "1.0.0", - "baseKeyPath": "$.Challan", - "entityIdPath": "$.id", - "isCommonTableBorderRequired": true, - "mappings": [ - { - "topic": "common-pdf-generation-3", - "mappings": [ - { - "direct": [ - { - "variable": "consumerName", - "value": { - "path": "$.citizen.name" - } - }, - { - "variable": "payerContact", - "value": { - "path": "$.mobileNumber" - } - }, - { - "variable": "challanNo", - "value": { - "path": "$.challanNo" - } - }, - { - "variable": "serviceType", - "value": { - "path": "$.businessService" - }, - "localisation": { - "required": true, - "prefix": "BILLINGSERVICE_BUSINESSSERVICE", - "module": "rainmaker-uc" - } - }, - { - "variable": "serviceCategory", - "value": { - "path": "$.serviceType" - }, - "localisation": { - "required": true, - "prefix": "BILLINGSERVICE_BUSINESSSERVICE", - "module": "rainmaker-uc" - } - }, - { - "variable": "fromPeriod", - "value": { - "path": "$.taxPeriodFrom" - }, - "type": "date" - }, - { - "variable": "billNo", - "value": { - "path": "$.billNo" - } - }, - { - "variable": "billDate", - "value": { - "path": "$.billDate" - }, - "type": "date" - }, - { - "variable": "toPeriod", - "value": { - "path": "$.taxPeriodTo" - }, - "type": "date" - }, - { - "variable": "bill", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "bill_date", - "value": { - "path": "ABG_COMMON_TABLE_COL_BILL_DATE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "bill_no", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_BILL_NO" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "letter-code", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_LETTER_CODE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "service_category", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_SERVICE_CATEGORY" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "address_label", - "value": { - "path": "PT_COMMON_COL_ADDRESS" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "remarks_label", - "value": { - "path": "PT_COMMON_COL_REMARK" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "letter-header", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_LETTER_HEAD" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "letter-section", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_LETTER_SECTION_NO" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "cantonment-board", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_MUNICIPAL_CORPORATION" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "form-number", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_CHALLAN_FORM_NO" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "rule-number", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_CHALLAN_RULE_NO" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "challan", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_CHALLAN" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "letter-code", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_MUNICIPAL_CORPORATION" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "application_no", - "value": { - "path": "NOC_COMMON_TABLE_COL_APP_NO" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "paymentMode", - "value": { - "path": "$.paymentMode" - }, - "localisation": { - "required": true, - "prefix": "COMMON_MASTERS_PAYMENTMODE", - "module":"rainmaker-common" - } - }, - { - "variable": "challanDate", - "value": { - "path": "$.auditDetails.lastModifiedTime" - }, - "type": "date" - }, - { - "variable": "city", - "value": { - "path": "$..tradeLicenseDetail.address.city" - }, - "localisation": { - "required": true, - "prefix": "TENANT_TENANTS", - "module": "rainmaker-common" - } - }, - { - "variable": "doorHouseNo", - "value": { - "path": "$.address.doorNo" - }, - "type": "setEmpty" - }, - { - "variable": "buildingColonyName", - "value": { - "path": "$.address.buildingName" - }, - "type": "setEmpty" - }, - { - "variable": "streetName", - "value": { - "path": "$.address.street" - }, - "type": "setEmpty" - }, - { - "variable": "buildingName", - "value": { - "path": "$.address.buildingName" - }, - "type": "setEmpty" - }, - { - "variable": "pinCode", - "value": { - "path": "$.address.pincode" - }, - "type": "setEmpty" - }, - { - "variable": "challanStatus", - "value": { - "path": "$.applicationStatus" - }, - "type": "challanStatus" - }, - { - "variable": "challanRemarks", - "value": { - "path": "$.description" - - } - }, - { - "variable": "mohalla", - "value": { - "path": "$.address.locality.code" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": "TENANTS_MOHALLA", - "module": "rainmaker-common", - "prefixCbName": true - - } - }, - { - "variable": "mcollect_comment", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_MCOLLECT_COMMENT" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "disclamer", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "disclamer_1", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_FIRST_LINE_UC" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "challan_no", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_CHALLAN_NO" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "GL_Code", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_GL_CODE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "challan_date", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_CHALLAN_DATE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "payer_name", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYER_NAME" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "payer_contact", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_LICENSE_CORPORATION_CONTACT" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "service_type", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_SERVICE_TYPE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "validity_from", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_PASS_LICENSE_VALIDITY_FROM" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "validity_to", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_PASS_LICENSE_VALIDITY_TO" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "paid_amount", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAID_AMOUNT" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "payment_mode", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_MODE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "transaction_id", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_TRANSACTION_ID" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "payment_receipt", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_RECEIPT" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "g8_receipt_no", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_G8_RECEIPT_NO" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "bank_transaction_no", - "value": { - "path": "NOC_PAYMENT_BANK_TRANSACTION_NO" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "g8_receipt_date", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_G8_RECEIPT_DATE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "consumer_Name", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_CONSUMER_NAME" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "no_signature", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_NO_SIGNATURE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "disclamer", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "to", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_TO" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "total_amount", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_TOTAL_AMOUNT" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "Rs", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_RUPEE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "variable10", - "value": { - "path": "$.amount.*" - }, - "type": "array", - "format": { - "type": "string", - "scema": [ - { - "variable": "trade_license_tax", - "value": "taxHeadCode", - "type": "string", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-uc" - } - }, - { - "variable": "tradeLicenseTax", - "value": "amount" - } - ] - } - }, - { - "variable": "totalAmount", - "value": { - "path": "$.totalAmount" - } - }, - { - "variable": "footerLogoImage", - "url": "https://pb-egov-assets.s3.ap-south-1.amazonaws.com/mseva-logo-colored.png", - "type": "image" - } - ] - }, - { - "externalAPI": [ - { - "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", - "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", - "apiRequest": null, - "responseMapping": [ - { - "variable": "cb-name", - "value": "$.MdmsRes.tenant.tenants[0].code", - "localisation": { - "required": true, - "prefix": "TENANT_TENANTS", - "module": "rainmaker-common" - } - }, - { - "variable":"mcGrade", - "value":"$.MdmsRes.tenant.tenants[0].city.ulbType" - } - ] - }, - { - "path": "http://egov-location:8080/egov-location/location/v11/boundarys/_search", - "queryParam": "tenantId=$.tenantId,hierarchyTypeCode=ADMIN,boundaryType=Locality,codes=$.address.locality.code", - "apiRequest": null, - "responseMapping":[ - { - "variable":"mohalla", - "value":"$.address.locality.code" - } - ] - } - ] - }, - { - "qrcodeConfig": [ - { - "variable": "qrcodeimage", - "value": "Payer Name : {{consumnerName}},Challan number: {{challanNo}}, Challan Date: {{billDate}}, Total Amount: {{totalAmount}}, Billing Period: {{fromPeriod}} to {{toPeriod}}" - } - ] - } - ] - } - ] - } -} diff --git a/configs/pdf-service/data-config/misc-receipt.json b/configs/pdf-service/data-config/misc-receipt.json deleted file mode 100644 index 79b94c1f..00000000 --- a/configs/pdf-service/data-config/misc-receipt.json +++ /dev/null @@ -1,516 +0,0 @@ -{ - "key": "misc-receipt", - "DataConfigs": { - "serviceName": "rainmaker-common", - "version": "1.0.0", - "baseKeyPath": "$.Payments.*", - "entityIdPath":"$.paymentDetails[0].receiptNumber", - "isCommonTableBorderRequired": true, - "mappings": [ - { - "topic": "common-pdf-generation-3", - "mappings": [ - { - "direct": [ - { - "variable": "payerName", - "value": { - "path": "$.payerName" - } - }, - { - "variable": "user-name", - "value": { - "path": "$.userInfo.name" - }, - "type":"selectFromRequestInfo" - }, - { - "variable": "payerContact", - "value": { - "path": "$.mobileNumber" - } - }, - { - "variable": "receiptNo", - "value": { - "path": "$.paymentDetails[0].receiptNumber" - } - }, - { - "variable": "serviceType", - "value": { - "path": "$.paymentDetails[0].businessService" - }, - "localisation":{ - "required":true, - "prefix":"BILLINGSERVICE_BUSINESSSERVICE", - "module":"rainmaker-bpa" - } - }, - { - "variable": "paidAmount", - "value": { - "path": "$.paymentDetails[0].totalAmountPaid" - } - }, - { - "variable": "fromPeriod", - "value": { - "path": "$.paymentDetails[0].bill.billDetails[0].fromPeriod" - }, - "type": "date" - }, - { - "variable": "toPeriod", - "value": { - "path": "$.paymentDetails[0].bill.billDetails[0].toPeriod" - }, - "type": "date" - }, - { - "variable": "paymentMode", - "value": { - "path": "$.paymentMode" - }, - "localisation":{ - "required":true, - "prefix": "COMMON_MASTERS_PAYMENTMODE", - "module": "rainmaker-common" - } - }, - { - "variable": "G8ReceiptNo", - "value": { - "path": "$.paymentDetails[0].manualReceiptNumber" - } - }, - { - "variable": "G8ReceiptDate", - "value": { - "path": "$.paymentDetails[0].manualReceiptDate" - }, - "type": "date" - }, - { - "variable": "paymentDate", - "value": { - "path": "$.transactionDate" - }, - "type": "date" - }, - { - "variable": "consumerID", - "value": { - "path": "$.paymentDetails[0].bill.consumerCode" - } - }, - { - "variable": "transactionID", - "value": { - "path": "$.transactionNumber" - } - }, - { - "variable": "dueAmount", - "value": { - "path": "$.paymentDetails[0].totalDue" - } - }, - { - "variable": "payment_receipt", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_RECEIPT" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "receipt_no", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_RECEIPT_NO" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "consumer_id", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_CONSUMER_ID" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "payment_date", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_DATE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "payer_name", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYER_NAME" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "payer_contact", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYER_CONTACT" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "service_type", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_SERVICE_TYPE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "billing_period", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_BILLING_PERIOD" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "paid_amount", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAID_AMOUNT" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "pending_amount", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PENDING_AMOUNT" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "payment_mode", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_MODE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "transaction_id", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_TRANSACTION_ID" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "g8_receipt_no", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_G8_RECEIPT_NO" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "g8_receipt_date", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_G8_RECEIPT_DATE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "generated_by", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_GENERATED_BY" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "commissioner/eo", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_COMMISSIONER_EO" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "no_signature", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_NO_SIGNATURE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "disclamer", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "disclamer_1", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_FIRST_LINE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "disclamer_2", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_SECOND_LINE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "disclamer_3", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_THIRD_LINE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "disclamer_4", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_FOURTH_LINE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "disclamer_5", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_FIFTH_LINE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "to", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_TO" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "Municipal_Corporation", - "value": { - "path": "PDF_STATIC_LABEL_MDMS_MUNICIPAL_CORPORATION" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "receipt_info", - "value": { - "path": "PDF_STATIC_LABEL_RECEIPT_INFO" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "payer_info", - "value": { - "path": "PDF_STATIC_LABEL_PAYER_INFO" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "payment_info", - "value": { - "path": "PDF_STATIC_LABEL_PAYMENT_INFO" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "footerLogoImage", - "url": "https://pb-egov-assets.s3.ap-south-1.amazonaws.com/mseva-logo-colored.png", - "type": "image" - } - ] - }, - { - "derived": [ - { - "variable": "pendingAmount", - "formula": "{{dueAmount}}-{{paidAmount}}" - } - ] - }, - { - "externalAPI": [ - { - "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", - "queryParam": "moduleName=tenant&masterName=tenants&tenantId=bh&filter=%5B?(@.code=='{$.tenantId}')%5D", - "apiRequest": null, - "responseMapping":[ - { - "variable":"address", - "value":"$.MdmsRes.tenant.tenants[0].address" - }, - { - "variable":"phoneNumber", - "value":"$.MdmsRes.tenant.tenants[0].contactNumber" - }, - { - "variable":"website", - "value":"$.MdmsRes.tenant.tenants[0].domainUrl" - }, - { - "variable":"email", - "value":"$.MdmsRes.tenant.tenants[0].emailId" - }, - { - "variable": "logoImage", - "value":"$.MdmsRes.tenant.tenants[0].logoId", - "type":"image" - }, - { - "variable": "logo-header", - "value":"$.MdmsRes.tenant.tenants[0].code", - "localisation":{ - "required":true, - "prefix": "TENANT_TENANTS", - "module":"rainmaker-pgr" - } - } - ] - } - ] - } - ] - } - ] - } - } diff --git a/configs/pdf-service/data-config/passvehicle-certificate.json b/configs/pdf-service/data-config/passvehicle-certificate.json deleted file mode 100644 index 20a7a091..00000000 --- a/configs/pdf-service/data-config/passvehicle-certificate.json +++ /dev/null @@ -1,560 +0,0 @@ -{ - "key": "tlcertificate", - "DataConfigs": { - "serviceName": "rainmaker-common", - "version": "1.0.0", - "baseKeyPath": "$.Licenses.*", - "entityIdPath":"$.licenseNumber", - "isCommonTableBorderRequired": true, - "mappings": [ - { - "mappings": [ - { - "direct": [ - { - "variable": "logoImage", - "url":"https://raw.githubusercontent.com/egovernments/egov-web-app/master/web/rainmaker/dev-packages/egov-ui-kit-dev/src/assets/images/pblogo.png", - "type":"image" - }, - { - "variable": "tradeLicenseNo", - "value": { - "path": "$.licenseNumber" - } - }, - { - "variable": "applicationNo", - "value": { - "path": "$.applicationNumber" - } - }, - { - "variable": "financialYear", - "value": { - "path": "$.financialYear" - } - }, - { - "variable": "tradeName", - "value": { - "path": "$.tradeName" - } - }, - { - "variable": "tradeOwnerName", - "value": { - "path": "$.tradeLicenseDetail.owners[0].name" - } - }, - { - "variable": "tradeOwnerContact", - "value": { - "path": "$.tradeLicenseDetail.owners[0].mobileNumber" - } - }, - { - "variable": "tradeAddress", - "value": { - "path": "$.tradeLicenseDetail.address.locality.name" - } - }, - { - "variable": "city", - "value": { - "path": "$.tradeLicenseDetail.address.city" - }, - "localisation":{ - "required":true, - "prefix": "TENANT_TENANTS", - "module": "rainmaker-common" - } - }, - { - "variable": "tradeType", - "value": { - "path": "$.tradeLicenseDetail.tradeUnits[0].tradeType" - }, - "localisation":{ - "required":true, - "prefix": "TRADELICENSE_TRADETYPE", - "module": "rainmaker-tl", - "isCategoryRequired":true - } - }, - { - "variable": "passSubCategory", - "value": { - "path": "$.tradeLicenseDetail.tradeUnits[0].tradeType" - }, - "localisation":{ - "required":true, - "prefix": "TRADELICENSE_TRADETYPE", - "module": "rainmaker-tl", - "isMainTypeRequired":true - } - }, - { - "variable": "accessories", - "value": { - "path": "$.tradeLicenseDetail.accessories[0].accessoryCategory" - }, - "localisation":{ - "required":true, - "prefix": "TL", - "module": "rainmaker-tl" - } - }, - { - "variable": "purpose_content", - "value": { - "path": "$.tradeLicenseDetail.additionalDetail.purpose" - } - }, - { - "variable": "licenseIssueDate", - "value": { - "path": "$.issuedDate" - }, - "type": "date" - }, - { - "variable": "licenseValidityFrom", - "value": { - "path": "$.validFrom" - }, - "type": "date" - }, - { - "variable": "licenseValidityTo", - "value": { - "path": "$.validTo" - }, - "type": "date" - }, - { - "variable": "vehicleNumber", - "value": { - "path": "$.tradeLicenseDetail.additionalDetail.vehicleNumber" - } - }, - { - "variable": "vehicleCompany", - "value": { - "path": "$.tradeLicenseDetail.additionalDetail.vehicleCompany" - } - }, - { - "variable": "vehicleModel", - "value": { - "path": "$.tradeLicenseDetail.additionalDetail.vehicleModel" - } - }, - { - "variable": "to", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_TO" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "vehicle_number_label", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_PASS_VEHICLE_NUMBER_LABLE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "vehicle_company_label", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_PASS_VEHICLE_COMPANY_LABLE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "vehicle_model_label", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_PASS_VEHICLE_MODEL_LABLE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "municipal_corportaion", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_PASS_CITY_POLICE_LABLE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "corporation_contact", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_LICENSE_CORPORATION_CONTACT" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "disclaimer_heading", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_LICENSE_DISCLAIMER_HEADING" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "disclaimer_body", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_LICENSE_DISCLAIMER_BODY" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "corporation_website", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_LICENSE_CORPORATION_WEBSITE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "corporation_email", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_LICENSE_CORPORATION_EMAIL" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "trade_license_certifcate", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_PASS_CERTIFICATE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "trade_license_no", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_PASS_NO" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "application_no", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_APPLICATION_NO" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "reciept_no", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_RECIEPT_NO" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "financial_year", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_FINANCIAL_YEAR" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "trade_name", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_TRADE_NAME" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "trade_owner_name", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_TRADE_OWNER_NAME" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "trade_owner_contact", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_TRADE_OWNER_CONTACT" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "trade_address", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_TRADE_ADDRESS" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "trade_type", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_PASS_TRADE_TYPE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "pass_subCategory", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_PASS_TRADE_SUB_TYPE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "purpose_label", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_PASS_PURPOSE_LABEL" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "accessories_label", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_ACCESSORIES_LABEL" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "trade_license_fee", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_TRADE_LICENSE_FEE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "license_issue_date", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_LICENSE_ISSUE_DATE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "license_validity", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_LICENSE_VALIDITY" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "license_validity_from", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_PASS_LICENSE_VALIDITY_FROM" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "license_validity_to", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_PASS_LICENSE_VALIDITY_TO" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "approved_by", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_APPROVED_BY" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "commissioner", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_COMMISSIONER" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable":"userpic", - "url":"https://egov-covid-assets.s3.ap-south-1.amazonaws.com/Bangalore_Police.jpeg", - "type":"image" - }, - { - "variable": "tenantID", - "value": { - "path": "$.tenantId" - } - }, - { - "variable": "footerLogoImage", - "url": "https://pb-egov-assets.s3.ap-south-1.amazonaws.com/mseva-logo-colored.png", - "type": "image" - } - ] - }, - { - "externalAPI": [ - { - "path": "http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search", - "queryParam": "businessIds=$.applicationNumber,history=true,tenantId=$.tenantId", - "apiRequest": null, - "responseMapping":[ - { - "variable":"approvedBy", - "value":"$.ProcessInstances[?(@.action == 'APPROVE')].assigner.name" - } - - ] - } - - ] - }, - { - "qrcodeConfig": [ - { - "variable": "qr", - "value":"https://egov-micro-qa.egovernments.org/employee/tradelicence/search-preview?applicationNumber={{applicationNo}}&tenantId={{tenantID}}" - } - ] - } - ] - - } - ] - } - } \ No newline at end of file diff --git a/configs/pdf-service/data-config/property-bill.json b/configs/pdf-service/data-config/property-bill.json deleted file mode 100644 index 0b22fd2c..00000000 --- a/configs/pdf-service/data-config/property-bill.json +++ /dev/null @@ -1,893 +0,0 @@ -{ - "key": "property-bill", - "documentType": "PROPERTYBILL", - "DataConfigs": { - "moduleName": "PT", - "version": "1.0.0", - "baseKeyPath": "$.Bill.*", - "entityIdPath":"$.id", - "isCommonTableBorderRequired": true, - "mappings": [ - { - "topic": "common-pdf-generation-1", - "staticConfigPath": "https://raw.githubusercontent.com/egovernments/egov-services/vishal-feature-filestore/core/egov-indexer/src/main/resources/rainmaker-pgr-indexer.yml", - "mappings": [ - { - "direct": [ - { - "variable": "total_amount_due", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_TOTAL_AMOUNT_DUE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "payer_name", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PAYER_NAME" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "Municipal_Corporation", - "value": { - "path": "PDF_STATIC_LABEL_MDMS_MUNICIPAL_CORPORATION" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "bill_no", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_BILL_NO" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "Rs", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_RUPEE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "mobile_no", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_MOBILE_NO" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "bill_period", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_BILL_PERIOD" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "payer_address", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PAYER_ADDRESS" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - - { - "variable": "bill_issue_date", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ISSUE_DATE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "bill_due_date", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_BILL_DUE_DATE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "billing_summary_property_tax", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_BILLING_SUMMARY" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "serviceType", - "value": { - "path": "$.businessService" - }, - "localisation":{ - "required":true, - "prefix":"MODULE", - "module":"rainmaker-common" - } - }, - { - "variable": "tl_application_no", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_TL_APPLICATION_NO" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "arrears_label", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ARREARS" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "charge_label", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_CHARGE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - - { - "variable": "penalty_label", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PENALTY" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "rebate_label", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_REBATE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "others_label", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_OTHERS" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "total_label", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_TOTAL" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "important_message", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_IMPORTANT_MESSAGE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "payment_received", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PAYMENT_RECEIVED" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "this_document", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_THIS_DOCUMENT" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "this_is_a", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_THIS_IS" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "assessment_payment", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ASSESSSMENT_PAYMENT" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "please_deposit", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PLEASE_DEPOSIT" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "if_the_tax", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_IF_THE_TAX" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "acknowledgement_for", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ACKNOWLEDGEMENT" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "date_label", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_DATE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "consumer_id", - "value": { - "path": "$.businessService" - }, - "localisation":{ - "required":true, - "prefix": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_CONSUMER_ID", - "module":"rainmaker-common" - } - }, - { - "variable": "name_address", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_NAME_ADDRESS" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "total_payment", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_TOTAL_PAYMENT" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "receivers_signature", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_RECEIVERS_SIGNATURE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "totalAmountDue", - "value": { - "path": "$.totalAmount" - } - }, - { - "variable": "total", - "value": { - "path": "$.totalAmount" - } - }, - - { - "variable": "payerName", - "value": { - "path": "$.payerName" - } - }, - - { - "variable": "mobileNo", - "value": { - "path": "$.mobileNumber" - } - }, - - { - "variable": "payerAddress", - "value": { - "path": "$.payerAddress" - } - }, - { - "variable": "nameAddress", - "value": { - "path": "$.payerAddress" - } - }, - - { - "variable": "billNo", - "value": { - "path": "$.billNumber" - } - }, - { - "variable": "fromPeriod", - "value": { - "path": "$.billDetails[0].fromPeriod" - }, - "type": "date" - }, - { - "variable": "toPeriod", - "value": { - "path": "$.billDetails[0].toPeriod" - }, - "type": "date" - }, - - { - "variable": "billIssueDate", - "value": { - "path": "$.billDate" - }, - "type": "date" - }, - - { - "variable": "billDueDate", - "value": { - "path": "$.billDetails[0].expiryDate" - }, - "type": "date" - }, - { - "variable": "billdate", - "value": { - "path": "$.billDate" - }, - "type": "date" - }, - - { - "variable": "propertyID", - "value": { - "path": "$.consumerCode" - } - }, - { - "variable": "fees", - "value":{ - "path": "$.billDetails[(@.length-1)].billAccountDetails[?(@.taxHeadCode == 'PT_TAX')].amount" - } - }, - { - "variable": "pt_penalty", - "value":{ - "path": "$.billDetails[(@.length-1)].billAccountDetails[?(@.taxHeadCode == 'PT_TIME_PENALTY')].amount" - } - }, - { - "variable": "pt_rebate", - "value":{ - "path": "$.billDetails[(@.length-1)].billAccountDetails[?(@.taxHeadCode == 'PT_TIME_REBATE')].amount" - } - }, - { - "variable": "pt_adhoc_penalty", - "value":{ - "path": "$.billDetails[(@.length-1)].billAccountDetails[?(@.taxHeadCode == 'PT_ADHOC_PENALTY')].amount" - } - }, - { - "variable": "pt_adhoc_rebate", - "value":{ - "path": "$.billDetails[(@.length-1)].billAccountDetails[?(@.taxHeadCode == 'PT_ADHOC_REBATE')].amount" - } - }, - { - "variable": "pt_owner_exemption", - "value":{ - "path": "$.billDetails[(@.length-1)].billAccountDetails[?(@.taxHeadCode == 'PT_OWNER_EXEMPTION')].amount" - } - }, - { - "variable": "pt_unit_usage_exemption", - "value":{ - "path": "$.billDetails[(@.length-1)].billAccountDetails[?(@.taxHeadCode == 'PT_UNIT_USAGE_EXEMPTION')].amount" - } - }, - { - "variable": "pt_fire_cess", - "value":{ - "path": "$.billDetails[(@.length-1)].billAccountDetails[?(@.taxHeadCode == 'PT_FIRE_CESS')].amount" - } - }, - { - "variable": "pt_cancer_cess", - "value":{ - "path": "$.billDetails[(@.length-1)].billAccountDetails[?(@.taxHeadCode == 'PT_CANCER_CESS')].amount" - } - }, - { - "variable": "pt_time_interest", - "value":{ - "path": "$.billDetails[(@.length-1)].billAccountDetails[?(@.taxHeadCode == 'PT_TIME_INTEREST')].amount" - } - }, - { - "variable": "pt_decimal_ceiling_debit", - "value":{ - "path": "$.billDetails[(@.length-1)].billAccountDetails[?(@.taxHeadCode == 'PT_DECIMAL_CEILING_DEBIT')].amount" - } - }, - { - "variable": "pt_decimal_ceiling_credit", - "value":{ - "path": "$.billDetails[(@.length-1)].billAccountDetails[?(@.taxHeadCode == 'PT_DECIMAL_CEILING_CREDIT')].amount" - } - }, - { - "variable": "pt_roundoff", - "value":{ - "path": "$.billDetails[(@.length-1)].billAccountDetails[?(@.taxHeadCode == 'PT_ROUNDOFF')].amount" - } - }, - { - "variable": "pt_arrearrs", - "value":{ - "path": "$.billDetails[(@.length-1)].amount" - } - }, - { - "variable": "pt_advance_carryforward", - "value":{ - "path": "$.billDetails[(@.length-1)].billAccountDetails[?(@.taxHeadCode == 'PT_ADVANCE_CARRYFORWARD')].amount" - } - }, - { - "variable": "consumerID", - "value": { - "path": "$.consumerCode" - } - }, - { - "variable": "date", - "value": { - "path": "$.billDate" - }, - "type": "date" - }, - { - "variable": "totalPayment", - "value": { - "path": "$.billDetails[0].amountPaid" - } - }, - { - "variable":"scissorImage", - "url":"http://www.pngall.com/wp-content/uploads/2016/03/Scissor-PNG-Clipart.png", - "type":"image" - }, - - { - "variable": "adhoc_penalty_label", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ADHOC_PENALTY" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "adhoc_rebate_label", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ADHOC_REBATE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "owner_exemption_label", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_OWNER_EXEMPTION" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "unit_usage_exemption_label", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_UNIT_USAGE_EXEMPTION" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "fire_cess_label", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_FIRE_CESS" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "cancer_cess_label", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_CANCER_CESS" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "time_interest_label", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_TIME_INTEREST" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "decimal_ceiling_debit_label", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_DECIMAL_CEILING_DEBIT" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "decimal_ceiling_credit_label", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_DECIMAL_CEILING_CREDIT" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "advance_carryforward_label", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_DECIMAL_ADVANCE_CARRYFORWARD" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "roundoff_label", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_DECIMAL_ADVANCE_ROUNDOFF" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "arrears_label", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_DECIMAL_ARREARS" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "footerLogoImage", - "url": "https://uat.digit.org/pg-egov-assets/mseva-logo-colored.png", - "type": "image" - } - ] - }, - { - "derived": [ - { - "variable": "charge", - "formula": "{{fees}}" - }, - { - "variable": "penalty", - "formula": "{{pt_penalty}}" - }, - { - "variable": "rebate", - "formula": "{{pt_rebate}}" - }, - { - "variable": "adhoc_penalty", - "formula": "{{pt_adhoc_penalty}}" - }, - { - "variable": "adhoc_rebate", - "formula": "{{pt_adhoc_rebate}}" - }, - { - "variable": "owner_exemption", - "formula": "{{pt_owner_exemption}}" - }, - { - "variable": "unit_usage_exemption", - "formula": "{{pt_unit_usage_exemption}}" - }, - { - "variable": "fire_cess", - "formula": "{{pt_owner_exemption}}" - }, - { - "variable": "cancer_cess", - "formula": "{{pt_cancer_cess}}" - }, - { - "variable": "time_interest", - "formula": "{{pt_time_interest}}" - }, - { - "variable": "decimal_ceiling_debit", - "formula": "{{pt_decimal_ceiling_debit}}" - }, - { - "variable": "decimal_ceiling_credit", - "formula": "{{pt_decimal_ceiling_credit}}" - }, - { - "variable": "advance_carryforward", - "formula": "{{pt_advance_carryforward}}" - }, - { - "variable": "roundoff", - "formula": "{{pt_roundoff}}" - }, - { - "variable": "arrearrs", - "formula": "{{totalAmountDue}} - {{pt_arrearrs}}" - } - ] - }, - { - "externalAPI": [ - { - "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", - "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", - "apiRequest": null, - "responseMapping":[ - { - "variable":"address", - "value":"$.MdmsRes.tenant.tenants[0].address" - }, - { - "variable":"phoneNumber", - "value":"$.MdmsRes.tenant.tenants[0].contactNumber" - }, - { - "variable":"website", - "value":"$.MdmsRes.tenant.tenants[0].domainUrl" - }, - { - "variable":"email", - "value":"$.MdmsRes.tenant.tenants[0].emailId" - }, - { - "variable": "logoImage", - "value":"$.MdmsRes.tenant.tenants[0].logoId", - "type": "image" - }, - { - "variable": "logo_header", - "value":"$.MdmsRes.tenant.tenants[0].code", - "localisation":{ - "required":true, - "prefix": "TENANT_TENANTS", - "module":"rainmaker-common" - } - } - ] - }, - { - "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", - "queryParam": "moduleName=tenant&masterName=footer&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}' %26%26 @.service=='{$.businessService}')%5D", - "apiRequest": null, - "responseMapping":[ - { - "variable": "variable11", - "value": "$.MdmsRes.tenant.footer[0].billFooterContent.*", - "type":"array", - "format":{ - "type":"string", - "scema":[ - { - "variable":"disclaimerContent", - "value":"disclaimer", - "type":"string", - "localisation":{ - "required":true, - "prefix": null, - "module": "rainmaker-common" - } - } - ] - } - } - ] - } - ] - } - ] - } - ] - } -} diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json deleted file mode 100644 index ca1fb104..00000000 --- a/configs/pdf-service/data-config/property-receipt.json +++ /dev/null @@ -1,982 +0,0 @@ -{ - "key": "property-receipt", - "documentType": "PROPERTYRECEIPT", - "DataConfigs": { - "moduleName": "PT", - "version": "1.0.0", - "baseKeyPath": "$.Payments.*", - "entityIdPath":"$.id", - "isCommonTableBorderRequired": true, - "mappings": [ - { - "topic": "common-pdf-generation-3", - "mappings": [ - { - "direct": [ - { - "variable": "payerName", - "value": { - "path": "$.paidBy" - } - }, - { - "variable": "user-name", - "value": { - "path": "$.userInfo.name" - }, - "type":"selectFromRequestInfo" - }, - { - "variable": "payerContact", - "value": { - "path": "$.mobileNumber" - } - }, - { - "variable": "paymentStatus", - "value": { - "path": "$.paymentStatus" - } - }, - { - "variable": "receiptNo", - "value": { - "path": "$.paymentDetails[0].receiptNumber" - } - }, - { - "variable": "serviceType", - "value": { - "path": "$.paymentDetails[0].businessService" - }, - "localisation":{ - "required":true, - "prefix":"MODULE", - "module":"rainmaker-common", - "locale":"en_IN" - } - }, - { - "variable": "paidAmount", - "value": { - "path": "$.totalAmountPaid" - } - }, - { - "variable": "assessmentYear", - "value": { - "path": "$.paymentDetails[0].additionalDetails.assessmentYears" - } - }, { - "variable": "ifsc", - "value": { - "path": "$.ifscCode" - } - },{ - "variable": "bank", - "value": { - "path": "$.additionalDetails[0].bankName" - } - },{ - "variable": "branch", - "value": { - "path": "$.additionalDetails[0].branchName" - } - }, - { - "variable": "fromPeriod", - "value": { - "path": "$.paymentDetails[0].bill.billDetails[0].fromPeriod" - }, - "type": "date" - }, - { - "variable": "toPeriod", - "value": { - "path": "$.paymentDetails[0].bill.billDetails[0].toPeriod" - }, - "type": "date" - }, - { - "variable": "assessmentYear1", - "value": { - "path": "$.paymentDetails[0].bill.billDetails[0].fromPeriod" - }, - "type": "date", - "format": "YYYY" - }, - { - "variable": "assessmentYear2", - "value": { - "path": "$.paymentDetails[0].bill.billDetails[0].toPeriod" - }, - "type": "date", - "format": "YYYY" - }, - { - "variable": "paymentMode", - "value": { - "path": "$.paymentMode" - }, - "localisation":{ - "required":true, - "prefix": "COMMON_MASTERS_PAYMENTMODE", - "module": "rainmaker-common", - "locale":"en_IN" - } - }, - { - "variable": "G8ReceiptNo", - "value": { - "path": "$.paymentDetails[0].manualReceiptNumber" - } - }, - { - "variable": "G8ReceiptDate", - "value": { - "path": "$.paymentDetails[0].manualReceiptDate" - }, - "type": "date" - }, - { - "variable": "paymentDate", - "value": { - "path": "$.transactionDate" - }, - "type": "date" - }, - { - "variable": "consumerID", - "value": { - "path": "$.paymentDetails[0].bill.consumerCode" - } - }, - { - "variable": "transactionID", - "value": { - "path": "$.instrumentNumber" - } - }, { - "variable": "transactionDate", - "value": { - "path": "$.instrumentDate" - }, - "type": "date" - }, - { - "variable": "dueAmount", - "value": { - "path": "$.paymentDetails[0].bill.totalAmount" - } - }, - { - "variable": "approvedBy", - "value": { - "path": "$.paymentDetails[0].bill.additionalDetails.lastModifier" - } - }, - { - "variable": "penaltyReason", - "value": { - "path": "$.paymentDetails[0].bill.additionalDetails.adhocPenaltyReason" - } - }, - { - "variable": "rebateReason", - "value": { - "path": "$.paymentDetails[0].bill.additionalDetails.adhocRebateReason" - } - }, - { - "variable": "PropertyTax", - "value": { - "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_TAX')].amount" - } - }, - { - "variable": "FireCess", - "value": { - "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_FIRE_CESS')].amount" - } - }, - { - "variable": "CancerCess", - "value": { - "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_CANCER_CESS')].amount" - } - }, - { - "variable": "Penalty", - "value": { - "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_TIME_PENALTY')].amount" - } - }, - { - "variable": "Arrears1", - "value": { - "path": "$.paymentDetails[0].bill.billDetails[1].amount" - } - }, { - "variable": "Arrears2", - "value": { - "path": "$.paymentDetails[0].bill.billDetails[2].amount" - } - }, { - "variable": "Arrears3", - "value": { - "path": "$.paymentDetails[0].bill.billDetails[3].amount" - } - }, { - "variable": "Arrears4", - "value": { - "path": "$.paymentDetails[0].bill.billDetails[4].amount" - } - }, { - "variable": "Arrears5", - "value": { - "path": "$.paymentDetails[0].bill.billDetails[5].amount" - } - }, { - "variable": "Arrears6", - "value": { - "path": "$.paymentDetails[0].bill.billDetails[6].amount" - } - }, { - "variable": "Arrears7", - "value": { - "path": "$.paymentDetails[0].bill.billDetails[7].amount" - } - }, { - "variable": "Arrears8", - "value": { - "path": "$.paymentDetails[0].bill.billDetails[8].amount" - } - }, - { - "variable": "adhocPenalty", - "value": { - "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_ADHOC_PENALTY')].amount" - } - }, - { - "variable": "adhocRebate", - "value": { - "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_ADHOC_REBATE')].amount" - } - }, - { - "variable": "Rebate", - "value": { - "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_TIME_REBATE')].amount" - } - }, - { - "variable": "Interest", - "value": { - "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_TIME_INTEREST')].amount" - } - }, - { - "variable": "UsageExemption", - "value": { - "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_UNIT_USAGE_EXEMPTION')].amount" - } - }, - { - "variable": "SpecialCategoryExemption", - "value": { - "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_OWNER_EXEMPTION')].amount" - } - }, - { - "variable": "RoundOff", - "value": { - "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_ROUNDOFF')].amount" - } - }, - { - "variable": "payment_receipt", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_RECEIPT" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common", - "locale":"en_IN" - } - }, - { - "variable": "receipt_no", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_RECEIPT_NO" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common", - "locale":"en_IN" - } - }, - { - "variable": "consumer_id", - "value": { - "path": "$.paymentDetails[0].businessService" - }, - "localisation":{ - "required":true, - "prefix": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_CONSUMER_ID", - "module":"rainmaker-common", - "locale":"en_IN" - } - }, - { - "variable": "payment_date", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_DATE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common", - "locale":"en_IN" - } - }, - { - "variable": "payer_name", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYER_NAME" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common", - "locale":"en_IN" - } - }, - { - "variable": "payer_contact", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYER_CONTACT" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common", - "locale":"en_IN" - } - }, - { - "variable": "payment_status", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_STATUS" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common", - "locale":"en_IN" - } - }, - { - "variable": "service_type", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_SERVICE_TYPE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common", - "locale":"en_IN" - } - }, - { - "variable": "billing_period", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_BILLING_PERIOD" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common", - "locale":"en_IN" - } - }, - { - "variable": "paid_amount", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAID_AMOUNT" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common", - "locale":"en_IN" - } - }, - { - "variable": "pending_amount", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PENDING_AMOUNT" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common", - "locale":"en_IN" - } - }, - { - "variable": "payment_mode", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_MODE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common", - "locale":"en_IN" - } - }, - { - "variable": "transaction_id", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_TRANSACTION_ID" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common", - "locale":"en_IN" - } - }, - { - "variable": "g8_receipt_no", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_G8_RECEIPT_NO" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common", - "locale":"en_IN" - } - }, - { - "variable": "g8_receipt_date", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_G8_RECEIPT_DATE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common", - "locale":"en_IN" - } - }, - { - "variable": "generated_by", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_GENERATED_BY" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common", - "locale":"en_IN" - } - }, - { - "variable": "commissioner/eo", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_COMMISSIONER_EO" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common", - "locale":"en_IN" - } - }, - { - "variable": "no_signature", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_NO_SIGNATURE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common", - "locale":"en_IN" - } - }, - { - "variable": "disclamer", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common", - "locale":"en_IN" - } - }, - { - "variable": "to", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_TO" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common", - "locale":"en_IN" - } - }, - { - "variable": "var_bills", - "value":{ - "path":"$.paymentDetails[0].additionalDetails.arrearArray.*" - }, - "type":"array", - "format":{ - "type":"string", - "scema":[ - { - "variable":"year", - "value": "year" - - },{ - "variable":"tax", - "value": "tax" - - },{ - "variable":"firecess", - "value": "firecess" - - },{ - "variable":"cancercess", - "value": "cancercess" - - },{ - "variable":"penalty", - "value": "penalty" - - },{ - "variable":"interest", - "value": "interest" - - },{ - "variable":"rebate", - "value": "rebate" - - }, - { - "variable":"usage_exemption", - "value": "usage_exemption" - - },{ - "variable":"special_category_exemption", - "value": "special_category_exemption" - - },{ - "variable":"adhoc_penalty", - "value": "adhoc_penalty" - - },{ - "variable":"adhoc_rebate", - "value": "adhoc_rebate" - - },{ - "variable":"roundoff", - "value": "roundoff" - - },{ - "variable":"total", - "value": "total" - - } - ] - } - }, - { - "variable": "var_tax", - "value":{ - "path":"$.paymentDetails[0].additionalDetails.taxArray.*" - }, - "type":"array", - "format":{ - "type":"string", - "scema":[ - { - "variable":"year", - "value": "year" - - },{ - "variable":"tax", - "value": "tax" - - },{ - "variable":"firecess", - "value": "firecess" - - },{ - "variable":"cancercess", - "value": "cancercess" - - },{ - "variable":"penalty", - "value": "penalty" - - },{ - "variable":"interest", - "value": "interest" - - },{ - "variable":"rebate", - "value": "rebate" - - }, - { - "variable":"usage_exemption", - "value": "usage_exemption" - - },{ - "variable":"special_category_exemption", - "value": "special_category_exemption" - - },{ - "variable":"adhoc_penalty", - "value": "adhoc_penalty" - - },{ - "variable":"adhoc_rebate", - "value": "adhoc_rebate" - - },{ - "variable":"roundoff", - "value": "roundoff" - - },{ - "variable":"total", - "value": "total" - - } - ] - } - }, - - { - "variable": "Municipal_Corporation", - "value": { - "path": "PDF_STATIC_LABEL_MDMS_MUNICIPAL_CORPORATION" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common", - "locale":"en_IN" - } - }, - { - "variable": "DisclaimerText", - "value": { - "path": "PT_RECEIPT_DISCLAIMER" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common", - "locale":"en_IN" - } - }, - { - "variable": "footerLogoImage", - "url": "https://pb-egov-assets.s3.ap-south-1.amazonaws.com/mseva-logo-colored.png", - "type": "image" - } - ] - }, - { - "derived": [ - { - "variable": "pendingAmount", - "formula": "{{dueAmount}}-{{paidAmount}}" - }, - { - "variable": "Arrears", - "formula": "{{Arrears1}}+{{Arrears2}}+{{Arrears3}}+{{Arrears4}}+{{Arrears5}}+{{Arrears6}}+{{Arrears7}}+{{Arrears8}}" - } - ] - }, - { - "externalAPI": [ - { - "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", - "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", - "apiRequest": null, - "responseMapping":[ - { - "variable":"address", - "value":"$.MdmsRes.tenant.tenants[0].address" - }, - { - "variable":"phoneNumber", - "value":"$.MdmsRes.tenant.tenants[0].contactNumber" - }, - { - "variable":"website", - "value":"$.MdmsRes.tenant.tenants[0].domainUrl" - }, - { - "variable":"mcGrade", - "value":"$.MdmsRes.tenant.tenants[0].city.ulbType" - }, - { - "variable":"email", - "value":"$.MdmsRes.tenant.tenants[0].emailId" - }, - { - "variable": "logoImage", - "value":"$.MdmsRes.tenant.tenants[0].logoId", - "type":"image" - }, - { - "variable": "logo-header", - "value":"$.MdmsRes.tenant.tenants[0].code", - "localisation":{ - "required":true, - "prefix": "TENANT_TENANTS", - "module":"rainmaker-common", - "locale":"en_IN" - } - } - ] - }, - { - "path": "http://property-services.egov:8080/property-services/property/_search", - "queryParam": "propertyIds=$.paymentDetails[0].bill.consumerCode,tenantId=$.tenantId", - "apiRequest": null, - "responseMapping":[ - { "variable":"institutionName", - "value":"$.Properties[0].institution.name" - }, - { - "variable":"vasikaNo", - "value":"$.Properties[0].additionalDetails.vasikaNo" - },{ - "variable":"vasikaDate", - "value":"$.Properties[0].additionalDetails.vasikaDate", - "type":"date" - }, { - "variable":"allotmentNo", - "value":"$.Properties[0].additionalDetails.allotmentNo" - }, { - "variable":"allotmentDate", - "value":"$.Properties[0].additionalDetails.allotmentDate", - "type":"date" - }, { - "variable":"businessName", - "value":"$.Properties[0].additionalDetails.businessName" - }, { - "variable":"remarks", - "value":"$.Properties[0].additionalDetails.remrks" - }, { - "variable":"fatherHusbandName", - "value":"$.Properties[0].owners[0].fatherOrHusbandName" - }, { - "variable":"propertyUsage", - "value":"$.Properties[0].usageCategory", - "localisation": { - "required": true, - "prefix": "COMMON_PROPUSGTYPE", - "module": "rainmaker-pt", - "locale":"en_IN" - } - }, - { - "variable":"doorNo", - "value":"$.Properties[0].address.doorNo" - }, - { - "variable":"buildingName", - "value":"$.Properties[0].address.buildingName" - }, - { - "variable":"streetName", - "value":"$.Properties[0].address.street" - }, - { - "variable":"locality", - "value":"$.Properties[0].address.locality.name" - }, - { - "variable":"landArea", - "value":"$.Properties[0].landArea" - }, - { - "variable":"propertyType", - "value":"$.Properties[0].propertyType", - "localisation": { - "required": true, - "prefix": "WS_PROPTYPE", - "module": "rainmaker-ws", - "locale":"en_IN" - } - }, - { - "variable":"oldPropertyId", - "value":"$.Properties[0].oldPropertyId" - }, - { - "variable":"surveyId", - "value":"$.Properties[0].surveyId" - }, - { - "variable":"ownerMobileNumber", - "value":"$.Properties[0].owners[?(@.status== 'ACTIVE')].mobileNumber" - }, - { - "variable": "var_owners", - "value":"$.Properties[0].owners[?(@.active== true && @.status== 'ACTIVE')]", - "type":"array", - "format":{ - "type":"string", - "scema":[ - { - "variable":"name2", - "value":"name" - }, - { - "variable":"fatherOrHusbandName2", - "value":"fatherOrHusbandName" - }, - { - "variable":"ownerShipPercentage", - "value":"ownerShipPercentage" - }, - { - "variable":"ownerType", - "value":"ownerType" - } - ] - } - }, - { - "variable": "var_floors", - "value":"$.Properties[0].units[?(@.active== true)]", - "type":"array", - "format":{ - "type":"string", - "scema":[ - { - "variable":"floor_no", - "value":"floorNo", - "localisation": { - "required": true, - "prefix": "PROPERTYTAX_FLOOR", - "module": "rainmaker-pt", - "locale":"en_IN" - } - }, - { - "variable":"usage_category", - "value":"usageCategory", - "localisation": { - "required": true, - "prefix": "COMMON_PROPUSGTYPE", - "module": "rainmaker-pt", - "locale":"en_IN" - } - }, - { - "variable":"sub_usage_category", - "value":"usageCategory", - "localisation": { - "required": true, - "prefix": "COMMON_PROPSUBUSGTYPE", - "module": "rainmaker-pt", - "isSubTypeRequired":true, - "locale":"en_IN" - } - }, - { - "variable":"occupancy_type", - "value":"occupancyType" - }, - { - "variable":"builtup_area", - "value":"constructionDetail.builtUpArea" - }, - { - "variable":"arv_rent", - "value":"arv" - }, - { - "variable":"additional_details", - "value":"additionalDetails" - } - - ] - } - } - - - ] - }, - { - "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", - "queryParam": "moduleName=tenant&masterName=footer&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}' %26%26 @.service=='{$.paymentDetails[0].businessService}')%5D", - "apiRequest": null, - "responseMapping":[ - { - "variable": "variable11", - "value": "$.MdmsRes.tenant.footer[0].receiptFooterContent.*", - "type":"array", - "format":{ - "type":"string", - "scema":[ - { - "variable":"disclaimerContent", - "value":"disclaimer", - "type":"string", - "localisation":{ - "required":true, - "prefix": null, - "module": "rainmaker-common" - } - } - ] - } - } - ] - } - ] - } - ] - } - ] - } -} diff --git a/configs/pdf-service/data-config/pt-receipt.json b/configs/pdf-service/data-config/pt-receipt.json deleted file mode 100644 index 30cceb74..00000000 --- a/configs/pdf-service/data-config/pt-receipt.json +++ /dev/null @@ -1,278 +0,0 @@ -{ - - "key":"pt-receipt", - "DataConfigs": { - "serviceName": "rainmaker-pt", - "version": "1.0.0", - "baseKeyPath": "$.Properties.*", - "entityIdPath":"$.propertyId", - "isCommonTableBorderRequired":true, - "mappings": [ - { - "topic": "pt-pdf-generation", - "staticConfigPath": "https://raw.githubusercontent.com/egovernments/egov-services/vishal-feature-filestore/core/egov-indexer/src/main/resources/rainmaker-pgr-indexer.yml", - "mappings": [ - { - "direct": [ - { - "variable": "variable1", - "value": { - "path":"$.propertyDetails[0].financialYear" - } - }, - { - "variable": "variable38", - "url":"https://raw.githubusercontent.com/egovernments/egov-web-app/master/web/rainmaker/dev-packages/egov-ui-kit-dev/src/assets/images/pblogo.png", - "type":"image" - }, - { - "variable": "variable35", - "value": { - "path":"$.tenantId" - }, - "localisation":{ - "required":true, - "prefix":"TENANT_TENANTS", - "module":"rainmaker-common" - }, - "isUpperCaseRequired":true - }, - { - "variable": "variable36", - "type":"citizen-employee-title" - }, - { - "variable":"variable2", - "value":{ - "path":"$.oldPropertyId" - } - }, - { - "variable": "variable3", - "value":{ - "path":"$.propertyId" - } - }, - { - "variable": "variable4", - "value":{ - "path":"$.propertyDetails[0].assessmentNumber" - } - }, - { - "variable": "variable5", - "value":{ - "path":"$.address.doorNo" - } - }, - { - "variable": "variable6", - "value":{ - "path":"$.address.buildingName" - } - }, - { - "variable": "variable7", - "value":{ - "path":"$.address.street" - } - }, - { - "variable": "variable8", - "value":{ - "path":"$.address.locality.name" - } - }, - { - "variable": "variable9", - "value":{ - "path":"$.propertyDetails[0].landArea" - } - }, - { - "variable": "variable10", - "value":{ - "path":"$.propertyDetails[0].propertySubType" - }, - "localisation":{ - "required":true, - "prefix":"PROPERTYTAX_BILLING_SLAB", - "module":"rainmaker-pt" - } - }, - { - "variable": "variable11", - "value":{ - "path":"$.propertyDetails[0].owners.*" - }, - "type":"array", - "format":{ - "type":"string", - "scema":[ - { - "key":"name" - }, - { - "key":"fatherOrHusbandName" - }] - } - }, - { - "variable": "variable12", - "value":{ - "path":"$.propertyDetails[0].units.*" - }, - "type":"array-column", - "format":{ - "type":"string", - "scema":[ - { - "key":"floorNo", - "localisation":{ - "required":true, - "prefix":"PROPERTYTAX_FLOOR", - "module":"rainmaker-pt" - } - - }, - { - "key":"usageCategoryMinor", - "localisation":{ - "required":true, - "prefix":"PROPERTYTAX_BILLING_SLAB", - "module":"rainmaker-pt" - } - - }, - { - "key":"usageCategoryDetail", - "localisation":{ - "required":true, - "prefix":"PROPERTYTAX_BILLING_SLAB", - "module":"rainmaker-pt" - } - }, - { - "key":"occupancyType", - "localisation":{ - "required":true, - "prefix":"PROPERTYTAX_OCCUPANCYTYPE", - "module":"rainmaker-pt" - } - }, - { - "key":"unitArea" - }] - } - }, - { - "variable": "footerLogoImage", - "url": "https://pb-egov-assets.s3.ap-south-1.amazonaws.com/mseva-logo-colored.png", - "type": "image" - } - ] - }, - { - "derived": [ - { - "variable": "variable37", - "formula": "{{variable34}}-{{variable27}}" - } - ] - }, - { - "externalAPI": [ - { - "path": "http://collection-services:8080/collection-services/receipts/_search", - "queryParam": "consumerCode=$.propertyId:$.propertyDetails[0].assessmentNumber", - "apiRequest": null, - "responseMapping":[ - { - "variable":"variable15", - "value":"$.Receipt[0].receiptNumber" - }, - { - "variable":"variable16", - "value":"$.Receipt[0].receiptDate" - }, - { - "variable":"variable17", - "value":"$.Receipt[0].Bill[0].billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_TAX')].amount" - }, - { - "variable":"variable18", - "value":"$.Receipt[0].Bill[0].billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_FIRE_CESS')].amount" - }, - { - "variable":"variable19", - "value":"$.Receipt[0].Bill[0].billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_CANCER_CESS')].amount" - }, - { - "variable":"variable20", - "value":"$.Receipt[0].Bill[0].billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_TIME_PENALTY')].amount" - }, - { - "variable":"variable21", - "value":"$.Receipt[0].Bill[0].billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_TIME_REBATE')].amount" - }, - { - "variable":"variable22", - "value":"$.Receipt[0].Bill[0].billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_TIME_INTEREST')].amount" - }, - { - "variable":"variable23", - "value":"$.Receipt[0].Bill[0].billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_UNIT_USAGE_EXEMPTION')].amount" - }, - { - "variable":"variable24", - "value":"$.Receipt[0].Bill[0].billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_OWNER_EXEMPTION')].amount" - }, - { - "variable":"variable25", - "value":"$.Receipt[0].Bill[0].billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_ROUNDOFF')].amount" - }, - { - "variable":"variable26", - "value":"$.Receipt[0].Bill[0].billDetails[0].totalAmount" - }, - { - "variable":"variable27", - "value":"$.Receipt[0].Bill[0].billDetails[0].amountPaid" - }, - { - "variable":"variable28", - "value":"$.Receipt[0].instrument.instrumentType.name" - }, - { - "variable":"variable29", - "value":"$.Receipt[0].instrument.bank.name" - }, - { - "variable":"variable30", - "value":"$.Receipt[0].transactionId" - }, - { - "variable":"variable31", - "value":"$.Receipt[0].instrument.transactionDateInput" - }, - { - "variable":"variable32", - "value":"$.Receipt[0].Bill[0].billDetails[0].manualReceiptNumber" - }, - { - "variable":"variable33", - "value":"$.Receipt[0].Bill[0].billDetails[0].manualReceiptDate" - }, - { - "variable":"variable34", - "value":"$.Receipt[0].Bill[0].billDetails[0].totalAmount" - } - ] - } - ] - } - ] - } - ] - } -} diff --git a/configs/pdf-service/data-config/ptmutationcertificate.json b/configs/pdf-service/data-config/ptmutationcertificate.json deleted file mode 100644 index 6c22a095..00000000 --- a/configs/pdf-service/data-config/ptmutationcertificate.json +++ /dev/null @@ -1,385 +0,0 @@ -{ - "key": "ptmutationcertificate", - "documentType": "PTMUTATION", - "DataConfigs": { - "moduleName": "PT", - "version": "1.0.0", - "baseKeyPath": "$.Properties.*", - "entityIdPath":"$.id", - "isCommonTableBorderRequired": true, - "mappings": [ - { - "mappings": [ - { - "direct": [ - - { - "variable": "municipal_corportaion", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_MUNICIPAL_CORPORATION" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "corporation_fax", - "value": { - "path": "PDF_STATIC_LABEL_MUTATION_FAX" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "corporation_website", - "value": { - "path": "PDF_STATIC_LABEL_MUTATION_WEBSITE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "corporation_email", - "value": { - "path": "PDF_STATIC_LABEL_MUTATION_EMAIL" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "Mutation_Approval_Certificate", - "value": { - "path": "PDF_STATIC_LABEL_MUATATION_APPROVAL_CERTIFICATE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "Property_ID_Label", - "value": { - "path": "PDF_STATIC_LABEL_MUATATION_PROPERTY_ID_LABEL" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "Mutation_Number_Label", - "value": { - "path": "PDF_STATIC_LABEL_MUATATION_NUMBER_LABEL" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "Application_Number_Label", - "value": { - "path": "PDF_STATIC_LABEL_APPLICATION_NUMBER_LABEL" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "Receipt_Number_Label", - "value": { - "path": "PDF_STATIC_LABEL_RECEIPT_NUMBER_LABEL" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "Approval_Date_Label", - "value": { - "path": "PDF_STATIC_LABEL_APPROVAL_DATE_LABEL" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "Order_Label", - "value": { - "path": "PDF_STATIC_LABEL_ORDER_LABEL" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "Mutation_Declaration_Label", - "value": { - "path": "$.tenantId" - }, - "localisation":{ - "required":true, - "prefix": "PDF_STATIC_LABEL_MUTATION_DECLARATION_LABEL", - "module":"rainmaker-common" - } - }, - { - "variable": "Transferrer_Details_Label", - "value": { - "path": "PDF_STATIC_LABEL_TRANSFERRER_LABEL" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "Transferree_Details_Label", - "value": { - "path": "PDF_STATIC_LABEL_TRANSFERREE_LABEL" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "Mutation_To_Label", - "value": { - "path": "PDF_STATIC_LABEL_MUTATION_TO_LABEL" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "Shri_Smt_Label", - "value": { - "path": "PDF_STATIC_LABEL_SHRI_SMT_LABEL" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "approved_by", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_APPROVED_BY" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "commissioner", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_COMMISSIONER" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "Property_ID", - "value": { - "path": "$.propertyId" - } - }, - { - "variable": "Mutation_Number", - "value": { - "path": "$.acknowldgementNumber" - } - }, - { - "variable": "Application_Number", - "value": { - "path": "$.acknowldgementNumber" - } - }, - { - "variable": "Transferrer_Name", - "value": { - "path": "$.owners[?(@.status == 'INACTIVE')].name" - } - }, - { - "variable": "Transferrer_Relation", - "value": { - "path": "$.owners[?(@.status == 'INACTIVE')].relationship" - }, - "localisation":{ - "required":true, - "prefix": "PT_MUTATION", - "module": "rainmaker-common" - } - }, - { - "variable": "Transferrer_Relative_Name", - "value": { - "path": "$.owners[?(@.status == 'INACTIVE')].fatherOrHusbandName" - } - }, - { - "variable": "Transferree_Name", - "value": { - "path": "$.owners[?(@.status == 'ACTIVE')].name" - } - }, - { - "variable": "Transferree_Relation", - "value": { - "path": "$.owners[?(@.status == 'ACTIVE')].relationship" - }, - "localisation":{ - "required":true, - "prefix": "PT_MUTATION", - "module": "rainmaker-common" - } - }, - { - "variable": "Transferree_Relative_Name", - "value": { - "path": "$.owners[?(@.status == 'ACTIVE')].fatherOrHusbandName" - } - }, - { - "variable": "Transferree_Address", - "value": { - "path": "$.owners[?(@.status == 'ACTIVE')].permanentAddress" - } - }, - { - "variable": "Transferree_City", - "value": { - "path": "$.owners[?(@.status == 'ACTIVE')].permanentCity" - } - }, - { - "variable": "footerLogoImage", - "url": "https://pb-egov-assets.s3.ap-south-1.amazonaws.com/mseva-logo-colored.png", - "type": "image" - } - ] - }, - { - "externalAPI": [ - { - "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", - "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", - "apiRequest": null, - "responseMapping":[ - { - "variable":"ULB_LOGO", - "value":"$.MdmsRes.tenant.tenants[0].logoId", - "type": "image" - }, - { - "variable":"ULB_ADDRESS", - "value":"$.MdmsRes.tenant.tenants[0].address" - }, - { - "variable":"ULB_CITY", - "value":"$.MdmsRes.tenant.tenants[0].name" - }, - { - "variable":"CorporationContact_Value", - "value":"$.MdmsRes.tenant.tenants[0].contactNumber" - }, - { - "variable":"corporationWebsite", - "value":"$.MdmsRes.tenant.tenants[0].domainUrl" - }, - { - "variable":"corporationEmail", - "value":"$.MdmsRes.tenant.tenants[0].emailId" - } - ] - }, - { - "path": "http://collection-services:8080/collection-services/payments/PT/_search", - "queryParam": "tenantId=$.tenantId,consumerCodes=$.acknowldgementNumber,businessServices=PT.MUTATION", - "apiRequest": null, - "responseMapping":[ - { - "variable":"Receipt_Number", - "value":"$.Payments[0].paymentDetails[0].receiptNumber" - } - - ] - }, - { - "path": "http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search", - "queryParam": "businessIds=$.acknowldgementNumber,history=true,tenantId=$.tenantId", - "apiRequest": null, - "responseMapping":[ - { - "variable":"approved_by_value", - "value":"$.ProcessInstances[?(@.action == 'APPROVE')].assigner.name" - }, - { - "variable":"Approval_Date", - "value":"$.ProcessInstances[?(@.action == 'APPROVE')].auditDetails.lastModifiedTime", - "type": "date" - } - - ] - } - - ] - } - ] - -} -] -} -} diff --git a/configs/pdf-service/data-config/sewerage-bill-amendment-note.json b/configs/pdf-service/data-config/sewerage-bill-amendment-note.json deleted file mode 100644 index 3fcdd62d..00000000 --- a/configs/pdf-service/data-config/sewerage-bill-amendment-note.json +++ /dev/null @@ -1,622 +0,0 @@ -{ - "key": "sw-bill-amendment-credit-note", - "DataConfigs": { - "serviceName": "rainmaker-common", - "version": "1.0.0", - "baseKeyPath": "$.Amendments.*", - "entityIdPath":"$.id", - "isCommonTableBorderRequired": true, - "mappings": [ - { - "topic": "common-pdf-generation-3", - "mappings": [ - { - "direct": [ - { - "variable": "payerName", - "value": { - "path": "$.payerName" - } - }, - { - "variable": "applicationNo", - "value": { - "path": "$.consumerCode" - } - }, - { - "variable": "user-name", - "value": { - "path": "$.additionalDetails.ownerName" - } - }, - { - "variable": "permanentAddress", - "value": { - "path": "$.additionalDetails.ownerAddress" - } - }, - { - "variable": "date", - "value": { - "path": "$.userInfo.createdDate" - }, - "type":"selectFromRequestInfo" - }, - { - "variable": "payerContact", - "value": { - "path": "$.mobileNumber" - } - }, - { - "variable": "paymentStatus", - "value": { - "path": "$.paymentStatus" - } - }, - { - "variable": "receiptNo", - "value": { - "path": "$.paymentDetails[0].receiptNumber" - } - }, - { - "variable": "serviceType", - "value": { - "path": "$.businessService" - }, - "localisation":{ - "required":true, - "prefix":"MODULE", - "module":"rainmaker-common" - } - }, - { - "variable": "sewerageInterest", - "value": { - "path": "$.demandDetails[?(@.taxHeadMasterCode == 'SW_TIME_INTEREST')].taxAmount" - } - }, - { - "variable": "water_cess", - "value": { - "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_WATER_CESS" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "interest", - "value": { - "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_INTEREST" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "generated_by", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_GENERATED_BY" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "commissioner/eo", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_COMMISSIONER_EO" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "no_signature", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_NO_SIGNATURE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "penalty", - "value": { - "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_PENALTY" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "sewerage_charge", - "value": { - "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_SEWERAGE_CHARGE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "seweragePenalty", - "value": { - "path": "$.demandDetails[?(@.taxHeadMasterCode == 'SW_TIME_PENALTY')].taxAmount" - } - }, - { - "variable": "arrears", - "value": { - "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_ARREARS" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "sewerageCharge", - "value": { - "path": "$.demandDetails[?(@.taxHeadMasterCode == 'SW_CHARGE')].taxAmount" - } - }, - { - "variable": "total_amount", - "value": { - "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_TOTAL_AMOUNT" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "bill_amendment_application", - "value": { - "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_APPLICATION" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "demand_revision_basis_details", - "value": { - "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_DEM_REV_BAS_DET" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "demand_revision_basis", - "value": { - "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_DEM_REV_BASIS" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "court_order_no", - "value": { - "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_COURT_ORDER_NO" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "with_effect_from", - "value": { - "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_WITH_EFFECT_FROM" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "demandRevisionBasis", - "value": { - "path": "$.amendmentReason" - } - }, - { - "variable": "courtOrderNo", - "value": { - "path": "$.reasonDocumentNumber" - } - }, - { - "variable": "withEffectFrom", - "value": { - "path": "$.effectiveFrom" - } - }, - { - "variable": "court_order", - "value": { - "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_COURT_ORDER" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "note_id", - "value": { - "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_NOTE_ID" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "note_date", - "value": { - "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_NOTE_DATE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "against", - "value": { - "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_NOTE_AGAINST" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "adjustment_amount_details", - "value": { - "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_NOTE_ADJUSTMENT_AMOUNT_DETAILS" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "total_amount", - "value": { - "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_NOTE_TOTAL_AMOUNT" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "rs", - "value": { - "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_NOTE_RS" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "box_note", - "value": { - "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_NOTE_BOX_NOTE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "box_validity", - "value": { - "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_NOTE_BOX_VALIDITY" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "self_declaration", - "value": { - "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_SELF_DECLARATION" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "past_bills", - "value": { - "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_PAST_BILLS" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "courtOrder", - "value": { - "path": "$.transactionNumber" - } - }, - { - "variable": "selfDeclaration", - "value": { - "path": "$.transactionNumber" - } - }, - { - "variable": "pastBills", - "value": { - "path": "$.transactionNumber" - } - }, - { - "variable": "applicationNo", - "value": { - "path": "$.consumerCode" - } - }, - { - "variable": "bill_amendment_application_number", - "value": { - "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_APPLICATION_NUMBER" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "adjustment_amount_details", - "value": { - "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_ADJUSTMENT_AMOUNT_DETAILS" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - - }, - { - "variable": "sl_no", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_SERIAL_NO" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "tax_heads", - "value": { - "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_TAX_HEADS" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "reduced_amount", - "value": { - "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_REDUCED_AMOUNT" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "note_type", - "value": { - "path": "$.additionalDetails.noteType" - }, - "localisation": { - "required": true, - "prefix": "PDF_STATIC_LABEL_BILL_AMENDMENT", - "module": "rainmaker-common" - } - }, - { - "variable": "water_tax", - "value": { - "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_WATER_TAX" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "Municipal_Corporation", - "value": { - "path": "PDF_STATIC_LABEL_MDMS_MUNICIPAL_CORPORATION" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "footerLogoImage", - "url": "https://pb-egov-assets.s3.ap-south-1.amazonaws.com/mseva-logo-colored.png", - "type": "image" - } - ] - }, - { - "derived": [ - { - "variable": "totalAmount", - "formula": "{{sewerageCharge}}+{{sewerageInterest}}+{{seweragePenalty}}" - } - ] - }, - { - "externalAPI": [ - { - "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", - "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", - "apiRequest": null, - "responseMapping":[ - { - "variable":"address", - "value":"$.MdmsRes.tenant.tenants[0].address" - }, - { - "variable":"phoneNumber", - "value":"$.MdmsRes.tenant.tenants[0].contactNumber" - }, - { - "variable":"mcGrade", - "value":"$.MdmsRes.tenant.tenants[0].city.pwssbGrade" - }, - { - "variable":"website", - "value":"$.MdmsRes.tenant.tenants[0].domainUrl" - }, - { - "variable":"email", - "value":"$.MdmsRes.tenant.tenants[0].emailId" - }, - { - "variable": "logoImage", - "value":"$.MdmsRes.tenant.tenants[0].logoId", - "type":"image" - }, - { - "variable": "logo-header", - "value":"$.MdmsRes.tenant.tenants[0].code", - "localisation":{ - "required":true, - "prefix": "TENANT_TENANTS", - "module":"rainmaker-common" - } - } - ] - }, - { - "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", - "queryParam": "moduleName=tenant&masterName=footer&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}' %26%26 @.service=='{$.businessService}')%5D", - "apiRequest": null, - "responseMapping":[ - { - "variable": "variable11", - "value": "$.MdmsRes.tenant.footer[0].receiptFooterContent.*", - "type":"array", - "format":{ - "type":"string", - "scema":[ - { - "variable":"disclaimerContent", - "value":"disclaimer", - "type":"string", - "localisation":{ - "required":true, - "prefix": null, - "module": "rainmaker-common" - } - } - ] - } - } - ] - } - ] - } - ] - } - ] - } -} diff --git a/configs/pdf-service/data-config/sw-bill.json b/configs/pdf-service/data-config/sw-bill.json deleted file mode 100644 index a2f6b9a8..00000000 --- a/configs/pdf-service/data-config/sw-bill.json +++ /dev/null @@ -1,847 +0,0 @@ -{ - "key": "sw-bill", - "DataConfigs": { - "serviceName": "rainmaker-common", - "version": "1.0.0", - "baseKeyPath": "$.Bill.*", - "entityIdPath": "$.billNumber", - "isCommonTableBorderRequired": true, - "mappings": [ - { - "topic": "common-pdf-generation-1", - "staticConfigPath": "https://raw.githubusercontent.com/egovernments/egov-services/vishal-feature-filestore/core/egov-indexer/src/main/resources/rainmaker-pgr-indexer.yml", - "mappings": [ - { - "direct": [ - { - "variable": "total_amount_due", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_TOTAL_AMOUNT_DUE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "payer_name", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PAYER_NAME" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "Municipal_Corporation", - "value": { - "path": "PDF_STATIC_LABEL_MDMS_MUNICIPAL_CORPORATION" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "bill_no", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_BILL_NO" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "Rs", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_RUPEE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "mobile_no", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_MOBILE_NO" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "bill_period", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_BILL_PERIOD" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "payer_address", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PAYER_ADDRESS" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "bill_issue_date", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ISSUE_DATE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "bill_due_date", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_BILL_DUE_DATE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "billing_summary_property_tax", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_BILLING_SUMMARY" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "serviceType", - "value": { - "path": "$.businessService" - }, - "localisation": { - "required": true, - "prefix": "MODULE", - "module": "rainmaker-common" - } - }, - { - "variable": "property_id", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PROPERTY_ID" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "arrears_label", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ARREARS" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "advanceAdjusted_label", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ADVANCEADJUSTED" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "advanceAvailable_label", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ADVANCEAVAILABLE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "charge_label", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_CHARGE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "penalty_label", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PENALTY" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "rebate_label", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_REBATE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "others_label", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_OTHERS" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "total_label", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_TOTAL" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "important_message", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_IMPORTANT_MESSAGE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "payment_received", - "value": { - "path": "PDF_STATIC_LABEL_WS_BILL_PAYMENT_RECEIVED" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-ws" - } - }, - { - "variable": "this_document", - "value": { - "path": "PDF_STATIC_LABEL_WS_BILL_THIS_DOCUMENT" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-ws" - } - }, - { - "variable": "this_is_a", - "value": { - "path": "PDF_STATIC_LABEL_WS_BILL_THIS_IS" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-ws" - } - }, - { - "variable": "assessment_payment", - "value": { - "path": "PDF_STATIC_LABEL_WS_BILL_ASSESSSMENT_PAYMENT" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-ws" - } - }, - { - "variable": "please_deposit", - "value": { - "path": "PDF_STATIC_LABEL_WS_BILL_PLEASE_DEPOSIT" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-ws" - } - }, - { - "variable": "if_the_tax", - "value": { - "path": "PDF_STATIC_LABEL_WS_BILL_IF_THE_TAX" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-ws" - } - }, - { - "variable": "acknowledgement_for", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ACKNOWLEDGEMENT" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "date_label", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_DATE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "consumer_id", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_CONSUMER_ID" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "consumer_no", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_CONSUMER_NO" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "name_address", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_NAME_ADDRESS" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "total_payment", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_TOTAL_PAYMENT" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "receivers_signature", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_RECEIVERS_SIGNATURE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "totalAmountDue", - "value": { - "path": "$.totalAmount" - } - }, - { - "variable": "total", - "value": { - "path": "$.totalAmount" - } - }, - { - "variable": "payerName", - "value": { - "path": "$.payerName" - } - }, - { - "variable": "mobileNo", - "value": { - "path": "$.mobileNumber" - } - }, - { - "variable": "oldConnectionNo", - "value": { - "path": "$.connection.oldConnectionNo" - } - }, { - "variable": "rate", - "value": { - "path": "$.additionalDetails.penaltyRate" - } - }, - { - "variable": "ledgerId", - "value": { - "path": "$.connection.additionalDetails.ledgerId" - } - }, - { - "variable": "payerAddress", - "value": { - "path": "$.payerAddress" - } - }, - { - "variable": "tenant", - "value": { - "path": "$.tenantId" - } - }, - { - "variable": "nameAddress", - "value": { - "path": "$.payerAddress" - } - }, - { - "variable": "billNo", - "value": { - "path": "$.billNumber" - } - }, - { - "variable": "fromPeriod", - "value": { - "path": "$.billDetails[0].fromPeriod" - }, - "type": "date" - }, - { - "variable": "toPeriod", - "value": { - "path": "$.billDetails[0].toPeriod" - }, - "type": "date" - }, - { - "variable": "billIssueDate", - "value": { - "path": "$.billDate" - }, - "type": "date" - }, - { - "variable": "billDueDate", - "value": { - "path": "$.billDetails[0].expiryDate" - }, - "type": "date" - }, - { - "variable": "billdate", - "value": { - "path": "$.billDate" - }, - "type": "date" - }, - { - "variable": "consumerCode", - "value": { - "path": "$.consumerCode" - } - }, - { - "variable": "taxCharge", - "value": { - "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_TAX' || @.taxHeadCode == 'TL_TAX' || @.taxHeadCode == 'FIRENOC_TAXES' || @.taxHeadCode == 'WS_CHARGE' || @.taxHeadCode == 'SW_CHARGE' )].amount" - } - }, - { - "variable": "timeRebate", - "value": { - "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_TIME_REBATE' || @.taxHeadCode == 'WS_TIME_REBATE' || @.taxHeadCode == 'SW_TIME_REBATE')].amount" - } - }, - { - "variable": "adhocRebate", - "value": { - "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_ADHOC_REBATE' || @.taxHeadCode == 'TL_ADHOC_REBATE' || @.taxHeadCode == 'FIRENOC_ADHOC_REBATE')].amount" - } - }, - { - "variable": "timePenalty", - "value": { - "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_TIME_PENALTY' || @.taxHeadCode == 'WS_TIME_PENALTY' || @.taxHeadCode == 'SW_TIME_PENALTY')].amount" - } - }, - { - "variable": "adhocPenalty", - "value": { - "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_ADHOC_PENALTY' || @.taxHeadCode == 'TL_ADHOC_PENALTY' || @.taxHeadCode == 'FIRENOC_ADHOC_PENALTY')].amount" - } - }, - { - "variable": "firecess", - "value": { - "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_FIRE_CESS')].amount" - } - }, - { - "variable": "usageExemption", - "value": { - "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_UNIT_USAGE_EXEMPTION')].amount" - } - }, - { - "variable": "roundoff", - "value": { - "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_ROUNDOFF' || @.taxHeadCode == 'TL_ROUNDOFF' || @.taxHeadCode == 'FIRENOC_ROUNDOFF' || @.taxHeadCode == 'WS_Round_Off' || @.taxHeadCode == 'SW_Round_Off')].amount" - } - }, - { - "variable": "fees", - "value": { - "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'FIRENOC_FEES')].amount" - } - }, - { - "variable": "ownerExemption", - "value": { - "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_OWNER_EXEMPTION')].amount" - } - }, - { - "variable": "cancerCess", - "value": { - "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_CANCER_CESS')].amount" - } - }, - { - "variable": "waterCess", - "value": { - "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'WS_WATER_CESS' || @.taxHeadCode == 'SW_SEWERAGE_CESS')].amount" - } - }, - { - "variable": "timeInterest", - "value": { - "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_TIME_INTEREST' || @.taxHeadCode == 'WS_TIME_INTEREST' || @.taxHeadCode == 'SW_TIME_INTEREST')].amount" - } - }, - { - "variable": "ceilingDebit", - "value": { - "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_DECIMAL_CEILING_DEBIT')].amount" - } - }, - { - "variable": "ceilingCredit", - "value": { - "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_DECIMAL_CEILING_CREDIT')].amount" - } - }, - { - "variable": "carryForward", - "value": { - "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'WS_ADVANCE_CARRYFORWARD' || @.taxHeadCode == 'SW_ADVANCE_CARRYFORWARD')].amount" - } - }, - { - "variable": "consumerID", - "value": { - "path": "$.consumerCode" - } - }, - { - "variable": "date", - "value": { - "path": "$.billDate" - }, - "type": "date" - }, - { - "variable": "totalPayment", - "value": { - "path": "$.billDetails[0].amountPaid" - } - }, - { - "variable": "WS_arrears", - "value": { - "path": "$.arrearAmount" - } - }, - { - "variable": "WS_AdvanceAdjusted", - "value": { - "path": "$.AdvanceAdjustedValue" - } - }, - { - "variable": "scissorImage", - "url": "http://www.pngall.com/wp-content/uploads/2016/03/Scissor-PNG-Clipart.png", - "type": "image" - }, - { - "variable": "footerLogoImage", - "url": "https://uat.digit.org/pg-egov-assets/mseva-logo-colored.png", - "type": "image" - } - ] - }, - { - "derived": [ - { - "variable": "charge", - "formula": "{{ws_charge}}" - }, - { - "variable": "penalty", - "formula": "{{timePenalty}}+{{adhocPenalty}}" - }, - { - "variable": "rebate", - "formula": "{{timeRebate}}+{{adhocRebate}}" - }, - { - "variable": "billOthers", - "formula": "{{cancerCess}}+{{roundoff}}+{{timeInterest}}+{{ceilingDebit}}+{{ceilingCredit}}+{{firecess}}+{{waterCess}}" - }, - { - "variable": "demandTotalAmount", - "formula": "{{ws_roundoff}}+{{ws_charge}}+{{ws_water_cess}}+{{ws_time_interest}}+{{ws_time_penalty}}" - }, - { - "variable": "billTotalAmount", - "formula": "{{total}}" - }, - { - "variable": "arrears", - "formula": "{{billTotalAmount}}>{{demandTotalAmount}}?({{billTotalAmount}}-{{demandTotalAmount}}).toFixed(2):0" - }, - { - "variable": "advanceAdjusted", - "formula": "{{billTotalAmount}}>=0?({{billTotalAmount}}<{{demandTotalAmount}}?({{billTotalAmount}}-{{demandTotalAmount}}).toFixed(2):0):{{demandTotalAmount}} * -1" - }, - { - "variable": "advanceAvailable", - "formula": "{{billTotalAmount}}<0?{{billTotalAmount}}*-1:0" - }, - { - "variable": "others", - "formula": "({{ws_roundoff}}+{{ws_water_cess}}+{{ws_time_interest}}).toFixed(2)" - }, - { - "variable": "calculatedTotal", - "formula": "{{billTotalAmount}}>0?{{billTotalAmount}}:0" - } - ] - }, - { - "externalAPI": [ - { - "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", - "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", - "apiRequest": null, - "responseMapping": [ - { - "variable": "address", - "value": "$.MdmsRes.tenant.tenants[0].address" - }, - { - "variable": "phoneNumber", - "value": "$.MdmsRes.tenant.tenants[0].contactNumber" - }, { - "variable":"mcGrade", - "value":"$.MdmsRes.tenant.tenants[0].city.pwssbGrade" - }, - { - "variable": "website", - "value": "$.MdmsRes.tenant.tenants[0].domainUrl" - }, - { - "variable": "email", - "value": "$.MdmsRes.tenant.tenants[0].emailId" - }, - { - "variable": "logoImage", - "value": "$.MdmsRes.tenant.tenants[0].logoId", - "type": "image" - }, - { - "variable": "logo_header", - "value": "$.MdmsRes.tenant.tenants[0].code", - "localisation": { - "required": true, - "prefix": "TENANT_TENANTS", - "module": "rainmaker-common" - } - } - ] - }, - { - "path": "http://billing-service:8080/billing-service/demand/_search", - "queryParam": "tenantId=$.tenantId,consumerCode=$.consumerCode,businessService=SW", - "apiRequest": null, - "responseMapping": [ - { - "variable": "ws_advanceAmount", - "value": "$.Demands[(@.length-1)].demandDetails[?(@.taxHeadMasterCode == 'WS_ADVANCE_CARRYFORWARD')].taxAmount" - }, - { - "variable": "ws_roundoff", - "value": "$.Demands[(@.length-1)].demandDetails[?(@.taxHeadMasterCode == 'WS_Round_Off')].taxAmount" - }, - { - "variable": "ws_charge", - "value": "$.Demands[(@.length-1)].demandDetails[?(@.taxHeadMasterCode == 'WS_CHARGE')].taxAmount" - }, - { - "variable": "ws_water_cess", - "value": "$.Demands[(@.length-1)].demandDetails[?(@.taxHeadMasterCode == 'WS_WATER_CESS')].taxAmount" - }, - { - "variable": "ws_time_interest", - "value": "$.Demands[(@.length-1)].demandDetails[?(@.taxHeadMasterCode == 'WS_TIME_INTEREST')].taxAmount" - }, - { - "variable": "ws_time_penalty", - "value": "$.Demands[(@.length-1)].demandDetails[?(@.taxHeadMasterCode == 'WS_TIME_PENALTY')].taxAmount" - } - ] - }, - { - "path": "http://property-services.egov:8080/property-services/property/_search", - "queryParam": "tenantId=$.tenantId,propertyIds=$.connection.propertyId", - "apiRequest": null, - "responseMapping": [ - { - "variable": "usageType", - "value": "$.Properties[0].usageCategory" - }, - { - "variable": "plotSize", - "value": "$.Properties[0].landArea" - }, - { - "variable": "houseNo", - "value": "$.Properties[0].address.doorNo" - }, - { - "variable": "streetName", - "value": "$.Properties[0].address.street" - }, - { - "variable": "locality", - "value": "$.Properties[0].address.locality.name" - }, - { - "variable": "landmark", - "value": "$.Properties[0].address.landmark" - }, - { - "variable": "ownerName", - "value": "$.Properties[0].owners[0].name" - }, - { - "variable": "guardianName", - "value": "$.Properties[0].owners[0].fatherOrHusbandName" - } - - ] - } - ] - } - ] - } - ] - } -} diff --git a/configs/pdf-service/data-config/testconsolidatedreceipt.json b/configs/pdf-service/data-config/testconsolidatedreceipt.json deleted file mode 100644 index d19bf671..00000000 --- a/configs/pdf-service/data-config/testconsolidatedreceipt.json +++ /dev/null @@ -1,481 +0,0 @@ -{ - "key": "testconsolidatedreceipt", - "documentType":"CONSOLIDATED_RECEIPT", - "DataConfigs": { - "moduleName": "rainmaker-common", - "version": "1.0.0", - "baseKeyPath": "$.Payments.*", - "entityIdPath":"$.id", - "isCommonTableBorderRequired": true, - "mappings": [ - { - "topic": "common-pdf-generation-3", - "mappings": [ - { - "direct": [ - { - "variable": "payerName", - "value": { - "path": "$.payerName" - } - }, - { - "variable": "user-name", - "value": { - "path": "$.userInfo.name" - }, - "type":"selectFromRequestInfo" - }, - { - "variable": "payerContact", - "value": { - "path": "$.mobileNumber" - } - }, - { - "variable": "receiptNo", - "value": { - "path": "$.paymentDetails[0].receiptNumber" - } - }, - { - "variable": "serviceType", - "value": { - "path": "$.paymentDetails[0].businessService" - }, - "localisation":{ - "required":true, - "prefix":"MODULE", - "module":"rainmaker-common" - } - }, - { - "variable": "paidAmount", - "value": { - "path": "$.paymentDetails[0].totalAmountPaid" - } - }, - { - "variable": "fromPeriod", - "value": { - "path": "$.paymentDetails[0].bill.billDetails[0].fromPeriod" - }, - "type": "date" - }, - { - "variable": "toPeriod", - "value": { - "path": "$.paymentDetails[0].bill.billDetails[0].toPeriod" - }, - "type": "date" - }, - { - "variable": "paymentMode", - "value": { - "path": "$.paymentMode" - }, - "localisation":{ - "required":true, - "prefix": "COMMON_MASTERS_PAYMENTMODE", - "module": "rainmaker-common" - } - }, - { - "variable": "G8ReceiptNo", - "value": { - "path": "$.paymentDetails[0].manualReceiptNumber" - } - }, - { - "variable": "G8ReceiptDate", - "value": { - "path": "$.paymentDetails[0].manualReceiptDate" - }, - "type": "date" - }, - { - "variable": "paymentDate", - "value": { - "path": "$.transactionDate" - }, - "type": "date" - }, - { - "variable": "consumerID", - "value": { - "path": "$.paymentDetails[0].bill.consumerCode" - } - }, - { - "variable": "transactionID", - "value": { - "path": "$.transactionNumber" - } - }, - { - "variable": "dueAmount", - "value": { - "path": "$.paymentDetails[0].totalDue" - } - }, - { - "variable": "payment_receipt", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_RECEIPT" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "receipt_no", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_RECEIPT_NO" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "consumer_id", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_CONSUMER_ID" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "payment_date", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_DATE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "payer_name", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYER_NAME" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "payer_contact", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYER_CONTACT" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "service_type", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_SERVICE_TYPE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "billing_period", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_BILLING_PERIOD" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "paid_amount", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAID_AMOUNT" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "pending_amount", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PENDING_AMOUNT" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "payment_mode", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_MODE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "transaction_id", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_TRANSACTION_ID" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "g8_receipt_no", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_G8_RECEIPT_NO" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "g8_receipt_date", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_G8_RECEIPT_DATE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "generated_by", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_GENERATED_BY" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "commissioner/eo", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_COMMISSIONER_EO" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "no_signature", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_NO_SIGNATURE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "disclamer", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "disclamer_1", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_FIRST_LINE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "disclamer_2", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_SECOND_LINE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "disclamer_3", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_THIRD_LINE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "disclamer_4", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_FOURTH_LINE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "disclamer_5", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_FIFTH_LINE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "to", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_TO" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "Municipal_Corporation", - "value": { - "path": "PDF_STATIC_LABEL_MDMS_MUNICIPAL_CORPORATION" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "footerLogoImage", - "url": "https://pb-egov-assets.s3.ap-south-1.amazonaws.com/mseva-logo-colored.png", - "type": "image" - } - ] - }, - { - "derived": [ - { - "variable": "pendingAmount", - "formula": "{{dueAmount}}-{{paidAmount}}" - } - ] - }, - { - "externalAPI": [ - { - "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", - "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", - "apiRequest": null, - "responseMapping":[ - { - "variable":"address", - "value":"$.MdmsRes.tenant.tenants[0].address" - }, - { - "variable":"phoneNumber", - "value":"$.MdmsRes.tenant.tenants[0].contactNumber" - }, - { - "variable":"website", - "value":"$.MdmsRes.tenant.tenants[0].domainUrl" - }, - { - "variable":"email", - "value":"$.MdmsRes.tenant.tenants[0].emailId" - }, - { - "variable": "logoImage", - "value":"$.MdmsRes.tenant.tenants[0].logoId", - "type":"image" - }, - { - "variable": "logo-header", - "value":"$.MdmsRes.tenant.tenants[0].code", - "localisation":{ - "required":true, - "prefix": "TENANT_TENANTS", - "module":"rainmaker-common" - } - } - ] - } - ] - } - ] - } - ] - } -} diff --git a/configs/pdf-service/data-config/testlocalconsolidatedbill.json b/configs/pdf-service/data-config/testlocalconsolidatedbill.json deleted file mode 100644 index 4e21050a..00000000 --- a/configs/pdf-service/data-config/testlocalconsolidatedbill.json +++ /dev/null @@ -1,540 +0,0 @@ -{ - "key": "testlocalconsolidatedbill", - "DataConfigs": { - "serviceName": "rainmaker-common", - "version": "1.0.0", - "baseKeyPath": "$.Bill.*", - "entityIdPath":"$.billNumber", - "isCommonTableBorderRequired": true, - "mappings": [ - { - "topic": "common-pdf-generation-1", - "staticConfigPath": "https://raw.githubusercontent.com/egovernments/egov-services/vishal-feature-filestore/core/egov-indexer/src/main/resources/rainmaker-pgr-indexer.yml", - "mappings": [ - { - "direct": [ - { - "variable": "logoImage", - "url": "https://raw.githubusercontent.com/egovernments/egov-web-app/master/web/rainmaker/dev-packages/egov-ui-kit-dev/src/assets/images/pblogo.png", - "type": "image" - }, - { - "variable": "logo_header", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_LOGO_HEADER" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "total_amount_due", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_TOTAL_AMOUNT_DUE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "payer_name", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PAYER_NAME" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "bill_no", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_BILL_NO" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "mobile_no", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_MOBILE_NO" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "bill_period", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_BILL_PERIOD" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "payer_address", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PAYER_ADDRESS" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - - { - "variable": "bill_issue_date", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ISSUE_DATE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "bill_due_date", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_BILL_DUE_DATE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "billing_summary_property_tax", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_BILLING_SUMMARY" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "property_id", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PROPERTY_ID" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "arrears_label", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ARREARS" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "charge_label", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_CHARGE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - - { - "variable": "penalty_label", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PENALTY" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "rebate_label", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_REBATE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "others_label", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_OTHERS" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "total_label", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_TOTAL" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "important_message", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_IMPORTANT_MESSAGE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "payment_received", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PAYMENT_RECEIVED" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "this_document", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_THIS_DOCUMENT" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "this_is_a", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_THIS_IS" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "assessment_payment", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ASSESSSMENT_PAYMENT" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "please_deposit", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PLEASE_DEPOSIT" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "if_the_tax", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_IF_THE_TAX" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "acknowledgement_for", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ACKNOWLEDGEMENT" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "date_label", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_DATE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "consumer_id", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_CONSUMER_ID" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "name_address", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_NAME_ADDRESS" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "total_payment", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_TOTAL_PAYMENT" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "receivers_signature", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_RECEIVERS_SIGNATURE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "totalAmountDue", - "value": { - "path": "$.totalAmount" - } - }, - { - "variable": "total", - "value": { - "path": "$.totalAmount" - } - }, - - { - "variable": "payerName", - "value": { - "path": "$.payerName" - } - }, - - { - "variable": "mobileNo", - "value": { - "path": "$.mobileNumber" - } - }, - - { - "variable": "payerAddress", - "value": { - "path": "$.payerAddress" - } - }, - { - "variable": "nameAddress", - "value": { - "path": "$.payerAddress" - } - }, - - { - "variable": "billNo", - "value": { - "path": "$.billNumber" - } - }, - { - "variable": "fromPeriod", - "value": { - "path": "$.billDetails[0].fromPeriod" - } - }, - { - "variable": "toPeriod", - "value": { - "path": "$.billDetails[0].toPeriod" - } - }, - - { - "variable": "billIssueDate", - "value": { - "path": "$.billDate" - } - }, - - { - "variable": "billDueDate", - "value": { - "path": "$.billDetails[0].expiryDate" - } - }, - - { - "variable": "propertyID", - "value": { - "path": "$.consumerCode" - } - }, - - { - "variable": "arrears", - "value": { - "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_TIME_PENALTY')].amount" - } - }, - - { - "variable": "charge", - "value": { - "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_TIME_REBATE')].amount" - } - }, - - { - "variable": "rebate", - "value": { - "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_TIME_REBATE')].amount" - } - }, - - { - "variable": "penalty", - "value": { - "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_TIME_REBATE')].amount" - } - }, - - { - "variable": "others", - "value": { - "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_TAX')].amount" - } - }, - - { - "variable": "consumerID", - "value": { - "path": "$.consumerCode" - } - }, - { - "variable": "date", - "value": { - "path": "$.billDate" - } - }, - { - "variable": "totalPayment", - "value": { - "path": "$.billDetails[0].amountPaid" - } - }, - { - "variable":"scissorImage", - "url":"https://raw.githubusercontent.com/egovernments/egov-web-app/master/web/rainmaker/dev-packages/egov-ui-kit-dev/src/assets/images/pblogo.png", - "type":"image" - }, - { - "variable": "footerLogoImage", - "url": "https://pb-egov-assets.s3.ap-south-1.amazonaws.com/mseva-logo-colored.png", - "type": "image" - } - ] - }, - { - "derived": [ - { - "variable": "variable19", - "formula": "{{totalPayment}}-{{totalPayment}}" - } - ] - } - ] - } - ] - } - } \ No newline at end of file diff --git a/configs/pdf-service/data-config/testlocalconsolidatedreceipt.json b/configs/pdf-service/data-config/testlocalconsolidatedreceipt.json deleted file mode 100644 index 26915191..00000000 --- a/configs/pdf-service/data-config/testlocalconsolidatedreceipt.json +++ /dev/null @@ -1,462 +0,0 @@ -{ - "key": "consolidatedreceipt", - "DataConfigs": { - "serviceName": "rainmaker-common", - "version": "1.0.0", - "baseKeyPath": "$.Payments.*", - "entityIdPath":"$.paymentDetails[0].receiptNumber", - "isCommonTableBorderRequired": true, - "mappings": [ - { - "topic": "common-pdf-generation-3", - "mappings": [ - { - "direct": [ - { - "variable": "payerName", - "value": { - "path": "$.payerName" - } - }, - { - "variable": "user-name", - "value": { - "path": "$.userInfo.name" - }, - "type":"selectFromRequestInfo" - }, - { - "variable": "payerContact", - "value": { - "path": "$.mobileNumber" - } - }, - { - "variable": "receiptNo", - "value": { - "path": "$.paymentDetails[0].receiptNumber" - } - }, - { - "variable": "serviceType", - "value": { - "path": "$.paymentDetails[0].businessService" - }, - "localisation":{ - "required":true, - "prefix":"MODULE", - "module":"rainmaker-common" - } - }, - { - "variable": "paidAmount", - "value": { - "path": "$.paymentDetails[0].totalAmountPaid" - } - }, - { - "variable": "fromPeriod", - "value": { - "path": "$.paymentDetails[0].bill.billDetails[0].fromPeriod" - } - }, - { - "variable": "toPeriod", - "value": { - "path": "$.paymentDetails[0].bill.billDetails[0].toPeriod" - } - }, - { - "variable": "paymentMode", - "value": { - "path": "$.paymentMode" - } - }, - { - "variable": "G8ReceiptNo", - "value": { - "path": "$.paymentDetails[0].bill.billDetails[0].manualReceiptNumber" - } - }, - { - "variable": "G8ReceiptDate", - "value": { - "path": "$.paymentDetails[0].bill.billDetails[0].manualReceiptDate" - } - }, - { - "variable": "paymentDate", - "value": { - "path": "$.transactionDate" - } - }, - { - "variable": "consumerID", - "value": { - "path": "$.paymentDetails[0].bill.consumerCode" - } - }, - { - "variable": "transactionID", - "value": { - "path": "$.transactionNumber" - } - }, - { - "variable": "dueAmount", - "value": { - "path": "$.paymentDetails[0].totalDue" - } - }, - { - "variable": "logoImage", - "url":"https://raw.githubusercontent.com/egovernments/egov-web-app/master/web/rainmaker/dev-packages/egov-ui-kit-dev/src/assets/images/pblogo.png", - "type":"image" - }, - { - "variable": "logo-header", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT.LOGO.HEADER" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": "", - "module":"rainmaker-common" - } - }, - { - "variable": "payment_receipt", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_RECEIPT" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "receipt_no", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_RECEIPT_NO" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "consumer_id", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_CONSUMER_ID" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "payment_date", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_DATE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "payer_name", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYER_NAME" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "payer_contact", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYER_CONTACT" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "service_type", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_SERVICE_TYPE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "billing_period", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_BILLING_PERIOD" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "paid_amount", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAID_AMOUNT" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "pending_amount", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PENDING_AMOUNT" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "payment_mode", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_MODE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "transaction_id", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_TRANSACTION_ID" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "g8_receipt_no", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_G8_RECEIPT_NO" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "g8_receipt_date", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_G8_RECEIPT_DATE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "generated_by", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_GENERATED_BY" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "commissioner/eo", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_COMMISSIONER_EO" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "no_signature", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_NO_SIGNATURE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "disclamer", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "disclamer_1", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_FIRST_LINE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "disclamer_2", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_SECOND_LINE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "disclamer_3", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_THIRD_LINE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "disclamer_4", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_FOURTH_LINE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "disclamer_5", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_FIFTH_LINE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "to", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_TO" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "footerLogoImage", - "url": "https://pb-egov-assets.s3.ap-south-1.amazonaws.com/mseva-logo-colored.png", - "type": "image" - } - ] - }, - { - "derived": [ - { - "variable": "pendingAmount", - "formula": "{{dueAmount}}-{{paidAmount}}" - } - ] - }, - { - "externalAPI": [ - { - "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", - "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='$.tenantId')%5D", - "apiRequest": null, - "responseMapping":[ - { - "variable":"address", - "value":"$.MdmsRes.tenant.tenants[0].address" - }, - { - "variable":"phoneNumber", - "value":"$.MdmsRes.tenant.tenants[0].contactNumber" - }, - { - "variable":"website", - "value":"$.MdmsRes.tenant.tenants[0].domainUrl" - }, - { - "variable":"email", - "value":"$.MdmsRes.tenant.tenants[0].emailId" - } - ] - } - ] - } - ] - } - ] - } -} \ No newline at end of file diff --git a/configs/pdf-service/data-config/tl-receipt.json b/configs/pdf-service/data-config/tl-receipt.json deleted file mode 100644 index c9c6177d..00000000 --- a/configs/pdf-service/data-config/tl-receipt.json +++ /dev/null @@ -1,241 +0,0 @@ -{ - "key":"tl-receipt", - "DataConfigs": { - "serviceName": "rainmaker-tl", - "version": "1.0.0", - "baseKeyPath": "$.Licenses.*", - "entityIdPath":"$.applicationNumber", - "isCommonTableBorderRequired":true, - "mappings": [ - { - "topic": "tl-pdf-generation", - "staticConfigPath": "https://raw.githubusercontent.com/egovernments/egov-services/vishal-feature-filestore/core/egov-indexer/src/main/resources/rainmaker-pgr-indexer.yml", - "mappings": [ - { - "direct": [ - - { - "variable": "variable1", - "value": { - "path":"$.tradeLicenseDetail.additionalDetail.applicationType" - }, - "localisation":{ - "required":true, - "prefix":"TRADELICENSE_APPLICATIONTYPE", - "module":"rainmaker-tl" - } - }, - { - "variable": "variable33", - "url":"https://s3.ap-south-1.amazonaws.com/pb-egov-assets/pb.amritsar/logo.png", - "type":"image" - }, - { - "variable": "variable30", - "value": { - "path":"$.tenantId" - }, - "localisation":{ - "required":true, - "prefix":"TENANT_TENANTS", - "module":"rainmaker-common" - }, - "isUpperCaseRequired":true - }, - { - "variable": "variable31", - "type":"citizen-employee-title" - }, - { - "variable": "variable2", - "value": { - "path":"$.oldLicenseNumber" - } - }, - { - "variable": "variable3", - "value":{ - "path":"$.applicationNumber" - } - }, - { - "variable": "variable4", - "value": { - "path":"$.financialYear" - } - }, - { - "variable": "variable5", - "value": { - "path":"$.tradeName" - } - }, - { - "variable": "variable6", - "value": { - "path":"$.tradeLicenseDetail.tradeUnits[*].tradeType" - }, - "localisation":{ - "required":true, - "prefix":"TRADELICENSE_TRADETYPE", - "module":"rainmaker-tl", - "isCategoryRequired":true - } - }, - { - "variable": "variable7", - "value": { - "path":"$.tradeLicenseDetail.tradeUnits[*].tradeType" - }, - "localisation":{ - "required":true, - "prefix":"TRADELICENSE_TRADETYPE", - "module":"rainmaker-tl", - "isMainTypeRequired":true, - "isSubTypeRequired":true - } - }, - { - "variable": "variable8", - "value": { - "path":"$.tradeLicenseDetail.accessories[*].accessoryCategory" - }, - "localisation":{ - "required":true, - "prefix":"TRADELICENSE_ACCESSORIESCATEGORY", - "module":"rainmaker-tl" - } - }, - { - "variable": "variable9", - "value": { - "path":"$.tradeLicenseDetail.address.doorNo" - } - }, - { - "variable": "variable10", - "value": { - "path":"$.tradeLicenseDetail.address.buildingName" - } - }, - { - "variable": "variable11", - "value": { - "path":"$.tradeLicenseDetail.address.street" - } - }, - { - "variable": "variable12", - "value": { - "path":"$.tradeLicenseDetail.address.locality.name" - } - }, - { - "variable": "variable13", - "value":{ - "path":"$.tradeLicenseDetail.owners.*" - }, - "type":"array", - "format":{ - "type":"string", - "scema":[ - { - "key":"name" - }, - { - "key":"mobileNumber" - }] - } - } , - { - "variable": "footerLogoImage", - "url": "https://pb-egov-assets.s3.ap-south-1.amazonaws.com/mseva-logo-colored.png", - "type": "image" - } - ] - }, - { - "derived": [ - { - "variable": "variable32", - "formula": "{{variable19}}-{{variable20}}" - } - ] - }, - { - "externalAPI": [ - - { - - "path": "http://localhost:8091/collection-services/receipts/_search", - "queryParam": "consumerCode=$.applicationNumber", - - - "apiRequest": null, - - "responseMapping":[ - { - "variable":"variable16", - "value":"$.Receipt[0].receiptNumber" - }, - { - "variable":"variable17", - "value":"$.Receipt[0].instrument.transactionDateInput" - }, - { - "variable":"variable18", - "value":"$.Receipt[0].Bill[0].billDetails[0].billAccountDetails[?(@.taxHeadCode=='TL_TAX')].amount" - }, - { - "variable":"variable19", - "value":"$.Receipt[0].Bill[0].billDetails[0].totalAmount" - }, - { - "variable":"variable20", - "value":"$.Receipt[0].Bill[0].billDetails[0].amountPaid" - }, - { - "variable":"variable21", - "value":"$.Receipt[0].instrument.instrumentType.name" - }, - { - "variable":"variable22", - "value":"$.Receipt[0].transactionId" - }, - { - "variable":"variable23", - "value":"$.Receipt[0].instrument.bank.name" - }, - { - "variable":"variable24", - "value":"$.Receipt[0].Bill[0].billDetails[0].manualReceiptNumber" - }, - { - "variable":"variable25", - "value":"$.Receipt[0].Bill[0].billDetails[0].manualReceiptDate" - }, - { - "variable":"variable26", - "value":"$.Receipt[0].Bill[0].billDetails[0].billAccountDetails[?(@.taxHeadCode=='TL_TIME_PENALTY')].amount" - }, - { - "variable":"variable27", - "value":"$.Receipt[0].Bill[0].billDetails[0].billAccountDetails[?(@.taxHeadCode=='TL_TIME_REBATE')].amount" - }, - { - "variable":"variable28", - "value":"$.Receipt[0].Bill[0].billDetails[0].billAccountDetails[?(@.taxHeadCode=='TL_ADHOC_PENALTY')].amount" - }, - { - "variable":"variable29", - "value":"$.Receipt[0].Bill[0].billDetails[0].billAccountDetails[?(@.taxHeadCode=='TL_ADHOC_REBATE')].amount" - } - ] - } - ] - } - ] - } - ] - } - } diff --git a/configs/pdf-service/data-config/tlapplication.json b/configs/pdf-service/data-config/tlapplication.json deleted file mode 100644 index 801ff4b7..00000000 --- a/configs/pdf-service/data-config/tlapplication.json +++ /dev/null @@ -1,1075 +0,0 @@ -{ - "key": "tlapplication", - "DataConfigs": { - "serviceName": "rainmaker-common", - "version": "1.0.0", - "baseKeyPath": "$.Licenses.*", - "entityIdPath":"$.applicationNumber", - "isCommonTableBorderRequired": true, - "mappings": [ - { - "mappings": [ - { - "direct": [ - { - "variable": "applicationNumber", - "value": { - "path": "$.applicationNumber" - } - }, - { - "variable": "applicationType", - "value": { - "path": "$.applicationType" - }, - "localisation":{ - "required":true, - "prefix": "TRADELICENSE_APPLICATIONTYPE", - "module": "rainmaker-tl" - } - }, - { - "variable": "oldLicenseNumber", - "value": { - "path": "$.oldLicenseNumber" - } - }, - { - "variable": "licenseType", - "value": { - "path": "$.licenseType" - }, - "localisation":{ - "required":true, - "prefix": "TRADELICENSE_LICENSETYPE", - "module": "rainmaker-tl" - } - }, - { - "variable": "tradeName", - "value": { - "path": "$.tradeName" - } - }, - { - "variable": "structureType", - "value": { - "path": "$.tradeLicenseDetail.structureType" - }, - "localisation":{ - "required":true, - "prefix": "COMMON_MASTERS_STRUCTURETYPE", - "module": "rainmaker-tl", - "isCategoryRequired":true - } - }, - { - "variable": "structureSubType", - "value": { - "path": "$.tradeLicenseDetail.structureType" - }, - "localisation":{ - "required":true, - "prefix": "COMMON_MASTERS_STRUCTURETYPE", - "module": "rainmaker-tl", - "isSubTypeRequired":true - } - }, - { - "variable": "commencementDate", - "value": { - "path": "$.commencementDate" - }, - "type": "date" - }, - { - "variable": "tradeGstNo", - "value": { - "path": "$.tradeLicenseDetail.additionalDetail.gstNo" - } - }, - { - "variable": "operationalArea", - "value": { - "path": "$.tradeLicenseDetail.operationalArea" - } - }, - { - "variable": "noOfEmployees", - "value": { - "path": "$.tradeLicenseDetail.noOfEmployees" - } - }, - { - "variable": "tradeCategory", - "value": { - "path": "$.tradeLicenseDetail.tradeUnits[0].tradeType" - }, - "localisation":{ - "required":true, - "prefix": "TRADELICENSE_TRADETYPE", - "module": "rainmaker-tl", - "isCategoryRequired":true - } - }, - { - "variable": "tradeType1", - "value": { - "path": "$.tradeLicenseDetail.tradeUnits[0].tradeType" - }, - "localisation":{ - "required":true, - "prefix": "TRADELICENSE_TRADETYPE", - "module": "rainmaker-tl", - "isMainTypeRequired":true - } - }, - { - "variable": "tradeSubType", - "value": { - "path": "$.tradeLicenseDetail.tradeUnits[0].tradeType" - }, - "localisation":{ - "required":true, - "prefix": "TRADELICENSE_TRADETYPE", - "module": "rainmaker-tl", - "isSubTypeRequired":true - } - }, - { - "variable": "uomMeasurement", - "value": { - "path": "$.tradeLicenseDetail.tradeUnits[0].uom" - } - }, - { - "variable": "uomValue1", - "value": { - "path": "$.tradeLicenseDetail.tradeUnits[0].uomValue" - } - }, - { - "variable": "propertyAssessmentId", - "value": { - "path": "$.propertyId" - } - }, - { - "variable": "city", - "value": { - "path": "$..tradeLicenseDetail.address.city" - }, - "localisation":{ - "required":true, - "prefix": "TENANT_TENANTS", - "module": "rainmaker-common" - } - - }, - { - "variable": "doorHouseNo", - "value": { - "path": "$.tradeLicenseDetail.address.doorNo" - } - }, - { - "variable": "buildingColonyName", - "value": { - "path": "$.tradeLicenseDetail.address.buildingName" - } - }, - { - "variable": "streetName", - "value": { - "path": "$.tradeLicenseDetail.address.street" - } - }, - { - "variable": "pincode", - "value": { - "path": "$.tradeLicenseDetail.address.pincode" - } - }, - { - "variable": "ownershipProof", - "value": { - "path": "$.additionalDetails.documents[?(@.title == 'TL_OWNERSHIPPROOF')].name" - } - }, - { - "variable": "ownersIdProof", - "value": { - "path": "$.additionalDetails.documents[?(@.title == 'TL_OWNERIDPROOF')].name" - } - }, - { - "variable": "ownerPhoto", - "value": { - "path": "$.additionalDetails.documents[?(@.title == 'TL_OWNERPHOTO')].name" - } - }, - { - "variable": "electricityConnectionNo", - "value": { - "path": "$.tradeLicenseDetail.additionalDetail.electricityConnectionNo" - } - }, - { - "variable": "typeOfOwnership", - "value": { - "path": "$.tradeLicenseDetail.subOwnerShipCategory" - }, - "localisation":{ - "required":true, - "prefix": "COMMON_MASTERS_OWNERSHIPCATEGORY", - "module": "rainmaker-tl", - "isCategoryRequired":true - } - - }, - { - "variable": "typeOfSubOwnership", - "value": { - "path": "$.tradeLicenseDetail.subOwnerShipCategory" - }, - "localisation":{ - "required":true, - "prefix": "COMMON_MASTERS_OWNERSHIPCATEGORY", - "module": "rainmaker-tl", - "isSubTypeRequired":true - } - }, - { - "variable": "mobileNo", - "value": { - "path": "$..tradeLicenseDetail.owners[0].mobileNumber" - } - }, - { - "variable": "altContactNumber", - "value": { - "path": "$.tradeLicenseDetail.owners[0].altContactNumber" - } - }, - { - "variable": "name", - "value": { - "path": "$.tradeLicenseDetail.owners[0].name" - } - }, - { - "variable": "fatherHusbandName", - "value": { - "path": "$.tradeLicenseDetail.owners[0].fatherOrHusbandName" - } - }, - { - "variable": "relationship", - "value": { - "path": "$.tradeLicenseDetail.owners[0].relationship" - }, - "localisation":{ - "required":true, - "prefix": "COMMON_RELATION", - "module": "rainmaker-tl" - } - }, - { - "variable": "gender", - "value": { - "path": "$.tradeLicenseDetail.owners[0].gender" - }, - "localisation":{ - "required":true, - "prefix": "COMMON_GENDER", - "module": "rainmaker-common" - } - }, - { - "variable": "dateOfBirth", - "value": { - "path": "$.tradeLicenseDetail.owners[0].dob" - }, - "type": "date" - }, - { - "variable": "email", - "value": { - "path": "$.tradeLicenseDetail.owners[0].emailId" - } - }, - { - "variable": "panNo", - "value": { - "path": "$.tradeLicenseDetail.owners[0].pan" - } - }, - { - "variable": "correspondenceAddress", - "value": { - "path": "$.tradeLicenseDetail.owners[0].permanentAddress" - } - }, - { - "variable": "specialOwnerCategory", - "value": { - "path": "$.tradeLicenseDetail.owners[0].ownerType" - }, - "localisation":{ - "required":true, - "prefix": "COMMON_MASTERS_OWNERTYPE", - "module":"rainmaker-common" - } - - }, - { - "variable": "trade_license_application", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_LOGO_HEADER" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "application_no", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_APPLICATION_NO" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "total_amount", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_TOTAL_AMOUNT" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "Rs", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_RUPEE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "trade_license_tax", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_TRADE_LICENSE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "rebate_label", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_REBATE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "penalty_label", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_PENALTY" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "trade_details", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_TRADE_DETAILS" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "application_type", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_APPLICATION_TYPE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "old_application_number", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_OLD_APPLICATION_NUMBER" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "licence_type", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_LICENSE_TYPE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "trade_name", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_TRADE_NAME" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "structure_type", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_STRUCTURE_TYPE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "structure_sub_type", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_STRUCTURE_SUB_TYPE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "trade_commencement", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_TRADE_COMMENCEMENT" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "trade_gst_no", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_TRADE_GST" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "operational_area", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_OPERATIONAL_AREA" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "no_of_employees", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_NO_OF_EMPLOYEES" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "trade_category", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_TRADE_CATEGORY" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "trade_type", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_TRADE_TYPE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "trade_sub_type", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_TRADE_SUB_TYPE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "uom_measurement", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_UOM_MEASUREMENT" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "accesory_type", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_ACCESORY_TYPE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "uom_label", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_UOM" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "uom_value", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_UOM_VALUE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "accessory_count", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_ACCESORY_COUNT" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "property_assessment_id", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_PROPERTY_ASSESSMENT_ID" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "city_label", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_CITY" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "door_house_no", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_DOOR_HOUSE_NO" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "building_colony_name", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_BUILDING_COLONY_NAME" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "street_name", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_STREET_NAME" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "mohalla_label", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_MOHALLA" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "pincode_label", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_PINCODE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "electricity_connection_no", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_ELECTRICITY_CONNECTION_NO" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "owner_details", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_OWNER_DETAILS" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "type_of_ownership", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_TYPE_OF_OWNERSHIP" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "type_of_sub_ownership", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_SUB_OWNERSHIP" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "mobile_no", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_MOBILE_NO" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "name_label", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_NAME" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "father_husband", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_FATHER_HUSBAND" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "relationship_label", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_RELATIONSHIP" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "gender_label", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_GENDER" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "date_of_birth", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_DATE_OF_BIRTH" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "email_label", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_EMAIL" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "pan_no", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_PAN_NO" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "correspondance_address", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_CORRESPONDANCE_ADDRESS" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "special_owner", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_SPECIAL_OWNER" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "documents_label", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_DOCUMENTS" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "ownership_proof", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_OWNERSHIP_PROOF" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "owners_id_proof", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_OWNERS_ID" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "owner_photo", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_OWNERSHIP_PHOTO" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "variable13", - "value":{ - "path":"$.tradeLicenseDetail.tradeUnits.*" - }, - "type":"array", - "format":{ - "type":"string", - "scema":[ - { - "variable": "tradeCat", - "value":"tradeType", - "localisation":{ - "required":true, - "prefix": "TRADELICENSE_TRADETYPE", - "module": "rainmaker-tl", - "isCategoryRequired":true - } - }, - { - "variable": "tradetyp", - "value":"tradeType", - "localisation":{ - "required":true, - "prefix": "TRADELICENSE_TRADETYPE", - "module": "rainmaker-tl", - "isMainTypeRequired":true - } - }, - { - "variable": "tradesub", - "value":"tradeType", - "localisation":{ - "required":true, - "prefix": "TRADELICENSE_TRADETYPE", - "module": "rainmaker-tl", - "isSubTypeRequired":true - } - }, - { - "variable": "UOM-measurement", - "value":"uom" - }, - { - "variable":"uomValue", - "value":"uomValue" - } - ] - } - }, - { - "variable": "variable14", - "value":{ - "path":"$.tradeLicenseDetail.accessories.*" - }, - "type":"array", - "format":{ - "type":"string", - "scema":[ - { - "variable": "accesoryType", - "value": "accessoryCategory", - "localisation":{ - "required":true, - "prefix": "TRADELICENSE_ACCESSORIESCATEGORY", - "module": "rainmaker-tl" - } - }, - { - "variable": "accessoryUomValue", - "value": "uomValue" - }, - - { - "variable": "uom", - "value": "uom" - }, - { - "variable": "accessoryCount", - "value": "count" - } - - ] - } - }, - { - "variable": "footerLogoImage", - "url": "https://pb-egov-assets.s3.ap-south-1.amazonaws.com/mseva-logo-colored.png", - "type": "image" - } - ] - }, - { - "externalAPI": [ - { - "path": "http://egov-location:8080/egov-location/location/v11/boundarys/_search", - "queryParam": "tenantId=$.tenantId,hierarchyTypeCode=REVENUE,boundaryType=Locality,codes=$.tradeLicenseDetail.address.locality.code", - "apiRequest": null, - "responseMapping":[ - { - "variable":"mohalla", - "value":"$.TenantBoundary[0].boundary[0].name" - } - ] - }, - { - "path": "http://billing-service:8080/billing-service/bill/v2/_search", - "queryParam": "tenantId=$.tenantId,consumerCode=$.applicationNumber,businessService=TL", - "apiRequest": null, - "responseMapping":[ - { - "variable":"totalAmount", - "value":"$.Bill[0].totalAmount" - }, - { - "variable":"tradeLicenseTax", - "value":"$.Bill[0].billDetails[0].billAccountDetails[?(@.taxHeadCode == 'TL_TAX')].amount" - }, - { - "variable":"billStatus", - "value":"$.Bill[0].status" - }, - { - "variable":"rebate", - "value":"$.Bill[0].billDetails[0].billAccountDetails[?(@.taxHeadCode == 'TL_ADHOC_REBATE')].amount" - }, - { - "variable":"penalty", - "value":"$.Bill[0].billDetails[0].billAccountDetails[?(@.taxHeadCode == 'TL_ADHOC_PENALTY')].amount" - } - ] - } - ] - } - ] - } - ] - } -} diff --git a/configs/pdf-service/data-config/tlcertificate.json b/configs/pdf-service/data-config/tlcertificate.json deleted file mode 100644 index 5c5bb80b..00000000 --- a/configs/pdf-service/data-config/tlcertificate.json +++ /dev/null @@ -1,736 +0,0 @@ -{ - "key": "tlcertificate", - "DataConfigs": { - "serviceName": "rainmaker-common", - "version": "1.0.0", - "baseKeyPath": "$.Licenses.*", - "entityIdPath":"$.id", - "isCommonTableBorderRequired": true, - "mappings": [ - { - "mappings": [ - { - "direct": [ - { - "variable": "logoImage", - "url":"https://raw.githubusercontent.com/egovernments/egov-web-app/master/web/rainmaker/dev-packages/egov-ui-kit-dev/src/assets/images/pblogo.png", - "type":"image" - }, - { - "variable": "tradeLicenseNo", - "value": { - "path": "$.licenseNumber" - } - }, - { - "variable": "applicationNo", - "value": { - "path": "$.applicationNumber" - } - }, - { - "variable": "financialYear", - "value": { - "path": "$.financialYear" - } - }, - { - "variable": "tradeName", - "value": { - "path": "$.tradeName" - } - }, - { - "variable": "tradeOwnerName", - "value": { - "path": "$.tradeLicenseDetail.owners[0].name" - } - }, - { - "variable": "tradeOwnerContact", - "value": { - "path": "$.tradeLicenseDetail.owners[0].mobileNumber" - } - }, - { - "variable": "tradeAddress", - "value": { - "path": "$.tradeLicenseDetail.address.locality.code" - } - }, - { - "variable": "doorNo", - "value": { - "path": "$.tradeLicenseDetail.address.doorNo" - } - }, - { - "variable": "structureType", - "value": { - "path": "$.tradeLicenseDetail.structureType" - }, - "localisation":{ - "required":true, - "prefix": "COMMON_MASTERS_STRUCTURETYPE", - "module": "rainmaker-tl", - "isCategoryRequired":true - } - }, - { - "variable": "structureSubType", - "value": { - "path": "$.tradeLicenseDetail.structureType" - }, - "localisation":{ - "required":true, - "prefix": "COMMON_MASTERS_STRUCTURETYPE", - "module": "rainmaker-tl", - "isSubTypeRequired":true - } - }, - { - "variable": "streetName", - "value": { - "path": "$.tradeLicenseDetail.address.street" - } - }, - { - "variable": "buildingName", - "value": { - "path": "$.tradeLicenseDetail.address.buildingName" - } - }, - { - "variable": "city", - "value": { - "path": "$.tradeLicenseDetail.address.city" - }, - "localisation":{ - "required":true, - "prefix": "TENANT_TENANTS", - "module": "rainmaker-common" - } - }, - { - "variable": "tradeType", - "value": { - "path": "$.tradeLicenseDetail.tradeUnits[0].tradeType" - }, - "localisation":{ - "required":true, - "prefix": "TRADELICENSE_TRADETYPE", - "module": "rainmaker-tl" - } - }, - - { - "variable": "variable13", - "value":{ - "path":"$.tradeLicenseDetail.tradeUnits.*" - }, - "type":"array", - "format":{ - "type":"string", - "scema":[ - { - "variable": "tradeCat", - "value":"tradeType", - "localisation":{ - "required":true, - "prefix": "TRADELICENSE_TRADETYPE", - "module": "rainmaker-tl", - "isCategoryRequired":true - } - }, - { - "variable": "tradetyp", - "value":"tradeType", - "localisation":{ - "required":true, - "prefix": "TRADELICENSE_TRADETYPE", - "module": "rainmaker-tl", - "isMainTypeRequired":true - } - }, - { - "variable": "tradesub", - "value":"tradeType", - "localisation":{ - "required":true, - "prefix": "TRADELICENSE_TRADETYPE", - "module": "rainmaker-tl", - "isSubTypeRequired":true - } - }, - { - "variable": "UOM-measurement", - "value":"uom" - }, - { - "variable":"uomValue", - "value":"uomValue" - } - ] - } - }, - { - "variable": "variable14", - "value":{ - "path":"$.tradeLicenseDetail.accessories.*" - }, - "type":"array", - "format":{ - "type":"string", - "scema":[ - { - "variable": "accesoryType", - "value": "accessoryCategory", - "localisation":{ - "required":true, - "prefix": "TRADELICENSE_ACCESSORIESCATEGORY", - "module": "rainmaker-tl" - } - }, - { - "variable": "accessoryUomValue", - "value": "uomValue" - }, - - { - "variable": "uom", - "value": "uom" - }, - { - "variable": "accessoryCount", - "value": "count" - } - - ] - } - - }, - { - "variable": "variable_owners", - "value": {"path":"$.tradeLicenseDetail.owners[?(@.active== true && @.userActive== true)]"}, - "type":"array", - "format":{ - "type":"string", - "scema":[ - { - "variable": "name", - "value": "name", - "type":"string" - }, - { - "variable": "fatherOrHusbandName", - "value": "fatherOrHusbandName", - "type":"string" - }, - - { - "variable": "permanentAddress", - "value": "permanentAddress", - "type":"string" - }, - { - "variable": "mobileNumber", - "value": "mobileNumber", - "type":"string" - } - - ] - } - }, - - - { - "variable": "accessories", - "value": { - "path": "$.tradeLicenseDetail.accessories[0].accessoryCategory" - }, - "localisation":{ - "required":true, - "prefix": "TRADELICENSE_ACCESSORIESCATEGORY", - "module": "rainmaker-tl" - } - - }, - { - "variable": "licenseIssueDate", - "value": { - "path": "$.issuedDate" - }, - "type": "date" - }, - { - "variable": "licenseValidityFrom", - "value": { - "path": "$.validFrom" - }, - "type": "date" - }, - { - "variable": "licenseValidityTo", - "value": { - "path": "$.validTo" - }, - "type": "date" - }, - { - "variable": "to", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_TO" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "municipal_corportaion", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_MUNICIPAL_CORPORATION" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "corporation_contact", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_LICENSE_CORPORATION_CONTACT" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "corporation_website", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_LICENSE_CORPORATION_WEBSITE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "trade_category", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_TRADE_CATEGORY" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "trade_type", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_TRADE_TYPE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "trade_sub_type", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_TRADE_SUB_TYPE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "uom_measurement", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_UOM_MEASUREMENT" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "accesory_type", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_ACCESORY_TYPE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "uom_label", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_UOM" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "uom_value", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_UOM_VALUE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "accessory_count", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_ACCESORY_COUNT" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "corporation_email", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_LICENSE_CORPORATION_EMAIL" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "trade_license_certificate", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_LICENSE_CERTIFICATE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "trade_license_no", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_LICENSE_NO" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "application_no", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_APPLICATION_NO" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "reciept_no", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_RECIEPT_NO" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "financial_year", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_FINANCIAL_YEAR" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "trade_name", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_TRADE_NAME" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "trade_owner_name", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_TRADE_OWNER_NAME" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "trade_owner_contact", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_TRADE_OWNER_CONTACT" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "trade_address", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_TRADE_ADDRESS" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "trade_type", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_TRADE_TYPE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "accessories_label", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_ACCESSORIES_LABEL" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "trade_license_fee", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_TRADE_LICENSE_FEE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "license_issue_date", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_LICENSE_ISSUE_DATE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "license_validity", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_LICENSE_VALIDITY" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "approved_by", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_APPROVED_BY" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "commissioner", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_COMMISSIONER" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "disclaimer", - "value": { - "path": "TL_CERTIFICATE_DISCLAIMER" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "footerLogoImage", - "url": "https://pb-egov-assets.s3.ap-south-1.amazonaws.com/mseva-logo-colored.png", - "type": "image" - } - ] - }, - { - "externalAPI": [ - { - "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", - "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", - "apiRequest": null, - "responseMapping":[ - { - "variable":"ulb-address", - "value":"$.MdmsRes.tenant.tenants[0].address" - }, - { - "variable":"mcGrade", - "value":"$.MdmsRes.tenant.tenants[0].city.ulbType" - }, - { - "variable":"corporationContact", - "value":"$.MdmsRes.tenant.tenants[0].contactNumber" - }, - { - "variable":"corporationWebsite", - "value":"$.MdmsRes.tenant.tenants[0].domainUrl" - }, - { - "variable":"corporationEmail", - "value":"$.MdmsRes.tenant.tenants[0].emailId" - } - ] - }, - { - "path": "http://collection-services:8080/collection-services/payments/TL/_search", - "queryParam": "tenantId=$.tenantId,consumerCodes=$.applicationNumber,businessServices=TL", - "apiRequest": null, - "responseMapping":[ - { - "variable":"tradeLicenseFee", - "value":"$.Payments[0].totalAmountPaid" - }, - { - "variable":"recieptNo", - "value":"$.Payments[0].paymentDetails[0].receiptNumber" - } - - ] - }, - { - "path": "http://egov-location:8080/egov-location/location/v11/boundarys/_search", - "queryParam": "tenantId=$.tenantId,hierarchyTypeCode=REVENUE,boundaryType=Locality,codes=$.tradeLicenseDetail.address.locality.code", - "apiRequest": null, - "responseMapping":[ - { - "variable":"localityNName", - "value":"$.TenantBoundary[0].boundary[0].name" - } - ] - }, - - { - "path": "http://egov-filestore:8080/filestore/v1/files/url", - "queryParam": "tenantId=pb,fileStoreIds=$.tradeLicenseDetail.applicationDocuments[?(@.documentType== 'OWNERPHOTO')].fileStoreId", - "apiRequest": null, - "requesttype": "GET", - "responseMapping":[ - { - "variable":"userpic", - "value":"$.fileStoreIds[0].url", - "type": "image" - } - ] - }, - { - "path": "http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search", - "queryParam": "businessIds=$.applicationNumber,history=true,tenantId=$.tenantId", - "apiRequest": null, - "responseMapping":[ - { - "variable":"approvedBy", - "value":"=if($.ProcessInstances[?(@.action == 'APPROVE')].assigner.name=='NA','SYSTEM',$.ProcessInstances[?(@.action == 'APPROVE')].assigner.name)" - } - - ] - } - - ] - } - ] - -} -] -} -} diff --git a/configs/pdf-service/data-config/tlrenewalcertificate.json b/configs/pdf-service/data-config/tlrenewalcertificate.json deleted file mode 100644 index f481e893..00000000 --- a/configs/pdf-service/data-config/tlrenewalcertificate.json +++ /dev/null @@ -1,734 +0,0 @@ -{ - "key": "tlrenewalcertificate", - "DataConfigs": { - "serviceName": "rainmaker-common", - "version": "1.0.0", - "baseKeyPath": "$.Licenses.*", - "entityIdPath":"$.id", - "isCommonTableBorderRequired": true, - "mappings": [ - { - "mappings": [ - { - "direct": [ - { - "variable": "logoImage", - "url":"https://raw.githubusercontent.com/egovernments/egov-web-app/master/web/rainmaker/dev-packages/egov-ui-kit-dev/src/assets/images/pblogo.png", - "type":"image" - }, - { - "variable": "tradeLicenseNo", - "value": { - "path": "$.licenseNumber" - } - }, - { - "variable": "applicationNo", - "value": { - "path": "$.applicationNumber" - } - }, - { - "variable": "financialYear", - "value": { - "path": "$.financialYear" - } - }, - { - "variable": "tradeName", - "value": { - "path": "$.tradeName" - } - }, - { - "variable": "tradeOwnerName", - "value": { - "path": "$.tradeLicenseDetail.owners[0].name" - } - }, - { - "variable": "tradeOwnerContact", - "value": { - "path": "$.tradeLicenseDetail.owners[0].mobileNumber" - } - }, - { - "variable": "tradeAddress", - "value": { - "path": "$.tradeLicenseDetail.address.locality.code" - } - }, - { - "variable": "doorNo", - "value": { - "path": "$.tradeLicenseDetail.address.doorNo" - } - }, - { - "variable": "structureType", - "value": { - "path": "$.tradeLicenseDetail.structureType" - }, - "localisation":{ - "required":true, - "prefix": "COMMON_MASTERS_STRUCTURETYPE", - "module": "rainmaker-tl", - "isCategoryRequired":true - } - }, - { - "variable": "structureSubType", - "value": { - "path": "$.tradeLicenseDetail.structureType" - }, - "localisation":{ - "required":true, - "prefix": "COMMON_MASTERS_STRUCTURETYPE", - "module": "rainmaker-tl", - "isSubTypeRequired":true - } - }, - { - "variable": "streetName", - "value": { - "path": "$.tradeLicenseDetail.address.street" - } - }, - { - "variable": "buildingName", - "value": { - "path": "$.tradeLicenseDetail.address.buildingName" - } - }, - { - "variable": "city", - "value": { - "path": "$.tradeLicenseDetail.address.city" - }, - "localisation":{ - "required":true, - "prefix": "TENANT_TENANTS", - "module": "rainmaker-common" - } - }, - { - "variable": "tradeType", - "value": { - "path": "$.tradeLicenseDetail.tradeUnits[0].tradeType" - }, - "localisation":{ - "required":true, - "prefix": "TRADELICENSE_TRADETYPE", - "module": "rainmaker-tl" - } - }, - - { - "variable": "variable13", - "value":{ - "path":"$.tradeLicenseDetail.tradeUnits.*" - }, - "type":"array", - "format":{ - "type":"string", - "scema":[ - { - "variable": "tradeCat", - "value":"tradeType", - "localisation":{ - "required":true, - "prefix": "TRADELICENSE_TRADETYPE", - "module": "rainmaker-tl", - "isCategoryRequired":true - } - }, - { - "variable": "tradetyp", - "value":"tradeType", - "localisation":{ - "required":true, - "prefix": "TRADELICENSE_TRADETYPE", - "module": "rainmaker-tl", - "isMainTypeRequired":true - } - }, - { - "variable": "tradesub", - "value":"tradeType", - "localisation":{ - "required":true, - "prefix": "TRADELICENSE_TRADETYPE", - "module": "rainmaker-tl", - "isSubTypeRequired":true - } - }, - { - "variable": "UOM-measurement", - "value":"uom" - }, - { - "variable":"uomValue", - "value":"uomValue" - } - ] - } - }, - { - "variable": "variable14", - "value":{ - "path":"$.tradeLicenseDetail.accessories.*" - }, - "type":"array", - "format":{ - "type":"string", - "scema":[ - { - "variable": "accesoryType", - "value": "accessoryCategory", - "localisation":{ - "required":true, - "prefix": "TRADELICENSE_ACCESSORIESCATEGORY", - "module": "rainmaker-tl" - } - }, - { - "variable": "accessoryUomValue", - "value": "uomValue" - }, - - { - "variable": "uom", - "value": "uom" - }, - { - "variable": "accessoryCount", - "value": "count" - } - - ] - } - - }, - { - "variable": "variable_owners", - "value": {"path":"$.tradeLicenseDetail.owners[?(@.active== true && @.userActive== true)]"}, - "type":"array", - "format":{ - "type":"string", - "scema":[ - { - "variable": "name", - "value": "name", - "type":"string" - }, - { - "variable": "fatherOrHusbandName", - "value": "fatherOrHusbandName", - "type":"string" - }, - - { - "variable": "permanentAddress", - "value": "permanentAddress", - "type":"string" - }, - { - "variable": "mobileNumber", - "value": "mobileNumber", - "type":"string" - } - - ] - } - }, - { - "variable": "accessories", - "value": { - "path": "$.tradeLicenseDetail.accessories[0].accessoryCategory" - }, - "localisation":{ - "required":true, - "prefix": "TRADELICENSE_ACCESSORIESCATEGORY", - "module": "rainmaker-tl" - } - - }, - { - "variable": "licenseIssueDate", - "value": { - "path": "$.issuedDate" - }, - "type": "date" - }, - { - "variable": "licenseValidityFrom", - "value": { - "path": "$.validFrom" - }, - "type": "date" - }, - { - "variable": "licenseValidityTo", - "value": { - "path": "$.validTo" - }, - "type": "date" - }, - { - "variable": "to", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_TO" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "municipal_corportaion", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_MUNICIPAL_CORPORATION" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "corporation_contact", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_LICENSE_CORPORATION_CONTACT" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "corporation_website", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_LICENSE_CORPORATION_WEBSITE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "trade_category", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_TRADE_CATEGORY" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "trade_type", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_TRADE_TYPE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "trade_sub_type", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_TRADE_SUB_TYPE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "uom_measurement", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_UOM_MEASUREMENT" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "accesory_type", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_ACCESORY_TYPE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "uom_label", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_UOM" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "uom_value", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_UOM_VALUE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "accessory_count", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_ACCESORY_COUNT" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "corporation_email", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_LICENSE_CORPORATION_EMAIL" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "trade_license_certifcate", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_LICENSE_CERTIFICATE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "trade_license_no", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_LICENSE_NO" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "application_no", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_APPLICATION_NO" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "reciept_no", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_RECIEPT_NO" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "financial_year", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_FINANCIAL_YEAR" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "trade_name", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_TRADE_NAME" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "trade_owner_name", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_TRADE_OWNER_NAME" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "trade_owner_contact", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_TRADE_OWNER_CONTACT" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "trade_address", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_TRADE_ADDRESS" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "trade_type", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_TRADE_TYPE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "accessories_label", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_ACCESSORIES_LABEL" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "trade_license_fee", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_TRADE_LICENSE_FEE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "license_issue_date", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_LICENSE_ISSUE_DATE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "license_validity", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_LICENSE_VALIDITY" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "approved_by", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_APPROVED_BY" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "commissioner", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_COMMISSIONER" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "disclaimer", - "value": { - "path": "TL_CERTIFICATE_DISCLAIMER" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "footerLogoImage", - "url": "https://pb-egov-assets.s3.ap-south-1.amazonaws.com/mseva-logo-colored.png", - "type": "image" - } - ] - }, - { - "externalAPI": [ - { - "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", - "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", - "apiRequest": null, - "responseMapping":[ - { - "variable":"ulb-address", - "value":"$.MdmsRes.tenant.tenants[0].address" - }, - { - "variable":"mcGrade", - "value":"$.MdmsRes.tenant.tenants[0].city.ulbType" - }, - { - "variable":"corporationContact", - "value":"$.MdmsRes.tenant.tenants[0].contactNumber" - }, - { - "variable":"corporationWebsite", - "value":"$.MdmsRes.tenant.tenants[0].domainUrl" - }, - { - "variable":"corporationEmail", - "value":"$.MdmsRes.tenant.tenants[0].emailId" - } - ] - }, - { - "path": "http://collection-services:8080/collection-services/payments/TL/_search", - "queryParam": "tenantId=$.tenantId,consumerCodes=$.applicationNumber,businessServices=TL", - "apiRequest": null, - "responseMapping":[ - { - "variable":"tradeLicenseFee", - "value":"$.Payments[0].totalAmountPaid" - }, - { - "variable":"recieptNo", - "value":"$.Payments[0].paymentDetails[0].receiptNumber" - } - - ] - }, - { - "path": "http://egov-location:8080/egov-location/location/v11/boundarys/_search", - "queryParam": "tenantId=$.tenantId,hierarchyTypeCode=REVENUE,boundaryType=Locality,codes=$.tradeLicenseDetail.address.locality.code", - "apiRequest": null, - "responseMapping":[ - { - "variable":"localityNName", - "value":"$.TenantBoundary[0].boundary[0].name" - } - ] - }, - - { - "path": "http://egov-filestore:8080/filestore/v1/files/url", - "queryParam": "tenantId=pb,fileStoreIds=$.tradeLicenseDetail.applicationDocuments[?(@.documentType== 'OWNERPHOTO')].fileStoreId", - "apiRequest": null, - "requesttype": "GET", - "responseMapping":[ - { - "variable":"userpic", - "value":"$.fileStoreIds[0].url", - "type": "image" - } - ] - }, - { - "path": "http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search", - "queryParam": "businessIds=$.applicationNumber,history=true,tenantId=$.tenantId", - "apiRequest": null, - "responseMapping":[ - { - "variable":"approvedBy", - "value":"$.ProcessInstances[?(@.action == 'APPROVE')].assigner.name" - } - - ] - } - - ] - } - ] - -} -] -} -} diff --git a/configs/pdf-service/data-config/tradelicense-bill.json b/configs/pdf-service/data-config/tradelicense-bill.json deleted file mode 100644 index 50c4713b..00000000 --- a/configs/pdf-service/data-config/tradelicense-bill.json +++ /dev/null @@ -1,649 +0,0 @@ -{ - "key": "tradelicense-bill", - "DataConfigs": { - "serviceName": "rainmaker-common", - "version": "1.0.0", - "baseKeyPath": "$.Bill.*", - "entityIdPath":"$.id", - "isCommonTableBorderRequired": true, - "mappings": [ - { - "topic": "common-pdf-generation-1", - "staticConfigPath": "https://raw.githubusercontent.com/egovernments/egov-services/vishal-feature-filestore/core/egov-indexer/src/main/resources/rainmaker-pgr-indexer.yml", - "mappings": [ - { - "direct": [ - { - "variable": "total_amount_due", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_TOTAL_AMOUNT_DUE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "payer_name", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PAYER_NAME" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "Municipal_Corporation", - "value": { - "path": "PDF_STATIC_LABEL_MDMS_MUNICIPAL_CORPORATION" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "bill_no", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_BILL_NO" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "Rs", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_RUPEE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "mobile_no", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_MOBILE_NO" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "bill_period", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_BILL_PERIOD" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "payer_address", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PAYER_ADDRESS" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - - { - "variable": "bill_issue_date", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ISSUE_DATE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "bill_due_date", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_BILL_DUE_DATE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "billing_summary_property_tax", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_BILLING_SUMMARY" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "serviceType", - "value": { - "path": "$.businessService" - }, - "localisation":{ - "required":true, - "prefix":"MODULE", - "module":"rainmaker-common" - } - }, - { - "variable": "tl_application_no", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_TL_APPLICATION_NO" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "arrears_label", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ARREARS" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "charge_label", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_CHARGE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - - { - "variable": "penalty_label", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PENALTY" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "rebate_label", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_REBATE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "others_label", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_OTHERS" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "total_label", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_TOTAL" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "important_message", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_IMPORTANT_MESSAGE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "payment_received", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PAYMENT_RECEIVED" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "this_document", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_THIS_DOCUMENT" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "this_is_a", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_THIS_IS" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "assessment_payment", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ASSESSSMENT_PAYMENT" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "please_deposit", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PLEASE_DEPOSIT" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "if_the_tax", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_IF_THE_TAX" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "acknowledgement_for", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ACKNOWLEDGEMENT" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "date_label", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_DATE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "consumer_id", - "value": { - "path": "$.businessService" - }, - "localisation":{ - "required":true, - "prefix": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_CONSUMER_ID", - "module":"rainmaker-common" - } - }, - { - "variable": "name_address", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_NAME_ADDRESS" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "total_payment", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_TOTAL_PAYMENT" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "receivers_signature", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_RECEIVERS_SIGNATURE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "totalAmountDue", - "value": { - "path": "$.totalAmount" - } - }, - { - "variable": "total", - "value": { - "path": "$.totalAmount" - } - }, - - { - "variable": "payerName", - "value": { - "path": "$.payerName" - } - }, - - { - "variable": "mobileNo", - "value": { - "path": "$.mobileNumber" - } - }, - - { - "variable": "payerAddress", - "value": { - "path": "$.payerAddress" - } - }, - { - "variable": "nameAddress", - "value": { - "path": "$.payerAddress" - } - }, - - { - "variable": "billNo", - "value": { - "path": "$.billNumber" - } - }, - { - "variable": "fromPeriod", - "value": { - "path": "$.billDetails[0].fromPeriod" - }, - "type": "date" - }, - { - "variable": "toPeriod", - "value": { - "path": "$.billDetails[0].toPeriod" - }, - "type": "date" - }, - - { - "variable": "billIssueDate", - "value": { - "path": "$.billDate" - }, - "type": "date" - }, - - { - "variable": "billDueDate", - "value": { - "path": "$.billDetails[0].expiryDate" - }, - "type": "date" - }, - { - "variable": "billdate", - "value": { - "path": "$.billDate" - }, - "type": "date" - }, - - { - "variable": "propertyID", - "value": { - "path": "$.consumerCode" - } - }, - { - "variable": "fees", - "value":{ - "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'TL_TAX' || @.taxHeadCode == 'TL_RENEWAL_TAX')].amount" - } - }, - { - "variable": "tl_penalty", - "value":{ - "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'TL_PENALTY' || @.taxHeadCode == 'TL_RENEWAL_PENALTY')].amount" - } - }, - { - "variable": "tl_rebate", - "value":{ - "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'TL_REBATE' || @.taxHeadCode == 'TL_RENEWAL_REBATE')].amount" - } - }, - { - "variable": "tl_adhoc_penalty", - "value":{ - "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'TL_ADHOC_PENALTY' || @.taxHeadCode == 'TL_RENEWAL_ADHOC_PENALTY')].amount" - } - }, - { - "variable": "tl_adhoc_rebate", - "value":{ - "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'TL_ADHOC_REBATE' || @.taxHeadCode == 'TL_RENEWAL_ADHOC_REBATE')].amount" - } - }, - { - "variable": "tl_roundoff", - "value":{ - "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'TL_ROUNDOFF')].amount" - } - }, - { - "variable": "consumerID", - "value": { - "path": "$.consumerCode" - } - }, - { - "variable": "date", - "value": { - "path": "$.billDate" - }, - "type": "date" - }, - { - "variable": "totalPayment", - "value": { - "path": "$.billDetails[0].amountPaid" - } - }, - { - "variable":"scissorImage", - "url":"http://www.pngall.com/wp-content/uploads/2016/03/Scissor-PNG-Clipart.png", - "type":"image" - }, - { - "variable": "footerLogoImage", - "url": "https://uat.digit.org/pg-egov-assets/mseva-logo-colored.png", - "type": "image" - } - ] - }, - { - "derived": [ - { - "variable": "charge", - "formula": "{{fees}}" - }, - { - "variable": "penalty", - "formula": "{{tl_penalty}}+{{tl_adhoc_penalty}}" - }, - { - "variable": "rebate", - "formula": "{{tl_rebate}}+{{tl_adhoc_rebate}}" - }, - { - "variable": "others", - "formula": "{{tl_roundoff}}" - } - ] - }, - { - "externalAPI": [ - { - "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", - "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", - "apiRequest": null, - "responseMapping":[ - { - "variable":"address", - "value":"$.MdmsRes.tenant.tenants[0].address" - }, - { - "variable":"phoneNumber", - "value":"$.MdmsRes.tenant.tenants[0].contactNumber" - }, - { - "variable":"website", - "value":"$.MdmsRes.tenant.tenants[0].domainUrl" - }, - { - "variable":"email", - "value":"$.MdmsRes.tenant.tenants[0].emailId" - }, - { - "variable": "logoImage", - "value":"$.MdmsRes.tenant.tenants[0].logoId", - "type": "image" - }, - { - "variable": "logo_header", - "value":"$.MdmsRes.tenant.tenants[0].code", - "localisation":{ - "required":true, - "prefix": "TENANT_TENANTS", - "module":"rainmaker-common" - } - } - ] - }, - { - "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", - "queryParam": "moduleName=tenant&masterName=footer&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}' %26%26 @.service=='{$.businessService}')%5D", - "apiRequest": null, - "responseMapping":[ - { - "variable": "variable11", - "value": "$.MdmsRes.tenant.footer[0].billFooterContent.*", - "type":"array", - "format":{ - "type":"string", - "scema":[ - { - "variable":"disclaimerContent", - "value":"disclaimer", - "type":"string", - "localisation":{ - "required":true, - "prefix": null, - "module": "rainmaker-common" - } - } - ] - } - } - ] - } - ] - } - ] - } - ] - } -} \ No newline at end of file diff --git a/configs/pdf-service/data-config/tradelicense-receipt.json b/configs/pdf-service/data-config/tradelicense-receipt.json deleted file mode 100644 index 0140f3ea..00000000 --- a/configs/pdf-service/data-config/tradelicense-receipt.json +++ /dev/null @@ -1,745 +0,0 @@ -{ - "key": "tradelicense-receipt", - "DataConfigs": { - "serviceName": "rainmaker-common", - "version": "1.0.0", - "baseKeyPath": "$.Payments.*", - "entityIdPath":"$.id", - "isCommonTableBorderRequired": true, - "mappings": [ - { - "topic": "common-pdf-generation-3", - "mappings": [ - { - "direct": [ - { - "variable": "payerName", - "value": { - "path": "$.payerName" - } - }, - { - "variable": "payerAddress", - "value": { - "path": "$.payerAddress" - } - }, - { - "variable": "user-name", - "value": { - "path": "$.userInfo.name" - }, - "type":"selectFromRequestInfo" - }, - { - "variable": "userName", - "value": { - "path": "$.additionalDetails.collectedBy" - } - },{ - "variable": "ifsc", - "value": { - "path": "$.ifscCode" - } - },{ - "variable": "bank", - "value": { - "path": "$.additionalDetails[0].bankName" - } - },{ - "variable": "branch", - "value": { - "path": "$.additionalDetails[0].branchName" - } - }, - { - "variable": "payerContact", - "value": { - "path": "$.mobileNumber" - } - }, - { - "variable": "receiptNo", - "value": { - "path": "$.paymentDetails[0].receiptNumber" - } - }, - { - "variable": "add", - "value": { - "path": "$.paymentDetails[0].bill.billDetails[0].additionalDetails.address" - } - }, - { - "variable": "serviceType", - "value": { - "path": "$.paymentDetails[0].businessService" - }, - "localisation":{ - "required":true, - "prefix":"MODULE", - "module":"rainmaker-common" - } - }, - { - "variable": "renewalTradeFee", - "value": { - "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'TL_RENEWAL_TAX')].amount" - } - }, - { - "variable": "newTradeFee", - "value": { - "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'TL_TAX')].amount" - } - }, - { - "variable": "renewalPenalty", - "value": { - "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'TL_RENEWAL_PENALTY')].amount" - } - }, - { - "variable": "adhocRebate", - "value": { - "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'TL_ADHOC_REBATE')].amount" - } - }, - { - "variable": "adhocPenalty", - "value": { - "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'TL_ADHOC_PENALTY')].amount" - } - }, - { - "variable": "paidAmount", - "value": { - "path": "$.paymentDetails[0].totalAmountPaid" - } - }, - { - "variable": "chequeNo", - "value": { - "path": "$.instrumentNumber" - } - }, - { - "variable": "chequeDate", - "value": { - "path": "$.instrumentDate" - }, - "type": "date" - }, - { - "variable": "chequeNo", - "value": { - "path": "$.instrumentNumber" - } - }, - { - "variable": "chequeDate", - "value": { - "path": "$.instrumentDate" - }, - "type": "date" - }, - { - "variable": "paymentMode", - "value": { - "path": "$.paymentMode" - }, - "localisation":{ - "required":true, - "prefix": "COMMON_MASTERS_PAYMENTMODE", - "module": "rainmaker-common" - } - }, - { - "variable": "G8ReceiptNo", - "value": { - "path": "$.paymentDetails[0].manualReceiptNumber" - } - }, - { - "variable": "G8ReceiptDate", - "value": { - "path": "$.paymentDetails[0].manualReceiptDate" - }, - "type": "date" - }, - { - "variable": "paymentDate", - "value": { - "path": "$.transactionDate" - }, - "type": "date" - }, - { - "variable": "consumerID", - "value": { - "path": "$.paymentDetails[0].bill.consumerCode" - } - }, - { - "variable": "transactionID", - "value": { - "path": "$.transactionNumber" - } - }, - { - "variable": "dueAmount", - "value": { - "path": "$.paymentDetails[0].bill.totalAmount" - } - }, - { - "variable": "payment_receipt", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_RECEIPT" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "receipt_no", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_RECEIPT_NO" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "consumer_id", - "value": { - "path": "$.paymentDetails[0].businessService" - }, - "localisation":{ - "required":true, - "prefix": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_CONSUMER_ID", - "module":"rainmaker-common" - } - }, - { - "variable": "payment_date", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_DATE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "payer_name", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYER_NAME" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "payer_contact", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYER_CONTACT" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "service_type", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_SERVICE_TYPE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "billing_period", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_BILLING_PERIOD" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "paid_amount", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAID_AMOUNT" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "pending_amount", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PENDING_AMOUNT" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "payment_mode", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_MODE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "transaction_id", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_TRANSACTION_ID" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "g8_receipt_no", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_G8_RECEIPT_NO" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "g8_receipt_date", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_G8_RECEIPT_DATE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "generated_by", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_GENERATED_BY" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "commissioner/eo", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_COMMISSIONER_EO" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "no_signature", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_NO_SIGNATURE" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "disclamer", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "to", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_TO" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "Municipal_Corporation", - "value": { - "path": "PDF_STATIC_LABEL_MDMS_MUNICIPAL_CORPORATION" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "footerLogoImage", - "url": "https://pb-egov-assets.s3.ap-south-1.amazonaws.com/mseva-logo-colored.png", - "type": "image" - } - ] - }, - { - "derived": [ - { - "variable": "pendingAmount", - "formula": "{{dueAmount}}-{{paidAmount}}" - }, - { - "variable": "tradeFee", - "formula": "{{renewalTradeFee}}+{{newTradeFee}}" - } - ] - }, - { - "externalAPI": [ - { - "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", - "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", - "apiRequest": null, - "responseMapping":[ - { - "variable":"address", - "value":"$.MdmsRes.tenant.tenants[0].address" - }, - { - "variable":"mcGrade", - "value":"$.MdmsRes.tenant.tenants[0].city.ulbType" - }, - { - "variable":"phoneNumber", - "value":"$.MdmsRes.tenant.tenants[0].contactNumber" - }, - { - "variable":"website", - "value":"$.MdmsRes.tenant.tenants[0].domainUrl" - }, - { - "variable":"email", - "value":"$.MdmsRes.tenant.tenants[0].emailId" - }, - { - "variable": "logoImage", - "value":"$.MdmsRes.tenant.tenants[0].logoId", - "type":"image" - }, - { - "variable": "logo-header", - "value":"$.MdmsRes.tenant.tenants[0].code", - "localisation":{ - "required":true, - "prefix": "TENANT_TENANTS", - "module":"rainmaker-common" - } - } - ] - }, - - { - "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", - "queryParam": "moduleName=tenant&masterName=footer&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}' %26%26 @.service=='{$.paymentDetails[0].businessService}')%5D", - "apiRequest": null, - "responseMapping":[ - { - "variable": "variable11", - "value": "$.MdmsRes.tenant.footer[0].receiptFooterContent.*", - "type":"array", - "format":{ - "type":"string", - "scema":[ - { - "variable":"disclaimerContent", - "value":"disclaimer", - "type":"string", - "localisation":{ - "required":true, - "prefix": null, - "module": "rainmaker-common" - } - } - ] - } - } - ] - }, - { - "path": "http://tl-services.egov:8080/tl-services/v1/_search", - "queryParam": "tenantId=$.tenantId,applicationNumber=$.paymentDetails[0].bill.consumerCode", - "apiRequest": null, - "responseMapping":[ - { - "variable":"applicationType", - "value":"$.Licenses[0].applicationType" - }, - { - "variable":"penaltyComments", - "value":"$.Licenses[0].tradeLicenseDetail.additionalDetail.penaltyComments" - }, - { - "variable":"rebateComments", - "value":"$.Licenses[0].tradeLicenseDetail.additionalDetail.rebateComments" - }, - { - "variable":"licenseNumber", - "value":"$.Licenses[0].licenseNumber" - }, - { - "variable":"oldLicenseNumber", - "value":"$.Licenses[0].oldLicenseNumber" - }, - { - "variable":"financialYear", - "value":"$.Licenses[0].financialYear" - }, - { - "variable": "fromPeriod", - "value": "$.Licenses[0].validFrom", - "type": "date" - }, - { - "variable": "toPeriod", - "value": "$.Licenses[0].validTo", - "type": "date" - }, - { - "variable":"tradeName", - "value":"$.Licenses[0].tradeName" - },{ - "variable":"tradeBuilding", - "value":"$.Licenses[0].tradeLicenseDetail.address.buildingName" - },{ - "variable":"tradeDoor", - "value":"$.Licenses[0].tradeLicenseDetail.address.doorNo" - },{ - "variable":"tradeStreet", - "value":"$.Licenses[0].tradeLicenseDetail.address.street" - }, - { - "variable":"adhocRebateReason", - "value":"$.Licenses[0].tradeLicenseDetail.adhocExemptionReason", - "localisation":{ - "required":true, - "prefix": null, - "module": "rainmaker-tl" - } - }, - { - "variable":"adhocPenaltyReason", - "value":"$.Licenses[0].tradeLicenseDetail.adhocPenaltyReason", - "localisation":{ - "required":true, - "prefix": null, - "module": "rainmaker-tl" - } - }, - { - "variable": "structureType", - "value": "$.Licenses[0].tradeLicenseDetail.structureType", - "localisation":{ - "required":true, - "prefix": "COMMON_MASTERS_STRUCTURETYPE", - "module": "rainmaker-tl", - "isCategoryRequired":true - } - }, - { - "variable": "structureSubType", - "value": "$.Licenses[0].tradeLicenseDetail.structureType", - "localisation":{ - "required":true, - "prefix": "COMMON_MASTERS_STRUCTURETYPE", - "module": "rainmaker-tl", - "isSubTypeRequired":true - } - }, - { - "variable": "variable_acc", - "value": "$.Licenses[0].tradeLicenseDetail.accessories.*", - "type":"array", - "format":{ - "type":"string", - "scema":[ - { - "variable": "accesoryType", - "value": "accessoryCategory", - "type":"string", - "localisation":{ - "required":true, - "prefix": "TRADELICENSE_ACCESSORIESCATEGORY", - "module": "rainmaker-tl" - } - }, - { - "variable": "accessoryUomValue", - "value": "uomValue", - "type":"string" - }, - - { - "variable": "uom", - "value": "uom", - "type":"string" - }, - { - "variable": "accessoryCount", - "value": "count", - "type":"string" - } - - ] - } - }, - { - "variable": "variable_owners", - "value": "$.Licenses[0].tradeLicenseDetail.owners[?(@.active== true && @.userActive== true)]", - "type":"array", - "format":{ - "type":"string", - "scema":[ - { - "variable": "name", - "value": "name", - "type":"string" - }, - { - "variable": "fatherOrHusbandName", - "value": "fatherOrHusbandName", - "type":"string" - }, - - { - "variable": "permanentAddress", - "value": "permanentAddress", - "type":"string" - }, - { - "variable": "mobileNumber", - "value": "mobileNumber", - "type":"string" - } - - ] - } - }, - { - "variable": "variable13", - "value": "$.Licenses[0].tradeLicenseDetail.tradeUnits.*", - "type":"array", - "format":{ - "type":"string", - "scema":[ - { - "variable": "tradeCat", - "value": "tradeType", - "type":"string", - "localisation":{ - "required":true, - "prefix":"TRADELICENSE_TRADETYPE", - "module": "rainmaker-tl", - "isCategoryRequired":true - } - }, - { - "variable": "tradeTyp", - "value": "tradeType", - "type":"string", - "localisation":{ - "required":true, - "prefix":"TRADELICENSE_TRADETYPE", - "module": "rainmaker-tl", - "isMainTypeRequired":true - } - }, - { - "variable": "tradeSub", - "value": "tradeType", - "type":"string", - "localisation":{ - "required":true, - "prefix":"TRADELICENSE_TRADETYPE", - "module": "rainmaker-tl", - "isSubTypeRequired":true - } - } - ] - } - } - ] - },{ - "path": "http://egov-location:8080/egov-location/location/v11/boundarys/_search", - "queryParam": "tenantId=$.tenantId,hierarchyTypeCode=REVENUE,boundaryType=Locality,codes=$.paymentDetails[0].bill.billDetails[0].additionalDetails.address", - "apiRequest": null, - "responseMapping":[ - { - "variable":"mohalla", - "value":"$.TenantBoundary[0].boundary[0].name" - } - ] - } - ] - - } - ] - } - ] - } -} diff --git a/configs/pdf-service/data-config/ws-applicationsewerage.json b/configs/pdf-service/data-config/ws-applicationsewerage.json deleted file mode 100644 index e921e4ff..00000000 --- a/configs/pdf-service/data-config/ws-applicationsewerage.json +++ /dev/null @@ -1,1033 +0,0 @@ -{ - "key": "ws-applicationsewerage", - "DataConfigs": { - "serviceName": "rainmaker-common", - "version": "1.0.0", - "baseKeyPath": "$.SewerageConnection.*", - "entityIdPath": "$.applicationNo", - "isCommonTableBorderRequired": true, - "mappings": [ - { - "topic": "common-pdf-generation-3", - "mappings": [ - { - "direct": [ - { - "variable": "applicationNo", - "value": { - "path": "$.applicationNo" - } - }, - { - "variable": "status", - "value": { - "path": "$.status" - } - }, - { - "variable": "totalAmount", - "value": { - "path": "$.totalAmount" - } - }, - { - "variable": "propertyId", - "value": { - "path": "$.property.propertyId" - } - }, - { - "variable": "propertyType", - "value": { - "path": "$.property.propertyType" - }, - "localisation": { - "required": true, - "prefix": "WS_PROPTYPE", - "module": "rainmaker-ws" - } - }, - { - "variable": "propertyUsageType", - "value": { - "path": "$.property.usageCategory" - }, - "localisation": { - "required": true, - "prefix": "WS_PROPUSGTYPE", - "module": "rainmaker-ws" - } - }, - { - "variable": "propertyUsageSubType", - "value": { - "path": "$.property.propertySubUsageType" - }, - "localisation": { - "required": true, - "prefix": "WS_PROPSUBUSGTYPE", - "module": "rainmaker-ws" - } - }, - { - "variable": "plotSize", - "value": { - "path": "$.property.landArea" - } - }, - { - "variable": "noOfFloor", - "value": { - "path": "$.property.noOfFloors" - } - }, - { - "variable": "rainwaterHarvestingFacility", - "value": { - "path": "$.property.rainWaterHarvesting" - }, - "localisation": { - "required": true, - "prefix": "HARVESTING", - "module": "rainmaker-common" - } - }, - { - "variable": "cityName", - "value": { - "path": "$.property.address.city" - } - }, - { - "variable": "doorHouseNo", - "value": { - "path": "$.property.address.doorNo" - } - }, - { - "variable": "buildingColonyName", - "value": { - "path": "$.property.address.buildingName" - } - }, - { - "variable": "streetName", - "value": { - "path": "$.property.address.street" - } - }, - { - "variable": "localityMohalla", - "value": { - "path": "$.property.address.locality.name" - } - }, - { - "variable": "pinCode", - "value": { - "path": "$.property.address.pincode" - } - }, - { - "variable": "variable13", - "value":{ - "path":"$.property.owners.*" - }, - "type":"array", - "format":{ - "type":"string", - "scema":[ - { - "variable": "ownerName", - "value": "name" - }, - { - "variable": "ownerEmailId", - "value":"emailId" - }, - { - "variable": "gender", - "value": "gender" - }, - { - "variable": "ownerDob", - "value": "dob", - "type": "date" - }, - { - "variable": "guardianName", - "value": "fatherOrHusbandName" - }, - { - "variable": "relationshipLabel", - "value": "relationship" - }, - { - "variable": "specialApplicantCategory", - "value": "ownerType" - }, - { - "variable": "correspondenceAddress", - "value": "correspondenceAddress" - } - ] - } - - }, - { - "variable": "applyCategory", - "value": { - "path": "$.service" - } - }, - { - "variable": "noOfWaterClosetsProposed", - "value": { - "path": "$.proposedWaterClosets" - } - }, - { - "variable": "noOfWaterToiletsProposed", - "value": { - "path": "$.proposedToilets" - } - }, - { - "variable": "connectionType", - "value": { - "path": "$.connectionType" - } - }, - { - "variable": "noOfWaterClosets", - "value": { - "path": "$.noOfWaterClosets" - } - }, - { - "variable": "noOfToilets", - "value": { - "path": "$.noOfToilets" - } - }, - { - "variable": "plumberProvidedBy", - "value": { - "path": "$.additionalDetails.detailsProvidedBy" - } - }, - { - "variable": "plumberLicenceNo", - "value": { - "path": "$.plumberInfo[0].licenseNo" - } - }, - { - "variable": "plumberName", - "value": { - "path": "$.plumberInfo[0].name" - } - }, - { - "variable": "plumberMobileNo", - "value": { - "path": "$.plumberInfo[0].mobileNumber" - } - }, - { - "variable": "roadType", - "value": { - "path": "$.roadType" - } - }, - { - "variable": "area", - "value": { - "path": "$.roadCuttingArea" - } - }, - { - "variable": "connectionExecutionDate", - "value": { - "path": "$.connectionExecutionDate" - }, - "type": "date" - }, - { - "variable": "ownershipProof", - "value": { - "path": "$.pdfDocuments[?(@.title == 'WS_OWNER.ADDRESSPROOF')].name" - } - }, - { - "variable": "ownersIdProof", - "value": { - "path": "$.pdfDocuments[?(@.title == 'WS_OWNER.IDENTITYPROOF')].name" - } - }, - { - "variable": "electricityBill", - "value": { - "path": "$.pdfDocuments[?(@.title == 'WS_ELECTRICITY_BILL')].name" - } - }, - { - "variable": "plumberReport", - "value": { - "path": "$.pdfDocuments[?(@.title == 'WS_PLUMBER_REPORT_DRAWING')].name" - } - }, - { - "variable": "buildingPlan", - "value": { - "path": "$.pdfDocuments[?(@.title == 'WS_BUILDING_PLAN_OR_COMPLETION_CERTIFICATE')].name" - } - }, - { - "variable": "ptTaxReciept", - "value": { - "path": "$.pdfDocuments[?(@.title == 'WS_PROPERTY_TAX_RECIEPT')].name" - } - }, - { - "variable": "logoImage", - "url": "https://raw.githubusercontent.com/egovernments/egov-web-app/master/web/rainmaker/dev-packages/egov-ui-kit-dev/src/assets/images/pblogo.png", - "type": "image" - }, - { - "variable": "Municipal_Corporation", - "value": { - "path": "PDF_STATIC_LABEL_MDMS_MUNICIPAL_CORPORATION" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "logo_sub_header", - "value": { - "path": "PDF_STATIC_LABEL_SW_CONSOLIDATED_ACKNOWELDGMENT_LOGO_SUB_HEADER" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "application_no", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_APPLICATION_NO" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "status_label", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_STATUS" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "document_details_header", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_DOCUMENT_DETAIL_HEADER" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "fee_estimate_header", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_FEES_ESTIMATE_HEADER" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "total_amount", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_TOTAL_AMOUNT" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "total_amount", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_TOTAL_AMOUNT" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "property_details_header", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PROPERTY_DETAILS_HEADER" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "property_id", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PROPERTY_ID" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "property_type", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PROPERTY_TYPE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "property_usage_type", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PROPERTY_USAGE_TYPE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "property_usage_sub_type", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PROPERTY_USAGE_SUB_TYPE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "plot_size", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PLOT_SIZE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "no_of_floor", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_NO_OF_FLOOR" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "rainwater_harvesting_facility", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_RAINWATER_HARVESTING_FACILITY" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "property_location_details_header", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PROPERTY_LOCATION_HEADER" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "city", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_CITY" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "door_house_no", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_DOOR_HOUSE_NO" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "building_colony_name", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_BUILDING" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "street_name", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_STREETNAME" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "locality_mohalla", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_LOCALITY" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "pin_code", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PINCODE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "property_owner_details_header", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_OWNER_DETAILS_HEADER" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "owner_name", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_OWNER_NAME" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "email_label", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_EMAIL" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "gender_label", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_GENDER" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "dob_label", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_DOB" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "guardian_name", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_GUARDIAN_NAME" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "relationship_label", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_RELATIONSHIP" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "special_applicant_category", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_SPECIAL_APPLICANT_CATEGORY" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "connection_details_header", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_CONNECTION_DETAILS_HEADER" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "apply_category", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_APPLY_CATEGORY" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "no_of_water_closets_proposed", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_NO_OF_WATER_CLOSETS_PROPOSED" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "no_of_water_toilets_proposed", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_NO_OF_WATER_TOILETS_PROPOSED" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "additional_connection_details_header", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ADDITIONAL_CONNECTION_HEADER" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "connection_type", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_CONNECTION_TYPE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "no_of_water_closets", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_NO_OF_WATER_CLOSETS" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "no_of_toilets", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_NO_OF_TOILETS" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "plumber_details_header", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PLUMBER_DETAILS_HEADER" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "plumber_provided_by", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PLUMBER_PROVIDED_BY" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "plumber_licence_no", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PLUMBER_LICENSE_NO" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "plumber_name", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PLUMBER_NAME" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "plumber_mobile_no", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PLUMBER_MOBILE_NO" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "road_charges_header", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ROAD_CHARGES_HEADER" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "road_type", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ROAD_TYPE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "area_label", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_AREA_LABEL" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "activation_details_header", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ACTIVATION_DETAILS_HEADER" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "connection_execution_date", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_CONNECTION_EXECUTION_DATE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "ownership_proof", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_OWNERSHIP_PROOF" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "owners_id_proof", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_OWNERS_ID_PROOF" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "electricty_bill", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ELECTRICITY_BILL" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "plumber_report", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PLUMBER_REPORT" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "building_plan", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_BUILDING_PLAN" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "property_tax_reciept", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PROPERTY_TAX_RECEIPT" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "sewerage_application", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_SEWERAGE_APPLICATION" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "correspondence_address", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_CORRESPONDENCE_ADDRESS" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "Rs", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_RUPEE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "footerLogoImage", - "url": "https://pb-egov-assets.s3.ap-south-1.amazonaws.com/mseva-logo-colored.png", - "type": "image" - } - ] - }, - { - "externalAPI": [ - { - "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", - "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.property.tenantId}')%5D", - "apiRequest": null, - "responseMapping": [ - { - "variable": "logoImage", - "value": "$.MdmsRes.tenant.tenants[0].logoId", - "type": "image" - }, - { - "variable":"mcGrade", - "value":"$.MdmsRes.tenant.tenants[0].city.pwssbGrade" - }, - { - "variable": "logo_header", - "value": "$.MdmsRes.tenant.tenants[0].code", - "localisation": { - "required": true, - "prefix": "TENANT_TENANTS", - "module": "rainmaker-common" - } - } - ] - } - ] - } - ] - } - ] - } -} diff --git a/configs/pdf-service/data-config/ws-applicationwater.json b/configs/pdf-service/data-config/ws-applicationwater.json deleted file mode 100644 index d9b5f9a2..00000000 --- a/configs/pdf-service/data-config/ws-applicationwater.json +++ /dev/null @@ -1,1112 +0,0 @@ -{ - "key": "ws-applicationwater", - "DataConfigs": { - "serviceName": "rainmaker-common", - "version": "1.0.0", - "baseKeyPath": "$.WaterConnection.*", - "entityIdPath": "$.applicationNo", - "isCommonTableBorderRequired": true, - "mappings": [ - { - "topic": "common-pdf-generation-3", - "mappings": [ - { - "direct": [ - { - "variable": "applicationNo", - "value": { - "path": "$.applicationNo" - } - }, - { - "variable": "status", - "value": { - "path": "$.status" - } - }, - { - "variable": "totalAmount", - "value": { - "path": "$.totalAmount" - } - }, - { - "variable": "propertyId", - "value": { - "path": "$.property.propertyId" - } - }, - { - "variable": "propertyType", - "value": { - "path": "$.property.propertyType" - }, - "localisation": { - "required": true, - "prefix": "WS_PROPTYPE", - "module": "rainmaker-ws" - } - }, - { - "variable": "propertyUsageType", - "value": { - "path": "$.property.usageCategory" - }, - "localisation": { - "required": true, - "prefix": "WS_PROPUSGTYPE", - "module": "rainmaker-ws" - } - }, - { - "variable": "propertyUsageSubType", - "value": { - "path": "$.property.propertySubUsageType" - }, - "localisation": { - "required": true, - "prefix": "WS_PROPSUBUSGTYPE", - "module": "rainmaker-ws" - } - }, - { - "variable": "plotSize", - "value": { - "path": "$.property.landArea" - } - }, - { - "variable": "noOfFloor", - "value": { - "path": "$.property.noOfFloors" - } - }, - { - "variable": "rainwaterHarvestingFacility", - "value": { - "path": "$.property.rainWaterHarvesting" - }, - "localisation": { - "required": true, - "prefix": "HARVESTING", - "module": "rainmaker-common" - } - }, - { - "variable": "cityName", - "value": { - "path": "$.property.address.city" - } - }, - { - "variable": "doorHouseNo", - "value": { - "path": "$.property.address.doorNo" - } - }, - { - "variable": "buildingColonyName", - "value": { - "path": "$.property.address.buildingName" - } - }, - { - "variable": "streetName", - "value": { - "path": "$.property.address.street" - } - }, - { - "variable": "localityMohalla", - "value": { - "path": "$.property.address.locality.name" - } - }, - { - "variable": "pinCode", - "value": { - "path": "$.property.address.pincode" - } - }, - { - "variable": "variable13", - "value":{ - "path":"$.property.owners.*" - }, - "type":"array", - "format":{ - "type":"string", - "scema":[ - { - "variable": "ownerName", - "value": "name" - }, - { - "variable": "ownerEmailId", - "value":"emailId" - }, - { - "variable": "gender", - "value": "gender" - }, - { - "variable": "ownerDob", - "value": "dob", - "type":"date" - }, - { - "variable": "guardianName", - "value": "fatherOrHusbandName" - }, - { - "variable": "relationshipLabel", - "value": "relationship" - }, - { - "variable": "specialApplicantCategory", - "value": "ownerType" - }, - { - "variable": "correspondenceAddress", - "value": "correspondenceAddress" - } - ] - } - - }, - { - "variable": "applyCategory", - "value": { - "path": "$.service" - } - }, - { - "variable": "noOfTapsProposed", - "value": { - "path": "$.proposedTaps" - } - }, - { - "variable": "pipeSizeProposed", - "value": { - "path": "$.proposedPipeSize" - } - }, - { - "variable": "connectionType", - "value": { - "path": "$.connectionType" - } - }, - { - "variable": "plumberProvidedBy", - "value": { - "path": "$.additionalDetails.detailsProvidedBy" - } - }, - { - "variable": "plumberLicenceNo", - "value": { - "path": "$.plumberInfo[0].licenseNo" - } - }, - { - "variable": "plumberName", - "value": { - "path": "$.plumberInfo[0].name" - } - }, - { - "variable": "plumberMobileNo", - "value": { - "path": "$.plumberInfo[0].mobileNumber" - } - }, - { - "variable": "roadType", - "value": { - "path": "$.roadType" - } - }, - { - "variable": "area", - "value": { - "path": "$.roadCuttingArea" - } - }, - { - "variable": "connectionExecutionDate", - "value": { - "path": "$.connectionExecutionDate" - }, - "type": "date" - }, - { - "variable": "noOfTaps", - "value": { - "path": "$.noOfTaps" - } - }, - { - "variable": "waterSource", - "value": { - "path": "$.waterSource" - } - }, - { - "variable": "waterSubSource", - "value": { - "path": "$.waterSubSource" - } - }, - { - "variable": "pipeSize", - "value": { - "path": "$.pipeSize" - } - }, - { - "variable": "ownershipProof", - "value": { - "path": "$.pdfDocuments[?(@.title == 'WS_OWNER.ADDRESSPROOF')].name" - } - }, - { - "variable": "ownersIdProof", - "value": { - "path": "$.pdfDocuments[?(@.title == 'WS_OWNER.IDENTITYPROOF')].name" - } - }, - { - "variable": "electricityBill", - "value": { - "path": "$.pdfDocuments[?(@.title == 'WS_ELECTRICITY_BILL')].name" - } - }, - { - "variable": "plumberReport", - "value": { - "path": "$.pdfDocuments[?(@.title == 'WS_PLUMBER_REPORT_DRAWING')].name" - } - }, - { - "variable": "buildingPlan", - "value": { - "path": "$.pdfDocuments[?(@.title == 'WS_BUILDING_PLAN_OR_COMPLETION_CERTIFICATE')].name" - } - }, - { - "variable": "ptTaxReciept", - "value": { - "path": "$.pdfDocuments[?(@.title == 'WS_PROPERTY_TAX_RECIEPT')].name" - } - }, - { - "variable": "meterId", - "value": { - "path": "$.meterId" - } - }, - { - "variable": "meterInstallationDate", - "value": { - "path": "$.meterInstallationDate" - }, - "type": "date" - }, - { - "variable": "initialMeterReading", - "value": { - "path": "$.additionalDetails.initialMeterReading" - } - }, - { - "variable": "logoImage", - "url": "https://raw.githubusercontent.com/egovernments/egov-web-app/master/web/rainmaker/dev-packages/egov-ui-kit-dev/src/assets/images/pblogo.png", - "type": "image" - }, - { - "variable": "Municipal_Corporation", - "value": { - "path": "PDF_STATIC_LABEL_MDMS_MUNICIPAL_CORPORATION" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "logo_sub_header", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_LOGO_SUB_HEADER" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "application_no", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_APPLICATION_NO" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "status_label", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_STATUS" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "document_details_header", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_DOCUMENT_DETAIL_HEADER" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "total_amount", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_TOTAL_AMOUNT" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "total_amount", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_TOTAL_AMOUNT" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "property_details_header", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PROPERTY_DETAILS_HEADER" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "property_id", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PROPERTY_ID" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "property_type", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PROPERTY_TYPE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "property_usage_type", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PROPERTY_USAGE_TYPE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "property_usage_sub_type", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PROPERTY_USAGE_SUB_TYPE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "plot_size", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PLOT_SIZE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "no_of_floor", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_NO_OF_FLOOR" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "rainwater_harvesting_facility", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_RAINWATER_HARVESTING_FACILITY" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "property_location_details_header", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PROPERTY_LOCATION_HEADER" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "city", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_CITY" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "door_house_no", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_DOOR_HOUSE_NO" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "building_colony_name", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_BUILDING" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "street_name", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_STREETNAME" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "locality_mohalla", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_LOCALITY" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "pin_code", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PINCODE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "property_owner_details_header", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_OWNER_DETAILS_HEADER" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "owner_name", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_OWNER_NAME" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "email_label", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_EMAIL" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "gender_label", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_GENDER" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "dob_label", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_DOB" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "guardian_name", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_GUARDIAN_NAME" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "relationship_label", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_RELATIONSHIP" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "special_applicant_category", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_SPECIAL_APPLICANT_CATEGORY" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "connection_details_header", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_CONNECTION_DETAILS_HEADER" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "apply_category", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_APPLY_CATEGORY" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "additional_connection_details_header", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ADDITIONAL_CONNECTION_HEADER" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "connection_type", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_CONNECTION_TYPE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "plumber_details_header", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PLUMBER_DETAILS_HEADER" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "plumber_provided_by", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PLUMBER_PROVIDED_BY" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "plumber_licence_no", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PLUMBER_LICENSE_NO" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "plumber_name", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PLUMBER_NAME" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "plumber_mobile_no", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PLUMBER_MOBILE_NO" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "road_charges_header", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ROAD_CHARGES_HEADER" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "road_type", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ROAD_TYPE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "area_label", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_AREA_LABEL" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "activation_details_header", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ACTIVATION_DETAILS_HEADER" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "connection_execution_date", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_CONNECTION_EXECUTION_DATE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "no_of_taps_proposed", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_TAPS_PROPOSED" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "pipe_size_proposed", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PIPE_SIZE_PROPOSED" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "no_of_taps", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_NO_OF_TAPS" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "water_source", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_WATER_SOURCE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "water_sub_source", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_WATER_SUB_SOURCE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "pipe_size", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PIPE_SIZE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "ownership_proof", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_OWNERSHIP_PROOF" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "owners_id_proof", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_OWNERS_ID_PROOF" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "electricty_bill", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ELECTRICITY_BILL" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "plumber_report", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PLUMBER_REPORT" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "building_plan", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_BUILDING_PLAN" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "property_tax_reciept", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PROPERTY_TAX_RECEIPT" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "meter_id", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_METER_ID" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "meter_installation_date", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_METER_INSTALLATION" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "initial_meter_reading", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_INITIAL_METER_READING" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "water_application", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_WATER_APPLICATION" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "correspondence_address", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_CORRESPONDENCE_ADDRESS" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "Rs", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_RUPEE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "footerLogoImage", - "url": "https://pb-egov-assets.s3.ap-south-1.amazonaws.com/mseva-logo-colored.png", - "type": "image" - } - ] - }, - { - "externalAPI": [ - { - "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", - "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.property.tenantId}')%5D", - "apiRequest": null, - "responseMapping": [ - { - "variable": "logoImage", - "value": "$.MdmsRes.tenant.tenants[0].logoId", - "type": "image" - }, - { - "variable":"mcGrade", - "value":"$.MdmsRes.tenant.tenants[0].city.pwssbGrade" - }, - { - "variable": "logo_header", - "value": "$.MdmsRes.tenant.tenants[0].code", - "localisation": { - "required": true, - "prefix": "TENANT_TENANTS", - "module": "rainmaker-common" - } - } - ] - } - ] - } - ] - } - ] - } -} diff --git a/configs/pdf-service/data-config/ws-bill.json b/configs/pdf-service/data-config/ws-bill.json deleted file mode 100644 index 3f6d0a77..00000000 --- a/configs/pdf-service/data-config/ws-bill.json +++ /dev/null @@ -1,848 +0,0 @@ -{ - "key": "ws-bill", - "DataConfigs": { - "serviceName": "rainmaker-common", - "version": "1.0.0", - "baseKeyPath": "$.Bill.*", - "entityIdPath": "$.billNumber", - "isCommonTableBorderRequired": true, - "mappings": [ - { - "topic": "common-pdf-generation-1", - "staticConfigPath": "https://raw.githubusercontent.com/egovernments/egov-services/vishal-feature-filestore/core/egov-indexer/src/main/resources/rainmaker-pgr-indexer.yml", - "mappings": [ - { - "direct": [ - { - "variable": "total_amount_due", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_TOTAL_AMOUNT_DUE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "payer_name", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PAYER_NAME" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "Municipal_Corporation", - "value": { - "path": "PDF_STATIC_LABEL_MDMS_MUNICIPAL_CORPORATION" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "bill_no", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_BILL_NO" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "Rs", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_RUPEE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "mobile_no", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_MOBILE_NO" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "bill_period", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_BILL_PERIOD" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "payer_address", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PAYER_ADDRESS" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "bill_issue_date", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ISSUE_DATE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "bill_due_date", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_BILL_DUE_DATE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "billing_summary_property_tax", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_BILLING_SUMMARY" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "serviceType", - "value": { - "path": "$.businessService" - }, - "localisation": { - "required": true, - "prefix": "MODULE", - "module": "rainmaker-common" - } - }, - { - "variable": "property_id", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PROPERTY_ID" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "arrears_label", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ARREARS" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "advanceAdjusted_label", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ADVANCEADJUSTED" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "advanceAvailable_label", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ADVANCEAVAILABLE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "charge_label", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_CHARGE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "penalty_label", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PENALTY" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "rebate_label", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_REBATE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "others_label", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_OTHERS" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "total_label", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_TOTAL" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "important_message", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_IMPORTANT_MESSAGE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "payment_received", - "value": { - "path": "PDF_STATIC_LABEL_WS_BILL_PAYMENT_RECEIVED" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-ws" - } - }, - { - "variable": "this_document", - "value": { - "path": "PDF_STATIC_LABEL_WS_BILL_THIS_DOCUMENT" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-ws" - } - }, - { - "variable": "this_is_a", - "value": { - "path": "PDF_STATIC_LABEL_WS_BILL_THIS_IS" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-ws" - } - }, - { - "variable": "assessment_payment", - "value": { - "path": "PDF_STATIC_LABEL_WS_BILL_ASSESSSMENT_PAYMENT" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-ws" - } - }, - { - "variable": "please_deposit", - "value": { - "path": "PDF_STATIC_LABEL_WS_BILL_PLEASE_DEPOSIT" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-ws" - } - }, - { - "variable": "if_the_tax", - "value": { - "path": "PDF_STATIC_LABEL_WS_BILL_IF_THE_TAX" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-ws" - } - }, - { - "variable": "acknowledgement_for", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ACKNOWLEDGEMENT" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "date_label", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_DATE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "consumer_id", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_CONSUMER_ID" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "consumer_no", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_CONSUMER_NO" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "name_address", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_NAME_ADDRESS" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "total_payment", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_TOTAL_PAYMENT" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "receivers_signature", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_RECEIVERS_SIGNATURE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "totalAmountDue", - "value": { - "path": "$.totalAmount" - } - }, - { - "variable": "total", - "value": { - "path": "$.totalAmount" - } - }, - { - "variable": "payerName", - "value": { - "path": "$.payerName" - } - }, - { - "variable": "mobileNo", - "value": { - "path": "$.mobileNumber" - } - }, - { - "variable": "oldConnectionNo", - "value": { - "path": "$.connection.oldConnectionNo" - } - }, { - "variable": "rate", - "value": { - "path": "$.additionalDetails.penaltyRate" - } - }, - { - "variable": "ledgerId", - "value": { - "path": "$.connection.additionalDetails.ledgerId" - } - }, - { - "variable": "payerAddress", - "value": { - "path": "$.payerAddress" - } - }, - { - "variable": "tenant", - "value": { - "path": "$.tenantId" - } - }, - { - "variable": "nameAddress", - "value": { - "path": "$.payerAddress" - } - }, - { - "variable": "billNo", - "value": { - "path": "$.billNumber" - } - }, - { - "variable": "fromPeriod", - "value": { - "path": "$.billDetails[0].fromPeriod" - }, - "type": "date" - }, - { - "variable": "toPeriod", - "value": { - "path": "$.billDetails[0].toPeriod" - }, - "type": "date" - }, - { - "variable": "billIssueDate", - "value": { - "path": "$.billDate" - }, - "type": "date" - }, - { - "variable": "billDueDate", - "value": { - "path": "$.billDetails[0].expiryDate" - }, - "type": "date" - }, - { - "variable": "billdate", - "value": { - "path": "$.billDate" - }, - "type": "date" - }, - { - "variable": "consumerCode", - "value": { - "path": "$.consumerCode" - } - }, - { - "variable": "taxCharge", - "value": { - "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_TAX' || @.taxHeadCode == 'TL_TAX' || @.taxHeadCode == 'FIRENOC_TAXES' || @.taxHeadCode == 'WS_CHARGE' || @.taxHeadCode == 'SW_CHARGE' )].amount" - } - }, - { - "variable": "timeRebate", - "value": { - "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_TIME_REBATE' || @.taxHeadCode == 'WS_TIME_REBATE' || @.taxHeadCode == 'SW_TIME_REBATE')].amount" - } - }, - { - "variable": "adhocRebate", - "value": { - "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_ADHOC_REBATE' || @.taxHeadCode == 'TL_ADHOC_REBATE' || @.taxHeadCode == 'FIRENOC_ADHOC_REBATE')].amount" - } - }, - { - "variable": "timePenalty", - "value": { - "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_TIME_PENALTY' || @.taxHeadCode == 'WS_TIME_PENALTY' || @.taxHeadCode == 'SW_TIME_PENALTY')].amount" - } - }, - { - "variable": "adhocPenalty", - "value": { - "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_ADHOC_PENALTY' || @.taxHeadCode == 'TL_ADHOC_PENALTY' || @.taxHeadCode == 'FIRENOC_ADHOC_PENALTY')].amount" - } - }, - { - "variable": "firecess", - "value": { - "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_FIRE_CESS')].amount" - } - }, - { - "variable": "usageExemption", - "value": { - "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_UNIT_USAGE_EXEMPTION')].amount" - } - }, - { - "variable": "roundoff", - "value": { - "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_ROUNDOFF' || @.taxHeadCode == 'TL_ROUNDOFF' || @.taxHeadCode == 'FIRENOC_ROUNDOFF' || @.taxHeadCode == 'WS_Round_Off' || @.taxHeadCode == 'SW_Round_Off')].amount" - } - }, - { - "variable": "fees", - "value": { - "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'FIRENOC_FEES')].amount" - } - }, - { - "variable": "ownerExemption", - "value": { - "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_OWNER_EXEMPTION')].amount" - } - }, - { - "variable": "cancerCess", - "value": { - "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_CANCER_CESS')].amount" - } - }, - { - "variable": "waterCess", - "value": { - "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'WS_WATER_CESS' || @.taxHeadCode == 'SW_SEWERAGE_CESS')].amount" - } - }, - { - "variable": "timeInterest", - "value": { - "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_TIME_INTEREST' || @.taxHeadCode == 'WS_TIME_INTEREST' || @.taxHeadCode == 'SW_TIME_INTEREST')].amount" - } - }, - { - "variable": "ceilingDebit", - "value": { - "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_DECIMAL_CEILING_DEBIT')].amount" - } - }, - { - "variable": "ceilingCredit", - "value": { - "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_DECIMAL_CEILING_CREDIT')].amount" - } - }, - { - "variable": "carryForward", - "value": { - "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'WS_ADVANCE_CARRYFORWARD' || @.taxHeadCode == 'SW_ADVANCE_CARRYFORWARD')].amount" - } - }, - { - "variable": "consumerID", - "value": { - "path": "$.consumerCode" - } - }, - { - "variable": "date", - "value": { - "path": "$.billDate" - }, - "type": "date" - }, - { - "variable": "totalPayment", - "value": { - "path": "$.billDetails[0].amountPaid" - } - }, - { - "variable": "WS_arrears", - "value": { - "path": "$.arrearAmount" - } - }, - { - "variable": "WS_AdvanceAdjusted", - "value": { - "path": "$.AdvanceAdjustedValue" - } - }, - { - "variable": "scissorImage", - "url": "http://www.pngall.com/wp-content/uploads/2016/03/Scissor-PNG-Clipart.png", - "type": "image" - }, - { - "variable": "footerLogoImage", - "url": "https://uat.digit.org/pg-egov-assets/mseva-logo-colored.png", - "type": "image" - } - ] - }, - { - "derived": [ - { - "variable": "charge", - "formula": "{{ws_charge}}" - }, - { - "variable": "penalty", - "formula": "{{timePenalty}}+{{adhocPenalty}}" - }, - { - "variable": "rebate", - "formula": "{{timeRebate}}+{{adhocRebate}}" - }, - { - "variable": "billOthers", - "formula": "{{cancerCess}}+{{roundoff}}+{{timeInterest}}+{{ceilingDebit}}+{{ceilingCredit}}+{{firecess}}+{{waterCess}}" - }, - { - "variable": "demandTotalAmount", - "formula": "{{ws_roundoff}}+{{ws_charge}}+{{ws_water_cess}}+{{ws_time_interest}}+{{ws_time_penalty}}" - }, - { - "variable": "billTotalAmount", - "formula": "{{total}}" - }, - { - "variable": "arrears", - "formula": "{{billTotalAmount}}>{{demandTotalAmount}}?({{billTotalAmount}}-{{demandTotalAmount}}).toFixed(2):0" - }, - { - "variable": "advanceAdjusted", - "formula": "{{billTotalAmount}}>=0?({{billTotalAmount}}<{{demandTotalAmount}}?({{billTotalAmount}}-{{demandTotalAmount}}).toFixed(2):0):{{demandTotalAmount}} * -1" - }, - { - "variable": "advanceAvailable", - "formula": "{{billTotalAmount}}<0?{{billTotalAmount}}*-1:0" - }, - { - "variable": "others", - "formula": "({{ws_roundoff}}+{{ws_water_cess}}+{{ws_time_interest}}).toFixed(2)" - }, - { - "variable": "calculatedTotal", - "formula": "{{billTotalAmount}}>0?{{billTotalAmount}}:0" - } - ] - }, - { - "externalAPI": [ - { - "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", - "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", - "apiRequest": null, - "responseMapping": [ - { - "variable": "address", - "value": "$.MdmsRes.tenant.tenants[0].address" - }, - { - "variable": "phoneNumber", - "value": "$.MdmsRes.tenant.tenants[0].contactNumber" - }, { - "variable":"mcGrade", - "value":"$.MdmsRes.tenant.tenants[0].city.pwssbGrade" - }, - { - "variable": "website", - "value": "$.MdmsRes.tenant.tenants[0].domainUrl" - }, - { - "variable": "email", - "value": "$.MdmsRes.tenant.tenants[0].emailId" - }, - { - "variable": "logoImage", - "value": "$.MdmsRes.tenant.tenants[0].logoId", - "type": "image" - }, - { - "variable": "logo_header", - "value": "$.MdmsRes.tenant.tenants[0].code", - "localisation": { - "required": true, - "prefix": "TENANT_TENANTS", - "module": "rainmaker-common" - } - } - ] - }, - { - "path": "http://billing-service:8080/billing-service/demand/_search", - "queryParam": "tenantId=$.tenantId,consumerCode=$.consumerCode,businessService=WS", - "apiRequest": null, - "responseMapping": [ - { - "variable": "ws_advanceAmount", - "value": "$.Demands[(@.length-1)].demandDetails[?(@.taxHeadMasterCode == 'WS_ADVANCE_CARRYFORWARD')].taxAmount" - }, - { - "variable": "ws_roundoff", - "value": "$.Demands[(@.length-1)].demandDetails[?(@.taxHeadMasterCode == 'WS_Round_Off')].taxAmount" - }, - { - "variable": "ws_charge", - "value": "$.Demands[(@.length-1)].demandDetails[?(@.taxHeadMasterCode == 'WS_CHARGE')].taxAmount" - }, - { - "variable": "ws_water_cess", - "value": "$.Demands[(@.length-1)].demandDetails[?(@.taxHeadMasterCode == 'WS_WATER_CESS')].taxAmount" - }, - { - "variable": "ws_time_interest", - "value": "$.Demands[(@.length-1)].demandDetails[?(@.taxHeadMasterCode == 'WS_TIME_INTEREST')].taxAmount" - }, - { - "variable": "ws_time_penalty", - "value": "$.Demands[(@.length-1)].demandDetails[?(@.taxHeadMasterCode == 'WS_TIME_PENALTY')].taxAmount" - } - ] - }, - { - "path": "http://property-services.egov:8080/property-services/property/_search", - "queryParam": "tenantId=$.tenantId,propertyIds=$.connection.propertyId", - "apiRequest": null, - "responseMapping": [ - { - "variable": "usageType", - "value": "$.Properties[0].usageCategory" - }, - { - "variable": "plotSize", - "value": "$.Properties[0].landArea" - }, - { - "variable": "houseNo", - "value": "$.Properties[0].address.doorNo" - }, - { - "variable": "streetName", - "value": "$.Properties[0].address.street" - }, - { - "variable": "locality", - "value": "$.Properties[0].address.locality.name" - }, - { - "variable": "landmark", - "value": "$.Properties[0].address.landmark" - }, - { - "variable": "ownerName", - "value": "$.Properties[0].owners[0].name" - }, - { - "variable": "guardianName", - "value": "$.Properties[0].owners[0].fatherOrHusbandName" - } - - - ] - } - ] - } - ] - } - ] - } -} diff --git a/configs/pdf-service/data-config/ws-consolidatedacknowlegment.json b/configs/pdf-service/data-config/ws-consolidatedacknowlegment.json deleted file mode 100644 index 0a011572..00000000 --- a/configs/pdf-service/data-config/ws-consolidatedacknowlegment.json +++ /dev/null @@ -1,694 +0,0 @@ -{ - "key": "ws-consolidatedacknowlegment", - "DataConfigs": { - "serviceName": "rainmaker-common", - "version": "1.0.0", - "baseKeyPath": "$.WaterConnection.*", - "entityIdPath": "$.connectionNo", - "isCommonTableBorderRequired": true, - "mappings": [ - { - "topic": "common-pdf-generation-3", - "mappings": [ - { - "direct": [ - { - "variable": "consumerNo", - "value": { - "path": "$.connectionNo" - } - }, - { - "variable": "status", - "value": { - "path": "$.status" - } - }, - { - "variable": "connectionCategory", - "value": { - "path": "$.connectionCategory" - } - }, - { - "variable": "connectionType", - "value": { - "path": "$.connectionType" - } - }, - { - "variable": "meterID", - "value": { - "path": "$.meterId" - } - }, - { - "variable": "pipeSize", - "value": { - "path": "$.pipeSize" - } - }, - { - "variable": "connectionExecutionDate", - "value": { - "path": "$.connectionExecutionDate" - }, - "type": "date" - }, - { - "variable": "rainwaterHarvestingFacility", - "value": { - "path": "$.rainWaterHarvesting" - }, - "localisation": { - "required": true, - "prefix": "HARVESTING", - "module": "rainmaker-common" - } - }, - { - "variable": "waterSource", - "value": { - "path": "$.waterSource" - } - }, - { - "variable": "waterSubSource", - "value": { - "path": "$.waterSubSource" - } - }, - { - "variable": "propertyType", - "value": { - "path": "$.property.propertyType" - }, - "localisation": { - "required": true, - "prefix": "WS_PROPTYPE", - "module": "rainmaker-ws" - } - }, - { - "variable": "propertyUsageType", - "value": { - "path": "$.property.usageCategory" - }, - "localisation": { - "required": true, - "prefix": "WS_PROPUSGTYPE", - "module": "rainmaker-ws" - } - }, - { - "variable": "plotSize", - "value": { - "path": "$.property.landArea" - } - }, - { - "variable": "propertyID", - "value": { - "path": "$.property.propertyId" - } - }, - { - "variable": "city", - "value": { - "path": "$.property.address.city" - } - }, - { - "variable": "plot", - "value": { - "path": "$.property.address.doorNo" - } - }, - { - "variable": "building", - "value": { - "path": "$.property.address.buildingName" - } - }, - { - "variable": "streetName", - "value": { - "path": "$.property.address.street" - } - }, - { - "variable": "locality", - "value": { - "path": "$.property.address.locality.name" - } - }, - { - "variable": "pincode", - "value": { - "path": "$.property.address.pincode" - } - }, - { - "variable": "lat", - "value": { - "path": "$.property.address.locality.latitude" - } - }, - { - "variable": "long", - "value": { - "path": "$.property.address.locality.longitude" - } - }, - { - "variable": "ownerName", - "value": { - "path": "$.property.owners[0].name" - } - }, - { - "variable": "ownerMobileNumber", - "value": { - "path": "$.property.owners[0].mobileNumber" - } - }, - { - "variable": "gender", - "value": { - "path": "$.property.owners[0].gender" - }, - "localisation": { - "required": true, - "prefix": "COMMON_GENDER", - "module": "rainmaker-common" - } - }, - { - "variable": "guardian", - "value": { - "path": "$.property.owners[0].relationship" - } - }, - { - "variable": "guardianName", - "value": { - "path": "$.property.owners[0].fatherOrHusbandName" - } - }, - { - "variable": "ownerCategory", - "value": { - "path": "$.property.ownershipCategory" - }, - "localisation": { - "required": true, - "prefix": "WS_OWNERSHIPCATEGORY", - "module": "rainmaker-ws" - } - }, - { - "variable": "email", - "value": { - "path": "$.property.owners[0].emailId" - } - }, - { - "variable": "correspondenceAddress", - "value": { - "path": "$.property.owners[0].correspondenceAddress" - } - }, - { - "variable": "Municipal_Corporation", - "value": { - "path": "PDF_STATIC_LABEL_MDMS_MUNICIPAL_CORPORATION" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "logo_sub_header", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_LOGO_SUB_HEADER" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "consumer_no", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_CONSUMER_NO" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "status_label", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_STATUS" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "service_details_header", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_SERVICE_DETAILS_HEADER" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "service", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_SERVICE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "connection_category", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_CONNECTION_CAT" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "connection_type", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_CONNECTION_TYPE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "meter_id", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_METER_ID" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "pipe_size", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PIPE_SIZE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "connection_execution_date", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_CONNECTION_EXECUTION_DATE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "rainwater_harvesting_facility", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_RAIN_HARV_FAC" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "water_source", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_WATER_SOURCE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "water_sub_source", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_WATER_SUB_SOURCE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "property_details_header", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PROPERTY_DETAILS_HEADER" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "property_type", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PROPERTY_TYPE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "property_usage_type", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PROPERTY_USAGE_TYPE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "plot_size", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PLOT_SIZE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "property_ID", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PROPERTY_ID" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "city_label", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_CITY" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "plot_label", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PLOT" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "building_label", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_BUILDING" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "street_name", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_STREET" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "locality_label", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_LOCALITY" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "pincode_label", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PINCODE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "location_on_map", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_LOCATION_ON_MAP" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "owner_details_header", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_OWNER_DETAILS_HEADER" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "owner_name", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_OWNER_NAME" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "owner_mobile_number", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_OWNER_MOB_NUM" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "gender_label", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_GENDER" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "guardian_label", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_GUARDIAN" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "guardian_name", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_GUARDIAN_NAME" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "owner_category", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_OWNER_CATEGORY" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "email_label", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_EMAIL" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "correspondence_address", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_CORR_ADDRESS" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "water_label", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_WATER" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "footerLogoImage", - "url": "https://uat.digit.org/pg-egov-assets/mseva-logo-colored.png", - "type": "image" - } - ] - }, - { - "externalAPI": [ - { - "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", - "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.property.tenantId}')%5D", - "apiRequest": null, - "responseMapping":[ - { - "variable": "logoImage", - "value":"$.MdmsRes.tenant.tenants[0].logoId", - "type": "image" - }, - { - "variable":"mcGrade", - "value":"$.MdmsRes.tenant.tenants[0].city.pwssbGrade" - }, - - { - "variable": "logo_header", - "value":"$.MdmsRes.tenant.tenants[0].code", - "localisation":{ - "required":true, - "prefix": "TENANT_TENANTS", - "module":"rainmaker-common" - } - } - ] - } - ] - } - ] - } - ] - } -} diff --git a/configs/pdf-service/data-config/ws-consolidatedsewerageconnection.json b/configs/pdf-service/data-config/ws-consolidatedsewerageconnection.json deleted file mode 100644 index 2f630eef..00000000 --- a/configs/pdf-service/data-config/ws-consolidatedsewerageconnection.json +++ /dev/null @@ -1,580 +0,0 @@ -{ - "key": "ws-consolidatedsewerageconnection", - "DataConfigs": { - "serviceName": "rainmaker-common", - "version": "1.0.0", - "baseKeyPath": "$.SewerageConnections.*", - "entityIdPath": "$.connectionNo", - "isCommonTableBorderRequired": true, - "mappings": [ - { - "topic": "common-pdf-generation-3", - "mappings": [ - { - "direct": [ - { - "variable": "consumerNo", - "value": { - "path": "$.connectionNo" - } - }, - { - "variable": "status", - "value": { - "path": "$.status" - } - }, - { - "variable": "connectionExecutionDate", - "value": { - "path": "$.connectionExecutionDate" - }, - "type": "date" - }, - { - "variable": "uom", - "value": { - "path": "$.uom" - } - }, - { - "variable": "propertyType", - "value": { - "path": "$.property.propertyType" - }, - "localisation": { - "required": true, - "prefix": "WS_PROPTYPE", - "module": "rainmaker-ws" - } - }, - { - "variable": "propertyUsageType", - "value": { - "path": "$.property.usageCategory" - }, - "localisation": { - "required": true, - "prefix": "WS_PROPUSGTYPE", - "module": "rainmaker-ws" - } - }, - { - "variable": "plotSize", - "value": { - "path": "$.property.landArea" - } - }, - { - "variable": "propertyID", - "value": { - "path": "$.property.propertyId" - } - }, - { - "variable": "city", - "value": { - "path": "$.property.address.city" - } - }, - { - "variable": "plot", - "value": { - "path": "$.property.address.doorNo" - } - }, - { - "variable": "building", - "value": { - "path": "$.property.address.buildingName" - } - }, - { - "variable": "streetName", - "value": { - "path": "$.property.address.street" - } - }, - { - "variable": "locality", - "value": { - "path": "$.property.address.locality.name" - } - }, - { - "variable": "pincode", - "value": { - "path": "$.property.address.pincode" - } - }, - { - "variable": "lat", - "value": { - "path": "$.WaterConnection[0].property.address.locality.latitude" - } - }, - { - "variable": "long", - "value": { - "path": "$.WaterConnection[0].property.address.locality.longitude" - } - }, - { - "variable": "ownerName", - "value": { - "path": "$.property.owners[0].name" - } - }, - { - "variable": "ownerMobileNumber", - "value": { - "path": "$.property.owners[0].mobileNumber" - } - }, - { - "variable": "gender", - "value": { - "path": "$.property.owners[0].gender" - } - }, - { - "variable": "guardian", - "value": { - "path": "$.property.owners[0].relationship" - } - }, - { - "variable": "guardianName", - "value": { - "path": "$.property.owners[0].fatherOrHusbandName" - } - }, - { - "variable": "ownerCategory", - "value": { - "path": "$.property.ownershipCategory" - }, - "localisation": { - "required": true, - "prefix": "WS_OWNERSHIPCATEGORY", - "module": "rainmaker-ws" - } - }, - { - "variable": "email", - "value": { - "path": "$.property.owners[0].emailId" - } - }, - { - "variable": "correspondenceAddress", - "value": { - "path": "$.property.owners[0].correspondenceAddress" - } - }, - { - "variable": "logoImage", - "url": "https://raw.githubusercontent.com/egovernments/egov-web-app/master/web/rainmaker/dev-packages/egov-ui-kit-dev/src/assets/images/pblogo.png", - "type": "image" - }, - { - "variable": "Municipal_Corporation", - "value": { - "path": "PDF_STATIC_LABEL_MDMS_MUNICIPAL_CORPORATION" - }, - "type": "label", - "localisation":{ - "required":true, - "prefix": null, - "module":"rainmaker-common" - } - }, - { - "variable": "logo_sub_header", - "value": { - "path": "PDF_STATIC_LABEL_SW_CONSOLIDATED_ACKNOWELDGMENT_LOGO_SUB_HEADER" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "consumer_no", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_CONSUMER_NO" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "status_label", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_STATUS" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "service_details_header", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_SERVICE_DETAILS_HEADER" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "service", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_SERVICE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "connection_execution_date", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_CONNECTION_EXECUTION_DATE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "unit_of_measurement", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_UNIT_OF_MEASUREMENT" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "property_details_header", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PROPERTY_DETAILS_HEADER" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "property_type", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PROPERTY_TYPE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "property_usage_type", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PROPERTY_USAGE_TYPE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "plot_size", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PLOT_SIZE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "property_ID", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PROPERTY_ID" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "city_label", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_CITY" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "plot_label", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PLOT" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "building_label", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_BUILDING" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "street_name", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_STREET" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "locality_label", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_LOCALITY" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "pincode_label", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PINCODE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "location_on_map", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_LOCATION_ON_MAP" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "owner_details_header", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_OWNER_DETAILS_HEADER" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "owner_name", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_OWNER_NAME" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "owner_mobile_number", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_OWNER_MOB_NUM" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "gender_label", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_GENDER" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "guardian_label", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_GUARDIAN" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "guardian_name", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_GUARDIAN_NAME" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "owner_category", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_OWNER_CATEGORY" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "email_label", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_EMAIL" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "correspondence_address", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_CORR_ADDRESS" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "sewarage_label", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_SEWERAGE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "footerLogoImage", - "url": "https://uat.digit.org/pg-egov-assets/mseva-logo-colored.png", - "type": "image" - } - ] - }, - { - "externalAPI": [ - { - "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", - "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.property.tenantId}')%5D", - "apiRequest": null, - "responseMapping":[ - { - "variable": "logoImage", - "value":"$.MdmsRes.tenant.tenants[0].logoId", - "type": "image" - }, - { - "variable":"mcGrade", - "value":"$.MdmsRes.tenant.tenants[0].city.pwssbGrade" - }, - { - "variable": "logo_header", - "value":"$.MdmsRes.tenant.tenants[0].code", - "localisation":{ - "required":true, - "prefix": "TENANT_TENANTS", - "module":"rainmaker-common" - } - } - ] - } - ] - } - ] - } - ] - } -} diff --git a/configs/pdf-service/data-config/ws-estimationnotice.json b/configs/pdf-service/data-config/ws-estimationnotice.json deleted file mode 100644 index 506e751f..00000000 --- a/configs/pdf-service/data-config/ws-estimationnotice.json +++ /dev/null @@ -1,537 +0,0 @@ -{ - "key": "ws-estimationnotice", - "DataConfigs": { - "serviceName": "rainmaker-common", - "version": "1.0.0", - "baseKeyPath": "$.WnsConnection.*", - "entityIdPath": "$.applicationNo", - "isCommonTableBorderRequired": true, - "mappings": [ - { - "topic": "common-pdf-generation-3", - "mappings": [ - { - "direct": [ - { - "variable": "appNo", - "value": { - "path": "$.applicationNo" - } - }, - { - "variable": "appDate", - "value": { - "path": "$.connectionExecutionDate" - }, - "type":"date" - }, - { - "variable": "name", - "value": { - "path": "$.property.owners[0].name" - } - }, - { - "variable": "guardianName", - "value": { - "path": "$.property.owners[0].fatherOrHusbandName" - } - }, - { - "variable": "usageType", - "value": { - "path": "$.property.usageCategory" - }, - "localisation":{ - "required":true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "houseNo", - "value": { - "path": "$.property.address.doorNo" - } - }, - { - "variable": "mobileNumber", - "value": { - "path": "$.property.owners[0].mobileNumber" - } - }, - { - "variable": "address", - "value": { - "path": "$.property.address.locality.name" - } - }, - { - "variable": "pincode", - "value": { - "path": "$.property.address.pincode" - } - }, - { - "variable": "formFee", - "value": { - "path": "$.pdfTaxhead[?(@.taxHeadCode == 'FORM_FEE')].estimateAmount" - } - }, - { - "variable": "ScrutinyFee", - "value": { - "path": "$.pdfTaxhead[?(@.taxHeadCode == 'SCRUTINY_FEE')].estimateAmount" - } - }, - { - "variable": "otherCharge", - "value": { - "path": "$.pdfTaxhead[?(@.taxHeadCode == 'OTHER_FEE')].estimateAmount" - } - }, - { - "variable": "securityCharge", - "value": { - "path": "$.pdfTaxhead[?(@.taxHeadCode == 'SECURITY_DEPOSIT')].estimateAmount" - } - }, - { - "variable": "taxCess", - "value": { - "path": "$.pdfTaxhead[?(@.taxHeadCode == 'TAX_AND_CESS')].estimateAmount" - } - }, - { - "variable": "roadCharge", - "value": { - "path": "$.pdfTaxhead[?(@.taxHeadCode == 'ROAD_CUTTING_CHARGE')].estimateAmount" - } - }, - { - "variable": "oneTimeFee", - "value": { - "path": "$.pdfTaxhead[?(@.taxHeadCode == 'ONE_TIME_FEE')].estimateAmount" - } - }, { - "variable": "connectionFee", - "value": { - "path": "$.pdfTaxhead[?(@.taxHeadCode == 'CONNECTION_FEE')].estimateAmount" - } - }, { - "variable": "compositionFee", - "value": { - "path": "$.pdfTaxhead[?(@.taxHeadCode == 'COMPOSITION_FEE')].estimateAmount" - } - },{ - "variable": "userCharges", - "value": { - "path": "$.pdfTaxhead[?(@.taxHeadCode == 'USER_CHARGE')].estimateAmount" - } - }, - { - "variable": "penaltyAmount", - "value": { - "path": "$.additionalDetails.adhocPenalty" - } - }, - { - "variable": "rebateAmount", - "value": { - "path": "$.additionalDetails.adhocRebate" - } - }, - { - "variable": "penaltyComments", - "value": { - "path": "$.additionalDetails.adhocPenaltyComment" - } - }, - { - "variable": "totalAmount", - "value": { - "path": "$.totalAmount" - } - }, - { - "variable": "service", - "value": { - "path": "$.service" - } - }, - { - "variable": "tenantName", - "value": { - "path": "$.tenantName" - } - }, - { - "variable": "logoImage", - "url": "https://raw.githubusercontent.com/egovernments/egov-web-app/master/web/rainmaker/dev-packages/egov-ui-kit-dev/src/assets/images/pblogo.png", - "type": "image" - }, - { - "variable": "estimation_notice_header", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ESTIMATION_NOTICE_HEADER" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "UAT", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_UAT" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "connection_header", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_CONNECTION_HEADER" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "app_no", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_APPLICATION_NO" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "app_date", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_APP_DATE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "user_name", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_USER_NAME" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "guardian_name", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_GUARDIAN" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "usage_type", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_USAGE_TYPE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "mobile_no", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_MOBILE_NO" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "house_no", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_DOOR_HOUSE_NO" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "user_address", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ADDRESS" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "estimation_header", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ESTIMATION_HEADER" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "sl_no", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_SERIAL_NO" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "fee_estimate", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_FEES_ESTIMATE_HEADER" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "amount", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_AMOUNT" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "form_fee", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_FORM_FEE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "scrutiny_fee", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_SCRUTINY_FEE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "other_charge", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_OTHER_CHARGE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "security_charge", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_SECURITY_CHARGE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "tax_cess", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_TAX_CESS" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "penalty", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PENALTY" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "rebate", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_REBATE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "comments", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PENALTY_COMMENTS" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "grand_total", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_GRAND_TOTAL" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "approved_by", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_APPROVED_BY" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "one_time_fee", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ONE_TIME_FEE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "road_charge", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ROAD_CHARGE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "footerLogoImage", - "url": "https://pb-egov-assets.s3.ap-south-1.amazonaws.com/mseva-logo-colored.png", - "type": "image" - } - ] - }, - { - "externalAPI": [ - { - "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", - "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.property.tenantId}')%5D", - "apiRequest": null, - "responseMapping": [ - { - "variable": "logoImage", - "value": "$.MdmsRes.tenant.tenants[0].logoId", - "type": "image" - }, - { - "variable":"mcGrade", - "value":"$.MdmsRes.tenant.tenants[0].city.pwssbGrade" - }, - { - "variable": "logo_header", - "value": "$.MdmsRes.tenant.tenants[0].code", - "localisation": { - "required": true, - "prefix": "TENANT_TENANTS", - "module": "rainmaker-common" - } - } - ] - } - ] - } - ] - } - ] - } -} diff --git a/configs/pdf-service/data-config/ws-onetime-receipt.json b/configs/pdf-service/data-config/ws-onetime-receipt.json deleted file mode 100644 index 9502c79b..00000000 --- a/configs/pdf-service/data-config/ws-onetime-receipt.json +++ /dev/null @@ -1,563 +0,0 @@ -{ - "key": "ws-onetime-receipt", - "documentType": "CONSOLIDATED_RECEIPT", - "DataConfigs": { - "moduleName": "rainmaker-common", - "version": "1.0.0", - "baseKeyPath": "$.Payments.*", - "entityIdPath": "$.id", - "isCommonTableBorderRequired": true, - "mappings": [ - { - "topic": "common-pdf-generation-3", - "mappings": [ - { - "direct": [ - { - "variable": "payerName", - "value": { - "path": "$.payerName" - } - }, - { - "variable": "user-name", - "value": { - "path": "$.userInfo.name" - }, - "type": "selectFromRequestInfo" - }, - { - "variable": "payerContact", - "value": { - "path": "$.mobileNumber" - } - }, - { - "variable": "receiptNo", - "value": { - "path": "$.paymentDetails[0].receiptNumber" - } - }, - { - "variable": "serviceType", - "value": { - "path": "$.paymentDetails[0].businessService" - }, - "localisation": { - "required": true, - "prefix": "MODULE", - "module": "rainmaker-common" - } - }, - { - "variable": "serviceTypeTemp", - "value": { - "path": "$.paymentDetails[0].guardianName" - }, - "localisation": { - "required": true, - "prefix": "MODULE", - "module": "rainmaker-common" - } - }, - { - "variable": "propertyID", - "value": { - "path": "$.paymentDetails[0].propertyID" - }, - "localisation": { - "required": true, - "prefix": "MODULE", - "module": "rainmaker-common" - } - }, - { - "variable": "landMark", - "value": { - "path": "$.paymentDetails[0].landMark" - }, - "localisation": { - "required": true, - "prefix": "MODULE", - "module": "rainmaker-common" - } - }, - { - "variable": "communicationAddress", - "value": { - "path": "$.paymentDetails[0].communicationAddress" - }, - "localisation": { - "required": true, - "prefix": "MODULE", - "module": "rainmaker-common" - } - }, - { - "variable": "paidAmount", - "value": { - "path": "$.paymentDetails[0].totalAmountPaid" - } - }, - { - "variable": "fromPeriod", - "value": { - "path": "$.paymentDetails[0].bill.billDetails[0].fromPeriod" - }, - "type": "date" - }, - { - "variable": "toPeriod", - "value": { - "path": "$.paymentDetails[0].bill.billDetails[0].toPeriod" - }, - "type": "date" - }, - { - "variable": "paymentMode", - "value": { - "path": "$.paymentMode" - }, - "localisation": { - "required": true, - "prefix": "COMMON_MASTERS_PAYMENTMODE", - "module": "rainmaker-common" - } - }, - { - "variable": "paymentDate", - "value": { - "path": "$.transactionDate" - }, - "type": "date" - }, - { - "variable": "consumerID", - "value": { - "path": "$.paymentDetails[0].bill.consumerCode" - } - }, - { - "variable": "transactionID", - "value": { - "path": "$.transactionNumber" - } - }, - { - "variable": "chequeDD", - "value": { - "path": "$.instrumentNumber" - } - }, - { - "variable": "chequeDDDate", - "value": { - "path": "$.instrumentDate" - }, - "type":"date" - }, - { - "variable": "bankName", - "value": { - "path": "$.additionalDetails[0].bankName" - } - }, { - "variable": "branchName", - "value": { - "path": "$.additionalDetails[0].branchName" - } - }, { - "variable": "ifsc", - "value": { - "path": "$.ifscCode" - } - }, - { - "variable": "var_paymentheads", - "value":{ - "path":"$.paymentDetails[0].additionalDetails.*"}, - "type":"array", - "format":{ - "type":"string", - "scema":[ - { - "variable":"taxheaddd", - "value": "taxhead" - }, - { - "variable":"amountt", - "value": "amount" - }] - } - }, - { - "variable": "dueAmount", - "value": { - "path": "$.paymentDetails[0].totalDue" - } - }, - { - "variable": "payment_receipt", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_RECEIPT" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "receipt_no", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_RECEIPT_NO" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "consumer_id", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_CONSUMER_NO_APP" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "payment_date", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_DATE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "payer_name", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYER_NAME" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "payer_contact", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYER_CONTACT" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "service_type", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_SERVICE_TYPE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "billing_period", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_BILLING_PERIOD" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "paid_amount", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAID_AMOUNT" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "bill_amount", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_BILL_AMOUNT" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "advance_amount", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_ADVANCE_AMOUNT" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "pending_amount", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PENDING_AMOUNT" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "payment_mode", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_MODE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "transaction_id", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_TRANSACTION_ID" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - - { - "variable": "generated_by", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_GENERATED_BY" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "commissioner/eo", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_COMMISSIONER_EO" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "no_signature", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_NO_SIGNATURE_WATER" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "disclamer", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "disclamer_1", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_FIRST_LINE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "disclamer_2", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_SECOND_LINE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "disclamer_3", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_THIRD_LINE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "disclamer_4", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_FOURTH_LINE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "disclamer_5", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_FIFTH_LINE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "to", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_TO" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "Municipal_Corporation", - "value": { - "path": "PDF_STATIC_LABEL_MDMS_MUNICIPAL_CORPORATION" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - } - ] - }, - { - "derived": [ - { - "variable": "pendingAmount", - "formula": "{{paidAmount}}>{{dueAmount}}?0:{{dueAmount}}-{{paidAmount}}" - }, - { - "variable": "advanceAmount", - "formula": "{{paidAmount}}>{{dueAmount}}?{{paidAmount}}-{{dueAmount}}:0" - } - ] - }, - { - "externalAPI": [ - { - "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", - "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", - "apiRequest": null, - "responseMapping": [ - { - "variable": "address", - "value": "$.MdmsRes.tenant.tenants[0].address" - }, - { - "variable":"mcGrade", - "value":"$.MdmsRes.tenant.tenants[0].city.pwssbGrade" - }, - { - "variable": "phoneNumber", - "value": "$.MdmsRes.tenant.tenants[0].contactNumber" - }, - { - "variable": "website", - "value": "$.MdmsRes.tenant.tenants[0].domainUrl" - }, - { - "variable": "email", - "value": "$.MdmsRes.tenant.tenants[0].emailId" - }, - { - "variable": "logoImage", - "value": "$.MdmsRes.tenant.tenants[0].logoId", - "type": "image" - }, - { - "variable": "logo-header", - "value": "$.MdmsRes.tenant.tenants[0].code", - "localisation": { - "required": true, - "prefix": "TENANT_TENANTS", - "module": "rainmaker-common" - } - } - ] - } - ] - } - ] - } - ] - } -} diff --git a/configs/pdf-service/data-config/ws-sanctionletter.json b/configs/pdf-service/data-config/ws-sanctionletter.json deleted file mode 100644 index 7a70fb75..00000000 --- a/configs/pdf-service/data-config/ws-sanctionletter.json +++ /dev/null @@ -1,978 +0,0 @@ -{ - "key": "ws-sanctionletter", - "DataConfigs": { - "serviceName": "rainmaker-common", - "version": "1.0.0", - "baseKeyPath": "$.WnsConnection.*", - "entityIdPath": "$.applicationNo", - "isCommonTableBorderRequired": true, - "mappings": [ - { - "topic": "common-pdf-generation-3", - "mappings": [ - { - "direct": [ - { - "variable": "tenantName", - "value": { - "path": "$.tenantName" - } - }, - { - "variable": "logoImage", - "url": "https://raw.githubusercontent.com/egovernments/egov-web-app/master/web/rainmaker/dev-packages/egov-ui-kit-dev/src/assets/images/pblogo.png", - "type": "image" - }, - { - "variable": "municipalCouncil", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_SUNAM_DEV_MUNICIPAL_COUNCIL" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "door_no", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_DOOR_NO_LABEL" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "sanctionLetter", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_SANCTION_LETTER" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "dated", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_DATED_IN_LOWER_CASE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "order_message4", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_SEEKING_ESTIMATE_AMOUNT" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "order_message5", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_PREPARATION_NOTICE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "order_message6", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_SERVICE_PAYMENT" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "order_message7", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_SAID_PREMISES" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "order_message8", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_FURTHER" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "order_message9", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_CONNECTION_SANCTIONED" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "order_message10", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_PLUMBER_INFO" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "order_message11", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_BILLING_CYCLE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "estimation_notice_header", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ESTIMATION_NOTICE_HEADER" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "UAT", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_UAT" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "cityName", - "value": { - "path": "$.tenantName" - } - }, - { - "variable": "presentByName", - "value": { - "path": "$.commissionerName" - } - }, - { - "variable": "usageType", - "value": { - "path": "$.appUserType" - } - }, - { - "variable": "applicationNumber", - "value": { - "path": "$.applicationNo" - } - }, - { - "variable": "connectionExecutionDate", - "value": { - "path": "$.connectionExecutionDate" - }, - "type": "date" - }, - { - "variable": "applicationType", - "value": { - "path": "$.service" - } - }, - { - "variable": "service", - "value": { - "path": "$.service" - } - }, - { - "variable": "doorNo", - "value": { - "path": "$.property.address.doorNo" - } - }, - { - "variable": "locality", - "value": { - "path": "$.property.address.locality.name" - } - }, - { - "variable": "ownerName", - "value": { - "path": "$.property.owners[0].name" - } - }, - { - "variable": "plumberName", - "value": { - "path": "$.plumberInfo[0].name" - } - }, - { - "variable": "licenceNo", - "value": { - "path": "$.plumberInfo[0].licenseNo" - } - }, - { - "variable": "contactNo", - "value": { - "path": "$.plumberInfo[0].mobileNumber" - } - }, - { - "variable": "slaDate", - "value": { - "path": "$.slaDate" - }, - "type": "date" - }, - { - "variable": "order_message14", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_CONCERNED_PLUMBER_CONTACT" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "order_message15", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_SLA_DATE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "order_message12", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_CONCERNED_PLUMBER_ALLOTED" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "order_message13", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_CONCERNED_PLUMBER_LICENCE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "formFee", - "value": { - "path": "$.pdfTaxhead[?(@.taxHeadCode == 'FORM_FEE')].estimateAmount" - } - }, - { - "variable": "ScrutinyFee", - "value": { - "path": "$.pdfTaxhead[?(@.taxHeadCode == 'SCRUTINY_FEE')].estimateAmount" - } - }, - { - "variable": "otherCharge", - "value": { - "path": "$.pdfTaxhead[?(@.taxHeadCode == 'OTHER_CHARGE')].estimateAmount" - } - }, - { - "variable": "securityCharge", - "value": { - "path": "$.pdfTaxhead[?(@.taxHeadCode == 'SECURITY_CHARGE')].estimateAmount" - } - }, - { - "variable": "taxCess", - "value": { - "path": "$.pdfTaxhead[?(@.taxHeadCode == 'TAX_AND_CESS')].estimateAmount" - } - }, - { - "variable": "roadCharge", - "value": { - "path": "$.pdfTaxhead[?(@.taxHeadCode == 'ROAD_CUTTING_CHARGE')].estimateAmount" - } - }, - { - "variable": "oneTimeFee", - "value": { - "path": "$.pdfTaxhead[?(@.taxHeadCode == 'ONE_TIME_FEE')].estimateAmount" - } - }, - { - "variable": "penaltyAmount", - "value": { - "path": "$.additionalDetails.adhocPenalty" - } - }, - { - "variable": "rebateAmount", - "value": { - "path": "$.additionalDetails.adhocRebate" - } - }, - { - "variable": "totalAmount", - "value": { - "path": "$.totalAmount" - } - }, - { - "variable": "tenantName", - "value": { - "path": "$.tenantName" - } - }, - { - "variable": "date", - "value": { - "path": "$.connectionExecutionDate" - }, - "type": "date" - }, - { - "variable": "appCreatedDate", - "value": { - "path": "$.additionalDetails.appCreatedDate" - }, - "type": "date" - }, - { - "variable": "sanctionLetterDate", - "value": { - "path": "$.sanctionLetterDate" - }, - "type": "date" - }, - { - "variable": "estimationLetterDate", - "value": { - "path": "$.additionalDetails.estimationLetterDate" - }, - "type": "date" - }, - { - "variable": "total", - "value": { - "path": "PDF_STATIC_LABELWS_CONSOLIDATED_ACKNOWELDGMENT_TOTAL" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "Rs", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_RUPEE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "Municipal_Corporation", - "value": { - "path": "PDF_STATIC_LABEL_WS_MDMS_MUNICIPAL_CORPORATION_LOGO_HEADER" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "presented_by", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PRESENTED_BY" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "commissioner_label", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_COMMISSIONER_LABEL" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "app_no", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_ACKNOWELDGMENT_APPLICATION_NO" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "date_label", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_DATE_LABEL" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "sub_label", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_SUBJECT" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "ref_label", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_REFERENCE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "total_amount", - "value": { - "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_TOTAL_AMOUNT" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "sub_data1", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_SUB_DATA1" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "sub_data2", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_SUB_DATA2" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "locality_label", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_LOCALITY_LABEL" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "order_issued", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ORDER_ISSUED" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "ref_message1", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_REF_MESSAGE1" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "dated_label", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_DATED_LABEL" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "ref_message2", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ESTIMATION_NOTICE_NO" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "order_label", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ORDER_LABEL" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "in_ref_label", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ORDER_DESCRIPTION" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "order_message1", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ORDER_MESSAGE1" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "order_message2", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_SEEKING" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "order_message3", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_WATER_TAP_CONNECTION" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "order_data2", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ORDER_DATA2" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "order_data3", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ORDER_DATA3" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "for_commissioner_label", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_APPROVAL_EXECUTIVE_OFFICER" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "to_label", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_TO_LABEL" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "sri_smt_label", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_SRI_SMT_LABEL" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "door_no_label", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_DOOR_NO_LABEL" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "copy_message1", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_COPY_MESSAGE1" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "copy_message-sub1", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_COPY_MESSAGE_SUB1" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "copy_message2", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_COPY_MESSAGE2" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "UAT", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_UAT" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "form_fee", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_FORM_FEE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "scrutiny_fee", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_SCRUTINY_FEE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "other_charge", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_OTHER_CHARGE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "security_charge", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_SECURITY_CHARGE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "tax_cess", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_TAX_CESS" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "penalty", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PENALTY" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "rebate", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_REBATE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "one_time_fee", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ONE_TIME_FEE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "approved_by", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_COMPUTER_GENERATED_DOCUMENT" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "connection_header", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_CONNECTION_HEADER" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "road_charge", - "value": { - "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ROAD_CHARGE" - }, - "type": "label", - "localisation": { - "required": true, - "prefix": null, - "module": "rainmaker-common" - } - }, - { - "variable": "footerLogoImage", - "url": "https://uat.digit.org/pg-egov-assets/mseva-logo-colored.png", - "type": "image" - } - ] - }, - { - "externalAPI": [ - { - "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", - "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.property.tenantId}')%5D", - "apiRequest": null, - "responseMapping": [ - { - "variable": "logoImage", - "value": "$.MdmsRes.tenant.tenants[0].logoId", - "type": "image" - }, - { - "variable":"mcGrade", - "value":"$.MdmsRes.tenant.tenants[0].city.pwssbGrade" - }, - { - "variable": "logo_header", - "value": "$.MdmsRes.tenant.tenants[0].code", - "localisation": { - "required": true, - "prefix": "TENANT_TENANTS", - "module": "rainmaker-common" - } - } - ] - } - ] - } - ] - } - ] - } -} diff --git a/configs/pdf-service/format-config/bill-amendment-note.json b/configs/pdf-service/format-config/bill-amendment-note.json deleted file mode 100644 index e3c7504b..00000000 --- a/configs/pdf-service/format-config/bill-amendment-note.json +++ /dev/null @@ -1,567 +0,0 @@ -{ - "key": "bill-amendment-credit-note", - "config": { - "defaultStyle": { - "font": "Cambay" - }, - "watermark": { - "text": "DIGIT UAT DIGIT UAT", - "color": "gery", - "opacity": 0.1, - "bold": true, - "italics": false - }, - "content": [ - { - "style": "noc-head", - "table": { - "widths": [ - 60, - "*", - 120 - ], - "color":"#484848", - "body": [ - [ - { - "image": "{{logoImage}}", - "width": 50, - "height": 61.25 - }, - { - "stack": [ - { - "text": "{{logo-header}} {{mcGrade}} (Digit UAT)", - "style": "receipt-logo-header" - }, - { - "text": "{{note_type}}", - "style": "receipt-logo-sub-header" - } - ], - "alignment": "left", - "margin": [ - 0, - 10, - 0, - 0 - ] - }, - { - "stack": [ - { - "text": "{{address}}" - }, - { - "text": "{{phoneNumber}}" - }, - { - "text": "{{website}}" - }, - { - "text": "{{email}}" - } - ], - "alignment": "right", - "color": "#484848", - "margin": [ - -100, - 0, - -25, - 0 - ] - } - ] - ] - }, - "layout": "noBorders" - }, - - { - "style": "note-info", - "columns": [ - { - "text": [ - { - "text": "{{note_id}} ", - "bold": true - }, - { - "text": "{{applicationNo}}", - "bold": false - } - ], - "alignment": "left" - }, - { - "text": [ - { - "text": "{{note_date}}", - "bold": true - }, - { - "text": "{{date}}", - "bold": false - } - ], - "alignment": "right", - "margin": [ - 0, - 0, - -10, - 1 - ] - } - ] - }, - - { - "style": "header", - "columns": [ - { - "text": [ - { - "text": "{{against}}", - "bold": true - } - ], - "alignment": "left" - } - ] - }, - { - "style": "header-1", - "text": "{{user-name}}", - "alignment": "left" - }, - { - "style": "header-1", - "text": "{{permanentAddress}}", - "alignment": "left" - }, - { - "style": "header", - "text": " ", - "alignment": "left" - }, - - { - "style": "note-info-1", - "columns": [ - { - "text": [ - { - "text": "{{adjustment_amount_details}}", - "bold": true - } - ], - "alignment": "left" - }, - { - "text": [ - { - "text": "{{total_amount}}", - "bold": true - } - ], - "alignment": "right", - "margin": [ - 0, - 0, - -200, - 1 - ] - }, - { - "text": [ - { - "text": "{{rs}} {{totalAmount}}", - "bold": true - } - ], - "alignment": "right", - "fontSize": 20, - "margin": [ - 0, - 25, - -10, - 1 - ] - } - ] - }, - - { - "style": "ws-table", - "table": { - "widths": [ - "70%" - ], - "body": [ - [ - { - "table": { - "widths": [ - "10%", - "30%", - "30%" - ], - "body": [ - [ - { - "text": "{{sl_no}}", - "alignment": "center" - }, - { - "text": "{{tax_heads}}", - "alignment": "left" - }, - { - "text": "{{reduced_amount}}", - "alignment": "right" - } - ], - [ - { - "text": "1.", - "alignment": "center" - }, - { - "text": "{{water_tax}}", - "alignment": "left" - }, - { - "text": "{{waterTax}}", - "alignment": "right" - } - ], - [ - { - "text": "2.", - "alignment": "center" - }, - { - "text": "{{water_cess}}", - "alignment": "left" - }, - { - "text": "{{waterCess}}", - "alignment": "right" - } - ], - [ - { - "text": "3.", - "alignment": "center" - }, - { - "text": "{{interest}}", - "alignment": "left" - }, - { - "text": "{{interestAmount}}", - "alignment": "right" - } - ], - [ - { - "text": "4.", - "alignment": "center" - }, - { - "text": "{{penalty}}", - "alignment": "left" - }, - { - "text": "{{penaltyAmount}}", - "alignment": "right" - } - ], - [ - { - "text": "5.", - "alignment": "center" - }, - { - "text": "{{arrears}}", - "alignment": "left" - }, - { - "text": "{{arrearsAmount}}", - "alignment": "right" - } - ], - [ - { - "text": " " - }, - { - "text": "{{total_amount}}", - "alignment": "left" - }, - { - "text": "{{totalAmount}}", - "alignment": "right" - } - ] - ] - }, - "border": [ - false, - false, - false, - false - ] - } - ] - ] - }, - "layout": {} - }, - - { - "style": "ws-table-1", - "table": { - "widths": [ - "130%" - ], - "body": [ - [ - { - "table": { - "widths": [ - "120%" - ], - "body": [ - [ - { - "text": "{{box_note}}", - "alignment": "left" - } - ] - ] - }, - "border": [ - false, - false, - false, - false - ] - } - ] - ] - }, - "layout": {} - }, - - { - "style": "header", - "text": " ", - "alignment": "left" - }, - - { - "style": "receipt-approver", - "columns": [ - { - "text": [ - { - "text": "{{generated_by}}: ", - "bold": true - }, - { - "text": "{{user-name}}", - "bold": false - } - ], - "alignment": "left" - }, - { - "text": [ - { - "text": "{{commissioner/eo}}", - "bold": true - } - ], - "alignment": "right", - "margin": [ - 0, - 0, - -10, - 1 - ] - } - ] - }, - - { - "style": "no-signature", - "text": "{{no_signature}}" - }, - - { - "style": "no-signature", - "text": "{{box_validity}}" - }, - { - "image": "{{footerLogoImage}}", - "width": 75, - "height": 10, - "alignment": "center", - "margin": [ - -12, - -10, - -230, - 0 - ] - } - ], - - "styles": { - "noc-head": { - "margin": [ - -30, - -30, - 0, - 1 - ] - }, - "ws-head": { - "margin": [ - -39, - -38, - -38, - 0 - ] - }, - "receipt-logo-header": { - "color": "#000000", - "fontSize": 14, - "bold": true, - "letterSpacing": 0.74, - "margin": [ - 0, - 0, - 0, - 5 - ] - }, - "ws-table": { - "fontSize": 12, - "color": "#484848", - "margin": [ - -25, - 18, - -8, - 10 - ] - }, - "ws-table-1": { - "fontSize": 12, - "color": "#000000", - "margin": [ - 380, - -120, - 20, - 10 - ] - }, - "receipt-logo-sub-header": { - "color": "#000000", - "fontSize": 12, - "letterSpacing": 0.6 - }, - "receipt-table-value": { - "color": "#000000", - "bold": true, - "fontSize": 12, - "fontWeight": 500, - "margin": [ - 8, - 8, - 0, - 8 - ] - }, - "receipt-table": { - "color": "#000000", - "bold": false, - "fontSize": 12, - "fontWeight": 400, - "margin": [ - -10, - 8, - 0, - 8 - ] - }, - "header": { - "color": "#000000", - "bold": true, - "fontSize": 12, - "fontWeight": 500, - "margin": [ - -25, - 15, - 0, - -10 - ] - }, - "header-1": { - "color": "#000000", - "bold": false, - "fontSize": 12, - "fontWeight": 500, - "margin": [ - -25, - 15, - 0, - -10 - ] - }, - "receipt-approver": { - "fontSize": 12, - "bold": true, - "margin": [ - -27, - 50, - -10, - 0 - ], - "color": "#484848" - }, - "note-info": { - "fontSize": 12, - "bold": true, - "margin": [ - -27, - 10, - -10, - 0 - ], - "color": "#000000" - }, - "note-info-1": { - "fontSize": 12, - "bold": true, - "margin": [ - -27, - 10, - -10, - -45 - ], - "color": "#000000" - }, - "no-signature": { - "fontSize": 12, - "margin": [ - -27, - 10, - -10, - 0 - ], - "color": "#484848" - } - } - } -} diff --git a/configs/pdf-service/format-config/bill-amendment.json b/configs/pdf-service/format-config/bill-amendment.json deleted file mode 100644 index 5a433c4a..00000000 --- a/configs/pdf-service/format-config/bill-amendment.json +++ /dev/null @@ -1,564 +0,0 @@ -{ - "key": "bill-amendment-summary", - "config": { - "defaultStyle": { - "font": "Cambay" - }, - "watermark": { - "text": "DIGIT UAT DIGIT UAT", - "color": "gery", - "opacity": 0.1, - "bold": true, - "italics": false - }, - "content": [ - { - "style": "noc-head", - "table": { - "widths": [ - 60, - "*", - 120 - ], - "color":"#484848", - "body": [ - [ - { - "image": "{{logoImage}}", - "width": 50, - "height": 61.25 - }, - { - "stack": [ - { - "text": "{{logo-header}} {{mcGrade}} (DIGIT UAT)", - "style": "receipt-logo-header" - }, - { - "text": "{{serviceType}} department", - "style": "receipt-logo-sub-header" - } - ], - "alignment": "left", - "margin": [ - 0, - 10, - 0, - 0 - ] - }, - { - "stack": [ - { - "text": "{{address}}" - }, - { - "text": "{{phoneNumber}}" - }, - { - "text": "{{website}}" - }, - { - "text": "{{email}}" - } - ], - "alignment": "right", - "color": "#484848", - "margin": [ - -100, - 0, - -25, - 0 - ] - } - ] - ] - }, - "layout": "noBorders" - }, - - { - "columns": [ - { - "text": "{{bill_amendment_application}}", - "style": "ws-header", - "margin": [ - 0, - 0, - 10, - 10 - ] - }, - { - "text": "{{bill_amendment_application_number}}", - "alignment": "right", - "margin": [ - 0, - 0, - -50, - 10 - ] - }, - { - "text": "{{applicationNo}}", - "alignment": "right", - "bold": true, - "margin": [ - -150, - 0, - -20, - 0 - ] - } - ], - "margin": [ - -26, - 10, - 0, - 0 - ] - }, - - { - "columns": [ - { - "text": "{{adjustment_amount_details}}", - "style": "header" - } - ] - }, - - { - "style": "ws-table", - "table": { - "widths": [ - "102%" - ], - "body": [ - [ - { - "table": { - "widths": [ - "10%", - "45%", - "45%" - ], - "body": [ - [ - { - "text": "{{sl_no}}", - "alignment": "center" - }, - { - "text": "{{tax_heads}}", - "alignment": "center" - }, - { - "text": "{{reduced_amount}}", - "alignment": "center" - } - ], - [ - { - "text": "1.", - "alignment": "center" - }, - { - "text": "{{water_tax}}", - "alignment": "left" - }, - { - "text": "{{waterTax}}", - "alignment": "right" - } - ], - [ - { - "text": "2.", - "alignment": "center" - }, - { - "text": "{{water_cess}}", - "alignment": "left" - }, - { - "text": "{{waterCess}}", - "alignment": "right" - } - ], - [ - { - "text": "3.", - "alignment": "center" - }, - { - "text": "{{interest}}", - "alignment": "left" - }, - { - "text": "{{interestAmount}}", - "alignment": "right" - } - ], - [ - { - "text": "4.", - "alignment": "center" - }, - { - "text": "{{penalty}}", - "alignment": "left" - }, - { - "text": "{{penaltyAmount}}", - "alignment": "right" - } - ], - [ - { - "text": "5.", - "alignment": "center" - }, - { - "text": "{{arrears}}", - "alignment": "left" - }, - { - "text": "{{arrearsAmount}}", - "alignment": "right" - } - ], - [ - { - "text": " " - }, - { - "text": "{{total_amount}}", - "alignment": "left" - }, - { - "text": "{{totalAmount}}", - "alignment": "right" - } - ] - ] - }, - "border": [ - false, - false, - false, - false - ] - } - ] - ] - }, - "layout": {} - }, - { - "text": "{{demand_revision_basis_details}}", - "bold": true, - "alignment": "left", - "style": "header" - }, - { - "style": "ws-table", - "table": { - "widths": [ - "102%" - ], - "body": [ - [ - { - "table": { - "widths": [ - "33%", - "33%", - "33%" - ], - "body": [ - [ - { - "text": "{{demand_revision_basis}}", - "alignment": "center", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{court_order_no}}", - "alignment": "center", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{with_effect_from}}", - "alignment": "center", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - } - ], - [ - { - "text": "{{demandRevisionBasis}}", - "alignment": "center", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{courtOrderNo}}", - "alignment": "center", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{withEffectFrom}}", - "alignment": "center", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - } - ] - ] - }, - "border": [ - true, - true, - true, - true - ] - } - ] - ] - }, - "layout": {} - }, - { - "text": "Documents", - "style": "header" - }, - { - "style": "ws-table", - "table": { - "widths": [ - "102%" - ], - "body": [ - [ - { - "table": { - "widths": [ - "33%", - "33%", - "33%" - ], - "body": [ - [ - { - "text": "{{court_order}}", - "alignment": "center", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{self_declaration}}", - "alignment": "center", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{past_bills}}", - "alignment": "center", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - } - ], - [ - { - "text": "{{courtOrder}}", - "alignment": "center", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{selfDeclaration}}", - "alignment": "center", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{pastBills}}", - "alignment": "center", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - } - ] - ] - }, - "border": [ - true, - true, - true, - true - ] - } - ] - ] - }, - "layout": {} - }, - { - "image": "{{footerLogoImage}}", - "width": 75, - "height": 10, - "alignment": "center", - "margin": [ - -12, - -10, - -230, - 0 - ] - } - ], - - "styles": { - "noc-head": { - "margin": [ - -30, - -30, - 0, - 1 - ] - }, - "ws-head": { - "margin": [ - -39, - -38, - -38, - 0 - ] - }, - "receipt-logo-header": { - "color": "#000000", - "fontSize": 14, - "bold": true, - "letterSpacing": 0.74, - "margin": [ - 0, - 0, - 0, - 5 - ] - }, - "ws-table": { - "fontSize": 12, - "color": "#484848", - "margin": [ - -25, - 18, - -8, - 10 - ] - }, - "receipt-logo-sub-header": { - "color": "#000000", - "fontSize": 12, - "letterSpacing": 0.6 - }, - "receipt-table-value": { - "color": "#000000", - "bold": true, - "fontSize": 12, - "fontWeight": 500, - "margin": [ - 8, - 8, - 0, - 8 - ] - }, - "receipt-table": { - "color": "#000000", - "bold": false, - "fontSize": 12, - "fontWeight": 400, - "margin": [ - -10, - 8, - 0, - 8 - ] - }, - "header": { - "color": "#000000", - "bold": true, - "fontSize": 12, - "fontWeight": 500, - "margin": [ - -25, - 15, - 0, - -10 - ] - } - } - } -} diff --git a/configs/pdf-service/format-config/bpa-revocation.json b/configs/pdf-service/format-config/bpa-revocation.json deleted file mode 100644 index a6ff99f5..00000000 --- a/configs/pdf-service/format-config/bpa-revocation.json +++ /dev/null @@ -1,190 +0,0 @@ -{ - "key": "bpa-revocation", - "config": { - "defaultStyle": { - "font": "Cambay" - }, - "watermark": { - "text": "DIGIT UAT DIGIT UAT", - "color": "gery", - "opacity": 0.1, - "bold": true, - "italics": false - }, - "content": [ - { - "columns": [ - { - "image": "{{logoImage}}", - "width": 70, - "height": 70, - "alignment": "left" - }, - { - "stack": [ - { - "text": "{{tenantName}} {{Muncipal_Council}} (Digit UAT)", - "style": "header" - }, - { - "text": "{{Revocation_Title}}", - "style": "sub-header" - } - ] - }, - { - "image": "{{logoImage}}", - "width": 70, - "height": 70, - "alignment": "right" - } - ] - }, - { - "columns": [ - { - "text": [ - { - "text": "{{Dated}} : ", - "bold": true - }, - { - "text": "{{createdDate}}", - "bold": true - } - ], - "alignment": "right" - } - ], - "style": "top-margin" - }, - { - "text": [ - { - "text": "{{SALUTATION}} " - }, - { - "text": "{{ownerName}},", - "bold": true - } - ], - "style": "top-margin" - }, - { - "text": [ - { - "text": "{{Permision_Issued}} " - }, - { - "text": "{{planPermissionNo}}", - "bold": true, - "font": "Roboto" - }, - { - "text": " {{WRT_APPNO}} " - }, - { - "text": "{{applicationNo}}", - "bold": true, - "font": "Roboto" - }, - { - "text": " {{dated}} " - }, - { - "text": "{{createdDate}}", - "bold": true - }, - { - "text": " {{isRevocated}}. " - } - ], - "style": "top-low-margin" - }, - { - "text": [ - { - "text": "{{revocationReasonIs}}" - }, - { - "text": " {{revocationReason}}.", - "bold": true - }, - { - "text": " {{noAuthText}}." - } - ], - "style": "top-low-margin" - }, - { - "text": [ - { - "text": "{{contactULB}}." - } - ], - "style": "top-low-margin" - }, - { - "stack": [ - { - "text": "{{BY_ORDER}}", - "style": "top-margin" - }, - { - "text": "{{AUTH_OFFICER}}", - "margin": 2 - }, - { - "text": "{{revocatedBy}}", - "margin": 2 - } - ], - "alignment": "right", - "style": "top-margin" - }, - { - "image": "{{footerLogoImage}}", - "width": 75, - "height": 10, - "alignment": "center", - "margin": [ - -12, - -10, - -230, - 0 - ] - } - ], - "styles": { - "header": { - "bold": true, - "alignment": "center" - }, - "sub-header": { - "alignment": "center", - "margin": [ - 0, - 5, - 0, - 5 - ] - }, - "top-margin": { - "margin": [ - 0, - 30, - 0, - 0 - ] - }, - "top-low-margin": { - "margin": [ - 0, - 10, - 0, - 0 - ] - } - } - } -} diff --git a/configs/pdf-service/format-config/buildingpermit-low.json b/configs/pdf-service/format-config/buildingpermit-low.json deleted file mode 100644 index 7eb8d271..00000000 --- a/configs/pdf-service/format-config/buildingpermit-low.json +++ /dev/null @@ -1,347 +0,0 @@ -{ - "key": "buildingpermit-low", - "config": { - "defaultStyle": { - "font": "Cambay" - }, - "watermark": { - "text": "DIGIT UAT DIGIT UAT", - "color": "gery", - "opacity": 0.1, - "bold": true, - "italics": false - }, - "content": [ - { - "text" : "{{GENERATED_ON}} : ", - "absolutePosition" : { - "x" : 400, - "y" : 5 - } - }, - { - "text" : " {{orderGeneratedOn}}", - "absolutePosition" : { - "x" : 500, - "y" : 5 - } - }, - { - "columns": [ - { - "image": "{{logoImage}}", - "width": 70, - "height": 70, - "alignment": "left" - }, - { - "stack": [ - { - "text": "{{tenantName}} {{Muncipal_Council}} (Digit UAT)", - "style": "header" - }, - { - "text": "{{BPA_FORM}}", - "style": "sub-header" - }, - { - "text": "{{BPA_FORM_APPROVAL}}", - "style": "header" - }, - { - "text": "{{BPA_BYELAWS}}", - "style": "sub-header" - } - ] - }, - { - "image": "{{logoImage}}", - "width": 70, - "height": 70, - "alignment": "right" - } - ] - }, - { - "columns": [ - { - "text": [ - { - "text": "{{PLAN_PERMISION_NO}} : ", - "bold": true - }, - { - "text": "{{planPermissionNo}}", - "bold": true, - "font": "Roboto" - } - ], - "alignment": "left", - "width": "*" - } - ], - "style": "top-margin" - }, - { - "text": [ - { - "text": "{{WRT_TXT}}" - }, - { - "text" : " {{applicationNo}}", - "bold" : true, - "font": "Roboto" - }, - { - "text" : " {{dated}}" - }, - { - "text" : " {{applicationDate}}" - }, - { - "text" : ", {{PERMISSION_GRANT_TXT}} : " - } - ], - "style": "top-margin" - }, - { - "text": [ - { - "text": "{{SALUTATION}} " - }, - { - "text": "{{favourOf}}", - "bold": true - }, - { - "text": " {{FOR}} " - } - ], - "style": "top-margin" - }, - { - "text": [ - { - "text": "{{DSCR1}} {{PLOT_NO}} {{CS_PLOT}}" - }, - { - "text": " {{plotNo}}", - "bold": true - }, - { - "text": " {{PLOT_NO}} {{MSP_PLOT}} " - }, - { - "text": "{{plotNo}}", - "bold": true - }, - { - "text": " {{KHATA_NO}} " - }, - { - "text": "{{khataNo}}", - "bold": true - }, - { - "text": " {{HOLDING_NO}} " - }, - { - "text": "{{holdingNo}}", - "bold": true - }, - { - "text" : " {{SERVEY_NO}} " - }, - { - "text" : "{{reServeyPlotNo}}", - "bold" : true - }, - { - "text" : " {{TOWNPLANNING_TXT}} " - }, - { - "text" : "{{townPlanningScheme}}", - "bold" : true - }, - { - "text" : " {{PROPOSE_LAND}} " - }, - { - "text" : "{{proposedLandUse}}", - "bold" : true - }, - { - "text": " {{OF}} " - }, - { - "text": "{{tenantName}} {{BPA_PDF_MUNCIPAL}}", - "bold": true - }, - { - "text": " {{CONDNS_TXT}}" - } - ] - }, - { - "separator": ")", - "ol": ["{{conditions}}"] - }, - { - "stack": [ - { - "text": "{{PERMIT_DETAILS_TXT}}," - } - ], - "bold": true, - "style": "top-margin" - }, - { - "table": { - "widths": [ - "auto", - "auto" - ], - "body": [ - [ - { - "text" : "{{FEE_DSCR}}", - "alignment" : "center", - "bold" : true - }, - { - "text" : "{{AMOUNT}}", - "bold" : true, - "alignment" : "right" - } - ], - "{{#paymentDetails}}[{ \"text\":\"{{headCode}}\", \"border\":[ true, true, true, true ],\"alignment\": \"center\"},{ \"text\":\"{{amnt}}\", \"border\":[ true, true, true, true ],\"alignment\": \"right\"}]{{/paymentDetails}}", - [ - { - "text" : "{{TOTAL}}", - "alignment" : "center" - }, - { - "text" : "{{totalDue}}", - "alignment" : "right" - } - ] - ] - }, - "margin": [ - 0, - 5, - 0, - 0 - ] - }, - { - "stack": [ - { - "text": "{{BY_ORDER}}", - "style": "top-margin" - }, - { - "text": "{{AUTH_OFFICER}}", - "margin": 2 - }, - { - "text": "{{tenantName}}", - "margin": 2 - } - ], - "alignment": "right", - "style": "top-margin" - }, - { - "text" : [ - { - "text" : "{{AUTH_DSCR}}" - } - ] - }, - { - "text": [ - { - "text": "{{VALIDITY_DSCR}} " - }, - { - "text": "{{validityDate}}" - }, - { - "text": " {{ONLY}}." - } - ], - "style": "top-margin", - "bold": true - }, - { - "text": "{{NOTE}} : ", - "bold": true, - "style": "top-margin" - }, - { - "text": [ - { - "text" : "{{SUMMARY1}}" - }, - { - "text" : " {{Bihar_Tenant}} " - }, - { - "text" : "{{SUMMARY2}}." - } - ], - "style": "top-margin" - }, - { - "image": "{{qrCode}}", - "alignment": "right", - "width": 100, - "height": 100 - }, - { - "image": "{{footerLogoImage}}", - "width": 75, - "height": 10, - "alignment": "center", - "margin": [ - -12, - -10, - -230, - 0 - ] - } - ], - "styles": { - "header": { - "bold": true, - "alignment": "center" - }, - "sub-header": { - "alignment": "center", - "margin": [ - 0, - 5, - 0, - 5 - ] - }, - "top-margin": { - "margin": [ - 0, - 10, - 0, - 0 - ] - }, - "top-high-margin": { - "margin": [ - 0, - 30, - 0, - 0 - ] - } - } - } -} diff --git a/configs/pdf-service/format-config/buildingpermit.json b/configs/pdf-service/format-config/buildingpermit.json deleted file mode 100644 index f42622ab..00000000 --- a/configs/pdf-service/format-config/buildingpermit.json +++ /dev/null @@ -1,360 +0,0 @@ -{ - "key": "buildingpermit", - "config": { - "defaultStyle": { - "font": "Cambay" - }, - "watermark": { - "text": "DIGIT UAT DIGIT UAT", - "color": "gery", - "opacity": 0.1, - "bold": true, - "italics": false - }, - "content": [ - { - "text" : "{{GENERATED_ON}} : ", - "absolutePosition" : { - "x" : 400, - "y" : 5 - } - }, - { - "text" : " {{orderGeneratedOn}}", - "absolutePosition" : { - "x" : 500, - "y" : 5 - } - }, - { - "columns": [ - { - "image": "{{logoImage}}", - "width": 70, - "height": 70, - "alignment": "left" - }, - { - "stack": [ - { - "text": "{{tenantName}} {{Muncipal_Council}} (Digit UAT)", - "style": "header" - }, - { - "text": "{{BPA_FORM}}", - "style": "sub-header" - }, - { - "text": "{{BPA_FORM_APPROVAL}}", - "style": "header" - }, - { - "text": "{{BPA_BYELAWS}}", - "style": "sub-header" - } - ] - }, - { - "image": "{{logoImage}}", - "width": 70, - "height": 70, - "alignment": "right" - } - ] - }, - { - "columns": [ - { - "text": [ - { - "text": "{{PLAN_PERMISION_NO}} : ", - "bold": true - }, - { - "text": "{{planPermissionNo}}", - "bold": true, - "font": "Roboto" - } - ], - "alignment": "left", - "width": "*" - } - ], - "style": "top-margin" - }, - { - "text": [ - { - "text": "{{WRT_TXT}}" - }, - { - "text": " {{applicationNo}}", - "bold": true, - "font": "Roboto" - }, - { - "text": " {{dated}}" - }, - { - "text": " {{applicationDate}}" - }, - { - "text": ", {{PERMISSION_GRANT_TXT}} : " - } - ], - "style": "top-margin" - }, - { - "text": [ - { - "text": "{{SALUTATION}} " - }, - { - "text": "{{favourOf}}", - "bold": true - }, - { - "text": " {{FOR}} " - } - ], - "style": "top-margin" - }, - { - "text": [ - { - "text": "{{DSCR1}} {{PLOT_NO}} {{CS_PLOT}}" - }, - { - "text": " {{plotNo}}", - "bold": true - }, - { - "text": " {{PLOT_NO}} {{MSP_PLOT}} " - }, - { - "text": "{{plotNo}}", - "bold": true - }, - { - "text": " {{KHATA_NO}} " - }, - { - "text": "{{khataNo}}", - "bold": true - }, - { - "text": " {{HOLDING_NO}} " - }, - { - "text": "{{holdingNo}}", - "bold": true - }, - { - "text": " {{SERVEY_NO}} " - }, - { - "text": "{{reServeyPlotNo}}", - "bold": true - }, - { - "text": " {{TOWNPLANNING_TXT}} " - }, - { - "text": "{{townPlanningScheme}}", - "bold": true - }, - { - "text": " {{PROPOSE_LAND}} " - }, - { - "text": "{{proposedLandUse}}", - "bold": true - }, - { - "text": " {{OF}} " - }, - { - "text": "{{tenantName}} {{BPA_PDF_MUNCIPAL}}", - "bold": true - }, - { - "text": " {{CONDNS_TXT}}" - } - ] - }, - { - "separator": ")", - "ol": [ - "{{conditions}}" - ] - }, - { - "stack": [ - { - "text": "{{PERMIT_DETAILS_TXT}}," - } - ], - "bold": true, - "style": "top-margin" - }, - { - "table": { - "widths": [ - "auto", - "auto" - ], - "body": [ - [ - { - "text": "Fee Description", - "bold": true - }, - { - "text": "Amount (Rs)", - "bold": true, - "alignment": "right" - } - ], - [ - { - "text": "{{appHeadCode}}" - }, - { - "text": "{{appFee}}", - "alignment": "right" - } - ], - [ - { - "text": "{{sanHeadCode}}" - }, - { - "text": "{{sanFee}}", - "alignment": "right" - } - ], - [ - { - "text": "Total", - "bold": true - }, - { - "text": "{{totalDue}}", - "bold": true, - "alignment": "right" - } - ] - ] - }, - "margin": [ - 0, - 5, - 0, - 0 - ] - }, - { - "stack": [ - { - "text": "{{BY_ORDER}}", - "style": "top-margin" - }, - { - "text": "{{AUTH_OFFICER}}", - "margin": 2 - }, - { - "text": "{{approvedBy}}", - "margin": 2 - } - ], - "alignment": "right", - "style": "top-margin" - }, - { - "text": [ - { - "text": "{{VALIDITY_DSCR}} " - }, - { - "text": "{{validityDate}}" - }, - { - "text": " {{ONLY}}." - } - ], - "style": "top-margin", - "bold": true - }, - { - "text": "{{NOTE}} : ", - "bold": true, - "style": "top-margin" - }, - { - "text": [ - { - "text": "{{SUMMARY1}}" - }, - { - "text": " {{Bihar_Tenant}} " - }, - { - "text": "{{SUMMARY2}}." - } - ], - "style": "top-margin" - }, - { - "image": "{{qrCode}}", - "alignment": "right", - "width": 100, - "height": 100 - }, - { - "image": "{{footerLogoImage}}", - "width": 75, - "height": 10, - "alignment": "center", - "margin": [ - -12, - -10, - -230, - 0 - ] - } - ], - "footer": "(function(currentPage, pageCount) { return currentPage.toString() + ' of ' + pageCount; })", - "styles": { - "header": { - "bold": true, - "alignment": "center" - }, - "sub-header": { - "alignment": "center", - "margin": [ - 0, - 5, - 0, - 5 - ] - }, - "top-margin": { - "margin": [ - 0, - 10, - 0, - 0 - ] - }, - "top-high-margin": { - "margin": [ - 0, - 30, - 0, - 0 - ] - } - } - } -} diff --git a/configs/pdf-service/format-config/consolidated-pdf1.json b/configs/pdf-service/format-config/consolidated-pdf1.json deleted file mode 100644 index c6fb9037..00000000 --- a/configs/pdf-service/format-config/consolidated-pdf1.json +++ /dev/null @@ -1,580 +0,0 @@ -{ - "key": "consolidated-pdf1", - "config": { - "watermark": { - "text": "DIGIT UAT DIGIT UAT", - "color": "gery", - "opacity": 0.1, - "bold": true, - "italics": false - }, - "content": [ - { - "style": "noc-head", - "table": { - "widths": [ - 60, - "*", - 120 - ], - "body": [ - [ - { - "image": "{{variable16}}", - "width": 50, - "height": 61.25 - }, - { - "stack": [ - { - "text": "Amritsar Municipal Corportaion", - "style": "receipt-logo-header" - }, - { - "text": "Property Tax payment Receipt", - "style": "receipt-logo-sub-header" - } - ], - "alignment": "left", - "margin": [ - 0, - 10, - 0, - 0 - ] - }, - { - "stack": [ - { - "text": "C Block, Ranjit Avenue, Amritsar" - }, - { - "text": " Tel. +91-183-2502339" - }, - { - "text": "website: www.amritsarcorp.com" - }, - { - "text": "Email: cmcasr@punjab.gov.in" - } - ], - "alignment": "right", - "color": "#484848", - "margin": [ - -150, - 0, - 0, - 0 - ] - } - ] - ] - }, - "layout": "noBorders" - }, - { - "style": "noc-table", - "table": { - "widths": [ - "*", - "*", - "*", - "*" - ], - "body": [ - [ - { - "text": "Receipt No.", - "border": [ - true, - true, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{variable3}}", - "border": [ - false, - true, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "Consumer ID", - "border": [ - false, - true, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{variable14}}", - "border": [ - false, - true, - true, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": "Payment Date", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{variable13}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "Payer Name", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{variable1}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": "Payer Contact", - "border": [ - true, - false, - false, - true - ], - "style": "receipt-table-value" - }, - { - "text": "{{variable2}}", - "border": [ - false, - false, - false, - true - ], - "style": "receipt-table" - }, - { - "text": "", - "border": [ - false, - false, - false, - true - ], - "style": "receipt-table-value" - }, - { - "text": "", - "border": [ - false, - false, - true, - true - ] - } - ] - ] - }, - "layout": {} - }, - { - "style": "noc-table2", - "table": { - "widths": [ - "*", - "*", - "*", - "*" - ], - "body": [ - [ - { - "text": "Service Type", - "border": [ - true, - true, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{variable4}}", - "border": [ - false, - true, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "Billing Period", - "border": [ - false, - true, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{variable6}} to {{variable7}}", - "border": [ - false, - true, - true, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": "Paid Amount", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{variable5}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "Pending Amount", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{variable19}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": "Payment Mode", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{variable9}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "Transaction ID", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{variable15}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": "G8 Receipt No.", - "border": [ - true, - false, - false, - true - ], - "style": "receipt-table-value" - }, - { - "text": "{{variable10}}", - "border": [ - false, - false, - false, - true - ], - "style": "receipt-table" - }, - { - "text": "G8 Receipt Date", - "border": [ - false, - false, - false, - true - ], - "style": "receipt-table-value" - }, - { - "text": "{{variable11}}", - "border": [ - false, - false, - true, - true - ], - "style": "receipt-table" - } - ] - ] - }, - "layout": {} - }, - { - "style": "receipt-approver", - "columns": [ - { - "text": [ - { - "text": "Generated by: ", - "bold": true - }, - { - "text": "Satplal Dhillon", - "bold": false - } - ], - "alignment": "left" - }, - { - "text": [ - { - "text": "Commissioner/EO", - "bold": true - } - ], - "alignment": "right" - } - ] - }, - { - "style": "no-signature", - "text": "This is Computer generated receipt, Signature is not required" - }, - { - "style": "pt-disclaimer", - "stack": [ - { - "text": "Disclamer", - "bold": true, - "style": "pt-disclaimer-value" - }, - { - "text": "Lorem ipsum dolor sit amet", - "bold": false, - "style": "pt-disclaimer-value" - }, - { - "text": "Lorem ipsum dolor sit amet", - "bold": false, - "style": "pt-disclaimer-value" - }, - { - "text": "Lorem ipsum dolor sit amet", - "bold": false, - "style": "pt-disclaimer-value" - } - ] - }, - { - "image": "{{footerLogoImage}}", - "width": 75, - "height": 10, - "alignment": "center", - "margin": [ - -12, - -10, - -230, - 0 - ] - } - ], - "styles": { - "noc-head": { - "margin": [ - -30, - -30, - 0, - 1 - ] - }, - "receipt-logo-header": { - "color": "#484848", - "fontFamily": "Roboto", - "fontSize": 16, - "bold": true, - "letterSpacing": 0.74, - "margin": [ - 0, - 0, - 0, - 5 - ] - }, - "receipt-logo-sub-header": { - "color": "#484848", - "fontFamily": "Roboto", - "fontSize": 13, - "letterSpacing": 0.6 - }, - "noc-table": { - "fontSize": 12, - "color": "#484848", - "margin": [ - -30, - 45, - -8, - -8 - ] - }, - "noc-table2": { - "fontSize": 12, - "color": "#484848", - "margin": [ - -30, - 28, - -8, - -8 - ] - }, - "receipt-table-value": { - "color": "#000000", - "bold": true, - "fontSize": 12, - "fontWeight": 500, - "margin": [ - 8, - 8, - 0, - 8 - ] - }, - "receipt-table": { - "color": "#484848", - "bold": true, - "fontSize": 12, - "fontWeight": 400, - "margin": [ - -30, - 8, - 0, - 8 - ] - }, - "receipt-approver": { - "fontSize": 12, - "bold": true, - "margin": [ - -27, - 50, - -10, - 0 - ], - "color": "#484848" - }, - "no-signature": { - "fontSize": 12, - "margin": [ - -27, - 35, - -10, - 0 - ], - "color": "#484848" - }, - "pt-disclaimer": { - "fontSize": 12, - "margin": [ - -27, - 30, - -10, - 0 - ], - "color": "#484848" - }, - "pt-disclaimer-value": { - "fontSize": 12, - "margin": [ - 0, - 5, - 0, - 0 - ], - "color": "#484848" - } - } - } -} diff --git a/configs/pdf-service/format-config/consolidated-pdf2.json b/configs/pdf-service/format-config/consolidated-pdf2.json deleted file mode 100644 index e9334b83..00000000 --- a/configs/pdf-service/format-config/consolidated-pdf2.json +++ /dev/null @@ -1,1049 +0,0 @@ -{ - "key": "consolidated-pdf2", - "config": { - "watermark": { - "text": "DIGIT UAT DIGIT UAT", - "color": "gery", - "opacity": 0.1, - "bold": true, - "italics": false - }, - "content": [ - { - "style": "noc-head", - "table": { - "widths": [ - 60, - "*", - 120 - ], - "body": [ - [ - { - "image": "{{variable1}}", - "width": 50, - "height": 61.25 - }, - { - "stack": [ - { - "text": "Amritsar Municipal Corportaion", - "style": "receipt-logo-header" - }, - { - "stack": [ - { - "text": "C Block, Ranjit Avenue, Amritsar" - }, - { - "text": " Tel. +91-183-2502339" - }, - { - "text": "website: www.amritsarcorp.com" - }, - { - "text": "Email: cmcasr@punjab.gov.in" - } - ] - } - ], - "alignment": "left", - "margin": [ - 0, - 10, - 0, - 0 - ] - }, - { - "stack": [ - { - "text": "Total Amount due" - }, - { - "text": "{{variable11}}", - "style": "amount-due" - }, - { - "table": { - "widths": [ - "*", - "*" - ], - "body": [ - [ - { - "image": "{{variable}}", - "width": 40, - "height": 40, - "border": [ - false, - false, - false, - false - ], - "style": "qr-image" - }, - { - "stack": [ - { - "text": "Scan Code to pay", - "style": "qr-text" - }, - { - "text": "Use any Bank/UPI App", - "style": "qr-text" - } - ], - "border": [ - false, - false, - false, - false - ] - } - ] - ], - "alignment": "right", - "margin": [ - 0, - 10, - 0, - 0 - ] - } - } - ], - "alignment": "right", - "color": "#484848", - "margin": [ - -150, - 2, - -20, - 0 - ] - } - ] - ] - }, - "layout": "noBorders" - }, - { - "style": "noc-table", - "table": { - "widths": [ - 130, - 130, - -2, - 130, - 130 - ], - "body": [ - [ - { - "text": "Payer Name", - "border": [ - true, - true, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{variable2}}", - "border": [ - false, - true, - true, - false - ], - "style": "receipt-table" - }, - { - "text": "", - "border": [ - false, - false, - false, - false - ] - }, - { - "text": "Bill No.", - "border": [ - true, - true, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{variable5}}", - "border": [ - false, - true, - true, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": "Mobile No.", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{variable3}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - }, - { - "text": "", - "border": [ - false, - false, - false, - false - ] - }, - { - "text": "Bill Period", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{variable6}} - {{variable7}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": "Payer Address", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{variable4}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - }, - { - "text": "", - "border": [ - false, - false, - false, - false - ] - }, - { - "text": "Bill Issue Date", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{variable8}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": "", - "border": [ - true, - false, - false, - true - ], - "style": "receipt-table-value" - }, - { - "text": "", - "border": [ - false, - false, - true, - true - ], - "style": "receipt-table" - }, - { - "text": "", - "border": [ - false, - false, - false, - false - ] - }, - { - "text": "Bill Due Date", - "border": [ - true, - false, - false, - true - ], - "style": "right-receipt-table" - }, - { - "text": "{{variable7}}", - "border": [ - false, - false, - true, - true - ], - "style": "right-receipt-table2" - } - ] - ] - }, - "layout": {} - }, - { - "style": "noc-table2", - "table": { - "widths": [ - "103%" - ], - "body": [ - [ - { - "text": "Billing Summary - Property Tax", - "border": [ - true, - true, - true, - false - ], - "style": "receipt-table-value" - } - ], - [ - { - "table": { - "widths": [ - "15%", - "20%", - "11%", - "12%", - "11%", - "12%", - "11%", - "11%" - ], - "body": [ - [ - { - "text": "Property ID", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - }, - { - "text": "Bill Period", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - }, - { - "text": "Arrears", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - }, - { - "text": "Charge", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - }, - { - "text": "Penalty", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - }, - { - "text": "Rebate", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - }, - { - "text": "Others", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - }, - { - "text": "Total", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - } - ], - [ - { - "text": "{{variable12}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text": "{{variable6}}-{{variable7}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text": "{{variable13}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text": "{{variable14}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text": "{{variable9}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text": "{{variable10}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text": "{{variable14}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text": "{{variable11}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2", - "bold": true - } - ] - ] - }, - "border": [ - true, - false, - true, - true - ] - } - ] - ] - }, - "layout": {} - }, - { - "style": "noc-table3", - "table": { - "widths": [ - "103%" - ], - "body": [ - [ - { - "text": "Important Message", - "border": [ - true, - true, - true, - false - ], - "margin": [ - 9, - 10, - 0, - 5 - ], - "style": "receipt-table-value" - } - ], - [ - { - "ol": [ - { - "text": "Payment received by cheque/demand draft shall be subject to realization.", - "margin": [ - 8, - 0, - 0, - 5 - ] - }, - { - "text": "This document is not a proof of Property Ownership and regularization of unauthorized construction.", - "margin": [ - 8, - 0, - 0, - 5 - ] - }, - { - "text": "This is a computer generated document, hence requires no signature.", - "margin": [ - 8, - 0, - 0, - 5 - ] - }, - { - "text": "Assessment & Payment is subject to verification/Scrutiny by competitive authority.", - "margin": [ - 8, - 0, - 0, - 5 - ] - }, - { - "text": "Please deposit property tax dues for earlier years also. Ignore, if already paid.", - "margin": [ - 8, - 0, - 0, - 5 - ] - }, - { - "text": "If the tax payers fail to pay the property tax within 15 days from the date of receipt of this Demand Bill, the same amount can be collected by issuing a distraint warrant u/s Section-269 of Municipal Corporations Act, 1955 (formerly GHMC Act, 1955)", - "margin": [ - 8, - 0, - 0, - 10 - ] - } - ], - "border": [ - true, - false, - true, - true - ], - "alignment": "left" - } - ] - ] - }, - "layout": {} - }, - { - "canvas": [ - { - "type": "line", - "x1": -40, - "y1": 30, - "x2": 700, - "y2": 30, - "dash": { - "length": 10, - "space": 5 - } - } - ] - }, - { - "image": "{{variable1}}", - "width": 14, - "height": 14, - "margin": [ - -30, - -7, - 0, - 0 - ] - }, - { - "text": "Acknowledgement( For Official use only)", - "style": "footer-header" - }, - { - "style": "noc-table", - "table": { - "widths": [ - "*", - "*", - "*", - "*" - ], - "body": [ - [ - { - "text": "Date", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "24/04/2018", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": "Consumer ID", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{variable15}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "Bill No.", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{variable5}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": "Name & Address", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{variable4}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "Total Payment", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{variable16}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - } - ] - ] - } - }, - { - "image": "{{footerLogoImage}}", - "width": 75, - "height": 10, - "alignment": "center", - "margin": [ - -12, - -10, - -230, - 0 - ] - } - ], - "styles": { - "noc-head": { - "margin": [ - -25, - -30, - 0, - 1 - ] - }, - "receipt-logo-header": { - "color": "#484848", - "fontFamily": "Roboto", - "fontSize": 14, - "bold": true, - "letterSpacing": 0.74, - "margin": [ - 0, - -10, - 0, - 5 - ] - }, - "receipt-logo-sub-header": { - "color": "#484848", - "fontFamily": "Roboto", - "fontSize": 13, - "letterSpacing": 0.6 - }, - "noc-table": { - "fontSize": 12, - "color": "#484848", - "margin": [ - -25, - 45, - -8, - -8 - ] - }, - "noc-table2": { - "fontSize": 12, - "color": "#484848", - "margin": [ - -25, - 18, - -8, - -8 - ] - }, - "noc-table3": { - "fontSize": 12, - "color": "#484848", - "margin": [ - -25, - 30, - -8, - -8 - ] - }, - "receipt-table-value": { - "color": "#000000", - "bold": true, - "fontSize": 12, - "fontWeight": 500, - "margin": [ - 8, - 5, - 0, - 0 - ] - }, - "receipt-table-value2": { - "color": "#000000", - "bold": true, - "fontSize": 12, - "fontWeight": 500, - "margin": [ - 3, - 5, - 0, - 0 - ] - }, - "receipt-table": { - "color": "#484848", - "bold": true, - "fontSize": 12, - "fontWeight": 400, - "margin": [ - -30, - 5, - 0, - 0 - ] - }, - "receipt-table2": { - "color": "#484848", - "bold": true, - "fontSize": 12, - "fontWeight": 400, - "margin": [ - 3, - 8, - 0, - 10 - ] - }, - "right-receipt-table": { - "color": "#000000", - "bold": true, - "fontSize": 12, - "fontWeight": 500, - "margin": [ - 8, - -10, - 0, - 10 - ] - }, - "right-receipt-table2": { - "color": "#484848", - "bold": true, - "fontSize": 12, - "fontWeight": 400, - "margin": [ - -30, - -10, - 0, - 0 - ] - }, - "receipt-approver": { - "fontSize": 12, - "bold": true, - "margin": [ - -27, - 50, - -10, - 0 - ], - "color": "#484848" - }, - "no-signature": { - "fontSize": 12, - "margin": [ - -27, - 35, - -10, - 0 - ], - "color": "#484848" - }, - "amount-due": { - "fontSize": 30, - "color": "#FC8019", - "fontWeight": 700 - }, - "pt-disclaimer": { - "fontSize": 12, - "margin": [ - -27, - 30, - -10, - 0 - ], - "color": "#484848" - }, - "pt-disclaimer-value": { - "fontSize": 12, - "margin": [ - 0, - 5, - 0, - 0 - ], - "color": "#484848" - }, - "qr-text": { - "fontSize": 12, - "margin": [ - 40, - 0, - 0, - 0 - ], - "color": "#484848", - "alignment": "left" - }, - "qr-image": { - "margin": [ - -40, - -1, - -3, - 0 - ], - "color": "#484848", - "alignment": "right" - }, - "footer-header": { - "margin": [ - 0, - 15, - 0, - -40 - ], - "color": "#000000", - "alignment": "center" - } - } - } -} diff --git a/configs/pdf-service/format-config/consolidatedbill.json b/configs/pdf-service/format-config/consolidatedbill.json deleted file mode 100644 index c5f8282e..00000000 --- a/configs/pdf-service/format-config/consolidatedbill.json +++ /dev/null @@ -1,1033 +0,0 @@ -{ - "key": "consolidatedbill", - "config": { - "defaultStyle": { - "font": "Cambay" - }, - "watermark": { - "text": "DIGIT UAT DIGIT UAT", - "color": "gery", - "opacity": 0.1, - "bold": true, - "italics": false - }, - "content": [ - { - "style": "noc-head", - "table": { - "widths": [ - 60, - "*", - 120 - ], - "body": [ - [ - { - "image": "{{logoImage}}", - "width": 50, - "height": 61.25 - }, - { - "stack": [ - { - "text": "{{logo_header}} {{Municipal_Corporation}} (Digit UAT)", - "style": "receipt-logo-header" - }, - { - "stack": [ - { - "text": "{{address}}" - }, - { - "text": "{{phoneNumber}}" - }, - { - "text": "{{website}}" - }, - { - "text": "{{email}}" - } - ] - } - ], - "alignment": "left", - "margin": [ - 0, - 10, - 0, - 0 - ] - }, - { - "stack": [ - { - "text": "{{total_amount_due}}" - }, - { - "text": "{{Rs}} {{totalAmountDue}}", - "style": "amount-due" - } - ], - "alignment": "right", - "color": "#484848", - "margin": [ - -150, - 2, - -20, - 0 - ] - } - ] - ] - }, - "layout": "noBorders" - }, - { - "style": "noc-table", - "table": { - "widths": [ - 130, - 130, - -2, - 130, - 130 - ], - "body": [ - [ - { - "text": "{{payer_name}}", - "border": [ - true, - true, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{payerName}}", - "border": [ - false, - true, - true, - false - ], - "style": "receipt-table" - }, - { - "text": " ", - "border": [ - false, - false, - false, - false - ] - }, - { - "text": "{{bill_no}}", - "border": [ - true, - true, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{billNo}}", - "border": [ - false, - true, - true, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": "{{mobile_no}}", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{mobileNo}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - }, - { - "text": " ", - "border": [ - false, - false, - false, - false - ] - }, - { - "text": "{{bill_period}}", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{fromPeriod}} - {{toPeriod}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": "{{payer_address}}", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{payerAddress}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - }, - { - "text": " ", - "border": [ - false, - false, - false, - false - ] - }, - { - "text": "{{bill_issue_date}}", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{billIssueDate}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": " ", - "border": [ - true, - false, - false, - true - ], - "style": "receipt-table-value" - }, - { - "text": " ", - "border": [ - false, - false, - true, - true - ], - "style": "receipt-table" - }, - { - "text": " ", - "border": [ - false, - false, - false, - false - ] - }, - { - "text": "{{bill_due_date}}", - "border": [ - true, - false, - false, - true - ], - "style": "right-receipt-table" - }, - { - "text": "{{billDueDate}}", - "border": [ - false, - false, - true, - true - ], - "style": "right-receipt-table2" - } - ] - ] - }, - "layout": {} - }, - { - "style": "noc-table2", - "table": { - "widths": [ - "103%" - ], - "body": [ - [ - { - "text": "{{billing_summary_property_tax}} {{serviceType}}", - "border": [ - true, - true, - true, - false - ], - "style": "receipt-table-value" - } - ], - [ - { - "table": { - "widths": [ - "18%", - "26%", - "10%", - "9%", - "10%", - "9%", - "10%", - "9%" - ], - "body": [ - [ - { - "text": "{{consumer_no}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - }, - { - "text": "{{bill_period}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - }, - { - "text": "{{arrears_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - }, - { - "text": "{{charge_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - }, - { - "text": "{{penalty_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - }, - { - "text": "{{rebate_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - }, - { - "text": "{{others_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - }, - { - "text": "{{total_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - } - ], - [ - { - "text": "{{propertyID}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text": "{{fromPeriod}}-{{toPeriod}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text": "{{arrears}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text": "{{charge}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text": "{{penalty}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text": "{{rebate}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text": "{{others}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text": "{{total}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2", - "bold": true - } - ] - ] - }, - "border": [ - true, - false, - true, - true - ] - } - ] - ] - }, - "layout": {} - }, - { - "style": "noc-table3", - "table": { - "widths": [ - "103%" - ], - "body": [ - [ - { - "text": "{{important_message}}", - "border": [ - true, - true, - true, - false - ], - "margin": [ - 9, - 10, - 0, - 5 - ], - "style": "receipt-table-value" - } - ], - [ - { - "ol": [ - { - "text": "{{payment_received}}", - "margin": [ - 8, - 0, - 0, - 3 - ] - }, - { - "text": "{{this_document}}", - "margin": [ - 8, - 0, - 0, - 3 - ] - }, - { - "text": "{{this_is_a}}", - "margin": [ - 8, - 0, - 0, - 3 - ] - }, - { - "text": "{{assessment_payment}}", - "margin": [ - 8, - 0, - 0, - 3 - ] - }, - { - "text": "{{please_deposit}}", - "margin": [ - 8, - 0, - 0, - 3 - ] - }, - { - "text": "{{if_the_tax}}", - "margin": [ - 8, - 0, - 0, - 5 - ] - } - ], - "border": [ - true, - false, - true, - true - ], - "alignment": "left" - } - ] - ] - }, - "layout": {} - }, - { - "canvas": [ - { - "type": "line", - "x1": -40, - "y1": 30, - "x2": 700, - "y2": 30, - "dash": { - "length": 10, - "space": 5 - } - } - ] - }, - { - "image": "{{scissorImage}}", - "width": 24, - "height": 24, - "margin": [ - -30, - -11.2, - 0, - 0 - ] - }, - - { - "text": "{{acknowledgement_for}}", - "style": "footer-header", - "pageBreak": "before" - - }, - { - "style": "noc-table4", - "table": { - "widths": [ - "*", - "*", - "*", - "*" - ], - "body": [ - [ - { - "text": "{{date_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{billdate}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": " ", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": " ", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": "{{consumer_no}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{consumerID}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "{{bill_no}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{billNo}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": "{{name_address}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{nameAddress}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "{{total_payment}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{total}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - } - ] - ] - } - }, - { - "text": "{{receivers_signature}}", - "style": "footer-bottom" - }, - { - "image": "{{footerLogoImage}}", - "width": 75, - "height": 10, - "alignment": "center", - "margin": [ - -12, - -10, - -230, - 0 - ] - } - ], - "styles": { - "noc-head": { - "margin": [ - -25, - -30, - 0, - 1 - ] - }, - "receipt-logo-header": { - "color": "#484848", - "fontFamily": "Roboto", - "fontSize": 14, - "bold": true, - "letterSpacing": 0.74, - "margin": [ - 0, - -10, - 0, - 5 - ] - }, - "receipt-logo-sub-header": { - "color": "#484848", - "fontFamily": "Roboto", - "fontSize": 13, - "letterSpacing": 0.6 - }, - "noc-table": { - "fontSize": 12, - "color": "#484848", - "margin": [ - -25, - 10, - -8, - -8 - ] - }, - "noc-table4": { - "fontSize": 12, - "color": "#484848", - "margin": [ - -25, - 75, - -8, - -8 - ] - }, - "noc-table2": { - "fontSize": 12, - "color": "#484848", - "margin": [ - -25, - 18, - -8, - -8 - ] - }, - "noc-table3": { - "fontSize": 12, - "color": "#484848", - "margin": [ - -25, - 30, - -8, - -8 - ] - }, - "receipt-table-value": { - "color": "#000000", - "bold": true, - "fontSize": 12, - "fontWeight": 500, - "margin": [ - 8, - 5, - 0, - 0 - ] - }, - "receipt-table-value2": { - "color": "#000000", - "bold": true, - "fontSize": 12, - "fontWeight": 500, - "margin": [ - 3, - 5, - 0, - 0 - ] - }, - "receipt-table": { - "color": "#484848", - "bold": true, - "fontSize": 12, - "fontWeight": 400, - "margin": [ - -30, - 5, - 0, - 0 - ] - }, - "receipt-table2": { - "color": "#484848", - "bold": true, - "fontSize": 11, - "fontWeight": 400, - "margin": [ - 3, - 8, - 0, - 10 - ] - }, - "right-receipt-table": { - "color": "#000000", - "bold": true, - "fontSize": 12, - "fontWeight": 500, - "margin": [ - 8, - 5, - 0, - 10 - ] - }, - "right-receipt-table2": { - "color": "#484848", - "bold": true, - "fontSize": 12, - "fontWeight": 400, - "margin": [ - -30, - 5, - 0, - 0 - ] - }, - "receipt-approver": { - "fontSize": 12, - "bold": true, - "margin": [ - -27, - 50, - -10, - 0 - ], - "color": "#484848" - }, - "no-signature": { - "fontSize": 12, - "margin": [ - -27, - 35, - -10, - 0 - ], - "color": "#484848" - }, - "amount-due": { - "fontSize": 30, - "color": "#FC8019", - "bold": true, - "fontWeight": 700 - }, - "pt-disclaimer": { - "fontSize": 12, - "margin": [ - -27, - 30, - -10, - 0 - ], - "color": "#484848" - }, - "pt-disclaimer-value": { - "fontSize": 12, - "margin": [ - 0, - 5, - 0, - 0 - ], - "color": "#484848" - }, - "qr-text": { - "fontSize": 12, - "margin": [ - 40, - 0, - 0, - 0 - ], - "color": "#484848", - "alignment": "left" - }, - "qr-image": { - "margin": [ - -40, - -1, - -3, - 0 - ], - "color": "#484848", - "alignment": "right" - }, - "footer-header": { - "margin": [ - 0, - 15, - 0, - -40 - ], - "bold": true, - "color": "#000000", - "alignment": "center" - }, - "footer-bottom": { - "margin": [ - 0, - 50, - 0, - 0 - ], - "bold": true, - "color": "#000000", - "alignment": "right" - } - } - } -} diff --git a/configs/pdf-service/format-config/consolidatedreceipt.json b/configs/pdf-service/format-config/consolidatedreceipt.json deleted file mode 100644 index 7a20a751..00000000 --- a/configs/pdf-service/format-config/consolidatedreceipt.json +++ /dev/null @@ -1,1390 +0,0 @@ -{ - "key": "consolidatedreceipt", - "config": { - "defaultStyle": { - "font": "Cambay" - }, - "watermark": { - "text": "DIGIT UAT DIGIT UAT", - "color": "gery", - "opacity": 0.1, - "bold": true, - "italics": false - }, - "content": [ - { - "style": "noc-head", - "table": { - "widths": [ - 60, - "*", - 150 - ], - "body": [ - [ - { - "image": "{{logoImage}}", - "width": 50, - "height": 50 - }, - { - "stack": [ - { - "text": "{{logo-header}} {{mcGrade}} (Digit UAT)", - "style": "receipt-logo-header" - }, - { - "text": "{{serviceType}} {{payment_receipt}} (Employee Copy)", - "style": "receipt-logo-sub-header" - } - ], - "alignment": "left", - "margin": [ - 0, - 4, - 0, - 0 - ] - }, - { - "stack": [ - { - "text": "{{address}},{{phoneNumber}}", - "style": "receipt-logo-sub-header" - }, - { - "text": "{{website}},{{email}}", - "style": "receipt-logo-sub-header" - } - ], - "alignment": "right", - "color": "#484848", - "margin": [ - -100, - 0, - -25, - 0 - ] - } - ] - ] - }, - "layout": "noBorders" - }, - { - "style": "noc-table", - "table": { - "widths": [ - "30%", - "20%", - "30%", - "20%" - ], - "body": [ - [ - { - "text": "{{receipt_no}}.", - "border": [ - true, - true, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{receiptNo}}", - "border": [ - false, - true, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "{{consumer_id}}", - "border": [ - false, - true, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{consumerID}}", - "border": [ - false, - true, - true, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": "Receipt Date", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{ReceiptDate}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "Tax period", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{fromPeriod}} {{to}} {{toPeriod}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - } - ], - [ - - { - "text": "Consumer Name", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{payerName}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "Contact No.", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{payerContact}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - } - ], - [ - - { - "text": "Address:", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{payerAddress}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "Paid By", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{PaidBy}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - } - ] - ] - }, - "layout": {} - }, - { - "style": "next-noc-table", - "table": { - "widths": [ - "30%", - "20%", - "30%", - "20%" - ], - "body": [ - [ - { - "text": "{{service_type}}", - "border": [ - true, - true, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{serviceType}}", - "border": [ - false, - true, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "{{billing_period}}", - "border": [ - false, - true, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{fromPeriod}} {{to}} {{toPeriod}}", - "border": [ - false, - true, - true, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": "{{paid_amount}}", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "₹ {{paidAmount}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "{{payment_mode}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{paymentMode}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": "Tax Amount", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "₹ {{taxAmount}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "Field Fee", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "₹ {{fieldFee}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - } - ],[ - { - "text": "CGST(if applicable)", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "₹ {{cgst}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "SGST(if applicable)", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "₹ {{sgst}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": "Cheque/DD/PO/Transaction No.", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{chequeDD}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "Cheque/DD/PO/Transaction Date", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{chequeDDDate}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - - } - ], [ - { - "text": "Bank Name", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{bankName}},{{branchName}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "IFSC Code", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{ifsc}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - - } - ], - [ - { - "text": "{{g8_receipt_no}}.", - "border": [ - true, - false, - false, - true - ], - "style": "receipt-table-value" - }, - { - "text": "{{G8ReceiptNo}}", - "border": [ - false, - false, - false, - true - ], - "style": "receipt-table" - }, - { - "text": "{{g8_receipt_date}}", - "border": [ - false, - false, - false, - true - ], - "style": "receipt-table-value" - }, - { - "text": "{{G8ReceiptDate}}", - "border": [ - false, - false, - true, - true - ], - "style": "receipt-table" - } - ] - ] - }, - "layout": {} - }, - { - "style": "next-noc-table", - "table": { - "widths": [ - "10%", - "*" - ], - "body": [ - [ - { - "text":"Comments: ", - "border":[false, false, false, false] - }, - { - "text":"{{comments}}", - "border":[false, false, false, false] - } - ] - ], - "layout":"noBorders" - } - }, - { - "style": "receipt-approver", - "columns": [ - { - "text": [ - { - "text": "{{generated_by}}: ", - "bold": true - }, - { - "text": "{{user-name}}", - "bold": false - } - ], - "alignment": "left" - }, - { - "text": [ - { - "text": "Authorised Signatory", - "bold": true - } - ], - "alignment": "right", - "margin": [ - 0, - 0, - -10, - 1 - ] - } - ] - }, - { - "text":"---------------x------------------------------x-----------------------------x------------------------------x-----------------------x------------------x------", - "style":"next-noc-table" - - }, - { - "style": "noc-head-emp", - "table": { - "widths": [ - 60, - "*", - 120 - ], - "body": [ - [ - { - "image": "{{logoImage}}", - "width": 50, - "height": 50 - }, - { - "stack": [ - { - "text": "{{logo-header}} {{mcGrade}}", - "style": "receipt-logo-header" - }, - { - "text": "{{serviceType}} {{payment_receipt}} (Citizen Copy)", - "style": "receipt-logo-sub-header" - } - ], - "alignment": "left", - "margin": [ - 0, - 4, - 0, - 0 - ] - }, - { - "stack": [ - { - "text": "{{address}},{{phoneNumber}}", - "style": "receipt-logo-sub-header" - }, - { - "text": "{{website}},{{email}}", - "style": "receipt-logo-sub-header" - } - ], - "alignment": "right", - "color": "#484848", - "margin": [ - -100, - 0, - -25, - 0 - ] - } - ] - ] - }, - "layout": "noBorders" - }, - { - "style": "noc-table", - "table": { - "widths": [ - "30%", - "20%", - "30%", - "20%" - ], - "body": [ - [ - { - "text": "{{receipt_no}}.", - "border": [ - true, - true, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{receiptNo}}", - "border": [ - false, - true, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "{{consumer_id}}", - "border": [ - false, - true, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{consumerID}}", - "border": [ - false, - true, - true, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": "Receipt Date", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{ReceiptDate}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "Tax period", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{fromPeriod}} {{to}} {{toPeriod}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - } - ], - [ - - { - "text": "Consumer Name", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{payerName}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "Contact No.", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{payerContact}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - } - ], - [ - - { - "text": "Address:", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{payerAddress}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "Paid By", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{PaidBy}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - } - ] - - ] - }, - "layout": {} - }, - { - "style": "next-noc-table", - "table": { - "widths": [ - "30%", - "20%", - "30%", - "20%" - ], - "body": [ - [ - { - "text": "{{service_type}}", - "border": [ - true, - true, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{serviceType}}", - "border": [ - false, - true, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "{{billing_period}}", - "border": [ - false, - true, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{fromPeriod}} {{to}} {{toPeriod}}", - "border": [ - false, - true, - true, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": "{{paid_amount}}", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "₹ {{paidAmount}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "{{payment_mode}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{paymentMode}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - } - ], [ - { - "text": "Tax Amount", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "₹ {{taxAmount}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "Field Fee", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "₹ {{fieldFee}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - } - ],[ - { - "text": "CGST(if applicable)", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "₹ {{cgst}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "SGST(if applicable)", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "₹ {{sgst}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": "Cheque/DD/PO/Transaction No.", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{chequeDD}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "Cheque/DD/PO/Transaction Date", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{chequeDDDate}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - - } - ],[ - { - "text": "Bank Name", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{bankName}},{{branchName}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "IFSC Code", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{ifsc}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - - } - ], - [ - { - "text": "{{g8_receipt_no}}.", - "border": [ - true, - false, - false, - true - ], - "style": "receipt-table-value" - }, - { - "text": "{{G8ReceiptNo}}", - "border": [ - false, - false, - false, - true - ], - "style": "receipt-table" - }, - { - "text": "{{g8_receipt_date}}", - "border": [ - false, - false, - false, - true - ], - "style": "receipt-table-value" - }, - { - "text": "{{G8ReceiptDate}}", - "border": [ - false, - false, - true, - true - ], - "style": "receipt-table" - } - ] - ] - }, - "layout": {} - }, - { - "style": "next-noc-table", - "table": { - "widths": [ - "10%", - "*" - ], - "body": [ - [ - { - "text":"Comments: ", - "border":[false, false, false, false] - }, - { - "text":"{{comments}}", - "border":[false, false, false, false] - } - ] - ], - "layout":"noBorders" - } - }, - { - "style": "receipt-approver", - "columns": [ - { - "text": [ - { - "text": "{{generated_by}}: ", - "bold": true - }, - { - "text": "{{user-name}}", - "bold": false - } - ], - "alignment": "left" - }, - { - "text": [ - { - "text": "Authorised Signatory", - "bold": true - } - ], - "alignment": "right", - "margin": [ - 0, - 0, - -10, - 1 - ] - } - ] - }, - { - "style": "pt-disclaimer", - "stack": [ - { - "text": "{{disclamer}}", - "bold": true, - "style": "pt-disclaimer-value" - }, - { - "text": "{{disclamer_1}}", - "bold": false, - "style": "pt-disclaimer-value" - }, - { - "text": "{{disclamer_2}}", - "bold": false, - "style": "pt-disclaimer-value" - }, - { - "text": "{{disclamer_3}}", - "bold": false, - "style": "pt-disclaimer-value" - }, { - "text":"Now log a complaint from WhatsApp, give a missed call on 8750975975 or send a Hi message on WhatsApp to this number", "bold": true, "fontSize": 8, "color": "blue", "decoration": "underline"} - ] - }, - { - "image": "{{footerLogoImage}}", - "width": 75, - "height": 10, - "alignment": "center", - "margin": [ - -12, - -10, - -230, - 0 - ] - } - ], - "styles": { - "noc-head": { - "margin": [ - -30, - -30, - 0, - 1 - ] - }, - "noc-head-emp": { - "margin": [ - -30, - 10, - 0, - 1 - ] - }, - "receipt-logo-header": { - "color": "#000000", - "fontSize": 10, - "bold": true, - "letterSpacing": 0.74, - "margin": [ - 0, - 0, - 0, - 4 - ] - }, - "receipt-logo-sub-header": { - "color": "#000000", - "fontSize": 8, - "letterSpacing": 0.6 - }, - "noc-table": { - "fontSize": 8, - "color": "#000000", - "margin": [ - -25, - 10, - -22, - -8 - ] - }, - "next-noc-table": { - "fontSize": 8, - "color": "#000000", - "margin": [ - -25, - 6, - -22, - 0 - ] - }, - "receipt-table-value": { - "color": "#000000", - "bold": true, - "fontSize": 8, - "fontWeight": 500, - "margin": [ - 8, - 0, - 0, - 0 - ] - }, - "receipt-table": { - "color": "#000000", - "bold": false, - "fontSize": 8, - "fontWeight": 400, - "margin": [ - -30, - 0, - 0, - 0 - ] - }, - "receipt-approver": { - "fontSize": 8, - "bold": true, - "margin": [ - -27, - 3, - -10, - 0 - ] - }, - "no-signature": { - "fontSize": 8, - "margin": [ - -27, - 3, - -10, - 0 - ] - }, - "pt-disclaimer": { - "fontSize": 8, - "margin": [ - -27, - 3, - -10, - 0 - ] - }, - "pt-disclaimer-value": { - "fontSize": 8, - "margin": [ - 2, - 1, - 0, - 0 - ] - } - } - } -} - - diff --git a/configs/pdf-service/format-config/consolidatedreceiptold.json b/configs/pdf-service/format-config/consolidatedreceiptold.json deleted file mode 100644 index 869c08ce..00000000 --- a/configs/pdf-service/format-config/consolidatedreceiptold.json +++ /dev/null @@ -1,1411 +0,0 @@ -{ - "key": "consolidatedreceiptold", - "config": { - "defaultStyle": { - "font": "Cambay" - }, - "watermark": { - "text": "DIGIT UAT DIGIT UAT", - "color": "gery", - "opacity": 0.1, - "bold": true, - "italics": false - }, - "content": [ - { - "style": "noc-head", - "table": { - "widths": [ - 60, - "*", - 150 - ], - "body": [ - [ - { - "image": "{{logoImage}}", - "width": 50, - "height": 50 - }, - { - "stack": [ - { - "text": "{{logo-header}} {{mcGrade}} (Digit UAT)", - "style": "receipt-logo-header" - }, - { - "text": "{{serviceType}} {{payment_receipt}} (Employee Copy)", - "style": "receipt-logo-sub-header" - } - ], - "alignment": "left", - "margin": [ - 0, - 4, - 0, - 0 - ] - }, - { - "stack": [ - { - "text": "{{address}},{{phoneNumber}}", - "style": "receipt-logo-sub-header" - }, - { - "text": "{{website}},{{email}}", - "style": "receipt-logo-sub-header" - } - ], - "alignment": "right", - "color": "#484848", - "margin": [ - -100, - 0, - -25, - 0 - ] - } - ] - ] - }, - "layout": "noBorders" - }, - { - "style": "noc-table", - "table": { - "widths": [ - "30%", - "20%", - "30%", - "20%" - ], - "body": [ - [ - { - "text": "{{receipt_no}}.", - "border": [ - true, - true, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{receiptNo}}", - "border": [ - false, - true, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "{{consumer_id}}", - "border": [ - false, - true, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{consumerID}}", - "border": [ - false, - true, - true, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": "Receipt Date", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{ReceiptDate}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "Tax period", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{fromPeriod}} {{to}} {{toPeriod}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - } - ], - [ - - { - "text": "Consumer Name", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{payerName}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "Contact No.", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{payerContact}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - } - ], - [ - - { - "text": "Address:", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{payerAddress}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "Paid By", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{PaidBy}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - } - ] - ] - }, - "layout": {} - }, - { - "style": "next-noc-table", - "table": { - "widths": [ - "30%", - "20%", - "30%", - "20%" - ], - "body": [ - [ - { - "text": "{{service_type}}", - "border": [ - true, - true, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{serviceType}}", - "border": [ - false, - true, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "{{billing_period}}", - "border": [ - false, - true, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{fromPeriod}} {{to}} {{toPeriod}}", - "border": [ - false, - true, - true, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": "{{paid_amount}}", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "₹ {{paidAmount}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - - "text": "{{payment_mode}}", - - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{paymentMode}}", - - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": "Tax Amount", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "₹ {{taxAmount}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - - "text": "Field Fee", - - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - - "text": "₹ {{fieldFee}}", - - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - } - ],[ - { - "text": "CGST(if applicable)", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "₹ {{cgst}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - - "text": "SGST(if applicable)", - - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - - "text": "₹ {{sgst}}", - - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": "Cheque/DD/PO/Transaction No.", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{chequeDD}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "Cheque/DD/PO/Transaction Date", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{chequeDDDate}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - - } - ], [ - { - "text": "Bank Name", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{bankName}},{{branchName}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "IFSC Code", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{ifsc}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - - } - ], - [ - { - "text": "{{g8_receipt_no}}.", - "border": [ - true, - false, - false, - true - ], - "style": "receipt-table-value" - }, - { - "text": "{{G8ReceiptNo}}", - "border": [ - false, - false, - false, - true - ], - "style": "receipt-table" - }, - { - "text": "{{g8_receipt_date}}", - "border": [ - false, - false, - false, - true - ], - "style": "receipt-table-value" - }, - { - "text": "{{G8ReceiptDate}}", - "border": [ - false, - false, - true, - true - ], - "style": "receipt-table" - } - ] - ] - }, - "layout": {} - }, - { - "style": "next-noc-table", - "table": { - "widths": [ - "10%", - "*" - ], - "body": [ - [ - { - "text":"Comments: ", - "border":[false, false, false, false] - }, - { - "text":"{{comments}}", - "border":[false, false, false, false] - } - ] - ], - "layout":"noBorders" - } - }, - { - "style": "receipt-approver", - "columns": [ - { - "text": [ - { - "text": "{{generated_by}}: ", - "bold": true - }, - { - "text": "{{user-name}}", - "bold": false - } - ], - "alignment": "left" - }, - { - "text": [ - { - "text": "Authorised Signatory", - "bold": true - } - ], - "alignment": "right", - "margin": [ - 0, - 0, - -10, - 1 - ] - } - ] - }, - { - "text":"---------------x------------------------------x-----------------------------x------------------------------x-----------------------x------------------x------", - "style":"next-noc-table" - - }, - { - "style": "noc-head-emp", - "table": { - "widths": [ - 60, - "*", - 120 - ], - "body": [ - [ - { - "image": "{{logoImage}}", - "width": 50, - "height": 50 - }, - { - "stack": [ - { - "text": "{{logo-header}} {{mcGrade}}", - "style": "receipt-logo-header" - }, - { - "text": "{{serviceType}} {{payment_receipt}} (Citizen Copy)", - "style": "receipt-logo-sub-header" - } - ], - "alignment": "left", - "margin": [ - 0, - 4, - 0, - 0 - ] - }, - { - "stack": [ - { - "text": "{{address}},{{phoneNumber}}", - "style": "receipt-logo-sub-header" - }, - { - "text": "{{website}},{{email}}", - "style": "receipt-logo-sub-header" - } - ], - "alignment": "right", - "color": "#484848", - "margin": [ - -100, - 0, - -25, - 0 - ] - } - ] - ] - }, - "layout": "noBorders" - }, - { - "style": "noc-table", - "table": { - "widths": [ - "30%", - "20%", - "30%", - "20%" - ], - "body": [ - [ - { - "text": "{{receipt_no}}.", - "border": [ - true, - true, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{receiptNo}}", - "border": [ - false, - true, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "{{consumer_id}}", - "border": [ - false, - true, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{consumerID}}", - "border": [ - false, - true, - true, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": "Receipt Date", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{ReceiptDate}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "Tax period", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{fromPeriod}} {{to}} {{toPeriod}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - } - ], - [ - - { - "text": "Consumer Name", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{payerName}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "Contact No.", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{payerContact}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - } - ], - [ - - { - "text": "Address:", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{payerAddress}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "Paid By", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{PaidBy}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - } - ] - - ] - }, - "layout": {} - }, - { - "style": "next-noc-table", - "table": { - "widths": [ - "30%", - "20%", - "30%", - "20%" - ], - "body": [ - [ - { - "text": "{{service_type}}", - "border": [ - true, - true, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{serviceType}}", - "border": [ - false, - true, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "{{billing_period}}", - "border": [ - false, - true, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{fromPeriod}} {{to}} {{toPeriod}}", - "border": [ - false, - true, - true, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": "{{paid_amount}}", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "₹ {{paidAmount}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - - "text": "{{payment_mode}}", - - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - - "text": "{{paymentMode}}", - - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - } - ], [ - { - "text": "Tax Amount", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "₹ {{taxAmount}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - - "text": "Field Fee", - - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - - "text": "₹ {{fieldFee}}", - - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - } - ],[ - { - "text": "CGST(if applicable)", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "₹ {{cgst}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - - "text": "SGST(if applicable)", - - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - - "text": "₹ {{sgst}}", - - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": "Cheque/DD/PO/Transaction No.", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{chequeDD}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "Cheque/DD/PO/Transaction Date", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{chequeDDDate}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - - } - ],[ - { - "text": "Bank Name", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{bankName}},{{branchName}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "IFSC Code", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{ifsc}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - - } - ], - [ - { - "text": "{{g8_receipt_no}}.", - "border": [ - true, - false, - false, - true - ], - "style": "receipt-table-value" - }, - { - "text": "{{G8ReceiptNo}}", - "border": [ - false, - false, - false, - true - ], - "style": "receipt-table" - }, - { - "text": "{{g8_receipt_date}}", - "border": [ - false, - false, - false, - true - ], - "style": "receipt-table-value" - }, - { - "text": "{{G8ReceiptDate}}", - "border": [ - false, - false, - true, - true - ], - "style": "receipt-table" - } - ] - ] - }, - "layout": {} - }, - { - "style": "next-noc-table", - "table": { - "widths": [ - "10%", - "*" - ], - "body": [ - [ - { - "text":"Comments: ", - "border":[false, false, false, false] - }, - { - "text":"{{comments}}", - "border":[false, false, false, false] - } - ] - ], - "layout":"noBorders" - } - }, - { - "style": "receipt-approver", - "columns": [ - { - "text": [ - { - "text": "{{generated_by}}: ", - "bold": true - }, - { - "text": "{{user-name}}", - "bold": false - } - ], - "alignment": "left" - }, - { - "text": [ - { - "text": "Authorised Signatory", - "bold": true - } - ], - "alignment": "right", - "margin": [ - 0, - 0, - -10, - 1 - ] - } - ] - }, - { - "style": "pt-disclaimer", - "stack": [ - { - "text": "{{disclamer}}", - "bold": true, - "style": "pt-disclaimer-value" - }, - { - "text": "{{disclamer_1}}", - "bold": false, - "style": "pt-disclaimer-value" - }, - { - "text": "{{disclamer_2}}", - "bold": false, - "style": "pt-disclaimer-value" - }, - { - "text": "{{disclamer_3}}", - "bold": false, - "style": "pt-disclaimer-value" - }, { - "text":"Now log a complaint from WhatsApp, give a missed call on 8750975975 or send a Hi message on WhatsApp to this number", "bold": true, "fontSize": 8, "color": "blue", "decoration": "underline"} - ] - }, - { - "image": "{{footerLogoImage}}", - "width": 75, - "height": 10, - "alignment": "center", - "margin": [ - -12, - -10, - -230, - 0 - ] - } - ], - "styles": { - "noc-head": { - "margin": [ - -30, - -30, - 0, - 1 - ] - }, - "noc-head-emp": { - "margin": [ - -30, - 10, - 0, - 1 - ] - }, - "receipt-logo-header": { - "color": "#000000", - "fontSize": 10, - "bold": true, - "letterSpacing": 0.74, - "margin": [ - 0, - 0, - 0, - 4 - ] - }, - "receipt-logo-sub-header": { - "color": "#000000", - "fontSize": 8, - "letterSpacing": 0.6 - }, - "noc-table": { - "fontSize": 8, - "color": "#000000", - "margin": [ - -25, - 10, - -22, - -8 - ] - }, - "next-noc-table": { - "fontSize": 8, - "color": "#000000", - "margin": [ - -25, - 6, - -22, - 0 - ] - }, - "receipt-table-value": { - "color": "#000000", - "bold": true, - "fontSize": 8, - "fontWeight": 500, - "margin": [ - 8, - 0, - 0, - 0 - ] - }, - "receipt-table": { - "color": "#000000", - "bold": false, - "fontSize": 8, - "fontWeight": 400, - "margin": [ - -30, - 0, - 0, - 0 - ] - }, - "receipt-approver": { - "fontSize": 8, - "bold": true, - "margin": [ - -27, - 3, - -10, - 0 - ] - }, - "no-signature": { - "fontSize": 8, - "margin": [ - -27, - 3, - -10, - 0 - ] - }, - "pt-disclaimer": { - "fontSize": 8, - "margin": [ - -27, - 3, - -10, - 0 - ] - }, - "pt-disclaimer-value": { - "fontSize": 8, - "margin": [ - 2, - 1, - 0, - 0 - ] - } - } - } -} diff --git a/configs/pdf-service/format-config/firenoc-receipt.json b/configs/pdf-service/format-config/firenoc-receipt.json deleted file mode 100644 index f1fd6a8f..00000000 --- a/configs/pdf-service/format-config/firenoc-receipt.json +++ /dev/null @@ -1,491 +0,0 @@ -{ - "key":"firenoc-receipt", - "config":{ - "watermark": { - "text": "DIGIT UAT DIGIT UAT", - "color": "gery", - "opacity": 0.1, - "bold": true, - "italics": false - }, - "content": [ - { - "style": "noc-head", - "table": { - "widths": [ - 120, - "*", - 120 - ], - "body": [ - [ - { - "image": "{{variable32}}", - "width": 60, - "height": 61.25, - "margin": [ - 51, - 12, - 10, - 10 - ] - }, - { - "stack": [ - { - "text": "{{variable20}} NAGAR PANCHAYAT", - "style": "receipt-logo-header" - }, - { - "text": "Fire NOC Payment Receipt", - "style": "receipt-logo-sub-header" - } - ], - "alignment": "left", - "margin": [ - 10, - 23, - 0, - 0 - ] - }, - { - "image": "{{variable14}}", - "width": 70, - "height": 70, - "margin": [ - 50, - 8, - 8, - 8 - ], - "alignment": "right" - } - ] - ] - }, - "layout": "noBorders" - }, - { - "style": "noc-subhead", - "columns": [ - { - "text": [ - { - "text": "Application No. ", - "bold": true - }, - { - "text": "{{variable1}}", - "bold": false - } - ], - "alignment": "left" - }, - { - "text": [ - { - "text": "Date of Payment ", - "bold": true - }, - { - "text": "{{variable6}}", - "bold": false - } - ], - "alignment": "right" - } - ] - }, - { - "style": "noc-subhead", - "columns": [ - { - "text": [ - { - "text": "Payment Receipt No. ", - "bold": true - }, - { - "text": "{{variable7}}", - "bold": false - } - ], - "alignment": "left" - } - ] - }, - "{{#variable3}}{ \"text\": \"INSTITUTION DETAILS\", \"style\": \"noc-title\" }, { \"style\": \"noc-table\", \"table\": { \"widths\": [\"*\", \"*\", \"*\", \"*\"], \"body\": [ [ { \"text\": \"Type of Institution\", \"border\": [true, true, false, false] }, { \"text\": \"Name of Institute\", \"border\": [false, true, false, false] }, { \"text\": \"Official Telephone No.\", \"border\": [false, true, false, false] }, { \"text\": \"Authorized Person\", \"border\": [false, true, true, false] } ], [ { \"text\": \"{{variable21}}\", \"style\": \"receipt-table-value\", \"border\": [true, false, false, false] }, { \"text\": \"{{variable22}}\", \"style\": \"receipt-table-value\", \"border\": [false, false, false, false] }, { \"text\": \"{{variable23}}\", \"style\": \"receipt-table-value\", \"border\": [false, false, false, false] }, { \"text\": \"{{variable24}}\", \"style\": \"receipt-table-value\", \"border\": [false, false, true, false] } ], [ { \"text\": \"Designation in Institution\", \"border\": [true, false, false, false] }, { \"text\": \"Mobile No. of Authorized Person\", \"border\": [false, false, false, false] }, { \"text\": \"Email of Authorized Person\", \"border\": [false, false, false, false] }, { \"text\": \"Official Correspondence Address\", \"border\": [false, false, true, false] } ], [ { \"text\": \"{{variable25}}\", \"style\": \"receipt-table-value\", \"border\": [true, false, false, true] }, { \"text\": \"{{variable26}}\", \"style\": \"receipt-table-value\", \"border\": [false, false, false, true] }, { \"text\": \"{{variable27}}\", \"style\": \"receipt-table-value\", \"border\": [false, false, false, true] }, { \"text\": \"{{variable28}}\", \"style\": \"receipt-table-value\", \"border\": [false, false, true, true] } ] ] }, \"layout\": {} }{{/variable3}}{{^variable3}}{ \"text\": \"APPLICANT INFORMATION\", \"style\": \"noc-title\" }, { \"style\": \"noc-table", "table\": { \"widths\": [ \"*\", \"*\", \"*\", \"*\" ], \"body\": [ \"{{#variable2}}[{\"text\":\"Applicant Name\",\"border\":[true,true,false,true],\"style\":\"receipt-table-value\"},{\"text\":\"{{name}}\",\"border\":[false,true,true,true]},{\"text\":\"Mobile No.\",\"border\":[true,true,false,true],\"style\":\"receipt-table-value\"},{\"text\":\"{{mobileNumber}}\",\"border\":[false,true,true,true]}]{{/variable2}}\" ] }, \"layout\": {} }{{/variable3}}", - { - "text": "AMOUNT PAID", - "style": "noc-title" - }, - { - "style": "noc-table", - "table": { - "widths": [ - "*", - "*", - "*", - "*" - ], - "body": [ - [ - { - "text": "NOC Fee", - "border": [ - true, - true, - true, - true - ], - "style": "receipt-table-value", - "alignment": "center" - }, - { - "text": "NOC Taxes", - "border": [ - true, - true, - true, - true - ], - "style": "receipt-table-value", - "alignment": "center" - }, - { - "text": "Adhoc Penalty/Rebate", - "border": [ - true, - true, - true, - true - ], - "style": "receipt-table-value", - "alignment": "center" - }, - { - "text": "TOTAL", - "border": [ - true, - true, - true, - true - ], - "style": "receipt-table-value", - "alignment": "center" - } - ], - [ - { - "text": "{{variable8}}", - "border": [ - true, - true, - true, - true - ], - "alignment": "center" - }, - { - "text": "{{variable9}}", - "border": [ - true, - true, - true, - true - ], - "alignment": "center" - }, - { - "text": "{{variable31}}", - "border": [ - true, - true, - true, - true - ], - "alignment": "center" - }, - { - "text": "{{variable10}}", - "border": [ - true, - true, - true, - true - ], - "alignment": "center" - } - ] - ] - }, - "layout": {} - }, - { - "text": "PAYMENT INFORMATION", - "style": "noc-title" - }, - { - "style": "noc-table", - "table": { - "widths": [ - "*", - "*", - "*" - ], - "body": [ - [ - { - "text": "Payment Mode", - "border": [ - true, - true, - true, - true - ], - "style": "receipt-table-value", - "alignment": "center" - }, - { - "text": "Transaction ID/ Cheque/ DD No.", - "border": [ - true, - true, - true, - true - ], - "style": "receipt-table-value", - "alignment": "center" - }, - { - "text": "Bank Name & Branch", - "border": [ - true, - true, - true, - true - ], - "style": "receipt-table-value", - "alignment": "center" - } - ], - [ - { - "text": "{{variable18}}", - "border": [ - true, - true, - true, - true - ], - "alignment": "center" - }, - { - "text": "{{variable12}}", - "border": [ - true, - true, - true, - true - ], - "alignment": "center" - }, - { - "text": "{{variable13}}", - "border": [ - true, - true, - true, - true - ], - "alignment": "center" - } - ] - ] - }, - "layout": {} - }, - { - "style": "receipt-approver", - "columns": [ - { - "text": [ - { - "text": "Generated by: ", - "bold": true - }, - { - "text": "NOC Approver", - "bold": false - } - ], - "alignment": "left" - }, - { - "text": [ - { - "text": "Commissioner/EO", - "bold": true - } - ], - "alignment": "right" - }, - { - "text": [ - { - "text": "Note", - "bold": true - } - ], - "alignment": "left" - }, - - - { - "ol": - [ - - "This license is not the proof of Property Ownership or Copy of NOC.", - "This is a computer generated document, hence requires no signature.", - "Payment is subjected to vaerification /scrutiny by competent authority." - ], - "style":"disclaimer" - - } - ] - }, - { - "image": "{{footerLogoImage}}", - "width": 75, - "height": 10, - "alignment": "center", - "margin": [ - -12, - -10, - -230, - 0 - ] - } - ], - "footer": [], - "styles": { - "noc-head": { - "fillColor": "#F2F2F2", - "margin": [ - -70, - -41, - -81, - 0 - ] - }, - "receipt-logo-header": { - "color": "#484848", - "fontFamily": "Roboto", - "fontSize": 16, - "bold": true, - "letterSpacing": 0.74, - "margin": [ - 0, - 0, - 0, - 5 - ] - }, - "receipt-logo-sub-header": { - "color": "#484848", - "fontFamily": "Roboto", - "fontSize": 13, - "letterSpacing": 0.6 - }, - "noc-subhead": { - "fontSize": 12, - "bold": true, - "margin": [ - -18, - 8, - 0, - 0 - ], - "color": "#484848" - }, - "noc-title": { - "fontSize": 10, - "bold": true, - "margin": [ - -18, - 16, - 8, - 8 - ], - "color": "#484848", - "fontWeight": 500 - }, - "noc-table": { - "fontSize": 10, - "color": "#484848", - "margin": [ - -20, - -2, - -8, - -8 - ] - }, - "receipt-header-details": { - "fontSize": 9, - "margin": [ - 0, - 0, - 0, - 8 - ], - "color": "#484848" - }, - "noc-table-key": { - "color": "#484848", - "bold": false, - "fontSize": 10 - }, - "receipt-table-value": { - "color": "#484848", - "bold": true, - "fontSize": 10 - }, - "receipt-footer": { - "color": "#484848", - "fontSize": 8, - "margin": [ - -6, - 15, - -15, - -10 - ] - }, - "receipt-no": { - "color": "#484848", - "fontSize": 10 - }, - "receipt-approver": { - "fontSize": 12, - "bold": true, - "margin": [ - -20, - 30, - -10, - 0 - ], - "color": "#484848" - }, - "disclaimer": - { - "fontSize":"10", - "margin": [ - 10, - 0, - 0, - 0 - ] - } - } - } -} \ No newline at end of file diff --git a/configs/pdf-service/format-config/firenocreceipt.json b/configs/pdf-service/format-config/firenocreceipt.json deleted file mode 100644 index fc1fb90c..00000000 --- a/configs/pdf-service/format-config/firenocreceipt.json +++ /dev/null @@ -1,1389 +0,0 @@ -{ - "key": "firenocreceipt", - "config": { - "defaultStyle": { - "font": "Cambay" - }, - "watermark": { - "text": "DIGIT UAT DIGIT UAT", - "color": "gery", - "opacity": 0.1, - "bold": true, - "italics": false - }, - "content": [ - { - "style": "noc-head", - "table": { - "widths": [ - 60, - "*", - 150 - ], - "body": [ - [ - { - "image": "{{logoImage}}", - "width": 50, - "height": 50 - }, - { - "stack": [ - { - "text": "{{logo-header}} {{mcGrade}} (Digit UAT)", - "style": "receipt-logo-header" - }, - { - "text": "{{serviceType}} {{payment_receipt}} (Employee Copy)", - "style": "receipt-logo-sub-header" - } - ], - "alignment": "left", - "margin": [ - 0, - 4, - 0, - 0 - ] - }, - { - "stack": [ - { - "text": "{{address}},{{phoneNumber}}", - "style": "receipt-logo-sub-header" - }, - { - "text": "{{website}},{{email}}", - "style": "receipt-logo-sub-header" - } - ], - "alignment": "right", - "color": "#484848", - "margin": [ - -100, - 0, - -25, - 0 - ] - } - ] - ] - }, - "layout": "noBorders" - }, - { - "style": "noc-table", - "table": { - "widths": [ - "30%", - "20%", - "30%", - "20%" - ], - "body": [ - [ - { - "text": "{{receipt_no}}.", - "border": [ - true, - true, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{receiptNo}}", - "border": [ - false, - true, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "{{consumer_id}}", - "border": [ - false, - true, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{consumerID}}", - "border": [ - false, - true, - true, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": "Receipt Date", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{ReceiptDate}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "Tax period", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{fromPeriod}} {{to}} {{toPeriod}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - } - ], - [ - - { - "text": "Consumer Name", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{payerName}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "Contact No.", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{payerContact}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - } - ], - [ - - { - "text": "Address:", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{payerAddress}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "Paid By", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{PaidBy}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - } - ] - ] - }, - "layout": {} - }, - { - "style": "next-noc-table", - "table": { - "widths": [ - "30%", - "20%", - "30%", - "20%" - ], - "body": [ - [ - { - "text": "{{service_type}}", - "border": [ - true, - true, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{serviceType}}", - "border": [ - false, - true, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "{{billing_period}}", - "border": [ - false, - true, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{fromPeriod}} {{to}} {{toPeriod}}", - "border": [ - false, - true, - true, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": "{{paid_amount}}", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "₹ {{paidAmount}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "{{payment_mode}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{paymentMode}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": "Tax Amount", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "₹ {{taxAmount}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "Field Fee", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "₹ {{fieldFee}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - } - ],[ - { - "text": "CGST(if applicable)", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "₹ {{cgst}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "SGST(if applicable)", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "₹ {{sgst}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": "Cheque/DD/PO/Transaction No.", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{chequeDD}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "Cheque/DD/PO/Transaction Date", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{chequeDDDate}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - - } - ], [ - { - "text": "Bank Name", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{bankName}},{{branchName}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "IFSC Code", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{ifsc}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - - } - ], - [ - { - "text": "{{g8_receipt_no}}.", - "border": [ - true, - false, - false, - true - ], - "style": "receipt-table-value" - }, - { - "text": "{{G8ReceiptNo}}", - "border": [ - false, - false, - false, - true - ], - "style": "receipt-table" - }, - { - "text": "{{g8_receipt_date}}", - "border": [ - false, - false, - false, - true - ], - "style": "receipt-table-value" - }, - { - "text": "{{G8ReceiptDate}}", - "border": [ - false, - false, - true, - true - ], - "style": "receipt-table" - } - ] - ] - }, - "layout": {} - }, - { - "style": "next-noc-table", - "table": { - "widths": [ - "10%", - "*" - ], - "body": [ - [ - { - "text":"Comments: ", - "border":[false, false, false, false] - }, - { - "text":"{{comments}}", - "border":[false, false, false, false] - } - ] - ], - "layout":"noBorders" - } - }, - { - "style": "receipt-approver", - "columns": [ - { - "text": [ - { - "text": "{{generated_by}}: ", - "bold": true - }, - { - "text": "{{user-name}}", - "bold": false - } - ], - "alignment": "left" - }, - { - "text": [ - { - "text": "Authorised Signatory", - "bold": true - } - ], - "alignment": "right", - "margin": [ - 0, - 0, - -10, - 1 - ] - } - ] - }, - { - "text":"---------------x------------------------------x-----------------------------x------------------------------x-----------------------x------------------x------", - "style":"next-noc-table" - - }, - { - "style": "noc-head-emp", - "table": { - "widths": [ - 60, - "*", - 120 - ], - "body": [ - [ - { - "image": "{{logoImage}}", - "width": 50, - "height": 50 - }, - { - "stack": [ - { - "text": "{{logo-header}} {{mcGrade}}", - "style": "receipt-logo-header" - }, - { - "text": "{{serviceType}} {{payment_receipt}} (Citizen Copy)", - "style": "receipt-logo-sub-header" - } - ], - "alignment": "left", - "margin": [ - 0, - 4, - 0, - 0 - ] - }, - { - "stack": [ - { - "text": "{{address}},{{phoneNumber}}", - "style": "receipt-logo-sub-header" - }, - { - "text": "{{website}},{{email}}", - "style": "receipt-logo-sub-header" - } - ], - "alignment": "right", - "color": "#484848", - "margin": [ - -100, - 0, - -25, - 0 - ] - } - ] - ] - }, - "layout": "noBorders" - }, - { - "style": "noc-table", - "table": { - "widths": [ - "30%", - "20%", - "30%", - "20%" - ], - "body": [ - [ - { - "text": "{{receipt_no}}.", - "border": [ - true, - true, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{receiptNo}}", - "border": [ - false, - true, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "{{consumer_id}}", - "border": [ - false, - true, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{consumerID}}", - "border": [ - false, - true, - true, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": "Receipt Date", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{ReceiptDate}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "Tax period", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{fromPeriod}} {{to}} {{toPeriod}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - } - ], - [ - - { - "text": "Consumer Name", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{payerName}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "Contact No.", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{payerContact}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - } - ], - [ - - { - "text": "Address:", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{payerAddress}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "Paid By", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{PaidBy}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - } - ] - - ] - }, - "layout": {} - }, - { - "style": "next-noc-table", - "table": { - "widths": [ - "30%", - "20%", - "30%", - "20%" - ], - "body": [ - [ - { - "text": "{{service_type}}", - "border": [ - true, - true, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{serviceType}}", - "border": [ - false, - true, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "{{billing_period}}", - "border": [ - false, - true, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{fromPeriod}} {{to}} {{toPeriod}}", - "border": [ - false, - true, - true, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": "{{paid_amount}}", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "₹ {{paidAmount}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "{{payment_mode}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{paymentMode}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - } - ], [ - { - "text": "Tax Amount", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "₹ {{taxAmount}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "Field Fee", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "₹ {{fieldFee}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - } - ],[ - { - "text": "CGST(if applicable)", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "₹ {{cgst}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "SGST(if applicable)", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "₹ {{sgst}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": "Cheque/DD/PO/Transaction No.", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{chequeDD}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "Cheque/DD/PO/Transaction Date", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{chequeDDDate}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - - } - ],[ - { - "text": "Bank Name", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{bankName}},{{branchName}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "IFSC Code", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{ifsc}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - - } - ], - [ - { - "text": "{{g8_receipt_no}}.", - "border": [ - true, - false, - false, - true - ], - "style": "receipt-table-value" - }, - { - "text": "{{G8ReceiptNo}}", - "border": [ - false, - false, - false, - true - ], - "style": "receipt-table" - }, - { - "text": "{{g8_receipt_date}}", - "border": [ - false, - false, - false, - true - ], - "style": "receipt-table-value" - }, - { - "text": "{{G8ReceiptDate}}", - "border": [ - false, - false, - true, - true - ], - "style": "receipt-table" - } - ] - ] - }, - "layout": {} - }, - { - "style": "next-noc-table", - "table": { - "widths": [ - "10%", - "*" - ], - "body": [ - [ - { - "text":"Comments: ", - "border":[false, false, false, false] - }, - { - "text":"{{comments}}", - "border":[false, false, false, false] - } - ] - ], - "layout":"noBorders" - } - }, - { - "style": "receipt-approver", - "columns": [ - { - "text": [ - { - "text": "{{generated_by}}: ", - "bold": true - }, - { - "text": "{{user-name}}", - "bold": false - } - ], - "alignment": "left" - }, - { - "text": [ - { - "text": "Authorised Signatory", - "bold": true - } - ], - "alignment": "right", - "margin": [ - 0, - 0, - -10, - 1 - ] - } - ] - }, - { - "style": "pt-disclaimer", - "stack": [ - { - "text": "{{disclamer}}", - "bold": true, - "style": "pt-disclaimer-value" - }, - { - "text": "{{disclamer_1}}", - "bold": false, - "style": "pt-disclaimer-value" - }, - { - "text": "{{disclamer_2}}", - "bold": false, - "style": "pt-disclaimer-value" - }, - { - "text": "{{disclamer_3}}", - "bold": false, - "style": "pt-disclaimer-value" - }, { - "text":"Now log a complaint from WhatsApp, give a missed call on 8750975975 or send a Hi message on WhatsApp to this number", "bold": true, "fontSize": 8, "color": "blue", "decoration": "underline"} - ] - }, - { - "image": "{{footerLogoImage}}", - "width": 75, - "height": 10, - "alignment": "center", - "margin": [ - -12, - -10, - -230, - 0 - ] - } - ], - "styles": { - "noc-head": { - "margin": [ - -30, - -30, - 0, - 1 - ] - }, - "noc-head-emp": { - "margin": [ - -30, - 10, - 0, - 1 - ] - }, - "receipt-logo-header": { - "color": "#000000", - "fontSize": 10, - "bold": true, - "letterSpacing": 0.74, - "margin": [ - 0, - 0, - 0, - 4 - ] - }, - "receipt-logo-sub-header": { - "color": "#000000", - "fontSize": 8, - "letterSpacing": 0.6 - }, - "noc-table": { - "fontSize": 8, - "color": "#000000", - "margin": [ - -25, - 10, - -22, - -8 - ] - }, - "next-noc-table": { - "fontSize": 8, - "color": "#000000", - "margin": [ - -25, - 6, - -22, - 0 - ] - }, - "receipt-table-value": { - "color": "#000000", - "bold": true, - "fontSize": 8, - "fontWeight": 500, - "margin": [ - 8, - 0, - 0, - 0 - ] - }, - "receipt-table": { - "color": "#000000", - "bold": false, - "fontSize": 8, - "fontWeight": 400, - "margin": [ - -30, - 0, - 0, - 0 - ] - }, - "receipt-approver": { - "fontSize": 8, - "bold": true, - "margin": [ - -27, - 3, - -10, - 0 - ] - }, - "no-signature": { - "fontSize": 8, - "margin": [ - -27, - 3, - -10, - 0 - ] - }, - "pt-disclaimer": { - "fontSize": 8, - "margin": [ - -27, - 3, - -10, - 0 - ] - }, - "pt-disclaimer-value": { - "fontSize": 8, - "margin": [ - 2, - 1, - 0, - 0 - ] - } - } - } -} - diff --git a/configs/pdf-service/format-config/mcollect-bill.json b/configs/pdf-service/format-config/mcollect-bill.json deleted file mode 100644 index 93c01196..00000000 --- a/configs/pdf-service/format-config/mcollect-bill.json +++ /dev/null @@ -1,787 +0,0 @@ -{ - "key": "mcollect-bill", - "config": { - "defaultStyle": { - "font": "Cambay" - }, - "watermark": { - "text": "DIGIT UAT DIGIT UAT", - "color": "gery", - "opacity": 0.1, - "bold": true, - "italics": false - }, - "content": [ - { - "style": "noc-head", - "table": { - "widths": [ - "33%", - "33%", - "33%" - ], - "body": [ - [ - { - "text": "{{letter-code}} (Digit UAT)", - "style": "receipt-logo-header" - }, - { - "text": "{{letter-header}}", - "alignment": "center", - "style": "receipt-logo-header" - }, - { - "text": "{{letter-section}}", - "alignment": "right", - "color": "#484848", - "style": "receipt-logo-header", - "margin": [ - 0, - 0, - -30, - 0 - ] - } - ] - ] - }, - "layout": "noBorders" - }, - { - "canvas": [ - { - "type": "line", - "x1": -25, - "y1": -5, - "x2": 540, - "y2": -5, - "lineWidth": 0.1 - }, - { - "type": "line", - "x1": -25, - "y1": -2.5, - "x2": 540, - "y2": -2.5, - "lineWidth": 0.1 - } - ] - }, - { - "style": "noc-table2", - "table": { - "widths": [ - "*" - ], - "body": [ - [ - { - "stack": [ - { - "text": "{{cb-name}} {{cantonment-board}}", - "alignment": "center", - "style": "receipt-logo-title-name" - }, - { - "text": "{{form-number}}", - "alignment": "center", - "style": "receipt-logo-title" - }, - { - "text": "{{rule-number}}", - "alignment": "center", - "style": "receipt-logo-title" - }, - { - "text": "{{challan}} / {{bill}}", - "alignment": "center", - "style": "receipt-logo-title" - } - ], - "border": [ - true, - true, - true, - false - ] - } - ], - [ - { - "stack": [ - { - "table": { - "widths": [ - "20%", - "30%", - "20%", - "30%" - ], - "body": [ - [ - { - "text": "{{challan_no}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{challanNo}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value-down" - }, - { - "text": "{{challan_date}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{challanDate}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value-down", - "font": "Roboto" - } - ] - ] - } - }, - { - "table": { - "widths": [ - "20%", - "30%", - "20%", - "30%" - ], - "body": [ - [ - { - "text": "{{bill_no}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{billNo}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value-down" - }, - { - "text": "{{bill_date}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{billDate}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value-down", - "font": "Roboto" - } - ] - ] - } - }, - { - "table": { - "widths": [ - "20%", - "30%", - "20%", - "30%" - ], - "body": [ - [ - { - "text": "{{service_category}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{serviceCategory}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value-down" - }, - { - "text": "{{service_type}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{serviceType}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value-down" - } - ] - ] - } - }, - { - "table": { - "widths": [ - "20%", - "30%", - "20%", - "30%" - ], - "body": [ - [ - { - "text": "{{validity_from}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{fromPeriod}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value-down", - "font": "Roboto" - }, - { - "text": "{{validity_to}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{toPeriod}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value-down", - "font": "Roboto" - } - ] - ] - } - }, - { - "table": { - "widths": [ - "20%", - "30%", - "20%", - "30%" - ], - "body": [ - [ - { - "text": "{{consumer_Name}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{payerName}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value-down" - }, - { - "text": "{{payer_contact}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{payerContact}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value-down", - "font": "Roboto" - } - ] - ] - } - }, - { - "table": { - "widths": [ - "19%", - "81%" - ], - "body": [ - [ - { - "text": "{{address_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{doorHouseNo}}, {{buildingName}}, {{streetName}}, {{mohalla}}, {{pinCode}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value-down" - } - ] - ] - } - } - ] - } - ] - ] - }, - "layout": {} - }, - { - "style": "noc-table3", - "table": { - "widths": [ - "*" - ], - "body": [ - [ - { - "text": "{{total_amount}}", - "border": [ - true, - true, - true, - false - ], - "style": "receipt-table-value-total", - "bold": false - } - ], - [ - { - "text": "{{Rs}} {{totalAmount}}", - "border": [ - true, - false, - true, - false - ], - "style": "receipt-table-value-total", - "fontSize": 20 - } - ] - ] - }, - "layout": {} - }, - { - "style": "noc-table4", - "table": { - "widths": [ - "60%", - "30%", - "10%" - ], - "body": [ - "{{#variable10}}[{\"text\": \"{{trade_license_tax}}\",\"border\": [true,false,false,false], \"style\": \"receipt-table-value-down\"},{\"text\": \"{{tradeLicenseTax}}\", \"border\": [false,false,false,false], \"style\": \"receipt-table-value-down\"},{ \"text\": \" \",\"border\": [false,false,true, false ]}]{{/variable10}}" - ] - }, - "layout": {} - }, - { - "canvas": [ - { - "type": "line", - "x1": -25, - "y1": 0, - "x2": 345, - "y2": 0, - "lineWidth": 1 - } - ] - }, - { - "style": "noc-table4", - "table": { - "widths": [ - "60%", - "30%", - "10%" - ], - "body": [ - [ - { - "text": "{{total_amount}}", - "border": [ - true, - false, - false, - true - ], - "bold": true, - "style": "receipt-table-value-down" - }, - { - "text": "{{totalAmount}}", - "border": [ - false, - false, - false, - true - ], - "bold": true, - "style": "receipt-table-value-down" - }, - { - "image": "{{qrcodeimage}}", - "style": "receipt-table-value-total-Qr", - "border": [ - false, - false, - true, - true - ], - "width": 72, - "height": 72 - } - ] - ] - }, - "layout": {} - }, - { - "table": { - "widths": [ - "*" - ], - "body": [ - [ - { - "style": "no-signature", - "text": "{{no_signature}}" - } - ] - ] - }, - "layout": "noBorders" - }, - { - "image": "{{footerLogoImage}}", - "width": 75, - "height": 10, - "alignment": "center", - "margin": [ - -12, - -10, - -230, - 0 - ] - } - ], - "styles": { - "noc-head": { - "margin": [ - -25, - -30, - 0, - 1 - ] - }, - "qr-head": { - "margin": [ - 0, - 30, - 0, - 1 - ] - }, - "noc-table3": { - "fontSize": 12, - "color": "#484848", - "margin": [ - -25, - 15, - -25, - -0 - ] - }, - "noc-table4": { - "fontSize": 12, - "color": "#484848", - "margin": [ - -25, - 0, - -25, - -0 - ] - }, - "no-signature": { - "fontSize": 12, - "margin": [ - -20, - 35, - -10, - 0 - ], - "color": "#484848" - }, - "receipt-approver": { - "fontSize": 12, - "bold": true, - "margin": [ - -27, - 50, - -10, - 0 - ], - "color": "#484848" - }, - "receipt-logo-title": { - "color": "#000000", - "bold": true, - "fontSize": 9, - "fontWeight": 500 - }, - "receipt-logo-title-name": { - "color": "#000000", - "bold": true, - "fontSize": 12, - "fontWeight": 500 - }, - "receipt-logo-header": { - "color": "#484848", - "fontSize": 9, - "bold": false, - "letterSpacing": 0.74, - "margin": [ - 0, - 0, - 0, - 5 - ] - }, - "noc-table": { - "fontSize": 12, - "color": "#484848", - "margin": [ - -25, - 45, - -8, - -8 - ] - }, - "noc-table2": { - "fontSize": 12, - "color": "#484848", - "margin": [ - -25, - 18, - -25, - -8 - ] - }, - "receipt-table-value": { - "color": "#000000", - "bold": true, - "fontSize": 12, - "fontWeight": 500, - "margin": [ - 3, - 5, - 0, - 5 - ] - }, - "receipt-table-value-total": { - "color": "#000000", - "bold": true, - "fontSize": 12, - "fontWeight": 500, - "alignment": "right", - "margin": [ - 0, - 5, - 30, - 0 - ] - }, - "receipt-table-value-total-Qr": { - "alignment": "right", - "margin": [ - 0, - -40, - 10, - 0 - ] - }, - "receipt-table-value-down": { - "color": "#000000", - "bold": false, - "fontSize": 12, - "fontWeight": 400, - "alignment": "left", - "margin": [ - 3, - 5, - 0, - 5 - ] - }, - "receipt-table-value2": { - "color": "#000000", - "bold": false, - "fontSize": 12, - "fontWeight": 500, - "margin": [ - 3, - 0, - 0, - 0 - ] - }, - "receipt-table-value-cont": { - "color": "#000000", - "bold": false, - "fontSize": 11, - "fontWeight": 400, - "margin": [ - 3, - 0, - 0, - 0 - ] - }, - "receipt-table": { - "color": "#484848", - "bold": true, - "fontSize": 12, - "fontWeight": 400, - "margin": [ - -30, - 5, - 0, - 0 - ] - }, - "receipt-table2": { - "color": "#000000", - "bold": true, - "fontSize": 12, - "fontWeight": 500, - "margin": [ - 3, - 0, - 0, - 0 - ] - }, - "pt-disclaimer": { - "fontSize": 11, - "margin": [ - -27, - 0, - -10, - 0 - ], - "color": "#484848" - }, - "pt-disclaimer-value": { - "fontSize": 10, - "margin": [ - 2, - 5, - 0, - 0 - ], - "color": "#484848" - } - } - } -} \ No newline at end of file diff --git a/configs/pdf-service/format-config/mcollect-challan.json b/configs/pdf-service/format-config/mcollect-challan.json deleted file mode 100644 index 068e9c86..00000000 --- a/configs/pdf-service/format-config/mcollect-challan.json +++ /dev/null @@ -1,843 +0,0 @@ -{ - "key": "mcollect-challan", - "config": { - "defaultStyle": { - "font": "Cambay" - }, - "watermark": { - "text": "DIGIT UAT DIGIT UAT", - "color": "gery", - "opacity": 0.1, - "bold": true, - "italics": false - }, - "content": [ - { - "style": "noc-head", - "table": { - "widths": [ - "33%", - "33%", - "33%" - ], - "body": [ - [ - { - "text": " ", - "style": "receipt-logo-header" - }, - { - "text": "{{letter-header}}", - "alignment": "center", - "style": "receipt-logo-header" - }, - { - "text": " ", - "alignment": "right", - "color": "#484848", - "style": "receipt-logo-header", - "margin": [ - 0, - 0, - -30, - 0 - ] - } - - ] - ] - }, - "layout": "noBorders" - }, - - { - "style": "noc-table2", - "table": { - "widths": [ - "*" - ], - "body": [ - [ - { - "stack": [ - { - "text": "{{cb-name}} {{mcGrade}} (Digit UAT)", - "alignment": "center", - "style": "receipt-logo-title-name" - }, - { - "text": "{{form-number}}", - "alignment": "center", - "style": "receipt-logo-title" - }, - { - "text": "{{challanStatus}}", - "style": "receipt-logo-title-status" - }, - { - "text": "{{rule-number}}", - "alignment": "center", - "style": "receipt-logo-title" - }, - { - "text": "{{challan}} / {{bill}}", - "alignment": "center", - "style": "receipt-logo-title" - } - ], - "border": [ - true, - true, - true, - false - ] - } - ], - [ - { - "stack": [ - { - "table": { - "widths": [ - "20%", - "30%", - "20%", - "30%" - ], - "body": [ - [ - { - "text": "{{challan_no}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{challanNo}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value-down" - }, - { - "text": "{{challan_date}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{challanDate}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value-down", - "font": "Roboto" - } - ] - ] - } - }, - { - "table": { - "widths": [ - "20%", - "30%", - "20%", - "30%" - ], - "body": [ - [ - { - "text": "{{bill_no}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{billNo}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value-down" - }, - { - "text": "{{bill_date}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{billDate}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value-down", - "font": "Roboto" - } - ] - ] - } - }, - { - "table": { - "widths": [ - "20%", - "30%", - "20%", - "30%" - ], - "body": [ - [ - { - "text": "{{service_category}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{serviceCategory}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value-down" - }, - { - "text": "{{service_type}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{serviceType}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value-down" - } - ] - ] - } - }, - { - "table": { - "widths": [ - "20%", - "30%", - "20%", - "30%" - ], - "body": [ - [ - { - "text": "{{validity_from}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{fromPeriod}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value-down", - "font": "Roboto" - }, - { - "text": "{{validity_to}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{toPeriod}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value-down", - "font": "Roboto" - } - ] - ] - } - }, - { - "table": { - "widths": [ - "20%", - "30%", - "20%", - "30%" - ], - "body": [ - [ - { - "text": "{{consumer_Name}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{consumerName}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value-down" - }, - { - "text": "{{payer_contact}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{payerContact}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value-down", - "font": "Roboto" - } - ] - ] - } - }, - { - "table": { - "widths": [ - "19%", - "81%" - ], - "body": [ - [ - { - "text": "{{address_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{doorHouseNo}}, {{buildingName}}, {{streetName}},{{pinCode}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value-down" - } - ] - ] - } - }, - { - "table": { - "widths": [ - "19%", - "81%" - ], - "body": [ - [ - { - "text": "{{remarks_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{challanRemarks}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-logo-title-remarks-new" - } - ] - ] - } - } - ] - } - ] - ] - }, - "layout": {} - }, - { - "style": "noc-table3", - "table": { - "widths": [ - "*" - ], - "body": [ - [ - { - "text": "{{total_amount}}", - "border": [ - true, - true, - true, - false - ], - "style": "receipt-table-value-total", - "bold": false - } - ], - [ - { - "text": "{{Rs}} {{totalAmount}}", - "border": [ - true, - false, - true, - false - ], - "style": "receipt-table-value-total", - "fontSize": 20 - } - ] - ] - }, - "layout": {} - }, - { - "style": "noc-table4", - "table": { - "widths": [ - "60%", - "30%", - "10%" - ], - "body": [ - "{{#variable10}}[{\"text\": \"{{trade_license_tax}}\",\"border\": [true,false,false,false], \"style\": \"receipt-table-value-down\"},{\"text\": \"{{tradeLicenseTax}}\", \"border\": [false,false,false,false], \"style\": \"receipt-table-value-down\"},{ \"text\": \" \",\"border\": [false,false,true, false ]}]{{/variable10}}" - ] - }, - "layout": {} - }, - { - "canvas": [ - { - "type": "line", - "x1": -25, - "y1": 0, - "x2": 345, - "y2": 0, - "lineWidth": 1 - } - ] - }, - { - "style": "noc-table4", - "table": { - "widths": [ - "60%", - "30%", - "10%" - ], - "body": [ - [ - { - "text": "{{total_amount}}", - "border": [ - true, - false, - false, - true - ], - "bold": true, - "style": "receipt-table-value-down" - }, - { - "text": "{{totalAmount}}", - "border": [ - false, - false, - false, - true - ], - "bold": true, - "style": "receipt-table-value-down" - }, - { - "image": "{{qrcodeimage}}", - "style": "receipt-table-value-total-Qr", - "border": [ - false, - false, - true, - true - ], - "width": 72, - "height": 72 - } - ] - ] - }, - "layout": {} - }, - { - "table": { - "widths": [ - "*" - ], - "body": [ - [ - { - "style": "no-signature", - "text": "{{no_signature}}" - } - ] - ] - }, - "layout": "noBorders" - }, - { - "image": "{{footerLogoImage}}", - "width": 75, - "height": 10, - "alignment": "center", - "margin": [ - -12, - -10, - -230, - 0 - ] - } - ], - "styles": { - "noc-head": { - "margin": [ - -25, - -30, - 0, - 1 - ] - }, - "qr-head": { - "margin": [ - 0, - 30, - 0, - 1 - ] - }, - "noc-table3": { - "fontSize": 12, - "color": "#484848", - "margin": [ - -25, - 15, - -25, - -0 - ] - }, - "noc-table4": { - "fontSize": 12, - "color": "#484848", - "margin": [ - -25, - 0, - -25, - -0 - ] - }, - "no-signature": { - "fontSize": 12, - "margin": [ - -20, - 35, - -10, - 0 - ], - "color": "#484848" - }, - "receipt-approver": { - "fontSize": 12, - "bold": true, - "margin": [ - -27, - 50, - -10, - 0 - ], - "color": "#484848" - }, - "receipt-logo-title": { - "color": "#000000", - "bold": true, - "fontSize": 9, - "fontWeight": 500 - }, - "receipt-logo-title-name": { - "color": "#000000", - "bold": true, - "fontSize": 12, - "fontWeight": 500 - }, - "receipt-logo-header": { - "color": "#484848", - "fontSize": 9, - "bold": false, - "letterSpacing": 0.74, - "margin": [ - 0, - 0, - 0, - 5 - ] - }, - "receipt-logo-title-status": { - "color": "#000000", - "alignment": "right", - "bold": true, - "fontSize": 13, - "fontWeight": 500, - "margin": [ - 0, - -22, - 60, - 0 - ] - }, - "receipt-logo-title-remarks": { - "color": "#000000", - "alignment": "right", - "bold": true, - "fontSize": 8, - "fontWeight": 500, - "margin": [ - 0, - -22, - 70, - -10 - ] - }, - "receipt-logo-title-remarks-new": { - "color": "#000000", - "bold": true, - "fontSize": 10, - "fontWeight": 500, - "margin": [ - 0, - 0, - 0, - 0 - ] - }, - "noc-table": { - "fontSize": 12, - "color": "#484848", - "margin": [ - -25, - 45, - -8, - -8 - ] - }, - "noc-table2": { - "fontSize": 12, - "color": "#484848", - "margin": [ - -25, - 18, - -25, - -8 - ] - }, - "receipt-table-value": { - "color": "#000000", - "bold": true, - "fontSize": 12, - "fontWeight": 500, - "margin": [ - 3, - 5, - 0, - 5 - ] - }, - "receipt-table-value-total": { - "color": "#000000", - "bold": true, - "fontSize": 12, - "fontWeight": 500, - "alignment": "right", - "margin": [ - 0, - 5, - 30, - 0 - ] - }, - "receipt-table-value-total-Qr": { - "alignment": "right", - "margin": [ - 0, - -40, - 10, - 0 - ] - }, - "receipt-table-value-down": { - "color": "#000000", - "bold": false, - "fontSize": 12, - "fontWeight": 400, - "alignment": "left", - "margin": [ - 3, - 5, - 0, - 5 - ] - }, - "receipt-table-value2": { - "color": "#000000", - "bold": false, - "fontSize": 12, - "fontWeight": 500, - "margin": [ - 3, - 0, - 0, - 0 - ] - }, - "receipt-table-value-cont": { - "color": "#000000", - "bold": false, - "fontSize": 11, - "fontWeight": 400, - "margin": [ - 3, - 0, - 0, - 0 - ] - }, - "receipt-table": { - "color": "#484848", - "bold": true, - "fontSize": 12, - "fontWeight": 400, - "margin": [ - -30, - 5, - 0, - 0 - ] - }, - "receipt-table2": { - "color": "#000000", - "bold": true, - "fontSize": 12, - "fontWeight": 500, - "margin": [ - 3, - 0, - 0, - 0 - ] - }, - "pt-disclaimer": { - "fontSize": 11, - "margin": [ - -27, - 0, - -10, - 0 - ], - "color": "#484848" - }, - "pt-disclaimer-value": { - "fontSize": 10, - "margin": [ - 2, - 5, - 0, - 0 - ], - "color": "#484848" - } - } - } -} diff --git a/configs/pdf-service/format-config/misc-receipt.json b/configs/pdf-service/format-config/misc-receipt.json deleted file mode 100644 index aac39bee..00000000 --- a/configs/pdf-service/format-config/misc-receipt.json +++ /dev/null @@ -1,611 +0,0 @@ -{ - "key": "misc-receipt", - "config": { - "defaultStyle": { - "font": "Cambay" - }, - "watermark": { - "text": "DIGIT UAT DIGIT UAT", - "color": "gery", - "opacity": 0.1, - "bold": true, - "italics": false - }, - "content": [ - { - "style": "noc-head", - "table": { - "widths": [ - 60, - "*" - ], - "body": [ - [ - { - "image": "{{logoImage}}", - "width": 50, - "height": 61.25, - "margin": [ - 10, - 0, - 0, - 0 - ] - }, - { - "stack": [ - { - "text": "{{logo-header}} (Digit UAT)", - "style": "receipt-logo-header" - }, - { - "text": "{{payment_receipt}}", - "style": "receipt-logo-sub-header" - } - ], - "alignment": "center", - "margin": [ - 0, - 10, - 0, - 0 - ] - } - ] - ] - }, - "layout": {} - }, - { - "style": "receipt-approver", - "columns": [ - { - "text": [ - { - "text": "{{receipt_info}}", - "bold": true - } - ], - "alignment": "left" - } - ] - }, - { - "style": "noc-table", - "table": { - "widths": [ - "16%", - "18%", - "16%", - "10%", - "18%", - "22%" - ], - "body": [ - [ - { - "text": "{{receipt_no}} :", - "border": [ - true, - true, - false, - true - ], - "style": "receipt-table-value" - }, - { - "text": "{{receiptNo}}", - "border": [ - false, - true, - true, - true - ], - "style": "receipt-table" - }, - { - "text": "{{payment_date}} :", - "border": [ - true, - true, - false, - true - ], - "style": "receipt-table-value" - }, - { - "text": "{{paymentDate}}", - "border": [ - false, - true, - true, - true - ], - "style": "receipt-table" - }, - { - "text": "{{consumer_id}} :", - "border": [ - true, - true, - false, - true - ], - "style": "receipt-table-value" - }, - { - "text": "{{consumerID}}", - "border": [ - false, - true, - true, - true - ], - "style": "receipt-table" - } - ] - ] - }, - "layout": {} - }, - { - "style": "receipt-approver", - "columns": [ - { - "text": [ - { - "text": "{{payer_info}}", - "bold": true - } - ], - "alignment": "left" - } - ] - }, - { - "style": "noc-table", - "table": { - "widths": [ - "25%", - "25%", - "25%", - "25%" - ], - "body": [ - [ - { - "text": "{{payer_name}} :", - "border": [ - true, - true, - false, - true - ], - "style": "receipt-table-value" - }, - { - "text": "{{payerName}}", - "border": [ - false, - true, - true, - true - ], - "style": "receipt-table" - }, - { - "text": "{{payer_contact}} :", - "border": [ - true, - true, - false, - true - ], - "style": "receipt-table-value" - }, - { - "text": "{{payerContact}}", - "border": [ - false, - true, - true, - true - ], - "style": "receipt-table" - } - ] - ] - }, - "layout": {} - }, - { - "style": "receipt-approver", - "columns": [ - { - "text": [ - { - "text": "{{payment_info}}", - "bold": true - } - ], - "alignment": "left" - } - ] - }, - { - "style": "next-noc-table", - "table": { - "widths": [ - "25%", - "25%", - "25%", - "25%" - ], - "body": [ - [ - { - "text": "{{service_type}} :", - "border": [ - true, - true, - false, - true - ], - "style": "receipt-table-value" - }, - { - "text": "{{serviceType}}", - "border": [ - false, - true, - false, - true - ], - "style": "receipt-table" - }, - { - "text": " ", - "border": [ - false, - true, - false, - true - ], - "style": "receipt-table-value" - }, - { - "text": " ", - "border": [ - false, - true, - true, - true - ], - "style": "receipt-table" - } - ], - [ - { - "text": "{{billing_period}} :", - "border": [ - true, - true, - false, - true - ], - "style": "receipt-table-value" - }, - { - "text": "{{fromPeriod}} {{to}} {{toPeriod}}", - "border": [ - false, - true, - true, - true - ], - "style": "receipt-table" - }, - { - "text": "{{paid_amount}} :", - "border": [ - true, - true, - false, - true - ], - "style": "receipt-table-value" - }, - { - "text": "₹ {{paidAmount}}", - "border": [ - false, - true, - true, - true - ], - "style": "receipt-table" - } - ], - [ - { - "text": "{{payment_mode}} :", - "border": [ - true, - true, - false, - true - ], - "style": "receipt-table-value" - }, - { - "text": "{{paymentMode}}", - "border": [ - false, - true, - true, - true - ], - "style": "receipt-table" - }, - { - "text": "{{transaction_id}} :", - "border": [ - true, - true, - false, - true - ], - "style": "receipt-table-value" - }, - { - "text": "{{transactionID}}", - "border": [ - false, - true, - true, - true - ], - "style": "receipt-table" - } - ], - [ - { - "text": "{{g8_receipt_no}} :", - "border": [ - true, - true, - false, - true - ], - "style": "receipt-table-value" - }, - { - "text": "{{G8ReceiptNo}}", - "border": [ - false, - false, - false, - true - ], - "style": "receipt-table" - }, - { - "text": "{{g8_receipt_date}} :", - "border": [ - true, - true, - false, - true - ], - "style": "receipt-table-value" - }, - { - "text": "{{G8ReceiptDate}}", - "border": [ - false, - true, - true, - true - ], - "style": "receipt-table" - } - ] - ] - }, - "layout": {} - }, - { - "style": "receipt-approver", - "columns": [ - { - "text": [ - { - "text": "{{generated_by}} : ", - "bold": true - }, - { - "text": "{{user-name}}", - "bold": false - } - ], - "alignment": "left" - }, - { - "text": [ - { - "text": "{{commissioner/eo}}", - "bold": true - } - ], - "alignment": "right", - "margin": [ - 0, - 0, - -10, - 1 - ] - } - ] - }, - { - "style": "no-signature", - "text": "{{no_signature}}" - }, - { - "style": "pt-disclaimer", - "stack": [ - { - "text": "{{disclamer}}", - "bold": true, - "style": "pt-disclaimer-value" - }, - { - "text": "{{disclamer_1}}", - "bold": false, - "style": "pt-disclaimer-value" - }, - { - "text": "{{disclamer_2}}", - "bold": false, - "style": "pt-disclaimer-value" - }, - { - "text": "{{disclamer_3}}", - "bold": false, - "style": "pt-disclaimer-value" - }, - { - "text": "{{disclamer_4}}", - "bold": false, - "style": "pt-disclaimer-value" - } - ] - }, - { - "image": "{{footerLogoImage}}", - "width": 75, - "height": 10, - "alignment": "center", - "margin": [ - -12, - -10, - -230, - 0 - ] - } - ], - "styles": { - "noc-head": { - "fillColor": "#b8bfcc", - "margin": [ - -25, - -30, - -22, - 1 - ] - }, - "receipt-logo-header": { - "color": "#000000", - "fontSize": 14, - "bold": true, - "letterSpacing": 0.74, - "margin": [ - 0, - 0, - 0, - 5 - ] - }, - "receipt-logo-sub-header": { - "color": "#000000", - "fontSize": 12, - "letterSpacing": 0.6 - }, - "noc-table": { - "fontSize": 12, - "color": "#000000", - "margin": [ - -25, - 20, - -22, - 0 - ] - }, - "next-noc-table": { - "fontSize": 12, - "color": "#000000", - "margin": [ - -25, - 10, - -22, - 0 - ] - }, - "receipt-table-value": { - "color": "#000000", - "bold": true, - "fontSize": 10, - "fontWeight": 500, - "margin": [ - 8, - 8, - 0, - 0 - ] - }, - "receipt-table": { - "color": "#000000", - "bold": false, - "fontSize": 10, - "fontWeight": 400, - "margin": [ - -6, - 8, - 0, - 0 - ] - }, - "receipt-approver": { - "fontSize": 12, - "bold": true, - "margin": [ - -27, - 30, - -10, - 0 - ], - "color": "#484848" - }, - "no-signature": { - "fontSize": 12, - "margin": [ - -27, - 35, - -10, - 0 - ], - "color": "#484848" - }, - "pt-disclaimer": { - "fontSize": 12, - "margin": [ - -27, - 30, - -10, - 0 - ], - "color": "#484848" - }, - "pt-disclaimer-value": { - "fontSize": 9, - "margin": [ - 2, - 5, - 0, - 0 - ], - "color": "#484848" - } - } - } -} diff --git a/configs/pdf-service/format-config/passvehicle-certificate.json b/configs/pdf-service/format-config/passvehicle-certificate.json deleted file mode 100644 index 9ddaeddd..00000000 --- a/configs/pdf-service/format-config/passvehicle-certificate.json +++ /dev/null @@ -1,520 +0,0 @@ -{ - "key": "tlcertificate", - "config": { - "defaultStyle": { - "font": "Cambay" - }, - "watermark": { - "text": "DIGIT UAT DIGIT UAT", - "color": "gery", - "opacity": 0.1, - "bold": true, - "italics": false - }, - - "content": [ - - { - "style": "noc-head", - "table": { - "widths": [ - "*" - ], - "body": [ - [ - { - "image": "{{qr}}", - "width": 70, - "height": 70, - "margin": [ - 50, - 8, - -30, - 8 - ], - "alignment": "right" - } - - ] - ] - }, - "layout": "noBorders" - }, - - { - "style":"noc-head", - "table":{ - "widths":[ - "*" - ], - "body":[ - [ - { - "image": "{{userpic}}", - "width": 80, - "height": 92, - "alignment": "center", - "margin": [ - 0, - 10, - 0, - 10 - ] - } - ], - [ - { - "stack": [ - { - "text":"{{municipal_corportaion}}", - "style":"receipt-logo-header" - } - ], - "alignment":"left", - "margin":[ - 0, - 10, - 0, - 0 - ] - } - ], - [ - { - "stack": [ - { - "text":"{{trade_license_certifcate}}", - "style":"receipt-sub-logo-header" - }, - { - "style":"noc-head", - "table":{ - "widths":[ - "35%", - "65%" - ], - "body":[ - [ - { - "text":"{{trade_license_no}}", - "style":"receipt-sub-logo-sub-header" - }, - { - "text":"{{tradeLicenseNo}}", - "style":"receipt-sub-logo-sub-header" - } - ] - ] - }, - "layout":"noBorders" - }, - { - "style":"noc-head", - "table":{ - "widths":[ - "35%", - "65%" - ], - "body":[ - [ - { - "text":"{{application_no}}", - "style":"receipt-sub-logo-sub-header" - }, - { - "text":"{{applicationNo}}", - "style":"receipt-sub-logo-sub-header" - } - ] - ] - }, - "layout":"noBorders" - }, - { - "style":"noc-head", - "table":{ - "widths":[ - "35%", - "65%" - ], - "body":[ - [ - { - "text":"{{trade_type}}", - "style":"receipt-sub-logo-sub-header" - }, - { - "text":"{{tradeType}}", - "style":"receipt-sub-logo-sub-header" - } - ] - ] - }, - "layout":"noBorders" - }, - { - "style":"noc-head", - "table":{ - "widths":[ - "35%", - "65%" - ], - "body":[ - [ - { - "text":"{{pass_subCategory}}", - "style":"receipt-sub-logo-sub-header" - }, - { - "text":"{{passSubCategory}}", - "style":"receipt-sub-logo-sub-header" - } - ] - ] - }, - "layout":"noBorders" - }, - { - "style":"noc-head", - "table":{ - "widths":[ - "35%", - "65%" - ], - "body":[ - [ - { - "text":"{{purpose_label}}", - "style":"receipt-sub-logo-sub-header" - }, - { - "text":"{{purpose_content}}", - "style":"receipt-sub-logo-sub-header" - } - ] - ] - }, - "layout":"noBorders" - }, - { - "style":"noc-head", - "table":{ - "widths":[ - "35%", - "65%" - ], - "body":[ - [ - { - "text":"{{license_issue_date}}", - "style":"receipt-sub-logo-sub-header" - }, - { - "text":"{{licenseIssueDate}}", - "style":"receipt-sub-logo-sub-header" - } - ] - ] - }, - "layout":"noBorders" - }, - - { - "style":"noc-head", - "table":{ - "widths":[ - "35%", - "65%" - ], - "body":[ - [ - { - "text":"{{license_validity_from}}", - "style":"receipt-sub-logo-sub-header" - }, - { - "text":"{{licenseValidityFrom}}", - "style":"receipt-sub-logo-sub-header" - } - ] - ] - }, - "layout":"noBorders" - }, - { - "style":"noc-head", - "table":{ - "widths":[ - "35%", - "65%" - ], - "body":[ - [ - { - "text":"{{license_validity_to}}", - "style":"receipt-sub-logo-sub-header" - }, - { - "text":"{{licenseValidityTo}}", - "style":"receipt-sub-logo-sub-header" - } - ] - ] - }, - "layout":"noBorders" - }, - { - "style":"noc-head", - "table":{ - "widths":[ - "35%", - "65%" - ], - "body":[ - [ - { - "text":"{{vehicle_number_label}}", - "style":"receipt-sub-logo-sub-header" - }, - { - "text":"{{vehicleNumber}}", - "style":"receipt-sub-logo-sub-header", - "font": "Roboto" - } - ] - ] - }, - "layout":"noBorders" - }, - { - "style":"noc-head", - "table":{ - "widths":[ - "35%", - "65%" - ], - "body":[ - [ - { - "text":"{{vehicle_company_label}}", - "style":"receipt-sub-logo-sub-header" - }, - { - "text":"{{vehicleCompany}}", - "style":"receipt-sub-logo-sub-header" - } - ] - ] - }, - "layout":"noBorders" - }, - - { - "style":"noc-head", - "table":{ - "widths":[ - "35%", - "65%" - ], - "body":[ - [ - { - "text":"{{vehicle_model_label}}", - "style":"receipt-sub-logo-sub-header" - }, - { - "text":"{{vehicleModel}}", - "style":"receipt-sub-logo-sub-header" - } - ] - ] - }, - "layout":"noBorders" - } - ], - "alignment":"left", - "margin":[ - 0, - 10, - 0, - 0 - ] - } - ] - ] - }, - "layout":"noBorders" - }, - { - "style":"receipt-approver", - "columns": [ - { - "text":[ - { - "text":"{{approved_by}} ", - "bold": true - }, - { - "text":" {{approvedBy}}", - "bold": false - } - ], - "alignment":"left" - }, - { - "text":[ - { - "text":"{{commissioner}}", - "bold": true - } - ], - "alignment":"right" - } - ] - }, - { - "text": "{{disclaimer_heading}}", - "bold": true, - "style": "receipt-approver", - "alignment": "left", - "fontSize": 13, - "margin": [ - -10, - 70, - 0, - 0 - ] - }, - { - "text": "{{disclaimer_body}}", - "style": "receipt-sub-logo-sub-header", - "alignment": "left", - "fontSize": 13, - "margin": [ - -10, - 10, - 0, - 0 - ] - }, - { - "image": "{{footerLogoImage}}", - "width": 75, - "height": 10, - "alignment": "center", - "margin": [ - -12, - -10, - -230, - 0 - ] - } - ], - "styles": { - "noc-head": { - "margin": [ - -30, - -35, - 0, - -2 - ] - }, - "receipt-approver": { - "color": "#000000", - "fontSize": 14, - "letterSpacing": 0.6, - "alignment": "center", - "margin": [ - -10, - 50, - 0, - 1 - ] - }, - "receipt-logo-header": { - "color": "#000000", - "fontSize": 20, - "letterSpacing": 0.74, - "alignment": "center", - "margin": [ - 0, - 0, - 0, - 5 - ] - }, - "receipt-sub-logo-header": { - "color": "#000000", - "fontSize": 18, - "letterSpacing": 0.74, - "alignment": "center", - "margin": [ - 0, - 5, - 0, - 5 - ] - }, - "receipt-logo-sub-header": { - "color": "#484848", - "fontSize": 14, - "letterSpacing": 0.6, - "alignment": "center", - "margin": [ - 0, - 5, - 0, - 0 - ] - }, - "receipt-sub-logo-sub-header": { - "color": "#484848", - "fontSize": 14, - "letterSpacing": 0.6, - "alignment": "left", - "margin": [ - 50, - 40, - 0, - 0 - ] - }, - "receipt-sub-address-sub-header": { - "color": "#484848", - "fontSize": 14, - "letterSpacing": 0.1, - "alignment": "right", - "margin": [ - 50, - 30, - -90, - 0 - ] - }, - "receipt-sub-website-sub-header": { - "color": "#484848", - "fontSize": 14, - "letterSpacing": 0.1, - "alignment": "right", - "margin": [ - 50, - 30, - -120, - 0 - ] - }, - "receipt-sub-email-sub-header": { - "color": "#484848", - "fontSize": 14, - "letterSpacing": 0.1, - "alignment": "right", - "margin": [ - 50, - 30, - -110, - 0 - ] - } - } - } - } \ No newline at end of file diff --git a/configs/pdf-service/format-config/property-bill.json b/configs/pdf-service/format-config/property-bill.json deleted file mode 100644 index 981085bd..00000000 --- a/configs/pdf-service/format-config/property-bill.json +++ /dev/null @@ -1,1231 +0,0 @@ -{ - "key": "property-bill", - "config": { - "defaultStyle": { - "font": "Cambay" - }, - "watermark": { - "text": "DIGIT UAT DIGIT UAT", - "color": "gery", - "opacity": 0.1, - "bold": true, - "italics": false - }, - "content": [ - { - "style": "noc-head", - "table": { - "widths": [ - 60, - "*", - 120 - ], - "body": [ - [ - { - "image": "{{logoImage}}", - "width": 50, - "height": 61.25 - }, - { - "stack": [ - { - "text": "{{logo_header}} {{Municipal_Corporation}} (DIGIT UAT)", - "style": "receipt-logo-header" - }, - { - "stack": [ - { - "text": "{{address}}" - }, - { - "text": "{{phoneNumber}}" - }, - { - "text": "{{website}}" - }, - { - "text": "{{email}}" - } - ] - } - ], - "alignment": "left", - "margin": [ - 0, - 10, - 0, - 0 - ] - }, - { - "stack": [ - { - "text": "{{total_amount_due}}" - }, - { - "text": "{{Rs}} {{totalAmountDue}}", - "style": "amount-due" - } - ], - "alignment": "right", - "color": "#484848", - "margin": [ - -150, - 2, - -20, - 0 - ] - } - ] - ] - }, - "layout": "noBorders" - }, - { - "style": "noc-table", - "table": { - "widths": [ - 130, - 130, - -2, - 130, - 130 - ], - "body": [ - [ - { - "text": "{{payer_name}}", - "border": [ - true, - true, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{payerName}}", - "border": [ - false, - true, - true, - false - ], - "style": "receipt-table" - }, - { - "text": " ", - "border": [ - false, - false, - false, - false - ] - }, - { - "text": "{{bill_no}}", - "border": [ - true, - true, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{billNo}}", - "border": [ - false, - true, - true, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": "{{mobile_no}}", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{mobileNo}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - }, - { - "text": " ", - "border": [ - false, - false, - false, - false - ] - }, - { - "text": "{{bill_period}}", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{fromPeriod}} - {{toPeriod}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": "{{payer_address}}", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{payerAddress}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - }, - { - "text": " ", - "border": [ - false, - false, - false, - false - ] - }, - { - "text": "{{bill_issue_date}}", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{billIssueDate}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": " ", - "border": [ - true, - false, - false, - true - ], - "style": "receipt-table-value" - }, - { - "text": " ", - "border": [ - false, - false, - true, - true - ], - "style": "receipt-table" - }, - { - "text": " ", - "border": [ - false, - false, - false, - false - ] - }, - { - "text": "{{bill_due_date}}", - "border": [ - true, - false, - false, - true - ], - "style": "right-receipt-table" - }, - { - "text": "{{billDueDate}}", - "border": [ - false, - false, - true, - true - ], - "style": "right-receipt-table2" - } - ] - ] - }, - "layout": {} - }, - { - "style": "noc-table2", - "table": { - "widths": [ - "103%" - ], - "body": [ - [ - { - "text": "{{billing_summary_property_tax}} {{serviceType}}", - "border": [ - true, - true, - true, - false - ], - "style": "receipt-table-value" - } - ], - [ - { - "table": { - "widths": [ - "30%", - "26%", - "10%", - "11%", - "10%", - "15%" - ], - "body": [ - [ - { - "text": "{{tl_application_no}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - }, - { - "text": "{{bill_period}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - }, - { - "text": "{{charge_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - }, - { - "text": "{{penalty_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - }, - { - "text": "{{rebate_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - }, - { - "text": "{{adhoc_penalty_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - } - ], - [ - { - "text": "{{propertyID}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text": "{{fromPeriod}}-{{toPeriod}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text": "{{charge}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text": "{{penalty}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text": "{{rebate}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text": "{{adhoc_penalty}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2" - } - ] - ] - } - } - ], - [ - { - "table": { - "widths" : [ - "11%", - "15%", - "15%", - "11%", - "11%", - "11%", - "11%", - "11%" - ], - "body":[ - [ - { - "text": "{{adhoc_rebate_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - }, - { - "text": "{{owner_exemption_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - }, - { - "text": "{{unit_usage_exemption_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - }, - { - "text": "{{fire_cess_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - }, - { - "text": "{{cancer_cess_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - }, - { - "text": "{{time_interest_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - }, - { - "text": "{{decimal_ceiling_debit_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - }, - { - "text": "{{decimal_ceiling_credit_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - } - ], - [ - { - "text": "{{adhoc_rebate}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2", - "bold": true - }, - { - "text": "{{owner_exemption}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text": "{{unit_usage_exemption}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text": "{{fire_cess}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text": "{{cancer_cess}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text": "{{time_interest}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text": "{{decimal_ceiling_debit}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text": "{{decimal_ceiling_credit}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2", - "bold": true - } - ] - - ] - } - - } - ], - [ - { - "table": { - "widths" : [ - "18%", - "11%", - "11%", - "11%" - ], - "body":[ - [ - { - "text": "{{advance_carryforward_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - }, - { - "text": "{{arrears_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - }, - { - "text": "{{roundoff_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - }, - { - "text": "{{total_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - } - ], - [ - { - "text": "{{advance_carryforward}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text": "{{arrearrs}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text": "{{roundoff}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text": "{{total}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2", - "bold": true - } - ] - - ] - } - - } - ] - ] - }, - "layout": {} - }, - - { - "style" : "noc-table3", - "table" : { - "widths": [ - "103%" - ], - "body":[ - [ - { - "style": "noc-table3", - "table": { - "widths": [ - "100%" - ], - "body": ["[{\"text\": \"{{important_message}}\",\"border\":[false,false,false,false],\"style\":\"bill-message-header\"}],{{#variable11}}[{\"text\":\"{{disclaimerContent}}\",\"border\":[false,false,false,false],\"style\":\"bill-message-value\"}]{{/variable11}}"] - } - } - ] - ] - - } - }, - { - "canvas": [ - { - "type": "line", - "x1": -40, - "y1": 30, - "x2": 700, - "y2": 30, - "dash": { - "length": 10, - "space": 5 - } - } - ] - }, - { - "image": "{{scissorImage}}", - "width": 24, - "height": 24, - "margin": [ - -30, - -11.2, - 0, - 0 - ] - }, - - { - "text": "{{acknowledgement_for}}", - "style": "footer-header" - - }, - { - "style": "noc-table4", - "table": { - "widths": [ - "25%", - "30%", - "25%", - "25%" - ], - "body": [ - [ - { - "text": "{{date_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{billdate}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": " ", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": " ", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": "{{consumer_id}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{consumerID}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "{{bill_no}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{billNo}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": "{{name_address}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{payerName}}, {{nameAddress}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "{{total_payment}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{total}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - } - ] - ] - } - }, - { - "text": "{{receivers_signature}}", - "style": "footer-bottom" - }, - { - "image": "{{footerLogoImage}}", - "width": 75, - "height": 10, - "alignment": "center", - "margin": [ - -12, - -10, - -230, - 0 - ] - } - ], - "styles": { - "noc-head": { - "margin": [ - -25, - -30, - 0, - 1 - ] - }, - "receipt-logo-header": { - "color": "#484848", - "fontFamily": "Roboto", - "fontSize": 14, - "bold": true, - "letterSpacing": 0.74, - "margin": [ - 0, - -10, - 0, - 5 - ] - }, - "receipt-logo-sub-header": { - "color": "#484848", - "fontFamily": "Roboto", - "fontSize": 13, - "letterSpacing": 0.6 - }, - "noc-table": { - "fontSize": 12, - "color": "#484848", - "margin": [ - -25, - 10, - -8, - -8 - ] - }, - "noc-table4": { - "fontSize": 12, - "color": "#484848", - "margin": [ - -25, - 75, - -8, - -8 - ] - }, - "noc-table2": { - "fontSize": 12, - "color": "#484848", - "margin": [ - -25, - 18, - -8, - -8 - ] - }, - "noc-table3": { - "fontSize": 12, - "color": "#484848", - "margin": [ - -25, - 30, - -8, - -8 - ] - }, - "receipt-table-value": { - "color": "#000000", - "bold": true, - "fontSize": 12, - "fontWeight": 500, - "margin": [ - 8, - 5, - 0, - 0 - ] - }, - "receipt-table-value2": { - "color": "#000000", - "bold": true, - "fontSize": 12, - "fontWeight": 500, - "margin": [ - 3, - 5, - 0, - 0 - ] - }, - "receipt-table": { - "color": "#484848", - "bold": true, - "fontSize": 12, - "fontWeight": 400, - "margin": [ - -10, - 5, - 0, - 0 - ] - }, - "receipt-table2": { - "color": "#484848", - "bold": true, - "fontSize": 11, - "fontWeight": 400, - "margin": [ - 3, - 8, - 0, - 10 - ] - }, - "right-receipt-table": { - "color": "#000000", - "bold": true, - "fontSize": 12, - "fontWeight": 500, - "margin": [ - 8, - 5, - 0, - 10 - ] - }, - "right-receipt-table2": { - "color": "#484848", - "bold": true, - "fontSize": 12, - "fontWeight": 400, - "margin": [ - -10, - 5, - 0, - 0 - ] - }, - "receipt-approver": { - "fontSize": 12, - "bold": true, - "margin": [ - -27, - 50, - -10, - 0 - ], - "color": "#484848" - }, - "no-signature": { - "fontSize": 12, - "margin": [ - -27, - 35, - -10, - 0 - ], - "color": "#484848" - }, - "amount-due": { - "fontSize": 30, - "color": "#FC8019", - "bold": true, - "fontWeight": 700 - }, - "pt-disclaimer": { - "fontSize": 12, - "margin": [ - -27, - 30, - -10, - 0 - ], - "color": "#484848" - }, - "pt-disclaimer-value": { - "fontSize": 12, - "margin": [ - 2, - 5, - 0, - 0 - ], - "color": "#484848" - }, - "qr-text": { - "fontSize": 12, - "margin": [ - 40, - 0, - 0, - 0 - ], - "color": "#484848", - "alignment": "left" - }, - "qr-image": { - "margin": [ - -40, - -1, - -3, - 0 - ], - "color": "#484848", - "alignment": "right" - }, - "footer-header": { - "margin": [ - 0, - 15, - 0, - -40 - ], - "bold": true, - "color": "#000000", - "alignment": "center" - }, - "footer-bottom": { - "margin": [ - 0, - 50, - 0, - 0 - ], - "bold": true, - "color": "#000000", - "alignment": "right" - }, - "bill-message-header": { - "color": "#000000", - "bold": true, - "fontSize": 12, - "fontWeight": 500, - "margin": [ - 28, - -15, - 0, - 10 - ] - }, - "bill-message-value": { - "color": "#484848", - "fontSize": 12, - "fontWeight": 500, - "margin": [ - 28, - -5, - 0, - 10 - ] - }, - "disclaimer-table": { - "fontSize": 12, - "bold": false, - "color": "#FC8019", - "margin": [ - -25, - 16, - -8, - -8 - ] - } - } - } -} \ No newline at end of file diff --git a/configs/pdf-service/format-config/property-receipt.json b/configs/pdf-service/format-config/property-receipt.json deleted file mode 100644 index 096a61a2..00000000 --- a/configs/pdf-service/format-config/property-receipt.json +++ /dev/null @@ -1,1376 +0,0 @@ -{ - "key": "property-receipt", - "config": { - "defaultStyle": { - "font": "Cambay" - }, - "watermark": { - "text": "DIGIT UAT DIGIT UAT", - "color": "gery", - "opacity": 0.1, - "bold": true, - "italics": false - }, - "content": [ - { - "style": "noc-head", - "table": { - "widths": [ - 60, - "*", - 120 - ], - "body": [ - [ - { - "image": "{{logoImage}}", - "width": 50, - "height": 61.25 - }, - { - "stack": [ - { - "text": "{{logo-header}} {{mcGrade}} (DIGIT UAT)", - "style": "receipt-logo-header" - }, - { - "text": "{{serviceType}} {{payment_receipt}}", - "style": "receipt-logo-sub-header" - } - ], - "alignment": "left", - "margin": [ - 0, - 4, - 0, - 0 - ] - }, - { - "stack": [ - { - "text": "{{address}}", - "style": "receipt-logo-sub-header" - - }, - { - "text": "{{phoneNumber}}", - "style": "receipt-logo-sub-header" - - }, - { - "text": "{{website}}", - "style": "receipt-logo-sub-header" - - }, - { - "text": "{{email}}", "style": "receipt-logo-sub-header" - - - } - ], - "alignment": "right", - "color": "#484848", - "margin": [ - -100, - 0, - -25, - 0 - ] - } - ] - ] - }, - "layout": "noBorders" - }, - { - "text":"PROPERTY INFORMATION", - "style":"block-head" - }, - { - "style": "next-noc-table", - "table": { - "widths": [ - "25%", - "25%", - "25%", - "25%" - ], - "body": [ - [ - { - "text": "{{receipt_no}}.", - "border": [ - true, - true, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{receiptNo}}", - "border": [ - false, - true, - false, - false - ], - "style": "receipt-tableee" - }, - { - "text": "{{consumer_id}}", - "border": [ - false, - true, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{consumerID}}", - "border": [ - false, - true, - true, - false - ], - "style": "receipt-tableee" - } - ], - [ - { - "text": "Assessment Year(Paid Amount)", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{assessmentYear}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-tableee" - }, - { - "text": "Existing Property Id", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{oldPropertyId}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-tableee" - } - ], - [ - { - "text": "{{payment_date}}", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{paymentDate}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-tableee" - }, - { - "text": "Survey Id/UID", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{surveyId}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-tableee" - } - ], - [ - { - "text": "{{payer_contact}}", - "border": [ - true, - false, - false, - true - ], - "style": "receipt-table-value" - }, - { - "text": "{{payerContact}}", - "border": [ - false, - false, - false, - true - ], - "style": "receipt-tableee" - }, - { - "text" : "Payment Status", - "border": [ - false, - false, - false, - true - ], - "style": "receipt-table-value" - }, - { - "text" : "{{paymentStatus}}", - "border": [ - false, - false, - true, - true - ], - "style": "receipt-tableee" - } - ] - ] - }, - "layout": {} - }, - { - "style": "noc-table", - "table": { - "widths": [ - "25%", - "25%", - "25%", - "25%" - ], - "body": [ - [ - { - "text": "House/Door No. : ", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{doorNo}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-tableee" - }, - { - "text": "Building/Colony Name: ", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{buildingName}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-tableee" - } - ], - [ - { - "text": "Street Name: ", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{streetName}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-tableee" - }, - { - "text": "Locality/Mohalla :", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{locality}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-tableee" - } - ], - [ - { - "text": "Plot Size (Sq. Yards) : ", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{landArea}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-tableee" - }, - { - "text": "Property Type: ", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{propertyType}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-tableee" - } - ], - [ - { - "text": "Property Usage Type ", - "border": [ - true, - false, - false, - true - - ], - "style": "receipt-table-value" - }, - { - "text": "{{propertyUsage}}", - "border": [ - false, - false, - false, - true - ], - "style": "receipt-tableee" - }, - { - "text": " ", - "border": [ - false, - false, - false, - true - ], - "style": "receipt-table-value" - }, - { - "text": " ", - "border": [ - false, - false, - true, - true - ], - "style": "receipt-tableee" - } - ] - ] - }, - "layout": {} - }, - { - "text":"AMOUNT TO BE PAID", - "style":"block-head" - }, - { - "style": "next-noc-table", - "table": { - "widths": [ - - "7%","9%","7%","7%","7%","7%","8%","8%","8%","8%","8%","7%","9%" - ], - "body": [ - - [ { - "text": "Year", - "style": "amounts" - }, - { - "text": "Property Tax", - "style": "amounts" - }, - { - "text": "Fire Cess", - "style": "amounts" - }, - { - "text": "Cancer Cess", - "style": "amounts" - }, - { - "text": "Penalty", - "style": "amounts" - }, - { - "text": "Rebate", - "style": "amounts" - }, - { - "text": "Interest", - "style": "amounts" - }, - { - "text": "Usage Exemp.", - "style": "amounts" - }, - { - "text": "Category Exemp.", - "style": "amounts" - }, - { - "text": "Adhoc Penalty", - "style": "amounts" - }, - { - "text": "Adhoc Rebate", - "style": "amounts" - }, - { - "text": "Round Off", - "style": "amounts" - }, - { - "text": "Total", - "style": "amounts" - } - - ], - - "{{#var_tax}}[{\"text\":\"{{year}}\",\"style\":\"receipt-table\"},{\"text\":\"{{tax}}\",\"style\":\"receipt-table\"},{\"text\":\"{{firecess}}\",\"style\":\"receipt-table\"},{\"text\":\"{{cancercess}}\",\"style\":\"receipt-table\"},{\"text\":\"{{penalty}}\",\"style\":\"receipt-table\"},{\"text\":\"{{rebate}}\",\"style\":\"receipt-table\"},{\"text\":\"{{interest}}\",\"style\":\"receipt-table\"},{\"text\":\"{{usage_exemption}}\",\"style\":\"receipt-table\"},{\"text\":\"{{special_category_exemption}}\",\"style\":\"receipt-table\"},{\"text\":\"{{adhoc_penalty}}\",\"style\":\"receipt-table\"},{\"text\":\"{{adhoc_rebate}}\",\"style\":\"receipt-table\"},{\"text\":\"{{roundoff}}\",\"style\":\"receipt-table\"},{\"text\":\"{{total}}\",\"style\":\"receipt-table\"}]{{/var_tax}}" - - - ] - }, - "layout":{} - }, - { - "text":"SUMMARY OF PAID AMOUNT", - "style":"block-head" - }, - { - "style": "next-noc-table", - "table": { - "widths": [ - - "7%","9%","7%","7%","7%","7%","8%","8%","8%","8%","8%","7%","9%" - ], - "body": [ - - [ { - "text": "Year", - "style": "amounts" - }, - { - "text": "Property Tax", - "style": "amounts" - }, - { - "text": "Fire Cess", - "style": "amounts" - }, - { - "text": "Cancer Cess", - "style": "amounts" - }, - { - "text": "Penalty", - "style": "amounts" - }, - { - "text": "Rebate", - "style": "amounts" - }, - { - "text": "Interest", - "style": "amounts" - }, - { - "text": "Usage Exemp.", - "style": "amounts" - }, - { - "text": "Category Exemp.", - "style": "amounts" - }, - { - "text": "Adhoc Penalty", - "style": "amounts" - }, - { - "text": "Adhoc Rebate", - "style": "amounts" - }, - { - "text": "Round Off", - "style": "amounts" - }, - { - "text": "Total", - "style": "amounts" - } - - ], - - "{{#var_bills}}[{\"text\":\"{{year}}\",\"style\":\"receipt-table\"},{\"text\":\"{{tax}}\",\"style\":\"receipt-table\"},{\"text\":\"{{firecess}}\",\"style\":\"receipt-table\"},{\"text\":\"{{cancercess}}\",\"style\":\"receipt-table\"},{\"text\":\"{{penalty}}\",\"style\":\"receipt-table\"},{\"text\":\"{{rebate}}\",\"style\":\"receipt-table\"},{\"text\":\"{{interest}}\",\"style\":\"receipt-table\"},{\"text\":\"{{usage_exemption}}\",\"style\":\"receipt-table\"},{\"text\":\"{{special_category_exemption}}\",\"style\":\"receipt-table\"},{\"text\":\"{{adhoc_penalty}}\",\"style\":\"receipt-table\"},{\"text\":\"{{adhoc_rebate}}\",\"style\":\"receipt-table\"},{\"text\":\"{{roundoff}}\",\"style\":\"receipt-table\"},{\"text\":\"{{total}}\",\"style\":\"receipt-table\"}]{{/var_bills}}" - - - ] - }, - "layout":{} - }, - { - "text":"{{PAYMENT INFORMATION}}", - "style":"block-head" - }, - { - "style": "next-noc-table", - "table": { - "widths": [ - "25%", - "25%", - "25%", - "25%" - ], - "body": [ - [ - { - "text": "Amount to be Paid", - "border": [ - true, - true, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "₹ {{dueAmount}}", - "border": [ - false, - true, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "{{paid_amount}}", - "border": [ - false, - true, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "₹ {{paidAmount}}", - "border": [ - false, - true, - true, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": "{{pending_amount}}", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "₹ {{pendingAmount}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "{{payment_mode}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{paymentMode}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - } - ],[ - { - "text": "IFSC Code", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{ifsc}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "Bank/Branch Name", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{bank}},{{branch}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": "{{transaction_id}}", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{transactionID}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "Trans/Cheque/DD Date", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{transactionDate}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": "{{g8_receipt_no}}.", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{G8ReceiptNo}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "{{g8_receipt_date}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{G8ReceiptDate}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": "Penalty Reason", - "border": [ - true, - false, - false, - true - ], - "style": "receipt-table-value" - }, - { - "text": "{{penaltyReason}}", - "border": [ - false, - false, - false, - true - ], - "style": "receipt-table" - }, - { - "text": "Rebate Reason", - "border": [ - false, - false, - false, - true - ], - "style": "receipt-table-value" - }, - { - "text": "{{rebateReason}}", - "border": [ - false, - false, - true, - true - ], - "style": "receipt-table" - } - - ] - ] - }, - "layout": {} - }, - { - "text":"OWNER/OCCUPIER INFORMATION", - "style":"block-head" - } - , - { - "style": "next-noc-table", - "table": { - "widths": [ - "*", - "*", - "*", - "*", - "*", - "*" - ], - "body": ["{{#var_owners}}[{\"text\":\"Owner Name\",\"border\":[true,true,false,true],\"style\":\"receipt-table-key\"},{\"text\":\"{{name2}}\",\"border\":[false,true,true,true]},{\"text\":\"Father/Husband Name\",\"border\":[true,true,false,true],\"style\":\"receipt-table-key\"},{\"text\":\"{{fatherOrHusbandName2}}\",\"border\":[false,true,true,true]},{\"text\":\"Share % (Category)\",\"border\":[true,true,false,true],\"style\":\"receipt-table-key\"},{\"text\":\"{{ownerShipPercentage}} ({{ownerType}}) \",\"border\":[false,true,true,true]}]{{/var_owners}}"] - }, - "layout": {} - }, { - "style": "next-noc-table", - "table": { - "widths": [ - "25%", - "25%", - "25%", - "25%" - ], - "body": [ - [ - { - "text": "Name of Institution", - "border": [ - true, - true, - false, - true - ], - "style": "receipt-table-value" - }, - { - "text": "{{institutionName}}", - "border": [ - false, - true, - false, - true - ], - "style": "receipt-table" - }, - { - "text": " ", - "border": [ - false, - true, - false, - true - ], - "style": "receipt-table-value" - }, - { - "text": " ", - "border": [ - false, - true, - true, - true - ], - "style": "receipt-table" - } - ] - ] - }, - "layout": {} - }, - { - "text":"BUILT-UP AREA DETAILS", - "style":"block-head" - }, - { - "style": "next-noc-table", - "table": { - "widths": [ - "15%", - "20%", - "*", - "20%", - "20%" - ], - "body": - [ - [ - { - "text": "Floor", - "style": "receipt-table-value22" - },{ - "text": "Usage", - "style": "receipt-table-value22" - }, - { - "text": "Sub Usage", - "style": "receipt-table-value22" - }, - { - "text": "Occupancy", - "style": "receipt-table-value22" - }, - { - "text": "Built Area (Sq. Yard) /annual Rent", - "style": "receipt-table-value22" - } - ], - "{{#var_floors}}[{\"text\":\"{{floor_no}}\",\"style\":\"receipt-table\"},{\"text\":\"{{usage_category}}\",\"style\":\"receipt-table\"},{\"text\":\"{{sub_usage_category}}\",\"style\":\"receipt-table\"},{\"text\":\"{{occupancy_type}}\",\"style\":\"receipt-table\"},{\"text\":\"{{builtup_area}}/{{arv_rent}}\",\"style\":\"receipt-table\"}]{{/var_floors}}" - ] - - - }, - "layout": {} - }, - { - "text":"ADDITIONAL DETAILS", - "style":"block-head" - }, - { - "style": "next-noc-table2", - "table": { - "widths": [ - "25%", - "25%", - "25%", - "25%" - ], - "body": [ - [ - { - "text": "Vasika No.", - "border": [ - true, - true, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{vasikaNo}}", - "border": [ - false, - true, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "Vasika Date", - "border": [ - false, - true, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{vasikaDate}}", - "border": [ - false, - true, - true, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": "Allotment No", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{allotmentNo}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "Allotment Date", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{allotmentDate}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": "Business Name", - "border": [ - true, - false, - false, - true - ], - "style": "receipt-table-value" - }, - { - "text": "{{businessName}}", - "border": [ - false, - false, - false, - true - ], - "style": "receipt-table" - }, - { - "text": "Remarks", - "border": [ - false, - false, - false, - true - ], - "style": "receipt-table-value" - }, - { - "text": "{{remarks}}", - "border": [ - false, - false, - true, - true - ], - "style": "receipt-table" - } - ] - ] - }, - "layout": {} - }, - { - "text": "Mobile Number {{ownerMobileNumber}} Assessee Signature: {{generated_by}}: {{user-name}} Approved By: {{approvedBy}} ", - "style": "receipt-approver" - } - , - { - "style": "receipt-approver", - "columns": [ - { - "text": [ - { - "text": "{{commissioner/eo}}", - "bold": true - } - ], - "alignment": "right", - "margin": [ - 0, - 0, - -10, - 1 - ] - } - ] - }, - { - "style": "pt-disclaimer", - "stack": - [ - { - "text": [{"text": "{{disclamer}} : Citizen for Online Payments please refer to the link ", "bold": true, "style": "pt-disclaimer-value"}, - {"text": "https://mseva.lgpunjab.gov.in/", "bold": true, "fontSize": 8, "color": "blue", "decoration": "underline"}]}, - { "text": "1. Payment received by cheque/demand draft shall be subject to realization, This is a computer generated document, hence requires no signature."}, - {"text":"2. This document is not a proof of Property Ownership and regularization of unauthorized construction."}, - {"text":"3. Assessment & Payment is subject to verification/Scrutiny by competitive authority.Also deposit property tax dues for earlier years. Ignore, if already paid."}, - {"text":"4. Residential Property will not be considered Commercial even if Commercial property tax is paid."}, - { - "text":"Now log a complaint from WhatsApp, give a missed call on 8750975975 or send a Hi message on WhatsApp to this number", "bold": true, "fontSize": 8, "color": "blue", "decoration": "underline"} - ] - }, - { - "image": "{{footerLogoImage}}", - "width": 75, - "height": 10, - "alignment": "center", - "margin": [ - -12, - -10, - -230, - 0 - ] - } - ], - "styles": { - "noc-head": { - "margin": [ - -30, - -30, - 0, - 1 - ] - }, - "block-head": { - "fontSize": 7, - "bold": true, - "letterSpacing": 0.74, - "margin": [ - -25, - 10, - 0, - -10 - ] - }, - "pt-reciept-citizen-table": { - "fontSize": 7, - "color": "#484848" - }, - "receipt-assess-table-header": { - "bold": true, - "fillColor": "#D8D8D8", - "color": "#484848" - }, - "receipt-logo-header": { - "color": "#000000", - "fontSize": 8.5, - "bold": true, - "letterSpacing": 0.74, - "margin": [ - 0, - 0, - 0, - 3 - ] - }, - "receipt-logo-sub-header": { - "color": "#000000", - "fontSize": 8.5, - "letterSpacing": 0.6 - }, - "noc-table": { - "fontSize": 7, - "color": "#000000", - "margin": [ - -25, - 5, - -22, - -8 - ] - }, - "next-noc-table": { - "fontSize": 7, - "color": "#000000", - "margin": [ - -25, - 7, - -22, - -8 - ] - }, "next-noc-table2": { - "fontSize": 7, - "color": "#000000", - "margin": [ - -25, - 10, - -22, - 0 - ] - }, - "receipt-table-value": { - "color": "#000000", - "bold": true, - "fontSize": 7, - "fontWeight": 500, - "margin": [ - 8, - 2, - 0, - -5 - ] - }, - "receipt-table-value22": { - "color": "#000000", - "bold": true, - "fontSize": 7, - "fontWeight": 500, - "backgroundColor": "#D3D3D3", - "margin": [ - -4, - 0, - 0, - 0 - ] - }, - "receipt-table": { - "color": "#000000", - "bold": false, - "fontSize": 7, - "fontWeight": 400, - "margin": [ - 0, - 0, - 0, - 0 - ] - },"receipt-tableee": { - "color": "#000000", - "bold": true, - "fontSize": 7, - "fontWeight": 500, - "margin": [ - 0, - 2, - 0, - -6 - ] - }, - "receipt-approver": { - "fontSize": 7, - "bold": true, - "margin": [ - -27, - 7, - -10, - 0 - ], - "color": "#484848" - },"receipt-approver2": { - "fontSize": 7, - "bold": true, - "margin": [ - -27, - 1, - -10, - 0 - ], - "color": "#484848" - }, - "no-signature": { - "fontSize": 7, - "margin": [ - -27, - 20, - -10, - 0 - ], - "color": "#484848" - }, - "pt-disclaimer": { - "fontSize": 8, - "margin": [ - -27, - 10, - -10, - 0 - ], - "color": "#484848" - }, - "pt-disclaimer-value": { - "fontSize": 8, - "margin": [ - 2, - 0, - 0, - 0 - ], - "color": "#484848" - }, - "amounts": - { - "fontSize": 8, - "backgroundColor": "#D3D3D3" - }, - "amountss": - { - "fontSize": 8 - } - } - } -} diff --git a/configs/pdf-service/format-config/pt-receipt.json b/configs/pdf-service/format-config/pt-receipt.json deleted file mode 100644 index 14b38f83..00000000 --- a/configs/pdf-service/format-config/pt-receipt.json +++ /dev/null @@ -1,826 +0,0 @@ -{ - "key":"pt-receipt", - "config":{ - "watermark": { - "text": "DIGIT UAT DIGIT UAT", - "color": "gery", - "opacity": 0.1, - "bold": true, - "italics": false - }, - "content":[ - { - "style": "pt-reciept-citizen-table", - "margin": [ - 0, - 0, - 0, - 18 - ], - "table": { - "widths": [ - 50, - "*", - 100 - ], - "body": [ - [ - { - "image": "{{variable38}}", - "width": 30, - "margin": [ - 10, - 10, - 10, - 10 - ] - }, - { - "stack": [ - { - "text": "{{variable35}} NAGAR PANCHAYAT (DIGIT UAT)", - "style": "receipt-logo-header" - }, - { - "text": "Property Tax Payment Receipt ({{variable36}}) ", - "style": "receipt-logo-sub-header" - } - ], - "alignment": "center", - "margin": [ - 0, - 5, - 0, - 0 - ] - }, - { - "text": [ - { - "text": "Receipt No.: ", - "bold": true - }, - "{{variable15}}" - ], - "margin": [10, 10, 10, 2] - } - ] - ] - }, - "layout": {} - }, - { - "style": "receipt-header-details", - "columns": [ - { - "text": [ - { - "text": "Date: ", - "bold": true - }, - "{{variable16}}" - ], - "alignment": "left" - }, - { - "text": [ - { - "text": "Contact Us: ", - "bold": true - }, - "0183-2545155" - ], - "alignment": "right" - } - ] - }, - { - "style": "receipt-header-details", - "columns": [ - { - "text": [ - { - "text": "Assessment Year: ", - "bold": true - }, - "{{variable1}}" - ], - "alignment": "left" - }, - { - "text": [ - { - "text": "Website: ", - "bold": true - }, - "www.amritsarcorp.com" - ], - "alignment": "right" - } - ] - }, - { - "style": "pt-reciept-citizen-table", - "table": { - "body": [ - [ - { - "text": "Existing Property ID:", - "border": [ - true, - true, - false, - true - ], - "style": "receipt-table-key" - }, - { - "text": "{{variable2}}", - "border": [ - false, - true, - true, - true - ] - }, - { - "text": "Property Tax Unique ID:", - "border": [ - true, - true, - false, - true - ], - "style": "receipt-table-key" - }, - { - "text": "{{variable3}}", - "border": [ - false, - true, - true, - true - ] - }, - { - "text": "Assessment No:", - "border": [ - true, - true, - false, - true - ], - "style": "receipt-table-key" - }, - { - "text": "{{variable4}}", - "border": [ - false, - true, - true, - true - ] - } - ] - ] - }, - "layout": {} - }, - { - "text": "PROPERTY ADDRESS", - "style": "pt-reciept-citizen-subheader" - }, - { - "style": "pt-reciept-citizen-table", - "table": { - "widths": [ - "*", - "*", - "*", - "*" - ], - "body": [ - [ - { - "text": "House/Door No.:", - "border": [ - true, - true, - false, - true - ], - "style": "receipt-table-key" - }, - { - "text": "{{variable5}}", - "border": [ - false, - true, - true, - true - ] - }, - { - "text": "Building/Colony Name.:", - "border": [ - true, - true, - false, - true - ], - "style": "receipt-table-key" - }, - { - "text": "{{variable6}}", - "border": [ - false, - true, - true, - true - ] - } - ], - [ - { - "text": "Street Name:", - "border": [ - true, - true, - false, - true - ], - "style": "receipt-table-key" - }, - { - "text": "{{variable7}}", - "border": [ - false, - true, - true, - true - ] - }, - { - "text": "Locality/Mohalla:", - "border": [ - true, - true, - false, - true - ], - "style": "receipt-table-key" - }, - { - "text": "{{variable8}}", - "border": [ - false, - true, - true, - true - ] - } - ] - ] - }, - "layout": {} - }, - { - "text": "ASSESSMENT INFORMATION", - "style": "pt-reciept-citizen-subheader" - }, - { - "style": "pt-reciept-citizen-table", - "table": { - "widths": [ - "*", - "*", - "*", - "*" - ], - "body": [ - [ - { - "text": "Plot Size(sq yards)", - "border": [ - true, - true, - false, - true - ], - "style": "receipt-table-key" - }, - { - "text": "{{variable9}}", - "border": [ - false, - true, - true, - true - ] - }, - { - "text": "Property Type:", - "border": [ - true, - true, - false, - true - ], - "style": "receipt-table-key" - }, - { - "text": "{{variable10}}", - "border": [ - false, - true, - true, - true - ] - } - ] - ] - }, - "layout": {} - }, - { - "text": "BUILT-UP AREA DETAILS", - "style": "pt-reciept-citizen-subheader" - }, - { - "style": "receipt-assess-table", - "table": { - "widths": [ - "*", - "*", - "*", - "*", - "*" - ], - "body": [ - [ - { - "text": "Floor", - "style": "receipt-assess-table-header" - }, - { - "text": "Usage Type", - "style": "receipt-assess-table-header" - }, - { - "text": "Sub Usage Type", - "style": "receipt-assess-table-header" - }, - { - "text": "Occupancy", - "style": "receipt-assess-table-header" - }, - { - "text": "Built Area/Total Annual Rent(sq yards)", - "style": "receipt-assess-table-header" - } - ], - "{{variable12}}" - ] - }, - "layout": {} - }, - { - "text": "OWNERSHIP INFORMATION", - "style": "pt-reciept-citizen-subheader" - }, - { - "style": "pt-reciept-citizen-table", - "table": { - "widths": [ - "*", - "*", - "*", - "*" - ], - "body": ["{{#variable11}}[{\"text\":\"Owner Name\",\"border\":[true,true,false,true],\"style\":\"receipt-table-key\"},{\"text\":\"{{name}}\",\"border\":[false,true,true,true]},{\"text\":\"Father's Name\",\"border\":[true,true,false,true],\"style\":\"receipt-table-key\"},{\"text\":\"{{fatherOrHusbandName}}\",\"border\":[false,true,true,true]}]{{/variable11}}"] - }, - "layout": {} - }, - { - "text": "PAYABLE AMOUNT", - "style": "pt-reciept-citizen-subheader" - }, - { - "style": "receipt-assess-table", - "table": { - "widths": [ - "auto", - "auto", - "auto", - "auto", - "auto", - "auto", - "auto", - "auto", - "auto", - "auto" - ], - "body": [ - [ - { - "text": "Property Tax" - }, - { - "text": "Fire Cess" - }, - { - "text": "Cancer Cess" - }, - { - "text": "Penalty" - }, - { - "text": "Rebate" - }, - { - "text": "Interest" - }, - { - "text": "Usage Exemption" - }, - { - "text": "Special Category Exemption" - }, - { - "text": "Round Off" - }, - { - "text": "Total" - } - ], - [ - { - "text": "{{variable17}}" - }, - { - "text": "{{variable18}}" - }, - { - "text": "{{variable19}}" - }, - { - "text": "{{variable20}}" - }, - { - "text": "{{variable21}}" - }, - { - "text": "{{variable22}}" - }, - { - "text": "{{variable23}}" - }, - { - "text": "{{variable24}}" - }, - { - "text": "{{variable25}}" - }, - { - "text": "{{variable34}}" - } - ] - ] - }, - "layout": {} - }, - { - "text": "PAYMENT INFORMATION", - "style": "pt-reciept-citizen-subheader" - }, - { - "style": "pt-reciept-citizen-table", - "table": { - "widths": [ - "auto", - "auto", - "auto", - "auto" - ], - "body": [ - [ - { - "text": "Total Amount Paid:", - "border": [ - true, - true, - false, - true - ], - "style": "receipt-table-key" - }, - { - "text": "{{variable27}}", - "border": [ - false, - true, - true, - true - ], - "style": "receipt-table-value" - }, - { - "text": "Pending Amount:", - "border": [ - true, - true, - false, - true - ], - "style": "receipt-table-key" - }, - { - "text": "{{variable37}}", - "border": [ - false, - true, - true, - true - ] - } - ], - [ - { - "text": "Payment Mode:", - "border": [ - true, - true, - false, - true - ], - "style": "receipt-table-key" - }, - { - "text": "{{variable28}}", - "border": [ - false, - true, - true, - true - ] - }, - { - "text": "Bank Name:", - "border": [ - true, - true, - false, - true - ], - "style": "receipt-table-key" - }, - { - "text": "{{variable29}}", - "border": [ - false, - true, - true, - true - ] - } - ], - [ - { - "text": "Transaction ID/ Cheque/ DD No.:", - "border": [ - true, - true, - false, - true - ], - "style": "receipt-table-key" - }, - { - "text": "{{variable30}}", - "border": [ - false, - true, - true, - true - ] - }, - { - "text": "Transaction Date:", - "border": [ - true, - true, - false, - true - ], - "style": "receipt-table-key" - }, - { - "text": "{{variable31}}", - "border": [ - false, - true, - true, - true - ] - } - ], - [ - { - "text": "G8 Receipt No:", - "border": [ - true, - true, - false, - true - ], - "style": "receipt-table-key" - }, - { - "text": "{{variable32}}", - "border": [ - false, - true, - true, - true - ] - }, - { - "text": "G8 Receipt Issue Date:", - "border": [ - true, - true, - false, - true - ], - "style": "receipt-table-key" - }, - { - "text": "{{variable33}}", - "border": [ - false, - true, - true, - true - ] - } - ] - ] - }, - "layout": {} - }, - { - "text": "Commissioner/EO", - "alignment": "right", - "color": "#484848", - "fontSize": 12, - "bold": true, - "margin": [ - 0, - 30, - 0, - 30 - ] - }, - { - "text": "Note:", - "alignment": "left", - "style": "receipt-footer" - }, - { - "ol": [ - { - "text": "Payment received by cheque/demand draft shall be subject to realization.", - "margin": [ - 0, - 0, - 0, - 5 - ] - }, - { - "text": "This document is not a proof of Property Ownership and regularization of unauthorized construction.", - "margin": [ - 0, - 0, - 0, - 5 - ] - }, - { - "text": "This is a computer generated document, hence requires no signature.", - "margin": [ - 0, - 0, - 0, - 5 - ] - }, - { - "text": "Assessment & Payment is subject to verification/Scrutiny by competitive authority.", - "margin": [ - 0, - 0, - 0, - 5 - ] - }, - { - "text": "Please deposit property tax dues for earlier years also. Ignore, if already paid.", - "margin": [ - 0, - 0, - 0, - 5 - ] - } - ], - "alignment": "left", - "style": "receipt-footer" - }, - { - "image": "{{footerLogoImage}}", - "width": 75, - "height": 10, - "alignment": "center", - "margin": [ - -12, - -10, - -230, - 0 - ] - } - ], - "styles": { - "pt-reciept-citizen-subheader": { - "fontSize": 10, - "bold": true, - "margin": [ - 0, - 16, - 0, - 8 - ], - "color": "#484848" - }, - "pt-reciept-citizen-table": { - "fontSize": 10, - "color": "#484848" - }, - "receipt-assess-table": { - "fontSize": 10, - "color": "#484848", - "margin": [ - 0, - 8, - 0, - 0 - ] - }, - "receipt-assess-table-header": { - "bold": true, - "fillColor": "#D8D8D8", - "color": "#484848" - }, - "receipt-header-details": { - "fontSize": 9, - "margin": [ - 0, - 0, - 0, - 8 - ], - "color": "#484848" - }, - "receipt-table-key": { - "color": "#484848", - "bold": true - }, - "receipt-table-value": { - "color": "#484848" - }, - "receipt-logo-header": { - "color": "#484848", - "fontSize": 16, - "bold": true, - "decoration": "underline", - "decorationColor": "#484848" - }, - "receipt-logo-sub-header": { - "color": "#484848", - "fontSize": 13, - "decoration": "underline", - "decorationColor": "#484848" - }, - "receipt-footer": { - "color": "#484848", - "fontSize": 8, - "margin": [ - 0, - 0, - 0, - 5 - ] - } - } - } -} \ No newline at end of file diff --git a/configs/pdf-service/format-config/ptmutationcertificate.json b/configs/pdf-service/format-config/ptmutationcertificate.json deleted file mode 100644 index 68483536..00000000 --- a/configs/pdf-service/format-config/ptmutationcertificate.json +++ /dev/null @@ -1,537 +0,0 @@ -{ - "key": "ptmutationcertificate", - "config": { - "defaultStyle": { - "font": "Cambay" - }, - "watermark": { - "text": "DIGIT UAT DIGIT UAT", - "color": "gery", - "opacity": 0.1, - "bold": true, - "italics": false - }, - "content": [ - { - "style": "noc-head", - "table": { - "widths": [ - "*" - ], - "body": [ - [ - { - "image": "{{ULB_LOGO}}", - "width": 70, - "height": 82, - "alignment": "center", - "margin": [ - 0, - 10, - 0, - 10 - ] - } - ], - [ - { - "stack": [ - { - "text": "{{ULB_CITY}} {{municipal_corportaion}} (DIGIT UAT) ", - "style": "receipt-logo-header" - }, - { - "text": "{{ULB_ADDRESS}}", - "style": "receipt-logo-sub-header" - }, - { - "style": "noc-head", - "table": { - "widths": [ - "*", - "*" - ], - "body": [ - [ - { - "text": "{{corporation_fax}} : {{CorporationContact_Value}} ", - "style": "receipt-sub-address-sub-header" - } - ] - ] - }, - "layout": "noBorders" - }, - { - "style": "noc-head", - "table": { - "widths": [ - "*", - "*" - ], - "body": [ - [ - { - "text": "{{corporation_website}} : {{corporationWebsite}}", - "style": "receipt-sub-website-sub-header" - } - ] - ] - }, - "layout": "noBorders" - }, - { - "style": "noc-head", - "table": { - "widths": [ - "*", - "*" - ], - "body": [ - [ - { - "text": "{{corporation_email}} : {{corporationEmail}}", - "style": "receipt-sub-email-sub-header" - } - ] - ] - }, - "layout": "noBorders" - } - ], - "alignment": "left", - "margin": [ - 0, - 10, - 0, - 0 - ] - } - ], - [ - { - "stack": [ - { - "text": "{{Mutation_Approval_Certificate}}", - "style": "receipt-sub-logo-header" - }, - { - "style": "noc-head", - "table": { - "widths": [ - "35%", - "65%" - ], - "body": [ - [ - { - "text": "{{Property_ID_Label}}", - "style": "receipt-content" - }, - { - "text": "{{Property_ID}}", - "style": "receipt-content", - "font": "Roboto" - } - ] - ] - }, - "layout": "noBorders" - }, - { - "style": "noc-head", - "table": { - "widths": [ - "35%", - "65%" - ], - "body": [ - [ - { - "text": "{{Mutation_Number_Label}}", - "style": "receipt-content" - }, - { - "text": "{{Mutation_Number}}", - "style": "receipt-content", - "font": "Roboto" - } - ] - ] - }, - "layout": "noBorders" - }, - { - "style": "noc-head", - "table": { - "widths": [ - "35%", - "65%" - ], - "body": [ - [ - { - "text": "{{Application_Number_Label}}", - "style": "receipt-content" - }, - { - "text": "{{Application_Number}}", - "style": "receipt-content", - "font": "Roboto" - } - ] - ] - }, - "layout": "noBorders" - }, - { - "style": "noc-head", - "table": { - "widths": [ - "35%", - "65%" - ], - "body": [ - [ - { - "text": "{{Receipt_Number_Label}}", - "style": "receipt-content" - }, - { - "text": "{{Receipt_Number}}", - "style": "receipt-content", - "font": "Roboto" - } - ] - ] - }, - "layout": "noBorders" - }, - { - "style": "noc-head", - "table": { - "widths": [ - "35%", - "65%" - ], - "body": [ - [ - { - "text": "{{Approval_Date_Label}}", - "style": "receipt-content" - }, - { - "text": "{{Approval_Date}}", - "style": "receipt-content", - "font": "Roboto" - } - ] - ] - }, - "layout": "noBorders" - } - ], - "alignment": "left", - "margin": [ - 0, - 10, - 0, - 0 - ] - } - - ], - [ - { - "stack": [ - { - "text": "{{Order_Label}}", - "bold": true, - "style": "receipt-order-header" - }, - { - "text": "{{Mutation_Declaration_Label}}", - "style": "receipt-order-content" - } - ], - "alignment": "left", - "margin": [ - 0, - 10, - 0, - 0 - ] - } - ], - [ - { - "stack": [ - { - "style": "noc-head", - "table": { - "widths": [ - "35%", - "65%" - ], - "body": [ - [ - { - "text": "{{Transferrer_Details_Label}}", - "style": "receipt-content" - }, - { - "text": "{{Transferrer_Name}} {{Transferrer_Relation}} {{Transferrer_Relative_Name}}", - "style": "receipt-content" - } - ] - ] - }, - "layout": "noBorders" - }, - { - "style": "noc-head", - "table": { - "widths": [ - "35%", - "65%" - ], - "body": [ - [ - { - "text": "{{Transferree_Details_Label}}", - "style": "receipt-content" - }, - { - "text": "{{Transferree_Name}} {{Transferree_Relation}} {{Transferree_Relative_Name}}", - "style": "receipt-content" - } - ] - ] - }, - "layout": "noBorders" - } - ], - "alignment": "left", - "margin": [ - 0, - 10, - 0, - 0 - ] - } - - ], - [ - { - "stack": [ - { - "text": "{{Mutation_To_Label}}", - "bold": true, - "style": "receipt-order-header" - }, - { - "text": "{{Shri_Smt_Label}} {{Transferree_Name}}", - "style": "receipt-order-content" - }, - { - "text": "{{Transferree_Address}}", - "style": "receipt-order-content" - } - ], - "alignment": "left", - "margin": [ - 0, - 10, - 0, - 0 - ] - } - ] - ] - }, - "layout": "noBorders" - }, - { - "style": "receipt-approver", - "columns": [ - { - "text": [ - { - "text": "{{approved_by}} ", - "bold": true - }, - { - "text": "{{approved_by_value}}", - "bold": false - } - ], - "alignment": "left" - }, - { - "text": [ - { - "text": "{{commissioner}}", - "bold": true - } - ], - "alignment": "right" - } - ] - }, - { - "image": "{{footerLogoImage}}", - "width": 75, - "height": 10, - "alignment": "center", - "margin": [ - -12, - -10, - -230, - 0 - ] - } - ], - "styles": { - "noc-head": { - "margin": [ - -30, - -35, - 0, - -2 - ] - }, - "receipt-approver": { - "color": "#000000", - "fontSize": 14, - "letterSpacing": 0.6, - "alignment": "center", - "margin": [ - -10, - 50, - 0, - 1 - ] - }, - "receipt-logo-header": { - "color": "#000000", - "fontSize": 20, - "letterSpacing": 0.74, - "alignment": "center", - "margin": [ - 0, - 0, - 0, - 5 - ] - }, - "receipt-sub-logo-header": { - "color": "#000000", - "fontSize": 18, - "letterSpacing": 0.74, - "alignment": "center", - "margin": [ - 0, - 5, - 0, - 10 - ] - }, - "receipt-logo-sub-header": { - "color": "#484848", - "fontSize": 14, - "letterSpacing": 0.6, - "alignment": "center", - "margin": [ - 0, - 5, - 0, - 0 - ] - }, - "receipt-sub-logo-sub-header": { - "color": "#484848", - "fontSize": 14, - "letterSpacing": 0.6, - "alignment": "left", - "margin": [ - 50, - 40, - 0, - 0 - ] - }, - "receipt-sub-address-sub-header": { - "color": "#484848", - "fontSize": 14, - "letterSpacing": 0.1, - "alignment": "right", - "margin": [ - 50, - 30, - -80, - 0 - ] - }, - "receipt-sub-website-sub-header": { - "color": "#484848", - "fontSize": 14, - "letterSpacing": 0.1, - "alignment": "right", - "margin": [ - 50, - 30, - -120, - 0 - ] - }, - "receipt-sub-email-sub-header": { - "color": "#484848", - "fontSize": 14, - "letterSpacing": 0.1, - "alignment": "right", - "margin": [ - 50, - 30, - -110, - 0 - ] - }, - "receipt-order-header": { - "color": "#000000", - "fontSize": 14, - "letterSpacing": 0.6, - "alignment": "left", - "margin": [ - 19, - 0, - 0, - 1 - ] - }, - "receipt-order-content": { - "color": "#484848", - "fontSize": 14, - "letterSpacing": 0.4, - "alignment": "left", - "margin": [ - 19, - -2, - 0, - 1 - ] - }, - "receipt-content": { - "color": "#000000", - "fontSize": 14, - "letterSpacing": 0.4, - "alignment": "left", - "margin": [ - 50, - 30, - 0, - 0 - ] - } - } - } - } \ No newline at end of file diff --git a/configs/pdf-service/format-config/sewerage-bill-amendment-note.json b/configs/pdf-service/format-config/sewerage-bill-amendment-note.json deleted file mode 100644 index 89e61c78..00000000 --- a/configs/pdf-service/format-config/sewerage-bill-amendment-note.json +++ /dev/null @@ -1,539 +0,0 @@ -{ - "key": "sw-bill-amendment-credit-note", - "config": { - "defaultStyle": { - "font": "Cambay" - }, - "watermark": { - "text": "DIGIT UAT DIGIT UAT", - "color": "gery", - "opacity": 0.1, - "bold": true, - "italics": false - }, - "content": [ - { - "style": "noc-head", - "table": { - "widths": [ - 60, - "*", - 120 - ], - "color":"#484848", - "body": [ - [ - { - "image": "{{logoImage}}", - "width": 50, - "height": 61.25 - }, - { - "stack": [ - { - "text": "{{logo-header}} {{mcGrade}} (Digit UAT)", - "style": "receipt-logo-header" - }, - { - "text": "{{note_type}}", - "style": "receipt-logo-sub-header" - } - ], - "alignment": "left", - "margin": [ - 0, - 10, - 0, - 0 - ] - }, - { - "stack": [ - { - "text": "{{address}}" - }, - { - "text": "{{phoneNumber}}" - }, - { - "text": "{{website}}" - }, - { - "text": "{{email}}" - } - ], - "alignment": "right", - "color": "#484848", - "margin": [ - -100, - 0, - -25, - 0 - ] - } - ] - ] - }, - "layout": "noBorders" - }, - - { - "style": "note-info", - "columns": [ - { - "text": [ - { - "text": "{{note_id}} ", - "bold": true - }, - { - "text": "{{applicationNo}}", - "bold": false - } - ], - "alignment": "left" - }, - { - "text": [ - { - "text": "{{note_date}}", - "bold": true - }, - { - "text": "{{date}}", - "bold": false - } - ], - "alignment": "right", - "margin": [ - 0, - 0, - -10, - 1 - ] - } - ] - }, - - { - "style": "header", - "columns": [ - { - "text": [ - { - "text": "{{against}}", - "bold": true - } - ], - "alignment": "left" - } - ] - }, - { - "style": "header-1", - "text": "{{user-name}}", - "alignment": "left" - }, - { - "style": "header-1", - "text": "{{permanentAddress}}", - "alignment": "left" - }, - { - "style": "header", - "text": " ", - "alignment": "left" - }, - - { - "style": "note-info-1", - "columns": [ - { - "text": [ - { - "text": "{{adjustment_amount_details}}", - "bold": true - } - ], - "alignment": "left" - }, - { - "text": [ - { - "text": "{{total_amount}}", - "bold": true - } - ], - "alignment": "right", - "margin": [ - 0, - 0, - -200, - 1 - ] - }, - { - "text": [ - { - "text": "{{rs}} {{totalAmount}}", - "bold": true - } - ], - "alignment": "right", - "fontSize": 20, - "margin": [ - 0, - 25, - -10, - 1 - ] - } - ] - }, - - { - "style": "ws-table", - "table": { - "widths": [ - "70%" - ], - "body": [ - [ - { - "table": { - "widths": [ - "10%", - "30%", - "30%" - ], - "body": [ - [ - { - "text": "{{sl_no}}", - "alignment": "center" - }, - { - "text": "{{tax_heads}}", - "alignment": "left" - }, - { - "text": "{{reduced_amount}}", - "alignment": "right" - } - ], - [ - { - "text": "1.", - "alignment": "center" - }, - { - "text": "{{sewerage_charge}}", - "alignment": "left" - }, - { - "text": "{{sewerageCharge}}", - "alignment": "right" - } - ], - [ - { - "text": "2.", - "alignment": "center" - }, - { - "text": "{{interest}}", - "alignment": "left" - }, - { - "text": "{{sewerageInterest}}", - "alignment": "right" - } - ], - [ - { - "text": "3.", - "alignment": "center" - }, - { - "text": "{{penalty}}", - "alignment": "left" - }, - { - "text": "{{seweragePenalty}}", - "alignment": "right" - } - ], - [ - { - "text": " " - }, - { - "text": "{{total_amount}}", - "alignment": "left" - }, - { - "text": "{{totalAmount}}", - "alignment": "right" - } - ] - ] - }, - "border": [ - false, - false, - false, - false - ] - } - ] - ] - }, - "layout": {} - }, - - { - "style": "ws-table-1", - "table": { - "widths": [ - "130%" - ], - "body": [ - [ - { - "table": { - "widths": [ - "120%" - ], - "body": [ - [ - { - "text": "{{box_note}}", - "alignment": "left" - } - ] - ] - }, - "border": [ - false, - false, - false, - false - ] - } - ] - ] - }, - "layout": {} - }, - - { - "style": "header", - "text": " ", - "alignment": "left" - }, - - { - "style": "receipt-approver", - "columns": [ - { - "text": [ - { - "text": "{{generated_by}}: ", - "bold": true - }, - { - "text": "{{user-name}}", - "bold": false - } - ], - "alignment": "left" - }, - { - "text": [ - { - "text": "{{commissioner/eo}}", - "bold": true - } - ], - "alignment": "right", - "margin": [ - 0, - 0, - -10, - 1 - ] - } - ] - }, - - { - "style": "no-signature", - "text": "{{no_signature}}" - }, - - { - "style": "no-signature", - "text": "{{box_validity}}" - }, - { - "image": "{{footerLogoImage}}", - "width": 75, - "height": 10, - "alignment": "center", - "margin": [ - -12, - -10, - -230, - 0 - ] - } - ], - - "styles": { - "noc-head": { - "margin": [ - -30, - -30, - 0, - 1 - ] - }, - "ws-head": { - "margin": [ - -39, - -38, - -38, - 0 - ] - }, - "receipt-logo-header": { - "color": "#000000", - "fontSize": 14, - "bold": true, - "letterSpacing": 0.74, - "margin": [ - 0, - 0, - 0, - 5 - ] - }, - "ws-table": { - "fontSize": 12, - "color": "#484848", - "margin": [ - -25, - 18, - -8, - 10 - ] - }, - "ws-table-1": { - "fontSize": 12, - "color": "#000000", - "margin": [ - 380, - -120, - 20, - 10 - ] - }, - "receipt-logo-sub-header": { - "color": "#000000", - "fontSize": 12, - "letterSpacing": 0.6 - }, - "receipt-table-value": { - "color": "#000000", - "bold": true, - "fontSize": 12, - "fontWeight": 500, - "margin": [ - 8, - 8, - 0, - 8 - ] - }, - "receipt-table": { - "color": "#000000", - "bold": false, - "fontSize": 12, - "fontWeight": 400, - "margin": [ - -10, - 8, - 0, - 8 - ] - }, - "header": { - "color": "#000000", - "bold": true, - "fontSize": 12, - "fontWeight": 500, - "margin": [ - -25, - 15, - 0, - -10 - ] - }, - "header-1": { - "color": "#000000", - "bold": false, - "fontSize": 12, - "fontWeight": 500, - "margin": [ - -25, - 15, - 0, - -10 - ] - }, - "receipt-approver": { - "fontSize": 12, - "bold": true, - "margin": [ - -27, - 50, - -10, - 0 - ], - "color": "#484848" - }, - "note-info": { - "fontSize": 12, - "bold": true, - "margin": [ - -27, - 10, - -10, - 0 - ], - "color": "#000000" - }, - "note-info-1": { - "fontSize": 12, - "bold": true, - "margin": [ - -27, - 10, - -10, - -45 - ], - "color": "#000000" - }, - "no-signature": { - "fontSize": 12, - "margin": [ - -27, - 10, - -10, - 0 - ], - "color": "#484848" - } - } - } -} diff --git a/configs/pdf-service/format-config/sw-bill.json b/configs/pdf-service/format-config/sw-bill.json deleted file mode 100644 index d83f6517..00000000 --- a/configs/pdf-service/format-config/sw-bill.json +++ /dev/null @@ -1,1249 +0,0 @@ -{ - "key": "sw-bill", - "config": { - "defaultStyle": { - "font": "Cambay" - }, - "watermark": { - "text": "DIGIT UAT DIGIT UAT", - "color": "gery", - "opacity": 0.1, - "bold": true, - "italics": false - }, - "content": [ - { - "style": "noc-head", - "table": { - "widths": [ - 60, - "*", - 120 - ], - "body": [ - [ - { - "image": "{{logoImage}}", - "width": 45, - "height": 50 - }, - { - "stack": [ - { - "text": "{{logo_header}} {{mcGrade}} (Digit UAT)", - "style": "receipt-logo-header" - }, - { - "stack": [ - { - "text": "{{address}}" - }, - { - "text": "{{phoneNumber}}" - }, - { - "text": "{{website}}" - }, - { - "text": "{{email}}" - } - ] - } - ], - "alignment": "left", - "margin": [ - 0, - 1, - 0, - 0 - ] - }, - { - "stack": [ - { - "text": "{{total_amount_due}}" - }, - { - "text": "{{Rs}} {{totalAmountDue}}", - "style": "amount-due" - } - ], - "alignment": "right", - "color": "#484848", - "margin": [ - -150, - 1, - -20, - 0 - ] - } - ] - ] - }, - "layout": "noBorders" - }, - { - "style": "noc-table2", - "table": { - "widths": [ - "103%" - ], - "body": [ - [ - { - "text": "{{serviceType}} Bill for Period {{fromPeriod}} - {{toPeriod}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2", - "alignment":"center" - } - ] - ] - }, - "layout": {} - }, - { - "style": "noc-table2", - "table": { - "widths": [ - "103%" - ], - "body": [ - [ - { - "table": { - "widths": [ - "8%", - "22%", - "15%", - "21%", - "15%", - "21%" - ], - "body": [ - [ - { - "text": "{{bill_no}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - }, - { - "text": "{{billNo}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - }, - { - "text": "{{bill_issue_date}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - }, - { - "text": "{{billIssueDate}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - }, - { - "text": "Bill Due Date", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - }, - { - "text": "{{billDueDate}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - } - ] - ] - }, - "border": [ - false, - true, - false, - true - ] - } - ] - - ] - }, - "layout": {} - }, - { - "style": "noc-table2", - "table": { - "widths": [ - "103%" - ], - "body": [ - [ - { - "table": { - "widths": [ - "23%", - "25%", - "23%", - "*" - ], - "body": [ - [ - { - "text": "{{consumer_no}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - }, - { - "text": "Old Consumer No.", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - }, - { - "text": "House No.", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - }, - { - "text": "Ledger Id", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - } - ], - [ - { - "text": "{{consumerCode}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text": "{{oldConnectionNo}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text": "{{houseNo}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text":"{{ledgerId}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2" - } - ], - [ - { - "text": "Plot Size", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - }, - { - "text": "Consumer Name", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - }, - { - "text": "Guardian Name", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - }, - { - "text": "Locality", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - } - ], - [ - { - "text": "{{plotSize}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text": "{{ownerName}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text": "{{guardianName}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text":"{{locality}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2" - } - ], - [ - { - "text": "Usage Type", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - }, - { - "text": "Mobile Number", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - }, - { - "text": "Street Name/Landmark", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - }, - { - "text": "Address", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - } - ], - [ - { - "text": "{{usageType}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - - { - "text": "{{mobileNo}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text":"{{streetName}}{{landmark}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text": "{{payerAddress}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2" - } - ] - ] - }, - "border": [ - true, - true, - true, - true - ] - } - ] - ] - }, - "layout": {} - }, - { - "style": "noc-table2", - "table": { - "widths": [ - "103%" - ], - "body": [ - [ - { - "text": "{{billing_summary_property_tax}} {{serviceType}}", - "border": [ - true, - true, - true, - false - ], - "style": "receipt-table-value" - } - ], - [ - { - "table": { - "widths": [ - "12%", - "23%", - "15%", - "10%", - "10%", - "10%", - "10%", - "*" - ], - "body": [ - [ - { - "text": "{{arrears_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - }, - { - "text": "{{advanceAdjusted_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - }, - { - "text": "{{advanceAvailable_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - },{ - "text": "{{charge_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - }, - { - "text": "{{penalty_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - }, - { - "text": "{{rebate_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - }, - { - "text": "{{others_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - }, - { - "text": "{{total_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - } - ], - [ - { - "text": "{{arrears}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text":"{{advanceAdjusted}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text": "{{advanceAvailable}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text": "{{charge}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text": "{{penalty}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text": "{{rebate}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text": "{{others}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text": "{{calculatedTotal}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2", - "bold": true - } - ] - ] - }, - "border": [ - true, - true, - true, - true - ] - } - ] - ] - }, - "layout": {} - }, - { - "style": "noc-table3", - "table": { - "widths": [ - "103%" - ], - "body": [ - [ - { - "text": "{{important_message}}", - "border": [ - true, - true, - true, - false - ], - "margin": [ - 9, - 1, - 0, - 1 - ], - "style": "receipt-table-value" - } - ], - [ - { - "text": "1. Online payment can be done for {{serviceType}} charges payment. http://bit.ly/{{logo_header}}{{serviceType}}", - "border": [ - true, - false, - true, - false - ], - "margin": [ - 4, - 0, - 0, - 0.5 - ] - } - ], - [ - { - "text": "2. If last day to pay bill is a holiday. Kindly pay your bills either online or offline on previous working day to avoid penalty.", - "border": [ - true, - false, - true, - false - ], - "margin": [ - 4, - 0, - 0, - 0.5 - ] - } - ], - [ - { - "text": "3. Payment mode available: Cash/Cheque at office counter,Online: Credit/Debit Card/PayTM/FreeCharge/BBPS/Airtel/SewaKendra.", - "border": [ - true, - false, - true, - false - ], - "margin": [ - 4, - 0, - 0, - 0.5 - ] - } - ], - [ - { - "text": "4. Please bring this bill while making payment at office counter.", - "border": [ - true, - false, - true, - false - ], - "margin": [ - 4, - 0, - 0, - 0.5 - ] - } - ], - [ - { - "text": "5. {{rate}}% Late payment charges will be applied after due date", - "border": [ - true, - false, - true, - false - ], - "margin": [ - 4, - 0, - 0, - 0.5 - ] - } - ], - [ - { - "text": "6. Interest & late payment charges calculated based on the payment date will reflect in next bill ", - "border": [ - true, - false, - true, - true - ], - "margin": [ - 4, - 0, - 0, - 0.5 - ] - } - ] - ] - }, - "layout": {} - }, - { - "canvas": [ - { - "type": "line", - "x1": -40, - "y1": 28, - "x2": 700, - "y2": 28, - "dash": { - "length": 10, - "space": 5 - } - } - ] - }, - { - "image": "{{scissorImage}}", - "width": 19, - "height": 19, - "margin": [ - -30, - -9.8, - 0, - 0 - ] - }, - { - "text": "{{acknowledgement_for}}", - "style": "footer-header" - }, - { - "style": "noc-table4", - "table": { - "widths": [ - "*", - "*", - "*", - "*" - ], - "body": [ - [ - { - "text": "{{date_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{billdate}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "Bill Due Date", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{billDueDate}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": "{{consumer_no}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{consumerID}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "{{bill_no}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{billNo}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": "{{name_address}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{payerName}}, {{nameAddress}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "{{total_payment}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{total}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - } - ] - ] - } - }, - { - "text": "{{receivers_signature}}", - "style": "footer-bottom" - }, - { - "image": "{{footerLogoImage}}", - "width": 75, - "height": 10, - "alignment": "center", - "margin": [ - -12, - -10, - -230, - 0 - ] - } - ], - "styles": { - "noc-head": { - "margin": [ - -25, - -30, - 0, - 1 - ] - }, - "receipt-logo-header": { - "color": "#484848", - "fontFamily": "Roboto", - "fontSize": 14, - "bold": true, - "letterSpacing": 0.74, - "margin": [ - 0, - -10, - 0, - 1 - ] - }, - "receipt-logo-sub-header": { - "color": "#484848", - "fontFamily": "Roboto", - "fontSize": 12, - "letterSpacing": 0.6 - }, - "noc-table": { - "fontSize": 10, - "color": "#484848", - "margin": [ - -25, - 13, - -8, - -8 - ] - }, - "noc-table4": { - "fontSize": 10, - "color": "#484848", - "margin": [ - -25, - 40, - -8, - -8 - ] - }, - "noc-table2": { - "fontSize": 10, - "color": "#484848", - "margin": [ - -25, - 8, - -8, - -8 - ] - }, - "noc-table3": { - "fontSize": 10, - "color": "#484848", - "margin": [ - -25, - 13, - -8, - -8 - ] - }, - "receipt-table-value": { - "color": "#000000", - "bold": true, - "fontSize": 10, - "fontWeight": 500, - "margin": [ - 8, - 1, - 0, - 0 - ] - }, - "receipt-table-value2": { - "color": "#000000", - "bold": true, - "fontSize": 10, - "fontWeight": 500, - "margin": [ - 3, - 1, - 0, - 0 - ] - }, - "receipt-table": { - "color": "#484848", - "bold": true, - "fontSize": 10, - "fontWeight": 400, - "margin": [ - -30, - 1, - 0, - 0 - ] - }, - "receipt-table2": { - "color": "#484848", - "bold": true, - "fontSize": 10, - "fontWeight": 400, - "margin": [ - 3, - 2, - 0, - 2 - ] - }, - "right-receipt-table": { - "color": "#000000", - "bold": true, - "fontSize": 10, - "fontWeight": 500, - "margin": [ - 8, - 5, - 0, - 10 - ] - }, - "right-receipt-table2": { - "color": "#484848", - "bold": true, - "fontSize": 10, - "fontWeight": 400, - "margin": [ - -30, - 5, - 0, - 0 - ] - }, - "receipt-approver": { - "fontSize": 10, - "bold": true, - "margin": [ - -27, - 30, - -10, - 0 - ], - "color": "#484848" - }, - "no-signature": { - "fontSize": 10, - "margin": [ - -27, - 25, - -10, - 0 - ], - "color": "#484848" - }, - "amount-due": { - "fontSize": 20, - "color": "#FC8019", - "bold": true, - "fontWeight": 700 - }, - "pt-disclaimer": { - "fontSize": 8, - "margin": [ - -27, - 20, - -10, - 0 - ], - "color": "#484848" - }, - "pt-disclaimer-value": { - "fontSize": 8, - "margin": [ - 0, - 2, - 0, - 0 - ], - "color": "#484848" - }, - "qr-text": { - "fontSize": 12, - "margin": [ - 40, - 0, - 0, - 0 - ], - "color": "#484848", - "alignment": "left" - }, - "qr-image": { - "margin": [ - -40, - -1, - -3, - 0 - ], - "color": "#484848", - "alignment": "right" - }, - "footer-header": { - "margin": [ - 0, - 2, - 0, - -40 - ], - "bold": true, - "color": "#000000", - "alignment": "center" - }, - "footer-bottom": { - "margin": [ - 0, - 20, - 0, - 0 - ], - "bold": true, - "color": "#000000", - "alignment": "right" - } - } - } -} diff --git a/configs/pdf-service/format-config/testconsolidatedreceipt.json b/configs/pdf-service/format-config/testconsolidatedreceipt.json deleted file mode 100644 index 2e889894..00000000 --- a/configs/pdf-service/format-config/testconsolidatedreceipt.json +++ /dev/null @@ -1,592 +0,0 @@ -{ - "key": "testconsolidatedreceipt", - "config": { - "defaultStyle": { - "font": "Cambay" - }, - "watermark": { - "text": "DIGIT UAT DIGIT UAT", - "color": "gery", - "opacity": 0.1, - "bold": true, - "italics": false - }, - "content": [ - { - "style": "noc-head", - "table": { - "widths": [ - 60, - "*", - 120 - ], - "body": [ - [ - { - "image": "{{logoImage}}", - "width": 50, - "height": 61.25 - }, - { - "stack": [ - { - "text": "{{logo-header}} {{Municipal_Corporation}} (Digit UAT)", - "style": "receipt-logo-header" - }, - { - "text": "{{serviceType}} {{payment_receipt}}", - "style": "receipt-logo-sub-header" - } - ], - "alignment": "left", - "margin": [ - 0, - 10, - 0, - 0 - ] - }, - { - "stack": [ - { - "text": "{{address}}" - }, - { - "text": "{{phoneNumber}}" - }, - { - "text": "{{website}}" - }, - { - "text": "{{email}}" - } - ], - "alignment": "right", - "color": "#484848", - "margin": [ - -100, - 0, - -25, - 0 - ] - } - ] - ] - }, - "layout": "noBorders" - }, - { - "style": "noc-table", - "table": { - "widths": [ - "25%", - "25%", - "25%", - "25%" - ], - "body": [ - [ - { - "text": "{{receipt_no}}.", - "border": [ - true, - true, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{receiptNo}}", - "border": [ - false, - true, - false, - false - ], - "style": "receipt-table", - "font": "Roboto" - }, - { - "text": "{{consumer_id}}", - "border": [ - false, - true, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{consumerID}}", - "border": [ - false, - true, - true, - false - ], - "style": "receipt-table", - "font": "Roboto" - } - ], - [ - { - "text": "{{payment_date}}", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{paymentDate}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "{{payer_name}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{payerName}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": "{{payer_contact}}", - "border": [ - true, - false, - false, - true - ], - "style": "receipt-table-value" - }, - { - "text": "{{payerContact}}", - "border": [ - false, - false, - false, - true - ], - "style": "receipt-table" - }, - { - "text" : " ", - "border": [ - false, - false, - false, - true - ], - "style": "receipt-table-value" - }, - { - "text" : " ", - "border": [ - false, - false, - true, - true - ], - "style": "receipt-table" - } - ] - ] - }, - "layout": {} - }, - { - "style": "next-noc-table", - "table": { - "widths": [ - "25%", - "25%", - "25%", - "25%" - ], - "body": [ - [ - { - "text": "{{service_type}}", - "border": [ - true, - true, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{serviceType}}", - "border": [ - false, - true, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "{{billing_period}}", - "border": [ - false, - true, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{fromPeriod}} {{to}} {{toPeriod}}", - "border": [ - false, - true, - true, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": "{{paid_amount}}", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "₹ {{paidAmount}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "{{pending_amount}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "₹ {{pendingAmount}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": "{{payment_mode}}", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{paymentMode}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "{{transaction_id}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{transactionID}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table", - "font": "Roboto" - } - ], - [ - { - "text": "{{g8_receipt_no}}.", - "border": [ - true, - false, - false, - true - ], - "style": "receipt-table-value" - }, - { - "text": "{{G8ReceiptNo}}", - "border": [ - false, - false, - false, - true - ], - "style": "receipt-table" - }, - { - "text": "{{g8_receipt_date}}", - "border": [ - false, - false, - false, - true - ], - "style": "receipt-table-value" - }, - { - "text": "{{G8ReceiptDate}}", - "border": [ - false, - false, - true, - true - ], - "style": "receipt-table" - } - ] - ] - }, - "layout": {} - }, - { - "style": "receipt-approver", - "columns": [ - { - "text": [ - { - "text": "{{generated_by}}: ", - "bold": true - }, - { - "text": "{{user-name}}", - "bold": false - } - ], - "alignment": "left" - }, - { - "text": [ - { - "text": "{{commissioner/eo}}", - "bold": true - } - ], - "alignment": "right", - "margin": [ - 0, - 0, - -10, - 1 - ] - } - ] - }, - { - "style": "no-signature", - "text": "{{no_signature}}" - }, - { - "style": "pt-disclaimer", - "stack": [ - { - "text": "{{disclamer}}", - "bold": true, - "style": "pt-disclaimer-value" - }, - { - "text": "{{disclamer_1}}", - "bold": false, - "style": "pt-disclaimer-value" - }, - { - "text": "{{disclamer_2}}", - "bold": false, - "style": "pt-disclaimer-value" - }, - { - "text": "{{disclamer_3}}", - "bold": false, - "style": "pt-disclaimer-value" - } - ] - }, - { - "image": "{{footerLogoImage}}", - "width": 75, - "height": 10, - "alignment": "center", - "margin": [ - -12, - -10, - -230, - 0 - ] - } - ], - "styles": { - "noc-head": { - "margin": [ - -30, - -30, - 0, - 1 - ] - }, - "receipt-logo-header": { - "color": "#000000", - "fontSize": 14, - "bold": true, - "letterSpacing": 0.74, - "margin": [ - 0, - 0, - 0, - 5 - ] - }, - "receipt-logo-sub-header": { - "color": "#000000", - "fontSize": 12, - "letterSpacing": 0.6 - }, - "noc-table": { - "fontSize": 12, - "color": "#000000", - "margin": [ - -25, - 45, - -22, - -8 - ] - }, - "next-noc-table": { - "fontSize": 12, - "color": "#000000", - "margin": [ - -25, - 28, - -22, - -8 - ] - }, - "receipt-table-value": { - "color": "#000000", - "bold": true, - "fontSize": 12, - "fontWeight": 500, - "margin": [ - 8, - 8, - 0, - 8 - ] - }, - "receipt-table": { - "color": "#000000", - "bold": false, - "fontSize": 12, - "fontWeight": 400, - "margin": [ - -30, - 8, - 0, - 8 - ] - }, - "receipt-approver": { - "fontSize": 12, - "bold": true, - "margin": [ - -27, - 50, - -10, - 0 - ], - "color": "#484848" - }, - "no-signature": { - "fontSize": 12, - "margin": [ - -27, - 35, - -10, - 0 - ], - "color": "#484848" - }, - "pt-disclaimer": { - "fontSize": 12, - "margin": [ - -27, - 30, - -10, - 0 - ], - "color": "#484848" - }, - "pt-disclaimer-value": { - "fontSize": 12, - "margin": [ - 2, - 5, - 0, - 0 - ], - "color": "#484848" - } - }, - "footer": "(function(currentPage, pageCount) { return currentPage.toString() + ' of ' + pageCount; })" - } -} diff --git a/configs/pdf-service/format-config/testlocalconsolidatedbill.json b/configs/pdf-service/format-config/testlocalconsolidatedbill.json deleted file mode 100644 index 311e2c1c..00000000 --- a/configs/pdf-service/format-config/testlocalconsolidatedbill.json +++ /dev/null @@ -1,1018 +0,0 @@ -{ - "key": "testlocalconsolidatedbill", - "config": { - "defaultStyle": { - "font": "Cambay" - }, - "watermark": { - "text": "DIGIT UAT DIGIT UAT", - "color": "gery", - "opacity": 0.1, - "bold": true, - "italics": false - }, - "content": [ - { - "style": "noc-head", - "table": { - "widths": [ - 60, - "*", - 120 - ], - "body": [ - [ - { - "image": "{{logoImage}}", - "width": 50, - "height": 61.25 - }, - { - "stack": [ - { - "text": "{{logo_header}} (Digit UAT)", - "style": "receipt-logo-header" - }, - { - "stack": [ - { - "text": "C Block, Ranjit Avenue, Amritsar" - }, - { - "text": " Tel. +91-183-2502339" - }, - { - "text": "website: www.amritsarcorp.com" - }, - { - "text": "Email: cmcasr@punjab.gov.in" - } - ] - } - ], - "alignment": "left", - "margin": [ - 0, - 10, - 0, - 0 - ] - }, - { - "stack": [ - { - "text": "{{total_amount_due}}" - }, - { - "text": "{{totalAmountDue}}", - "style": "amount-due" - } - ], - "alignment": "right", - "color": "#484848", - "margin": [ - -150, - 2, - -20, - 0 - ] - } - ] - ] - }, - "layout": "noBorders" - }, - { - "style": "noc-table", - "table": { - "widths": [ - 130, - 130, - -2, - 130, - 130 - ], - "body": [ - [ - { - "text": "{{payer_name}}", - "border": [ - true, - true, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{payerName}}", - "border": [ - false, - true, - true, - false - ], - "style": "receipt-table" - }, - { - "text": " ", - "border": [ - false, - false, - false, - false - ] - }, - { - "text": "{{bill_no}}", - "border": [ - true, - true, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{billNo}}", - "border": [ - false, - true, - true, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": "{{mobile_no}}", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{mobileNo}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - }, - { - "text": " ", - "border": [ - false, - false, - false, - false - ] - }, - { - "text": "{{bill_period}}", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{fromPeriod}} - {{toPeriod}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": "{{payer_address}}", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{payerAddress}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - }, - { - "text": " ", - "border": [ - false, - false, - false, - false - ] - }, - { - "text": "{{bill_issue_date}}", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{billIssueDate}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": " ", - "border": [ - true, - false, - false, - true - ], - "style": "receipt-table-value" - }, - { - "text": " ", - "border": [ - false, - false, - true, - true - ], - "style": "receipt-table" - }, - { - "text": " ", - "border": [ - false, - false, - false, - false - ] - }, - { - "text": "{{bill_due_date}}", - "border": [ - true, - false, - false, - true - ], - "style": "right-receipt-table" - }, - { - "text": "{{billDueDate}}", - "border": [ - false, - false, - true, - true - ], - "style": "right-receipt-table2" - } - ] - ] - }, - "layout": {} - }, - { - "style": "noc-table2", - "table": { - "widths": [ - "103%" - ], - "body": [ - [ - { - "text": "{{billing_summary_property_tax}}", - "border": [ - true, - true, - true, - false - ], - "style": "receipt-table-value" - } - ], - [ - { - "table": { - "widths": [ - "18%", - "26%", - "10%", - "9%", - "10%", - "9%", - "10%", - "9%" - ], - "body": [ - [ - { - "text": "{{property_id}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - }, - { - "text": "{{bill_period}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - }, - { - "text": "{{arrears_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - }, - { - "text": "{{charge_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - }, - { - "text": "{{penalty_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - }, - { - "text": "{{rebate_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - }, - { - "text": "{{others_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - }, - { - "text": "{{total_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - } - ], - [ - { - "text": "{{propertyID}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text": "{{fromPeriod}}-{{toPeriod}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text": "{{arrears}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text": "{{charge}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text": "{{penalty}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text": "{{rebate}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text": "{{others}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text": "{{total}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2", - "bold": true - } - ] - ] - }, - "border": [ - true, - false, - true, - true - ] - } - ] - ] - }, - "layout": {} - }, - { - "style": "noc-table3", - "table": { - "widths": [ - "103%" - ], - "body": [ - [ - { - "text": "{{important_message}}", - "border": [ - true, - true, - true, - false - ], - "margin": [ - 9, - 10, - 0, - 5 - ], - "style": "receipt-table-value" - } - ], - [ - { - "ol": [ - { - "text": "{{payment_received}}", - "margin": [ - 8, - 0, - 0, - 5 - ] - }, - { - "text": "{{this_document}}", - "margin": [ - 8, - 0, - 0, - 5 - ] - }, - { - "text": "{{this_is_a}}", - "margin": [ - 8, - 0, - 0, - 5 - ] - }, - { - "text": "{{assessment_payment}}", - "margin": [ - 8, - 0, - 0, - 5 - ] - }, - { - "text": "{{please_deposit}}", - "margin": [ - 8, - 0, - 0, - 5 - ] - }, - { - "text": "{{if_the_tax}}", - "margin": [ - 8, - 0, - 0, - 10 - ] - } - ], - "border": [ - true, - false, - true, - true - ], - "alignment": "left" - } - ] - ] - }, - "layout": {} - }, - { - "canvas": [ - { - "type": "line", - "x1": -40, - "y1": 30, - "x2": 700, - "y2": 30, - "dash": { - "length": 10, - "space": 5 - } - } - ] - }, - { - "image": "{{scissorImage}}", - "width": 14, - "height": 14, - "margin": [ - -30, - -7, - 0, - 0 - ] - }, - { - "text": "{{acknowledgement_for}}", - "style": "footer-header" - }, - { - "style": "noc-table", - "table": { - "widths": [ - "*", - "*", - "*", - "*" - ], - "body": [ - [ - { - "text": "{{date_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "date", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": " ", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": " ", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": "{{consumer_id}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{consumerID}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "{{bill_no}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{billNo}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": "{{name_address}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{nameAddress}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "{{total_payment}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{totalPayment}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - } - ] - ] - } - }, - { - "text": "{{receivers_signature}}", - "style": "footer-bottom" - }, - { - "image": "{{footerLogoImage}}", - "width": 75, - "height": 10, - "alignment": "center", - "margin": [ - -12, - -10, - -230, - 0 - ] - } - ], - "styles": { - "noc-head": { - "margin": [ - -25, - -30, - 0, - 1 - ] - }, - "receipt-logo-header": { - "color": "#484848", - "fontFamily": "Roboto", - "fontSize": 14, - "bold": true, - "letterSpacing": 0.74, - "margin": [ - 0, - -10, - 0, - 5 - ] - }, - "receipt-logo-sub-header": { - "color": "#484848", - "fontFamily": "Roboto", - "fontSize": 13, - "letterSpacing": 0.6 - }, - "noc-table": { - "fontSize": 12, - "color": "#484848", - "margin": [ - -25, - 45, - -8, - -8 - ] - }, - "noc-table2": { - "fontSize": 12, - "color": "#484848", - "margin": [ - -25, - 18, - -8, - -8 - ] - }, - "noc-table3": { - "fontSize": 12, - "color": "#484848", - "margin": [ - -25, - 30, - -8, - -8 - ] - }, - "receipt-table-value": { - "color": "#000000", - "bold": true, - "fontSize": 12, - "fontWeight": 500, - "margin": [ - 8, - 5, - 0, - 0 - ] - }, - "receipt-table-value2": { - "color": "#000000", - "bold": true, - "fontSize": 12, - "fontWeight": 500, - "margin": [ - 3, - 5, - 0, - 0 - ] - }, - "receipt-table": { - "color": "#484848", - "bold": true, - "fontSize": 12, - "fontWeight": 400, - "margin": [ - -30, - 5, - 0, - 0 - ] - }, - "receipt-table2": { - "color": "#484848", - "bold": true, - "fontSize": 11, - "fontWeight": 400, - "margin": [ - 3, - 8, - 0, - 10 - ] - }, - "right-receipt-table": { - "color": "#000000", - "bold": true, - "fontSize": 12, - "fontWeight": 500, - "margin": [ - 8, - -10, - 0, - 10 - ] - }, - "right-receipt-table2": { - "color": "#484848", - "bold": true, - "fontSize": 12, - "fontWeight": 400, - "margin": [ - -30, - -10, - 0, - 0 - ] - }, - "receipt-approver": { - "fontSize": 12, - "bold": true, - "margin": [ - -27, - 50, - -10, - 0 - ], - "color": "#484848" - }, - "no-signature": { - "fontSize": 12, - "margin": [ - -27, - 35, - -10, - 0 - ], - "color": "#484848" - }, - "amount-due": { - "fontSize": 30, - "color": "#FC8019", - "bold": true, - "fontWeight": 700 - }, - "pt-disclaimer": { - "fontSize": 12, - "margin": [ - -27, - 30, - -10, - 0 - ], - "color": "#484848" - }, - "pt-disclaimer-value": { - "fontSize": 12, - "margin": [ - 0, - 5, - 0, - 0 - ], - "color": "#484848" - }, - "qr-text": { - "fontSize": 12, - "margin": [ - 40, - 0, - 0, - 0 - ], - "color": "#484848", - "alignment": "left" - }, - "qr-image": { - "margin": [ - -40, - -1, - -3, - 0 - ], - "color": "#484848", - "alignment": "right" - }, - "footer-header": { - "margin": [ - 0, - 15, - 0, - -40 - ], - "color": "#000000", - "alignment": "center" - }, - "footer-bottom": { - "margin": [ - 0, - 10, - 0, - 0 - ], - "color": "#000000", - "alignment": "right" - } - } - } - } \ No newline at end of file diff --git a/configs/pdf-service/format-config/testlocalconsolidatedreceipt.json b/configs/pdf-service/format-config/testlocalconsolidatedreceipt.json deleted file mode 100644 index 615c37f8..00000000 --- a/configs/pdf-service/format-config/testlocalconsolidatedreceipt.json +++ /dev/null @@ -1,598 +0,0 @@ -{ - "key": "testlocalconsolidatedreceipt", - "config": { - "defaultStyle": { - "font": "Cambay" - }, - "watermark": { - "text": "DIGIT UAT DIGIT UAT", - "color": "gery", - "opacity": 0.1, - "bold": true, - "italics": false - }, - "content": [ - { - "style": "noc-head", - "table": { - "widths": [ - 60, - "*", - 120 - ], - "body": [ - [ - { - "image": "{{logoImage}}", - "width": 50, - "height": 61.25 - }, - { - "stack": [ - { - "text": "{{logo-header}}", - "style": "receipt-logo-header" - }, - { - "text": "{{serviceType}} {{payment_receipt}} (Digit UAT)", - "style": "receipt-logo-sub-header" - } - ], - "alignment": "left", - "margin": [ - 0, - 10, - 0, - 0 - ] - }, - { - "stack": [ - { - "text": "{{address}}" - }, - { - "text": "{{phoneNumber}}" - }, - { - "text": "{{website}}" - }, - { - "text": "{{email}}" - } - ], - "alignment": "right", - "color": "#484848", - "margin": [ - -100, - 0, - -25, - 0 - ] - } - ] - ] - }, - "layout": "noBorders" - }, - { - "style": "noc-table", - "table": { - "widths": [ - "*", - "*", - "*", - "*" - ], - "body": [ - [ - { - "text": "{{receipt_no}}.", - "border": [ - true, - true, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{receiptNo}}", - "border": [ - false, - true, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "{{consumer_id}}", - "border": [ - false, - true, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{consumerID}}", - "border": [ - false, - true, - true, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": "{{payment_date}}", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{paymentDate}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "{{payer_name}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{payerName}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": "{{payer_contact}}", - "border": [ - true, - false, - false, - true - ], - "style": "receipt-table-value" - }, - { - "text": "{{payerContact}}", - "border": [ - false, - false, - false, - true - ], - "style": "receipt-table" - }, - { - "text" : " ", - "border": [ - false, - false, - false, - true - ], - "style": "receipt-table-value" - }, - { - "text" : " ", - "border": [ - false, - false, - true, - true - ], - "style": "receipt-table" - } - ] - ] - }, - "layout": {} - }, - { - "style": "next-noc-table", - "table": { - "widths": [ - "25%", - "25%", - "25%", - "25%" - ], - "body": [ - [ - { - "text": "{{service_type}}", - "border": [ - true, - true, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{serviceType}}", - "border": [ - false, - true, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "{{billing_period}}", - "border": [ - false, - true, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{fromPeriod}} {{to}} {{toPeriod}}", - "border": [ - false, - true, - true, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": "{{paid_amount}}", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "₹ {{paidAmount}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "{{pending_amount}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "₹ {{pendingAmount}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": "{{payment_mode}}", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{paymentMode}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "{{transaction_id}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{transactionID}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": "{{g8_receipt_no}}.", - "border": [ - true, - false, - false, - true - ], - "style": "receipt-table-value" - }, - { - "text": "{{G8ReceiptNo}}", - "border": [ - false, - false, - false, - true - ], - "style": "receipt-table" - }, - { - "text": "{{g8_receipt_date}}", - "border": [ - false, - false, - false, - true - ], - "style": "receipt-table-value" - }, - { - "text": "{{G8ReceiptDate}}", - "border": [ - false, - false, - true, - true - ], - "style": "receipt-table" - } - ] - ] - }, - "layout": {} - }, - { - "style": "receipt-approver", - "columns": [ - { - "text": [ - { - "text": "{{generated_by}}: ", - "bold": true - }, - { - "text": "{{user-name}}", - "bold": false - } - ], - "alignment": "left" - }, - { - "text": [ - { - "text": "{{commissioner/eo}}", - "bold": true - } - ], - "alignment": "right", - "margin": [ - 0, - 0, - -10, - 1 - ] - } - ] - }, - { - "style": "no-signature", - "text": "{{no_signature}}" - }, - { - "style": "pt-disclaimer", - "stack": [ - { - "text": "{{disclamer}}", - "bold": true, - "style": "pt-disclaimer-value" - }, - { - "text": "{{disclamer_1}}", - "bold": false, - "style": "pt-disclaimer-value" - }, - { - "text": "{{disclamer_2}}", - "bold": false, - "style": "pt-disclaimer-value" - }, - { - "text": "{{disclamer_3}}", - "bold": false, - "style": "pt-disclaimer-value" - }, - { - "text": "{{disclamer_4}}", - "bold": false, - "style": "pt-disclaimer-value" - }, - { - "text": "{{disclamer_5}}", - "bold": false, - "style": "pt-disclaimer-value" - } - ] - }, - { - "image": "{{footerLogoImage}}", - "width": 75, - "height": 10, - "alignment": "center", - "margin": [ - -12, - -10, - -230, - 0 - ] - } - ], - "styles": { - "noc-head": { - "margin": [ - -30, - -30, - 0, - 1 - ] - }, - "receipt-logo-header": { - "color": "#000000", - "fontSize": 14, - "bold": true, - "letterSpacing": 0.74, - "margin": [ - 0, - 0, - 0, - 5 - ] - }, - "receipt-logo-sub-header": { - "color": "#000000", - "fontSize": 12, - "letterSpacing": 0.6 - }, - "noc-table": { - "fontSize": 12, - "color": "#000000", - "margin": [ - -25, - 45, - -22, - -8 - ] - }, - "next-noc-table": { - "fontSize": 12, - "color": "#000000", - "margin": [ - -25, - 28, - -22, - -8 - ] - }, - "receipt-table-value": { - "color": "#000000", - "bold": true, - "fontSize": 12, - "fontWeight": 500, - "margin": [ - 8, - 8, - 0, - 8 - ] - }, - "receipt-table": { - "color": "#000000", - "bold": false, - "fontSize": 12, - "fontWeight": 400, - "margin": [ - -30, - 8, - 0, - 8 - ] - }, - "receipt-approver": { - "fontSize": 12, - "bold": true, - "margin": [ - -27, - 50, - -10, - 0 - ], - "color": "#484848" - }, - "no-signature": { - "fontSize": 12, - "margin": [ - -27, - 35, - -10, - 0 - ], - "color": "#484848" - }, - "pt-disclaimer": { - "fontSize": 12, - "margin": [ - -27, - 30, - -10, - 0 - ], - "color": "#484848" - }, - "pt-disclaimer-value": { - "fontSize": 12, - "margin": [ - 2, - 5, - 0, - 0 - ], - "color": "#484848" - } - } - } -} \ No newline at end of file diff --git a/configs/pdf-service/format-config/tl-receipt.json b/configs/pdf-service/format-config/tl-receipt.json deleted file mode 100644 index 6db555c7..00000000 --- a/configs/pdf-service/format-config/tl-receipt.json +++ /dev/null @@ -1,921 +0,0 @@ -{ - "key":"tl-receipt", - "config":{ - "watermark": { - "text": "DIGIT UAT DIGIT UAT", - "color": "gery", - "opacity": 0.1, - "bold": true, - "italics": false - }, - "content": [ - { - "style": "tl-head", - "table": { - "widths": [ - 50, - "*", - 100 - ], - "body": [ - [ - { - "image": "{{variable33}}", - "width": 50, - "height": 61.25, - "margin": [ - 45, - 12, - 10, - 10 - ] - }, - { - "stack": [ - { - "text": "{{variable30}} Nagar Panchayat (DIGIT UAT)", - "style": "receipt-logo-header" - }, - { - "text": "Trade License Payment Receipt ({{variable31}})", - "style": "receipt-logo-sub-header" - } - ], - "alignment": "center", - "margin": [ - 56, - 23, - 0, - 0 - ] - }, - { - "stack": [ - { - "text": "Receipt No.", - "style": "receipt-no", - "bold": true - }, - { - "text": "{{variable16}}", - "style": "receipt-no", - "bold": true - } - ], - "alignment": "center", - "margin": [-50, 30, 0, 2] - } - ] - ] - }, - "layout": "noBorders" - }, - { - "style": "pt-reciept-citizen-header", - "columns": [ - { - "text": [ - { - "text": "Application Type ", - "bold": true - }, - { - "text": "{{variable1}}", - "bold": false - } - ], - "alignment": "left" - }, - { - "text": [ - { - "text": "Old License No. ", - "bold": true - }, - { - "text": "{{variable2}}", - "bold": false - } - ], - "alignment": "right" - } - ] - }, - { - "style": "pt-reciept-citizen-header", - "columns": [ - { - "text": [ - { - "text": "Application No. ", - "bold": true - }, - { - "text": "{{variable3}}", - "bold": false - } - ], - "alignment": "left" - }, - { - "text": [ - { - "text": "Receipt No. ", - "bold": true - }, - { - "text": "{{variable16}}", - "bold": false - } - ], - "alignment": "right" - } - ] - }, - { - "style": "pt-reciept-citizen-header", - "columns": [ - { - "text": [ - { - "text": "Financial Year ", - "bold": true - }, - { - "text": "{{variable4}}", - "bold": false - } - ], - "alignment": "left" - }, - { - "text": [ - { - "text": "Payment Date ", - "bold": true - }, - { - "text": "{{variable17}}", - "bold": false - } - ], - "alignment": "right" - } - ] - }, - { - "text": "TRADE DETAILS", - "style": "pt-reciept-citizen-subheader" - }, - - { - "style": "pt-reciept-citizen-table", - "table": { - "widths": ["*", "*", "*", "*"], - "body": [ - [ - { - "text": "Trade Name", - "border": [ - true, - true, - false, - true - ], - "style": "receipt-table-key" - }, - { - "text": "{{variable5}}", - "border": [ - false, - true, - true, - true - ] - }, - { - "text": "Trade Category", - "border": [ - true, - true, - false, - true - ], - "style": "receipt-table-key" - }, - { - "text": "{{variable6}}", - "border": [ - false, - true, - true, - true - ] - } - ] - ] - }, - "layout": {} - }, - { - "style": "pt-reciept-citizen-table", - "table": { - "widths": ["24%", "76%"], - "body": [ - [ - { - "text": "Trade Type", - "border": [ - true, - false, - false, - true - ], - "style": "receipt-table-key" - }, - { - "text": "{{variable7}}", - "border": [ - false, - false, - true, - true - ] - } - ], - [ - { - "text": "Accessories", - "border": [ - true, - true, - false, - true - ], - "style": "receipt-table-key" - }, - { - "text": "{{variable8}}", - "border": [ - false, - true, - true, - true - ] - } - ] - ] - }, - "layout": {} - }, - { - "text": "TRADE LOCATION DETAILS", - "style": "pt-reciept-citizen-subheader" - }, - { - "style": "pt-reciept-citizen-table", - "table": { - "widths": ["*", "*", "*", "*"], - "body": [ - [ - { - "text": "House/Door No.", - "border": [ - true, - true, - false, - true - ], - "style": "receipt-table-key" - }, - { - "text": "{{variable9}}", - "border": [ - false, - true, - true, - true - ] - }, - { - "text": "Building/Colony Name.", - "border": [ - true, - true, - false, - true - ], - "style": "receipt-table-key" - }, - { - "text": "{{variable10}}", - "border": [ - false, - true, - true, - true - ] - } - ], - [ - { - "text": "Street Name", - "border": [ - true, - true, - false, - true - ], - "style": "receipt-table-key" - }, - { - "text": "{{variable11}}", - "border": [ - false, - true, - true, - true - ] - }, - { - "text": "Locality/Mohalla", - "border": [ - true, - true, - false, - true - ], - "style": "receipt-table-key" - }, - { - "text": "{{variable12}}", - "border": [ - false, - true, - true, - true - ] - } - ] - ] - }, - "layout": {} - }, - { - "text": "OWNERSHIP INFORMATION", - "style": "pt-reciept-citizen-subheader" - }, - { - "style": "pt-reciept-citizen-table", - "table": { - "widths":["*", "*", "*", "*"], - "body": ["{{#variable13}}[{\"text\":\"Owner Name\",\"border\":[true,true,false,true],\"style\":\"receipt-table-key\"},{\"text\":\"{{name}}","border\":[false,true,true,true]},{\"text\":\"Mobile No.\",\"border\":[true,true,false,true],\"style\":\"receipt-table-key\"},{\"text\":\"{{mobileNumber}}\",\"border\":[false,true,true,true]}]{{/variable13}}"] - }, - "layout": {} - }, - { - "text": "PAYABLE AMOUNT", - "style": "pt-reciept-citizen-subheader" - }, - { - "style": "pt-reciept-citizen-table", - "table": { - "widths": ["*", "*", "*", "*", "*", "*"], - "body": [ - [ - { - "text": "Trade License Fee", - "border": [ - true, - true, - true, - true, - true, - true, - true - ], - "style": "receipt-table-key", - "alignment": "center" - }, - { - "text": "Penalty", - "border": [ - true, - true, - true, - true, - true, - true, - true - ], - "style": "receipt-table-key", - "alignment": "center" - }, - { - "text": "Rebate", - "border": [ - true, - true, - true, - true, - true, - true, - true - ], - "style": "receipt-table-key", - "alignment": "center" - }, - { - "text": "Adhoc Penalty", - "border": [ - true, - true, - true, - true, - true, - true, - true - ], - "style": "receipt-table-key", - "alignment": "center" - }, - { - "text": "Adhoc Rebate", - "border": [ - true, - true, - true, - true, - true, - true, - true - ], - "style": "receipt-table-key", - "alignment": "center" - }, - { - "text": "Total", - "border": [ - true, - true, - true, - true, - true, - true, - true - ], - "style": "receipt-table-key", - "alignment": "center" - } - ], - [ - { - "text": "{{variable18}}", - "border": [ - true, - true, - true, - true, - true, - true, - true - ], - "style": "receipt-table-value", - "alignment": "center" - }, - { - "text": "{{variable26}}", - "border": [ - true, - true, - true, - true, - true, - true, - true - ], - "style": "receipt-table-value", - "alignment": "center" - }, - { - "text": "{{variable27}}", - "border": [ - true, - true, - true, - true, - true, - true, - true - ], - "style": "receipt-table-value", - "alignment": "center" - }, - { - "text": "{{variable28}}", - "border": [ - true, - true, - true, - true, - true, - true, - true - ], - "style": "receipt-table-value", - "alignment": "center" - }, - { - "text": "{{variable29}}", - "border": [ - true, - true, - true, - true, - true, - true, - true - ], - "style": "receipt-table-value", - "alignment": "center" - }, - { - "text": "{{variable19}}", - "border": [ - true, - true, - true, - true, - true, - true, - true - ], - "style": "receipt-table-value", - "alignment": "center" - } - ] - ] - }, - "layout": {} - }, - { - "text": "PAYMENT INFORMATION", - "style": "pt-reciept-citizen-subheader" - }, - { - "style": "pt-reciept-citizen-table", - "table": { - "widths": ["*", "*", "*", "*"], - "body": [ - [ - { - "text": "Total Amount Paid:", - "border": [ - true, - true, - false, - true - ], - "style": "receipt-table-key" - }, - { - "text": "{{variable20}}", - "border": [ - false, - true, - true, - true - ] - }, - { - "text": "Amount Due:", - "border": [ - true, - true, - false, - true - ], - "style": "receipt-table-key" - }, - { - "text": "{{variable32}}", - "border": [ - false, - true, - true, - true - ] - } - ] - ] - }, - "layout": {} - }, - { - "style": "pt-reciept-citizen-table", - "table": { - "widths": ["*", "*", "*"], - "body": [ - [ - { - "text": "Payment Mode", - "border": [ - true, - true, - true, - true, - true, - true, - true - ], - "style": "receipt-table-key", - "alignment": "center" - }, - { - "text": "Transaction ID/ Cheque/ DD No.", - "border": [ - true, - true, - true, - true, - true, - true, - true - ], - "style": "receipt-table-key", - "alignment": "center" - }, - { - "text": "Bank Name & Branch", - "border": [ - true, - true, - true, - true, - true, - true, - true - ], - "style": "receipt-table-key", - "alignment": "center" - } - ], - [ - { - "text": "{{variable21}}", - "border": [ - true, - true, - true, - true, - true, - true, - true - ], - "style": "receipt-table-value", - "alignment": "center" - }, - { - "text": "{{variable22}}", - "border": [ - true, - true, - true, - true, - true, - true, - true - ], - "style": "receipt-table-value", - "alignment": "center" - }, - { - "text": "{{variable23}}", - "border": [ - true, - true, - true, - true, - true, - true, - true - ], - "style": "receipt-table-value", - "alignment": "center" - } - ] - ] - }, - "layout": {} - }, - { - "style": "pt-reciept-citizen-table", - "table": { - "widths": ["*", "*", "*", "*"], - "body": [ - [ - { - "text": "G8 Receipt No:", - "border": [ - true, - true, - false, - true - ], - "style": "receipt-table-key" - }, - { - "text": "{{variable24}}", - "border": [ - false, - true, - true, - true - ] - }, - { - "text": "G8 Receipt Issue Date:", - "border": [ - true, - true, - false, - true - ], - "style": "receipt-table-key" - }, - { - "text": "{{variable25}}", - "border": [ - false, - true, - true, - true - ] - } - ] - ] - }, - "layout": {} - }, - { - "style": "receipt-approver", - "columns": [ - { - "text": [ - { - "text": "Generated by: ", - "bold": true - }, - { - "text": "Kulvinder Approver", - "bold": false - } - ], - "alignment": "left" - }, - { - "text": [ - { - "text": "Commissioner/EO", - "bold": true - } - ], - "alignment": "right" - } - ] - }, - { - "image": "{{footerLogoImage}}", - "width": 75, - "height": 10, - "alignment": "center", - "margin": [ - -12, - -10, - -230, - 0 - ] - } - ], - "footer": [ - { - "text": "Note:\n1. Payment received by cheque/demand draft shall be subject to realization.\n2. This document is not a proof of Property Ownership.\n3. This is a computer generated document, hence requires no signature.", - "style": "receipt-footer" - } - ], - "styles": { - "tl-head": { - "fillColor": "#F2F2F2", - "margin": [ - -41, - -41, - -41, - 0 - ] - }, - "pt-reciept-citizen-header": { - "fontSize": 12, - "bold": true, - "margin": [ - 0, - 8, - 0, - 0 - ], - "color": "#484848" - }, - "pt-reciept-citizen-subheader": { - "fontSize": 10, - "bold": true, - "margin": [ - 0, - 16, - 0, - 8 - ], - "color": "#484848" - }, - "pt-reciept-citizen-table": { - "fontSize": 10, - "color": "#484848" - }, - "receipt-assess-table": { - "fontSize": 10, - "color": "#484848", - "margin": [ - 0, - 8, - 0, - 0 - ] - }, - "receipt-assess-table-header": { - "bold": true, - "fillColor": "#D8D8D8", - "color": "#484848" - }, - "receipt-header-details": { - "fontSize": 9, - "margin": [ - 0, - 0, - 0, - 8 - ], - "color": "#484848" - }, - "receipt-table-key": { - "color": "#484848", - "bold": true - }, - "receipt-table-value": { - "color": "#484848" - }, - "receipt-logo-header": { - "color": "#484848", - "fontFamily": "Roboto", - "fontSize": 16, - "bold": true, - "letterSpacing": 0.74 - }, - "receipt-logo-sub-header": { - "color": "#484848", - "fontFamily": "Roboto", - "fontSize": 13, - "letterSpacing": 1.6, - "margin": [ - 0, - 6, - 0, - 0 - ] - }, - "receipt-footer": { - "color": "#484848", - "fontSize": 8, - "margin": [ - 30, - -20, - 0, - 0 - ] - }, - "receipt-no": { - "color": "#484848", - "fontSize": 10 - }, - "receipt-approver": { - "fontSize": 10, - "bold": true, - "margin": [ - 0, - 60, - 0, - 8 - ], - "color": "#484848" - } - } - } -} - \ No newline at end of file diff --git a/configs/pdf-service/format-config/tlapplication.json b/configs/pdf-service/format-config/tlapplication.json deleted file mode 100644 index f35ed3e5..00000000 --- a/configs/pdf-service/format-config/tlapplication.json +++ /dev/null @@ -1,1414 +0,0 @@ -{ - "key": "tlapplication", - "config": { - "defaultStyle": { - "font": "Cambay" - }, - "watermark": { - "text": "DIGIT UAT DIGIT UAT", - "color": "gery", - "opacity": 0.1, - "bold": true, - "italics": false - }, - "content": [ - { - "style": "noc-head", - "table": { - "widths": [ - "*", - "*", - "*" - ], - "body": [ - [ - { - "text":"{{trade_license_application}} (DIGIT UAT)", - "style": "receipt-logo-header" - }, - { - "text":"{{application_no}}", - "alignment":"right", - "color": "#484848", - "margin": [ - 0, - 2, - -50, - 0 - ] - }, - { - "text":"{{applicationNumber}}", - "alignment": "right", - "color": "#484848", - "bold": true, - "margin": [ - -150, - 2, - -20, - 0 - ] - } - ] - ] - }, - "layout": "noBorders" - }, - { - "style": "noc-table2", - "table": { - "widths": [ - "*" - ], - "body": [ - [ - { - "stack":[ - { - "text":"{{total_amount}}", - "style":"receipt-table-value-total", - "bold" : false - }, - { - "text":"{{Rs}} {{totalAmount}}", - "style":"receipt-table-value-total", - "fontSize": 15 - } - ], - "border":[ - true, - true, - true, - false - ] - } - ], - [ - { - "stack":[ - { - "table": { - "widths": [ - "*", - "*" - ], - "body": [ - [ - { - "text":"{{trade_license_tax}}", - "border":[ - false, - false, - false, - false - ], - "style": "receipt-table-value-down" - }, - { - "text":"{{tradeLicenseTax}}", - "border":[ - false, - false, - false, - false - ], - "style": "receipt-table-value-down" - } - ] - ] - } - }, - { - "table": { - "widths": [ - "*", - "*" - ], - "body": [ - [ - { - "text":"{{rebate_label}}", - "border":[ - false, - false, - false, - false - ], - "style": "receipt-table-value-down" - }, - { - "text":"{{rebate}}", - "border":[ - false, - false, - false, - false - ], - "style": "receipt-table-value-down" - } - ] - ] - } - }, - { - "table": { - "widths": [ - "*", - "*" - ], - "body": [ - [ - { - "text":"{{penalty_label}}", - "border":[ - false, - false, - false, - false - ], - "style": "receipt-table-value-down" - }, - { - "text":"{{penalty}}", - "border":[ - false, - false, - false, - false - ], - "style": "receipt-table-value-down" - } - ] - ] - } - }, - { - "canvas": [ - { - "type": "line", - "x1": 0, "y1": 0, - "x2": 315, "y2": 0, - "lineWidth": 1 - } - ] - }, - { - "table": { - "widths": [ - "*", - "*" - ], - "body": [ - [ - { - "text":"{{total_amount}}", - "border":[ - false, - false, - false, - false - ], - "bold": true, - "style": "receipt-table-value-down" - }, - { - "text":"{{totalAmount}}", - "border":[ - false, - false, - false, - false - ], - "bold": true, - "style": "receipt-table-value-down" - } - ] - ] - } - } - ], - "border":[ - true, - false, - true, - true - ], - "margin": [ - 0, - -15, - 0, - 0 - ] - } - ] - ] - }, - "layout": {} - }, - { - "style": "noc-table2", - "table": { - "widths": [ - "*" - ], - "body": [ - [ - { - "text":"{{trade_details}}", - "border":[ - true, - true, - true, - false - ], - "style": "receipt-table-value" - } - ], - [ - { - "table": { - "widths": [ - "25%", - "25%", - "30%", - "20%" - ], - "body": [ - [ - { - "text":"{{application_type}}", - "border":[ - false, - false, - false, - false - ], - "style": "receipt-table-value-cont" - }, - { - "text":"{{old_application_number}}", - "border":[ - false, - false, - false, - false - ], - "style": "receipt-table-value-cont", - "fontSize": 9 - }, - { - "text":"{{licence_type}}", - "border":[ - false, - false, - false, - false - ], - "style": "receipt-table-value-cont" - }, - { - "text":"{{trade_name}}", - "border":[ - false, - false, - false, - false - ], - "style": "receipt-table-value-cont" - } - ], - [ - { - "text":"{{applicationType}}", - "border":[ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text":"{{oldLicenseNumber}}", - "border":[ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text":"{{licenseType}}", - "border":[ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text":"{{tradeName}}", - "border":[ - false, - false, - false, - false - ], - "style": "receipt-table2" - } - ], - [ - { - "text":"{{structure_type}}", - "border":[ - false, - false, - false, - false - ], - "style": "receipt-table-value-cont" - }, - { - "text":"{{structure_sub_type}}", - "border":[ - false, - false, - false, - false - ], - "style": "receipt-table-value-cont", - "fontSize": 9 - }, - { - "text":"{{trade_commencement}}", - "border":[ - false, - false, - false, - false - ], - "style": "receipt-table-value-cont" - }, - { - "text":"{{trade_gst_no}}", - "border":[ - false, - false, - false, - false - ], - "style": "receipt-table-value-cont" - } - ], - [ - { - "text":"{{structureType}}", - "border":[ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text":"{{structureSubType}}", - "border":[ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text":"{{commencementDate}}", - "border":[ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text":"{{tradeGstNo}}", - "border":[ - false, - false, - false, - false - ], - "style": "receipt-table2" - } - ], - [ - { - "text":"{{operational_area}}", - "border":[ - false, - false, - false, - false - ], - "style": "receipt-table-value-cont" - }, - { - "text":"{{no_of_employees}}", - "border":[ - false, - false, - false, - false - ], - "style": "receipt-table-value-cont", - "fontSize": 9 - }, - { - "text":" ", - "border":[ - false, - false, - false, - false - ], - "style": "receipt-table-value-cont" - }, - { - "text":" ", - "border":[ - false, - false, - false, - false - ], - "style": "receipt-table-value-cont" - } - ], - [ - { - "text":"{{operationalArea}}", - "border":[ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text":"{{noOfEmployees}}", - "border":[ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text":" ", - "border":[ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text":" ", - "border":[ - false, - false, - false, - false - ], - "style": "receipt-table2" - } - ] - ] - }, - "border":[ - true, - false, - true, - false - ] - } - - ], - [ - { - "canvas": [ - { - "type": "line", - "x1": 5, "y1": 0, - "x2": 550, "y2": 0, - "lineWidth": 1 - } - ], - "border":[ - true, - false, - true, - false - ] - } - ], - [ - { - "table": { - "widths": [ - "*", - "*", - "*", - "*", - "*" - ], - "body": - [ - [ - { - "text": "{{trade_category}}", - "style": "receipt-table-value" - }, - { - "text": "{{trade_type}}", - "style": "receipt-table-value" - }, - { - "text": "{{trade_sub_type}}", - "style": "receipt-table-value" - }, - { - "text": "{{uom_measurement}}", - "style": "receipt-table-value" - }, - { - "text": "{{uom_value}}", - "style": "receipt-table-value" - } - ], - "{{#variable13}}[ { \"text\":\"{{tradeCat}}\", \"border\":[ true, false, true, true ], \"style\": \"receipt-table2\" }, { \"text\":\"{{tradetyp}}\", \"border\":[ false, false, true, true ], \"style\": \"receipt-table2\" }, { \"text\":\"{{tradesub}}\", \"border\":[ false, false, true,true ], \"style\": \"receipt-table2\" }, { \"text\":\"{{UOM-measurement}}\", \"border\":[ false, false, true, true ], \"style\": \"receipt-table2\" } ,{ \"text\":\"{{uomValue}}\", \"border\":[ false, false, true,true ], \"style\": \"receipt-table2\" }]{{/variable13}}" ] - }, - "border":[ - true, - false, - true, - false - ] - } - - ], - - [ - { - "table": { - "widths": [ - "*", - "*", - "*", - "*" - ], - "body": - [ - [ - { - "text": "{{accesory_type}}", - "style": "receipt-table-value" - }, - { - "text": "{{uom_label}}", - "style": "receipt-table-value" - }, - { - "text": "{{uom_value}}", - "style": "receipt-table-value" - }, - { - "text": "{{accessory_count}}", - "style": "receipt-table-value" - } - ], - "{{#variable14}}[ { \"text\":\"{{accesoryType}}\", \"border\":[ true, false, true,true ], \"style\": \"receipt-table2\" }, { \"text\":\"{{uom}}\", \"border\":[ false, false, true, true], \"style\": \"receipt-table2\" }, { \"text\":\"{{accessoryUomValue}}\", \"border\":[ false, false,true, true], \"style\": \"receipt-table2\" }, { \"text\":\"{{accessoryCount}}\", \"border\":[ false, false, true,true ], \"style\": \"receipt-table2\" } ]{{/variable14}}" ] - } - } - - ], - - [ - { - "table": { - "widths": [ - "25%", - "25%", - "20%", - "30%" - ], - "body": [ - [ - { - "text":"{{property_assessment_id}}", - "border":[ - false, - false, - false, - false - ], - "style": "receipt-table-value-cont" - }, - { - "text":"{{city_label}}", - "border":[ - false, - false, - false, - false - ], - "style": "receipt-table-value-cont", - "fontSize": 9 - }, - { - "text":"{{door_house_no}}", - "border":[ - false, - false, - false, - false - ], - "style": "receipt-table-value-cont" - }, - { - "text":"{{building_colony_name}}", - "border":[ - false, - false, - false, - false - ], - "style": "receipt-table-value-cont" - } - ], - [ - { - "text":"{{propertyAssessmentId}}", - "border":[ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text":"{{city}}", - "border":[ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text":"{{doorHouseNo}}", - "border":[ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text":"{{buildingColonyName}}", - "border":[ - false, - false, - false, - false - ], - "style": "receipt-table2" - } - ], - [ - { - "text":"{{street_name}}", - "border":[ - false, - false, - false, - false - ], - "style": "receipt-table-value-cont" - }, - { - "text":"{{mohalla_label}}", - "border":[ - false, - false, - false, - false - ], - "style": "receipt-table-value-cont", - "fontSize": 9 - }, - { - "text":"{{pincode_label}}", - "border":[ - false, - false, - false, - false - ], - "style": "receipt-table-value-cont" - }, - { - "text":"{{electricity_connection_no}}", - "border":[ - false, - false, - false, - false - ], - "style": "receipt-table-value-cont" - } - ], - [ - { - "text":"{{streetName}}", - "border":[ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text":"{{mohalla}}", - "border":[ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text":"{{pincode}}", - "border":[ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text":"{{electricityConnectionNo}}", - "border":[ - false, - false, - false, - false - ], - "style": "receipt-table2" - } - ] - ] - }, - "border":[ - true, - false, - true, - true - ] - } - - ] - ] - }, - "layout": {} - }, - { - "stack": [ - { - "style": "noc-table2", - "table": { - "widths": [ - "*" - ], - "body": [ - [ - { - "text":"{{owner_details}}", - "border":[ - true, - true, - true, - false - ], - "style": "receipt-table-value" - } - ], - [ - { - "table": { - "widths": [ - "25%", - "25%", - "25%", - "25%" - ], - "body": [ - [ - { - "text":"{{type_of_ownership}}", - "border":[ - false, - false, - false, - false - ], - "style": "receipt-table-value-cont" - }, - { - "text":"{{type_of_sub_ownership}}", - "border":[ - false, - false, - false, - false - ], - "style": "receipt-table-value-cont", - "fontSize": 9 - }, - { - "text":"Mobile Number/Alternate Contact", - "border":[ - false, - false, - false, - false - ], - "style": "receipt-table-value-cont" - }, - { - "text":"{{name_label}}", - "border":[ - false, - false, - false, - false - ], - "style": "receipt-table-value-cont" - } - ], - [ - { - "text":"{{typeOfOwnership}}", - "border":[ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text":"{{typeOfSubOwnership}}", - "border":[ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text":"{{mobileNo}}, {{altContactNumber}}", - "border":[ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text":"{{name}}", - "border":[ - false, - false, - false, - false - ], - "style": "receipt-table2" - } - ], - [ - { - "text":"{{father_husband}}", - "border":[ - false, - false, - false, - false - ], - "style": "receipt-table-value-cont" - }, - { - "text":"{{relationship_label}}", - "border":[ - false, - false, - false, - false - ], - "style": "receipt-table-value-cont", - "fontSize": 9 - }, - { - "text":"{{gender_label}}", - "border":[ - false, - false, - false, - false - ], - "style": "receipt-table-value-cont" - }, - { - "text":"{{date_of_birth}}", - "border":[ - false, - false, - false, - false - ], - "style": "receipt-table-value-cont" - } - ], - [ - { - "text":"{{fatherHusbandName}}", - "border":[ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text":"{{relationship}}", - "border":[ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text":"{{gender}}", - "border":[ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text":"{{dateOfBirth}}", - "border":[ - false, - false, - false, - false - ], - "style": "receipt-table2" - } - ], - [ - { - "text":"{{email_label}}", - "border":[ - false, - false, - false, - false - ], - "style": "receipt-table-value-cont" - }, - { - "text":"{{pan_no}}", - "border":[ - false, - false, - false, - false - ], - "style": "receipt-table-value-cont", - "fontSize": 9 - }, - { - "text":"{{correspondance_address}}", - "border":[ - false, - false, - false, - false - ], - "style": "receipt-table-value-cont" - }, - { - "text":"{{special_owner}}", - "border":[ - false, - false, - false, - false - ], - "style": "receipt-table-value-cont" - } - ], - [ - { - "text":"{{email}}", - "border":[ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text":"{{panNo}}", - "border":[ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text":"{{correspondenceAddress}}", - "border":[ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text":"{{specialOwnerCategory}}", - "border":[ - false, - false, - false, - false - ], - "style": "receipt-table2" - } - ] - ] - }, - "border":[ - true, - false, - true, - true - ] - } - - ] - ], - "unbreakable": true - }, - "layout": {} - } - ], - "unbreakable": true - }, - { - "stack": [ - { - "style": "noc-table2", - "table": { - "widths": [ - "*" - ], - "body": [ - [ - { - "text":"{{documents_label}}", - "border":[ - true, - true, - true, - false - ], - "style": "receipt-table-value" - } - ], - [ - { - "table": { - "widths": [ - "33%", - "33%", - "33%", - "1%" - ], - "body": [ - [ - { - "text":"{{ownership_proof}}", - "border":[ - false, - false, - false, - false - ], - "style": "receipt-table-value-cont" - }, - { - "text":"{{owners_id_proof}}", - "border":[ - false, - false, - false, - false - ], - "style": "receipt-table-value-cont", - "fontSize": 9 - }, - { - "text":"{{owner_photo}}", - "border":[ - false, - false, - false, - false - ], - "style": "receipt-table-value-cont", - "fontSize": 9 - } - - ], - [ - { - "text":"{{ownershipProof}}", - "border":[ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text":"{{ownersIdProof}}", - "border":[ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text":"{{ownerPhoto}}", - "border":[ - false, - false, - false, - false - ], - "style": "receipt-table2" - } - ] - ] - }, - "border":[ - true, - false, - true, - true - ] - } - - ] - ], - "unbreakable": true - }, - "layout": {} - } - ], - "unbreakable": true - }, - { - "image": "{{footerLogoImage}}", - "width": 75, - "height": 10, - "alignment": "center", - "margin": [ - -12, - -10, - -230, - 0 - ] - } - - ], - "styles": { - "noc-head": { - "margin": [ - -25, - -40, - 0, - 0 - ] - }, - "receipt-logo-header": { - "color": "#484848", - "fontSize": 11, - "bold": true, - "letterSpacing": 0.74, - "margin": [ - 0, - 0, - 0, - 2 - ] - }, - "noc-table": { - "fontSize": 9, - "color": "#484848", - "margin": [ - -25, - 45, - -8, - -8 - ] - }, - "noc-table2": { - "fontSize": 9, - "color": "#484848", - "margin": [ - -25, - 8, - -25, - -8 - ] - }, - "receipt-table-value": { - "color": "#000000", - "bold": true, - "fontSize": 9, - "fontWeight": 350, - "margin": [ - 1, - 1, - 0, - 0 - ] - }, - "receipt-table-value-total": { - "color": "#000000", - "bold": true, - "fontSize": 10, - "fontWeight": 350, - "alignment": "right", - "margin": [ - 0, - 0, - 15, - 0 - ] - }, - "receipt-table-value-down": { - "color": "#000000", - "bold": false, - "fontSize": 9, - "fontWeight": 250, - "alignment": "left", - "margin": [ - 0, - 0, - 0, - 0 - ] - }, - "next-noc-table": { - "fontSize": 12, - "color": "#000000", - "margin": [ - -25, - 15, - -22, - -8 - ] - }, - "receipt-table-value2": { - "color": "#000000", - "bold": false, - "fontSize": 9, - "fontWeight": 250, - "margin": [ - 0, - 0, - 0, - 0 - ] - }, - "receipt-table-value-cont": { - "color": "#000000", - "bold": false, - "fontSize": 9, - "fontWeight": 250, - "margin": [ - 0, - 0, - 0, - 0 - ] - }, - "receipt-table": { - "color": "#484848", - "bold": true, - "fontSize": 9, - "fontWeight": 250, - "margin": [ - -50, - 1, - 0, - 0 - ] - }, - "receipt-table2": { - "color": "#000000", - "bold": true, - "fontSize": 9, - "fontWeight": 200, - "margin": [ - 0, - 0, - 0, - 0 - ] - } - - } - - } -} diff --git a/configs/pdf-service/format-config/tlcertificate.json b/configs/pdf-service/format-config/tlcertificate.json deleted file mode 100644 index 6d3f1742..00000000 --- a/configs/pdf-service/format-config/tlcertificate.json +++ /dev/null @@ -1,721 +0,0 @@ -{ - "key": "tlcertificate", - "config": { - "defaultStyle": { - "font": "Cambay" - }, - "watermark": { - "text": "DIGIT UAT DIGIT UAT", - "color": "gery", - "opacity": 0.1, - "bold": true, - "italics": false - }, - "content": [ - { - "style":"noc-head", - "table":{ - "widths":[ - "*" - ], - "body":[ - [ - - { - "style":"noc-head", - "table": - { - "widths":["30%","*"], - "body": - [ - [ - { - "image": "{{logoImage}}", - "width": 70, - "height": 82, - "alignment": "center", - "margin": [30, 40, 0,10 ] - }, - - { - "stack": - [ - { - "text":"{{mcGrade}},{{city}} (DIGIT UAT)", - "style":"receipt-logo-header" - }, - { - "text":"{{ulb-address}}", - "style":"receipt-logo-sub-header" - }, - { - "text": "{{corporation_contact}} : {{corporationContact}} ", - "style": "receipt-logo-sub-header" - - }, - { - "text": "{{corporation_website}} : {{corporationWebsite}}", - "style": "receipt-logo-sub-header" - - }, - { - "text": "{{corporation_email}} : {{corporationEmail}}", - "style": "receipt-logo-sub-header" - - } - ], - "alignment":"left", - "margin":[0,40,0,0] - - - - - - } - ] - ] - }, - "layout":"noBorders" - } - - ], - - - - [ - { - "stack": [ - { - "text":"{{trade_license_certifcate}}", - "style":"receipt-sub-logo-header" - }, - { - "style":"noc-head", - "table":{ - "widths":[ - "35%", - "65%" - ], - "body":[ - [ - { - "text":"{{trade_license_no}}", - "style":"receipt-sub-logo-sub-header" - }, - { - "text":"{{tradeLicenseNo}}", - "style":"receipt-sub-logo-sub-header" - } - ] - ] - }, - "layout":"noBorders" - }, - { - "style":"noc-head", - "table":{ - "widths":[ - "35%", - "65%" - ], - "body":[ - [ - { - "text":"{{application_no}}", - "style":"receipt-sub-logo-sub-header" - }, - { - "text":"{{applicationNo}}", - "style":"receipt-sub-logo-sub-header" - } - ] - ] - }, - "layout":"noBorders" - }, - { - "style":"noc-head", - "table":{ - "widths":[ - "35%", - "65%" - ], - "body":[ - [ - { - "text":"{{reciept_no}}", - "style":"receipt-sub-logo-sub-header" - }, - { - "text":"{{recieptNo}}", - "style":"receipt-sub-logo-sub-header" - } - ] - ] - }, - "layout":"noBorders" - }, - { - "style":"noc-head", - "table":{ - "widths":[ - "35%", - "65%" - ], - "body":[ - [ - { - "text":"{{financial_year}}", - "style":"receipt-sub-logo-sub-header" - }, - { - "text":"{{financialYear}}", - "style":"receipt-sub-logo-sub-header" - } - ] - ] - }, - "layout":"noBorders" - }, - { - "style":"noc-head", - "table":{ - "widths":[ - "35%", - "65%" - ], - "body":[ - [ - { - "text":"{{trade_name}}", - "style":"receipt-sub-logo-sub-header" - }, - { - "text":"{{tradeName}}", - "style":"receipt-sub-logo-sub-header" - } - ] - ] - }, - "layout":"noBorders" - }, - { - "style":"noc-head", - "table":{ - "widths":[ - "35%", - "65%" - ], - "body":[ - [ - { - "text":"{{trade_owner_name}}", - "style":"receipt-sub-logo-sub-header" - }, - { - "text":"{{tradeOwnerName}}", - "style":"receipt-sub-logo-sub-header" - } - ] - ] - }, - "layout":"noBorders" - }, - - { - "style":"noc-head", - "table":{ - "widths":[ - "35%", - "65%" - ], - "body":[ - [ - { - "text":"{{trade_owner_contact}}", - "style":"receipt-sub-logo-sub-header" - }, - { - "text":"{{tradeOwnerContact}}", - "style":"receipt-sub-logo-sub-header" - } - ] - ] - }, - "layout":"noBorders" - }, - { - "style":"noc-head", - "table":{ - "widths":[ - "35%", - "65%" - ], - "body":[ - [ - { - "text":"{{trade_address}}", - "style":"receipt-sub-logo-sub-header" - }, - { - "text":"{{doorNo}},{{streetName}},{{buildingName}},{{localityNName}}, {{city}}", - "style":"receipt-sub-logo-sub-header" - } - ] - ] - }, - "layout":"noBorders" - }, - { - "style":"noc-head", - "table":{ - "widths":[ - "35%", - "65%" - ], - "body":[ - [ - { - "text":"Structure Type/Sub Type", - "style":"receipt-sub-logo-sub-header" - }, - { - "text":"{{structureType}}, {{structureSubType}}", - "style":"receipt-sub-logo-sub-header" - } - ] - ] - }, - "layout":"noBorders" - }, - { - "style":"noc-head", - "table":{ - "widths":[ - "35%", - "65%" - ], - "body":[ - [ - { - "text":"{{trade_license_fee}}", - "style":"receipt-sub-logo-sub-header" - }, - { - "text":"{{tradeLicenseFee}}", - "style":"receipt-sub-logo-sub-header" - } - ] - ] - }, - "layout":"noBorders" - }, - { - "style":"noc-head", - "table":{ - "widths":[ - "35%", - "65%" - ], - "body":[ - [ - { - "text":"{{license_issue_date}}", - "style":"receipt-sub-logo-sub-header" - }, - { - "text":"{{licenseIssueDate}}", - "style":"receipt-sub-logo-sub-header" - } - ] - ] - }, - "layout":"noBorders" - }, - - { - "style":"noc-head", - "table":{ - "widths":[ - "35%", - "65%" - ], - "body":[ - [ - { - "text":"{{license_validity}}", - "style":"receipt-sub-logo-sub-header" - }, - { - "text":"{{licenseValidityFrom}} {{to}} {{licenseValidityTo}}", - "style":"receipt-sub-logo-sub-header" - } - ] - ] - }, - "layout":"noBorders" - }, - { - "style":"noc-head2", - "table":{ - "widths": [ - "*", - "*", - "*" - ], - "body": - [ - [ - { - "text": "{{trade_category}}", - "style": "receipt-table-value2" - }, - { - "text": "{{trade_type}}", - "style": "receipt-table-value" - }, - { - "text": "{{trade_sub_type}}", - "style": "receipt-table-value" - } - ], - "{{#variable13}}[ { \"text\":\"{{tradeCat}}\", \"border\":[ true, false, true, true ], \"style\": \"receipt-table3\" }, { \"text\":\"{{tradetyp}}\", \"border\":[ false, false, true, true ], \"style\": \"receipt-table2\" }, { \"text\":\"{{tradesub}}\", \"border\":[ false, false, true,true ], \"style\": \"receipt-table2\" }]{{/variable13}}" ] - }, - "border":[ - true, - false, - true, - false - ] - }, - { - "style":"noc-head", - "table":{ - "widths":[ - "35%", - "65%" - ], - "body":[ - [ - { - "text":" ", - "style":"receipt-sub-logo-sub-header" - }, - { - "text":" ", - "style":"receipt-sub-logo-sub-header" - } - ] - ] - }, - "layout":"noBorders" - }, - { - "style":"noc-head2", - "table": { - "widths": [ - "55%", - "15%", - "15%", - "15%" - ], - "body": - [ - [ - { - "text": "{{accesory_type}}", - "style": "receipt-table-value2" - }, - { - "text": "{{uom_label}}", - "style": "receipt-table-value" - }, - { - "text": "{{uom_value}}", - "style": "receipt-table-value" - }, - { - "text": "{{accessory_count}}", - "style": "receipt-table-value" - } - ], - "{{#variable14}}[ { \"text\":\"{{accesoryType}}\", \"border\":[ true, false, true,true ], \"style\": \"receipt-table3\" }, { \"text\":\"{{uom}}\", \"border\":[ false, false, true, true], \"style\": \"receipt-table2\" }, { \"text\":\"{{accessoryUomValue}}\", \"border\":[ false, false,true, true], \"style\": \"receipt-table2\" }, { \"text\":\"{{accessoryCount}}\", \"border\":[ false, false, true,true ], \"style\": \"receipt-table2\" } ]{{/variable14}}" ] - } , - "border":[ - true, - false, - true, - false - ] - }, { - "style": "noc-head2", - "table": { - "widths": [ - "50%", - "*", - "15%" - ], - "body": - [ - [ - { - "text": "Owner Name", - "style": "receipt-table-value2" - }, - { - "text": "Father/Husband Name", - "style": "receipt-table-value" - }, - { - "text": "Mobile Number", - "style": "receipt-table-value" - } - ], - "{{#variable_owners}}[{ \"text\":\"{{name}}\", \"border\":[ true, false, true, true ], \"style\": \"receipt-table3\" }, { \"text\":\"{{fatherOrHusbandName}}\", \"border\":[ false, false, true, true ], \"style\": \"receipt-table2\" }, { \"text\":\"{{mobileNumber}}\", \"border\":[ false, false, true, true ], \"style\": \"receipt-table2\" }]{{/variable_owners}}" - ] - }, "layout": {} - - - } - - ], - "alignment":"left", - "margin":[ - 0, - 10, - 0, - 0 - ] - } - ] - ] - }, - "layout":"noBorders" - }, - { - "style":"receipt-approver", - "columns": [ - { - "text":[ - { - "text":"{{approved_by}} ", - "bold": true - }, - { - "text":"{{approvedBy}}", - "bold": false - } - ], - "alignment":"left" - }, - { - "text":[ - { - "text":"Authorised Signatory", - "bold": true - } - ], - "alignment":"right" - } - ] - }, - { - "text":"Disclaimer", - "style":"disclaimer" - }, - { - "ol": - [ - "This license is not the proof of ownership.", - "This Trade License is issued under rule 10.39 of the Municipal Account Code 2017 with condition that the applicant shall obtain relevant NOC from concerned departments like Punjab Pollution control board / Fire Ofce /Health Department/ Excise Department/Deputy Commissioner (under Explosive Act) whichever applicable.", - "The Municipal Council/Corporation reserves the right to cancel this Trade License for Breach of any condition in accordance with law.", - "This is a computer generated document, hence requires no signature.", - "The grant of Trade License is not approval to any violation of building by laws, town planning scheme.", - "This license is issued subject to the self declaration of the applicant." - ], - "style":"disclaimer" - - }, - { - "image": "{{footerLogoImage}}", - "width": 75, - "height": 10, - "alignment": "center", - "margin": [ - -12, - -10, - -230, - 0 - ] - } - ], - - - "styles": { - "noc-head": { - "margin": [ - -30, - -35, - 0, - -2 - ] - }, - - "noc-head2": { - "margin": [ - 22, - 2,0,0 - ] - }, - "receipt-table-value": { - "color": "#000000", - "fontSize": 9, - "margin": [ - 0, - 2, - 0, - 0 - ] - }, - "receipt-table2": { - "color": "#000000", - "fontSize": 9, - - "margin": [ - 0, - 2, - 0, - 0 - ] - }, - "receipt-table-value2": { - "color": "#000000", - "fontSize": 9, - "margin": [ - 0, - 2, - 0, - 0 - ] - }, - "receipt-table3": { - "color": "#000000", - "fontSize": 9, - "margin": [ - 0, - 2, - 0, - 0 - ] - }, - "receipt-approver": { - "color": "#000000", - "fontSize": 12, - "letterSpacing": 0.6, - "alignment": "center", - "margin": [ - -10, - 30, - 0, - 1 - ] - }, - "receipt-logo-header": { - "color": "#000000", - "fontSize": 17, - "letterSpacing": 0.74, - "alignment": "center", - "margin": [ - 0, - 0, - 0, - 0 - ] - }, - "receipt-sub-logo-header": { - "color": "#000000", - "fontSize": 16, - "letterSpacing": 0.74, - "alignment": "center", - "margin": [ - 0, - -10, - 0, - 0 - ] - }, - "receipt-logo-sub-header": { - "color": "#484848", - "fontSize": 10, - "letterSpacing": 0.6, - "alignment": "center", - "margin": [ - 0, - -5, - 0, - 0 - ] - }, - "receipt-sub-logo-sub-header": { - "color": "#484848", - "fontSize": 12, - "letterSpacing": 0.6, - "alignment": "left", - "margin": [ - 50, - 30, - 0, - 0 - ] - }, - "receipt-sub-address-sub-header": { - "color": "#484848", - "fontSize": 12, - "letterSpacing": 0.1, - "alignment": "right", - "margin": [ - 50, - 30, - -90, - 0 - ] - }, - "receipt-sub-website-sub-header": { - "color": "#484848", - "fontSize": 12, - "letterSpacing": 0.1, - "alignment": "right", - "margin": [ - 50, - 30, - -120, - 0 - ] - }, - "receipt-sub-email-sub-header": { - "color": "#484848", - "fontSize": 12, - "letterSpacing": 0.1, - "alignment": "right", - "margin": [ - 20, - 30, - -110, - 0 - ] - }, - "disclaimer": - { - "fontSize":"10", - "margin": [ - 2, - 3, - 0, - 0 - ] - } - } - - - } - } diff --git a/configs/pdf-service/format-config/tlrenewalcertificate.json b/configs/pdf-service/format-config/tlrenewalcertificate.json deleted file mode 100644 index 0ca3425a..00000000 --- a/configs/pdf-service/format-config/tlrenewalcertificate.json +++ /dev/null @@ -1,720 +0,0 @@ -{ - "key": "tlrenewalcertificate", - "config": { - "defaultStyle": { - "font": "Cambay" - }, - "watermark": { - "text": "DIGIT UAT DIGIT UAT", - "color": "gery", - "opacity": 0.1, - "bold": true, - "italics": false - }, - "content": [ - { - "style":"noc-head", - "table":{ - "widths":[ - "*" - ], - "body":[ - [ - - { - "style":"noc-head", - "table": - { - "widths":["30%","*"], - "body": - [ - [ - { - "image": "{{logoImage}}", - "width": 70, - "height": 82, - "alignment": "center", - "margin": [30, 40, 0,10 ] - }, - - { - "stack": - [ - { - "text":"{{mcGrade}},{{city}} (DIGIT UAT)", - "style":"receipt-logo-header" - }, - { - "text":"{{ulb-address}}", - "style":"receipt-logo-sub-header" - }, - { - "text": "{{corporation_contact}} : {{corporationContact}} ", - "style": "receipt-logo-sub-header" - - }, - { - "text": "{{corporation_website}} : {{corporationWebsite}}", - "style": "receipt-logo-sub-header" - - }, - { - "text": "{{corporation_email}} : {{corporationEmail}}", - "style": "receipt-logo-sub-header" - - } - ], - "alignment":"left", - "margin":[0,40,0,0] - - - - - - } - ] - ] - }, - "layout":"noBorders" - } - - ], - - - - [ - { - "stack": [ - { - "text":"{{trade_license_certifcate}}", - "style":"receipt-sub-logo-header" - }, - { - "style":"noc-head", - "table":{ - "widths":[ - "35%", - "65%" - ], - "body":[ - [ - { - "text":"{{trade_license_no}}", - "style":"receipt-sub-logo-sub-header" - }, - { - "text":"{{tradeLicenseNo}}", - "style":"receipt-sub-logo-sub-header" - } - ] - ] - }, - "layout":"noBorders" - }, - { - "style":"noc-head", - "table":{ - "widths":[ - "35%", - "65%" - ], - "body":[ - [ - { - "text":"{{application_no}}", - "style":"receipt-sub-logo-sub-header" - }, - { - "text":"{{applicationNo}}", - "style":"receipt-sub-logo-sub-header" - } - ] - ] - }, - "layout":"noBorders" - }, - { - "style":"noc-head", - "table":{ - "widths":[ - "35%", - "65%" - ], - "body":[ - [ - { - "text":"{{reciept_no}}", - "style":"receipt-sub-logo-sub-header" - }, - { - "text":"{{recieptNo}}", - "style":"receipt-sub-logo-sub-header" - } - ] - ] - }, - "layout":"noBorders" - }, - { - "style":"noc-head", - "table":{ - "widths":[ - "35%", - "65%" - ], - "body":[ - [ - { - "text":"{{financial_year}}", - "style":"receipt-sub-logo-sub-header" - }, - { - "text":"{{financialYear}}", - "style":"receipt-sub-logo-sub-header" - } - ] - ] - }, - "layout":"noBorders" - }, - { - "style":"noc-head", - "table":{ - "widths":[ - "35%", - "65%" - ], - "body":[ - [ - { - "text":"{{trade_name}}", - "style":"receipt-sub-logo-sub-header" - }, - { - "text":"{{tradeName}}", - "style":"receipt-sub-logo-sub-header" - } - ] - ] - }, - "layout":"noBorders" - }, - { - "style":"noc-head", - "table":{ - "widths":[ - "35%", - "65%" - ], - "body":[ - [ - { - "text":"{{trade_owner_name}}", - "style":"receipt-sub-logo-sub-header" - }, - { - "text":"{{tradeOwnerName}}", - "style":"receipt-sub-logo-sub-header" - } - ] - ] - }, - "layout":"noBorders" - }, - - { - "style":"noc-head", - "table":{ - "widths":[ - "35%", - "65%" - ], - "body":[ - [ - { - "text":"{{trade_owner_contact}}", - "style":"receipt-sub-logo-sub-header" - }, - { - "text":"{{tradeOwnerContact}}", - "style":"receipt-sub-logo-sub-header" - } - ] - ] - }, - "layout":"noBorders" - }, - { - "style":"noc-head", - "table":{ - "widths":[ - "35%", - "65%" - ], - "body":[ - [ - { - "text":"{{trade_address}}", - "style":"receipt-sub-logo-sub-header" - }, - { - "text":"{{doorNo}},{{streetName}},{{buildingName}},{{localityNName}}, {{city}}", - "style":"receipt-sub-logo-sub-header" - } - ] - ] - }, - "layout":"noBorders" - }, - { - "style":"noc-head", - "table":{ - "widths":[ - "35%", - "65%" - ], - "body":[ - [ - { - "text":"Structure Type/Sub Type", - "style":"receipt-sub-logo-sub-header" - }, - { - "text":"{{structureType}}, {{structureSubType}}", - "style":"receipt-sub-logo-sub-header" - } - ] - ] - }, - "layout":"noBorders" - }, - { - "style":"noc-head", - "table":{ - "widths":[ - "35%", - "65%" - ], - "body":[ - [ - { - "text":"{{trade_license_fee}}", - "style":"receipt-sub-logo-sub-header" - }, - { - "text":"{{tradeLicenseFee}}", - "style":"receipt-sub-logo-sub-header" - } - ] - ] - }, - "layout":"noBorders" - }, - { - "style":"noc-head", - "table":{ - "widths":[ - "35%", - "65%" - ], - "body":[ - [ - { - "text":"{{license_issue_date}}", - "style":"receipt-sub-logo-sub-header" - }, - { - "text":"{{licenseIssueDate}}", - "style":"receipt-sub-logo-sub-header" - } - ] - ] - }, - "layout":"noBorders" - }, - - { - "style":"noc-head", - "table":{ - "widths":[ - "35%", - "65%" - ], - "body":[ - [ - { - "text":"{{license_validity}}", - "style":"receipt-sub-logo-sub-header" - }, - { - "text":"{{licenseValidityFrom}} {{to}} {{licenseValidityTo}}", - "style":"receipt-sub-logo-sub-header" - } - ] - ] - }, - "layout":"noBorders" - }, - { - "style":"noc-head2", - "table":{ - "widths": [ - "*", - "*", - "*" - ], - "body": - [ - [ - { - "text": "{{trade_category}}", - "style": "receipt-table-value2" - }, - { - "text": "{{trade_type}}", - "style": "receipt-table-value" - }, - { - "text": "{{trade_sub_type}}", - "style": "receipt-table-value" - } - ], - "{{#variable13}}[ { \"text\":\"{{tradeCat}}\", \"border\":[ true, false, true, true ], \"style\": \"receipt-table3\" }, { \"text\":\"{{tradetyp}}\", \"border\":[ false, false, true, true ], \"style\": \"receipt-table2\" }, { \"text\":\"{{tradesub}}\", \"border\":[ false, false, true,true ], \"style\": \"receipt-table2\" }]{{/variable13}}" ] - }, - "border":[ - true, - false, - true, - false - ] - }, - { - "style":"noc-head", - "table":{ - "widths":[ - "35%", - "65%" - ], - "body":[ - [ - { - "text":" ", - "style":"receipt-sub-logo-sub-header" - }, - { - "text":" ", - "style":"receipt-sub-logo-sub-header" - } - ] - ] - }, - "layout":"noBorders" - }, - { - "style":"noc-head2", - "table": { - "widths": [ - "55%", - "15%", - "15%", - "15%" - ], - "body": - [ - [ - { - "text": "{{accesory_type}}", - "style": "receipt-table-value2" - }, - { - "text": "{{uom_label}}", - "style": "receipt-table-value" - }, - { - "text": "{{uom_value}}", - "style": "receipt-table-value" - }, - { - "text": "{{accessory_count}}", - "style": "receipt-table-value" - } - ], - "{{#variable14}}[ { \"text\":\"{{accesoryType}}\", \"border\":[ true, false, true,true ], \"style\": \"receipt-table3\" }, { \"text\":\"{{uom}}\", \"border\":[ false, false, true, true], \"style\": \"receipt-table2\" }, { \"text\":\"{{accessoryUomValue}}\", \"border\":[ false, false,true, true], \"style\": \"receipt-table2\" }, { \"text\":\"{{accessoryCount}}\", \"border\":[ false, false, true,true ], \"style\": \"receipt-table2\" } ]{{/variable14}}" ] - } , - "border":[ - true, - false, - true, - false - ] - }, { - "style": "noc-head2", - "table": { - "widths": [ - "50%", - "*", - "15%" - ], - "body": - [ - [ - { - "text": "Owner Name", - "style": "receipt-table-value2" - }, - { - "text": "Father/Husband Name", - "style": "receipt-table-value" - }, - { - "text": "Mobile Number", - "style": "receipt-table-value" - } - ], - "{{#variable_owners}}[{ \"text\":\"{{name}}\", \"border\":[ true, false, true, true ], \"style\": \"receipt-table3\" }, { \"text\":\"{{fatherOrHusbandName}}\", \"border\":[ false, false, true, true ], \"style\": \"receipt-table2\" }, { \"text\":\"{{mobileNumber}}\", \"border\":[ false, false, true, true ], \"style\": \"receipt-table2\" }]{{/variable_owners}}" - ] - }, "layout": {} - - - } - - ], - "alignment":"left", - "margin":[ - 0, - 10, - 0, - 0 - ] - } - ] - ] - }, - "layout":"noBorders" - }, - { - "style":"receipt-approver", - "columns": [ - { - "text":[ - { - "text":"{{approved_by}} ", - "bold": true - }, - { - "text":"Auto Approved", - "bold": false - } - ], - "alignment":"left" - }, - { - "text":[ - { - "text":"Authorised Signatory", - "bold": true - } - ], - "alignment":"right" - } - ] - }, - { - "text":"Disclaimer", - "style":"disclaimer" - }, - { - "ol": - [ - "This license is not the proof of ownership.", - "This Trade License is issued under rule 10.39 of the Municipal Account Code 2017 with condition that the applicant shall obtain relevant NOC from concerned departments like Punjab Pollution control board / Fire Ofce /Health Department/ Excise Department/Deputy Commissioner (under Explosive Act) whichever applicable.", - "The Municipal Council/Corporation reserves the right to cancel this Trade License for Breach of any condition in accordance with law.", - "This is a computer generated document, hence requires no signature.", - "The grant of Trade License is not approval to any violation of building by laws, town planning scheme." - ], - "style":"disclaimer" - - }, - { - "image": "{{footerLogoImage}}", - "width": 75, - "height": 10, - "alignment": "center", - "margin": [ - -12, - -10, - -230, - 0 - ] - } - ], - - - "styles": { - "noc-head": { - "margin": [ - -30, - -35, - 0, - -2 - ] - }, - - "noc-head2": { - "margin": [ - 22, - 2,0,0 - ] - }, - "receipt-table-value": { - "color": "#000000", - "fontSize": 9, - "margin": [ - 0, - 2, - 0, - 0 - ] - }, - "receipt-table2": { - "color": "#000000", - "fontSize": 9, - - "margin": [ - 0, - 2, - 0, - 0 - ] - }, - "receipt-table-value2": { - "color": "#000000", - "fontSize": 9, - "margin": [ - 0, - 2, - 0, - 0 - ] - }, - "receipt-table3": { - "color": "#000000", - "fontSize": 9, - "margin": [ - 0, - 2, - 0, - 0 - ] - }, - "receipt-approver": { - "color": "#000000", - "fontSize": 12, - "letterSpacing": 0.6, - "alignment": "center", - "margin": [ - -10, - 30, - 0, - 1 - ] - }, - "receipt-logo-header": { - "color": "#000000", - "fontSize": 17, - "letterSpacing": 0.74, - "alignment": "center", - "margin": [ - 0, - 0, - 0, - 0 - ] - }, - "receipt-sub-logo-header": { - "color": "#000000", - "fontSize": 16, - "letterSpacing": 0.74, - "alignment": "center", - "margin": [ - 0, - -10, - 0, - 0 - ] - }, - "receipt-logo-sub-header": { - "color": "#484848", - "fontSize": 10, - "letterSpacing": 0.6, - "alignment": "center", - "margin": [ - 0, - -5, - 0, - 0 - ] - }, - "receipt-sub-logo-sub-header": { - "color": "#484848", - "fontSize": 12, - "letterSpacing": 0.6, - "alignment": "left", - "margin": [ - 50, - 30, - 0, - 0 - ] - }, - "receipt-sub-address-sub-header": { - "color": "#484848", - "fontSize": 12, - "letterSpacing": 0.1, - "alignment": "right", - "margin": [ - 50, - 30, - -90, - 0 - ] - }, - "receipt-sub-website-sub-header": { - "color": "#484848", - "fontSize": 12, - "letterSpacing": 0.1, - "alignment": "right", - "margin": [ - 50, - 30, - -120, - 0 - ] - }, - "receipt-sub-email-sub-header": { - "color": "#484848", - "fontSize": 12, - "letterSpacing": 0.1, - "alignment": "right", - "margin": [ - 20, - 30, - -110, - 0 - ] - }, - "disclaimer": - { - "fontSize":"10", - "margin": [ - 2, - 3, - 0, - 0 - ] - } - } - - - } - } diff --git a/configs/pdf-service/format-config/tradelicense-bill.json b/configs/pdf-service/format-config/tradelicense-bill.json deleted file mode 100644 index 32703aa4..00000000 --- a/configs/pdf-service/format-config/tradelicense-bill.json +++ /dev/null @@ -1,974 +0,0 @@ -{ - "key": "tradelicense-bill", - "config": { - "defaultStyle": { - "font": "Cambay" - }, - "watermark": { - "text": "DIGIT UAT DIGIT UAT", - "color": "gery", - "opacity": 0.1, - "bold": true, - "italics": false - }, - "content": [ - { - "style": "noc-head", - "table": { - "widths": [ - 60, - "*", - 120 - ], - "body": [ - [ - { - "image": "{{logoImage}}", - "width": 50, - "height": 61.25 - }, - { - "stack": [ - { - "text": "{{logo_header}} {{Municipal_Corporation}} (DIGIT UAT)", - "style": "receipt-logo-header" - }, - { - "stack": [ - { - "text": "{{address}}" - }, - { - "text": "{{phoneNumber}}" - }, - { - "text": "{{website}}" - }, - { - "text": "{{email}}" - } - ] - } - ], - "alignment": "left", - "margin": [ - 0, - 10, - 0, - 0 - ] - }, - { - "stack": [ - { - "text": "{{total_amount_due}}" - }, - { - "text": "{{Rs}} {{totalAmountDue}}", - "style": "amount-due" - } - ], - "alignment": "right", - "color": "#484848", - "margin": [ - -150, - 2, - -20, - 0 - ] - } - ] - ] - }, - "layout": "noBorders" - }, - { - "style": "noc-table", - "table": { - "widths": [ - 130, - 130, - -2, - 130, - 130 - ], - "body": [ - [ - { - "text": "{{payer_name}}", - "border": [ - true, - true, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{payerName}}", - "border": [ - false, - true, - true, - false - ], - "style": "receipt-table" - }, - { - "text": " ", - "border": [ - false, - false, - false, - false - ] - }, - { - "text": "{{bill_no}}", - "border": [ - true, - true, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{billNo}}", - "border": [ - false, - true, - true, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": "{{mobile_no}}", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{mobileNo}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - }, - { - "text": " ", - "border": [ - false, - false, - false, - false - ] - }, - { - "text": "{{bill_period}}", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{fromPeriod}} - {{toPeriod}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": "{{payer_address}}", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{payerAddress}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - }, - { - "text": " ", - "border": [ - false, - false, - false, - false - ] - }, - { - "text": "{{bill_issue_date}}", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{billIssueDate}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": " ", - "border": [ - true, - false, - false, - true - ], - "style": "receipt-table-value" - }, - { - "text": " ", - "border": [ - false, - false, - true, - true - ], - "style": "receipt-table" - }, - { - "text": " ", - "border": [ - false, - false, - false, - false - ] - }, - { - "text": "{{bill_due_date}}", - "border": [ - true, - false, - false, - true - ], - "style": "right-receipt-table" - }, - { - "text": "{{billDueDate}}", - "border": [ - false, - false, - true, - true - ], - "style": "right-receipt-table2" - } - ] - ] - }, - "layout": {} - }, - { - "style": "noc-table2", - "table": { - "widths": [ - "103%" - ], - "body": [ - [ - { - "text": "{{billing_summary_property_tax}} {{serviceType}}", - "border": [ - true, - true, - true, - false - ], - "style": "receipt-table-value" - } - ], - [ - { - "table": { - "widths": [ - "30%", - "26%", - "10%", - "11%", - "10%", - "9%", - "10%", - "9%" - ], - "body": [ - [ - { - "text": "{{tl_application_no}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - }, - { - "text": "{{bill_period}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - }, - { - "text": "{{charge_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - }, - { - "text": "{{penalty_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - }, - { - "text": "{{rebate_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - }, - { - "text": "{{others_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - }, - { - "text": "{{total_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - } - ], - [ - { - "text": "{{propertyID}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text": "{{fromPeriod}}-{{toPeriod}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text": "{{charge}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text": "{{penalty}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text": "{{rebate}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text": "{{others}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text": "{{totalAmountDue}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2", - "bold": true - } - ] - ] - }, - "border": [ - true, - false, - true, - true - ] - } - ] - ] - }, - "layout": {} - }, - - { - "style" : "noc-table3", - "table" : { - "widths": [ - "103%" - ], - "body":[ - [ - { - "style": "noc-table3", - "table": { - "widths": [ - "100%" - ], - "body": ["[{\"text\": \"{{important_message}}\",\"border\":[false,false,false,false],\"style\":\"bill-message-header\"}],{{#variable11}}[{\"text\":\"{{disclaimerContent}}\",\"border\":[false,false,false,false],\"style\":\"bill-message-value\"}]{{/variable11}}"] - } - } - ] - ] - - } - }, - { - "canvas": [ - { - "type": "line", - "x1": -40, - "y1": 30, - "x2": 700, - "y2": 30, - "dash": { - "length": 10, - "space": 5 - } - } - ] - }, - { - "image": "{{scissorImage}}", - "width": 24, - "height": 24, - "margin": [ - -30, - -11.2, - 0, - 0 - ] - }, - - { - "text": "{{acknowledgement_for}}", - "style": "footer-header", - "pageBreak": "before" - - }, - { - "style": "noc-table4", - "table": { - "widths": [ - "25%", - "25%", - "25%", - "25%" - ], - "body": [ - [ - { - "text": "{{date_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{billdate}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": " ", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": " ", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": "{{consumer_id}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{consumerID}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "{{bill_no}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{billNo}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": "{{name_address}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{payerName}}, {{nameAddress}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "{{total_payment}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{total}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - } - ] - ] - } - }, - { - "text": "{{receivers_signature}}", - "style": "footer-bottom" - }, - { - "image": "{{footerLogoImage}}", - "width": 75, - "height": 10, - "alignment": "center", - "margin": [ - -12, - -10, - -230, - 0 - ] - } - ], - "styles": { - "noc-head": { - "margin": [ - -25, - -30, - 0, - 1 - ] - }, - "receipt-logo-header": { - "color": "#484848", - "fontFamily": "Roboto", - "fontSize": 14, - "bold": true, - "letterSpacing": 0.74, - "margin": [ - 0, - -10, - 0, - 5 - ] - }, - "receipt-logo-sub-header": { - "color": "#484848", - "fontFamily": "Roboto", - "fontSize": 13, - "letterSpacing": 0.6 - }, - "noc-table": { - "fontSize": 12, - "color": "#484848", - "margin": [ - -25, - 10, - -8, - -8 - ] - }, - "noc-table4": { - "fontSize": 12, - "color": "#484848", - "margin": [ - -25, - 75, - -8, - -8 - ] - }, - "noc-table2": { - "fontSize": 12, - "color": "#484848", - "margin": [ - -25, - 18, - -8, - -8 - ] - }, - "noc-table3": { - "fontSize": 12, - "color": "#484848", - "margin": [ - -25, - 30, - -8, - -8 - ] - }, - "receipt-table-value": { - "color": "#000000", - "bold": true, - "fontSize": 12, - "fontWeight": 500, - "margin": [ - 8, - 5, - 0, - 0 - ] - }, - "receipt-table-value2": { - "color": "#000000", - "bold": true, - "fontSize": 12, - "fontWeight": 500, - "margin": [ - 3, - 5, - 0, - 0 - ] - }, - "receipt-table": { - "color": "#484848", - "bold": true, - "fontSize": 12, - "fontWeight": 400, - "margin": [ - -10, - 5, - 0, - 0 - ] - }, - "receipt-table2": { - "color": "#484848", - "bold": true, - "fontSize": 11, - "fontWeight": 400, - "margin": [ - 3, - 8, - 0, - 10 - ] - }, - "right-receipt-table": { - "color": "#000000", - "bold": true, - "fontSize": 12, - "fontWeight": 500, - "margin": [ - 8, - 5, - 0, - 10 - ] - }, - "right-receipt-table2": { - "color": "#484848", - "bold": true, - "fontSize": 12, - "fontWeight": 400, - "margin": [ - -10, - 5, - 0, - 0 - ] - }, - "receipt-approver": { - "fontSize": 12, - "bold": true, - "margin": [ - -27, - 50, - -10, - 0 - ], - "color": "#484848" - }, - "no-signature": { - "fontSize": 12, - "margin": [ - -27, - 35, - -10, - 0 - ], - "color": "#484848" - }, - "amount-due": { - "fontSize": 30, - "color": "#FC8019", - "bold": true, - "fontWeight": 700 - }, - "pt-disclaimer": { - "fontSize": 12, - "margin": [ - -27, - 30, - -10, - 0 - ], - "color": "#484848" - }, - "pt-disclaimer-value": { - "fontSize": 12, - "margin": [ - 2, - 5, - 0, - 0 - ], - "color": "#484848" - }, - "qr-text": { - "fontSize": 12, - "margin": [ - 40, - 0, - 0, - 0 - ], - "color": "#484848", - "alignment": "left" - }, - "qr-image": { - "margin": [ - -40, - -1, - -3, - 0 - ], - "color": "#484848", - "alignment": "right" - }, - "footer-header": { - "margin": [ - 0, - 15, - 0, - -40 - ], - "bold": true, - "color": "#000000", - "alignment": "center" - }, - "footer-bottom": { - "margin": [ - 0, - 50, - 0, - 0 - ], - "bold": true, - "color": "#000000", - "alignment": "right" - }, - "bill-message-header": { - "color": "#000000", - "bold": true, - "fontSize": 12, - "fontWeight": 500, - "margin": [ - 28, - -15, - 0, - 10 - ] - }, - "bill-message-value": { - "color": "#484848", - "fontSize": 12, - "fontWeight": 500, - "margin": [ - 28, - -5, - 0, - 10 - ] - }, - "disclaimer-table": { - "fontSize": 12, - "bold": false, - "color": "#FC8019", - "margin": [ - -25, - 16, - -8, - -8 - ] - } - } - } -} \ No newline at end of file diff --git a/configs/pdf-service/format-config/tradelicense-receipt.json b/configs/pdf-service/format-config/tradelicense-receipt.json deleted file mode 100644 index e6a89a2c..00000000 --- a/configs/pdf-service/format-config/tradelicense-receipt.json +++ /dev/null @@ -1,1026 +0,0 @@ -{ - "key": "tradelicense-receipt", - "config": { - "defaultStyle": { - "font": "Cambay" - }, - "watermark": { - "text": "DIGIT UAT DIGIT UAT", - "color": "gery", - "opacity": 0.1, - "bold": true, - "italics": false - }, - "content": [ - { - "style": "noc-head", - "table": { - "widths": [ - 60, - "*", - 120 - ], - "body": [ - [ - { - "image": "{{logoImage}}", - "width": 50, - "height": 61.25 - }, - { - "stack": [ - { - "text": "{{logo-header}} {{mcGrade}} (DIGIT UAT)", - "style": "receipt-logo-header" - }, - { - "text": "{{serviceType}} {{payment_receipt}}", - "style": "receipt-logo-sub-header" - } - ], - "alignment": "left", - "margin": [ - 0, - 0, - 0, - 0 - ] - }, - { - "stack": [ - { - "text": "{{address}}", - "style":"receipt-logo-address-header" - }, - { - "text": "{{phoneNumber}}", - "style":"receipt-logo-address-header" - - }, - { - "text": "{{website}}", - "style":"receipt-logo-address-header" - - }, - { - "text": "{{email}}", - "style":"receipt-logo-address-header" - - } - ], - "alignment": "right", - "color": "#484848", - "margin": [ - -100, - 0, - -25, - 0 - ] - } - ] - ] - }, - "layout": "noBorders" - }, - { - "style": "noc-table", - "table": { - "widths": [ - "20%", - "29%", - "22%", - "29%" - ], - "body": [ - [ - { - "text": "{{receipt_no}}.", - "border": [ - true, - true, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{receiptNo}}", - "border": [ - false, - true, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "{{consumer_id}}", - "border": [ - false, - true, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{consumerID}}", - "border": [ - false, - true, - true, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": "Application Type", - "border": [ - true, - true, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{applicationType}}", - "border": [ - false, - true, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "License No.", - "border": [ - false, - true, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{licenseNumber}}", - "border": [ - false, - true, - true, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": "Financial Year", - "border": [ - true, - true, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{financialYear}}", - "border": [ - false, - true, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "Payer Contact", - "border": [ - false, - true, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{payerContact}}", - "border": [ - false, - true, - true, - false - ], - "style": "receipt-table" - } - - ], - [ - { - "text": "{{payment_date}}", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{paymentDate}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "Payer Name", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{payerName}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": "Address", - "border": [ - true, - false, - false, - true - ], - "style": "receipt-table-value" - }, - { - "text": "{{tradeDoor || ' '}} {{tradeBuilding || ''}} {{tradeStreet || ''}} {{mohalla}},{{logo-header}}", - "border": [ - false, - false, - false, - true - ], - "style": "receipt-table" - }, - { - "text" : " ", - "border": [ - false, - false, - false, - true - ], - "style": "receipt-table-value" - }, - { - "text" : " ", - "border": [ - false, - false, - true, - true - ], - "style": "receipt-table" - } - ] - ] - }, - "layout": {} - }, - { - "style": "next-noc-table", - "table": { - "widths": [ - "25%", - "25%", - "25%", - "25%" - ], - "body": [ - [ - { - "text": "{{service_type}}", - "border": [ - true, - true, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{serviceType}}", - "border": [ - false, - true, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "{{billing_period}}", - "border": [ - false, - true, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{fromPeriod}} {{to}} {{toPeriod}}", - "border": [ - false, - true, - true, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": "Trade Name", - "border": [ - true, - true, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{tradeName}}", - "border": [ - false, - true, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "Structure Type", - "border": [ - false, - true, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{structureType}},{{structureSubType}}", - "border": [ - false, - true, - true, - false - ], - "style": "receipt-table" - } - ], [ - { - "text": "{{payment_mode}}", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{paymentMode}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "{{paid_amount}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "₹ {{paidAmount}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": "{{pending_amount}}", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "₹ {{pendingAmount}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "Trade License Fee, Renewal Penalty", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "₹ {{tradeFee}}, ₹ {{renewalPenalty}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": "Adhoc Rebate", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "₹ {{adhocRebate}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "Rebate Reason", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{adhocRebateReason}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": "Adhoc Penalty", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "₹ {{adhocPenalty}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "Penalty reason", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{adhocPenaltyReason}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": "Rebate Comments", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{rebateComments}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "Penalty Comments", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{penaltyComments}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": "Cheque/DD/PO/Transaction No.", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{chequeNo}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "Cheque/DD/PO/Transaction Date", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{chequeDate}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - } - ],[ - { - "text": "IFSC Code", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{ifsc}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "Bank/Branch Name", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{bank}},{{branch}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": "{{g8_receipt_no}}.", - "border": [ - true, - false, - false, - true - ], - "style": "receipt-table-value" - }, - { - "text": "{{G8ReceiptNo}}", - "border": [ - false, - false, - false, - true - ], - "style": "receipt-table" - }, - { - "text": "{{g8_receipt_date}}", - "border": [ - false, - false, - false, - true - ], - "style": "receipt-table-value" - }, - { - "text": "{{G8ReceiptDate}}", - "border": [ - false, - false, - true, - true - ], - "style": "receipt-table" - } - ] - ] - }, - "layout": {} - }, - - { - "style": "next-noc-table", - "table": { - "widths": [ - "*", - "*", - "*" - ], - "body": - [ - [ - { - "text": "Trade Category", - "style": "receipt-table-value" - }, - { - "text": "Trade Type", - "style": "receipt-table-value" - }, - { - "text": "Trade Sub Type", - "style": "receipt-table-value" - } - ], - "{{#variable13}}[{ \"text\":\"{{tradeCat}}\", \"border\":[ true, false, true, true ], \"style\": \"receipt-table\" }, { \"text\":\"{{tradeTyp}}\", \"border\":[ false, false, true, true ], \"style\": \"receipt-table\" },{ \"text\":\"{{tradeSub}}\", \"border\":[ false, false, true, true ], \"style\": \"receipt-table\"}]{{/variable13}}" - ] - }, "layout": {} - - - }, - { - "style": "next-noc-table", - "table": { - "widths": [ - "55%", - "15%", - "15%", - "15%" - ], - "body": - [ - [ - { - "text": "Accessory Type", - "style": "receipt-table-value" - }, - { - "text": "UOM", - "style": "receipt-table-value" - }, - { - "text": "UOM Value", - "style": "receipt-table-value" - }, - { - "text": "Count", - "style": "receipt-table-value" - } - ], - "{{#variable_acc}}[{ \"text\":\"{{accesoryType}}\", \"border\":[ true, false, true, true ], \"style\": \"receipt-table\" }, { \"text\":\"{{uom}}\", \"border\":[ false, false, true, true ], \"style\": \"receipt-table\" }, { \"text\":\"{{accessoryUomValue}}\", \"border\":[ false, false, true, true ], \"style\": \"receipt-table\" }, { \"text\":\"{{accessoryCount}}\", \"border\":[ false, false, true, true ], \"style\": \"receipt-table\"}]{{/variable_acc}}" - ] - }, "layout": {} - - - },{ - "style": "next-noc-table", - "table": { - "widths": [ - "55%", - "*", - "15%" - ], - "body": - [ - [ - { - "text": "Owner Name", - "style": "receipt-table-value" - }, - { - "text": "Father/Husband Name", - "style": "receipt-table-value" - }, - { - "text": "Mobile Number", - "style": "receipt-table-value" - } - ], - "{{#variable_owners}}[{ \"text\":\"{{name}}\", \"border\":[ true, false, true, true ], \"style\": \"receipt-table\" }, { \"text\":\"{{fatherOrHusbandName}}\", \"border\":[ false, false, true, true ], \"style\": \"receipt-table\" }, { \"text\":\"{{mobileNumber}}\", \"border\":[ false, false, true, true ], \"style\": \"receipt-table\" }]{{/variable_owners}}" - ] - }, "layout": {} - - - }, - { - "style": "receipt-approver", - "columns": [ - { - "text": [ - { - "text": "{{printed_by}}: ", - "bold": true - }, - { - "text": "{{userName}}", - "bold": false - } - ], - "alignment": "left" - }, - { - "text": [ - { - "text": "Authorised Signatory", - "bold": true - } - ], - "alignment": "right", - "margin": [ - 0, - 4, - -10, - 1 - ] - } - ] - }, - { - "style": "no-signature", - "text": "This is a computer generted recepit hence requires no signature." - }, - { - "style": "pt-disclaimer", - "stack": [ - { - "text": "{{disclamer}}", - "bold": true, - "style": "pt-disclaimer-value" - }, - - { - - "ol": - [ - "Payment received by Cheque/DD shall be subject to realization", - "This document is not a proof of property ownership" - ] - }, - { - "text":"Now log a complaint from WhatsApp, give a missed call on 8750975975 or send a Hi message on WhatsApp to this number", "bold": true, "fontSize": 8, "color": "blue", "decoration": "underline"} - ] - }, - { - "image": "{{footerLogoImage}}", - "width": 75, - "height": 10, - "alignment": "center", - "margin": [ - -12, - -10, - -230, - 0 - ] - } - ], - "styles": { - "noc-head": { - "margin": [ - -30, - -30, - 0, - 1 - ] - }, - "receipt-logo-header": { - "color": "#000000", - "fontSize": 14, - "bold": true, - "letterSpacing": 0.74, - "margin": [ - 0, - 0, - 0, - 1 - ] - }, - "receipt-logo-sub-header": { - "color": "#000000", - "fontSize": 12, - "letterSpacing": 0.6 - }, - "receipt-logo-address-header": { - "color": "#000000", - "fontSize": 8, - "letterSpacing": 0.6 - }, - "noc-table": { - "fontSize": 10, - "color": "#000000", - "margin": [ - -25, - 1, - -22, - -8 - ] - }, - "next-noc-table": { - "fontSize": 10, - "color": "#000000", - "margin": [ - -25, - 10, - -22, - -8 - ] - }, - "receipt-table-value": { - "color": "#000000", - "bold": true, - "fontSize": 10, - "fontWeight": 400, - "margin": [ - 2, - -1, - 0, - 0 - ] - }, - "receipt-table": { - "color": "#000000", - "bold": false, - "fontSize": 10, - "fontWeight": 300, - "margin": [ - 0, - -1, - 0, - 0 - ] - }, - "receipt-approver": { - "fontSize": 10, - "bold": true, - "margin": [ - -27, - 30, - -10, - 0 - ], - "color": "#484848" - }, - "no-signature": { - "fontSize": 8, - "margin": [ - -27, - 5, - -10, - 0 - ], - "color": "#484848" - }, - "pt-disclaimer": { - "fontSize": 9, - "margin": [ - -27, - 0, - -10, - 0 - ], - "color": "#484848" - }, - "pt-disclaimer-value": { - "fontSize": 10, - "margin": [ - 0, - 0, - 0, - 0 - ], - "color": "#484848" - } - } - } -} diff --git a/configs/pdf-service/format-config/ws-applicationsewerage.json b/configs/pdf-service/format-config/ws-applicationsewerage.json deleted file mode 100644 index 149b4cba..00000000 --- a/configs/pdf-service/format-config/ws-applicationsewerage.json +++ /dev/null @@ -1,1230 +0,0 @@ -{ - "key": "ws-applicationsewerage", - "config": { - "defaultStyle": { - "font": "Cambay" - }, - "watermark": { - "text": "DIGIT UAT DIGIT UAT", - "color": "gery", - "opacity": 0.1, - "bold": true, - "italics": false - }, - "content": [ - { - "style": "ws-head", - "table": { - "widths": [ - 60, - "*", - 120 - ], - "body": [ - [ - { - "image": "{{logoImage}}", - "width": 40, - "height": 43, - "margin": [ - 12, - 5, - 12, - 5 - ] - }, - { - "stack": [ - { - "text": "{{logo_header}} {{mcGrade}} (Digit UAT)", - "style": "receipt-logo-header" - }, - { - "text": "{{logo_sub_header}}", - "fontSize": 10 - } - ], - "alignment": "left", - "margin": [ - 10, - 10, - 0, - 0 - ] - } - ] - ] - }, - "layout": "noBorders" - }, - { - "columns": [ - { - "text": "Sewerage Application No. : {{applicationNo}}", - "fontSize":10, - "alignment": "left", - "margin": [ - -23, - 0, - 0, - 0 - ] - } - ] - }, - { - "text": "{{property_details_header}}", - "style": "header" - }, - { - "style": "ws-table", - "table": { - "widths": [ - "103%" - ], - "body": [ - [ - { - "table": { - "widths": [ - "25%", - "25%", - "25%", - "25%" - ], - "body": [ - [ - { - "text": "{{property_id}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{property_type}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{property_usage_type}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{property_usage_sub_type}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - } - ], - [ - { - "text": "{{propertyId}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{propertyType}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{propertyUsageType}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{propertyUsageSubType}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - } - ], - [ - { - "text": "{{plot_size}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{no_of_floor}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{rainwater_harvesting_facility}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": " ", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - } - ], - [ - { - "text": "{{plotSize}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{noOfFloor}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{rainwaterHarvestingFacility}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": " ", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - } - ] - ] - }, - "border": [ - true, - true, - true, - true - ] - } - ] - ] - }, - "layout": {} - }, - { - "text": "{{property_location_details_header}}", - "style": "header" - }, - { - "style": "ws-table", - "table": { - "widths": [ - "103%" - ], - "body": [ - [ - { - "table": { - "widths": [ - "25%", - "25%", - "25%", - "25%" - ], - "body": [ - [ - { - "text": "{{city}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{door_house_no}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{building_colony_name}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{street_name}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - } - ], - [ - { - "text": "{{cityName}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{doorHouseNo}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{buildingColonyName}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{streetName}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - } - ], - [ - { - "text": "{{locality_mohalla}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{pin_code}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": " ", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": " ", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - } - ], - [ - { - "text": "{{localityMohalla}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{pinCode}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": " ", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": " ", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - } - ] - ] - }, - "border": [ - true, - true, - true, - true - ] - } - ] - ] - }, - "layout": {} - }, - { - "text": "{{property_owner_details_header}}", - "style": "header" - }, - { - "style": "ws-table", - "table": { - "widths": [ - "103%" - ], - "body": [ - [ - { - "table": { - "widths": [ - "25%", - "25%", - "25%", - "25%" - ], - "body": [ - "{{#variable13}}[{\"text\":\"{{owner_name}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\" }, { \"text\":\"{{email_label}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\", \"fontSize\": 8 }, { \"text\":\"{{gender_label}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\" }, { \"text\":\"{{dob_label}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\" } ], [ { \"text\":\"{{ownerName}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" }, { \"text\":\"{{ownerEmailId}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" }, { \"text\":\"{{gender}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" }, { \"text\":\"{{ownerDob}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" } ], [ { \"text\":\"{{guardian_name}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\" }, { \"text\":\"{{relationship_label}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\", \"fontSize\": 8 }, { \"text\":\"{{correspondence_address}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\" }, { \"text\":\"{{special_applicant_category}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\" } ], [ { \"text\":\"{{guardianName}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" }, { \"text\":\"{{relationshipLabel}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" }, { \"text\":\"{{correspondenceAddress}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" }, { \"text\":\"{{specialApplicantCategory}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" } ]{{/variable13}}" - ] - }, - "border": [ - true, - true, - true, - true - ] - } - ] - ] - }, - "layout": {} - }, - { - "text": "{{connection_details_header}}", - "style": "header" - }, - { - "style": "ws-table", - "table": { - "widths": [ - "103%" - ], - "body": [ - [ - { - "table": { - "widths": [ - "25%", - "25%", - "25%", - "25%" - ], - "body": [ - [ - { - "text": "{{apply_category}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{no_of_water_closets_proposed}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{no_of_water_toilets_proposed}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": " ", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - } - ], - [ - { - "text": "{{applyCategory}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{noOfWaterClosetsProposed}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{noOfWaterToiletsProposed}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": " ", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - } - ] - ] - }, - "border": [ - true, - true, - true, - true - ] - } - ] - ] - }, - "layout": {} - }, - { - "text": "{{document_details_header}}", - "style": "header" - }, - { - "stack": [ - { - "style": "ws-table", - "table": { - "widths": [ - "103%" - ], - "body": [ - [ - { - "table": { - "widths": [ - "33%", - "33%", - "33%", - "1%" - ], - "body": [ - [ - { - "text": "{{ownership_proof}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{owners_id_proof}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table", - "fontSize": 8 - }, - { - "text": "{{electricty_bill}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table", - "fontSize": 8 - } - ], - [ - { - "text": "{{ownershipProof}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{ownersIdProof}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{electricityBill}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - } - ], - [ - { - "text": "{{plumber_report}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{building_plan}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table", - "fontSize": 8 - }, - { - "text": "{{property_tax_reciept}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table", - "fontSize": 8 - } - ], - [ - { - "text": "{{plumberReport}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{buildingPlan}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{ptTaxReciept}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - } - ] - ] - }, - "border" : [ - true, - true, - true, - true - ] - } - ] - ] - } - } - ] - - }, - { - "text": "{{plumber_details_header}}", - "style": "header" - }, - { - "style": "ws-table", - "table": { - "widths": [ - "103%" - ], - "body": [ - [ - { - "table": { - "widths": [ - "25%", - "25%", - "25%", - "25%" - ], - "body": [ - [ - { - "text": "{{plumber_provided_by}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{plumber_licence_no}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{plumber_name}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{plumber_mobile_no}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - } - ], - [ - { - "text": "{{plumberProvidedBy}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{plumberLicenceNo}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{plumberName}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{plumberMobileNo}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - } - ] - ] - }, - "border": [ - true, - true, - true, - true - ] - } - ] - ] - }, - "layout": {} - }, - { - "text": "{{road_charges_header}}", - "style": "header" - }, - { - "style": "ws-table", - "table": { - "widths": [ - "103%" - ], - "body": [ - [ - { - "table": { - "widths": [ - "25%", - "25%", - "25%", - "25%" - ], - "body": [ - [ - { - "text": "{{road_type}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{area_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": " ", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": " ", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - } - ], - [ - { - "text": "{{roadType}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{area}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": " ", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": " ", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - } - ] - ] - }, - "border": [ - true, - true, - true, - true - ] - } - ] - ] - }, - "layout": {} - }, - { - "text": "{{activation_details_header}}", - "style": "header" - }, - { - "style": "ws-table", - "table": { - "widths": [ - "103%" - ], - "body": [ - [ - { - "table": { - "widths": [ - "25%", - "25%", - "25%", - "25%" - ], - "body": [ - [ - { - "text": "{{connection_execution_date}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{connectionExecutionDate}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": " ", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": " ", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - } - ] - ] - }, - "border": [ - true, - true, - true, - true - ] - } - ] - ] - }, - "layout": {} - }, - { - "image": "{{footerLogoImage}}", - "width": 75, - "height": 10, - "alignment": "center", - "margin": [ - -12, - -10, - -230, - 0 - ] - } - ], - "styles": { - "ws-head": { - "margin": [ - -39, - -38, - -38, - 0 - ] - }, - "receipt-logo-header": { - "color": "#000000", - "fontFamily": "Cambay", - "fontSize": 10, - "bold": true, - "letterSpacing": 0.5, - "margin": [ - 0, - -10, - 0, - 0 - ] - }, - "ws-table": { - "fontSize": 9, - "color": "#484848", - "margin": [ - -25, - 0, - -8, - 0 - ] - }, - "header": { - "color": "#000000", - "textTransform": "uppercase", - "bold": true, - "fontSize": 9, - "fontWeight": 500, - "margin": [ - -25, - 1, - 0, - 1 - ] - }, - "ws-sub-table-value": { - "color": "#000000", - "bold": true, - "fontSize": 9, - "fontWeight": 500, - "margin": [ - 3, - 0, - 0, - 0 - ] - }, - "ws-sub-table": { - "color": "#484848", - "bold": true, - "fontSize": 9, - "fontWeight": 400, - "margin": [ - 3, - 0, - 0, - 0 - ] - }, - "qr-image": { - "margin": [ - -40, - -1, - -3, - 0 - ], - "color": "#484848", - "alignment": "right", - "backgroundColor": "#dddddd" - }, - "receipt-table-value-total": { - "color": "#000000", - "bold": true, - "fontSize": 9, - "fontWeight": 500, - "alignment": "right", - "margin": [ - 0, - 5, - 30, - 0 - ] - } - } - } -} diff --git a/configs/pdf-service/format-config/ws-applicationwater.json b/configs/pdf-service/format-config/ws-applicationwater.json deleted file mode 100644 index ad4ef7de..00000000 --- a/configs/pdf-service/format-config/ws-applicationwater.json +++ /dev/null @@ -1,1366 +0,0 @@ -{ - "key": "ws-applicationwater", - "config": { - "defaultStyle": { - "font": "Cambay" - }, - "watermark": { - "text": "DIGIT UAT DIGIT UAT", - "color": "gery", - "opacity": 0.1, - "bold": true, - "italics": false - }, - "content": [ - { - "style": "ws-head", - "table": { - "widths": [ - 60, - "*", - 120 - ], - "body": [ - [ - { - "image": "{{logoImage}}", - "width": 40, - "height": 43, - "margin": [ - 12, - 5, - 12, - 5 - ] - }, - { - "stack": [ - { - "text": "{{logo_header}} {{mcGrade}} (Digit UAT)", - "style": "receipt-logo-header" - }, - { - "text": "{{logo_sub_header}}", - "fontSize": 10 - - } - ], - "alignment": "left", - "margin": [ - 10, - 10, - 0, - 0 - ] - } - ] - ] - }, - "layout": "noBorders" - }, - { - "columns": [ - { - "text": "Water Application No. : {{applicationNo}}", - "fontSize":10, - "alignment": "left", - "margin": [ - -23, - 0, - 0, - 0 - ] - } - ] - }, - { - "text": "{{property_details_header}}", - "style": "header" - }, - { - "style": "ws-table", - "table": { - "widths": [ - "103%" - ], - "body": [ - [ - { - "table": { - "widths": [ - "25%", - "25%", - "25%", - "25%" - ], - "body": [ - [ - { - "text": "{{property_id}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{property_type}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{property_usage_type}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{property_usage_sub_type}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - } - ], - [ - { - "text": "{{propertyId}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{propertyType}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{propertyUsageType}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{propertyUsageSubType}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - } - ], - [ - { - "text": "{{plot_size}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{no_of_floor}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{rainwater_harvesting_facility}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": " ", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - } - ], - [ - { - "text": "{{plotSize}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{noOfFloor}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{rainwaterHarvestingFacility}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": " ", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - } - ] - ] - }, - "border": [ - true, - true, - true, - true - ] - } - ] - ] - }, - "layout": {} - }, - { - "text": "{{property_location_details_header}}", - "style": "header" - }, - { - "style": "ws-table", - "table": { - "widths": [ - "103%" - ], - "body": [ - [ - { - "table": { - "widths": [ - "25%", - "25%", - "25%", - "25%" - ], - "body": [ - [ - { - "text": "{{city}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{door_house_no}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{building_colony_name}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{street_name}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - } - ], - [ - { - "text": "{{cityName}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{doorHouseNo}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{buildingColonyName}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{streetName}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - } - ], - [ - { - "text": "{{locality_mohalla}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{pin_code}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": " ", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": " ", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - } - ], - [ - { - "text": "{{localityMohalla}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{pinCode}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": " ", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": " ", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - } - ] - ] - }, - "border": [ - true, - true, - true, - true - ] - } - ] - ] - }, - "layout": {} - }, - { - "text": "{{property_owner_details_header}}", - "style": "header" - }, - { - "style": "ws-table", - "table": { - "widths": [ - "103%" - ], - "body": [ - [ - { - "table": { - "widths": [ - "25%", - "25%", - "25%", - "25%" - ], - "body": [ - "{{#variable13}}[{\"text\":\"{{owner_name}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\" }, { \"text\":\"{{email_label}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\", \"fontSize\": 8 }, { \"text\":\"{{gender_label}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\" }, { \"text\":\"{{dob_label}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\" } ], [ { \"text\":\"{{ownerName}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" }, { \"text\":\"{{ownerEmailId}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" }, { \"text\":\"{{gender}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" }, { \"text\":\"{{ownerDob}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" } ], [ { \"text\":\"{{guardian_name}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\" }, { \"text\":\"{{relationship_label}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\", \"fontSize\": 8 }, { \"text\":\"{{correspondence_address}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\" }, { \"text\":\"{{special_applicant_category}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\" } ], [ { \"text\":\"{{guardianName}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" }, { \"text\":\"{{relationshipLabel}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" }, { \"text\":\"{{correspondenceAddress}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" }, { \"text\":\"{{specialApplicantCategory}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" } ]{{/variable13}}" - ] - }, - "border": [ - true, - true, - true, - true - ] - } - ] - ] - }, - "layout": {} - }, - { - "text": "{{connection_details_header}}", - "style": "header" - }, - { - "style": "ws-table", - "table": { - "widths": [ - "103%" - ], - "body": [ - [ - { - "table": { - "widths": [ - "25%", - "25%", - "25%", - "25%" - ], - "body": [ - [ - { - "text": "{{apply_category}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{no_of_taps_proposed}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{pipe_size_proposed}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": " ", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - } - ], - [ - { - "text": "{{applyCategory}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{noOfTapsProposed}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{pipeSizeProposed}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": " ", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - } - ] - ] - }, - "border": [ - true, - true, - true, - true - ] - } - ] - ] - }, - "layout": {} - }, - { - "text": "{{document_details_header}}", - "style": "header" - }, - { - "style": "ws-table", - "table": { - "widths": [ - "103%" - ], - "body": [ - [ - { - "table": { - "widths": [ - "33%", - "33%", - "33%", - "1%" - ], - "body": [ - [ - { - "text": "{{ownership_proof}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{owners_id_proof}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table", - "fontSize": 8 - }, - { - "text": "{{electricty_bill}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table", - "fontSize": 8 - } - ], - [ - { - "text": "{{ownershipProof}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{ownersIdProof}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{electricityBill}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - } - ], - [ - { - "text": "{{plumber_report}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{building_plan}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table", - "fontSize": 8 - }, - { - "text": "{{property_tax_reciept}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table", - "fontSize": 8 - } - ], - [ - { - "text": "{{plumberReport}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{buildingPlan}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{ptTaxReciept}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - } - ] - ] - }, - "border" : [ - true, - true, - true, - true - ] - } - ] - ] - } - }, - { - "text": "{{additional_connection_details_header}}", - "style": "header" - }, - { - "style": "ws-table", - "table": { - "widths": [ - "103%" - ], - "body": [ - [ - { - "table": { - "widths": [ - "18%", - "18%", - "20%", - "18%", - "*" - ], - "body": [ - [ - { - "text": "{{connection_type}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{no_of_taps}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{water_source}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{water_sub_source}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{pipe_size}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - } - ], - [ - { - "text": "{{connectionType}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{noOfTaps}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{waterSource}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{waterSubSource}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{pipeSize}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - } - ] - ] - }, - "border": [ - true, - true, - true, - true - ] - } - ] - ] - }, - "layout": {} - }, - { - "text": "{{plumber_details_header}}", - "style": "header" - }, - { - "style": "ws-table", - "table": { - "widths": [ - "103%" - ], - "body": [ - [ - { - "table": { - "widths": [ - "25%", - "25%", - "25%", - "25%" - ], - "body": [ - [ - { - "text": "{{plumber_provided_by}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{plumber_licence_no}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{plumber_name}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{plumber_mobile_no}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - } - ], - [ - { - "text": "{{plumberProvidedBy}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{plumberLicenceNo}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{plumberName}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{plumberMobileNo}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - } - ] - ] - }, - "border": [ - true, - true, - true, - true - ] - } - ] - ] - }, - "layout": {} - }, - { - "text": "{{road_charges_header}}", - "style": "header" - }, - { - "style": "ws-table", - "table": { - "widths": [ - "103%" - ], - "body": [ - [ - { - "table": { - "widths": [ - "25%", - "25%", - "25%", - "25%" - ], - "body": [ - [ - { - "text": "{{road_type}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{roadType}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{area_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{area}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - } - ] - ] - }, - "border": [ - true, - true, - true, - true - ] - } - ] - ] - }, - "layout": {} - }, - { - "text": "{{activation_details_header}}", - "style": "header" - }, - { - "style": "ws-table", - "table": { - "widths": [ - "103%" - ], - "body": [ - [ - { - "table": { - "widths": [ - "25%", - "25%", - "25%", - "25%" - ], - "body": [ - [ - { - "text": "{{connection_execution_date}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{meter_id}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{meter_installation_date}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{initial_meter_reading}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - } - ], - [ - { - "text": "{{connectionExecutionDate}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{meterId}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{meterInstallationDate}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{initialMeterReading}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - } - ] - ] - }, - "border": [ - true, - true, - true, - true - ] - } - ] - ] - }, - "layout": {} - }, - { - "image": "{{footerLogoImage}}", - "width": 75, - "height": 10, - "alignment": "center", - "margin": [ - -12, - -10, - -230, - 0 - ] - } - ], - "styles": { - "ws-head": { - "margin": [ - -39, - -38, - -38, - 0 - ] - }, - "receipt-logo-header": { - "color": "#000000", - "fontFamily": "Cambay", - "fontSize": 10, - "bold": true, - "letterSpacing": 0.5, - "margin": [ - 0, - -10, - 0, - 0 - ] - }, - "ws-table": { - "fontSize": 9, - "color": "#484848", - "margin": [ - -25, - 0, - -8, - 0 - ] - }, - "header": { - "color": "#000000", - "textTransform": "uppercase", - "bold": true, - "fontSize": 9, - "fontWeight": 500, - "margin": [ - -25, - 1, - 0, - 1 - ] - }, - "ws-sub-table-value": { - "color": "#000000", - "bold": true, - "fontSize": 9, - "fontWeight": 500, - "margin": [ - 3, - 0, - 0, - 0 - ] - }, - "ws-sub-table": { - "color": "#484848", - "bold": true, - "fontSize": 9, - "fontWeight": 400, - "margin": [ - 3, - 0, - 0, - 0 - ] - }, - "qr-image": { - "margin": [ - -40, - -1, - -3, - 0 - ], - "color": "#484848", - "alignment": "right", - "backgroundColor": "#dddddd" - }, - "receipt-table-value-total": { - "color": "#000000", - "bold": true, - "fontSize": 9, - "fontWeight": 500, - "alignment": "right", - "margin": [ - 0, - 5, - 30, - 0 - ] - } - } - } -} diff --git a/configs/pdf-service/format-config/ws-bill.json b/configs/pdf-service/format-config/ws-bill.json deleted file mode 100644 index 03048b2a..00000000 --- a/configs/pdf-service/format-config/ws-bill.json +++ /dev/null @@ -1,1246 +0,0 @@ -{ - "key": "ws-bill", - "config": { - "defaultStyle": { - "font": "Cambay" - }, - "content": [ - { - "style": "noc-head", - "table": { - "widths": [ - 60, - "*", - 120 - ], - "body": [ - [ - { - "image": "{{logoImage}}", - "width": 45, - "height": 50 - }, - { - "stack": [ - { - "text": "{{logo_header}} {{mcGrade}} (Digit UAT)", - "style": "receipt-logo-header" - }, - { - "stack": [ - { - "text": "{{address}}" - }, - { - "text": "{{phoneNumber}}" - }, - { - "text": "{{website}}" - }, - { - "text": "{{email}}" - } - ] - } - ], - "alignment": "left", - "margin": [ - 0, - 1, - 0, - 0 - ] - }, - { - "stack": [ - { - "text": "{{total_amount_due}}" - }, - { - "text": "{{Rs}} {{totalAmountDue}}", - "style": "amount-due" - } - ], - "alignment": "right", - "color": "#484848", - "margin": [ - -150, - 1, - -20, - 0 - ] - } - ] - ] - }, - "layout": "noBorders" - }, - { - "style": "noc-table2", - "table": { - "widths": [ - "103%" - ], - "body": [ - [ - { - "text": "{{serviceType}} Bill for Period {{fromPeriod}} - {{toPeriod}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2", - "alignment":"center" - } - ] - ] - }, - "layout": {} - }, - { - "style": "noc-table2", - "table": { - "widths": [ - "103%" - ], - "body": [ - [ - { - "table": { - "widths": [ - "8%", - "22%", - "15%", - "21%", - "15%", - "21%" - ], - "body": [ - [ - { - "text": "{{bill_no}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - }, - { - "text": "{{billNo}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - }, - { - "text": "{{bill_issue_date}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - }, - { - "text": "{{billIssueDate}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - }, - { - "text": "Bill Due Date", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - }, - { - "text": "{{billDueDate}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - } - ] - ] - }, - "border": [ - false, - true, - false, - true - ] - } - ] - - ] - }, - "layout": {} - }, - { - "style": "noc-table2", - "table": { - "widths": [ - "103%" - ], - "body": [ - [ - { - "table": { - "widths": [ - "23%", - "25%", - "23%", - "*" - ], - "body": [ - [ - { - "text": "{{consumer_no}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - }, - { - "text": "Old Consumer No.", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - }, - { - "text": "House No.", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - }, - { - "text": "Ledger Id", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - } - ], - [ - { - "text": "{{consumerCode}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text": "{{oldConnectionNo}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text": "{{houseNo}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text":"{{ledgerId}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2" - } - ], - [ - { - "text": "Plot Size", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - }, - { - "text": "Consumer Name", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - }, - { - "text": "Guardian Name", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - }, - { - "text": "Locality", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - } - ], - [ - { - "text": "{{plotSize}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text": "{{ownerName}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text": "{{guardianName}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text":"{{locality}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2" - } - ], - [ - { - "text": "Usage Type", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - }, - { - "text": "Mobile Number", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - }, - { - "text": "Street Name/Landmark", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - }, - { - "text": "Address", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - } - ], - [ - { - "text": "{{usageType}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - - { - "text": "{{mobileNo}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text":"{{streetName}}{{landmark}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text": "{{payerAddress}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2" - } - ] - ] - }, - "border": [ - true, - true, - true, - true - ] - } - ] - ] - }, - "layout": {} - }, - { - "style": "noc-table2", - "table": { - "widths": [ - "103%" - ], - "body": [ - [ - { - "text": "{{billing_summary_property_tax}} {{serviceType}}", - "border": [ - true, - true, - true, - false - ], - "style": "receipt-table-value" - } - ], - [ - { - "table": { - "widths": [ - "12%", - "23%", - "15%", - "10%", - "10%", - "10%", - "10%", - "*" - ], - "body": [ - [ - { - "text": "{{arrears_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - }, - { - "text": "{{advanceAdjusted_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - }, - { - "text": "{{advanceAvailable_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - },{ - "text": "{{charge_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - }, - { - "text": "{{penalty_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - }, - { - "text": "{{rebate_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - }, - { - "text": "{{others_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - }, - { - "text": "{{total_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value2" - } - ], - [ - { - "text": "{{arrears}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text":"{{advanceAdjusted}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text": "{{advanceAvailable}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text": "{{charge}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text": "{{penalty}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text": "{{rebate}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text": "{{others}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2" - }, - { - "text": "{{calculatedTotal}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table2", - "bold": true - } - ] - ] - }, - "border": [ - true, - true, - true, - true - ] - } - ] - ] - }, - "layout": {} - }, - { - "style": "noc-table3", - "table": { - "widths": [ - "103%" - ], - "body": [ - [ - { - "text": "{{important_message}}", - "border": [ - true, - true, - true, - false - ], - "margin": [ - 9, - 1, - 0, - 1 - ], - "style": "receipt-table-value" - } - ], - [ - { - "text": "1. Online payment can be done for {{serviceType}} charges payment. http://bit.ly/{{logo_header}}{{serviceType}}", - "border": [ - true, - false, - true, - false - ], - "margin": [ - 4, - 0, - 0, - 0.5 - ] - } - ], - [ - { - "text": "2. If last day to pay bill is a holiday. Kindly pay your bills either online or offline on previous working day to avoid penalty.", - "border": [ - true, - false, - true, - false - ], - "margin": [ - 4, - 0, - 0, - 0.5 - ] - } - ], - [ - { - "text": "3. Payment mode available: Cash/Cheque at office counter,Online: Credit/Debit Card/PayTM/FreeCharge/BBPS/Airtel/SewaKendra.", - "border": [ - true, - false, - true, - false - ], - "margin": [ - 4, - 0, - 0, - 0.5 - ] - } - ], - [ - { - "text": "4. Please bring this bill while making payment at office counter.", - "border": [ - true, - false, - true, - false - ], - "margin": [ - 4, - 0, - 0, - 0.5 - ] - } - ], - [ - { - "text": "5. {{rate}}% Late payment charges will be applied after due date", - "border": [ - true, - false, - true, - false - ], - "margin": [ - 4, - 0, - 0, - 0.5 - ] - } - ], - [ - { - "text": "6. Interest & late payment charges calculated based on the payment date will reflect in next bill ", - "border": [ - true, - false, - true, - true - ], - "margin": [ - 4, - 0, - 0, - 0.5 - ] - } - ] - ] - }, - "layout": {} - }, - { - "text": "Authorized Signatory", - "style": "footer-bottom" - }, - { - "canvas": [ - { - "type": "line", - "x1": -40, - "y1": 28, - "x2": 700, - "y2": 28, - "dash": { - "length": 10, - "space": 5 - } - } - ] - }, - { - "image": "{{scissorImage}}", - "width": 19, - "height": 19, - "margin": [ - -30, - -9.8, - 0, - 0 - ] - }, - { - "text": "{{acknowledgement_for}}", - "style": "footer-header" - }, - { - "style": "noc-table4", - "table": { - "widths": [ - "*", - "*", - "*", - "*" - ], - "body": [ - [ - { - "text": "{{date_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{billdate}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "Bill Due Date", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{billDueDate}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": "{{consumer_no}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{consumerID}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "{{bill_no}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{billNo}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": "{{name_address}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{payerName}}, {{nameAddress}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "{{total_payment}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{total}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - } - ] - ] - } - }, - { - "text": "{{receivers_signature}}", - "style": "footer-bottom" - }, - { - "image": "{{footerLogoImage}}", - "width": 75, - "height": 10, - "alignment": "center", - "margin": [ - -12, - -10, - -230, - 0 - ] - } - ], - "styles": { - "noc-head": { - "margin": [ - -25, - -30, - 0, - 1 - ] - }, - "receipt-logo-header": { - "color": "#484848", - "fontFamily": "Roboto", - "fontSize": 14, - "bold": true, - "letterSpacing": 0.74, - "margin": [ - 0, - -10, - 0, - 1 - ] - }, - "receipt-logo-sub-header": { - "color": "#484848", - "fontFamily": "Roboto", - "fontSize": 12, - "letterSpacing": 0.6 - }, - "noc-table": { - "fontSize": 10, - "color": "#484848", - "margin": [ - -25, - 13, - -8, - -8 - ] - }, - "noc-table4": { - "fontSize": 10, - "color": "#484848", - "margin": [ - -25, - 40, - -8, - -8 - ] - }, - "noc-table2": { - "fontSize": 10, - "color": "#484848", - "margin": [ - -25, - 8, - -8, - -8 - ] - }, - "noc-table3": { - "fontSize": 10, - "color": "#484848", - "margin": [ - -25, - 13, - -8, - -8 - ] - }, - "receipt-table-value": { - "color": "#000000", - "bold": true, - "fontSize": 10, - "fontWeight": 500, - "margin": [ - 8, - 1, - 0, - 0 - ] - }, - "receipt-table-value2": { - "color": "#000000", - "bold": true, - "fontSize": 10, - "fontWeight": 500, - "margin": [ - 3, - 1, - 0, - 0 - ] - }, - "receipt-table": { - "color": "#484848", - "bold": true, - "fontSize": 10, - "fontWeight": 400, - "margin": [ - -30, - 1, - 0, - 0 - ] - }, - "receipt-table2": { - "color": "#484848", - "bold": true, - "fontSize": 10, - "fontWeight": 400, - "margin": [ - 3, - 2, - 0, - 2 - ] - }, - "right-receipt-table": { - "color": "#000000", - "bold": true, - "fontSize": 10, - "fontWeight": 500, - "margin": [ - 8, - 5, - 0, - 10 - ] - }, - "right-receipt-table2": { - "color": "#484848", - "bold": true, - "fontSize": 10, - "fontWeight": 400, - "margin": [ - -30, - 5, - 0, - 0 - ] - }, - "receipt-approver": { - "fontSize": 10, - "bold": true, - "margin": [ - -27, - 30, - -10, - 0 - ], - "color": "#484848" - }, - "no-signature": { - "fontSize": 10, - "margin": [ - -27, - 25, - -10, - 0 - ], - "color": "#484848" - }, - "amount-due": { - "fontSize": 20, - "color": "#FC8019", - "bold": true, - "fontWeight": 700 - }, - "pt-disclaimer": { - "fontSize": 8, - "margin": [ - -27, - 20, - -10, - 0 - ], - "color": "#484848" - }, - "pt-disclaimer-value": { - "fontSize": 8, - "margin": [ - 0, - 2, - 0, - 0 - ], - "color": "#484848" - }, - "qr-text": { - "fontSize": 12, - "margin": [ - 40, - 0, - 0, - 0 - ], - "color": "#484848", - "alignment": "left" - }, - "qr-image": { - "margin": [ - -40, - -1, - -3, - 0 - ], - "color": "#484848", - "alignment": "right" - }, - "footer-header": { - "margin": [ - 0, - 2, - 0, - -40 - ], - "bold": true, - "color": "#000000", - "alignment": "center" - }, - "footer-bottom": { - "margin": [ - 0, - 20, - 0, - 0 - ], - "bold": true, - "color": "#000000", - "alignment": "right" - } - } - } -} diff --git a/configs/pdf-service/format-config/ws-consolidatedacknowlegment.json b/configs/pdf-service/format-config/ws-consolidatedacknowlegment.json deleted file mode 100644 index 6dcb9884..00000000 --- a/configs/pdf-service/format-config/ws-consolidatedacknowlegment.json +++ /dev/null @@ -1,1003 +0,0 @@ -{ - "key": "ws-consolidatedacknowlegment", - "config": { - "defaultStyle": { - "font": "Cambay" - }, - "watermark": { - "text": "DIGIT UAT DIGIT UAT", - "color": "gery", - "opacity": 0.1, - "bold": true, - "italics": false - }, - "content": [ - { - "style": "ws-head", - "table": { - "widths": [ - 60, - "*", - 120 - ], - "body": [ - [ - { - "image": "{{logoImage}}", - "width": 50, - "height": 61.25, - "margin": [ - 12, - 10, - 12, - 10 - ] - }, - { - "stack": [ - { - "text": "{{logo_header}} {{mcGrade}} (Digit UAT)", - "style": "receipt-logo-header" - }, - { - "text": "{{logo_sub_header}}" - } - ], - "alignment": "left", - "margin": [ - 10, - 30, - 0, - 0 - ] - }, - { - "stack": [ - { - "table": { - "widths": [ - "*", - "*" - ], - "body": [ - [ - { - "image": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAABkAAAAZAAQMAAAAbwhzkAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAGUExURQAAAP7+/soH9D0AAAYwSURBVHja7dyxcYNAEAVQPA4UugRKoTRcGqW4BIcKNMKBcABzXu8JhIXn/UwSJ/Zt/Oea8Z+kAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAXkiyGdTn77iaHt79nLHa1oQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEJA9IC+ZVvolhHS3b88hpE+130FAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQP4AMmQK7vNpruVme80OppxAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQECOCeluH1PdeBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQkGND4pvaQUBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBADgYJE0OG+TTh0TggICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB7QqqSgpS78TUBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQF5LGRF4h2MjwoICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICMhGkPI0izvTP6Ju/IosLnk/b1/yBwEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEB+RVyz1+mdjDlEu6gW4wKAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKyB6Scc1hp76MdjCGk3I0f5jsAAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQHZBRJ348PhYkhNrb6rWTIICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICMi2kB8yPfTRJFKepnz07fbjdX40tT4QEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEJCtICuSqtWndjDllHotCAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAjIRpDPpj797B+umSOv08PvGcj0sQUBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAdkD8pJppV/mkMXRYT5VuRtf3kFXU8kHAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQF5DGQoltbbImQxzYpMkMVN7SAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAeDnMZEype8p46CgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIA8AeSem9pr0oKAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgOwJSU0zh3ynW7yvOM17ceRurAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICMi2kKr00dFTZgdTrjU7AAEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEB2RhyvICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICArMkXJlylJdANIpEAAAAASUVORK5CYII=", - "width": 70, - "height": 70, - "alignment": "right", - "border": [ - false, - false, - false, - false - ], - "style": "qr-image" - } - ] - ] - } - } - ] - } - ] - ] - }, - "layout": "noBorders" - }, - { - "columns": [ - { - "width": "20%", - "text": "{{consumer_no}}" - }, - { - "width": "50%", - "text": "{{consumerNo}}" - }, - { - "width": "14%", - "text": " " - }, - { - "width": "10%", - "text": "{{status_label}}", - "alignment": "right" - }, - { - "width": "10%", - "text": "{{status}}", - "alignment": "right" - } - ], - "margin": [ - -26, - 4, - 0, - 0 - ] - }, - { - "text": "{{service_details_header}}", - "style": "header" - }, - { - "style": "ws-table-property", - "table": { - "widths": [ - "103%" - ], - "body": [ - [ - { - "table": { - "widths": [ - "25%", - "25%", - "25%", - "25%" - ], - "body": [ - [ - { - "text": "{{service}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{connection_category}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{connection_type}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{meter_id}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - } - ], - [ - { - "text": "{{water_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{connectionCategory}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{connectionType}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{meterID}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - } - ], - [ - { - "text": "{{pipe_size}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{connection_execution_date}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{rainwater_harvesting_facility}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{water_source}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - } - ], - [ - { - "text": "{{pipeSize}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{connectionExecutionDate}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{rainwaterHarvestingFacility}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{waterSource}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - } - ], - [ - { - "text": "{{water_sub_source}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": " ", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": " ", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": " ", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - } - ], - [ - { - "text": "{{waterSubSource}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": " ", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": " ", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": " ", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - } - ] - ] - }, - "border": [ - true, - true, - true, - true - ] - } - ] - ] - }, - "layout": {} - }, - { - "text": "{{property_details_header}}", - "style": "header" - }, - { - "style": "ws-table-property", - "table": { - "widths": [ - "103%" - ], - "body": [ - [ - { - "table": { - "widths": [ - "25%", - "25%", - "25%", - "25%" - ], - "body": [ - [ - { - "text": "{{property_type}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{property_usage_type}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{plot_size}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": " ", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - } - ], - [ - { - "text": "{{propertyType}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{propertyUsageType}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{plotSize}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": " ", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - } - ], - [ - { - "text": "{{property_ID}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{city_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{plot_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{building_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - } - ], - [ - { - "text": "{{propertyID}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{city}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{plot}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{building}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - } - ], - [ - { - "text": "{{street_name}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{locality_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{pincode_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{location_on_map}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - } - ], - [ - { - "text": "{{streetName}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{locality}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{pincode}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{lat}} {{long}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - } - ] - ] - }, - "border": [ - true, - true, - true, - true - ] - } - ] - ] - }, - "layout": {} - }, - { - "text": "{{owner_details_header}}", - "style": "header" - }, - { - "style": "ws-table-property", - "table": { - "widths": [ - "103%" - ], - "body": [ - [ - { - "table": { - "widths": [ - "25%", - "25%", - "25%", - "25%" - ], - "body": [ - [ - { - "text": "{{owner_mobile_number}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{owner_name}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{gender_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{guardian_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - } - ], - [ - { - "text": "{{ownerMobileNumber}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{ownerName}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{gender}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{guardian}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - } - ], - [ - { - "text": "{{guardian_name}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{owner_category}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{email_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{correspondence_address}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - } - ], - [ - { - "text": "{{guardianName}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{ownerCategory}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{email}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{correspondenceAddress}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - } - ] - ] - }, - "border": [ - true, - true, - true, - true - ] - } - ] - ] - }, - "layout": {} - }, - { - "image": "{{footerLogoImage}}", - "width": 75, - "height": 10, - "alignment": "center", - "margin": [ - -12, - -10, - -230, - 0 - ] - } - ], - "styles": { - "ws-head": { - "fillColor": "#F2F2F2", - "margin": [ - -39, - -38, - -38, - 0 - ] - }, - "receipt-logo-header": { - "color": "#000000", - "fontFamily": "Cambay", - "fontSize": 14, - "bold": true, - "letterSpacing": 0.74, - "margin": [ - 0, - -10, - 0, - 5 - ] - }, - "ws-table": { - "fontSize": 12, - "color": "#484848", - "margin": [ - -25, - 18, - -8, - 10 - ] - }, - "ws-table-property": { - "fontSize": 12, - "color": "#484848", - "margin": [ - -25, - 8, - -8, - 2 - ] - }, - "header": { - "color": "#000000", - "textTransform": "uppercase", - "bold": true, - "fontSize": 12, - "fontWeight": 500, - "margin": [ - -25, - 5, - 0, - -10 - ] - }, - "ws-sub-table-value": { - "color": "#000000", - "bold": true, - "fontSize": 12, - "fontWeight": 500, - "margin": [ - 3, - 0, - 0, - 1 - ] - }, - "ws-sub-table": { - "color": "#484848", - "bold": true, - "fontSize": 12, - "fontWeight": 400, - "margin": [ - 3, - 1, - 0, - 0 - ] - }, - "qr-image": { - "margin": [ - -40, - -1, - -3, - 0 - ], - "color": "#484848", - "alignment": "right", - "backgroundColor": "#dddddd" - } - } - } -} diff --git a/configs/pdf-service/format-config/ws-consolidatedsewerageconnection.json b/configs/pdf-service/format-config/ws-consolidatedsewerageconnection.json deleted file mode 100644 index 460887c5..00000000 --- a/configs/pdf-service/format-config/ws-consolidatedsewerageconnection.json +++ /dev/null @@ -1,804 +0,0 @@ -{ - "key": "ws-consolidatedsewerageconnection", - "config": { - "defaultStyle": { - "font": "Cambay" - }, - "watermark": { - "text": "DIGIT UAT DIGIT UAT", - "color": "gery", - "opacity": 0.1, - "bold": true, - "italics": false - }, - "content": [ - { - "style": "ws-head", - "table": { - "widths": [ - 60, - "*", - 120 - ], - "body": [ - [ - { - "image": "{{logoImage}}", - "width": 50, - "height": 61.25, - "margin": [ - 12, - 10, - 12, - 10 - ] - }, - { - "stack": [ - { - "text": "{{logo_header}} {{mcGrade}} (Digit UAT)", - "style": "receipt-logo-header" - }, - { - "text": "{{logo_sub_header}}" - } - ], - "alignment": "left", - "margin": [ - 10, - 30, - 0, - 0 - ] - }, - { - "stack": [ - { - "table": { - "widths": [ - "*", - "*" - ], - "body": [ - [ - { - "image": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAABkAAAAZAAQMAAAAbwhzkAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAGUExURQAAAP7+/soH9D0AAAYwSURBVHja7dyxcYNAEAVQPA4UugRKoTRcGqW4BIcKNMKBcABzXu8JhIXn/UwSJ/Zt/Oea8Z+kAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAXkiyGdTn77iaHt79nLHa1oQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEJA9IC+ZVvolhHS3b88hpE+130FAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQP4AMmQK7vNpruVme80OppxAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQECOCeluH1PdeBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQkGND4pvaQUBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBADgYJE0OG+TTh0TggICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB7QqqSgpS78TUBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQF5LGRF4h2MjwoICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICMhGkPI0izvTP6Ju/IosLnk/b1/yBwEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEB+RVyz1+mdjDlEu6gW4wKAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKyB6Scc1hp76MdjCGk3I0f5jsAAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQHZBRJ348PhYkhNrb6rWTIICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICMi2kB8yPfTRJFKepnz07fbjdX40tT4QEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEJCtICuSqtWndjDllHotCAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAjIRpDPpj797B+umSOv08PvGcj0sQUBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAdkD8pJppV/mkMXRYT5VuRtf3kFXU8kHAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQF5DGQoltbbImQxzYpMkMVN7SAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAeDnMZEype8p46CgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIA8AeSem9pr0oKAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgOwJSU0zh3ynW7yvOM17ceRurAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICMi2kKr00dFTZgdTrjU7AAEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEB2RhyvICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICArMkXJlylJdANIpEAAAAASUVORK5CYII=", - "width": 70, - "height": 70, - "alignment": "right", - "border": [ - false, - false, - false, - false - ], - "style": "qr-image" - } - ] - ] - } - } - ] - } - ] - ] - }, - "layout": "noBorders" - }, - { - "columns": [ - { - "width": "20%", - "text": "{{consumer_no}}" - }, - { - "width": "50%", - "text": "{{consumerNo}}" - }, - { - "width": "14%", - "text": " " - }, - { - "width": "10%", - "text": "{{status_label}}", - "alignment": "right" - }, - { - "width": "10%", - "text": "{{status}}", - "alignment": "right" - } - ], - "margin": [ - -26, - 10, - 0, - 0 - ] - }, - { - "text": "{{service_details_header}}", - "style": "header" - }, - { - "style": "ws-table", - "table": { - "widths": [ - "103%" - ], - "body": [ - [ - { - "table": { - "widths": [ - "25%", - "50%", - "25%" - ], - "body": [ - [ - { - "text": "{{service}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{connection_execution_date}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{unit_of_measurement}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - } - ], - [ - { - "text": "{{sewarage_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{connectionExecutionDate}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{uom}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - } - ] - ] - }, - "border": [ - true, - true, - true, - true - ] - } - ] - ] - }, - "layout": {} - }, - { - "text": "{{property_details_header}}", - "style": "header" - }, - { - "style": "ws-table", - "table": { - "widths": [ - "103%" - ], - "body": [ - [ - { - "table": { - "widths": [ - "25%", - "25%", - "25%", - "25%" - ], - "body": [ - [ - { - "text": "{{property_type}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{property_usage_type}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{plot_size}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": " ", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - } - ], - [ - { - "text": "{{propertyType}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{propertyUsageType}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{plotSize}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": " ", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - } - ], - [ - { - "text": "{{property_ID}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{city_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{plot_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{building_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - } - ], - [ - { - "text": "{{propertyID}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{city}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{plot}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{building}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - } - ], - [ - { - "text": "{{street_name}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{locality_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{pincode_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{location_on_map}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - } - ], - [ - { - "text": "{{streetName}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{locality}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{pincode}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{lat}} {{long}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - } - ] - ] - }, - "border": [ - true, - true, - true, - true - ] - } - ] - ] - }, - "layout": {} - }, - { - "text": "{{owner_details_header}}", - "style": "header" - }, - { - "style": "ws-table", - "table": { - "widths": [ - "103%" - ], - "body": [ - [ - { - "table": { - "widths": [ - "25%", - "25%", - "25%", - "25%" - ], - "body": [ - [ - { - "text": "{{owner_mobile_number}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{owner_name}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{gender_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{guardian_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - } - ], - [ - { - "text": "{{ownerMobileNumber}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{ownerName}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{gender}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{guardian}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - } - ], - [ - { - "text": "{{guardian_name}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{owner_category}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{email_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{correspondence_address}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - } - ], - [ - { - "text": "{{guardianName}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{ownerCategory}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{email}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - }, - { - "text": "{{correspondenceAddress}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table-value" - } - ] - ] - }, - "border": [ - true, - true, - true, - true - ] - } - ] - ] - }, - "layout": {} - }, - { - "image": "{{footerLogoImage}}", - "width": 75, - "height": 10, - "alignment": "center", - "margin": [ - -12, - -10, - -230, - 0 - ] - } - ], - "styles": { - "ws-head": { - "fillColor": "#F2F2F2", - "margin": [ - -39, - -38, - -38, - 0 - ] - }, - "receipt-logo-header": { - "color": "#000000", - "fontFamily": "Cambay", - "fontSize": 14, - "bold": true, - "letterSpacing": 0.74, - "margin": [ - 0, - -10, - 0, - 5 - ] - }, - "ws-table": { - "fontSize": 12, - "color": "#484848", - "margin": [ - -25, - 8, - -8, - 4 - ] - }, - "header": { - "color": "#000000", - "textTransform": "uppercase", - "bold": true, - "fontSize": 12, - "fontWeight": 500, - "margin": [ - -25, - 12, - 0, - -10 - ] - }, - "ws-sub-table-value": { - "color": "#000000", - "bold": true, - "fontSize": 12, - "fontWeight": 500, - "margin": [ - 3, - 0, - 0, - 2 - ] - }, - "ws-sub-table": { - "color": "#484848", - "bold": true, - "fontSize": 12, - "fontWeight": 400, - "margin": [ - 3, - 2, - 0, - 0 - ] - }, - "qr-image": { - "margin": [ - -40, - -1, - -3, - 0 - ], - "color": "#484848", - "alignment": "right", - "backgroundColor": "#dddddd" - } - } - } -} diff --git a/configs/pdf-service/format-config/ws-estimationnotice.json b/configs/pdf-service/format-config/ws-estimationnotice.json deleted file mode 100644 index 58ff0307..00000000 --- a/configs/pdf-service/format-config/ws-estimationnotice.json +++ /dev/null @@ -1,734 +0,0 @@ -{ - "key": "ws-estimationnotice", - "config": { - "defaultStyle": { - "font": "Cambay" - }, - "watermark": { - "text": "DIGIT UAT DIGIT UAT", - "color": "gery", - "opacity": 0.1, - "bold": true, - "italics": false - }, - "content": [ - { - "style": "ws-head", - "table": { - "widths": [ - 60, - "*", - 120 - ], - "body": [ - [ - { - "image": "{{logoImage}}", - "width": 55, - "height": 61.25, - "margin": [ - 12, - 10, - 12, - 10 - ] - }, - { - "stack": [ - { - "text": "{{tenantName}} - {{UAT}} (Digit UAT)", - "style": "receipt-logo-header", - "margin": [ - 0, - 0, - 0, - 20 - ] - }, - { - "text": "{{estimation_notice_header}} {{service}} {{connection_header}}", - "style": "receipt-logo-header" - } - ], - "alignment": "center", - "margin": [ - 10, - 30, - 0, - 0 - ] - } - ] - ] - }, - "layout": "noBorders" - }, - { - "style": "ws-table-property", - "table": { - "widths": [ - "103%" - ], - "body": [ - [ - { - "table": { - "widths": [ - "16%", - "44%", - "18%", - "22%" - ], - "body": [ - [ - { - "text": "{{app_no}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": ": {{appNo}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{app_date}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": ": {{appDate}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - } - ], - [ - { - "text": "{{user_name}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": ": {{name}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{guardian_name}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": ": {{guardianName}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - } - ], - [ - { - "text": "{{usage_type}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": ": {{usageType}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": "{{mobile_no}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": ": {{mobileNumber}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - } - ], - [ - { - "text": "{{house_no}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": ": {{houseNo}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": " ", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": " ", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - } - ], - [ - { - "text": "{{user_address}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": ": {{address}}, PIN:{{pincode}}", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": " ", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - }, - { - "text": " ", - "border": [ - false, - false, - false, - false - ], - "style": "ws-sub-table" - } - ] - ] - }, - "border": [ - false, - false, - false, - false - ] - } - ] - ] - }, - "layout": {} - }, - { - "text": "{{estimation_header}} {{service}} {{connection_header}}", - "style": "receipt-logo-header", - "alignment": "center" - }, - { - "image": "{{footerLogoImage}}", - "width": 55, - "height": 61.25, - "margin": [ - 12, - 10, - 12, - 10 - ], - "alignment": "center" - }, - { - "style": "ws-table-property", - "table": { - "widths": [ - "*" - ], - "body": [ - [ - { - "table": { - "widths": [ - "auto", - "*", - "*" - ], - "body": [ - [ - { - "text": "{{sl_no}}", - "alignment": "center" - }, - { - "text": "{{fee_estimate}}", - "alignment": "center" - }, - { - "text": "{{amount}}", - "alignment": "center" - } - ], - [ - { - "text": "1.", - "alignment": "center" - }, - { - "text": "{{form_fee}}" - }, - { - "text": "{{formFee}}", - "alignment": "right" - } - ], - [ - { - "text": "2.", - "alignment": "center" - }, - { - "text": "{{scrutiny_fee}}" - }, - { - "text": "{{ScrutinyFee}}", - "alignment": "right" - } - ], - [ - { - "text": "3.", - "alignment": "center" - }, - { - "text": "{{one_time_fee}}" - }, - { - "text": "{{oneTimeFee}}", - "alignment": "right" - } - ], - [ - { - "text": "4.", - "alignment": "center" - }, - { - "text": "{{other_charge}}" - }, - { - "text": "{{otherCharge}}", - "alignment": "right" - } - ], - [ - { - "text": "5.", - "alignment": "center" - }, - { - "text": "{{road_charge}}" - }, - { - "text": "{{roadCharge}}", - "alignment": "right" - } - ], - [ - { - "text": "6.", - "alignment": "center" - }, - { - "text": "{{security_charge}}" - }, - { - "text": "{{securityCharge}}", - "alignment": "right" - } - ], - [ - { - "text": "7.", - "alignment": "center" - }, - { - "text": "{{tax_cess}}" - }, - { - "text": "{{taxCess}}", - "alignment": "right" - } - ], - [ - { - "text": "8.", - "alignment": "center" - }, - { - "text": "{{penalty}}" - }, - { - "text": "{{penaltyAmount}}", - "alignment": "right" - } - ], - [ - { - "text": "9.", - "alignment": "center" - }, - { - "text": "{{rebate}}" - }, - { - "text": "{{rebateAmount}}", - "alignment": "right" - } - ], [ - { - "text": "10.", - "alignment": "center" - }, - { - "text": "Connection Fee" - }, - { - "text": "{{connectionFee}}", - "alignment": "right" - } - ],[ - { - "text": "11.", - "alignment": "center" - }, - { - "text": "Composition Fee" - }, - { - "text": "{{compositionFee}}", - "alignment": "right" - } - ],[ - { - "text": "12.", - "alignment": "center" - }, - { - "text": "User Charges" - }, - { - "text": "{{userCharges}}", - "alignment": "right" - } - ], - [ - { - "text": "(+)", - "alignment": "center" - }, - { - "text": "{{comments}}" - }, - { - "text": "{{penaltyComments}}", - "alignment": "right" - } - ], - [ - { - "text": " " - }, - { - "text": "{{grand_total}}" - }, - { - "text": "{{totalAmount}}", - "alignment": "right" - } - ] - ] - }, - "border": [ - false, - false, - false, - false - ] - } - ] - ] - }, - "layout": {} - }, - { - "text": "{{approved_by}}", - "alignment": "right" - }, - { - "image": "{{footerLogoImage}}", - "width": 75, - "height": 10, - "alignment": "center", - "margin": [ - -12, - -10, - -230, - 0 - ] - } - ], - "styles": { - "ws-head": { - "margin": [ - -39, - -38, - -38, - 0 - ] - }, - "receipt-logo-header": { - "color": "#000000", - "fontFamily": "Cambay", - "fontSize": 14, - "bold": true, - "letterSpacing": 0.74, - "margin": [ - 0, - -10, - 0, - 5 - ] - }, - "ws-table": { - "fontSize": 12, - "color": "#484848", - "margin": [ - -25, - 18, - -8, - 10 - ] - }, - "ws-table-property": { - "fontSize": 12, - "color": "#484848", - "margin": [ - -25, - 18, - -8, - 50 - ] - }, - "header": { - "color": "#000000", - "textTransform": "uppercase", - "bold": true, - "fontSize": 10, - "fontWeight": 500, - "margin": [ - -25, - 15, - 0, - -10 - ] - }, - "ws-sub-table-value": { - "color": "#000000", - "fontSize": 10, - "fontWeight": 500 - }, - "ws-sub-table": { - "color": "#000000", - "bold": true, - "fontSize": 10, - "fontWeight": 400, - "margin": [ - 3, - 8, - 0, - 0 - ] - }, - "qr-image": { - "margin": [ - -40, - -1, - -3, - 0 - ], - "color": "#484848", - "alignment": "right", - "backgroundColor": "#dddddd" - }, - "receipt-table-value": { - "color": "#000000", - "bold": true, - "fontSize": 10, - "fontWeight": 500, - "margin": [ - 5, - 5, - 0, - 0 - ] - }, - "receipt-table-value-total": { - "color": "#000000", - "bold": true, - "fontSize": 10, - "fontWeight": 500, - "alignment": "right", - "margin": [ - 0, - 5, - 30, - 0 - ] - }, - "receipt-table-value-down": { - "color": "#000000", - "bold": false, - "fontSize": 10, - "fontWeight": 400, - "alignment": "left", - "margin": [ - 3, - 5, - 0, - 5 - ] - }, - "receipt-table-value2": { - "color": "#000000", - "bold": false, - "fontSize": 10, - "fontWeight": 500, - "margin": [ - 3, - 0, - 0, - 0 - ] - }, - "receipt-table-value-cont": { - "color": "#000000", - "bold": false, - "fontSize": 10, - "fontWeight": 400, - "margin": [ - 3, - 0, - 0, - 0 - ] - }, - "receipt-table": { - "color": "#484848", - "bold": true, - "fontSize": 10, - "fontWeight": 400, - "margin": [ - -30, - 5, - 0, - 0 - ] - }, - "receipt-table2": { - "color": "#000000", - "bold": true, - "fontSize": 10, - "fontWeight": 500, - "margin": [ - 3, - 0, - 0, - 0 - ] - } - } - } -} diff --git a/configs/pdf-service/format-config/ws-onetime-receipt.json b/configs/pdf-service/format-config/ws-onetime-receipt.json deleted file mode 100644 index 8e957540..00000000 --- a/configs/pdf-service/format-config/ws-onetime-receipt.json +++ /dev/null @@ -1,881 +0,0 @@ -{ - "key": "ws-onetime-receipt", - "config": { - "defaultStyle": { - "font": "Cambay" - }, - "content": [ - { - "style": "noc-head", - "table": { - "widths": [ - 60, - "*", - 120 - ], - "body": [ - [ - { - "image": "{{logoImage}}", - "width": 60, - "height": 61.25 - }, - { - "stack": [ - { - "text": "{{logo-header}}{{mcGrade}}", - "style": "receipt-logo-header" - }, - { - "text": "{{serviceType}} {{payment_receipt}}(Employee Copy)", - "style": "receipt-logo-sub-header" - } - ], - "alignment": "left", - "margin": [ - 0, - 7, - 0, - 0 - ] - }, - { - "stack": [ - { - "text": "{{address}}" - }, - { - "text": "{{phoneNumber}}" - }, - { - "text": "{{website}}" - }, - { - "text": "{{email}}" - } - ], - "alignment": "right", - "color": "#484848", - "margin": [ - -100, - 0, - -25, - 0 - ] - } - ] - ] - }, - "layout": "noBorders" - }, - { - "style": "noc-table", - "table": { - "widths": [ - "34%", - "18%", - "36%", - "12%" - ], - "body": [ - [ - { - "text": "{{receipt_no}}.", - "border": [ - true, - true, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{receiptNo}}", - "border": [ - false, - true, - false, - false - ], - "style": "receipt-table", - "font": "Roboto" - }, - { - "text": "{{consumer_id}}", - "border": [ - false, - true, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{consumerID}}", - "border": [ - false, - true, - true, - false - ], - "style": "receipt-table", - "font": "Roboto" - } - ], - [ - { - "text": "{{payment_date}}", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{paymentDate}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "{{payer_name}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{payerName}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": "{{payer_contact}}", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{payerContact}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "Payment Mode", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{paymentMode}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": "Chq/DD/PO/Txn Date", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{chequeDD}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "Chq/DD/PO/Txn Date", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{chequeDDDate}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - - } - ], - [ - { - "text": "Bank Name", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{bankName}},{{branchName}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "IFSC Code", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{ifsc}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - - } - ] - - ] - }, - "layout": {} - }, - { - "style": "next-noc-table", - "table": { - "widths": [ - "65%", - "35%" - ], - "body": - [ - [ - { - "text": "Description Head of A/C", - "style": "receipt-table-value22" - },{ - "text": "Amount(in Rupees)", - "style": "receipt-table-value22" - } - ], - "{{#var_paymentheads}}[{\"text\":\"{{taxheaddd}}\",\"style\":\"receipt-tableee\",\"alignment\":\"left\"},{\"text\":\"{{amountt}}\",\"style\":\"receipt-tableee\",\"alignment\":\"right\"}]{{/var_paymentheads}}" - ] - - - }, - "layout": {} - }, - { - "style": "receipt-approver", - "columns": [ - { - "text": [ - { - "text": "{{generated_by}}: ", - "bold": true - }, - { - "text": "{{user-name}}", - "bold": false - } - ], - "alignment": "left" - }, - { - "text": [ - { - "text": "{{commissioner/eo}}", - "bold": true - } - ], - "alignment": "right", - "margin": [ - 0, - 0, - -10, - 1 - ] - } - ] - }, - { - "style": "no-signature", - "text": "{{no_signature}}" - }, - { - "text":"-----------------------------x-----------------------------x-----------------------------x-----------------------------x-----------------------------", - "style":"next-noc-table2", - "alignment":"center" - - }, - { - "text":" ", - "style":"next-noc-table2" - - }, - { - "text":" ", - "style":"next-noc-table2" - - }, - { - "style": "noc-head", - "table": { - "widths": [ - 60, - "*", - 120 - ], - "body": [ - [ - { - "image": "{{logoImage}}", - "width": 60, - "height": 61.25 - }, - { - "stack": [ - { - "text": "{{logo-header}} {{Municipal_Corporation}}", - "style": "receipt-logo-header" - }, - { - "text": "{{serviceType}} {{payment_receipt}}(Citizen Copy)", - "style": "receipt-logo-sub-header" - } - ], - "alignment": "left", - "margin": [ - 13, - 7, - 0, - 0 - ] - }, - { - "stack": [ - { - "text": "{{address}}" - }, - { - "text": "{{phoneNumber}}" - }, - { - "text": "{{website}}" - }, - { - "text": "{{email}}" - } - ], - "alignment": "right", - "color": "#484848", - "margin": [ - -100, - 0, - -25, - -3 - ] - } - ] - ] - }, - "layout": "noBorders" - }, - { - "style": "noc-table", - "table": { - "widths": [ - "34%", - "16%", - "36%", - "14%" - ], - "body": [ - [ - { - "text": "{{receipt_no}}.", - "border": [ - true, - true, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{receiptNo}}", - "border": [ - false, - true, - false, - false - ], - "style": "receipt-table", - "font": "Roboto" - }, - { - "text": "{{consumer_id}}", - "border": [ - false, - true, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{consumerID}}", - "border": [ - false, - true, - true, - false - ], - "style": "receipt-table", - "font": "Roboto" - } - ], - [ - { - "text": "{{payment_date}}", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{paymentDate}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "{{payer_name}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{payerName}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": "{{payer_contact}}", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{payerContact}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "Payment Mode", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{paymentMode}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - } - ], - [ - { - "text": "Chq/DD/PO/Txn Date", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{chequeDD}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "Chq/DD/PO/Txn Date", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{chequeDDDate}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - - } - ], - [ - { - "text": "Bank Name", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{bankName}},{{branchName}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "IFSC Code", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{ifsc}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - - } - ] - - ] - }, - "layout": {} - }, - { - "style": "next-noc-table", - "table": { - "widths": [ - "65%", - "35%" - ], - "body": - [ - [ - { - "text": "Description Head of A/C", - "style": "receipt-table-value22" - },{ - "text": "Amount(in Rupees)", - "style": "receipt-table-value22" - } - ], - "{{#var_paymentheads}}[{\"text\":\"{{taxheaddd}}\",\"style\":\"receipt-tableee\",\"alignment\":\"left\"},{\"text\":\"{{amountt}}\",\"style\":\"receipt-tableee\",\"alignment\":\"right\"}]{{/var_paymentheads}}" - ] - - - }, - "layout": {} - }, - { - "style": "receipt-approver", - "columns": [ - { - "text": [ - { - "text": "{{generated_by}}: ", - "bold": true - }, - { - "text": "{{user-name}}", - "bold": false - } - ], - "alignment": "left" - }, - { - "text": [ - { - "text": "{{commissioner/eo}}", - "bold": true - } - ], - "alignment": "right", - "margin": [ - 0, - 0, - -10, - 1 - ] - } - ] - }, - { - "style": "no-signature", - "text": "{{no_signature}}" - } - ], - "styles": { - "noc-head": { - "margin": [ - -30, - -30, - 0, - 0 - ] - }, - "receipt-table-value22": { - "color": "#000000", - "bold": true, - "fontSize": 10, - "fontWeight": 500, - "backgroundColor": "#D3D3D3", - "margin": [ - 8, - 0, - 0, - 0 - ] - }, - "receipt-logo-header": { - "color": "#000000", - "fontSize": 14, - "bold": true, - "letterSpacing": 0.74, - "margin": [ - 0, - 0, - 0, - 2 - ] - }, - "receipt-logo-sub-header": { - "color": "#000000", - "fontSize": 12, - "letterSpacing": 0.6 - }, - "noc-table": { - "fontSize": 12, - "color": "#000000", - "margin": [ - -25, - 7, - -22, - -8 - ] - }, - "next-noc-table": { - "fontSize": 12, - "color": "#000000", - "margin": [ - -25, - 7, - -22, - -8 - ] - }, - "next-noc-table2": { - "fontSize": 8, - "color": "#000000", - "margin": [ - -25, - 0, - -22, - 0 - ] - }, - "receipt-table-value": { - "color": "#000000", - "bold": true, - "fontSize": 10, - "fontWeight": 500, - "margin": [ - 8, - 0, - 0, - 0 - ] - }, - "receipt-tableee": { - "color": "#000000", - "bold": false, - "fontSize": 10, - "fontWeight": 400, - "margin": [ - 8, - 0, - 0, - 0 - ] - }, - "receipt-table": { - "color": "#000000", - "bold": false, - "fontSize": 10, - "fontWeight": 400, - "margin": [ - -30, - 0, - 0, - 0 - ] - }, - "receipt-approver": { - "fontSize": 8, - "bold": true, - "margin": [ - -27, - 10, - -10, - 0 - ], - "color": "#484848" - }, - "no-signature": { - "fontSize": 8, - "margin": [ - -27, - 1, - -10, - 0 - ], - "color": "#484848" - }, - "pt-disclaimer": { - "fontSize": 12, - "margin": [ - -27, - 30, - -10, - 0 - ], - "color": "#484848" - }, - "pt-disclaimer-value": { - "fontSize": 12, - "margin": [ - 2, - 5, - 0, - 0 - ], - "color": "#484848" - } - } - } -} diff --git a/configs/pdf-service/format-config/ws-sanctionletter.json b/configs/pdf-service/format-config/ws-sanctionletter.json deleted file mode 100644 index 24ea98ec..00000000 --- a/configs/pdf-service/format-config/ws-sanctionletter.json +++ /dev/null @@ -1,655 +0,0 @@ -{ - "key": "ws-sanctionletter", - "config": { - "defaultStyle": { - "font": "Cambay" - }, - "watermark": { - "text": "DIGIT UAT DIGIT UAT", - "color": "gery", - "opacity": 0.1, - "bold": true, - "italics": false - }, - "content": [ - { - "style": "ws-head", - "table": { - "widths": [ - 60, - "*", - 120 - ], - "body": [ - [ - { - "image": "{{logoImage}}", - "width": 60, - "height": 61.25, - "margin": [ - 50, - 30, - 12, - 10 - ] - }, - { - "stack": [ - { - "text": "{{mcGrade}} (Digit UAT)", - "style": "receipt-logo-header", - "margin": [ - 0, - 0, - 0, - 10 - ] - }, - { - "text": "{{tenantName}} (Digit UAT)", - "style": "receipt-logo-header" - }, - { - "text": "{{sanctionLetter}}", - "style": "receipt-logo-header" - } - ], - "alignment": "center", - "margin": [ - 90, - 30, - 0, - 0 - ] - } - ] - ] - }, - "layout": "noBorders" - }, - { - "style": "ws-table-property", - "table": { - "widths": [ - "103%" - ], - "body": [ - [ - { - "border": [ - false, - false, - false, - false - ], - "columns": [ - { - "width": "auto", - "text": "{{date_label}}", - "style": "ws-sub-header", - "alignment": "right" - }, - { - "width": "auto", - "text": "{{sanctionLetterDate}}", - "alignment": "right", - "style": "ws-sub-data" - } - ] - } - ], - [ - { - "border": [ - false, - false, - false, - false - ], - "columns": [ - { - "width": "20%", - "text": "{{sub_label}}", - "style": "receipt-value-down-sub" - }, - { - "width": "80%", - "text": "{{applicationType}} {{sub_data1}} {{applicationType}} {{sub_data2}} {{doorNo}} {{locality_label}} {{locality}} {{order_issued}} ", - "style": "receipt-value-down" - } - ], - "margin": [ - 50, - 10, - 0, - 0 - ] - } - ], - [ - { - "border": [ - false, - false, - false, - false - ], - "columns": [ - { - "width": "20%", - "text": "{{ref_label}}", - "style": "receipt-value-down-sub" - }, - { - "width": "80%", - "ol": [ - { - "text": "{{ref_message1}} {{ownerName}} {{doorNo}} {{locality_label}} {{locality}} {{dated_label}} {{appCreatedDate}}", - "style": "receipt-value-down" - }, - { - "text": "{{ref_message2}}{{applicationNumber}} {{dated_label}} {{estimationLetterDate}}", - "style": "receipt-value-down" - } - ] - } - ], - "margin": [ - 50, - 10, - 0, - 0 - ] - } - ], - [ - { - "border": [ - false, - false, - false, - false - ], - "columns": [ - { - "width": "100%", - "text": "{{order_label}}", - "style": "receipt-value-down-sub" - } - ], - "margin": [ - 25, - 10, - 0, - 0 - ] - } - ], - [ - { - "border": [ - false, - false, - false, - false - ], - "columns": [ - { - "width": "100%", - "text": "{{in_ref_label}} {{applicationNumber}} {{dated}} {{appCreatedDate}} {{order_message2}} {{applicationType}} {{order_message3}} {{door_no}} {{doorNo}} {{locality_label}} {{locality}}{{order_message4}} {{totalAmount}} {{order_message5}} {{applicationType}} {{order_message6}} {{totalAmount}} {{dated}} {{sanctionLetterDate}} {{order_message7}}", - "style": "receipt-value-down" - } - ], - "margin": [ - 50, - 10, - 0, - 0 - ] - } - ], - [ - { - "border": [ - false, - false, - false, - false - ], - "columns": [ - { - "width": "100%", - "text": "{{order_message12}} {{plumberName}}{{order_message13}} {{licenceNo}}{{order_message14}} {{contactNo}}{{order_message10}} 10 {{order_message15}} {{slaDate}}{{order_message11}}", - "style": "receipt-value-down" - } - ], - "margin": [ - 50, - 10, - 0, - 0 - ] - } - ], - [ - { - "stack": [ - { - "text": "{{for_commissioner_label}}", - "style": "receipt-table-value-total", - "fontSize": 12 - } - ], - "border": [ - false, - false, - false, - false - ], - "margin": [ - 40, - 60, - 0, - 0 - ] - } - ], - [ - { - "stack": [ - { - "table": { - "widths": [ - "10%", - "40%" - ], - "body": [ - [ - { - "text": "{{to_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-value-down-sub" - }, - { - "text": " ", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-value-down-sub" - } - ], - [ - { - "text": "{{sri_smt_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-value-down-sub" - }, - { - "text": "{{ownerName}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-value-down-sub" - } - ], - [ - { - "text": "{{door_no_label}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-value-down-sub" - }, - { - "text": "{{doorNo}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-value-down-sub" - } - ] - ] - } - }, - [ - { - "border": [ - false, - false, - false, - false - ], - "columns": [ - { - "width": "auto", - "text": "{{app_no}}", - "style": "receipt-value-down-sub" - }, - { - "width": "2%", - "text": ":" - }, - { - "width": "40%", - "text": "{{applicationNumber}}", - "style": "receipt-value-down-sub" - } - ], - "margin": [ - 0, - 10, - 0, - 0 - ] - } - ] - ], - "border": [ - false, - false, - false, - false - ], - "margin": [ - 20, - 5, - 0, - 0 - ] - } - ] - ] - }, - "layout": {} - }, - { - "text": "{{approved_by}}", - "alignment": "center", - "style": "receipt-down-footer" - }, - { - "image": "{{footerLogoImage}}", - "width": 75, - "height": 10, - "alignment": "center", - "margin": [ - -12, - -10, - -230, - 0 - ] - } - ], - "styles": { - "ws-head": { - "margin": [ - -39, - -38, - -38, - 0 - ] - }, - "receipt-down-footer": { - "color": "#FF0000", - "fontFamily": "Cambay", - "fontSize": 14, - "bold": true, - "letterSpacing": 0.74, - "margin": [ - 0, - -10, - 0, - 5 - ] - }, - "ws-consumer-sub-header": { - "color": "#000000", - "fontSize": 12, - "fontWeight": 500 - }, - "receipt-value-down": { - "color": "#000000", - "bold": false, - "fontSize": 10, - "fontWeight": 400, - "alignment": "left", - "margin": [ - -8, - 0, - 0, - 5 - ] - }, - "receipt-value-down-sub": { - "color": "#000000", - "bold": true, - "fontSize": 10, - "fontWeight": 400, - "alignment": "left", - "margin": [ - 10, - 0, - 0, - 1 - ] - }, - "ws-sub-header": { - "color": "#000000", - "bold": true, - "fontSize": 10, - "fontWeight": 500, - "margin": [ - 380, - 10, - 10, - 10 - ] - }, - "ws-order-header": { - "color": "#000000", - "bold": true, - "fontSize": 10, - "fontWeight": 500, - "margin": [ - 10, - 10, - 10, - 10 - ] - }, - "receipt-logo-header": { - "color": "#000000", - "fontFamily": "Cambay", - "fontSize": 14, - "bold": true, - "letterSpacing": 0.74, - "margin": [ - 10, - -8, - 20, - 10 - ] - }, - "ws-table": { - "fontSize": 12, - "color": "#484848", - "margin": [ - -25, - 18, - -8, - 10 - ] - }, - "ws-table-property": { - "fontSize": 12, - "color": "#484848", - "margin": [ - -25, - 18, - -8, - 50 - ] - }, - "header": { - "color": "#000000", - "textTransform": "uppercase", - "bold": true, - "fontSize": 12, - "fontWeight": 500, - "margin": [ - -25, - 15, - 0, - -10 - ] - }, - "ws-sub-table-value": { - "color": "#000000", - "fontSize": 12, - "fontWeight": 500 - }, - "ws-sub-table": { - "color": "#000000", - "bold": true, - "fontSize": 12, - "fontWeight": 400, - "margin": [ - 3, - 8, - 0, - 0 - ] - }, - "ws-sub-data": { - "color": "#000000", - "fontSize": 10, - "fontWeight": 400, - "margin": [ - -5, - 10, - 10, - 10 - ] - }, - "qr-image": { - "margin": [ - -40, - -1, - -3, - 0 - ], - "color": "#484848", - "alignment": "right", - "backgroundColor": "#dddddd" - }, - "receipt-table-value": { - "color": "#000000", - "bold": true, - "fontSize": 12, - "fontWeight": 500, - "margin": [ - 5, - 5, - 0, - 0 - ] - }, - "receipt-table-value-total": { - "color": "#000000", - "bold": true, - "fontSize": 12, - "fontWeight": 500, - "alignment": "right", - "margin": [ - 0, - 5, - 30, - 0 - ] - }, - "receipt-table-value-down": { - "color": "#000000", - "bold": false, - "fontSize": 12, - "fontWeight": 400, - "alignment": "left", - "margin": [ - 3, - 5, - 0, - 5 - ] - }, - "receipt-table-value2": { - "color": "#000000", - "bold": false, - "fontSize": 12, - "fontWeight": 500, - "margin": [ - 3, - 0, - 0, - 0 - ] - }, - "receipt-table-value-cont": { - "color": "#000000", - "bold": false, - "fontSize": 11, - "fontWeight": 400, - "margin": [ - 3, - 0, - 0, - 0 - ] - }, - "receipt-table": { - "color": "#484848", - "bold": true, - "fontSize": 12, - "fontWeight": 400, - "margin": [ - -30, - 5, - 0, - 0 - ] - }, - "receipt-table2": { - "color": "#000000", - "bold": true, - "fontSize": 12, - "fontWeight": 500, - "margin": [ - 3, - 0, - 0, - 0 - ] - } - } - } -} diff --git a/configs/reports/configs/asset-reports.yml b/configs/reports/configs/asset-reports.yml deleted file mode 100644 index 5e38d058..00000000 --- a/configs/reports/configs/asset-reports.yml +++ /dev/null @@ -1,1522 +0,0 @@ ---- -ReportDefinitions: -- reportName: AssetImmovableRegister - summary: Immovable Asset Register Report - version: 1.0.0 - moduleName: asset - viewPath: assetImmovableReport - selectiveDownload: true - externalService: - - entity: $.MdmsRes.ASSET.AssetCategory - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=ASSET&masterName=AssetCategory&tenantId=$tenantid&filter=%5B%3F%28+%40.assetCategoryType%3D%3D%27IMMOVABLE%27++%26%26+%40.isAssetAllow%3D%3Dtrue%29%5D - keyOrder: id,name,depreciationRate,parent,tenantId - tableName: tbl_assetsubcategory - stateData: true - - entity: $.MdmsRes.ASSET.AssetCategory - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=ASSET&masterName=AssetCategory&tenantId=$tenantid&filter=%5B%3F%28+%40.assetCategoryType%3D%3D%27IMMOVABLE%27++%26%26+%40.isAssetAllow%3D%3Dfalse%29%5D - keyOrder: id,name,tenantId - tableName: tbl_assetcategory - stateData: true - sourceColumns: - - name: name - label: reports.asset.name - type: string - source: asset - - name: code - label: reports.asset.code - type: string - linkedReport: - reportName: AssetImmovableRegisterDetail - linkedColumn: _parent?reportName={reportName}&assetdetail={code} - source: asset - - name: dateofcreation - label: reports.asset.dateofcreation - type: epoch - source: asset - - name: grossvalue - label: reports.asset.grossvalue - type: number - source: asset - - name: originalvalue - label: reports.asset.originalvalue - type: number - source: asset - searchParams: - - name: assetcategory - label: reports.asset.assetCategory - isMandatory: false - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=ASSET&masterName=AssetCategory&tenantId=$tenantid&filter=%5B%3F(%20%40.assetCategoryType%3D%3D%27IMMOVABLE%27%20%26%26%20%40.isAssetAllow%3D%3Dfalse)%5D|$.MdmsRes.ASSET.AssetCategory.*.id|$.MdmsRes.ASSET.AssetCategory.*.name - source: asset - stateData: true - wrapper: true - searchClause : AND assetsubcategory.assetsubcategoryparent =$assetcategory - - name: assetsubcategory - label: reports.asset.assetSubCategory - isMandatory: false - type: url - pattern: /egov-mdms-service/v1/_get?moduleName=ASSET&masterName=AssetCategory&tenantId=$tenantid&filter=%5B%3F(%20%40.parent%3D%3D{assetcategory})%5D|$.MdmsRes.ASSET.AssetCategory.*.id|$.MdmsRes.ASSET.AssetCategory.*.name - source: asset - stateData: true - wrapper: true - searchClause : AND asset.assetcategory=$assetsubcategory - - name: department - label: reports.asset.departmentCode - isMandatory: false - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=common-masters&masterName=Department&tenantId=$tenantid|$..code|$..name - source: asset - stateData: true - wrapper: true - searchClause : AND asset.departmentcode=$department - - name: code - label: reports.asset.code - type: string - isMandatory: false - source: asset - searchClause : AND asset.code in ($code) - - name: name - label: reports.asset.name - type: string - isMandatory: false - source: asset - searchClause : AND asset.name ilike $name - - name: originalvaluefrom - label: reports.asset.originalvaluefrom - type: number - source: asset - searchClause : AND asset.originalvalue>=$originalvaluefrom - isMandatory: false - - name: originalvalueto - label: reports.asset.originalvalueto - type: number - source: asset - searchClause : AND asset.originalvalue<=$originalvalueto - isMandatory: false - - name: fromDate - label: reports.asset.fromDate - type: date - source: asset - searchClause : AND asset.createddate>=$fromDate - isMandatory: false - - name: toDate - label: reports.asset.toDate - type: date - source: asset - searchClause : AND asset.createddate<=$toDate - isMandatory: false - - - - - query: select asset.name,asset.code,asset.ordernumber,asset.warrantyavailable,asset.wipreferenceno,asset.titledocumentsavailable as titledocumentsavailable, - asset.accumulateddepreciation,asset.grossvalue,asset.id,asset.quantity,asset.totalarea,asset.openingdate,asset.fundsource, - asset.location,(select string_agg(land.surveynumber,',') from egasset_asset_landdetails land where land.isenabled=true and asset.id=land.assetid group by asset.id) as - totalsurveyno,asset.acquiredfrom,asset.anticipatedLife,asset.modeofacquisition,asset.warrantyexpirydate,asset.defectliabilityyear as - defectliability,asset.defectliabilitymonth as defectliabilitymonth,asset.assetCategoryType,asset.defectliabilityday as defectliabilityday, - asset.securitydepositretained,asset.securitydepositrealized,asset.dateofcreation,asset.acquisitiondate,asset.grossvalue,asset.originalvalue, - currentvalue.currentamount,disposal.salevalue as disposalsalevalue,disposal.profitlossvoucherreference as disposalvoucherno,disposal.disposaldate, - disposal.buyername,disposal.buyeraddress,revaluation.revaluationdate,revaluation.incrementalrevalsum,revaluation.decrementalrevalsum, - depreciation.depreciationvalue,depreciation.totaldepreciationval,assetsubcategoryname,assetSubCategory.depreciationrate,assetsubcategoryparent, - assetparentcategoryname from egasset_asset asset left outer join (select b.* from egasset_current_value b inner join ( select assetid,tenantid, - max(createdtime) as createdtime from egasset_current_value where tenantid = $tenantid group by assetid,tenantid) c ON b.assetid = c.assetid - and b.tenantid=c.tenantid AND c.createdtime=b.createdtime) currentvalue ON asset.id=currentvalue.assetid AND asset.tenantid=currentvalue.tenantid - left outer join egasset_disposal disposal ON asset.id=disposal.assetid AND asset.tenantId = disposal.tenantid left outer join - ( select dep1.*,depsum.totaldepreciationval from egasset_depreciation dep1 inner join (select assetid,tenantid,max(createdtime) as createdtime - from egasset_depreciation where tenantid = $tenantid group by assetid,tenantid ) depmax ON dep1.assetid=depmax.assetid AND - dep1.tenantid=depmax.tenantid AND dep1.createdtime=depmax.createdtime inner join (select assetid,tenantid,sum(depreciationvalue) as - totaldepreciationval from egasset_depreciation where tenantid = $tenantid group by assetid,tenantid) depsum ON dep1.assetid=depsum.assetid - AND dep1.tenantid=depsum.tenantid ) depreciation ON asset.id=depreciation.assetid AND asset.tenantid=depreciation.tenantid left outer join - (select rev1.*,revinc.incrementalrevalsum,revdec.decrementalrevalsum from egasset_revaluation rev1 inner join (select assetid,tenantid,max(createddate) - as createddate from egasset_revaluation where tenantid = $tenantid group by assetid,tenantid ) revalmax ON rev1.assetid=revalmax.assetid AND - rev1.tenantid=revalmax.tenantid AND rev1.createddate=revalmax.createddate left outer join (select assetid,tenantid,sum(revaluationamount) as - incrementalrevalsum from egasset_revaluation where tenantid = $tenantid AND typeofchange='INCREASED' group by assetid,tenantid) revinc - ON rev1.assetid=revinc.assetid and rev1.tenantid=revinc.tenantid left outer join (select assetid,tenantid,sum(revaluationamount) as decrementalrevalsum - from egasset_revaluation where tenantid = $tenantid AND typeofchange='DECREASED' group by assetid,tenantid) revdec - ON rev1.assetid=revdec.assetid and rev1.tenantid=revdec.tenantid where rev1.tenantid = $tenantid) revaluation - ON asset.tenantid=revaluation.tenantid AND asset.id=revaluation.assetid - left outer join ( select assetSubcategory.name assetsubcategoryname,assetSubcategory.depreciationrate as depreciationrate, - assetSubcategory.parent as assetsubcategoryparent,assetSubcategory.tenantid as tenantid,assetSubcategory.id assetsubcategoryid, - ac.name as assetparentcategoryname,ac.id assetparentcategoryid from (VALUES tbl_assetsubcategory) as assetSubcategory (id,name,depreciationRate,parent,tenantId) - inner join (VALUES tbl_assetcategory) as ac (id,name,tenantId) ON assetSubcategory.parent = ac.id ) as - assetsubcategory ON asset.assetcategory::character varying=assetsubcategory.assetsubcategoryid - where asset.tenantid = $tenantid AND asset.assetCategoryType='IMMOVABLE' - - -- reportName: AssetImmovableRegisterDetail - summary: Immovable Asset Register Report - version: 1.0.0 - moduleName: asset - viewPath: assetImmovableReport - selectiveDownload: true - externalService: - - entity: $.MdmsRes.egf-master.FinancialYear - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=egf-master&masterName=FinancialYear&tenantId=$tenantid&filter=%5B%3F(%20%40.startingDate%20%3C%3D%20$currentTime%20%26%26%20%40.endingDate%20%3E%3D%20$currentTime)%5D - keyOrder: startingDate,endingDate - tableName: tbl_financialYears - stateData: true - - entity: $.MdmsRes.ASSET.AssetCategory - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=ASSET&masterName=AssetCategory&tenantId=$tenantid&filter=%5B%3F%28+%40.assetCategoryType%3D%3D%27IMMOVABLE%27++%26%26+%40.isAssetAllow%3D%3Dtrue%29%5D - keyOrder: id,name,depreciationRate,parent,tenantId - tableName: tbl_assetsubcategory - stateData: true - - entity: $.MdmsRes.ASSET.AssetCategory - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=ASSET&masterName=AssetCategory&tenantId=$tenantid&filter=%5B%3F%28+%40.assetCategoryType%3D%3D%27IMMOVABLE%27++%26%26+%40.isAssetAllow%3D%3Dfalse%29%5D - keyOrder: id,name,tenantId - tableName: tbl_assetcategory - stateData: true - - entity: $.MdmsRes.egf-master.Fund - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=egf-master&masterName=Fund&tenantId=$tenantid - keyOrder: id,tenantId,name,code - tableName: tbl_funds - stateData: true - sourceColumns: - - name: id - label: reports.asset.id - type: number - source: asset - - name: quantity - label: reports.asset.quantity - type: number - source: asset - - name: plintharea - label: reports.asset.plintharea - type: number - source: asset - showColumn: true - - name: cubiccontents - label: reports.asset.cubiccontents - type: string - source: asset - - name: landsurveyno - label: reports.asset.landsurveyno - type: string - source: asset - - name: length - label: reports.asset.length - type: number - source: asset - - name: width - label: reports.asset.width - type: number - source: asset - - name: height - label: reports.asset.height - type: number - source: asset - - name: totalarea - label: reports.asset.totalarea - type: number - source: asset - - name: acquiredfrom - label: reports.asset.acquiredfrom - type: string - source: asset - - name: anticipatedLife - label: reports.asset.anticipatedLife - type: number - source: asset - - name: modeofacquisition - label: reports.asset.modeofacquisition - type: string - source: asset - - name: warrantyexpirydate - label: reports.asset.warrantyexpirydate - type: number - source: asset - - name: defectliability - label: reports.asset.defectliability - type: number - source: asset - - name: defectliabilitymonth - label: reports.asset.defectliabilitymonth - type: number - source: asset - - name: defectliabilityday - label: reports.asset.defectliabilityday - type: string - source: asset - - name: securitydepositretained - label: reports.asset.securitydepositretained - type: number - source: asset - - name: securitydepositrealized - label: reports.asset.securitydepositrealized - type: number - source: asset - - name: dateofcreation - label: reports.asset.dateofcreation - type: string - source: asset - - name: acquisitiondate - label: reports.asset.acquisitiondate - type: string - source: asset - - name: grossvalue - label: reports.asset.grossvalue - type: number - source: asset - - name: originalvalue - label: reports.asset.originalvalue - type: number - source: asset - - name: currentvalue - label: reports.asset.currentvalue - type: number - source: asset - - name: currentamount - label: reports.asset.currentamount - type: number - source: asset - - name: disposalsalevalue - label: reports.asset.disposalsalevalue - type: number - source: asset - - name: disposalvoucherno - label: reports.asset.disposalvoucherno - type: number - source: asset - - name: disposaldate - label: reports.asset.disposaldate - type: string - source: asset - - name: revaluationdate - label: reports.asset.revaluationdate - type: string - source: asset - - name: incrementalrevalsum - label: reports.asset.incrementalrevalsum - type: number - source: asset - - name: decrementalrevalsum - label: reports.asset.decrementalrevalsum - type: number - source: asset - - name: depreciationvalue - label: reports.asset.depreciationvalue - type: number - source: asset - - name: totaldepreciationval - label: reports.asset.totaldepreciationval - type: number - source: asset - - name: name - label: reports.asset.name - type: string - source: asset - - name: code - label: reports.asset.code - type: string - source: asset - - name: ordernumber - label: reports.asset.ordernumber - type: number - - name: warrantyavailable - label: reports.asset.warrantyavailable - type: string - source: asset - - name: wipreferenceno - label: reports.asset.wipreferenceno - type: string - source: asset - - name: floors - label: reports.asset.floors - type: number - source: asset - - name: titledocumentsavailable - label: reports.asset.titledocumentsavailable - type: number - - name: buyername - label: reports.asset.buyername - type: string - source: asset - - name: accumulateddepreciation - label: reports.asset.accumulateddepreciation - type: number - source: asset - - name: openingdate - label: reports.asset.openingdate - type: number - source: asset - - name: fundsourcename - label: reports.asset.fundsource - type: string - source: asset - - name: location - label: reports.asset.location - type: string - source: asset - - name: totalsurveyno - label: reports.asset.totalsurveyno - type: string - source: asset - - name: assetattributes - label: reports.asset.assetattributes - type: string - source: asset - - name: assetsubcategoryname - label: reports.asset.assetsubcategoryname - type: string - source: asset - - name: assetparentcategoryname - label: reports.asset.assetparentcategoryname - type: string - source: asset - - name: depreciationrate - label: reports.asset.depreciationrate - type: string - source: asset - - name: totalrevalsum - label: reports.asset.totalrevalsum - type: string - source: asset - - name: prevtotaldepreciationval - label: reports.asset.prevtotaldepreciationval - type: string - source: asset - - name: currtotaldepreciationval - label: reports.asset.currtotaldepreciationval - type: string - source: asset - searchParams: - - name: fromDate - label: reports.asset.fromDate - type: date - source: asset - searchClause : AND asset.createddate>=$fromDate - isMandatory: false - - name: toDate - label: reports.asset.toDate - type: date - source: asset - searchClause : AND asset.createddate<=$toDate - isMandatory: false - - name: name - label: reports.asset.name - type: string - isMandatory: false - source: asset - searchClause : AND asset.name=$name - - name: code - label: reports.asset.code - type: string - isMandatory: false - source: asset - searchClause : AND asset.code=$code - - name: assetdetail - label: reports.asset.detail - type: number - isMandatory: false - source: asset - searchClause : and asset.code in ($assetdetail) - - query: select asset.name,asset.code,asset.ordernumber,asset.warrantyavailable,asset.wipreferenceno,asset.titledocumentsavailable as titledocumentsavailable, - asset.accumulateddepreciation,asset.grossvalue,asset.id,asset.quantity,asset.totalarea,asset.openingdate,asset.fundsource,funds.fundsourcename, - asset.location,(select string_agg(land.surveynumber,',') from egasset_asset_landdetails land where land.isenabled=true and asset.id=land.assetid group by asset.id) as - totalsurveyno,asset.acquiredfrom,asset.anticipatedLife,asset.modeofacquisition,asset.warrantyexpirydate,asset.defectliabilityyear as - defectliability,asset.defectliabilitymonth as defectliabilitymonth,asset.assetCategoryType,asset.defectliabilityday as defectliabilityday, coalesce(grossvalue,0.0)-coalesce(accumulateddepreciation,0.0)+coalesce(incrementalrevalsum,0.0)-coalesce(decrementalrevalsum,0.0) as totalrevalsum, - asset.securitydepositretained,asset.securitydepositrealized,asset.dateofcreation,asset.acquisitiondate,asset.grossvalue,asset.originalvalue, - currentvalue.currentamount,disposal.salevalue as disposalsalevalue,disposal.profitlossvoucherreference as disposalvoucherno,disposal.disposaldate, - disposal.buyername,disposal.buyeraddress,revaluation.revaluationdate,revaluation.incrementalrevalsum,revaluation.decrementalrevalsum, - depreciation.depreciationvalue,depreciation.totaldepreciationval,depreciation.prevtotaldepreciationval,depreciation.currtotaldepreciationval,assetsubcategoryname,assetSubCategory.depreciationrate,assetsubcategoryparent, assetparentcategoryname from egasset_asset asset left outer join (select b.* from egasset_current_value b inner join ( select assetid,tenantid, max(createdtime) as createdtime from egasset_current_value where tenantid = $tenantid group by assetid,tenantid) c ON b.assetid = c.assetid and b.tenantid=c.tenantid AND c.createdtime=b.createdtime) currentvalue ON asset.id=currentvalue.assetid AND asset.tenantid=currentvalue.tenantid left outer join egasset_disposal disposal ON asset.id=disposal.assetid AND asset.tenantId = disposal.tenantid left outer join ( select dep1.*,depsum.totaldepreciationval,prevtotaldepreciationval,currtotaldepreciationval from egasset_depreciation dep1 - inner join (select assetid,tenantid,max(createdtime) as createdtime from egasset_depreciation where tenantid = $tenantid group by assetid,tenantid ) depmax ON dep1.assetid=depmax.assetid AND - dep1.tenantid=depmax.tenantid AND dep1.createdtime=depmax.createdtime inner join - (select assetid,tenantid,sum(depreciationvalue) as totaldepreciationval from egasset_depreciation where tenantid = $tenantid group by assetid,tenantid) depsum - ON dep1.assetid=depsum.assetid AND dep1.tenantid=depsum.tenantid left outer join - (select assetid,tenantid,sum(depreciationvalue) as prevtotaldepreciationval from egasset_depreciation where tenantid = $tenantid AND todate<=(select startingDate::bigint from (VALUES tbl_financialYears) as financialYears (startingDate,endingDate)) group by assetid,tenantid) prevdepsum - ON dep1.assetid=prevdepsum.assetid AND dep1.tenantid=prevdepsum.tenantid left outer join (select assetid,tenantid,sum(depreciationvalue) as currtotaldepreciationval - from egasset_depreciation where tenantid = $tenantid AND (todate BETWEEN (select startingDate::bigint from (VALUES tbl_financialYears) as financialYears (startingDate,endingDate)) - AND (select endingDate::bigint from (VALUES tbl_financialYears) as financialYears (startingDate,endingDate)) ) group by assetid,tenantid) currdepsum - ON dep1.assetid=currdepsum.assetid AND dep1.tenantid=currdepsum.tenantid) - depreciation ON asset.id=depreciation.assetid AND asset.tenantid=depreciation.tenantid - left outer join - (select rev1.*,revinc.incrementalrevalsum,revdec.decrementalrevalsum from egasset_revaluation rev1 inner join (select assetid,tenantid,max(createddate) - as createddate from egasset_revaluation where tenantid = $tenantid group by assetid,tenantid ) revalmax ON rev1.assetid=revalmax.assetid AND - rev1.tenantid=revalmax.tenantid AND rev1.createddate=revalmax.createddate left outer join (select assetid,tenantid,sum(revaluationamount) as - incrementalrevalsum from egasset_revaluation where tenantid = $tenantid AND typeofchange='INCREASED' group by assetid,tenantid) revinc - ON rev1.assetid=revinc.assetid and rev1.tenantid=revinc.tenantid left outer join (select assetid,tenantid,sum(revaluationamount) as decrementalrevalsum - from egasset_revaluation where tenantid = $tenantid AND typeofchange='DECREASED' group by assetid,tenantid) revdec - ON rev1.assetid=revdec.assetid and rev1.tenantid=revdec.tenantid where rev1.tenantid = $tenantid) revaluation - ON asset.tenantid=revaluation.tenantid AND asset.id=revaluation.assetid - left outer join ( select assetSubcategory.name assetsubcategoryname,assetSubcategory.depreciationrate as depreciationrate, - assetSubcategory.parent as assetsubcategoryparent,assetSubcategory.tenantid as tenantid,assetSubcategory.id assetsubcategoryid, - ac.name as assetparentcategoryname,ac.id assetparentcategoryid from (VALUES tbl_assetsubcategory) as assetSubcategory (id,name,depreciationRate,parent,tenantId) - inner join (VALUES tbl_assetcategory) as ac (id,name,tenantId) ON assetSubcategory.parent = ac.id ) as - assetsubcategory ON asset.assetcategory::character varying=assetsubcategory.assetsubcategoryid - left outer join (select funds.name fundsourcename,funds.code from (VALUES tbl_funds) as funds (id,tenantId,name,code)) as funds ON asset.fundsource=funds.code - where asset.tenantid = $tenantid AND asset.assetCategoryType='IMMOVABLE' - - -- reportName: AssetMovableRegister - summary: Movable Asset Register Report - version: 1.0.0 - moduleName: asset - viewPath: assetMovableReport - selectiveDownload: true - externalService: - - entity: $.MdmsRes.ASSET.AssetCategory - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=ASSET&masterName=AssetCategory&tenantId=$tenantid&filter=%5B%3F%28+%40.assetCategoryType%3D%3D%27MOVABLE%27++%26%26+%40.isAssetAllow%3D%3Dtrue%29%5D - keyOrder: id,name,depreciationRate,parent,tenantId - tableName: tbl_assetsubcategory - stateData: true - - entity: $.MdmsRes.ASSET.AssetCategory - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=ASSET&masterName=AssetCategory&tenantId=$tenantid&filter=%5B%3F%28+%40.assetCategoryType%3D%3D%27MOVABLE%27++%26%26+%40.isAssetAllow%3D%3Dfalse%29%5D - keyOrder: id,name,tenantId - tableName: tbl_assetcategory - stateData: true - sourceColumns: - - name: name - label: reports.asset.name - type: string - source: asset - - name: code - label: reports.asset.code - type: string - linkedReport: - reportName: AssetMovableRegisterDetail - linkedColumn: _parent?reportName={reportName}&assetdetail={code} - source: asset - - name: dateofcreation - label: reports.asset.dateofcreation - type: epoch - source: asset - - name: grossvalue - label: reports.asset.grossvalue - type: number - source: asset - - name: originalvalue - label: reports.asset.originalvalue - type: number - source: asset - searchParams: - - name: assetcategory - label: reports.asset.assetCategory - isMandatory: false - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=ASSET&masterName=AssetCategory&tenantId=$tenantid&filter=%5B%3F(%20%40.assetCategoryType%3D%3D%27MOVABLE%27%20%26%26%20%40.isAssetAllow%3D%3Dfalse)%5D|$.MdmsRes.ASSET.AssetCategory.*.id|$.MdmsRes.ASSET.AssetCategory.*.name - source: asset - wrapper: true - stateData: true - searchClause : AND assetsubcategory.assetsubcategoryparent =$assetcategory - - name: assetsubcategory - label: reports.asset.assetSubCategory - isMandatory: false - type: url - pattern: /egov-mdms-service/v1/_get?moduleName=ASSET&masterName=AssetCategory&tenantId=$tenantid&filter=%5B%3F(%20%40.parent%3D%3D{assetcategory})%5D|$.MdmsRes.ASSET.AssetCategory.*.id|$.MdmsRes.ASSET.AssetCategory.*.name - source: asset - wrapper: true - stateData: true - searchClause : AND asset.assetcategory=$assetsubcategory - - name: department - label: reports.asset.departmentCode - isMandatory: false - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=common-masters&masterName=Department&tenantId=$tenantid|$..code|$..name - source: asset - wrapper: true - stateData: true - searchClause : AND asset.departmentcode=$department - - name: code - label: reports.asset.code - type: string - isMandatory: false - source: asset - searchClause : AND asset.code in ($code) - - name: name - label: reports.asset.name - type: string - isMandatory: false - source: asset - searchClause : AND asset.name=$name - - name: originalvaluefrom - label: reports.asset.originalvaluefrom - type: number - source: asset - searchClause : AND asset.originalvalue>=$originalvaluefrom - isMandatory: false - - name: originalvalueto - label: reports.asset.originalvalueto - type: number - source: asset - searchClause : AND asset.originalvalue<=$originalvalueto - isMandatory: false - - name: fromDate - label: reports.asset.fromDate - type: date - source: asset - searchClause : AND asset.createddate>=$fromDate - isMandatory: false - - name: toDate - label: reports.asset.toDate - type: date - source: asset - searchClause : AND asset.createddate<=$toDate - isMandatory: false - - - - - - query: select asset.name,asset.code,asset.ordernumber,asset.warrantyavailable,asset.wipreferenceno,asset.titledocumentsavailable as titledocumentsavailable,asset.accumulateddepreciation,asset.grossvalue,asset.id,asset.quantity,asset.totalarea,asset.openingdate,asset.fundsource,asset.location,asset.assetCategoryType, - asset.acquiredfrom,asset.anticipatedLife,asset.modeofacquisition,asset.warrantyexpirydate,asset.defectliabilityyear as defectliability,asset.defectliabilitymonth as defectliabilitymonth,(select string_agg(land.surveynumber,',') from egasset_asset_landdetails land where land.isenabled=true and asset.id=land.assetid group by asset.id) as totalsurveyno, - asset.defectliabilityday as defectliabilityday,asset.securitydepositretained, - asset.securitydepositrealized,asset.dateofcreation,asset.acquisitiondate,asset.grossvalue,asset.originalvalue,currentvalue.currentamount, - disposal.salevalue as disposalsalevalue,disposal.profitlossvoucherreference as disposalvoucherno,disposal.disposaldate,disposal.buyername,disposal.buyeraddress, - revaluation.revaluationdate,revaluation.incrementalrevalsum,revaluation.decrementalrevalsum, - depreciation.depreciationvalue,depreciation.totaldepreciationval,assetsubcategoryname,assetSubCategory.depreciationrate,assetsubcategoryparent, - assetparentcategoryname - from egasset_asset asset left outer join - (select b.* from egasset_current_value b inner join ( select assetid,tenantid,max(createdtime) as createdtime from egasset_current_value - where tenantid = $tenantid group by assetid,tenantid) c - ON b.assetid = c.assetid and b.tenantid=c.tenantid AND c.createdtime=b.createdtime) currentvalue - ON asset.id=currentvalue.assetid AND asset.tenantid=currentvalue.tenantid - left outer join egasset_disposal disposal ON asset.id=disposal.assetid AND asset.tenantId = disposal.tenantid - left outer join ( select dep1.*,depsum.totaldepreciationval from egasset_depreciation dep1 - inner join - (select assetid,tenantid,max(createdtime) as createdtime from egasset_depreciation where tenantid = $tenantid - group by assetid,tenantid ) depmax ON dep1.assetid=depmax.assetid AND dep1.tenantid=depmax.tenantid AND dep1.createdtime=depmax.createdtime - inner join (select assetid,tenantid,sum(depreciationvalue) as totaldepreciationval from egasset_depreciation - where tenantid = $tenantid group by assetid,tenantid) depsum ON dep1.assetid=depsum.assetid - AND dep1.tenantid=depsum.tenantid ) depreciation ON asset.id=depreciation.assetid AND asset.tenantid=depreciation.tenantid - left outer join - (select rev1.*,revinc.incrementalrevalsum,revdec.decrementalrevalsum from egasset_revaluation rev1 inner join - (select assetid,tenantid,max(createddate) as createddate from egasset_revaluation where tenantid = $tenantid - group by assetid,tenantid ) revalmax ON rev1.assetid=revalmax.assetid AND rev1.tenantid=revalmax.tenantid AND rev1.createddate=revalmax.createddate - left outer join - (select assetid,tenantid,sum(revaluationamount) as incrementalrevalsum from egasset_revaluation where tenantid = $tenantid - AND typeofchange='INCREASED' group by assetid,tenantid) revinc ON rev1.assetid=revinc.assetid and rev1.tenantid=revinc.tenantid - left outer join (select assetid,tenantid,sum(revaluationamount) as decrementalrevalsum from egasset_revaluation - where tenantid = $tenantid AND typeofchange='DECREASED' group by assetid,tenantid) revdec - ON rev1.assetid=revdec.assetid and rev1.tenantid=revdec.tenantid - where rev1.tenantid = $tenantid) revaluation - ON asset.tenantid=revaluation.tenantid AND asset.id=revaluation.assetid - left outer join ( select assetSubcategory.name assetsubcategoryname,assetSubcategory.depreciationrate as depreciationrate, - assetSubcategory.parent as assetsubcategoryparent,assetSubcategory.tenantid as tenantid,assetSubcategory.id assetsubcategoryid, - ac.name as assetparentcategoryname,ac.id assetparentcategoryid from (VALUES tbl_assetsubcategory) as assetSubcategory (id,name,depreciationRate,parent,tenantId) - inner join (VALUES tbl_assetcategory) as ac (id,name,tenantId) ON assetSubcategory.parent = ac.id ) as - assetsubcategory ON asset.assetcategory::character varying=assetsubcategory.assetsubcategoryid - where asset.tenantid = $tenantid AND asset.assetCategoryType='MOVABLE' - - -- reportName: AssetMovableRegisterDetail - summary: Movable Asset Register Report - version: 1.0.0 - moduleName: asset - viewPath: assetMovableReport - selectiveDownload: true - externalService: - - entity: $.MdmsRes.egf-master.FinancialYear - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=egf-master&masterName=FinancialYear&tenantId=$tenantid&filter=%5B%3F(%20%40.startingDate%20%3C%3D%20$currentTime%20%26%26%20%40.endingDate%20%3E%3D%20$currentTime)%5D - keyOrder: startingDate,endingDate - tableName: tbl_financialYears - stateData: true - - entity: $.MdmsRes.ASSET.AssetCategory - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=ASSET&masterName=AssetCategory&tenantId=$tenantid&filter=%5B%3F%28+%40.assetCategoryType%3D%3D%27MOVABLE%27++%26%26+%40.isAssetAllow%3D%3Dtrue%29%5D - keyOrder: id,name,depreciationRate,parent,tenantId - tableName: tbl_assetsubcategory - stateData: true - - entity: $.MdmsRes.ASSET.AssetCategory - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=ASSET&masterName=AssetCategory&tenantId=$tenantid&filter=%5B%3F%28+%40.assetCategoryType%3D%3D%27MOVABLE%27++%26%26+%40.isAssetAllow%3D%3Dfalse%29%5D - keyOrder: id,name,tenantId - tableName: tbl_assetcategory - stateData: true - - entity: $.MdmsRes.egf-master.Fund - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=egf-master&masterName=Fund&tenantId=$tenantid - keyOrder: id,tenantId,name,code - tableName: tbl_funds - stateData: true - sourceColumns: - - name: id - label: reports.asset.id - type: number - source: asset - - name: quantity - label: reports.asset.quantity - type: number - source: asset - - name: plintharea - label: reports.asset.plintharea - type: number - source: asset - showColumn: true - - name: cubiccontents - label: reports.asset.cubiccontents - type: string - source: asset - - name: landsurveyno - label: reports.asset.landsurveyno - type: string - source: asset - - name: length - label: reports.asset.length - type: number - source: asset - - name: width - label: reports.asset.width - type: number - source: asset - - name: height - label: reports.asset.height - type: number - source: asset - - name: totalarea - label: reports.asset.totalarea - type: number - source: asset - - name: acquiredfrom - label: reports.asset.acquiredfrom - type: string - source: asset - - name: anticipatedLife - label: reports.asset.anticipatedLife - type: number - source: asset - - name: modeofacquisition - label: reports.asset.modeofacquisition - type: string - source: asset - - name: warrantyexpirydate - label: reports.asset.warrantyexpirydate - type: number - source: asset - - name: defectliability - label: reports.asset.defectliability - type: number - source: asset - - name: defectliabilitymonth - label: reports.asset.defectliabilitymonth - type: number - source: asset - - name: defectliabilityday - label: reports.asset.defectliabilityday - type: string - source: asset - - name: securitydepositretained - label: reports.asset.securitydepositretained - type: number - source: asset - - name: securitydepositrealized - label: reports.asset.securitydepositrealized - type: number - source: asset - - name: dateofcreation - label: reports.asset.dateofcreation - type: string - source: asset - - name: acquisitiondate - label: reports.asset.acquisitiondate - type: string - source: asset - - name: grossvalue - label: reports.asset.grossvalue - type: number - source: asset - - name: originalvalue - label: reports.asset.originalvalue - type: number - source: asset - - name: currentvalue - label: reports.asset.currentvalue - type: number - source: asset - - name: currentamount - label: reports.asset.currentamount - type: number - source: asset - - name: disposalsalevalue - label: reports.asset.disposalsalevalue - type: number - source: asset - - name: disposalvoucherno - label: reports.asset.disposalvoucherno - type: number - source: asset - - name: disposaldate - label: reports.asset.disposaldate - type: string - source: asset - - name: revaluationdate - label: reports.asset.revaluationdate - type: string - source: asset - - name: incrementalrevalsum - label: reports.asset.incrementalrevalsum - type: number - source: asset - - name: decrementalrevalsum - label: reports.asset.decrementalrevalsum - type: number - source: asset - - name: depreciationvalue - label: reports.asset.depreciationvalue - type: number - source: asset - - name: totaldepreciationval - label: reports.asset.totaldepreciationval - type: number - source: asset - - name: name - label: reports.asset.name - type: string - source: asset - - name: code - label: reports.asset.code - type: string - source: asset - - name: ordernumber - label: reports.asset.ordernumber - type: number - - name: warrantyavailable - label: reports.asset.warrantyavailable - type: string - source: asset - - name: wipreferenceno - label: reports.asset.wipreferenceno - type: string - source: asset - - name: floors - label: reports.asset.floors - type: number - source: asset - - name: titledocumentsavailable - label: reports.asset.titledocumentsavailable - type: number - - name: buyername - label: reports.asset.buyername - type: string - source: asset - - name: accumulateddepreciation - label: reports.asset.accumulateddepreciation - type: number - source: asset - - name: openingdate - label: reports.asset.openingdate - type: number - source: asset - - name: fundsourcename - label: reports.asset.fundsource - type: string - source: asset - - name: location - label: reports.asset.location - type: string - source: asset - - name: totalsurveyno - label: reports.asset.totalsurveyno - type: string - source: asset - - name: assetsubcategoryname - label: reports.asset.assetsubcategoryname - type: string - source: asset - - name: assetparentcategoryname - label: reports.asset.assetparentcategoryname - type: string - source: asset - - name: depreciationrate - label: reports.asset.depreciationrate - type: number - source: asset - - name: totalrevalsum - label: reports.asset.totalrevalsum - type: number - source: asset - - name: prevtotaldepreciationval - label: reports.asset.prevtotaldepreciationval - type: string - source: asset - - name: currtotaldepreciationval - label: reports.asset.currtotaldepreciationval - type: string - source: asset - searchParams: - - name: fromDate - label: reports.asset.fromDate - type: date - source: asset - searchClause : AND asset.createddate>=$fromDate - isMandatory: false - - name: toDate - label: reports.asset.toDate - type: date - source: asset - searchClause : AND asset.createddate<=$toDate - isMandatory: false - - name: name - label: reports.asset.name - type: string - isMandatory: false - source: asset - searchClause : AND asset.name=$name - - name: code - label: reports.asset.code - type: string - isMandatory: false - source: asset - searchClause : AND asset.code=$code - - name: assetcategory - label: reports.asset.assetcategory - type: string - isMandatory: false - source: asset - searchClause : AND asset.assetcategory=assetcategory - - name: assetdetail - label: reports.asset.detail - type: number - isMandatory: false - source: asset - searchClause : and asset.code in ($assetdetail) - - query: select asset.name,asset.code,asset.ordernumber,asset.warrantyavailable,asset.wipreferenceno,asset.titledocumentsavailable as titledocumentsavailable,asset.accumulateddepreciation,asset.grossvalue,asset.id,asset.quantity,asset.totalarea,asset.openingdate,asset.fundsource,asset.location,asset.assetCategoryType, - asset.acquiredfrom,asset.anticipatedLife,asset.modeofacquisition,asset.warrantyexpirydate,asset.defectliabilityyear as defectliability,asset.defectliabilitymonth as defectliabilitymonth,(select string_agg(land.surveynumber,',') from egasset_asset_landdetails land where land.isenabled=true and asset.id=land.assetid group by asset.id) as totalsurveyno,coalesce(grossvalue,0.0)-coalesce(accumulateddepreciation,0.0)+coalesce(incrementalrevalsum,0.0)-coalesce(decrementalrevalsum,0.0) as totalrevalsum, - asset.defectliabilityday as defectliabilityday,asset.securitydepositretained, - asset.securitydepositrealized,asset.dateofcreation,asset.acquisitiondate,asset.grossvalue,asset.originalvalue,currentvalue.currentamount,funds.fundsourcename, - disposal.salevalue as disposalsalevalue,disposal.profitlossvoucherreference as disposalvoucherno,disposal.disposaldate,disposal.buyername,disposal.buyeraddress, - revaluation.revaluationdate,revaluation.incrementalrevalsum,revaluation.decrementalrevalsum, - depreciation.depreciationvalue,depreciation.totaldepreciationval,depreciation.currtotaldepreciationval,depreciation.prevtotaldepreciationval,assetsubcategoryname,assetSubCategory.depreciationrate,assetsubcategoryparent, assetparentcategoryname from egasset_asset asset left outer join - (select b.* from egasset_current_value b inner join ( select assetid,tenantid,max(createdtime) as createdtime from egasset_current_value where tenantid = $tenantid group by assetid,tenantid) c - ON b.assetid = c.assetid and b.tenantid=c.tenantid AND c.createdtime=b.createdtime) currentvalue - ON asset.id=currentvalue.assetid AND asset.tenantid=currentvalue.tenantid left outer join egasset_disposal disposal ON asset.id=disposal.assetid AND asset.tenantId = disposal.tenantid left outer join ( select dep1.*,depsum.totaldepreciationval,prevtotaldepreciationval,currtotaldepreciationval from egasset_depreciation dep1 inner join (select assetid,tenantid,max(createdtime) as createdtime from egasset_depreciation where tenantid = $tenantid group by assetid,tenantid ) depmax ON dep1.assetid=depmax.assetid AND dep1.tenantid=depmax.tenantid AND dep1.createdtime=depmax.createdtime inner join (select assetid,tenantid,sum(depreciationvalue) as totaldepreciationval from egasset_depreciation where tenantid = $tenantid group by assetid,tenantid) depsum ON dep1.assetid=depsum.assetid AND dep1.tenantid=depsum.tenantid left outer join (select assetid,tenantid,sum(depreciationvalue) as prevtotaldepreciationval from egasset_depreciation where tenantid = $tenantid AND todate<=(select startingDate::bigint from (VALUES tbl_financialYears) as financialYears (startingDate,endingDate)) group by assetid,tenantid) prevdepsum ON dep1.assetid=prevdepsum.assetid AND dep1.tenantid=prevdepsum.tenantid left outer join (select assetid,tenantid,sum(depreciationvalue) as currtotaldepreciationval from egasset_depreciation where tenantid = $tenantid AND (todate BETWEEN (select startingDate::bigint from (VALUES tbl_financialYears) as financialYears (startingDate,endingDate)) AND (select endingDate::bigint from (VALUES tbl_financialYears) as financialYears (startingDate,endingDate)) ) group by assetid,tenantid) currdepsum ON dep1.assetid=currdepsum.assetid AND dep1.tenantid=currdepsum.tenantid) depreciation ON asset.id=depreciation.assetid AND asset.tenantid=depreciation.tenantid left outer join - (select rev1.*,revinc.incrementalrevalsum,revdec.decrementalrevalsum from egasset_revaluation rev1 inner join - (select assetid,tenantid,max(createddate) as createddate from egasset_revaluation where tenantid = $tenantid - group by assetid,tenantid ) revalmax ON rev1.assetid=revalmax.assetid AND rev1.tenantid=revalmax.tenantid AND rev1.createddate=revalmax.createddate - left outer join - (select assetid,tenantid,sum(revaluationamount) as incrementalrevalsum from egasset_revaluation where tenantid = $tenantid - AND typeofchange='INCREASED' group by assetid,tenantid) revinc ON rev1.assetid=revinc.assetid and rev1.tenantid=revinc.tenantid - left outer join (select assetid,tenantid,sum(revaluationamount) as decrementalrevalsum from egasset_revaluation - where tenantid = $tenantid AND typeofchange='DECREASED' group by assetid,tenantid) revdec - ON rev1.assetid=revdec.assetid and rev1.tenantid=revdec.tenantid - where rev1.tenantid = $tenantid) revaluation - ON asset.tenantid=revaluation.tenantid AND asset.id=revaluation.assetid - left outer join ( select assetSubcategory.name assetsubcategoryname,assetSubcategory.depreciationrate as depreciationrate, - assetSubcategory.parent as assetsubcategoryparent,assetSubcategory.tenantid as tenantid,assetSubcategory.id assetsubcategoryid, - ac.name as assetparentcategoryname,ac.id assetparentcategoryid from (VALUES tbl_assetsubcategory) as assetSubcategory (id,name,depreciationRate,parent,tenantId) - inner join (VALUES tbl_assetcategory) as ac (id,name,tenantId) ON assetSubcategory.parent = ac.id) as - assetsubcategory ON asset.assetcategory::character varying=assetsubcategory.assetsubcategoryid left outer join (select funds.name fundsourcename,funds.code from (VALUES tbl_funds) as funds (id,tenantId,name,code)) as funds ON asset.fundsource=funds.code - where asset.tenantid = $tenantid AND asset.assetCategoryType='MOVABLE' - - -- reportName: AssetSchedule - summary: Asset Schedule Register Report - version: 1.0.0 - moduleName: asset - viewPath: assetScheduleReport - externalService: - - entity: $.MdmsRes.egf-master.FinancialYear - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=egf-master&masterName=FinancialYear&tenantId=$tenantid&filter=%5B%3F(%20%40.startingDate%20%3C%3D%20$currentTime%20%26%26%20%40.endingDate%20%3E%3D%20$currentTime)%5D - keyOrder: startingDate,endingDate - tableName: tbl_financialYears - stateData: true - - entity: $.MdmsRes.ASSET.AssetCategory - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=ASSET&masterName=AssetCategory&tenantId=$tenantid&filter=%5B%3F%28+@.parent%21%3Dnull%29%5D - keyOrder: id,name,depreciationRate,parent,tenantId - tableName: tbl_assetsubcategory - stateData: true - - entity: $.MdmsRes.ASSET.AssetCategory - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=ASSET&masterName=AssetCategory&tenantId=$tenantid&filter=%5B%3F%28+%40.parent%3D%3Dnull%29%5D - keyOrder: id,name,tenantId - tableName: tbl_assetcategory - stateData: true - - entity: $.MdmsRes.ASSET.AssetCategory - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=ASSET&masterName=AssetCategory&tenantId=$tenantid - keyOrder: id,name,tenantId,depreciationRate,parent - tableName: tbl_assetcategories - stateData: true - sourceColumns: - - name: assetparentcategoryname - label: reports.asset.assetparentcategoryname - type: string - source: asset - - name: assetsubcategoryname - label: reports.asset.assetsubcategoryname - type: string - source: asset - - name: name - label: reports.asset.schedulename - type: string - source: asset - - name: depreciationrate - label: reports.asset.depreciationrate - type: string - source: asset - - name: code - label: reports.asset.code - type: string - source: asset - - name: revaluationreserveaccount - label: reports.asset.revaluationreserveaccount - type: string - source: asset - - name: previousfynetblock - label: reports.asset.currentstartnetblock - type: number - source: asset - - name: plusrevalsum - label: reports.asset.plusrevalsum - type: string - source: asset - - name: minusrevalsum - label: reports.asset.minusrevalsum - type: number - source: asset - - name: revaltotal - label: reports.asset.revaltotal - type: number - source: asset - - name: accumulateddepreciationaccount - label: reports.asset.accumulateddepreciationaccount - type: string - source: asset - - name: startdepval - label: reports.asset.startdepval - type: number - source: asset - - name: currdepsum - label: reports.asset.currdepsum - type: number - source: asset - - name: totaldepsum - label: reports.asset.totaldepsum - type: number - source: asset - - name: endcurrentamount - label: reports.asset.endcurrentamount - type: string - source: asset - - name: previousfynetblock - label: reports.asset.previousfynetblock - type: string - source: asset - searchParams: - - name: assetcategorytype - label: reports.asset.assetcategorytype - isMandatory: false - type: singlevaluelist - pattern: 'list://IMMOVABLE:IMMOVABLE,MOVABLE:MOVABLE,LAND:LAND' - source: asset - - name: assetcategory - label: reports.asset.assetCategory - isMandatory: false - type: url - pattern: /egov-mdms-service/v1/_get?moduleName=ASSET&masterName=AssetCategory&tenantId=$tenantid&filter=%5B%3F(%20%40.assetCategoryType%3D%3D%27{assetcategorytype}%27%20%26%26%20%40.isAssetAllow%3D%3Dfalse)%5D|$.MdmsRes.ASSET.AssetCategory.*.id|$.MdmsRes.ASSET.AssetCategory.*.name - source: asset - wrapper: true - stateData: true - searchClause : - - name: assetsubcategory - label: reports.asset.assetSubCategory - isMandatory: false - type: url - pattern: /egov-mdms-service/v1/_get?moduleName=ASSET&masterName=AssetCategory&tenantId=$tenantid&filter=%5B%3F(%20%40.parent%3D%3D{assetcategory})%5D|$.MdmsRes.ASSET.AssetCategory.*.id|$.MdmsRes.ASSET.AssetCategory.*.name - source: asset - stateData: true - wrapper: true - searchClause : AND asset.assetcategory=$assetsubcategory - - name: department - label: reports.asset.departmentCode - isMandatory: false - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=common-masters&masterName=Department&tenantId=$tenantid|$..id|$..name - source: asset - wrapper: true - stateData: true - searchClause : AND asset.departmentcode=$department - - name: code - label: reports.asset.code - type: string - isMandatory: false - source: asset - searchClause : AND asset.code in ($code) - - name: name - label: reports.asset.name - type: string - isMandatory: false - source: asset - searchClause : AND asset.name=$name - - name: originalvaluefrom - label: reports.asset.originalvaluefrom - type: number - source: asset - searchClause : AND asset.originalvalue>=$originalvaluefrom - isMandatory: false - - name: originalvalueto - label: reports.asset.originalvalueto - type: number - source: asset - searchClause : AND asset.originalvalue<=$originalvalueto - isMandatory: false - - name: fromDate - label: reports.asset.fromDate - type: date - source: asset - searchClause : AND asset.createddate>=$fromDate - isMandatory: false - - name: toDate - label: reports.asset.toDate - type: date - source: asset - searchClause : AND asset.createddate<=$toDate - isMandatory: false - - - query: select asset.code,asset.assetcategory,asset.name,asset.originalvalue,asset.revaluationreserveaccount, - asset.accumulateddepreciationaccount,asset.assetaccount,asset.accumulateddepreciation,previousfynetblock,endcurrentamount, - plusrevalsum,minusrevalsum,coalesce(prevdepsum,0)+coalesce(asset.accumulateddepreciation,0) as startdepval, - coalesce(previousfynetblock,0.0)+coalesce(plusrevalsum,0.0)-coalesce(minusRevalsum,0.0) as revaltotal,prevdepsum, currdepsum, - coalesce(prevdepsum,0.0)+coalesce(currdepsum,0.0)+coalesce(asset.accumulateddepreciation,0.0) as totaldepsum,assetsubcategoryname,assetSubCategory.depreciationrate,assetsubcategoryparent, - assetparentcategoryname from egasset_asset asset inner join (select distinct(current.assetid),current.tenantid,current.transactiondate,previousfynetblock,current.createdtime, - endcurrentamount,plusrevalsum,minusrevalsum ,previousfynetblock+plusrevalsum-minusRevalsum as revaltotal,prevdepsum,currdepsum, - prevdepsum+currdepsum as totaldepsum from egasset_current_value current inner join (select value.assetid,currentamount as - endcurrentamount,value.tenantid,value.transactiondate,value.createdtime from egasset_current_value value inner join (select max(createdtime) as createdtime, - assetid,tenantid from egasset_current_value where tenantid=$tenantid AND transactiondate<=(select endingDate::bigint::bigint from (VALUES tbl_financialYears) as financialYears (startingDate,endingDate)) - GROUP BY assetid,tenantid) as maxvalue ON value.assetid=maxvalue.assetid and value.tenantid=maxvalue.tenantid AND - value.createdtime=maxvalue.createdtime) endcurrent ON current.assetid=endcurrent.assetid AND current.tenantid= - endcurrent.tenantid AND current.createdtime=endcurrent.createdtime left outer join (select value.assetid,currentamount as - previousfynetblock,value.tenantid,value.transactiondate,value.createdtime from egasset_current_value value inner join (select max(createdtime) as - createdtime,assetid,tenantid from egasset_current_value where tenantid=$tenantid AND transactiondate<=(select startingDate::bigint from (VALUES tbl_financialYears) as financialYears (startingDate,endingDate)) GROUP BY assetid,tenantid ) as maxvalue ON value.assetid=maxvalue.assetid and - value.tenantid=maxvalue.tenantid AND value.createdtime=maxvalue.createdtime) prevyearcurrent ON current.assetid= - prevyearcurrent.assetid AND current.tenantid=prevyearcurrent.tenantid AND current.createdtime=prevyearcurrent.createdtime - left outer join (select COALESCE(sum(revaluationamount),0.0) plusRevalsum,assetid,tenantid from egasset_revaluation where - tenantid=$tenantid AND typeofchange='INCREASED' AND (revaluationdate BETWEEN (select startingDate::bigint from (VALUES tbl_financialYears) as financialYears (startingDate,endingDate)) AND (select endingDate::bigint from (VALUES tbl_financialYears) as financialYears (startingDate,endingDate))) - GROUP BY assetid,tenantid ) plusreval ON current.assetid=plusreval.assetid AND current.tenantid= - plusreval.tenantid left outer join (select sum(revaluationamount) minusRevalsum,assetid,tenantid from egasset_revaluation where - tenantid=$tenantid AND typeofchange='DECREASED' AND (revaluationdate between (select startingDate::bigint from (VALUES tbl_financialYears) as financialYears (startingDate,endingDate)) and (select endingDate::bigint from (VALUES tbl_financialYears) as financialYears (startingDate,endingDate))) GROUP BY assetid,tenantid ) minusreval ON current.assetid=minusreval.assetid AND current.tenantid= - minusreval.tenantid left outer join (select sum(depreciationvalue) prevdepsum,assetid,tenantid from egasset_depreciation where - tenantid=$tenantid AND todate<(select startingDate::bigint from (VALUES tbl_financialYears) as financialYears (startingDate,endingDate)) GROUP BY assetid,tenantid ) prevdep ON current.assetid=prevdep. - assetid AND current.tenantid=prevdep.tenantid left outer join (select sum(depreciationvalue) currdepsum,assetid,tenantid from - egasset_depreciation where tenantid=$tenantid AND (todate between (select startingDate::bigint from (VALUES tbl_financialYears) as financialYears (startingDate,endingDate)) and (select endingDate::bigint from (VALUES tbl_financialYears) as financialYears (startingDate,endingDate))) GROUP BY assetid,tenantid ) currdep ON current.assetid=currdep.assetid AND current.tenantid= - currdep.tenantid) as transactions ON asset.id=transactions.assetid AND asset.tenantid=transactions.tenantid - left outer join ( select assetSubcategory.name as assetsubcategoryname,CASE WHEN assetSubcategory.depreciationrate='null' THEN 'NA' WHEN assetSubcategory.depreciationrate='' THEN 'NA' ELSE assetSubcategory.depreciationrate END, - assetSubcategory.parent as assetsubcategoryparent,assetSubcategory.tenantid as tenantid,assetSubcategory.id assetsubcategoryid, - ac.name as assetparentcategoryname from (VALUES tbl_assetsubcategory) as assetSubcategory (id,name,depreciationRate,parent,tenantId) - inner join (VALUES tbl_assetcategories) as ac (id,name,tenantId) ON assetSubcategory.parent = ac.id ) as - assetsubcategory ON asset.assetcategory::character varying=assetsubcategory.assetsubcategoryid - WHERE asset.tenantid=$tenantid - -- reportName: LandRegister - summary: Land Register Report - version: 1.0.0 - moduleName: asset - viewPath: landRegisterReport - selectiveDownload: true - externalService: - - entity: $.MdmsRes.ASSET.AssetCategory - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=ASSET&masterName=AssetCategory&tenantId=$tenantid&filter=%5B%3F%28+%40.assetCategoryType%3D%3D%27LAND%27++%26%26+%40.isAssetAllow%3D%3Dtrue%29%5D - keyOrder: id,name,depreciationRate,parent,tenantId - tableName: tbl_assetsubcategory - stateData: true - - entity: $.MdmsRes.ASSET.AssetCategory - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=ASSET&masterName=AssetCategory&tenantId=$tenantid&filter=%5B%3F%28+%40.assetCategoryType%3D%3D%27LAND%27++%26%26+%40.isAssetAllow%3D%3Dfalse%29%5D - keyOrder: id,name,tenantId - tableName: tbl_assetcategory - stateData: true - sourceColumns: - - name: name - label: reports.asset.name - type: string - source: asset - - name: code - label: reports.asset.code - type: string - linkedReport: - reportName: LandRegisterDetail - linkedColumn: _parent?reportName={reportName}&assetdetail={code} - source: asset - - name: dateofcreation - label: reports.asset.dateofcreation - type: epoch - source: asset - - name: grossvalue - label: reports.asset.grossvalue - type: number - source: asset - - name: originalvalue - label: reports.asset.originalvalue - type: number - source: asset - searchParams: - - name: assetcategory - label: reports.asset.assetCategory - isMandatory: false - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=ASSET&masterName=AssetCategory&tenantId=$tenantid&filter=%5B%3F(%20%40.assetCategoryType%3D%3D%27LAND%27%20%26%26%20%40.isAssetAllow%3D%3Dfalse)%5D|$.MdmsRes.ASSET.AssetCategory.*.id|$.MdmsRes.ASSET.AssetCategory.*.name - source: asset - wrapper: true - stateData: true - searchClause : AND assetsubcategory.assetsubcategoryparent =$assetcategory - - name: assetsubcategory - label: reports.asset.assetSubCategory - isMandatory: false - type: url - pattern: /egov-mdms-service/v1/_get?moduleName=ASSET&masterName=AssetCategory&tenantId=$tenantid&filter=%5B%3F(%20%40.parent%3D%3D{assetcategory})%5D|$.MdmsRes.ASSET.AssetCategory.*.id|$.MdmsRes.ASSET.AssetCategory.*.name - source: asset - wrapper: true - stateData: true - searchClause : AND asset.assetcategory=$assetsubcategory - - name: department - label: reports.asset.departmentCode - isMandatory: false - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=common-masters&masterName=Department&tenantId=$tenantid|$..code|$..name - source: asset - wrapper: true - stateData: true - searchClause : AND asset.departmentcode=$department - - name: code - label: reports.asset.code - type: string - isMandatory: false - source: asset - searchClause : AND asset.code in ($code) - - name: name - label: reports.asset.name - type: string - isMandatory: false - source: asset - searchClause : AND asset.name=$name - - name: originalvaluefrom - label: reports.asset.originalvaluefrom - type: number - source: asset - searchClause : AND asset.originalvalue>=$originalvaluefrom - isMandatory: false - - name: originalvalueto - label: reports.asset.originalvalueto - type: number - source: asset - searchClause : AND asset.originalvalue<=$originalvalueto - isMandatory: false - - name: fromDate - label: reports.asset.fromDate - type: date - source: asset - searchClause : AND asset.createddate>=$fromDate - isMandatory: false - - name: toDate - label: reports.asset.toDate - type: date - source: asset - searchClause : AND asset.createddate<=$toDate - isMandatory: false - - - - - query: select asset.name,asset.code,asset.ordernumber,asset.warrantyavailable,asset.wipreferenceno,asset.titledocumentsavailable as titledocumentsavailable,asset.accumulateddepreciation,asset.grossvalue,asset.id,asset.quantity,asset.totalarea,asset.openingdate,asset.fundsource,asset.location,(select string_agg(land.surveynumber,',') from egasset_asset_landdetails land where land.isenabled=true and asset.id=land.assetid group by asset.id) as totalsurveyno, - asset.acquiredfrom,asset.anticipatedLife,asset.modeofacquisition,asset.warrantyexpirydate,asset.defectliabilityyear as defectliability,asset.defectliabilitymonth as defectliabilitymonth,asset.assetCategoryType, - asset.defectliabilityday as defectliabilityday,asset.securitydepositretained, - asset.securitydepositrealized,asset.dateofcreation,asset.acquisitiondate,asset.grossvalue,asset.originalvalue,currentvalue.currentamount, - disposal.salevalue as disposalsalevalue,disposal.profitlossvoucherreference as disposalvoucherno,disposal.disposaldate,disposal.buyername,disposal.buyeraddress, - revaluation.revaluationdate,revaluation.incrementalrevalsum,revaluation.decrementalrevalsum,assetsubcategoryname,assetSubCategory.depreciationrate,assetsubcategoryparent, - assetparentcategoryname - from egasset_asset asset left outer join - (select b.* from egasset_current_value b inner join ( select assetid,tenantid,max(createdtime) as createdtime from egasset_current_value - where tenantid = $tenantid group by assetid,tenantid) c - ON b.assetid = c.assetid and b.tenantid=c.tenantid AND c.createdtime=b.createdtime) currentvalue - ON asset.id=currentvalue.assetid AND asset.tenantid=currentvalue.tenantid - left outer join egasset_disposal disposal ON asset.id=disposal.assetid AND asset.tenantId = disposal.tenantid - left outer join - (select rev1.*,revinc.incrementalrevalsum,revdec.decrementalrevalsum from egasset_revaluation rev1 inner join - (select assetid,tenantid,max(createddate) as createddate from egasset_revaluation where tenantid = $tenantid - group by assetid,tenantid ) revalmax ON rev1.assetid=revalmax.assetid AND rev1.tenantid=revalmax.tenantid AND rev1.createddate=revalmax.createddate - left outer join - (select assetid,tenantid,sum(revaluationamount) as incrementalrevalsum from egasset_revaluation where tenantid = $tenantid - AND typeofchange='INCREASED' group by assetid,tenantid) revinc ON rev1.assetid=revinc.assetid and rev1.tenantid=revinc.tenantid - left outer join (select assetid,tenantid,sum(revaluationamount) as decrementalrevalsum from egasset_revaluation - where tenantid = $tenantid AND typeofchange='DECREASED' group by assetid,tenantid) revdec - ON rev1.assetid=revdec.assetid and rev1.tenantid=revdec.tenantid - where rev1.tenantid = $tenantid) revaluation - ON asset.tenantid=revaluation.tenantid AND asset.id=revaluation.assetid - left outer join ( select assetSubcategory.name assetsubcategoryname,assetSubcategory.depreciationrate as depreciationrate, - assetSubcategory.parent as assetsubcategoryparent,assetSubcategory.tenantid as tenantid,assetSubcategory.id assetsubcategoryid, - ac.name as assetparentcategoryname from (VALUES tbl_assetsubcategory) as assetSubcategory (id,name,depreciationRate,parent,tenantId) - inner join (VALUES tbl_assetcategory) as ac (id,name,tenantId) ON assetSubcategory.parent = ac.id ) as - assetsubcategory ON asset.assetcategory::character varying=assetsubcategory.assetsubcategoryid - where asset.tenantid = $tenantid AND asset.assetCategoryType='LAND' - - -- reportName: LandRegisterDetail - summary: Land Register Report - version: 1.0.0 - moduleName: asset - viewPath: landRegisterReport - selectiveDownload: true - externalService: - - entity: $.MdmsRes.ASSET.AssetCategory - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=ASSET&masterName=AssetCategory&tenantId=$tenantid&filter=%5B%3F%28+%40.assetCategoryType%3D%3D%27LAND%27++%26%26+%40.isAssetAllow%3D%3Dtrue%29%5D - keyOrder: id,name,depreciationRate,parent,tenantId - tableName: tbl_assetsubcategory - stateData: true - - entity: $.MdmsRes.ASSET.AssetCategory - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=ASSET&masterName=AssetCategory&tenantId=$tenantid&filter=%5B%3F%28+%40.assetCategoryType%3D%3D%27LAND%27++%26%26+%40.isAssetAllow%3D%3Dfalse%29%5D - keyOrder: id,name,tenantId - tableName: tbl_assetcategory - stateData: true - - entity: $.MdmsRes.egf-master.Fund - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=egf-master&masterName=Fund&tenantId=$tenantid - keyOrder: id,tenantId,name,code - tableName: tbl_funds - stateData: true - sourceColumns: - - name: id - label: reports.asset.id - type: number - source: asset - - name: quantity - label: reports.asset.quantity - type: number - source: asset - - name: plintharea - label: reports.asset.plintharea - type: number - source: asset - showColumn: true - - name: cubiccontents - label: reports.asset.cubiccontents - type: string - source: asset - - name: landsurveyno - label: reports.asset.landsurveyno - type: string - source: asset - - name: length - label: reports.asset.length - type: number - source: asset - - name: width - label: reports.asset.width - type: number - source: asset - - name: height - label: reports.asset.height - type: number - source: asset - - name: totalarea - label: reports.asset.totalarea - type: number - source: asset - - name: acquiredfrom - label: reports.asset.acquiredfrom - type: string - source: asset - - name: anticipatedLife - label: reports.asset.anticipatedLife - type: number - source: asset - - name: modeofacquisition - label: reports.asset.modeofacquisition - type: string - source: asset - - name: warrantyexpirydate - label: reports.asset.warrantyexpirydate - type: number - source: asset - - name: defectliability - label: reports.asset.defectliability - type: number - source: asset - - name: defectliabilitymonth - label: reports.asset.defectliabilitymonth - type: number - source: asset - - name: defectliabilityday - label: reports.asset.defectliabilityday - type: string - source: asset - - name: securitydepositretained - label: reports.asset.securitydepositretained - type: number - source: asset - - name: securitydepositrealized - label: reports.asset.securitydepositrealized - type: number - source: asset - - name: dateofcreation - label: reports.asset.dateofcreation - type: string - source: asset - - name: acquisitiondate - label: reports.asset.acquisitiondate - type: string - source: asset - - name: grossvalue - label: reports.asset.grossvalue - type: number - source: asset - - name: originalvalue - label: reports.asset.originalvalue - type: number - source: asset - - name: currentvalue - label: reports.asset.currentvalue - type: number - source: asset - - name: currentamount - label: reports.asset.currentamount - type: number - source: asset - - name: disposalsalevalue - label: reports.asset.disposalsalevalue - type: number - source: asset - - name: disposalvoucherno - label: reports.asset.disposalvoucherno - type: number - source: asset - - name: disposaldate - label: reports.asset.disposaldate - type: string - source: asset - - name: revaluationdate - label: reports.asset.revaluationdate - type: string - source: asset - - name: incrementalrevalsum - label: reports.asset.incrementalrevalsum - type: number - source: asset - - name: decrementalrevalsum - label: reports.asset.decrementalrevalsum - type: number - source: asset - - name: depreciationvalue - label: reports.asset.depreciationvalue - type: number - source: asset - - name: totaldepreciationval - label: reports.asset.totaldepreciationval - type: number - source: asset - - name: name - label: reports.asset.name - type: string - source: asset - - name: code - label: reports.asset.code - type: string - source: asset - - name: ordernumber - label: reports.asset.ordernumber - type: number - - name: warrantyavailable - label: reports.asset.warrantyavailable - type: string - source: asset - - name: wipreferenceno - label: reports.asset.wipreferenceno - type: string - source: asset - - name: floors - label: reports.asset.floors - type: number - source: asset - - name: titledocumentsavailable - label: reports.asset.titledocumentsavailable - type: number - - name: buyername - label: reports.asset.buyername - type: string - source: asset - - name: accumulateddepreciation - label: reports.asset.accumulateddepreciation - type: number - source: asset - - name: openingdate - label: reports.asset.openingdate - type: number - source: asset - - name: fundsourcename - label: reports.asset.fundsource - type: string - source: asset - - name: location - label: reports.asset.location - type: string - source: asset - - name: totalsurveyno - label: reports.asset.totalsurveyno - type: string - source: asset - - name: assetattributes - label: reports.asset.assetattributes - type: string - source: asset - - name: assetsubcategoryname - label: reports.asset.assetsubcategoryname - type: string - source: asset - - name: assetparentcategoryname - label: reports.asset.assetparentcategoryname - type: string - source: asset - - name: depreciationrate - label: reports.asset.depreciationrate - type: number - source: asset - - name: totalrevalsum - label: reports.asset.totalrevalsum - type: number - source: asset - searchParams: - - name: fromDate - label: reports.asset.fromDate - type: date - source: asset - searchClause : AND asset.createddate>=$fromDate - isMandatory: false - - name: toDate - label: reports.asset.toDate - type: date - source: asset - searchClause : AND asset.createddate<=$toDate - isMandatory: false - - name: name - label: reports.asset.name - type: string - isMandatory: false - source: asset - searchClause : AND asset.name=$name - - name: code - label: reports.asset.code - type: string - isMandatory: false - source: asset - searchClause : AND asset.code=$code - - name: assetdetail - label: reports.asset.detail - type: number - isMandatory: false - source: asset - searchClause : and asset.code in ($assetdetail) - - query: select asset.name,asset.code,asset.ordernumber,asset.warrantyavailable,asset.wipreferenceno,asset.titledocumentsavailable as titledocumentsavailable,asset.accumulateddepreciation,asset.grossvalue,asset.id,asset.quantity,asset.totalarea,asset.openingdate,asset.fundsource,asset.location,(select string_agg(land.surveynumber,',') from egasset_asset_landdetails land where land.isenabled=true and asset.id=land.assetid group by asset.id) as totalsurveyno,asset.assetattributes,funds.fundsourcename, - asset.acquiredfrom,asset.anticipatedLife,asset.modeofacquisition,asset.warrantyexpirydate,asset.defectliabilityyear as defectliability,asset.defectliabilitymonth as defectliabilitymonth,asset.assetCategoryType,coalesce(grossvalue,0.0)-coalesce(accumulateddepreciation,0.0)+coalesce(incrementalrevalsum,0.0)-coalesce(decrementalrevalsum,0.0) as totalrevalsum, - asset.defectliabilityday as defectliabilityday,asset.securitydepositretained, - asset.securitydepositrealized,asset.dateofcreation,asset.acquisitiondate,asset.grossvalue,asset.originalvalue,currentvalue.currentamount, - disposal.salevalue as disposalsalevalue,disposal.profitlossvoucherreference as disposalvoucherno,disposal.disposaldate,disposal.buyername,disposal.buyeraddress, - revaluation.revaluationdate,revaluation.incrementalrevalsum,revaluation.decrementalrevalsum,assetsubcategoryname,assetSubCategory.depreciationrate,assetsubcategoryparent, - assetparentcategoryname - from egasset_asset asset left outer join - (select b.* from egasset_current_value b inner join ( select assetid,tenantid,max(createdtime) as createdtime from egasset_current_value - where tenantid = $tenantid group by assetid,tenantid) c - ON b.assetid = c.assetid and b.tenantid=c.tenantid AND c.createdtime=b.createdtime) currentvalue - ON asset.id=currentvalue.assetid AND asset.tenantid=currentvalue.tenantid - left outer join egasset_disposal disposal ON asset.id=disposal.assetid AND asset.tenantId = disposal.tenantid - left outer join - (select rev1.*,revinc.incrementalrevalsum,revdec.decrementalrevalsum from egasset_revaluation rev1 inner join - (select assetid,tenantid,max(createddate) as createddate from egasset_revaluation where tenantid = $tenantid - group by assetid,tenantid ) revalmax ON rev1.assetid=revalmax.assetid AND rev1.tenantid=revalmax.tenantid AND rev1.createddate=revalmax.createddate - left outer join - (select assetid,tenantid,sum(revaluationamount) as incrementalrevalsum from egasset_revaluation where tenantid = $tenantid - AND typeofchange='INCREASED' group by assetid,tenantid) revinc ON rev1.assetid=revinc.assetid and rev1.tenantid=revinc.tenantid - left outer join (select assetid,tenantid,sum(revaluationamount) as decrementalrevalsum from egasset_revaluation - where tenantid = $tenantid AND typeofchange='DECREASED' group by assetid,tenantid) revdec - ON rev1.assetid=revdec.assetid and rev1.tenantid=revdec.tenantid - where rev1.tenantid = $tenantid) revaluation - ON asset.tenantid=revaluation.tenantid AND asset.id=revaluation.assetid - left outer join ( select assetSubcategory.name assetsubcategoryname,assetSubcategory.depreciationrate as depreciationrate, - assetSubcategory.parent as assetsubcategoryparent,assetSubcategory.tenantid as tenantid,assetSubcategory.id assetsubcategoryid, - ac.name as assetparentcategoryname from (VALUES tbl_assetsubcategory) as assetSubcategory (id,name,depreciationRate,parent,tenantId) - inner join (VALUES tbl_assetcategory) as ac (id,name,tenantId) ON assetSubcategory.parent = ac.id ) as - assetsubcategory ON asset.assetcategory::character varying=assetsubcategory.assetsubcategoryid left outer join (select funds.name fundsourcename,funds.code from (VALUES tbl_funds) as funds (id,tenantId,name,code)) as funds ON asset.fundsource=funds.code - where asset.tenantid = $tenantid AND asset.assetCategoryType='LAND' diff --git a/configs/reports/configs/citizen-reports.yml b/configs/reports/configs/citizen-reports.yml deleted file mode 100644 index 47098b07..00000000 --- a/configs/reports/configs/citizen-reports.yml +++ /dev/null @@ -1,49 +0,0 @@ ---- -ReportDefinitions: -- reportName: CitizenService - summary: Citizen Services Report - version: 1.0.0 - moduleName: citizen - sourceColumns: - - name: receiptNo - label: reports.citizen.receiptno - type: string - source: citizen - - name: receiptDate - label: reports.citizen.receiptdate - type: number - source: citizen - - name: totalAmount - label: reports.citizen.totalamount - type: number - source: citizen - - name: payeeName - label: reports.citizen.payeename - type: number - source: citizen - - name: consumerAddress - label: reports.citizen.consumeraddress - type: number - source: citizen - - name: print - label: reports.citizen.print - type: number - source: citizen - linkedReport: - reportName: ReceiptDetail - linkedColumn: _url?/pgr/viewGrievance/:srn - searchParams: - - name: consumerno - label: reports.citizen.consumerno - type: string - source: citizen - isMandatory: false - searchClause: and consumerNo = $consumerno - - name: receiptno - label: reports.citizen.receiptno - type: string - source: citizen - isMandatory: false - searchClause: and receiptno = $receiptno - query: select receiptNo,receiptDate,totalAmount,payeeName,consumerAddress,'print' as print from egcl_legacy_receipt_header where tenantid = $tenantid - diff --git a/configs/reports/configs/common-reports.yml b/configs/reports/configs/common-reports.yml deleted file mode 100644 index 98f4b55f..00000000 --- a/configs/reports/configs/common-reports.yml +++ /dev/null @@ -1,68 +0,0 @@ ---- -ReportDefinitions: -- reportName: CommonInbox - summary: Common Inbox - version: 1.0.0 - moduleName: common - sourceColumns: - - name: createddate - label: reports.common.createddate - type: epoch - source: common - - name: sendername - label: reports.common.sendername - type: string - source: egpgr_router - - name: natureoftask - label: reports.common.natureoftask - type: string - source: common - - name: status - label: reports.common.status - type: string - source: common - - name: details - label: reports.common.details - type: string - source: common - - name: url - label: reports.common.url - type: string - source: common - searchParams: - - name: positionId - label: reports.pgr.complaintcategorytype - type: number - source: seva - - name: complainttype - label: reports.pgr.complainttype - type: number - source: seva - query: select * from ( - (select sub.createddate as createddate,sub.name as senderName,'Grievance' as natureoftask ,sub_a.code as status, - 'Complaint No.'|| sub.crn||' regarding '|| - (select name from egpgr_complainttype where code =sub.servicecode AND tenantid=sub.tenantid) ||' in '|| sub_a.code as details, - replace('_url?/pgr/viewGrievance/:srn',':srn',replace(sub.crn, '/', '%2F')::character varying) as url from submission sub inner join submission_attribute sub_a on sub.crn = sub_a.crn where - sub_a.key in('systemStatus','status') and sub_a.code in ('REGISTERED','FORWARDED','PROCESSING','REOPENED','ONHOLD') and sub.positionid IN ($positionId) and sub.tenantid = $tenantid order by createdDate desc) - union - (select createddate as createddate,sendername as sendername,natureoftask as natureoftask,value as status, abstractestimate.abstractestimatenumber::character varying ||':'||comments as details, - replace('_url?/non-framework/works/transaction/update/abstractEstimate/:id', ':id', replace(abstractestimate.abstractestimatenumber, '/', '%2F')::character varying) as url from EG_WF_STATES states JOIN - egw_abstractestimate abstractestimate ON abstractestimate.stateid = states.id::character varying where type = 'AbstractEstimate' and owner_pos IN ($positionId) - and states.tenantId=$tenantid and states.status<>2 order by states.createdDate desc) - union - (select createddate as createddate,sendername as sendername,natureoftask as natureoftask,value as status, abstractestimate.abstractestimatenumber::character varying ||':'||comments as details, - replace('_url?/non-framework/works/transaction/update/abstractEstimate/:id', ':id', replace(abstractestimate.abstractestimatenumber, '/', '%2F')::character varying) as url from EG_WF_STATES states JOIN - egw_abstractestimate abstractestimate ON abstractestimate.stateid = states.id::character varying where type = 'SpilloverAbstractEstimate' and owner_pos IN ($positionId) - and states.tenantId=$tenantid and states.status<>2 order by states.createdDate desc) - union - (select createddate as createddate,sendername as sendername,natureoftask as natureoftask,value as status, detailedestimate.id::character varying ||':'||comments as details, - replace('_url?/non-framework/works/transaction/viewDetailedEstimate/:id', ':id', replace(detailedestimate.estimatenumber, '/', '%2F')::character varying) as url from EG_WF_STATES states JOIN - egw_detailedestimate detailedestimate ON detailedestimate.stateid = states.id::character varying where type = 'DetailedEstimate' and owner_pos IN ($positionId) - and states.tenantId=$tenantid and states.status<>2 order by states.createdDate desc) - union - (select createddate as createddate,sendername as sendername,natureoftask as natureoftask,value as status, detailedestimate.id::character varying ||':'||comments as details, - replace('_url?/non-framework/works/transaction/viewDetailedEstimate/:id', ':id', replace(detailedestimate.estimatenumber, '/', '%2F')::character varying) as url from EG_WF_STATES states JOIN - egw_detailedestimate detailedestimate ON detailedestimate.stateid = states.id::character varying where type = 'SpilloverDetailedEstimate' and owner_pos IN ($positionId) - and states.tenantId=$tenantid and states.status<>2 order by states.createdDate desc)) result - order by createddate desc; - diff --git a/configs/reports/configs/e-pass-reports.yml b/configs/reports/configs/e-pass-reports.yml deleted file mode 100644 index bb145438..00000000 --- a/configs/reports/configs/e-pass-reports.yml +++ /dev/null @@ -1,96 +0,0 @@ -ReportDefinitions: -- reportName: epassreport - summary: epass report - version: 1.0.0 - moduleName: rainmaker-epass - sourceColumns: - - name: applicationnumber - label: reports.epass.applicationnumber - type: string - source: epass - total: false - - name: applicationdate - label: reports.epass.applicationdate - type: string - source: epass - total: false - - name: fromdistrict - label: reports.epass.fromdistrict - type: string - source: epass - total: false - - name: todistrict - label: reports.epass.todistrict - type: string - source: epass - total: false - - name: tradeType - label: reports.epass.tradetype - type: string - source: epass - total: false - - name: issuedate - label: reports.epass.issuedate - type: string - source: epass - total: false - - name: purpose - label: reports.epass.purpose - type: string - source: epass - total: false - - name: vehiclenumber - label: reports.epass.vehiclenumber - type: string - source: epass - total: false - - name: licensenumber - label: reports.epass.licensenumber - type: string - source: epass - total: false - - name: status - label: reports.epass.status - type: string - source: epass - total: false - - name: rejectionremarks - label: reports.epass.rejectionremarks - type: string - source: epass - total: false - searchParams: - - name: fromDate - label: reports.epass.fromDate - type: epoch - source: epass - isMandatory: false - searchClause: AND tl.createdtime >= $fromDate - - name: toDate - label: reports.epass.toDate - type: epoch - source: epass - isMandatory: false - searchClause: AND tl.createdtime <= $toDate - query: | - select - tl.applicationnumber, - to_char((To_timestamp(tl.createdtime/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY HH:MI AM') as applicationDate, - CASE WHEN tlu.tradeType = 'INTERSTATE' THEN 'Other State to MP Pass' - WHEN tlu.tradeType = 'INTRASTATE' THEN 'MP Inter District Pass' - WHEN tlu.tradeType = 'MP_TO_OTHER_STATE' THEN 'MP to Other State Pass' - ELSE 'NA' END as tradeType, - initcap(replace(tld.additionaldetail->>'fromDistrict', 'MP_', '')) as fromDistrict, - initcap(replace(tld.additionaldetail->>'toDistrict', 'MP_', '')) as toDistrict, - COALESCE(to_char((To_timestamp(tl.issueddate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY HH:MI AM'), '') as issueDate, - initcap(replace(COALESCE(tld.additionaldetail->>'purpose', ''), '_',' ')) as purpose, - COALESCE(tld.additionaldetail->>'vehicleNumber', '') as vehicleNumber, - COALESCE(tl.licensenumber, '') as licensenumber, - initcap(tl.status) as status, - COALESCE(tlw.comment, '') as rejectionRemarks - from eg_tl_tradelicense as tl - inner join eg_tl_tradelicensedetail as tld on tld.tradelicenseid = tl.id - inner join eg_tl_TradeUnit as tlu on tlu.tradeLicenseDetailId = tld.id - left join eg_wf_processinstance_v2 as tlw on tlw.businessid = tl.applicationnumber and tlw.action = 'REJECT' - where tl.tenantid = $tenantid and tl.status not in ('INITIATED') - orderby: order by tl.createdtime desc diff --git a/configs/reports/configs/finance-reports.yml b/configs/reports/configs/finance-reports.yml deleted file mode 100644 index a7cb996b..00000000 --- a/configs/reports/configs/finance-reports.yml +++ /dev/null @@ -1,177 +0,0 @@ -ReportDefinitions: - - reportName: ReceiptRegister - summary: Receipt Register - version: 1.0.0 - moduleName: finance - externalService: - - entity: $.MdmsRes.common-masters.Department - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=common-masters&masterName=Department&tenantId=$tenantId - keyOrder: name,code - tableName: tbl_def_dept - sourceColumns: - - name: receiptnumber - label: reports.fin.erp.receiptnumber - type: string - source: finance-erp - total: false - - name: receiptdate - label: reports.fin.erp.receiptdate - type: string - source: finance-erp - total: false - - name: service - label: reports.fin.erp.service - type: string - source: finance-erp - total: false - - name: department - label: reports.fin.erp.department - type: string - source: finance-erp - total: false - - name: cash - label: reports.fin.erp.cash - type: number - source: finance-erp - total: true - - name: chequenumber - label: reports.fin.erp.chequenumber - type: number - source: finance-erp - total: false - - name: cheque - label: reports.fin.erp.cheque - type: number - source: finance-erp - total: true - - name: online - label: reports.fin.erp.online - type: number - source: finance-erp - total: true - - name: card - label: reports.fin.erp.card - type: number - source: finance-erp - total: true - - name: status - label: reports.fin.erp.status - type: string - source: finance-erp - total: false - searchParams: - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: false - searchClause: AND receiptdate >= $fromDate - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: false - searchClause: AND receiptdate <= $toDate - - name: dept - label: Department - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=common-masters&masterName=Department|$.MdmsRes.common-masters.Department[*].code|$.MdmsRes.common-masters.Department[*].name - source: finance-erp - wrapper: true - isMandatory: false - searchClause: AND deptmap_def.code = $dept - - name: service - label: Service - type: singlevaluelist - pattern: http://egov-common-masters:8080/egov-common-masters/businessDetails/_search?tenantId=$tenantid&active=true|$.BusinessDetails[*].code|$.BusinessDetails[*].name - source: finance-erp - wrapper: true - isMandatory: false - searchClause: AND rt.businessdetails = $service - - query: select to_char(to_timestamp(rt.receiptdate/1000),'DD/MM/YYYY') as receiptdate, rt.receiptnumber as receiptnumber, bd.name as Service, deptmap_def.name as department, (case when instrumenttype='Cash' then ins.amount end) as cash, (case when instrumenttype='Cheque' then ins.amount when instrumenttype='DD' then ins.amount end) as cheque, (case when instrumenttype='Cheque' then ins.instrumentnumber when instrumenttype='DD' then ins.instrumentnumber end) as chequenumber, (case when instrumenttype='Online' then ins.amount end) as online, (case when instrumenttype='Card' then amount end) as card, rt.status as status from egcl_receiptheader rt inner join (VALUES tbl_def_dept) AS deptmap_def(name,code) on deptmap_def.code=rt.department, eg_businessdetails bd, egcl_instrumentheader ins where ins.id = (select instrumentheader from egcl_receiptinstrument where receiptheader = rt.id) and rt.tenantid = bd.tenantid and rt.businessdetails = bd.code - orderby: ORDER BY receiptdate DESC NULLS LAST - - reportName: BankRemittance - summary: BankRemittance - version: 1.0.0 - moduleName: finance - sourceColumns: - - name: receiptnumber - label: reports.fin.erp.receiptnumber - type: string - source: finance-erp - total: false - - name: receiptdate - label: reports.fin.erp.receiptdate - type: string - source: finance-erp - total: false - - name: modeofpayment - label: reports.fin.erp.modeofpayment - type: string - source: finance-erp - total: false - - name: chequenumber - label: reports.fin.erp.chequenumber - type: string - source: finance-erp - total: false - - name: bankname - label: reports.fin.erp.bankname - type: string - source: finance-erp - total: false - - name: branchname - label: reports.fin.erp.branchname - type: string - source: finance-erp - total: false - - name: chequdate - label: reports.fin.erp.chequedate - type: string - source: finance-erp - total: false - - name: amount - label: reports.fin.erp.amount - type: number - source: finance-erp - total: true - searchParams: - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: false - searchClause: AND receiptdate >= $fromDate - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: false - searchClause: AND receiptdate <= $toDate - - name: dept - label: Department - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=common-masters&masterName=Department|$.MdmsRes.common-masters.Department[*].code|$.MdmsRes.common-masters.Department[*].name - source: finance-erp - wrapper: true - isMandatory: false - searchClause: AND rt.department = $dept - - name: service - label: Service - type: singlevaluelist - pattern: http://egov-common-masters:8080/egov-common-masters/businessDetails/_search?tenantId=$tenantid&active=true|$.BusinessDetails[*].code|$.BusinessDetails[*].name - source: finance-erp - wrapper: true - isMandatory: false - searchClause: AND rt.businessdetails = $service - - name: bankaccount - label: Bank Account - type: singlevaluelist - pattern: https://jalandhar-dev.egovernments.org/services/EGF/rest/bankaccount?tenantId=$tenantid|$.bankaccounts[*].code|$.bankaccounts[*].account - source: finance-erp - wrapper: true - isMandatory: false - searchClause: And ins.bankaccountid = $bankaccount - - query: select receiptnumber as receiptnumber , to_char(to_timestamp(receiptdate/1000),'DD/MM/YYYY') as receiptdate, instrumenttypeid as modeofpayment, transactionnumber as chequenumber, bankid as bankname, branchname branchname,amount as amount from egf_instrumentvoucher vh INNER JOIN egf_instrument ins on ins.id = vh.instrumentid INNER JOIN egcl_receiptheader rt on rt.id = vh.receiptheaderid WHERE rt.status = 'Remitted' diff --git a/configs/reports/configs/hrms-reports.yml b/configs/reports/configs/hrms-reports.yml deleted file mode 100644 index aa3eeb5a..00000000 --- a/configs/reports/configs/hrms-reports.yml +++ /dev/null @@ -1,85 +0,0 @@ ---- -ReportDefinitions: -- reportName: HRMSEmployeewiseReport - decryptionPathId: TradeLicenseDetailsReport_v2 - summary: HRMS Employeewise Report - version: 1.0.0 - moduleName: rainmaker-hrms - sourceColumns: - - name: name - label: reports.hrms.name - type: string - source: hrms - total: false - - name: mobilenumber - label: reports.hrms.mobilenumber - type: string - source: hrms - total: false - - name: tenantid - label: reports.hrms.tenantid - type: string - source: hrms - total: false - - name: role_assigned - label: reports.hrms.role_assigned - type: string - source: hrms - total: false - - name: user_id - label: reports.hrms.user_id - type: string - source: hrms - total: false - - name: departmentname - label: report.hrms.departmentname - type: string - source: hrms - total: false - - name: designationname - label: reports.hrms.designationname - type: string - source: hrms - total: false - - name: status - label: reports.hrms.status - type: string - source: hrms - total: false - searchParams: - - name: ulb - label: ULB - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name - source: pt - wrapper: true - isMandatory: false - searchClause: AND u.tenantId = $ulb - query: | - with userroles as - ( - select user_id,string_agg(role_code,',') as role_codes - from eg_userrole_v1 - group by user_id - ) - select - u.name, - u.mobilenumber, - u.tenantid, - r.role_codes as role_assigned, - e.code as user_id, - --assign.department, - --assign.designation, - msg.message as departmentname, - msg1.message as designationname, - case - when u.active='true' then 'Active' - when u.active='false' then 'Inactive' - end as status - from eg_user u - inner join userroles r on u.id=r.user_id inner join eg_hrms_employee e on u.id=e.id - inner join eg_hrms_assignment assign on e.uuid=assign.employeeid and assign.iscurrentassignment='true' - inner join message as msg on msg.code=concat('COMMON_MASTERS_DEPARTMENT_',assign.department) and msg.locale='en_IN' - inner join message as msg1 on msg1.code=concat('COMMON_MASTERS_DESIGNATION_',assign.designation) and msg1.locale='en_IN' - where u.type!='CITIZEN' - orderby: ORDER BY u.tenantId asc diff --git a/configs/reports/configs/inventoryReport.yml b/configs/reports/configs/inventoryReport.yml deleted file mode 100644 index d04da1db..00000000 --- a/configs/reports/configs/inventoryReport.yml +++ /dev/null @@ -1,1090 +0,0 @@ ---- -ReportDefinitions: - # Stock Opening Balance Report -- reportName: openingBalanceReport - summary: Stock Opening Balance Report - version: 1.0.0 - moduleName: inventory - externalService: - - entity: $.MdmsRes.inventory.Material - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=inventory&masterName=Material&tenantId=$tenantid - keyOrder: code,name,tenantId - tableName: tbl_material - - entity: $.MdmsRes.common-masters.Uom - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=common-masters&masterName=Uom&tenantId=$tenantid - keyOrder: code,conversionFactor,tenantId - tableName: tbl_uom - sourceColumns: - - - name: financialYear - label: inventory.financialYear - type: string - source: materialReceipt - - - name: storeName - label: inventory.store.name - type: string - source: materialReceipt - - - name: materialCode - label: inventory.material.code - type: string - source: materialReceipt - - - name: materialName - label: inventory.materialName - type: string - source: material - - - name: materialTypeName - label: inventory.material.materialtype - type: string - source: materialReceiptDetails - - - name: uom - label: reports.inventory.openbal.Uom - type: string - source: materialReceiptDetails - - - name: qty - label: reports.inventory.openbal.Qty. - type: string - source: materialReceiptDetails - - - name: rate - label: inventory.Rate - type: string - source: materialReceiptDetails - - - name: totalAmount - label: reports.inventory.openbal.TotalAmount - type: string - source: materialReceiptDetails - - - name: remarks - label: reports.inventory.openbal.Remarks - type: string - source: materialReceiptDetails - - searchParams: - - name: financialYear - label: inventory.financialYear - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$..finYearRange|$..finYearRange - source: materialReceipt - isMandatory: true - - - name: storeName - label: inventory.store.name - type: singlevaluelist - pattern: http://inventory-services:8080/inventory-services/stores/_search?active=true&tenantId=$tenantid|$..code|$..name - source: store - isMandatory: true - wrapper: true - - - name: materialTypeName - label: inventory.material.materialtype - type: singlevaluelist - pattern: 'list://OPENING BALANCE:OPENING BALANCE' - source: materialReceipt - isMandatory: false - searchClause: AND matrcpt.receiptType = $materialTypeName - - - name: materialName - label: inventory.materialName - type: string - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=inventory&masterName=Material&tenantId=$tenantid|$.MdmsRes.inventory.Material.*.code|$.MdmsRes.inventory.Material.*.name - source: materialReceipt - isMandatory: false - searchClause: AND mat.name = $materialName - query: SELECT matrcpt.financialyear AS financialyear, - store.name AS storeName, - matrcptdtl.material AS materialcode, - mat.name AS materialname, - matrcpt.receiptType AS materialtypename, - matrcptdtl.uomno AS uom, - (matrcptdtl.receivedqty / (SELECT CAST(conversionFactor AS bigint) FROM (values tbl_uom )AS tb (code,conversionFactor,tenantid) - WHERE tb.code = matrcptdtl.uomno AND tb.tenantid= $tenantid AND matrcptdtl.tenantid = $tenantid)) ::numeric(13,2) AS qty, - matrcptdtl.unitrate AS rate, - (matrcptdtl.unitrate * (matrcptdtl.receivedqty / (SELECT CAST(conversionFactor AS bigint) FROM (values tbl_uom )AS tb (code,conversionFactor,tenantid) - WHERE tb.code = matrcptdtl.uomno AND tb.tenantid= $tenantid AND matrcptdtl.tenantid = $tenantid))) ::numeric(13,2) AS totalamount, - matrcptdtl.remarks AS remarks - FROM materialreceipt matrcpt, - (VALUES tbl_material) AS mat (code, name, tenantid), - (VALUES tbl_uom) AS uomtbl (code,conversionFactor,tenantid), - materialreceiptdetail matrcptdtl , store store - WHERE matrcpt.financialyear = $financialYear - AND matrcpt.receivingstore = store.code - AND matrcpt.receivingstore = $storeName - AND store.tenantid = matrcpt.tenantid - AND mat.tenantid= matrcpt.tenantid - AND uomtbl.code=matrcptdtl.uomno - AND uomtbl.tenantid= store.tenantid - AND matrcpt.tenantid = matrcptdtl.tenantid - AND mat.tenantid = matrcpt.tenantid - AND matrcpt.tenantid = $tenantid - AND matrcpt.mrnnumber = matrcptdtl.mrnnumber - AND mat.code = matrcptdtl.material - -# Supplier Report -- reportName: supplierreport - summary: Supplier List - version: 1.0.0 - moduleName: inventory - sourceColumns: - - name: supplierCode - label: inventory.supplier.code - type: string - source: supplier - - - name: supplierType - label: inventory.supplier.type - type: string - source: supplier - - - name: supplierName - label: inventory.supplier.name - type: string - source: supplier - - - name: status - label: inventory.common.status - type: string - source: supplier - - - name: address - label: inventory.supplier.address - type: string - source: supplier - - - name: contactNo - label: inventory.common.contactNo - type: string - source: supplier - - - name: email - label: inventory.report.email - type: string - source: supplier - - - name: cstNo - label: inventory.common.cstno - type: string - source: supplier - - - name: bankName - label: inventory.common.bankname - type: string - source: supplier - - - name: bankBranch - label: inventory.common.bankbranchname - type: string - source: supplier - - - name: bankAcctNo - label: inventory.common.bankacctno - type: string - source: supplier - - - name: ifsc - label: inventory.common.ifsc - type: string - source: supplier - - - name: contactPerson - label: inventory.common.contactperson - type: string - source: supplier - - - name: contactPersonNo - label: inventory.common.contactpersonno - type: string - source: supplier - - query: SELECT supplier.code AS supplierCode, supplier.type AS supplierType, supplier.name AS supplierName, - supplier.status AS status, supplier.address AS address , supplier.contactno AS contactNo, - supplier.email AS email, supplier.cstno AS cstNo, - bank.name AS bankName, supplier.bankbranch AS bankBranch, supplier.bankacctno AS bankAcctNo, - supplier.bankifsc AS ifsc, supplier.contactperson AS contactPerson, - supplier.contactpersonno AS contactPersonNo - FROM supplier AS supplier, egf_bank bank - WHERE - bank.code = supplier.bankcode - AND bank.tenantid = supplier.tenantid - AND supplier.tenantid = $tenantid - ORDER BY supplier.name asc; - -# Material Returned Report -# Need to change drop down Link based on report and Query -- reportName: materialReturnedReport - summary: Material Returned Report - version: 1.0.0 - moduleName: inventory - sourceColumns: - - - name: materialReturnNo - label: inventory.materialReturnNo - type: string - source: inventory - - - name: returnDate - label: inventory.returnDate - type: string - source: inventory - - - name: supplierName - label: inventory.supplierName - type: epoch - source: inventory - - - name: materialCode - label: inventory.materialCode - type: string - source: inventory - - - name: materialName - label: inventory.materialName - type: string - source: inventory - - - name: returnedQty - label: inventory.returnedQty - type: string - source: inventory - - - name: uom - label: inventory.uom - type: string - source: inventory - - - name: unitRate - label: inventory.unitRate - type: string - source: inventory - - - name: totalReturnedAmount - label: inventory.totalReturnedAmount - type: string - source: inventory - - - name: returnRemarks - label: inventory.returnRemarks - type: string - source: inventory - - - name: returnBy - label: inventory.returnBy - type: string - source: inventory - - searchParams: - - - name: storeName - label: inventory.store.name - type: singlevaluelist - pattern: http://inventory-services:8080/inventory-services/stores/_search?active=true&tenantId=$tenantid|$..code|$..name - source: store - isMandatory: true - - - name: fromDate - label: inventory.fromDate - type: epoch - source: inventory - isMandatory: false - - - name: toDate - label: inventory.toDate - type: epoch - source: inventory - isMandatory: false - - - name: supplierName - label: inventory.supplierName - pattern: http://inventory-services:8080/inventory-services/suppliers/_search?tenantId=$tenantid|$..code|$..name - type: singlevaluelist - source: inventory - isMandatory: false - - - name: materialReturnNo - label: inventory.materialReturnNo - type: singlevaluelist - source: inventory - isMandatory: false - - - name: materialName - label: inventory.materialName - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=inventory&masterName=Material&tenantId=$tenantid|$.MdmsRes.inventory.Material.*.code|$.MdmsRes.inventory.Material.*.name - type: singlevaluelist - source: inventory - isMandatory: false - - query: SELECT * FROM material; - -# Disposal of Scrap Report -# Need to Change drop down Link based on report and Query -- reportName: disposalOfScrapReport - summary: Disposal of Scrap Report - version: 1.0.0 - moduleName: inventory - sourceColumns: - - - name: storeName - label: inventory.storeName - type: string - source: inventory - - - name: materialCode - label: inventory.materialCode - type: string - source: inventory - - - name: materialName - label: inventory.materialName - type: string - source: inventory - - - name: materialTypeName - label: inventory.materialTypeName - type: epoch - source: inventory - - - name: disposalNo - label: inventory.disposalNo - type: string - source: inventory - - - name: disposalDate - label: inventory.disposalDate - type: string - source: inventory - - - name: disposalQty - label: inventory.disposalQty - type: string - source: inventory - - - name: uom - label: inventory.uom - type: string - source: inventory - - - name: disposalValue - label: inventory.disposalValue - type: string - source: inventory - - - name: lotNo - label: inventory.lotNo - type: string - source: inventory - - - name: disposalBy - label: inventory.disposalBy - type: string - source: inventory - - - name: remarks - label: inventory.remarks - type: string - source: inventory - - searchParams: - - - name: storeName - label: inventory.store.name - type: singlevaluelist - pattern: http://inventory-services:8080/inventory-services/stores/_search?active=true&tenantId=$tenantid|$..code|$..name - source: store - isMandatory: true - - - name: disposalFromDate - label: inventory.disposalFromDate - type: epoch - source: inventory - isMandatory: false - - - name: toDate - label: inventory.toDate - type: epoch - source: inventory - isMandatory: false - - - name: materialtypename - label: inventory.materialtypename - type: singlevaluelist - source: inventory - isMandatory: false - - - name: disposalNo - label: inventory.disposalNo - type: singlevaluelist - source: inventory - isMandatory: false - - - name: materialName - label: inventory.materialName - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=inventory&masterName=Material&tenantId=$tenantid|$.MdmsRes.inventory.Material.*.code|$.MdmsRes.inventory.Material.*.name - type: singlevaluelist - source: inventory - isMandatory: false - - query: SELECT * FROM material; - -# Rates comparison with history data Report -- reportName: ratesComparisonWithHistory - summary: Rates comparison with history data - version: 1.0.0 - moduleName: inventory - externalService: - - entity: $.MdmsRes.inventory.Material - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=inventory&masterName=Material&tenantId=$tenantid - keyOrder: code,name,tenantId - tableName: tbl_material - sourceColumns: - - - name: materialCode - label: inventory.material.code - type: string - source: inventory - - - name: materialName - label: inventory.material.name - type: string - source: inventory - - - name: supplierName - label: inventory.supplierName - type: string - source: inventory - - - name: rateType - label: inventory.rateType - type: string - source: inventory - - - name: currentRate - label: inventory.currentRate - type: string - source: inventory - - - name: currentYear - label: inventory.currentYear - type: string - source: inventory - - - name: previousYear - label: inventory.previousYear - type: string - source: inventory - - searchParams: - - name: supplierName - label: inventory.supplierName - pattern: http://inventory-services:8080/inventory-services/suppliers/_search?tenantId=$tenantid|$..code|$..name - type: singlevaluelist - source: inventory - searchClause: AND pl.supplier = $supplierName - wrapper: true - isMandatory: false - - - name: materialName - label: inventory.materialName - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=inventory&masterName=Material&tenantId=$tenantid|$.MdmsRes.inventory.Material.*.code|$.MdmsRes.inventory.Material.*.name - type: singlevaluelist - source: inventory - searchClause: AND pld.material = $materialName - isMandatory: false - wrapper: true - - query: SELECT pld.material AS materialCode, - sup.name AS supplierName, - mat.name AS materialName, - pl.ratetype AS ratetype, - pld.ratePerUnit AS currentRate, - (SELECT count(*) FROM pricelistdetails WHERE material=pld.material AND pld.tenantid = $tenantid - AND fromdate::bigint >= (SELECT EXTRACT(EPOCH FROM timestamptz (CONCAT ((SELECT to_char(now(),'YYYY')),'-','01','-','01')))) - AND todate::bigint <= (SELECT EXTRACT(EPOCH FROM timestamptz (CONCAT ((SELECT to_char(now(),'YYYY')),'-','03','-','01'))))) AS currentYear, - (SELECT count(*) FROM pricelistdetails WHERE material=pld.material AND pricelistdetails.tenantid = $tenantid - AND fromdate::bigint >= (SELECT EXTRACT(EPOCH FROM timestamptz (CONCAT ((SELECT to_char(now()- interval '1 year','YYYY')),'-','01','-','01')))) - AND todate::bigint <= (SELECT EXTRACT(EPOCH FROM timestamptz (CONCAT ((SELECT to_char(now()- interval '1 year','YYYY')),'-','12','-','31'))))) AS previousYear - FROM pricelist pl,pricelistdetails pld,supplier sup,(VALUES tbl_material) AS mat (code, name, tenantid) - WHERE - pld.tenantid = sup.tenantid - AND sup.tenantid = pl.tenantid - AND pl.tenantid = $tenantid - AND mat.tenantid = pld.tenantid - AND pl.supplier = sup.code - AND pl.id = pld.pricelist - AND pld.deleted = false - AND mat.code = pld.material - -# Comparison between different rates Report -- reportName: comparisonBetweenDifferentRates - summary: Comparison between different rates - version: 1.0.0 - moduleName: inventory - externalService: - - entity: $.MdmsRes.inventory.Material - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=inventory&masterName=Material&tenantId=$tenantid - keyOrder: code,name,tenantId - tableName: tbl_material - sourceColumns: - - - name: materialCode - label: inventory.material.code - type: string - source: inventory - - - name: materialName - label: inventory.materialName - type: string - source: inventory - - - name: supplierName - label: inventory.supplierName - type: string - source: inventory - - - name: dtt - label: inventory.DTT - type: string - source: inventory - - - name: quotation - label: inventory.quotation - type: string - source: inventory - - - name: dgsnd - label: inventory.DGSND - type: string - source: inventory - - - name: tender - label: inventory.tender - type: string - source: inventory - - searchParams: - - name: supplierName - label: inventory.supplierName - pattern: http://inventory-services:8080/inventory-services/suppliers/_search?tenantId=$tenantid|$..code|$..name - type: singlevaluelist - source: inventory - searchClause: AND pl.supplier = $supplierName - wrapper: true - isMandatory: false - - - name: materialName - label: inventory.materialName - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=inventory&masterName=Material&tenantId=$tenantid|$.MdmsRes.inventory.Material.*.code|$.MdmsRes.inventory.Material.*.name - type: singlevaluelist - source: inventory - searchClause: AND pld.material = $materialName - isMandatory: false - wrapper: true - - - query: SELECT pld.material AS materialCode, - mat.name AS materialName, - sup.name AS supplierName, - ((SELECT ratePerUnit FROM pricelistdetails WHERE material=pld.material AND pl.rateType = 'Quotation' AND pld.tenantid = $tenantid - AND FROMdate::bigint <= (SELECT extract(epoch FROM now())*1000) AND todate::bigint >= (SELECT extract(epoch FROM now()))*1000) - ORDER BY createdtime desc limit 1) AS quotation, - ((SELECT ratePerUnit FROM pricelistdetails WHERE material=pld.material AND pl.rateType ='DGSC Rate Contract' AND pld.tenantid = $tenantid - AND FROMdate::bigint <= (SELECT extract(epoch FROM now())*1000) AND todate::bigint >= (SELECT extract(epoch FROM now()))*1000) - ORDER BY createdtime desc limit 1) AS dgsnd, - ((SELECT ratePerUnit FROM pricelistdetails WHERE material=pld.material AND pl.rateType = 'ULB Rate Contract' AND pld.tenantid = $tenantid - AND FROMdate::bigint <= (SELECT extract(epoch FROM now())*1000) AND todate::bigint >= (SELECT extract(epoch FROM now()))*1000) - ORDER BY createdtime desc limit 1) AS dtt, - ((SELECT ratePerUnit FROM pricelistdetails WHERE material=pld.material AND pl.rateType = 'One Time Tender' AND pld.tenantid = $tenantid - AND FROMdate::bigint <= (SELECT extract(epoch FROM now())*1000) AND todate::bigint >= (SELECT extract(epoch FROM now()))*1000) - ORDER BY createdtime desc limit 1) AS tender - FROM pricelistdetails pld, pricelist pl, (VALUES tbl_material) AS mat (code, name, tenantid) , supplier sup - WHERE pld.tenantid = $tenantid - AND pl.tenantid = pld.tenantid - AND sup.tenantid=pl.tenantId - AND mat.tenantid = pl.tenantid - AND mat.code = pld.material - AND sup.code = pl.supplier - AND pld.deleted = false - AND pld.pricelist = pl.id - -# Procurement Expenditure Report -# Need to Change drop down Link based on report and Query -- reportName: procurementExpenditureReport - summary: Procurement Expenditure Report - version: 1.0.0 - moduleName: inventory - sourceColumns: - - - name: budgetHeadCode - label: inventory.budgetHeadCode - type: string - source: inventory - - - name: nameOfBudgetHead - label: inventory.nameOfBudgetHead - type: string - source: inventory - - - name: estimateBudget - label: inventory.estimateBudget - type: string - source: inventory - - - name: actualExpenses - label: inventory.actualExpenses - type: string - source: inventory - - - name: remainingBudget - label: inventory.remainingBudget - type: string - source: inventory - - searchParams: - - - name: storeName - label: inventory.store.name - type: singlevaluelist - pattern: http://inventory-services:8080/inventory-services/stores/_search?active=true&tenantId=$tenantid|$..code|$..name - source: inventory - isMandatory: true - wrapper: true - - - name: financialYear - label: inventory.financialYear - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$..finYearRange|$..finYearRange - source: inventory - isMandatory: true - - - name: budgetHead - label: inventory.budgetHead - type: singlevaluelist - source: inventory - isMandatory: true - - query: SELECT * FROM material; - -# Supplier wise Purchase Order History Report -- reportName: SupplierwisesPurchaseOrderHistoryReport - summary: Supplier wise Purchase Order History - version: 1.0.0 - moduleName: inventory - sourceColumns: - - - name: supplierName - label: inventory.supplierName - type: string - source: inventory - - - name: supplierCompanyName - label: inventory.supplierCompanyName - type: string - source: inventory - - - name: poNo - label: inventory.poNo - type: string - source: inventory - - - name: poDate - label: inventory.poDate - type: epoch - source: inventory - - - name: poStatus - label: inventory.poStatus - type: string - source: inventory - - - name: expectedDeliveryDate - label: inventory.expecteddeliverydate - type: epoch - source: inventory - - - name: paymentDueDate - label: inventory.paymentDueDate - type: epoch - source: inventory - - - name: qtyOrdered - label: inventory.qtyOrdered - type: string - source: inventory - - - name: poTotal - label: inventory.poTotal - type: string - source: inventory - - - name: amountPaid - label: inventory.amountPaid - type: string - source: inventory - - - name: balanceDue - label: inventory.balanceDue - type: string - source: inventory - - searchParams: - - - name: supplierName - label: inventory.supplierName - pattern: http://inventory-services:8080/inventory-services/suppliers/_search?tenantId=$tenantid|$..code|$..name - type: singlevaluelist - source: inventory - searchClause: AND po.supplier = $supplierName - wrapper: true - isMandatory: false - - - name: supplierCompanyName - label: inventory.supplierCompanyName - pattern: http://inventory-services:8080/inventory-services/suppliers/_search?tenantId=$tenantid&type=COMPANY|$..code|$..name - type: singlevaluelist - source: inventory - searchClause: AND sup.name = $supplierCompanyName - isMandatory: false - - - name: storeName - label: inventory.store.name - pattern: http://inventory-services:8080/inventory-services/stores/_search?active=true&tenantId=$tenantid|$..code|$..name - type: singlevaluelist - searchClause: AND po.store = $storeName - source: inventory - isMandatory: false - wrapper: true - - - name: poNo - label: inventory.poNo - type: string - source: inventory - searchClause: AND po.purchaseordernumber = $poNo - isMandatory: false - - - name: poDate - label: inventory.poDate - type: epoch - source: inventory - searchClause: AND po.purchaseorderdate = $poDate - isMandatory: false - - query: SELECT sup.name AS suppliername, - (SELECT name FROM supplier WHERE type = 'COMPANY' AND tenantid =$tenantid) AS supplierCompanyName, - po.purchaseorderNumber AS PoNo, - po.purchaseorderdate AS PoDate, - po.status AS postatus, - po.expecteddeliverydate AS expecteddeliverydate, - pod.orderquantity AS qtyOrdered - FROM supplier sup,purchaseorder po,purchaseorderdetail pod - WHERE po.tenantid = $tenantid - AND pod.tenantid = po.tenantid - AND pod.tenantid = sup.tenantid - AND po.purchaseordernumber = pod.purchaseorder - AND po.supplier = sup.code - -# Material wise Purchase Order History Report -- reportName: MaterialwisePurchaseOrderHistoryReport - summary: Material wise Purchase Order History - version: 1.0.0 - moduleName: inventory - externalService: - - entity: $.MdmsRes.inventory.Material - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=inventory&masterName=Material&tenantId=$tenantid - keyOrder: code,name,tenantId,description - tableName: tbl_material - sourceColumns: - - - name: materialName - label: inventory.materialName - type: string - source: inventory - - - name: materialdescription - label: inventory.material.description - type: string - source: inventory - - - name: poNo - label: inventory.poNo - type: string - source: inventory - - - name: poDate - label: inventory.poDate - type: epoch - source: inventory - - - name: poStatus - label: inventory.poStatus - type: string - source: inventory - - - name: expectedDeliveryDate - label: inventory.expecteddeliverydate - type: epoch - source: inventory - - - name: paymentDueDate - label: inventory.paymentDueDate - type: epoch - source: inventory - - - name: qtyOrdered - label: inventory.qtyOrdered - type: string - source: inventory - - - name: poTotal - label: inventory.poTotal - type: string - source: inventory - - searchParams: - - - name: materialName - label: inventory.materialName - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=inventory&masterName=Material&tenantId=$tenantid - type: singlevaluelist - source: inventory - searchClause: AND pld.material = $materialName - wrapper: true - isMandatory: false - - - name: storeName - label: inventory.store.name - pattern: http://inventory-services:8080/inventory-services/stores/_search?active=true&tenantId=$tenantid|$..code|$..name - type: singlevaluelist - source: inventory - searchClause: AND po.store = $storeName - isMandatory: false - wrapper: true - - - name: poNo - label: inventory.poNo - type: string - source: inventory - searchClause: AND po.purchaseordernumber = $poNo - isMandatory: false - - - name: poDate - label: inventory.poDate - type: epoch - source: inventory - searchClause: AND po.purchaseorderdate = $poDate - isMandatory: false - - query: SELECT mat.name AS materialName, - mat .description AS materialdescription, - po.purchaseorderNumber AS PoNo, - po.purchaseorderdate AS PoDate, - po.status AS postatus, - po.expecteddeliverydate AS expecteddeliverydate, - pod.orderquantity AS qtyOrdered - FROM (VALUES tbl_material) AS mat (code, name, tenantid,description),purchaseorder po,purchaseorderdetail pod - WHERE po.tenantid = $tenantid - AND pod.tenantid = po.tenantid - AND pod.tenantid = mat.tenantid - AND po.purchaseordernumber = pod.purchaseorder - AND pod.material = mat.code - -# Inventory Register Report -- reportName: inventoryRegisterReport - summary: Inventory Register - version: 1.0.0 - moduleName: inventory - sourceColumns: - - name: storeName - label: inventory.store.name - type: string - source: inventory - - - name: deptName - label: inventory.deptName - type: string - source: inventory - - - name: materialName - label: inventory.materialName - type: string - source: material - - - name: supplierName - label: inventory.suppliername - type: string - source: inventory - - - name: qty - label: inventory.qty - type: string - source: inventory - - - name: uom - label: inventory.uom - type: string - source: inventory - - - name: unitRate - label: inventory.unitrate - type: string - source: inventory - - - name: totalAmount - label: inventory.totalAmount - type: string - source: inventory - - - name: receiptDate - label: inventory.date - type: string - source: inventory - - - name: transactionNumber - label: inventory.transactionnumber - type: string - source: inventory - - - name: receiptType - label: inventory.receiptType - type: string - source: inventory - - searchParams: - - name: storeName - label: inventory.store.name - type: singlevaluelist - pattern: http://inventory-services:8080/inventory-services/stores/_search?active=true&tenantId=$tenantid|$..code|$..name - source: store - searchClause: AND store.code = $storeName - isMandatory: true - wrapper: true - - - name: materialName - label: inventory.materialName - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=inventory&masterName=Material&tenantId=$tenantid|$.MdmsRes.inventory.Material.*.code|$.MdmsRes.inventory.Material.*.name - source: materialReceipt - isMandatory: false - query: select store.name as storeName,store.department as deptName, - sup.name as supplierName, - detail.receivedqty as qty,detail.uomno as uom,detail.unitrate as unitRate, - (detail.receivedqty * detail.unitrate) as totalAmount, - (select to_date(to_char(to_timestamp(Trunc(CAST(mat.receiptdate as bigint)/1000 )), 'YYYY/MM/DD'), 'YYYY-MM-DD')) as receiptDate, - detail.mrnnumber as transactionNumber,mat.receipttype as receipttype - from materialreceiptdetail detail,materialreceipt mat,store store,supplier sup - where detail.tenantid=$tenantid - AND mat.tenantid=detail.tenantid - AND store.tenantid=mat.tenantid - AND sup.tenantid= store.tenantid - AND mat.suppliercode =sup.code - AND mat.receivingstore=store.code - AND mat.mrnnumber=detail.mrnnumber - -# Need to add query -# Stock Aging Report -- reportName: stockAgingReport - summary: Stock Aging Report - version: 1.0.0 - moduleName: inventory - sourceColumns: - - name: materialCode - label: inventory.materialcode - type: string - source: inventory - - - name: materialName - label: inventory.materialName - type: string - source: inventory - - - name: materialTypeName - label: inventory.materialTypeName - type: string - source: material - - - name: lotNo - label: inventory.lotNo - type: string - source: inventory - - - name: qtyFrom0to90Days - label: inventory.qtyFrom0to90Days - type: string - source: inventory - - - name: stockValueFrom0to90Days - label: inventory.stockValueFrom0to90Days - type: string - source: inventory - - - name: qtyFrom91to180Days - label: inventory.qtyFrom91to180Days - type: string - source: inventory - - - name: stockValueFrom91to180Days - label: inventory.stockValueFrom91to180Days - type: string - source: inventory - - - name: qtyFrom181DaysAndAbove - label: inventory.qtyFrom181DaysAndAbove - type: string - source: inventory - - - name: stockValueFrom181DaysAndAbove - label: inventory.stockValueFrom181DaysAndAbove - type: string - source: inventory - - - name: totalQty - label: inventory.totalQty - type: string - source: inventory - - - name: totalStockValue - label: inventory.totalStockValue - type: string - source: inventory - - searchParams: - - name: storeName - label: inventory.store.name - type: singlevaluelist - pattern: http://inventory-services:8080/inventory-services/stores/_search?active=true&tenantId=$tenantid|$..code|$..name - source: store - searchClause: AND store.code = $storeName - isMandatory: true - wrapper: true - - - name: materialTypeName - label: inventory.materialTypeName - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=inventory&masterName=MaterialType&tenantId=$tenantid|$.MdmsRes.inventory.Material.*.code|$.MdmsRes.inventory.Material.*.name - source: materialReceipt - isMandatory: false - - - name: materialName - label: inventory.materialName - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=inventory&masterName=Material&tenantId=$tenantid|$.MdmsRes.inventory.Material.*.code|$.MdmsRes.inventory.Material.*.name - source: materialReceipt - isMandatory: false - - - name: asOnDate - label: inventory.asOnDate - type: epoch - source: inventory - isMandatory: true - query: - - - - - - - diff --git a/configs/reports/configs/lcms-reports.yml b/configs/reports/configs/lcms-reports.yml deleted file mode 100644 index ed7a3602..00000000 --- a/configs/reports/configs/lcms-reports.yml +++ /dev/null @@ -1,891 +0,0 @@ ---- -ReportDefinitions: -- reportName: CaseRegisterReport - summary: Case Register Report - version: 1.0.0 - moduleName: lcms - selectiveDownload: true - externalService: - - entity: $.MdmsRes.lcms.court - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=lcms&masterName=court&tenantId=$tenantid - keyOrder: code,name - tableName: tbl_court - sourceColumns: - - name: caseno - label: reports.lcms.caseNo - type: string - source: lcms - showColumn: true - - name: plantiffname - label: reports.lcms.nameOfPlaintiff - type: string - source: lcms - showColumn: true - - name: defendant - label: reports.lcms.nameOfDefendant - type: string - source: lcms - showColumn: true - - name: pleaderengagementdetails - label: reports.lcms.amountOfPleadersEngaged - type: string - source: lcms - showColumn: false - - name: sectionapplied - label: reports.lcms.sectionApplied - type: string - source: lcms - showColumn: false - - name: receiptdate - label: reports.lcms.dateOfReceiptOfOfficer - type: epoch - source: lcms - showColumn: false - - name: summondate - label: reports.lcms.dateOfSummon - type: epoch - source: lcms - showColumn: false - - name: resolutiondetails - label: reports.lcms.resolutionOfMunicipalDate - type: string - source: lcms - showColumn: false - - name: pleaderfee - label: reports.lcms.particularsOfPleadersFee - type: string - source: lcms - showColumn: false - - name: vakalatnamagenerationdate - label: reports.lcms.dateOfProductionOfVakalatnama - type: epoch - source: lcms - showColumn: false - - name: courtname - label: reports.lcms.suitFiledCourtName - type: string - source: lcms - showColumn: true - - name: departmentperson - label: reports.lcms.nameOfResponsibleOfficer - type: string - source: lcms - showColumn: false - - name: judgementdate - label: reports.lcms.dateOfJudgment - type: epoch - source: lcms - showColumn: false - - name: casejudgement - label: reports.lcms.judgmentDetails - type: string - source: lcms - showColumn: false - - name: advocateopinion - label: reports.lcms.opinionOfPleader - type: string - source: lcms - showColumn: false - - name: furtherprocessdetails - label: reports.lcms.furtherProcessDetails - type: string - source: lcms - showColumn: false - - name: particularsamount - label: reports.lcms.particularsOfActualAmount - type: string - source: lcms - showColumn: false - - name: voucherdate - label: reports.lcms.dateOfCredit - type: epoch - source: lcms - showColumn: false - - name: paymentdetails - label: reports.lcms.particularsOfPayment - type: string - source: lcms - showColumn: false - - name: voucherdate - label: reports.lcms.dateOfDebit - type: epoch - source: lcms - showColumn: false - - name: verificationremarks - label: reports.lcms.remarksRegardingReferenceToCourt - type: string - source: lcms - showColumn: false - - name: remarks - label: reports.lcms.remarks - type: string - source: lcms - showColumn: false - searchParams: - - name: fromDate - label: reports.lcms.fromDate - type: epoch - source: lcms - isMandatory: true - - name: toDate - label: reports.lcms.toDate - type: epoch - source: lcms - isMandatory: true - - name: caseNo - label: reports.lcms.caseNo - type: string - isMandatory: false - source: lcms - searchClause : AND upper(lc.caseno) = upper($caseNo) - - name: lcNumber - label: reports.lcms.lcNumber - type: string - isMandatory: false - source: lcms - searchClause : AND upper(lc.summonreferenceno) = upper($lcNumber) - - name: caseTitle - label: reports.lcms.caseTitle - type: string - isMandatory: false - source: lcms - searchClause : AND upper(lc.casedetails) = upper($caseTitle) - - name: courtName - label: reports.lcms.courtName - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=lcms&masterName=court|$..code|$..name - source: lcms - wrapper: true - isMandatory: false - searchClause : AND lc.courtname ->> 'code' = $courtName - - name: plaintiff - label: reports.lcms.plaintiff - type: string - isMandatory: false - source: lcms - searchClause : AND upper(lc.plantiffname) = upper($plaintiff) - - name: defendant - label: reports.lcms.defendant - type: string - isMandatory: false - source: lcms - searchClause : AND upper(lc.defendant) = upper($defendant) - - name: department - label: reports.lcms.department - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=common-masters&masterName=Department|$..code|$..name - source: lcms - wrapper: true - isMandatory: false - searchClause : AND lc.departmentname ->> 'code' = $department - - name: caseStatus - label: reports.lcms.caseStatus - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=lcms&masterName=caseStatus|$..code|$..name - source: lcms - wrapper: true - isMandatory: false - searchClause : AND lc.casestatus ->> 'code' = $caseStatus - query: select lc.caseno, lc.plantiffname, lc.defendant, lc.pleaderengagementdetails ,lc.sectionapplied, lc.summondate, CONCAT(lc.resloution, ', ', lc.resloutiondate) AS resolutiondetails, lc.vakalatnamagenerationdate, (select name from (VALUES tbl_court) as court (code,name) where court.code=lc.courtname::jsonb ->> 'code')as courtname, lc.departmentperson, lhd.judgementdate, lhd.casejudgement, lhd.advocateopinion, lhd.furtherprocessdetails, lc.remarks from egov_lcms_case lc LEFT OUTER JOIN egov_lcms_hearing_details as lhd ON (lc.code = lhd.casecode AND lhd.casestatus ->> 'code'= 'FO') WHERE lc.caseregistrationdate>=$fromDate and lc.caseregistrationdate<=$toDate AND lc.tenantid=$tenantid -- reportName: CaseSummaryReport - summary: Case Summary Report - version: 1.0.0 - moduleName: lcms - selectiveDownload: true - externalService: - - entity: $.MdmsRes.lcms.caseType - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=lcms&masterName=caseType&tenantId=$tenantid - keyOrder: code,name - tableName: tbl_casetype - - entity: $.MdmsRes.lcms.court - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=lcms&masterName=court&tenantId=$tenantid - keyOrder: code,name - tableName: tbl_court - - entity: $.MdmsRes.lcms.caseStatus - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=lcms&masterName=caseStatus&tenantId=$tenantid - keyOrder: code,name - tableName: tbl_casestatus - - entity: $.MdmsRes.common-masters.Department - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=common-masters&masterName=Department&tenantId=$tenantid - keyOrder: code,name - tableName: tbl_department - sourceColumns: - - name: caseno - label: reports.lcms.caseNo - type: string - source: lcms - showColumn: true - - name: department - label: reports.lcms.department - type: string - source: lcms - showColumn: false - - name: casetype - label: reports.lcms.caseType - type: string - source: lcms - showColumn: false - - name: plantiffname - label: reports.lcms.plaintiff - type: string - source: lcms - showColumn: true - - name: defendant - label: reports.lcms.defendant - type: string - source: lcms - showColumn: true - - name: courtname - label: reports.lcms.courtName - type: string - source: lcms - showColumn: true - - name: advocate - label: reports.lcms.advocateName - type: string - source: lcms - showColumn: false - - name: casestatus - label: reports.lcms.status - type: string - source: lcms - showColumn: false - searchParams: - - name: fromDate - label: reports.lcms.fromDate - type: epoch - source: lcms - isMandatory: true - - name: toDate - label: reports.lcms.toDate - type: epoch - source: lcms - isMandatory: true - - name: caseNo - label: reports.lcms.caseNo - type: string - isMandatory: false - source: lcms - searchClause : AND lc.caseno=$caseNo - - name: department - label: reports.lcms.department - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=common-masters&masterName=Department|$..code|$..name - source: lcms - wrapper: true - isMandatory: false - searchClause : AND lc.departmentname ->> 'code' = $department - - name: advocate - label: reports.lcms.advocate - type: singlevaluelist - pattern: http://lcms-services:8080/lcms-services/legalcase/advocate/_search?tenantId=$tenantid&pageSize=500|$..code|$..name - source: lcms - searchClause : AND position($advocate in tempadvocate.advocatecode) > 0 - isMandatory: false - - name: courtName - label: reports.lcms.courtName - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=lcms&masterName=court|$..code|$..name - source: lcms - wrapper: true - isMandatory: false - searchClause : AND lc.courtname ->> 'code' = $courtName - - name: plaintiff - label: reports.lcms.plaintiff - type: string - isMandatory: false - source: lcms - searchClause : AND lc.plantiffname = $plaintiff - - name: defendant - label: reports.lcms.defendant - type: string - isMandatory: false - source: lcms - searchClause : AND lc.defendant = $defendant - query: select lc.caseno, (select name from (VALUES tbl_department) as departmentdata (code,name) where departmentdata.code= lc.departmentname->>'code')as department, (select name from (VALUES tbl_casetype) as casetype (code,name) where casetype.code=lc.casetype::jsonb ->> 'code') as casetype, lc.plantiffName, lc.defendant, (select name from (VALUES tbl_court) as court (code,name) where court.code=lc.courtname::jsonb ->> 'code') as courtname, tempadvocate.advocatename as advocate,(select name from (VALUES tbl_casestatus) as casestatus (code,name) where casestatus.code=lc.casestatus::jsonb ->> 'code') as casestatus from egov_lcms_case as lc left outer join - (select lca.casecode as casecode, string_agg(la.name,',') as advocatename,string_agg(la.code,',') as advocatecode from egov_lcms_case_advocate as lca inner join egov_lcms_advocate as la on la.code=lca.advocate->>'code' where lca.tenantid=$tenantid group by lca.casecode) as tempadvocate on lc.code=tempadvocate.casecode WHERE lc.caseregistrationdate>=$fromDate and lc.caseregistrationdate<=$toDate and lc.tenantid=$tenantid - -- reportName: CaseDetailReport - summary: Case Detail Report - version: 1.0.0 - moduleName: lcms - selectiveDownload: true - externalService: - - entity: $.MdmsRes.lcms.court - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=lcms&masterName=court&tenantId=$tenantid - keyOrder: code,name,type - tableName: tbl_court - - entity: $.MdmsRes.lcms.caseCategory - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=lcms&masterName=caseCategory&tenantId=$tenantid - keyOrder: code,name - tableName: tbl_casecategory - - entity: $.MdmsRes.lcms.caseStatus - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=lcms&masterName=caseStatus&tenantId=$tenantid - keyOrder: code,name - tableName: tbl_casestatus - - entity: $.MdmsRes.common-masters.Department - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=common-masters&masterName=Department&tenantId=$tenantid - keyOrder: code,name - tableName: tbl_department - - sourceColumns: - - name: caseno - label: reports.lcms.caseNo - type: string - source: lcms - showColumn: false - - name: courtname - label: reports.lcms.courtName - type: string - source: lcms - showColumn: true - - name: courttype - label: reports.lcms.courtType - type: string - source: lcms - showColumn: false - - name: department - label: reports.lcms.department - type: string - source: lcms - showColumn: false - - name: casecategory - label: reports.lcms.caseCategory - type: string - source: lcms - showColumn: false - - name: sectionapplied - label: reports.lcms.sectionNo - type: string - source: lcms - showColumn: false - - name: advocate - label: reports.lcms.advocateName - type: string - source: lcms - showColumn: false - - name: plantiffname - label: reports.lcms.petitionName - type: string - source: lcms - showColumn: true - - name: defendant - label: reports.lcms.defendant - type: string - source: lcms - showColumn: true - - name: casestatus - label: reports.lcms.caseStatus - type: string - source: lcms - showColumn: true - searchParams: - - name: fromDate - label: reports.lcms.fromDate - type: epoch - source: lcms - isMandatory: true - - name: toDate - label: reports.lcms.toDate - type: epoch - source: lcms - isMandatory: true - - name: caseStatus - label: reports.lcms.caseStatus - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=lcms&masterName=caseStatus|$..code|$..name - source: lcms - wrapper: true - isMandatory: false - searchClause : AND lc.casestatus ->> 'code'= $caseStatus - - name: sectionNo - label: reports.lcms.sectionNo - type: string - isMandatory: false - source: lcms - searchClause : AND lc.sectionapplied=$sectionNo - - name: advocate - label: reports.lcms.advocate - type: singlevaluelist - pattern: http://lcms-services:8080/lcms-services/legalcase/advocate/_search?tenantId=$tenantid&pageSize=500|$..code|$..name - source: lcms - isMandatory: false - searchClause : AND position($advocate in tempadvocate.advocatecode) > 0 - - name: courtName - label: reports.lcms.courtName - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=lcms&masterName=court|$..code|$..name - source: lcms - wrapper: true - isMandatory: false - searchClause : AND lc.courtname ->> 'code' = $courtName - - name: plaintiff - label: reports.lcms.plaintiff - type: string - isMandatory: false - source: lcms - searchClause : AND lc.plantiffname = $plaintiff - - name: defendant - label: reports.lcms.defendant - type: string - isMandatory: false - source: lcms - searchClause : AND lc.defendant = $defendant - - name: caseCategory - label: reports.lcms.caseCategory - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=lcms&masterName=caseCategory|$..code|$..name - source: lcms - wrapper: true - isMandatory: false - searchClause : AND lc.casecategory ->> 'code' = $caseCategory - - name: department - label: reports.lcms.department - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=common-masters&masterName=Department|$..code|$..name - source: lcms - wrapper: true - isMandatory: false - searchClause : AND lc.departmentname ->> 'code' = $department - - name: caseType - label: reports.lcms.caseType - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=lcms&masterName=caseType|$..code|$..name - source: lcms - wrapper: true - isMandatory: false - searchClause : AND lc.casetype ->> 'code' = $caseType - query: select lc.caseno, (select name from (VALUES tbl_court) as court (code,name,type) where court.code=lc.courtname::jsonb ->> 'code') as courtname, (select type from (VALUES tbl_court) as court (code,name,type) where court.code=lc.courtname::jsonb ->> 'code') as courttype, (select name from (VALUES tbl_department) as departmentdata (code,name) where departmentdata.code= lc.departmentname->>'code')as department, (select name from (VALUES tbl_casecategory) as caseCategory (code,name) where caseCategory.code=lc.casecategory::jsonb ->> 'code') as casecategory, lc.sectionapplied, tempadvocate.advocatename as advocate, lc.plantiffName,lc.defendant, (select name from (VALUES tbl_casestatus) as caseStatus (code,name) where caseStatus.code=lc.casestatus::jsonb ->> 'code') as casestatus from egov_lcms_case as lc left outer join - (select lca.casecode as casecode, string_agg(la.name,',') as advocatename,string_agg(la.code,',') as advocatecode from egov_lcms_case_advocate as lca inner join egov_lcms_advocate as la on la.code=lca.advocate->>'code' where lca.tenantid=$tenantid group by lca.casecode) as tempadvocate on lc.code=tempadvocate.casecode WHERE lc.caseregistrationdate>=$fromDate and lc.caseregistrationdate<=$toDate and lc.tenantid=$tenantid -- reportName: CaseHistoryReport - summary: Case History Report - version: 1.0.0 - moduleName: lcms - selectiveDownload: true - externalService: - - entity: $.MdmsRes.lcms.caseType - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=lcms&masterName=caseType&tenantId=$tenantid - keyOrder: code,name - tableName: tbl_casetype - - entity: $.MdmsRes.lcms.court - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=lcms&masterName=court&tenantId=$tenantid - keyOrder: code,name - tableName: tbl_court - - entity: $.MdmsRes.lcms.caseStatus - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=lcms&masterName=caseStatus&tenantId=$tenantid - keyOrder: code,name - tableName: tbl_casestatus - - entity: $.MdmsRes.common-masters.Department - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=common-masters&masterName=Department&tenantId=$tenantid - keyOrder: code,name - tableName: tbl_department - sourceColumns: - - name: caseno - label: reports.lcms.caseNo - type: string - source: lcms - showColumn: true - - name: summondate - label: reports.lcms.caseDate - type: epoch - source: lcms - showColumn: false - - name: courtname - label: reports.lcms.courtName - type: string - source: lcms - showColumn: true - - name: casetype - label: reports.lcms.caseType - type: string - source: lcms - showColumn: true - - name: department - label: reports.lcms.department - type: string - source: lcms - showColumn: false - - name: advocate - label: reports.lcms.advocateName - type: string - source: lcms - showColumn: true - - name: plantiffname - label: reports.lcms.plaintiff - type: string - source: lcms - showColumn: false - - name: defendant - label: reports.lcms.defendant - type: string - source: lcms - showColumn: false - - name: hearingdate - label: reports.lcms.hearingDate - type: epoch - source: lcms - showColumn: false - - name: casestatus - label: reports.lcms.status - type: string - source: lcms - showColumn: false - searchParams: - - name: fromDate - label: reports.lcms.fromDate - type: epoch - source: lcms - isMandatory: true - - name: toDate - label: reports.lcms.toDate - type: epoch - source: lcms - isMandatory: true - - - name: oragnization - label: reports.lcms.organization - type: singlevaluelist - pattern: http://lcms-services:8080/lcms-services/legalcase/advocate/agency/_search?tenantId=$tenantid&pageSize=500|$.agencies[*].name|$.agencies[*].name - source: lcms - isMandatory: false - - - name: advocatename - label: reports.lcms.advocate - type: url - pattern: /lcms-services/legalcase/advocate/agency/_search?tenantId=$tenantid&agencyName={oragnization}&pageSize=500|$.agencies[*].advocates[*].code|$.agencies[*].advocates[*].name - source: lcms - isMandatory: false - searchClause : AND position($advocatename in tempadvocate.advocatecode) > 0 - - - name: department - label: reports.lcms.department - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=common-masters&masterName=Department|$..code|$..name - source: lcms - wrapper: true - isMandatory: false - searchClause : AND lc.departmentname ->> 'code' = $department - - name: caseType - label: reports.lcms.caseType - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=lcms&masterName=caseType|$..code|$..name - source: lcms - wrapper: true - isMandatory: false - searchClause : AND lc.casetype ->> 'code' = $caseType - - name: courtName - label: reports.lcms.courtName - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=lcms&masterName=court|$..code|$..name - source: lcms - wrapper: true - isMandatory: false - searchClause : AND lc.courtname ->> 'code' = $courtName - - - name: caseStatus - label: reports.lcms.caseStatus - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=lcms&masterName=caseStatus|$..code|$..name - source: lcms - wrapper: true - isMandatory: false - searchClause : AND lc.casestatus ->> 'code'= $caseStatus - query: select lc.caseno, lc.summondate, (select name from (VALUES tbl_court) as court (code,name) where court.code=lc.courtname::jsonb ->> 'code') as courtname, (select name from (VALUES tbl_casetype) as caseType (code,name) where caseType.code=lc.casetype::jsonb ->> 'code') as casetype, tempadvocate.advocatename as advocate, (select name from (VALUES tbl_department) as departmentdata (code,name) where departmentdata.code= lc.departmentname->>'code')as department, lc.plantiffName, lc.defendant, lc.hearingdate, (select name from (VALUES tbl_casestatus) as caseStatus (code,name) where caseStatus.code=lc.casestatus::jsonb ->> 'code') as casestatus from egov_lcms_case as lc left outer join (select lca.casecode as casecode, string_agg(la.name,',') as advocatename,string_agg(la.code,',') as advocatecode from egov_lcms_case_advocate as lca inner join egov_lcms_advocate as la on la.code=lca.advocate->>'code' where lca.tenantid=$tenantid group by lca.casecode) as tempadvocate on lc.code=tempadvocate.casecode WHERE lc.caseregistrationdate>=$fromDate and lc.caseregistrationdate<=$toDate -- reportName: CasePendencyReport - summary: Case Pendency Report - version: 1.0.0 - moduleName: lcms - selectiveDownload: true - externalService: - - entity: $.MdmsRes.lcms.caseType - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=lcms&masterName=caseType&tenantId=$tenantid - keyOrder: code,name - tableName: tbl_casetype - - entity: $.MdmsRes.lcms.court - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=lcms&masterName=court&tenantId=$tenantid - keyOrder: code,name - tableName: tbl_court - - entity: $.MdmsRes.lcms.caseStatus - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=lcms&masterName=caseStatus&tenantId=$tenantid - keyOrder: code,name - tableName: tbl_casestatus - - entity: $.MdmsRes.common-masters.Department - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=common-masters&masterName=Department&tenantId=$tenantid - keyOrder: code,name - tableName: tbl_department - sourceColumns: - - name: caseno - label: reports.lcms.caseNo - type: string - source: lcms - showColumn: true - - name: advocate - label: reports.lcms.advocateName - type: string - source: lcms - showColumn: true - - name: department - label: reports.lcms.department - type: string - source: lcms - showColumn: true - - name: courtname - label: reports.lcms.courtName - type: string - source: lcms - showColumn: false - - name: casetype - label: reports.lcms.caseType - type: string - source: lcms - showColumn: true - - name: plantiffname - label: reports.lcms.plaintiff - type: string - source: lcms - showColumn: false - - name: defendant - label: reports.lcms.defendant - type: string - source: lcms - showColumn: false - - name: casejudgement - label: reports.lcms.hearingDetails - type: string - source: lcms - showColumn: false - - name: casestatus - label: reports.lcms.caseStatus - type: string - source: lcms - showColumn: false - searchParams: - - name: fromDate - label: reports.lcms.fromDate - type: epoch - source: lcms - isMandatory: true - - name: toDate - label: reports.lcms.toDate - type: epoch - source: lcms - isMandatory: true - - name: department - label: reports.lcms.department - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=common-masters&masterName=Department|$..code|$..name - source: lcms - wrapper: true - isMandatory: false - searchClause : AND lc.departmentname ->> 'code' = $department - - name: advocate - label: reports.lcms.advocate - type: singlevaluelist - pattern: http://lcms-services:8080/lcms-services/legalcase/advocate/_search?tenantId=$tenantid&pageSize=500|$..code|$..name - source: lcms - isMandatory: false - searchClause : AND position($advocate in tempadvocate.advocatecode) > 0 - query: select lc.caseno, tempadvocate.advocatename as advocate, (select name from (VALUES tbl_department) as departmentdata (code,name) where departmentdata.code= lc.departmentname->>'code')as department, (select name from (VALUES tbl_court) as court (code,name) where court.code=lc.courtname::jsonb ->> 'code') as courtname, (select name from (VALUES tbl_casetype) as caseType (code,name) where caseType.code=lc.casetype::jsonb ->> 'code') as casetype, lc.plantiffName, lc.defendant, (select casejudgement from egov_lcms_hearing_details as lhd where lhd.casestatus->>'code'=lc.casestatus->>'code' and lhd.casecode=lc.code order by createdtime desc limit 1 ) as casejudgement, (select name from (VALUES tbl_casestatus) as caseStatus (code,name) where caseStatus.code=lc.casestatus::jsonb ->> 'code') as casestatus from egov_lcms_case as lc left outer join (select lca.casecode as casecode, string_agg(la.name,',') as advocatename,string_agg(la.code,',') as advocatecode from egov_lcms_case_advocate as lca inner join egov_lcms_advocate as la on la.code=lca.advocate->>'code' where lca.tenantid=$tenantid group by lca.casecode) as tempadvocate on lc.code=tempadvocate.casecode WHERE lc.caseregistrationdate>=$fromDate and lc.caseregistrationdate<=$toDate and lc.tenantid=$tenantid -- reportName: CaseStatusReport - summary: Case Status Report - version: 1.0.0 - moduleName: lcms - selectiveDownload: true - externalService: - - entity: $.MdmsRes.lcms.caseType - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=lcms&masterName=caseType&tenantId=$tenantid - keyOrder: code,name - tableName: tbl_casetype - - entity: $.MdmsRes.lcms.court - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=lcms&masterName=court&tenantId=$tenantid - keyOrder: code,name - tableName: tbl_court - - entity: $.MdmsRes.lcms.caseStatus - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=lcms&masterName=caseStatus&tenantId=$tenantid - keyOrder: code,name - tableName: tbl_casestatus - - entity: $.MdmsRes.common-masters.Department - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=common-masters&masterName=Department&tenantId=$tenantid - keyOrder: code,name - tableName: tbl_department - - sourceColumns: - - name: caseno - label: reports.lcms.caseNo - type: string - source: lcms - showColumn: true - - name: advocate - label: reports.lcms.advocateName - type: string - source: lcms - showColumn: true - - name: department - label: reports.lcms.department - type: string - source: lcms - showColumn: false - - name: courtname - label: reports.lcms.courtName - type: string - source: lcms - showColumn: false - - name: casetype - label: reports.lcms.caseType - type: string - source: lcms - showColumn: true - - name: plantiffname - label: reports.lcms.plaintiff - type: string - source: lcms - showColumn: false - - name: defendant - label: reports.lcms.defendant - type: string - source: lcms - showColumn: false - - name: casejudgement - label: reports.lcms.hearingDetails - type: string - source: lcms - showColumn: false - - name: casestatus - label: reports.lcms.status - type: string - source: lcms - showColumn: true - searchParams: - - name: fromDate - label: reports.lcms.fromDate - type: epoch - source: lcms - isMandatory: true - - name: toDate - label: reports.lcms.toDate - type: epoch - source: lcms - isMandatory: true - - name: caseStatus - label: reports.lcms.caseStatus - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=lcms&masterName=caseStatus|$..code|$..name - source: lcms - wrapper: true - isMandatory: false - searchClause : AND lc.casestatus ->> 'code'= $caseStatus - query: select lc.caseno, (select string_agg(name, ', ') from egov_lcms_advocate where code in( select advocate->>'code' from egov_lcms_case_advocate where casecode=lc.code)) as advocate, (select name from (VALUES tbl_department) as departmentdata (code,name) where departmentdata.code= lc.departmentname->>'code')as department,(select name from (VALUES tbl_court) as court (code,name) where court.code=lc.courtname::jsonb ->> 'code') as courtname, (select name from (VALUES tbl_casetype) as caseType (code,name) where caseType.code=lc.casetype::jsonb ->> 'code') as casetype, lc.plantiffName, lc.defendant,(select casejudgement from egov_lcms_hearing_details as lhd where lhd.casestatus->>'code'=lc.casestatus->>'code' and lhd.casecode=lc.code order by createdtime desc limit 1) as casejudgement, (select name from (VALUES tbl_casestatus) as caseStatus (code,name) where caseStatus.code=lc.casestatus::jsonb ->> 'code') as casestatus from egov_lcms_case as lc WHERE lc.caseregistrationdate>=$fromDate and lc.caseregistrationdate<=$toDate and lc.tenantid=$tenantid -- reportName: DueDateReport - summary: Due Date Report - version: 1.0.0 - moduleName: lcms - selectiveDownload: true - externalService: - - entity: $.MdmsRes.lcms.caseType - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=lcms&masterName=caseType&tenantId=$tenantid - keyOrder: code,name - tableName: tbl_casetype - - entity: $.MdmsRes.lcms.court - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=lcms&masterName=court&tenantId=$tenantid - keyOrder: code,name - tableName: tbl_court - - entity: $.MdmsRes.lcms.caseStatus - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=lcms&masterName=caseStatus&tenantId=$tenantid - keyOrder: code,name - tableName: tbl_casestatus - - entity: $.MdmsRes.common-masters.Department - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=common-masters&masterName=Department&tenantId=$tenantid - keyOrder: code,name - tableName: tbl_department - sourceColumns: - - name: caseno - label: reports.lcms.caseNo - type: string - source: lcms - showColumn: true - - name: courtname - label: reports.lcms.courtName - type: string - source: lcms - showColumn: false - - name: casetype - label: reports.lcms.caseType - type: string - source: lcms - showColumn: true - - name: department - label: reports.lcms.department - type: string - source: lcms - showColumn: false - - name: departmentperson - label: reports.lcms.concernedPersonName - type: string - source: lcms - showColumn: false - - name: advocate - label: reports.lcms.advocateName - type: string - source: lcms - showColumn: true - - name: plantiffname - label: reports.lcms.plaintiff - type: string - source: lcms - showColumn: false - - name: defendant - label: reports.lcms.defendant - type: string - source: lcms - showColumn: false - - name: casestatus - label: reports.lcms.caseStatus - type: string - source: lcms - showColumn: true - - name: hearingdate - label: reports.lcms.hearingDetailsDateAndTime - type: epoch - source: lcms - showColumn: false - searchParams: - - name: fromDate - label: reports.lcms.fromDate - type: epoch - source: lcms - isMandatory: true - - name: toDate - label: reports.lcms.toDate - type: epoch - source: lcms - isMandatory: true - - name: department - label: reports.lcms.department - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=common-masters&masterName=Department|$..code|$..name - source: lcms - wrapper: true - isMandatory: false - searchClause : AND lc.departmentname ->> 'code' = $department - - name: departmentPerson - label: reports.lcms.departmentPerson - type: string - isMandatory: false - source: lcms - searchClause : AND lc.departmentperson=$departmentPerson - - name: advocate - label: reports.lcms.advocate - type: singlevaluelist - pattern: http://lcms-services:8080/lcms-services/legalcase/advocate/_search?tenantId=$tenantid&pageSize=500|$..code|$..name - source: lcms - isMandatory: false - searchClause : AND position($advocate in tempadvocate.advocatecode) > 0 - - name: courtName - label: reports.lcms.courtName - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=lcms&masterName=court|$..code|$..name - source: lcms - wrapper: true - isMandatory: false - searchClause : AND lc.courtname ->> 'code' = $courtName - query: select lc.caseno, (select name from (VALUES tbl_court) as court (code,name) where court.code=lc.courtname::jsonb ->> 'code') as courtname, (select name from (VALUES tbl_casetype) as caseType (code,name) where caseType.code=lc.casetype::jsonb ->> 'code') as casetype, (select name from (VALUES tbl_department) as departmentdata (code,name) where departmentdata.code= lc.departmentname->>'code')as department, lc.departmentperson, tempadvocate.advocatename as advocate, lc.plantiffName, lc.defendant, (select name from (VALUES tbl_casestatus) as caseStatus (code,name) where caseStatus.code=lc.casestatus::jsonb ->> 'code') as casestatus, lc.hearingdate from egov_lcms_case as lc left outer join (select lca.casecode as casecode, string_agg(la.name,',') as advocatename,string_agg(la.code,',') as advocatecode from egov_lcms_case_advocate as lca inner join egov_lcms_advocate as la on la.code=lca.advocate->>'code' where lca.tenantid=$tenantid group by lca.casecode) as tempadvocate on lc.code=tempadvocate.casecode WHERE lc.caseregistrationdate>=$fromDate and lc.caseregistrationdate<=$toDate and lc.tenantid=$tenantid diff --git a/configs/reports/configs/pgr-reports.yml b/configs/reports/configs/pgr-reports.yml deleted file mode 100644 index f76933bb..00000000 --- a/configs/reports/configs/pgr-reports.yml +++ /dev/null @@ -1,2117 +0,0 @@ -ReportDefinitions: -- reportName: SourceWiseReport - summary: Fetches reports based on the source of reception of the complaint - version: 1.0.0 - moduleName: rainmaker-pgr - sourceColumns: - - name: citizen_mobile_app - label: reports.rainmaker-pgr.citizen_mobile_app - type: string - source: eg_pgr_service - - name: citizen_web_app - label: reports.rainmaker-pgr.citizen_web_app - type: string - source: eg_pgr_service - - name: counter_desktop - label: reports.rainmaker-pgr.counter_desktop - type: string - source: eg_pgr_service - searchParams: - - name: tenantId - label: reports.rainmaker-pgr.tenantId - type: singlevaluelist - pattern: 'list://Wet:Wet,Dry:Dry' - source: eg_pgr_service - isMandatory: false - - name: fromDate - label: reports.rainmaker-pgr.datefrom - type: epoch - source: eg_pgr_service - isMandatory: false - - name: toDate - label: reports.rainmaker-pgr.dateto - type: epoch - source: eg_pgr_service - isMandatory: false - query: SELECT sum(case when source = 'mobileapp' then 1 else 0 end) as citizen_mobile_app, sum(case when source = 'web' then 1 else 0 end) as citizen_web_app, sum(case when source = 'ivr' then 1 else 0 end) as counter_desktop FROM eg_pgr_service WHERE tenantid = $tenantid - -- reportName: DescriptionReport - summary: Fetches department wise reports based description of the complaint - version: 1.0.0 - moduleName: rainmaker-pgr - externalService: - - entity: $.MdmsRes.RAINMAKER-PGR.ServiceDefs - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=RAINMAKER-PGR&masterName=ServiceDefs&tenantId=$tenantId - keyOrder: serviceCode,department,slaHours - tableName: tbl_dept - - entity: $.MdmsRes.common-masters.Department - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=common-masters&masterName=Department&tenantId=$tenantId - keyOrder: name,code - tableName: tbl_def_dept - - entity: $.TenantBoundary[0].boundary - apiURL: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search?hierarchyTypeCode=ADMIN&boundaryType=Locality&tenantId=$tenantId - keyOrder: name,code - tableName: tbl_boundary - sourceColumns: - - name: department - label: reports.rainmaker-pgr.department - type: string - source: eg_pgr_service - total: false - - name: servicecode - label: reports.rainmaker-pgr.servicecode - type: string - source: eg_pgr_service - total: false - - name: complaintNo - label: reports.rainmaker-pgr.complaintNo - type: string - source: eg_pgr_service - total: false - - name: date - label: reports.rainmaker-pgr.date - type: string - source: eg_pgr_service - total: false - - name: name - label: reports.rainmaker-pgr.name - type: string - source: eg_pgr_service - total: false - - name: phone - label: reports.rainmaker-pgr.phone - type: string - source: eg_pgr_service - total: false - - name: address - label: reports.rainmaker-pgr.address - type: string - source: eg_pgr_service - total: false - - name: locality - label: reports.rainmaker-pgr.locality - type: string - source: eg_pgr_service - total: false - - name: landmark - label: reports.rainmaker-pgr.landmark - type: string - source: eg_pgr_service - total: false - - name: description - label: reports.rainmaker-pgr.description - type: string - source: eg_pgr_service - total: false - - name: lastassignedto - label: reports.rainmaker-pgr.lastassignedto - type: string - source: eg_pgr_service - total: false - - name: status - label: reports.rainmaker-pgr.status - type: string - source: eg_pgr_service - total: false - - name: slahours - label: reports.rainmaker-pgr.slahours - type: string - source: eg_pgr_service - total: false - - name: actiondate - label: reports.rainmaker-pgr.actiondate - type: string - source: eg_pgr_service - total: false - searchParams: - - name: fromDate - label: reports.rainmaker-pgr.datefrom - type: epoch - source: eg_pgr_service - isMandatory: false - searchClause: AND eg_pgr_service.createdtime >= $fromDate - - name: toDate - label: reports.rainmaker-pgr.dateto - type: epoch - source: eg_pgr_service - isMandatory: false - searchClause: AND eg_pgr_service.createdtime <= $toDate - query: | - SELECT - DISTINCT ON (servicerequestid) - ua.name as lastassignedto, - (SELECT deptmap_def.name FROM (VALUES tbl_def_dept) AS deptmap_def(name,code) INNER JOIN (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) on deptmap.serviceCode = eg_pgr_service.servicecode and deptmap_def.code = deptmap.department) AS department, - regexp_replace(servicecode, '([a-z])([A-Z])', '\1 \2','g') AS servicecode, - (SELECT boundary_def.name FROM (VALUES tbl_boundary) AS boundary_def(name,code) where code=eg_pgr_address.mohalla) as locality, - servicerequestid AS complaintNo, - to_char(to_timestamp(TRUNC(CAST(eg_pgr_service.createdtime AS bigint) / 1000)), 'DD/MM/YYYY') AS date, - eg_user.name, - phone, - eg_pgr_address.landmark, - eg_pgr_address.housenoandstreetname as address, - description, - (SELECT (CASE WHEN (((SELECT deptmap.slaHours FROM (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) WHERE deptmap.serviceCode = eg_pgr_service.servicecode)::integer / 24) - (epa.when - eg_pgr_service.createdtime)::bigint/86400000) < 1 THEN CONCAT('Overdue by ', ((epa.when - eg_pgr_service.createdtime)::bigint/86400000) - ((SELECT deptmap.slaHours FROM (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) WHERE deptmap.serviceCode = eg_pgr_service.servicecode)::integer / 24), ' days') ELSE CONCAT(((SELECT deptmap.slaHours FROM (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) WHERE deptmap.serviceCode = eg_pgr_service.servicecode)::integer / 24) - (epa.when - eg_pgr_service.createdtime)::bigint/86400000, ' days remaining') END) as slaHours), - Initcap(eg_pgr_service.status) as status, - to_char((To_timestamp(epa.when/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS actiondate - FROM eg_pgr_service - left outer join eg_pgr_address on eg_pgr_address.uuid = eg_pgr_service.addressid - left outer join eg_user on eg_user.id = eg_pgr_service.accountid::int - left outer join eg_pgr_action as epa on epa.businesskey = eg_pgr_service.servicerequestid and epa.action in ('assign','reassign','resolve') - left outer join eg_user as ua on (ua.id = epa.assignee::int or ua.id = split_part(epa.by,':',1)::INTEGER) - WHERE - eg_pgr_service.tenantid LIKE $tenantid - AND eg_pgr_address.uuid = eg_pgr_service.addressid - AND eg_pgr_service.status IN ('open','assigned','reassigrequested','rejected','closed','resolved') - orderby: ORDER BY servicerequestid, epa."when" desc - -- reportName: StateSourceReport - summary: Source of complaints across tenants - version: 1.0.0 - moduleName: rainmaker-pgr - sourceColumns: - - name: tenantid - label: reports.rainmaker-pgr.tenantid - type: string - source: eg_pgr_service - total: false - - name: whatsapp - label: reports.rainmaker-pgr.source.whatsapp - type: string - source: eg_pgr_service - total: true - - name: ivr - label: reports.rainmaker-pgr.source.ivr - type: string - source: eg_pgr_service - total: true - - name: mobileapp - label: reports.rainmaker-pgr.source.mobileapp - type: string - source: eg_pgr_service - total: true - - name: web - label: reports.rainmaker-pgr.source.web - type: string - source: eg_pgr_service - total: true - - name: unknown - label: reports.rainmaker-pgr.source.unknown - type: string - source: eg_pgr_service - total: true - searchParams: - - name: fromDate - label: reports.rainmaker-pgr.datefrom - type: epoch - source: eg_pgr_service - isMandatory: false - searchClause: AND createdtime >= $fromDate - - name: toDate - label: reports.rainmaker-pgr.dateto - type: epoch - source: eg_pgr_service - isMandatory: false - searchClause: AND createdtime <= $toDate - query: | - select initcap(split_part(tenantid, '.', 2)) as tenantid, - SUM(CASE WHEN source ='whatsapp' THEN 1 ELSE 0 END) as whatsapp, - SUM(CASE WHEN source ='ivr' THEN 1 ELSE 0 END) as ivr, - SUM(CASE WHEN source ='mobileapp' THEN 1 ELSE 0 END) as mobileapp, - SUM(CASE WHEN source ='web' THEN 1 ELSE 0 END) as web, - SUM(CASE WHEN source NOT IN ('web', 'ivr', 'mobileapp','whatsapp') OR source is NULL THEN 1 ELSE 0 END) as unknown - from eg_pgr_service - WHERE tenantid != 'pb.testing' - - groupby: GROUP BY tenantid - orderby: ORDER BY tenantid - -- reportName: EmployeeReport - summary: Fetches complaints for employees - version: 1.0.0 - moduleName: rainmaker-pgr - externalService: - - entity: $.MdmsRes.RAINMAKER-PGR.ServiceDefs - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=RAINMAKER-PGR&masterName=ServiceDefs&tenantId=$tenantId - keyOrder: serviceCode,department,slaHours - tableName: tbl_dept - - entity: $.TenantBoundary[0].boundary - apiURL: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search?hierarchyTypeCode=ADMIN&boundaryType=Locality&tenantId=$tenantId - keyOrder: name,code - tableName: tbl_boundary - sourceColumns: - - name: department - label: reports.rainmaker-pgr.department - type: string - source: eg_pgr_service - total: false - - name: servicecode - label: reports.rainmaker-pgr.servicecode - type: string - source: eg_pgr_service - total: false - - name: complaintNo - label: reports.rainmaker-pgr.complaintNo - type: string - source: eg_pgr_service - total: false - - name: date - label: reports.rainmaker-pgr.date - type: string - source: eg_pgr_service - total: false - - name: name - label: reports.rainmaker-pgr.name - type: string - source: eg_pgr_service - total: false - - name: phone - label: reports.rainmaker-pgr.phone - type: string - source: eg_pgr_service - total: false - - name: locality - label: reports.rainmaker-pgr.locality - type: string - source: eg_pgr_service - total: false - - name: address - label: reports.rainmaker-pgr.address - type: string - source: eg_pgr_service - total: false - - name: landmark - label: reports.rainmaker-pgr.landmark - type: string - source: eg_pgr_service - total: false - - name: description - label: reports.rainmaker-pgr.description - type: string - source: eg_pgr_service - total: false - - name: status - label: reports.rainmaker-pgr.status - type: string - source: eg_pgr_service - total: false - - name: slahours - label: reports.rainmaker-pgr.slahours - type: string - source: eg_pgr_service - total: false - searchParams: - - name: fromDate - label: reports.rainmaker-pgr.datefrom - type: epoch - source: eg_pgr_service - isMandatory: false - searchClause: AND eg_pgr_service.createdtime >= $fromDate - - name: toDate - label: reports.rainmaker-pgr.dateto - type: epoch - source: eg_pgr_service - isMandatory: false - searchClause: AND eg_pgr_service.createdtime <= $toDate - query: | - SELECT (SELECT deptmap.department FROM (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) WHERE deptmap.serviceCode = eg_pgr_service.servicecode) AS department, - regexp_replace(eg_pgr_service.servicecode, '([a-z])([A-Z])', '\1 \2','g') AS servicecode, - servicerequestid AS complaintNo, - to_char(to_timestamp(TRUNC(CAST(eg_pgr_service.createdtime AS bigint) / 1000)), 'DD/MM/YYYY') AS date, - (SELECT boundary_def.name FROM (VALUES tbl_boundary) AS boundary_def(name,code) where code=eg_pgr_address.mohalla) as locality, - eg_user.name, - phone, - eg_pgr_service.landmark, - housenoandstreetname as address, - description, - (SELECT (CASE WHEN (((SELECT deptmap.slaHours FROM (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) WHERE deptmap.serviceCode = eg_pgr_service.servicecode)::integer / 24) - ((((select extract(epoch from now())) * 1000) - eg_pgr_service.createdtime)::bigint/86400000)) < 1 THEN CONCAT('Overdue by ', ((((select extract(epoch from now())) * 1000) - eg_pgr_service.createdtime)::bigint/86400000) - ((SELECT deptmap.slaHours FROM (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) WHERE deptmap.serviceCode = eg_pgr_service.servicecode)::integer / 24), ' days') ELSE CONCAT(((SELECT deptmap.slaHours FROM (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) WHERE deptmap.serviceCode = eg_pgr_service.servicecode)::integer / 24) - ((((select extract(epoch from now())) * 1000) - eg_pgr_service.createdtime)::bigint/86400000), ' days remaining') END) as slaHours), - initcap(status) as status FROM eg_pgr_service - INNER JOIN eg_user ON eg_pgr_service.accountid = eg_user.id::VARCHAR - INNER JOIN eg_pgr_address ON eg_pgr_service.addressid = eg_pgr_address.uuid - WHERE eg_pgr_service.status = 'assigned' - AND servicerequestid IN (SELECT DISTINCT businesskey FROM eg_pgr_action WHERE status = 'assigned' AND "when" IN (select max("when") FROM eg_pgr_action WHERE assignee NOTNULL GROUP BY businesskey) AND assignee = $userid) - orderby: ORDER BY eg_pgr_service.createdtime asc - -- reportName: StateULBReport - summary: Fetches complaints stats for all ULBs in state - version: 1.0.0 - moduleName: rainmaker-pgr - sourceColumns: - - name: tenantid - label: reports.rainmaker-pgr.tenantid - type: string - source: eg_pgr_service - total: false - - name: open - label: reports.rainmaker-pgr.status.open - type: string - source: eg_pgr_service - total: true - - name: assigned - label: reports.rainmaker-pgr.status.assigned - type: string - source: eg_pgr_service - total: true - - name: closed - label: reports.rainmaker-pgr.status.closed - type: string - source: eg_pgr_service - total: true - - name: reassignrequested - label: reports.rainmaker-pgr.status.reassignrequested - type: string - source: eg_pgr_service - total: true - - name: rejected - label: reports.rainmaker-pgr.status.rejected - type: string - source: eg_pgr_service - total: true - - name: total - label: reports.rainmaker-pgr.total - type: string - source: eg_pgr_service - total: true - searchParams: - - name: fromDate - label: reports.rainmaker-pgr.datefrom - type: epoch - source: eg_pgr_service - isMandatory: false - searchClause: AND createdtime >= $fromDate - - name: toDate - label: reports.rainmaker-pgr.dateto - type: epoch - source: eg_pgr_service - isMandatory: false - searchClause: AND createdtime <= $toDate - query: | - select initcap(split_part(tenantid, '.', 2)) as tenantid, - SUM(CASE WHEN status ='open' THEN 1 ELSE 0 END) as open, - SUM(CASE WHEN status ='assigned' THEN 1 ELSE 0 END) as assigned, - SUM(CASE WHEN status in ('closed', 'resolved') THEN 1 ELSE 0 END) as closed, - SUM(CASE WHEN status ='reassignrequested' THEN 1 ELSE 0 END) as reassignrequested, - SUM(CASE WHEN status ='rejected' THEN 1 ELSE 0 END) as rejected, - COUNT(status) as total - from eg_pgr_service - WHERE tenantid != 'pb.testing' - groupby: GROUP BY tenantid - orderby: ORDER BY tenantid - -- reportName: ComplaintTypesReport - summary: Fetches complaint stats based on complaint types for a ULB - version: 1.0.0 - moduleName: rainmaker-pgr - sourceColumns: - - name: tenantid - label: reports.rainmaker-pgr.tenantid - type: string - source: eg_pgr_service - total: false - - name: complainttype - label: reports.rainmaker-pgr.complainttype - type: string - source: eg_pgr_service - total: false - - name: open - label: reports.rainmaker-pgr.status.open - type: string - source: eg_pgr_service - total: true - - name: assigned - label: reports.rainmaker-pgr.status.assigned - type: string - source: eg_pgr_service - total: true - - name: closed - label: reports.rainmaker-pgr.status.closed - type: string - source: eg_pgr_service - total: true - - name: reassignrequested - label: reports.rainmaker-pgr.status.reassignrequested - type: string - source: eg_pgr_service - total: true - - name: rejected - label: reports.rainmaker-pgr.status.rejected - type: string - source: eg_pgr_service - total: true - - name: total - label: reports.rainmaker-pgr.total - type: string - source: eg_pgr_service - total: true - searchParams: - - name: ulb - label: ULB - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name - source: pt - wrapper: true - isMandatory: false - searchClause: AND tenantid = $ulb - - name: fromDate - label: reports.rainmaker-pgr.datefrom - type: epoch - source: eg_pgr_service - isMandatory: false - searchClause: AND createdtime >= $fromDate - - name: toDate - label: reports.rainmaker-pgr.dateto - type: epoch - source: eg_pgr_service - isMandatory: false - searchClause: AND createdtime <= $toDate - query: | - select - initcap(split_part(tenantid, '.', 2)) as tenantid, - regexp_replace(servicecode, '([a-z])([A-Z])', '\1 \2','g') as complainttype, - SUM(CASE WHEN status ='open' THEN 1 ELSE 0 END) as open, - SUM(CASE WHEN status ='assigned' THEN 1 ELSE 0 END) as assigned, - SUM(CASE WHEN status in ('closed', 'resolved') THEN 1 ELSE 0 END) as closed, - SUM(CASE WHEN status ='reassignrequested' THEN 1 ELSE 0 END) as reassignrequested, - SUM(CASE WHEN status ='rejected' THEN 1 ELSE 0 END) as rejected, - count(status) as total - from eg_pgr_service - WHERE tenantid != 'pb.testing' - groupby: GROUP BY tenantid,servicecode - orderby: ORDER BY tenantid,servicecode - -- reportName: DepartmentReport - summary: Fetches complaint stats based on complaint types for a ULB - version: 1.0.0 - moduleName: rainmaker-pgr - externalService: - - entity: $.MdmsRes.RAINMAKER-PGR.ServiceDefs - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=RAINMAKER-PGR&masterName=ServiceDefs&tenantId=$tenantId - keyOrder: serviceCode,department,slaHours - tableName: tbl_dept - - entity: $.MdmsRes.common-masters.Department - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=common-masters&masterName=Department&tenantId=$tenantId - keyOrder: name,code - tableName: tbl_def_dept - sourceColumns: - - name: tenantid - label: reports.rainmaker-pgr.tenantid - type: string - source: eg_pgr_service - total: false - - name: department - label: reports.rainmaker-pgr.department - type: string - source: eg_pgr_service - total: false - - name: open - label: reports.rainmaker-pgr.status.open - type: string - source: eg_pgr_service - total: true - - name: assigned - label: reports.rainmaker-pgr.status.assigned - type: string - source: eg_pgr_service - total: true - - name: closed - label: reports.rainmaker-pgr.status.closed - type: string - source: eg_pgr_service - total: true - - name: reassignrequested - label: reports.rainmaker-pgr.status.reassignrequested - type: string - source: eg_pgr_service - total: true - - name: rejected - label: reports.rainmaker-pgr.status.rejected - type: string - source: eg_pgr_service - total: true - searchParams: - - name: ulb - label: ULB - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name - source: pt - wrapper: true - isMandatory: false - searchClause: AND tenantid = $ulb - - name: fromDate - label: reports.rainmaker-pgr.datefrom - type: epoch - source: eg_pgr_service - isMandatory: false - searchClause: AND createdtime >= $fromDate - - name: toDate - label: reports.rainmaker-pgr.dateto - type: epoch - source: eg_pgr_service - isMandatory: false - searchClause: AND createdtime <= $toDate - query: | - select - initcap(split_part(tenantid, '.', 2)) as tenantid, - deptmap_def.name as department, - SUM(CASE WHEN status ='open' THEN 1 ELSE 0 END) as open, - SUM(CASE WHEN status ='assigned' THEN 1 ELSE 0 END) as assigned, - SUM(CASE WHEN status in ('closed', 'resolved') THEN 1 ELSE 0 END) as closed, - SUM(CASE WHEN status ='reassignrequested' THEN 1 ELSE 0 END) as reassignrequested, - SUM(CASE WHEN status ='rejected' THEN 1 ELSE 0 END) as rejected, - count(status) as total - from eg_pgr_service - INNER JOIN (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) ON deptmap.serviceCode = eg_pgr_service.servicecode - INNER JOIN (VALUES tbl_def_dept) AS deptmap_def(name,code) ON deptmap.department = deptmap_def.code - WHERE tenantid != 'pb.testing' - groupby: GROUP BY tenantid,deptmap_def.name - orderby: ORDER BY tenantid,deptmap_def.name - -- reportName: ULBDepartmentReport - summary: Fetches complaint stats based on department types for a ULB - version: 1.0.0 - moduleName: rainmaker-pgr - externalService: - - entity: $.MdmsRes.RAINMAKER-PGR.ServiceDefs - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=RAINMAKER-PGR&masterName=ServiceDefs&tenantId=$tenantId - keyOrder: serviceCode,department,slaHours - tableName: tbl_dept - - entity: $.MdmsRes.common-masters.Department - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=common-masters&masterName=Department&tenantId=$tenantId - keyOrder: name,code - tableName: tbl_def_dept - sourceColumns: - - name: department - label: reports.rainmaker-pgr.department - type: string - source: eg_pgr_service - total: false - - name: rejected - label: reports.rainmaker-pgr.rejected - type: string - source: pgr_data - total: true - - name: resolved - label: reports.rainmaker-pgr.resolved - type: string - source: pgr_data - total: true - - name: resolvedoutsidesla - label: reports.rainmaker-pgr.resolvedoutsidesla - type: string - source: pgr_data - total: true - - name: open - label: reports.rainmaker-pgr.open - type: string - source: pgr_data - total: true - - name: assigned - label: reports.rainmaker-pgr.assigned - type: string - source: pgr_data - total: true - - name: outsidesla - label: reports.rainmaker-pgr.outsidesla - type: string - source: pgr_data - total: true - searchParams: - - name: fromDate - label: reports.rainmaker-pgr.datefrom - type: epoch - source: eg_pgr_service - isMandatory: false - searchClause: AND pgr_data.createdtime >= $fromDate - - name: toDate - label: reports.rainmaker-pgr.dateto - type: epoch - source: eg_pgr_service - isMandatory: false - searchClause: AND pgr_data.createdtime <= $toDate - query: | - with pgr_data as (select - servicerequestid, - servicecode, - createdtime, - status, - (select max("when") from eg_pgr_action where action='resolve' and businesskey = servicerequestid) as resolvedtime, - (select min("when") from eg_pgr_action where action='open' and businesskey = servicerequestid) as opentime - from eg_pgr_service as ps - where - tenantid = $tenantid) - - select - deptmap_def.name as department, - count(*) as total, - SUM (CASE WHEN status in ('rejected') THEN 1 ELSE 0 END) as rejected, - SUM (CASE WHEN status in ('closed', 'resolved') THEN 1 ELSE 0 END) as resolved, - SUM (CASE WHEN status in ('closed', 'resolved') and (resolvedtime - opentime) >= 14 * 86400 * 1000 THEN 1 ELSE 0 END) as resolvedoutsidesla, - SUM (CASE WHEN status in ('assigned', 'reassignrequested') THEN 1 ELSE 0 END) as assigned, - SUM (CASE WHEN status in ('open') THEN 1 ELSE 0 END) as open, - SUM (CASE WHEN status in ('assigned', 'reassignrequested', 'open') and (extract(epoch from now()) * 1000 - opentime) >= 14 * 86400 * 1000 THEN 1 ELSE 0 END) as outsidesla - from pgr_data - INNER JOIN (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) ON deptmap.serviceCode = pgr_data.servicecode - INNER JOIN (VALUES tbl_def_dept) AS deptmap_def(name,code) ON deptmap.department = deptmap_def.code - WHERE 1=1 - groupby: GROUP BY deptmap_def.name - orderby: ORDER BY deptmap_def.name - -- reportName: ULBEmployeeWiseReport - summary: Fetches employee wise assignment report - version: 1.0.0 - moduleName: rainmaker-pgr - sourceColumns: - - name: employee - label: reports.rainmaker-pgr.employee - type: string - source: pgr_data - total: false - - name: rejected - label: reports.rainmaker-pgr.rejected - type: string - source: pgr_data - total: true - - name: resolved - label: reports.rainmaker-pgr.resolved - type: string - source: pgr_data - total: true - - name: resolvedoutsidesla - label: reports.rainmaker-pgr.resolvedoutsidesla - type: string - source: pgr_data - total: true - - name: open - label: reports.rainmaker-pgr.open - type: string - source: pgr_data - total: true - - name: assigned - label: reports.rainmaker-pgr.assigned - type: string - source: pgr_data - total: true - - name: outsidesla - label: reports.rainmaker-pgr.outsidesla - type: string - source: pgr_data - total: true - searchParams: - - name: fromDate - label: reports.rainmaker-pgr.datefrom - type: epoch - source: eg_pgr_service - isMandatory: false - searchClause: AND pgr_data.createdtime >= $fromDate - - name: toDate - label: reports.rainmaker-pgr.dateto - type: epoch - source: eg_pgr_service - isMandatory: false - searchClause: AND pgr_data.createdtime <= $toDate - query: | - with pgr_data as (select - (select assignee from eg_pgr_action as pa where - pa.businesskey = ps.servicerequestid - and pa."action" in ('assign', 'reassign') - order by "when" desc - fetch first 1 rows only - ) as assignee, - servicerequestid, - createdtime, - status, - (select max("when") from eg_pgr_action where action='resolve' and businesskey = servicerequestid) as resolvedtime, - (select min("when") from eg_pgr_action where action='open' and businesskey = servicerequestid) as opentime - from eg_pgr_service as ps - where - tenantid = $tenantid) - - select - coalesce((select name from eg_user where id::varchar = assignee),'-- Unassigned --') as employee, - SUM (CASE WHEN status in ('rejected') THEN 1 ELSE 0 END) as rejected, - SUM (CASE WHEN status in ('closed', 'resolved') THEN 1 ELSE 0 END) as resolved, - SUM (CASE WHEN status in ('closed', 'resolved') and (resolvedtime - opentime) >= 14 * 86400 * 1000 THEN 1 ELSE 0 END) as resolvedoutsidesla, - SUM (CASE WHEN status in ('assigned', 'reassignrequested') THEN 1 ELSE 0 END) as assigned, - SUM (CASE WHEN status in ('open') THEN 1 ELSE 0 END) as open, - SUM (CASE WHEN status in ('assigned', 'reassignrequested', 'open') and (extract(epoch from now()) * 1000 - opentime) >= 14 * 86400 * 1000 THEN 1 ELSE 0 END) as outsidesla - from pgr_data - WHERE 1=1 - orderby: ORDER BY assignee NULLS FIRST - groupby: GROUP BY assignee - - -- reportName: UlbPgrSlaReport - summary: Fetches employee sla - version: 1.0.0 - moduleName: rainmaker-pgr - sourceColumns: - - name: tenantid - label: reports.rainmaker-pgr.tenantid - type: string - source: eg_pgr_service - total: false - - name: complainttype - label: reports.rainmaker-pgr.complainttype - type: string - source: eg_pgr_service - total: false - - name: total - label: reports.rainmaker-pgr.total - type: string - source: eg_pgr_service - total: true - - name: pendinginsla - label: reports.rainmaker-pgr.pendinginsla - type: string - source: eg_pgr_service - total: true - - name: pendingoutsidesla - label: reports.rainmaker-pgr.pendingoutsidesla - type: string - source: eg_pgr_service - total: true - - name: resolvedinsla - label: reports.rainmaker-pgr.resolvedinsla - type: string - source: eg_pgr_service - total: true - - name: resolvedoutsidesla - label: reports.rainmaker-pgr.resolvedoutsidesla - type: string - source: eg_pgr_service - total: true - searchParams: - - name: fromDate - label: reports.rainmaker-pgr.datefrom - type: epoch - source: eg_pgr_service - isMandatory: false - searchClause: AND pgr_data.createdtime >= $fromDate - - name: toDate - label: reports.rainmaker-pgr.dateto - type: epoch - source: eg_pgr_service - isMandatory: false - searchClause: AND pgr_data.createdtime <= $toDate - query: | - with pgr_data as (select - servicerequestid, - servicecode, - createdtime, - status, - (select max("when") from eg_pgr_action where action='resolve' and businesskey = servicerequestid) as resolvedtime, - (select min("when") from eg_pgr_action where action='open' and businesskey = servicerequestid) as opentime - from eg_pgr_service as ps) - select - initcap(split_part(tenantid, '.', 2)) as tenantid, - regexp_replace(eg_pgr_service.servicecode, '([a-z])([A-Z])', '\1 \2','g') as complainttype, - count(eg_pgr_service.status) as total, - SUM (CASE WHEN eg_pgr_service.status in ('assigned', 'reassignrequested', 'open') and (extract(epoch from now()) * 1000 - opentime) < 14 * 86400 * 1000 THEN 1 ELSE 0 END) as pendinginsla, - SUM (CASE WHEN eg_pgr_service.status in ('assigned', 'reassignrequested', 'open') and (extract(epoch from now()) * 1000 - opentime) >= 14 * 86400 * 1000 THEN 1 ELSE 0 END) as pendingoutsidesla, - SUM (CASE WHEN eg_pgr_service.status in ('closed', 'resolved') and (resolvedtime - opentime) < 14 * 86400 * 1000 THEN 1 ELSE 0 END) as resolvedinsla, - SUM (CASE WHEN eg_pgr_service.status in ('closed', 'resolved') and (resolvedtime - opentime) >= 14 * 86400 * 1000 THEN 1 ELSE 0 END) as resolvedoutsidesla - from eg_pgr_service,pgr_data - WHERE tenantid != 'pb.testing' and eg_pgr_service.servicerequestid=pgr_data.servicerequestid - groupby: GROUP BY tenantid,eg_pgr_service.servicecode - orderby: ORDER BY tenantid,eg_pgr_service.servicecode - -- reportName: FeedbackReport - summary: Fetches complaint state based on Feedback - version: 1.0.0 - moduleName: rainmaker-pgr - externalService: - - entity: $.MdmsRes.RAINMAKER-PGR.ServiceDefs - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=RAINMAKER-PGR&masterName=ServiceDefs&tenantId=$tenantId - keyOrder: serviceCode,department,slaHours - tableName: tbl_dept - - entity: $.MdmsRes.common-masters.Department - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=common-masters&masterName=Department&tenantId=$tenantId - keyOrder: name,code - tableName: tbl_def_dept - sourceColumns: - - name: department - label: reports.rainmaker-pgr.department - type: string - source: eg_pgr_service - total: false - - name: tenantid - label: reports.rainmaker-pgr.tenantid - type: string - source: eg_pgr_service - total: false - - name: citizenname - label: reports.rainmaker-pgr.citizenname - type: string - source: eg_pgr_service - total: false - - name: complainttype - label: reports.rainmaker-pgr.complainttype - type: string - source: eg_pgr_service - total: false - - name: complaintnumber - label: reports.rainmaker-pgr.complaintnumber - type: string - source: eg_pgr_service - total: false - - name: lastassignto - label: reports.rainmaker-pgr.lastassignto - type: string - source: eg_pgr_service - total: false - - name: rating - label: reports.rainmaker-pgr.rating - type: string - source: eg_pgr_service - total: false - - name: feedback - label: reports.rainmaker-pgr.feedback - type: string - source: eg_pgr_service - total: false - searchParams: - - name: ulb - label: ULB - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name - source: pt - wrapper: true - isMandatory: false - searchClause: AND eg_pgr_service.tenantid = $ulb - - name: fromDate - label: reports.rainmaker-pgr.datefrom - type: epoch - source: eg_pgr_service - isMandatory: false - searchClause: AND eg_pgr_service.createdtime >= $fromDate - - name: toDate - label: reports.rainmaker-pgr.dateto - type: epoch - source: eg_pgr_service - isMandatory: false - searchClause: AND eg_pgr_service.createdtime <= $toDate - query: | - SELECT - DISTINCT ON (servicerequestid) - initcap(split_part(eg_pgr_service.tenantid, '.', 2)) as tenantid, - (SELECT deptmap_def.name FROM (VALUES tbl_def_dept) AS deptmap_def(name,code) INNER JOIN (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) on deptmap.serviceCode = eg_pgr_service.servicecode and deptmap_def.code = deptmap.department) AS department, - regexp_replace(servicecode, '([a-z])([A-Z])', '\1 \2','g') AS complainttype, - ua.name as lastassignto, - servicerequestid AS complaintnumber, - eg_user.name AS citizenname, - rating, feedback FROM eg_pgr_service - left outer join eg_pgr_address on eg_pgr_address.uuid = eg_pgr_service.addressid - left outer join eg_user on eg_user.id = eg_pgr_service.accountid::int - left outer join eg_pgr_action as epa on epa.businesskey = eg_pgr_service.servicerequestid and epa.action in ('assign','reassign') - left outer join eg_user as ua on ua.id = epa.assignee::int - WHERE - eg_pgr_address.uuid = eg_pgr_service.addressid - AND rating is not null AND feedback is not null - orderby: ORDER BY servicerequestid, epa."when" desc - - -- reportName: SourceWiseReport_v2 - summary: Fetches reports based on the source of reception of the complaint - version: 1.0.0 - moduleName: rainmaker-pgr - sourceColumns: - - name: citizen_mobile_app - label: reports.rainmaker-pgr.citizen_mobile_app - type: string - source: eg_pgr_service - total: true - - name: citizen_web_app - label: reports.rainmaker-pgr.citizen_web_app - type: string - source: eg_pgr_service - total: true - - name: counter_desktop - label: reports.rainmaker-pgr.counter_desktop - type: string - source: eg_pgr_service - total: true - searchParams: - - name: fromDate - label: reports.rainmaker-pgr.datefrom - type: epoch - source: eg_pgr_service - isMandatory: false - searchClause: AND eg_pgr_service.createdtime >= $fromDate - - name: toDate - label: reports.rainmaker-pgr.dateto - type: epoch - source: eg_pgr_service - isMandatory: false - searchClause: AND eg_pgr_service.createdtime >= $fromDate - query: | - SELECT - sum(case when source = 'mobileapp' then 1 else 0 end) as citizen_mobile_app, - sum(case when source = 'web' then 1 else 0 end) as citizen_web_app, - sum(case when source = 'ivr' then 1 else 0 end) as counter_desktop - FROM eg_pgr_service - WHERE tenantid = $tenantid - -- reportName: DescriptionReport_v2 - decryptionPathId: DescriptionReport_v2 - summary: Fetches department wise reports based description of the complaint - version: 1.0.0 - moduleName: rainmaker-pgr - externalService: - - entity: $.MdmsRes.RAINMAKER-PGR.ServiceDefs - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=RAINMAKER-PGR&masterName=ServiceDefs&tenantId=$tenantId - keyOrder: serviceCode,department,slaHours - tableName: tbl_dept - - entity: $.MdmsRes.common-masters.Department - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=common-masters&masterName=Department&tenantId=$tenantId - keyOrder: name,code - tableName: tbl_def_dept - - entity: $.TenantBoundary[0].boundary - apiURL: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search?hierarchyTypeCode=ADMIN&boundaryType=Locality&tenantId=$tenantId - keyOrder: name,code - tableName: tbl_boundary - sourceColumns: - - name: department - label: reports.rainmaker-pgr.department - type: string - source: eg_pgr_service - total: false - - name: servicecode - label: reports.rainmaker-pgr.servicecode - type: string - source: eg_pgr_service - total: false - - name: complaintNo - label: reports.rainmaker-pgr.complaintNo - type: string - source: eg_pgr_service - total: false - - name: date - label: reports.rainmaker-pgr.date - type: string - source: eg_pgr_service - total: false - - name: name - label: reports.rainmaker-pgr.name - type: string - source: eg_pgr_service - total: false - - name: phone - label: reports.rainmaker-pgr.phone - type: string - source: eg_pgr_service - total: false - - name: address - label: reports.rainmaker-pgr.address - type: string - source: eg_pgr_service - total: false - - name: locality - label: reports.rainmaker-pgr.locality - type: string - source: eg_pgr_service - total: false - - name: landmark - label: reports.rainmaker-pgr.landmark - type: string - source: eg_pgr_service - total: false - - name: description - label: reports.rainmaker-pgr.description - type: string - source: eg_pgr_service - total: false - - name: lastassignedto - label: reports.rainmaker-pgr.lastassignedto - type: string - source: eg_pgr_service - total: false - - name: status - label: reports.rainmaker-pgr.status - type: string - source: eg_pgr_service - total: false - - name: slahours - label: reports.rainmaker-pgr.slahours - type: string - source: eg_pgr_service - total: false - - name: actiondate - label: reports.rainmaker-pgr.actiondate - type: string - source: eg_pgr_service - total: false - - name: source - label: reports.rainmaker-pgr.source - type: string - source: eg_pgr_service - total: false - searchParams: - - name: fromDate - label: reports.rainmaker-pgr.datefrom - type: epoch - source: eg_pgr_service - isMandatory: false - searchClause: AND eg_pgr_service.createdtime >= $fromDate - - name: toDate - label: reports.rainmaker-pgr.dateto - type: epoch - source: eg_pgr_service - isMandatory: false - searchClause: AND eg_pgr_service.createdtime <= $toDate - query: | - SELECT - DISTINCT ON (servicerequestid) - (case when ua.name is null then '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' else ua.name end) as lastassignedto, --value for Unassigned - (SELECT deptmap_def.name FROM (VALUES tbl_def_dept) AS deptmap_def(name,code) INNER JOIN (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) on deptmap.serviceCode = eg_pgr_service.servicecode and deptmap_def.code = deptmap.department) AS department, - regexp_replace(servicecode, '([a-z])([A-Z])', '\1 \2','g') AS servicecode, - (SELECT boundary_def.name FROM (VALUES tbl_boundary) AS boundary_def(name,code) where code=eg_pgr_address.mohalla) as locality, - servicerequestid AS complaintNo, - to_char(to_timestamp(TRUNC(CAST(eg_pgr_service.createdtime AS bigint) / 1000)), 'DD/MM/YYYY') AS date, - (case when eg_user.name is null then '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' else eg_user.name end) as name, --value for NULL - phone, - eg_pgr_address.landmark, - eg_pgr_address.housenoandstreetname as address, - description, - source, - (SELECT (CASE WHEN (((SELECT deptmap.slaHours FROM (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) WHERE deptmap.serviceCode = eg_pgr_service.servicecode)::integer / 24) - (epa.when - eg_pgr_service.createdtime)::bigint/86400000) < 1 THEN CONCAT('Overdue by ', ((epa.when - eg_pgr_service.createdtime)::bigint/86400000) - ((SELECT deptmap.slaHours FROM (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) WHERE deptmap.serviceCode = eg_pgr_service.servicecode)::integer / 24), ' days') ELSE CONCAT(((SELECT deptmap.slaHours FROM (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) WHERE deptmap.serviceCode = eg_pgr_service.servicecode)::integer / 24) - (epa.when - eg_pgr_service.createdtime)::bigint/86400000, ' days remaining') END) as slaHours), - Initcap(eg_pgr_service.status) as status, - to_char((To_timestamp(epa.when/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS actiondate - FROM eg_pgr_service - left outer join eg_pgr_address on eg_pgr_address.uuid = eg_pgr_service.addressid - left outer join eg_user on eg_user.id = eg_pgr_service.accountid::int - left outer join eg_pgr_action as epa on epa.businesskey = eg_pgr_service.servicerequestid and epa.action in ('assign','reassign','resolve') - left outer join eg_user as ua on (ua.id = epa.assignee::int or ua.id = split_part(epa.by,':',1)::INTEGER) - WHERE - eg_pgr_service.tenantid LIKE $tenantid - AND eg_pgr_address.uuid = eg_pgr_service.addressid - AND eg_pgr_service.status IN ('open','assigned','reassigrequested','rejected','closed','resolved') - orderby: ORDER BY servicerequestid, epa."when" desc - -- reportName: StateSourceReport_v2 - summary: Source of complaints across tenants - version: 1.0.0 - moduleName: rainmaker-pgr - sourceColumns: - - name: tenantid - label: reports.rainmaker-pgr.tenantid - type: string - source: eg_pgr_service - total: false - - name: whatsapp - label: reports.rainmaker-pgr.source.whatsapp - type: string - source: eg_pgr_service - total: true - - name: ivr - label: reports.rainmaker-pgr.source.ivr - type: string - source: eg_pgr_service - total: true - - name: mobileapp - label: reports.rainmaker-pgr.source.mobileapp - type: string - source: eg_pgr_service - total: true - - name: web - label: reports.rainmaker-pgr.source.web - type: string - source: eg_pgr_service - total: true - - name: unknown - label: reports.rainmaker-pgr.source.unknown - type: string - source: eg_pgr_service - total: true - searchParams: - - name: fromDate - label: reports.rainmaker-pgr.datefrom - type: epoch - source: eg_pgr_service - isMandatory: false - searchClause: AND createdtime >= $fromDate - - name: toDate - label: reports.rainmaker-pgr.dateto - type: epoch - source: eg_pgr_service - isMandatory: false - searchClause: AND createdtime <= $toDate - query: | - select initcap(split_part(tenantid, '.', 2)) as tenantid, - SUM(CASE WHEN source ='whatsapp' THEN 1 ELSE 0 END) as whatsapp, - SUM(CASE WHEN source ='ivr' THEN 1 ELSE 0 END) as ivr, - SUM(CASE WHEN source ='mobileapp' THEN 1 ELSE 0 END) as mobileapp, - SUM(CASE WHEN source ='web' THEN 1 ELSE 0 END) as web, - SUM(CASE WHEN source NOT IN ('web', 'ivr', 'mobileapp','whatsapp') OR source is NULL THEN 1 ELSE 0 END) as unknown - from eg_pgr_service - WHERE tenantid != 'pb.testing' - groupby: GROUP BY tenantid - orderby: ORDER BY tenantid - -- reportName: EmployeeReport_v2 - decryptionPathId: EmployeeReport_v2 - summary: Fetches complaints for employees - version: 1.0.0 - moduleName: rainmaker-pgr - externalService: - - entity: $.MdmsRes.RAINMAKER-PGR.ServiceDefs - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=RAINMAKER-PGR&masterName=ServiceDefs&tenantId=$tenantId - keyOrder: serviceCode,department,slaHours - tableName: tbl_dept - - entity: $.TenantBoundary[0].boundary - apiURL: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search?hierarchyTypeCode=ADMIN&boundaryType=Locality&tenantId=$tenantId - keyOrder: name,code - tableName: tbl_boundary - sourceColumns: - - name: department - label: reports.rainmaker-pgr.department - type: string - source: eg_pgr_service - total: false - - name: servicecode - label: reports.rainmaker-pgr.servicecode - type: string - source: eg_pgr_service - total: false - - name: complaintNo - label: reports.rainmaker-pgr.complaintNo - type: string - source: eg_pgr_service - total: false - - name: date - label: reports.rainmaker-pgr.date - type: string - source: eg_pgr_service - total: false - - name: name - label: reports.rainmaker-pgr.name - type: string - source: eg_pgr_service - total: false - - name: phone - label: reports.rainmaker-pgr.phone - type: string - source: eg_pgr_service - total: false - - name: locality - label: reports.rainmaker-pgr.locality - type: string - source: eg_pgr_service - total: false - - name: address - label: reports.rainmaker-pgr.address - type: string - source: eg_pgr_service - total: false - - name: landmark - label: reports.rainmaker-pgr.landmark - type: string - source: eg_pgr_service - total: false - - name: description - label: reports.rainmaker-pgr.description - type: string - source: eg_pgr_service - total: false - - name: status - label: reports.rainmaker-pgr.status - type: string - source: eg_pgr_service - total: false - - name: slahours - label: reports.rainmaker-pgr.slahours - type: string - source: eg_pgr_service - total: false - searchParams: - - name: fromDate - label: reports.rainmaker-pgr.datefrom - type: epoch - source: eg_pgr_service - isMandatory: false - searchClause: AND eg_pgr_service.createdtime >= $fromDate - - name: toDate - label: reports.rainmaker-pgr.dateto - type: epoch - source: eg_pgr_service - isMandatory: false - searchClause: AND eg_pgr_service.createdtime <= $toDate - query: | - SELECT (SELECT deptmap.department FROM (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) WHERE deptmap.serviceCode = eg_pgr_service.servicecode) AS department, - regexp_replace(eg_pgr_service.servicecode, '([a-z])([A-Z])', '\1 \2','g') AS servicecode, - servicerequestid AS complaintNo, - to_char(to_timestamp(TRUNC(CAST(eg_pgr_service.createdtime AS bigint) / 1000)), 'DD/MM/YYYY') AS date, - (SELECT boundary_def.name FROM (VALUES tbl_boundary) AS boundary_def(name,code) where code=eg_pgr_address.mohalla) as locality, - eg_user.name, - phone, - eg_pgr_service.landmark, - housenoandstreetname as address, - description, - (SELECT (CASE WHEN (((SELECT deptmap.slaHours FROM (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) WHERE deptmap.serviceCode = eg_pgr_service.servicecode)::integer / 24) - ((((select extract(epoch from now())) * 1000) - eg_pgr_service.createdtime)::bigint/86400000)) < 1 THEN CONCAT('Overdue by ', ((((select extract(epoch from now())) * 1000) - eg_pgr_service.createdtime)::bigint/86400000) - ((SELECT deptmap.slaHours FROM (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) WHERE deptmap.serviceCode = eg_pgr_service.servicecode)::integer / 24), ' days') ELSE CONCAT(((SELECT deptmap.slaHours FROM (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) WHERE deptmap.serviceCode = eg_pgr_service.servicecode)::integer / 24) - ((((select extract(epoch from now())) * 1000) - eg_pgr_service.createdtime)::bigint/86400000), ' days remaining') END) as slaHours), - initcap(status) as status FROM eg_pgr_service - INNER JOIN eg_user ON eg_pgr_service.accountid = eg_user.id::VARCHAR - INNER JOIN eg_pgr_address ON eg_pgr_service.addressid = eg_pgr_address.uuid - WHERE eg_pgr_service.status = 'assigned' - AND servicerequestid IN (SELECT DISTINCT businesskey FROM eg_pgr_action WHERE status = 'assigned' AND "when" IN (select max("when") FROM eg_pgr_action WHERE assignee NOTNULL GROUP BY businesskey) AND assignee = $userid) - orderby: ORDER BY eg_pgr_service.createdtime asc - -- reportName: StateULBReport_v2 - summary: Fetches complaints stats for all ULBs in state - version: 1.0.0 - moduleName: rainmaker-pgr - sourceColumns: - - name: tenantid - label: reports.rainmaker-pgr.tenantid - type: string - source: eg_pgr_service - total: false - - name: open - label: reports.rainmaker-pgr.status.open - type: string - source: eg_pgr_service - total: true - - name: assigned - label: reports.rainmaker-pgr.status.assigned - type: string - source: eg_pgr_service - total: true - - name: closed - label: reports.rainmaker-pgr.status.closed - type: string - source: eg_pgr_service - total: true - - name: reassignrequested - label: reports.rainmaker-pgr.status.reassignrequested - type: string - source: eg_pgr_service - total: true - - name: rejected - label: reports.rainmaker-pgr.status.rejected - type: string - source: eg_pgr_service - total: true - - name: total - label: reports.rainmaker-pgr.total - type: string - source: eg_pgr_service - total: true - searchParams: - - name: fromDate - label: reports.rainmaker-pgr.datefrom - type: epoch - source: eg_pgr_service - isMandatory: false - searchClause: AND createdtime >= $fromDate - - name: toDate - label: reports.rainmaker-pgr.dateto - type: epoch - source: eg_pgr_service - isMandatory: false - searchClause: AND createdtime <= $toDate - query: | - select initcap(split_part(tenantid, '.', 2)) as tenantid, - SUM(CASE WHEN status ='open' THEN 1 ELSE 0 END) as open, - SUM(CASE WHEN status ='assigned' THEN 1 ELSE 0 END) as assigned, - SUM(CASE WHEN status in ('closed', 'resolved') THEN 1 ELSE 0 END) as closed, - SUM(CASE WHEN status ='reassignrequested' THEN 1 ELSE 0 END) as reassignrequested, - SUM(CASE WHEN status ='rejected' THEN 1 ELSE 0 END) as rejected, - COUNT(status) as total - from eg_pgr_service - WHERE tenantid != 'pb.testing' - groupby: GROUP BY tenantid - orderby: ORDER BY tenantid - -- reportName: ComplaintTypeWiseReport - summary: Fetches complaint stats based on complaint types for a ULB - version: 1.0.0 - moduleName: rainmaker-pgr - sourceColumns: - - name: tenantid - label: reports.rainmaker-pgr.tenantid - type: string - source: eg_pgr_service - total: false - - name: complainttype - label: reports.rainmaker-pgr.complainttype - type: string - source: eg_pgr_service - total: false - - name: open - label: reports.rainmaker-pgr.status.open - type: string - source: eg_pgr_service - total: true - - name: assigned - label: reports.rainmaker-pgr.status.assigned - type: string - source: eg_pgr_service - total: true - - name: closed - label: reports.rainmaker-pgr.status.closed - type: string - source: eg_pgr_service - total: true - - name: reassignrequested - label: reports.rainmaker-pgr.status.reassignrequested - type: string - source: eg_pgr_service - total: true - - name: rejected - label: reports.rainmaker-pgr.status.rejected - type: string - source: eg_pgr_service - total: true - - name: total - label: reports.rainmaker-pgr.total - type: string - source: eg_pgr_service - total: true - searchParams: - - name: fromDate - label: reports.rainmaker-pgr.datefrom - type: epoch - source: eg_pgr_service - isMandatory: false - searchClause: AND createdtime >= $fromDate - - name: toDate - label: reports.rainmaker-pgr.dateto - type: epoch - source: eg_pgr_service - isMandatory: false - searchClause: AND createdtime <= $toDate - query: | - select - initcap(split_part(tenantid, '.', 2)) as tenantid, - regexp_replace(servicecode, '([a-z])([A-Z])', '\1 \2','g') as complainttype, - SUM(CASE WHEN status ='open' THEN 1 ELSE 0 END) as open, - SUM(CASE WHEN status ='assigned' THEN 1 ELSE 0 END) as assigned, - SUM(CASE WHEN status in ('closed', 'resolved') THEN 1 ELSE 0 END) as closed, - SUM(CASE WHEN status ='reassignrequested' THEN 1 ELSE 0 END) as reassignrequested, - SUM(CASE WHEN status ='rejected' THEN 1 ELSE 0 END) as rejected, - count(status) as total - from eg_pgr_service - WHERE tenantid = $tenantid - groupby: GROUP BY tenantid,servicecode - orderby: ORDER BY tenantid,servicecode - -- reportName: DepartmentReport_v2 - summary: Fetches complaint stats based on complaint types for a ULB - version: 1.0.0 - moduleName: rainmaker-pgr - externalService: - - entity: $.MdmsRes.RAINMAKER-PGR.ServiceDefs - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=RAINMAKER-PGR&masterName=ServiceDefs&tenantId=$tenantId - keyOrder: serviceCode,department,slaHours - tableName: tbl_dept - - entity: $.MdmsRes.common-masters.Department - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=common-masters&masterName=Department&tenantId=$tenantId - keyOrder: name,code - tableName: tbl_def_dept - sourceColumns: - - name: tenantid - label: reports.rainmaker-pgr.tenantid - type: string - source: eg_pgr_service - total: false - - name: department - label: reports.rainmaker-pgr.department - type: string - source: eg_pgr_service - total: false - - name: open - label: reports.rainmaker-pgr.status.open - type: string - source: eg_pgr_service - total: true - - name: assigned - label: reports.rainmaker-pgr.status.assigned - type: string - source: eg_pgr_service - total: true - - name: closed - label: reports.rainmaker-pgr.status.closed - type: string - source: eg_pgr_service - total: true - - name: reassignrequested - label: reports.rainmaker-pgr.status.reassignrequested - type: string - source: eg_pgr_service - total: true - - name: rejected - label: reports.rainmaker-pgr.status.rejected - type: string - source: eg_pgr_service - total: true - searchParams: - - name: ulb - label: ULB - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name - source: pt - wrapper: true - isMandatory: false - searchClause: AND tenantid = $ulb - - name: fromDate - label: reports.rainmaker-pgr.datefrom - type: epoch - source: eg_pgr_service - isMandatory: false - searchClause: AND createdtime >= $fromDate - - name: toDate - label: reports.rainmaker-pgr.dateto - type: epoch - source: eg_pgr_service - isMandatory: false - searchClause: AND createdtime <= $toDate - query: | - select - initcap(split_part(tenantid, '.', 2)) as tenantid, - deptmap_def.name as department, - SUM(CASE WHEN status ='open' THEN 1 ELSE 0 END) as open, - SUM(CASE WHEN status ='assigned' THEN 1 ELSE 0 END) as assigned, - SUM(CASE WHEN status in ('closed', 'resolved') THEN 1 ELSE 0 END) as closed, - SUM(CASE WHEN status ='reassignrequested' THEN 1 ELSE 0 END) as reassignrequested, - SUM(CASE WHEN status ='rejected' THEN 1 ELSE 0 END) as rejected, - count(status) as total - from eg_pgr_service - INNER JOIN (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) ON deptmap.serviceCode = eg_pgr_service.servicecode - INNER JOIN (VALUES tbl_def_dept) AS deptmap_def(name,code) ON deptmap.department = deptmap_def.code - WHERE tenantid != 'pb.testing' - groupby: GROUP BY tenantid,deptmap_def.name - orderby: ORDER BY tenantid,deptmap_def.name - -- reportName: ULBDepartmentReport_v2 - summary: Fetches complaint stats based on department types for a ULB - version: 1.0.0 - moduleName: rainmaker-pgr - externalService: - - entity: $.MdmsRes.RAINMAKER-PGR.ServiceDefs - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=RAINMAKER-PGR&masterName=ServiceDefs&tenantId=$tenantId - keyOrder: serviceCode,department,slaHours - tableName: tbl_dept - - entity: $.MdmsRes.common-masters.Department - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=common-masters&masterName=Department&tenantId=$tenantId - keyOrder: name,code - tableName: tbl_def_dept - sourceColumns: - - name: department - label: reports.rainmaker-pgr.department - type: string - source: eg_pgr_service - total: false - - name: rejected - label: reports.rainmaker-pgr.rejected - type: string - source: pgr_data - total: true - - name: resolved - label: reports.rainmaker-pgr.resolved - type: string - source: pgr_data - total: true - - name: resolvedoutsidesla - label: reports.rainmaker-pgr.resolvedoutsidesla - type: string - source: pgr_data - total: true - - name: open - label: reports.rainmaker-pgr.open - type: string - source: pgr_data - total: true - - name: assigned - label: reports.rainmaker-pgr.assigned - type: string - source: pgr_data - total: true - - name: outsidesla - label: reports.rainmaker-pgr.outsidesla - type: string - source: pgr_data - total: true - searchParams: - - name: fromDate - label: reports.rainmaker-pgr.datefrom - type: epoch - source: eg_pgr_service - isMandatory: false - searchClause: AND pgr_data.createdtime >= $fromDate - - name: toDate - label: reports.rainmaker-pgr.dateto - type: epoch - source: eg_pgr_service - isMandatory: false - searchClause: AND pgr_data.createdtime <= $toDate - query: | - with pgr_data as (select - servicerequestid, - servicecode, - createdtime, - status, - (select max("when") from eg_pgr_action where action='resolve' and businesskey = servicerequestid) as resolvedtime, - (select min("when") from eg_pgr_action where action='open' and businesskey = servicerequestid) as opentime - from eg_pgr_service as ps - where - tenantid = $tenantid) - - select - deptmap_def.name as department, - count(*) as total, - SUM (CASE WHEN status in ('rejected') THEN 1 ELSE 0 END) as rejected, - SUM (CASE WHEN status in ('closed', 'resolved') THEN 1 ELSE 0 END) as resolved, - SUM (CASE WHEN status in ('closed', 'resolved') and (resolvedtime - opentime) >= 14 * 86400 * 1000 THEN 1 ELSE 0 END) as resolvedoutsidesla, - SUM (CASE WHEN status in ('assigned', 'reassignrequested') THEN 1 ELSE 0 END) as assigned, - SUM (CASE WHEN status in ('open') THEN 1 ELSE 0 END) as open, - SUM (CASE WHEN status in ('assigned', 'reassignrequested', 'open') and (extract(epoch from now()) * 1000 - opentime) >= 14 * 86400 * 1000 THEN 1 ELSE 0 END) as outsidesla - from pgr_data - INNER JOIN (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) ON deptmap.serviceCode = pgr_data.servicecode - INNER JOIN (VALUES tbl_def_dept) AS deptmap_def(name,code) ON deptmap.department = deptmap_def.code - WHERE 1=1 - groupby: GROUP BY deptmap_def.name - orderby: ORDER BY deptmap_def.name - -- reportName: ULBEmployeeWiseReport_v2 - decryptionPathId: ULBEmployeeWiseReport - summary: Fetches employee wise assignment report - version: 1.0.0 - moduleName: rainmaker-pgr - sourceColumns: - - name: employee - label: reports.rainmaker-pgr.employee - type: string - source: pgr_data - total: false - - name: rejected - label: reports.rainmaker-pgr.rejected - type: string - source: pgr_data - total: true - - name: resolved - label: reports.rainmaker-pgr.resolved - type: string - source: pgr_data - total: true - - name: resolvedoutsidesla - label: reports.rainmaker-pgr.resolvedoutsidesla - type: string - source: pgr_data - total: true - - name: open - label: reports.rainmaker-pgr.open - type: string - source: pgr_data - total: true - - name: assigned - label: reports.rainmaker-pgr.assigned - type: string - source: pgr_data - total: true - - name: outsidesla - label: reports.rainmaker-pgr.outsidesla - type: string - source: pgr_data - total: true - searchParams: - - name: fromDate - label: reports.rainmaker-pgr.datefrom - type: epoch - source: eg_pgr_service - isMandatory: false - searchClause: AND pgr_data.createdtime >= $fromDate - - name: toDate - label: reports.rainmaker-pgr.dateto - type: epoch - source: eg_pgr_service - isMandatory: false - searchClause: AND pgr_data.createdtime <= $toDate - query: | - with pgr_data as (select - (select assignee from eg_pgr_action as pa where - pa.businesskey = ps.servicerequestid - and pa."action" in ('assign', 'reassign') - order by "when" desc - fetch first 1 rows only - ) as assignee, - servicerequestid, - createdtime, - status, - (select max("when") from eg_pgr_action where action='resolve' and businesskey = servicerequestid) as resolvedtime, - (select min("when") from eg_pgr_action where action='open' and businesskey = servicerequestid) as opentime - from eg_pgr_service as ps - where - tenantid = $tenantid) - select - coalesce((select name from eg_user where id::varchar = assignee),'30048|23/xn3x2FAxn8vYAN0IdplsOxaE=') as employee, -- encrypted value for NULL - SUM (CASE WHEN status in ('rejected') THEN 1 ELSE 0 END) as rejected, - SUM (CASE WHEN status in ('closed', 'resolved') THEN 1 ELSE 0 END) as resolved, - SUM (CASE WHEN status in ('closed', 'resolved') and (resolvedtime - opentime) >= 14 * 86400 * 1000 THEN 1 ELSE 0 END) as resolvedoutsidesla, - SUM (CASE WHEN status in ('assigned', 'reassignrequested') THEN 1 ELSE 0 END) as assigned, - SUM (CASE WHEN status in ('open') THEN 1 ELSE 0 END) as open, - SUM (CASE WHEN status in ('assigned', 'reassignrequested', 'open') and (extract(epoch from now()) * 1000 - opentime) >= 14 * 86400 * 1000 THEN 1 ELSE 0 END) as outsidesla - from pgr_data - WHERE 1=1 - groupby: GROUP BY assignee - orderby: ORDER BY assignee NULLS FIRST - - -- reportName: UlbPgrSlaReport_v2 - summary: Fetches employee sla for state - version: 1.0.0 - moduleName: rainmaker-pgr - sourceColumns: - - name: tenantid - label: reports.rainmaker-pgr.tenantid - type: string - source: eg_pgr_service - total: false - - name: complainttype - label: reports.rainmaker-pgr.complainttype - type: string - source: eg_pgr_service - total: false - - name: total - label: reports.rainmaker-pgr.total - type: string - source: eg_pgr_service - total: true - - name: pendinginsla - label: reports.rainmaker-pgr.pendinginsla - type: string - source: eg_pgr_service - total: true - - name: pendingoutsidesla - label: reports.rainmaker-pgr.pendingoutsidesla - type: string - source: eg_pgr_service - total: true - - name: resolvedinsla - label: reports.rainmaker-pgr.resolvedinsla - type: string - source: eg_pgr_service - total: true - - name: resolvedoutsidesla - label: reports.rainmaker-pgr.resolvedoutsidesla - type: string - source: eg_pgr_service - total: true - searchParams: - - name: fromDate - label: reports.rainmaker-pgr.datefrom - type: epoch - source: eg_pgr_service - isMandatory: false - searchClause: AND pgr_data.createdtime >= $fromDate - - name: toDate - label: reports.rainmaker-pgr.dateto - type: epoch - source: eg_pgr_service - isMandatory: false - searchClause: AND pgr_data.createdtime <= $toDate - query: | - with pgr_data as (select - servicerequestid, - servicecode, - createdtime, - status, - (select max("when") from eg_pgr_action where action='resolve' and businesskey = servicerequestid) as resolvedtime, - (select min("when") from eg_pgr_action where action='open' and businesskey = servicerequestid) as opentime - from eg_pgr_service as ps) - select - initcap(split_part(tenantid, '.', 2)) as tenantid, - regexp_replace(eg_pgr_service.servicecode, '([a-z])([A-Z])', '\1 \2','g') as complainttype, - count(eg_pgr_service.status) as total, - SUM (CASE WHEN eg_pgr_service.status in ('assigned', 'reassignrequested', 'open') and (extract(epoch from now()) * 1000 - opentime) < 14 * 86400 * 1000 THEN 1 ELSE 0 END) as pendinginsla, - SUM (CASE WHEN eg_pgr_service.status in ('assigned', 'reassignrequested', 'open') and (extract(epoch from now()) * 1000 - opentime) >= 14 * 86400 * 1000 THEN 1 ELSE 0 END) as pendingoutsidesla, - SUM (CASE WHEN eg_pgr_service.status in ('closed', 'resolved') and (resolvedtime - opentime) < 14 * 86400 * 1000 THEN 1 ELSE 0 END) as resolvedinsla, - SUM (CASE WHEN eg_pgr_service.status in ('closed', 'resolved') and (resolvedtime - opentime) >= 14 * 86400 * 1000 THEN 1 ELSE 0 END) as resolvedoutsidesla - from eg_pgr_service,pgr_data - WHERE tenantid != 'pb.testing' and eg_pgr_service.servicerequestid=pgr_data.servicerequestid - groupby: GROUP BY tenantid,eg_pgr_service.servicecode - orderby: ORDER BY tenantid,eg_pgr_service.servicecode - -- reportName: FeedbackReport_v2 - decryptionPathId: FeedbackReport_v2 - summary: Fetches complaint state based on Feedback - version: 1.0.0 - moduleName: rainmaker-pgr - externalService: - - entity: $.MdmsRes.RAINMAKER-PGR.ServiceDefs - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=RAINMAKER-PGR&masterName=ServiceDefs&tenantId=$tenantId - keyOrder: serviceCode,department,slaHours - tableName: tbl_dept - - entity: $.MdmsRes.common-masters.Department - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=common-masters&masterName=Department&tenantId=$tenantId - keyOrder: name,code - tableName: tbl_def_dept - sourceColumns: - - name: department - label: reports.rainmaker-pgr.department - type: string - source: eg_pgr_service - total: false - - name: tenantid - label: reports.rainmaker-pgr.tenantid - type: string - source: eg_pgr_service - total: false - - name: citizenname - label: reports.rainmaker-pgr.citizenname - type: string - source: eg_pgr_service - total: false - - name: complainttype - label: reports.rainmaker-pgr.complainttype - type: string - source: eg_pgr_service - total: false - - name: complaintnumber - label: reports.rainmaker-pgr.complaintnumber - type: string - source: eg_pgr_service - total: false - - name: lastassignto - label: reports.rainmaker-pgr.lastassignto - type: string - source: eg_pgr_service - total: false - - name: rating - label: reports.rainmaker-pgr.rating - type: string - source: eg_pgr_service - total: false - - name: feedback - label: reports.rainmaker-pgr.feedback - type: string - source: eg_pgr_service - total: false - searchParams: - - name: ulb - label: ULB - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name - source: pt - wrapper: true - isMandatory: false - searchClause: AND eg_pgr_service.tenantid = $ulb - - name: fromDate - label: reports.rainmaker-pgr.datefrom - type: epoch - source: eg_pgr_service - isMandatory: false - searchClause: AND eg_pgr_service.createdtime >= $fromDate - - name: toDate - label: reports.rainmaker-pgr.dateto - type: epoch - source: eg_pgr_service - isMandatory: false - searchClause: AND eg_pgr_service.createdtime <= $toDate - query: | - SELECT - DISTINCT ON (servicerequestid) - initcap(split_part(eg_pgr_service.tenantid, '.', 2)) as tenantid, - (SELECT deptmap_def.name FROM (VALUES tbl_def_dept) AS deptmap_def(name,code) INNER JOIN (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) on deptmap.serviceCode = eg_pgr_service.servicecode and deptmap_def.code = deptmap.department) AS department, - regexp_replace(servicecode, '([a-z])([A-Z])', '\1 \2','g') AS complainttype, - ua.name as lastassignto, - servicerequestid AS complaintnumber, - eg_user.name AS citizenname, - rating, feedback FROM eg_pgr_service - left outer join eg_pgr_address on eg_pgr_address.uuid = eg_pgr_service.addressid - left outer join eg_user on eg_user.id = eg_pgr_service.accountid::int - left outer join eg_pgr_action as epa on epa.businesskey = eg_pgr_service.servicerequestid and epa.action in ('assign','reassign') - left outer join eg_user as ua on ua.id = epa.assignee::int - WHERE - eg_pgr_address.uuid = eg_pgr_service.addressid - AND rating is not null AND feedback is not null - orderby: ORDER BY servicerequestid, epa."when" desc - - -- reportName: ComplaintTypesReport_v2 - summary: Fetches complaint stats based on complaint types for a ULB - version: 1.0.0 - moduleName: rainmaker-pgr - sourceColumns: - - name: tenantid - label: reports.rainmaker-pgr.tenantid - type: string - source: eg_pgr_service - total: false - - name: complainttype - label: reports.rainmaker-pgr.complainttype - type: string - source: eg_pgr_service - total: false - - name: open - label: reports.rainmaker-pgr.status.open - type: string - source: eg_pgr_service - total: true - - name: assigned - label: reports.rainmaker-pgr.status.assigned - type: string - source: eg_pgr_service - total: true - - name: closed - label: reports.rainmaker-pgr.status.closed - type: string - source: eg_pgr_service - total: true - - name: reassignrequested - label: reports.rainmaker-pgr.status.reassignrequested - type: string - source: eg_pgr_service - total: true - - name: rejected - label: reports.rainmaker-pgr.status.rejected - type: string - source: eg_pgr_service - total: true - - name: total - label: reports.rainmaker-pgr.total - type: string - source: eg_pgr_service - total: true - searchParams: - - name: ulb - label: ULB - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name - source: pt - wrapper: true - isMandatory: false - searchClause: AND tenantid = $ulb - - name: fromDate - label: reports.rainmaker-pgr.datefrom - type: epoch - source: eg_pgr_service - isMandatory: false - searchClause: AND createdtime >= $fromDate - - name: toDate - label: reports.rainmaker-pgr.dateto - type: epoch - source: eg_pgr_service - isMandatory: false - searchClause: AND createdtime <= $toDate - query: | - select - initcap(split_part(tenantid, '.', 2)) as tenantid, - regexp_replace(servicecode, '([a-z])([A-Z])', '\1 \2','g') as complainttype, - SUM(CASE WHEN status ='open' THEN 1 ELSE 0 END) as open, - SUM(CASE WHEN status ='assigned' THEN 1 ELSE 0 END) as assigned, - SUM(CASE WHEN status in ('closed', 'resolved') THEN 1 ELSE 0 END) as closed, - SUM(CASE WHEN status ='reassignrequested' THEN 1 ELSE 0 END) as reassignrequested, - SUM(CASE WHEN status ='rejected' THEN 1 ELSE 0 END) as rejected, - count(status) as total - from eg_pgr_service - WHERE tenantid != 'pb.testing' - groupby: GROUP BY tenantid,servicecode - orderby: ORDER BY tenantid,servicecode - - - - -- reportName: StateDescriptionReport_v2 - decryptionPathId: DescriptionReport_v2 - summary: Fetches state description wise reports - version: 1.0.0 - moduleName: rainmaker-pgr - externalService: - - entity: $.MdmsRes.RAINMAKER-PGR.ServiceDefs - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=RAINMAKER-PGR&masterName=ServiceDefs&tenantId=$tenantId - keyOrder: serviceCode,department,slaHours - tableName: tbl_dept - - entity: $.MdmsRes.common-masters.Department - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=common-masters&masterName=Department&tenantId=$tenantId - keyOrder: name,code - tableName: tbl_def_dept - sourceColumns: - - name: department - label: reports.rainmaker-pgr.department - type: string - source: eg_pgr_service - total: false - - name: servicecode - label: reports.rainmaker-pgr.servicecode - type: string - source: eg_pgr_service - total: false - - name: complaintNo - label: reports.rainmaker-pgr.complaintNo - type: string - source: eg_pgr_service - total: false - - name: date - label: reports.rainmaker-pgr.date - type: string - source: eg_pgr_service - total: false - - name: name - label: reports.rainmaker-pgr.name - type: string - source: eg_pgr_service - total: false - - name: phone - label: reports.rainmaker-pgr.phone - type: string - source: eg_pgr_service - total: false - - name: address - label: reports.rainmaker-pgr.address - type: string - source: eg_pgr_service - total: false - - name: landmark - label: reports.rainmaker-pgr.landmark - type: string - source: eg_pgr_service - total: false - - name: description - label: reports.rainmaker-pgr.description - type: string - source: eg_pgr_service - total: false - - name: lastassignedto - label: reports.rainmaker-pgr.lastassignedto - type: string - source: eg_pgr_service - total: false - - name: status - label: reports.rainmaker-pgr.status - type: string - source: eg_pgr_service - total: false - - name: slahours - label: reports.rainmaker-pgr.slahours - type: string - source: eg_pgr_service - total: false - - name: actiondate - label: reports.rainmaker-pgr.actiondate - type: string - source: eg_pgr_service - total: false - - name: source - label: reports.rainmaker-pgr.source - type: string - source: eg_pgr_service - total: false - - name: tenantid - label: reports.rainmaker-pgr.tenantid - type: string - source: eg_pgr_service - total: false - searchParams: - - name: fromDate - label: reports.rainmaker-pgr.datefrom - type: epoch - source: eg_pgr_service - isMandatory: false - searchClause: AND eg_pgr_service.createdtime >= $fromDate - - name: toDate - label: reports.rainmaker-pgr.dateto - type: epoch - source: eg_pgr_service - isMandatory: false - searchClause: AND eg_pgr_service.createdtime <= $toDate - query: | - SELECT - DISTINCT ON (servicerequestid) - (case when ua.name is null then '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' else ua.name end) as lastassignedto, --value for Unassigned - (SELECT deptmap_def.name FROM (VALUES tbl_def_dept) AS deptmap_def(name,code) INNER JOIN (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) on deptmap.serviceCode = eg_pgr_service.servicecode and deptmap_def.code = deptmap.department) AS department, - regexp_replace(servicecode, '([a-z])([A-Z])', '\1 \2','g') AS servicecode, - --(SELECT boundary_def.name FROM (VALUES tbl_boundary) AS boundary_def(name,code) where code=eg_pgr_address.mohalla) as locality, - servicerequestid AS complaintNo, - to_char(to_timestamp(TRUNC(CAST(eg_pgr_service.createdtime AS bigint) / 1000)), 'DD/MM/YYYY') AS date, - (case when eg_user.name is null then '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' else eg_user.name end) as name, --value for NULL - phone, - eg_pgr_address.landmark, - eg_pgr_address.housenoandstreetname as address, - description, - source, - eg_pgr_service.tenantid, - (SELECT (CASE WHEN (((SELECT deptmap.slaHours FROM (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) WHERE deptmap.serviceCode = eg_pgr_service.servicecode)::integer / 24) - (epa.when - eg_pgr_service.createdtime)::bigint/86400000) < 1 THEN CONCAT('Overdue by ', ((epa.when - eg_pgr_service.createdtime)::bigint/86400000) - ((SELECT deptmap.slaHours FROM (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) WHERE deptmap.serviceCode = eg_pgr_service.servicecode)::integer / 24), ' days') ELSE CONCAT(((SELECT deptmap.slaHours FROM (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) WHERE deptmap.serviceCode = eg_pgr_service.servicecode)::integer / 24) - (epa.when - eg_pgr_service.createdtime)::bigint/86400000, ' days remaining') END) as slaHours), - Initcap(eg_pgr_service.status) as status, - to_char((To_timestamp(epa.when/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS actiondate - FROM eg_pgr_service - left outer join eg_pgr_address on eg_pgr_address.uuid = eg_pgr_service.addressid - left outer join eg_user on eg_user.id = eg_pgr_service.accountid::int - left outer join eg_pgr_action as epa on epa.businesskey = eg_pgr_service.servicerequestid and epa.action in ('assign','reassign','resolve') - left outer join eg_user as ua on (ua.id = epa.assignee::int or ua.id = split_part(epa.by,':',1)::INTEGER) - WHERE - eg_pgr_service.tenantid !='pb.testing' - AND eg_pgr_address.uuid = eg_pgr_service.addressid - AND eg_pgr_service.status IN ('open','assigned','reassigrequested','rejected','closed','resolved') - orderby: ORDER BY servicerequestid, epa."when" desc - -- reportName: UlbwisePgrSlaReport_v2 - summary: Fetches Ulb employee sla - version: 1.0.0 - moduleName: rainmaker-pgr - sourceColumns: - - name: tenantid - label: reports.rainmaker-pgr.tenantid - type: string - source: eg_pgr_service - total: false - - name: complainttype - label: reports.rainmaker-pgr.complainttype - type: string - source: eg_pgr_service - total: false - - name: total - label: reports.rainmaker-pgr.total - type: string - source: eg_pgr_service - total: true - - name: pendinginsla - label: reports.rainmaker-pgr.pendinginsla - type: string - source: eg_pgr_service - total: true - - name: pendingoutsidesla - label: reports.rainmaker-pgr.pendingoutsidesla - type: string - source: eg_pgr_service - total: true - - name: resolvedinsla - label: reports.rainmaker-pgr.resolvedinsla - type: string - source: eg_pgr_service - total: true - - name: resolvedoutsidesla - label: reports.rainmaker-pgr.resolvedoutsidesla - type: string - source: eg_pgr_service - total: true - searchParams: - - name: fromDate - label: reports.rainmaker-pgr.datefrom - type: epoch - source: eg_pgr_service - isMandatory: false - searchClause: AND pgr_data.createdtime >= $fromDate - - name: toDate - label: reports.rainmaker-pgr.dateto - type: epoch - source: eg_pgr_service - isMandatory: false - searchClause: AND pgr_data.createdtime <= $toDate - query: | - with pgr_data as (select - servicerequestid, - servicecode, - createdtime, - status, - (select max("when") from eg_pgr_action where action='resolve' and businesskey = servicerequestid) as resolvedtime, - (select min("when") from eg_pgr_action where action='open' and businesskey = servicerequestid) as opentime - from eg_pgr_service as ps) - select - initcap(split_part(tenantid, '.', 2)) as tenantid, - regexp_replace(eg_pgr_service.servicecode, '([a-z])([A-Z])', '\1 \2','g') as complainttype, - count(eg_pgr_service.status) as total, - SUM (CASE WHEN eg_pgr_service.status in ('assigned', 'reassignrequested', 'open') and (extract(epoch from now()) * 1000 - opentime) < 14 * 86400 * 1000 THEN 1 ELSE 0 END) as pendinginsla, - SUM (CASE WHEN eg_pgr_service.status in ('assigned', 'reassignrequested', 'open') and (extract(epoch from now()) * 1000 - opentime) >= 14 * 86400 * 1000 THEN 1 ELSE 0 END) as pendingoutsidesla, - SUM (CASE WHEN eg_pgr_service.status in ('closed', 'resolved') and (resolvedtime - opentime) < 14 * 86400 * 1000 THEN 1 ELSE 0 END) as resolvedinsla, - SUM (CASE WHEN eg_pgr_service.status in ('closed', 'resolved') and (resolvedtime - opentime) >= 14 * 86400 * 1000 THEN 1 ELSE 0 END) as resolvedoutsidesla - from eg_pgr_service,pgr_data - WHERE tenantid = $tenantid and eg_pgr_service.servicerequestid=pgr_data.servicerequestid - groupby: GROUP BY tenantid,eg_pgr_service.servicecode - orderby: ORDER BY tenantid,eg_pgr_service.servicecode diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml deleted file mode 100644 index a31a733d..00000000 --- a/configs/reports/configs/pt-reports.yml +++ /dev/null @@ -1,6347 +0,0 @@ ---- -ReportDefinitions: - - reportName: ReceiptRegister - decryptionPathId: ReceiptRegister - summary: Receipt Register - version: 1.0.0 - moduleName: rainmaker-pt - additionalConfig: - print: - pdfPageSize: A1 - sourceColumns: - - name: receiptnumber - label: reports.pt.receiptNo - type: string - source: pt - total: false - - name: receiptdate - label: reports.pt.receiptDate - type: string - source: pt - total: false - - name: g8issuedate - label: reports.pt.g8issuedate - type: string - source: pt - total: false - - name: g8receiptno - label: reports.pt.g8receiptno - type: string - source: pt - total: false - - name: amount - label: reports.pt.amount - type: string - source: pt - total: true - - name: propertytax - label: reports.pt.propertyTax - type: string - source: pt - total: true - - name: firecess - label: reports.pt.fireCess - type: string - source: pt - total: true - - name: cancercess - label: reports.pt.cancerCess - type: string - source: pt - total: true - - name: rebate - label: reports.pt.rebate - type: string - source: pt - total: true - - name: adhocrebate - label: reports.pt.adhocrebate - type: string - source: pt - total: true - - name: penalty - label: reports.pt.penalty - type: string - source: pt - total: true - - name: adhocpenalty - label: reports.pt.adhocpenalty - type: string - source: pt - total: true - - name: interest - label: reports.pt.interest - type: string - source: pt - total: true - - name: exemption - label: reports.pt.exemption - type: string - source: pt - total: true - - name: adjustment - label: reports.pt.roundoff - type: string - source: pt - total: true - - name: pendingamount - label: reports.pt.pendingamount - type: string - source: pt - total: true - - name: propertyid - label: reports.pt.propertyId - type: string - source: pt - total: false - - name: usagetype - label: reports.pt.usagetype - type: string - source: pt - total: false - - name: assessmentnumber - label: reports.pt.assessmentNo - type: string - source: pt - total: false - - name: financialyear - label: reports.pt.financialYear - type: string - source: pt - total: false - - name: instrumenttype - label: reports.pt.paymentMode - type: string - source: pt - total: false - - name: transactionnumber - label: reports.pt.ddChequeTransactionNo - type: string - source: pt - total: false - - name: transactiondate - label: reports.pt.ddChequeTransactionDate - type: string - source: pt - total: false - - name: bankname - label: reports.pt.bankName - type: string - source: pt - total: false - - name: collectorname - label: reports.pt.collectorname - type: string - source: pt - total: false - - name: remarks - label: reports.pt.remarks - type: string - source: pt - total: false - searchParams: - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: true - searchClause: AND rh.receiptdate >= $fromDate - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: true - searchClause: AND rh.receiptdate <= $toDate - - name: paymentMode - label: Payment Mode - type: singlevaluelist - pattern: list://Cash:Cash,Online:Online,Card:Card,DD:DD,Cheque:Cheque - source: pt - isMandatory: false - searchClause: AND instrumenttype = $paymentMode - - name: financialyear - label: Financial Year - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name - source: pt - wrapper: true - isMandatory: false - searchClause: AND financialyear = $financialyear - - name: localityArray - label: reports.pt.zoneList - type: boundarylist - source: pt - isMandatory: false - searchClause: AND pt_addr.locality IN ($localityArray) - query: > - -- Use CTE to force query plan, compute & use CTE later - - WITH receipt_breakup AS ( - SELECT - receiptheader, - SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, - SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, - SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, - SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, - SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as propertytax, - (SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN adjustedamount ELSE 0 END) )as exemption, - ( SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END)) as adjustment - FROM egcl_receiptdetails_v1 as rd - INNER JOIN egcl_receiptheader_v1 as rh on rh.id = rd.receiptheader - WHERE rd.tenantid = $tenantid and rh.status != 'Cancelled' and businessdetails='PT' - GROUP BY rd.receiptheader - ) - - SELECT - rh.tenantid AS tenantid, - rh.id, - Substring(rh.consumercode, '(.*):') AS propertyid, - Substring(rh.consumercode, ':(.*)') AS assessmentnumber, - rh.consumercode, - to_char((To_timestamp(rh.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS receiptdate, - bankid AS bankname, - receiptnumber, - amount, - instrumenttype, - transactionnumber, - to_char((To_timestamp(transactiondate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, - receipt_breakup.*, - rh.totalamount - ih.amount AS pendingamount, - pt_detail.financialyear, - to_char((To_timestamp(rh.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, - Initcap(COALESCE(pt_detail.usagecategoryminor, pt_detail.usagecategorymajor)) as usagetype, - manualreceiptnumber as g8receiptno, - (case when eg_user.name is null then '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' else eg_user.name end) as collectorname, - pt_detail.additionaldetails->>'remarks' as "remarks" - FROM egcl_receiptheader_v1 AS rh - - JOIN egcl_receiptinstrument_v1 AS ri ON rh.id = ri.receiptheader - - JOIN egcl_instrumentheader_v1 AS ih ON ih.id = ri.instrumentheader - - JOIN receipt_breakup ON rh.id = receipt_breakup.receiptheader - - JOIN eg_pt_propertydetail_v2 pt_detail ON (pt_detail.property || ':' || pt_detail.assessmentnumber) = rh.consumercode - - JOIN eg_pt_address_v2 pt_addr ON pt_detail.property = pt_addr.property - - LEFT OUTER JOIN eg_user ON eg_user.id = rh.createdby::INTEGER - - WHERE rh.tenantid = $tenantid and rh.status != 'Cancelled' and businessdetails='PT' - orderby: ORDER BY rh.receiptdate DESC - - reportName: CancelledReceiptRegister - summary: Receipt Register for cancelled Receipts - version: 1.0.0 - moduleName: rainmaker-pt - additionalConfig: - print: - pdfPageSize: A1 - sourceColumns: - - name: receiptnumber - label: reports.pt.receiptNo - type: string - source: pt - total: false - - name: status - label: reports.pt.status - type: string - source: pt - total: false - - name: transactiondate - label: reports.pt.receiptDate - type: string - source: pt - total: false - - name: g8issuedate - label: reports.pt.g8issuedate - type: string - source: pt - total: false - - name: g8receiptno - label: reports.pt.g8receiptno - type: string - source: pt - total: false - - name: amount - label: reports.pt.amount - type: string - source: pt - total: true - - name: propertytax - label: reports.pt.propertyTax - type: string - source: pt - total: true - - name: firecess - label: reports.pt.fireCess - type: string - source: pt - total: true - - name: cancercess - label: reports.pt.cancerCess - type: string - source: pt - total: true - - name: rebate - label: reports.pt.rebate - type: string - source: pt - total: true - - name: adhocrebate - label: reports.pt.adhocrebate - type: string - source: pt - total: true - - name: penalty - label: reports.pt.penalty - type: string - source: pt - total: true - - name: adhocpenalty - label: reports.pt.adhocpenalty - type: string - source: pt - total: true - - name: interest - label: reports.pt.interest - type: string - source: pt - total: true - - name: exemption - label: reports.pt.exemption - type: string - source: pt - total: true - - name: adjustment - label: reports.pt.roundoff - type: string - source: pt - total: true - - name: propertyid - label: reports.pt.propertyId - type: string - source: pt - total: false - - name: usagetype - label: reports.pt.usagetype - type: string - source: pt - total: false - - name: assessmentnumber - label: reports.pt.assessmentNo - type: string - source: pt - total: false - - name: financialyear - label: reports.pt.financialYear - type: string - source: pt - total: false - - name: instrumenttype - label: reports.pt.paymentMode - type: string - source: pt - total: false - - name: transactionnumber - label: reports.pt.ddChequeTransactionNo - type: string - source: pt - total: false - - name: bankname - label: reports.pt.bankName - type: string - source: pt - total: false - searchParams: - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: false - searchClause: AND rh.receiptdate >= $fromDate - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: false - searchClause: AND rh.receiptdate <= $toDate - - name: paymentMode - label: Payment Mode - type: singlevaluelist - pattern: list://Cash:Cash,Online:Online,Card:Card,DD:DD,Cheque:Cheque - source: pt - isMandatory: false - searchClause: AND instrumenttype = $paymentMode - - name: financialyear - label: Financial Year - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name - source: pt - wrapper: true - isMandatory: false - searchClause: AND financialyear = $financialyear - - name: localityArray - label: reports.pt.zoneList - type: boundarylist - source: pt - isMandatory: false - searchClause: AND pt_addr.locality IN ($localityArray) - query: > - -- Use CTE to force query plan, compute & use CTE later - - WITH receipt_breakup AS ( - SELECT - receiptheader, - SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, - SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, - SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, - SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, - SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as propertytax, - (SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN adjustedamount ELSE 0 END) )as exemption, - ( SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END)) as adjustment - FROM egcl_receiptdetails_v1 as rd - INNER JOIN egcl_receiptheader_v1 as rh on rh.id = rd.receiptheader - WHERE rd.tenantid = $tenantid and rh.status = 'Cancelled' and businessdetails='PT' - GROUP BY rd.receiptheader - ) - - SELECT - rh.tenantid AS tenantid, - rh.id, - Substring(rh.consumercode, '(.*):') AS propertyid, - Substring(rh.consumercode, ':(.*)') AS assessmentnumber, - rh.status, - rh.consumercode, - rh.receiptdate, - to_char((To_timestamp(rh.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, - bankid AS bankname, - receiptnumber, - amount, - instrumenttype, - transactionnumber, - receipt_breakup.*, - rh.totalamount - ih.amount AS pendingamount, - pt_detail.financialyear, - to_char((To_timestamp(rh.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, - Initcap(COALESCE(pt_detail.usagecategoryminor, pt_detail.usagecategorymajor)) as usagetype, - manualreceiptnumber as g8receiptno - FROM egcl_receiptheader_v1 AS rh - - JOIN egcl_receiptinstrument_v1 AS ri ON rh.id = ri.receiptheader - - JOIN egcl_instrumentheader_v1 AS ih ON ih.id = ri.instrumentheader - - JOIN receipt_breakup ON rh.id = receipt_breakup.receiptheader - - JOIN eg_pt_propertydetail_v2 pt_detail ON (pt_detail.property || ':' || pt_detail.assessmentnumber) = rh.consumercode - - JOIN eg_pt_address_v2 pt_addr ON pt_detail.property = pt_addr.property - - WHERE rh.tenantid = $tenantid and rh.status = 'Cancelled' and businessdetails='PT' - orderby: ORDER BY rh.receiptdate DESC - - reportName: OldUlbWisePtCollection - summary: ULB-wise PT Collection - version: 1.0.0 - moduleName: rainmaker-pt - sourceColumns: - - name: totalassessments - label: reports.pt.totalassessments - type: string - source: pt - total: true - - name: totalamountpaid - label: reports.pt.totalamountpaid - type: string - source: pt - total: true - - name: totalamountdue - label: reports.pt.totalamountdue - type: string - source: pt - total: true - searchParams: - - name: financialyear - label: Financial Year - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name - source: pt - wrapper: true - isMandatory: false - searchClause: AND financialyear = $financialyear - - name: usage - label: Usage - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=PropertyTax&masterName=UsageCategoryMajor|$..code|$..name - source: pt - wrapper: true - isMandatory: false - searchClause: AND usagecategorymajor = $usage - query: > - SELECT - tenantid, - COUNT(*) AS totalassessments, - SUM(totalamount) AS totalamount, - SUM(amount) AS totalamountpaid, - (SUM(totalamount) - SUM(amount)) AS totalamountdue - FROM eg_pt_propertydetail_v2 AS pd - - LEFT OUTER JOIN - (SELECT consumercode, totalamount, amount FROM egcl_receiptheader_v1 AS rh - LEFT OUTER JOIN egcl_receiptinstrument_v1 AS ri ON rh.id = ri.receiptheader - LEFT OUTER JOIN egcl_instrumentheader_v1 AS ih ON ri.instrumentheader = ih.id - and ih.instrumentstatus != 'CANCELLED' - where rh.status != 'Cancelled' - ) AS instrument_data ON (pd.property || ':' || pd.assessmentnumber) = instrument_data.consumercode - WHERE tenantid = $tenantid - groupby: GROUP BY tenantid - orderby: ORDER BY tenantid, totalamountpaid DESC NULLS LAST - - reportName: StateCancelledReceiptRegister - summary: Receipt Register for cancelled Receipts State - version: 1.0.0 - moduleName: rainmaker-pt - additionalConfig: - print: - pdfPageSize: A1 - sourceColumns: - - name: tenantid - label: reports.pt.ulbName - type: string - source: pt - total: false - - name: receiptnumber - label: reports.pt.receiptNo - type: string - source: pt - total: false - - name: status - label: reports.pt.status - type: string - source: pt - total: false - - name: transactiondate - label: reports.pt.receiptDate - type: string - source: pt - total: false - - name: g8issuedate - label: reports.pt.g8issuedate - type: string - source: pt - total: false - - name: g8receiptno - label: reports.pt.g8receiptno - type: string - source: pt - total: false - - name: amount - label: reports.pt.amount - type: string - source: pt - total: true - - name: propertytax - label: reports.pt.propertyTax - type: string - source: pt - total: true - - name: firecess - label: reports.pt.fireCess - type: string - source: pt - total: true - - name: cancercess - label: reports.pt.cancerCess - type: string - source: pt - total: true - - name: rebate - label: reports.pt.rebate - type: string - source: pt - total: true - - name: adhocrebate - label: reports.pt.adhocrebate - type: string - source: pt - total: true - - name: penalty - label: reports.pt.penalty - type: string - source: pt - total: true - - name: adhocpenalty - label: reports.pt.adhocpenalty - type: string - source: pt - total: true - - name: interest - label: reports.pt.interest - type: string - source: pt - total: true - - name: exemption - label: reports.pt.exemption - type: string - source: pt - total: true - - name: adjustment - label: reports.pt.roundoff - type: string - source: pt - total: true - - name: propertyid - label: reports.pt.propertyId - type: string - source: pt - total: false - - name: usagetype - label: reports.pt.usagetype - type: string - source: pt - total: false - - name: assessmentnumber - label: reports.pt.assessmentNo - type: string - source: pt - total: false - - name: financialyear - label: reports.pt.financialYear - type: string - source: pt - total: false - - name: instrumenttype - label: reports.pt.paymentMode - type: string - source: pt - total: false - - name: transactionnumber - label: reports.pt.ddChequeTransactionNo - type: string - source: pt - total: false - - name: bankname - label: reports.pt.bankName - type: string - source: pt - total: false - searchParams: - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: false - searchClause: AND rh.receiptdate >= $fromDate - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: false - searchClause: AND rh.receiptdate <= $toDate - - name: paymentMode - label: Payment Mode - type: singlevaluelist - pattern: list://Cash:Cash,Online:Online,Card:Card,DD:DD,Cheque:Cheque - source: pt - isMandatory: false - searchClause: AND instrumenttype = $paymentMode - - name: financialyear - label: Financial Year - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name - source: pt - wrapper: true - isMandatory: false - searchClause: AND financialyear = $financialyear - query: > - -- Use CTE to force query plan, compute & use CTE later - - WITH receipt_breakup AS ( - SELECT - receiptheader, - SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, - SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, - SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, - SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, - SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as propertytax, - (SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN adjustedamount ELSE 0 END) )as exemption, - ( SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END)) as adjustment - FROM egcl_receiptdetails_v1 as rd - INNER JOIN egcl_receiptheader_v1 as rh on rh.id = rd.receiptheader - WHERE rd.tenantid !='pb.testing' and rh.status = 'Cancelled' and businessdetails='PT' - GROUP BY rd.receiptheader - ) - - SELECT - rh.tenantid AS tenantid, - rh.id, - Substring(rh.consumercode, '(.*):') AS propertyid, - Substring(rh.consumercode, ':(.*)') AS assessmentnumber, - rh.status, - rh.consumercode, - rh.receiptdate, - to_char((To_timestamp(rh.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, - bankid AS bankname, - receiptnumber, - amount, - instrumenttype, - transactionnumber, - receipt_breakup.*, - rh.totalamount - ih.amount AS pendingamount, - pt_detail.financialyear, - to_char((To_timestamp(rh.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, - Initcap(COALESCE(pt_detail.usagecategoryminor, pt_detail.usagecategorymajor)) as usagetype, - manualreceiptnumber as g8receiptno - FROM egcl_receiptheader_v1 AS rh - - JOIN egcl_receiptinstrument_v1 AS ri ON rh.id = ri.receiptheader - - JOIN egcl_instrumentheader_v1 AS ih ON ih.id = ri.instrumentheader - - JOIN receipt_breakup ON rh.id = receipt_breakup.receiptheader - - JOIN eg_pt_propertydetail_v2 pt_detail ON (pt_detail.property || ':' || pt_detail.assessmentnumber) = rh.consumercode - - JOIN eg_pt_address_v2 pt_addr ON pt_detail.property = pt_addr.property - - WHERE rh.tenantid != 'pb.testing' and rh.status = 'Cancelled' and businessdetails='PT' - orderby: ORDER BY rh.receiptdate DESC - - reportName: StateWidePtCollection - summary: State Wide PT Collection - version: 1.0.0 - moduleName: rainmaker-pt - sourceColumns: - - name: tenantid - label: reports.pt.ulbName - type: string - source: pt - total: false - - name: totalassessments - label: reports.pt.totalassessments - type: string - source: pt - total: true - - name: totalamountpaid - label: reports.pt.totalamountpaid - type: string - source: pt - total: true - - name: totaloffline - label: reports.pt.totaloffline - type: string - source: pt - total: true - - name: totalonline - label: reports.pt.totalonline - type: string - source: pt - total: true - - name: totalamountdue - label: reports.pt.totalamountdue - type: string - source: pt - total: true - searchParams: - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: false - searchClause: AND receiptdate >= $fromDate - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: false - searchClause: AND receiptdate <= $toDate - - name: ulb - label: ULB - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name - source: pt - wrapper: true - isMandatory: false - searchClause: AND tenantid = $ulb - - name: financialyear - label: Financial Year - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name - source: pt - wrapper: true - isMandatory: false - searchClause: AND financialyear = $financialyear - - name: usage - label: Usage - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=PropertyTax&masterName=UsageCategoryMajor|$..code|$..name - source: pt - wrapper: true - isMandatory: false - searchClause: AND usagecategorymajor = $usage - query: > - SELECT - - initcap(split_part(tenantid, '.', 2)) as tenantid, - - COUNT(*) AS totalassessments, - - SUM(totalamount) AS totalamount, - - SUM(amount) AS totalamountpaid, - - SUM(CASE WHEN collectiontype LIKE 'ONLINE' THEN amount ELSE 0 END) AS totalonline, - - SUM(CASE WHEN collectiontype LIKE 'COUNTER' THEN amount ELSE 0 END) AS totaloffline, - - (SUM(totalamount) - SUM(amount)) AS totalamountdue - - FROM eg_pt_propertydetail_v2 AS pd - - LEFT OUTER JOIN (SELECT consumercode, totalamount, amount, collectiontype, receiptdate FROM egcl_receiptheader_v1 AS rh - - LEFT OUTER JOIN egcl_receiptinstrument_v1 AS ri ON rh.id = ri.receiptheader - - LEFT OUTER JOIN egcl_instrumentheader_v1 AS ih ON ri.instrumentheader = ih.id and ih.instrumentstatus != 'CANCELLED' - - where rh.status != 'Cancelled' and rh.tenantid != 'pb.testing' and businessdetails='PT' - - ) AS tbl_amounts ON (pd.property || ':' || pd.assessmentnumber) = tbl_amounts.consumercode - - WHERE tenantid not in ('pb.testing','pb.ludhiana_legacy') - groupby: GROUP BY tenantid - orderby: ORDER BY tenantid, totalamountpaid DESC NULLS LAST - - reportName: UlbWisePtCollection - summary: State Wide PT Collection - version: 1.0.0 - moduleName: rainmaker-pt - sourceColumns: - - name: totalassessments - label: reports.pt.totalassessments - type: string - source: pt - total: true - - name: totalamountpaid - label: reports.pt.totalamountpaid - type: string - source: pt - total: true - - name: totaloffline - label: reports.pt.totaloffline - type: string - source: pt - total: true - - name: countoffline - label: reports.pt.countoffline - type: string - source: pt - total: true - - name: totalonline - label: reports.pt.totalonline - type: string - source: pt - total: true - - name: countonline - label: reports.pt.countonline - type: string - source: pt - total: true - - name: totalamountdue - label: reports.pt.totalamountdue - type: string - source: pt - total: true - searchParams: - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: false - searchClause: AND receiptdate >= $fromDate - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: false - searchClause: AND receiptdate <= $toDate - - name: financialyear - label: Financial Year - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name - source: pt - wrapper: true - isMandatory: false - searchClause: AND financialyear = $financialyear - - name: usage - label: Usage - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=PropertyTax&masterName=UsageCategoryMajor|$..code|$..name - source: pt - wrapper: true - isMandatory: false - searchClause: AND usagecategorymajor = $usage - query: > - SELECT - - initcap(split_part(tenantid, '.', 2)) as tenantid, - - COUNT(collectiontype) AS totalassessments, - - SUM(totalamount) AS totalamount, - - SUM(amount) AS totalamountpaid, - - SUM(CASE WHEN collectiontype LIKE 'ONLINE' THEN amount ELSE 0 END) AS totalonline, - - SUM(CASE WHEN collectiontype LIKE 'ONLINE' THEN 1 ELSE 0 END) AS countonline, - - SUM(CASE WHEN collectiontype LIKE 'COUNTER' THEN amount ELSE 0 END) AS totaloffline, - - SUM(CASE WHEN collectiontype LIKE 'COUNTER' THEN 1 ELSE 0 END) AS countoffline, - - (SUM(totalamount) - SUM(amount)) AS totalamountdue - - FROM eg_pt_propertydetail_v2 AS pd - - LEFT OUTER JOIN (SELECT consumercode, totalamount, amount, collectiontype, receiptdate FROM egcl_receiptheader_v1 AS rh - - LEFT OUTER JOIN egcl_receiptinstrument_v1 AS ri ON rh.id = ri.receiptheader - - LEFT OUTER JOIN egcl_instrumentheader_v1 AS ih ON ri.instrumentheader = ih.id and ih.instrumentstatus != 'CANCELLED' - - where rh.status != 'Cancelled' - - ) AS tbl_amounts ON (pd.property || ':' || pd.assessmentnumber) = tbl_amounts.consumercode - - WHERE tenantid LIKE CONCAT(SPLIT_PART($tenantid, '.', 1), '%') and tenantid = $tenantid - groupby: GROUP BY tenantid - orderby: ORDER BY tenantid, totalamountpaid DESC NULLS LAST - - reportName: ULBPTDataDumpReportOld - summary: ULB level report - version: 1.0.0 - moduleName: rainmaker-pt - sourceColumns: - - name: ulb - label: reports.pt.ulb - type: string - source: pt - total: false - - name: propertytaxuniqueid - label: reports.pt.propertytaxuniqueid - type: string - source: pt - total: false - - name: transcationdate - label: reports.pt.transcationdate - type: string - source: pt - total: false - - name: receiptnumber - label: reports.pt.receiptnumber - type: string - source: pt - total: false - - name: existingpropertyid - label: reports.pt.existingpropertyid - type: string - source: pt - total: false - - name: financialyear - label: reports.pt.financialYear - type: string - source: pt - total: false - - name: ownername - label: reports.pt.ownername - type: string - source: pt - total: false - - name: guardianname - label: reports.pt.guardianname - type: string - source: pt - total: false - - name: totalarea - label: reports.pt.totalarea - type: string - source: pt - total: false - - name: builtarea - label: reports.pt.builtarea - type: string - source: pt - total: false - - name: floors - label: reports.pt.floors - type: string - source: pt - total: false - - name: occupancy - label: reports.pt.occupancy - type: string - source: pt - total: false - - name: propertytype - label: reports.pt.propertytype - type: string - source: pt - total: false - - name: mobileno - label: reports.pt.mobileno - type: string - source: pt - total: false - - name: transcationmode - label: reports.pt.transcationmode - type: string - source: pt - total: false - - name: paymentamount - label: reports.pt.paymentamount - type: string - source: pt - total: true - - name: paymentdate - label: reports.pt.paymentdate - type: string - source: pt - total: false - - name: emailid - label: reports.pt.emailid - type: string - source: pt - total: false - - name: address - label: reports.pt.address - type: string - source: pt - total: false - - name: remarks - label: reports.pt.remarks - type: string - source: pt - total: false - - name: businessname - label: reports.pt.businessname - type: string - source: pt - total: false - searchParams: - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: true - searchClause: AND rh.receiptdate >= $fromDate - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: true - searchClause: AND rh.receiptdate <= $toDate - query: > - --S.no Service Name ULB Property Tax Unique ID Date Of - Transcation Receipt Number Existing Property ID Owner - Name Guardian Name Total Area (SQ.YARD) Covered Area/Built Area - (SQ.FEET) Floors Occupancy (Rented,Self /Unoccupied) Type Of - Property Mobile Number Transcation Mode of Payment Payment - Amount Payment Date Email Id Address - - with eg_pt_unit_v2_ot as ( - select - propertydetail, - string_agg(distinct pu.occupancytype, ',') as occupancytype, - string_agg(distinct coalesce(usagecategoryminor, usagecategorymajor), ',') as propertytype - from eg_pt_unit_v2 as pu - where pu.tenantid = $tenantid - group by propertydetail - ) - - select - distinct on (rh.receiptnumber) - initcap(split_part(rh.tenantid, '.', 2)) as "ulb", - split_part(consumercode, ':', 1) as "propertytaxuniqueid", - to_char((To_timestamp(receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS "transcationdate", - receiptnumber as "receiptnumber", - pt.oldpropertyid as "existingpropertyid", - pd.financialyear as "financialyear", - eu."name" as "ownername", - eu.guardian as "guardianname", - pd.landarea as "totalarea", - pd.builduparea * 9 as "builtarea", - pd.nooffloors as "floors", - pot.occupancytype as "occupancy", - pot.propertytype as "propertytype", - eu.mobilenumber as "mobileno", - instrumenttype as "transcationmode", - ih.amount as "paymentamount", - to_char((To_timestamp(ih.transactiondate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS "paymentdate", - eu.emailid as "emailid" , - REGEXP_REPLACE(REGEXP_REPLACE(CONCAT(pta.doorno, ',', pta.addressline1, ',', pta.addressline2, ',', pta.buildingname, ',', pta.pincode), ',+', ','), '^,|,$', '') as "address", - pd.additionaldetails->>'remarks' as "remarks", - pt.additionaldetails->>'FirmBusinessName' as "businessname" - from egcl_receiptheader_v1 as rh - - inner join egcl_receiptinstrument_v1 as ri on ri.receiptheader = rh.id - - inner join egcl_instrumentheader_v1 as ih on ih.id = ri.instrumentheader - - inner join eg_pt_property_v2 as pt on pt.propertyid = split_part(consumercode, ':', 1) - - inner join eg_pt_propertydetail_v2 as pd on pd.assessmentnumber = split_part(consumercode, ':', 2) - - inner join eg_pt_owner_v2 as po on po.propertydetail = pd.assessmentnumber - - inner join eg_user as eu on eu.uuid = po.userid - - inner join eg_pt_address_v2 as pta on pta.property = pt.propertyid - - left outer join eg_pt_unit_v2_ot as pot on pot.propertydetail = pd.assessmentnumber - - where rh.tenantid = $tenantid and rh.status != 'Cancelled' - - reportName: ReceiptRegisterShort - summary: Receipt Register - version: 1.0.0 - moduleName: rainmaker-pt - additionalConfig: - print: - pdfPageSize: Legal - sourceColumns: - - name: receiptnumber - label: reports.pt.receiptNo - type: string - source: pt - total: false - - name: transactiondate - label: reports.pt.receiptDate - type: string - source: pt - total: false - - name: g8receiptno - label: reports.pt.g8book - type: string - source: pt - total: false - - name: g8issuedate - label: reports.pt.g8dated - type: string - source: pt - total: false - - name: propertyid - label: reports.pt.ptrId - type: string - source: pt - total: false - - name: financialyear - label: reports.pt.financialYear - type: string - source: pt - total: false - - name: instrumenttype - label: reports.pt.paymentMode - type: string - source: pt - total: false - - name: amount - label: reports.pt.taxamount - type: string - source: pt - total: true - - name: transactionnumber - label: reports.pt.ddChequeNo - type: string - source: pt - total: false - - name: bankname - label: reports.pt.bankName - type: string - source: pt - total: false - - name: collectorname - label: reports.pt.collectorname - type: string - source: pt - total: false - - name: remarks - label: reports.pt.remarks - type: string - source: pt - total: false - searchParams: - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: true - searchClause: AND rh.receiptdate >= $fromDate - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: true - searchClause: AND rh.receiptdate <= $toDate - - name: paymentMode - label: Payment Mode - type: singlevaluelist - pattern: list://Cash:Cash,Online:Online,Card:Card,DD:DD,Cheque:Cheque - source: pt - isMandatory: false - searchClause: AND instrumenttype = $paymentMode - - name: financialyear - label: Financial Year - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name - source: pt - wrapper: true - isMandatory: false - searchClause: AND financialyear = $financialyear - - name: localityArray - label: reports.pt.zoneList - type: boundarylist - source: pt - isMandatory: false - searchClause: AND pt_addr.locality IN ($localityArray) - - name: collectorname - label: reports.pt.collectorname - type: singlevaluelist - pattern: http://egov-hrms:8080/egov-hrms/employees/_search?tenantId=$tenantid&roles=PTCEMP|$.Employees[*].user.id|$.Employees[*].user.name - source: pt - wrapper: true - isMandatory: false - searchClause: AND eg_user.id = $collectorname::INTEGER - query: > - -- Use CTE to force query plan, compute & use CTE later - - WITH receipt_breakup AS ( - SELECT - receiptheader, - SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, - SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, - SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, - SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, - SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as propertytax, - (SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN adjustedamount ELSE 0 END) )as exemption, - ( SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END)) as adjustment - FROM egcl_receiptdetails_v1 as rd - INNER JOIN egcl_receiptheader_v1 as rh on rh.id = rd.receiptheader - WHERE rd.tenantid = $tenantid and rh.status != 'Cancelled' and businessdetails ='PT' - GROUP BY rd.receiptheader - ) - - SELECT - rh.tenantid AS tenantid, - rh.id, - Substring(rh.consumercode, '(.*):') AS propertyid, - Substring(rh.consumercode, ':(.*)') AS assessmentnumber, - rh.consumercode, - rh.receiptdate, - to_char((To_timestamp(rh.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, - bankid AS bankname, - receiptnumber, - amount, - instrumenttype, - transactionnumber, - receipt_breakup.*, - rh.totalamount - ih.amount AS pendingamount, - pt_detail.financialyear, - to_char((To_timestamp(rh.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, - Initcap(COALESCE(pt_detail.usagecategoryminor, pt_detail.usagecategorymajor)) as usagetype, - manualreceiptnumber as g8receiptno, - (CASE WHEN collectiontype='COUNTER' THEN eg_user.name ELSE '' END) as collectorname, - pt_detail.additionaldetails->>'remarks' as "remarks" - FROM egcl_receiptheader_v1 AS rh - - JOIN egcl_receiptinstrument_v1 AS ri ON rh.id = ri.receiptheader - - JOIN egcl_instrumentheader_v1 AS ih ON ih.id = ri.instrumentheader - - JOIN receipt_breakup ON rh.id = receipt_breakup.receiptheader - - JOIN eg_pt_propertydetail_v2 pt_detail ON (pt_detail.property || ':' || pt_detail.assessmentnumber) = rh.consumercode - - JOIN eg_pt_address_v2 pt_addr ON pt_detail.property = pt_addr.property - - LEFT OUTER JOIN eg_user ON eg_user.id = rh.createdby::INTEGER - - WHERE rh.tenantid = $tenantid and rh.status != 'Cancelled' and businessdetails ='PT' - orderby: ORDER BY rh.receiptdate DESC - - reportName: ULBPTDataDumpReport - summary: ULB level report - version: 1.0.0 - moduleName: rainmaker-pt - sourceColumns: - - name: ulb - label: reports.pt.ulb - type: string - source: pt - total: false - - name: propertytaxuniqueid - label: reports.pt.propertytaxuniqueid - type: string - source: pt - total: false - - name: transcationdate - label: reports.pt.transcationdate - type: string - source: pt - total: false - - name: receiptnumber - label: reports.pt.receiptnumber - type: string - source: pt - total: false - - name: existingpropertyid - label: reports.pt.existingpropertyid - type: string - source: pt - total: false - - name: financialyear - label: reports.pt.financialYear - type: string - source: pt - total: false - - name: ownername - label: reports.pt.ownername - type: string - source: pt - total: false - - name: guardianname - label: reports.pt.guardianname - type: string - source: pt - total: false - - name: totalarea - label: reports.pt.totalarea - type: string - source: pt - total: false - - name: builtarea - label: reports.pt.builtarea - type: string - source: pt - total: false - - name: floors - label: reports.pt.floors - type: string - source: pt - total: false - - name: occupancy - label: reports.pt.occupancy - type: string - source: pt - total: false - - name: propertytype - label: reports.pt.propertytype - type: string - source: pt - total: false - - name: mobileno - label: reports.pt.mobileno - type: string - source: pt - total: false - - name: transcationmode - label: reports.pt.transcationmode - type: string - source: pt - total: false - - name: paymentamount - label: reports.pt.paymentamount - type: string - source: pt - total: true - - name: paymentdate - label: reports.pt.paymentdate - type: string - source: pt - total: false - - name: emailid - label: reports.pt.emailid - type: string - source: pt - total: false - - name: address - label: reports.pt.address - type: string - source: pt - total: false - - name: payeraddress - label: reports.pt.payeraddress - type: string - source: pt - total: false - - name: remarks - label: reports.pt.remarks - type: string - source: pt - total: false - - name: businessname - label: reports.pt.businessname - type: string - source: pt - total: false - - name: localitycode - label: reports.pt.localitycode - type: string - source: pt - total: false - searchParams: - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: true - searchClause: AND rh.receiptdate >= $fromDate - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: true - searchClause: AND rh.receiptdate <= $toDate - - name: financialyear - label: Financial Year - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name - source: pt - wrapper: true - isMandatory: false - searchClause: AND pd.financialyear = $financialyear - - name: localityArray - label: reports.pt.zoneList - type: boundarylist - source: pt - isMandatory: false - searchClause: AND pta.locality IN ($localityArray) - query: > - --S.no Service Name ULB Property Tax Unique ID Date Of - Transcation Receipt Number Existing Property ID Owner - Name Guardian Name Total Area (SQ.YARD) Covered Area/Built Area - (SQ.FEET) Floors Occupancy (Rented,Self /Unoccupied) Type Of - Property Mobile Number Transcation Mode of Payment Payment - Amount Payment Date Email Id Address - - with eg_pt_unit_v2_ot as ( - select - propertydetail, - string_agg(distinct pu.occupancytype, ',') as occupancytype, - string_agg(distinct coalesce(usagecategoryminor, usagecategorymajor), ',') as propertytype - from eg_pt_unit_v2 as pu - where pu.tenantid = $tenantid - group by propertydetail - ) - - select - distinct on (rh.receiptnumber) - initcap(split_part(rh.tenantid, '.', 2)) as "ulb", - split_part(consumercode, ':', 1) as "propertytaxuniqueid", - to_char((To_timestamp(receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS "transcationdate", - receiptnumber as "receiptnumber", - pt.oldpropertyid as "existingpropertyid", - pd.financialyear as "financialyear", - eu."name" as "ownername", - eu.guardian as "guardianname", - pd.landarea as "totalarea", - pd.builduparea * 9 as "builtarea", - pd.nooffloors as "floors", - pot.occupancytype as "occupancy", - pot.propertytype as "propertytype", - eu.mobilenumber as "mobileno", - instrumenttype as "transcationmode", - ih.amount as "paymentamount", - to_char((To_timestamp(ih.transactiondate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS "paymentdate", - eu.emailid as "emailid", - REGEXP_REPLACE(REGEXP_REPLACE(CONCAT(pta.doorno, ',', pta.addressline1, ',', pta.addressline2, ',', pta.buildingname, ',', pta.pincode), ',+', ','), '^,|,$', '') as "address", - rh.payeraddress as "payeraddress", - pd.additionaldetails->>'remarks' as "remarks", - pt.additionaldetails->>'FirmBusinessName' as "businessname", - pta.locality as "localitycode" - from egcl_receiptheader_v1 as rh - - inner join egcl_receiptinstrument_v1 as ri on ri.receiptheader = rh.id - - inner join egcl_instrumentheader_v1 as ih on ih.id = ri.instrumentheader - - inner join eg_pt_property_v2 as pt on pt.propertyid = split_part(consumercode, ':', 1) - - inner join eg_pt_propertydetail_v2 as pd on pd.assessmentnumber = split_part(consumercode, ':', 2) - - inner join eg_pt_owner_v2 as po on po.propertydetail = pd.assessmentnumber - - inner join eg_user as eu on eu.uuid = po.userid - - inner join eg_pt_address_v2 as pta on pta.property = pt.propertyid - - left outer join eg_pt_unit_v2_ot as pot on pot.propertydetail = pd.assessmentnumber - - where rh.tenantid = $tenantid and rh.status != 'Cancelled' and businessdetails ='PT' - - reportName: Sewa_Kendra_ReceiptRegister - summary: Sewa Kendra Receipt Register - version: 1.0.0 - moduleName: rainmaker-pt - additionalConfig: - print: - pdfPageSize: A1 - sourceColumns: - - name: receiptnumber - label: reports.pt.receiptNo - type: string - source: pt - total: false - - name: receiptdate - label: reports.pt.receiptDate - type: string - source: pt - total: false - - name: g8issuedate - label: reports.pt.g8issuedate - type: string - source: pt - total: false - - name: g8receiptno - label: reports.pt.g8receiptno - type: string - source: pt - total: false - - name: amount - label: reports.pt.amount - type: string - source: pt - total: true - - name: propertytax - label: reports.pt.propertyTax - type: string - source: pt - total: true - - name: firecess - label: reports.pt.fireCess - type: string - source: pt - total: true - - name: cancercess - label: reports.pt.cancerCess - type: string - source: pt - total: true - - name: rebate - label: reports.pt.rebate - type: string - source: pt - total: true - - name: adhocrebate - label: reports.pt.adhocrebate - type: string - source: pt - total: true - - name: penalty - label: reports.pt.penalty - type: string - source: pt - total: true - - name: adhocpenalty - label: reports.pt.adhocpenalty - type: string - source: pt - total: true - - name: interest - label: reports.pt.interest - type: string - source: pt - total: true - - name: exemption - label: reports.pt.exemption - type: string - source: pt - total: true - - name: adjustment - label: reports.pt.roundoff - type: string - source: pt - total: true - - name: pendingamount - label: reports.pt.pendingamount - type: string - source: pt - total: true - - name: propertyid - label: reports.pt.propertyId - type: string - source: pt - total: false - - name: usagetype - label: reports.pt.usagetype - type: string - source: pt - total: false - - name: assessmentnumber - label: reports.pt.assessmentNo - type: string - source: pt - total: false - - name: financialyear - label: reports.pt.financialYear - type: string - source: pt - total: false - - name: instrumenttype - label: reports.pt.paymentMode - type: string - source: pt - total: false - - name: transactionnumber - label: reports.pt.ddChequeTransactionNo - type: string - source: pt - total: false - - name: transactiondate - label: reports.pt.ddChequeTransactionDate - type: string - source: pt - total: false - - name: bankname - label: reports.pt.bankName - type: string - source: pt - total: false - - name: collectorname - label: reports.pt.collectorname - type: string - source: pt - total: false - - name: remarks - label: reports.pt.remarks - type: string - source: pt - total: false - searchParams: - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: true - searchClause: AND rh.receiptdate >= $fromDate - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: true - searchClause: AND rh.receiptdate <= $toDate - - name: paymentMode - label: Payment Mode - type: singlevaluelist - pattern: list://Cash:Cash,Online:Online,Card:Card,DD:DD,Cheque:Cheque - source: pt - isMandatory: false - searchClause: AND instrumenttype = $paymentMode - - name: financialyear - label: Financial Year - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name - source: pt - wrapper: true - isMandatory: false - searchClause: AND financialyear = $financialyear - - name: localityArray - label: reports.pt.zoneList - type: boundarylist - source: pt - isMandatory: false - searchClause: AND pt_addr.locality IN ($localityArray) - query: > - -- Use CTE to force query plan, compute & use CTE later - - WITH receipt_breakup AS ( - SELECT - receiptheader, - SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, - SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, - SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, - SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, - SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as propertytax, - (SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN adjustedamount ELSE 0 END) )as exemption, - ( SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END)) as adjustment - FROM egcl_receiptdetails_v1 as rd - INNER JOIN egcl_receiptheader_v1 as rh on rh.id = rd.receiptheader - WHERE rd.tenantid = $tenantid and rh.status != 'Cancelled' and businessdetails='PT' and rh.createdby::INTEGER in (select user_id from eg_userrole_v1 where role_code ='SEVA_KENDRA_EMP') - GROUP BY rd.receiptheader - ) - - SELECT - rh.tenantid AS tenantid, - rh.id, - Substring(rh.consumercode, '(.*):') AS propertyid, - Substring(rh.consumercode, ':(.*)') AS assessmentnumber, - rh.consumercode, - to_char((To_timestamp(rh.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS receiptdate, - bankid AS bankname, - receiptnumber, - amount, - instrumenttype, - transactionnumber, - to_char((To_timestamp(transactiondate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, - receipt_breakup.*, - rh.totalamount - ih.amount AS pendingamount, - pt_detail.financialyear, - to_char((To_timestamp(rh.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, - Initcap(COALESCE(pt_detail.usagecategoryminor, pt_detail.usagecategorymajor)) as usagetype, - manualreceiptnumber as g8receiptno, - (case when eg_user.name is null then '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' else eg_user.name end) as collectorname, - pt_detail.additionaldetails->>'remarks' as "remarks" - FROM egcl_receiptheader_v1 AS rh - - JOIN egcl_receiptinstrument_v1 AS ri ON rh.id = ri.receiptheader - - JOIN egcl_instrumentheader_v1 AS ih ON ih.id = ri.instrumentheader - - JOIN receipt_breakup ON rh.id = receipt_breakup.receiptheader - - JOIN eg_pt_propertydetail_v2 pt_detail ON (pt_detail.property || ':' || pt_detail.assessmentnumber) = rh.consumercode - - JOIN eg_pt_address_v2 pt_addr ON pt_detail.property = pt_addr.property - - LEFT OUTER JOIN eg_user ON eg_user.id = rh.createdby::INTEGER - - WHERE rh.tenantid = $tenantid and rh.status != 'Cancelled' and businessdetails='PT' and rh.createdby::INTEGER in - - (select user_id from eg_userrole_v1 where role_code ='SEVA_KENDRA_EMP') - orderby: ORDER BY rh.receiptdate DESC - - reportName: ReceiptRegisterSummary - summary: Receipt Register Summary - version: 1.0.0 - moduleName: rainmaker-pt - additionalConfig: - print: - pdfPageSize: A1 - sourceColumns: - - name: ulb - label: reports.pt.ulb - type: string - source: pt - total: false - - name: adhocpenalty - label: reports.pt.adhocpenalty - type: string - source: pt - total: true - - name: adhocrebate - label: reports.pt.adhocrebate - type: string - source: pt - total: true - - name: firecess - label: reports.pt.firecess - type: string - source: pt - total: true - - name: cancercess - label: reports.pt.cancercess - type: string - source: pt - total: true - - name: interest - label: reports.pt.interest - type: string - source: pt - total: true - - name: penalty - label: reports.pt.penalty - type: string - source: pt - total: true - - name: rebate - label: reports.pt.rebate - type: string - source: pt - total: true - - name: propertytax - label: reports.pt.propertytax - type: string - source: pt - total: true - - name: exemption - label: reports.pt.exemption - type: string - source: pt - total: true - - name: adjustment - label: reports.pt.adjustment - type: string - source: pt - total: true - - name: adhocrebate - label: reports.pt.adhocrebate - type: string - source: pt - total: true - - name: noofassessments - label: reports.pt.noofassessments - type: string - source: pt - total: true - - name: collectorname - label: reports.pt.collectorname - type: string - source: pt - total: false - searchParams: - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: true - searchClause: AND rh.receiptdate >= $fromDate - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: true - searchClause: AND rh.receiptdate <= $toDate - - name: collectorname - label: reports.pt.collectorname - type: singlevaluelist - pattern: http://egov-hrms:8080/egov-hrms/employees/_search?tenantId=$tenantid&roles=PTCEMP|$.Employees[*].user.id|$.Employees[*].user.name - source: pt - wrapper: true - isMandatory: false - searchClause: AND eg_user.id = $collectorname::INTEGER - query: > - -- Use CTE to force query plan, compute & use CTE later - - SELECT - split_part(rd.tenantid,'.',2) as ulb, - Count (*)/8 noofassessments, - SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, - SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, - SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, - SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, - SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as propertytax, - (SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN adjustedamount ELSE 0 END) )as exemption, - ( SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END)) as adjustment, - (CASE WHEN collectiontype='COUNTER' THEN eg_user.name ELSE 'Online' END) as collectorname - FROM egcl_receiptdetails_v1 as rd - - INNER JOIN egcl_receiptheader_v1 as rh on rh.id = rd.receiptheader - - LEFT OUTER JOIN eg_user ON eg_user.id = rh.createdby::INTEGER - - WHERE rd.tenantid = $tenantid and rh.status != 'Cancelled' and businessdetails='PT' - groupby: group by rd.tenantid,collectorname - - reportName: StateReceiptRegisterSummary - summary: Receipt Register Summary - version: 1.0.0 - moduleName: rainmaker-pt - additionalConfig: - print: - pdfPageSize: A1 - sourceColumns: - - name: ulb - label: reports.pt.ulb - type: string - source: pt - total: false - - name: adhocpenalty - label: reports.pt.adhocpenalty - type: string - source: pt - total: true - - name: adhocrebate - label: reports.pt.adhocrebate - type: string - source: pt - total: true - - name: firecess - label: reports.pt.firecess - type: string - source: pt - total: true - - name: cancercess - label: reports.pt.cancercess - type: string - source: pt - total: true - - name: interest - label: reports.pt.interest - type: string - source: pt - total: true - - name: penalty - label: reports.pt.penalty - type: string - source: pt - total: true - - name: rebate - label: reports.pt.rebate - type: string - source: pt - total: true - - name: propertytax - label: reports.pt.propertytax - type: string - source: pt - total: true - - name: exemption - label: reports.pt.exemption - type: string - source: pt - total: true - - name: adjustment - label: reports.pt.adjustment - type: string - source: pt - total: true - searchParams: - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: false - searchClause: AND rh.receiptdate >= $fromDate - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: false - searchClause: AND rh.receiptdate <= $toDate - - name: ulb - label: ULB - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name - source: pt - wrapper: true - isMandatory: false - searchClause: AND rd.tenantid = $ulb - query: > - -- Use CTE to force query plan, compute & use CTE later - - SELECT - split_part(rd.tenantid,'.',2) as ulb, - SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, - SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, - SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, - SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, - SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as propertytax, - (SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN adjustedamount ELSE 0 END) )as exemption, - ( SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END)) as adjustment - FROM egcl_receiptdetails_v1 as rd - - INNER JOIN egcl_receiptheader_v1 as rh on rh.id = rd.receiptheader - - WHERE rd.tenantid != 'pb.testing' and rh.status != 'Cancelled' and businessdetails='PT' - groupby: group by rd.tenantid - orderby: order by rd.tenantid - - reportName: FYCollectionsReport - summary: FY Collections - version: 1.0.0 - moduleName: rainmaker-pt - additionalConfig: - print: - pdfPageSize: Legal - sourceColumns: - - name: financialyear - label: reports.pt.financialyear - type: string - source: pt - total: false - - name: residential - label: reports.pt.residential - type: string - source: pt - total: true - - name: nonresidential - label: reports.pt.nonresidential - type: string - source: pt - total: true - - name: mixed - label: reports.pt.mixed - type: string - source: pt - total: true - - name: totalamount - label: reports.pt.totalamount - type: string - source: pt - total: true - - name: online - label: reports.pt.online - type: string - source: pt - total: true - - name: cash - label: reports.pt.cash - type: string - source: pt - total: true - - name: cheque - label: reports.pt.cheque - type: string - source: pt - total: true - - name: dd - label: reports.pt.dd - type: string - source: pt - total: true - searchParams: - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: false - searchClause: AND rh.receiptdate >= $fromDate - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: false - searchClause: AND rh.receiptdate <= $toDate - - name: localityArray - label: reports.pt.zoneList - type: boundarylist - source: pt - isMandatory: false - searchClause: AND pt_addr.locality IN ($localityArray) - query: > - -- Use CTE to force query plan, compute & use CTE later - - SELECT - financialyear, - sum(case when usagecategorymajor='RESIDENTIAL' then amount else 0 end) as "residential", - sum(case when usagecategorymajor='RESIDENTIAL' then 1 else 0 end) as "countresidential", - sum(case when usagecategorymajor='NONRESIDENTIAL' then amount else 0 end) as "nonresidential", - sum(case when usagecategorymajor='NONRESIDENTIAL' then 1 else 0 end) as "countnonresidential", - sum(case when usagecategorymajor='MIXED' then amount else 0 end) as "mixed", - sum(case when usagecategorymajor='MIXED' then 1 else 0 end) as "countmixed", - sum(amount) as totalamount, - count(amount) as totalcount, - sum(case when instrumenttype='Online' then amount else 0 end) as "online", - sum(case when instrumenttype='Cash' then amount else 0 end) as "cash", - sum(case when instrumenttype='Cheque' then amount else 0 end) as "cheque", - sum(case when instrumenttype='DD' then amount else 0 end) as "dd" - FROM egcl_receiptheader_v1 AS rh - - JOIN egcl_receiptinstrument_v1 AS ri ON rh.id = ri.receiptheader - - JOIN egcl_instrumentheader_v1 AS ih ON ih.id = ri.instrumentheader - - JOIN eg_pt_propertydetail_v2 pt_detail ON (pt_detail.property || ':' || pt_detail.assessmentnumber) = rh.consumercode - - JOIN eg_pt_address_v2 pt_addr ON pt_detail.property = pt_addr.property - - LEFT OUTER JOIN eg_user ON eg_user.id = rh.createdby::INTEGER - - WHERE rh.tenantid = $tenantid and rh.status != 'Cancelled' - groupby: GROUP BY financialyear - orderby: ORDER BY financialyear - - reportName: ULBDEFAULTERPTREPORT - summary: ULB Defaulter Pt report - version: 1.0.0 - moduleName: rainmaker-pt - sourceColumns: - - name: ulb - label: reports.pt.ulb - type: string - source: pt - total: false - - name: propertytaxuniqueid - label: reports.pt.propertytaxuniqueid - type: string - source: pt - total: false - - name: transcationdate - label: reports.pt.transcationdate - type: string - source: pt - total: false - - name: receiptnumber - label: reports.pt.receiptnumber - type: string - source: pt - total: false - - name: existingpropertyid - label: reports.pt.existingpropertyid - type: string - source: pt - total: false - - name: financialyear - label: reports.pt.financialYear - type: string - source: pt - total: false - - name: ownername - label: reports.pt.ownername - type: string - source: pt - total: false - - name: guardianname - label: reports.pt.guardianname - type: string - source: pt - total: false - - name: propertytype - label: reports.pt.propertytype - type: string - source: pt - total: false - - name: mobileno - label: reports.pt.mobileno - type: string - source: pt - total: false - - name: address - label: reports.pt.address - type: string - source: pt - total: false - - name: payeraddress - label: reports.pt.payeraddress - type: string - source: pt - total: false - searchParams: - - name: localityArray - label: reports.pt.zoneList - type: boundarylist - source: pt - isMandatory: true - searchClause: AND pta.locality IN ($localityArray) - query: > - --S.no Service Name ULB Property Tax Unique ID Date Of - Transcation Receipt Number Existing Property ID Type Of - Property Mobile Number Address - with eg_pt_unit_v2_ot as ( - select - propertydetail, - string_agg(distinct pu.occupancytype, ',') as occupancytype, - string_agg(distinct coalesce(usagecategoryminor, usagecategorymajor), ',') as propertytype - from eg_pt_unit_v2 as pu - where pu.tenantid =$tenantid - group by propertydetail - ) - - select - distinct on (rh.receiptnumber) - initcap(split_part(rh.tenantid, '.', 2)) as "ulb", - split_part(consumercode, ':', 1) as "propertytaxuniqueid", - to_char((To_timestamp(receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS "transcationdate", - receiptnumber as "receiptnumber", - pt.oldpropertyid as "existingpropertyid", - pd.financialyear as "financialyear", - eu."name" as "ownername", - eu.guardian as "guardianname", - pot.propertytype as "propertytype", - eu.mobilenumber as "mobileno", - REGEXP_REPLACE(REGEXP_REPLACE(CONCAT(pta.doorno, ',', pta.addressline1, ',', pta.addressline2, ',', pta.buildingname, ',', pta.pincode), ',+', ','), '^,|,$', '') as "address" - from egcl_receiptheader_v1 as rh - - inner join egcl_receiptinstrument_v1 as ri on ri.receiptheader = rh.id - - inner join egcl_instrumentheader_v1 as ih on ih.id = ri.instrumentheader - - inner join eg_pt_property_v2 as pt on pt.propertyid = split_part(consumercode, ':', 1) - - inner join eg_pt_propertydetail_v2 as pd on pd.assessmentnumber = split_part(consumercode, ':', 2) - - inner join eg_pt_owner_v2 as po on po.propertydetail = pd.assessmentnumber - - inner join eg_user as eu on eu.uuid = po.userid - - inner join eg_pt_address_v2 as pta on pta.property = pt.propertyid - - left outer join eg_pt_unit_v2_ot as pot on pot.propertydetail = pd.assessmentnumber - - where rh.tenantid =$tenantid and pd.property not in (select property from eg_pt_propertydetail_v2 where financialyear in ('2019-20')) - - reportName: ReceiptRegister_V2 - decryptionPathId: ReceiptRegister_V2 - summary: Receipt Register - version: 1.0.0 - moduleName: rainmaker-pt - additionalConfig: - print: - pdfPageSize: A1 - sourceColumns: - - name: receiptnumber - label: reports.pt.receiptNo - type: string - source: pt - total: false - - name: receiptdate - label: reports.pt.receiptDate - type: string - source: pt - total: false - - name: g8issuedate - label: reports.pt.g8issuedate - type: string - source: pt - total: false - - name: g8receiptno - label: reports.pt.g8receiptno - type: string - source: pt - total: false - - name: amount - label: reports.pt.amount - type: string - source: pt - total: true - - name: propertytax - label: reports.pt.propertyTax - type: string - source: pt - total: true - - name: firecess - label: reports.pt.fireCess - type: string - source: pt - total: true - - name: cancercess - label: reports.pt.cancerCess - type: string - source: pt - total: true - - name: rebate - label: reports.pt.rebate - type: string - source: pt - total: true - - name: adhocrebate - label: reports.pt.adhocrebate - type: string - source: pt - total: true - - name: penalty - label: reports.pt.penalty - type: string - source: pt - total: true - - name: adhocpenalty - label: reports.pt.adhocpenalty - type: string - source: pt - total: true - - name: interest - label: reports.pt.interest - type: string - source: pt - total: true - - name: exemption - label: reports.pt.exemption - type: string - source: pt - total: true - - name: adjustment - label: reports.pt.roundoff - type: string - source: pt - total: true - - name: pendingamount - label: reports.pt.pendingamount - type: string - source: pt - total: true - - name: consumercode - label: reports.pt.propertyId - type: string - source: pt - total: false - - name: usagetype - label: reports.pt.usagetype - type: string - source: pt - total: false - - name: instrumenttype - label: reports.pt.paymentMode - type: string - source: pt - total: false - - name: transactionnumber - label: reports.pt.ddChequeTransactionNo - type: string - source: pt - total: false - - name: transactiondate - label: reports.pt.ddChequeTransactionDate - type: string - source: pt - total: false - - name: bankname - label: reports.pt.bankName - type: string - source: pt - total: false - - name: collectorname - label: reports.pt.collectorname - type: string - source: pt - total: false - - name: financialyear - label: reports.pt.financialyear - type: string - source: pt - total: false - searchParams: - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: true - searchClause: AND pd.receiptdate >= $fromDate - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: true - searchClause: AND pd.receiptdate <= $toDate - - name: financialyear - label: Financial Year - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name - source: pt - wrapper: true - isMandatory: false - searchClause: AND concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) - at time Zone 'Asia/Kolkata'),'YYYY'),'-', - to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone - 'Asia/Kolkata'),'YY')) = $financialyear - - name: paymentMode - label: Payment Mode - type: singlevaluelist - pattern: list://CARD:Card,CASH:Cash,CHEQUE:Cheque,DD:DD,OFFLINE_NEFT:NEFT,OFFLINE_RTGS:RTGS,ONLINE:Online,POSTAL_ORDER:PostalOrder - source: pt - isMandatory: false - searchClause: AND payment.paymentmode = $paymentMode - - name: localityArray - label: reports.pt.zoneList - type: boundarylist - source: pt - isMandatory: false - searchClause: AND pt_addr.locality IN ($localityArray) - query: > - -- Use CTE to force query plan, compute & use CTE later - - WITH receipt_breakup AS ( - SELECT - pd.id as pdid, - SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, - SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, - SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, - SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, - SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN bad.amount ELSE 0 END) as propertytax, - SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as paidpropertytax, - (SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN bad.amount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN bad.amount ELSE 0 END) ) as exemption, - (SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END)) as adjustment - FROM egcl_billaccountdetail as bad - INNER JOIN egcl_billdetial as bd on bd.id = bad.billdetailid - INNER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid - INNER JOIN egcl_payment as payment on pd.paymentid=payment.id - WHERE payment.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' - GROUP BY pdid - ) - - SELECT - pd.tenantid AS tenantid, - pd.id, - pt.propertyid as consumercode, - to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS receiptdate, - payment.ifsccode AS bankname, - receiptnumber, - payment.totalamountpaid as amount, - payment.paymentmode as instrumenttype, - payment.transactionnumber, - getfinancialyear(pd.billid) as financialyear, - to_char((To_timestamp(payment.transactiondate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, - payment.totaldue - payment.totalamountpaid AS pendingamount, - Initcap(case when pt.usagecategory like '%.%' then split_part(pt.usagecategory,'.',2) else pt.usagecategory end) as usagetype, - (case when eg_user.name is null then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else eg_user.name end) as collectorname, - receipt_breakup.*, - to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, - manualreceiptnumber as g8receiptno - FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, - - (select * from (select *,(row_number() over(partition by propertyid order by lastmodifiedtime desc)) as rw from eg_pt_property where tenantid=$tenantid) pts where rw=1) as pt, - - receipt_breakup, egcl_bill bill, - - (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr - - where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid - - and pt.propertyid = bill.consumercode and receipt_breakup.pdid=pd.id --and pt.status!='INACTIVE' - - and pt_addr.propertyid=pt.id - - --and pt.propertyid='PT-1012-978737' - - --and receiptnumber='PT/1012/2020-21/001021' - orderby: ORDER BY pd.receiptdate DESC; - - reportName: ReceiptRegister_without_locality_V2 - decryptionPathId: ReceiptRegister_V2 - summary: Receipt Register - version: 1.0.0 - moduleName: rainmaker-pt - additionalConfig: - print: - pdfPageSize: A1 - sourceColumns: - - name: receiptnumber - label: reports.pt.receiptNo - type: string - source: pt - total: false - - name: receiptdate - label: reports.pt.receiptDate - type: string - source: pt - total: false - - name: g8issuedate - label: reports.pt.g8issuedate - type: string - source: pt - total: false - - name: g8receiptno - label: reports.pt.g8receiptno - type: string - source: pt - total: false - - name: amount - label: reports.pt.amount - type: string - source: pt - total: true - - name: propertytax - label: reports.pt.propertyTax - type: string - source: pt - total: true - - name: firecess - label: reports.pt.fireCess - type: string - source: pt - total: true - - name: cancercess - label: reports.pt.cancerCess - type: string - source: pt - total: true - - name: rebate - label: reports.pt.rebate - type: string - source: pt - total: true - - name: adhocrebate - label: reports.pt.adhocrebate - type: string - source: pt - total: true - - name: penalty - label: reports.pt.penalty - type: string - source: pt - total: true - - name: adhocpenalty - label: reports.pt.adhocpenalty - type: string - source: pt - total: true - - name: interest - label: reports.pt.interest - type: string - source: pt - total: true - - name: exemption - label: reports.pt.exemption - type: string - source: pt - total: true - - name: adjustment - label: reports.pt.roundoff - type: string - source: pt - total: true - - name: pendingamount - label: reports.pt.pendingamount - type: string - source: pt - total: true - - name: consumercode - label: reports.pt.propertyId - type: string - source: pt - total: false - - name: usagetype - label: reports.pt.usagetype - type: string - source: pt - total: false - - name: instrumenttype - label: reports.pt.paymentMode - type: string - source: pt - total: false - - name: transactionnumber - label: reports.pt.ddChequeTransactionNo - type: string - source: pt - total: false - - name: transactiondate - label: reports.pt.ddChequeTransactionDate - type: string - source: pt - total: false - - name: bankname - label: reports.pt.bankName - type: string - source: pt - total: false - - name: collectorname - label: reports.pt.collectorname - type: string - source: pt - total: false - - name: financialyear - label: reports.pt.financialyear - type: string - source: pt - total: false - searchParams: - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: true - searchClause: AND pd.receiptdate >= $fromDate - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: true - searchClause: AND pd.receiptdate <= $toDate - - name: financialyear - label: Financial Year - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name - source: pt - wrapper: true - isMandatory: false - searchClause: AND concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) - at time Zone 'Asia/Kolkata'),'YYYY'),'-', - to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone - 'Asia/Kolkata'),'YY')) = $financialyear - - name: paymentMode - label: Payment Mode - type: singlevaluelist - pattern: list://CARD:Card,CASH:Cash,CHEQUE:Cheque,DD:DD,OFFLINE_NEFT:NEFT,OFFLINE_RTGS:RTGS,ONLINE:Online,POSTAL_ORDER:PostalOrder - source: pt - isMandatory: false - searchClause: AND payment.paymentmode = $paymentMode - query: > - -- Use CTE to force query plan, compute & use CTE later - - WITH receipt_breakup AS ( - SELECT - pd.id as pdid, - SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, - SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, - SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, - SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, - SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN bad.amount ELSE 0 END) as propertytax, - SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as paidpropertytax, - (SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN bad.amount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN bad.amount ELSE 0 END) ) as exemption, - (SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END)) as adjustment - FROM egcl_billaccountdetail as bad - INNER JOIN egcl_billdetial as bd on bd.id = bad.billdetailid - INNER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid - INNER JOIN egcl_payment as payment on pd.paymentid=payment.id - WHERE payment.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' - AND pd.receiptdate >= $fromDate AND pd.receiptdate <= $toDate - GROUP BY pdid - ) - - SELECT - pd.tenantid AS tenantid, - pd.id, - pt.propertyid as consumercode, - to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS receiptdate, - --payment.ifsccode AS bankname, - concat(bank_branches.bank_name,' ',bank_branches.branch) as bankname, - receiptnumber, - payment.totalamountpaid as amount, - payment.paymentmode as instrumenttype, - payment.transactionnumber, - concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear, - to_char((To_timestamp(payment.instrumentdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, - payment.totaldue - payment.totalamountpaid AS pendingamount, - Initcap(case when pt.usagecategory like '%.%' then split_part(pt.usagecategory,'.',2) else pt.usagecategory end) as usagetype, - (case when eg_user.name is null then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else eg_user.name end) as collectorname, - receipt_breakup.*, - to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, - manualreceiptnumber as g8receiptno - FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment left outer join bank_branches on bank_branches.ifsc=payment.ifsccode, - - (select * from (select *,(row_number() over(partition by propertyid order by lastmodifiedtime desc)) as rw from eg_pt_property where tenantid=$tenantid) pts where rw=1) as pt, - - receipt_breakup, egcl_bill bill - - --,(select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr - - where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid - - and pt.propertyid = bill.consumercode and receipt_breakup.pdid=pd.id --and pt.status!='INACTIVE' - - --and pt_addr.propertyid=pt.id - orderby: ORDER BY pd.receiptdate DESC; - - reportName: CancelledReceiptRegister_V2 - decryptionPathId: CancelledReceiptRegister_V2 - summary: Receipt Register for cancelled Receipts - version: 1.0.0 - moduleName: rainmaker-pt - additionalConfig: - print: - pdfPageSize: A1 - sourceColumns: - - name: receiptnumber - label: reports.pt.receiptNo - type: string - source: pt - total: false - - name: receiptdate - label: reports.pt.receiptDate - type: string - source: pt - total: false - - name: g8issuedate - label: reports.pt.g8issuedate - type: string - source: pt - total: false - - name: g8receiptno - label: reports.pt.g8receiptno - type: string - source: pt - total: false - - name: amount - label: reports.pt.amount - type: string - source: pt - total: true - - name: propertytax - label: reports.pt.propertyTax - type: string - source: pt - total: true - - name: firecess - label: reports.pt.fireCess - type: string - source: pt - total: true - - name: cancercess - label: reports.pt.cancerCess - type: string - source: pt - total: true - - name: rebate - label: reports.pt.rebate - type: string - source: pt - total: true - - name: adhocrebate - label: reports.pt.adhocrebate - type: string - source: pt - total: true - - name: penalty - label: reports.pt.penalty - type: string - source: pt - total: true - - name: adhocpenalty - label: reports.pt.adhocpenalty - type: string - source: pt - total: true - - name: interest - label: reports.pt.interest - type: string - source: pt - total: true - - name: exemption - label: reports.pt.exemption - type: string - source: pt - total: true - - name: adjustment - label: reports.pt.roundoff - type: string - source: pt - total: true - - name: pendingamount - label: reports.pt.pendingamount - type: string - source: pt - total: true - - name: consumercode - label: reports.pt.propertyId - type: string - source: pt - total: false - - name: usagetype - label: reports.pt.usagetype - type: string - source: pt - total: false - - name: instrumenttype - label: reports.pt.paymentMode - type: string - source: pt - total: false - - name: transactionnumber - label: reports.pt.ddChequeTransactionNo - type: string - source: pt - total: false - - name: transactiondate - label: reports.pt.ddChequeTransactionDate - type: string - source: pt - total: false - - name: bankname - label: reports.pt.bankName - type: string - source: pt - total: false - - name: collectorname - label: reports.pt.collectorname - type: string - source: pt - total: false - - name: financialyear - label: reports.pt.financialyear - type: string - source: pt - total: false - - name: paymentstatus - label: reports.pt.paymentstatus - type: string - source: pt - total: false - searchParams: - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: true - searchClause: AND pd.receiptdate >= $fromDate - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: true - searchClause: AND pd.receiptdate <= $toDate - - name: financialyear - label: Financial Year - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name - source: pt - wrapper: true - isMandatory: false - searchClause: AND concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) - at time Zone 'Asia/Kolkata'),'YYYY'),'-', - to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone - 'Asia/Kolkata'),'YY')) = $financialyear - - name: paymentMode - label: Payment Mode - type: singlevaluelist - pattern: list://CARD:Card,CASH:Cash,CHEQUE:Cheque,DD:DD,OFFLINE_NEFT:NEFT,OFFLINE_RTGS:RTGS,ONLINE:Online,POSTAL_ORDER:PostalOrder - source: pt - isMandatory: false - searchClause: AND payment.paymentmode = $paymentMode - query: > - -- Use CTE to force query plan, compute & use CTE later - - WITH receipt_breakup AS ( - SELECT - pd.id as pdid, - SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, - SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, - SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, - SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, - SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN bad.amount ELSE 0 END) as propertytax, - SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as paidpropertytax, - (SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN bad.amount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN bad.amount ELSE 0 END) ) as exemption, - (SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END)) as adjustment - FROM egcl_billaccountdetail as bad - INNER JOIN egcl_billdetial as bd on bd.id = bad.billdetailid - INNER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid - INNER JOIN egcl_payment as payment on pd.paymentid=payment.id - WHERE payment.tenantid = $tenantid and payment.paymentstatus = 'CANCELLED' and pd.businessservice='PT' - GROUP BY pdid - ) - - SELECT - pd.tenantid AS tenantid, - pd.id, - pt.propertyid as consumercode, - to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS receiptdate, - --payment.ifsccode AS bankname, - concat(bank_branches.bank_name,' ',bank_branches.branch) as bankname, - receiptnumber, - payment.totalamountpaid as amount, - payment.paymentmode as instrumenttype, - payment.transactionnumber, - concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear, - to_char((To_timestamp(payment.transactiondate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, - payment.totaldue - payment.totalamountpaid AS pendingamount, - Initcap(case when pt.usagecategory like '%.%' then split_part(pt.usagecategory,'.',2) else pt.usagecategory end) as usagetype, - (case when eg_user.name is null then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else eg_user.name end) as collectorname, - receipt_breakup.*, - to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, - manualreceiptnumber as g8receiptno - FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment left outer join bank_branches on bank_branches.ifsc=payment.ifsccode, eg_pt_property as pt, receipt_breakup, egcl_bill bill - - --,(select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr - - where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus = 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid - - and pt.propertyid = bill.consumercode and receipt_breakup.pdid=pd.id and pt.status!='INACTIVE' - - --and pt_addr.propertyid=pt.id - orderby: ORDER BY pd.receiptdate DESC; - - reportName: OldUlbWisePtCollection_V2 - summary: ULB-wise PT Collection - version: 1.0.0 - moduleName: rainmaker-pt - sourceColumns: - - name: totalassessments - label: reports.pt.totalassessments - type: string - source: pt - total: true - - name: totalamountpaid - label: reports.pt.totalamountpaid - type: string - source: pt - total: true - - name: totalamountdue - label: reports.pt.totalamountdue - type: string - source: pt - total: true - searchParams: - - name: financialyear - label: Financial Year - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name - source: pt - wrapper: true - isMandatory: false - searchClause: AND financialyear = $financialyear - - name: usage - label: Usage - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=PropertyTax&masterName=UsageCategoryMajor|$..code|$..name - source: pt - wrapper: true - isMandatory: false - searchClause: AND usagecategorymajor = $usage - query: > - SELECT - tenantid, - COUNT(*) AS totalassessments, - SUM(totalamount) AS totalamount, - SUM(amount) AS totalamountpaid, - (SUM(totalamount) - SUM(amount)) AS totalamountdue - FROM eg_pt_propertydetail_v2 AS pd - - LEFT OUTER JOIN - (SELECT consumercode, totalamount, amount FROM egcl_receiptheader_v1 AS rh - LEFT OUTER JOIN egcl_receiptinstrument_v1 AS ri ON rh.id = ri.receiptheader - LEFT OUTER JOIN egcl_instrumentheader_v1 AS ih ON ri.instrumentheader = ih.id - and ih.instrumentstatus != 'CANCELLED' - where rh.status != 'Cancelled' - ) AS instrument_data ON (pd.property || ':' || pd.assessmentnumber) = instrument_data.consumercode - WHERE tenantid = $tenantid - groupby: GROUP BY tenantid - orderby: ORDER BY tenantid, totalamountpaid DESC NULLS LAST - - reportName: StateCancelledReceiptRegister_V2 - decryptionPathId: CancelledReceiptRegister_V2 - summary: Receipt Register for cancelled Receipts state - version: 1.0.0 - moduleName: rainmaker-pt - additionalConfig: - print: - pdfPageSize: A1 - sourceColumns: - - name: tenantid - label: reports.pt.ulb - type: string - source: pt - total: false - - name: receiptnumber - label: reports.pt.receiptNo - type: string - source: pt - total: false - - name: receiptdate - label: reports.pt.receiptDate - type: string - source: pt - total: false - - name: g8issuedate - label: reports.pt.g8issuedate - type: string - source: pt - total: false - - name: g8receiptno - label: reports.pt.g8receiptno - type: string - source: pt - total: false - - name: amount - label: reports.pt.amount - type: string - source: pt - total: true - - name: paystatus - label: reports.pt.paymentstatus - type: string - source: pt - total: false - - name: propertytax - label: reports.pt.propertyTax - type: string - source: pt - total: true - - name: firecess - label: reports.pt.fireCess - type: string - source: pt - total: true - - name: cancercess - label: reports.pt.cancerCess - type: string - source: pt - total: true - - name: rebate - label: reports.pt.rebate - type: string - source: pt - total: true - - name: adhocrebate - label: reports.pt.adhocrebate - type: string - source: pt - total: true - - name: penalty - label: reports.pt.penalty - type: string - source: pt - total: true - - name: adhocpenalty - label: reports.pt.adhocpenalty - type: string - source: pt - total: true - - name: interest - label: reports.pt.interest - type: string - source: pt - total: true - - name: exemption - label: reports.pt.exemption - type: string - source: pt - total: true - - name: adjustment - label: reports.pt.roundoff - type: string - source: pt - total: true - - name: pendingamount - label: reports.pt.pendingamount - type: string - source: pt - total: true - - name: consumercode - label: reports.pt.propertyId - type: string - source: pt - total: false - - name: usagetype - label: reports.pt.usagetype - type: string - source: pt - total: false - - name: instrumenttype - label: reports.pt.paymentMode - type: string - source: pt - total: false - - name: transactionnumber - label: reports.pt.ddChequeTransactionNo - type: string - source: pt - total: false - - name: transactiondate - label: reports.pt.ddChequeTransactionDate - type: string - source: pt - total: false - - name: bankname - label: reports.pt.bankName - type: string - source: pt - total: false - - name: collectorname - label: reports.pt.collectorname - type: string - source: pt - total: false - - name: financialyear - label: reports.pt.financialyear - type: string - source: pt - total: false - searchParams: - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: true - searchClause: AND pd.receiptdate >= $fromDate - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: true - searchClause: AND pd.receiptdate <= $toDate - - name: paymentMode - label: Payment Mode - type: singlevaluelist - pattern: list://CARD:Card,CASH:Cash,CHEQUE:Cheque,DD:DD,OFFLINE_NEFT:NEFT,OFFLINE_RTGS:RTGS,ONLINE:Online,POSTAL_ORDER:PostalOrder - source: pt - isMandatory: false - searchClause: AND payment.paymentmode = $paymentMode - query: > - -- Use CTE to force query plan, compute & use CTE later - - WITH receipt_breakup AS ( - SELECT - pd.id as pdid, - SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, - SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, - SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, - SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, - SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as propertytax, - (SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN adjustedamount ELSE 0 END) )as exemption, - ( SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END)) as adjustment - FROM egcl_billaccountdetail as bad - INNER JOIN egcl_billdetial as bd on bd.id = bad.billdetailid - INNER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid - INNER JOIN egcl_payment as payment on pd.paymentid=payment.id - WHERE bad.tenantid not in ('pb.testing','pb.ludhiana_legacy') and payment.paymentstatus = 'CANCELLED' and pd.businessservice='PT' - GROUP BY pdid - ) - - SELECT - pd.tenantid AS tenantid, - pd.id, - bill.consumercode, - to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS receiptdate, - payment.ifsccode AS bankname, - receiptnumber, - payment.totalamountpaid as amount, - payment.paymentmode as instrumenttype, - payment.transactionnumber, - concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear, - to_char((To_timestamp(payment.transactiondate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, - pd.due AS pendingamount, - Initcap(case when pt.usagecategory like '%.%' then split_part(pt.usagecategory,'.',2) else pt.usagecategory end) as usagetype, - (CASE WHEN billd.collectiontype='COUNTER' THEN eg_user.name ELSE '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' END) as collectorname, - receipt_breakup.*, - to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, manualreceiptnumber as g8receiptno, - payment.paymentstatus as paystatus - FROM egcl_paymentdetail pd, eg_user, eg_pt_property as pt, egcl_billdetial as billd, egcl_payment payment,receipt_breakup, egcl_bill bill, (select bill.id as billid, min(bd.fromperiod) fromperiod, max(bd.toperiod) toperiod from egcl_billdetial bd, egcl_bill bill where bill.id=bd.billid group by bill.id) bd - - WHERE pd.paymentid=payment.id and eg_user.id = pd.createdby::INTEGER and pt.propertyid = bill.consumercode and bill.id=pd.billid and bill.id=billd.billid and bd.billid=bill.id and payment.paymentstatus = 'CANCELLED' and pd.businessservice='PT' and payment.tenantid not in ('pb.testing','pb.ludhiana_legacy') and receipt_breakup.pdid=pd.id - orderby: ORDER BY pd.receiptdate DESC; - - reportName: StateWidePtCollection_V2 - summary: State Wide PT Collection - version: 1.0.0 - moduleName: rainmaker-pt - sourceColumns: - - name: tenantid - label: reports.pt.tenantid - type: string - source: pt - total: false - - name: totalamountpaid - label: reports.pt.totalamountpaid - type: string - source: pt - total: true - - name: totalassessments - label: reports.pt.totalassessments - type: string - source: pt - total: true - - name: totaloffline - label: reports.pt.totaloffline - type: string - source: pt - total: true - - name: countoffline - label: reports.pt.countoffline - type: string - source: pt - total: true - - name: totalonline - label: reports.pt.totalonline - type: string - source: pt - total: true - - name: countonline - label: reports.pt.countonline - type: string - source: pt - total: true - searchParams: - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: false - searchClause: AND pd.receiptdate >= $fromDate - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: false - searchClause: AND pd.receiptdate <= $toDate - - name: financialyear - label: Financial Year - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name - source: pt - wrapper: true - isMandatory: false - searchClause: AND concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) - at time Zone 'Asia/Kolkata'),'YYYY'),'-', - to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone - 'Asia/Kolkata'),'YY')) = $financialyear - - name: usage - label: Usage - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=PropertyTax&masterName=UsageCategoryMajor|$..code|$..name - source: pt - wrapper: true - isMandatory: false - searchClause: AND pt.usagecategory = $usage - query: > - SELECT - initcap(split_part(payment.tenantid, '.', 2)) as tenantid, - sum(payment.totalamountpaid) as totalamountpaid, - count(payment.totalamountpaid) as totalassessments, - sum(case when payment.paymentmode='ONLINE' then payment.totalamountpaid else 0 end) as "totalonline", - sum(case when payment.paymentmode='ONLINE' then 1 else 0 end) as "countonline", - sum(case when payment.paymentmode='CASH' then payment.totalamountpaid else 0 end) + - sum(case when payment.paymentmode='CHEQUE' then payment.totalamountpaid else 0 end) + - sum(case when payment.paymentmode='DD' then payment.totalamountpaid else 0 end) + - sum(case when payment.paymentmode='CARD' then payment.totalamountpaid else 0 end) + - sum(case when payment.paymentmode='OFFLINE_RTGS' then payment.totalamountpaid else 0 end) + - sum(case when payment.paymentmode='OFFLINE_NEFT' then payment.totalamountpaid else 0 end) + - sum(case when payment.paymentmode='POTAL_ORDER' then payment.totalamountpaid else 0 end) as "totaloffline", - sum(case when payment.paymentmode!='ONLINE' then 1 else 0 end) as "countoffline" - --concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear - FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, - (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid!='pb.testing' group by propertyid ) pt_addr - where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid!='pb.testing' - and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id - groupby: GROUP BY payment.tenantid - orderby: ORDER BY payment.tenantid, totalamountpaid DESC NULLS LAST - - reportName: UlbWisePtCollection_V2 - summary: ULB Wide PT Collection - version: 1.0.0 - moduleName: rainmaker-pt - sourceColumns: - - name: totalamountpaid - label: reports.pt.totalamountpaid - type: string - source: pt - total: true - - name: totalassessments - label: reports.pt.totalassessments - type: string - source: pt - total: true - - name: totaloffline - label: reports.pt.totaloffline - type: string - source: pt - total: true - - name: countoffline - label: reports.pt.countoffline - type: string - source: pt - total: true - - name: totalonline - label: reports.pt.totalonline - type: string - source: pt - total: true - - name: countonline - label: reports.pt.countonline - type: string - source: pt - total: true - searchParams: - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: false - searchClause: AND pd.receiptdate >= $fromDate - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: false - searchClause: AND pd.receiptdate <= $toDate - - name: financialyear - label: Financial Year - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name - source: pt - wrapper: true - isMandatory: false - searchClause: AND concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) - at time Zone 'Asia/Kolkata'),'YYYY'),'-', - to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone - 'Asia/Kolkata'),'YY')) = $financialyear - - name: usage - label: Usage - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=PropertyTax&masterName=UsageCategoryMajor|$..code|$..name - source: pt - wrapper: true - isMandatory: false - searchClause: AND pt.usagecategory = $usage - query: > - SELECT - --initcap(split_part(payment.tenantid, '.', 2)) as tenantid, - sum(payment.totalamountpaid) as totalamountpaid, - count(payment.totalamountpaid) as totalassessments, - sum(case when payment.paymentmode='ONLINE' then payment.totalamountpaid else 0 end) as "totalonline", - sum(case when payment.paymentmode='ONLINE' then 1 else 0 end) as "countonline", - sum(case when payment.paymentmode='CASH' then payment.totalamountpaid else 0 end) + - sum(case when payment.paymentmode='CHEQUE' then payment.totalamountpaid else 0 end) + - sum(case when payment.paymentmode='DD' then payment.totalamountpaid else 0 end) + - sum(case when payment.paymentmode='CARD' then payment.totalamountpaid else 0 end) + - sum(case when payment.paymentmode='OFFLINE_RTGS' then payment.totalamountpaid else 0 end) + - sum(case when payment.paymentmode='OFFLINE_NEFT' then payment.totalamountpaid else 0 end) + - sum(case when payment.paymentmode='POTAL_ORDER' then payment.totalamountpaid else 0 end) as "totaloffline", - sum(case when payment.paymentmode!='ONLINE' then 1 else 0 end) as "countoffline" - --concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear - FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, - (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr - where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid - and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id - - reportName: ReceiptRegisterShort_V2 - decryptionPathId: ReceiptRegisterShort_V2 - summary: Receipt Register - version: 1.0.0 - moduleName: rainmaker-pt - additionalConfig: - print: - pdfPageSize: Legal - sourceColumns: - - name: receiptnumber - label: reports.pt.receiptNo - type: string - source: pt - total: false - - name: transactiondate - label: reports.pt.receiptDate - type: string - source: pt - total: false - - name: g8receiptno - label: reports.pt.g8book - type: string - source: pt - total: false - - name: g8issuedate - label: reports.pt.g8dated - type: string - source: pt - total: false - - name: propertyid - label: reports.pt.ptrId - type: string - source: pt - total: false - - name: financialyear - label: reports.pt.financialYear - type: string - source: pt - total: false - - name: instrumenttype - label: reports.pt.paymentMode - type: string - source: pt - total: false - - name: amount - label: reports.pt.taxamount - type: string - source: pt - total: true - - name: transactionnumber - label: reports.pt.ddChequeNo - type: string - source: pt - total: false - - name: bankname - label: reports.pt.bankName - type: string - source: pt - total: false - - name: collectorname - label: reports.pt.collectorname - type: string - source: pt - total: false - - name: remarks - label: reports.pt.remarks - type: string - source: pt - total: false - searchParams: - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: true - searchClause: AND pd.receiptdate >= $fromDate - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: true - searchClause: AND pd.receiptdate <= $toDate - - name: paymentMode - label: Payment Mode - type: singlevaluelist - pattern: list://CARD:Card,CASH:Cash,CHEQUE:Cheque,DD:DD,OFFLINE_NEFT:NEFT,OFFLINE_RTGS:RTGS,ONLINE:Online,POSTAL_ORDER:PostalOrder - source: pt - isMandatory: false - searchClause: AND payment.paymentmode = $paymentMode - - name: financialyear - label: Financial Year - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name - source: pt - wrapper: true - isMandatory: false - searchClause: AND concat(to_char((To_timestamp(bd.fromperiod/1000) at time Zone - 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(bd.toperiod/1000) - at time Zone 'Asia/Kolkata'),'YY')) = $financialyear - - name: localityArray - label: reports.pt.zoneList - type: boundarylist - source: pt - isMandatory: false - searchClause: AND pt_addr.locality IN ($localityArray) - - name: collectorname - label: reports.pt.collectorname - type: singlevaluelist - pattern: http://egov-hrms:8080/egov-hrms/employees/_search?tenantId=$tenantid&roles=PTCEMP|$.Employees[*].user.id|$.Employees[*].user.name - source: pt - wrapper: true - isMandatory: false - searchClause: AND eg_user.id = $collectorname::INTEGER - query: > - -- Use CTE to force query plan, compute & use CTE later - - SELECT - pt.propertyid as propertyid, - to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') as transactiondate, - payment.ifsccode AS bankname, - receiptnumber, - payment.totalamountpaid as amount, - payment.paymentmode as instrumenttype, - payment.transactionnumber as transactionnumber, - --concat(to_char((To_timestamp(bd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(bd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY')) AS financialyear, - concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear, - (case when eg_user.name is null then '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' else eg_user.name end) as collectorname, - --receipt_breakup.*, - to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, - manualreceiptnumber as g8receiptno, - 'NA' as remarks - FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, - - (select bill.id as billid, bill.consumercode as consumercodei, min(bd.fromperiod) fromperiod, max(bd.toperiod) toperiod from egcl_billdetial bd, egcl_bill bill - - where bill.id=bd.billid and bill.tenantid = $tenantid group by bill.id) bd, - - (select string_agg(distinct propertyid,',') as propertyid,string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr - - where pd.paymentid=payment.id and bd.billid=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid - - and pt.propertyid = bd.consumercodei and pt.status!='INACTIVE' - - and pt_addr.propertyid=pt.id - orderby: ORDER BY pd.receiptdate DESC; - - reportName: ReceiptRegisterShort_WithoutLocality_V2 - decryptionPathId: ReceiptRegisterShort_V2 - summary: Receipt Register - version: 1.0.0 - moduleName: rainmaker-pt - additionalConfig: - print: - pdfPageSize: Legal - sourceColumns: - - name: receiptnumber - label: reports.pt.receiptNo - type: string - source: pt - total: false - - name: transactiondate - label: reports.pt.receiptDate - type: string - source: pt - total: false - - name: g8receiptno - label: reports.pt.g8book - type: string - source: pt - total: false - - name: g8issuedate - label: reports.pt.g8dated - type: string - source: pt - total: false - - name: propertyid - label: reports.pt.ptrId - type: string - source: pt - total: false - - name: financialyear - label: reports.pt.financialYear - type: string - source: pt - total: false - - name: instrumenttype - label: reports.pt.paymentMode - type: string - source: pt - total: false - - name: amount - label: reports.pt.taxamount - type: string - source: pt - total: true - - name: transactionnumber - label: reports.pt.ddChequeNo - type: string - source: pt - total: false - - name: bankname - label: reports.pt.bankName - type: string - source: pt - total: false - - name: collectorname - label: reports.pt.collectorname - type: string - source: pt - total: false - - name: remarks - label: reports.pt.remarks - type: string - source: pt - total: false - searchParams: - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: true - searchClause: AND pd.receiptdate >= $fromDate - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: true - searchClause: AND pd.receiptdate <= $toDate - - name: paymentMode - label: Payment Mode - type: singlevaluelist - pattern: list://CARD:Card,CASH:Cash,CHEQUE:Cheque,DD:DD,OFFLINE_NEFT:NEFT,OFFLINE_RTGS:RTGS,ONLINE:Online,POSTAL_ORDER:PostalOrder - source: pt - isMandatory: false - searchClause: AND payment.paymentmode = $paymentMode - - name: financialyear - label: Financial Year - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name - source: pt - wrapper: true - isMandatory: false - searchClause: AND concat(to_char((To_timestamp(bd.fromperiod/1000) at time Zone - 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(bd.toperiod/1000) - at time Zone 'Asia/Kolkata'),'YY')) = $financialyear - - name: collectorname - label: reports.pt.collectorname - type: singlevaluelist - pattern: http://egov-hrms:8080/egov-hrms/employees/_search?tenantId=$tenantid&roles=PTCEMP|$.Employees[*].user.id|$.Employees[*].user.name - source: pt - wrapper: true - isMandatory: false - searchClause: AND eg_user.id = $collectorname::INTEGER - query: > - -- Use CTE to force query plan, compute & use CTE later - - SELECT - pt.propertyid as propertyid, - to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') as transactiondate, - payment.ifsccode AS bankname, - receiptnumber, - payment.totalamountpaid as amount, - payment.paymentmode as instrumenttype, - payment.transactionnumber as transactionnumber, - --concat(to_char((To_timestamp(bd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(bd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY')) AS financialyear, - concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear, - (case when eg_user.name is null then '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' else eg_user.name end) as collectorname, - --receipt_breakup.*, - to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, - manualreceiptnumber as g8receiptno, - 'NA' as remarks - FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, - - (select bill.id as billid, bill.consumercode as consumercodei, min(bd.fromperiod) fromperiod, max(bd.toperiod) toperiod from egcl_billdetial bd, egcl_bill bill - - where bill.id=bd.billid and bill.tenantid = $tenantid group by bill.id) bd - - where pd.paymentid=payment.id and bd.billid=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid - - and pt.propertyid = bd.consumercodei and pt.status!='INACTIVE' - orderby: ORDER BY pd.receiptdate DESC; - - reportName: ULBPTDataDumpReport_V2 - decryptionPathId: ULBPTDataDumpReport_V2 - summary: ULB level report - version: 1.0.0 - moduleName: rainmaker-pt - sourceColumns: - - name: ulb - label: reports.pt.ulb - type: string - source: pt - total: false - - name: propertytaxuniqueid - label: reports.pt.propertytaxuniqueid - type: string - source: pt - total: false - - name: transcationdate - label: reports.pt.transcationdate - type: string - source: pt - total: false - - name: receiptnumber - label: reports.pt.receiptnumber - type: string - source: pt - total: false - - name: existingpropertyid - label: reports.pt.existingpropertyid - type: string - source: pt - total: false - - name: financialyear - label: reports.pt.financialYear - type: string - source: pt - total: false - - name: ownername - label: reports.pt.ownername - type: string - source: pt - total: false - - name: guardianname - label: reports.pt.guardianname - type: string - source: pt - total: false - - name: totalarea - label: reports.pt.totalarea - type: string - source: pt - total: false - - name: builtarea - label: reports.pt.builtarea - type: string - source: pt - total: false - - name: floors - label: reports.pt.floors - type: string - source: pt - total: false - - name: occupancy - label: reports.pt.occupancy - type: string - source: pt - total: false - - name: propertytype - label: reports.pt.propertytype - type: string - source: pt - total: false - - name: mobileno - label: reports.pt.mobileno - type: string - source: pt - total: false - - name: transcationmode - label: reports.pt.transcationmode - type: string - source: pt - total: false - - name: paymentamount - label: reports.pt.paymentamount - type: string - source: pt - total: true - - name: paymentdate - label: reports.pt.paymentdate - type: string - source: pt - total: false - - name: emailid - label: reports.pt.emailid - type: string - source: pt - total: false - - name: address - label: reports.pt.address - type: string - source: pt - total: false - - name: payeraddress - label: reports.pt.payeraddress - type: string - source: pt - total: false - - name: remarks - label: reports.pt.remarks - type: string - source: pt - total: false - - name: businessname - label: reports.pt.businessname - type: string - source: pt - total: false - - name: localitycode - label: reports.pt.localitycode - type: string - source: pt - total: false - - name: localityname - label: reports.pt.localityname - type: string - source: pt - total: false - searchParams: - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: true - searchClause: AND payd.receiptdate >= $fromDate - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: true - searchClause: AND payd.receiptdate <= $toDate - - name: financialyear - label: Financial Year - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name - source: pt - wrapper: true - isMandatory: false - searchClause: AND concat(to_char((To_timestamp(billd.fromperiod/1000) at time - Zone 'Asia/Kolkata'),'YYYY'),'-', - to_char((To_timestamp(billd.toperiod/1000) at time Zone - 'Asia/Kolkata'),'YY')) = $financialyear - - name: paymentMode - label: Payment Mode - type: singlevaluelist - pattern: list://CARD:Card,CASH:Cash,CHEQUE:Cheque,DD:DD,OFFLINE_NEFT:NEFT,OFFLINE_RTGS:RTGS,ONLINE:Online,POSTAL_ORDER:PostalOrder - source: pt - isMandatory: false - searchClause: AND payment.paymentmode = $paymentMode - - name: localityArray - label: reports.pt.zoneList - type: boundarylist - source: pt - isMandatory: false - searchClause: AND pta.locality IN ($localityArray) - query: > - --S.no Service Name ULB Property Tax Unique ID Date Of - Transcation Receipt Number Existing Property ID Owner - Name Guardian Name Total Area (SQ.YARD) Covered Area/Built Area - (SQ.FEET) Floors Occupancy (Rented,Self /Unoccupied) Type Of - Property Mobile Number Transcation Mode of Payment Payment - Amount Payment Date Email Id Address - - with eg_pt_unit_v2_ot as ( - select - propertyid, - string_agg(distinct pu.occupancytype, ',') as occupancytype, - string_agg(distinct Initcap(case when usagecategory like '%.%' then split_part(usagecategory,'.',2) else usagecategory end),',') as propertytype - from eg_pt_unit as pu - where pu.tenantid = $tenantid - group by propertyid - ) - select - distinct on (payd.receiptnumber) - initcap(split_part(payd.tenantid, '.', 2)) as "ulb", - split_part(consumercode, ':', 1) as "propertytaxuniqueid", - to_char((To_timestamp(receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS "transcationdate", - receiptnumber as "receiptnumber", - pt.oldpropertyid as "existingpropertyid", - concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) AS "financialyear", - eu."name" as "ownername", - eu.guardian as "guardianname", - pt.landarea as "totalarea", - pt.superbuiltuparea * 9 as "builtarea", - pt.nooffloors as "floors", - eu.mobilenumber as "mobileno", - paymentmode as "transcationmode", - payment.totalamountpaid as "paymentamount", - to_char((To_timestamp(payment.transactiondate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS "paymentdate", - eu.emailid as "emailid", - REGEXP_REPLACE(REGEXP_REPLACE(CONCAT(pta.doorno, ',', pta.buildingname, ',',pta.street,',', pta.pincode), ',+', ','), '^,|,$', '') as "address", - payment.payeraddress as "payeraddress", - pt.additionaldetails->>'remarks' as "remarks", - pt.additionaldetails->>'FirmBusinessName' as "businessname", - pot.occupancytype as occupancy, - pot.propertytype as propertytype, - pta.locality as "localitycode", - localnames.localityname as localityname - from egcl_paymentdetail as payd - - inner join egcl_payment as payment on payment.id = payd.paymentid - - inner join egcl_bill as bill on bill.id = payd.billid - - inner join egcl_billdetial as billd on billd.billid=bill.id - - inner join eg_pt_property as pt on pt.propertyid = bill.consumercode - - inner join eg_pt_owner as po on po.propertyid = pt.id and po.status='ACTIVE' - - inner join eg_user as eu on eu.uuid = po.userid - - inner join eg_pt_address as pta on pta.propertyid = pt.id - - left outer join eg_bndry_mohalla as localnames on pta.locality=localnames.localitycode - - left outer join eg_pt_unit_v2_ot as pot on pot.propertyid = pt.id - - where payd.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and payd.businessservice='PT' and pt.status!='INACTIVE' - - reportName: Sewa_Kendra_ReceiptRegister_V2 - summary: Sewa Kendra Receipt Register - version: 1.0.0 - moduleName: rainmaker-pt - additionalConfig: - print: - pdfPageSize: A1 - sourceColumns: - - name: receiptnumber - label: reports.pt.receiptNo - type: string - source: pt - total: false - - name: receiptdate - label: reports.pt.receiptDate - type: string - source: pt - total: false - - name: g8issuedate - label: reports.pt.g8issuedate - type: string - source: pt - total: false - - name: g8receiptno - label: reports.pt.g8receiptno - type: string - source: pt - total: false - - name: amount - label: reports.pt.amount - type: string - source: pt - total: true - - name: propertytax - label: reports.pt.propertyTax - type: string - source: pt - total: true - - name: firecess - label: reports.pt.fireCess - type: string - source: pt - total: true - - name: cancercess - label: reports.pt.cancerCess - type: string - source: pt - total: true - - name: rebate - label: reports.pt.rebate - type: string - source: pt - total: true - - name: adhocrebate - label: reports.pt.adhocrebate - type: string - source: pt - total: true - - name: penalty - label: reports.pt.penalty - type: string - source: pt - total: true - - name: adhocpenalty - label: reports.pt.adhocpenalty - type: string - source: pt - total: true - - name: interest - label: reports.pt.interest - type: string - source: pt - total: true - - name: exemption - label: reports.pt.exemption - type: string - source: pt - total: true - - name: adjustment - label: reports.pt.roundoff - type: string - source: pt - total: true - - name: pendingamount - label: reports.pt.pendingamount - type: string - source: pt - total: true - - name: propertyid - label: reports.pt.propertyId - type: string - source: pt - total: false - - name: usagetype - label: reports.pt.usagetype - type: string - source: pt - total: false - - name: assessmentnumber - label: reports.pt.assessmentNo - type: string - source: pt - total: false - - name: financialyear - label: reports.pt.financialYear - type: string - source: pt - total: false - - name: instrumenttype - label: reports.pt.paymentMode - type: string - source: pt - total: false - - name: transactionnumber - label: reports.pt.ddChequeTransactionNo - type: string - source: pt - total: false - - name: transactiondate - label: reports.pt.ddChequeTransactionDate - type: string - source: pt - total: false - - name: bankname - label: reports.pt.bankName - type: string - source: pt - total: false - - name: collectorname - label: reports.pt.collectorname - type: string - source: pt - total: false - - name: remarks - label: reports.pt.remarks - type: string - source: pt - total: false - searchParams: - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: true - searchClause: AND rh.receiptdate >= $fromDate - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: true - searchClause: AND rh.receiptdate <= $toDate - - name: paymentMode - label: Payment Mode - type: singlevaluelist - pattern: list://CARD:Card,CASH:Cash,CHEQUE:Cheque,DD:DD,OFFLINE_NEFT:NEFT,OFFLINE_RTGS:RTGS,ONLINE:Online,POSTAL_ORDER:PostalOrder - source: pt - isMandatory: false - searchClause: AND instrumenttype = $paymentMode - - name: financialyear - label: Financial Year - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name - source: pt - wrapper: true - isMandatory: false - searchClause: AND financialyear = $financialyear - - name: localityArray - label: reports.pt.zoneList - type: boundarylist - source: pt - isMandatory: false - searchClause: AND pt_addr.locality IN ($localityArray) - query: > - -- Use CTE to force query plan, compute & use CTE later - WITH receipt_breakup AS ( - SELECT - receiptnumber, - SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, - SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, - SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, - SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, - SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as propertytax, - (SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN adjustedamount ELSE 0 END) )as exemption, - ( SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END)) as adjustment - FROM egcl_billaccountdetail as bad - INNER JOIN egcl_billdetial as bd on bd.id = bad.billdetailid - INNER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid - INNER JOIN egcl_payment as payment on pd.paymentid=payment.id - WHERE bd.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' - and pd.createdby::INTEGER in (select user_id from eg_userrole_v1 where role_code ='SEVA_KENDRA_EMP') - GROUP BY pd.receiptnumber - ) - - SELECT - bill.tenantid AS tenantid, - bill.id, - pt_detail.property AS propertyid, - pt_detail.assessmentnumber AS assessmentnumber, - bill.consumercode, - pd.receiptdate, - to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, - payment.ifsccode AS bankname, - pd.receiptnumber, - payment.totalamountpaid as amount, - payment.paymentmode as instrumenttype, - payment.transactionnumber, - receipt_breakup.*, - pd.due AS pendingamount, - pt_detail.financialyear, - to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, - Initcap(COALESCE(pt_detail.usagecategoryminor, pt_detail.usagecategorymajor)) as usagetype, - manualreceiptnumber as g8receiptno, - (CASE WHEN collectiontype='COUNTER' THEN eg_user.name ELSE '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' END) as collectorname, - pt_detail.additionaldetails->>'remarks' as "remarks" - FROM egcl_bill AS bill - - INNER JOIN egcl_billdetial as bd on bd.billid = bill.id - - LEFT OUTER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid - - LEFT OUTER JOIN egcl_payment as payment on pd.paymentid=payment.id - - JOIN eg_pt_propertydetail_v2 pt_detail ON pt_detail.property = bill.consumercode - - JOIN eg_pt_address_v2 pt_addr ON pt_detail.property = pt_addr.property - - JOIN receipt_breakup ON receipt_breakup.receiptnumber = pd.receiptnumber - - LEFT OUTER JOIN eg_user ON eg_user.id = pd.createdby::INTEGER - - WHERE bd.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and pd.createdby::INTEGER in (select user_id - - FROM eg_userrole_v1 where role_code ='SEVA_KENDRA_EMP') - orderby: ORDER BY pd.receiptdate DESC - - reportName: ReceiptRegisterSummary_V2 - decryptionPathId: ReceiptRegisterShort_V2 - summary: Receipt Register Summary - version: 1.0.0 - moduleName: rainmaker-pt - additionalConfig: - print: - pdfPageSize: A1 - sourceColumns: - - name: ulb - label: reports.pt.ulb - type: string - source: pt - total: false - - name: adhocpenalty - label: reports.pt.adhocpenalty - type: string - source: pt - total: true - - name: adhocrebate - label: reports.pt.adhocrebate - type: string - source: pt - total: true - - name: firecess - label: reports.pt.firecess - type: string - source: pt - total: true - - name: cancercess - label: reports.pt.cancercess - type: string - source: pt - total: true - - name: interest - label: reports.pt.interest - type: string - source: pt - total: true - - name: penalty - label: reports.pt.penalty - type: string - source: pt - total: true - - name: rebate - label: reports.pt.rebate - type: string - source: pt - total: true - - name: propertytax - label: reports.pt.propertytax - type: string - source: pt - total: true - - name: exemption - label: reports.pt.exemption - type: string - source: pt - total: true - - name: adjustment - label: reports.pt.adjustment - type: string - source: pt - total: true - - name: noofassessments - label: reports.pt.noofassessments - type: string - source: pt - total: true - - name: sumcash - label: reports.pt.sumcash - type: string - source: pt - total: true - - name: sumcheque - label: reports.pt.sumcheque - type: string - source: pt - total: true - - name: countcheque - label: reports.pt.countcheque - type: string - source: pt - total: true - - name: sumonline - label: reports.pt.sumonline - type: string - source: pt - total: true - - name: totalamount - label: reports.pt.totalamount - type: string - source: pt - total: true - - name: collectorname - label: reports.pt.collectorname - type: string - source: pt - total: false - searchParams: - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: true - searchClause: AND pd.receiptdate >= $fromDate - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: true - searchClause: AND pd.receiptdate <= $toDate - - name: collectorname - label: reports.pt.collectorname - type: singlevaluelist - pattern: http://egov-hrms:8080/egov-hrms/employees/_search?tenantId=$tenantid&roles=PTCEMP|$.Employees[*].user.id|$.Employees[*].user.name - source: pt - wrapper: true - isMandatory: false - searchClause: AND eg_user.id = $collectorname::INTEGER - query: > - -- Use CTE to force query plan, compute & use CTE later - - SELECT - split_part(bd.tenantid,'.',2) as ulb, - Count (distinct pd.paymentid) as noofassessments, - SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, - SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, - SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, - SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, - SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as propertytax, - (SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN adjustedamount ELSE 0 END) )as exemption, - ( SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END)) as adjustment, - sum(case when payment.paymentmode='CASH' then bad.adjustedamount else 0 end) as sumcash, - sum(case when payment.paymentmode='CHEQUE' then bad.adjustedamount else 0 end) as sumcheque, - count (distinct case when payment.paymentmode='CHEQUE' then concat(payment.paymentmode) end) as countcheque, - sum(case when payment.paymentmode='ONLINE' then bad.adjustedamount else 0 end) as sumonline, - (CASE WHEN collectiontype='COUNTER' THEN eg_user.name ELSE '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' END) as collectorname, --for Online collecion show None as collectorname - sum(adjustedamount) as totalamount - FROM egcl_billaccountdetail as bad - - INNER JOIN egcl_billdetial as bd on bd.id = bad.billdetailid - - INNER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid - - INNER JOIN egcl_payment as payment on pd.paymentid=payment.id - - LEFT OUTER JOIN eg_user ON eg_user.id = pd.createdby::INTEGER - - WHERE bd.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' - groupby: group by collectorname,bd.tenantid - - reportName: StateReceiptRegisterSummary_V2 - summary: Receipt Register Summary - version: 1.0.0 - moduleName: rainmaker-pt - additionalConfig: - print: - pdfPageSize: A1 - sourceColumns: - - name: ulb - label: reports.pt.ulb - type: string - source: pt - total: false - - name: adhocpenalty - label: reports.pt.adhocpenalty - type: string - source: pt - total: true - - name: adhocrebate - label: reports.pt.adhocrebate - type: string - source: pt - total: true - - name: firecess - label: reports.pt.firecess - type: string - source: pt - total: true - - name: cancercess - label: reports.pt.cancercess - type: string - source: pt - total: true - - name: interest - label: reports.pt.interest - type: string - source: pt - total: true - - name: penalty - label: reports.pt.penalty - type: string - source: pt - total: true - - name: rebate - label: reports.pt.rebate - type: string - source: pt - total: true - - name: propertytax - label: reports.pt.propertytax - type: string - source: pt - total: true - - name: exemption - label: reports.pt.exemption - type: string - source: pt - total: true - - name: adjustment - label: reports.pt.adjustment - type: string - source: pt - total: true - searchParams: - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: false - searchClause: AND pd.receiptdate >= $fromDate - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: false - searchClause: AND pd.receiptdate <= $toDate - - name: ulb - label: ULB - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name - source: pt - wrapper: true - isMandatory: false - searchClause: AND bd.tenantid = $ulb - query: > - -- Use CTE to force query plan, compute & use CTE later - - SELECT - split_part(bd.tenantid,'.',2) as ulb, - SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, - SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, - SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, - SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, - SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as propertytax, - (SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN adjustedamount ELSE 0 END) )as exemption, - ( SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END)) as adjustment - FROM egcl_billaccountdetail as bad - - INNER JOIN egcl_billdetial as bd on bd.id = bad.billdetailid - - INNER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid - - WHERE bd.tenantid != 'pb.testing' and pd.businessservice='PT' - groupby: group by bd.tenantid - orderby: order by bd.tenantid - - reportName: FYCollectionsReport_V2 - summary: FY Collections - version: 1.0.0 - moduleName: rainmaker-pt - additionalConfig: - print: - pdfPageSize: Legal - sourceColumns: - - name: financialyear - label: reports.pt.financialyear - type: string - source: pt - total: false - - name: residential - label: reports.pt.residential - type: string - source: pt - total: true - - name: countresidential - label: reports.pt.countresidential - type: string - source: pt - total: true - - name: nonresidential - label: reports.pt.nonresidential - type: string - source: pt - total: true - - name: countnonresidential - label: reports.pt.countnonresidential - type: string - source: pt - total: true - - name: mixed - label: reports.pt.mixed - type: string - source: pt - total: true - - name: countmixed - label: reports.pt.countmixed - type: string - source: pt - total: true - - name: totalamount - label: reports.pt.totalamount - type: string - source: pt - total: true - - name: totalcount - label: reports.pt.totalcount - type: string - source: pt - total: true - - name: online - label: reports.pt.online - type: string - source: pt - total: true - - name: cash - label: reports.pt.cash - type: string - source: pt - total: true - - name: cheque - label: reports.pt.cheque - type: string - source: pt - total: true - - name: dd - label: reports.pt.dd - type: string - source: pt - total: true - - name: card - label: reports.pt.card - type: string - source: pt - total: true - - name: neft - label: reports.pt.neft - type: string - source: pt - total: true - - name: rtgs - label: reports.pt.rtgs - type: string - source: pt - total: true - - name: po - label: reports.pt.po - type: string - source: pt - total: true - searchParams: - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: false - searchClause: AND pd.receiptdate >= $fromDate - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: false - searchClause: AND pd.receiptdate <= $toDate - - name: localityArray - label: reports.pt.zoneList - type: boundarylist - source: pt - isMandatory: false - searchClause: AND pt_addr.locality IN ($localityArray) - query: > - -- Use CTE to force query plan, compute & use CTE later - - SELECT - sum(payment.totalamountpaid) as totalamount, - count(payment.totalamountpaid) as totalcount, - sum(case when payment.paymentmode='ONLINE' then payment.totalamountpaid else 0 end) as "online", - sum(case when payment.paymentmode='CASH' then payment.totalamountpaid else 0 end) as "cash", - sum(case when payment.paymentmode='CHEQUE' then payment.totalamountpaid else 0 end) as "cheque", - sum(case when payment.paymentmode='DD' then payment.totalamountpaid else 0 end) as "dd", - sum(case when payment.paymentmode='CARD' then payment.totalamountpaid else 0 end) as "card", - sum(case when payment.paymentmode='OFFLINE_RTGS' then payment.totalamountpaid else 0 end) as "rtgs", - sum(case when payment.paymentmode='OFFLINE_NEFT' then payment.totalamountpaid else 0 end) as "neft", - sum(case when payment.paymentmode='POTAL_ORDER' then payment.totalamountpaid else 0 end) as "po", - sum(case when split_part(pt.usagecategory, '.', 1)='RESIDENTIAL' then payment.totalamountpaid else 0 end) as "residential", - sum(case when split_part(pt.usagecategory, '.', 1)='RESIDENTIAL' then 1 else 0 end) as "countresidential", - sum(case when split_part(pt.usagecategory, '.', 1) = 'NONRESIDENTIAL' then payment.totalamountpaid else 0 end) as "nonresidential", - sum(case when pt.usagecategory like 'NONRESIDENTIAL%' then 1 else 0 end) as "countnonresidential", - sum(case when pt.usagecategory='MIXED' then payment.totalamountpaid else 0 end) as "mixed", - sum(case when pt.usagecategory='MIXED' then 1 else 0 end) as "countmixed", - concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear - FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, - - (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr - - where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid - - and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id - groupby: GROUP BY financialyear - orderby: ORDER BY financialyear - - reportName: FYCollectionsReport_WithoutLocality_V2 - summary: FY Collections - version: 1.0.0 - moduleName: rainmaker-pt - additionalConfig: - print: - pdfPageSize: Legal - sourceColumns: - - name: financialyear - label: reports.pt.financialyear - type: string - source: pt - total: false - - name: residential - label: reports.pt.residential - type: string - source: pt - total: true - - name: countresidential - label: reports.pt.countresidential - type: string - source: pt - total: true - - name: nonresidential - label: reports.pt.nonresidential - type: string - source: pt - total: true - - name: countnonresidential - label: reports.pt.countnonresidential - type: string - source: pt - total: true - - name: mixed - label: reports.pt.mixed - type: string - source: pt - total: true - - name: countmixed - label: reports.pt.countmixed - type: string - source: pt - total: true - - name: totalamount - label: reports.pt.totalamount - type: string - source: pt - total: true - - name: totalcount - label: reports.pt.totalcount - type: string - source: pt - total: true - - name: online - label: reports.pt.online - type: string - source: pt - total: true - - name: cash - label: reports.pt.cash - type: string - source: pt - total: true - - name: cheque - label: reports.pt.cheque - type: string - source: pt - total: true - - name: dd - label: reports.pt.dd - type: string - source: pt - total: true - - name: card - label: reports.pt.card - type: string - source: pt - total: true - - name: neft - label: reports.pt.neft - type: string - source: pt - total: true - - name: rtgs - label: reports.pt.rtgs - type: string - source: pt - total: true - - name: po - label: reports.pt.po - type: string - source: pt - total: true - searchParams: - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: false - searchClause: AND pd.receiptdate >= $fromDate - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: false - searchClause: AND pd.receiptdate <= $toDate - query: > - -- Use CTE to force query plan, compute & use CTE later - - SELECT - sum(payment.totalamountpaid) as totalamount, - count(payment.totalamountpaid) as totalcount, - sum(case when payment.paymentmode='ONLINE' then payment.totalamountpaid else 0 end) as "online", - sum(case when payment.paymentmode='CASH' then payment.totalamountpaid else 0 end) as "cash", - sum(case when payment.paymentmode='CHEQUE' then payment.totalamountpaid else 0 end) as "cheque", - sum(case when payment.paymentmode='DD' then payment.totalamountpaid else 0 end) as "dd", - sum(case when payment.paymentmode='CARD' then payment.totalamountpaid else 0 end) as "card", - sum(case when payment.paymentmode='OFFLINE_RTGS' then payment.totalamountpaid else 0 end) as "rtgs", - sum(case when payment.paymentmode='OFFLINE_NEFT' then payment.totalamountpaid else 0 end) as "neft", - sum(case when payment.paymentmode='POTAL_ORDER' then payment.totalamountpaid else 0 end) as "po", - sum(case when split_part(pt.usagecategory, '.', 1)='RESIDENTIAL' then payment.totalamountpaid else 0 end) as "residential", - sum(case when split_part(pt.usagecategory, '.', 1)='RESIDENTIAL' then 1 else 0 end) as "countresidential", - sum(case when split_part(pt.usagecategory, '.', 1) = 'NONRESIDENTIAL' then payment.totalamountpaid else 0 end) as "nonresidential", - sum(case when pt.usagecategory like 'NONRESIDENTIAL%' then 1 else 0 end) as "countnonresidential", - sum(case when pt.usagecategory='MIXED' then payment.totalamountpaid else 0 end) as "mixed", - sum(case when pt.usagecategory='MIXED' then 1 else 0 end) as "countmixed", - concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear - FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill - - where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid - - and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' - groupby: GROUP BY financialyear - orderby: ORDER BY financialyear - - reportName: ULBDEFAULTERPTREPORT_V2 - decryptionPathId: ULBDEFAULTERPTREPORT_V2 - summary: ULB Defaulter Pt report - version: 1.0.0 - moduleName: rainmaker-pt - sourceColumns: - - name: ulb - label: reports.pt.ulb - type: string - source: pt - total: false - - name: propertytaxuniqueid - label: reports.pt.propertytaxuniqueid - type: string - source: pt - total: false - - name: transcationdate - label: reports.pt.transcationdate - type: string - source: pt - total: false - - name: receiptnumber - label: reports.pt.receiptnumber - type: string - source: pt - total: false - - name: existingpropertyid - label: reports.pt.existingpropertyid - type: string - source: pt - total: false - - name: financialyear - label: reports.pt.financialYear - type: string - source: pt - total: false - - name: ownername - label: reports.pt.ownername - type: string - source: pt - total: false - - name: guardianname - label: reports.pt.guardianname - type: string - source: pt - total: false - - name: propertytype - label: reports.pt.propertytype - type: string - source: pt - total: false - - name: mobileno - label: reports.pt.mobileno - type: string - source: pt - total: false - - name: address - label: reports.pt.address - type: string - source: pt - total: false - - name: payeraddress - label: reports.pt.payeraddress - type: string - source: pt - total: false - searchParams: - - name: localityArray - label: reports.pt.zoneList - type: boundarylist - source: pt - isMandatory: false - searchClause: AND pta.locality IN ($localityArray) - query: >+ - --S.no Service Name ULB Property Tax Unique ID Date Of - Transcation Receipt Number Existing Property ID Type Of - Property Mobile Number Address - - with eg_pt_unit_v2_ot as ( - select - propertyid, - string_agg(distinct pu.occupancytype, ',') as occupancytype, - --string_agg(distinct coalesce(usagecategory), ',') as propertytype - string_agg(distinct Initcap(case when usagecategory like '%.%' then split_part(usagecategory,'.',2) else usagecategory end),',') as propertytype - from eg_pt_unit as pu - where pu.tenantid = $tenantid - group by propertyid - ) - select - distinct on (payd.receiptnumber) - initcap(split_part(payd.tenantid, '.', 2)) as "ulb", - split_part(consumercode, ':', 1) as "propertytaxuniqueid", - to_char((To_timestamp(payd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS "transcationdate", - payd.receiptnumber as "receiptnumber", - pt.oldpropertyid as "existingpropertyid", - concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) AS "financialyear", - eu."name" as "ownername", - eu.guardian as "guardianname", - pot.propertytype as "propertytype", - eu.mobilenumber as "mobileno", - REGEXP_REPLACE(REGEXP_REPLACE(CONCAT(pta.doorno, ',', pta.buildingname, ',',pta.street,',', pta.pincode), ',+', ','), '^,|,$', '') as "address" - from egcl_paymentdetail as payd - inner join egcl_payment as payment on payment.id = payd.paymentid - inner join egcl_bill as bill on bill.id = payd.billid - inner join egcl_billdetial as billd on billd.billid=bill.id - inner join eg_pt_property as pt on pt.propertyid = bill.consumercode - inner join eg_pt_owner as po on po.propertyid = pt.id and po.status='ACTIVE' - inner join eg_user as eu on eu.uuid = po.userid - inner join eg_pt_address as pta on pta.propertyid = pt.id - left outer join eg_pt_unit_v2_ot as pot on pot.propertyid = pt.id - where payd.tenantid = $tenantid - and bill.consumercode not in (select consumercode from egcl_bill where tenantid=$tenantid and businessservice='PT' and id in (select billid from egcl_billdetial where tenantid=$tenantid and concat(to_char((To_timestamp(fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) ='2020-21')) - and pt.status!='INACTIVE' - - - reportName: ULBDEFAULTERPTREPORT_NEW_V2 - decryptionPathId: ULBDEFAULTERPTREPORT_V2 - summary: ULB Defaulter Pt report - version: 1.0.0 - moduleName: rainmaker-pt - sourceColumns: - - name: propertytaxuniqueid - label: reports.pt.propertytaxuniqueid - type: string - source: pt - total: false - - name: existingpropertyid - label: reports.pt.existingpropertyid - type: string - source: pt - total: false - - name: ownername - label: reports.pt.ownername - type: string - source: pt - total: false - - name: propertytype - label: reports.pt.propertytype - type: string - source: pt - total: false - - name: mobileno - label: reports.pt.mobileno - type: string - source: pt - total: false - - name: address - label: reports.pt.address - type: string - source: pt - total: false - searchParams: - - name: localityArray - label: reports.pt.zoneList - type: boundarylist - source: pt - isMandatory: false - searchClause: AND pta.locality IN ($localityArray) - query: > - --S.no Service Name ULB Property Tax Unique ID Date Of - Transcation Receipt Number Existing Property ID Type Of - Property Mobile Number Address - with eg_pt_unit_v2_ot as ( - select - propertyid, - string_agg(distinct pu.occupancytype, ',') as occupancytype, - --string_agg(distinct coalesce(usagecategory), ',') as propertytype - string_agg(distinct Initcap(case when usagecategory like '%.%' then split_part(usagecategory,'.',2) else usagecategory end),',') as propertytype - from eg_pt_unit as pu - where pu.tenantid = $tenantid - group by propertyid - ) - select - --distinct on (payd.receiptnumber) - --initcap(split_part(payd.tenantid, '.', 2)) as "ulb", - --split_part(consumercode, ':', 1) as "propertytaxuniqueid", - --to_char((To_timestamp(payd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS "transcationdate", - --payd.receiptnumber as "receiptnumber", - pt.propertyid as "propertytaxuniqueid", - string_agg(pt.oldpropertyid,',') as "existingpropertyid", - --concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) AS "financialyear", - split_part(string_agg(eu."name",','),',',1) as "ownername", --first owner - --eu.guardian as "guardianname", - string_agg(pot.propertytype,',') as "propertytype", - split_part(string_agg(eu.mobilenumber,','),',',1) as "mobileno", - --string_agg(distinct REGEXP_REPLACE(REGEXP_REPLACE(CONCAT(pta.doorno, ',', pta.buildingname, ',',pta.street,',', pta.pincode), ',+', ','), '^,|,$', ''),',') as "address", - string_agg(distinct concat(pta.doorno,',',pta.plotno,',',pta.buildingname,',',pta.street,',',pta.landmark,',',eg_bndry_mohalla.localityname,',',pta.city),',') as "address" - from eg_pt_property pt - --inner join egcl_payment as payment on payment.id = payd.paymentid - --inner join egcl_bill as bill on bill.id = payd.billid - --inner join egcl_billdetial as billd on billd.billid=bill.id - --inner join as pt on pt.propertyid = bill.consumercode - inner join eg_pt_owner as po on po.propertyid = pt.id and po.status='ACTIVE' - inner join eg_user as eu on eu.uuid = po.userid - inner join eg_pt_address as pta on pta.propertyid = pt.id - inner join eg_pt_unit_v2_ot as pot on pot.propertyid = pt.id - inner join eg_bndry_mohalla on eg_bndry_mohalla.localitycode=pta.locality - where pt.tenantid = $tenantid - --and bill.consumercode not in (select consumercode from egcl_bill where tenantid=$tenantid and businessservice='PT' and id in (select billid from egcl_billdetial where tenantid=$tenantid and concat(to_char((To_timestamp(fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) ='2020-21')) - and pt.status!='INACTIVE' - and pt.propertyid not in (select consumercode from egcl_bill where tenantid=$tenantid and businessservice='PT' and id in (select billid from egcl_billdetial where tenantid=$tenantid and concat(to_char((To_timestamp(fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) ='2020-21')) - groupby: group by pt.propertyid - - reportName: ULBDEFAULTERPTREPORT_MINI_STATE_V2 - decryptionPathId: ULBDEFAULTERPTREPORT_V2 - summary: ULB Defaulter Pt report - version: 1.0.0 - moduleName: rainmaker-pt - sourceColumns: - - name: propertytaxuniqueid - label: reports.pt.propertytaxuniqueid - type: string - source: pt - total: false - - name: existingpropertyid - label: reports.pt.existingpropertyid - type: string - source: pt - total: false - - name: ownername - label: reports.pt.ownername - type: string - source: pt - total: false - - name: propertytype - label: reports.pt.propertytype - type: string - source: pt - total: false - - name: mobileno - label: reports.pt.mobileno - type: string - source: pt - total: false - - name: address - label: reports.pt.address - type: string - source: pt - total: false - searchParams: - - name: ulb - label: ULB - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name - source: pt - wrapper: true - isMandatory: false - searchClause: AND tenantid = $ulb - query: > - --S.no Service Name ULB Property Tax Unique ID Date Of - Transcation Receipt Number Existing Property ID Type Of - Property Mobile Number Address - with eg_pt_unit_v2_ot as ( - select - propertyid, - string_agg(distinct pu.occupancytype, ',') as occupancytype, - --string_agg(distinct coalesce(usagecategory), ',') as propertytype - string_agg(distinct Initcap(case when usagecategory like '%.%' then split_part(usagecategory,'.',2) else usagecategory end),',') as propertytype - from eg_pt_unit as pu - where pu.tenantid = $ulb - group by propertyid - ) - select - --distinct on (payd.receiptnumber) - --initcap(split_part(payd.tenantid, '.', 2)) as "ulb", - --split_part(consumercode, ':', 1) as "propertytaxuniqueid", - --to_char((To_timestamp(payd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS "transcationdate", - --payd.receiptnumber as "receiptnumber", - pt.propertyid as "propertytaxuniqueid", - string_agg(pt.oldpropertyid,',') as "existingpropertyid", - --concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) AS "financialyear", - split_part(string_agg(eu."name",','),',',1) as "ownername", - --eu.guardian as "guardianname", - string_agg(pot.propertytype,',') as "propertytype", - split_part(string_agg(eu.mobilenumber,','),',',1) as "mobileno", - string_agg(distinct REGEXP_REPLACE(REGEXP_REPLACE(CONCAT(pta.doorno, ',', pta.buildingname, ',',pta.street,',', pta.pincode), ',+', ','), '^,|,$', ''),',') as "address" - from eg_pt_property pt - --inner join egcl_payment as payment on payment.id = payd.paymentid - --inner join egcl_bill as bill on bill.id = payd.billid - --inner join egcl_billdetial as billd on billd.billid=bill.id - --inner join as pt on pt.propertyid = bill.consumercode - inner join eg_pt_owner as po on po.propertyid = pt.id and po.status='ACTIVE' - inner join eg_user as eu on eu.uuid = po.userid - inner join eg_pt_address as pta on pta.propertyid = pt.id - inner join eg_pt_unit_v2_ot as pot on pot.propertyid = pt.id - where pt.tenantid = $ulb - --and bill.consumercode not in (select consumercode from egcl_bill where tenantid=$ulb and businessservice='PT' and id in (select billid from egcl_billdetial where tenantid=$ulb and concat(to_char((To_timestamp(fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) ='2020-21')) - and pt.status!='INACTIVE' - and pt.propertyid not in (select consumercode from egcl_bill where tenantid=$ulb and businessservice='PT' and id in (select billid from egcl_billdetial where tenantid=$ulb and concat(to_char((To_timestamp(fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) ='2020-21')) - groupby: group by pt.propertyid - - reportName: ZoneFYReport_V2 - summary: Zone FY Collection - version: 1.0.0 - moduleName: rainmaker-pt - sourceColumns: - - name: zonecode - label: reports.pt.zonename - type: string - source: pt - total: false - - name: 2013_14PTR - label: reports.pt.2013_14_PTR - type: string - source: pt - total: true - - name: 2013_14Collection - label: reports.pt.2013_14Collection - type: string - source: pt - total: true - - name: 2014_15PTR - label: reports.pt.2014_15_PTR - type: string - source: pt - total: true - - name: 2014_15Collection - label: reports.pt.2014_15Collection - type: string - source: pt - total: true - - name: 2015_16PTR - label: reports.pt.2015_16_PTR - type: string - source: pt - total: true - - name: 2015_16Collection - label: reports.pt.2015_16Collection - type: string - source: pt - total: true - - name: 2016_17PTR - label: reports.pt.2016_17_PTR - type: string - source: pt - total: true - - name: 2016_17Collection - label: reports.pt.2016_17Collection - type: string - source: pt - total: true - - name: 2017_18PTR - label: reports.pt.2017_18_PTR - type: string - source: pt - total: true - - name: 2017_18Collection - label: reports.pt.2017_18Collection - type: string - source: pt - total: true - - name: 2018_19PTR - label: reports.pt.2018_19_PTR - type: string - source: pt - total: true - - name: 2018_19Collection - label: reports.pt.2018_19Collection - type: string - source: pt - total: true - - name: 2019_20PTR - label: reports.pt.2019_20_PTR - type: string - source: pt - total: true - - name: 2019_20Collection - label: reports.pt.2019_20Collection - type: string - source: pt - total: true - - name: 2020_21PTR - label: reports.pt.2020_21_PTR - type: string - source: pt - total: true - - name: 2020_21Collection - label: reports.pt.2020_21Collection - type: string - source: pt - total: true - - name: totalptr - label: reports.pt.totalptr - type: string - source: pt - total: true - - name: totalcollection - label: reports.pt.totalcollection - type: string - source: pt - total: true - searchParams: - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: true - searchClause: AND 1=1 - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: true - searchClause: AND 1=1 - query: > - --S.no Service Name ULB Property Tax Unique ID Date Of - Transcation Receipt Number Existing Property ID Type Of Property - Mobile Number Address - with fy2013 as - ( - SELECT - zonecode, - sum(payment.totalamountpaid) as amount, - count(payment.totalamountpaid) as totalcount, - concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear - FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, - (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr - INNER JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality and eg_bndry_mohalla.tenantid=$tenantid - where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid - and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id - and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY'))='2013-14' - and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate - GROUP BY financialyear,zonecode - - ), - fy2014 as - ( - SELECT - zonecode, - sum(payment.totalamountpaid) as amount, - count(payment.totalamountpaid) as totalcount, - concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear - FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, - (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr - INNER JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality and eg_bndry_mohalla.tenantid=$tenantid - where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid - and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id - and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY'))='2014-15' - and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate - GROUP BY financialyear,zonecode - ), - fy2015 as - ( - SELECT - zonecode, - sum(payment.totalamountpaid) as amount, - count(payment.totalamountpaid) as totalcount, - concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear - FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, - (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr - INNER JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality and eg_bndry_mohalla.tenantid=$tenantid - where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid - and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id - and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY'))='2015-16' - and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate - GROUP BY financialyear,zonecode - ), - fy2016 as - ( - SELECT - zonecode, - sum(payment.totalamountpaid) as amount, - count(payment.totalamountpaid) as totalcount, - concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear - FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, - (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr - inner JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality - where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid - and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id - and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY'))='2016-17' - and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate - GROUP BY financialyear,zonecode - ), - fy2017 as - ( - SELECT - zonecode, - sum(payment.totalamountpaid) as amount, - count(payment.totalamountpaid) as totalcount, - concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear - FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, - (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr - INNER JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality and eg_bndry_mohalla.tenantid=$tenantid - where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid - and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id - and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY'))='2017-18' - and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate - GROUP BY financialyear,zonecode - ), - fy2018 as - ( - SELECT - zonecode, - sum(payment.totalamountpaid) as amount, - count(payment.totalamountpaid) as totalcount, - concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear - FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, - (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr - INNER JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality and eg_bndry_mohalla.tenantid=$tenantid - where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid - and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id - and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY'))='2018-19' - and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate - GROUP BY financialyear,zonecode - ), - fy2019 as - ( - SELECT - zonecode, - sum(payment.totalamountpaid) as amount, - count(payment.totalamountpaid) as totalcount, - concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear - FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, - (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr - INNER JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality and eg_bndry_mohalla.tenantid=$tenantid - where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid - and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id - and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY'))='2019-20' - and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate - GROUP BY financialyear,zonecode - ), - fy2020 as - ( - SELECT - zonecode, - sum(payment.totalamountpaid) as amount, - count(payment.totalamountpaid) as totalcount, - concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear - FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, - (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr - INNER JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality and eg_bndry_mohalla.tenantid=$tenantid - where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid - and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id - and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY'))='2020-21' - and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate - GROUP BY financialyear,zonecode - ), - zones as - ( - select zonecode,string_agg(distinct zonename,',') as zname from eg_bndry_mohalla where tenantid=$tenantid group by zonecode - ) - SELECT - zones.zonecode as zonecode, - zones.zname as zonename, - coalesce(fy2013.totalcount,0) as "2013_14PTR", - coalesce(fy2013.amount,0) as "2013_14Collection", - coalesce(fy2014.totalcount,0) as "2014_15PTR", - coalesce(fy2014.amount,0) as "2014_15Collection", - coalesce(fy2015.totalcount,0) as "2015_16PTR", - coalesce(fy2015.amount,0) as "2015_16Collection", - coalesce(fy2016.totalcount,0) as "2016_17PTR", - coalesce(fy2016.amount,0) as "2016_17Collection", - coalesce(fy2017.totalcount,0) as "2017_18PTR", - coalesce(fy2017.amount,0) as "2017_18Collection", - coalesce(fy2018.totalcount,0) as "2018_19PTR", - coalesce(fy2018.amount,0) as "2018_19Collection", - coalesce(fy2019.totalcount,0) as "2019_20PTR", - coalesce(fy2019.amount,0) as "2019_20Collection", - coalesce(fy2020.totalcount,0) as "2020_21PTR", - coalesce(fy2020.amount,0) as "2020_21Collection", - coalesce(fy2013.totalcount,0)+coalesce(fy2014.totalcount,0)+coalesce(fy2015.totalcount,0)+coalesce(fy2016.totalcount,0)+coalesce(fy2017.totalcount,0)+coalesce(fy2018.totalcount,0)+coalesce(fy2019.totalcount,0)+coalesce(fy2020.totalcount,0) as "totalptr", - coalesce(fy2013.amount,0)+coalesce(fy2014.amount,0)+coalesce(fy2015.amount,0)+coalesce(fy2016.amount,0)+coalesce(fy2017.amount,0)+coalesce(fy2018.amount,0)+coalesce(fy2019.amount,0)+coalesce(fy2020.amount,0) as "totalcollection" - from zones - left outer join fy2013 on fy2013.zonecode=zones.zonecode - left outer join fy2014 on fy2014.zonecode=zones.zonecode - left outer join fy2015 on fy2015.zonecode=zones.zonecode - left outer join fy2016 on fy2016.zonecode=zones.zonecode - left outer join fy2017 on fy2017.zonecode=zones.zonecode - left outer join fy2018 on fy2018.zonecode=zones.zonecode - left outer join fy2019 on fy2019.zonecode=zones.zonecode - left outer join fy2020 on fy2020.zonecode=zones.zonecode - where 1=1 - orderby: order by zonename - - reportName: BlockFYReport_V2 - summary: Block FY Collection - version: 1.0.0 - moduleName: rainmaker-pt - sourceColumns: - - name: blockname - label: reports.pt.blockname - type: string - source: pt - total: false - - name: 2013_14PTR - label: reports.pt.2013_14_PTR - type: string - source: pt - total: true - - name: 2013_14Collection - label: reports.pt.2013_14Collection - type: string - source: pt - total: true - - name: 2014_15PTR - label: reports.pt.2014_15_PTR - type: string - source: pt - total: true - - name: 2014_15Collection - label: reports.pt.2014_15Collection - type: string - source: pt - total: true - - name: 2015_16PTR - label: reports.pt.2015_16_PTR - type: string - source: pt - total: true - - name: 2015_16Collection - label: reports.pt.2015_16Collection - type: string - source: pt - total: true - - name: 2016_17PTR - label: reports.pt.2016_17_PTR - type: string - source: pt - total: true - - name: 2016_17Collection - label: reports.pt.2016_17Collection - type: string - source: pt - total: true - - name: 2017_18PTR - label: reports.pt.2017_18_PTR - type: string - source: pt - total: true - - name: 2017_18Collection - label: reports.pt.2017_18Collection - type: string - source: pt - total: true - - name: 2018_19PTR - label: reports.pt.2018_19_PTR - type: string - source: pt - total: true - - name: 2018_19Collection - label: reports.pt.2018_19Collection - type: string - source: pt - total: true - - name: 2019_20PTR - label: reports.pt.2019_20_PTR - type: string - source: pt - total: true - - name: 2019_20Collection - label: reports.pt.2019_20Collection - type: string - source: pt - total: true - - name: 2020_21PTR - label: reports.pt.2020_21_PTR - type: string - source: pt - total: true - - name: 2020_21Collection - label: reports.pt.2020_21Collection - type: string - source: pt - total: true - - name: totalptr - label: reports.pt.totalptr - type: string - source: pt - total: true - - name: totalcollection - label: reports.pt.totalcollection - type: string - source: pt - total: true - searchParams: - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: true - searchClause: AND 1=1 - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: true - searchClause: AND 1=1 - query: > - --S.no Service Name ULB Property Tax Unique ID Date Of - Transcation Receipt Number Existing Property ID Type Of Property - Mobile Number Address - with fy2013 as - ( - SELECT - blockcode, - sum(payment.totalamountpaid) as amount, - count(payment.totalamountpaid) as totalcount, - concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY')) as financialyear - FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, - (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr - INNER JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality and eg_bndry_mohalla.tenantid=$tenantid - where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid - and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id - and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY'))='2013-14' - and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate - GROUP BY financialyear,blockcode - - ), - fy2014 as - ( - SELECT - blockcode, - sum(payment.totalamountpaid) as amount, - count(payment.totalamountpaid) as totalcount, - concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY')) as financialyear - FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, - (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr - INNER JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality and eg_bndry_mohalla.tenantid=$tenantid - where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid - and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id - and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY'))='2014-15' - and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate - GROUP BY financialyear,blockcode - ), - fy2015 as - ( - SELECT - blockcode, - sum(payment.totalamountpaid) as amount, - count(payment.totalamountpaid) as totalcount, - concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY')) as financialyear - FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, - (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr - INNER JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality and eg_bndry_mohalla.tenantid=$tenantid - where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid - and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id - and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY'))='2015-16' - and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate - GROUP BY financialyear,blockcode - ), - fy2016 as - ( - SELECT - blockcode, - sum(payment.totalamountpaid) as amount, - count(payment.totalamountpaid) as totalcount, - concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY')) as financialyear - FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, - (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr - inner JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality - where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid - and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id - and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY'))='2016-17' - and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate - GROUP BY financialyear,blockcode - ), - fy2017 as - ( - SELECT - blockcode, - sum(payment.totalamountpaid) as amount, - count(payment.totalamountpaid) as totalcount, - concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY')) as financialyear - FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, - (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr - INNER JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality and eg_bndry_mohalla.tenantid=$tenantid - where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid - and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id - and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY'))='2017-18' - and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate - GROUP BY financialyear,blockcode - ), - fy2018 as - ( - SELECT - blockcode, - sum(payment.totalamountpaid) as amount, - count(payment.totalamountpaid) as totalcount, - concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY')) as financialyear - FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, - (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr - INNER JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality and eg_bndry_mohalla.tenantid=$tenantid - where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid - and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id - and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY'))='2018-19' - and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate - GROUP BY financialyear,blockcode - ), - fy2019 as - ( - SELECT - blockcode, - sum(payment.totalamountpaid) as amount, - count(payment.totalamountpaid) as totalcount, - concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY')) as financialyear - FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, - (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr - INNER JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality and eg_bndry_mohalla.tenantid=$tenantid - where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid - and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id - and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY'))='2019-20' - and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate - GROUP BY financialyear,blockcode - ), - fy2020 as - ( - SELECT - blockcode, - sum(payment.totalamountpaid) as amount, - count(payment.totalamountpaid) as totalcount, - concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY')) as financialyear - FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, - (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr - INNER JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality and eg_bndry_mohalla.tenantid=$tenantid - where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid - and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id - and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY'))='2020-21' - and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate - GROUP BY financialyear,blockcode - ), - blocks as - ( - select blockcode,string_agg(distinct blockname,',') as zname from eg_bndry_mohalla where tenantid=$tenantid group by blockcode - ) - SELECT - blocks.blockcode as blockcode, - blocks.zname as blockname, - coalesce(fy2013.totalcount,0) as "2013_14PTR", - coalesce(fy2013.amount,0) as "2013_14Collection", - coalesce(fy2014.totalcount,0) as "2014_15PTR", - coalesce(fy2014.amount,0) as "2014_15Collection", - coalesce(fy2015.totalcount,0) as "2015_16PTR", - coalesce(fy2015.amount,0) as "2015_16Collection", - coalesce(fy2016.totalcount,0) as "2016_17PTR", - coalesce(fy2016.amount,0) as "2016_17Collection", - coalesce(fy2017.totalcount,0) as "2017_18PTR", - coalesce(fy2017.amount,0) as "2017_18Collection", - coalesce(fy2018.totalcount,0) as "2018_19PTR", - coalesce(fy2018.amount,0) as "2018_19Collection", - coalesce(fy2019.totalcount,0) as "2019_20PTR", - coalesce(fy2019.amount,0) as "2019_20Collection", - coalesce(fy2020.totalcount,0) as "2020_21PTR", - coalesce(fy2020.amount,0) as "2020_21Collection", - coalesce(fy2013.totalcount,0)+coalesce(fy2014.totalcount,0)+coalesce(fy2015.totalcount,0)+coalesce(fy2016.totalcount,0)+coalesce(fy2017.totalcount,0)+coalesce(fy2018.totalcount,0)+coalesce(fy2019.totalcount,0)+coalesce(fy2020.totalcount,0) as "totalptr", - coalesce(fy2013.amount,0)+coalesce(fy2014.amount,0)+coalesce(fy2015.amount,0)+coalesce(fy2016.amount,0)+coalesce(fy2017.amount,0)+coalesce(fy2018.amount,0)+coalesce(fy2019.amount,0)+coalesce(fy2020.amount,0) as "totalcollection" - from blocks - left outer join fy2013 on fy2013.blockcode=blocks.blockcode - left outer join fy2014 on fy2014.blockcode=blocks.blockcode - left outer join fy2015 on fy2015.blockcode=blocks.blockcode - left outer join fy2016 on fy2016.blockcode=blocks.blockcode - left outer join fy2017 on fy2017.blockcode=blocks.blockcode - left outer join fy2018 on fy2018.blockcode=blocks.blockcode - left outer join fy2019 on fy2019.blockcode=blocks.blockcode - left outer join fy2020 on fy2020.blockcode=blocks.blockcode - where 1=1 - orderby: order by blockname - - reportName: StatusReport_V2 - decryptionPathId: StatusReport_V2 - summary: Status Report - version: 1.0.0 - moduleName: rainmaker-pt - additionalConfig: - print: - pdfPageSize: A1 - sourceColumns: - - name: propertyid - label: reports.pt.propertyid - type: string - source: pt - total: false - - name: applicationnumber - label: reports.pt.applicationnumber - type: string - source: pt - total: false - - name: usagecategory - label: reports.pt.usagecategory - type: string - source: pt - total: false - - name: financialyear - label: reports.pt.financialyear - type: string - source: pt - total: false - - name: createdtime - label: reports.pt.createdtime - type: string - source: pt - total: false - - name: createdby - label: reports.pt.createdby - type: string - source: pt - total: false - - name: zone - label: reports.pt.zone - type: string - source: pt - total: false - - name: block - label: reports.pt.block - type: string - source: pt - total: false - - name: localityname - label: reports.pt.localityname - type: string - source: pt - total: false - - name: totalamount - label: reports.pt.totalamount - type: string - source: pt - total: false - - name: approvedby - label: reports.pt.approvedby - type: string - source: pt - total: false - - name: address - label: reports.pt.address - type: string - source: pt - total: false - - name: status - label: reports.pt.status - type: string - source: pt - total: false - searchParams: - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: true - searchClause: AND propety.createdtime >= $fromDate - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: true - searchClause: AND propety.createdtime <= $toDate - query: > - -- Use CTE to force query plan, compute & use CTE later - - SELECT - propety.propertyid, propety.acknowldgementnumber as applicationnumber, propety.usagecategory, - to_char((To_timestamp(propety.createdtime/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS createdtime, - (case when eu.name is null then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else eu.name end) AS createdby, - localnames.zonecode AS zone, localnames.blockcode AS block, localnames.localityname AS localityname, - REGEXP_REPLACE(REGEXP_REPLACE(CONCAT(pta.doorno, ',', pta.buildingname, ',',pta.street,',', pta.pincode), ',+', ','), '^,|,$', '') as "address", pt_detail.financialyear, propety.status, bill.totalamount, - (case when propety.status = 'INWORKFLOW' then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else euser.name end) as approvedby - FROM eg_pt_property as propety - Left outer join eg_user as eu on eu.uuid = propety.createdby - Left outer join eg_user as euser on euser.uuid = propety.lastmodifiedby - Left outer join eg_pt_address as pta on pta.propertyid = propety.id - INNER join eg_pt_propertydetail_v2 pt_detail ON pt_detail.property = propety.propertyid - Left outer join egcl_bill as bill on bill.consumercode = propety.propertyid - Left outer join eg_bndry_mohalla as localnames on pta.locality=localnames.localitycode - WHERE propety.tenantid=$tenantid AND propety.acknowldgementnumber NOTNULL AND propety.status='ACTIVE' - orderby: ORDER BY propety.createdtime DESC; - - reportName: PendingPTApplicationsReport - summary: ULB-wise PT Collection - version: 1.0.0 - moduleName: rainmaker-pt - sourceColumns: - - name: tenantid - label: reports.pt.tenantid - type: string - source: pt - total: false - - name: propertyid - label: reports.pt.propertyid - type: string - source: pt - total: false - - name: applicationnumber - label: reports.pt.applicationnumber - type: string - source: pt - total: false - - name: oldpropertyid - label: reports.pt.oldpropertyid - type: string - source: pt - total: false - - name: status - label: reports.pt.status - type: string - source: pt - total: false - - name: propertytype - label: reports.pt.propertytype - type: string - source: pt - total: false - - name: usagecategory - label: reports.pt.usagecategory - type: string - source: pt - total: false - - name: channel - label: reports.pt.channel - type: string - source: pt - total: false - - name: createdon - label: reports.pt.createdon - type: string - source: pt - total: false - query: > - select - tenantid, - propertyid, - acknowldgementnumber as applicationnumber, - oldpropertyid, - status, - propertytype, - usagecategory, - channel, - to_char((To_timestamp(createdtime/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') as createdon - from eg_pt_property where status='INWORKFLOW' and tenantid=$tenantid - - reportName: ULBDEFAULTERPTREPORT_NEW_V2 - decryptionPathId: ULBDEFAULTERPTREPORT_V2 - summary: ULB Defaulter Pt report - version: 1.0.0 - moduleName: rainmaker-pt - sourceColumns: - - name: propertytaxuniqueid - label: reports.pt.propertytaxuniqueid - type: string - source: pt - total: false - - name: existingpropertyid - label: reports.pt.existingpropertyid - type: string - source: pt - total: false - - name: amountcollected - label: reports.pt.amountcollected - type: string - source: pt - total: true - - name: ownername - label: reports.pt.ownername - type: string - source: pt - total: false - - name: propertytype - label: reports.pt.propertytype - type: string - source: pt - total: false - - name: mobileno - label: reports.pt.mobileno - type: string - source: pt - total: false - - name: address - label: reports.pt.address - type: string - source: pt - total: false - query: > - --S.no Service Name ULB Property Tax Unique ID Date Of - Transcation Receipt Number Existing Property ID Type Of - Property Mobile Number Address - - with props as - (select - pt.propertyid as "propertytaxuniqueid", - string_agg(collection.finyear, ', ') as "financailyear" , - string_agg(collection.taxpaid::varchar, ', ') as "amountcollected" , - string_agg(pt.oldpropertyid,',') as "existingpropertyid", - split_part(string_agg(eu."name",','),',',1) as "ownername", - string_agg(pot.propertytype,',') as "propertytype", - split_part(string_agg(eu.mobilenumber,','),',',1) as "mobileno", - string_agg(distinct REGEXP_REPLACE(REGEXP_REPLACE(CONCAT(pta.doorno, ',', pta.buildingname, ',',pta.street,',',pta.localityname,',', pta.pincode), ',+', ','), '^,|,$', ''),',') as "address" - from eg_pt_property pt - inner join (select a.consumercode, to_char((To_timestamp(a.taxperiodfrom/1000) at time Zone 'Asia/Kolkata'),'YYYY')||'-'||to_char((To_timestamp(a.taxperiodfrom/1000) at time Zone 'Asia/Kolkata'),'YYYY')::int+1 as finyear, a.tax, a.taxpaid from (select d.consumercode, d.taxperiodfrom, sum(dd.taxamount) tax, sum(dd.collectionamount) as taxpaid - from egbs_demanddetail_v1 dd, egbs_demand_v1 d - where dd.demandid=d.id - and d.status!='CANCELLED' and dd.tenantid='pb.amritsar' and d.tenantid='pb.amritsar' - group by d.consumercode, d.taxperiodfrom - having sum(dd.taxamount - dd.collectionamount)=0) a, - (select d.consumercode, max(d.taxperiodfrom) maxperiod - from egbs_demanddetail_v1 dd, egbs_demand_v1 d - where dd.demandid=d.id - and d.status!='CANCELLED' and dd.tenantid='pb.amritsar' and d.tenantid='pb.amritsar' - group by d.consumercode - having sum(dd.taxamount - dd.collectionamount)=0) b - where a.consumercode=b.consumercode and a.taxperiodfrom=b.maxperiod - ) collection ON collection.consumercode = pt.propertyid - inner join (SELECT DISTINCT ON (propertyid) propertyid ,name as name , mobilenumber - FROM eg_pt_owner , eg_user - WHERE uuid = userid - AND status = 'ACTIVE' - AND active = true ) eu ON pt.id=eu.propertyid - inner join (SELECT propertyid , locality,doorno,street,buildingname,pincode,localityname, max(createdtime) - from eg_pt_address inner join eg_bndry_mohalla on eg_bndry_mohalla.localitycode=locality where eg_pt_address.tenantid='pb.amritsar' - group by propertyid, locality, doorno,street,buildingname,pincode,localityname) pta ON pt.id=pta.propertyid - inner join (select propertyid, - string_agg(distinct pu.occupancytype, ',') as occupancytype, - string_agg(distinct Initcap(case when usagecategory like '%.%' then split_part(usagecategory,'.',2) else usagecategory end),',') as propertytype - from eg_pt_unit as pu - where pu.tenantid = 'pb.amritsar' - group by propertyid) pot ON pot.propertyid = pt.id - where pt.tenantid = 'pb.amritsar' - and pt.status!='INACTIVE' - and pt.propertyid not in ( - select consumercode from egcl_bill - where tenantid='pb.amritsar' - and businessservice='PT' - and id in (select billid - from egcl_billdetial - where tenantid='pb.amritsar' and concat(to_char((To_timestamp(fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) ='2020-21')) - group by pt.propertyid - ), - prop2019 as - ( - select - oldpropertyid as oldpropertyid, - pt.propertyid as propertyid - from eg_pt_property pt - inner join eg_pt_assessment as assessment on assessment.propertyid=pt.propertyid and assessment.assessmentyear='2019-20' and assessment.tenantid='pb.amritsar' - where pt.tenantid='pb.amritsar' - group by pt.propertyid,oldpropertyid - ) - select * from props - where propertytaxuniqueid not in (select propertyid from prop2019 where oldpropertyid in (select concat('RID',previous_returnid) from amritsar_ikon_2020_21_non_migrated_records)) - - reportName: ULBPTData - decryptionPathId: ULBPTDataDumpReport_V2 - summary: ULB-wise PT Data - version: 1.0.0 - moduleName: rainmaker-pt - sourceColumns: - - name: propertyid - label: reports.pt.propertyId - type: string - source: pt - total: false - - name: ownername - label: reports.pt.ownername - type: string - source: pt - total: false - - name: guardianname - label: reports.pt.guardianname - type: string - source: pt - total: false - - name: mobileno - label: reports.pt.mobileno - type: string - source: pt - total: false - - name: useruuid - label: reports.pt.useruuid - type: string - source: pt - total: false - searchParams: - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: true - searchClause: AND pt.createdtime >= $fromDate - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: true - searchClause: AND pt.createdtime <= $toDate - query: > - select pt.propertyid as propertyid, u.name as ownername, u.guardian as - guardianname, u.mobilenumber as mobileno, u.uuid as useruuid from - eg_pt_property pt, eg_pt_owner po, eg_user u where pt.id=po.propertyid and - po.userid=u.uuid and pt.tenantid=$tenantid - orderby: ORDER BY pt.propertyid DESC NULLS LAST - - reportName: PT_DEFAULTER_REPORT_V2 - decryptionPathId: ULBDEFAULTERPTREPORT_V2 - summary: ULB_PT_DEFAULTER - version: 1.0.0 - moduleName: rainmaker-pt - sourceColumns: - - name: propertyid - label: reports.pt.propertyId - type: string - source: pt - total: false - - name: oldpropertyid - label: reports.pt.oldpropertyId - type: string - source: pt - total: false - - name: businessname - label: reports.pt.busnessname - type: string - source: pt - total: false - - name: financialyear - label: reports.pt.financialyear - type: string - source: pt - total: false - - name: latestfy - label: reports.pt.latestfy - type: string - source: pt - total: false - - name: max_pt_tax - label: reports.pt.max_pt_tax - type: string - source: pt - total: true - - name: max_paid - label: reports.pt.max_paid - type: string - source: pt - total: true - - name: propertytype - label: reports.pt.propertytype - type: string - source: pt - total: false - - name: propertyusagetype - label: reports.pt.propertyusagetype - type: string - source: pt - total: false - - name: address - label: reports.pt.address - type: string - source: pt - total: false - - name: block - label: reports.pt.block - type: string - source: pt - total: false - - name: ownername - label: reports.pt.ownername - type: string - source: pt - total: false - - name: mobileno - label: reports.pt.mobileno - type: string - source: pt - total: false - query: > - with assessments as - - ( - select - propertyid, - string_agg(concat(assessmentyears,'(Rs.',totalamount,')'),',') as fy, - max(assessmentyears) as latest_fy, - max(totalamount) as maxtotal, - max(propertytax) as max_pt_tax - from report_assessments - where tenantid=$tenantid - and propertyid not in (select propertyid from report_assessments where tenantid=$tenantid and assessmentyears ='2020-21') - group by propertyid - ), - - owners as - - ( - select - split_part(string_agg(ownername,','),',',1) as ownername, - split_part(string_agg(mobileNumber,','),',',1) as mobileNumber, - propertyid - from report_owners - group by propertyid - ) - - select - assessments.propertyid as propertyid, - props.oldpropertyid as oldpropertyid, - props.firmbusinessname as businessname, - assessments.fy as financialyear, - assessments.latest_fy as latestfy, - assessments.max_pt_tax as max_pt_tax, - assessments.maxtotal as max_paid, - props.propertytype as propertytype, - propertyusagetype as propertyusagetype, - concat(address,' ',localityname) as address, - blockcode as block, - owners.ownername as ownername, - owners.mobileNumber as mobileno - from report_properties props - - inner join assessments on assessments.propertyid=props.propertyid - - inner join owners on owners.propertyid=props.propertyid - - reportName: DAILY_CHALLAN_REPORT - summary: Daily Challan Report - version: 1.0.0 - moduleName: rainmaker-pt - sourceColumns: - - name: paymentmode - label: reports.pt.paymentmode - type: string - source: pt - total: false - - name: amount - label: reports.pt.amount - type: string - source: pt - total: true - - name: nos - label: reports.pt.nos - type: string - source: pt - total: true - - name: firecess - label: reports.pt.firecess - type: string - source: pt - total: true - - name: cancercess - label: reports.pt.cancercess - type: string - source: pt - total: true - - name: total - label: reports.pt.total - type: string - source: pt - total: true - searchParams: - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: true - searchClause: AND 1=1 - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: true - searchClause: AND 1=1 - query: > - --S.no Service Name ULB Property Tax Unique ID Date Of - Transcation Receipt Number Existing Property ID Type Of - Property Mobile Number Addr - - with paidbills as - - ( - SELECT - --sum(payment.totalamountpaid) as totalamount, - bd.billid as billid, - sum(bd.amountpaid) as totalamount, - count(distinct bd.billid) as totalcount, - sum(case when bad.taxheadcode='PT_FIRE_CESS' then bad.amount else 0 end) as "totalfirecess", - sum(case when bad.taxheadcode='PT_CANCER_CESS' then bad.amount else 0 end) as "totalcancercess", - sum(case when payment.paymentmode='ONLINE' then bd.amountpaid else 0 end) as "online", - sum(case when payment.paymentmode='ONLINE' and bad.taxheadcode='PT_FIRE_CESS' then bad.amount else 0 end) as "firecess_online", - sum(case when payment.paymentmode='ONLINE' and bad.taxheadcode='PT_CANCER_CESS' then bad.amount else 0 end) as "cancercess_online", - count(distinct case when payment.paymentmode='ONLINE' then bd.billid else NULL end) as "countonline", - sum(case when payment.paymentmode='CASH' then bd.amountpaid else 0 end) as "cash", - sum(case when payment.paymentmode='CASH' and bad.taxheadcode='PT_FIRE_CESS' then bad.amount else 0 end) as "firecess_cash", - sum(case when payment.paymentmode='CASH' and bad.taxheadcode='PT_CANCER_CESS' then bad.amount else 0 end) as "cancercess_cash", - count(distinct case when payment.paymentmode='CASH' then bd.billid else NULL end) as "countcash", - sum(case when payment.paymentmode='CHEQUE' then bd.amountpaid else 0 end) as "cheque", - sum(case when payment.paymentmode='CHEQUE' and bad.taxheadcode='PT_FIRE_CESS' then bad.amount else 0 end) as "firecess_cheque", - sum(case when payment.paymentmode='CHEQUE' and bad.taxheadcode='PT_CANCER_CESS' then bad.amount else 0 end) as "cancercess_cheque", - count(distinct case when payment.paymentmode='CHEQUE' then bd.billid else NULL end) as "countcheque", - sum(case when payment.paymentmode='DD' then bd.amountpaid else 0 end) as "dd", - sum(case when payment.paymentmode='DD' and bad.taxheadcode='PT_FIRE_CESS' then bad.amount else 0 end) as "firecess_dd", - sum(case when payment.paymentmode='DD' and bad.taxheadcode='PT_CANCER_CESS' then bad.amount else 0 end) as "cancercess_dd", - count(distinct case when payment.paymentmode='DD' then bd.billid else NULL end) as "countdd", - sum(case when payment.paymentmode='CARD' then bd.amountpaid else 0 end) as "card", - sum(case when payment.paymentmode='CARD' and bad.taxheadcode='PT_FIRE_CESS' then bad.amount else 0 end) as "firecess_card", - sum(case when payment.paymentmode='CARD' and bad.taxheadcode='PT_CANCER_CESS' then bad.amount else 0 end) as "cancercess_card", - count(distinct case when payment.paymentmode='CARD' then bd.billid else NULL end) as "countcard", - sum(case when payment.paymentmode='OFFLINE_RTGS' then bd.amountpaid else 0 end) as "rtgs", - sum(case when payment.paymentmode='OFFLINE_RTGS' and bad.taxheadcode='PT_FIRE_CESS' then bad.amount else 0 end) as "firecess_rtgs", - sum(case when payment.paymentmode='OFFLINE_RTGS' and bad.taxheadcode='PT_CANCER_CESS' then bad.amount else 0 end) as "cancercess_rtgs", - count(distinct case when payment.paymentmode='OFFLINE_RTGS' then bd.billid else NULL end) as "countrtgs", - sum(case when payment.paymentmode='OFFLINE_NEFT' then bd.amountpaid else 0 end) as "neft", - sum(case when payment.paymentmode='OFFLINE_NEFT' and bad.taxheadcode='PT_FIRE_CESS' then bad.amount else 0 end) as "firecess_neft", - sum(case when payment.paymentmode='OFFLINE_NEFT' and bad.taxheadcode='PT_CANCER_CESS' then bad.amount else 0 end) as "cancercess_neft", - count(distinct case when payment.paymentmode='OFFLINE_NEFT' then bd.billid else NULL end) as "countneft", - sum(case when payment.paymentmode='POSTAL_ORDER' then bd.amountpaid else 0 end) as "po", - sum(case when payment.paymentmode='POSTAL_ORDER' and bad.taxheadcode='PT_FIRE_CESS' then bad.amount else 0 end) as "firecess_po", - sum(case when payment.paymentmode='POSTAL_ORDER' and bad.taxheadcode='PT_CANCER_CESS' then bad.amount else 0 end) as "cancercess_po", - count(distinct case when payment.paymentmode='POTAL_ORDER' then bd.billid else NULL end) as "countpo" - FROM egcl_paymentdetail as pd - inner join egcl_payment payment on pd.paymentid=payment.id and payment.paymentstatus != 'CANCELLED' - inner join egcl_billdetial bd on bd.billid=pd.billid - inner join egcl_billaccountdetail bad on bad.billdetailid=bd.id - where pd.businessservice='PT' and payment.tenantid=$tenantid and payment.createdtime>=$fromDate and payment.createdtime<=$toDate - group by bd.billid - ) - select - 'ONLINE' as paymentmode, - sum(online)-sum(firecess_online)-sum(cancercess_online) as amount, - sum(countonline) as nos, - sum(firecess_online) as firecess, - sum(cancercess_online) as cancercess, - sum(online) as total - from paidbills - union - select - 'CASH' as paymentmode, - sum(cash)-sum(firecess_cash)-sum(cancercess_cash), - sum(countcash), - sum(firecess_cash), - sum(cancercess_cash), - sum(cash) - from paidbills - union - select - 'DD' as paymentmode, - sum(dd)-sum(firecess_dd)-sum(cancercess_dd), - sum(countdd), - sum(firecess_dd), - sum(cancercess_dd), - sum(dd) - from paidbills - union - select 'CARD', - sum(card)-sum(firecess_card)-sum(cancercess_card), - sum(countcard), - sum(firecess_card), - sum(cancercess_card), - sum(card) - from paidbills - union - select 'RTGS', - sum(rtgs)-sum(firecess_rtgs)-sum(cancercess_rtgs), - sum(countrtgs), - sum(firecess_rtgs), - sum(cancercess_rtgs), - sum(rtgs) - from paidbills - union - select'CHEQUE', - sum(cheque)-sum(firecess_cheque)-sum(cancercess_cheque), - sum(countcheque), - sum(firecess_cheque), - sum(cancercess_cheque), - sum(cheque) - from paidbills - union - select 'NEFT', - sum(neft)-sum(firecess_neft)-sum(cancercess_neft), - sum(countneft), - sum(firecess_neft), - sum(cancercess_neft), - sum(neft) - from paidbills - union - select 'PO', - sum(po)-sum(firecess_po)-sum(cancercess_po), - sum(countpo), - sum(firecess_po), - sum(cancercess_po), - sum(po) - from paidbills where 1=1 - - reportName: CHEQUE_REPORT - summary: Cheque Report Register - version: 1.0.0 - moduleName: rainmaker-pt - additionalConfig: - print: - pdfPageSize: A1 - sourceColumns: - - name: propertyid - label: reports.pt.propertyId - type: string - source: pt - total: false - - name: receiptnumber - label: reports.pt.receiptNo - type: string - source: pt - total: false - - name: receiptdate - label: reports.pt.receiptDate - type: string - source: pt - total: false - - name: instrumenttype - label: reports.pt.paymentMode - type: string - source: pt - total: false - - name: transactionnumber - label: reports.pt.ddChequeTransactionNo - type: string - source: pt - total: false - - name: transactiondate - label: reports.pt.ddChequeTransactionDate - type: string - source: pt - total: false - - name: bankname - label: reports.pt.bankName - type: string - source: pt - total: false - - name: tax_withoutcess - label: reports.pt.taxwithoutcess - type: string - source: pt - total: true - - name: firecess - label: reports.pt.fireCess - type: string - source: pt - total: true - - name: cancercess - label: reports.pt.cancerCess - type: string - source: pt - total: true - - name: amount - label: reports.pt.amount - type: string - source: pt - total: true - searchParams: - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: true - searchClause: AND pd.receiptdate >= $fromDate - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: true - searchClause: AND pd.receiptdate <= $toDate - query: > - -- Use CTE to force query plan, compute & use CTE later - - WITH receipt_breakup AS ( - SELECT - pd.id as pdid, - SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) - +SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) - +SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) - +SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) - +SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) - +SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN bad.amount ELSE 0 END) - --SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as paidpropertytax, - +SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN bad.amount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN bad.amount ELSE 0 END) - +SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END) as tax_withoutcess, - SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, - SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess - FROM egcl_billaccountdetail as bad - INNER JOIN egcl_billdetial as bd on bd.id = bad.billdetailid - INNER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid - INNER JOIN egcl_payment as payment on pd.paymentid=payment.id - WHERE payment.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' - AND pd.receiptdate >= $fromDate AND pd.receiptdate <= $toDate - GROUP BY pdid - ) - - SELECT - pd.tenantid AS tenantid, - bill.consumercode as propertyid, - to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS receiptdate, - concat(bank_branches.bank_name,' ',bank_branches.branch) as bankname, - receiptnumber, - payment.paymentmode as instrumenttype, - payment.transactionnumber, - to_char((To_timestamp(payment.instrumentdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, - receipt_breakup.tax_withoutcess, - receipt_breakup.firecess, - receipt_breakup.cancercess, - payment.totalamountpaid as amount - FROM egcl_paymentdetail pd, egcl_payment payment left outer join bank_branches on bank_branches.ifsc=payment.ifsccode, receipt_breakup, egcl_bill bill - - where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid - - and receipt_breakup.pdid=pd.id - - and payment.paymentmode in ('CHEQUE','DD','OFFLINE_NEFT') - orderby: ORDER BY pd.receiptdate DESC - - reportName: DigitData_PT - summary: Online DigitData_PT - version: 1.0.0 - moduleName: rainmaker-pt - additionalConfig: - print: - pdfPageSize: A1 - sourceColumns: - - name: tenantid - label: reports.pt.tenant - type: string - source: pt - total: false - - name: amountpaid - label: reports.pt.amountpaid - type: string - source: pt - total: true - - name: receiptnumber - label: reports.pt.receiptnumber - type: string - source: pt - total: false - - name: receiptdate - label: reports.pt.receiptdate - type: string - source: pt - total: false - - name: businessservice - label: reports.pt.businessservice - type: string - source: pt - total: false - - name: transactionnumber - label: reports.pt.transactionnumber - type: string - source: pt - total: false - - name: paymentmode - label: reports.pt.paymentmode - type: string - source: pt - total: false - - name: instrumentnumber - label: reports.pt.instrumentnumber - type: string - source: pt - total: false - - name: paidby - label: reports.pt.paidby - type: string - source: pt - total: false - - name: txn id - label: reports.pt.txn_id - type: string - source: pt - total: false - - name: txn status - label: reports.pt.txn_status - type: string - source: pt - total: false - - name: txn status msg - label: reports.pt.txn_status_msg - type: string - source: pt - total: false - - name: gateway - label: reports.pt.gateway - type: string - source: pt - total: false - - name: product info - label: reports.pt.product_info - type: string - source: pt - total: false - - name: gatewaytxnid - label: reports.pt.gatewaytxnid - type: string - source: pt - total: false - - name: gateway payment mode - label: reports.pt.gateway_payment_mode - type: string - source: pt - total: false - - name: gateway status msg - label: reports.pt.gateway_status_msg - type: string - source: pt - total: false - searchParams: - - name: gateway - label: report.pt.gateway - type: singlevaluelist - pattern: list://Razorpay:Razorpay,Paytm:Paytm,Other:Other - source: pt - isMandatory: true - query: > - ---Use CTE to force query plan, compute & use CTE later - - select - txn.txn_id, - txn.txn_status, - txn.txn_status_msg, - txn.gateway, - txn.product_info, - txn.gateway_txn_id, - txn.gateway_payment_mode, - txn.gateway_status_msg, - pyd.tenantid, - pyd.amountpaid, - pyd.receiptnumber, - pyd.businessservice, - to_char((To_timestamp(pyd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'YYYY-MM-DD') as receiptdate, - egp.transactionnumber, - egp.paymentmode, - egp.instrumentnumber,egp.paidby - from eg_pg_transactions as txn - join egcl_payment as egp on egp.transactionnumber=txn.txn_id - - join egcl_paymentdetail as pyd on pyd.paymentid=egp.id --pyd.receiptdate>=1625097660000 and pyd.receiptdate<=1627689660000 - - where egp.paymentmode='ONLINE' and egp.tenantid= $tenantid - orderby: ORDER BY egp.transactiondate asc - - reportName: USERNAME_PT - decryptionPathId: ULBDEFAULTERPTREPORT_V2 - summary: Name User - version: 1.0.0 - moduleName: rainmaker-pt - additionalConfig: - print: - pdfPageSize: Legal - sourceColumns: - - name: ownername - label: reports.pt.ownername - type: string - source: pt - total: false - - name: guardian - label: reports.pt.guardian - type: string - source: pt - total: false - - name: mobileno - label: reports.pt.mobileno - type: string - source: pt - total: false - query: | - -- Use CTE to force query plan, compute & use CTE later - SELECT - name as ownername, - guardian, - mobilenumber as mobileno from eg_user where lower(name) like '%gurp%' diff --git a/configs/reports/configs/rainmaker-common-reports.yml b/configs/reports/configs/rainmaker-common-reports.yml deleted file mode 100644 index e13742a1..00000000 --- a/configs/reports/configs/rainmaker-common-reports.yml +++ /dev/null @@ -1,127 +0,0 @@ -ReportDefinitions: - - reportName: CollectionRegister - summary: Collection Register - version: 1.0.0 - moduleName: rainmaker-common - externalService: - - entity: $.MdmsRes.BillingService.BusinessService[*] - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=pb&moduleName=BillingService&masterName=BusinessService&filter=[?(@.type=='Adhoc')] - keyOrder: code,businessService - tableName: tbl_businessserviceList - sourceColumns: - - name: service - label: reports.common.CollectionRegister.serviceResult - type: string - source: common - total: false - - name: channel - label: reports.common.CollectionRegister.channel - type: string - source: common - total: false - - name: cash_count - label: reports.common.CollectionRegister.transactions - type: number - source: common - total: true - - name: cash_sum - label: reports.common.CollectionRegister.cash - type: number - source: common - total: true - - name: cheque_count - label: reports.common.CollectionRegister.transactions - type: number - source: common - total: true - - name: cheque_sum - label: reports.common.CollectionRegister.cheque - type: number - source: common - total: true - - name: dd_count - label: reports.common.CollectionRegister.transactions - type: number - source: common - total: true - - name: dd_sum - label: reports.common.CollectionRegister.dd - type: number - source: common - total: true - - name: online_count - label: reports.common.CollectionRegister.transactions - type: number - source: common - total: true - - name: online_sum - label: reports.common.CollectionRegister.online - type: number - source: common - total: true - - name: card_count - label: reports.common.CollectionRegister.transactions - type: number - source: common - total: true - - name: card_sum - label: reports.common.CollectionRegister.card - type: number - source: common - total: true - - name: total - label: reports.common.CollectionRegister.total - type: number - source: common - total: true - - searchParams: - - name: ulb - label: reports.common.CollectionRegister.ulb - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name - source: common - wrapper: true - isMandatory: true - searchClause: AND rt.tenantId = $ulb - - name: service - label: reports.common.CollectionRegister.service - type: multivaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=BillingService&masterName=BusinessService&filter=[?(@.type=='Adhoc')]|$.MdmsRes.BillingService.BusinessService.*.code|$.MdmsRes.BillingService.BusinessService.*.businessService - source: common - wrapper: true - state: true - isMandatory: true - isLocalisationRequired: true - localisationPrefix: "BILLINGSERVICE_BUSINESSSERVICE_" - searchClause: AND REGEXP_REPLACE(rt.businessdetails,'\..*','') IN ($service) - - name: paymentMode - label: reports.common.CollectionRegister.mode - type: singlevaluelist - pattern: 'list://Cash:Cash,Online:Online,Card:Card,DD:DD,Cheque:Cheque' - source: common - isMandatory: false - searchClause: AND instrumenttype = $paymentMode - - name: channel - label: reports.common.CollectionRegister.channel - type: singlevaluelist - pattern: 'list://COUNTER:COUNTER,FIELD:FIELD' - source: common - isMandatory: false - searchClause: AND collectiontype = $channel - - name: fromDate - label: reports.common.CollectionRegister.fromdate - type: epoch - source: common - isMandatory: true - searchClause: AND receiptdate >= $fromDate - - name: toDate - label: reports.common.CollectionRegister.todate - type: epoch - source: common - isMandatory: true - searchClause: AND receiptdate <= $toDate - - query: select COALESCE(message,REGEXP_REPLACE(businessdetails,'\..*','')) service,collectiontype channel,sum(case when instrumenttype='Cash' then 1 else 0 end) as cash_count, sum(case when instrumenttype='Cash' then ins.amount else 0 end) as cash_sum, sum(case when instrumenttype='Cheque' then 1 else 0 end) as cheque_count, sum(case when instrumenttype='Cheque' then ins.amount else 0 end) as cheque_sum, sum(case when instrumenttype='DD' then 1 else 0 end) as dd_count, sum(case when instrumenttype='DD' then ins.amount else 0 end) as dd_sum, sum(case when instrumenttype='Online' then 1 else 0 end) as online_count, sum(case when instrumenttype='Online' then ins.amount else 0 end) as online_sum, sum(case when instrumenttype='Card' then 1 else 0 end) as card_count, sum(case when instrumenttype='Card' then amount else 0 end) as card_sum,sum(amount) total from egcl_receiptheader_v1 rt inner join egcl_receiptinstrument_v1 ihead on rt.id=receiptheader inner join egcl_instrumentheader_v1 ins on instrumentheader=ins.id left outer join message on LOWER(concat('BILLINGSERVICE_BUSINESSSERVICE_',REGEXP_REPLACE(businessdetails,'\..*','')))=LOWER(code) AND module='rainmaker-uc' where businessdetails IN (select code from (VALUES tbl_businessserviceList) AS serv_list(code,servicename)) - groupby: group by service,collectiontype - orderby: order by service,collectiontype \ No newline at end of file diff --git a/configs/reports/configs/rainmaker-noc-reports.yml b/configs/reports/configs/rainmaker-noc-reports.yml deleted file mode 100644 index 7c49499f..00000000 --- a/configs/reports/configs/rainmaker-noc-reports.yml +++ /dev/null @@ -1,831 +0,0 @@ ---- -ReportDefinitions: - - reportName: UrbanCollectionReport - summary: Collection Report - version: 1.0.0 - moduleName: rainmaker-noc - sourceColumns: - - name: localisedmessage - label: reports.noc.collectionreport.usagetype - type: string - source: rainmaker-noc - total: false - - name: transactionNumber - label: reports.noc.collectionreport.transactionNumber - type: string - source: rainmaker-noc - total: true - - name: fees_counter - label: reports.noc.collectionreport.fees_counter - type: string - source: rainmaker-noc - total: true - - name: fees_online - label: reports.noc.collectionreport.fees_online - type: string - source: rainmaker-noc - total: true - searchParams: - - name: fromDate - label: reports.noc.collectionreport.fromDate - type: epoch - source: pt - isMandatory: false - searchClause: AND receiptdate >= $fromDate - - name: toDate - label: reports.noc.collectionreport.toDate - type: epoch - source: pt - isMandatory: false - searchClause: AND receiptdate <= $toDate - - name: channel - label: reports.noc.collectionreport.channel - type: multivaluelist - pattern: 'list://COUNTER:ULB Counter,ONLINE:Online by Citizen' - source: common - isMandatory: false - searchClause: AND collectiontype IN ($channel) - - name: paymentMode - label: reports.noc.collectionreport.paymentMode - type: singlevaluelist - pattern: 'list://Cash:Cash,Online:Online,Card:Card,DD:DD,Cheque:Cheque' - source: common - isMandatory: false - searchClause: AND instrumenttype = $paymentMode - - name: ulb - label: reports.noc.collectionreport.ulb - type: multivaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name - source: noc - wrapper: true - isMandatory: false - searchClause: AND fnoc.tenantId IN ($ulb) - query: select COALESCE(message,usagetype) localisedmessage, COUNT(*) as transactionNumber, sum(case when collectiontype='COUNTER' then ins.amount else 0 end) fees_counter, sum(case when collectiontype='ONLINE' then ins.amount else 0 end) fees_online from eg_fn_firenoc fnoc inner join eg_fn_firenocdetail fdet on fdet.firenocuuid=fnoc.uuid inner join egcl_receiptheader_v1 rhead on rhead.consumercode=fdet.applicationnumber inner join eg_fn_buidlings build on build.firenocdetailsuuid=fdet.uuid inner join egcl_receiptinstrument_v1 recins on recins.receiptheader=rhead.id inner join egcl_instrumentheader_v1 ins on recins.instrumentheader=ins.id left outer join message on code=concat('FIRENOC_BUILDINGTYPE_',UPPER(REGEXP_REPLACE(usagetype,'\..*',''))) and module='rainmaker-noc' where 1=1 - groupby: GROUP BY localisedmessage - orderby: ORDER BY localisedmessage - - - reportName: UrbanApplicationStatusReport - summary: Application Status Report - version: 1.0.0 - moduleName: rainmaker-noc - sourceColumns: - - name: application_status - label: reports.noc.applicationstatusreport.appStatus - type: string - source: rainmaker-noc - total: false - - name: number_of_application - label: reports.noc.applicationstatusreport.noofapplications - type: string - source: rainmaker-noc - total: true - searchParams: - - name: fromDate - label: reports.noc.applicationstatusreport.fromDate - type: epoch - source: noc - isMandatory: false - searchClause: AND applicationdate >= $fromDate - - name: toDate - label: reports.noc.applicationstatusreport.toDate - type: epoch - source: noc - isMandatory: false - searchClause: AND applicationdate <= $toDate - - name: ulb - label: reports.noc.applicationstatusreport.ulb - type: multivaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name - source: noc - wrapper: true - isMandatory: false - searchClause: AND fnoc.tenantId IN ($ulb) - query: select COALESCE(message,state) application_status,count(*) number_of_application from eg_fn_firenoc fnoc inner join eg_fn_firenocdetail fdet on fdet.firenocuuid=fnoc.uuid inner join (SELECT DISTINCT ON (businessid) * FROM eg_wf_processinstance_v2 ORDER BY businessid,createdtime desc) pinstance on pinstance.businessid=fdet.applicationnumber inner join eg_wf_state_v2 wfstate on pinstance.status=wfstate.uuid left outer join message on code=concat('WF_FIRENOC_',UPPER(state)) and module='rainmaker-noc' where 1=1 - groupby: GROUP BY application_status - orderby: ORDER BY application_status - - - reportName: UrbanChannelsReport - summary: Channels Report - version: 1.0.0 - moduleName: rainmaker-noc - sourceColumns: - - name: channel - label: reports.noc.channelsreport.channel - type: string - source: rainmaker-noc - total: false - - name: number_of_applications - label: reports.noc.channelsreport.applicationNo - type: string - source: rainmaker-noc - total: true - - name: percentage - label: reports.noc.channelsreport.percentage - type: string - source: rainmaker-noc - total: false - searchParams: - - name: fromDate - label: reports.noc.channelsreport.fromDate - type: epoch - source: noc - isMandatory: false - searchClause: AND applicationdate >= $fromDate - - name: toDate - label: reports.noc.channelsreport.toDate - type: epoch - source: noc - isMandatory: false - searchClause: AND applicationdate <= $toDate - - name: ulb - label: reports.noc.channelsreport.ulb - type: multivaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name - source: noc - wrapper: true - isMandatory: false - searchClause: AND fnoc.tenantId IN ($ulb) - query: select channel, count (*) number_of_applications,round((count (*)::decimal/(select count(*) from eg_fn_firenoc fnoc inner join eg_fn_firenocdetail fdet on fdet.firenocuuid=fnoc.uuid))*100,2) percentage from eg_fn_firenoc fnoc inner join eg_fn_firenocdetail fdet on fdet.firenocuuid=fnoc.uuid - groupby: GROUP BY channel - orderby: ORDER BY channel - - - - reportName: UrbanCollectionReport_V2 - summary: Collection Report - version: 1.0.0 - moduleName: rainmaker-noc - sourceColumns: - - name: localisedmessage - label: reports.noc.collectionreport.usagetype - type: string - source: rainmaker-noc - total: false - - name: transactionNumber - label: reports.noc.collectionreport.transactionNumber - type: string - source: rainmaker-noc - total: true - - name: fees_counter - label: reports.noc.collectionreport.fees_counter - type: string - source: rainmaker-noc - total: true - - name: fees_online - label: reports.noc.collectionreport.fees_online - type: string - source: rainmaker-noc - total: true - searchParams: - - name: fromDate - label: reports.noc.collectionreport.fromDate - type: epoch - source: pt - isMandatory: false - searchClause: AND receiptdate >= $fromDate - - name: toDate - label: reports.noc.collectionreport.toDate - type: epoch - source: pt - isMandatory: false - searchClause: AND receiptdate <= $toDate - - name: channel - label: reports.noc.collectionreport.channel - type: multivaluelist - pattern: 'list://COUNTER:ULB Counter,ONLINE:Online by Citizen' - source: common - isMandatory: false - searchClause: AND collectiontype IN ($channel) - - name: ulb - label: reports.noc.collectionreport.ulb - type: multivaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name - source: noc - wrapper: true - isMandatory: false - searchClause: AND fnoc.tenantId IN ($ulb) - query: | - Select - COALESCE(message,usagetype) localisedmessage, - COUNT(*) as transactionNumber, - --(select COALESCE((select message from message where code=concat('FIRENOC_FIRESTATIONS_',UPPER(REGEXP_REPLACE(firestationid,'\..*',''))) limit 1), firestationid)) as firestation, - SUM (CASE WHEN egcl_payment.paymentmode='CASH' THEN egcl_payment.totalamountpaid ELSE 0 END) as fees_counter, - SUM (CASE WHEN egcl_payment.paymentmode='ONLINE' THEN egcl_payment.totalamountpaid ELSE 0 END) AS fees_online - from eg_fn_firenoc AS fnoc - INNER JOIN eg_fn_firenocdetail fdet on fdet.firenocuuid=fnoc.uuid - INNER JOIN egcl_bill as bill on bill.consumercode=fdet.applicationnumber - INNER JOIN egcl_billdetial as billd on billd.billid=bill.id - INNER JOIN eg_fn_buidlings build on build.firenocdetailsuuid=fdet.uuid - INNER JOIN egcl_paymentdetail ON (egcl_paymentdetail.billid=bill.id AND egcl_paymentdetail.businessservice='FIRENOC') - INNER JOIN egcl_payment on egcl_payment.id=egcl_paymentdetail.paymentid - LEFT OUTER JOIN message on code=concat('FIRENOC_BUILDINGTYPE_',UPPER(REGEXP_REPLACE(usagetype,'\..*',''))) - INNER JOIN eg_fn_address as fad on fad.firenocdetailsuuid=fdet.uuid and module='rainmaker-noc' - where 1=1 - and egcl_payment.tenantid!='pb.testing' and fad.areatype='Urban' and egcl_payment.paymentstatus!='CANCELLED' - groupby: GROUP BY (localisedmessage) - orderby: ORDER BY localisedmessage - - - reportName: UrbanApplicationStatusReport_V2 - summary: Application Status Report - version: 1.0.0 - moduleName: rainmaker-noc - sourceColumns: - - name: application_status - label: reports.noc.applicationstatusreport.appStatus - type: string - source: rainmaker-noc - total: false - - name: number_of_application - label: reports.noc.applicationstatusreport.noofapplications - type: string - source: rainmaker-noc - total: true - searchParams: - - name: fromDate - label: reports.noc.applicationstatusreport.fromDate - type: epoch - source: noc - isMandatory: false - searchClause: AND applicationdate >= $fromDate - - name: toDate - label: reports.noc.applicationstatusreport.toDate - type: epoch - source: noc - isMandatory: false - searchClause: AND applicationdate <= $toDate - - name: ulb - label: reports.noc.applicationstatusreport.ulb - type: multivaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name - source: noc - wrapper: true - isMandatory: false - searchClause: AND fnoc.tenantid IN ($ulb) - query: | - select - COALESCE(message,state) application_status, - count(*) number_of_application - from eg_fn_firenoc fnoc - inner join eg_fn_firenocdetail fdet on fdet.firenocuuid=fnoc.uuid - inner join (SELECT DISTINCT ON (businessid) * FROM eg_wf_processinstance_v2 ORDER BY businessid,createdtime desc) pinstance on pinstance.businessid=fdet.applicationnumber - inner join eg_wf_state_v2 wfstate on pinstance.status=wfstate.uuid - left outer join message on code=concat('WF_FIRENOC_',UPPER(state)) and module='rainmaker-noc' - where 1=1 and fnoc.tenantid!='pb.testing' - groupby: GROUP BY application_status - orderby: ORDER BY application_status - - - - reportName: UrbanChannelsReport_V2 - summary: Channels Report - version: 1.0.0 - moduleName: rainmaker-noc - sourceColumns: - - name: channel - label: reports.noc.channelsreport.channel - type: string - source: rainmaker-noc - total: false - - name: number_of_applications - label: reports.noc.channelsreport.applicationNo - type: string - source: rainmaker-noc - total: true - - name: percentage - label: reports.noc.channelsreport.percentage - type: string - source: rainmaker-noc - total: false - searchParams: - - name: fromDate - label: reports.noc.channelsreport.fromDate - type: epoch - source: noc - isMandatory: false - searchClause: AND applicationdate >= $fromDate - - name: toDate - label: reports.noc.channelsreport.toDate - type: epoch - source: noc - isMandatory: false - searchClause: AND applicationdate <= $toDate - - name: ulb - label: reports.noc.channelsreport.ulb - type: multivaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name - source: noc - wrapper: true - isMandatory: false - searchClause: AND fnoc.tenantid IN ($ulb) - query: | - select - channel, - count (*) number_of_applications, - round((count (*)::decimal/(select count(*) from eg_fn_firenoc fnoc inner join eg_fn_firenocdetail fdet on fdet.firenocuuid=fnoc.uuid))*100,2) percentage - from eg_fn_firenoc fnoc - inner join eg_fn_firenocdetail fdet on fdet.firenocuuid=fnoc.uuid - where 1=1 and fnoc.tenantid!='pb.testing' - groupby: GROUP BY channel - orderby: ORDER BY channel - - - reportName: RuralDistrictWiseCollectionReport_V2 - summary: Rural District Wise Collection Report - version: 1.0.0 - moduleName: rainmaker-noc - sourceColumns: - - name: subdistrict - label: reports.noc.collectionreport.subdistrict - type: string - source: rainmaker-noc - total: false - - name: firestation - label: reports.noc.collectionreport.firestation - type: string - source: rainmaker-noc - total: false - - name: localisedmessage - label: reports.noc.collectionreport.usagetype - type: string - source: rainmaker-noc - total: false - - name: transactionNumber - label: reports.noc.collectionreport.transactionNumber - type: string - source: rainmaker-noc - total: true - - name: fees_counter - label: reports.noc.collectionreport.fees_counter - type: string - source: rainmaker-noc - total: true - - name: fees_online - label: reports.noc.collectionreport.fees_online - type: string - source: rainmaker-noc - total: true - searchParams: - - name: fromDate - label: reports.noc.collectionreport.fromDate - type: epoch - source: noc - isMandatory: false - searchClause: AND receiptdate >= $fromDate - - name: toDate - label: reports.noc.collectionreport.toDate - type: epoch - source: noc - isMandatory: false - searchClause: AND receiptdate <= $toDate - - name: channel - label: reports.noc.collectionreport.channel - type: multivaluelist - pattern: 'list://COUNTER:ULB Counter,ONLINE:Online by Citizen' - source: common - isMandatory: false - searchClause: AND collectiontype IN ($channel) - - name: district - label: reports.noc.collectionreport.district - type: multivaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.city.districtTenantCode|$.MdmsRes.tenant.tenants.*.city.districtName - source: noc - wrapper: true - isMandatory: false - searchClause: AND fad.city IN ($district) - query: | - Select - COALESCE(message,usagetype) localisedmessage, - COUNT(*) as transactionNumber, - fad.subdistrict, - --(select COALESCE((select message from message where code=concat('FIRENOC_FIRESTATIONS_',UPPER(REGEXP_REPLACE(firestationid,'\..*',''))) limit 1), firestationid)) as firestation, - SUM (CASE WHEN egcl_payment.paymentmode='CASH' THEN egcl_payment.totalamountpaid ELSE 0 END) as fees_counter, - SUM (CASE WHEN egcl_payment.paymentmode='ONLINE' THEN egcl_payment.totalamountpaid ELSE 0 END) AS fees_online - from eg_fn_firenoc AS fnoc - INNER JOIN eg_fn_firenocdetail fdet on fdet.firenocuuid=fnoc.uuid - INNER JOIN egcl_bill as bill on bill.consumercode=fdet.applicationnumber - INNER JOIN egcl_billdetial as billd on billd.billid=bill.id - INNER JOIN eg_fn_buidlings build on build.firenocdetailsuuid=fdet.uuid - INNER JOIN egcl_paymentdetail ON (egcl_paymentdetail.billid=bill.id AND egcl_paymentdetail.businessservice='FIRENOC') - INNER JOIN egcl_payment on egcl_payment.id=egcl_paymentdetail.paymentid - LEFT OUTER JOIN message on code=concat('FIRENOC_BUILDINGTYPE_',UPPER(REGEXP_REPLACE(usagetype,'\..*',''))) - INNER JOIN eg_fn_address as fad on fad.firenocdetailsuuid=fdet.uuid and module='rainmaker-noc' - where 1=1 and egcl_payment.tenantid!='pb.testing' and fad.areatype='Rural' and egcl_payment.paymentstatus!='CANCELLED' - groupby: GROUP BY (localisedmessage),fad.subdistrict - orderby: ORDER BY localisedmessage - - - - reportName: RuralDistrictWiseApplicationStatusReport_V2 - summary: Rural District Wise Application Status Report - version: 1.0.0 - moduleName: rainmaker-noc - sourceColumns: - - name: subdistrict - label: reports.noc.collectionreport.subdistrict - type: string - source: rainmaker-noc - total: false - - name: firestation - label: reports.noc.collectionreport.firestation - type: string - source: rainmaker-noc - total: false - - name: application_status - label: reports.noc.applicationstatusreport.appStatus - type: string - source: rainmaker-noc - total: false - - name: number_of_application - label: reports.noc.applicationstatusreport.noofapplications - type: string - source: rainmaker-noc - total: true - searchParams: - - name: fromDate - label: reports.noc.applicationstatusreport.fromDate - type: epoch - source: noc - isMandatory: false - searchClause: AND applicationdate >= $fromDate - - name: toDate - label: reports.noc.applicationstatusreport.toDate - type: epoch - source: noc - isMandatory: false - searchClause: AND applicationdate <= $toDate - - name: district - label: reports.noc.applicationstatusreport.district - type: multivaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.city.districtTenantCode|$.MdmsRes.tenant.tenants.*.city.districtName - source: noc - wrapper: true - isMandatory: false - searchClause: AND fad.city IN ($district) - query: | - select - fad.subdistrict as subdistrict, - (select COALESCE((select message from message where code=concat('FIRENOC_FIRESTATIONS_',UPPER(REGEXP_REPLACE(firestationid,'\..*',''))) limit 1), firestationid)) as firestation, - COALESCE(message,state) application_status, - count(*) number_of_application - from eg_fn_firenoc fnoc - inner join eg_fn_firenocdetail fdet on fdet.firenocuuid=fnoc.uuid - inner join (SELECT DISTINCT ON (businessid) * FROM eg_wf_processinstance_v2 ORDER BY businessid,createdtime desc) pinstance on pinstance.businessid=fdet.applicationnumber - inner join eg_wf_state_v2 wfstate on pinstance.status=wfstate.uuid left outer join message on code=concat('WF_FIRENOC_',UPPER(state)) and module='rainmaker-noc' - inner join eg_fn_address as fad on fad.firenocdetailsuuid=fdet.uuid - where 1=1 AND fad.subdistrict NOT LIKE 'pb.%' - groupby: GROUP BY (application_status,subdistrict,firestation) - orderby: ORDER BY application_status - - - reportName: RuralDistrictWiseChannelsReport_V2 - summary: Rural District Wise Channels Report - version: 1.0.0 - moduleName: rainmaker-noc - sourceColumns: - - name: subdistrict - label: reports.noc.collectionreport.subdistrict - type: string - source: rainmaker-noc - total: false - - name: firestation - label: reports.noc.collectionreport.firestation - type: string - source: rainmaker-noc - total: false - - name: channel - label: reports.noc.channelsreport.channel - type: string - source: rainmaker-noc - total: false - - name: number_of_applications - label: reports.noc.channelsreport.applicationNo - type: string - source: rainmaker-noc - total: true - - name: percentage - label: reports.noc.channelsreport.percentage - type: string - source: rainmaker-noc - total: false - searchParams: - - name: fromDate - label: reports.noc.channelsreport.fromDate - type: epoch - source: noc - isMandatory: false - searchClause: AND applicationdate >= $fromDate - - name: toDate - label: reports.noc.channelsreport.toDate - type: epoch - source: noc - isMandatory: false - searchClause: AND applicationdate <= $toDate - - name: district - label: reports.noc.channelsreport.district - type: multivaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.city.districtTenantCode|$.MdmsRes.tenant.tenants.*.city.districtName - source: noc - wrapper: true - isMandatory: false - searchClause: AND fad.city IN ($district) - query: | - select - channel, - fad.subdistrict as subdistrict, - (select COALESCE((select message from message where code=concat('FIRENOC_FIRESTATIONS_',UPPER(REGEXP_REPLACE(firestationid,'\..*',''))) limit 1), firestationid)) as firestation, - count (*) number_of_applications, - round((count (*)::decimal/(select count(*) from eg_fn_firenoc fnoc inner join eg_fn_firenocdetail fdet on fdet.firenocuuid=fnoc.uuid))*100,2) percentage - from eg_fn_firenoc fnoc - inner join eg_fn_firenocdetail fdet on fdet.firenocuuid=fnoc.uuid - inner join eg_fn_address as fad on fad.firenocdetailsuuid=fdet.uuid - Where 1=1 AND fad.subdistrict NOT LIKE 'pb.%' - groupby: GROUP BY (channel,subdistrict,firestation) - orderby: ORDER BY channel - - - reportName: ReceiptRegisterFirenocReport_V2 - decryptionPathId: ReceiptRegister_V2 - summary: Receipt Register FireNoc - version: 1.0.0 - moduleName: rainmaker-noc - additionalConfig: - print: - pdfPageSize: "A3" - sourceColumns: - - name: ulb - label: reports.noc.ulb - type: string - source: rainmaker-noc - total: false - - name: receiptnumber - label: reports.noc.receiptnumber - type: string - source: rainmaker-noc - total: false - - name: applicationnumber - label: reports.noc.applicationnumber - type: string - source: rainmaker-noc - total: false - - name: receiptdate - label: reports.noc.receiptdate - type: string - source: rainmaker-noc - total: false - - name: g8issuedate - label: reports.noc.g8issuedate - type: string - source: rainmaker-noc - total: false - - name: g8receiptno - label: reports.noc.g8receiptno - type: string - source: rainmaker-noc - total: false - - name: status - label: reports.noc.status - type: string - source: rainmaker-noc - total: false - - name: servicecategory - label: reports.noc.servicecategory - type: string - source: rainmaker-noc - total: false - - name: totalamount - label: reports.noc.totalamount - type: string - source: rainmaker-noc - total: true - - name: paymentmode - label: reports.noc.paymentmode - type: string - source: rainmaker-noc - total: false - - name: ddorchequenumber - label: reports.noc.ddorchequenumber - type: string - source: rainmaker-noc - total: false - - name: firenoctype - label: reports.noc.firenoctype - type: string - source: rainmaker-noc - total: false - - name: usagetype - label: reports.noc.usagetype - type: string - source: rainmaker-noc - total: false - - name: areatype - label: reports.noc.areatype - type: string - source: rainmaker-noc - total: false - - name: ownername - label: reports.noc.ownername - type: string - source: rainmaker-noc - total: false - - name: collectiontype - label: reports.noc.collectiontype - type: string - source: rainmaker-noc - total: false - - name: collectorname - label: reports.noc.collectorname - type: string - source: rainmaker-noc - total: false - searchParams: - - name: fromDate - label: reports.noc.fromDate - type: epoch - source: noc - isMandatory: false - searchClause: AND applicationdate >= $fromDate - - name: toDate - label: reports.noc.toDate - type: epoch - source: noc - isMandatory: false - searchClause: AND applicationdate <= $toDate - - name: ulb - label: reports.noc.ulb - type: multivaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name - source: noc - wrapper: true - isMandatory: false - searchClause: AND fnoc.tenantId IN ($ulb) - query: | - -- Use CTE to force query plan, compute & use CTE later - WITH receipt_breakup AS ( - SELECT - egcl_billaccountdetail.billdetailid bill_id, - string_agg(distinct consumercode,',') as consumercode - FROM egcl_billaccountdetail - LEFT JOIN egcl_bill as bill on bill.id = egcl_billaccountdetail.billdetailid - WHERE bill.tenantid!='pb.testing' AND businessservice in ('FIRENOC') - GROUP BY billdetailid - ) - SELECT - payment.tenantid as ulb, - paydetail.receiptnumber as receiptnumber, - To_char((To_timestamp(paydetail.receiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as receiptdate, - To_char((To_timestamp(paydetail.manualreceiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as g8issuedate, - paydetail.manualreceiptnumber as g8receiptno, - payment.paymentstatus as status, - paydetail.businessservice as servicecategory, - receipt_breakup.*, - payment.totalamountpaid as totalamount, - paymentmode as paymentmode, - (case when paymentmode like 'CASH' then '' else transactionnumber end) as ddorchequenumber, - 'System' as collectiontype, - eg_user.name as collectorname, - fdet.firenoctype as firenoctype, - build.usagetype as usagetype, - fad.areatype as areatype, - fdet.applicationnumber as applicationnumber, - build.name as ownername - FROM egcl_payment AS payment - LEFT JOIN egcl_paymentdetail as paydetail on paydetail.paymentid=payment.id - LEFT JOIN receipt_breakup ON paydetail.billid = receipt_breakup.bill_id - JOIN eg_user ON payment.createdby::INTEGER=eg_user.id - JOIN egcl_bill as bill ON bill.id=paydetail.billid - JOIN eg_fn_firenocdetail AS fdet ON fdet.applicationnumber=bill.consumercode - JOIN eg_fn_buidlings AS build ON build.firenocdetailsuuid=fdet.uuid - INNER JOIN eg_fn_address as fad on fad.firenocdetailsuuid=fdet.uuid - WHERE payment.tenantid!='pb.testing' AND paydetail.businessservice in ('FIRENOC') AND paydetail.receiptnumber NOT LIKE 'MP%' and payment.tenantid = $tenantid - and payment.paymentstatus!='CANCELLED' - orderby: ORDER BY paydetail.receiptdate DESC - - - reportName: CancelledReceiptRegisterFirenocReport_V2 - decryptionPathId: ReceiptRegister_V2 - summary: Cancelled Receipt Register FireNoc - version: 1.0.0 - moduleName: rainmaker-noc - additionalConfig: - print: - pdfPageSize: "A3" - sourceColumns: - - name: ulb - label: reports.noc.ulb - type: string - source: rainmaker-noc - total: false - - name: receiptnumber - label: reports.noc.receiptnumber - type: string - source: rainmaker-noc - total: false - - name: applicationnumber - label: reports.noc.applicationnumber - type: string - source: rainmaker-noc - total: false - - name: receiptdate - label: reports.noc.receiptdate - type: string - source: rainmaker-noc - total: false - - name: g8issuedate - label: reports.noc.g8issuedate - type: string - source: rainmaker-noc - total: false - - name: g8receiptno - label: reports.noc.g8receiptno - type: string - source: rainmaker-noc - total: false - - name: status - label: reports.noc.status - type: string - source: rainmaker-noc - total: false - - name: servicecategory - label: reports.noc.servicecategory - type: string - source: rainmaker-noc - total: false - - name: totalamount - label: reports.noc.totalamount - type: string - source: rainmaker-noc - total: true - - name: paymentmode - label: reports.noc.paymentmode - type: string - source: rainmaker-noc - total: false - - name: ddorchequenumber - label: reports.noc.ddorchequenumber - type: string - source: rainmaker-noc - total: false - - name: collectiontype - label: reports.noc.collectiontype - type: string - source: rainmaker-noc - total: false - - name: collectorname - label: reports.noc.collectorname - type: string - source: rainmaker-noc - total: false - searchParams: - - name: fromDate - label: reports.noc.fromDate - type: epoch - source: noc - isMandatory: false - searchClause: AND applicationdate >= $fromDate - - name: toDate - label: reports.noc.toDate - type: epoch - source: noc - isMandatory: false - searchClause: AND applicationdate <= $toDate - - name: ulb - label: reports.noc.ulb - type: multivaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name - source: noc - wrapper: true - isMandatory: false - searchClause: AND fnoc.tenantId IN ($ulb) - query: | - -- Use CTE to force query plan, compute & use CTE later - WITH receipt_breakup AS ( - SELECT - egcl_billaccountdetail.billdetailid bill_id, - string_agg(distinct consumercode,',') as consumercode - FROM egcl_billaccountdetail - LEFT JOIN egcl_bill as bill on bill.id = egcl_billaccountdetail.billdetailid - WHERE bill.tenantid!='pb.testing' AND businessservice in ('FIRENOC') - GROUP BY billdetailid - ) - SELECT - payment.tenantid as ulb, - paydetail.receiptnumber as receiptnumber, - To_char((To_timestamp(paydetail.receiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as receiptdate, - To_char((To_timestamp(paydetail.manualreceiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as g8issuedate, - paydetail.manualreceiptnumber as g8receiptno, - payment.paymentstatus as status, - paydetail.businessservice as servicecategory, - receipt_breakup.*, - payment.totalamountpaid as totalamount, - paymentmode as paymentmode, - (case when paymentmode like 'CASH' then '' else transactionnumber end) as ddorchequenumber, - 'System' as collectiontype, - eg_user.name as collectorname, - fdet.firenoctype as firenoctype, - build.usagetype as usagetype, - fdet.applicationnumber as applicationnumber, - build.name as ownername - FROM egcl_payment AS payment - LEFT JOIN egcl_paymentdetail as paydetail on paydetail.paymentid=payment.id - LEFT JOIN receipt_breakup ON paydetail.billid = receipt_breakup.bill_id - JOIN eg_user ON payment.createdby::INTEGER=eg_user.id - JOIN egcl_bill as bill ON bill.id=paydetail.billid - JOIN eg_fn_firenocdetail AS fdet ON fdet.applicationnumber=bill.consumercode - JOIN eg_fn_buidlings AS build ON build.firenocdetailsuuid=fdet.uuid - WHERE payment.tenantid!='pb.testing' and paydetail.businessservice not in ('PT','TL','UC') and payment.paymentstatus = 'CANCELLED' and paydetail.receiptnumber NOT LIKE 'MP%' - --and paydetail.tenantid=$tenantid - orderby: ORDER BY paydetail.receiptdate DESC - diff --git a/configs/reports/configs/rainmaker-pgr-reports.yml b/configs/reports/configs/rainmaker-pgr-reports.yml deleted file mode 100644 index 6a0aadaf..00000000 --- a/configs/reports/configs/rainmaker-pgr-reports.yml +++ /dev/null @@ -1,727 +0,0 @@ -ReportDefinitions: -- reportName: SourceWiseReport - summary: Fetches reports based on the source of reception of the complaint - version: 1.0.0 - moduleName: rainmaker-pgr - sourceColumns: - - name: citizen_mobile_app - label: reports.rainmaker-pgr.citizen_mobile_app - type: number - source: eg_pgr_service - - name: citizen_web_app - label: reports.rainmaker-pgr.citizen_web_app - type: number - source: eg_pgr_service - - name: counter_desktop - label: reports.rainmaker-pgr.counter_desktop - type: number - source: eg_pgr_service - searchParams: - - name: tenantId - label: reports.rainmaker-pgr.tenantId - type: singlevaluelist - pattern: 'list://Wet:Wet,Dry:Dry' - source: eg_pgr_service - isMandatory: true - - name: fromDate - label: reports.rainmaker-pgr.datefrom - type: epoch - source: eg_pgr_service - isMandatory: true - - name: toDate - label: reports.rainmaker-pgr.dateto - type: epoch - source: eg_pgr_service - isMandatory: true - query: SELECT sum(case when source = 'mobileapp' then 1 else 0 end) as citizen_mobile_app, sum(case when source = 'web' then 1 else 0 end) as citizen_web_app, sum(case when source = 'ivr' then 1 else 0 end) as counter_desktop FROM eg_pgr_service WHERE tenantid = $tenantid - -- reportName: DescriptionReport - summary: Fetches department wise reports based description of the complaint - version: 1.0.0 - moduleName: rainmaker-pgr - externalService: - - entity: $.MdmsRes.RAINMAKER-PGR.ServiceDefs - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=RAINMAKER-PGR&masterName=ServiceDefs&tenantId=$tenantId - keyOrder: serviceCode,department,slaHours - tableName: tbl_dept - - entity: $.MdmsRes.common-masters.Department - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=common-masters&masterName=Department&tenantId=$tenantId - keyOrder: name,code - tableName: tbl_def_dept - - entity: $.TenantBoundary[0].boundary - apiURL: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search?hierarchyTypeCode=ADMIN&boundaryType=Locality&tenantId=$tenantId - keyOrder: name,code - tableName: tbl_boundary - sourceColumns: - - name: department - label: reports.rainmaker-pgr.department - type: string - source: eg_pgr_service - total: false - - name: servicecode - label: reports.rainmaker-pgr.servicecode - type: string - source: eg_pgr_service - total: false - - name: complaintNo - label: reports.rainmaker-pgr.complaintNo - type: string - source: eg_pgr_service - total: false - - name: date - label: reports.rainmaker-pgr.date - type: string - source: eg_pgr_service - total: false - - name: name - label: reports.rainmaker-pgr.name - type: string - source: eg_pgr_service - total: false - - name: phone - label: reports.rainmaker-pgr.phone - type: string - source: eg_pgr_service - total: false - - name: address - label: reports.rainmaker-pgr.address - type: string - source: eg_pgr_service - total: false - - name: locality - label: reports.rainmaker-pgr.locality - type: string - source: eg_pgr_service - total: false - - name: landmark - label: reports.rainmaker-pgr.landmark - type: string - source: eg_pgr_service - total: false - - name: description - label: reports.rainmaker-pgr.description - type: string - source: eg_pgr_service - total: false - - name: lastassignedto - label: reports.rainmaker-pgr.lastassignedto - type: string - source: eg_pgr_service - total: false - - name: status - label: reports.rainmaker-pgr.status - type: string - source: eg_pgr_service - total: false - - name: slahours - label: reports.rainmaker-pgr.slahours - type: string - source: eg_pgr_service - total: false - searchParams: - - name: fromDate - label: reports.rainmaker-pgr.datefrom - type: epoch - source: eg_pgr_service - isMandatory: false - searchClause: AND eg_pgr_service.createdtime >= $fromDate - - name: toDate - label: reports.rainmaker-pgr.dateto - type: epoch - source: eg_pgr_service - isMandatory: false - searchClause: AND eg_pgr_service.createdtime <= $toDate - query: | - SELECT - DISTINCT ON (servicerequestid) - ua.name as lastassignedto, - (SELECT deptmap_def.name FROM (VALUES tbl_def_dept) AS deptmap_def(name,code) INNER JOIN (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) on deptmap.serviceCode = eg_pgr_service.servicecode and deptmap_def.code = deptmap.department) AS department, - regexp_replace(servicecode, '([a-z])([A-Z])', '\1 \2','g') AS servicecode, - (SELECT boundary_def.name FROM (VALUES tbl_boundary) AS boundary_def(name,code) where code=eg_pgr_address.mohalla) as locality, - servicerequestid AS complaintNo, - to_char(to_timestamp(TRUNC(CAST(eg_pgr_service.createdtime AS bigint) / 1000)), 'DD/MM/YYYY') AS date, - eg_user.name, - phone, - eg_pgr_address.landmark, - eg_pgr_address.housenoandstreetname as address, - description, - (SELECT (CASE WHEN (((SELECT deptmap.slaHours FROM (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) WHERE deptmap.serviceCode = eg_pgr_service.servicecode)::integer / 24) - ((((select extract(epoch from now())) * 1000) - eg_pgr_service.createdtime)::bigint/86400000)) < 1 THEN CONCAT('Overdue by ', ((((select extract(epoch from now())) * 1000) - eg_pgr_service.createdtime)::bigint/86400000) - ((SELECT deptmap.slaHours FROM (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) WHERE deptmap.serviceCode = eg_pgr_service.servicecode)::integer / 24), ' days') ELSE CONCAT(((SELECT deptmap.slaHours FROM (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) WHERE deptmap.serviceCode = eg_pgr_service.servicecode)::integer / 24) - ((((select extract(epoch from now())) * 1000) - eg_pgr_service.createdtime)::bigint/86400000), ' days remaining') END) as slaHours), - Initcap(eg_pgr_service.status) as status - FROM eg_pgr_service - left outer join eg_pgr_address on eg_pgr_address.uuid = eg_pgr_service.addressid - left outer join eg_user on eg_user.id = eg_pgr_service.accountid::int - left outer join eg_pgr_action as epa on epa.businesskey = eg_pgr_service.servicerequestid and epa.action in ('assign','reassign') - left outer join eg_user as ua on ua.id = epa.assignee::int - WHERE - eg_pgr_service.tenantid LIKE $tenantid - AND eg_pgr_address.uuid = eg_pgr_service.addressid - AND eg_pgr_service.status IN ('open','assigned','reassigrequested','rejected') - orderby: ORDER BY servicerequestid, epa."when" desc - -- reportName: StateSourceReport - summary: Source of complaints across tenants - version: 1.0.0 - moduleName: rainmaker-pgr - sourceColumns: - - name: tenantid - label: reports.rainmaker-pgr.tenantid - type: string - source: eg_pgr_service - total: false - - name: ivr - label: reports.rainmaker-pgr.source.ivr - type: string - source: eg_pgr_service - total: true - - name: mobileapp - label: reports.rainmaker-pgr.source.mobileapp - type: string - source: eg_pgr_service - total: true - - name: web - label: reports.rainmaker-pgr.source.web - type: string - source: eg_pgr_service - total: true - - name: unknown - label: reports.rainmaker-pgr.source.unknown - type: string - source: eg_pgr_service - total: true - searchParams: - - name: fromDate - label: reports.rainmaker-pgr.datefrom - type: epoch - source: eg_pgr_service - isMandatory: false - searchClause: AND createdtime >= $fromDate - - name: toDate - label: reports.rainmaker-pgr.dateto - type: epoch - source: eg_pgr_service - isMandatory: false - searchClause: AND createdtime <= $toDate - query: | - select initcap(split_part(tenantid, '.', 2)) as tenantid, - SUM(CASE WHEN source ='ivr' THEN 1 ELSE 0 END) as ivr, - SUM(CASE WHEN source ='mobileapp' THEN 1 ELSE 0 END) as mobileapp, - SUM(CASE WHEN source ='web' THEN 1 ELSE 0 END) as web, - SUM(CASE WHEN source NOT IN ('web', 'ivr', 'mobileapp') OR source is NULL THEN 1 ELSE 0 END) as unknown - from eg_pgr_service - WHERE tenantid != 'pb.testing' - - groupby: GROUP BY tenantid - orderby: ORDER BY tenantid - -- reportName: EmployeeReport - summary: Fetches complaints for employees - version: 1.0.0 - moduleName: rainmaker-pgr - externalService: - - entity: $.MdmsRes.RAINMAKER-PGR.ServiceDefs - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=RAINMAKER-PGR&masterName=ServiceDefs&tenantId=$tenantId - keyOrder: serviceCode,department,slaHours - tableName: tbl_dept - - entity: $.TenantBoundary[0].boundary - apiURL: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search?hierarchyTypeCode=ADMIN&boundaryType=Locality&tenantId=$tenantId - keyOrder: name,code - tableName: tbl_boundary - sourceColumns: - - name: department - label: reports.rainmaker-pgr.department - type: string - source: eg_pgr_service - total: false - - name: servicecode - label: reports.rainmaker-pgr.servicecode - type: string - source: eg_pgr_service - total: false - - name: complaintNo - label: reports.rainmaker-pgr.complaintNo - type: string - source: eg_pgr_service - total: false - - name: date - label: reports.rainmaker-pgr.date - type: string - source: eg_pgr_service - total: false - - name: name - label: reports.rainmaker-pgr.name - type: string - source: eg_pgr_service - total: false - - name: phone - label: reports.rainmaker-pgr.phone - type: string - source: eg_pgr_service - total: false - - name: locality - label: reports.rainmaker-pgr.locality - type: string - source: eg_pgr_service - total: false - - name: address - label: reports.rainmaker-pgr.address - type: string - source: eg_pgr_service - total: false - - name: landmark - label: reports.rainmaker-pgr.landmark - type: string - source: eg_pgr_service - total: false - - name: description - label: reports.rainmaker-pgr.description - type: string - source: eg_pgr_service - total: false - - name: status - label: reports.rainmaker-pgr.status - type: string - source: eg_pgr_service - total: false - - name: slahours - label: reports.rainmaker-pgr.slahours - type: string - source: eg_pgr_service - total: false - searchParams: - - name: fromDate - label: reports.rainmaker-pgr.datefrom - type: epoch - source: eg_pgr_service - isMandatory: false - searchClause: AND eg_pgr_service.createdtime >= $fromDate - - name: toDate - label: reports.rainmaker-pgr.dateto - type: epoch - source: eg_pgr_service - isMandatory: false - searchClause: AND eg_pgr_service.createdtime <= $toDate - query: | - SELECT (SELECT deptmap.department FROM (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) WHERE deptmap.serviceCode = eg_pgr_service.servicecode) AS department, - regexp_replace(eg_pgr_service.servicecode, '([a-z])([A-Z])', '\1 \2','g') AS servicecode, - servicerequestid AS complaintNo, - to_char(to_timestamp(TRUNC(CAST(eg_pgr_service.createdtime AS bigint) / 1000)), 'DD/MM/YYYY') AS date, - (SELECT boundary_def.name FROM (VALUES tbl_boundary) AS boundary_def(name,code) where code=eg_pgr_address.mohalla) as locality, - eg_user.name, - phone, - eg_pgr_service.landmark, - housenoandstreetname as address, - description, - (SELECT (CASE WHEN (((SELECT deptmap.slaHours FROM (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) WHERE deptmap.serviceCode = eg_pgr_service.servicecode)::integer / 24) - ((((select extract(epoch from now())) * 1000) - eg_pgr_service.createdtime)::bigint/86400000)) < 1 THEN CONCAT('Overdue by ', ((((select extract(epoch from now())) * 1000) - eg_pgr_service.createdtime)::bigint/86400000) - ((SELECT deptmap.slaHours FROM (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) WHERE deptmap.serviceCode = eg_pgr_service.servicecode)::integer / 24), ' days') ELSE CONCAT(((SELECT deptmap.slaHours FROM (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) WHERE deptmap.serviceCode = eg_pgr_service.servicecode)::integer / 24) - ((((select extract(epoch from now())) * 1000) - eg_pgr_service.createdtime)::bigint/86400000), ' days remaining') END) as slaHours), - initcap(status) as status FROM eg_pgr_service - INNER JOIN eg_user ON eg_pgr_service.accountid = eg_user.id::VARCHAR - INNER JOIN eg_pgr_address ON eg_pgr_service.addressid = eg_pgr_address.uuid - WHERE eg_pgr_service.status = 'assigned' - AND servicerequestid IN (SELECT DISTINCT businesskey FROM eg_pgr_action WHERE status = 'assigned' AND "when" IN (select max("when") FROM eg_pgr_action WHERE assignee NOTNULL GROUP BY businesskey) AND assignee = $userid) - orderby: ORDER BY eg_pgr_service.createdtime asc - -- reportName: StateULBReport - summary: Fetches complaints stats for all ULBs in state - version: 1.0.0 - moduleName: rainmaker-pgr - sourceColumns: - - name: tenantid - label: reports.rainmaker-pgr.tenantid - type: string - source: eg_pgr_service - total: false - - name: open - label: reports.rainmaker-pgr.status.open - type: string - source: eg_pgr_service - total: true - - name: assigned - label: reports.rainmaker-pgr.status.assigned - type: string - source: eg_pgr_service - total: true - - name: closed - label: reports.rainmaker-pgr.status.closed - type: string - source: eg_pgr_service - total: true - - name: reassignrequested - label: reports.rainmaker-pgr.status.reassignrequested - type: string - source: eg_pgr_service - total: true - - name: rejected - label: reports.rainmaker-pgr.status.rejected - type: string - source: eg_pgr_service - total: true - - name: total - label: reports.rainmaker-pgr.total - type: string - source: eg_pgr_service - total: true - searchParams: - - name: fromDate - label: reports.rainmaker-pgr.datefrom - type: epoch - source: eg_pgr_service - isMandatory: false - searchClause: AND createdtime >= $fromDate - - name: toDate - label: reports.rainmaker-pgr.dateto - type: epoch - source: eg_pgr_service - isMandatory: false - searchClause: AND createdtime <= $toDate - query: | - select initcap(split_part(tenantid, '.', 2)) as tenantid, - SUM(CASE WHEN status ='open' THEN 1 ELSE 0 END) as open, - SUM(CASE WHEN status ='assigned' THEN 1 ELSE 0 END) as assigned, - SUM(CASE WHEN status in ('closed', 'resolved') THEN 1 ELSE 0 END) as closed, - SUM(CASE WHEN status ='reassignrequested' THEN 1 ELSE 0 END) as reassignrequested, - SUM(CASE WHEN status ='rejected' THEN 1 ELSE 0 END) as rejected, - COUNT(status) as total - from eg_pgr_service - WHERE tenantid != 'pb.testing' - groupby: GROUP BY tenantid - orderby: ORDER BY tenantid - -- reportName: ComplaintTypesReport - summary: Fetches complaint stats based on complaint types for a ULB - version: 1.0.0 - moduleName: rainmaker-pgr - sourceColumns: - - name: tenantid - label: reports.rainmaker-pgr.tenantid - type: string - source: eg_pgr_service - total: false - - name: complainttype - label: reports.rainmaker-pgr.complainttype - type: string - source: eg_pgr_service - total: false - - name: open - label: reports.rainmaker-pgr.status.open - type: string - source: eg_pgr_service - total: true - - name: assigned - label: reports.rainmaker-pgr.status.assigned - type: string - source: eg_pgr_service - total: true - - name: closed - label: reports.rainmaker-pgr.status.closed - type: string - source: eg_pgr_service - total: true - - name: reassignrequested - label: reports.rainmaker-pgr.status.reassignrequested - type: string - source: eg_pgr_service - total: true - - name: rejected - label: reports.rainmaker-pgr.status.rejected - type: string - source: eg_pgr_service - total: true - - name: total - label: reports.rainmaker-pgr.total - type: string - source: eg_pgr_service - total: true - searchParams: - - name: ulb - label: ULB - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name - source: pt - wrapper: true - isMandatory: false - searchClause: AND tenantid = $ulb - - name: fromDate - label: reports.rainmaker-pgr.datefrom - type: epoch - source: eg_pgr_service - isMandatory: false - searchClause: AND createdtime >= $fromDate - - name: toDate - label: reports.rainmaker-pgr.dateto - type: epoch - source: eg_pgr_service - isMandatory: false - searchClause: AND createdtime <= $toDate - query: | - select - initcap(split_part(tenantid, '.', 2)) as tenantid, - regexp_replace(servicecode, '([a-z])([A-Z])', '\1 \2','g') as complainttype, - SUM(CASE WHEN status ='open' THEN 1 ELSE 0 END) as open, - SUM(CASE WHEN status ='assigned' THEN 1 ELSE 0 END) as assigned, - SUM(CASE WHEN status in ('closed', 'resolved') THEN 1 ELSE 0 END) as closed, - SUM(CASE WHEN status ='reassignrequested' THEN 1 ELSE 0 END) as reassignrequested, - SUM(CASE WHEN status ='rejected' THEN 1 ELSE 0 END) as rejected, - count(status) as total - from eg_pgr_service - WHERE tenantid != 'pb.testing' - groupby: GROUP BY tenantid,servicecode - orderby: ORDER BY tenantid,servicecode - -- reportName: DepartmentReport - summary: Fetches complaint stats based on complaint types for a ULB - version: 1.0.0 - moduleName: rainmaker-pgr - externalService: - - entity: $.MdmsRes.RAINMAKER-PGR.ServiceDefs - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=RAINMAKER-PGR&masterName=ServiceDefs&tenantId=$tenantId - keyOrder: serviceCode,department,slaHours - tableName: tbl_dept - - entity: $.MdmsRes.common-masters.Department - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=common-masters&masterName=Department&tenantId=$tenantId - keyOrder: name,code - tableName: tbl_def_dept - sourceColumns: - - name: tenantid - label: reports.rainmaker-pgr.tenantid - type: string - source: eg_pgr_service - total: false - - name: department - label: reports.rainmaker-pgr.department - type: string - source: eg_pgr_service - total: false - - name: open - label: reports.rainmaker-pgr.status.open - type: string - source: eg_pgr_service - total: true - - name: assigned - label: reports.rainmaker-pgr.status.assigned - type: string - source: eg_pgr_service - total: true - - name: closed - label: reports.rainmaker-pgr.status.closed - type: string - source: eg_pgr_service - total: true - - name: reassignrequested - label: reports.rainmaker-pgr.status.reassignrequested - type: string - source: eg_pgr_service - total: true - - name: rejected - label: reports.rainmaker-pgr.status.rejected - type: string - source: eg_pgr_service - total: true - searchParams: - - name: ulb - label: ULB - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name - source: pt - wrapper: true - isMandatory: false - searchClause: AND tenantid = $ulb - - name: fromDate - label: reports.rainmaker-pgr.datefrom - type: epoch - source: eg_pgr_service - isMandatory: false - searchClause: AND createdtime >= $fromDate - - name: toDate - label: reports.rainmaker-pgr.dateto - type: epoch - source: eg_pgr_service - isMandatory: false - searchClause: AND createdtime <= $toDate - query: | - select - initcap(split_part(tenantid, '.', 2)) as tenantid, - deptmap_def.name as department, - SUM(CASE WHEN status ='open' THEN 1 ELSE 0 END) as open, - SUM(CASE WHEN status ='assigned' THEN 1 ELSE 0 END) as assigned, - SUM(CASE WHEN status in ('closed', 'resolved') THEN 1 ELSE 0 END) as closed, - SUM(CASE WHEN status ='reassignrequested' THEN 1 ELSE 0 END) as reassignrequested, - SUM(CASE WHEN status ='rejected' THEN 1 ELSE 0 END) as rejected, - count(status) as total - from eg_pgr_service - INNER JOIN (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) ON deptmap.serviceCode = eg_pgr_service.servicecode - INNER JOIN (VALUES tbl_def_dept) AS deptmap_def(name,code) ON deptmap.department = deptmap_def.code - WHERE tenantid != 'pb.testing' - groupby: GROUP BY tenantid,deptmap_def.name - orderby: ORDER BY tenantid,deptmap_def.name - -- reportName: ULBDepartmentReport - summary: Fetches complaint stats based on department types for a ULB - version: 1.0.0 - moduleName: rainmaker-pgr - externalService: - - entity: $.MdmsRes.RAINMAKER-PGR.ServiceDefs - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=RAINMAKER-PGR&masterName=ServiceDefs&tenantId=$tenantId - keyOrder: serviceCode,department,slaHours - tableName: tbl_dept - - entity: $.MdmsRes.common-masters.Department - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=common-masters&masterName=Department&tenantId=$tenantId - keyOrder: name,code - tableName: tbl_def_dept - sourceColumns: - - name: department - label: reports.rainmaker-pgr.department - type: string - source: eg_pgr_service - total: false - - name: rejected - label: reports.rainmaker-pgr.rejected - type: string - source: pgr_data - total: true - - name: resolved - label: reports.rainmaker-pgr.resolved - type: string - source: pgr_data - total: true - - name: resolvedoutsidesla - label: reports.rainmaker-pgr.resolvedoutsidesla - type: string - source: pgr_data - total: true - - name: open - label: reports.rainmaker-pgr.open - type: string - source: pgr_data - total: true - - name: assigned - label: reports.rainmaker-pgr.assigned - type: string - source: pgr_data - total: true - - name: outsidesla - label: reports.rainmaker-pgr.outsidesla - type: string - source: pgr_data - total: true - searchParams: - - name: fromDate - label: reports.rainmaker-pgr.datefrom - type: epoch - source: eg_pgr_service - isMandatory: false - searchClause: AND pgr_data.createdtime >= $fromDate - - name: toDate - label: reports.rainmaker-pgr.dateto - type: epoch - source: eg_pgr_service - isMandatory: false - searchClause: AND pgr_data.createdtime <= $toDate - query: | - with pgr_data as (select - servicerequestid, - servicecode, - createdtime, - status, - (select max("when") from eg_pgr_action where action='resolve' and businesskey = servicerequestid) as resolvedtime, - (select min("when") from eg_pgr_action where action='open' and businesskey = servicerequestid) as opentime - from eg_pgr_service as ps - where - tenantid = $tenantid) - - select - deptmap_def.name as department, - count(*) as total, - SUM (CASE WHEN status in ('rejected') THEN 1 ELSE 0 END) as rejected, - SUM (CASE WHEN status in ('closed', 'resolved') THEN 1 ELSE 0 END) as resolved, - SUM (CASE WHEN status in ('closed', 'resolved') and (resolvedtime - opentime) >= 14 * 86400 * 1000 THEN 1 ELSE 0 END) as resolvedoutsidesla, - SUM (CASE WHEN status in ('assigned', 'reassignrequested') THEN 1 ELSE 0 END) as assigned, - SUM (CASE WHEN status in ('open') THEN 1 ELSE 0 END) as open, - SUM (CASE WHEN status in ('assigned', 'reassignrequested', 'open') and (extract(epoch from now()) * 1000 - opentime) >= 14 * 86400 * 1000 THEN 1 ELSE 0 END) as outsidesla - from pgr_data - INNER JOIN (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) ON deptmap.serviceCode = pgr_data.servicecode - INNER JOIN (VALUES tbl_def_dept) AS deptmap_def(name,code) ON deptmap.department = deptmap_def.code - WHERE 1=1 - groupby: GROUP BY deptmap_def.name - orderby: ORDER BY deptmap_def.name - -- reportName: ULBEmployeeWiseReport - summary: Fetches employee wise assignment report - version: 1.0.0 - moduleName: rainmaker-pgr - sourceColumns: - - name: employee - label: reports.rainmaker-pgr.employee - type: string - source: pgr_data - total: false - - name: rejected - label: reports.rainmaker-pgr.rejected - type: string - source: pgr_data - total: true - - name: resolved - label: reports.rainmaker-pgr.resolved - type: string - source: pgr_data - total: true - - name: resolvedoutsidesla - label: reports.rainmaker-pgr.resolvedoutsidesla - type: string - source: pgr_data - total: true - - name: open - label: reports.rainmaker-pgr.open - type: string - source: pgr_data - total: true - - name: assigned - label: reports.rainmaker-pgr.assigned - type: string - source: pgr_data - total: true - - name: outsidesla - label: reports.rainmaker-pgr.outsidesla - type: string - source: pgr_data - total: true - searchParams: - - name: fromDate - label: reports.rainmaker-pgr.datefrom - type: epoch - source: eg_pgr_service - isMandatory: false - searchClause: AND pgr_data.createdtime >= $fromDate - - name: toDate - label: reports.rainmaker-pgr.dateto - type: epoch - source: eg_pgr_service - isMandatory: false - searchClause: AND pgr_data.createdtime <= $toDate - query: | - with pgr_data as (select - (select assignee from eg_pgr_action as pa where - pa.businesskey = ps.servicerequestid - and pa."action" in ('assign', 'reassign') - order by "when" desc - fetch first 1 rows only - ) as assignee, - servicerequestid, - createdtime, - status, - (select max("when") from eg_pgr_action where action='resolve' and businesskey = servicerequestid) as resolvedtime, - (select min("when") from eg_pgr_action where action='open' and businesskey = servicerequestid) as opentime - from eg_pgr_service as ps - where - tenantid = $tenantid) - - select - coalesce((select name from eg_user where id::varchar = assignee),'-- Unassigned --') as employee, - SUM (CASE WHEN status in ('rejected') THEN 1 ELSE 0 END) as rejected, - SUM (CASE WHEN status in ('closed', 'resolved') THEN 1 ELSE 0 END) as resolved, - SUM (CASE WHEN status in ('closed', 'resolved') and (resolvedtime - opentime) >= 14 * 86400 * 1000 THEN 1 ELSE 0 END) as resolvedoutsidesla, - SUM (CASE WHEN status in ('assigned', 'reassignrequested') THEN 1 ELSE 0 END) as assigned, - SUM (CASE WHEN status in ('open') THEN 1 ELSE 0 END) as open, - SUM (CASE WHEN status in ('assigned', 'reassignrequested', 'open') and (extract(epoch from now()) * 1000 - opentime) >= 14 * 86400 * 1000 THEN 1 ELSE 0 END) as outsidesla - from pgr_data - WHERE 1=1 - orderby: ORDER BY assignee NULLS FIRST - groupby: GROUP BY assignee diff --git a/configs/reports/configs/rainmaker-pt-reports.yml b/configs/reports/configs/rainmaker-pt-reports.yml deleted file mode 100644 index 22796616..00000000 --- a/configs/reports/configs/rainmaker-pt-reports.yml +++ /dev/null @@ -1,987 +0,0 @@ ---- -ReportDefinitions: -- reportName: ReceiptRegister - summary: Receipt Register - version: 1.0.0 - moduleName: rainmaker-pt - sourceColumns: - - name: receiptnumber - label: reports.pt.receiptNo - type: string - source: pt - total: false - - name: transactiondate - label: reports.pt.receiptDate - type: string - source: pt - total: false - - name: g8issuedate - label: reports.pt.g8issuedate - type: string - source: pt - total: false - - name: g8receiptno - label: reports.pt.g8receiptno - type: string - source: pt - total: false - - name: amount - label: reports.pt.amount - type: string - source: pt - total: true - - name: propertytax - label: reports.pt.propertyTax - type: string - source: pt - total: true - - name: firecess - label: reports.pt.fireCess - type: string - source: pt - total: true - - name: cancercess - label: reports.pt.cancerCess - type: string - source: pt - total: true - - name: rebate - label: reports.pt.rebate - type: string - source: pt - total: true - - name: adhocrebate - label: reports.pt.adhocrebate - type: string - source: pt - total: true - - name: penalty - label: reports.pt.penalty - type: string - source: pt - total: true - - name: adhocpenalty - label: reports.pt.adhocpenalty - type: string - source: pt - total: true - - name: interest - label: reports.pt.interest - type: string - source: pt - total: true - - name: exemption - label: reports.pt.exemption - type: string - source: pt - total: true - - name: adjusment - label: reports.pt.roundoff - type: string - source: pt - total: true - - name: pendingamount - label: reports.pt.pendingamount - type: string - source: pt - total: true - - name: propertyid - label: reports.pt.propertyId - type: string - source: pt - total: false - - name: usagetype - label: reports.pt.usagetype - type: string - source: pt - total: false - - name: assessmentnumber - label: reports.pt.assessmentNo - type: string - source: pt - total: false - - name: financialyear - label: reports.pt.financialYear - type: string - source: pt - total: false - - name: instrumenttype - label: reports.pt.paymentMode - type: string - source: pt - total: false - - name: transactionnumber - label: reports.pt.ddChequeTransactionNo - type: string - source: pt - total: false - - name: bankname - label: reports.pt.bankName - type: string - source: pt - total: false - searchParams: - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: false - searchClause: AND rh.receiptdate >= $fromDate - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: false - searchClause: AND rh.receiptdate <= $toDate - - name: paymentMode - label: Payment Mode - type: singlevaluelist - pattern: 'list://Cash:Cash,Online:Online,Card:Card,DD:DD,Cheque:Cheque' - source: pt - isMandatory: false - searchClause: AND instrumenttype = $paymentMode - - name: financialyear - label: Financial Year - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name - source: pt - wrapper: true - isMandatory: false - searchClause: AND financialyear = $financialyear - - name: localityArray - label: reports.pt.zoneList - type: boundarylist - source: pt - isMandatory: false - searchClause: AND pt_addr.locality IN ($localityArray) - query: | - -- Use CTE to force query plan, compute & use CTE later - WITH receipt_breakup AS ( - SELECT - receiptheader, - SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, - SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocrebate, - SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, - SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, - (SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END)) - as propertytax, - SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN adjustedamount ELSE 0 END) as exemption, - (SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END)) as adjusment - FROM egcl_receiptdetails_v1 - WHERE tenantid LIKE $tenantid - GROUP BY receiptheader - ) - SELECT - rh.tenantid AS tenantid, - rh.id, - Substring(rh.consumercode, '(.*):') AS propertyid, - Substring(rh.consumercode, ':(.*)') AS assessmentnumber, - rh.consumercode, - rh.receiptdate, - To_char(To_timestamp(rh.receiptdate / 1000), 'DD/MM/YYYY') AS transactiondate, - bankid AS bankname, - receiptnumber, - amount, - instrumenttype, - transactionnumber, - receipt_breakup.*, - rh.totalamount - ih.amount AS pendingamount, - pt_detail.financialyear, - To_char(To_timestamp(rh.manualreceiptdate / 1000), 'DD/MM/YYYY') AS g8issuedate, - Initcap(COALESCE(pt_detail.usagecategoryminor, pt_detail.usagecategorymajor)) as usagetype, - manualreceiptnumber as g8receiptno - FROM egcl_receiptheader_v1 AS rh - JOIN egcl_receiptinstrument_v1 AS ri ON rh.id = ri.receiptheader - JOIN egcl_instrumentheader_v1 AS ih ON ih.id = ri.instrumentheader - JOIN receipt_breakup ON rh.id = receipt_breakup.receiptheader - JOIN eg_pt_propertydetail_v2 pt_detail ON CONCAT(pt_detail.property, ':', pt_detail.assessmentnumber) = rh.consumercode - JOIN eg_pt_address_v2 pt_addr ON pt_detail.property = pt_addr.property - WHERE rh.tenantid LIKE $tenantid and rh.status != 'Cancelled' - orderby: ORDER BY rh.receiptdate DESC - -- reportName: CancelledReceiptRegister - summary: Receipt Register for cancelled Receipts - version: 1.0.0 - moduleName: rainmaker-pt - sourceColumns: - - name: receiptnumber - label: reports.pt.receiptNo - type: string - source: pt - total: false - - name: status - label: reports.pt.status - type: string - source: pt - total: false - - name: transactiondate - label: reports.pt.receiptDate - type: string - source: pt - total: false - - name: g8issuedate - label: reports.pt.g8issuedate - type: string - source: pt - total: false - - name: g8receiptno - label: reports.pt.g8receiptno - type: string - source: pt - total: false - - name: amount - label: reports.pt.amount - type: string - source: pt - total: true - - name: propertytax - label: reports.pt.propertyTax - type: string - source: pt - total: true - - name: firecess - label: reports.pt.fireCess - type: string - source: pt - total: true - - name: cancercess - label: reports.pt.cancerCess - type: string - source: pt - total: true - - name: rebate - label: reports.pt.rebate - type: string - source: pt - total: true - - name: adhocrebate - label: reports.pt.adhocrebate - type: string - source: pt - total: true - - name: penalty - label: reports.pt.penalty - type: string - source: pt - total: true - - name: adhocpenalty - label: reports.pt.adhocpenalty - type: string - source: pt - total: true - - name: interest - label: reports.pt.interest - type: string - source: pt - total: true - - name: exemption - label: reports.pt.exemption - type: string - source: pt - total: true - - name: adjusment - label: reports.pt.roundoff - type: string - source: pt - total: true - - name: propertyid - label: reports.pt.propertyId - type: string - source: pt - total: false - - name: usagetype - label: reports.pt.usagetype - type: string - source: pt - total: false - - name: assessmentnumber - label: reports.pt.assessmentNo - type: string - source: pt - total: false - - name: financialyear - label: reports.pt.financialYear - type: string - source: pt - total: false - - name: instrumenttype - label: reports.pt.paymentMode - type: string - source: pt - total: false - - name: transactionnumber - label: reports.pt.ddChequeTransactionNo - type: string - source: pt - total: false - - name: bankname - label: reports.pt.bankName - type: string - source: pt - total: false - searchParams: - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: false - searchClause: AND rh.receiptdate >= $fromDate - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: false - searchClause: AND rh.receiptdate <= $toDate - - name: paymentMode - label: Payment Mode - type: singlevaluelist - pattern: 'list://Cash:Cash,Online:Online,Card:Card,DD:DD,Cheque:Cheque' - source: pt - isMandatory: false - searchClause: AND instrumenttype = $paymentMode - - name: financialyear - label: Financial Year - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name - source: pt - wrapper: true - isMandatory: false - searchClause: AND financialyear = $financialyear - - name: localityArray - label: reports.pt.zoneList - type: boundarylist - source: pt - isMandatory: false - searchClause: AND pt_addr.locality IN ($localityArray) - query: | - -- Use CTE to force query plan, compute & use CTE later - WITH receipt_breakup AS ( - SELECT - receiptheader, - SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, - SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocrebate, - SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, - SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, - (SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END)) - as propertytax, - SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN adjustedamount ELSE 0 END) as exemption, - (SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END)) as adjusment - FROM egcl_receiptdetails_v1 - WHERE tenantid LIKE $tenantid - GROUP BY receiptheader - ) - SELECT - rh.tenantid AS tenantid, - rh.id, - Substring(rh.consumercode, '(.*):') AS propertyid, - Substring(rh.consumercode, ':(.*)') AS assessmentnumber, - rh.status, - rh.consumercode, - rh.receiptdate, - To_char(To_timestamp(rh.receiptdate / 1000), 'DD/MM/YYYY') AS transactiondate, - bankid AS bankname, - receiptnumber, - amount, - instrumenttype, - transactionnumber, - receipt_breakup.*, - rh.totalamount - ih.amount AS pendingamount, - pt_detail.financialyear, - To_char(To_timestamp(rh.manualreceiptdate / 1000), 'DD/MM/YYYY') AS g8issuedate, - Initcap(COALESCE(pt_detail.usagecategoryminor, pt_detail.usagecategorymajor)) as usagetype, - manualreceiptnumber as g8receiptno - FROM egcl_receiptheader_v1 AS rh - JOIN egcl_receiptinstrument_v1 AS ri ON rh.id = ri.receiptheader - JOIN egcl_instrumentheader_v1 AS ih ON ih.id = ri.instrumentheader - JOIN receipt_breakup ON rh.id = receipt_breakup.receiptheader - JOIN eg_pt_propertydetail_v2 pt_detail ON CONCAT(pt_detail.property, ':', pt_detail.assessmentnumber) = rh.consumercode - JOIN eg_pt_address_v2 pt_addr ON pt_detail.property = pt_addr.property - WHERE rh.tenantid LIKE $tenantid and rh.status = 'Cancelled' - orderby: ORDER BY rh.receiptdate DESC - -- reportName: OldUlbWisePtCollection - summary: ULB-wise PT Collection - version: 1.0.0 - moduleName: rainmaker-pt - sourceColumns: - - name: totalassessments - label: reports.pt.totalassessments - type: string - source: pt - total: true - - name: totalamountpaid - label: reports.pt.totalamountpaid - type: string - source: pt - total: true - - name: totalamountdue - label: reports.pt.totalamountdue - type: string - source: pt - total: true - searchParams: - - name: financialyear - label: Financial Year - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name - source: pt - wrapper: true - isMandatory: false - searchClause: AND financialyear = $financialyear - - name: usage - label: Usage - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=PropertyTax&masterName=UsageCategoryMajor|$..code|$..name - source: pt - wrapper: true - isMandatory: false - searchClause: AND usagecategorymajor = $usage - query: | - SELECT - tenantid, - COUNT(*) AS totalassessments, - SUM(totalamount) AS totalamount, - SUM(amount) AS totalamountpaid, - (SUM(totalamount) - SUM(amount)) AS totalamountdue - FROM eg_pt_propertydetail_v2 AS pd - LEFT OUTER JOIN - (SELECT consumercode, totalamount, amount FROM egcl_receiptheader_v1 AS rh - LEFT OUTER JOIN egcl_receiptinstrument_v1 AS ri ON rh.id = ri.receiptheader - LEFT OUTER JOIN egcl_instrumentheader_v1 AS ih ON ri.instrumentheader = ih.id - and ih.instrumentstatus != 'CANCELLED' - where rh.status != 'Cancelled' - ) AS instrument_data ON CONCAT(pd.property, ':', pd.assessmentnumber) = instrument_data.consumercode - WHERE tenantid = $tenantid - groupby: GROUP BY tenantid - orderby: ORDER BY tenantid, totalamountpaid DESC NULLS LAST - -- reportName: StateCancelledReceiptRegister - summary: Receipt Register for cancelled Receipts State - version: 1.0.0 - moduleName: rainmaker-pt - sourceColumns: - - name: tenantid - label: reports.pt.ulbName - type: string - source: pt - total: false - - name: receiptnumber - label: reports.pt.receiptNo - type: string - source: pt - total: false - - name: status - label: reports.pt.status - type: string - source: pt - total: false - - name: transactiondate - label: reports.pt.receiptDate - type: string - source: pt - total: false - - name: g8issuedate - label: reports.pt.g8issuedate - type: string - source: pt - total: false - - name: g8receiptno - label: reports.pt.g8receiptno - type: string - source: pt - total: false - - name: amount - label: reports.pt.amount - type: string - source: pt - total: true - - name: propertytax - label: reports.pt.propertyTax - type: string - source: pt - total: true - - name: firecess - label: reports.pt.fireCess - type: string - source: pt - total: true - - name: cancercess - label: reports.pt.cancerCess - type: string - source: pt - total: true - - name: rebate - label: reports.pt.rebate - type: string - source: pt - total: true - - name: adhocrebate - label: reports.pt.adhocrebate - type: string - source: pt - total: true - - name: penalty - label: reports.pt.penalty - type: string - source: pt - total: true - - name: adhocpenalty - label: reports.pt.adhocpenalty - type: string - source: pt - total: true - - name: interest - label: reports.pt.interest - type: string - source: pt - total: true - - name: exemption - label: reports.pt.exemption - type: string - source: pt - total: true - - name: adjusment - label: reports.pt.roundoff - type: string - source: pt - total: true - - name: propertyid - label: reports.pt.propertyId - type: string - source: pt - total: false - - name: usagetype - label: reports.pt.usagetype - type: string - source: pt - total: false - - name: assessmentnumber - label: reports.pt.assessmentNo - type: string - source: pt - total: false - - name: financialyear - label: reports.pt.financialYear - type: string - source: pt - total: false - - name: instrumenttype - label: reports.pt.paymentMode - type: string - source: pt - total: false - - name: transactionnumber - label: reports.pt.ddChequeTransactionNo - type: string - source: pt - total: false - - name: bankname - label: reports.pt.bankName - type: string - source: pt - total: false - searchParams: - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: false - searchClause: AND rh.receiptdate >= $fromDate - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: false - searchClause: AND rh.receiptdate <= $toDate - - name: paymentMode - label: Payment Mode - type: singlevaluelist - pattern: 'list://Cash:Cash,Online:Online,Card:Card,DD:DD,Cheque:Cheque' - source: pt - isMandatory: false - searchClause: AND instrumenttype = $paymentMode - - name: financialyear - label: Financial Year - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name - source: pt - wrapper: true - isMandatory: false - searchClause: AND financialyear = $financialyear - query: | - -- Use CTE to force query plan, compute & use CTE later - WITH receipt_breakup AS ( - SELECT - receiptheader, - SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, - SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocrebate, - SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, - SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, - SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, - SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, - (SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END)) - as propertytax, - SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN adjustedamount ELSE 0 END) as exemption, - (SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END) - + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END)) as adjusment - FROM egcl_receiptdetails_v1 - WHERE tenantid != 'pb.testing' - GROUP BY receiptheader - ) - SELECT - initcap(split_part(rh.tenantid, '.', 2)) as tenantid, - rh.id, - Substring(rh.consumercode, '(.*):') AS propertyid, - Substring(rh.consumercode, ':(.*)') AS assessmentnumber, - rh.status, - rh.consumercode, - rh.receiptdate, - To_char(To_timestamp(rh.receiptdate / 1000), 'DD/MM/YYYY') AS transactiondate, - bankid AS bankname, - receiptnumber, - amount, - instrumenttype, - transactionnumber, - receipt_breakup.*, - pt_detail.financialyear, - To_char(To_timestamp(rh.manualreceiptdate / 1000), 'DD/MM/YYYY') AS g8issuedate, - Initcap(COALESCE(pt_detail.usagecategoryminor, pt_detail.usagecategorymajor)) as usagetype, - manualreceiptnumber as g8receiptno - FROM egcl_receiptheader_v1 AS rh - JOIN egcl_receiptinstrument_v1 AS ri ON rh.id = ri.receiptheader - JOIN egcl_instrumentheader_v1 AS ih ON ih.id = ri.instrumentheader - JOIN receipt_breakup ON rh.id = receipt_breakup.receiptheader - JOIN eg_pt_propertydetail_v2 pt_detail ON CONCAT(pt_detail.property, ':', pt_detail.assessmentnumber) = rh.consumercode - JOIN eg_pt_address_v2 pt_addr ON pt_detail.property = pt_addr.property - WHERE rh.tenantid != 'pb.testing' and rh.status = 'Cancelled' - orderby: ORDER BY rh.receiptdate DESC - -- reportName: StateWidePtCollection - summary: State Wide PT Collection - version: 1.0.0 - moduleName: rainmaker-pt - sourceColumns: - - name: tenantid - label: reports.pt.ulbName - type: string - source: pt - total: false - - name: totalassessments - label: reports.pt.totalassessments - type: string - source: pt - total: true - - name: totalamountpaid - label: reports.pt.totalamountpaid - type: string - source: pt - total: true - - name: totaloffline - label: reports.pt.totaloffline - type: string - source: pt - total: true - - name: totalonline - label: reports.pt.totalonline - type: string - source: pt - total: true - - name: totalamountdue - label: reports.pt.totalamountdue - type: string - source: pt - total: true - searchParams: - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: false - searchClause: AND receiptdate >= $fromDate - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: false - searchClause: AND receiptdate <= $toDate - - name: ulb - label: ULB - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name - source: pt - wrapper: true - isMandatory: false - searchClause: AND tenantid = $ulb - - name: financialyear - label: Financial Year - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name - source: pt - wrapper: true - isMandatory: false - searchClause: AND financialyear = $financialyear - - name: usage - label: Usage - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=PropertyTax&masterName=UsageCategoryMajor|$..code|$..name - source: pt - wrapper: true - isMandatory: false - searchClause: AND usagecategorymajor = $usage - query: | - SELECT - initcap(split_part(tenantid, '.', 2)) as tenantid, - COUNT(*) AS totalassessments, - SUM(totalamount) AS totalamount, - SUM(amount) AS totalamountpaid, - SUM(CASE WHEN collectiontype LIKE 'ONLINE' THEN amount ELSE 0 END) AS totalonline, - SUM(CASE WHEN collectiontype LIKE 'COUNTER' THEN amount ELSE 0 END) AS totaloffline, - (SUM(totalamount) - SUM(amount)) AS totalamountdue - FROM eg_pt_propertydetail_v2 AS pd - LEFT OUTER JOIN (SELECT consumercode, totalamount, amount, collectiontype, receiptdate FROM egcl_receiptheader_v1 AS rh - LEFT OUTER JOIN egcl_receiptinstrument_v1 AS ri ON rh.id = ri.receiptheader - LEFT OUTER JOIN egcl_instrumentheader_v1 AS ih ON ri.instrumentheader = ih.id and ih.instrumentstatus != 'CANCELLED' - where rh.status != 'Cancelled' - ) AS tbl_amounts ON CONCAT(pd.property, ':', pd.assessmentnumber) = tbl_amounts.consumercode - WHERE tenantid LIKE CONCAT(SPLIT_PART($tenantid, '.', 1), '%') and tenantid != 'pb.testing' - groupby: GROUP BY tenantid - orderby: ORDER BY tenantid, totalamountpaid DESC NULLS LAST - -- reportName: UlbWisePtCollection - summary: State Wide PT Collection - version: 1.0.0 - moduleName: rainmaker-pt - sourceColumns: - - name: totalassessments - label: reports.pt.totalassessments - type: string - source: pt - total: true - - name: totalamountpaid - label: reports.pt.totalamountpaid - type: string - source: pt - total: true - - name: totaloffline - label: reports.pt.totaloffline - type: string - source: pt - total: true - - name: totalonline - label: reports.pt.totalonline - type: string - source: pt - total: true - - name: totalamountdue - label: reports.pt.totalamountdue - type: string - source: pt - total: true - searchParams: - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: false - searchClause: AND receiptdate >= $fromDate - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: false - searchClause: AND receiptdate <= $toDate - - name: financialyear - label: Financial Year - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name - source: pt - wrapper: true - isMandatory: false - searchClause: AND financialyear = $financialyear - - name: usage - label: Usage - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=PropertyTax&masterName=UsageCategoryMajor|$..code|$..name - source: pt - wrapper: true - isMandatory: false - searchClause: AND usagecategorymajor = $usage - query: | - SELECT - initcap(split_part(tenantid, '.', 2)) as tenantid, - COUNT(*) AS totalassessments, - SUM(totalamount) AS totalamount, - SUM(amount) AS totalamountpaid, - SUM(CASE WHEN collectiontype LIKE 'ONLINE' THEN amount ELSE 0 END) AS totalonline, - SUM(CASE WHEN collectiontype LIKE 'COUNTER' THEN amount ELSE 0 END) AS totaloffline, - (SUM(totalamount) - SUM(amount)) AS totalamountdue - FROM eg_pt_propertydetail_v2 AS pd - LEFT OUTER JOIN (SELECT consumercode, totalamount, amount, collectiontype, receiptdate FROM egcl_receiptheader_v1 AS rh - LEFT OUTER JOIN egcl_receiptinstrument_v1 AS ri ON rh.id = ri.receiptheader - LEFT OUTER JOIN egcl_instrumentheader_v1 AS ih ON ri.instrumentheader = ih.id and ih.instrumentstatus != 'CANCELLED' - where rh.status != 'Cancelled' - ) AS tbl_amounts ON CONCAT(pd.property, ':', pd.assessmentnumber) = tbl_amounts.consumercode - WHERE tenantid LIKE CONCAT(SPLIT_PART($tenantid, '.', 1), '%') and tenantid = $tenantid - groupby: GROUP BY tenantid - orderby: ORDER BY tenantid, totalamountpaid DESC NULLS LAST - - -- reportName: ULBPTDataDumpReport - summary: ULB level report - version: 1.0.0 - moduleName: rainmaker-pt - sourceColumns: - - name: ulb - label: reports.pt.ulb - type: string - source: pt - total: false - - name: propertytaxuniqueid - label: reports.pt.propertytaxuniqueid - type: string - source: pt - total: false - - name: transcationdate - label: reports.pt.transcationdate - type: string - source: pt - total: false - - name: receiptnumber - label: reports.pt.receiptnumber - type: string - source: pt - total: false - - name: existingpropertyid - label: reports.pt.existingpropertyid - type: string - source: pt - total: false - - name: ownername - label: reports.pt.ownername - type: string - source: pt - total: false - - name: guardianname - label: reports.pt.guardianname - type: string - source: pt - total: false - - name: totalarea - label: reports.pt.totalarea - type: string - source: pt - total: false - - name: builtarea - label: reports.pt.builtarea - type: string - source: pt - total: false - - name: floors - label: reports.pt.floors - type: string - source: pt - total: false - - name: occupancy - label: reports.pt.occupancy - type: string - source: pt - total: false - - name: propertytype - label: reports.pt.propertytype - type: string - source: pt - total: false - - name: mobileno - label: reports.pt.mobileno - type: string - source: pt - total: false - - name: transcationmode - label: reports.pt.transcationmode - type: string - source: pt - total: false - - name: paymentamount - label: reports.pt.paymentamount - type: string - source: pt - total: true - - name: paymentdate - label: reports.pt.paymentdate - type: string - source: pt - total: false - - name: emailid - label: reports.pt.emailid - type: string - source: pt - total: false - - name: address - label: reports.pt.address - type: string - source: pt - total: false - searchParams: - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: false - searchClause: AND rh.receiptdate >= $fromDate - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: false - searchClause: AND rh.receiptdate <= $toDate - query: | - --S.no Service Name ULB Property Tax Unique ID Date Of Transcation Receipt Number Existing Property ID Owner Name Guardian Name Total Area (SQ.YARD) Covered Area/Built Area (SQ.FEET) Floors Occupancy (Rented,Self /Unoccupied) Type Of Property Mobile Number Transcation Mode of Payment Payment Amount Payment Date Email Id Address - with eg_pt_unit_v2_ot as ( - select - propertydetail, - string_agg(distinct pu.occupancytype, ',') as occupancytype, - string_agg(distinct coalesce(usagecategoryminor, usagecategorymajor), ',') as propertytype - from eg_pt_unit_v2 as pu - where pu.tenantid = $tenantid - group by propertydetail - ) - select - distinct on (rh.receiptnumber) - initcap(split_part(rh.tenantid, '.', 2)) as "ulb", - split_part(consumercode, ':', 1) as "propertytaxuniqueid", - to_timestamp(receiptdate/1000) at time zone 'Asia/Kolkata' as "transcationdate", - receiptnumber as "receiptnumber", - pt.oldpropertyid as "existingpropertyid", - eu."name" as "ownername", - eu.guardian as "guardianname", - pd.landarea as "totalarea", - pd.builduparea * 9 as "builtarea", - pd.nooffloors as "floors", - pot.occupancytype as "occupancy", - pot.propertytype as "propertytype", - eu.mobilenumber as "mobileno", - instrumenttype as "transcationmode", - ih.amount as "paymentamount", - to_timestamp(ih.transactiondate/1000) at time zone 'Asia/Kolkata' as "paymentdate", - eu.emailid as "emailid" , - REGEXP_REPLACE(REGEXP_REPLACE(CONCAT(pta.doorno, ',', pta.addressline1, ',', pta.addressline2, ',', pta.buildingname, ',', pta.pincode), ',+', ','), '^,|,$', '') as "address" - from egcl_receiptheader_v1 as rh - inner join egcl_receiptinstrument_v1 as ri on ri.receiptheader = rh.id inner join egcl_instrumentheader_v1 as ih on ih.id = ri.instrumentheader - inner join eg_pt_property_v2 as pt on pt.propertyid = split_part(consumercode, ':', 1) - inner join eg_pt_propertydetail_v2 as pd on pd.assessmentnumber = split_part(consumercode, ':', 2) - inner join eg_pt_owner_v2 as po on po.propertydetail = pd.assessmentnumber - inner join eg_user as eu on eu.uuid = po.userid - inner join eg_pt_address_v2 as pta on pta.property = pt.propertyid - inner join eg_pt_unit_v2_ot as pot on pot.propertydetail = pd.assessmentnumber - where rh.tenantid = $tenantid \ No newline at end of file diff --git a/configs/reports/configs/rainmaker-tl-reports.yml b/configs/reports/configs/rainmaker-tl-reports.yml deleted file mode 100644 index 9987e3e4..00000000 --- a/configs/reports/configs/rainmaker-tl-reports.yml +++ /dev/null @@ -1,781 +0,0 @@ ---- -ReportDefinitions: -- reportName: TradeLicenseRegistryReport - decryptionPathId: TradeLicenseRegistryReport - summary: TL Receipt Register Report - version: 1.0.0 - moduleName: rainmaker-tl - sourceColumns: - - name: receiptnumber - label: report.tl.receiptnumber - type: string - source: tl - total: false - - name: receiptIssueDate - label: report.tl.receiptissuedate - type: string - source: tl - total: false - - name: g8issuedate - label: report.tl.g8issuedate - type: string - source: tl - total: false - - name: g8receiptno - label: report.tl.g8receiptno - type: string - source: tl - total: false - - name: licensenumber - label: report.tl.licensenumber - type: string - source: tl - total: false - - name: formattedIssuedDate - label: report.tl.issueddate - type: string - source: tl - total: false - - name: name - label: report.tl.user.name - type: string - source: tl - total: false - - name: mobilenumber - label: report.tl.user.mobilenumber - type: string - source: tl - total: false - - name: bankid - label: report.tl.bankid - type: string - source: tl - total: false - - name: branchname - label: report.tl.branchname - type: string - source: tl - total: false - - name: transactionumber - label: report.tl.transactionumber - type: string - source: tl - total: false - - name: instrumenttype - label: report.tl.instrumenttype - type: string - source: tl - total: false - - name: status - label: report.tl.status - type: string - source: tl - total: false - - name: tradeTypeName - label: report.tl.tradetype - type: string - source: tl - total: true - - name: acc - label: report.tl.accessorycategories - type: string - source: tl - total: false - - name: tradeName - label: report.tl.tradeName - type: string - source: tl - total: false - - name: totalamount - label: report.tl.receipt.totalamount - type: string - source: tl - total: true - searchParams: - - name: fromDate - label: reports.tl.fromDate - type: epoch - source: tl - isMandatory: false - searchClause: AND receipt.createddate >= $fromDate - - name: toDate - label: reports.tl.toDate - type: epoch - source: tl - isMandatory: false - searchClause: AND receipt.createddate <= $toDate - query: | - SELECT - licensenumber, - to_char(To_timestamp(issueddate / 1000), 'DD/MM/YYYY') as formattedIssuedDate, - tl.tradeName, - initcap(tl.status) as status, - to_char(To_timestamp(receipt.receiptdate / 1000), 'DD/MM/YYYY') as receiptIssueDate , - receipt.receiptnumber, - tradeTypeName, - acc, - name, - mobilenumber, - ih.bankid, - ih.branchname, - ih.transactionnumber, - ih.instrumenttype, - amount as totalamount, - To_char(To_timestamp(receipt.manualreceiptdate / 1000), 'DD/MM/YYYY') AS g8issuedate, - receipt.manualreceiptnumber as g8receiptno - - FROM eg_tl_tradelicense tl - INNER JOIN eg_tl_tradelicensedetail tld ON tld.tradelicenseid = tl.id - INNER JOIN ( - SELECT tradelicensedetailid,array_to_string(array_agg(message.message),', ') as tradeTypeName FROM eg_tl_tradeunit - INNER JOIN message ON split_part(message.code,'_',2) = tradeType AND message.locale = 'en_IN' GROUP BY 1) tlunit ON tlunit.tradelicensedetailid = tld.id - INNER JOIN ( - SELECT tradelicensedetailid, array_to_string(array_agg(name),', ') as name, array_to_string(array_agg(mobilenumber),', ') as mobilenumber - FROM eg_tl_owner tlowner - INNER JOIN eg_user tluser ON tluser.uuid = tlowner.id - group by tradelicensedetailid - ) tlown ON tlown.tradelicensedetailid = tld.id - LEFT OUTER JOIN egcl_receiptheader_v1 receipt ON receipt.consumercode = tl.applicationnumber and receipt.status != 'Cancelled' - LEFT OUTER JOIN egcl_receiptinstrument_v1 as ri ON ri.receiptheader = receipt.id - LEFT OUTER JOIN egcl_instrumentheader_v1 as ih ON ih.id = ri.instrumentheader and ih.instrumentstatus != 'CANCELLED' - LEFT OUTER JOIN (SELECT tradelicensedetailid,array_to_string(array_agg(message.message),',') AS acc FROM eg_tl_accessory - LEFT OUTER JOIN message ON split_part(message.code,'_',2) = accessorycategory AND message.locale = 'en_IN' GROUP BY 1 ) tlacc ON tlacc.tradelicensedetailid = tld.id - WHERE tl.Status in ('APPROVED', 'PAID', 'CANCELLED') AND tl.tenantId LIKE $tenantid - -- reportName: StateTradeLicenseCancelledRegistryReport - summary: TL Cancelled Receipt Register Report - version: 1.0.0 - moduleName: rainmaker-tl - sourceColumns: - - name: tenantId - label: report.tl.tenantid - type: string - source: tl - total: false - - name: receiptnumber - label: report.tl.receiptnumber - type: string - source: tl - total: false - - name: receiptIssueDate - label: report.tl.receiptissuedate - type: string - source: tl - total: false - - name: g8issuedate - label: report.tl.g8issuedate - type: string - source: tl - total: false - - name: g8receiptno - label: report.tl.g8receiptno - type: string - source: tl - total: false - - name: licensenumber - label: report.tl.licensenumber - type: string - source: tl - total: false - - name: formattedIssuedDate - label: report.tl.issueddate - type: string - source: tl - total: false - - name: name - label: report.tl.user.name - type: string - source: tl - total: false - - name: mobilenumber - label: report.tl.user.mobilenumber - type: string - source: tl - total: false - - name: bankid - label: report.tl.bankid - type: string - source: tl - total: false - - name: branchname - label: report.tl.branchname - type: string - source: tl - total: false - - name: transactionumber - label: report.tl.transactionumber - type: string - source: tl - total: false - - name: instrumenttype - label: report.tl.instrumenttype - type: string - source: tl - total: false - - name: status - label: report.tl.status - type: string - source: tl - total: false - - name: tradeTypeName - label: report.tl.tradetype - type: string - source: tl - total: false - - name: acc - label: report.tl.accessorycategories - type: string - source: tl - total: false - - name: tradeName - label: report.tl.tradeName - type: string - source: tl - total: false - - name: totalamount - label: report.tl.receipt.totalamount - type: number - source: tl - total: true - searchParams: - - name: fromDate - label: reports.tl.fromDate - type: epoch - source: tl - isMandatory: false - searchClause: AND receipt.createddate >= $fromDate - - name: toDate - label: reports.tl.toDate - type: epoch - source: tl - isMandatory: false - searchClause: AND receipt.createddate <= $toDate - query: | - SELECT - initcap(split_part(tl.tenantId, '.', 2)) as tenantId, - licensenumber, - to_char(To_timestamp(issueddate / 1000), 'DD/MM/YYYY') as formattedIssuedDate, - tl.tradeName, - initcap(tl.status) as status, - to_char(To_timestamp(receipt.receiptdate / 1000), 'DD/MM/YYYY') as receiptIssueDate , - receipt.receiptnumber, - tradeTypeName, - acc, - name, - mobilenumber, - ih.bankid, - ih.branchname, - ih.transactionnumber, - ih.instrumenttype, - amount as totalamount, - To_char(To_timestamp(receipt.manualreceiptdate / 1000), 'DD/MM/YYYY') AS g8issuedate, - receipt.manualreceiptnumber as g8receiptno - - FROM eg_tl_tradelicense tl - INNER JOIN eg_tl_tradelicensedetail tld ON tld.tradelicenseid = tl.id - INNER JOIN ( - SELECT tradelicensedetailid,array_to_string(array_agg(message.message),', ') as tradeTypeName FROM eg_tl_tradeunit - INNER JOIN message ON split_part(message.code,'_',2) = tradeType AND message.locale = 'en_IN' GROUP BY 1) tlunit ON tlunit.tradelicensedetailid = tld.id - INNER JOIN ( - SELECT tradelicensedetailid, array_to_string(array_agg(name),', ') as name, array_to_string(array_agg(mobilenumber),', ') as mobilenumber - FROM eg_tl_owner tlowner - INNER JOIN eg_user tluser ON tluser.uuid = tlowner.id - group by tradelicensedetailid - ) tlown ON tlown.tradelicensedetailid = tld.id - INNER JOIN egcl_receiptheader_v1 receipt ON receipt.consumercode = tl.applicationnumber and receipt.status = 'Cancelled' - INNER JOIN egcl_receiptinstrument_v1 as ri ON ri.receiptheader = receipt.id - INNER JOIN egcl_instrumentheader_v1 as ih ON ih.id = ri.instrumentheader - LEFT OUTER JOIN (SELECT tradelicensedetailid,array_to_string(array_agg(message.message),',') AS acc FROM eg_tl_accessory - LEFT OUTER JOIN message ON split_part(message.code,'_',2) = accessorycategory AND message.locale = 'en_IN' GROUP BY 1 ) tlacc ON tlacc.tradelicensedetailid = tld.id - WHERE tl.tenantId != 'pb.testing' - -- reportName: TradeLicenseCancelledRegistryReport - summary: TL Cancelled Receipt Register Report - version: 1.0.0 - moduleName: rainmaker-tl - sourceColumns: - - name: receiptnumber - label: report.tl.receiptnumber - type: string - source: tl - total: false - - name: receiptIssueDate - label: report.tl.receiptissuedate - type: string - source: tl - total: false - - name: g8issuedate - label: report.tl.g8issuedate - type: string - source: tl - total: false - - name: g8receiptno - label: report.tl.g8receiptno - type: string - source: tl - total: false - - name: licensenumber - label: report.tl.licensenumber - type: string - source: tl - total: false - - name: formattedIssuedDate - label: report.tl.issueddate - type: string - source: tl - total: false - - name: name - label: report.tl.user.name - type: string - source: tl - total: false - - name: mobilenumber - label: report.tl.user.mobilenumber - type: string - source: tl - total: false - - name: bankid - label: report.tl.bankid - type: string - source: tl - total: false - - name: branchname - label: report.tl.branchname - type: string - source: tl - total: false - - name: transactionumber - label: report.tl.transactionumber - type: string - source: tl - total: false - - name: instrumenttype - label: report.tl.instrumenttype - type: string - source: tl - total: false - - name: status - label: report.tl.status - type: string - source: tl - total: false - - name: tradeTypeName - label: report.tl.tradetype - type: string - source: tl - total: false - - name: acc - label: report.tl.accessorycategories - type: string - source: tl - total: false - - name: tradeName - label: report.tl.tradeName - type: string - source: tl - total: false - - name: totalamount - label: report.tl.receipt.totalamount - type: number - source: tl - total: true - searchParams: - - name: fromDate - label: reports.tl.fromDate - type: epoch - source: tl - isMandatory: false - searchClause: AND receipt.createddate >= $fromDate - - name: toDate - label: reports.tl.toDate - type: epoch - source: tl - isMandatory: false - searchClause: AND receipt.createddate <= $toDate - query: | - SELECT - licensenumber, - to_char(To_timestamp(issueddate / 1000), 'DD/MM/YYYY') as formattedIssuedDate, - tl.tradeName, - initcap(tl.status) as status, - to_char(To_timestamp(receipt.receiptdate / 1000), 'DD/MM/YYYY') as receiptIssueDate , - receipt.receiptnumber, - tradeTypeName, - acc, - name, - mobilenumber, - ih.bankid, - ih.branchname, - ih.transactionnumber, - ih.instrumenttype, - amount as totalamount, - To_char(To_timestamp(receipt.manualreceiptdate / 1000), 'DD/MM/YYYY') AS g8issuedate, - receipt.manualreceiptnumber as g8receiptno - - FROM eg_tl_tradelicense tl - INNER JOIN eg_tl_tradelicensedetail tld ON tld.tradelicenseid = tl.id - INNER JOIN ( - SELECT tradelicensedetailid,array_to_string(array_agg(message.message),', ') as tradeTypeName FROM eg_tl_tradeunit - INNER JOIN message ON split_part(message.code,'_',2) = tradeType AND message.locale = 'en_IN' GROUP BY 1) tlunit ON tlunit.tradelicensedetailid = tld.id - INNER JOIN ( - SELECT tradelicensedetailid, array_to_string(array_agg(name),', ') as name, array_to_string(array_agg(mobilenumber),', ') as mobilenumber - FROM eg_tl_owner tlowner - INNER JOIN eg_user tluser ON tluser.uuid = tlowner.id - group by tradelicensedetailid - ) tlown ON tlown.tradelicensedetailid = tld.id - INNER JOIN egcl_receiptheader_v1 receipt ON receipt.consumercode = tl.applicationnumber and receipt.status = 'Cancelled' - INNER JOIN egcl_receiptinstrument_v1 as ri ON ri.receiptheader = receipt.id - INNER JOIN egcl_instrumentheader_v1 as ih ON ih.id = ri.instrumentheader - LEFT OUTER JOIN (SELECT tradelicensedetailid,array_to_string(array_agg(message.message),',') AS acc FROM eg_tl_accessory - LEFT OUTER JOIN message ON split_part(message.code,'_',2) = accessorycategory AND message.locale = 'en_IN' GROUP BY 1 ) tlacc ON tlacc.tradelicensedetailid = tld.id - WHERE tl.tenantId LIKE $tenantid - - -- reportName: TradeWiseCollectionReport - summary: Collection according to tradeTypes - version: 1.0.0 - moduleName: rainmaker-tl - sourceColumns: - - name: transactionNumber - label: report.tl.totalTransaction - type: string - source: tl - total: false - - name: online - label: report.tl.online.collection - type: number - source: tl - total: true - - name: offline - label: report.tl.offline.collection - type: number - source: tl - total: true - - name: total - label: report.tl.totalCollection - type: number - source: tl - total: true - searchParams: - - name: fromDate - label: reports.tl.fromDate - type: epoch - source: tl - isMandatory: false - searchClause: AND rh.receiptdate >= $fromDate - - name: toDate - label: reports.tl.toDate - type: epoch - source: tl - isMandatory: false - searchClause: AND rh.receiptdate <= $toDate - query: | - select - sum(ih.amount) as total, - count(*) as transactionNumber, - sum(case collectiontype when 'COUNTER' then amount else 0 end) as offline, - sum(case collectiontype when 'ONLINE' then amount else 0 end) as online, - initcap(split_part(rh.tenantId, '.', 2)) as tenantId - from egcl_receiptheader_v1 as rh - inner join egcl_receiptinstrument_v1 as ri on ri.receiptheader = rh.id - inner join egcl_instrumentheader_v1 as ih on ih.id = ri.instrumentheader - where rh.businessdetails = 'TL' and rh.status !='Cancelled' and rh.tenantid !='pb.testing' - AND rh.tenantId LIKE $tenantid - groupby: GROUP BY rh.tenantId - -- reportName: TradeLicenseApplicationStatusReport - summary: Nummber of applications by there status - version: 1.0.0 - moduleName: rainmaker-tl - externalService: - - entity: $.messages[*] - apiURL: http://egov-localization:8080/localization/messages/v1/_search?locale=en_IN&tenantId=pb&module=rainmaker-tl - keyOrder: code,message - tableName: tbl_localization - sourceColumns: - - name: status - label: report.tl.status - type: string - source: tl - total: false - - name: total - label: report.tl.total - type: number - source: tl - total: true - searchParams: - - name: fromDate - label: reports.tl.fromDate - type: epoch - source: tl - isMandatory: false - searchClause: AND tl.lastmodifiedtime >= $fromDate - - name: toDate - label: reports.tl.toDate - type: epoch - source: tl - isMandatory: false - searchClause: AND tl.lastmodifiedtime <= $toDate - query: SELECT COUNT(applicationnumber) as total,message.message as status from eg_tl_tradelicense tl LEFT OUTER JOIN message ON split_part(message.code,'_',2) = status AND message.locale = 'en_IN' WHERE tl.tenantid LIKE $tenantid - groupby: GROUP BY message.message - orderby: ORDER BY case message.message when 'Pending Application' then 1 when 'Pending Payment' then 2 when 'Pending Approval' then 3 when 'Approved' then 4 when 'Rejected' then 5 when 'Cancelled' then 6 else 7 end - -- reportName: TradeLicenseULBWiseApplicationStatusReport - summary: Nummber of applications by there status - version: 1.0.0 - moduleName: rainmaker-tl - sourceColumns: - - name: tenantId - label: report.tl.tenantid - type: string - source: tl - total: false - - name: initiated - label: TL_INITIATED - type: number - source: tl - total: true - - name: applied - label: TL_APPLIED - type: number - source: tl - total: true - - name: paid - label: TL_PAID - type: number - source: tl - total: true - - name: approved - label: TL_APPROVED - type: number - source: tl - total: true - - name: rejected - label: TL_REJECTED - type: number - source: tl - total: true - - name: cancelled - label: TL_CANCELLED - type: number - source: tl - total: true - searchParams: - - name: fromDate - label: reports.tl.fromDate - type: epoch - source: tl - isMandatory: false - searchClause: AND tl.lastmodifiedtime >= $fromDate - - name: toDate - label: reports.tl.toDate - type: epoch - source: tl - isMandatory: false - searchClause: AND tl.lastmodifiedtime <= $toDate - query: | - SELECT - initcap(split_part(tenantId, '.', 2)) as tenantId, - SUM(CASE status when 'REJECTED' then 1 else 0 end) as rejected, - SUM(CASE status when 'INITIATED' then 1 else 0 end) as initiated, - SUM(CASE status when 'PAID' then 1 else 0 end) as paid, - SUM(CASE status when 'APPROVED' then 1 else 0 end) as approved, - SUM(CASE status when 'APPLIED' then 1 else 0 end) as applied, - SUM(CASE status when 'CANCELLED' then 1 else 0 end) as cancelled - FROM eg_tl_tradelicense as tl - WHERE tl.tenantid != 'pb.testing' - groupby: GROUP BY tenantid - orderby: ORDER BY tenantid - - -- reportName: StateLevelStatus - summary: Nummber of applications by there status state level - version: 1.0.0 - moduleName: rainmaker-tl - sourceColumns: - - name: status - label: report.tl.status - type: string - source: tl - total: false - - name: total - label: report.tl.total - type: number - source: tl - total: true - searchParams: - - name: fromDate - label: reports.tl.fromDate - type: epoch - source: tl - isMandatory: false - searchClause: AND tl.lastmodifiedtime >= $fromDate - - name: toDate - label: reports.tl.toDate - type: epoch - source: tl - isMandatory: false - searchClause: AND tl.lastmodifiedtime <= $toDate - - name: ulb - label: ULB - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name - source: tl - wrapper: true - isMandatory: false - searchClause: AND tl.tenantId = $ulb - query: SELECT COUNT(applicationnumber) as total,message.message as status from eg_tl_tradelicense tl LEFT OUTER JOIN (select distinct module,code,locale,tenantid,message from message where module='rainmaker-tl' ) as message ON split_part(message.code,'_',2) = status AND message.locale = 'en_IN' WHERE 1=1 - groupby: GROUP BY message.message - orderby: ORDER BY case message.message when 'Pending Application' then 1 when 'Pending Payment' then 2 when 'Pending Approval' then 3 when 'Approved' then 4 when 'Rejected' then 5 when 'Cancelled' then 6 else 7 end - - - -- reportName: StateLevelTradeWiseCollection - summary: Collection according to tradeTypes state level - version: 1.0.0 - moduleName: rainmaker-tl - sourceColumns: - - name: tenantId - label: report.tl.tenantid - type: string - source: tl - total: false - - name: transactionNumber - label: report.tl.totalTransaction - type: string - source: tl - total: true - - name: online - label: report.tl.online.collection - type: number - source: tl - total: true - - name: offline - label: report.tl.offline.collection - type: number - source: tl - total: true - - name: total - label: report.tl.totalCollection - type: number - source: tl - total: true - searchParams: - - name: fromDate - label: reports.tl.fromDate - type: epoch - source: tl - isMandatory: false - searchClause: AND rh.receiptdate >= $fromDate - - name: toDate - label: reports.tl.toDate - type: epoch - source: tl - isMandatory: false - searchClause: AND rh.receiptdate <= $toDate - - name: ulb - label: ULB - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name - source: tl - wrapper: true - isMandatory: false - searchClause: AND tl.tenantId = $ulb - query: | - select - sum(ih.amount) as total, - count(*) as transactionNumber, - sum(case collectiontype when 'COUNTER' then amount else 0 end) as offline, - sum(case collectiontype when 'ONLINE' then amount else 0 end) as online, - initcap(split_part(rh.tenantId, '.', 2)) as tenantId - from egcl_receiptheader_v1 as rh - inner join egcl_receiptinstrument_v1 as ri on ri.receiptheader = rh.id - inner join egcl_instrumentheader_v1 as ih on ih.id = ri.instrumentheader - where rh.businessdetails = 'TL' and rh.status !='Cancelled' and rh.tenantid !='pb.testing' - groupby: GROUP BY rh.tenantId - orderby: ORDER BY rh.tenantId asc - - -- reportName: StateLevelTradeLicenseRegistryReport - summary: TL Basic Report State Level - version: 1.0.0 - moduleName: rainmaker-tl - sourceColumns: - - name: tenantId - label: report.tl.tenantId - type: string - source: tl - total: false - - name: licensenumber - label: report.tl.licensenumber - type: string - source: tl - total: false - - name: formattedIssuedDate - label: report.tl.issueddate - type: string - source: tl - total: false - - name: g8issuedate - label: report.tl.g8issuedate - type: string - source: tl - total: false - - name: g8receiptno - label: report.tl.g8receiptno - type: string - source: tl - total: false - - name: name - label: report.tl.user.name - type: string - source: tl - total: false - - name: mobilenumber - label: report.tl.user.mobilenumber - type: string - source: tl - total: false - - name: tradeTypeName - label: report.tl.tradetype - type: string - source: tl - total: false - - name: acc - label: report.tl.accessorycategories - type: string - source: tl - total: false - - name: tradeName - label: report.tl.tradeName - type: string - source: tl - total: false - - name: totalamount - label: report.tl.receipt.totalamount - type: number - source: tl - total: true - searchParams: - - name: fromDate - label: reports.tl.fromDate - type: epoch - source: tl - isMandatory: false - searchClause: AND issueddate >= $fromDate - - name: toDate - label: reports.tl.toDate - type: epoch - source: tl - isMandatory: false - searchClause: AND issueddate <= $toDate - - name: ulb - label: ULB - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name - source: tl - wrapper: true - isMandatory: false - searchClause: AND tl.tenantId = $ulb - query: SELECT tl.tenantId as tenantId,licensenumber,to_char(To_timestamp(issueddate / 1000), 'DD/MM/YYYY') as formattedIssuedDate,tl.tradeName,tradeTypeName,acc, name,mobilenumber,amount as totalamount,To_char(To_timestamp(receipt.manualreceiptdate / 1000), 'DD/MM/YYYY') AS g8issuedate,receipt.manualreceiptnumber as g8receiptno FROM eg_tl_tradelicense tl INNER JOIN eg_tl_tradelicensedetail tld ON tld.tradelicenseid = tl.id INNER JOIN eg_tl_owner tlowner ON tlowner.tradelicensedetailid = tld.id INNER JOIN (SELECT tradelicensedetailid,message.message as tradeTypeName FROM eg_tl_tradeunit INNER JOIN message ON split_part(message.code,'_',2) = tradeType) tlunit ON tlunit.tradelicensedetailid = tld.id INNER JOIN eg_user tluser ON tluser.uuid = tlowner.id LEFT OUTER JOIN egcl_receiptheader_v1 receipt ON receipt.consumercode = tl.applicationnumber LEFT JOIN egcl_receiptinstrument_v1 as ri ON ri.receiptheader = receipt.id LEFT JOIN egcl_instrumentheader_v1 as ih ON ih.id = ri.instrumentheader LEFT OUTER JOIN (SELECT tradelicensedetailid,array_to_string(array_agg(message.message),',') AS acc FROM eg_tl_accessory LEFT OUTER JOIN message ON split_part(message.code,'_',2) = accessorycategory AND message.locale = 'en_IN' GROUP BY 1 ) tlacc ON tlacc.tradelicensedetailid = tld.id WHERE tl.Status = 'APPROVED' - orderby: ORDER BY tl.tenantId asc diff --git a/configs/reports/configs/swm-reports.yml b/configs/reports/configs/swm-reports.yml deleted file mode 100644 index 48c97dfc..00000000 --- a/configs/reports/configs/swm-reports.yml +++ /dev/null @@ -1,135 +0,0 @@ -ReportDefinitions: -- reportName: DumpingGroundDetailReport - summary: Dumping Ground Details report - version: 1.0.0 - moduleName: swm - externalService: - - entity: $.MdmsRes.swm.DumpingGround - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=swm&masterName=DumpingGround&tenantId=$tenantid - keyOrder: code,name,tenantId,isProcessingSite - tableName: tbl_swmdumpingground - stateData: true - sourceColumns: - - name: dumpinggroundname - label: reports.swm.dumpingground - type: string - source: mdms - - name: date - label: reports.swm.date - type: string - source: egswm_sourcesegregation - - name: wetwastecollected - label: reports.swm.wetwaste - type: number - source: egswm_collectiondetails - - name: drywastecollected - label: reports.swm.drywaste - type: number - source: egswm_collectiondetails - - name: sortdate - label: reports.swm.date - type: string - source: egswm_sourcesegregation - showColumn: false - - searchParams: - - name: dumpinggroundcode - label: reports.swm.dumpingground - type: singlevaluelist - source: mdms - isMandatory: false - stateData: true - wrapper: true - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=swm&masterName=DumpingGround&tenantId=$tenantid|$.MdmsRes.swm.DumpingGround.*.code|$.MdmsRes.swm.DumpingGround.*.name - searchClause: and ssg.dumpingground = $dumpinggroundcode - - name: wasteprocess - label: reports.swm.wasteprocess - type: singlevaluelist - pattern: 'list://false:Dump,true:Process' - source: wastetypeprocess - isMandatory: false - searchClause: and dg.isProcessingSite = $wasteprocess - - name: wastetype - label: reports.swm.wastetype - type: singlevaluelist - pattern: 'list://Wet:Wet,Dry:Dry' - source: wastetype - isMandatory: false - - name: fromDate - label: reports.swm.datefrom - type: epoch - source: egswm_sourcesegregation - isMandatory: true - - name: toDate - label: reports.swm.dateto - type: epoch - source: egswm_sourcesegregation - isMandatory: true - query: select dg.name as dumpinggroundname, CASE WHEN $wastetype = 'Wet' THEN sum(cd.wetwastecollected) WHEN $wastetype = 'Dry' THEN 0 ELSE sum(cd.wetwastecollected) END as wetwastecollected, CASE WHEN $wastetype = 'Wet' THEN 0 WHEN $wastetype = 'Dry' THEN sum(cd.drywastecollected) ELSE sum(cd.drywastecollected) END as drywastecollected, to_char((to_timestamp(ssg.sourcesegregationdate/1000) AT TIME ZONE 'Asia/Kolkata')::date,'dd/mm/yyyy') as date, (to_timestamp(ssg.sourcesegregationdate/1000) AT TIME ZONE 'Asia/Kolkata')::date as sortdate from egswm_collectiondetails cd, egswm_sourcesegregation ssg, (VALUES tbl_swmdumpingground) as dg (code,name,tenantId,isProcessingSite) where cd.sourcesegregation = ssg.code and cd.tenantid = $tenantid and ssg.tenantid = $tenantid and ssg.dumpingground = dg.code and ssg.sourcesegregationdate >= $fromDate and ssg.sourcesegregationdate <= $toDate - groupBy: group by date, dumpinggroundname, sortdate order by dumpinggroundname, sortdate; - -- reportName: ExpenditureIncurredReport - summary: Expenditure incurred on Transportation report - version: 1.0.0 - moduleName: swm - externalService: - - entity: $.MdmsRes.swm.VehicleType - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=swm&masterName=VehicleType&tenantId=$tenantid - keyOrder: code,name,tenantId - tableName: tbl_swmvehicletype - stateData: true - sourceColumns: - - name: date - label: reports.swm.date - type: string - source: egswm_vehiclemaintenancedetails - - name: vehicletype - label: reports.swm.vehicletype - type: string - source: mdms - - name: registrationnumber - label: reports.swm.registrationnumber - type: string - source: egswm_vehicle - - name: fuellingcost - label: reports.swm.fuellingcost - type: number - source: egswm_vehiclefuellingdetails - - name: maintenancecost - label: reports.swm.maintenancecost - type: number - source: egswm_vehiclemaintenancedetails - - name: salary - label: reports.swm.salary - type: string - source: employee - - name: totalcost - label: reports.swm.totalcost - type: number - source: egswm_vehiclemaintenancedetails - searchParams: - - name: vehicle - label: reports.swm.vehicle - type: singlevaluelistac - source: egswm_vehicle - isMandatory: true - wrapper: true - pattern: http://swm-services:8080/swm-services/vehicles/_search?tenantId=$tenantid|$..regNumber|$..regNumber - - name: typeofvehicle - label: reports.swm.vehicletype - type: string - source: egswm_vehicle - isMandatory: false - wrapper: true - pattern: /swm-services/vehicles/_search?tenantId=$tenantid®Numbers={vehicle}|$..vehicleType.name|$..vehicleType.name - - name: fromDate - label: reports.swm.datefrom - type: epoch - source: egswm_vehiclemaintenancedetails - isMandatory: true - - name: toDate - label: reports.swm.dateto - type: epoch - source: egswm_vehiclemaintenancedetails - isMandatory: true - query: select to_char(result.date,'dd/mm/yyyy') as date,COALESCE(sum(result.fuellingcost),0) as fuellingcost,COALESCE(sum(result.maintenancecost),0) as maintenancecost,COALESCE(sum(result.totalcost),0) as totalcost, result.vehicletype as vehicletype, result.registrationnumber registrationnumber,'' as salary from ((select (to_timestamp(vmd.actualmaintenancedate/1000) AT TIME ZONE 'Asia/Kolkata')::date as date,0 as fuellingcost,COALESCE(sum(vmd.costincurred),0) as maintenancecost,COALESCE(sum(vmd.costincurred),0) as totalcost, vt.name as vehicletype,vehicle.regnumber as registrationnumber from egswm_vehicle vehicle, egswm_vehiclemaintenancedetails vmd, (VALUES tbl_swmvehicletype) as vt (code,name,tenantId) where vehicle.regnumber = $vehicle and vehicle.vehicletype = vt.code and vehicle.regnumber = vmd.vehicle and vehicle.tenantid = $tenantid and vmd.tenantid = $tenantid and vmd.actualmaintenancedate >= $fromDate and vmd.actualmaintenancedate <= $toDate group by date, vt.name, registrationnumber) UNION (select (to_timestamp(vfd.transactiondate/1000) AT TIME ZONE 'Asia/Kolkata')::date as date, COALESCE(sum(vfd.totalcostincurred),0) as fuellingcost, 0 as maintenancecost, COALESCE(sum(vfd.totalcostincurred),0) as totalcost, vt.name as vehicletype,vehicle.regnumber as registrationnumber from egswm_vehicle vehicle, egswm_vehiclefuellingdetails vfd, (VALUES tbl_swmvehicletype) as vt (code,name,tenantId) where vehicle.regnumber = $vehicle and vehicle.vehicletype = vt.code and vehicle.regnumber = vfd.vehicle and vehicle.tenantid = $tenantid and vfd.tenantid = $tenantid and vfd.transactiondate >= $fromDate and vfd.transactiondate <= $toDate group by date, vt.name, registrationnumber)) as result group by result.date, result.registrationnumber, result.vehicletype order by result.registrationnumber, result.date, result.vehicletype; diff --git a/configs/reports/configs/tl-reports.yml b/configs/reports/configs/tl-reports.yml deleted file mode 100644 index 399a734a..00000000 --- a/configs/reports/configs/tl-reports.yml +++ /dev/null @@ -1,2808 +0,0 @@ ---- -ReportDefinitions: -- reportName: TradeLicenseRegistryReport - summary: TL Receipt Register Report - version: 1.0.0 - moduleName: rainmaker-tl - sourceColumns: - - name: receiptnumber - label: report.tl.receiptnumber - type: string - source: tl - total: false - - name: receiptIssueDate - label: report.tl.receiptissuedate - type: string - source: tl - total: false - - name: g8issuedate - label: report.tl.g8issuedate - type: string - source: tl - total: false - - name: g8receiptno - label: report.tl.g8receiptno - type: string - source: tl - total: false - - name: licensenumber - label: report.tl.licensenumber - type: string - source: tl - total: false - - name: formattedIssuedDate - label: report.tl.issueddate - type: string - source: tl - total: false - - name: name - label: report.tl.user.name - type: string - source: tl - total: false - - name: mobilenumber - label: report.tl.user.mobilenumber - type: string - source: tl - total: false - - name: bankid - label: report.tl.bankid - type: string - source: tl - total: false - - name: branchname - label: report.tl.branchname - type: string - source: tl - total: false - - name: transactionnumber - label: report.tl.transactionumber - type: string - source: tl - total: false - - name: instrumenttype - label: report.tl.instrumenttype - type: string - source: tl - total: false - - name: status - label: report.tl.status - type: string - source: tl - total: false - - name: tradeTypeName - label: report.tl.tradetype - type: string - source: tl - total: true - - name: acc - label: report.tl.accessorycategories - type: string - source: tl - total: false - - name: tradeName - label: report.tl.tradeName - type: string - source: tl - total: false - - name: totalamount - label: report.tl.receipt.totalamount - type: string - source: tl - total: true - - name: collectorname - label: reports.uc.collectorname - type: string - source: pt - total: false - searchParams: - - name: fromDate - label: reports.tl.fromDate - type: epoch - source: tl - isMandatory: false - searchClause: AND receipt.createddate >= $fromDate - - name: toDate - label: reports.tl.toDate - type: epoch - source: tl - isMandatory: false - searchClause: AND receipt.createddate <= $toDate - - name: collectorname - label: reports.uc.collectorname - type: singlevaluelist - pattern: http://egov-hrms:8080/egov-hrms/employees/_search?tenantId=$tenantid&roles=TL_CEMP|$.Employees[*].user.id|$.Employees[*].user.name - source: pt - wrapper: true - isMandatory: false - searchClause: AND eg_user.id = $collectorname::INTEGER - query: | - SELECT - licensenumber, - to_char((To_timestamp(issueddate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as formattedIssuedDate, - tl.tradeName, - initcap(tl.status) as status, - to_char((To_timestamp(receipt.receiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as receiptIssueDate , - receipt.receiptnumber, - tradeTypeName, - acc, - tlown.name, - tlown.mobilenumber, - ih.bankid, - ih.branchname, - ih.transactionnumber as transactionnumber, - ih.instrumenttype, - amount as totalamount, - To_char((To_timestamp(receipt.manualreceiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') AS g8issuedate, - receipt.manualreceiptnumber as g8receiptno, - (CASE WHEN collectiontype='COUNTER' THEN eg_user.name ELSE '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' END) as collectorname --value for Online - - FROM eg_tl_tradelicense tl - INNER JOIN eg_tl_tradelicensedetail tld ON tld.tradelicenseid = tl.id - INNER JOIN ( - SELECT tradelicensedetailid, array_to_string(array_agg(message.message),', ') as tradeTypeName FROM eg_tl_tradeunit - LEFT OUTER JOIN message ON code = CONCAT('TRADELICENSE_TRADETYPE_', REGEXP_REPLACE(tradetype, '[^A-Za-z0-9]','_','g')) AND message.locale = 'en_IN' GROUP BY 1) tlunit ON tlunit.tradelicensedetailid = tld.id - INNER JOIN ( - SELECT tradelicensedetailid, array_to_string(array_agg(name),', ') as name, array_to_string(array_agg(mobilenumber),', ') as mobilenumber - FROM eg_tl_owner tlowner - INNER JOIN eg_user tluser ON tluser.uuid = tlowner.id - group by tradelicensedetailid - ) tlown ON tlown.tradelicensedetailid = tld.id - LEFT OUTER JOIN egcl_receiptheader_v1 receipt ON receipt.consumercode = tl.applicationnumber and receipt.status != 'Cancelled' - LEFT OUTER JOIN egcl_receiptinstrument_v1 as ri ON ri.receiptheader = receipt.id - LEFT OUTER JOIN egcl_instrumentheader_v1 as ih ON ih.id = ri.instrumentheader and ih.instrumentstatus != 'CANCELLED' - LEFT OUTER JOIN ( - SELECT tradelicensedetailid,array_to_string(array_agg(message.message),',') AS acc FROM eg_tl_accessory - LEFT OUTER JOIN message ON code=CONCAT('TRADELICENSE_ACCESSORIESCATEGORY_', REGEXP_REPLACE(accessorycategory, '[^A-Za-z0-9]','_', 'g')) AND message.locale = 'en_IN' GROUP BY 1 ) tlacc ON tlacc.tradelicensedetailid = tld.id - Join eg_user ON eg_user.id = receipt.createdby::INTEGER - WHERE tl.tenantId = $tenantid - - -- reportName: StateTradeLicenseCancelledRegistryReport - summary: TL Cancelled Receipt Register Report - version: 1.0.0 - moduleName: rainmaker-tl - sourceColumns: - - name: tenantId - label: report.tl.tenantid - type: string - source: tl - total: false - - name: receiptnumber - label: report.tl.receiptnumber - type: string - source: tl - total: false - - name: receiptIssueDate - label: report.tl.receiptissuedate - type: string - source: tl - total: false - - name: g8issuedate - label: report.tl.g8issuedate - type: string - source: tl - total: false - - name: g8receiptno - label: report.tl.g8receiptno - type: string - source: tl - total: false - - name: licensenumber - label: report.tl.licensenumber - type: string - source: tl - total: false - - name: formattedIssuedDate - label: report.tl.issueddate - type: string - source: tl - total: false - - name: name - label: report.tl.user.name - type: string - source: tl - total: false - - name: mobilenumber - label: report.tl.user.mobilenumber - type: string - source: tl - total: false - - name: bankid - label: report.tl.bankid - type: string - source: tl - total: false - - name: branchname - label: report.tl.branchname - type: string - source: tl - total: false - - name: transactionumber - label: report.tl.transactionumber - type: string - source: tl - total: false - - name: instrumenttype - label: report.tl.instrumenttype - type: string - source: tl - total: false - - name: status - label: report.tl.status - type: string - source: tl - total: false - - name: tradeTypeName - label: report.tl.tradetype - type: string - source: tl - total: false - - name: acc - label: report.tl.accessorycategories - type: string - source: tl - total: false - - name: tradeName - label: report.tl.tradeName - type: string - source: tl - total: false - - name: totalamount - label: report.tl.receipt.totalamount - type: string - source: tl - total: true - searchParams: - - name: fromDate - label: reports.tl.fromDate - type: epoch - source: tl - isMandatory: false - searchClause: AND receipt.createddate >= $fromDate - - name: toDate - label: reports.tl.toDate - type: epoch - source: tl - isMandatory: false - searchClause: AND receipt.createddate <= $toDate - query: | - SELECT - initcap(split_part(tl.tenantId, '.', 2)) as tenantId, - licensenumber, - to_char((To_timestamp(issueddate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as formattedIssuedDate, - tl.tradeName, - initcap(tl.status) as status, - to_char((To_timestamp(receipt.receiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as receiptIssueDate , - receipt.receiptnumber, - tradeTypeName, - acc, - name, - mobilenumber, - ih.bankid, - ih.branchname, - ih.transactionnumber, - ih.instrumenttype, - amount as totalamount, - To_char((To_timestamp(receipt.manualreceiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') AS g8issuedate, - receipt.manualreceiptnumber as g8receiptno - - FROM eg_tl_tradelicense tl - INNER JOIN eg_tl_tradelicensedetail tld ON tld.tradelicenseid = tl.id - INNER JOIN ( - SELECT tradelicensedetailid, array_to_string(array_agg(message.message),', ') as tradeTypeName FROM eg_tl_tradeunit - LEFT OUTER JOIN message ON code = CONCAT('TRADELICENSE_TRADETYPE_', REGEXP_REPLACE(tradetype, '[^A-Za-z0-9]','_','g')) AND message.locale = 'en_IN' GROUP BY 1) tlunit ON tlunit.tradelicensedetailid = tld.id - INNER JOIN ( - SELECT tradelicensedetailid, array_to_string(array_agg(name),', ') as name, array_to_string(array_agg(mobilenumber),', ') as mobilenumber - FROM eg_tl_owner tlowner - INNER JOIN eg_user tluser ON tluser.uuid = tlowner.id - group by tradelicensedetailid - ) tlown ON tlown.tradelicensedetailid = tld.id - INNER JOIN egcl_receiptheader_v1 receipt ON receipt.consumercode = tl.applicationnumber and receipt.status = 'Cancelled' - INNER JOIN egcl_receiptinstrument_v1 as ri ON ri.receiptheader = receipt.id - INNER JOIN egcl_instrumentheader_v1 as ih ON ih.id = ri.instrumentheader - LEFT OUTER JOIN ( - SELECT tradelicensedetailid,array_to_string(array_agg(message.message),',') AS acc FROM eg_tl_accessory - LEFT OUTER JOIN message ON code=CONCAT('TRADELICENSE_ACCESSORIESCATEGORY_', REGEXP_REPLACE(accessorycategory, '[^A-Za-z0-9]','_', 'g')) AND message.locale = 'en_IN' GROUP BY 1 ) tlacc ON tlacc.tradelicensedetailid = tld.id - WHERE tl.tenantId != 'pb.testing' - -- reportName: TradeLicenseCancelledRegistryReport - summary: TL Cancelled Receipt Register Report - version: 1.0.0 - moduleName: rainmaker-tl - sourceColumns: - - name: receiptnumber - label: report.tl.receiptnumber - type: string - source: tl - total: false - - name: receiptIssueDate - label: report.tl.receiptissuedate - type: string - source: tl - total: false - - name: g8issuedate - label: report.tl.g8issuedate - type: string - source: tl - total: false - - name: g8receiptno - label: report.tl.g8receiptno - type: string - source: tl - total: false - - name: licensenumber - label: report.tl.licensenumber - type: string - source: tl - total: false - - name: formattedIssuedDate - label: report.tl.issueddate - type: string - source: tl - total: false - - name: name - label: report.tl.user.name - type: string - source: tl - total: false - - name: mobilenumber - label: report.tl.user.mobilenumber - type: string - source: tl - total: false - - name: bankid - label: report.tl.bankid - type: string - source: tl - total: false - - name: branchname - label: report.tl.branchname - type: string - source: tl - total: false - - name: transactionumber - label: report.tl.transactionumber - type: string - source: tl - total: false - - name: instrumenttype - label: report.tl.instrumenttype - type: string - source: tl - total: false - - name: status - label: report.tl.status - type: string - source: tl - total: false - - name: tradeTypeName - label: report.tl.tradetype - type: string - source: tl - total: false - - name: acc - label: report.tl.accessorycategories - type: string - source: tl - total: false - - name: tradeName - label: report.tl.tradeName - type: string - source: tl - total: false - - name: totalamount - label: report.tl.receipt.totalamount - type: string - source: tl - total: true - searchParams: - - name: fromDate - label: reports.tl.fromDate - type: epoch - source: tl - isMandatory: false - searchClause: AND receipt.createddate >= $fromDate - - name: toDate - label: reports.tl.toDate - type: epoch - source: tl - isMandatory: false - searchClause: AND receipt.createddate <= $toDate - query: | - SELECT - licensenumber, - to_char((To_timestamp(issueddate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as formattedIssuedDate, - tl.tradeName, - initcap(tl.status) as status, - to_char((To_timestamp(receipt.receiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as receiptIssueDate , - receipt.receiptnumber, - tradeTypeName, - acc, - name, - mobilenumber, - ih.bankid, - ih.branchname, - ih.transactionnumber, - ih.instrumenttype, - amount as totalamount, - To_char((To_timestamp(receipt.manualreceiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') AS g8issuedate, - receipt.manualreceiptnumber as g8receiptno - - FROM eg_tl_tradelicense tl - INNER JOIN eg_tl_tradelicensedetail tld ON tld.tradelicenseid = tl.id - INNER JOIN ( - SELECT tradelicensedetailid, array_to_string(array_agg(message.message),', ') as tradeTypeName FROM eg_tl_tradeunit - LEFT OUTER JOIN message ON code = CONCAT('TRADELICENSE_TRADETYPE_', REGEXP_REPLACE(tradetype, '[^A-Za-z0-9]','_','g')) AND message.locale = 'en_IN' GROUP BY 1) tlunit ON tlunit.tradelicensedetailid = tld.id - INNER JOIN ( - SELECT tradelicensedetailid, array_to_string(array_agg(name),', ') as name, array_to_string(array_agg(mobilenumber),', ') as mobilenumber - FROM eg_tl_owner tlowner - INNER JOIN eg_user tluser ON tluser.uuid = tlowner.id - group by tradelicensedetailid - ) tlown ON tlown.tradelicensedetailid = tld.id - INNER JOIN egcl_receiptheader_v1 receipt ON receipt.consumercode = tl.applicationnumber and receipt.status = 'Cancelled' - INNER JOIN egcl_receiptinstrument_v1 as ri ON ri.receiptheader = receipt.id - INNER JOIN egcl_instrumentheader_v1 as ih ON ih.id = ri.instrumentheader - LEFT OUTER JOIN ( - SELECT tradelicensedetailid,array_to_string(array_agg(message.message),',') AS acc FROM eg_tl_accessory - LEFT OUTER JOIN message ON code=CONCAT('TRADELICENSE_ACCESSORIESCATEGORY_', REGEXP_REPLACE(accessorycategory, '[^A-Za-z0-9]','_', 'g')) AND message.locale = 'en_IN' GROUP BY 1 ) tlacc ON tlacc.tradelicensedetailid = tld.id - WHERE tl.tenantId LIKE $tenantid - - -- reportName: TradeWiseCollectionReport - summary: Collection according to tradeTypes - version: 1.0.0 - moduleName: rainmaker-tl - sourceColumns: - - name: transactionNumber - label: report.tl.totalTransaction - type: string - source: tl - total: false - - name: online - label: report.tl.online.collection - type: string - source: tl - total: true - - name: offline - label: report.tl.offline.collection - type: string - source: tl - total: true - - name: total - label: report.tl.totalCollection - type: string - source: tl - total: true - searchParams: - - name: fromDate - label: reports.tl.fromDate - type: epoch - source: tl - isMandatory: false - searchClause: AND rh.receiptdate >= $fromDate - - name: toDate - label: reports.tl.toDate - type: epoch - source: tl - isMandatory: false - searchClause: AND rh.receiptdate <= $toDate - query: | - select - sum(ih.amount) as total, - count(*) as transactionNumber, - sum(case collectiontype when 'COUNTER' then amount else 0 end) as offline, - sum(case collectiontype when 'ONLINE' then amount else 0 end) as online, - initcap(split_part(rh.tenantId, '.', 2)) as tenantId - from egcl_receiptheader_v1 as rh - inner join egcl_receiptinstrument_v1 as ri on ri.receiptheader = rh.id - inner join egcl_instrumentheader_v1 as ih on ih.id = ri.instrumentheader - where rh.businessdetails = 'TL' and rh.status !='Cancelled' and rh.tenantid !='pb.testing' - AND rh.tenantId LIKE $tenantid - groupby: GROUP BY rh.tenantId - -- reportName: TradeLicenseApplicationStatusReport - summary: Nummber of applications by there status - version: 1.0.0 - moduleName: rainmaker-tl - externalService: - - entity: $.messages[*] - apiURL: http://egov-localization:8080/localization/messages/v1/_search?locale=en_IN&tenantId=pb&module=rainmaker-tl - keyOrder: code,message - tableName: tbl_localization - sourceColumns: - - name: status - label: report.tl.status - type: string - source: tl - total: false - - name: total - label: report.tl.total - type: string - source: tl - total: true - searchParams: - - name: fromDate - label: reports.tl.fromDate - type: epoch - source: tl - isMandatory: false - searchClause: AND tl.lastmodifiedtime >= $fromDate - - name: toDate - label: reports.tl.toDate - type: epoch - source: tl - isMandatory: false - searchClause: AND tl.lastmodifiedtime <= $toDate - query: | - SELECT - COUNT(applicationnumber) as total, - message.message as status - from eg_tl_tradelicense tl - LEFT OUTER JOIN message ON split_part(message.code,'_',2) = status AND split_part(message.code,'_',1)='TL' AND message.locale = 'en_IN' - WHERE tl.tenantid LIKE $tenantid - groupby: GROUP BY message.message - orderby: ORDER BY case message.message when 'Pending Application' then 1 when 'Pending Payment' then 2 when 'Pending Approval' then 3 when 'Approved' then 4 when 'Rejected' then 5 when 'Cancelled' then 6 else 7 end - -- reportName: TradeLicenseULBWiseApplicationStatusReport - summary: Nummber of applications by there status - version: 1.0.0 - moduleName: rainmaker-tl - sourceColumns: - - name: tenantId - label: report.tl.tenantid - type: string - source: tl - total: false - - name: initiated - label: TL_INITIATED - type: string - source: tl - total: true - - name: applied - label: TL_APPLIED - type: string - source: tl - total: true - - name: paid - label: TL_PAID - type: string - source: tl - total: true - - name: approved - label: TL_APPROVED - type: string - source: tl - total: true - - name: rejected - label: TL_REJECTED - type: string - source: tl - total: true - - name: cancelled - label: TL_CANCELLED - type: string - source: tl - total: true - searchParams: - - name: fromDate - label: reports.tl.fromDate - type: epoch - source: tl - isMandatory: false - searchClause: AND tl.lastmodifiedtime >= $fromDate - - name: toDate - label: reports.tl.toDate - type: epoch - source: tl - isMandatory: false - searchClause: AND tl.lastmodifiedtime <= $toDate - query: | - SELECT - initcap(split_part(tenantId, '.', 2)) as tenantId, - SUM(CASE status when 'REJECTED' then 1 else 0 end) as rejected, - SUM(CASE status when 'INITIATED' then 1 else 0 end) as initiated, - SUM(CASE status when 'PAID' then 1 else 0 end) as paid, - SUM(CASE status when 'APPROVED' then 1 else 0 end) as approved, - SUM(CASE status when 'APPLIED' then 1 else 0 end) as applied, - SUM(CASE status when 'CANCELLED' then 1 else 0 end) as cancelled - FROM eg_tl_tradelicense as tl - WHERE tl.tenantid != 'pb.testing' - groupby: GROUP BY tenantid - orderby: ORDER BY tenantid - - -- reportName: StateLevelStatus - summary: Nummber of applications by there status state level - version: 1.0.0 - moduleName: rainmaker-tl - sourceColumns: - - name: status - label: report.tl.status - type: string - source: tl - total: false - - name: total - label: report.tl.total - type: string - source: tl - total: true - searchParams: - - name: fromDate - label: reports.tl.fromDate - type: epoch - source: tl - isMandatory: false - searchClause: AND tl.lastmodifiedtime >= $fromDate - - name: toDate - label: reports.tl.toDate - type: epoch - source: tl - isMandatory: false - searchClause: AND tl.lastmodifiedtime <= $toDate - - name: ulb - label: ULB - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name - source: tl - wrapper: true - isMandatory: false - searchClause: AND tl.tenantId = $ulb - query: | - SELECT - COUNT(applicationnumber) as total, - message.message as status - from eg_tl_tradelicense tl - LEFT OUTER JOIN message ON split_part(message.code,'_',2) = status AND split_part(message.code,'_',1)='TL' AND message.locale = 'en_IN' - WHERE tl.tenantid!='pb.testing' - groupby: GROUP BY message.message - orderby: ORDER BY case message.message when 'Pending Application' then 1 when 'Pending Payment' then 2 when 'Pending Approval' then 3 when 'Approved' then 4 when 'Rejected' then 5 when 'Cancelled' then 6 else 7 end - -- reportName: ULBLevelStatus - summary: Nummber of applications by there status ULB level - version: 1.0.0 - moduleName: rainmaker-tl - sourceColumns: - - name: status - label: report.tl.status - type: string - source: tl - total: false - - name: total - label: report.tl.total - type: string - source: tl - total: true - searchParams: - - name: fromDate - label: reports.tl.fromDate - type: epoch - source: tl - isMandatory: false - searchClause: AND tl.lastmodifiedtime >= $fromDate - - name: toDate - label: reports.tl.toDate - type: epoch - source: tl - isMandatory: false - searchClause: AND tl.lastmodifiedtime <= $toDate - query: | - SELECT - COUNT(applicationnumber) as total, - message.message as status - from eg_tl_tradelicense tl - LEFT OUTER JOIN message ON split_part(message.code,'_',2) = status AND split_part(message.code,'_',1)='TL' AND message.locale = 'en_IN' - WHERE tl.tenantid=$tenantid - groupby: GROUP BY message.message - orderby: ORDER BY case message.message when 'Pending Application' then 1 when 'Pending Payment' then 2 when 'Pending Approval' then 3 when 'Approved' then 4 when 'Rejected' then 5 when 'Cancelled' then 6 else 7 end - - -- reportName: StateLevelTradeWiseCollection - summary: Collection according to tradeTypes state level - version: 1.0.0 - moduleName: rainmaker-tl - sourceColumns: - - name: tenantId - label: report.tl.tenantid - type: string - source: tl - total: false - - name: transactionNumber - label: report.tl.totalTransaction - type: string - source: tl - total: true - - name: online - label: report.tl.online.collection - type: string - source: tl - total: true - - name: offline - label: report.tl.offline.collection - type: string - source: tl - total: true - - name: total - label: report.tl.totalCollection - type: string - source: tl - total: true - searchParams: - - name: fromDate - label: reports.tl.fromDate - type: epoch - source: tl - isMandatory: false - searchClause: AND rh.receiptdate >= $fromDate - - name: toDate - label: reports.tl.toDate - type: epoch - source: tl - isMandatory: false - searchClause: AND rh.receiptdate <= $toDate - - name: ulb - label: ULB - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name - source: tl - wrapper: true - isMandatory: false - searchClause: AND tl.tenantId = $ulb - query: | - select - sum(ih.amount) as total, - count(*) as transactionNumber, - sum(case collectiontype when 'COUNTER' then amount else 0 end) as offline, - sum(case collectiontype when 'ONLINE' then amount else 0 end) as online, - initcap(split_part(rh.tenantId, '.', 2)) as tenantId - from egcl_receiptheader_v1 as rh - inner join egcl_receiptinstrument_v1 as ri on ri.receiptheader = rh.id - inner join egcl_instrumentheader_v1 as ih on ih.id = ri.instrumentheader - where rh.businessdetails = 'TL' and rh.status !='Cancelled' and rh.tenantid !='pb.testing' - groupby: GROUP BY rh.tenantId - orderby: ORDER BY rh.tenantId asc - - -- reportName: StateLevelTradeLicenseRegistryReport - summary: TL Basic Report State Level - version: 1.0.0 - moduleName: rainmaker-tl - sourceColumns: - - name: tenantId - label: report.tl.tenantId - type: string - source: tl - total: false - - name: licensenumber - label: report.tl.licensenumber - type: string - source: tl - total: false - - name: formattedIssuedDate - label: report.tl.issueddate - type: string - source: tl - total: false - - name: g8issuedate - label: report.tl.g8issuedate - type: string - source: tl - total: false - - name: g8receiptno - label: report.tl.g8receiptno - type: string - source: tl - total: false - - name: name - label: report.tl.user.name - type: string - source: tl - total: false - - name: mobilenumber - label: report.tl.user.mobilenumber - type: string - source: tl - total: false - - name: tradeTypeName - label: report.tl.tradetype - type: string - source: tl - total: false - - name: acc - label: report.tl.accessorycategories - type: string - source: tl - total: false - - name: tradeName - label: report.tl.tradeName - type: string - source: tl - total: false - - name: totalamount - label: report.tl.receipt.totalamount - type: string - source: tl - total: true - searchParams: - - name: fromDate - label: reports.tl.fromDate - type: epoch - source: tl - isMandatory: false - searchClause: AND issueddate >= $fromDate - - name: toDate - label: reports.tl.toDate - type: epoch - source: tl - isMandatory: false - searchClause: AND issueddate <= $toDate - - name: ulb - label: ULB - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name - source: tl - wrapper: true - isMandatory: false - searchClause: AND tl.tenantId = $ulb - query: | - SELECT - tl.tenantId as tenantId, - licensenumber, - to_char((To_timestamp(issueddate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as formattedIssuedDate, - tl.tradeName, - tradeTypeName, - acc, - name, - mobilenumber, - amount as totalamount, - To_char((To_timestamp(receipt.manualreceiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') AS g8issuedate, - receipt.manualreceiptnumber as g8receiptno - FROM eg_tl_tradelicense tl - INNER JOIN eg_tl_tradelicensedetail tld ON tld.tradelicenseid = tl.id - INNER JOIN eg_tl_owner tlowner ON tlowner.tradelicensedetailid = tld.id - INNER JOIN ( - SELECT tradelicensedetailid, array_to_string(array_agg(message.message),', ') as tradeTypeName FROM eg_tl_tradeunit - LEFT OUTER JOIN message ON code = CONCAT('TRADELICENSE_TRADETYPE_', REGEXP_REPLACE(tradetype, '[^A-Za-z0-9]','_','g')) AND message.locale = 'en_IN' GROUP BY 1) tlunit ON tlunit.tradelicensedetailid = tld.id - INNER JOIN eg_user tluser ON tluser.uuid = tlowner.id - LEFT OUTER JOIN egcl_receiptheader_v1 receipt ON receipt.consumercode = tl.applicationnumber - LEFT JOIN egcl_receiptinstrument_v1 as ri ON ri.receiptheader = receipt.id - LEFT JOIN egcl_instrumentheader_v1 as ih ON ih.id = ri.instrumentheader - LEFT OUTER JOIN - ( - SELECT tradelicensedetailid,array_to_string(array_agg(message.message),',') AS acc FROM eg_tl_accessory - LEFT OUTER JOIN message ON code=CONCAT('TRADELICENSE_ACCESSORIESCATEGORY_', REGEXP_REPLACE(accessorycategory, '[^A-Za-z0-9]','_', 'g')) AND message.locale = 'en_IN' GROUP BY 1 ) tlacc ON tlacc.tradelicensedetailid = tld.id - WHERE tl.Status = 'APPROVED' - orderby: ORDER BY tl.tenantId asc - - -- reportName: SearchTradeLicenseApplicationReport - summary: TL Search Application Report - version: 1.0.0 - moduleName: rainmaker-tl - sourceColumns: - - name: applicationnumber - label: report.tl.applicationnumber - type: string - source: tl - total: false - - name: licensenumber - label: report.tl.licensenumber - type: string - source: tl - total: false - - name: tradeName - label: report.tl.tradeName - type: string - source: tl - total: false - - name: name - label: report.tl.user.name - type: string - source: tl - total: false - - name: mobilenumber - label: report.tl.user.mobilenumber - type: string - source: tl - total: false - - name: formattedIssuedDate - label: report.tl.issueddate - type: string - source: tl - total: false - - name: status - label: report.tl.status - type: string - source: tl - total: false - searchParams: - - name: fromDate - label: reports.tl.fromDate - type: epoch - source: tl - isMandatory: false - searchClause: AND tl.applicationdate >= $fromDate - - name: toDate - label: reports.tl.toDate - type: epoch - source: tl - isMandatory: false - searchClause: AND tl.applicationdate <= $toDate - - name: localityArray - label: reports.tl.zoneList - type: boundarylist - source: tl - isMandatory: false - searchClause: AND tla.locality IN ($localityArray) - query: | - SELECT - tl.applicationnumber, - tl.licensenumber, - tl.tradeName, - (split_part(tl.tenantId, '.', 2)) as tenantId, - ownername, - mobilenumber, - tla.locality, - to_char((To_timestamp(applicationdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as applicationDate, - tl.status - from eg_tl_tradelicense as tl - INNER JOIN eg_tl_tradelicensedetail tld ON - tld.tradelicenseid = tl.id - INNER JOIN eg_tl_address as tla ON - tla.tradelicensedetailid=tld.id - INNER JOIN (SELECT tradelicensedetailid, array_to_string(array_agg(name),', ') as ownername, array_to_string(array_agg(mobilenumber),', ') as mobilenumber - FROM eg_tl_owner tlowner - INNER JOIN eg_user tluser ON - tluser.uuid = tlowner.id - group by tradelicensedetailid - ) tlown ON tlown.tradelicensedetailid = tld.id - WHERE tl.tenantid=$tenantid - -- reportName: TradeLicenseDetailsReport - summary: Trade License Details Report - version: 1.0.0 - moduleName: rainmaker-tl - sourceColumns: - - name: applicationnumber - label: report.tl.applicationnumber - type: string - source: tl - total: false - - name: propertyid - label: report.tl.propertyid - type: string - source: tl - total: false - - name: financialyear - label: report.tl.financialyear - type: string - source: tl - total: false - - name: licensetype - label: report.tl.licensetype - type: string - source: tl - total: false - - name: oldlicensenumber - label: report.tl.oldlicensenumber - type: string - source: tl - total: false - - name: licensenumber - label: report.tl.licensenumber - type: string - source: tl - total: false - - name: tradeName - label: report.tl.tradeName - type: string - source: tl - total: false - - name: name - label: report.tl.user.name - type: string - source: tl - total: false - - name: mobilenumber - label: report.tl.user.mobilenumber - type: string - source: tl - total: false - - name: formattedIssuedDate - label: report.tl.issueddate - type: string - source: tl - total: false - - name: tradeTypeName - label: report.tl.tradetype - type: string - source: tl - total: false - - name: acc - label: report.tl.accessorycategories - type: string - source: tl - total: false - - name: totalamount - label: report.tl.receipt.totalamount - type: string - source: tl - total: true - searchParams: - - name: fromDate - label: reports.tl.fromDate - type: epoch - source: tl - isMandatory: false - searchClause: AND tl.applicationdate >= $fromDate - - name: toDate - label: reports.tl.toDate - type: epoch - source: tl - isMandatory: false - searchClause: AND tl.applicationdate <= $toDate - - name: localityArray - label: reports.tl.zoneList - type: boundarylist - source: tl - isMandatory: false - searchClause: AND tla.locality IN ($localityArray) - query: | - SELECT - tl.applicationnumber, - propertyid, - financialyear, - (case when oldlicensenumber is null then 'New' else 'Renewal' end) AS licensetype, - - oldlicensenumber, - licensenumber, - to_char((To_timestamp(issueddate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as formattedIssuedDate, - tl.tradeName, - tradeTypeName, - - acc, - name, - mobilenumber, - amount as totalamount - FROM eg_tl_tradelicense tl - INNER JOIN eg_tl_tradelicensedetail tld ON tld.tradelicenseid = tl.id - - INNER JOIN eg_tl_address as tla ON - tla.tradelicensedetailid=tld.id - INNER JOIN eg_tl_owner tlowner ON tlowner.tradelicensedetailid = tld.id - INNER JOIN ( - SELECT tradelicensedetailid, array_to_string(array_agg(message.message),', ') as tradeTypeName FROM eg_tl_tradeunit - LEFT OUTER JOIN message ON code = CONCAT('TRADELICENSE_TRADETYPE_', REGEXP_REPLACE(tradetype, '[^A-Za-z0-9]','_','g')) AND message.locale = 'en_IN' GROUP BY 1) tlunit ON tlunit.tradelicensedetailid = tld.id - INNER JOIN eg_user tluser ON tluser.uuid = tlowner.id - LEFT OUTER JOIN egcl_receiptheader_v1 receipt ON receipt.consumercode = tl.applicationnumber - LEFT JOIN egcl_receiptinstrument_v1 as ri ON ri.receiptheader = receipt.id - LEFT JOIN egcl_instrumentheader_v1 as ih ON ih.id = ri.instrumentheader - LEFT OUTER JOIN - ( - SELECT tradelicensedetailid,array_to_string(array_agg(message.message),',') AS acc FROM eg_tl_accessory - LEFT OUTER JOIN message ON code=CONCAT('TRADELICENSE_ACCESSORIESCATEGORY_', REGEXP_REPLACE(accessorycategory, '[^A-Za-z0-9]','_', 'g')) AND message.locale = 'en_IN' GROUP BY 1 ) tlacc ON tlacc.tradelicensedetailid = tld.id - WHERE tl.tenantid=$tenantid - -- reportName: StateDefaulterReport - summary: TL Defautler - version: 1.0.0 - moduleName: rainmaker-tl - sourceColumns: - - name: ulb - label: report.tl.ulb - type: string - source: tl - total: false - - name: licensenumber - label: report.tl.licensenumber - type: string - source: tl - total: false - - name: applicationnumber - label: report.tl.applicationnumber - type: string - source: tl - total: false - - name: oldlicensenumber - label: report.tl.oldlicensenumber - type: string - source: tl - total: false - - name: financialyear - label: report.tl.financialyear - type: string - source: tl - total: false - - name: tradename - label: report.tl.tradename - type: string - source: tl - total: false - - name: ownername - label: report.tl.ownername - type: string - source: tl - total: false - - name: mobilenumber - label: report.tl.mobilenumber - type: string - source: tl - total: false - query: | - select - split_part(tenantid,'.',2) as ulb, - licensenumber, - applicationnumber, - oldlicensenumber, - financialyear, - tradename, - name as ownername, - mobilenumber - from eg_tl_tradelicense tl - INNER JOIN eg_tl_tradelicensedetail tld ON tld.tradelicenseid = tl.id - INNER JOIN ( - SELECT tradelicensedetailid, array_to_string(array_agg(name),', ') as name, array_to_string(array_agg(mobilenumber),', ') as mobilenumber - FROM eg_tl_owner tlowner - INNER JOIN eg_user tluser ON tluser.uuid = tlowner.id - group by tradelicensedetailid - ) tlown ON tlown.tradelicensedetailid = tld.id - where validto < extract (epoch from NOW())*1000 and licensenumber is not null and licensenumber not in (select oldlicensenumber from eg_tl_tradelicense where oldlicensenumber is not null) - and tenantid!='pb.testing' - orderby: order by tenantid - -- reportName: ULBDefaulterReport - summary: TL Defautler - version: 1.0.0 - moduleName: rainmaker-tl - sourceColumns: - - name: ulb - label: report.tl.ulb - type: string - source: tl - total: false - - name: licensenumber - label: report.tl.licensenumber - type: string - source: tl - total: false - - name: applicationnumber - label: report.tl.applicationnumber - type: string - source: tl - total: false - - name: oldlicensenumber - label: report.tl.oldlicensenumber - type: string - source: tl - total: false - - name: financialyear - label: report.tl.financialyear - type: string - source: tl - total: false - - name: tradename - label: report.tl.tradename - type: string - source: tl - total: false - - name: ownername - label: report.tl.ownername - type: string - source: tl - total: false - - name: mobilenumber - label: report.tl.mobilenumber - type: string - source: tl - total: false - query: | - select - split_part(tenantid,'.',2) as ulb, - licensenumber, - applicationnumber, - oldlicensenumber, - financialyear, - tradename, - name as ownername, - mobilenumber - from eg_tl_tradelicense tl - INNER JOIN eg_tl_tradelicensedetail tld ON tld.tradelicenseid = tl.id - INNER JOIN ( - SELECT tradelicensedetailid, array_to_string(array_agg(name),', ') as name, array_to_string(array_agg(mobilenumber),', ') as mobilenumber - FROM eg_tl_owner tlowner - INNER JOIN eg_user tluser ON tluser.uuid = tlowner.id - group by tradelicensedetailid - ) tlown ON tlown.tradelicensedetailid = tld.id - where validto < extract (epoch from NOW())*1000 and licensenumber is not null and licensenumber not in (select oldlicensenumber from eg_tl_tradelicense where oldlicensenumber is not null) - and tenantid = $tenantid - - -- reportName: TradeLicenseRegistryReport_v2 - decryptionPathId: TradeLicenseRegistryReport_v2 - summary: TL Receipt Register Report - version: 1.0.0 - moduleName: rainmaker-tl - sourceColumns: - - name: receiptnumber - label: report.tl.receiptnumber - type: string - source: tl - total: false - - name: receiptIssueDate - label: report.tl.receiptissuedate - type: string - source: tl - total: false - - name: g8issuedate - label: report.tl.g8issuedate - type: string - source: tl - total: false - - name: g8receiptno - label: report.tl.g8receiptno - type: string - source: tl - total: false - - name: licensenumber - label: report.tl.licensenumber - type: string - source: tl - total: false - - name: formattedIssuedDate - label: report.tl.issueddate - type: string - source: tl - total: false - - name: name - label: report.tl.user.name - type: string - source: tl - total: false - - name: mobilenumber - label: report.tl.user.mobilenumber - type: string - source: tl - total: false - - name: bankid - label: report.tl.bankid - type: string - source: tl - total: false - - name: branchname - label: report.tl.branchname - type: string - source: tl - total: false - - name: transactionnumber - label: report.tl.transactionumber - type: string - source: tl - total: false - - name: instrumenttype - label: report.tl.instrumenttype - type: string - source: tl - total: false - - name: status - label: report.tl.status - type: string - source: tl - total: false - - name: tradeTypeName - label: report.tl.tradetype - type: string - source: tl - total: false - - name: acc - label: report.tl.accessorycategories - type: string - source: tl - total: false - - name: tradeName - label: report.tl.tradeName - type: string - source: tl - total: false - - name: totalamount - label: report.tl.receipt.totalamount - type: string - source: tl - total: true - - name: collectorname - label: reports.uc.collectorname - type: string - source: pt - total: false - searchParams: - - name: fromDate - label: reports.tl.fromDate - type: epoch - source: tl - isMandatory: false - searchClause: AND egcl_paymentdetail.receiptdate >= $fromDate - - name: toDate - label: reports.tl.toDate - type: epoch - source: tl - isMandatory: false - searchClause: AND egcl_paymentdetail.receiptdate <= $toDate - - name: collectorname - label: reports.uc.collectorname - type: singlevaluelist - pattern: http://egov-hrms:8080/egov-hrms/employees/_search?tenantId=$tenantid&roles=TL_CEMP|$.Employees[*].user.id|$.Employees[*].user.name - source: pt - wrapper: true - isMandatory: false - searchClause: AND eg_user.id = $collectorname::INTEGER - query: | - SELECT - licensenumber, - to_char((To_timestamp(issueddate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as formattedIssuedDate, - tl.tradeName, - initcap(tl.status) as status, - to_char((To_timestamp(egcl_paymentdetail.receiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as receiptIssueDate , - egcl_paymentdetail.receiptnumber, - tradeTypeName, - acc, - split_part(tlown.name,',',1) as name, -- showing first name as decryption service not able to decrypt multiple comma seperated encrypted names - split_part(tlown.mobilenumber,',',1) as mobilenumber, -- similary showing first mobilenumber only - payment.ifsccode as bankid, -- ih.bankid, - payment.ifsccode as branchname, --ih.branchname, - payment.transactionnumber as transactionnumber, -- ih.transactionnumber as transactionnumber, - payment.paymentmode as instrumenttype, -- ih.instrumenttype, - payment.totalamountpaid as totalamount, --amount as totalamount, - To_char((To_timestamp(egcl_paymentdetail.manualreceiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') AS g8issuedate, - egcl_paymentdetail.manualreceiptnumber as g8receiptno, - (CASE WHEN paymentmode!='ONLINE' THEN eg_user.name ELSE '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' END) as collectorname - FROM eg_tl_tradelicense tl - INNER JOIN eg_tl_tradelicensedetail tld ON tld.tradelicenseid = tl.id - INNER JOIN ( - SELECT tradelicensedetailid, array_to_string(array_agg(message.message),', ') as tradeTypeName FROM eg_tl_tradeunit - LEFT OUTER JOIN message ON code = CONCAT('TRADELICENSE_TRADETYPE_', REGEXP_REPLACE(tradetype, '[^A-Za-z0-9]','_','g')) AND message.locale = 'en_IN' GROUP BY 1) tlunit ON tlunit.tradelicensedetailid = tld.id - INNER JOIN ( - SELECT tradelicensedetailid, array_to_string(array_agg(name),', ') as name, array_to_string(array_agg(mobilenumber),', ') as mobilenumber - FROM eg_tl_owner tlowner - INNER JOIN eg_user tluser ON tluser.uuid = tlowner.id - group by tradelicensedetailid - ) tlown ON tlown.tradelicensedetailid = tld.id - LEFT OUTER JOIN egcl_bill bill ON bill.consumercode = tl.applicationnumber - LEFT OUTER JOIN egcl_paymentdetail on bill.id=egcl_paymentdetail.billid - LEFT OUTER JOIN egcl_payment as payment ON payment.id = egcl_paymentdetail.paymentid - LEFT OUTER JOIN ( - SELECT tradelicensedetailid,array_to_string(array_agg(message.message),',') AS acc FROM eg_tl_accessory - LEFT OUTER JOIN message ON code=CONCAT('TRADELICENSE_ACCESSORIESCATEGORY_', REGEXP_REPLACE(accessorycategory, '[^A-Za-z0-9]','_', 'g')) AND message.locale = 'en_IN' GROUP BY 1 ) tlacc ON tlacc.tradelicensedetailid = tld.id - Join eg_user ON eg_user.id = egcl_paymentdetail.createdby::INTEGER - WHERE tl.tenantId = $tenantid and payment.paymentstatus!='CANCELLED' - - -- reportName: StateTradeLicenseCancelledRegistryReport_v2 - decryptionPathId: TradeLicenseCancelledRegistryReport_v2 - summary: TL Cancelled Receipt Register Report - version: 1.0.0 - moduleName: rainmaker-tl - sourceColumns: - - name: tenantId - label: report.tl.tenantid - type: string - source: tl - total: false - - name: receiptnumber - label: report.tl.receiptnumber - type: string - source: tl - total: false - - name: receiptIssueDate - label: report.tl.receiptissuedate - type: string - source: tl - total: false - - name: g8issuedate - label: report.tl.g8issuedate - type: string - source: tl - total: false - - name: g8receiptno - label: report.tl.g8receiptno - type: string - source: tl - total: false - - name: licensenumber - label: report.tl.licensenumber - type: string - source: tl - total: false - - name: formattedIssuedDate - label: report.tl.issueddate - type: string - source: tl - total: false - - name: name - label: report.tl.user.name - type: string - source: tl - total: false - - name: mobilenumber - label: report.tl.user.mobilenumber - type: string - source: tl - total: false - - name: bankid - label: report.tl.bankid - type: string - source: tl - total: false - - name: branchname - label: report.tl.branchname - type: string - source: tl - total: false - - name: transactionumber - label: report.tl.transactionumber - type: string - source: tl - total: false - - name: instrumenttype - label: report.tl.instrumenttype - type: string - source: tl - total: false - - name: status - label: report.tl.status - type: string - source: tl - total: false - - name: tradeTypeName - label: report.tl.tradetype - type: string - source: tl - total: false - - name: acc - label: report.tl.accessorycategories - type: string - source: tl - total: false - - name: tradeName - label: report.tl.tradeName - type: string - source: tl - total: false - - name: totalamount - label: report.tl.receipt.totalamount - type: string - source: tl - total: true - searchParams: - - name: fromDate - label: reports.tl.fromDate - type: epoch - source: tl - isMandatory: false - searchClause: AND paydetail.receiptdate >= $fromDate - - name: toDate - label: reports.tl.toDate - type: epoch - source: tl - isMandatory: false - searchClause: AND paydetail.receiptdate <= $toDate - query: | - SELECT - initcap(split_part(tl.tenantId, '.', 2)) as tenantId, - licensenumber, - to_char((To_timestamp(issueddate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as formattedIssuedDate, - tl.tradeName, - initcap(tl.status) as status, - to_char((To_timestamp(paydetail.receiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as receiptIssueDate , - paydetail.receiptnumber, - tradeTypeName, - acc, - split_part(name,',',1) as name, -- showing first name as decryption service not able to decrypt multiple encrypted values seperate by comma - payment.mobilenumber, - payment.ifsccode as bankid, -- ih.bankid, - payment.ifsccode as branchname, --ih.branchname, - payment.transactionnumber as transactionnumber, -- ih.transactionnumber as transactionnumber, - payment.paymentmode as instrumenttype, -- ih.instrumenttype, - payment.totalamountpaid as totalamount, --amount as totalamount, - To_char((To_timestamp(paydetail.manualreceiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') AS g8issuedate, - paydetail.manualreceiptnumber as g8receiptno - FROM eg_tl_tradelicense tl - INNER JOIN eg_tl_tradelicensedetail tld ON tld.tradelicenseid = tl.id - INNER JOIN ( - SELECT tradelicensedetailid, array_to_string(array_agg(message.message),', ') as tradeTypeName FROM eg_tl_tradeunit - LEFT OUTER JOIN message ON code = CONCAT('TRADELICENSE_TRADETYPE_', REGEXP_REPLACE(tradetype, '[^A-Za-z0-9]','_','g')) AND message.locale = 'en_IN' GROUP BY 1) tlunit ON tlunit.tradelicensedetailid = tld.id - INNER JOIN ( - SELECT tradelicensedetailid, array_to_string(array_agg(name),', ') as name, array_to_string(array_agg(mobilenumber),', ') as mobilenumber - FROM eg_tl_owner tlowner - INNER JOIN eg_user tluser ON tluser.uuid = tlowner.id - group by tradelicensedetailid - ) tlown ON tlown.tradelicensedetailid = tld.id - INNER JOIN egcl_bill as bill ON bill.consumercode = tl.applicationnumber - INNER JOIN egcl_paymentdetail as paydetail on bill.id=paydetail.billid - INNER JOIN egcl_payment as payment on payment.id=paydetail.paymentid and payment.paymentstatus='CANCELLED' - LEFT OUTER JOIN ( - SELECT tradelicensedetailid,array_to_string(array_agg(message.message),',') AS acc FROM eg_tl_accessory - LEFT OUTER JOIN message ON code=CONCAT('TRADELICENSE_ACCESSORIESCATEGORY_', REGEXP_REPLACE(accessorycategory, '[^A-Za-z0-9]','_', 'g')) AND message.locale = 'en_IN' GROUP BY 1 ) tlacc ON tlacc.tradelicensedetailid = tld.id - WHERE tl.tenantId != 'pb.testing' - - -- reportName: TradeLicenseCancelledRegistryReport_v2 - decryptionPathId: TradeLicenseCancelledRegistryReport_v2 - summary: TL Cancelled Receipt Register Report - version: 1.0.0 - moduleName: rainmaker-tl - sourceColumns: - - name: receiptnumber - label: report.tl.receiptnumber - type: string - source: tl - total: false - - name: receiptIssueDate - label: report.tl.receiptissuedate - type: string - source: tl - total: false - - name: g8issuedate - label: report.tl.g8issuedate - type: string - source: tl - total: false - - name: g8receiptno - label: report.tl.g8receiptno - type: string - source: tl - total: false - - name: licensenumber - label: report.tl.licensenumber - type: string - source: tl - total: false - - name: formattedIssuedDate - label: report.tl.issueddate - type: string - source: tl - total: false - - name: name - label: report.tl.user.name - type: string - source: tl - total: false - - name: mobilenumber - label: report.tl.user.mobilenumber - type: string - source: tl - total: false - - name: bankid - label: report.tl.bankid - type: string - source: tl - total: false - - name: branchname - label: report.tl.branchname - type: string - source: tl - total: false - - name: transactionumber - label: report.tl.transactionumber - type: string - source: tl - total: false - - name: instrumenttype - label: report.tl.instrumenttype - type: string - source: tl - total: false - - name: status - label: report.tl.status - type: string - source: tl - total: false - - name: tradeTypeName - label: report.tl.tradetype - type: string - source: tl - total: false - - name: acc - label: report.tl.accessorycategories - type: string - source: tl - total: false - - name: tradeName - label: report.tl.tradeName - type: string - source: tl - total: false - - name: totalamount - label: report.tl.receipt.totalamount - type: string - source: tl - total: true - searchParams: - - name: fromDate - label: reports.tl.fromDate - type: epoch - source: tl - isMandatory: false - searchClause: AND paydetail.receiptdate >= $fromDate - - name: toDate - label: reports.tl.toDate - type: epoch - source: tl - isMandatory: false - searchClause: AND paydetail.receiptdate <= $toDate - query: | - SELECT - licensenumber, - to_char((To_timestamp(issueddate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as formattedIssuedDate, - tl.tradeName, - initcap(tl.status) as status, - to_char((To_timestamp(paydetail.receiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as receiptIssueDate , - paydetail.receiptnumber, - tradeTypeName, - acc, - split_part(name,',',1) as name, -- showing first name as decryption service not able to decrypt multiple encrypted values seperate by comma - payment.mobilenumber, - payment.ifsccode as bankid, -- ih.bankid, - payment.ifsccode as branchname, --ih.branchname, - payment.transactionnumber as transactionnumber, -- ih.transactionnumber as transactionnumber, - payment.paymentmode as instrumenttype, -- ih.instrumenttype, - payment.totalamountpaid as totalamount, --amount as totalamount, - To_char((To_timestamp(paydetail.manualreceiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') AS g8issuedate, - paydetail.manualreceiptnumber as g8receiptno - FROM eg_tl_tradelicense tl - INNER JOIN eg_tl_tradelicensedetail tld ON tld.tradelicenseid = tl.id - INNER JOIN ( - SELECT tradelicensedetailid, array_to_string(array_agg(message.message),', ') as tradeTypeName FROM eg_tl_tradeunit - LEFT OUTER JOIN message ON code = CONCAT('TRADELICENSE_TRADETYPE_', REGEXP_REPLACE(tradetype, '[^A-Za-z0-9]','_','g')) AND message.locale = 'en_IN' GROUP BY 1) tlunit ON tlunit.tradelicensedetailid = tld.id - INNER JOIN ( - SELECT tradelicensedetailid, array_to_string(array_agg(name),', ') as name, array_to_string(array_agg(mobilenumber),', ') as mobilenumber - FROM eg_tl_owner tlowner - INNER JOIN eg_user tluser ON tluser.uuid = tlowner.id - group by tradelicensedetailid - ) tlown ON tlown.tradelicensedetailid = tld.id - INNER JOIN egcl_bill as bill ON bill.consumercode = tl.applicationnumber - INNER JOIN egcl_paymentdetail as paydetail on bill.id=paydetail.billid - INNER JOIN egcl_payment as payment on payment.id=paydetail.paymentid and payment.paymentstatus='CANCELLED' - LEFT OUTER JOIN ( - SELECT tradelicensedetailid,array_to_string(array_agg(message.message),',') AS acc FROM eg_tl_accessory - LEFT OUTER JOIN message ON code=CONCAT('TRADELICENSE_ACCESSORIESCATEGORY_', REGEXP_REPLACE(accessorycategory, '[^A-Za-z0-9]','_', 'g')) AND message.locale = 'en_IN' GROUP BY 1 ) tlacc ON tlacc.tradelicensedetailid = tld.id - WHERE tl.tenantId LIKE $tenantid - - -- reportName: TradeWiseCollectionReport_v2 - summary: Collection according to tradeTypes - version: 1.0.0 - moduleName: rainmaker-tl - sourceColumns: - - name: transactionNumber - label: report.tl.totalTransaction - type: string - source: tl - total: false - - name: online - label: report.tl.online.collection - type: string - source: tl - total: true - - name: offline - label: report.tl.offline.collection - type: string - source: tl - total: true - - name: total - label: report.tl.totalCollection - type: string - source: tl - total: true - searchParams: - - name: fromDate - label: reports.tl.fromDate - type: epoch - source: tl - isMandatory: false - searchClause: AND paydetail.receiptdate >= $fromDate - - name: toDate - label: reports.tl.toDate - type: epoch - source: tl - isMandatory: false - searchClause: AND paydetail.receiptdate <= $toDate - query: | - select - sum(payment.totalamountpaid) as total, - count(*) as transactionNumber, - sum(case when payment.paymentmode!='ONLINE' then totalamountpaid else 0 end) as offline, - sum(case when payment.paymentmode='ONLINE' then totalamountpaid else 0 end) as online, - initcap(split_part(payment.tenantId, '.', 2)) as tenantId - from egcl_payment as payment - inner join egcl_paymentdetail paydetail on paydetail.paymentid=payment.id - where paydetail.businessservice = 'TL' and payment.paymentstatus != 'CANCELLED' - AND payment.tenantId LIKE '$tenantid' - groupby: GROUP BY payment.tenantId - - -- reportName: TradeLicenseApplicationStatusReport_v2 - summary: Nummber of applications by there status - version: 1.0.0 - moduleName: rainmaker-tl - externalService: - - entity: $.messages[*] - apiURL: http://egov-localization:8080/localization/messages/v1/_search?locale=en_IN&tenantId=pb&module=rainmaker-tl - keyOrder: code,message - tableName: tbl_localization - sourceColumns: - - name: status - label: report.tl.status - type: string - source: tl - total: false - - name: total - label: report.tl.total - type: string - source: tl - total: true - searchParams: - - name: fromDate - label: reports.tl.fromDate - type: epoch - source: tl - isMandatory: false - searchClause: AND tl.lastmodifiedtime >= $fromDate - - name: toDate - label: reports.tl.toDate - type: epoch - source: tl - isMandatory: false - searchClause: AND tl.lastmodifiedtime <= $toDate - query: | - SELECT - COUNT(applicationnumber) as total, - message.message as status - from eg_tl_tradelicense tl - LEFT OUTER JOIN message ON split_part(message.code,'_',2) = status AND split_part(message.code,'_',1)='TL' AND message.locale = 'en_IN' - WHERE tl.tenantid LIKE $tenantid - groupby: GROUP BY message.message - orderby: ORDER BY case message.message when 'Pending Application' then 1 when 'Pending Payment' then 2 when 'Pending Approval' then 3 when 'Approved' then 4 when 'Rejected' then 5 when 'Cancelled' then 6 else 7 end - - -- reportName: TradeLicenseULBWiseApplicationStatusReport_v2 - summary: Nummber of applications by there status - version: 1.0.0 - moduleName: rainmaker-tl - sourceColumns: - - name: tenantId - label: report.tl.tenantid - type: string - source: tl - total: false - - name: initiated - label: TL_INITIATED - type: string - source: tl - total: true - - name: applied - label: TL_APPLIED - type: string - source: tl - total: true - - name: pendingpayment - label: TL_PENDINGPAYMENT - type: string - source: tl - total: true - - name: paid - label: TL_PAID - type: string - source: tl - total: true - - name: fieldinspection - label: TL_FIELDINSPECTION - type: string - source: tl - total: true - - name: pendingapproval - label: TL_PENDINGAPPROVAL - type: string - source: tl - total: true - - name: approved - label: TL_APPROVED - type: string - source: tl - total: true - - name: rejected - label: TL_REJECTED - type: string - source: tl - total: true - - name: cancelled - label: TL_CANCELLED - type: string - source: tl - total: true - - name: citizenactionrequired - label: TL_CITIZENACTIONREQUIRED - type: string - source: tl - total: true - searchParams: - - name: fromDate - label: reports.tl.fromDate - type: epoch - source: tl - isMandatory: false - searchClause: AND tl.lastmodifiedtime >= $fromDate - - name: toDate - label: reports.tl.toDate - type: epoch - source: tl - isMandatory: false - searchClause: AND tl.lastmodifiedtime <= $toDate - - name: ulb - label: ULB - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name - source: tl - wrapper: true - isMandatory: false - searchClause: AND tl.tenantId = $ulb - query: | - SELECT - initcap(split_part(tenantId, '.', 2)) as tenantId, - SUM(CASE status when 'REJECTED' then 1 else 0 end) as rejected, - SUM(CASE status when 'INITIATED' then 1 else 0 end) as initiated, - SUM(CASE status when 'PENDINGPAYMENT' then 1 else 0 end) as pendingpayment, - SUM(CASE status when 'PAID' then 1 else 0 end) as paid, - SUM(CASE status when 'FIELDINSPECTION' then 1 else 0 end) as fieldinspection, - SUM(CASE status when 'CITIZENACTIONREQUIRED' then 1 else 0 end) as citizenactionrequired, - SUM(CASE status when 'PENDINGAPPROVAL' then 1 else 0 end) as pendingapproval, - SUM(CASE status when 'APPROVED' then 1 else 0 end) as approved, - SUM(CASE status when 'APPLIED' then 1 else 0 end) as applied, - SUM(CASE status when 'CANCELLED' then 1 else 0 end) as cancelled - FROM eg_tl_tradelicense as tl - WHERE tl.tenantid != 'pb.testing' - groupby: GROUP BY tenantid - orderby: ORDER BY tenantid - - -- reportName: StateLevelStatus_v2 - summary: Nummber of applications by there status state level - version: 1.0.0 - moduleName: rainmaker-tl - sourceColumns: - - name: status - label: report.tl.status - type: string - source: tl - total: false - - name: total - label: report.tl.total - type: string - source: tl - total: true - searchParams: - - name: fromDate - label: reports.tl.fromDate - type: epoch - source: tl - isMandatory: false - searchClause: AND tl.lastmodifiedtime >= $fromDate - - name: toDate - label: reports.tl.toDate - type: epoch - source: tl - isMandatory: false - searchClause: AND tl.lastmodifiedtime <= $toDate - - name: ulb - label: ULB - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name - source: tl - wrapper: true - isMandatory: false - searchClause: AND tl.tenantId = $ulb - query: | - SELECT - COUNT(applicationnumber) as total, - message.message as status - from eg_tl_tradelicense tl - LEFT OUTER JOIN message ON split_part(message.code,'_',2) = status AND split_part(message.code,'_',1)='TL' AND message.locale = 'en_IN' - WHERE tl.tenantid!='pb.testing' - groupby: GROUP BY message.message - orderby: ORDER BY case message.message when 'Pending Application' then 1 when 'Pending Payment' then 2 when 'Pending Approval' then 3 when 'Approved' then 4 when 'Rejected' then 5 when 'Cancelled' then 6 else 7 end - - -- reportName: ULBLevelStatus_v2 - summary: Nummber of applications by there status ULB level - version: 1.0.0 - moduleName: rainmaker-tl - sourceColumns: - - name: status - label: report.tl.status - type: string - source: tl - total: false - - name: total - label: report.tl.total - type: string - source: tl - total: true - searchParams: - - name: fromDate - label: reports.tl.fromDate - type: epoch - source: tl - isMandatory: false - searchClause: AND tl.lastmodifiedtime >= $fromDate - - name: toDate - label: reports.tl.toDate - type: epoch - source: tl - isMandatory: false - searchClause: AND tl.lastmodifiedtime <= $toDate - query: | - SELECT - COUNT(applicationnumber) as total, - message.message as status - from eg_tl_tradelicense tl - LEFT OUTER JOIN message ON split_part(message.code,'_',2) = status AND split_part(message.code,'_',1)='TL' AND message.locale = 'en_IN' - WHERE tl.tenantid=$tenantid - groupby: GROUP BY message.message - orderby: ORDER BY case message.message when 'Pending Application' then 1 when 'Pending Payment' then 2 when 'Pending Approval' then 3 when 'Approved' then 4 when 'Rejected' then 5 when 'Cancelled' then 6 else 7 end - - -- reportName: StateLevelTradeWiseCollection_v2 - summary: Collection according to tradeTypes state level - version: 1.0.0 - moduleName: rainmaker-tl - sourceColumns: - - name: tenantId - label: report.tl.tenantid - type: string - source: tl - total: false - - name: transactionNumber - label: report.tl.totalTransaction - type: string - source: tl - total: true - - name: online - label: report.tl.online.collection - type: string - source: tl - total: true - - name: offline - label: report.tl.offline.collection - type: string - source: tl - total: true - - name: total - label: report.tl.totalCollection - type: string - source: tl - total: true - searchParams: - - name: fromDate - label: reports.tl.fromDate - type: epoch - source: tl - isMandatory: false - searchClause: AND paydetail.receiptdate >= $fromDate - - name: toDate - label: reports.tl.toDate - type: epoch - source: tl - isMandatory: false - searchClause: AND paydetail.receiptdate <= $toDate - - name: ulb - label: ULB - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name - source: tl - wrapper: true - isMandatory: false - searchClause: AND payment.tenantId = $ulb - query: | - select - sum(payment.totalamountpaid) as total, - count(*) as transactionNumber, - sum(case when payment.paymentmode!='ONLINE' then payment.totalamountpaid else 0 end) as offline, - sum(case payment.paymentmode when 'ONLINE' then payment.totalamountpaid else 0 end) as online, - initcap(split_part(payment.tenantId, '.', 2)) as tenantId - from egcl_payment as payment - inner join egcl_paymentdetail as paydetail on paydetail.paymentid=payment.id - where paydetail.businessservice = 'TL' and payment.tenantid !='pb.testing' and payment.paymentstatus != 'CANCELLED' - groupby: GROUP BY payment.tenantId - orderby: ORDER BY payment.tenantId asc - - -- reportName: StateLevelTradeLicenseRegistryReport_v2 - decryptionPathId: StateLevelTradeLicenseRegistryReport_v2 - summary: TL Basic Report State Level - version: 1.0.0 - moduleName: rainmaker-tl - sourceColumns: - - name: tenantId - label: report.tl.tenantId - type: string - source: tl - total: false - - name: licensenumber - label: report.tl.licensenumber - type: string - source: tl - total: false - - name: formattedIssuedDate - label: report.tl.issueddate - type: string - source: tl - total: false - - name: g8issuedate - label: report.tl.g8issuedate - type: string - source: tl - total: false - - name: g8receiptno - label: report.tl.g8receiptno - type: string - source: tl - total: false - - name: name - label: report.tl.user.name - type: string - source: tl - total: false - - name: mobilenumber - label: report.tl.user.mobilenumber - type: string - source: tl - total: false - - name: tradeTypeName - label: report.tl.tradetype - type: string - source: tl - total: false - - name: acc - label: report.tl.accessorycategories - type: string - source: tl - total: false - - name: tradeName - label: report.tl.tradeName - type: string - source: tl - total: false - - name: totalamount - label: report.tl.receipt.totalamount - type: string - source: tl - total: true - searchParams: - - name: fromDate - label: reports.tl.fromDate - type: epoch - source: tl - isMandatory: false - searchClause: AND issueddate >= $fromDate - - name: toDate - label: reports.tl.toDate - type: epoch - source: tl - isMandatory: false - searchClause: AND issueddate <= $toDate - - name: ulb - label: ULB - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name - source: tl - wrapper: true - isMandatory: false - searchClause: AND tl.tenantId = $ulb - query: | - SELECT - tl.tenantId as tenantId, - licensenumber, - to_char((To_timestamp(issueddate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as formattedIssuedDate, - tl.tradeName, - tradeTypeName, - acc, - name, - mobilenumber, - paydetail.amountpaid as totalamount, - To_char((To_timestamp(paydetail.manualreceiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') AS g8issuedate, - paydetail.manualreceiptnumber as g8receiptno - FROM eg_tl_tradelicense tl - INNER JOIN eg_tl_tradelicensedetail tld ON tld.tradelicenseid = tl.id - INNER JOIN eg_tl_owner tlowner ON tlowner.tradelicensedetailid = tld.id - INNER JOIN ( - SELECT tradelicensedetailid, array_to_string(array_agg(message.message),', ') as tradeTypeName FROM eg_tl_tradeunit - LEFT OUTER JOIN message ON code = CONCAT('TRADELICENSE_TRADETYPE_', REGEXP_REPLACE(tradetype, '[^A-Za-z0-9]','_','g')) AND message.locale = 'en_IN' GROUP BY 1) tlunit ON tlunit.tradelicensedetailid = tld.id - INNER JOIN eg_user tluser ON tluser.uuid = tlowner.id - LEFT OUTER JOIN egcl_bill as bill ON bill.consumercode = tl.applicationnumber - inner join egcl_paymentdetail as paydetail on paydetail.billid=bill.id - LEFT OUTER JOIN - ( - SELECT tradelicensedetailid,array_to_string(array_agg(message.message),',') AS acc FROM eg_tl_accessory - LEFT OUTER JOIN message ON code=CONCAT('TRADELICENSE_ACCESSORIESCATEGORY_', REGEXP_REPLACE(accessorycategory, '[^A-Za-z0-9]','_', 'g')) AND message.locale = 'en_IN' GROUP BY 1 ) tlacc ON tlacc.tradelicensedetailid = tld.id - WHERE tl.Status = 'APPROVED' - orderby: ORDER BY tl.tenantId asc - - -- reportName: SearchTradeLicenseApplicationReport_v2 - decryptionPathId: SearchTradeLicenseApplicationReport_v2 - summary: TL Search Application Report - version: 1.0.0 - moduleName: rainmaker-tl - sourceColumns: - - name: applicationnumber - label: report.tl.applicationnumber - type: string - source: tl - total: false - - name: licensenumber - label: report.tl.licensenumber - type: string - source: tl - total: false - - name: tradeName - label: report.tl.tradeName - type: string - source: tl - total: false - - name: name - label: report.tl.user.name - type: string - source: tl - total: false - - name: mobilenumber - label: report.tl.user.mobilenumber - type: string - source: tl - total: false - - name: formattedIssuedDate - label: report.tl.issueddate - type: string - source: tl - total: false - - name: status - label: report.tl.status - type: string - source: tl - total: false - searchParams: - - name: fromDate - label: reports.tl.fromDate - type: epoch - source: tl - isMandatory: false - searchClause: AND tl.applicationdate >= $fromDate - - name: toDate - label: reports.tl.toDate - type: epoch - source: tl - isMandatory: false - searchClause: AND tl.applicationdate <= $toDate - - name: localityArray - label: reports.tl.zoneList - type: boundarylist - source: tl - isMandatory: false - searchClause: AND tla.locality IN ($localityArray) - query: | - SELECT - tl.applicationnumber, - tl.licensenumber, - tl.tradeName, - (split_part(tl.tenantId, '.', 2)) as tenantId, - split_part(ownername,',',1) as ownername, - split_part(mobilenumber,',',1) as mobilenumber, - tla.locality, - to_char((To_timestamp(applicationdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as applicationDate, - tl.status - from eg_tl_tradelicense as tl - INNER JOIN eg_tl_tradelicensedetail tld ON - tld.tradelicenseid = tl.id - INNER JOIN eg_tl_address as tla ON - tla.tradelicensedetailid=tld.id - INNER JOIN (SELECT tradelicensedetailid, array_to_string(array_agg(name),', ') as ownername, array_to_string(array_agg(mobilenumber),', ') as mobilenumber - FROM eg_tl_owner tlowner - INNER JOIN eg_user tluser ON - tluser.uuid = tlowner.id - group by tradelicensedetailid - ) tlown ON tlown.tradelicensedetailid = tld.id - WHERE tl.tenantid=$tenantid - - -- reportName: TradeLicenseDetailsReport_v2 - decryptionPathId: TradeLicenseDetailsReport_v2 - summary: Trade License Details Report - version: 1.0.0 - moduleName: rainmaker-tl - sourceColumns: - - name: applicationnumber - label: report.tl.applicationnumber - type: string - source: tl - total: false - - name: propertyid - label: report.tl.propertyid - type: string - source: tl - total: false - - name: financialyear - label: report.tl.financialyear - type: string - source: tl - total: false - - name: licensetype - label: report.tl.licensetype - type: string - source: tl - total: false - - name: oldlicensenumber - label: report.tl.oldlicensenumber - type: string - source: tl - total: false - - name: licensenumber - label: report.tl.licensenumber - type: string - source: tl - total: false - - name: tradeName - label: report.tl.tradeName - type: string - source: tl - total: false - - name: name - label: report.tl.user.name - type: string - source: tl - total: false - - name: mobilenumber - label: report.tl.user.mobilenumber - type: string - source: tl - total: false - - name: formattedIssuedDate - label: report.tl.issueddate - type: string - source: tl - total: false - - name: tradeTypeName - label: report.tl.tradetype - type: string - source: tl - total: false - - name: acc - label: report.tl.accessorycategories - type: string - source: tl - total: false - - name: totalamount - label: report.tl.receipt.totalamount - type: string - source: tl - total: true - - name: zone - label: report.tl.zone - type: string - source: tl - total: false - - name: ward_block - label: report.tl.locality - type: string - source: tl - total: false - - name: locality - label: report.tl.locality - type: string - source: tl - total: false - - name: status - label: report.tl.receipt.status - type: string - source: tl - total: false - searchParams: - - name: fromDate - label: reports.tl.fromDate - type: epoch - source: tl - isMandatory: false - searchClause: AND applicationdate >= $fromDate - - name: toDate - label: reports.tl.toDate - type: epoch - source: tl - isMandatory: false - searchClause: AND applicationdate <= $toDate - - name: localityArray - label: reports.tl.zoneList - type: boundarylist - source: tl - isMandatory: false - searchClause: AND eg_tl_address.locality IN ($localityArray) - query: | - SELECT - tl.applicationnumber as applicationnumber, - locality_tlb.locality as locality, - eg_bndry_mohalla.blockcode as ward_block, - eg_bndry_mohalla.zonecode as zone, - propertyid, - financialyear, - (case when oldlicensenumber is null then 'New' else 'Renewal' end) AS licensetype, - oldlicensenumber, - licensenumber, - to_char((To_timestamp(issueddate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as formattedIssuedDate, - tl.tradeName, - tradeTypeName, - acc, - name, - mobilenumber, - paydetail.amountpaid as totalamount, - tl.status as status - FROM eg_tl_tradelicense tl - INNER JOIN eg_tl_tradelicensedetail tld ON tld.tradelicenseid = tl.id - INNER JOIN ( - select tradelicensedetailid, array_to_string(array_agg(message.message),', ') as locality,array_to_string(array_agg(locality),', ') as localitycode from eg_tl_address as tla - LEFT OUTER JOIN message on code=CONCAT(UPPER(REGEXP_REPLACE( $tenantid , '[^A-Za-z0-9]','_', 'g')),'_REVENUE_', REGEXP_REPLACE( locality , '[^A-Za-z0-9]','_', 'g')) - AND message.locale = 'en_IN' group by 1) locality_tlb ON locality_tlb.tradelicensedetailid = tld.id - INNER JOIN eg_tl_owner tlowner ON tlowner.tradelicensedetailid = tld.id - INNER JOIN ( - SELECT tradelicensedetailid, array_to_string(array_agg(message.message),', ') as tradeTypeName FROM eg_tl_tradeunit - LEFT OUTER JOIN message ON code = CONCAT('TRADELICENSE_TRADETYPE_', REGEXP_REPLACE(tradetype, '[^A-Za-z0-9]','_','g')) AND message.locale = 'en_IN' GROUP BY 1) tlunit ON tlunit.tradelicensedetailid = tld.id - INNER JOIN eg_user tluser ON tluser.uuid = tlowner.id - LEFT OUTER JOIN egcl_bill bill ON bill.consumercode = tl.applicationnumber - LEFT OUTER JOIN egcl_paymentdetail as paydetail on paydetail.billid=bill.id - INNER JOIN eg_tl_address ON eg_tl_address.tradelicensedetailid = tld.id - INNER JOIN eg_bndry_mohalla ON eg_bndry_mohalla.localitycode= eg_tl_address.locality - LEFT OUTER JOIN - ( - SELECT tradelicensedetailid,array_to_string(array_agg(message.message),',') AS acc FROM eg_tl_accessory - LEFT OUTER JOIN message ON code=CONCAT('TRADELICENSE_ACCESSORIESCATEGORY_', REGEXP_REPLACE(accessorycategory, '[^A-Za-z0-9]','_', 'g')) AND message.locale = 'en_IN' GROUP BY 1 ) tlacc ON tlacc.tradelicensedetailid = tld.id - WHERE tl.tenantid=$tenantid - - -- reportName: StateDefaulterReport_v2 - decryptionPathId: StateDefaulterReport_v2 - summary: TL Defautler - version: 1.0.0 - moduleName: rainmaker-tl - sourceColumns: - - name: ulb - label: report.tl.ulb - type: string - source: tl - total: false - - name: licensenumber - label: report.tl.licensenumber - type: string - source: tl - total: false - - name: applicationnumber - label: report.tl.applicationnumber - type: string - source: tl - total: false - - name: oldlicensenumber - label: report.tl.oldlicensenumber - type: string - source: tl - total: false - - name: financialyear - label: report.tl.financialyear - type: string - source: tl - total: false - - name: tradename - label: report.tl.tradename - type: string - source: tl - total: false - - name: ownername - label: report.tl.ownername - type: string - source: tl - total: false - - name: mobilenumber - label: report.tl.mobilenumber - type: string - source: tl - total: false - query: | - select - split_part(tenantid,'.',2) as ulb, - licensenumber, - applicationnumber, - oldlicensenumber, - financialyear, - tradename, - split_part(name,',',1) as ownername, - split_part(mobilenumber,',',1) as mobilenumber - from eg_tl_tradelicense tl - INNER JOIN eg_tl_tradelicensedetail tld ON tld.tradelicenseid = tl.id - INNER JOIN ( - SELECT tradelicensedetailid, array_to_string(array_agg(name),', ') as name, array_to_string(array_agg(mobilenumber),', ') as mobilenumber - FROM eg_tl_owner tlowner - INNER JOIN eg_user tluser ON tluser.uuid = tlowner.id - group by tradelicensedetailid - ) tlown ON tlown.tradelicensedetailid = tld.id - where validto < extract (epoch from NOW())*1000 and licensenumber is not null and licensenumber not in (select oldlicensenumber from eg_tl_tradelicense where oldlicensenumber is not null) - and tenantid!='pb.testing' - orderby: order by tenantid - - -- reportName: ULBDefaulterReport_v2 - decryptionPathId: StateDefaulterReport_v2 - summary: TL Defautler - version: 1.0.0 - moduleName: rainmaker-tl - sourceColumns: - - name: ulb - label: report.tl.ulb - type: string - source: tl - total: false - - name: licensenumber - label: report.tl.licensenumber - type: string - source: tl - total: false - - name: applicationnumber - label: report.tl.applicationnumber - type: string - source: tl - total: false - - name: oldlicensenumber - label: report.tl.oldlicensenumber - type: string - source: tl - total: false - - name: financialyear - label: report.tl.financialyear - type: string - source: tl - total: false - - name: tradename - label: report.tl.tradename - type: string - source: tl - total: false - - name: ownername - label: report.tl.ownername - type: string - source: tl - total: false - - name: mobilenumber - label: report.tl.mobilenumber - type: string - source: tl - total: false - query: | - select - split_part(tenantid,'.',2) as ulb, - licensenumber, - applicationnumber, - oldlicensenumber, - financialyear, - tradename, - split_part(name,',',1) as ownername, - split_part(mobilenumber,',',1) as mobilenumber - from eg_tl_tradelicense tl - INNER JOIN eg_tl_tradelicensedetail tld ON tld.tradelicenseid = tl.id - INNER JOIN ( - SELECT tradelicensedetailid, array_to_string(array_agg(name),', ') as name, array_to_string(array_agg(mobilenumber),', ') as mobilenumber - FROM eg_tl_owner tlowner - INNER JOIN eg_user tluser ON tluser.uuid = tlowner.id - group by tradelicensedetailid - ) tlown ON tlown.tradelicensedetailid = tld.id - where validto < extract (epoch from NOW())*1000 and licensenumber is not null and licensenumber not in (select oldlicensenumber from eg_tl_tradelicense where oldlicensenumber is not null) - and tenantid = $tenantid - -- reportName: StateTradeLicenseDetailsReport_v2 - decryptionPathId: TradeLicenseDetailsReport_v2 - summary: State Trade License Details Report - version: 1.0.0 - moduleName: rainmaker-tl - sourceColumns: - - name: applicationnumber - label: report.tl.applicationnumber - type: string - source: tl - total: false - - name: propertyid - label: report.tl.propertyid - type: string - source: tl - total: false - - name: financialyear - label: report.tl.financialyear - type: string - source: tl - total: false - - name: licensetype - label: report.tl.licensetype - type: string - source: tl - total: false - - name: oldlicensenumber - label: report.tl.oldlicensenumber - type: string - source: tl - total: false - - name: licensenumber - label: report.tl.licensenumber - type: string - source: tl - total: false - - name: tradeName - label: report.tl.tradeName - type: string - source: tl - total: false - - name: name - label: report.tl.user.name - type: string - source: tl - total: false - - name: mobilenumber - label: report.tl.user.mobilenumber - type: string - source: tl - total: false - - name: formattedIssuedDate - label: report.tl.issueddate - type: string - source: tl - total: false - - name: tradeTypeName - label: report.tl.tradetype - type: string - source: tl - total: false - - name: acc - label: report.tl.accessorycategories - type: string - source: tl - total: false - - name: totalamount - label: report.tl.receipt.totalamount - type: string - source: tl - total: true - - name: tenantid - label: report.tl.tenantid - type: string - source: tl - total: false - - name: address - label: report.tl.address - type: string - source: tl - total: false - - name: emailid - label: report.tl.emailid - type: string - source: tl - total: false - - name: status - label: report.tl.receipt.status - type: string - source: tl - total: false - searchParams: - - name: fromDate - label: reports.tl.fromDate - type: epoch - source: tl - isMandatory: false - searchClause: AND applicationdate >= $fromDate - - name: toDate - label: reports.tl.toDate - type: epoch - source: tl - isMandatory: false - searchClause: AND applicationdate <= $toDate - - name: localityArray - label: reports.tl.zoneList - type: boundarylist - source: tl - isMandatory: false - searchClause: AND localitycode IN ($localityArray) - query: | - SELECT - tl.applicationnumber as applicationnumber, - propertyid, - financialyear, - (case when oldlicensenumber is null then 'New' else 'Renewal' end) AS licensetype, - oldlicensenumber, - licensenumber, - to_char((To_timestamp(issueddate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as formattedIssuedDate, - tl.tradeName, - tl.tenantid, - tradeTypeName, - acc, - name, - mobilenumber, - emailid, - paydetail.amountpaid as totalamount, - string_agg(distinct REGEXP_REPLACE(REGEXP_REPLACE(CONCAT(tla.doorno, ',', tla.buildingname, ',',tla.street,',',tla.localityname,',', tla.pincode), ',+', ','), '^,|,$', ''),',') as "address", - tl.status as status - FROM eg_tl_tradelicense tl - INNER JOIN eg_tl_tradelicensedetail tld ON tld.tradelicenseid = tl.id - inner join (SELECT tradelicensedetailid , locality,doorno,street,buildingname,pincode,localityname, max(createdtime) - from eg_tl_address inner join eg_bndry_mohalla on eg_bndry_mohalla.localitycode=locality where eg_tl_address.tenantid=$tenantid - group by tradelicensedetailid, locality, doorno,street,buildingname,pincode,localityname) tla ON tld.id=tla.tradelicensedetailid - INNER JOIN eg_tl_owner tlowner ON tlowner.tradelicensedetailid = tld.id - INNER JOIN ( - SELECT tradelicensedetailid, array_to_string(array_agg(message.message),', ') as tradeTypeName FROM eg_tl_tradeunit - LEFT OUTER JOIN message ON code = CONCAT('TRADELICENSE_TRADETYPE_', REGEXP_REPLACE(tradetype, '[^A-Za-z0-9]','_','g')) AND message.locale = 'en_IN' GROUP BY 1) tlunit ON tlunit.tradelicensedetailid = tld.id - INNER JOIN eg_user tluser ON tluser.uuid = tlowner.id - LEFT OUTER JOIN egcl_bill bill ON bill.consumercode = tl.applicationnumber - LEFT OUTER JOIN egcl_paymentdetail as paydetail on paydetail.billid=bill.id - INNER JOIN eg_tl_address ON eg_tl_address.tradelicensedetailid = tld.id - LEFT OUTER JOIN - ( - SELECT tradelicensedetailid,array_to_string(array_agg(message.message),',') AS acc FROM eg_tl_accessory - LEFT OUTER JOIN message ON code=CONCAT('TRADELICENSE_ACCESSORIESCATEGORY_', REGEXP_REPLACE(accessorycategory, '[^A-Za-z0-9]','_', 'g')) AND message.locale = 'en_IN' GROUP BY 1 ) tlacc ON tlacc.tradelicensedetailid = tld.id - WHERE tl.tenantid!='pb.testing' - orderby: order by tl.tenantid - -- reportName: TradeLicensePendencyReport_v2 - decryptionPathId: TradeLicensePendencyReport_v2 - summary: Trade License Pendency Report - version: 1.0.0 - moduleName: rainmaker-tl - sourceColumns: - - name: applicationnumber - label: report.tl.applicationnumber - type: string - source: tl - total: false - - name: tradename - label: report.tl.tradename - type: string - source: tl - total: false - - name: financialyear - label: report.tl.financialyear - type: string - source: tl - total: false - - name: licensetype - label: report.tl.licensetype - type: string - source: tl - total: false - - name: licensenumber - label: report.tl.licensenumber - type: string - source: tl - total: false - - name: name - label: report.tl.user.name - type: string - source: tl - total: false - - name: totalamount - label: report.tl.totalamount - type: string - source: tl - total: true - - name: status - label: report.tl.status - type: string - source: tl - total: false - - name: assignee - label: report.tl.assignee - type: string - source: tl - total: false - - name: days - label: report.tl.days - type: string - source: tl - total: false - searchParams: - - name: fromDate - label: reports.tl.fromDate - type: epoch - source: tl - isMandatory: false - searchClause: AND applicationdate >= $fromDate - - name: toDate - label: reports.tl.toDate - type: epoch - source: tl - isMandatory: false - searchClause: AND applicationdate <= $toDate - query: | - SELECT - string_agg(DISTINCT t.applicationnumber,',')as applicationnumber, - string_agg(DISTINCT t.tradeName,',') as tradename, - string_agg(DISTINCT financialyear,',') as financialyear, - t.applicationdate, - string_agg(DISTINCT(case when oldlicensenumber is null then 'New' else 'Renewal' end),',') AS licensetype, - string_agg(distinct licensenumber,',') as licensenumber, - split_part(string_agg(u.name,','),',',1) as name, -- string_agg(name,',') as name, - string_agg(distinct paydetail.amountpaid::varchar,',') as totalamount, - string_agg(distinct t.status,',') as status, - split_part(string_agg(distinct us.name,','),',',1) as assignee, - CURRENT_DATE- to_timestamp(cast(t.applicationdate/1000 as bigint))::date as days - FROM eg_tl_tradelicense t INNER JOIN eg_tl_tradelicensedetail td ON td.tradelicenseid = t.id - INNER JOIN eg_tl_owner O ON O.tradelicensedetailid = td.id - INNER JOIN eg_user u ON u.uuid = O.id - LEFT OUTER JOIN egcl_bill bill ON bill.consumercode = t.applicationnumber - LEFT OUTER JOIN egcl_paymentdetail as paydetail on paydetail.billid=bill.id - INNER JOIN eg_wf_processinstance_v2 AS WFP ON WFP.businessid=t.applicationnumber and WFP.lastmodifiedtime - in (select max(lastmodifiedtime) from eg_wf_processinstance_v2 where businessid=t.applicationnumber) - INNER JOIN eg_wf_assignee_v2 as W ON W.processinstanceid=WFP.id - INNER JOIN eg_user us ON us.uuid = W.assignee - WHERE t.status NOT IN ('APPROVED','CANCELLED','REJECTED','PENDINGPAYMENT','INITIATED') - and t.tenantid=$tenantid - groupby: GROUP BY O.tradelicensedetailid,applicationdate - orderby: ORDER BY applicationnumber DESC - -- reportName: EmployeeWiseCollectionTL_v2 - decryptionPathId: MiscReceiptULB_v2 - summary: Employee Wise Collection TL - version: 1.0.0 - moduleName: rainmaker-tl - additionalConfig: - print: - pdfPageSize: "A3" - sourceColumns: - - name: collectorname - label: reports.tl.collectorname - type: string - source: tl - total: false - - name: paymentmode - label: reports.tl.paymentmode - type: string - source: tl - total: false - - name: countofreceipts - label: reports.tl.countofreceipts - type: string - source: tl - total: true - - name: totalamount - label: reports.tl.totalamount - type: string - source: tl - total: true - searchParams: - - name: fromDate - label: reports.tl.fromDate - type: epoch - source: tl - isMandatory: false - searchClause: AND receipt.createddate >= $fromDate - - name: toDate - label: reports.tl.toDate - type: epoch - source: tl - isMandatory: false - searchClause: AND receipt.createddate <= $toDate - - name: collectorname - label: reports.tl.collectorname - type: singlevaluelist - pattern: http://egov-hrms:8080/egov-hrms/employees/_search?tenantId=$tenantid&roles=TL_CEMP|$.Employees[*].user.id|$.Employees[*].user.name - source: pt - wrapper: true - isMandatory: false - searchClause: AND eg_user.id = $collectorname::INTEGER - query: | - SELECT - eg_user.name as collectorname, - paymentmode as paymentmode, - count(paydetail.receiptnumber) as Countofreceipts, - Sum(payment.totalamountpaid) as totalamount - FROM egcl_payment AS payment - JOIN egcl_paymentdetail as paydetail on paydetail.paymentid=payment.id - JOIN eg_user ON payment.createdby::INTEGER=eg_user.id - WHERE payment.tenantid=$tenantid AND businessservice in ('TL') and payment.paymentstatus != 'CANCELLED' - groupby: GROUP BY collectorname , paymentmode - - diff --git a/configs/reports/configs/uc-reports.yml b/configs/reports/configs/uc-reports.yml deleted file mode 100644 index 75374011..00000000 --- a/configs/reports/configs/uc-reports.yml +++ /dev/null @@ -1,2030 +0,0 @@ -ReportDefinitions: - - reportName: MiscReceipt - summary: Receipt Register Miscellaneous - version: 1.0.0 - moduleName: rainmaker-uc - sourceColumns: - - name: ulb - label: reports.uc.ulb - type: string - source: uc - total: false - - name: receiptnumber - label: reports.uc.receiptnumber - type: string - source: uc - total: false - - name: receiptdate - label: reports.uc.receiptdate - type: string - source: uc - total: false - - name: g8issuedate - label: reports.uc.g8issuedate - type: string - source: uc - total: false - - name: g8receiptno - label: reports.uc.g8receiptno - type: string - source: uc - total: false - - name: status - label: reports.uc.receiptstatus - type: string - source: uc - total: false - - name: servicecategory - label: reports.uc.businessdetails - type: string - source: uc - total: false - - name: cgst - label: reports.uc.cgst - type: string - source: uc - total: true - - name: tax - label: reports.uc.tax - type: string - source: uc - total: true - - name: fieldcollection - label: reports.uc.fieldcollection - type: string - source: uc - total: true - - name: sgst - label: reports.uc.sgst - type: string - source: uc - total: true - - name: ddorchequenumber - label: reports.uc.ddorchequenumber - type: string - source: uc - total: false - - name: collectiontype - label: reports.uc.collectiontype - type: string - source: uc - total: false - - name: collectorname - label: reports.uc.collectorname - type: string - source: uc - total: false - - name: totalamount - label: reports.uc.totalamount - type: string - source: uc - total: true - - name: paymentmode - label: reports.uc.paymentmode - type: string - source: uc - total: false - searchParams: - - name: fromDate - label: reports.uc.fromDate - type: epoch - source: uc - isMandatory: false - searchClause: AND rh.receiptdate >= $fromDate - - name: toDate - label: reports.uc.toDate - type: epoch - source: uc - isMandatory: false - searchClause: AND rh.receiptdate <= $toDate - - name: ulb - label: reports.uc.ulb - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name - source: uc - wrapper: true - isMandatory: false - searchClause: AND rh.tenantid = $ulb - query: | - -- Use CTE to force query plan, compute & use CTE later - WITH receipt_breakup AS ( - SELECT - receiptheader, - SUM(CASE WHEN taxheadcode LIKE '%_CGST' THEN adjustedamount ELSE 0 END) as cgst, - SUM(CASE WHEN taxheadcode LIKE '%_TAX' THEN adjustedamount ELSE 0 END) as tax, - SUM(CASE WHEN taxheadcode LIKE '%_SGST' THEN adjustedamount ELSE 0 END) as sgst, - SUM(CASE WHEN taxheadcode LIKE '%_FIELD_FEE' THEN adjustedamount ELSE 0 END) as fieldcollection - FROM egcl_receiptdetails_v1 as rd - INNER JOIN egcl_receiptheader_v1 as rh on rh.id = rd.receiptheader - WHERE rh.status != 'Cancelled' AND rh.tenantid!='pb.testing' AND businessdetails not in ('PT','TL') - GROUP BY rd.receiptheader - ) - SELECT - rh.tenantid as ulb, - rh.receiptnumber as receiptnumber, - To_char((To_timestamp(rh.receiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as receiptdate, - To_char((To_timestamp(rh.manualreceiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as g8issuedate, - rh.manualreceiptnumber as g8receiptno, - rh.status as status, - businessdetails as servicecategory, - receipt_breakup.*, - amount as totalamount, - instrumenttype as paymentmode, - (case when instrumenttype like 'Cash' then '' else transactionnumber end) as ddorchequenumber, - 'System' as collectiontype, - eg_user.name as collectorname - FROM egcl_receiptheader_v1 AS rh - JOIN egcl_receiptinstrument_v1 AS ri ON rh.id = ri.receiptheader - JOIN egcl_instrumentheader_v1 AS ih ON ih.id = ri.instrumentheader - JOIN receipt_breakup ON rh.id = receipt_breakup.receiptheader - JOIN eg_user ON rh.createdby::INTEGER=eg_user.id - WHERE rh.status != 'Cancelled' AND rh.tenantid!='pb.testing' AND businessdetails not in ('PT','TL') - orderby: ORDER BY rh.receiptdate DESC - - - reportName: MiscReceiptULB - summary: Receipt Register Miscellaneous - version: 1.0.0 - moduleName: rainmaker-uc - additionalConfig: - print: - pdfPageSize: "A3" - sourceColumns: - - name: ulb - label: reports.uc.ulb - type: string - source: uc - total: false - - name: receiptnumber - label: reports.uc.receiptnumber - type: string - source: uc - total: false - - name: receiptdate - label: reports.uc.receiptdate - type: string - source: uc - total: false - - name: g8issuedate - label: reports.uc.g8issuedate - type: string - source: uc - total: false - - name: g8receiptno - label: reports.uc.g8receiptno - type: string - source: uc - total: false - - name: status - label: reports.uc.receiptstatus - type: string - source: uc - total: false - - name: servicecategory - label: reports.uc.businessdetails - type: string - source: uc - total: false - - name: cgst - label: reports.uc.cgst - type: string - source: uc - total: true - - name: tax - label: reports.uc.tax - type: string - source: uc - total: true - - name: fieldcollection - label: reports.uc.fieldcollection - type: string - source: uc - total: true - - name: sgst - label: reports.uc.sgst - type: string - source: uc - total: true - - name: ddorchequenumber - label: reports.uc.ddorchequenumber - type: string - source: uc - total: false - - name: ddchequedate - label: reports.uc.ddorchequedate - type: string - source: uc - total: false - - name: bankname - label: reports.uc.bankname - type: string - source: uc - total: false - - name: branchname - label: reports.uc.branchname - type: string - source: uc - total: false - - name: collectiontype - label: reports.uc.collectiontype - type: string - source: uc - total: false - - name: collectorname - label: reports.uc.collectorname - type: string - source: uc - total: false - - name: totalamount - label: reports.uc.totalamount - type: string - source: uc - total: true - - name: paymentmode - label: reports.uc.paymentmode - type: string - source: uc - total: false - - name: comments - label: reports.uc.comment - type: string - source: uc - total: false - searchParams: - - name: fromDate - label: reports.uc.fromDate - type: epoch - source: uc - isMandatory: true - searchClause: AND rh.receiptdate >= $fromDate - - name: toDate - label: reports.uc.toDate - type: epoch - source: uc - isMandatory: true - searchClause: AND rh.receiptdate <= $toDate - - name: businessservice - label: reports.uc.businessservice - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=BillingService&masterName=BusinessService&tenantId=$tenantid|$.MdmsRes.BillingService.BusinessService[*].code|$.MdmsRes.BillingService.BusinessService[*].code - source: uc - wrapper: true - isMandatory: false - searchClause: AND rh.businessdetails = $businessservice - - name: collectorname - label: reports.uc.collectorname - type: singlevaluelist - pattern: http://egov-hrms:8080/egov-hrms/employees/_search?tenantId=$tenantid&roles=UC_EMP|$.Employees[*].user.id|$.Employees[*].user.name - source: uc - wrapper: true - isMandatory: false - searchClause: AND eg_user.id = $collectorname::INTEGER - query: | - -- Use CTE to force query plan, compute & use CTE later - WITH receipt_breakup AS ( - SELECT - receiptheader, - SUM(CASE WHEN taxheadcode LIKE '%_CGST' THEN adjustedamount ELSE 0 END) as cgst, - SUM(CASE WHEN taxheadcode LIKE '%_TAX' THEN adjustedamount ELSE 0 END) as tax, - SUM(CASE WHEN taxheadcode LIKE '%_SGST' THEN adjustedamount ELSE 0 END) as sgst, - SUM(CASE WHEN taxheadcode LIKE '%_FIELD_FEE' THEN adjustedamount ELSE 0 END) as fieldcollection - FROM egcl_receiptdetails_v1 as rd - INNER JOIN egcl_receiptheader_v1 as rh on rh.id = rd.receiptheader - where status!='Cancelled' and businessdetails not in ('PT','TL') and rd.tenantid=$tenantid - GROUP BY rd.receiptheader - ) - SELECT - rh.tenantid as ulb, - rh.receiptnumber as receiptnumber, - To_char((To_timestamp(rh.receiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as receiptdate, - To_char((To_timestamp(rh.manualreceiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as g8issuedate, - rh.manualreceiptnumber as g8receiptno, - rh.status as status, - businessdetails as servicecategory, - receipt_breakup.*, - amount as totalamount, - instrumenttype as paymentmode, - (case when instrumenttype like 'Cash' then '' else transactionnumber end) as ddorchequenumber, - (case when instrumenttype like 'DD' or instrumenttype like 'Cheque' then To_char((To_timestamp(ih.transactiondate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') else '' end) as ddchequedate, - ih.bankid as bankname, - ih.branchname as branchname, - 'System' as collectiontype, - eg_user.name as collectorname, - rh.additionaldetails->>'comment' as comments - FROM egcl_receiptheader_v1 AS rh - JOIN egcl_receiptinstrument_v1 AS ri ON rh.id = ri.receiptheader - JOIN egcl_instrumentheader_v1 AS ih ON ih.id = ri.instrumentheader - JOIN receipt_breakup ON rh.id = receipt_breakup.receiptheader - JOIN eg_user ON rh.createdby::INTEGER=eg_user.id - WHERE rh.status != 'Cancelled' AND businessdetails not in ('PT','TL') - and rh.tenantid=$tenantid - orderby: ORDER BY rh.receiptdate DESC - - - reportName: MiscReceiptStateWide - summary: State Receipt Register Miscellaneous - version: 1.0.0 - moduleName: rainmaker-uc - sourceColumns: - - name: ulb - label: reports.uc.ulb - type: string - source: uc - total: false - - name: servicecategory - label: reports.uc.businessdetails - type: string - source: uc - total: false - - name: cgst - label: reports.uc.cgst - type: string - source: uc - total: true - - name: tax - label: reports.uc.tax - type: string - source: uc - total: true - - name: fieldcollection - label: reports.uc.fieldcollection - type: string - source: uc - total: true - - name: sgst - label: reports.uc.sgst - type: string - source: uc - total: true - - name: totalamount - label: reports.uc.totalamount - type: string - source: uc - total: true - searchParams: - - name: fromDate - label: reports.uc.fromDate - type: epoch - source: uc - isMandatory: false - searchClause: AND rh.receiptdate >= $fromDate - - name: toDate - label: reports.uc.toDate - type: epoch - source: uc - isMandatory: false - searchClause: AND rh.receiptdate <= $toDate - - name: ulb - label: reports.uc.ulb - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name - source: uc - wrapper: true - isMandatory: false - searchClause: AND rh.tenantid = $ulb - query: | - -- Use CTE to force query plan, compute & use CTE later - SELECT - rh.tenantid as ulb,rh.businessdetails as servicecategory, count(*) as receipts, - SUM(CASE WHEN taxheadcode LIKE '%_FIELD_FEE' THEN adjustedamount ELSE 0 END) as fieldcollection, - SUM(CASE WHEN taxheadcode LIKE '%_TAX' THEN adjustedamount ELSE 0 END) as tax, - SUM(CASE WHEN taxheadcode LIKE '%_CGST' THEN adjustedamount ELSE 0 END) as cgst, - SUM(CASE WHEN taxheadcode LIKE '%_SGST' THEN adjustedamount ELSE 0 END) as sgst, - sum(totalamount) as totalamount - from egcl_receiptheader_v1 rh, egcl_receiptdetails_v1 as rd - WHERE rh.id=rd.receiptheader and rh.status != 'Cancelled' AND rh.tenantid!='pb.testing' AND businessdetails not in ('PT','TL') - groupby: group by rh.tenantid,rh.businessdetails - orderby: order by rh.tenantid - - - reportName: MiscReceiptState - summary: State Miscellaneous Receipt Register - version: 1.0.0 - moduleName: rainmaker-uc - sourceColumns: - - name: ulb - label: reports.uc.ulb - type: string - source: uc - total: false - - name: noofreceipts - label: reports.uc.noOfReceipts - type: string - source: uc - total: true - - name: tax - label: reports.uc.tax - type: string - source: uc - total: true - - name: cgst - label: reports.uc.cgst - type: string - source: uc - total: true - - name: sgst - label: reports.uc.sgst - type: string - source: uc - total: true - - name: fieldcollection - label: reports.uc.fieldCollection - type: string - source: uc - total: true - - name: totalamount - label: reports.uc.totalamount - type: string - source: uc - total: true - searchParams: - - name: fromDate - label: reports.uc.fromDate - type: epoch - source: uc - isMandatory: false - searchClause: AND rh.receiptdate >= $fromDate - - name: toDate - label: reports.uc.toDate - type: epoch - source: uc - isMandatory: false - searchClause: AND rh.receiptdate <= $toDate - - name: ulb - label: reports.uc.ulb - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name - source: uc - wrapper: true - isMandatory: false - searchClause: AND rh.tenantid = $ulb - query: | - -- Use CTE to force query plan, compute & use CTE later - SELECT - rh.tenantid as ulb, - count(distinct rh.id) as noofreceipts, - SUM(CASE WHEN taxheadcode LIKE '%_TAX' THEN adjustedamount ELSE 0 END) as tax, - SUM(CASE WHEN taxheadcode LIKE '%_CGST' THEN adjustedamount ELSE 0 END) as cgst, - SUM(CASE WHEN taxheadcode LIKE '%_SGST' THEN adjustedamount ELSE 0 END) as sgst, - SUM(CASE WHEN taxheadcode LIKE '%_FIELD_FEE' THEN adjustedamount ELSE 0 END) as fieldcollection, - sum(amount) as totalamount - from egcl_receiptheader_v1 rh, egcl_receiptdetails_v1 as rd - WHERE rh.id=rd.receiptheader and rh.status != 'Cancelled' AND rh.tenantid!='pb.testing' AND businessdetails not in ('PT','TL') - groupby: group by rh.tenantid - - - - - reportName: MiscCollectionState - summary: State Miscellaneous Collection Register - version: 1.0.0 - moduleName: rainmaker-uc - sourceColumns: - - name: ulb - label: reports.uc.ulb - type: string - source: uc - total: false - - name: offlinetransactions - label: reports.uc.noOfOfflineTransactions - type: string - source: uc - total: true - - name: onlinetransactions - label: reports.uc.noOfOnlineTransactions - type: string - source: uc - total: true - - name: totaltransactions - label: reports.uc.totalTransactions - type: string - source: uc - total: true - - name: offlinecollection - label: reports.uc.offlineCollection - type: string - source: uc - total: true - - name: onlinecollection - label: reports.uc.onlineCollection - type: string - source: uc - total: true - - name: totalcollection - label: reports.uc.totalCollection - type: string - source: uc - total: true - searchParams: - - name: fromDate - label: reports.uc.fromDate - type: epoch - source: uc - isMandatory: false - searchClause: AND rh.receiptdate >= $fromDate - - name: toDate - label: reports.uc.toDate - type: epoch - source: uc - isMandatory: false - searchClause: AND rh.receiptdate <= $toDate - - name: ulb - label: reports.uc.ulb - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name - source: uc - wrapper: true - isMandatory: false - searchClause: AND rh.tenantid = $ulb - query: | - -- Use CTE to force query plan, compute & use CTE later - SELECT - initcap(split_part(rh.tenantId, '.', 2)) as ulb, - count(*) FILTER (where collectiontype='COUNTER') as offlinetransactions, - count(*) FILTER (where collectiontype='ONLINE') as onlinetransactions, - count(*) as totaltransactions, - sum(case collectiontype when 'COUNTER' then ih.amount else 0 end) as offlinecollection, - sum(case collectiontype when 'ONLINE' then ih.amount else 0 end) as onlinecollection, - sum(ih.amount) as totalcollection - from egcl_receiptheader_v1 as rh - inner join egcl_receiptinstrument_v1 as ri on ri.receiptheader = rh.id - inner join egcl_instrumentheader_v1 as ih on ih.id = ri.instrumentheader - where rh.businessdetails not in ('PT','TL') and rh.status !='Cancelled' and rh.tenantid !='pb.testing' - groupby: GROUP BY rh.tenantid - orderby: ORDER BY rh.tenantId asc - - - reportName: MiscBusinessServiceCollectionTenant - summary: Miscellaneous Business Service Collection - version: 1.0.0 - moduleName: rainmaker-uc - sourceColumns: - - name: servicetype - label: reports.uc.serviceType - type: string - source: uc - total: false - - name: totalreceipts - label: reports.uc.totalReceipts - type: string - source: uc - total: true - - name: tax - label: reports.uc.tax - type: string - source: uc - total: true - - name: cgst - label: reports.uc.cgst - type: string - source: uc - total: true - - name: sgst - label: reports.uc.sgst - type: string - source: uc - total: true - - name: fieldcollection - label: reports.uc.fieldCollection - type: string - source: uc - total: true - - name: totalcollection - label: reports.uc.totalCollection - type: string - source: uc - total: true - searchParams: - - name: fromDate - label: reports.uc.fromDate - type: epoch - source: uc - isMandatory: false - searchClause: AND rh.receiptdate >= $fromDate - - name: toDate - label: reports.uc.toDate - type: epoch - source: uc - isMandatory: false - searchClause: AND rh.receiptdate <= $toDate - query: | - -- Use CTE to force query plan, compute & use CTE later - SELECT - rh.businessdetails as servicetype, - count(distinct rh.id) as totalreceipts, - SUM(CASE WHEN taxheadcode LIKE '%_TAX' THEN adjustedamount ELSE 0 END) as tax, - SUM(CASE WHEN taxheadcode LIKE '%_CGST' THEN adjustedamount ELSE 0 END) as cgst, - SUM(CASE WHEN taxheadcode LIKE '%_SGST' THEN adjustedamount ELSE 0 END) as sgst, - SUM(CASE WHEN taxheadcode LIKE '%_FIELD_FEE' THEN adjustedamount ELSE 0 END) as fieldcollection, - SUM(amount) as totalcollection - from egcl_receiptheader_v1 rh, egcl_receiptdetails_v1 as rd - WHERE rh.id=rd.receiptheader and rh.status != 'Cancelled' AND rh.tenantid=$tenantid AND businessdetails not in ('PT','TL') - groupby: GROUP BY rh.businessdetails - orderby: ORDER BY rh.businessdetails - - - reportName: MiscReceiptULBCancelled - summary: Cancelled Receipt Miscellaneous - version: 1.0.0 - moduleName: rainmaker-uc - additionalConfig: - print: - pdfPageSize: "A3" - sourceColumns: - - name: ulb - label: reports.uc.ulb - type: string - source: uc - total: false - - name: receiptnumber - label: reports.uc.receiptnumber - type: string - source: uc - total: false - - name: receiptdate - label: reports.uc.receiptdate - type: string - source: uc - total: false - - name: servicecategory - label: reports.uc.businessdetails - type: string - source: uc - total: false - - name: cgst - label: reports.uc.cgst - type: string - source: uc - total: true - - name: tax - label: reports.uc.tax - type: string - source: uc - total: true - - name: fieldcollection - label: reports.uc.fieldcollection - type: string - source: uc - total: true - - name: sgst - label: reports.uc.sgst - type: string - source: uc - total: true - - name: ddorchequenumber - label: reports.uc.ddorchequenumber - type: string - source: uc - total: false - - name: ddchequedate - label: reports.uc.ddorchequedate - type: string - source: uc - total: false - - name: collectiontype - label: reports.uc.collectiontype - type: string - source: uc - total: false - - name: collectorname - label: reports.uc.collectorname - type: string - source: uc - total: false - - name: totalamount - label: reports.uc.totalamount - type: string - source: uc - total: true - - name: paymentmode - label: reports.uc.paymentmode - type: string - source: uc - total: false - searchParams: - - name: fromDate - label: reports.uc.fromDate - type: epoch - source: uc - isMandatory: false - searchClause: AND rh.receiptdate >= $fromDate - - name: toDate - label: reports.uc.toDate - type: epoch - source: uc - isMandatory: false - searchClause: AND rh.receiptdate <= $toDate - - name: collectorname - label: reports.uc.collectorname - type: singlevaluelist - pattern: http://egov-hrms:8080/egov-hrms/employees/_search?tenantId=$tenantid&roles=UC_EMP|$.Employees[*].user.id|$.Employees[*].user.name - source: uc - wrapper: true - isMandatory: false - searchClause: AND eg_user.id = $collectorname::INTEGER - query: | - -- Use CTE to force query plan, compute & use CTE later - WITH receipt_breakup AS ( - SELECT - receiptheader, - SUM(CASE WHEN taxheadcode LIKE '%_CGST' THEN adjustedamount ELSE 0 END) as cgst, - SUM(CASE WHEN taxheadcode LIKE '%_TAX' THEN adjustedamount ELSE 0 END) as tax, - SUM(CASE WHEN taxheadcode LIKE '%_SGST' THEN adjustedamount ELSE 0 END) as sgst, - SUM(CASE WHEN taxheadcode LIKE '%_FIELD_FEE' THEN adjustedamount ELSE 0 END) as fieldcollection - FROM egcl_receiptdetails_v1 as rd - INNER JOIN egcl_receiptheader_v1 as rh on rh.id = rd.receiptheader - WHERE rh.status = 'Cancelled' AND businessdetails not in ('PT','TL') and rh.tenantid=$tenantid - GROUP BY rd.receiptheader - ) - SELECT - rh.tenantid as ulb, - rh.receiptnumber as receiptnumber, - To_char((To_timestamp(rh.receiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as receiptdate, - businessdetails as servicecategory, - receipt_breakup.*, - amount as totalamount, - instrumenttype as paymentmode, - (case when instrumenttype like 'Cash' then '' else transactionnumber end) as ddorchequenumber, - (case when instrumenttype like 'DD' or instrumenttype like 'Cheque' then To_char((To_timestamp(ih.transactiondate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') else '' end) as ddchequedate, - eg_user.name as collectorname - FROM egcl_receiptheader_v1 AS rh - JOIN egcl_receiptinstrument_v1 AS ri ON rh.id = ri.receiptheader - JOIN egcl_instrumentheader_v1 AS ih ON ih.id = ri.instrumentheader - JOIN receipt_breakup ON rh.id = receipt_breakup.receiptheader - JOIN eg_user ON rh.createdby::INTEGER=eg_user.id - WHERE rh.status = 'Cancelled' AND businessdetails not in ('PT','TL') - and rh.tenantid=$tenantid - orderby: ORDER BY rh.receiptdate DESC - - - reportName: MiscReceiptULBShort - summary: Receipt Register Miscellaneous - version: 1.0.0 - moduleName: rainmaker-uc - additionalConfig: - print: - pdfPageSize: "A3" - sourceColumns: - - name: consumername - label: reports.uc.consumername - type: string - source: uc - total: false - - name: mobilenumber - label: reports.uc.mobilenumber - type: string - source: uc - total: false - - name: receiptdate - label: reports.uc.receiptdate - type: string - source: uc - total: false - - name: servicecategory - label: reports.uc.businessdetails - type: string - source: uc - total: false - - name: amount - label: reports.uc.totalamount - type: string - source: uc - total: true - - name: remarks - label: reports.uc.remarks - type: string - source: uc - total: false - - name: collectorname - label: reports.uc.collectorname - type: string - source: uc - total: false - searchParams: - - name: fromDate - label: reports.uc.fromDate - type: epoch - source: uc - isMandatory: false - searchClause: AND rh.receiptdate >= $fromDate - - name: toDate - label: reports.uc.toDate - type: epoch - source: uc - isMandatory: false - searchClause: AND rh.receiptdate <= $toDate - - name: collectorname - label: reports.uc.collectorname - type: singlevaluelist - pattern: http://egov-hrms:8080/egov-hrms/employees/_search?tenantId=$tenantid&roles=UC_EMP|$.Employees[*].user.id|$.Employees[*].user.name - source: uc - wrapper: true - isMandatory: false - searchClause: AND eg_user.id = $collectorname::INTEGER - query: | - -- Use CTE to force query plan, compute & use CTE later - SELECT - rh.payername as consumername, - rh.payermobile as mobilenumber, - To_char((To_timestamp(rh.receiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as receiptdate, - businessdetails as servicecategory, - rh.totalamount as amount, - eg_user.name as collectorname, - rh.additionaldetails->>'comment' as remarks - FROM egcl_receiptheader_v1 AS rh - JOIN egcl_receiptinstrument_v1 AS ri ON rh.id = ri.receiptheader - JOIN egcl_instrumentheader_v1 AS ih ON ih.id = ri.instrumentheader - JOIN eg_user ON rh.createdby::INTEGER=eg_user.id - WHERE rh.status != 'Cancelled' AND businessdetails not in ('PT','TL') - and rh.tenantid=$tenantid - orderby: ORDER BY rh.receiptdate DESC - - - - reportName: MiscReceipt_v2 - decryptionPathId: MiscReceiptULB_v2 - summary: Receipt Register Miscellaneous - version: 1.0.0 - moduleName: rainmaker-uc - sourceColumns: - - name: ulb - label: reports.uc.ulb - type: string - source: uc - total: false - - name: receiptnumber - label: reports.uc.receiptnumber - type: string - source: uc - total: false - - name: receiptdate - label: reports.uc.receiptdate - type: string - source: uc - total: false - - name: g8issuedate - label: reports.uc.g8issuedate - type: string - source: uc - total: false - - name: g8receiptno - label: reports.uc.g8receiptno - type: string - source: uc - total: false - - name: status - label: reports.uc.receiptstatus - type: string - source: uc - total: false - - name: servicecategory - label: reports.uc.businessdetails - type: string - source: uc - total: false - - name: cgst - label: reports.uc.cgst - type: string - source: uc - total: true - - name: tax - label: reports.uc.tax - type: string - source: uc - total: true - - name: fieldcollection - label: reports.uc.fieldcollection - type: string - source: uc - total: true - - name: sgst - label: reports.uc.sgst - type: string - source: uc - total: true - - name: ddorchequenumber - label: reports.uc.ddorchequenumber - type: string - source: uc - total: false - - name: collectiontype - label: reports.uc.collectiontype - type: string - source: uc - total: false - - name: collectorname - label: reports.uc.collectorname - type: string - source: uc - total: false - - name: totalamount - label: reports.uc.totalamount - type: string - source: uc - total: true - - name: paymentmode - label: reports.uc.paymentmode - type: string - source: uc - total: false - searchParams: - - name: fromDate - label: reports.uc.fromDate - type: epoch - source: uc - isMandatory: true - searchClause: AND paydetail.receiptdate >= $fromDate - - name: toDate - label: reports.uc.toDate - type: epoch - source: uc - isMandatory: true - searchClause: AND paydetail.receiptdate <= $toDate - - name: ulb - label: reports.uc.ulb - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name - source: uc - wrapper: true - isMandatory: false - searchClause: AND paydetail.tenantid = $ulb - query: | - -- Use CTE to force query plan, compute & use CTE later - WITH receipt_breakup AS ( - SELECT - string_agg(distinct billd.billid,',') bill_id, - SUM(CASE WHEN taxheadcode LIKE '%_CGST' THEN adjustedamount ELSE 0 END) as cgst, - SUM(CASE WHEN taxheadcode LIKE '%_TAX' THEN adjustedamount ELSE 0 END) as tax, - SUM(CASE WHEN taxheadcode LIKE '%_SGST' THEN adjustedamount ELSE 0 END) as sgst, - SUM(CASE WHEN taxheadcode LIKE '%_FEE' THEN adjustedamount ELSE 0 END) as fieldcollection - FROM egcl_billaccountdetail - inner join egcl_billdetial as billd on billd.id=egcl_billaccountdetail.billdetailid - INNER JOIN egcl_bill as bill on bill.id = billd.billid - WHERE bill.tenantid!='pb.testing' AND businessservice not in ('PT','TL','FIRENOC') -- and rh.status != 'Cancelled' - GROUP BY billdetailid - ) - SELECT - payment.tenantid as ulb, - paydetail.receiptnumber as receiptnumber, - To_char((To_timestamp(paydetail.receiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as receiptdate, - To_char((To_timestamp(paydetail.manualreceiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as g8issuedate, - paydetail.manualreceiptnumber as g8receiptno, - payment.paymentstatus as status, - businessservice as servicecategory, - receipt_breakup.*, - payment.totalamountpaid as totalamount, - paymentmode as paymentmode, - (case when paymentmode like 'CASH' then '' else transactionnumber end) as ddorchequenumber, - 'System' as collectiontype, - eg_user.name as collectorname - FROM egcl_payment AS payment - JOIN egcl_paymentdetail as paydetail on paydetail.paymentid=payment.id - LEFT JOIN receipt_breakup ON paydetail.billid = receipt_breakup.bill_id - JOIN eg_user ON payment.createdby::INTEGER=eg_user.id - WHERE payment.tenantid!='pb.testing' AND businessservice not in ('PT','TL','FIRENOC') and payment.paymentstatus != 'CANCELLED' - orderby: ORDER BY paydetail.receiptdate DESC - - - - reportName: MiscReceiptULB_v2 - decryptionPathId: MiscReceiptULB_v2 - summary: Receipt Register Miscellaneous - version: 1.0.0 - moduleName: rainmaker-uc - additionalConfig: - print: - pdfPageSize: "A3" - sourceColumns: - - name: ulb - label: reports.uc.ulb - type: string - source: uc - total: false - - name: receiptnumber - label: reports.uc.receiptnumber - type: string - source: uc - total: false - - name: receiptdate - label: reports.uc.receiptdate - type: string - source: uc - total: false - - name: g8issuedate - label: reports.uc.g8issuedate - type: string - source: uc - total: false - - name: g8receiptno - label: reports.uc.g8receiptno - type: string - source: uc - total: false - - name: status - label: reports.uc.receiptstatus - type: string - source: uc - total: false - - name: servicecategory - label: reports.uc.businessdetails - type: string - source: uc - total: false - - name: cgst - label: reports.uc.cgst - type: string - source: uc - total: true - - name: tax - label: reports.uc.tax - type: string - source: uc - total: true - - name: fieldcollection - label: reports.uc.fieldcollection - type: string - source: uc - total: true - - name: sgst - label: reports.uc.sgst - type: string - source: uc - total: true - - name: ddorchequenumber - label: reports.uc.ddorchequenumber - type: string - source: uc - total: false - - name: ddchequedate - label: reports.uc.ddorchequedate - type: string - source: uc - total: false - - name: bankname - label: reports.uc.bankname - type: string - source: uc - total: false - - name: branchname - label: reports.uc.branchname - type: string - source: uc - total: false - - name: collectiontype - label: reports.uc.collectiontype - type: string - source: uc - total: false - - name: collectorname - label: reports.uc.collectorname - type: string - source: uc - total: false - - name: totalamount - label: reports.uc.totalamount - type: string - source: uc - total: true - - name: paymentmode - label: reports.uc.paymentmode - type: string - source: uc - total: false - - name: remarks - label: reports.uc.remarks - type: string - source: uc - total: false - searchParams: - - name: fromDate - label: reports.uc.fromDate - type: epoch - source: uc - isMandatory: true - searchClause: AND paydetail.receiptdate >= $fromDate - - name: toDate - label: reports.uc.toDate - type: epoch - source: uc - isMandatory: true - searchClause: AND paydetail.receiptdate <= $toDate - - name: businessservice - label: reports.uc.businessservice - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=BillingService&masterName=BusinessService&tenantId=$tenantid|$.MdmsRes.BillingService.BusinessService[*].code|$.MdmsRes.BillingService.BusinessService[*].code - source: uc - wrapper: true - isMandatory: false - searchClause: AND businessservice = $businessservice - - name: collectorname - label: reports.uc.collectorname - type: singlevaluelist - pattern: http://egov-hrms:8080/egov-hrms/employees/_search?tenantId=$tenantid&roles=UC_EMP|$.Employees[*].user.id|$.Employees[*].user.name - source: uc - wrapper: true - isMandatory: false - searchClause: AND eg_user.id = $collectorname::INTEGER - query: | - -- Use CTE to force query plan, compute & use CTE later - WITH receipt_breakup AS ( - SELECT - bill.id as bill_id, - SUM(CASE WHEN taxheadcode LIKE '%_CGST' THEN adjustedamount ELSE 0 END) as cgst, - SUM(CASE WHEN taxheadcode LIKE '%_TAX' THEN adjustedamount ELSE 0 END) as tax, - SUM(CASE WHEN taxheadcode LIKE '%_SGST' THEN adjustedamount ELSE 0 END) as sgst, - SUM(CASE WHEN taxheadcode LIKE '%_FEE' THEN adjustedamount ELSE 0 END) as fieldcollection - FROM egcl_billaccountdetail - INNER JOIN egcl_billdetial as billd on billd.id = egcl_billaccountdetail.billdetailid - INNER JOIN egcl_bill as bill on bill.id=billd.billid - WHERE billd.tenantid=$tenantid AND businessservice not in ('PT','TL','FIRENOC') - GROUP BY billdetailid,bill.id - ) - SELECT - payment.tenantid as ulb, - paydetail.receiptnumber as receiptnumber, - To_char((To_timestamp(paydetail.receiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as receiptdate, - To_char((To_timestamp(paydetail.manualreceiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as g8issuedate, - paydetail.manualreceiptnumber as g8receiptno, - bank_branches.bank_name as bankname, - bank_branches.branch as branchname, - payment.paymentstatus as status, - businessservice as servicecategory, - receipt_breakup.*, - payment.totalamountpaid as totalamount, - paymentmode as paymentmode, - (case when paymentmode like 'CASH' then '' else transactionnumber end) as ddorchequenumber, - (case when paymentmode like 'DD' or paymentmode like 'CHEQUE' then To_char((To_timestamp(payment.instrumentdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') else '' end) as ddchequedate, - 'System' as collectiontype, - eg_user.name as collectorname, - billd.additionaldetails->>'comment' as remarks - FROM egcl_payment AS payment - JOIN egcl_paymentdetail as paydetail on paydetail.paymentid=payment.id - JOIN receipt_breakup ON paydetail.billid = receipt_breakup.bill_id - JOIN egcl_billdetial as billd on billd.billid=paydetail.billid - JOIN eg_user ON payment.createdby::INTEGER=eg_user.id - LEFT OUTER JOIN bank_branches on bank_branches.ifsc=payment.ifsccode - WHERE payment.tenantid=$tenantid AND businessservice not in ('PT','TL','FIRENOC') and payment.paymentstatus != 'CANCELLED' - orderby: ORDER BY paydetail.receiptdate DESC - - - - reportName: MiscReceiptStateWide_v2 - summary: State Receipt Register Miscellaneous - version: 1.0.0 - moduleName: rainmaker-uc - sourceColumns: - - name: ulb - label: reports.uc.ulb - type: string - source: uc - total: false - - name: servicecategory - label: reports.uc.businessdetails - type: string - source: uc - total: false - - name: cgst - label: reports.uc.cgst - type: string - source: uc - total: true - - name: tax - label: reports.uc.tax - type: string - source: uc - total: true - - name: fieldcollection - label: reports.uc.fieldcollection - type: string - source: uc - total: true - - name: sgst - label: reports.uc.sgst - type: string - source: uc - total: true - - name: totalamount - label: reports.uc.totalamount - type: string - source: uc - total: true - searchParams: - - name: fromDate - label: reports.uc.fromDate - type: epoch - source: uc - isMandatory: false - searchClause: AND paydetail.receiptdate >= $fromDate - - name: toDate - label: reports.uc.toDate - type: epoch - source: uc - isMandatory: false - searchClause: AND paydetail.receiptdate <= $toDate - - name: ulb - label: reports.uc.ulb - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name - source: uc - wrapper: true - isMandatory: false - searchClause: AND paydetail.tenantid = $ulb - query: | - -- Use CTE to force query plan, compute & use CTE later - SELECT - payment.tenantid as ulb, - paydetail.businessservice as servicecategory, - count(*) as receipts, - SUM(CASE WHEN taxheadcode LIKE '%_FEE' THEN adjustedamount ELSE 0 END) as fieldcollection, - SUM(CASE WHEN taxheadcode LIKE '%_TAX' THEN adjustedamount ELSE 0 END) as tax, - SUM(CASE WHEN taxheadcode LIKE '%_CGST' THEN adjustedamount ELSE 0 END) as cgst, - SUM(CASE WHEN taxheadcode LIKE '%_SGST' THEN adjustedamount ELSE 0 END) as sgst, - sum(paydetail.amountpaid) as totalamount - from egcl_payment payment - inner join egcl_paymentdetail as paydetail on paydetail.paymentid=payment.id - inner join egcl_billaccountdetail as ebd on paydetail.billid=ebd.billdetailid - WHERE payment.tenantid!='pb.testing' AND paydetail.businessservice not in ('PT','TL','FIRENOC') and payment.paymentstatus != 'CANCELLED' - groupby: group by payment.tenantid,paydetail.businessservice - orderby: order by payment.tenantid - - - reportName: MiscReceiptState_v2 - summary: State Miscellaneous Receipt Register - version: 1.0.0 - moduleName: rainmaker-uc - sourceColumns: - - name: ulb - label: reports.uc.ulb - type: string - source: uc - total: false - - name: noofreceipts - label: reports.uc.noOfReceipts - type: string - source: uc - total: true - - name: tax - label: reports.uc.tax - type: string - source: uc - total: true - - name: cgst - label: reports.uc.cgst - type: string - source: uc - total: true - - name: sgst - label: reports.uc.sgst - type: string - source: uc - total: true - - name: fieldcollection - label: reports.uc.fieldCollection - type: string - source: uc - total: true - - name: totalamount - label: reports.uc.totalamount - type: string - source: uc - total: true - searchParams: - - name: fromDate - label: reports.uc.fromDate - type: epoch - source: uc - isMandatory: false - searchClause: AND paydetail.receiptdate >= $fromDate - - name: toDate - label: reports.uc.toDate - type: epoch - source: uc - isMandatory: false - searchClause: AND paydetail.receiptdate <= $toDate - - name: businessservice - label: reports.uc.businessservice - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=BillingService&masterName=BusinessService&tenantId=$tenantid|$.MdmsRes.BillingService.BusinessService[*].code|$.MdmsRes.BillingService.BusinessService[*].code - source: uc - wrapper: true - isMandatory: false - searchClause: AND paydetail.businessservice = $businessservice - - name: ulb - label: reports.uc.ulb - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name - source: uc - wrapper: true - isMandatory: false - searchClause: AND paydetail.tenantid = $ulb - query: | - -- Use CTE to force query plan, compute & use CTE later - SELECT - paydetail.tenantid as ulb, - count(distinct paydetail.receiptnumber) as noofreceipts, - SUM(CASE WHEN taxheadcode LIKE '%_TAX' THEN adjustedamount ELSE 0 END) as tax, - SUM(CASE WHEN taxheadcode LIKE '%_CGST' THEN adjustedamount ELSE 0 END) as cgst, - SUM(CASE WHEN taxheadcode LIKE '%_SGST' THEN adjustedamount ELSE 0 END) as sgst, - SUM(CASE WHEN taxheadcode LIKE '%_FEE' THEN adjustedamount ELSE 0 END) as fieldcollection, - sum(adjustedamount) as totalamount - from egcl_paymentdetail paydetail - INNER JOIN egcl_bill as bill on bill.id = paydetail.billid - inner join egcl_billdetial as billd on billd.billid=bill.id - inner join egcl_billaccountdetail as ebd on ebd.billdetailid=billd.id - inner join egcl_payment as payment on paydetail.paymentid=payment.id - WHERE paydetail.tenantid!='pb.testing' AND paydetail.businessservice not in ('PT','TL','FIRENOC') and payment.paymentstatus!='CANCELLED' - groupby: group by paydetail.tenantid - - - reportName: MiscCollectionState_v2 - summary: State Miscellaneous Collection Register - version: 1.0.0 - moduleName: rainmaker-uc - sourceColumns: - - name: ulb - label: reports.uc.ulb - type: string - source: uc - total: false - - name: offlinetransactions - label: reports.uc.noOfOfflineTransactions - type: string - source: uc - total: true - - name: onlinetransactions - label: reports.uc.noOfOnlineTransactions - type: string - source: uc - total: true - - name: totaltransactions - label: reports.uc.totalTransactions - type: string - source: uc - total: true - - name: offlinecollection - label: reports.uc.offlineCollection - type: string - source: uc - total: true - - name: onlinecollection - label: reports.uc.onlineCollection - type: string - source: uc - total: true - - name: totalcollection - label: reports.uc.totalCollection - type: string - source: uc - total: true - searchParams: - - name: fromDate - label: reports.uc.fromDate - type: epoch - source: uc - isMandatory: false - searchClause: AND paydetail.receiptdate >= $fromDate - - name: toDate - label: reports.uc.toDate - type: epoch - source: uc - isMandatory: false - searchClause: AND paydetail.receiptdate <= $toDate - - name: ulb - label: reports.uc.ulb - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name - source: uc - wrapper: true - isMandatory: false - searchClause: AND paydetail.tenantid = $ulb - query: | - -- Use CTE to force query plan, compute & use CTE later - SELECT - initcap(split_part(payment.tenantId, '.', 2)) as ulb, - count(*) FILTER (where payment.paymentmode!='ONLINE') as offlinetransactions, - count(*) FILTER (where payment.paymentmode='ONLINE') as onlinetransactions, - count(*) as totaltransactions, - sum(case when paymentmode!='ONLINE' then payment.totalamountpaid else 0 end) as offlinecollection, - sum(case paymentmode when 'ONLINE' then payment.totalamountpaid else 0 end) as onlinecollection, - sum(payment.totalamountpaid) as totalcollection - from egcl_payment as payment - inner join egcl_paymentdetail as paydetail on paydetail.paymentid=payment.id - where paydetail.businessservice not in ('PT','TL','FIRENOC') and payment.tenantid !='pb.testing' and payment.paymentstatus != 'CANCELLED' - groupby: GROUP BY payment.tenantid - orderby: ORDER BY payment.tenantId asc - - - - reportName: MiscBusinessServiceCollectionTenant_v2 - summary: Miscellaneous Business Service Collection - version: 1.0.0 - moduleName: rainmaker-uc - sourceColumns: - - name: servicetype - label: reports.uc.serviceType - type: string - source: uc - total: false - - name: totalreceipts - label: reports.uc.totalReceipts - type: string - source: uc - total: true - - name: tax - label: reports.uc.tax - type: string - source: uc - total: true - - name: cgst - label: reports.uc.cgst - type: string - source: uc - total: true - - name: sgst - label: reports.uc.sgst - type: string - source: uc - total: true - - name: fieldcollection - label: reports.uc.fieldCollection - type: string - source: uc - total: true - - name: totalcollection - label: reports.uc.totalCollection - type: string - source: uc - total: true - searchParams: - - name: fromDate - label: reports.uc.fromDate - type: epoch - source: uc - isMandatory: false - searchClause: AND paydetail.receiptdate >= $fromDate - - name: toDate - label: reports.uc.toDate - type: epoch - source: uc - isMandatory: false - searchClause: AND paydetail.receiptdate <= $toDate - query: | - -- Use CTE to force query plan, compute & use CTE later - SELECT - paydetail.businessservice as servicetype, - count(distinct paydetail.receiptnumber) totalreceipts, - SUM(CASE WHEN taxheadcode LIKE '%_CGST' THEN adjustedamount ELSE 0 END) as cgst, - SUM(CASE WHEN taxheadcode LIKE '%_TAX' THEN adjustedamount ELSE 0 END) as tax, - SUM(CASE WHEN taxheadcode LIKE '%_SGST' THEN adjustedamount ELSE 0 END) as sgst, - SUM(CASE WHEN taxheadcode LIKE '%_FEE' THEN adjustedamount ELSE 0 END) as fieldcollection, - SUM(adjustedamount) as totalcollection - FROM egcl_billaccountdetail - INNER JOIN egcl_billdetial as billd on billd.id = egcl_billaccountdetail.billdetailid - INNER JOIN egcl_bill as bill on bill.id=billd.billid - INNER Join egcl_paymentdetail as paydetail ON paydetail.billid = bill.id - Inner join egcl_payment as payment on paydetail.paymentid = payment.id - WHERE billd.tenantid=$tenantid AND paydetail.businessservice not in ('PT','TL','FIRENOC') and payment.paymentStatus!='CANCELLED' - groupby: GROUP BY paydetail.businessservice - orderby: ORDER BY paydetail.businessservice - - - - reportName: MiscReceiptULBCancelled_v2 - decryptionPathId: MiscReceiptULB_v2 - summary: Cancelled Receipt Miscellaneous - version: 1.0.0 - moduleName: rainmaker-uc - additionalConfig: - print: - pdfPageSize: "A3" - sourceColumns: - - name: ulb - label: reports.uc.ulb - type: string - source: uc - total: false - - name: receiptnumber - label: reports.uc.receiptnumber - type: string - source: uc - total: false - - name: receiptdate - label: reports.uc.receiptdate - type: string - source: uc - total: false - - name: servicecategory - label: reports.uc.businessdetails - type: string - source: uc - total: false - - name: cgst - label: reports.uc.cgst - type: string - source: uc - total: true - - name: tax - label: reports.uc.tax - type: string - source: uc - total: true - - name: fieldcollection - label: reports.uc.fieldcollection - type: string - source: uc - total: true - - name: sgst - label: reports.uc.sgst - type: string - source: uc - total: true - - name: ddorchequenumber - label: reports.uc.ddorchequenumber - type: string - source: uc - total: false - - name: ddchequedate - label: reports.uc.ddorchequedate - type: string - source: uc - total: false - - name: collectiontype - label: reports.uc.collectiontype - type: string - source: uc - total: false - - name: collectorname - label: reports.uc.collectorname - type: string - source: uc - total: false - - name: totalamount - label: reports.uc.totalamount - type: string - source: uc - total: true - - name: paymentmode - label: reports.uc.paymentmode - type: string - source: uc - total: false - searchParams: - - name: fromDate - label: reports.uc.fromDate - type: epoch - source: uc - isMandatory: false - searchClause: AND paydetail.receiptdate >= $fromDate - - name: toDate - label: reports.uc.toDate - type: epoch - source: uc - isMandatory: false - searchClause: AND paydetail.receiptdate <= $toDate - - name: collectorname - label: reports.uc.collectorname - type: singlevaluelist - pattern: http://egov-hrms:8080/egov-hrms/employees/_search?tenantId=$tenantid&roles=UC_EMP|$.Employees[*].user.id|$.Employees[*].user.name - source: uc - wrapper: true - isMandatory: false - searchClause: AND eg_user.id = $collectorname::INTEGER - query: | - -- Use CTE to force query plan, compute & use CTE later - WITH receipt_breakup AS ( - SELECT - bill.id as bill_id, - SUM(CASE WHEN taxheadcode LIKE '%_CGST' THEN adjustedamount ELSE 0 END) as cgst, - SUM(CASE WHEN taxheadcode LIKE '%_TAX' THEN adjustedamount ELSE 0 END) as tax, - SUM(CASE WHEN taxheadcode LIKE '%_SGST' THEN adjustedamount ELSE 0 END) as sgst, - SUM(CASE WHEN taxheadcode LIKE '%_FEE' THEN adjustedamount ELSE 0 END) as fieldcollection - FROM egcl_billaccountdetail - INNER JOIN egcl_billdetial as billd on billd.id = egcl_billaccountdetail.billdetailid - INNER JOIN egcl_bill as bill on bill.id=billd.billid - WHERE billd.tenantid=$tenantid AND businessservice not in ('PT','TL','FIRENOC') - GROUP BY billdetailid,bill.id - ) - SELECT - payment.tenantid as ulb, - paydetail.receiptnumber as receiptnumber, - To_char((To_timestamp(paydetail.receiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as receiptdate, - To_char((To_timestamp(paydetail.manualreceiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as g8issuedate, - paydetail.manualreceiptnumber as g8receiptno, - payment.paymentstatus as status, - businessservice as servicecategory, - receipt_breakup.*, - payment.totalamountpaid as totalamount, - paymentmode as paymentmode, - (case when paymentmode like 'CASH' then '' else transactionnumber end) as ddorchequenumber, - (case when paymentmode like 'DD' or paymentmode like 'CHEQUE' then To_char((To_timestamp(payment.transactiondate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') else '' end) as ddchequedate, - 'System' as collectiontype, - (case when eg_user.name is null then '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' else eg_user.name end) as collectorname - FROM egcl_payment AS payment - JOIN egcl_paymentdetail as paydetail on paydetail.paymentid=payment.id - JOIN receipt_breakup ON paydetail.billid = receipt_breakup.bill_id - JOIN eg_user ON payment.createdby::INTEGER=eg_user.id - WHERE payment.tenantid=$tenantid AND businessservice not in ('PT','TL','FIRENOC') and payment.paymentstatus = 'CANCELLED' - orderby: ORDER BY paydetail.receiptdate DESC - - - reportName: MiscReceiptULBShort_v2 - decryptionPathId: MiscReceiptULB_v2 - summary: Receipt Register Miscellaneous - version: 1.0.0 - moduleName: rainmaker-uc - additionalConfig: - print: - pdfPageSize: "A3" - sourceColumns: - - name: consumername - label: reports.uc.consumername - type: string - source: uc - total: false - - name: mobilenumber - label: reports.uc.mobilenumber - type: string - source: uc - total: false - - name: receiptdate - label: reports.uc.receiptdate - type: string - source: uc - total: false - - name: servicecategory - label: reports.uc.businessdetails - type: string - source: uc - total: false - - name: amount - label: reports.uc.totalamount - type: string - source: uc - total: true - - name: remarks - label: reports.uc.remarks - type: string - source: uc - total: false - - name: collectorname - label: reports.uc.collectorname - type: string - source: uc - total: false - searchParams: - - name: fromDate - label: reports.uc.fromDate - type: epoch - source: uc - isMandatory: false - searchClause: AND paydetail.receiptdate >= $fromDate - - name: toDate - label: reports.uc.toDate - type: epoch - source: uc - isMandatory: false - searchClause: AND paydetail.receiptdate <= $toDate - - name: collectorname - label: reports.uc.collectorname - type: singlevaluelist - pattern: http://egov-hrms:8080/egov-hrms/employees/_search?tenantId=$tenantid&roles=UC_EMP|$.Employees[*].user.id|$.Employees[*].user.name - source: uc - wrapper: true - isMandatory: false - searchClause: AND eg_user.id = $collectorname::INTEGER - query: | - -- Use CTE to force query plan, compute & use CTE later - SELECT - payment.payername as consumername, - payment.mobilenumber as mobilenumber, - To_char((To_timestamp(paydetail.receiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as receiptdate, - paydetail.businessservice as servicecategory, - payment.totalamountpaid as amount, - (case when eg_user.name is null then '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' else eg_user.name end) as collectorname, - billd.additionaldetails->>'comment' as remarks - FROM egcl_payment AS payment - INNER JOIN egcl_paymentdetail as paydetail on paydetail.paymentid=payment.id - INNER JOIN egcl_billdetial as billd on billd.billid=paydetail.billid - JOIN eg_user ON payment.createdby::INTEGER=eg_user.id - WHERE paydetail.businessservice not in ('PT','TL','FIRENOC') and payment.paymentstatus != 'CANCELLED' and payment.tenantid =$tenantid - orderby: ORDER BY paydetail.receiptdate DESC - - - - reportName: EmployeeWiseCollectionUC_v2 - decryptionPathId: MiscReceiptULB_v2 - summary: Employee Wise Collection UC - version: 1.0.0 - moduleName: rainmaker-uc - additionalConfig: - print: - pdfPageSize: "A3" - sourceColumns: - - name: collectorname - label: reports.uc.collectorname - type: string - source: uc - total: false - - name: paymentmode - label: reports.uc.paymentmode - type: string - source: uc - total: false - - name: countofreceipts - label: reports.uc.countofreceipts - type: string - source: uc - total: true - - name: totalamount - label: reports.uc.totalamount - type: string - source: uc - total: true - searchParams: - - name: fromDate - label: reports.uc.fromDate - type: epoch - source: uc - isMandatory: false - searchClause: AND paydetail.receiptdate >= $fromDate - - name: toDate - label: reports.uc.toDate - type: epoch - source: uc - isMandatory: false - searchClause: AND paydetail.receiptdate <= $toDate - - name: collectorname - label: reports.uc.collectorname - type: singlevaluelist - pattern: http://egov-hrms:8080/egov-hrms/employees/_search?tenantId=$tenantid&roles=UC_EMP|$.Employees[*].user.id|$.Employees[*].user.name - source: uc - wrapper: true - isMandatory: false - searchClause: AND eg_user.id = $collectorname::INTEGER - query: | - SELECT - eg_user.name as collectorname, - paymentmode as paymentmode, - count(paydetail.receiptnumber) as Countofreceipts, - Sum(payment.totalamountpaid) as totalamount - FROM egcl_payment AS payment - JOIN egcl_paymentdetail as paydetail on paydetail.paymentid=payment.id - JOIN eg_user ON payment.createdby::INTEGER=eg_user.id - WHERE payment.tenantid=$tenantid AND businessservice not in ('PT','TL','FIRENOC') and payment.paymentstatus != 'CANCELLED' - groupby: group by collectorname , paymentmode - - - - reportName: echallanReport_v2 - decryptionPathId: MiscReceiptULB_v2 - summary: eChallan Report - version: 1.0.0 - moduleName: rainmaker-uc - additionalConfig: - print: - pdfPageSize: "A3" - sourceColumns: - - name: totalamount - label: reports.uc.totalamount - type: string - source: uc - total: true - - name: challanno - label: reports.uc.challanno - type: string - source: uc - total: false - - name: status - label: reports.uc.status - type: string - source: uc - total: false - - name: businessservice - label: reports.uc.businessservice - type: string - source: uc - total: false - - name: description - label: reports.uc.description - type: string - source: uc - total: false - - name: applicationstatus - label: reports.uc.applicationstatus - type: string - source: uc - total: false - - name: receiptnumber - label: reports.uc.receiptnumber - type: string - source: uc - total: false - - name: receiptdate - label: reports.uc.receiptdate - type: string - source: uc - total: false - searchParams: - - name: fromDate - label: reports.uc.fromDate - type: epoch - source: uc - isMandatory: false - searchClause: AND eg_echallan.createdtime >= $fromDate - - name: toDate - label: reports.uc.toDate - type: epoch - source: uc - isMandatory: false - searchClause: AND eg_echallan.createdtime <= $toDate - query: | - -- Use CTE to force query plan, compute & use CTE later - SELECT - egcl_bill.status, - egcl_bill.totalamount, - eg_echallan.challanno, - eg_echallan.businessservice, - eg_echallan.description, - eg_echallan.applicationstatus, - egcl_paymentdetail.receiptnumber, - To_char((To_timestamp(egcl_paymentdetail.receiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as receiptdate - from eg_echallan left JOIN egcl_bill ON eg_echallan.challanno=egcl_bill.consumercode left join egcl_paymentdetail on egcl_bill.id=egcl_paymentdetail.billid - where eg_echallan.tenantid=$tenantid - orderby: ORDER BY eg_echallan.createdtime DESC - - - reportName: NewMiscReceiptULB_v2 - decryptionPathId: MiscReceiptULB_v2 - summary: Receipt Register Miscellaneous - version: 1.0.0 - moduleName: rainmaker-uc - additionalConfig: - print: - pdfPageSize: "A3" - sourceColumns: - - name: ulb - label: reports.uc.ulb - type: string - source: uc - total: false - - name: receiptnumber - label: reports.uc.receiptnumber - type: string - source: uc - total: false - - name: receiptdate - label: reports.uc.receiptdate - type: string - source: uc - total: false - - name: g8issuedate - label: reports.uc.g8issuedate - type: string - source: uc - total: false - - name: challanno - label: reports.uc.challanno - type: string - source: uc - total: false - - name: g8receiptno - label: reports.uc.g8receiptno - type: string - source: uc - total: false - - name: status - label: reports.uc.receiptstatus - type: string - source: uc - total: false - - name: servicecategory - label: reports.uc.businessdetails - type: string - source: uc - total: false - - name: cgst - label: reports.uc.cgst - type: string - source: uc - total: true - - name: tax - label: reports.uc.tax - type: string - source: uc - total: true - - name: fieldcollection - label: reports.uc.fieldcollection - type: string - source: uc - total: true - - name: sgst - label: reports.uc.sgst - type: string - source: uc - total: true - - name: ddorchequenumber - label: reports.uc.ddorchequenumber - type: string - source: uc - total: false - - name: ddchequedate - label: reports.uc.ddorchequedate - type: string - source: uc - total: false - - name: bankname - label: reports.uc.bankname - type: string - source: uc - total: false - - name: branchname - label: reports.uc.branchname - type: string - source: uc - total: false - - name: transactionnumber - label: reports.uc.transactionnumber - type: string - source: uc - total: false - - name: collectiontype - label: reports.uc.collectiontype - type: string - source: uc - total: false - - name: collectorname - label: reports.uc.collectorname - type: string - source: uc - total: false - - name: totalamount - label: reports.uc.totalamount - type: string - source: uc - total: true - - name: paymentmode - label: reports.uc.paymentmode - type: string - source: uc - total: false - - name: remarks - label: reports.uc.remarks - type: string - source: uc - total: false - searchParams: - - name: fromDate - label: reports.uc.fromDate - type: epoch - source: uc - isMandatory: true - searchClause: AND paydetail.receiptdate >= $fromDate - - name: toDate - label: reports.uc.toDate - type: epoch - source: uc - isMandatory: true - searchClause: AND paydetail.receiptdate <= $toDate - - name: businessservice - label: reports.uc.businessservice - type: singlevaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=BillingService&masterName=BusinessService&tenantId=$tenantid|$.MdmsRes.BillingService.BusinessService[*].code|$.MdmsRes.BillingService.BusinessService[*].code - source: uc - wrapper: true - isMandatory: false - searchClause: AND businessservice = $businessservice - - name: collectorname - label: reports.uc.collectorname - type: singlevaluelist - pattern: http://egov-hrms:8080/egov-hrms/employees/_search?tenantId=$tenantid&roles=UC_EMP|$.Employees[*].user.id|$.Employees[*].user.name - source: uc - wrapper: true - isMandatory: false - searchClause: AND eg_user.id = $collectorname::INTEGER - query: | - -- Use CTE to force query plan, compute & use CTE later - WITH receipt_breakup AS ( - SELECT - bill.id as bill_id, - SUM(CASE WHEN taxheadcode LIKE '%_CGST' THEN adjustedamount ELSE 0 END) as cgst, - SUM(CASE WHEN taxheadcode LIKE '%_TAX' THEN adjustedamount ELSE 0 END) as tax, - SUM(CASE WHEN taxheadcode LIKE '%_SGST' THEN adjustedamount ELSE 0 END) as sgst, - SUM(CASE WHEN taxheadcode LIKE '%_FEE' THEN adjustedamount ELSE 0 END) as fieldcollection - FROM egcl_billaccountdetail - INNER JOIN egcl_billdetial as billd on billd.id = egcl_billaccountdetail.billdetailid - INNER JOIN egcl_bill as bill on bill.id=billd.billid - WHERE billd.tenantid=$tenantid AND businessservice not in ('PT','TL','FIRENOC','WS','SW','WS.ONE_TIME_FEE') - GROUP BY billdetailid,bill.id - ) - SELECT - payment.tenantid as ulb, - paydetail.receiptnumber as receiptnumber, - To_char((To_timestamp(paydetail.receiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as receiptdate, - To_char((To_timestamp(paydetail.manualreceiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as g8issuedate, - paydetail.manualreceiptnumber as g8receiptno, - challan.challanno as challanno, - bank_branches.bank_name as bankname, - bank_branches.branch as branchname, - payment.transactionnumber as transactionnumber, - payment.paymentstatus as status, - bill.businessservice as servicecategory, - receipt_breakup.*, - payment.totalamountpaid as totalamount, - paymentmode as paymentmode, - (case when paymentmode like 'CASH' then '' else transactionnumber end) as ddorchequenumber, - (case when paymentmode like 'DD' or paymentmode like 'CHEQUE' then To_char((To_timestamp(payment.instrumentdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') else '' end) as ddchequedate, - 'System' as collectiontype, - eg_user.name as collectorname, - challan.description as remarks - FROM egcl_payment AS payment - JOIN egcl_paymentdetail as paydetail on paydetail.paymentid=payment.id - JOIN receipt_breakup ON paydetail.billid = receipt_breakup.bill_id - JOIN egcl_billdetial as billd on billd.billid=paydetail.billid - LEFT OUTER JOIN egcl_bill as bill on bill.id=paydetail.billid - LEFT OUTER JOIN eg_echallan as challan on challan.challanno=bill.consumercode - JOIN eg_user ON payment.createdby::INTEGER=eg_user.id - LEFT OUTER JOIN bank_branches on bank_branches.ifsc=payment.ifsccode - WHERE payment.tenantid=$tenantid AND bill.businessservice not in ('PT','TL','FIRENOC','WS','SW','WS.ONE_TIME_FEE') and payment.paymentstatus != 'CANCELLED' - orderby: ORDER BY paydetail.receiptdate DESC diff --git a/configs/reports/configs/works-reports.yml b/configs/reports/configs/works-reports.yml deleted file mode 100644 index 43aa78d0..00000000 --- a/configs/reports/configs/works-reports.yml +++ /dev/null @@ -1,565 +0,0 @@ ---- -ReportDefinitions: -- reportName: WorkOrderRegister - summary: Work Order Register - version: 1.0.0 - moduleName: works - viewPath: workOrderRegister - externalService: - - entity: $.MdmsRes.egf-master.FinancialYear - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=egf-master&masterName=FinancialYear&tenantId=$tenantid&filter=%5B%3F%28%40.active%3D%3Dtrue%29%5D - keyOrder: finYearRange,startingDate,endingDate,tenantId - tableName: tbl_financialyear - stateData: true - sourceColumns: - - name: workorderdate - label: reports.works.workorderdate - type: epoch - source: works - - name: nameofwork - label: reports.works.nameofwork - type: string - source: works - - name: workordernumber - label: reports.works.workordernumber - type: number - source: works - - name: referencenoofwip - label: reports.works.referencenoofwip - type: string - source: works - - name: estimateamount - label: reports.works.estimateamount - type: number - source: works - - name: tenderamount - label: reports.works.tenderamount - type: number - source: works - - name: contractorname - label: reports.works.contractorname - type: string - source: works - - name: approvedattherateof - label: reports.works.approvedattherateof - type: number - source: works - - name: totalvalueofthework - label: reports.works.totalvalueofthework - type: number - source: works - - name: emdamount - label: reports.works.emdamount - type: number - source: works - - name: sanctionedfinyear - label: reports.works.sanctionedfinyear - type: string - source: works - - name: securitydepositamount - label: reports.works.securitydepositamount - type: number - source: works - - name: expectedcompletiondate - label: reports.works.expectedcompletiondate - type: epoch - source: works - searchParams: - - name: fromDate - label: reports.works.wofromDate - type: date - source: works - searchClause : AND wo.workorderdate>=$fromDate - isMandatory: false - - name: toDate - label: reports.works.wotoDate - type: date - source: works - searchClause : AND wo.workorderdate<=$toDate - isMandatory: false - - name: contractorName - label: reports.works.contractorname - type: string - source: works - searchClause : AND contractor.name=$contractorName - isMandatory: false - - name: amountFrom - label: reports.works.woamountfrom - type: number - source: works - searchClause : AND loae.estimateloaamount>=$amountFrom - isMandatory: false - - name: amountUpto - label: reports.works.woamountupto - type: number - source: works - searchClause : AND loae.estimateloaamount<=$amountUpto - isMandatory: false - - query: select wo.workorderdate, de.nameofwork, wo.workordernumber, de.projectcode as referencenoofwip, de.estimatevalue as estimateamount, de.workvalue as tenderamount, contractor.name as contractorname, loa.tenderfinalizedpercentage as approvedattherateof, loa.loaamount as totalvalueofthework, loa.emdamountdeposited as emdamount, (select sum(amount) from egw_securitydeposit where letterofacceptance=loa.id) as securitydepositamount, (select finyear.finYearRange from (values tbl_financialyear) as finyear (finYearRange,startingDate,endingDate,tenantId) where wo.createdtime between startingDate::bigint and endingDate::bigint) as sanctionedfinyear, ((select coalesce(statusdate, innerwo.workorderdate) from egw_workorder innerwo left join egw_offlinestatus fs on fs.objecttype='WorkOrderOffline' and fs.status='WORK_COMMENCED' and fs.objectnumber=innerwo.workordernumber where innerwo.workordernumber=wo.workordernumber) + loa.contractperiod*24*12*60*1000) as expectedcompletiondate from egw_workorder wo, egw_letterofacceptance loa, egw_letterofacceptanceestimate loae, egw_detailedestimate de, egw_contractor contractor where wo.letterofacceptance=loa.id and wo.letterofacceptance=loae.letterofacceptance and loae.letterofacceptance=loa.id and loae.detailedestimate=de.estimatenumber and contractor.code=loa.contractor - -- reportName: WorkStatusReport - summary: Work Status Report - version: 1.0.0 - moduleName: works - viewPath: WorkStatusReport - sourceColumns: - - name: nameofwork - label: reports.works.nameofwork - type: epoch - source: works - - name: fund - label: reports.works.fund - type: string - source: works - - name: typeofwork - label: reports.works.typeofwork - type: string - source: works - - name: subtypeofwork - label: reports.works.subtypeofwork - type: string - source: works - - name: estimatevalue - label: reports.works.estimatevalue - type: number - source: works - - name: agencyfirmname - label: reports.works.agencyfirmname - type: string - source: works - - name: workorderamount - label: reports.works.workorderamount - type: number - source: works - - name: billsubmittedtilldate - label: reports.works.billsubmittedtilldate - type: number - source: works - - name: worksstatuspercentage - label: reports.works.worksstatuspercentage - type: number - source: works - - name: amountpaidtilldate - label: reports.works.amountpaidtilldate - type: number - source: works - searchParams: - - name: fund - label: reports.works.fund - isMandatory: false - type: multivaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=egf-master&masterName=Fund&tenantId=$tenantid&filter=%5B%3F%28%40.active%3D%3Dtrue%29%5D - source: works - stateData: true - wrapper: true - searchClause : AND de.fund in ($fund) - - name: typeofwork - label: reports.works.typeofwork - isMandatory: false - type: multivaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=works&masterName=TypeOfWork&tenantId=$tenantid&filter=%5B%3F%28%40.active%3D%3Dtrue%29%5D - source: works - stateData: true - wrapper: true - searchClause : AND de.workstype in ($typeofwork) - - name: subtypeofwork - label: reports.works.subtypeofwork - isMandatory: false - type: multivaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=works&masterName=TypeOfWork&tenantId=$tenantid&filter%3D%5B%3F%28%20%40.parent%3D%3D%7Btypeofwork%7D%29%5D%7C%24.MdmsRes.works.TypeOfWork.%2A.code%7C%24.MdmsRes..works.TypeOfWork.%2A.name - source: works - stateData: true - wrapper: true - searchClause : AND de.workssubtype in ($subtypeofwork) - - name: department - label: reports.works.department - isMandatory: false - type: multivaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=common-masters&masterName=Department&tenantId=$tenantid&filter=%5B%3F%28%40.active%3D%3Dtrue%29%5D - source: works - stateData: true - wrapper: true - searchClause : AND de.department in ($department) - - name: scheme - label: reports.works.scheme - isMandatory: false - type: multivaluelist - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=Works&masterName=Scheme&tenantId=$tenantid&filter=%5B%3F%28%40.active%3D%3Dtrue%29%5D - source: works - stateData: true - wrapper: true - searchClause : AND de.scheme in ($scheme) - - name: status - label: reports.works.status - isMandatory: false - type: multivaluelist - pattern: 'list://Documentation stage:Documentation stage,Tendering Stage:Tendering Stage,Work In Progress Stage:Work In Progress Stage,Completed:Completed' - source: works - stateData: true - wrapper: true - searchClause : AND de.status in ('Approved') - - query: select de.nameofwork AS nameofwork, de.fund as fund, de.workstype AS typeofwork, de.workssubtype AS subtypeofwork, de.estimatevalue As estimatevalue, contractor.name as firmname, loa.loaamount AS workorderamount, cb.contractorbillamount as billsubmittedtilldate, tm.totalpercentage AS workstatuspercentage, (select COALESCE(sum(br.billamount),0) from egf_billregister br where br.billnumber=cb.billnumber) as amountpaidtilldate from egw_detailedestimate de, egw_letterofacceptanceestimate loae,egw_contractor contractor, egw_milestone m, egw_trackmilestone tm, egw_letterofacceptance loa, egw_contractorbill cb where loa.id=loae.letterofacceptance and loae.detailedestimate=de.id and contractor.code = loa.contractor and m.letterofacceptanceestimate = loae.id and m.id=tm.milestone and loae.id=cb.letterofacceptanceestimate; - -- reportName: WorkInProgressRegister - summary: Work In Progress Register - version: 1.0.0 - moduleName: works - externalService: - - entity: $.MdmsRes.works.TypeOfWork - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=works&masterName=TypeOfWork&tenantId=$tenantid&filter=%5B%3F%28%40.parent%3D%3Dnull%20%26%26%20%40.active%3D%3D%27true%27%29%5D - keyOrder: name,code,description,tenantId - tableName: tbl_typeofwork - stateData: true - - entity: $.MdmsRes.works.TypeOfWork - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=works&masterName=TypeOfWork&tenantId=$tenantid&filter=%5B%3F%28%40.parent%21%3Dnull%20%26%26%20%40.active%3D%3D%27true%27%29%5D - keyOrder: name,code,description,tenantId - tableName: tbl_subtypeofwork - stateData: true - - entity: $.MdmsRes.works.WorksStatus - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=works&masterName=WorksStatus&tenantId=$tenantid&filter=%5B%3F%28%40.moduleType%3D%3D%27DetailedEstimate%27%29%5D - keyOrder: code,description,tenantId - tableName: tbl_workstatus - stateData: true - sourceColumns: - - name: wincode - label: reports.works.wincode - type: string - source: works - linkedReport: - reportName: WorkInProgressDetails - linkedColumn: _parent?reportName={reportName}&wcode={wincode} - - name: nameofwork - label: reports.works.nameofwork - type: string - source: works - - name: subtypeofwork - label: reports.works.subtypeofwork - type: string - source: works - - name: status - label: reports.works.status - type: string - source: works - searchParams: - - name: typeOfWork - label: reports.works.typeofwork - type: singlevaluelist - source: works - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=works&masterName=TypeOfWork&tenantId=$tenantid&filter=%5B%3F%28%40.parent%3D%3Dnull%20%26%26%20%40.active%3D%3D%27true%27%29%5D|$.MdmsRes.works.TypeOfWork.*.code|$.MdmsRes.works.TypeOfWork.*.name - wrapper: true - stateData: true - searchClause : AND de.workstype=$typeOfWork - isMandatory: false - - name: subTypeOfWork - label: reports.works.subtypeofwork - type: singlevaluelist - source: works - pattern: /egov-mdms-service/v1/_get?moduleName=works&masterName=TypeOfWork&tenantId=$tenantid&filter=%5B%3F(%40.parent%3D%3D%27{typeOfWork}%27%20%26%26%20%40.active%3D%3D%27true%27)%5D|$.MdmsRes.works.TypeOfWork.*.code|$.MdmsRes.works.TypeOfWork.*.name - wrapper: true - stateData: true - searchClause : AND de.workssubtype=$subTypeOfWork - isMandatory: false - - name: nameOfWork - label: reports.works.nameofwork - type: string - source: works - searchClause : AND de.nameofwork=$nameOfWork - isMandatory: false - - name: wincode - label: reports.works.wincode - type: string - source: works - searchClause : AND de.projectcode=$wincode - isMandatory: false - - name: status - label: reports.works.status - type: singlevaluelist - source: works - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=works&masterName=WorksStatus&tenantId=$tenantid&filter=%5B%3F%28%40.moduleType%3D%3D%27DetailedEstimate%27%29%5D|$..code|$..description - wrapper: true - stateData: true - searchClause : AND de.status=$status - isMandatory: false - - name: statusason - label: reports.works.statusason - type: string - source: works - searchClause : AND de.status=$statusason - isMandatory: false - - query: select de.projectcode as wincode, de.nameofwork, tw.name||'/'||stw.name as subtypeofwork, workstatus.description as status from egw_detailedestimate de, (values tbl_workstatus) as workstatus (code,description,tenantId), (values tbl_typeofwork) as tw (name,code,description,tenantId), (values tbl_subtypeofwork) as stw (name,code,description,tenantId) where de.status='CREATED' and workstatus.code=de.status and tw.code=de.workstype and stw.code=de.workssubtype - -- reportName: WorkInProgressDetails - summary: Work In Progress Details - version: 1.0.0 - moduleName: works - externalService: - - entity: $.MdmsRes.egf-master.FinancialYear - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=egf-master&masterName=FinancialYear&tenantId=$tenantid&filter=%5B%3F%28%40.active%3D%3Dtrue%29%5D - keyOrder: finYearRange,startingDate,endingDate,tenantId - tableName: tbl_financialyear - stateData: true - - entity: $.MdmsRes.works.Scheme - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=works&masterName=Scheme&tenantId=$tenantid&filter=%5B%3F%28%40.parent%21%3Dnull%29%5D - keyOrder: name,code - tableName: tbl_scheme - stateData: true - sourceColumns: - - name: nameofwork - label: reports.works.nameofwork - type: string - source: works - - name: distributedforfinyear - label: reports.works.distributedforfinyear - type: string - source: works - - name: accountcode - label: reports.works.accountcode - type: string - source: works - - name: estimatevalue - label: reports.works.estimatevalue - type: number - source: works - - name: location - label: reports.works.location - type: string - source: works - - name: expectedcompletiondate - label: reports.works.expectedcompletiondate - type: epoch - source: works - - name: schemename - label: reports.works.schemename - type: string - source: works - - name: actualcompletiondate - label: reports.works.actualcompletiondate - type: epoch - source: works - - name: resolutionnumberanddate - label: reports.works.resolutionnumberanddate - type: string - source: works - - name: capitalisationdate - label: reports.works.capitalisationdate - type: epoch - source: works - - name: workordernumber - label: reports.works.workordernumber - type: number - source: works - - name: wincode - label: reports.works.wincode - type: number - source: works - - name: approvedbudget - label: reports.works.approvedbudget - type: string - source: works - - name: assetidentificationnumber - label: reports.works.assetidentificationnumber - type: string - source: works - - name: securitydepositamount - label: reports.works.securitydepositamount - type: string - source: works - - name: totalexpensesincurredsofar - label: reports.works.totalexpensesincurredsofar - type: string - source: works - - name: paymentdate - label: reports.works.paymentdate - type: epoch - source: works - - name: amount - label: reports.works.amount - type: number - source: works - - name: deductionamount - label: reports.works.deductionamount - type: number - source: works - - name: netpayable - label: reports.works.netpayable - type: number - source: works - - name: vouchernumber - label: reports.works.vouchernumber - type: string - source: works - - name: securitydepositrefunddate - label: reports.works.securitydepositrefunddate - type: epoch - source: works - - name: securitydepositrefundamount - label: reports.works.securitydepositrefundamount - type: number - source: works - - name: outstandingsecuritydepositamount - label: reports.works.outstandingsecuritydepositamount - type: number - source: works - - name: remarks - label: reports.works.remarks - type: string - source: works - - name: headofdepartment - label: reports.works.headofdepartment - type: string - source: works - searchParams: - - name: wcode - label: reports.works.wincode - type: string - source: works - searchClause : AND de.projectcode=$wcode - isMandatory: false - - query: select de.nameofwork, (select finyear.finYearRange from (values tbl_financialyear) as finyear (finYearRange,startingDate,endingDate,tenantId) where de.estimatedate between startingDate::bigint and endingDate::bigint) as distributedforfinyear, de.budgetgroup as accountcode, de.estimatevalue, de.location, ((select coalesce(statusdate, innerwo.workorderdate) from egw_workorder innerwo left join egw_offlinestatus fs on fs.objecttype='WorkOrderOffline' and fs.status='WORK_COMMENCED' and fs.objectnumber=innerwo.workordernumber where innerwo.workordernumber=wo.workordernumber) + loa.contractperiod*24*12*60*1000) as expectedcompletiondate, (select scheme.name from (values tbl_scheme) as scheme (name, code) where scheme.code=de.scheme) as schemename, (select cb.workcompletiondate from egw_contractorbill cb, egf_billregister bg where bg.billnumber=cb.billnumber and bg.billtype='contractorbill' and bg.billsubtype='Final' and cb.letterofacceptanceestimate=loae.id) as actualcompletiondate, de.councilresolutionnumber||'/'||de.councilresolutiondate as resolutionnumberanddate, (select bg.billdate from egw_contractorbill cb, egf_billregister bg where bg.billnumber=cb.billnumber and bg.billtype='contractorbill' and bg.billsubtype='Final' and cb.letterofacceptanceestimate=loae.id) as capitalisationdate, wo.workordernumber, de.projectcode as wincode, de.estimatevalue as approvedbudget, '' as assetidentificationnumber, (select sum(amount) from egw_securitydeposit where letterofacceptance=loa.id) as securitydepositamount, (select sum(bg.billamount) from egw_contractorbill cb, egf_billregister bg where bg.billnumber=cb.billnumber and bg.billtype='contractorbill' and cb.deleted=false and cb.letterofacceptanceestimate=loae.id) as totalexpensesincurredsofar, br.billdate as paymentdate, br.billamount as amount, br.billnumber as vouchernumber from egw_detailedestimate de left join egw_letterofacceptanceestimate loae on loae.detailedestimate=de.estimatenumber left join egw_letterofacceptance loa on loae.letterofacceptance=loa.id left join egw_workorder wo on wo.letterofacceptance=loa.id left join egw_contractorbill cb on cb.letterofacceptanceestimate=loae.id left join egf_billregister br on cb.billnumber=br.billnumber and br.billtype='contractorbill'where wo.letterofacceptance=loa.id and loae.letterofacceptance= wo.letterofacceptance and loae.letterofacceptance=loa.id and loae.detailedestimate=de.estimatenumber - -- reportName: ProjectStatusReport - summary: Project Status Report - version: 1.0.0 - moduleName: works - externalService: - - entity: $.MdmsRes.tenant.tenants[*].city - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_search - keyOrder: name,districtName, regionName - tableName: tbl_tenant - postObject: $RequestInfo,"MdmsCriteria":{"tenantId":"default","moduleDetails":[{"moduleName":"tenant","masterDetails":[{"name":"tenants","filter":"[?(@.code=='$tenantid')]"}]}]} - stateData: true - - entity: $.MdmsRes.works.Scheme - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=works&masterName=Scheme&tenantId=$tenantid&filter=%5B%3F%28%40.parent%21%3Dnull%29%5D - keyOrder: name,code - tableName: tbl_scheme - stateData: true - - entity: $.MdmsRes.works.TypeOfWork - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=works&masterName=TypeOfWork&tenantId=$tenantid&filter=%5B%3F%28%40.parent%3D%3Dnull%20%26%26%20%40.active%3D%3D%27true%27%29%5D - keyOrder: name,code,description,tenantId - tableName: tbl_typeofwork - stateData: true - - entity: $.MdmsRes.works.TypeOfWork - apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=works&masterName=TypeOfWork&tenantId=$tenantid&filter=%5B%3F%28%40.parent%21%3Dnull%20%26%26%20%40.active%3D%3D%27true%27%29%5D - keyOrder: name,code,description,tenantId - tableName: tbl_subtypeofwork - stateData: true - sourceColumns: - - name: divisionname - label: reports.works.division - type: string - source: works - - name: districtname - label: reports.works.district - type: string - source: works - - name: ulbname - label: reports.works.ulbname - type: string - source: works - - name: typeofwork - label: reports.works.typeofwork - type: string - source: works - - name: subtypeofwork - label: reports.works.subtypeofwork - type: string - source: works - - name: schemename - label: reports.works.schemename - type: string - source: works - - name: estimatenumber - label: reports.works.estimatenumber - type: string - source: works - - name: nameofwork - label: reports.works.nameofwork - type: string - source: works - - name: estimateamount - label: reports.works.estimateamount - type: number - source: works - - name: sanctionedamount - label: reports.works.sanctionedamount - type: number - source: works - - name: workstatus - label: reports.works.status - type: string - source: works - - name: billsreceivedtill - label: reports.works.billsreceivedtill - type: string - source: works - - name: paymentdonetill - label: reports.works.paymentdonetill - type: number - source: works - searchParams: - - name: division - label: reports.works.division - type: singlevaluelist - source: works - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=tenant&masterName=tenants&tenantId=$tenantid|$.MdmsRes.tenant.tenants.*.city.regionName|$.MdmsRes.tenant.tenants.*.city.regionName - wrapper: true - stateData: true - searchClause : AND de.workstype=$typeOfWork - isMandatory: false - - name: district - label: reports.works.district - type: singlevaluelist - isMandatory: false - type: string - source: works - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=tenant&masterName=tenants&tenantId=$tenantid|$.MdmsRes.tenant.tenants.*.city.districtName|$.MdmsRes.tenant.tenants.*.city.districtName - wrapper: true - stateData: true - searchClause : AND de.workstype in ($typeofwork) - - name: ulb - label: reports.works.ulbname - isMandatory: false - type: multivaluelist - source: works - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=tenant&masterName=tenants&tenantId=$tenantid|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name - wrapper: true - stateData: true - searchClause : AND de.workssubtype in ($subtypeofwork) - - name: status - label: reports.works.status - type: singlevaluelist - source: works - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=works&masterName=WorksStatus&tenantId=$tenantid&filter=%5B%3F%28%40.moduleType%3D%3D%27DetailedEstimate%27%29%5D|$..code|$..description - wrapper: true - stateData: true - searchClause : AND de.status=$status - isMandatory: false - - name: statusason - label: reports.works.statusason - type: string - source: works - searchClause : AND de.status=$statusason - isMandatory: false - - name: typeOfWork - label: reports.works.typeofwork - type: singlevaluelist - source: works - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=works&masterName=TypeOfWork&tenantId=$tenantid&filter=%5B%3F%28%40.parent%3D%3Dnull%20%26%26%20%40.active%3D%3D%27true%27%29%5D|$..code|$..name - wrapper: true - stateData: true - searchClause : AND de.workstype=$typeOfWork - isMandatory: false - - name: subTypeOfWork - label: reports.works.subtypeofwork - type: singlevaluelist - source: works - pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=works&masterName=TypeOfWork&tenantId=$tenantid&filter=%5B%3F%28%40.parent%3D%3D%7BtypeOfWork%7D%20%26%26%20%40.active%3D%3D%27true%27%29%5D|$..code|$..name - wrapper: true - stateData: true - searchClause : AND de.workssubtype=$subTypeOfWork - isMandatory: false - query: select (select city.name from (values tbl_tenant) as city (name, districtName, regionName)) as divisionname, (select city.districtName from (values tbl_tenant) as city (name, districtName, regionName)) as districtname, (select name from (values tbl_tenant) as city (name, districtName, regionName)) as ulbname, (select tw.name from (values tbl_typeofwork) as tw (name,code,description,tenantId) where tw.code=de.workstype) as typeofwork, (select stw.name from (values tbl_subtypeofwork) as stw (name,code,description,tenantId) where stw.code=de.workssubtype) as subtypeofwork, (select scheme.name from (values tbl_scheme) as scheme (name, code) where scheme.code=de.scheme) as schemename, de.estimatenumber, de.nameofwork, de.estimatevalue as estimateamount, loa.loaamount as sanctionedamount, (select sum(bg.billamount) from egw_contractorbill cb, egf_billregister bg where bg.billnumber=cb.billnumber and bg.billtype='contractorbill' and cb.deleted=false and cb.letterofacceptanceestimate=loae.id) as billsreceivedtill from egw_letterofacceptance loa, egw_detailedestimate de, egw_letterofacceptanceestimate loae left join egw_contractorbill cb on cb.letterofacceptanceestimate=loae.id left join egf_billregister br on cb.billnumber=br.billnumber and br.billtype='contractorbill' where loae.letterofacceptance=loa.id and loae.detailedestimate=de.estimatenumber diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml deleted file mode 100644 index e9e9181c..00000000 --- a/configs/reports/configs/ws-reports.yml +++ /dev/null @@ -1,1601 +0,0 @@ ---- -ReportDefinitions: -- reportName: ReceiptRegisterSW - summary: Receipt Register - version: 1.0.0 - moduleName: rainmaker-ws - additionalConfig: - print: - pdfPageSize: "A1" - sourceColumns: - - name: receiptno - label: reports.ws.receiptno - type: string - source: ws - total: false - - name: receiptdate1 - label: reports.ws.receiptdate - type: string - source: ws - total: false - - name: service - label: reports.ws.serive - type: string - source: ws - total: false - - name: billnumber - label: reports.ws.billnumber - type: string - source: ws - total: false - - name: billdate1 - label: reports.ws.billdate - type: string - source: ws - total: false - - name: paidby - label: reports.ws.paidby - type: string - source: ws - total: false - - name: amountpaid - label: reports.ws.amountpaid - type: string - source: ws - total: true - - name: paymentmode - label: reports.ws.paymentmode - type: string - source: ws - total: false - - name: paymentstatus - label: reports.ws.paymentstatus - type: string - source: ws - total: false - - name: ownername - label: reports.ws.ownername - type: string - source: ws - total: false - searchParams: - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: true - searchClause: AND pd.receiptdate >= $fromDate - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: true - searchClause: AND pd.receiptdate <= $toDate - - name: serviceType - label: serviceType - type: singlevaluelist - pattern: 'list://WS%:Water,SW%:Sewerage' - source: pt - isMandatory: true - searchClause: AND pd.businessservice like $serviceType - - name: receiptNumber - label: receiptNumber - type: string - source: pt - isMandatory: false - searchClause: AND pd.receiptnumber like $receiptNumber - - name: paymentStatus - label: paymentStatus - type: singlevaluelist - pattern: 'list://NEW:NEW,DEPOSITED:DEPOSITED' - source: pt - isMandatory: false - searchClause: AND payment.paymentstatus like $paymentStatus - - name: paymentMode - label: paymentMode - type: singlevaluelist - pattern: 'list://CASH:CASH,CHEQUE:CHEQUE,DD:DD,ONLINE:ONLINE,CARD:CARD,OFFLINE_NEFT:OFFLINE NEFT' - source: pt - isMandatory: false - searchClause: AND payment.paymentmode like $paymentMode - query: | - -- Use CTE to force query plan, compute & use CTE later - select - receiptnumber as receiptno, - to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') as receiptdate1, - bill.businessservice as service, - billnumber, - to_char((To_timestamp(bill.billdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') as billdate1, - paidby, - amountpaid, - paymentmode, - paymentstatus, - payername as ownername - from egcl_paymentdetail pd - inner join egcl_bill as bill on bill.id=pd.billid - inner join egcl_payment as payment on payment.id=pd.paymentid and payment.paymentstatus!='CANCELLED' - where payment.tenantid=$tenantid - orderby: order by pd.receiptdate desc - - -- reportName: ReceiptRegisterSW_OLD - summary: Receipt Register - version: 1.0.0 - moduleName: rainmaker-ws - additionalConfig: - print: - pdfPageSize: "A1" - sourceColumns: - - name: connectionno - label: reports.ws.connectionno - type: string - source: ws - total: false - - name: consumercode - label: reports.ws.consumercode - type: string - source: ws - total: false - - name: receiptdate - label: reports.ws.receiptdate - type: string - source: ws - total: false - - name: receiptnumber - label: reports.ws.receiptnumber - type: string - source: ws - total: false - - name: instrumenttype - label: reports.ws.instrumenttype - type: string - source: ws - total: false - - name: bankname - label: reports.ws.bankname - type: string - source: ws - total: false - - name: transactionnumber - label: reports.ws.transactionnumber - type: string - source: ws - total: false - - name: transactiondate - label: reports.ws.transactiondate - type: string - source: ws - total: false - - name: billperiod - label: reports.ws.billperiod - type: string - source: ws - total: false - - name: amount - label: reports.ws.amount - type: string - source: ws - total: true - - name: pendingamount - label: reports.ws.pendingamount - type: string - source: ws - total: true - - name: usagetype - label: reports.ws.usagetype - type: string - source: ws - total: false - - name: adhocpenalty - label: reports.ws.adhocpenalty - type: string - source: ws - total: true - - name: adhocrebate - label: reports.ws.adhocrebate - type: string - source: ws - total: true - - name: compositionfee - label: reports.ws.compositionfee - type: string - source: ws - total: true - - name: connectionfee - label: reports.ws.connectionfee - type: string - source: ws - total: true - - name: roundoff - label: reports.ws.roundoff - type: string - source: ws - total: true - - name: formfee - label: reports.ws.formfee - type: string - source: ws - total: true - - name: onetimefee - label: reports.ws.onetimefee - type: string - source: ws - total: true - - name: othercharge - label: reports.ws.othercharge - type: string - source: ws - total: true - - name: otherfee - label: reports.ws.otherfee - type: string - source: ws - total: true - - name: roadcuttingcharge - label: reports.ws.roadcuttingcharge - type: string - source: ws - total: true - - name: securityfee - label: reports.ws.securityfee - type: string - source: ws - total: true - - name: securitycharge - label: reports.ws.securitycharge - type: string - source: ws - total: true - - name: taxandcess - label: reports.ws.interest - type: string - source: ws - total: true - - name: usercharge - label: reports.ws.usercharge - type: string - source: ws - total: true - - name: g8issuedate - label: reports.ws.g8issuedate - type: string - source: ws - total: false - - name: g8receiptno - label: reports.ws.g8receiptno - type: string - source: ws - total: false - searchParams: - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: true - searchClause: AND pd.receiptdate >= $fromDate - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: true - searchClause: AND pd.receiptdate <= $toDate - - name: connectionType - label: connectionType - type: singlevaluelist - pattern: 'list://WS%:Water,SW%:Sewerage' - source: pt - isMandatory: true - searchClause: AND pd.businessservice like $connectionType - query: | - -- Use CTE to force query plan, compute & use CTE later - WITH receipt_breakup AS - ( - SELECT - pd.id as pdid, - SUM(CASE WHEN taxheadcode LIKE 'SW_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, - SUM(CASE WHEN taxheadcode LIKE 'SW_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, - SUM(CASE WHEN taxheadcode LIKE 'SW_COMPOSITION_FEE' THEN adjustedamount ELSE 0 END) as compositionfee, - SUM(CASE WHEN taxheadcode LIKE 'SW_CONNECTION_FEE' THEN adjustedamount ELSE 0 END) as connectionfee, - SUM(CASE WHEN taxheadcode LIKE 'SW_FEE_ROUND_OFF' THEN adjustedamount ELSE 0 END) as roundoff, - SUM(CASE WHEN taxheadcode LIKE 'SW_FORM_FEE' THEN adjustedamount ELSE 0 END) as formfee, - SUM(CASE WHEN taxheadcode LIKE 'SW_ONE_TIME_FEE' THEN adjustedamount ELSE 0 END) as onetimefee, - SUM(CASE WHEN taxheadcode LIKE 'SW_OTHER_CHARGE' THEN bad.amount ELSE 0 END) as othercharge, - SUM(CASE WHEN taxheadcode LIKE 'SW_OTHER_FEE' THEN adjustedamount ELSE 0 END) as otherfee, - SUM(CASE WHEN taxheadcode LIKE 'SW_ROAD_CUTTING_CHARGE' THEN bad.amount ELSE 0 END) as roadcuttingcharge, - SUM(CASE WHEN taxheadcode LIKE 'SW_SCRUTINY_FEE' THEN bad.amount ELSE 0 END) as scrutinyfee, - SUM(CASE WHEN taxheadcode LIKE 'SW_SECURITY_CHARGE' THEN adjustedamount ELSE 0 END) as securitycharge, - SUM(CASE WHEN taxheadcode LIKE 'SW_TAX_AND_CESS' THEN adjustedamount ELSE 0 END) as taxandcess, - SUM(CASE WHEN taxheadcode LIKE 'SW_USER_CHARGE' THEN adjustedamount ELSE 0 END) as usercharge - FROM egcl_billaccountdetail as bad - INNER JOIN egcl_billdetial as bd on bd.id = bad.billdetailid - INNER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid - INNER JOIN egcl_payment as payment on pd.paymentid=payment.id - WHERE payment.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' - group by pdid - ) - SELECT - --count(*) - pd.tenantid AS tenantid, - pd.id, - pt.propertyid as consumercode, - to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS receiptdate, - payment.ifsccode AS bankname, - receiptnumber, - payment.totalamountpaid as amount, - payment.paymentmode as instrumenttype, - payment.transactionnumber, - concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY')) as billperiod, - to_char((To_timestamp(payment.transactiondate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, - payment.totaldue - payment.totalamountpaid AS pendingamount, - Initcap(case when pt.usagecategory like '%.%' then split_part(pt.usagecategory,'.',2) else pt.usagecategory end) as usagetype, - (case when eg_user.name is null then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else eg_user.name end) as collectorname, - receipt_breakup.*, - to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, - manualreceiptnumber as g8receiptno - FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, receipt_breakup, egcl_bill bill, eg_sw_connection - --(select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr - where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice like $connectionType and payment.tenantid=$tenantid - and pt.id = eg_sw_connection.property_id - and receipt_breakup.pdid=pd.id - and pt.status!='INACTIVE' - --and pt_addr.propertyid=pt.id - --and pt.propertyid='PT-1012-978737' - --and receiptnumber='PT/1012/2020-21/001021' - orderby: ORDER BY pd.receiptdate DESC - - -- reportName: ReceiptRegisterReportSW - decryptionPathId: ReceiptRegisterShort_V2 - summary: Receipt Register - version: 1.0.0 - moduleName: rainmaker-ws - additionalConfig: - print: - pdfPageSize: "A1" - sourceColumns: - - name: receiptnumber - label: reports.ws.receiptnumber - type: string - source: ws - total: false - - name: receiptdate - label: reports.ws.receiptdate - type: string - source: ws - total: false - - name: service - label: reports.ws.service - type: string - source: ws - total: false - - name: collectorname - label: reports.ws.collectorname - type: string - source: ws - total: false - - name: online - label: reports.ws.online - type: string - source: ws - total: true - - name: cash - label: reports.ws.cash - type: string - source: ws - total: true - - name: cheque - label: reports.ws.cheque - type: string - source: ws - total: true - - name: dd - label: reports.ws.dd - type: string - source: ws - total: true - - name: cheque_dd_date - label: reports.ws.cheque_dd_date - type: string - source: ws - total: false - - name: cheque_dd_transaction_number - label: reports.ws.cheque_dd_transaction_number - type: string - source: ws - total: false - - name: card - label: reports.ws.card - type: string - source: ws - total: true - - name: rtgs - label: reports.ws.rtgs - type: string - source: ws - total: true - - name: neft - label: reports.ws.neft - type: string - source: ws - total: true - - name: po - label: reports.ws.po - type: string - source: ws - total: true - - name: paymentstatus - label: reports.ws.paymentstatus - type: string - source: ws - total: false - searchParams: - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: true - searchClause: AND pd.receiptdate >= $fromDate - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: true - searchClause: AND pd.receiptdate <= $toDate - - name: connectionType - label: connectionType - type: singlevaluelist - pattern: 'list://WS%:Water,SW%:Sewerage' - source: pt - isMandatory: true - searchClause: AND pd.businessservice like $connectionType - query: | - -- Use CTE to force query plan, compute & use CTE later - select - receiptnumber, - to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') as receiptdate1, - businessservice as service, - (case when eg_user.name is null then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else eg_user.name end) as collectorname, - case when payment.paymentmode='ONLINE' then payment.totalamountpaid else 0 end as "online", - case when payment.paymentmode='CASH' then payment.totalamountpaid else 0 end as cash, - case when payment.paymentmode='CHEQUE' then payment.totalamountpaid else 0 end as cheque, - case when payment.paymentmode='DD' then payment.totalamountpaid else 0 end as dd, - to_char((To_timestamp(instrumentdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') as cheque_dd_date, - instrumentnumber as cheque_dd_transaction_number, - case when payment.paymentmode='CARD' then payment.totalamountpaid else 0 end as card, - case when payment.paymentmode='OFFLINE_RTGS' then payment.totalamountpaid else 0 end as rtgs, - case when payment.paymentmode='OFFLINE_NEFT' then payment.totalamountpaid else 0 end as neft, - case when payment.paymentmode='POTAL_ORDER' then payment.totalamountpaid else 0 end as po - from egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER - inner join egcl_payment payment on payment.id=pd.paymentid - where pd.tenantid=$tenantid - orderby: order by pd.receiptdate - - -- reportName: BaseRegisterReportWS - summary: Base Register Report WS - version: 1.0.0 - moduleName: rainmaker-ws - additionalConfig: - print: - pdfPageSize: "A1" - sourceColumns: - - name: connectionno - label: reports.ws.connectionno - type: string - source: ws - total: false - - name: plotsize - label: reports.ws.plotsize - type: string - source: ws - total: false - - name: applicationno - label: reports.ws.applicationno - type: string - source: ws - total: false - - name: propertyid - label: reports.ws.propertyid - type: string - source: ws - total: false - - name: connectionholdertype - label: reports.ws.connectionholdertype - type: string - source: ws - total: false - - name: applicationstatus - label: reports.ws.applicationstatus - type: string - source: ws - total: false - - name: connectionholder - label: reports.ws.connectionholder - type: string - source: ws - total: false - - name: name - label: reports.ws.ownername - type: string - source: ws - total: false - - name: address - label: reports.ws.address - type: string - source: ws - total: false - query: | - -- Use CTE to force query plan, compute & use CTE later - with ptowner as - ( - select split_part(string_agg(userid,','),',',1) as owneruserid, - propertyid - from eg_pt_owner - where tenantid=$tenantid and status='ACTIVE' - group by propertyid - ) - --, - -- ptaddress as - --( - -- select - -- split_part(string_agg(locality,','),',',1) as locality, - -- split_part(string_agg(concat(doorno,' ',plotno,' ',buildingname,' ',street,' ',city),'|'),'|',1) as address, - -- propertyid - -- from eg_pt_address - -- where tenantid=$tenantid - -- group by propertyid - --) - select - connectionno, - pt.landarea as plotsize, - oldconnectionno, - applicationno, - pt.propertyid, - ch.connectionholdertype, - wsconnection.applicationstatus, - users.name as connectionHolder, - userowner.name as name - --concat(address,' ',localityname) as address - from eg_ws_connection wsconnection - inner join eg_pt_property as pt on pt.id=wsconnection.property_id - left outer join eg_ws_connectionholder as ch on ch.connectionid=wsconnection.id - left outer join eg_user as users on ch.userid=users.uuid - inner join ptowner on ptowner.propertyid=pt.id - left outer join eg_user as userowner on ptowner.owneruserid=userowner.uuid - --inner join ptaddress on ptaddress.propertyid=pt.id - --INNER JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode=ptaddress.locality - -- reportName: FieldCollectionSearchReportWS - decryptionPathId: FieldCollectionSearchReportWS - summary: Field Collection Search Report WS - version: 1.0.0 - moduleName: rainmaker-ws - additionalConfig: - print: - pdfPageSize: "A1" - sourceColumns: - - name: receiptnumber - label: reports.ws.receiptnumber - type: string - source: ws - total: false - - name: receiptdate1 - label: reports.ws.receiptdate - type: string - source: ws - total: false - - name: businessservice - label: reports.ws.businessservice - type: string - source: ws - total: false - - name: amountpaid - label: reports.ws.amountpaid - type: string - source: ws - total: true - - name: consumercode - label: reports.ws.consumercode - type: string - source: ws - total: false - - name: paymentstatus - label: reports.ws.paymentstatus - type: string - source: ws - total: false - - name: paymentmode - label: reports.ws.paymentmode - type: string - source: ws - total: false - - name: name - label: reports.ws.name - type: string - source: ws - total: false - - name: mobilenumber - label: reports.ws.mobilenumber - type: string - source: ws - total: false - searchParams: - - name: connectionType - label: connectionType - type: singlevaluelist - pattern: 'list://WS%:Water,SW%:Sewerage' - source: pt - isMandatory: true - searchClause: AND pd.businessservice like $connectionType - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: false - searchClause: AND pd.receiptdate >= $fromDate - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: false - searchClause: AND pd.receiptdate <= $toDate - query: | - -- Use CTE to force query plan, compute & use CTE later - select - receiptnumber, - to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS receiptdate1, - pd.businessservice, - pd.amountpaid, - consumercode, - paymentstatus, - paymentmode, - usr.name as name, - usr.mobilenumber as mobilenumber - from egcl_paymentdetail pd - inner join egcl_bill as bill on bill.id=pd.billid - INNER join egcl_payment as payment on payment.id=pd.paymentid - inner join eg_user as usr on usr.id=payment.createdby::integer - where pd.tenantid=$tenantid - orderby: ORDER BY pd.receiptdate DESC - -- reportName: FieldCollectionSearchReceiptWS - summary: Field Collection Search Receipt WS - version: 1.0.0 - moduleName: rainmaker-ws - additionalConfig: - print: - pdfPageSize: "A1" - sourceColumns: - - name: receiptnumber - label: reports.ws.receiptnumber - type: string - source: ws - total: false - - name: receiptdate1 - label: reports.ws.receiptdate - type: string - source: ws - total: false - - name: manualreceiptnumber - label: reports.ws.manualreceiptnumber - type: string - source: ws - total: false - - name: businessservice - label: reports.ws.businessservice - type: string - source: ws - total: false - - name: amountpaid - label: reports.ws.amountpaid - type: string - source: ws - total: true - - name: consumercode - label: reports.ws.consumercode - type: string - source: ws - total: false - - name: paymentstatus - label: reports.ws.paymentstatus - type: string - source: ws - total: false - - name: paymentmode - label: reports.ws.paymentmode - type: string - source: ws - total: false - - name: billnumber - label: reports.ws.billnumber - type: string - source: ws - total: false - - name: billdescription - label: reports.ws.billdescription - type: string - source: ws - total: false - searchParams: - - name: connectionType - label: connectionType - type: singlevaluelist - pattern: 'list://WS%:Water,SW%:Sewerage' - source: pt - isMandatory: true - searchClause: AND bill.businessservice like $connectionType - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: false - searchClause: AND pd.receiptdate >= $fromDate - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: false - searchClause: AND pd.receiptdate <= $toDate - query: | - -- Use CTE to force query plan, compute & use CTE later - select - receiptnumber, - manualreceiptnumber, - to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS receiptdate1, - pd.businessservice as businessservice, - billnumber, - billdescription, - consumercode, - pd.amountpaid as amountpaid, - paymentmode, - paymentstatus - from egcl_paymentdetail pd - inner join egcl_bill as bill on bill.id=pd.billid - inner join egcl_billdetial as billd on billd.billid=pd.billid - INNER join egcl_payment as payment on payment.id=pd.paymentid - where 1=1 - orderby: ORDER BY pd.receiptdate DESC - - -- reportName: ChequeCollectionReportWS - summary: Cheque Collection Report WS - version: 1.0.0 - moduleName: rainmaker-ws - additionalConfig: - print: - pdfPageSize: "A1" - sourceColumns: - - name: consumercode - label: reports.ws.consumercode - type: string - source: ws - total: false - - name: connectionno - label: reports.ws.connectionno - type: string - source: ws - total: false - - name: oldconnectionno - label: reports.ws.oldconnectionno - type: string - source: ws - total: false - - name: receiptnumber - label: reports.ws.receiptnumber - type: string - source: ws - total: false - - name: receiptdate1 - label: reports.ws.receiptdate - type: string - source: ws - total: false - - name: manualreceiptnumber - label: reports.ws.manualreceiptnumber - type: string - source: ws - total: false - - name: manualreceiptdate - label: reports.ws.manualreceiptdate - type: string - source: ws - total: false - - name: cheque_dd_no - label: reports.ws.cheque_dd_no - type: string - source: ws - total: false - - name: cheque_dd_date - label: reports.ws.cheque_dd_date - type: string - source: ws - total: false - - name: paymentmode - label: reports.ws.paymentmode - type: string - source: ws - total: false - - name: paymentstatus - label: reports.ws.paymentstatus - type: string - source: ws - total: false - - name: bank_name - label: reports.ws.bank_name - type: string - source: ws - total: false - - name: branch - label: reports.ws.branch - type: string - source: ws - total: false - - name: amountpaid - label: reports.ws.amountpaid - type: string - source: ws - total: true - - name: businessservice - label: reports.ws.businessservice - type: string - source: ws - total: false - searchParams: - - name: connectionType - label: connectionType - type: singlevaluelist - pattern: 'list://WS%:Water,SW%:Sewerage' - source: pt - isMandatory: true - searchClause: AND bill.businessservice like $connectionType - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: false - searchClause: AND pd.receiptdate >= $fromDate - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: false - searchClause: AND pd.receiptdate <= $toDate - query: | - -- Use CTE to force query plan, compute & use CTE later - select - consumercode, - wsconnection.connectionno, - wsconnection.oldconnectionno, - receiptnumber, - to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') as receiptdate1, - manualreceiptnumber, - to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') as manualreceiptdate, - transactionnumber as cheque_dd_no, - to_char((To_timestamp(transactiondate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') as cheque_dd_date, - paymentmode, - paymentstatus, - bank_name, - branch, - pd.amountpaid, - pd.businessservice - from egcl_paymentdetail pd - inner join egcl_payment payment on payment.id=pd.paymentid - left outer join bank_branches on bank_branches.ifsc=payment.ifsccode - inner join egcl_bill bill on bill.id=pd.billid - inner join eg_ws_connection wsconnection on wsconnection.connectionno=bill.consumercode - where payment.paymentmode='CHEQUE' and pd.tenantid=$tenantid and payment.paymentstatus!='CANCELLED' - orderby: ORDER BY pd.receiptdate DESC - -- reportName: SearchOnlineReceiptsWS - decryptionPathId: ReceiptRegisterShort_V2 - summary: Search Online Receipts WS - version: 1.0.0 - moduleName: rainmaker-ws - additionalConfig: - print: - pdfPageSize: "A1" - sourceColumns: - - name: billnumber - label: reports.ws.billnumber - type: string - source: ws - total: false - - name: consumercode - label: reports.ws.consumercode - type: string - source: ws - total: false - - name: receiptnumber - label: reports.ws.receiptnumber - type: string - source: ws - total: false - - name: receiptdate1 - label: reports.ws.receiptdate1 - type: string - source: ws - total: false - - name: amountpaid - label: reports.ws.amountpaid - type: string - source: ws - total: true - - name: transactionnumber - label: reports.ws.transactionnumber - type: string - source: ws - total: false - - name: transactiondate1 - label: reports.ws.transactiondate - type: string - source: ws - total: false - - name: businessservice - label: reports.ws.businessservice - type: string - source: ws - total: false - - name: paymentstatus - label: reports.ws.paymentstatus - type: string - source: ws - total: false - - name: paymentmode - label: reports.ws.paymentmode - type: string - source: ws - total: false - - name: collectorname - label: reports.ws.collectorname - type: string - source: ws - total: false - searchParams: - - name: connectionType - label: connectionType - type: singlevaluelist - pattern: 'list://WS%:Water,SW%:Sewerage' - source: pt - isMandatory: true - searchClause: AND bill.businessservice like $connectionType - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: false - searchClause: AND payment.transactiondate >= $fromDate - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: false - searchClause: AND payment.transactiondate <= $toDate - query: | - -- Use CTE to force query plan, compute & use CTE later - select - billnumber, - bill.consumercode as consumercode, - pd.receiptnumber as receiptnumber, - to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') as receiptate1, - pd.amountpaid, - pd.businessservice , - paymentstatus , - payment.transactionnumber , - to_char((To_timestamp(payment.transactiondate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') as transactiondate1, - paymentmode, - (case when eg_user.name is null then '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' else eg_user.name end) as collectorname - from egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER - inner join egcl_bill as bill on bill.id=pd.billid - INNER join egcl_payment as payment on payment.id=pd.paymentid - where paymentmode='ONLINE' and payment.tenantid=$tenantid - orderby: ORDER BY payment.transactiondate DESC - -- reportName: ReceiptCollections - summary: Receipt Collections - version: 1.0.0 - moduleName: rainmaker-ws - additionalConfig: - print: - pdfPageSize: "A1" - sourceColumns: - - name: receiptnumber - label: reports.ws.receiptnumber - type: string - source: ws - total: false - - name: receiptdate1 - label: reports.ws.receiptdate - type: string - source: ws - total: false - - name: businessservice - label: reports.ws.businessservice - type: string - source: ws - total: false - - name: amountpaid - label: reports.ws.amountpaid - type: string - source: ws - total: true - - name: consumercode - label: reports.ws.consumercode - type: string - source: ws - total: false - - name: paymentmode - label: reports.ws.paymentmode - type: string - source: ws - total: false - - name: billnumber - label: reports.ws.billnumber - type: string - source: ws - total: false - - name: paidby - label: reports.ws.paidby - type: string - source: ws - total: false - searchParams: - - name: connectionType - label: connectionType - type: singlevaluelist - pattern: 'list://WS%:Water,SW%:Sewerage' - source: pt - isMandatory: true - searchClause: AND pd.businessservice like $connectionType - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: false - searchClause: AND payment.transactiondate >= $fromDate - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: false - searchClause: AND payment.transactiondate <= $toDate - query: | - -- Use CTE to force query plan, compute & use CTE later - select - consumercode, - receiptnumber, - to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') as receiptdate1, - amountpaid, - paymentmode, - pd.businessservice, - bill.billnumber, - payment.paidby - from egcl_paymentdetail pd - inner join egcl_bill as bill on bill.id=pd.billid - inner join egcl_payment as payment on payment.id=pd.paymentid and payment.paymentstatus!='CANCELLED' - where pd.tenantid=$tenantid - orderby: ORDER BY pd.receiptdate DESC - -- reportName: JE_PendencyReport - decryptionPathId: JE_PendencyReport_WS - summary: JE_Pendency Report - version: 1.0.0 - moduleName: rainmaker-ws - additionalConfig: - print: - pdfPageSize: "A1" - sourceColumns: - - name: name - label: reports.ws.name - type: string - source: ws - total: false - - name: count - label: reports.ws.count - type: string - source: ws - total: true - query: | - -- Use CTE to force query plan, compute & use CTE later - select usr.name,count(*) - from eg_ws_connection con - inner join eg_user as usr on usr.uuid=con.createdby and usr.type='EMPLOYEE' - where applicationstatus not in ('INITIATED') and con.tenantid=$tenantid - groupby: GROUP BY con.createdby,usr.name - -- reportName: CashCollectionReport - decryptionPathId: ReceiptRegisterShort_V2 - summary: Cash Collection Report - version: 1.0.0 - moduleName: rainmaker-ws - additionalConfig: - print: - pdfPageSize: "A1" - sourceColumns: - - name: receiptnumber - label: reports.ws.receiptnumber - type: string - source: ws - total: false - - name: receiptdate1 - label: reports.ws.receiptdate - type: string - source: ws - total: false - - name: amountpaid - label: reports.ws.amountpaid - type: string - source: ws - total: true - - name: consumercode - label: reports.ws.consumercode - type: string - source: ws - total: false - - name: collectorname - label: reports.ws.collectorname - type: string - source: ws - total: false - searchParams: - - name: connectionType - label: connectionType - type: singlevaluelist - pattern: 'list://WS%:Water,SW%:Sewerage' - source: pt - isMandatory: true - searchClause: AND pd.businessservice like $connectionType - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: false - searchClause: AND pd.receiptdate >= $fromDate - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: false - searchClause: AND pd.receiptdate <= $toDate - - name: collectorname - label: reports.pt.collectorname - type: singlevaluelist - pattern: http://egov-hrms:8080/egov-hrms/employees/_search?tenantId=$tenantid&roles=WS_CEMP,WS_CLERK,SW_CEMP,SW_CLERK|$.Employees[*].user.id|$.Employees[*].user.name - source: ws - wrapper: true - isMandatory: false - searchClause: AND eg_user.id = $collectorname::INTEGER - query: | - -- Use CTE to force query plan, compute & use CTE later - select - consumercode, - receiptnumber, - to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') as receiptdate1, - amountpaid, - (case when eg_user.name is null then '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' else eg_user.name end) as collectorname - from egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER - inner join egcl_bill as bill on bill.id=pd.billid - inner join egcl_payment as payment on payment.id=pd.paymentid and payment.paymentmode='CASH' and payment.paymentstatus!='CANCELLED' - where payment.tenantid=$tenantid - orderby: ORDER BY pd.receiptdate DESC - -- reportName: CollectionsSummaryHeadwiseReport - summary: Collections Summary Headwise Report - version: 1.0.0 - moduleName: rainmaker-ws - additionalConfig: - print: - pdfPageSize: "A1" - sourceColumns: - - name: taxheadcode - label: reports.ws.taxheadcode - type: string - source: ws - total: false - - name: totalamountpaid - label: reports.ws.totalamountpaid - type: string - source: ws - total: true - - name: totalassessments - label: reports.ws.totalassessments - type: string - source: ws - total: true - - name: totalonline - label: reports.ws.totalonline - type: string - source: ws - total: true - - name: countonline - label: reports.ws.countonline - type: string - source: ws - total: true - - name: totalcash - label: reports.ws.totalcash - type: string - source: ws - total: true - - name: countcash - label: reports.ws.countcash - type: string - source: ws - total: true - - name: totalcheque - label: reports.ws.totalcheque - type: string - source: ws - total: true - - name: totaldd - label: reports.ws.totaldd - type: string - source: ws - total: true - - name: countdd - label: reports.ws.countdd - type: string - source: ws - total: true - - name: totalcard - label: reports.ws.totalcard - type: string - source: ws - total: true - - name: countcard - label: reports.ws.countcard - type: string - source: ws - total: true - - name: totalrtgs - label: reports.ws.totalrtgs - type: string - source: ws - total: true - - name: totalneft - label: reports.ws.totalneft - type: string - source: ws - total: true - - name: countneft - label: reports.ws.countneft - type: string - source: ws - total: true - - name: totalPO - label: reports.ws.totalPO - type: string - source: ws - total: true - - name: countPO - label: reports.ws.countPO - type: string - source: ws - total: true - - name: countoffline - label: reports.ws.countoffline - type: string - source: ws - total: true - searchParams: - - name: connectionType - label: connectionType - type: singlevaluelist - pattern: 'list://WS%:Water,SW%:Sewerage' - source: pt - isMandatory: true - searchClause: AND pd.businessservice like $connectionType - - name: fromDate - label: reports.pt.fromDate - type: epoch - source: pt - isMandatory: false - searchClause: AND pd.receiptdate >= $fromDate - - name: toDate - label: reports.pt.toDate - type: epoch - source: pt - isMandatory: false - searchClause: AND pd.receiptdate <= $toDate - query: | - -- Use CTE to force query plan, compute & use CTE later - SELECT - taxheadcode, - sum(payment.totalamountpaid) as totalamountpaid, - count(payment.totalamountpaid) as totalassessments, - sum(case when payment.paymentmode='ONLINE' then payment.totalamountpaid else 0 end) as "totalonline", - sum(case when payment.paymentmode='ONLINE' then 1 else 0 end) as "countonline", - sum(case when payment.paymentmode='CASH' then payment.totalamountpaid else 0 end) as totalcash, - sum(case when payment.paymentmode='CASH' then 1 else 0 end) as countcash, - sum(case when payment.paymentmode='CHEQUE' then payment.totalamountpaid else 0 end) as totalcheque, - sum(case when payment.paymentmode='CHEQUE' then 1 else 0 end) as countcheque, - sum(case when payment.paymentmode='DD' then payment.totalamountpaid else 0 end) as totalDD, - sum(case when payment.paymentmode='DD' then 1 else 0 end) as countDD, - sum(case when payment.paymentmode='CARD' then payment.totalamountpaid else 0 end) as totalcard, - sum(case when payment.paymentmode='CARD' then 1 else 0 end) as countcard, - sum(case when payment.paymentmode='OFFLINE_RTGS' then payment.totalamountpaid else 0 end) as totalRTGS, - sum(case when payment.paymentmode='OFFLINE_RTGS' then 1 else 0 end) as countRTGS, - sum(case when payment.paymentmode='OFFLINE_NEFT' then payment.totalamountpaid else 0 end) as totalNEFT, - sum(case when payment.paymentmode='OFFLINE_NEFT' then 1 else 0 end) as countNEFT, - sum(case when payment.paymentmode='POTAL_ORDER' then payment.totalamountpaid else 0 end) as "totalPO", - sum(case when payment.paymentmode='POTAL_ORDER' then 1 else 0 end) as "countPO", - sum(case when payment.paymentmode!='ONLINE' then 1 else 0 end) as "countoffline" - FROM egcl_paymentdetail pd - INNER join egcl_payment as payment on pd.paymentid=payment.id - INNER JOIN egcl_billdetial as bd on pd.billid = bd.billid - INNER JOIN egcl_billaccountdetail as bad on bad.billdetailid = bd.id - where payment.paymentstatus != 'CANCELLED' and payment.tenantid=$tenantid - groupby: GROUP BY taxheadcode - - -- reportName: ArrearReport - summary: Arrear Report - version: 1.0.0 - moduleName: rainmaker-ws - additionalConfig: - print: - pdfPageSize: "A1" - sourceColumns: - - name: consumercode - label: reports.ws.consumercode - type: string - source: ws - total: false - - name: totalamount - label: reports.ws.totalamount - type: string - source: ws - total: true - - name: amountpaid - label: reports.ws.amountpaid - type: string - source: ws - total: true - - name: dueamount - label: reports.ws.dueamount - type: string - source: ws - total: true - searchParams: - - name: connectionType - label: connectionType - type: singlevaluelist - pattern: 'list://WS%:Water,SW%:Sewerage' - source: pt - isMandatory: true - searchClause: AND businessservice like $connectionType - query: | - -- Use CTE to force query plan, compute & use CTE later - with demands as - ( - select demandid,sum(taxamount) as amount,sum(collectionamount) as collection,sum(taxamount-collectionamount) as arrear - from egbs_demanddetail_v1 where tenantid=$tenantid - group by demandid - having sum(taxamount-collectionamount)>0 - ) - select consumercode,sum(amount) as totalamount,sum(collection) as amountpaid,sum(arrear) as dueamount - from egbs_demand_v1 d - inner join demands on demands.demandid=d.id and status='ACTIVE' - where tenantid=$tenantid - groupby: group by consumercode - - -- reportName: SearchWaterChargeReport - summary: Search Water Charge Notice Report - version: 1.0.0 - moduleName: rainmaker-ws - additionalConfig: - print: - pdfPageSize: "A1" - sourceColumns: - - name: connectionno - label: reports.ws.connectionno - type: string - source: ws - total: false - - name: oldconnectionno - label: reports.ws.connectionno - type: string - source: ws - total: false - - name: ownername - label: reports.ws.connectionno - type: string - source: ws - total: false - - name: propertyid - label: reports.ws.propertyid - type: string - source: ws - total: false - - name: connectiontype - label: reports.ws.propertyid - type: string - source: ws - total: false - - name: billnumber - label: reports.ws.billno - type: string - source: ws - total: false - - name: fromdate - label: reports.ws.fromdate - type: string - source: ws - total: false - - name: todate - label: reports.ws.todate - type: string - source: ws - total: false - searchParams: - - name: fromDate - label: reports.ws.fromBillDate - type: epoch - source: ws - isMandatory: false - searchClause: AND bill.billdate >= $fromDate - - name: toDate - label: reports.ws.toBillDate - type: epoch - source: ws - isMandatory: false - searchClause: AND bill.billdate <= $toDate - - name: mobilenumber - label: reports.ws.mobilenumber - type: string - source: ws - isMandatory: false - searchClause: AND owners.mobilenumber=$mobilenumber - - name: connectionNumber - label: reports.ws.connectionNumber - type: string - source: ws - isMandatory: false - searchClause: AND connectionno=$connectionNumber - - name: oldConnectionNumber - label: reports.ws.oldConnectionNumber - type: string - source: ws - isMandatory: false - searchClause: AND oldconnectionno=$oldConnectionNumber - query: | - -- Use CTE to force query plan, compute & use CTE later - with owners as - ( - select - split_part(string_agg(name,','),',',1) as ownername, - split_part(string_agg(mobilenumber,','),',',1) as mobilenumber, - pt.propertyid as propertyid - from eg_user usr - inner join eg_pt_owner on eg_pt_owner.userid=usr.uuid - inner join eg_pt_property pt on eg_pt_owner.propertyid=pt.id and pt.status='ACTIVE' - where pt.tenantid=$tenantid - group by pt.propertyid - ) - select - connectionno, - oldconnectionno, - pt.propertyid, - ownername, - connectiontype, - bill.billnumber, - to_char((To_timestamp(bill.billdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') as billdate, - to_char((To_timestamp(bd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') fromperiod, - to_char((To_timestamp(bd.toperiod/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') toperiod, - bill.totalamount, - bill.businessservice - from eg_ws_connection wsconnection - inner join eg_pt_property pt on pt.id=wsconnection.property_id and pt.status='ACTIVE' - inner join eg_ws_service on eg_ws_service.connection_id=wsconnection.id - inner join egcl_bill bill on bill.consumercode=wsconnection.connectionno - inner join egcl_billdetial bd on bill.id=bd.billid - inner join owners on owners.propertyid=pt.propertyid - where wsconnection.tenantid=$tenantid and wsconnection.status='Active' and bill.businessservice like 'WS%' - orderby: order by bill.billdate desc - - -- reportName: SearchSewerageChargeReport - summary: Search Sewerage Charge Notice Report - version: 1.0.0 - moduleName: rainmaker-ws - additionalConfig: - print: - pdfPageSize: "A1" - sourceColumns: - - name: connectionno - label: reports.ws.connectionno - type: string - source: ws - total: false - - name: oldconnectionno - label: reports.ws.connectionno - type: string - source: ws - total: false - - name: ownername - label: reports.ws.connectionno - type: string - source: ws - total: false - - name: propertyid - label: reports.ws.propertyid - type: string - source: ws - total: false - - name: billnumber - label: reports.ws.billno - type: string - source: ws - total: false - - name: fromdate - label: reports.ws.fromdate - type: string - source: ws - total: false - - name: todate - label: reports.ws.todate - type: string - source: ws - total: false - searchParams: - - name: fromDate - label: reports.ws.fromBillDate - type: epoch - source: ws - isMandatory: false - searchClause: AND bill.billdate >= $fromDate - - name: toDate - label: reports.ws.toBillDate - type: epoch - source: ws - isMandatory: false - searchClause: AND bill.billdate <= $toDate - - name: mobilenumber - label: reports.ws.mobilenumber - type: string - source: ws - isMandatory: false - searchClause: AND owners.mobilenumber=$mobilenumber - - name: connectionNumber - label: reports.ws.connectionNumber - type: string - source: ws - isMandatory: false - searchClause: AND connectionno=$connectionNumber - - name: oldConnectionNumber - label: reports.ws.oldConnectionNumber - type: string - source: ws - isMandatory: false - searchClause: AND oldconnectionno=$oldConnectionNumber - query: | - -- Use CTE to force query plan, compute & use CTE later - with owners as - ( - select - split_part(string_agg(name,','),',',1) as ownername, - pt.propertyid as propertyid - from eg_user usr - inner join eg_pt_owner on eg_pt_owner.userid=usr.uuid - inner join eg_pt_property pt on eg_pt_owner.propertyid=pt.id and pt.status='ACTIVE' - where pt.tenantid=$tenantid - group by pt.propertyid - ) - select - connectionno, - oldconnectionno, - pt.propertyid, - ownername, - bill.billnumber, - to_char((To_timestamp(bill.billdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') as billdate, - to_char((To_timestamp(bd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') fromperiod, - to_char((To_timestamp(bd.toperiod/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') toperiod, - bill.totalamount, - bill.businessservice - from eg_sw_connection swconnection - inner join eg_pt_property pt on pt.id=swconnection.property_id and pt.status='ACTIVE' - inner join egcl_bill bill on bill.consumercode=swconnection.connectionno - inner join egcl_billdetial bd on bill.id=bd.billid - inner join owners on owners.propertyid=pt.propertyid - where swconnection.tenantid=$tenantid and swconnection.status='Active' and bill.businessservice like 'SW%' - orderby: order by bill.billdate desc diff --git a/configs/reports/report.config b/configs/reports/report.config deleted file mode 100644 index d61eda0e..00000000 --- a/configs/reports/report.config +++ /dev/null @@ -1,7 +0,0 @@ -rainmaker-pgr=file:///work-dir/punjab-rainmaker-customization/configs/reports/configs/pgr-reports.yml -rainmaker-pt=file:///work-dir/punjab-rainmaker-customization/configs/reports/configs/pt-reports.yml -rainmaker-tl=file:///work-dir/punjab-rainmaker-customization/configs/reports/configs/tl-reports.yml -rainmaker-uc=file:///work-dir/punjab-rainmaker-customization/configs/reports/configs/uc-reports.yml -rainmaker-noc=file:///work-dir/punjab-rainmaker-customization/configs/reports/configs/rainmaker-noc-reports.yml -rainmaker-ws=file:///work-dir/punjab-rainmaker-customization/configs/reports/configs/ws-reports.yml -rainmaker-hrms=file:///work-dir/punjab-rainmaker-customization/configs/reports/configs/hrms-reports.yml diff --git a/configs/upload-templates/collection_receipt_workflow_template.xls b/configs/upload-templates/collection_receipt_workflow_template.xls deleted file mode 100644 index 43d4b9284ccf3323ebc9f705ca7499df284c4242..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9728 zcmeHtg;yQf^7X|bxCM824GzKG9fG^NYjAgWm*DP%AVGsea1X(QyL~q^^M09O^8E$x z^aO1V)UG-$F9imU27m-W0{{RbfB?JyxD5yZ01g2FpaP&l-wD~;I2qeG z=_hEQs zxAOUxQdG{E1{`hyigehLt7;t`3d}63q}3UYcq;UX*HKhxweqbEcLWmq!&7Lv z+O=j_TtWo=<`p2N*31NOEWt2HwM=Mdgr@Hy8Aw*zhFh3l^)9-3=^cn+wq&DOcLT6~LvJx_ByKV%&&stltW)-*npy@q*m!!-7~w52UP$M759CCp}u zJ$3I4gmw%@GG76#wjCi~;5t@h;;OhV;lTai z4uu@d=C2}gZ_AeuRJbQiy1IYh_rj06$Bo{#JNdsqLfi%^1Ft&1J zp#S;*KYIQbbMkMGUJ)-N*UJbOd@TMDGI%|^5{o1#EleHoO1&y1e$+a>#<<8z2ikjRZS=7E_qYv3-_HyBFfs^g%}h(}gOpK`WxmTWl32GfwjwgKP&bVs~95t54^` z8C|H4UUagVgNnqgC^yXGVgqEkm%f?}tfwPc?tSbqz2$=^L;ev2rK`Y<^>32o%C@6z z00~kJ2>>7hBjaYp;A-n&X<%z>`7@7IsJyeyU_|rDX?T9`RxY`%|TkX1b?JW}mo z{=wbR1fqD7Qq#Br2|Z#I>T7CALbY!HJ0f-|A~r~XvW(St$=Nt-cJndG#mvxj6+I0Y z4Mhm0)}{NJH0pp|jy7R`gR%MoIeuq%@_VcQRuKCj2zh z*PoJ3o0eEB_~6Z zxIoO>DZIbE6=mzM7Odfp?!J%JdROOJ<>;nI_J~+_hN%9;f+?CK+Dlj|OM?u49ALKU zhr>j%h0ZW<&7d9d^%7BYUmCqwVM3ISxk~+Y21#l-oo6HAlE>m1XazV4O8V6|!W}7d zBP)?5!Ik&1P;MMp9|=(8x?p<5Uwt+bLC*-2^h3Dz@m6)jyQ0O&wc84RG;cMstKrvO zr)gk~+O2CXq-NLD==;udcPSWfp?>n5E0}IEXLVA!)48`q0%v+(;EvD@@ALL;SE_s?CfWSRn<)#KIS?Q^BkjV~ozs7LF5m!@w1Eq~Y89yFjJG zO85zS4v$QATi$AgKC`Z$EVhCJ7F@ab7wSYRB85=t}GW;eSd!O=Pj$$^{Fi6lGoK+M$U!O*?yRwWyv3t5rSr-^yo>P$-(!3y=E^d<4;I=?K% zjC5}Gbh6sYxDIFmXAyN=M2S(A0Pf%~nZ0=OUeg=8e+xTEqqK$(;lB3wX6a-ed(;fU=Ao<`v4)Mvj`NV%v?J+Bt!T@2} zW6eqS6{&*8;GH&qG@YDC#B5b~0_c{`FOg10WJh$ylG&2tTp4}TCVy8>JkW(%M2od5 z3pK65MNnwv!P1hSh%lc?ZpA0J190m}u+Li$^i~-hWFBB=&0vxy-&)T(mb5wQ#^wCj zl9GfbD~J#t*SsTm0EO5QAjZVF2snw<;%JOh(oo@t+dLen7u!UQ$~j`gysH-o zqP=Z%(7m`SP##GNXfRI{%v+_>IORxCeJ?`fjAj;8^&ZSeq4J>|5@D-dww!vIdcX<| zKE#~I2m>>$(Yftu(ptW{3^6bO#*fh^2W%^Ja%8frH+L8ba?263Gjb~N=`GO=8nON| zMWI4`4M(1DvSgd05RU2c>CpTx9jK?!Xw&vnUGBmf7etcBZqz_9^lolY?~?Q;)552) zP}9B;C2;Sk)NJB;%f3UjxC>~|GS9tj(E=&b{-Uu7Iv=qd90=b zr;(I1RCcLZb>$)EdE3CaJzQ)tM%T8>;tL-QGbpyDYE?UKsohR?TIxoZdx-h*^Hr&4 zn>e;tR(SNwxXp_ky-5LZX};~F+Q`e2cU>Vvw!cMqHwMy2SttOYpYUh7`v=0E%#5v# z8UFbH1KfuiqY*glXk8e0Z{ZwWAKq-mkgcwdTP3WJ8f7KoHZ~n9sIoA}ci^Ccl5t)t zQWh4a2-@-{PVs}mcV5K6kT&cQOj3-_lT>b#W>`sTy1++>J$06pTxa`uoI9OPb*6fV zrNZ{aC+mKcKjY1eoKGd4PWH9rpk(!u6HkmpHiogeg{6IvTFUWpK(-!&9+(Ha6}HMt zCXnDj7N6fYsF3G)0P)m?ZHxI{pUop5DwvB!}=x zlD?iFI^;H(;soI%Dc97>YRU3yw|eUYLxXk|f8Y@ZapP}#PF+)?p!k^Gl0EKV zG&8)OR3#VQhSU(U$$e&SmDcl8pL9Ii>$aF8gbvX3EYbxl)f%`wc+~7_nkoS?WA#re zZkp#hNV195hnK&b&1+XXRvCG{I-#pw--=fj6Ev5r>{}B|0N1uI0$VLW#i!L9l4Vk2 zdN7xZru(jUPU=WUzWKsZURc7RC73>_(ZaQL5#6X~HyU*nE81yo+*x))hHPHXr<1+&kS<=|i{0B^-MZFBYAG8iG9{%S zvoX5QkB=Cux?N8v`={)CGZd#ieO(W?BPm_ar(Bmco6G17AHC1c_7X7Gyf1g;V(=E1 zaPd-4h{9@5sx}Od$s_dr5bjSw-e&bN3iieGBk#JD{umhq)p3< zxDZui{2e|VC9IgEdrGORRwxp$yj>`CdybcRQ@SSX;s;W7KN{7+CAL7+!L_`yCOas(og zIM)CP46m34Zed;_T=_bta>4_AfcgACQwH=XZodg(8{xuQCi#$#9 zjiX^K++61$k`~)Bm7F5`F+H349MvcESw?nRC)J4clJE{CD`*DCR4z01K#b$dEWc7Y zq(IXcU!Nvg*O=Pc`@6lS3`1Tkyu}t?k<{kc&Q$iuibjxGe*?Nr@GWARY7SzTF}}S^ z;vfoI!!*U?^$#y?I~pI``T;%NRov~$h=%d1NPi?j|ezhUy@v)ydDj@oS& zqQoB~5TDxxUA@6OCL^I3OP3VdC|WH*#)xmy-=xwmCz8-@*^|GeU|x)wfYTH*Uip+6 zE`6!&#zLNJSQz3=gPt={c`tkJ785lsYuZ}Tmi_@2BL3EmN-IhzMY4ETllOSFa^}Ei zSJ_n~1(I@M8dG1|1V_OcQ$ZI&5KYH4P-h`cebPyNQhq-rPgB%>`xT=#I=b8T)w)RM zc8I{DK(GmJ;*KGDNkdvkWYw#&G*OQPmJewl@&*hngfUJ^3vKr97S85nog#&FB#}<_ zQH)cJ{umpy+@s0&8vSi)Av4T!tp=?)4lMgoh{%>A#1t)lo7mtt2z=F!GgJT(BgvZEjrkld&-BLWC2!v=U^8A(`S*Jrn!rbm@GP;8`be z^Q~#r-Xrm8Zl&|n5Mb@&!0qWIh>Gb1 zu@%pn-}Gdmj01#{X5A$_HfFpdz`7afa=tLjXmrT-hS%3CEH$vuLc__;u-#ZYi*oRuR#Chi z%=)6~%ujnDnRRnFyxcKs0_Ez*<6-B^QKGmjFKC-WLU}iZGnmMx7qOh65e2>0!AU{) z>_cS*wIVrBmx!(3g`^yyn1|d{9^`_lI`UYfweL)gxULtcpoK7fa0jBLKOy2`UOg~J z|6^;LZZrrvB0^gC3r6F{-R4KF1uy$!WWucb#^GEIYZr?klSW=j@J`u+iNmj4K{}Q1 zj^RC4Y9?`cPC7~85f*1{@3bi5_cWoMqwbv) z2}M>as%lv@x|#My{=!%nT^9bTQau>)%Vzn*W%*27fS&8Seq2y!W0nr*Dh(uq5xRsK zo!ww6jt`A-Gu>aULapHnk}gvU3GFdu!wR)F@b!sC-h#x<@EoS+&eY{aSGTVJn9$cJ z9r=7DYA!SfTG})jm|PlFOfFi<3AtAxw<)fJZS8zS4@lW<`%dO5=_>m@Fxixp-v>)E zF_zIM(bG~Vl$9v>sFi_WY+94XRN;f`urUW@zK;LrfGJ(&jhNh?0JZGJYBM=IAKVLpeW2dm&t}Gb{OW1AOB9|k2{8o`NZa^f9UZUnn)$kz z2fe~2*KZ@E@|kPp)3GKuR912cdI?Tt=}8@)EgY?Qp=)O?zZG$R zG0;p!fsb-558W|XAb4*l1P<^pqRUO=p}v&yj$qwcaJ^;b%9B&zpADaNqF8?1W9;3z z^i(~~3KU~=^Zw>}#1#scGk5GYTks*KTl0FXr~W;|B3AZ>E&B-j`K$~wRJ|Q1EO`no z%=aM&bkc-_Z3~qzy&N4+eArsgj7@Evun^JYurzutX+#Tt4=W4F8MUP z()dKQy>!21l(??xmwhCRi{3 zs=elLI=r+SXs*b&s%=&h-knE8T1p#%l}Rj*7ularJ@=vmZ$25^Lj z%$(#C1amsglo6>NWT~CQbNIJBCz@q+YTaETrQqC+`IXz zC)iSL%DeL%omMAMlBDbYHbC6g%u?OJ89`uxNd64a&mP5JW#^wwi(kd(A1#Z(nC|c% zMl_LYuqPom&xEf*a6(G##4Rd2Uk_Et*k4A2q2r0wpQitq4kjxr88#5Bjt*NJq(J(J+3VA{P#X>N zA(rp^f<%}*sT)~VlRPk zaI7O5hYtS{9zm@>&hj#Yb+F>7sm!Yjie-$&43wD;EpckFyPbLJl)dI*Y&BS-1&69V z<>Y&GDZ`dCRT1a(?%;s%BEE;wiC^1Zzieh zY>h6Y*J@~;wkY9Q&|4oBQtu`Ophw_9rvnm1^)s)}DZ@6nbk?n%K;86{;anrIg-i?c zAs2@jC60`co}!;Vu2`V&?gjI<-tYAQiyopbGwh?bZ^{=Dy!YSs7Y2&zzn&s~tvJP} zcGY@SewI|LcFR>+awc-}1atp|-en$4*>taNt<+{cf1I)x|5^zS`Uzvtjv*U)iF|-h z^xO4qAeWqTUFI9C{P&cEuR=k8GknSaME6@FJi(Tk3IJhX3`~*8z?Pknt)aYwt(_x- zp{;}QUt6*N>(l{57a6ZB*Gq`@c}?a40sffI*f%o1NowYBh>U#9%!|aXISySCFn75m zwN&YnhREkIzA?bbZWK{KT>z#|L6b!iUq}f$N<(zXCU$&a>=i@2llHozg7sS|NXYBY zM>75J+etxc@33lg{3AdmxQAt;T~=|zYqz-NzmRq31+;vqFyO;IdX3Y6Z3XKVU+k*x zXX@`B{7%mbl9-DKf*|($QZgRD9UK|u#HxNg(!;@}Uef)!U`b@AR5Hj=v}FRU;_40ix^Q8A@LQ1}O|UgA4`$ApIS8`gV5zgB=iWe;t|e0=7Vf z8gvYHM*z2i!?_|4=T~7Mu69wQ4-(&GDpPEjS4SFJ5qCHj(=<7=;ISX|&C~5pSYid2 zOZOsn^0R!{c0L*eIF2R8Rg&BMinb3rL_AF6DHA_g^!rUwT`$E9TvQ{6_Yh*>6~a=9 zs*3s6c`Pk@oHbK@%UGLi$HrFJrWWUhD2w}4|LedDrTD#JL-dPlJ83DISs5zZ+vRjlQJX1_nP!{>k10!lQNqvETcl+KpphEfs?I4 z?&E){X^67NYTP%U4Jb;5b@FwyR?EM!MuN_da zqWAL5L&1msR@;z#>p4{Qoy>Uix|2xBuk{9`65c;$L0- zmtJ1>Mt^xZM)+-~^reHB)!i=#Hn0D1@T=B)Y5Gzl|1vei`qT8KVt(o2rHK6HArSjz z41OyqUpjoL$$mKu#`(kH3q|%@h4#|vKQsIdIZQ7*8ng=6NyKNFR&@>_0AV{HZlAAPkvm25P z)(3I>Cn6TAeGnudfjlUJKPdWO!Q?^kp+!*(QD0K=r6{-+r4*X1-*@g^yDq!UMuX6j zvwZV&=FFU#GiT<^-LJo@nw$J^!)3{#N5v}(=~5}l;u|QJX6gYE56a{%q|@mP8^sm6 zjVv(l&Xs%U!zTIx?)fUf1jsLQ^V?`yD^o4f0$mcvFCmt+N(}j^JdfQjp4P)-vQ-t+ zGyA?MMt(7w75z6Yu$Zmbo^5~L-@M1YK)&03krCfNEeZunwpJ z)&q9|cLVnT8-R_#y}%}5Gr&1mZqD-kC_eyf1%fWW&dqPGZl$!`7AQ5bizR;fY|RB; z`Fi(XhDUthn^C{`3A{rxLf>ePMEk7&i}vdrA_jeP8cwU|Ij ziPeORFOtjNkk0*#rnQ<@AT{Ju?el|jcEc~fgnatNv+g1A8~bqo4M{|zlG6&gm56!a{1c}@EZ#7cNE~4=H>h02|6D>#FVD3a~_<;q@UDBU^Mm_#CPR%uRMBX` z{^r4_f6&*m(J199-us{9m1xRw198HfHbO{4viT|_10scqh+!fUnAZ?2ZpeT}5=IjY z+8pn<@z6XF?~6oj_4?nuE3Bp<#Q> zI%q#ta6B3rtqtyeD7ddiwlm}{BG(DySi#Pds^FBSK}@Dm>B`=1S>-yE zPwt#Ov2!-HcY9WOQfl%2){o`!cS0JB1|!oylN-{5vCHHIjrJlhRWZ_w*0KM_%jHg8 zJbVQ>?*`|q!Sry~wM<8WY^9J#@4=q^&6`&*a9#=`PR+o(fdWp=gBp7|H7{y>oj5fg zYBW1*l&RD&7N=&Q2LEx}Jg70GIc;9l=nPKHhZ9gb%)^e0Cxu?@%0qdnfa*4Yzclxd0uXh{?y!)Cd_1ixBp1Wb9fp1W@j{xj> z44{Xc0_YoO0q(>Ez>RntpeK9`(B9JkcmD!FOV0v)-~J5njhh0f;|9R-ugp7dR_Y}2 z{kmLbj^7A`faK&CtEivl424jb55C^><163sc9o0YhC;ugjG|H@`*B>)rHhv)c5Mut zdjs}sxc*)Xc>WyTA@F$5b3h^hurJqKh>zwKxI>|5HGLH2RRkQ2Z;M@jEo7VMEFizMKtrF-!PbAEmNuWJf3f~;(3?>0%abhC{@MS(EXNG~ Hi~hd=G7&-w diff --git a/configs/upload-templates/property-residential.xlsx b/configs/upload-templates/property-residential.xlsx deleted file mode 100644 index 8bbecf5842d7fdfe653c594801a790906aaea20b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 40176 zcmeFYWk6NYwl+*7DWaqz2&i-j2ue31NVlYP3P^VdNJt~0fQZsvA}ydu2!eDeDXnz# z&9xWyIp?1Ho%_Cj?&}Zt-gD16=IHT^vDorAQPIvIVIZAALPENLq;-gG`WP7r=?x|l z(rKgY-W^uN%q)J0Wp-V+V0sH^ozyHM=Xpil<)yRhXc15aM zG?r1b1kay9^Q}+#X_WK^RR1?x&z|2n<5pP1Z;fFpqLuML`mR~*$)kgkg`sCTMph-< zL8jG=O;jr(xVPuZY)eF{`NlU`!~)VEtM>8IHDSx&4hs*L=*&TiFDh#kQ5O5GD9yx} zNi-wiJsF)9UPi6+CIL75aSmCFew`P~&6N}9HZngDOn$(V>3yx}ST(i8g_RVt=;~2m zt8#+Km+Lt-Mr=pch&f4vLCEK%9>FiJDTddyF4^YF)JKn=*9qfo_er@Wi#7BpB+>6Z zyO=yVBT}~2`Lxfso3IFMTZ=8*|OZHWXOzlXw!+fiSA&NX_yw%wKEd4Cv$x;-0qYtU_ShK^fJTdnoQX0pK` zUa!O8IVACsi^4BvSCpa+Hw}@^jF79W&)v9}GAk|Kb$Wt@d*Pg(QdO9r){4?Pvdgj< z4oEdhwAn?bdBUB{$--24+{Z_*o z_(lfAEDi{2T{|O7dsY_c|Nj@v|BEB|7twR0I;BzB2?AGqR|sato>-xuGAk!J<$5~n zB-^DDuL0Rhv=l=r(awE$r_icqRt@%APEXs>Z-`1|%e!}X&7QM96+JhokWE|2`b0JD+3kl#jY7uh z4{eqD`$_9KQZ?9m$IOG=sxTaQ0*ZH>%1f8@wr{nE+)0tkt)CXVptQ(i5r5e|nnxfc zROJ)~-%{~TRa@tZ*xLjqBN3WNwF_}E2Ir;ob+4)Q~B`X{zPBwNH1~xVpQ0e;~GRUC*fxZ8` z|24(PT7di?u;O=s`D|~3cInm0`SmLp_n(w6W5$c^P(7evvavWkkijs+Zm#lQH;C}p z<*$yb9;Fx#@ObuAnh{xn07W!*K3DO+cW2|mC=FY&qEYb&Z1i=h!kgAMBE(dsiBVzRH8kJtD(Jb*;y6PsV%Dgi$ZB z*8a&+f1iua^X;^r0^-=3F5e?lC8YQxj%A|DyRO?Wk6i z-Z94cgK-rrA!{NB$83A(CCZ`f(%LJ%cj;fW)YwKeqs3k$siJ>%R9bx6kSj6hag1Ui z{qy`$?T&;n~7FBSpnCP}_!@`We>W7MY6*2y0i=@_Uj37ML zN&&~zmh3OiHK!FLWwFdEter&yrqS;;XGMjL%%Ams?GZt;^9tW_RA740u^oNJgY_6sF78lC#0~X_@UwpI3*jFZc6N-LP}M-nNqD8Q&-hfb ztLL`pC3|~@Amf|#oCI59J4Y9@8g+;XX^WNzblvhvm3=>(U-h~C^iHvv^#hjN8itG$ zy-g8Tn27sn2{1-gU08NHvU(U%P9VKRj^HN#%|a z5J;CfjUVjv$b#TwChtt4{6e*owW%ZP%UVvKY`!GtOFK{BQDQcHe2%BwJNU-SYVB+c zrIKH&Z$rPZ1pq+=F6Q(2+~BWXoxAeqKeU@r2JQsc4avq(|>Q%HDo^_CkoX@D_H=hnp|i zao17yhrZl8VJa;k?)CPW3Tfy>i(`+ADQ0BS01kK1l3s#wgTa|yd%>N}k+g6o^OA?}$wxb~-d7ef>BK;YW_NGQg_v~2_FPu>FPgmEnnYd2isXMnHNVjs4R_Nsk z^`&yAkdJ-@t=DF+p`j{7$IB|39vvhUp+3AUOZ4R?&iT&mq;K3Le20g`l5ZY7*Jz1; zU{*2oq9MxLrqNK4{pgz~KduZ-+kxSNB%l82wI@b1TXVYOZ%mSF4Kd%?p)%19Ht|jE z*cxhR+|?^eDcg>`NHzG4bJKo1aXD`>{)!i4%tVXbkX3*10UP`C`wBx%7~@N?z4^a= z;xfL$5|+-iYG0p1@%oNq5izE0d$Z^6s;m16XLq#INo?3_PWm4?C-h1OF7s`0pV~e! zb~^ZEpyi$wAKpkcO*THw%w}>URV5{`uM6d7&$p{+C)pMyS{+ZX1@f;x_A!%vOD%L1 zu=qGu;4JA1-YhGfy5(i#voeNE2FR|~+h13j&TE|Uxrmv+7|uDLD!gD`w7+9;@aW}J z6?4n|Q2x~~b$62}y|L^4nTK}@6!M8N^Mv1;Iay{n5#{gfaN}$Ro>SIS@i#8@@G{Uq zB0=NPLJ_T};UPFAw+#|o5b-|X-uZm{@qn2_exF}I)9g2N99P?32c(3q=946&Iym?R z3>vGqPkCP!+{&1YNx{=g#ACm{+oI*>?@9`X<)AzACn(!q zTWgWL=X{!nGn?4;;eJSQVL@A5qJbPqKIc;u3!h1~mBOw?SWJumR+zIIyWM^3CEl`#1b+1Y@BcKtQ3t2HdPBBu$5_`tW%vxI$U&D>>i z269s~Gfgq}no?UdNzR(&^7f)#@*}2<56@ zEfYR3s}~)iA+9zEU)Gf^X=pn#XYj^bFX$GYzCvG}%yY^-f!HJVwClPVYc-9+XDTtt z(`D+HmfA$sd7MnYD38s3G39=RsV#}ma&I@HEnS9n$?nd)yymk~U+w9K51*75xD`5~ zJK8nalTxyOimf~$_c&g2=~BD)=cxzhOPggLOpd-%Cv2=RwHq^1+6l(sx_>@njJ4%XHw^Vj6zeCDT9Bzb2iXPhh3{M4#HHsl~@aKFAO);g*wy+>(}BYXO*1G?PC;hsVZi`>w+?)>uG75Rl( zp00w}gV%1@-yZ74_|kWVZQn|z>qgr4VqhPxW5^ZVX!D2jw6dW@{LccuJY?9H4Sh#w z(@)T;;PC1JyN2shBK@es{SxpNXDKlY+betgE^;x!AlI|tXThSU4U2IH90Wzoial@P zCB!-64YR+qxmyzdl-_Lm<^y*+o?W-iij?I>S`O;+({g0qJh3(uOT><3o=un!1^k^G z?VSr=y7SialK8a_TO+eNKAwHVx=n8HaV_Z(q`<#3plrWQG}Iq{0hpHNuM7yoU_>6| z_yK}*Ba3cZy zBaztaO3CN;_V#UBEdCYm3v;IDWC?Z3PpWa(ORE^hg!>cXtLyRK*2zuo${9)ycE~D} zcuL*Sml!8<#)>`j^&JuO_oVjnW$*YNq_5wSr6bmMVqUeuz?GCKXD3{JvtC~w_%Z6p z_^s_d@|84C9H|W%|H81CnrGU6*?ju31Tkw|EGBmZXY%WwNQQ9qv%Bl^N%Xv4*&^bg zKRMyv*6dX-GpG>a_C|9UcRGV{cA|;5m*2}_T}AQS5{EnJn*Y{W=ULVgA`T>^4L{_6 zRyD3b+G>BIWphq4&VQU_;3)ModHm&&+?z_&7tE;2rB%qsR~|JO2rDs%ux0f{tq;60 zIND3j&pyL(ODx#Io1%V=t+W-yu&2_-lXhX{mQkj%3sRNT)2rWNu)xuIn>vXJ>wS z|F9bO*3#WQCHcdI@XheeB`LY{HGCB*dfZD}`Bw|hukhzRtn>0LzV2RFaWwUTM{+#b z#`c~-KDmU zoE}|PYwKpMrM4xT#+m)ue(tMwMuK0KXZbyM-j;N1B*>Q53>>&_*_jOEv>6_Gt*p9N z=vgM;@}fN2w{lI`{Zu>H=~+`dsPjTCIV}2lGV`WM@y9L7s~f^fy(>;vOL`6;Kk5B^ zFki^eQ{6c5USeNMfAX)-UqJr1%Q@d9U_vrC<4HX7VanhzJYr8iAnpU*seP|9In zI*`)vfG_dM=Io+n(q2cDZiDqH*}AWdGfxjzP4*fWNw#G2Aoi zkaInMsiJf*a2+S{R;ofohELwn=!N9vhwKlFdnSk8fAJD9!>3$2>UsaJ#H9u6WR`7H zqNK7U&r||W3o`y(Qv`M(ABpJgI2~NGuXKK--4hWc1}*cW5gtiLPIYKn1c#6G>e}aq zA`b{(Sacs?uH@sduqfYOP~JsfdU)hqP=06ZFyQ>l@h-kMarIT~Cr3}#cyb$W@j9;U zS{{bye50<=A{oscAg|$1*COqF*Be45xm<>ELa~2qVMud*^l0P@$%@_LttRc_y6DwY z^pw%7SoA4Tt7P;k(W~h6x>2h{^t#cjc=Y2@s}%I((W|KRf-~5;%6r;}H`V5sx62jR zF7|B4UJrL!k@ny=u238mpBUVyEQw{%*?g*-H8n3zpqWL`lp@bMR8t4X^1tyYqB_ZzKh>F%?2}#zA8v<{;Ncm5C6iYh!uJiUQQrcN7IK zOe-l0&`jGa)>2L1RIH_*wot6SFs-FnOEc}J=t(vG_O?%~`NjdOc2?D-;F!hO#@BbW z165V)Ra(*AE=qEu7>YX1J>xZBBS{1{UtiYQ{)m&}^4Xr%{qud+ny;}WwVSWGb+-F( z#$7(UvF?AmPsxECSHB!q?$&SBHhr{$H@+?*poJ10!HTSS-DcjbMW_|WX19t&VDLy!rlXlCBBtMLK zpX5q@WePie*yCy;-xv@1YKQdsi02R8`A?Dyy^iplJUXN}EPd3$Lf4xvBo+0_9mwP}$UlSr3^$_q9|eC&}7mOgt+6mQk(l=?fX$g)S{S%vR^4((_kq zJynZS43V%zm&d}GPF|~VdMEmR#dtM>)**IlqXgxGJ!Qa1@APU!t(BZ(O8@fMv)Kzb z=4TXk64QlI&tZ!$vwUe2-4)=;x`Zwg^|9mGY6PdLx2S$gwf5qb-NWdlq308>`dLZO z`DnOtx7qHDu{(hgSJq2I^?76Z&K7=Df%bUrjwfVUW(@h{aj!I5IqZhLPhRPB86AnW zJ%?+>!MNjUm_?)8>4y;kPG1G5i?b>%q0>o{=Q+Lo$<~T1IcOYYJG2`Wxo^5itm1uY z40Y)rNr=og-l|Nj5-R@Kp_m-$jtVZ<;R45B40=c}aoF{=KU)n&u==LjY`I-Zyksx2 z!(=KgL2{a`()5#jJUeS5FNb1hyY5WAO9wwkIN+?a{wdp?bQAOW1P!0i>hKG?owdlc z?WA)FiLS<~R5U75K+7JeQt|BF99$dixk3_SJrM|#7+O;EbKnOgC&cp6+@#oXMKDgo z-y`4Ij%_$4i?`#t35@ebs+030M+pj9mdN$hjm5JYpKLH4Sws8NTTWQkLUt)uV#UbJP;%RaMQA-QI=nszZ5F9U) zA#U~!wMsX6)6m6H5@qsJ{plu}f87l<1Vs4d?zlhiE=9=n>)p@)yqo#gyAe`nK~mdw z!s;^)U6;AZ&%qcG>Go3%zp;WwrWTn@hB^6Yo|o5ifbV3hfz#B2OBWI$INBZzI9hf2 zRSeZXSuz&?ll=dcEmV{G|4_~N2=P}ve@Y9l{GyQd3xDeDTKb=A4g6EgnTS7)GeG0C zd@BpM^Dq8nFZHJ~e!tz&onS7(mTgR-WiP=+p1A6Jbf%k}2M#SQ5YFWAQ~9WWdd!;l zpFHrT{>gaN?DB~AOJ#-y7lOweWBqHXaF}62@~r*pv?meK@vB0 zTI&8|5HpC(l5XPIX;Zb=zvEfrLSVQKXG;)}i^*h8WLe66Yg8>?JP?T&#N;4<=<*fC ztlU}Qh!1<;gSo^_YRo8IQKQq3>e zBN|yaluzDdxW6=+5#Di;{lV@zg})4N3gIVXKSQbg-(NW#3H_0F9{#0jn9gy=fTH$V z+MkA${LKTesA5K@B}i1wa#fml7gk#gn1@?N^(GItbCGa$bN3<>-2%{sD3SlRwA)$s z_OzL^7fHAjd3%vJZbh*%aG%t&QZ#4-j zgc8%|4RXYv>l1VJ-~K2?qJpU`apQI7ZAr_rOin;EF@!uTect;z{SDGstp|C;u>l$% zZ`&)-bSP8Eb6v!GW_PWqH?5m3B+-J!JUulV)jX3{UwN6XTvM6cSi!zSJZxRrK}bB7 zHndfxSv5quk;yz?UpWv20wXOo?0d5C^^*Y!qjVho}VBnWIRJ zNmEwG%$v}e!dtB_cA*nl5XaWa5CWaL*l;PL0wOiBRHUIFZQauv((JT=Vd92c-;ZeN zynnKi`{u*;Tr1OOBB8~+7IQVE52~q^Jq)E429Jd=I%9~GXl#g^KsUE@W=h1=ucFsm zT`a`t5k4@R&LdV?%xg9EGpEHy-1`MAdnntKWdgY_om0Nh)WAvJpY44vU4L+wEB?`V z99hTBQWdg$@?q{i%_Xgwesf6qdGUAj6n3J8e0b{{KbvtGU?2o;@eAe(k>=(N(#N>L z=taoW4KGhY%RsT#C|$nIs+}qYq8@! zCFDVSs-Zllg++b5bml3cGPGpPh%6zL69Um1JQ3?n1Je>f(7NmsDwT;wBWy|>J1nh7 z*cGfGn(7~X1M7ybld5lQy=vq2;BtmZ!t6-J!tGbB_5KKH0`!oi0a4ld#!3x551Zx@ ze`)X2{>BQGd1$=Ic`W8%+!)_nR`yMy;)Dbtz&3SI5VdMPb6;BT47}?Gv@0`@^o2ZD zqHh-y1Mmfg)LwDCG9nHl24oe2L~-B{x6w;qWj-x8C>6OlfGtu2yaA=aTa|?CqpFO0 zCYk}vvOICud|JRzurN+66*DZ@0E#BN`H2d7cAE<~x>S8%*7xbC<9*etZ8I>WV6tX> z!=mh4Ma4;T%3cd=9Yu3A7o48MiLGaaPotp1`t*NFcm@Mjo&lshb4Fu!Wt2CtNY1#h zNKygPY-F%Vaj;17?ebWheh86LIbe}c$r*%AVUZ#*V3BT#UKGMZh~(P~ixg^+iB5ae^3B)g>05SMVNL$cR?S}nq`S`g8%wzY3)~gTN$Lg0Z+uEf zfQewX!4_s#;@W_2%R4VJWDq37(x1+Ky$dNk{)?U$a&8dAapd)-5I-zj&v^zPH(0nPOjx)t zq8Bqy!uHztRt+T=5mavXlp-vRO%*IGBk4m18TpHdP#^rFTq=BaN^NqGiq45O%CMNo8M(3kb*kddjpp^MbcnGui`MVJ)lxG%YuM z3VD0Tm#H2EKOnGpI;gAEY;{qO5cUSX2f+;l#Ie?!kgxjE!+eCsX2ze?S7@eKG%Q0G zYP3X-S;0CNi66qvB=abf^fdTpEI1cYS3qu~t)w>Lq0$vYbzwI#_^s2z{K1W)I7%cNv!T-RW2%Iat=+V_Ch^ z2+^=%kA5n|D1oO>$1o#Li!~%2K{qgjv)~PCojKzh1!Z5!3!Hm6IKUI4P!M4nFRg&Z zbRXfK!@r}9)Sl;lBdg}0vcbFI&ieN{h!zmT{c)h7O zUZScFFD?cDR^uw~z@WL;1*Y-SK|l(#oJ0-c8?7NKrkiU0idql!Hy`yAr{L#HIyQB0 z<@A_x=ahzPX6W^Rb(%J;?6L zt`V(iidtAX;vIR**aR?7uNjf}rHtV1Gr;A$Rk=!-qWl%+gc(A>ow>wZ6|XWQ%d-=V zB56aVPbz9Cn=|T{WmXbB3s5KKLZ-hJg{FYs=9^bjI5du@Q{9#Z_zRI^G}e&8yqiI^ z#=OYNK3hJaPh2*ldLd3+RtP&u<%6oPQG;rdO0nigJFWW&DohOHMi)4fRDjbL3*~6# zMAoQ)tsx9U(uGU|<|VBuXlVc-ZNj`|#F_&7Cvup*zaO_$%}M~V2GvM)VyH%$GomP} zE1O>e6oNH~4dOe@EAvE{LK3~t5XUCIOA9VHh`SH;)@DUypz#qcy)g5m46#ZnQ3+EM zTZpE04nbR*ah!P6r&2;D9FXd+rv_MXH5F$fbdad_e*1#gTNpYasJdQ~HRQ_yDC=-6 z7}Vxcl>{S&Ky~6C(-92pIB{}}VIgCUApNU3(={qVMhd4RCTMT)R<{1l6+8YFD6huR>dW%`yJT>T3B)Dzj6F# zAsf2luC@`R%Mzfr$je3B2F*+%nuSdM#ul-HSZA1UN?(-$&e+@1h?#KUtOg8>s9hQ# zeSytkj-aJ~y$iN1l<1D>L#4e9C6DyGVKR{#iuDk3AgaBw#z)+Ab)3ALnvN+@hyY}` zN=vM(25f^92gR}1cfD1@#=eXEmEXs*4848}^0fc~EWE1}C~gCOFY)5SQs`z=Ibx1_>hl5wXg1gD_cjf&~Z40OHK!M(n_>b=vxW7z>>Mprh{| z_Ro9=fj_?cLj?$!R5+`F1c;UaK7PjrA3-!AtgPL=`X4It7fDygfThw4KY6INX51~d*>@fE@+-x9IpWj20}7y*x9TN;ssvcX zG6aimDBl-fr*(@e0g$KpyqvJnGLN{f!W@(}vr^tXQ$It69XH1Eq1@FmY%cB`aNP+h z{SxUtIw->;y8jZ*5iKqnUW2(YbMhtQ*krWw%=AH&R6vQz+!_>3vz!2+^VdD*<}dae z2mqz;Q-nNnV+~rYXSX{1zvF~Zasv&{_F^eQF{0xN2~s9hYVlC%`$QI^;+FEDN?Pq# zgH^=z;)Am$7E}mvyxB;v=A`AdGKE}1V5LmuYtZL-qYD9pxihL2NFq>rmw?I#j`wja zfU1uNA(HP^zr*}nbUl0=ooXof0@2l+(h6zCO(h6Tge?Yve&m=0s1O6@aE(Xs$^v@q zU&9G-RHA!>$(! zb|A;F5+}t47$dvA*c4$02yg5VQ)n@RdI=J;ETXbQc=`en9NgW7b0iaepzkr>6|1c@ zrn=7zm;$w($c?eM8GEm_z`FRAzUF68Um}~XMWbiD`JA}iac9n^AAxT679 z;zZyA>2Uy)0pNk^b{s1reL$!8Z=^zb+60t+1gkGmPW;SuDQJM-Qvhf<+-MVoLg%OC zJg}c3@GN3NfKVL>rQB|901&~>-j--}cTG^6AOeV~1*lD+7l+cbDcWx}{vRws&L8%7 z*@tPtxetsxAp8Bgi{1R#>+Wj*5lGN30A9w9fyTW@=p{_#-g2RZqh$cRjGm?g5feB3 z-C(zoCfvR|G9<^ycb>22z)9)X&^ks=aIQQy0HXRG=QnZ)SpE(fXdoc;8|wL0BZzzr zd4q4rA5{~v>yN7WJ1sEqiW7&Iex%|mrXP;+8(-dX?KWz_2S!x++Hd8oUiJZ?sS)5+ zPznd0<8?fVoF8F70 zLgcc4rEt)t{uu?t3F?>*95XBbKE=bA0sq(*TV#Gx2 zr|%Z^0{#C;7u6_1Q1t{2Cy4c9o9HXs%7Nk!t%2zR0H_r{$0jL9dWnd3>pVoo_=n-} zGf(}Wli?TW3G?t9AUpQ&t>gIn#Z7<3{=Y^6w!$z$n*li;ibom$WJHQcp+ zj0na+1Kwjw!ZnU7I}W}gjUAE(C7`)R1v=BoFxntM@#))n7Njw)=eC1MLI9M3@6JNi zYc#i8!2C(T=UiwKL0tB-!W_&YRy8(a?XOVOcba>i-CZYnl3~l11D-b!ujtu8-)7#! z+`ETF$>n9rAP&HXYDl8iHv`Z;mqI8YSLJ8#g~;mIAgjMhpT_adBQA5sbVJj~&PZ6wGX(0S8>zGJrQ}LN59PHbN7DHYn81#POi1uD2Gu z4juFi0Ac|x9W(_JpuvSxKsk01lO_VOfD~a_7D5D`uT1}3{9f)5!vokf;!yomXNHFa zaZn=51S1MCq{aOB6`SB#NC{Akf58fb2!sYE@c_N#9*;M8qc2^V7XheZKr6DB*c*WX ztRM{V#=wZG`8uAT!EvuVhCnJ%{Z<8F2S9T#lb>CG-^{xr;4nBsr9>K5$X#qny$E14 zT{6!t<*50fhREV-PIbkPnF>NJxxY(=Ob?Aj7E1{soj^4hQ7NGLMf?v_IcwfmC;lh$ zzs^LUvhQ-;6awh}=Tu+}n%cl8=Xx3*=9NQ_wct{F1t2KWA4;jNfJ}j+IDnGcs)5sC z99vrffz8T1C`UuxG~+LI#i=OR-KG~J@Dc_z>Q+DOTL_>YVic4?r17hnG`?5O031Cq z0Mp3s^q)5IEqs_FrPT*c4JTD98|$ zfreCIhzcm^B7u3GoNB>$e??GSU|%O`q@S!fJ5HzkO1mR z5yApw8Jq{kOFvwk1bE&b4*jb^0UG;8lm|rZm6r zs=QnXaBU`^=pqr3 zftb@Gsws_AVFi?G^1=8J0`XcvUUD!B?T3cD5Z@u`4Vurb62zIk2*IELk(S;=27>^z zLR$(N$d<6n9)oCwHZV%NT;z`Y73#w^`xZ+l;NHH6;TO%q`5$U`5EPky88RWt^l|vs zK`8Y5sONX>K)~Qwhra@YW4B8df(D);j(d(f8w*_VEJ{b@#{h8(bi8d`(-$R@Ez#+-@g_EiWu9pR=)sTIm(gEDbLP-5dPJ2>>|RK%oIR??--tu*r{$;577e2{8sD_J%ra2u4981u)YxBdsn$Jeq*U z=>Sc_%m2yhy`6P&hFHm1y_UPJ|_EeCOeojw}*HZX{=smnd{ zDH_7D62i;ie0>2N&IztbecA0jqr>*K!v}g>Xe_9|!*A}7r3WtIoOtJXZr1a4z0>xM-j}3 zXS#g3+N0lT7H6oTSp}Wb>Fe;8*-dYuYqxH0 zmTvp{t=;+5hz*^vIsfR~?Z@A~#+37JFOk(veVXtP+aa4**~Hz5@(bAlzf4G08&v89 z$HypRQj~OzI_X)jz2p)7Y<7ox_9=%lA5Jw&2L<1~fZz-#wbV+#amW2Avr{H?e0~e~ zo^Io>0TGVUeg8!UHxb8%hMf=n`qxF~?PZerdv-tNTe#N|$~{e+0XqX&5L7i30Z&!U zae$|%U)M8ux2^gSU$k`^=NFrBK)gPk&Y)Kt?1=#^T`%3=pJZ@5w0+kg9vFO?c&h;V ztwHB4n_DS-u5P<)GtoUcDV^iD$Eyaa$;a;uDCEEQ@_cf*W4!0M_5RM*zkt_ zf3K(U*~t_E-fR0`2S4m)Y6yC`cJsL%)@>%wu1<7p6xFP`RB!Fh%q)F7Jlq&u=$M|{ zIA~id$ywUi?Cm%xS(-lF?9Ev#={VdNX1vLMDD;SAZ=<2%!{LX+>A9V=ZYhSC*F4Px zrz~hJ;I?&( zm8HDy$?eCrJJa8ExB^|uYF_PcOq3RzK6+b_y#H*sv$LSwhFgu>YrnswqhoHTS@&?V zZFxuc{8ISQ;9(&p5?}w3N14mURJwq`wR4!VM*?_FDar@yEAO0Eb~iRFNNmOqUDw{t z><;xcv8>ZMs;Ld<$UMeh^o*)Ie0JC=cdNh(d1RP5r;cUsTEM*AhNz5Sy{>@suCPbH z%_lR5{nG1&vq52AR#Gj{L>#`B7S%TeoA9MB4u}foZ|CQ z{qtD|F;%XW3+AF|n7ofh!yah69eldW$zB!k;J8f-$wmV8WEIQb=^s=c* z5UfoaXQd>0w3kA%a4=rGvsdSKU{<;7;!&k;x!HOme4*`NxMOB+;**|-eU)>3fi80j zarpF6wQm0TnWWXu-ax;N9&>iDelGqI%BjZ2XurUn(aA$=|B&7o_PCYt@lmGyN8FT@ z#NkP!R5{HD?n>MJ6;5&%WJ{loTkoD+>+PgWsjbxz;ETQB`KqdJ*nJseblmM_<@R#p zq#f7MT&?@EZqJ8(i8srKp98#JR%tNzw{0b<8NKwQ$UJJF#hk@7O6M*ZAB~kOe6m^7 zJ8>|5IDGG0wrVMitW<;!`ccBfdkKPo;^&~`gA8b)p*y{x6?oRGEPHe4pwuL7xbsZdyS~sV}wWU;aJFT#6ox~Y%wXJ(O_?k>W1+P3bQT9rpRKFHjwa1lGIm@)Fs&TzERW8VyU(KR zS%339{N}mFBw*pC>ACA@yY<;oi6Oi##>V7uVsv()dH03o>g#O=o4SpT)mrzI)!DJe zQOCJB=Br0#d%IajSKk(Nzx(j{28&-VcZ$(JFxRqU<(o}o+C zw-%mk)J$89C#~g_Xb3!hK8GZEKsB9%8>PcPIV-Y;zOOj&`B6c)#~BHpIZS$8qlkC* zcZas(3X1V=H6l%W_jm-as$g7mH`U=*mP(euFx|2CTRN2c#RvHw?>4E*&T8CT zO-=WSQsQmpig`R3W#c_P5Le39TFJaa5o%|8v-WpI*{+M>lcPHheN~cmS zB}U_hCs*%k#d(-iu;qkR@+Q|Z5ceDj^0z!ZcgIN7rmkVylclPAE$+PKvm9+%hBhUO z_ZXB}b8qP}G4rlb%8YH~8>1 zqWSA&Ol2#suN&XpRypY;bci=7k!=gicnFw(Kw?k!^wVL~*#xAQDmkNTdiY_{WYr$6Kru-L6u@48%T@2ZhnH?t95`d0; z+mLRa1xLQQ4=Xj#d25$lTvwz~Y^GC0pUcsVM6!1t+nPRIeRwYYy576WiIR^&%6B%y zxQto()yle0#5XD>vfi1m4CHC(-HaJz@sUU;FDb}ocguRSc(MMR>((RoUc(gjCm$_4 z`OBxksowbf>{y9<+=P#tw0ebG&RM6j-mFVZLpO0u$qb)G6_r_$RaCj->a?noC*@66 z{A}u=i=(s-dFZ6CFGp7&1Su=IqC(`7?c8jnn7>?X%^$cP@rXQ)j#s4RCkWFL%%Mj81UzDnna4j<*Vctt;1I?HX2O+J?ZXWihl zL0g6^{5rpF>D(k9{gjT-!}G24Ko3*&RVh&|8U9fOMm7S(YW`H?+rNn2`Af#4zhoTH{U4(9tFGQD zC5u&OFrMclnXHjSs9y3;^_CQoyhQbE)2|z`=xE05Ct#(*PKOqAYUSFuKb_{W^PkGR z^_Ma)|0VzFzvO@Lm;Ar61NfFe@csGAG2embYL5B-_!r;vfAPKX7vHXb@?BnFftzx2 zb893$`N_=|U?zj)93i}&AH0=$bOc+Xir=KXE&ci#VsC;OSdc>gOPi-#x+5JpmLSAf=<&p7V+PFuy}STW6$Dh}Q^BeC^{(N*uTX~j zPgyp-=zh9I-vv&Y=+&qQYx^uMoVYrnI@dK!WC~7k6pj_8=7S5-&a&s-`=X6g3Qm!! z+uW8{0~h*+Ijdb?pF!6Ir*Lz(STn(e6!nQQ{>7R)Qj~YC9b)M&`PdQC(fLFX)}Dza zuw$bPmDhWc6I+OOm+gbhZQmS57pzJAzUOCUJdhc8oc&Q2Zs*ne`aLk#)7JK(a4KZU z*1OKc6YozEPl|n)EsLWtKfnGVuR4i38wK&X(23J@g2J4r3yHf#& zb25SVE!a+I4}@J0>WRFLii3ake09XDQUvLUn!>XVCvf`p2L!Z;u6xvVp$jsN9-Mppelj(I-R;uF6@SN z^&ZKosI!D(+?mFDpINBWxlLIc0+y*oyhVM{Fne*Ccu4(upe4Y|IYP8+@Giq^$GaYj z`trfM#ID1;6e$RsuEV=%d5?F!6!pCa??U5)cU?J8=+6gsH8fDoLQG8Q5o|!8V)GNEFIK?Hsn-{P0az^3-`Bt98gLd8n^z=z z(fFE+)KF|ug5tHWpRkPoW_KdqHBwq}+Mr8~c<-ws0CIh9SO4n#eHwe&mz98Q;_4T^*h zNBM6OLITQA3n#(?qFjUpOd!M(xrh)jf)Nt%6^5Vb1GGUxn3OZt(#3%;E>c<<+Mswq z3b36n1L+^QlPR@uH%#mGC771WX)Kh>Fs*B_vVxvSMerh&<@W_^34K6*Tg-PIt4kVJ z;I^MI68gtj+I?Hh1v|=1yrll}v{Fyy^O7~Pa^y~32oiyO6(2+64AyHpn55(}$#lB9 z?)OJ8@J~GNy3SGZmG-SOi};R8gpc>W_Qt0jji49MG6<7fPir_!E@1k32cuyT0delK zoydZU~%-`P9NX_Ysz-W`u>wBEm9Ygm1nL-+ZD#DnbVq1_=ie#$VhQ z7pIH7*IYfQ$oti*mf{Y%fFTG(D`56i9|{76O?{L(ptVvJ(=}G5wlwfQcgf zgujUUe#AjU8=5XmteBP1Ul%5JbWF@Ak_uH65h3iPP=rv0qTL`(<;w0YBnUuunC3PO z<5hno%s$vaML;7=9e_}X2z%)xV-Q{uA(2$1@ZmvHm<{Jpv>j4}OhGNMOzDQS1+iQU z$?Vmtc~{Y;TDz`8ZtQPFE7d07(ar>{t``7noCEy848FjQ1J?KlGOS__gvJR{V2w+4 zNfA7SHGT#U7BfP^mlh9BDrTmv^#K!{gi~hTeVM9_BIy_(W5@G(mi4rwnhi1i)Wgs! z$zkUDx^xl;fsS5D_&URfX)R$LiCiU2w}f?MDvD5eL|G)2B_t+DloiJ=HzE~L39~V9 z%*LvO?-!U-x(!STg@=&#E=;#pL`rWOD(uc-ZC-lg! zToYpCSQuM-rP@*d>eZE!8i~SFm~9d7kTrcA1jiW)#~O}nwrwG9!nsr;buYXZi3u8N zYI>3>;_ccfZ`QdM#xaM(^!jXlHk?kWa1w-OM%T$-nKm*_d zVXZ;|6={T9O(vYX7W1ws=R6Oop`GcI1d#9N@*XufUy{T(vIAHU6dM7HNlmwo_Fa=x zWe?+ozmNldfL1f1+AibT(GKo<6wJPp+cs-+8`uT7({5Fee1EnC2PjZ2Q!NqifVTp? zkus{F_m+Yw=3S)6p#*eKN|{0*6oi)o`#!WoNgP(avGIYnSSBMRnKlFD86(;40CRN? z(Q!aw@b0MtTgi75S}5n30K=r_tAy#%d>8GLURv*44M<*Jyisv~nTNpV;PeDE1}ccQ z*e_hc+pYoO4H3M9;&v$zB!#J2*sU!9SP|o}AYP`HrhrhxPuam+C{+O50rP#Vd_<*2 zumb1ncTm{A3OVun64F`VKu~}@)5OC`I0vZw>kn?@33IZCKI!*SSU)bn~ zdip27pq~CCHU=$z_?v~}K8peHioN|X#x8885uh2!3n%-(I}otNPHvb*UQQ>70?`Fi zGXEdq_5s`k+yjA|jx_*b9pJCXSAjt-?X{ z02~&m5`Y(2;gAo28;`RhtX_;CngfsnVP%kDFG+&rfymDP5$ivl7*;=`!2O^d-?>cJ zrni6NAsn-6sj*x*oz%gqDefSRY<9Q*BbWJGJ^%WS|4jA&7VRI=hXH|eU{?sk{?IeT zFkEE+Ln8tt1Pu0HIRF1o2Z3orsQCAA`Q2XsM3?`TxZZe1P?kW-Q^*Ur4}!-+g$4pU zKYZaop$#FEe>0}xc=-3lEeL!9%93O6rZ^SAhYaey*(vlw+BxJ666Y-YE;{4tyP0H< zmG*#k9jcIvUrK^XSdj0`mjr=oZ@D6aQQnW6>%>N}QVI3loF%6)lY~KGF(O;HHqxu{ z11&nm!L@;0fDZ&pYH;{FCwi^X&f0^Vzkv_czIBg64Z7$%YW%k`YB)e)P7(j8Q{uOi zF$WcsrUqju32I<~df$tin**}`F4F`=s}^^}KG2A4+XSG2wt8Mt#Bc!u8yt`U+AUX9 zG5U^I^=R;~f}jU8gP)7|dZG#E5L^GS)mxCZ5sA55E9tfKrMI9Sf#P@W6_oKncNo7; zK46Q9V`SG(1#((3ZheDT&Pi>^X-jdb`{B#$cP~RE^7C^Ce{MwqjULG35TbdJ;&6j3 zS{51ToCfzjUi$l74S;uQj5`oj`3~5Y8k?}B-2xh^9RQX9n0Pn!GBII4%&&K~C#ior zyry^hkSXes0>*s!{^(#h1znVpEfP62 zA?|voz(#u1u!6R>qorKkM?8XbXV`0 zt2u5|O=RG5))wbDNg!UUxEU^YM!GoJfBhix)^bf}S}(PWeYkp!hm`JK`_&aXd<<-g zl8!20KOgAp^W*T>cT6y|#~vgVK5XZ;1>cy^%#4;c2t6%1wKg^Yb_@o&WLU7tn;Io; z5xn6B{IUNI;-eD>{87>X z{+0y(SfPjbID3eRxa-n5zB0e4AfRUQ1zw5sfH$q!Nc3uYcaa^?p6Eiqmw;vJ1B`4Hugp7mz!-=bEaE^ytJ9ebeFxNHxrd>KkQA< zf1W(xtGQ8da(yLjhWoN4!z_2fNv6Id)R~p;F{il+H&NH1^l6Vlp81U7>4OO`frS3K ziR%>SpHMt9Y007I7l=8E*uH(VN4>4r-EX5a9@ks=s?Ke{@^DY5Lc@!$YHWUDd35@4 zzRJn$DAls$)ovD3m|(ja<#MZem2UOQGIlJ@Lqx7QcedU9qKo~68hU+3xO;jp@~;bJdfF;-iXs9kZSVQtPo zBACzGnwR(IgMa>!(cHL&>AjAer0K?n)q}mNq~?ZQGnLdT{^ieysrxTN*ZkI?$NzT* zrHw#eN>S*(et0(aq~P=(lV^>_y~&i&@UfM~EvJPm6i1^qPJsv2DTljvza4heO?e&I zmNDHlSlb!TCrR2FJ=oU@_brI>12I-XUlJ4$K>F(~7 z?hX-)QW z|IDL9>HIXS4DVvgE2(phBb6NFh_d#zXX?-=+2&RrnRftx`=EN;=X`3R;;SUn9jjK$ z5dxG?JpNi=#RzTN?ODlrGLL8~?R@*z=viOI=g*JD_c!ZgH>_HooEPzqcY~|5axZeX z3Ty9bIGu4lHOjq@U(nb*{&AoCkDXjp-GF`W+W=Qlf9@&kV5(wlB71(C_eJ%%isq|D10a^MF4mo=<%+h1&yxxz zG+M4MNp%xZpOomiH1P2JyhlU4M=z5J8bA76a@4IHuuY6}q1KW1p2_M_PmgS44UW|r z%S*hF1|yXM8=d2{J=)kTkf9uZGzM&boE{lcSM=!44E8pZ$`RX(d_9915?-3Skf0wKy)9+7=F_ofdH zww^aS)l*~emp4B8+KANXD#ZL)TCsYy#mrQrR>ORjOoP`NM{m6v@4DJebKihys^z^E zwvRv0UOm8hX^+f&`8W{G#^?8{p5k6XSGic)edjQEnK_uPka9*R%pp$cm3<8I>@!2n zS+1xu61(RVRJmmkW)J#U?|8F^MJGc6^LD~7?37F2DxARETgzkPP>5~f*ml1{XA)C{ z?~QqH+wZXAN`PSTJ}_3I7_^2(4>vE85XG8l%rbwj{&VRP6q|mmKs55YszUif%UCBC zC8$5uWoo6z%03UX8PeK>u+hFwq0~mn@>@P}(LHh)$PU0xDl;M}Y|yjHmpWu_IXj(p zU$&Wgy!uQ;ZrV<`_=~Q}c2Y7~92V3K*(mmePac?JrJh~M@0&WI<7>ns9fK76ooMj2 znGG*0g5@&HXqamalspryyET&;dQ~CFAf?cgjt^ zL$`uz(COWwr^*|YxU&3FxC2Odi`g*O- z6lG?u@@=qfSLP4VXH?oFE5_$%3t!VC`dyLOeVE^|3W=`djEA|S%ilBNj(T@*y#BhZ zjI(?zavMN*MPkd9J`~h7#f25^xgyzX*FMz(H86P6IT7p{_TK8nVBaV!CUyIGr;FKT z6>PK52`lE|d?;l(hTTRpt+3};$I~a5Cmp~u{qMUXFK{OF2>|xdcMtzRF6CnQxht}k zBDVPZz?0YdPtPT?$Jm zFPu5By&LP=o*aX_#vj^J@hk6A2TWPhW$7?D>zbGHHV=+E}o4 z+7`W!AljSbyN;Gr>E0vV_8HzAv|T<->tAo3U%PW@M9>}bS=mfMt`0ihmeJmunvPzw z+raF5jXb%v&y1EY?;Ll@%(S=ryuBKhzqP8nFk-`RPuG4L-PE@;s?e`l)AwY*_ik0| zK)YjpI2&~RdSR}YD9Xxufe26g$bmm9>TD@BKH~lGC1$=cHE3V9=oh^e~S$PJq7iK)3iMA#z zV7Iy{-)T&LRbL)!Tefj+aac4c-QTNCgSi~u54oKGriVUt62OIthp+6y>$PtKvlHE% z!FTaGP~xN@PIEZ#p;cQn*ISXM&x9rQQmY;Fa4iQ=@YF4hsO$0a^$oGyxI`&49dv zQB7OJw8_AM34An7`N{rzoo)+$PAKFt>cRb$2=GXJg_^_10s5Lzr5j8H7O5lO%dnN{mf&|rb<@QLF4_@t}fFYP>g2;AUW_ws^Y{P6lW z5tRuYw$gnsuV>3>FE-WDLWtx)i$T#Z66pj8(-qR@2D`0{OcQ~#e z1w30Uff2b=HEB+ijl1R%T+u~2%c7bRQ8+sRDR8D;Z*Wi#VNKd;fjyLx=x<Qp<2#AzeyK1!468!aCUm46!fuR9MA`kFf3v<8ZQLb}HOfcwRT&VIy; zgG^rdZ#3bNM%kTT#=`KD+mGZo9i{yi01Wn>XX){UM1NB!+TqG{Kvov|K>pqCSVZm3 zG)PC8?6AMx6P|YNJ0h-x^p|A-8hB&By97YvIS>suzTap7V#bcJ``?ftZ+RpRdz?v= zcG^))cZZ}=s`~s_Yyiq*fR%p%QZ5LroSdf-6<;fCl(r{0d3{3i>})H4lnx<0t)}R> zh23p<;IAx+_-@Moh$aSX%HA(igw{lbN9L4V9$S1z{)UADID{COlMoO}G_XUEfTOa` z^3Tw^{qG^Ne+3pP5FdlxL~-ec^EC%q$zLf6h)ncv=8yyc(t`n*Nd7OBAL-EtoF4Ch zBLqnLe`Kivus5WDz403fp*6CfK3#qPPoJUyqX+<@$O8GaV2L<773O+DL*=*J{Q#W1 z|7+MC=-)g!DO7)_$XhT?h>EG`JoYbBE^c|;k>S$aOyaqzf zTcU6$k8f%nrO$xj%>nQ#e}I2eFFN`s_?e?|k3Yb}I(vN61%@}(rAa81B@K{xrBEeA znJfm5Qe;SkCjCu}RXzn}(2x2 zT&x78g1m5QP1t+-Oh1SKl#&J_M#&IlnNs9%CByOUp=?sr!pvuD-IR4=Tj)irM2T;5 zv%^_UFj&_3z~Q0Dj5lLiApue##EH7OL=mheFIfore_Z$$!$Odz298-oLX2kgk$tcb z8kW+OkF6?4K~DVgU37H)v80 z8IB4VCg9u`&6PT|p8fZRnV@Lve#*JXG%gER){0eaR-(cKQ$>-14g07_g4rWVr8W!l z^7f%-l-+qb{jkVR`TAZ9QDJchLW+cML<62eIQ}Km^PvcFnlR2&D7{E+r7kCXGi+EX zgo*)aka%CJ=e7*0maM>D#uHA<#!7Dp zu}P;o8J13udNX!|QpOplg}gVbiHev4otF(#;}^D$KcKZ*HL?$_^EqmeQ7(a?&BWxAsPdPUYKKW8GrdZOd&#mw=~dEzyp zV|}p+3sY7i@nb`R{$iXyPX0z%xFs0n2G4KK)RG6q3Y1A=J4j7fSR)w44%ccLGqO`z zNyvsRww3T*Wbd}aIO$NfA#-zd4yoR4<&U9}u;1c>DiFF$G+Reg@Kj@Ba=%BWt>xW^Tv@zBx{C}k_b7iUkq^w&$ZGG z%}M|g=0zA3mo3p5AANik-~K zqg|I3D^+!TyY4z}9I>RZfovr-_3J_@6BZ!)4IRs&oQL2w0`UTy0H`|#s zq15Ns{|G;&HB$xt`f}s&2;LB}$~d~_XEmNYuN$1r=Cv8Smm_U5);pRr8-v?!`^Za+pLC;*ORw(STCTn8 zonE(KkMhVq8X=I>y9_$ARu$ACU|fE?PF`@CnA2xXqdsgL?0sUXeQMxoPo0!aS-Caf z(v%WG;9a2Y^P#=>9QRzh<*6z5Y4^H2zP=bAA2_dxe{GY2@6FEb@pyYbe0F|bQ*Q!k zqtou~VEg#!bL0@4da!Wwi3iuM(W_Q%5#HHlC#U3W*tX4q33E9Ad~ZwNgt>JtU0Yj5 zWMk=OX$Z^W1DcmZYjb0ee#u^RbiK<8h8|bO zf-CPQmzp`pI*8;Zx`LY2lNmu1-X%C%oxrul7qdRx9uGr!atnxe`bV{&x1Z7?>2zA1 z{bw$dOAAEFF5wiZw7wX*c`#2xJv`N)UhdGe*!jPfZ47kbwOLz)AIY$X#s6@G@WIQ~ z7{SxqleN{s-$k}DI@$>zKVvTEE&j0fwiUJc^mJzRTqH}iWvb;mnJ$&SiEj`DCjTymZD zVMANXt$aH(#J*{@-n=rgHXBQ>V0CwM^uLu!BwOe|XhPy7yV;wR0Nka09v~}Gip0rO z)i=h=Q_IubvC|gGY+{;@BF8!HY~FHT&(6R6z>w}`F`}dMfd9vFHz%GHvv>#)kO(Xg z5Ww);_qWPAni^Rd{rvf3$n8*FGkie=)tl}cFH|dMn|O6=H@4-R%={rK;X&@Eon>^{ zKoqkG({d#A+c>U^JUKB*9T=|zK?->0v9aXGcYy({4@lfhab+nNY^j6!A75Fh<&L|I zcsh)XzsAsNaiq&1L6TwD6JIFPE^K%q(`zXZr@qk2f|KyRybD}{G^84=e(BZrao$oi zZ&Qe~P=LXquUDsw+(Kl)yOV@LPq^U_9bJdCPc;;h1|+Mj>4{_%91!gcG&7WmnK;C8 z4KjZEwjN#_uM7_1@+4hcwpwJ@SdreaMwq!1Xc=?~=#d30hptNEeVJqz_;@71i{i}H zeHCyZ*A32P+KhIwljK5|G%jN;)Pt@$Y@PXN-@K@6ucqjgUo+mMIC|ciS#wzdqGY*# z8|giUF#U)M64^)pB_jNI;-s#Lo43zA^YF`h^UUs43552!&dTcI+1BVMD!J{Ig--|& zghJzhzk{x57|bRGzMl?4U_FhLDA-|vYXKEbAPL6a4a1-8nlhbF@rx;N0JBa6q);dbq? zTyJkQtHnPcRqt`rrRw8#)p))`x6#ijUc5XTV}=Ms25LF5Hk$G~B1Yetq>y=A zEz6)&XBbL@=i1tfEDd-8R~Qa4s`?I?BD0xp{@FsAm@<{Nn@r9jRYs03Pz>u$vb_`=mXv9n-Frm(@B=Xs z5dxGE6K@ZXBM_^#-bj73r3$vmPCeL^ObQKd~ zNrI5Hr`C7T=qoi!ZzSX6$6i18Mpmyy<4c8K=j=qAY;sko6gd0Gn?=Ehy?#7SIAYY% zvNUnzy;<37!US@AYkEEZ6Q*vU{zBf)1!f*S@!YAVf2j8Wf zY{bbRsZc(jw-IxfietKXNT|Mhil|;-xy4~#I=7uc;B?wb2(syVfJ|%-MjwEO zqZ`~Fy5Mi%g{r@6$2hh+`FbZKcYiz2hZHf&F+#xhtD0s#lLRn;k0$6kjSrsE;ZV5fF-6>NRa&-L@% z)azcX1D7RJ#fz!N>m9M=^Hh&bxR+Q&f{>B=2zAaC&b3Uns@g~~bv6P52Sb22y~miA zViCet5M_xt(^6}oqf763Cl)KC&t!p^AC!LT9C*8>vT)IQhyzlm6tW&Vr07gi`MF$b zq|w-2lfFp%S!I}-GGFXo(q@yBtG%OoQL9KkJhDb(3du*th%vC8sUrNeG?Q{oVF`G5 zM%0q}tjuxKw&*vKNbGs=%;SlEq$73<@cTSzk&)vqM>2XV2+3zS=D~yDblFU7T-f2v z9&0Ni>f00;+}%0Us}hckEFqzviUh?MowrVBrub0u2*WgMA^c7&Ud@22-_*zY=cbDH zPEg>%avy1gM>sme!ep2QUKBCgtj3bM3xVUR%&A{WKec{SdX~ z)YGy78R3g$MC)e7q88uC(KDB0GP17dl6P1(?+OB5;Z>hd8?KTVGQ|yXf7_{9*(W4M z<7b2=m#hq)W)sF2ZGU8x>UqCjfDsY+j5=;okWPRaB0nXFj_t)4&bm*~_b3c_kf2GP z*7>ke{_2#W`sQ^sB^JHU#N~SR5QC-PbwBgbqSYV_$9PMiC=jYfrQILW)luNq=}Mmm z;$+0huXd^uj(f=f%`T}iea>JnEJ_#IYNy{f!J_R$hVwNIqYDSMQ;UJ z=Ml2`rfQu2!MX(;)!EW8Du^&A0vlB6dHH>hM!b-S?(cE*a;c`-et}|? ziF%(R*91+c3W01H5rnu6dfpuz82jX{O-B%c+%JZS?sVM0$Br=VykI30!zf{l+~b)I zS>X@IZwOj>yvXCp(du2lbTXGTp*U1%!EWDO^(cdOAF>)Hsnu<@i*c3=$3>hx&nMJ@Ze2I-qny~GLE95 za=c0)F66=sJBy$;(A5kr3B4r`9JKhVi8Vnk1*2eq?5mS$BNY$rQB<0An?_n9GNGgr znOjwgHS8myGVE1OV{tr$h((zHO`PLQXPlI0ezm`(Uo5E#KU_A3C9^q3x$PQykLW3- zN1)F4CA-ij=z}*Au^RR6?I7a^{o|5jsik~pqc|E>1GKKK+YfPW$Oeh`a=qJBCZNFr zPSKQfDNT+krSIRRkEq*YmFyONa;C7w#%xMroy0VpD;mI~)}aUuPbAGc+{|Pc1Y^~H zNw)G<&e@UB6vTmK!I)pbN;JPz*>RTCx1>@WoM=%S$`wanFX4cXwe3vzEJ9U+xbM{E z#hnuFqrU_V8dOJ+j2}_ghOfu#plV!hnRf9ZtCV6a(c&5##J;ke}kq(E>>vO8?lqoLtx~h_k;BzmB z?5j+4us@Vf_FgZ?D^$o^*_fVND6M*(jvScP2vydTncEL2OFV^sVU}BsK9*aS_jid* zsBU*`57$=oXt~qbE8zY%js76fQv#c@Ff~Wzwq&)Wf0DBtO_8GdMRwRXC;z2b<5mEu zG4eb?K4Z`v96cQS`>QbLjUGUvi0%7xPz=3trz z$e$QA6a5J;Dq?IZCqqpA;gEabL_6Zbc7`+XD1DyFd$Yz$cM96#UX!B2A|$r+4yKeW zB{B)R0(vB!zNl@HugLIj@9gfgo=$h`HMuPoE!c4n>u!&)v$igT67@s9%M z!7C;vEqGrh%#IM`oqmbj>D*q;_{@!977o|;-WAjm*Q0%@_E>Ad{04W>ntdsAX5Wd^ zdeG(QQg8;7w=)$AzS#rMd4bW2)5CEga~6zJ2=lb3b0IOlxms=@1Yj zE!o9~7Skym6!S)iZ(zS&W2MxhfRGsa|i1rT1V?oMew`rJaOj=yf zU3gakAp=7h0hQbWGN}F_U8I?i(d2fwdc7~>B)s;rtfZdj=G4y888uf7{#EgIgz06j zR<-y|W~c4mH%sAL_lt>l{OrM0J6nLz|H0ewgT%QA08eNC=idI&cl^uS7MB6L8N}<1=rGZEtvRg(lu_RvIfUjqw5$CglMyW*pjcsV?+?zVd-=zoRRULzpxr&T3 zKfkDfpk~p=n$y=(7<4!YEjXp3ST&l1yXKw`I1=9LBbRRsB~~Szh#qi!okZ~(Be(-w z%=EvKyGhY}D;%9g=8`Iqjqzqu^6H{y%~vopFfL|`@KSlqz)kHn*ARZ#qv*#+=JS_> z*{x$ub0OC99EbAiGxO=;;bHt!Z+O5+W7oY^XShm)FUK3yxw(XHms-D3aAv)!LK z6GQ=C{r<9WqCe&Fzh!VloU{cfKim&@>K$`fQ{>Se!}OpB)S=FQkW3qH@;|R4$=Pi` z*)3M9gS3G@-yTSnBAqC!(f98ry%sR;ibdUZDvZ!U|9W>|bV?2`dWtr?S{1`-$WCKp zL)s82hId$UMioo&0d}r?c3Yy#dh8j3U^q|fqbIf)PKbjNjU<%y6;o$Ece1 zrP;)`oo{}}4_4$}fuGKDhk z#$g@3%Zf@1XX{KE)#??sYI`^4ExJD@I4=q7MhPGczJQg7h#*kU3~dbL>}_lv==5xD zzppzY$Od~xo(TfDxUvvo$mK5HMD#T_o@zfkQpawrAmqZg0LL~F= z;nE6+lUQFYyf(-7jC@O@fGo+T5$4yZEhe7-3C0wCg4Wm`pK^6KDCe7-HGFxiTk%*` zi}(ZrvTOux*I_XpY*^NM_SzH8d$)@-b_}2Qa$G8r zWXM8DzA9iuV|OwA;J2kxAR(hw%Otl>$&=+k4xPvaIf*Oqx{YR*PlKh!bgU8qdQQjA z_chVYvjE!hEQwkY3pOI!Em(op}$?Ji=p5Ge_f4#dOZB4_i3#t&D1rf*=HL7$6B zy&*cLNfx`hK?i;Ecjb9?j0v&)Y-berlFs1DljBQm6ieTiUEze^ z93qeIr#^jFWocj~6*(wzigql#@`jHXE`!H( zi=NM%u8U9G8IobiB6sE?+Gc`oekR5NGD!XpkeZcC>9<48CfX!WmC=%tv^wJi-k z-NL*<6`N%UG5{Q|e!$^h+Z&D>?y_N>RnS5W|6?d?vSM-->7r3euR zVcyHw?S*M>J{UL_^08&T_j30;7rKef^J7#f1;zK{0k6~7W#$y%)^~Xt%$e(~Qa{%4 zi1f>z^=;qO`k24jvsML_ixuw(06)goG<0=`4lijuPp#ar0{^=9@*5Qk#cjiLFhf+( zO2T7xw+wEcL<^6NmazP) z;nlvX4d6nsmz|tQEQ%N+TrOQFiXq}t&h^Y#uguWS{wMfuj+w!?!X1&aHkrI3uF?i490mLSx}&~e*MixXj&)LN2d1_ za@c*)d4*Pyy%vEeESSvGCZlvhqNCs|M6P_JVu0F>ZPxgsIM>Zs3XfPvpc&=BIcc(! zTf-V2i?my!AL6xo=0aO(OEI{}T1q4J7`UlSM2*4yn zk-Yd z>&KRpf3#^7o2~|p2?XTA{}~W13II`nZ@$~~JFOo*7GUEdOa8g*4?Sx&TH1Ub6iQf!FenJbpagz$m~IP`^;>eSV+-Pe%a*0FVCt0`Lg> zX~^GWfxx1`J=$NQ>wsnGfOr7)XMw-}=-&c^0(VS*f!ap=0R6o||KE30fuVtWVZWf4 zBmX1lUwtxQXy9(hFKD*tKS2L(!yl9MpY7>iXdoc%F(4qot!rR5|7@)ME}a?woAh5z l7hrMVI_DR_%cTFon1AIcIH0WhUUH&<$N Date: Thu, 21 Dec 2023 12:25:49 +0530 Subject: [PATCH 1215/1242] replace file prod to uat --- build/build-config.yml | 15 + build/maven/Dockerfile | 9 + build/maven/start.sh | 11 + configs/egov-dss-dashboards/.project | 11 + .../dashboard-analytics/ChartApiConfig.json | 5532 ++++++++++ .../MasterDashboardConfig.json | 4683 ++++++++ .../RoleDashboardConfig.json | 562 + .../RoleDashboardMappingsConf.json | 83 + .../TenantCodeNameMappings.json | 561 + .../dashboard-analytics/getchart.json | 43 + .../CollectionDomainConfig.json | 51 + .../dashboard-ingest/DigressionPoints.json | 8 + .../dashboard-ingest/DomainConfig.json | 247 + .../dashboard-ingest/EnhanceDomainConfig.json | 31 + .../TopicContextConfiguration.json | 14 + .../dashboard-ingest/config.properties | 18 + .../enrichment_transaction_v1.json | 49 + .../transform_collection_v1.json | 36 + .../transform_firenoc_v1.json | 10 + .../transform_mcollect_v1.json | 8 + .../dashboard-ingest/transform_pgr_v1.json | 12 + .../transform_pt_enhance_v1.json | 12 + .../dashboard-ingest/transform_pt_v1.json | 13 + .../transform_sw.one_time_fee_v1.json | 17 + .../dashboard-ingest/transform_sw_v1.json | 17 + .../dashboard-ingest/transform_target_v1.json | 20 + .../dashboard-ingest/transform_tl_v1.json | 25 + .../transform_transaction_v1.json | 29 + .../transform_ws.one_time_fee_v1.json | 17 + .../dashboard-ingest/transform_ws_v1.json | 17 + .../validator_transaction_v1.json | 32 + .../egov-indexer/billingservices-indexer.yml | 21 + .../egov-indexer/chatbot-telemetry-v2.yaml | 12 + configs/egov-indexer/chatbot-telemetry.yaml | 12 + configs/egov-indexer/collection-indexer.yml | 165 + .../egov-indexer/covid-chatbot-telemetry.yaml | 12 + configs/egov-indexer/egov-bpa-indexer.yml | 133 + .../egov-indexer/egov-telemetry-indexer.yml | 35 + .../egov-indexer/egov-uploader-indexer.yml | 28 + configs/egov-indexer/error-queue.yml | 27 + .../finance-rolloutadoption-indexer.yml | 31 + .../payment-indexer-migration.yml | 54 + configs/egov-indexer/payment-indexer.yml | 485 + .../property-services-migration-temp.yml | 775 ++ .../property-services-migration.yml | 134 + configs/egov-indexer/property-services.yml | 861 ++ .../rainmaker-bpastakeholder-indexer.yml | 24 + .../rainmaker-firenoc-indexer.yml | 304 + .../egov-indexer/rainmaker-pgr-indexer.yml | 326 + configs/egov-indexer/rainmaker-pt-indexer.yml | 207 + configs/egov-indexer/rainmaker-tl-indexer.yml | 168 + configs/egov-indexer/sewerage-service.yml | 410 + configs/egov-indexer/tradelicense-indexer.yml | 21 + configs/egov-indexer/water-service.yml | 444 + configs/egov-indexer/water-services-meter.yml | 28 + .../egov-indexer/whatsapp-adoption-data.yaml | 12 + .../mdms-masters-config.json | 715 ++ .../egov-persister/apportion-persister.yml | 81 + .../assessment-persister-migration-temp.yml | 226 + .../egov-persister/assessment-persister.yml | 228 + .../billing-services-persist.yml | 274 + configs/egov-persister/chatbot.yml | 77 + .../collection-migration-count.yml | 23 + .../collection-migration-persister.yml | 240 + configs/egov-persister/echallan.yml | 122 + configs/egov-persister/egf-bill.yaml | 338 + .../egov-user-event-persister.yml | 154 + .../egov-workflow-v2-persister.yml | 272 + .../firenoc-calculator-persister.yml | 92 + configs/egov-persister/firenoc_persiter.yaml | 643 ++ .../hrms-employee-persister.yml | 505 + .../egov-persister/indexer-job-persister.yml | 68 + .../migration-batch-count-persister.yml | 25 + .../egov-persister/pdf-filestoreid-update.yml | 30 + configs/egov-persister/pdf-generator.yml | 41 + .../egov-persister/pg-service-persister.yml | 147 + configs/egov-persister/pgr-v3-persister.yml | 211 + configs/egov-persister/pgr.yml | 203 + ...roperty-services-migration-temp-config.yml | 400 + .../property-services-persister.yml | 784 ++ .../property-services-registry.yml | 587 + configs/egov-persister/property-services.yml | 819 ++ .../pt-calculator-v2-persister.yml | 118 + .../egov-persister/pt-drafts-persister.yml | 65 + .../pt-mutation-calculator-persister.yml | 87 + configs/egov-persister/pt-persist.yml | 582 + .../sewerage-bill-scheduler.yml | 33 + configs/egov-persister/sewerage-persist.yml | 455 + .../tl-billing-slab-persister.yml | 81 + .../tl-calculation-persister.yml | 53 + .../egov-persister/tradelicense-persister.yml | 847 ++ configs/egov-persister/tradelicense.yml | 847 ++ configs/egov-persister/uploader-persister.yml | 75 + .../egov-persister/water-bill-scheduler.yml | 33 + configs/egov-persister/water-meter.yml | 37 + configs/egov-persister/water-persist.yml | 473 + .../egov-searcher/PTDemandBasedSearcher.yml | 45 + configs/egov-searcher/bill-genie.yml | 338 + configs/egov-searcher/localitySearcher.yml | 194 + configs/egov-searcher/propertyopensearch.yml | 42 + .../rainmaker-pgr-v2-searcher.yml | 311 + .../rainmaker-pt-customsearch-punjab.yml | 133 + .../egov-searcher/rainmaker-pt-gissearch.yml | 149 + configs/egov-searcher/rainmaker-tl.yml | 26 + .../weekly-impact-emailer-searcher.yml | 133 + .../CollectionReceiptWorkflow.json | 67 + .../egov-uploader/localization-upload.json | 61 + configs/egov-uploader/property-upload.json | 20 + configs/egov-zuul/post-hook.json | 8 + configs/egov-zuul/pre-hook.json | 3 + .../kube-cluster-dashboard.json | 6024 +++++++++++ .../nginx-ingress-dashboard.json | 1463 +++ .../data-config/bill-amendment-note.json | 617 ++ .../data-config/bill-amendment.json | 468 + .../data-config/bpa-revocation.json | 237 + .../data-config/buildingpermit-low.json | 623 ++ .../data-config/buildingpermit.json | 642 ++ .../data-config/consolidated-pdf1.json | 124 + .../data-config/consolidated-pdf2.json | 124 + .../data-config/consolidatedbill.json | 702 ++ .../data-config/consolidatedreceipt.json | 606 ++ .../data-config/consolidatedreceiptold.json | 579 + .../data-config/firenoc-receipt.json | 245 + .../data-config/firenocreceipt.json | 578 + .../data-config/mcollect-bill.json | 674 ++ .../data-config/mcollect-challan.json | 723 ++ .../pdf-service/data-config/misc-receipt.json | 511 + .../data-config/passvehicle-certificate.json | 555 + .../data-config/property-bill.json | 888 ++ .../data-config/property-receipt.json | 977 ++ .../pdf-service/data-config/pt-receipt.json | 273 + .../data-config/ptmutationcertificate.json | 380 + .../sewerage-bill-amendment-note.json | 617 ++ configs/pdf-service/data-config/sw-bill.json | 842 ++ .../data-config/testconsolidatedreceipt.json | 476 + .../testlocalconsolidatedbill.json | 535 + .../testlocalconsolidatedreceipt.json | 457 + .../pdf-service/data-config/tl-receipt.json | 236 + .../data-config/tlapplication.json | 1073 ++ .../data-config/tlcertificate.json | 731 ++ .../data-config/tlrenewalcertificate.json | 729 ++ .../data-config/tradelicense-bill.json | 644 ++ .../data-config/tradelicense-receipt.json | 747 ++ .../data-config/ws-applicationsewerage.json | 1028 ++ .../data-config/ws-applicationwater.json | 1107 ++ configs/pdf-service/data-config/ws-bill.json | 843 ++ .../ws-consolidatedacknowlegment.json | 687 ++ .../ws-consolidatedsewerageconnection.json | 574 + .../data-config/ws-estimationnotice.json | 532 + .../data-config/ws-onetime-receipt.json | 563 + .../data-config/ws-sanctionletter.json | 972 ++ .../format-config/bill-amendment-note.json | 549 + .../format-config/bill-amendment.json | 546 + .../format-config/bpa-revocation.json | 171 + .../format-config/buildingpermit-low.json | 328 + .../format-config/buildingpermit.json | 341 + .../format-config/consolidated-pdf1.json | 561 + .../format-config/consolidated-pdf2.json | 1030 ++ .../format-config/consolidatedbill.json | 1014 ++ .../format-config/consolidatedreceipt.json | 1392 +++ .../format-config/consolidatedreceiptold.json | 1392 +++ .../format-config/firenoc-receipt.json | 472 + .../format-config/firenocreceipt.json | 1369 +++ .../format-config/mcollect-bill.json | 768 ++ .../format-config/mcollect-challan.json | 824 ++ .../format-config/misc-receipt.json | 592 + .../passvehicle-certificate.json | 500 + .../format-config/property-bill.json | 1212 +++ .../format-config/property-receipt.json | 1357 +++ .../pdf-service/format-config/pt-receipt.json | 808 ++ .../format-config/ptmutationcertificate.json | 518 + .../sewerage-bill-amendment-note.json | 521 + .../pdf-service/format-config/sw-bill.json | 1234 +++ .../testconsolidatedreceipt.json | 573 + .../testlocalconsolidatedbill.json | 999 ++ .../testlocalconsolidatedreceipt.json | 579 + .../pdf-service/format-config/tl-receipt.json | 902 ++ .../format-config/tlapplication.json | 1395 +++ .../format-config/tlcertificate.json | 703 ++ .../format-config/tlrenewalcertificate.json | 702 ++ .../format-config/tradelicense-bill.json | 955 ++ .../format-config/tradelicense-receipt.json | 1006 ++ .../format-config/ws-applicationsewerage.json | 1211 +++ .../format-config/ws-applicationwater.json | 1347 +++ .../pdf-service/format-config/ws-bill.json | 1234 +++ .../ws-consolidatedacknowlegment.json | 984 ++ .../ws-consolidatedsewerageconnection.json | 785 ++ .../format-config/ws-estimationnotice.json | 703 ++ .../format-config/ws-onetime-receipt.json | 881 ++ .../format-config/ws-sanctionletter.json | 636 ++ configs/reports/configs/asset-reports.yml | 1522 +++ configs/reports/configs/citizen-reports.yml | 49 + configs/reports/configs/common-reports.yml | 68 + configs/reports/configs/e-pass-reports.yml | 96 + configs/reports/configs/finance-reports.yml | 177 + configs/reports/configs/hrms-reports.yml | 85 + configs/reports/configs/inventoryReport.yml | 1090 ++ configs/reports/configs/lcms-reports.yml | 891 ++ configs/reports/configs/pgr-reports.yml | 2683 +++++ configs/reports/configs/pt-reports.yml | 9541 +++++++++++++++++ .../configs/rainmaker-common-reports.yml | 127 + .../reports/configs/rainmaker-noc-reports.yml | 831 ++ .../reports/configs/rainmaker-pgr-reports.yml | 727 ++ .../reports/configs/rainmaker-pt-reports.yml | 1093 ++ .../reports/configs/rainmaker-tl-reports.yml | 781 ++ configs/reports/configs/swm-reports.yml | 135 + configs/reports/configs/tl-reports.yml | 2990 ++++++ configs/reports/configs/uc-reports.yml | 2404 +++++ configs/reports/configs/works-reports.yml | 565 + configs/reports/configs/ws-reports.yml | 1845 ++++ configs/reports/report.config | 7 + .../collection_receipt_workflow_template.xls | Bin 0 -> 9728 bytes .../localization_template.xls | Bin 0 -> 6144 bytes .../property-residential.xlsx | Bin 0 -> 40176 bytes 214 files changed, 121750 insertions(+) create mode 100644 build/build-config.yml create mode 100644 build/maven/Dockerfile create mode 100644 build/maven/start.sh create mode 100644 configs/egov-dss-dashboards/.project create mode 100644 configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json create mode 100644 configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json create mode 100644 configs/egov-dss-dashboards/dashboard-analytics/RoleDashboardConfig.json create mode 100644 configs/egov-dss-dashboards/dashboard-analytics/RoleDashboardMappingsConf.json create mode 100644 configs/egov-dss-dashboards/dashboard-analytics/TenantCodeNameMappings.json create mode 100644 configs/egov-dss-dashboards/dashboard-analytics/getchart.json create mode 100644 configs/egov-dss-dashboards/dashboard-ingest/CollectionDomainConfig.json create mode 100644 configs/egov-dss-dashboards/dashboard-ingest/DigressionPoints.json create mode 100644 configs/egov-dss-dashboards/dashboard-ingest/DomainConfig.json create mode 100644 configs/egov-dss-dashboards/dashboard-ingest/EnhanceDomainConfig.json create mode 100644 configs/egov-dss-dashboards/dashboard-ingest/TopicContextConfiguration.json create mode 100644 configs/egov-dss-dashboards/dashboard-ingest/config.properties create mode 100644 configs/egov-dss-dashboards/dashboard-ingest/enrichment_transaction_v1.json create mode 100644 configs/egov-dss-dashboards/dashboard-ingest/transform_collection_v1.json create mode 100644 configs/egov-dss-dashboards/dashboard-ingest/transform_firenoc_v1.json create mode 100644 configs/egov-dss-dashboards/dashboard-ingest/transform_mcollect_v1.json create mode 100644 configs/egov-dss-dashboards/dashboard-ingest/transform_pgr_v1.json create mode 100644 configs/egov-dss-dashboards/dashboard-ingest/transform_pt_enhance_v1.json create mode 100644 configs/egov-dss-dashboards/dashboard-ingest/transform_pt_v1.json create mode 100644 configs/egov-dss-dashboards/dashboard-ingest/transform_sw.one_time_fee_v1.json create mode 100644 configs/egov-dss-dashboards/dashboard-ingest/transform_sw_v1.json create mode 100644 configs/egov-dss-dashboards/dashboard-ingest/transform_target_v1.json create mode 100644 configs/egov-dss-dashboards/dashboard-ingest/transform_tl_v1.json create mode 100644 configs/egov-dss-dashboards/dashboard-ingest/transform_transaction_v1.json create mode 100644 configs/egov-dss-dashboards/dashboard-ingest/transform_ws.one_time_fee_v1.json create mode 100644 configs/egov-dss-dashboards/dashboard-ingest/transform_ws_v1.json create mode 100644 configs/egov-dss-dashboards/dashboard-ingest/validator_transaction_v1.json create mode 100644 configs/egov-indexer/billingservices-indexer.yml create mode 100644 configs/egov-indexer/chatbot-telemetry-v2.yaml create mode 100644 configs/egov-indexer/chatbot-telemetry.yaml create mode 100644 configs/egov-indexer/collection-indexer.yml create mode 100644 configs/egov-indexer/covid-chatbot-telemetry.yaml create mode 100644 configs/egov-indexer/egov-bpa-indexer.yml create mode 100644 configs/egov-indexer/egov-telemetry-indexer.yml create mode 100644 configs/egov-indexer/egov-uploader-indexer.yml create mode 100644 configs/egov-indexer/error-queue.yml create mode 100644 configs/egov-indexer/finance-rolloutadoption-indexer.yml create mode 100644 configs/egov-indexer/payment-indexer-migration.yml create mode 100644 configs/egov-indexer/payment-indexer.yml create mode 100644 configs/egov-indexer/property-services-migration-temp.yml create mode 100644 configs/egov-indexer/property-services-migration.yml create mode 100644 configs/egov-indexer/property-services.yml create mode 100644 configs/egov-indexer/rainmaker-bpastakeholder-indexer.yml create mode 100644 configs/egov-indexer/rainmaker-firenoc-indexer.yml create mode 100644 configs/egov-indexer/rainmaker-pgr-indexer.yml create mode 100644 configs/egov-indexer/rainmaker-pt-indexer.yml create mode 100644 configs/egov-indexer/rainmaker-tl-indexer.yml create mode 100644 configs/egov-indexer/sewerage-service.yml create mode 100644 configs/egov-indexer/tradelicense-indexer.yml create mode 100644 configs/egov-indexer/water-service.yml create mode 100644 configs/egov-indexer/water-services-meter.yml create mode 100644 configs/egov-indexer/whatsapp-adoption-data.yaml create mode 100644 configs/egov-mdms-service/mdms-masters-config.json create mode 100644 configs/egov-persister/apportion-persister.yml create mode 100644 configs/egov-persister/assessment-persister-migration-temp.yml create mode 100644 configs/egov-persister/assessment-persister.yml create mode 100644 configs/egov-persister/billing-services-persist.yml create mode 100644 configs/egov-persister/chatbot.yml create mode 100644 configs/egov-persister/collection-migration-count.yml create mode 100644 configs/egov-persister/collection-migration-persister.yml create mode 100644 configs/egov-persister/echallan.yml create mode 100644 configs/egov-persister/egf-bill.yaml create mode 100644 configs/egov-persister/egov-user-event-persister.yml create mode 100644 configs/egov-persister/egov-workflow-v2-persister.yml create mode 100644 configs/egov-persister/firenoc-calculator-persister.yml create mode 100644 configs/egov-persister/firenoc_persiter.yaml create mode 100644 configs/egov-persister/hrms-employee-persister.yml create mode 100644 configs/egov-persister/indexer-job-persister.yml create mode 100644 configs/egov-persister/migration-batch-count-persister.yml create mode 100644 configs/egov-persister/pdf-filestoreid-update.yml create mode 100644 configs/egov-persister/pdf-generator.yml create mode 100644 configs/egov-persister/pg-service-persister.yml create mode 100644 configs/egov-persister/pgr-v3-persister.yml create mode 100644 configs/egov-persister/pgr.yml create mode 100644 configs/egov-persister/property-services-migration-temp-config.yml create mode 100644 configs/egov-persister/property-services-persister.yml create mode 100644 configs/egov-persister/property-services-registry.yml create mode 100644 configs/egov-persister/property-services.yml create mode 100644 configs/egov-persister/pt-calculator-v2-persister.yml create mode 100644 configs/egov-persister/pt-drafts-persister.yml create mode 100644 configs/egov-persister/pt-mutation-calculator-persister.yml create mode 100644 configs/egov-persister/pt-persist.yml create mode 100644 configs/egov-persister/sewerage-bill-scheduler.yml create mode 100644 configs/egov-persister/sewerage-persist.yml create mode 100644 configs/egov-persister/tl-billing-slab-persister.yml create mode 100644 configs/egov-persister/tl-calculation-persister.yml create mode 100644 configs/egov-persister/tradelicense-persister.yml create mode 100644 configs/egov-persister/tradelicense.yml create mode 100644 configs/egov-persister/uploader-persister.yml create mode 100644 configs/egov-persister/water-bill-scheduler.yml create mode 100644 configs/egov-persister/water-meter.yml create mode 100644 configs/egov-persister/water-persist.yml create mode 100644 configs/egov-searcher/PTDemandBasedSearcher.yml create mode 100644 configs/egov-searcher/bill-genie.yml create mode 100644 configs/egov-searcher/localitySearcher.yml create mode 100644 configs/egov-searcher/propertyopensearch.yml create mode 100644 configs/egov-searcher/rainmaker-pgr-v2-searcher.yml create mode 100644 configs/egov-searcher/rainmaker-pt-customsearch-punjab.yml create mode 100644 configs/egov-searcher/rainmaker-pt-gissearch.yml create mode 100644 configs/egov-searcher/rainmaker-tl.yml create mode 100644 configs/egov-searcher/weekly-impact-emailer-searcher.yml create mode 100644 configs/egov-uploader/CollectionReceiptWorkflow.json create mode 100644 configs/egov-uploader/localization-upload.json create mode 100644 configs/egov-uploader/property-upload.json create mode 100644 configs/egov-zuul/post-hook.json create mode 100644 configs/egov-zuul/pre-hook.json create mode 100644 configs/monitoring-dashboards/kube-cluster-dashboard.json create mode 100644 configs/monitoring-dashboards/nginx-ingress-dashboard.json create mode 100644 configs/pdf-service/data-config/bill-amendment-note.json create mode 100644 configs/pdf-service/data-config/bill-amendment.json create mode 100644 configs/pdf-service/data-config/bpa-revocation.json create mode 100644 configs/pdf-service/data-config/buildingpermit-low.json create mode 100644 configs/pdf-service/data-config/buildingpermit.json create mode 100644 configs/pdf-service/data-config/consolidated-pdf1.json create mode 100644 configs/pdf-service/data-config/consolidated-pdf2.json create mode 100644 configs/pdf-service/data-config/consolidatedbill.json create mode 100644 configs/pdf-service/data-config/consolidatedreceipt.json create mode 100644 configs/pdf-service/data-config/consolidatedreceiptold.json create mode 100644 configs/pdf-service/data-config/firenoc-receipt.json create mode 100644 configs/pdf-service/data-config/firenocreceipt.json create mode 100644 configs/pdf-service/data-config/mcollect-bill.json create mode 100644 configs/pdf-service/data-config/mcollect-challan.json create mode 100644 configs/pdf-service/data-config/misc-receipt.json create mode 100644 configs/pdf-service/data-config/passvehicle-certificate.json create mode 100644 configs/pdf-service/data-config/property-bill.json create mode 100644 configs/pdf-service/data-config/property-receipt.json create mode 100644 configs/pdf-service/data-config/pt-receipt.json create mode 100644 configs/pdf-service/data-config/ptmutationcertificate.json create mode 100644 configs/pdf-service/data-config/sewerage-bill-amendment-note.json create mode 100644 configs/pdf-service/data-config/sw-bill.json create mode 100644 configs/pdf-service/data-config/testconsolidatedreceipt.json create mode 100644 configs/pdf-service/data-config/testlocalconsolidatedbill.json create mode 100644 configs/pdf-service/data-config/testlocalconsolidatedreceipt.json create mode 100644 configs/pdf-service/data-config/tl-receipt.json create mode 100644 configs/pdf-service/data-config/tlapplication.json create mode 100644 configs/pdf-service/data-config/tlcertificate.json create mode 100644 configs/pdf-service/data-config/tlrenewalcertificate.json create mode 100644 configs/pdf-service/data-config/tradelicense-bill.json create mode 100644 configs/pdf-service/data-config/tradelicense-receipt.json create mode 100644 configs/pdf-service/data-config/ws-applicationsewerage.json create mode 100644 configs/pdf-service/data-config/ws-applicationwater.json create mode 100644 configs/pdf-service/data-config/ws-bill.json create mode 100644 configs/pdf-service/data-config/ws-consolidatedacknowlegment.json create mode 100644 configs/pdf-service/data-config/ws-consolidatedsewerageconnection.json create mode 100644 configs/pdf-service/data-config/ws-estimationnotice.json create mode 100644 configs/pdf-service/data-config/ws-onetime-receipt.json create mode 100644 configs/pdf-service/data-config/ws-sanctionletter.json create mode 100644 configs/pdf-service/format-config/bill-amendment-note.json create mode 100644 configs/pdf-service/format-config/bill-amendment.json create mode 100644 configs/pdf-service/format-config/bpa-revocation.json create mode 100644 configs/pdf-service/format-config/buildingpermit-low.json create mode 100644 configs/pdf-service/format-config/buildingpermit.json create mode 100644 configs/pdf-service/format-config/consolidated-pdf1.json create mode 100644 configs/pdf-service/format-config/consolidated-pdf2.json create mode 100644 configs/pdf-service/format-config/consolidatedbill.json create mode 100644 configs/pdf-service/format-config/consolidatedreceipt.json create mode 100644 configs/pdf-service/format-config/consolidatedreceiptold.json create mode 100644 configs/pdf-service/format-config/firenoc-receipt.json create mode 100644 configs/pdf-service/format-config/firenocreceipt.json create mode 100644 configs/pdf-service/format-config/mcollect-bill.json create mode 100644 configs/pdf-service/format-config/mcollect-challan.json create mode 100644 configs/pdf-service/format-config/misc-receipt.json create mode 100644 configs/pdf-service/format-config/passvehicle-certificate.json create mode 100644 configs/pdf-service/format-config/property-bill.json create mode 100644 configs/pdf-service/format-config/property-receipt.json create mode 100644 configs/pdf-service/format-config/pt-receipt.json create mode 100644 configs/pdf-service/format-config/ptmutationcertificate.json create mode 100644 configs/pdf-service/format-config/sewerage-bill-amendment-note.json create mode 100644 configs/pdf-service/format-config/sw-bill.json create mode 100644 configs/pdf-service/format-config/testconsolidatedreceipt.json create mode 100644 configs/pdf-service/format-config/testlocalconsolidatedbill.json create mode 100644 configs/pdf-service/format-config/testlocalconsolidatedreceipt.json create mode 100644 configs/pdf-service/format-config/tl-receipt.json create mode 100644 configs/pdf-service/format-config/tlapplication.json create mode 100644 configs/pdf-service/format-config/tlcertificate.json create mode 100644 configs/pdf-service/format-config/tlrenewalcertificate.json create mode 100644 configs/pdf-service/format-config/tradelicense-bill.json create mode 100644 configs/pdf-service/format-config/tradelicense-receipt.json create mode 100644 configs/pdf-service/format-config/ws-applicationsewerage.json create mode 100644 configs/pdf-service/format-config/ws-applicationwater.json create mode 100644 configs/pdf-service/format-config/ws-bill.json create mode 100644 configs/pdf-service/format-config/ws-consolidatedacknowlegment.json create mode 100644 configs/pdf-service/format-config/ws-consolidatedsewerageconnection.json create mode 100644 configs/pdf-service/format-config/ws-estimationnotice.json create mode 100644 configs/pdf-service/format-config/ws-onetime-receipt.json create mode 100644 configs/pdf-service/format-config/ws-sanctionletter.json create mode 100644 configs/reports/configs/asset-reports.yml create mode 100644 configs/reports/configs/citizen-reports.yml create mode 100644 configs/reports/configs/common-reports.yml create mode 100644 configs/reports/configs/e-pass-reports.yml create mode 100644 configs/reports/configs/finance-reports.yml create mode 100644 configs/reports/configs/hrms-reports.yml create mode 100644 configs/reports/configs/inventoryReport.yml create mode 100644 configs/reports/configs/lcms-reports.yml create mode 100644 configs/reports/configs/pgr-reports.yml create mode 100644 configs/reports/configs/pt-reports.yml create mode 100644 configs/reports/configs/rainmaker-common-reports.yml create mode 100644 configs/reports/configs/rainmaker-noc-reports.yml create mode 100644 configs/reports/configs/rainmaker-pgr-reports.yml create mode 100644 configs/reports/configs/rainmaker-pt-reports.yml create mode 100644 configs/reports/configs/rainmaker-tl-reports.yml create mode 100644 configs/reports/configs/swm-reports.yml create mode 100644 configs/reports/configs/tl-reports.yml create mode 100644 configs/reports/configs/uc-reports.yml create mode 100644 configs/reports/configs/works-reports.yml create mode 100644 configs/reports/configs/ws-reports.yml create mode 100644 configs/reports/report.config create mode 100644 configs/upload-templates/collection_receipt_workflow_template.xls create mode 100644 configs/upload-templates/localization_template.xls create mode 100644 configs/upload-templates/property-residential.xlsx diff --git a/build/build-config.yml b/build/build-config.yml new file mode 100644 index 00000000..08a376d4 --- /dev/null +++ b/build/build-config.yml @@ -0,0 +1,15 @@ +# +# config: +# - name: < Name of the job, foo/bar would create job named bar inside folder foo > +# build: +# - work-dir: < Working directory of the app to be built > +# dockerfile: < Path to the dockerfile, optional, assumes dockerfile in working directory if not provided > +# image-name: < Docker image name > +# - +# - +config: + - name: "builds/punjab-rainmaker-customization/rainmaker-custom-service" + build: + - work-dir: "rainmaker-custom-service" + image-name: "rainmaker-custom-service" + dockerfile: "rainmaker-custom-service/Dockerfile" diff --git a/build/maven/Dockerfile b/build/maven/Dockerfile new file mode 100644 index 00000000..c7c85163 --- /dev/null +++ b/build/maven/Dockerfile @@ -0,0 +1,9 @@ +FROM node:8.12-alpine +RUN npm install -g yarn +RUN mkdir /opt/app +COPY package.json yarn.lock /opt/app/ +WORKDIR /opt/app +RUN yarn install +COPY . /opt/app +CMD ["node", "index.js"] + diff --git a/build/maven/start.sh b/build/maven/start.sh new file mode 100644 index 00000000..08bdd8de --- /dev/null +++ b/build/maven/start.sh @@ -0,0 +1,11 @@ +#!/bin/sh + +if [[ -z "${JAVA_OPTS}" ]];then + export JAVA_OPTS="-Xmx64m -Xms64m" +fi + +if [ x"${JAVA_ENABLE_DEBUG}" != x ] && [ "${JAVA_ENABLE_DEBUG}" != "false" ]; then + java_debug_args="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=${JAVA_DEBUG_PORT:-5005}" +fi + +exec java ${java_debug_args} ${JAVA_OPTS} ${JAVA_ARGS} -jar /opt/egov/*.jar \ No newline at end of file diff --git a/configs/egov-dss-dashboards/.project b/configs/egov-dss-dashboards/.project new file mode 100644 index 00000000..918700e2 --- /dev/null +++ b/configs/egov-dss-dashboards/.project @@ -0,0 +1,11 @@ + + + egov-dss-dashboards + + + + + + + + diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json new file mode 100644 index 00000000..0c16ed54 --- /dev/null +++ b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -0,0 +1,5532 @@ + +{ + + "_comment": "dss-collectionindex new queries ", + "overviewTargetAchieved": { + "chartName": "DSS_TARGET_ACHIEVED", + "queries": [ + { + "module": "COMMON", + "requestQueryMap": "{\r\n \"module\" : \"businessService.keyword\", \n\"tenantId\" : \"tenantIdForMunicipalCorporation\"}", + "dateRefField": "startdate", + "indexName": "dss-target_v1", + "aggrQuery": "{\"aggs\":{\"Actual collection\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}" + }, + { + "module": "COMMON", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\r\n \"district\" : \"dataObject.tenantData.city.districtCode\", \"module\" : \"dataObject.paymentDetails.businessService.keyword\", \n\"tenantId\" : \"dataObject.tenantId\"}", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must\":[{\"terms\":{\"dataObject.paymentDetails.bill.businessService.keyword\":[\"PT\",\"TL\"]}}],\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"CANCELLED\"]}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" + } + + ], + "chartType": "metric", + "valueType": "percentage", + "drillChart": "none", + "documentType": "_doc", + "action": "percentage", + "aggregationPaths": [ + "Total Collection", + "Actual collection" + ], + "insight": { + "chartResponseMap" : "targetAchieved", + "action" : "differenceOfNumbers", + "upwardIndicator" : "positive", + "downwardIndicator" : "negative", + "textMessage" : "$indicator$value% than last $insightInterval", + "colorCode" : "#228B22", + "insightInterval" : "year" + }, + "_comment": " " + }, + "totalCollection": { + "chartName": "DSS_TOTAL_COLLECTION", + "queries": [ + { + "module": "PT", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\"}", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"CANCELLED\"]}}],\"must\":[{\"term\":{\"dataObject.paymentDetails.businessService.keyword\":\"PT\"}}]}},\"aggs\":{\"Total Collection\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"amount\": {\"sum\": {\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.adjustedAmount\"}}}}}}}}" + }, + { + "module": "TL", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\"}", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"CANCELLED\"]}}],\"must\":[{\"term\":{\"dataObject.paymentDetails.businessService.keyword\":\"TL\"}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" + + } + ], + "chartType": "metric", + "valueType": "Amount", + "drillChart": "none", + "documentType": "_doc", + "action": "", + "aggregationPaths": [ + "Total Collection" + ], + "insight": { + }, + "_comment": " " + }, + "cumulativeCollection": { + "chartName": "DSS_TOTAL_CUMULATIVE_COLLECTION", + "queries": [ + { + "module": "COMMON", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\r\n \"module\" : \"dataObject.paymentDetails.businessService.keyword\", \n\"tenantId\" : \"dataObject.tenantId\"}", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"CANCELLED\"]}}],\"must\":[{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"TL\"]}}]}},\"aggs\":{\"Collections\":{\"date_histogram\":{\"field\":\"dataObject.paymentDetails.receiptDate\",\"interval\":\"intervalvalue\"},\"aggs\":{\"Sum\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" + }, + { + "module": "COMMON", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\r\n \"module\" : \"dataObject.paymentDetails.businessService.keyword\", \n\"tenantId\" : \"dataObject.tenantId\"}", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"CANCELLED\"]}}],\"must\":[{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\"]}}]}},\"aggs\":{\"Collections\":{\"date_histogram\":{\"field\":\"dataObject.paymentDetails.receiptDate\",\"interval\":\"intervalvalue\"},\"aggs\":{\"Sum\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"amount\": {\"sum\": {\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.adjustedAmount\"}}}}}}}}}}" + } + ], + "chartType": "line", + "valueType": "amount", + "action": "", + "drillChart": "none", + "documentType": "_doc", + "aggregationPaths": [ + "Collections" + ], + "isCumulative": true, + "interval": "month", + "insight": { + }, + "_comment": " " + }, + "targetAchieved": { + "chartName": "DSS_TARGET_ACHIEVED", + "queries": [ + { + "module": "COMMON", + "requestQueryMap": "{\r\n \"module\" : \"businessService.keyword\", \n\"tenantId\" : \"tenantIdForMunicipalCorporation\"}", + "dateRefField": "startdate", + "indexName": "dss-target_v1", + "aggrQuery": "{\"aggs\":{\"Actual collection\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}" + }, + { + "module": "COMMON", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\r\n \"district\" : \"dataObject.tenantData.city.districtCode\", \"module\" : \"dataObject.paymentDetails.businessService.keyword\", \n\"tenantId\" : \"dataObject.tenantId\"}", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"CANCELLED\"]}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" + } + + ], + "chartType": "metric", + "valueType": "percentage", + "drillChart": "none", + "documentType": "_doc", + "action": "percentage", + "aggregationPaths": [ + "Total Collection", + "Actual collection" + ], + "insight": { + "chartResponseMap" : "targetAchieved", + "action" : "differenceOfNumbers", + "upwardIndicator" : "positive", + "downwardIndicator" : "negative", + "textMessage" : "$indicator$value% than last $insightInterval", + "colorCode" : "#228B22", + "insightInterval" : "year" + }, + "_comment": " " + }, + "todaysCollection": { + "chartName": "DSS_TODAYS_COLLECTION", + "queries": [ + { + "module": "PT", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\"}", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"CANCELLED\"]}}],\"must\":[{\"term\":{\"dataObject.paymentDetails.businessService.keyword\":\"PT\"}}]}},\"aggs\":{\"Todays Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" + }, + { + "module": "TL", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\"}", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"CANCELLED\"]}}],\"must\":[{\"term\":{\"dataObject.paymentDetails.businessService.keyword\":\"TL\"}}]}},\"aggs\":{\"Todays Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" + }, + { + "module": "FIRENOC", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must\":[{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"FIRENOC\"]}},{\"range\":{\"dataObject.paymentDetails.receiptDate\":{\"gte\":\"now-24h\",\"lte\":\"now\"}}}],\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pg.testing\"}},{\"term\":{\"dataObject.paymentStatus.keyword\":\"Cancelled\"}}]}},\"aggs\":{\"Todays Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}", + "requestQueryMap": "{\"wardId\" : \"dataObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\",\"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", + "dateRefField": "dataObject.paymentDetails.receiptDate" + }, + { + "module": "MCOLLECT", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\"}", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pg.testing\",\"pg\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"FSM.TRIP_CHARGES\",\"PT.MUTATION\",\"SW\",\"BPA.LOW_RISK_PERMIT_FEE\",\"BPA.NC_SAN_FEE\",\"BPA.NC_APP_FEE\",\"BPA.NC_OC_APP_FEE\"]}}],\"must\":[{\"range\":{\"dataObject.paymentDetails.receiptDate\":{\"gte\":\"now-1d\",\"lte\":\"now\"}}}]}},\"aggs\":{\"Todays Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" + } + ], + "chartType": "metric", + "valueType": "Amount", + "drillChart": "none", + "documentType": "_doc", + "action": "", + "aggregationPaths": [ + "Todays Collection" + ], + "insight": { + }, + "_comment": " " + }, + "totalCollectionDeptWise": { + "chartName": "DSS_TOTAL_CUMULATIVE_COLLECTION:_DEPARTMENT_WISE", + "queries": [ + { + "module": "COMMON", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\"}", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"CANCELLED\"]}}],\"must\":[{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"TL\"]}}]}},\"aggs\":{\"Business Service\":{\"terms\":{\"field\":\"dataObject.paymentDetails.businessService.keyword\"},\"aggs\":{\"total\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" + }, + { + "module": "COMMON", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\"}", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"CANCELLED\"]}}],\"must\":[{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\"]}}]}},\"aggs\":{\"Business Service\":{\"terms\":{\"field\":\"dataObject.paymentDetails.businessService.keyword\"},\"aggs\":{\"total\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"amount\": {\"sum\": {\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.adjustedAmount\"}}}}}}}}}}" + } + + ], + "chartType": "pie", + "valueType": "Amount", + "drillChart": "none", + "documentType": "_doc", + "action": "", + "aggregationPaths": [ + "Business Service" + ], + "insight": { + }, + "_comment": " " + }, + "topPerformingUlbs": { + "chartName": "DSS_PT_TOP_3_PERFORMING_ULBS", + "queries": [ + { + "module": "COMMON", + "requestQueryMap": "{\r\n \"module\" : \"businessService.keyword\", \n\"tenantId\" : \"tenantIdForMunicipalCorporation\"}", + "dateRefField": "", + "indexName": "dss-target_v1", + "aggrQuery": "{\"aggs\":{\"Target Collection\":{\"terms\":{\"field\":\"tenantIdForMunicipalCorporation.keyword\",\"size\":\"200\",\"order\":{\"Sum\":\"desc\"}},\"aggs\":{\"Sum\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}}}" + }, + { + "module": "COMMON", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\r\n \"module\" : \"dataObject.paymentDetails.businessService.keyword\", \n\"tenantId\" : \"dataObject.tenantId\"}", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"CANCELLED\"]}}]}},\"aggs\":{\"Total Collection\":{\"terms\":{\"field\":\"dataObject.tenantId.keyword\",\"size\":\"200\",\"order\":{\"Sum\":\"desc\"}},\"aggs\":{\"Sum\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" + } + ], + "chartType": "perform", + "valueType": "percentage", + "drillChart": "none", + "documentType": "_doc", + "action": "percentage", + "plotLabel": "DSS_TARGET_ACHIEVED", + "order": "desc", + "limit": 4, + "aggregationPaths": [ + "Total Collection","Target Collection" + ], + "insight": { + }, + "_comment": " Top Performing Ulbs for target achieved" + }, + "bottomPerformingUlbs": { + "chartName": "DSS_PT_BOTTOM_3_PERFORMING_ULBS", + "queries": [ + { + "module": "COMMON", + "requestQueryMap": "{\"module\" : \"businessService.keyword\",\"tenantId\" : \"tenantIdForMunicipalCorporation\" }", + "dateRefField": "", + "indexName": "dss-target_v1", + "aggrQuery": "{\"aggs\":{\"Target Collection\":{\"terms\":{\"field\":\"tenantIdForMunicipalCorporation.keyword\",\"size\":\"200\",\"order\":{\"Sum\":\"asc\"}},\"aggs\":{\"Sum\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}}}" + }, + { + "module": "COMMON", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\" }", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"CANCELLED\"]}}]}},\"aggs\":{\"Total Collection\":{\"terms\":{\"field\":\"dataObject.tenantId.keyword\",\"size\":\"200\",\"order\":{\"Sum\":\"asc\"}},\"aggs\":{\"Sum\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" + } + ], + "chartType": "perform", + "valueType": "percentage", + "drillChart": "none", + "documentType": "_doc", + "action": "percentage", + "plotLabel": "DSS_TARGET_ACHIEVED", + "order": "asc", + "limit": 3, + "aggregationPaths": [ + "Total Collection", "Target Collection" + ], + "insight": { + }, + "_comment": " Bottom Performing Ulbs for target achieved" + }, + "licenseByLicenseType": { + "chartName": "DSS_TL_LICENSE_BY_TYPE", + "queries": [ + { + "module": "COMMON", + "requestQueryMap": "{\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\"}", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"CANCELLED\"]}}]}},\"aggs\":{\"License Instrument Type\":{\"terms\":{\"field\":\"dataObject.paymentMode.keyword\"},\"aggs\":{\"Licens Issued\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" + } + ], + "chartType": "pie", + "valueType": "amount", + "action": "", + "documentType": "_doc", + "drillChart": "none", + "aggregationPaths": [ + "License Instrument Type" + ], + "insight": { + }, + "_comment": " License Application which are issued by License Type" + }, + + "_comment": "COMMON NON-COLLECTION CHARTS", + "totalApplication": { + "chartName": "DSS_TOTAL_APPLICATION", + "queries": [ + { + "module": "PT", + "indexName": "property-services", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Total Application\":{\"value_count\":{\"field\":\"Data.propertyId.keyword\"}}}}}}", + "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \r\n \"district\" : \"Data.tenantData.city.districtCode\", \r\n\"tenantId\" : \"Data.tenantId\" \r\n}", + "dateRefField": "Data.@timestamp" + }, + { + "module": "TL", + "indexName": "tlindex-v1", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tradelicense.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Total Application\":{\"value_count\":{\"field\":\"Data.tradelicense.applicationNumber.keyword\"}}}}}}", + "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \r\n \"district\" : \"Data.tenantData.city.districtCode\", \r\n\"tenantId\" : \"Data.tradelicense.tenantId.keyword\" \r\n}", + "dateRefField": "Data.tradelicense.applicationDate" + }, + { + "module": "PGR", + "indexName": "pgrindex-v1", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Total Application\":{\"value_count\":{\"field\":\"Data.dateOfComplaint\"}}}}}}", + "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\", \r\n \"district\" : \"Data.tenantData.city.districtCode\", \r\n\"tenantId\" : \"Data.tenantId\" \r\n}", + "dateRefField": "Data.dateOfComplaint" + } + ], + "chartType": "metric", + "valueType": "number", + "action": "", + "documentType": "_doc", + "drillChart": "none", + "aggregationPaths": [ + "Total Application" + ], + "insight": { + "chartResponseMap" : "totalApplication", + "action" : "differenceOfNumbers", + "upwardIndicator" : "positive", + "downwardIndicator" : "negative", + "textMessage" : "$indicator$value% than last $insightInterval", + "colorCode" : "#228B22", + "insightInterval" : "year" + }, + "_comment": " totalApplication is the chartId" + }, + "closedApplication": { + "chartName": "DSS_CLOSED_APPLICATION", + "queries": [ + { + "module": "PT", + "dateRefField": "Data.@timestamp", + "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \r\n \"district\" : \"Data.tenantData.city.districtCode\", \r\n\"tenantId\" : \"Data.tenantId\" \r\n}", + "indexName": "property-services", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Applications Closed\":{\"filter\":{\"bool\":{\"must\":[{\"terms\":{\"Data.status.keyword\":[\"closed\",\"resolved\"]}}]}},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.propertyId.keyword\"}}}}}}}}" + }, + { + "module": "TL", + "dateRefField": "Data.tradelicense.applicationDate", + "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \r\n \"district\" : \"Data.tenantData.city.districtCode\", \r\n\"tenantId\" : \"Data.tradelicense.tenantId.keyword\" \r\n}", + "indexName": "tlindex-v1", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tradelicense.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Applications Closed\":{\"filter\":{\"bool\":{\"must\":[{\"terms\":{\"Data.status.keyword\":[\"closed\",\"resolved\"]}}]}},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.tradelicense.applicationNumber.keyword\"}}}}}}}}" + }, + { + "module": "PGR", + "dateRefField": "Data.dateOfComplaint", + "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\", \r\n \"district\" : \"Data.tenantData.city.districtCode\", \r\n\"tenantId\" : \"Data.tenantId\" \r\n}", + "indexName": "pgrindex-v1", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Applications Closed\":{\"filter\":{\"bool\":{\"must\":[{\"terms\":{\"Data.status.keyword\":[\"closed\",\"resolved\"]}}]}},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.dateOfComplaint\"}}}}}}}}" + } + ], + "chartType": "metric", + "valueType": "number", + "action": "", + "documentType": "_doc", + "drillChart": "none", + "aggregationPaths": [ + "Applications Closed" + ], + "insight": { + "chartResponseMap" : "closedApplication", + "action" : "differenceOfNumbers", + "upwardIndicator" : "positive", + "downwardIndicator" : "negative", + "textMessage" : "$indicator$value% than last $insightInterval", + "colorCode" : "#228B22", + "insightInterval" : "year" + }, + "_comment": " totalApplication is the chartId" + }, + "citizenRegistered": { + "chartName": "DSS_CITIZEN_REGISTERED", + "queries": [ + { + "module": "PGR", + "indexName": "pgrindex-v1", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Citizen Registered\":{\"terms\":{\"field\":\"Data.citizen.uuid.keyword\"},\"aggs\":{\"type_count\":{\"cardinality\":{\"field\":\"Data.citizen.uuid.keyword\"}}}}}}}}", + "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\", \"district\" : \"Data.tenantData.city.districtCode\", \"tenantId\" : \"Data.tenantId\", \"status\" : \"Data.status\"}", + "dateRefField": "Data.dateOfComplaint" + } + ], + "chartType": "metric", + "valueType": "number", + "action": "", + "documentType": "_doc", + "drillChart": "none", + "aggregationPaths": [ + "Citizen Registered" + ], + "insight": { + "chartResponseMap" : "citizenRegistered", + "action" : "differenceOfNumbers", + "upwardIndicator" : "positive", + "downwardIndicator" : "negative", + "textMessage" : "$indicator$value% than last $insightInterval", + "colorCode" : "#228B22", + "insightInterval" : "year" + }, + "_comment": " totalApplication is the chartId" + }, + "totalApplicationDeptWise": { + "chartName": "DSS_TOTAL_APPLICATIONS:_DEPARTMENT_WISE", + "queries": [ + { + "module": "PT", + "dateRefField": "Data.@timestamp", + "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \r\n \"district\" : \"Data.tenantData.city.districtCode\", \r\n\"tenantId\" : \"Data.tenantId\" \r\n}", + "indexName": "property-services", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Property Tax\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}}" + }, + { + "module": "TL", + "dateRefField": "Data.@timestamp", + "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \r\n \"district\" : \"Data.tenantData.city.districtCode\", \r\n\"tenantId\" : \"Data.tenantId\" \r\n}", + "indexName": "tlindex-v1", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tradelicense.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Trade Licence\":{\"value_count\":{\"field\":\"Data.tradelicense.tenantId.keyword\"}}}}}}" + }, + { + "module": "PGR", + "dateRefField": "Data.@timestamp", + "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\", \r\n \"district\" : \"Data.tenantData.city.districtCode\", \r\n\"tenantId\" : \"Data.tenantId\" \r\n}", + "indexName": "pgrindex-v1", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"PGR\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}}" + } + ], + "chartType": "pie", + "valueType": "number", + "action": "", + "documentType": "_doc", + "drillChart": "none", + "aggregationPaths": [ + "Property Tax", + "Trade Licence", + "PGR" + ], + "insight": { + }, + "_comment": " totalApplication is the chartId" + }, + "totalApplication&ClosedApplication": { + "chartName": "DSS_TOTAL_APPLICATION_&_CLOSED_APPLICATION", + "queries": [ + { + "module": "PT", + "dateRefField": "Data.@timestamp", + "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \r\n \"district\" : \"Data.tenantData.city.districtCode\", \r\n\"tenantId\" : \"Data.tenantId.keyword\" \r\n}", + "indexName": "property-services", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Total Application\":{\"date_histogram\":{\"field\":\"Data.@timestamp\",\"interval\":\"intervalvalue\"},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.propertyId.keyword\"}}}},\"Closed Application\":{\"date_histogram\":{\"field\":\"Data.@timestamp\",\"interval\":\"intervalvalue\"},\"aggs\":{\"Applications Closed\":{\"filter\":{\"bool\":{\"must\":[{\"terms\":{\"Data.status.keyword\":[\"closed\",\"resolved\"]}}]}},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.propertyId.keyword\"}}}}}}}}}}" + }, + { + "module": "TL", + "dateRefField": "Data.tradelicense.applicationDate", + "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \r\n \"district\" : \"Data.tenantData.city.districtCode\", \r\n\"tenantId\" : \"Data.tradelicense.tenantId.keyword\" \r\n}", + "indexName": "tlindex-v1", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tradelicense.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Total Application\":{\"date_histogram\":{\"field\":\"Data.tradelicense.applicationDate\",\"interval\":\"intervalvalue\"},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.tradelicense.applicationNumber.keyword\"}}}},\"Closed Application\":{\"date_histogram\":{\"field\":\"Data.tradelicense.applicationDate\",\"interval\":\"intervalvalue\"},\"aggs\":{\"Applications Closed\":{\"filter\":{\"bool\":{\"must\":[{\"terms\":{\"Data.status.keyword\":[\"closed\",\"resolved\"]}}]}},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.tradelicense.applicationNumber.keyword\"}}}}}}}}}}" + + }, + { + "module": "PGR", + "dateRefField": "Data.dateOfComplaint", + "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\", \r\n \"district\" : \"Data.tenantData.city.districtCode\", \r\n\"tenantId\" : \"Data.tenantId\" \r\n}", + "indexName": "pgrindex-v1", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Total Application\":{\"date_histogram\":{\"field\":\"Data.dateOfComplaint\",\"interval\":\"intervalvalue\"},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}},\"Closed Application\":{\"date_histogram\":{\"field\":\"Data.dateOfComplaint\",\"interval\":\"intervalvalue\"},\"aggs\":{\"Applications Closed\":{\"filter\":{\"bool\":{\"must\":[{\"terms\":{\"Data.status.keyword\":[\"closed\",\"resolved\"]}}]}},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.dateOfComplaint\"}}}}}}}}}}" + + } + ], + "chartType": "line", + "valueType": "number", + "action": "", + "drillChart": "none", + "documentType": "_doc", + "aggregationPaths": [ + "Total Application", + "Closed Application" + ], + "isCumulative": false, + "interval": "month", + "insight": { + }, + "_comment": " " + }, + "topPerformingUlbsCompletionRate": { + "chartName": "DSS_PT_TOP_3_PERFORMING_ULBS", + "queries": [ + { + "module": "PGR", + "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\", \"module\" : \"businessService.keyword\",\"tenantId\" : \"Data.tenantId\" , \"district\" : \"Data.tenantData.city.districtCode\"}", + "dateRefField": "Data.@timestamp", + "indexName": "pgrindex-v1", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Closed Application\":{\"filter\":{\"term\":{\"Data.status.keyword\":\"resolved\"}},\"aggs\":{\"count\":{\"terms\":{\"field\":\"Data.tenantId.keyword\",\"order\":{\"_key\":\"asc\"},\"size\":100},\"aggs\":{\"tenant_count\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}},\"Total Application\":{\"terms\":{\"field\":\"Data.tenantId.keyword\",\"order\":{\"_key\":\"asc\"},\"size\":100},\"aggs\":{\"tenant_count\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}}}}" + }, + { + "module": "PT", + "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \"module\" : \"businessService.keyword\",\"tenantId\" : \"Data.tenantId\" , \"district\" : \"Data.tenantData.city.districtCode\"}", + "dateRefField": "Data.@timestamp", + "indexName": "property-services", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Closed Application\":{\"filter\":{\"exists\":{\"field\":\"Data.propertyId.keyword\"}},\"aggs\":{\"count\":{\"terms\":{\"field\":\"Data.tenantId.keyword\"},\"aggs\":{\"tenant_count\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}},\"Total Application\":{\"terms\":{\"field\":\"Data.tenantId.keyword\"},\"aggs\":{\"tenant_count\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}}}}" + }, + { + "module": "TL", + "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \"module\" : \"businessService.keyword\",\"tenantId\" : \"Data.tenantData.code\" , \"district\" : \"Data.tenantData.city.districtCode\"}", + "dateRefField": "Data.tradelicense.applicationDate", + "indexName": "tlindex-v1", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tradelicense.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Closed Application\":{\"filter\":{\"exists\":{\"field\":\"Data.tradelicense.issuedDate\"}},\"aggs\":{\"count\":{\"terms\":{\"field\":\"Data.tenantData.code.keyword\"},\"aggs\":{\"tenant_count\":{\"value_count\":{\"field\":\"Data.tenantData.code.keyword\"}}}}}},\"Total Application\":{\"filter\":{\"exists\":{\"field\":\"Data.tradelicense.applicationDate\"}},\"aggs\":{\"count\":{\"terms\":{\"field\":\"Data.tenantData.code.keyword\"},\"aggs\":{\"tenant_count\":{\"value_count\":{\"field\":\"Data.tenantData.code.keyword\"}}}}}}}}}}" + } + ], + "chartType": "perform", + "valueType": "percentage", + "drillChart": "none", + "documentType": "_doc", + "action": "percentage", + "plotLabel": "DSS_COMPLETION_RATE", + "order": "desc", + "limit": 3, + "aggregationPaths": [ + "Closed Application", + "Total Application" + ], + "insight": { + }, + "_comment": " Top Performing Ulbs for Completion rate" + }, + "bottomPerformingUlbsCompletionRate": { + "chartName": "DSS_PT_BOTTOM_3_PERFORMING_ULBS", + "queries": [ + { + "module": "PGR", + "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\", \"module\" : \"businessService.keyword\",\"tenantId\" : \"Data.tenantId\" , \"district\" : \"Data.tenantData.city.districtCode\"}", + "dateRefField": "Data.@timestamp", + "indexName": "pgrindex-v1", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Closed Application\":{\"filter\":{\"term\":{\"Data.status.keyword\":\"resolved\"}},\"aggs\":{\"count\":{\"terms\":{\"field\":\"Data.tenantId.keyword\"},\"aggs\":{\"tenant_count\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}},\"Total Application\":{\"terms\":{\"field\":\"Data.tenantId.keyword\"},\"aggs\":{\"tenant_count\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}}}}" + }, + { + "module": "PT", + "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \"module\" : \"businessService.keyword\",\"tenantId\" : \"Data.tenantId\" ,\"district\" : \"Data.tenantData.city.districtCode\"}", + "dateRefField": "Data.@timestamp", + "indexName": "property-services", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Closed Application\":{\"filter\":{\"exists\":{\"field\":\"Data.propertyId.keyword\"}},\"aggs\":{\"count\":{\"terms\":{\"field\":\"Data.tenantId.keyword\"},\"aggs\":{\"tenant_count\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}},\"Total Application\":{\"terms\":{\"field\":\"Data.tenantId.keyword\"},\"aggs\":{\"tenant_count\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}}}}" + }, + { + "module": "TL", + "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \"module\" : \"businessService.keyword\",\"tenantId\" : \"Data.tenantData.code\" , \"district\" : \"Data.tenantData.city.districtCode\"}", + "dateRefField": "Data.tradelicense.applicationDate", + "indexName": "tlindex-v1", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tradelicense.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Closed Application\":{\"filter\":{\"exists\":{\"field\":\"Data.tradelicense.issuedDate\"}},\"aggs\":{\"count\":{\"terms\":{\"field\":\"Data.tenantData.code.keyword\"},\"aggs\":{\"tenant_count\":{\"value_count\":{\"field\":\"Data.tenantData.code.keyword\"}}}}}},\"Total Application\":{\"filter\":{\"exists\":{\"field\":\"Data.tradelicense.applicationDate\"}},\"aggs\":{\"count\":{\"terms\":{\"field\":\"Data.tenantData.code.keyword\"},\"aggs\":{\"tenant_count\":{\"value_count\":{\"field\":\"Data.tenantData.code.keyword\"}}}}}}}}}}" + } + ], + "chartType": "perform", + "valueType": "percentage", + "drillChart": "none", + "documentType": "_doc", + "action": "percentage", + "plotLabel": "DSS_COMPLETION_RATE", + "order": "asc", + "limit": 3, + "aggregationPaths": [ + "Closed Application", + "Total Application" + ], + "insight": { + }, + "_comment": " Bottom Performing Ulbs for Completion rate" + }, + + "_comment": "COMMON COLLECTION CHARTS", + "targetCollection": { + "chartName": "DSS_TARGET_COLLECTION", + "queries": [ + { + "module": "COMMON", + "requestQueryMap": "{\"module\" : \"businessService.keyword\", \"tenantId\" : \"tenantIdForMunicipalCorporation.keyword\"}", + "dateRefField": "startdate", + "indexName": "dss-target_v1", + "aggrQuery": "{\"aggs\":{\"Target Collection\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}" + } + ], + "chartType": "metric", + "valueType": "amount", + "action": "", + "drillChart": "none", + "documentType": "_doc", + "aggregationPaths": [ + "Target Collection" + ], + "isDayUnit": true, + "postAggregationTheory" : "repsonseToDifferenceOfDates", + "insight": { + }, + "_comment": " " + }, + "collectionByUsageType": { + "chartName": "DSS_PT_COLLECTION_BY_USAGE_TYPE", + "queries": [ + { + "module": "COMMON", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"CANCELLED\"]}}]}},\"aggs\":{\"Usage Type\":{\"terms\":{\"field\":\"domainObject.usageCategory.keyword\",\"size\":200},\"aggs\":{\"Usage Type\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.adjustedAmount\"}}}}}}}}}}" + } + ], + "chartType": "pie", + "valueType": "amount", + "action": "", + "documentType": "_doc", + "drillChart": "none", + "aggregationPaths": [ + "Usage Type" + ], + "insight": { + }, + "_comment": " collection/amount per usage type" + }, + "ptcollectionByPaymentMode": { + "chartName": "DSS_PT_COLLECTION_BY_PAYMENT_MODE", + "queries": [ + { + "module": "COMMON", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"CANCELLED\"]}}],\"must\":[{\"term\":{\"dataObject.paymentDetails.businessService.keyword\":\"PT\"}}]}},\"aggs\":{\"Payment Mode\":{\"terms\":{\"field\":\"dataObject.paymentMode.keyword\",\"size\": 200},\"aggs\":{\"Payment Mode\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"amount\": {\"sum\": {\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.adjustedAmount\"}}}}}}}}}}" + + } + ], + "chartType": "pie", + "valueType": "amount", + "action": "", + "documentType": "_doc", + "drillChart": "none", + "aggregationPaths": [ + "Payment Mode" + ], + "insight": { + }, + "_comment": " collection/amount per payment mode" + }, + + "_comment": "PT NON-COLLECTION CHARTS", + "propertiesByUsageType": { + "chartName": "DSS_PT_PROPERTIES_BY_USAGE_TYPE", + "queries": [ + { + "module": "PT", + "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\",\"module\" : \"Data.businessService.keyword\", \"tenantId\" : \"Data.tenantId\", \"district\" : \"Data.tenantData.city.districtCode\"}", + "dateRefField": "Data.@timestamp", + "indexName": "property-services", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Usage Type\":{\"terms\":{\"field\":\"Data.usageCategory.keyword\"}}}}}}" + } + ], + "chartType": "pie", + "valueType": "number", + "action": "", + "documentType": "_doc", + "drillChart": "none", + "aggregationPaths": [ + "Usage Type" + ], + "insight": { + }, + "_comment": " properties having assessmentNumber per usage type" + }, + "totalProperties": { + "chartName": "DSS_PT_TOTAL_PROPERTIES", + "queries": [ + { + "module": "PT", + "indexName": "property-services", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Total Application\":{\"value_count\":{\"field\":\"Data.propertyId.keyword\"}}}}}}", + "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \r\n \"district\" : \"Data.tenantData.city.districtCode\", \r\n\"tenantId\" : \"Data.tenantId\" \r\n}", + "dateRefField": "" + } + ], + "chartType": "metric", + "valueType": "number", + "action": "", + "documentType": "_doc", + "drillChart": "none", + "aggregationPaths": [ + "Total Application" + ], + "_comment": " totol properties count" + }, + "propertiesAssessed": { + "chartName": "DSS_PT_TOTAL_PROPERTIES_ASSESSED", + "queries": [ + { + "module": "PT", + "indexName": "property-services", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Total Application\":{\"value_count\":{\"field\":\"Data.propertyId.keyword\"}}}}}}", + "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \r\n \"district\" : \"Data.tenantData.city.districtCode\", \r\n\"tenantId\" : \"Data.tenantId\" \r\n}", + "dateRefField": "Data.@timestamp" + } + ], + "chartType": "metric", + "valueType": "number", + "action": "", + "documentType": "_doc", + "drillChart": "none", + "aggregationPaths": [ + "Total Application" + ], + "insight": { + "chartResponseMap" : "propertiesAssessed", + "action" : "differenceOfNumbers", + "upwardIndicator" : "positive", + "downwardIndicator" : "negative", + "textMessage" : "$indicator$value% than last $insightInterval", + "colorCode" : "#228B22", + "insightInterval" : "year" + }, + "_comment": " totol properties having assessmentNumber " + }, + "totalAssessment": { + "chartName": "DSS_PT_TOTAL_ASSESSMENTS", + "queries": [ + { + "module": "PT", + "indexName": "property-assessments", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Assessed Properties\":{\"value_count\":{\"field\":\"Data.assessmentNumber.keyword\"}}}}}}", + "requestQueryMap": "{\"wardId\" : \"Data.tenantData.city.districtCode.keyword\", \"tenantId\" : \"Data.tenantId\" ,\"district\" : \"Data.tenantData.city.districtCode\"}", + "dateRefField": "Data.@timestamp" + } + ], + "chartType": "metric", + "valueType": "number", + "action": "", + "documentType": "_doc", + "drillChart": "none", + "aggregationPaths": [ + "Assessed Properties" + ], + "insight": { + "chartResponseMap" : "totalAssessment", + "action" : "differenceOfNumbers", + "upwardIndicator" : "positive", + "downwardIndicator" : "negative", + "textMessage" : "$indicator$value% than last $insightInterval", + "colorCode" : "#228B22", + "insightInterval" : "year" + }, + "_comment": " totol properties having assessmentNumber " + }, + "cumulativePropertiesAssessed": { + "chartName": "DSS_PT_CUMULATIVE_PROPERTIES_ASSESSED", + "queries": [ + { + "module": "PT", + "indexName": "property-assessments", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Properties Assessed\":{\"date_histogram\":{\"field\":\"Data.@timestamp\",\"interval\":\"intervalvalue\"},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.assessmentNumber.keyword\"}}}}}}}}", + "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \"tenantId\" : \"Data.tenantId\" ,\"district\" : \"Data.tenantData.city.districtCode\"}", + "dateRefField": "Data.@timestamp" + } + ], + "chartType": "line", + "valueType": "number", + "action": "", + "documentType": "_doc", + "drillChart": "none", + "aggregationPaths": [ + "Properties Assessed" + ], + "isCumulative": true, + "interval": "week", + "insight": { + }, + "_comment": " totol properties having assessmentNumber " + }, + "activeUlbs": { + "chartName": "DSS_PT_TOTAL_ACTIVE_ULBS", + "queries": [ + { + "module": "PT", + "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \"tenantId\" : \"Data.tenantId\"}", + "dateRefField": "Data.@timestamp", + "indexName": "property-services", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Active ULBs\":{\"cardinality\":{\"field\":\"Data.tenantId.keyword\"}}}}}}" + }, + { + "module": "TL", + "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \"tenantId\" : \"Data.tenantData.code\"}", + "dateRefField": "Data.tradelicense.@timestamp", + "indexName": "tlindex-v1", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantData.code.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Active ULBs\":{\"cardinality\":{\"field\":\"Data.tenantData.code.keyword\"}}}}}}" + } + ], + "chartType": "metric", + "valueType": "number", + "action": "", + "documentType": "_doc", + "drillChart": "none", + "aggregationPaths": [ + "Active ULBs" + ], + "_comment": " total ULBs count" + }, + + "_comment": "PT COLLECTION CHARTS (Tax heads)", + + "_comment": "PT COLLECTION CHARTS (Demands) ", + "demandCollectionIndexDDRRevenue": { + "chartName": "DSS_PT_KEY_FY_INDICATORS", + "queries": [ + { + "module": "COMMON", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"usageId\" : \"domainObject.usageCategory.keyword\",\"minorUsageId\" : \"domainObject.usageCategory.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"CANCELLED\"]}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.transactionNumber.keyword\"}}}}}}" + }, + { + "module": "COMMON", + "indexName": "property-services", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Assessed Properties\":{\"value_count\":{\"field\":\"Data.propertyId.keyword\"}}}}}}", + "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \r\n \"district\" : \"Data.tenantData.city.districtCode\", \r\n\"tenantId\" : \"Data.tenantId\" \r\n}", + "dateRefField": "Data.@timestamp" + }, + { + "module": "COMMON", + "requestQueryMap": "{\"module\" : \"businessService.keyword\", \"tenantId\" : \"tenantIdForMunicipalCorporation.keyword\"}", + "dateRefField": "", + "indexName": "dss-target_v1", + "aggrQuery": "{\"aggs\":{\"Target Collection\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}}}" + } + ], + "isMdmsEnabled": true, + "filterKeys": [ + {"key": "tenantId", "column": "DDRs"} + ], + "chartType": "table", + "valueType": "number", + "drillChart": "demandCollectionIndexBoundaryRevenue", + "action": "", + "plotLabel": "DDRs", + "isPostResponseHandler": true, + "postAggregationTheory" : "repsonseToDifferenceOfDates", + "aggregationPaths": [ + "Total Collection", + "Transactions", + "Assessed Properties", + "Target Collection" + ], + "pathDataTypeMapping": [ + { + "Total Collection": "amount" + }, + { + "Transactions": "number" + }, + { + "Assessed Properties": "number" + }, + { + "Target Collection": "amount" + } + ], + "insight": { + }, + "_comment": "" + }, + "collectionByModule": { + "chartName": "COLLECTION_BY_MODULE", + "queries": [ + { + "module": "COMMON", + "requestQueryMap":"{\"tenantId\" : \"dataObject.tenantId\"}", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"CANCELLED\"]}}]}},\"aggs\":{\"AGGR\":{\"terms\":{\"field\":\"dataObject.tenantId.keyword\",\"size\":200},\"aggs\":{\"PT\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"dataObject.paymentDetails.businessService.keyword\":\"PT\"}}]}},\"aggs\":{\"AGGRS\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}},\"TL\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"dataObject.paymentDetails.businessService.keyword\":\"TL\"}}]}},\"aggs\":{\"AGGRS\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}},\"WS\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"dataObject.paymentDetails.businessService.keyword\":\"WS\"}}]}},\"aggs\":{\"AGGRS\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}}}" + }, + { + "module": "PT", + "requestQueryMap": "{\"module\" : \"businessService.keyword\", \"tenantId\" : \"tenantIdForMunicipalCorporation.keyword\"}", + "dateRefField": "startdate", + "indexName": "dss-target_v1", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"terms\":{\"field\":\"tenantIdForMunicipalCorporation.keyword\",\"size\":200},\"aggs\":{\"Target Collection PT\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"businessService.keyword\":\"PT\"}}]}},\"aggs\":{\"AGGRS\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}},\"Target Collection TL\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"businessService.keyword\":\"TL\"}}]}},\"aggs\":{\"AGGRS\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}},\"Target Collection WS\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"businessService.keyword\":\"WS\"}}]}},\"aggs\":{\"AGGRS\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}}}}}" + } + ], + "isMdmsEnabled": false, + "filterKeys": [ + { + "key": "tenantId", + "column": "ULBs" + } + ], + "chartType": "table", + "valueType": "", + "drillChart": "none", + "action": "", + "plotLabel": "ULBs", + "isPostResponseHandler": true, + "postAggregationTheory": "repsonseToDifferenceOfDates", + "aggregationPaths": [ + "PT", + "Target Collection PT", + "TL", + "Target Collection TL" + ], + "pathDataTypeMapping": [ + { + "PT": "amount" + }, + { + "Target Collection PT": "amount" + }, + { + "TL": "amount" + }, + { + "Target Collection TL": "amount" + } + ], + "insight": {}, + "_comment": "" + }, + "demandCollectionIndexBoundaryRevenue": { + "chartName": "DSS_PT_DEMAND_COLLECTION_BOUNDARY", + "queries": [ + { + "module": "COMMON", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"usageId\" : \"domainObject.usageCategory.keyword\",\"minorUsageId\" : \"domainObject.usageCategory.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"CANCELLED\"]}}]}},\"aggs\":{\"ULBs \":{\"terms\":{\"field\":\"domainObject.tenantId.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.transactionNumber.keyword\"}},\"Assessed Properties\":{\"nested\":{\"path\":\"domainObject.assessmentsDetails\"},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"domainObject.assessmentsDetails.assessmentNumber.keyword\"}}}}}}}}}}" + }, + { + "module": "COMMON", + "requestQueryMap": "{\"module\" : \"businessService.keyword\", \"tenantId\" : \"tenantIdForMunicipalCorporation.keyword\"}", + "dateRefField": "", + "indexName": "dss-target_v1", + "aggrQuery": "{\"aggs\":{\"ULBs \":{\"terms\":{\"field\":\"tenantIdForMunicipalCorporation.keyword\",\"size\":1000},\"aggs\":{\"Target Collection\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}}}" + } + ], + "filterKeys": [ + {"key": "tenantId", "column": "Boundary"} + ], + "postAggregationTheory" : "repsonseToDifferenceOfDates", "chartType": "table", + "valueType": "number", + "drillChart": "boundaryDrillDown", + "drillFields": [ + "Ward", + "" + ], + "documentType": "_doc", + "action": "", + "plotLabel": "Boundary", + "aggregationPaths": [ + "Total Collection", + "Transactions", + "Assessed Properties", + "Target Collection" + ], + "pathDataTypeMapping": [ + { + "Total Collection": "amount" + }, + { + "Transactions": "number" + }, + { + "Assessed Properties": "number" + }, + { + "Target Collection": "amount" + } + ], + "insight": { + }, + "_comment": "" + }, + "boundaryDrillDown": { + "kind": "drillDown", + "chartName": "Boundary", + "queries": [ + { + "module": "COMMON", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"usageId\" : \"domainObject.usageCategory.keyword\",\"minorUsageId\" : \"domainObject.usageCategory.keyword\",\"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"CANCELLED\"]}}]}},\"aggs\":{\"Ward \":{\"terms\":{\"field\":\"domainObject.ward.name.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.transactionNumber.keyword\"}},\"Assessed Properties\":{\"nested\":{\"path\":\"domainObject.assessmentsDetails\"},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"domainObject.assessmentsDetails.assessmentNumber.keyword\"}}}}}}}}}}" + } + ], + "chartType": "table", + "valueType": "number", + "drillChart": "none", + "documentType": "_doc", + "action": "", + "plotLabel": "Ward", + "aggregationPaths": [ + "Total Collection", + "Transactions", + "Assessed Properties", + "Target Collection" + ], + "pathDataTypeMapping": [ + { + "Total Collection": "amount" + }, + { + "Transactions": "number" + }, + { + "Assessed Properties": "number" + }, + { + "Target Collection": "amount" + } + ], + "insight": { + }, + "_comment": "" + }, + + + "_comment": " PT Nested Array related new queries", + "taxHeadsBreakupDDRRevenue": { + "chartName": "DSS_PT_TAX_HEAD_BREAKUP_REVENUE", + "queries": [ + { + "module": "COMMON", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"usageId\" : \"domainObject.usageCategory.keyword\",\"minorUsageId\" : \"domainObject.usageCategory.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"CANCELLED\"]}}]}},\"aggs\":{\"Total Amount\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"amount\": {\"sum\": {\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.adjustedAmount\"}}}},\"PT Tax\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TAX\",\"PT_ADVANCE_CARRYFORWARD\",\"FIRENOC_FEES\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.adjustedAmount\"}}}}}},\"Fire Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_FIRE_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.adjustedAmount\"}}}}}},\"Cancer Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_CANCER_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.adjustedAmount\"}}}}}},\"Rebate\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_REBATE\",\"PT_UNIT_USAGE_EXEMPTION\",\"PT_OWNER_EXEMPTION\",\"PT_ADHOC_REBATE\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.adjustedAmount\"}}}}}},\"Penalty\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_PENALTY\",\"PT_ADHOC_PENALTY\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.adjustedAmount\"}}}}}},\"Time Interest\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_INTEREST\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.adjustedAmount\"}}}}}},\"Round Off\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_ROUNDOFF\",\"PT_DECIMAL_CEILING_DEBIT\",\"PT_DECIMAL_CEILING_CREDIT\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.adjustedAmount\"}}}}}}}}}}" + } + ], + "isMdmsEnabled": true, + "filterKeys": [ + {"key": "tenantId", "column": "DDRs"} + + ], + "chartType": "xtable", + "valueType": "number", + "drillChart": "taxHeadsBreakupRevenue", + "isPostResponseHandler": true, + "documentType": "_doc", + "action": "", + "plotLabel": "DDRs", + "aggregationPaths": [ + "PT Tax", + "Fire Cess", + "Cancer Cess", + "Rebate", + "Penalty", + "Time Interest","Round Off" + ], + "computedFields": [ + { + "postAggregationTheory" : "", + "actionName": "AdditiveComputedField", + "fields" : [ "PT Tax", "Fire Cess", "Cancer Cess", "Rebate", "Penalty", "Time Interest","Round Off"], + "newField" : "Total Amount", + "_comments": "fields are field names picked from its aggregation query to use post aggregation newField value with given new field name " + } + ], + "insight": { + }, + "_comment": "" + }, + "taxHeadsBreakupRevenue": { + "chartName": "DSS_PT_TAX_HEAD_BREAKUP_REVENUE", + "queries": [ + { + "module": "COMMON", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"usageId\" : \"domainObject.usageCategory.keyword\",\"minorUsageId\" : \"domainObject.usageCategory.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"CANCELLED\"]}}]}},\"aggs\":{\"ULBs \":{\"terms\":{\"field\":\"dataObject.tenantId.keyword\",\"size\":200},\"aggs\":{\"Total Amount\":{\"bucket_script\":{\"buckets_path\":{\"c1\":\"PT Tax>aggrFilter>amount\",\"c2\":\"Fire Cess>aggrFilter>amount\",\"c3\":\"Cancer Cess>aggrFilter>amount\",\"c4\":\"Rebate>aggrFilter>amount\",\"c5\":\"Penalty>aggrFilter>amount\",\"c6\":\"Time Interest>aggrFilter>amount\",\"c7\":\"Round Off>aggrFilter>amount\"},\"script\":{\"source\":\"params.c1+params.c2+params.c3+params.c4+params.c5+params.c6+params.c7\"}}},\"PT Tax\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TAX\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.adjustedAmount\"}}}}}},\"Fire Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_FIRE_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.adjustedAmount\"}}}}}},\"Cancer Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_CANCER_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.adjustedAmount\"}}}}}},\"Rebate\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_REBATE\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.adjustedAmount\"}}}}}},\"Penalty\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_PENALTY\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.adjustedAmount\"}}}}}},\"Time Interest\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_INTEREST\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.adjustedAmount\"}}}}}},\"Round Off\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_ROUNDOFF\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.adjustedAmount\"}}}}}}}}}}}}" + } + ], + "filterKeys": [ + {"key": "tenantId", "column": "Boundary"} + + ], + "chartType": "xtable", + "valueType": "number", + "drillChart": "taxHeadsBreakupBoundaryDrill", + "drillFields": [ + "Ward", + "" + ], + "documentType": "_doc", + "action": "", + "plotLabel": "Boundary", + "aggregationPaths": [ + "PT Tax", + "Fire Cess", + "Cancer Cess", + "Rebate", + "Penalty", + "Time Interest","Round Off", "Total Amount" + ], + + "insight": { + }, + "_comment": "" + }, + "taxHeadsBreakupBoundaryDrill": { + "chartName": "Tax head Breakup boundary", + "queries": [ + { + "module": "COMMON", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"usageId\" : \"domainObject.usageCategory.keyword\",\"minorUsageId\" : \"domainObject.usageCategory.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"CANCELLED\"]}}]}},\"aggs\":{\"Ward \":{\"terms\":{\"field\":\"domainObject.ward.name.keyword\",\"size\":200},\"aggs\":{\"Total Amount\":{\"bucket_script\":{\"buckets_path\":{\"c1\":\"PT Tax>aggrFilter>amount\",\"c2\":\"Fire Cess>aggrFilter>amount\",\"c3\":\"Cancer Cess>aggrFilter>amount\",\"c4\":\"Rebate>aggrFilter>amount\",\"c5\":\"Penalty>aggrFilter>amount\",\"c6\":\"Time Interest>aggrFilter>amount\",\"c7\":\"Round Off>aggrFilter>amount\"},\"script\":{\"source\":\"params.c1+params.c2+params.c3+params.c4+params.c5+params.c6+params.c7\"}}},\"PT Tax\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TAX\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.adjustedAmount\"}}}}}},\"Fire Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_FIRE_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.adjustedAmount\"}}}}}},\"Cancer Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_CANCER_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.adjustedAmount\"}}}}}},\"Rebate\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_REBATE\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.adjustedAmount\"}}}}}},\"Penalty\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_PENALTY\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.adjustedAmount\"}}}}}},\"Time Interest\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_INTEREST\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.adjustedAmount\"}}}}}},\"Round Off\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_ROUNDOFF\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.adjustedAmount\"}}}}}}}}}}}}" + } + ], + "filterKeys": [ + + ], + "chartType": "xtable", + "valueType": "number", + "drillChart": "", + "drillFields": [ + "Ward", + "" + ], + "documentType": "_doc", + "action": "", + "plotLabel": "Boundary", + "aggregationPaths": [ + "PT Tax", + "Fire Cess", + "Cancer Cess", + "Rebate", + "Penalty", + "Time Interest","Round Off","Total Amount" + ], + + "insight": { + }, + "_comment": "" + }, + "taxHeadsBreakupUsageMinor": { + "chartName": "", + "queries": [ + { + "module": "COMMON", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"usageId\" : \"domainObject.usageCategory.keyword\",\"minorUsageId\" : \"domainObject.usageCategory.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"CANCELLED\"]}}]}},\"aggs\": {\"Usage \":{\"terms\":{\"field\":\"domainObject.usageCategory.keyword\",\"size\":200},\"aggs\":{\"Total Amount\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.adjustedAmount\"}}}}}},\"PT Tax\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TAX\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.adjustedAmount\"}}}}}},\"Fire Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_FIRE_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.adjustedAmount\"}}}}}},\"Cancer Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_CANCER_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.adjustedAmount\"}}}}}},\"Rebate\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_REBATE\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.adjustedAmount\"}}}}}},\"Penalty\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_PENALTY\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.adjustedAmount\"}}}}}}}}}}}}" + } + ], + "filterKeys": [ + {"key": "minorUsageId", "column": "Minor Usage Type"} + ], + "chartType": "table", + "valueType": "number", + "drillChart": "taxHeadsBreakupUsageSubMinor", + "documentType": "_doc", + "action": "", + "plotLabel": "Minor Usage Type", + "aggregationPaths": [ + "Total Amount", + "PT Tax", + "Fire Cess", + "Cancer Cess", + "Rebate", + "Penalty" + ], + "pathDataTypeMapping": [ + { + "Total Amount": "amount" + }, + { + "PT Tax": "amount" + }, + { + "Fire Cess": "amount" + }, + { + "Cancer Cess": "amount" + }, + { + "Rebate": "amount" + }, + { + "Penalty": "amount" + } + ], + "insight": { + }, + "_comment": "present we are not using, Need to check the taxAndPayments" + }, + "taxHeadsBreakupUsageSubMinor": { + "chartName": "", + "queries": [ + { + "module": "COMMON", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"usageId\" : \"domainObject.usageCategory.keyword\",\"minorUsageId\" : \"domainObject.usageCategory.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"CANCELLED\"]}}]}},\"aggs\":{\"Usage \":{\"terms\":{\"field\":\"domainObject.usageCategory.keyword\",\"size\":200},\"aggs\":{\"Total Amount\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.Bill.taxAndPayments.taxAmount\"}}}}}},\"PT Tax\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TAX\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.adjustedAmount\"}}}}}},\"Fire Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_FIRE_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.adjustedAmount\"}}}}}},\"Cancer Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_CANCER_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.adjustedAmount\"}}}}}},\"Rebate\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_REBATE\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.adjustedAmount\"}}}}}},\"Penalty\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_PENALTY\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.adjustedAmount\"}}}}}}}}}}}}" + } + ], + "filterKeys": [ + "" + ], + "chartType": "table", + "valueType": "number", + "drillChart": "", + "documentType": "_doc", + "action": "", + "plotLabel": "Sub Minor Usage Type", + "aggregationPaths": [ + "Total Amount", + "PT Tax", + "Fire Cess", + "Cancer Cess", + "Rebate", + "Penalty" + ], + "pathDataTypeMapping": [ + { + "Total Amount": "amount" + }, + { + "PT Tax": "amount" + }, + { + "Fire Cess": "amount" + }, + { + "Cancer Cess": "amount" + }, + { + "Rebate": "amount" + }, + { + "Penalty": "amount" + } + ], + "insight": { + }, + "_comment": "" + }, + "demandCollectionIndexUsageRevenue": { + "chartName": "DSS_PT_DEMAND_COLLECTION_USAGETYPE", + "queries": [ + { + "module": "COMMON", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\",\"usageId\" : \"domainObject.usageCategory.keyword\",\"minorUsageId\" : \"domainObject.usageCategory.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"CANCELLED\"]}}]}},\"aggs\":{\"UsageType \":{\"terms\":{\"field\":\"domainObject.usageCategory.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"amount\": {\"sum\": {\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.adjustedAmount\"}}}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.transactionNumber.keyword\"}},\"Assessed Properties\":{\"nested\":{\"path\":\"domainObject.assessmentsDetails\"},\"aggs\":{\"attr\":{\"cardinality\":{\"field\":\"domainObject.assessmentsDetails.assessmentNumber.keyword\"}}}}}}}}}}", + "aggrQuerybc": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Approved\"]}}]}},\"aggs\":{\"UsageType \":{\"terms\":{\"field\":\"domainObject.usageCategory.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"amount\": {\"sum\": {\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.adjustedAmount\"}}}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.transactionNumber.keyword\"}},\"Assessed Properties\":{\"nested\":{\"path\":\"domainObject.assessmentsDetails\"},\"aggs\":{\"attr\":{\"cardinality\":{\"field\":\"domainObject.assessmentsDetails.assessmentNumber.keyword\"}}}}}}}}}}" + } + ], + "filterKeys": [ + + ], + "chartType": "table", + "valueType": "number", + "drillChart": "", + "drillFields": [ + "Ward", + "" + ], + "documentType": "_doc", + "action": "", + "plotLabel": "Usage Type", + "aggregationPaths": [ + "Total Collection", + "Transactions", + "Assessed Properties" + + ], + "pathDataTypeMapping": [ + { + "Total Collection": "amount" + }, + { + "Transactions": "number" + }, + { + "Assessed Properties": "number" + } + ], + "insight": { + }, + "_comment": "removed reverse_nested in aggrQuery" + }, + "usageRevenueDrillDownMinor": { + "chartName": "", + "queries": [ + { + "module": "COMMON", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"usageId\" : \"domainObject.usageCategory.keyword\",\"minorUsageId\" : \"domainObject.usageCategory.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"CANCELLED\"]}}]}},\"aggs\":{\"UsageType \":{\"terms\":{\"field\":\"domainObject.usageCategory.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.transactionNumber.keyword\"}},\"Assessed Properties\":{\"nested\":{\"path\":\"domainObject.assessmentsDetails\"},\"aggs\":{\"attr\":{\"cardinality\":{\"field\":\"domainObject.assessmentsDetails.assessmentNumber.keyword\"}}}}}}}}}}", + "aggrQuerybc": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Approved\"]}}]}},\"aggs\":{\"UsageType \":{\"terms\":{\"field\":\"domainObject.usageCategory.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.transactionNumber.keyword\"}},\"Assessed Properties\":{\"nested\":{\"path\":\"domainObject.assessmentsDetails\"},\"aggs\":{\"attr\":{\"cardinality\":{\"field\":\"domainObject.assessmentsDetails.assessmentNumber.keyword\"}}}}}}}}}}" + } + ], + "filterKeys": [ + {"key": "minorUsageId", "column": "Minor Usage Type"} + ], + "chartType": "table", + "valueType": "number", + "drillChart": "usageRevenueDrillDownSubMinor", + "documentType": "_doc", + "action": "", + "plotLabel": "Minor Usage Type", + "aggregationPaths": [ + "Total Collection", + "Transactions", + "Assessed Properties" + ], + "pathDataTypeMapping": [ + { + "Total Collection": "amount" + }, + { + "Transactions": "number" + }, + { + "Assessed Properties": "number" + } + ], + "insight": { + }, + "_comment": "" + }, + "usageRevenueDrillDownSubMinor": { + "chartName": "", + "queries": [ + { + "module": "COMMON", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"usageId\" : \"domainObject.usageCategory.keyword\",\"minorUsageId\" : \"domainObject.usageCategory.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"CANCELLED\"]}}]}},\"aggs\":{\"UsageType \":{\"terms\":{\"field\":\"domainObject.usageCategory.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.transactionNumber.keyword\"}},\"Assessed Properties\":{\"nested\":{\"path\":\"domainObject.assessmentsDetails\"},\"aggs\":{\"attr\":{\"cardinality\":{\"field\":\"domainObject.assessmentsDetails.assessmentNumber.keyword\"}}}}}}}}}}", + "aggrQuerybc": "{\"aggs\":{\"UsageType \":{\"terms\":{\"field\":\"domainObject.usageCategory.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.transactionNumber.keyword\"}},\"Assessed Properties\":{\"nested\":{\"path\":\"Data.propertyDetails\"},\"aggs\":{\"attr\":{\"cardinality\":{\"field\":\"Data.propertyDetails.assessmentNumber.keyword\"}}}}}}}}" + } + ], + "filterKeys": [ + + ], + "chartType": "table", + "valueType": "number", + "drillChart": "none", + "documentType": "_doc", + "action": "", + "plotLabel": "Sub Minor Usage Type", + "aggregationPaths": [ + "Total Collection", + "Transactions", + "Assessed Properties" + ], + "pathDataTypeMapping": [ + { + "Total Collection": "amount" + }, + { + "Transactions": "number" + }, + { + "Assessed Properties": "number" + } + ], + "insight": { + }, + "_comment": "" + }, + + + + "_comment": "TL COLLECTION CHARTS", + + "licenseIssuedDDRRevenue": { + "chartName": "DSS_TL_KEY_FY_INDICATORS", + "queries": [ + { + "module": "COMMON", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"CANCELLED\"]}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.transactionNumber.keyword\"}}}}}}" + }, + { + "module": "COMMON", + "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \r\n \"district\" : \"Data.tenantData.city.districtCode\", \r\n\"tenantId\" : \"Data.tradelicense.tenantId.keyword\" \r\n}", + "dateRefField": "Data.tradelicense.applicationDate", + "indexName": "tlindex-v1-enriched", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tradelicense.tenantId.keyword\":\"pb.testing\"}}],\"must\":[{\"match\":{\"Data.tradelicense.status.keyword\":\"APPROVED\"}}]}},\"aggs\":{\"Total Licence Issued\":{\"value_count\":{\"field\":\"Data.tradelicense.licenseNumber.keyword\"}}}}}}" + }, + { + "module": "COMMON", + "requestQueryMap": "{\"module\" : \"businessService.keyword\", \"tenantId\" : \"tenantIdForMunicipalCorporation.keyword\"}", + "dateRefField": "", + "indexName": "dss-target_v1", + "aggrQuery": "{\"aggs\":{\"Target Collection\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}}}" + } + ], + "isMdmsEnabled": true, + "filterKeys": [ + {"key": "tenantId", "column": "DDRs"} + ], + "isPostResponseHandler": true, + "postAggregationTheory" : "repsonseToDifferenceOfDates", + "chartType": "table", + "valueType": "number", + "drillChart": "licenseIssuedBoundaryRevenue", + "documentType": "_doc", + "action": "", + "plotLabel": "DDRs", + "aggregationPaths": [ + "Total Collection", + "Transactions", + "Total Licence Issued", + "Target Collection" + ], + "pathDataTypeMapping": [ + { + "Total Collection": "amount" + }, + { + "Transactions": "number" + }, + { + "Total Licence Issued": "number" + }, + { + "Target Collection": "amount" + } + ], + "insight": { + }, + "_comment": "" + }, + "licenseIssuedBoundaryRevenue": { + "chartName": "DSS_TL_DEMAND_COLLECTION_BOUNDARY", + "queries": [ + { + "module": "COMMON", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"CANCELLED\"]}}]}},\"aggs\":{\"ULBs \":{\"terms\":{\"field\":\"dataObject.tenantId.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.transactionNumber.keyword\"}},\"Total Licence Issued\":{\"value_count\":{\"field\":\"domainObject.tradelicense.licenseNumber.keyword\"}}}}}}}}" + }, + { + "module": "COMMON", + "requestQueryMap": "{\"module\" : \"businessService.keyword\", \"tenantId\" : \"tenantIdForMunicipalCorporation.keyword\"}", + "dateRefField": "", + "indexName": "dss-target_v1", + "aggrQuery": "{\"aggs\":{\"ULBs \":{\"terms\":{\"field\":\"tenantIdForMunicipalCorporation.keyword\",\"size\":1000},\"aggs\":{\"Target Collection\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}}}" + } + ], + "filterKeys": [ + {"key": "tenantId", "column": "Boundary"} + ], + "postAggregationTheory" : "repsonseToDifferenceOfDates", + "chartType": "table", + "valueType": "number", + "drillChart": "licenseIssuedBoundaryDrillDown", + "documentType": "_doc", + "action": "", + "plotLabel": "Boundary", + "aggregationPaths": [ + "Total Collection", + "Transactions", + "Total Licence Issued", + "Target Collection" + ], + "pathDataTypeMapping": [ + { + "Total Collection": "amount" + }, + { + "Transactions": "number" + }, + { + "Total Licence Issued": "number" + }, + { + "Target Collection": "amount" + } + ], + "insight": { + }, + "_comment": "" + }, + "licenseIssuedBoundaryDrillDown": { + "chartName": "", + "queries": [ + { + "module": "COMMON", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"CANCELLED\"]}}]}},\"aggs\":{\"Ward \":{\"terms\":{\"field\":\"domainObject.ward.name.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.transactionNumber.keyword\"}},\"Total Licence Issued\":{\"value_count\":{\"field\":\"domainObject.tradelicense.licenseNumber.keyword\"}}}}}}}}" + } + ], + "postAggregationTheory" : "repsonseToDifferenceOfDates", + "chartType": "table", + "valueType": "number", + "drillChart": "", + "documentType": "_doc", + "action": "", + "plotLabel": "Ward", + "aggregationPaths": [ + "Total Collection", + "Transactions", + "Total Licence Issued", + "Target Collection" + ], + "pathDataTypeMapping": [ + { + "Total Collection": "amount" + }, + { + "Transactions": "number" + }, + { + "Total Licence Issued": "number" + }, + { + "Target Collection": "amount" + } + ], + "insight": { + }, + "_comment": "" + }, + + "_comment": " TL Nested Array related newer queries", + "licenceTaxHeadsBreakupDDR": { + "chartName": "DSS_TL_TAX_HEAD_BREAKUP_BOUNDARY", + "queries": [ + { + "module": "COMMON", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"CANCELLED\"]}}]}},\"aggs\":{\"Total Amount\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"TL\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.adjustedAmount\"}}}}}},\"TL Tax\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"TL_TAX\",\"TL_RENEWAL_TAX\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.adjustedAmount\"}}}}}},\"Adhoc Penalty\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"TL_ADHOC_PENALTY\",\"TL_RENEWAL_PENALTY\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.adjustedAmount\"}}}}}},\"Adhoc Rebate\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"TL_ADHOC_REBATE\",\"ADVANCE_ADJUSTMENT\",\"TL_RENEWAL_REBATE\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.adjustedAmount\"}}}}}}}}}}" + } + ], + "isMdmsEnabled": true, + "filterKeys": [ + {"key": "tenantId", "column": "DDRs"} + ], + "isPostResponseHandlerA": true, + "chartType": "xtable", + "valueType": "number", + "drillChart": "licenceTaxHeadsBreakupBoundary", + "documentType": "_doc", + "action": "", + "plotLabel": "DDRs", + "aggregationPaths": [ + "TL Tax", + "Adhoc Penalty", + "Adhoc Rebate" + ], + "computedFields": [ + { + "postAggregationTheory" : "", + "actionName": "AdditiveComputedField", + "fields" : ["TL Tax", "Adhoc Penalty", "Adhoc Rebate"], + "newField" : "Total Amount", + "_comments": "fields are field names picked from its aggregation query to use post aggregation newField value with given new field name " + } + ], + + "insight": { + }, + "_comment": "" + }, + "taxHeadsBreakupUsage": { + "chartName": "DSS_PT_TAX_HEAD_BREAKUP_USAGE", + "queries": [ + { + "module": "COMMON", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"CANCELLED\"]}}]}},\"aggs\":{\"Usage \":{\"terms\":{\"field\":\"domainObject.usageCategory.keyword\",\"size\":200},\"aggs\":{\"Total Amount\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.adjustedAmount\"}}}},\"PT Tax\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TAX\",\"PT_ROUNDOFF\",\"PT_TIME_INTEREST\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.adjustedAmount\"}}}}}},\"Fire Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_FIRE_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.adjustedAmount\"}}}}}},\"Cancer Cess\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_CANCER_CESS\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.adjustedAmount\"}}}}}},\"Rebate\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_REBATE\",\"PT_ADHOC_REBATE\",\"PT_ADVANCE_CARRYFORWARD\",\"PT_UNIT_USAGE_EXEMPTION\",\"PT_OWNER_EXEMPTION\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.adjustedAmount\"}}}}}},\"Penalty\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"PT_TIME_PENALTY\",\"PT_ADHOC_PENALTY\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.adjustedAmount\"}}}}}}}}}}}}" + + } + ], + "filterKeys": [ + + ], + "chartType": "table", + "valueType": "number", + "drillChart": "", + "documentType": "_doc", + "action": "", + "plotLabel": "Usage Type", + "aggregationPaths": [ + "Total Amount", + "PT Tax", + "Fire Cess", + "Cancer Cess", + "Rebate", + "Penalty" + ], + "pathDataTypeMapping": [ + { + "Total Amount": "amount" + }, + { + "PT Tax": "amount" + }, + { + "Fire Cess": "amount" + }, + { + "Cancer Cess": "amount" + }, + { + "Rebate": "amount" + }, + { + "Penalty": "amount" + } + ], + "insight": { + }, + "_comment": "" + }, + "licenceTaxHeadsBreakupBoundary": { + "chartName": "DSS_TL_TAX_HEAD_BREAKUP_BOUNDARY", + "queries": [ + { + "module": "COMMON", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"CANCELLED\"]}}]}},\"aggs\":{\"ULBs \":{\"terms\":{\"field\":\"dataObject.tenantId.keyword\",\"size\":200},\"aggs\":{\"Total Amount\":{\"bucket_script\":{\"buckets_path\":{\"c1\":\"TL Tax>aggrFilter>amount\",\"c2\":\"Adhoc Penalty>aggrFilter>amount\",\"c3\":\"Adhoc Rebate>aggrFilter>amount\"},\"script\":{\"source\":\"params.c1+params.c2+params.c3\"}}},\"TL Tax\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"TL_TAX\",\"TL_RENEWAL_TAX\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.adjustedAmount\"}}}}}},\"Adhoc Penalty\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"TL_ADHOC_PENALTY\",\"TL_RENEWAL_PENALTY\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.adjustedAmount\"}}}}}},\"Adhoc Rebate\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"TL_ADHOC_REBATE\",\"ADVANCE_ADJUSTMENT\",\"TL_RENEWAL_REBATE\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.adjustedAmount\"}}}}}}}}}}}}" + } + ], + "filterKeys": [ + {"key": "tenantId", "column": "Boundary"} + ], + "chartType": "xtable", + "valueType": "number", + "drillChart": "licenceTaxHeadsBreakupWard", + "documentType": "_doc", + "action": "", + "plotLabel": "Boundary", + "aggregationPaths": [ + "TL Tax", + "Adhoc Penalty", + "Adhoc Rebate","Total Amount" + ], + "insight": { + }, + "_comment": "" + }, + "licenceTaxHeadsBreakupWard": { + "chartName": "DSS_TL_TAX_HEAD_BREAKUP_BOUNDARY", + "queries": [ + { + "module": "COMMON", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"CANCELLED\"]}}]}},\"aggs\":{\"ULBs \":{\"terms\":{\"field\":\"dataObject.ward.name.keyword\",\"size\":200},\"aggs\":{\"Total Amount\":{\"bucket_script\":{\"buckets_path\":{\"c1\":\"TL Tax>aggrFilter>amount\",\"c2\":\"Adhoc Penalty>aggrFilter>amount\",\"c3\":\"Adhoc Rebate>aggrFilter>amount\"},\"script\":{\"source\":\"params.c1+params.c2+params.c3\"}}},\"TL Tax\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"TL_TAX\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.adjustedAmount\"}}}}}},\"Adhoc Penalty\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"TL_ADHOC_PENALTY\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.adjustedAmount\"}}}}}},\"Adhoc Rebate\":{\"nested\":{\"path\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.taxHeadCode.keyword\":[\"TL_ADHOC_REBATE\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.billAccountDetails.adjustedAmount\"}}}}}}}}}}}}" + } + ], + "filterKeys": [ + ], + "chartType": "xtable", + "valueType": "number", + "drillChart": "", + "documentType": "_doc", + "action": "", + "plotLabel": "Boundary", + "aggregationPaths": [ + "TL Tax", + "Adhoc Penalty", + "Adhoc Rebate", "Total Amount" + ], + "insight": { + }, + "_comment": "" + }, + + + "_comment": "TL NON-COLLECTION CHARTS", + "licenseIssued": { + "chartName": "DSS_TL_LICENSE_ISSUED", + "queries": [ + { + "module": "TL", + "indexName": "tlindex-v1", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tradelicense.tenantId.keyword\":\"pb.testing\"}}],\"must\":[{\"match\":{\"Data.tradelicense.status.keyword\":\"APPROVED\"}}]}},\"aggs\":{\"License Issued\":{\"value_count\":{\"field\":\"Data.tradelicense.licenseNumber.keyword\"}}}}}}", + "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \r\n \"district\" : \"Data.tenantData.city.districtCode\", \r\n\"tenantId\" : \"Data.tradelicense.tenantid\" \r\n, \r\n\"businessService\" : \"dataObject.Bill.billDetails.businessServices\" \r\n}", + "dateRefField": "Data.tradelicense.applicationDate" + } + ], + "chartType": "metric", + "valueType": "number", + "action": "", + "documentType": "_doc", + "drillChart": "none", + "aggregationPaths": [ + "License Issued" + ], + "insight": { + "chartResponseMap" : "licenseIssued", + "action" : "differenceOfNumbers", + "upwardIndicator" : "positive", + "downwardIndicator" : "negative", + "textMessage" : "$indicator$value% than last $insightInterval", + "colorCode" : "#228B22", + "insightInterval" : "year" + }, + "_comment": " licenseIssued is the Chart ID" + }, + "cumulativeLicenseIssued": { + "chartName": "DSS_TL_CUMULATIVE_LICENSE_ISSUED", + "queries": [ + { + "module": "TL", + "indexName": "tlindex-v1", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tradelicense.tenantId.keyword\":\"pb.testing\"}}],\"must\":[{\"match\":{\"Data.tradelicense.status.keyword\":\"APPROVED\"}}]}},\"aggs\":{\"Trade Licence Issued\":{\"date_histogram\":{\"field\":\"Data.tradelicense.issuedDate\",\"interval\":\"intervalvalue\"},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.tradelicense.licenseNumber.keyword\"}}}}}}}}", + "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \"tenantId\" : \"Data.tenantData.code\" ,\"district\" : \"Data.tenantData.city.districtCode\"}", + "dateRefField": "Data.tradelicense.applicationDate" + }, + { + "module": "TL", + "indexName": "tlindex-v1", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tradelicense.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Total Application\":{\"date_histogram\":{\"field\":\"Data.tradelicense.applicationDate\",\"interval\":\"intervalvalue\"},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.tradelicense.applicationNumber.keyword\"}}}}}}}}", + "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \"tenantId\" : \"Data.tenantData.code\" ,\"district\" : \"Data.tenantData.city.districtCode\"}", + "dateRefField": "Data.tradelicense.applicationDate" + } + ], + "chartType": "line", + "valueType": "number", + "action": "", + "documentType": "_doc", + "drillChart": "none", + "aggregationPaths": [ + "Trade Licence Issued", + "Total Application" + ], + "isCumulative": true, + "interval": "month", + "insight": { + }, + "_comment": " Total Number of License having issued" + }, + "licenseApplicationByStatus": { + "chartName": "DSS_TL_LICENSE_BY_STATUS", + "queries": [ + { + "module": "TL", + "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \"tenantId\" : \"Data.tenantData.code\", \"district\" : \"Data.tenantData.cityDistrictCode\"}", + "dateRefField": "Data.tradelicense.applicationDate", + "indexName": "tlindex-v1", + "aggrQueryBc": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tradelicense.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Status\":{\"terms\":{\"field\":\"Data.tradelicense.status.keyword\"},\"aggs\":{\"License Issued\":{\"value_count\":{\"field\":\"Data.tradelicense.status.keyword\"}}}}}}}}", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tradelicense.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Status\":{\"terms\":{\"field\":\"Data.tradelicense.status.keyword\",\"size\":1000,\"min_doc_count\":0},\"aggs\":{\"License Issued\":{\"value_count\":{\"field\":\"Data.tradelicense.licenseNumber.keyword\"}}}}}}}}" + } + ], + "chartType": "pie", + "valueType": "number", + "action": "", + "documentType": "_doc", + "drillChart": "none", + "aggregationPaths": [ + "Status" + ], + "insight": { + }, + "_comment": " License Application which are issued by License Type" + }, + "slaAchieved": { + "chartName": "DSS_SLA_ACHIEVED", + "queries": [ + { + "module": "PGR", + "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\", \r\n \"module\" : \"businessService.keyword\", \n\"tenantId\" : \"Data.tenantId\"}", + "dateRefField": "Data.dateOfComplaint", + "indexName": "pgrindex-v1", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Total Application\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}, \"withinSLA\":{\"range\":{\"script\":{\"lang\":\"painless\",\"source\":\"doc['Data.slaHours'].value\"},\"ranges\":[{\"key\":\"Within SLA\",\"from\":0,\"to\":360}]}}}}}}" + } + ], + "chartType": "metric", + "valueType": "percentage", + "drillChart": "none", + "documentType": "_doc", + "action": "percentage", + "aggregationPaths": [ + "withinSLA", + "Total Application" + ], + "insight": { + "chartResponseMap" : "slaAchieved", + "action" : "differenceOfNumbers", + "upwardIndicator" : "positive", + "downwardIndicator" : "negative", + "textMessage" : "$indicator$value% than last $insightInterval", + "colorCode" : "#228B22", + "insightInterval" : "year" + }, + "_comment": " SLA Achieved Percentage " + }, + "tlStatusByDDR": { + "chartName": "DSS_TL_STATUS_BY_DDR", + "queries": [ + { + "module": "TL", + "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \"tenantId\" : \"Data.tradelicense.tenantId.keyword\" }", + "dateRefField": "Data.tradelicense.applicationDate", + "indexName": "tlindex-v1", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tradelicense.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Status\":{\"terms\":{\"field\":\"Data.tradelicense.status.keyword\",\"size\":1000,\"min_doc_count\":0},\"aggs\":{\"License Issued\":{\"value_count\":{\"field\":\"Data.tradelicense.applicationNumber.keyword\"}}}}}}}}", + "aggrQueryBC": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tradelicense.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Status\":{\"filters\":{\"filters\":{\"Approved\":{\"match\":{\"Data.tradelicense.status.keyword\":\"APPROVED\"}},\"Initiated\":{\"match\":{\"Data.tradelicense.status.keyword\":\"INITIATED\"}},\"Applied\":{\"match\":{\"Data.tradelicense.status.keyword\":\"APPLIED\"}},\"Rejected\":{\"match\":{\"Data.tradelicense.status.keyword\":\"REJECTED\"}},\"Pending Approval\":{\"match\":{\"Data.tradelicense.status.keyword\":\"PENDINGAPPROVAL\"}},\"Field Inspection\":{\"match\":{\"Data.tradelicense.status.keyword\":\"FIELDINSPECTION\"}},\"Cancelled\":{\"match\":{\"Data.tradelicense.status.keyword\":\"CANCELLED\"}},\"Pending Payment\":{\"match\":{\"Data.tradelicense.status.keyword\":\"PENDINGPAYMENT\"}},\"Paid\":{\"match\":{\"Data.tradelicense.status.keyword\":\"PAID\"}}}}}}}}}" + } + ], + "isMdmsEnabled": true, + "filterKeys": [ + {"key": "tenantId", "column": "DDRs"} + ], + "chartType": "xtable", + "valueType": "number", + "drillChart": "tlStatusByTenant", + "drillFields": [ + "" + ], + "documentType": "_doc", + "action": "", + "plotLabel": "DDRs", + "aggregationPathsA": [ + "Approved", + "Initiated", + "Applied", + "Rejected", + "Pending Approval", + "Field Inspection", + "Cancelled", + "Pending Payment", + "Paid" + ], + "pathDataTypeMappingA": [ + { + "Approved": "number" + }, + { + "Initiated": "number" + }, + { + "Applied": "number" + }, + { + "Rejected": "number" + }, + { + "Pending Approval": "number" + }, + { + "Field Inspection": "number" + }, + { + "Cancelled": "number" + }, + { + "Pending Payment": "number" + }, + { + "Paid": "number" + } + ], + "insight": { + }, + "_comment": "" + }, + "tlStatusByTenant": { + "chartName": "DSS_TL_STATUS_BY_TENANT", + "queries": [ + { + "module": "TL", + "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \"tenantId\" : \"Data.tradelicense.tenantId.keyword\" }", + "dateRefField": "Data.tradelicense.applicationDate", + "indexName": "tlindex-v1", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tradelicense.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"ULBs \":{\"terms\":{\"field\":\"Data.tradelicense.tenantId.keyword\",\"size\":1000},\"aggs\":{\"Status\":{\"terms\":{\"field\":\"Data.tradelicense.status.keyword\",\"size\":1000,\"min_doc_count\":0},\"aggs\":{\"License Issued\":{\"value_count\":{\"field\":\"Data.tradelicense.licenseNumber.keyword\"}}}}}}}}}}", + "aggrQueryBc": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tradelicense.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"ULBs \":{\"terms\":{\"field\":\"Data.tradelicense.tenantId.keyword\",\"size\":1000},\"aggs\":{\"Status\":{\"filters\":{\"filters\":{\"Approved\":{\"match\":{\"Data.tradelicense.status.keyword\":\"APPROVED\"}},\"Initiated\":{\"match\":{\"Data.tradelicense.status.keyword\":\"INITIATED\"}},\"Applied\":{\"match\":{\"Data.tradelicense.status.keyword\":\"APPLIED\"}},\"Rejected\":{\"match\":{\"Data.tradelicense.status.keyword\":\"REJECTED\"}},\"Pending Approval\":{\"match\":{\"Data.tradelicense.status.keyword\":\"PENDINGAPPROVAL\"}},\"Field Inspection\":{\"match\":{\"Data.tradelicense.status.keyword\":\"FIELDINSPECTION\"}},\"Cancelled\":{\"match\":{\"Data.tradelicense.status.keyword\":\"CANCELLED\"}},\"Pending Payment\":{\"match\":{\"Data.tradelicense.status.keyword\":\"PENDINGPAYMENT\"}},\"Paid\":{\"match\":{\"Data.tradelicense.status.keyword\":\"PAID\"}}}}}}}}}}}" + } + ], + "filterKeys": [ + {"key": "tenantId", "column": "Boundary"} + ], + "chartType": "xtable", + "valueType": "number", + "drillChart": "tlStatusByTenantDrillDown", + "drillFields": [ + "" + ], + "documentType": "_doc", + "action": "", + "plotLabel": "ULBs", + "aggregationPaths": [ + "Approved", + "Initiated", + "Applied", + "Rejected", + "Pending Approval", + "Field Inspection", + "Cancelled", + "Pending Payment", + "Paid" + ], + "pathDataTypeMapping": [ + { + "Approved": "number" + }, + { + "Initiated": "number" + }, + { + "Applied": "number" + }, + { + "Rejected": "number" + }, + { + "Pending Approval": "number" + }, + { + "Field Inspection": "number" + }, + { + "Cancelled": "number" + }, + { + "Pending Payment": "number" + }, + { + "Paid": "number" + } + ], + "insight": { + }, + "_comment": "" + }, + "tlStatusByTenantDrillDown": { + "chartName": "DSS_TL_STATUS_BY_WARD", + "queries": [ + { + "module": "TL", + "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \"tenantId\" : \"Data.tradelicense.tenantId.keyword\" }", + "dateRefField": "Data.tradelicense.applicationDate", + "indexName": "tlindex-v1", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tradelicense.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Ward \":{\"terms\":{\"field\":\"Data.ward.name.keyword\",\"size\":1000},\"aggs\":{\"Status\":{\"terms\":{\"field\":\"Data.tradelicense.status.keyword\",\"size\":1000,\"min_doc_count\":0},\"aggs\":{\"License Issued\":{\"value_count\":{\"field\":\"Data.tradelicense.licenseNumber.keyword\"}}}}}}}}}}", + "aggrQueryBc": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tradelicense.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Ward \":{\"terms\":{\"field\":\"Data.ward.name.keyword\",\"size\":1000},\"aggs\":{\"Status\":{\"filters\":{\"filters\":{\"Approved\":{\"match\":{\"Data.tradelicense.status.keyword\":\"APPROVED\"}},\"Initiated\":{\"match\":{\"Data.tradelicense.status.keyword\":\"INITIATED\"}},\"Applied\":{\"match\":{\"Data.tradelicense.status.keyword\":\"APPLIED\"}},\"Rejected\":{\"match\":{\"Data.tradelicense.status.keyword\":\"REJECTED\"}},\"Pending Approval\":{\"match\":{\"Data.tradelicense.status.keyword\":\"PENDINGAPPROVAL\"}},\"Field Inspection\":{\"match\":{\"Data.tradelicense.status.keyword\":\"FIELDINSPECTION\"}},\"Cancelled\":{\"match\":{\"Data.tradelicense.status.keyword\":\"CANCELLED\"}},\"Pending Payment\":{\"match\":{\"Data.tradelicense.status.keyword\":\"PENDINGPAYMENT\"}},\"Paid\":{\"match\":{\"Data.tradelicense.status.keyword\":\"PAID\"}}}}}}}}}}}" + } + ], + "filterKeys": [ + ], + "chartType": "xtable", + "valueType": "number", + "drillChart": "", + "drillFields": [ + "" + ], + "documentType": "_doc", + "action": "", + "plotLabel": "Ward", + "aggregationPathsA": [ + "Approved", + "Initiated", + "Applied", + "Rejected", + "Pending Approval", + "Field Inspection", + "Cancelled", + "Pending Payment", + "Paid" + ], + "pathDataTypeMappingA": [ + { + "Approved": "number" + }, + { + "Initiated": "number" + }, + { + "Applied": "number" + }, + { + "Rejected": "number" + }, + { + "Pending Approval": "number" + }, + { + "Field Inspection": "number" + }, + { + "Cancelled": "number" + }, + { + "Pending Payment": "number" + }, + { + "Paid": "number" + } + ], + "insight": { + }, + "_comment": "" + }, + + "_comment": "Enhanced table charts..TODO: refactor to remove xtable type ", + "xlicenseIssuedBoundaryRevenue": { + "chartName": "DSS_TL_DEMAND_COLLECTION_BOUNDARY", + "queries": [ + { + "module": "COMMON", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"CANCELLED\"]}}]}},\"aggs\":{\"ULBs \":{\"terms\":{\"field\":\"dataObject.tenantId.keyword\",\"size\":200,\"min_doc_count\":0},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}},\"Transactions\":{\"value_count\":{\"field\":\"dataObject.transactionNumber.keyword\"}},\"Total Licence Issued\":{\"value_count\":{\"field\":\"domainObject.tradelicense.licenseNumber.keyword\"}}}}}}}}" + }, + { + "module": "COMMON", + "requestQueryMap": "{\"module\" : \"businessService.keyword\", \"tenantId\" : \"tenantIdForMunicipalCorporation.keyword\"}", + "dateRefField": "", + "indexName": "dss-target_v1", + "aggrQuery": "{\"aggs\":{\"ULBs \":{\"terms\":{\"field\":\"tenantIdForMunicipalCorporation.keyword\",\"size\":1000,\"min_doc_count\":0},\"aggs\":{\"Target Collection\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}}}" + } + ], + "filterKeys": [ + {"key": "tenantId", "column": "Boundary"} + ], + "postAggregationTheory" : "repsonseToDifferenceOfDates", + "chartType": "xtable", + "valueType": "number", + "drillChart": "", + "plotLabel": "Boundary", + "aggregationPaths": [ + ], + "computedFields": [ + { + "postAggregationTheory" : "repsonseToDifferenceOfDates", + "actionName": "PercentageComputedField", + "fields" : ["Target Collection", "Total Collection"], + "newField" : "Target Achieved", + "_comments": "fields are field names picked from its aggregation query to use post aggregation newField value with given new field name " + }, + { + "postAggregationTheory" : "repsonseToDifferenceOfDates", + "actionName": "PercentageComputedField", + "fields" : ["Target Collection", "Total Collection"], + "newField" : "Target Achieved", + "_comments": "fields are field names picked from its aggregation query to use post aggregation newField value with given new field name " + } + ], + "pathDataTypeMapping": [ + ], + "insight": { + }, + "_comment": "" + }, + "xptFyByDDR": { + "chartName": "DSS_TL_STATUS_BY_TENANT", + "queries": [ + { + "module": "PT", + "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\",\"tenantId\" : \"Data.tenantId.keyword\" }", + "dateRefField": "Data.@timestamp", + "indexName": "property-assessments", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Fys\":{\"terms\":{\"field\":\"Data.financialYear.keyword\",\"min_doc_count\":0}}}}}}" + }, + { + "module": "PT", + "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \"tenantId\" : \"Data.tenantId.keyword\" }", + "dateRefField": "Data.@timestamp", + "indexName": "property-assessments", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Total\":{\"value_count\":{\"field\":\"Data.assessmentNumber.keyword\"}}}}}}}}" + } + ], + "isMdmsEnabled": true, + "filterKeys": [ + {"key": "tenantId", "column": "DDRs"} + ], + "chartType": "xtable", + "valueType": "number", + "drillChart": "xptFyByTenant", + "plotLabel": "DDRs", + "insight": { + }, + "_comment": "" + }, + "xptFyByTenant": { + "chartName": "DSS_TL_STATUS_BY_TENANT", + "queries": [ + { + "module": "PT", + "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\",\"tenantId\" : \"Data.tenantId.keyword\" }", + "dateRefField": "Data.@timestamp", + "indexName": "property-assessments", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"ULBS \":{\"terms\":{\"field\":\"Data.tenantId.keyword\"},\"aggs\":{\"Fys\":{\"terms\":{\"field\":\"Data.financialYear.keyword\",\"min_doc_count\":0}}}}}}}}" + }, + { + "module": "PT", + "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\",\"tenantId\" : \"Data.tenantId.keyword\" }", + "dateRefField": "Data.@timestamp", + "indexName": "property-assessments", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"ULBS \":{\"terms\":{\"field\":\"Data.tenantId.keyword\"},\"aggs\":{\"Total\":{\"value_count\":{\"field\":\"Data.assessmentNumber.keyword\"}}}}}}}}" + } + ], + "filterKeys": [ + {"key": "tenantId", "column": "Boundary"} + ], + "chartType": "xtable", + "valueType": "number", + "drillChart": "xptFyByWard", + "plotLabel": "Boundary", + "insight": { + }, + "_comment": "" + }, + "xptFyByWard": { + "chartName": "DSS_TL_STATUS_BY_TENANT", + "queries": [ + { + "module": "PT", + "requestQueryMap": "{\"tenantId\" : \"Data.tenantId.keyword\" , \"wardId\" : \"Data.ward.name.keyword\"}", + "dateRefField": "Data.@timestamp", + "indexName": "property-assessments", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Ward \":{\"terms\":{\"field\":\"Data.ward.locality.name.keyword\"},\"aggs\":{\"Fys\":{\"terms\":{\"field\":\"Data.financialYear.keyword\",\"min_doc_count\":0}}}}}}}}" + }, + { + "module": "PT", + "requestQueryMap": "{\"tenantId\" : \"Data.tenantId.keyword\" , \"wardId\" : \"Data.ward.name.keyword\"}", + "dateRefField": "Data.@timestamp", + "indexName": "property-assessments", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Ward \":{\"terms\":{\"field\":\"Data.ward.locality.name.keyword\"},\"aggs\":{\"Total\":{\"value_count\":{\"field\":\"Data.assessmentNumber.keyword\"}}}}}}}}" + } + ], + "filterKeys": [ + ], + "chartType": "xtable", + "valueType": "number", + "drillChart": "none", + "plotLabel": "Wards", + "insight": { + }, + "_comment": "" + }, + + "xpgrStatusByDDR": { + "chartName": "DSS_PGR_STATUS_BY_TENANT", + "queries": [ + { + "module": "PGR", + "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\", \"tenantId\" : \"Data.tenantId.keyword\" , \"departmentId\" : \"Data.department.keyword\"}", + "dateRefField": "Data.dateOfComplaint", + "indexName": "pgrindex-v1", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"withinSLA\":{\"range\":{\"script\":{\"lang\":\"painless\",\"source\":\"doc['Data.slaHours'].value\"},\"ranges\":[{\"key\":\"withinSLA\",\"from\":0,\"to\":360}]}},\"Open Complaints\":{\"filter\":{\"terms\":{\"Data.status.keyword\":[\"open\",\"reassignrequested\"]}},\"aggs\":{\"Open Complaints\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}},\"Assigned Complaints\":{\"filter\":{\"terms\":{\"Data.status.keyword\":[\"assign\"]}},\"aggs\":{\"Assigned Complaints\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}},\"Resolved Complaints\":{\"filter\":{\"terms\":{\"Data.status.keyword\":[\"resolved\"]}},\"aggs\":{\"Resolved Complaints\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}},\"Rejected Complaints\":{\"filter\":{\"terms\":{\"Data.status.keyword\":[\"rejected\"]}},\"aggs\":{\"Rejected Complaints\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}},\"Closed Complaints\":{\"filter\":{\"terms\":{\"Data.status.keyword\":[\"closed\",\"rejected\",\"resolved\"]}},\"aggs\":{\"Closed Complaints\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}},\"Total Complaints\":{\"value_count\":{\"field\":\"Data.dateOfComplaint\"}},\"Reopened Complaints\":{\"filter\":{\"terms\":{\"Data.actionHistory.actions.action.keyword\":[\"reopen\"]}},\"aggs\":{\"Reopened Complaints\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}}}}" + } + ], + "isMdmsEnabled": true, + "filterKeys": [ + {"key": "tenantId", "column": "DDRs"} + ], + "chartType": "xtable", + "valueType": "number", + "drillChart": "xpgrStatusByTenant", + "plotLabel": "DDRs", + "excludedColumns": ["withinSLA"], + "computedFields": [ + { + "postAggregationTheory" : "", + "actionName": "PercentageComputedField", + "fields" : ["Closed Complaints", "Total Complaints"], + "newField" : "Completion Rate", + "_comments": "fields are field names picked from its aggregation query to use post aggregation newField value with given new field name " + }, + { + "postAggregationTheory" : "", + "actionName": "PercentageComputedField", + "fields" : ["withinSLA","Total Complaints"], + "newField" : "Sla Achieved", + "_comments": "fields are field names picked from its aggregation query to use post aggregation newField value with given new field name " + } + ], + "insight": { + }, + "_comment": "" + }, + "xpgrStatusByTenant": { + "chartName": "DSS_PGR_STATUS_BY_TENANT", + "queries": [ + { + "module": "PGR", + "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\", \"tenantId\" : \"Data.tenantId.keyword\" , \"departmentId\" : \"Data.department.keyword\"}", + "dateRefField": "Data.dateOfComplaint", + "indexName": "pgrindex-v1", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"ULBs \":{\"terms\":{\"field\":\"Data.tenantId.keyword\",\"size\":1000},\"aggs\":{\"withinSLA\":{\"range\":{\"script\":{\"lang\":\"painless\",\"source\":\"doc['Data.slaHours'].value\"},\"ranges\":[{\"key\":\"withinSLA\",\"from\":0,\"to\":360}]}},\"Open Complaints\":{\"filter\":{\"terms\":{\"Data.status.keyword\":[\"open\",\"reassignrequested\"]}},\"aggs\":{\"Open Complaints\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}},\"Assigned Complaints\":{\"filter\":{\"terms\":{\"Data.status.keyword\":[\"assign\"]}},\"aggs\":{\"Assigned Complaints\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}},\"Resolved Complaints\":{\"filter\":{\"terms\":{\"Data.status.keyword\":[\"resolved\"]}},\"aggs\":{\"Resolved Complaints\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}},\"Rejected Complaints\":{\"filter\":{\"terms\":{\"Data.status.keyword\":[\"rejected\"]}},\"aggs\":{\"Rejected Complaints\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}},\"Closed Complaints\":{\"filter\":{\"terms\":{\"Data.status.keyword\":[\"closed\",\"rejected\",\"resolved\"]}},\"aggs\":{\"Closed Complaints\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}},\"Total Complaints\":{\"value_count\":{\"field\":\"Data.dateOfComplaint\"}},\"Reopened Complaints\":{\"filter\":{\"terms\":{\"Data.actionHistory.actions.action.keyword\":[\"reopen\"]}},\"aggs\":{\"Reopened Complaints\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}}}}}}" + + } + ], + "filterKeys": [ + {"key": "tenantId", "column": "Boundary"} + ], + "chartType": "xtable", + "valueType": "number", + "drillChart": "xpgrStatusByWard", + "plotLabel": "Boundary", + "excludedColumns": ["withinSLA"], + "computedFields": [ + { + "postAggregationTheory" : "", + "actionName": "PercentageComputedField", + "fields" : ["Closed Complaints", "Total Complaints"], + "newField" : "Completion Rate", + "_comments": "fields are field names picked from its aggregation query to use post aggregation newField value with given new field name " + }, + { + "postAggregationTheory" : "", + "actionName": "PercentageComputedField", + "fields" : ["Total Complaints", "withinSLA"], + "newField" : "Sla Achieved", + "_comments": "fields are field names picked from its aggregation query to use post aggregation newField value with given new field name " + } + ], + "insight": { + }, + "_comment": "" + }, + "xpgrStatusByWard": { + "chartName": "DSS_PGR_STATUS_BY_TENANT", + "queries": [ + { + "module": "PGR", + "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\", \"tenantId\" : \"Data.tenantId.keyword\" , \"departmentId\" : \"Data.department.keyword\"}", + "dateRefField": "Data.dateOfComplaint", + "indexName": "pgrindex-v1", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Ward \":{\"terms\":{\"field\":\"Data.complaintWard.name.keyword\",\"size\":1000},\"aggs\":{\"withinSLA\":{\"range\":{\"script\":{\"lang\":\"painless\",\"source\":\"doc['Data.slaHours'].value\"},\"ranges\":[{\"key\":\"withinSLA\",\"from\":0,\"to\":360}]}},\"Open Complaints\":{\"filter\":{\"terms\":{\"Data.status.keyword\":[\"open\",\"reassignrequested\"]}},\"aggs\":{\"Open Complaints\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}},\"Assigned Complaints\":{\"filter\":{\"terms\":{\"Data.status.keyword\":[\"assign\"]}},\"aggs\":{\"Assigned Complaints\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}},\"Resolved Complaints\":{\"filter\":{\"terms\":{\"Data.status.keyword\":[\"resolved\"]}},\"aggs\":{\"Resolved Complaints\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}},\"Rejected Complaints\":{\"filter\":{\"terms\":{\"Data.status.keyword\":[\"rejected\"]}},\"aggs\":{\"Rejected Complaints\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}},\"Closed Complaints\":{\"filter\":{\"terms\":{\"Data.status.keyword\":[\"closed\",\"rejected\",\"resolved\"]}},\"aggs\":{\"Closed Complaints\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}},\"Total Complaints\":{\"value_count\":{\"field\":\"Data.dateOfComplaint\"}},\"Reopened Complaints\":{\"filter\":{\"terms\":{\"Data.actionHistory.actions.action.keyword\":[\"reopen\"]}},\"aggs\":{\"Reopened Complaints\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}}}}}}" + + } + ], + "filterKeys": [ + {"key": "tenantId", "column": "Boundary"} + ], + "chartType": "xtable", + "valueType": "number", + "drillChart": "none", + + "documentType": "_doc", + "action": "", + "plotLabel": "Ward", + "excludedColumns": ["withinSLA"], + "computedFields": [ + { + "postAggregationTheory" : "", + "actionName": "PercentageComputedField", + "fields" : ["Closed Complaints", "Total Complaints"], + "newField" : "Completion Rate", + "_comments": "fields are field names picked from its aggregation query to use post aggregation newField value with given new field name " + }, + { + "postAggregationTheory" : "", + "actionName": "PercentageComputedField", + "fields" : ["Total Complaints", "withinSLA"], + "newField" : "Sla Achieved", + "_comments": "fields are field names picked from its aggregation query to use post aggregation newField value with given new field name " + } + ], + "insight": { + }, + "_comment": "" + }, + "xpgrStatusByDept": { + "chartName": "DSS_PGR_STATUS_BY_TENANT", + "queries": [ + { + "module": "PGR", + "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\",\"tenantId\" : \"Data.tenantId.keyword\" , \"departmentId\" : \"Data.department.keyword\"}", + "dateRefField": "Data.dateOfComplaint", + "indexName": "pgrindex-v1", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Department \":{\"terms\":{\"field\":\"Data.department.keyword\",\"size\":1000},\"aggs\":{\"withinSLA\":{\"range\":{\"script\":{\"lang\":\"painless\",\"source\":\"doc['Data.slaHours'].value\"},\"ranges\":[{\"key\":\"withinSLA\",\"from\":0,\"to\":360}]}},\"Open Complaints\":{\"filter\":{\"terms\":{\"Data.status.keyword\":[\"open\",\"reassignrequested\"]}},\"aggs\":{\"Open Complaints\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}},\"Assigned Complaints\":{\"filter\":{\"terms\":{\"Data.status.keyword\":[\"assign\"]}},\"aggs\":{\"Assigned Complaints\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}},\"Resolved Complaints\":{\"filter\":{\"terms\":{\"Data.status.keyword\":[\"resolved\"]}},\"aggs\":{\"Resolved Complaints\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}},\"Rejected Complaints\":{\"filter\":{\"terms\":{\"Data.status.keyword\":[\"rejected\"]}},\"aggs\":{\"Rejected Complaints\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}},\"Closed Complaints\":{\"filter\":{\"terms\":{\"Data.status.keyword\":[\"closed\",\"rejected\",\"resolved\"]}},\"aggs\":{\"Closed Complaints\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}},\"Total Complaints\":{\"value_count\":{\"field\":\"Data.dateOfComplaint\"}},\"Reopened Complaints\":{\"filter\":{\"terms\":{\"Data.actionHistory.actions.action.keyword\":[\"reopen\"]}},\"aggs\":{\"Reopened Complaints\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}}}}}}" + } + ], + "filterKeys": [ + {"key": "departmentId", "column": "Department"} + ], + "chartType": "xtable", + "valueType": "number", + "drillChart": "xpgrStatusByCatagory", + + "documentType": "_doc", + "action": "", + "plotLabel": "Department", + "excludedColumns": ["withinSLA"], + "computedFields": [ + { + "postAggregationTheory" : "", + "actionName": "PercentageComputedField", + "fields" : ["Closed Complaints", "Total Complaints"], + "newField" : "Completion Rate", + "_comments": "fields are field names picked from its aggregation query to use post aggregation newField value with given new field name " + }, + { + "postAggregationTheory" : "", + "actionName": "PercentageComputedField", + "fields" : ["Total Complaints", "withinSLA"], + "newField" : "Sla Achieved", + "_comments": "fields are field names picked from its aggregation query to use post aggregation newField value with given new field name " + } + ], + "insight": { + }, + "_comment": "" + }, + "xpgrStatusByCatagory": { + "chartName": "DSS_PGR_STATUS_BY_TENANT", + "queries": [ + { + "module": "PGR", + "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\", \"tenantId\" : \"Data.tenantId.keyword\" , \"departmentId\" : \"Data.department.keyword\"}", + "dateRefField": "Data.dateOfComplaint", + "indexName": "pgrindex-v1", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Category \":{\"terms\":{\"field\":\"Data.complainCategory.keyword\",\"size\":1000},\"aggs\":{\"withinSLA\":{\"range\":{\"script\":{\"lang\":\"painless\",\"source\":\"doc['Data.slaHours'].value\"},\"ranges\":[{\"key\":\"withinSLA\",\"from\":0,\"to\":360}]}},\"Open Complaints\":{\"filter\":{\"terms\":{\"Data.status.keyword\":[\"open\",\"reassignrequested\"]}},\"aggs\":{\"Open Complaints\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}},\"Assigned Complaints\":{\"filter\":{\"terms\":{\"Data.status.keyword\":[\"assign\"]}},\"aggs\":{\"Assigned Complaints\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}},\"Resolved Complaints\":{\"filter\":{\"terms\":{\"Data.status.keyword\":[\"resolved\"]}},\"aggs\":{\"Resolved Complaints\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}},\"Rejected Complaints\":{\"filter\":{\"terms\":{\"Data.status.keyword\":[\"rejected\"]}},\"aggs\":{\"Rejected Complaints\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}},\"Closed Complaints\":{\"filter\":{\"terms\":{\"Data.status.keyword\":[\"closed\",\"rejected\",\"resolved\"]}},\"aggs\":{\"Closed Complaints\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}},\"Total Complaints\":{\"value_count\":{\"field\":\"Data.dateOfComplaint\"}},\"Reopened Complaints\":{\"filter\":{\"terms\":{\"Data.actionHistory.actions.action.keyword\":[\"reopen\"]}},\"aggs\":{\"Reopened Complaints\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}}}}}}" + } + ], + "filterKeys": [ + {"key": "departmentId", "column": "Department"} + ], + "chartType": "xtable", + "valueType": "number", + "drillChart": "none", + + "documentType": "_doc", + "action": "", + "plotLabel": "Complaint Category", + "excludedColumns": ["withinSLA"], + "computedFields": [ + { + "postAggregationTheory" : "", + "actionName": "PercentageComputedField", + "fields" : ["Closed Complaints", "Total Complaints"], + "newField" : "Completion Rate", + "_comments": "fields are field names picked from its aggregation query to use post aggregation newField value with given new field name " + }, + { + "postAggregationTheory" : "", + "actionName": "PercentageComputedField", + "fields" : ["Total Complaints", "withinSLA"], + "newField" : "Sla Achieved", + "_comments": "fields are field names picked from its aggregation query to use post aggregation newField value with given new field name " + } + ], + "insight": { + }, + "_comment": "" + }, + + "_comment": "PGR NON-COLLECTION CHARTS", + "complaintsResolvingRate": { + "chartName": "DSS_PGR_COMPLAINTS_RESOLVING_RATE", + "queries": [ + { + "module": "PGR", + "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\", \"tenantId\" : \"Data.tenantId\"}", + "dateRefField": "Data.dateOfComplaint", + "indexName": "pgrindex-v1", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Total Complaints\":{\"value_count\":{\"field\":\"Data.dateOfComplaint\"}},\"Closed Complaints\":{\"filters\":{\"filters\":{\"resolved\":{\"match\":{\"Data.status.keyword\":\"resolved\"}}}}}}}}}" + } + ], + "chartType": "metric", + "valueType": "percentage", + "drillChart": "none", + "documentType": "_doc", + "action": "percentage", + "aggregationPaths": [ + "Closed Complaints", + "Total Complaints" + ], + "insight": { + "chartResponseMap" : "completionRate", + "action" : "differenceOfNumbers", + "upwardIndicator" : "positive", + "downwardIndicator" : "negative", + "textMessage" : "$indicator$value% than last $insightInterval", + "colorCode" : "#228B22", + "insightInterval" : "year" + }, + "_comment": " Total Number of Complaints " + }, + "totalComplaints": { + "chartName": "DSS_PGR_TOTAL_COMPLAINTS", + "queries": [ + { + "module": "PGR", + "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\", \"tenantId\" : \"Data.tenantId\"}", + "dateRefField": "Data.dateOfComplaint", + "indexName": "pgrindex-v1", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Total Complaints\":{\"value_count\":{\"field\":\"Data.dateOfComplaint\"}}}}}}" + } + ], + "chartType": "metric", + "valueType": "number", + "drillChart": "none", + "documentType": "_doc", + "action": "", + "aggregationPaths": [ + "Total Complaints" + ], + "insight": { + "chartResponseMap" : "totalComplaints", + "action" : "differenceOfNumbers", + "upwardIndicator" : "positive", + "downwardIndicator" : "negative", + "textMessage" : "$indicator$value% than last $insightInterval", + "colorCode" : "#228B22", + "insightInterval" : "year" + }, + "_comment": " Total Number of Complaints " + }, + "closedComplaints": { + "chartName": "DSS_PGR_CLOSED_COMPLAINTS", + "queries": [ + { + "module": "PGR", + "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\", \"tenantId\" : \"Data.tenantId\"}", + "dateRefField": "Data.dateOfComplaint", + "indexName": "pgrindex-v1", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Closed Complaints\":{\"filters\":{\"filters\":{\"closed\":{\"match\":{\"Data.status.keyword\":\"closed\"}}}}}}}}}\n" + } + ], + "chartType": "metric", + "valueType": "number", + "drillChart": "none", + "documentType": "_doc", + "action": "", + "aggregationPaths": [ + "Closed Complaints" + ], + "insight": { + "chartResponseMap" : "closedComplaints", + "action" : "differenceOfNumbers", + "upwardIndicator" : "positive", + "downwardIndicator" : "negative", + "textMessage" : "$indicator$value% than last $insightInterval", + "colorCode" : "#228B22", + "insightInterval" : "year" + }, + "_comment": " Total Number of Closed Complaints " + }, + "reopenedComplaints": { + "chartName": "DSS_PGR_REOPENED_COMPLAINTS", + "queries": [ + { + "module": "PGR", + "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\", \"tenantId\" : \"Data.tenantId\"}", + "dateRefField": "Data.dateOfComplaint", + "indexName": "pgrindex-v1", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Reopened Complaints\":{\"filters\":{\"filters\":{\"reopen\":{\"match\":{\"Data.actionHistory.actions.action.keyword\":\"reopen\"}}}}}}}}}" + } + ], + "chartType": "metric", + "valueType": "number", + "drillChart": "none", + "documentType": "_doc", + "action": "", + "aggregationPaths": [ + "Reopened Complaints" + ], + "insight": { + "chartResponseMap" : "reopenedComplaints", + "action" : "differenceOfNumbers", + "upwardIndicator" : "positive", + "downwardIndicator" : "negative", + "textMessage" : "$indicator$value% than last $insightInterval", + "colorCode" : "#228B22", + "insightInterval" : "year" + }, + "_comment": " Total Number of Resolved Complaints " + }, + "resolvedComplaints": { + "chartName": "DSS_PGR_RESOLVED_COMPLAINTS", + "queries": [ + { + "module": "PGR", + "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\", \"tenantId\" : \"Data.tenantId\"}", + "dateRefField": "Data.dateOfComplaint", + "indexName": "pgrindex-v1", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Resolved Complaints\":{\"filters\":{\"filters\":{\"resolved\":{\"match\":{\"Data.status.keyword\":\"resolved\"}}}}}}}}}" + } + ], + "chartType": "metric", + "valueType": "number", + "drillChart": "none", + "documentType": "_doc", + "action": "", + "aggregationPaths": [ + "Resolved Complaints" + ], + "insight": { + "chartResponseMap" : "resolvedComplaints", + "action" : "differenceOfNumbers", + "upwardIndicator" : "positive", + "downwardIndicator" : "negative", + "textMessage" : "$indicator$value% than last $insightInterval", + "colorCode" : "#228B22", + "insightInterval" : "year" + }, + "_comment": " Total Number of Resolved Complaints " + }, + "rejectedComplaints": { + "chartName": "DSS_PGR_REJECTED_COMPLAINTS", + "queries": [ + { + "module": "PGR", + "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\", \"tenantId\" : \"Data.tenantId\"}", + "dateRefField": "Data.dateOfComplaint", + "indexName": "pgrindex-v1", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Rejected Complaints\":{\"filters\":{\"filters\":{\"rejected\":{\"match\":{\"Data.status.keyword\":\"rejected\"}}}}}}}}}" + } + ], + "chartType": "metric", + "valueType": "number", + "drillChart": "none", + "documentType": "_doc", + "action": "", + "aggregationPaths": [ + "Rejected Complaints" + ], + "insight": { + "chartResponseMap" : "rejectedComplaints", + "action" : "differenceOfNumbers", + "upwardIndicator" : "positive", + "downwardIndicator" : "negative", + "textMessage" : "$indicator$value% than last $insightInterval", + "colorCode" : "#228B22", + "insightInterval" : "year" + }, + "_comment": " Total Number of Rejected Complaints " + }, + "cumulativeComplaints": { + "chartName": "DSS_TOTAL_CUMULATIVE_CLOSED_COMPLAINTS", + "queries": [ + { + "module": "PGR", + "dateRefField": "Data.dateOfComplaint", + "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\",\"tenantId\" : \"Data.tenantId\"}", + "indexName": "pgrindex-v1", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Total Complaints\":{\"date_histogram\":{\"field\":\"Data.dateOfComplaint\",\"interval\":\"month\"},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}},\"Resolved Complaints\":{\"date_histogram\":{\"field\":\"Data.dateOfComplaint\",\"interval\":\"month\"},\"aggs\":{\"Resolved\":{\"filter\":{\"terms\":{\"Data.status.keyword\":[\"resolved\"]}},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}},\"Rejected Complaints\":{\"date_histogram\":{\"field\":\"Data.dateOfComplaint\",\"interval\":\"month\"},\"aggs\":{\"Rejected\":{\"filter\":{\"terms\":{\"Data.status.keyword\":[\"rejected\"]}},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}},\"Closed Complaints\":{\"date_histogram\":{\"field\":\"Data.dateOfComplaint\",\"interval\":\"month\"},\"aggs\":{\"Closed\":{\"filter\":{\"terms\":{\"Data.status.keyword\":[\"closed\"]}},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}},\"Reopened Complaints\":{\"date_histogram\":{\"field\":\"Data.dateOfComplaint\",\"interval\":\"month\"},\"aggs\":{\"Reopened\":{\"filter\":{\"terms\":{\"Data.actionHistory.actions.action.keyword\":[\"reopen\"]}},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}}}}}}" + } + ], + "chartType": "line", + "valueType": "number", + "action": "", + "drillChart": "none", + "documentType": "_doc", + "aggregationPaths": [ + "Closed Complaints", + "Reopened Complaints", + "Total Complaints", + "Resolved Complaints", + "Rejected Complaints" + + ], + "isCumulative": true, + "interval": "month", + "insight": { + }, + "_comment": " " + }, + "totalComplaintsbySource": { + "chartName": "DSS_PGR_TOTAL_COMPLAINTS_BY_SOURCE", + "queries": [ + { + "module": "PGR", + "dateRefField": "Data.dateOfComplaint", + "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\", \"tenantId\" : \"Data.tenantId\"}", + "indexName": "pgrindex-v1", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Ivr\":{\"date_histogram\":{\"field\":\"Data.dateOfComplaint\",\"interval\":\"intervalvalue\"},\"aggs\":{\"ivr\":{\"filter\":{\"terms\":{\"Data.source.keyword\":[\"ivr\"]}},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.dateOfComplaint\"}}}}}},\"Web\":{\"date_histogram\":{\"field\":\"Data.dateOfComplaint\",\"interval\":\"intervalvalue\"},\"aggs\":{\"web\":{\"filter\":{\"terms\":{\"Data.source.keyword\":[\"web\"]}},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.dateOfComplaint\"}}}}}},\"Whatsapp\":{\"date_histogram\":{\"field\":\"Data.dateOfComplaint\",\"interval\":\"intervalvalue\"},\"aggs\":{\"whatapp\":{\"filter\":{\"terms\":{\"Data.source.keyword\":[\"whatsapp\"]}},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.dateOfComplaint\"}}}}}},\"Mobileapp\":{\"date_histogram\":{\"field\":\"Data.dateOfComplaint\",\"interval\":\"intervalvalue\"},\"aggs\":{\"mobileapp\":{\"filter\":{\"terms\":{\"Data.source.keyword\":[\"mobileapp\"]}},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.dateOfComplaint\"}}}}}}}}}}" + } + ], + "chartType": "line", + "valueType": "number", + "action": "", + "drillChart": "none", + "documentType": "_doc", + "aggregationPaths": [ + "Ivr", + "Web", + "Whatsapp", + "Mobileapp" + ], + "isCumulative": false, + "interval": "month", + "insight": { + }, + "_comment": " " + }, + "totalComplaintsbyStatus": { + "chartName": "DSS_PGR_TOTAL_COMPLAINTS_BY_STATUS", + "queries": [ + { + "module": "PGR", + "dateRefField": "Data.dateOfComplaint", + "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\",\"tenantId\" : \"Data.tenantId\"}", + "indexName": "pgrindex-v1", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Open\":{\"date_histogram\":{\"field\":\"Data.dateOfComplaint\",\"interval\":\"intervalvalue\"},\"aggs\":{\"open\":{\"filter\":{\"terms\":{\"Data.status.keyword\":[\"open\",\"reassignrequested\",\"assign\"]}},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.dateOfComplaint\"}}}}}},\"Closed\":{\"date_histogram\":{\"field\":\"Data.dateOfComplaint\",\"interval\":\"intervalvalue\"},\"aggs\":{\"closed\":{\"filter\":{\"terms\":{\"Data.status.keyword\":[\"closed\",\"rejected\",\"resolved\"]}},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.dateOfComplaint\"}}}}}}}}}}" + } + ], + "chartType": "line", + "valueType": "number", + "action": "", + "drillChart": "none", + "documentType": "_doc", + "aggregationPaths": [ + "Open", + "Closed" + ], + "isCumulative": false, + "interval": "month", + "insight": { + }, + "_comment": " " + }, + "complaintsByStatus": { + "chartName": "DSS_PGR_COMPLAINTS_BY_STATUS", + "queries": [ + { + "module": "PGR", + "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\",\"tenantId\" : \"Data.tenantId\"}", + "dateRefField": "Data.dateOfComplaint", + "indexName": "pgrindex-v1", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Complaints By Status\":{\"filters\":{\"filters\":{\"Open\":{\"terms\":{\"Data.status.keyword\":[\"open\",\"reassignrequested\"]}},\"Reopen\":{\"match\":{\"Data.status.keyword\":\"reopen\"}},\"Assigned\":{\"match\":{\"Data.status.keyword\":\"assigned\"}},\"Closed\":{\"match\":{\"Data.status.keyword\":\"closed\"}},\"Resolved\":{\"match\":{\"Data.status.keyword\":\"resolved\"}},\"Rejected\":{\"match\":{\"Data.status.keyword\":\"rejected\"}}}}}}}}}" + } + ], + "chartType": "pie", + "valueType": "number", + "action": "", + "documentType": "_doc", + "drillChart": "none", + "aggregationPaths": [ + "Open", + "Reopen", + "Assigned", + "Closed", + "Resolved", + "Rejected" + + ], + "insight": { + }, + "_comment": " Complaints By Their Statuses" + }, + "complaintsByChannel": { + "chartName": "DSS_PGR_COMPLAINTS_BY_CHANNELS", + "queries": [ + { + "module": "PGR", + "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\", \"tenantId\" : \"Data.tenantId\"}", + "dateRefField": "Data.dateOfComplaint", + "indexName": "pgrindex-v1", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Complaints By Channels\":{\"terms\":{\"field\":\"Data.source.keyword\"},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.dateOfComplaint\"}}}}}}}}" + } + ], + "chartType": "pie", + "valueType": "number", + "action": "", + "documentType": "_doc", + "drillChart": "none", + "aggregationPaths": [ + "Complaints By Channels" + ], + "insight": { + }, + "_comment": " Top 3 Channels For Complaints" + }, + "complaintsByCategory": { + "chartName": "DSS_PGR_COMPLAINTS_BY_CATEGORY", + "queries": [ + { + "module": "PGR", + "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\",\"tenantId\" : \"Data.tenantId\"}", + "dateRefField": "Data.dateOfComplaint", + "indexName": "pgrindex-v1", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Complaints By Category\":{\"terms\":{\"field\":\"Data.complainCategory.keyword\"},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.dateOfComplaint\"}}}}}}}}" + } + ], + "chartType": "pie", + "valueType": "number", + "action": "", + "documentType": "_doc", + "drillChart": "none", + "aggregationPaths": [ + "Complaints By Category" + ], + "insight": { + }, + "_comment": " Top 3 Channels For Complaints" + }, + "complaintsByTenant": { + "chartName": "DSS_PGR_COMPLAINTS_BY_TENANT", + "queries": [ + { + "module": "PGR", + "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\", \"tenantId\" : \"Data.tenantId\"}", + "dateRefField": "Data.dateOfComplaint", + "indexName": "pgrindex-v1", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Complaints By Tenant\":{\"terms\":{\"field\":\"Data.tenantId.keyword\"},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.dateOfComplaint\"}}}}}}}}" + } + ], + "chartType": "pie", + "valueType": "number", + "action": "", + "documentType": "_doc", + "drillChart": "none", + "aggregationPaths": [ + "Complaints By Tenant" + ], + "insight": { + }, + "_comment": " Complaints by Tenant" + }, + "complaintsByDistrict": { + "chartName": "DSS_PGR_COMPLAINTS_BY_DISTRICT", + "queries": [ + { + "module": "PGR", + "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\", \"tenantId\" : \"Data.tenantId\"}", + "dateRefField": "Data.dateOfComplaint", + "indexName": "pgrindex-v1", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Complaints By District\":{\"terms\":{\"field\":\"Data.tenantData.city.districtName.keyword\"},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.dateOfComplaint\"}}}}}}}}" + } + ], + "chartType": "pie", + "valueType": "number", + "action": "", + "documentType": "_doc", + "drillChart": "none", + "aggregationPaths": [ + "Complaints By District" + ], + "insight": { + }, + "_comment": " Complaints by District" + }, + "complaintsByDepartment": { + "chartName": "DSS_PGR_COMPLAINTS_BY_DEPARTMENT", + "queries": [ + { + "module": "PGR", + "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\", \"tenantId\" : \"Data.tenantId\"}", + "dateRefField": "Data.dateOfComplaint", + "indexName": "pgrindex-v1", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Complaints By Department\":{\"terms\":{\"field\":\"Data.department.keyword\"},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.dateOfComplaint\"}}}}}}}}" + } + ], + "chartType": "pie", + "valueType": "number", + "action": "", + "documentType": "_doc", + "drillChart": "none", + "aggregationPaths": [ + "Complaints By Department" + ], + "insight": { + }, + "_comment": " Complaints by Department" + }, + "pgrStatusByDDR": { + "chartName": "DSS_PGR_STATUS_BY_DDR", + "queries": [ + { + "module": "PGR", + "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\",\"tenantId\" : \"Data.tenantId.keyword\" , \"departmentId\" : \"Data.department.keyword\"}", + "dateRefField": "Data.dateOfComplaint", + "indexName": "pgrindex-v1", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Closed Complaints\":{\"filters\":{\"filters\":{\"Open\":{\"match\":{\"Data.status.keyword\":\"open\"}},\"Reopen\":{\"match\":{\"Data.status.keyword\":\"reopen\"}},\"Assigned\":{\"match\":{\"Data.status.keyword\":\"assigned\"}},\"Closed\":{\"match\":{\"Data.status.keyword\":\"closed\"}},\"Resolved\":{\"match\":{\"Data.status.keyword\":\"resolved\"}},\"Rejected\":{\"match\":{\"Data.status.keyword\":\"rejected\"}},\"ReassignRequested\":{\"match\":{\"Data.status.keyword\":\"reassignrequested\"}}}}}}}}}" + } + ], + "isMdmsEnabled": true, + "filterKeys": [ + {"key": "tenantId", "column": "DDRs"} + ], + "chartType": "table", + "valueType": "number", + "drillChart": "pgrStatusByTenant", + "drillFields": [ + "" + ], + "documentType": "_doc", + "action": "", + "plotLabel": "DDRs", + "aggregationPaths": [ + "Open", + "Reopen", + "Assigned", + "Closed", + "Resolved", + "Rejected", + "ReassignRequested" + ], + "pathDataTypeMapping": [ + { + "Open": "number" + }, + { + "Reopen": "number" + }, + { + "Assigned": "number" + }, + { + "Closed": "number" + }, + { + "Resolved": "number" + }, + { + "Rejected": "number" + }, + { + "ReassignRequested": "number" + } + ], + "insight": { + }, + "_comment": "" + }, + "pgrStatusByTenant": { + "chartName": "DSS_PGR_STATUS_BY_TENANT", + "queries": [ + { + "module": "PGR", + "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\", \"tenantId\" : \"Data.tenantId.keyword\" , \"departmentId\" : \"Data.department.keyword\"}", + "dateRefField": "Data.dateOfComplaint", + "indexName": "pgrindex-v1", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"ULBs \":{\"terms\":{\"field\":\"Data.tenantId.keyword\",\"size\":1000},\"aggs\":{\"Closed Complaints\":{\"filters\":{\"filters\":{\"Open\":{\"match\":{\"Data.status.keyword\":\"open\"}},\"Reopen\":{\"match\":{\"Data.status.keyword\":\"reopen\"}},\"Assigned\":{\"match\":{\"Data.status.keyword\":\"assigned\"}},\"Closed\":{\"match\":{\"Data.status.keyword\":\"closed\"}},\"Resolved\":{\"match\":{\"Data.status.keyword\":\"resolved\"}},\"Rejected\":{\"match\":{\"Data.status.keyword\":\"rejected\"}},\"ReassignRequested\":{\"match\":{\"Data.status.keyword\":\"reassignrequested\"}}}}}}}}}}}" + } + ], + "filterKeys": [ + {"key": "tenantId", "column": "Boundary"} + ], + "chartType": "table", + "valueType": "number", + "drillChart": "pgrStatusWardDrillDown", + "drillFields": [ + "" + ], + "documentType": "_doc", + "action": "", + "plotLabel": "Boundary", + "aggregationPaths": [ + "Open", + "Reopen", + "Assigned", + "Closed", + "Resolved", + "Rejected", + "ReassignRequested" + ], + "pathDataTypeMapping": [ + { + "Open": "number" + }, + { + "Reopen": "number" + }, + { + "Assigned": "number" + }, + { + "Closed": "number" + }, + { + "Resolved": "number" + }, + { + "Rejected": "number" + }, + { + "ReassignRequested": "number" + } + ], + "insight": { + }, + "_comment": "" + }, + "pgrStatusWardDrillDown": { + "chartName": "", + "queries": [ + { + "module": "PGR", + "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\", \"tenantId\" : \"Data.tenantId.keyword\" , \"departmentId\" : \"Data.department.keyword\"}", + "dateRefField": "Data.dateOfComplaint", + "indexName": "pgrindex-v1", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Ward \":{\"terms\":{\"field\":\"Data.complaintWard.name.keyword\",\"size\":1000},\"aggs\":{\"Closed Complaints\":{\"filters\":{\"filters\":{\"Open\":{\"match\":{\"Data.status.keyword\":\"open\"}},\"Reopen\":{\"match\":{\"Data.status.keyword\":\"reopen\"}},\"Assigned\":{\"match\":{\"Data.status.keyword\":\"assigned\"}},\"Closed\":{\"match\":{\"Data.status.keyword\":\"closed\"}},\"Resolved\":{\"match\":{\"Data.status.keyword\":\"resolved\"}},\"Rejected\":{\"match\":{\"Data.status.keyword\":\"rejected\"}},\"ReassignRequested\":{\"match\":{\"Data.status.keyword\":\"reassignrequested\"}}}}}}}}}}}" + } + ], + "filterKeys": [ + ], + "chartType": "table", + "valueType": "number", + "drillChart": "", + "drillFields": [ + "" + ], + "documentType": "_doc", + "action": "", + "plotLabel": "Complaint Ward", + "aggregationPaths": [ + "Open", + "Reopen", + "Assigned", + "Closed", + "Resolved", + "Rejected", + "ReassignRequested" + ], + "pathDataTypeMapping": [ + { + "Open": "number" + }, + { + "Reopen": "number" + }, + { + "Assigned": "number" + }, + { + "Closed": "number" + }, + { + "Resolved": "number" + }, + { + "Rejected": "number" + }, + { + "ReassignRequested": "number" + } + ], + "insight": { + }, + "_comment": "" + }, + "pgrStatusByDepartment": { + "chartName": "DSS_PGR_STATUS_BY_DEPARTMENT", + "queries": [ + { + "module": "PGR", + "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\", \"tenantId\" : \"Data.tenantId.keyword\" }", + "dateRefField": "Data.dateOfComplaint", + "indexName": "pgrindex-v1", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Department \":{\"terms\":{\"field\":\"Data.department.keyword\",\"size\":1000},\"aggs\":{\"Closed Complaints\":{\"filters\":{\"filters\":{\"Open\":{\"match\":{\"Data.status.keyword\":\"open\"}},\"Reopen\":{\"match\":{\"Data.status.keyword\":\"reopen\"}},\"Assigned\":{\"match\":{\"Data.status.keyword\":\"assigned\"}},\"Closed\":{\"match\":{\"Data.status.keyword\":\"closed\"}},\"Resolved\":{\"match\":{\"Data.status.keyword\":\"resolved\"}},\"Rejected\":{\"match\":{\"Data.status.keyword\":\"rejected\"}},\"ReassignRequested\":{\"match\":{\"Data.status.keyword\":\"reassignrequested\"}}}}}}}}}}}" + } + ], + "filterKeys": [ + {"key": "departmentId", "column": "Department"} + ], + "chartType": "table", + "valueType": "number", + "drillChart": "pgrStatusCategoryDrillDown", + "documentType": "_doc", + "action": "", + "plotLabel": "Department", + "aggregationPaths": [ + "Open", + "Reopen", + "Assigned", + "Closed", + "Resolved", + "Rejected", + "ReassignRequested" + ], + "pathDataTypeMapping": [ + { + "Open": "number" + }, + { + "Reopen": "number" + }, + { + "Assigned": "number" + }, + { + "Closed": "number" + }, + { + "Resolved": "number" + }, + { + "Rejected": "number" + }, + { + "ReassignRequested": "number" + } + ], + "insight": { + }, + "_comment": "" + }, + "pgrStatusCategoryDrillDown": { + "chartName": "", + "queries": [ + { + "module": "PGR", + "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\", \"tenantId\" : \"Data.tenantId.keyword\" , \"departmentId\" : \"Data.department.keyword\"}", + "dateRefField": "Data.dateOfComplaint", + "indexName": "pgrindex-v1", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Category \":{\"terms\":{\"field\":\"Data.complainCategory.keyword\",\"size\":1000},\"aggs\":{\"Closed Complaints\":{\"filters\":{\"filters\":{\"Open\":{\"match\":{\"Data.status.keyword\":\"open\"}},\"Reopen\":{\"match\":{\"Data.status.keyword\":\"reopen\"}},\"Assigned\":{\"match\":{\"Data.status.keyword\":\"assigned\"}},\"Closed\":{\"match\":{\"Data.status.keyword\":\"closed\"}},\"Resolved\":{\"match\":{\"Data.status.keyword\":\"resolved\"}},\"Rejected\":{\"match\":{\"Data.status.keyword\":\"rejected\"}},\"ReassignRequested\":{\"match\":{\"Data.status.keyword\":\"reassignrequested\"}}}}}}}}}}}" + } + ], + "filterKeys": [ + ], + "chartType": "table", + "valueType": "number", + "drillChart": "", + "drillFields": [ + "" + ], + "documentType": "_doc", + "action": "", + "plotLabel": "Complaint Category", + "aggregationPaths": [ + "Open", + "Reopen", + "Assigned", + "Closed", + "Resolved", + "Rejected", + "ReassignRequested" + ], + "pathDataTypeMapping": [ + { + "Open": "number" + }, + { + "Reopen": "number" + }, + { + "Assigned": "number" + }, + { + "Closed": "number" + }, + { + "Resolved": "number" + }, + { + "Rejected": "number" + }, + { + "ReassignRequested": "number" + } + ], + "insight": { + }, + "_comment": "" + }, + "topFiveComplaints": { + "chartName": "DSS_PGR_TOP_COMPLAINTS", + "queries": [ + { + "module": "PGR", + "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\", \"tenantId\" : \"Data.tenantId\"}", + "dateRefField": "Data.dateOfComplaint", + "indexName": "pgrindex-v1", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Complain Category\":{\"terms\":{\"field\":\"Data.complainCategory.keyword\",\"size\":6,\"order\":{\"Count\":\"desc\"}},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.complainCategory.keyword\"}}}}}}}}" + } + ], + "chartType": "pie", + "valueType": "number", + "action": "", + "documentType": "_doc", + "drillChart": "none", + "aggregationPaths": [ + "Complain Category" + ], + "insight": { + }, + "_comment": " Complaints By Their Statuses" + }, + "averageTurnAroundTime": { + "chartName": "DSS_AVERAGE_TURN_AROUND_TIME", + "queries": [ + { + "module": "PGR", + "dateRefField": "Data.@timestamp", + "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\", \"tenantId\" : \"Data.tenantId\"}", + "indexName": "pgrindex-v1", + "aggrQuery": "{\"aggs\":{\"Complaints Average Turn Around Time (in Days)\":{\"date_histogram\":{\"field\":\"Data.@timestamp\",\"interval\":\"intervalvalue\"},\"aggs\":{\"each_open\":{\"terms\":{\"field\":\"_id\",\"min_doc_count\":0, \"size\":200},\"aggs\":{\"Open_Complaints\":{\"nested\":{\"path\":\"Data.actionHistory.actions\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"Data.actionHistory.actions.status.keyword\":[\"open\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"Data.actionHistory.actions.when\"}}}}}},\"Closed_Complaints\":{\"nested\":{\"path\":\"Data.actionHistory.actions\"},\"aggs\":{\"aggrFilter\":{\"filter\":{\"terms\":{\"Data.actionHistory.actions.status.keyword\":[\"closed\"]}},\"aggs\":{\"amount\":{\"sum\":{\"field\":\"Data.actionHistory.actions.when\"}}}}}},\"computedValueATA\":{\"bucket_script\":{\"buckets_path\":{\"max\":\"Closed_Complaints>aggrFilter>amount\",\"min\":\"Open_Complaints>aggrFilter>amount\"},\"script\":{\"source\":\"params.max-params.min\"}}}}}}}}}", + "aggrQuerybc": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Complaints Average Turn Around Time (in Days)\":{\"date_histogram\":{\"field\":\"Data.@timestamp\",\"interval\":\"intervalvalue\"},\"aggs\":{\"each_open\":{\"terms\":{\"field\":\"_id\",\"min_doc_count\":0},\"aggs\":{\"Open_Complaints\":{\"min\":{\"field\":\"Data.actionHistory.actions.when\"}},\"Closed_Complaints\":{\"max\":{\"field\":\"Data.actionHistory.actions.when\"}},\"computedValueATA\":{\"bucket_script\":{\"buckets_path\":{\"max\":\"Closed_Complaints\",\"min\":\"Open_Complaints\"},\"script\":{\"source\":\"if(params.max == null && params.min == null) {0} else {params.max-params.min}\"}}}}}}}}}}}" + } + ], + "chartType": "line", + "valueType": "days", + "action": "", + "drillChart": "none", + "documentType": "_doc", + "aggregationPaths": [ + "Complaints Average Turn Around Time (in Days)" + ], + "computedFields": [ + { + "postAggregationTheory" : "", + "actionName": "AverageComputedField", + "fields" : ["computedValueATA"], + "newField" : "ATA", + "_comments": "fields are field names picked from its aggregation query to use post aggregation newField value with given new field name " + } + ], + "isCumulative": false, + "interval": "month", + "insight": { + }, + "_comment": " " + }, +"pgrCitizenOnDateRange": { + "chartName": "DSS_PGR_CITIZEN", + "queries": [ + { + "module": "PGR", + "dateRefField": "Data.@timestamp", + "requestQueryMap": "{\"wardId\" : \"Data.complaintWard.name.keyword\", \"tenantId\" : \"Data.tenantId\"}", + "indexName": "pgrindex-v1", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Citizens\":{\"date_histogram\":{\"field\":\"Data.@timestamp\",\"interval\":\"intervalvalue\",\"time_zone\":\"+05:30\"},\"aggs\":{\"sum\":{\"cardinality\":{\"field\":\"Data.citizen.uuid.keyword\"}}}}}}}}" + } + ], + "chartType": "line", + "valueType": "number", + "action": "", + "drillChart": "none", + "documentType": "_doc", + "aggregationPaths": [ + "Citizens" + ], + "isCumulative": false, + "interval": "month", + "insight": { + }, + "_comment": " " + }, + + + "_comment": "W&S charts below-----------------------------------------------------------------------", + + "wstodaysCollection": { + "chartName": "DSS_W&S_TODAYS_COLLECTION", + "queries": [ + { + "module": "W&S", + "indexName": "receipts-consumers", + "aggrQuery": "{\"aggs\": {\"AGGR\": {\"filter\": {\"bool\": {\"must_not\": [{\"term\": {\"status\": \"Cancelled\"}}]}},\"aggs\": {\"Total Collection\": {\"sum\": {\"field\": \"totalamount\"}}}}}}", + "requestQueryMap": "{\"tenantId\" : \"cityname.keyword\", \"wardId\" : \"block.keyword\"}", + "dateRefField": "receiptdate" + } + ], + "chartType": "metric", + "valueType": "amount", + "action": "", + "drillChart": "none", + "aggregationPaths": [ + "Total Collection" + ], + "insight": { + }, + "_comment": "W&S todays collections " + }, + "wstotalCollection": { + "chartName": "DSS_W&S_TOTAL_COLLECTION", + "queries": [ + { + "module": "W&S", + "indexName": "receipts-consumers", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"status\":\"Cancelled\"}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"totalamount\"}}}}}}", + "requestQueryMap": "{\"tenantId\" : \"cityname.keyword\", \"wardId\" : \"block.keyword\"}", + "dateRefField": "receiptdate" + } + ], + "translateTenantCode": true, + "chartType": "metric", + "valueType": "amount", + "action": "", + "drillChart": "none", + "aggregationPaths": [ + "Total Collection" + ], + "insight": { + }, + "_comment": "W&S total collections " + }, + "wstargetCollection": { + "chartName": "DSS_W&S_TARGET_COLLECTION", + "queries": [ + { + "module": "COMMON", + "requestQueryMap": "{\"module\" : \"businessService.keyword\", \"tenantId\" : \"tenantIdForMunicipalCorporation.keyword\"}", + "dateRefField": "startdate", + "indexName": "dss-target_v1", + "aggrQuery": "{\"aggs\":{\"Target Collection\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}" + } + ], + "chartType": "metric", + "valueType": "amount", + "action": "", + "drillChart": "none", + "documentType": "_doc", + "aggregationPaths": [ + "Target Collection" + ], + "isDayUnit": true, + "postAggregationTheory" : "repsonseToDifferenceOfDates", + "insight": { + }, + "_comment": " " + }, + "wstargetAchieved": { + "chartName": "DSS_W&S_TARGET_ACHIEVED", + "queries": [ + { + "module": "COMMON", + "requestQueryMap": "{\r\n \"module\" : \"businessService.keyword\", \n\"tenantId\" : \"ulbName.keyword\"}", + "dateRefField": "startdate", + "indexName": "dss-target_v1", + "aggrQuery": "{\"aggs\":{\"Actual collection\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}" + }, + { + "module": "W&S", + "requestQueryMap": "{\"tenantId\" : \"cityname.keyword\", \"wardId\" : \"block.keyword\"}", + "dateRefField": "receiptdate", + "indexName": "receipts-consumers", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"status\":\"Cancelled\"}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"totalamount\"}}}}}}" + } + + ], + "translateTenantCode": true, + "chartType": "metric", + "valueType": "percentage", + "drillChart": "none", + "documentType": "_doc", + "action": "percentage", + "aggregationPaths": [ + "Total Collection", + "Actual collection" + ], + "insight": { + "chartResponseMap" : "wstargetAchieved", + "action" : "differenceOfNumbers", + "upwardIndicator" : "positive", + "downwardIndicator" : "negative", + "textMessage" : "$indicator$value% than last $insightInterval", + "colorCode" : "#228B22", + "insightInterval" : "year" + }, + "_comment": " " + }, + "wscumulativeCollections": { + "chartName": "DSS_W&S_TOTAL_CUMULATIVE_COLLECTION", + "queries": [ + { + "module": "W&S", + "dateRefField": "receiptdate", + "requestQueryMap": "{\"tenantId\" : \"cityname.keyword\", \"wardId\" : \"block.keyword\"}", + "indexName": "receipts-consumers", + "aggrQuery": "{\"aggs\":{\"Water Sewerage\":{\"date_histogram\":{\"field\":\"receiptdate\",\"interval\":\"intervalvalue\"},\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"status\":[\"Cancelled\"]}}]}},\"aggs\":{\"approved\":{\"sum\":{\"field\":\"totalamount\"}}}}}}}}" + } + ], + "translateTenantCode": true, + "chartType": "line", + "valueType": "amount", + "action": "", + "drillChart": "none", + "documentType": "_doc", + "aggregationPaths": [ + "Water Sewerage" + ], + "isCumulative": true, + "interval": "month", + "insight": { + }, + "_comment": " " + }, + + "wstopPerformingUlbs": { + "chartName": "DSS_W&S_TOP_3_PERFORMING_ULBS", + "queries": [ + { + "module": "COMMON", + "requestQueryMap": "{\r\n \"module\" : \"businessService.keyword\", \n\"tenantId\" : \"ulbName.keyword\"}", + "dateRefField": "", + "indexName": "dss-target_v1", + "aggrQuery": "{\"aggs\":{\"Target Collection\":{\"terms\":{\"field\":\"ulbName.keyword\",\"size\":\"200\",\"order\":{\"Sum\":\"desc\"}},\"aggs\":{\"Sum\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}}}" + }, + { + "module": "W&S", + "requestQueryMap": "{\"tenantId\" : \"cityname.keyword\", \"wardId\" : \"block.keyword\"}", + "dateRefField": "receiptdate", + "indexName": "receipts-consumers", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"status\":\"Cancelled\"}}]}},\"aggs\":{\"Total Collection\":{\"terms\":{\"field\":\"cityname.keyword\",\"size\":\"200\",\"order\":{\"Sum\":\"desc\"}},\"aggs\":{\"Sum\":{\"sum\":{\"field\":\"totalamount\"}}}}}}}}" + } + ], + "translateTenantCode": true, + "chartType": "perform", + "valueType": "percentage", + "drillChart": "none", + "documentType": "_doc", + "action": "percentage", + "plotLabel": "DSS_TARGET_ACHIEVED", + "order": "desc", + "limit": 3, + "aggregationPaths": [ + "Total Collection","Target Collection" + ], + "insight": { + }, + "_comment": " Top Performing Ulbs for target achieved" + }, + "wsbottomPerformingUlbs": { + "chartName": "DSS_W&S_BOTTOM_3_PERFORMING_ULBS", + "queries": [ + { + "module": "COMMON", + "requestQueryMap": "{\"module\" : \"businessService.keyword\",\"tenantId\" : \"ulbName.keyword\" }", + "dateRefField": "", + "indexName": "dss-target_v1", + "aggrQuery": "{\"aggs\":{\"Target Collection\":{\"terms\":{\"field\":\"ulbName.keyword\",\"size\":\"200\",\"order\":{\"Sum\":\"asc\"}},\"aggs\":{\"Sum\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}}}" + }, + { + "module": "W&S", + "requestQueryMap": "{\"tenantId\" : \"cityname.keyword\", \"wardId\" : \"block.keyword\"}", + "dateRefField": "receiptdate", + "indexName": "receipts-consumers", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"status\":\"Cancelled\"}}]}},\"aggs\":{\"Total Collection\":{\"terms\":{\"field\":\"cityname.keyword\",\"size\":\"200\",\"order\":{\"Sum\":\"asc\"}},\"aggs\":{\"Sum\":{\"sum\":{\"field\":\"totalamount\"}}}}}}}}" + } + ], + "translateTenantCode": true, + "chartType": "perform", + "valueType": "percentage", + "drillChart": "none", + "documentType": "_doc", + "action": "percentage", + "plotLabel": "DSS_TARGET_ACHIEVED", + "order": "asc", + "limit": 3, + "aggregationPaths": [ + "Total Collection", "Target Collection" + ], + "insight": { + }, + "_comment": " Bottom Performing Ulbs for target achieved" + }, + "wscollectionByUsage": { + "chartName": "DSS_W&S_COLLECTION_BY_USAGE", + "queries": [ + { + "module": "W&S", + "dateRefField": "receiptdate", + "requestQueryMap": "{\"tenantId\" : \"cityname.keyword\", \"wardId\" : \"block.keyword\"}", + "indexName": "receipts-consumers", + "aggrQuery": "{\"aggs\":{\"Usage Type\":{\"terms\":{\"field\":\"consumertype.keyword\"},\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"status\":\"Cancelled\"}}]}},\"aggs\":{\"approved\":{\"sum\":{\"field\":\"totalamount\"}}}}}}}}" + } + ], + "translateTenantCode": true, + "chartType": "pie", + "valueType": "amount", + "action": "", + "documentType": "_doc", + "drillChart": "none", + "aggregationPaths": [ + "Usage Type" + ], + "insight": { + }, + "_comment": " " + }, + + "wscollectionByChannel": { + "chartName": "DSS_W&S_COLLECTION_BY_CHANNEL", + "queries": [ + { + "module": "W&S", + "dateRefField": "receiptdate", + "requestQueryMap": "{\"tenantId\" : \"cityname.keyword\", \"wardId\" : \"block.keyword\"}", + "indexName": "receipts-consumers", + "aggrQuery": "{\"aggs\":{\"Usage Type\":{\"terms\":{\"field\":\"channel.keyword\"},\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"status\":\"Cancelled\"}}]}},\"aggs\":{\"approved\":{\"sum\":{\"field\":\"totalamount\"}}}}}}}}" + } + ], + "translateTenantCode": true, + "chartType": "pie", + "valueType": "amount", + "action": "", + "documentType": "_doc", + "drillChart": "none", + "aggregationPaths": [ + "Usage Type" + ], + "insight": { + }, + "_comment": " " + }, + + "wsFinancialIndicatorDDR": { + "chartName": "DSS_W&S_DEMAND_COLLECTION_BOUNDARY", + "queries": [ + { + "module": "W&S", + "requestQueryMap": "{\"tenantId\" : \"cityname.keyword\", \"wardId\" : \"block.keyword\" }", + "dateRefField": "receiptdate", + "indexName": "receipts-consumers", + "aggrQuery": "{\"aggs\":{\"Total Collection\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"status\":\"Cancelled\"}}]}},\"aggs\":{\"collection\":{\"sum\":{\"field\":\"totalamount\"}}}},\"Total Receipt\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"status\":\"Cancelled\"}}]}},\"aggs\":{\"receipt\":{\"value_count\":{\"field\":\"receiptnumber.keyword\"}}}}}}" + }, + { + "module": "W&S", + "requestQueryMap": "{ \"tenantId\" : \"cityname.keyword\", \"wardId\" : \"block.keyword\"}", + "dateRefField": "billdate", + "indexName": "demandbillconsumers", + "aggrQuery": "{\"aggs\":{\"No of Bill\":{\"filter\":{\"term\":{\"billgenerated\":true}},\"aggs\":{\"approved\":{\"value_count\":{\"field\":\"installmentfrom.keyword\"}}}}}}" + }, + { + "module": "W&S", + "requestQueryMap": "{ \"tenantId\" : \"cityname.keyword\", \"wardId\" : \"block.keyword\"}", + "dateRefField": "@timestamp", + "indexName": "demandbillconsumers", + "aggrQuery": "{\"aggs\":{\"Project Demand\":{\"sum\":{\"field\":\"billamount\"}}}}" + } + ], + "isMdmsEnabled": true, + "translateTenantCode": true, + "filterKeys": [ + {"key": "tenantId", "column": "DDRs"} + ], + "chartType": "table", + "valueType": "number", + "drillChart": "wsFinancialIndicatorUlb", + "action": "", + "plotLabel": "DDRs", + "isPostResponseHandler": true, + "postAggregationTheory" : "", + "aggregationPaths": [ + "Total Collection", + "Total Receipt", + "No of Bill", + "Project Demand" + + ], + "pathDataTypeMapping": [ + { + "Total Collection": "amount" + }, + { + "Total Receipt": "number" + }, + { + "No of Bill": "number" + }, + { + "Project Demand": "amount" + } + ], + "insight": { + }, + "_comment": "" + }, + "wsFinancialIndicatorUlb": { + "chartName": "DSS_W&S_DEMAND_COLLECTION_BOUNDARY", + "queries": [ + { + "module": "W&S", + "requestQueryMap": "{\"tenantId\" : \"cityname.keyword\", \"wardId\" : \"block.keyword\" }", + "dateRefField": "receiptdate", + "indexName": "receipts-consumers", + "aggrQuery": "{\"aggs\":{\"ULB\":{\"terms\":{\"field\":\"cityname.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"status\":\"Cancelled\"}}]}},\"aggs\":{\"collection\":{\"sum\":{\"field\":\"totalamount\"}}}},\"Total Receipt\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"status\":\"Cancelled\"}}]}},\"aggs\":{\"receipt\":{\"value_count\":{\"field\":\"receiptnumber.keyword\"}}}}}}}}" + }, + { + "module": "W&S", + "requestQueryMap": "{ \"tenantId\" : \"cityname.keyword\", \"wardId\" : \"block.keyword\"}", + "dateRefField": "billdate", + "indexName": "demandbillconsumers", + "aggrQuery": "{\"aggs\":{\"ULB\":{\"terms\":{\"field\":\"cityname.keyword\",\"size\":200},\"aggs\":{\"No of Bill\":{\"filter\":{\"term\":{\"billgenerated\":true}},\"aggs\":{\"approved\":{\"value_count\":{\"field\":\"installmentfrom.keyword\"}}}}}}}}" + }, + { + "module": "W&S", + "requestQueryMap": "{ \"tenantId\" : \"cityname.keyword\", \"wardId\" : \"block.keyword\"}", + "dateRefField": "@timestamp", + "indexName": "demandbillconsumers", + "aggrQuery": "{\"aggs\":{\"ULB\":{\"terms\":{\"field\":\"cityname.keyword\",\"size\":200},\"aggs\":{\"Project Demand\":{\"sum\":{\"field\":\"billamount\"}}}}}}" + } + ], + "isMdmsEnabled": false, + "translateTenantCode": true, + "filterKeys": [ + {"key": "tenantId", "column": "ULB"} + ], + "chartType": "table", + "valueType": "number", + "drillChart": "wsFinancialIndicatorWard", + "action": "", + "plotLabel": "ULB", + "isPostResponseHandler": true, + "postAggregationTheory" : "", + "aggregationPaths": [ + "Total Collection", + "Total Receipt", + "No of Bill", + "Project Demand" + + ], + "pathDataTypeMapping": [ + { + "Total Collection": "amount" + }, + { + "Total Receipt": "number" + }, + { + "No of Bill": "number" + }, + { + "Project Demand": "amount" + } + ], + "insight": { + }, + "_comment": "" + }, + "wsFinancialIndicatorWard": { + "chartName": "DSS_W&S_DEMAND_COLLECTION_BOUNDARY", + "queries": [ + { + "module": "W&S", + "requestQueryMap": "{ \"tenantId\" : \"cityname.keyword\", \"wardId\" : \"block.keyword\" }", + "dateRefField": "receiptdate", + "indexName": "receipts-consumers", + "aggrQuery": "{\"aggs\":{\"Ward\":{\"terms\":{\"field\":\"block\",\"size\":200},\"aggs\":{\"Total Collection\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"status\":\"Cancelled\"}}]}},\"aggs\":{\"collection\":{\"sum\":{\"field\":\"totalamount\"}}}},\"Total Receipt\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"status\":\"Cancelled\"}}]}},\"aggs\":{\"receipt\":{\"value_count\":{\"field\":\"receiptnumber.keyword\"}}}}}}}}" + }, + { + "module": "W&S", + "requestQueryMap": "{ \"tenantId\" : \"cityname.keyword\", \"wardId\" : \"block.keyword\" }", + "dateRefField": "billdate", + "indexName": "demandbillconsumers", + "aggrQuery": "{\"aggs\":{\"Ward\":{\"terms\":{\"field\":\"block.keyword\",\"size\":200},\"aggs\":{\"No of Bill\":{\"filter\":{\"term\":{\"billgenerated\":true}},\"aggs\":{\"approved\":{\"value_count\":{\"field\":\"installmentfrom.keyword\"}}}}}}}}" + }, + { + "module": "W&S", + "requestQueryMap": "{ \"tenantId\" : \"cityname.keyword\", \"wardId\" : \"block.keyword\" }", + "dateRefField": "@timestamp", + "indexName": "demandbillconsumers", + "aggrQuery": "{\"aggs\":{\"Ward\":{\"terms\":{\"field\":\"block.keyword\",\"size\":200},\"aggs\":{\"Project Demand\":{\"sum\":{\"field\":\"billamount\"}}}}}}" + } + ], + "isMdmsEnabled": false, + "translateTenantCode": true, + "filterKeys": [ + + ], + "chartType": "table", + "valueType": "number", + "drillChart": "", + "action": "", + "plotLabel": "Ward", + "isPostResponseHandler": true, + "postAggregationTheory" : "", + "aggregationPaths": [ + "Total Collection", + "Total Receipt", + "No of Bill", + "Project Demand" + + ], + "pathDataTypeMapping": [ + { + "Total Collection": "amount" + }, + { + "Total Receipt": "number" + }, + { + "No of Bill": "number" + }, + { + "Project Demand": "amount" + } + ], + "insight": { + }, + "_comment": "" + }, + + "wsTaxHeadDDR": { + "chartName": "DSS_W&S_TAX_HEAD_BOUNDARY", + "queries": [ + { + "module": "W&S", + "requestQueryMap": "{\"tenantId\" : \"cityname.keyword\", \"wardId\" : \"block.keyword\" }", + "dateRefField": "receiptdate", + "indexName": "receipts-consumers", + "aggrQuery": "{\"aggs\":{\"Total Collection\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"status\":\"Cancelled\"}}]}},\"aggs\":{\"collection\":{\"sum\":{\"field\":\"totalamount\"}}}},\"Total Receipt\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"status\":\"Cancelled\"}}]}},\"aggs\":{\"receipt\":{\"value_count\":{\"field\":\"receiptnumber.keyword\"}}}}}}" + }, + { + "module": "W&S", + "requestQueryMap": "{\"tenantId\" : \"cityname.keyword\", \"wardId\" : \"block.keyword\" }", + "dateRefField": "billdate", + "indexName": "demandbillconsumers", + "aggrQuery": "{\"aggs\":{\"No of Bill\":{\"filter\":{\"term\":{\"billgenerated\":true}},\"aggs\":{\"approved\":{\"value_count\":{\"field\":\"installmentfrom.keyword\"}}}},\"Late charges\":{\"filter\":{\"term\":{\"billgenerated\":true}},\"aggs\":{\"penalty\":{\"sum\":{\"field\":\"penaltycollection\"}}}},\"Interest\":{\"filter\":{\"term\":{\"billgenerated\":true}},\"aggs\":{\"interest\":{\"sum\":{\"field\":\"interestcollection\"}}}},\"Advance\":{\"filter\":{\"term\":{\"billgenerated\":true}},\"aggs\":{\"advance\":{\"sum\":{\"field\":\"advancecollection\"}}}},\"Current Charges\":{\"filter\":{\"term\":{\"billgenerated\":true}},\"aggs\":{\"advance\":{\"sum\":{\"field\":\"currentcharges\"}}}},\"Arrear Charges\":{\"filter\":{\"term\":{\"billgenerated\":true}},\"aggs\":{\"advance\":{\"sum\":{\"field\":\"arrearcharges\"}}}}}}}" + } + ], + "translateTenantCode": true, + "isMdmsEnabled": true, + "filterKeys": [ + {"key": "tenantId", "column": "DDRs"} + ], + "chartType": "table", + "valueType": "number", + "drillChart": "wsTaxHeadUlb", + "action": "", + "plotLabel": "DDRs", + "postAggregationTheory" : "", + "aggregationPaths": [ + "Total Collection", + "Total Receipt", + "No of Bill", + "Late charges", + "Interest", + "Advance", + "Current Charges", + "Arrear Charges" + + ], + "pathDataTypeMapping": [ + { + "Total Collection": "amount" + }, + { + "Total Receipt": "number" + }, + { + "No of Bill": "number" + }, + { + "Late charges": "amount" + }, + { + "Interest": "amount" + }, + { + "Advance": "amount" + }, + { + "Current Charges": "amount" + }, + { + "Arrear Charges": "amount" + } + ], + "insight": { + }, + "_comment": "" + }, + "wsTaxHeadDDROverview": { + "chartName": "DSS_W&S_TAX_HEAD_BOUNDARY", + "queries": [ + { + "module": "W&S", + "requestQueryMap": "{\"tenantId\" : \"cityname.keyword\", \"wardId\" : \"block.keyword\" }", + "dateRefField": "receiptdate", + "indexName": "receipts-consumers", + "aggrQuery": "{\"aggs\":{\"Total Collection\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"status\":\"Cancelled\"}}]}},\"aggs\":{\"collection\":{\"sum\":{\"field\":\"totalamount\"}}}},\"Total Receipt\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"status\":\"Cancelled\"}}]}},\"aggs\":{\"receipt\":{\"value_count\":{\"field\":\"receiptnumber.keyword\"}}}}}}" + }, + { + "module": "W&S", + "requestQueryMap": "{\"tenantId\" : \"cityname.keyword\", \"wardId\" : \"block.keyword\" }", + "dateRefField": "billdate", + "indexName": "demandbillconsumers", + "aggrQuery": "{\"aggs\":{\"No of Bill\":{\"filter\":{\"term\":{\"billgenerated\":true}},\"aggs\":{\"approved\":{\"value_count\":{\"field\":\"installmentfrom.keyword\"}}}},\"Late charges\":{\"filter\":{\"term\":{\"billgenerated\":true}},\"aggs\":{\"penalty\":{\"sum\":{\"field\":\"penaltycollection\"}}}},\"Interest\":{\"filter\":{\"term\":{\"billgenerated\":true}},\"aggs\":{\"interest\":{\"sum\":{\"field\":\"interestcollection\"}}}},\"Advance\":{\"filter\":{\"term\":{\"billgenerated\":true}},\"aggs\":{\"advance\":{\"sum\":{\"field\":\"advancecollection\"}}}},\"Current Charges\":{\"filter\":{\"term\":{\"billgenerated\":true}},\"aggs\":{\"advance\":{\"sum\":{\"field\":\"currentcharges\"}}}},\"Arrear Charges\":{\"filter\":{\"term\":{\"billgenerated\":true}},\"aggs\":{\"advance\":{\"sum\":{\"field\":\"arrearcharges\"}}}}}}}" + }, + { + "module": "W&S", + "requestQueryMap": "{\"tenantId\" : \"cityname.keyword\", \"wardId\" : \"block.keyword\" }", + "dateRefField": "", + "indexName": "dss-target_v1", + "aggrQuery": "{\"aggs\":{\"Target Collection\":{\"sum\":{\"field\":\"budgetProposedForMunicipalCorporation\"}}}}" + } + ], + "translateTenantCode": true, + "isMdmsEnabled": true, + "filterKeys": [ + {"key": "tenantId", "column": "DDRs"} + ], + "chartType": "table", + "valueType": "number", + "drillChart": "none", + "action": "", + "plotLabel": "DDRs", + "postAggregationTheory" : "", + "aggregationPaths": [ + "Total Collection", + "Total Receipt" + ], + "pathDataTypeMapping": [ + { + "Total Collection": "amount" + }, + { + "Total Receipt": "number" + } + ], + "insight": { + }, + "_comment": "" + }, + "wsTaxHeadUlb": { + "chartName": "DSS_W&S_TAX_HEAD_BOUNDARY", + "queries": [ + { + "module": "W&S", + "requestQueryMap": "{\"tenantId\" : \"cityname.keyword\", \"wardId\" : \"block.keyword\" }", + "dateRefField": "receiptdate", + "indexName": "receipts-consumers", + "aggrQuery": "{\"aggs\":{\"ULB\":{\"terms\":{\"field\":\"cityname.keyword\",\"size\":200},\"aggs\":{\"Total Collection\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"status\":\"Cancelled\"}}]}},\"aggs\":{\"collection\":{\"sum\":{\"field\":\"totalamount\"}}}},\"Total Reciept\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"status\":\"Cancelled\"}}]}},\"aggs\":{\"reciept\":{\"value_count\":{\"field\":\"receiptnumber.keyword\"}}}}}}}}" + }, + { + "module": "W&S", + "requestQueryMap": "{\"tenantId\" : \"cityname.keyword\", \"wardId\" : \"block.keyword\" }", + "dateRefField": "billdate", + "indexName": "demandbillconsumers", + "aggrQuery": "{\"aggs\":{\"ULB\":{\"terms\":{\"field\":\"cityname.keyword\",\"size\":200},\"aggs\":{\"No of Bill\":{\"filter\":{\"term\":{\"billgenerated\":true}},\"aggs\":{\"approved\":{\"value_count\":{\"field\":\"installmentfrom.keyword\"}}}},\"Late charges\":{\"filter\":{\"term\":{\"billgenerated\":true}},\"aggs\":{\"penalty\":{\"sum\":{\"field\":\"penaltycollection\"}}}},\"Interest\":{\"filter\":{\"term\":{\"billgenerated\":true}},\"aggs\":{\"interest\":{\"sum\":{\"field\":\"interestcollection\"}}}},\"Advance\":{\"filter\":{\"term\":{\"billgenerated\":true}},\"aggs\":{\"advance\":{\"sum\":{\"field\":\"advancecollection\"}}}},\"Current Charges\":{\"filter\":{\"term\":{\"billgenerated\":true}},\"aggs\":{\"advance\":{\"sum\":{\"field\":\"currentcharges\"}}}},\"Arrear Charges\":{\"filter\":{\"term\":{\"billgenerated\":true}},\"aggs\":{\"advance\":{\"sum\":{\"field\":\"arrearcharges\"}}}}}}}}" + } + ], + "translateTenantCode": true, + "isMdmsEnabled": false, + "filterKeys": [ + {"key": "tenantId", "column": "ULB"} + ], + "chartType": "table", + "valueType": "number", + "drillChart": "wsTaxHeadWard", + "action": "", + "plotLabel": "ULB", + "postAggregationTheory" : "", + "aggregationPaths": [ + "Total Collection", + "Total Receipt", + "No of Bill", + "Late charges", + "Interest", + "Advance", + "Current Charges", + "Arrear Charges" + + ], + "pathDataTypeMapping": [ + { + "Total Collection": "amount" + }, + { + "Total Receipt": "number" + }, + { + "No of Bill": "number" + }, + { + "Late charges": "amount" + }, + { + "Interest": "amount" + }, + { + "Advance": "amount" + }, + { + "Current Charges": "amount" + }, + { + "Arrear Charges": "amount" + } + ], + "insight": { + }, + "_comment": "" + }, + "wsTaxHeadWard": { + "chartName": "DSS_W&S_TAX_HEAD_BOUNDARY", + "queries": [ + { + "module": "W&S", + "requestQueryMap": "{\"tenantId\" : \"cityname.keyword\", \"wardId\" : \"block.keyword\" }", + "dateRefField": "receiptdate", + "indexName": "receipts-consumers", + "aggrQuery": "{\"aggs\":{\"Ward\":{\"terms\":{\"field\":\"block\",\"size\":200},\"aggs\":{\"Total Collection\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"status\":\"Cancelled\"}}]}},\"aggs\":{\"collection\":{\"sum\":{\"field\":\"totalamount\"}}}},\"Total Reciept\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"status\":\"Cancelled\"}}]}},\"aggs\":{\"reciept\":{\"value_count\":{\"field\":\"receiptnumber.keyword\"}}}}}}}}" + }, + { + "module": "W&S", + "requestQueryMap": "{\"tenantId\" : \"cityname.keyword\", \"wardId\" : \"block.keyword\" }", + "dateRefField": "billdate", + "indexName": "demandbillconsumers", + "aggrQuery": "{\"aggs\":{\"Ward\":{\"terms\":{\"field\":\"block.keyword\",\"size\":200},\"aggs\":{\"No of Bill\":{\"filter\":{\"term\":{\"billgenerated\":true}},\"aggs\":{\"approved\":{\"value_count\":{\"field\":\"installmentfrom.keyword\"}}}},\"Late charges\":{\"filter\":{\"term\":{\"billgenerated\":true}},\"aggs\":{\"penalty\":{\"sum\":{\"field\":\"penaltycollection\"}}}},\"Interest\":{\"filter\":{\"term\":{\"billgenerated\":true}},\"aggs\":{\"interest\":{\"sum\":{\"field\":\"interestcollection\"}}}},\"Advance\":{\"filter\":{\"term\":{\"billgenerated\":true}},\"aggs\":{\"advance\":{\"sum\":{\"field\":\"advancecollection\"}}}},\"Current Charges\":{\"filter\":{\"term\":{\"billgenerated\":true}},\"aggs\":{\"advance\":{\"sum\":{\"field\":\"currentcharges\"}}}},\"Arrear Charges\":{\"filter\":{\"term\":{\"billgenerated\":true}},\"aggs\":{\"advance\":{\"sum\":{\"field\":\"arrearcharges\"}}}}}}}}" + } + ], + "isMdmsEnabled": false, + "translateTenantCode": true, + "filterKeys": [ + ], + "chartType": "table", + "valueType": "number", + "drillChart": "", + "action": "", + "plotLabel": "Ward", + "postAggregationTheory" : "", + "aggregationPaths": [ + "Total Collection", + "Total Receipt", + "No of Bill", + "Late charges", + "Interest", + "Advance", + "Current Charges", + "Arrear Charges" + + ], + "pathDataTypeMapping": [ + { + "Total Collection": "amount" + }, + { + "Total Receipt": "number" + }, + { + "No of Bill": "number" + }, + { + "Late charges": "amount" + }, + { + "Interest": "amount" + }, + { + "Advance": "amount" + }, + { + "Current Charges": "amount" + }, + { + "Arrear Charges": "amount" + } + ], + "insight": { + }, + "_comment": "" + }, + + + "wstotalConnection": { + "chartName": "DSS_W&S_CONNECTIONS", + "queries": [ + { + "module": "W&S", + "indexName": "wsapplications", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"applicationstatus.keyword\":\"Cancelled\"}}],\"must\":[{\"terms\":{\"servicetype.keyword\":[\"Water Charges\",\"Sewerage Charges\"]}},{\"terms\":{\"connectionstatus.keyword\":[\"ACTIVE\"]}}]}},\"aggs\":{\"Total Connection\":{\"value_count\":{\"field\":\"id.keyword\"}}}}}}", + "requestQueryMap": "{\"tenantId\" : \"cityname.keyword\", \"wardId\" : \"block.keyword\"}", + "dateRefField": "createddate" + } + ], + "translateTenantCode": true, + "chartType": "metric", + "valueType": "number", + "action": "", + "drillChart": "none", + "aggregationPaths": [ + "Total Connection" + ], + "insight": { + }, + "_comment": " " + }, + "wsActiveUlbs": { + "chartName": "DSS_W&S_ACTIVE_ULBS", + "queries": [ + { + "module": "W&S", + "indexName": "receipts-consumers", + "aggrQuery": "{\"aggs\":{\"Active Ulbs\":{\"cardinality\":{\"field\":\"cityname.keyword\"}}}}", + "requestQueryMap": "{\"tenantId\" : \"cityname.keyword\", \"wardId\" : \"block.keyword\"}", + "dateRefField": "receiptdate" + } + ], + "translateTenantCode": true, + "chartType": "metric", + "valueType": "number", + "action": "", + "drillChart": "none", + "aggregationPaths": [ + "Active Ulbs" + ], + "insight": { + }, + "_comment": " " + }, + "wsNewWaterConnection": { + "chartName": "DSS_W&S_WATER_CONNECTIONS", + "queries": [ + { + "module": "W&S", + "indexName": "wsapplications", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"applicationstatus.keyword\":\"Cancelled\"}}],\"must\":[{\"terms\":{\"servicetype.keyword\":[\"Water Charges\"]}},{\"terms\":{\"connectionstatus.keyword\":[\"ACTIVE\"]}}]}},\"aggs\":{\"Water Connections\":{\"value_count\":{\"field\":\"id.keyword\"}}}}}}", + "requestQueryMap": "{\"tenantId\" : \"cityname.keyword\", \"wardId\" : \"block.keyword\"}", + "dateRefField": "createddate" + } + ], + "translateTenantCode": true, + "chartType": "metric", + "valueType": "number", + "action": "", + "drillChart": "none", + "aggregationPaths": [ + "Water Connections" + ], + "insight": { + }, + "_comment": " " + }, + "wsNewSewerageConnection": { + "chartName": "DSS_W&S_SEWERAGE_CONNECTIONS", + "queries": [ + { + "module": "W&S", + "indexName": "wsapplications", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"applicationstatus.keyword\":\"Cancelled\"}}],\"must\":[{\"terms\":{\"servicetype.keyword\":[\"Sewerage Charges\"]}},{\"terms\":{\"connectionstatus.keyword\":[\"ACTIVE\"]}}]}},\"aggs\":{\"Sewerage Connections\":{\"value_count\":{\"field\":\"id.keyword\"}}}}}}", + "requestQueryMap": "{\"tenantId\" : \"cityname.keyword\", \"wardId\" : \"block.keyword\"}", + "dateRefField": "createddate" + } + ], + "translateTenantCode": true, + "chartType": "metric", + "valueType": "number", + "action": "", + "drillChart": "none", + "aggregationPaths": [ + "Sewerage Connections" + ], + "insight": { + }, + "_comment": " " + }, + + "wscumulativeConnections": { + "chartName": "DSS_W&S_CUMULATIVE_COLLECTION", + "queries": [ + { + "module": "W&S", + "dateRefField": "createddate", + "requestQueryMap": "{\"tenantId\" : \"cityname.keyword\", \"wardId\" : \"block.keyword\"}", + "indexName": "wsapplications", + "aggrQuery": "{\"aggs\":{\"Water Connections\":{\"date_histogram\":{\"field\":\"@timestamp\",\"interval\":\"intervalvalue\"},\"aggs\":{\"Water\":{\"filter\":{\"bool\":{\"must\":[{\"terms\":{\"servicetype.keyword\":[\"Water Charges\"]}}],\"must_not\":[{\"terms\":{\"applicationstatus.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"id.keyword\"}}}}}},\"Sewerage Connections\":{\"date_histogram\":{\"field\":\"@timestamp\",\"interval\":\"intervalvalue\"},\"aggs\":{\"Water\":{\"filter\":{\"bool\":{\"must\":[{\"terms\":{\"servicetype.keyword\":[\"Sewerage Charges\"]}}],\"must_not\":[{\"terms\":{\"applicationstatus.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"id.keyword\"}}}}}}}}" + } + ], + "translateTenantCode": true, + "chartType": "line", + "valueType": "number", + "action": "", + "drillChart": "none", + "documentType": "_doc", + "aggregationPaths": [ + "Water Connections", + "Sewerage Connections" + + ], + "isCumulative": true, + "interval": "month", + "insight": { + }, + "_comment": " " + }, + + "wsWaterConsumersByUsageType": { + "chartName": "DSS_W&S_WATER_CONNECTION_BY_USAGE", + "queries": [ + { + "module": "W&S", + "indexName": "wsapplications", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"applicationstatus.keyword\":\"Cancelled\"}}],\"must\":[{\"terms\":{\"servicetype.keyword\":[\"Water Charges\"]}},{\"terms\":{\"connectionstatus.keyword\":[\"ACTIVE\"]}}]}},\"aggs\":{\"Water Consumers by Usage Type\":{\"terms\":{\"field\":\"usage.keyword\"}}}}}}", + "requestQueryMap": "{\"tenantId\" : \"cityname.keyword\", \"wardId\" : \"block.keyword\"}", + "dateRefField": "createddate" + } + ], + "translateTenantCode": true, + "chartType": "pie", + "valueType": "number", + "action": "", + "documentType": "_doc", + "drillChart": "none", + "aggregationPaths": [ + "Water Consumers by Usage Type" + ], + "insight": { + }, + "_comment": " " + }, + + "wsSewerageConsumersByUsageType": { + "chartName": "DSS_W&S_SEWERAGE_CONNECTION_BY_USAGE", + "queries": [ + { + "module": "W&S", + "indexName": "wsapplications", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"applicationstatus.keyword\":\"Cancelled\"}}],\"must\":[{\"terms\":{\"servicetype.keyword\":[\"Sewerage Charges\"]}},{\"terms\":{\"connectionstatus.keyword\":[\"ACTIVE\"]}}]}},\"aggs\":{\"Sewerage Consumers by Usage Type\":{\"terms\":{\"field\":\"usage.keyword\"}}}}}}", + "requestQueryMap": "{\"tenantId\" : \"cityname.keyword\", \"wardId\" : \"block.keyword\"}", + "dateRefField": "createddate" + } + ], + "translateTenantCode": true, + "chartType": "pie", + "valueType": "number", + "action": "", + "documentType": "_doc", + "drillChart": "none", + "aggregationPaths": [ + "Sewerage Consumers by Usage Type" + ], + "insight": { + }, + "_comment": " " + }, + + "wsConsumersByChannel": { + "chartName": "DSS_W&S_CONNECTION_BY_CHANNEL", + "queries": [ + { + "module": "W&S", + "dateRefField": "createddate", + "requestQueryMap": "{\"tenantId\" : \"cityname.keyword\", \"wardId\" : \"block.keyword\"}", + "indexName": "wsapplications", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"applicationstatus.keyword\":\"Cancelled\"}}],\"must\":[{\"terms\":{\"servicetype.keyword\":[\"Water Charges\",\"Sewerage Charges\"]}},{\"terms\":{\"connectionstatus.keyword\":[\"ACTIVE\"]}}]}},\"aggs\":{\"W & S Consumers by Channel\":{\"terms\":{\"field\":\"channel.keyword\"}}}}}}" + } + ], + "translateTenantCode": true, + "chartType": "pie", + "valueType": "number", + "action": "", + "documentType": "_doc", + "drillChart": "none", + "aggregationPaths": [ + "W & S Consumers by Channel" + ], + "insight": { + }, + "_comment": " " + }, + + "wsConnectionAgeingDDR": { + "chartName": "DSS_W&S_CONNECTION_AGEING", + "queries": [ + { + "module": "W&S", + "dateRefField": "createddate", + "requestQueryMap": "{\"tenantId\" : \"cityname.keyword\" }", + "indexName": "wsapplications", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must\":[{\"terms\":{\"servicetype.keyword\":[\"Water Charges\",\"Sewerage Charges\"]}},{\"terms\":{\"applicationstatus.keyword\":[\"Created\",\"Rejected\",\"Verified\",\"verified\"]}}]}},\"aggs\":{\"2\":{\"terms\":{\"field\":\"cityname.keyword\",\"size\":10000,\"order\":{\"_key\":\"asc\"}},\"aggs\":{\"Pending from 0 to 3 days\":{\"date_range\":{\"field\":\"applicationdate\",\"ranges\":[{\"from\":\"now-3d/d\",\"to\":\"now\"}]}},\"Pending from 3 to 7 days\":{\"date_range\":{\"field\":\"applicationdate\",\"ranges\":[{\"from\":\"now-1w\",\"to\":\"now-3d/d\"}]}},\"Pending from 7 to 15 days\":{\"date_range\":{\"field\":\"applicationdate\",\"ranges\":[{\"from\":\"now-15d\",\"to\":\"now-1w\"}]}},\"Pending more than 15 days\":{\"date_range\":{\"field\":\"applicationdate\",\"ranges\":[{\"from\":\"now-2y\",\"to\":\"now-15d\"}]}}}}}}}}" + } + ], + "isMdmsEnabled": true, + "translateTenantCode": true, + "filterKeys": [ + {"key": "tenantId", "column": "DDRs"} + ], + "chartType": "xtable", + "valueType": "number", + "drillChart": "wsConnectionAgeingUlb", + "action": "", + "plotLabel": "DDRs", + "isPostResponseHandler": true, + "postAggregationTheory" : "", + "aggregationPaths": [ + "Pending from 0 to 3 days", + "Pending from 3 to 7 days", + "Pending from 7 to 15 days", + "Pending more than 15 days" + ], + "computedFields": [ + { + "postAggregationTheory" : "", + "actionName": "AdditiveComputedField", + "fields" : [ "Pending from 0 to 3 days", "Pending from 3 to 7 days", "Pending from 7 to 15 days", "Pending more than 15 days"], + "newField" : "Total Pending", + "_comments": "fields are field names picked from its aggregation query to use post aggregation newField value with given new field name " + } + ], + + "insight": { + }, + "_comment": "" + }, + "wsConnectionAgeingUlb": { + "chartName": "DSS_W&S_CONNECTION_AGEING", + "queries": [ + { + "module": "W&S", + "requestQueryMap": "{\"tenantId\" : \"cityname.keyword\", \"wardId\" : \"block.keyword\" }", + "dateRefField": "createddate", + "indexName": "wsapplications", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must\":[{\"terms\":{\"servicetype.keyword\":[\"Water Charges\",\"Sewerage Charges\"]}},{\"terms\":{\"applicationstatus.keyword\":[\"Created\",\"Rejected\",\"Verified\",\"verified\"]}}]}},\"aggs\":{\"2\":{\"terms\":{\"field\":\"cityname.keyword\",\"size\":10000,\"order\":{\"_key\":\"asc\"}},\"aggs\":{\"Pending from 0 to 3 days\":{\"date_range\":{\"field\":\"applicationdate\",\"ranges\":[{\"from\":\"now-3d/d\",\"to\":\"now\"}]}},\"Pending from 3 to 7 days\":{\"date_range\":{\"field\":\"applicationdate\",\"ranges\":[{\"from\":\"now-1w\",\"to\":\"now-3d/d\"}]}},\"Pending from 7 to 15 days\":{\"date_range\":{\"field\":\"applicationdate\",\"ranges\":[{\"from\":\"now-15d\",\"to\":\"now-1w\"}]}},\"Pending more than 15 days\":{\"date_range\":{\"field\":\"applicationdate\",\"ranges\":[{\"from\":\"now-2y\",\"to\":\"now-15d\"}]}}}}}}}}" + } + ], + "isMdmsEnabled": false, + "translateTenantCode": true, + "filterKeys": [ + {"key": "tenantId", "column": "ULB"} + ], + "chartType": "xtable", + "valueType": "number", + "drillChart": "wsConnectionAgeingWard", + "action": "", + "plotLabel": "ULB", + "isPostResponseHandler": true, + "postAggregationTheory" : "", + "aggregationPaths": [ + "Pending from 0 to 3 days", + "Pending from 3 to 7 days", + "Pending from 7 to 15 days", + "Pending more than 15 days" + + ], + "computedFields": [ + { + "postAggregationTheory" : "", + "actionName": "AdditiveComputedField", + "fields" : [ "Pending from 0 to 3 days", "Pending from 3 to 7 days", "Pending from 7 to 15 days", "Pending more than 15 days"], + "newField" : "Total Pending", + "_comments": "fields are field names picked from its aggregation query to use post aggregation newField value with given new field name " + } + ], + + "insight": { + }, + "_comment": "" + }, + "wsConnectionAgeingWard": { + "chartName": "DSS_W&S_CONNECTION_AGEING", + "queries": [ + { + "module": "W&S", + "requestQueryMap": "{\"tenantId\" : \"cityname.keyword\", \"wardId\" : \"block.keyword\" }", + "dateRefField": "createddate", + "indexName": "wsapplications", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must\":[{\"terms\":{\"servicetype.keyword\":[\"Water Charges\",\"Sewerage Charges\"]}},{\"terms\":{\"applicationstatus.keyword\":[\"Created\",\"Rejected\",\"Verified\",\"verified\"]}}]}},\"aggs\":{\"2\":{\"terms\":{\"field\":\"block.keyword\",\"size\":10000,\"order\":{\"_key\":\"asc\"}},\"aggs\":{\"Pending from 0 to 3 days\":{\"date_range\":{\"field\":\"applicationdate\",\"ranges\":[{\"from\":\"now-3d/d\",\"to\":\"now\"}]}},\"Pending from 3 to 7 days\":{\"date_range\":{\"field\":\"applicationdate\",\"ranges\":[{\"from\":\"now-1w\",\"to\":\"now-3d/d\"}]}},\"Pending from 7 to 15 days\":{\"date_range\":{\"field\":\"applicationdate\",\"ranges\":[{\"from\":\"now-15d\",\"to\":\"now-1w\"}]}},\"Pending more than 15 days\":{\"date_range\":{\"field\":\"applicationdate\",\"ranges\":[{\"from\":\"now-2y\",\"to\":\"now-15d\"}]}}}}}}}}" + } + ], + "isMdmsEnabled": false, + "translateTenantCode": true, + "filterKeys": [ + {"key": "tenantId", "column": "Ward"} + ], + "chartType": "xtable", + "valueType": "number", + "drillChart": "", + "action": "", + "plotLabel": "Ward", + "isPostResponseHandler": true, + "postAggregationTheory" : "", + "aggregationPaths": [ + "Pending from 0 to 3 days", + "Pending from 3 to 7 days", + "Pending from 7 to 15 days", + "Pending more than 15 days" + + ], + "computedFields": [ + { + "postAggregationTheory" : "", + "actionName": "AdditiveComputedField", + "fields" : [ "Pending from 0 to 3 days", "Pending from 3 to 7 days", "Pending from 7 to 15 days", "Pending more than 15 days"], + "newField" : "Total Pending", + "_comments": "fields are field names picked from its aggregation query to use post aggregation newField value with given new field name " + } + ], + + "insight": { + }, + "_comment": "" + }, + "mcTotalCollection": { + "chartName": "DSS_TOTAL_COLLECTION", + "queries": [ + { + "module": "MCOLLECT", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\"}", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pg.testing\",\"pg\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"FSM.TRIP_CHARGES\",\"PT.MUTATION\",\"SW\",\"BPA.LOW_RISK_PERMIT_FEE\",\"BPA.NC_SAN_FEE\",\"BPA.NC_APP_FEE\",\"BPA.NC_OC_APP_FEE\"]}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" + } + ], + "chartType": "metric", + "valueType": "Amount", + "drillChart": "none", + "documentType": "_doc", + "action": "", + "aggregationPaths": [ + "Total Collection" + ], + "insight": { + "chartResponseMap": "mcTotalCollection", + "action": "differenceOfNumbers", + "upwardIndicator": "positive", + "downwardIndicator": "negative", + "textMessage": "$indicator$value% than last $insightInterval", + "colorCode": "#228B22", + "insightInterval": "year" + }, + "_comment": " " + }, + "mcTotalReceipts": { + "chartName": "DSS_MC_TOTAL_RECEIPTS", + "queries": [ + { + "module": "MCOLLECT", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.Bill.billDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.cityDistrictCode\"}", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pb.testing\",\"pb\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"PT.MUTATION\",\"SW\"]}}]}},\"aggs\":{\"Total Receipts\":{\"value_count\":{\"field\":\"dataObject.paymentDetails.receiptNumber.keyword\"}}}}}}" + } + ], + "chartType": "metric", + "valueType": "number", + "drillChart": "none", + "documentType": "_doc", + "action": "", + "aggregationPaths": [ + "Total Receipts" + ], + "insight": { + "chartResponseMap": "mcTotalReceipts", + "action": "differenceOfNumbers", + "upwardIndicator": "positive", + "downwardIndicator": "negative", + "textMessage": "$indicator$value% than last $insightInterval", + "colorCode": "#228B22", + "insightInterval": "year" + }, + "_comment": " " + }, + "nocTotalCollection": { + "chartName": "DSS_NOC_TOTAL_COLLECTION", + "queries": [ + { + "module": "FIRENOC", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must\":[{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"FIRENOC\"]}}],\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"term\":{\"dataObject.paymentStatus.keyword\":\"Cancelled\"}}]}},\"aggs\":{\"Total Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}", + "requestQueryMap": "{\"wardId\" : \"dataObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\",\"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\" }", + "dateRefField": "dataObject.paymentDetails.receiptDate" + } + ], + "chartType": "metric", + "valueType": "amount", + "action": "", + "drillChart": "none", + "aggregationPaths": [ + "Total Collection" + ], + "insight": { + "chartResponseMap": "nocTotalCollection", + "action": "differenceOfNumbers", + "upwardIndicator": "positive", + "downwardIndicator": "negative", + "textMessage": "$indicator$value% than last $insightInterval", + "colorCode": "#228B22", + "insightInterval": "year" + }, + "_comment": "FIRE NOC total collections " + }, + "nocTotalNocsIssued": { + "chartName": "DSS_NOC_TOTAL_NOCS_ISSUED", + "queries": [ + { + "module": "FIRENOC", + "indexName": "firenoc-services", + "aggrQuery": "{\"aggs\":{\"FireNOC\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}],\"must\":[{\"terms\":{\"Data.fireNOCDetails.status.keyword\":[\"APPROVED\"]}}]}},\"aggs\":{\"Total Nocs Issued\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}}", + "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\",\"tenantId\" : \"Data.tenantId\", \"district\" : \"Data.tenantData.city.districtCode\"}", + "dateRefField": "Data.auditDetails.createdTime" + } + ], + "chartType": "metric", + "valueType": "number", + "action": "", + "drillChart": "none", + "aggregationPaths": [ + "Total Nocs Issued" + ], + "insight": { + "chartResponseMap": "nocTotalNocsIssued", + "action": "differenceOfNumbers", + "upwardIndicator": "positive", + "downwardIndicator": "negative", + "textMessage": "$indicator$value% than last $insightInterval", + "colorCode": "#228B22", + "insightInterval": "year" + }, + "_comment": "FIRE NOC total nocs issued " + }, + "mcTodaysCollection": { + "chartName": "DSS_TOTAL_COLLECTION_TODAY", + "queries": [ + { + "module": "COMMON", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.paymentDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.city.districtCode\"}", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pb.testing\",\"pb\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"PT.MUTATION\",\"SW\"]}}]}},\"aggs\":{\"Todays Collection\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}" + } + ], + "chartType": "metric", + "valueType": "Amount", + "drillChart": "none", + "documentType": "_doc", + "action": "", + "aggregationPaths": [ + "Todays Collection" + ], + "insight": {}, + "_comment": " " + }, + "mcTotalChallans": { + "chartName": "DSS_MC_TOTAL_CHALLANS", + "queries": [ + { + "module": "MCOLLECT", + "dateRefField": "Data.taxPeriodFrom", + "requestQueryMap": "{\"module\" : \"Data.businessService\", \"tenantId\" : \"Data.tenantId\"}", + "indexName": "echallan-services", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Total Challans\":{\"value_count\":{\"field\":\"Data.challanNo.keyword\"}}}}}}" + } + ], + "chartType": "metric", + "valueType": "number", + "drillChart": "none", + "documentType": "_doc", + "action": "", + "aggregationPaths": [ + "Total Challans" + ], + "insight": { + "chartResponseMap": "mcTotalChallans", + "action": "differenceOfNumbers", + "upwardIndicator": "positive", + "downwardIndicator": "negative", + "textMessage": "$indicator$value% than last $insightInterval", + "colorCode": "#228B22", + "insightInterval": "year" + }, + "_comment": " " + }, + "mcTotalCategories": { + "chartName": "DSS_MC_TOTAL_CATEGORIES", + "queries": [ + { + "module": "MCOLLECT", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.Bill.billDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.cityDistrictCode\"}", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pb.testing\",\"pb\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"PT.MUTATION\",\"SW\"]}}]}},\"aggs\":{\"Total Categories\":{\"cardinality\":{\"field\":\"dataObject.paymentDetails.businessService.keyword\"}}}}}}" + } + ], + "chartType": "metric", + "valueType": "number", + "drillChart": "none", + "documentType": "_doc", + "action": "", + "aggregationPaths": [ + "Total Categories" + ], + "insight": {}, + "_comment": " " + }, + "mcCumulativeCollection": { + "chartName": "DSS_TOTAL_CUMULATIVE_COLLECTION", + "queries": [ + { + "module": "MCOLLECT", + "dateRefField": "dataObject.paymentDetails.receiptDate", + "requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\r\n \"module\" : \"dataObject.paymentDetails.businessService.keyword\", \n\"tenantId\" : \"dataObject.tenantId\"}", + "indexName": "dss-collection_v2", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"terms\":{\"dataObject.tenantId.keyword\":[\"pb.testing\",\"pb\"]}},{\"terms\":{\"dataObject.bill.status.keyword\":[\"Cancelled\"]}},{\"terms\":{\"dataObject.paymentDetails.businessService.keyword\":[\"PT\",\"TL\",\"WS.ONE_TIME_FEE\",\"SW.ONE_TIME_FEE\",\"PT.MUTATION\",\"SW\"]}}]}},\"aggs\":{\"Collections\":{\"date_histogram\":{\"field\":\"dataObject.paymentDetails.receiptDate\",\"interval\":\"intervalvalue\"},\"aggs\":{\"Sum\":{\"sum\":{\"field\":\"dataObject.paymentDetails.totalAmountPaid\"}}}}}}}}" + } + ], + "chartType": "line", + "valueType": "amount", + "action": "", + "drillChart": "none", + "documentType": "_doc", + "aggregationPaths": [ + "Collections" + ], + "isCumulative": true, + "interval": "month", + "insight": {}, + "_comment": " " + }, + "nocTotalApplications": { + "chartName": "DSS_NOC_TOTAL_APPLICATIONS", + "queries": [ + { + "module": "FIRENOC", + "indexName": "firenoc-services", + "aggrQuery": "{\"aggs\":{\"FireNOC\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Total Applications\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}}", + "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\",\"tenantId\" : \"Data.tenantId\", \"district\" : \"Data.tenantData.city.districtCode\"}", + "dateRefField": "Data.auditDetails.createdTime" + } + ], + "chartType": "metric", + "valueType": "number", + "action": "", + "drillChart": "none", + "aggregationPaths": [ + "Total Applications" + ], + "insight": { + "chartResponseMap": "nocTotalApplications", + "action": "differenceOfNumbers", + "upwardIndicator": "positive", + "downwardIndicator": "negative", + "textMessage": "$indicator$value% than last $insightInterval", + "colorCode": "#228B22", + "insightInterval": "year" + }, + "_comment": "FIRE NOC total applications " + }, + "nocProvisionalIssued": { + "chartName": "DSS_NOC_PROVISIONAL_ISSUED", + "queries": [ + { + "module": "FIRENOC", + "indexName": "firenoc-services", + "aggrQuery": "{\"aggs\":{\"FireNOC\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Provisional Fire Nocs issued\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"Data.fireNOCDetails.fireNOCType.keyword\":\"PROVISIONAL\"}}]}}}}}}}", + "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\",\"tenantId\" : \"Data.tenantId\", \"district\" : \"Data.tenantData.city.districtCode\"}", + "dateRefField": "Data.auditDetails.createdTime" + } + ], + "chartType": "metric", + "valueType": "number", + "action": "", + "drillChart": "none", + "aggregationPaths": [ + "Provisional Fire Nocs issued" + ], + "insight": { + "chartResponseMap": "nocProvisionalIssued", + "action": "differenceOfNumbers", + "upwardIndicator": "positive", + "downwardIndicator": "negative", + "textMessage": "$indicator$value% than last $insightInterval", + "colorCode": "#228B22", + "insightInterval": "year" + }, + "_comment": "FIRE NOC Provisional Issued" + }, + "nocActualIssued": { + "chartName": "DSS_NOC_ACTUAL_ISSUED", + "queries": [ + { + "module": "FIRENOC", + "indexName": "firenoc-services", + "aggrQuery": "{\"aggs\":{\"FireNOC\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Actual Fire Nocs issued\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"Data.fireNOCDetails.fireNOCType.keyword\":\"NEW\"}}]}}}}}}}", + "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\",\"tenantId\" : \"Data.tenantId\", \"district\" : \"Data.tenantData.city.districtCode\"}", + "dateRefField": "Data.auditDetails.createdTime" + } + ], + "chartType": "metric", + "valueType": "number", + "action": "", + "drillChart": "none", + "aggregationPaths": [ + "Actual Fire Nocs issued" + ], + "insight": { + "chartResponseMap": "nocActualIssued", + "action": "differenceOfNumbers", + "upwardIndicator": "positive", + "downwardIndicator": "negative", + "textMessage": "$indicator$value% than last $insightInterval", + "colorCode": "#228B22", + "insightInterval": "year" + }, + "_comment": "Actual fire nocs Issued" + }, + "nocSLAComplianceProvisional": { + "chartName": "DSS_NOC_SLA_COMPLIANCE_PROVISIONAL", + "queries": [ + { + "module": "FIRENOC", + "indexName": "firenoc-services", + "aggrQuery": "{\"aggs\":{\"FireNOC\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"SLA Compliance (Provisional NOC)\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"Data.fireNOCDetails.fireNOCType.keyword\":\"PROVISIONAL\"}},{\"term\":{\"Data.fireNOCDetails.status.keyword\":\"APPROVED\"}},{\"script\":{\"script\":{\"source\":\"doc['Data.auditDetails.lastModifiedTime'].value-doc['Data.auditDetails.createdTime'].value egovtelemetryreindex +#configKey=INDEX: Index that currently receives live data from the services +#configKey=REINDEX: Configuration for reindexing that will be enabled only during reindexing activity. diff --git a/configs/egov-indexer/egov-uploader-indexer.yml b/configs/egov-indexer/egov-uploader-indexer.yml new file mode 100644 index 00000000..c4202ea3 --- /dev/null +++ b/configs/egov-indexer/egov-uploader-indexer.yml @@ -0,0 +1,28 @@ +ServiceMaps: + serviceName: Uploader + version: 1.0.0 + mappings: + - topic: save-upload-jobs + configKey: INDEX + indexes: + - name: uploaderindex-v1 + type: jobs + id: $.code + isBulk: false + jsonPath: $.UploadJob + timeStampField: $.auditDetails.createdTime + + - topic: update-upload-jobs + configKey: INDEX + indexes: + - name: uploaderindex-v1 + type: jobs + id: $.code + isBulk: false + jsonPath: $.UploadJob + timeStampField: $.auditDetails.createdTime + + +#JOURNEY: egovtelemetry -> egovtelemetryreindex +#configKey=INDEX: Index that currently receives live data from the services +#configKey=REINDEX: Configuration for reindexing that will be enabled only during reindexing activity. diff --git a/configs/egov-indexer/error-queue.yml b/configs/egov-indexer/error-queue.yml new file mode 100644 index 00000000..c8b550b5 --- /dev/null +++ b/configs/egov-indexer/error-queue.yml @@ -0,0 +1,27 @@ +ServiceMaps: + serviceName: Tracer + version: 1.0.0 + mappings: + - topic: tracer-error-queue-index + configKey: INDEX + indexes: + - name: egovtracer + type: errors + id: $.id + isBulk: false + timeStampField: $.ts + + - topic: tracer-error-queue-reindex + configKey: REINDEX + indexes: + - name: egovtracerreindex + type: errors + id: $.id + isBulk: true + jsonPath: $.hits + timeStampField: $.ts + + +#JOURNEY: egovtracer +#configKey=INDEX: Index that currently receives live data from the services +#configKey=REINDEX: Configuration for reindexing that will be enabled only during reindexing activity. diff --git a/configs/egov-indexer/finance-rolloutadoption-indexer.yml b/configs/egov-indexer/finance-rolloutadoption-indexer.yml new file mode 100644 index 00000000..d62ba073 --- /dev/null +++ b/configs/egov-indexer/finance-rolloutadoption-indexer.yml @@ -0,0 +1,31 @@ +ServiceMaps: + serviceName: FinanceAdoption + version: 1.0.0 + mappings: + - topic: finance-adoption-topic + configKey: INDEX + indexes: + - name: financeindex-v1 + type: rolloutadoption + id: $.id + isBulk: false + timeStampField: $.timestamp + jsonPath: $.rollOutAdoptionData + - topic: finance-bill-topic + configKey: INDEX + indexes: + - name: financebill-v1 + type: billregister + id: $.id + isBulk: true + timeStampField: $.timestamp + jsonPath: $.egBillRegisterData + - topic: finance-voucher-topic + configKey: INDEX + indexes: + - name: financevoucher-v1 + type: voucher + id: $.id + isBulk: true + timeStampField: $.timestamp + jsonPath: $.voucherHeaderData diff --git a/configs/egov-indexer/payment-indexer-migration.yml b/configs/egov-indexer/payment-indexer-migration.yml new file mode 100644 index 00000000..f2b0a305 --- /dev/null +++ b/configs/egov-indexer/payment-indexer-migration.yml @@ -0,0 +1,54 @@ +ServiceMaps: + serviceName: Collection Services + version: 1.0.0 + mappings: + - topic: egov-collection-migration-batch + configKey: INDEX + indexes: + - name: paymentsindex-v1 + type: payments + id: $.id + isBulk: true + timeStampField: $.auditDetails.createdTime + jsonPath: $.Payments.* + customJsonMapping: + indexMapping: {"Data":{"tenantId":"","id":"","transactionNumber":"","transactionDate":1,"paymentMode":"","paymentStatus":"","payer":{"id":"","name":""},"paidBy":"","paymentDetails":{},"auditDetails":{},"additionalDetails":{},"tenantData":{},"@timestamp":"timestamp"}} + fieldMapping: + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.transactionNumber + outJsonPath: $.Data.transactionNumber + - inJsonPath: $.transactionDate + outJsonPath: $.Data.transactionDate + - inJsonPath: $.paymentMode + outJsonPath: $.Data.paymentMode + - inJsonPath: $.paymentStatus + outJsonPath: $.Data.paymentStatus + - inJsonPath: $.payerId + outJsonPath: $.Data.payer.id + - inJsonPath: $.payerName + outJsonPath: $.Data.payer.name + - inJsonPath: $.paidBy + outJsonPath: $.Data.paidBy + - inJsonPath: $.paymentDetails + outJsonPath: $.Data.paymentDetails + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - inJsonPath: $.additionalDetails + outJsonPath: $.Data.additionalDetails + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + mdmsMapping: + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData diff --git a/configs/egov-indexer/payment-indexer.yml b/configs/egov-indexer/payment-indexer.yml new file mode 100644 index 00000000..fd9cc521 --- /dev/null +++ b/configs/egov-indexer/payment-indexer.yml @@ -0,0 +1,485 @@ +ServiceMaps: + serviceName: Collection Services + version: 1.0.0 + mappings: + - topic: egov.collection.payment-create + configKey: INDEX + indexes: + - name: paymentsindex-v1 + type: payments + id: $.id + isBulk: false + timeStampField: $.auditDetails.createdTime + jsonPath: $.Payment + customJsonMapping: + indexMapping: {"Data":{"tenantId":"","id":"","transactionNumber":"","transactionDate":1,"paymentMode":"","paymentStatus":"","payer":{"id":"","name":""},"paidBy":"","paymentDetails":{},"auditDetails":{},"additionalDetails":{},"tenantData":{},"@timestamp":"timestamp","ward":{}}} + fieldMapping: + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.transactionNumber + outJsonPath: $.Data.transactionNumber + - inJsonPath: $.transactionDate + outJsonPath: $.Data.transactionDate + - inJsonPath: $.paymentMode + outJsonPath: $.Data.paymentMode + - inJsonPath: $.paymentStatus + outJsonPath: $.Data.paymentStatus + - inJsonPath: $.payerId + outJsonPath: $.Data.payer.id + - inJsonPath: $.payerName + outJsonPath: $.Data.payer.name + - inJsonPath: $.paidBy + outJsonPath: $.Data.paidBy + - inJsonPath: $.paymentDetails + outJsonPath: $.Data.paymentDetails + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - inJsonPath: $.additionalDetails + outJsonPath: $.Data.additionalDetails + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + + externalUriMapping: + - path: http://egov-location:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + mdmsMapping: + - path: http://egov-mdms-service:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData + + + - topic: egov.collection.payment-update + configKey: INDEX + indexes: + - name: paymentsindex-v1 + type: payments + id: $.id + isBulk: false + timeStampField: $.auditDetails.createdTime + jsonPath: $.Payment + customJsonMapping: + indexMapping: {"Data":{"tenantId":"","id":"","transactionNumber":"","transactionDate":1,"paymentMode":"","paymentStatus":"","payer":{"id":"","name":""},"paidBy":"","paymentDetails":{},"auditDetails":{},"additionalDetails":{},"tenantData":{},"@timestamp":"timestamp","ward":{}}} + fieldMapping: + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.transactionNumber + outJsonPath: $.Data.transactionNumber + - inJsonPath: $.transactionDate + outJsonPath: $.Data.transactionDate + - inJsonPath: $.paymentMode + outJsonPath: $.Data.paymentMode + - inJsonPath: $.paymentStatus + outJsonPath: $.Data.paymentStatus + - inJsonPath: $.payerId + outJsonPath: $.Data.payer.id + - inJsonPath: $.payerName + outJsonPath: $.Data.payer.name + - inJsonPath: $.paidBy + outJsonPath: $.Data.paidBy + - inJsonPath: $.paymentDetails + outJsonPath: $.Data.paymentDetails + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - inJsonPath: $.additionalDetails + outJsonPath: $.Data.additionalDetails + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + externalUriMapping: + - path: http://egov-location:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + mdmsMapping: + - path: http://egov-mdms-service:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData + + + - topic: egov-payment-legacy-index + configKey: LEGACYINDEX + indexes: + - name: paymentsindex-v1 + type: payments + id: $.id + isBulk: true + timeStampField: $.auditDetails.createdTime + jsonPath: $.Payments.* + customJsonMapping: + indexMapping: {"Data":{"tenantId":"","id":"","transactionNumber":"","transactionDate":1,"paymentMode":"","paymentStatus":"","payer":{"id":"","name":""},"paidBy":"","paymentDetails":{},"auditDetails":{},"additionalDetails":{},"tenantData":{},"@timestamp":"timestamp","ward":{}}} + fieldMapping: + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.transactionNumber + outJsonPath: $.Data.transactionNumber + - inJsonPath: $.transactionDate + outJsonPath: $.Data.transactionDate + - inJsonPath: $.paymentMode + outJsonPath: $.Data.paymentMode + - inJsonPath: $.paymentStatus + outJsonPath: $.Data.paymentStatus + - inJsonPath: $.payerId + outJsonPath: $.Data.payer.id + - inJsonPath: $.payerName + outJsonPath: $.Data.payer.name + - inJsonPath: $.paidBy + outJsonPath: $.Data.paidBy + - inJsonPath: $.paymentDetails + outJsonPath: $.Data.paymentDetails + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - inJsonPath: $.additionalDetails + outJsonPath: $.Data.additionalDetails + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + externalUriMapping: + - path: http://egov-location:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + mdmsMapping: + - path: http://egov-mdms-service:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData + + - topic: egov.collection.payment-cancel + configKey: INDEX + indexes: + - name: paymentsindex-v1 + type: payments + id: $.id + isBulk: false + timeStampField: $.auditDetails.createdTime + jsonPath: $.Payment + customJsonMapping: + indexMapping: {"Data":{"tenantId":"","id":"","transactionNumber":"","transactionDate":1,"paymentMode":"","paymentStatus":"","payer":{"id":"","name":""},"paidBy":"","paymentDetails":{},"auditDetails":{},"additionalDetails":{},"tenantData":{},"@timestamp":"timestamp","ward":{}}} + fieldMapping: + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.transactionNumber + outJsonPath: $.Data.transactionNumber + - inJsonPath: $.transactionDate + outJsonPath: $.Data.transactionDate + - inJsonPath: $.paymentMode + outJsonPath: $.Data.paymentMode + - inJsonPath: $.paymentStatus + outJsonPath: $.Data.paymentStatus + - inJsonPath: $.payerId + outJsonPath: $.Data.payer.id + - inJsonPath: $.payerName + outJsonPath: $.Data.payer.name + - inJsonPath: $.paidBy + outJsonPath: $.Data.paidBy + - inJsonPath: $.paymentDetails + outJsonPath: $.Data.paymentDetails + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - inJsonPath: $.additionalDetails + outJsonPath: $.Data.additionalDetails + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + externalUriMapping: + - path: http://egov-location:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + mdmsMapping: + - path: http://egov-mdms-service:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData + + - topic: save-challan + configKey: INDEX + indexes: + - name: echallan-services + type: general + id: $.id,$.tenantId + jsonPath: $.Challan + timeStampField: $.auditDetails.createdTime + customJsonMapping: + indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","tenantId":"","businessService":"","challanNo":"","referenceId":"","description":"","accountId":"","additionalDetail":{},"source":"","taxPeriodFrom":"","taxPeriodTo":"","amount":[],"filestoreid":"","additionalDetails":{},"applicationStatus":"","vendor":"","typeOfExpense":"","billDate":"","billIssuedDate":"","paidDate":"","isBillPaid":"","vendorName":"","totalAmount":"","@timestamp":"timestamp","history":{},"ward":{"name": "NA"}}} + fieldMapping: + - inJsonPath: $.applicationStatus.state + outJsonPath: $.Data.workflow.state + - inJsonPath: $.processInstance.action + outJsonPath: $.Data.workflow.action + - inJsonPath: $.processInstance.assignes.*.uuid + outJsonPath: $.Data.workflow.assignes + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.businessService + outJsonPath: $.Data.businessService + - inJsonPath: $.challanNo + outJsonPath: $.Data.challanNo + - inJsonPath: $.referenceId + outJsonPath: $.Data.referenceId + - inJsonPath: $.description + outJsonPath: $.Data.description + - inJsonPath: $.accountId + outJsonPath: $.Data.accountId + - inJsonPath: $.additionalDetail + outJsonPath: $.Data.additionalDetail + - inJsonPath: $.source + outJsonPath: $.Data.source + - inJsonPath: $.taxPeriodFrom + outJsonPath: $.Data.taxPeriodFrom + - inJsonPath: $.taxPeriodTo + outJsonPath: $.Data.taxPeriodTo + - inJsonPath: $.amount + outJsonPath: $.Data.amount + - inJsonPath: $.filestoreid + outJsonPath: $.Data.filestoreid + - inJsonPath: $.additionalDetails + outJsonPath: $.Data.additionalDetails + - inJsonPath: $.applicationStatus + outJsonPath: $.Data.applicationStatus + - inJsonPath: $.vendor + outJsonPath: $.Data.vendor + - inJsonPath: $.typeOfExpense + outJsonPath: $.Data.typeOfExpense + - inJsonPath: $.billDate + outJsonPath: $.Data.billDate + - inJsonPath: $.billIssuedDate + outJsonPath: $.Data.billIssuedDate + - inJsonPath: $.paidDate + outJsonPath: $.Data.paidDate + - inJsonPath: $.isBillPaid + outJsonPath: $.Data.isBillPaid + - inJsonPath: $.vendorName + outJsonPath: $.Data.vendorName + - inJsonPath: $.totalAmount + outJsonPath: $.Data.totalAmount + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + externalUriMapping: + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.acknowldgementNumber,history=true,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.echallan","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + + + - topic: update-challan + configKey: INDEX + indexes: + - name: echallan-services + type: general + id: $.id,$.tenantId + jsonPath: $.Challan + timeStampField: $.auditDetails.createdTime + customJsonMapping: + indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","tenantId":"","businessService":"","challanNo":"","referenceId":"","description":"","accountId":"","additionalDetail":{},"source":"","taxPeriodFrom":"","taxPeriodTo":"","amount":[],"filestoreid":"","additionalDetails":{},"applicationStatus":"","vendor":"","typeOfExpense":"","billDate":"","billIssuedDate":"","paidDate":"","isBillPaid":"","vendorName":"","totalAmount":"","@timestamp":"timestamp","history":{},"ward":{"name": "NA"}}} + fieldMapping: + - inJsonPath: $.applicationStatus.state + outJsonPath: $.Data.workflow.state + - inJsonPath: $.processInstance.action + outJsonPath: $.Data.workflow.action + - inJsonPath: $.processInstance.assignes.*.uuid + outJsonPath: $.Data.workflow.assignes + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.businessService + outJsonPath: $.Data.businessService + - inJsonPath: $.challanNo + outJsonPath: $.Data.challanNo + - inJsonPath: $.referenceId + outJsonPath: $.Data.referenceId + - inJsonPath: $.description + outJsonPath: $.Data.description + - inJsonPath: $.accountId + outJsonPath: $.Data.accountId + - inJsonPath: $.additionalDetail + outJsonPath: $.Data.additionalDetail + - inJsonPath: $.source + outJsonPath: $.Data.source + - inJsonPath: $.taxPeriodFrom + outJsonPath: $.Data.taxPeriodFrom + - inJsonPath: $.taxPeriodTo + outJsonPath: $.Data.taxPeriodTo + - inJsonPath: $.amount + outJsonPath: $.Data.amount + - inJsonPath: $.filestoreid + outJsonPath: $.Data.filestoreid + - inJsonPath: $.additionalDetails + outJsonPath: $.Data.additionalDetails + - inJsonPath: $.applicationStatus + outJsonPath: $.Data.applicationStatus + - inJsonPath: $.vendor + outJsonPath: $.Data.vendor + - inJsonPath: $.typeOfExpense + outJsonPath: $.Data.typeOfExpense + - inJsonPath: $.billDate + outJsonPath: $.Data.billDate + - inJsonPath: $.billIssuedDate + outJsonPath: $.Data.billIssuedDate + - inJsonPath: $.paidDate + outJsonPath: $.Data.paidDate + - inJsonPath: $.isBillPaid + outJsonPath: $.Data.isBillPaid + - inJsonPath: $.vendorName + outJsonPath: $.Data.vendorName + - inJsonPath: $.totalAmount + outJsonPath: $.Data.totalAmount + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + externalUriMapping: + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.acknowldgementNumber,history=true,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.echallan","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + + + - topic: echallan-legacyIndex + configKey: LEGACYINDEX + indexes: + - name: echallan-services + type: general + isBulk: true + id: $.id,$.tenantId + jsonPath: $.challans.* + timeStampField: $.auditDetails.createdTime + customJsonMapping: + indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","tenantId":"","businessService":"","challanNo":"","referenceId":"","description":"","accountId":"","additionalDetail":{},"source":"","taxPeriodFrom":"","taxPeriodTo":"","amount":[],"filestoreid":"","additionalDetails":{},"applicationStatus":"","vendor":"","typeOfExpense":"","billDate":"","billIssuedDate":"","paidDate":"","isBillPaid":"","vendorName":"","totalAmount":"","@timestamp":"timestamp","history":{},"ward":{"name": "NA"}}} + fieldMapping: + - inJsonPath: $.processInstance.action + outJsonPath: $.Data.workflow.action + - inJsonPath: $.processInstance.assignes.*.uuid + outJsonPath: $.Data.workflow.assignes + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.businessService + outJsonPath: $.Data.businessService + - inJsonPath: $.challanNo + outJsonPath: $.Data.challanNo + - inJsonPath: $.referenceId + outJsonPath: $.Data.referenceId + - inJsonPath: $.description + outJsonPath: $.Data.description + - inJsonPath: $.accountId + outJsonPath: $.Data.accountId + - inJsonPath: $.additionalDetail + outJsonPath: $.Data.additionalDetail + - inJsonPath: $.source + outJsonPath: $.Data.source + - inJsonPath: $.taxPeriodFrom + outJsonPath: $.Data.taxPeriodFrom + - inJsonPath: $.taxPeriodTo + outJsonPath: $.Data.taxPeriodTo + - inJsonPath: $.amount + outJsonPath: $.Data.amount + - inJsonPath: $.filestoreid + outJsonPath: $.Data.filestoreid + - inJsonPath: $.additionalDetails + outJsonPath: $.Data.additionalDetails + - inJsonPath: $.applicationStatus + outJsonPath: $.Data.applicationStatus + - inJsonPath: $.vendor + outJsonPath: $.Data.vendor + - inJsonPath: $.typeOfExpense + outJsonPath: $.Data.typeOfExpense + - inJsonPath: $.billDate + outJsonPath: $.Data.billDate + - inJsonPath: $.billIssuedDate + outJsonPath: $.Data.billIssuedDate + - inJsonPath: $.paidDate + outJsonPath: $.Data.paidDate + - inJsonPath: $.isBillPaid + outJsonPath: $.Data.isBillPaid + - inJsonPath: $.vendorName + outJsonPath: $.Data.vendorName + - inJsonPath: $.totalAmount + outJsonPath: $.Data.totalAmount + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + externalUriMapping: + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.acknowldgementNumber,history=true,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.echallan","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + + diff --git a/configs/egov-indexer/property-services-migration-temp.yml b/configs/egov-indexer/property-services-migration-temp.yml new file mode 100644 index 00000000..43a20544 --- /dev/null +++ b/configs/egov-indexer/property-services-migration-temp.yml @@ -0,0 +1,775 @@ +ServiceMaps: + serviceName: Property Tax - rainmaker + version: 1.0.0 + mappings: + - topic: save-property-registry-batch + configKey: INDEX + indexes: + - name: property-services + type: general + id: $.propertyId,$.tenantId + jsonPath: $.Property + timeStampField: $.auditDetails.lastModifiedTime + customJsonMapping: + indexMapping: {"Data":{"owners":[],"acknowldgementNumber":"","propertyType":"","ownershipCategory":"","creationReason":"","usageCategory":"","noOfFloors":"","landArea":"","superBuiltUpArea":"","source":"","channel":"","units":{},"auditDetails":{},"id":"","propertyId":"","surveyId":"","linkedProperties":{},"tenantId":"","accountId":"","oldPropertyId":"","status":"","@timestamp":"timestamp"}} + fieldMapping: + - inJsonPath: $.owners.*.uuid + outJsonPath: $.Data.owners + - inJsonPath: $.acknowldgementNumber + outJsonPath: $.Data.acknowldgementNumber + - inJsonPath: $.propertyType + outJsonPath: $.Data.propertyType + - inJsonPath: $.ownershipCategory + outJsonPath: $.Data.ownershipCategory + - inJsonPath: $.creationReason + outJsonPath: $.Data.creationReason + - inJsonPath: $.usageCategory + outJsonPath: $.Data.usageCategory + - inJsonPath: $.noOfFloors + outJsonPath: $.Data.noOfFloors + - inJsonPath: $.landArea + outJsonPath: $.Data.landArea + - inJsonPath: $.superBuiltUpArea + outJsonPath: $.Data.superBuiltUpArea + - inJsonPath: $.source + outJsonPath: $.Data.source + - inJsonPath: $.channel + outJsonPath: $.Data.channel + - inJsonPath: $.units + outJsonPath: $.Data.units + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.propertyId + outJsonPath: $.Data.propertyId + - inJsonPath: $.surveyId + outJsonPath: $.Data.surveyId + - inJsonPath: $.linkedProperties + outJsonPath: $.Data.linkedProperties + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.accountId + outJsonPath: $.Data.accountId + - inJsonPath: $.oldPropertyId + outJsonPath: $.Data.oldPropertyId + - inJsonPath: $.status + outJsonPath: $.Data.status + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + externalUriMapping: + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.acknowldgementNumber,history=true,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history + mdmsMapping: + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: PropertyTax + masterName: UsageCategory + tenantId: pb + filter: "[?(@.code == $usageCategory)]" + filterMapping: + - variable: $usageCategory + valueJsonpath: $.usageCategory + uriResponseMapping: + - inJsonPath: $.MdmsRes.PropertyTax.UsageCategory[0].name + outJsonPath: $.Data.usageCategory + + - name: property-application + type: general + id: $.propertyId,$.acknowldgementNumber,$.tenantId + jsonPath: $.Property + timeStampField: $.auditDetails.lastModifiedTime + customJsonMapping: + indexMapping: {"Data":{"acknowldgementNumber":"","creationReason":"","auditDetails":{},"propertyId":"","tenantId":"","accountId":"","status":"","@timestamp":""}} + fieldMapping: + - inJsonPath: $.acknowldgementNumber + outJsonPath: $.Data.acknowldgementNumber + - inJsonPath: $.creationReason + outJsonPath: $.Data.creationReason + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - inJsonPath: $.propertyId + outJsonPath: $.Data.propertyId + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.accountId + outJsonPath: $.Data.accountId + - inJsonPath: $.status + outJsonPath: $.Data.status + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + externalUriMapping: + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + - inJsonPath: $.TenantBoundary[0].boundary[0].children + outJsonPath: $.Data.ward.children + filter: "[?(@.code == $locality)]" + filterMapping: + - variable: $locality + valueJsonpath: $.address.locality.code + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.acknowldgementNumber,history=true,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history + mdmsMapping: + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: PropertyTax + masterName: UsageCategory + tenantId: pb + filter: "[?(@.code == $usageCategory)]" + filterMapping: + - variable: $usageCategory + valueJsonpath: $.usageCategory + uriResponseMapping: + - inJsonPath: $.MdmsRes.PropertyTax.UsageCategory[0].name + outJsonPath: $.Data.usageCategory + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData + + + + + - topic: update-property-registry + configKey: INDEX + indexes: + - name: property-services + type: general + id: $.propertyId,$.tenantId + jsonPath: $.Property + timeStampField: $.auditDetails.lastModifiedTime + customJsonMapping: + indexMapping: {"Data":{"owners":[],"acknowldgementNumber":"","propertyType":"","ownershipCategory":"","creationReason":"","usageCategory":"","noOfFloors":"","landArea":"","superBuiltUpArea":"","source":"","channel":"","units":{},"auditDetails":{},"id":"","propertyId":"","surveyId":"","linkedProperties":{},"tenantId":"","accountId":"","oldPropertyId":"","status":"","@timestamp":"timestamp"}} + fieldMapping: + - inJsonPath: $.owners.*.uuid + outJsonPath: $.Data.owners + - inJsonPath: $.acknowldgementNumber + outJsonPath: $.Data.acknowldgementNumber + - inJsonPath: $.propertyType + outJsonPath: $.Data.propertyType + - inJsonPath: $.ownershipCategory + outJsonPath: $.Data.ownershipCategory + - inJsonPath: $.creationReason + outJsonPath: $.Data.creationReason + - inJsonPath: $.usageCategory + outJsonPath: $.Data.usageCategory + - inJsonPath: $.noOfFloors + outJsonPath: $.Data.noOfFloors + - inJsonPath: $.landArea + outJsonPath: $.Data.landArea + - inJsonPath: $.superBuiltUpArea + outJsonPath: $.Data.superBuiltUpArea + - inJsonPath: $.source + outJsonPath: $.Data.source + - inJsonPath: $.channel + outJsonPath: $.Data.channel + - inJsonPath: $.units + outJsonPath: $.Data.units + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.propertyId + outJsonPath: $.Data.propertyId + - inJsonPath: $.surveyId + outJsonPath: $.Data.surveyId + - inJsonPath: $.linkedProperties + outJsonPath: $.Data.linkedProperties + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.accountId + outJsonPath: $.Data.accountId + - inJsonPath: $.oldPropertyId + outJsonPath: $.Data.oldPropertyId + - inJsonPath: $.status + outJsonPath: $.Data.status + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + externalUriMapping: + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.acknowldgementNumber,history=true,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history + mdmsMapping: + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: PropertyTax + masterName: UsageCategory + tenantId: pb + filter: "[?(@.code == $usageCategory)]" + filterMapping: + - variable: $usageCategory + valueJsonpath: $.usageCategory + uriResponseMapping: + - inJsonPath: $.MdmsRes.PropertyTax.UsageCategory[0].name + outJsonPath: $.Data.usageCategory + + - name: property-application + type: general + id: $.propertyId,$.acknowldgementNumber,$.tenantId + jsonPath: $.Property + timeStampField: $.auditDetails.lastModifiedTime + customJsonMapping: + indexMapping: {"Data":{"acknowldgementNumber":"","creationReason":"","auditDetails":{},"propertyId":"","tenantId":"","accountId":"","status":"","@timestamp":""}} + fieldMapping: + - inJsonPath: $.acknowldgementNumber + outJsonPath: $.Data.acknowldgementNumber + - inJsonPath: $.creationReason + outJsonPath: $.Data.creationReason + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - inJsonPath: $.propertyId + outJsonPath: $.Data.propertyId + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.accountId + outJsonPath: $.Data.accountId + - inJsonPath: $.status + outJsonPath: $.Data.status + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + externalUriMapping: + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + - inJsonPath: $.TenantBoundary[0].boundary[0].children + outJsonPath: $.Data.ward.children + filter: "[?(@.code == $locality)]" + filterMapping: + - variable: $locality + valueJsonpath: $.address.locality.code + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.acknowldgementNumber,history=true,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history + mdmsMapping: + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData + + - topic: cancel-property-registry + configKey: INDEX + indexes: + - name: property-services + type: general + id: $.propertyId,$.tenantId + jsonPath: $.Property + timeStampField: $.auditDetails.lastModifiedTime + customJsonMapping: + indexMapping: {"Data":{"owners":[],"acknowldgementNumber":"","propertyType":"","ownershipCategory":"","creationReason":"","usageCategory":"","noOfFloors":"","landArea":"","superBuiltUpArea":"","source":"","channel":"","units":{},"auditDetails":{},"id":"","propertyId":"","surveyId":"","linkedProperties":{},"tenantId":"","accountId":"","oldPropertyId":"","status":"","@timestamp":"timestamp"}} + fieldMapping: + - inJsonPath: $.owners.*.uuid + outJsonPath: $.Data.owners + - inJsonPath: $.acknowldgementNumber + outJsonPath: $.Data.acknowldgementNumber + - inJsonPath: $.propertyType + outJsonPath: $.Data.propertyType + - inJsonPath: $.ownershipCategory + outJsonPath: $.Data.ownershipCategory + - inJsonPath: $.creationReason + outJsonPath: $.Data.creationReason + - inJsonPath: $.usageCategory + outJsonPath: $.Data.usageCategory + - inJsonPath: $.noOfFloors + outJsonPath: $.Data.noOfFloors + - inJsonPath: $.landArea + outJsonPath: $.Data.landArea + - inJsonPath: $.superBuiltUpArea + outJsonPath: $.Data.superBuiltUpArea + - inJsonPath: $.source + outJsonPath: $.Data.source + - inJsonPath: $.channel + outJsonPath: $.Data.channel + - inJsonPath: $.units + outJsonPath: $.Data.units + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.propertyId + outJsonPath: $.Data.propertyId + - inJsonPath: $.surveyId + outJsonPath: $.Data.surveyId + - inJsonPath: $.linkedProperties + outJsonPath: $.Data.linkedProperties + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.accountId + outJsonPath: $.Data.accountId + - inJsonPath: $.oldPropertyId + outJsonPath: $.Data.oldPropertyId + - inJsonPath: $.status + outJsonPath: $.Data.status + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + externalUriMapping: + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.acknowldgementNumber,history=true,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history + mdmsMapping: + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: PropertyTax + masterName: UsageCategory + tenantId: pb + filter: "[?(@.code == $usageCategory)]" + filterMapping: + - variable: $usageCategory + valueJsonpath: $.usageCategory + uriResponseMapping: + - inJsonPath: $.MdmsRes.PropertyTax.UsageCategory[0].name + outJsonPath: $.Data.usageCategory + + - name: property-application + type: general + id: $.propertyId,$.acknowldgementNumber,$.tenantId + jsonPath: $.Property + timeStampField: $.auditDetails.lastModifiedTime + customJsonMapping: + indexMapping: {"Data":{"acknowldgementNumber":"","creationReason":"","auditDetails":{},"propertyId":"","tenantId":"","accountId":"","status":"","@timestamp":""}} + fieldMapping: + - inJsonPath: $.acknowldgementNumber + outJsonPath: $.Data.acknowldgementNumber + - inJsonPath: $.creationReason + outJsonPath: $.Data.creationReason + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - inJsonPath: $.propertyId + outJsonPath: $.Data.propertyId + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.accountId + outJsonPath: $.Data.accountId + - inJsonPath: $.status + outJsonPath: $.Data.status + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + externalUriMapping: + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + - inJsonPath: $.TenantBoundary[0].boundary[0].children + outJsonPath: $.Data.ward.children + filter: "[?(@.code == $locality)]" + filterMapping: + - variable: $locality + valueJsonpath: $.address.locality.code + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.acknowldgementNumber,history=true,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history + mdmsMapping: + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData + + - topic: property-registry-legacyIndex + configKey: LEGACYINDEX + indexes: + - name: property-services + type: general + isBulk: true + id: $.propertyId,$.tenantId + jsonPath: $.Properties.* + timeStampField: $.auditDetails.lastModifiedTime + customJsonMapping: + indexMapping: {"Data":{"owners":[],"acknowldgementNumber":"","propertyType":"","ownershipCategory":"","creationReason":"","usageCategory":"","noOfFloors":"","landArea":"","superBuiltUpArea":"","source":"","channel":"","units":{},"auditDetails":{},"id":"","propertyId":"","surveyId":"","linkedProperties":{},"tenantId":"","accountId":"","oldPropertyId":"","status":"","@timestamp":"timestamp"}} + fieldMapping: + - inJsonPath: $.owners.*.uuid + outJsonPath: $.Data.owners + - inJsonPath: $.acknowldgementNumber + outJsonPath: $.Data.acknowldgementNumber + - inJsonPath: $.propertyType + outJsonPath: $.Data.propertyType + - inJsonPath: $.ownershipCategory + outJsonPath: $.Data.ownershipCategory + - inJsonPath: $.creationReason + outJsonPath: $.Data.creationReason + - inJsonPath: $.usageCategory + outJsonPath: $.Data.usageCategory + - inJsonPath: $.noOfFloors + outJsonPath: $.Data.noOfFloors + - inJsonPath: $.landArea + outJsonPath: $.Data.landArea + - inJsonPath: $.superBuiltUpArea + outJsonPath: $.Data.superBuiltUpArea + - inJsonPath: $.source + outJsonPath: $.Data.source + - inJsonPath: $.channel + outJsonPath: $.Data.channel + - inJsonPath: $.units + outJsonPath: $.Data.units + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.propertyId + outJsonPath: $.Data.propertyId + - inJsonPath: $.surveyId + outJsonPath: $.Data.surveyId + - inJsonPath: $.linkedProperties + outJsonPath: $.Data.linkedProperties + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.accountId + outJsonPath: $.Data.accountId + - inJsonPath: $.oldPropertyId + outJsonPath: $.Data.oldPropertyId + - inJsonPath: $.status + outJsonPath: $.Data.status + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + externalUriMapping: + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.acknowldgementNumber,history=true,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history + mdmsMapping: + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: PropertyTax + masterName: UsageCategory + tenantId: pb + filter: "[?(@.code == $usageCategory)]" + filterMapping: + - variable: $usageCategory + valueJsonpath: $.usageCategory + uriResponseMapping: + - inJsonPath: $.MdmsRes.PropertyTax.UsageCategory[0].name + outJsonPath: $.Data.usageCategory + + - topic: property-application-legacyIndex + configKey: LEGACYINDEX + indexes: + - name: property-application + type: general + isBulk: true + id: $.propertyId,$.acknowldgementNumber,$.tenantId + jsonPath: $.Properties.* + timeStampField: $.auditDetails.lastModifiedTime + customJsonMapping: + indexMapping: {"Data":{"acknowldgementNumber":"","creationReason":"","auditDetails":{},"propertyId":"","tenantId":"","accountId":"","status":"","@timestamp":""}} + fieldMapping: + - inJsonPath: $.acknowldgementNumber + outJsonPath: $.Data.acknowldgementNumber + - inJsonPath: $.creationReason + outJsonPath: $.Data.creationReason + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - inJsonPath: $.propertyId + outJsonPath: $.Data.propertyId + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.accountId + outJsonPath: $.Data.accountId + - inJsonPath: $.status + outJsonPath: $.Data.status + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + externalUriMapping: + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + - inJsonPath: $.TenantBoundary[0].boundary[0].children + outJsonPath: $.Data.ward.children + filter: "[?(@.code == $locality)]" + filterMapping: + - variable: $locality + valueJsonpath: $.address.locality.code + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.acknowldgementNumber,history=true,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history + mdmsMapping: + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData + + - topic: save-pt-assessment-batch + configKey: INDEX + indexes: + - name: property-assessments + type: general + id: $.assessmentNumber, $.tenantId + jsonPath: $.Assessment + timeStampField: $.auditDetails.createdTime + customJsonMapping: + indexMapping: {"Data":{"id":"","tenantId":"","additionalDetails":"","assessmentNumber":"","financialYear":"","propertyId":"","assessmentDate":"","status":"","source":"","unitUsageList":{},"channel":"","auditDetails":{},"@timestamp":"timestamp"}} + fieldMapping: + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.assessmentNumber + outJsonPath: $.Data.assessmentNumber + - inJsonPath: $.financialYear + outJsonPath: $.Data.financialYear + - inJsonPath: $.propertyId + outJsonPath: $.Data.propertyId + - inJsonPath: $.assessmentDate + outJsonPath: $.Data.assessmentDate + - inJsonPath: $.status + outJsonPath: $.Data.status + - inJsonPath: $.source + outJsonPath: $.Data.source + - inJsonPath: $.unitUsageList + outJsonPath: $.Data.unitUsageList + - inJsonPath: $.channel + outJsonPath: $.Data.channel + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - inJsonPath: $.additionalDetails + outJsonPath: $.Data.additionalDetails + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + + - topic: update-pt-assessment + configKey: INDEX + indexes: + - name: property-assessments + type: general + id: $.assessmentNumber, $.tenantId + jsonPath: $.Assessment + timeStampField: $.auditDetails.createdTime + customJsonMapping: + indexMapping: {"Data":{"id":"","tenantId":"","additionalDetails":"","assessmentNumber":"","financialYear":"","propertyId":"","assessmentDate":"","status":"","source":"","unitUsageList":{},"channel":"","auditDetails":{},"@timestamp":"timestamp"}} + fieldMapping: + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.assessmentNumber + outJsonPath: $.Data.assessmentNumber + - inJsonPath: $.financialYear + outJsonPath: $.Data.financialYear + - inJsonPath: $.propertyId + outJsonPath: $.Data.propertyId + - inJsonPath: $.assessmentDate + outJsonPath: $.Data.assessmentDate + - inJsonPath: $.status + outJsonPath: $.Data.status + - inJsonPath: $.source + outJsonPath: $.Data.source + - inJsonPath: $.unitUsageList + outJsonPath: $.Data.unitUsageList + - inJsonPath: $.channel + outJsonPath: $.Data.channel + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - inJsonPath: $.additionalDetails + outJsonPath: $.Data.additionalDetails + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + + - topic: cancel-property-assessment + configKey: INDEX + indexes: + - name: property-assessments + type: general + id: $.assessmentNumber, $.tenantId + jsonPath: $.Assessment + timeStampField: $.auditDetails.createdTime + customJsonMapping: + indexMapping: {"Data":{"id":"","tenantId":"","additionalDetails":"","assessmentNumber":"","financialYear":"","propertyId":"","assessmentDate":"","status":"","source":"","unitUsageList":{},"channel":"","auditDetails":{},"@timestamp":"timestamp"}} + fieldMapping: + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.assessmentNumber + outJsonPath: $.Data.assessmentNumber + - inJsonPath: $.financialYear + outJsonPath: $.Data.financialYear + - inJsonPath: $.propertyId + outJsonPath: $.Data.propertyId + - inJsonPath: $.assessmentDate + outJsonPath: $.Data.assessmentDate + - inJsonPath: $.status + outJsonPath: $.Data.status + - inJsonPath: $.source + outJsonPath: $.Data.source + - inJsonPath: $.unitUsageList + outJsonPath: $.Data.unitUsageList + - inJsonPath: $.channel + outJsonPath: $.Data.channel + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - inJsonPath: $.additionalDetails + outJsonPath: $.Data.additionalDetails + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + + - topic: pt-assessment-legacyIndex + configKey: LEGACYINDEX + indexes: + - name: property-assessments + type: general + id: $.assessmentNumber, $.tenantId + jsonPath: $.Assessments.* + isBulk: true + timeStampField: $.auditDetails.createdTime + customJsonMapping: + indexMapping: {"Data":{"id":"","tenantId":"","additionalDetails":"","assessmentNumber":"","financialYear":"","propertyId":"","assessmentDate":"","status":"","source":"","unitUsageList":{},"channel":"","auditDetails":{},"@timestamp":"timestamp"}} + fieldMapping: + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.assessmentNumber + outJsonPath: $.Data.assessmentNumber + - inJsonPath: $.financialYear + outJsonPath: $.Data.financialYear + - inJsonPath: $.propertyId + outJsonPath: $.Data.propertyId + - inJsonPath: $.assessmentDate + outJsonPath: $.Data.assessmentDate + - inJsonPath: $.status + outJsonPath: $.Data.status + - inJsonPath: $.source + outJsonPath: $.Data.source + - inJsonPath: $.unitUsageList + outJsonPath: $.Data.unitUsageList + - inJsonPath: $.channel + outJsonPath: $.Data.channel + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - inJsonPath: $.additionalDetails + outJsonPath: $.Data.additionalDetails + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp diff --git a/configs/egov-indexer/property-services-migration.yml b/configs/egov-indexer/property-services-migration.yml new file mode 100644 index 00000000..dc720213 --- /dev/null +++ b/configs/egov-indexer/property-services-migration.yml @@ -0,0 +1,134 @@ +ServiceMaps: + serviceName: Property Tax - rainmaker + version: 1.0.0 + mappings: + - topic: save-property-registry-batch + configKey: INDEX + indexes: + - name: property-services + type: general + id: $.propertyId,$.tenantId + jsonPath: $.Property + timeStampField: $.auditDetails.lastModifiedTime + customJsonMapping: + indexMapping: {"Data":{"owners":[],"acknowldgementNumber":"","propertyType":"","ownershipCategory":"","creationReason":"","usageCategory":"","noOfFloors":"","landArea":"","superBuiltUpArea":"","source":"","channel":"","units":{},"auditDetails":{},"id":"","propertyId":"","surveyId":"","linkedProperties":{},"tenantId":"","accountId":"","oldPropertyId":"","status":"","@timestamp":"timestamp"}} + fieldMapping: + - inJsonPath: $.owners.*.uuid + outJsonPath: $.Data.owners + - inJsonPath: $.acknowldgementNumber + outJsonPath: $.Data.acknowldgementNumber + - inJsonPath: $.propertyType + outJsonPath: $.Data.propertyType + - inJsonPath: $.ownershipCategory + outJsonPath: $.Data.ownershipCategory + - inJsonPath: $.creationReason + outJsonPath: $.Data.creationReason + - inJsonPath: $.usageCategory + outJsonPath: $.Data.usageCategory + - inJsonPath: $.noOfFloors + outJsonPath: $.Data.noOfFloors + - inJsonPath: $.landArea + outJsonPath: $.Data.landArea + - inJsonPath: $.superBuiltUpArea + outJsonPath: $.Data.superBuiltUpArea + - inJsonPath: $.source + outJsonPath: $.Data.source + - inJsonPath: $.channel + outJsonPath: $.Data.channel + - inJsonPath: $.units + outJsonPath: $.Data.units + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.propertyId + outJsonPath: $.Data.propertyId + - inJsonPath: $.surveyId + outJsonPath: $.Data.surveyId + - inJsonPath: $.linkedProperties + outJsonPath: $.Data.linkedProperties + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.accountId + outJsonPath: $.Data.accountId + - inJsonPath: $.oldPropertyId + outJsonPath: $.Data.oldPropertyId + - inJsonPath: $.status + outJsonPath: $.Data.status + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + externalUriMapping: + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.acknowldgementNumber,history=true,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history + mdmsMapping: + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: PropertyTax + masterName: UsageCategory + tenantId: pb + filter: "[?(@.code == $usageCategory)]" + filterMapping: + - variable: $usageCategory + valueJsonpath: $.usageCategory + uriResponseMapping: + - inJsonPath: $.MdmsRes.PropertyTax.UsageCategory[0].name + outJsonPath: $.Data.usageCategory + + - topic: save-pt-assessment-batch + configKey: INDEX + indexes: + - name: property-assessments + type: general + id: $.assessmentNumber, $.tenantId + jsonPath: $.Assessment + timeStampField: $.auditDetails.createdTime + customJsonMapping: + indexMapping: {"Data":{"id":"","tenantId":"","additionalDetails":"","assessmentNumber":"","financialYear":"","propertyId":"","assessmentDate":"","status":"","source":"","unitUsageList":{},"channel":"","auditDetails":{},"@timestamp":"timestamp"}} + fieldMapping: + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.assessmentNumber + outJsonPath: $.Data.assessmentNumber + - inJsonPath: $.financialYear + outJsonPath: $.Data.financialYear + - inJsonPath: $.propertyId + outJsonPath: $.Data.propertyId + - inJsonPath: $.assessmentDate + outJsonPath: $.Data.assessmentDate + - inJsonPath: $.status + outJsonPath: $.Data.status + - inJsonPath: $.source + outJsonPath: $.Data.source + - inJsonPath: $.unitUsageList + outJsonPath: $.Data.unitUsageList + - inJsonPath: $.channel + outJsonPath: $.Data.channel + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - inJsonPath: $.additionalDetails + outJsonPath: $.Data.additionalDetails + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp diff --git a/configs/egov-indexer/property-services.yml b/configs/egov-indexer/property-services.yml new file mode 100644 index 00000000..81748ee0 --- /dev/null +++ b/configs/egov-indexer/property-services.yml @@ -0,0 +1,861 @@ +ServiceMaps: + serviceName: Property Tax - rainmaker + version: 1.0.0 + mappings: + - topic: save-property-registry + configKey: INDEX + indexes: + - name: property-services + type: general + id: $.propertyId,$.tenantId + jsonPath: $.Property + timeStampField: $.auditDetails.lastModifiedTime + customJsonMapping: + indexMapping: {"Data":{"ownerNames":[],"doorNo":"","street":"","owners":[],"acknowldgementNumber":"","propertyType":"","ownershipCategory":"","creationReason":"","usageCategory":"","noOfFloors":"","landArea":"","superBuiltUpArea":"","source":"","channel":"","units":{},"auditDetails":{},"id":"","propertyId":"","surveyId":"","linkedProperties":{},"tenantId":"","accountId":"","oldPropertyId":"","status":"","@timestamp":"timestamp"}} + fieldMapping: + - inJsonPath: $.owners[*][?(@.status=='ACTIVE')].name + outJsonPath: $.Data.ownerNames + - inJsonPath: $.address.doorNo + outJsonPath: $.Data.doorNo + - inJsonPath: $.address.street + outJsonPath: $.Data.street + - inJsonPath: $.owners.*.uuid + outJsonPath: $.Data.owners + - inJsonPath: $.acknowldgementNumber + outJsonPath: $.Data.acknowldgementNumber + - inJsonPath: $.propertyType + outJsonPath: $.Data.propertyType + - inJsonPath: $.ownershipCategory + outJsonPath: $.Data.ownershipCategory + - inJsonPath: $.creationReason + outJsonPath: $.Data.creationReason + - inJsonPath: $.usageCategory + outJsonPath: $.Data.usageCategory + - inJsonPath: $.noOfFloors + outJsonPath: $.Data.noOfFloors + - inJsonPath: $.landArea + outJsonPath: $.Data.landArea + - inJsonPath: $.superBuiltUpArea + outJsonPath: $.Data.superBuiltUpArea + - inJsonPath: $.source + outJsonPath: $.Data.source + - inJsonPath: $.channel + outJsonPath: $.Data.channel + - inJsonPath: $.units + outJsonPath: $.Data.units + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.propertyId + outJsonPath: $.Data.propertyId + - inJsonPath: $.surveyId + outJsonPath: $.Data.surveyId + - inJsonPath: $.linkedProperties + outJsonPath: $.Data.linkedProperties + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.accountId + outJsonPath: $.Data.accountId + - inJsonPath: $.oldPropertyId + outJsonPath: $.Data.oldPropertyId + - inJsonPath: $.status + outJsonPath: $.Data.status + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + externalUriMapping: + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.acknowldgementNumber,history=true,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history + mdmsMapping: + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: PropertyTax + masterName: UsageCategory + tenantId: pb + filter: "[?(@.code == $usageCategory)]" + filterMapping: + - variable: $usageCategory + valueJsonpath: $.usageCategory + uriResponseMapping: + - inJsonPath: $.MdmsRes.PropertyTax.UsageCategory[0].name + outJsonPath: $.Data.usageCategory + + - name: property-application + type: general + id: $.propertyId,$.acknowldgementNumber,$.tenantId + jsonPath: $.Property + timeStampField: $.auditDetails.lastModifiedTime + customJsonMapping: + indexMapping: {"Data":{"acknowldgementNumber":"","creationReason":"","auditDetails":{},"propertyId":"","tenantId":"","accountId":"","status":"","@timestamp":""}} + fieldMapping: + - inJsonPath: $.acknowldgementNumber + outJsonPath: $.Data.acknowldgementNumber + - inJsonPath: $.creationReason + outJsonPath: $.Data.creationReason + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - inJsonPath: $.propertyId + outJsonPath: $.Data.propertyId + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.accountId + outJsonPath: $.Data.accountId + - inJsonPath: $.status + outJsonPath: $.Data.status + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + externalUriMapping: + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + - inJsonPath: $.TenantBoundary[0].boundary[0].children + outJsonPath: $.Data.ward.children + filter: "[?(@.code == $locality)]" + filterMapping: + - variable: $locality + valueJsonpath: $.address.locality.code + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.acknowldgementNumber,history=true,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history + mdmsMapping: + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData + + - topic: update-property-registry + configKey: INDEX + indexes: + - name: property-services + type: general + id: $.propertyId,$.tenantId + jsonPath: $.Property + timeStampField: $.auditDetails.lastModifiedTime + customJsonMapping: + indexMapping: {"Data":{"ownerNames":[],"doorNo":"","street":"","owners":[],"acknowldgementNumber":"","propertyType":"","ownershipCategory":"","creationReason":"","usageCategory":"","noOfFloors":"","landArea":"","superBuiltUpArea":"","source":"","channel":"","units":{},"auditDetails":{},"id":"","propertyId":"","surveyId":"","linkedProperties":{},"tenantId":"","accountId":"","oldPropertyId":"","status":"","@timestamp":"timestamp"}} + fieldMapping: + - inJsonPath: $.owners[*][?(@.status=='ACTIVE')].name + outJsonPath: $.Data.ownerNames + - inJsonPath: $.address.doorNo + outJsonPath: $.Data.doorNo + - inJsonPath: $.address.street + outJsonPath: $.Data.street + - inJsonPath: $.owners.*.uuid + outJsonPath: $.Data.owners + - inJsonPath: $.acknowldgementNumber + outJsonPath: $.Data.acknowldgementNumber + - inJsonPath: $.propertyType + outJsonPath: $.Data.propertyType + - inJsonPath: $.ownershipCategory + outJsonPath: $.Data.ownershipCategory + - inJsonPath: $.creationReason + outJsonPath: $.Data.creationReason + - inJsonPath: $.usageCategory + outJsonPath: $.Data.usageCategory + - inJsonPath: $.noOfFloors + outJsonPath: $.Data.noOfFloors + - inJsonPath: $.landArea + outJsonPath: $.Data.landArea + - inJsonPath: $.superBuiltUpArea + outJsonPath: $.Data.superBuiltUpArea + - inJsonPath: $.source + outJsonPath: $.Data.source + - inJsonPath: $.channel + outJsonPath: $.Data.channel + - inJsonPath: $.units + outJsonPath: $.Data.units + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.propertyId + outJsonPath: $.Data.propertyId + - inJsonPath: $.surveyId + outJsonPath: $.Data.surveyId + - inJsonPath: $.linkedProperties + outJsonPath: $.Data.linkedProperties + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.accountId + outJsonPath: $.Data.accountId + - inJsonPath: $.oldPropertyId + outJsonPath: $.Data.oldPropertyId + - inJsonPath: $.status + outJsonPath: $.Data.status + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + externalUriMapping: + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.acknowldgementNumber,history=true,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history + mdmsMapping: + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: PropertyTax + masterName: UsageCategory + tenantId: pb + filter: "[?(@.code == $usageCategory)]" + filterMapping: + - variable: $usageCategory + valueJsonpath: $.usageCategory + uriResponseMapping: + - inJsonPath: $.MdmsRes.PropertyTax.UsageCategory[0].name + outJsonPath: $.Data.usageCategory + + - name: property-application + type: general + id: $.propertyId,$.acknowldgementNumber,$.tenantId + jsonPath: $.Property + timeStampField: $.auditDetails.lastModifiedTime + customJsonMapping: + indexMapping: {"Data":{"acknowldgementNumber":"","creationReason":"","auditDetails":{},"propertyId":"","tenantId":"","accountId":"","status":"","@timestamp":""}} + fieldMapping: + - inJsonPath: $.acknowldgementNumber + outJsonPath: $.Data.acknowldgementNumber + - inJsonPath: $.creationReason + outJsonPath: $.Data.creationReason + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - inJsonPath: $.propertyId + outJsonPath: $.Data.propertyId + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.accountId + outJsonPath: $.Data.accountId + - inJsonPath: $.status + outJsonPath: $.Data.status + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + externalUriMapping: + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + - inJsonPath: $.TenantBoundary[0].boundary[0].children + outJsonPath: $.Data.ward.children + filter: "[?(@.code == $locality)]" + filterMapping: + - variable: $locality + valueJsonpath: $.address.locality.code + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.acknowldgementNumber,history=true,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history + mdmsMapping: + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData + + - topic: cancel-property-registry + configKey: INDEX + indexes: + - name: property-services + type: general + id: $.propertyId,$.tenantId + jsonPath: $.Property + timeStampField: $.auditDetails.lastModifiedTime + customJsonMapping: + indexMapping: {"Data":{"owners":[],"acknowldgementNumber":"","propertyType":"","ownershipCategory":"","creationReason":"","usageCategory":"","noOfFloors":"","landArea":"","superBuiltUpArea":"","source":"","channel":"","units":{},"auditDetails":{},"id":"","propertyId":"","surveyId":"","linkedProperties":{},"tenantId":"","accountId":"","oldPropertyId":"","status":"","@timestamp":"timestamp"}} + fieldMapping: + - inJsonPath: $.owners.*.uuid + outJsonPath: $.Data.owners + - inJsonPath: $.acknowldgementNumber + outJsonPath: $.Data.acknowldgementNumber + - inJsonPath: $.propertyType + outJsonPath: $.Data.propertyType + - inJsonPath: $.ownershipCategory + outJsonPath: $.Data.ownershipCategory + - inJsonPath: $.creationReason + outJsonPath: $.Data.creationReason + - inJsonPath: $.usageCategory + outJsonPath: $.Data.usageCategory + - inJsonPath: $.noOfFloors + outJsonPath: $.Data.noOfFloors + - inJsonPath: $.landArea + outJsonPath: $.Data.landArea + - inJsonPath: $.superBuiltUpArea + outJsonPath: $.Data.superBuiltUpArea + - inJsonPath: $.source + outJsonPath: $.Data.source + - inJsonPath: $.channel + outJsonPath: $.Data.channel + - inJsonPath: $.units + outJsonPath: $.Data.units + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.propertyId + outJsonPath: $.Data.propertyId + - inJsonPath: $.surveyId + outJsonPath: $.Data.surveyId + - inJsonPath: $.linkedProperties + outJsonPath: $.Data.linkedProperties + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.accountId + outJsonPath: $.Data.accountId + - inJsonPath: $.oldPropertyId + outJsonPath: $.Data.oldPropertyId + - inJsonPath: $.status + outJsonPath: $.Data.status + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + externalUriMapping: + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.acknowldgementNumber,history=true,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history + mdmsMapping: + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: PropertyTax + masterName: UsageCategory + tenantId: pb + filter: "[?(@.code == $usageCategory)]" + filterMapping: + - variable: $usageCategory + valueJsonpath: $.usageCategory + uriResponseMapping: + - inJsonPath: $.MdmsRes.PropertyTax.UsageCategory[0].name + outJsonPath: $.Data.usageCategory + + - name: property-application + type: general + id: $.propertyId,$.acknowldgementNumber,$.tenantId + jsonPath: $.Property + timeStampField: $.auditDetails.lastModifiedTime + customJsonMapping: + indexMapping: {"Data":{"acknowldgementNumber":"","creationReason":"","auditDetails":{},"propertyId":"","tenantId":"","accountId":"","status":"","@timestamp":""}} + fieldMapping: + - inJsonPath: $.acknowldgementNumber + outJsonPath: $.Data.acknowldgementNumber + - inJsonPath: $.creationReason + outJsonPath: $.Data.creationReason + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - inJsonPath: $.propertyId + outJsonPath: $.Data.propertyId + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.accountId + outJsonPath: $.Data.accountId + - inJsonPath: $.status + outJsonPath: $.Data.status + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + externalUriMapping: + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + - inJsonPath: $.TenantBoundary[0].boundary[0].children + outJsonPath: $.Data.ward.children + filter: "[?(@.code == $locality)]" + filterMapping: + - variable: $locality + valueJsonpath: $.address.locality.code + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.acknowldgementNumber,history=true,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history + mdmsMapping: + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData + + - topic: property-registry-legacyIndex + configKey: LEGACYINDEX + indexes: + - name: property-services + type: general + isBulk: true + id: $.propertyId,$.tenantId + jsonPath: $.Properties.* + timeStampField: $.auditDetails.lastModifiedTime + customJsonMapping: + indexMapping: {"Data":{"ownerNames":[],"doorNo":"","street":"","owners":[],"acknowldgementNumber":"","propertyType":"","ownershipCategory":"","creationReason":"","usageCategory":"","noOfFloors":"","landArea":"","superBuiltUpArea":"","source":"","channel":"","units":{},"auditDetails":{},"id":"","propertyId":"","surveyId":"","linkedProperties":{},"tenantId":"","accountId":"","oldPropertyId":"","status":"","@timestamp":"timestamp"}} + fieldMapping: + - inJsonPath: $.owners.*.name + outJsonPath: $.Data.ownerNames + - inJsonPath: $.address.doorNo + outJsonPath: $.Data.doorNo + - inJsonPath: $.address.street + outJsonPath: $.Data.street + - inJsonPath: $.owners.*.uuid + outJsonPath: $.Data.owners + - inJsonPath: $.acknowldgementNumber + outJsonPath: $.Data.acknowldgementNumber + - inJsonPath: $.propertyType + outJsonPath: $.Data.propertyType + - inJsonPath: $.ownershipCategory + outJsonPath: $.Data.ownershipCategory + - inJsonPath: $.creationReason + outJsonPath: $.Data.creationReason + - inJsonPath: $.usageCategory + outJsonPath: $.Data.usageCategory + - inJsonPath: $.noOfFloors + outJsonPath: $.Data.noOfFloors + - inJsonPath: $.landArea + outJsonPath: $.Data.landArea + - inJsonPath: $.superBuiltUpArea + outJsonPath: $.Data.superBuiltUpArea + - inJsonPath: $.source + outJsonPath: $.Data.source + - inJsonPath: $.channel + outJsonPath: $.Data.channel + - inJsonPath: $.units + outJsonPath: $.Data.units + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.propertyId + outJsonPath: $.Data.propertyId + - inJsonPath: $.surveyId + outJsonPath: $.Data.surveyId + - inJsonPath: $.linkedProperties + outJsonPath: $.Data.linkedProperties + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.accountId + outJsonPath: $.Data.accountId + - inJsonPath: $.oldPropertyId + outJsonPath: $.Data.oldPropertyId + - inJsonPath: $.status + outJsonPath: $.Data.status + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + externalUriMapping: + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.acknowldgementNumber,history=true,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history + mdmsMapping: + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: PropertyTax + masterName: UsageCategory + tenantId: pb + filter: "[?(@.code == $usageCategory)]" + filterMapping: + - variable: $usageCategory + valueJsonpath: $.usageCategory + uriResponseMapping: + - inJsonPath: $.MdmsRes.PropertyTax.UsageCategory[0].name + outJsonPath: $.Data.usageCategory + + - topic: property-application-legacyIndex + configKey: LEGACYINDEX + indexes: + - name: property-application + type: general + isBulk: true + id: $.propertyId,$.acknowldgementNumber,$.tenantId + jsonPath: $.Properties.* + timeStampField: $.auditDetails.lastModifiedTime + customJsonMapping: + indexMapping: {"Data":{"acknowldgementNumber":"","creationReason":"","auditDetails":{},"propertyId":"","tenantId":"","accountId":"","status":"","@timestamp":""}} + fieldMapping: + - inJsonPath: $.acknowldgementNumber + outJsonPath: $.Data.acknowldgementNumber + - inJsonPath: $.creationReason + outJsonPath: $.Data.creationReason + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - inJsonPath: $.propertyId + outJsonPath: $.Data.propertyId + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.accountId + outJsonPath: $.Data.accountId + - inJsonPath: $.status + outJsonPath: $.Data.status + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + externalUriMapping: + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + - inJsonPath: $.TenantBoundary[0].boundary[0].children + outJsonPath: $.Data.ward.children + filter: "[?(@.code == $locality)]" + filterMapping: + - variable: $locality + valueJsonpath: $.address.locality.code + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.acknowldgementNumber,history=true,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history + mdmsMapping: + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData + + - topic: save-pt-assessment + configKey: INDEX + indexes: + - name: property-assessments + type: general + id: $.assessmentNumber, $.tenantId + jsonPath: $.Assessment + timeStampField: $.auditDetails.createdTime + customJsonMapping: + indexMapping: {"Data":{"id":"","tenantId":"","additionalDetails":"","assessmentNumber":"","financialYear":"","propertyId":"","assessmentDate":"","status":"","source":"","unitUsageList":{},"channel":"","auditDetails":{},"@timestamp":"timestamp"}} + fieldMapping: + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.assessmentNumber + outJsonPath: $.Data.assessmentNumber + - inJsonPath: $.financialYear + outJsonPath: $.Data.financialYear + - inJsonPath: $.propertyId + outJsonPath: $.Data.propertyId + - inJsonPath: $.assessmentDate + outJsonPath: $.Data.assessmentDate + - inJsonPath: $.status + outJsonPath: $.Data.status + - inJsonPath: $.source + outJsonPath: $.Data.source + - inJsonPath: $.unitUsageList + outJsonPath: $.Data.unitUsageList + - inJsonPath: $.channel + outJsonPath: $.Data.channel + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - inJsonPath: $.additionalDetails + outJsonPath: $.Data.additionalDetails + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + externalUriMapping: + - path: http://property-services.egov:8080/property-services/property/_search + queryParam: propertyIds=$.propertyId,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.Properties[0].address + outJsonPath: $.Data.ward + mdmsMapping: + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData + - topic: update-pt-assessment + configKey: INDEX + indexes: + - name: property-assessments + type: general + id: $.assessmentNumber, $.tenantId + jsonPath: $.Assessment + timeStampField: $.auditDetails.createdTime + customJsonMapping: + indexMapping: {"Data":{"id":"","tenantId":"","additionalDetails":"","assessmentNumber":"","financialYear":"","propertyId":"","assessmentDate":"","status":"","source":"","unitUsageList":{},"channel":"","auditDetails":{},"@timestamp":"timestamp"}} + fieldMapping: + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.assessmentNumber + outJsonPath: $.Data.assessmentNumber + - inJsonPath: $.financialYear + outJsonPath: $.Data.financialYear + - inJsonPath: $.propertyId + outJsonPath: $.Data.propertyId + - inJsonPath: $.assessmentDate + outJsonPath: $.Data.assessmentDate + - inJsonPath: $.status + outJsonPath: $.Data.status + - inJsonPath: $.source + outJsonPath: $.Data.source + - inJsonPath: $.unitUsageList + outJsonPath: $.Data.unitUsageList + - inJsonPath: $.channel + outJsonPath: $.Data.channel + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - inJsonPath: $.additionalDetails + outJsonPath: $.Data.additionalDetails + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + externalUriMapping: + - path: http://property-services.egov:8080/property-services/property/_search + queryParam: propertyIds=$.propertyId,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.Properties[0].address + outJsonPath: $.Data.ward + mdmsMapping: + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData + + - topic: cancel-property-assessment + configKey: INDEX + indexes: + - name: property-assessments + type: general + id: $.assessmentNumber, $.tenantId + jsonPath: $.Assessment + timeStampField: $.auditDetails.createdTime + customJsonMapping: + indexMapping: {"Data":{"id":"","tenantId":"","additionalDetails":"","assessmentNumber":"","financialYear":"","propertyId":"","assessmentDate":"","status":"","source":"","unitUsageList":{},"channel":"","auditDetails":{},"@timestamp":"timestamp"}} + fieldMapping: + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.assessmentNumber + outJsonPath: $.Data.assessmentNumber + - inJsonPath: $.financialYear + outJsonPath: $.Data.financialYear + - inJsonPath: $.propertyId + outJsonPath: $.Data.propertyId + - inJsonPath: $.assessmentDate + outJsonPath: $.Data.assessmentDate + - inJsonPath: $.status + outJsonPath: $.Data.status + - inJsonPath: $.source + outJsonPath: $.Data.source + - inJsonPath: $.unitUsageList + outJsonPath: $.Data.unitUsageList + - inJsonPath: $.channel + outJsonPath: $.Data.channel + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - inJsonPath: $.additionalDetails + outJsonPath: $.Data.additionalDetails + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + externalUriMapping: + - path: http://property-services.egov:8080/property-services/property/_search + queryParam: propertyIds=$.propertyId,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","userInfo": {"id": 23299,"uuid": "e721639b-c095-40b3-86e2-acecb2cb6efb","userName": "9337682030","name": "Abhilash Seth","type": "EMPLOYEE","mobileNumber": "9337682030","emailId": "abhilash.seth@gmail.com","roles": [{"id": 281,"name": "Employee"}]},"roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.Properties[0].address + outJsonPath: $.Data.ward + mdmsMapping: + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData + + - topic: pt-assessment-legacyIndex + configKey: LEGACYINDEX + indexes: + - name: property-assessments + type: general + id: $.assessmentNumber, $.tenantId + jsonPath: $.Assessments.* + isBulk: true + timeStampField: $.auditDetails.createdTime + customJsonMapping: + indexMapping: {"Data":{"id":"","tenantId":"","additionalDetails":"","assessmentNumber":"","financialYear":"","propertyId":"","assessmentDate":"","status":"","source":"","unitUsageList":{},"channel":"","auditDetails":{},"@timestamp":"timestamp"}} + fieldMapping: + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.assessmentNumber + outJsonPath: $.Data.assessmentNumber + - inJsonPath: $.financialYear + outJsonPath: $.Data.financialYear + - inJsonPath: $.propertyId + outJsonPath: $.Data.propertyId + - inJsonPath: $.assessmentDate + outJsonPath: $.Data.assessmentDate + - inJsonPath: $.status + outJsonPath: $.Data.status + - inJsonPath: $.source + outJsonPath: $.Data.source + - inJsonPath: $.unitUsageList + outJsonPath: $.Data.unitUsageList + - inJsonPath: $.channel + outJsonPath: $.Data.channel + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - inJsonPath: $.additionalDetails + outJsonPath: $.Data.additionalDetails + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + externalUriMapping: + - path: http://property-services.egov:8080/property-services/property/_search + queryParam: propertyIds=$.propertyId,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pg.citya","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pg.citya"}]}}} + uriResponseMapping: + - inJsonPath: $.Properties[0].address + outJsonPath: $.Data.ward + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.applicationNo,history=true,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history + mdmsMapping: + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData + diff --git a/configs/egov-indexer/rainmaker-bpastakeholder-indexer.yml b/configs/egov-indexer/rainmaker-bpastakeholder-indexer.yml new file mode 100644 index 00000000..14faf199 --- /dev/null +++ b/configs/egov-indexer/rainmaker-bpastakeholder-indexer.yml @@ -0,0 +1,24 @@ +ServiceMaps: + serviceName: BPA - rainmaker + version: 1.0.0 + mappings: + - topic: save-tl-tradelicense + configKey: INDEX + indexes: + - name: bpastakeholderindex-v1 + type: stakeholder + id: $.id, $.tenantId + isBulk: true + jsonPath: $.Licenses + timeStampField: $.auditDetails.createdTime + fieldsToBeMasked: ["$.tradeLicenseDetail.owners[0].userName","$.tradeLicenseDetail.owners[0].password","$.tradeLicenseDetail.owners[0].mobileNumber","$.tradeLicenseDetail.owners[0].emailId","$.tradeLicenseDetail.owners[0].altContactNumber","$.tradeLicenseDetail.owners[0].pan","$.tradeLicenseDetail.owners[0].aadhaarNumber"] + customJsonMapping: + indexMapping: {"Data":{"owners":{},"tradeUnits": {},"@timestamp":"timestamp"}} + fieldMapping: + - inJsonPath: $.tradeLicenseDetail.owners + outJsonPath: $.Data.owners + - inJsonPath: $.tradeLicenseDetail.tradeUnits + outJsonPath: $.Data.tradeUnits + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + diff --git a/configs/egov-indexer/rainmaker-firenoc-indexer.yml b/configs/egov-indexer/rainmaker-firenoc-indexer.yml new file mode 100644 index 00000000..493f4d87 --- /dev/null +++ b/configs/egov-indexer/rainmaker-firenoc-indexer.yml @@ -0,0 +1,304 @@ +ServiceMaps: + serviceName: Fire Noc Service - rainmaker + version: 1.0.0 + mappings: + - topic: save-fn-firenoc + configKey: INDEX + indexes: + - name: firenoc-services + type: general + id: $.id,$.tenantId + isBulk: true + jsonPath: $.FireNOCs + timeStampField: $.auditDetails.createdTime + customJsonMapping: + indexMapping: {"Data":{"channel":"","id":"","tenantId":"","fireNOCDetails":{"status":"","action":"","firestationId":"","applicationNumber":"","fireNOCType":"","buildings":[],"propertyDetails":{},"additionalDetail":{},"applicantDetails":{}},"auditDetails":{},"@timestamp":"timestamp","Department": "NA"}} + fieldMapping: + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.fireNOCDetails.channel + outJsonPath: $.Data.channel + - inJsonPath: $.fireNOCDetails.status + outJsonPath: $.Data.fireNOCDetails.status + - inJsonPath: $.fireNOCDetails.action + outJsonPath: $.Data.fireNOCDetails.action + - inJsonPath: $.fireNOCDetails.fireNOCType + outJsonPath: $.Data.fireNOCDetails.fireNOCType + - inJsonPath: $.fireNOCDetails.buildings + outJsonPath: $.Data.fireNOCDetails.buildings + - inJsonPath: $.fireNOCDetails.applicationNumber + outJsonPath: $.Data.fireNOCDetails.applicationNumber + - inJsonPath: $.fireNOCDetails.buildings + outJsonPath: $.Data.fireNOCDetails.buildings + - inJsonPath: $.fireNOCDetails.propertyDetails + outJsonPath: $.Data.fireNOCDetails.propertyDetails + - inJsonPath: $.fireNOCDetails.additionalDetail + outJsonPath: $.Data.fireNOCDetails.additionalDetail + - inJsonPath: $.fireNOCDetails.applicantDetails + outJsonPath: $.Data.fireNOCDetails.applicantDetails + - inJsonPath: $.fireNOCDetails.firestationId + outJsonPath: $.Data.fireNOCDetails.firestationId + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + externalUriMapping: + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.fireNOCDetails.applicationNumber,history=true,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history + - path: http://egov-localization.egov:8080/localization/messages/v1/_search + queryParam: locale=en_IN,tenantId=$.tenantId,codes=$.fireNOCDetails.firestationId,module=rainmaker-noc + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.messages[0].message + outJsonPath: $.Data.Department + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.fireNOCDetails.propertyDetails.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + mdmsMapping: + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData + + + - topic: update-fn-firenoc + configKey: INDEX + indexes: + - name: firenoc-services + type: general + id: $.id,$.tenantId + isBulk: true + jsonPath: $.FireNOCs + timeStampField: $.auditDetails.lastModifiedTime + customJsonMapping: + indexMapping: {"Data":{"channel":"","id":"","tenantId":"","fireNOCDetails":{"status":"","action":"","firestationId":"","applicationNumber":"","fireNOCType":"","buildings":[],"propertyDetails":{},"additionalDetail":{},"applicantDetails":{}},"auditDetails":{},"@timestamp":"timestamp","Department": "NA"}} + fieldMapping: + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.fireNOCDetails.channel + outJsonPath: $.Data.channel + - inJsonPath: $.fireNOCDetails.status + outJsonPath: $.Data.fireNOCDetails.status + - inJsonPath: $.fireNOCDetails.action + outJsonPath: $.Data.fireNOCDetails.action + - inJsonPath: $.fireNOCDetails.fireNOCType + outJsonPath: $.Data.fireNOCDetails.fireNOCType + - inJsonPath: $.fireNOCDetails.buildings + outJsonPath: $.Data.fireNOCDetails.buildings + - inJsonPath: $.fireNOCDetails.applicationNumber + outJsonPath: $.Data.fireNOCDetails.applicationNumber + - inJsonPath: $.fireNOCDetails.buildings + outJsonPath: $.Data.fireNOCDetails.buildings + - inJsonPath: $.fireNOCDetails.propertyDetails + outJsonPath: $.Data.fireNOCDetails.propertyDetails + - inJsonPath: $.fireNOCDetails.additionalDetail + outJsonPath: $.Data.fireNOCDetails.additionalDetail + - inJsonPath: $.fireNOCDetails.applicantDetails + outJsonPath: $.Data.fireNOCDetails.applicantDetails + - inJsonPath: $.fireNOCDetails.firestationId + outJsonPath: $.Data.fireNOCDetails.firestationId + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + externalUriMapping: + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: locale=en_IN,tenantId=$.tenantId,codes=$.fireNOCDetails.firestationId,module=rainmaker-noc + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history + - path: http://egov-localization.egov:8080/localization/messages/v1/_search + queryParam: locale=en_IN,tenantId=$.tenantId,codes=$.fireNOCDetails.firestationId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.messages[0].message + outJsonPath: $.Data.Department + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.fireNOCDetails.propertyDetails.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + mdmsMapping: + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData + + - topic: update-fn-workflow + configKey: INDEX + indexes: + - name: firenoc-services + type: general + id: $.id,$.tenantId + isBulk: true + jsonPath: $.FireNOCs + timeStampField: $.auditDetails.lastModifiedTime + customJsonMapping: + indexMapping: {"Data":{"channel":"","id":"","tenantId":"","fireNOCDetails":{"status":"","action":"","firestationId":"","applicationNumber":"","fireNOCType":"","buildings":[],"propertyDetails":{},"additionalDetail":{},"applicantDetails":{}},"auditDetails":{},"@timestamp":"timestamp","Department": "NA"}} + fieldMapping: + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.fireNOCDetails.channel + outJsonPath: $.Data.channel + - inJsonPath: $.fireNOCDetails.status + outJsonPath: $.Data.fireNOCDetails.status + - inJsonPath: $.fireNOCDetails.action + outJsonPath: $.Data.fireNOCDetails.action + - inJsonPath: $.fireNOCDetails.fireNOCType + outJsonPath: $.Data.fireNOCDetails.fireNOCType + - inJsonPath: $.fireNOCDetails.buildings + outJsonPath: $.Data.fireNOCDetails.buildings + - inJsonPath: $.fireNOCDetails.applicationNumber + outJsonPath: $.Data.fireNOCDetails.applicationNumber + - inJsonPath: $.fireNOCDetails.buildings + outJsonPath: $.Data.fireNOCDetails.buildings + - inJsonPath: $.fireNOCDetails.propertyDetails + outJsonPath: $.Data.fireNOCDetails.propertyDetails + - inJsonPath: $.fireNOCDetails.additionalDetail + outJsonPath: $.Data.fireNOCDetails.additionalDetail + - inJsonPath: $.fireNOCDetails.applicantDetails + outJsonPath: $.Data.fireNOCDetails.applicantDetails + - inJsonPath: $.fireNOCDetails.firestationId + outJsonPath: $.Data.fireNOCDetails.firestationId + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + externalUriMapping: + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.fireNOCDetails.applicationNumber,history=true,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history + - path: http://egov-localization.egov:8080/localization/messages/v1/_search + queryParam: locale=en_IN,tenantId=$.tenantId,codes=$.fireNOCDetails.firestationId,module=rainmaker-noc + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.messages[0].message + outJsonPath: $.Data.Department + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.fireNOCDetails.propertyDetails.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + mdmsMapping: + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData + + - topic: legacy-fn-firenoc + configKey: LEGACYINDEX + indexes: + - name: firenoc-services + type: general + id: $.id,$.tenantId + isBulk: true + jsonPath: $.FireNOCs + timeStampField: $.auditDetails.createdTime + customJsonMapping: + indexMapping: {"Data":{"channel":"","id":"","tenantId":"","fireNOCDetails":{"status":"","action":"","firestationId":"","applicationNumber":"","fireNOCType":"","buildings":[],"propertyDetails":{},"additionalDetail":{},"applicantDetails":{}},"auditDetails":{},"@timestamp":"timestamp","Department": "NA"}} + fieldMapping: + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.fireNOCDetails.channel + outJsonPath: $.Data.channel + - inJsonPath: $.fireNOCDetails.status + outJsonPath: $.Data.fireNOCDetails.status + - inJsonPath: $.fireNOCDetails.action + outJsonPath: $.Data.fireNOCDetails.action + - inJsonPath: $.fireNOCDetails.fireNOCType + outJsonPath: $.Data.fireNOCDetails.fireNOCType + - inJsonPath: $.fireNOCDetails.buildings + outJsonPath: $.Data.fireNOCDetails.buildings + - inJsonPath: $.fireNOCDetails.applicationNumber + outJsonPath: $.Data.fireNOCDetails.applicationNumber + - inJsonPath: $.fireNOCDetails.buildings + outJsonPath: $.Data.fireNOCDetails.buildings + - inJsonPath: $.fireNOCDetails.propertyDetails + outJsonPath: $.Data.fireNOCDetails.propertyDetails + - inJsonPath: $.fireNOCDetails.additionalDetail + outJsonPath: $.Data.fireNOCDetails.additionalDetail + - inJsonPath: $.fireNOCDetails.applicantDetails + outJsonPath: $.Data.fireNOCDetails.applicantDetails + - inJsonPath: $.fireNOCDetails.firestationId + outJsonPath: $.Data.fireNOCDetails.firestationId + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + externalUriMapping: + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.fireNOCDetails.applicationNumber,history=true,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history + - path: http://egov-localization.egov:8080/localization/messages/v1/_search + queryParam: locale=en_IN,tenantId=$.tenantId,codes=$.fireNOCDetails.firestationId,module=rainmaker-noc + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.messages[0].message + outJsonPath: $.Data.Department + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.fireNOCDetails.propertyDetails.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + mdmsMapping: + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData diff --git a/configs/egov-indexer/rainmaker-pgr-indexer.yml b/configs/egov-indexer/rainmaker-pgr-indexer.yml new file mode 100644 index 00000000..e13e7c66 --- /dev/null +++ b/configs/egov-indexer/rainmaker-pgr-indexer.yml @@ -0,0 +1,326 @@ +ServiceMaps: + serviceName: PGR - rainmaker + version: 1.0.0 + mappings: + + - topic: save-pgr-index-service + configKey: INDEX + indexes: + - name: pgrindex-v1 + type: grievances + id: $.serviceRequestId, $.tenantId + isBulk: true + jsonPath: $.serviceRequests + timeStampField: $.auditDetails.createdTime + fieldsToBeMasked: ["$.phone", "$.citizen.mobileNumber", "$.citizen.address", "$.citizen.aadhaarNumber", "$.citizen.pan", "$.citizen.emailId", "$.citizen.password"] + customJsonMapping: + indexMapping: {"Data":{"serviceRequestId":"serviceRequestId","tenantId":"tenantId","complainCategory":"complainCategory","citizen":{},"phone":"phone","dateOfComplaint":null,"address":"","addressDetail":{},"status":"status","assignee":"assignee","gro":"gro","department":"department","complaintWard":{},"source":"source","description":"","slaHours":"slaHours","tenantData":{},"actionHistory":{},"@timestamp":"timestamp"}} + fieldMapping: + - inJsonPath: $.serviceRequestId + outJsonPath: $.Data.serviceRequestId + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.phone + outJsonPath: $.Data.phone + - inJsonPath: $.auditDetails.createdTime + outJsonPath: $.Data.dateOfComplaint + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - inJsonPath: $.description + outJsonPath: $.Data.description + - inJsonPath: $.address + outJsonPath: $.Data.address + - inJsonPath: $.addressDetail + outJsonPath: $.Data.addressDetail + - inJsonPath: $.status + outJsonPath: $.Data.status + - inJsonPath: $.complaintCategory + outJsonPath: $.Data.complainCategory + - inJsonPath: $.source + outJsonPath: $.Data.source + - inJsonPath: $.actionHistory + outJsonPath: $.Data.actionHistory + - inJsonPath: $.citizen + outJsonPath: $.Data.citizen + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + externalUriMapping: + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=ADMIN,boundaryType=locality,codes=$.addressDetail.mohalla,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0].name + outJsonPath: $.Data.addressDetail.locality + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=ADMIN,boundaryType=Block,codes=$.addressDetail.mohalla,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.complaintWard + mdmsMapping: + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: common-masters + masterName: Department + tenantId: pb + filter: "[?(@.code == $department)]" + filterMapping: + - variable: $department + valueJsonpath: $.department + uriResponseMapping: + - inJsonPath: $.MdmsRes.common-masters.Department.*.name + outJsonPath: $.Data.department + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: RAINMAKER-PGR + masterName: ServiceDefs + tenantId: pb + filter: "[?((@.serviceCode == $servicecode) && (@.active == true))]" + filterMapping: + - variable: $servicecode + valueJsonpath: $.serviceCode + uriResponseMapping: + - inJsonPath: $.MdmsRes.RAINMAKER-PGR.ServiceDefs.*.slaHours + outJsonPath: $.Data.slaHours + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData + + + - topic: update-pgr-index-service + configKey: INDEX + indexes: + - name: pgrindex-v1 + type: grievances + id: $.serviceRequestId, $.tenantId + isBulk: true + jsonPath: $.serviceRequests + timeStampField: $.auditDetails.createdTime + fieldsToBeMasked: ["$.phone", "$.citizen.mobileNumber", "$.citizen.address", "$.citizen.aadhaarNumber", "$.citizen.pan", "$.citizen.emailId", "$.citizen.password"] + customJsonMapping: + indexMapping: {"Data":{"serviceRequestId":"serviceRequestId","tenantId":"tenantId","complainCategory":"complainCategory","citizen":{},"phone":"phone","dateOfComplaint":null,"address":"","addressDetail":{},"status":"status","assignee":"assignee","gro":"gro","department":"department","complaintWard":{},"source":"source","description":"","slaHours":"slaHours","tenantData":{},"actionHistory":{},"@timestamp":"timestamp"}} + fieldMapping: + - inJsonPath: $.serviceRequestId + outJsonPath: $.Data.serviceRequestId + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.phone + outJsonPath: $.Data.phone + - inJsonPath: $.auditDetails.createdTime + outJsonPath: $.Data.dateOfComplaint + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - inJsonPath: $.description + outJsonPath: $.Data.description + - inJsonPath: $.address + outJsonPath: $.Data.address + - inJsonPath: $.addressDetail + outJsonPath: $.Data.addressDetail + - inJsonPath: $.status + outJsonPath: $.Data.status + - inJsonPath: $.complaintCategory + outJsonPath: $.Data.complainCategory + - inJsonPath: $.source + outJsonPath: $.Data.source + - inJsonPath: $.actionHistory + outJsonPath: $.Data.actionHistory + - inJsonPath: $.citizen + outJsonPath: $.Data.citizen + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + externalUriMapping: + - path: http://egov-hrms.egov:8080/egov-hrms/employees/_search + queryParam: tenantId=$.tenantId,ids=$.assignee + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "750d4aa9-2436-4bc4-a8f4-3796e3bfd465","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.Employees[0].user.name + outJsonPath: $.Data.assignee + - path: http://egov-hrms.egov:8080/egov-hrms/employees/_search + queryParam: tenantId=$.tenantId,ids=$.gro + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "750d4aa9-2436-4bc4-a8f4-3796e3bfd465","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.Employees[0].user.name + outJsonPath: $.Data.gro + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=ADMIN,boundaryType=locality,codes=$.addressDetail.mohalla,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "750d4aa9-2436-4bc4-a8f4-3796e3bfd465","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0].name + outJsonPath: $.Data.addressDetail.locality + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=ADMIN,boundaryType=Block,codes=$.addressDetail.mohalla,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "750d4aa9-2436-4bc4-a8f4-3796e3bfd465","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.complaintWard + mdmsMapping: + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: common-masters + masterName: Department + tenantId: pb + filter: "[?(@.code == $department)]" + filterMapping: + - variable: $department + valueJsonpath: $.department + uriResponseMapping: + - inJsonPath: $.MdmsRes.common-masters.Department.*.name + outJsonPath: $.Data.department + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: RAINMAKER-PGR + masterName: ServiceDefs + tenantId: pb + filter: "[?((@.serviceCode == $servicecode) && (@.active == true))]" + filterMapping: + - variable: $servicecode + valueJsonpath: $.serviceCode + uriResponseMapping: + - inJsonPath: $.MdmsRes.RAINMAKER-PGR.ServiceDefs.*.slaHours + outJsonPath: $.Data.slaHours + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData + + - topic: pgr-service-reindex + configKey: REINDEX + indexes: + - name: pgrreindex-v1 + type: grievances + id: $.Data.serviceRequestId, $.Data.tenantId + isBulk: true + jsonPath: $.hits + timeStampField: $.Data.auditDetails.createdTime + + - topic: pgr-service-legacyindex + configKey: LEGACYINDEX + indexes: + - name: pgrindex-v1 + type: grievances + id: $.serviceRequestId, $.tenantId + isBulk: true + jsonPath: $.serviceRequests + fieldsToBeMasked: ["$.phone", "$.citizen.mobileNumber", "$.citizen.address", "$.citizen.aadhaarNumber", "$.citizen.pan", "$.citizen.emailId", "$.citizen.password"] + timeStampField: $.auditDetails.createdTime + customJsonMapping: + indexMapping: {"Data":{"serviceRequestId":"serviceRequestId","tenantId":"tenantId","complainCategory":"complainCategory","citizen":{},"phone":"phone","dateOfComplaint":null,"address":"","addressDetail":{},"status":"status","assignee":"assignee","gro":"gro","department":"department","complaintWard":{"name":"NA"},"source":"source","description":"","slaHours":"slaHours","tenantData":{},"actionHistory":{},"@timestamp":"timestamp"}} + fieldMapping: + - inJsonPath: $.serviceRequestId + outJsonPath: $.Data.serviceRequestId + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.phone + outJsonPath: $.Data.phone + - inJsonPath: $.auditDetails.createdTime + outJsonPath: $.Data.dateOfComplaint + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + - inJsonPath: $.description + outJsonPath: $.Data.description + - inJsonPath: $.address + outJsonPath: $.Data.address + - inJsonPath: $.addressDetail + outJsonPath: $.Data.addressDetail + - inJsonPath: $.status + outJsonPath: $.Data.status + - inJsonPath: $.complaintCategory + outJsonPath: $.Data.complainCategory + - inJsonPath: $.source + outJsonPath: $.Data.source + - inJsonPath: $.actionHistory + outJsonPath: $.Data.actionHistory + - inJsonPath: $.citizen + outJsonPath: $.Data.citizen + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + externalUriMapping: + - path: http://egov-hrms.egov:8080/egov-hrms/employees/_search + queryParam: tenantId=$.tenantId,id=$.assignee + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "750d4aa9-2436-4bc4-a8f4-3796e3bfd465","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.Employee[0].name + outJsonPath: $.Data.assignee + - path: http://egov-hrms.egov:8080/egov-hrms/employees/_search + queryParam: tenantId=$.tenantId,ids=$.assignee + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "750d4aa9-2436-4bc4-a8f4-3796e3bfd465","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.Employees[0].user.name + outJsonPath: $.Data.assignee + - path: http://egov-hrms.egov:8080/egov-hrms/employees/_search + queryParam: tenantId=$.tenantId,ids=$.gro + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "750d4aa9-2436-4bc4-a8f4-3796e3bfd465","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.Employees[0].user.name + outJsonPath: $.Data.gro + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=ADMIN,boundaryType=Block,codes=$.addressDetail.mohalla,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "750d4aa9-2436-4bc4-a8f4-3796e3bfd465","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.complaintWard + mdmsMapping: + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: common-masters + masterName: Department + tenantId: pb + filter: "[?(@.code == $department)]" + filterMapping: + - variable: $department + valueJsonpath: $.department + uriResponseMapping: + - inJsonPath: $.MdmsRes.common-masters.Department.*.name + outJsonPath: $.Data.department + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: RAINMAKER-PGR + masterName: ServiceDefs + tenantId: pb + filter: "[?((@.serviceCode == $servicecode) && (@.active == true))]" + filterMapping: + - variable: $servicecode + valueJsonpath: $.serviceCode + uriResponseMapping: + - inJsonPath: $.MdmsRes.RAINMAKER-PGR.ServiceDefs.*.slaHours + outJsonPath: $.Data.slaHours + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData + + +#JOURNEY: rainmakerpgr -> pgrreindextest -> pgrreindex -> pgrnew +#configKey=INDEX: Index that currently receives live data from the services +#configKey=REINDEX: Configuration for reindexing that will be enabled only during reindexing activity. +#configKey=LEGACYINDEX: Configuration for reindexing the database to es that will be enabled only during reindexing activity. + + + +#there was custom mapping config for this index, that needs to be redesigned so has been removed for now. Take from any commit before 22/11/2018. diff --git a/configs/egov-indexer/rainmaker-pt-indexer.yml b/configs/egov-indexer/rainmaker-pt-indexer.yml new file mode 100644 index 00000000..83e5ae16 --- /dev/null +++ b/configs/egov-indexer/rainmaker-pt-indexer.yml @@ -0,0 +1,207 @@ +ServiceMaps: + serviceName: Property Tax - rainmaker + version: 1.0.0 + mappings: + - topic: save-pt-property + configKey: INDEX + indexes: + - name: ptindex-v1 + type: property + id: $.propertyId, $.tenantId + isBulk: true + timeStampField: $.auditDetails.createdTime + jsonPath: $.Properties.* + customJsonMapping: + indexMapping: {"Data":{"propertyId":"","tenantId":"","propertyDetails":{},"address":{},"ward":{},"tenantData":{},"@timestamp":"timestamp"}} + fieldMapping: + - inJsonPath: $.propertyId + outJsonPath: $.Data.propertyId + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.propertyDetails + outJsonPath: $.Data.propertyDetails + - inJsonPath: $.address + outJsonPath: $.Data.address + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + externalUriMapping: + - path: http://egov-location:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + mdmsMapping: + - path: http://egov-mdms-service:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData + + + - topic: update-pt-property + configKey: INDEX + indexes: + - name: ptindex-v1 + type: property + id: $.propertyId, $.tenantId + isBulk: true + timeStampField: $.auditDetails.createdTime + jsonPath: $.Properties.* + customJsonMapping: + indexMapping: {"Data":{"propertyId":"","tenantId":"","propertyDetails":{},"address":{},"ward":{},"tenantData":{},"@timestamp":"timestamp"}} + fieldMapping: + - inJsonPath: $.propertyId + outJsonPath: $.Data.propertyId + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.propertyDetails + outJsonPath: $.Data.propertyDetails + - inJsonPath: $.address + outJsonPath: $.Data.address + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + externalUriMapping: + - path: http://egov-location:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + mdmsMapping: + - path: http://egov-mdms-service:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData + + - topic: pt-property-reindex + configKey: REINDEX + indexes: + - name: ptreindex-v1 + type: property + id: $.propertyId, $.tenantId + isBulk: true + timeStampField: $.auditDetails.createdTime + jsonPath: $.hits.* + + - topic: pt-property-legacyindex + configKey: LEGACYINDEX + indexes: + - name: ptindex-v1 + type: property + id: $.propertyId, $.tenantId + isBulk: true + timeStampField: $.auditDetails.createdTime + jsonPath: $.Properties.* + customJsonMapping: + indexMapping: {"Data":{"propertyId":"","tenantId":"","propertyDetails":{},"address":{},"ward":{},"tenantData":{},"@timestamp":"timestamp"}} + fieldMapping: + - inJsonPath: $.propertyId + outJsonPath: $.Data.propertyId + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.propertyDetails + outJsonPath: $.Data.propertyDetails + - inJsonPath: $.address + outJsonPath: $.Data.address + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + externalUriMapping: + - path: http://egov-location:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + mdmsMapping: + - path: http://egov-mdms-service:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData + + + - topic: save-pt-property-dcb + configKey: INDEX + indexes: + - name: ptindex-dcb-v1 + type: property + id: $.propertyId, $.tenantId + isBulk: true + timeStampField: $.auditDetails.createdTime + jsonPath: $.Properties.* + customJsonMapping: + indexMapping: {"Data":{"propertyId":"","tenantId":"","propertyDetails":{},"address":{},"ward":{},"tenantData":{},"collections":{},"demands":{},"@timestamp":"timestamp"}} + fieldMapping: + - inJsonPath: $.propertyId + outJsonPath: $.Data.propertyId + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.propertyDetails + outJsonPath: $.Data.propertyDetails + - inJsonPath: $.address + outJsonPath: $.Data.address + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + externalUriMapping: + - path: http://egov-location:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + - path: http://collection-services:8080/collection-services/receipts/_search + queryParam: consumerCode=$.consumerCodes + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.Receipt + outJsonPath: $.Data.collections + - path: http://billing-service:8080/billing-service/demand//_search + queryParam: consumerCode=$.consumerCodes,tenantId=$.propertyDetails[0].tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.Demands + outJsonPath: $.Data.demands + mdmsMapping: + - path: http://egov-mdms-service:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData + + +#JOURNEY: rainmakerpt -> rainmakerptlegacyindex +#configKey=INDEX: Index that currently receives live data from the services +#configKey=REINDEX: Configuration for reindexing that will be enabled only during reindexing activity. +#configKey=LEGACYINDEX: Configuration for reindexing the database to es that will be enabled only during reindexing activity. diff --git a/configs/egov-indexer/rainmaker-tl-indexer.yml b/configs/egov-indexer/rainmaker-tl-indexer.yml new file mode 100644 index 00000000..db1121e3 --- /dev/null +++ b/configs/egov-indexer/rainmaker-tl-indexer.yml @@ -0,0 +1,168 @@ +ServiceMaps: + serviceName: Trade License + version: 1.0.0 + mappings: + - topic: save-tl-tradelicense + configKey: INDEX + indexes: + - name: tlindex-v1 + type: general + id: $.id, $.tenantId + isBulk: true + timeStampField: $.auditDetails.createdTime + jsonPath: $.Licenses + customJsonMapping: + indexMapping: {"Data":{"tradelicense":{},"ward":{},"tenantData":{}, "history":{}}} + fieldMapping: + - inJsonPath: $ + outJsonPath: $.Data.tradelicense + - inJsonPath: $.tradeLicenseDetail.tradeUnits[0].tradeType + outJsonPath: $.Data.tradeType + externalUriMapping: + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=locality,codes=$.tradeLicenseDetail.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.applicationNumber,history=true,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history + mdmsMapping: + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData + + - topic: update-tl-tradelicense + configKey: INDEX + indexes: + - name: tlindex-v1 + type: general + id: $.id, $.tenantId + isBulk: true + timeStampField: $.auditDetails.createdTime + jsonPath: $.Licenses + customJsonMapping: + indexMapping: {"Data":{"tradelicense":{},"ward":{},"tenantData":{}, "history":{}}} + fieldMapping: + - inJsonPath: $ + outJsonPath: $.Data.tradelicense + externalUriMapping: + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=locality,codes=$.tradeLicenseDetail.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.applicationNumber,history=true,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history + mdmsMapping: + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData + + - topic: tradelicense-legacyindex + configKey: LEGACYINDEX + indexes: + - name: tlindex-v1 + type: general + id: $.id, $.tenantId + isBulk: true + timeStampField: $.auditDetails.createdTime + jsonPath: $.Licenses + customJsonMapping: + indexMapping: {"Data":{"tradelicense":{},"ward":{},"tenantData":{}, "history":{}}} + fieldMapping: + - inJsonPath: $ + outJsonPath: $.Data.tradelicense + - inJsonPath: $.tradeLicenseDetail.tradeUnits[0].tradeType + outJsonPath: $.Data.tradeType + + externalUriMapping: + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=locality,codes=$.tradeLicenseDetail.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.applicationNumber,history=true,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history + mdmsMapping: + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData + + - topic: update-tl-workflow + configKey: INDEX + indexes: + - name: tlindex-v1 + type: general + id: $.id, $.tenantId + isBulk: true + timeStampField: $.auditDetails.createdTime + jsonPath: $.Licenses + customJsonMapping: + indexMapping: {"Data":{"tradelicense":{},"ward":{},"tenantData":{}, "history":{}}} + fieldMapping: + - inJsonPath: $ + outJsonPath: $.Data.tradelicense + externalUriMapping: + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=locality,codes=$.tradeLicenseDetail.address.locality.code,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.applicationNumber,history=true,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history + mdmsMapping: + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData diff --git a/configs/egov-indexer/sewerage-service.yml b/configs/egov-indexer/sewerage-service.yml new file mode 100644 index 00000000..a6d946fb --- /dev/null +++ b/configs/egov-indexer/sewerage-service.yml @@ -0,0 +1,410 @@ +ServiceMaps: + serviceName: Sewerage Service - rainmaker + version: 1.0.0 + mappings: + - topic: save-sw-connection + configKey: INDEX + indexes: + - name: sewerage-services + type: general + id: $.id,$.tenantId + timeStampField: $.auditDetails.createdTime + jsonPath: $.SewerageConnection + customJsonMapping: + indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","applicationStatus":"","status":"","connectionNo":"","oldConnectionNo":"","plumberInfo":[],"roadCuttingInfo":[],"connectionHolders":[],"roadType":"","roadCuttingArea":"","connectionExecutionDate":"","connectionCategory":"","connectionType":"","additionalDetails":{},"auditDetails":{},"id":"","propertyId":"","propertyUsageType":"","tenantId":"","proposedWaterClosets":"","proposedToilets":"","noOfWaterClosets":"","noOfToilets":"","applicationType":"","dateEffectiveFrom":"","channel":"","history":{}}} + fieldMapping: + - inJsonPath: $.applicationStatus.state + outJsonPath: $.Data.workflow.state + - inJsonPath: $.processInstance.action + outJsonPath: $.Data.workflow.action + - inJsonPath: $.processInstance.assignes.*.uuid + outJsonPath: $.Data.workflow.assignes + - inJsonPath: $.applicationNo + outJsonPath: $.Data.applicationNo + - inJsonPath: $.applicationStatus + outJsonPath: $.Data.applicationStatus + - inJsonPath: $.status + outJsonPath: $.Data.status + - inJsonPath: $.connectionNo + outJsonPath: $.Data.connectionNo + - inJsonPath: $.oldConnectionNo + outJsonPath: $.Data.oldConnectionNo + - inJsonPath: $.plumberInfo + outJsonPath: $.Data.plumberInfo + - inJsonPath: $.roadCuttingInfo + outJsonPath: $.Data.roadCuttingInfo + - inJsonPath: $.connectionHolders + outJsonPath: $.Data.connectionHolders + - inJsonPath: $.roadType + outJsonPath: $.Data.roadType + - inJsonPath: $.roadCuttingArea + outJsonPath: $.Data.roadCuttingArea + - inJsonPath: $.connectionExecutionDate + outJsonPath: $.Data.connectionExecutionDate + - inJsonPath: $.connectionCategory + outJsonPath: $.Data.connectionCategory + - inJsonPath: $.connectionType + outJsonPath: $.Data.connectionType + - inJsonPath: $.additionalDetails + outJsonPath: $.Data.additionalDetails + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.propertyId + outJsonPath: $.Data.propertyId + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.proposedWaterClosets + outJsonPath: $.Data.proposedWaterClosets + - inJsonPath: $.proposedToilets + outJsonPath: $.Data.proposedToilets + - inJsonPath: $.noOfWaterClosets + outJsonPath: $.Data.noOfWaterClosets + - inJsonPath: $.noOfToilets + outJsonPath: $.Data.noOfToilets + - inJsonPath: $.applicationType + outJsonPath: $.Data.applicationType + - inJsonPath: $.dateEffectiveFrom + outJsonPath: $.Data.dateEffectiveFrom + - inJsonPath: $.channel + outJsonPath: $.Data.channel + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + externalUriMapping: + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.applicationNo,history=true,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history + - path: http://property-services.egov:8080/property-services/property/_search + queryParam: propertyIds=$.propertyId,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.Properties[0].usageCategory + outJsonPath: $.Data.propertyUsageType + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.additionalDetails.locality,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + mdmsMapping: + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData + + - topic: update-sw-connection + configKey: INDEX + indexes: + - name: sewerage-services + type: general + id: $.id,$.tenantId + timeStampField: $.auditDetails.lastModifiedTime + jsonPath: $.SewerageConnection + customJsonMapping: + indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","applicationStatus":"","status":"","connectionNo":"","oldConnectionNo":"","plumberInfo":[],"roadCuttingInfo":[],"connectionHolders":[],"roadType":"","roadCuttingArea":"","connectionExecutionDate":"","connectionCategory":"","connectionType":"","additionalDetails":{},"auditDetails":{},"id":"","propertyId":"","propertyUsageType":"","tenantId":"","proposedWaterClosets":"","proposedToilets":"","noOfWaterClosets":"","noOfToilets":"","applicationType":"","dateEffectiveFrom":"","channel":"","@timestamp":"timestamp","history":{}}} + fieldMapping: + - inJsonPath: $.applicationStatus.state + outJsonPath: $.Data.workflow.state + - inJsonPath: $.processInstance.action + outJsonPath: $.Data.workflow.action + - inJsonPath: $.processInstance.assignes.*.uuid + outJsonPath: $.Data.workflow.assignes + - inJsonPath: $.applicationNo + outJsonPath: $.Data.applicationNo + - inJsonPath: $.applicationStatus + outJsonPath: $.Data.applicationStatus + - inJsonPath: $.status + outJsonPath: $.Data.status + - inJsonPath: $.connectionNo + outJsonPath: $.Data.connectionNo + - inJsonPath: $.oldConnectionNo + outJsonPath: $.Data.oldConnectionNo + - inJsonPath: $.plumberInfo + outJsonPath: $.Data.plumberInfo + - inJsonPath: $.roadCuttingInfo + outJsonPath: $.Data.roadCuttingInfo + - inJsonPath: $.connectionHolders + outJsonPath: $.Data.connectionHolders + - inJsonPath: $.roadType + outJsonPath: $.Data.roadType + - inJsonPath: $.roadCuttingArea + outJsonPath: $.Data.roadCuttingArea + - inJsonPath: $.connectionExecutionDate + outJsonPath: $.Data.connectionExecutionDate + - inJsonPath: $.connectionCategory + outJsonPath: $.Data.connectionCategory + - inJsonPath: $.connectionType + outJsonPath: $.Data.connectionType + - inJsonPath: $.additionalDetails + outJsonPath: $.Data.additionalDetails + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.propertyId + outJsonPath: $.Data.propertyId + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.proposedWaterClosets + outJsonPath: $.Data.proposedWaterClosets + - inJsonPath: $.proposedToilets + outJsonPath: $.Data.proposedToilets + - inJsonPath: $.noOfWaterClosets + outJsonPath: $.Data.noOfWaterClosets + - inJsonPath: $.noOfToilets + outJsonPath: $.Data.noOfToilets + - inJsonPath: $.applicationType + outJsonPath: $.Data.applicationType + - inJsonPath: $.dateEffectiveFrom + outJsonPath: $.Data.dateEffectiveFrom + - inJsonPath: $.channel + outJsonPath: $.Data.channel + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + externalUriMapping: + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.applicationNo,history=true,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history + - path: http://property-services.egov:8080/property-services/property/_search + queryParam: propertyIds=$.propertyId,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.Properties[0].usageCategory + outJsonPath: $.Data.propertyUsageType + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.additionalDetails.locality,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + mdmsMapping: + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData + + + - topic: update-sw-workflow + configKey: INDEX + indexes: + - name: sewerage-services + type: general + id: $.id,$.tenantId + timeStampField: $.auditDetails.lastModifiedTime + jsonPath: $.SewerageConnection + customJsonMapping: + indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","applicationStatus":"","status":"","connectionNo":"","oldConnectionNo":"","plumberInfo":[],"roadCuttingInfo":[],"connectionHolders":[],"roadType":"","roadCuttingArea":"","connectionExecutionDate":"","connectionCategory":"","connectionType":"","additionalDetails":{},"auditDetails":{},"id":"","propertyId":"","tenantId":"","proposedWaterClosets":"","proposedToilets":"","noOfWaterClosets":"","noOfToilets":"","applicationType":"","dateEffectiveFrom":"","channel":"","@timestamp":"timestamp","history":{}}} + fieldMapping: + - inJsonPath: $.applicationStatus.state + outJsonPath: $.Data.workflow.state + - inJsonPath: $.processInstance.action + outJsonPath: $.Data.workflow.action + - inJsonPath: $.processInstance.assignes.*.uuid + outJsonPath: $.Data.workflow.assignes + - inJsonPath: $.applicationNo + outJsonPath: $.Data.applicationNo + - inJsonPath: $.applicationStatus + outJsonPath: $.Data.applicationStatus + - inJsonPath: $.status + outJsonPath: $.Data.status + - inJsonPath: $.connectionNo + outJsonPath: $.Data.connectionNo + - inJsonPath: $.oldConnectionNo + outJsonPath: $.Data.oldConnectionNo + - inJsonPath: $.plumberInfo + outJsonPath: $.Data.plumberInfo + - inJsonPath: $.roadCuttingInfo + outJsonPath: $.Data.roadCuttingInfo + - inJsonPath: $.connectionHolders + outJsonPath: $.Data.connectionHolders + - inJsonPath: $.roadType + outJsonPath: $.Data.roadType + - inJsonPath: $.roadCuttingArea + outJsonPath: $.Data.roadCuttingArea + - inJsonPath: $.connectionExecutionDate + outJsonPath: $.Data.connectionExecutionDate + - inJsonPath: $.connectionCategory + outJsonPath: $.Data.connectionCategory + - inJsonPath: $.connectionType + outJsonPath: $.Data.connectionType + - inJsonPath: $.additionalDetails + outJsonPath: $.Data.additionalDetails + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.propertyId + outJsonPath: $.Data.propertyId + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.proposedWaterClosets + outJsonPath: $.Data.proposedWaterClosets + - inJsonPath: $.proposedToilets + outJsonPath: $.Data.proposedToilets + - inJsonPath: $.noOfWaterClosets + outJsonPath: $.Data.noOfWaterClosets + - inJsonPath: $.noOfToilets + outJsonPath: $.Data.noOfToilets + - inJsonPath: $.applicationType + outJsonPath: $.Data.applicationType + - inJsonPath: $.dateEffectiveFrom + outJsonPath: $.Data.dateEffectiveFrom + - inJsonPath: $.channel + outJsonPath: $.Data.channel + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + externalUriMapping: + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.applicationNo,history=true,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history + - path: http://property-services.egov:8080/property-services/property/_search + queryParam: propertyIds=$.propertyId,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.Properties[0].usageCategory + outJsonPath: $.Data.propertyUsageType + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.additionalDetails.locality,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + mdmsMapping: + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData + - topic: sw-services-legacyindex + configKey: LEGACYINDEX + indexes: + - name: sewerage-services + type: general + isBulk: true + id: $.id,$.tenantId + timeStampField: $.auditDetails.createdTime + jsonPath: $.SewerageConnections + customJsonMapping: + indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","applicationStatus":"","status":"","connectionNo":"","oldConnectionNo":"","plumberInfo":[],"roadCuttingInfo":[],"connectionHolders":[],"roadType":"","roadCuttingArea":"","connectionExecutionDate":"","connectionCategory":"","connectionType":"","additionalDetails":{},"auditDetails":{},"id":"","propertyId":"","propertyUsageType":"","tenantId":"","proposedWaterClosets":"","proposedToilets":"","noOfWaterClosets":"","noOfToilets":"","applicationType":"","dateEffectiveFrom":"","channel":"","history":{}}} + fieldMapping: + - inJsonPath: $.applicationStatus.state + outJsonPath: $.Data.workflow.state + - inJsonPath: $.processInstance.action + outJsonPath: $.Data.workflow.action + - inJsonPath: $.processInstance.assignes.*.uuid + outJsonPath: $.Data.workflow.assignes + - inJsonPath: $.applicationNo + outJsonPath: $.Data.applicationNo + - inJsonPath: $.applicationStatus + outJsonPath: $.Data.applicationStatus + - inJsonPath: $.status + outJsonPath: $.Data.status + - inJsonPath: $.connectionNo + outJsonPath: $.Data.connectionNo + - inJsonPath: $.oldConnectionNo + outJsonPath: $.Data.oldConnectionNo + - inJsonPath: $.plumberInfo + outJsonPath: $.Data.plumberInfo + - inJsonPath: $.roadCuttingInfo + outJsonPath: $.Data.roadCuttingInfo + - inJsonPath: $.connectionHolders + outJsonPath: $.Data.connectionHolders + - inJsonPath: $.roadType + outJsonPath: $.Data.roadType + - inJsonPath: $.roadCuttingArea + outJsonPath: $.Data.roadCuttingArea + - inJsonPath: $.connectionExecutionDate + outJsonPath: $.Data.connectionExecutionDate + - inJsonPath: $.connectionCategory + outJsonPath: $.Data.connectionCategory + - inJsonPath: $.connectionType + outJsonPath: $.Data.connectionType + - inJsonPath: $.additionalDetails + outJsonPath: $.Data.additionalDetails + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.propertyId + outJsonPath: $.Data.propertyId + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.proposedWaterClosets + outJsonPath: $.Data.proposedWaterClosets + - inJsonPath: $.proposedToilets + outJsonPath: $.Data.proposedToilets + - inJsonPath: $.noOfWaterClosets + outJsonPath: $.Data.noOfWaterClosets + - inJsonPath: $.noOfToilets + outJsonPath: $.Data.noOfToilets + - inJsonPath: $.applicationType + outJsonPath: $.Data.applicationType + - inJsonPath: $.dateEffectiveFrom + outJsonPath: $.Data.dateEffectiveFrom + - inJsonPath: $.channel + outJsonPath: $.Data.channel + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + externalUriMapping: + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.applicationNo,history=true,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history + - path: http://property-services.egov:8080/property-services/property/_search + queryParam: propertyIds=$.propertyId,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.Properties[0].usageCategory + outJsonPath: $.Data.propertyUsageType + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.additionalDetails.locality,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + mdmsMapping: + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData diff --git a/configs/egov-indexer/tradelicense-indexer.yml b/configs/egov-indexer/tradelicense-indexer.yml new file mode 100644 index 00000000..0b836b18 --- /dev/null +++ b/configs/egov-indexer/tradelicense-indexer.yml @@ -0,0 +1,21 @@ +ServiceMaps: + serviceName: Trade License + version: 1.0.0 + mappings: + - topic: save-tl-tradelicense + configKey: INDEX + indexes: + - name: tl-index + type: tradelicenses + id: $.id, $.tenantId + isBulk: true + jsonPath: $.Licenses + + - topic: update-tl-tradelicense + configKey: INDEX + indexes: + - name: tl-index + type: tradelicenses + id: $.id, $.tenantId + isBulk: true + jsonPath: $.Licenses diff --git a/configs/egov-indexer/water-service.yml b/configs/egov-indexer/water-service.yml new file mode 100644 index 00000000..a83eb8ce --- /dev/null +++ b/configs/egov-indexer/water-service.yml @@ -0,0 +1,444 @@ +ServiceMaps: + serviceName: Water Service - rainmaker + version: 1.0.0 + mappings: + - topic: save-ws-connection + configKey: INDEX + indexes: + - name: water-services + type: general + id: $.id,$.tenantId + jsonPath: $.WaterConnection + timeStampField: $.auditDetails.createdTime + customJsonMapping: + indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","applicationStatus":"","status":"","connectionNo":"","oldConnectionNo":"","plumberInfo":[],"roadCuttingInfo":[],"connectionHolders":[],"roadType":"","roadCuttingArea":"","connectionExecutionDate":"","connectionCategory":"","connectionType":"","additionalDetails":{},"id":"","propertyId":"","propertyUsageType":"","rainWaterHarvesting":"","waterSource":"","tenantId":"","meterId":"","meterInstallationDate":"","proposedPipeSize":"","proposedTaps":"","pipeSize":"","noOfTaps":"","applicationType":"","dateEffectiveFrom":"","channel":"","@timestamp":"timestamp","auditDetails":{},"history":{}}} + fieldMapping: + - inJsonPath: $.applicationStatus.state + outJsonPath: $.Data.workflow.state + - inJsonPath: $.processInstance.action + outJsonPath: $.Data.workflow.action + - inJsonPath: $.processInstance.assignes.*.uuid + outJsonPath: $.Data.workflow.assignes + - inJsonPath: $.applicationNo + outJsonPath: $.Data.applicationNo + - inJsonPath: $.applicationStatus + outJsonPath: $.Data.applicationStatus + - inJsonPath: $.status + outJsonPath: $.Data.status + - inJsonPath: $.connectionNo + outJsonPath: $.Data.connectionNo + - inJsonPath: $.oldConnectionNo + outJsonPath: $.Data.oldConnectionNo + - inJsonPath: $.plumberInfo + outJsonPath: $.Data.plumberInfo + - inJsonPath: $.roadCuttingInfo + outJsonPath: $.Data.roadCuttingInfo + - inJsonPath: $.connectionHolders + outJsonPath: $.Data.connectionHolders + - inJsonPath: $.roadType + outJsonPath: $.Data.roadType + - inJsonPath: $.roadCuttingArea + outJsonPath: $.Data.roadCuttingArea + - inJsonPath: $.connectionExecutionDate + outJsonPath: $.Data.connectionExecutionDate + - inJsonPath: $.connectionCategory + outJsonPath: $.Data.connectionCategory + - inJsonPath: $.connectionType + outJsonPath: $.Data.connectionType + - inJsonPath: $.additionalDetails + outJsonPath: $.Data.additionalDetails + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.propertyId + outJsonPath: $.Data.propertyId + - inJsonPath: $.rainWaterHarvesting + outJsonPath: $.Data.rainWaterHarvesting + - inJsonPath: $.waterSource + outJsonPath: $.Data.waterSource + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.meterId + outJsonPath: $.Data.meterId + - inJsonPath: $.meterInstallationDate + outJsonPath: $.Data.meterInstallationDate + - inJsonPath: $.proposedPipeSize + outJsonPath: $.Data.proposedPipeSize + - inJsonPath: $.proposedTaps + outJsonPath: $.Data.proposedTaps + - inJsonPath: $.pipeSize + outJsonPath: $.Data.pipeSize + - inJsonPath: $.noOfTaps + outJsonPath: $.Data.noOfTaps + - inJsonPath: $.applicationType + outJsonPath: $.Data.applicationType + - inJsonPath: $.dateEffectiveFrom + outJsonPath: $.Data.dateEffectiveFrom + - inJsonPath: $.channel + outJsonPath: $.Data.channel + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + externalUriMapping: + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.applicationNo,history=true,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history + - path: http://property-services.egov:8080/property-services/property/_search + queryParam: propertyIds=$.propertyId,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.Properties[0].usageCategory + outJsonPath: $.Data.propertyUsageType + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.additionalDetails.locality,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + mdmsMapping: + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData + + + - topic: update-ws-connection + configKey: INDEX + indexes: + - name: water-services + type: general + id: $.id,$.tenantId + jsonPath: $.WaterConnection + timeStampField: $.auditDetails.lastModifiedTime + customJsonMapping: + indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","applicationStatus":"","status":"","connectionNo":"","oldConnectionNo":"","plumberInfo":[],"roadCuttingInfo":[],"connectionHolders":[],"roadType":"","roadCuttingArea":"","connectionExecutionDate":"","connectionCategory":"","connectionType":"","additionalDetails":{},"id":"","propertyId":"","propertyUsageType":"","rainWaterHarvesting":"","waterSource":"","tenantId":"","meterId":"","meterInstallationDate":"","proposedPipeSize":"","proposedTaps":"","pipeSize":"","noOfTaps":"","applicationType":"","dateEffectiveFrom":"","channel":"","@timestamp":"timestamp","auditDetails":{},"history":{}}} + fieldMapping: + - inJsonPath: $.applicationStatus.state + outJsonPath: $.Data.workflow.state + - inJsonPath: $.processInstance.action + outJsonPath: $.Data.workflow.action + - inJsonPath: $.processInstance.assignes.*.uuid + outJsonPath: $.Data.workflow.assignes + - inJsonPath: $.applicationNo + outJsonPath: $.Data.applicationNo + - inJsonPath: $.applicationStatus + outJsonPath: $.Data.applicationStatus + - inJsonPath: $.status + outJsonPath: $.Data.status + - inJsonPath: $.connectionNo + outJsonPath: $.Data.connectionNo + - inJsonPath: $.oldConnectionNo + outJsonPath: $.Data.oldConnectionNo + - inJsonPath: $.plumberInfo + outJsonPath: $.Data.plumberInfo + - inJsonPath: $.roadCuttingInfo + outJsonPath: $.Data.roadCuttingInfo + - inJsonPath: $.connectionHolders + outJsonPath: $.Data.connectionHolders + - inJsonPath: $.roadType + outJsonPath: $.Data.roadType + - inJsonPath: $.roadCuttingArea + outJsonPath: $.Data.roadCuttingArea + - inJsonPath: $.connectionExecutionDate + outJsonPath: $.Data.connectionExecutionDate + - inJsonPath: $.connectionCategory + outJsonPath: $.Data.connectionCategory + - inJsonPath: $.connectionType + outJsonPath: $.Data.connectionType + - inJsonPath: $.additionalDetails + outJsonPath: $.Data.additionalDetails + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.propertyId + outJsonPath: $.Data.propertyId + - inJsonPath: $.rainWaterHarvesting + outJsonPath: $.Data.rainWaterHarvesting + - inJsonPath: $.waterSource + outJsonPath: $.Data.waterSource + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.meterId + outJsonPath: $.Data.meterId + - inJsonPath: $.meterInstallationDate + outJsonPath: $.Data.meterInstallationDate + - inJsonPath: $.proposedPipeSize + outJsonPath: $.Data.proposedPipeSize + - inJsonPath: $.proposedTaps + outJsonPath: $.Data.proposedTaps + - inJsonPath: $.pipeSize + outJsonPath: $.Data.pipeSize + - inJsonPath: $.noOfTaps + outJsonPath: $.Data.noOfTaps + - inJsonPath: $.applicationType + outJsonPath: $.Data.applicationType + - inJsonPath: $.dateEffectiveFrom + outJsonPath: $.Data.dateEffectiveFrom + - inJsonPath: $.channel + outJsonPath: $.Data.channel + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + externalUriMapping: + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.applicationNo,history=true,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history + - path: http://property-services.egov:8080/property-services/property/_search + queryParam: propertyIds=$.propertyId,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.Properties[0].usageCategory + outJsonPath: $.Data.propertyUsageType + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.additionalDetails.locality,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + mdmsMapping: + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData + + - topic: update-ws-workflow + configKey: INDEX + indexes: + - name: water-services + type: general + id: $.id,$.tenantId + jsonPath: $.WaterConnection + timeStampField: $.auditDetails.lastModifiedTime + customJsonMapping: + indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","applicationStatus":"","status":"","connectionNo":"","oldConnectionNo":"","plumberInfo":[],"roadCuttingInfo":[],"connectionHolders":[],"roadType":"","roadCuttingArea":"","connectionExecutionDate":"","connectionCategory":"","connectionType":"","additionalDetails":{},"id":"","propertyId":"","rainWaterHarvesting":"","waterSource":"","tenantId":"","meterId":"","meterInstallationDate":"","proposedPipeSize":"","proposedTaps":"","pipeSize":"","noOfTaps":"","applicationType":"","dateEffectiveFrom":"","channel":"","@timestamp":"timestamp","auditDetails":{},"history":{}}} + fieldMapping: + - inJsonPath: $.applicationStatus.state + outJsonPath: $.Data.workflow.state + - inJsonPath: $.processInstance.action + outJsonPath: $.Data.workflow.action + - inJsonPath: $.processInstance.assignes.*.uuid + outJsonPath: $.Data.workflow.assignes + - inJsonPath: $.applicationNo + outJsonPath: $.Data.applicationNo + - inJsonPath: $.applicationStatus + outJsonPath: $.Data.applicationStatus + - inJsonPath: $.status + outJsonPath: $.Data.status + - inJsonPath: $.connectionNo + outJsonPath: $.Data.connectionNo + - inJsonPath: $.oldConnectionNo + outJsonPath: $.Data.oldConnectionNo + - inJsonPath: $.plumberInfo + outJsonPath: $.Data.plumberInfo + - inJsonPath: $.roadCuttingInfo + outJsonPath: $.Data.roadCuttingInfo + - inJsonPath: $.connectionHolders + outJsonPath: $.Data.connectionHolders + - inJsonPath: $.roadType + outJsonPath: $.Data.roadType + - inJsonPath: $.roadCuttingArea + outJsonPath: $.Data.roadCuttingArea + - inJsonPath: $.connectionExecutionDate + outJsonPath: $.Data.connectionExecutionDate + - inJsonPath: $.connectionCategory + outJsonPath: $.Data.connectionCategory + - inJsonPath: $.connectionType + outJsonPath: $.Data.connectionType + - inJsonPath: $.additionalDetails + outJsonPath: $.Data.additionalDetails + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.propertyId + outJsonPath: $.Data.propertyId + - inJsonPath: $.rainWaterHarvesting + outJsonPath: $.Data.rainWaterHarvesting + - inJsonPath: $.waterSource + outJsonPath: $.Data.waterSource + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.meterId + outJsonPath: $.Data.meterId + - inJsonPath: $.meterInstallationDate + outJsonPath: $.Data.meterInstallationDate + - inJsonPath: $.proposedPipeSize + outJsonPath: $.Data.proposedPipeSize + - inJsonPath: $.proposedTaps + outJsonPath: $.Data.proposedTaps + - inJsonPath: $.pipeSize + outJsonPath: $.Data.pipeSize + - inJsonPath: $.noOfTaps + outJsonPath: $.Data.noOfTaps + - inJsonPath: $.applicationType + outJsonPath: $.Data.applicationType + - inJsonPath: $.dateEffectiveFrom + outJsonPath: $.Data.dateEffectiveFrom + - inJsonPath: $.channel + outJsonPath: $.Data.channel + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + externalUriMapping: + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.applicationNo,history=true,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history + - path: http://property-services.egov:8080/property-services/property/_search + queryParam: propertyIds=$.propertyId,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.Properties[0].usageCategory + outJsonPath: $.Data.propertyUsageType + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.additionalDetails.locality,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + mdmsMapping: + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData + - topic: ws-services-legacyindex + configKey: LEGACYINDEX + indexes: + - name: water-services + type: general + isBulk: true + id: $.id,$.tenantId + jsonPath: $.WaterConnection + timeStampField: $.auditDetails.createdTime + customJsonMapping: + indexMapping: {"Data":{"workflow": {"state": {}, "action": "", "assignes": []},"applicationNo":"","applicationStatus":"","status":"","connectionNo":"","oldConnectionNo":"","plumberInfo":[],"roadCuttingInfo":[],"connectionHolders":[],"roadType":"","roadCuttingArea":"","connectionExecutionDate":"","connectionCategory":"","connectionType":"","additionalDetails":{},"id":"","propertyId":"","propertyUsageType":"","rainWaterHarvesting":"","waterSource":"","tenantId":"","meterId":"","meterInstallationDate":"","proposedPipeSize":"","proposedTaps":"","pipeSize":"","noOfTaps":"","applicationType":"","dateEffectiveFrom":"","channel":"","@timestamp":"timestamp","auditDetails":{},"history":{}}} + fieldMapping: + - inJsonPath: $.applicationStatus.state + outJsonPath: $.Data.workflow.state + - inJsonPath: $.processInstance.action + outJsonPath: $.Data.workflow.action + - inJsonPath: $.processInstance.assignes.*.uuid + outJsonPath: $.Data.workflow.assignes + - inJsonPath: $.applicationNo + outJsonPath: $.Data.applicationNo + - inJsonPath: $.applicationStatus + outJsonPath: $.Data.applicationStatus + - inJsonPath: $.status + outJsonPath: $.Data.status + - inJsonPath: $.connectionNo + outJsonPath: $.Data.connectionNo + - inJsonPath: $.oldConnectionNo + outJsonPath: $.Data.oldConnectionNo + - inJsonPath: $.plumberInfo + outJsonPath: $.Data.plumberInfo + - inJsonPath: $.roadCuttingInfo + outJsonPath: $.Data.roadCuttingInfo + - inJsonPath: $.connectionHolders + outJsonPath: $.Data.connectionHolders + - inJsonPath: $.roadType + outJsonPath: $.Data.roadType + - inJsonPath: $.roadCuttingArea + outJsonPath: $.Data.roadCuttingArea + - inJsonPath: $.connectionExecutionDate + outJsonPath: $.Data.connectionExecutionDate + - inJsonPath: $.connectionCategory + outJsonPath: $.Data.connectionCategory + - inJsonPath: $.connectionType + outJsonPath: $.Data.connectionType + - inJsonPath: $.additionalDetails + outJsonPath: $.Data.additionalDetails + - inJsonPath: $.id + outJsonPath: $.Data.id + - inJsonPath: $.propertyId + outJsonPath: $.Data.propertyId + - inJsonPath: $.rainWaterHarvesting + outJsonPath: $.Data.rainWaterHarvesting + - inJsonPath: $.waterSource + outJsonPath: $.Data.waterSource + - inJsonPath: $.tenantId + outJsonPath: $.Data.tenantId + - inJsonPath: $.meterId + outJsonPath: $.Data.meterId + - inJsonPath: $.meterInstallationDate + outJsonPath: $.Data.meterInstallationDate + - inJsonPath: $.proposedPipeSize + outJsonPath: $.Data.proposedPipeSize + - inJsonPath: $.proposedTaps + outJsonPath: $.Data.proposedTaps + - inJsonPath: $.pipeSize + outJsonPath: $.Data.pipeSize + - inJsonPath: $.noOfTaps + outJsonPath: $.Data.noOfTaps + - inJsonPath: $.applicationType + outJsonPath: $.Data.applicationType + - inJsonPath: $.dateEffectiveFrom + outJsonPath: $.Data.dateEffectiveFrom + - inJsonPath: $.channel + outJsonPath: $.Data.channel + - inJsonPath: $.@timestamp + outJsonPath: $.Data.@timestamp + - inJsonPath: $.auditDetails + outJsonPath: $.Data.auditDetails + externalUriMapping: + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search + queryParam: businessIds=$.applicationNo,history=true,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.ProcessInstances + outJsonPath: $.Data.history + - path: http://property-services.egov:8080/property-services/property/_search + queryParam: propertyIds=$.propertyId,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pb.amritsar","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pb.amritsar"}]}}} + uriResponseMapping: + - inJsonPath: $.Properties[0].usageCategory + outJsonPath: $.Data.propertyUsageType + - path: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search + queryParam: hierarchyTypeCode=REVENUE,boundaryType=Block,codes=$.additionalDetails.locality,tenantId=$.tenantId + apiRequest: {"RequestInfo": {"apiId": "org.egov.pt","ver": "1.0","ts": 1502890899493,"action": "asd","did": "4354648646","key": "xyz","msgId": "654654", "requesterId": "61", + "authToken": "02dbe5be-28df-4d82-954f-3d27c56cca7d","userInfo":{"id":73}}} + uriResponseMapping: + - inJsonPath: $.TenantBoundary[0].boundary[0] + outJsonPath: $.Data.ward + mdmsMapping: + - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search + moduleName: tenant + masterName: tenants + tenantId: pb + filter: "[?(@.code == $tenant)]" + filterMapping: + - variable: $tenant + valueJsonpath: $.tenantId + uriResponseMapping: + - inJsonPath: $.MdmsRes.tenant.tenants + outJsonPath: $.Data.tenantData diff --git a/configs/egov-indexer/water-services-meter.yml b/configs/egov-indexer/water-services-meter.yml new file mode 100644 index 00000000..dd17bf31 --- /dev/null +++ b/configs/egov-indexer/water-services-meter.yml @@ -0,0 +1,28 @@ +ServiceMaps: + serviceName: Meter Connection - rainmaker + version: 1.0.0 + mappings: + - topic: save-ws-meter + configKey: INDEX + indexes: + - name: meter-services + type: general + id: $.id,$.connectionNo + jsonPath: $.meterReadings + customJsonMapping: + indexMapping: {"Data":{"connectionNo":"","meterStatus":"","currentReadingDate":"","currentReading":"","lastReading":"","billingPeriod":"","lastReadingDate":""}} + fieldMapping: + - inJsonPath: $.connectionNo + outJsonPath: $.Data.connectionNo + - inJsonPath: $.meterStatus + outJsonPath: $.Data.meterStatus + - inJsonPath: $.currentReadingDate + outJsonPath: $.Data.currentReadingDate + - inJsonPath: $.currentReading + outJsonPath: $.Data.currentReading + - inJsonPath: $.lastReading + outJsonPath: $.Data.lastReading + - inJsonPath: $.billingPeriod + outJsonPath: $.Data.billingPeriod + - inJsonPath: $.lastReadingDate + outJsonPath: $.Data.lastReadingDate diff --git a/configs/egov-indexer/whatsapp-adoption-data.yaml b/configs/egov-indexer/whatsapp-adoption-data.yaml new file mode 100644 index 00000000..4f7b13c0 --- /dev/null +++ b/configs/egov-indexer/whatsapp-adoption-data.yaml @@ -0,0 +1,12 @@ +ServiceMaps: + serviceName: Collection Service + version: 1.0.0 + mappings: + - topic: whatsapp-adoption-data + configKey: INDEX + indexes: + - name: whatsapp-adoption-data + type: general + id: $.id + isBulk: true + jsonPath: $.* diff --git a/configs/egov-mdms-service/mdms-masters-config.json b/configs/egov-mdms-service/mdms-masters-config.json new file mode 100644 index 00000000..14070c28 --- /dev/null +++ b/configs/egov-mdms-service/mdms-masters-config.json @@ -0,0 +1,715 @@ +{ + "ACCESSCONTROL-ACTIONS-TEST": { + "actions-test": { + "masterName": "actions-test", + "isStateLevel": true, + "uniqueKeys": [ + "$.id" + ] + } + }, + "ACCESSCONTROL-ROLES": { + "roles": { + "masterName": "roles", + "isStateLevel": true, + "uniqueKeys": [ + "$.code" + ] + } + }, + "ACCESSCONTROL-ROLEACTIONS": { + "roleactions": { + "masterName": "roleactions", + "uniqueKeys": [ + "$.rolecode", + "$.actionid", + "$.tenantid" + ] + } + }, + "ASSET": { + "AssetCategory": { + "masterName": "AssetCategory", + "moduleDefinition": null, + "isStateLevel": true, + "uniqueKeys": [ + "$.id", + "$.tenantId" + ] + }, + "LayerType": { + "masterName": "LayerType", + "moduleDefinition": "null", + "isStateLevel": true, + "uniqueKeys": [ + "$.name", + "$.tenantId" + ] + }, + "Assetconfiguration": { + "masterName": "Assetconfiguration", + "moduleDefinition": "null", + "isStateLevel": true, + "uniqueKeys": [ + "$.keyname", + "$.tenantId" + ] + }, + "ModeOfAcquisition": { + "masterName": "ModeOfAcquisition", + "moduleDefinition": "null", + "isStateLevel": true, + "uniqueKeys": [ + "$.code", + "$.tenantId" + ] + }, + "NewTestMaster": { + "masterName": "NewMaster", + "moduleDefinition": "null", + "isStateLevel": true, + "uniqueKeys": [ + "$.id" + ] + } + }, + "common-masters": { + "IdFormat": { + "masterName": "IdFormat", + "moduleDefinition": null, + "isStateLevel": true, + "uniqueKeys": [ + "$.idname" + ] + }, + "OwnerShipCategory": { + "masterName": "OwnerShipCategory", + "moduleDefinition": null, + "isStateLevel": true, + "uniqueKeys": [ + "$.code" + ] + }, + "OwnerType": { + "masterName": "OwnerType", + "moduleDefinition": null, + "isStateLevel": true, + "uniqueKeys": [ + "$.code" + ] + }, + "UOM": { + "masterName": "UOM", + "moduleDefinition": null, + "isStateLevel": true, + "uniqueKeys": [ + "$.code" + ] + }, + "StructureType": { + "masterName": "StructureType", + "moduleDefinition": null, + "isStateLevel": true, + "uniqueKeys": [ + "$.code" + ] + }, + "DocumentType": { + "masterName": "StructureType", + "moduleDefinition": null, + "isStateLevel": true, + "uniqueKeys": [ + "$.code" + ] + }, + "Department": { + "masterName": "Department", + "moduleDefinition": null, + "isStateLevel": true, + "uniqueKeys": [ + "$.code", + "$.tenantId" + ] + }, + "CensusYear": { + "masterName": "CensusYear", + "moduleDefinition": null, + "isStateLevel": true, + "uniqueKeys": [ + "$.code", + "$.tenantId" + ] + }, + "Designation": { + "masterName": "Designation", + "moduleDefinition": null, + "isStateLevel": true, + "uniqueKeys": [ + "$.code" + ] + } + }, + "egf-master": { + "Fund": { + "masterName": "Fund", + "moduleDefinition": null, + "isStateLevel": true, + "uniqueKeys": [ + "$.code", + "$.tenantId" + ] + }, + "FinancialYear": { + "masterName": "FinancialYear", + "moduleDefinition": null, + "isStateLevel": true, + "uniqueKeys": [ + "$.code", + "$.tenantId" + ] + } + }, + "lcms": { + "court": { + "masterName": "court", + "moduleDefinition": null, + "uniqueKeys": [ + "$.code", + "$.tenantId" + ] + }, + "side": { + "masterName": "side", + "moduleDefinition": null, + "uniqueKeys": [ + "$.code", + "$.tenantId" + ] + }, + "caseType": { + "masterName": "caseType", + "moduleDefinition": null, + "uniqueKeys": [ + "$.code", + "$.tenantId" + ] + }, + "caseCategory": { + "masterName": "caseCategory", + "moduleDefinition": null, + "uniqueKeys": [ + "$.code", + "$.tenantId" + ] + }, + "bench": { + "masterName": "bench", + "moduleDefinition": null, + "uniqueKeys": [ + "$.code", + "$.tenantId" + ] + }, + "caseStatus": { + "masterName": "caseStatus", + "moduleDefinition": null, + "uniqueKeys": [ + "$.code", + "$.tenantId" + ] + } + }, + "swm": { + "VehicleType": { + "masterName": "VehicleType", + "moduleDefinition": null, + "isStateLevel": true, + "uniqueKeys": [ + "$.code", + "$.tenantId" + ] + }, + "FuelType": { + "masterName": "FuelType", + "moduleDefinition": null, + "isStateLevel": true, + "uniqueKeys": [ + "$.code", + "$.tenantId" + ] + }, + "OilCompany": { + "masterName": "OilCompany", + "moduleDefinition": null, + "isStateLevel": true, + "uniqueKeys": [ + "$.code", + "$.tenantId" + ] + }, + "WasteType": { + "masterName": "WasteType", + "moduleDefinition": null, + "isStateLevel": true, + "uniqueKeys": [ + "$.code", + "$.tenantId" + ] + }, + "WasteSubType": { + "masterName": "WasteSubType", + "moduleDefinition": null, + "isStateLevel": true, + "uniqueKeys": [ + "$.code", + "$.tenantId" + ] + }, + "DumpingGround": { + "masterName": "DumpingGround", + "moduleDefinition": null, + "isStateLevel": true, + "uniqueKeys": [ + "$.code", + "$.tenantId" + ] + }, + "ProcessingSite": { + "masterName": "ProcessingSite", + "moduleDefinition": null, + "isStateLevel": true, + "uniqueKeys": [ + "$.code", + "$.tenantId" + ] + }, + "ShiftType": { + "masterName": "ShiftType", + "moduleDefinition": null, + "isStateLevel": true, + "uniqueKeys": [ + "$.code", + "$.tenantId" + ] + }, + "Shift": { + "masterName": "Shift", + "moduleDefinition": null, + "uniqueKeys": [ + "$.code", + "$.tenantId" + ] + }, + "CollectionType": { + "masterName": "CollectionType", + "moduleDefinition": null, + "isStateLevel": true, + "uniqueKeys": [ + "$.code", + "$.tenantId" + ] + }, + "Population": { + "masterName": "Population", + "moduleDefinition": null, + "uniqueKeys": [ + "$.code", + "$.tenantId" + ] + }, + "Toilet": { + "masterName": "Toilet", + "moduleDefinition": null, + "uniqueKeys": [ + "$.code", + "$.tenantId" + ] + }, + "ToiletType": { + "masterName": "ToiletType", + "isStateLevel": true, + "moduleDefinition": null, + "uniqueKeys": [ + "$.code", + "$.tenantId" + ] + }, + "SwmProcess": { + "masterName": "SwmProcess", + "moduleDefinition": null, + "isStateLevel": true, + "uniqueKeys": [ + "$.code", + "$.tenantId" + ] + }, + "PaymentTerms": { + "masterName": "PaymentTerms", + "moduleDefinition": null, + "isStateLevel": true, + "uniqueKeys": [ + "$.label", + "$.tenantId" + ] + } + }, + "PM": { + "KpiCategory": { + "masterName": "KpiCategory", + "moduleDefinition": null, + "isStateLevel": true, + "uniqueKeys": [ + "$.code" + ] + } + }, + "inventory": { + "Material": { + "masterName": "Material", + "isStateLevel": true, + "moduleDefinition": null, + "uniqueKeys": [ + "$.code", + "$.tenantId" + ] + }, + "MaterialType": { + "masterName": "MaterialType", + "isStateLevel": true, + "moduleDefinition": null, + "uniqueKeys": [ + "$.code", + "$.tenantId" + ] + } + }, + "tenant": { + "tenants": { + "masterName": "tenants", + "isStateLevel": true, + "moduleDefinition": null, + "uniqueKeys": [ + "$.code" + ] + }, + "citymodule": { + "masterName": "citymodule", + "isStateLevel": true, + "moduleDefinition": null, + "uniqueKeys": [ + "$.code" + ] + } + }, + "works": { + "ScheduleCategory": { + "masterName": "ScheduleCategory", + "isStateLevel": true, + "moduleDefinition": null, + "uniqueKeys": [ + "$.code", + "$.tenantId" + ] + }, + "TypeOfWork": { + "masterName": "TypeOfWork", + "isStateLevel": true, + "moduleDefinition": null, + "uniqueKeys": [ + "$.code", + "$.tenantId" + ] + }, + "Overhead": { + "masterName": "Overhead", + "isStateLevel": true, + "moduleDefinition": null, + "uniqueKeys": [ + "$.code", + "$.tenantId" + ] + }, + "ContractorClass": { + "masterName": "ContractorClass", + "isStateLevel": true, + "moduleDefinition": null, + "uniqueKeys": [ + "$.class", + "$.tenantId" + ] + }, + "BudgetGroup": { + "masterName": "BudgetGroup", + "isStateLevel": true, + "moduleDefinition": null, + "uniqueKeys": [ + "$.name", + "$.tenantId" + ] + }, + "WorksStatus": { + "masterName": "WorksStatus", + "isStateLevel": true, + "moduleDefinition": null, + "uniqueKeys": [ + "$.code", + "$.tenantId" + ] + } + }, + "RAINMAKER-PGR": { + "ServiceDefs": { + "masterName": "ServiceDefs", + "isStateLevel": true, + "uniqueKeys": [ + "$.code" + ] + } + }, + "PropertyTax": { + "ConstructionType": { + "masterName": "ConstructionType", + "isStateLevel": true, + "uniqueKeys": [ + "$.code" + ] + }, + "ConstructionSubType": { + "masterName": "ConstructionSubType", + "isStateLevel": true, + "uniqueKeys": [ + "$.code" + ] + }, + "FireCess": { + "masterName": "FireCess", + "isStateLevel": false, + "uniqueKeys": [] + }, + "Floor": { + "masterName": "Floor", + "isStateLevel": true, + "uniqueKeys": [ + "$.code" + ] + }, + "Interest": { + "masterName": "Interest", + "isStateLevel": true, + "uniqueKeys": [ + "$.fromFY" + ] + }, + "PropertyType": { + "masterName": "PropertyType", + "isStateLevel": true, + "uniqueKeys": [ + "$.code" + ] + }, + "PropertySubType": { + "masterName": "PropertySubType", + "isStateLevel": true, + "uniqueKeys": [ + "$.code" + ] + }, + "OwnerShipCategory": { + "masterName": "OwnerShipCategory", + "isStateLevel": true, + "uniqueKeys": [ + "$.code" + ] + }, + "OwnerTypeDocument": { + "masterName": "OwnerTypeDocument", + "isStateLevel": true, + "uniqueKeys": [ + "$.code" + ] + }, + "SubOwnerShipCategory": { + "masterName": "SubOwnerShipCategory", + "isStateLevel": true, + "uniqueKeys": [ + "$.code" + ] + }, + "OccupancyType": { + "masterName": "OccupancyType", + "isStateLevel": true, + "uniqueKeys": [ + "$.code" + ] + }, + "UsageCategoryMajor": { + "masterName": "UsageCategoryMajor", + "isStateLevel": true, + "uniqueKeys": [ + "$.code" + ] + }, + "UsageCategoryMinor": { + "masterName": "UsageCategoryMinor", + "isStateLevel": true, + "uniqueKeys": [ + "$.code" + ] + }, + "UsageCategorySubMinor": { + "masterName": "UsageCategorySubMinor", + "isStateLevel": true, + "uniqueKeys": [ + "$.code" + ] + }, + "UsageCategoryDetail": { + "masterName": "UsageCategoryDetail", + "isStateLevel": true, + "uniqueKeys": [ + "$.code" + ] + }, + "OwnerType": { + "masterName": "OwnerType", + "isStateLevel": true, + "uniqueKeys": [ + "$.code" + ] + }, + "Rebate": { + "masterName": "Rebate", + "isStateLevel": true, + "uniqueKeys": [ + "$.fromFY" + ] + }, + "Penalty": { + "masterName": "Penalty", + "isStateLevel": true, + "uniqueKeys": [ + "$.fromFY" + ] + }, + "CancerCess": { + "masterName": "CancerCess", + "isStateLevel": true, + "uniqueKeys": [] + } + }, + "TradeLicense": { + "ApplicationType": { + "masterName": "ApplicationType", + "isStateLevel": true, + "uniqueKeys": [ + "$.code" + ] + }, + "TradeType": { + "masterName": "TradeType", + "isStateLevel": true, + "uniqueKeys": [ + "$.code" + ] + }, + "AccessoriesCategory": { + "masterName": "AccessoriesCategory", + "isStateLevel": true, + "uniqueKeys": [ + "$.code" + ] + } + }, + "egov-hrms": { + "EmployeeStatus": { + "masterName": "EmployeeStatus", + "isStateLevel": true, + "uniqueKeys": [ + "$.code" + ] + }, + "EmployeeType": { + "masterName": "EmployeeType", + "isStateLevel": true, + "uniqueKeys": [ + "$.code" + ] + }, + "Degree": { + "masterName": "Degree", + "isStateLevel": true, + "uniqueKeys": [ + "$.code" + ] + }, + "Specalization": { + "masterName": "Specalization", + "isStateLevel": true, + "uniqueKeys": [ + "$.code" + ] + }, + "DeactivationReason": { + "masterName": "DeactivationReason", + "isStateLevel": true, + "uniqueKeys": [ + "$.code" + ] + }, + "EmploymentTest": { + "masterName": "EmploymentTest", + "isStateLevel": true, + "uniqueKeys": [ + "$.code" + ] + } + }, + "BillingService": { + "BusinessService": { + "masterName": "BusinessService", + "isStateLevel": true, + "uniqueKeys": [] + }, + "TaxHeadMaster": { + "masterName": "TaxHeadMaster", + "isStateLevel": true, + "uniqueKeys": [] + }, + "TaxPeriod": { + "masterName": "TaxPeriod", + "isStateLevel": true, + "uniqueKeys": [] + } + }, + "FinanceModule": { + "BusinessServiceMapping": { + "masterName": "BusinessServiceMapping", + "isStateLevel": true, + "uniqueKeys": [ + "$.code" + ] + }, + "TaxHeadMasterGlCodeMapping": { + "masterName": "TaxHeadMasterGlCodeMapping", + "isStateLevel": true, + "uniqueKeys": [ + "$.billingservicecode", + "$.taxhead" + ] + }, + "InstrumentGLcodeMapping": { + "masterName": "InstrumentGLcodeMapping", + "isStateLevel": true, + "uniqueKeys": [ + "$.instrumenttype" + ] + }, + "FinanceInstrumentStatusMapping": { + "masterName": "FinanceInstrumentStatusMapping", + "isStateLevel": true, + "uniqueKeys": [ + "$.code" + ] + } + } +} diff --git a/configs/egov-persister/apportion-persister.yml b/configs/egov-persister/apportion-persister.yml new file mode 100644 index 00000000..43f29b85 --- /dev/null +++ b/configs/egov-persister/apportion-persister.yml @@ -0,0 +1,81 @@ +serviceMaps: + serviceName: apportion-services + mappings: + - version: 1.0 + description: Persists apportioning request + fromTopic: save-apportion-request + 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 + + - jsonPath: $.Bills.*.tenantId + + - jsonPath: $.Bills.*.mobileNumber + + - jsonPath: $.Bills.*.payerName + + - jsonPath: $.Bills.*.payerAddress + + - jsonPath: $.Bills.*.payerEmail + + - jsonPath: $.Bills.*.paidBy + + - jsonPath: $.Bills.*.taxAndPayments + type: JSON + dbType: JSONB + + - jsonPath: $.Bills.*.isActive + + - jsonPath: $.Bills.*.isCancelled + + - jsonPath: $.Bills.*.billDetails + type: JSON + dbType: JSONB + + - jsonPath: $.Bills.*.auditDetails.createdBy + + - jsonPath: $.Bills.*.auditDetails.createdTime + + + - version: 1.0 + description: Persists apportioning response + fromTopic: save-apportion-response + isTransaction: true + 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 + + - jsonPath: $.Bills.*.tenantId + + - jsonPath: $.Bills.*.mobileNumber + + - jsonPath: $.Bills.*.payerName + + - jsonPath: $.Bills.*.payerAddress + + - jsonPath: $.Bills.*.payerEmail + + - jsonPath: $.Bills.*.paidBy + + - jsonPath: $.Bills.*.taxAndPayments + type: JSON + dbType: JSONB + + - jsonPath: $.Bills.*.isActive + + - jsonPath: $.Bills.*.isCancelled + + - jsonPath: $.Bills.*.billDetails + type: JSON + dbType: JSONB + + - jsonPath: $.Bills.*.auditDetails.createdBy + + - jsonPath: $.Bills.*.auditDetails.createdTime diff --git a/configs/egov-persister/assessment-persister-migration-temp.yml b/configs/egov-persister/assessment-persister-migration-temp.yml new file mode 100644 index 00000000..7137529d --- /dev/null +++ b/configs/egov-persister/assessment-persister-migration-temp.yml @@ -0,0 +1,226 @@ +serviceMaps: + serviceName: property-services + mappings: + - version: 1.0 + description: Persists assessment details to eg_pt_asmt_assessment table + fromTopic: save-pt-assessment-batch + isTransaction: true + queryMaps: + + - query: INSERT INTO eg_pt_asmt_assessment(id, tenantid, assessmentnumber, financialyear, propertyid, status, source, channel, assessmentdate, additionaldetails, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: Assessment + jsonMaps: + + - jsonPath: $.Assessment.id + + - jsonPath: $.Assessment.tenantId + + - jsonPath: $.Assessment.assessmentNumber + + - jsonPath: $.Assessment.financialYear + + - jsonPath: $.Assessment.propertyId + + - jsonPath: $.Assessment.status + + - jsonPath: $.Assessment.source + + - jsonPath: $.Assessment.channel + + - jsonPath: $.Assessment.assessmentDate + + - jsonPath: $.Assessment.additionalDetails + type: JSON + dbType: JSONB + + - jsonPath: $.Assessment.auditDetails.createdBy + + - jsonPath: $.Assessment.auditDetails.createdTime + + - jsonPath: $.Assessment.auditDetails.lastModifiedBy + + - jsonPath: $.Assessment.auditDetails.lastModifiedTime + + + + - query: INSERT INTO eg_pt_asmt_unitusage (tenantid, id, assessmentid, unitid, usagecategory, occupancytype, occupancydate, active, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: Assessment.unitUsageList.* + jsonMaps: + + - jsonPath: $.Assessment.unitUsageList.*.tenantId + + - jsonPath: $.Assessment.unitUsageList.*.id + + - jsonPath: $.Assessment[?({id} in @.unitUsageList[*].id)].id + + - jsonPath: $.Assessment.unitUsageList.*.unitId + + - jsonPath: $.Assessment.unitUsageList.*.usageCategory + + - jsonPath: $.Assessment.unitUsageList.*.occupancyType + + - jsonPath: $.Assessment.unitUsageList.*.occupancyDate + + - jsonPath: $.Assessment.unitUsageList.*.active + + - jsonPath: $.Assessment.unitUsageList.*.auditDetails.createdBy + + - jsonPath: $.Assessment.unitUsageList.*.auditDetails.createdTime + + - jsonPath: $.Assessment.unitUsageList.*.auditDetails.lastModifiedBy + + - jsonPath: $.Assessment.unitUsageList.*.auditDetails.lastModifiedTime + + + + - query: INSERT INTO eg_pt_asmt_document (id, tenantid, entityid, documenttype, filestoreid, documentuid, status, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: $.Assessment.documents.* + jsonMaps: + + - jsonPath: $.Assessment.documents.*.id + + - jsonPath: $.Assessment.tenantId + + - jsonPath: $.Assessment.id + + - jsonPath: $.Assessment.documents.*.documentType + + - jsonPath: $.Assessment.documents.*.fileStoreId + + - jsonPath: $.Assessment.documents.*.documentUid + + - jsonPath: $.Assessment.documents.*.status + + - jsonPath: $.Assessment.documents.*.auditDetails.createdBy + + - jsonPath: $.Assessment.documents.*.auditDetails.lastModifiedBy + + - jsonPath: $.Assessment.documents.*.auditDetails.createdTime + + - jsonPath: $.Assessment.documents.*.auditDetails.lastModifiedTime + + + + - version: 1.0 + description: Updates assessment details to eg_pt_asmt_assessment table + fromTopic: update-pt-assessment + isTransaction: true + queryMaps: + + - query: INSERT INTO eg_pt_asmt_assessment_audit SELECT *, (SELECT extract(epoch from now())) FROM eg_pt_asmt_assessment WHERE id = ?; + basePath: Assessment + jsonMaps: + + - jsonPath: $.Assessment.id + + + - query: INSERT INTO eg_pt_asmt_unitusage_audit SELECT *, (SELECT extract(epoch from now())) FROM eg_pt_asmt_unitusage WHERE id = ?; + basePath: Assessment.unitUsageList.* + jsonMaps: + + - jsonPath: $.Assessment.unitUsageList.*.id + + + - query: UPDATE eg_pt_asmt_assessment SET financialyear = ?, status = ?, source = ?, assessmentDate = ?, additionaldetails = ?, lastmodifiedby = ?, lastmodifiedtime = ? WHERE id = ?; + basePath: Assessment + jsonMaps: + + - jsonPath: $.Assessment.financialYear + + - jsonPath: $.Assessment.status + + - jsonPath: $.Assessment.source + + - jsonPath: $.Assessment.assessmentDate + + - jsonPath: $.Assessment.additionalDetails + type: JSON + dbType: JSONB + + - jsonPath: $.Assessment.auditDetails.lastModifiedBy + + - jsonPath: $.Assessment.auditDetails.lastModifiedTime + + - jsonPath: $.Assessment.id + + + + + - query: INSERT INTO eg_pt_asmt_unitusage (tenantid, id, assessmentId, unitid, usageCategory, occupancyType, occupancyDate, active, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET usageCategory = ?, occupancyType = ?, occupancyDate = ?, active = ?, lastmodifiedby = ?, lastmodifiedtime = ?; + basePath: Assessment.unitUsageList.* + jsonMaps: + + - jsonPath: $.Assessment.unitUsageList.*.tenantId + + - jsonPath: $.Assessment.unitUsageList.*.id + + - jsonPath: $.Assessment[?({id} in @.unitUsageList[*].id)].id + + - jsonPath: $.Assessment.unitUsageList.*.unitId + + - jsonPath: $.Assessment.unitUsageList.*.usageCategory + + - jsonPath: $.Assessment.unitUsageList.*.occupancyType + + - jsonPath: $.Assessment.unitUsageList.*.occupancyDate + + - jsonPath: $.Assessment.unitUsageList.*.active + + - jsonPath: $.Assessment.unitUsageList.*.auditDetails.createdBy + + - jsonPath: $.Assessment.unitUsageList.*.auditDetails.createdTime + + - jsonPath: $.Assessment.unitUsageList.*.auditDetails.lastModifiedBy + + - jsonPath: $.Assessment.unitUsageList.*.auditDetails.lastModifiedTime + + - jsonPath: $.Assessment.unitUsageList.*.usageCategory + + - jsonPath: $.Assessment.unitUsageList.*.occupancyType + + - jsonPath: $.Assessment.unitUsageList.*.occupancyDate + + - jsonPath: $.Assessment.unitUsageList.*.active + + - jsonPath: $.Assessment.unitUsageList.*.auditDetails.lastModifiedBy + + - jsonPath: $.Assessment.unitUsageList.*.auditDetails.lastModifiedTime + + + + + - query: INSERT INTO eg_pt_asmt_document (id, tenantid, entityid, documenttype, filestoreid, documentuid, status, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE documenttype = ?, documentuid = ?, status = ?, lastmodifiedby = ?, lastmodifiedtime = ?; + basePath: $.Assessment.documents.* + jsonMaps: + + - jsonPath: $.Assessment.documents.*.id + + - jsonPath: $.Assessment.tenantId + + - jsonPath: $.Assessment.id + + - jsonPath: $.Assessment.documents.*.documentType + + - jsonPath: $.Assessment.documents.*.fileStoreId + + - jsonPath: $.Assessment.documents.*.documentUid + + - jsonPath: $.Assessment.documents.*.status + + - jsonPath: $.Assessment.documents.*.auditDetails.createdBy + + - jsonPath: $.Assessment.documents.*.auditDetails.lastModifiedBy + + - jsonPath: $.Assessment.documents.*.auditDetails.createdTime + + - jsonPath: $.Assessment.documents.*.auditDetails.lastModifiedTime + + - jsonPath: $.Assessment.documents.*.documentType + + - jsonPath: $.Assessment.documents.*.documentUid + + - jsonPath: $.Assessment.documents.*.status + + - jsonPath: $.Assessment.documents.*.auditDetails.lastModifiedBy + + - jsonPath: $.Assessment.documents.*.auditDetails.lastModifiedTime \ No newline at end of file diff --git a/configs/egov-persister/assessment-persister.yml b/configs/egov-persister/assessment-persister.yml new file mode 100644 index 00000000..677f54ac --- /dev/null +++ b/configs/egov-persister/assessment-persister.yml @@ -0,0 +1,228 @@ +serviceMaps: + serviceName: property-services + mappings: + - version: 1.0 + description: Persists assessment details to eg_pt_asmt_assessment table + fromTopic: save-pt-assessment + isTransaction: true + queryMaps: + + - query: INSERT INTO eg_pt_asmt_assessment(id, tenantid, assessmentnumber, financialyear, propertyid, status, source, channel, assessmentdate, additionaldetails, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: Assessment + jsonMaps: + + - jsonPath: $.Assessment.id + + - jsonPath: $.Assessment.tenantId + + - jsonPath: $.Assessment.assessmentNumber + + - jsonPath: $.Assessment.financialYear + + - jsonPath: $.Assessment.propertyId + + - jsonPath: $.Assessment.status + + - jsonPath: $.Assessment.source + + - jsonPath: $.Assessment.channel + + - jsonPath: $.Assessment.assessmentDate + + - jsonPath: $.Assessment.additionalDetails + type: JSON + dbType: JSONB + + - jsonPath: $.Assessment.auditDetails.createdBy + + - jsonPath: $.Assessment.auditDetails.createdTime + + - jsonPath: $.Assessment.auditDetails.lastModifiedBy + + - jsonPath: $.Assessment.auditDetails.lastModifiedTime + + + + - query: INSERT INTO eg_pt_asmt_unitusage (tenantid, id, assessmentid, unitid, usagecategory, occupancytype, occupancydate, active, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: Assessment.unitUsageList.* + jsonMaps: + + - jsonPath: $.Assessment.unitUsageList.*.tenantId + + - jsonPath: $.Assessment.unitUsageList.*.id + + - jsonPath: $.Assessment[?({id} in @.unitUsageList[*].id)].id + + - jsonPath: $.Assessment.unitUsageList.*.unitId + + - jsonPath: $.Assessment.unitUsageList.*.usageCategory + + - jsonPath: $.Assessment.unitUsageList.*.occupancyType + + - jsonPath: $.Assessment.unitUsageList.*.occupancyDate + + - jsonPath: $.Assessment.unitUsageList.*.active + + - jsonPath: $.Assessment.unitUsageList.*.auditDetails.createdBy + + - jsonPath: $.Assessment.unitUsageList.*.auditDetails.createdTime + + - jsonPath: $.Assessment.unitUsageList.*.auditDetails.lastModifiedBy + + - jsonPath: $.Assessment.unitUsageList.*.auditDetails.lastModifiedTime + + + + - query: INSERT INTO eg_pt_asmt_document (id, tenantid, entityid, documenttype, filestoreid, documentuid, status, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: $.Assessment.documents.* + jsonMaps: + + - jsonPath: $.Assessment.documents.*.id + + - jsonPath: $.Assessment.tenantId + + - jsonPath: $.Assessment.id + + - jsonPath: $.Assessment.documents.*.documentType + + - jsonPath: $.Assessment.documents.*.fileStoreId + + - jsonPath: $.Assessment.documents.*.documentUid + + - jsonPath: $.Assessment.documents.*.status + + - jsonPath: $.Assessment.documents.*.auditDetails.createdBy + + - jsonPath: $.Assessment.documents.*.auditDetails.lastModifiedBy + + - jsonPath: $.Assessment.documents.*.auditDetails.createdTime + + - jsonPath: $.Assessment.documents.*.auditDetails.lastModifiedTime + + + + - version: 1.0 + description: Updates assessment details to eg_pt_asmt_assessment table + fromTopic: update-pt-assessment + isTransaction: true + queryMaps: + + - query: INSERT INTO eg_pt_asmt_assessment_audit SELECT *, (SELECT extract(epoch from now())) FROM eg_pt_asmt_assessment WHERE id = ?; + basePath: Assessment + jsonMaps: + + - jsonPath: $.Assessment.id + + + - query: INSERT INTO eg_pt_asmt_unitusage_audit SELECT *, (SELECT extract(epoch from now())) FROM eg_pt_asmt_unitusage WHERE id = ?; + basePath: Assessment.unitUsageList.* + jsonMaps: + + - jsonPath: $.Assessment.unitUsageList.*.id + + + - query: UPDATE eg_pt_asmt_assessment SET financialyear = ?, status = ?, source = ?, assessmentDate = ?, additionaldetails = ?, lastmodifiedby = ?, lastmodifiedtime = ? WHERE id = ?; + basePath: Assessment + jsonMaps: + + - jsonPath: $.Assessment.financialYear + + - jsonPath: $.Assessment.status + + - jsonPath: $.Assessment.source + + - jsonPath: $.Assessment.assessmentDate + + - jsonPath: $.Assessment.additionalDetails + type: JSON + dbType: JSONB + + - jsonPath: $.Assessment.auditDetails.lastModifiedBy + + - jsonPath: $.Assessment.auditDetails.lastModifiedTime + + - jsonPath: $.Assessment.id + + + + + - query: INSERT INTO eg_pt_asmt_unitusage (tenantid, id, assessmentId, unitid, usageCategory, occupancyType, occupancyDate, active, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET usageCategory = ?, occupancyType = ?, occupancyDate = ?, active = ?, lastmodifiedby = ?, lastmodifiedtime = ?; + basePath: Assessment.unitUsageList.* + jsonMaps: + + - jsonPath: $.Assessment.unitUsageList.*.tenantId + + - jsonPath: $.Assessment.unitUsageList.*.id + + - jsonPath: $.Assessment[?({id} in @.unitUsageList[*].id)].id + + - jsonPath: $.Assessment.unitUsageList.*.unitId + + - jsonPath: $.Assessment.unitUsageList.*.usageCategory + + - jsonPath: $.Assessment.unitUsageList.*.occupancyType + + - jsonPath: $.Assessment.unitUsageList.*.occupancyDate + + - jsonPath: $.Assessment.unitUsageList.*.active + + - jsonPath: $.Assessment.unitUsageList.*.auditDetails.createdBy + + - jsonPath: $.Assessment.unitUsageList.*.auditDetails.createdTime + + - jsonPath: $.Assessment.unitUsageList.*.auditDetails.lastModifiedBy + + - jsonPath: $.Assessment.unitUsageList.*.auditDetails.lastModifiedTime + + - jsonPath: $.Assessment.unitUsageList.*.usageCategory + + - jsonPath: $.Assessment.unitUsageList.*.occupancyType + + - jsonPath: $.Assessment.unitUsageList.*.occupancyDate + + - jsonPath: $.Assessment.unitUsageList.*.active + + - jsonPath: $.Assessment.unitUsageList.*.auditDetails.lastModifiedBy + + - jsonPath: $.Assessment.unitUsageList.*.auditDetails.lastModifiedTime + + + + + - query: INSERT INTO eg_pt_asmt_document (id, tenantid, entityid, documenttype, filestoreid, documentuid, status, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE documenttype = ?, documentuid = ?, status = ?, lastmodifiedby = ?, lastmodifiedtime = ?; + basePath: $.Assessment.documents.* + jsonMaps: + + - jsonPath: $.Assessment.documents.*.id + + - jsonPath: $.Assessment.tenantId + + - jsonPath: $.Assessment.id + + - jsonPath: $.Assessment.documents.*.documentType + + - jsonPath: $.Assessment.documents.*.fileStoreId + + - jsonPath: $.Assessment.documents.*.documentUid + + - jsonPath: $.Assessment.documents.*.status + + - jsonPath: $.Assessment.documents.*.auditDetails.createdBy + + - jsonPath: $.Assessment.documents.*.auditDetails.lastModifiedBy + + - jsonPath: $.Assessment.documents.*.auditDetails.createdTime + + - jsonPath: $.Assessment.documents.*.auditDetails.lastModifiedTime + + - jsonPath: $.Assessment.documents.*.documentType + + - jsonPath: $.Assessment.documents.*.documentUid + + - jsonPath: $.Assessment.documents.*.status + + - jsonPath: $.Assessment.documents.*.auditDetails.lastModifiedBy + + - jsonPath: $.Assessment.documents.*.auditDetails.lastModifiedTime + + diff --git a/configs/egov-persister/billing-services-persist.yml b/configs/egov-persister/billing-services-persist.yml new file mode 100644 index 00000000..f720d59e --- /dev/null +++ b/configs/egov-persister/billing-services-persist.yml @@ -0,0 +1,274 @@ +serviceMaps: + serviceName: User Service + mappings: + - version: 1.0 + name: bill create + description: create bill in egbs_bill + fromTopic: save-bill-db + queryMaps: + - query: INSERT into egbs_bill (id, tenantid, payeename, payeeaddress, payeeemail, isactive, iscancelled, createdby, createddate, lastmodifiedby, lastmodifieddate) values(?,?,?,?,?,?,?,?,?,?,?) + basePath: $.Bills.* + jsonMaps: + + - jsonPath: $.Bills.*.id + + - jsonPath: $.Bills.*.tenantId + + - jsonPath: $.Bills.*.payeeName + + - jsonPath: $.Bills.*.payeeAddress + + - jsonPath: $.Bills.*.payeeEmail + + - jsonPath: $.Bills.*.isActive + type: BOOLEAN + + - jsonPath: $.Bills.*.isCancelled + type: BOOLEAN + + - jsonPath: $.RequestInfo.userInfo.id + type: LONG + + - type: CURRENTDATE + dbType: LONG + + - jsonPath: $.RequestInfo.userInfo.id + + - type: CURRENTDATE + dbType: LONG + + - query: INSERT into egbs_billdetail (id, tenantid, billid, businessservice, billno, billdate, consumercode, consumertype, billdescription, displaymessage, minimumamount, totalamount, callbackforapportioning, partpaymentallowed, collectionmodesnotallowed, createdby, createddate, lastmodifiedby, lastmodifieddate) values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?); + basePath: $.Bills.*.billDetails.* + jsonMaps: + - jsonPath: $.Bills.*.billDetails.*.id + + - jsonPath: $.Bills.*.billDetails.*.tenantId + + - jsonPath: $.Bills[?({id} in @.billDetails[*].id)].id + + - jsonPath: $.Bills.*.billDetails.*.businessService + type: DOUBLE + + - jsonPath: $.Bills.*.billDetails.*.billNumber + type: DOUBLE + + - jsonPath: $.Bills.*.billDetails.*.billDate + type: LONG + + - jsonPath: $.Bills.*.billDetails.*.consumerCode + + - jsonPath: $.Bills.*.billDetails.*.consumerType + + - jsonPath: $.Bills.*.billDetails.*.billDescription + + - jsonPath: $.Bills.*.billDetails.*.displayMessage + + - jsonPath: $.Bills.*.billDetails.*.minimumAmount + type: DOUBLE + + - jsonPath: $.Bills.*.billDetails.*.totalAmount + type: DOUBLE + + - jsonPath: $.Bills.*.billDetails.*.callBackForApportioning + type: BOOLEAN + + - jsonPath: $.Bills.*.billDetails.*.partPaymentAllowed + type: BOOLEAN + + - jsonPath: $.Bills.*.billDetails.*.collectionModesNotAllowed + type: ARRAY + dbType: STRING + + - jsonPath: $.RequestInfo.userInfo.id + type: LONG + + - type: CURRENTDATE + dbType: LONG + + - jsonPath: $.RequestInfo.userInfo.id + + - type: CURRENTDATE + dbType: LONG + + - query: INSERT into egbs_billaccountdetail(id, tenantid, billdetail, glcode, orderno, accountdescription, cramounttobepaid, creditamount, debitamount, isactualdemand, purpose, createdby, createddate, lastmodifiedby, lastmodifieddate) values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?); + basePath: $.Bills.*.billDetails.*.billAccountDetails.* + jsonMaps: + - jsonPath: $.Bills.*.billDetails.*.billAccountDetails.*.id + + - jsonPath: $.Bills.*.billDetails.*.billAccountDetails.*.tenantId + + - jsonPath: $.Bills[*].billDetails[?({id} in @.billAccountDetails[*].id)].id + + - jsonPath: $.Bills.*.billDetails.*.billAccountDetails.*.glcode + + - jsonPath: $.Bills.*.billDetails.*.billAccountDetails.*.order + type: INT + + - jsonPath: $.Bills.*.billDetails.*.billAccountDetails.*.accountDescription + + - jsonPath: $.Bills.*.billDetails.*.billAccountDetails.*.crAmountToBePaid + type: DOUBLE + + - jsonPath: $.Bills.*.billDetails.*.billAccountDetails.*.creditAmount + type: DOUBLE + + - jsonPath: $.Bills.*.billDetails.*.billAccountDetails.*.debitAmount + type: DOUBLE + + - jsonPath: $.Bills.*.billDetails.*.billAccountDetails.*.isActualDemand + type: BOOLEAN + + - jsonPath: $.Bills.*.billDetails.*.billAccountDetails.*.purpose + + - jsonPath: $.RequestInfo.userInfo.id + type: LONG + + - type: CURRENTDATE + dbType: LONG + + - jsonPath: $.RequestInfo.userInfo.id + + - type: CURRENTDATE + dbType: LONG + + - version: 1.0 + name: demand create + description: create demand in egbs_demand + fromTopic: save-demand + isTransaction: true + queryMaps: + - query: INSERT INTO egbs_demand (id,consumerCode,consumerType,businessService,owner,taxPeriodFrom,taxPeriodTo,minimumAmountPayable,createdby,lastModifiedby,createdtime,lastModifiedtime,tenantid) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?); + basePath: $.Demands.* + jsonMaps: + + - jsonPath: $.Demands.*.id + type: STRING + + - jsonPath: $.Demands.*.consumerCode + type: STRING + + - jsonPath: $.Demands.*.consumerType + type: STRING + + - jsonPath: $.Demands.*.businessService + type: STRING + + - jsonPath: $.Demands.*.owner.id + type: STRING + + - jsonPath: $.Demands.*.taxPeriodFrom + type: LONG + + - jsonPath: $.Demands.*.taxPeriodTo + type: LONG + + - jsonPath: $.Demands.*.minimumAmountPayable + type: DOUBLE + + - jsonPath: $.Demands.*.auditDetail.createdBy + type: STRING + + - jsonPath: $.Demands.*.auditDetail.lastModifiedBy + type: STRING + + - jsonPath: $.Demands.*.auditDetail.createdTime + type: LONG + + - jsonPath: $.Demands.*.auditDetail.lastModifiedTime + type: LONG + + - jsonPath: $.Demands.*.tenantId + type: STRING + + - query: INSERT INTO egbs_demanddetail (id,demandid,taxHeadCode,taxamount,collectionamount,createdby,lastModifiedby,createdtime,lastModifiedtime,tenantid) VALUES (?,?,?,?,?,?,?,?,?,?); + basePath: $.Demands.*.demandDetails.* + jsonMaps: + - jsonPath: $.Demands.*.demandDetails.*.id + type: STRING + + - jsonPath: $.Demands.*.demandDetails.*.demandId + type: STRING + + - jsonPath: $.Demands.*.demandDetails.*.taxHeadMasterCode + type: STRING + + - jsonPath: $.Demands.*.demandDetails.*.taxAmount + type: DOUBLE + + - jsonPath: $.Demands.*.demandDetails.*.collectionAmount + type: DOUBLE + + - jsonPath: $.Demands.*.demandDetails.*.auditDetail.createdBy + type: STRING + + - jsonPath: $.Demands.*.demandDetails.*.auditDetail.lastModifiedBy + type: STRING + + - jsonPath: $.Demands.*.demandDetails.*.auditDetail.createdTime + type: LONG + + - jsonPath: $.Demands.*.demandDetails.*.auditDetail.lastModifiedTime + type: LONG + + - jsonPath: $.Demands.*.demandDetails.*.tenantId + type: STRING + + + - version: 1.0 + name: demand update + description: update demand in egbs_demand + fromTopic: update-demand + isTransaction: true + queryMaps: + - query: UPDATE egbs_demand SET consumerCode=?,consumerType=?,businessService=?,owner=?,taxPeriodFrom=?,taxPeriodTo=?,minimumAmountPayable=?,lastModifiedby=?,lastModifiedtime=? WHERE id=? AND tenantid=?; + basePath: $.Demands.* + jsonMaps: + + - jsonPath: $.Demands.*.consumerCode + + - jsonPath: $.Demands.*.consumerType + + - jsonPath: $.Demands.*.businessService + + - jsonPath: $.Demands.*.owner.id + + - jsonPath: $.Demands.*.taxPeriodFrom + type: LONG + + - jsonPath: $.Demands.*.taxPeriodTo + type: LONG + + - jsonPath: $.Demands.*.minimumAmountPayable + type: DOUBLE + + - jsonPath: $.Demands.*.auditDetail.lastModifiedBy + + - jsonPath: $.Demands.*.auditDetail.lastModifiedTime + type: LONG + + - jsonPath: $.Demands.*.id + + - jsonPath: $.Demands.*.tenantId + + - query: UPDATE egbs_demanddetail SET demandid=?,taxHeadCode=?,taxamount=?,collectionamount=?,lastModifiedby=?,lastModifiedtime=? WHERE id=? AND tenantid=?; + basePath: $.Demands.*.demandDetails.* + jsonMaps: + + - jsonPath: $.Demands.*.demandDetails.*.demandId + + - jsonPath: $.Demands.*.demandDetails.*.taxHeadMasterCode + + - jsonPath: $.Demands.*.demandDetails.*.taxAmount + type: DOUBLE + + - jsonPath: $.Demands.*.demandDetails.*.collectionAmount + type: DOUBLE + + - jsonPath: $.Demands.*.demandDetails.*.auditDetail.lastModifiedBy + + - jsonPath: $.Demands.*.demandDetails.*.auditDetail.lastModifiedTime + type: LONG + + - jsonPath: $.Demands.*.demandDetails.*.id + + - jsonPath: $.Demands.*.demandDetails.*.tenantId diff --git a/configs/egov-persister/chatbot.yml b/configs/egov-persister/chatbot.yml new file mode 100644 index 00000000..5cd87288 --- /dev/null +++ b/configs/egov-persister/chatbot.yml @@ -0,0 +1,77 @@ +serviceMaps: + serviceName: Chatbot Persister + mappings: + - version: 1.0 + name: chatbot-persister + description: Insert new conversationState to database + fromTopic: chatbot-conversation-state-insert + isTransaction: true + queryMaps: + - query: INSERT INTO eg_chat_conversation_state (conversation_id, user_id, active, locale) VALUES (?, ?, ?, ?); + basePath: $ + jsonMaps: + + - jsonPath: $.conversationId + + - jsonPath: $.userId + + - jsonPath: $.active + + - jsonPath: $.locale + + - version: 1.0 + name: chatbot-persister + description: Update conversationState + fromTopic: chatbot-conversation-state-update + isTransaction: true + queryMaps: + - query: UPDATE eg_chat_conversation_state SET active_node_id=?, question_details=?, last_modified_time=? WHERE conversation_id=?; + basePath: $ + jsonMaps: + + - jsonPath: $.activeNodeId + + - jsonPath: $.questionDetails + type: JSON + dbType: JSONB + + - jsonPath: $.lastModifiedTime + + - jsonPath: $.conversationId + + - version: 1.0 + name: chatbot-persister + description: Mark conversationState inactive + fromTopic: chatbot-conversation-state-deactivate + isTransaction: true + queryMaps: + - query: UPDATE eg_chat_conversation_state SET active=FALSE WHERE conversation_id=?; + basePath: $ + jsonMaps: + + - jsonPath: $.conversationId + + + - version: 1.0 + name: chatbot-persister + description: Save chatbot message + fromTopic: chatbot-message-insert + isTransaction: true + queryMaps: + - query: INSERT INTO eg_chat_message (message_id, conversation_id, node_id, raw_input, message_content, content_type, is_valid) VALUES (?, ?, ?, ?, ?, ?, ?); + basePath: $ + jsonMaps: + + - jsonPath: $.messageId + + - jsonPath: $.conversationId + + - jsonPath: $.nodeId + + - jsonPath: $.rawInput + + - jsonPath: $.messageContent + + - jsonPath: $.contentType + + - jsonPath: $.valid diff --git a/configs/egov-persister/collection-migration-count.yml b/configs/egov-persister/collection-migration-count.yml new file mode 100644 index 00000000..ce6c394c --- /dev/null +++ b/configs/egov-persister/collection-migration-count.yml @@ -0,0 +1,23 @@ +serviceMaps: + serviceName: collection-services-migration-count + mappings: + - version: 1.0 + description: Persists property details in egcl_payment_migration table + fromTopic: collection-migartion-batch-count + isTransaction: true + queryMaps: + + + - query: INSERT INTO egcl_payment_migration (id,batch,batchsize,createdtime,tenantid,recordCount) VALUES (?,?,?,(SELECT extract(epoch from CURRENT_TIMESTAMP)*1000),?,?); + basePath: MigrationCount + jsonMaps: + + - jsonPath: $.MigrationCount.id + + - jsonPath: $.MigrationCount.offset + + - jsonPath: $.MigrationCount.limit + + - jsonPath: $.MigrationCount.tenantid + + - jsonPath: $.MigrationCount.recordCount \ No newline at end of file diff --git a/configs/egov-persister/collection-migration-persister.yml b/configs/egov-persister/collection-migration-persister.yml new file mode 100644 index 00000000..c1106a59 --- /dev/null +++ b/configs/egov-persister/collection-migration-persister.yml @@ -0,0 +1,240 @@ +serviceMaps: + serviceName: Payment Service + mappings: + - version: 1.0 + name: collection migration + description: Inserting payment details into egcl_payment + fromTopic: egov-collection-migration-batch + queryMaps: + + - query: INSERT into egcl_payment (id, tenantid, totaldue, totalamountpaid, transactionnumber, transactiondate, paymentmode, instrumentdate, instrumentnumber, instrumentstatus, ifsccode, additionaldetails, paidby, mobilenumber, payername, payeraddress, payeremail, payerid, paymentstatus, createdby, createdtime, lastmodifiedby, lastmodifiedtime) values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) + basePath: $.Payments.* + jsonMaps: + - jsonPath: $.Payments.*.id + + - jsonPath: $.Payments.*.tenantId + + - jsonPath: $.Payments.*.totalDue + type: DOUBLE + + - jsonPath: $.Payments.*.totalAmountPaid + type: Double + + - jsonPath: $.Payments.*.transactionNumber + + - jsonPath: $.Payments.*.transactionDate + type: LONG + + - jsonPath: $.Payments.*.paymentMode + + - jsonPath: $.Payments.*.instrumentDate + type: LONG + + - jsonPath: $.Payments.*.instrumentNumber + + - jsonPath: $.Payments.*.instrumentStatus + + - jsonPath: $.Payments.*.ifscCode + + - jsonPath: $.Payments.*.additionalDetails + type: JSON + dbType: JSONB + + - jsonPath: $.Payments.*.paidBy + + - jsonPath: $.Payments.*.mobileNumber + + - jsonPath: $.Payments.*.payerName + + - jsonPath: $.Payments.*.payerAddress + + - jsonPath: $.Payments.*.payerEmail + + - jsonPath: $.Payments.*.payerId + + - jsonPath: $.Payments.*.paymentStatus + + - jsonPath: $.Payments.*.auditDetails.createdBy + + - jsonPath: $.Payments.*.auditDetails.createdTime + type: LONG + + - jsonPath: $.Payments.*.auditDetails.lastModifiedBy + + - jsonPath: $.Payments.*.auditDetails.lastModifiedTime + type: LONG + + + + + - query: INSERT into egcl_paymentdetail (id, tenantid, paymentid, due, amountpaid, receiptnumber, receiptdate, receipttype, businessservice, billid, additionaldetails, createdby, createdtime, lastmodifiedby, lastmodifiedtime, manualreceiptnumber, manualreceiptdate) values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) + basePath: $.Payments.*.paymentDetails.* + jsonMaps: + - jsonPath: $.Payments.*.paymentDetails.*.id + + - jsonPath: $.Payments.*.paymentDetails.*.tenantId + + - jsonPath: $.Payments.*.paymentDetails.*.paymentId + + - jsonPath: $.Payments.*.paymentDetails.*.totalDue + type: DOUBLE + + - jsonPath: $.Payments.*.paymentDetails.*.totalAmountPaid + type: DOUBLE + + - jsonPath: $.Payments.*.paymentDetails.*.receiptNumber + + - jsonPath: $.Payments.*.paymentDetails.*.receiptDate + type: LONG + + - jsonPath: $.Payments.*.paymentDetails.*.receiptType + + - jsonPath: $.Payments.*.paymentDetails.*.businessService + + - jsonPath: $.Payments.*.paymentDetails.*.billId + + - jsonPath: $.Payments.*.paymentDetails.*.additionalDetails + type: JSON + dbType: JSONB + + - jsonPath: $.Payments.*.paymentDetails.*.auditDetails.createdBy + + - jsonPath: $.Payments.*.paymentDetails.*.auditDetails.createdTime + type: LONG + + - jsonPath: $.Payments.*.paymentDetails.*.auditDetails.lastModifiedBy + + - jsonPath: $.Payments.*.paymentDetails.*.auditDetails.lastModifiedTime + type: LONG + + - jsonPath: $.Payments.*.paymentDetails.*.manualReceiptNumber + + - jsonPath: $.Payments.*.paymentDetails.*.manualReceiptDate + type: LONG + + + - query: INSERT into egcl_bill (id, status, iscancelled, additionaldetails, tenantid, collectionmodesnotallowed, partpaymentallowed, isadvanceallowed, minimumamounttobepaid, businessservice, totalamount, consumercode, billnumber, billdate, reasonforcancellation, createdby, createdtime, lastmodifiedby, lastmodifiedtime) values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) + basePath: $.Payments.*.paymentDetails.*.bill + jsonMaps: + - jsonPath: $.Payments.*.paymentDetails.*.bill.id + + - jsonPath: $.Payments.*.paymentDetails.*.bill.status + + - jsonPath: $.Payments.*.paymentDetails.*.bill.isCancelled + type: BOOLEAN + + - jsonPath: $.Payments.*.paymentDetails.*.bill.additionalDetails + type: JSON + dbType: JSONB + + - jsonPath: $.Payments.*.paymentDetails.*.bill.tenantId + + - jsonPath: $.Payments.*.paymentDetails.*.bill.collectionModesNotAllowed[0] + + - jsonPath: $.Payments.*.paymentDetails.*.bill.partPaymentAllowed + type: BOOLEAN + + - jsonPath: $.Payments.*.paymentDetails.*.bill.isAdvanceAllowed + type: BOOLEAN + + - jsonPath: $.Payments.*.paymentDetails.*.bill.minimumAmountToBePaid + type: DOUBLE + + - jsonPath: $.Payments.*.paymentDetails.*.bill.businessService + + - jsonPath: $.Payments.*.paymentDetails.*.bill.totalAmount + type: DOUBLE + + - jsonPath: $.Payments.*.paymentDetails.*.bill.consumerCode + + - jsonPath: $.Payments.*.paymentDetails.*.bill.billNumber + + - jsonPath: $.Payments.*.paymentDetails.*.bill.billDate + type: LONG + + - jsonPath: $.Payments.*.paymentDetails.*.bill.reasonForCancellation + + - jsonPath: $.Payments.*.paymentDetails.*.bill.auditDetails.createdBy + + - jsonPath: $.Payments.*.paymentDetails.*.bill.auditDetails.createdTime + type: LONG + + - jsonPath: $.Payments.*.paymentDetails.*.bill.auditDetails.lastModifiedBy + + - jsonPath: $.Payments.*.paymentDetails.*.bill.auditDetails.lastModifiedTime + type: LONG + + + - query: INSERT into egcl_billdetail (id, tenantid, demandid, billid, amount, amountpaid, fromperiod, toperiod, additionaldetails, channel, voucherheader, boundary, collectiontype, billdescription, expirydate, displaymessage, callbackforapportioning, cancellationremarks) values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) + basePath: $.Payments.*.paymentDetails.*.bill.billDetails.* + jsonMaps: + - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.id + + - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.tenantId + + - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.demandId + + - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.billId + + - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.amount + type: DOUBLE + + - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.amountPaid + type: DOUBLE + + - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.fromPeriod + type: LONG + + - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.toPeriod + type: LONG + + - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.additionalDetails + type: JSON + dbType: JSONB + + - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.channel + + - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.voucherHeader + + - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.boundary + + - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.collectionType + + - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.billDescription + + - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.expiryDate + + - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.displayMessage + + - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.callBackForApportioning + + - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.cancellationRemarks + + + - query: INSERT into egcl_billaccountdetail (id, tenantid, billdetailid, demanddetailid, "order", amount, adjustedamount, isactualdemand, taxheadcode, additionaldetails) values(?,?,?,?,?,?,?,?,?,?) + basePath: $.Payments.*.paymentDetails.*.bill.billDetails.*.billAccountDetails.* + jsonMaps: + - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.billAccountDetails.*.id + + - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.billAccountDetails.*.tenantId + + - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.billAccountDetails.*.billDetailId + + - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.billAccountDetails.*.demandDetailId + + - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.billAccountDetails.*.order + + - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.billAccountDetails.*.amount + type: DOUBLE + + - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.billAccountDetails.*.adjustedAmount + type: DOUBLE + + - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.billAccountDetails.*.isActualDemand + type: BOOLEAN + + - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.billAccountDetails.*.taxHeadCode + + - jsonPath: $.Payments.*.paymentDetails.*.bill.billDetails.*.billAccountDetails.*.additionalDetails + type: JSON + dbType: JSONB \ No newline at end of file diff --git a/configs/egov-persister/echallan.yml b/configs/egov-persister/echallan.yml new file mode 100644 index 00000000..dfe351ce --- /dev/null +++ b/configs/egov-persister/echallan.yml @@ -0,0 +1,122 @@ +serviceMaps: + serviceName: echallan-services + mappings: + - version: 1.0.0 + description: Persists challan details in eg_echallan table + fromTopic: save-challan + isTransaction: true + queryMaps: + + - query: INSERT INTO eg_echallan( id, accountid, tenantid, challanNo, businessService, referenceId, applicationStatus,taxPeriodFrom,taxPeriodTo, additionalDetail, createdby, lastmodifiedby, createdtime, lastmodifiedtime,description,filestoreid) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?,?); + basePath: Challan + jsonMaps: + - jsonPath: $.Challan.id + + - jsonPath: $.Challan.citizen.uuid + + - jsonPath: $.Challan.tenantId + + - jsonPath: $.Challan.challanNo + + - jsonPath: $.Challan.businessService + + - jsonPath: $.Challan.referenceId + + - jsonPath: $.Challan.applicationStatus + + - jsonPath: $.Challan.taxPeriodFrom + + - jsonPath: $.Challan.taxPeriodTo + + - jsonPath: $.Challan.additionalDetail + type: JSON + dbType: JSONB + + - jsonPath: $.Challan.auditDetails.createdBy + + - jsonPath: $.Challan.auditDetails.lastModifiedBy + + - jsonPath: $.Challan.auditDetails.createdTime + + - jsonPath: $.Challan.auditDetails.lastModifiedTime + + - jsonPath: $.Challan.description + + - jsonPath: $.Challan.filestoreid + + - query: INSERT INTO eg_challan_address( id, tenantid, doorno,plotNo,street,buildingName, latitude,longitude,locality, district, landmark,city,pincode, region, state,country, detail, echallanId, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: Challan.address + jsonMaps: + - jsonPath: $.Challan.address.id + + - jsonPath: $.Challan.address.tenantId + + - jsonPath: $.Challan.address.doorNo + + - jsonPath: $.Challan.address.plotNo + + - jsonPath: $.Challan.address.street + + - jsonPath: $.Challan.address.buildingName + + - jsonPath: $.Challan.address.latitude + + - jsonPath: $.Challan.address.longitude + + - jsonPath: $.Challan.address.locality.code + + - jsonPath: $.Challan.address.district + + - jsonPath: $.Challan.address.landmark + + - jsonPath: $.Challan.address.city + + - jsonPath: $.Challan.address.pincode + + - jsonPath: $.Challan.address.region + + - jsonPath: $.Challan.address.state + + - jsonPath: $.Challan.address.country + + - jsonPath: $.Challan.address.detail + + - jsonPath: $.Challan.id + + - jsonPath: $.Challan.auditDetails.createdBy + + - jsonPath: $.Challan.auditDetails.lastModifiedBy + + - jsonPath: $.Challan.auditDetails.createdTime + + - jsonPath: $.Challan.auditDetails.lastModifiedTime + + - version: 1.0.0 + description: Update Challan details in eg_echallan table + fromTopic: update-challan + isTransaction: true + queryMaps: + + - query: UPDATE eg_echallan SET applicationStatus = ?, taxPeriodFrom = ?,taxPeriodTo = ?, lastmodifiedby = ?, lastmodifiedtime = ?,description = ?, additionalDetail = ?, filestoreid = ? WHERE id=?; + basePath: Challan + jsonMaps: + + - jsonPath: $.Challan.applicationStatus + + - jsonPath: $.Challan.taxPeriodFrom + + - jsonPath: $.Challan.taxPeriodTo + + - jsonPath: $.Challan.auditDetails.lastModifiedBy + + - jsonPath: $.Challan.auditDetails.lastModifiedTime + + - jsonPath: $.Challan.description + + - jsonPath: $.Challan.additionalDetail + type: JSON + dbType: JSONB + + - jsonPath: $.Challan.filestoreid + + - jsonPath: $.Challan.id diff --git a/configs/egov-persister/egf-bill.yaml b/configs/egov-persister/egf-bill.yaml new file mode 100644 index 00000000..c8453a0e --- /dev/null +++ b/configs/egov-persister/egf-bill.yaml @@ -0,0 +1,338 @@ +serviceMaps: + serviceName: Financial Bill Service + mappings: + - version: 1.0 + name: bill create + description: create bills in egf_billregister + fromTopic: egf-bill-billregister-save-topic + queryMaps: + - query: INSERT INTO egf_billregister( tenantid, billtype, billsubtype, billnumber, billdate, billamount, passedamount, modulename, status, fund, function, fundsource, scheme, subscheme, functionary, location, department, sourcepath, budgetcheckrequired, budgetappropriationno, partybillnumber, partybilldate, description, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: $.billRegisters.* + jsonMaps: + + - jsonPath: $.billRegisters.*.tenantId + + - jsonPath: $.billRegisters.*.billType + + - jsonPath: $.billRegisters.*.billSubType + + - jsonPath: $.billRegisters.*.billNumber + + - jsonPath: $.billRegisters.*.billDate + dbType: LONG + + - jsonPath: $.billRegisters.*.billAmount + dbType: DOUBLE + + - jsonPath: $.billRegisters.*.passedAmount + dbType: DOUBLE + + - jsonPath: $.billRegisters.*.moduleName + + - jsonPath: $.billRegisters.*.status.code + + - jsonPath: $.billRegisters.*.fund.code + + - jsonPath: $.billRegisters.*.function.code + + - jsonPath: $.billRegisters.*.fundsource.code + + - jsonPath: $.billRegisters.*.scheme.code + + - jsonPath: $.billRegisters.*.subScheme.code + + - jsonPath: $.billRegisters.*.functionary.code + + - jsonPath: $.billRegisters.*.location.code + + - jsonPath: $.billRegisters.*.department.code + + - jsonPath: $.billRegisters.*.sourcePath + + - jsonPath: $.billRegisters.*.budgetCheckRequired + + - jsonPath: $.billRegisters.*.budgetAppropriationNo + + - jsonPath: $.billRegisters.*.partyBillNumber + + - jsonPath: $.billRegisters.*.partyBillDate + dbType: LONG + + - jsonPath: $.billRegisters.*.description + + - jsonPath: $.billRegisters.*.auditDetails.createdBy + + - jsonPath: $.billRegisters.*.auditDetails.lastModifiedBy + + - jsonPath: $.billRegisters.*.auditDetails.createdTime + dbType: LONG + + - jsonPath: $.billRegisters.*.auditDetails.lastModifiedTime + dbType: LONG + + - query: INSERT INTO egf_billdetail(tenantId, id, orderid, chartofaccount, debitamount, creditamount, function, bill, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: $.billRegisters.*.billDetails.* + jsonMaps: + + - jsonPath: $.billRegisters.*.billDetails.*.tenantId + + - jsonPath: $.billRegisters.*.billDetails.*.id + + - jsonPath: $.billRegisters.*.billDetails.*.orderId + dbType: INTEGER + + - jsonPath: $.billRegisters.*.billDetails.*.chartOfAccount.glcode + + - jsonPath: $.billRegisters.*.billDetails.*.debitAmount + dbType: DOUBLE + + - jsonPath: $.billRegisters.*.billDetails.*.creditAmount + dbType: DOUBLE + + - jsonPath: $.billRegisters.*.billDetails.*.function.code + + - jsonPath: $.billRegisters[?({id} in @.billDetails[*].id)].billNumber + + - jsonPath: $.billRegisters.*.billDetails.*.auditDetails.createdBy + + - jsonPath: $.billRegisters.*.billDetails.*.auditDetails.lastModifiedBy + + - jsonPath: $.billRegisters.*.billDetails.*.auditDetails.createdTime + dbType: LONG + + - jsonPath: $.billRegisters.*.billDetails.*.auditDetails.lastModifiedTime + dbType: LONG + + - query: INSERT INTO egf_billpayeedetail(tenantId, id, accountdetailtype, accountdetailkey, amount, billdetail, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: $.billRegisters.*.billDetails.*.billPayeeDetails.* + jsonMaps: + + - jsonPath: $.billRegisters.*.billDetails.*.billPayeeDetails.*.tenantId + + - jsonPath: $.billRegisters.*.billDetails.*.billPayeeDetails.*.id + + - jsonPath: $.billRegisters.*.billDetails.*.billPayeeDetails.*.accountDetailType.id + + - jsonPath: $.billRegisters.*.billDetails.*.billPayeeDetails.*.accountDetailKey.id + + - jsonPath: $.billRegisters.*.billDetails.*.billPayeeDetails.*.amount + dbType: DOUBLE + + - jsonPath: $.billRegisters.*.billDetails[?({id} in @.billPayeeDetails[*].id)].id + + - jsonPath: $.billRegisters.*.billDetails.*.billPayeeDetails.*.auditDetails.createdBy + + - jsonPath: $.billRegisters.*.billDetails.*.billPayeeDetails.*.auditDetails.lastModifiedBy + + - jsonPath: $.billRegisters.*.billDetails.*.billPayeeDetails.*.auditDetails.createdTime + dbType: LONG + + - jsonPath: $.billRegisters.*.billDetails.*.billPayeeDetails.*.auditDetails.lastModifiedTime + dbType: LONG + + - query: INSERT INTO egf_billchecklist(tenantId, id, bill, checklist, checklistvalue, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: $.billRegisters.*.checkLists.* + jsonMaps: + + - jsonPath: $.billRegisters.*.checkLists.*.tenantId + + - jsonPath: $.billRegisters.*.checkLists.*.id + + - jsonPath: $.billRegisters[?({id} in @.checkLists[*].id)].billNumber + + - jsonPath: $.billRegisters.*.checkLists.*.checklist.code + + - jsonPath: $.billRegisters.*.checkLists.*.checklistValue + + - jsonPath: $.billRegisters.*.checkLists.*.auditDetails.createdBy + + - jsonPath: $.billRegisters.*.checkLists.*.auditDetails.lastModifiedBy + + - jsonPath: $.billRegisters.*.checkLists.*.auditDetails.createdTime + dbType: LONG + + - jsonPath: $.billRegisters.*.checkLists.*.auditDetails.lastModifiedTime + dbType: LONG + + + - version: 1.0 + name: bill update + description: update bills in egf_billregister + fromTopic: egf-bill-billregister-update-topic + queryMaps: + - query: update egf_billregister set billtype=? , billsubtype=? , billdate=? , billamount=? , passedamount=? , modulename=? , status=? , fund=? , function=? , fundsource=? , scheme=? , subscheme=? , functionary=? , location=? , department=? , sourcepath=? , budgetcheckrequired=? , budgetappropriationno=? , partybillnumber=? , partybilldate=? , description=? ,lastmodifiedby=? , lastmodifiedtime=? where tenantId=? and billNumber=?; + basePath: $.billRegisters.* + jsonMaps: + + - jsonPath: $.billRegisters.*.billType + + - jsonPath: $.billRegisters.*.billSubType + + - jsonPath: $.billRegisters.*.billDate + dbType: LONG + + - jsonPath: $.billRegisters.*.billAmount + dbType: DOUBLE + + - jsonPath: $.billRegisters.*.passedAmount + dbType: DOUBLE + + - jsonPath: $.billRegisters.*.moduleName + + - jsonPath: $.billRegisters.*.status.code + + - jsonPath: $.billRegisters.*.fund.code + + - jsonPath: $.billRegisters.*.function.code + + - jsonPath: $.billRegisters.*.fundsource.code + + - jsonPath: $.billRegisters.*.scheme.code + + - jsonPath: $.billRegisters.*.subScheme.code + + - jsonPath: $.billRegisters.*.functionary.code + + - jsonPath: $.billRegisters.*.location.code + + - jsonPath: $.billRegisters.*.department.code + + - jsonPath: $.billRegisters.*.sourcePath + + - jsonPath: $.billRegisters.*.budgetCheckRequired + + - jsonPath: $.billRegisters.*.budgetAppropriationNo + + - jsonPath: $.billRegisters.*.partyBillNumber + + - jsonPath: $.billRegisters.*.partyBillDate + dbType: LONG + + - jsonPath: $.billRegisters.*.description + + - jsonPath: $.billRegisters.*.auditDetails.lastModifiedBy + + - jsonPath: $.billRegisters.*.auditDetails.lastModifiedTime + dbType: LONG + + - jsonPath: $.billRegisters.*.tenantId + + - jsonPath: $.billRegisters.*.billNumber + + - query: INSERT INTO egf_billdetail(tenantId, id, orderid, chartofaccount, debitamount, creditamount, function, bill, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: $.billRegisters.*.billDetails.* + jsonMaps: + + - jsonPath: $.billRegisters.*.billDetails.*.tenantId + + - jsonPath: $.billRegisters.*.billDetails.*.id + + - jsonPath: $.billRegisters.*.billDetails.*.orderId + dbType: INTEGER + + - jsonPath: $.billRegisters.*.billDetails.*.chartOfAccount.glcode + + - jsonPath: $.billRegisters.*.billDetails.*.debitAmount + dbType: DOUBLE + + - jsonPath: $.billRegisters.*.billDetails.*.creditAmount + dbType: DOUBLE + + - jsonPath: $.billRegisters.*.billDetails.*.function.code + + - jsonPath: $.billRegisters[?({id} in @.billDetails[*].id)].billNumber + + - jsonPath: $.billRegisters.*.billDetails.*.auditDetails.createdBy + + - jsonPath: $.billRegisters.*.billDetails.*.auditDetails.lastModifiedBy + + - jsonPath: $.billRegisters.*.billDetails.*.auditDetails.createdTime + dbType: LONG + + - jsonPath: $.billRegisters.*.billDetails.*.auditDetails.lastModifiedTime + dbType: LONG + + - query: INSERT INTO egf_billpayeedetail(tenantId, id, accountdetailtype, accountdetailkey, amount, billdetail, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: $.billRegisters.*.billDetails.*.billPayeeDetails.* + jsonMaps: + + - jsonPath: $.billRegisters.*.billDetails.*.billPayeeDetails.*.tenantId + + - jsonPath: $.billRegisters.*.billDetails.*.billPayeeDetails.*.id + + - jsonPath: $.billRegisters.*.billDetails.*.billPayeeDetails.*.accountDetailType.id + + - jsonPath: $.billRegisters.*.billDetails.*.billPayeeDetails.*.accountDetailKey.id + + - jsonPath: $.billRegisters.*.billDetails.*.billPayeeDetails.*.amount + dbType: DOUBLE + + - jsonPath: $.billRegisters.*.billDetails[?({id} in @.billPayeeDetails[*].id)].id + + - jsonPath: $.billRegisters.*.billDetails.*.billPayeeDetails.*.auditDetails.createdBy + + - jsonPath: $.billRegisters.*.billDetails.*.billPayeeDetails.*.auditDetails.lastModifiedBy + + - jsonPath: $.billRegisters.*.billDetails.*.billPayeeDetails.*.auditDetails.createdTime + dbType: LONG + + - jsonPath: $.billRegisters.*.billDetails.*.billPayeeDetails.*.auditDetails.lastModifiedTime + dbType: LONG + + - version: 1.0 + name: checklist create + description: create checklists in egf_checklist + fromTopic: egf-bill-checklist-save-topic + queryMaps: + - query: INSERT INTO egf_checklist(code, type, subType, key, description, createdby, lastmodifiedby, createdtime, lastmodifiedtime, tenantId) VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: $.checklists.* + jsonMaps: + + - jsonPath: $.checklists.*.code + + - jsonPath: $.checklists.*.type + + - jsonPath: $.checklists.*.subType + + - jsonPath: $.checklists.*.key + + - jsonPath: $.checklists.*.description + + - jsonPath: $.checklists.*.auditDetails.createdBy + + - jsonPath: $.checklists.*.auditDetails.lastModifiedBy + + - jsonPath: $.checklists.*.auditDetails.createdTime + dbType: LONG + + - jsonPath: $.checklists.*.auditDetails.lastModifiedTime + dbType: LONG + + - jsonPath: $.checklists.*.tenantId + + + - version: 1.0 + name: checklist update + description: update checklists in egf_checklist + fromTopic: egf-bill-checklist-update-topic + queryMaps: + - query: update egf_checklist set type=?, subType=?, key=?, description=?, lastmodifiedby=?, lastmodifiedtime=? where code=? and tenantId=?; + basePath: $.checklists.* + jsonMaps: + + - jsonPath: $.checklists.*.type + + - jsonPath: $.checklists.*.subType + + - jsonPath: $.checklists.*.key + + - jsonPath: $.checklists.*.description + + - jsonPath: $.checklists.*.auditDetails.lastModifiedBy + + - jsonPath: $.checklists.*.auditDetails.lastModifiedTime + dbType: LONG + + - jsonPath: $.checklists.*.code + + - jsonPath: $.checklists.*.tenantId diff --git a/configs/egov-persister/egov-user-event-persister.yml b/configs/egov-persister/egov-user-event-persister.yml new file mode 100644 index 00000000..8132b8c8 --- /dev/null +++ b/configs/egov-persister/egov-user-event-persister.yml @@ -0,0 +1,154 @@ +serviceMaps: + serviceName: mSeva Event Notification + mappings: + - version: 1.0 + name: mSeva + description: Persists events into the table + fromTopic: save-user-events + isTransaction: true + queryMaps: + - query: INSERT INTO eg_usrevents_events(tenantid, id, source, eventtype, category, name, postedby, referenceid, description, status, eventdetails, actions, recepient, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + + basePath: events.* + jsonMaps: + + + - jsonPath: $.events.*.tenantId + + - jsonPath: $.events.*.id + + - jsonPath: $.events.*.source + + - jsonPath: $.events.*.eventType + + - jsonPath: $.events.*.eventCategory + + - jsonPath: $.events.*.name + + - jsonPath: $.events.*.postedBy + + - jsonPath: $.events.*.referenceId + + - jsonPath: $.events.*.description + + - jsonPath: $.events.*.status + + - jsonPath: $.events.*.eventDetails + type: JSON + dbType: JSONB + + - jsonPath: $.events.*.actions + type: JSON + dbType: JSONB + + - jsonPath: $.events.*.recepient + type: JSON + dbType: JSONB + + - jsonPath: $.events.*.auditDetails.createdBy + + - jsonPath: $.events.*.auditDetails.createdTime + + - jsonPath: $.events.*.auditDetails.lastModifiedBy + + - jsonPath: $.events.*.auditDetails.lastModifiedTime + + + + - query: INSERT INTO eg_usrevents_recepnt_event_registry(recepient, eventid) VALUES (?, ?); + + basePath: events.*.recepientEventMap.* + jsonMaps: + + + - jsonPath: $.events.*.recepientEventMap.*.recepient + + - jsonPath: $.events.*.recepientEventMap.*.eventId + + + + + + - version: 1.0 + name: mSeva + description: Updates event details in the table + fromTopic: update-user-events + isTransaction: true + queryMaps: + - query: UPDATE eg_usrevents_events SET description = ?, status = ?, name = ?, category = ?, eventdetails = ?, actions = ?, recepient = ? , lastmodifiedby = ?, lastmodifiedtime = ? WHERE id = ?; + + basePath: events.* + jsonMaps: + + - jsonPath: $.events.*.description + + - jsonPath: $.events.*.status + + - jsonPath: $.events.*.name + + - jsonPath: $.events.*.eventCategory + + - jsonPath: $.events.*.eventDetails + type: JSON + dbType: JSONB + + - jsonPath: $.events.*.actions + type: JSON + dbType: JSONB + + - jsonPath: $.events.*.recepient + type: JSON + dbType: JSONB + + - jsonPath: $.events.*.auditDetails.lastModifiedBy + + - jsonPath: $.events.*.auditDetails.lastModifiedTime + + - jsonPath: $.events.*.id + + + + - query: DELETE FROM eg_usrevents_recepnt_event_registry WHERE eventid = ?; + + basePath: events.* + jsonMaps: + + - jsonPath: $.events.*.id + + + + - query: INSERT INTO eg_usrevents_recepnt_event_registry(recepient, eventid) VALUES (?, ?); + + basePath: events.*.recepientEventMap.* + jsonMaps: + + + - jsonPath: $.events.*.recepientEventMap.*.recepient + + - jsonPath: $.events.*.recepientEventMap.*.eventId + + + + + + - version: 1.0 + name: mSeva + description: Persists user last login details + fromTopic: user-events-lat + isTransaction: true + queryMaps: + - query: INSERT INTO eg_usrevents_user_lat(userid, lastaccesstime) VALUES (?, ?) ON CONFLICT (userid) DO UPDATE SET lastaccesstime = ?; + + basePath: lastAccessDetails + jsonMaps: + + + - jsonPath: $.lastAccessDetails.userId + + - jsonPath: $.lastAccessDetails.lastAccessTime + + - jsonPath: $.lastAccessDetails.lastAccessTime + + + + diff --git a/configs/egov-persister/egov-workflow-v2-persister.yml b/configs/egov-persister/egov-workflow-v2-persister.yml new file mode 100644 index 00000000..97412d3e --- /dev/null +++ b/configs/egov-persister/egov-workflow-v2-persister.yml @@ -0,0 +1,272 @@ +serviceMaps: + serviceName: egov-workflow-v2 + mappings: + - version: 1.0 + description: Persists workflow processInstanceFromRequest details in eg_workflow_v2 table + fromTopic: save-wf-transitions + isTransaction: true + queryMaps: + + - query: INSERT INTO eg_wf_processinstance_v2( id,tenantid,businessService,businessId,moduleName,action,status,comment, assigner, stateSla,businessServiceSla, previousStatus, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: ProcessInstances.* + jsonMaps: + - jsonPath: $.ProcessInstances.*.id + + - jsonPath: $.ProcessInstances.*.tenantId + + - jsonPath: $.ProcessInstances.*.businessService + + - jsonPath: $.ProcessInstances.*.businessId + + - jsonPath: $.ProcessInstances.*.moduleName + + - jsonPath: $.ProcessInstances.*.action + + - jsonPath: $.ProcessInstances.*.state.uuid + + - jsonPath: $.ProcessInstances.*.comment + + - jsonPath: $.ProcessInstances.*.assigner.uuid + + - jsonPath: $.ProcessInstances.*.stateSla + + - jsonPath: $.ProcessInstances.*.businesssServiceSla + + - jsonPath: $.ProcessInstances.*.previousStatus + + - jsonPath: $.ProcessInstances.*.auditDetails.createdBy + + - jsonPath: $.ProcessInstances.*.auditDetails.lastModifiedBy + + - jsonPath: $.ProcessInstances.*.auditDetails.createdTime + + - jsonPath: $.ProcessInstances.*.auditDetails.lastModifiedTime + + + + + - query: INSERT INTO eg_wf_document_v2( id, tenantid, active, documenttype,documentUid, processinstanceid, filestoreid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: ProcessInstances.*.documents.* + jsonMaps: + - jsonPath: $.ProcessInstances.documents.*.id + + - jsonPath: $.ProcessInstances.documents.*.tenantId + + - jsonPath: $.ProcessInstances.documents.*.active + + - jsonPath: $.ProcessInstances.documents.*.documentType + + - jsonPath: $.ProcessInstances.documents.*.documentUid + + - jsonPath: $.ProcessInstances[*][?({id} in @.documents[*].id)].id + + - jsonPath: $.ProcessInstances.documents.*.fileStoreId + + - jsonPath: $.ProcessInstances.documents.*.auditDetails.createdBy + + - jsonPath: $.ProcessInstances.documents.*.auditDetails.lastModifiedBy + + - jsonPath: $.ProcessInstances.documents.*.auditDetails.createdTime + + - jsonPath: $.ProcessInstances.documents.*.auditDetails.lastModifiedTime + + + - query: INSERT INTO eg_wf_assignee_v2(processinstanceid, tenantid, assignee, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?); + basePath: ProcessInstances.*.assignes.* + jsonMaps: + - jsonPath: $.ProcessInstances[*][?({uuid} in @.assignes[*].uuid)].id + + - jsonPath: $.ProcessInstances[*][?({uuid} in @.assignes[*].uuid)].tenantId + + - jsonPath: $.ProcessInstances.*.assignes.*.uuid + + - jsonPath: $.ProcessInstances[*][?({uuid} in @.assignes[*].uuid)].auditDetails.createdBy + + - jsonPath: $.ProcessInstances[*][?({uuid} in @.assignes[*].uuid)].auditDetails.lastModifiedBy + + - jsonPath: $.ProcessInstances[*][?({uuid} in @.assignes[*].uuid)].auditDetails.createdTime + + - jsonPath: $.ProcessInstances[*][?({uuid} in @.assignes[*].uuid)].auditDetails.lastModifiedTime + + + + + - version: 1.0 + description: Persists BusinessService in the table + fromTopic: save-wf-businessservice + isTransaction: true + queryMaps: + + - query: INSERT INTO eg_wf_businessservice_v2(businessServiceSla, businessservice, business, tenantid, uuid, geturi, posturi, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: BusinessServices.* + jsonMaps: + - jsonPath: $.BusinessServices.*.businessServiceSla + + - jsonPath: $.BusinessServices.*.businessService + + - jsonPath: $.BusinessServices.*.business + + - jsonPath: $.BusinessServices.*.tenantId + + - jsonPath: $.BusinessServices.*.uuid + + - jsonPath: $.BusinessServices.*.geturi + + - jsonPath: $.BusinessServices.*.posturi + + - jsonPath: $.BusinessServices.*.auditDetails.createdBy + + - jsonPath: $.BusinessServices.*.auditDetails.createdTime + + - jsonPath: $.BusinessServices.*.auditDetails.lastModifiedBy + + - jsonPath: $.BusinessServices.*.auditDetails.lastModifiedTime + + + + + - query: INSERT INTO eg_wf_state_v2(seq, uuid, tenantid, businessserviceid, state,applicationStatus,sla,docuploadrequired, isstartstate, isterminatestate,isStateUpdatable, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (nextval('seq_eg_wf_state_v2'),? , ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: BusinessServices.*.states.* + jsonMaps: + - jsonPath: $.BusinessServices.*.states.*.uuid + + - jsonPath: $.BusinessServices.*.states.*.tenantId + + - jsonPath: $.BusinessServices[*][?({uuid} in @.states[*].uuid)].uuid + + - jsonPath: $.BusinessServices.*.states.*.state + + - jsonPath: $.BusinessServices.*.states.*.applicationStatus + + - jsonPath: $.BusinessServices.*.states.*.sla + + - jsonPath: $.BusinessServices.*.states.*.docUploadRequired + + - jsonPath: $.BusinessServices.*.states.*.isStartState + + - jsonPath: $.BusinessServices.*.states.*.isTerminateState + + - jsonPath: $.BusinessServices.*.states.*.isStateUpdatable + + - jsonPath: $.BusinessServices.*.states.*.auditDetails.createdBy + + - jsonPath: $.BusinessServices.*.states.*.auditDetails.createdTime + + - jsonPath: $.BusinessServices.*.states.*.auditDetails.lastModifiedBy + + - jsonPath: $.BusinessServices.*.states.*.auditDetails.lastModifiedTime + + + + - query: INSERT INTO eg_wf_action_v2( uuid,tenantId, currentState, action, nextstate, roles, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: BusinessServices.*.states.*.actions.* + jsonMaps: + - jsonPath: $.BusinessServices.*.states.*.actions.*.uuid + + - jsonPath: $.BusinessServices.*.states.*.actions.*.tenantId + + - jsonPath: $.BusinessServices.*.states[*][?({uuid} in @.actions[*].uuid)].uuid + + - jsonPath: $.BusinessServices.*.states.*.actions.*.action + + - jsonPath: $.BusinessServices.*.states.*.actions.*.nextState + + - jsonPath: $.BusinessServices.*.states.*.actions.*.roles + type: ARRAY + dbType: STRING + + - jsonPath: $.BusinessServices.*.states.*.actions.*.auditDetails.createdBy + + - jsonPath: $.BusinessServices.*.states.*.actions.*.auditDetails.createdTime + + - jsonPath: $.BusinessServices.*.states.*.actions.*.auditDetails.lastModifiedBy + + - jsonPath: $.BusinessServices.*.states.*.actions.*.auditDetails.lastModifiedTime + + + + - version: 1.0 + description: Persists BusinessService in the table + fromTopic: update-wf-businessservice + isTransaction: true + queryMaps: + + - query: UPDATE eg_wf_businessservice_v2 SET businessservicesla=?,businessservice=?, business=?, geturi=?, posturi=?, lastmodifiedby=?, lastmodifiedtime=? WHERE uuid=?; + basePath: BusinessServices.* + jsonMaps: + - jsonPath: $.BusinessServices.*.businessServiceSla + + - jsonPath: $.BusinessServices.*.businessService + + - jsonPath: $.BusinessServices.*.business + + - jsonPath: $.BusinessServices.*.geturi + + - jsonPath: $.BusinessServices.*.posturi + + - jsonPath: $.BusinessServices.*.auditDetails.lastModifiedBy + + - jsonPath: $.BusinessServices.*.auditDetails.lastModifiedTime + + - jsonPath: $.BusinessServices.*.uuid + + + + + - query: INSERT INTO eg_wf_state_v2(seq, uuid, tenantid, businessserviceid, state,applicationStatus,sla,docuploadrequired, isstartstate, isterminatestate,isStateUpdatable, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (nextval('seq_eg_wf_state_v2'), ?,?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (uuid) DO UPDATE SET state=EXCLUDED.state,sla=EXCLUDED.sla,docuploadrequired=EXCLUDED.docuploadrequired,isstartstate=EXCLUDED.isstartstate, isterminatestate=EXCLUDED.isterminatestate,isStateUpdatable=EXCLUDED.isStateUpdatable, lastmodifiedby=EXCLUDED.lastmodifiedby, lastmodifiedtime=EXCLUDED.lastmodifiedtime; + basePath: BusinessServices.*.states.* + jsonMaps: + + - jsonPath: $.BusinessServices.*.states.*.uuid + + - jsonPath: $.BusinessServices.*.states.*.tenantId + + - jsonPath: $.BusinessServices[*][?({uuid} in @.states[*].uuid)].uuid + + - jsonPath: $.BusinessServices.*.states.*.state + + - jsonPath: $.BusinessServices.*.states.*.applicationStatus + + - jsonPath: $.BusinessServices.*.states.*.sla + + - jsonPath: $.BusinessServices.*.states.*.docUploadRequired + + - jsonPath: $.BusinessServices.*.states.*.isStartState + + - jsonPath: $.BusinessServices.*.states.*.isTerminateState + + - jsonPath: $.BusinessServices.*.states.*.isStateUpdatable + + - jsonPath: $.BusinessServices.*.states.*.auditDetails.createdBy + + - jsonPath: $.BusinessServices.*.states.*.auditDetails.createdTime + + - jsonPath: $.BusinessServices.*.states.*.auditDetails.lastModifiedBy + + - jsonPath: $.BusinessServices.*.states.*.auditDetails.lastModifiedTime + + - query: INSERT INTO eg_wf_action_v2( uuid,tenantId, currentState, action, nextstate, roles, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (uuid) DO UPDATE SET action=EXCLUDED.action, nextstate=EXCLUDED.nextstate, roles=EXCLUDED.roles, lastmodifiedby=EXCLUDED.lastmodifiedby, lastmodifiedtime=EXCLUDED.lastmodifiedtime; + basePath: BusinessServices.*.states.*.actions.* + jsonMaps: + + - jsonPath: $.BusinessServices.*.states.*.actions.*.uuid + + - jsonPath: $.BusinessServices.*.states.*.actions.*.tenantId + + - jsonPath: $.BusinessServices.*.states[*][?({uuid} in @.actions[*].uuid)].uuid + + - jsonPath: $.BusinessServices.*.states.*.actions.*.action + + - jsonPath: $.BusinessServices.*.states.*.actions.*.nextState + + - jsonPath: $.BusinessServices.*.states.*.actions.*.roles + type: ARRAY + dbType: STRING + + - jsonPath: $.BusinessServices.*.states.*.actions.*.auditDetails.createdBy + + - jsonPath: $.BusinessServices.*.states.*.actions.*.auditDetails.createdTime + + - jsonPath: $.BusinessServices.*.states.*.actions.*.auditDetails.lastModifiedBy + + - jsonPath: $.BusinessServices.*.states.*.actions.*.auditDetails.lastModifiedTime diff --git a/configs/egov-persister/firenoc-calculator-persister.yml b/configs/egov-persister/firenoc-calculator-persister.yml new file mode 100644 index 00000000..12773dd6 --- /dev/null +++ b/configs/egov-persister/firenoc-calculator-persister.yml @@ -0,0 +1,92 @@ +serviceMaps: + serviceName: FIRENOC_CALCULATOR + mappings: + - version: 1.0 + name: firenoc-calculator + description: Persists billing slab details in the table + fromTopic: save-firenoc-calculator-billingslab + isTransaction: true + queryMaps: + - query: INSERT INTO eg_firenoc_billingslab (id, tenantid, isactive , firenoctype, buildingusagetype, calculationtype, uom, fromuom, touom, fromdate, todate, rate, createdby, createddate, lastmodifiedby, lastModifiedDate) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?); + + basePath: BillingSlabs.* + jsonMaps: + - jsonPath: $.BillingSlabs.*.id + + - jsonPath: $.BillingSlabs.*.tenantId + + - jsonPath: $.BillingSlabs.*.isActive + + - jsonPath: $.BillingSlabs.*.fireNOCType + + - jsonPath: $.BillingSlabs.*.buildingUsageType + + - jsonPath: $.BillingSlabs.*.calculationType + + - jsonPath: $.BillingSlabs.*.uom + + - jsonPath: $.BillingSlabs.*.fromUom + + - jsonPath: $.BillingSlabs.*.toUom + + - jsonPath: $.BillingSlabs.*.fromDate + + - jsonPath: $.BillingSlabs.*.toDate + + - jsonPath: $.BillingSlabs.*.rate + + - jsonPath: $.BillingSlabs.*.auditDetails.createdBy + + - jsonPath: $.BillingSlabs.*.auditDetails.createdDate + + - jsonPath: $.BillingSlabs.*.auditDetails.lastModifiedBy + + - jsonPath: $.BillingSlabs.*.auditDetails.lastModifiedDate + + - version: 1.0 + name: firenoc-calculator + description: Persists billing slab details in the table + fromTopic: update-firenoc-calculator-billingslab + isTransaction: true + queryMaps: + - query: DELETE FROM eg_firenoc_billingslab + + basePath: BillingSlabs.* + jsonMaps: + - jsonPath: $.BillingSlabs.*.id + + - query: INSERT INTO eg_firenoc_billingslab (id, tenantid, isactive , firenoctype, buildingusagetype, calculationtype, uom, fromuom, touom, fromdate, todate, rate, createdby, createddate, lastmodifiedby, lastModifiedDate) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?); + + basePath: BillingSlabs.* + jsonMaps: + - jsonPath: $.BillingSlabs.*.id + + - jsonPath: $.BillingSlabs.*.tenantId + + - jsonPath: $.BillingSlabs.*.isActive + + - jsonPath: $.BillingSlabs.*.fireNOCType + + - jsonPath: $.BillingSlabs.*.buildingUsageType + + - jsonPath: $.BillingSlabs.*.calculationType + + - jsonPath: $.BillingSlabs.*.uom + + - jsonPath: $.BillingSlabs.*.fromUom + + - jsonPath: $.BillingSlabs.*.toUom + + - jsonPath: $.BillingSlabs.*.fromDate + + - jsonPath: $.BillingSlabs.*.toDate + + - jsonPath: $.BillingSlabs.*.rate + + - jsonPath: $.BillingSlabs.*.auditDetails.createdBy + + - jsonPath: $.BillingSlabs.*.auditDetails.createdDate + + - jsonPath: $.BillingSlabs.*.auditDetails.lastModifiedBy + + - jsonPath: $.BillingSlabs.*.auditDetails.lastModifiedDate diff --git a/configs/egov-persister/firenoc_persiter.yaml b/configs/egov-persister/firenoc_persiter.yaml new file mode 100644 index 00000000..e7a57fde --- /dev/null +++ b/configs/egov-persister/firenoc_persiter.yaml @@ -0,0 +1,643 @@ +serviceMaps: + serviceName: fn-services + mappings: + - version: 1.0 + description: Persists fireNOC details in eg_fn_firenoc table + fromTopic: save-fn-firenoc + isTransaction: true + queryMaps: + + - query: INSERT INTO eg_fn_firenoc(uuid, tenantid, firenocnumber, provisionfirenocnumber, oldfirenocnumber, dateofapplied, createdby, lastmodifiedby, createdtime, lastmodifiedtime,islegacy) VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?); + basePath: FireNOCs.* + jsonMaps: + - jsonPath: $.FireNOCs.*.id + + - jsonPath: $.FireNOCs.*.tenantId + + - jsonPath: $.FireNOCs.*.firenocnumber + + - jsonPath: $.FireNOCs.*.provisionfirenocnumber + + - jsonPath: $.FireNOCs.*.oldfirenocnumber + + - jsonPath: $.FireNOCs.*.dateofapplied + + - jsonPath: $.FireNOCs.*.auditDetails.createdBy + + - jsonPath: $.FireNOCs.*.auditDetails.lastModifiedBy + + - jsonPath: $.FireNOCs.*.auditDetails.createdTime + + - jsonPath: $.FireNOCs.*.auditDetails.lastModifiedTime + + - jsonPath: $.FireNOCs.*.islegacy + + + - query: INSERT INTO eg_fn_firenocdetail(uuid, firenocuuid, applicationnumber, firenoctype, firestationid, applicationdate, financialyear, issueddate, validfrom, validto, action,channel, noofbuildings, tenantid, additionaldetail, createdby, lastmodifiedby, createdtime, lastmodifiedtime, propertyid,status) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?); + basePath: FireNOCs.*.fireNOCDetails + jsonMaps: + - jsonPath: $.FireNOCs.*.fireNOCDetails.id + + - jsonPath: $.FireNOCs.*.id + + - jsonPath: $.FireNOCs.*.fireNOCDetails.applicationNumber + + - jsonPath: $.FireNOCs.*.fireNOCDetails.fireNOCType + + - jsonPath: $.FireNOCs.*.fireNOCDetails.firestationId + + - jsonPath: $.FireNOCs.*.fireNOCDetails.applicationDate + + - jsonPath: $.FireNOCs.*.fireNOCDetails.financialYear + + - jsonPath: $.FireNOCs.*.fireNOCDetails.issuedDate + + - jsonPath: $.FireNOCs.*.fireNOCDetails.validFrom + + - jsonPath: $.FireNOCs.*.fireNOCDetails.validTo + + - jsonPath: $.FireNOCs.*.fireNOCDetails.action + + - jsonPath: $.FireNOCs.*.fireNOCDetails.channel + + - jsonPath: $.FireNOCs.*.fireNOCDetails.noOfBuildings + + - jsonPath: $.FireNOCs.*.fireNOCDetails.tenantId + + - jsonPath: $.FireNOCs.*.fireNOCDetails.additionalDetail + type: JSON + dbType: JSONB + + - jsonPath: $.FireNOCs.*.auditDetails.createdBy + + - jsonPath: $.FireNOCs.*.auditDetails.lastModifiedBy + + - jsonPath: $.FireNOCs.*.auditDetails.createdTime + + - jsonPath: $.FireNOCs.*.auditDetails.lastModifiedTime + + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.propertyid + + - jsonPath: $.FireNOCs.*.fireNOCDetails.status + + + - query: INSERT INTO eg_fn_owner(uuid, tenantid, firenocdetailsuuid, isactive, isprimaryowner, ownertype, ownershippercentage, relationship, active, institutionid, createdby, createdtime, lastmodifiedby, lastmodifiedtime,useruuid) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?); + basePath: FireNOCs.*.fireNOCDetails.applicantDetails.owners.* + jsonMaps: + - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.owners.*.ownerUUID + + - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.owners.*.tenantId + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.applicantDetails.owners[*].id)].fireNOCDetails.id + + - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.owners.*.isActive + + - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.owners.*.isPrimaryOwner + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.applicantDetails.owners[*].id)].fireNOCDetails.applicantDetails.ownerShipType + + - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.owners.*.ownerShipPercentage + + - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.owners.*.relationship + + - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.owners.*.active + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.applicantDetails.owners[*].id)].fireNOCDetails.applicantDetails.additionalDetail.id + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.applicantDetails.owners[*].id)].auditDetails.createdBy + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.applicantDetails.owners[*].id)].auditDetails.createdTime + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.applicantDetails.owners[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.applicantDetails.owners[*].id)].auditDetails.lastModifiedTime + + - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.owners.*.uuid + + - query: INSERT INTO public.eg_fn_address(uuid, tenantid, doorno, latitude, longitude, buildingname, addressid, addressnumber, type, addressline1, addressline2, landmark, street, city, locality, pincode, detail, firenocdetailsuuid, createdby, lastmodifiedby, createdtime, lastmodifiedtime,areatype,subdistrict) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?,?); + basePath: FireNOCs.*.fireNOCDetails.propertyDetails.address + jsonMaps: + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.id + + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.tenantId + + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.doorNo + + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.latitude + + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.longitude + + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.buildingName + + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.addressId + + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.addressNumber + + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.type + + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.addressLine1 + + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.addressLine2 + + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.landmark + + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.street + + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.city + + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.locality.code + + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.pincode + + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.detail + + - jsonPath: $.FireNOCs.*.fireNOCDetails.id + + - jsonPath: $.FireNOCs.*.auditDetails.createdBy + + - jsonPath: $.FireNOCs.*.auditDetails.lastModifiedBy + + - jsonPath: $.FireNOCs.*.auditDetails.createdTime + + - jsonPath: $.FireNOCs.*.auditDetails.lastModifiedTime + + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.areaType + + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.subDistrict + + - query: INSERT INTO public.eg_fn_institution(uuid, tenantid, firenocdetailsuuid, name, type, designation, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: FireNOCs.*.fireNOCDetails.applicantDetails.additionalDetail + jsonMaps: + + - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.additionalDetail.id + + - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.additionalDetail.tenantId + + - jsonPath: $.FireNOCs.*.fireNOCDetails.id + + - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.additionalDetail.name + + - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.additionalDetail.type + + - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.additionalDetail.designation + + - jsonPath: $.FireNOCs.*.auditDetails.createdBy + + - jsonPath: $.FireNOCs.*.auditDetails.createdTime + + - jsonPath: $.FireNOCs.*.auditDetails.lastModifiedBy + + - jsonPath: $.FireNOCs.*.auditDetails.lastModifiedTime + + - query: INSERT INTO eg_fn_buidlings(uuid, firenocdetailsuuid, tenantid, name, createdby, lastmodifiedby, createdtime, lastmodifiedtime, usagetype,usagesubtype,leftsurrounding,rightsurrounding,frontsurrounding,backsurrounding,landarea,totalcoveredarea,parkingarea) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?,?,?,?,?,?,?,?,?); + basePath: FireNOCs.*.fireNOCDetails.buildings.* + jsonMaps: + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.id + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings[*].id)].fireNOCDetails.id + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.tenantId + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.name + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings[*].id)].auditDetails.createdBy + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings[*].id)].auditDetails.createdTime + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings[*].id)].auditDetails.lastModifiedTime + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.usageType + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.usageSubType + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.leftSurrounding + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.rightSurrounding + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.frontSurrounding + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.backSurrounding + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.landArea + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.totalCoveredArea + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.parkingArea + + + + + + - query: INSERT INTO eg_fn_buildingdocuments(uuid, tenantid, documenttype, filestoreid, active, documentuid, createdby, createdtime, lastmodifiedby, lastmodifiedtime, buildinguuid) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: FireNOCs.*.fireNOCDetails.buildings.*.applicationDocuments.* + jsonMaps: + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.applicationDocuments.*.id + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings.*.applicationDocuments[*].id)].tenantId + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.applicationDocuments.*.documentType + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.applicationDocuments.*.fileStoreId + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.applicationDocuments.*.active + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.applicationDocuments.*.documentUid + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings.*.applicationDocuments[*].id)].auditDetails.createdBy + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings.*.applicationDocuments[*].id)].auditDetails.createdTime + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings.*.applicationDocuments[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings.*.applicationDocuments[*].id)].auditDetails.lastModifiedTime + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings[*][?({id} in @.applicationDocuments[*].id)].id + + - query: INSERT INTO eg_fn_buildinguoms(uuid, code, activeuom, active, createdby, lastmodifiedby, createdtime, lastmodifiedtime, buildinguuid,value) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?,?); + basePath: FireNOCs.*.fireNOCDetails.buildings.*.uoms.* + jsonMaps: + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.uoms.*.id + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.uoms.*.code + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.uoms.*.isActiveUom + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.uoms.*.active + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings.*.uoms[*].id)].auditDetails.createdBy + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings.*.uoms[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings.*.uoms[*].id)].auditDetails.createdTime + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings.*.uoms[*].id)].auditDetails.lastModifiedTime + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings[*][?({id} in @.uoms[*].id)].id + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.uoms.*.value + + - version: 1.0 + description: Update fire NOC details in eg_fn_firenoc table + fromTopic: update-fn-firenoc + isTransaction: true + queryMaps: + + - query: UPDATE eg_fn_firenoc SET provisionFireNOCNumber = ?,oldFireNOCNumber = ?,lastmodifiedby = ?, lastmodifiedtime = ? WHERE uuid=?; + basePath: FireNOCs.* + jsonMaps: + - jsonPath: $.FireNOCs.*.provisionFireNOCNumber + + - jsonPath: $.FireNOCs.*.oldFireNOCNumber + + - jsonPath: $.FireNOCs.*.auditDetails.lastModifiedBy + + - jsonPath: $.FireNOCs.*.auditDetails.lastModifiedTime + + - jsonPath: $.FireNOCs.*.id + + + - query: UPDATE eg_fn_firenocdetail SET fireNOCType = ?, firestationId = ?, additionaldetail = ?,financialYear = ?,action = ?,status=?,channel = ?,noOfBuildings = ?,propertyId = ?,lastmodifiedby = ?, lastmodifiedtime = ? WHERE uuid = ?; + basePath: FireNOCs.*.fireNOCDetails + jsonMaps: + + - jsonPath: $.FireNOCs.*.fireNOCDetails.fireNOCType + + - jsonPath: $.FireNOCs.*.fireNOCDetails.firestationId + + - jsonPath: $.FireNOCs.*.fireNOCDetails.additionalDetail + type: JSON + dbType: JSONB + + - jsonPath: $.FireNOCs.*.fireNOCDetails.financialYear + + - jsonPath: $.FireNOCs.*.fireNOCDetails.action + + - jsonPath: $.FireNOCs.*.fireNOCDetails.status + + - jsonPath: $.FireNOCs.*.fireNOCDetails.channel + + - jsonPath: $.FireNOCs.*.fireNOCDetails.noOfBuildings + + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.propertyId + + - jsonPath: $.FireNOCs.*.auditDetails.lastModifiedBy + + - jsonPath: $.FireNOCs.*.auditDetails.lastModifiedTime + + - jsonPath: $.FireNOCs.*.fireNOCDetails.id + + + - query: INSERT INTO eg_fn_buidlings(uuid, tenantid, name, usagetype, firenocdetailsuuid, createdby, lastmodifiedby, createdtime, lastmodifiedtime,usagesubtype,leftsurrounding,rightsurrounding,frontsurrounding,backsurrounding,landarea,totalcoveredarea,parkingarea) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?,?,?,?,?,?,?,?,?) ON CONFLICT (uuid) DO UPDATE SET active = ?, name = ?, usageType = ?, lastmodifiedby = ?, lastmodifiedtime = ?,usagesubtype=?, leftsurrounding=?, rightsurrounding=?, frontsurrounding=?, backsurrounding=?, landarea=?,totalcoveredarea=?,parkingArea=?; + basePath: FireNOCs.*.fireNOCDetails.buildings.* + jsonMaps: + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.id + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.tenantId + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.name + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.usageType + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings[*].id)].fireNOCDetails.id + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings[*].id)].auditDetails.createdBy + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings[*].id)].auditDetails.createdTime + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings[*].id)].auditDetails.lastModifiedTime + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.usageSubType + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.leftSurrounding + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.rightSurrounding + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.frontSurrounding + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.backSurrounding + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.landArea + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.totalCoveredArea + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.parkingArea + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.active + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.name + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.usageType + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings[*].id)].auditDetails.lastModifiedTime + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.usageSubType + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.leftSurrounding + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.rightSurrounding + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.frontSurrounding + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.backSurrounding + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.landArea + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.totalCoveredArea + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.parkingArea + + + + - query: INSERT INTO eg_fn_buildingdocuments(uuid, tenantid, documenttype, filestoreid, active, documentuid, createdby, createdtime, lastmodifiedby, lastmodifiedtime, buildinguuid) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (uuid) DO UPDATE SET active = ?,documentType = ?, fileStoreId = ?, documentUid=?,lastmodifiedby = ?, lastmodifiedtime = ?; + basePath: FireNOCs.*.fireNOCDetails.buildings.*.applicationDocuments.* + jsonMaps: + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.applicationDocuments.*.id + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings.*.applicationDocuments[*].id)].tenantId + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.applicationDocuments.*.documentType + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.applicationDocuments.*.fileStoreId + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.applicationDocuments.*.active + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.applicationDocuments.*.documentUid + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings.*.applicationDocuments[*].id)].auditDetails.createdBy + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings.*.applicationDocuments[*].id)].auditDetails.createdTime + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings.*.applicationDocuments[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings.*.applicationDocuments[*].id)].auditDetails.lastModifiedTime + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings[*][?({id} in @.applicationDocuments[*].id)].id + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.applicationDocuments.*.active + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.applicationDocuments.*.documentType + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.applicationDocuments.*.fileStoreId + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.applicationDocuments.*.documentUid + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings.*.applicationDocuments[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings.*.applicationDocuments[*].id)].auditDetails.lastModifiedTime + + - query: INSERT INTO eg_fn_buildinguoms(uuid, code, activeuom, active, createdby, lastmodifiedby, createdtime, lastmodifiedtime, buildinguuid,value) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?,?) ON CONFLICT (uuid) DO UPDATE SET active = ?,code = ?, activeuom = ?, value=?,lastmodifiedby = ?, lastmodifiedtime = ?; + basePath: FireNOCs.*.fireNOCDetails.buildings.*.uoms.* + jsonMaps: + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.uoms.*.id + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.uoms.*.code + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.uoms.*.isActiveUom + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.uoms.*.active + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings.*.uoms[*].id)].auditDetails.createdBy + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings.*.uoms[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings.*.uoms[*].id)].auditDetails.createdTime + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings.*.uoms[*].id)].auditDetails.lastModifiedTime + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings[*][?({id} in @.uoms[*].id)].id + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.uoms.*.value + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.uoms.*.active + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.uoms.*.code + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.uoms.*.isActiveUom + + - jsonPath: $.FireNOCs.*.fireNOCDetails.buildings.*.uoms.*.value + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings.*.uoms[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.buildings.*.uoms[*].id)].auditDetails.lastModifiedTime + + + - query: INSERT INTO eg_fn_owner(uuid, tenantid, firenocdetailsuuid, isactive, isprimaryowner, ownertype, ownershippercentage, relationship, active, institutionid, createdby, createdtime, lastmodifiedby, lastmodifiedtime,useruuid) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?) ON CONFLICT ON CONSTRAINT pk_eg_fn_owner DO UPDATE SET active = ?, isprimaryowner = ?, ownertype = ?, ownershippercentage = ?, relationship = ?,useruuid=?, lastmodifiedby = ?, lastmodifiedtime = ?; + basePath: FireNOCs.*.fireNOCDetails.applicantDetails.owners.* + jsonMaps: + - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.owners.*.ownerUUID + + - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.owners.*.tenantId + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.applicantDetails.owners[*].id)].fireNOCDetails.id + + - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.owners.*.userActive + + - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.owners.*.isPrimaryOwner + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.applicantDetails.owners[*].id)].fireNOCDetails.applicantDetails.ownerShipType + + - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.owners.*.ownerShipPercentage + + - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.owners.*.relationship + + - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.owners.*.active + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.applicantDetails.owners[*].id)].fireNOCDetails.applicantDetails.additionalDetail.id + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.applicantDetails.owners[*].id)].auditDetails.createdBy + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.applicantDetails.owners[*].id)].auditDetails.createdTime + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.applicantDetails.owners[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.applicantDetails.owners[*].id)].auditDetails.lastModifiedTime + + - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.owners.*.uuid + + - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.owners.*.userActive + + - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.owners.*.isPrimaryOwner + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.applicantDetails.owners[*].id)].fireNOCDetails.applicantDetails.ownerShipType + + - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.owners.*.ownerShipPercentage + + - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.owners.*.relationship + + - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.owners.*.uuid + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.applicantDetails.owners[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.FireNOCs[*][?({id} in @.fireNOCDetails.applicantDetails.owners[*].id)].auditDetails.lastModifiedTime + + - query: UPDATE eg_fn_address SET doorno =?,street = ?,buildingName = ?, latitude =?, longitude =?, addressid =?, addressnumber =?,locality =?, type =?, addressline1 =?, addressline2 =?, landmark =?, city =?, pincode =?, detail =?,lastmodifiedby =?, lastmodifiedtime =?, areatype=?, subdistrict=? WHERE uuid =?; + basePath: FireNOCs.*.fireNOCDetails.propertyDetails.address + jsonMaps: + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.doorNo + + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.street + + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.buildingName + + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.latitude + + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.longitude + + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.addressId + + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.addressNumber + + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.locality.code + + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.type + + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.addressLine1 + + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.addressLine2 + + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.landmark + + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.city + + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.pincode + + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.detail + + - jsonPath: $.FireNOCs.*.auditDetails.lastModifiedBy + + - jsonPath: $.FireNOCs.*.auditDetails.lastModifiedTime + + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.areaType + + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.address.subDistrict + + - jsonPath: $.FireNOCs.*.fireNOCDetails.propertyDetails.id + + + + + - query: INSERT INTO eg_fn_institution(tenantId,uuid, firenocdetailsuuid, name, type,designation, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (uuid) DO UPDATE SET active = ?,name = ?,type = ?,designation = ?, lastmodifiedby = ?,lastmodifiedtime = ?; + basePath: FireNOCs.*.fireNOCDetails.applicantDetails.additionalDetail + jsonMaps: + - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.additionalDetail.tenantId + + - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.additionalDetail.id + + - jsonPath: $.FireNOCs.*.fireNOCDetails.id + + - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.additionalDetail.name + + - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.additionalDetail.type + + - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.additionalDetail.designation + + - jsonPath: $.FireNOCs.*.auditDetails.createdBy + + - jsonPath: $.FireNOCs.*.auditDetails.lastModifiedBy + + - jsonPath: $.FireNOCs.*.auditDetails.createdTime + + - jsonPath: $.FireNOCs.*.auditDetails.lastModifiedTime + + - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.additionalDetail.active + + - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.additionalDetail.name + + - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.additionalDetail.type + + - jsonPath: $.FireNOCs.*.fireNOCDetails.applicantDetails.additionalDetail.designation + + - jsonPath: $.FireNOCs.*.auditDetails.lastModifiedBy + + - jsonPath: $.FireNOCs.*.auditDetails.lastModifiedTime + + + - version: 1.0 + description: Persists tradeLicense details in eg_fn_firenoc table + fromTopic: update-fn-workflow + isTransaction: true + queryMaps: + + - query: UPDATE eg_fn_firenoc SET fireNOCNumber = ?, lastmodifiedby = ?, lastmodifiedtime = ? WHERE uuid=?; + basePath: FireNOCs.* + jsonMaps: + + - jsonPath: $.FireNOCs.*.fireNOCNumber + + - jsonPath: $.FireNOCs.*.auditDetails.lastModifiedBy + + - jsonPath: $.FireNOCs.*.auditDetails.lastModifiedTime + + - jsonPath: $.FireNOCs.*.id + + + - query: UPDATE eg_fn_firenocdetail SET validFrom=?,validTo=?,issueddate = ?, action = ?,status=?, additionaldetail = ?,lastmodifiedby = ?, lastmodifiedtime = ? WHERE uuid = ?; + basePath: FireNOCs.*.fireNOCDetails + jsonMaps: + + - jsonPath: $.FireNOCs.*.fireNOCDetails.validFrom + + - jsonPath: $.FireNOCs.*.fireNOCDetails.validTo + + - jsonPath: $.FireNOCs.*.fireNOCDetails.issuedDate + + - jsonPath: $.FireNOCs.*.fireNOCDetails.action + + - jsonPath: $.FireNOCs.*.fireNOCDetails.status + + - jsonPath: $.FireNOCs.*.fireNOCDetails.additionalDetail + type: JSON + dbType: JSONB + + - jsonPath: $.FireNOCs.*.auditDetails.lastModifiedBy + + - jsonPath: $.FireNOCs.*.auditDetails.lastModifiedTime + + - jsonPath: $.FireNOCs.*.fireNOCDetails.id + diff --git a/configs/egov-persister/hrms-employee-persister.yml b/configs/egov-persister/hrms-employee-persister.yml new file mode 100644 index 00000000..4797de8e --- /dev/null +++ b/configs/egov-persister/hrms-employee-persister.yml @@ -0,0 +1,505 @@ +serviceMaps: + serviceName: HRMS + mappings: + - version: 1.0 + name: hrms + description: Persists employee details in the table + fromTopic: save-hrms-employee + isTransaction: true + queryMaps: + - query: INSERT INTO eg_hrms_employee(tenantid, id, uuid, code, dateOfAppointment, employeestatus, employeetype, active, createdby, createddate, lastmodifiedby, lastModifiedDate,reactivateemployee) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + + basePath: Employees.* + jsonMaps: + + + - jsonPath: $.Employees.*.tenantId + + - jsonPath: $.Employees.*.id + + - jsonPath: $.Employees.*.uuid + + - jsonPath: $.Employees.*.code + + - jsonPath: $.Employees.*.dateOfAppointment + + - jsonPath: $.Employees.*.employeeStatus + + - jsonPath: $.Employees.*.employeeType + + - jsonPath: $.Employees.*.isActive + + - jsonPath: $.Employees.*.auditDetails.createdBy + + - jsonPath: $.Employees.*.auditDetails.createdDate + + - jsonPath: $.Employees.*.auditDetails.lastModifiedBy + + - jsonPath: $.Employees.*.auditDetails.lastModifiedDate + + - jsonPath: $.Employees.*.reActivateEmployee + + + + - query: INSERT INTO eg_hrms_assignment(tenantid, uuid, position, department, designation, fromdate, todate, govtordernumber, reportingto, isHOD, iscurrentassignment, employeeid, createdby, createddate, lastmodifiedby, lastModifiedDate) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + + basePath: Employees.*.assignments.* + jsonMaps: + + + - jsonPath: $.Employees[*][?({id} in @.assignments[*].id)].tenantId + + - jsonPath: $.Employees.*.assignments.*.id + + - jsonPath: $.Employees.*.assignments.*.position + + - jsonPath: $.Employees.*.assignments.*.department + + - jsonPath: $.Employees.*.assignments.*.designation + + - jsonPath: $.Employees.*.assignments.*.fromDate + + - jsonPath: $.Employees.*.assignments.*.toDate + + - jsonPath: $.Employees.*.assignments.*.govtOrderNumber + + - jsonPath: $.Employees.*.assignments.*.reportingTo + + - jsonPath: $.Employees.*.assignments.*.isHOD + + - jsonPath: $.Employees.*.assignments.*.isCurrentAssignment + + - jsonPath: $.Employees[*][?({id} in @.assignments[*].id)].uuid + + - jsonPath: $.Employees.*.assignments.*.auditDetails.createdBy + + - jsonPath: $.Employees.*.assignments.*.auditDetails.createdDate + + - jsonPath: $.Employees.*.assignments.*.auditDetails.lastModifiedBy + + - jsonPath: $.Employees.*.assignments.*.auditDetails.lastModifiedDate + + + + + - query: INSERT INTO eg_hrms_educationaldetails(tenantid, uuid, employeeid, qualification, stream, yearofpassing, university, remarks, isactive, createdby, createddate, lastmodifiedby, lastModifiedDate) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + + basePath: Employees.*.education.* + jsonMaps: + + + - jsonPath: $.Employees[*][?({id} in @.education[*].id)].tenantId + + - jsonPath: $.Employees.*.education.*.id + + - jsonPath: $.Employees[*][?({id} in @.education[*].id)].uuid + + - jsonPath: $.Employees.*.education.*.qualification + + - jsonPath: $.Employees.*.education.*.stream + + - jsonPath: $.Employees.*.education.*.yearOfPassing + + - jsonPath: $.Employees.*.education.*.university + + - jsonPath: $.Employees.*.education.*.remarks + + - jsonPath: $.Employees.*.education.*.isActive + + - jsonPath: $.Employees.*.education.*.auditDetails.createdBy + + - jsonPath: $.Employees.*.education.*.auditDetails.createdDate + + - jsonPath: $.Employees.*.education.*.auditDetails.lastModifiedBy + + - jsonPath: $.Employees.*.education.*.auditDetails.lastModifiedDate + + + - query: INSERT INTO eg_hrms_departmentaltests(tenantid, uuid, employeeid, test, yearofpassing, remarks, isactive, createdby, createddate, lastmodifiedby, lastModifiedDate) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + + basePath: Employees.*.tests.* + jsonMaps: + + + - jsonPath: $.Employees[*][?({id} in @.tests[*].id)].tenantId + + - jsonPath: $.Employees.*.tests.*.id + + - jsonPath: $.Employees[*][?({id} in @.tests[*].id)].uuid + + - jsonPath: $.Employees.*.tests.*.test + + - jsonPath: $.Employees.*.tests.*.yearOfPassing + + - jsonPath: $.Employees.*.tests.*.remarks + + - jsonPath: $.Employees.*.tests.*.isActive + + - jsonPath: $.Employees.*.tests.*.auditDetails.createdBy + + - jsonPath: $.Employees.*.tests.*.auditDetails.createdDate + + - jsonPath: $.Employees.*.tests.*.auditDetails.lastModifiedBy + + - jsonPath: $.Employees.*.tests.*.auditDetails.lastModifiedDate + + + - query: INSERT INTO eg_hrms_empdocuments(tenantid, uuid, employeeid, documentid, documentname, referencetype, referenceid, createdby, createddate, lastmodifiedby, lastModifiedDate) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + + basePath: Employees.*.documents.* + jsonMaps: + + + - jsonPath: $.Employees[*][?({id} in @.documents[*].id)].tenantId + + - jsonPath: $.Employees.*.documents.*.id + + - jsonPath: $.Employees[*][?({id} in @.documents[*].id)].uuid + + - jsonPath: $.Employees.*.documents.*.documentId + + - jsonPath: $.Employees.*.documents.*.documentName + + - jsonPath: $.Employees.*.documents.*.referenceType + + - jsonPath: $.Employees.*.documents.*.referenceId + + - jsonPath: $.Employees.*.documents.*.auditDetails.createdBy + + - jsonPath: $.Employees.*.documents.*.auditDetails.createdDate + + - jsonPath: $.Employees.*.documents.*.auditDetails.lastModifiedBy + + - jsonPath: $.Employees.*.documents.*.auditDetails.lastModifiedDate + + + - query: INSERT INTO eg_hrms_servicehistory(tenantid, uuid, employeeid, servicestatus, servicefrom, serviceto, ordernumber, isCurrentPosition, location, createdby, createddate, lastmodifiedby, lastModifiedDate) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + + basePath: Employees.*.serviceHistory.* + jsonMaps: + + + - jsonPath: $.Employees[*][?({id} in @.serviceHistory[*].id)].tenantId + + - jsonPath: $.Employees.*.serviceHistory.*.id + + - jsonPath: $.Employees[*][?({id} in @.serviceHistory[*].id)].uuid + + - jsonPath: $.Employees.*.serviceHistory.*.serviceStatus + + - jsonPath: $.Employees.*.serviceHistory.*.serviceFrom + + - jsonPath: $.Employees.*.serviceHistory.*.serviceTo + + - jsonPath: $.Employees.*.serviceHistory.*.orderNo + + - jsonPath: $.Employees.*.serviceHistory.*.isCurrentPosition + + - jsonPath: $.Employees.*.serviceHistory.*.location + + - jsonPath: $.Employees.*.serviceHistory.*.auditDetails.createdBy + + - jsonPath: $.Employees.*.serviceHistory.*.auditDetails.createdDate + + - jsonPath: $.Employees.*.serviceHistory.*.auditDetails.lastModifiedBy + + - jsonPath: $.Employees.*.serviceHistory.*.auditDetails.lastModifiedDate + + + - query: INSERT INTO eg_hrms_jurisdiction (uuid, employeeid, hierarchy, boundarytype, boundary, tenantid, isActive, createdby, createddate, lastmodifiedby, lastModifiedDate) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + + basePath: Employees.*.jurisdictions.* + jsonMaps: + + - jsonPath: $.Employees.*.jurisdictions.*.id + + - jsonPath: $.Employees[*][?({id} in @.jurisdictions[*].id)].uuid + + - jsonPath: $.Employees.*.jurisdictions.*.hierarchy + + - jsonPath: $.Employees.*.jurisdictions.*.boundaryType + + - jsonPath: $.Employees.*.jurisdictions.*.boundary + + - jsonPath: $.Employees[*][?({id} in @.jurisdictions[*].id)].tenantId + + - jsonPath: $.Employees.*.jurisdictions.*.isActive + + - jsonPath: $.Employees.*.jurisdictions.*.auditDetails.createdBy + + - jsonPath: $.Employees.*.jurisdictions.*.auditDetails.createdDate + + - jsonPath: $.Employees.*.jurisdictions.*.auditDetails.lastModifiedBy + + - jsonPath: $.Employees.*.jurisdictions.*.auditDetails.lastModifiedDate + + + + + - version: 1.0 + name: hrms + description: Persists employee details in the table + fromTopic: update-hrms-employee + isTransaction: true + queryMaps: + - query: DELETE from eg_hrms_employee WHERE uuid=? + + basePath: Employees.* + jsonMaps: + + - jsonPath: $.Employees.*.uuid + + - query: INSERT INTO eg_hrms_employee(tenantid, id, uuid, code, dateOfAppointment, employeestatus, employeetype, active, createdby, createddate, lastmodifiedby, lastModifiedDate,reactivateemployee) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?); + + basePath: Employees.* + jsonMaps: + + + - jsonPath: $.Employees.*.tenantId + + - jsonPath: $.Employees.*.id + + - jsonPath: $.Employees.*.uuid + + - jsonPath: $.Employees.*.code + + - jsonPath: $.Employees.*.dateOfAppointment + + - jsonPath: $.Employees.*.employeeStatus + + - jsonPath: $.Employees.*.employeeType + + - jsonPath: $.Employees.*.isActive + + - jsonPath: $.Employees.*.auditDetails.createdBy + + - jsonPath: $.Employees.*.auditDetails.createdDate + + - jsonPath: $.Employees.*.auditDetails.lastModifiedBy + + - jsonPath: $.Employees.*.auditDetails.lastModifiedDate + + - jsonPath: $.Employees.*.reActivateEmployee + + + + - query: INSERT INTO eg_hrms_assignment(tenantid, uuid, position, department, designation, fromdate, todate, govtordernumber, reportingto, isHOD, iscurrentassignment, employeeid, createdby, createddate, lastmodifiedby, lastModifiedDate) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + + basePath: Employees.*.assignments.* + jsonMaps: + + + - jsonPath: $.Employees[*][?({id} in @.assignments[*].id)].tenantId + + - jsonPath: $.Employees.*.assignments.*.id + + - jsonPath: $.Employees.*.assignments.*.position + + - jsonPath: $.Employees.*.assignments.*.department + + - jsonPath: $.Employees.*.assignments.*.designation + + - jsonPath: $.Employees.*.assignments.*.fromDate + + - jsonPath: $.Employees.*.assignments.*.toDate + + - jsonPath: $.Employees.*.assignments.*.govtOrderNumber + + - jsonPath: $.Employees.*.assignments.*.reportingTo + + - jsonPath: $.Employees.*.assignments.*.isHOD + + - jsonPath: $.Employees.*.assignments.*.isCurrentAssignment + + - jsonPath: $.Employees[*][?({id} in @.assignments[*].id)].uuid + + - jsonPath: $.Employees.*.assignments.*.auditDetails.createdBy + + - jsonPath: $.Employees.*.assignments.*.auditDetails.createdDate + + - jsonPath: $.Employees.*.assignments.*.auditDetails.lastModifiedBy + + - jsonPath: $.Employees.*.assignments.*.auditDetails.lastModifiedDate + + + + + - query: INSERT INTO eg_hrms_educationaldetails(tenantid, uuid, employeeid, qualification, stream, yearofpassing, university, remarks, isactive, createdby, createddate, lastmodifiedby, lastModifiedDate) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + + basePath: Employees.*.education.* + jsonMaps: + + + - jsonPath: $.Employees[*][?({id} in @.education[*].id)].tenantId + + - jsonPath: $.Employees.*.education.*.id + + - jsonPath: $.Employees[*][?({id} in @.education[*].id)].uuid + + - jsonPath: $.Employees.*.education.*.qualification + + - jsonPath: $.Employees.*.education.*.stream + + - jsonPath: $.Employees.*.education.*.yearOfPassing + + - jsonPath: $.Employees.*.education.*.university + + - jsonPath: $.Employees.*.education.*.remarks + + - jsonPath: $.Employees.*.education.*.isActive + + - jsonPath: $.Employees.*.education.*.auditDetails.createdBy + + - jsonPath: $.Employees.*.education.*.auditDetails.createdDate + + - jsonPath: $.Employees.*.education.*.auditDetails.lastModifiedBy + + - jsonPath: $.Employees.*.education.*.auditDetails.lastModifiedDate + + + - query: INSERT INTO eg_hrms_departmentaltests(tenantid, uuid, employeeid, test, yearofpassing, remarks, isactive, createdby, createddate, lastmodifiedby, lastModifiedDate) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + + basePath: Employees.*.tests.* + jsonMaps: + + + - jsonPath: $.Employees[*][?({id} in @.tests[*].id)].tenantId + + - jsonPath: $.Employees.*.tests.*.id + + - jsonPath: $.Employees[*][?({id} in @.tests[*].id)].uuid + + - jsonPath: $.Employees.*.tests.*.test + + - jsonPath: $.Employees.*.tests.*.yearOfPassing + + - jsonPath: $.Employees.*.tests.*.remarks + + - jsonPath: $.Employees.*.tests.*.isActive + + - jsonPath: $.Employees.*.tests.*.auditDetails.createdBy + + - jsonPath: $.Employees.*.tests.*.auditDetails.createdDate + + - jsonPath: $.Employees.*.tests.*.auditDetails.lastModifiedBy + + - jsonPath: $.Employees.*.tests.*.auditDetails.lastModifiedDate + + + - query: INSERT INTO eg_hrms_empdocuments(tenantid, uuid, employeeid, documentid, documentname, referencetype, referenceid, createdby, createddate, lastmodifiedby, lastModifiedDate) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + + basePath: Employees.*.documents.* + jsonMaps: + + + - jsonPath: $.Employees[*][?({id} in @.documents[*].id)].tenantId + + - jsonPath: $.Employees.*.documents.*.id + + - jsonPath: $.Employees[*][?({id} in @.documents[*].id)].uuid + + - jsonPath: $.Employees.*.documents.*.documentId + + - jsonPath: $.Employees.*.documents.*.documentName + + - jsonPath: $.Employees.*.documents.*.referenceType + + - jsonPath: $.Employees.*.documents.*.referenceId + + - jsonPath: $.Employees.*.documents.*.auditDetails.createdBy + + - jsonPath: $.Employees.*.documents.*.auditDetails.createdDate + + - jsonPath: $.Employees.*.documents.*.auditDetails.lastModifiedBy + + - jsonPath: $.Employees.*.documents.*.auditDetails.lastModifiedDate + + + - query: INSERT INTO eg_hrms_servicehistory(tenantid, uuid, employeeid, servicestatus, servicefrom, serviceto, ordernumber, isCurrentPosition, location, createdby, createddate, lastmodifiedby, lastModifiedDate) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + + basePath: Employees.*.serviceHistory.* + jsonMaps: + + + - jsonPath: $.Employees[*][?({id} in @.serviceHistory[*].id)].tenantId + + - jsonPath: $.Employees.*.serviceHistory.*.id + + - jsonPath: $.Employees[*][?({id} in @.serviceHistory[*].id)].uuid + + - jsonPath: $.Employees.*.serviceHistory.*.serviceStatus + + - jsonPath: $.Employees.*.serviceHistory.*.serviceFrom + + - jsonPath: $.Employees.*.serviceHistory.*.serviceTo + + - jsonPath: $.Employees.*.serviceHistory.*.orderNo + + - jsonPath: $.Employees.*.serviceHistory.*.isCurrentPosition + + - jsonPath: $.Employees.*.serviceHistory.*.location + + - jsonPath: $.Employees.*.serviceHistory.*.auditDetails.createdBy + + - jsonPath: $.Employees.*.serviceHistory.*.auditDetails.createdDate + + - jsonPath: $.Employees.*.serviceHistory.*.auditDetails.lastModifiedBy + + - jsonPath: $.Employees.*.serviceHistory.*.auditDetails.lastModifiedDate + + + - query: INSERT INTO eg_hrms_jurisdiction (uuid, employeeid, hierarchy, boundarytype, boundary, tenantid, isActive, createdby, createddate, lastmodifiedby, lastModifiedDate) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + + basePath: Employees.*.jurisdictions.* + jsonMaps: + + - jsonPath: $.Employees.*.jurisdictions.*.id + + - jsonPath: $.Employees[*][?({id} in @.jurisdictions[*].id)].uuid + + - jsonPath: $.Employees.*.jurisdictions.*.hierarchy + + - jsonPath: $.Employees.*.jurisdictions.*.boundaryType + + - jsonPath: $.Employees.*.jurisdictions.*.boundary + + - jsonPath: $.Employees[*][?({id} in @.jurisdictions[*].id)].tenantId + + - jsonPath: $.Employees.*.jurisdictions.*.isActive + + - jsonPath: $.Employees.*.jurisdictions.*.auditDetails.createdBy + + - jsonPath: $.Employees.*.jurisdictions.*.auditDetails.createdDate + + - jsonPath: $.Employees.*.jurisdictions.*.auditDetails.lastModifiedBy + + - jsonPath: $.Employees.*.jurisdictions.*.auditDetails.lastModifiedDate + + + + - query: INSERT INTO eg_hrms_deactivationdetails(uuid, employeeid, reasonfordeactivation, effectivefrom, ordernumber, remarks, tenantid, createdby, createddate, lastmodifiedby, lastModifiedDate) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + + basePath: Employees.*.deactivationDetails.* + jsonMaps: + + - jsonPath: $.Employees.*.deactivationDetails.*.id + + - jsonPath: $.Employees[*][?({id} in @.deactivationDetails[*].id)].uuid + + - jsonPath: $.Employees.*.deactivationDetails.*.reasonForDeactivation + + - jsonPath: $.Employees.*.deactivationDetails.*.effectiveFrom + + - jsonPath: $.Employees.*.deactivationDetails.*.orderNo + + - jsonPath: $.Employees.*.deactivationDetails.*.remarks + + - jsonPath: $.Employees[*][?({id} in @.deactivationDetails[*].id)].tenantId + + - jsonPath: $.Employees.*.deactivationDetails.*.auditDetails.createdBy + + - jsonPath: $.Employees.*.deactivationDetails.*.auditDetails.createdDate + + - jsonPath: $.Employees.*.deactivationDetails.*.auditDetails.lastModifiedBy + + - jsonPath: $.Employees.*.deactivationDetails.*.auditDetails.lastModifiedDate diff --git a/configs/egov-persister/indexer-job-persister.yml b/configs/egov-persister/indexer-job-persister.yml new file mode 100644 index 00000000..46ce7b3e --- /dev/null +++ b/configs/egov-persister/indexer-job-persister.yml @@ -0,0 +1,68 @@ +serviceMaps: + serviceName: Indexer + mappings: + - version: 1.0 + name: Indexer + description: Persists index jobs to table + fromTopic: save-index-jobs + isTransaction: true + queryMaps: + - query: INSERT INTO eg_indexer_job(tenantid, jobid, requesterid, typeofjob, oldindex, newindex, jobstatus, totaltimetakeninms, recordstobeindexed, totalrecordsindexed, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: job + jsonMaps: + + + - jsonPath: $.job.tenantId + + - jsonPath: $.job.jobId + + - jsonPath: $.job.requesterId + + - jsonPath: $.job.typeOfJob + + - jsonPath: $.job.oldIndex + + - jsonPath: $.job.newIndex + + - jsonPath: $.job.jobStatus + + - jsonPath: $.job.totalTimeTakenInMS + + - jsonPath: $.job.recordsToBeIndexed + + - jsonPath: $.job.totalRecordsIndexed + + - jsonPath: $.job.auditDetails.createdBy + + - jsonPath: $.job.auditDetails.createdTime + + - jsonPath: $.job.auditDetails.lastModifiedBy + + - jsonPath: $.job.auditDetails.lastModifiedTime + + + + - version: 1.0 + name: Indexer + description: Updates index jobs in the table + fromTopic: update-index-jobs + isTransaction: true + queryMaps: + - query: UPDATE eg_indexer_job SET jobStatus = ?, totalTimeTakenInMS = ?, totalrecordsindexed = ?, lastmodifiedby = ?, lastmodifiedtime = ? WHERE jobid = ? + basePath: job + jsonMaps: + + + - jsonPath: $.job.jobStatus + + - jsonPath: $.job.totalTimeTakenInMS + + - jsonPath: $.job.totalRecordsIndexed + + - jsonPath: $.job.auditDetails.lastModifiedBy + + - jsonPath: $.job.auditDetails.lastModifiedTime + + - jsonPath: $.job.jobId + + \ No newline at end of file diff --git a/configs/egov-persister/migration-batch-count-persister.yml b/configs/egov-persister/migration-batch-count-persister.yml new file mode 100644 index 00000000..9019909a --- /dev/null +++ b/configs/egov-persister/migration-batch-count-persister.yml @@ -0,0 +1,25 @@ +serviceMaps: + serviceName: property-services + mappings: + - version: 1.0 + description: Persists property details in EG_PT_PROPERTY table + fromTopic: migartion-batch-count + isTransaction: true + queryMaps: + + + - query: INSERT INTO eg_pt_property_migration (id,batch,batchsize,createdtime,tenantid,recordCount) VALUES (?,?,?,?,?,?); + basePath: MigrationCount + jsonMaps: + + - jsonPath: $.MigrationCount.id + + - jsonPath: $.MigrationCount.offset + + - jsonPath: $.MigrationCount.limit + + - jsonPath: $.MigrationCount.createdTime + + - jsonPath: $.MigrationCount.tenantid + + - jsonPath: $.MigrationCount.recordCount \ No newline at end of file diff --git a/configs/egov-persister/pdf-filestoreid-update.yml b/configs/egov-persister/pdf-filestoreid-update.yml new file mode 100644 index 00000000..1549d28d --- /dev/null +++ b/configs/egov-persister/pdf-filestoreid-update.yml @@ -0,0 +1,30 @@ +serviceMaps: + serviceName: pdf-service + mappings: + - version: 1.0 + description: Update fileStoreIds + fromTopic: PDF_GEN_CREATE + isTransaction: true + queryMaps: + + + - query: UPDATE eg_tl_tradelicense SET filestoreid=? WHERE id = ? + basePath: jobs.* + jsonMaps: + + - jsonPath: $.jobs.*.filestoreids + type: ARRAY + dbType: STRING + + - jsonPath: $.jobs.*.entityid + + + - query: UPDATE egbs_bill_v1 SET filestoreid=? WHERE id = ? + basePath: jobs.* + jsonMaps: + + - jsonPath: $.jobs.*.filestoreids + type: ARRAY + dbType: STRING + + - jsonPath: $.jobs.*.entityid diff --git a/configs/egov-persister/pdf-generator.yml b/configs/egov-persister/pdf-generator.yml new file mode 100644 index 00000000..9bb8c94a --- /dev/null +++ b/configs/egov-persister/pdf-generator.yml @@ -0,0 +1,41 @@ +serviceMaps: + serviceName: PDF Generation Service + mappings: + - version: 1.0 + name: PDF create + description: create PDF + fromTopic: PDF_GEN_CREATE + queryMaps: + - query: INSERT INTO egov_pdf_gen(jobid,filestoreids,tenantid,createdtime,endtime,totalcount,entityid,isconsolidated,id,createdby,modifiedby,key,documenttype,modulename) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: $.jobs.* + jsonMaps: + + - jsonPath: $.jobs.*.jobid + + - jsonPath: $.jobs.*.filestoreids + type: JSON + dbType: JSONB + + - jsonPath: $.jobs.*.tenantId + + - jsonPath: $.jobs.*.createdtime + + - jsonPath: $.jobs.*.endtime + + - jsonPath: $.jobs.*.totalcount + + - jsonPath: $.jobs.*.entityid + + - jsonPath: $.jobs.*.isconsolidated + + - jsonPath: $.jobs.*.id + + - jsonPath: $.jobs.*.createdby + + - jsonPath: $.jobs.*.modifiedby + + - jsonPath: $.jobs.*.key + + - jsonPath: $.jobs.*.documentType + + - jsonPath: $.jobs.*.moduleName diff --git a/configs/egov-persister/pg-service-persister.yml b/configs/egov-persister/pg-service-persister.yml new file mode 100644 index 00000000..341954f9 --- /dev/null +++ b/configs/egov-persister/pg-service-persister.yml @@ -0,0 +1,147 @@ +serviceMaps: + serviceName: PaymentGateway + mappings: + - version: 1.0 + name: pg-service + description: Persists transactions + fromTopic: save-pg-txns + isTransaction: true + queryMaps: + - query: INSERT INTO eg_pg_transactions (txn_id, txn_amount, txn_status, txn_status_msg, gateway, consumer_code, bill_id, product_info, user_uuid, user_name, mobile_number, email_id, name, user_tenant_id, tenant_id, gateway_txn_id, gateway_payment_mode, gateway_status_code, gateway_status_msg, receipt, additional_details, created_by, created_time, last_modified_by, last_modified_time) VALUES (?, ?::numeric, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + + basePath: Transaction + jsonMaps: + + - jsonPath: $.Transaction.txnId + + - jsonPath: $.Transaction.txnAmount + + - jsonPath: $.Transaction.txnStatus + + - jsonPath: $.Transaction.txnStatusMsg + + - jsonPath: $.Transaction.gateway + + - jsonPath: $.Transaction.consumerCode + + - jsonPath: $.Transaction.billId + + - jsonPath: $.Transaction.productInfo + + - jsonPath: $.Transaction.user.uuid + + - jsonPath: $.Transaction.user.userName + + - jsonPath: $.Transaction.user.mobileNumber + + - jsonPath: $.Transaction.user.emailId + + - jsonPath: $.Transaction.user.name + + - jsonPath: $.Transaction.user.tenantId + + - jsonPath: $.Transaction.tenantId + + - jsonPath: $.Transaction.gatewayTxnId + + - jsonPath: $.Transaction.gatewayPaymentMode + + - jsonPath: $.Transaction.gatewayStatusCode + + - jsonPath: $.Transaction.gatewayStatusMsg + + - jsonPath: $.Transaction.receipt + + - jsonPath: $.Transaction.additionalDetails + type: JSON + dbType: JSONB + + - jsonPath: $.Transaction.auditDetails.createdBy + + - jsonPath: $.Transaction.auditDetails.createdTime + + - jsonPath: $.Transaction.auditDetails.lastModifiedBy + + - jsonPath: $.Transaction.auditDetails.lastModifiedTime + + + + - version: 1.0 + name: pg-service + description: Persists transaction requests / response to and from gateways + fromTopic: save-pg-txns-dump + isTransaction: true + queryMaps: + + - query: INSERT INTO eg_pg_transactions_dump (txn_id, txn_request, txn_response, created_by, created_time, last_modified_by, last_modified_time) VALUES (?, ?, ?, ?, ?, ?, ?); + + basePath: TransactionDump + jsonMaps: + + - jsonPath: $.TransactionDump.txnId + + - jsonPath: $.TransactionDump.txnRequest + + - jsonPath: $.TransactionDump.txnResponse + type: JSON + dbType: JSONB + + - jsonPath: $.TransactionDump.auditDetails.createdBy + + - jsonPath: $.TransactionDump.auditDetails.createdTime + + - jsonPath: $.TransactionDump.auditDetails.lastModifiedBy + + - jsonPath: $.TransactionDump.auditDetails.lastModifiedTime + + - version: 1.0 + description: Update transaction + fromTopic: update-pg-txns + isTransaction: true + queryMaps: + + - query: UPDATE eg_pg_transactions SET txn_status=?, txn_status_msg=?, gateway_txn_id=?,gateway_payment_mode=?,gateway_status_code=?, gateway_status_msg=?, receipt=?, last_modified_by=?, last_modified_time=? where txn_id=? AND tenant_id=?; + basePath: Transaction + jsonMaps: + + - jsonPath: $.Transaction.txnStatus + + - jsonPath: $.Transaction.txnStatusMsg + + - jsonPath: $.Transaction.gatewayTxnId + + - jsonPath: $.Transaction.gatewayPaymentMode + + - jsonPath: $.Transaction.gatewayStatusCode + + - jsonPath: $.Transaction.gatewayStatusMsg + + - jsonPath: $.Transaction.receipt + + - jsonPath: $.Transaction.auditDetails.lastModifiedBy + + - jsonPath: $.Transaction.auditDetails.lastModifiedTime + + - jsonPath: $.Transaction.txnId + + - jsonPath: $.Transaction.tenantId + + - version: 1.0 + description: Update transaction dump + fromTopic: update-pg-txns-dump + isTransaction: true + queryMaps: + + - query: UPDATE eg_pg_transactions_dump SET txn_response=?, last_modified_by=?, last_modified_time=? where txn_id=? ; + basePath: TransactionDump + jsonMaps: + + - jsonPath: $.TransactionDump.txnResponse + type: JSON + dbType: JSONB + + - jsonPath: $.TransactionDump.auditDetails.lastModifiedBy + + - jsonPath: $.TransactionDump.auditDetails.lastModifiedTime + + - jsonPath: $.TransactionDump.txnId \ No newline at end of file diff --git a/configs/egov-persister/pgr-v3-persister.yml b/configs/egov-persister/pgr-v3-persister.yml new file mode 100644 index 00000000..3690c374 --- /dev/null +++ b/configs/egov-persister/pgr-v3-persister.yml @@ -0,0 +1,211 @@ +serviceMaps: + serviceName: User Service + mappings: + - version: 1.0 + name: PGR + description: Persists grievance details in service table + fromTopic: save-pgr-service + isTransaction: true + queryMaps: + - query: INSERT INTO eg_pgr_service(tenantid, servicecode, servicerequestid, description, lat, "long", addressid, address, email, deviceid, accountid, firstname, lastname, phone, attributes, status, source, expectedtime, rating, feedback, landmark, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + + basePath: services.* + jsonMaps: + + + - jsonPath: $.services.*.tenantId + + - jsonPath: $.services.*.serviceCode + + - jsonPath: $.services.*.serviceRequestId + + - jsonPath: $.services.*.description + + - jsonPath: $.services.*.lat + + - jsonPath: $.services.*.long + + - jsonPath: $.services.*.addressId + + - jsonPath: $.services.*.address + + - jsonPath: $.services.*.email + + - jsonPath: $.services.*.deviceId + + - jsonPath: $.services.*.accountId + + - jsonPath: $.services.*.firstName + + - jsonPath: $.services.*.lastName + + - jsonPath: $.services.*.phone + + - jsonPath: $.services.*.attributes + type: JSON + dbType: JSONB + + - jsonPath: $.services.*.status + + - jsonPath: $.services.*.source + + - jsonPath: $.services.*.expectedTime + + - jsonPath: $.services.*.rating + + - jsonPath: $.services.*.feedback + + - jsonPath: $.services.*.landmark + + - jsonPath: $.services.*.auditDetails.createdBy + + - jsonPath: $.services.*.auditDetails.createdTime + + - jsonPath: $.services.*.auditDetails.lastModifiedBy + + - jsonPath: $.services.*.auditDetails.lastModifiedTime + + + - query: INSERT INTO eg_pgr_action(uuid, by, "when", action, status, comments, media, assignee, isinternal, tenantid, businesskey) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + + basePath: actionInfo.* + jsonMaps: + + - jsonPath: $.actionInfo.*.uuid + + - jsonPath: $.actionInfo.*.by + + - jsonPath: $.actionInfo.*.when + + - jsonPath: $.actionInfo.*.action + + - jsonPath: $.actionInfo.*.status + + - jsonPath: $.actionInfo.*.comments + + - jsonPath: $.actionInfo.*.media + type: JSON + dbType: JSONB + + - jsonPath: $.actionInfo.*.assignee + + - jsonPath: $.actionInfo.*.isInternal + + - jsonPath: $.actionInfo.*.tenantId + + - jsonPath: $.actionInfo.*.businessKey + + + - query: INSERT INTO eg_pgr_address(uuid, housenoandstreetname, mohalla, landmark, latitude, longitude, city, tenantid, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + + basePath: services.* + jsonMaps: + + - jsonPath: $.services.*.addressDetail.uuid + + - jsonPath: $.services.*.addressDetail.houseNoAndStreetName + + - jsonPath: $.services.*.addressDetail.mohalla + + - jsonPath: $.services.*.addressDetail.landmark + + - jsonPath: $.services.*.addressDetail.latitude + + - jsonPath: $.services.*.addressDetail.longitude + + - jsonPath: $.services.*.addressDetail.city + + - jsonPath: $.services.*.addressDetail.tenantId + + - jsonPath: $.services.*.addressDetail.auditDetails.createdBy + + - jsonPath: $.services.*.addressDetail.auditDetails.createdTime + + - jsonPath: $.services.*.addressDetail.auditDetails.lastModifiedBy + + - jsonPath: $.services.*.addressDetail.auditDetails.lastModifiedTime + + + - version: 1.0 + name: Asset + description: Persists asset details in eg_asset table + fromTopic: update-pgr-service + isTransaction: true + queryMaps: + + - query: UPDATE eg_pgr_service SET servicecode=?, description=?,lat=?, "long"=?, email=?, deviceid=?, firstname=?, lastname=?, phone=?, attributes=?, status=?, source=?, expectedtime=?, feedback=?, rating=?, landmark=?, lastmodifiedby=?, lastmodifiedtime=? WHERE tenantid=? AND servicerequestid=?; + + basePath: services.* + jsonMaps: + + - jsonPath: $.services.*.serviceCode + + - jsonPath: $.services.*.description + + - jsonPath: $.services.*.lat + + - jsonPath: $.services.*.long + + - jsonPath: $.services.*.email + + - jsonPath: $.services.*.deviceId + + - jsonPath: $.services.*.firstName + + - jsonPath: $.services.*.lastName + + - jsonPath: $.services.*.phone + + - jsonPath: $.services.*.attributes + type: JSON + dbType: JSONB + + - jsonPath: $.services.*.status + + - jsonPath: $.services.*.source + + - jsonPath: $.services.*.expectedTime + + - jsonPath: $.services.*.feedback + + - jsonPath: $.services.*.rating + + - jsonPath: $.services.*.landmark + + - jsonPath: $.services.*.auditDetails.lastModifiedBy + + - jsonPath: $.services.*.auditDetails.lastModifiedTime + + - jsonPath: $.services.*.tenantId + + - jsonPath: $.services.*.serviceRequestId + + + - query: INSERT INTO eg_pgr_action(uuid, by, "when", action, status, comments, media, assignee, isinternal, tenantid, businesskey) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + + basePath: actionInfo.* + jsonMaps: + + - jsonPath: $.actionInfo.*.uuid + + - jsonPath: $.actionInfo.*.by + + - jsonPath: $.actionInfo.*.when + + - jsonPath: $.actionInfo.*.action + + - jsonPath: $.actionInfo.*.status + + - jsonPath: $.actionInfo.*.comments + + - jsonPath: $.actionInfo.*.media + type: JSON + dbType: JSONB + + - jsonPath: $.actionInfo.*.assignee + + - jsonPath: $.actionInfo.*.isInternal + + - jsonPath: $.actionInfo.*.tenantId + + - jsonPath: $.actionInfo.*.businessKey \ No newline at end of file diff --git a/configs/egov-persister/pgr.yml b/configs/egov-persister/pgr.yml new file mode 100644 index 00000000..fda7078f --- /dev/null +++ b/configs/egov-persister/pgr.yml @@ -0,0 +1,203 @@ +serviceMaps: + serviceName: User Service + mappings: + - version: 1.0 + name: Asset + description: Persists asset details in eg_asset table + fromTopic: save-pgr-servicereq + isTransaction: true + queryMaps: + - query: INSERT INTO eg_pgr_servicereq(tenantId,serviceCode,serviceRequestId,description,lat,long,address,addressId,email,deviceId,accountId,firstName,lastName,phone,attributes,status,assignedTo,source,expectedTime,createdby,createdtime,lastmodifiedby,lastmodifiedtime) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?); + + basePath: serviceReq.* + jsonMaps: + + + - jsonPath: $.serviceReq.*.tenantId + + - jsonPath: $.serviceReq.*.serviceCode + + - jsonPath: $.serviceReq.*.serviceRequestId + + - jsonPath: $.serviceReq.*.description + + - jsonPath: $.serviceReq.*.lat + + - jsonPath: $.serviceReq.*._long + + - jsonPath: $.serviceReq.*.address + + - jsonPath: $.serviceReq.*.addressId + + - jsonPath: $.serviceReq.*.email + + - jsonPath: $.serviceReq.*.deviceId + + - jsonPath: $.serviceReq.*.accountId + + - jsonPath: $.serviceReq.*.firstName + + - jsonPath: $.serviceReq.*.lastName + + - jsonPath: $.serviceReq.*.phone + + - jsonPath: $.serviceReq.*.attributes + type: JSON + dbType: JSONB + + - jsonPath: $.serviceReq.*.status + + - jsonPath: $.serviceReq.*.assignedTo + + - jsonPath: $.serviceReq.*.source + + - jsonPath: $.serviceReq.*.expectedTime + + - jsonPath: $.serviceReq.*.auditDetails.createdBy + + - jsonPath: $.serviceReq.*.auditDetails.createdTime + + - jsonPath: $.serviceReq.*.auditDetails.lastModifiedBy + + - jsonPath: $.serviceReq.*.auditDetails.lastModifiedTime + + + - query: INSERT INTO eg_pgr_media(id, by, "when",url, tenantId,serviceRequestId) VALUES (?,?,?,?,?,?); + + basePath: serviceReq.*.media.* + jsonMaps: + + - jsonPath: $.serviceReq.*.media.*.id + + - jsonPath: $.serviceReq.*.media.*.by + + - jsonPath: $.serviceReq[?({id} in @.media[*].id)].auditDetails.createdTime + + - jsonPath: $.serviceReq.*.media.*.url + + - jsonPath: $.serviceReq[?({id} in @.media[*].id)].tenantId + + - jsonPath: $.serviceReq[?({id} in @.media[*].id)].serviceRequestId + + + - query: INSERT INTO eg_pgr_comment(id, by, "when", message, tenantId,serviceRequestId, isInternal) VALUES (?,?,?,?,?,?,?); + + basePath: serviceReq.*.comments.* + jsonMaps: + + - jsonPath: $.serviceReq.*.comments.*.id + + - jsonPath: $.serviceReq.*.comments.*.by + + - jsonPath: $.serviceReq[?({id} in @.comments[*].id)].auditDetails.createdTime + + - jsonPath: $.serviceReq.*.comments.*.message + + - jsonPath: $.serviceReq[?({id} in @.comments[*].id)].tenantId + + - jsonPath: $.serviceReq[?({id} in @.comments[*].id)].serviceRequestId + + - jsonPath: $.serviceReq.*.comments.*.isInternal + + + - version: 1.0 + name: Asset + description: Persists asset details in eg_asset table + fromTopic: update-pgr-servicereq + isTransaction: true + queryMaps: + - query: INSERT INTO eg_pgr_servicereq_audit (tenantid, servicecode, servicerequestid, description, lat, "long", address, addressid, email, deviceid, accountid, firstname,lastname, phone, attributes, status, assignedto, source, expectedtime, createdby, createdtime,auditcreatedtime) SELECT tenantid, servicecode, servicerequestid, description, lat, "long", address, addressid, email, deviceid, accountid,firstname, lastname, phone, attributes, status, assignedto, source, expectedtime,lastmodifiedby,lastmodifiedtime,(select extract (EPOCH from now())*1000) FROM eg_pgr_servicereq where tenantId=? AND servicerequestid=?; + + basePath: serviceReq.* + jsonMaps: + + - jsonPath: $.serviceReq.*.tenantId + + - jsonPath: $.serviceReq.*.serviceRequestId + + + - query: UPDATE eg_pgr_servicereq SET description=?, lat=?, long=?,address=?, addressid=?, email=?, deviceid=?, accountid=?, firstname=?, lastname=?, phone=?, attributes=?, status=?, assignedto=?, source=?, expectedtime=?, lastmodifiedby=?, lastmodifiedtime=? WHERE tenantid=? AND servicerequestid=?; + + basePath: serviceReq.* + jsonMaps: + + - jsonPath: $.serviceReq.*.description + + - jsonPath: $.serviceReq.*.lat + + - jsonPath: $.serviceReq.*._long + + - jsonPath: $.serviceReq.*.address + + - jsonPath: $.serviceReq.*.addressId + + - jsonPath: $.serviceReq.*.email + + - jsonPath: $.serviceReq.*.deviceId + + - jsonPath: $.serviceReq.*.accountId + + - jsonPath: $.serviceReq.*.firstName + + - jsonPath: $.serviceReq.*.lastName + + - jsonPath: $.serviceReq.*.phone + + - jsonPath: $.serviceReq.*.attributes + type: JSON + dbType: JSONB + + - jsonPath: $.serviceReq.*.status + + - jsonPath: $.serviceReq.*.assignedTo + + - jsonPath: $.serviceReq.*.source + + - jsonPath: $.serviceReq.*.expectedTime + + - jsonPath: $.serviceReq.*.auditDetails.lastModifiedBy + + - jsonPath: $.serviceReq.*.auditDetails.lastModifiedTime + + - jsonPath: $.serviceReq.*.tenantId + + - jsonPath: $.serviceReq.*.serviceRequestId + + + + - query: INSERT INTO eg_pgr_media(id, by, "when",url, tenantId,serviceRequestId) VALUES (?,?,?,?,?,?) ON CONFLICT (id,TenantId) DO NOTHING; + + basePath: serviceReq.*.media.* + jsonMaps: + + - jsonPath: $.serviceReq.*.media.*.id + + - jsonPath: $.serviceReq.*.media.*.by + + - jsonPath: $.serviceReq[?({id} in @.media[*].id)].auditDetails.lastModifiedTime + + - jsonPath: $.serviceReq.*.media.*.url + + - jsonPath: $.serviceReq[?({id} in @.media[*].id)].tenantId + + - jsonPath: $.serviceReq[?({id} in @.media[*].id)].serviceRequestId + + + - query: INSERT INTO eg_pgr_comment(id, by, "when", message, tenantId,serviceRequestId, isInternal) VALUES (?,?,?,?,?,?,?) ON CONFLICT (id,tenantId) DO NOTHING; + + basePath: serviceReq.*.comments.* + jsonMaps: + + - jsonPath: $.serviceReq.*.comments.*.id + + - jsonPath: $.serviceReq.*.comments.*.by + + - jsonPath: $.serviceReq[?({id} in @.comments[*].id)].auditDetails.lastModifiedTime + + - jsonPath: $.serviceReq.*.comments.*.message + + - jsonPath: $.serviceReq[?({id} in @.comments[*].id)].tenantId + + - jsonPath: $.serviceReq[?({id} in @.comments[*].id)].serviceRequestId + + - jsonPath: $.serviceReq.*.comments.*.isInternal diff --git a/configs/egov-persister/property-services-migration-temp-config.yml b/configs/egov-persister/property-services-migration-temp-config.yml new file mode 100644 index 00000000..a4e65f92 --- /dev/null +++ b/configs/egov-persister/property-services-migration-temp-config.yml @@ -0,0 +1,400 @@ +serviceMaps: + serviceName: property-services + mappings: + - version: 1.0 + description: Persists property details in EG_PT_PROPERTY table + fromTopic: save-property-registry-batch + isTransaction: true + queryMaps: + + + - query: INSERT INTO eg_pt_property_audit (audituuid, propertyid, property, auditcreatedtime) VALUES ((select nextval('seq_eg_pt_registry_audit')), ?, ?, (SELECT extract(epoch from now()))); + basePath: Property + jsonMaps: + + - jsonPath: $.Property.propertyId + + - jsonPath: $.Property + type: JSON + dbType: JSONB + + - query: INSERT INTO eg_pt_property (id, propertyid, tenantid, surveyid, accountid, oldpropertyid, status, acknowldgementnumber, propertytype, ownershipcategory, usagecategory, creationreason, nooffloors, landarea, superbuiltuparea, source, channel, createdby, createdtime, lastmodifiedby, lastmodifiedtime, additionaldetails) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT(id) DO NOTHING; + basePath: Property + jsonMaps: + + - jsonPath: $.Property.id + + - jsonPath: $.Property.propertyId + + - jsonPath: $.Property.tenantId + + - jsonPath: $.Property.surveyId + + - jsonPath: $.Property.accountId + + - jsonPath: $.Property.oldPropertyId + + - jsonPath: $.Property.status + + - jsonPath: $.Property.acknowldgementNumber + + - jsonPath: $.Property.propertyType + + - jsonPath: $.Property.ownershipCategory + + - jsonPath: $.Property.usageCategory + + - jsonPath: $.Property.creationReason + + - jsonPath: $.Property.noOfFloors + + - jsonPath: $.Property.landArea + + - jsonPath: $.Property.superBuiltUpArea + + - jsonPath: $.Property.source + + - jsonPath: $.Property.channel + + - jsonPath: $.Property.auditDetails.createdBy + + - jsonPath: $.Property.auditDetails.createdTime + + - jsonPath: $.Property.auditDetails.lastModifiedBy + + - jsonPath: $.Property.auditDetails.lastModifiedTime + + - jsonPath: $.Property.additionalDetails + type: JSON + dbType: JSONB + + - query: INSERT INTO eg_pt_address(tenantid, id, propertyid, doorno, plotno, buildingname, street, landmark, city, pincode, locality, district, region, state, country, latitude, longitude, createdby, createdtime, lastmodifiedby, lastmodifiedtime, additionaldetails) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT(id) DO NOTHING; + basePath: Property.address + jsonMaps: + + - jsonPath: $.Property.address.tenantId + + - jsonPath: $.Property.address.id + + - jsonPath: $.Property.id + + - jsonPath: $.Property.address.doorNo + + - jsonPath: $.Property.address.plotNo + + - jsonPath: $.Property.address.buildingName + + - jsonPath: $.Property.address.street + + - jsonPath: $.Property.address.landmark + + - jsonPath: $.Property.address.city + + - jsonPath: $.Property.address.pincode + + - jsonPath: $.Property.address.locality.code + + - jsonPath: $.Property.address.district + + - jsonPath: $.Property.address.region + + - jsonPath: $.Property.address.state + + - jsonPath: $.Property.address.country + + - jsonPath: $.Property.address.geoLocation.latitude + + - jsonPath: $.Property.address.geoLocation.longitude + + - jsonPath: $.Property.auditDetails.createdBy + + - jsonPath: $.Property.auditDetails.createdTime + + - jsonPath: $.Property.auditDetails.lastModifiedBy + + - jsonPath: $.Property.auditDetails.lastModifiedTime + + - jsonPath: $.Property.address.additionalDetails + type: JSON + dbType: JSONB + + + - query: INSERT INTO eg_pt_unit(id, tenantid, propertyid, floorno, unittype, usagecategory, occupancytype, occupancydate, carpetarea, builtuparea, plintharea, superbuiltuparea, arv, constructiontype, constructiondate, dimensions, active, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT(id) DO NOTHING; + basePath: Property.units.* + jsonMaps: + + - jsonPath: $.Property.units.*.id + + - jsonPath: $.Property.tenantId + + - jsonPath: $.Property.id + + - jsonPath: $.Property.units.*.floorNo + + - jsonPath: $.Property.units.*.unitType + + - jsonPath: $.Property.units.*.usageCategory + + - jsonPath: $.Property.units.*.occupancyType + + - jsonPath: $.Property.units.*.occupancyDate + + - jsonPath: $.Property.units.*.constructionDetail.carpetArea + + - jsonPath: $.Property.units.*.constructionDetail.builtUpArea + + - jsonPath: $.Property.units.*.constructionDetail.plinthArea + + - jsonPath: $.Property.units.*.constructionDetail.superBuiltUpArea + + - jsonPath: $.Property.units.*.arv + + - jsonPath: $.Property.units.*.constructionDetail.constructionType + + - jsonPath: $.Property.units.*.constructionDetail.constructionDate + + - jsonPath: $.Property.units.*.constructionDetail.dimensions + type: JSON + dbType: JSONB + + - jsonPath: $.Property.units.*.active + + - jsonPath: $.Property.auditDetails.createdBy + + - jsonPath: $.Property.auditDetails.createdTime + + - jsonPath: $.Property.auditDetails.lastModifiedBy + + - jsonPath: $.Property.auditDetails.lastModifiedTime + + - query: UPDATE eg_pt_property SET propertyid=?, surveyid=?, accountid=?, oldpropertyid=?, status=?, propertytype=?, ownershipcategory=?, usagecategory=?, nooffloors=?, landarea=?, superbuiltuparea=?, lastmodifiedby=?, lastmodifiedtime=?, additionaldetails=? WHERE Id=? AND tenantId=?; + basePath: Property + jsonMaps: + + - jsonPath: $.Property.propertyId + + - jsonPath: $.Property.surveyId + + - jsonPath: $.Property.accountId + + - jsonPath: $.Property.oldPropertyId + + - jsonPath: $.Property.status + + - jsonPath: $.Property.propertyType + + - jsonPath: $.Property.ownershipCategory + + - jsonPath: $.Property.usageCategory + + - jsonPath: $.Property.noOfFloors + + - jsonPath: $.Property.landArea + + - jsonPath: $.Property.superBuiltUpArea + + - jsonPath: $.Property.auditDetails.lastModifiedBy + + - jsonPath: $.Property.auditDetails.lastModifiedTime + + - jsonPath: $.Property.additionalDetails + type: JSON + dbType: JSONB + + - jsonPath: $.Property.id + + - jsonPath: $.Property.tenantId + + + - query: INSERT INTO eg_pt_owner (ownerinfouuid, tenantid, propertyid, userid, status, isprimaryowner, ownertype, ownershippercentage, institutionid, relationship, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (userid, propertyid) DO UPDATE SET status=EXCLUDED.status, isprimaryowner=EXCLUDED.isprimaryowner, ownertype=EXCLUDED.ownertype, ownershippercentage=EXCLUDED.ownershippercentage, institutionid=EXCLUDED.institutionid, relationship=EXCLUDED.relationship, lastmodifiedby=EXCLUDED.lastModifiedby, lastmodifiedtime=EXCLUDED.lastmodifiedtime; + basePath: Property.owners.* + jsonMaps: + + - jsonPath: $.Property.owners.*.ownerInfoUuid + + - jsonPath: $.Property.tenantId + + - jsonPath: $.Property.id + + - jsonPath: $.Property.owners.*.uuid + + - jsonPath: $.Property.owners.*.status + + - jsonPath: $.Property.owners.*.isPrimaryOwner + + - jsonPath: $.Property.owners.*.ownerType + + - jsonPath: $.Property.owners.*.ownerShipPercentage + + - jsonPath: $.Property.owners.*.institutionId + + - jsonPath: $.Property.owners.*.relationship + + - jsonPath: $.Property.auditDetails.createdBy + + - jsonPath: $.Property.auditDetails.createdTime + + - jsonPath: $.Property.auditDetails.lastModifiedBy + + - jsonPath: $.Property.auditDetails.lastModifiedTime + + - query: INSERT INTO eg_pt_document (id, tenantid, entityid, documenttype, filestoreid, documentuid, status, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET documenttype = EXCLUDED.documenttype,fileStoreid = EXCLUDED.filestoreid, documentuid=EXCLUDED.documentuid, status=EXCLUDED.status, lastmodifiedby = EXCLUDED.lastModifiedby, lastmodifiedtime = EXCLUDED.lastmodifiedtime; + basePath: $.Property.documents.* + jsonMaps: + + - jsonPath: $.Property.documents.*.id + + - jsonPath: $.Property.tenantId + + - jsonPath: $.Property.id + + - jsonPath: $.Property.documents.*.documentType + + - jsonPath: $.Property.documents.*.fileStoreId + + - jsonPath: $.Property.documents.*.documentUid + + - jsonPath: $.Property.documents.*.status + + - jsonPath: $.Property.auditDetails.createdBy + + - jsonPath: $.Property.auditDetails.lastModifiedBy + + - jsonPath: $.Property.auditDetails.createdTime + + - jsonPath: $.Property.auditDetails.lastModifiedTime + + - query: INSERT INTO eg_pt_document (id, tenantid, entityid, documenttype, filestoreid, documentuid, status, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET documenttype = EXCLUDED.documenttype,fileStoreid = EXCLUDED.filestoreid, documentuid=EXCLUDED.documentuid, status=EXCLUDED.status, lastmodifiedby = EXCLUDED.lastModifiedby, lastmodifiedtime = EXCLUDED.lastmodifiedtime; + basePath: $.Property.owners.*.documents.* + jsonMaps: + + - jsonPath: $.Property.owners.*.documents.*.id + + - jsonPath: $.Property.tenantId + + - jsonPath: $.Property.owners[*][?({id} in @.documents[*].id)].ownerInfoUuid + + - jsonPath: $.Property.owners.*.documents.*.documentType + + - jsonPath: $.Property.owners.*.documents.*.fileStoreId + + - jsonPath: $.Property.owners.*.documents.*.documentUid + + - jsonPath: $.Property.owners.*.documents.*.status + + - jsonPath: $.Property.auditDetails.createdBy + + - jsonPath: $.Property.auditDetails.lastModifiedBy + + - jsonPath: $.Property.auditDetails.createdTime + + - jsonPath: $.Property.auditDetails.lastModifiedTime + + - query: UPDATE eg_pt_address SET doorno=?, plotno=?, buildingname=?, street=?, landmark=?, city=?, pincode=?, locality=?, district=?, region=?, state=?, country=?, latitude=?, longitude=?, lastmodifiedby=?, lastmodifiedtime=?, additionaldetails=? WHERE id=?; + basePath: Property.address + jsonMaps: + + - jsonPath: $.Property.address.doorNo + + - jsonPath: $.Property.address.plotNo + + - jsonPath: $.Property.address.buildingName + + - jsonPath: $.Property.address.street + + - jsonPath: $.Property.address.landmark + + - jsonPath: $.Property.address.city + + - jsonPath: $.Property.address.pincode + + - jsonPath: $.Property.address.locality.code + + - jsonPath: $.Property.address.district + + - jsonPath: $.Property.address.region + + - jsonPath: $.Property.address.state + + - jsonPath: $.Property.address.country + + - jsonPath: $.Property.address.geoLocation.latitude + + - jsonPath: $.Property.address.geoLocation.longitude + + - jsonPath: $.Property.auditDetails.lastModifiedBy + + - jsonPath: $.Property.auditDetails.lastModifiedTime + + - jsonPath: $.Property.address.additionalDetails + type: JSON + dbType: JSONB + + - jsonPath: $.Property.address.id + + - query: INSERT INTO eg_pt_institution (id, propertyid, tenantid, name, nameofauthorizedperson, type, designation, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET name=EXCLUDED.name, type=EXCLUDED.type, designation=EXCLUDED.designation, lastmodifiedby=EXCLUDED.lastModifiedby, lastmodifiedtime=EXCLUDED.lastmodifiedtime; + basePath: $.Property.institution + jsonMaps: + + - jsonPath: $.Property.institution.id + + - jsonPath: $.Property.id + + - jsonPath: $.Property.tenantId + + - jsonPath: $.Property.institution.name + + - jsonPath: $.Property.institution.nameOfAuthorizedPerson + + - jsonPath: $.Property.institution.type + + - jsonPath: $.Property.institution.designation + + - jsonPath: $.Property.auditDetails.createdBy + + - jsonPath: $.Property.auditDetails.createdTime + + - jsonPath: $.Property.auditDetails.lastModifiedBy + + - jsonPath: $.Property.auditDetails.lastModifiedTime + + + - query: UPDATE eg_pt_unit SET floorno=?, unittype=?, usagecategory=?, occupancytype=?, occupancydate=?, carpetarea=?, builtuparea=?, plintharea=?, superbuiltuparea=?, arv=?, constructiontype=?, constructiondate=?, dimensions=?, active=?, lastmodifiedby=?, lastmodifiedtime=? WHERE id=?; + basePath: Property.units.* + jsonMaps: + + - jsonPath: $.Property.units.*.floorNo + + - jsonPath: $.Property.units.*.unitType + + - jsonPath: $.Property.units.*.usageCategory + + - jsonPath: $.Property.units.*.occupancyType + + - jsonPath: $.Property.units.*.occupancyDate + + - jsonPath: $.Property.units.*.constructionDetail.carpetArea + + - jsonPath: $.Property.units.*.constructionDetail.builtUpArea + + - jsonPath: $.Property.units.*.constructionDetail.plinthArea + + - jsonPath: $.Property.units.*.constructionDetail.superBuiltUpArea + + - jsonPath: $.Property.units.*.arv + + - jsonPath: $.Property.units.*.constructionDetail.constructionType + + - jsonPath: $.Property.units.*.constructionDetail.constructionDate + + - jsonPath: $.Property.units.*.constructionDetail.dimensions + type: JSON + dbType: JSONB + + - jsonPath: $.Property.units.*.active + + - jsonPath: $.Property.auditDetails.lastModifiedBy + + - jsonPath: $.Property.auditDetails.lastModifiedTime + + - jsonPath: $.Property.units.*.id diff --git a/configs/egov-persister/property-services-persister.yml b/configs/egov-persister/property-services-persister.yml new file mode 100644 index 00000000..0076f358 --- /dev/null +++ b/configs/egov-persister/property-services-persister.yml @@ -0,0 +1,784 @@ +serviceMaps: + serviceName: property-services + mappings: + - version: 1.0 + description: Persists property details in EG_PT_PROPERTY table + fromTopic: save-pt-property + isTransaction: true + queryMaps: + + - query: INSERT INTO eg_pt_property_v2(tenantId,propertyId, status,acknowldgementNumber, oldPropertyId, creationReason, occupancyDate,additionalDetails ,createdBy,createdTime,lastModifiedBy,lastModifiedTime ) VALUES (?,?,?,?,?,?,?,?,?,?,?,?); + basePath: Properties.* + jsonMaps: + - jsonPath: $.Properties.*.tenantId + + - jsonPath: $.Properties.*.propertyId + + - jsonPath: $.Properties.*.status + + - jsonPath: $.Properties.*.acknowldgementNumber + + - jsonPath: $.Properties.*.oldPropertyId + + - jsonPath: $.Properties.*.creationReason + + - jsonPath: $.Properties.*.occupancyDate + + - jsonPath: $.Properties.*.additionalDetails + type: JSON + dbType: JSONB + + - jsonPath: $.Properties.*.auditDetails.createdBy + + - jsonPath: $.Properties.*.auditDetails.createdTime + + - jsonPath: $.Properties.*.auditDetails.lastModifiedBy + + - jsonPath: $.Properties.*.auditDetails.lastModifiedTime + + + - query: INSERT INTO eg_pt_propertydetail_v2(tenantId,assessmentNumber,property,accountId,ownershipCategory,subOwnershipCategory,source,usage,noOfFloors,landArea,buildUpArea,additionalDetails,channel,financialYear,propertyType,propertySubType,usageCategoryMajor,usageCategoryMinor,assessmentDate,adhocExemption,adhocPenalty,adhocExemptionReason,adhocPenaltyReason,createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?); + basePath: Properties.*.propertyDetails.* + jsonMaps: + + - jsonPath: $.Properties[*][?({assessmentNumber} in @.propertyDetails[*].assessmentNumber)].tenantId + + - jsonPath: $.Properties.*.propertyDetails.*.assessmentNumber + + - jsonPath: $.Properties[*][?({assessmentNumber} in @.propertyDetails[*].assessmentNumber)].propertyId + + - jsonPath: $.Properties.*.propertyDetails.*.citizenInfo.uuid + + - jsonPath: $.Properties.*.propertyDetails.*.ownershipCategory + + - jsonPath: $.Properties.*.propertyDetails.*.subOwnershipCategory + + - jsonPath: $.Properties.*.propertyDetails.*.source + + - jsonPath: $.Properties.*.propertyDetails.*.usage + + - jsonPath: $.Properties.*.propertyDetails.*.noOfFloors + + - jsonPath: $.Properties.*.propertyDetails.*.landArea + + - jsonPath: $.Properties.*.propertyDetails.*.buildUpArea + + - jsonPath: $.Properties.*.propertyDetails.*.additionalDetails + type: JSON + dbType: JSONB + + - jsonPath: $.Properties.*.propertyDetails.*.channel + + - jsonPath: $.Properties.*.propertyDetails.*.financialYear + + - jsonPath: $.Properties.*.propertyDetails.*.propertyType + + - jsonPath: $.Properties.*.propertyDetails.*.propertySubType + + - jsonPath: $.Properties.*.propertyDetails.*.usageCategoryMajor + + - jsonPath: $.Properties.*.propertyDetails.*.usageCategoryMinor + + - jsonPath: $.Properties.*.propertyDetails.*.assessmentDate + + - jsonPath: $.Properties.*.propertyDetails.*.adhocExemption + + - jsonPath: $.Properties.*.propertyDetails.*.adhocPenalty + + - jsonPath: $.Properties.*.propertyDetails.*.adhocExemptionReason + + - jsonPath: $.Properties.*.propertyDetails.*.adhocPenaltyReason + + - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.createdBy + + - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.lastModifiedBy + + - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.createdTime + + - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.lastModifiedTime + + - query: INSERT INTO eg_pt_owner_v2(tenantId,propertyDetail, userid, isactive,isPrimaryOwner,ownerShipPercentage, ownerType,institutionId,relationship,createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: Properties.*.propertyDetails.*.owners.* + jsonMaps: + + - jsonPath: $.Properties[*][?({uuid} in @.propertyDetails.*.owners[*].uuid)].tenantId + + - jsonPath: $.Properties.*.propertyDetails[*][?({uuid} in @.owners[*].uuid)].assessmentNumber + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.uuid + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.isActive + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.isPrimaryOwner + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.ownerShipPercentage + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.ownerType + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.institutionId + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.relationship + + - jsonPath: $.Properties.*.propertyDetails[*][?({uuid} in @.owners[*].uuid)].auditDetails.createdBy + + - jsonPath: $.Properties.*.propertyDetails[*][?({uuid} in @.owners[*].uuid)].auditDetails.lastModifiedBy + + - jsonPath: $.Properties.*.propertyDetails[*][?({uuid} in @.owners[*].uuid)].auditDetails.createdTime + + - jsonPath: $.Properties.*.propertyDetails[*][?({uuid} in @.owners[*].uuid)].auditDetails.lastModifiedTime + + + + - query: INSERT INTO eg_pt_document_propertydetail_v2(tenantId,id, propertydetail, documenttype, fileStore,documentuid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?,?,?, ?, ?, ?, ?, ?, ?, ?); + basePath: $.Properties.*.propertyDetails.*.documents.* + jsonMaps: + + - jsonPath: $.Properties[*][?({id} in @.propertyDetails.*.documents[*].id)].tenantId + + - jsonPath: $.Properties.*.propertyDetails.*.documents.*.id + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.documents[*].id)].assessmentNumber + + - jsonPath: $.Properties.*.propertyDetails.*.documents.*.documentType + + - jsonPath: $.Properties.*.propertyDetails.*.documents.*.fileStore + + - jsonPath: $.Properties.*.propertyDetails.*.documents.*.documentUid + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.documents[*].id)].auditDetails.createdBy + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.documents[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.documents[*].id)].auditDetails.createdTime + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.documents[*].id)].auditDetails.lastModifiedTime + + + - query: INSERT INTO eg_pt_document_owner_v2(tenantId,id,userid, propertydetail, documenttype, fileStore,documentuid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?,?,?,?, ?, ?, ?, ?, ?, ?, ?); + basePath: $.Properties.*.propertyDetails.*.owners.*.documents.* + jsonMaps: + + - jsonPath: $.Properties[*][?({id} in @.propertyDetails.*.owners.*.documents[*].id)].tenantId + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.documents.*.id + + - jsonPath: $.Properties.*.propertyDetails.*.owners[*][?({id} in @.documents[*].id)].uuid + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.owners.*.documents[*].id)].assessmentNumber + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.documents.*.documentType + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.documents.*.fileStore + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.documents.*.documentUid + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.owners.*.documents[*].id)].auditDetails.createdBy + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.owners.*.documents[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.owners.*.documents[*].id)].auditDetails.createdTime + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.owners.*.documents[*].id)].auditDetails.lastModifiedTime + + + + - query: INSERT INTO eg_pt_address_v2(tenantId, id, property,doorNo, latitude,longitude, addressid, addressnumber, type, addressline1, addressline2, landmark, city, pincode, detail,buildingName,street, locality, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?,?,?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: Properties.*.address + jsonMaps: + + - jsonPath: $.Properties.*.tenantId + + - jsonPath: $.Properties.*.address.id + + - jsonPath: $.Properties.*.propertyId + + - jsonPath: $.Properties.*.address.doorNo + + - jsonPath: $.Properties.*.address.latitude + + - jsonPath: $.Properties.*.address.longitude + + - jsonPath: $.Properties.*.address.addressId + + - jsonPath: $.Properties.*.address.addressNumber + + - jsonPath: $.Properties.*.address.type + + - jsonPath: $.Properties.*.address.addressLine1 + + - jsonPath: $.Properties.*.address.addressLine2 + + - jsonPath: $.Properties.*.address.landmark + + - jsonPath: $.Properties.*.address.city + + - jsonPath: $.Properties.*.address.pincode + + - jsonPath: $.Properties.*.address.detail + + - jsonPath: $.Properties.*.address.buildingName + + - jsonPath: $.Properties.*.address.street + + - jsonPath: $.Properties.*.address.locality.code + + - jsonPath: $.Properties.*.auditDetails.createdBy + + - jsonPath: $.Properties.*.auditDetails.lastModifiedBy + + - jsonPath: $.Properties.*.auditDetails.createdTime + + - jsonPath: $.Properties.*.auditDetails.lastModifiedTime + + + - query: INSERT INTO eg_pt_unit_v2(tenantId,id,propertyDetail,floorNo,unitType,unitArea,usageCategoryMajor,usageCategoryMinor,usageCategorySubMinor,usageCategoryDetail,occupancyType,occupancyDate,constructionType,constructionSubType,arv,createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?); + basePath: Properties.*.propertyDetails.*.units.* + jsonMaps: + + - jsonPath: $.Properties[*][?({id} in @.propertyDetails.*.units[*].id)].tenantId + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.id + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.units[*].id)].assessmentNumber + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.floorNo + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.unitType + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.unitArea + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.usageCategoryMajor + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.usageCategoryMinor + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.usageCategorySubMinor + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.usageCategoryDetail + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.occupancyType + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.occupancyDate + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.constructionType + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.constructionSubType + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.arv + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.units[*].id)].auditDetails.createdBy + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.units[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.units[*].id)].auditDetails.createdTime + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.units[*].id)].auditDetails.lastModifiedTime + + - query: INSERT INTO eg_pt_institution_v2(tenantId,id, propertyDetail, name, type,designation, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?,?,?, ?, ?, ?, ?, ?, ?,?) ON CONFLICT ON CONSTRAINT pk_eg_pt_institution_v2 DO NOTHING; + basePath: $.Properties.*.propertyDetails.*.institution + jsonMaps: + + - jsonPath: $.Properties.*.propertyDetails.*.tenantId + + - jsonPath: $.Properties.*.propertyDetails.*.institution.id + + - jsonPath: $.Properties.*.propertyDetails.*.assessmentNumber + + - jsonPath: $.Properties.*.propertyDetails.*.institution.name + + - jsonPath: $.Properties.*.propertyDetails.*.institution.type + + - jsonPath: $.Properties.*.propertyDetails.*.institution.designation + + - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.createdBy + + - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.lastModifiedBy + + - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.createdTime + + - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.lastModifiedTime + + + + + + - version: 1.0 + description: Update property details in EG_PT_PROPERTY table + fromTopic: update-pt-property + isTransaction: true + queryMaps: + + + - query: INSERT INTO eg_pt_property_audit_v2 SELECT * FROM eg_pt_property_v2 WHERE propertyid = ?; + basePath: Properties.* + jsonMaps: + + - jsonPath: $.Properties.*.propertyId + + + - query: INSERT INTO eg_pt_address_audit_v2 SELECT * FROM eg_pt_address_v2 WHERE id = ?; + basePath: Properties.*.address + jsonMaps: + + - jsonPath: $.Properties.*.address.id + + + + - query: UPDATE eg_pt_property_v2 SET additionalDetails=?,status=?,acknowldgementNumber=?,oldPropertyId=?,creationReason=?, occupancyDate=?,lastModifiedBy=?, lastModifiedTime=? where propertyId=? AND tenantId=?; + basePath: Properties.* + jsonMaps: + + - jsonPath: $.Properties.*.additionalDetails + type: JSON + dbType: JSONB + + - jsonPath: $.Properties.*.status + + - jsonPath: $.Properties.*.acknowldgementNumber + + - jsonPath: $.Properties.*.oldPropertyId + + - jsonPath: $.Properties.*.creationReason + + - jsonPath: $.Properties.*.occupancyDate + + - jsonPath: $.Properties.*.auditDetails.lastModifiedBy + + - jsonPath: $.Properties.*.auditDetails.lastModifiedTime + + - jsonPath: $.Properties.*.propertyId + + - jsonPath: $.Properties.*.tenantId + + + + + - query: INSERT INTO eg_pt_propertydetail_v2(tenantId,assessmentNumber,property,accountId,ownershipCategory,subOwnershipCategory,source,usage,noOfFloors,landArea,buildUpArea,additionalDetails,channel,financialYear,propertyType,propertySubType,usageCategoryMajor,usageCategoryMinor,assessmentDate,adhocExemption,adhocPenalty,adhocExemptionReason,adhocPenaltyReason,createdby, lastmodifiedby, createdtime,lastmodifiedtime) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) ON CONFLICT (assessmentNumber) DO UPDATE SET accountId=?,financialYear=?, propertyType=?, propertySubType=?,usageCategoryMajor=?,usageCategoryMinor=?, assessmentDate=?,ownershipCategory=?,subOwnershipCategory=?,source=?,usage=?,noOfFloors=?,landArea=?,buildUpArea=?,additionalDetails=?,channel=?,adhocExemption=?,adhocPenalty=?,adhocExemptionReason=?,adhocPenaltyReason=?,lastModifiedBy=?, lastModifiedTime=?; + basePath: Properties.*.propertyDetails.* + jsonMaps: + + - jsonPath: $.Properties[*][?({assessmentNumber} in @.propertyDetails[*].assessmentNumber)].tenantId + + - jsonPath: $.Properties.*.propertyDetails.*.assessmentNumber + + - jsonPath: $.Properties[*][?({assessmentNumber} in @.propertyDetails[*].assessmentNumber)].propertyId + + - jsonPath: $.Properties.*.propertyDetails.*.citizenInfo.uuid + + - jsonPath: $.Properties.*.propertyDetails.*.ownershipCategory + + - jsonPath: $.Properties.*.propertyDetails.*.subOwnershipCategory + + - jsonPath: $.Properties.*.propertyDetails.*.source + + - jsonPath: $.Properties.*.propertyDetails.*.usage + + - jsonPath: $.Properties.*.propertyDetails.*.noOfFloors + + - jsonPath: $.Properties.*.propertyDetails.*.landArea + + - jsonPath: $.Properties.*.propertyDetails.*.buildUpArea + + - jsonPath: $.Properties.*.propertyDetails.*.additionalDetails + type: JSON + dbType: JSONB + + - jsonPath: $.Properties.*.propertyDetails.*.channel + + - jsonPath: $.Properties.*.propertyDetails.*.financialYear + + - jsonPath: $.Properties.*.propertyDetails.*.propertyType + + - jsonPath: $.Properties.*.propertyDetails.*.propertySubType + + - jsonPath: $.Properties.*.propertyDetails.*.usageCategoryMajor + + - jsonPath: $.Properties.*.propertyDetails.*.usageCategoryMinor + + - jsonPath: $.Properties.*.propertyDetails.*.assessmentDate + + - jsonPath: $.Properties.*.propertyDetails.*.adhocExemption + + - jsonPath: $.Properties.*.propertyDetails.*.adhocPenalty + + - jsonPath: $.Properties.*.propertyDetails.*.adhocExemptionReason + + - jsonPath: $.Properties.*.propertyDetails.*.adhocPenaltyReason + + - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.createdBy + + - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.lastModifiedBy + + - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.createdTime + + - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.lastModifiedTime + + - jsonPath: $.Properties.*.propertyDetails.*.citizenInfo.uuid + + - jsonPath: $.Properties.*.propertyDetails.*.financialYear + + - jsonPath: $.Properties.*.propertyDetails.*.propertyType + + - jsonPath: $.Properties.*.propertyDetails.*.propertySubType + + - jsonPath: $.Properties.*.propertyDetails.*.usageCategoryMajor + + - jsonPath: $.Properties.*.propertyDetails.*.usageCategoryMinor + + - jsonPath: $.Properties.*.propertyDetails.*.assessmentDate + + - jsonPath: $.Properties.*.propertyDetails.*.ownershipCategory + + - jsonPath: $.Properties.*.propertyDetails.*.subOwnershipCategory + + - jsonPath: $.Properties.*.propertyDetails.*.source + + - jsonPath: $.Properties.*.propertyDetails.*.usage + + - jsonPath: $.Properties.*.propertyDetails.*.noOfFloors + + - jsonPath: $.Properties.*.propertyDetails.*.landArea + + - jsonPath: $.Properties.*.propertyDetails.*.buildUpArea + + - jsonPath: $.Properties.*.propertyDetails.*.additionalDetails + type: JSON + dbType: JSONB + + - jsonPath: $.Properties.*.propertyDetails.*.channel + + - jsonPath: $.Properties.*.propertyDetails.*.adhocExemption + + - jsonPath: $.Properties.*.propertyDetails.*.adhocPenalty + + - jsonPath: $.Properties.*.propertyDetails.*.adhocExemptionReason + + - jsonPath: $.Properties.*.propertyDetails.*.adhocPenaltyReason + + - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.lastModifiedBy + + - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.lastModifiedTime + + + + - query: INSERT INTO eg_pt_owner_v2(tenantId,propertyDetail, userid, isActive,isPrimaryOwner,ownerShipPercentage, ownerType,institutionId,relationship, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT ON CONSTRAINT pk_eg_pt_owner_v2 DO UPDATE SET isActive =?,isPrimaryOwner=?,ownerShipPercentage=?,ownerType=?,institutionId=?,relationship=?,lastmodifiedby =?,lastmodifiedtime =?; + basePath: Properties.*.propertyDetails.*.owners.* + jsonMaps: + + - jsonPath: $.Properties[*][?({uuid} in @.propertyDetails.*.owners[*].uuid)].tenantId + + - jsonPath: $.Properties.*.propertyDetails[*][?({uuid} in @.owners[*].uuid)].assessmentNumber + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.uuid + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.isActive + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.isPrimaryOwner + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.ownerShipPercentage + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.ownerType + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.institutionId + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.relationship + + - jsonPath: $.Properties.*.propertyDetails[*][?({uuid} in @.owners[*].uuid)].auditDetails.lastModifiedBy + + - jsonPath: $.Properties.*.propertyDetails[*][?({uuid} in @.owners[*].uuid)].auditDetails.lastModifiedBy + + - jsonPath: $.Properties.*.propertyDetails[*][?({uuid} in @.owners[*].uuid)].auditDetails.lastModifiedTime + + - jsonPath: $.Properties.*.propertyDetails[*][?({uuid} in @.owners[*].uuid)].auditDetails.lastModifiedTime + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.isActive + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.isPrimaryOwner + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.ownerShipPercentage + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.ownerType + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.institutionId + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.relationship + + - jsonPath: $.Properties.*.propertyDetails[*][?({uuid} in @.owners[*].uuid)].auditDetails.lastModifiedBy + + - jsonPath: $.Properties.*.propertyDetails[*][?({uuid} in @.owners[*].uuid)].auditDetails.lastModifiedTime + + + - query: INSERT INTO eg_pt_document_propertydetail_v2(tenantId,id, propertydetail, documenttype, fileStore,documentuid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?,?) ON CONFLICT (id) DO UPDATE SET documenttype = ?, fileStore = ?,documentuid=?, lastmodifiedby = ?, lastmodifiedtime = ?; + basePath: $.Properties.*.propertyDetails.*.documents.* + jsonMaps: + + - jsonPath: $.Properties[*][?({id} in @.propertyDetails.*.documents[*].id)].tenantId + + - jsonPath: $.Properties.*.propertyDetails.*.documents.*.id + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.documents[*].id)].assessmentNumber + + - jsonPath: $.Properties.*.propertyDetails.*.documents.*.documentType + + - jsonPath: $.Properties.*.propertyDetails.*.documents.*.fileStore + + - jsonPath: $.Properties.*.propertyDetails.*.documents.*.documentUid + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.documents[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.documents[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.documents[*].id)].auditDetails.lastModifiedTime + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.documents[*].id)].auditDetails.lastModifiedTime + + - jsonPath: $.Properties.*.propertyDetails.documents.*.documentType + + - jsonPath: $.Properties.*.propertyDetails.*.documents.*.fileStore + + - jsonPath: $.Properties.*.propertyDetails.*.documents.*.documentUid + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.documents[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.documents[*].id)].auditDetails.lastModifiedTime + + + - query: INSERT INTO eg_pt_document_owner_v2(tenantId,id, userid,propertydetail, documenttype, fileStore,documentuid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?) ON CONFLICT (userid,propertydetail) DO UPDATE SET documenttype = ?, fileStore = ?,documentuid=?, lastmodifiedby = ?, lastmodifiedtime = ?; + basePath: $.Properties.*.propertyDetails.*.owners.*.documents.* + jsonMaps: + + - jsonPath: $.Properties[*][?({id} in @.propertyDetails.*.owners.*.documents[*].id)].tenantId + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.documents.*.id + + - jsonPath: $.Properties.*.propertyDetails.*.owners[*][?({id} in @.documents[*].id)].uuid + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.owners.*.documents[*].id)].assessmentNumber + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.documents.*.documentType + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.documents.*.fileStore + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.documents.*.documentUid + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.owners.*.documents[*].id)].auditDetails.createdBy + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.owners.*.documents[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.owners.*.documents[*].id)].auditDetails.createdTime + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.owners.*.documents[*].id)].auditDetails.lastModifiedTime + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.documents.*.documentType + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.documents.*.fileStore + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.documents.*.documentUid + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.owners.*.documents[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.owners.*.documents[*].id)].auditDetails.lastModifiedTime + + + + - query: INSERT INTO eg_pt_unit_v2(tenantId,id,propertyDetail,floorNo,unitType,unitArea,usageCategoryMajor,usageCategoryMinor,usageCategorySubMinor,usageCategoryDetail,occupancyType,occupancyDate,constructionType,constructionSubType,arv,createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) ON CONFLICT (id) DO UPDATE SET floorNo=?,unitType=?,unitArea=?,usageCategoryMajor=?,usageCategoryMinor=?,usageCategorySubMinor=?,usageCategoryDetail=?,occupancyType=?,occupancyDate=?,constructionType=?,constructionSubType=?,arv=?,lastmodifiedby=?,lastmodifiedtime=?; + basePath: Properties.*.propertyDetails.*.units.* + jsonMaps: + + - jsonPath: $.Properties[*][?({id} in @.propertyDetails.*.units[*].id)].tenantId + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.id + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.units[*].id)].assessmentNumber + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.floorNo + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.unitType + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.unitArea + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.usageCategoryMajor + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.usageCategoryMinor + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.usageCategorySubMinor + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.usageCategoryDetail + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.occupancyType + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.occupancyDate + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.constructionType + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.constructionSubType + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.arv + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.units[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.units[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.units[*].id)].auditDetails.lastModifiedTime + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.units[*].id)].auditDetails.lastModifiedTime + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.floorNo + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.unitType + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.unitArea + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.usageCategoryMajor + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.usageCategoryMinor + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.usageCategorySubMinor + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.usageCategoryDetail + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.occupancyType + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.occupancyDate + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.constructionType + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.constructionSubType + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.arv + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.units[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.units[*].id)].auditDetails.lastModifiedTime + + + + - query: UPDATE eg_pt_address_v2 SET doorNo=?,latitude=?,longitude=?, addressid=?, addressnumber=?, type=?, addressline1=?, addressline2=?, landmark=?, city=?, pincode=?, detail=?,buildingName=?,street=?, locality=?, lastmodifiedby=?, lastmodifiedtime=? where id=?; + basePath: Properties.*.address + jsonMaps: + + - jsonPath: $.Properties.*.address.doorNo + + - jsonPath: $.Properties.*.address.latitude + + - jsonPath: $.Properties.*.address.longitude + + - jsonPath: $.Properties.*.address.addressId + + - jsonPath: $.Properties.*.address.addressNumber + + - jsonPath: $.Properties.*.address.type + + - jsonPath: $.Properties.*.address.addressLine1 + + - jsonPath: $.Properties.*.address.addressLine2 + + - jsonPath: $.Properties.*.address.landmark + + - jsonPath: $.Properties.*.address.city + + - jsonPath: $.Properties.*.address.pincode + + - jsonPath: $.Properties.*.address.detail + + - jsonPath: $.Properties.*.address.buildingName + + - jsonPath: $.Properties.*.address.street + + - jsonPath: $.Properties.*.address.locality.code + + - jsonPath: $.Properties.*.auditDetails.lastModifiedBy + + - jsonPath: $.Properties.*.auditDetails.lastModifiedTime + + - jsonPath: $.Properties.*.address.id + + + - query: INSERT INTO eg_pt_institution_v2(tenantId,id, propertyDetail, name, type,designation, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?,?,?, ?, ?, ?, ?, ?, ?,?) ON CONFLICT (id) DO UPDATE SET name=?,type=?,designation=?,lastmodifiedby=?,lastmodifiedtime=?; + basePath: $.Properties.*.propertyDetails.*.institution + jsonMaps: + + - jsonPath: $.Properties.*.propertyDetails.*.tenantId + + - jsonPath: $.Properties.*.propertyDetails.*.institution.id + + - jsonPath: $.Properties.*.propertyDetails.*.assessmentNumber + + - jsonPath: $.Properties.*.propertyDetails.*.institution.name + + - jsonPath: $.Properties.*.propertyDetails.*.institution.type + + - jsonPath: $.Properties.*.propertyDetails.*.institution.designation + + - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.createdBy + + - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.lastModifiedBy + + - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.createdTime + + - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.lastModifiedTime + + - jsonPath: $.Properties.*.propertyDetails.*.institution.name + + - jsonPath: $.Properties.*.propertyDetails.*.institution.type + + - jsonPath: $.Properties.*.propertyDetails.*.institution.designation + + - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.lastModifiedBy + + - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.lastModifiedTime + - version: 1.0 + description: Cancel property details in eg_pt_propertydetail_v2 table + fromTopic: cancel-pt-propertyDetail + isTransaction: true + queryMaps: + - query: UPDATE eg_pt_assessment SET active=(CASE ? WHEN 'ACTIVE' THEN true ELSE false END) where propertyid=? AND assessmentNumber=? AND tenantId=?; + basePath: Properties.*.propertyDetails.* + jsonMaps: + + - jsonPath: $.Properties.*.propertyDetails.*.status + + - jsonPath: $.Properties[*][?({assessmentNumber} in @.propertyDetails[*].assessmentNumber)].propertyId + + - jsonPath: $.Properties.*.propertyDetails.*.assessmentNumber + + - jsonPath: $.Properties[*][?({assessmentNumber} in @.propertyDetails[*].assessmentNumber)].tenantId + + - query: UPDATE eg_pt_propertydetail_v2 SET status=? where property=? AND assessmentNumber=? AND tenantId=?; + basePath: Properties.*.propertyDetails.* + jsonMaps: + + - jsonPath: $.Properties.*.propertyDetails.*.status + + - jsonPath: $.Properties[*][?({assessmentNumber} in @.propertyDetails[*].assessmentNumber)].propertyId + + - jsonPath: $.Properties.*.propertyDetails.*.assessmentNumber + + - jsonPath: $.Properties[*][?({assessmentNumber} in @.propertyDetails[*].assessmentNumber)].tenantId + + - version: 1.0 + description: Cancel property in eg_pt_property_v2 table + fromTopic: cancel-pt-property + isTransaction: true + queryMaps: + + - query: UPDATE eg_pt_property_v2 SET status=? where propertyId=? AND tenantId=?; + basePath: Properties.* + jsonMaps: + + - jsonPath: $.Properties.*.status + + - jsonPath: $.Properties.*.propertyId + + - jsonPath: $.Properties.*.tenantId + + - query: UPDATE eg_pt_propertydetail_v2 SET status=? where property=? AND assessmentNumber=? AND tenantId=?; + basePath: Properties.*.propertyDetails.* + jsonMaps: + + - jsonPath: $.Properties.*.propertyDetails.*.status + + - jsonPath: $.Properties[*][?({assessmentNumber} in @.propertyDetails[*].assessmentNumber)].propertyId + + - jsonPath: $.Properties.*.propertyDetails.*.assessmentNumber + + - jsonPath: $.Properties[*][?({assessmentNumber} in @.propertyDetails[*].assessmentNumber)].tenantId diff --git a/configs/egov-persister/property-services-registry.yml b/configs/egov-persister/property-services-registry.yml new file mode 100644 index 00000000..4cb28d11 --- /dev/null +++ b/configs/egov-persister/property-services-registry.yml @@ -0,0 +1,587 @@ +serviceMaps: + serviceName: property-services + mappings: + - version: 1.0 + description: Persists property details in EG_PT_PROPERTY table + fromTopic: save-property-registry + isTransaction: true + queryMaps: + + + - query: INSERT INTO eg_pt_property_audit (audituuid, propertyid, property, auditcreatedtime) VALUES ((select nextval('seq_eg_pt_registry_audit')), ?, ?, (SELECT extract(epoch from now()))*1000); + basePath: Property + jsonMaps: + + - jsonPath: $.Property.propertyId + + - jsonPath: $.Property + type: JSON + dbType: JSONB + + - query: INSERT INTO eg_pt_property (id, propertyid, tenantid, surveyid, accountid, oldpropertyid, status, acknowldgementnumber, propertytype, ownershipcategory, usagecategory, creationreason, nooffloors, landarea, superbuiltuparea, linkedproperties, source, channel, createdby, createdtime, lastmodifiedby, lastmodifiedtime, additionaldetails) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: Property + jsonMaps: + + - jsonPath: $.Property.id + + - jsonPath: $.Property.propertyId + + - jsonPath: $.Property.tenantId + + - jsonPath: $.Property.surveyId + + - jsonPath: $.Property.accountId + + - jsonPath: $.Property.oldPropertyId + + - jsonPath: $.Property.status + + - jsonPath: $.Property.acknowldgementNumber + + - jsonPath: $.Property.propertyType + + - jsonPath: $.Property.ownershipCategory + + - jsonPath: $.Property.usageCategory + + - jsonPath: $.Property.creationReason + + - jsonPath: $.Property.noOfFloors + + - jsonPath: $.Property.landArea + + - jsonPath: $.Property.superBuiltUpArea + + - jsonPath: $.Property.linkedProperties + type: ARRAY + dbType: STRING + + - jsonPath: $.Property.source + + - jsonPath: $.Property.channel + + - jsonPath: $.Property.auditDetails.createdBy + + - jsonPath: $.Property.auditDetails.createdTime + + - jsonPath: $.Property.auditDetails.lastModifiedBy + + - jsonPath: $.Property.auditDetails.lastModifiedTime + + - jsonPath: $.Property.additionalDetails + type: JSON + dbType: JSONB + + + - query: INSERT INTO eg_pt_owner(ownerinfouuid, tenantid, propertyid, userid, status, isprimaryowner, ownertype, ownershippercentage, institutionid, relationship, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: Property.owners.* + jsonMaps: + + - jsonPath: $.Property.owners.*.ownerInfoUuid + + - jsonPath: $.Property.tenantId + + - jsonPath: $.Property.id + + - jsonPath: $.Property.owners.*.uuid + + - jsonPath: $.Property.owners.*.status + + - jsonPath: $.Property.owners.*.isPrimaryOwner + + - jsonPath: $.Property.owners.*.ownerType + + - jsonPath: $.Property.owners.*.ownerShipPercentage + + - jsonPath: $.Property.owners.*.institutionId + + - jsonPath: $.Property.owners.*.relationship + + - jsonPath: $.Property.auditDetails.createdBy + + - jsonPath: $.Property.auditDetails.createdTime + + - jsonPath: $.Property.auditDetails.lastModifiedBy + + - jsonPath: $.Property.auditDetails.lastModifiedTime + + + - query: INSERT INTO eg_pt_document (id, tenantid, entityid, documenttype, filestoreid, documentuid, status, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: $.Property.documents.* + jsonMaps: + + - jsonPath: $.Property.documents.*.id + + - jsonPath: $.Property.tenantId + + - jsonPath: $.Property.id + + - jsonPath: $.Property.documents.*.documentType + + - jsonPath: $.Property.documents.*.fileStoreId + + - jsonPath: $.Property.documents.*.documentUid + + - jsonPath: $.Property.documents.*.status + + - jsonPath: $.Property.auditDetails.createdBy + + - jsonPath: $.Property.auditDetails.lastModifiedBy + + - jsonPath: $.Property.auditDetails.createdTime + + - jsonPath: $.Property.auditDetails.lastModifiedTime + + + - query: INSERT INTO eg_pt_document (id, tenantid, entityid, documenttype, filestoreid, documentuid, status, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: $.Property.owners.*.documents.* + jsonMaps: + + - jsonPath: $.Property.owners.*.documents.*.id + + - jsonPath: $.Property.tenantId + + - jsonPath: $.Property.owners[*][?({id} in @.documents[*].id)].ownerInfoUuid + + - jsonPath: $.Property.owners.*.documents.*.documentType + + - jsonPath: $.Property.owners.*.documents.*.fileStoreId + + - jsonPath: $.Property.owners.*.documents.*.documentUid + + - jsonPath: $.Property.documents.*.status + + - jsonPath: $.Property.auditDetails.createdBy + + - jsonPath: $.Property.auditDetails.lastModifiedBy + + - jsonPath: $.Property.auditDetails.createdTime + + - jsonPath: $.Property.auditDetails.lastModifiedTime + + + - query: INSERT INTO eg_pt_institution (id, propertyid, tenantid, name, nameofauthorizedperson, type, designation, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: $.Property.institution + jsonMaps: + + - jsonPath: $.Property.institution.id + + - jsonPath: $.Property.id + + - jsonPath: $.Property.tenantId + + - jsonPath: $.Property.institution.name + + - jsonPath: $.Property.institution.nameOfAuthorizedPerson + + - jsonPath: $.Property.institution.type + + - jsonPath: $.Property.institution.designation + + - jsonPath: $.Property.auditDetails.createdBy + + - jsonPath: $.Property.auditDetails.createdTime + + - jsonPath: $.Property.auditDetails.lastModifiedBy + + - jsonPath: $.Property.auditDetails.lastModifiedTime + + + - query: INSERT INTO eg_pt_address(tenantid, id, propertyid, doorno, plotno, buildingname, street, landmark, city, pincode, locality, district, region, state, country, latitude, longitude, createdby, createdtime, lastmodifiedby, lastmodifiedtime, additionaldetails) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: Property.address + jsonMaps: + + - jsonPath: $.Property.tenantId + + - jsonPath: $.Property.address.id + + - jsonPath: $.Property.id + + - jsonPath: $.Property.address.doorNo + + - jsonPath: $.Property.address.plotNo + + - jsonPath: $.Property.address.buildingName + + - jsonPath: $.Property.address.street + + - jsonPath: $.Property.address.landmark + + - jsonPath: $.Property.address.city + + - jsonPath: $.Property.address.pincode + + - jsonPath: $.Property.address.locality.code + + - jsonPath: $.Property.address.district + + - jsonPath: $.Property.address.region + + - jsonPath: $.Property.address.state + + - jsonPath: $.Property.address.country + + - jsonPath: $.Property.address.geoLocation.latitude + + - jsonPath: $.Property.address.geoLocation.longitude + + - jsonPath: $.Property.auditDetails.createdBy + + - jsonPath: $.Property.auditDetails.createdTime + + - jsonPath: $.Property.auditDetails.lastModifiedBy + + - jsonPath: $.Property.auditDetails.lastModifiedTime + + - jsonPath: $.Property.address.additionalDetails + type: JSON + dbType: JSONB + + + - query: INSERT INTO eg_pt_unit(id, tenantid, propertyid, floorno, unittype, usagecategory, occupancytype, occupancydate, carpetarea, builtuparea, plintharea, superbuiltuparea, arv, constructiontype, constructiondate, dimensions, active, additionaldetails, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: Property.units.* + jsonMaps: + + - jsonPath: $.Property.units.*.id + + - jsonPath: $.Property.tenantId + + - jsonPath: $.Property.id + + - jsonPath: $.Property.units.*.floorNo + + - jsonPath: $.Property.units.*.unitType + + - jsonPath: $.Property.units.*.usageCategory + + - jsonPath: $.Property.units.*.occupancyType + + - jsonPath: $.Property.units.*.occupancyDate + + - jsonPath: $.Property.units.*.constructionDetail.carpetArea + + - jsonPath: $.Property.units.*.constructionDetail.builtUpArea + + - jsonPath: $.Property.units.*.constructionDetail.plinthArea + + - jsonPath: $.Property.units.*.constructionDetail.superBuiltUpArea + + - jsonPath: $.Property.units.*.arv + + - jsonPath: $.Property.units.*.constructionDetail.constructionType + + - jsonPath: $.Property.units.*.constructionDetail.constructionDate + + - jsonPath: $.Property.units.*.constructionDetail.dimensions + type: JSON + dbType: JSONB + + - jsonPath: $.Property.units.*.active + + - jsonPath: $.Property.units.*.additionalDetails + type: JSON + dbType: JSONB + + - jsonPath: $.Property.auditDetails.createdBy + + - jsonPath: $.Property.auditDetails.createdTime + + - jsonPath: $.Property.auditDetails.lastModifiedBy + + - jsonPath: $.Property.auditDetails.lastModifiedTime + + - version: 1.0 + description: Update property EG_PT_PROPERTY ltable + fromTopic: update-property-registry + isTransaction: true + queryMaps: + + + - query: INSERT INTO eg_pt_property_audit (audituuid, propertyid, property, auditcreatedtime) VALUES ((select nextval('seq_eg_pt_registry_audit')), ?, ?, (SELECT extract(epoch from now()))*1000); + basePath: Property + jsonMaps: + + - jsonPath: $.Property.propertyId + + - jsonPath: $.Property + type: JSON + dbType: JSONB + + - query: UPDATE eg_pt_property SET propertyid=?, surveyid=?, accountid=?, oldpropertyid=?, status=?, propertytype=?, ownershipcategory=?, usagecategory=?, nooffloors=?, landarea=?, superbuiltuparea=?, linkedproperties=?, lastmodifiedby=?, lastmodifiedtime=?, additionaldetails=? WHERE Id=? AND tenantId=?; + basePath: Property + jsonMaps: + + - jsonPath: $.Property.propertyId + + - jsonPath: $.Property.surveyId + + - jsonPath: $.Property.accountId + + - jsonPath: $.Property.oldPropertyId + + - jsonPath: $.Property.status + + - jsonPath: $.Property.propertyType + + - jsonPath: $.Property.ownershipCategory + + - jsonPath: $.Property.usageCategory + + - jsonPath: $.Property.noOfFloors + + - jsonPath: $.Property.landArea + + - jsonPath: $.Property.superBuiltUpArea + + - jsonPath: $.Property.linkedProperties + + - jsonPath: $.Property.auditDetails.lastModifiedBy + + - jsonPath: $.Property.auditDetails.lastModifiedTime + + - jsonPath: $.Property.additionalDetails + type: JSON + dbType: JSONB + + - jsonPath: $.Property.id + + - jsonPath: $.Property.tenantId + + + - query: INSERT INTO eg_pt_owner (ownerinfouuid, tenantid, propertyid, userid, status, isprimaryowner, ownertype, ownershippercentage, institutionid, relationship, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (userid, propertyid) DO UPDATE SET status=EXCLUDED.status, isprimaryowner=EXCLUDED.isprimaryowner, ownertype=EXCLUDED.ownertype, ownershippercentage=EXCLUDED.ownershippercentage, institutionid=EXCLUDED.institutionid, relationship=EXCLUDED.relationship, lastmodifiedby=EXCLUDED.lastModifiedby, lastmodifiedtime=EXCLUDED.lastmodifiedtime; + basePath: Property.owners.* + jsonMaps: + + - jsonPath: $.Property.owners.*.ownerInfoUuid + + - jsonPath: $.Property.tenantId + + - jsonPath: $.Property.id + + - jsonPath: $.Property.owners.*.uuid + + - jsonPath: $.Property.owners.*.status + + - jsonPath: $.Property.owners.*.isPrimaryOwner + + - jsonPath: $.Property.owners.*.ownerType + + - jsonPath: $.Property.owners.*.ownerShipPercentage + + - jsonPath: $.Property.owners.*.institutionId + + - jsonPath: $.Property.owners.*.relationship + + - jsonPath: $.Property.auditDetails.createdBy + + - jsonPath: $.Property.auditDetails.createdTime + + - jsonPath: $.Property.auditDetails.lastModifiedBy + + - jsonPath: $.Property.auditDetails.lastModifiedTime + + - query: INSERT INTO eg_pt_document (id, tenantid, entityid, documenttype, filestoreid, documentuid, status, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET documenttype = EXCLUDED.documenttype,fileStoreid = EXCLUDED.filestoreid, documentuid=EXCLUDED.documentuid, status=EXCLUDED.status, lastmodifiedby = EXCLUDED.lastModifiedby, lastmodifiedtime = EXCLUDED.lastmodifiedtime; + basePath: $.Property.documents.* + jsonMaps: + + - jsonPath: $.Property.documents.*.id + + - jsonPath: $.Property.tenantId + + - jsonPath: $.Property.id + + - jsonPath: $.Property.documents.*.documentType + + - jsonPath: $.Property.documents.*.fileStoreId + + - jsonPath: $.Property.documents.*.documentUid + + - jsonPath: $.Property.documents.*.status + + - jsonPath: $.Property.auditDetails.createdBy + + - jsonPath: $.Property.auditDetails.lastModifiedBy + + - jsonPath: $.Property.auditDetails.createdTime + + - jsonPath: $.Property.auditDetails.lastModifiedTime + + - query: INSERT INTO eg_pt_document (id, tenantid, entityid, documenttype, filestoreid, documentuid, status, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET documenttype = EXCLUDED.documenttype,fileStoreid = EXCLUDED.filestoreid, documentuid=EXCLUDED.documentuid, status=EXCLUDED.status, lastmodifiedby = EXCLUDED.lastModifiedby, lastmodifiedtime = EXCLUDED.lastmodifiedtime; + basePath: $.Property.owners.*.documents.* + jsonMaps: + + - jsonPath: $.Property.owners.*.documents.*.id + + - jsonPath: $.Property.tenantId + + - jsonPath: $.Property.owners[*][?({id} in @.documents[*].id)].ownerInfoUuid + + - jsonPath: $.Property.owners.*.documents.*.documentType + + - jsonPath: $.Property.owners.*.documents.*.fileStoreId + + - jsonPath: $.Property.owners.*.documents.*.documentUid + + - jsonPath: $.Property.owners.*.documents.*.status + + - jsonPath: $.Property.auditDetails.createdBy + + - jsonPath: $.Property.auditDetails.lastModifiedBy + + - jsonPath: $.Property.auditDetails.createdTime + + - jsonPath: $.Property.auditDetails.lastModifiedTime + + - query: UPDATE eg_pt_address SET doorno=?, plotno=?, buildingname=?, street=?, landmark=?, city=?, pincode=?, locality=?, district=?, region=?, state=?, country=?, latitude=?, longitude=?, lastmodifiedby=?, lastmodifiedtime=?, additionaldetails=? WHERE id=?; + basePath: Property.address + jsonMaps: + + - jsonPath: $.Property.address.doorNo + + - jsonPath: $.Property.address.plotNo + + - jsonPath: $.Property.address.buildingName + + - jsonPath: $.Property.address.street + + - jsonPath: $.Property.address.landmark + + - jsonPath: $.Property.address.city + + - jsonPath: $.Property.address.pincode + + - jsonPath: $.Property.address.locality.code + + - jsonPath: $.Property.address.district + + - jsonPath: $.Property.address.region + + - jsonPath: $.Property.address.state + + - jsonPath: $.Property.address.country + + - jsonPath: $.Property.address.geoLocation.latitude + + - jsonPath: $.Property.address.geoLocation.longitude + + - jsonPath: $.Property.auditDetails.lastModifiedBy + + - jsonPath: $.Property.auditDetails.lastModifiedTime + + - jsonPath: $.Property.address.additionalDetails + type: JSON + dbType: JSONB + + - jsonPath: $.Property.address.id + + - query: INSERT INTO eg_pt_institution (id, propertyid, tenantid, name, nameofauthorizedperson, type, designation, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET name=EXCLUDED.name, type=EXCLUDED.type, designation=EXCLUDED.designation, lastmodifiedby=EXCLUDED.lastModifiedby, lastmodifiedtime=EXCLUDED.lastmodifiedtime; + basePath: $.Property.institution + jsonMaps: + + - jsonPath: $.Property.institution.id + + - jsonPath: $.Property.id + + - jsonPath: $.Property.tenantId + + - jsonPath: $.Property.institution.name + + - jsonPath: $.Property.institution.nameOfAuthorizedPerson + + - jsonPath: $.Property.institution.type + + - jsonPath: $.Property.institution.designation + + - jsonPath: $.Property.auditDetails.createdBy + + - jsonPath: $.Property.auditDetails.createdTime + + - jsonPath: $.Property.auditDetails.lastModifiedBy + + - jsonPath: $.Property.auditDetails.lastModifiedTime + + + - query: INSERT INTO eg_pt_unit(id, tenantid, propertyid, floorno, unittype, usagecategory, occupancytype, occupancydate, carpetarea, builtuparea, plintharea, superbuiltuparea, arv, constructiontype, constructiondate, dimensions, active, additionaldetails, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET floorno=EXCLUDED.floorno, unittype=EXCLUDED.unittype, usagecategory=EXCLUDED.usagecategory, occupancytype=EXCLUDED.occupancytype, occupancydate=EXCLUDED.occupancydate, carpetarea=EXCLUDED.carpetarea, builtuparea=EXCLUDED.builtuparea, plintharea=EXCLUDED.plintharea, superbuiltuparea=EXCLUDED.superbuiltuparea, arv=EXCLUDED.arv, constructiontype=EXCLUDED.constructiontype, constructiondate=EXCLUDED.constructiondate, dimensions=excluded.dimensions, active=EXCLUDED.active, lastmodifiedby=EXCLUDED.lastmodifiedby, lastmodifiedtime=EXCLUDED.lastmodifiedtime; + basePath: Property.units.* + jsonMaps: + + - jsonPath: $.Property.units.*.id + + - jsonPath: $.Property.tenantId + + - jsonPath: $.Property.id + + - jsonPath: $.Property.units.*.floorNo + + - jsonPath: $.Property.units.*.unitType + + - jsonPath: $.Property.units.*.usageCategory + + - jsonPath: $.Property.units.*.occupancyType + + - jsonPath: $.Property.units.*.occupancyDate + + - jsonPath: $.Property.units.*.constructionDetail.carpetArea + + - jsonPath: $.Property.units.*.constructionDetail.builtUpArea + + - jsonPath: $.Property.units.*.constructionDetail.plinthArea + + - jsonPath: $.Property.units.*.constructionDetail.superBuiltUpArea + + - jsonPath: $.Property.units.*.arv + + - jsonPath: $.Property.units.*.constructionDetail.constructionType + + - jsonPath: $.Property.units.*.constructionDetail.constructionDate + + - jsonPath: $.Property.units.*.constructionDetail.dimensions + type: JSON + dbType: JSONB + + - jsonPath: $.Property.units.*.active + + - jsonPath: $.Property.units.*.additionalDetails + type: JSON + dbType: JSONB + + - jsonPath: $.Property.auditDetails.createdBy + + - jsonPath: $.Property.auditDetails.createdTime + + - jsonPath: $.Property.auditDetails.lastModifiedBy + + - jsonPath: $.Property.auditDetails.lastModifiedTime + + - version: 1.0 + description: Update documents in EG_PT_PROPERTY ltable + fromTopic: update-property-doc-registry + isTransaction: true + queryMaps: + + + - query: INSERT INTO eg_pt_document (id, tenantid, entityid, documenttype, filestoreid, documentuid, status, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET documenttype = EXCLUDED.documenttype,fileStoreid = EXCLUDED.filestoreid, documentuid=EXCLUDED.documentuid, status=EXCLUDED.status, lastmodifiedby = EXCLUDED.lastModifiedby, lastmodifiedtime = EXCLUDED.lastmodifiedtime; + basePath: $.Property.documents.* + jsonMaps: + + - jsonPath: $.Property.documents.*.id + + - jsonPath: $.Property.tenantId + + - jsonPath: $.Property.id + + - jsonPath: $.Property.documents.*.documentType + + - jsonPath: $.Property.documents.*.fileStoreId + + - jsonPath: $.Property.documents.*.documentUid + + - jsonPath: $.Property.documents.*.status + + - jsonPath: $.Property.auditDetails.createdBy + + - jsonPath: $.Property.auditDetails.lastModifiedBy + + - jsonPath: $.Property.auditDetails.createdTime + + - jsonPath: $.Property.auditDetails.lastModifiedTime diff --git a/configs/egov-persister/property-services.yml b/configs/egov-persister/property-services.yml new file mode 100644 index 00000000..0e4514f5 --- /dev/null +++ b/configs/egov-persister/property-services.yml @@ -0,0 +1,819 @@ +serviceMaps: + serviceName: property-services + mappings: + - version: 1.0 + description: Persists property details in EG_PT_PROPERTY table + fromTopic: save-pt-property + isTransaction: true + queryMaps: + + - query: INSERT INTO eg_pt_property_v2(tenantId,propertyId, status,acknowldgementNumber, oldPropertyId, creationReason, occupancyDate,additionalDetails ,createdBy,createdTime,lastModifiedBy,lastModifiedTime ) VALUES (?,?,?,?,?,?,?,?,?,?,?,?); + basePath: Properties.* + jsonMaps: + - jsonPath: $.Properties.*.tenantId + + - jsonPath: $.Properties.*.propertyId + + - jsonPath: $.Properties.*.status + + - jsonPath: $.Properties.*.acknowldgementNumber + + - jsonPath: $.Properties.*.oldPropertyId + + - jsonPath: $.Properties.*.creationReason + + - jsonPath: $.Properties.*.occupancyDate + + - jsonPath: $.Properties.*.additionalDetails + type: JSON + dbType: JSONB + + - jsonPath: $.Properties.*.auditDetails.createdBy + + - jsonPath: $.Properties.*.auditDetails.createdTime + + - jsonPath: $.Properties.*.auditDetails.lastModifiedBy + + - jsonPath: $.Properties.*.auditDetails.lastModifiedTime + + + - query: INSERT INTO eg_pt_propertydetail_v2(tenantId,assessmentNumber,property,accountId,ownershipCategory,subOwnershipCategory,source,usage,noOfFloors,landArea,buildUpArea,additionalDetails,channel,financialYear,propertyType,propertySubType,usageCategoryMajor,usageCategoryMinor,assessmentDate,adhocExemption,adhocPenalty,adhocExemptionReason,adhocPenaltyReason,createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?); + basePath: Properties.*.propertyDetails.* + jsonMaps: + + - jsonPath: $.Properties[*][?({assessmentNumber} in @.propertyDetails[*].assessmentNumber)].tenantId + + - jsonPath: $.Properties.*.propertyDetails.*.assessmentNumber + + - jsonPath: $.Properties[*][?({assessmentNumber} in @.propertyDetails[*].assessmentNumber)].propertyId + + - jsonPath: $.Properties.*.propertyDetails.*.citizenInfo.uuid + + - jsonPath: $.Properties.*.propertyDetails.*.ownershipCategory + + - jsonPath: $.Properties.*.propertyDetails.*.subOwnershipCategory + + - jsonPath: $.Properties.*.propertyDetails.*.source + + - jsonPath: $.Properties.*.propertyDetails.*.usage + + - jsonPath: $.Properties.*.propertyDetails.*.noOfFloors + + - jsonPath: $.Properties.*.propertyDetails.*.landArea + + - jsonPath: $.Properties.*.propertyDetails.*.buildUpArea + + - jsonPath: $.Properties.*.propertyDetails.*.additionalDetails + type: JSON + dbType: JSONB + + - jsonPath: $.Properties.*.propertyDetails.*.channel + + - jsonPath: $.Properties.*.propertyDetails.*.financialYear + + - jsonPath: $.Properties.*.propertyDetails.*.propertyType + + - jsonPath: $.Properties.*.propertyDetails.*.propertySubType + + - jsonPath: $.Properties.*.propertyDetails.*.usageCategoryMajor + + - jsonPath: $.Properties.*.propertyDetails.*.usageCategoryMinor + + - jsonPath: $.Properties.*.propertyDetails.*.assessmentDate + + - jsonPath: $.Properties.*.propertyDetails.*.adhocExemption + + - jsonPath: $.Properties.*.propertyDetails.*.adhocPenalty + + - jsonPath: $.Properties.*.propertyDetails.*.adhocExemptionReason + + - jsonPath: $.Properties.*.propertyDetails.*.adhocPenaltyReason + + - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.createdBy + + - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.lastModifiedBy + + - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.createdTime + + - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.lastModifiedTime + + - query: INSERT INTO eg_pt_owner_v2(tenantId,propertyDetail, userid,additionalDetails, isactive,isPrimaryOwner,ownerShipPercentage, ownerType,institutionId,relationship,createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: Properties.*.propertyDetails.*.owners.* + jsonMaps: + + - jsonPath: $.Properties[*][?({uuid} in @.propertyDetails.*.owners[*].uuid)].tenantId + + - jsonPath: $.Properties.*.propertyDetails[*][?({persisterRefId} in @.owners[*].persisterRefId)].assessmentNumber + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.uuid + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.additionalDetails + type: JSON + dbType: JSONB + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.isActive + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.isPrimaryOwner + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.ownerShipPercentage + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.ownerType + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.institutionId + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.relationship + + - jsonPath: $.Properties.*.propertyDetails[*][?({uuid} in @.owners[*].uuid)].auditDetails.createdBy + + - jsonPath: $.Properties.*.propertyDetails[*][?({uuid} in @.owners[*].uuid)].auditDetails.lastModifiedBy + + - jsonPath: $.Properties.*.propertyDetails[*][?({uuid} in @.owners[*].uuid)].auditDetails.createdTime + + - jsonPath: $.Properties.*.propertyDetails[*][?({uuid} in @.owners[*].uuid)].auditDetails.lastModifiedTime + + + + - query: INSERT INTO eg_pt_document_propertydetail_v2(tenantId,id, propertydetail, documenttype, fileStore,documentuid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?,?,?, ?, ?, ?, ?, ?, ?, ?); + basePath: $.Properties.*.propertyDetails.*.documents.* + jsonMaps: + + - jsonPath: $.Properties[*][?({id} in @.propertyDetails.*.documents[*].id)].tenantId + + - jsonPath: $.Properties.*.propertyDetails.*.documents.*.id + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.documents[*].id)].assessmentNumber + + - jsonPath: $.Properties.*.propertyDetails.*.documents.*.documentType + + - jsonPath: $.Properties.*.propertyDetails.*.documents.*.fileStore + + - jsonPath: $.Properties.*.propertyDetails.*.documents.*.documentUid + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.documents[*].id)].auditDetails.createdBy + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.documents[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.documents[*].id)].auditDetails.createdTime + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.documents[*].id)].auditDetails.lastModifiedTime + + + - query: INSERT INTO eg_pt_document_owner_v2(tenantId,id,userid, propertydetail, documenttype, fileStore,documentuid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?,?,?,?, ?, ?, ?, ?, ?, ?, ?); + basePath: $.Properties.*.propertyDetails.*.owners.*.documents.* + jsonMaps: + + - jsonPath: $.Properties[*][?({id} in @.propertyDetails.*.owners.*.documents[*].id)].tenantId + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.documents.*.id + + - jsonPath: $.Properties.*.propertyDetails.*.owners[*][?({id} in @.documents[*].id)].uuid + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.owners.*.documents[*].id)].assessmentNumber + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.documents.*.documentType + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.documents.*.fileStore + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.documents.*.documentUid + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.owners.*.documents[*].id)].auditDetails.createdBy + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.owners.*.documents[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.owners.*.documents[*].id)].auditDetails.createdTime + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.owners.*.documents[*].id)].auditDetails.lastModifiedTime + + + + - query: INSERT INTO eg_pt_address_v2(tenantId, id, property,additionalDetails,doorNo, latitude,longitude, addressid, addressnumber, type, addressline1, addressline2, landmark, city, pincode, detail,buildingName,street, locality, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ? , ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: Properties.*.address + jsonMaps: + + - jsonPath: $.Properties.*.tenantId + + - jsonPath: $.Properties.*.address.id + + - jsonPath: $.Properties.*.propertyId + + - jsonPath: $.Properties.*.address.additionalDetails + type: JSON + dbType: JSONB + + - jsonPath: $.Properties.*.address.doorNo + + - jsonPath: $.Properties.*.address.latitude + + - jsonPath: $.Properties.*.address.longitude + + - jsonPath: $.Properties.*.address.addressId + + - jsonPath: $.Properties.*.address.addressNumber + + - jsonPath: $.Properties.*.address.type + + - jsonPath: $.Properties.*.address.addressLine1 + + - jsonPath: $.Properties.*.address.addressLine2 + + - jsonPath: $.Properties.*.address.landmark + + - jsonPath: $.Properties.*.address.city + + - jsonPath: $.Properties.*.address.pincode + + - jsonPath: $.Properties.*.address.detail + + - jsonPath: $.Properties.*.address.buildingName + + - jsonPath: $.Properties.*.address.street + + - jsonPath: $.Properties.*.address.locality.code + + - jsonPath: $.Properties.*.auditDetails.createdBy + + - jsonPath: $.Properties.*.auditDetails.lastModifiedBy + + - jsonPath: $.Properties.*.auditDetails.createdTime + + - jsonPath: $.Properties.*.auditDetails.lastModifiedTime + + + - query: INSERT INTO eg_pt_unit_v2(tenantId,id,propertyDetail,additionalDetails,floorNo,unitType,unitArea,usageCategoryMajor,usageCategoryMinor,usageCategorySubMinor,usageCategoryDetail,occupancyType,occupancyDate,constructionType,constructionSubType,arv,createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?); + basePath: Properties.*.propertyDetails.*.units.* + jsonMaps: + + - jsonPath: $.Properties[*][?({id} in @.propertyDetails.*.units[*].id)].tenantId + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.id + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.units[*].id)].assessmentNumber + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.additionalDetails + type: JSON + dbType: JSONB + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.floorNo + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.unitType + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.unitArea + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.usageCategoryMajor + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.usageCategoryMinor + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.usageCategorySubMinor + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.usageCategoryDetail + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.occupancyType + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.occupancyDate + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.constructionType + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.constructionSubType + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.arv + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.units[*].id)].auditDetails.createdBy + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.units[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.units[*].id)].auditDetails.createdTime + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.units[*].id)].auditDetails.lastModifiedTime + + - query: INSERT INTO eg_pt_institution_v2(tenantId,id, propertyDetail,additionalDetails, name, type,designation, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT ON CONSTRAINT pk_eg_pt_institution_v2 DO NOTHING; + basePath: $.Properties.*.propertyDetails.*.institution + jsonMaps: + + - jsonPath: $.Properties.*.propertyDetails.*.tenantId + + - jsonPath: $.Properties.*.propertyDetails.*.institution.id + + - jsonPath: $.Properties.*.propertyDetails.*.assessmentNumber + + - jsonPath: $.Properties.*.propertyDetails.*.institution.additionalDetails + type: JSON + dbType: JSONB + + - jsonPath: $.Properties.*.propertyDetails.*.institution.name + + - jsonPath: $.Properties.*.propertyDetails.*.institution.type + + - jsonPath: $.Properties.*.propertyDetails.*.institution.designation + + - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.createdBy + + - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.lastModifiedBy + + - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.createdTime + + - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.lastModifiedTime + + + + + + - version: 1.0 + description: Update property details in EG_PT_PROPERTY table + fromTopic: update-pt-property + isTransaction: true + queryMaps: + + + - query: INSERT INTO eg_pt_property_audit_v2 SELECT * FROM eg_pt_property_v2 WHERE propertyid = ?; + basePath: Properties.* + jsonMaps: + + - jsonPath: $.Properties.*.propertyId + + + - query: INSERT INTO eg_pt_address_audit_v2 SELECT * FROM eg_pt_address_v2 WHERE id = ?; + basePath: Properties.*.address + jsonMaps: + + - jsonPath: $.Properties.*.address.id + + + + - query: UPDATE eg_pt_property_v2 SET additionalDetails=?,status=?,acknowldgementNumber=?,oldPropertyId=?,creationReason=?, occupancyDate=?,lastModifiedBy=?, lastModifiedTime=? where propertyId=? AND tenantId=?; + basePath: Properties.* + jsonMaps: + + - jsonPath: $.Properties.*.additionalDetails + type: JSON + dbType: JSONB + + - jsonPath: $.Properties.*.status + + - jsonPath: $.Properties.*.acknowldgementNumber + + - jsonPath: $.Properties.*.oldPropertyId + + - jsonPath: $.Properties.*.creationReason + + - jsonPath: $.Properties.*.occupancyDate + + - jsonPath: $.Properties.*.auditDetails.lastModifiedBy + + - jsonPath: $.Properties.*.auditDetails.lastModifiedTime + + - jsonPath: $.Properties.*.propertyId + + - jsonPath: $.Properties.*.tenantId + + + + + - query: INSERT INTO eg_pt_propertydetail_v2(tenantId,assessmentNumber,property,accountId,ownershipCategory,subOwnershipCategory,source,usage,noOfFloors,landArea,buildUpArea,additionalDetails,channel,financialYear,propertyType,propertySubType,usageCategoryMajor,usageCategoryMinor,assessmentDate,adhocExemption,adhocPenalty,adhocExemptionReason,adhocPenaltyReason,createdby, lastmodifiedby, createdtime,lastmodifiedtime) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) ON CONFLICT (assessmentNumber) DO UPDATE SET accountId=?,financialYear=?, propertyType=?, propertySubType=?,usageCategoryMajor=?,usageCategoryMinor=?, assessmentDate=?,ownershipCategory=?,subOwnershipCategory=?,source=?,usage=?,noOfFloors=?,landArea=?,buildUpArea=?,additionalDetails=?,channel=?,adhocExemption=?,adhocPenalty=?,adhocExemptionReason=?,adhocPenaltyReason=?,lastModifiedBy=?, lastModifiedTime=?; + basePath: Properties.*.propertyDetails.* + jsonMaps: + + - jsonPath: $.Properties[*][?({assessmentNumber} in @.propertyDetails[*].assessmentNumber)].tenantId + + - jsonPath: $.Properties.*.propertyDetails.*.assessmentNumber + + - jsonPath: $.Properties[*][?({assessmentNumber} in @.propertyDetails[*].assessmentNumber)].propertyId + + - jsonPath: $.Properties.*.propertyDetails.*.citizenInfo.uuid + + - jsonPath: $.Properties.*.propertyDetails.*.ownershipCategory + + - jsonPath: $.Properties.*.propertyDetails.*.subOwnershipCategory + + - jsonPath: $.Properties.*.propertyDetails.*.source + + - jsonPath: $.Properties.*.propertyDetails.*.usage + + - jsonPath: $.Properties.*.propertyDetails.*.noOfFloors + + - jsonPath: $.Properties.*.propertyDetails.*.landArea + + - jsonPath: $.Properties.*.propertyDetails.*.buildUpArea + + - jsonPath: $.Properties.*.propertyDetails.*.additionalDetails + type: JSON + dbType: JSONB + + - jsonPath: $.Properties.*.propertyDetails.*.channel + + - jsonPath: $.Properties.*.propertyDetails.*.financialYear + + - jsonPath: $.Properties.*.propertyDetails.*.propertyType + + - jsonPath: $.Properties.*.propertyDetails.*.propertySubType + + - jsonPath: $.Properties.*.propertyDetails.*.usageCategoryMajor + + - jsonPath: $.Properties.*.propertyDetails.*.usageCategoryMinor + + - jsonPath: $.Properties.*.propertyDetails.*.assessmentDate + + - jsonPath: $.Properties.*.propertyDetails.*.adhocExemption + + - jsonPath: $.Properties.*.propertyDetails.*.adhocPenalty + + - jsonPath: $.Properties.*.propertyDetails.*.adhocExemptionReason + + - jsonPath: $.Properties.*.propertyDetails.*.adhocPenaltyReason + + - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.createdBy + + - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.lastModifiedBy + + - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.createdTime + + - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.lastModifiedTime + + - jsonPath: $.Properties.*.propertyDetails.*.citizenInfo.uuid + + - jsonPath: $.Properties.*.propertyDetails.*.financialYear + + - jsonPath: $.Properties.*.propertyDetails.*.propertyType + + - jsonPath: $.Properties.*.propertyDetails.*.propertySubType + + - jsonPath: $.Properties.*.propertyDetails.*.usageCategoryMajor + + - jsonPath: $.Properties.*.propertyDetails.*.usageCategoryMinor + + - jsonPath: $.Properties.*.propertyDetails.*.assessmentDate + + - jsonPath: $.Properties.*.propertyDetails.*.ownershipCategory + + - jsonPath: $.Properties.*.propertyDetails.*.subOwnershipCategory + + - jsonPath: $.Properties.*.propertyDetails.*.source + + - jsonPath: $.Properties.*.propertyDetails.*.usage + + - jsonPath: $.Properties.*.propertyDetails.*.noOfFloors + + - jsonPath: $.Properties.*.propertyDetails.*.landArea + + - jsonPath: $.Properties.*.propertyDetails.*.buildUpArea + + - jsonPath: $.Properties.*.propertyDetails.*.additionalDetails + type: JSON + dbType: JSONB + + - jsonPath: $.Properties.*.propertyDetails.*.channel + + - jsonPath: $.Properties.*.propertyDetails.*.adhocExemption + + - jsonPath: $.Properties.*.propertyDetails.*.adhocPenalty + + - jsonPath: $.Properties.*.propertyDetails.*.adhocExemptionReason + + - jsonPath: $.Properties.*.propertyDetails.*.adhocPenaltyReason + + - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.lastModifiedBy + + - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.lastModifiedTime + + + + - query: INSERT INTO eg_pt_owner_v2(tenantId,propertyDetail, userid,additionalDetails, isActive,isPrimaryOwner,ownerShipPercentage, ownerType,institutionId,relationship, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT ON CONSTRAINT pk_eg_pt_owner_v2 DO UPDATE SET additionalDetails=?,isActive =?,isPrimaryOwner=?,ownerShipPercentage=?,ownerType=?,institutionId=?,relationship=?,lastmodifiedby =?,lastmodifiedtime =?; + basePath: Properties.*.propertyDetails.*.owners.* + jsonMaps: + + - jsonPath: $.Properties[*][?({uuid} in @.propertyDetails.*.owners[*].uuid)].tenantId + + - jsonPath: $.Properties.*.propertyDetails[*][?({persisterRefId} in @.owners[*].persisterRefId)].assessmentNumber + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.uuid + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.additionalDetails + type: JSON + dbType: JSONB + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.isActive + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.isPrimaryOwner + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.ownerShipPercentage + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.ownerType + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.institutionId + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.relationship + + - jsonPath: $.Properties.*.propertyDetails[*][?({persisterRefId} in @.owners[*].persisterRefId)].auditDetails.lastModifiedBy + + - jsonPath: $.Properties.*.propertyDetails[*][?({persisterRefId} in @.owners[*].persisterRefId)].auditDetails.lastModifiedBy + + - jsonPath: $.Properties.*.propertyDetails[*][?({persisterRefId} in @.owners[*].persisterRefId)].auditDetails.lastModifiedTime + + - jsonPath: $.Properties.*.propertyDetails[*][?({persisterRefId} in @.owners[*].persisterRefId)].auditDetails.lastModifiedTime + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.additionalDetails + type: JSON + dbType: JSONB + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.isActive + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.isPrimaryOwner + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.ownerShipPercentage + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.ownerType + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.institutionId + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.relationship + + - jsonPath: $.Properties.*.propertyDetails[*][?({persisterRefId} in @.owners[*].persisterRefId)].auditDetails.lastModifiedBy + + - jsonPath: $.Properties.*.propertyDetails[*][?({persisterRefId} in @.owners[*].persisterRefId)].auditDetails.lastModifiedTime + + + - query: INSERT INTO eg_pt_document_propertydetail_v2(tenantId,id, propertydetail, documenttype, fileStore,documentuid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?,?) ON CONFLICT (id) DO UPDATE SET documenttype = ?, fileStore = ?,documentuid=?, lastmodifiedby = ?, lastmodifiedtime = ?; + basePath: $.Properties.*.propertyDetails.*.documents.* + jsonMaps: + + - jsonPath: $.Properties[*][?({id} in @.propertyDetails.*.documents[*].id)].tenantId + + - jsonPath: $.Properties.*.propertyDetails.*.documents.*.id + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.documents[*].id)].assessmentNumber + + - jsonPath: $.Properties.*.propertyDetails.*.documents.*.documentType + + - jsonPath: $.Properties.*.propertyDetails.*.documents.*.fileStore + + - jsonPath: $.Properties.*.propertyDetails.*.documents.*.documentUid + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.documents[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.documents[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.documents[*].id)].auditDetails.lastModifiedTime + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.documents[*].id)].auditDetails.lastModifiedTime + + - jsonPath: $.Properties.*.propertyDetails.documents.*.documentType + + - jsonPath: $.Properties.*.propertyDetails.*.documents.*.fileStore + + - jsonPath: $.Properties.*.propertyDetails.*.documents.*.documentUid + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.documents[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.documents[*].id)].auditDetails.lastModifiedTime + + + - query: INSERT INTO eg_pt_document_owner_v2(tenantId,id, userid,propertydetail, documenttype, fileStore,documentuid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?) ON CONFLICT (userid,propertydetail) DO UPDATE SET documenttype = ?, fileStore = ?,documentuid=?, lastmodifiedby = ?, lastmodifiedtime = ?; + basePath: $.Properties.*.propertyDetails.*.owners.*.documents.* + jsonMaps: + + - jsonPath: $.Properties[*][?({id} in @.propertyDetails.*.owners.*.documents[*].id)].tenantId + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.documents.*.id + + - jsonPath: $.Properties.*.propertyDetails.*.owners[*][?({id} in @.documents[*].id)].uuid + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.owners.*.documents[*].id)].assessmentNumber + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.documents.*.documentType + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.documents.*.fileStore + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.documents.*.documentUid + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.owners.*.documents[*].id)].auditDetails.createdBy + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.owners.*.documents[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.owners.*.documents[*].id)].auditDetails.createdTime + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.owners.*.documents[*].id)].auditDetails.lastModifiedTime + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.documents.*.documentType + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.documents.*.fileStore + + - jsonPath: $.Properties.*.propertyDetails.*.owners.*.documents.*.documentUid + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.owners.*.documents[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.owners.*.documents[*].id)].auditDetails.lastModifiedTime + + + + - query: INSERT INTO eg_pt_unit_v2(tenantId,id,propertyDetail,additionalDetails,floorNo,unitType,unitArea,usageCategoryMajor,usageCategoryMinor,usageCategorySubMinor,usageCategoryDetail,occupancyType,occupancyDate,constructionType,constructionSubType,arv,createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) ON CONFLICT (id) DO UPDATE SET additionalDetails=?,floorNo=?,unitType=?,unitArea=?,usageCategoryMajor=?,usageCategoryMinor=?,usageCategorySubMinor=?,usageCategoryDetail=?,occupancyType=?,occupancyDate=?,constructionType=?,constructionSubType=?,arv=?,lastmodifiedby=?,lastmodifiedtime=?; + basePath: Properties.*.propertyDetails.*.units.* + jsonMaps: + + - jsonPath: $.Properties[*][?({id} in @.propertyDetails.*.units[*].id)].tenantId + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.id + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.units[*].id)].assessmentNumber + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.additionalDetails + type: JSON + dbType: JSONB + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.floorNo + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.unitType + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.unitArea + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.usageCategoryMajor + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.usageCategoryMinor + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.usageCategorySubMinor + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.usageCategoryDetail + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.occupancyType + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.occupancyDate + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.constructionType + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.constructionSubType + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.arv + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.units[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.units[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.units[*].id)].auditDetails.lastModifiedTime + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.units[*].id)].auditDetails.lastModifiedTime + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.additionalDetails + type: JSON + dbType: JSONB + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.floorNo + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.unitType + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.unitArea + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.usageCategoryMajor + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.usageCategoryMinor + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.usageCategorySubMinor + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.usageCategoryDetail + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.occupancyType + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.occupancyDate + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.constructionType + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.constructionSubType + + - jsonPath: $.Properties.*.propertyDetails.*.units.*.arv + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.units[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Properties.*.propertyDetails[*][?({id} in @.units[*].id)].auditDetails.lastModifiedTime + + + + - query: UPDATE eg_pt_address_v2 SET additionalDetails=?,doorNo=?,latitude=?,longitude=?, addressid=?, addressnumber=?, type=?, addressline1=?, addressline2=?, landmark=?, city=?, pincode=?, detail=?,buildingName=?,street=?, locality=?, lastmodifiedby=?, lastmodifiedtime=? where id=?; + basePath: Properties.*.address + jsonMaps: + + - jsonPath: $.Properties.*.address.additionalDetails + type: JSON + dbType: JSONB + + - jsonPath: $.Properties.*.address.doorNo + + - jsonPath: $.Properties.*.address.latitude + + - jsonPath: $.Properties.*.address.longitude + + - jsonPath: $.Properties.*.address.addressId + + - jsonPath: $.Properties.*.address.addressNumber + + - jsonPath: $.Properties.*.address.type + + - jsonPath: $.Properties.*.address.addressLine1 + + - jsonPath: $.Properties.*.address.addressLine2 + + - jsonPath: $.Properties.*.address.landmark + + - jsonPath: $.Properties.*.address.city + + - jsonPath: $.Properties.*.address.pincode + + - jsonPath: $.Properties.*.address.detail + + - jsonPath: $.Properties.*.address.buildingName + + - jsonPath: $.Properties.*.address.street + + - jsonPath: $.Properties.*.address.locality.code + + - jsonPath: $.Properties.*.auditDetails.lastModifiedBy + + - jsonPath: $.Properties.*.auditDetails.lastModifiedTime + + - jsonPath: $.Properties.*.address.id + + + - query: INSERT INTO eg_pt_institution_v2(tenantId,id, propertyDetail,additionalDetails, name, type,designation, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?) ON CONFLICT (id) DO UPDATE SET additionalDetails=?,name=?,type=?,designation=?,lastmodifiedby=?,lastmodifiedtime=?; + basePath: $.Properties.*.propertyDetails.*.institution + jsonMaps: + + - jsonPath: $.Properties.*.propertyDetails.*.tenantId + + - jsonPath: $.Properties.*.propertyDetails.*.institution.id + + - jsonPath: $.Properties.*.propertyDetails.*.assessmentNumber + + - jsonPath: $.Properties.*.propertyDetails.*.institution.additionalDetails + type: JSON + dbType: JSONB + + - jsonPath: $.Properties.*.propertyDetails.*.institution.name + + - jsonPath: $.Properties.*.propertyDetails.*.institution.type + + - jsonPath: $.Properties.*.propertyDetails.*.institution.designation + + - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.createdBy + + - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.lastModifiedBy + + - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.createdTime + + - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.lastModifiedTime + + - jsonPath: $.Properties.*.propertyDetails.*.institution.additionalDetails + type: JSON + dbType: JSONB + + - jsonPath: $.Properties.*.propertyDetails.*.institution.name + + - jsonPath: $.Properties.*.propertyDetails.*.institution.type + + - jsonPath: $.Properties.*.propertyDetails.*.institution.designation + + - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.lastModifiedBy + + - jsonPath: $.Properties.*.propertyDetails.*.auditDetails.lastModifiedTime + + + - version: 1.0 + description: Cancel property details in eg_pt_propertydetail_v2 table + fromTopic: cancel-pt-propertyDetail + isTransaction: true + queryMaps: + + - query: UPDATE eg_pt_propertydetail_v2 SET status=? where propertyId=? AND assessmentNumber=? AND tenantId=?; + basePath: Properties.*.propertyDetails.* + jsonMaps: + + - jsonPath: $.Properties.*.propertyDetails.*.status + + - jsonPath: $.Properties[*][?({assessmentNumber} in @.propertyDetails[*].assessmentNumber)].propertyId + + - jsonPath: $.Properties.*.propertyDetails.*.assessmentNumber + + - jsonPath: $.Properties[*][?({assessmentNumber} in @.propertyDetails[*].assessmentNumber)].tenantId + + - version: 1.0 + description: Cancel property in eg_pt_property_v2 table + fromTopic: cancel-pt-property + isTransaction: true + queryMaps: + + - query: UPDATE eg_pt_property_v2 SET status=? where propertyId=? AND tenantId=?; + basePath: Properties.* + jsonMaps: + + - jsonPath: $.Properties.*.status + + - jsonPath: $.Properties.*.propertyId + + - jsonPath: $.Properties.*.tenantId + + - query: UPDATE eg_pt_propertydetail_v2 SET status=? where propertyId=? AND assessmentNumber=? AND tenantId=?; + basePath: Properties.*.propertyDetails.* + jsonMaps: + + - jsonPath: $.Properties.*.propertyDetails.*.status + + - jsonPath: $.Properties[*][?({assessmentNumber} in @.propertyDetails[*].assessmentNumber)].propertyId + + - jsonPath: $.Properties.*.propertyDetails.*.assessmentNumber + + - jsonPath: $.Properties[*][?({assessmentNumber} in @.propertyDetails[*].assessmentNumber)].tenantId diff --git a/configs/egov-persister/pt-calculator-v2-persister.yml b/configs/egov-persister/pt-calculator-v2-persister.yml new file mode 100644 index 00000000..5cef6585 --- /dev/null +++ b/configs/egov-persister/pt-calculator-v2-persister.yml @@ -0,0 +1,118 @@ +serviceMaps: + serviceName: PropertyTax Calculator + mappings: + - version: 1.0 + name: pt-calculator + description: Persists the pt-calculator related records to db + fromTopic: save-pt-billingslab + isTransaction: true + queryMaps: + - query: INSERT INTO eg_pt_Billingslab_v2(id, tenantid, propertyType, propertySubType, usageCategoryMajor, usageCategoryMinor, usageCategorySubMinor, usageCategoryDetail, ownerShipCategory, subOwnerShipCategory, fromFloor, toFloor, areaType, fromPlotSize, toPlotSize, occupancyType, unitRate, unbuiltunitrate, arvpercent, isPropertyMultiFloored, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, cast(? as double precision), cast(? as double precision), ?, ?, cast(? as double precision), ?, ?, ?, ?, ?, ?, ?, ?, ?); + + basePath: BillingSlab.* + jsonMaps: + + - jsonPath: $.BillingSlab.*.id + + - jsonPath: $.BillingSlab.*.tenantId + + - jsonPath: $.BillingSlab.*.propertyType + + - jsonPath: $.BillingSlab.*.propertySubType + + - jsonPath: $.BillingSlab.*.usageCategoryMajor + + - jsonPath: $.BillingSlab.*.usageCategoryMinor + + - jsonPath: $.BillingSlab.*.usageCategorySubMinor + + - jsonPath: $.BillingSlab.*.usageCategoryDetail + + - jsonPath: $.BillingSlab.*.ownerShipCategory + + - jsonPath: $.BillingSlab.*.subOwnerShipCategory + + - jsonPath: $.BillingSlab.*.fromFloor + + - jsonPath: $.BillingSlab.*.toFloor + + - jsonPath: $.BillingSlab.*.areaType + + - jsonPath: $.BillingSlab.*.fromPlotSize + + - jsonPath: $.BillingSlab.*.toPlotSize + + - jsonPath: $.BillingSlab.*.occupancyType + + - jsonPath: $.BillingSlab.*.unitRate + + - jsonPath: $.BillingSlab.*.unBuiltUnitRate + + - jsonPath: $.BillingSlab.*.arvPercent + + - jsonPath: $.BillingSlab.*.isPropertyMultiFloored + + - jsonPath: $.BillingSlab.*.auditDetails.createdBy + + - jsonPath: $.BillingSlab.*.auditDetails.createdTime + + - jsonPath: $.BillingSlab.*.auditDetails.lastmodifiedBy + + - jsonPath: $.BillingSlab.*.auditDetails.lastmodifiedTime + + + - version: 1.0 + name: pt-calculator + description: Persists the pt-calculator related records to db + fromTopic: update-pt-billingslab + isTransaction: true + queryMaps: + + - query: UPDATE eg_pt_Billingslab_v2 SET propertyType=?, propertySubType=?, usageCategoryMajor=?, usageCategoryMinor=?, usageCategorySubMinor=?, usageCategoryDetail=?, ownerShipCategory=?, subOwnerShipCategory=?, fromFloor=cast(? as double precision), toFloor=cast(? as double precision), areaType=?, fromPlotSize=?, toPlotSize=cast(? as double precision), occupancyType=?, unitRate=?, unbuiltunitrate=?, arvpercent=?, isPropertyMultiFloored=?, lastmodifiedby=?, lastmodifiedtime=? WHERE tenantid=? AND id=?; + + basePath: BillingSlab.* + jsonMaps: + + - jsonPath: $.BillingSlab.*.propertyType + + - jsonPath: $.BillingSlab.*.propertySubType + + - jsonPath: $.BillingSlab.*.usageCategoryMajor + + - jsonPath: $.BillingSlab.*.usageCategoryMinor + + - jsonPath: $.BillingSlab.*.usageCategorySubMinor + + - jsonPath: $.BillingSlab.*.usageCategoryDetail + + - jsonPath: $.BillingSlab.*.ownerShipCategory + + - jsonPath: $.BillingSlab.*.subOwnerShipCategory + + - jsonPath: $.BillingSlab.*.fromFloor + + - jsonPath: $.BillingSlab.*.toFloor + + - jsonPath: $.BillingSlab.*.areaType + + - jsonPath: $.BillingSlab.*.fromPlotSize + + - jsonPath: $.BillingSlab.*.toPlotSize + + - jsonPath: $.BillingSlab.*.occupancyType + + - jsonPath: $.BillingSlab.*.unitRate + + - jsonPath: $.BillingSlab.*.unBuiltUnitRate + + - jsonPath: $.BillingSlab.*.arvPercent + + - jsonPath: $.BillingSlab.*.isPropertyMultiFloored + + - jsonPath: $.BillingSlab.*.auditDetails.lastmodifiedBy + + - jsonPath: $.BillingSlab.*.auditDetails.lastmodifiedTime + + - jsonPath: $.BillingSlab.*.tenantId + + - jsonPath: $.BillingSlab.*.id diff --git a/configs/egov-persister/pt-drafts-persister.yml b/configs/egov-persister/pt-drafts-persister.yml new file mode 100644 index 00000000..0c5422b1 --- /dev/null +++ b/configs/egov-persister/pt-drafts-persister.yml @@ -0,0 +1,65 @@ +serviceMaps: + serviceName: PropertyTax + mappings: + - version: 1.0 + name: pt-service-v2 + description: Persists the property tax requests + fromTopic: save-pt-drafts + isTransaction: true + queryMaps: + - query: INSERT INTO eg_pt_drafts_v2(id, userid, tenantid, draft, isActive, createdBy, createdTime, lastModifiedBy, lastModifiedTime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?); + + basePath: draft + jsonMaps: + + - jsonPath: $.draft.id + + - jsonPath: $.draft.userId + + - jsonPath: $.draft.tenantId + + - jsonPath: $.draft.draftRecord + type: JSON + dbType: JSONB + + - jsonPath: $.draft.isActive + + - jsonPath: $.draft.auditDetails.createdBy + + - jsonPath: $.draft.auditDetails.createdTime + + - jsonPath: $.draft.auditDetails.lastModifiedBy + + - jsonPath: $.draft.auditDetails.lastModifiedTime + + + - version: 1.0 + name: pt-service-v2 + description: Persists asset details in eg_asset table + fromTopic: update-pt-drafts + isTransaction: true + queryMaps: + + - query: UPDATE eg_pt_drafts_v2 SET userid=?, tenantid=?, draft=?, isActive=?, assessmentNumber=? ,lastModifiedBy = ?, lastModifiedTime = ? WHERE id=?; + + basePath: draft + jsonMaps: + + - jsonPath: $.draft.userId + + - jsonPath: $.draft.tenantId + + - jsonPath: $.draft.draftRecord + type: JSON + dbType: JSONB + + - jsonPath: $.draft.isActive + + - jsonPath: $.draft.assessmentNumber + + - jsonPath: $.draft.auditDetails.lastModifiedBy + + - jsonPath: $.draft.auditDetails.lastModifiedTime + + - jsonPath: $.draft.id + diff --git a/configs/egov-persister/pt-mutation-calculator-persister.yml b/configs/egov-persister/pt-mutation-calculator-persister.yml new file mode 100644 index 00000000..42b72687 --- /dev/null +++ b/configs/egov-persister/pt-mutation-calculator-persister.yml @@ -0,0 +1,87 @@ +serviceMaps: + serviceName: Property Mutation Calculator + mappings: + - version: 1.0 + name: pt-mutation-calculator + description: Persists the pt-mutation-calculator related records to db + fromTopic: save-pt-mutation-billingslab + isTransaction: true + queryMaps: + - query: INSERT INTO eg_pt_mutation_billingslab(id, tenantid, propertyType, propertySubType, usageCategoryMajor, usageCategoryMinor, usageCategorySubMinor, usageCategoryDetail, ownershipCategory, subOwnershipCategory, minMarketValue, maxMarketValue, fixedAmount, rate, method) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, cast(? as double precision), cast(? as double precision), cast(? as double precision), cast(? as double precision), ?); + + basePath: MutationBillingSlab.* + jsonMaps: + + - jsonPath: $.MutationMutationBillingSlab.*.id + + - jsonPath: $.MutationMutationBillingSlab.*.tenantId + + - jsonPath: $.MutationBillingSlab.*.propertyType + + - jsonPath: $.MutationBillingSlab.*.propertySubType + + - jsonPath: $.MutationBillingSlab.*.usageCategoryMajor + + - jsonPath: $.MutationBillingSlab.*.usageCategoryMinor + + - jsonPath: $.MutationBillingSlab.*.usageCategorySubMinor + + - jsonPath: $.MutationBillingSlab.*.usageCategoryDetail + + - jsonPath: $.MutationBillingSlab.*.ownerShipCategory + + - jsonPath: $.MutationBillingSlab.*.subOwnerShipCategory + + - jsonPath: $.MutationBillingSlab.*.minMarketValue + + - jsonPath: $.MutationBillingSlab.*.maxMarketValue + + - jsonPath: $.MutationBillingSlab.*.fixedAmount + + - jsonPath: $.MutationBillingSlab.*.rate + + - jsonPath: $.MutationBillingSlab.*.type + + + + - version: 1.0 + name: pt-mutation-calculator + description: Persists the pt-mutation-calculator related records to db + fromTopic: update-pt-mutation-billingslab + isTransaction: true + queryMaps: + + - query: UPDATE eg_pt_mutation_billingslab SET propertyType=?, propertySubType=?, usageCategoryMajor=?, usageCategoryMinor=?, usageCategorySubMinor=?, usageCategoryDetail=?, ownershipCategory=?, subOwnershipCategory=?, minMarketValue=cast(? as double precision), maxMarketValue=cast(? as double precision), fixedAmount=cast(? as double precision), rate=cast(? as double precision), method=? WHERE tenantid=? AND id=?; + + basePath: MutationBillingSlab.* + jsonMaps: + + - jsonPath: $.MutationBillingSlab.*.propertyType + + - jsonPath: $.MutationBillingSlab.*.propertySubType + + - jsonPath: $.MutationBillingSlab.*.usageCategoryMajor + + - jsonPath: $.MutationBillingSlab.*.usageCategoryMinor + + - jsonPath: $.MutationBillingSlab.*.usageCategorySubMinor + + - jsonPath: $.MutationBillingSlab.*.usageCategoryDetail + + - jsonPath: $.MutationBillingSlab.*.ownerShipCategory + + - jsonPath: $.MutationBillingSlab.*.subOwnerShipCategory + + - jsonPath: $.MutationBillingSlab.*.minMarketValue + + - jsonPath: $.MutationBillingSlab.*.maxMarketValue + + - jsonPath: $.MutationBillingSlab.*.fixedAmount + + - jsonPath: $.MutationBillingSlab.*.rate + + - jsonPath: $.MutationBillingSlab.*.type + + - jsonPath: $.MutationBillingSlab.*.tenantId + + - jsonPath: $.MutationBillingSlab.*.id diff --git a/configs/egov-persister/pt-persist.yml b/configs/egov-persister/pt-persist.yml new file mode 100644 index 00000000..5efedcc5 --- /dev/null +++ b/configs/egov-persister/pt-persist.yml @@ -0,0 +1,582 @@ +serviceMaps: + serviceName: Property Tax Service + mappings: + - version: 1.0 + name: property tax create + description: create property tax in egpt_property + fromTopic: property-create-validated + queryMaps: + - query: INSERT INTO egpt_property (id,tenantId, upicNumber, oldUpicNumber, vltUpicNumber,creationReason, assessmentDate,occupancyDate, gisRefNo,isAuthorised, isUnderWorkflow, channel, createdBy,lastModifiedBy, createdTime,lastModifiedTime,sequenceNo,demands,oldestUpicNumber)VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?); + basePath: $.properties.* + jsonMaps: + + - jsonPath: $.properties.*.id + + - jsonPath: $.properties.*.tenantId + + - jsonPath: $.properties.*.upicNumber + + - jsonPath: $.properties.*.oldUpicNumber + + - jsonPath: $.properties.*.vltUpicNumber + + - jsonPath: $.properties.*.creationReason + + - jsonPath: $.properties.*.assessmentDate + type: DATE + dbType: DATE + + - jsonPath: $.properties.*.occupancyDate + type: DATE + dbType: DATE + + - jsonPath: $.properties.*.gisRefNo + + - jsonPath: $.properties.*.isAuthorised + type: BOOLEAN + + - jsonPath: $.properties.*.isUnderWorkflow + type: BOOLEAN + + - jsonPath: $.properties.*.channel + + - jsonPath: $.properties.*.auditDetails.createdBy + + - jsonPath: $.properties.*.auditDetails.lastModifiedBy + + - jsonPath: $.properties.*.auditDetails.createdTime + type: LONG + + - jsonPath: $.properties.*.auditDetails.lastModifiedTime + type: LONG + + - jsonPath: $.properties.*.sequenceNo + type: INT + + - jsonPath: $.properties.*.demandsJsonObject + type: JSON + dbType: JSONB + + - jsonPath: $.properties.*.oldestUpicNumber + + - query: INSERT INTO egpt_propertydetails (id, source, regdDocNo, regdDocDate,reason, status, isVerified,verificationDate, isExempted, exemptionReason, propertyType, category, usage,department, apartment, siteLength, siteBreadth, sitalArea,totalBuiltupArea, undividedShare, noOfFloors, isSuperStructure, landOwner, floorType,woodType, roofType, wallType, stateId, applicationNo, createdBy, lastModifiedBy,createdTime, lastModifiedTime, property, taxCalculations,factors,assessmentDates,builderDetails,bpaNo,bpaDate,subUsage)VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?); + basePath: $.properties.*.propertyDetail + jsonMaps: + - jsonPath: $.properties.*.propertyDetail.id + + - jsonPath: $.properties.*.propertyDetail.source + + - jsonPath: $.properties.*.propertyDetail.regdDocNo + + - jsonPath: $.properties.*.propertyDetail.regdDocDate + type: DATE + dbType: DATE + + - jsonPath: $.properties.*.propertyDetail.reason + + - jsonPath: $.properties.*.propertyDetail.status + + - jsonPath: $.properties.*.propertyDetail.isVerified + type: BOOLEAN + + - jsonPath: $.properties.*.propertyDetail.verificationDate + type: DATE + dbType: DATE + + - jsonPath: $.properties.*.propertyDetail.isExempted + type: BOOLEAN + + - jsonPath: $.properties.*.propertyDetail.exemptionReason + + - jsonPath: $.properties.*.propertyDetail.propertyType + + - jsonPath: $.properties.*.propertyDetail.category + + - jsonPath: $.properties.*.propertyDetail.usage + + - jsonPath: $.properties.*.propertyDetail.department + + - jsonPath: $.properties.*.propertyDetail.apartment + + - jsonPath: $.properties.*.propertyDetail.siteLength + type: DOUBLE + + - jsonPath: $.properties.*.propertyDetail.siteBreadth + type: DOUBLE + + - jsonPath: $.properties.*.propertyDetail.sitalArea + type: DOUBLE + + - jsonPath: $.properties.*.propertyDetail.totalBuiltupArea + type: DOUBLE + + - jsonPath: $.properties.*.propertyDetail.undividedShare + type: DOUBLE + + - jsonPath: $.properties.*.propertyDetail.noOfFloors + type: LONG + + - jsonPath: $.properties.*.propertyDetail.isSuperStructure + type: BOOLEAN + + - jsonPath: $.properties.*.propertyDetail.landOwner + + - jsonPath: $.properties.*.propertyDetail.floorType + + - jsonPath: $.properties.*.propertyDetail.woodType + + - jsonPath: $.properties.*.propertyDetail.roofType + + - jsonPath: $.properties.*.propertyDetail.wallType + + - jsonPath: $.properties.*.propertyDetail.stateId + + - jsonPath: $.properties.*.propertyDetail.applicationNo + + - jsonPath: $.properties.*.propertyDetail.auditDetails.createdBy + + - jsonPath: $.properties.*.propertyDetail.auditDetails.lastModifiedBy + + - jsonPath: $.properties.*.propertyDetail.auditDetails.createdTime + type: LONG + + - jsonPath: $.properties.*.propertyDetail.auditDetails.lastModifiedTime + type: LONG + + - jsonPath: $.properties.*.id + + - jsonPath: $.properties.*.propertyDetail.taxCalculations + type: JSON + dbType: JSONB + + - jsonPath: $.properties.*.propertyDetail.factors + type: JSON + dbType: JSONB + + - jsonPath: $.properties.*.propertyDetail.assessmentDates + type: JSON + dbType: JSONB + + - jsonPath: $.properties.*.propertyDetail.builderDetails + type: JSON + dbType: JSONB + + - jsonPath: $.properties.*.propertyDetail.bpaNo + + - jsonPath: $.properties.*.propertyDetail.bpaDate + + - jsonPath: $.properties.*.propertyDetail.subUsage + + + - query: INSERT INTO egpt_Address (id, tenantId, latitude, longitude, addressNumber, addressLine1, addressLine2, landmark, city, pincode, detail,createdBy, lastModifiedBy, createdTime, lastModifiedTime, property, surveyNo, plotNo )VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?); + basePath: $.properties.*.address + jsonMaps: + + - jsonPath: $.properties.*.address.id + + - jsonPath: $.properties.*.address.tenantId + + - jsonPath: $.properties.*.address.latitude + type: DOUBLE + + - jsonPath: $.properties.*.address.longitude + type: DOUBLE + + - jsonPath: $.properties.*.address.addressNumber + + - jsonPath: $.properties.*.address.addressLine1 + + - jsonPath: $.properties.*.address.addressLine2 + + - jsonPath: $.properties.*.address.landmark + + - jsonPath: $.properties.*.address.city + + - jsonPath: $.properties.*.address.pincode + + - jsonPath: $.properties.*.address.detail + + - jsonPath: $.properties.*.address.auditDetails.createdBy + + - jsonPath: $.properties.*.address.auditDetails.lastModifiedBy + + - jsonPath: $.properties.*.address.auditDetails.createdTime + type: LONG + + - jsonPath: $.properties.*.address.auditDetails.lastModifiedTime + type: LONG + + - jsonPath: $.properties.*.id + type: LONG + + - jsonPath: $.properties.*.address.surveyNo + + - jsonPath: $.properties.*.address.plotNo + + + - query: INSERT INTO egpt_floors (id,floorNo,createdBy, lastModifiedBy, createdTime, lastModifiedTime, propertydetails)VALUES(?,?,?,?,?,?,?); + basePath: $.properties.*.propertyDetail.floors.* + jsonMaps: + + - jsonPath: $.properties.*.propertyDetail.floors.*.id + + - jsonPath: $.properties.*.propertyDetail.floors.*.floorNo + + - jsonPath: $.properties.*.propertyDetail.floors.*.auditDetails.createdBy + + - jsonPath: $.properties.*.propertyDetail.floors.*.auditDetails.lastModifiedBy + + - jsonPath: $.properties.*.propertyDetail.floors.*.auditDetails.createdTime + type: LONG + + - jsonPath: $.properties.*.propertyDetail.floors.*.auditDetails.lastModifiedTime + type: LONG + + - jsonPath: $.properties.*.propertyDetail[?( {id} in @.floors[*].id)].id + + - query: INSERT INTO egpt_unit (id, unitNo, unitType, length,width,builtupArea,assessableArea,bpaBuiltupArea,bpaNo,bpaDate,usage,occupancytype,occupierName,firmName,rentCollected, structure, age,exemptionReason, isStructured, occupancyDate, constCompletionDate, manualArv, arv,electricMeterNo, waterMeterNo, createdBy, lastModifiedBy, createdTime, lastModifiedTime,floor,isAuthorised,constructionStartDate,landCost,buildingCost,subusage,carpetArea,exemptionArea,rv) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?); + basePath: $.properties.*.propertyDetail.floors.*.units.* + jsonMaps: + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.id + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.unitNo + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.unitType + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.length + type: DOUBLE + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.width + type: DOUBLE + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.builtupArea + type: DOUBLE + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.assessableArea + type: DOUBLE + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.bpaBuiltupArea + type: DOUBLE + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.bpaNo + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.bpaDate + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.usage + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.occupancyType + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.occupierName + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.firmName + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.rentCollected + type: DOUBLE + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.structure + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.age + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.exemptionReason + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.isStructured + type: BOOLEAN + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.occupancyDate + type: DATE + dbType: DATE + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.constCompletionDate + type: DATE + dbType: DATE + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.manualArv + type: DOUBLE + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.arv + type: DOUBLE + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.electricMeterNo + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.waterMeterNo + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.auditDetails.createdBy + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.auditDetails.lastModifiedBy + type: LONG + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.auditDetails.createdTime + type: LONG + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.auditDetails.lastModifiedTime + type: LONG + + - jsonPath: $.properties.*.propertyDetail.floors[?( {id} in @.units[*].id)].id + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.isAuthorised + type: BOOLEAN + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.constructionStartDate + type: DATE + dbType: DATE + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.landCost + type: DOUBLE + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.buildingCost + type: DOUBLE + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.subUsage + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.carpetArea + type: DOUBLE + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.exemptionArea + type: DOUBLE + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.rv + type: DOUBLE + + - query: INSERT INTO egpt_unit (id, unitNo, unitType, length,width,builtupArea,assessableArea,bpaBuiltupArea,bpaNo,bpaDate,usage,occupancytype,occupierName,firmName,rentCollected, structure, age,exemptionReason, isStructured, occupancyDate, constCompletionDate, manualArv, arv,electricMeterNo, waterMeterNo, createdBy, lastModifiedBy, createdTime, lastModifiedTime,floor,parentid,isAuthorised,constructionStartDate,landCost,buildingCost,subusage,carpetArea,exemptionArea,rv) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?); + basePath: $.properties.*.propertyDetail.floors.*.units.*.units.* + jsonMaps: + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.id + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.unitNo + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.unitType + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.length + type: DOUBLE + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.width + type: DOUBLE + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.builtupArea + type: DOUBLE + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.assessableArea + type: DOUBLE + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.bpaBuiltupArea + type: DOUBLE + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.bpaNo + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.bpaDate + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.usage + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.occupancyType + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.occupierName + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.firmName + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.rentCollected + type: DOUBLE + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.structure + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.age + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.exemptionReason + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.isStructured + type: BOOLEAN + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.occupancyDate + type: DATE + dbType: DATE + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.constCompletionDate + type: DATE + dbType: DATE + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.manualArv + type: DOUBLE + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.arv + type: DOUBLE + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.electricMeterNo + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.waterMeterNo + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.auditDetails.createdBy + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.auditDetails.lastModifiedBy + type: LONG + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.auditDetails.createdTime + type: LONG + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.auditDetails.lastModifiedTime + type: LONG + + - jsonPath: $.properties.*.propertyDetail.floors[?( {id} in @.units[*].id)].id + + - jsonPath: $.properties.*.propertyDetail.floors.*.units[?( {id} in @.units[*].id)].id + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.isAuthorised + type: BOOLEAN + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.constructionStartDate + type: DATE + dbType: DATE + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.landCost + type: DOUBLE + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.buildingCost + type: DOUBLE + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.subUsage + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.carpetArea + type: DOUBLE + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.exemptionArea + type: DOUBLE + + - jsonPath: $.properties.*.propertyDetail.floors.*.units.*.units.*.rv + type: DOUBLE + + - query: INSERT INTO egpt_document (id, fileStore, createdBy, lastModifiedBy, createdTime, lastModifiedTime,propertydetails,documenttype) VALUES(?,?,?,?,?,?,?,?); + basePath: $.properties.*.propertyDetail.documents.* + jsonMaps: + + - jsonPath: $.properties.*.propertyDetail.documents.*.id + + - jsonPath: $.properties.*.propertyDetail.documents.*.fileStore + + - jsonPath: $.properties.*.propertyDetail.documents.*.auditDetails.createdBy + + - jsonPath: $.properties.*.propertyDetail.documents.*.auditDetails.lastModifiedBy + + - jsonPath: $.properties.*.propertyDetail.documents.*.auditDetails.createdTime + type: LONG + + - jsonPath: $.properties.*.propertyDetail.documents.*.auditDetails.lastModifiedTime + type: LONG + + - jsonPath: $.properties.*.propertyDetail[?({id} in @.documents[*].id)].id + + - jsonPath: $.properties.*.propertyDetail.documents.*.documentType + + + - query: INSERT INTO egpt_vacantland (id,surveyNumber,pattaNumber, marketValue,capitalValue,layoutApprovedAuth,layoutPermissionNo,layoutPermissionDate, resdPlotArea,nonResdPlotArea,createdBy, lastModifiedBy, createdTime,lastModifiedTime, property) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?); + basePath: $.properties.*.vacantLand + jsonMaps: + + - jsonPath: $.properties.*.vacantLand.id + + - jsonPath: $.properties.*.vacantLand.surveyNumber + + - jsonPath: $.properties.*.vacantLand.pattaNumber + + - jsonPath: $.properties.*.vacantLand.marketValue + type: DOUBLE + + - jsonPath: $.properties.*.vacantLand.capitalValue + type: DOUBLE + + - jsonPath: $.properties.*.vacantLand.layoutApprovedAuth + + - jsonPath: $.properties.*.vacantLand.layoutPermissionNo + + - jsonPath: $.properties.*.vacantLand.layoutPermissionDate + + - jsonPath: $.properties.*.vacantLand.resdPlotArea + type: DOUBLE + + - jsonPath: $.properties.*.vacantLand.nonResdPlotArea + type: DOUBLE + + - jsonPath: $.properties.*.vacantLand.auditDetails.createdBy + + - jsonPath: $.properties.*.vacantLand.auditDetails.lastModifiedBy + + - jsonPath: $.properties.*.vacantLand.auditDetails.createdTime + type: LONG + + - jsonPath: $.properties.*.vacantLand.auditDetails.lastModifiedTime + type: LONG + + - jsonPath: $.properties.*.id + type: LONG + + + - query: INSERT INTO egpt_propertylocation (id,revenueBoundary, locationBoundary, adminBoundary, northBoundedBy,eastBoundedBy, westBoundedBy, southBoundedBy,createdBy, lastModifiedBy, createdTime,lastModifiedTime,property,guidanceValueBoundary) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?); + basePath: $.properties.*.boundary + jsonMaps: + + - jsonPath: $.properties.*.boundary.id + + - jsonPath: $.properties.*.boundary.revenueBoundary.id + type: LONG + + - jsonPath: $.properties.*.boundary.locationBoundary.id + type: LONG + + - jsonPath: $.properties.*.boundary.adminBoundary.id + type: BOOLEAN + + - jsonPath: $.properties.*.boundary.northBoundedBy + + - jsonPath: $.properties.*.boundary.eastBoundedBy + + - jsonPath: $.properties.*.boundary.westBoundedBy + + - jsonPath: $.properties.*.boundary.southBoundedBy + + - jsonPath: $.properties.*.boundary.auditDetails.createdBy + + - jsonPath: $.properties.*.boundary.auditDetails.lastModifiedBy + + - jsonPath: $.properties.*.boundary.auditDetails.createdTime + type: LONG + + - jsonPath: $.properties.*.boundary.auditDetails.lastModifiedTime + type: LONG + + - jsonPath: $.properties.*.id + type: LONG + + - jsonPath: $.properties.*.boundary.guidanceValueBoundary + type: LONG + + - query: INSERT INTO egpt_property_owner (id, owner,property,isPrimaryOwner, isSecondaryOwner,ownerShipPercentage, ownerType,createdBy, lastModifiedBy, createdTime, lastModifiedTime ) VALUES(?,?,?,?,?,?,?,?,?,?,?); + basePath: $.properties.*.owners.* + jsonMaps: + + + - jsonPath: $.properties.*.owners.*.id + + - jsonPath: $.properties.*.owners.*.owner + type: LONG + + - jsonPath: $.properties[?({id} in @.owners[*].id)].id + + - jsonPath: $.properties.*.owners.*.isPrimaryOwner + type: BOOLEAN + + - jsonPath: $.properties.*.owners.*.isSecondaryOwner + type: BOOLEAN + + - jsonPath: $.properties.*.owners.*.ownerShipPercentage + type: DOUBLE + + - jsonPath: $.properties.*.owners.*.ownerType + + - jsonPath: $.properties.*.owners.*.auditDetails.createdBy + + - jsonPath: $.properties.*.owners.*.auditDetails.lastModifiedBy + + - jsonPath: $.properties.*.owners.*.auditDetails.createdTime + type: LONG + + - jsonPath: $.properties.*.owners.*.auditDetails.lastModifiedTime + type: LONG diff --git a/configs/egov-persister/sewerage-bill-scheduler.yml b/configs/egov-persister/sewerage-bill-scheduler.yml new file mode 100644 index 00000000..dc4d5209 --- /dev/null +++ b/configs/egov-persister/sewerage-bill-scheduler.yml @@ -0,0 +1,33 @@ +serviceMaps: + serviceName: Bill Generate Scheduler Service + mappings: + - version: 1.0 + name: BillGenerateScheduler + description: capture bill generation details for particular sewerage connection number + fromTopic: save-sw-bill-scheduler + isTransaction: true + queryMaps: + - query: INSERT INTO eg_sw_scheduler (id, tenantid, transactiontype,locality,billingcyclestartdate,billingcycleenddate,status, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?,?,?,?,?); + basePath: $.billScheduler + jsonMaps: + - jsonPath: $.billScheduler.id + + - jsonPath: $.billScheduler.tenantId + + - jsonPath: $.billScheduler.transactionType + + - jsonPath: $.billScheduler.locality + + - jsonPath: $.billScheduler.billingcycleStartdate + + - jsonPath: $.billScheduler.billingcycleEnddate + + - jsonPath: $.billScheduler.status + + - jsonPath: $.billScheduler.auditDetails.createdBy + + - jsonPath: $.billScheduler.auditDetails.lastModifiedBy + + - jsonPath: $.billScheduler.auditDetails.createdTime + + - jsonPath: $.billScheduler.auditDetails.lastModifiedTime \ No newline at end of file diff --git a/configs/egov-persister/sewerage-persist.yml b/configs/egov-persister/sewerage-persist.yml new file mode 100644 index 00000000..8508c5b0 --- /dev/null +++ b/configs/egov-persister/sewerage-persist.yml @@ -0,0 +1,455 @@ +serviceMaps: + serviceName: Sewerage Connection Service + mappings: + - version: 1.0 + name: SewerageConnection + description: create ConnectionDetails in connection and eg_sw_service + fromTopic: save-sw-connection + isTransaction: true + queryMaps: + - query: INSERT INTO eg_sw_connection (id, tenantid, property_id, applicationno, applicationstatus, status, connectionno, oldconnectionno,roadcuttingarea,action,roadtype, createdby, lastmodifiedby, createdtime, lastmodifiedtime, applicationtype, dateEffectiveFrom, locality, isoldapplication, additionaldetails) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?,?,?,?,?,?,?,?,?); + basePath: $.SewerageConnection + jsonMaps: + - jsonPath: $.SewerageConnection.id + + - jsonPath: $.SewerageConnection.tenantId + + - jsonPath: $.SewerageConnection.propertyId + + - jsonPath: $.SewerageConnection.applicationNo + + - jsonPath: $.SewerageConnection.applicationStatus + + - jsonPath: $.SewerageConnection.status + + - jsonPath: $.SewerageConnection.connectionNo + + - jsonPath: $.SewerageConnection.oldConnectionNo + + - jsonPath: $.SewerageConnection.roadCuttingArea + + - jsonPath: $.SewerageConnection.processInstance.action + + - jsonPath: $.SewerageConnection.roadType + + - jsonPath: $.SewerageConnection.auditDetails.createdBy + + - jsonPath: $.SewerageConnection.auditDetails.lastModifiedBy + + - jsonPath: $.SewerageConnection.auditDetails.createdTime + + - jsonPath: $.SewerageConnection.auditDetails.lastModifiedTime + + - jsonPath: $.SewerageConnection.applicationType + + - jsonPath: $.SewerageConnection.dateEffectiveFrom + + - jsonPath: $.SewerageConnection.additionalDetails.locality + + - jsonPath: $.SewerageConnection.oldApplication + + - jsonPath: $.SewerageConnection.additionalDetails + type: JSON + dbType: JSONB + + + - query: INSERT INTO eg_sw_service(connection_id,connectionExecutionDate,noOfWaterClosets,noOfToilets,connectiontype,proposedWaterClosets,proposedToilets, appCreatedDate, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES(?,?,?,?,?,?,?,?,?,?,?,?); + basePath: $.SewerageConnection + jsonMaps: + + - jsonPath: $.SewerageConnection.id + + - jsonPath: $.SewerageConnection.connectionExecutionDate + + - jsonPath: $.SewerageConnection.noOfWaterClosets + + - jsonPath: $.SewerageConnection.noOfToilets + + - jsonPath: $.SewerageConnection.connectionType + + - jsonPath: $.SewerageConnection.proposedWaterClosets + + - jsonPath: $.SewerageConnection.proposedToilets + + - jsonPath: $.SewerageConnection.additionalDetails.appCreatedDate + + - jsonPath: $.SewerageConnection.auditDetails.createdBy + + - jsonPath: $.SewerageConnection.auditDetails.lastModifiedBy + + - jsonPath: $.SewerageConnection.auditDetails.createdTime + + - jsonPath: $.SewerageConnection.auditDetails.lastModifiedTime + + - query: INSERT INTO eg_sw_connectionholder(tenantid, connectionid, userid, status, isprimaryholder, connectionholdertype, holdershippercentage, relationship, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: $.SewerageConnection.connectionHolders.* + jsonMaps: + + - jsonPath: $.SewerageConnection.tenantId + + - jsonPath: $.SewerageConnection.id + + - jsonPath: $.SewerageConnection.connectionHolders.*.uuid + + - jsonPath: $.SewerageConnection.connectionHolders.*.status + + - jsonPath: $.SewerageConnection.connectionHolders.*.isPrimaryOwner + + - jsonPath: $.SewerageConnection.connectionHolders.*.ownerType + + - jsonPath: $.SewerageConnection.connectionHolders.*.ownerShipPercentage + + - jsonPath: $.SewerageConnection.connectionHolders.*.relationship + + - jsonPath: $.SewerageConnection.auditDetails.createdBy + + - jsonPath: $.SewerageConnection.auditDetails.createdTime + + - jsonPath: $.SewerageConnection.auditDetails.lastModifiedBy + + - jsonPath: $.SewerageConnection.auditDetails.lastModifiedTime + + - query: INSERT INTO eg_sw_roadcuttinginfo(id, tenantId, swid, active, roadtype, roadcuttingarea, createdBy, lastModifiedBy, createdTime, lastModifiedTime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET active = ?, roadtype =?, roadcuttingarea =?,lastmodifiedby =?, lastmodifiedtime =?; + basePath: $.SewerageConnection.roadCuttingInfo.* + jsonMaps: + + - jsonPath: $.SewerageConnection.roadCuttingInfo.*.id + + - jsonPath: $.SewerageConnection.tenantId + + - jsonPath: $.SewerageConnection.id + + - jsonPath: $.SewerageConnection.roadCuttingInfo.*.status + + - jsonPath: $.SewerageConnection.roadCuttingInfo.*.roadType + + - jsonPath: $.SewerageConnection.roadCuttingInfo.*.roadCuttingArea + + - jsonPath: $.SewerageConnection.roadCuttingInfo.*.auditDetails.createdBy + + - jsonPath: $.SewerageConnection.roadCuttingInfo.*.auditDetails.lastModifiedBy + + - jsonPath: $.SewerageConnection.roadCuttingInfo.*.auditDetails.createdTime + + - jsonPath: $.SewerageConnection.roadCuttingInfo.*.auditDetails.lastModifiedTime + + - jsonPath: $.SewerageConnection.roadCuttingInfo.*.status + + - jsonPath: $.SewerageConnection.roadCuttingInfo.*.roadType + + - jsonPath: $.SewerageConnection.roadCuttingInfo.*.roadCuttingArea + + - jsonPath: $.SewerageConnection.roadCuttingInfo.*.auditDetails.lastModifiedBy + + - jsonPath: $.SewerageConnection.roadCuttingInfo.*.auditDetails.lastModifiedTime + + - version: 1.0 + name: SewerageConnection + description: update ConnectionDetails in connection and eg_sw_service + fromTopic: update-sw-connection + isTransaction: true + queryMaps: + + - query: INSERT INTO eg_sw_connection_audit SELECT * FROM eg_sw_connection WHERE id = ?; + basePath: $.SewerageConnection + jsonMaps: + - jsonPath: $.SewerageConnection.id + + - query: UPDATE eg_sw_connection SET applicationstatus=?, status=?, connectionno=?, oldconnectionno=?, action=?, roadCuttingArea=?, roadType=?, adhocpenalty=?, adhocrebate=?, adhocpenaltyreason=?, adhocpenaltycomment=?, adhocrebatereason=?, adhocrebatecomment=?, lastmodifiedby=?, lastmodifiedtime=?, dateEffectiveFrom=?, locality=?, isoldapplication=?, property_id=?, additionaldetails=? WHERE id=?; + basePath: $.SewerageConnection + jsonMaps: + + - jsonPath: $.SewerageConnection.applicationStatus + + - jsonPath: $.SewerageConnection.status + + - jsonPath: $.SewerageConnection.connectionNo + + - jsonPath: $.SewerageConnection.oldConnectionNo + + - jsonPath: $.SewerageConnection.processInstance.action + + - jsonPath: $.SewerageConnection.roadCuttingArea + + - jsonPath: $.SewerageConnection.roadType + + - jsonPath: $.SewerageConnection.additionalDetails.adhocPenalty + + - jsonPath: $.SewerageConnection.additionalDetails.adhocRebate + + - jsonPath: $.SewerageConnection.additionalDetails.adhocPenaltyReason + + - jsonPath: $.SewerageConnection.additionalDetails.adhocPenaltyComment + + - jsonPath: $.SewerageConnection.additionalDetails.adhocRebateReason + + - jsonPath: $.SewerageConnection.additionalDetails.adhocRebateComment + + - jsonPath: $.SewerageConnection.auditDetails.lastModifiedBy + + - jsonPath: $.SewerageConnection.auditDetails.lastModifiedTime + + - jsonPath: $.SewerageConnection.dateEffectiveFrom + + - jsonPath: $.SewerageConnection.additionalDetails.locality + + - jsonPath: $.SewerageConnection.oldApplication + + - jsonPath: $.SewerageConnection.propertyId + + - jsonPath: $.SewerageConnection.additionalDetails + type: JSON + dbType: JSONB + + - jsonPath: $.SewerageConnection.id + + - query: INSERT INTO eg_sw_service_audit SELECT * FROM eg_sw_service WHERE connection_id = ?; + basePath: $.SewerageConnection + jsonMaps: + - jsonPath: $.SewerageConnection.id + + - query: UPDATE eg_sw_service SET connectionexecutiondate=?, noOfWaterClosets=?, noOfToilets=?, connectiontype=?, proposedWaterClosets=?, proposedToilets=?, detailsprovidedby = ?, estimationfileStoreId = ?, sanctionfileStoreId = ?, estimationLetterDate = ?, lastmodifiedby=?, lastmodifiedtime=? WHERE connection_id=?; + basePath: $.SewerageConnection + jsonMaps: + + - jsonPath: $.SewerageConnection.connectionExecutionDate + + - jsonPath: $.SewerageConnection.noOfWaterClosets + + - jsonPath: $.SewerageConnection.noOfToilets + + - jsonPath: $.SewerageConnection.connectionType + + - jsonPath: $.SewerageConnection.proposedWaterClosets + + - jsonPath: $.SewerageConnection.proposedToilets + + - jsonPath: $.SewerageConnection.additionalDetails.detailsProvidedBy + + - jsonPath: $.SewerageConnection.additionalDetails.estimationFileStoreId + + - jsonPath: $.SewerageConnection.additionalDetails.sanctionFileStoreId + + - jsonPath: $.SewerageConnection.additionalDetails.estimationLetterDate + + - jsonPath: $.SewerageConnection.auditDetails.lastModifiedBy + + - jsonPath: $.SewerageConnection.auditDetails.lastModifiedTime + + - jsonPath: $.SewerageConnection.id + + + - query: INSERT INTO eg_sw_applicationDocument(id, tenantId, documenttype, filestoreid, swid, active, createdBy, lastModifiedBy, createdTime, lastModifiedTime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET active = ?, documenttype =?, filestoreid =?,lastmodifiedby =?, lastmodifiedtime =?; + basePath: $.SewerageConnection.documents.* + jsonMaps: + + - jsonPath: $.SewerageConnection.documents.*.id + + - jsonPath: $.SewerageConnection.tenantId + + - jsonPath: $.SewerageConnection.documents.*.documentType + + - jsonPath: $.SewerageConnection.documents.*.fileStoreId + + - jsonPath: $.SewerageConnection.id + + - jsonPath: $.SewerageConnection.documents.*.status + + - jsonPath: $.SewerageConnection.documents.*.auditDetails.createdBy + + - jsonPath: $.SewerageConnection.documents.*.auditDetails.lastModifiedBy + + - jsonPath: $.SewerageConnection.documents.*.auditDetails.createdTime + + - jsonPath: $.SewerageConnection.documents.*.auditDetails.lastModifiedTime + + - jsonPath: $.SewerageConnection.documents.*.status + + - jsonPath: $.SewerageConnection.documents.*.documentType + + - jsonPath: $.SewerageConnection.documents.*.fileStoreId + + - jsonPath: $.SewerageConnection.documents.*.auditDetails.lastModifiedBy + + - jsonPath: $.SewerageConnection.documents.*.auditDetails.lastModifiedTime + + - query: INSERT INTO eg_sw_plumberinfo(id,tenantId, name, licenseno, mobilenumber, gender, fatherorhusbandname, correspondenceaddress, relationship, createdBy, lastModifiedBy, createdTime, lastModifiedTime, swid) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET name =?, licenseno =?,mobilenumber =?, gender =?, fatherorhusbandname =?, correspondenceaddress =?, relationship=?,lastmodifiedby =?, lastmodifiedtime =?; + basePath: $.SewerageConnection.plumberInfo.* + jsonMaps: + + - jsonPath: $.SewerageConnection.plumberInfo.*.id + + - jsonPath: $.SewerageConnection.tenantId + + - jsonPath: $.SewerageConnection.plumberInfo.*.name + + - jsonPath: $.SewerageConnection.plumberInfo.*.licenseNo + + - jsonPath: $.SewerageConnection.plumberInfo.*.mobileNumber + + - jsonPath: $.SewerageConnection.plumberInfo.*.gender + + - jsonPath: $.SewerageConnection.plumberInfo.*.fatherOrHusbandName + + - jsonPath: $.SewerageConnection.plumberInfo.*.correspondenceAddress + + - jsonPath: $.SewerageConnection.plumberInfo.*.relationship + + - jsonPath: $.SewerageConnection.plumberInfo.*.auditDetails.createdBy + + - jsonPath: $.SewerageConnection.plumberInfo.*.auditDetails.lastModifiedBy + + - jsonPath: $.SewerageConnection.plumberInfo.*.auditDetails.createdTime + + - jsonPath: $.SewerageConnection.plumberInfo.*.auditDetails.lastModifiedTime + + - jsonPath: $.SewerageConnection.id + + - jsonPath: $.SewerageConnection.plumberInfo.*.name + + - jsonPath: $.SewerageConnection.plumberInfo.*.licenseNo + + - jsonPath: $.SewerageConnection.plumberInfo.*.mobileNumber + + - jsonPath: $.SewerageConnection.plumberInfo.*.gender + + - jsonPath: $.SewerageConnection.plumberInfo.*.fatherOrHusbandName + + - jsonPath: $.SewerageConnection.plumberInfo.*.correspondenceAddress + + - jsonPath: $.SewerageConnection.plumberInfo.*.relationship + + - jsonPath: $.SewerageConnection.plumberInfo.*.auditDetails.lastModifiedBy + + - jsonPath: $.SewerageConnection.plumberInfo.*.auditDetails.lastModifiedTime + + - query: INSERT INTO eg_sw_connectionholder(tenantid, connectionid, userid, status, isprimaryholder, connectionholdertype, holdershippercentage, relationship, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (connectionid) DO UPDATE SET tenantid =?, userid =?,status =?, isprimaryholder =?, connectionholdertype =?, holdershippercentage =?, relationship=?, lastmodifiedby =?, lastmodifiedtime =?; + basePath: $.SewerageConnection.connectionHolders.* + jsonMaps: + + - jsonPath: $.SewerageConnection.tenantId + + - jsonPath: $.SewerageConnection.id + + - jsonPath: $.SewerageConnection.connectionHolders.*.uuid + + - jsonPath: $.SewerageConnection.connectionHolders.*.status + + - jsonPath: $.SewerageConnection.connectionHolders.*.isPrimaryOwner + + - jsonPath: $.SewerageConnection.connectionHolders.*.ownerType + + - jsonPath: $.SewerageConnection.connectionHolders.*.ownerShipPercentage + + - jsonPath: $.SewerageConnection.connectionHolders.*.relationship + + - jsonPath: $.SewerageConnection.auditDetails.createdBy + + - jsonPath: $.SewerageConnection.auditDetails.createdTime + + - jsonPath: $.SewerageConnection.auditDetails.lastModifiedBy + + - jsonPath: $.SewerageConnection.auditDetails.lastModifiedTime + + - jsonPath: $.SewerageConnection.tenantId + + - jsonPath: $.SewerageConnection.connectionHolders.*.uuid + + - jsonPath: $.SewerageConnection.connectionHolders.*.status + + - jsonPath: $.SewerageConnection.connectionHolders.*.isPrimaryOwner + + - jsonPath: $.SewerageConnection.connectionHolders.*.ownerType + + - jsonPath: $.SewerageConnection.connectionHolders.*.ownerShipPercentage + + - jsonPath: $.SewerageConnection.connectionHolders.*.relationship + + - jsonPath: $.SewerageConnection.auditDetails.lastModifiedBy + + - jsonPath: $.SewerageConnection.auditDetails.lastModifiedTime + + - query: INSERT INTO eg_sw_roadcuttinginfo(id, tenantId, swid, active, roadtype, roadcuttingarea, createdBy, lastModifiedBy, createdTime, lastModifiedTime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET active = ?, roadtype =?, roadcuttingarea =?,lastmodifiedby =?, lastmodifiedtime =?; + basePath: $.SewerageConnection.roadCuttingInfo.* + jsonMaps: + + - jsonPath: $.SewerageConnection.roadCuttingInfo.*.id + + - jsonPath: $.SewerageConnection.tenantId + + - jsonPath: $.SewerageConnection.id + + - jsonPath: $.SewerageConnection.roadCuttingInfo.*.status + + - jsonPath: $.SewerageConnection.roadCuttingInfo.*.roadType + + - jsonPath: $.SewerageConnection.roadCuttingInfo.*.roadCuttingArea + + - jsonPath: $.SewerageConnection.roadCuttingInfo.*.auditDetails.createdBy + + - jsonPath: $.SewerageConnection.roadCuttingInfo.*.auditDetails.lastModifiedBy + + - jsonPath: $.SewerageConnection.roadCuttingInfo.*.auditDetails.createdTime + + - jsonPath: $.SewerageConnection.roadCuttingInfo.*.auditDetails.lastModifiedTime + + - jsonPath: $.SewerageConnection.roadCuttingInfo.*.status + + - jsonPath: $.SewerageConnection.roadCuttingInfo.*.roadType + + - jsonPath: $.SewerageConnection.roadCuttingInfo.*.roadCuttingArea + + - jsonPath: $.SewerageConnection.roadCuttingInfo.*.auditDetails.lastModifiedBy + + - jsonPath: $.SewerageConnection.roadCuttingInfo.*.auditDetails.lastModifiedTime + + - version: 1.0 + name: SewerageConnection + description: update ConnectionDetails in eg_sw_connection and eg_sw_service + fromTopic: update-sw-workflow + isTransaction: true + queryMaps: + - query: INSERT INTO eg_sw_connection_audit SELECT * FROM eg_sw_connection WHERE id = ?; + basePath: $.SewerageConnection + jsonMaps: + - jsonPath: $.SewerageConnection.id + + - query: UPDATE eg_sw_connection SET applicationstatus=?, status=?, connectionno=?, action=?, lastModifiedBy=?, lastModifiedTime=? WHERE id=?; + basePath: $.SewerageConnection + jsonMaps: + + - jsonPath: $.SewerageConnection.applicationStatus + + - jsonPath: $.SewerageConnection.status + + - jsonPath: $.SewerageConnection.connectionNo + + - jsonPath: $.SewerageConnection.processInstance.action + + - jsonPath: $.SewerageConnection.auditDetails.lastModifiedBy + + - jsonPath: $.SewerageConnection.auditDetails.lastModifiedTime + + - jsonPath: $.SewerageConnection.id + + - version: 1.0 + name: SewerageConnection + description: save filestore ids + fromTopic: save-sw-filestoreids + isTransaction: true + queryMaps: + + - query: INSERT INTO eg_sw_service_audit SELECT * FROM eg_sw_service WHERE connection_id = ?; + basePath: $.SewerageConnection + jsonMaps: + - jsonPath: $.SewerageConnection.id + + - query: UPDATE eg_sw_service SET estimationfileStoreId = ?, sanctionfileStoreId = ? WHERE connection_id=?; + basePath: $.SewerageConnection + jsonMaps: + + - jsonPath: $.SewerageConnection.additionalDetails.estimationFileStoreId + + - jsonPath: $.SewerageConnection.additionalDetails.sanctionFileStoreId + + - jsonPath: $.SewerageConnection.id \ No newline at end of file diff --git a/configs/egov-persister/tl-billing-slab-persister.yml b/configs/egov-persister/tl-billing-slab-persister.yml new file mode 100644 index 00000000..2483c8fb --- /dev/null +++ b/configs/egov-persister/tl-billing-slab-persister.yml @@ -0,0 +1,81 @@ +serviceMaps: + serviceName: tradelicense Calculator + mappings: + - version: 1.0 + name: tl-calculator + description: Persists the billing slabs of tl into db + fromTopic: save-tl-billingslab + isTransaction: true + queryMaps: + - query: INSERT INTO eg_tl_billingSlab(id, tenantid, licensetype, structuretype, tradetype, accessorycategory, type, uom, fromUom, toUom, rate, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, cast(? as double precision), cast(? as double precision), ?, ?, ?, ?, ?); + + basePath: billingSlab.* + jsonMaps: + + - jsonPath: $.billingSlab.*.id + + - jsonPath: $.billingSlab.*.tenantId + + - jsonPath: $.billingSlab.*.licenseType + + - jsonPath: $.billingSlab.*.structureType + + - jsonPath: $.billingSlab.*.tradeType + + - jsonPath: $.billingSlab.*.accessoryCategory + + - jsonPath: $.billingSlab.*.type + + - jsonPath: $.billingSlab.*.uom + + - jsonPath: $.billingSlab.*.fromUom + + - jsonPath: $.billingSlab.*.toUom + + - jsonPath: $.billingSlab.*.rate + + - jsonPath: $.billingSlab.*.auditDetails.createdBy + + - jsonPath: $.billingSlab.*.auditDetails.createdTime + + - jsonPath: $.billingSlab.*.auditDetails.lastModifiedBy + + - jsonPath: $.billingSlab.*.auditDetails.lastModifiedTime + + + - version: 1.0 + name: tl-calculator + description: Updates the billing slabs of tl into db + fromTopic: update-tl-billingslab + isTransaction: true + queryMaps: + - query: UPDATE eg_tl_billingSlab SET licensetype=?, structuretype=?, tradetype=?, accessorycategory=?, type=?, uom=?, fromUom=cast(? as double precision), toUom=cast(? as double precision), rate=?, lastmodifiedby=?, lastmodifiedtime=? WHERE id=? AND tenantid=?; + + basePath: billingSlab.* + jsonMaps: + + - jsonPath: $.billingSlab.*.licenseType + + - jsonPath: $.billingSlab.*.structureType + + - jsonPath: $.billingSlab.*.tradeType + + - jsonPath: $.billingSlab.*.accessoryCategory + + - jsonPath: $.billingSlab.*.type + + - jsonPath: $.billingSlab.*.uom + + - jsonPath: $.billingSlab.*.fromUom + + - jsonPath: $.billingSlab.*.toUom + + - jsonPath: $.billingSlab.*.rate + + - jsonPath: $.billingSlab.*.auditDetails.lastModifiedBy + + - jsonPath: $.billingSlab.*.auditDetails.lastModifiedTime + + - jsonPath: $.billingSlab.*.id + + - jsonPath: $.billingSlab.*.tenantId diff --git a/configs/egov-persister/tl-calculation-persister.yml b/configs/egov-persister/tl-calculation-persister.yml new file mode 100644 index 00000000..85adc65e --- /dev/null +++ b/configs/egov-persister/tl-calculation-persister.yml @@ -0,0 +1,53 @@ +serviceMaps: + serviceName: tl-calculator + mappings: + - version: 1.0 + description: Persists tradeLicense calculation details in EG_TL_CALCULATION table + fromTopic: save-tl-calculation + isTransaction: true + queryMaps: + + - query: INSERT INTO eg_tl_calculator_tradetype(id,tenantId,consumercode,tradeTypeFeeAndBillingSlabIds,createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES ( ?, ?, ?, ?, ?, ?, ?, ?); + basePath: Calculations.*.tradeLicense + jsonMaps: + - jsonPath: $.Calculations.*.tradeTypeBillingIds.id + + - jsonPath: $.Calculations.*.tradeLicense.tenantId + + - jsonPath: $.Calculations.*.tradeLicense.applicationNumber + + - jsonPath: $.Calculations.*.tradeTypeBillingIds + type: JSON + dbType: JSONB + + - jsonPath: $.Calculations.*.tradeLicense.auditDetails.createdBy + + - jsonPath: $.Calculations.*.tradeLicense.auditDetails.lastModifiedBy + + - jsonPath: $.Calculations.*.tradeLicense.auditDetails.createdTime + + - jsonPath: $.Calculations.*.tradeLicense.auditDetails.lastModifiedTime + + + - query: INSERT INTO eg_tl_calculator_accessory(id,tenantId,consumercode,accessoryFeeAndBillingSlabIds,createdby,lastmodifiedby, createdtime, lastmodifiedtime) SELECT * FROM (VALUES ( ?, ?, ?, ?::JSONB, ?, ?, ?::BIGINT, ?::BIGINT)) AS t WHERE (NOT (SELECT coalesce(field, '') = '' FROM (VALUES (?))sub(field))); + basePath: Calculations.*.tradeLicense + jsonMaps: + - jsonPath: $.Calculations.*.accessoryBillingIds.id + + - jsonPath: $.Calculations.*.tradeLicense.tenantId + + - jsonPath: $.Calculations.*.tradeLicense.applicationNumber + + - jsonPath: $.Calculations.*.accessoryBillingIds + type: JSON + dbType: JSONB + + - jsonPath: $.Calculations.*.tradeLicense.auditDetails.createdBy + + - jsonPath: $.Calculations.*.tradeLicense.auditDetails.lastModifiedBy + + - jsonPath: $.Calculations.*.tradeLicense.auditDetails.createdTime + + - jsonPath: $.Calculations.*.tradeLicense.auditDetails.lastModifiedTime + + - jsonPath: $.Calculations.*.accessoryBillingIds.id diff --git a/configs/egov-persister/tradelicense-persister.yml b/configs/egov-persister/tradelicense-persister.yml new file mode 100644 index 00000000..b012713e --- /dev/null +++ b/configs/egov-persister/tradelicense-persister.yml @@ -0,0 +1,847 @@ +serviceMaps: + serviceName: tl-services + mappings: + - version: 1.0 + description: Persists tradeLicense details in EG_TL_TradeLicense table + fromTopic: save-tl-tradelicense + isTransaction: true + queryMaps: + + - query: INSERT INTO eg_tl_tradelicense( id, accountid,tenantid,tradeName, validfrom,validto,licensetype,applicationNumber, licenseNumber, oldlicensenumber, propertyid, oldpropertyid, applicationdate, commencementdate, financialyear, action, status, createdby, lastmodifiedby, createdtime, lastmodifiedtime, businessservice, applicationtype, workflowcode) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: Licenses.* + jsonMaps: + - jsonPath: $.Licenses.*.id + + - jsonPath: $.Licenses.*.accountId + + - jsonPath: $.Licenses.*.tenantId + + - jsonPath: $.Licenses.*.tradeName + + - jsonPath: $.Licenses.*.validFrom + + - jsonPath: $.Licenses.*.validTo + + - jsonPath: $.Licenses.*.licenseType + + - jsonPath: $.Licenses.*.applicationNumber + + - jsonPath: $.Licenses.*.licenseNumber + + - jsonPath: $.Licenses.*.oldLicenseNumber + + - jsonPath: $.Licenses.*.propertyId + + - jsonPath: $.Licenses.*.oldPropertyId + + - jsonPath: $.Licenses.*.applicationDate + + - jsonPath: $.Licenses.*.commencementDate + + - jsonPath: $.Licenses.*.financialYear + + - jsonPath: $.Licenses.*.action + + - jsonPath: $.Licenses.*.status + + - jsonPath: $.Licenses.*.auditDetails.createdBy + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy + + - jsonPath: $.Licenses.*.auditDetails.createdTime + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime + + - jsonPath: $.Licenses.*.businessService + + - jsonPath: $.Licenses.*.applicationType + + - jsonPath: $.Licenses.*.workflowCode + + + - query: INSERT INTO eg_tl_tradelicensedetail( id, surveyno, subownershipcategory, channel, additionaldetail, tradelicenseid,structureType,operationalArea,noOfEmployees,adhocExemption,adhocPenalty,adhocExemptionReason,adhocPenaltyReason, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?, ?, ?, ?); + basePath: Licenses.*.tradeLicenseDetail + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.id + + - jsonPath: $.Licenses.*.tradeLicenseDetail.surveyNo + + - jsonPath: $.Licenses.*.tradeLicenseDetail.subOwnerShipCategory + + - jsonPath: $.Licenses.*.tradeLicenseDetail.channel + + - jsonPath: $.Licenses.*.tradeLicenseDetail.additionalDetail + type: JSON + dbType: JSONB + + - jsonPath: $.Licenses.*.id + + - jsonPath: $.Licenses.*.tradeLicenseDetail.structureType + + - jsonPath: $.Licenses.*.tradeLicenseDetail.operationalArea + + - jsonPath: $.Licenses.*.tradeLicenseDetail.noOfEmployees + + - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocExemption + + - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocPenalty + + - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocExemptionReason + + - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocPenaltyReason + + - jsonPath: $.Licenses.*.auditDetails.createdBy + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy + + - jsonPath: $.Licenses.*.auditDetails.createdTime + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime + + + + - query: INSERT INTO eg_tl_tradeunit( id, tenantid,active, tradetype, uom, uomvalue, tradelicensedetailid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?,?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: Licenses.*.tradeLicenseDetail.tradeUnits.* + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.id + + - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.tenantId + + - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.active + + - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.tradeType + + - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.uom + + - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.uomValue + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].tradeLicenseDetail.id + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.createdBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.createdTime + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.lastModifiedTime + + + + - query: INSERT INTO eg_tl_accessory( id, tenantid,active, accessoryCategory, uom, uomvalue, count, tradelicensedetailid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?,?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: Licenses.*.tradeLicenseDetail.accessories.* + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.id + + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.tenantId + + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.active + + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.accessoryCategory + + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.uom + + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.uomValue + + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.count + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].tradeLicenseDetail.id + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.createdBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.createdTime + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.lastModifiedTime + + + - query: INSERT INTO eg_tl_owner( id,tenantid,active,institutionid, tradelicensedetailid, isprimaryowner, ownertype, ownershippercentage, relationship, createdby,lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: Licenses.*.tradeLicenseDetail.owners.* + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.uuid + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.tenantId + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.userActive + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.institutionId + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].tradeLicenseDetail.id + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.isPrimaryOwner + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.ownerType + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.ownerShipPercentage + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.relationship + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.createdBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.createdTime + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.lastModifiedTime + + + + - query: INSERT INTO eg_tl_document_owner(id,tenantId,userid,active, tradeLicenseDetailId, documenttype, fileStoreId,documentuid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ? ,? ,?, ?, ?, ?, ?, ?, ?, ?); + basePath: Licenses.*.tradeLicenseDetail.owners.*.documents.* + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.id + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].tenantId + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners[*][?({id} in @.documents[*].id)].uuid + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.active + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].tradeLicenseDetail.id + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.documentType + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.fileStoreId + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.documentUid + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.createdBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.createdTime + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.lastModifiedTime + + + + - query: INSERT INTO eg_tl_applicationdocument( id, tenantid, active, documenttype, tradecategorydetail, filestoreid, tradelicensedetailid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: Licenses.*.tradeLicenseDetail.applicationDocuments.* + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.id + + - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.tenantId + + - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.active + + - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.documentType + + - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.tradecategorydetail + + - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.fileStoreId + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].tradeLicenseDetail.id + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.createdBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.createdTime + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.lastModifiedTime + + + - query: INSERT INTO eg_tl_address( id, tenantid, doorno,street,buildingName, latitude,longitude, addressid, addressnumber,locality, type, addressline1, addressline2, landmark, city, pincode, detail, tradelicensedetailid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: Licenses.*.tradeLicenseDetail.address + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.id + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.tenantId + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.doorNo + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.street + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.buildingName + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.latitude + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.longitude + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.addressId + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.addressNumber + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.locality.code + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.type + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.addressLine1 + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.addressline2 + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.landmark + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.city + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.pincode + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.detail + + - jsonPath: $.Licenses.*.tradeLicenseDetail.id + + - jsonPath: $.Licenses.*.auditDetails.createdBy + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy + + - jsonPath: $.Licenses.*.auditDetails.createdTime + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime + + + - query: INSERT INTO eg_tl_institution(tenantId,active,id,instituionName,contactNo,organisationRegistrationNo,address, tradelicensedetailid, name, type,designation, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ; + basePath: Licenses.*.tradeLicenseDetail.institution + jsonMaps: + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.tenantId + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.active + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.id + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.instituionName + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.contactNo + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.organisationRegistrationNo + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.address + + - jsonPath: $.Licenses.*.tradeLicenseDetail.id + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.name + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.type + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.designation + + - jsonPath: $.Licenses.*.auditDetails.createdBy + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy + + - jsonPath: $.Licenses.*.auditDetails.createdTime + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime + + + + + + + - version: 1.0 + description: Update tradeLicense details in EG_TL_TradeLicense table + fromTopic: update-tl-tradelicense + isTransaction: true + queryMaps: + + + - query: INSERT INTO eg_tl_tradelicense_audit SELECT * FROM eg_tl_tradelicense WHERE id = ?; + basePath: Licenses.* + jsonMaps: + - jsonPath: $.Licenses.*.id + + + - query: UPDATE eg_tl_tradelicense SET tradeName = ?,licenseNumber = ?,licensetype = ?, oldlicensenumber = ?, propertyid = ?, oldpropertyid = ?, commencementdate = ?, issueddate = ?, financialyear = ?, validfrom = ?, validto = ?, action = ?, status = ?, lastmodifiedby = ?, lastmodifiedtime = ?, businessservice = ?, applicationtype = ?, workflowcode = ? WHERE id=?; + basePath: Licenses.* + jsonMaps: + - jsonPath: $.Licenses.*.tradeName + + - jsonPath: $.Licenses.*.licenseNumber + + - jsonPath: $.Licenses.*.licenseType + + - jsonPath: $.Licenses.*.oldLicenseNumber + + - jsonPath: $.Licenses.*.propertyId + + - jsonPath: $.Licenses.*.oldPropertyId + + - jsonPath: $.Licenses.*.commencementDate + + - jsonPath: $.Licenses.*.issuedDate + + - jsonPath: $.Licenses.*.financialYear + + - jsonPath: $.Licenses.*.validFrom + + - jsonPath: $.Licenses.*.validTo + + - jsonPath: $.Licenses.*.action + + - jsonPath: $.Licenses.*.status + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime + + - jsonPath: $.Licenses.*.businessService + + - jsonPath: $.Licenses.*.applicationType + + - jsonPath: $.Licenses.*.workflowCode + + - jsonPath: $.Licenses.*.id + + - query: INSERT INTO eg_tl_tradelicensedetail_audit SELECT * FROM eg_tl_tradelicensedetail WHERE id = ?; + basePath: Licenses.*.tradeLicenseDetail + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.id + + + + - query: UPDATE eg_tl_tradelicensedetail SET surveyno = ?, subownershipcategory = ?, channel = ?, additionaldetail = ?,operationalArea = ?,noOfEmployees = ?,structureType = ?,adhocExemption = ?,adhocPenalty = ?,adhocExemptionReason = ?,adhocPenaltyReason = ?,lastmodifiedby = ?, lastmodifiedtime = ? WHERE id = ?; + basePath: Licenses.*.tradeLicenseDetail + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.surveyNo + + - jsonPath: $.Licenses.*.tradeLicenseDetail.subOwnerShipCategory + + - jsonPath: $.Licenses.*.tradeLicenseDetail.channel + + - jsonPath: $.Licenses.*.tradeLicenseDetail.additionalDetail + type: JSON + dbType: JSONB + + - jsonPath: $.Licenses.*.tradeLicenseDetail.operationalArea + + - jsonPath: $.Licenses.*.tradeLicenseDetail.noOfEmployees + + - jsonPath: $.Licenses.*.tradeLicenseDetail.structureType + + - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocExemption + + - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocPenalty + + - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocExemptionReason + + - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocPenaltyReason + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime + + - jsonPath: $.Licenses.*.tradeLicenseDetail.id + + + - query: INSERT INTO eg_tl_tradeunit(id, tenantid, active, tradetype, uom, uomvalue, tradelicensedetailid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET active = ?, tradetype = ?, uom = ?, uomvalue = ?, lastmodifiedby = ?, lastmodifiedtime = ?; + basePath: Licenses.*.tradeLicenseDetail.tradeUnits.* + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.id + + - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.tenantId + + - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.active + + - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.tradeType + + - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.uom + + - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.uomValue + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].tradeLicenseDetail.id + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.createdBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.createdTime + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.lastModifiedTime + + - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.active + + - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.tradeType + + - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.uom + + - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.uomValue + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.lastModifiedTime + + + - query: INSERT INTO eg_tl_accessory(id, tenantid, active, accessoryCategory, uom, uomvalue, count, tradelicensedetailid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET active = ?,accessoryCategory = ?, uom = ?, uomvalue = ?,count =?, lastmodifiedby = ?, lastmodifiedtime = ?; + basePath: Licenses.*.tradeLicenseDetail.accessories.* + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.id + + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.tenantId + + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.active + + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.accessoryCategory + + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.uom + + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.uomValue + + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.count + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].tradeLicenseDetail.id + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.createdBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.createdTime + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.lastModifiedTime + + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.active + + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.accessoryCategory + + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.uom + + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.uomValue + + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.count + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.lastModifiedTime + + + + - query: INSERT INTO eg_tl_owner( id, tenantid, active, tradelicensedetailid, isprimaryowner, ownertype, ownershippercentage, relationship, createdby,lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT ON CONSTRAINT pk_eg_tl_owner DO UPDATE SET active = ?, isprimaryowner = ?, ownertype = ?, ownershippercentage = ?, relationship = ?, lastmodifiedby = ?, lastmodifiedtime = ?; + basePath: Licenses.*.tradeLicenseDetail.owners.* + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.uuid + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.tenantId + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.userActive + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].tradeLicenseDetail.id + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.isPrimaryOwner + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.ownerType + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.ownerShipPercentage + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.relationship + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.createdBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.createdTime + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.lastModifiedTime + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.userActive + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.isPrimaryOwner + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.ownerType + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.ownerShipPercentage + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.relationship + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.lastModifiedTime + + + - query: INSERT INTO eg_tl_document_owner(id,tenantId,active,userid, tradeLicenseDetailId, documenttype, fileStoreId,documentuid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT ON CONSTRAINT pk_eg_tl_document_owner DO UPDATE SET active = ?, documenttype = ?, fileStoreId = ?,documentuid = ?, lastmodifiedby = ?, lastmodifiedtime = ?; + basePath: Licenses.*.tradeLicenseDetail.owners.*.documents.* + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.id + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].tenantId + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.active + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners[*][?({id} in @.documents[*].id)].uuid + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].tradeLicenseDetail.id + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.documentType + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.fileStoreId + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.documentUid + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.createdBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.createdTime + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.lastModifiedTime + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.active + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.documentType + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.fileStoreId + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.documentUid + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.lastModifiedTime + + + + - query: INSERT INTO eg_tl_applicationdocument( id, tenantid, active, documenttype, tradecategorydetail, filestoreid, tradelicensedetailid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET active = ?, documenttype =?, tradecategorydetail =?, filestoreid =?,lastmodifiedby =?, lastmodifiedtime =?; + basePath: Licenses.*.tradeLicenseDetail.applicationDocuments.* + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.id + + - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.tenantId + + - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.active + + - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.documentType + + - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.tradecategorydetail + + - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.fileStoreId + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].tradeLicenseDetail.id + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.createdBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.createdTime + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.lastModifiedTime + + - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.active + + - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.documentType + + - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.tradecategorydetail + + - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.fileStoreId + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.lastModifiedTime + + + + - query: UPDATE eg_tl_address SET doorno =?,street = ?,buildingName = ?, latitude =?, longitude =?, addressid =?, addressnumber =?,locality =?, type =?, addressline1 =?, addressline2 =?, landmark =?, city =?, pincode =?, detail =?,lastmodifiedby =?, lastmodifiedtime =? WHERE id =?; + basePath: Licenses.*.tradeLicenseDetail.address + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.doorNo + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.street + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.buildingName + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.latitude + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.longitude + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.addressId + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.addressNumber + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.locality.code + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.type + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.addressline1 + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.addressline2 + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.landmark + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.city + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.pincode + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.detail + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.id + + + - query: INSERT INTO eg_tl_institution(tenantId, active, id, instituionName, contactNo, organisationRegistrationNo, address, tradelicensedetailid, name, type,designation, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET active = ?,name = ?,type = ?,designation = ?, lastmodifiedby = ?,lastmodifiedtime = ?, instituionName = ?, contactNo = ?, organisationRegistrationNo = ?, address = ?; + basePath: Licenses.*.tradeLicenseDetail.institution + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.tenantId + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.active + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.id + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.instituionName + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.contactNo + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.organisationRegistrationNo + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.address + + - jsonPath: $.Licenses.*.tradeLicenseDetail.id + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.name + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.type + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.designation + + - jsonPath: $.Licenses.*.auditDetails.createdBy + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy + + - jsonPath: $.Licenses.*.auditDetails.createdTime + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.active + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.name + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.type + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.designation + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.instituionName + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.contactNo + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.organisationRegistrationNo + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.address + + + + + - version: 1.0 + description: Persists tradeLicense details in EG_TL_TradeLicense table + fromTopic: update-tl-workflow + isTransaction: true + queryMaps: + + - query: INSERT INTO eg_tl_tradelicense_audit SELECT * FROM eg_tl_tradelicense WHERE id = ?; + basePath: Licenses.* + jsonMaps: + - jsonPath: $.Licenses.*.id + + + + - query: INSERT INTO eg_tl_tradelicensedetail_audit SELECT * FROM eg_tl_tradelicensedetail WHERE id = ?; + basePath: Licenses.*.tradeLicenseDetail + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.id + + + + - query: INSERT INTO eg_tl_verificationdocument( id, tenantid, active, documenttype, tradecategorydetail, filestoreid,tradelicensedetailid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET active = ?,documenttype =?, tradecategorydetail =?, filestoreid =?, lastmodifiedby =?, lastmodifiedtime =?; + basePath: Licenses.*.tradeLicenseDetail.verificationDocuments.* + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.id + + - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.tenantId + + - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.active + + - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.documentType + + - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.tradecategorydetail + + - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.fileStoreId + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.verificationDocuments[*].id)].tradeLicenseDetail.id + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.verificationDocuments[*].id)].auditDetails.createdBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.verificationDocuments[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.verificationDocuments[*].id)].auditDetails.createdTime + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.verificationDocuments[*].id)].auditDetails.lastModifiedTime + + - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.active + + - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.documentType + + - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.tradecategorydetail + + - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.fileStoreId + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.verificationDocuments[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.verificationDocuments[*].id)].auditDetails.lastModifiedTime + + + - query: UPDATE eg_tl_tradelicense SET validfrom = ?,validto = ?,licenseNumber =?, issueddate = ?, action = ?, status = ?, lastmodifiedby = ?, lastmodifiedtime = ? WHERE id=?; + basePath: Licenses.* + jsonMaps: + - jsonPath: $.Licenses.*.validFrom + + - jsonPath: $.Licenses.*.validTo + + - jsonPath: $.Licenses.*.licenseNumber + + - jsonPath: $.Licenses.*.issuedDate + + - jsonPath: $.Licenses.*.action + + - jsonPath: $.Licenses.*.status + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime + + - jsonPath: $.Licenses.*.id + + + - query: UPDATE eg_tl_tradelicensedetail SET additionaldetail = ?,lastmodifiedby = ?, lastmodifiedtime = ? WHERE id = ?; + basePath: Licenses.*.tradeLicenseDetail + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.additionalDetail + type: JSON + dbType: JSONB + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime + + - jsonPath: $.Licenses.*.tradeLicenseDetail.id + + + + - version: 1.0 + description: Update adhocDetails + fromTopic: update-tl-adhoc-tradelicense + isTransaction: true + queryMaps: + + + - query: UPDATE eg_tl_tradelicensedetail SET additionaldetail = ?, adhocExemption = ?,adhocPenalty = ?,adhocExemptionReason = ?,adhocPenaltyReason = ?,lastmodifiedby = ?, lastmodifiedtime = ? WHERE id = ?; + basePath: Licenses.*.tradeLicenseDetail + jsonMaps: + + - jsonPath: $.Licenses.*.tradeLicenseDetail.additionalDetail + type: JSON + dbType: JSONB + + - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocExemption + + - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocPenalty + + - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocExemptionReason + + - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocPenaltyReason + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime + + - jsonPath: $.Licenses.*.tradeLicenseDetail.id \ No newline at end of file diff --git a/configs/egov-persister/tradelicense.yml b/configs/egov-persister/tradelicense.yml new file mode 100644 index 00000000..2efc3184 --- /dev/null +++ b/configs/egov-persister/tradelicense.yml @@ -0,0 +1,847 @@ +serviceMaps: + serviceName: tl-services + mappings: + - version: 1.0 + description: Persists tradeLicense details in EG_TL_TradeLicense table + fromTopic: save-tl-tradelicense + isTransaction: true + queryMaps: + + - query: INSERT INTO eg_tl_tradelicense( id, accountid,tenantid,tradeName, validfrom,validto,licensetype,applicationNumber, licenseNumber, oldlicensenumber, propertyid, oldpropertyid, applicationdate, commencementdate, financialyear, action, status, createdby, lastmodifiedby, createdtime, lastmodifiedtime, businessservice, applicationtype, workflowcode) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: Licenses.* + jsonMaps: + - jsonPath: $.Licenses.*.id + + - jsonPath: $.Licenses.*.accountId + + - jsonPath: $.Licenses.*.tenantId + + - jsonPath: $.Licenses.*.tradeName + + - jsonPath: $.Licenses.*.validFrom + + - jsonPath: $.Licenses.*.validTo + + - jsonPath: $.Licenses.*.licenseType + + - jsonPath: $.Licenses.*.applicationNumber + + - jsonPath: $.Licenses.*.licenseNumber + + - jsonPath: $.Licenses.*.oldLicenseNumber + + - jsonPath: $.Licenses.*.propertyId + + - jsonPath: $.Licenses.*.oldPropertyId + + - jsonPath: $.Licenses.*.applicationDate + + - jsonPath: $.Licenses.*.commencementDate + + - jsonPath: $.Licenses.*.financialYear + + - jsonPath: $.Licenses.*.action + + - jsonPath: $.Licenses.*.status + + - jsonPath: $.Licenses.*.auditDetails.createdBy + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy + + - jsonPath: $.Licenses.*.auditDetails.createdTime + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime + + - jsonPath: $.Licenses.*.businessService + + - jsonPath: $.Licenses.*.applicationType + + - jsonPath: $.Licenses.*.workflowCode + + + - query: INSERT INTO eg_tl_tradelicensedetail( id, surveyno, subownershipcategory, channel, additionaldetail, tradelicenseid,structureType,operationalArea,noOfEmployees,adhocExemption,adhocPenalty,adhocExemptionReason,adhocPenaltyReason, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?, ?, ?, ?); + basePath: Licenses.*.tradeLicenseDetail + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.id + + - jsonPath: $.Licenses.*.tradeLicenseDetail.surveyNo + + - jsonPath: $.Licenses.*.tradeLicenseDetail.subOwnerShipCategory + + - jsonPath: $.Licenses.*.tradeLicenseDetail.channel + + - jsonPath: $.Licenses.*.tradeLicenseDetail.additionalDetail + type: JSON + dbType: JSONB + + - jsonPath: $.Licenses.*.id + + - jsonPath: $.Licenses.*.tradeLicenseDetail.structureType + + - jsonPath: $.Licenses.*.tradeLicenseDetail.operationalArea + + - jsonPath: $.Licenses.*.tradeLicenseDetail.noOfEmployees + + - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocExemption + + - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocPenalty + + - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocExemptionReason + + - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocPenaltyReason + + - jsonPath: $.Licenses.*.auditDetails.createdBy + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy + + - jsonPath: $.Licenses.*.auditDetails.createdTime + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime + + + + - query: INSERT INTO eg_tl_tradeunit( id, tenantid,active, tradetype, uom, uomvalue, tradelicensedetailid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?,?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: Licenses.*.tradeLicenseDetail.tradeUnits.* + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.id + + - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.tenantId + + - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.active + + - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.tradeType + + - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.uom + + - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.uomValue + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].tradeLicenseDetail.id + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.createdBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.createdTime + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.lastModifiedTime + + + + - query: INSERT INTO eg_tl_accessory( id, tenantid,active, accessoryCategory, uom, uomvalue, count, tradelicensedetailid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?,?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: Licenses.*.tradeLicenseDetail.accessories.* + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.id + + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.tenantId + + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.active + + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.accessoryCategory + + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.uom + + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.uomValue + + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.count + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].tradeLicenseDetail.id + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.createdBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.createdTime + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.lastModifiedTime + + + - query: INSERT INTO eg_tl_owner( id,tenantid,active,institutionid, tradelicensedetailid, isprimaryowner, ownertype, ownershippercentage, relationship, createdby,lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: Licenses.*.tradeLicenseDetail.owners.* + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.uuid + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.tenantId + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.userActive + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.institutionId + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].tradeLicenseDetail.id + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.isPrimaryOwner + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.ownerType + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.ownerShipPercentage + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.relationship + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.createdBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.createdTime + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.lastModifiedTime + + + + - query: INSERT INTO eg_tl_document_owner(id,tenantId,userid,active, tradeLicenseDetailId, documenttype, fileStoreId,documentuid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ? ,? ,?, ?, ?, ?, ?, ?, ?, ?); + basePath: Licenses.*.tradeLicenseDetail.owners.*.documents.* + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.id + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].tenantId + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners[*][?({id} in @.documents[*].id)].uuid + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.active + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].tradeLicenseDetail.id + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.documentType + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.fileStoreId + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.documentUid + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.createdBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.createdTime + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.lastModifiedTime + + + + - query: INSERT INTO eg_tl_applicationdocument( id, tenantid, active, documenttype, tradecategorydetail, filestoreid, tradelicensedetailid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: Licenses.*.tradeLicenseDetail.applicationDocuments.* + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.id + + - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.tenantId + + - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.active + + - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.documentType + + - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.tradecategorydetail + + - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.fileStoreId + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].tradeLicenseDetail.id + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.createdBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.createdTime + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.lastModifiedTime + + + - query: INSERT INTO eg_tl_address( id, tenantid, doorno,street,buildingName, latitude,longitude, addressid, addressnumber,locality, type, addressline1, addressline2, landmark, city, pincode, detail, tradelicensedetailid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: Licenses.*.tradeLicenseDetail.address + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.id + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.tenantId + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.doorNo + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.street + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.buildingName + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.latitude + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.longitude + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.addressId + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.addressNumber + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.locality.code + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.type + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.addressLine1 + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.addressline2 + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.landmark + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.city + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.pincode + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.detail + + - jsonPath: $.Licenses.*.tradeLicenseDetail.id + + - jsonPath: $.Licenses.*.auditDetails.createdBy + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy + + - jsonPath: $.Licenses.*.auditDetails.createdTime + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime + + + - query: INSERT INTO eg_tl_institution(tenantId,active,id,instituionName,contactNo,organisationRegistrationNo,address, tradelicensedetailid, name, type,designation, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ; + basePath: Licenses.*.tradeLicenseDetail.institution + jsonMaps: + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.tenantId + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.active + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.id + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.instituionName + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.contactNo + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.organisationRegistrationNo + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.address + + - jsonPath: $.Licenses.*.tradeLicenseDetail.id + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.name + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.type + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.designation + + - jsonPath: $.Licenses.*.auditDetails.createdBy + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy + + - jsonPath: $.Licenses.*.auditDetails.createdTime + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime + + + + + + + - version: 1.0 + description: Update tradeLicense details in EG_TL_TradeLicense table + fromTopic: update-tl-tradelicense + isTransaction: true + queryMaps: + + + - query: INSERT INTO eg_tl_tradelicense_audit SELECT * FROM eg_tl_tradelicense WHERE id = ?; + basePath: Licenses.* + jsonMaps: + - jsonPath: $.Licenses.*.id + + + - query: UPDATE eg_tl_tradelicense SET tradeName = ?,licenseNumber = ?,licensetype = ?, oldlicensenumber = ?, propertyid = ?, oldpropertyid = ?, commencementdate = ?, issueddate = ?, financialyear = ?, validfrom = ?, validto = ?, action = ?, status = ?, lastmodifiedby = ?, lastmodifiedtime = ?, businessservice = ?, applicationtype = ?, workflowcode = ? WHERE id=?; + basePath: Licenses.* + jsonMaps: + - jsonPath: $.Licenses.*.tradeName + + - jsonPath: $.Licenses.*.licenseNumber + + - jsonPath: $.Licenses.*.licenseType + + - jsonPath: $.Licenses.*.oldLicenseNumber + + - jsonPath: $.Licenses.*.propertyId + + - jsonPath: $.Licenses.*.oldPropertyId + + - jsonPath: $.Licenses.*.commencementDate + + - jsonPath: $.Licenses.*.issuedDate + + - jsonPath: $.Licenses.*.financialYear + + - jsonPath: $.Licenses.*.validFrom + + - jsonPath: $.Licenses.*.validTo + + - jsonPath: $.Licenses.*.action + + - jsonPath: $.Licenses.*.status + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime + + - jsonPath: $.Licenses.*.businessService + + - jsonPath: $.Licenses.*.applicationType + + - jsonPath: $.Licenses.*.workflowCode + + - jsonPath: $.Licenses.*.id + + - query: INSERT INTO eg_tl_tradelicensedetail_audit SELECT * FROM eg_tl_tradelicensedetail WHERE id = ?; + basePath: Licenses.*.tradeLicenseDetail + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.id + + + + - query: UPDATE eg_tl_tradelicensedetail SET surveyno = ?, subownershipcategory = ?, channel = ?, additionaldetail = ?,operationalArea = ?,noOfEmployees = ?,structureType = ?,adhocExemption = ?,adhocPenalty = ?,adhocExemptionReason = ?,adhocPenaltyReason = ?,lastmodifiedby = ?, lastmodifiedtime = ? WHERE id = ?; + basePath: Licenses.*.tradeLicenseDetail + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.surveyNo + + - jsonPath: $.Licenses.*.tradeLicenseDetail.subOwnerShipCategory + + - jsonPath: $.Licenses.*.tradeLicenseDetail.channel + + - jsonPath: $.Licenses.*.tradeLicenseDetail.additionalDetail + type: JSON + dbType: JSONB + + - jsonPath: $.Licenses.*.tradeLicenseDetail.operationalArea + + - jsonPath: $.Licenses.*.tradeLicenseDetail.noOfEmployees + + - jsonPath: $.Licenses.*.tradeLicenseDetail.structureType + + - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocExemption + + - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocPenalty + + - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocExemptionReason + + - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocPenaltyReason + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime + + - jsonPath: $.Licenses.*.tradeLicenseDetail.id + + + - query: INSERT INTO eg_tl_tradeunit(id, tenantid, active, tradetype, uom, uomvalue, tradelicensedetailid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET active = ?, tradetype = ?, uom = ?, uomvalue = ?, lastmodifiedby = ?, lastmodifiedtime = ?; + basePath: Licenses.*.tradeLicenseDetail.tradeUnits.* + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.id + + - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.tenantId + + - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.active + + - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.tradeType + + - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.uom + + - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.uomValue + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].tradeLicenseDetail.id + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.createdBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.createdTime + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.lastModifiedTime + + - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.active + + - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.tradeType + + - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.uom + + - jsonPath: $.Licenses.*.tradeLicenseDetail.tradeUnits.*.uomValue + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.tradeUnits[*].id)].auditDetails.lastModifiedTime + + + - query: INSERT INTO eg_tl_accessory(id, tenantid, active, accessoryCategory, uom, uomvalue, count, tradelicensedetailid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET active = ?,accessoryCategory = ?, uom = ?, uomvalue = ?,count =?, lastmodifiedby = ?, lastmodifiedtime = ?; + basePath: Licenses.*.tradeLicenseDetail.accessories.* + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.id + + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.tenantId + + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.active + + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.accessoryCategory + + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.uom + + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.uomValue + + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.count + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].tradeLicenseDetail.id + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.createdBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.createdTime + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.lastModifiedTime + + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.active + + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.accessoryCategory + + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.uom + + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.uomValue + + - jsonPath: $.Licenses.*.tradeLicenseDetail.accessories.*.count + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.accessories[*].id)].auditDetails.lastModifiedTime + + + + - query: INSERT INTO eg_tl_owner( id, tenantid, active, tradelicensedetailid, isprimaryowner, ownertype, ownershippercentage, relationship, createdby,lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT ON CONSTRAINT pk_eg_tl_owner DO UPDATE SET active = ?, isprimaryowner = ?, ownertype = ?, ownershippercentage = ?, relationship = ?, lastmodifiedby = ?, lastmodifiedtime = ?; + basePath: Licenses.*.tradeLicenseDetail.owners.* + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.uuid + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.tenantId + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.userActive + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].tradeLicenseDetail.id + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.isPrimaryOwner + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.ownerType + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.ownerShipPercentage + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.relationship + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.createdBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.createdTime + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.lastModifiedTime + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.userActive + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.isPrimaryOwner + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.ownerType + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.ownerShipPercentage + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.relationship + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners[*].id)].auditDetails.lastModifiedTime + + + - query: INSERT INTO eg_tl_document_owner(id,tenantId,active,userid, tradeLicenseDetailId, documenttype, fileStoreId,documentuid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT ON CONSTRAINT pk_eg_tl_document_owner DO UPDATE SET active = ?, documenttype = ?, fileStoreId = ?,documentuid = ?, lastmodifiedby = ?, lastmodifiedtime = ?; + basePath: Licenses.*.tradeLicenseDetail.owners.*.documents.* + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.id + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].tenantId + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.active + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners[*][?({id} in @.documents[*].id)].uuid + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].tradeLicenseDetail.id + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.documentType + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.fileStoreId + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.documentUid + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.createdBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.createdTime + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.lastModifiedTime + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.active + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.documentType + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.fileStoreId + + - jsonPath: $.Licenses.*.tradeLicenseDetail.owners.*.documents.*.documentUid + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.owners.*.documents[*].id)].auditDetails.lastModifiedTime + + + + - query: INSERT INTO eg_tl_applicationdocument( id, tenantid, active, documenttype, tradecategorydetail, filestoreid, tradelicensedetailid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET active = ?, documenttype =?, tradecategorydetail =?, filestoreid =?,lastmodifiedby =?, lastmodifiedtime =?; + basePath: Licenses.*.tradeLicenseDetail.applicationDocuments.* + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.id + + - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.tenantId + + - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.active + + - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.documentType + + - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.tradecategorydetail + + - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.fileStoreId + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].tradeLicenseDetail.id + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.createdBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.createdTime + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.lastModifiedTime + + - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.active + + - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.documentType + + - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.tradecategorydetail + + - jsonPath: $.Licenses.*.tradeLicenseDetail.applicationDocuments.*.fileStoreId + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.applicationDocuments[*].id)].auditDetails.lastModifiedTime + + + + - query: UPDATE eg_tl_address SET doorno =?,street = ?,buildingName = ?, latitude =?, longitude =?, addressid =?, addressnumber =?,locality =?, type =?, addressline1 =?, addressline2 =?, landmark =?, city =?, pincode =?, detail =?,lastmodifiedby =?, lastmodifiedtime =? WHERE id =?; + basePath: Licenses.*.tradeLicenseDetail.address + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.doorNo + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.street + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.buildingName + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.latitude + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.longitude + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.addressId + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.addressNumber + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.locality.code + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.type + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.addressline1 + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.addressline2 + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.landmark + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.city + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.pincode + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.detail + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime + + - jsonPath: $.Licenses.*.tradeLicenseDetail.address.id + + + - query: INSERT INTO eg_tl_institution(tenantId, active, id, instituionName, contactNo, organisationRegistrationNo, address, tradelicensedetailid, name, type,designation, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET active = ?,name = ?,type = ?,designation = ?, lastmodifiedby = ?,lastmodifiedtime = ?, instituionName = ?, contactNo = ?, organisationRegistrationNo = ?, address = ?; + basePath: Licenses.*.tradeLicenseDetail.institution + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.tenantId + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.active + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.id + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.instituionName + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.contactNo + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.organisationRegistrationNo + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.address + + - jsonPath: $.Licenses.*.tradeLicenseDetail.id + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.name + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.type + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.designation + + - jsonPath: $.Licenses.*.auditDetails.createdBy + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy + + - jsonPath: $.Licenses.*.auditDetails.createdTime + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.active + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.name + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.type + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.designation + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.instituionName + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.contactNo + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.organisationRegistrationNo + + - jsonPath: $.Licenses.*.tradeLicenseDetail.institution.address + + + + + - version: 1.0 + description: Persists tradeLicense details in EG_TL_TradeLicense table + fromTopic: update-tl-workflow + isTransaction: true + queryMaps: + + - query: INSERT INTO eg_tl_tradelicense_audit SELECT * FROM eg_tl_tradelicense WHERE id = ?; + basePath: Licenses.* + jsonMaps: + - jsonPath: $.Licenses.*.id + + + + - query: INSERT INTO eg_tl_tradelicensedetail_audit SELECT * FROM eg_tl_tradelicensedetail WHERE id = ?; + basePath: Licenses.*.tradeLicenseDetail + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.id + + + + - query: INSERT INTO eg_tl_verificationdocument( id, tenantid, active, documenttype, tradecategorydetail, filestoreid,tradelicensedetailid, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET active = ?,documenttype =?, tradecategorydetail =?, filestoreid =?, lastmodifiedby =?, lastmodifiedtime =?; + basePath: Licenses.*.tradeLicenseDetail.verificationDocuments.* + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.id + + - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.tenantId + + - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.active + + - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.documentType + + - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.tradecategorydetail + + - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.fileStoreId + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.verificationDocuments[*].id)].tradeLicenseDetail.id + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.verificationDocuments[*].id)].auditDetails.createdBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.verificationDocuments[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.verificationDocuments[*].id)].auditDetails.createdTime + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.verificationDocuments[*].id)].auditDetails.lastModifiedTime + + - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.active + + - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.documentType + + - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.tradecategorydetail + + - jsonPath: $.Licenses.*.tradeLicenseDetail.verificationDocuments.*.fileStoreId + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.verificationDocuments[*].id)].auditDetails.lastModifiedBy + + - jsonPath: $.Licenses[*][?({id} in @.tradeLicenseDetail.verificationDocuments[*].id)].auditDetails.lastModifiedTime + + + - query: UPDATE eg_tl_tradelicense SET validfrom = ?,validto = ?,licenseNumber =?, issueddate = ?, action = ?, status = ?, lastmodifiedby = ?, lastmodifiedtime = ? WHERE id=?; + basePath: Licenses.* + jsonMaps: + - jsonPath: $.Licenses.*.validFrom + + - jsonPath: $.Licenses.*.validTo + + - jsonPath: $.Licenses.*.licenseNumber + + - jsonPath: $.Licenses.*.issuedDate + + - jsonPath: $.Licenses.*.action + + - jsonPath: $.Licenses.*.status + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime + + - jsonPath: $.Licenses.*.id + + + - query: UPDATE eg_tl_tradelicensedetail SET additionaldetail = ?,lastmodifiedby = ?, lastmodifiedtime = ? WHERE id = ?; + basePath: Licenses.*.tradeLicenseDetail + jsonMaps: + - jsonPath: $.Licenses.*.tradeLicenseDetail.additionalDetail + type: JSON + dbType: JSONB + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime + + - jsonPath: $.Licenses.*.tradeLicenseDetail.id + + + + - version: 1.0 + description: Update adhocDetails + fromTopic: update-tl-adhoc-tradelicense + isTransaction: true + queryMaps: + + + - query: UPDATE eg_tl_tradelicensedetail SET additionaldetail = ?, adhocExemption = ?,adhocPenalty = ?,adhocExemptionReason = ?,adhocPenaltyReason = ?,lastmodifiedby = ?, lastmodifiedtime = ? WHERE id = ?; + basePath: Licenses.*.tradeLicenseDetail + jsonMaps: + + - jsonPath: $.Licenses.*.tradeLicenseDetail.additionalDetail + type: JSON + dbType: JSONB + + - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocExemption + + - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocPenalty + + - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocExemptionReason + + - jsonPath: $.Licenses.*.tradeLicenseDetail.adhocPenaltyReason + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedBy + + - jsonPath: $.Licenses.*.auditDetails.lastModifiedTime + + - jsonPath: $.Licenses.*.tradeLicenseDetail.id diff --git a/configs/egov-persister/uploader-persister.yml b/configs/egov-persister/uploader-persister.yml new file mode 100644 index 00000000..32fdc3df --- /dev/null +++ b/configs/egov-persister/uploader-persister.yml @@ -0,0 +1,75 @@ +serviceMaps: + serviceName: Uploader + mappings: + - version: 1.0 + name: Uploader + description: Persists upload jobs to table + fromTopic: save-upload-jobs + isTransaction: true + queryMaps: + - query: Insert into EGDU_UPLOADREGISTRY(CODE, TENANTID, REQUESTFILE_PATH, MODULE_NAME, DEF_NAME, REQUESTER_NAME, STATUS,FILE_NAME,CREATEDBY,CREATEDDATE,LASTMODIFIEDBY,LASTMODIFIEDDATE) VALUES(?,?,?,?,?,?,?,?,?,?,?,?); + basePath: UploadJob + jsonMaps: + + + - jsonPath: $.UploadJob.code + + - jsonPath: $.UploadJob.tenantId + + - jsonPath: $.UploadJob.requestFilePath + + - jsonPath: $.UploadJob.moduleName + + - jsonPath: $.UploadJob.defName + + - jsonPath: $.UploadJob.requesterName + + - jsonPath: $.UploadJob.status + + - jsonPath: $.UploadJob.requestFileName + + - jsonPath: $.UploadJob.auditDetails.createdBy + + - jsonPath: $.UploadJob.auditDetails.createdTime + + - jsonPath: $.UploadJob.auditDetails.lastModifiedBy + + - jsonPath: $.UploadJob.auditDetails.lastModifiedTime + + + + - version: 1.0 + name: Uploader + description: Updates upload jobs in the table + fromTopic: update-upload-jobs + isTransaction: true + queryMaps: + - query: Update EGDU_UPLOADREGISTRY set START_TIME=?, END_TIME=?, TOTAL_ROWS=?, SUCCESS_ROWS=?, FAILED_ROWS=?, RESPONSEFILE_PATH=?, STATUS=?, REASON_FOR_FAILURE = ?, LASTMODIFIEDBY=?, LASTMODIFIEDDATE=? where CODE=? AND TENANTID=? + basePath: UploadJobs + jsonMaps: + + + - jsonPath: $.UploadJob.startTime + + - jsonPath: $.UploadJob.endTime + + - jsonPath: $.UploadJob.totalRows + + - jsonPath: $.UploadJob.successfulRows + + - jsonPath: $.UploadJob.failedRows + + - jsonPath: $.UploadJob.responseFilePath + + - jsonPath: $.UploadJob.status + + - jsonPath: $.UploadJob.reasonForFailure + + - jsonPath: $.UploadJob.auditDetails.lastModifiedBy + + - jsonPath: $.UploadJob.auditDetails.lastModifiedTime + + - jsonPath: $.UploadJob.code + + - jsonPath: $.UploadJob.tenantId + diff --git a/configs/egov-persister/water-bill-scheduler.yml b/configs/egov-persister/water-bill-scheduler.yml new file mode 100644 index 00000000..f3e299b4 --- /dev/null +++ b/configs/egov-persister/water-bill-scheduler.yml @@ -0,0 +1,33 @@ +serviceMaps: + serviceName: Bill Generate Scheduler Service + mappings: + - version: 1.0 + name: BillGenerateScheduler + description: capture bill generation details for particular connection number + fromTopic: save-ws-bill-scheduler + isTransaction: true + queryMaps: + - query: INSERT INTO eg_ws_scheduler (id, tenantid, transactiontype,locality,billingcyclestartdate,billingcycleenddate,status, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?,?,?,?,?); + basePath: $.billScheduler + jsonMaps: + - jsonPath: $.billScheduler.id + + - jsonPath: $.billScheduler.tenantId + + - jsonPath: $.billScheduler.transactionType + + - jsonPath: $.billScheduler.locality + + - jsonPath: $.billScheduler.billingcycleStartdate + + - jsonPath: $.billScheduler.billingcycleEnddate + + - jsonPath: $.billScheduler.status + + - jsonPath: $.billScheduler.auditDetails.createdBy + + - jsonPath: $.billScheduler.auditDetails.lastModifiedBy + + - jsonPath: $.billScheduler.auditDetails.createdTime + + - jsonPath: $.billScheduler.auditDetails.lastModifiedTime \ No newline at end of file diff --git a/configs/egov-persister/water-meter.yml b/configs/egov-persister/water-meter.yml new file mode 100644 index 00000000..495c25da --- /dev/null +++ b/configs/egov-persister/water-meter.yml @@ -0,0 +1,37 @@ +serviceMaps: + serviceName: Meter Connection Service + mappings: + - version: 1.0 + name: MeterConnection + description: create meter reading for particular connection number + fromTopic: save-ws-meter + isTransaction: true + queryMaps: + - query: INSERT INTO eg_ws_meterreading (id, tenantid, connectionNo, billingPeriod, meterStatus, lastReading, lastReadingDate, currentReading, currentReadingDate, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?,?,?,?,?,?, ?); + basePath: $.meterReadings + jsonMaps: + - jsonPath: $.meterReadings.id + + - jsonPath: $.meterReadings.tenantId + + - jsonPath: $.meterReadings.connectionNo + + - jsonPath: $.meterReadings.billingPeriod + + - jsonPath: $.meterReadings.meterStatus + + - jsonPath: $.meterReadings.lastReading + + - jsonPath: $.meterReadings.lastReadingDate + + - jsonPath: $.meterReadings.currentReading + + - jsonPath: $.meterReadings.currentReadingDate + + - jsonPath: $.meterReadings.auditDetails.createdBy + + - jsonPath: $.meterReadings.auditDetails.lastModifiedBy + + - jsonPath: $.meterReadings.auditDetails.createdTime + + - jsonPath: $.meterReadings.auditDetails.lastModifiedTime \ No newline at end of file diff --git a/configs/egov-persister/water-persist.yml b/configs/egov-persister/water-persist.yml new file mode 100644 index 00000000..d95437ff --- /dev/null +++ b/configs/egov-persister/water-persist.yml @@ -0,0 +1,473 @@ +serviceMaps: + serviceName: Water Connection Service + mappings: + - version: 1.0 + name: WaterConnection + description: create ConnectionDetails in connection and water_service_connection + fromTopic: save-ws-connection + isTransaction: true + queryMaps: + - query: INSERT INTO eg_ws_connection (id, tenantid, property_id, applicationno, applicationstatus, status, connectionno, oldconnectionno,roadcuttingarea,action,roadtype, createdby, lastmodifiedby, createdtime, lastmodifiedtime, applicationtype, dateEffectiveFrom, locality, isoldapplication,additionaldetails) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?,?,?,?,?,?,?,?,?); + basePath: $.WaterConnection + jsonMaps: + - jsonPath: $.WaterConnection.id + + - jsonPath: $.WaterConnection.tenantId + + - jsonPath: $.WaterConnection.propertyId + + - jsonPath: $.WaterConnection.applicationNo + + - jsonPath: $.WaterConnection.applicationStatus + + - jsonPath: $.WaterConnection.status + + - jsonPath: $.WaterConnection.connectionNo + + - jsonPath: $.WaterConnection.oldConnectionNo + + - jsonPath: $.WaterConnection.roadCuttingArea + + - jsonPath: $.WaterConnection.processInstance.action + + - jsonPath: $.WaterConnection.roadType + + - jsonPath: $.WaterConnection.auditDetails.createdBy + + - jsonPath: $.WaterConnection.auditDetails.lastModifiedBy + + - jsonPath: $.WaterConnection.auditDetails.createdTime + + - jsonPath: $.WaterConnection.auditDetails.lastModifiedTime + + - jsonPath: $.WaterConnection.applicationType + + - jsonPath: $.WaterConnection.dateEffectiveFrom + + - jsonPath: $.WaterConnection.additionalDetails.locality + + - jsonPath: $.WaterConnection.oldApplication + + - jsonPath: $.WaterConnection.additionalDetails + type: JSON + dbType: JSONB + + + - query: INSERT INTO eg_ws_service(connection_id,connectionCategory,connectionType,waterSource,meterId,meterInstallationDate,pipeSize,noOfTaps,connectionexecutiondate,proposedPipeSize,proposedTaps, appCreatedDate, createdby, lastmodifiedby, createdtime, lastmodifiedtime) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?); + basePath: $.WaterConnection + jsonMaps: + + - jsonPath: $.WaterConnection.id + - jsonPath: $.WaterConnection.connectionCategory + + - jsonPath: $.WaterConnection.connectionType + + - jsonPath: $.WaterConnection.waterSource + + - jsonPath: $.WaterConnection.meterId + + - jsonPath: $.WaterConnection.meterInstallationDate + + - jsonPath: $.WaterConnection.pipeSize + + - jsonPath: $.WaterConnection.noOfTaps + + - jsonPath: $.WaterConnection.connectionExecutionDate + + - jsonPath: $.WaterConnection.proposedPipeSize + + - jsonPath: $.WaterConnection.proposedTaps + + - jsonPath: $.WaterConnection.additionalDetails.appCreatedDate + + - jsonPath: $.WaterConnection.auditDetails.createdBy + + - jsonPath: $.WaterConnection.auditDetails.lastModifiedBy + + - jsonPath: $.WaterConnection.auditDetails.createdTime + + - jsonPath: $.WaterConnection.auditDetails.lastModifiedTime + + + - query: INSERT INTO eg_ws_connectionholder(tenantid, connectionid, userid, status, isprimaryholder, connectionholdertype, holdershippercentage, relationship, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: $.WaterConnection.connectionHolders.* + jsonMaps: + + - jsonPath: $.WaterConnection.tenantId + + - jsonPath: $.WaterConnection.id + + - jsonPath: $.WaterConnection.connectionHolders.*.uuid + + - jsonPath: $.WaterConnection.connectionHolders.*.status + + - jsonPath: $.WaterConnection.connectionHolders.*.isPrimaryOwner + + - jsonPath: $.WaterConnection.connectionHolders.*.ownerType + + - jsonPath: $.WaterConnection.connectionHolders.*.ownerShipPercentage + + - jsonPath: $.WaterConnection.connectionHolders.*.relationship + + - jsonPath: $.WaterConnection.auditDetails.createdBy + + - jsonPath: $.WaterConnection.auditDetails.createdTime + + - jsonPath: $.WaterConnection.auditDetails.lastModifiedBy + + - jsonPath: $.WaterConnection.auditDetails.lastModifiedTime + + - query: INSERT INTO eg_ws_roadcuttinginfo(id, tenantId, wsid, active, roadtype, roadcuttingarea, createdBy, lastModifiedBy, createdTime, lastModifiedTime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET active = ?, roadtype =?, roadcuttingarea =?,lastmodifiedby =?, lastmodifiedtime =?; + basePath: $.WaterConnection.roadCuttingInfo.* + jsonMaps: + + - jsonPath: $.WaterConnection.roadCuttingInfo.*.id + + - jsonPath: $.WaterConnection.tenantId + + - jsonPath: $.WaterConnection.id + + - jsonPath: $.WaterConnection.roadCuttingInfo.*.status + + - jsonPath: $.WaterConnection.roadCuttingInfo.*.roadType + + - jsonPath: $.WaterConnection.roadCuttingInfo.*.roadCuttingArea + + - jsonPath: $.WaterConnection.roadCuttingInfo.*.auditDetails.createdBy + + - jsonPath: $.WaterConnection.roadCuttingInfo.*.auditDetails.lastModifiedBy + + - jsonPath: $.WaterConnection.roadCuttingInfo.*.auditDetails.createdTime + + - jsonPath: $.WaterConnection.roadCuttingInfo.*.auditDetails.lastModifiedTime + + - jsonPath: $.WaterConnection.roadCuttingInfo.*.status + + - jsonPath: $.WaterConnection.roadCuttingInfo.*.roadType + + - jsonPath: $.WaterConnection.roadCuttingInfo.*.roadCuttingArea + + - jsonPath: $.WaterConnection.roadCuttingInfo.*.auditDetails.lastModifiedBy + + - jsonPath: $.WaterConnection.roadCuttingInfo.*.auditDetails.lastModifiedTime + + - version: 1.0 + name: WaterConnection + description: update ConnectionDetails in eg_ws_connection and eg_ws_service + fromTopic: update-ws-connection + isTransaction: true + queryMaps: + + - query: INSERT INTO eg_ws_connection_audit SELECT * FROM eg_ws_connection WHERE id = ?; + basePath: $.WaterConnection + jsonMaps: + - jsonPath: $.WaterConnection.id + + - query: UPDATE eg_ws_connection SET applicationstatus=?, status=?, connectionno=?, oldconnectionno=?, action=?, roadCuttingArea=?, roadType=?, adhocpenalty=?, adhocrebate=?, adhocpenaltyreason=?, adhocpenaltycomment=?, adhocrebatereason=?, adhocrebatecomment=?, lastModifiedBy=?, lastModifiedTime=?, dateEffectiveFrom=?, locality=?, isoldapplication=?, property_id=?, additionaldetails=? WHERE id=?; + basePath: $.WaterConnection + jsonMaps: + + - jsonPath: $.WaterConnection.applicationStatus + + - jsonPath: $.WaterConnection.status + + - jsonPath: $.WaterConnection.connectionNo + + - jsonPath: $.WaterConnection.oldConnectionNo + + - jsonPath: $.WaterConnection.processInstance.action + + - jsonPath: $.WaterConnection.roadCuttingArea + + - jsonPath: $.WaterConnection.roadType + + - jsonPath: $.WaterConnection.additionalDetails.adhocPenalty + + - jsonPath: $.WaterConnection.additionalDetails.adhocRebate + + - jsonPath: $.WaterConnection.additionalDetails.adhocPenaltyReason + + - jsonPath: $.WaterConnection.additionalDetails.adhocPenaltyComment + + - jsonPath: $.WaterConnection.additionalDetails.adhocRebateReason + + - jsonPath: $.WaterConnection.additionalDetails.adhocRebateComment + + - jsonPath: $.WaterConnection.auditDetails.lastModifiedBy + + - jsonPath: $.WaterConnection.auditDetails.lastModifiedTime + + - jsonPath: $.WaterConnection.dateEffectiveFrom + + - jsonPath: $.WaterConnection.additionalDetails.locality + + - jsonPath: $.WaterConnection.oldApplication + + - jsonPath: $.WaterConnection.propertyId + + - jsonPath: $.WaterConnection.additionalDetails + type: JSON + dbType: JSONB + + - jsonPath: $.WaterConnection.id + + - query: INSERT INTO eg_ws_service_audit SELECT * FROM eg_ws_service WHERE connection_id = ?; + basePath: $.WaterConnection + jsonMaps: + - jsonPath: $.WaterConnection.id + + - query: UPDATE eg_ws_service SET connectionCategory=?,connectionType=?,waterSource=?,meterId=?,meterInstallationDate=?,pipeSize=?,noOfTaps=?,proposedPipeSize=?,proposedTaps=?, initialmeterreading = ?, connectionexecutiondate = ?, detailsprovidedby = ?, estimationfileStoreId = ?, sanctionfileStoreId = ?, estimationLetterDate = ?, lastModifiedBy=?, lastModifiedTime=? WHERE connection_id=?; + basePath: $.WaterConnection + jsonMaps: + + - jsonPath: $.WaterConnection.connectionCategory + + - jsonPath: $.WaterConnection.connectionType + + - jsonPath: $.WaterConnection.waterSource + + - jsonPath: $.WaterConnection.meterId + + - jsonPath: $.WaterConnection.meterInstallationDate + + - jsonPath: $.WaterConnection.pipeSize + + - jsonPath: $.WaterConnection.noOfTaps + + - jsonPath: $.WaterConnection.proposedPipeSize + + - jsonPath: $.WaterConnection.proposedTaps + + - jsonPath: $.WaterConnection.additionalDetails.initialMeterReading + + - jsonPath: $.WaterConnection.connectionExecutionDate + + - jsonPath: $.WaterConnection.additionalDetails.detailsProvidedBy + + - jsonPath: $.WaterConnection.additionalDetails.estimationFileStoreId + + - jsonPath: $.WaterConnection.additionalDetails.sanctionFileStoreId + + - jsonPath: $.WaterConnection.additionalDetails.estimationLetterDate + + - jsonPath: $.WaterConnection.auditDetails.lastModifiedBy + + - jsonPath: $.WaterConnection.auditDetails.lastModifiedTime + + - jsonPath: $.WaterConnection.id + + - query: INSERT INTO eg_ws_applicationDocument(id, tenantId, documenttype, filestoreid, wsid, active, createdBy, lastModifiedBy, createdTime, lastModifiedTime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET active = ?, documenttype =?, filestoreid =?,lastmodifiedby =?, lastmodifiedtime =?; + basePath: $.WaterConnection.documents.* + jsonMaps: + + - jsonPath: $.WaterConnection.documents.*.id + + - jsonPath: $.WaterConnection.tenantId + + - jsonPath: $.WaterConnection.documents.*.documentType + + - jsonPath: $.WaterConnection.documents.*.fileStoreId + + - jsonPath: $.WaterConnection.id + + - jsonPath: $.WaterConnection.documents.*.status + + - jsonPath: $.WaterConnection.documents.*.auditDetails.createdBy + + - jsonPath: $.WaterConnection.documents.*.auditDetails.lastModifiedBy + + - jsonPath: $.WaterConnection.documents.*.auditDetails.createdTime + + - jsonPath: $.WaterConnection.documents.*.auditDetails.lastModifiedTime + + - jsonPath: $.WaterConnection.documents.*.status + + - jsonPath: $.WaterConnection.documents.*.documentType + + - jsonPath: $.WaterConnection.documents.*.fileStoreId + + - jsonPath: $.WaterConnection.documents.*.auditDetails.lastModifiedBy + + - jsonPath: $.WaterConnection.documents.*.auditDetails.lastModifiedTime + + - query: INSERT INTO eg_ws_plumberinfo(id, tenantId, name, licenseno, mobilenumber, gender, fatherorhusbandname, correspondenceaddress, relationship, createdBy, lastModifiedBy, createdTime, lastModifiedTime, wsid) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET name =?, licenseno =?,mobilenumber =?, gender =?, fatherorhusbandname =?, correspondenceaddress =?, relationship=?, lastmodifiedby =?, lastmodifiedtime =?; + basePath: $.WaterConnection.plumberInfo.* + jsonMaps: + + - jsonPath: $.WaterConnection.plumberInfo.*.id + + - jsonPath: $.WaterConnection.tenantId + + - jsonPath: $.WaterConnection.plumberInfo.*.name + + - jsonPath: $.WaterConnection.plumberInfo.*.licenseNo + + - jsonPath: $.WaterConnection.plumberInfo.*.mobileNumber + + - jsonPath: $.WaterConnection.plumberInfo.*.gender + + - jsonPath: $.WaterConnection.plumberInfo.*.fatherOrHusbandName + + - jsonPath: $.WaterConnection.plumberInfo.*.correspondenceAddress + + - jsonPath: $.WaterConnection.plumberInfo.*.relationship + + - jsonPath: $.WaterConnection.plumberInfo.*.auditDetails.createdBy + + - jsonPath: $.WaterConnection.plumberInfo.*.auditDetails.lastModifiedBy + + - jsonPath: $.WaterConnection.plumberInfo.*.auditDetails.createdTime + + - jsonPath: $.WaterConnection.plumberInfo.*.auditDetails.lastModifiedTime + + - jsonPath: $.WaterConnection.id + + - jsonPath: $.WaterConnection.plumberInfo.*.name + + - jsonPath: $.WaterConnection.plumberInfo.*.licenseNo + + - jsonPath: $.WaterConnection.plumberInfo.*.mobileNumber + + - jsonPath: $.WaterConnection.plumberInfo.*.gender + + - jsonPath: $.WaterConnection.plumberInfo.*.fatherOrHusbandName + + - jsonPath: $.WaterConnection.plumberInfo.*.correspondenceAddress + + - jsonPath: $.WaterConnection.plumberInfo.*.relationship + + - jsonPath: $.WaterConnection.plumberInfo.*.auditDetails.lastModifiedBy + + - jsonPath: $.WaterConnection.plumberInfo.*.auditDetails.lastModifiedTime + + - query: INSERT INTO eg_ws_connectionholder(tenantid, connectionid, userid, status, isprimaryholder, connectionholdertype, holdershippercentage, relationship, createdby, createdtime, lastmodifiedby, lastmodifiedtime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (connectionid) DO UPDATE SET tenantid =?, userid =?,status =?, isprimaryholder =?, connectionholdertype =?, holdershippercentage =?, relationship=?, lastmodifiedby =?, lastmodifiedtime =?; + basePath: $.WaterConnection.connectionHolders.* + jsonMaps: + + - jsonPath: $.WaterConnection.tenantId + + - jsonPath: $.WaterConnection.id + + - jsonPath: $.WaterConnection.connectionHolders.*.uuid + + - jsonPath: $.WaterConnection.connectionHolders.*.status + + - jsonPath: $.WaterConnection.connectionHolders.*.isPrimaryOwner + + - jsonPath: $.WaterConnection.connectionHolders.*.ownerType + + - jsonPath: $.WaterConnection.connectionHolders.*.ownerShipPercentage + + - jsonPath: $.WaterConnection.connectionHolders.*.relationship + + - jsonPath: $.WaterConnection.auditDetails.createdBy + + - jsonPath: $.WaterConnection.auditDetails.createdTime + + - jsonPath: $.WaterConnection.auditDetails.lastModifiedBy + + - jsonPath: $.WaterConnection.auditDetails.lastModifiedTime + + - jsonPath: $.WaterConnection.tenantId + + - jsonPath: $.WaterConnection.connectionHolders.*.uuid + + - jsonPath: $.WaterConnection.connectionHolders.*.status + + - jsonPath: $.WaterConnection.connectionHolders.*.isPrimaryOwner + + - jsonPath: $.WaterConnection.connectionHolders.*.ownerType + + - jsonPath: $.WaterConnection.connectionHolders.*.ownerShipPercentage + + - jsonPath: $.WaterConnection.connectionHolders.*.relationship + + - jsonPath: $.WaterConnection.auditDetails.lastModifiedBy + + - jsonPath: $.WaterConnection.auditDetails.lastModifiedTime + + - query: INSERT INTO eg_ws_roadcuttinginfo(id, tenantId, wsid, active, roadtype, roadcuttingarea, createdBy, lastModifiedBy, createdTime, lastModifiedTime) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ON CONFLICT (id) DO UPDATE SET active = ?, roadtype =?, roadcuttingarea =?,lastmodifiedby =?, lastmodifiedtime =?; + basePath: $.WaterConnection.roadCuttingInfo.* + jsonMaps: + + - jsonPath: $.WaterConnection.roadCuttingInfo.*.id + + - jsonPath: $.WaterConnection.tenantId + + - jsonPath: $.WaterConnection.id + + - jsonPath: $.WaterConnection.roadCuttingInfo.*.status + + - jsonPath: $.WaterConnection.roadCuttingInfo.*.roadType + + - jsonPath: $.WaterConnection.roadCuttingInfo.*.roadCuttingArea + + - jsonPath: $.WaterConnection.roadCuttingInfo.*.auditDetails.createdBy + + - jsonPath: $.WaterConnection.roadCuttingInfo.*.auditDetails.lastModifiedBy + + - jsonPath: $.WaterConnection.roadCuttingInfo.*.auditDetails.createdTime + + - jsonPath: $.WaterConnection.roadCuttingInfo.*.auditDetails.lastModifiedTime + + - jsonPath: $.WaterConnection.roadCuttingInfo.*.status + + - jsonPath: $.WaterConnection.roadCuttingInfo.*.roadType + + - jsonPath: $.WaterConnection.roadCuttingInfo.*.roadCuttingArea + + - jsonPath: $.WaterConnection.roadCuttingInfo.*.auditDetails.lastModifiedBy + + - jsonPath: $.WaterConnection.roadCuttingInfo.*.auditDetails.lastModifiedTime + + - version: 1.0 + name: WaterConnection + description: update ConnectionDetails in eg_ws_connection and eg_ws_service + fromTopic: update-ws-workflow + isTransaction: true + queryMaps: + + - query: INSERT INTO eg_ws_connection_audit SELECT * FROM eg_ws_connection WHERE id = ?; + basePath: $.WaterConnection + jsonMaps: + - jsonPath: $.WaterConnection.id + + - query: UPDATE eg_ws_connection SET applicationstatus=?, status=?, connectionno=?, action=?, lastModifiedBy=?, lastModifiedTime=? WHERE id=?; + basePath: $.WaterConnection + jsonMaps: + + - jsonPath: $.WaterConnection.applicationStatus + + - jsonPath: $.WaterConnection.status + + - jsonPath: $.WaterConnection.connectionNo + + - jsonPath: $.WaterConnection.processInstance.action + + - jsonPath: $.WaterConnection.auditDetails.lastModifiedBy + + - jsonPath: $.WaterConnection.auditDetails.lastModifiedTime + + - jsonPath: $.WaterConnection.id + + - version: 1.0 + name: WaterConnection + description: save filestore ids + fromTopic: save-ws-filestoreids + isTransaction: true + queryMaps: + + - query: INSERT INTO eg_ws_service_audit SELECT * FROM eg_ws_service WHERE connection_id = ?; + basePath: $.WaterConnection + jsonMaps: + - jsonPath: $.WaterConnection.id + + - query: UPDATE eg_ws_service SET estimationfileStoreId = ?, sanctionfileStoreId = ? WHERE connection_id=?; + basePath: $.WaterConnection + jsonMaps: + + - jsonPath: $.WaterConnection.additionalDetails.estimationFileStoreId + + - jsonPath: $.WaterConnection.additionalDetails.sanctionFileStoreId + + - jsonPath: $.WaterConnection.id \ No newline at end of file diff --git a/configs/egov-searcher/PTDemandBasedSearcher.yml b/configs/egov-searcher/PTDemandBasedSearcher.yml new file mode 100644 index 00000000..0930f192 --- /dev/null +++ b/configs/egov-searcher/PTDemandBasedSearcher.yml @@ -0,0 +1,45 @@ +SearchDefinitions: + moduleName: rainmaker-pt-demandbased + summary: Searcher configuration for demand based search + version: 1.0.0 + definitions: + + - name: searchAssessmentsToUpdate + query: + baseQuery: | + select row_to_json(data) from ( + WITH summary AS ( + SELECT ptdl.property, + ptdl.assessmentnumber, + ptdl.financialYear, + pt.tenantId, + address.locality, + ROW_NUMBER() OVER(PARTITION BY ptdl.property + ORDER BY ptdl.financialyear DESC,ptdl.createdtime DESC ) AS rk + FROM eg_pt_property_v2 pt INNER JOIN eg_pt_propertydetail_v2 ptdl ON pt.propertyid = ptdl.property INNER JOIN eg_pt_address_v2 address on address.property=pt.propertyid) + SELECT s.* + FROM summary s + WHERE s.rk = 1) data $where + groupBy: + orderBy: + searchParams: + condition: AND + params: + - name: data.locality + isMandatory: true + jsonPath: $.searchCriteria.locality + operator: = + - name: data.tenantid + isMandatory: true + jsonPath: $.searchCriteria.tenantId + operator: = + - name: data.financialYear + isMandatory: true + jsonPath: $.searchCriteria.financialYear + operator: NE + + + output: + jsonFormat: {"ResponseInfo": {}} + outJsonPath: $.DemandBasedAssessments + responseInfoPath: $.ResponseInfo diff --git a/configs/egov-searcher/bill-genie.yml b/configs/egov-searcher/bill-genie.yml new file mode 100644 index 00000000..bac78338 --- /dev/null +++ b/configs/egov-searcher/bill-genie.yml @@ -0,0 +1,338 @@ +SearchDefinitions: + moduleName: bill-genie + summary: Search configs for bill-genie + version: 1.0.0 + definitions: + - name: billswithaddranduser + isCustomerRowMapEnabled: true + rowMapperKey: billsearch + query: + baseQuery: with bill_data as ( + + SELECT b.id AS b_id, b.mobilenumber, + b.tenantid AS b_tenantid, b.payername AS b_payername, + b.payeraddress AS b_payeraddress, b.payeremail AS b_payeremail, + b.isactive AS b_isactive, b.iscancelled AS b_iscancelled, + b.createdby AS b_createdby, b.status as b_status,b.filestoreid AS b_filestoreid, + b.createddate AS b_createddate, b.lastmodifiedby AS b_lastmodifiedby, + b.lastmodifieddate AS b_lastmodifieddate, bd.id AS bd_id, + bd.billid AS bd_billid, bd.tenantid AS bd_tenantid, + bd.businessservice AS bd_businessservice, bd.demandid, + bd.fromperiod, bd.toperiod, + bd.billno AS bd_billno, bd.billdate AS bd_billdate, + bd.consumercode AS bd_consumercode, bd.consumertype AS bd_consumertype, + bd.billdescription AS bd_billdescription, bd.displaymessage AS bd_displaymessage, + bd.minimumamount AS bd_minimumamount, bd.totalamount AS bd_totalamount, + bd.callbackforapportioning AS bd_callbackforapportioning, bd.expirydate AS bd_expirydate, + bd.partpaymentallowed AS bd_partpaymentallowed, bd.isadvanceallowed as bd_isadvanceallowed, + bd.collectionmodesnotallowed AS bd_collectionmodesnotallowed, bd.createddate as bd_createddate, + b.additionaldetails as b_additionaldetails, bd.additionaldetails as bd_additionaldetails, + ad.id AS ad_id, ad.tenantid AS ad_tenantid, + ad.billdetail AS ad_billdetail, ad.glcode AS ad_glcode, + ad.orderno AS ad_orderno, ad.accountdescription AS ad_accountdescription, + ad.amount AS ad_amount, ad.adjustedamount AS ad_adjustedamount, + ad.taxheadcode AS ad_taxheadcode, ad.demanddetailid, + ad.isactualdemand AS ad_isactualdemand, ad.purpose AS ad_purpose, + ad.additionaldetails as ad_additionaldetails, + ptadd.doorNo as ptadd_doorNo,ptadd.landmark as ptadd_landmark, + ptadd.city as ptadd_city, ptadd.pincode as ptadd_pincode, + ptadd.locality as ptadd_locality, ptown.userid as ptown_userid + + FROM egbs_bill_v1 b INNER JOIN egbs_billdetail_v1 bd ON b.id = bd.billid AND b.tenantid = bd.tenantid + INNER JOIN egbs_billaccountdetail_v1 ad ON bd.id = ad.billdetail AND bd.tenantid = ad.tenantid + LEFT OUTER JOIN eg_pt_property pt ON bd.consumercode = pt.propertyid + INNER JOIN eg_pt_address ptadd ON ptadd.propertyid = pt.id + INNER JOIN eg_pt_asmt_assessment ptdet ON ptdet.propertyid = pt.propertyid + INNER JOIN eg_pt_owner ptown ON pt.id = ptown.propertyid $where ) + + select * from bill_data inner join (select max(b_createddate) as maxcreateddate, bd_consumercode from bill_data group by bd_consumercode) as max ON max.maxcreateddate=b_createddate + searchParams: + condition: AND + params: + - name: b.tenantid + isMandatory: true + jsonPath: $.searchCriteria.tenantId + - name: bd.consumercode + isMandatory: false + jsonPath: $.searchCriteria.consumerCode + operator: ILIKE + - name: bd.businessservice + isMandatory: false + jsonPath: $.searchCriteria.businesService + - name: b.mobilenumber + isMandatory: false + jsonPath: $.searchCriteria.mobileNumber + - name: bd.billno + isMandatory: false + operator: ILIKE + jsonPath: $.searchCriteria.billNo + - name: ptadd.locality + isMandatory: false + jsonPath: $.searchCriteria.locality + - name: ptdet.financialyear + isMandatory: false + jsonPath: $.searchCriteria.financialYear + - name: fromperiod + isMandatory: false + jsonPath: $.searchCriteria.fromPeriod + operator: LE + - name: toperiod + isMandatory: false + jsonPath: $.searchCriteria.toPeriod + operator: GE + - name: b.status + isMandatory: false + jsonPath: $.searchCriteria.billActive + + output: + jsonFormat: {"ResponseInfo": {},"Bills": []} + outJsonPath: $.Bills + responseInfoPath: $.ResponseInfo + + + - name: waterbills + isCustomerRowMapEnabled: true + rowMapperKey: billsearch + query: + baseQuery: with bill_data as ( + SELECT conn.status as conn_status,conn.property_id as pid,conn.oldConnectionNo as oldpid,conn.additionaldetails as conn_add,b.id AS b_id, b.mobilenumber, + b.tenantid AS b_tenantid, b.payername AS b_payername, + b.payeraddress AS b_payeraddress, b.payeremail AS b_payeremail, + b.isactive AS b_isactive, b.iscancelled AS b_iscancelled, + b.createdby AS b_createdby, b.status as b_status, b.filestoreid AS b_filestoreid, + b.createddate AS b_createddate, b.lastmodifiedby AS b_lastmodifiedby, + b.lastmodifieddate AS b_lastmodifieddate, bd.id AS bd_id, + bd.billid AS bd_billid, bd.tenantid AS bd_tenantid, + bd.businessservice AS bd_businessservice, bd.demandid, + bd.fromperiod, bd.toperiod, + bd.billno AS bd_billno, bd.billdate AS bd_billdate, + bd.consumercode AS bd_consumercode, bd.consumertype AS bd_consumertype, + bd.billdescription AS bd_billdescription, bd.displaymessage AS bd_displaymessage, + bd.minimumamount AS bd_minimumamount, bd.totalamount AS bd_totalamount, + bd.callbackforapportioning AS bd_callbackforapportioning, bd.expirydate AS bd_expirydate, + bd.partpaymentallowed AS bd_partpaymentallowed, bd.isadvanceallowed as bd_isadvanceallowed, + bd.collectionmodesnotallowed AS bd_collectionmodesnotallowed, bd.createddate as bd_createddate, + b.additionaldetails as b_additionaldetails, bd.additionaldetails as bd_additionaldetails, + ad.id AS ad_id, ad.tenantid AS ad_tenantid, + ad.billdetail AS ad_billdetail, ad.glcode AS ad_glcode, + ad.orderno AS ad_orderno, ad.accountdescription AS ad_accountdescription, + ad.amount AS ad_amount, ad.adjustedamount AS ad_adjustedamount, + ad.taxheadcode AS ad_taxheadcode, ad.demanddetailid, + ad.isactualdemand AS ad_isactualdemand, ad.purpose AS ad_purpose, + ad.additionaldetails as ad_additionaldetails, + ptadd.doorNo as ptadd_doorNo, ptadd.landmark as ptadd_landmark, + ptadd.city as ptadd_city, ptadd.pincode as ptadd_pincode, + ptadd.locality as ptadd_locality, ptown.userid as ptown_userid + + FROM egbs_bill_v1 b INNER JOIN egbs_billdetail_v1 bd ON b.id = bd.billid AND b.tenantid = bd.tenantid + INNER JOIN egbs_billaccountdetail_v1 ad ON bd.id = ad.billdetail AND bd.tenantid = ad.tenantid + INNER JOIN eg_ws_connection conn ON bd.consumercode = conn.connectionno + INNER JOIN eg_pt_property pt ON conn.property_id = pt.propertyid + INNER JOIN eg_pt_address ptadd ON ptadd.propertyid = pt.id + INNER JOIN eg_pt_owner ptown ON ptown.propertyid = pt.id $where ) + + select * from bill_data inner join (select max(b_createddate) as maxcreateddate, bd_consumercode from bill_data group by bd_consumercode) as max ON max.maxcreateddate=b_createddate + searchParams: + condition: AND + params: + - name: b.tenantid + isMandatory: true + jsonPath: $.searchCriteria.tenantId + - name: bd.consumercode + isMandatory: false + jsonPath: $.searchCriteria.consumerCode + operator: ILIKE + - name: bd.businessservice + isMandatory: false + jsonPath: $.searchCriteria.businesService + - name: b.mobilenumber + isMandatory: false + jsonPath: $.searchCriteria.mobileNumber + - name: bd.billno + isMandatory: false + operator: ILIKE + jsonPath: $.searchCriteria.billNo + - name: ptadd.locality + isMandatory: false + jsonPath: $.searchCriteria.locality + - name: fromperiod + isMandatory: false + jsonPath: $.searchCriteria.fromPeriod + operator: LE + - name: toperiod + isMandatory: false + jsonPath: $.searchCriteria.toPeriod + operator: GE + - name: b.status + isMandatory: false + jsonPath: $.searchCriteria.billActive + + output: + jsonFormat: {"ResponseInfo": {},"Bills": []} + outJsonPath: $.Bills + responseInfoPath: $.ResponseInfo + + + + + - name: seweragebills + isCustomerRowMapEnabled: true + rowMapperKey: billsearch + query: + baseQuery: with bill_data as ( + SELECT conn.status as conn_status,conn.property_id as pid,conn.oldConnectionNo as oldpid,conn.additionaldetails as conn_add,b.id AS b_id, b.mobilenumber, + b.tenantid AS b_tenantid, b.payername AS b_payername, + b.payeraddress AS b_payeraddress, b.payeremail AS b_payeremail, + b.isactive AS b_isactive, b.iscancelled AS b_iscancelled, + b.createdby AS b_createdby, b.status as b_status, b.filestoreid AS b_filestoreid, + b.createddate AS b_createddate, b.lastmodifiedby AS b_lastmodifiedby, + b.lastmodifieddate AS b_lastmodifieddate, bd.id AS bd_id, + bd.billid AS bd_billid, bd.tenantid AS bd_tenantid, + bd.businessservice AS bd_businessservice, bd.demandid, + bd.fromperiod, bd.toperiod, + bd.billno AS bd_billno, bd.billdate AS bd_billdate, + bd.consumercode AS bd_consumercode, bd.consumertype AS bd_consumertype, + bd.billdescription AS bd_billdescription, bd.displaymessage AS bd_displaymessage, + bd.minimumamount AS bd_minimumamount, bd.totalamount AS bd_totalamount, + bd.callbackforapportioning AS bd_callbackforapportioning, bd.expirydate AS bd_expirydate, + bd.partpaymentallowed AS bd_partpaymentallowed, bd.isadvanceallowed as bd_isadvanceallowed, + bd.collectionmodesnotallowed AS bd_collectionmodesnotallowed, bd.createddate as bd_createddate, + b.additionaldetails as b_additionaldetails, bd.additionaldetails as bd_additionaldetails, + ad.id AS ad_id, ad.tenantid AS ad_tenantid, + ad.billdetail AS ad_billdetail, ad.glcode AS ad_glcode, + ad.orderno AS ad_orderno, ad.accountdescription AS ad_accountdescription, + ad.amount AS ad_amount, ad.adjustedamount AS ad_adjustedamount, + ad.taxheadcode AS ad_taxheadcode, ad.demanddetailid, + ad.isactualdemand AS ad_isactualdemand, ad.purpose AS ad_purpose, + ad.additionaldetails as ad_additionaldetails, + ptadd.doorNo as ptadd_doorNo, ptadd.landmark as ptadd_landmark, + ptadd.city as ptadd_city, ptadd.pincode as ptadd_pincode, + ptadd.locality as ptadd_locality, ptown.userid as ptown_userid + + FROM egbs_bill_v1 b INNER JOIN egbs_billdetail_v1 bd ON b.id = bd.billid AND b.tenantid = bd.tenantid + INNER JOIN egbs_billaccountdetail_v1 ad ON bd.id = ad.billdetail AND bd.tenantid = ad.tenantid + INNER JOIN eg_sw_connection conn ON bd.consumercode = conn.connectionno + INNER JOIN eg_pt_property pt ON conn.property_id = pt.propertyid + INNER JOIN eg_pt_address ptadd ON ptadd.propertyid = pt.id + INNER JOIN eg_pt_owner ptown ON ptown.propertyid = pt.id $where ) + + select * from bill_data inner join (select max(b_createddate) as maxcreateddate, bd_consumercode from bill_data group by bd_consumercode) as max ON max.maxcreateddate=b_createddate + searchParams: + condition: AND + params: + - name: b.tenantid + isMandatory: true + jsonPath: $.searchCriteria.tenantId + - name: bd.consumercode + isMandatory: false + jsonPath: $.searchCriteria.consumerCode + operator: ILIKE + - name: bd.businessservice + isMandatory: false + jsonPath: $.searchCriteria.businesService + - name: b.mobilenumber + isMandatory: false + jsonPath: $.searchCriteria.mobileNumber + - name: bd.billno + isMandatory: false + operator: ILIKE + jsonPath: $.searchCriteria.billNo + - name: ptadd.locality + isMandatory: false + jsonPath: $.searchCriteria.locality + - name: fromperiod + isMandatory: false + jsonPath: $.searchCriteria.fromPeriod + operator: LE + - name: toperiod + isMandatory: false + jsonPath: $.searchCriteria.toPeriod + operator: GE + - name: b.status + isMandatory: false + jsonPath: $.searchCriteria.billActive + + output: + jsonFormat: {"ResponseInfo": {},"Bills": []} + outJsonPath: $.Bills + responseInfoPath: $.ResponseInfo + + - name: mcollectbills + isCustomerRowMapEnabled: true + rowMapperKey: billsearch + query: + baseQuery: with bill_data as ( + SELECT b.id AS b_id, b.mobilenumber, + b.tenantid AS b_tenantid, b.payername AS b_payername, + b.payeraddress AS b_payeraddress, b.payeremail AS b_payeremail, + b.isactive AS b_isactive, b.iscancelled AS b_iscancelled, + b.createdby AS b_createdby, b.status as b_status, b.filestoreid AS b_filestoreid, + b.createddate AS b_createddate, b.lastmodifiedby AS b_lastmodifiedby, + b.lastmodifieddate AS b_lastmodifieddate, bd.id AS bd_id, + bd.billid AS bd_billid, bd.tenantid AS bd_tenantid, + bd.businessservice AS bd_businessservice, bd.demandid, + bd.fromperiod, bd.toperiod, + bd.billno AS bd_billno, bd.billdate AS bd_billdate, + bd.consumercode AS bd_consumercode, bd.consumertype AS bd_consumertype, + bd.billdescription AS bd_billdescription, bd.displaymessage AS bd_displaymessage, + bd.minimumamount AS bd_minimumamount, bd.totalamount AS bd_totalamount, + bd.callbackforapportioning AS bd_callbackforapportioning, bd.expirydate AS bd_expirydate, + bd.partpaymentallowed AS bd_partpaymentallowed, bd.isadvanceallowed as bd_isadvanceallowed, + bd.collectionmodesnotallowed AS bd_collectionmodesnotallowed, bd.createddate as bd_createddate, + b.additionaldetails as b_additionaldetails, bd.additionaldetails as bd_additionaldetails, + ad.id AS ad_id, ad.tenantid AS ad_tenantid, + ad.billdetail AS ad_billdetail, ad.glcode AS ad_glcode, + ad.orderno AS ad_orderno, ad.accountdescription AS ad_accountdescription, + ad.amount AS ad_amount, ad.adjustedamount AS ad_adjustedamount, + ad.taxheadcode AS ad_taxheadcode, ad.demanddetailid, + ad.isactualdemand AS ad_isactualdemand, ad.purpose AS ad_purpose, + ad.additionaldetails as ad_additionaldetails, + challanadd.doorNo as ptadd_doorNo, challanadd.landmark as ptadd_landmark, + challanadd.city as ptadd_city, challanadd.pincode as ptadd_pincode, + challanadd.locality as ptadd_locality, challan.accountid as ptown_userid , challan.createdtime + + FROM egbs_bill_v1 b INNER JOIN egbs_billdetail_v1 bd ON b.id = bd.billid AND b.tenantid = bd.tenantid and bd.totalamount > 0 + INNER JOIN egbs_billaccountdetail_v1 ad ON bd.id = ad.billdetail AND bd.tenantid = ad.tenantid + INNER JOIN eg_echallan challan ON bd.consumercode = challan.challanno AND b.status!='CANCELLED' + INNER JOIN eg_challan_address challanadd ON challanadd.eChallanId = challan.id $where ) + + select * from bill_data inner join (select max(b_createddate) as maxcreateddate, bd_consumercode from bill_data group by bd_consumercode) as max ON max.maxcreateddate=b_createddate + searchParams: + condition: AND + params: + - name: b.tenantid + isMandatory: true + jsonPath: $.searchCriteria.tenantId + - name: bd.consumercode + isMandatory: false + jsonPath: $.searchCriteria.consumerCode + operator: ILIKE + - name: bd.businessservice + isMandatory: false + jsonPath: $.searchCriteria.businesService + - name: b.mobilenumber + isMandatory: false + jsonPath: $.searchCriteria.mobileNumber + - name: bd.billno + isMandatory: false + operator: ILIKE + jsonPath: $.searchCriteria.billNo + - name: ptadd.locality + isMandatory: false + jsonPath: $.searchCriteria.locality + - name: fromperiod + isMandatory: false + jsonPath: $.searchCriteria.fromPeriod + operator: LE + - name: toperiod + isMandatory: false + jsonPath: $.searchCriteria.toPeriod + operator: GE + - name: b.status + isMandatory: false + jsonPath: $.searchCriteria.billActive + + output: + jsonFormat: {"ResponseInfo": {},"Bills": []} + outJsonPath: $.Bills + responseInfoPath: $.ResponseInfo diff --git a/configs/egov-searcher/localitySearcher.yml b/configs/egov-searcher/localitySearcher.yml new file mode 100644 index 00000000..e14bc752 --- /dev/null +++ b/configs/egov-searcher/localitySearcher.yml @@ -0,0 +1,194 @@ +SearchDefinitions: + moduleName: locality + summary: Searcher configuration for searching locality in workflow inbox + version: 1.0.0 + definitions: + + - name: tl-services + query: + baseQuery: | + Select row_to_json(result) from + ( + select applicationNumber as referenceNumber,locality from eg_tl_tradelicense tl + INNER JOIN eg_tl_TradeLicenseDetail tld ON tld.tradelicenseId = tl.id + INNER JOIN eg_tl_address ad ON ad.tradeLicenseDetailId = tld.id + ) result $where + groupBy: + orderBy: + searchParams: + condition: AND + params: + - name: result.referenceNumber + isMandatory: true + jsonPath: $.searchCriteria.referenceNumber + operator: + + output: + jsonFormat: {"ResponseInfo": {}} + outJsonPath: $.Localities + responseInfoPath: $.ResponseInfo + + - name: fireNoc + query: + baseQuery: | + Select row_to_json(result) from + ( + select fnd.applicationnumber as referenceNumber,locality from eg_fn_firenoc fn + INNER JOIN eg_fn_firenocDetail fnd ON fnd.firenocuuid = fn.uuid + INNER JOIN eg_fn_address ad ON ad.firenocdetailsuuid = fnd.uuid + ) result $where + groupBy: + orderBy: + searchParams: + condition: AND + params: + - name: result.referenceNumber + isMandatory: true + jsonPath: $.searchCriteria.referenceNumber + operator: + + output: + jsonFormat: {"ResponseInfo": {}} + outJsonPath: $.Localities + responseInfoPath: $.ResponseInfo + + + - name: BPAREG + query: + baseQuery: | + Select row_to_json(result) from + ( + select applicationNumber as referenceNumber,locality from eg_tl_tradelicense tl + INNER JOIN eg_tl_TradeLicenseDetail tld ON tld.tradelicenseId = tl.id + INNER JOIN eg_tl_address ad ON ad.tradeLicenseDetailId = tld.id + ) result $where + groupBy: + orderBy: + searchParams: + condition: AND + params: + - name: result.referenceNumber + isMandatory: true + jsonPath: $.searchCriteria.referenceNumber + operator: + + output: + jsonFormat: {"ResponseInfo": {}} + outJsonPath: $.Localities + responseInfoPath: $.ResponseInfo + + - name: bpa-services + query: + baseQuery: | + Select row_to_json(result) from + ( + select applicationNo as referenceNumber,locality from eg_bpa_buildingplan bpa + INNER JOIN eg_land_Address ad ON ad.landInfoId = bpa.landid + ) result $where + groupBy: + orderBy: + searchParams: + condition: AND + params: + - name: result.referenceNumber + isMandatory: true + jsonPath: $.searchCriteria.referenceNumber + operator: + + output: + jsonFormat: {"ResponseInfo": {}} + outJsonPath: $.Localities + responseInfoPath: $.ResponseInfo + + - name: pt-services + query: + baseQuery: | + Select row_to_json(result) from + ( + select property.propertyid as referenceNumber,locality from eg_pt_property property + INNER JOIN eg_pt_address ptadd ON ptadd.propertyid = property.id + ) result $where + groupBy: + orderBy: + searchParams: + condition: AND + params: + - name: result.referenceNumber + isMandatory: true + jsonPath: $.searchCriteria.referenceNumber + operator: + + output: + jsonFormat: {"ResponseInfo": {}} + outJsonPath: $.Localities + responseInfoPath: $.ResponseInfo + + - name: PT + query: + baseQuery: | + Select row_to_json(result) from + ( + select property.acknowldgementnumber as referenceNumber,locality from eg_pt_property property + INNER JOIN eg_pt_address ptadd ON ptadd.propertyid = property.id + ) result $where + groupBy: + orderBy: + searchParams: + condition: AND + params: + - name: result.referenceNumber + isMandatory: true + jsonPath: $.searchCriteria.referenceNumber + operator: + + output: + jsonFormat: {"ResponseInfo": {}} + outJsonPath: $.Localities + responseInfoPath: $.ResponseInfo + + - name: ws-services + query: + baseQuery: | + Select row_to_json(result) from + ( + select applicationno as referenceNumber,conn.locality from eg_ws_connection conn + INNER JOIN eg_pt_property property ON property.propertyid = conn.property_id + INNER JOIN eg_pt_address ptadd ON ptadd.propertyid = property.id + ) result $where + groupBy: + orderBy: + searchParams: + condition: AND + params: + - name: result.referenceNumber + isMandatory: true + jsonPath: $.searchCriteria.referenceNumber + operator: + + output: + jsonFormat: {"ResponseInfo": {}} + outJsonPath: $.Localities + responseInfoPath: $.ResponseInfo + - name: sw-services + query: + baseQuery: | + Select row_to_json(result) from + ( + select applicationno as referenceNumber,conn.locality from eg_sw_connection conn + INNER JOIN eg_pt_property property ON property.propertyid = conn.property_id + INNER JOIN eg_pt_address ptadd ON ptadd.propertyid = property.id + ) result $where + groupBy: + orderBy: + searchParams: + condition: AND + params: + - name: result.referenceNumber + isMandatory: true + jsonPath: $.searchCriteria.referenceNumber + operator: + + output: + jsonFormat: {"ResponseInfo": {}} + outJsonPath: $.Localities + responseInfoPath: $.ResponseInfo diff --git a/configs/egov-searcher/propertyopensearch.yml b/configs/egov-searcher/propertyopensearch.yml new file mode 100644 index 00000000..84fed5ac --- /dev/null +++ b/configs/egov-searcher/propertyopensearch.yml @@ -0,0 +1,42 @@ +SearchDefinitions: + moduleName: property-services + summary: Property Services Open API + version: 1.0.0 + definitions: + - name: propertyopensearch + query: + baseQuery: Select row_to_json(result) from + ( + select property.tenantid, property.propertyid, surveyid, oldpropertyid, property.createdtime, locality, owner.userid as owneruuid from eg_pt_property as property + INNER JOIN eg_pt_address ptadd ON ptadd.propertyid = property.id + INNER JOIN eg_pt_owner owner ON owner.propertyid=property.id $where + ) result + groupBy: + orderBy: createdtime,desc + searchParams: + condition: AND + params: + - name: property.tenantid + isMandatory: true + jsonPath: $.searchCriteria.tenantId + - name: property.propertyId + isMandatory: false + jsonPath: $.searchCriteria.propertyId + - name: property.surveyId + isMandatory: false + jsonPath: $.searchCriteria.surveyId + - name: property.oldPropertyId + isMandatory: false + jsonPath: $.searchCriteria.oldPropertyId + - name: ptadd.doorNo + isMandatory: false + jsonPath: $.searchCriteria.doorNo + - name: ptadd.locality + isMandatory: true + jsonPath: $.searchCriteria.locality + + + output: + jsonFormat: {"ResponseInfo": {},"Properties": []} + outJsonPath: $.Properties + responseInfoPath: $.ResponseInfo diff --git a/configs/egov-searcher/rainmaker-pgr-v2-searcher.yml b/configs/egov-searcher/rainmaker-pgr-v2-searcher.yml new file mode 100644 index 00000000..76308662 --- /dev/null +++ b/configs/egov-searcher/rainmaker-pgr-v2-searcher.yml @@ -0,0 +1,311 @@ +SearchDefinitions: + moduleName: rainmaker-pgr-V2 + summary: PGR resolver for Rainmaker + version: 1.0.0 + definitions: + - name: serviceSearchWithDetails + query: + baseQuery: select array_to_json(array_agg(row_to_json(serviceRequests))) from (select (select (select (row_to_json(services)) from ( select *, (select (select row_to_json(auditDetails) from (select createdtime, lastmodifiedtime, createdby, lastmodifiedby from eg_pgr_service where svc.serviceRequestId=eg_pgr_service.serviceRequestId) auditDetails) as auditDetails), (select (select (row_to_json(addressDetail)) from (select * from eg_pgr_address where eg_pgr_address.uuid=eg_pgr_service.addressid) addressDetail) as addressDetail) from eg_pgr_service svc where svc.serviceRequestId=eg_pgr_service.serviceRequestId order by createdtime desc) services) as services),(select (select array_to_json(array_agg(row_to_json(actionHistory))) from ( select * from eg_pgr_action where businessKey=eg_pgr_service.serviceRequestId order by "when" desc) actionHistory) as actionHistory) from eg_pgr_service $where order by createdtime desc $pagination) serviceRequests + groupBy: + orderBy: + searchParams: + condition: AND + params: + - name: tenantid + isMandatory: true + jsonPath: $.searchCriteria.tenantId + operator: LIKE + - name: servicerequestid + isMandatory: false + jsonPath: $.searchCriteria.serviceRequestId + operator: LIKE + - name: servicerequestid + isMandatory: false + jsonPath: $.searchCriteria.complaintId + operator: LIKE + - name: accountid + isMandatory: false + jsonPath: $.searchCriteria.accountId + - name: status + isMandatory: false + jsonPath: $.searchCriteria.status + - name: createdtime + isMandatory: false + operator: GE + jsonPath: $.searchCriteria.startDate + - name: createdtime + isMandatory: false + operator: LE + jsonPath: $.searchCriteria.endDate + - name: lastmodifiedtime + isMandatory: false + jsonPath: $.searchCriteria.lastUpdatedSince + - name: serviceCode + isMandatory: false + jsonPath: $.searchCriteria.serviceCodes + - name: phone + isMandatory: false + jsonPath: $.searchCriteria.phone + - name: createdby + isMandatory: false + jsonPath: $.searchCriteria.createdBy + - name: active + isMandatory: false + jsonPath: $.searchCriteria.active + pagination: + noOfRecords: $.searchCriteria.noOfRecords + offset: $.searchCriteria.offset + + output: + jsonFormat: {"ResponseInfo": {}} + outJsonPath: $.services + responseInfoPath: $.ResponseInfo + + - name: serviceSearchWithDetailsCitizen + query: + baseQuery: select array_to_json(array_agg(row_to_json(serviceRequests))) from (select (select (select (row_to_json(services)) from ( select *, (select (select row_to_json(auditDetails) from (select createdtime, lastmodifiedtime, createdby, lastmodifiedby from eg_pgr_service where svc.serviceRequestId=eg_pgr_service.serviceRequestId) auditDetails) as auditDetails), (select (select (row_to_json(addressDetail)) from (select * from eg_pgr_address where eg_pgr_address.uuid=eg_pgr_service.addressid) addressDetail) as addressDetail) from eg_pgr_service svc where svc.serviceRequestId=eg_pgr_service.serviceRequestId order by createdtime desc) services) as services),(select (select array_to_json(array_agg(row_to_json(actionHistory))) from ( select * from eg_pgr_action where businessKey=eg_pgr_service.serviceRequestId order by "when" desc) actionHistory) as actionHistory) from eg_pgr_service $where order by createdtime desc $pagination) serviceRequests + groupBy: + orderBy: + searchParams: + condition: AND + params: + - name: accountid + isMandatory: true + jsonPath: $.searchCriteria.accountId + operator: = + - name: tenantid + isMandatory: false + jsonPath: $.searchCriteria.tenantId + operator: LIKE + - name: servicerequestid + isMandatory: false + jsonPath: $.searchCriteria.serviceRequestId + - name: status + isMandatory: false + jsonPath: $.searchCriteria.status + - name: createdtime + isMandatory: false + operator: GE + jsonPath: $.searchCriteria.startDate + - name: createdtime + isMandatory: false + operator: LE + jsonPath: $.searchCriteria.endDate + - name: lastmodifiedtime + isMandatory: false + jsonPath: $.searchCriteria.lastUpdatedSince + - name: serviceCode + isMandatory: false + jsonPath: $.searchCriteria.serviceCodes + - name: phone + isMandatory: false + jsonPath: $.searchCriteria.phone + - name: createdby + isMandatory: false + jsonPath: $.searchCriteria.createdBy + - name: active + isMandatory: false + jsonPath: $.searchCriteria.active + pagination: + noOfRecords: $.searchCriteria.noOfRecords + offset: $.searchCriteria.offset + + output: + jsonFormat: {"ResponseInfo": {}} + outJsonPath: $.services + responseInfoPath: $.ResponseInfo + + - name: getServiceRequestsOnAssignedTo + #select array_to_json(array_agg(row_to_json(servicesRequestIds))) from (select businessKey from eg_pgr_action $where AND eg_pgr_action.when IN (select max("when") from eg_pgr_action where assignee NOTNULL group by businessKey)) servicesRequestIds baseQuery: | + query: + baseQuery: | + select + array_to_json(array_agg(row_to_json(servicesRequestIds))) + from + ( + select + businessKey + from + eg_pgr_action $where + + AND eg_pgr_action.when IN ( + select + max("when") + from + eg_pgr_action + $where + and assignee NOTNULL + group by + businessKey + ) + ) servicesRequestIds + groupBy: + orderBy: + searchParams: + condition: AND + params: + - name: tenantid + isMandatory: true + jsonPath: $.searchCriteria.tenantId + - name: assignee + isMandatory: true + jsonPath: $.searchCriteria.assignedTo + + output: + jsonFormat: {"ResponseInfo": {}} + outJsonPath: $.servicesRequestIds + responseInfoPath: $.ResponseInfo + + + - name: count + query: + baseQuery: select (row_to_json(services)) from ( select count(*) from eg_pgr_service $where) as services + groupBy: + orderBy: + searchParams: + condition: AND + params: + - name: tenantid + isMandatory: true + jsonPath: $.searchCriteria.tenantId + operator: LIKE + - name: servicerequestid + isMandatory: false + jsonPath: $.searchCriteria.serviceRequestId + operator: LIKE + - name: accountid + isMandatory: false + jsonPath: $.searchCriteria.accountId + - name: status + isMandatory: false + jsonPath: $.searchCriteria.status + - name: createdtime + isMandatory: false + operator: GE + jsonPath: $.searchCriteria.startDate + - name: createdtime + isMandatory: false + operator: LE + jsonPath: $.searchCriteria.endDate + - name: lastmodifiedtime + isMandatory: false + jsonPath: $.searchCriteria.lastUpdatedSince + - name: serviceCode + isMandatory: false + jsonPath: $.searchCriteria.serviceCodes + - name: phone + isMandatory: false + jsonPath: $.searchCriteria.phone + - name: active + isMandatory: false + jsonPath: $.searchCriteria.active + + output: + jsonFormat: {"ResponseInfo": {}} + outJsonPath: $.count + responseInfoPath: $.ResponseInfo + + - name: countOpen + query: + baseQuery: select array_to_json(array_agg(row_to_json(data))) from (with complaints as(select distinct on (businesskey) businesskey, status, eg_pgr_action.when as lastmodifiedtime, tenantid from eg_pgr_action order by businesskey,eg_pgr_action.when desc)select tenantid,count(*) from complaints where status='open' and (extract(epoch from NOW()) - complaints.lastmodifiedtime/1000)/3600 >24 group by tenantid) data + groupBy: + orderBy: + searchParams: + condition: AND + params: + - name: tenantid + isMandatory: false + jsonPath: $.searchCriteria.tenantId + operator: LIKE + - name: servicerequestid + isMandatory: false + jsonPath: $.searchCriteria.serviceRequestId + operator: LIKE + - name: accountid + isMandatory: false + jsonPath: $.searchCriteria.accountId + - name: status + isMandatory: false + jsonPath: $.searchCriteria.status + - name: createdtime + isMandatory: false + operator: GE + jsonPath: $.searchCriteria.startDate + - name: createdtime + isMandatory: false + operator: LE + jsonPath: $.searchCriteria.endDate + - name: lastmodifiedtime + isMandatory: false + jsonPath: $.searchCriteria.lastUpdatedSince + - name: serviceCode + isMandatory: false + jsonPath: $.searchCriteria.serviceCodes + - name: phone + isMandatory: false + jsonPath: $.searchCriteria.phone + - name: active + isMandatory: false + jsonPath: $.searchCriteria.active + + output: + jsonFormat: {"ResponseInfo": {}} + outJsonPath: $.data + responseInfoPath: $.ResponseInfo + + - name: plainSearch + query: + baseQuery: SELECT Array_to_json(Array_agg(Row_to_json(servicerequests))) FROM (SELECT (SELECT (SELECT ( Row_to_json(services) )FROM (SELECT *, (SELECT (SELECT Row_to_json(auditdetails) FROM (SELECT createdtime FROM eg_pgr_service WHERE svc.servicerequestid = eg_pgr_service.servicerequestid) auditDetails) AS auditDetails), (SELECT (SELECT ( Row_to_json( addressdetail) ) FROM (SELECT * FROM eg_pgr_address WHERE eg_pgr_address.uuid = eg_pgr_service.addressid) addressDetail) AS addressDetail) FROM eg_pgr_service svc WHERE svc.servicerequestid = eg_pgr_service.servicerequestid ORDER BY createdtime DESC) services) AS services), (SELECT (SELECT Array_to_json(Array_agg(Row_to_json(actionhistory))) FROM (SELECT * FROM eg_pgr_action WHERE businesskey = eg_pgr_service.servicerequestid ORDER BY "when" DESC) actionHistory) AS actionHistory) FROM eg_pgr_service $where AND servicerequestid in (Select servicerequestid from eg_pgr_service ORDER BY createdtime ASC $pagination) ORDER BY createdtime ASC) serviceRequests; + groupBy: + orderBy: + searchParams: + condition: AND + params: + - name: tenantid + isMandatory: true + jsonPath: $.searchCriteria.tenantId + operator: LIKE + - name: servicerequestid + isMandatory: false + jsonPath: $.searchCriteria.serviceRequestId + - name: servicerequestid + isMandatory: false + jsonPath: $.searchCriteria.complaintId + operator: LIKE + - name: accountid + isMandatory: false + jsonPath: $.searchCriteria.accountId + - name: status + isMandatory: false + jsonPath: $.searchCriteria.status + - name: createdtime + isMandatory: false + operator: GE + jsonPath: $.searchCriteria.startDate + - name: createdtime + isMandatory: false + operator: LE + jsonPath: $.searchCriteria.endDate + - name: lastmodifiedtime + isMandatory: false + jsonPath: $.searchCriteria.lastUpdatedSince + - name: serviceCode + isMandatory: false + jsonPath: $.searchCriteria.serviceCodes + - name: phone + isMandatory: false + jsonPath: $.searchCriteria.phone + - name: createdby + isMandatory: false + jsonPath: $.searchCriteria.createdBy + - name: active + isMandatory: false + jsonPath: $.searchCriteria.active + pagination: + noOfRecords: $.searchCriteria.noOfRecords + offset: $.searchCriteria.offset + + output: + jsonFormat: {"ResponseInfo": {}} + outJsonPath: $.services + responseInfoPath: $.ResponseInfo diff --git a/configs/egov-searcher/rainmaker-pt-customsearch-punjab.yml b/configs/egov-searcher/rainmaker-pt-customsearch-punjab.yml new file mode 100644 index 00000000..56456ec8 --- /dev/null +++ b/configs/egov-searcher/rainmaker-pt-customsearch-punjab.yml @@ -0,0 +1,133 @@ +SearchDefinitions: + moduleName: rainmaker-pt-customsearch-punjab + summary: Vasika number search for punjab + version: 1.0.0 + definitions: + - name: searchPropertyIDByVasikaNo + query: + baseQuery: | + select + array_to_json(array_agg(row_to_json(vasika_results))) + from (select propertyid from eg_pt_property + $where and + additionaldetails is not null and additionaldetails !='null' + ) vasika_results + groupBy: + orderBy: + searchParams: + condition: AND + params: + - name: tenantid + isMandatory: false + jsonPath: $.searchCriteria.tenantId + - name: additionaldetails->>'vasikaNo' + isMandatory: true + jsonPath: $.searchCriteria.vasikaNo + - name: propertyid + isMandatory: false + jsonPath: $.searchCriteria.propertyId + + output: + jsonFormat: {"ResponseInfo": {}} + outJsonPath: $.services + responseInfoPath: $.ResponseInfo + - name: searchLocalitiesUsedInRevenue + query: + baseQuery: | + select + array_to_json(array_agg(localities)) + from ( + select distinct locality from eg_tl_address $where + union + select distinct locality from eg_pt_address $where + ) as localities + groupBy: + orderBy: + searchParams: + condition: AND + params: + - name: tenantid + isMandatory: true + jsonPath: $.searchCriteria.tenantId + + output: + jsonFormat: {"ResponseInfo": {}} + outJsonPath: $.services + responseInfoPath: $.ResponseInfo + - name: searchLocalitiesUsedInAdmin + query: + baseQuery: | + select + array_to_json(array_agg(localities)) + from ( + select distinct eg_pgr_address.mohalla from eg_pgr_address $where + ) as localities + groupBy: + orderBy: + searchParams: + condition: AND + params: + - name: tenantid + isMandatory: true + jsonPath: $.searchCriteria.tenantId + + output: + jsonFormat: {"ResponseInfo": {}} + outJsonPath: $.services + responseInfoPath: $.ResponseInfo + - name: propertyidSearch + query: + baseQuery: | + select array_to_json(array_agg(row_to_json(data))) from ( + select + propertyid, + receiptnumber, + amountpaid, + getfinancialyear(bill.id) + from eg_pt_property as pt + inner join egcl_bill as bill on bill.consumercode=pt.propertyid + inner join egcl_paymentdetail as pd ON pd.billid=bill.id + $where) data + groupBy: + orderBy: + searchParams: + condition: AND + params: + - name: pt.propertyid + isMandatory: true + jsonPath: $.searchCriteria.propertyid + operator: = + + output: + jsonFormat: {"ResponseInfo": {}} + outJsonPath: $.data + responseInfoPath: $.ResponseInfo + + + - name: firenocSearch + query: + baseQuery: | + select array_to_json(array_agg(row_to_json(data))) from ( + select fnd.uuid,firenocuuid,applicationnumber,firenocnumber,firenoctype,firestationid, + to_char(to_timestamp(cast(validfrom/1000 as bigint))::date , 'dd/mm/yyyy') as validfrom, + to_char(to_timestamp(cast(validto/1000 as bigint))::date , 'dd/mm/yyyy') as validto, + status,concat(addressline1,' ',addressline2,' ',street,' ',city,' ',locality,' ',subdistrict,' ') as address,fnb.name,concat(fnb.usagetype,' ',fnb.usagesubtype) + from eg_fn_firenoc fn + inner join eg_fn_firenocdetail fnd on fnd.firenocuuid=fn.uuid + inner join eg_fn_address fna on fna.firenocdetailsuuid=fnd.uuid + inner join eg_fn_buidlings fnb on fnb.firenocdetailsuuid=fnd.uuid + $where) data + groupBy: + orderBy: + searchParams: + condition: AND + params: + - name: firenocnumber + isMandatory: true + jsonPath: $.searchCriteria.firenocNumber + operator: = + output: + jsonFormat: {"ResponseInfo": {}} + outJsonPath: $.data + responseInfoPath: $.ResponseInfo + diff --git a/configs/egov-searcher/rainmaker-pt-gissearch.yml b/configs/egov-searcher/rainmaker-pt-gissearch.yml new file mode 100644 index 00000000..3034a9e5 --- /dev/null +++ b/configs/egov-searcher/rainmaker-pt-gissearch.yml @@ -0,0 +1,149 @@ +--- +SearchDefinitions: + moduleName: rainmaker-pt-gissearch + summary: Searcher configuration for Adhoc Requirment + version: 1.0.0 + definitions: + - name: searchNewTaxPayments + query: + baseQuery: | + select array_to_json(array_agg(row_to_json(data))) from ( + select + concat(pt.propertyid , '/' , pt.surveyid) as primarykey, + pt.oldpropertyid as oldpropertyid, + pt.surveyid as surveyid, + pd.amountpaid as amount, + getfinancialyearforgis(pd.billid) as financialyear, + bn.blockname, + pt.tenantid as tenantid, + pd.receiptnumber as receiptnumber, + to_char(to_timestamp(cast(pd.receiptdate/1000 as bigint))::date , 'dd/mm/yyyy') as receiptdate, + pt.landarea as plotarea + from egcl_paymentdetail AS pd + INNER JOIN egcl_bill on pd.billid=egcl_bill.id + INNER JOIN eg_pt_property AS pt ON pt.propertyid = egcl_bill.consumercode AND ((pt.oldpropertyid IS NOT NULL + AND pt.oldpropertyid != '') OR pt.surveyid is not null) + INNER JOIN eg_pt_address As ad ON ad.propertyid=pt.id and ad.lastmodifiedtime in (select max(lastmodifiedtime) from eg_pt_address where propertyid=pt.id) + INNER JOIN eg_bndry_mohalla As bn ON ad.locality=bn.localitycode and ad.tenantid=bn.tenantid $where) data + groupBy: null + orderBy: null + searchParams: + condition: AND + params: + - name: pd.receiptdate + isMandatory: false + jsonPath: $.searchCriteria.fromDate + operator: GE + - name: pd.receiptdate + isMandatory: false + jsonPath: $.searchCriteria.toDate + operator: LE + - name: pt.tenantid + isMandatory: true + jsonPath: $.searchCriteria.tenantId + operator: = + - name: bn.blockname + isMandatory: false + jsonPath: $.searchCriteria.blockcode + operator: = + output: + jsonFormat: + ResponseInfo: {} + outJsonPath: $.data + responseInfoPath: $.ResponseInfo + - name: searchTLApplicationsEODB + query: + baseQuery: | + select array_to_json(array_agg(row_to_json(data))) from ( + select + tl.applicationnumber, + tld.additionalDetail::text, + tl.status,additionalDetail->>'IPIN' as iPin, + additionalDetail->>'APPID' as appId, + additionalDetail->>'mobileNo' as mobileNp + from eg_tl_tradelicense tl + inner join eg_tl_tradelicensedetail tld on tld.tradelicenseid=tl.id and tld.additionalDetail->>'CHANNEL'='EODB' ) data + groupBy: null + orderBy: null + searchParams: + condition: AND + params: null + output: + jsonFormat: + ResponseInfo: {} + outJsonPath: $.data + responseInfoPath: $.ResponseInfo + - name: IFMSintegration + query: + baseQuery: | + select array_to_json(array_agg(row_to_json(data))) from + (with details as + ( + SELECT pd.receiptnumber,payment.paidby,bill.consumercode,pd.amountpaid, + pd.businessservice, + pd.tenantid,payment.paymentmode,payment.transactionnumber as transactionNo ,t.mobile_number, taxheadcode , + SUM(adjustedamount) as amount FROM egcl_billaccountdetail as bad + INNER JOIN egcl_billdetial as bd on bd.id = bad.billdetailid + INNER JOIN egcl_bill bill on bd.billid = bill.id + INNER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid + INNER JOIN egcl_payment as payment on pd.paymentid=payment.id + left outer join eg_pg_transactions t on t.bill_id=pd.billid + $where and payment.paymentstatus != 'CANCELLED' + GROUP BY pd.receiptnumber,pd.businessservice,pd.amountpaid,pd.tenantid, + payment.paymentmode,t.mobile_number,payment.transactionnumber, + bill.consumercode,payment.paidby,bad.taxheadcode + ) + select receiptnumber, + paidby, + consumercode, + amountpaid, + businessservice, + tenantid, + paymentmode, + transactionNo , + mobile_number, + json_agg( json_build_object('taxheadcode', taxheadcode,'amount', amount::text)) as taxheads , + ( case when consumercode like 'PT%' then (select usagecategory from eg_pt_property where propertyid=consumercode and status='ACTIVE') else '' end) as ptype + from details + group by receiptnumber,paidby, consumercode, amountpaid, businessservice, tenantid,paymentmode,transactionNo ,mobile_number + ) as data + groupBy: null + orderBy: null + searchParams: + condition: AND + params: + - name: pd.receiptdate + isMandatory: false + jsonPath: $.searchCriteria.fromDate + operator: GE + - name: pd.receiptdate + isMandatory: false + jsonPath: $.searchCriteria.toDate + operator: LE + output: + jsonFormat: + ResponseInfo: {} + outJsonPath: $.data + responseInfoPath: $.ResponseInfo + - name: GetTenantConfig + query: + baseQuery: | + select array_to_json(array_agg(row_to_json(data))) from ( + select id,tenantid,locality,issurveyidmandatory + from eg_tenant_config + $where + ) data + groupBy: null + orderBy: null + searchParams: + condition: AND + params: + - name: tenantid + isMandatory: true + jsonPath: $.searchCriteria.tenantId + operator: = + output: + jsonFormat: + ResponseInfo: {} + outJsonPath: $.data + responseInfoPath: $.ResponseInfo diff --git a/configs/egov-searcher/rainmaker-tl.yml b/configs/egov-searcher/rainmaker-tl.yml new file mode 100644 index 00000000..d5ac3adc --- /dev/null +++ b/configs/egov-searcher/rainmaker-tl.yml @@ -0,0 +1,26 @@ +SearchDefinitions: + moduleName: tlservice-indexer + summary: Searcher for TradeLicense + version: 1.0.0 + definitions: + - name: serviceTradelicense + query: + baseQuery: select array_to_json(array_agg(row_to_json(result))) from ( select id,tenantid,licensetype,licensenumber,applicationnumber,oldlicensenumber,propertyid,oldpropertyid,accountid, tradename,applicationdate,commencementdate,issueddate,financialyear,validfrom,validto,action, null as assignee, null as wfdocuments,status, applicationdate,commencementdate, (select row_to_json(tltradelicensedetail) from (select id,surveyno,subownershipcategory,structuretype,operationalarea,noofemployees,adhocexemption, adhocpenalty,adhocexemptionreason,adhocpenaltyreason, (select array_to_json(array_agg(row_to_json(tlowner))) from (select isprimaryowner,ownershippercentage,ownertype, institutionid,(select array_to_json(array_agg(row_to_json(tlownerdoc))) from (select * from eg_tl_document_owner) tlownerdoc where tlownerdoc.userid = tlowner.id) documents,tlowner.active as useractive,relationship,urid id,uuid,username,password,salutation,name,(CASE gender WHEN 1 THEN 'FEMALE' WHEN 2 THEN 'MALE' ELSE 'OTHERS' END) AS gender,mobilenumber,emailid, altcontactnumber, pan, aadhaarnumber, permanentaddress, permanentcity, permanentpincode, correspondencecity, correspondencepincode, correspondenceaddress, u.active, TRUNC(EXTRACT(EPOCH FROM dob::timestamp AT time zone 'Asia/Kolkata'))*1000 dob, TRUNC(EXTRACT(EPOCH FROM pwdexpirydate::timestamp AT time zone 'Asia/Kolkata'))*1000 pwdexpirydate, locale,utype as type,signature,accountlocked,Roles,guardian as fatherorhusbandname, (CASE bloodgroup WHEN '' THEN null ELSE bloodgroup END) bloodgroup, identificationmark,photo, (CASE WHEN ucreatedby is null THEN 0 ELSE ucreatedby END)::text createdby, TRUNC(EXTRACT(EPOCH FROM ucreateddate::timestamp AT time zone 'Asia/Kolkata'))*1000 createddate, (CASE WHEN ulastmodifiedby is null THEN 0 ELSE ulastmodifiedby END)::text lastmodifiedby, TRUNC(EXTRACT(EPOCH FROM ulastmodifieddate::timestamp AT time zone 'Asia/Kolkata'))*1000 lastmodifieddate, null as otpreference,utenantid tenantid from eg_tl_owner tlowner left join ( select *,users.id urid,users.type utype, users.createdby ucreatedby, users.createddate ucreateddate, users.lastmodifiedby ulastmodifiedby, users.lastmodifieddate ulastmodifieddate, users.tenantid utenantid, addr1.address as permanentaddress, addr1.city as permanentcity, addr1.pincode as permanentpincode, addr2.address as correspondenceaddress, addr2.city as correspondencecity, addr2.pincode as correspondencepincode,(select array_to_json(array_agg(row_to_json(rolejson))) from (select null as id,role_code code from eg_userrole_v1 roles where roles.user_id=users.id) rolejson) Roles from eg_user users left outer join eg_user_address addr1 ON users.id = addr1.userid and addr1.type='PERMANENT' left outer join eg_user_address addr2 ON users.id = addr2.userid and addr2.type='CORRESPONDANCE') u on tlowner.id=u.uuid where tradelicensedetailid = tld.id) tlowner ) owners, null as channel, (select row_to_json(tladdress) from (select id,tenantid,doorno,latitude,longitude, addressid,addressnumber,type,addressline1,addressline2,landmark,city,pincode,detail,buildingname,street, (select row_to_json(loc) from (select locality as code from eg_tl_address addr where addr.tradelicensedetailid = tld.id) loc) locality from eg_tl_address addr where addr.tradelicensedetailid = tld.id) tladdress) address, (select array_to_json(array_agg(row_to_json(tlunit))) from (select id,tenantid,active,tradetype,uom,uomvalue, null as auditdetails from eg_tl_tradeunit trunit where trunit.tradelicensedetailid = tld.id) tlunit ) tradeunits, (select array_to_json(array_agg(row_to_json(tlacc))) from (select id,tenantid,active,accessorycategory, uom,uomvalue,null as count,null as auditdetails from eg_tl_accessory where tradelicensedetailid = tld.id) tlacc ) accessories, (select array_to_json(array_agg(row_to_json(tlapldoc))) from (select id,active,tenantid,documenttype,filestoreid, null as documentuid, null as auditdetails from eg_tl_applicationdocument where tradelicensedetailid = tld.id) tlapldoc ) applicationdocuments, (select array_to_json(array_agg(row_to_json(tlverdoc))) from (select * from eg_tl_verificationdocument) tlverdoc where tlverdoc.tradelicensedetailid = tld.id) verificationdocuments, additionaldetail, (select array_to_json(array_agg(row_to_json(tlinsti))) from (select * from eg_tl_institution) tlinsti where tlinsti.tradelicensedetailid = tld.id) institution, (select row_to_json(audit) from (select tld.createdBy,tld.lastModifiedBy,tld.createdTime,tld.createdTime as lastModifiedTime) as audit) as auditdetails from eg_tl_tradelicensedetail tld where tld.tradelicenseid=tl.id) tltradelicensedetail ) tradelicensedetail, null as calculation, (select row_to_json(audit) from (select tl.createdBy,tl.lastModifiedBy,tl.createdTime,tl.lastModifiedTime) as audit) as auditdetails,null as comment from eg_tl_tradelicense tl $where AND tl.id in (select id from eg_tl_tradelicense order by createdtime ASC $pagination)) result + groupBy: + orderBy: + searchParams: + condition: AND + params: + - name: tenantid + isMandatory: true + jsonPath: $.searchCriteria.tenantId + operator: LIKE + pagination: + noOfRecords: $.searchCriteria.noOfRecords + offset: $.searchCriteria.offset + + output: + jsonFormat: {"ResponseInfo": {}} + outJsonPath: $.Licenses + responseInfoPath: $.ResponseInfo + diff --git a/configs/egov-searcher/weekly-impact-emailer-searcher.yml b/configs/egov-searcher/weekly-impact-emailer-searcher.yml new file mode 100644 index 00000000..c2c7f934 --- /dev/null +++ b/configs/egov-searcher/weekly-impact-emailer-searcher.yml @@ -0,0 +1,133 @@ + SearchDefinitions: + moduleName: impactemailer + summary: Weekly impact emailer cron + version: 1.0.0 + definitions: + - name: stateWideData + query: + baseQuery: select array_to_json(array_agg(row_to_json(stateWideReports))) from ((SELECT (SELECT count(*) FROM ((SELECT DISTINCT tenantid FROM eg_pt_property WHERE (createdtime/1000) <= (extract(epoch from NOW())) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_tl_tradelicense WHERE (createdtime/1000) <= (extract(epoch from NOW())) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_pgr_service WHERE (createdtime/1000) <= (extract(epoch from NOW())) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_fn_firenoc WHERE (createdtime/1000) <= (extract(epoch from NOW())) AND tenantid != 'pb.testing')) AS tenants) as ulbCovered,(SELECT TRUNC((SELECT SUM(payment.totalamountpaid) FROM egcl_payment payment INNER JOIN egcl_paymentdetail paymentdetail ON payment.id = paymentdetail.paymentid INNER JOIN egcl_bill bill ON paymentdetail.billid =bill.id WHERE (paymentdetail.receiptdate/1000) <= (extract(epoch from NOW())) AND payment.tenantid != 'pb.testing' AND payment.paymentstatus != 'CANCELLED') / 10000000, 3)) as revenueCollected,(SELECT (SELECT count(*) FROM eg_pt_property WHERE (createdtime/1000) <= (extract(epoch from NOW())) AND tenantid != 'pb.testing') + (SELECT count(*) FROM eg_tl_tradelicense WHERE (createdtime/1000) <= (extract(epoch from NOW())) AND tenantid != 'pb.testing')+ (SELECT count(*) FROM eg_fn_firenoc WHERE (createdtime/1000) <= (extract(epoch from NOW())) AND tenantid != 'pb.testing')) as servicesApplied, (select trunc((select sum((SELECT count(*) FROM eg_user WHERE (createddate <= NOW()) AND tenantid != 'pb.testing' AND type = 'CITIZEN'))/100000),3)) as noOfUsersRegistered, 'Week0' as day) UNION (SELECT (SELECT count(*) FROM ((SELECT DISTINCT tenantid FROM eg_pt_property WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_tl_tradelicense WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_fn_firenoc WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing')) AS tenants) as ulbCovered,(SELECT TRUNC((SELECT SUM(payment.totalamountpaid) FROM egcl_payment payment INNER JOIN egcl_paymentdetail paymentdetail ON payment.id = paymentdetail.paymentid INNER JOIN egcl_bill bill ON paymentdetail.billid =bill.id WHERE (paymentdetail.receiptdate/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND payment.tenantid != 'pb.testing' AND payment.paymentstatus != 'CANCELLED') / 10000000, 3)) as revenueCollected,(SELECT (SELECT count(*) FROM eg_pt_property WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing') + (SELECT count(*) FROM eg_tl_tradelicense WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing')+(SELECT count(*) FROM eg_fn_firenocdetail WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing')) as servicesApplied, (select trunc((select sum((SELECT count(*) FROM eg_user WHERE createddate <= to_timestamp((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing' AND type = 'CITIZEN'))/100000),3)) as noOfUsersRegistered, 'Week1' as day) UNION (SELECT (SELECT count(*) FROM ((SELECT DISTINCT tenantid FROM eg_pt_property WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_tl_tradelicense WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_fn_firenocdetail WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing')) AS tenants) as ulbCovered,(SELECT TRUNC((SELECT SUM(payment.totalamountpaid) FROM egcl_payment payment INNER JOIN egcl_paymentdetail paymentdetail ON payment.id = paymentdetail.paymentid INNER JOIN egcl_bill bill ON paymentdetail.billid =bill.id WHERE (paymentdetail.receiptdate/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND payment.tenantid != 'pb.testing' AND payment.paymentstatus != 'CANCELLED') / 10000000, 3)) as revenueCollected,(SELECT (SELECT count(*) FROM eg_pt_property WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing') + (SELECT count(*) FROM eg_tl_tradelicense WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing')) as servicesApplied, (select trunc((select sum((SELECT count(*) FROM eg_user WHERE createddate <= to_timestamp((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing' AND type = 'CITIZEN'))/100000),3)) as noOfUsersRegistered, 'Week2' as day) UNION (SELECT (SELECT count(*) FROM ((SELECT DISTINCT tenantid FROM eg_pt_property WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_tl_tradelicense WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing')) AS tenants) as ulbCovered,(SELECT TRUNC(((SELECT SUM(payment.totalamountpaid) FROM egcl_payment payment INNER JOIN egcl_paymentdetail paymentdetail ON payment.id = paymentdetail.paymentid INNER JOIN egcl_bill bill ON paymentdetail.billid =bill.id WHERE (paymentdetail.receiptdate/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND payment.tenantid != 'pb.testing' AND payment.paymentstatus != 'CANCELLED')) / 10000000, 3)) as revenueCollected,(SELECT (SELECT count(*) FROM eg_pt_property WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing') + (SELECT count(*) FROM eg_tl_tradelicense WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing')+(SELECT count(*) FROM eg_fn_firenocdetail WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing')) as servicesApplied, (select trunc((select sum((SELECT count(*) FROM eg_user WHERE createddate <= to_timestamp((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing' AND type = 'CITIZEN'))/100000),3)) as noOfUsersRegistered, 'Week3' as day) UNION (SELECT (SELECT count(*) FROM ((SELECT DISTINCT tenantid FROM eg_pt_property WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_tl_tradelicense WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_fn_firenoc WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing')) AS tenants) as ulbCovered,(SELECT TRUNC((SELECT SUM(payment.totalamountpaid) FROM egcl_payment payment INNER JOIN egcl_paymentdetail paymentdetail ON payment.id = paymentdetail.paymentid INNER JOIN egcl_bill bill ON paymentdetail.billid =bill.id WHERE (paymentdetail.receiptdate/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND payment.tenantid != 'pb.testing' AND payment.paymentstatus != 'CANCELLED') / 10000000, 3)) as revenueCollected,(SELECT (SELECT count(*) FROM eg_pt_property WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing') + (SELECT count(*) FROM eg_tl_tradelicense WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing')+ (SELECT count(*) FROM eg_fn_firenocdetail WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing')) as servicesApplied, (select trunc((select sum((SELECT count(*) FROM eg_user WHERE createddate <= to_timestamp((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing' AND type = 'CITIZEN'))/100000),3)) as noOfUsersRegistered, 'Week4' as day) UNION (SELECT (SELECT count(*) FROM ((SELECT DISTINCT tenantid FROM eg_pt_property WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_tl_tradelicense WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing')UNION (SELECT DISTINCT tenantid FROM eg_fn_firenocdetail WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing') UNION (SELECT DISTINCT tenantid FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing')) AS tenants) as ulbCovered,(SELECT TRUNC((SELECT SUM(payment.totalamountpaid) FROM egcl_payment payment INNER JOIN egcl_paymentdetail paymentdetail ON payment.id = paymentdetail.paymentid INNER JOIN egcl_bill bill ON paymentdetail.billid =bill.id WHERE (paymentdetail.receiptdate/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND payment.tenantid != 'pb.testing' AND payment.paymentstatus != 'CANCELLED')/ 10000000, 3)) as revenueCollected, (SELECT (SELECT count(*) FROM eg_pt_property WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing') + (SELECT count(*) FROM eg_tl_tradelicense WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing')+ (SELECT count(*) FROM eg_fn_firenocdetail WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing')) as servicesApplied, (select trunc((select sum((SELECT count(*) FROM eg_user WHERE createddate <= to_timestamp((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing' AND type = 'CITIZEN'))/100000),3)) as noOfUsersRegistered, 'Week5' as day)) stateWideReports + searchParams: + condition: AND + params: + - name: intervalinsecs + isMandatory: true + jsonPath: $.searchCriteria.intervalinsecs + + output: + jsonFormat: {"ResponseInfo": {}} + outJsonPath: $.data + responseInfoPath: $.ResponseInfo + + + + - name: pgrData + query: + baseQuery: select array_to_json(array_agg(row_to_json(pgrReports))) from ((SELECT (SELECT count(DISTINCT tenantid) as ulbCovered FROM eg_pgr_service WHERE (createdtime/1000) <= (extract (epoch from NOW())) AND tenantid != 'pb.testing'), CONCAT((count(*) / 1000), '.', MOD(count(*), 1000)) as totalComplaints, (SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= (extract (epoch from NOW())) AND tenantid != 'pb.testing') != 0) THEN CONCAT(((SELECT count(*) FROM eg_pgr_service WHERE status = 'closed' OR status = 'resolved' AND (createdtime/1000) <= (extract (epoch from NOW())) AND tenantid != 'pb.testing') * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= (extract (epoch from NOW())) AND tenantid != 'pb.testing')), '%') ELSE '0%' END) as redressal), 'Week0' as day FROM eg_pgr_service WHERE (createdtime/1000) <= (extract (epoch from NOW())) AND tenantid != 'pb.testing') UNION (SELECT (SELECT count(DISTINCT tenantid) as ulbCovered FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing'), CONCAT((count(*) / 1000), '.', MOD(count(*), 1000)) as totalComplaints, (SELECT (CASE WHEN (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing') != 0 THEN CONCAT(((SELECT count(*) FROM eg_pgr_service WHERE status = 'closed' OR status = 'resolved' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing') * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing')), '%') ELSE '0%' END) as redressal), 'Week1' as day FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing') UNION (SELECT (SELECT count(DISTINCT tenantid) as ulbCovered FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing'), CONCAT((count(*) / 1000), '.', MOD(count(*), 1000)) as totalComplaints, (SELECT (CASE WHEN (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing') != 0 THEN CONCAT(((SELECT count(*) FROM eg_pgr_service WHERE status = 'closed' OR status = 'resolved' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing') * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing')), '%') ELSE '0%' END) as redressal), 'Week2' as day FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing') UNION (SELECT (SELECT count(DISTINCT tenantid) as ulbCovered FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing'), CONCAT((count(*) / 1000), '.', MOD(count(*), 1000)) as totalComplaints, (SELECT (CASE WHEN (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing') != 0 THEN CONCAT(((SELECT count(*) FROM eg_pgr_service WHERE status = 'closed' OR status = 'resolved' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing') * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing')), '%') ELSE '0%' END) as redressal), 'Week3' as day FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing') UNION (SELECT (SELECT count(DISTINCT tenantid) as ulbCovered FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing'), CONCAT((count(*) / 1000), '.', MOD(count(*), 1000)) as totalComplaints, (SELECT (CASE WHEN (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing') != 0 THEN CONCAT(((SELECT count(*) FROM eg_pgr_service WHERE status = 'closed' OR status = 'resolved' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing') * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing')), '%') ELSE '0%' END) as redressal), 'Week4' as day FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing') UNION (SELECT (SELECT count(DISTINCT tenantid) as ulbCovered FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing'), CONCAT((count(*) / 1000), '.', MOD(count(*), 1000)) as totalComplaints, (SELECT (CASE WHEN (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing') != 0 THEN CONCAT(((SELECT count(*) FROM eg_pgr_service WHERE status = 'closed' OR status = 'resolved' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing') * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing')), '%') ELSE '0%' END) as redressal), 'Week5' as day FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing')) pgrReports + searchParams: + condition: AND + params: + - name: intervalinsecs + isMandatory: true + jsonPath: $.searchCriteria.intervalinsecs + + output: + jsonFormat: {"ResponseInfo": {}} + outJsonPath: $.data + responseInfoPath: $.ResponseInfo + + + - name: pgrChannelData + query: + baseQuery: select array_to_json(array_agg(row_to_json(pgrChannel))) from ((SELECT(SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= (extract (epoch from NOW())) AND tenantid != 'pb.testing') != 0) THEN CONCAT(round(((SELECT count(*) FROM eg_pgr_service WHERE source = 'ivr' AND (createdtime/1000) <= (extract (epoch from NOW())) AND tenantid != 'pb.testing')::numeric * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= (extract (epoch from NOW())) AND tenantid != 'pb.testing'))::numeric, 2), '%') ELSE '0%' END) as ivr),(SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= (extract (epoch from NOW())) AND tenantid != 'pb.testing') != 0) THEN CONCAT(round(((SELECT count(*) FROM eg_pgr_service WHERE source = 'web' AND (createdtime/1000) <= (extract (epoch from NOW())) AND tenantid != 'pb.testing')::numeric * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= (extract (epoch from NOW())) AND tenantid != 'pb.testing'))::numeric, 2), '%') ELSE '0%' END) as webapp),(SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= (extract (epoch from NOW())) AND tenantid != 'pb.testing') != 0) THEN CONCAT(round(((SELECT count(*) FROM eg_pgr_service WHERE source = 'mobileapp' AND (createdtime/1000) <= (extract (epoch from NOW())) AND tenantid != 'pb.testing')::numeric * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= (extract (epoch from NOW())) AND tenantid != 'pb.testing'))::numeric, 2), '%') ELSE '0%' END) as mobileapp),(SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= (extract (epoch from NOW())) AND tenantid != 'pb.testing') != 0) THEN CONCAT(round(((SELECT count(*) FROM eg_pgr_service WHERE source = 'whatsapp' AND (createdtime/1000) <= (extract (epoch from NOW())) AND tenantid != 'pb.testing')::numeric * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= (extract (epoch from NOW())) AND tenantid != 'pb.testing'))::numeric, 2), '%') ELSE '0%' END) as whatsapp),(SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= (extract (epoch from NOW())) AND tenantid != 'pb.testing') != 0) THEN CONCAT(round(((SELECT count(*) FROM eg_pgr_service WHERE source = 'RB Bot' AND (createdtime/1000) <= (extract (epoch from NOW())) AND tenantid != 'pb.testing')::numeric * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= (extract (epoch from NOW())) AND tenantid != 'pb.testing'))::numeric, 2), '%') ELSE '0%' END) as rbbot),'Week0' as day FROM eg_pgr_service LIMIT 1) UNION (SELECT (SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing') != 0) THEN CONCAT(round(((SELECT count(*) FROM eg_pgr_service WHERE source = 'ivr' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing')::numeric * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing'))::numeric, 2), '%') ELSE '0%' END) as redressal), (SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing') != 0) THEN CONCAT(round(((SELECT count(*) FROM eg_pgr_service WHERE source = 'web' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing')::numeric * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing'))::numeric, 2), '%') ELSE '0%' END) as redressal),(SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing') != 0) THEN CONCAT(round(((SELECT count(*) FROM eg_pgr_service WHERE source = 'mobileapp' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing')::numeric * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing'))::numeric, 2), '%') ELSE '0%' END) as redressal),(SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing') != 0) THEN CONCAT(round(((SELECT count(*) FROM eg_pgr_service WHERE source = 'whatsapp' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing')::numeric * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing'))::numeric, 2), '%') ELSE '0%' END) as redressal),(SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing') != 0) THEN CONCAT(round(((SELECT count(*) FROM eg_pgr_service WHERE source = 'RB Bot' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing')::numeric * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing'))::numeric, 2), '%') ELSE '0%' END) as redressal),'Week1' as day FROM eg_pgr_service LIMIT 1) UNION (SELECT (SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing') != 0) THEN CONCAT(round(((SELECT count(*) FROM eg_pgr_service WHERE source = 'ivr' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing')::numeric * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing'))::numeric, 2), '%') ELSE '0%' END) as redressal), (SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing') != 0) THEN CONCAT(round(((SELECT count(*) FROM eg_pgr_service WHERE source = 'web' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing')::numeric * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing'))::numeric, 2), '%') ELSE '0%' END) as redressal),(SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing') != 0) THEN CONCAT(round(((SELECT count(*) FROM eg_pgr_service WHERE source = 'mobileapp' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing')::numeric * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing'))::numeric, 2), '%') ELSE '0%' END) as redressal), (SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing') != 0) THEN CONCAT(round(((SELECT count(*) FROM eg_pgr_service WHERE source = 'whatsapp' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing')::numeric * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing'))::numeric, 2), '%') ELSE '0%' END) as redressal),(SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing') != 0) THEN CONCAT(round(((SELECT count(*) FROM eg_pgr_service WHERE source = 'RB Bot' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing')::numeric * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing'))::numeric, 2), '%') ELSE '0%' END) as redressal), 'Week2' as day FROM eg_pgr_service LIMIT 1) UNION (SELECT (SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing') != 0) THEN CONCAT(round(((SELECT count(*) FROM eg_pgr_service WHERE source = 'ivr' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing')::numeric * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing'))::numeric, 2), '%') ELSE '0%' END) as redressal), (SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing') != 0) THEN CONCAT(round(((SELECT count(*) FROM eg_pgr_service WHERE source = 'web' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing')::numeric * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing'))::numeric, 2), '%') ELSE '0%' END) as redressal), (SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing') != 0) THEN CONCAT(round(((SELECT count(*) FROM eg_pgr_service WHERE source = 'mobileapp' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing')::numeric * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing'))::numeric, 2), '%') ELSE '0%' END) as redressal), (SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing') != 0) THEN CONCAT(round(((SELECT count(*) FROM eg_pgr_service WHERE source = 'whatsapp' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing')::numeric * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing'))::numeric, 2), '%') ELSE '0%' END) as redressal),(SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing') != 0) THEN CONCAT(round(((SELECT count(*) FROM eg_pgr_service WHERE source = 'RB Bot' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing')::numeric * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing'))::numeric, 2), '%') ELSE '0%' END) as redressal), 'Week3' as day FROM eg_pgr_service LIMIT 1) UNION (SELECT (SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing') != 0) THEN CONCAT(round(((SELECT count(*) FROM eg_pgr_service WHERE source = 'ivr' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing')::numeric * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing'))::numeric, 2), '%') ELSE '0%' END) as redressal), (SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing') != 0) THEN CONCAT(round(((SELECT count(*) FROM eg_pgr_service WHERE source = 'web' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing')::numeric * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing'))::numeric, 2), '%') ELSE '0%' END) as redressal), (SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing') != 0) THEN CONCAT(round(((SELECT count(*) FROM eg_pgr_service WHERE source = 'mobileapp' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing')::numeric * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing'))::numeric, 2), '%') ELSE '0%' END) as redressal), (SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing') != 0) THEN CONCAT(round(((SELECT count(*) FROM eg_pgr_service WHERE source = 'whatsapp' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing')::numeric * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing'))::numeric, 2), '%') ELSE '0%' END) as redressal),(SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing') != 0) THEN CONCAT(round(((SELECT count(*) FROM eg_pgr_service WHERE source = 'RB Bot' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing')::numeric * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing'))::numeric, 2), '%') ELSE '0%' END) as redressal), 'Week4' as day FROM eg_pgr_service LIMIT 1) UNION (SELECT (SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing') != 0) THEN CONCAT(round(((SELECT count(*) FROM eg_pgr_service WHERE source = 'ivr' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing')::numeric * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing'))::numeric, 2), '%') ELSE '0%' END) as redressal), (SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing') != 0) THEN CONCAT(round(((SELECT count(*) FROM eg_pgr_service WHERE source = 'web' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing')::numeric * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing'))::numeric, 2), '%') ELSE '0%' END) as redressal), (SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing') != 0) THEN CONCAT(round(((SELECT count(*) FROM eg_pgr_service WHERE source = 'mobileapp' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing')::numeric * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing'))::numeric, 2), '%') ELSE '0%' END) as redressal), (SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing') != 0) THEN CONCAT(round(((SELECT count(*) FROM eg_pgr_service WHERE source = 'whatsapp' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing')::numeric * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing'))::numeric, 2), '%') ELSE '0%' END) as redressal),(SELECT (CASE WHEN ((SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing') != 0) THEN CONCAT(round(((SELECT count(*) FROM eg_pgr_service WHERE source = 'RB Bot' AND (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing')::numeric * 100 / (SELECT count(*) FROM eg_pgr_service WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing'))::numeric, 2), '%') ELSE '0%' END) as redressal), 'Week5' as day FROM eg_pgr_service LIMIT 1)) pgrChannel + + searchParams: + condition: AND + params: + - name: intervalinsecs + isMandatory: true + jsonPath: $.searchCriteria.intervalinsecs + + output: + jsonFormat: {"ResponseInfo": {}} + outJsonPath: $.data + responseInfoPath: $.ResponseInfo + + + + - name: ptData + query: + baseQuery: select array_to_json(array_agg(row_to_json(ptReports))) from ((SELECT (SELECT count(DISTINCT tenantid) as ulbCovered FROM eg_pt_property WHERE (createdtime/1000) <= (extract (epoch from NOW())) AND tenantid != 'pb.testing'),(select CONCAT((count(DISTINCT pt.propertyid) / 1000), '.', MOD(count(DISTINCT pt.propertyid), 1000)) as noofpropertiescreated FROM eg_pt_property pt where status='ACTIVE' AND tenantid != 'pb.testing'),(select TRUNC(SUM(payment.totalamountpaid) / 10000000, 3) as revenuecollected FROM egcl_paymentdetail paymentdetail INNER JOIN egcl_payment payment ON paymentdetail.paymentid =payment.id WHERE (paymentdetail.receiptdate/1000) <= (extract(epoch from NOW())) AND payment.tenantid != 'pb.testing' AND payment.paymentstatus != 'CANCELLED' AND paymentdetail.businessservice='PT'), 'Week0' as day) UNION (SELECT (SELECT count(DISTINCT tenantid) as ulbCovered FROM eg_pt_property WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tenantid != 'pb.testing'),(select CONCAT((count(DISTINCT pt.propertyid) / 1000), '.', MOD(count(DISTINCT pt.propertyid), 1000)) as noofpropertiescreated FROM eg_pt_property pt where (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND status='ACTIVE' AND tenantid != 'pb.testing') ,(select TRUNC(SUM(payment.totalamountpaid) / 10000000, 3) as revenuecollected FROM egcl_paymentdetail paymentdetail INNER JOIN egcl_payment payment ON paymentdetail.paymentid =payment.id WHERE (paymentdetail.receiptdate/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND payment.tenantid != 'pb.testing' AND payment.paymentstatus != 'CANCELLED' AND paymentdetail.businessservice='PT'), 'Week1' as day) UNION (SELECT (SELECT count(DISTINCT tenantid) as ulbCovered FROM eg_pt_property WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND tenantid != 'pb.testing'),(select CONCAT((count(DISTINCT pt.propertyid) / 1000), '.', MOD(count(DISTINCT pt.propertyid), 1000)) as noofpropertiescreated FROM eg_pt_property pt where (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND status='ACTIVE' AND tenantid != 'pb.testing'),(select TRUNC(SUM(payment.totalamountpaid) / 10000000, 3) as revenuecollected FROM egcl_paymentdetail paymentdetail INNER JOIN egcl_payment payment ON paymentdetail.paymentid =payment.id WHERE (paymentdetail.receiptdate/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 2) AND payment.tenantid != 'pb.testing' AND payment.paymentstatus != 'CANCELLED' AND paymentdetail.businessservice='PT') ,'Week2') UNION (SELECT (SELECT count(DISTINCT tenantid) as ulbCovered FROM eg_pt_property WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND tenantid != 'pb.testing'),(select CONCAT((count(DISTINCT pt.propertyid) / 1000), '.', MOD(count(DISTINCT pt.propertyid), 1000)) as noofpropertiescreated FROM eg_pt_property pt where (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 *3 ) AND status='ACTIVE' AND tenantid != 'pb.testing') ,(select TRUNC(SUM(payment.totalamountpaid) / 10000000, 3) as revenuecollected FROM egcl_paymentdetail paymentdetail INNER JOIN egcl_payment payment ON paymentdetail.paymentid =payment.id WHERE (paymentdetail.receiptdate/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 3) AND payment.tenantid != 'pb.testing' AND payment.paymentstatus != 'CANCELLED' AND paymentdetail.businessservice='PT'),'Week3' as day) UNION (SELECT (SELECT count(DISTINCT tenantid) as ulbCovered FROM eg_pt_property WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND tenantid != 'pb.testing'), (select CONCAT((count(DISTINCT pt.propertyid) / 1000), '.', MOD(count(DISTINCT pt.propertyid), 1000)) as noofpropertiescreated FROM eg_pt_property pt where (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND status='ACTIVE' AND tenantid != 'pb.testing'),(select TRUNC(SUM(payment.totalamountpaid) / 10000000, 3) as revenuecollected FROM egcl_paymentdetail paymentdetail INNER JOIN egcl_payment payment ON paymentdetail.paymentid =payment.id WHERE (paymentdetail.receiptdate/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 4) AND payment.tenantid != 'pb.testing' AND payment.paymentstatus != 'CANCELLED' AND paymentdetail.businessservice='PT'), 'Week4' as day) UNION (SELECT (SELECT count(DISTINCT tenantid) as ulbCovered FROM eg_pt_property WHERE (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND tenantid != 'pb.testing'), (select CONCAT((count(DISTINCT pt.propertyid) / 1000), '.', MOD(count(DISTINCT pt.propertyid), 1000)) as noofpropertiescreated FROM eg_pt_property pt where (createdtime/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND status='ACTIVE' AND tenantid != 'pb.testing'),(select TRUNC(SUM(payment.totalamountpaid) / 10000000, 3) as revenuecollected FROM egcl_paymentdetail paymentdetail INNER JOIN egcl_payment payment ON paymentdetail.paymentid =payment.id WHERE (paymentdetail.receiptdate/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800 * 5) AND payment.tenantid != 'pb.testing' AND payment.paymentstatus != 'CANCELLED' AND paymentdetail.businessservice='PT'), 'Week5' as day)) ptReports + searchParams: + condition: AND + params: + - name: intervalinsecs + isMandatory: true + jsonPath: $.searchCriteria.intervalinsecs + + output: + jsonFormat: {"ResponseInfo": {}} + outJsonPath: $.data + responseInfoPath: $.ResponseInfo + + + + - name: tlData + query: + baseQuery: select array_to_json(array_agg(row_to_json(tlReports))) from (SELECT count(DISTINCT tl.tenantid) as ulbCovered , CONCAT((count(*) / 1000), '.', MOD(count(*), 1000)) as licenseIssued,TRUNC(SUM(payment.totalamountpaid) / 10000000, 3) as revenuecollected, 'Week0' as day FROM eg_tl_tradelicense as tl INNER JOIN egcl_bill bill ON tl.applicationnumber = bill.consumercode INNER JOIN egcl_paymentdetail paymentdetail ON bill.id = paymentdetail.billid INNER JOIN egcl_payment payment ON paymentdetail.paymentid =payment.id WHERE (paymentdetail.receiptdate/1000) <= (extract(epoch from NOW())) AND tl.tenantid != 'pb.testing' AND payment.paymentstatus != 'CANCELLED' AND tl.status='APPROVED' UNION SELECT count(DISTINCT tl.tenantid) as ulbCovered , CONCAT((count(*) / 1000), '.', MOD(count(*), 1000)) as licenseIssued, TRUNC(SUM(payment.totalamountpaid) / 10000000, 3) as revenuecollected,'Week1' as day FROM eg_tl_tradelicense tl INNER JOIN egcl_bill bill ON tl.applicationnumber = bill.consumercode INNER JOIN egcl_paymentdetail paymentdetail ON bill.id = paymentdetail.billid INNER JOIN egcl_payment payment ON paymentdetail.paymentid =payment.id WHERE (paymentdetail.receiptdate/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND tl.tenantid != 'pb.testing' AND payment.paymentstatus != 'CANCELLED' AND tl.status='APPROVED' UNION SELECT count(DISTINCT tl.tenantid) as ulbCovered , CONCAT((count(*) / 1000), '.', MOD(count(*), 1000)) as licenseIssued,TRUNC(SUM(payment.totalamountpaid) / 10000000, 3) as revenuecollected, 'Week2' as day FROM eg_tl_tradelicense tl INNER JOIN egcl_bill bill ON tl.applicationnumber = bill.consumercode INNER JOIN egcl_paymentdetail paymentdetail ON bill.id = paymentdetail.billid INNER JOIN egcl_payment payment ON paymentdetail.paymentid =payment.id WHERE (paymentdetail.receiptdate/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800*2) AND tl.tenantid != 'pb.testing' AND payment.paymentstatus != 'CANCELLED' AND tl.status='APPROVED' UNION SELECT count(DISTINCT tl.tenantid) as ulbCovered , CONCAT((count(*) / 1000), '.', MOD(count(*), 1000)) as licenseIssued,TRUNC(SUM(payment.totalamountpaid) / 10000000, 3) as revenuecollected, 'Week3' as day FROM eg_tl_tradelicense tl INNER JOIN egcl_bill bill ON tl.applicationnumber = bill.consumercode INNER JOIN egcl_paymentdetail paymentdetail ON bill.id = paymentdetail.billid INNER JOIN egcl_payment payment ON paymentdetail.paymentid =payment.id WHERE (paymentdetail.receiptdate/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800*3) AND tl.tenantid != 'pb.testing' AND payment.paymentstatus != 'CANCELLED' AND tl.status='APPROVED' UNION SELECT count(DISTINCT tl.tenantid) as ulbCovered , CONCAT((count(*) / 1000), '.', MOD(count(*), 1000)) as licenseIssued,TRUNC(SUM(payment.totalamountpaid) / 10000000, 3) as revenuecollected, 'Week4' as day FROM eg_tl_tradelicense tl INNER JOIN egcl_bill bill ON tl.applicationnumber = bill.consumercode INNER JOIN egcl_paymentdetail paymentdetail ON bill.id = paymentdetail.billid INNER JOIN egcl_payment payment ON paymentdetail.paymentid =payment.id WHERE (paymentdetail.receiptdate/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800*4) AND tl.tenantid != 'pb.testing' AND payment.paymentstatus != 'CANCELLED' AND tl.status='APPROVED' UNION SELECT count(DISTINCT tl.tenantid) as ulbCovered , CONCAT((count(*) / 1000), '.', MOD(count(*), 1000)) as licenseIssued,TRUNC(SUM(payment.totalamountpaid) / 10000000, 3) as revenuecollected, 'Week5' as day FROM eg_tl_tradelicense tl INNER JOIN egcl_bill bill ON tl.applicationnumber = bill.consumercode INNER JOIN egcl_paymentdetail paymentdetail ON bill.id = paymentdetail.billid INNER JOIN egcl_payment payment ON paymentdetail.paymentid =payment.id WHERE (paymentdetail.receiptdate/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800*5) AND tl.tenantid != 'pb.testing' AND payment.paymentstatus != 'CANCELLED' AND tl.status='APPROVED') tlReports + + searchParams: + condition: AND + params: + - name: intervalinsecs + isMandatory: true + jsonPath: $.searchCriteria.intervalinsecs + + output: + jsonFormat: {"ResponseInfo": {}} + outJsonPath: $.data + responseInfoPath: $.ResponseInfo + + + + - name: miscCollections + query: + baseQuery: select array_to_json(array_agg(row_to_json(misccollections))) from ((SELECT TRUNC(CONCAT((count(*) / 100000), '.', MOD(count(*), 100000))::decimal,3) as receiptscreated, TRUNC(SUM(payment.totalamountpaid) / 10000000, 3) as revenuecollected, 'Week0' as day FROM egcl_payment payment LEFT JOIN egcl_paymentdetail paymentdetail ON payment.id = paymentdetail.paymentid $where AND (paymentdetail.receiptdate/1000) <= (extract(epoch from NOW()))) UNION (SELECT TRUNC(CONCAT((count(*) / 100000), '.', MOD(count(*), 100000))::decimal,3) as receiptscreated, TRUNC(SUM(payment.totalamountpaid) / 10000000, 3) as revenuecollected, 'Week1' as day FROM egcl_payment payment LEFT JOIN egcl_paymentdetail paymentdetail ON payment.id = paymentdetail.paymentid $where AND (paymentdetail.receiptdate/1000) <= ((extract(epoch from NOW())) - 604800)) UNION (SELECT TRUNC(CONCAT((count(*) / 100000), '.', MOD(count(*), 100000))::decimal,3) as receiptscreated, TRUNC(SUM(payment.totalamountpaid) / 10000000, 3) as revenuecollected, 'Week2' as day FROM egcl_payment payment LEFT JOIN egcl_paymentdetail paymentdetail ON payment.id = paymentdetail.paymentid $where AND (paymentdetail.receiptdate/1000) <= ((extract(epoch from NOW())) - 604800 * 2)) UNION (SELECT TRUNC(CONCAT((count(*) / 100000), '.', MOD(count(*), 100000))::decimal,3) as receiptscreated, TRUNC(SUM(payment.totalamountpaid) / 10000000, 3) as revenuecollected, 'Week3' as day FROM egcl_payment payment LEFT JOIN egcl_paymentdetail paymentdetail ON payment.id = paymentdetail.paymentid $where AND (paymentdetail.receiptdate/1000) <= ((extract(epoch from NOW())) - 604800 * 3)) UNION (SELECT TRUNC(CONCAT((count(*) / 100000), '.', MOD(count(*), 100000))::decimal,3) as receiptscreated, TRUNC(SUM(payment.totalamountpaid) / 10000000, 3) as revenuecollected, 'Week4' as day FROM egcl_payment payment LEFT JOIN egcl_paymentdetail paymentdetail ON payment.id = paymentdetail.paymentid $where AND (paymentdetail.receiptdate/1000) <= ((extract(epoch from NOW())) - 604800 * 4)) UNION (SELECT TRUNC(CONCAT((count(*) / 100000), '.', MOD(count(*), 100000))::decimal,3) as receiptscreated, TRUNC(SUM(payment.totalamountpaid) / 10000000, 3) as revenuecollected, 'Week5' as day FROM egcl_payment payment LEFT JOIN egcl_paymentdetail paymentdetail ON payment.id = paymentdetail.paymentid $where AND (paymentdetail.receiptdate/1000) <= ((extract(epoch from NOW())) - 604800 * 5))) misccollections + searchParams: + condition: AND + params: + - name: payment.tenantid + isMandatory: true + operator: NE + jsonPath: $.searchCriteria.ignoreTenant + - name: paymentdetail.businessservice + isMandatory: false + operator: IN + jsonPath: $.searchCriteria.taxHeads + - name: paymentdetail.businessservice + isMandatory: false + operator: NOT IN + jsonPath: $.searchCriteria.ignoreTaxHeads + - name: payment.paymentstatus + isMandatory: true + operator: NE + jsonPath: $.searchCriteria.ignoreStatus + + output: + jsonFormat: {"ResponseInfo": {}} + outJsonPath: $.data + responseInfoPath: $.ResponseInfo + + - name: firenocData + query: + baseQuery: select array_to_json(array_agg(row_to_json(firenocReports))) from (SELECT count(DISTINCT fn.tenantid) as ulbCovered , count(*) as certificatesIssued,COALESCE(TRUNC(SUM(payment.totalamountpaid) / 10000000, 3),0) as revenuecollected, 'Week0' as day FROM eg_fn_firenocdetail as fn INNER JOIN egcl_bill bill ON fn.applicationnumber = bill.consumercode INNER JOIN egcl_paymentdetail paymentdetail ON bill.id = paymentdetail.billid INNER JOIN egcl_payment payment ON paymentdetail.paymentid =payment.id WHERE (paymentdetail.receiptdate/1000) <= (extract(epoch from NOW())) AND fn.tenantid != 'pb.testing' AND payment.paymentstatus!='CANCELLED' AND fn.status='APPROVED' UNION SELECT count(DISTINCT fn.tenantid) as ulbCovered , count(*) as certficatesIssued, COALESCE(TRUNC(SUM(payment.totalamountpaid) / 10000000, 3),0) as revenuecollected,'Week1' as day FROM eg_fn_firenocdetail fn INNER JOIN egcl_bill bill ON fn.applicationnumber = bill.consumercode INNER JOIN egcl_paymentdetail paymentdetail ON bill.id = paymentdetail.billid INNER JOIN egcl_payment payment ON paymentdetail.paymentid =payment.id WHERE (paymentdetail.receiptdate/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800) AND fn.tenantid != 'pb.testing' AND payment.paymentstatus!='CANCELLED' AND fn.status='APPROVED' UNION SELECT count(DISTINCT fn.tenantid) as ulbCovered , count(*) as certficatesIssued,COALESCE(TRUNC(SUM(payment.totalamountpaid) / 10000000, 3),0) as revenuecollected, 'Week2' as day FROM eg_fn_firenocdetail fn INNER JOIN egcl_bill bill ON fn.applicationnumber = bill.consumercode INNER JOIN egcl_paymentdetail paymentdetail ON bill.id = paymentdetail.billid INNER JOIN egcl_payment payment ON paymentdetail.paymentid =payment.id WHERE (paymentdetail.receiptdate/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800*2) AND fn.tenantid != 'pb.testing' AND payment.paymentstatus!='CANCELLED' AND fn.status='APPROVED' UNION SELECT count(DISTINCT fn.tenantid) as ulbCovered , count(*) as certificatesIssued,COALESCE(TRUNC(SUM(payment.totalamountpaid) / 10000000, 3),0) as revenuecollected, 'Week3' as day FROM eg_fn_firenocdetail fn INNER JOIN egcl_bill bill ON fn.applicationnumber = bill.consumercode INNER JOIN egcl_paymentdetail paymentdetail ON bill.id = paymentdetail.billid INNER JOIN egcl_payment payment ON paymentdetail.paymentid =payment.id WHERE (paymentdetail.receiptdate/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800*3) AND fn.tenantid != 'pb.testing' AND payment.paymentstatus!='CANCELLED' AND fn.status='APPROVED' UNION SELECT count(DISTINCT fn.tenantid) as ulbCovered , count(*) as certficatesIssued,COALESCE(TRUNC(SUM(payment.totalamountpaid) / 10000000, 3),0) as revenuecollected, 'Week4' as day FROM eg_fn_firenocdetail fn INNER JOIN egcl_bill bill ON fn.applicationnumber = bill.consumercode INNER JOIN egcl_paymentdetail paymentdetail ON bill.id = paymentdetail.billid INNER JOIN egcl_payment payment ON paymentdetail.paymentid =payment.id WHERE (paymentdetail.receiptdate/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800*4) AND fn.tenantid != 'pb.testing' AND payment.paymentstatus!='CANCELLED' AND fn.status='APPROVED' UNION SELECT count(DISTINCT fn.tenantid) as ulbCovered , count(*) as certficatesIssued,COALESCE(TRUNC(SUM(payment.totalamountpaid) / 10000000, 3),0) as revenuecollected, 'Week5' as day FROM eg_fn_firenocdetail fn INNER JOIN egcl_bill bill ON fn.applicationnumber = bill.consumercode INNER JOIN egcl_paymentdetail paymentdetail ON bill.id = paymentdetail.billid INNER JOIN egcl_payment payment ON paymentdetail.paymentid =payment.id WHERE (paymentdetail.receiptdate/1000) <= ((extract (epoch from (to_timestamp(CONCAT(CURRENT_DATE + integer '1'), 'YYYY-MM-DD H24:MI:SS')))) - 604800*5) AND fn.tenantid != 'pb.testing' AND payment.paymentstatus!='CANCELLED' AND fn.status='APPROVED') firenocReports + searchParams: + condition: AND + params: + - name: intervalinsecs + isMandatory: true + jsonPath: $.searchCriteria.intervalinsecs + + output: + jsonFormat: {"ResponseInfo": {}} + outJsonPath: $.data + responseInfoPath: $.ResponseInfo diff --git a/configs/egov-uploader/CollectionReceiptWorkflow.json b/configs/egov-uploader/CollectionReceiptWorkflow.json new file mode 100644 index 00000000..068a9b27 --- /dev/null +++ b/configs/egov-uploader/CollectionReceiptWorkflow.json @@ -0,0 +1,67 @@ +{ + "moduleName": "Collections", + "Definitions": [ + { + "name": "Upload-Receipt-Workflow-Data", + "uniqueParentKeys": [], + "templateFileName": "collection_receipt_workflow_template.xls", + "isParentChild": false, + "requests": [ + { + "apiRequest": { + "ReceiptWorkflow": [ + { + "consumerCode": "", + "receiptNumber": "", + "action": "", + "reason": "", + "additionalDetails": { + "temp": "" + } + } + ], + "RequestInfo": { + "apiId": "Rainmaker", + "ver": ".01", + "ts": 0, + "action": "_create", + "did": "1", + "key": "", + "msgId": "20170310130900|en_IN", + "authToken": "8040b93b-03ea-4532-81b7-164538cee9d4", + "correlationId": "a2e4642e-8cb5-483b-8ea2-827cbe822c5f", + "userInfo": { + "id": 1 + } + } + }, + "excelHeadersToRequestMap": { + "consumerCode": [ + "$.ReceiptWorkflow.*.consumerCode" + ], + "receiptNumber": [ + "$.ReceiptWorkflow.*.receiptNumber" + ], + "action": [ + "$.ReceiptWorkflow.*.action" + ], + "reason": [ + "$.ReceiptWorkflow.*.reason" + ], + "additionalDetails": [ + "$.ReceiptWorkflow.*.additionalDetails" + ] + }, + "arrayPath": "$.ReceiptWorkflow.*", + "tenantIdPaths": [ + "$.ReceiptWorkflow.*.tenantId" + ], + "url": "http://collection-services:8080/collection-services/receipts/_workflow", + "additionalResFields": { + "$.ReceiptWorkflow.*.code[0]": "Response" + } + } + ] + } + ] +} diff --git a/configs/egov-uploader/localization-upload.json b/configs/egov-uploader/localization-upload.json new file mode 100644 index 00000000..f73c0181 --- /dev/null +++ b/configs/egov-uploader/localization-upload.json @@ -0,0 +1,61 @@ +{ + "moduleName": "Localization", + "Definitions": [ + { + "name": "Upload-Localization-Messages", + "uniqueParentKeys": [], + "templateFileName": "localization_template.xls", + "isParentChild": false, + "requests": [ + { + "apiRequest": { + "RequestInfo": { + "apiId": "localization", + "ver": null, + "ts": null, + "action": null, + "did": null, + "key": null, + "msgId": "search with from and to values", + "authToken": "cdc03e03-8b26-49ca-9c15-3ccc9c91c1ec" + }, + "tenantId": "pb", + "messages": [ + { + "code": "SERVICEDEFS.DAMAGEDGARBAGEBIN", + "message": "Damaged Garbage Bin", + "module": "rainmaker-pgr", + "locale": "en_IN" + } + ] + }, + "excelHeadersToRequestMap": { + "Code": [ + "$.messages.*.code" + ], + "Locale": [ + "$.messages.*.locale" + ], + "Message": [ + "$.messages.*.message" + ], + "Module": [ + "$.messages.*.module" + ], + "TenantId": [ + "$.tenantId" + ] + }, + "arrayPath": "$.messages.*", + "tenantIdPaths": [ + "$.messages.*.tenantId" + ], + "url": "http://egov-localization:8080/localization/messages/v1/_create", + "additionalResFields":{ + "$.messages.*.code[0]":"Response" + } + } + ] + } + ] +} diff --git a/configs/egov-uploader/property-upload.json b/configs/egov-uploader/property-upload.json new file mode 100644 index 00000000..1417113c --- /dev/null +++ b/configs/egov-uploader/property-upload.json @@ -0,0 +1,20 @@ +{ + "moduleName": "property-upload", + "Definitions": [ + { + "name": "property-residential-create", + "templateFileName": "property-residential.xlsx", + "uniqueParentKeys": [], + "isParentChild": false, + "requests": [ + { + "url": "", + "apiRequest": {}, + "excelHeadersToRequestMap": {}, + "additionalResFields": {}, + "tenantIdPaths": [] + } + ] + } + ] +} diff --git a/configs/egov-zuul/post-hook.json b/configs/egov-zuul/post-hook.json new file mode 100644 index 00000000..567d3f37 --- /dev/null +++ b/configs/egov-zuul/post-hook.json @@ -0,0 +1,8 @@ +{ + "/pt-services-v2/property/_create":"http://rainmaker-custom-service:8000/customization/protected/punjab-pt/property/_create", + "/pt-services-v2/property/_update":"http://rainmaker-custom-service:8000/customization/protected/punjab-pt/property/_create", + "/pt-calculator-v2/propertytax/_estimate":"http://rainmaker-custom-service:8000/customization/protected/punjab-pt/pt-calculator-v2/_estimate", + "/pt-calculator-v2/propertytax/v2/_estimate":"http://rainmaker-custom-service:8000/customization/protected/punjab-pt/pt-calculator-v2/_estimate", + "/property-services/assessment/_create":"http://rainmaker-custom-service:8000/customization/protected/punjab-pt/assessment/_create", + "/property-services/assessment/_update":"http://rainmaker-custom-service:8000/customization/protected/punjab-pt/assessment/_update" +} \ No newline at end of file diff --git a/configs/egov-zuul/pre-hook.json b/configs/egov-zuul/pre-hook.json new file mode 100644 index 00000000..ee0ed854 --- /dev/null +++ b/configs/egov-zuul/pre-hook.json @@ -0,0 +1,3 @@ +{ + "/pg-service/transaction/v1/_create": "http://rainmaker-custom-service:8000/customization/protected/punjab-pt/pre-hook/pg-service/transaction/v1/_create" +} \ No newline at end of file diff --git a/configs/monitoring-dashboards/kube-cluster-dashboard.json b/configs/monitoring-dashboards/kube-cluster-dashboard.json new file mode 100644 index 00000000..94872619 --- /dev/null +++ b/configs/monitoring-dashboards/kube-cluster-dashboard.json @@ -0,0 +1,6024 @@ +{ + "annotations": { + "list": [ + { + "builtIn": 1, + "datasource": "-- Grafana --", + "enable": true, + "hide": true, + "iconColor": "rgba(0, 211, 255, 1)", + "name": "Annotations & Alerts", + "type": "dashboard" + } + ] + }, + "description": "This dashboard can help troubleshooting issue in k8s cluster at cluster, node and namespace level.", + "editable": true, + "gnetId": 11802, + "graphTooltip": 0, + "iteration": 1597248957829, + "links": [], + "panels": [ + { + "collapsed": true, + "datasource": "Prometheus", + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 0 + }, + "id": 37, + "panels": [ + { + "cacheTimeout": null, + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {}, + "mappings": [], + "noValue": "N/A", + "nullValueMode": "connected", + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + } + ] + }, + "unit": "s" + }, + "overrides": [] + }, + "gridPos": { + "h": 3, + "w": 5, + "x": 0, + "y": 1 + }, + "id": 98, + "interval": null, + "links": [], + "maxDataPoints": 100, + "options": { + "colorMode": "value", + "fieldOptions": { + "calcs": [ + "lastNotNull" + ] + }, + "graphMode": "none", + "justifyMode": "auto", + "orientation": "horizontal", + "reduceOptions": { + "calcs": [ + "mean" + ], + "fields": "", + "values": false + } + }, + "pluginVersion": "7.0.5", + "targets": [ + { + "expr": "sum(time() - kube_service_created{namespace=\"default\",service=\"kubernetes\"})", + "hide": false, + "instant": true, + "interval": "", + "legendFormat": "", + "refId": "B" + } + ], + "timeFrom": null, + "timeShift": null, + "title": "Cluster age", + "transformations": [], + "transparent": true, + "type": "stat" + }, + { + "cacheTimeout": null, + "colorBackground": false, + "colorValue": false, + "colors": [ + "#299c46", + "#37872D", + "#d44a3a" + ], + "datasource": "Prometheus", + "description": "", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, + "gridPos": { + "h": 3, + "w": 3, + "x": 5, + "y": 1 + }, + "id": 131, + "interval": null, + "links": [], + "mappingType": 1, + "mappingTypes": [ + { + "name": "value to text", + "value": 1 + }, + { + "name": "range to text", + "value": 2 + } + ], + "maxDataPoints": 100, + "nullPointMode": "connected", + "nullText": null, + "postfix": "", + "postfixFontSize": "50%", + "prefix": "", + "prefixFontSize": "50%", + "rangeMaps": [ + { + "from": "null", + "text": "N/A", + "to": "null" + } + ], + "sparkline": { + "fillColor": "rgba(31, 118, 189, 0.18)", + "full": false, + "lineColor": "rgb(31, 120, 193)", + "show": true, + "ymax": null, + "ymin": null + }, + "tableColumn": "", + "targets": [ + { + "expr": " count(kube_namespace_created)", + "hide": false, + "instant": false, + "interval": "", + "legendFormat": "{{pod}}", + "refId": "A" + }, + { + "expr": "", + "hide": true, + "refId": "B" + } + ], + "thresholds": "", + "timeFrom": null, + "timeShift": null, + "title": "Namespaces ", + "transparent": true, + "type": "singlestat", + "valueFontSize": "80%", + "valueMaps": [ + { + "op": "=", + "text": "N/A", + "value": "null" + } + ], + "valueName": "current" + }, + { + "cacheTimeout": null, + "colorBackground": false, + "colorValue": false, + "colors": [ + "#299c46", + "#37872D", + "#d44a3a" + ], + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, + "gridPos": { + "h": 3, + "w": 3, + "x": 8, + "y": 1 + }, + "id": 76, + "interval": null, + "links": [], + "mappingType": 1, + "mappingTypes": [ + { + "name": "value to text", + "value": 1 + }, + { + "name": "range to text", + "value": 2 + } + ], + "maxDataPoints": 100, + "nullPointMode": "connected", + "nullText": null, + "postfix": "", + "postfixFontSize": "50%", + "prefix": "", + "prefixFontSize": "50%", + "rangeMaps": [ + { + "from": "null", + "text": "N/A", + "to": "null" + } + ], + "sparkline": { + "fillColor": "rgba(31, 118, 189, 0.18)", + "full": false, + "lineColor": "rgb(31, 120, 193)", + "show": true, + "ymax": null, + "ymin": null + }, + "tableColumn": "", + "targets": [ + { + "expr": " count(count by (pod)(container_spec_memory_reservation_limit_bytes{pod!=\"\"}))", + "hide": false, + "instant": false, + "legendFormat": "{{pod}}", + "refId": "A" + }, + { + "expr": "", + "hide": true, + "refId": "B" + } + ], + "thresholds": "", + "timeFrom": null, + "timeShift": null, + "title": "Total pods", + "transparent": true, + "type": "singlestat", + "valueFontSize": "80%", + "valueMaps": [ + { + "op": "=", + "text": "N/A", + "value": "null" + } + ], + "valueName": "current" + }, + { + "cacheTimeout": null, + "colorBackground": false, + "colorValue": true, + "colors": [ + "#299c46", + "#37872D", + "#d44a3a" + ], + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, + "gridPos": { + "h": 3, + "w": 3, + "x": 11, + "y": 1 + }, + "id": 60, + "interval": null, + "links": [], + "mappingType": 1, + "mappingTypes": [ + { + "name": "value to text", + "value": 1 + }, + { + "name": "range to text", + "value": 2 + } + ], + "maxDataPoints": 100, + "nullPointMode": "connected", + "nullText": null, + "postfix": "", + "postfixFontSize": "50%", + "prefix": "", + "prefixFontSize": "50%", + "rangeMaps": [ + { + "from": "null", + "text": "N/A", + "to": "null" + } + ], + "sparkline": { + "fillColor": "rgba(31, 118, 189, 0.18)", + "full": false, + "lineColor": "rgb(31, 120, 193)", + "show": true, + "ymax": null, + "ymin": null + }, + "tableColumn": "", + "targets": [ + { + "expr": "count(kube_pod_container_status_waiting !=0 ) or vector(0)", + "hide": false, + "instant": false, + "interval": "", + "legendFormat": "{{pod}}", + "refId": "A" + }, + { + "expr": "", + "hide": true, + "refId": "B" + } + ], + "thresholds": "0,1", + "timeFrom": null, + "timeShift": null, + "title": "Waiting pods", + "transparent": true, + "type": "singlestat", + "valueFontSize": "80%", + "valueMaps": [ + { + "op": "=", + "text": "N/A", + "value": "null" + } + ], + "valueName": "current" + }, + { + "cacheTimeout": null, + "colorBackground": false, + "colorValue": true, + "colors": [ + "#299c46", + "#37872D", + "#d44a3a" + ], + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, + "gridPos": { + "h": 3, + "w": 3, + "x": 14, + "y": 1 + }, + "id": 61, + "interval": null, + "links": [], + "mappingType": 1, + "mappingTypes": [ + { + "name": "value to text", + "value": 1 + }, + { + "name": "range to text", + "value": 2 + } + ], + "maxDataPoints": 100, + "nullPointMode": "connected", + "nullText": null, + "postfix": "", + "postfixFontSize": "50%", + "prefix": "", + "prefixFontSize": "50%", + "rangeMaps": [ + { + "from": "null", + "text": "N/A", + "to": "null" + } + ], + "sparkline": { + "fillColor": "rgba(31, 118, 189, 0.18)", + "full": false, + "lineColor": "rgb(31, 120, 193)", + "show": true, + "ymax": null, + "ymin": null + }, + "tableColumn": "", + "targets": [ + { + "expr": "count(kube_pod_container_status_terminated_reason{reason!=\"Completed\"} !=0 ) or vector(0)", + "hide": false, + "instant": false, + "legendFormat": "{{pod}}", + "refId": "A" + }, + { + "expr": "", + "hide": true, + "refId": "B" + } + ], + "thresholds": "0,1", + "timeFrom": null, + "timeShift": null, + "title": "Terminated pods", + "transparent": true, + "type": "singlestat", + "valueFontSize": "80%", + "valueMaps": [ + { + "op": "=", + "text": "N/A", + "value": "null" + } + ], + "valueName": "current" + }, + { + "cacheTimeout": null, + "colorBackground": false, + "colorValue": false, + "colors": [ + "#299c46", + "#37872D", + "#d44a3a" + ], + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, + "gridPos": { + "h": 3, + "w": 3, + "x": 17, + "y": 1 + }, + "id": 74, + "interval": null, + "links": [], + "mappingType": 1, + "mappingTypes": [ + { + "name": "value to text", + "value": 1 + }, + { + "name": "range to text", + "value": 2 + } + ], + "maxDataPoints": 100, + "nullPointMode": "connected", + "nullText": null, + "postfix": "", + "postfixFontSize": "50%", + "prefix": "", + "prefixFontSize": "50%", + "rangeMaps": [ + { + "from": "null", + "text": "N/A", + "to": "null" + } + ], + "sparkline": { + "fillColor": "rgba(31, 118, 189, 0.18)", + "full": false, + "lineColor": "rgb(31, 120, 193)", + "show": true, + "ymax": null, + "ymin": null + }, + "tableColumn": "", + "targets": [ + { + "expr": "sum(count by (pod)(container_spec_memory_reservation_limit_bytes{id=~\".*.burstable.*\",id!~\".*.scope\",pod!=\"\"}))", + "hide": false, + "instant": false, + "interval": "", + "legendFormat": "{{pod}}", + "refId": "A" + }, + { + "expr": "", + "hide": true, + "refId": "B" + } + ], + "thresholds": "0,1", + "timeFrom": null, + "timeShift": null, + "title": "burstable pods", + "transparent": true, + "type": "singlestat", + "valueFontSize": "80%", + "valueMaps": [ + { + "op": "=", + "text": "N/A", + "value": "null" + } + ], + "valueName": "current" + }, + { + "cacheTimeout": null, + "colorBackground": false, + "colorValue": false, + "colors": [ + "#299c46", + "#37872D", + "#d44a3a" + ], + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, + "gridPos": { + "h": 3, + "w": 2, + "x": 20, + "y": 1 + }, + "id": 73, + "interval": null, + "links": [], + "mappingType": 1, + "mappingTypes": [ + { + "name": "value to text", + "value": 1 + }, + { + "name": "range to text", + "value": 2 + } + ], + "maxDataPoints": 100, + "nullPointMode": "connected", + "nullText": null, + "postfix": "", + "postfixFontSize": "50%", + "prefix": "", + "prefixFontSize": "50%", + "rangeMaps": [ + { + "from": "null", + "text": "N/A", + "to": "null" + } + ], + "sparkline": { + "fillColor": "rgba(31, 118, 189, 0.18)", + "full": false, + "lineColor": "rgb(31, 120, 193)", + "show": true, + "ymax": null, + "ymin": null + }, + "tableColumn": "", + "targets": [ + { + "expr": "count(count by (pod)(container_spec_memory_reservation_limit_bytes{id=~\".*.besteffort.*\",id!~\".*.scope\",pod!=\"\"}))", + "hide": false, + "instant": false, + "interval": "", + "legendFormat": "{{pod}}", + "refId": "A" + }, + { + "expr": "", + "hide": true, + "refId": "B" + } + ], + "thresholds": "0,1", + "timeFrom": null, + "timeShift": null, + "title": "Besteffort pods", + "transparent": true, + "type": "singlestat", + "valueFontSize": "80%", + "valueMaps": [ + { + "op": "=", + "text": "N/A", + "value": "null" + } + ], + "valueName": "current" + }, + { + "cacheTimeout": null, + "colorBackground": false, + "colorValue": false, + "colors": [ + "#299c46", + "#37872D", + "#d44a3a" + ], + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, + "gridPos": { + "h": 3, + "w": 2, + "x": 22, + "y": 1 + }, + "id": 59, + "interval": null, + "links": [], + "mappingType": 1, + "mappingTypes": [ + { + "name": "value to text", + "value": 1 + }, + { + "name": "range to text", + "value": 2 + } + ], + "maxDataPoints": 100, + "nullPointMode": "connected", + "nullText": null, + "postfix": "", + "postfixFontSize": "50%", + "prefix": "", + "prefixFontSize": "50%", + "rangeMaps": [ + { + "from": "null", + "text": "N/A", + "to": "null" + } + ], + "sparkline": { + "fillColor": "rgba(31, 118, 189, 0.18)", + "full": false, + "lineColor": "rgb(31, 120, 193)", + "show": false, + "ymax": null, + "ymin": null + }, + "tableColumn": "", + "targets": [ + { + "expr": "count(kube_persistentvolumeclaim_info) ", + "hide": false, + "instant": false, + "legendFormat": "{{pod}}", + "refId": "A" + }, + { + "expr": "", + "hide": true, + "refId": "B" + } + ], + "thresholds": "0", + "timeFrom": null, + "timeShift": null, + "title": "PVCs", + "transparent": true, + "type": "singlestat", + "valueFontSize": "80%", + "valueMaps": [ + { + "op": "=", + "text": "N/A", + "value": "null" + } + ], + "valueName": "current" + }, + { + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": { + "align": null + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [ + { + "matcher": { + "id": "byName", + "options": "osVersion" + }, + "properties": [ + { + "id": "custom.width", + "value": 360 + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "Docker version" + }, + "properties": [ + { + "id": "custom.width", + "value": 120 + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "Node name" + }, + "properties": [ + { + "id": "custom.width", + "value": 213 + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "No. of pods" + }, + "properties": [ + { + "id": "custom.width", + "value": 104 + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "dockerVersion" + }, + "properties": [ + { + "id": "custom.width", + "value": 123 + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "instance" + }, + "properties": [ + { + "id": "custom.width", + "value": 147 + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "Memory used" + }, + "properties": [ + { + "id": "custom.width", + "value": 109 + }, + { + "id": "unit", + "value": "percentunit" + }, + { + "id": "thresholds", + "value": { + "mode": "percentage", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + { + "id": "custom.displayMode", + "value": "lcd-gauge" + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "kernelVersion" + }, + "properties": [ + { + "id": "custom.width", + "value": 140 + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "node" + }, + "properties": [ + { + "id": "custom.width", + "value": 204 + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "Pod capacity used" + }, + "properties": [ + { + "id": "custom.width", + "value": 142 + }, + { + "id": "unit", + "value": "none" + }, + { + "id": "custom.displayMode", + "value": "auto" + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "CPU usage" + }, + "properties": [ + { + "id": "custom.width", + "value": 91 + }, + { + "id": "unit", + "value": "percentunit" + }, + { + "id": "thresholds", + "value": { + "mode": "percentage", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + { + "id": "custom.displayMode", + "value": "lcd-gauge" + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "K8s version" + }, + "properties": [ + { + "id": "custom.width", + "value": 105 + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "OS version" + }, + "properties": [ + { + "id": "custom.width", + "value": 178 + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "pod_cidr" + }, + "properties": [ + { + "id": "custom.width", + "value": 122 + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "Kernel version" + }, + "properties": [ + { + "id": "custom.width", + "value": 122 + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "Pod count" + }, + "properties": [ + { + "id": "custom.width", + "value": 88 + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "role" + }, + "properties": [ + { + "id": "custom.width", + "value": 72 + } + ] + } + ] + }, + "gridPos": { + "h": 10, + "w": 8, + "x": 0, + "y": 4 + }, + "id": 64, + "options": { + "angular": { + "decimals": 0, + "defaultColor": "#37872D", + "format": "none", + "linkIndex": "0", + "linkVars": [], + "mathColorValue": "data[end]", + "mathDisplayValue": "data[end]", + "mathScratchPad": "data = size(data)[1] == 0 ? [NaN] : data", + "options": {}, + "radius": "25px", + "thresholds": [ + { + "color": "#37872D", + "value": "1" + }, + { + "color": "#C4162A", + "value": "0" + } + ] + }, + "frameIndex": 0, + "showHeader": true + }, + "pluginVersion": "7.0.5", + "targets": [ + { + "expr": "kube_node_info", + "format": "table", + "hide": false, + "instant": true, + "interval": "", + "legendFormat": "{{node}}", + "refId": "A" + }, + { + "expr": " (count by (node)(container_spec_memory_reservation_limit_bytes{pod!=\"\"}))", + "format": "table", + "hide": false, + "instant": true, + "interval": "", + "legendFormat": "", + "refId": "B" + }, + { + "expr": "((label_replace((node_memory_MemTotal_bytes + on(instance) group_left(nodename) \nnode_uname_info),\"node\",\"$1\",\"nodename\", \"(.+)\")) - (label_replace((node_memory_MemAvailable_bytes + on(instance) group_left(nodename) \nnode_uname_info),\"node\",\"$1\",\"nodename\", \"(.+)\"))) / (label_replace((node_memory_MemTotal_bytes + on(instance) group_left(nodename) \nnode_uname_info),\"node\",\"$1\",\"nodename\", \"(.+)\")) ", + "format": "table", + "instant": true, + "interval": "", + "legendFormat": "", + "refId": "C" + }, + { + "expr": "max\n by(node) (max by(instance) (kubelet_running_pod_count{job=\"kubelet\",metrics_path=\"/metrics\"})\n * on(instance) group_left(node) kubelet_node_name{job=\"kubelet\",metrics_path=\"/metrics\"})\n", + "format": "table", + "instant": true, + "interval": "", + "legendFormat": "", + "refId": "D" + }, + { + "expr": "sum by (node)(label_replace(instance:node_cpu:ratio + on(instance) group_left(nodename) \nnode_uname_info,\"node\",\"$1\",\"nodename\", \"(.+)\") ) / sum by (node)(kube_node_status_capacity{resource=\"cpu\"})", + "format": "table", + "instant": true, + "interval": "", + "legendFormat": "", + "refId": "E" + }, + { + "expr": "kube_node_role", + "format": "table", + "interval": "", + "legendFormat": "", + "refId": "F" + } + ], + "timeFrom": null, + "timeShift": null, + "title": "cluster node details", + "transformations": [ + { + "id": "filterFieldsByName", + "options": { + "include": { + "names": [ + "container_runtime_version", + "kernel_version", + "kubelet_version", + "node", + "os_image", + "pod_cidr", + "provider_id", + "Value #C", + "Value #D", + "Value #E", + "role" + ] + } + } + }, + { + "id": "seriesToColumns", + "options": { + "byField": "node" + } + }, + { + "id": "organize", + "options": { + "excludeByName": {}, + "indexByName": { + "Value #C": 2, + "Value #D": 4, + "Value #E": 3, + "container_runtime_version": 9, + "kernel_version": 7, + "kubelet_version": 5, + "node": 0, + "os_image": 8, + "pod_cidr": 6, + "provider_id": 10, + "role": 1 + }, + "renameByName": { + "Value #C": "Memory used", + "Value #D": "Pod count", + "Value #E": "CPU usage", + "container_runtime_version": "Docker version", + "kernel_version": "Kernel version", + "kubelet_version": "K8s version", + "node": "Node name", + "os_image": "OS version", + "provider_id": "" + } + } + } + ], + "transparent": true, + "type": "table" + }, + { + "aliasColors": {}, + "bars": false, + "cacheTimeout": null, + "dashLength": 10, + "dashes": false, + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fill": 0, + "fillGradient": 0, + "gridPos": { + "h": 10, + "w": 8, + "x": 8, + "y": 4 + }, + "hiddenSeries": false, + "id": 68, + "legend": { + "avg": false, + "current": false, + "hideEmpty": true, + "hideZero": true, + "max": true, + "min": false, + "show": true, + "total": false, + "values": true + }, + "lines": true, + "linewidth": 1, + "links": [], + "nullPointMode": "null", + "options": { + "dataLinks": [] + }, + "percentage": false, + "pluginVersion": "6.5.2", + "pointradius": 2, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "sort(sum by (node)(container_memory_usage_bytes{pod!=\"POD\",namespace!=\"\"}))", + "hide": true, + "legendFormat": "{{node}}", + "refId": "A" + }, + { + "expr": "(sum by (namespace)(container_memory_usage_bytes{pod!=\"POD\",namespace!=\"\"}))", + "legendFormat": "{{namespace}}", + "refId": "B" + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "Memory usage by namespace in cluster", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "transparent": true, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "decbytes", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, + { + "aliasColors": {}, + "bars": false, + "cacheTimeout": null, + "dashLength": 10, + "dashes": false, + "datasource": "Prometheus", + "description": "", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fill": 0, + "fillGradient": 0, + "gridPos": { + "h": 9, + "w": 8, + "x": 16, + "y": 4 + }, + "hiddenSeries": false, + "id": 121, + "legend": { + "avg": false, + "current": false, + "hideEmpty": true, + "hideZero": false, + "max": false, + "min": false, + "rightSide": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "links": [], + "nullPointMode": "null as zero", + "options": { + "dataLinks": [] + }, + "percentage": false, + "pluginVersion": "6.5.2", + "pointradius": 2, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": " histogram_quantile(0.99,\n sum by(instance, le) (rate(kubelet_pod_worker_duration_seconds_bucket{job=\"kubelet\",metrics_path=\"/metrics\"}[10m])))\n * on(instance) group_left(node) kubelet_node_name{job=\"kubelet\",metrics_path=\"/metrics\"}", + "instant": false, + "interval": "", + "legendFormat": "{{node}} ", + "refId": "A" + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "Pod startup latency", + "tooltip": { + "shared": true, + "sort": 2, + "value_type": "individual" + }, + "transparent": true, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "decimals": null, + "format": "s", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": false + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + } + ], + "title": "Overall cluster status", + "type": "row" + }, + { + "collapsed": true, + "datasource": null, + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 1 + }, + "id": 140, + "panels": [ + { + "datasource": null, + "fieldConfig": { + "defaults": { + "custom": { + "align": "center" + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [ + { + "matcher": { + "id": "byName", + "options": "Lag" + }, + "properties": [ + { + "id": "custom.displayMode", + "value": "color-text" + } + ] + } + ] + }, + "gridPos": { + "h": 8, + "w": 12, + "x": 0, + "y": 2 + }, + "id": 137, + "options": { + "frameIndex": 1, + "showHeader": true, + "sortBy": [ + { + "desc": true, + "displayName": "Value #B" + } + ] + }, + "pluginVersion": "7.0.5", + "targets": [ + { + "expr": "sort_desc(sum(kafka_consumergroup_lag_sum) by (consumergroup, topic))", + "format": "table", + "instant": true, + "interval": "", + "legendFormat": "Lag", + "refId": "A" + } + ], + "timeFrom": null, + "timeShift": null, + "title": "Consumer Group Lag", + "transformations": [ + { + "id": "organize", + "options": { + "excludeByName": { + "Time": true, + "__name__": true, + "consumergroup": false, + "endpoint": true, + "instance": true, + "job": true, + "namespace": true, + "pod": true, + "service": true + }, + "indexByName": {}, + "renameByName": { + "Value": "Lag", + "consumergroup": "", + "topic": "" + } + } + }, + { + "id": "organize", + "options": {} + } + ], + "type": "table" + }, + { + "datasource": null, + "fieldConfig": { + "defaults": { + "custom": { + "align": "center" + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 12, + "x": 12, + "y": 2 + }, + "id": 138, + "options": { + "frameIndex": 1, + "showHeader": true, + "sortBy": [] + }, + "pluginVersion": "7.0.5", + "targets": [ + { + "expr": "sort_desc(sum(delta(kafka_consumergroup_current_offset[10m])) by (consumergroup, topic))", + "format": "table", + "instant": true, + "interval": "", + "legendFormat": "Lag", + "refId": "A" + } + ], + "timeFrom": null, + "timeShift": null, + "title": "Consumption Rate", + "transformations": [ + { + "id": "organize", + "options": { + "excludeByName": { + "Time": true, + "__name__": true, + "consumergroup": false, + "endpoint": true, + "instance": true, + "job": true, + "namespace": true, + "pod": true, + "service": true + }, + "indexByName": {}, + "renameByName": { + "Value": "Messages/5min", + "consumergroup": "", + "topic": "" + } + } + }, + { + "id": "organize", + "options": {} + } + ], + "type": "table" + }, + { + "datasource": null, + "fieldConfig": { + "defaults": { + "custom": { + "align": "center" + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [ + { + "matcher": { + "id": "byName", + "options": "Dead Letters" + }, + "properties": [ + { + "id": "custom.displayMode", + "value": "color-text" + } + ] + } + ] + }, + "gridPos": { + "h": 9, + "w": 12, + "x": 0, + "y": 10 + }, + "id": 143, + "options": { + "frameIndex": 1, + "showHeader": true, + "sortBy": [ + { + "desc": true, + "displayName": "Value #B" + } + ] + }, + "pluginVersion": "7.0.5", + "targets": [ + { + "expr": "sort_desc(sum(kafka_topic_partition_current_offset{topic=~\".*deadletter\"}) by (topic))", + "format": "table", + "instant": true, + "interval": "", + "legendFormat": "Lag", + "refId": "A" + } + ], + "timeFrom": null, + "timeShift": null, + "title": "Dead Letters", + "transformations": [ + { + "id": "organize", + "options": { + "excludeByName": { + "Time": true, + "__name__": true, + "consumergroup": false, + "endpoint": true, + "instance": true, + "job": true, + "namespace": true, + "pod": true, + "service": true + }, + "indexByName": {}, + "renameByName": { + "Value": "Dead Letters", + "consumergroup": "", + "topic": "" + } + } + }, + { + "id": "organize", + "options": {} + } + ], + "type": "table" + }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fill": 0, + "fillGradient": 0, + "gridPos": { + "h": 9, + "w": 12, + "x": 12, + "y": 10 + }, + "hiddenSeries": false, + "id": 142, + "legend": { + "alignAsTable": true, + "avg": false, + "current": false, + "max": false, + "min": false, + "rightSide": false, + "show": true, + "sideWidth": 480, + "sort": "current", + "sortDesc": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "links": [], + "nullPointMode": "connected", + "options": { + "dataLinks": [] + }, + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "sum(kafka_consumergroup_current_offset) by (consumergroup, topic)", + "format": "time_series", + "interval": "", + "intervalFactor": 1, + "legendFormat": "{{consumergroup}} (topic: {{topic}})", + "refId": "A" + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "Message Consumption", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "$$hashKey": "object:169", + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "$$hashKey": "object:170", + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + } + ], + "title": "Kafka Consumer Groups", + "type": "row" + }, + { + "collapsed": true, + "datasource": null, + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 2 + }, + "id": 135, + "panels": [ + { + "cacheTimeout": null, + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": { + "align": "left" + }, + "mappings": [ + { + "id": 0, + "op": "=", + "text": "0", + "type": 1, + "value": "null" + } + ], + "nullValueMode": "connected", + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "#299c46", + "value": null + }, + { + "color": "#37872D", + "value": 0 + }, + { + "color": "#d44a3a" + } + ] + }, + "unit": "percentunit" + }, + "overrides": [] + }, + "gridPos": { + "h": 6, + "w": 10, + "x": 0, + "y": 2 + }, + "id": 133, + "interval": null, + "links": [], + "maxDataPoints": 100, + "options": { + "displayMode": "lcd", + "orientation": "horizontal", + "reduceOptions": { + "calcs": [ + "mean" + ], + "fields": "", + "values": false + }, + "showUnfilled": true + }, + "pluginVersion": "7.0.5", + "targets": [ + { + "expr": "kubelet_volume_stats_available_bytes{job=\"kubelet\",metrics_path=\"/metrics\",namespace=\"$namespace\"}\n / kubelet_volume_stats_capacity_bytes{job=\"kubelet\",metrics_path=\"/metrics\",namespace=\"$namespace\"}\n ", + "format": "time_series", + "hide": false, + "instant": true, + "interval": "", + "legendFormat": "{{persistentvolumeclaim}}", + "refId": "A" + }, + { + "expr": "", + "hide": true, + "refId": "B" + } + ], + "timeFrom": null, + "timeShift": null, + "title": "PVCs available capacity in namespacee $namespace", + "transparent": true, + "type": "bargauge" + }, + { + "aliasColors": { + "ReadOnly::k8s-aboutmckinsey-intranet-aboutmckinsey-prod-pvc-0::intranet-aboutmckinsey-prod-85c4d8fcd6-cq4vv": "dark-red", + "Total": "dark-red" + }, + "bars": false, + "cacheTimeout": null, + "dashLength": 10, + "dashes": false, + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fill": 0, + "fillGradient": 0, + "gridPos": { + "h": 6, + "w": 10, + "x": 10, + "y": 2 + }, + "hiddenSeries": false, + "id": 50, + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, + "rightSide": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "links": [], + "nullPointMode": "null", + "options": { + "dataLinks": [] + }, + "percentage": false, + "pointradius": 2, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "(kube_persistentvolumeclaim_access_mode{namespace=\"$namespace\"})", + "format": "time_series", + "hide": false, + "legendFormat": "{{access_mode}}::{{persistentvolumeclaim}}", + "refId": "B" + }, + { + "expr": "kube_persistentvolumeclaim_status_phase{namespace=\"$namespace\",phase=\"Bound\"}", + "legendFormat": "Bound::{{persistentvolumeclaim}}", + "refId": "A" + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "persistentvolumeclaim status in namespace $namespace", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "transparent": true, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "none", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": false + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, + { + "cacheTimeout": null, + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {}, + "mappings": [ + { + "id": 0, + "op": "=", + "text": "0", + "type": 1, + "value": "null" + } + ], + "nullValueMode": "connected", + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "#299c46", + "value": null + }, + { + "color": "#37872D", + "value": 0 + }, + { + "color": "#d44a3a" + } + ] + }, + "unit": "none" + }, + "overrides": [] + }, + "gridPos": { + "h": 6, + "w": 2, + "x": 20, + "y": 2 + }, + "id": 106, + "interval": null, + "links": [], + "maxDataPoints": 100, + "options": { + "colorMode": "value", + "fieldOptions": { + "calcs": [ + "lastNotNull" + ] + }, + "graphMode": "none", + "justifyMode": "auto", + "orientation": "horizontal", + "reduceOptions": { + "calcs": [ + "mean" + ], + "fields": "", + "values": true + } + }, + "pluginVersion": "7.0.5", + "targets": [ + { + "expr": "count(kube_persistentvolume_status_phase{job=\"kube-state-metrics\",phase=\"Failed\",namespace=\"$namespace\"} != 0) ", + "hide": false, + "instant": true, + "interval": "", + "legendFormat": "", + "refId": "A" + } + ], + "timeFrom": null, + "timeShift": null, + "title": "PVCs Failed", + "transparent": true, + "type": "stat" + }, + { + "cacheTimeout": null, + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {}, + "mappings": [ + { + "id": 0, + "op": "=", + "text": "0", + "type": 1, + "value": "null" + } + ], + "nullValueMode": "connected", + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "#299c46", + "value": null + }, + { + "color": "#37872D", + "value": 0 + }, + { + "color": "#d44a3a" + } + ] + }, + "unit": "none" + }, + "overrides": [] + }, + "gridPos": { + "h": 6, + "w": 2, + "x": 22, + "y": 2 + }, + "id": 107, + "interval": null, + "links": [], + "maxDataPoints": 100, + "options": { + "colorMode": "value", + "fieldOptions": { + "calcs": [ + "lastNotNull" + ] + }, + "graphMode": "none", + "justifyMode": "auto", + "orientation": "horizontal", + "reduceOptions": { + "calcs": [ + "mean" + ], + "fields": "", + "values": true + } + }, + "pluginVersion": "7.0.5", + "targets": [ + { + "expr": "count(kube_persistentvolume_status_phase{job=\"kube-state-metrics\",phase=\"Pending\",namespace=\"$namespace\"} != 0)", + "hide": false, + "instant": true, + "interval": "", + "legendFormat": "", + "refId": "A" + } + ], + "timeFrom": null, + "timeShift": null, + "title": "PVCs Pending", + "transparent": true, + "type": "stat" + } + ], + "title": "Persistence Volumes", + "type": "row" + }, + { + "collapsed": true, + "datasource": "Prometheus", + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 3 + }, + "id": 41, + "panels": [ + { + "cacheTimeout": null, + "colorBackground": false, + "colorValue": false, + "colors": [ + "#299c46", + "#37872D", + "#d44a3a" + ], + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, + "gridPos": { + "h": 3, + "w": 3, + "x": 0, + "y": 21 + }, + "id": 53, + "interval": null, + "links": [], + "mappingType": 1, + "mappingTypes": [ + { + "name": "value to text", + "value": 1 + }, + { + "name": "range to text", + "value": 2 + } + ], + "maxDataPoints": 100, + "nullPointMode": "connected", + "nullText": null, + "postfix": "", + "postfixFontSize": "50%", + "prefix": "", + "prefixFontSize": "50%", + "rangeMaps": [ + { + "from": "null", + "text": "N/A", + "to": "null" + } + ], + "sparkline": { + "fillColor": "rgba(31, 118, 189, 0.18)", + "full": false, + "lineColor": "rgb(31, 120, 193)", + "show": true, + "ymax": null, + "ymin": null + }, + "tableColumn": "", + "targets": [ + { + "expr": "count(kube_deployment_created{namespace=\"$namespace\"})", + "hide": false, + "instant": false, + "legendFormat": "{{deployment}}", + "refId": "A" + }, + { + "expr": "", + "hide": true, + "refId": "B" + } + ], + "thresholds": "0,1", + "timeFrom": null, + "timeShift": null, + "title": "Deployments", + "transparent": true, + "type": "singlestat", + "valueFontSize": "80%", + "valueMaps": [ + { + "op": "=", + "text": "N/A", + "value": "null" + } + ], + "valueName": "current" + }, + { + "cacheTimeout": null, + "colorBackground": false, + "colorValue": false, + "colors": [ + "#299c46", + "rgba(237, 129, 40, 0.89)", + "#d44a3a" + ], + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, + "gridPos": { + "h": 3, + "w": 3, + "x": 3, + "y": 21 + }, + "id": 44, + "interval": null, + "links": [], + "mappingType": 1, + "mappingTypes": [ + { + "name": "value to text", + "value": 1 + }, + { + "name": "range to text", + "value": 2 + } + ], + "maxDataPoints": 100, + "nullPointMode": "connected", + "nullText": null, + "postfix": "", + "postfixFontSize": "50%", + "prefix": "", + "prefixFontSize": "50%", + "rangeMaps": [ + { + "from": "null", + "text": "N/A", + "to": "null" + } + ], + "sparkline": { + "fillColor": "rgba(31, 118, 189, 0.18)", + "full": false, + "lineColor": "rgb(31, 120, 193)", + "show": true, + "ymax": null, + "ymin": null + }, + "tableColumn": "", + "targets": [ + { + "expr": "count(kube_pod_container_status_ready{namespace=\"$namespace\"} !=0 ) or vector(0)", + "hide": false, + "instant": false, + "interval": "", + "legendFormat": "{{pod}}", + "refId": "A" + }, + { + "expr": "", + "hide": true, + "refId": "B" + } + ], + "thresholds": "", + "timeFrom": null, + "timeShift": null, + "title": "Ready pods", + "transparent": true, + "type": "singlestat", + "valueFontSize": "80%", + "valueMaps": [ + { + "op": "=", + "text": "N/A", + "value": "null" + } + ], + "valueName": "current" + }, + { + "cacheTimeout": null, + "colorBackground": false, + "colorValue": true, + "colors": [ + "#299c46", + "#37872D", + "#d44a3a" + ], + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, + "gridPos": { + "h": 3, + "w": 3, + "x": 6, + "y": 21 + }, + "id": 42, + "interval": null, + "links": [], + "mappingType": 1, + "mappingTypes": [ + { + "name": "value to text", + "value": 1 + }, + { + "name": "range to text", + "value": 2 + } + ], + "maxDataPoints": 100, + "nullPointMode": "connected", + "nullText": null, + "postfix": "", + "postfixFontSize": "50%", + "prefix": "", + "prefixFontSize": "50%", + "rangeMaps": [ + { + "from": "null", + "text": "N/A", + "to": "null" + } + ], + "sparkline": { + "fillColor": "rgba(31, 118, 189, 0.18)", + "full": false, + "lineColor": "rgb(31, 120, 193)", + "show": true, + "ymax": null, + "ymin": null + }, + "tableColumn": "", + "targets": [ + { + "expr": "count(kube_pod_container_status_terminated{namespace=\"$namespace\"} !=0 ) or vector(0)", + "hide": false, + "instant": false, + "legendFormat": "{{pod}}", + "refId": "A" + }, + { + "expr": "", + "hide": true, + "refId": "B" + } + ], + "thresholds": "0,1", + "timeFrom": null, + "timeShift": null, + "title": "Terminated pods", + "transparent": true, + "type": "singlestat", + "valueFontSize": "80%", + "valueMaps": [ + { + "op": "=", + "text": "N/A", + "value": "null" + } + ], + "valueName": "current" + }, + { + "cacheTimeout": null, + "colorBackground": false, + "colorValue": true, + "colors": [ + "#299c46", + "#37872D", + "#d44a3a" + ], + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, + "gridPos": { + "h": 3, + "w": 3, + "x": 9, + "y": 21 + }, + "id": 45, + "interval": null, + "links": [], + "mappingType": 1, + "mappingTypes": [ + { + "name": "value to text", + "value": 1 + }, + { + "name": "range to text", + "value": 2 + } + ], + "maxDataPoints": 100, + "nullPointMode": "connected", + "nullText": null, + "postfix": "", + "postfixFontSize": "50%", + "prefix": "", + "prefixFontSize": "50%", + "rangeMaps": [ + { + "from": "null", + "text": "N/A", + "to": "null" + } + ], + "sparkline": { + "fillColor": "rgba(31, 118, 189, 0.18)", + "full": false, + "lineColor": "rgb(31, 120, 193)", + "show": true, + "ymax": null, + "ymin": null + }, + "tableColumn": "", + "targets": [ + { + "expr": "count(kube_pod_container_status_waiting{namespace=\"$namespace\"} !=0 ) or vector(0)", + "hide": false, + "instant": false, + "legendFormat": "{{pod}}", + "refId": "A" + }, + { + "expr": "", + "hide": true, + "refId": "B" + } + ], + "thresholds": "0,1", + "timeFrom": null, + "timeShift": null, + "title": "Waiting pods", + "transparent": true, + "type": "singlestat", + "valueFontSize": "80%", + "valueMaps": [ + { + "op": "=", + "text": "N/A", + "value": "null" + } + ], + "valueName": "current" + }, + { + "cacheTimeout": null, + "colorBackground": false, + "colorValue": false, + "colors": [ + "#299c46", + "#37872D", + "#d44a3a" + ], + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, + "gridPos": { + "h": 3, + "w": 3, + "x": 12, + "y": 21 + }, + "id": 92, + "interval": null, + "links": [], + "mappingType": 1, + "mappingTypes": [ + { + "name": "value to text", + "value": 1 + }, + { + "name": "range to text", + "value": 2 + } + ], + "maxDataPoints": 100, + "nullPointMode": "connected", + "nullText": null, + "postfix": "", + "postfixFontSize": "50%", + "prefix": "", + "prefixFontSize": "50%", + "rangeMaps": [ + { + "from": "null", + "text": "N/A", + "to": "null" + } + ], + "sparkline": { + "fillColor": "rgba(31, 118, 189, 0.18)", + "full": false, + "lineColor": "rgb(31, 120, 193)", + "show": true, + "ymax": null, + "ymin": null + }, + "tableColumn": "", + "targets": [ + { + "expr": "count(container_spec_memory_reservation_limit_bytes{namespace=\"$namespace\",container=\"POD\",id!~\".*.burstable.*|.*.besteffort.*\",id!~\".*.scope\",pod!=\"\"})", + "hide": false, + "instant": false, + "interval": "", + "legendFormat": "{{pod}}", + "refId": "A" + }, + { + "expr": "", + "hide": true, + "refId": "B" + } + ], + "thresholds": "0,1", + "timeFrom": null, + "timeShift": null, + "title": "Guaranteed pods", + "transparent": true, + "type": "singlestat", + "valueFontSize": "80%", + "valueMaps": [ + { + "op": "=", + "text": "N/A", + "value": "null" + } + ], + "valueName": "current" + }, + { + "cacheTimeout": null, + "colorBackground": false, + "colorValue": false, + "colors": [ + "#299c46", + "#37872D", + "#d44a3a" + ], + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, + "gridPos": { + "h": 3, + "w": 3, + "x": 15, + "y": 21 + }, + "id": 91, + "interval": null, + "links": [], + "mappingType": 1, + "mappingTypes": [ + { + "name": "value to text", + "value": 1 + }, + { + "name": "range to text", + "value": 2 + } + ], + "maxDataPoints": 100, + "nullPointMode": "connected", + "nullText": null, + "postfix": "", + "postfixFontSize": "50%", + "prefix": "", + "prefixFontSize": "50%", + "rangeMaps": [ + { + "from": "null", + "text": "N/A", + "to": "null" + } + ], + "sparkline": { + "fillColor": "rgba(31, 118, 189, 0.18)", + "full": false, + "lineColor": "rgb(31, 120, 193)", + "show": true, + "ymax": null, + "ymin": null + }, + "tableColumn": "", + "targets": [ + { + "expr": "sum(count by (pod)(container_spec_memory_reservation_limit_bytes{namespace=\"$namespace\",container=\"POD\"}))", + "hide": false, + "instant": false, + "interval": "", + "legendFormat": "", + "refId": "A" + }, + { + "expr": "", + "hide": true, + "refId": "B" + } + ], + "thresholds": "0,1", + "timeFrom": null, + "timeShift": null, + "title": "total pods", + "transparent": true, + "type": "singlestat", + "valueFontSize": "80%", + "valueMaps": [ + { + "op": "=", + "text": "N/A", + "value": "null" + } + ], + "valueName": "current" + }, + { + "cacheTimeout": null, + "colorBackground": false, + "colorValue": false, + "colors": [ + "#299c46", + "#37872D", + "#d44a3a" + ], + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, + "gridPos": { + "h": 3, + "w": 3, + "x": 18, + "y": 21 + }, + "id": 89, + "interval": null, + "links": [], + "mappingType": 1, + "mappingTypes": [ + { + "name": "value to text", + "value": 1 + }, + { + "name": "range to text", + "value": 2 + } + ], + "maxDataPoints": 100, + "nullPointMode": "connected", + "nullText": null, + "postfix": "", + "postfixFontSize": "50%", + "prefix": "", + "prefixFontSize": "50%", + "rangeMaps": [ + { + "from": "null", + "text": "N/A", + "to": "null" + } + ], + "sparkline": { + "fillColor": "rgba(31, 118, 189, 0.18)", + "full": false, + "lineColor": "rgb(31, 120, 193)", + "show": true, + "ymax": null, + "ymin": null + }, + "tableColumn": "", + "targets": [ + { + "expr": "count(count by (pod)(container_spec_memory_reservation_limit_bytes{id=~\".*.besteffort.*\",id!~\".*.scope\",pod!=\"\",namespace=\"$namespace\"}))", + "hide": false, + "instant": false, + "interval": "", + "legendFormat": "{{pod}}", + "refId": "A" + }, + { + "expr": "", + "hide": true, + "refId": "B" + } + ], + "thresholds": "0,1", + "timeFrom": null, + "timeShift": null, + "title": "Besteffort pods", + "transparent": true, + "type": "singlestat", + "valueFontSize": "80%", + "valueMaps": [ + { + "op": "=", + "text": "N/A", + "value": "null" + } + ], + "valueName": "current" + }, + { + "cacheTimeout": null, + "colorBackground": false, + "colorValue": false, + "colors": [ + "#299c46", + "#37872D", + "#d44a3a" + ], + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, + "gridPos": { + "h": 3, + "w": 3, + "x": 21, + "y": 21 + }, + "id": 94, + "interval": null, + "links": [], + "mappingType": 1, + "mappingTypes": [ + { + "name": "value to text", + "value": 1 + }, + { + "name": "range to text", + "value": 2 + } + ], + "maxDataPoints": 100, + "nullPointMode": "connected", + "nullText": null, + "postfix": "", + "postfixFontSize": "50%", + "prefix": "", + "prefixFontSize": "50%", + "rangeMaps": [ + { + "from": "null", + "text": "N/A", + "to": "null" + } + ], + "sparkline": { + "fillColor": "rgba(31, 118, 189, 0.18)", + "full": false, + "lineColor": "rgb(31, 120, 193)", + "show": true, + "ymax": null, + "ymin": null + }, + "tableColumn": "", + "targets": [ + { + "expr": "sum(count by (pod)(container_spec_memory_reservation_limit_bytes{id=~\".*.burstable.*\",id!~\".*.scope\",pod!=\"\",namespace=\"$namespace\",container=\"POD\"}))", + "hide": false, + "instant": false, + "interval": "", + "legendFormat": "", + "refId": "A" + }, + { + "expr": "", + "hide": true, + "refId": "B" + } + ], + "thresholds": "0,1", + "timeFrom": null, + "timeShift": null, + "title": "burstable pods", + "transparent": true, + "type": "singlestat", + "valueFontSize": "80%", + "valueMaps": [ + { + "op": "=", + "text": "N/A", + "value": "null" + } + ], + "valueName": "current" + }, + { + "cacheTimeout": null, + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": { + "align": "left", + "displayMode": "color-text" + }, + "mappings": [], + "noValue": "--", + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "dark-green", + "value": null + } + ] + }, + "unit": "decbytes" + }, + "overrides": [ + { + "matcher": { + "id": "byName", + "options": "pod" + }, + "properties": [ + { + "id": "custom.width", + "value": 366 + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "host_ip" + }, + "properties": [ + { + "id": "custom.width", + "value": 104 + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "pod_ip" + }, + "properties": [ + { + "id": "custom.width", + "value": 111 + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "node" + }, + "properties": [ + { + "id": "custom.width", + "value": 202 + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "Memory usage" + }, + "properties": [ + { + "id": "custom.width", + "value": null + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "Status" + }, + "properties": [ + { + "id": "custom.width", + "value": 68 + }, + { + "id": "mappings", + "value": [ + { + "from": "", + "id": 0, + "operator": "", + "text": "Up", + "to": "", + "type": 1, + "value": "1" + }, + { + "from": "", + "id": 1, + "operator": "", + "text": "Down", + "to": "", + "type": 1, + "value": "0" + } + ] + }, + { + "id": "thresholds", + "value": { + "mode": "absolute", + "steps": [ + { + "color": "dark-red", + "value": null + }, + { + "color": "dark-green", + "value": 1 + } + ] + } + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "Age" + }, + "properties": [ + { + "id": "custom.width", + "value": 92 + }, + { + "id": "unit", + "value": "s" + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "Restarts" + }, + "properties": [ + { + "id": "custom.width", + "value": null + }, + { + "id": "unit", + "value": "none" + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "CPU Usage" + }, + "properties": [ + { + "id": "custom.width", + "value": 247 + }, + { + "id": "unit" + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "CPU Usage [95th Percentile]" + }, + "properties": [ + { + "id": "custom.width", + "value": 253 + }, + { + "id": "unit", + "value": "none" + } + ] + } + ] + }, + "gridPos": { + "h": 8, + "w": 24, + "x": 0, + "y": 24 + }, + "id": 104, + "links": [], + "options": { + "angular": { + "columns": [], + "fontSize": "100%", + "options": {}, + "pageSize": null, + "showHeader": true, + "sort": { + "col": 0, + "desc": true + }, + "styles": [ + { + "alias": "Time", + "align": "auto", + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "pattern": "Time", + "type": "hidden" + }, + { + "alias": "", + "align": "auto", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "decimals": 2, + "pattern": "/pod.*/", + "thresholds": [], + "type": "string", + "unit": "short" + }, + { + "alias": "", + "align": "auto", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "mappingType": 1, + "pattern": "node", + "thresholds": [], + "type": "string", + "unit": "short" + }, + { + "alias": "", + "align": "auto", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "mappingType": 1, + "pattern": "__name__", + "thresholds": [], + "type": "hidden", + "unit": "short" + }, + { + "alias": "", + "align": "auto", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "mappingType": 1, + "pattern": "/created.*/", + "thresholds": [], + "type": "hidden", + "unit": "short" + }, + { + "alias": "", + "align": "auto", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "mappingType": 1, + "pattern": "/prom.*/", + "thresholds": [], + "type": "hidden", + "unit": "short" + }, + { + "alias": "", + "align": "auto", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "mappingType": 1, + "pattern": "/job/", + "thresholds": [], + "type": "hidden", + "unit": "short" + }, + { + "alias": "", + "align": "auto", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "mappingType": 1, + "pattern": "service", + "thresholds": [], + "type": "hidden", + "unit": "short" + }, + { + "alias": "", + "align": "auto", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "mappingType": 1, + "pattern": "instance", + "thresholds": [], + "type": "hidden", + "unit": "short" + }, + { + "alias": "", + "align": "auto", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "mappingType": 1, + "pattern": "endpoint", + "thresholds": [], + "type": "hidden", + "unit": "short" + }, + { + "alias": "", + "align": "auto", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "mappingType": 1, + "pattern": "uid", + "thresholds": [], + "type": "hidden", + "unit": "short" + }, + { + "alias": "", + "align": "auto", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "mappingType": 1, + "pattern": "", + "thresholds": [], + "type": "number", + "unit": "short" + }, + { + "alias": "", + "align": "auto", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "mappingType": 1, + "pattern": "namespace", + "thresholds": [], + "type": "hidden", + "unit": "short" + }, + { + "alias": "", + "align": "auto", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "mappingType": 1, + "pattern": "Value", + "thresholds": [], + "type": "string", + "unit": "short", + "valueMaps": [] + } + ], + "transform": "table" + }, + "frameIndex": 0, + "showHeader": true, + "sortBy": [ + { + "desc": false, + "displayName": "pod" + } + ] + }, + "pluginVersion": "7.0.5", + "targets": [ + { + "expr": "kube_pod_container_status_ready{namespace=\"$namespace\"}", + "format": "table", + "hide": false, + "instant": true, + "interval": "", + "legendFormat": "", + "refId": "A" + }, + { + "expr": "sum\r\n by(pod) (container_memory_usage_bytes{container!=\"POD\",image!=\"\",job=\"kubelet\",metrics_path=\"/metrics/cadvisor\",namespace=\"$namespace\"})", + "format": "table", + "hide": false, + "instant": true, + "interval": "", + "legendFormat": "Memory usage", + "refId": "B" + }, + { + "expr": "kube_pod_info{namespace=\"$namespace\"}", + "format": "table", + "interval": "", + "legendFormat": "", + "refId": "C" + }, + { + "expr": "sum by(pod) (kube_pod_container_status_restarts_total{namespace=\"$namespace\"})", + "format": "table", + "hide": false, + "instant": true, + "interval": "", + "legendFormat": "", + "refId": "E" + }, + { + "expr": "quantile_over_time(0.95,\r\n sum by (pod) (\r\n rate(container_cpu_usage_seconds_total{namespace=\"$namespace\", container_name!=\"POD\"}[10m])\r\n )[2d:]\r\n)", + "format": "table", + "instant": true, + "interval": "", + "legendFormat": "CPU Usage [95th Percentile]", + "refId": "D" + } + ], + "timeFrom": null, + "timeShift": null, + "title": "pods running in $namespace", + "transformations": [ + { + "id": "filterFieldsByName", + "options": { + "include": { + "names": [ + "pod", + "Value #A", + "Value #B", + "host_ip", + "node", + "pod_ip", + "Value #E", + "Value #D" + ] + } + } + }, + { + "id": "seriesToColumns", + "options": { + "byField": "pod" + } + }, + { + "id": "organize", + "options": { + "excludeByName": {}, + "indexByName": { + "Value #A": 3, + "Value #B": 2, + "Value #D": 1, + "Value #E": 4, + "host_ip": 6, + "node": 7, + "pod": 0, + "pod_ip": 5 + }, + "renameByName": { + "Value #A": "Status", + "Value #B": "Memory usage", + "Value #C": "Age", + "Value #D": "CPU Usage [95th Percentile]", + "Value #E": "Restarts" + } + } + } + ], + "transparent": true, + "type": "table" + }, + { + "aliasColors": {}, + "bars": false, + "cacheTimeout": null, + "dashLength": 10, + "dashes": false, + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fill": 1, + "fillGradient": 0, + "gridPos": { + "h": 9, + "w": 11, + "x": 0, + "y": 32 + }, + "hiddenSeries": false, + "id": 78, + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "links": [], + "nullPointMode": "null", + "options": { + "dataLinks": [] + }, + "percentage": false, + "pointradius": 2, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "sum\n by(namespace) (rate(container_cpu_usage_seconds_total{container!=\"POD\",image!=\"\",job=\"kubelet\",metrics_path=\"/metrics/cadvisor\",namespace=\"$namespace\"}[10m]))", + "format": "time_series", + "hide": false, + "instant": false, + "interval": "", + "legendFormat": "{{namespace}}", + "refId": "A" + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "Total CPU usage in $namespace namespace", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "transparent": true, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "none", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, + { + "aliasColors": {}, + "bars": false, + "cacheTimeout": null, + "dashLength": 10, + "dashes": false, + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fill": 1, + "fillGradient": 0, + "gridPos": { + "h": 9, + "w": 13, + "x": 11, + "y": 32 + }, + "hiddenSeries": false, + "id": 101, + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "links": [], + "nullPointMode": "null", + "options": { + "dataLinks": [] + }, + "percentage": false, + "pointradius": 2, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "sum\n by(pod) (rate(container_cpu_usage_seconds_total{container!=\"POD\",image!=\"\",job=\"kubelet\",metrics_path=\"/metrics/cadvisor\",namespace=\"$namespace\"}[10m]))", + "format": "time_series", + "hide": false, + "instant": false, + "interval": "", + "legendFormat": "{{pod}}", + "refId": "A" + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": " CPU usage by pod in $namespace namespace", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "transparent": true, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "none", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fill": 1, + "fillGradient": 0, + "gridPos": { + "h": 9, + "w": 10, + "x": 0, + "y": 41 + }, + "hiddenSeries": false, + "id": 48, + "legend": { + "avg": false, + "current": false, + "hideEmpty": true, + "hideZero": true, + "max": true, + "min": false, + "show": true, + "total": false, + "values": true + }, + "lines": true, + "linewidth": 1, + "nullPointMode": "null", + "options": { + "dataLinks": [] + }, + "percentage": false, + "pluginVersion": "6.5.2", + "pointradius": 2, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "sum\n by(namespace) (container_memory_usage_bytes{container!=\"POD\",image!=\"\",job=\"kubelet\",metrics_path=\"/metrics/cadvisor\",namespace=\"$namespace\"})", + "hide": false, + "interval": "", + "legendFormat": "{{namespace}}", + "refId": "A" + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "Total memory usage by pods in $namespace", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "transparent": true, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "bytes", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": false + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fill": 1, + "fillGradient": 0, + "gridPos": { + "h": 8, + "w": 13, + "x": 11, + "y": 41 + }, + "hiddenSeries": false, + "id": 100, + "legend": { + "avg": true, + "current": false, + "hideEmpty": true, + "hideZero": true, + "max": true, + "min": true, + "show": true, + "total": false, + "values": true + }, + "lines": true, + "linewidth": 1, + "nullPointMode": "null", + "options": { + "dataLinks": [] + }, + "percentage": false, + "pluginVersion": "6.5.2", + "pointradius": 2, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "sum\n by(pod) (container_memory_usage_bytes{container!=\"POD\",image!=\"\",job=\"kubelet\",metrics_path=\"/metrics/cadvisor\",namespace=\"$namespace\"})", + "hide": false, + "interval": "", + "legendFormat": "{{pod}}", + "refId": "A" + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "memory usage by pods in $namespace", + "tooltip": { + "shared": true, + "sort": 2, + "value_type": "individual" + }, + "transparent": true, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "bytes", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": false + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + } + ], + "title": "Namespace $namespace details", + "type": "row" + }, + { + "collapsed": true, + "datasource": "Prometheus", + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 4 + }, + "id": 39, + "panels": [ + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "Prometheus", + "description": "This panel shows the NotReady state of nodes. If any node goes in NotReady state, graph value will go from 1 to 0.", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fill": 0, + "fillGradient": 0, + "gridPos": { + "h": 6, + "w": 6, + "x": 0, + "y": 4 + }, + "hiddenSeries": false, + "id": 2, + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "nullPointMode": "null", + "options": { + "dataLinks": [] + }, + "percentage": false, + "pointradius": 2, + "points": false, + "renderer": "flot", + "scopedVars": { + "node": { + "selected": true, + "text": "ip-10-0-75-112.ap-south-1.compute.internal", + "value": "ip-10-0-75-112.ap-south-1.compute.internal" + } + }, + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "(kube_node_status_condition{status=\"true\",condition=\"Ready\",node=\"$node\"}) ", + "legendFormat": "{{node}}", + "refId": "A" + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "Node readiness for $node ", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fill": 1, + "fillGradient": 0, + "gridPos": { + "h": 6, + "w": 6, + "x": 6, + "y": 4 + }, + "hiddenSeries": false, + "id": 9, + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "nullPointMode": "null", + "options": { + "dataLinks": [] + }, + "percentage": false, + "pointradius": 2, + "points": false, + "renderer": "flot", + "scopedVars": { + "node": { + "selected": true, + "text": "ip-10-0-75-112.ap-south-1.compute.internal", + "value": "ip-10-0-75-112.ap-south-1.compute.internal" + } + }, + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "(kube_node_status_condition{status=\"true\",condition=~\"MemoryPressure|PIDPressure|DiskPressure\",node=\"$node\"})", + "interval": "", + "legendFormat": "{{condition}}", + "refId": "A" + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "node $node Memory/Disk/PID Pressure", + "tooltip": { + "shared": true, + "sort": 1, + "value_type": "individual" + }, + "transformations": [], + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": false + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, + { + "cacheTimeout": null, + "colorBackground": false, + "colorValue": false, + "colors": [ + "#299c46", + "rgba(237, 129, 40, 0.89)", + "#d44a3a" + ], + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, + "gridPos": { + "h": 3, + "w": 3, + "x": 12, + "y": 4 + }, + "id": 10, + "interval": null, + "links": [], + "mappingType": 1, + "mappingTypes": [ + { + "name": "value to text", + "value": 1 + }, + { + "name": "range to text", + "value": 2 + } + ], + "maxDataPoints": 100, + "nullPointMode": "connected", + "nullText": null, + "postfix": "", + "postfixFontSize": "50%", + "prefix": "", + "prefixFontSize": "50%", + "rangeMaps": [ + { + "from": "null", + "text": "N/A", + "to": "null" + } + ], + "scopedVars": { + "node": { + "selected": true, + "text": "ip-10-0-75-112.ap-south-1.compute.internal", + "value": "ip-10-0-75-112.ap-south-1.compute.internal" + } + }, + "sparkline": { + "fillColor": "rgba(31, 118, 189, 0.18)", + "full": true, + "lineColor": "rgb(31, 120, 193)", + "show": true, + "ymax": null, + "ymin": null + }, + "tableColumn": "", + "targets": [ + { + "expr": " count(count by (pod)(container_spec_memory_reservation_limit_bytes{node=\"$node\",pod!=\"\"}))", + "instant": false, + "interval": "", + "legendFormat": "{{node}}", + "refId": "A" + } + ], + "thresholds": "", + "timeFrom": null, + "timeShift": null, + "title": "pod count", + "type": "singlestat", + "valueFontSize": "80%", + "valueMaps": [ + { + "op": "=", + "text": "N/A", + "value": "null" + } + ], + "valueName": "current" + }, + { + "cacheTimeout": null, + "colorBackground": false, + "colorValue": false, + "colors": [ + "#299c46", + "rgba(237, 129, 40, 0.89)", + "#d44a3a" + ], + "datasource": "Prometheus", + "decimals": 0, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, + "gridPos": { + "h": 3, + "w": 2, + "x": 15, + "y": 4 + }, + "id": 27, + "interval": null, + "links": [], + "mappingType": 1, + "mappingTypes": [ + { + "name": "value to text", + "value": 1 + }, + { + "name": "range to text", + "value": 2 + } + ], + "maxDataPoints": 100, + "nullPointMode": "connected", + "nullText": null, + "postfix": "", + "postfixFontSize": "50%", + "prefix": "", + "prefixFontSize": "50%", + "rangeMaps": [ + { + "from": "null", + "text": "N/A", + "to": "null" + } + ], + "scopedVars": { + "node": { + "selected": true, + "text": "ip-10-0-75-112.ap-south-1.compute.internal", + "value": "ip-10-0-75-112.ap-south-1.compute.internal" + } + }, + "sparkline": { + "fillColor": "rgba(31, 118, 189, 0.18)", + "full": true, + "lineColor": "rgb(31, 120, 193)", + "show": true, + "ymax": null, + "ymin": null + }, + "tableColumn": "", + "targets": [ + { + "expr": "count(count by (pod)(container_spec_memory_reservation_limit_bytes{id=~\".*.besteffort.*\",container=\"POD\",node=\"$node\"}))", + "instant": false, + "interval": "", + "legendFormat": "", + "refId": "A" + } + ], + "thresholds": "", + "timeFrom": null, + "timeShift": null, + "title": "besteffort pods", + "type": "singlestat", + "valueFontSize": "80%", + "valueMaps": [ + { + "op": "=", + "text": "N/A", + "value": "null" + } + ], + "valueName": "avg" + }, + { + "cacheTimeout": null, + "colorBackground": false, + "colorValue": false, + "colors": [ + "#299c46", + "rgba(237, 129, 40, 0.89)", + "#d44a3a" + ], + "datasource": "Prometheus", + "decimals": 0, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, + "gridPos": { + "h": 3, + "w": 2, + "x": 17, + "y": 4 + }, + "id": 93, + "interval": null, + "links": [], + "mappingType": 1, + "mappingTypes": [ + { + "name": "value to text", + "value": 1 + }, + { + "name": "range to text", + "value": 2 + } + ], + "maxDataPoints": 100, + "nullPointMode": "connected", + "nullText": null, + "postfix": "", + "postfixFontSize": "50%", + "prefix": "", + "prefixFontSize": "50%", + "rangeMaps": [ + { + "from": "null", + "text": "N/A", + "to": "null" + } + ], + "scopedVars": { + "node": { + "selected": true, + "text": "ip-10-0-75-112.ap-south-1.compute.internal", + "value": "ip-10-0-75-112.ap-south-1.compute.internal" + } + }, + "sparkline": { + "fillColor": "rgba(31, 118, 189, 0.18)", + "full": true, + "lineColor": "rgb(31, 120, 193)", + "show": true, + "ymax": null, + "ymin": null + }, + "tableColumn": "", + "targets": [ + { + "expr": "sum(count by (pod)(container_spec_memory_reservation_limit_bytes{container=\"POD\",id=~\".*.burstable.*\",node=\"$node\"}))", + "instant": false, + "interval": "", + "legendFormat": "", + "refId": "A" + } + ], + "thresholds": "", + "timeFrom": null, + "timeShift": null, + "title": "burstable pods", + "type": "singlestat", + "valueFontSize": "80%", + "valueMaps": [ + { + "op": "=", + "text": "N/A", + "value": "null" + } + ], + "valueName": "avg" + }, + { + "cacheTimeout": null, + "colorBackground": false, + "colorValue": false, + "colors": [ + "#299c46", + "rgba(237, 129, 40, 0.89)", + "#d44a3a" + ], + "datasource": "Prometheus", + "decimals": 0, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, + "gridPos": { + "h": 3, + "w": 2, + "x": 19, + "y": 4 + }, + "id": 26, + "interval": null, + "links": [], + "mappingType": 1, + "mappingTypes": [ + { + "name": "value to text", + "value": 1 + }, + { + "name": "range to text", + "value": 2 + } + ], + "maxDataPoints": 100, + "nullPointMode": "connected", + "nullText": null, + "postfix": "", + "postfixFontSize": "50%", + "prefix": "", + "prefixFontSize": "50%", + "rangeMaps": [ + { + "from": "null", + "text": "N/A", + "to": "null" + } + ], + "scopedVars": { + "node": { + "selected": true, + "text": "ip-10-0-75-112.ap-south-1.compute.internal", + "value": "ip-10-0-75-112.ap-south-1.compute.internal" + } + }, + "sparkline": { + "fillColor": "rgba(31, 118, 189, 0.18)", + "full": true, + "lineColor": "rgb(31, 120, 193)", + "show": true, + "ymax": null, + "ymin": null + }, + "tableColumn": "", + "targets": [ + { + "expr": "sum(count by (pod)(container_spec_memory_reservation_limit_bytes{container=\"POD\",id!~\".*.burstable.*\",id!~\".*.besteffort.*\",node=\"$node\"}))", + "instant": false, + "interval": "", + "legendFormat": "", + "refId": "A" + } + ], + "thresholds": "", + "timeFrom": null, + "timeShift": null, + "title": "guaranteed pods", + "type": "singlestat", + "valueFontSize": "80%", + "valueMaps": [ + { + "op": "=", + "text": "N/A", + "value": "null" + } + ], + "valueName": "avg" + }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fill": 0, + "fillGradient": 0, + "gridPos": { + "h": 6, + "w": 6, + "x": 12, + "y": 7 + }, + "hiddenSeries": false, + "id": 77, + "legend": { + "avg": false, + "current": true, + "max": false, + "min": false, + "show": true, + "total": false, + "values": true + }, + "lines": true, + "linewidth": 1, + "nullPointMode": "null", + "options": { + "dataLinks": [] + }, + "percentage": false, + "pointradius": 2, + "points": false, + "renderer": "flot", + "scopedVars": { + "node": { + "selected": true, + "text": "ip-10-0-75-112.ap-south-1.compute.internal", + "value": "ip-10-0-75-112.ap-south-1.compute.internal" + } + }, + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "count by (namespace)(container_memory_working_set_bytes{image!=\"\",node=\"$node\"})", + "legendFormat": "{{namespace}}", + "refId": "A" + }, + { + "expr": "", + "refId": "B" + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "Pod count by namespace on $node ", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "decimals": 0, + "format": "short", + "label": "", + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": false + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fill": 0, + "fillGradient": 0, + "gridPos": { + "h": 6, + "w": 6, + "x": 18, + "y": 7 + }, + "hiddenSeries": false, + "id": 126, + "legend": { + "avg": false, + "current": true, + "max": false, + "min": false, + "show": true, + "total": false, + "values": true + }, + "lines": true, + "linewidth": 1, + "nullPointMode": "null", + "options": { + "dataLinks": [] + }, + "percentage": false, + "pointradius": 2, + "points": false, + "renderer": "flot", + "scopedVars": { + "node": { + "selected": true, + "text": "ip-10-0-75-112.ap-south-1.compute.internal", + "value": "ip-10-0-75-112.ap-south-1.compute.internal" + } + }, + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": " histogram_quantile(0.99,\n sum by(instance, le) (rate(kubelet_pod_worker_duration_seconds_bucket{job=\"kubelet\",metrics_path=\"/metrics\",node=\"$node\"}[10m])))\n * on(instance) group_left(node) kubelet_node_name{job=\"kubelet\",metrics_path=\"/metrics\",node=\"$node\"}", + "interval": "", + "legendFormat": "{{node}}", + "refId": "A" + }, + { + "expr": "", + "refId": "B" + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "Pod startup latency ", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "decimals": 0, + "format": "µs", + "label": "", + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": false + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, + { + "aliasColors": { + "Total CPU": "dark-red" + }, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fill": 0, + "fillGradient": 0, + "gridPos": { + "h": 6, + "w": 6, + "x": 0, + "y": 10 + }, + "hiddenSeries": false, + "id": 7, + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "nullPointMode": "null", + "options": { + "dataLinks": [] + }, + "percentage": false, + "pointradius": 2, + "points": false, + "renderer": "flot", + "scopedVars": { + "node": { + "selected": true, + "text": "ip-10-0-75-112.ap-south-1.compute.internal", + "value": "ip-10-0-75-112.ap-south-1.compute.internal" + } + }, + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "node_load5 + on(instance) group_left(nodename) \nnode_uname_info{nodename=\"$node\"}", + "hide": false, + "interval": "", + "legendFormat": "{{nodename}}", + "refId": "A" + }, + { + "expr": "kube_node_status_capacity_cpu_cores{node=\"$node\"}", + "interval": "", + "legendFormat": "Total CPU", + "refId": "B" + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "Node $node load", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": false + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, + { + "aliasColors": { + "Total CPU": "dark-red" + }, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "Prometheus", + "description": "record: instance:node_cpu_utilisation:rate1m\nexpr: 1\n - avg without(cpu, mode) (rate(node_cpu_seconds_total{job=\"node-exporter\",mode=\"idle\"}[1m]))", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fill": 0, + "fillGradient": 0, + "gridPos": { + "h": 6, + "w": 6, + "x": 6, + "y": 10 + }, + "hiddenSeries": false, + "id": 4, + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "nullPointMode": "null", + "options": { + "dataLinks": [] + }, + "percentage": false, + "pointradius": 2, + "points": false, + "renderer": "flot", + "scopedVars": { + "node": { + "selected": true, + "text": "ip-10-0-75-112.ap-south-1.compute.internal", + "value": "ip-10-0-75-112.ap-south-1.compute.internal" + } + }, + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "\n((sum by (instance) (instance:node_cpu_utilisation:rate1m)) + on(instance) group_left(nodename) \nnode_uname_info{nodename=\"$node\"})", + "hide": false, + "interval": "", + "legendFormat": "{{nodename}}", + "refId": "A" + }, + { + "expr": "kube_node_status_capacity{node=\"$node\",resource=\"cpu\"}", + "interval": "", + "legendFormat": "Total CPU", + "refId": "B" + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "Node $node CPU usage", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": false + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, + { + "aliasColors": { + "Total CPU": "dark-red" + }, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fill": 0, + "fillGradient": 0, + "gridPos": { + "h": 6, + "w": 6, + "x": 12, + "y": 13 + }, + "hiddenSeries": false, + "id": 18, + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "nullPointMode": "null", + "options": { + "dataLinks": [] + }, + "percentage": false, + "pointradius": 2, + "points": false, + "renderer": "flot", + "scopedVars": { + "node": { + "selected": true, + "text": "ip-10-0-75-112.ap-south-1.compute.internal", + "value": "ip-10-0-75-112.ap-south-1.compute.internal" + } + }, + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "sum by (node)(kube_pod_container_resource_requests_cpu_cores{node=\"$node\"})", + "legendFormat": "requests", + "refId": "A" + }, + { + "expr": "kube_node_status_capacity{node=\"$node\",resource=\"cpu\"}", + "legendFormat": "Total CPU", + "refId": "B" + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "Total CPU requests on $node", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "decimals": 0, + "format": "none", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": false + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, + { + "aliasColors": { + "Total CPU": "dark-red" + }, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fill": 0, + "fillGradient": 0, + "gridPos": { + "h": 6, + "w": 6, + "x": 18, + "y": 13 + }, + "hiddenSeries": false, + "id": 20, + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "nullPointMode": "null", + "options": { + "dataLinks": [] + }, + "percentage": false, + "pointradius": 2, + "points": false, + "renderer": "flot", + "scopedVars": { + "node": { + "selected": true, + "text": "ip-10-0-75-112.ap-south-1.compute.internal", + "value": "ip-10-0-75-112.ap-south-1.compute.internal" + } + }, + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "sum by (node)(kube_pod_container_resource_limits_cpu_cores{node=\"$node\"})", + "interval": "", + "legendFormat": "total limits", + "refId": "A" + }, + { + "expr": "kube_node_status_capacity{node=\"$node\",resource=\"cpu\"}", + "hide": false, + "legendFormat": "Total CPU", + "refId": "B" + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "Total CPU limits on $node", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": false + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, + { + "aliasColors": { + "Total memory": "dark-red" + }, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fill": 0, + "fillGradient": 0, + "gridPos": { + "h": 6, + "w": 6, + "x": 0, + "y": 16 + }, + "hiddenSeries": false, + "id": 6, + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "nullPointMode": "null", + "options": { + "dataLinks": [] + }, + "percentage": false, + "pointradius": 2, + "points": false, + "renderer": "flot", + "scopedVars": { + "node": { + "selected": true, + "text": "ip-10-0-75-112.ap-south-1.compute.internal", + "value": "ip-10-0-75-112.ap-south-1.compute.internal" + } + }, + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "(node_memory_MemTotal_bytes + on(instance) group_left(nodename) \nnode_uname_info{nodename=\"$node\"}) - (node_memory_MemAvailable_bytes + on(instance) group_left(nodename) \nnode_uname_info{nodename=\"$node\"})", + "hide": false, + "interval": "", + "legendFormat": "{{nodename}}", + "refId": "A" + }, + { + "expr": "kube_node_status_capacity{node=\"$node\",resource=\"memory\"}", + "legendFormat": "Total memory", + "refId": "B" + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "Node $node memory usage", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "decbytes", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, + { + "aliasColors": { + "Total memory": "dark-red" + }, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fill": 0, + "fillGradient": 0, + "gridPos": { + "h": 6, + "w": 6, + "x": 6, + "y": 16 + }, + "hiddenSeries": false, + "id": 19, + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "nullPointMode": "null", + "options": { + "dataLinks": [] + }, + "percentage": false, + "pointradius": 2, + "points": false, + "renderer": "flot", + "scopedVars": { + "node": { + "selected": true, + "text": "ip-10-0-75-112.ap-south-1.compute.internal", + "value": "ip-10-0-75-112.ap-south-1.compute.internal" + } + }, + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "sum by (node)(kube_pod_container_resource_requests_memory_bytes{node=\"$node\"})", + "legendFormat": "requests", + "refId": "A" + }, + { + "expr": "kube_node_status_capacity{node=\"$node\",resource=\"memory\"}", + "legendFormat": "Total memory", + "refId": "B" + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "Total memory requests on $node", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "decbytes", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": false + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, + { + "aliasColors": { + "Total": "dark-red", + "Total memory": "dark-red" + }, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fill": 0, + "fillGradient": 0, + "gridPos": { + "h": 9, + "w": 6, + "x": 12, + "y": 19 + }, + "hiddenSeries": false, + "id": 21, + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "nullPointMode": "null", + "options": { + "dataLinks": [] + }, + "percentage": false, + "pointradius": 2, + "points": false, + "renderer": "flot", + "scopedVars": { + "node": { + "selected": true, + "text": "ip-10-0-75-112.ap-south-1.compute.internal", + "value": "ip-10-0-75-112.ap-south-1.compute.internal" + } + }, + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "sum by (node)(kube_pod_container_resource_limits_memory_bytes{node=\"$node\"})", + "legendFormat": "total liimits ", + "refId": "A" + }, + { + "expr": "kube_node_status_capacity{node=\"$node\",resource=\"memory\"}", + "legendFormat": "Total memory", + "refId": "B" + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "Total Memory limits on $node", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "decbytes", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": false + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fill": 0, + "fillGradient": 0, + "gridPos": { + "h": 9, + "w": 6, + "x": 18, + "y": 19 + }, + "hiddenSeries": false, + "id": 8, + "legend": { + "avg": false, + "current": true, + "max": true, + "min": false, + "show": true, + "total": false, + "values": true + }, + "lines": true, + "linewidth": 1, + "nullPointMode": "null", + "options": { + "dataLinks": [] + }, + "percentage": false, + "pointradius": 2, + "points": false, + "renderer": "flot", + "scopedVars": { + "node": { + "selected": true, + "text": "ip-10-0-75-112.ap-south-1.compute.internal", + "value": "ip-10-0-75-112.ap-south-1.compute.internal" + } + }, + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "histogram_quantile(0.9, sum by (node,le) (rate(kubelet_pleg_relist_duration_seconds_bucket{node=\"$node\"}[10m])))", + "legendFormat": "{{node}}", + "refId": "A" + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "kubelet_pleg_relist_duration_seconds_bucket", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "s", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": false + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fill": 0, + "fillGradient": 0, + "gridPos": { + "h": 6, + "w": 6, + "x": 0, + "y": 22 + }, + "hiddenSeries": false, + "id": 67, + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "nullPointMode": "null", + "options": { + "dataLinks": [] + }, + "percentage": false, + "pointradius": 2, + "points": false, + "renderer": "flot", + "scopedVars": { + "node": { + "selected": true, + "text": "ip-10-0-75-112.ap-south-1.compute.internal", + "value": "ip-10-0-75-112.ap-south-1.compute.internal" + } + }, + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": " sort(topk(5, container_memory_working_set_bytes{image!=\"\",node=\"$node\"}))", + "legendFormat": "{{pod}}", + "refId": "A" + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "Top 5 memory guzzling pods on $node", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "decbytes", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": false + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fill": 0, + "fillGradient": 0, + "gridPos": { + "h": 6, + "w": 6, + "x": 6, + "y": 22 + }, + "hiddenSeries": false, + "id": 117, + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "nullPointMode": "null", + "options": { + "dataLinks": [] + }, + "percentage": false, + "pointradius": 2, + "points": false, + "renderer": "flot", + "scopedVars": { + "node": { + "selected": true, + "text": "ip-10-0-75-112.ap-south-1.compute.internal", + "value": "ip-10-0-75-112.ap-south-1.compute.internal" + } + }, + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": " sort(topk(5, container_memory_working_set_bytes{image!=\"\",node=\"$node\"}))", + "legendFormat": "{{pod}}", + "refId": "A" + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "Top 5 memory guzzling pods on $node", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "decbytes", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": false + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + } + ], + "repeat": "node", + "scopedVars": { + "node": { + "selected": true, + "text": "ip-10-0-75-112.ap-south-1.compute.internal", + "value": "ip-10-0-75-112.ap-south-1.compute.internal" + } + }, + "title": "$node Node details", + "type": "row" + } + ], + "refresh": false, + "schemaVersion": 25, + "style": "dark", + "tags": [ + "kubernetes", + "k8s", + "namespace" + ], + "templating": { + "list": [ + { + "allValue": "", + "current": { + "selected": false, + "text": "ip-10-0-75-112.ap-south-1.compute.internal", + "value": "ip-10-0-75-112.ap-south-1.compute.internal" + }, + "datasource": "Prometheus", + "definition": "label_values(kube_node_created,node)", + "hide": 0, + "includeAll": false, + "label": null, + "multi": false, + "name": "node", + "options": [], + "query": "label_values(kube_node_created,node)", + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "sort": 5, + "tagValuesQuery": "", + "tags": [], + "tagsQuery": "", + "type": "query", + "useTags": false + }, + { + "allValue": null, + "current": { + "selected": false, + "text": "monitoring", + "value": "monitoring" + }, + "datasource": "Prometheus", + "definition": "query_result(kube_namespace_labels)", + "hide": 0, + "includeAll": false, + "label": null, + "multi": false, + "name": "namespace", + "options": [], + "query": "query_result(kube_namespace_labels)", + "refresh": 1, + "regex": "/.*namespace=\"([^\"]*).*/", + "skipUrlSync": false, + "sort": 0, + "tagValuesQuery": "", + "tags": [], + "tagsQuery": "", + "type": "query", + "useTags": false + }, + { + "allValue": null, + "current": { + "selected": false, + "text": "alertmanager", + "value": "alertmanager" + }, + "datasource": "Prometheus", + "definition": "kube_pod_container_info{namespace=\"$namespace\"}", + "hide": 0, + "includeAll": false, + "label": null, + "multi": false, + "name": "container", + "options": [], + "query": "kube_pod_container_info{namespace=\"$namespace\"}", + "refresh": 1, + "regex": "/.*container=\"([^\"]*).*/", + "skipUrlSync": false, + "sort": 0, + "tagValuesQuery": "", + "tags": [], + "tagsQuery": "", + "type": "query", + "useTags": false + }, + { + "allValue": null, + "current": { + "selected": true, + "text": "6h", + "value": "6h" + }, + "hide": 0, + "includeAll": false, + "label": null, + "multi": false, + "name": "duration", + "options": [ + { + "selected": false, + "text": "10m", + "value": "10m" + }, + { + "selected": false, + "text": "30m", + "value": "30m" + }, + { + "selected": false, + "text": "1h", + "value": "1h" + }, + { + "selected": false, + "text": "2h", + "value": "2h" + }, + { + "selected": true, + "text": "6h", + "value": "6h" + }, + { + "selected": false, + "text": "12h", + "value": "12h" + }, + { + "selected": false, + "text": "1d", + "value": "1d" + }, + { + "selected": false, + "text": "2d", + "value": "2d" + }, + { + "selected": false, + "text": "5d", + "value": "5d" + }, + { + "selected": false, + "text": "14d", + "value": "14d" + }, + { + "selected": false, + "text": "30d", + "value": "30d" + } + ], + "query": "10m,30m,1h,2h,6h,12h,1d,2d,5d,14d,30d", + "queryValue": "", + "skipUrlSync": false, + "type": "custom" + } + ] + }, + "time": { + "from": "now-2d", + "to": "now" + }, + "timepicker": { + "refresh_intervals": [ + "30s", + "1m", + "5m", + "15m", + "30m", + "1h", + "2h", + "1d" + ] + }, + "timezone": "", + "title": "1 Kubernetes cluster overview(कुबरनेटेस)", + "uid": "N9uZBy8Wz", + "version": 1 +} diff --git a/configs/monitoring-dashboards/nginx-ingress-dashboard.json b/configs/monitoring-dashboards/nginx-ingress-dashboard.json new file mode 100644 index 00000000..7aa9811e --- /dev/null +++ b/configs/monitoring-dashboards/nginx-ingress-dashboard.json @@ -0,0 +1,1463 @@ +{ + "annotations": { + "list": [ + { + "builtIn": 1, + "datasource": "-- Grafana --", + "enable": true, + "hide": true, + "iconColor": "rgba(0, 211, 255, 1)", + "name": "Annotations & Alerts", + "type": "dashboard" + }, + { + "datasource": "Prometheus", + "enable": true, + "expr": "sum(changes(nginx_ingress_controller_config_last_reload_successful_timestamp_seconds{instance!=\"unknown\",controller_class=~\"$controller_class\",namespace=~\"$namespace\"}[30s])) by (controller_class)", + "hide": false, + "iconColor": "rgba(255, 96, 96, 1)", + "limit": 100, + "name": "Config Reloads", + "showIn": 0, + "step": "30s", + "tagKeys": "controller_class", + "tags": [], + "titleFormat": "Config Reloaded", + "type": "tags" + } + ] + }, + "description": "This Dashboard contains metrics visualization of Nginx Ingress Controller Running in Kubernetes Using Prometheus as Datasource.", + "editable": true, + "gnetId": 12575, + "graphTooltip": 0, + "id": 1, + "iteration": 1595328866350, + "links": [], + "panels": [ + { + "cacheTimeout": null, + "colorBackground": false, + "colorValue": false, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "format": "ops", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, + "id": 20, + "interval": null, + "links": [], + "mappingType": 1, + "mappingTypes": [ + { + "name": "value to text", + "value": 1 + }, + { + "name": "range to text", + "value": 2 + } + ], + "maxDataPoints": 100, + "nullPointMode": "connected", + "nullText": null, + "postfix": "", + "postfixFontSize": "50%", + "prefix": "", + "prefixFontSize": "50%", + "rangeMaps": [ + { + "from": "null", + "text": "N/A", + "to": "null" + } + ], + "sparkline": { + "fillColor": "rgba(31, 118, 189, 0.18)", + "full": true, + "lineColor": "rgb(31, 120, 193)", + "show": true + }, + "tableColumn": "", + "targets": [ + { + "expr": "round(sum(irate(nginx_ingress_controller_requests{controller_pod=~\"$controller\",controller_class=~\"$controller_class\",namespace=~\"$namespace\"}[$__range])), 0.001)", + "format": "time_series", + "intervalFactor": 1, + "refId": "A", + "step": 4 + } + ], + "thresholds": "", + "title": "Controller Request Volume", + "type": "singlestat", + "valueFontSize": "80%", + "valueMaps": [ + { + "op": "=", + "text": "N/A", + "value": "null" + } + ], + "valueName": "avg" + }, + { + "cacheTimeout": null, + "colorBackground": false, + "colorValue": false, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, + "gridPos": { + "h": 3, + "w": 6, + "x": 6, + "y": 0 + }, + "id": 82, + "interval": null, + "links": [], + "mappingType": 1, + "mappingTypes": [ + { + "name": "value to text", + "value": 1 + }, + { + "name": "range to text", + "value": 2 + } + ], + "maxDataPoints": 100, + "nullPointMode": "connected", + "nullText": null, + "postfix": "", + "postfixFontSize": "50%", + "prefix": "", + "prefixFontSize": "50%", + "rangeMaps": [ + { + "from": "null", + "text": "N/A", + "to": "null" + } + ], + "sparkline": { + "fillColor": "rgba(31, 118, 189, 0.18)", + "full": true, + "lineColor": "rgb(31, 120, 193)", + "show": true + }, + "tableColumn": "", + "targets": [ + { + "expr": "sum(avg_over_time(nginx_ingress_controller_nginx_process_connections{controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\"}[$__range]))", + "format": "time_series", + "instant": false, + "intervalFactor": 1, + "refId": "A", + "step": 4 + } + ], + "thresholds": "", + "title": "Controller Connections", + "type": "singlestat", + "valueFontSize": "80%", + "valueMaps": [ + { + "op": "=", + "text": "N/A", + "value": "null" + } + ], + "valueName": "avg" + }, + { + "cacheTimeout": null, + "colorBackground": false, + "colorValue": false, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "format": "percentunit", + "gauge": { + "maxValue": 100, + "minValue": 80, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": false + }, + "gridPos": { + "h": 3, + "w": 6, + "x": 12, + "y": 0 + }, + "id": 21, + "interval": null, + "links": [], + "mappingType": 1, + "mappingTypes": [ + { + "name": "value to text", + "value": 1 + }, + { + "name": "range to text", + "value": 2 + } + ], + "maxDataPoints": 100, + "nullPointMode": "connected", + "nullText": null, + "postfix": "", + "postfixFontSize": "50%", + "prefix": "", + "prefixFontSize": "50%", + "rangeMaps": [ + { + "from": "null", + "text": "N/A", + "to": "null" + } + ], + "sparkline": { + "fillColor": "rgba(31, 118, 189, 0.18)", + "full": true, + "lineColor": "rgb(31, 120, 193)", + "show": true + }, + "tableColumn": "", + "targets": [ + { + "expr": "sum(rate(nginx_ingress_controller_requests{controller_pod=~\"$controller\",controller_class=~\"$controller_class\",namespace=~\"$namespace\",status!~\"[4-5].*\"}[$__range])) / sum(rate(nginx_ingress_controller_requests{controller_pod=~\"$controller\",controller_class=~\"$controller_class\",namespace=~\"$namespace\"}[$__range]))", + "format": "time_series", + "intervalFactor": 1, + "refId": "A", + "step": 4 + } + ], + "thresholds": "95, 99, 99.5", + "title": "Controller Success Rate (non-4|5xx responses)", + "type": "singlestat", + "valueFontSize": "80%", + "valueMaps": [ + { + "op": "=", + "text": "N/A", + "value": "null" + } + ], + "valueName": "avg" + }, + { + "cacheTimeout": null, + "colorBackground": false, + "colorValue": false, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "datasource": "Prometheus", + "decimals": 0, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, + "gridPos": { + "h": 3, + "w": 3, + "x": 18, + "y": 0 + }, + "id": 81, + "interval": null, + "links": [], + "mappingType": 1, + "mappingTypes": [ + { + "name": "value to text", + "value": 1 + }, + { + "name": "range to text", + "value": 2 + } + ], + "maxDataPoints": 100, + "nullPointMode": "connected", + "nullText": null, + "postfix": "", + "postfixFontSize": "50%", + "prefix": "", + "prefixFontSize": "50%", + "rangeMaps": [ + { + "from": "null", + "text": "N/A", + "to": "null" + } + ], + "sparkline": { + "fillColor": "rgba(31, 118, 189, 0.18)", + "full": true, + "lineColor": "rgb(31, 120, 193)", + "show": true + }, + "tableColumn": "", + "targets": [ + { + "expr": "avg(irate(nginx_ingress_controller_success{controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\"}[$__range])) * 60", + "format": "time_series", + "instant": false, + "intervalFactor": 1, + "refId": "A", + "step": 4 + } + ], + "thresholds": "", + "title": "Config Reloads", + "type": "singlestat", + "valueFontSize": "80%", + "valueMaps": [ + { + "op": "=", + "text": "N/A", + "value": "null" + } + ], + "valueName": "total" + }, + { + "cacheTimeout": null, + "colorBackground": false, + "colorValue": false, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "datasource": "Prometheus", + "decimals": 0, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, + "gridPos": { + "h": 3, + "w": 3, + "x": 21, + "y": 0 + }, + "id": 83, + "interval": null, + "links": [], + "mappingType": 1, + "mappingTypes": [ + { + "name": "value to text", + "value": 1 + }, + { + "name": "range to text", + "value": 2 + } + ], + "maxDataPoints": 100, + "nullPointMode": "connected", + "nullText": null, + "postfix": "", + "postfixFontSize": "50%", + "prefix": "", + "prefixFontSize": "50%", + "rangeMaps": [ + { + "from": "null", + "text": "N/A", + "to": "null" + } + ], + "sparkline": { + "fillColor": "rgba(31, 118, 189, 0.18)", + "full": true, + "lineColor": "rgb(31, 120, 193)", + "show": true + }, + "tableColumn": "", + "targets": [ + { + "expr": "count(nginx_ingress_controller_config_last_reload_successful{controller_pod=~\"$controller\",controller_namespace=~\"$namespace\"} == 0)", + "format": "time_series", + "instant": true, + "intervalFactor": 1, + "refId": "A", + "step": 4 + } + ], + "thresholds": "", + "title": "Last Config Failed", + "type": "singlestat", + "valueFontSize": "80%", + "valueMaps": [ + { + "op": "=", + "text": "N/A", + "value": "null" + } + ], + "valueName": "avg" + }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "Prometheus", + "decimals": 2, + "editable": true, + "error": false, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fill": 1, + "fillGradient": 0, + "grid": {}, + "gridPos": { + "h": 7, + "w": 12, + "x": 0, + "y": 3 + }, + "height": "200px", + "hiddenSeries": false, + "id": 86, + "isNew": true, + "legend": { + "alignAsTable": true, + "avg": true, + "current": false, + "hideEmpty": false, + "hideZero": true, + "max": false, + "min": false, + "rightSide": true, + "show": true, + "sideWidth": 300, + "sort": "current", + "sortDesc": true, + "total": false, + "values": true + }, + "lines": true, + "linewidth": 2, + "links": [], + "nullPointMode": "connected", + "options": { + "dataLinks": [] + }, + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", + "repeat": null, + "repeatDirection": "h", + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "round(sum(irate(nginx_ingress_controller_requests{controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\",ingress=~\"$ingress\"}[$__range])) by (ingress), 0.001)", + "format": "time_series", + "hide": false, + "instant": false, + "interval": "", + "intervalFactor": 1, + "legendFormat": "{{ ingress }}", + "metric": "network", + "refId": "A", + "step": 10 + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "Ingress Request Volume", + "tooltip": { + "msResolution": false, + "shared": true, + "sort": 2, + "value_type": "cumulative" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "reqps", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "Bps", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": false + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, + { + "aliasColors": { + "max - istio-proxy": "#890f02", + "max - master": "#bf1b00", + "max - prometheus": "#bf1b00" + }, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "Prometheus", + "decimals": 2, + "editable": false, + "error": false, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fill": 0, + "fillGradient": 0, + "grid": {}, + "gridPos": { + "h": 7, + "w": 12, + "x": 12, + "y": 3 + }, + "hiddenSeries": false, + "id": 87, + "isNew": true, + "legend": { + "alignAsTable": true, + "avg": true, + "current": false, + "hideEmpty": true, + "hideZero": false, + "max": false, + "min": false, + "rightSide": true, + "show": true, + "sideWidth": 300, + "sort": "avg", + "sortDesc": true, + "total": false, + "values": true + }, + "lines": true, + "linewidth": 2, + "links": [], + "nullPointMode": "connected", + "options": { + "dataLinks": [] + }, + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "sum(rate(nginx_ingress_controller_requests{controller_pod=~\"$controller\",controller_class=~\"$controller_class\",namespace=~\"$namespace\",ingress=~\"$ingress\",status!~\"[4-5].*\"}[5m])) by (ingress) / sum(rate(nginx_ingress_controller_requests{controller_pod=~\"$controller\",controller_class=~\"$controller_class\",namespace=~\"$namespace\",ingress=~\"$ingress\"}[5m])) by (ingress)", + "format": "time_series", + "instant": false, + "interval": "10s", + "intervalFactor": 1, + "legendFormat": "{{ ingress }}", + "metric": "container_memory_usage:sort_desc", + "refId": "A", + "step": 10 + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "Ingress Success Rate (non-4|5xx responses)", + "tooltip": { + "msResolution": false, + "shared": true, + "sort": 1, + "value_type": "cumulative" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "percentunit", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": false + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, + { + "columns": [], + "datasource": "Prometheus", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fontSize": "100%", + "gridPos": { + "h": 8, + "w": 24, + "x": 0, + "y": 10 + }, + "hideTimeOverride": false, + "id": 75, + "links": [], + "pageSize": 7, + "repeat": null, + "repeatDirection": "h", + "scroll": true, + "showHeader": true, + "sort": { + "col": 1, + "desc": true + }, + "styles": [ + { + "alias": "Ingress", + "align": "auto", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "pattern": "ingress", + "preserveFormat": false, + "sanitize": false, + "thresholds": [], + "type": "string", + "unit": "short" + }, + { + "alias": "Requests", + "align": "auto", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "pattern": "Value #A", + "thresholds": [ + "" + ], + "type": "number", + "unit": "ops" + }, + { + "alias": "Errors", + "align": "auto", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "pattern": "Value #B", + "thresholds": [], + "type": "number", + "unit": "ops" + }, + { + "alias": "P50 Latency", + "align": "auto", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 0, + "link": false, + "pattern": "Value #C", + "thresholds": [], + "type": "number", + "unit": "dtdurations" + }, + { + "alias": "P90 Latency", + "align": "auto", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 0, + "pattern": "Value #D", + "thresholds": [], + "type": "number", + "unit": "dtdurations" + }, + { + "alias": "P99 Latency", + "align": "auto", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 0, + "pattern": "Value #E", + "thresholds": [], + "type": "number", + "unit": "dtdurations" + }, + { + "alias": "IN", + "align": "auto", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "pattern": "Value #F", + "thresholds": [ + "" + ], + "type": "number", + "unit": "Bps" + }, + { + "alias": "", + "align": "auto", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "pattern": "Time", + "thresholds": [], + "type": "hidden", + "unit": "short" + }, + { + "alias": "OUT", + "align": "auto", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "mappingType": 1, + "pattern": "Value #G", + "thresholds": [], + "type": "number", + "unit": "Bps" + } + ], + "targets": [ + { + "expr": "histogram_quantile(0.50, sum(rate(nginx_ingress_controller_request_duration_seconds_bucket{ingress!=\"\",controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\",ingress=~\"$ingress\"}[$__range])) by (le, ingress))", + "format": "table", + "hide": false, + "instant": true, + "intervalFactor": 1, + "legendFormat": "{{ ingress }}", + "refId": "C" + }, + { + "expr": "histogram_quantile(0.90, sum(rate(nginx_ingress_controller_request_duration_seconds_bucket{ingress!=\"\",controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\",ingress=~\"$ingress\"}[$__range])) by (le, ingress))", + "format": "table", + "hide": false, + "instant": true, + "intervalFactor": 1, + "legendFormat": "{{ ingress }}", + "refId": "D" + }, + { + "expr": "histogram_quantile(0.99, sum(rate(nginx_ingress_controller_request_duration_seconds_bucket{ingress!=\"\",controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\",ingress=~\"$ingress\"}[$__range])) by (le, ingress))", + "format": "table", + "hide": false, + "instant": true, + "intervalFactor": 1, + "legendFormat": "{{ destination_service }}", + "refId": "E" + }, + { + "expr": "sum(irate(nginx_ingress_controller_request_size_sum{ingress!=\"\",controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\",ingress=~\"$ingress\"}[$__range])) by (ingress)", + "format": "table", + "hide": false, + "instant": true, + "interval": "", + "intervalFactor": 1, + "legendFormat": "{{ ingress }}", + "refId": "F" + }, + { + "expr": "sum(irate(nginx_ingress_controller_response_size_sum{ingress!=\"\",controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\",ingress=~\"$ingress\"}[$__range])) by (ingress)", + "format": "table", + "instant": true, + "intervalFactor": 1, + "legendFormat": "{{ ingress }}", + "refId": "G" + } + ], + "timeFrom": null, + "title": "Ingress Percentile Response Times and Transfer Rates", + "transform": "table", + "type": "table-old" + }, + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "Prometheus", + "decimals": 2, + "editable": true, + "error": false, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fill": 1, + "fillGradient": 0, + "grid": {}, + "gridPos": { + "h": 6, + "w": 8, + "x": 0, + "y": 18 + }, + "height": "200px", + "hiddenSeries": false, + "id": 32, + "isNew": true, + "legend": { + "alignAsTable": false, + "avg": true, + "current": true, + "max": false, + "min": false, + "rightSide": false, + "show": false, + "sideWidth": 200, + "sort": "current", + "sortDesc": true, + "total": false, + "values": true + }, + "lines": true, + "linewidth": 2, + "links": [], + "nullPointMode": "connected", + "options": { + "dataLinks": [] + }, + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "sum (irate (nginx_ingress_controller_request_size_sum{controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\"}[5m]))", + "format": "time_series", + "instant": false, + "interval": "10s", + "intervalFactor": 1, + "legendFormat": "Received", + "metric": "network", + "refId": "A", + "step": 10 + }, + { + "expr": "- sum (irate (nginx_ingress_controller_response_size_sum{controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\"}[5m]))", + "format": "time_series", + "hide": false, + "interval": "10s", + "intervalFactor": 1, + "legendFormat": "Sent", + "metric": "network", + "refId": "B", + "step": 10 + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "Network I/O pressure", + "tooltip": { + "msResolution": false, + "shared": true, + "sort": 0, + "value_type": "cumulative" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "Bps", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "Bps", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": false + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, + { + "aliasColors": { + "max - istio-proxy": "#890f02", + "max - master": "#bf1b00", + "max - prometheus": "#bf1b00" + }, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "Prometheus", + "decimals": 2, + "editable": false, + "error": false, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fill": 0, + "fillGradient": 0, + "grid": {}, + "gridPos": { + "h": 6, + "w": 8, + "x": 8, + "y": 18 + }, + "hiddenSeries": false, + "id": 77, + "isNew": true, + "legend": { + "alignAsTable": true, + "avg": true, + "current": true, + "max": false, + "min": false, + "rightSide": false, + "show": false, + "sideWidth": 200, + "sort": "current", + "sortDesc": true, + "total": false, + "values": true + }, + "lines": true, + "linewidth": 2, + "links": [], + "nullPointMode": "connected", + "options": { + "dataLinks": [] + }, + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "avg(nginx_ingress_controller_nginx_process_resident_memory_bytes{controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\"}) ", + "format": "time_series", + "instant": false, + "interval": "10s", + "intervalFactor": 1, + "legendFormat": "nginx", + "metric": "container_memory_usage:sort_desc", + "refId": "A", + "step": 10 + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "Average Memory Usage", + "tooltip": { + "msResolution": false, + "shared": true, + "sort": 2, + "value_type": "cumulative" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "bytes", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": false + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, + { + "aliasColors": { + "max - istio-proxy": "#890f02", + "max - master": "#bf1b00" + }, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "Prometheus", + "decimals": 3, + "editable": false, + "error": false, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, + "fill": 0, + "fillGradient": 0, + "grid": {}, + "gridPos": { + "h": 6, + "w": 8, + "x": 16, + "y": 18 + }, + "height": "", + "hiddenSeries": false, + "id": 79, + "isNew": true, + "legend": { + "alignAsTable": true, + "avg": true, + "current": true, + "max": false, + "min": false, + "rightSide": false, + "show": false, + "sort": null, + "sortDesc": null, + "total": false, + "values": true + }, + "lines": true, + "linewidth": 2, + "links": [], + "nullPointMode": "connected", + "options": { + "dataLinks": [] + }, + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "sum (rate (nginx_ingress_controller_nginx_process_cpu_seconds_total{controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\"}[5m])) ", + "format": "time_series", + "interval": "10s", + "intervalFactor": 1, + "legendFormat": "nginx", + "metric": "container_cpu", + "refId": "A", + "step": 10 + } + ], + "thresholds": [ + { + "colorMode": "critical", + "fill": true, + "line": true, + "op": "gt" + } + ], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "Average CPU Usage", + "tooltip": { + "msResolution": true, + "shared": true, + "sort": 2, + "value_type": "cumulative" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "none", + "label": "cores", + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + } + ], + "refresh": "30s", + "schemaVersion": 25, + "style": "dark", + "tags": [ + "nginx" + ], + "templating": { + "list": [ + { + "current": { + "selected": false, + "text": "Prometheus", + "value": "Prometheus" + }, + "hide": 0, + "includeAll": false, + "label": "datasource", + "multi": false, + "name": "DS_PROMETHEUS", + "options": [], + "query": "prometheus", + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "type": "datasource" + }, + { + "allValue": ".*", + "current": { + "selected": false, + "text": "All", + "value": "$__all" + }, + "datasource": "Prometheus", + "definition": "label_values(kube_service_status_load_balancer_ingress, namespace)", + "hide": 0, + "includeAll": true, + "label": "Namespace", + "multi": false, + "name": "namespace", + "options": [], + "query": "label_values(kube_service_status_load_balancer_ingress, namespace)", + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "sort": 0, + "tagValuesQuery": "", + "tags": [], + "tagsQuery": "", + "type": "query", + "useTags": false + }, + { + "allValue": ".*", + "current": { + "selected": false, + "text": "All", + "value": "$__all" + }, + "datasource": "Prometheus", + "definition": "label_values(kube_service_status_load_balancer_ingress{namespace=~\"$namespace\"}, service)", + "hide": 0, + "includeAll": true, + "label": "Controller Class", + "multi": false, + "name": "controller_class", + "options": [], + "query": "label_values(kube_service_status_load_balancer_ingress{namespace=~\"$namespace\"}, service)", + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "sort": 0, + "tagValuesQuery": "", + "tags": [], + "tagsQuery": "", + "type": "query", + "useTags": false + }, + { + "allValue": ".*", + "current": { + "selected": false, + "text": "All", + "value": "$__all" + }, + "datasource": "Prometheus", + "definition": "label_values(kube_service_status_load_balancer_ingress{namespace=~\"$namespace\",service=~\"$controller_class\"}, pod) ", + "hide": 0, + "includeAll": true, + "label": "Controller", + "multi": false, + "name": "controller", + "options": [], + "query": "label_values(kube_service_status_load_balancer_ingress{namespace=~\"$namespace\",service=~\"$controller_class\"}, pod) ", + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "sort": 0, + "tagValuesQuery": "", + "tags": [], + "tagsQuery": "", + "type": "query", + "useTags": false + }, + { + "allValue": ".*", + "current": { + "selected": false, + "text": "All", + "value": "$__all" + }, + "datasource": "Prometheus", + "definition": "label_values(kube_service_status_load_balancer_ingress{namespace=~\"$namespace\",service=~\"$controller_class\",pod=~\"$controller\"}, ingress) ", + "hide": 0, + "includeAll": true, + "label": "Ingress", + "multi": false, + "name": "ingress", + "options": [], + "query": "label_values(kube_service_status_load_balancer_ingress{namespace=~\"$namespace\",service=~\"$controller_class\",pod=~\"$controller\"}, ingress) ", + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "sort": 2, + "tagValuesQuery": "", + "tags": [], + "tagsQuery": "", + "type": "query", + "useTags": false + } + ] + }, + "time": { + "from": "now-30m", + "to": "now" + }, + "timepicker": { + "refresh_intervals": [ + "30s", + "1m", + "2m", + "5m", + "15m", + "30m", + "1h", + "2h", + "1d" + ], + "time_options": [ + "5m", + "15m", + "1h", + "6h", + "12h", + "24h", + "2d", + "7d", + "30d" + ] + }, + "timezone": "browser", + "title": "Kubernetes Ingress Controller Dashboard", + "uid": "nginx", + "version": 1 +} \ No newline at end of file diff --git a/configs/pdf-service/data-config/bill-amendment-note.json b/configs/pdf-service/data-config/bill-amendment-note.json new file mode 100644 index 00000000..bb877f4d --- /dev/null +++ b/configs/pdf-service/data-config/bill-amendment-note.json @@ -0,0 +1,617 @@ +{ + "key": "bill-amendment-credit-note", + "DataConfigs": { + "serviceName": "rainmaker-common", + "version": "1.0.0", + "baseKeyPath": "$.Amendments.*", + "entityIdPath":"$.id", + "isCommonTableBorderRequired": true, + "mappings": [ + { + "topic": "common-pdf-generation-3", + "mappings": [ + { + "direct": [ + { + "variable": "payerName", + "value": { + "path": "$.payerName" + } + }, + { + "variable": "applicationNo", + "value": { + "path": "$.consumerCode" + } + }, + { + "variable": "user-name", + "value": { + "path": "$.additionalDetails.ownerName" + } + }, + { + "variable": "permanentAddress", + "value": { + "path": "$.additionalDetails.ownerAddress" + } + }, + { + "variable": "date", + "value": { + "path": "$.userInfo.createdDate" + }, + "type":"selectFromRequestInfo" + }, + { + "variable": "payerContact", + "value": { + "path": "$.mobileNumber" + } + }, + { + "variable": "paymentStatus", + "value": { + "path": "$.paymentStatus" + } + }, + { + "variable": "receiptNo", + "value": { + "path": "$.paymentDetails[0].receiptNumber" + } + }, + { + "variable": "serviceType", + "value": { + "path": "$.businessService" + }, + "localisation":{ + "required":true, + "prefix":"MODULE", + "module":"rainmaker-common" + } + }, + { + "variable": "waterTax", + "value": { + "path": "$.demandDetails[?(@.taxHeadMasterCode == 'OM.WATER_CONNECTION/DISCONNECTION_FEES_TAX')].taxAmount" + } + }, + { + "variable": "water_cess", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_WATER_CESS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "waterCess", + "value": { + "path": "$.demandDetails[?(@.taxHeadMasterCode == 'WS_WATER_CESS')].taxAmount" + } + }, + { + "variable": "interest", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_INTEREST" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "generated_by", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_GENERATED_BY" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "commissioner/eo", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_COMMISSIONER_EO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "interestAmount", + "value": { + "path": "$.demandDetails[?(@.taxHeadMasterCode == 'WS_TIME_INTEREST')].taxAmount" + } + }, + { + "variable": "no_signature", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_NO_SIGNATURE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "penalty", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_PENALTY" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "penaltyAmount", + "value": { + "path": "$.demandDetails[?(@.taxHeadMasterCode == 'WS_ADHOC_PENALTY')].taxAmount" + } + }, + { + "variable": "arrears", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_ARREARS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "arrearsAmount", + "value": { + "path": "$.demandDetails[?(@.taxHeadMasterCode == 'ARREARS_AMOUNT')].taxAmount" + } + }, + { + "variable": "total_amount", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_TOTAL_AMOUNT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "bill_amendment_application", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_APPLICATION" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "demand_revision_basis_details", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_DEM_REV_BAS_DET" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "demand_revision_basis", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_DEM_REV_BASIS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "court_order_no", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_COURT_ORDER_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "with_effect_from", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_WITH_EFFECT_FROM" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "demandRevisionBasis", + "value": { + "path": "$.amendmentReason" + } + }, + { + "variable": "courtOrderNo", + "value": { + "path": "$.reasonDocumentNumber" + } + }, + { + "variable": "withEffectFrom", + "value": { + "path": "$.effectiveFrom" + } + }, + { + "variable": "court_order", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_COURT_ORDER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "note_id", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_NOTE_ID" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "note_date", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_NOTE_DATE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "against", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_NOTE_AGAINST" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "adjustment_amount_details", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_NOTE_ADJUSTMENT_AMOUNT_DETAILS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "total_amount", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_NOTE_TOTAL_AMOUNT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "rs", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_NOTE_RS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "box_note", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_NOTE_BOX_NOTE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "box_validity", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_NOTE_BOX_VALIDITY" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "self_declaration", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_SELF_DECLARATION" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "past_bills", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_PAST_BILLS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "courtOrder", + "value": { + "path": "$.transactionNumber" + } + }, + { + "variable": "selfDeclaration", + "value": { + "path": "$.transactionNumber" + } + }, + { + "variable": "pastBills", + "value": { + "path": "$.transactionNumber" + } + }, + { + "variable": "applicationNo", + "value": { + "path": "$.consumerCode" + } + }, + { + "variable": "bill_amendment_application_number", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_APPLICATION_NUMBER" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "adjustment_amount_details", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_ADJUSTMENT_AMOUNT_DETAILS" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + + }, + { + "variable": "sl_no", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_SERIAL_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "tax_heads", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_TAX_HEADS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "reduced_amount", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_REDUCED_AMOUNT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "note_type", + "value": { + "path": "$.additionalDetails.noteType" + }, + "localisation": { + "required": true, + "prefix": "PDF_STATIC_LABEL_BILL_AMENDMENT", + "module": "rainmaker-common" + } + }, + { + "variable": "water_tax", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_WATER_TAX" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "Municipal_Corporation", + "value": { + "path": "PDF_STATIC_LABEL_MDMS_MUNICIPAL_CORPORATION" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + } + ] + }, + { + "derived": [ + { + "variable": "totalAmount", + "formula": "{{arrearsAmount}}+{{penaltyAmount}}+{{interestAmount}}+{{waterCess}}+{{waterTax}}" + } + ] + }, + { + "externalAPI": [ + { + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", + "apiRequest": null, + "responseMapping":[ + { + "variable":"address", + "value":"$.MdmsRes.tenant.tenants[0].address" + }, + { + "variable":"phoneNumber", + "value":"$.MdmsRes.tenant.tenants[0].contactNumber" + }, + { + "variable":"mcGrade", + "value":"$.MdmsRes.tenant.tenants[0].city.pwssbGrade" + }, + { + "variable":"website", + "value":"$.MdmsRes.tenant.tenants[0].domainUrl" + }, + { + "variable":"email", + "value":"$.MdmsRes.tenant.tenants[0].emailId" + }, + { + "variable": "logoImage", + "value":"$.MdmsRes.tenant.tenants[0].logoId", + "type":"image" + }, + { + "variable": "logo-header", + "value":"$.MdmsRes.tenant.tenants[0].code", + "localisation":{ + "required":true, + "prefix": "TENANT_TENANTS", + "module":"rainmaker-common" + } + } + ] + }, + { + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "queryParam": "moduleName=tenant&masterName=footer&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}' %26%26 @.service=='{$.businessService}')%5D", + "apiRequest": null, + "responseMapping":[ + { + "variable": "variable11", + "value": "$.MdmsRes.tenant.footer[0].receiptFooterContent.*", + "type":"array", + "format":{ + "type":"string", + "scema":[ + { + "variable":"disclaimerContent", + "value":"disclaimer", + "type":"string", + "localisation":{ + "required":true, + "prefix": null, + "module": "rainmaker-common" + } + } + ] + } + } + ] + } + ] + } + ] + } + ] + } +} diff --git a/configs/pdf-service/data-config/bill-amendment.json b/configs/pdf-service/data-config/bill-amendment.json new file mode 100644 index 00000000..bbaa44be --- /dev/null +++ b/configs/pdf-service/data-config/bill-amendment.json @@ -0,0 +1,468 @@ +{ + "key": "bill-amendment-summary", + "DataConfigs": { + "serviceName": "rainmaker-common", + "version": "1.0.0", + "baseKeyPath": "$.Amendments.*", + "entityIdPath":"$.id", + "isCommonTableBorderRequired": true, + "mappings": [ + { + "topic": "common-pdf-generation-3", + "mappings": [ + { + "direct": [ + { + "variable": "payerName", + "value": { + "path": "$.payerName" + } + }, + { + "variable": "user-name", + "value": { + "path": "$.userInfo.name" + }, + "type":"selectFromRequestInfo" + }, + { + "variable": "payerContact", + "value": { + "path": "$.mobileNumber" + } + }, + { + "variable": "paymentStatus", + "value": { + "path": "$.paymentStatus" + } + }, + { + "variable": "receiptNo", + "value": { + "path": "$.paymentDetails[0].receiptNumber" + } + }, + { + "variable": "bill_amendment_adjusted_amount", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_ADJUSTED_AMOUNT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "serviceType", + "value": { + "path": "$.businessService" + }, + "localisation":{ + "required":true, + "prefix":"MODULE", + "module":"rainmaker-common" + } + }, + { + "variable": "waterTax", + "value": { + "path": "$.demandDetails[?(@.taxHeadMasterCode == 'OM.WATER_CONNECTION/DISCONNECTION_FEES_TAX')].taxAmount" + } + }, + { + "variable": "water_cess", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_WATER_CESS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "waterCess", + "value": { + "path": "$.demandDetails[?(@.taxHeadMasterCode == 'WS_WATER_CESS')].taxAmount" + } + }, + { + "variable": "interest", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_INTEREST" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "interestAmount", + "value": { + "path": "$.demandDetails[?(@.taxHeadMasterCode == 'WS_TIME_INTEREST')].taxAmount" + } + }, + { + "variable": "penalty", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_PENALTY" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "penaltyAmount", + "value": { + "path": "$.demandDetails[?(@.taxHeadMasterCode == 'WS_ADHOC_PENALTY')].taxAmount" + } + }, + { + "variable": "arrears", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_ARREARS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "arrearsAmount", + "value": { + "path": "$.demandDetails[?(@.taxHeadMasterCode == 'ARREARS_AMOUNT')].taxAmount" + } + }, + { + "variable": "total_amount", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_TOTAL_AMOUNT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "bill_amendment_application", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_APPLICATION" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "demand_revision_basis_details", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_DEM_REV_BAS_DET" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "demand_revision_basis", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_DEM_REV_BASIS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "court_order_no", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_COURT_ORDER_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "with_effect_from", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_WITH_EFFECT_FROM" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "demandRevisionBasis", + "value": { + "path": "$.amendmentReason" + } + }, + { + "variable": "courtOrderNo", + "value": { + "path": "$.reasonDocumentNumber" + } + }, + { + "variable": "withEffectFrom", + "value": { + "path": "$.effectiveFrom" + } + }, + { + "variable": "court_order", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_COURT_ORDER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "self_declaration", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_SELF_DECLARATION" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "past_bills", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_PAST_BILLS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "courtOrder", + "value": { + "path": "$.transactionNumber" + } + }, + { + "variable": "selfDeclaration", + "value": { + "path": "$.transactionNumber" + } + }, + { + "variable": "pastBills", + "value": { + "path": "$.transactionNumber" + } + }, + { + "variable": "applicationNo", + "value": { + "path": "$.consumerCode" + } + }, + { + "variable": "bill_amendment_application_number", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_APPLICATION_NUMBER" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "adjustment_amount_details", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_ADJUSTMENT_AMOUNT_DETAILS" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + + }, + { + "variable": "sl_no", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_SERIAL_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "tax_heads", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_TAX_HEADS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "reduced_amount", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_REDUCED_AMOUNT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "water_tax", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_WATER_TAX" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "Municipal_Corporation", + "value": { + "path": "PDF_STATIC_LABEL_MDMS_MUNICIPAL_CORPORATION" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + } + ] + }, + { + "derived": [ + { + "variable": "totalAmount", + "formula": "{{arrearsAmount}}+{{penaltyAmount}}+{{interestAmount}}+{{waterCess}}+{{waterTax}}" + } + ] + }, + { + "externalAPI": [ + { + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", + "apiRequest": null, + "responseMapping":[ + { + "variable":"address", + "value":"$.MdmsRes.tenant.tenants[0].address" + }, + { + "variable":"phoneNumber", + "value":"$.MdmsRes.tenant.tenants[0].contactNumber" + }, + { + "variable":"mcGrade", + "value":"$.MdmsRes.tenant.tenants[0].city.pwssbGrade" + }, + { + "variable":"website", + "value":"$.MdmsRes.tenant.tenants[0].domainUrl" + }, + { + "variable":"email", + "value":"$.MdmsRes.tenant.tenants[0].emailId" + }, + { + "variable": "logoImage", + "value":"$.MdmsRes.tenant.tenants[0].logoId", + "type":"image" + }, + { + "variable": "logo-header", + "value":"$.MdmsRes.tenant.tenants[0].code", + "localisation":{ + "required":true, + "prefix": "TENANT_TENANTS", + "module":"rainmaker-common" + } + } + ] + }, + { + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "queryParam": "moduleName=tenant&masterName=footer&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}' %26%26 @.service=='{$.businessService}')%5D", + "apiRequest": null, + "responseMapping":[ + { + "variable": "variable11", + "value": "$.MdmsRes.tenant.footer[0].receiptFooterContent.*", + "type":"array", + "format":{ + "type":"string", + "scema":[ + { + "variable":"disclaimerContent", + "value":"disclaimer", + "type":"string", + "localisation":{ + "required":true, + "prefix": null, + "module": "rainmaker-common" + } + } + ] + } + } + ] + } + ] + } + ] + } + ] + } +} diff --git a/configs/pdf-service/data-config/bpa-revocation.json b/configs/pdf-service/data-config/bpa-revocation.json new file mode 100644 index 00000000..edab8053 --- /dev/null +++ b/configs/pdf-service/data-config/bpa-revocation.json @@ -0,0 +1,237 @@ +{ + "key": "bpa-revocation", + "DataConfigs": { + "serviceName": "rainmaker-bpa", + "version": "1.0.0", + "baseKeyPath": "$.Bpa.*", + "entityIdPath": "$.applicationNo", + "isCommonTableBorderRequired": true, + "mappings": [ + { + "mappings": [ + { + "direct": [ + { + "variable": "logoImage", + "url": "https://raw.githubusercontent.com/egovernments/egov-web-app/master/web/rainmaker/dev-packages/egov-ui-kit-dev/src/assets/images/pblogo.png", + "type": "image" + }, + { + "variable": "applicationNo", + "value": { + "path": "$.applicationNo" + } + }, + { + "variable": "planPermissionNo", + "value": { + "path": "$.permitOrderNo" + } + }, + { + "variable": "tenantName", + "value": { + "path": "$.tenantId" + }, + "localisation": { + "required": true, + "prefix": "TENANT_TENANTS", + "module": "rainmaker-common" + } + }, + { + "variable": "createdDate", + "value": { + "path": "$.auditDetails.createdTime" + }, + "type": "date" + }, + { + "variable": "ownerName", + "value": { + "path": "$.owners.*.name" + } + }, + { + "variable": "Muncipal_Council", + "value": { + "path": "BPA_PDF_MUNCIPAL" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "Revocation_Title", + "value": { + "path": "BPA_PDF_BPA_REVOCATION_TITLE" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "Dated", + "value": { + "path": "BPA_PDF_DATED" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "SALUTATION", + "value": { + "path": "BPA_PDF_SALUTATION" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "Permision_Issued", + "value": { + "path": "BPA_PDF_PERMISSION_ISSUED" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "WRT_APPNO", + "value": { + "path": "BPA_PDF_WRT_APPNO" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "dated", + "value": { + "path": "BPA_PDF_DATED_SMALL" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "isRevocated", + "value": { + "path": "BPA_PDF_IS_REVOCATED" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "revocationReasonIs", + "value": { + "path": "BPA_PDF_REASON_REVOCATION_TXT" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "noAuthText", + "value": { + "path": "BPA_PDF_NOT_AUTH_TXT" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "contactULB", + "value": { + "path": "BPA_PDF_CONTACT_ULB" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "BY_ORDER", + "value": { + "path": "BPA_PDF_BY_ORDER" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "AUTH_OFFICER", + "value": { + "path": "BPA_PDF_AUTH_OFFICER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + } + ] + }, + { + "externalAPI": [ + { + "path": "http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search", + "queryParam": "tenantId=$.tenantId,businessIds=$.applicationNo,history=true", + "apiRequest": null, + "responseMapping": [ + { + "variable": "revocatedBy", + "value": "$.ProcessInstances[?(@.action=='REVOCATE')].assigner.name", + "isUpperCaseRequired": true + }, + { + "variable": "revocationReason", + "value": "$.ProcessInstances[?(@.action=='REVOCATE')].comment" + } + ] + } + ] + } + ] + } + ] + } +} diff --git a/configs/pdf-service/data-config/buildingpermit-low.json b/configs/pdf-service/data-config/buildingpermit-low.json new file mode 100644 index 00000000..c3e298cb --- /dev/null +++ b/configs/pdf-service/data-config/buildingpermit-low.json @@ -0,0 +1,623 @@ +{ + "key": "buildingpermit-low", + "DataConfigs": { + "serviceName": "rainmaker-bpa", + "version": "1.0.0", + "baseKeyPath": "$.Bpa.*", + "entityIdPath": "$.applicationNo", + "isCommonTableBorderRequired": true, + "mappings": [ + { + "mappings": [ + { + "direct": [ + { + "variable": "logoImage", + "url": "https://raw.githubusercontent.com/egovernments/egov-web-app/master/web/rainmaker/dev-packages/egov-ui-kit-dev/src/assets/images/pblogo.png", + "type": "image" + }, + { + "variable": "applicationNo", + "value": { + "path": "$.applicationNo" + } + }, + { + "variable": "planPermissionNo", + "value": { + "path": "$.permitOrderNo" + } + }, + { + "variable": "edcrNo", + "value": { + "path": "$.edcrNumber" + } + }, + { + "variable": "createdDate", + "value": { + "path": "$.auditDetails.createdTime" + }, + "type": "date" + }, + { + "variable": "favourOf", + "value": { + "path": "$.owners.*.name" + } + }, + { + "variable": "holdingNo", + "value": { + "path": "$.holdingNo" + } + }, + { + "variable": "validityDate", + "value": { + "path": "$.validityDate" + }, + "type": "date" + }, + { + "variable": "conditions", + "value": { + "path": "$.additionalDetails" + }, + "type": "array-column", + "format": { + "scema": [ + { + "key": "pendingapproval", + "type" : "array-orderedlist" + } + ] + } + }, + { + "variable": "reServeyPlotNo", + "value": { + "path": "$.additionalDetails.reSurveyPlotNo" + } + }, + { + "variable": "townPlanningScheme", + "value": { + "path": "$.additionalDetails.townPlanningScheme" + } + }, + { + "variable": "proposedLandUse", + "value": { + "path": "$.additionalDetails.proposedLandUse" + } + }, + { + "variable": "WRT_TXT", + "value": { + "path": "BOA_PDF_WRT_TXT" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "tenantName", + "value": { + "path": "$.tenantId" + }, + "localisation": { + "required": true, + "prefix": "TENANT_TENANTS", + "module": "rainmaker-common" + } + }, + { + "variable": "GENERATED_ON", + "value": { + "path": "BPA_PDF_GENERATED_ON" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "orderGeneratedOn", + "value": { + "path": "$.orderGeneratedDate" + }, + "type": "date" + }, + { + "variable": "Muncipal_Council", + "value": { + "path": "BPA_PDF_MUNCIPAL" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "BPA_FORM", + "value": { + "path": "BPA_PDF_FORM" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "BPA_FORM_APPROVAL", + "value": { + "path": "BPA_PDF_FORM_APPROVAL_TXT" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "BPA_BYELAWS", + "value": { + "path": "BPA_PDF_BYELAWS" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "PLAN_PERMISION_NO", + "value": { + "path": "BPA_PDF_PLANPERMISSION_NO" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "Dated", + "value": { + "path": "BPA_PDF_DATED" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "dated", + "value": { + "path": "BPA_PDF_DATED_SMALL" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "PERMISSION_GRANT_TXT", + "value": { + "path": "BPA_PDF_PERMISSION_GRANT_TXT" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "SALUTATION", + "value": { + "path": "BPA_PDF_SALUTATION" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "FOR", + "value": { + "path": "BPA_PDF_FOR" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "DSCR1", + "value": { + "path": "BPA_PDF_DSCR" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "PLOT_NO", + "value": { + "path": "BPA_PDF_PLOTNO_TXT" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "CS_PLOT", + "value": { + "path": "BPA_PDF_CS_PLOT" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "MSP_PLOT", + "value": { + "path": "BPA_PDF_MSP_PLOT" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "KHATA_NO", + "value": { + "path": "BPA_PDF_KHATANO_TXT" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "HOLDING_NO", + "value": { + "path": "BPA_PDF_HOLDINGNO_TXT" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "SERVEY_NO", + "value": { + "path": "BPA_PDF_SERVEYNO_TXT" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "TOWNPLANNING_TXT", + "value": { + "path": "BPA_PDF_TOWN_PLANNING_TXT" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "PROPOSE_LAND", + "value": { + "path": "BPA_PDF_PROPOSE_LAND" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "OF", + "value": { + "path": "BPA_PDF_OF" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "CONDNS_TXT", + "value": { + "path": "BPA_PDF_CONDNS_TXT" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "PERMIT_DETAILS_TXT", + "value": { + "path": "BPA_PDF_PERMITFEE_DETAILS_TXT" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "FEE_DSCR", + "value": { + "path": "BPA_PDF_FEE_DSCR" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "AMOUNT", + "value": { + "path": "BPA_PDF_AMOUNT_TXT" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "TOTAL", + "value": { + "path": "BPA_PDF_TOTAL" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "BY_ORDER", + "value": { + "path": "BPA_PDF_BY_ORDER" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "AUTH_OFFICER", + "value": { + "path": "BPA_PDF_COMMISSIONER" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "VALIDITY_DSCR", + "value": { + "path": "BPA_PDF_VALIDITY_DSCR" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "ONLY", + "value": { + "path": "BPA_PDF_ONLY" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "NOTE", + "value": { + "path": "BPA_PDF_NOTE" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "SUMMARY1", + "value": { + "path": "BPA_PDF_SUMMARY1" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "SUMMARY2", + "value": { + "path": "BPA_PDF_SUMMARY2" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "AUTH_DSCR", + "value": { + "path": "BPA_PDF_AUTH_DSCR" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "Bihar_Tenant", + "value": { + "path": "BIHAR_TENANT" + }, + "type" : "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "applicantName", + "value": { + "path": "$.edcrDetail[0].planDetail.planInformation.applicantName" + } + }, + { + "variable": "applicationDate", + "value": { + "path": "$.edcrDetail[0].planDetail.applicationDate" + }, + "type": "date" + }, + { + "variable": "plotNo", + "value": { + "path": "$.edcrDetail[0].planDetail.planInformation.plotNo" + } + }, + { + "variable": "khataNo", + "value": { + "path": "$.edcrDetail[0].planDetail.planInformation.khataNo" + } + } + ] + }, + { + "externalAPI": [ + { + "path": "http://collection-services:8080/collection-services/payments/_search", + "queryParam": "tenantId=$.tenantId,consumerCodes=$.applicationNo", + "apiRequest": null, + "responseMapping": [ + { + "variable": "paymentDetails", + "value": "$.Payments[0].paymentDetails[0].bill.billDetails[0].billAccountDetails.*", + "type" : "array", + "format":{ + "type":"string", + "scema":[ + { + "variable": "headCode", + "value":"taxHeadCode", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "amnt", + "value":"amount" + } + ] + } + }, + { + "variable" : "totalDue", + "value" : "$.Payments[0].paymentDetails[0].bill.billDetails[0].amount" + } + ] + } + ] + }, + { + "qrcodeConfig": [ + { + "variable": "qrCode", + "value": "Applicant Name: {{favourOf}}, Permit Order Number : {{planPermissionNo}}, Permit Order Date : {{orderGeneratedOn}}, eDCR Scrutiny Number: {{edcrNo}}" + } + ] + } + ] + } + ] + } +} diff --git a/configs/pdf-service/data-config/buildingpermit.json b/configs/pdf-service/data-config/buildingpermit.json new file mode 100644 index 00000000..ddbb4eaa --- /dev/null +++ b/configs/pdf-service/data-config/buildingpermit.json @@ -0,0 +1,642 @@ +{ + "key": "buildingpermit", + "DataConfigs": { + "serviceName": "rainmaker-bpa", + "version": "1.0.0", + "baseKeyPath": "$.Bpa.*", + "entityIdPath": "$.applicationNo", + "isCommonTableBorderRequired": true, + "mappings": [ + { + "mappings": [ + { + "direct": [ + { + "variable": "logoImage", + "url": "https://raw.githubusercontent.com/egovernments/egov-web-app/master/web/rainmaker/dev-packages/egov-ui-kit-dev/src/assets/images/pblogo.png", + "type": "image" + }, + { + "variable": "applicationNo", + "value": { + "path": "$.applicationNo" + } + }, + { + "variable": "planPermissionNo", + "value": { + "path": "$.permitOrderNo" + } + }, + { + "variable": "edcrNo", + "value": { + "path": "$.edcrNumber" + } + }, + { + "variable": "createdDate", + "value": { + "path": "$.auditDetails.createdTime" + }, + "type": "date" + }, + { + "variable": "favourOf", + "value": { + "path": "$.owners.*.name" + } + }, + { + "variable": "holdingNo", + "value": { + "path": "$.holdingNo" + } + }, + { + "variable": "validityDate", + "value": { + "path": "$.validityDate" + }, + "type": "date" + }, + { + "variable": "conditions", + "value": { + "path": "$.additionalDetails" + }, + "type": "array-column", + "format": { + "scema": [ + { + "key": "pendingapproval", + "type" : "array-orderedlist" + } + ] + } + }, + { + "variable": "reServeyPlotNo", + "value": { + "path": "$.additionalDetails.reSurveyPlotNo" + } + }, + { + "variable": "townPlanningScheme", + "value": { + "path": "$.additionalDetails.townPlanningScheme" + } + }, + { + "variable": "proposedLandUse", + "value": { + "path": "$.additionalDetails.proposedLandUse" + } + }, + { + "variable": "WRT_TXT", + "value": { + "path": "BOA_PDF_WRT_TXT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "tenantName", + "value": { + "path": "$.tenantId" + }, + "localisation": { + "required": true, + "prefix": "TENANT_TENANTS", + "module": "rainmaker-common" + } + }, + { + "variable": "GENERATED_ON", + "value": { + "path": "BPA_PDF_GENERATED_ON" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "orderGeneratedOn", + "value": { + "path": "$.orderGeneratedDate" + }, + "type": "date" + }, + { + "variable": "Muncipal_Council", + "value": { + "path": "BPA_PDF_MUNCIPAL" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "BPA_FORM", + "value": { + "path": "BPA_PDF_FORM" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "BPA_FORM_APPROVAL", + "value": { + "path": "BPA_PDF_FORM_APPROVAL_TXT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "BPA_BYELAWS", + "value": { + "path": "BPA_PDF_BYELAWS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "PLAN_PERMISION_NO", + "value": { + "path": "BPA_PDF_PLANPERMISSION_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "Dated", + "value": { + "path": "BPA_PDF_DATED" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "dated", + "value": { + "path": "BPA_PDF_DATED_SMALL" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "PERMISSION_GRANT_TXT", + "value": { + "path": "BPA_PDF_PERMISSION_GRANT_TXT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "SALUTATION", + "value": { + "path": "BPA_PDF_SALUTATION" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "FOR", + "value": { + "path": "BPA_PDF_FOR" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "DSCR1", + "value": { + "path": "BPA_PDF_DSCR" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "PLOT_NO", + "value": { + "path": "BPA_PDF_PLOTNO_TXT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "CS_PLOT", + "value": { + "path": "BPA_PDF_CS_PLOT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "MSP_PLOT", + "value": { + "path": "BPA_PDF_MSP_PLOT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "KHATA_NO", + "value": { + "path": "BPA_PDF_KHATANO_TXT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "HOLDING_NO", + "value": { + "path": "BPA_PDF_HOLDINGNO_TXT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "SERVEY_NO", + "value": { + "path": "BPA_PDF_SERVEYNO_TXT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "TOWNPLANNING_TXT", + "value": { + "path": "BPA_PDF_TOWN_PLANNING_TXT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "PROPOSE_LAND", + "value": { + "path": "BPA_PDF_PROPOSE_LAND" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "OF", + "value": { + "path": "BPA_PDF_OF" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "CONDNS_TXT", + "value": { + "path": "BPA_PDF_CONDNS_TXT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "PERMIT_DETAILS_TXT", + "value": { + "path": "BPA_PDF_PERMITFEE_DETAILS_TXT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "FEE_DSCR", + "value": { + "path": "BPA_PDF_FEE_DSCR" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "AMOUNT", + "value": { + "path": "BPA_PDF_AMOUNT_TXT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "TOTAL", + "value": { + "path": "BPA_PDF_TOTAL" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "BY_ORDER", + "value": { + "path": "BPA_PDF_BY_ORDER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "AUTH_OFFICER", + "value": { + "path": "BPA_PDF_AUTH_OFFICER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "VALIDITY_DSCR", + "value": { + "path": "BPA_PDF_VALIDITY_DSCR" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "ONLY", + "value": { + "path": "BPA_PDF_ONLY" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "NOTE", + "value": { + "path": "BPA_PDF_NOTE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "SUMMARY1", + "value": { + "path": "BPA_PDF_SUMMARY1" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "SUMMARY2", + "value": { + "path": "BPA_PDF_SUMMARY2" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "AUTH_DSCR", + "value": { + "path": "BPA_PDF_AUTH_DSCR" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "Bihar_Tenant", + "value": { + "path": "BIHAR_TENANT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-bpa" + } + }, + { + "variable": "applicantName", + "value": { + "path": "$.edcrDetail[0].planDetail.planInformation.applicantName" + } + }, + { + "variable": "applicationDate", + "value": { + "path": "$.edcrDetail[0].planDetail.applicationDate" + }, + "type": "date" + }, + { + "variable": "plotNo", + "value": { + "path": "$.edcrDetail[0].planDetail.planInformation.plotNo" + } + }, + { + "variable": "khataNo", + "value": { + "path": "$.edcrDetail[0].planDetail.planInformation.khataNo" + } + } + ] + }, + { + "externalAPI": [ + { + "path": "http://collection-services:8080/collection-services/payments/_search", + "queryParam": "tenantId=$.tenantId,consumerCodes=$.applicationNo", + "apiRequest": null, + "responseMapping": [ + { + "variable": "sanHeadCode", + "value": "$.Payments[0].paymentDetails[0].bill.billDetails[0].billAccountDetails[0].taxHeadCode", + "localisation": { + "required": true, + "prefix": "BPA", + "module": "rainmaker-bpa" + } + }, + { + "variable": "sanFee", + "value": "$.Payments[0].paymentDetails[0].bill.billDetails[0].billAccountDetails[0].amount" + }, + { + "variable": "appHeadCode", + "value": "$.Payments[1].paymentDetails[0].bill.billDetails[0].billAccountDetails[0].taxHeadCode", + "localisation": { + "required": true, + "prefix": "BPA", + "module": "rainmaker-bpa" + } + }, + { + "variable": "appFee", + "value": "$.Payments[1].paymentDetails[0].bill.billDetails[0].billAccountDetails[0].amount" + } + ] + }, + { + "path": "http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search", + "queryParam": "tenantId=$.tenantId,businessIds=$.applicationNo,history=true", + "apiRequest": null, + "responseMapping": [ + { + "variable": "approvedBy", + "value": "$.ProcessInstances[?(@.action=='APPROVE')].assigner.name", + "isUpperCaseRequired": true + } + ] + } + ] + }, + { + "derived": [ + { + "variable": "totalDue", + "formula": "{{sanFee}}+{{appFee}}" + } + ] + }, + { + "qrcodeConfig": [ + { + "variable": "qrCode", + "value": "Applicant Name: {{favourOf}}, Permit Order Number : {{planPermissionNo}}, Permit Order Date : {{orderGeneratedOn}}, eDCR Scrutiny Number: {{edcrNo}}, Approver Name : {{approvedBy}}" + } + ] + } + ] + } + ] + } +} diff --git a/configs/pdf-service/data-config/consolidated-pdf1.json b/configs/pdf-service/data-config/consolidated-pdf1.json new file mode 100644 index 00000000..14d85ad1 --- /dev/null +++ b/configs/pdf-service/data-config/consolidated-pdf1.json @@ -0,0 +1,124 @@ +{ + "key": "consolidated-pdf1", + "DataConfigs": { + "serviceName": "rainmaker-common", + "version": "1.0.0", + "baseKeyPath": "$.Receipt.*", + "isCommonTableBorderRequired": true, + "mappings": [ + { + "topic": "common-pdf-generation-1", + "staticConfigPath": "https://raw.githubusercontent.com/egovernments/egov-services/vishal-feature-filestore/core/egov-indexer/src/main/resources/rainmaker-pgr-indexer.yml", + "mappings": [ + { + "direct": [ + { + "variable": "variable1", + "value": { + "path": "$.Bill[0].payerName" + } + }, + { + "variable": "variable2", + "value": { + "path": "$.Bill[0].mobileNumber" + } + }, + { + "variable": "variable3", + "value": { + "path": "$.Bill[0].billDetails[0].receiptNumber" + } + }, + { + "variable": "variable4", + "value": { + "path": "$.Bill[0].taxAndPayments[0].businessService" + } + }, + { + "variable": "variable5", + "value": { + "path": "$.Bill[0].taxAndPayments[0].amountPaid" + } + }, + { + "variable": "variable6", + "value": { + "path": "$.Bill[0].billDetails[0].fromPeriod" + } + }, + { + "variable": "variable7", + "value": { + "path": "$.Bill[0].billDetails[0].toPeriod" + } + }, + { + "variable": "variable8", + "value": { + "path": "$.Bill[0].billDetails[0].billDate" + } + }, + { + "variable": "variable9", + "value": { + "path": "$.instrument.instrumentType.name" + } + }, + { + "variable": "variable10", + "value": { + "path": "$.Bill[0].billDetails[0].manualReceiptNumber" + } + }, + { + "variable": "variable11", + "value": { + "path": "$.Bill[0].billDetails[0].manualReceiptDate" + } + }, + { + "variable": "variable12", + "value": { + "path": "$.Bill[0].billDetails[0].totalAmount" + } + }, + { + "variable": "variable13", + "value": { + "path": "$.Receipt[0].instrument.transactionDateInput" + } + }, + { + "variable": "variable14", + "value": { + "path": "$.consumerCode" + } + }, + { + "variable": "variable15", + "value": { + "path": "$.transactionId" + } + }, + { + "variable": "variable16", + "url":"https://raw.githubusercontent.com/egovernments/egov-web-app/master/web/rainmaker/dev-packages/egov-ui-kit-dev/src/assets/images/pblogo.png", + "type":"image" + } + ] + }, + { + "derived": [ + { + "variable": "variable19", + "formula": "{{variable12}}-{{variable5}}" + } + ] + } + ] + } + ] + } +} diff --git a/configs/pdf-service/data-config/consolidated-pdf2.json b/configs/pdf-service/data-config/consolidated-pdf2.json new file mode 100644 index 00000000..ef1fb938 --- /dev/null +++ b/configs/pdf-service/data-config/consolidated-pdf2.json @@ -0,0 +1,124 @@ +{ + "key": "consolidated-pdf2", + "DataConfigs": { + "serviceName": "rainmaker-common", + "version": "1.0.0", + "baseKeyPath": "$.Receipt.*", + "isCommonTableBorderRequired": true, + "mappings": [ + { + "topic": "common-pdf-generation-1", + "staticConfigPath": "https://raw.githubusercontent.com/egovernments/egov-services/vishal-feature-filestore/core/egov-indexer/src/main/resources/rainmaker-pgr-indexer.yml", + "mappings": [ + { + "direct": [ + { + "variable": "variable1", + "url": "https://raw.githubusercontent.com/egovernments/egov-web-app/master/web/rainmaker/dev-packages/egov-ui-kit-dev/src/assets/images/pblogo.png", + "type": "image" + }, + { + "variable": "variable2", + "value": { + "path": "$.Bill[0].payerName" + } + }, + { + "variable": "variable3", + "value": { + "path": "$.Bill[0].mobileNumber" + } + }, + { + "variable": "variable4", + "value": { + "path": "$.Bill[0].payerAddress" + } + }, + { + "variable": "variable5", + "value": { + "path": "$.Bill[0].billDetails[0].billNumber" + } + }, + { + "variable": "variable6", + "value": { + "path": "$.Bill[0].billDetails[0].fromPeriod" + } + }, + { + "variable": "variable7", + "value": { + "path": "$.Bill[0].billDetails[0].toPeriod" + } + }, + { + "variable": "variable8", + "value": { + "path": "$.Bill[0].billDetails[0].billDate" + } + }, + { + "variable": "variable9", + "value": { + "path": "$.Bill[0].billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_TIME_PENALTY')].amount" + } + }, + { + "variable": "variable10", + "value": { + "path": "$.Bill[0].billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_TIME_REBATE')].amount" + } + }, + { + "variable": "variable11", + "value": { + "path": "$.Bill[0].billDetails[0].totalAmount" + } + }, + { + "variable": "variable12", + "value": { + "path": "$.transactionId" + } + }, + { + "variable": "variable13", + "value": { + "path": "$.Bill[0].billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_TIME_REBATE')].amount" + } + }, + { + "variable": "variable14", + "value": { + "path": "$.Receipt[0].Bill[0].billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_TAX')].amount" + } + }, + { + "variable": "variable15", + "value": { + "path": "$.consumerCode" + } + }, + { + "variable": "variable16", + "value": { + "path": "$.Bill[0].billDetails[0].amountPaid" + } + } + ] + }, + { + "derived": [ + { + "variable": "variable19", + "formula": "{{variable16}}-{{variable17}}" + } + ] + } + ] + } + ] + } +} diff --git a/configs/pdf-service/data-config/consolidatedbill.json b/configs/pdf-service/data-config/consolidatedbill.json new file mode 100644 index 00000000..0944cf75 --- /dev/null +++ b/configs/pdf-service/data-config/consolidatedbill.json @@ -0,0 +1,702 @@ +{ + "key": "consolidatedbill", + "DataConfigs": { + "serviceName": "rainmaker-common", + "version": "1.0.0", + "baseKeyPath": "$.Bill.*", + "entityIdPath":"$.billNumber", + "isCommonTableBorderRequired": true, + "mappings": [ + { + "topic": "common-pdf-generation-1", + "staticConfigPath": "https://raw.githubusercontent.com/egovernments/egov-services/vishal-feature-filestore/core/egov-indexer/src/main/resources/rainmaker-pgr-indexer.yml", + "mappings": [ + { + "direct": [ + { + "variable": "total_amount_due", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_TOTAL_AMOUNT_DUE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payer_name", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PAYER_NAME" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "Municipal_Corporation", + "value": { + "path": "PDF_STATIC_LABEL_MDMS_MUNICIPAL_CORPORATION" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "bill_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_BILL_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "Rs", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_RUPEE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "mobile_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_MOBILE_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "bill_period", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_BILL_PERIOD" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payer_address", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PAYER_ADDRESS" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + + { + "variable": "bill_issue_date", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ISSUE_DATE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "bill_due_date", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_BILL_DUE_DATE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "billing_summary_property_tax", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_BILLING_SUMMARY" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "serviceType", + "value": { + "path": "$.businessService" + }, + "localisation":{ + "required":true, + "prefix":"MODULE", + "module":"rainmaker-common" + } + }, + { + "variable": "property_id", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PROPERTY_ID" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "arrears_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ARREARS" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "charge_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_CHARGE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + + { + "variable": "penalty_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PENALTY" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "rebate_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_REBATE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "others_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_OTHERS" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "total_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_TOTAL" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "important_message", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_IMPORTANT_MESSAGE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payment_received", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PAYMENT_RECEIVED" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "this_document", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_THIS_DOCUMENT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "this_is_a", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_THIS_IS" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "assessment_payment", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ASSESSSMENT_PAYMENT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "please_deposit", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PLEASE_DEPOSIT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "if_the_tax", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_IF_THE_TAX" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "acknowledgement_for", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ACKNOWLEDGEMENT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "date_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_DATE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "consumer_id", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_CONSUMER_ID" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "consumer_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_CONSUMER_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "name_address", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_NAME_ADDRESS" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "total_payment", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_TOTAL_PAYMENT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "receivers_signature", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_RECEIVERS_SIGNATURE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "totalAmountDue", + "value": { + "path": "$.totalAmount" + } + }, + { + "variable": "total", + "value": { + "path": "$.totalAmount" + } + }, + + { + "variable": "payerName", + "value": { + "path": "$.payerName" + } + }, + + { + "variable": "mobileNo", + "value": { + "path": "$.mobileNumber" + } + }, + + { + "variable": "payerAddress", + "value": { + "path": "$.payerAddress" + } + }, + { + "variable": "nameAddress", + "value": { + "path": "$.payerAddress" + } + }, + + { + "variable": "billNo", + "value": { + "path": "$.billNumber" + } + }, + { + "variable": "fromPeriod", + "value": { + "path": "$.billDetails[0].fromPeriod" + }, + "type": "date" + }, + { + "variable": "toPeriod", + "value": { + "path": "$.billDetails[0].toPeriod" + }, + "type": "date" + }, + + { + "variable": "billIssueDate", + "value": { + "path": "$.billDate" + }, + "type": "date" + }, + + { + "variable": "billDueDate", + "value": { + "path": "$.billDetails[0].expiryDate" + }, + "type": "date" + }, + { + "variable": "billdate", + "value": { + "path": "$.billDate" + }, + "type": "date" + }, + + { + "variable": "propertyID", + "value": { + "path": "$.consumerCode" + } + }, + { + "variable": "taxCharge", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_TAX' || @.taxHeadCode == 'TL_TAX' || @.taxHeadCode == 'FIRENOC_TAXES' || @.taxHeadCode == 'WS_CHARGE' || @.taxHeadCode == 'SW_CHARGE' )].amount" + } + }, + { + "variable": "timeRebate", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_TIME_REBATE' || @.taxHeadCode == 'WS_TIME_REBATE' || @.taxHeadCode == 'SW_TIME_REBATE')].amount" + } + }, + { + "variable": "adhocRebate", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_ADHOC_REBATE' || @.taxHeadCode == 'TL_ADHOC_REBATE' || @.taxHeadCode == 'FIRENOC_ADHOC_REBATE')].amount" + } + }, + + { + "variable": "timePenalty", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_TIME_PENALTY' || @.taxHeadCode == 'WS_TIME_PENALTY' || @.taxHeadCode == 'SW_TIME_PENALTY')].amount" + } + }, + { + "variable": "adhocPenalty", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_ADHOC_PENALTY' || @.taxHeadCode == 'TL_ADHOC_PENALTY' || @.taxHeadCode == 'FIRENOC_ADHOC_PENALTY')].amount" + } + }, + { + "variable": "firecess", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_FIRE_CESS')].amount" + } + }, + { + "variable": "usageExemption", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_UNIT_USAGE_EXEMPTION')].amount" + } + }, + { + "variable": "roundoff", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_ROUNDOFF' || @.taxHeadCode == 'TL_ROUNDOFF' || @.taxHeadCode == 'FIRENOC_ROUNDOFF' || @.taxHeadCode == 'WS_Round_Off' || @.taxHeadCode == 'SW_Round_Off')].amount" + } + }, + { + "variable": "fees", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'FIRENOC_FEES')].amount" + } + }, + { + "variable": "ownerExemption", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_OWNER_EXEMPTION')].amount" + } + }, + { + "variable": "cancerCess", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_CANCER_CESS')].amount" + } + }, + { + "variable": "waterCess", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'WS_WATER_CESS')].amount" + } + }, + { + "variable": "timeInterest", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_TIME_INTEREST' || @.taxHeadCode == 'WS_TIME_INTEREST' || @.taxHeadCode == 'SW_TIME_INTEREST')].amount" + } + }, + { + "variable": "ceilingDebit", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_DECIMAL_CEILING_DEBIT')].amount" + } + }, + { + "variable": "ceilingCredit", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_DECIMAL_CEILING_CREDIT')].amount" + } + }, + { + "variable": "carryForward", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_ADVANCE_CARRYFORWARD')].amount" + } + }, + + { + "variable": "consumerID", + "value": { + "path": "$.consumerCode" + } + }, + { + "variable": "date", + "value": { + "path": "$.billDate" + }, + "type": "date" + }, + { + "variable": "totalPayment", + "value": { + "path": "$.billDetails[0].amountPaid" + } + }, + { + "variable": "WS_arrears", + "value":{ + "path": "$.arrearAmount" + } + }, + { + "variable":"scissorImage", + "url":"http://www.pngall.com/wp-content/uploads/2016/03/Scissor-PNG-Clipart.png", + "type":"image" + } + ] + }, + { + "derived": [ + { + "variable": "charge", + "formula": "{{taxCharge}}+{{fees}}" + }, + { + "variable": "penalty", + "formula": "{{timePenalty}}+{{adhocPenalty}}" + }, + { + "variable": "rebate", + "formula": "{{timeRebate}}+{{adhocRebate}}" + }, + { + "variable": "others", + "formula": "{{cancerCess}}+{{roundoff}}+{{timeInterest}}+{{ceilingDebit}}+{{ceilingCredit}}+{{firecess}}+{{waterCess}}" + }, + { + "variable": "arrears", + "formula": "{{WS_arrears}}" + } + ] + }, + { + "externalAPI": [ + { + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", + "apiRequest": null, + "responseMapping":[ + { + "variable":"address", + "value":"$.MdmsRes.tenant.tenants[0].address" + }, + { + "variable":"phoneNumber", + "value":"$.MdmsRes.tenant.tenants[0].contactNumber" + }, + { + "variable":"website", + "value":"$.MdmsRes.tenant.tenants[0].domainUrl" + }, + { + "variable":"email", + "value":"$.MdmsRes.tenant.tenants[0].emailId" + }, + { + "variable": "logoImage", + "value":"$.MdmsRes.tenant.tenants[0].logoId", + "type": "image" + }, + { + "variable": "logo_header", + "value":"$.MdmsRes.tenant.tenants[0].code", + "localisation":{ + "required":true, + "prefix": "TENANT_TENANTS", + "module":"rainmaker-common" + } + } + ] + } + ] + } + ] + } + ] + } +} diff --git a/configs/pdf-service/data-config/consolidatedreceipt.json b/configs/pdf-service/data-config/consolidatedreceipt.json new file mode 100644 index 00000000..d0b8aba8 --- /dev/null +++ b/configs/pdf-service/data-config/consolidatedreceipt.json @@ -0,0 +1,606 @@ +{ + "key": "consolidatedreceipt", + "documentType":"CONSOLIDATED_RECEIPT", + "DataConfigs": { + "moduleName": "rainmaker-common", + "version": "1.0.0", + "baseKeyPath": "$.Payments.*", + "entityIdPath":"$.id", + "isCommonTableBorderRequired": true, + "mappings": [ + { + "topic": "common-pdf-generation-3", + "mappings": [ + { + "direct": [ + { + "variable": "payerName", + "value": { + "path": "$.payerName" + } + }, + { + "variable": "PaidBy", + "value": { + "path": "$.paidBy" + } + }, + { + "variable": "chequeDD", + "value": { + "path": "$.instrumentNumber" + } + }, + { + "variable": "user-name", + "value": { + "path": "$.userInfo.name" + }, + "type":"selectFromRequestInfo" + }, + { + "variable": "payerContact", + "value": { + "path": "$.mobileNumber" + } + }, + { + "variable": "receiptNo", + "value": { + "path": "$.paymentDetails[0].receiptNumber" + } + }, + { + "variable": "serviceType", + "value": { + "path": "$.paymentDetails[0].businessService" + }, + "localisation":{ + "required":true, + "prefix":"MODULE", + "module":"rainmaker-common" + } + }, + { + "variable": "paidAmount", + "value": { + "path": "$.paymentDetails[0].totalAmountPaid" + } + }, + { + "variable": "fieldFee", + "value": { + "path": "$.paymentDetails[0].additionalDetails.fieldfee" + } + }, { + "variable": "taxAmount", + "value": { + "path": "$.paymentDetails[0].additionalDetails.tax" + } + }, { + "variable": "cgst", + "value": { + "path": "$.paymentDetails[0].additionalDetails.cgst" + } + }, { + "variable": "sgst", + "value": { + "path": "$.paymentDetails[0].additionalDetails.sgst" + } + }, + + { + "variable": "fromPeriod", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].fromPeriod" + }, + "type": "date" + }, + { + "variable": "chequeDDDate", + "value": { + "path": "$.instrumentDate" + }, + "type":"date" + }, + { + "variable": "toPeriod", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].toPeriod" + }, + "type": "date" + }, + { + "variable": "payerAddress", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].additionalDetails.address" + } + }, + { + "variable": "oldPayerAddress", + "value": { + "path": "$.payerAddress" + } + }, + { + "variable": "oldComments", + "value": { + "path": "$.additionalDetails.comment" + } + }, + { + "variable": "paymentMode", + "value": { + "path": "$.paymentMode" + }, + "localisation":{ + "required":true, + "prefix": "COMMON_MASTERS_PAYMENTMODE", + "module": "rainmaker-common" + } + }, + { + "variable": "G8ReceiptNo", + "value": { + "path": "$.paymentDetails[0].manualReceiptNumber" + } + }, + { + "variable": "G8ReceiptDate", + "value": { + "path": "$.paymentDetails[0].manualReceiptDate" + }, + "type": "date" + }, + { + "variable": "ReceiptDate", + "value": { + "path": "$.paymentDetails[0].receiptDate" + }, + "type": "date" + }, { + "variable": "bankName", + "value": { + "path": "$.additionalDetails[0].bankName" + } + }, { + "variable": "branchName", + "value": { + "path": "$.additionalDetails[0].branchName" + } + }, { + "variable": "ifsc", + "value": { + "path": "$.ifscCode" + } + }, + { + "variable": "paymentDate", + "value": { + "path": "$.transactionDate" + }, + "type": "date" + }, + { + "variable": "transactionID", + "value": { + "path": "$.transactionNumber" + } + }, + { + "variable": "consumerID", + "value": { + "path": "$.paymentDetails[0].bill.consumerCode" + } + }, + { + "variable": "dueAmount", + "value": { + "path": "$.paymentDetails[0].totalDue" + } + }, + { + "variable": "payment_receipt", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_RECEIPT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "receipt_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_RECEIPT_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "consumer_id", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_CONSUMER_ID" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payment_date", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_DATE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payer_name", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYER_NAME" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payer_contact", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYER_CONTACT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "service_type", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_SERVICE_TYPE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "billing_period", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_BILLING_PERIOD" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "paid_amount", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAID_AMOUNT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "pending_amount", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PENDING_AMOUNT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payment_mode", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_MODE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "transaction_id", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_TRANSACTION_ID" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "g8_receipt_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_G8_RECEIPT_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "g8_receipt_date", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_G8_RECEIPT_DATE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "cheque_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_CHEQUE_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "generated_by", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_GENERATED_BY" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "commissioner/eo", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_COMMISSIONER_EO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "no_signature", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_NO_SIGNATURE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "disclamer", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "disclamer_1", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_FIRST_LINE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "disclamer_2", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_SECOND_LINE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "disclamer_3", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_THIRD_LINE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "disclamer_4", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_FOURTH_LINE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "disclamer_5", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_FIFTH_LINE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "to", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_TO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "Municipal_Corporation", + "value": { + "path": "PDF_STATIC_LABEL_MDMS_MUNICIPAL_CORPORATION" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + } + ] + }, + { + "derived": [ + { + "variable": "pendingAmount", + "formula": "{{dueAmount}}-{{paidAmount}}" + } + ] + }, + { + "externalAPI": [ + { + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", + "apiRequest": null, + "responseMapping":[ + { + "variable":"address", + "value":"$.MdmsRes.tenant.tenants[0].address" + }, + { + "variable":"phoneNumber", + "value":"$.MdmsRes.tenant.tenants[0].contactNumber" + }, + { + "variable":"website", + "value":"$.MdmsRes.tenant.tenants[0].domainUrl" + }, + { + "variable":"mcGrade", + "value":"$.MdmsRes.tenant.tenants[0].city.ulbType" + }, + { + "variable":"email", + "value":"$.MdmsRes.tenant.tenants[0].emailId" + }, + { + "variable": "logoImage", + "value":"$.MdmsRes.tenant.tenants[0].logoId", + "type":"image" + }, + { + "variable": "logo-header", + "value":"$.MdmsRes.tenant.tenants[0].code", + "localisation":{ + "required":true, + "prefix": "TENANT_TENANTS", + "module":"rainmaker-common" + } + } + ] + }, + { + "path": "http://echallan-services:8080/echallan-services/eChallan/v1/_search", + "queryParam": "tenantId=$.tenantId,challanNo=$.paymentDetails[0].bill.consumerCode,businessService=$.paymentDetails[0].businessService,offset=0", + "apiRequest": null, + "responseMapping":[ + { + "variable":"comments", + "value":"$.challans[0].description" + }, + { + "variable":"consumerName", + "value":"$.challans[0].citizen.name" + }, + { + "variable": "doorHouseNo", + "value": "$.challans[0].address.doorNo" + }, + { + "variable": "streetName", + "value": "$.challans[0].address.street" + + }, + { + "variable": "buildingName", + "value": "$.challans[0].address.buildingName" + }, + { + "variable": "pinCode", + "value":"$.challans[0].address.pincode" + } + ] + } + + ] + } + ] + } + ] + } +} diff --git a/configs/pdf-service/data-config/consolidatedreceiptold.json b/configs/pdf-service/data-config/consolidatedreceiptold.json new file mode 100644 index 00000000..b754b62b --- /dev/null +++ b/configs/pdf-service/data-config/consolidatedreceiptold.json @@ -0,0 +1,579 @@ +{ + "key": "consolidatedreceiptold", + "documentType":"CONSOLIDATED_RECEIPT", + "DataConfigs": { + "moduleName": "rainmaker-common", + "version": "1.0.0", + "baseKeyPath": "$.Payments.*", + "entityIdPath":"$.id", + "isCommonTableBorderRequired": true, + "mappings": [ + { + "topic": "common-pdf-generation-3", + "mappings": [ + { + "direct": [ + { + "variable": "payerName", + "value": { + "path": "$.payerName" + } + }, + { + "variable": "PaidBy", + "value": { + "path": "$.paidBy" + } + }, + { + "variable": "chequeDD", + "value": { + "path": "$.instrumentNumber" + } + }, + { + "variable": "user-name", + "value": { + "path": "$.userInfo.name" + }, + "type":"selectFromRequestInfo" + }, + { + "variable": "payerContact", + "value": { + "path": "$.mobileNumber" + } + }, + { + "variable": "receiptNo", + "value": { + "path": "$.paymentDetails[0].receiptNumber" + } + }, + { + "variable": "serviceType", + "value": { + "path": "$.paymentDetails[0].businessService" + }, + "localisation":{ + "required":true, + "prefix":"MODULE", + "module":"rainmaker-common" + } + }, + { + "variable": "paidAmount", + "value": { + "path": "$.paymentDetails[0].totalAmountPaid" + } + }, + { + "variable": "fieldFee", + "value": { + "path": "$.paymentDetails[0].additionalDetails.fieldfee" + } + }, { + "variable": "taxAmount", + "value": { + "path": "$.paymentDetails[0].additionalDetails.tax" + } + }, { + "variable": "cgst", + "value": { + "path": "$.paymentDetails[0].additionalDetails.cgst" + } + }, { + "variable": "sgst", + "value": { + "path": "$.paymentDetails[0].additionalDetails.sgst" + } + }, + + { + "variable": "fromPeriod", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].fromPeriod" + }, + "type": "date" + }, + { + "variable": "chequeDDDate", + "value": { + "path": "$.instrumentDate" + }, + "type":"date" + }, + { + "variable": "toPeriod", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].toPeriod" + }, + "type": "date" + }, + { + "variable": "payerAddress", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].additionalDetails.address" + } + }, + { + "variable": "oldPayerAddress", + "value": { + "path": "$.payerAddress" + } + }, + { + "variable": "oldComments", + "value": { + "path": "$.additionalDetails.comment" + } + }, + { + "variable": "comments", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].additionalDetails.comment" + } + }, + { + "variable": "paymentMode", + "value": { + "path": "$.paymentMode" + }, + "localisation":{ + "required":true, + "prefix": "COMMON_MASTERS_PAYMENTMODE", + "module": "rainmaker-common" + } + }, + { + "variable": "G8ReceiptNo", + "value": { + "path": "$.paymentDetails[0].manualReceiptNumber" + } + }, + { + "variable": "G8ReceiptDate", + "value": { + "path": "$.paymentDetails[0].manualReceiptDate" + }, + "type": "date" + }, + { + "variable": "ReceiptDate", + "value": { + "path": "$.paymentDetails[0].receiptDate" + }, + "type": "date" + }, { + "variable": "bankName", + "value": { + "path": "$.additionalDetails[0].bankName" + } + }, { + "variable": "branchName", + "value": { + "path": "$.additionalDetails[0].branchName" + } + }, { + "variable": "ifsc", + "value": { + "path": "$.ifscCode" + } + }, + { + "variable": "paymentDate", + "value": { + "path": "$.transactionDate" + }, + "type": "date" + }, + { + "variable": "consumerID", + "value": { + "path": "$.paymentDetails[0].bill.consumerCode" + } + }, + { + "variable": "transactionID", + "value": { + "path": "$.transactionNumber" + } + }, + { + "variable": "dueAmount", + "value": { + "path": "$.paymentDetails[0].totalDue" + } + }, + { + "variable": "payment_receipt", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_RECEIPT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "receipt_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_RECEIPT_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "consumer_id", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_CONSUMER_ID" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payment_date", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_DATE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payer_name", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYER_NAME" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payer_contact", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYER_CONTACT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "service_type", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_SERVICE_TYPE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "billing_period", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_BILLING_PERIOD" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "paid_amount", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAID_AMOUNT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "pending_amount", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PENDING_AMOUNT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payment_mode", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_MODE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "transaction_id", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_TRANSACTION_ID" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "g8_receipt_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_G8_RECEIPT_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "g8_receipt_date", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_G8_RECEIPT_DATE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "cheque_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_CHEQUE_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "generated_by", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_GENERATED_BY" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "commissioner/eo", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_COMMISSIONER_EO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "no_signature", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_NO_SIGNATURE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "disclamer", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "disclamer_1", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_FIRST_LINE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "disclamer_2", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_SECOND_LINE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "disclamer_3", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_THIRD_LINE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "disclamer_4", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_FOURTH_LINE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "disclamer_5", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_FIFTH_LINE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "to", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_TO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "Municipal_Corporation", + "value": { + "path": "PDF_STATIC_LABEL_MDMS_MUNICIPAL_CORPORATION" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + } + ] + }, + { + "derived": [ + { + "variable": "pendingAmount", + "formula": "{{dueAmount}}-{{paidAmount}}" + } + ] + }, + { + "externalAPI": [ + { + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", + "apiRequest": null, + "responseMapping":[ + { + "variable":"address", + "value":"$.MdmsRes.tenant.tenants[0].address" + }, + { + "variable":"phoneNumber", + "value":"$.MdmsRes.tenant.tenants[0].contactNumber" + }, + { + "variable":"website", + "value":"$.MdmsRes.tenant.tenants[0].domainUrl" + }, + { + "variable":"mcGrade", + "value":"$.MdmsRes.tenant.tenants[0].city.ulbType" + }, + { + "variable":"email", + "value":"$.MdmsRes.tenant.tenants[0].emailId" + }, + { + "variable": "logoImage", + "value":"$.MdmsRes.tenant.tenants[0].logoId", + "type":"image" + }, + { + "variable": "logo-header", + "value":"$.MdmsRes.tenant.tenants[0].code", + "localisation":{ + "required":true, + "prefix": "TENANT_TENANTS", + "module":"rainmaker-common" + } + } + ] + } + ] + } + ] + } + ] + } +} diff --git a/configs/pdf-service/data-config/firenoc-receipt.json b/configs/pdf-service/data-config/firenoc-receipt.json new file mode 100644 index 00000000..9a89b2e5 --- /dev/null +++ b/configs/pdf-service/data-config/firenoc-receipt.json @@ -0,0 +1,245 @@ +{ + "key":"firenoc-receipt", + "DataConfigs": { + "serviceName": "rainmaker-noc", + "version": "1.0.0", + "baseKeyPath": "$.FireNOCs.*", + "entityIdPath":"$.fireNOCNumber", + "isCommonTableBorderRequired":true, + "mappings": [ + { + "topic": "noc-pdf-generation", + "staticConfigPath": "https://raw.githubusercontent.com/egovernments/egov-services/vishal-feature-filestore/core/egov-indexer/src/main/resources/rainmaker-pgr-indexer.yml", + "mappings": [ + { + "direct": [ + { + "variable": "variable1", + "value": { + "path":"$.fireNOCDetails.applicationNumber" + } + }, + { + "variable": "variable32", + "url":"https://s3.ap-south-1.amazonaws.com/pb-egov-assets/pb.amritsar/logo.png", + "type":"image" + }, + { + "variable": "variable3", + "value": { + "path":"$.fireNOCDetails.applicantDetails.ownerShipType" + }, + "type":"function", + "format":"return type.startsWith('INSTITUTION')" + }, + { + "variable": "variable21", + "value": { + "path":"$.fireNOCDetails.applicantDetails.ownerShipType" + }, + "localisation":{ + "required":true, + "prefix":"COMMON_MASTERS_OWNERSHIPCATEGORY", + "module":"rainmaker-common" + } + }, + { + "variable": "variable22", + "value": { + "path":"$.fireNOCDetails.applicantDetails.additionalDetail.institutionName" + } + }, + { + "variable": "variable23", + "value": { + "path":"$.fireNOCDetails.applicantDetails.additionalDetail.telephoneNumber" + } + }, + { + "variable": "variable24", + "value": { + "path":"$.fireNOCDetails.applicantDetails.owners[0].name" + } + }, + { + "variable": "variable25", + "value": { + "path":"$.fireNOCDetails.applicantDetails.additionalDetail.institutionDesignation" + } + }, + { + "variable": "variable26", + "value": { + "path":"$.fireNOCDetails.applicantDetails.owners[0].mobileNumber" + } + }, + { + "variable": "variable27", + "value": { + "path":"$.fireNOCDetails.applicantDetails.owners[0].emailId" + } + }, + { + "variable": "variable28", + "value": { + "path":"$.fireNOCDetails.applicantDetails.owners[0].correspondenceAddress" + } + }, + { + "variable": "variable20", + "value": { + "path":"$.tenantId" + }, + "localisation":{ + "required":true, + "prefix":"TENANT_TENANTS", + "module":"rainmaker-common" + }, + "isUpperCaseRequired":true + }, + { + "variable": "variable2", + "value":{ + "path":"$.fireNOCDetails.applicantDetails.owners.*" + }, + "type":"array", + "format":{ + "type":"string", + "scema":[ + { + "key":"name" + }, + { + "key":"mobileNumber" + }] + } + } + ] + }, + { + "derived": [ + { + "variable": "variable31", + "formula": "{{variable29}}+{{variable30}}" + } + ] + }, + { + "externalAPI": [ + + { + + "path": "http://collection-services:8080/collection-services/receipts/_search", + "queryParam": "consumerCode=$.fireNOCDetails.applicationNumber", + "apiRequest": null, + + "responseMapping":[ + { + "variable":"variable6", + "value":"$.Receipt[0].instrument.transactionDateInput" + }, + { + "variable":"variable7", + "value":"$.Receipt[0].receiptNumber" + }, + { + "variable":"variable8", + "value":"$.Receipt[0].Bill[0].billDetails[0].billAccountDetails[?(@.taxHeadCode=='FIRENOC_FEES')].amount" + }, + { + "variable":"variable9", + "value":"$.Receipt[0].Bill[0].billDetails[0].billAccountDetails[?(@.taxHeadCode=='FIRENOC_TAXES')].amount" + }, + { + "variable":"variable29", + "value":"$.Receipt[0].Bill[0].billDetails[0].billAccountDetails[?(@.taxHeadCode=='FIRENOC_ADHOC_PENALTY')].amount" + }, + { + "variable":"variable30", + "value":"$.Receipt[0].Bill[0].billDetails[0].billAccountDetails[?(@.taxHeadCode=='FIRENOC_ADHOC_REBATE')].amount" + }, + { + "variable":"variable10", + "value":"$.Receipt[0].Bill[0].billDetails[0].totalAmount" + }, + { + "variable":"variable11", + "value":"$.Receipt[0].instrument.transactionType" + }, + { + "variable":"variable12", + "value":"$.Receipt[0].transactionId" + }, + { + "variable":"variable13", + "value":"$.Receipt[0].instrument.bank.name" + }, + { + "variable":"variable15", + "value":"$.Receipt[0].Bill[0].billDetails[0].receiptNumber" + }, + { + "variable":"variable16", + "value":"$.Receipt[0].Bill[0].billDetails[0].receiptDate" + }, + { + "variable":"variable17", + "value":"$.Receipt[0].Bill[0].billDetails[0].amountPaid" + }, + { + "variable":"variable18", + "value":"$.Receipt[0].instrument.instrumentType.name" + }, + { + "variable":"variable19", + "value":"$.Receipt[0].instrument.transactionNumber" + } + ] + } + ] + }, + { + "qrcodeConfig": [ + { + "variable": "variable14", + "value":"Application: {{variable1}}, Receipt number: {{variable15}}, Date of payment: {{variable16}}, Fees Paid: {{variable17}}, Payment mode: {{variable18}}, Transaction ID: {{variable19}}" + } + ] + }, + { + "mdmsDenormalization": [ + { + "variable": "$variable", + "moduleName": "common-masters", + "masterName": "Department", + "tenantId": "pb", + "filter": "[?(@.code == $department)]", + "filterMapping": [ + { + "variable": "$department", + "valueJsonpath": "$.department" + } + ], + "valueJsonPath": "$.TenantBoundary[0].boundary[0].name" + }, + { + "variable": "$variable", + "moduleName": "common-masters", + "masterName": "Department", + "tenantId": "pb", + "filter": "[?(@.code == $department)]", + "filterMapping": [ + { + "variable": "$department", + "valueJsonpath": "$.department" + } + ], + "valueJsonPath": "$.TenantBoundary[0].boundary[0].name" + } + ] + } + ] + } + ] + } + } diff --git a/configs/pdf-service/data-config/firenocreceipt.json b/configs/pdf-service/data-config/firenocreceipt.json new file mode 100644 index 00000000..f5c4258b --- /dev/null +++ b/configs/pdf-service/data-config/firenocreceipt.json @@ -0,0 +1,578 @@ +{ + "key": "firenocreceipt", + "documentType":"FIRENOC_RECEIPT", + "DataConfigs": { + "moduleName": "rainmaker-common", + "version": "1.0.0", + "baseKeyPath": "$.Payments.*", + "entityIdPath":"$.id", + "isCommonTableBorderRequired": true, + "mappings": [ + { + "topic": "common-pdf-generation-3", + "mappings": [ + { + "direct": [ + { + "variable": "payerName", + "value": { + "path": "$.payerName" + } + }, + { + "variable": "PaidBy", + "value": { + "path": "$.paidBy" + } + }, + { + "variable": "chequeDD", + "value": { + "path": "$.instrumentNumber" + } + }, + { + "variable": "user-name", + "value": { + "path": "$.userInfo.name" + }, + "type":"selectFromRequestInfo" + }, + { + "variable": "payerContact", + "value": { + "path": "$.mobileNumber" + } + }, + { + "variable": "receiptNo", + "value": { + "path": "$.paymentDetails[0].receiptNumber" + } + }, + { + "variable": "serviceType", + "value": { + "path": "$.paymentDetails[0].businessService" + }, + "localisation":{ + "required":true, + "prefix":"MODULE", + "module":"rainmaker-common" + } + }, + { + "variable": "paidAmount", + "value": { + "path": "$.paymentDetails[0].totalAmountPaid" + } + }, + { + "variable": "fieldFee", + "value": { + "path": "$.paymentDetails[0].additionalDetails.fieldfee" + } + }, { + "variable": "taxAmount", + "value": { + "path": "$.paymentDetails[0].additionalDetails.tax" + } + }, { + "variable": "cgst", + "value": { + "path": "$.paymentDetails[0].additionalDetails.cgst" + } + }, { + "variable": "sgst", + "value": { + "path": "$.paymentDetails[0].additionalDetails.sgst" + } + }, + { + "variable": "fromPeriod", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].fromPeriod" + }, + "type": "date" + }, + { + "variable": "chequeDDDate", + "value": { + "path": "$.instrumentDate" + }, + "type":"date" + }, + { + "variable": "toPeriod", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].toPeriod" + }, + "type": "date" + }, + { + "variable": "payerAddress", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].additionalDetails.address" + } + }, + { + "variable": "oldPayerAddress", + "value": { + "path": "$.payerAddress" + } + }, + { + "variable": "oldComments", + "value": { + "path": "$.additionalDetails.comment" + } + }, + { + "variable": "comments", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].additionalDetails.comment" + } + }, + { + "variable": "paymentMode", + "value": { + "path": "$.paymentMode" + }, + "localisation":{ + "required":true, + "prefix": "COMMON_MASTERS_PAYMENTMODE", + "module": "rainmaker-common" + } + }, + { + "variable": "G8ReceiptNo", + "value": { + "path": "$.paymentDetails[0].manualReceiptNumber" + } + }, + { + "variable": "G8ReceiptDate", + "value": { + "path": "$.paymentDetails[0].manualReceiptDate" + }, + "type": "date" + }, + { + "variable": "ReceiptDate", + "value": { + "path": "$.paymentDetails[0].receiptDate" + }, + "type": "date" + }, { + "variable": "bankName", + "value": { + "path": "$.additionalDetails[0].bankName" + } + }, { + "variable": "branchName", + "value": { + "path": "$.additionalDetails[0].branchName" + } + }, { + "variable": "ifsc", + "value": { + "path": "$.ifscCode" + } + }, + { + "variable": "paymentDate", + "value": { + "path": "$.transactionDate" + }, + "type": "date" + }, + { + "variable": "consumerID", + "value": { + "path": "$.paymentDetails[0].bill.consumerCode" + } + }, + { + "variable": "transactionID", + "value": { + "path": "$.transactionNumber" + } + }, + { + "variable": "dueAmount", + "value": { + "path": "$.paymentDetails[0].totalDue" + } + }, + { + "variable": "payment_receipt", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_RECEIPT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "receipt_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_RECEIPT_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "consumer_id", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_CONSUMER_ID" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payment_date", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_DATE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payer_name", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYER_NAME" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payer_contact", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYER_CONTACT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "service_type", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_SERVICE_TYPE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "billing_period", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_BILLING_PERIOD" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "paid_amount", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAID_AMOUNT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "pending_amount", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PENDING_AMOUNT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payment_mode", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_MODE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "transaction_id", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_TRANSACTION_ID" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "g8_receipt_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_G8_RECEIPT_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "g8_receipt_date", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_G8_RECEIPT_DATE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "cheque_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_CHEQUE_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "generated_by", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_GENERATED_BY" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "commissioner/eo", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_COMMISSIONER_EO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "no_signature", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_NO_SIGNATURE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "disclamer", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "disclamer_1", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_FIRST_LINE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "disclamer_2", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_SECOND_LINE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "disclamer_3", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_THIRD_LINE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "disclamer_4", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_FOURTH_LINE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "disclamer_5", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_FIFTH_LINE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "to", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_TO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "Municipal_Corporation", + "value": { + "path": "PDF_STATIC_LABEL_MDMS_MUNICIPAL_CORPORATION" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + } + ] + }, + { + "derived": [ + { + "variable": "pendingAmount", + "formula": "{{dueAmount}}-{{paidAmount}}" + } + ] + }, + { + "externalAPI": [ + { + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", + "apiRequest": null, + "responseMapping":[ + { + "variable":"address", + "value":"$.MdmsRes.tenant.tenants[0].address" + }, + { + "variable":"phoneNumber", + "value":"$.MdmsRes.tenant.tenants[0].contactNumber" + }, + { + "variable":"website", + "value":"$.MdmsRes.tenant.tenants[0].domainUrl" + }, + { + "variable":"mcGrade", + "value":"$.MdmsRes.tenant.tenants[0].city.ulbType" + }, + { + "variable":"email", + "value":"$.MdmsRes.tenant.tenants[0].emailId" + }, + { + "variable": "logoImage", + "value":"$.MdmsRes.tenant.tenants[0].logoId", + "type":"image" + }, + { + "variable": "logo-header", + "value":"$.MdmsRes.tenant.tenants[0].code", + "localisation":{ + "required":true, + "prefix": "TENANT_TENANTS", + "module":"rainmaker-common" + } + } + ] +} + ] + } + ] + } + ] + } +} diff --git a/configs/pdf-service/data-config/mcollect-bill.json b/configs/pdf-service/data-config/mcollect-bill.json new file mode 100644 index 00000000..c27d60ac --- /dev/null +++ b/configs/pdf-service/data-config/mcollect-bill.json @@ -0,0 +1,674 @@ +{ + "key": "mcollect-bill", + "DataConfigs": { + "serviceName": "rainmaker-common", + "version": "1.0.0", + "baseKeyPath": "$.Bill.*", + "entityIdPath": "$.id", + "isCommonTableBorderRequired": true, + "mappings": [ + { + "topic": "common-pdf-generation-3", + "mappings": [ + { + "direct": [ + { + "variable": "payerName", + "value": { + "path": "$.payerName" + } + }, + { + "variable": "payerContact", + "value": { + "path": "$.mobileNumber" + } + }, + { + "variable": "billNo", + "value": { + "path": "$.billNumber" + } + }, + { + "variable": "challanNo", + "value": { + "path": "$.consumerCode" + } + }, + { + "variable": "challan_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_CHALLAN_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "challan", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_CHALLAN" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "serviceType", + "value": { + "path": "$.businessService" + }, + "type": "splitString", + "localisation": { + "required": true, + "prefix": "BILLINGSERVICE_BUSINESSSERVICE", + "module": "rainmaker-uc", + "isCategoryRequired": true + } + }, + { + "variable": "fromPeriod", + "value": { + "path": "$.billDetails[0].fromPeriod" + }, + "type": "date" + }, + { + "variable": "toPeriod", + "value": { + "path": "$.billDetails[0].toPeriod" + }, + "type": "date" + }, + { + "variable": "letter-code", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_LETTER_CODE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "address_label", + "value": { + "path": "PT_COMMON_COL_ADDRESS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "letter-header", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_LETTER_HEAD" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "letter-section", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_LETTER_SECTION_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "cantonment-board", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_MUNICIPAL_CORPORATION" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "form-number", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_LETTER_FORM_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "rule-number", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_LETTER_RULENO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "bill", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "letter-code", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_MUNICIPAL_CORPORATION" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "paymentMode", + "value": { + "path": "$.paymentMode" + }, + "localisation": { + "required": true, + "prefix": "COMMON_MASTERS_PAYMENTMODE", + "module": "rainmaker-common" + } + }, + { + "variable": "billDate", + "value": { + "path": "$.billDate" + }, + "type": "date" + }, + { + "variable": "city", + "value": { + "path": "$..tradeLicenseDetail.address.city" + }, + "localisation": { + "required": true, + "prefix": "TENANT_TENANTS", + "module": "rainmaker-common" + } + }, + { + "variable": "doorHouseNo", + "value": { + "path": "$.address.doorNo" + }, + "type": "setEmpty" + }, + { + "variable": "buildingColonyName", + "value": { + "path": "$.address.buildingName" + }, + "type": "setEmpty" + }, + { + "variable": "streetName", + "value": { + "path": "$.address.street" + }, + "type": "setEmpty" + }, + { + "variable": "buildingName", + "value": { + "path": "$.address.buildingName" + }, + "type": "setEmpty" + }, + { + "variable": "pinCode", + "value": { + "path": "$.address.pincode" + }, + "type": "setEmpty" + }, + { + "variable": "mohalla", + "value": { + "path": "$.address.locality" + }, + "localisation": { + "required": true, + "prefix": "TENANTS_MOHALLA", + "module": "rainmaker-common" + } + }, + { + "variable": "serviceCategory", + "value": { + "path": "$.businessService" + }, + "localisation": { + "required": true, + "prefix": "BILLINGSERVICE_BUSINESSSERVICE", + "module": "rainmaker-uc" + } + }, + { + "variable": "mcollect_comment", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_MCOLLECT_COMMENT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "disclamer", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "disclamer_1", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_FIRST_LINE_UC" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "bill_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_BILL_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "GL_Code", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_GL_CODE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "bill_date", + "value": { + "path": "ABG_COMMON_TABLE_COL_BILL_DATE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "consumer_Name", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_CONSUMER_NAME" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "payer_contact", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_LICENSE_CORPORATION_CONTACT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "service_category", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_SERVICE_CATEGORY" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "validity_from", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_PASS_LICENSE_VALIDITY_FROM" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "validity_to", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_PASS_LICENSE_VALIDITY_TO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "paid_amount", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAID_AMOUNT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "payment_mode", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_MODE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "transaction_id", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_TRANSACTION_ID" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "payment_receipt", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_RECEIPT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "g8_receipt_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_G8_RECEIPT_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "bank_transaction_no", + "value": { + "path": "NOC_PAYMENT_BANK_TRANSACTION_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "g8_receipt_date", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_G8_RECEIPT_DATE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "payer_Name", + "value": { + "path": "NOC_PAYMENT_PAYER_NAME_LABEL" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "no_signature", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_NO_SIGNATURE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "disclamer", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "to", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_TO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "service_type", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_SERVICE_TYPE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "total_amount", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_TOTAL_AMOUNT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "challan_date", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_CHALLAN_DATE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "Rs", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_RUPEE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "variable10", + "value": { + "path": "$.billDetails[0].billAccountDetails.*" + }, + "type": "array", + "format": { + "type": "string", + "scema": [ + { + "variable": "trade_license_tax", + "value": "taxHeadCode", + "type": "string", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-uc" + } + }, + { + "variable": "tradeLicenseTax", + "value": "amount" + } + ] + } + }, + { + "variable": "totalAmount", + "value": { + "path": "$.totalAmount" + } + } + ] + }, + { + "externalAPI": [ + { + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pg&filter=%5B?(@.code=='{$.tenantId}')%5D", + "apiRequest": null, + "responseMapping": [ + { + "variable": "cb-name", + "value": "$.MdmsRes.tenant.tenants[0].code", + "localisation": { + "required": true, + "prefix": "TENANT_TENANTS", + "module": "rainmaker-common" + } + } + ] + }, + { + "path": "http://echallan-services:8080/echallan-services/eChallan/v1/_search", + "queryParam": "challanNo=$.consumerCode,tenantId=$.tenantId", + "apiRequest": null, + "responseMapping": [ + { + "variable": "challanDate", + "value": "$.challans[0].auditDetails.lastModifiedTime", + "type": "date" + } + ] + } + ] + }, + { + "qrcodeConfig": [ + { + "variable": "qrcodeimage", + "value": "Payer Name : {{payerName}},BillNo: {{billNumber}}, Challan number: {{challanNo}}, Bill Date: {{billDate}}, Total Amount: {{totalAmount}}, Billing Period: {{fromPeriod}} to {{toPeriod}}" + } + ] + } + ] + } + ] + } +} diff --git a/configs/pdf-service/data-config/mcollect-challan.json b/configs/pdf-service/data-config/mcollect-challan.json new file mode 100644 index 00000000..fa102fe8 --- /dev/null +++ b/configs/pdf-service/data-config/mcollect-challan.json @@ -0,0 +1,723 @@ +{ + "key": "mcollect-challan", + "DataConfigs": { + "serviceName": "rainmaker-common", + "version": "1.0.0", + "baseKeyPath": "$.Challan", + "entityIdPath": "$.id", + "isCommonTableBorderRequired": true, + "mappings": [ + { + "topic": "common-pdf-generation-3", + "mappings": [ + { + "direct": [ + { + "variable": "consumerName", + "value": { + "path": "$.citizen.name" + } + }, + { + "variable": "payerContact", + "value": { + "path": "$.mobileNumber" + } + }, + { + "variable": "challanNo", + "value": { + "path": "$.challanNo" + } + }, + { + "variable": "serviceType", + "value": { + "path": "$.businessService" + }, + "localisation": { + "required": true, + "prefix": "BILLINGSERVICE_BUSINESSSERVICE", + "module": "rainmaker-uc" + } + }, + { + "variable": "serviceCategory", + "value": { + "path": "$.serviceType" + }, + "localisation": { + "required": true, + "prefix": "BILLINGSERVICE_BUSINESSSERVICE", + "module": "rainmaker-uc" + } + }, + { + "variable": "fromPeriod", + "value": { + "path": "$.taxPeriodFrom" + }, + "type": "date" + }, + { + "variable": "billNo", + "value": { + "path": "$.billNo" + } + }, + { + "variable": "billDate", + "value": { + "path": "$.billDate" + }, + "type": "date" + }, + { + "variable": "toPeriod", + "value": { + "path": "$.taxPeriodTo" + }, + "type": "date" + }, + { + "variable": "bill", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "bill_date", + "value": { + "path": "ABG_COMMON_TABLE_COL_BILL_DATE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "bill_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_BILL_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "letter-code", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_LETTER_CODE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "service_category", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_SERVICE_CATEGORY" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "address_label", + "value": { + "path": "PT_COMMON_COL_ADDRESS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "remarks_label", + "value": { + "path": "PT_COMMON_COL_REMARK" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "letter-header", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_LETTER_HEAD" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "letter-section", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_LETTER_SECTION_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "cantonment-board", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_MUNICIPAL_CORPORATION" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "form-number", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_CHALLAN_FORM_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "rule-number", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_CHALLAN_RULE_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "challan", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_CHALLAN" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "letter-code", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_MUNICIPAL_CORPORATION" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "application_no", + "value": { + "path": "NOC_COMMON_TABLE_COL_APP_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "paymentMode", + "value": { + "path": "$.paymentMode" + }, + "localisation": { + "required": true, + "prefix": "COMMON_MASTERS_PAYMENTMODE", + "module":"rainmaker-common" + } + }, + { + "variable": "challanDate", + "value": { + "path": "$.auditDetails.lastModifiedTime" + }, + "type": "date" + }, + { + "variable": "city", + "value": { + "path": "$..tradeLicenseDetail.address.city" + }, + "localisation": { + "required": true, + "prefix": "TENANT_TENANTS", + "module": "rainmaker-common" + } + }, + { + "variable": "doorHouseNo", + "value": { + "path": "$.address.doorNo" + }, + "type": "setEmpty" + }, + { + "variable": "buildingColonyName", + "value": { + "path": "$.address.buildingName" + }, + "type": "setEmpty" + }, + { + "variable": "streetName", + "value": { + "path": "$.address.street" + }, + "type": "setEmpty" + }, + { + "variable": "buildingName", + "value": { + "path": "$.address.buildingName" + }, + "type": "setEmpty" + }, + { + "variable": "pinCode", + "value": { + "path": "$.address.pincode" + }, + "type": "setEmpty" + }, + { + "variable": "challanStatus", + "value": { + "path": "$.applicationStatus" + }, + "type": "challanStatus" + }, + { + "variable": "challanRemarks", + "value": { + "path": "$.description" + + } + }, + { + "variable": "mohalla", + "value": { + "path": "$.address.locality.code" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": "TENANTS_MOHALLA", + "module": "rainmaker-common", + "prefixCbName": true + + } + }, + { + "variable": "mcollect_comment", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_MCOLLECT_COMMENT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "disclamer", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "disclamer_1", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_FIRST_LINE_UC" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "challan_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_CHALLAN_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "GL_Code", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_GL_CODE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "challan_date", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_CHALLAN_DATE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payer_name", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYER_NAME" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payer_contact", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_LICENSE_CORPORATION_CONTACT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "service_type", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_SERVICE_TYPE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "validity_from", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_PASS_LICENSE_VALIDITY_FROM" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "validity_to", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_PASS_LICENSE_VALIDITY_TO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "paid_amount", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAID_AMOUNT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payment_mode", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_MODE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "transaction_id", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_TRANSACTION_ID" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payment_receipt", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_RECEIPT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "g8_receipt_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_G8_RECEIPT_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "bank_transaction_no", + "value": { + "path": "NOC_PAYMENT_BANK_TRANSACTION_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "g8_receipt_date", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_G8_RECEIPT_DATE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "consumer_Name", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_CONSUMER_NAME" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "no_signature", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_NO_SIGNATURE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "disclamer", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "to", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_TO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "total_amount", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_TOTAL_AMOUNT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "Rs", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_RUPEE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "variable10", + "value": { + "path": "$.amount.*" + }, + "type": "array", + "format": { + "type": "string", + "scema": [ + { + "variable": "trade_license_tax", + "value": "taxHeadCode", + "type": "string", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-uc" + } + }, + { + "variable": "tradeLicenseTax", + "value": "amount" + } + ] + } + }, + { + "variable": "totalAmount", + "value": { + "path": "$.totalAmount" + } + } + ] + }, + { + "externalAPI": [ + { + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", + "apiRequest": null, + "responseMapping": [ + { + "variable": "cb-name", + "value": "$.MdmsRes.tenant.tenants[0].code", + "localisation": { + "required": true, + "prefix": "TENANT_TENANTS", + "module": "rainmaker-common" + } + }, + { + "variable":"mcGrade", + "value":"$.MdmsRes.tenant.tenants[0].city.ulbType" + } + ] + }, + { + "path": "http://egov-location:8080/egov-location/location/v11/boundarys/_search", + "queryParam": "tenantId=$.tenantId,hierarchyTypeCode=ADMIN,boundaryType=Locality,codes=$.address.locality.code", + "apiRequest": null, + "responseMapping":[ + { + "variable":"mohalla", + "value":"$.address.locality.code" + } + ] + } + ] + }, + { + "qrcodeConfig": [ + { + "variable": "qrcodeimage", + "value": "Payer Name : {{consumnerName}},Challan number: {{challanNo}}, Challan Date: {{billDate}}, Total Amount: {{totalAmount}}, Billing Period: {{fromPeriod}} to {{toPeriod}}" + } + ] + } + ] + } + ] + } +} diff --git a/configs/pdf-service/data-config/misc-receipt.json b/configs/pdf-service/data-config/misc-receipt.json new file mode 100644 index 00000000..c0fd312b --- /dev/null +++ b/configs/pdf-service/data-config/misc-receipt.json @@ -0,0 +1,511 @@ +{ + "key": "misc-receipt", + "DataConfigs": { + "serviceName": "rainmaker-common", + "version": "1.0.0", + "baseKeyPath": "$.Payments.*", + "entityIdPath":"$.paymentDetails[0].receiptNumber", + "isCommonTableBorderRequired": true, + "mappings": [ + { + "topic": "common-pdf-generation-3", + "mappings": [ + { + "direct": [ + { + "variable": "payerName", + "value": { + "path": "$.payerName" + } + }, + { + "variable": "user-name", + "value": { + "path": "$.userInfo.name" + }, + "type":"selectFromRequestInfo" + }, + { + "variable": "payerContact", + "value": { + "path": "$.mobileNumber" + } + }, + { + "variable": "receiptNo", + "value": { + "path": "$.paymentDetails[0].receiptNumber" + } + }, + { + "variable": "serviceType", + "value": { + "path": "$.paymentDetails[0].businessService" + }, + "localisation":{ + "required":true, + "prefix":"BILLINGSERVICE_BUSINESSSERVICE", + "module":"rainmaker-bpa" + } + }, + { + "variable": "paidAmount", + "value": { + "path": "$.paymentDetails[0].totalAmountPaid" + } + }, + { + "variable": "fromPeriod", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].fromPeriod" + }, + "type": "date" + }, + { + "variable": "toPeriod", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].toPeriod" + }, + "type": "date" + }, + { + "variable": "paymentMode", + "value": { + "path": "$.paymentMode" + }, + "localisation":{ + "required":true, + "prefix": "COMMON_MASTERS_PAYMENTMODE", + "module": "rainmaker-common" + } + }, + { + "variable": "G8ReceiptNo", + "value": { + "path": "$.paymentDetails[0].manualReceiptNumber" + } + }, + { + "variable": "G8ReceiptDate", + "value": { + "path": "$.paymentDetails[0].manualReceiptDate" + }, + "type": "date" + }, + { + "variable": "paymentDate", + "value": { + "path": "$.transactionDate" + }, + "type": "date" + }, + { + "variable": "consumerID", + "value": { + "path": "$.paymentDetails[0].bill.consumerCode" + } + }, + { + "variable": "transactionID", + "value": { + "path": "$.transactionNumber" + } + }, + { + "variable": "dueAmount", + "value": { + "path": "$.paymentDetails[0].totalDue" + } + }, + { + "variable": "payment_receipt", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_RECEIPT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "receipt_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_RECEIPT_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "consumer_id", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_CONSUMER_ID" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payment_date", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_DATE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payer_name", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYER_NAME" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payer_contact", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYER_CONTACT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "service_type", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_SERVICE_TYPE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "billing_period", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_BILLING_PERIOD" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "paid_amount", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAID_AMOUNT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "pending_amount", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PENDING_AMOUNT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payment_mode", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_MODE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "transaction_id", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_TRANSACTION_ID" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "g8_receipt_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_G8_RECEIPT_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "g8_receipt_date", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_G8_RECEIPT_DATE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "generated_by", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_GENERATED_BY" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "commissioner/eo", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_COMMISSIONER_EO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "no_signature", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_NO_SIGNATURE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "disclamer", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "disclamer_1", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_FIRST_LINE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "disclamer_2", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_SECOND_LINE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "disclamer_3", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_THIRD_LINE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "disclamer_4", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_FOURTH_LINE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "disclamer_5", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_FIFTH_LINE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "to", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_TO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "Municipal_Corporation", + "value": { + "path": "PDF_STATIC_LABEL_MDMS_MUNICIPAL_CORPORATION" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "receipt_info", + "value": { + "path": "PDF_STATIC_LABEL_RECEIPT_INFO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payer_info", + "value": { + "path": "PDF_STATIC_LABEL_PAYER_INFO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payment_info", + "value": { + "path": "PDF_STATIC_LABEL_PAYMENT_INFO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + } + ] + }, + { + "derived": [ + { + "variable": "pendingAmount", + "formula": "{{dueAmount}}-{{paidAmount}}" + } + ] + }, + { + "externalAPI": [ + { + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "queryParam": "moduleName=tenant&masterName=tenants&tenantId=bh&filter=%5B?(@.code=='{$.tenantId}')%5D", + "apiRequest": null, + "responseMapping":[ + { + "variable":"address", + "value":"$.MdmsRes.tenant.tenants[0].address" + }, + { + "variable":"phoneNumber", + "value":"$.MdmsRes.tenant.tenants[0].contactNumber" + }, + { + "variable":"website", + "value":"$.MdmsRes.tenant.tenants[0].domainUrl" + }, + { + "variable":"email", + "value":"$.MdmsRes.tenant.tenants[0].emailId" + }, + { + "variable": "logoImage", + "value":"$.MdmsRes.tenant.tenants[0].logoId", + "type":"image" + }, + { + "variable": "logo-header", + "value":"$.MdmsRes.tenant.tenants[0].code", + "localisation":{ + "required":true, + "prefix": "TENANT_TENANTS", + "module":"rainmaker-pgr" + } + } + ] + } + ] + } + ] + } + ] + } + } diff --git a/configs/pdf-service/data-config/passvehicle-certificate.json b/configs/pdf-service/data-config/passvehicle-certificate.json new file mode 100644 index 00000000..38f83596 --- /dev/null +++ b/configs/pdf-service/data-config/passvehicle-certificate.json @@ -0,0 +1,555 @@ +{ + "key": "tlcertificate", + "DataConfigs": { + "serviceName": "rainmaker-common", + "version": "1.0.0", + "baseKeyPath": "$.Licenses.*", + "entityIdPath":"$.licenseNumber", + "isCommonTableBorderRequired": true, + "mappings": [ + { + "mappings": [ + { + "direct": [ + { + "variable": "logoImage", + "url":"https://raw.githubusercontent.com/egovernments/egov-web-app/master/web/rainmaker/dev-packages/egov-ui-kit-dev/src/assets/images/pblogo.png", + "type":"image" + }, + { + "variable": "tradeLicenseNo", + "value": { + "path": "$.licenseNumber" + } + }, + { + "variable": "applicationNo", + "value": { + "path": "$.applicationNumber" + } + }, + { + "variable": "financialYear", + "value": { + "path": "$.financialYear" + } + }, + { + "variable": "tradeName", + "value": { + "path": "$.tradeName" + } + }, + { + "variable": "tradeOwnerName", + "value": { + "path": "$.tradeLicenseDetail.owners[0].name" + } + }, + { + "variable": "tradeOwnerContact", + "value": { + "path": "$.tradeLicenseDetail.owners[0].mobileNumber" + } + }, + { + "variable": "tradeAddress", + "value": { + "path": "$.tradeLicenseDetail.address.locality.name" + } + }, + { + "variable": "city", + "value": { + "path": "$.tradeLicenseDetail.address.city" + }, + "localisation":{ + "required":true, + "prefix": "TENANT_TENANTS", + "module": "rainmaker-common" + } + }, + { + "variable": "tradeType", + "value": { + "path": "$.tradeLicenseDetail.tradeUnits[0].tradeType" + }, + "localisation":{ + "required":true, + "prefix": "TRADELICENSE_TRADETYPE", + "module": "rainmaker-tl", + "isCategoryRequired":true + } + }, + { + "variable": "passSubCategory", + "value": { + "path": "$.tradeLicenseDetail.tradeUnits[0].tradeType" + }, + "localisation":{ + "required":true, + "prefix": "TRADELICENSE_TRADETYPE", + "module": "rainmaker-tl", + "isMainTypeRequired":true + } + }, + { + "variable": "accessories", + "value": { + "path": "$.tradeLicenseDetail.accessories[0].accessoryCategory" + }, + "localisation":{ + "required":true, + "prefix": "TL", + "module": "rainmaker-tl" + } + }, + { + "variable": "purpose_content", + "value": { + "path": "$.tradeLicenseDetail.additionalDetail.purpose" + } + }, + { + "variable": "licenseIssueDate", + "value": { + "path": "$.issuedDate" + }, + "type": "date" + }, + { + "variable": "licenseValidityFrom", + "value": { + "path": "$.validFrom" + }, + "type": "date" + }, + { + "variable": "licenseValidityTo", + "value": { + "path": "$.validTo" + }, + "type": "date" + }, + { + "variable": "vehicleNumber", + "value": { + "path": "$.tradeLicenseDetail.additionalDetail.vehicleNumber" + } + }, + { + "variable": "vehicleCompany", + "value": { + "path": "$.tradeLicenseDetail.additionalDetail.vehicleCompany" + } + }, + { + "variable": "vehicleModel", + "value": { + "path": "$.tradeLicenseDetail.additionalDetail.vehicleModel" + } + }, + { + "variable": "to", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_TO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "vehicle_number_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_PASS_VEHICLE_NUMBER_LABLE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "vehicle_company_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_PASS_VEHICLE_COMPANY_LABLE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "vehicle_model_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_PASS_VEHICLE_MODEL_LABLE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "municipal_corportaion", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_PASS_CITY_POLICE_LABLE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "corporation_contact", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_LICENSE_CORPORATION_CONTACT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "disclaimer_heading", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_LICENSE_DISCLAIMER_HEADING" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "disclaimer_body", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_LICENSE_DISCLAIMER_BODY" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "corporation_website", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_LICENSE_CORPORATION_WEBSITE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "corporation_email", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_LICENSE_CORPORATION_EMAIL" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "trade_license_certifcate", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_PASS_CERTIFICATE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "trade_license_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_PASS_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "application_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_APPLICATION_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "reciept_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_RECIEPT_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "financial_year", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_FINANCIAL_YEAR" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "trade_name", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_TRADE_NAME" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "trade_owner_name", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_TRADE_OWNER_NAME" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "trade_owner_contact", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_TRADE_OWNER_CONTACT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "trade_address", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_TRADE_ADDRESS" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "trade_type", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_PASS_TRADE_TYPE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "pass_subCategory", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_PASS_TRADE_SUB_TYPE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "purpose_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_PASS_PURPOSE_LABEL" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "accessories_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_ACCESSORIES_LABEL" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "trade_license_fee", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_TRADE_LICENSE_FEE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "license_issue_date", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_LICENSE_ISSUE_DATE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "license_validity", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_LICENSE_VALIDITY" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "license_validity_from", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_PASS_LICENSE_VALIDITY_FROM" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "license_validity_to", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_PASS_LICENSE_VALIDITY_TO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "approved_by", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_APPROVED_BY" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "commissioner", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_COMMISSIONER" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable":"userpic", + "url":"https://egov-covid-assets.s3.ap-south-1.amazonaws.com/Bangalore_Police.jpeg", + "type":"image" + }, + { + "variable": "tenantID", + "value": { + "path": "$.tenantId" + } + } + ] + }, + { + "externalAPI": [ + { + "path": "http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search", + "queryParam": "businessIds=$.applicationNumber,history=true,tenantId=$.tenantId", + "apiRequest": null, + "responseMapping":[ + { + "variable":"approvedBy", + "value":"$.ProcessInstances[?(@.action == 'APPROVE')].assigner.name" + } + + ] + } + + ] + }, + { + "qrcodeConfig": [ + { + "variable": "qr", + "value":"https://egov-micro-qa.egovernments.org/employee/tradelicence/search-preview?applicationNumber={{applicationNo}}&tenantId={{tenantID}}" + } + ] + } + ] + + } + ] + } + } \ No newline at end of file diff --git a/configs/pdf-service/data-config/property-bill.json b/configs/pdf-service/data-config/property-bill.json new file mode 100644 index 00000000..1ed8778d --- /dev/null +++ b/configs/pdf-service/data-config/property-bill.json @@ -0,0 +1,888 @@ +{ + "key": "property-bill", + "documentType": "PROPERTYBILL", + "DataConfigs": { + "moduleName": "PT", + "version": "1.0.0", + "baseKeyPath": "$.Bill.*", + "entityIdPath":"$.id", + "isCommonTableBorderRequired": true, + "mappings": [ + { + "topic": "common-pdf-generation-1", + "staticConfigPath": "https://raw.githubusercontent.com/egovernments/egov-services/vishal-feature-filestore/core/egov-indexer/src/main/resources/rainmaker-pgr-indexer.yml", + "mappings": [ + { + "direct": [ + { + "variable": "total_amount_due", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_TOTAL_AMOUNT_DUE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payer_name", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PAYER_NAME" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "Municipal_Corporation", + "value": { + "path": "PDF_STATIC_LABEL_MDMS_MUNICIPAL_CORPORATION" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "bill_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_BILL_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "Rs", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_RUPEE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "mobile_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_MOBILE_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "bill_period", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_BILL_PERIOD" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payer_address", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PAYER_ADDRESS" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + + { + "variable": "bill_issue_date", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ISSUE_DATE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "bill_due_date", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_BILL_DUE_DATE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "billing_summary_property_tax", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_BILLING_SUMMARY" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "serviceType", + "value": { + "path": "$.businessService" + }, + "localisation":{ + "required":true, + "prefix":"MODULE", + "module":"rainmaker-common" + } + }, + { + "variable": "tl_application_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_TL_APPLICATION_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "arrears_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ARREARS" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "charge_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_CHARGE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + + { + "variable": "penalty_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PENALTY" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "rebate_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_REBATE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "others_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_OTHERS" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "total_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_TOTAL" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "important_message", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_IMPORTANT_MESSAGE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payment_received", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PAYMENT_RECEIVED" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "this_document", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_THIS_DOCUMENT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "this_is_a", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_THIS_IS" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "assessment_payment", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ASSESSSMENT_PAYMENT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "please_deposit", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PLEASE_DEPOSIT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "if_the_tax", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_IF_THE_TAX" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "acknowledgement_for", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ACKNOWLEDGEMENT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "date_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_DATE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "consumer_id", + "value": { + "path": "$.businessService" + }, + "localisation":{ + "required":true, + "prefix": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_CONSUMER_ID", + "module":"rainmaker-common" + } + }, + { + "variable": "name_address", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_NAME_ADDRESS" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "total_payment", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_TOTAL_PAYMENT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "receivers_signature", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_RECEIVERS_SIGNATURE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "totalAmountDue", + "value": { + "path": "$.totalAmount" + } + }, + { + "variable": "total", + "value": { + "path": "$.totalAmount" + } + }, + + { + "variable": "payerName", + "value": { + "path": "$.payerName" + } + }, + + { + "variable": "mobileNo", + "value": { + "path": "$.mobileNumber" + } + }, + + { + "variable": "payerAddress", + "value": { + "path": "$.payerAddress" + } + }, + { + "variable": "nameAddress", + "value": { + "path": "$.payerAddress" + } + }, + + { + "variable": "billNo", + "value": { + "path": "$.billNumber" + } + }, + { + "variable": "fromPeriod", + "value": { + "path": "$.billDetails[0].fromPeriod" + }, + "type": "date" + }, + { + "variable": "toPeriod", + "value": { + "path": "$.billDetails[0].toPeriod" + }, + "type": "date" + }, + + { + "variable": "billIssueDate", + "value": { + "path": "$.billDate" + }, + "type": "date" + }, + + { + "variable": "billDueDate", + "value": { + "path": "$.billDetails[0].expiryDate" + }, + "type": "date" + }, + { + "variable": "billdate", + "value": { + "path": "$.billDate" + }, + "type": "date" + }, + + { + "variable": "propertyID", + "value": { + "path": "$.consumerCode" + } + }, + { + "variable": "fees", + "value":{ + "path": "$.billDetails[(@.length-1)].billAccountDetails[?(@.taxHeadCode == 'PT_TAX')].amount" + } + }, + { + "variable": "pt_penalty", + "value":{ + "path": "$.billDetails[(@.length-1)].billAccountDetails[?(@.taxHeadCode == 'PT_TIME_PENALTY')].amount" + } + }, + { + "variable": "pt_rebate", + "value":{ + "path": "$.billDetails[(@.length-1)].billAccountDetails[?(@.taxHeadCode == 'PT_TIME_REBATE')].amount" + } + }, + { + "variable": "pt_adhoc_penalty", + "value":{ + "path": "$.billDetails[(@.length-1)].billAccountDetails[?(@.taxHeadCode == 'PT_ADHOC_PENALTY')].amount" + } + }, + { + "variable": "pt_adhoc_rebate", + "value":{ + "path": "$.billDetails[(@.length-1)].billAccountDetails[?(@.taxHeadCode == 'PT_ADHOC_REBATE')].amount" + } + }, + { + "variable": "pt_owner_exemption", + "value":{ + "path": "$.billDetails[(@.length-1)].billAccountDetails[?(@.taxHeadCode == 'PT_OWNER_EXEMPTION')].amount" + } + }, + { + "variable": "pt_unit_usage_exemption", + "value":{ + "path": "$.billDetails[(@.length-1)].billAccountDetails[?(@.taxHeadCode == 'PT_UNIT_USAGE_EXEMPTION')].amount" + } + }, + { + "variable": "pt_fire_cess", + "value":{ + "path": "$.billDetails[(@.length-1)].billAccountDetails[?(@.taxHeadCode == 'PT_FIRE_CESS')].amount" + } + }, + { + "variable": "pt_cancer_cess", + "value":{ + "path": "$.billDetails[(@.length-1)].billAccountDetails[?(@.taxHeadCode == 'PT_CANCER_CESS')].amount" + } + }, + { + "variable": "pt_time_interest", + "value":{ + "path": "$.billDetails[(@.length-1)].billAccountDetails[?(@.taxHeadCode == 'PT_TIME_INTEREST')].amount" + } + }, + { + "variable": "pt_decimal_ceiling_debit", + "value":{ + "path": "$.billDetails[(@.length-1)].billAccountDetails[?(@.taxHeadCode == 'PT_DECIMAL_CEILING_DEBIT')].amount" + } + }, + { + "variable": "pt_decimal_ceiling_credit", + "value":{ + "path": "$.billDetails[(@.length-1)].billAccountDetails[?(@.taxHeadCode == 'PT_DECIMAL_CEILING_CREDIT')].amount" + } + }, + { + "variable": "pt_roundoff", + "value":{ + "path": "$.billDetails[(@.length-1)].billAccountDetails[?(@.taxHeadCode == 'PT_ROUNDOFF')].amount" + } + }, + { + "variable": "pt_arrearrs", + "value":{ + "path": "$.billDetails[(@.length-1)].amount" + } + }, + { + "variable": "pt_advance_carryforward", + "value":{ + "path": "$.billDetails[(@.length-1)].billAccountDetails[?(@.taxHeadCode == 'PT_ADVANCE_CARRYFORWARD')].amount" + } + }, + { + "variable": "consumerID", + "value": { + "path": "$.consumerCode" + } + }, + { + "variable": "date", + "value": { + "path": "$.billDate" + }, + "type": "date" + }, + { + "variable": "totalPayment", + "value": { + "path": "$.billDetails[0].amountPaid" + } + }, + { + "variable":"scissorImage", + "url":"http://www.pngall.com/wp-content/uploads/2016/03/Scissor-PNG-Clipart.png", + "type":"image" + }, + + { + "variable": "adhoc_penalty_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ADHOC_PENALTY" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "adhoc_rebate_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ADHOC_REBATE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "owner_exemption_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_OWNER_EXEMPTION" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "unit_usage_exemption_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_UNIT_USAGE_EXEMPTION" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "fire_cess_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_FIRE_CESS" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "cancer_cess_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_CANCER_CESS" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "time_interest_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_TIME_INTEREST" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "decimal_ceiling_debit_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_DECIMAL_CEILING_DEBIT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "decimal_ceiling_credit_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_DECIMAL_CEILING_CREDIT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "advance_carryforward_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_DECIMAL_ADVANCE_CARRYFORWARD" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "roundoff_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_DECIMAL_ADVANCE_ROUNDOFF" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "arrears_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_DECIMAL_ARREARS" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + } + ] + }, + { + "derived": [ + { + "variable": "charge", + "formula": "{{fees}}" + }, + { + "variable": "penalty", + "formula": "{{pt_penalty}}" + }, + { + "variable": "rebate", + "formula": "{{pt_rebate}}" + }, + { + "variable": "adhoc_penalty", + "formula": "{{pt_adhoc_penalty}}" + }, + { + "variable": "adhoc_rebate", + "formula": "{{pt_adhoc_rebate}}" + }, + { + "variable": "owner_exemption", + "formula": "{{pt_owner_exemption}}" + }, + { + "variable": "unit_usage_exemption", + "formula": "{{pt_unit_usage_exemption}}" + }, + { + "variable": "fire_cess", + "formula": "{{pt_owner_exemption}}" + }, + { + "variable": "cancer_cess", + "formula": "{{pt_cancer_cess}}" + }, + { + "variable": "time_interest", + "formula": "{{pt_time_interest}}" + }, + { + "variable": "decimal_ceiling_debit", + "formula": "{{pt_decimal_ceiling_debit}}" + }, + { + "variable": "decimal_ceiling_credit", + "formula": "{{pt_decimal_ceiling_credit}}" + }, + { + "variable": "advance_carryforward", + "formula": "{{pt_advance_carryforward}}" + }, + { + "variable": "roundoff", + "formula": "{{pt_roundoff}}" + }, + { + "variable": "arrearrs", + "formula": "{{totalAmountDue}} - {{pt_arrearrs}}" + } + ] + }, + { + "externalAPI": [ + { + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", + "apiRequest": null, + "responseMapping":[ + { + "variable":"address", + "value":"$.MdmsRes.tenant.tenants[0].address" + }, + { + "variable":"phoneNumber", + "value":"$.MdmsRes.tenant.tenants[0].contactNumber" + }, + { + "variable":"website", + "value":"$.MdmsRes.tenant.tenants[0].domainUrl" + }, + { + "variable":"email", + "value":"$.MdmsRes.tenant.tenants[0].emailId" + }, + { + "variable": "logoImage", + "value":"$.MdmsRes.tenant.tenants[0].logoId", + "type": "image" + }, + { + "variable": "logo_header", + "value":"$.MdmsRes.tenant.tenants[0].code", + "localisation":{ + "required":true, + "prefix": "TENANT_TENANTS", + "module":"rainmaker-common" + } + } + ] + }, + { + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "queryParam": "moduleName=tenant&masterName=footer&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}' %26%26 @.service=='{$.businessService}')%5D", + "apiRequest": null, + "responseMapping":[ + { + "variable": "variable11", + "value": "$.MdmsRes.tenant.footer[0].billFooterContent.*", + "type":"array", + "format":{ + "type":"string", + "scema":[ + { + "variable":"disclaimerContent", + "value":"disclaimer", + "type":"string", + "localisation":{ + "required":true, + "prefix": null, + "module": "rainmaker-common" + } + } + ] + } + } + ] + } + ] + } + ] + } + ] + } +} diff --git a/configs/pdf-service/data-config/property-receipt.json b/configs/pdf-service/data-config/property-receipt.json new file mode 100644 index 00000000..79102e7a --- /dev/null +++ b/configs/pdf-service/data-config/property-receipt.json @@ -0,0 +1,977 @@ +{ + "key": "property-receipt", + "documentType": "PROPERTYRECEIPT", + "DataConfigs": { + "moduleName": "PT", + "version": "1.0.0", + "baseKeyPath": "$.Payments.*", + "entityIdPath":"$.id", + "isCommonTableBorderRequired": true, + "mappings": [ + { + "topic": "common-pdf-generation-3", + "mappings": [ + { + "direct": [ + { + "variable": "payerName", + "value": { + "path": "$.paidBy" + } + }, + { + "variable": "user-name", + "value": { + "path": "$.userInfo.name" + }, + "type":"selectFromRequestInfo" + }, + { + "variable": "payerContact", + "value": { + "path": "$.mobileNumber" + } + }, + { + "variable": "paymentStatus", + "value": { + "path": "$.paymentStatus" + } + }, + { + "variable": "receiptNo", + "value": { + "path": "$.paymentDetails[0].receiptNumber" + } + }, + { + "variable": "serviceType", + "value": { + "path": "$.paymentDetails[0].businessService" + }, + "localisation":{ + "required":true, + "prefix":"MODULE", + "module":"rainmaker-common", + "locale":"en_IN" + } + }, + { + "variable": "paidAmount", + "value": { + "path": "$.totalAmountPaid" + } + }, + { + "variable": "assessmentYear", + "value": { + "path": "$.paymentDetails[0].additionalDetails.assessmentYears" + } + }, { + "variable": "ifsc", + "value": { + "path": "$.ifscCode" + } + },{ + "variable": "bank", + "value": { + "path": "$.additionalDetails[0].bankName" + } + },{ + "variable": "branch", + "value": { + "path": "$.additionalDetails[0].branchName" + } + }, + { + "variable": "fromPeriod", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].fromPeriod" + }, + "type": "date" + }, + { + "variable": "toPeriod", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].toPeriod" + }, + "type": "date" + }, + { + "variable": "assessmentYear1", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].fromPeriod" + }, + "type": "date", + "format": "YYYY" + }, + { + "variable": "assessmentYear2", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].toPeriod" + }, + "type": "date", + "format": "YYYY" + }, + { + "variable": "paymentMode", + "value": { + "path": "$.paymentMode" + }, + "localisation":{ + "required":true, + "prefix": "COMMON_MASTERS_PAYMENTMODE", + "module": "rainmaker-common", + "locale":"en_IN" + } + }, + { + "variable": "G8ReceiptNo", + "value": { + "path": "$.paymentDetails[0].manualReceiptNumber" + } + }, + { + "variable": "G8ReceiptDate", + "value": { + "path": "$.paymentDetails[0].manualReceiptDate" + }, + "type": "date" + }, + { + "variable": "paymentDate", + "value": { + "path": "$.transactionDate" + }, + "type": "date" + }, + { + "variable": "consumerID", + "value": { + "path": "$.paymentDetails[0].bill.consumerCode" + } + }, + { + "variable": "transactionID", + "value": { + "path": "$.instrumentNumber" + } + }, { + "variable": "transactionDate", + "value": { + "path": "$.instrumentDate" + }, + "type": "date" + }, + { + "variable": "dueAmount", + "value": { + "path": "$.paymentDetails[0].bill.totalAmount" + } + }, + { + "variable": "approvedBy", + "value": { + "path": "$.paymentDetails[0].bill.additionalDetails.lastModifier" + } + }, + { + "variable": "penaltyReason", + "value": { + "path": "$.paymentDetails[0].bill.additionalDetails.adhocPenaltyReason" + } + }, + { + "variable": "rebateReason", + "value": { + "path": "$.paymentDetails[0].bill.additionalDetails.adhocRebateReason" + } + }, + { + "variable": "PropertyTax", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_TAX')].amount" + } + }, + { + "variable": "FireCess", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_FIRE_CESS')].amount" + } + }, + { + "variable": "CancerCess", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_CANCER_CESS')].amount" + } + }, + { + "variable": "Penalty", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_TIME_PENALTY')].amount" + } + }, + { + "variable": "Arrears1", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[1].amount" + } + }, { + "variable": "Arrears2", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[2].amount" + } + }, { + "variable": "Arrears3", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[3].amount" + } + }, { + "variable": "Arrears4", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[4].amount" + } + }, { + "variable": "Arrears5", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[5].amount" + } + }, { + "variable": "Arrears6", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[6].amount" + } + }, { + "variable": "Arrears7", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[7].amount" + } + }, { + "variable": "Arrears8", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[8].amount" + } + }, + { + "variable": "adhocPenalty", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_ADHOC_PENALTY')].amount" + } + }, + { + "variable": "adhocRebate", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_ADHOC_REBATE')].amount" + } + }, + { + "variable": "Rebate", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_TIME_REBATE')].amount" + } + }, + { + "variable": "Interest", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_TIME_INTEREST')].amount" + } + }, + { + "variable": "UsageExemption", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_UNIT_USAGE_EXEMPTION')].amount" + } + }, + { + "variable": "SpecialCategoryExemption", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_OWNER_EXEMPTION')].amount" + } + }, + { + "variable": "RoundOff", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_ROUNDOFF')].amount" + } + }, + { + "variable": "payment_receipt", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_RECEIPT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common", + "locale":"en_IN" + } + }, + { + "variable": "receipt_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_RECEIPT_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common", + "locale":"en_IN" + } + }, + { + "variable": "consumer_id", + "value": { + "path": "$.paymentDetails[0].businessService" + }, + "localisation":{ + "required":true, + "prefix": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_CONSUMER_ID", + "module":"rainmaker-common", + "locale":"en_IN" + } + }, + { + "variable": "payment_date", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_DATE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common", + "locale":"en_IN" + } + }, + { + "variable": "payer_name", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYER_NAME" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common", + "locale":"en_IN" + } + }, + { + "variable": "payer_contact", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYER_CONTACT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common", + "locale":"en_IN" + } + }, + { + "variable": "payment_status", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_STATUS" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common", + "locale":"en_IN" + } + }, + { + "variable": "service_type", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_SERVICE_TYPE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common", + "locale":"en_IN" + } + }, + { + "variable": "billing_period", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_BILLING_PERIOD" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common", + "locale":"en_IN" + } + }, + { + "variable": "paid_amount", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAID_AMOUNT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common", + "locale":"en_IN" + } + }, + { + "variable": "pending_amount", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PENDING_AMOUNT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common", + "locale":"en_IN" + } + }, + { + "variable": "payment_mode", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_MODE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common", + "locale":"en_IN" + } + }, + { + "variable": "transaction_id", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_TRANSACTION_ID" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common", + "locale":"en_IN" + } + }, + { + "variable": "g8_receipt_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_G8_RECEIPT_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common", + "locale":"en_IN" + } + }, + { + "variable": "g8_receipt_date", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_G8_RECEIPT_DATE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common", + "locale":"en_IN" + } + }, + { + "variable": "generated_by", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_GENERATED_BY" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common", + "locale":"en_IN" + } + }, + { + "variable": "commissioner/eo", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_COMMISSIONER_EO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common", + "locale":"en_IN" + } + }, + { + "variable": "no_signature", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_NO_SIGNATURE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common", + "locale":"en_IN" + } + }, + { + "variable": "disclamer", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common", + "locale":"en_IN" + } + }, + { + "variable": "to", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_TO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common", + "locale":"en_IN" + } + }, + { + "variable": "var_bills", + "value":{ + "path":"$.paymentDetails[0].additionalDetails.arrearArray.*" + }, + "type":"array", + "format":{ + "type":"string", + "scema":[ + { + "variable":"year", + "value": "year" + + },{ + "variable":"tax", + "value": "tax" + + },{ + "variable":"firecess", + "value": "firecess" + + },{ + "variable":"cancercess", + "value": "cancercess" + + },{ + "variable":"penalty", + "value": "penalty" + + },{ + "variable":"interest", + "value": "interest" + + },{ + "variable":"rebate", + "value": "rebate" + + }, + { + "variable":"usage_exemption", + "value": "usage_exemption" + + },{ + "variable":"special_category_exemption", + "value": "special_category_exemption" + + },{ + "variable":"adhoc_penalty", + "value": "adhoc_penalty" + + },{ + "variable":"adhoc_rebate", + "value": "adhoc_rebate" + + },{ + "variable":"roundoff", + "value": "roundoff" + + },{ + "variable":"total", + "value": "total" + + } + ] + } + }, + { + "variable": "var_tax", + "value":{ + "path":"$.paymentDetails[0].additionalDetails.taxArray.*" + }, + "type":"array", + "format":{ + "type":"string", + "scema":[ + { + "variable":"year", + "value": "year" + + },{ + "variable":"tax", + "value": "tax" + + },{ + "variable":"firecess", + "value": "firecess" + + },{ + "variable":"cancercess", + "value": "cancercess" + + },{ + "variable":"penalty", + "value": "penalty" + + },{ + "variable":"interest", + "value": "interest" + + },{ + "variable":"rebate", + "value": "rebate" + + }, + { + "variable":"usage_exemption", + "value": "usage_exemption" + + },{ + "variable":"special_category_exemption", + "value": "special_category_exemption" + + },{ + "variable":"adhoc_penalty", + "value": "adhoc_penalty" + + },{ + "variable":"adhoc_rebate", + "value": "adhoc_rebate" + + },{ + "variable":"roundoff", + "value": "roundoff" + + },{ + "variable":"total", + "value": "total" + + } + ] + } + }, + + { + "variable": "Municipal_Corporation", + "value": { + "path": "PDF_STATIC_LABEL_MDMS_MUNICIPAL_CORPORATION" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common", + "locale":"en_IN" + } + }, + { + "variable": "DisclaimerText", + "value": { + "path": "PT_RECEIPT_DISCLAIMER" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common", + "locale":"en_IN" + } + } + ] + }, + { + "derived": [ + { + "variable": "pendingAmount", + "formula": "{{dueAmount}}-{{paidAmount}}" + }, + { + "variable": "Arrears", + "formula": "{{Arrears1}}+{{Arrears2}}+{{Arrears3}}+{{Arrears4}}+{{Arrears5}}+{{Arrears6}}+{{Arrears7}}+{{Arrears8}}" + } + ] + }, + { + "externalAPI": [ + { + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", + "apiRequest": null, + "responseMapping":[ + { + "variable":"address", + "value":"$.MdmsRes.tenant.tenants[0].address" + }, + { + "variable":"phoneNumber", + "value":"$.MdmsRes.tenant.tenants[0].contactNumber" + }, + { + "variable":"website", + "value":"$.MdmsRes.tenant.tenants[0].domainUrl" + }, + { + "variable":"mcGrade", + "value":"$.MdmsRes.tenant.tenants[0].city.ulbType" + }, + { + "variable":"email", + "value":"$.MdmsRes.tenant.tenants[0].emailId" + }, + { + "variable": "logoImage", + "value":"$.MdmsRes.tenant.tenants[0].logoId", + "type":"image" + }, + { + "variable": "logo-header", + "value":"$.MdmsRes.tenant.tenants[0].code", + "localisation":{ + "required":true, + "prefix": "TENANT_TENANTS", + "module":"rainmaker-common", + "locale":"en_IN" + } + } + ] + }, + { + "path": "http://property-services.egov:8080/property-services/property/_search", + "queryParam": "propertyIds=$.paymentDetails[0].bill.consumerCode,tenantId=$.tenantId", + "apiRequest": null, + "responseMapping":[ + { "variable":"institutionName", + "value":"$.Properties[0].institution.name" + }, + { + "variable":"vasikaNo", + "value":"$.Properties[0].additionalDetails.vasikaNo" + },{ + "variable":"vasikaDate", + "value":"$.Properties[0].additionalDetails.vasikaDate", + "type":"date" + }, { + "variable":"allotmentNo", + "value":"$.Properties[0].additionalDetails.allotmentNo" + }, { + "variable":"allotmentDate", + "value":"$.Properties[0].additionalDetails.allotmentDate", + "type":"date" + }, { + "variable":"businessName", + "value":"$.Properties[0].additionalDetails.businessName" + }, { + "variable":"remarks", + "value":"$.Properties[0].additionalDetails.remrks" + }, { + "variable":"fatherHusbandName", + "value":"$.Properties[0].owners[0].fatherOrHusbandName" + }, { + "variable":"propertyUsage", + "value":"$.Properties[0].usageCategory", + "localisation": { + "required": true, + "prefix": "COMMON_PROPUSGTYPE", + "module": "rainmaker-pt", + "locale":"en_IN" + } + }, + { + "variable":"doorNo", + "value":"$.Properties[0].address.doorNo" + }, + { + "variable":"buildingName", + "value":"$.Properties[0].address.buildingName" + }, + { + "variable":"streetName", + "value":"$.Properties[0].address.street" + }, + { + "variable":"locality", + "value":"$.Properties[0].address.locality.name" + }, + { + "variable":"landArea", + "value":"$.Properties[0].landArea" + }, + { + "variable":"propertyType", + "value":"$.Properties[0].propertyType", + "localisation": { + "required": true, + "prefix": "WS_PROPTYPE", + "module": "rainmaker-ws", + "locale":"en_IN" + } + }, + { + "variable":"oldPropertyId", + "value":"$.Properties[0].oldPropertyId" + }, + { + "variable":"surveyId", + "value":"$.Properties[0].surveyId" + }, + { + "variable":"ownerMobileNumber", + "value":"$.Properties[0].owners[?(@.status== 'ACTIVE')].mobileNumber" + }, + { + "variable": "var_owners", + "value":"$.Properties[0].owners[?(@.active== true && @.status== 'ACTIVE')]", + "type":"array", + "format":{ + "type":"string", + "scema":[ + { + "variable":"name2", + "value":"name" + }, + { + "variable":"fatherOrHusbandName2", + "value":"fatherOrHusbandName" + }, + { + "variable":"ownerShipPercentage", + "value":"ownerShipPercentage" + }, + { + "variable":"ownerType", + "value":"ownerType" + } + ] + } + }, + { + "variable": "var_floors", + "value":"$.Properties[0].units[?(@.active== true)]", + "type":"array", + "format":{ + "type":"string", + "scema":[ + { + "variable":"floor_no", + "value":"floorNo", + "localisation": { + "required": true, + "prefix": "PROPERTYTAX_FLOOR", + "module": "rainmaker-pt", + "locale":"en_IN" + } + }, + { + "variable":"usage_category", + "value":"usageCategory", + "localisation": { + "required": true, + "prefix": "COMMON_PROPUSGTYPE", + "module": "rainmaker-pt", + "locale":"en_IN" + } + }, + { + "variable":"sub_usage_category", + "value":"usageCategory", + "localisation": { + "required": true, + "prefix": "COMMON_PROPSUBUSGTYPE", + "module": "rainmaker-pt", + "isSubTypeRequired":true, + "locale":"en_IN" + } + }, + { + "variable":"occupancy_type", + "value":"occupancyType" + }, + { + "variable":"builtup_area", + "value":"constructionDetail.builtUpArea" + }, + { + "variable":"arv_rent", + "value":"arv" + }, + { + "variable":"additional_details", + "value":"additionalDetails" + } + + ] + } + } + + + ] + }, + { + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "queryParam": "moduleName=tenant&masterName=footer&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}' %26%26 @.service=='{$.paymentDetails[0].businessService}')%5D", + "apiRequest": null, + "responseMapping":[ + { + "variable": "variable11", + "value": "$.MdmsRes.tenant.footer[0].receiptFooterContent.*", + "type":"array", + "format":{ + "type":"string", + "scema":[ + { + "variable":"disclaimerContent", + "value":"disclaimer", + "type":"string", + "localisation":{ + "required":true, + "prefix": null, + "module": "rainmaker-common" + } + } + ] + } + } + ] + } + ] + } + ] + } + ] + } +} diff --git a/configs/pdf-service/data-config/pt-receipt.json b/configs/pdf-service/data-config/pt-receipt.json new file mode 100644 index 00000000..56e0706e --- /dev/null +++ b/configs/pdf-service/data-config/pt-receipt.json @@ -0,0 +1,273 @@ +{ + + "key":"pt-receipt", + "DataConfigs": { + "serviceName": "rainmaker-pt", + "version": "1.0.0", + "baseKeyPath": "$.Properties.*", + "entityIdPath":"$.propertyId", + "isCommonTableBorderRequired":true, + "mappings": [ + { + "topic": "pt-pdf-generation", + "staticConfigPath": "https://raw.githubusercontent.com/egovernments/egov-services/vishal-feature-filestore/core/egov-indexer/src/main/resources/rainmaker-pgr-indexer.yml", + "mappings": [ + { + "direct": [ + { + "variable": "variable1", + "value": { + "path":"$.propertyDetails[0].financialYear" + } + }, + { + "variable": "variable38", + "url":"https://raw.githubusercontent.com/egovernments/egov-web-app/master/web/rainmaker/dev-packages/egov-ui-kit-dev/src/assets/images/pblogo.png", + "type":"image" + }, + { + "variable": "variable35", + "value": { + "path":"$.tenantId" + }, + "localisation":{ + "required":true, + "prefix":"TENANT_TENANTS", + "module":"rainmaker-common" + }, + "isUpperCaseRequired":true + }, + { + "variable": "variable36", + "type":"citizen-employee-title" + }, + { + "variable":"variable2", + "value":{ + "path":"$.oldPropertyId" + } + }, + { + "variable": "variable3", + "value":{ + "path":"$.propertyId" + } + }, + { + "variable": "variable4", + "value":{ + "path":"$.propertyDetails[0].assessmentNumber" + } + }, + { + "variable": "variable5", + "value":{ + "path":"$.address.doorNo" + } + }, + { + "variable": "variable6", + "value":{ + "path":"$.address.buildingName" + } + }, + { + "variable": "variable7", + "value":{ + "path":"$.address.street" + } + }, + { + "variable": "variable8", + "value":{ + "path":"$.address.locality.name" + } + }, + { + "variable": "variable9", + "value":{ + "path":"$.propertyDetails[0].landArea" + } + }, + { + "variable": "variable10", + "value":{ + "path":"$.propertyDetails[0].propertySubType" + }, + "localisation":{ + "required":true, + "prefix":"PROPERTYTAX_BILLING_SLAB", + "module":"rainmaker-pt" + } + }, + { + "variable": "variable11", + "value":{ + "path":"$.propertyDetails[0].owners.*" + }, + "type":"array", + "format":{ + "type":"string", + "scema":[ + { + "key":"name" + }, + { + "key":"fatherOrHusbandName" + }] + } + }, + { + "variable": "variable12", + "value":{ + "path":"$.propertyDetails[0].units.*" + }, + "type":"array-column", + "format":{ + "type":"string", + "scema":[ + { + "key":"floorNo", + "localisation":{ + "required":true, + "prefix":"PROPERTYTAX_FLOOR", + "module":"rainmaker-pt" + } + + }, + { + "key":"usageCategoryMinor", + "localisation":{ + "required":true, + "prefix":"PROPERTYTAX_BILLING_SLAB", + "module":"rainmaker-pt" + } + + }, + { + "key":"usageCategoryDetail", + "localisation":{ + "required":true, + "prefix":"PROPERTYTAX_BILLING_SLAB", + "module":"rainmaker-pt" + } + }, + { + "key":"occupancyType", + "localisation":{ + "required":true, + "prefix":"PROPERTYTAX_OCCUPANCYTYPE", + "module":"rainmaker-pt" + } + }, + { + "key":"unitArea" + }] + } + } + ] + }, + { + "derived": [ + { + "variable": "variable37", + "formula": "{{variable34}}-{{variable27}}" + } + ] + }, + { + "externalAPI": [ + { + "path": "http://collection-services:8080/collection-services/receipts/_search", + "queryParam": "consumerCode=$.propertyId:$.propertyDetails[0].assessmentNumber", + "apiRequest": null, + "responseMapping":[ + { + "variable":"variable15", + "value":"$.Receipt[0].receiptNumber" + }, + { + "variable":"variable16", + "value":"$.Receipt[0].receiptDate" + }, + { + "variable":"variable17", + "value":"$.Receipt[0].Bill[0].billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_TAX')].amount" + }, + { + "variable":"variable18", + "value":"$.Receipt[0].Bill[0].billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_FIRE_CESS')].amount" + }, + { + "variable":"variable19", + "value":"$.Receipt[0].Bill[0].billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_CANCER_CESS')].amount" + }, + { + "variable":"variable20", + "value":"$.Receipt[0].Bill[0].billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_TIME_PENALTY')].amount" + }, + { + "variable":"variable21", + "value":"$.Receipt[0].Bill[0].billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_TIME_REBATE')].amount" + }, + { + "variable":"variable22", + "value":"$.Receipt[0].Bill[0].billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_TIME_INTEREST')].amount" + }, + { + "variable":"variable23", + "value":"$.Receipt[0].Bill[0].billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_UNIT_USAGE_EXEMPTION')].amount" + }, + { + "variable":"variable24", + "value":"$.Receipt[0].Bill[0].billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_OWNER_EXEMPTION')].amount" + }, + { + "variable":"variable25", + "value":"$.Receipt[0].Bill[0].billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_ROUNDOFF')].amount" + }, + { + "variable":"variable26", + "value":"$.Receipt[0].Bill[0].billDetails[0].totalAmount" + }, + { + "variable":"variable27", + "value":"$.Receipt[0].Bill[0].billDetails[0].amountPaid" + }, + { + "variable":"variable28", + "value":"$.Receipt[0].instrument.instrumentType.name" + }, + { + "variable":"variable29", + "value":"$.Receipt[0].instrument.bank.name" + }, + { + "variable":"variable30", + "value":"$.Receipt[0].transactionId" + }, + { + "variable":"variable31", + "value":"$.Receipt[0].instrument.transactionDateInput" + }, + { + "variable":"variable32", + "value":"$.Receipt[0].Bill[0].billDetails[0].manualReceiptNumber" + }, + { + "variable":"variable33", + "value":"$.Receipt[0].Bill[0].billDetails[0].manualReceiptDate" + }, + { + "variable":"variable34", + "value":"$.Receipt[0].Bill[0].billDetails[0].totalAmount" + } + ] + } + ] + } + ] + } + ] + } +} diff --git a/configs/pdf-service/data-config/ptmutationcertificate.json b/configs/pdf-service/data-config/ptmutationcertificate.json new file mode 100644 index 00000000..7f9f3af2 --- /dev/null +++ b/configs/pdf-service/data-config/ptmutationcertificate.json @@ -0,0 +1,380 @@ +{ + "key": "ptmutationcertificate", + "documentType": "PTMUTATION", + "DataConfigs": { + "moduleName": "PT", + "version": "1.0.0", + "baseKeyPath": "$.Properties.*", + "entityIdPath":"$.id", + "isCommonTableBorderRequired": true, + "mappings": [ + { + "mappings": [ + { + "direct": [ + + { + "variable": "municipal_corportaion", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_MUNICIPAL_CORPORATION" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "corporation_fax", + "value": { + "path": "PDF_STATIC_LABEL_MUTATION_FAX" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "corporation_website", + "value": { + "path": "PDF_STATIC_LABEL_MUTATION_WEBSITE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "corporation_email", + "value": { + "path": "PDF_STATIC_LABEL_MUTATION_EMAIL" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "Mutation_Approval_Certificate", + "value": { + "path": "PDF_STATIC_LABEL_MUATATION_APPROVAL_CERTIFICATE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "Property_ID_Label", + "value": { + "path": "PDF_STATIC_LABEL_MUATATION_PROPERTY_ID_LABEL" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "Mutation_Number_Label", + "value": { + "path": "PDF_STATIC_LABEL_MUATATION_NUMBER_LABEL" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "Application_Number_Label", + "value": { + "path": "PDF_STATIC_LABEL_APPLICATION_NUMBER_LABEL" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "Receipt_Number_Label", + "value": { + "path": "PDF_STATIC_LABEL_RECEIPT_NUMBER_LABEL" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "Approval_Date_Label", + "value": { + "path": "PDF_STATIC_LABEL_APPROVAL_DATE_LABEL" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "Order_Label", + "value": { + "path": "PDF_STATIC_LABEL_ORDER_LABEL" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "Mutation_Declaration_Label", + "value": { + "path": "$.tenantId" + }, + "localisation":{ + "required":true, + "prefix": "PDF_STATIC_LABEL_MUTATION_DECLARATION_LABEL", + "module":"rainmaker-common" + } + }, + { + "variable": "Transferrer_Details_Label", + "value": { + "path": "PDF_STATIC_LABEL_TRANSFERRER_LABEL" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "Transferree_Details_Label", + "value": { + "path": "PDF_STATIC_LABEL_TRANSFERREE_LABEL" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "Mutation_To_Label", + "value": { + "path": "PDF_STATIC_LABEL_MUTATION_TO_LABEL" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "Shri_Smt_Label", + "value": { + "path": "PDF_STATIC_LABEL_SHRI_SMT_LABEL" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "approved_by", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_APPROVED_BY" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "commissioner", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_COMMISSIONER" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "Property_ID", + "value": { + "path": "$.propertyId" + } + }, + { + "variable": "Mutation_Number", + "value": { + "path": "$.acknowldgementNumber" + } + }, + { + "variable": "Application_Number", + "value": { + "path": "$.acknowldgementNumber" + } + }, + { + "variable": "Transferrer_Name", + "value": { + "path": "$.owners[?(@.status == 'INACTIVE')].name" + } + }, + { + "variable": "Transferrer_Relation", + "value": { + "path": "$.owners[?(@.status == 'INACTIVE')].relationship" + }, + "localisation":{ + "required":true, + "prefix": "PT_MUTATION", + "module": "rainmaker-common" + } + }, + { + "variable": "Transferrer_Relative_Name", + "value": { + "path": "$.owners[?(@.status == 'INACTIVE')].fatherOrHusbandName" + } + }, + { + "variable": "Transferree_Name", + "value": { + "path": "$.owners[?(@.status == 'ACTIVE')].name" + } + }, + { + "variable": "Transferree_Relation", + "value": { + "path": "$.owners[?(@.status == 'ACTIVE')].relationship" + }, + "localisation":{ + "required":true, + "prefix": "PT_MUTATION", + "module": "rainmaker-common" + } + }, + { + "variable": "Transferree_Relative_Name", + "value": { + "path": "$.owners[?(@.status == 'ACTIVE')].fatherOrHusbandName" + } + }, + { + "variable": "Transferree_Address", + "value": { + "path": "$.owners[?(@.status == 'ACTIVE')].permanentAddress" + } + }, + { + "variable": "Transferree_City", + "value": { + "path": "$.owners[?(@.status == 'ACTIVE')].permanentCity" + } + } + ] + }, + { + "externalAPI": [ + { + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", + "apiRequest": null, + "responseMapping":[ + { + "variable":"ULB_LOGO", + "value":"$.MdmsRes.tenant.tenants[0].logoId", + "type": "image" + }, + { + "variable":"ULB_ADDRESS", + "value":"$.MdmsRes.tenant.tenants[0].address" + }, + { + "variable":"ULB_CITY", + "value":"$.MdmsRes.tenant.tenants[0].name" + }, + { + "variable":"CorporationContact_Value", + "value":"$.MdmsRes.tenant.tenants[0].contactNumber" + }, + { + "variable":"corporationWebsite", + "value":"$.MdmsRes.tenant.tenants[0].domainUrl" + }, + { + "variable":"corporationEmail", + "value":"$.MdmsRes.tenant.tenants[0].emailId" + } + ] + }, + { + "path": "http://collection-services:8080/collection-services/payments/PT/_search", + "queryParam": "tenantId=$.tenantId,consumerCodes=$.acknowldgementNumber,businessServices=PT.MUTATION", + "apiRequest": null, + "responseMapping":[ + { + "variable":"Receipt_Number", + "value":"$.Payments[0].paymentDetails[0].receiptNumber" + } + + ] + }, + { + "path": "http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search", + "queryParam": "businessIds=$.acknowldgementNumber,history=true,tenantId=$.tenantId", + "apiRequest": null, + "responseMapping":[ + { + "variable":"approved_by_value", + "value":"$.ProcessInstances[?(@.action == 'APPROVE')].assigner.name" + }, + { + "variable":"Approval_Date", + "value":"$.ProcessInstances[?(@.action == 'APPROVE')].auditDetails.lastModifiedTime", + "type": "date" + } + + ] + } + + ] + } + ] + +} +] +} +} diff --git a/configs/pdf-service/data-config/sewerage-bill-amendment-note.json b/configs/pdf-service/data-config/sewerage-bill-amendment-note.json new file mode 100644 index 00000000..6123217b --- /dev/null +++ b/configs/pdf-service/data-config/sewerage-bill-amendment-note.json @@ -0,0 +1,617 @@ +{ + "key": "sw-bill-amendment-credit-note", + "DataConfigs": { + "serviceName": "rainmaker-common", + "version": "1.0.0", + "baseKeyPath": "$.Amendments.*", + "entityIdPath":"$.id", + "isCommonTableBorderRequired": true, + "mappings": [ + { + "topic": "common-pdf-generation-3", + "mappings": [ + { + "direct": [ + { + "variable": "payerName", + "value": { + "path": "$.payerName" + } + }, + { + "variable": "applicationNo", + "value": { + "path": "$.consumerCode" + } + }, + { + "variable": "user-name", + "value": { + "path": "$.additionalDetails.ownerName" + } + }, + { + "variable": "permanentAddress", + "value": { + "path": "$.additionalDetails.ownerAddress" + } + }, + { + "variable": "date", + "value": { + "path": "$.userInfo.createdDate" + }, + "type":"selectFromRequestInfo" + }, + { + "variable": "payerContact", + "value": { + "path": "$.mobileNumber" + } + }, + { + "variable": "paymentStatus", + "value": { + "path": "$.paymentStatus" + } + }, + { + "variable": "receiptNo", + "value": { + "path": "$.paymentDetails[0].receiptNumber" + } + }, + { + "variable": "serviceType", + "value": { + "path": "$.businessService" + }, + "localisation":{ + "required":true, + "prefix":"MODULE", + "module":"rainmaker-common" + } + }, + { + "variable": "sewerageInterest", + "value": { + "path": "$.demandDetails[?(@.taxHeadMasterCode == 'SW_TIME_INTEREST')].taxAmount" + } + }, + { + "variable": "water_cess", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_WATER_CESS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "interest", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_INTEREST" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "generated_by", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_GENERATED_BY" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "commissioner/eo", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_COMMISSIONER_EO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "no_signature", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_NO_SIGNATURE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "penalty", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_PENALTY" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "sewerage_charge", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_SEWERAGE_CHARGE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "seweragePenalty", + "value": { + "path": "$.demandDetails[?(@.taxHeadMasterCode == 'SW_TIME_PENALTY')].taxAmount" + } + }, + { + "variable": "arrears", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_ARREARS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "sewerageCharge", + "value": { + "path": "$.demandDetails[?(@.taxHeadMasterCode == 'SW_CHARGE')].taxAmount" + } + }, + { + "variable": "total_amount", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_TOTAL_AMOUNT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "bill_amendment_application", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_APPLICATION" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "demand_revision_basis_details", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_DEM_REV_BAS_DET" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "demand_revision_basis", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_DEM_REV_BASIS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "court_order_no", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_COURT_ORDER_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "with_effect_from", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_WITH_EFFECT_FROM" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "demandRevisionBasis", + "value": { + "path": "$.amendmentReason" + } + }, + { + "variable": "courtOrderNo", + "value": { + "path": "$.reasonDocumentNumber" + } + }, + { + "variable": "withEffectFrom", + "value": { + "path": "$.effectiveFrom" + } + }, + { + "variable": "court_order", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_COURT_ORDER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "note_id", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_NOTE_ID" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "note_date", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_NOTE_DATE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "against", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_NOTE_AGAINST" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "adjustment_amount_details", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_NOTE_ADJUSTMENT_AMOUNT_DETAILS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "total_amount", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_NOTE_TOTAL_AMOUNT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "rs", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_NOTE_RS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "box_note", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_NOTE_BOX_NOTE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "box_validity", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_NOTE_BOX_VALIDITY" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "self_declaration", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_SELF_DECLARATION" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "past_bills", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_PAST_BILLS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "courtOrder", + "value": { + "path": "$.transactionNumber" + } + }, + { + "variable": "selfDeclaration", + "value": { + "path": "$.transactionNumber" + } + }, + { + "variable": "pastBills", + "value": { + "path": "$.transactionNumber" + } + }, + { + "variable": "applicationNo", + "value": { + "path": "$.consumerCode" + } + }, + { + "variable": "bill_amendment_application_number", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_APPLICATION_NUMBER" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "adjustment_amount_details", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_ADJUSTMENT_AMOUNT_DETAILS" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + + }, + { + "variable": "sl_no", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_SERIAL_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "tax_heads", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_TAX_HEADS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "reduced_amount", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_REDUCED_AMOUNT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "note_type", + "value": { + "path": "$.additionalDetails.noteType" + }, + "localisation": { + "required": true, + "prefix": "PDF_STATIC_LABEL_BILL_AMENDMENT", + "module": "rainmaker-common" + } + }, + { + "variable": "water_tax", + "value": { + "path": "PDF_STATIC_LABEL_BILL_AMENDMENT_WATER_TAX" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "Municipal_Corporation", + "value": { + "path": "PDF_STATIC_LABEL_MDMS_MUNICIPAL_CORPORATION" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + } + ] + }, + { + "derived": [ + { + "variable": "totalAmount", + "formula": "{{sewerageCharge}}+{{sewerageInterest}}+{{seweragePenalty}}" + } + ] + }, + { + "externalAPI": [ + { + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", + "apiRequest": null, + "responseMapping":[ + { + "variable":"address", + "value":"$.MdmsRes.tenant.tenants[0].address" + }, + { + "variable":"phoneNumber", + "value":"$.MdmsRes.tenant.tenants[0].contactNumber" + }, + { + "variable":"mcGrade", + "value":"$.MdmsRes.tenant.tenants[0].city.pwssbGrade" + }, + { + "variable":"website", + "value":"$.MdmsRes.tenant.tenants[0].domainUrl" + }, + { + "variable":"email", + "value":"$.MdmsRes.tenant.tenants[0].emailId" + }, + { + "variable": "logoImage", + "value":"$.MdmsRes.tenant.tenants[0].logoId", + "type":"image" + }, + { + "variable": "logo-header", + "value":"$.MdmsRes.tenant.tenants[0].code", + "localisation":{ + "required":true, + "prefix": "TENANT_TENANTS", + "module":"rainmaker-common" + } + } + ] + }, + { + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "queryParam": "moduleName=tenant&masterName=footer&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}' %26%26 @.service=='{$.businessService}')%5D", + "apiRequest": null, + "responseMapping":[ + { + "variable": "variable11", + "value": "$.MdmsRes.tenant.footer[0].receiptFooterContent.*", + "type":"array", + "format":{ + "type":"string", + "scema":[ + { + "variable":"disclaimerContent", + "value":"disclaimer", + "type":"string", + "localisation":{ + "required":true, + "prefix": null, + "module": "rainmaker-common" + } + } + ] + } + } + ] + } + ] + } + ] + } + ] + } +} diff --git a/configs/pdf-service/data-config/sw-bill.json b/configs/pdf-service/data-config/sw-bill.json new file mode 100644 index 00000000..c4b001aa --- /dev/null +++ b/configs/pdf-service/data-config/sw-bill.json @@ -0,0 +1,842 @@ +{ + "key": "sw-bill", + "DataConfigs": { + "serviceName": "rainmaker-common", + "version": "1.0.0", + "baseKeyPath": "$.Bill.*", + "entityIdPath": "$.billNumber", + "isCommonTableBorderRequired": true, + "mappings": [ + { + "topic": "common-pdf-generation-1", + "staticConfigPath": "https://raw.githubusercontent.com/egovernments/egov-services/vishal-feature-filestore/core/egov-indexer/src/main/resources/rainmaker-pgr-indexer.yml", + "mappings": [ + { + "direct": [ + { + "variable": "total_amount_due", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_TOTAL_AMOUNT_DUE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "payer_name", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PAYER_NAME" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "Municipal_Corporation", + "value": { + "path": "PDF_STATIC_LABEL_MDMS_MUNICIPAL_CORPORATION" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "bill_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_BILL_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "Rs", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_RUPEE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "mobile_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_MOBILE_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "bill_period", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_BILL_PERIOD" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "payer_address", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PAYER_ADDRESS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "bill_issue_date", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ISSUE_DATE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "bill_due_date", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_BILL_DUE_DATE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "billing_summary_property_tax", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_BILLING_SUMMARY" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "serviceType", + "value": { + "path": "$.businessService" + }, + "localisation": { + "required": true, + "prefix": "MODULE", + "module": "rainmaker-common" + } + }, + { + "variable": "property_id", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PROPERTY_ID" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "arrears_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ARREARS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "advanceAdjusted_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ADVANCEADJUSTED" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "advanceAvailable_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ADVANCEAVAILABLE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "charge_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_CHARGE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "penalty_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PENALTY" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "rebate_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_REBATE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "others_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_OTHERS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "total_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_TOTAL" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "important_message", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_IMPORTANT_MESSAGE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "payment_received", + "value": { + "path": "PDF_STATIC_LABEL_WS_BILL_PAYMENT_RECEIVED" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-ws" + } + }, + { + "variable": "this_document", + "value": { + "path": "PDF_STATIC_LABEL_WS_BILL_THIS_DOCUMENT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-ws" + } + }, + { + "variable": "this_is_a", + "value": { + "path": "PDF_STATIC_LABEL_WS_BILL_THIS_IS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-ws" + } + }, + { + "variable": "assessment_payment", + "value": { + "path": "PDF_STATIC_LABEL_WS_BILL_ASSESSSMENT_PAYMENT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-ws" + } + }, + { + "variable": "please_deposit", + "value": { + "path": "PDF_STATIC_LABEL_WS_BILL_PLEASE_DEPOSIT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-ws" + } + }, + { + "variable": "if_the_tax", + "value": { + "path": "PDF_STATIC_LABEL_WS_BILL_IF_THE_TAX" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-ws" + } + }, + { + "variable": "acknowledgement_for", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ACKNOWLEDGEMENT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "date_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_DATE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "consumer_id", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_CONSUMER_ID" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "consumer_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_CONSUMER_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "name_address", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_NAME_ADDRESS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "total_payment", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_TOTAL_PAYMENT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "receivers_signature", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_RECEIVERS_SIGNATURE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "totalAmountDue", + "value": { + "path": "$.totalAmount" + } + }, + { + "variable": "total", + "value": { + "path": "$.totalAmount" + } + }, + { + "variable": "payerName", + "value": { + "path": "$.payerName" + } + }, + { + "variable": "mobileNo", + "value": { + "path": "$.mobileNumber" + } + }, + { + "variable": "oldConnectionNo", + "value": { + "path": "$.connection.oldConnectionNo" + } + }, { + "variable": "rate", + "value": { + "path": "$.additionalDetails.penaltyRate" + } + }, + { + "variable": "ledgerId", + "value": { + "path": "$.connection.additionalDetails.ledgerId" + } + }, + { + "variable": "payerAddress", + "value": { + "path": "$.payerAddress" + } + }, + { + "variable": "tenant", + "value": { + "path": "$.tenantId" + } + }, + { + "variable": "nameAddress", + "value": { + "path": "$.payerAddress" + } + }, + { + "variable": "billNo", + "value": { + "path": "$.billNumber" + } + }, + { + "variable": "fromPeriod", + "value": { + "path": "$.billDetails[0].fromPeriod" + }, + "type": "date" + }, + { + "variable": "toPeriod", + "value": { + "path": "$.billDetails[0].toPeriod" + }, + "type": "date" + }, + { + "variable": "billIssueDate", + "value": { + "path": "$.billDate" + }, + "type": "date" + }, + { + "variable": "billDueDate", + "value": { + "path": "$.billDetails[0].expiryDate" + }, + "type": "date" + }, + { + "variable": "billdate", + "value": { + "path": "$.billDate" + }, + "type": "date" + }, + { + "variable": "consumerCode", + "value": { + "path": "$.consumerCode" + } + }, + { + "variable": "taxCharge", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_TAX' || @.taxHeadCode == 'TL_TAX' || @.taxHeadCode == 'FIRENOC_TAXES' || @.taxHeadCode == 'WS_CHARGE' || @.taxHeadCode == 'SW_CHARGE' )].amount" + } + }, + { + "variable": "timeRebate", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_TIME_REBATE' || @.taxHeadCode == 'WS_TIME_REBATE' || @.taxHeadCode == 'SW_TIME_REBATE')].amount" + } + }, + { + "variable": "adhocRebate", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_ADHOC_REBATE' || @.taxHeadCode == 'TL_ADHOC_REBATE' || @.taxHeadCode == 'FIRENOC_ADHOC_REBATE')].amount" + } + }, + { + "variable": "timePenalty", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_TIME_PENALTY' || @.taxHeadCode == 'WS_TIME_PENALTY' || @.taxHeadCode == 'SW_TIME_PENALTY')].amount" + } + }, + { + "variable": "adhocPenalty", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_ADHOC_PENALTY' || @.taxHeadCode == 'TL_ADHOC_PENALTY' || @.taxHeadCode == 'FIRENOC_ADHOC_PENALTY')].amount" + } + }, + { + "variable": "firecess", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_FIRE_CESS')].amount" + } + }, + { + "variable": "usageExemption", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_UNIT_USAGE_EXEMPTION')].amount" + } + }, + { + "variable": "roundoff", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_ROUNDOFF' || @.taxHeadCode == 'TL_ROUNDOFF' || @.taxHeadCode == 'FIRENOC_ROUNDOFF' || @.taxHeadCode == 'WS_Round_Off' || @.taxHeadCode == 'SW_Round_Off')].amount" + } + }, + { + "variable": "fees", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'FIRENOC_FEES')].amount" + } + }, + { + "variable": "ownerExemption", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_OWNER_EXEMPTION')].amount" + } + }, + { + "variable": "cancerCess", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_CANCER_CESS')].amount" + } + }, + { + "variable": "waterCess", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'WS_WATER_CESS' || @.taxHeadCode == 'SW_SEWERAGE_CESS')].amount" + } + }, + { + "variable": "timeInterest", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_TIME_INTEREST' || @.taxHeadCode == 'WS_TIME_INTEREST' || @.taxHeadCode == 'SW_TIME_INTEREST')].amount" + } + }, + { + "variable": "ceilingDebit", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_DECIMAL_CEILING_DEBIT')].amount" + } + }, + { + "variable": "ceilingCredit", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_DECIMAL_CEILING_CREDIT')].amount" + } + }, + { + "variable": "carryForward", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'WS_ADVANCE_CARRYFORWARD' || @.taxHeadCode == 'SW_ADVANCE_CARRYFORWARD')].amount" + } + }, + { + "variable": "consumerID", + "value": { + "path": "$.consumerCode" + } + }, + { + "variable": "date", + "value": { + "path": "$.billDate" + }, + "type": "date" + }, + { + "variable": "totalPayment", + "value": { + "path": "$.billDetails[0].amountPaid" + } + }, + { + "variable": "WS_arrears", + "value": { + "path": "$.arrearAmount" + } + }, + { + "variable": "WS_AdvanceAdjusted", + "value": { + "path": "$.AdvanceAdjustedValue" + } + }, + { + "variable": "scissorImage", + "url": "http://www.pngall.com/wp-content/uploads/2016/03/Scissor-PNG-Clipart.png", + "type": "image" + } + ] + }, + { + "derived": [ + { + "variable": "charge", + "formula": "{{ws_charge}}" + }, + { + "variable": "penalty", + "formula": "{{timePenalty}}+{{adhocPenalty}}" + }, + { + "variable": "rebate", + "formula": "{{timeRebate}}+{{adhocRebate}}" + }, + { + "variable": "billOthers", + "formula": "{{cancerCess}}+{{roundoff}}+{{timeInterest}}+{{ceilingDebit}}+{{ceilingCredit}}+{{firecess}}+{{waterCess}}" + }, + { + "variable": "demandTotalAmount", + "formula": "{{ws_roundoff}}+{{ws_charge}}+{{ws_water_cess}}+{{ws_time_interest}}+{{ws_time_penalty}}" + }, + { + "variable": "billTotalAmount", + "formula": "{{total}}" + }, + { + "variable": "arrears", + "formula": "{{billTotalAmount}}>{{demandTotalAmount}}?({{billTotalAmount}}-{{demandTotalAmount}}).toFixed(2):0" + }, + { + "variable": "advanceAdjusted", + "formula": "{{billTotalAmount}}>=0?({{billTotalAmount}}<{{demandTotalAmount}}?({{billTotalAmount}}-{{demandTotalAmount}}).toFixed(2):0):{{demandTotalAmount}} * -1" + }, + { + "variable": "advanceAvailable", + "formula": "{{billTotalAmount}}<0?{{billTotalAmount}}*-1:0" + }, + { + "variable": "others", + "formula": "({{ws_roundoff}}+{{ws_water_cess}}+{{ws_time_interest}}).toFixed(2)" + }, + { + "variable": "calculatedTotal", + "formula": "{{billTotalAmount}}>0?{{billTotalAmount}}:0" + } + ] + }, + { + "externalAPI": [ + { + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", + "apiRequest": null, + "responseMapping": [ + { + "variable": "address", + "value": "$.MdmsRes.tenant.tenants[0].address" + }, + { + "variable": "phoneNumber", + "value": "$.MdmsRes.tenant.tenants[0].contactNumber" + }, { + "variable":"mcGrade", + "value":"$.MdmsRes.tenant.tenants[0].city.pwssbGrade" + }, + { + "variable": "website", + "value": "$.MdmsRes.tenant.tenants[0].domainUrl" + }, + { + "variable": "email", + "value": "$.MdmsRes.tenant.tenants[0].emailId" + }, + { + "variable": "logoImage", + "value": "$.MdmsRes.tenant.tenants[0].logoId", + "type": "image" + }, + { + "variable": "logo_header", + "value": "$.MdmsRes.tenant.tenants[0].code", + "localisation": { + "required": true, + "prefix": "TENANT_TENANTS", + "module": "rainmaker-common" + } + } + ] + }, + { + "path": "http://billing-service:8080/billing-service/demand/_search", + "queryParam": "tenantId=$.tenantId,consumerCode=$.consumerCode,businessService=SW,filter=%5B?(@.status=='ACTIVE')%5D", + "apiRequest": null, + "responseMapping": [ + { + "variable": "ws_advanceAmount", + "value": "$.Demands[(@.length-1)].demandDetails[?(@.taxHeadMasterCode == 'SW_ADVANCE_CARRYFORWARD')].taxAmount" + }, + { + "variable": "ws_roundoff", + "value": "$.Demands[(@.length-1)].demandDetails[?(@.taxHeadMasterCode == 'SW_Round_Off')].taxAmount" + }, + { + "variable": "ws_charge", + "value": "$.Demands[(@.length-1)].demandDetails[?(@.taxHeadMasterCode == 'SW_CHARGE')].taxAmount" + }, + { + "variable": "ws_water_cess", + "value": "$.Demands[(@.length-1)].demandDetails[?(@.taxHeadMasterCode == 'SW_WATER_CESS')].taxAmount" + }, + { + "variable": "ws_time_interest", + "value": "$.Demands[(@.length-1)].demandDetails[?(@.taxHeadMasterCode == 'SW_TIME_INTEREST')].taxAmount" + }, + { + "variable": "ws_time_penalty", + "value": "$.Demands[(@.length-1)].demandDetails[?(@.taxHeadMasterCode == 'SW_TIME_PENALTY')].taxAmount" + } + ] + }, + { + "path": "http://property-services.egov:8080/property-services/property/_search", + "queryParam": "tenantId=$.tenantId,propertyIds=$.connection.propertyId", + "apiRequest": null, + "responseMapping": [ + { + "variable": "usageType", + "value": "$.Properties[0].usageCategory" + }, + { + "variable": "plotSize", + "value": "$.Properties[0].landArea" + }, + { + "variable": "houseNo", + "value": "$.Properties[0].address.doorNo" + }, + { + "variable": "streetName", + "value": "$.Properties[0].address.street" + }, + { + "variable": "locality", + "value": "$.Properties[0].address.locality.name" + }, + { + "variable": "landmark", + "value": "$.Properties[0].address.landmark" + }, + { + "variable": "ownerName", + "value": "$.Properties[0].owners[0].name" + }, + { + "variable": "guardianName", + "value": "$.Properties[0].owners[0].fatherOrHusbandName" + } + + ] + } + ] + } + ] + } + ] + } +} diff --git a/configs/pdf-service/data-config/testconsolidatedreceipt.json b/configs/pdf-service/data-config/testconsolidatedreceipt.json new file mode 100644 index 00000000..7e996bb4 --- /dev/null +++ b/configs/pdf-service/data-config/testconsolidatedreceipt.json @@ -0,0 +1,476 @@ +{ + "key": "testconsolidatedreceipt", + "documentType":"CONSOLIDATED_RECEIPT", + "DataConfigs": { + "moduleName": "rainmaker-common", + "version": "1.0.0", + "baseKeyPath": "$.Payments.*", + "entityIdPath":"$.id", + "isCommonTableBorderRequired": true, + "mappings": [ + { + "topic": "common-pdf-generation-3", + "mappings": [ + { + "direct": [ + { + "variable": "payerName", + "value": { + "path": "$.payerName" + } + }, + { + "variable": "user-name", + "value": { + "path": "$.userInfo.name" + }, + "type":"selectFromRequestInfo" + }, + { + "variable": "payerContact", + "value": { + "path": "$.mobileNumber" + } + }, + { + "variable": "receiptNo", + "value": { + "path": "$.paymentDetails[0].receiptNumber" + } + }, + { + "variable": "serviceType", + "value": { + "path": "$.paymentDetails[0].businessService" + }, + "localisation":{ + "required":true, + "prefix":"MODULE", + "module":"rainmaker-common" + } + }, + { + "variable": "paidAmount", + "value": { + "path": "$.paymentDetails[0].totalAmountPaid" + } + }, + { + "variable": "fromPeriod", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].fromPeriod" + }, + "type": "date" + }, + { + "variable": "toPeriod", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].toPeriod" + }, + "type": "date" + }, + { + "variable": "paymentMode", + "value": { + "path": "$.paymentMode" + }, + "localisation":{ + "required":true, + "prefix": "COMMON_MASTERS_PAYMENTMODE", + "module": "rainmaker-common" + } + }, + { + "variable": "G8ReceiptNo", + "value": { + "path": "$.paymentDetails[0].manualReceiptNumber" + } + }, + { + "variable": "G8ReceiptDate", + "value": { + "path": "$.paymentDetails[0].manualReceiptDate" + }, + "type": "date" + }, + { + "variable": "paymentDate", + "value": { + "path": "$.transactionDate" + }, + "type": "date" + }, + { + "variable": "consumerID", + "value": { + "path": "$.paymentDetails[0].bill.consumerCode" + } + }, + { + "variable": "transactionID", + "value": { + "path": "$.transactionNumber" + } + }, + { + "variable": "dueAmount", + "value": { + "path": "$.paymentDetails[0].totalDue" + } + }, + { + "variable": "payment_receipt", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_RECEIPT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "receipt_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_RECEIPT_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "consumer_id", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_CONSUMER_ID" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payment_date", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_DATE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payer_name", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYER_NAME" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payer_contact", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYER_CONTACT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "service_type", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_SERVICE_TYPE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "billing_period", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_BILLING_PERIOD" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "paid_amount", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAID_AMOUNT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "pending_amount", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PENDING_AMOUNT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payment_mode", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_MODE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "transaction_id", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_TRANSACTION_ID" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "g8_receipt_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_G8_RECEIPT_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "g8_receipt_date", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_G8_RECEIPT_DATE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "generated_by", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_GENERATED_BY" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "commissioner/eo", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_COMMISSIONER_EO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "no_signature", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_NO_SIGNATURE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "disclamer", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "disclamer_1", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_FIRST_LINE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "disclamer_2", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_SECOND_LINE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "disclamer_3", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_THIRD_LINE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "disclamer_4", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_FOURTH_LINE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "disclamer_5", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_FIFTH_LINE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "to", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_TO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "Municipal_Corporation", + "value": { + "path": "PDF_STATIC_LABEL_MDMS_MUNICIPAL_CORPORATION" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + } + ] + }, + { + "derived": [ + { + "variable": "pendingAmount", + "formula": "{{dueAmount}}-{{paidAmount}}" + } + ] + }, + { + "externalAPI": [ + { + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", + "apiRequest": null, + "responseMapping":[ + { + "variable":"address", + "value":"$.MdmsRes.tenant.tenants[0].address" + }, + { + "variable":"phoneNumber", + "value":"$.MdmsRes.tenant.tenants[0].contactNumber" + }, + { + "variable":"website", + "value":"$.MdmsRes.tenant.tenants[0].domainUrl" + }, + { + "variable":"email", + "value":"$.MdmsRes.tenant.tenants[0].emailId" + }, + { + "variable": "logoImage", + "value":"$.MdmsRes.tenant.tenants[0].logoId", + "type":"image" + }, + { + "variable": "logo-header", + "value":"$.MdmsRes.tenant.tenants[0].code", + "localisation":{ + "required":true, + "prefix": "TENANT_TENANTS", + "module":"rainmaker-common" + } + } + ] + } + ] + } + ] + } + ] + } +} diff --git a/configs/pdf-service/data-config/testlocalconsolidatedbill.json b/configs/pdf-service/data-config/testlocalconsolidatedbill.json new file mode 100644 index 00000000..a9d8bf77 --- /dev/null +++ b/configs/pdf-service/data-config/testlocalconsolidatedbill.json @@ -0,0 +1,535 @@ +{ + "key": "testlocalconsolidatedbill", + "DataConfigs": { + "serviceName": "rainmaker-common", + "version": "1.0.0", + "baseKeyPath": "$.Bill.*", + "entityIdPath":"$.billNumber", + "isCommonTableBorderRequired": true, + "mappings": [ + { + "topic": "common-pdf-generation-1", + "staticConfigPath": "https://raw.githubusercontent.com/egovernments/egov-services/vishal-feature-filestore/core/egov-indexer/src/main/resources/rainmaker-pgr-indexer.yml", + "mappings": [ + { + "direct": [ + { + "variable": "logoImage", + "url": "https://raw.githubusercontent.com/egovernments/egov-web-app/master/web/rainmaker/dev-packages/egov-ui-kit-dev/src/assets/images/pblogo.png", + "type": "image" + }, + { + "variable": "logo_header", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_LOGO_HEADER" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "total_amount_due", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_TOTAL_AMOUNT_DUE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payer_name", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PAYER_NAME" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "bill_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_BILL_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "mobile_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_MOBILE_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "bill_period", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_BILL_PERIOD" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payer_address", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PAYER_ADDRESS" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + + { + "variable": "bill_issue_date", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ISSUE_DATE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "bill_due_date", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_BILL_DUE_DATE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "billing_summary_property_tax", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_BILLING_SUMMARY" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "property_id", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PROPERTY_ID" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "arrears_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ARREARS" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "charge_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_CHARGE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + + { + "variable": "penalty_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PENALTY" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "rebate_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_REBATE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "others_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_OTHERS" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "total_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_TOTAL" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "important_message", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_IMPORTANT_MESSAGE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payment_received", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PAYMENT_RECEIVED" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "this_document", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_THIS_DOCUMENT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "this_is_a", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_THIS_IS" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "assessment_payment", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ASSESSSMENT_PAYMENT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "please_deposit", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PLEASE_DEPOSIT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "if_the_tax", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_IF_THE_TAX" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "acknowledgement_for", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ACKNOWLEDGEMENT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "date_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_DATE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "consumer_id", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_CONSUMER_ID" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "name_address", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_NAME_ADDRESS" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "total_payment", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_TOTAL_PAYMENT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "receivers_signature", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_RECEIVERS_SIGNATURE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "totalAmountDue", + "value": { + "path": "$.totalAmount" + } + }, + { + "variable": "total", + "value": { + "path": "$.totalAmount" + } + }, + + { + "variable": "payerName", + "value": { + "path": "$.payerName" + } + }, + + { + "variable": "mobileNo", + "value": { + "path": "$.mobileNumber" + } + }, + + { + "variable": "payerAddress", + "value": { + "path": "$.payerAddress" + } + }, + { + "variable": "nameAddress", + "value": { + "path": "$.payerAddress" + } + }, + + { + "variable": "billNo", + "value": { + "path": "$.billNumber" + } + }, + { + "variable": "fromPeriod", + "value": { + "path": "$.billDetails[0].fromPeriod" + } + }, + { + "variable": "toPeriod", + "value": { + "path": "$.billDetails[0].toPeriod" + } + }, + + { + "variable": "billIssueDate", + "value": { + "path": "$.billDate" + } + }, + + { + "variable": "billDueDate", + "value": { + "path": "$.billDetails[0].expiryDate" + } + }, + + { + "variable": "propertyID", + "value": { + "path": "$.consumerCode" + } + }, + + { + "variable": "arrears", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_TIME_PENALTY')].amount" + } + }, + + { + "variable": "charge", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_TIME_REBATE')].amount" + } + }, + + { + "variable": "rebate", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_TIME_REBATE')].amount" + } + }, + + { + "variable": "penalty", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_TIME_REBATE')].amount" + } + }, + + { + "variable": "others", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode=='PT_TAX')].amount" + } + }, + + { + "variable": "consumerID", + "value": { + "path": "$.consumerCode" + } + }, + { + "variable": "date", + "value": { + "path": "$.billDate" + } + }, + { + "variable": "totalPayment", + "value": { + "path": "$.billDetails[0].amountPaid" + } + }, + { + "variable":"scissorImage", + "url":"https://raw.githubusercontent.com/egovernments/egov-web-app/master/web/rainmaker/dev-packages/egov-ui-kit-dev/src/assets/images/pblogo.png", + "type":"image" + } + ] + }, + { + "derived": [ + { + "variable": "variable19", + "formula": "{{totalPayment}}-{{totalPayment}}" + } + ] + } + ] + } + ] + } + } \ No newline at end of file diff --git a/configs/pdf-service/data-config/testlocalconsolidatedreceipt.json b/configs/pdf-service/data-config/testlocalconsolidatedreceipt.json new file mode 100644 index 00000000..1c5af18a --- /dev/null +++ b/configs/pdf-service/data-config/testlocalconsolidatedreceipt.json @@ -0,0 +1,457 @@ +{ + "key": "consolidatedreceipt", + "DataConfigs": { + "serviceName": "rainmaker-common", + "version": "1.0.0", + "baseKeyPath": "$.Payments.*", + "entityIdPath":"$.paymentDetails[0].receiptNumber", + "isCommonTableBorderRequired": true, + "mappings": [ + { + "topic": "common-pdf-generation-3", + "mappings": [ + { + "direct": [ + { + "variable": "payerName", + "value": { + "path": "$.payerName" + } + }, + { + "variable": "user-name", + "value": { + "path": "$.userInfo.name" + }, + "type":"selectFromRequestInfo" + }, + { + "variable": "payerContact", + "value": { + "path": "$.mobileNumber" + } + }, + { + "variable": "receiptNo", + "value": { + "path": "$.paymentDetails[0].receiptNumber" + } + }, + { + "variable": "serviceType", + "value": { + "path": "$.paymentDetails[0].businessService" + }, + "localisation":{ + "required":true, + "prefix":"MODULE", + "module":"rainmaker-common" + } + }, + { + "variable": "paidAmount", + "value": { + "path": "$.paymentDetails[0].totalAmountPaid" + } + }, + { + "variable": "fromPeriod", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].fromPeriod" + } + }, + { + "variable": "toPeriod", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].toPeriod" + } + }, + { + "variable": "paymentMode", + "value": { + "path": "$.paymentMode" + } + }, + { + "variable": "G8ReceiptNo", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].manualReceiptNumber" + } + }, + { + "variable": "G8ReceiptDate", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].manualReceiptDate" + } + }, + { + "variable": "paymentDate", + "value": { + "path": "$.transactionDate" + } + }, + { + "variable": "consumerID", + "value": { + "path": "$.paymentDetails[0].bill.consumerCode" + } + }, + { + "variable": "transactionID", + "value": { + "path": "$.transactionNumber" + } + }, + { + "variable": "dueAmount", + "value": { + "path": "$.paymentDetails[0].totalDue" + } + }, + { + "variable": "logoImage", + "url":"https://raw.githubusercontent.com/egovernments/egov-web-app/master/web/rainmaker/dev-packages/egov-ui-kit-dev/src/assets/images/pblogo.png", + "type":"image" + }, + { + "variable": "logo-header", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT.LOGO.HEADER" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": "", + "module":"rainmaker-common" + } + }, + { + "variable": "payment_receipt", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_RECEIPT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "receipt_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_RECEIPT_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "consumer_id", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_CONSUMER_ID" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payment_date", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_DATE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payer_name", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYER_NAME" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payer_contact", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYER_CONTACT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "service_type", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_SERVICE_TYPE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "billing_period", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_BILLING_PERIOD" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "paid_amount", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAID_AMOUNT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "pending_amount", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PENDING_AMOUNT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payment_mode", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_MODE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "transaction_id", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_TRANSACTION_ID" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "g8_receipt_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_G8_RECEIPT_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "g8_receipt_date", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_G8_RECEIPT_DATE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "generated_by", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_GENERATED_BY" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "commissioner/eo", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_COMMISSIONER_EO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "no_signature", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_NO_SIGNATURE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "disclamer", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "disclamer_1", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_FIRST_LINE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "disclamer_2", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_SECOND_LINE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "disclamer_3", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_THIRD_LINE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "disclamer_4", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_FOURTH_LINE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "disclamer_5", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_FIFTH_LINE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "to", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_TO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + } + ] + }, + { + "derived": [ + { + "variable": "pendingAmount", + "formula": "{{dueAmount}}-{{paidAmount}}" + } + ] + }, + { + "externalAPI": [ + { + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='$.tenantId')%5D", + "apiRequest": null, + "responseMapping":[ + { + "variable":"address", + "value":"$.MdmsRes.tenant.tenants[0].address" + }, + { + "variable":"phoneNumber", + "value":"$.MdmsRes.tenant.tenants[0].contactNumber" + }, + { + "variable":"website", + "value":"$.MdmsRes.tenant.tenants[0].domainUrl" + }, + { + "variable":"email", + "value":"$.MdmsRes.tenant.tenants[0].emailId" + } + ] + } + ] + } + ] + } + ] + } +} \ No newline at end of file diff --git a/configs/pdf-service/data-config/tl-receipt.json b/configs/pdf-service/data-config/tl-receipt.json new file mode 100644 index 00000000..a97933bd --- /dev/null +++ b/configs/pdf-service/data-config/tl-receipt.json @@ -0,0 +1,236 @@ +{ + "key":"tl-receipt", + "DataConfigs": { + "serviceName": "rainmaker-tl", + "version": "1.0.0", + "baseKeyPath": "$.Licenses.*", + "entityIdPath":"$.applicationNumber", + "isCommonTableBorderRequired":true, + "mappings": [ + { + "topic": "tl-pdf-generation", + "staticConfigPath": "https://raw.githubusercontent.com/egovernments/egov-services/vishal-feature-filestore/core/egov-indexer/src/main/resources/rainmaker-pgr-indexer.yml", + "mappings": [ + { + "direct": [ + + { + "variable": "variable1", + "value": { + "path":"$.tradeLicenseDetail.additionalDetail.applicationType" + }, + "localisation":{ + "required":true, + "prefix":"TRADELICENSE_APPLICATIONTYPE", + "module":"rainmaker-tl" + } + }, + { + "variable": "variable33", + "url":"https://s3.ap-south-1.amazonaws.com/pb-egov-assets/pb.amritsar/logo.png", + "type":"image" + }, + { + "variable": "variable30", + "value": { + "path":"$.tenantId" + }, + "localisation":{ + "required":true, + "prefix":"TENANT_TENANTS", + "module":"rainmaker-common" + }, + "isUpperCaseRequired":true + }, + { + "variable": "variable31", + "type":"citizen-employee-title" + }, + { + "variable": "variable2", + "value": { + "path":"$.oldLicenseNumber" + } + }, + { + "variable": "variable3", + "value":{ + "path":"$.applicationNumber" + } + }, + { + "variable": "variable4", + "value": { + "path":"$.financialYear" + } + }, + { + "variable": "variable5", + "value": { + "path":"$.tradeName" + } + }, + { + "variable": "variable6", + "value": { + "path":"$.tradeLicenseDetail.tradeUnits[*].tradeType" + }, + "localisation":{ + "required":true, + "prefix":"TRADELICENSE_TRADETYPE", + "module":"rainmaker-tl", + "isCategoryRequired":true + } + }, + { + "variable": "variable7", + "value": { + "path":"$.tradeLicenseDetail.tradeUnits[*].tradeType" + }, + "localisation":{ + "required":true, + "prefix":"TRADELICENSE_TRADETYPE", + "module":"rainmaker-tl", + "isMainTypeRequired":true, + "isSubTypeRequired":true + } + }, + { + "variable": "variable8", + "value": { + "path":"$.tradeLicenseDetail.accessories[*].accessoryCategory" + }, + "localisation":{ + "required":true, + "prefix":"TRADELICENSE_ACCESSORIESCATEGORY", + "module":"rainmaker-tl" + } + }, + { + "variable": "variable9", + "value": { + "path":"$.tradeLicenseDetail.address.doorNo" + } + }, + { + "variable": "variable10", + "value": { + "path":"$.tradeLicenseDetail.address.buildingName" + } + }, + { + "variable": "variable11", + "value": { + "path":"$.tradeLicenseDetail.address.street" + } + }, + { + "variable": "variable12", + "value": { + "path":"$.tradeLicenseDetail.address.locality.name" + } + }, + { + "variable": "variable13", + "value":{ + "path":"$.tradeLicenseDetail.owners.*" + }, + "type":"array", + "format":{ + "type":"string", + "scema":[ + { + "key":"name" + }, + { + "key":"mobileNumber" + }] + } + } + ] + }, + { + "derived": [ + { + "variable": "variable32", + "formula": "{{variable19}}-{{variable20}}" + } + ] + }, + { + "externalAPI": [ + + { + + "path": "http://collection-services:8080/collection-services/receipts/_search", + "queryParam": "consumerCode=$.applicationNumber", + + + "apiRequest": null, + + "responseMapping":[ + { + "variable":"variable16", + "value":"$.Receipt[0].receiptNumber" + }, + { + "variable":"variable17", + "value":"$.Receipt[0].instrument.transactionDateInput" + }, + { + "variable":"variable18", + "value":"$.Receipt[0].Bill[0].billDetails[0].billAccountDetails[?(@.taxHeadCode=='TL_TAX')].amount" + }, + { + "variable":"variable19", + "value":"$.Receipt[0].Bill[0].billDetails[0].totalAmount" + }, + { + "variable":"variable20", + "value":"$.Receipt[0].Bill[0].billDetails[0].amountPaid" + }, + { + "variable":"variable21", + "value":"$.Receipt[0].instrument.instrumentType.name" + }, + { + "variable":"variable22", + "value":"$.Receipt[0].transactionId" + }, + { + "variable":"variable23", + "value":"$.Receipt[0].instrument.bank.name" + }, + { + "variable":"variable24", + "value":"$.Receipt[0].Bill[0].billDetails[0].manualReceiptNumber" + }, + { + "variable":"variable25", + "value":"$.Receipt[0].Bill[0].billDetails[0].manualReceiptDate" + }, + { + "variable":"variable26", + "value":"$.Receipt[0].Bill[0].billDetails[0].billAccountDetails[?(@.taxHeadCode=='TL_TIME_PENALTY')].amount" + }, + { + "variable":"variable27", + "value":"$.Receipt[0].Bill[0].billDetails[0].billAccountDetails[?(@.taxHeadCode=='TL_TIME_REBATE')].amount" + }, + { + "variable":"variable28", + "value":"$.Receipt[0].Bill[0].billDetails[0].billAccountDetails[?(@.taxHeadCode=='TL_ADHOC_PENALTY')].amount" + }, + { + "variable":"variable29", + "value":"$.Receipt[0].Bill[0].billDetails[0].billAccountDetails[?(@.taxHeadCode=='TL_ADHOC_REBATE')].amount" + } + ] + } + ] + } + ] + } + ] + } + } diff --git a/configs/pdf-service/data-config/tlapplication.json b/configs/pdf-service/data-config/tlapplication.json new file mode 100644 index 00000000..7673bf3f --- /dev/null +++ b/configs/pdf-service/data-config/tlapplication.json @@ -0,0 +1,1073 @@ +{ + "key": "tlapplication", + "DataConfigs": { + "serviceName": "rainmaker-common", + "version": "1.0.0", + "baseKeyPath": "$.Licenses.*", + "entityIdPath":"$.applicationNumber", + "isCommonTableBorderRequired": true, + "mappings": [ + { + "mappings": [ + { + "direct": [ + { + "variable": "applicationNumber", + "value": { + "path": "$.applicationNumber" + } + }, + { + "variable": "applicationType", + "value": { + "path": "$.applicationType" + }, + "localisation":{ + "required":true, + "prefix": "TRADELICENSE_APPLICATIONTYPE", + "module": "rainmaker-tl" + } + }, + { + "variable": "oldLicenseNumber", + "value": { + "path": "$.oldLicenseNumber" + } + }, + { + "variable": "licenseType", + "value": { + "path": "$.licenseType" + }, + "localisation":{ + "required":true, + "prefix": "TRADELICENSE_LICENSETYPE", + "module": "rainmaker-tl" + } + }, + { + "variable": "tradeName", + "value": { + "path": "$.tradeName" + } + }, + { + "variable": "structureType", + "value": { + "path": "$.tradeLicenseDetail.structureType" + }, + "localisation":{ + "required":true, + "prefix": "COMMON_MASTERS_STRUCTURETYPE", + "module": "rainmaker-tl", + "isCategoryRequired":true + } + }, + { + "variable": "structureSubType", + "value": { + "path": "$.tradeLicenseDetail.structureType" + }, + "localisation":{ + "required":true, + "prefix": "COMMON_MASTERS_STRUCTURETYPE", + "module": "rainmaker-tl", + "isSubTypeRequired":true + } + }, + { + "variable": "commencementDate", + "value": { + "path": "$.commencementDate" + }, + "type": "date" + }, + { + "variable": "tradeGstNo", + "value": { + "path": "$.tradeLicenseDetail.additionalDetail.gstNo" + } + }, + { + "variable": "operationalArea", + "value": { + "path": "$.tradeLicenseDetail.operationalArea" + } + }, + { + "variable": "noOfEmployees", + "value": { + "path": "$.tradeLicenseDetail.noOfEmployees" + } + }, + { + "variable": "tradeCategory", + "value": { + "path": "$.tradeLicenseDetail.tradeUnits[0].tradeType" + }, + "localisation":{ + "required":true, + "prefix": "TRADELICENSE_TRADETYPE", + "module": "rainmaker-tl", + "isCategoryRequired":true + } + }, + { + "variable": "tradeType1", + "value": { + "path": "$.tradeLicenseDetail.tradeUnits[0].tradeType" + }, + "localisation":{ + "required":true, + "prefix": "TRADELICENSE_TRADETYPE", + "module": "rainmaker-tl", + "isMainTypeRequired":true + } + }, + { + "variable": "tradeSubType", + "value": { + "path": "$.tradeLicenseDetail.tradeUnits[0].tradeType" + }, + "localisation":{ + "required":true, + "prefix": "TRADELICENSE_TRADETYPE", + "module": "rainmaker-tl", + "isSubTypeRequired":true + } + }, + { + "variable": "uomMeasurement", + "value": { + "path": "$.tradeLicenseDetail.tradeUnits[0].uom" + } + }, + { + "variable": "uomValue1", + "value": { + "path": "$.tradeLicenseDetail.tradeUnits[0].uomValue" + } + }, + { + "variable": "propertyAssessmentId", + "value": { + "path": "$.propertyId" + } + }, + { + "variable": "city", + "value": { + "path": "$..tradeLicenseDetail.address.city" + }, + "localisation":{ + "required":true, + "prefix": "TENANT_TENANTS", + "module": "rainmaker-common" + } + + }, + { + "variable": "doorHouseNo", + "value": { + "path": "$.tradeLicenseDetail.address.doorNo" + } + }, + { + "variable": "buildingColonyName", + "value": { + "path": "$.tradeLicenseDetail.address.buildingName" + } + }, + { + "variable": "streetName", + "value": { + "path": "$.tradeLicenseDetail.address.street" + } + }, + { + "variable": "pincode", + "value": { + "path": "$.tradeLicenseDetail.address.pincode" + } + }, + { + "variable": "ownershipProof", + "value": { + "path": "$.additionalDetails.documents[?(@.title == 'TL_OWNERSHIPPROOF')].name" + } + }, + { + "variable": "ownersIdProof", + "value": { + "path": "$.additionalDetails.documents[?(@.title == 'TL_OWNERIDPROOF')].name" + } + }, + { + "variable": "ownerPhoto", + "value": { + "path": "$.additionalDetails.documents[?(@.title == 'TL_OWNERPHOTO')].name" + } + }, + { + "variable": "electricityConnectionNo", + "value": { + "path": "$.tradeLicenseDetail.additionalDetail.electricityConnectionNo" + } + }, + { + "variable": "typeOfOwnership", + "value": { + "path": "$.tradeLicenseDetail.subOwnerShipCategory" + }, + "localisation":{ + "required":true, + "prefix": "COMMON_MASTERS_OWNERSHIPCATEGORY", + "module": "rainmaker-tl", + "isCategoryRequired":true + } + + }, + { + "variable": "typeOfSubOwnership", + "value": { + "path": "$.tradeLicenseDetail.subOwnerShipCategory" + }, + "localisation":{ + "required":true, + "prefix": "COMMON_MASTERS_OWNERSHIPCATEGORY", + "module": "rainmaker-tl", + "isSubTypeRequired":true + } + }, + { + "variable": "mobileNo", + "value": { + "path": "$..tradeLicenseDetail.owners[0].mobileNumber" + } + }, + { + "variable": "altContactNumber", + "value": { + "path": "$.tradeLicenseDetail.owners[0].altContactNumber" + } + }, + { + "variable": "name", + "value": { + "path": "$.tradeLicenseDetail.owners[0].name" + } + }, + { + "variable": "fatherHusbandName", + "value": { + "path": "$.tradeLicenseDetail.owners[0].fatherOrHusbandName" + } + }, + { + "variable": "relationship", + "value": { + "path": "$.tradeLicenseDetail.owners[0].relationship" + }, + "localisation":{ + "required":true, + "prefix": "COMMON_RELATION", + "module": "rainmaker-tl" + } + }, + { + "variable": "gender", + "value": { + "path": "$.tradeLicenseDetail.owners[0].gender" + }, + "localisation":{ + "required":true, + "prefix": "COMMON_GENDER", + "module": "rainmaker-common" + } + }, + { + "variable": "dateOfBirth", + "value": { + "path": "$.tradeLicenseDetail.owners[0].dob" + }, + "type": "date" + }, + { + "variable": "email", + "value": { + "path": "$.tradeLicenseDetail.owners[0].emailId" + } + }, + { + "variable": "panNo", + "value": { + "path": "$.tradeLicenseDetail.owners[0].pan" + } + }, + { + "variable": "correspondenceAddress", + "value": { + "path": "$.tradeLicenseDetail.owners[0].permanentAddress" + } + }, + { + "variable": "specialOwnerCategory", + "value": { + "path": "$.tradeLicenseDetail.owners[0].ownerType" + }, + "localisation":{ + "required":true, + "prefix": "COMMON_MASTERS_OWNERTYPE", + "module":"rainmaker-common" + } + + }, + { + "variable": "trade_license_application", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_LOGO_HEADER" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "application_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_APPLICATION_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "total_amount", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_TOTAL_AMOUNT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "Rs", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_RUPEE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "trade_license_tax", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_TRADE_LICENSE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "rebate_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_REBATE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "penalty_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_PENALTY" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "trade_details", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_TRADE_DETAILS" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "application_type", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_APPLICATION_TYPE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "old_application_number", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_OLD_APPLICATION_NUMBER" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "licence_type", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_LICENSE_TYPE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "trade_name", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_TRADE_NAME" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "structure_type", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_STRUCTURE_TYPE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "structure_sub_type", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_STRUCTURE_SUB_TYPE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "trade_commencement", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_TRADE_COMMENCEMENT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "trade_gst_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_TRADE_GST" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "operational_area", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_OPERATIONAL_AREA" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "no_of_employees", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_NO_OF_EMPLOYEES" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "trade_category", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_TRADE_CATEGORY" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "trade_type", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_TRADE_TYPE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "trade_sub_type", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_TRADE_SUB_TYPE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "uom_measurement", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_UOM_MEASUREMENT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "accesory_type", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_ACCESORY_TYPE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "uom_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_UOM" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "uom_value", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_UOM_VALUE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "accessory_count", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_ACCESORY_COUNT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "property_assessment_id", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_PROPERTY_ASSESSMENT_ID" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "city_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_CITY" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "door_house_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_DOOR_HOUSE_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "building_colony_name", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_BUILDING_COLONY_NAME" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "street_name", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_STREET_NAME" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "mohalla_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_MOHALLA" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "pincode_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_PINCODE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "electricity_connection_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_ELECTRICITY_CONNECTION_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "owner_details", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_OWNER_DETAILS" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "type_of_ownership", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_TYPE_OF_OWNERSHIP" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "type_of_sub_ownership", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_SUB_OWNERSHIP" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "mobile_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_MOBILE_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "name_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_NAME" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "father_husband", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_FATHER_HUSBAND" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "relationship_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_RELATIONSHIP" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "gender_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_GENDER" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "date_of_birth", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_DATE_OF_BIRTH" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "email_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_EMAIL" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "pan_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_PAN_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "correspondance_address", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_CORRESPONDANCE_ADDRESS" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "special_owner", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_SPECIAL_OWNER" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "documents_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_DOCUMENTS" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "ownership_proof", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_OWNERSHIP_PROOF" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "owners_id_proof", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_OWNERS_ID" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "owner_photo", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_OWNERSHIP_PHOTO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "variable13", + "value":{ + "path":"$.tradeLicenseDetail.tradeUnits.*" + }, + "type":"array", + "format":{ + "type":"string", + "scema":[ + { + "variable": "tradeCat", + "value":"tradeType", + "localisation":{ + "required":true, + "prefix": "TRADELICENSE_TRADETYPE", + "module": "rainmaker-tl", + "isCategoryRequired":true + } + }, + { + "variable": "tradetyp", + "value":"tradeType", + "localisation":{ + "required":true, + "prefix": "TRADELICENSE_TRADETYPE", + "module": "rainmaker-tl", + "isMainTypeRequired":true + } + }, + { + "variable": "tradesub", + "value":"tradeType", + "localisation":{ + "required":true, + "prefix": "TRADELICENSE_TRADETYPE", + "module": "rainmaker-tl", + "isSubTypeRequired":true + } + }, + { + "variable": "UOM-measurement", + "value":"uom" + }, + { + "variable":"uomValue", + "value":"uomValue" + } + ] + } + }, + { + "variable": "variable14", + "value":{ + "path":"$.tradeLicenseDetail.accessories.*" + }, + "type":"array", + "format":{ + "type":"string", + "scema":[ + { + "variable": "accesoryType", + "value": "accessoryCategory", + "localisation":{ + "required":true, + "prefix": "TRADELICENSE_ACCESSORIESCATEGORY", + "module": "rainmaker-tl" + } + }, + { + "variable": "accessoryUomValue", + "value": "uomValue" + }, + + { + "variable": "uom", + "value": "uom" + }, + { + "variable": "accessoryCount", + "value": "count" + } + + ] + } + } + + + + ] + }, + { + "externalAPI": [ + { + "path": "http://egov-location:8080/egov-location/location/v11/boundarys/_search", + "queryParam": "tenantId=$.tenantId,hierarchyTypeCode=REVENUE,boundaryType=Locality,codes=$.tradeLicenseDetail.address.locality.code", + "apiRequest": null, + "responseMapping":[ + { + "variable":"mohalla", + "value":"$.TenantBoundary[0].boundary[0].name" + } + ] + }, + { + "path": "http://billing-service:8080/billing-service/bill/v2/_search", + "queryParam": "tenantId=$.tenantId,consumerCode=$.applicationNumber,businessService=TL", + "apiRequest": null, + "responseMapping":[ + { + "variable":"totalAmount", + "value":"$.Bill[0].totalAmount" + }, + { + "variable":"tradeLicenseTax", + "value":"$.Bill[0].billDetails[0].billAccountDetails[?(@.taxHeadCode == 'TL_TAX')].amount" + }, + { + "variable":"billStatus", + "value":"$.Bill[0].status" + }, + { + "variable":"rebate", + "value":"$.Bill[0].billDetails[0].billAccountDetails[?(@.taxHeadCode == 'TL_ADHOC_REBATE')].amount" + }, + { + "variable":"penalty", + "value":"$.Bill[0].billDetails[0].billAccountDetails[?(@.taxHeadCode == 'TL_ADHOC_PENALTY')].amount" + } + ] + } + ] + } + ] + } + ] + } +} diff --git a/configs/pdf-service/data-config/tlcertificate.json b/configs/pdf-service/data-config/tlcertificate.json new file mode 100644 index 00000000..2756e470 --- /dev/null +++ b/configs/pdf-service/data-config/tlcertificate.json @@ -0,0 +1,731 @@ +{ + "key": "tlcertificate", + "DataConfigs": { + "serviceName": "rainmaker-common", + "version": "1.0.0", + "baseKeyPath": "$.Licenses.*", + "entityIdPath":"$.id", + "isCommonTableBorderRequired": true, + "mappings": [ + { + "mappings": [ + { + "direct": [ + { + "variable": "logoImage", + "url":"https://raw.githubusercontent.com/egovernments/egov-web-app/master/web/rainmaker/dev-packages/egov-ui-kit-dev/src/assets/images/pblogo.png", + "type":"image" + }, + { + "variable": "tradeLicenseNo", + "value": { + "path": "$.licenseNumber" + } + }, + { + "variable": "applicationNo", + "value": { + "path": "$.applicationNumber" + } + }, + { + "variable": "financialYear", + "value": { + "path": "$.financialYear" + } + }, + { + "variable": "tradeName", + "value": { + "path": "$.tradeName" + } + }, + { + "variable": "tradeOwnerName", + "value": { + "path": "$.tradeLicenseDetail.owners[0].name" + } + }, + { + "variable": "tradeOwnerContact", + "value": { + "path": "$.tradeLicenseDetail.owners[0].mobileNumber" + } + }, + { + "variable": "tradeAddress", + "value": { + "path": "$.tradeLicenseDetail.address.locality.code" + } + }, + { + "variable": "doorNo", + "value": { + "path": "$.tradeLicenseDetail.address.doorNo" + } + }, + { + "variable": "structureType", + "value": { + "path": "$.tradeLicenseDetail.structureType" + }, + "localisation":{ + "required":true, + "prefix": "COMMON_MASTERS_STRUCTURETYPE", + "module": "rainmaker-tl", + "isCategoryRequired":true + } + }, + { + "variable": "structureSubType", + "value": { + "path": "$.tradeLicenseDetail.structureType" + }, + "localisation":{ + "required":true, + "prefix": "COMMON_MASTERS_STRUCTURETYPE", + "module": "rainmaker-tl", + "isSubTypeRequired":true + } + }, + { + "variable": "streetName", + "value": { + "path": "$.tradeLicenseDetail.address.street" + } + }, + { + "variable": "buildingName", + "value": { + "path": "$.tradeLicenseDetail.address.buildingName" + } + }, + { + "variable": "city", + "value": { + "path": "$.tradeLicenseDetail.address.city" + }, + "localisation":{ + "required":true, + "prefix": "TENANT_TENANTS", + "module": "rainmaker-common" + } + }, + { + "variable": "tradeType", + "value": { + "path": "$.tradeLicenseDetail.tradeUnits[0].tradeType" + }, + "localisation":{ + "required":true, + "prefix": "TRADELICENSE_TRADETYPE", + "module": "rainmaker-tl" + } + }, + + { + "variable": "variable13", + "value":{ + "path":"$.tradeLicenseDetail.tradeUnits.*" + }, + "type":"array", + "format":{ + "type":"string", + "scema":[ + { + "variable": "tradeCat", + "value":"tradeType", + "localisation":{ + "required":true, + "prefix": "TRADELICENSE_TRADETYPE", + "module": "rainmaker-tl", + "isCategoryRequired":true + } + }, + { + "variable": "tradetyp", + "value":"tradeType", + "localisation":{ + "required":true, + "prefix": "TRADELICENSE_TRADETYPE", + "module": "rainmaker-tl", + "isMainTypeRequired":true + } + }, + { + "variable": "tradesub", + "value":"tradeType", + "localisation":{ + "required":true, + "prefix": "TRADELICENSE_TRADETYPE", + "module": "rainmaker-tl", + "isSubTypeRequired":true + } + }, + { + "variable": "UOM-measurement", + "value":"uom" + }, + { + "variable":"uomValue", + "value":"uomValue" + } + ] + } + }, + { + "variable": "variable14", + "value":{ + "path":"$.tradeLicenseDetail.accessories.*" + }, + "type":"array", + "format":{ + "type":"string", + "scema":[ + { + "variable": "accesoryType", + "value": "accessoryCategory", + "localisation":{ + "required":true, + "prefix": "TRADELICENSE_ACCESSORIESCATEGORY", + "module": "rainmaker-tl" + } + }, + { + "variable": "accessoryUomValue", + "value": "uomValue" + }, + + { + "variable": "uom", + "value": "uom" + }, + { + "variable": "accessoryCount", + "value": "count" + } + + ] + } + + }, + { + "variable": "variable_owners", + "value": {"path":"$.tradeLicenseDetail.owners[?(@.active== true && @.userActive== true)]"}, + "type":"array", + "format":{ + "type":"string", + "scema":[ + { + "variable": "name", + "value": "name", + "type":"string" + }, + { + "variable": "fatherOrHusbandName", + "value": "fatherOrHusbandName", + "type":"string" + }, + + { + "variable": "permanentAddress", + "value": "permanentAddress", + "type":"string" + }, + { + "variable": "mobileNumber", + "value": "mobileNumber", + "type":"string" + } + + ] + } + }, + + + { + "variable": "accessories", + "value": { + "path": "$.tradeLicenseDetail.accessories[0].accessoryCategory" + }, + "localisation":{ + "required":true, + "prefix": "TRADELICENSE_ACCESSORIESCATEGORY", + "module": "rainmaker-tl" + } + + }, + { + "variable": "licenseIssueDate", + "value": { + "path": "$.issuedDate" + }, + "type": "date" + }, + { + "variable": "licenseValidityFrom", + "value": { + "path": "$.validFrom" + }, + "type": "date" + }, + { + "variable": "licenseValidityTo", + "value": { + "path": "$.validTo" + }, + "type": "date" + }, + { + "variable": "to", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_TO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "municipal_corportaion", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_MUNICIPAL_CORPORATION" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "corporation_contact", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_LICENSE_CORPORATION_CONTACT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "corporation_website", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_LICENSE_CORPORATION_WEBSITE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "trade_category", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_TRADE_CATEGORY" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "trade_type", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_TRADE_TYPE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "trade_sub_type", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_TRADE_SUB_TYPE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "uom_measurement", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_UOM_MEASUREMENT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "accesory_type", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_ACCESORY_TYPE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "uom_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_UOM" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "uom_value", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_UOM_VALUE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "accessory_count", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_ACCESORY_COUNT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "corporation_email", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_LICENSE_CORPORATION_EMAIL" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "trade_license_certificate", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_LICENSE_CERTIFICATE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "trade_license_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_LICENSE_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "application_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_APPLICATION_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "reciept_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_RECIEPT_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "financial_year", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_FINANCIAL_YEAR" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "trade_name", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_TRADE_NAME" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "trade_owner_name", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_TRADE_OWNER_NAME" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "trade_owner_contact", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_TRADE_OWNER_CONTACT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "trade_address", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_TRADE_ADDRESS" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "trade_type", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_TRADE_TYPE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "accessories_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_ACCESSORIES_LABEL" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "trade_license_fee", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_TRADE_LICENSE_FEE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "license_issue_date", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_LICENSE_ISSUE_DATE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "license_validity", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_LICENSE_VALIDITY" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "approved_by", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_APPROVED_BY" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "commissioner", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_COMMISSIONER" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "disclaimer", + "value": { + "path": "TL_CERTIFICATE_DISCLAIMER" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + } + ] + }, + { + "externalAPI": [ + { + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", + "apiRequest": null, + "responseMapping":[ + { + "variable":"ulb-address", + "value":"$.MdmsRes.tenant.tenants[0].address" + }, + { + "variable":"mcGrade", + "value":"$.MdmsRes.tenant.tenants[0].city.ulbType" + }, + { + "variable":"corporationContact", + "value":"$.MdmsRes.tenant.tenants[0].contactNumber" + }, + { + "variable":"corporationWebsite", + "value":"$.MdmsRes.tenant.tenants[0].domainUrl" + }, + { + "variable":"corporationEmail", + "value":"$.MdmsRes.tenant.tenants[0].emailId" + } + ] + }, + { + "path": "http://collection-services:8080/collection-services/payments/TL/_search", + "queryParam": "tenantId=$.tenantId,consumerCodes=$.applicationNumber,businessServices=TL", + "apiRequest": null, + "responseMapping":[ + { + "variable":"tradeLicenseFee", + "value":"$.Payments[0].totalAmountPaid" + }, + { + "variable":"recieptNo", + "value":"$.Payments[0].paymentDetails[0].receiptNumber" + } + + ] + }, + { + "path": "http://egov-location:8080/egov-location/location/v11/boundarys/_search", + "queryParam": "tenantId=$.tenantId,hierarchyTypeCode=REVENUE,boundaryType=Locality,codes=$.tradeLicenseDetail.address.locality.code", + "apiRequest": null, + "responseMapping":[ + { + "variable":"localityNName", + "value":"$.TenantBoundary[0].boundary[0].name" + } + ] + }, + + { + "path": "http://egov-filestore:8080/filestore/v1/files/url", + "queryParam": "tenantId=pb,fileStoreIds=$.tradeLicenseDetail.applicationDocuments[?(@.documentType== 'OWNERPHOTO')].fileStoreId", + "apiRequest": null, + "requesttype": "GET", + "responseMapping":[ + { + "variable":"userpic", + "value":"$.fileStoreIds[0].url", + "type": "image" + } + ] + }, + { + "path": "http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search", + "queryParam": "businessIds=$.applicationNumber,history=true,tenantId=$.tenantId", + "apiRequest": null, + "responseMapping":[ + { + "variable":"approvedBy", + "value":"$.ProcessInstances[?(@.action == 'APPROVE')].assigner.name" + } + + ] + } + + ] + } + ] + +} +] +} +} diff --git a/configs/pdf-service/data-config/tlrenewalcertificate.json b/configs/pdf-service/data-config/tlrenewalcertificate.json new file mode 100644 index 00000000..92f21289 --- /dev/null +++ b/configs/pdf-service/data-config/tlrenewalcertificate.json @@ -0,0 +1,729 @@ +{ + "key": "tlrenewalcertificate", + "DataConfigs": { + "serviceName": "rainmaker-common", + "version": "1.0.0", + "baseKeyPath": "$.Licenses.*", + "entityIdPath":"$.id", + "isCommonTableBorderRequired": true, + "mappings": [ + { + "mappings": [ + { + "direct": [ + { + "variable": "logoImage", + "url":"https://raw.githubusercontent.com/egovernments/egov-web-app/master/web/rainmaker/dev-packages/egov-ui-kit-dev/src/assets/images/pblogo.png", + "type":"image" + }, + { + "variable": "tradeLicenseNo", + "value": { + "path": "$.licenseNumber" + } + }, + { + "variable": "applicationNo", + "value": { + "path": "$.applicationNumber" + } + }, + { + "variable": "financialYear", + "value": { + "path": "$.financialYear" + } + }, + { + "variable": "tradeName", + "value": { + "path": "$.tradeName" + } + }, + { + "variable": "tradeOwnerName", + "value": { + "path": "$.tradeLicenseDetail.owners[0].name" + } + }, + { + "variable": "tradeOwnerContact", + "value": { + "path": "$.tradeLicenseDetail.owners[0].mobileNumber" + } + }, + { + "variable": "tradeAddress", + "value": { + "path": "$.tradeLicenseDetail.address.locality.code" + } + }, + { + "variable": "doorNo", + "value": { + "path": "$.tradeLicenseDetail.address.doorNo" + } + }, + { + "variable": "structureType", + "value": { + "path": "$.tradeLicenseDetail.structureType" + }, + "localisation":{ + "required":true, + "prefix": "COMMON_MASTERS_STRUCTURETYPE", + "module": "rainmaker-tl", + "isCategoryRequired":true + } + }, + { + "variable": "structureSubType", + "value": { + "path": "$.tradeLicenseDetail.structureType" + }, + "localisation":{ + "required":true, + "prefix": "COMMON_MASTERS_STRUCTURETYPE", + "module": "rainmaker-tl", + "isSubTypeRequired":true + } + }, + { + "variable": "streetName", + "value": { + "path": "$.tradeLicenseDetail.address.street" + } + }, + { + "variable": "buildingName", + "value": { + "path": "$.tradeLicenseDetail.address.buildingName" + } + }, + { + "variable": "city", + "value": { + "path": "$.tradeLicenseDetail.address.city" + }, + "localisation":{ + "required":true, + "prefix": "TENANT_TENANTS", + "module": "rainmaker-common" + } + }, + { + "variable": "tradeType", + "value": { + "path": "$.tradeLicenseDetail.tradeUnits[0].tradeType" + }, + "localisation":{ + "required":true, + "prefix": "TRADELICENSE_TRADETYPE", + "module": "rainmaker-tl" + } + }, + + { + "variable": "variable13", + "value":{ + "path":"$.tradeLicenseDetail.tradeUnits.*" + }, + "type":"array", + "format":{ + "type":"string", + "scema":[ + { + "variable": "tradeCat", + "value":"tradeType", + "localisation":{ + "required":true, + "prefix": "TRADELICENSE_TRADETYPE", + "module": "rainmaker-tl", + "isCategoryRequired":true + } + }, + { + "variable": "tradetyp", + "value":"tradeType", + "localisation":{ + "required":true, + "prefix": "TRADELICENSE_TRADETYPE", + "module": "rainmaker-tl", + "isMainTypeRequired":true + } + }, + { + "variable": "tradesub", + "value":"tradeType", + "localisation":{ + "required":true, + "prefix": "TRADELICENSE_TRADETYPE", + "module": "rainmaker-tl", + "isSubTypeRequired":true + } + }, + { + "variable": "UOM-measurement", + "value":"uom" + }, + { + "variable":"uomValue", + "value":"uomValue" + } + ] + } + }, + { + "variable": "variable14", + "value":{ + "path":"$.tradeLicenseDetail.accessories.*" + }, + "type":"array", + "format":{ + "type":"string", + "scema":[ + { + "variable": "accesoryType", + "value": "accessoryCategory", + "localisation":{ + "required":true, + "prefix": "TRADELICENSE_ACCESSORIESCATEGORY", + "module": "rainmaker-tl" + } + }, + { + "variable": "accessoryUomValue", + "value": "uomValue" + }, + + { + "variable": "uom", + "value": "uom" + }, + { + "variable": "accessoryCount", + "value": "count" + } + + ] + } + + }, + { + "variable": "variable_owners", + "value": {"path":"$.tradeLicenseDetail.owners[?(@.active== true && @.userActive== true)]"}, + "type":"array", + "format":{ + "type":"string", + "scema":[ + { + "variable": "name", + "value": "name", + "type":"string" + }, + { + "variable": "fatherOrHusbandName", + "value": "fatherOrHusbandName", + "type":"string" + }, + + { + "variable": "permanentAddress", + "value": "permanentAddress", + "type":"string" + }, + { + "variable": "mobileNumber", + "value": "mobileNumber", + "type":"string" + } + + ] + } + }, + { + "variable": "accessories", + "value": { + "path": "$.tradeLicenseDetail.accessories[0].accessoryCategory" + }, + "localisation":{ + "required":true, + "prefix": "TRADELICENSE_ACCESSORIESCATEGORY", + "module": "rainmaker-tl" + } + + }, + { + "variable": "licenseIssueDate", + "value": { + "path": "$.issuedDate" + }, + "type": "date" + }, + { + "variable": "licenseValidityFrom", + "value": { + "path": "$.validFrom" + }, + "type": "date" + }, + { + "variable": "licenseValidityTo", + "value": { + "path": "$.validTo" + }, + "type": "date" + }, + { + "variable": "to", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_TO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "municipal_corportaion", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_MUNICIPAL_CORPORATION" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "corporation_contact", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_LICENSE_CORPORATION_CONTACT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "corporation_website", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_LICENSE_CORPORATION_WEBSITE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "trade_category", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_TRADE_CATEGORY" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "trade_type", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_TRADE_TYPE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "trade_sub_type", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_TRADE_SUB_TYPE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "uom_measurement", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_UOM_MEASUREMENT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "accesory_type", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_ACCESORY_TYPE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "uom_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_UOM" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "uom_value", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_UOM_VALUE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "accessory_count", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_ACCESORY_COUNT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "corporation_email", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_LICENSE_CORPORATION_EMAIL" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "trade_license_certifcate", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_LICENSE_CERTIFICATE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "trade_license_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_LICENSE_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "application_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_APPLICATION_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "reciept_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_RECIEPT_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "financial_year", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_FINANCIAL_YEAR" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "trade_name", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_TRADE_NAME" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "trade_owner_name", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_TRADE_OWNER_NAME" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "trade_owner_contact", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_TRADE_OWNER_CONTACT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "trade_address", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_TRADE_ADDRESS" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "trade_type", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_TRADE_TYPE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "accessories_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_ACCESSORIES_LABEL" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "trade_license_fee", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_TRADE_LICENSE_FEE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "license_issue_date", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_LICENSE_ISSUE_DATE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "license_validity", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_LICENSE_VALIDITY" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "approved_by", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_APPROVED_BY" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "commissioner", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLCERTIFICATE_COMMISSIONER" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "disclaimer", + "value": { + "path": "TL_CERTIFICATE_DISCLAIMER" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + } + ] + }, + { + "externalAPI": [ + { + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", + "apiRequest": null, + "responseMapping":[ + { + "variable":"ulb-address", + "value":"$.MdmsRes.tenant.tenants[0].address" + }, + { + "variable":"mcGrade", + "value":"$.MdmsRes.tenant.tenants[0].city.ulbType" + }, + { + "variable":"corporationContact", + "value":"$.MdmsRes.tenant.tenants[0].contactNumber" + }, + { + "variable":"corporationWebsite", + "value":"$.MdmsRes.tenant.tenants[0].domainUrl" + }, + { + "variable":"corporationEmail", + "value":"$.MdmsRes.tenant.tenants[0].emailId" + } + ] + }, + { + "path": "http://collection-services:8080/collection-services/payments/TL/_search", + "queryParam": "tenantId=$.tenantId,consumerCodes=$.applicationNumber,businessServices=TL", + "apiRequest": null, + "responseMapping":[ + { + "variable":"tradeLicenseFee", + "value":"$.Payments[0].totalAmountPaid" + }, + { + "variable":"recieptNo", + "value":"$.Payments[0].paymentDetails[0].receiptNumber" + } + + ] + }, + { + "path": "http://egov-location:8080/egov-location/location/v11/boundarys/_search", + "queryParam": "tenantId=$.tenantId,hierarchyTypeCode=REVENUE,boundaryType=Locality,codes=$.tradeLicenseDetail.address.locality.code", + "apiRequest": null, + "responseMapping":[ + { + "variable":"localityNName", + "value":"$.TenantBoundary[0].boundary[0].name" + } + ] + }, + + { + "path": "http://egov-filestore:8080/filestore/v1/files/url", + "queryParam": "tenantId=pb,fileStoreIds=$.tradeLicenseDetail.applicationDocuments[?(@.documentType== 'OWNERPHOTO')].fileStoreId", + "apiRequest": null, + "requesttype": "GET", + "responseMapping":[ + { + "variable":"userpic", + "value":"$.fileStoreIds[0].url", + "type": "image" + } + ] + }, + { + "path": "http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/process/_search", + "queryParam": "businessIds=$.applicationNumber,history=true,tenantId=$.tenantId", + "apiRequest": null, + "responseMapping":[ + { + "variable":"approvedBy", + "value":"$.ProcessInstances[?(@.action == 'APPROVE')].assigner.name" + } + + ] + } + + ] + } + ] + +} +] +} +} diff --git a/configs/pdf-service/data-config/tradelicense-bill.json b/configs/pdf-service/data-config/tradelicense-bill.json new file mode 100644 index 00000000..0e012f7d --- /dev/null +++ b/configs/pdf-service/data-config/tradelicense-bill.json @@ -0,0 +1,644 @@ +{ + "key": "tradelicense-bill", + "DataConfigs": { + "serviceName": "rainmaker-common", + "version": "1.0.0", + "baseKeyPath": "$.Bill.*", + "entityIdPath":"$.id", + "isCommonTableBorderRequired": true, + "mappings": [ + { + "topic": "common-pdf-generation-1", + "staticConfigPath": "https://raw.githubusercontent.com/egovernments/egov-services/vishal-feature-filestore/core/egov-indexer/src/main/resources/rainmaker-pgr-indexer.yml", + "mappings": [ + { + "direct": [ + { + "variable": "total_amount_due", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_TOTAL_AMOUNT_DUE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payer_name", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PAYER_NAME" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "Municipal_Corporation", + "value": { + "path": "PDF_STATIC_LABEL_MDMS_MUNICIPAL_CORPORATION" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "bill_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_BILL_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "Rs", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_RUPEE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "mobile_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_MOBILE_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "bill_period", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_BILL_PERIOD" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payer_address", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PAYER_ADDRESS" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + + { + "variable": "bill_issue_date", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ISSUE_DATE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "bill_due_date", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_BILL_DUE_DATE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "billing_summary_property_tax", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_BILLING_SUMMARY" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "serviceType", + "value": { + "path": "$.businessService" + }, + "localisation":{ + "required":true, + "prefix":"MODULE", + "module":"rainmaker-common" + } + }, + { + "variable": "tl_application_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_TL_APPLICATION_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "arrears_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ARREARS" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "charge_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_CHARGE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + + { + "variable": "penalty_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PENALTY" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "rebate_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_REBATE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "others_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_OTHERS" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "total_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_TOTAL" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "important_message", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_IMPORTANT_MESSAGE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payment_received", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PAYMENT_RECEIVED" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "this_document", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_THIS_DOCUMENT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "this_is_a", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_THIS_IS" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "assessment_payment", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ASSESSSMENT_PAYMENT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "please_deposit", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PLEASE_DEPOSIT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "if_the_tax", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_IF_THE_TAX" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "acknowledgement_for", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ACKNOWLEDGEMENT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "date_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_DATE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "consumer_id", + "value": { + "path": "$.businessService" + }, + "localisation":{ + "required":true, + "prefix": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_CONSUMER_ID", + "module":"rainmaker-common" + } + }, + { + "variable": "name_address", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_NAME_ADDRESS" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "total_payment", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_TOTAL_PAYMENT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "receivers_signature", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_RECEIVERS_SIGNATURE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "totalAmountDue", + "value": { + "path": "$.totalAmount" + } + }, + { + "variable": "total", + "value": { + "path": "$.totalAmount" + } + }, + + { + "variable": "payerName", + "value": { + "path": "$.payerName" + } + }, + + { + "variable": "mobileNo", + "value": { + "path": "$.mobileNumber" + } + }, + + { + "variable": "payerAddress", + "value": { + "path": "$.payerAddress" + } + }, + { + "variable": "nameAddress", + "value": { + "path": "$.payerAddress" + } + }, + + { + "variable": "billNo", + "value": { + "path": "$.billNumber" + } + }, + { + "variable": "fromPeriod", + "value": { + "path": "$.billDetails[0].fromPeriod" + }, + "type": "date" + }, + { + "variable": "toPeriod", + "value": { + "path": "$.billDetails[0].toPeriod" + }, + "type": "date" + }, + + { + "variable": "billIssueDate", + "value": { + "path": "$.billDate" + }, + "type": "date" + }, + + { + "variable": "billDueDate", + "value": { + "path": "$.billDetails[0].expiryDate" + }, + "type": "date" + }, + { + "variable": "billdate", + "value": { + "path": "$.billDate" + }, + "type": "date" + }, + + { + "variable": "propertyID", + "value": { + "path": "$.consumerCode" + } + }, + { + "variable": "fees", + "value":{ + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'TL_TAX' || @.taxHeadCode == 'TL_RENEWAL_TAX')].amount" + } + }, + { + "variable": "tl_penalty", + "value":{ + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'TL_PENALTY' || @.taxHeadCode == 'TL_RENEWAL_PENALTY')].amount" + } + }, + { + "variable": "tl_rebate", + "value":{ + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'TL_REBATE' || @.taxHeadCode == 'TL_RENEWAL_REBATE')].amount" + } + }, + { + "variable": "tl_adhoc_penalty", + "value":{ + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'TL_ADHOC_PENALTY' || @.taxHeadCode == 'TL_RENEWAL_ADHOC_PENALTY')].amount" + } + }, + { + "variable": "tl_adhoc_rebate", + "value":{ + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'TL_ADHOC_REBATE' || @.taxHeadCode == 'TL_RENEWAL_ADHOC_REBATE')].amount" + } + }, + { + "variable": "tl_roundoff", + "value":{ + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'TL_ROUNDOFF')].amount" + } + }, + { + "variable": "consumerID", + "value": { + "path": "$.consumerCode" + } + }, + { + "variable": "date", + "value": { + "path": "$.billDate" + }, + "type": "date" + }, + { + "variable": "totalPayment", + "value": { + "path": "$.billDetails[0].amountPaid" + } + }, + { + "variable":"scissorImage", + "url":"http://www.pngall.com/wp-content/uploads/2016/03/Scissor-PNG-Clipart.png", + "type":"image" + } + ] + }, + { + "derived": [ + { + "variable": "charge", + "formula": "{{fees}}" + }, + { + "variable": "penalty", + "formula": "{{tl_penalty}}+{{tl_adhoc_penalty}}" + }, + { + "variable": "rebate", + "formula": "{{tl_rebate}}+{{tl_adhoc_rebate}}" + }, + { + "variable": "others", + "formula": "{{tl_roundoff}}" + } + ] + }, + { + "externalAPI": [ + { + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", + "apiRequest": null, + "responseMapping":[ + { + "variable":"address", + "value":"$.MdmsRes.tenant.tenants[0].address" + }, + { + "variable":"phoneNumber", + "value":"$.MdmsRes.tenant.tenants[0].contactNumber" + }, + { + "variable":"website", + "value":"$.MdmsRes.tenant.tenants[0].domainUrl" + }, + { + "variable":"email", + "value":"$.MdmsRes.tenant.tenants[0].emailId" + }, + { + "variable": "logoImage", + "value":"$.MdmsRes.tenant.tenants[0].logoId", + "type": "image" + }, + { + "variable": "logo_header", + "value":"$.MdmsRes.tenant.tenants[0].code", + "localisation":{ + "required":true, + "prefix": "TENANT_TENANTS", + "module":"rainmaker-common" + } + } + ] + }, + { + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "queryParam": "moduleName=tenant&masterName=footer&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}' %26%26 @.service=='{$.businessService}')%5D", + "apiRequest": null, + "responseMapping":[ + { + "variable": "variable11", + "value": "$.MdmsRes.tenant.footer[0].billFooterContent.*", + "type":"array", + "format":{ + "type":"string", + "scema":[ + { + "variable":"disclaimerContent", + "value":"disclaimer", + "type":"string", + "localisation":{ + "required":true, + "prefix": null, + "module": "rainmaker-common" + } + } + ] + } + } + ] + } + ] + } + ] + } + ] + } +} \ No newline at end of file diff --git a/configs/pdf-service/data-config/tradelicense-receipt.json b/configs/pdf-service/data-config/tradelicense-receipt.json new file mode 100644 index 00000000..0ac82d6c --- /dev/null +++ b/configs/pdf-service/data-config/tradelicense-receipt.json @@ -0,0 +1,747 @@ +{ + "key": "tradelicense-receipt", + "DataConfigs": { + "serviceName": "rainmaker-common", + "version": "1.0.0", + "baseKeyPath": "$.Payments.*", + "entityIdPath":"$.id", + "isCommonTableBorderRequired": true, + "mappings": [ + { + "topic": "common-pdf-generation-3", + "mappings": [ + { + "direct": [ + { + "variable": "payerName", + "value": { + "path": "$.payerName" + } + }, + { + "variable": "payerAddress", + "value": { + "path": "$.payerAddress" + } + }, + { + "variable": "user-name", + "value": { + "path": "$.userInfo.name" + }, + "type":"selectFromRequestInfo" + }, + { + "variable": "userName", + "value": { + "path": "$.additionalDetails.collectedBy" + } + }, + { + "variable": "payerContact", + "value": { + "path": "$.mobileNumber" + } + }, + { + "variable": "receiptNo", + "value": { + "path": "$.paymentDetails[0].receiptNumber" + } + }, + { + "variable": "ifsc", + "value": { + "path": "$.ifscCode" + } + }, + { + "variable": "bank", + "value": { + "path": "$.additionalDetails[0].bankName" + } + }, + { + "variable": "branch", + "value": { + "path": "$.additionalDetails[0].branchName" + } + }, + { + "variable": "add", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].additionalDetails.address" + } + }, + { + "variable": "serviceType", + "value": { + "path": "$.paymentDetails[0].businessService" + }, + "localisation":{ + "required":true, + "prefix":"MODULE", + "module":"rainmaker-common" + } + }, + { + "variable": "renewalTradeFee", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'TL_RENEWAL_TAX')].amount" + } + }, + { + "variable": "newTradeFee", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'TL_TAX')].amount" + } + }, + { + "variable": "renewalPenalty", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'TL_RENEWAL_PENALTY')].amount" + } + }, + { + "variable": "adhocRebate", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'TL_ADHOC_REBATE')].amount" + } + }, + { + "variable": "adhocPenalty", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'TL_ADHOC_PENALTY')].amount" + } + }, + { + "variable": "paidAmount", + "value": { + "path": "$.paymentDetails[0].totalAmountPaid" + } + }, + { + "variable": "fromPeriod", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].fromPeriod" + }, + "type": "date" + }, + { + "variable": "toPeriod", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].toPeriod" + }, + "type": "date" + }, + { + "variable": "chequeNo", + "value": { + "path": "$.instrumentNumber" + } + }, + { + "variable": "chequeDate", + "value": { + "path": "$.instrumentDate" + }, + "type": "date" + }, + { + "variable": "chequeNo", + "value": { + "path": "$.instrumentNumber" + } + }, + { + "variable": "chequeDate", + "value": { + "path": "$.instrumentDate" + }, + "type": "date" + }, + { + "variable": "paymentMode", + "value": { + "path": "$.paymentMode" + }, + "localisation":{ + "required":true, + "prefix": "COMMON_MASTERS_PAYMENTMODE", + "module": "rainmaker-common" + } + }, + { + "variable": "G8ReceiptNo", + "value": { + "path": "$.paymentDetails[0].manualReceiptNumber" + } + }, + { + "variable": "G8ReceiptDate", + "value": { + "path": "$.paymentDetails[0].manualReceiptDate" + }, + "type": "date" + }, + { + "variable": "paymentDate", + "value": { + "path": "$.transactionDate" + }, + "type": "date" + }, + { + "variable": "consumerID", + "value": { + "path": "$.paymentDetails[0].bill.consumerCode" + } + }, + { + "variable": "transactionID", + "value": { + "path": "$.transactionNumber" + } + }, + { + "variable": "dueAmount", + "value": { + "path": "$.paymentDetails[0].bill.totalAmount" + } + }, + { + "variable": "payment_receipt", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_RECEIPT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "receipt_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_RECEIPT_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "consumer_id", + "value": { + "path": "$.paymentDetails[0].businessService" + }, + "localisation":{ + "required":true, + "prefix": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_CONSUMER_ID", + "module":"rainmaker-common" + } + }, + { + "variable": "payment_date", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_DATE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payer_name", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYER_NAME" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payer_contact", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYER_CONTACT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "service_type", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_SERVICE_TYPE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "billing_period", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_BILLING_PERIOD" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "paid_amount", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAID_AMOUNT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "pending_amount", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PENDING_AMOUNT" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "payment_mode", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_MODE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "transaction_id", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_TRANSACTION_ID" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "g8_receipt_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_G8_RECEIPT_NO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "g8_receipt_date", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_G8_RECEIPT_DATE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "generated_by", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_GENERATED_BY" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "commissioner/eo", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_COMMISSIONER_EO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "no_signature", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_NO_SIGNATURE" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "disclamer", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "to", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_TO" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "Municipal_Corporation", + "value": { + "path": "PDF_STATIC_LABEL_MDMS_MUNICIPAL_CORPORATION" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + } + ] + }, + { + "derived": [ + { + "variable": "pendingAmount", + "formula": "{{dueAmount}}-{{paidAmount}}" + }, + { + "variable": "tradeFee", + "formula": "{{renewalTradeFee}}+{{newTradeFee}}" + } + ] + }, + { + "externalAPI": [ + { + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", + "apiRequest": null, + "responseMapping":[ + { + "variable":"address", + "value":"$.MdmsRes.tenant.tenants[0].address" + }, + { + "variable":"mcGrade", + "value":"$.MdmsRes.tenant.tenants[0].city.ulbType" + }, + { + "variable":"phoneNumber", + "value":"$.MdmsRes.tenant.tenants[0].contactNumber" + }, + { + "variable":"website", + "value":"$.MdmsRes.tenant.tenants[0].domainUrl" + }, + { + "variable":"email", + "value":"$.MdmsRes.tenant.tenants[0].emailId" + }, + { + "variable": "logoImage", + "value":"$.MdmsRes.tenant.tenants[0].logoId", + "type":"image" + }, + { + "variable": "logo-header", + "value":"$.MdmsRes.tenant.tenants[0].code", + "localisation":{ + "required":true, + "prefix": "TENANT_TENANTS", + "module":"rainmaker-common" + } + } + ] + }, + + { + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "queryParam": "moduleName=tenant&masterName=footer&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}' %26%26 @.service=='{$.paymentDetails[0].businessService}')%5D", + "apiRequest": null, + "responseMapping":[ + { + "variable": "variable11", + "value": "$.MdmsRes.tenant.footer[0].receiptFooterContent.*", + "type":"array", + "format":{ + "type":"string", + "scema":[ + { + "variable":"disclaimerContent", + "value":"disclaimer", + "type":"string", + "localisation":{ + "required":true, + "prefix": null, + "module": "rainmaker-common" + } + } + ] + } + } + ] + }, + { + "path": "http://tl-services.egov:8080/tl-services/v1/_search", + "queryParam": "tenantId=$.tenantId,applicationNumber=$.paymentDetails[0].bill.consumerCode", + "apiRequest": null, + "responseMapping":[ + { + "variable":"applicationType", + "value":"$.Licenses[0].applicationType" + }, + { + "variable":"penaltyComments", + "value":"$.Licenses[0].tradeLicenseDetail.additionalDetail.penaltyComments" + }, + { + "variable":"rebateComments", + "value":"$.Licenses[0].tradeLicenseDetail.additionalDetail.rebateComments" + }, + { + "variable":"licenseNumber", + "value":"$.Licenses[0].licenseNumber" + }, + { + "variable":"oldLicenseNumber", + "value":"$.Licenses[0].oldLicenseNumber" + }, + { + "variable":"financialYear", + "value":"$.Licenses[0].financialYear" + }, + { + "variable":"tradeName", + "value":"$.Licenses[0].tradeName" + },{ + "variable":"tradeBuilding", + "value":"$.Licenses[0].tradeLicenseDetail.address.buildingName" + },{ + "variable":"tradeDoor", + "value":"$.Licenses[0].tradeLicenseDetail.address.doorNo" + },{ + "variable":"tradeStreet", + "value":"$.Licenses[0].tradeLicenseDetail.address.street" + }, + { + "variable":"adhocRebateReason", + "value":"$.Licenses[0].tradeLicenseDetail.adhocExemptionReason", + "localisation":{ + "required":true, + "prefix": null, + "module": "rainmaker-tl" + } + }, + { + "variable":"adhocPenaltyReason", + "value":"$.Licenses[0].tradeLicenseDetail.adhocPenaltyReason", + "localisation":{ + "required":true, + "prefix": null, + "module": "rainmaker-tl" + } + }, + { + "variable": "structureType", + "value": "$.Licenses[0].tradeLicenseDetail.structureType", + "localisation":{ + "required":true, + "prefix": "COMMON_MASTERS_STRUCTURETYPE", + "module": "rainmaker-tl", + "isCategoryRequired":true + } + }, + { + "variable": "structureSubType", + "value": "$.Licenses[0].tradeLicenseDetail.structureType", + "localisation":{ + "required":true, + "prefix": "COMMON_MASTERS_STRUCTURETYPE", + "module": "rainmaker-tl", + "isSubTypeRequired":true + } + }, + { + "variable": "variable_acc", + "value": "$.Licenses[0].tradeLicenseDetail.accessories.*", + "type":"array", + "format":{ + "type":"string", + "scema":[ + { + "variable": "accesoryType", + "value": "accessoryCategory", + "type":"string", + "localisation":{ + "required":true, + "prefix": "TRADELICENSE_ACCESSORIESCATEGORY", + "module": "rainmaker-tl" + } + }, + { + "variable": "accessoryUomValue", + "value": "uomValue", + "type":"string" + }, + + { + "variable": "uom", + "value": "uom", + "type":"string" + }, + { + "variable": "accessoryCount", + "value": "count", + "type":"string" + } + + ] + } + }, + { + "variable": "variable_owners", + "value": "$.Licenses[0].tradeLicenseDetail.owners[?(@.active== true && @.userActive== true)]", + "type":"array", + "format":{ + "type":"string", + "scema":[ + { + "variable": "name", + "value": "name", + "type":"string" + }, + { + "variable": "fatherOrHusbandName", + "value": "fatherOrHusbandName", + "type":"string" + }, + + { + "variable": "permanentAddress", + "value": "permanentAddress", + "type":"string" + }, + { + "variable": "mobileNumber", + "value": "mobileNumber", + "type":"string" + } + + ] + } + }, + { + "variable": "variable13", + "value": "$.Licenses[0].tradeLicenseDetail.tradeUnits.*", + "type":"array", + "format":{ + "type":"string", + "scema":[ + { + "variable": "tradeCat", + "value": "tradeType", + "type":"string", + "localisation":{ + "required":true, + "prefix":"TRADELICENSE_TRADETYPE", + "module": "rainmaker-tl", + "isCategoryRequired":true + } + }, + { + "variable": "tradeTyp", + "value": "tradeType", + "type":"string", + "localisation":{ + "required":true, + "prefix":"TRADELICENSE_TRADETYPE", + "module": "rainmaker-tl", + "isMainTypeRequired":true + } + }, + { + "variable": "tradeSub", + "value": "tradeType", + "type":"string", + "localisation":{ + "required":true, + "prefix":"TRADELICENSE_TRADETYPE", + "module": "rainmaker-tl", + "isSubTypeRequired":true + } + } + ] + } + } + ] + },{ + "path": "http://egov-location:8080/egov-location/location/v11/boundarys/_search", + "queryParam": "tenantId=$.tenantId,hierarchyTypeCode=REVENUE,boundaryType=Locality,codes=$.paymentDetails[0].bill.billDetails[0].additionalDetails.address", + "apiRequest": null, + "responseMapping":[ + { + "variable":"mohalla", + "value":"$.TenantBoundary[0].boundary[0].name" + } + ] + } + ] + + } + ] + } + ] + } +} diff --git a/configs/pdf-service/data-config/ws-applicationsewerage.json b/configs/pdf-service/data-config/ws-applicationsewerage.json new file mode 100644 index 00000000..b80149f9 --- /dev/null +++ b/configs/pdf-service/data-config/ws-applicationsewerage.json @@ -0,0 +1,1028 @@ +{ + "key": "ws-applicationsewerage", + "DataConfigs": { + "serviceName": "rainmaker-common", + "version": "1.0.0", + "baseKeyPath": "$.SewerageConnection.*", + "entityIdPath": "$.applicationNo", + "isCommonTableBorderRequired": true, + "mappings": [ + { + "topic": "common-pdf-generation-3", + "mappings": [ + { + "direct": [ + { + "variable": "applicationNo", + "value": { + "path": "$.applicationNo" + } + }, + { + "variable": "status", + "value": { + "path": "$.status" + } + }, + { + "variable": "totalAmount", + "value": { + "path": "$.totalAmount" + } + }, + { + "variable": "propertyId", + "value": { + "path": "$.property.propertyId" + } + }, + { + "variable": "propertyType", + "value": { + "path": "$.property.propertyType" + }, + "localisation": { + "required": true, + "prefix": "WS_PROPTYPE", + "module": "rainmaker-ws" + } + }, + { + "variable": "propertyUsageType", + "value": { + "path": "$.property.usageCategory" + }, + "localisation": { + "required": true, + "prefix": "WS_PROPUSGTYPE", + "module": "rainmaker-ws" + } + }, + { + "variable": "propertyUsageSubType", + "value": { + "path": "$.property.propertySubUsageType" + }, + "localisation": { + "required": true, + "prefix": "WS_PROPSUBUSGTYPE", + "module": "rainmaker-ws" + } + }, + { + "variable": "plotSize", + "value": { + "path": "$.property.landArea" + } + }, + { + "variable": "noOfFloor", + "value": { + "path": "$.property.noOfFloors" + } + }, + { + "variable": "rainwaterHarvestingFacility", + "value": { + "path": "$.property.rainWaterHarvesting" + }, + "localisation": { + "required": true, + "prefix": "HARVESTING", + "module": "rainmaker-common" + } + }, + { + "variable": "cityName", + "value": { + "path": "$.property.address.city" + } + }, + { + "variable": "doorHouseNo", + "value": { + "path": "$.property.address.doorNo" + } + }, + { + "variable": "buildingColonyName", + "value": { + "path": "$.property.address.buildingName" + } + }, + { + "variable": "streetName", + "value": { + "path": "$.property.address.street" + } + }, + { + "variable": "localityMohalla", + "value": { + "path": "$.property.address.locality.name" + } + }, + { + "variable": "pinCode", + "value": { + "path": "$.property.address.pincode" + } + }, + { + "variable": "variable13", + "value":{ + "path":"$.property.owners.*" + }, + "type":"array", + "format":{ + "type":"string", + "scema":[ + { + "variable": "ownerName", + "value": "name" + }, + { + "variable": "ownerEmailId", + "value":"emailId" + }, + { + "variable": "gender", + "value": "gender" + }, + { + "variable": "ownerDob", + "value": "dob", + "type": "date" + }, + { + "variable": "guardianName", + "value": "fatherOrHusbandName" + }, + { + "variable": "relationshipLabel", + "value": "relationship" + }, + { + "variable": "specialApplicantCategory", + "value": "ownerType" + }, + { + "variable": "correspondenceAddress", + "value": "correspondenceAddress" + } + ] + } + + }, + { + "variable": "applyCategory", + "value": { + "path": "$.service" + } + }, + { + "variable": "noOfWaterClosetsProposed", + "value": { + "path": "$.proposedWaterClosets" + } + }, + { + "variable": "noOfWaterToiletsProposed", + "value": { + "path": "$.proposedToilets" + } + }, + { + "variable": "connectionType", + "value": { + "path": "$.connectionType" + } + }, + { + "variable": "noOfWaterClosets", + "value": { + "path": "$.noOfWaterClosets" + } + }, + { + "variable": "noOfToilets", + "value": { + "path": "$.noOfToilets" + } + }, + { + "variable": "plumberProvidedBy", + "value": { + "path": "$.additionalDetails.detailsProvidedBy" + } + }, + { + "variable": "plumberLicenceNo", + "value": { + "path": "$.plumberInfo[0].licenseNo" + } + }, + { + "variable": "plumberName", + "value": { + "path": "$.plumberInfo[0].name" + } + }, + { + "variable": "plumberMobileNo", + "value": { + "path": "$.plumberInfo[0].mobileNumber" + } + }, + { + "variable": "roadType", + "value": { + "path": "$.roadType" + } + }, + { + "variable": "area", + "value": { + "path": "$.roadCuttingArea" + } + }, + { + "variable": "connectionExecutionDate", + "value": { + "path": "$.connectionExecutionDate" + }, + "type": "date" + }, + { + "variable": "ownershipProof", + "value": { + "path": "$.pdfDocuments[?(@.title == 'WS_OWNER.ADDRESSPROOF')].name" + } + }, + { + "variable": "ownersIdProof", + "value": { + "path": "$.pdfDocuments[?(@.title == 'WS_OWNER.IDENTITYPROOF')].name" + } + }, + { + "variable": "electricityBill", + "value": { + "path": "$.pdfDocuments[?(@.title == 'WS_ELECTRICITY_BILL')].name" + } + }, + { + "variable": "plumberReport", + "value": { + "path": "$.pdfDocuments[?(@.title == 'WS_PLUMBER_REPORT_DRAWING')].name" + } + }, + { + "variable": "buildingPlan", + "value": { + "path": "$.pdfDocuments[?(@.title == 'WS_BUILDING_PLAN_OR_COMPLETION_CERTIFICATE')].name" + } + }, + { + "variable": "ptTaxReciept", + "value": { + "path": "$.pdfDocuments[?(@.title == 'WS_PROPERTY_TAX_RECIEPT')].name" + } + }, + { + "variable": "logoImage", + "url": "https://raw.githubusercontent.com/egovernments/egov-web-app/master/web/rainmaker/dev-packages/egov-ui-kit-dev/src/assets/images/pblogo.png", + "type": "image" + }, + { + "variable": "Municipal_Corporation", + "value": { + "path": "PDF_STATIC_LABEL_MDMS_MUNICIPAL_CORPORATION" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "logo_sub_header", + "value": { + "path": "PDF_STATIC_LABEL_SW_CONSOLIDATED_ACKNOWELDGMENT_LOGO_SUB_HEADER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "application_no", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_APPLICATION_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "status_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_STATUS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "document_details_header", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_DOCUMENT_DETAIL_HEADER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "fee_estimate_header", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_FEES_ESTIMATE_HEADER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "total_amount", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_TOTAL_AMOUNT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "total_amount", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_TOTAL_AMOUNT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "property_details_header", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PROPERTY_DETAILS_HEADER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "property_id", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PROPERTY_ID" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "property_type", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PROPERTY_TYPE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "property_usage_type", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PROPERTY_USAGE_TYPE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "property_usage_sub_type", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PROPERTY_USAGE_SUB_TYPE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "plot_size", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PLOT_SIZE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "no_of_floor", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_NO_OF_FLOOR" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "rainwater_harvesting_facility", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_RAINWATER_HARVESTING_FACILITY" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "property_location_details_header", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PROPERTY_LOCATION_HEADER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "city", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_CITY" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "door_house_no", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_DOOR_HOUSE_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "building_colony_name", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_BUILDING" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "street_name", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_STREETNAME" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "locality_mohalla", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_LOCALITY" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "pin_code", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PINCODE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "property_owner_details_header", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_OWNER_DETAILS_HEADER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "owner_name", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_OWNER_NAME" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "email_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_EMAIL" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "gender_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_GENDER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "dob_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_DOB" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "guardian_name", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_GUARDIAN_NAME" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "relationship_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_RELATIONSHIP" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "special_applicant_category", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_SPECIAL_APPLICANT_CATEGORY" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "connection_details_header", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_CONNECTION_DETAILS_HEADER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "apply_category", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_APPLY_CATEGORY" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "no_of_water_closets_proposed", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_NO_OF_WATER_CLOSETS_PROPOSED" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "no_of_water_toilets_proposed", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_NO_OF_WATER_TOILETS_PROPOSED" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "additional_connection_details_header", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ADDITIONAL_CONNECTION_HEADER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "connection_type", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_CONNECTION_TYPE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "no_of_water_closets", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_NO_OF_WATER_CLOSETS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "no_of_toilets", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_NO_OF_TOILETS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "plumber_details_header", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PLUMBER_DETAILS_HEADER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "plumber_provided_by", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PLUMBER_PROVIDED_BY" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "plumber_licence_no", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PLUMBER_LICENSE_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "plumber_name", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PLUMBER_NAME" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "plumber_mobile_no", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PLUMBER_MOBILE_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "road_charges_header", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ROAD_CHARGES_HEADER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "road_type", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ROAD_TYPE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "area_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_AREA_LABEL" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "activation_details_header", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ACTIVATION_DETAILS_HEADER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "connection_execution_date", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_CONNECTION_EXECUTION_DATE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "ownership_proof", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_OWNERSHIP_PROOF" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "owners_id_proof", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_OWNERS_ID_PROOF" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "electricty_bill", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ELECTRICITY_BILL" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "plumber_report", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PLUMBER_REPORT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "building_plan", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_BUILDING_PLAN" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "property_tax_reciept", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PROPERTY_TAX_RECEIPT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "sewerage_application", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_SEWERAGE_APPLICATION" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "correspondence_address", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_CORRESPONDENCE_ADDRESS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "Rs", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_RUPEE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + } + ] + }, + { + "externalAPI": [ + { + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.property.tenantId}')%5D", + "apiRequest": null, + "responseMapping": [ + { + "variable": "logoImage", + "value": "$.MdmsRes.tenant.tenants[0].logoId", + "type": "image" + }, + { + "variable":"mcGrade", + "value":"$.MdmsRes.tenant.tenants[0].city.pwssbGrade" + }, + { + "variable": "logo_header", + "value": "$.MdmsRes.tenant.tenants[0].code", + "localisation": { + "required": true, + "prefix": "TENANT_TENANTS", + "module": "rainmaker-common" + } + } + ] + } + ] + } + ] + } + ] + } +} diff --git a/configs/pdf-service/data-config/ws-applicationwater.json b/configs/pdf-service/data-config/ws-applicationwater.json new file mode 100644 index 00000000..e4a22eb3 --- /dev/null +++ b/configs/pdf-service/data-config/ws-applicationwater.json @@ -0,0 +1,1107 @@ +{ + "key": "ws-applicationwater", + "DataConfigs": { + "serviceName": "rainmaker-common", + "version": "1.0.0", + "baseKeyPath": "$.WaterConnection.*", + "entityIdPath": "$.applicationNo", + "isCommonTableBorderRequired": true, + "mappings": [ + { + "topic": "common-pdf-generation-3", + "mappings": [ + { + "direct": [ + { + "variable": "applicationNo", + "value": { + "path": "$.applicationNo" + } + }, + { + "variable": "status", + "value": { + "path": "$.status" + } + }, + { + "variable": "totalAmount", + "value": { + "path": "$.totalAmount" + } + }, + { + "variable": "propertyId", + "value": { + "path": "$.property.propertyId" + } + }, + { + "variable": "propertyType", + "value": { + "path": "$.property.propertyType" + }, + "localisation": { + "required": true, + "prefix": "WS_PROPTYPE", + "module": "rainmaker-ws" + } + }, + { + "variable": "propertyUsageType", + "value": { + "path": "$.property.usageCategory" + }, + "localisation": { + "required": true, + "prefix": "WS_PROPUSGTYPE", + "module": "rainmaker-ws" + } + }, + { + "variable": "propertyUsageSubType", + "value": { + "path": "$.property.propertySubUsageType" + }, + "localisation": { + "required": true, + "prefix": "WS_PROPSUBUSGTYPE", + "module": "rainmaker-ws" + } + }, + { + "variable": "plotSize", + "value": { + "path": "$.property.landArea" + } + }, + { + "variable": "noOfFloor", + "value": { + "path": "$.property.noOfFloors" + } + }, + { + "variable": "rainwaterHarvestingFacility", + "value": { + "path": "$.property.rainWaterHarvesting" + }, + "localisation": { + "required": true, + "prefix": "HARVESTING", + "module": "rainmaker-common" + } + }, + { + "variable": "cityName", + "value": { + "path": "$.property.address.city" + } + }, + { + "variable": "doorHouseNo", + "value": { + "path": "$.property.address.doorNo" + } + }, + { + "variable": "buildingColonyName", + "value": { + "path": "$.property.address.buildingName" + } + }, + { + "variable": "streetName", + "value": { + "path": "$.property.address.street" + } + }, + { + "variable": "localityMohalla", + "value": { + "path": "$.property.address.locality.name" + } + }, + { + "variable": "pinCode", + "value": { + "path": "$.property.address.pincode" + } + }, + { + "variable": "variable13", + "value":{ + "path":"$.property.owners.*" + }, + "type":"array", + "format":{ + "type":"string", + "scema":[ + { + "variable": "ownerName", + "value": "name" + }, + { + "variable": "ownerEmailId", + "value":"emailId" + }, + { + "variable": "gender", + "value": "gender" + }, + { + "variable": "ownerDob", + "value": "dob", + "type":"date" + }, + { + "variable": "guardianName", + "value": "fatherOrHusbandName" + }, + { + "variable": "relationshipLabel", + "value": "relationship" + }, + { + "variable": "specialApplicantCategory", + "value": "ownerType" + }, + { + "variable": "correspondenceAddress", + "value": "correspondenceAddress" + } + ] + } + + }, + { + "variable": "applyCategory", + "value": { + "path": "$.service" + } + }, + { + "variable": "noOfTapsProposed", + "value": { + "path": "$.proposedTaps" + } + }, + { + "variable": "pipeSizeProposed", + "value": { + "path": "$.proposedPipeSize" + } + }, + { + "variable": "connectionType", + "value": { + "path": "$.connectionType" + } + }, + { + "variable": "plumberProvidedBy", + "value": { + "path": "$.additionalDetails.detailsProvidedBy" + } + }, + { + "variable": "plumberLicenceNo", + "value": { + "path": "$.plumberInfo[0].licenseNo" + } + }, + { + "variable": "plumberName", + "value": { + "path": "$.plumberInfo[0].name" + } + }, + { + "variable": "plumberMobileNo", + "value": { + "path": "$.plumberInfo[0].mobileNumber" + } + }, + { + "variable": "roadType", + "value": { + "path": "$.roadType" + } + }, + { + "variable": "area", + "value": { + "path": "$.roadCuttingArea" + } + }, + { + "variable": "connectionExecutionDate", + "value": { + "path": "$.connectionExecutionDate" + }, + "type": "date" + }, + { + "variable": "noOfTaps", + "value": { + "path": "$.noOfTaps" + } + }, + { + "variable": "waterSource", + "value": { + "path": "$.waterSource" + } + }, + { + "variable": "waterSubSource", + "value": { + "path": "$.waterSubSource" + } + }, + { + "variable": "pipeSize", + "value": { + "path": "$.pipeSize" + } + }, + { + "variable": "ownershipProof", + "value": { + "path": "$.pdfDocuments[?(@.title == 'WS_OWNER.ADDRESSPROOF')].name" + } + }, + { + "variable": "ownersIdProof", + "value": { + "path": "$.pdfDocuments[?(@.title == 'WS_OWNER.IDENTITYPROOF')].name" + } + }, + { + "variable": "electricityBill", + "value": { + "path": "$.pdfDocuments[?(@.title == 'WS_ELECTRICITY_BILL')].name" + } + }, + { + "variable": "plumberReport", + "value": { + "path": "$.pdfDocuments[?(@.title == 'WS_PLUMBER_REPORT_DRAWING')].name" + } + }, + { + "variable": "buildingPlan", + "value": { + "path": "$.pdfDocuments[?(@.title == 'WS_BUILDING_PLAN_OR_COMPLETION_CERTIFICATE')].name" + } + }, + { + "variable": "ptTaxReciept", + "value": { + "path": "$.pdfDocuments[?(@.title == 'WS_PROPERTY_TAX_RECIEPT')].name" + } + }, + { + "variable": "meterId", + "value": { + "path": "$.meterId" + } + }, + { + "variable": "meterInstallationDate", + "value": { + "path": "$.meterInstallationDate" + }, + "type": "date" + }, + { + "variable": "initialMeterReading", + "value": { + "path": "$.additionalDetails.initialMeterReading" + } + }, + { + "variable": "logoImage", + "url": "https://raw.githubusercontent.com/egovernments/egov-web-app/master/web/rainmaker/dev-packages/egov-ui-kit-dev/src/assets/images/pblogo.png", + "type": "image" + }, + { + "variable": "Municipal_Corporation", + "value": { + "path": "PDF_STATIC_LABEL_MDMS_MUNICIPAL_CORPORATION" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "logo_sub_header", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_LOGO_SUB_HEADER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "application_no", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_APPLICATION_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "status_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_STATUS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "document_details_header", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_DOCUMENT_DETAIL_HEADER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "total_amount", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_TOTAL_AMOUNT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "total_amount", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_TOTAL_AMOUNT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "property_details_header", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PROPERTY_DETAILS_HEADER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "property_id", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PROPERTY_ID" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "property_type", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PROPERTY_TYPE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "property_usage_type", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PROPERTY_USAGE_TYPE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "property_usage_sub_type", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PROPERTY_USAGE_SUB_TYPE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "plot_size", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PLOT_SIZE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "no_of_floor", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_NO_OF_FLOOR" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "rainwater_harvesting_facility", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_RAINWATER_HARVESTING_FACILITY" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "property_location_details_header", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PROPERTY_LOCATION_HEADER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "city", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_CITY" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "door_house_no", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_DOOR_HOUSE_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "building_colony_name", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_BUILDING" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "street_name", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_STREETNAME" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "locality_mohalla", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_LOCALITY" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "pin_code", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PINCODE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "property_owner_details_header", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_OWNER_DETAILS_HEADER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "owner_name", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_OWNER_NAME" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "email_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_EMAIL" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "gender_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_GENDER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "dob_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_DOB" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "guardian_name", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_GUARDIAN_NAME" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "relationship_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_RELATIONSHIP" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "special_applicant_category", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_SPECIAL_APPLICANT_CATEGORY" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "connection_details_header", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_CONNECTION_DETAILS_HEADER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "apply_category", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_APPLY_CATEGORY" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "additional_connection_details_header", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ADDITIONAL_CONNECTION_HEADER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "connection_type", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_CONNECTION_TYPE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "plumber_details_header", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PLUMBER_DETAILS_HEADER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "plumber_provided_by", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PLUMBER_PROVIDED_BY" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "plumber_licence_no", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PLUMBER_LICENSE_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "plumber_name", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PLUMBER_NAME" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "plumber_mobile_no", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PLUMBER_MOBILE_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "road_charges_header", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ROAD_CHARGES_HEADER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "road_type", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ROAD_TYPE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "area_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_AREA_LABEL" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "activation_details_header", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ACTIVATION_DETAILS_HEADER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "connection_execution_date", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_CONNECTION_EXECUTION_DATE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "no_of_taps_proposed", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_TAPS_PROPOSED" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "pipe_size_proposed", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PIPE_SIZE_PROPOSED" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "no_of_taps", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_NO_OF_TAPS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "water_source", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_WATER_SOURCE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "water_sub_source", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_WATER_SUB_SOURCE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "pipe_size", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PIPE_SIZE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "ownership_proof", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_OWNERSHIP_PROOF" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "owners_id_proof", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_OWNERS_ID_PROOF" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "electricty_bill", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ELECTRICITY_BILL" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "plumber_report", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PLUMBER_REPORT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "building_plan", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_BUILDING_PLAN" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "property_tax_reciept", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PROPERTY_TAX_RECEIPT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "meter_id", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_METER_ID" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "meter_installation_date", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_METER_INSTALLATION" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "initial_meter_reading", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_INITIAL_METER_READING" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "water_application", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_WATER_APPLICATION" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "correspondence_address", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_CORRESPONDENCE_ADDRESS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "Rs", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_RUPEE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + } + ] + }, + { + "externalAPI": [ + { + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.property.tenantId}')%5D", + "apiRequest": null, + "responseMapping": [ + { + "variable": "logoImage", + "value": "$.MdmsRes.tenant.tenants[0].logoId", + "type": "image" + }, + { + "variable":"mcGrade", + "value":"$.MdmsRes.tenant.tenants[0].city.pwssbGrade" + }, + { + "variable": "logo_header", + "value": "$.MdmsRes.tenant.tenants[0].code", + "localisation": { + "required": true, + "prefix": "TENANT_TENANTS", + "module": "rainmaker-common" + } + } + ] + } + ] + } + ] + } + ] + } +} diff --git a/configs/pdf-service/data-config/ws-bill.json b/configs/pdf-service/data-config/ws-bill.json new file mode 100644 index 00000000..1325d256 --- /dev/null +++ b/configs/pdf-service/data-config/ws-bill.json @@ -0,0 +1,843 @@ +{ + "key": "ws-bill", + "DataConfigs": { + "serviceName": "rainmaker-common", + "version": "1.0.0", + "baseKeyPath": "$.Bill.*", + "entityIdPath": "$.billNumber", + "isCommonTableBorderRequired": true, + "mappings": [ + { + "topic": "common-pdf-generation-1", + "staticConfigPath": "https://raw.githubusercontent.com/egovernments/egov-services/vishal-feature-filestore/core/egov-indexer/src/main/resources/rainmaker-pgr-indexer.yml", + "mappings": [ + { + "direct": [ + { + "variable": "total_amount_due", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_TOTAL_AMOUNT_DUE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "payer_name", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PAYER_NAME" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "Municipal_Corporation", + "value": { + "path": "PDF_STATIC_LABEL_MDMS_MUNICIPAL_CORPORATION" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "bill_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_BILL_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "Rs", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_RUPEE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "mobile_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_MOBILE_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "bill_period", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_BILL_PERIOD" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "payer_address", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PAYER_ADDRESS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "bill_issue_date", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ISSUE_DATE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "bill_due_date", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_BILL_DUE_DATE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "billing_summary_property_tax", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_BILLING_SUMMARY" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "serviceType", + "value": { + "path": "$.businessService" + }, + "localisation": { + "required": true, + "prefix": "MODULE", + "module": "rainmaker-common" + } + }, + { + "variable": "property_id", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PROPERTY_ID" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "arrears_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ARREARS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "advanceAdjusted_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ADVANCEADJUSTED" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "advanceAvailable_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ADVANCEAVAILABLE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "charge_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_CHARGE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "penalty_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_PENALTY" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "rebate_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_REBATE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "others_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_OTHERS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "total_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_TOTAL" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "important_message", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_IMPORTANT_MESSAGE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "payment_received", + "value": { + "path": "PDF_STATIC_LABEL_WS_BILL_PAYMENT_RECEIVED" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-ws" + } + }, + { + "variable": "this_document", + "value": { + "path": "PDF_STATIC_LABEL_WS_BILL_THIS_DOCUMENT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-ws" + } + }, + { + "variable": "this_is_a", + "value": { + "path": "PDF_STATIC_LABEL_WS_BILL_THIS_IS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-ws" + } + }, + { + "variable": "assessment_payment", + "value": { + "path": "PDF_STATIC_LABEL_WS_BILL_ASSESSSMENT_PAYMENT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-ws" + } + }, + { + "variable": "please_deposit", + "value": { + "path": "PDF_STATIC_LABEL_WS_BILL_PLEASE_DEPOSIT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-ws" + } + }, + { + "variable": "if_the_tax", + "value": { + "path": "PDF_STATIC_LABEL_WS_BILL_IF_THE_TAX" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-ws" + } + }, + { + "variable": "acknowledgement_for", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_ACKNOWLEDGEMENT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "date_label", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_DATE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "consumer_id", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_CONSUMER_ID" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "consumer_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_CONSUMER_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "name_address", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_NAME_ADDRESS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "total_payment", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_TOTAL_PAYMENT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "receivers_signature", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_BILL_RECEIVERS_SIGNATURE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "totalAmountDue", + "value": { + "path": "$.totalAmount" + } + }, + { + "variable": "total", + "value": { + "path": "$.totalAmount" + } + }, + { + "variable": "payerName", + "value": { + "path": "$.payerName" + } + }, + { + "variable": "mobileNo", + "value": { + "path": "$.mobileNumber" + } + }, + { + "variable": "oldConnectionNo", + "value": { + "path": "$.connection.oldConnectionNo" + } + }, { + "variable": "rate", + "value": { + "path": "$.additionalDetails.penaltyRate" + } + }, + { + "variable": "ledgerId", + "value": { + "path": "$.connection.additionalDetails.ledgerId" + } + }, + { + "variable": "payerAddress", + "value": { + "path": "$.payerAddress" + } + }, + { + "variable": "tenant", + "value": { + "path": "$.tenantId" + } + }, + { + "variable": "nameAddress", + "value": { + "path": "$.payerAddress" + } + }, + { + "variable": "billNo", + "value": { + "path": "$.billNumber" + } + }, + { + "variable": "fromPeriod", + "value": { + "path": "$.billDetails[0].fromPeriod" + }, + "type": "date" + }, + { + "variable": "toPeriod", + "value": { + "path": "$.billDetails[0].toPeriod" + }, + "type": "date" + }, + { + "variable": "billIssueDate", + "value": { + "path": "$.billDate" + }, + "type": "date" + }, + { + "variable": "billDueDate", + "value": { + "path": "$.billDetails[0].expiryDate" + }, + "type": "date" + }, + { + "variable": "billdate", + "value": { + "path": "$.billDate" + }, + "type": "date" + }, + { + "variable": "consumerCode", + "value": { + "path": "$.consumerCode" + } + }, + { + "variable": "taxCharge", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_TAX' || @.taxHeadCode == 'TL_TAX' || @.taxHeadCode == 'FIRENOC_TAXES' || @.taxHeadCode == 'WS_CHARGE' || @.taxHeadCode == 'SW_CHARGE' )].amount" + } + }, + { + "variable": "timeRebate", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_TIME_REBATE' || @.taxHeadCode == 'WS_TIME_REBATE' || @.taxHeadCode == 'SW_TIME_REBATE')].amount" + } + }, + { + "variable": "adhocRebate", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_ADHOC_REBATE' || @.taxHeadCode == 'TL_ADHOC_REBATE' || @.taxHeadCode == 'FIRENOC_ADHOC_REBATE')].amount" + } + }, + { + "variable": "timePenalty", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_TIME_PENALTY' || @.taxHeadCode == 'WS_TIME_PENALTY' || @.taxHeadCode == 'SW_TIME_PENALTY')].amount" + } + }, + { + "variable": "adhocPenalty", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_ADHOC_PENALTY' || @.taxHeadCode == 'TL_ADHOC_PENALTY' || @.taxHeadCode == 'FIRENOC_ADHOC_PENALTY')].amount" + } + }, + { + "variable": "firecess", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_FIRE_CESS')].amount" + } + }, + { + "variable": "usageExemption", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_UNIT_USAGE_EXEMPTION')].amount" + } + }, + { + "variable": "roundoff", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_ROUNDOFF' || @.taxHeadCode == 'TL_ROUNDOFF' || @.taxHeadCode == 'FIRENOC_ROUNDOFF' || @.taxHeadCode == 'WS_Round_Off' || @.taxHeadCode == 'SW_Round_Off')].amount" + } + }, + { + "variable": "fees", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'FIRENOC_FEES')].amount" + } + }, + { + "variable": "ownerExemption", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_OWNER_EXEMPTION')].amount" + } + }, + { + "variable": "cancerCess", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_CANCER_CESS')].amount" + } + }, + { + "variable": "waterCess", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'WS_WATER_CESS' || @.taxHeadCode == 'SW_SEWERAGE_CESS')].amount" + } + }, + { + "variable": "timeInterest", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_TIME_INTEREST' || @.taxHeadCode == 'WS_TIME_INTEREST' || @.taxHeadCode == 'SW_TIME_INTEREST')].amount" + } + }, + { + "variable": "ceilingDebit", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_DECIMAL_CEILING_DEBIT')].amount" + } + }, + { + "variable": "ceilingCredit", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'PT_DECIMAL_CEILING_CREDIT')].amount" + } + }, + { + "variable": "carryForward", + "value": { + "path": "$.billDetails[0].billAccountDetails[?(@.taxHeadCode == 'WS_ADVANCE_CARRYFORWARD' || @.taxHeadCode == 'SW_ADVANCE_CARRYFORWARD')].amount" + } + }, + { + "variable": "consumerID", + "value": { + "path": "$.consumerCode" + } + }, + { + "variable": "date", + "value": { + "path": "$.billDate" + }, + "type": "date" + }, + { + "variable": "totalPayment", + "value": { + "path": "$.billDetails[0].amountPaid" + } + }, + { + "variable": "WS_arrears", + "value": { + "path": "$.arrearAmount" + } + }, + { + "variable": "WS_AdvanceAdjusted", + "value": { + "path": "$.AdvanceAdjustedValue" + } + }, + { + "variable": "scissorImage", + "url": "http://www.pngall.com/wp-content/uploads/2016/03/Scissor-PNG-Clipart.png", + "type": "image" + } + ] + }, + { + "derived": [ + { + "variable": "charge", + "formula": "{{ws_charge}}" + }, + { + "variable": "penalty", + "formula": "{{timePenalty}}+{{adhocPenalty}}" + }, + { + "variable": "rebate", + "formula": "{{timeRebate}}+{{adhocRebate}}" + }, + { + "variable": "billOthers", + "formula": "{{cancerCess}}+{{roundoff}}+{{timeInterest}}+{{ceilingDebit}}+{{ceilingCredit}}+{{firecess}}+{{waterCess}}" + }, + { + "variable": "demandTotalAmount", + "formula": "{{ws_roundoff}}+{{ws_charge}}+{{ws_water_cess}}+{{ws_time_interest}}+{{ws_time_penalty}}" + }, + { + "variable": "billTotalAmount", + "formula": "{{total}}" + }, + { + "variable": "arrears", + "formula": "{{billTotalAmount}}>{{demandTotalAmount}}?({{billTotalAmount}}-{{demandTotalAmount}}).toFixed(2):0" + }, + { + "variable": "advanceAdjusted", + "formula": "{{billTotalAmount}}>=0?({{billTotalAmount}}<{{demandTotalAmount}}?({{billTotalAmount}}-{{demandTotalAmount}}).toFixed(2):0):{{demandTotalAmount}} * -1" + }, + { + "variable": "advanceAvailable", + "formula": "{{billTotalAmount}}<0?{{billTotalAmount}}*-1:0" + }, + { + "variable": "others", + "formula": "({{ws_roundoff}}+{{ws_water_cess}}+{{ws_time_interest}}).toFixed(2)" + }, + { + "variable": "calculatedTotal", + "formula": "{{billTotalAmount}}>0?{{billTotalAmount}}:0" + } + ] + }, + { + "externalAPI": [ + { + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", + "apiRequest": null, + "responseMapping": [ + { + "variable": "address", + "value": "$.MdmsRes.tenant.tenants[0].address" + }, + { + "variable": "phoneNumber", + "value": "$.MdmsRes.tenant.tenants[0].contactNumber" + }, { + "variable":"mcGrade", + "value":"$.MdmsRes.tenant.tenants[0].city.pwssbGrade" + }, + { + "variable": "website", + "value": "$.MdmsRes.tenant.tenants[0].domainUrl" + }, + { + "variable": "email", + "value": "$.MdmsRes.tenant.tenants[0].emailId" + }, + { + "variable": "logoImage", + "value": "$.MdmsRes.tenant.tenants[0].logoId", + "type": "image" + }, + { + "variable": "logo_header", + "value": "$.MdmsRes.tenant.tenants[0].code", + "localisation": { + "required": true, + "prefix": "TENANT_TENANTS", + "module": "rainmaker-common" + } + } + ] + }, + { + "path": "http://billing-service:8080/billing-service/demand/_search", + "queryParam": "tenantId=$.tenantId,consumerCode=$.consumerCode,businessService=WS,filter=%5B?(@.status=='ACTIVE')%5D", + "apiRequest": null, + "responseMapping": [ + { + "variable": "ws_advanceAmount", + "value": "$.Demands[(@.length-1)].demandDetails[?(@.taxHeadMasterCode == 'WS_ADVANCE_CARRYFORWARD')].taxAmount" + }, + { + "variable": "ws_roundoff", + "value": "$.Demands[(@.length-1)].demandDetails[?(@.taxHeadMasterCode == 'WS_Round_Off')].taxAmount" + }, + { + "variable": "ws_charge", + "value": "$.Demands[(@.length-1)].demandDetails[?(@.taxHeadMasterCode == 'WS_CHARGE')].taxAmount" + }, + { + "variable": "ws_water_cess", + "value": "$.Demands[(@.length-1)].demandDetails[?(@.taxHeadMasterCode == 'WS_WATER_CESS')].taxAmount" + }, + { + "variable": "ws_time_interest", + "value": "$.Demands[(@.length-1)].demandDetails[?(@.taxHeadMasterCode == 'WS_TIME_INTEREST')].taxAmount" + }, + { + "variable": "ws_time_penalty", + "value": "$.Demands[(@.length-1)].demandDetails[?(@.taxHeadMasterCode == 'WS_TIME_PENALTY')].taxAmount" + } + ] + }, + { + "path": "http://property-services.egov:8080/property-services/property/_search", + "queryParam": "tenantId=$.tenantId,propertyIds=$.connection.propertyId", + "apiRequest": null, + "responseMapping": [ + { + "variable": "usageType", + "value": "$.Properties[0].usageCategory" + }, + { + "variable": "plotSize", + "value": "$.Properties[0].landArea" + }, + { + "variable": "houseNo", + "value": "$.Properties[0].address.doorNo" + }, + { + "variable": "streetName", + "value": "$.Properties[0].address.street" + }, + { + "variable": "locality", + "value": "$.Properties[0].address.locality.name" + }, + { + "variable": "landmark", + "value": "$.Properties[0].address.landmark" + }, + { + "variable": "ownerName", + "value": "$.Properties[0].owners[0].name" + }, + { + "variable": "guardianName", + "value": "$.Properties[0].owners[0].fatherOrHusbandName" + } + + + ] + } + ] + } + ] + } + ] + } +} diff --git a/configs/pdf-service/data-config/ws-consolidatedacknowlegment.json b/configs/pdf-service/data-config/ws-consolidatedacknowlegment.json new file mode 100644 index 00000000..11439c33 --- /dev/null +++ b/configs/pdf-service/data-config/ws-consolidatedacknowlegment.json @@ -0,0 +1,687 @@ +{ + "key": "ws-consolidatedacknowlegment", + "DataConfigs": { + "serviceName": "rainmaker-common", + "version": "1.0.0", + "baseKeyPath": "$.WaterConnection.*", + "entityIdPath": "$.connectionNo", + "isCommonTableBorderRequired": true, + "mappings": [ + { + "topic": "common-pdf-generation-3", + "mappings": [ + { + "direct": [ + { + "variable": "consumerNo", + "value": { + "path": "$.connectionNo" + } + }, + { + "variable": "status", + "value": { + "path": "$.status" + } + }, + { + "variable": "connectionCategory", + "value": { + "path": "$.connectionCategory" + } + }, + { + "variable": "connectionType", + "value": { + "path": "$.connectionType" + } + }, + { + "variable": "meterID", + "value": { + "path": "$.meterId" + } + }, + { + "variable": "pipeSize", + "value": { + "path": "$.pipeSize" + } + }, + { + "variable": "connectionExecutionDate", + "value": { + "path": "$.connectionExecutionDate" + }, + "type": "date" + }, + { + "variable": "rainwaterHarvestingFacility", + "value": { + "path": "$.rainWaterHarvesting" + }, + "localisation": { + "required": true, + "prefix": "HARVESTING", + "module": "rainmaker-common" + } + }, + { + "variable": "waterSource", + "value": { + "path": "$.waterSource" + } + }, + { + "variable": "waterSubSource", + "value": { + "path": "$.waterSubSource" + } + }, + { + "variable": "propertyType", + "value": { + "path": "$.property.propertyType" + }, + "localisation": { + "required": true, + "prefix": "WS_PROPTYPE", + "module": "rainmaker-ws" + } + }, + { + "variable": "propertyUsageType", + "value": { + "path": "$.property.usageCategory" + }, + "localisation": { + "required": true, + "prefix": "WS_PROPUSGTYPE", + "module": "rainmaker-ws" + } + }, + { + "variable": "plotSize", + "value": { + "path": "$.property.landArea" + } + }, + { + "variable": "propertyID", + "value": { + "path": "$.property.propertyId" + } + }, + { + "variable": "city", + "value": { + "path": "$.property.address.city" + } + }, + { + "variable": "plot", + "value": { + "path": "$.property.address.doorNo" + } + }, + { + "variable": "building", + "value": { + "path": "$.property.address.buildingName" + } + }, + { + "variable": "streetName", + "value": { + "path": "$.property.address.street" + } + }, + { + "variable": "locality", + "value": { + "path": "$.property.address.locality.name" + } + }, + { + "variable": "pincode", + "value": { + "path": "$.property.address.pincode" + } + }, + { + "variable": "lat", + "value": { + "path": "$.property.address.locality.latitude" + } + }, + { + "variable": "long", + "value": { + "path": "$.property.address.locality.longitude" + } + }, + { + "variable": "ownerName", + "value": { + "path": "$.property.owners[0].name" + } + }, + { + "variable": "ownerMobileNumber", + "value": { + "path": "$.property.owners[0].mobileNumber" + } + }, + { + "variable": "gender", + "value": { + "path": "$.property.owners[0].gender" + }, + "localisation": { + "required": true, + "prefix": "COMMON_GENDER", + "module": "rainmaker-common" + } + }, + { + "variable": "guardian", + "value": { + "path": "$.property.owners[0].relationship" + } + }, + { + "variable": "guardianName", + "value": { + "path": "$.property.owners[0].fatherOrHusbandName" + } + }, + { + "variable": "ownerCategory", + "value": { + "path": "$.property.ownershipCategory" + }, + "localisation": { + "required": true, + "prefix": "WS_OWNERSHIPCATEGORY", + "module": "rainmaker-ws" + } + }, + { + "variable": "email", + "value": { + "path": "$.property.owners[0].emailId" + } + }, + { + "variable": "correspondenceAddress", + "value": { + "path": "$.property.owners[0].correspondenceAddress" + } + }, + { + "variable": "Municipal_Corporation", + "value": { + "path": "PDF_STATIC_LABEL_MDMS_MUNICIPAL_CORPORATION" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "logo_sub_header", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_LOGO_SUB_HEADER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "consumer_no", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_CONSUMER_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "status_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_STATUS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "service_details_header", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_SERVICE_DETAILS_HEADER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "service", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_SERVICE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "connection_category", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_CONNECTION_CAT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "connection_type", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_CONNECTION_TYPE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "meter_id", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_METER_ID" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "pipe_size", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PIPE_SIZE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "connection_execution_date", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_CONNECTION_EXECUTION_DATE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "rainwater_harvesting_facility", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_RAIN_HARV_FAC" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "water_source", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_WATER_SOURCE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "water_sub_source", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_WATER_SUB_SOURCE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "property_details_header", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PROPERTY_DETAILS_HEADER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "property_type", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PROPERTY_TYPE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "property_usage_type", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PROPERTY_USAGE_TYPE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "plot_size", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PLOT_SIZE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "property_ID", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PROPERTY_ID" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "city_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_CITY" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "plot_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PLOT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "building_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_BUILDING" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "street_name", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_STREET" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "locality_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_LOCALITY" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "pincode_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PINCODE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "location_on_map", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_LOCATION_ON_MAP" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "owner_details_header", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_OWNER_DETAILS_HEADER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "owner_name", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_OWNER_NAME" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "owner_mobile_number", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_OWNER_MOB_NUM" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "gender_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_GENDER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "guardian_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_GUARDIAN" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "guardian_name", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_GUARDIAN_NAME" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "owner_category", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_OWNER_CATEGORY" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "email_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_EMAIL" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "correspondence_address", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_CORR_ADDRESS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "water_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_WATER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + } + ] + }, + { + "externalAPI": [ + { + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.property.tenantId}')%5D", + "apiRequest": null, + "responseMapping":[ + { + "variable": "logoImage", + "value":"$.MdmsRes.tenant.tenants[0].logoId", + "type": "image" + }, + { + "variable":"mcGrade", + "value":"$.MdmsRes.tenant.tenants[0].city.pwssbGrade" + }, + { + "variable": "logo_header", + "value":"$.MdmsRes.tenant.tenants[0].code", + "localisation":{ + "required":true, + "prefix": "TENANT_TENANTS", + "module":"rainmaker-common" + } + } + ] + } + ] + } + ] + } + ] + }} diff --git a/configs/pdf-service/data-config/ws-consolidatedsewerageconnection.json b/configs/pdf-service/data-config/ws-consolidatedsewerageconnection.json new file mode 100644 index 00000000..090d96fd --- /dev/null +++ b/configs/pdf-service/data-config/ws-consolidatedsewerageconnection.json @@ -0,0 +1,574 @@ +{ + "key": "ws-consolidatedsewerageconnection", + "DataConfigs": { + "serviceName": "rainmaker-common", + "version": "1.0.0", + "baseKeyPath": "$.SewerageConnections.*", + "entityIdPath": "$.connectionNo", + "isCommonTableBorderRequired": true, + "mappings": [ + { + "topic": "common-pdf-generation-3", + "mappings": [ + { + "direct": [ + { + "variable": "consumerNo", + "value": { + "path": "$.connectionNo" + } + }, + { + "variable": "status", + "value": { + "path": "$.status" + } + }, + { + "variable": "connectionExecutionDate", + "value": { + "path": "$.connectionExecutionDate" + }, + "type": "date" + }, + { + "variable": "uom", + "value": { + "path": "$.uom" + } + }, + { + "variable": "propertyType", + "value": { + "path": "$.property.propertyType" + }, + "localisation": { + "required": true, + "prefix": "WS_PROPTYPE", + "module": "rainmaker-ws" + } + }, + { + "variable": "propertyUsageType", + "value": { + "path": "$.property.usageCategory" + }, + "localisation": { + "required": true, + "prefix": "WS_PROPUSGTYPE", + "module": "rainmaker-ws" + } + }, + { + "variable": "plotSize", + "value": { + "path": "$.property.landArea" + } + }, + { + "variable": "propertyID", + "value": { + "path": "$.property.propertyId" + } + }, + { + "variable": "city", + "value": { + "path": "$.property.address.city" + } + }, + { + "variable": "plot", + "value": { + "path": "$.property.address.doorNo" + } + }, + { + "variable": "building", + "value": { + "path": "$.property.address.buildingName" + } + }, + { + "variable": "streetName", + "value": { + "path": "$.property.address.street" + } + }, + { + "variable": "locality", + "value": { + "path": "$.property.address.locality.name" + } + }, + { + "variable": "pincode", + "value": { + "path": "$.property.address.pincode" + } + }, + { + "variable": "lat", + "value": { + "path": "$.WaterConnection[0].property.address.locality.latitude" + } + }, + { + "variable": "long", + "value": { + "path": "$.WaterConnection[0].property.address.locality.longitude" + } + }, + { + "variable": "ownerName", + "value": { + "path": "$.property.owners[0].name" + } + }, + { + "variable": "ownerMobileNumber", + "value": { + "path": "$.property.owners[0].mobileNumber" + } + }, + { + "variable": "gender", + "value": { + "path": "$.property.owners[0].gender" + } + }, + { + "variable": "guardian", + "value": { + "path": "$.property.owners[0].relationship" + } + }, + { + "variable": "guardianName", + "value": { + "path": "$.property.owners[0].fatherOrHusbandName" + } + }, + { + "variable": "ownerCategory", + "value": { + "path": "$.property.ownershipCategory" + }, + "localisation": { + "required": true, + "prefix": "WS_OWNERSHIPCATEGORY", + "module": "rainmaker-ws" + } + }, + { + "variable": "email", + "value": { + "path": "$.property.owners[0].emailId" + } + }, + { + "variable": "correspondenceAddress", + "value": { + "path": "$.property.owners[0].correspondenceAddress" + } + }, + { + "variable": "logoImage", + "url": "https://raw.githubusercontent.com/egovernments/egov-web-app/master/web/rainmaker/dev-packages/egov-ui-kit-dev/src/assets/images/pblogo.png", + "type": "image" + }, + { + "variable": "Municipal_Corporation", + "value": { + "path": "PDF_STATIC_LABEL_MDMS_MUNICIPAL_CORPORATION" + }, + "type": "label", + "localisation":{ + "required":true, + "prefix": null, + "module":"rainmaker-common" + } + }, + { + "variable": "logo_sub_header", + "value": { + "path": "PDF_STATIC_LABEL_SW_CONSOLIDATED_ACKNOWELDGMENT_LOGO_SUB_HEADER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "consumer_no", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_CONSUMER_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "status_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_STATUS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "service_details_header", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_SERVICE_DETAILS_HEADER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "service", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_SERVICE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "connection_execution_date", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_CONNECTION_EXECUTION_DATE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "unit_of_measurement", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_UNIT_OF_MEASUREMENT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "property_details_header", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PROPERTY_DETAILS_HEADER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "property_type", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PROPERTY_TYPE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "property_usage_type", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PROPERTY_USAGE_TYPE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "plot_size", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PLOT_SIZE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "property_ID", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PROPERTY_ID" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "city_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_CITY" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "plot_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PLOT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "building_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_BUILDING" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "street_name", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_STREET" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "locality_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_LOCALITY" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "pincode_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PINCODE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "location_on_map", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_LOCATION_ON_MAP" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "owner_details_header", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_OWNER_DETAILS_HEADER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "owner_name", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_OWNER_NAME" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "owner_mobile_number", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_OWNER_MOB_NUM" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "gender_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_GENDER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "guardian_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_GUARDIAN" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "guardian_name", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_GUARDIAN_NAME" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "owner_category", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_OWNER_CATEGORY" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "email_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_EMAIL" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "correspondence_address", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_CORR_ADDRESS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "sewarage_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_SEWERAGE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + } + ] + }, + { + "externalAPI": [ + { + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.property.tenantId}')%5D", + "apiRequest": null, + "responseMapping":[ + { + "variable": "logoImage", + "value":"$.MdmsRes.tenant.tenants[0].logoId", + "type": "image" + }, + { + "variable":"mcGrade", + "value":"$.MdmsRes.tenant.tenants[0].city.pwssbGrade" + }, + { + "variable": "logo_header", + "value":"$.MdmsRes.tenant.tenants[0].code", + "localisation":{ + "required":true, + "prefix": "TENANT_TENANTS", + "module":"rainmaker-common" + } + } + ] + } + ] + } + ] + } + ] + }} diff --git a/configs/pdf-service/data-config/ws-estimationnotice.json b/configs/pdf-service/data-config/ws-estimationnotice.json new file mode 100644 index 00000000..5900f99c --- /dev/null +++ b/configs/pdf-service/data-config/ws-estimationnotice.json @@ -0,0 +1,532 @@ +{ + "key": "ws-estimationnotice", + "DataConfigs": { + "serviceName": "rainmaker-common", + "version": "1.0.0", + "baseKeyPath": "$.WnsConnection.*", + "entityIdPath": "$.applicationNo", + "isCommonTableBorderRequired": true, + "mappings": [ + { + "topic": "common-pdf-generation-3", + "mappings": [ + { + "direct": [ + { + "variable": "appNo", + "value": { + "path": "$.applicationNo" + } + }, + { + "variable": "appDate", + "value": { + "path": "$.connectionExecutionDate" + }, + "type":"date" + }, + { + "variable": "name", + "value": { + "path": "$.property.owners[0].name" + } + }, + { + "variable": "guardianName", + "value": { + "path": "$.property.owners[0].fatherOrHusbandName" + } + }, + { + "variable": "usageType", + "value": { + "path": "$.property.usageCategory" + }, + "localisation":{ + "required":true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "houseNo", + "value": { + "path": "$.property.address.doorNo" + } + }, + { + "variable": "mobileNumber", + "value": { + "path": "$.property.owners[0].mobileNumber" + } + }, + { + "variable": "address", + "value": { + "path": "$.property.address.locality.name" + } + }, + { + "variable": "pincode", + "value": { + "path": "$.property.address.pincode" + } + }, + { + "variable": "formFee", + "value": { + "path": "$.pdfTaxhead[?(@.taxHeadCode == 'FORM_FEE')].estimateAmount" + } + }, + { + "variable": "ScrutinyFee", + "value": { + "path": "$.pdfTaxhead[?(@.taxHeadCode == 'SCRUTINY_FEE')].estimateAmount" + } + }, + { + "variable": "otherCharge", + "value": { + "path": "$.pdfTaxhead[?(@.taxHeadCode == 'OTHER_FEE')].estimateAmount" + } + }, + { + "variable": "securityCharge", + "value": { + "path": "$.pdfTaxhead[?(@.taxHeadCode == 'SECURITY_DEPOSIT')].estimateAmount" + } + }, + { + "variable": "taxCess", + "value": { + "path": "$.pdfTaxhead[?(@.taxHeadCode == 'TAX_AND_CESS')].estimateAmount" + } + }, + { + "variable": "roadCharge", + "value": { + "path": "$.pdfTaxhead[?(@.taxHeadCode == 'ROAD_CUTTING_CHARGE')].estimateAmount" + } + }, + { + "variable": "oneTimeFee", + "value": { + "path": "$.pdfTaxhead[?(@.taxHeadCode == 'ONE_TIME_FEE')].estimateAmount" + } + }, { + "variable": "connectionFee", + "value": { + "path": "$.pdfTaxhead[?(@.taxHeadCode == 'CONNECTION_FEE')].estimateAmount" + } + }, { + "variable": "compositionFee", + "value": { + "path": "$.pdfTaxhead[?(@.taxHeadCode == 'COMPOSITION_FEE')].estimateAmount" + } + },{ + "variable": "userCharges", + "value": { + "path": "$.pdfTaxhead[?(@.taxHeadCode == 'USER_CHARGE')].estimateAmount" + } + }, + { + "variable": "penaltyAmount", + "value": { + "path": "$.additionalDetails.adhocPenalty" + } + }, + { + "variable": "rebateAmount", + "value": { + "path": "$.additionalDetails.adhocRebate" + } + }, + { + "variable": "penaltyComments", + "value": { + "path": "$.additionalDetails.adhocPenaltyComment" + } + }, + { + "variable": "totalAmount", + "value": { + "path": "$.totalAmount" + } + }, + { + "variable": "service", + "value": { + "path": "$.service" + } + }, + { + "variable": "tenantName", + "value": { + "path": "$.tenantName" + } + }, + { + "variable": "logoImage", + "url": "https://raw.githubusercontent.com/egovernments/egov-web-app/master/web/rainmaker/dev-packages/egov-ui-kit-dev/src/assets/images/pblogo.png", + "type": "image" + }, + { + "variable": "estimation_notice_header", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ESTIMATION_NOTICE_HEADER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "UAT", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_UAT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "connection_header", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_CONNECTION_HEADER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "app_no", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_APPLICATION_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "app_date", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_APP_DATE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "user_name", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_USER_NAME" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "guardian_name", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_GUARDIAN" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "usage_type", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_USAGE_TYPE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "mobile_no", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_MOBILE_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "house_no", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_DOOR_HOUSE_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "user_address", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ADDRESS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "estimation_header", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ESTIMATION_HEADER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "sl_no", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_SERIAL_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "fee_estimate", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_FEES_ESTIMATE_HEADER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "amount", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_AMOUNT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "form_fee", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_FORM_FEE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "scrutiny_fee", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_SCRUTINY_FEE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "other_charge", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_OTHER_CHARGE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "security_charge", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_SECURITY_CHARGE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "tax_cess", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_TAX_CESS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "penalty", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PENALTY" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "rebate", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_REBATE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "comments", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PENALTY_COMMENTS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "grand_total", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_GRAND_TOTAL" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "approved_by", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_APPROVED_BY" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "one_time_fee", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ONE_TIME_FEE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "road_charge", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ROAD_CHARGE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + } + ] + }, + { + "externalAPI": [ + { + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.property.tenantId}')%5D", + "apiRequest": null, + "responseMapping": [ + { + "variable": "logoImage", + "value": "$.MdmsRes.tenant.tenants[0].logoId", + "type": "image" + }, + { + "variable":"mcGrade", + "value":"$.MdmsRes.tenant.tenants[0].city.pwssbGrade" + }, + { + "variable": "logo_header", + "value": "$.MdmsRes.tenant.tenants[0].code", + "localisation": { + "required": true, + "prefix": "TENANT_TENANTS", + "module": "rainmaker-common" + } + } + ] + } + ] + } + ] + } + ] + } +} diff --git a/configs/pdf-service/data-config/ws-onetime-receipt.json b/configs/pdf-service/data-config/ws-onetime-receipt.json new file mode 100644 index 00000000..9502c79b --- /dev/null +++ b/configs/pdf-service/data-config/ws-onetime-receipt.json @@ -0,0 +1,563 @@ +{ + "key": "ws-onetime-receipt", + "documentType": "CONSOLIDATED_RECEIPT", + "DataConfigs": { + "moduleName": "rainmaker-common", + "version": "1.0.0", + "baseKeyPath": "$.Payments.*", + "entityIdPath": "$.id", + "isCommonTableBorderRequired": true, + "mappings": [ + { + "topic": "common-pdf-generation-3", + "mappings": [ + { + "direct": [ + { + "variable": "payerName", + "value": { + "path": "$.payerName" + } + }, + { + "variable": "user-name", + "value": { + "path": "$.userInfo.name" + }, + "type": "selectFromRequestInfo" + }, + { + "variable": "payerContact", + "value": { + "path": "$.mobileNumber" + } + }, + { + "variable": "receiptNo", + "value": { + "path": "$.paymentDetails[0].receiptNumber" + } + }, + { + "variable": "serviceType", + "value": { + "path": "$.paymentDetails[0].businessService" + }, + "localisation": { + "required": true, + "prefix": "MODULE", + "module": "rainmaker-common" + } + }, + { + "variable": "serviceTypeTemp", + "value": { + "path": "$.paymentDetails[0].guardianName" + }, + "localisation": { + "required": true, + "prefix": "MODULE", + "module": "rainmaker-common" + } + }, + { + "variable": "propertyID", + "value": { + "path": "$.paymentDetails[0].propertyID" + }, + "localisation": { + "required": true, + "prefix": "MODULE", + "module": "rainmaker-common" + } + }, + { + "variable": "landMark", + "value": { + "path": "$.paymentDetails[0].landMark" + }, + "localisation": { + "required": true, + "prefix": "MODULE", + "module": "rainmaker-common" + } + }, + { + "variable": "communicationAddress", + "value": { + "path": "$.paymentDetails[0].communicationAddress" + }, + "localisation": { + "required": true, + "prefix": "MODULE", + "module": "rainmaker-common" + } + }, + { + "variable": "paidAmount", + "value": { + "path": "$.paymentDetails[0].totalAmountPaid" + } + }, + { + "variable": "fromPeriod", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].fromPeriod" + }, + "type": "date" + }, + { + "variable": "toPeriod", + "value": { + "path": "$.paymentDetails[0].bill.billDetails[0].toPeriod" + }, + "type": "date" + }, + { + "variable": "paymentMode", + "value": { + "path": "$.paymentMode" + }, + "localisation": { + "required": true, + "prefix": "COMMON_MASTERS_PAYMENTMODE", + "module": "rainmaker-common" + } + }, + { + "variable": "paymentDate", + "value": { + "path": "$.transactionDate" + }, + "type": "date" + }, + { + "variable": "consumerID", + "value": { + "path": "$.paymentDetails[0].bill.consumerCode" + } + }, + { + "variable": "transactionID", + "value": { + "path": "$.transactionNumber" + } + }, + { + "variable": "chequeDD", + "value": { + "path": "$.instrumentNumber" + } + }, + { + "variable": "chequeDDDate", + "value": { + "path": "$.instrumentDate" + }, + "type":"date" + }, + { + "variable": "bankName", + "value": { + "path": "$.additionalDetails[0].bankName" + } + }, { + "variable": "branchName", + "value": { + "path": "$.additionalDetails[0].branchName" + } + }, { + "variable": "ifsc", + "value": { + "path": "$.ifscCode" + } + }, + { + "variable": "var_paymentheads", + "value":{ + "path":"$.paymentDetails[0].additionalDetails.*"}, + "type":"array", + "format":{ + "type":"string", + "scema":[ + { + "variable":"taxheaddd", + "value": "taxhead" + }, + { + "variable":"amountt", + "value": "amount" + }] + } + }, + { + "variable": "dueAmount", + "value": { + "path": "$.paymentDetails[0].totalDue" + } + }, + { + "variable": "payment_receipt", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_RECEIPT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "receipt_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_RECEIPT_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "consumer_id", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_CONSUMER_NO_APP" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "payment_date", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_DATE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "payer_name", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYER_NAME" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "payer_contact", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYER_CONTACT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "service_type", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_SERVICE_TYPE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "billing_period", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_BILLING_PERIOD" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "paid_amount", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAID_AMOUNT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "bill_amount", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_BILL_AMOUNT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "advance_amount", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_ADVANCE_AMOUNT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "pending_amount", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PENDING_AMOUNT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "payment_mode", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_PAYMENT_MODE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "transaction_id", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_TRANSACTION_ID" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + + { + "variable": "generated_by", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_GENERATED_BY" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "commissioner/eo", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_COMMISSIONER_EO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "no_signature", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_NO_SIGNATURE_WATER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "disclamer", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "disclamer_1", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_FIRST_LINE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "disclamer_2", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_SECOND_LINE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "disclamer_3", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_THIRD_LINE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "disclamer_4", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_FOURTH_LINE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "disclamer_5", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_DISCLAIMER_FIFTH_LINE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "to", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_RECEIPT_TO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "Municipal_Corporation", + "value": { + "path": "PDF_STATIC_LABEL_MDMS_MUNICIPAL_CORPORATION" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + } + ] + }, + { + "derived": [ + { + "variable": "pendingAmount", + "formula": "{{paidAmount}}>{{dueAmount}}?0:{{dueAmount}}-{{paidAmount}}" + }, + { + "variable": "advanceAmount", + "formula": "{{paidAmount}}>{{dueAmount}}?{{paidAmount}}-{{dueAmount}}:0" + } + ] + }, + { + "externalAPI": [ + { + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.tenantId}')%5D", + "apiRequest": null, + "responseMapping": [ + { + "variable": "address", + "value": "$.MdmsRes.tenant.tenants[0].address" + }, + { + "variable":"mcGrade", + "value":"$.MdmsRes.tenant.tenants[0].city.pwssbGrade" + }, + { + "variable": "phoneNumber", + "value": "$.MdmsRes.tenant.tenants[0].contactNumber" + }, + { + "variable": "website", + "value": "$.MdmsRes.tenant.tenants[0].domainUrl" + }, + { + "variable": "email", + "value": "$.MdmsRes.tenant.tenants[0].emailId" + }, + { + "variable": "logoImage", + "value": "$.MdmsRes.tenant.tenants[0].logoId", + "type": "image" + }, + { + "variable": "logo-header", + "value": "$.MdmsRes.tenant.tenants[0].code", + "localisation": { + "required": true, + "prefix": "TENANT_TENANTS", + "module": "rainmaker-common" + } + } + ] + } + ] + } + ] + } + ] + } +} diff --git a/configs/pdf-service/data-config/ws-sanctionletter.json b/configs/pdf-service/data-config/ws-sanctionletter.json new file mode 100644 index 00000000..be75c69d --- /dev/null +++ b/configs/pdf-service/data-config/ws-sanctionletter.json @@ -0,0 +1,972 @@ +{ + "key": "ws-sanctionletter", + "DataConfigs": { + "serviceName": "rainmaker-common", + "version": "1.0.0", + "baseKeyPath": "$.WnsConnection.*", + "entityIdPath": "$.applicationNo", + "isCommonTableBorderRequired": true, + "mappings": [ + { + "topic": "common-pdf-generation-3", + "mappings": [ + { + "direct": [ + { + "variable": "tenantName", + "value": { + "path": "$.tenantName" + } + }, + { + "variable": "logoImage", + "url": "https://raw.githubusercontent.com/egovernments/egov-web-app/master/web/rainmaker/dev-packages/egov-ui-kit-dev/src/assets/images/pblogo.png", + "type": "image" + }, + { + "variable": "municipalCouncil", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_SUNAM_DEV_MUNICIPAL_COUNCIL" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "door_no", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_DOOR_NO_LABEL" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "sanctionLetter", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_SANCTION_LETTER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "dated", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_DATED_IN_LOWER_CASE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "order_message4", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_SEEKING_ESTIMATE_AMOUNT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "order_message5", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_PREPARATION_NOTICE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "order_message6", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_SERVICE_PAYMENT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "order_message7", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_SAID_PREMISES" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "order_message8", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_FURTHER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "order_message9", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_CONNECTION_SANCTIONED" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "order_message10", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_PLUMBER_INFO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "order_message11", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_BILLING_CYCLE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "estimation_notice_header", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ESTIMATION_NOTICE_HEADER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "UAT", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_UAT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "cityName", + "value": { + "path": "$.tenantName" + } + }, + { + "variable": "presentByName", + "value": { + "path": "$.commissionerName" + } + }, + { + "variable": "usageType", + "value": { + "path": "$.appUserType" + } + }, + { + "variable": "applicationNumber", + "value": { + "path": "$.applicationNo" + } + }, + { + "variable": "connectionExecutionDate", + "value": { + "path": "$.connectionExecutionDate" + }, + "type": "date" + }, + { + "variable": "applicationType", + "value": { + "path": "$.service" + } + }, + { + "variable": "service", + "value": { + "path": "$.service" + } + }, + { + "variable": "doorNo", + "value": { + "path": "$.property.address.doorNo" + } + }, + { + "variable": "locality", + "value": { + "path": "$.property.address.locality.name" + } + }, + { + "variable": "ownerName", + "value": { + "path": "$.property.owners[0].name" + } + }, + { + "variable": "plumberName", + "value": { + "path": "$.plumberInfo[0].name" + } + }, + { + "variable": "licenceNo", + "value": { + "path": "$.plumberInfo[0].licenseNo" + } + }, + { + "variable": "contactNo", + "value": { + "path": "$.plumberInfo[0].mobileNumber" + } + }, + { + "variable": "slaDate", + "value": { + "path": "$.slaDate" + }, + "type": "date" + }, + { + "variable": "order_message14", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_CONCERNED_PLUMBER_CONTACT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "order_message15", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_SLA_DATE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "order_message12", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_CONCERNED_PLUMBER_ALLOTED" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "order_message13", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_CONCERNED_PLUMBER_LICENCE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "formFee", + "value": { + "path": "$.pdfTaxhead[?(@.taxHeadCode == 'FORM_FEE')].estimateAmount" + } + }, + { + "variable": "ScrutinyFee", + "value": { + "path": "$.pdfTaxhead[?(@.taxHeadCode == 'SCRUTINY_FEE')].estimateAmount" + } + }, + { + "variable": "otherCharge", + "value": { + "path": "$.pdfTaxhead[?(@.taxHeadCode == 'OTHER_CHARGE')].estimateAmount" + } + }, + { + "variable": "securityCharge", + "value": { + "path": "$.pdfTaxhead[?(@.taxHeadCode == 'SECURITY_CHARGE')].estimateAmount" + } + }, + { + "variable": "taxCess", + "value": { + "path": "$.pdfTaxhead[?(@.taxHeadCode == 'TAX_AND_CESS')].estimateAmount" + } + }, + { + "variable": "roadCharge", + "value": { + "path": "$.pdfTaxhead[?(@.taxHeadCode == 'ROAD_CUTTING_CHARGE')].estimateAmount" + } + }, + { + "variable": "oneTimeFee", + "value": { + "path": "$.pdfTaxhead[?(@.taxHeadCode == 'ONE_TIME_FEE')].estimateAmount" + } + }, + { + "variable": "penaltyAmount", + "value": { + "path": "$.additionalDetails.adhocPenalty" + } + }, + { + "variable": "rebateAmount", + "value": { + "path": "$.additionalDetails.adhocRebate" + } + }, + { + "variable": "totalAmount", + "value": { + "path": "$.totalAmount" + } + }, + { + "variable": "tenantName", + "value": { + "path": "$.tenantName" + } + }, + { + "variable": "date", + "value": { + "path": "$.connectionExecutionDate" + }, + "type": "date" + }, + { + "variable": "appCreatedDate", + "value": { + "path": "$.additionalDetails.appCreatedDate" + }, + "type": "date" + }, + { + "variable": "sanctionLetterDate", + "value": { + "path": "$.sanctionLetterDate" + }, + "type": "date" + }, + { + "variable": "estimationLetterDate", + "value": { + "path": "$.additionalDetails.estimationLetterDate" + }, + "type": "date" + }, + { + "variable": "total", + "value": { + "path": "PDF_STATIC_LABELWS_CONSOLIDATED_ACKNOWELDGMENT_TOTAL" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "Rs", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_RUPEE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "Municipal_Corporation", + "value": { + "path": "PDF_STATIC_LABEL_WS_MDMS_MUNICIPAL_CORPORATION_LOGO_HEADER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "presented_by", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PRESENTED_BY" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "commissioner_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_COMMISSIONER_LABEL" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "app_no", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_ACKNOWELDGMENT_APPLICATION_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "date_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_DATE_LABEL" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "sub_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_SUBJECT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "ref_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_REFERENCE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "total_amount", + "value": { + "path": "PDF_STATIC_LABEL_CONSOLIDATED_TLAPP_TOTAL_AMOUNT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "sub_data1", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_SUB_DATA1" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "sub_data2", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_SUB_DATA2" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "locality_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_LOCALITY_LABEL" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "order_issued", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ORDER_ISSUED" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "ref_message1", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_REF_MESSAGE1" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "dated_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_DATED_LABEL" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "ref_message2", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ESTIMATION_NOTICE_NO" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "order_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ORDER_LABEL" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "in_ref_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ORDER_DESCRIPTION" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "order_message1", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ORDER_MESSAGE1" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "order_message2", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_SEEKING" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "order_message3", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_WATER_TAP_CONNECTION" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "order_data2", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ORDER_DATA2" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "order_data3", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ORDER_DATA3" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "for_commissioner_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_APPROVAL_EXECUTIVE_OFFICER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "to_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_TO_LABEL" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "sri_smt_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_SRI_SMT_LABEL" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "door_no_label", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_DOOR_NO_LABEL" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "copy_message1", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_COPY_MESSAGE1" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "copy_message-sub1", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_COPY_MESSAGE_SUB1" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "copy_message2", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_COPY_MESSAGE2" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "UAT", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_UAT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "form_fee", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_FORM_FEE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "scrutiny_fee", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_SCRUTINY_FEE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "other_charge", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_OTHER_CHARGE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "security_charge", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_SECURITY_CHARGE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "tax_cess", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_TAX_CESS" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "penalty", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_PENALTY" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "rebate", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_REBATE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "one_time_fee", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ONE_TIME_FEE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "approved_by", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_COMPUTER_GENERATED_DOCUMENT" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "connection_header", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_CONNECTION_HEADER" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + }, + { + "variable": "road_charge", + "value": { + "path": "PDF_STATIC_LABEL_WS_CONSOLIDATED_ACKNOWELDGMENT_ROAD_CHARGE" + }, + "type": "label", + "localisation": { + "required": true, + "prefix": null, + "module": "rainmaker-common" + } + } + ] + }, + { + "externalAPI": [ + { + "path": "http://egov-mdms-service:8080/egov-mdms-service/v1/_get", + "queryParam": "moduleName=tenant&masterName=tenants&tenantId=pb&filter=%5B?(@.code=='{$.property.tenantId}')%5D", + "apiRequest": null, + "responseMapping": [ + { + "variable": "logoImage", + "value": "$.MdmsRes.tenant.tenants[0].logoId", + "type": "image" + }, + { + "variable":"mcGrade", + "value":"$.MdmsRes.tenant.tenants[0].city.pwssbGrade" + }, + { + "variable": "logo_header", + "value": "$.MdmsRes.tenant.tenants[0].code", + "localisation": { + "required": true, + "prefix": "TENANT_TENANTS", + "module": "rainmaker-common" + } + } + ] + } + ] + } + ] + } + ] + }} diff --git a/configs/pdf-service/format-config/bill-amendment-note.json b/configs/pdf-service/format-config/bill-amendment-note.json new file mode 100644 index 00000000..e6d16b50 --- /dev/null +++ b/configs/pdf-service/format-config/bill-amendment-note.json @@ -0,0 +1,549 @@ +{ + "key": "bill-amendment-credit-note", + "config": { + "defaultStyle": { + "font": "Cambay" + }, + + "content": [ + { + "style": "noc-head", + "table": { + "widths": [ + 60, + "*", + 120 + ], + "color":"#484848", + "body": [ + [ + { + "image": "{{logoImage}}", + "width": 50, + "height": 61.25 + }, + { + "stack": [ + { + "text": "{{logo-header}} {{mcGrade}}", + "style": "receipt-logo-header" + }, + { + "text": "{{note_type}}", + "style": "receipt-logo-sub-header" + } + ], + "alignment": "left", + "margin": [ + 0, + 10, + 0, + 0 + ] + }, + { + "stack": [ + { + "text": "{{address}}" + }, + { + "text": "{{phoneNumber}}" + }, + { + "text": "{{website}}" + }, + { + "text": "{{email}}" + } + ], + "alignment": "right", + "color": "#484848", + "margin": [ + -100, + 0, + -25, + 0 + ] + } + ] + ] + }, + "layout": "noBorders" + }, + + { + "style": "note-info", + "columns": [ + { + "text": [ + { + "text": "{{note_id}} ", + "bold": true + }, + { + "text": "{{applicationNo}}", + "bold": false + } + ], + "alignment": "left" + }, + { + "text": [ + { + "text": "{{note_date}}", + "bold": true + }, + { + "text": "{{date}}", + "bold": false + } + ], + "alignment": "right", + "margin": [ + 0, + 0, + -10, + 1 + ] + } + ] + }, + + { + "style": "header", + "columns": [ + { + "text": [ + { + "text": "{{against}}", + "bold": true + } + ], + "alignment": "left" + } + ] + }, + { + "style": "header-1", + "text": "{{user-name}}", + "alignment": "left" + }, + { + "style": "header-1", + "text": "{{permanentAddress}}", + "alignment": "left" + }, + { + "style": "header", + "text": " ", + "alignment": "left" + }, + + { + "style": "note-info-1", + "columns": [ + { + "text": [ + { + "text": "{{adjustment_amount_details}}", + "bold": true + } + ], + "alignment": "left" + }, + { + "text": [ + { + "text": "{{total_amount}}", + "bold": true + } + ], + "alignment": "right", + "margin": [ + 0, + 0, + -200, + 1 + ] + }, + { + "text": [ + { + "text": "{{rs}} {{totalAmount}}", + "bold": true + } + ], + "alignment": "right", + "fontSize": 20, + "margin": [ + 0, + 25, + -10, + 1 + ] + } + ] + }, + + { + "style": "ws-table", + "table": { + "widths": [ + "70%" + ], + "body": [ + [ + { + "table": { + "widths": [ + "10%", + "30%", + "30%" + ], + "body": [ + [ + { + "text": "{{sl_no}}", + "alignment": "center" + }, + { + "text": "{{tax_heads}}", + "alignment": "left" + }, + { + "text": "{{reduced_amount}}", + "alignment": "right" + } + ], + [ + { + "text": "1.", + "alignment": "center" + }, + { + "text": "{{water_tax}}", + "alignment": "left" + }, + { + "text": "{{waterTax}}", + "alignment": "right" + } + ], + [ + { + "text": "2.", + "alignment": "center" + }, + { + "text": "{{water_cess}}", + "alignment": "left" + }, + { + "text": "{{waterCess}}", + "alignment": "right" + } + ], + [ + { + "text": "3.", + "alignment": "center" + }, + { + "text": "{{interest}}", + "alignment": "left" + }, + { + "text": "{{interestAmount}}", + "alignment": "right" + } + ], + [ + { + "text": "4.", + "alignment": "center" + }, + { + "text": "{{penalty}}", + "alignment": "left" + }, + { + "text": "{{penaltyAmount}}", + "alignment": "right" + } + ], + [ + { + "text": "5.", + "alignment": "center" + }, + { + "text": "{{arrears}}", + "alignment": "left" + }, + { + "text": "{{arrearsAmount}}", + "alignment": "right" + } + ], + [ + { + "text": " " + }, + { + "text": "{{total_amount}}", + "alignment": "left" + }, + { + "text": "{{totalAmount}}", + "alignment": "right" + } + ] + ] + }, + "border": [ + false, + false, + false, + false + ] + } + ] + ] + }, + "layout": {} + }, + + { + "style": "ws-table-1", + "table": { + "widths": [ + "130%" + ], + "body": [ + [ + { + "table": { + "widths": [ + "120%" + ], + "body": [ + [ + { + "text": "{{box_note}}", + "alignment": "left" + } + ] + ] + }, + "border": [ + false, + false, + false, + false + ] + } + ] + ] + }, + "layout": {} + }, + + { + "style": "header", + "text": " ", + "alignment": "left" + }, + + { + "style": "receipt-approver", + "columns": [ + { + "text": [ + { + "text": "{{generated_by}}: ", + "bold": true + }, + { + "text": "{{user-name}}", + "bold": false + } + ], + "alignment": "left" + }, + { + "text": [ + { + "text": "{{commissioner/eo}}", + "bold": true + } + ], + "alignment": "right", + "margin": [ + 0, + 0, + -10, + 1 + ] + } + ] + }, + + { + "style": "no-signature", + "text": "{{no_signature}}" + }, + + { + "style": "no-signature", + "text": "{{box_validity}}" + } + ], + + "styles": { + "noc-head": { + "margin": [ + -30, + -30, + 0, + 1 + ] + }, + "ws-head": { + "margin": [ + -39, + -38, + -38, + 0 + ] + }, + "receipt-logo-header": { + "color": "#000000", + "fontSize": 14, + "bold": true, + "letterSpacing": 0.74, + "margin": [ + 0, + 0, + 0, + 5 + ] + }, + "ws-table": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -25, + 18, + -8, + 10 + ] + }, + "ws-table-1": { + "fontSize": 12, + "color": "#000000", + "margin": [ + 380, + -120, + 20, + 10 + ] + }, + "receipt-logo-sub-header": { + "color": "#000000", + "fontSize": 12, + "letterSpacing": 0.6 + }, + "receipt-table-value": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 8, + 8, + 0, + 8 + ] + }, + "receipt-table": { + "color": "#000000", + "bold": false, + "fontSize": 12, + "fontWeight": 400, + "margin": [ + -10, + 8, + 0, + 8 + ] + }, + "header": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + -25, + 15, + 0, + -10 + ] + }, + "header-1": { + "color": "#000000", + "bold": false, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + -25, + 15, + 0, + -10 + ] + }, + "receipt-approver": { + "fontSize": 12, + "bold": true, + "margin": [ + -27, + 50, + -10, + 0 + ], + "color": "#484848" + }, + "note-info": { + "fontSize": 12, + "bold": true, + "margin": [ + -27, + 10, + -10, + 0 + ], + "color": "#000000" + }, + "note-info-1": { + "fontSize": 12, + "bold": true, + "margin": [ + -27, + 10, + -10, + -45 + ], + "color": "#000000" + }, + "no-signature": { + "fontSize": 12, + "margin": [ + -27, + 10, + -10, + 0 + ], + "color": "#484848" + } + } + } +} diff --git a/configs/pdf-service/format-config/bill-amendment.json b/configs/pdf-service/format-config/bill-amendment.json new file mode 100644 index 00000000..700c7dd9 --- /dev/null +++ b/configs/pdf-service/format-config/bill-amendment.json @@ -0,0 +1,546 @@ +{ + "key": "bill-amendment-summary", + "config": { + "defaultStyle": { + "font": "Cambay" + }, + + "content": [ + { + "style": "noc-head", + "table": { + "widths": [ + 60, + "*", + 120 + ], + "color":"#484848", + "body": [ + [ + { + "image": "{{logoImage}}", + "width": 50, + "height": 61.25 + }, + { + "stack": [ + { + "text": "{{logo-header}} {{mcGrade}}", + "style": "receipt-logo-header" + }, + { + "text": "{{serviceType}} department", + "style": "receipt-logo-sub-header" + } + ], + "alignment": "left", + "margin": [ + 0, + 10, + 0, + 0 + ] + }, + { + "stack": [ + { + "text": "{{address}}" + }, + { + "text": "{{phoneNumber}}" + }, + { + "text": "{{website}}" + }, + { + "text": "{{email}}" + } + ], + "alignment": "right", + "color": "#484848", + "margin": [ + -100, + 0, + -25, + 0 + ] + } + ] + ] + }, + "layout": "noBorders" + }, + + { + "columns": [ + { + "text": "{{bill_amendment_application}}", + "style": "ws-header", + "margin": [ + 0, + 0, + 10, + 10 + ] + }, + { + "text": "{{bill_amendment_application_number}}", + "alignment": "right", + "margin": [ + 0, + 0, + -50, + 10 + ] + }, + { + "text": "{{applicationNo}}", + "alignment": "right", + "bold": true, + "margin": [ + -150, + 0, + -20, + 0 + ] + } + ], + "margin": [ + -26, + 10, + 0, + 0 + ] + }, + + { + "columns": [ + { + "text": "{{adjustment_amount_details}}", + "style": "header" + } + ] + }, + + { + "style": "ws-table", + "table": { + "widths": [ + "102%" + ], + "body": [ + [ + { + "table": { + "widths": [ + "10%", + "45%", + "45%" + ], + "body": [ + [ + { + "text": "{{sl_no}}", + "alignment": "center" + }, + { + "text": "{{tax_heads}}", + "alignment": "center" + }, + { + "text": "{{reduced_amount}}", + "alignment": "center" + } + ], + [ + { + "text": "1.", + "alignment": "center" + }, + { + "text": "{{water_tax}}", + "alignment": "left" + }, + { + "text": "{{waterTax}}", + "alignment": "right" + } + ], + [ + { + "text": "2.", + "alignment": "center" + }, + { + "text": "{{water_cess}}", + "alignment": "left" + }, + { + "text": "{{waterCess}}", + "alignment": "right" + } + ], + [ + { + "text": "3.", + "alignment": "center" + }, + { + "text": "{{interest}}", + "alignment": "left" + }, + { + "text": "{{interestAmount}}", + "alignment": "right" + } + ], + [ + { + "text": "4.", + "alignment": "center" + }, + { + "text": "{{penalty}}", + "alignment": "left" + }, + { + "text": "{{penaltyAmount}}", + "alignment": "right" + } + ], + [ + { + "text": "5.", + "alignment": "center" + }, + { + "text": "{{arrears}}", + "alignment": "left" + }, + { + "text": "{{arrearsAmount}}", + "alignment": "right" + } + ], + [ + { + "text": " " + }, + { + "text": "{{total_amount}}", + "alignment": "left" + }, + { + "text": "{{totalAmount}}", + "alignment": "right" + } + ] + ] + }, + "border": [ + false, + false, + false, + false + ] + } + ] + ] + }, + "layout": {} + }, + { + "text": "{{demand_revision_basis_details}}", + "bold": true, + "alignment": "left", + "style": "header" + }, + { + "style": "ws-table", + "table": { + "widths": [ + "102%" + ], + "body": [ + [ + { + "table": { + "widths": [ + "33%", + "33%", + "33%" + ], + "body": [ + [ + { + "text": "{{demand_revision_basis}}", + "alignment": "center", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{court_order_no}}", + "alignment": "center", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{with_effect_from}}", + "alignment": "center", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + } + ], + [ + { + "text": "{{demandRevisionBasis}}", + "alignment": "center", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{courtOrderNo}}", + "alignment": "center", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{withEffectFrom}}", + "alignment": "center", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + } + ] + ] + }, + "border": [ + true, + true, + true, + true + ] + } + ] + ] + }, + "layout": {} + }, + { + "text": "Documents", + "style": "header" + }, + { + "style": "ws-table", + "table": { + "widths": [ + "102%" + ], + "body": [ + [ + { + "table": { + "widths": [ + "33%", + "33%", + "33%" + ], + "body": [ + [ + { + "text": "{{court_order}}", + "alignment": "center", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{self_declaration}}", + "alignment": "center", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{past_bills}}", + "alignment": "center", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + } + ], + [ + { + "text": "{{courtOrder}}", + "alignment": "center", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{selfDeclaration}}", + "alignment": "center", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{pastBills}}", + "alignment": "center", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + } + ] + ] + }, + "border": [ + true, + true, + true, + true + ] + } + ] + ] + }, + "layout": {} + } + ], + + "styles": { + "noc-head": { + "margin": [ + -30, + -30, + 0, + 1 + ] + }, + "ws-head": { + "margin": [ + -39, + -38, + -38, + 0 + ] + }, + "receipt-logo-header": { + "color": "#000000", + "fontSize": 14, + "bold": true, + "letterSpacing": 0.74, + "margin": [ + 0, + 0, + 0, + 5 + ] + }, + "ws-table": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -25, + 18, + -8, + 10 + ] + }, + "receipt-logo-sub-header": { + "color": "#000000", + "fontSize": 12, + "letterSpacing": 0.6 + }, + "receipt-table-value": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 8, + 8, + 0, + 8 + ] + }, + "receipt-table": { + "color": "#000000", + "bold": false, + "fontSize": 12, + "fontWeight": 400, + "margin": [ + -10, + 8, + 0, + 8 + ] + }, + "header": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + -25, + 15, + 0, + -10 + ] + } + } + } +} diff --git a/configs/pdf-service/format-config/bpa-revocation.json b/configs/pdf-service/format-config/bpa-revocation.json new file mode 100644 index 00000000..43731998 --- /dev/null +++ b/configs/pdf-service/format-config/bpa-revocation.json @@ -0,0 +1,171 @@ +{ + "key": "bpa-revocation", + "config": { + "defaultStyle": { + "font": "Cambay" + }, + "content": [ + { + "columns": [ + { + "image": "{{logoImage}}", + "width": 70, + "height": 70, + "alignment": "left" + }, + { + "stack": [ + { + "text": "{{tenantName}} {{Muncipal_Council}}", + "style": "header" + }, + { + "text": "{{Revocation_Title}}", + "style": "sub-header" + } + ] + }, + { + "image": "{{logoImage}}", + "width": 70, + "height": 70, + "alignment": "right" + } + ] + }, + { + "columns": [ + { + "text": [ + { + "text": "{{Dated}} : ", + "bold": true + }, + { + "text": "{{createdDate}}", + "bold": true + } + ], + "alignment": "right" + } + ], + "style": "top-margin" + }, + { + "text": [ + { + "text": "{{SALUTATION}} " + }, + { + "text": "{{ownerName}},", + "bold": true + } + ], + "style": "top-margin" + }, + { + "text": [ + { + "text": "{{Permision_Issued}} " + }, + { + "text": "{{planPermissionNo}}", + "bold": true, + "font": "Roboto" + }, + { + "text": " {{WRT_APPNO}} " + }, + { + "text": "{{applicationNo}}", + "bold": true, + "font": "Roboto" + }, + { + "text": " {{dated}} " + }, + { + "text": "{{createdDate}}", + "bold": true + }, + { + "text": " {{isRevocated}}. " + } + ], + "style": "top-low-margin" + }, + { + "text": [ + { + "text": "{{revocationReasonIs}}" + }, + { + "text": " {{revocationReason}}.", + "bold": true + }, + { + "text": " {{noAuthText}}." + } + ], + "style": "top-low-margin" + }, + { + "text": [ + { + "text": "{{contactULB}}." + } + ], + "style": "top-low-margin" + }, + { + "stack": [ + { + "text": "{{BY_ORDER}}", + "style": "top-margin" + }, + { + "text": "{{AUTH_OFFICER}}", + "margin": 2 + }, + { + "text": "{{revocatedBy}}", + "margin": 2 + } + ], + "alignment": "right", + "style": "top-margin" + } + ], + "styles": { + "header": { + "bold": true, + "alignment": "center" + }, + "sub-header": { + "alignment": "center", + "margin": [ + 0, + 5, + 0, + 5 + ] + }, + "top-margin": { + "margin": [ + 0, + 30, + 0, + 0 + ] + }, + "top-low-margin": { + "margin": [ + 0, + 10, + 0, + 0 + ] + } + } + } +} diff --git a/configs/pdf-service/format-config/buildingpermit-low.json b/configs/pdf-service/format-config/buildingpermit-low.json new file mode 100644 index 00000000..f565545f --- /dev/null +++ b/configs/pdf-service/format-config/buildingpermit-low.json @@ -0,0 +1,328 @@ +{ + "key": "buildingpermit-low", + "config": { + "defaultStyle": { + "font": "Cambay" + }, + "content": [ + { + "text" : "{{GENERATED_ON}} : ", + "absolutePosition" : { + "x" : 400, + "y" : 5 + } + }, + { + "text" : " {{orderGeneratedOn}}", + "absolutePosition" : { + "x" : 500, + "y" : 5 + } + }, + { + "columns": [ + { + "image": "{{logoImage}}", + "width": 70, + "height": 70, + "alignment": "left" + }, + { + "stack": [ + { + "text": "{{tenantName}} {{Muncipal_Council}}", + "style": "header" + }, + { + "text": "{{BPA_FORM}}", + "style": "sub-header" + }, + { + "text": "{{BPA_FORM_APPROVAL}}", + "style": "header" + }, + { + "text": "{{BPA_BYELAWS}}", + "style": "sub-header" + } + ] + }, + { + "image": "{{logoImage}}", + "width": 70, + "height": 70, + "alignment": "right" + } + ] + }, + { + "columns": [ + { + "text": [ + { + "text": "{{PLAN_PERMISION_NO}} : ", + "bold": true + }, + { + "text": "{{planPermissionNo}}", + "bold": true, + "font": "Roboto" + } + ], + "alignment": "left", + "width": "*" + } + ], + "style": "top-margin" + }, + { + "text": [ + { + "text": "{{WRT_TXT}}" + }, + { + "text" : " {{applicationNo}}", + "bold" : true, + "font": "Roboto" + }, + { + "text" : " {{dated}}" + }, + { + "text" : " {{applicationDate}}" + }, + { + "text" : ", {{PERMISSION_GRANT_TXT}} : " + } + ], + "style": "top-margin" + }, + { + "text": [ + { + "text": "{{SALUTATION}} " + }, + { + "text": "{{favourOf}}", + "bold": true + }, + { + "text": " {{FOR}} " + } + ], + "style": "top-margin" + }, + { + "text": [ + { + "text": "{{DSCR1}} {{PLOT_NO}} {{CS_PLOT}}" + }, + { + "text": " {{plotNo}}", + "bold": true + }, + { + "text": " {{PLOT_NO}} {{MSP_PLOT}} " + }, + { + "text": "{{plotNo}}", + "bold": true + }, + { + "text": " {{KHATA_NO}} " + }, + { + "text": "{{khataNo}}", + "bold": true + }, + { + "text": " {{HOLDING_NO}} " + }, + { + "text": "{{holdingNo}}", + "bold": true + }, + { + "text" : " {{SERVEY_NO}} " + }, + { + "text" : "{{reServeyPlotNo}}", + "bold" : true + }, + { + "text" : " {{TOWNPLANNING_TXT}} " + }, + { + "text" : "{{townPlanningScheme}}", + "bold" : true + }, + { + "text" : " {{PROPOSE_LAND}} " + }, + { + "text" : "{{proposedLandUse}}", + "bold" : true + }, + { + "text": " {{OF}} " + }, + { + "text": "{{tenantName}} {{BPA_PDF_MUNCIPAL}}", + "bold": true + }, + { + "text": " {{CONDNS_TXT}}" + } + ] + }, + { + "separator": ")", + "ol": ["{{conditions}}"] + }, + { + "stack": [ + { + "text": "{{PERMIT_DETAILS_TXT}}," + } + ], + "bold": true, + "style": "top-margin" + }, + { + "table": { + "widths": [ + "auto", + "auto" + ], + "body": [ + [ + { + "text" : "{{FEE_DSCR}}", + "alignment" : "center", + "bold" : true + }, + { + "text" : "{{AMOUNT}}", + "bold" : true, + "alignment" : "right" + } + ], + "{{#paymentDetails}}[{ \"text\":\"{{headCode}}\", \"border\":[ true, true, true, true ],\"alignment\": \"center\"},{ \"text\":\"{{amnt}}\", \"border\":[ true, true, true, true ],\"alignment\": \"right\"}]{{/paymentDetails}}", + [ + { + "text" : "{{TOTAL}}", + "alignment" : "center" + }, + { + "text" : "{{totalDue}}", + "alignment" : "right" + } + ] + ] + }, + "margin": [ + 0, + 5, + 0, + 0 + ] + }, + { + "stack": [ + { + "text": "{{BY_ORDER}}", + "style": "top-margin" + }, + { + "text": "{{AUTH_OFFICER}}", + "margin": 2 + }, + { + "text": "{{tenantName}}", + "margin": 2 + } + ], + "alignment": "right", + "style": "top-margin" + }, + { + "text" : [ + { + "text" : "{{AUTH_DSCR}}" + } + ] + }, + { + "text": [ + { + "text": "{{VALIDITY_DSCR}} " + }, + { + "text": "{{validityDate}}" + }, + { + "text": " {{ONLY}}." + } + ], + "style": "top-margin", + "bold": true + }, + { + "text": "{{NOTE}} : ", + "bold": true, + "style": "top-margin" + }, + { + "text": [ + { + "text" : "{{SUMMARY1}}" + }, + { + "text" : " {{Bihar_Tenant}} " + }, + { + "text" : "{{SUMMARY2}}." + } + ], + "style": "top-margin" + }, + { + "image": "{{qrCode}}", + "alignment": "right", + "width": 100, + "height": 100 + } + ], + "styles": { + "header": { + "bold": true, + "alignment": "center" + }, + "sub-header": { + "alignment": "center", + "margin": [ + 0, + 5, + 0, + 5 + ] + }, + "top-margin": { + "margin": [ + 0, + 10, + 0, + 0 + ] + }, + "top-high-margin": { + "margin": [ + 0, + 30, + 0, + 0 + ] + } + } + } +} diff --git a/configs/pdf-service/format-config/buildingpermit.json b/configs/pdf-service/format-config/buildingpermit.json new file mode 100644 index 00000000..0bb95339 --- /dev/null +++ b/configs/pdf-service/format-config/buildingpermit.json @@ -0,0 +1,341 @@ +{ + "key": "buildingpermit", + "config": { + "defaultStyle": { + "font": "Cambay" + }, + "content": [ + { + "text" : "{{GENERATED_ON}} : ", + "absolutePosition" : { + "x" : 400, + "y" : 5 + } + }, + { + "text" : " {{orderGeneratedOn}}", + "absolutePosition" : { + "x" : 500, + "y" : 5 + } + }, + { + "columns": [ + { + "image": "{{logoImage}}", + "width": 70, + "height": 70, + "alignment": "left" + }, + { + "stack": [ + { + "text": "{{tenantName}} {{Muncipal_Council}}", + "style": "header" + }, + { + "text": "{{BPA_FORM}}", + "style": "sub-header" + }, + { + "text": "{{BPA_FORM_APPROVAL}}", + "style": "header" + }, + { + "text": "{{BPA_BYELAWS}}", + "style": "sub-header" + } + ] + }, + { + "image": "{{logoImage}}", + "width": 70, + "height": 70, + "alignment": "right" + } + ] + }, + { + "columns": [ + { + "text": [ + { + "text": "{{PLAN_PERMISION_NO}} : ", + "bold": true + }, + { + "text": "{{planPermissionNo}}", + "bold": true, + "font": "Roboto" + } + ], + "alignment": "left", + "width": "*" + } + ], + "style": "top-margin" + }, + { + "text": [ + { + "text": "{{WRT_TXT}}" + }, + { + "text": " {{applicationNo}}", + "bold": true, + "font": "Roboto" + }, + { + "text": " {{dated}}" + }, + { + "text": " {{applicationDate}}" + }, + { + "text": ", {{PERMISSION_GRANT_TXT}} : " + } + ], + "style": "top-margin" + }, + { + "text": [ + { + "text": "{{SALUTATION}} " + }, + { + "text": "{{favourOf}}", + "bold": true + }, + { + "text": " {{FOR}} " + } + ], + "style": "top-margin" + }, + { + "text": [ + { + "text": "{{DSCR1}} {{PLOT_NO}} {{CS_PLOT}}" + }, + { + "text": " {{plotNo}}", + "bold": true + }, + { + "text": " {{PLOT_NO}} {{MSP_PLOT}} " + }, + { + "text": "{{plotNo}}", + "bold": true + }, + { + "text": " {{KHATA_NO}} " + }, + { + "text": "{{khataNo}}", + "bold": true + }, + { + "text": " {{HOLDING_NO}} " + }, + { + "text": "{{holdingNo}}", + "bold": true + }, + { + "text": " {{SERVEY_NO}} " + }, + { + "text": "{{reServeyPlotNo}}", + "bold": true + }, + { + "text": " {{TOWNPLANNING_TXT}} " + }, + { + "text": "{{townPlanningScheme}}", + "bold": true + }, + { + "text": " {{PROPOSE_LAND}} " + }, + { + "text": "{{proposedLandUse}}", + "bold": true + }, + { + "text": " {{OF}} " + }, + { + "text": "{{tenantName}} {{BPA_PDF_MUNCIPAL}}", + "bold": true + }, + { + "text": " {{CONDNS_TXT}}" + } + ] + }, + { + "separator": ")", + "ol": [ + "{{conditions}}" + ] + }, + { + "stack": [ + { + "text": "{{PERMIT_DETAILS_TXT}}," + } + ], + "bold": true, + "style": "top-margin" + }, + { + "table": { + "widths": [ + "auto", + "auto" + ], + "body": [ + [ + { + "text": "Fee Description", + "bold": true + }, + { + "text": "Amount (Rs)", + "bold": true, + "alignment": "right" + } + ], + [ + { + "text": "{{appHeadCode}}" + }, + { + "text": "{{appFee}}", + "alignment": "right" + } + ], + [ + { + "text": "{{sanHeadCode}}" + }, + { + "text": "{{sanFee}}", + "alignment": "right" + } + ], + [ + { + "text": "Total", + "bold": true + }, + { + "text": "{{totalDue}}", + "bold": true, + "alignment": "right" + } + ] + ] + }, + "margin": [ + 0, + 5, + 0, + 0 + ] + }, + { + "stack": [ + { + "text": "{{BY_ORDER}}", + "style": "top-margin" + }, + { + "text": "{{AUTH_OFFICER}}", + "margin": 2 + }, + { + "text": "{{approvedBy}}", + "margin": 2 + } + ], + "alignment": "right", + "style": "top-margin" + }, + { + "text": [ + { + "text": "{{VALIDITY_DSCR}} " + }, + { + "text": "{{validityDate}}" + }, + { + "text": " {{ONLY}}." + } + ], + "style": "top-margin", + "bold": true + }, + { + "text": "{{NOTE}} : ", + "bold": true, + "style": "top-margin" + }, + { + "text": [ + { + "text": "{{SUMMARY1}}" + }, + { + "text": " {{Bihar_Tenant}} " + }, + { + "text": "{{SUMMARY2}}." + } + ], + "style": "top-margin" + }, + { + "image": "{{qrCode}}", + "alignment": "right", + "width": 100, + "height": 100 + } + ], + "footer": "(function(currentPage, pageCount) { return currentPage.toString() + ' of ' + pageCount; })", + "styles": { + "header": { + "bold": true, + "alignment": "center" + }, + "sub-header": { + "alignment": "center", + "margin": [ + 0, + 5, + 0, + 5 + ] + }, + "top-margin": { + "margin": [ + 0, + 10, + 0, + 0 + ] + }, + "top-high-margin": { + "margin": [ + 0, + 30, + 0, + 0 + ] + } + } + } +} diff --git a/configs/pdf-service/format-config/consolidated-pdf1.json b/configs/pdf-service/format-config/consolidated-pdf1.json new file mode 100644 index 00000000..d9197f53 --- /dev/null +++ b/configs/pdf-service/format-config/consolidated-pdf1.json @@ -0,0 +1,561 @@ +{ + "key": "consolidated-pdf1", + "config": { + "content": [ + { + "style": "noc-head", + "table": { + "widths": [ + 60, + "*", + 120 + ], + "body": [ + [ + { + "image": "{{variable16}}", + "width": 50, + "height": 61.25 + }, + { + "stack": [ + { + "text": "Amritsar Municipal Corportaion", + "style": "receipt-logo-header" + }, + { + "text": "Property Tax payment Receipt", + "style": "receipt-logo-sub-header" + } + ], + "alignment": "left", + "margin": [ + 0, + 10, + 0, + 0 + ] + }, + { + "stack": [ + { + "text": "C Block, Ranjit Avenue, Amritsar" + }, + { + "text": " Tel. +91-183-2502339" + }, + { + "text": "website: www.amritsarcorp.com" + }, + { + "text": "Email: cmcasr@punjab.gov.in" + } + ], + "alignment": "right", + "color": "#484848", + "margin": [ + -150, + 0, + 0, + 0 + ] + } + ] + ] + }, + "layout": "noBorders" + }, + { + "style": "noc-table", + "table": { + "widths": [ + "*", + "*", + "*", + "*" + ], + "body": [ + [ + { + "text": "Receipt No.", + "border": [ + true, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{variable3}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Consumer ID", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{variable14}}", + "border": [ + false, + true, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "Payment Date", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{variable13}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Payer Name", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{variable1}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "Payer Contact", + "border": [ + true, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{variable2}}", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table" + }, + { + "text": "", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "", + "border": [ + false, + false, + true, + true + ] + } + ] + ] + }, + "layout": {} + }, + { + "style": "noc-table2", + "table": { + "widths": [ + "*", + "*", + "*", + "*" + ], + "body": [ + [ + { + "text": "Service Type", + "border": [ + true, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{variable4}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Billing Period", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{variable6}} to {{variable7}}", + "border": [ + false, + true, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "Paid Amount", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{variable5}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Pending Amount", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{variable19}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "Payment Mode", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{variable9}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Transaction ID", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{variable15}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "G8 Receipt No.", + "border": [ + true, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{variable10}}", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table" + }, + { + "text": "G8 Receipt Date", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{variable11}}", + "border": [ + false, + false, + true, + true + ], + "style": "receipt-table" + } + ] + ] + }, + "layout": {} + }, + { + "style": "receipt-approver", + "columns": [ + { + "text": [ + { + "text": "Generated by: ", + "bold": true + }, + { + "text": "Satplal Dhillon", + "bold": false + } + ], + "alignment": "left" + }, + { + "text": [ + { + "text": "Commissioner/EO", + "bold": true + } + ], + "alignment": "right" + } + ] + }, + { + "style": "no-signature", + "text": "This is Computer generated receipt, Signature is not required" + }, + { + "style": "pt-disclaimer", + "stack": [ + { + "text": "Disclamer", + "bold": true, + "style": "pt-disclaimer-value" + }, + { + "text": "Lorem ipsum dolor sit amet", + "bold": false, + "style": "pt-disclaimer-value" + }, + { + "text": "Lorem ipsum dolor sit amet", + "bold": false, + "style": "pt-disclaimer-value" + }, + { + "text": "Lorem ipsum dolor sit amet", + "bold": false, + "style": "pt-disclaimer-value" + } + ] + } + ], + "styles": { + "noc-head": { + "margin": [ + -30, + -30, + 0, + 1 + ] + }, + "receipt-logo-header": { + "color": "#484848", + "fontFamily": "Roboto", + "fontSize": 16, + "bold": true, + "letterSpacing": 0.74, + "margin": [ + 0, + 0, + 0, + 5 + ] + }, + "receipt-logo-sub-header": { + "color": "#484848", + "fontFamily": "Roboto", + "fontSize": 13, + "letterSpacing": 0.6 + }, + "noc-table": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -30, + 45, + -8, + -8 + ] + }, + "noc-table2": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -30, + 28, + -8, + -8 + ] + }, + "receipt-table-value": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 8, + 8, + 0, + 8 + ] + }, + "receipt-table": { + "color": "#484848", + "bold": true, + "fontSize": 12, + "fontWeight": 400, + "margin": [ + -30, + 8, + 0, + 8 + ] + }, + "receipt-approver": { + "fontSize": 12, + "bold": true, + "margin": [ + -27, + 50, + -10, + 0 + ], + "color": "#484848" + }, + "no-signature": { + "fontSize": 12, + "margin": [ + -27, + 35, + -10, + 0 + ], + "color": "#484848" + }, + "pt-disclaimer": { + "fontSize": 12, + "margin": [ + -27, + 30, + -10, + 0 + ], + "color": "#484848" + }, + "pt-disclaimer-value": { + "fontSize": 12, + "margin": [ + 0, + 5, + 0, + 0 + ], + "color": "#484848" + } + } + } +} diff --git a/configs/pdf-service/format-config/consolidated-pdf2.json b/configs/pdf-service/format-config/consolidated-pdf2.json new file mode 100644 index 00000000..f41c0de5 --- /dev/null +++ b/configs/pdf-service/format-config/consolidated-pdf2.json @@ -0,0 +1,1030 @@ +{ + "key": "consolidated-pdf2", + "config": { + "content": [ + { + "style": "noc-head", + "table": { + "widths": [ + 60, + "*", + 120 + ], + "body": [ + [ + { + "image": "{{variable1}}", + "width": 50, + "height": 61.25 + }, + { + "stack": [ + { + "text": "Amritsar Municipal Corportaion", + "style": "receipt-logo-header" + }, + { + "stack": [ + { + "text": "C Block, Ranjit Avenue, Amritsar" + }, + { + "text": " Tel. +91-183-2502339" + }, + { + "text": "website: www.amritsarcorp.com" + }, + { + "text": "Email: cmcasr@punjab.gov.in" + } + ] + } + ], + "alignment": "left", + "margin": [ + 0, + 10, + 0, + 0 + ] + }, + { + "stack": [ + { + "text": "Total Amount due" + }, + { + "text": "{{variable11}}", + "style": "amount-due" + }, + { + "table": { + "widths": [ + "*", + "*" + ], + "body": [ + [ + { + "image": "{{variable}}", + "width": 40, + "height": 40, + "border": [ + false, + false, + false, + false + ], + "style": "qr-image" + }, + { + "stack": [ + { + "text": "Scan Code to pay", + "style": "qr-text" + }, + { + "text": "Use any Bank/UPI App", + "style": "qr-text" + } + ], + "border": [ + false, + false, + false, + false + ] + } + ] + ], + "alignment": "right", + "margin": [ + 0, + 10, + 0, + 0 + ] + } + } + ], + "alignment": "right", + "color": "#484848", + "margin": [ + -150, + 2, + -20, + 0 + ] + } + ] + ] + }, + "layout": "noBorders" + }, + { + "style": "noc-table", + "table": { + "widths": [ + 130, + 130, + -2, + 130, + 130 + ], + "body": [ + [ + { + "text": "Payer Name", + "border": [ + true, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{variable2}}", + "border": [ + false, + true, + true, + false + ], + "style": "receipt-table" + }, + { + "text": "", + "border": [ + false, + false, + false, + false + ] + }, + { + "text": "Bill No.", + "border": [ + true, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{variable5}}", + "border": [ + false, + true, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "Mobile No.", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{variable3}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + }, + { + "text": "", + "border": [ + false, + false, + false, + false + ] + }, + { + "text": "Bill Period", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{variable6}} - {{variable7}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "Payer Address", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{variable4}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + }, + { + "text": "", + "border": [ + false, + false, + false, + false + ] + }, + { + "text": "Bill Issue Date", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{variable8}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "", + "border": [ + true, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "", + "border": [ + false, + false, + true, + true + ], + "style": "receipt-table" + }, + { + "text": "", + "border": [ + false, + false, + false, + false + ] + }, + { + "text": "Bill Due Date", + "border": [ + true, + false, + false, + true + ], + "style": "right-receipt-table" + }, + { + "text": "{{variable7}}", + "border": [ + false, + false, + true, + true + ], + "style": "right-receipt-table2" + } + ] + ] + }, + "layout": {} + }, + { + "style": "noc-table2", + "table": { + "widths": [ + "103%" + ], + "body": [ + [ + { + "text": "Billing Summary - Property Tax", + "border": [ + true, + true, + true, + false + ], + "style": "receipt-table-value" + } + ], + [ + { + "table": { + "widths": [ + "15%", + "20%", + "11%", + "12%", + "11%", + "12%", + "11%", + "11%" + ], + "body": [ + [ + { + "text": "Property ID", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "Bill Period", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "Arrears", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "Charge", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "Penalty", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "Rebate", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "Others", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "Total", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + } + ], + [ + { + "text": "{{variable12}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{variable6}}-{{variable7}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{variable13}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{variable14}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{variable9}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{variable10}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{variable14}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{variable11}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2", + "bold": true + } + ] + ] + }, + "border": [ + true, + false, + true, + true + ] + } + ] + ] + }, + "layout": {} + }, + { + "style": "noc-table3", + "table": { + "widths": [ + "103%" + ], + "body": [ + [ + { + "text": "Important Message", + "border": [ + true, + true, + true, + false + ], + "margin": [ + 9, + 10, + 0, + 5 + ], + "style": "receipt-table-value" + } + ], + [ + { + "ol": [ + { + "text": "Payment received by cheque/demand draft shall be subject to realization.", + "margin": [ + 8, + 0, + 0, + 5 + ] + }, + { + "text": "This document is not a proof of Property Ownership and regularization of unauthorized construction.", + "margin": [ + 8, + 0, + 0, + 5 + ] + }, + { + "text": "This is a computer generated document, hence requires no signature.", + "margin": [ + 8, + 0, + 0, + 5 + ] + }, + { + "text": "Assessment & Payment is subject to verification/Scrutiny by competitive authority.", + "margin": [ + 8, + 0, + 0, + 5 + ] + }, + { + "text": "Please deposit property tax dues for earlier years also. Ignore, if already paid.", + "margin": [ + 8, + 0, + 0, + 5 + ] + }, + { + "text": "If the tax payers fail to pay the property tax within 15 days from the date of receipt of this Demand Bill, the same amount can be collected by issuing a distraint warrant u/s Section-269 of Municipal Corporations Act, 1955 (formerly GHMC Act, 1955)", + "margin": [ + 8, + 0, + 0, + 10 + ] + } + ], + "border": [ + true, + false, + true, + true + ], + "alignment": "left" + } + ] + ] + }, + "layout": {} + }, + { + "canvas": [ + { + "type": "line", + "x1": -40, + "y1": 30, + "x2": 700, + "y2": 30, + "dash": { + "length": 10, + "space": 5 + } + } + ] + }, + { + "image": "{{variable1}}", + "width": 14, + "height": 14, + "margin": [ + -30, + -7, + 0, + 0 + ] + }, + { + "text": "Acknowledgement( For Official use only)", + "style": "footer-header" + }, + { + "style": "noc-table", + "table": { + "widths": [ + "*", + "*", + "*", + "*" + ], + "body": [ + [ + { + "text": "Date", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "24/04/2018", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "Consumer ID", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{variable15}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Bill No.", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{variable5}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "Name & Address", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{variable4}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Total Payment", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{variable16}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + } + ] + ] + } + } + ], + "styles": { + "noc-head": { + "margin": [ + -25, + -30, + 0, + 1 + ] + }, + "receipt-logo-header": { + "color": "#484848", + "fontFamily": "Roboto", + "fontSize": 14, + "bold": true, + "letterSpacing": 0.74, + "margin": [ + 0, + -10, + 0, + 5 + ] + }, + "receipt-logo-sub-header": { + "color": "#484848", + "fontFamily": "Roboto", + "fontSize": 13, + "letterSpacing": 0.6 + }, + "noc-table": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -25, + 45, + -8, + -8 + ] + }, + "noc-table2": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -25, + 18, + -8, + -8 + ] + }, + "noc-table3": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -25, + 30, + -8, + -8 + ] + }, + "receipt-table-value": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 8, + 5, + 0, + 0 + ] + }, + "receipt-table-value2": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 3, + 5, + 0, + 0 + ] + }, + "receipt-table": { + "color": "#484848", + "bold": true, + "fontSize": 12, + "fontWeight": 400, + "margin": [ + -30, + 5, + 0, + 0 + ] + }, + "receipt-table2": { + "color": "#484848", + "bold": true, + "fontSize": 12, + "fontWeight": 400, + "margin": [ + 3, + 8, + 0, + 10 + ] + }, + "right-receipt-table": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 8, + -10, + 0, + 10 + ] + }, + "right-receipt-table2": { + "color": "#484848", + "bold": true, + "fontSize": 12, + "fontWeight": 400, + "margin": [ + -30, + -10, + 0, + 0 + ] + }, + "receipt-approver": { + "fontSize": 12, + "bold": true, + "margin": [ + -27, + 50, + -10, + 0 + ], + "color": "#484848" + }, + "no-signature": { + "fontSize": 12, + "margin": [ + -27, + 35, + -10, + 0 + ], + "color": "#484848" + }, + "amount-due": { + "fontSize": 30, + "color": "#FC8019", + "fontWeight": 700 + }, + "pt-disclaimer": { + "fontSize": 12, + "margin": [ + -27, + 30, + -10, + 0 + ], + "color": "#484848" + }, + "pt-disclaimer-value": { + "fontSize": 12, + "margin": [ + 0, + 5, + 0, + 0 + ], + "color": "#484848" + }, + "qr-text": { + "fontSize": 12, + "margin": [ + 40, + 0, + 0, + 0 + ], + "color": "#484848", + "alignment": "left" + }, + "qr-image": { + "margin": [ + -40, + -1, + -3, + 0 + ], + "color": "#484848", + "alignment": "right" + }, + "footer-header": { + "margin": [ + 0, + 15, + 0, + -40 + ], + "color": "#000000", + "alignment": "center" + } + } + } +} diff --git a/configs/pdf-service/format-config/consolidatedbill.json b/configs/pdf-service/format-config/consolidatedbill.json new file mode 100644 index 00000000..992700b0 --- /dev/null +++ b/configs/pdf-service/format-config/consolidatedbill.json @@ -0,0 +1,1014 @@ +{ + "key": "consolidatedbill", + "config": { + "defaultStyle": { + "font": "Cambay" + }, + "content": [ + { + "style": "noc-head", + "table": { + "widths": [ + 60, + "*", + 120 + ], + "body": [ + [ + { + "image": "{{logoImage}}", + "width": 50, + "height": 61.25 + }, + { + "stack": [ + { + "text": "{{logo_header}} {{Municipal_Corporation}}", + "style": "receipt-logo-header" + }, + { + "stack": [ + { + "text": "{{address}}" + }, + { + "text": "{{phoneNumber}}" + }, + { + "text": "{{website}}" + }, + { + "text": "{{email}}" + } + ] + } + ], + "alignment": "left", + "margin": [ + 0, + 10, + 0, + 0 + ] + }, + { + "stack": [ + { + "text": "{{total_amount_due}}" + }, + { + "text": "{{Rs}} {{totalAmountDue}}", + "style": "amount-due" + } + ], + "alignment": "right", + "color": "#484848", + "margin": [ + -150, + 2, + -20, + 0 + ] + } + ] + ] + }, + "layout": "noBorders" + }, + { + "style": "noc-table", + "table": { + "widths": [ + 130, + 130, + -2, + 130, + 130 + ], + "body": [ + [ + { + "text": "{{payer_name}}", + "border": [ + true, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerName}}", + "border": [ + false, + true, + true, + false + ], + "style": "receipt-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ] + }, + { + "text": "{{bill_no}}", + "border": [ + true, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{billNo}}", + "border": [ + false, + true, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{mobile_no}}", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{mobileNo}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ] + }, + { + "text": "{{bill_period}}", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{fromPeriod}} - {{toPeriod}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{payer_address}}", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerAddress}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ] + }, + { + "text": "{{bill_issue_date}}", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{billIssueDate}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": " ", + "border": [ + true, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": " ", + "border": [ + false, + false, + true, + true + ], + "style": "receipt-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ] + }, + { + "text": "{{bill_due_date}}", + "border": [ + true, + false, + false, + true + ], + "style": "right-receipt-table" + }, + { + "text": "{{billDueDate}}", + "border": [ + false, + false, + true, + true + ], + "style": "right-receipt-table2" + } + ] + ] + }, + "layout": {} + }, + { + "style": "noc-table2", + "table": { + "widths": [ + "103%" + ], + "body": [ + [ + { + "text": "{{billing_summary_property_tax}} {{serviceType}}", + "border": [ + true, + true, + true, + false + ], + "style": "receipt-table-value" + } + ], + [ + { + "table": { + "widths": [ + "18%", + "26%", + "10%", + "9%", + "10%", + "9%", + "10%", + "9%" + ], + "body": [ + [ + { + "text": "{{consumer_no}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{bill_period}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{arrears_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{charge_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{penalty_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{rebate_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{others_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{total_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + } + ], + [ + { + "text": "{{propertyID}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{fromPeriod}}-{{toPeriod}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{arrears}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{charge}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{penalty}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{rebate}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{others}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{total}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2", + "bold": true + } + ] + ] + }, + "border": [ + true, + false, + true, + true + ] + } + ] + ] + }, + "layout": {} + }, + { + "style": "noc-table3", + "table": { + "widths": [ + "103%" + ], + "body": [ + [ + { + "text": "{{important_message}}", + "border": [ + true, + true, + true, + false + ], + "margin": [ + 9, + 10, + 0, + 5 + ], + "style": "receipt-table-value" + } + ], + [ + { + "ol": [ + { + "text": "{{payment_received}}", + "margin": [ + 8, + 0, + 0, + 3 + ] + }, + { + "text": "{{this_document}}", + "margin": [ + 8, + 0, + 0, + 3 + ] + }, + { + "text": "{{this_is_a}}", + "margin": [ + 8, + 0, + 0, + 3 + ] + }, + { + "text": "{{assessment_payment}}", + "margin": [ + 8, + 0, + 0, + 3 + ] + }, + { + "text": "{{please_deposit}}", + "margin": [ + 8, + 0, + 0, + 3 + ] + }, + { + "text": "{{if_the_tax}}", + "margin": [ + 8, + 0, + 0, + 5 + ] + } + ], + "border": [ + true, + false, + true, + true + ], + "alignment": "left" + } + ] + ] + }, + "layout": {} + }, + { + "canvas": [ + { + "type": "line", + "x1": -40, + "y1": 30, + "x2": 700, + "y2": 30, + "dash": { + "length": 10, + "space": 5 + } + } + ] + }, + { + "image": "{{scissorImage}}", + "width": 24, + "height": 24, + "margin": [ + -30, + -11.2, + 0, + 0 + ] + }, + + { + "text": "{{acknowledgement_for}}", + "style": "footer-header", + "pageBreak": "before" + + }, + { + "style": "noc-table4", + "table": { + "widths": [ + "*", + "*", + "*", + "*" + ], + "body": [ + [ + { + "text": "{{date_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{billdate}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{consumer_no}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{consumerID}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{bill_no}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{billNo}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{name_address}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{nameAddress}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{total_payment}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{total}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + } + ] + ] + } + }, + { + "text": "{{receivers_signature}}", + "style": "footer-bottom" + } + ], + "styles": { + "noc-head": { + "margin": [ + -25, + -30, + 0, + 1 + ] + }, + "receipt-logo-header": { + "color": "#484848", + "fontFamily": "Roboto", + "fontSize": 14, + "bold": true, + "letterSpacing": 0.74, + "margin": [ + 0, + -10, + 0, + 5 + ] + }, + "receipt-logo-sub-header": { + "color": "#484848", + "fontFamily": "Roboto", + "fontSize": 13, + "letterSpacing": 0.6 + }, + "noc-table": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -25, + 10, + -8, + -8 + ] + }, + "noc-table4": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -25, + 75, + -8, + -8 + ] + }, + "noc-table2": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -25, + 18, + -8, + -8 + ] + }, + "noc-table3": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -25, + 30, + -8, + -8 + ] + }, + "receipt-table-value": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 8, + 5, + 0, + 0 + ] + }, + "receipt-table-value2": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 3, + 5, + 0, + 0 + ] + }, + "receipt-table": { + "color": "#484848", + "bold": true, + "fontSize": 12, + "fontWeight": 400, + "margin": [ + -30, + 5, + 0, + 0 + ] + }, + "receipt-table2": { + "color": "#484848", + "bold": true, + "fontSize": 11, + "fontWeight": 400, + "margin": [ + 3, + 8, + 0, + 10 + ] + }, + "right-receipt-table": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 8, + 5, + 0, + 10 + ] + }, + "right-receipt-table2": { + "color": "#484848", + "bold": true, + "fontSize": 12, + "fontWeight": 400, + "margin": [ + -30, + 5, + 0, + 0 + ] + }, + "receipt-approver": { + "fontSize": 12, + "bold": true, + "margin": [ + -27, + 50, + -10, + 0 + ], + "color": "#484848" + }, + "no-signature": { + "fontSize": 12, + "margin": [ + -27, + 35, + -10, + 0 + ], + "color": "#484848" + }, + "amount-due": { + "fontSize": 30, + "color": "#FC8019", + "bold": true, + "fontWeight": 700 + }, + "pt-disclaimer": { + "fontSize": 12, + "margin": [ + -27, + 30, + -10, + 0 + ], + "color": "#484848" + }, + "pt-disclaimer-value": { + "fontSize": 12, + "margin": [ + 0, + 5, + 0, + 0 + ], + "color": "#484848" + }, + "qr-text": { + "fontSize": 12, + "margin": [ + 40, + 0, + 0, + 0 + ], + "color": "#484848", + "alignment": "left" + }, + "qr-image": { + "margin": [ + -40, + -1, + -3, + 0 + ], + "color": "#484848", + "alignment": "right" + }, + "footer-header": { + "margin": [ + 0, + 15, + 0, + -40 + ], + "bold": true, + "color": "#000000", + "alignment": "center" + }, + "footer-bottom": { + "margin": [ + 0, + 50, + 0, + 0 + ], + "bold": true, + "color": "#000000", + "alignment": "right" + } + } + } +} diff --git a/configs/pdf-service/format-config/consolidatedreceipt.json b/configs/pdf-service/format-config/consolidatedreceipt.json new file mode 100644 index 00000000..3064d335 --- /dev/null +++ b/configs/pdf-service/format-config/consolidatedreceipt.json @@ -0,0 +1,1392 @@ +{ + "key": "consolidatedreceipt", + "config": { + "defaultStyle": { + "font": "Cambay" + }, + "content": [ + { + "style": "noc-head", + "table": { + "widths": [ + 60, + "*", + 150 + ], + "body": [ + [ + { + "image": "{{logoImage}}", + "width": 50, + "height": 50 + }, + { + "stack": [ + { + "text": "{{logo-header}} {{mcGrade}}", + "style": "receipt-logo-header" + }, + { + "text": "{{serviceType}} {{payment_receipt}} (Employee Copy)", + "style": "receipt-logo-sub-header" + } + ], + "alignment": "left", + "margin": [ + 0, + 4, + 0, + 0 + ] + }, + { + "stack": [ + { + "text": "{{address}},{{phoneNumber}}", + "style": "receipt-logo-sub-header" + }, + { + "text": "{{website}},{{email}}", + "style": "receipt-logo-sub-header" + } + ], + "alignment": "right", + "color": "#484848", + "margin": [ + -100, + 0, + -25, + 0 + ] + } + ] + ] + }, + "layout": "noBorders" + }, + { + "style": "noc-table", + "table": { + "widths": [ + "30%", + "20%", + "30%", + "20%" + ], + "body": [ + [ + { + "text": "{{receipt_no}}.", + "border": [ + true, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{receiptNo}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{consumer_id}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{consumerID}}", + "border": [ + false, + true, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "Receipt Date", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{ReceiptDate}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Tax period", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{fromPeriod}} {{to}} {{toPeriod}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + + { + "text": "Consumer Name", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{consumerName}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Contact No.", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerContact}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + + { + "text": "Address:", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{doorHouseNo}} {{buildingName}} {{streetName}} {{pinCode}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Paid By", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{PaidBy}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ] + ] + }, + "layout": {} + }, + { + "style": "next-noc-table", + "table": { + "widths": [ + "30%", + "20%", + "30%", + "20%" + ], + "body": [ + [ + { + "text": "{{service_type}}", + "border": [ + true, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{serviceType}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{billing_period}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{fromPeriod}} {{to}} {{toPeriod}}", + "border": [ + false, + true, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{paid_amount}}", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "₹ {{paidAmount}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + + "text": "{{payment_mode}}", + + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{paymentMode}}", + + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "Tax Amount", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "₹ {{taxAmount}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + + "text": "Field Fee", + + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + + "text": "₹ {{fieldFee}}", + + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ],[ + { + "text": "CGST(if applicable)", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "₹ {{cgst}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + + "text": "SGST(if applicable)", + + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + + "text": "₹ {{sgst}}", + + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "Cheque/DD/PO/Transaction No.", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{chequeDD}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Cheque/DD/PO/Transaction Date", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{chequeDDDate}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + + } + ], [ + { + "text": "Bank Name", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{bankName}},{{branchName}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "IFSC Code", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{ifsc}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + + } + ], + [ + { + "text": "{{g8_receipt_no}}.", + "border": [ + true, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{G8ReceiptNo}}", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table" + }, + { + "text": "{{g8_receipt_date}}", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{G8ReceiptDate}}", + "border": [ + false, + false, + true, + true + ], + "style": "receipt-table" + } + ] + ] + }, + "layout": {} + }, + { + "style": "next-noc-table", + "table": { + "widths": [ + "10%", + "*" + ], + "body": [ + [ + { + "text":"Comments: ", + "border":[false, false, false, false] + }, + { + "text":"{{comments}}", + "border":[false, false, false, false] + } + ] + ], + "layout":"noBorders" + } + }, + { + "style": "receipt-approver", + "columns": [ + { + "text": [ + { + "text": "{{generated_by}}: ", + "bold": true + }, + { + "text": "{{user-name}}", + "bold": false + } + ], + "alignment": "left" + }, + { + "text": [ + { + "text": "Authorised Signatory", + "bold": true + } + ], + "alignment": "right", + "margin": [ + 0, + 0, + -10, + 1 + ] + } + ] + }, + { + "text":"---------------x------------------------------x-----------------------------x------------------------------x-----------------------x------------------x------", + "style":"next-noc-table" + + }, + { + "style": "noc-head-emp", + "table": { + "widths": [ + 60, + "*", + 120 + ], + "body": [ + [ + { + "image": "{{logoImage}}", + "width": 50, + "height": 50 + }, + { + "stack": [ + { + "text": "{{logo-header}} {{mcGrade}}", + "style": "receipt-logo-header" + }, + { + "text": "{{serviceType}} {{payment_receipt}} (Citizen Copy)", + "style": "receipt-logo-sub-header" + } + ], + "alignment": "left", + "margin": [ + 0, + 4, + 0, + 0 + ] + }, + { + "stack": [ + { + "text": "{{address}},{{phoneNumber}}", + "style": "receipt-logo-sub-header" + }, + { + "text": "{{website}},{{email}}", + "style": "receipt-logo-sub-header" + } + ], + "alignment": "right", + "color": "#484848", + "margin": [ + -100, + 0, + -25, + 0 + ] + } + ] + ] + }, + "layout": "noBorders" + }, + { + "style": "noc-table", + "table": { + "widths": [ + "30%", + "20%", + "30%", + "20%" + ], + "body": [ + [ + { + "text": "{{receipt_no}}.", + "border": [ + true, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{receiptNo}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{consumer_id}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{consumerID}}", + "border": [ + false, + true, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "Receipt Date", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{ReceiptDate}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Tax period", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{fromPeriod}} {{to}} {{toPeriod}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + + { + "text": "Consumer Name", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{consumerName}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Contact No.", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerContact}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + + { + "text": "Address:", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{doorHouseNo}} {{buildingName}} {{streetName}} {{pinCode}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Paid By", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{PaidBy}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ] + + ] + }, + "layout": {} + }, + { + "style": "next-noc-table", + "table": { + "widths": [ + "30%", + "20%", + "30%", + "20%" + ], + "body": [ + [ + { + "text": "{{service_type}}", + "border": [ + true, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{serviceType}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{billing_period}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{fromPeriod}} {{to}} {{toPeriod}}", + "border": [ + false, + true, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{paid_amount}}", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "₹ {{paidAmount}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + + "text": "{{payment_mode}}", + + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + + "text": "{{paymentMode}}", + + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], [ + { + "text": "Tax Amount", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "₹ {{taxAmount}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + + "text": "Field Fee", + + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + + "text": "₹ {{fieldFee}}", + + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ],[ + { + "text": "CGST(if applicable)", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "₹ {{cgst}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + + "text": "SGST(if applicable)", + + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + + "text": "₹ {{sgst}}", + + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "Cheque/DD/PO/Transaction No.", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{chequeDD}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Cheque/DD/PO/Transaction Date", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{chequeDDDate}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + + } + ],[ + { + "text": "Bank Name", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{bankName}},{{branchName}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "IFSC Code", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{ifsc}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + + } + ], + [ + { + "text": "{{g8_receipt_no}}.", + "border": [ + true, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{G8ReceiptNo}}", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table" + }, + { + "text": "{{g8_receipt_date}}", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{G8ReceiptDate}}", + "border": [ + false, + false, + true, + true + ], + "style": "receipt-table" + } + ] + ] + }, + "layout": {} + }, + { + "style": "next-noc-table", + "table": { + "widths": [ + "10%", + "*" + ], + "body": [ + [ + { + "text":"Comments: ", + "border":[false, false, false, false] + }, + { + "text":"{{comments}}", + "border":[false, false, false, false] + } + ] + ], + "layout":"noBorders" + } + }, + { + "style": "receipt-approver", + "columns": [ + { + "text": [ + { + "text": "{{generated_by}}: ", + "bold": true + }, + { + "text": "{{user-name}}", + "bold": false + } + ], + "alignment": "left" + }, + { + "text": [ + { + "text": "Authorised Signatory", + "bold": true + } + ], + "alignment": "right", + "margin": [ + 0, + 0, + -10, + 1 + ] + } + ] + }, + { + "style": "pt-disclaimer", + "stack": [ + { + "text": "{{disclamer}}", + "bold": true, + "style": "pt-disclaimer-value" + }, + { + "text": "{{disclamer_1}}", + "bold": false, + "style": "pt-disclaimer-value" + }, + { + "text": "{{disclamer_2}}", + "bold": false, + "style": "pt-disclaimer-value" + }, + { + "text": "{{disclamer_3}}", + "bold": false, + "style": "pt-disclaimer-value" + }, { + "text":"Now log a complaint from WhatsApp, give a missed call on 8750975975 or send a Hi message on WhatsApp to this number", "bold": true, "fontSize": 8, "color": "blue", "decoration": "underline"} + ] + } + ], + "styles": { + "noc-head": { + "margin": [ + -30, + -30, + 0, + 1 + ] + }, + "noc-head-emp": { + "margin": [ + -30, + 10, + 0, + 1 + ] + }, + "receipt-logo-header": { + "color": "#000000", + "fontSize": 10, + "bold": true, + "letterSpacing": 0.74, + "margin": [ + 0, + 0, + 0, + 4 + ] + }, + "receipt-logo-sub-header": { + "color": "#000000", + "fontSize": 8, + "letterSpacing": 0.6 + }, + "noc-table": { + "fontSize": 8, + "color": "#000000", + "margin": [ + -25, + 10, + -22, + -8 + ] + }, + "next-noc-table": { + "fontSize": 8, + "color": "#000000", + "margin": [ + -25, + 6, + -22, + 0 + ] + }, + "receipt-table-value": { + "color": "#000000", + "bold": true, + "fontSize": 8, + "fontWeight": 500, + "margin": [ + 8, + 0, + 0, + 0 + ] + }, + "receipt-table": { + "color": "#000000", + "bold": false, + "fontSize": 8, + "fontWeight": 400, + "margin": [ + -30, + 0, + 0, + 0 + ] + }, + "receipt-approver": { + "fontSize": 8, + "bold": true, + "margin": [ + -27, + 3, + -10, + 0 + ] + }, + "no-signature": { + "fontSize": 8, + "margin": [ + -27, + 3, + -10, + 0 + ] + }, + "pt-disclaimer": { + "fontSize": 8, + "margin": [ + -27, + 3, + -10, + 0 + ] + }, + "pt-disclaimer-value": { + "fontSize": 8, + "margin": [ + 2, + 1, + 0, + 0 + ] + } + } + } +} diff --git a/configs/pdf-service/format-config/consolidatedreceiptold.json b/configs/pdf-service/format-config/consolidatedreceiptold.json new file mode 100644 index 00000000..ef1aad3f --- /dev/null +++ b/configs/pdf-service/format-config/consolidatedreceiptold.json @@ -0,0 +1,1392 @@ +{ + "key": "consolidatedreceiptold", + "config": { + "defaultStyle": { + "font": "Cambay" + }, + "content": [ + { + "style": "noc-head", + "table": { + "widths": [ + 60, + "*", + 150 + ], + "body": [ + [ + { + "image": "{{logoImage}}", + "width": 50, + "height": 50 + }, + { + "stack": [ + { + "text": "{{logo-header}} {{mcGrade}}", + "style": "receipt-logo-header" + }, + { + "text": "{{serviceType}} {{payment_receipt}} (Employee Copy)", + "style": "receipt-logo-sub-header" + } + ], + "alignment": "left", + "margin": [ + 0, + 4, + 0, + 0 + ] + }, + { + "stack": [ + { + "text": "{{address}},{{phoneNumber}}", + "style": "receipt-logo-sub-header" + }, + { + "text": "{{website}},{{email}}", + "style": "receipt-logo-sub-header" + } + ], + "alignment": "right", + "color": "#484848", + "margin": [ + -100, + 0, + -25, + 0 + ] + } + ] + ] + }, + "layout": "noBorders" + }, + { + "style": "noc-table", + "table": { + "widths": [ + "30%", + "20%", + "30%", + "20%" + ], + "body": [ + [ + { + "text": "{{receipt_no}}.", + "border": [ + true, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{receiptNo}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{consumer_id}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{consumerID}}", + "border": [ + false, + true, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "Receipt Date", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{ReceiptDate}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Tax period", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{fromPeriod}} {{to}} {{toPeriod}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + + { + "text": "Consumer Name", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerName}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Contact No.", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerContact}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + + { + "text": "Address:", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerAddress}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Paid By", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{PaidBy}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ] + ] + }, + "layout": {} + }, + { + "style": "next-noc-table", + "table": { + "widths": [ + "30%", + "20%", + "30%", + "20%" + ], + "body": [ + [ + { + "text": "{{service_type}}", + "border": [ + true, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{serviceType}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{billing_period}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{fromPeriod}} {{to}} {{toPeriod}}", + "border": [ + false, + true, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{paid_amount}}", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "₹ {{paidAmount}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + + "text": "{{payment_mode}}", + + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{paymentMode}}", + + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "Tax Amount", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "₹ {{taxAmount}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + + "text": "Field Fee", + + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + + "text": "₹ {{fieldFee}}", + + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ],[ + { + "text": "CGST(if applicable)", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "₹ {{cgst}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + + "text": "SGST(if applicable)", + + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + + "text": "₹ {{sgst}}", + + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "Cheque/DD/PO/Transaction No.", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{chequeDD}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Cheque/DD/PO/Transaction Date", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{chequeDDDate}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + + } + ], [ + { + "text": "Bank Name", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{bankName}},{{branchName}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "IFSC Code", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{ifsc}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + + } + ], + [ + { + "text": "{{g8_receipt_no}}.", + "border": [ + true, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{G8ReceiptNo}}", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table" + }, + { + "text": "{{g8_receipt_date}}", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{G8ReceiptDate}}", + "border": [ + false, + false, + true, + true + ], + "style": "receipt-table" + } + ] + ] + }, + "layout": {} + }, + { + "style": "next-noc-table", + "table": { + "widths": [ + "10%", + "*" + ], + "body": [ + [ + { + "text":"Comments: ", + "border":[false, false, false, false] + }, + { + "text":"{{comments}}", + "border":[false, false, false, false] + } + ] + ], + "layout":"noBorders" + } + }, + { + "style": "receipt-approver", + "columns": [ + { + "text": [ + { + "text": "{{generated_by}}: ", + "bold": true + }, + { + "text": "{{user-name}}", + "bold": false + } + ], + "alignment": "left" + }, + { + "text": [ + { + "text": "Authorised Signatory", + "bold": true + } + ], + "alignment": "right", + "margin": [ + 0, + 0, + -10, + 1 + ] + } + ] + }, + { + "text":"---------------x------------------------------x-----------------------------x------------------------------x-----------------------x------------------x------", + "style":"next-noc-table" + + }, + { + "style": "noc-head-emp", + "table": { + "widths": [ + 60, + "*", + 120 + ], + "body": [ + [ + { + "image": "{{logoImage}}", + "width": 50, + "height": 50 + }, + { + "stack": [ + { + "text": "{{logo-header}} {{mcGrade}}", + "style": "receipt-logo-header" + }, + { + "text": "{{serviceType}} {{payment_receipt}} (Citizen Copy)", + "style": "receipt-logo-sub-header" + } + ], + "alignment": "left", + "margin": [ + 0, + 4, + 0, + 0 + ] + }, + { + "stack": [ + { + "text": "{{address}},{{phoneNumber}}", + "style": "receipt-logo-sub-header" + }, + { + "text": "{{website}},{{email}}", + "style": "receipt-logo-sub-header" + } + ], + "alignment": "right", + "color": "#484848", + "margin": [ + -100, + 0, + -25, + 0 + ] + } + ] + ] + }, + "layout": "noBorders" + }, + { + "style": "noc-table", + "table": { + "widths": [ + "30%", + "20%", + "30%", + "20%" + ], + "body": [ + [ + { + "text": "{{receipt_no}}.", + "border": [ + true, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{receiptNo}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{consumer_id}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{consumerID}}", + "border": [ + false, + true, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "Receipt Date", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{ReceiptDate}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Tax period", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{fromPeriod}} {{to}} {{toPeriod}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + + { + "text": "Consumer Name", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerName}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Contact No.", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerContact}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + + { + "text": "Address:", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerAddress}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Paid By", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{PaidBy}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ] + + ] + }, + "layout": {} + }, + { + "style": "next-noc-table", + "table": { + "widths": [ + "30%", + "20%", + "30%", + "20%" + ], + "body": [ + [ + { + "text": "{{service_type}}", + "border": [ + true, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{serviceType}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{billing_period}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{fromPeriod}} {{to}} {{toPeriod}}", + "border": [ + false, + true, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{paid_amount}}", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "₹ {{paidAmount}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + + "text": "{{payment_mode}}", + + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + + "text": "{{paymentMode}}", + + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], [ + { + "text": "Tax Amount", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "₹ {{taxAmount}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + + "text": "Field Fee", + + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + + "text": "₹ {{fieldFee}}", + + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ],[ + { + "text": "CGST(if applicable)", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "₹ {{cgst}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + + "text": "SGST(if applicable)", + + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + + "text": "₹ {{sgst}}", + + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "Cheque/DD/PO/Transaction No.", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{chequeDD}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Cheque/DD/PO/Transaction Date", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{chequeDDDate}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + + } + ],[ + { + "text": "Bank Name", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{bankName}},{{branchName}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "IFSC Code", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{ifsc}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + + } + ], + [ + { + "text": "{{g8_receipt_no}}.", + "border": [ + true, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{G8ReceiptNo}}", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table" + }, + { + "text": "{{g8_receipt_date}}", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{G8ReceiptDate}}", + "border": [ + false, + false, + true, + true + ], + "style": "receipt-table" + } + ] + ] + }, + "layout": {} + }, + { + "style": "next-noc-table", + "table": { + "widths": [ + "10%", + "*" + ], + "body": [ + [ + { + "text":"Comments: ", + "border":[false, false, false, false] + }, + { + "text":"{{comments}}", + "border":[false, false, false, false] + } + ] + ], + "layout":"noBorders" + } + }, + { + "style": "receipt-approver", + "columns": [ + { + "text": [ + { + "text": "{{generated_by}}: ", + "bold": true + }, + { + "text": "{{user-name}}", + "bold": false + } + ], + "alignment": "left" + }, + { + "text": [ + { + "text": "Authorised Signatory", + "bold": true + } + ], + "alignment": "right", + "margin": [ + 0, + 0, + -10, + 1 + ] + } + ] + }, + { + "style": "pt-disclaimer", + "stack": [ + { + "text": "{{disclamer}}", + "bold": true, + "style": "pt-disclaimer-value" + }, + { + "text": "{{disclamer_1}}", + "bold": false, + "style": "pt-disclaimer-value" + }, + { + "text": "{{disclamer_2}}", + "bold": false, + "style": "pt-disclaimer-value" + }, + { + "text": "{{disclamer_3}}", + "bold": false, + "style": "pt-disclaimer-value" + }, { + "text":"Now log a complaint from WhatsApp, give a missed call on 8750975975 or send a Hi message on WhatsApp to this number", "bold": true, "fontSize": 8, "color": "blue", "decoration": "underline"} + ] + } + ], + "styles": { + "noc-head": { + "margin": [ + -30, + -30, + 0, + 1 + ] + }, + "noc-head-emp": { + "margin": [ + -30, + 10, + 0, + 1 + ] + }, + "receipt-logo-header": { + "color": "#000000", + "fontSize": 10, + "bold": true, + "letterSpacing": 0.74, + "margin": [ + 0, + 0, + 0, + 4 + ] + }, + "receipt-logo-sub-header": { + "color": "#000000", + "fontSize": 8, + "letterSpacing": 0.6 + }, + "noc-table": { + "fontSize": 8, + "color": "#000000", + "margin": [ + -25, + 10, + -22, + -8 + ] + }, + "next-noc-table": { + "fontSize": 8, + "color": "#000000", + "margin": [ + -25, + 6, + -22, + 0 + ] + }, + "receipt-table-value": { + "color": "#000000", + "bold": true, + "fontSize": 8, + "fontWeight": 500, + "margin": [ + 8, + 0, + 0, + 0 + ] + }, + "receipt-table": { + "color": "#000000", + "bold": false, + "fontSize": 8, + "fontWeight": 400, + "margin": [ + -30, + 0, + 0, + 0 + ] + }, + "receipt-approver": { + "fontSize": 8, + "bold": true, + "margin": [ + -27, + 3, + -10, + 0 + ] + }, + "no-signature": { + "fontSize": 8, + "margin": [ + -27, + 3, + -10, + 0 + ] + }, + "pt-disclaimer": { + "fontSize": 8, + "margin": [ + -27, + 3, + -10, + 0 + ] + }, + "pt-disclaimer-value": { + "fontSize": 8, + "margin": [ + 2, + 1, + 0, + 0 + ] + } + } + } +} diff --git a/configs/pdf-service/format-config/firenoc-receipt.json b/configs/pdf-service/format-config/firenoc-receipt.json new file mode 100644 index 00000000..623f282e --- /dev/null +++ b/configs/pdf-service/format-config/firenoc-receipt.json @@ -0,0 +1,472 @@ +{ + "key":"firenoc-receipt", + "config":{ + "content": [ + { + "style": "noc-head", + "table": { + "widths": [ + 120, + "*", + 120 + ], + "body": [ + [ + { + "image": "{{variable32}}", + "width": 60, + "height": 61.25, + "margin": [ + 51, + 12, + 10, + 10 + ] + }, + { + "stack": [ + { + "text": "{{variable20}} NAGAR PANCHAYAT", + "style": "receipt-logo-header" + }, + { + "text": "Fire NOC Payment Receipt", + "style": "receipt-logo-sub-header" + } + ], + "alignment": "left", + "margin": [ + 10, + 23, + 0, + 0 + ] + }, + { + "image": "{{variable14}}", + "width": 70, + "height": 70, + "margin": [ + 50, + 8, + 8, + 8 + ], + "alignment": "right" + } + ] + ] + }, + "layout": "noBorders" + }, + { + "style": "noc-subhead", + "columns": [ + { + "text": [ + { + "text": "Application No. ", + "bold": true + }, + { + "text": "{{variable1}}", + "bold": false + } + ], + "alignment": "left" + }, + { + "text": [ + { + "text": "Date of Payment ", + "bold": true + }, + { + "text": "{{variable6}}", + "bold": false + } + ], + "alignment": "right" + } + ] + }, + { + "style": "noc-subhead", + "columns": [ + { + "text": [ + { + "text": "Payment Receipt No. ", + "bold": true + }, + { + "text": "{{variable7}}", + "bold": false + } + ], + "alignment": "left" + } + ] + }, + "{{#variable3}}{ \"text\": \"INSTITUTION DETAILS\", \"style\": \"noc-title\" }, { \"style\": \"noc-table\", \"table\": { \"widths\": [\"*\", \"*\", \"*\", \"*\"], \"body\": [ [ { \"text\": \"Type of Institution\", \"border\": [true, true, false, false] }, { \"text\": \"Name of Institute\", \"border\": [false, true, false, false] }, { \"text\": \"Official Telephone No.\", \"border\": [false, true, false, false] }, { \"text\": \"Authorized Person\", \"border\": [false, true, true, false] } ], [ { \"text\": \"{{variable21}}\", \"style\": \"receipt-table-value\", \"border\": [true, false, false, false] }, { \"text\": \"{{variable22}}\", \"style\": \"receipt-table-value\", \"border\": [false, false, false, false] }, { \"text\": \"{{variable23}}\", \"style\": \"receipt-table-value\", \"border\": [false, false, false, false] }, { \"text\": \"{{variable24}}\", \"style\": \"receipt-table-value\", \"border\": [false, false, true, false] } ], [ { \"text\": \"Designation in Institution\", \"border\": [true, false, false, false] }, { \"text\": \"Mobile No. of Authorized Person\", \"border\": [false, false, false, false] }, { \"text\": \"Email of Authorized Person\", \"border\": [false, false, false, false] }, { \"text\": \"Official Correspondence Address\", \"border\": [false, false, true, false] } ], [ { \"text\": \"{{variable25}}\", \"style\": \"receipt-table-value\", \"border\": [true, false, false, true] }, { \"text\": \"{{variable26}}\", \"style\": \"receipt-table-value\", \"border\": [false, false, false, true] }, { \"text\": \"{{variable27}}\", \"style\": \"receipt-table-value\", \"border\": [false, false, false, true] }, { \"text\": \"{{variable28}}\", \"style\": \"receipt-table-value\", \"border\": [false, false, true, true] } ] ] }, \"layout\": {} }{{/variable3}}{{^variable3}}{ \"text\": \"APPLICANT INFORMATION\", \"style\": \"noc-title\" }, { \"style\": \"noc-table", "table\": { \"widths\": [ \"*\", \"*\", \"*\", \"*\" ], \"body\": [ \"{{#variable2}}[{\"text\":\"Applicant Name\",\"border\":[true,true,false,true],\"style\":\"receipt-table-value\"},{\"text\":\"{{name}}\",\"border\":[false,true,true,true]},{\"text\":\"Mobile No.\",\"border\":[true,true,false,true],\"style\":\"receipt-table-value\"},{\"text\":\"{{mobileNumber}}\",\"border\":[false,true,true,true]}]{{/variable2}}\" ] }, \"layout\": {} }{{/variable3}}", + { + "text": "AMOUNT PAID", + "style": "noc-title" + }, + { + "style": "noc-table", + "table": { + "widths": [ + "*", + "*", + "*", + "*" + ], + "body": [ + [ + { + "text": "NOC Fee", + "border": [ + true, + true, + true, + true + ], + "style": "receipt-table-value", + "alignment": "center" + }, + { + "text": "NOC Taxes", + "border": [ + true, + true, + true, + true + ], + "style": "receipt-table-value", + "alignment": "center" + }, + { + "text": "Adhoc Penalty/Rebate", + "border": [ + true, + true, + true, + true + ], + "style": "receipt-table-value", + "alignment": "center" + }, + { + "text": "TOTAL", + "border": [ + true, + true, + true, + true + ], + "style": "receipt-table-value", + "alignment": "center" + } + ], + [ + { + "text": "{{variable8}}", + "border": [ + true, + true, + true, + true + ], + "alignment": "center" + }, + { + "text": "{{variable9}}", + "border": [ + true, + true, + true, + true + ], + "alignment": "center" + }, + { + "text": "{{variable31}}", + "border": [ + true, + true, + true, + true + ], + "alignment": "center" + }, + { + "text": "{{variable10}}", + "border": [ + true, + true, + true, + true + ], + "alignment": "center" + } + ] + ] + }, + "layout": {} + }, + { + "text": "PAYMENT INFORMATION", + "style": "noc-title" + }, + { + "style": "noc-table", + "table": { + "widths": [ + "*", + "*", + "*" + ], + "body": [ + [ + { + "text": "Payment Mode", + "border": [ + true, + true, + true, + true + ], + "style": "receipt-table-value", + "alignment": "center" + }, + { + "text": "Transaction ID/ Cheque/ DD No.", + "border": [ + true, + true, + true, + true + ], + "style": "receipt-table-value", + "alignment": "center" + }, + { + "text": "Bank Name & Branch", + "border": [ + true, + true, + true, + true + ], + "style": "receipt-table-value", + "alignment": "center" + } + ], + [ + { + "text": "{{variable18}}", + "border": [ + true, + true, + true, + true + ], + "alignment": "center" + }, + { + "text": "{{variable12}}", + "border": [ + true, + true, + true, + true + ], + "alignment": "center" + }, + { + "text": "{{variable13}}", + "border": [ + true, + true, + true, + true + ], + "alignment": "center" + } + ] + ] + }, + "layout": {} + }, + { + "style": "receipt-approver", + "columns": [ + { + "text": [ + { + "text": "Generated by: ", + "bold": true + }, + { + "text": "NOC Approver", + "bold": false + } + ], + "alignment": "left" + }, + { + "text": [ + { + "text": "Commissioner/EO", + "bold": true + } + ], + "alignment": "right" + }, + { + "text": [ + { + "text": "Note", + "bold": true + } + ], + "alignment": "left" + }, + + + { + "ol": + [ + + "This license is not the proof of Property Ownership or Copy of NOC.", + "This is a computer generated document, hence requires no signature.", + "Payment is subjected to vaerification /scrutiny by competent authority." + ], + "style":"disclaimer" + + } + ] + } + ], + "footer": [], + "styles": { + "noc-head": { + "fillColor": "#F2F2F2", + "margin": [ + -70, + -41, + -81, + 0 + ] + }, + "receipt-logo-header": { + "color": "#484848", + "fontFamily": "Roboto", + "fontSize": 16, + "bold": true, + "letterSpacing": 0.74, + "margin": [ + 0, + 0, + 0, + 5 + ] + }, + "receipt-logo-sub-header": { + "color": "#484848", + "fontFamily": "Roboto", + "fontSize": 13, + "letterSpacing": 0.6 + }, + "noc-subhead": { + "fontSize": 12, + "bold": true, + "margin": [ + -18, + 8, + 0, + 0 + ], + "color": "#484848" + }, + "noc-title": { + "fontSize": 10, + "bold": true, + "margin": [ + -18, + 16, + 8, + 8 + ], + "color": "#484848", + "fontWeight": 500 + }, + "noc-table": { + "fontSize": 10, + "color": "#484848", + "margin": [ + -20, + -2, + -8, + -8 + ] + }, + "receipt-header-details": { + "fontSize": 9, + "margin": [ + 0, + 0, + 0, + 8 + ], + "color": "#484848" + }, + "noc-table-key": { + "color": "#484848", + "bold": false, + "fontSize": 10 + }, + "receipt-table-value": { + "color": "#484848", + "bold": true, + "fontSize": 10 + }, + "receipt-footer": { + "color": "#484848", + "fontSize": 8, + "margin": [ + -6, + 15, + -15, + -10 + ] + }, + "receipt-no": { + "color": "#484848", + "fontSize": 10 + }, + "receipt-approver": { + "fontSize": 12, + "bold": true, + "margin": [ + -20, + 30, + -10, + 0 + ], + "color": "#484848" + }, + "disclaimer": + { + "fontSize":"10", + "margin": [ + 10, + 0, + 0, + 0 + ] + } + } + } +} \ No newline at end of file diff --git a/configs/pdf-service/format-config/firenocreceipt.json b/configs/pdf-service/format-config/firenocreceipt.json new file mode 100644 index 00000000..2b408bf7 --- /dev/null +++ b/configs/pdf-service/format-config/firenocreceipt.json @@ -0,0 +1,1369 @@ +{ + "key": "firenocreceipt", + "config": { + "defaultStyle": { + "font": "Cambay" + }, + "content": [ + { + "style": "noc-head", + "table": { + "widths": [ + 60, + "*", + 150 + ], + "body": [ + [ + { + "image": "{{logoImage}}", + "width": 50, + "height": 50 + }, + { + "stack": [ + { + "text": "{{logo-header}} {{mcGrade}}", + "style": "receipt-logo-header" + }, + { + "text": "{{serviceType}} {{payment_receipt}} (Employee Copy)", + "style": "receipt-logo-sub-header" + } + ], + "alignment": "left", + "margin": [ + 0, + 4, + 0, + 0 + ] + }, + { + "stack": [ + { + "text": "{{address}},{{phoneNumber}}", + "style": "receipt-logo-sub-header" + }, + { + "text": "{{website}},{{email}}", + "style": "receipt-logo-sub-header" + } + ], + "alignment": "right", + "color": "#484848", + "margin": [ + -100, + 0, + -25, + 0 + ] + } + ] + ] + }, + "layout": "noBorders" + }, + { + "style": "noc-table", + "table": { + "widths": [ + "30%", + "20%", + "30%", + "20%" + ], + "body": [ + [ + { + "text": "{{receipt_no}}.", + "border": [ + true, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{receiptNo}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{consumer_id}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{consumerID}}", + "border": [ + false, + true, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "Receipt Date", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{ReceiptDate}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Tax period", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{fromPeriod}} {{to}} {{toPeriod}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + + { + "text": "Consumer Name", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerName}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Contact No.", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerContact}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + + { + "text": "Address:", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerAddress}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Paid By", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{PaidBy}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ] + ] + }, + "layout": {} + }, + { + "style": "next-noc-table", + "table": { + "widths": [ + "30%", + "20%", + "30%", + "20%" + ], + "body": [ + [ + { + "text": "{{service_type}}", + "border": [ + true, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{serviceType}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{billing_period}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{fromPeriod}} {{to}} {{toPeriod}}", + "border": [ + false, + true, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{paid_amount}}", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "₹ {{paidAmount}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{payment_mode}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{paymentMode}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "Tax Amount", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "₹ {{taxAmount}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Field Fee", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "₹ {{fieldFee}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ],[ + { + "text": "CGST(if applicable)", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "₹ {{cgst}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "SGST(if applicable)", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "₹ {{sgst}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "Cheque/DD/PO/Transaction No.", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{chequeDD}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Cheque/DD/PO/Transaction Date", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{chequeDDDate}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + + } + ], [ + { + "text": "Bank Name", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{bankName}},{{branchName}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "IFSC Code", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{ifsc}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + + } + ], + [ + { + "text": "{{g8_receipt_no}}.", + "border": [ + true, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{G8ReceiptNo}}", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table" + }, + { + "text": "{{g8_receipt_date}}", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{G8ReceiptDate}}", + "border": [ + false, + false, + true, + true + ], + "style": "receipt-table" + } + ] + ] + }, + "layout": {} + }, + { + "style": "next-noc-table", + "table": { + "widths": [ + "10%", + "*" + ], + "body": [ + [ + { + "text":"Comments: ", + "border":[false, false, false, false] + }, + { + "text":"{{comments}}", + "border":[false, false, false, false] + } + ] + ], + "layout":"noBorders" + } + }, + { + "style": "receipt-approver", + "columns": [ + { + "text": [ + { + "text": "{{generated_by}}: ", + "bold": true + }, + { + "text": "{{user-name}}", + "bold": false + } + ], + "alignment": "left" + }, + { + "text": [ + { + "text": "Authorised Signatory", + "bold": true + } + ], + "alignment": "right", + "margin": [ + 0, + 0, + -10, + 1 + ] + } + ] + }, + { + "text":"---------------x------------------------------x-----------------------------x------------------------------x-----------------------x------------------x------", + "style":"next-noc-table" + + }, + { + "style": "noc-head-emp", + "table": { + "widths": [ + 60, + "*", + 120 + ], + "body": [ + [ + { + "image": "{{logoImage}}", + "width": 50, + "height": 50 + }, + { + "stack": [ + { + "text": "{{logo-header}} {{mcGrade}}", + "style": "receipt-logo-header" + }, + { + "text": "{{serviceType}} {{payment_receipt}} (Citizen Copy)", + "style": "receipt-logo-sub-header" + } + ], + "alignment": "left", + "margin": [ + 0, + 4, + 0, + 0 + ] + }, + { + "stack": [ + { + "text": "{{address}},{{phoneNumber}}", + "style": "receipt-logo-sub-header" + }, + { + "text": "{{website}},{{email}}", + "style": "receipt-logo-sub-header" + } + ], + "alignment": "right", + "color": "#484848", + "margin": [ + -100, + 0, + -25, + 0 + ] + } + ] + ] + }, + "layout": "noBorders" + }, + { + "style": "noc-table", + "table": { + "widths": [ + "30%", + "20%", + "30%", + "20%" + ], + "body": [ + [ + { + "text": "{{receipt_no}}.", + "border": [ + true, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{receiptNo}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{consumer_id}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{consumerID}}", + "border": [ + false, + true, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "Receipt Date", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{ReceiptDate}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Tax period", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{fromPeriod}} {{to}} {{toPeriod}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + + { + "text": "Consumer Name", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerName}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Contact No.", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerContact}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + + { + "text": "Address:", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerAddress}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Paid By", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{PaidBy}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ] + + ] + }, + "layout": {} + }, + { + "style": "next-noc-table", + "table": { + "widths": [ + "30%", + "20%", + "30%", + "20%" + ], + "body": [ + [ + { + "text": "{{service_type}}", + "border": [ + true, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{serviceType}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{billing_period}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{fromPeriod}} {{to}} {{toPeriod}}", + "border": [ + false, + true, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{paid_amount}}", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "₹ {{paidAmount}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{payment_mode}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{paymentMode}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], [ + { + "text": "Tax Amount", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "₹ {{taxAmount}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Field Fee", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "₹ {{fieldFee}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ],[ + { + "text": "CGST(if applicable)", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "₹ {{cgst}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "SGST(if applicable)", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "₹ {{sgst}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "Cheque/DD/PO/Transaction No.", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{chequeDD}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Cheque/DD/PO/Transaction Date", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{chequeDDDate}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + + } + ],[ + { + "text": "Bank Name", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{bankName}},{{branchName}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "IFSC Code", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{ifsc}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + + } + ], + [ + { + "text": "{{g8_receipt_no}}.", + "border": [ + true, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{G8ReceiptNo}}", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table" + }, + { + "text": "{{g8_receipt_date}}", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{G8ReceiptDate}}", + "border": [ + false, + false, + true, + true + ], + "style": "receipt-table" + } + ] + ] + }, + "layout": {} + }, + { + "style": "next-noc-table", + "table": { + "widths": [ + "10%", + "*" + ], + "body": [ + [ + { + "text":"Comments: ", + "border":[false, false, false, false] + }, + { + "text":"{{comments}}", + "border":[false, false, false, false] + } + ] + ], + "layout":"noBorders" + } + }, + { + "style": "receipt-approver", + "columns": [ + { + "text": [ + { + "text": "{{generated_by}}: ", + "bold": true + }, + { + "text": "{{user-name}}", + "bold": false + } + ], + "alignment": "left" + }, + { + "text": [ + { + "text": "Authorised Signatory", + "bold": true + } + ], + "alignment": "right", + "margin": [ + 0, + 0, + -10, + 1 + ] + } + ] + }, + { + "style": "pt-disclaimer", + "stack": [ + { + "text": "{{disclamer}}", + "bold": true, + "style": "pt-disclaimer-value" + }, + { + "text": "{{disclamer_1}}", + "bold": false, + "style": "pt-disclaimer-value" + }, + { + "text": "{{disclamer_2}}", + "bold": false, + "style": "pt-disclaimer-value" + }, + { + "text": "{{disclamer_3}}", + "bold": false, + "style": "pt-disclaimer-value" + }, { + "text":"Now log a complaint from WhatsApp, give a missed call on 8750975975 or send a Hi message on WhatsApp to this number", "bold": true, "fontSize": 8, "color": "blue", "decoration": "underline"} + ] + } + ], + "styles": { + "noc-head": { + "margin": [ + -30, + -30, + 0, + 1 + ] + }, + "noc-head-emp": { + "margin": [ + -30, + 10, + 0, + 1 + ] + }, + "receipt-logo-header": { + "color": "#000000", + "fontSize": 10, + "bold": true, + "letterSpacing": 0.74, + "margin": [ + 0, + 0, + 0, + 4 + ] + }, + "receipt-logo-sub-header": { + "color": "#000000", + "fontSize": 8, + "letterSpacing": 0.6 + }, + "noc-table": { + "fontSize": 8, + "color": "#000000", + "margin": [ + -25, + 10, + -22, + -8 + ] + }, + "next-noc-table": { + "fontSize": 8, + "color": "#000000", + "margin": [ + -25, + 6, + -22, + 0 + ] + }, + "receipt-table-value": { + "color": "#000000", + "bold": true, + "fontSize": 8, + "fontWeight": 500, + "margin": [ + 8, + 0, + 0, + 0 + ] + }, + "receipt-table": { + "color": "#000000", + "bold": false, + "fontSize": 8, + "fontWeight": 400, + "margin": [ + -30, + 0, + 0, + 0 + ] + }, + "receipt-approver": { + "fontSize": 8, + "bold": true, + "margin": [ + -27, + 3, + -10, + 0 + ] + }, + "no-signature": { + "fontSize": 8, + "margin": [ + -27, + 3, + -10, + 0 + ] + }, + "pt-disclaimer": { + "fontSize": 8, + "margin": [ + -27, + 3, + -10, + 0 + ] + }, + "pt-disclaimer-value": { + "fontSize": 8, + "margin": [ + 2, + 1, + 0, + 0 + ] + } + } + } +} diff --git a/configs/pdf-service/format-config/mcollect-bill.json b/configs/pdf-service/format-config/mcollect-bill.json new file mode 100644 index 00000000..081e437c --- /dev/null +++ b/configs/pdf-service/format-config/mcollect-bill.json @@ -0,0 +1,768 @@ +{ + "key": "mcollect-bill", + "config": { + "defaultStyle": { + "font": "Cambay" + }, + "content": [ + { + "style": "noc-head", + "table": { + "widths": [ + "33%", + "33%", + "33%" + ], + "body": [ + [ + { + "text": "{{letter-code}}", + "style": "receipt-logo-header" + }, + { + "text": "{{letter-header}}", + "alignment": "center", + "style": "receipt-logo-header" + }, + { + "text": "{{letter-section}}", + "alignment": "right", + "color": "#484848", + "style": "receipt-logo-header", + "margin": [ + 0, + 0, + -30, + 0 + ] + } + ] + ] + }, + "layout": "noBorders" + }, + { + "canvas": [ + { + "type": "line", + "x1": -25, + "y1": -5, + "x2": 540, + "y2": -5, + "lineWidth": 0.1 + }, + { + "type": "line", + "x1": -25, + "y1": -2.5, + "x2": 540, + "y2": -2.5, + "lineWidth": 0.1 + } + ] + }, + { + "style": "noc-table2", + "table": { + "widths": [ + "*" + ], + "body": [ + [ + { + "stack": [ + { + "text": "{{cb-name}} {{cantonment-board}}", + "alignment": "center", + "style": "receipt-logo-title-name" + }, + { + "text": "{{form-number}}", + "alignment": "center", + "style": "receipt-logo-title" + }, + { + "text": "{{rule-number}}", + "alignment": "center", + "style": "receipt-logo-title" + }, + { + "text": "{{challan}} / {{bill}}", + "alignment": "center", + "style": "receipt-logo-title" + } + ], + "border": [ + true, + true, + true, + false + ] + } + ], + [ + { + "stack": [ + { + "table": { + "widths": [ + "20%", + "30%", + "20%", + "30%" + ], + "body": [ + [ + { + "text": "{{challan_no}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{challanNo}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value-down" + }, + { + "text": "{{challan_date}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{challanDate}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value-down", + "font": "Roboto" + } + ] + ] + } + }, + { + "table": { + "widths": [ + "20%", + "30%", + "20%", + "30%" + ], + "body": [ + [ + { + "text": "{{bill_no}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{billNo}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value-down" + }, + { + "text": "{{bill_date}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{billDate}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value-down", + "font": "Roboto" + } + ] + ] + } + }, + { + "table": { + "widths": [ + "20%", + "30%", + "20%", + "30%" + ], + "body": [ + [ + { + "text": "{{service_category}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{serviceCategory}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value-down" + }, + { + "text": "{{service_type}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{serviceType}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value-down" + } + ] + ] + } + }, + { + "table": { + "widths": [ + "20%", + "30%", + "20%", + "30%" + ], + "body": [ + [ + { + "text": "{{validity_from}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{fromPeriod}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value-down", + "font": "Roboto" + }, + { + "text": "{{validity_to}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{toPeriod}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value-down", + "font": "Roboto" + } + ] + ] + } + }, + { + "table": { + "widths": [ + "20%", + "30%", + "20%", + "30%" + ], + "body": [ + [ + { + "text": "{{consumer_Name}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerName}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value-down" + }, + { + "text": "{{payer_contact}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerContact}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value-down", + "font": "Roboto" + } + ] + ] + } + }, + { + "table": { + "widths": [ + "19%", + "81%" + ], + "body": [ + [ + { + "text": "{{address_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{doorHouseNo}}, {{buildingName}}, {{streetName}}, {{mohalla}}, {{pinCode}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value-down" + } + ] + ] + } + } + ] + } + ] + ] + }, + "layout": {} + }, + { + "style": "noc-table3", + "table": { + "widths": [ + "*" + ], + "body": [ + [ + { + "text": "{{total_amount}}", + "border": [ + true, + true, + true, + false + ], + "style": "receipt-table-value-total", + "bold": false + } + ], + [ + { + "text": "{{Rs}} {{totalAmount}}", + "border": [ + true, + false, + true, + false + ], + "style": "receipt-table-value-total", + "fontSize": 20 + } + ] + ] + }, + "layout": {} + }, + { + "style": "noc-table4", + "table": { + "widths": [ + "60%", + "30%", + "10%" + ], + "body": [ + "{{#variable10}}[{\"text\": \"{{trade_license_tax}}\",\"border\": [true,false,false,false], \"style\": \"receipt-table-value-down\"},{\"text\": \"{{tradeLicenseTax}}\", \"border\": [false,false,false,false], \"style\": \"receipt-table-value-down\"},{ \"text\": \" \",\"border\": [false,false,true, false ]}]{{/variable10}}" + ] + }, + "layout": {} + }, + { + "canvas": [ + { + "type": "line", + "x1": -25, + "y1": 0, + "x2": 345, + "y2": 0, + "lineWidth": 1 + } + ] + }, + { + "style": "noc-table4", + "table": { + "widths": [ + "60%", + "30%", + "10%" + ], + "body": [ + [ + { + "text": "{{total_amount}}", + "border": [ + true, + false, + false, + true + ], + "bold": true, + "style": "receipt-table-value-down" + }, + { + "text": "{{totalAmount}}", + "border": [ + false, + false, + false, + true + ], + "bold": true, + "style": "receipt-table-value-down" + }, + { + "image": "{{qrcodeimage}}", + "style": "receipt-table-value-total-Qr", + "border": [ + false, + false, + true, + true + ], + "width": 72, + "height": 72 + } + ] + ] + }, + "layout": {} + }, + { + "table": { + "widths": [ + "*" + ], + "body": [ + [ + { + "style": "no-signature", + "text": "{{no_signature}}" + } + ] + ] + }, + "layout": "noBorders" + } + ], + "styles": { + "noc-head": { + "margin": [ + -25, + -30, + 0, + 1 + ] + }, + "qr-head": { + "margin": [ + 0, + 30, + 0, + 1 + ] + }, + "noc-table3": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -25, + 15, + -25, + -0 + ] + }, + "noc-table4": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -25, + 0, + -25, + -0 + ] + }, + "no-signature": { + "fontSize": 12, + "margin": [ + -20, + 35, + -10, + 0 + ], + "color": "#484848" + }, + "receipt-approver": { + "fontSize": 12, + "bold": true, + "margin": [ + -27, + 50, + -10, + 0 + ], + "color": "#484848" + }, + "receipt-logo-title": { + "color": "#000000", + "bold": true, + "fontSize": 9, + "fontWeight": 500 + }, + "receipt-logo-title-name": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500 + }, + "receipt-logo-header": { + "color": "#484848", + "fontSize": 9, + "bold": false, + "letterSpacing": 0.74, + "margin": [ + 0, + 0, + 0, + 5 + ] + }, + "noc-table": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -25, + 45, + -8, + -8 + ] + }, + "noc-table2": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -25, + 18, + -25, + -8 + ] + }, + "receipt-table-value": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 3, + 5, + 0, + 5 + ] + }, + "receipt-table-value-total": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "alignment": "right", + "margin": [ + 0, + 5, + 30, + 0 + ] + }, + "receipt-table-value-total-Qr": { + "alignment": "right", + "margin": [ + 0, + -40, + 10, + 0 + ] + }, + "receipt-table-value-down": { + "color": "#000000", + "bold": false, + "fontSize": 12, + "fontWeight": 400, + "alignment": "left", + "margin": [ + 3, + 5, + 0, + 5 + ] + }, + "receipt-table-value2": { + "color": "#000000", + "bold": false, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 3, + 0, + 0, + 0 + ] + }, + "receipt-table-value-cont": { + "color": "#000000", + "bold": false, + "fontSize": 11, + "fontWeight": 400, + "margin": [ + 3, + 0, + 0, + 0 + ] + }, + "receipt-table": { + "color": "#484848", + "bold": true, + "fontSize": 12, + "fontWeight": 400, + "margin": [ + -30, + 5, + 0, + 0 + ] + }, + "receipt-table2": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 3, + 0, + 0, + 0 + ] + }, + "pt-disclaimer": { + "fontSize": 11, + "margin": [ + -27, + 0, + -10, + 0 + ], + "color": "#484848" + }, + "pt-disclaimer-value": { + "fontSize": 10, + "margin": [ + 2, + 5, + 0, + 0 + ], + "color": "#484848" + } + } + } +} diff --git a/configs/pdf-service/format-config/mcollect-challan.json b/configs/pdf-service/format-config/mcollect-challan.json new file mode 100644 index 00000000..4ed93c20 --- /dev/null +++ b/configs/pdf-service/format-config/mcollect-challan.json @@ -0,0 +1,824 @@ +{ + "key": "mcollect-challan", + "config": { + "defaultStyle": { + "font": "Cambay" + }, + "content": [ + { + "style": "noc-head", + "table": { + "widths": [ + "33%", + "33%", + "33%" + ], + "body": [ + [ + { + "text": " ", + "style": "receipt-logo-header" + }, + { + "text": "{{letter-header}}", + "alignment": "center", + "style": "receipt-logo-header" + }, + { + "text": " ", + "alignment": "right", + "color": "#484848", + "style": "receipt-logo-header", + "margin": [ + 0, + 0, + -30, + 0 + ] + } + + ] + ] + }, + "layout": "noBorders" + }, + + { + "style": "noc-table2", + "table": { + "widths": [ + "*" + ], + "body": [ + [ + { + "stack": [ + { + "text": "{{cb-name}} {{mcGrade}}", + "alignment": "center", + "style": "receipt-logo-title-name" + }, + { + "text": "{{form-number}}", + "alignment": "center", + "style": "receipt-logo-title" + }, + { + "text": "{{challanStatus}}", + "style": "receipt-logo-title-status" + }, + { + "text": "{{rule-number}}", + "alignment": "center", + "style": "receipt-logo-title" + }, + { + "text": "{{challan}} / {{bill}}", + "alignment": "center", + "style": "receipt-logo-title" + } + ], + "border": [ + true, + true, + true, + false + ] + } + ], + [ + { + "stack": [ + { + "table": { + "widths": [ + "20%", + "30%", + "20%", + "30%" + ], + "body": [ + [ + { + "text": "{{challan_no}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{challanNo}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value-down" + }, + { + "text": "{{challan_date}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{challanDate}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value-down", + "font": "Roboto" + } + ] + ] + } + }, + { + "table": { + "widths": [ + "20%", + "30%", + "20%", + "30%" + ], + "body": [ + [ + { + "text": "{{bill_no}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{billNo}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value-down" + }, + { + "text": "{{bill_date}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{billDate}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value-down", + "font": "Roboto" + } + ] + ] + } + }, + { + "table": { + "widths": [ + "20%", + "30%", + "20%", + "30%" + ], + "body": [ + [ + { + "text": "{{service_category}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{serviceCategory}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value-down" + }, + { + "text": "{{service_type}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{serviceType}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value-down" + } + ] + ] + } + }, + { + "table": { + "widths": [ + "20%", + "30%", + "20%", + "30%" + ], + "body": [ + [ + { + "text": "{{validity_from}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{fromPeriod}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value-down", + "font": "Roboto" + }, + { + "text": "{{validity_to}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{toPeriod}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value-down", + "font": "Roboto" + } + ] + ] + } + }, + { + "table": { + "widths": [ + "20%", + "30%", + "20%", + "30%" + ], + "body": [ + [ + { + "text": "{{consumer_Name}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{consumerName}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value-down" + }, + { + "text": "{{payer_contact}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerContact}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value-down", + "font": "Roboto" + } + ] + ] + } + }, + { + "table": { + "widths": [ + "19%", + "81%" + ], + "body": [ + [ + { + "text": "{{address_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{doorHouseNo}}, {{buildingName}}, {{streetName}},{{pinCode}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value-down" + } + ] + ] + } + }, + { + "table": { + "widths": [ + "19%", + "81%" + ], + "body": [ + [ + { + "text": "{{remarks_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{challanRemarks}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-logo-title-remarks-new" + } + ] + ] + } + } + ] + } + ] + ] + }, + "layout": {} + }, + { + "style": "noc-table3", + "table": { + "widths": [ + "*" + ], + "body": [ + [ + { + "text": "{{total_amount}}", + "border": [ + true, + true, + true, + false + ], + "style": "receipt-table-value-total", + "bold": false + } + ], + [ + { + "text": "{{Rs}} {{totalAmount}}", + "border": [ + true, + false, + true, + false + ], + "style": "receipt-table-value-total", + "fontSize": 20 + } + ] + ] + }, + "layout": {} + }, + { + "style": "noc-table4", + "table": { + "widths": [ + "60%", + "30%", + "10%" + ], + "body": [ + "{{#variable10}}[{\"text\": \"{{trade_license_tax}}\",\"border\": [true,false,false,false], \"style\": \"receipt-table-value-down\"},{\"text\": \"{{tradeLicenseTax}}\", \"border\": [false,false,false,false], \"style\": \"receipt-table-value-down\"},{ \"text\": \" \",\"border\": [false,false,true, false ]}]{{/variable10}}" + ] + }, + "layout": {} + }, + { + "canvas": [ + { + "type": "line", + "x1": -25, + "y1": 0, + "x2": 345, + "y2": 0, + "lineWidth": 1 + } + ] + }, + { + "style": "noc-table4", + "table": { + "widths": [ + "60%", + "30%", + "10%" + ], + "body": [ + [ + { + "text": "{{total_amount}}", + "border": [ + true, + false, + false, + true + ], + "bold": true, + "style": "receipt-table-value-down" + }, + { + "text": "{{totalAmount}}", + "border": [ + false, + false, + false, + true + ], + "bold": true, + "style": "receipt-table-value-down" + }, + { + "image": "{{qrcodeimage}}", + "style": "receipt-table-value-total-Qr", + "border": [ + false, + false, + true, + true + ], + "width": 72, + "height": 72 + } + ] + ] + }, + "layout": {} + }, + { + "table": { + "widths": [ + "*" + ], + "body": [ + [ + { + "style": "no-signature", + "text": "{{no_signature}}" + } + ] + ] + }, + "layout": "noBorders" + } + ], + "styles": { + "noc-head": { + "margin": [ + -25, + -30, + 0, + 1 + ] + }, + "qr-head": { + "margin": [ + 0, + 30, + 0, + 1 + ] + }, + "noc-table3": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -25, + 15, + -25, + -0 + ] + }, + "noc-table4": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -25, + 0, + -25, + -0 + ] + }, + "no-signature": { + "fontSize": 12, + "margin": [ + -20, + 35, + -10, + 0 + ], + "color": "#484848" + }, + "receipt-approver": { + "fontSize": 12, + "bold": true, + "margin": [ + -27, + 50, + -10, + 0 + ], + "color": "#484848" + }, + "receipt-logo-title": { + "color": "#000000", + "bold": true, + "fontSize": 9, + "fontWeight": 500 + }, + "receipt-logo-title-name": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500 + }, + "receipt-logo-header": { + "color": "#484848", + "fontSize": 9, + "bold": false, + "letterSpacing": 0.74, + "margin": [ + 0, + 0, + 0, + 5 + ] + }, + "receipt-logo-title-status": { + "color": "#000000", + "alignment": "right", + "bold": true, + "fontSize": 13, + "fontWeight": 500, + "margin": [ + 0, + -22, + 60, + 0 + ] + }, + "receipt-logo-title-remarks": { + "color": "#000000", + "alignment": "right", + "bold": true, + "fontSize": 8, + "fontWeight": 500, + "margin": [ + 0, + -22, + 70, + -10 + ] + }, + "receipt-logo-title-remarks-new": { + "color": "#000000", + "bold": true, + "fontSize": 10, + "fontWeight": 500, + "margin": [ + 0, + 0, + 0, + 0 + ] + }, + "noc-table": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -25, + 45, + -8, + -8 + ] + }, + "noc-table2": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -25, + 18, + -25, + -8 + ] + }, + "receipt-table-value": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 3, + 5, + 0, + 5 + ] + }, + "receipt-table-value-total": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "alignment": "right", + "margin": [ + 0, + 5, + 30, + 0 + ] + }, + "receipt-table-value-total-Qr": { + "alignment": "right", + "margin": [ + 0, + -40, + 10, + 0 + ] + }, + "receipt-table-value-down": { + "color": "#000000", + "bold": false, + "fontSize": 12, + "fontWeight": 400, + "alignment": "left", + "margin": [ + 3, + 5, + 0, + 5 + ] + }, + "receipt-table-value2": { + "color": "#000000", + "bold": false, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 3, + 0, + 0, + 0 + ] + }, + "receipt-table-value-cont": { + "color": "#000000", + "bold": false, + "fontSize": 11, + "fontWeight": 400, + "margin": [ + 3, + 0, + 0, + 0 + ] + }, + "receipt-table": { + "color": "#484848", + "bold": true, + "fontSize": 12, + "fontWeight": 400, + "margin": [ + -30, + 5, + 0, + 0 + ] + }, + "receipt-table2": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 3, + 0, + 0, + 0 + ] + }, + "pt-disclaimer": { + "fontSize": 11, + "margin": [ + -27, + 0, + -10, + 0 + ], + "color": "#484848" + }, + "pt-disclaimer-value": { + "fontSize": 10, + "margin": [ + 2, + 5, + 0, + 0 + ], + "color": "#484848" + } + } + } +} diff --git a/configs/pdf-service/format-config/misc-receipt.json b/configs/pdf-service/format-config/misc-receipt.json new file mode 100644 index 00000000..babaa3eb --- /dev/null +++ b/configs/pdf-service/format-config/misc-receipt.json @@ -0,0 +1,592 @@ +{ + "key": "misc-receipt", + "config": { + "defaultStyle": { + "font": "Cambay" + }, + "content": [ + { + "style": "noc-head", + "table": { + "widths": [ + 60, + "*" + ], + "body": [ + [ + { + "image": "{{logoImage}}", + "width": 50, + "height": 61.25, + "margin": [ + 10, + 0, + 0, + 0 + ] + }, + { + "stack": [ + { + "text": "{{logo-header}}", + "style": "receipt-logo-header" + }, + { + "text": "{{payment_receipt}}", + "style": "receipt-logo-sub-header" + } + ], + "alignment": "center", + "margin": [ + 0, + 10, + 0, + 0 + ] + } + ] + ] + }, + "layout": {} + }, + { + "style": "receipt-approver", + "columns": [ + { + "text": [ + { + "text": "{{receipt_info}}", + "bold": true + } + ], + "alignment": "left" + } + ] + }, + { + "style": "noc-table", + "table": { + "widths": [ + "16%", + "18%", + "16%", + "10%", + "18%", + "22%" + ], + "body": [ + [ + { + "text": "{{receipt_no}} :", + "border": [ + true, + true, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{receiptNo}}", + "border": [ + false, + true, + true, + true + ], + "style": "receipt-table" + }, + { + "text": "{{payment_date}} :", + "border": [ + true, + true, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{paymentDate}}", + "border": [ + false, + true, + true, + true + ], + "style": "receipt-table" + }, + { + "text": "{{consumer_id}} :", + "border": [ + true, + true, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{consumerID}}", + "border": [ + false, + true, + true, + true + ], + "style": "receipt-table" + } + ] + ] + }, + "layout": {} + }, + { + "style": "receipt-approver", + "columns": [ + { + "text": [ + { + "text": "{{payer_info}}", + "bold": true + } + ], + "alignment": "left" + } + ] + }, + { + "style": "noc-table", + "table": { + "widths": [ + "25%", + "25%", + "25%", + "25%" + ], + "body": [ + [ + { + "text": "{{payer_name}} :", + "border": [ + true, + true, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerName}}", + "border": [ + false, + true, + true, + true + ], + "style": "receipt-table" + }, + { + "text": "{{payer_contact}} :", + "border": [ + true, + true, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerContact}}", + "border": [ + false, + true, + true, + true + ], + "style": "receipt-table" + } + ] + ] + }, + "layout": {} + }, + { + "style": "receipt-approver", + "columns": [ + { + "text": [ + { + "text": "{{payment_info}}", + "bold": true + } + ], + "alignment": "left" + } + ] + }, + { + "style": "next-noc-table", + "table": { + "widths": [ + "25%", + "25%", + "25%", + "25%" + ], + "body": [ + [ + { + "text": "{{service_type}} :", + "border": [ + true, + true, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{serviceType}}", + "border": [ + false, + true, + false, + true + ], + "style": "receipt-table" + }, + { + "text": " ", + "border": [ + false, + true, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": " ", + "border": [ + false, + true, + true, + true + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{billing_period}} :", + "border": [ + true, + true, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{fromPeriod}} {{to}} {{toPeriod}}", + "border": [ + false, + true, + true, + true + ], + "style": "receipt-table" + }, + { + "text": "{{paid_amount}} :", + "border": [ + true, + true, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "₹ {{paidAmount}}", + "border": [ + false, + true, + true, + true + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{payment_mode}} :", + "border": [ + true, + true, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{paymentMode}}", + "border": [ + false, + true, + true, + true + ], + "style": "receipt-table" + }, + { + "text": "{{transaction_id}} :", + "border": [ + true, + true, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{transactionID}}", + "border": [ + false, + true, + true, + true + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{g8_receipt_no}} :", + "border": [ + true, + true, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{G8ReceiptNo}}", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table" + }, + { + "text": "{{g8_receipt_date}} :", + "border": [ + true, + true, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{G8ReceiptDate}}", + "border": [ + false, + true, + true, + true + ], + "style": "receipt-table" + } + ] + ] + }, + "layout": {} + }, + { + "style": "receipt-approver", + "columns": [ + { + "text": [ + { + "text": "{{generated_by}} : ", + "bold": true + }, + { + "text": "{{user-name}}", + "bold": false + } + ], + "alignment": "left" + }, + { + "text": [ + { + "text": "{{commissioner/eo}}", + "bold": true + } + ], + "alignment": "right", + "margin": [ + 0, + 0, + -10, + 1 + ] + } + ] + }, + { + "style": "no-signature", + "text": "{{no_signature}}" + }, + { + "style": "pt-disclaimer", + "stack": [ + { + "text": "{{disclamer}}", + "bold": true, + "style": "pt-disclaimer-value" + }, + { + "text": "{{disclamer_1}}", + "bold": false, + "style": "pt-disclaimer-value" + }, + { + "text": "{{disclamer_2}}", + "bold": false, + "style": "pt-disclaimer-value" + }, + { + "text": "{{disclamer_3}}", + "bold": false, + "style": "pt-disclaimer-value" + }, + { + "text": "{{disclamer_4}}", + "bold": false, + "style": "pt-disclaimer-value" + } + ] + } + ], + "styles": { + "noc-head": { + "fillColor": "#b8bfcc", + "margin": [ + -25, + -30, + -22, + 1 + ] + }, + "receipt-logo-header": { + "color": "#000000", + "fontSize": 14, + "bold": true, + "letterSpacing": 0.74, + "margin": [ + 0, + 0, + 0, + 5 + ] + }, + "receipt-logo-sub-header": { + "color": "#000000", + "fontSize": 12, + "letterSpacing": 0.6 + }, + "noc-table": { + "fontSize": 12, + "color": "#000000", + "margin": [ + -25, + 20, + -22, + 0 + ] + }, + "next-noc-table": { + "fontSize": 12, + "color": "#000000", + "margin": [ + -25, + 10, + -22, + 0 + ] + }, + "receipt-table-value": { + "color": "#000000", + "bold": true, + "fontSize": 10, + "fontWeight": 500, + "margin": [ + 8, + 8, + 0, + 0 + ] + }, + "receipt-table": { + "color": "#000000", + "bold": false, + "fontSize": 10, + "fontWeight": 400, + "margin": [ + -6, + 8, + 0, + 0 + ] + }, + "receipt-approver": { + "fontSize": 12, + "bold": true, + "margin": [ + -27, + 30, + -10, + 0 + ], + "color": "#484848" + }, + "no-signature": { + "fontSize": 12, + "margin": [ + -27, + 35, + -10, + 0 + ], + "color": "#484848" + }, + "pt-disclaimer": { + "fontSize": 12, + "margin": [ + -27, + 30, + -10, + 0 + ], + "color": "#484848" + }, + "pt-disclaimer-value": { + "fontSize": 9, + "margin": [ + 2, + 5, + 0, + 0 + ], + "color": "#484848" + } + } + } +} diff --git a/configs/pdf-service/format-config/passvehicle-certificate.json b/configs/pdf-service/format-config/passvehicle-certificate.json new file mode 100644 index 00000000..dcbb8d75 --- /dev/null +++ b/configs/pdf-service/format-config/passvehicle-certificate.json @@ -0,0 +1,500 @@ +{ + "key": "tlcertificate", + "config": { + "defaultStyle": { + "font": "Cambay" + }, + "content": [ + + { + "style": "noc-head", + "table": { + "widths": [ + "*" + ], + "body": [ + [ + { + "image": "{{qr}}", + "width": 70, + "height": 70, + "margin": [ + 50, + 8, + -30, + 8 + ], + "alignment": "right" + } + + ] + ] + }, + "layout": "noBorders" + }, + + { + "style":"noc-head", + "table":{ + "widths":[ + "*" + ], + "body":[ + [ + { + "image": "{{userpic}}", + "width": 80, + "height": 92, + "alignment": "center", + "margin": [ + 0, + 10, + 0, + 10 + ] + } + ], + [ + { + "stack": [ + { + "text":"{{municipal_corportaion}}", + "style":"receipt-logo-header" + } + ], + "alignment":"left", + "margin":[ + 0, + 10, + 0, + 0 + ] + } + ], + [ + { + "stack": [ + { + "text":"{{trade_license_certifcate}}", + "style":"receipt-sub-logo-header" + }, + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":"{{trade_license_no}}", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":"{{tradeLicenseNo}}", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + }, + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":"{{application_no}}", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":"{{applicationNo}}", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + }, + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":"{{trade_type}}", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":"{{tradeType}}", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + }, + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":"{{pass_subCategory}}", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":"{{passSubCategory}}", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + }, + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":"{{purpose_label}}", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":"{{purpose_content}}", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + }, + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":"{{license_issue_date}}", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":"{{licenseIssueDate}}", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + }, + + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":"{{license_validity_from}}", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":"{{licenseValidityFrom}}", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + }, + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":"{{license_validity_to}}", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":"{{licenseValidityTo}}", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + }, + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":"{{vehicle_number_label}}", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":"{{vehicleNumber}}", + "style":"receipt-sub-logo-sub-header", + "font": "Roboto" + } + ] + ] + }, + "layout":"noBorders" + }, + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":"{{vehicle_company_label}}", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":"{{vehicleCompany}}", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + }, + + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":"{{vehicle_model_label}}", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":"{{vehicleModel}}", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + } + ], + "alignment":"left", + "margin":[ + 0, + 10, + 0, + 0 + ] + } + ] + ] + }, + "layout":"noBorders" + }, + { + "style":"receipt-approver", + "columns": [ + { + "text":[ + { + "text":"{{approved_by}} ", + "bold": true + }, + { + "text":" {{approvedBy}}", + "bold": false + } + ], + "alignment":"left" + }, + { + "text":[ + { + "text":"{{commissioner}}", + "bold": true + } + ], + "alignment":"right" + } + ] + }, + { + "text": "{{disclaimer_heading}}", + "bold": true, + "style": "receipt-approver", + "alignment": "left", + "fontSize": 13, + "margin": [ + -10, + 70, + 0, + 0 + ] + }, + { + "text": "{{disclaimer_body}}", + "style": "receipt-sub-logo-sub-header", + "alignment": "left", + "fontSize": 13, + "margin": [ + -10, + 10, + 0, + 0 + ] + } + ], + "styles": { + "noc-head": { + "margin": [ + -30, + -35, + 0, + -2 + ] + }, + "receipt-approver": { + "color": "#000000", + "fontSize": 14, + "letterSpacing": 0.6, + "alignment": "center", + "margin": [ + -10, + 50, + 0, + 1 + ] + }, + "receipt-logo-header": { + "color": "#000000", + "fontSize": 20, + "letterSpacing": 0.74, + "alignment": "center", + "margin": [ + 0, + 0, + 0, + 5 + ] + }, + "receipt-sub-logo-header": { + "color": "#000000", + "fontSize": 18, + "letterSpacing": 0.74, + "alignment": "center", + "margin": [ + 0, + 5, + 0, + 5 + ] + }, + "receipt-logo-sub-header": { + "color": "#484848", + "fontSize": 14, + "letterSpacing": 0.6, + "alignment": "center", + "margin": [ + 0, + 5, + 0, + 0 + ] + }, + "receipt-sub-logo-sub-header": { + "color": "#484848", + "fontSize": 14, + "letterSpacing": 0.6, + "alignment": "left", + "margin": [ + 50, + 40, + 0, + 0 + ] + }, + "receipt-sub-address-sub-header": { + "color": "#484848", + "fontSize": 14, + "letterSpacing": 0.1, + "alignment": "right", + "margin": [ + 50, + 30, + -90, + 0 + ] + }, + "receipt-sub-website-sub-header": { + "color": "#484848", + "fontSize": 14, + "letterSpacing": 0.1, + "alignment": "right", + "margin": [ + 50, + 30, + -120, + 0 + ] + }, + "receipt-sub-email-sub-header": { + "color": "#484848", + "fontSize": 14, + "letterSpacing": 0.1, + "alignment": "right", + "margin": [ + 50, + 30, + -110, + 0 + ] + } + } + } + } \ No newline at end of file diff --git a/configs/pdf-service/format-config/property-bill.json b/configs/pdf-service/format-config/property-bill.json new file mode 100644 index 00000000..140463f7 --- /dev/null +++ b/configs/pdf-service/format-config/property-bill.json @@ -0,0 +1,1212 @@ +{ + "key": "property-bill", + "config": { + "defaultStyle": { + "font": "Cambay" + }, + "content": [ + { + "style": "noc-head", + "table": { + "widths": [ + 60, + "*", + 120 + ], + "body": [ + [ + { + "image": "{{logoImage}}", + "width": 50, + "height": 61.25 + }, + { + "stack": [ + { + "text": "{{logo_header}} {{Municipal_Corporation}}", + "style": "receipt-logo-header" + }, + { + "stack": [ + { + "text": "{{address}}" + }, + { + "text": "{{phoneNumber}}" + }, + { + "text": "{{website}}" + }, + { + "text": "{{email}}" + } + ] + } + ], + "alignment": "left", + "margin": [ + 0, + 10, + 0, + 0 + ] + }, + { + "stack": [ + { + "text": "{{total_amount_due}}" + }, + { + "text": "{{Rs}} {{totalAmountDue}}", + "style": "amount-due" + } + ], + "alignment": "right", + "color": "#484848", + "margin": [ + -150, + 2, + -20, + 0 + ] + } + ] + ] + }, + "layout": "noBorders" + }, + { + "style": "noc-table", + "table": { + "widths": [ + 130, + 130, + -2, + 130, + 130 + ], + "body": [ + [ + { + "text": "{{payer_name}}", + "border": [ + true, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerName}}", + "border": [ + false, + true, + true, + false + ], + "style": "receipt-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ] + }, + { + "text": "{{bill_no}}", + "border": [ + true, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{billNo}}", + "border": [ + false, + true, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{mobile_no}}", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{mobileNo}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ] + }, + { + "text": "{{bill_period}}", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{fromPeriod}} - {{toPeriod}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{payer_address}}", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerAddress}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ] + }, + { + "text": "{{bill_issue_date}}", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{billIssueDate}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": " ", + "border": [ + true, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": " ", + "border": [ + false, + false, + true, + true + ], + "style": "receipt-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ] + }, + { + "text": "{{bill_due_date}}", + "border": [ + true, + false, + false, + true + ], + "style": "right-receipt-table" + }, + { + "text": "{{billDueDate}}", + "border": [ + false, + false, + true, + true + ], + "style": "right-receipt-table2" + } + ] + ] + }, + "layout": {} + }, + { + "style": "noc-table2", + "table": { + "widths": [ + "103%" + ], + "body": [ + [ + { + "text": "{{billing_summary_property_tax}} {{serviceType}}", + "border": [ + true, + true, + true, + false + ], + "style": "receipt-table-value" + } + ], + [ + { + "table": { + "widths": [ + "30%", + "26%", + "10%", + "11%", + "10%", + "15%" + ], + "body": [ + [ + { + "text": "{{tl_application_no}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{bill_period}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{charge_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{penalty_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{rebate_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{adhoc_penalty_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + } + ], + [ + { + "text": "{{propertyID}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{fromPeriod}}-{{toPeriod}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{charge}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{penalty}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{rebate}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{adhoc_penalty}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + } + ] + ] + } + } + ], + [ + { + "table": { + "widths" : [ + "11%", + "15%", + "15%", + "11%", + "11%", + "11%", + "11%", + "11%" + ], + "body":[ + [ + { + "text": "{{adhoc_rebate_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{owner_exemption_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{unit_usage_exemption_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{fire_cess_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{cancer_cess_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{time_interest_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{decimal_ceiling_debit_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{decimal_ceiling_credit_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + } + ], + [ + { + "text": "{{adhoc_rebate}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2", + "bold": true + }, + { + "text": "{{owner_exemption}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{unit_usage_exemption}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{fire_cess}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{cancer_cess}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{time_interest}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{decimal_ceiling_debit}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{decimal_ceiling_credit}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2", + "bold": true + } + ] + + ] + } + + } + ], + [ + { + "table": { + "widths" : [ + "18%", + "11%", + "11%", + "11%" + ], + "body":[ + [ + { + "text": "{{advance_carryforward_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{arrears_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{roundoff_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{total_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + } + ], + [ + { + "text": "{{advance_carryforward}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{arrearrs}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{roundoff}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{total}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2", + "bold": true + } + ] + + ] + } + + } + ] + ] + }, + "layout": {} + }, + + { + "style" : "noc-table3", + "table" : { + "widths": [ + "103%" + ], + "body":[ + [ + { + "style": "noc-table3", + "table": { + "widths": [ + "100%" + ], + "body": ["[{\"text\": \"{{important_message}}\",\"border\":[false,false,false,false],\"style\":\"bill-message-header\"}],{{#variable11}}[{\"text\":\"{{disclaimerContent}}\",\"border\":[false,false,false,false],\"style\":\"bill-message-value\"}]{{/variable11}}"] + } + } + ] + ] + + } + }, + { + "canvas": [ + { + "type": "line", + "x1": -40, + "y1": 30, + "x2": 700, + "y2": 30, + "dash": { + "length": 10, + "space": 5 + } + } + ] + }, + { + "image": "{{scissorImage}}", + "width": 24, + "height": 24, + "margin": [ + -30, + -11.2, + 0, + 0 + ] + }, + + { + "text": "{{acknowledgement_for}}", + "style": "footer-header" + + }, + { + "style": "noc-table4", + "table": { + "widths": [ + "25%", + "30%", + "25%", + "25%" + ], + "body": [ + [ + { + "text": "{{date_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{billdate}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{consumer_id}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{consumerID}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{bill_no}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{billNo}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{name_address}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerName}}, {{nameAddress}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{total_payment}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{total}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + } + ] + ] + } + }, + { + "text": "{{receivers_signature}}", + "style": "footer-bottom" + } + ], + "styles": { + "noc-head": { + "margin": [ + -25, + -30, + 0, + 1 + ] + }, + "receipt-logo-header": { + "color": "#484848", + "fontFamily": "Roboto", + "fontSize": 14, + "bold": true, + "letterSpacing": 0.74, + "margin": [ + 0, + -10, + 0, + 5 + ] + }, + "receipt-logo-sub-header": { + "color": "#484848", + "fontFamily": "Roboto", + "fontSize": 13, + "letterSpacing": 0.6 + }, + "noc-table": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -25, + 10, + -8, + -8 + ] + }, + "noc-table4": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -25, + 75, + -8, + -8 + ] + }, + "noc-table2": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -25, + 18, + -8, + -8 + ] + }, + "noc-table3": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -25, + 30, + -8, + -8 + ] + }, + "receipt-table-value": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 8, + 5, + 0, + 0 + ] + }, + "receipt-table-value2": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 3, + 5, + 0, + 0 + ] + }, + "receipt-table": { + "color": "#484848", + "bold": true, + "fontSize": 12, + "fontWeight": 400, + "margin": [ + -10, + 5, + 0, + 0 + ] + }, + "receipt-table2": { + "color": "#484848", + "bold": true, + "fontSize": 11, + "fontWeight": 400, + "margin": [ + 3, + 8, + 0, + 10 + ] + }, + "right-receipt-table": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 8, + 5, + 0, + 10 + ] + }, + "right-receipt-table2": { + "color": "#484848", + "bold": true, + "fontSize": 12, + "fontWeight": 400, + "margin": [ + -10, + 5, + 0, + 0 + ] + }, + "receipt-approver": { + "fontSize": 12, + "bold": true, + "margin": [ + -27, + 50, + -10, + 0 + ], + "color": "#484848" + }, + "no-signature": { + "fontSize": 12, + "margin": [ + -27, + 35, + -10, + 0 + ], + "color": "#484848" + }, + "amount-due": { + "fontSize": 30, + "color": "#FC8019", + "bold": true, + "fontWeight": 700 + }, + "pt-disclaimer": { + "fontSize": 12, + "margin": [ + -27, + 30, + -10, + 0 + ], + "color": "#484848" + }, + "pt-disclaimer-value": { + "fontSize": 12, + "margin": [ + 2, + 5, + 0, + 0 + ], + "color": "#484848" + }, + "qr-text": { + "fontSize": 12, + "margin": [ + 40, + 0, + 0, + 0 + ], + "color": "#484848", + "alignment": "left" + }, + "qr-image": { + "margin": [ + -40, + -1, + -3, + 0 + ], + "color": "#484848", + "alignment": "right" + }, + "footer-header": { + "margin": [ + 0, + 15, + 0, + -40 + ], + "bold": true, + "color": "#000000", + "alignment": "center" + }, + "footer-bottom": { + "margin": [ + 0, + 50, + 0, + 0 + ], + "bold": true, + "color": "#000000", + "alignment": "right" + }, + "bill-message-header": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 28, + -15, + 0, + 10 + ] + }, + "bill-message-value": { + "color": "#484848", + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 28, + -5, + 0, + 10 + ] + }, + "disclaimer-table": { + "fontSize": 12, + "bold": false, + "color": "#FC8019", + "margin": [ + -25, + 16, + -8, + -8 + ] + } + } + } +} \ No newline at end of file diff --git a/configs/pdf-service/format-config/property-receipt.json b/configs/pdf-service/format-config/property-receipt.json new file mode 100644 index 00000000..e9fff43b --- /dev/null +++ b/configs/pdf-service/format-config/property-receipt.json @@ -0,0 +1,1357 @@ +{ + "key": "property-receipt", + "config": { + "defaultStyle": { + "font": "Cambay" + }, + "content": [ + { + "style": "noc-head", + "table": { + "widths": [ + 60, + "*", + 120 + ], + "body": [ + [ + { + "image": "{{logoImage}}", + "width": 50, + "height": 61.25 + }, + { + "stack": [ + { + "text": "{{logo-header}} {{mcGrade}}", + "style": "receipt-logo-header" + }, + { + "text": "{{serviceType}} {{payment_receipt}}", + "style": "receipt-logo-sub-header" + } + ], + "alignment": "left", + "margin": [ + 0, + 4, + 0, + 0 + ] + }, + { + "stack": [ + { + "text": "{{address}}", + "style": "receipt-logo-sub-header" + + }, + { + "text": "{{phoneNumber}}", + "style": "receipt-logo-sub-header" + + }, + { + "text": "{{website}}", + "style": "receipt-logo-sub-header" + + }, + { + "text": "{{email}}", "style": "receipt-logo-sub-header" + + + } + ], + "alignment": "right", + "color": "#484848", + "margin": [ + -100, + 0, + -25, + 0 + ] + } + ] + ] + }, + "layout": "noBorders" + }, + { + "text":"PROPERTY INFORMATION", + "style":"block-head" + }, + { + "style": "next-noc-table", + "table": { + "widths": [ + "25%", + "25%", + "25%", + "25%" + ], + "body": [ + [ + { + "text": "{{receipt_no}}.", + "border": [ + true, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{receiptNo}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-tableee" + }, + { + "text": "{{consumer_id}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{consumerID}}", + "border": [ + false, + true, + true, + false + ], + "style": "receipt-tableee" + } + ], + [ + { + "text": "Assessment Year(Paid Amount)", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{assessmentYear}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-tableee" + }, + { + "text": "Existing Property Id", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{oldPropertyId}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-tableee" + } + ], + [ + { + "text": "{{payment_date}}", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{paymentDate}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-tableee" + }, + { + "text": "Survey Id/UID", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{surveyId}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-tableee" + } + ], + [ + { + "text": "{{payer_contact}}", + "border": [ + true, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerContact}}", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-tableee" + }, + { + "text" : "Payment Status", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text" : "{{paymentStatus}}", + "border": [ + false, + false, + true, + true + ], + "style": "receipt-tableee" + } + ] + ] + }, + "layout": {} + }, + { + "style": "noc-table", + "table": { + "widths": [ + "25%", + "25%", + "25%", + "25%" + ], + "body": [ + [ + { + "text": "House/Door No. : ", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{doorNo}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-tableee" + }, + { + "text": "Building/Colony Name: ", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{buildingName}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-tableee" + } + ], + [ + { + "text": "Street Name: ", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{streetName}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-tableee" + }, + { + "text": "Locality/Mohalla :", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{locality}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-tableee" + } + ], + [ + { + "text": "Plot Size (Sq. Yards) : ", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{landArea}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-tableee" + }, + { + "text": "Property Type: ", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{propertyType}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-tableee" + } + ], + [ + { + "text": "Property Usage Type ", + "border": [ + true, + false, + false, + true + + ], + "style": "receipt-table-value" + }, + { + "text": "{{propertyUsage}}", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-tableee" + }, + { + "text": " ", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": " ", + "border": [ + false, + false, + true, + true + ], + "style": "receipt-tableee" + } + ] + ] + }, + "layout": {} + }, + { + "text":"AMOUNT TO BE PAID", + "style":"block-head" + }, + { + "style": "next-noc-table", + "table": { + "widths": [ + + "7%","9%","7%","7%","7%","7%","8%","8%","8%","8%","8%","7%","9%" + ], + "body": [ + + [ { + "text": "Year", + "style": "amounts" + }, + { + "text": "Property Tax", + "style": "amounts" + }, + { + "text": "Fire Cess", + "style": "amounts" + }, + { + "text": "Cancer Cess", + "style": "amounts" + }, + { + "text": "Penalty", + "style": "amounts" + }, + { + "text": "Rebate", + "style": "amounts" + }, + { + "text": "Interest", + "style": "amounts" + }, + { + "text": "Usage Exemp.", + "style": "amounts" + }, + { + "text": "Category Exemp.", + "style": "amounts" + }, + { + "text": "Adhoc Penalty", + "style": "amounts" + }, + { + "text": "Adhoc Rebate", + "style": "amounts" + }, + { + "text": "Round Off", + "style": "amounts" + }, + { + "text": "Total", + "style": "amounts" + } + + ], + + "{{#var_tax}}[{\"text\":\"{{year}}\",\"style\":\"receipt-table\"},{\"text\":\"{{tax}}\",\"style\":\"receipt-table\"},{\"text\":\"{{firecess}}\",\"style\":\"receipt-table\"},{\"text\":\"{{cancercess}}\",\"style\":\"receipt-table\"},{\"text\":\"{{penalty}}\",\"style\":\"receipt-table\"},{\"text\":\"{{rebate}}\",\"style\":\"receipt-table\"},{\"text\":\"{{interest}}\",\"style\":\"receipt-table\"},{\"text\":\"{{usage_exemption}}\",\"style\":\"receipt-table\"},{\"text\":\"{{special_category_exemption}}\",\"style\":\"receipt-table\"},{\"text\":\"{{adhoc_penalty}}\",\"style\":\"receipt-table\"},{\"text\":\"{{adhoc_rebate}}\",\"style\":\"receipt-table\"},{\"text\":\"{{roundoff}}\",\"style\":\"receipt-table\"},{\"text\":\"{{total}}\",\"style\":\"receipt-table\"}]{{/var_tax}}" + + + ] + }, + "layout":{} + }, + { + "text":"SUMMARY OF PAID AMOUNT", + "style":"block-head" + }, + { + "style": "next-noc-table", + "table": { + "widths": [ + + "7%","9%","7%","7%","7%","7%","8%","8%","8%","8%","8%","7%","9%" + ], + "body": [ + + [ { + "text": "Year", + "style": "amounts" + }, + { + "text": "Property Tax", + "style": "amounts" + }, + { + "text": "Fire Cess", + "style": "amounts" + }, + { + "text": "Cancer Cess", + "style": "amounts" + }, + { + "text": "Penalty", + "style": "amounts" + }, + { + "text": "Rebate", + "style": "amounts" + }, + { + "text": "Interest", + "style": "amounts" + }, + { + "text": "Usage Exemp.", + "style": "amounts" + }, + { + "text": "Category Exemp.", + "style": "amounts" + }, + { + "text": "Adhoc Penalty", + "style": "amounts" + }, + { + "text": "Adhoc Rebate", + "style": "amounts" + }, + { + "text": "Round Off", + "style": "amounts" + }, + { + "text": "Total", + "style": "amounts" + } + + ], + + "{{#var_bills}}[{\"text\":\"{{year}}\",\"style\":\"receipt-table\"},{\"text\":\"{{tax}}\",\"style\":\"receipt-table\"},{\"text\":\"{{firecess}}\",\"style\":\"receipt-table\"},{\"text\":\"{{cancercess}}\",\"style\":\"receipt-table\"},{\"text\":\"{{penalty}}\",\"style\":\"receipt-table\"},{\"text\":\"{{rebate}}\",\"style\":\"receipt-table\"},{\"text\":\"{{interest}}\",\"style\":\"receipt-table\"},{\"text\":\"{{usage_exemption}}\",\"style\":\"receipt-table\"},{\"text\":\"{{special_category_exemption}}\",\"style\":\"receipt-table\"},{\"text\":\"{{adhoc_penalty}}\",\"style\":\"receipt-table\"},{\"text\":\"{{adhoc_rebate}}\",\"style\":\"receipt-table\"},{\"text\":\"{{roundoff}}\",\"style\":\"receipt-table\"},{\"text\":\"{{total}}\",\"style\":\"receipt-table\"}]{{/var_bills}}" + + + ] + }, + "layout":{} + }, + { + "text":"PAYMENT INFORMATION", + "style":"block-head" + }, + { + "style": "next-noc-table", + "table": { + "widths": [ + "25%", + "25%", + "25%", + "25%" + ], + "body": [ + [ + { + "text": "Amount to be Paid", + "border": [ + true, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "₹ {{dueAmount}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{paid_amount}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "₹ {{paidAmount}}", + "border": [ + false, + true, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{pending_amount}}", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "₹ {{pendingAmount}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{payment_mode}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{paymentMode}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ],[ + { + "text": "IFSC Code", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{ifsc}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Bank/Branch Name", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{bank}},{{branch}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{transaction_id}}", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{transactionID}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Trans/Cheque/DD Date", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{transactionDate}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{g8_receipt_no}}.", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{G8ReceiptNo}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{g8_receipt_date}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{G8ReceiptDate}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "Penalty Reason", + "border": [ + true, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{penaltyReason}}", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table" + }, + { + "text": "Rebate Reason", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{rebateReason}}", + "border": [ + false, + false, + true, + true + ], + "style": "receipt-table" + } + + ] + ] + }, + "layout": {} + }, + { + "text":"OWNER/OCCUPIER INFORMATION", + "style":"block-head" + } + , + { + "style": "next-noc-table", + "table": { + "widths": [ + "*", + "*", + "*", + "*", + "*", + "*" + ], + "body": ["{{#var_owners}}[{\"text\":\"Owner Name\",\"border\":[true,true,false,true],\"style\":\"receipt-table-key\"},{\"text\":\"{{name2}}\",\"border\":[false,true,true,true]},{\"text\":\"Father/Husband Name\",\"border\":[true,true,false,true],\"style\":\"receipt-table-key\"},{\"text\":\"{{fatherOrHusbandName2}}\",\"border\":[false,true,true,true]},{\"text\":\"Share % (Category)\",\"border\":[true,true,false,true],\"style\":\"receipt-table-key\"},{\"text\":\"{{ownerShipPercentage}} ({{ownerType}}) \",\"border\":[false,true,true,true]}]{{/var_owners}}"] + }, + "layout": {} + }, { + "style": "next-noc-table", + "table": { + "widths": [ + "25%", + "25%", + "25%", + "25%" + ], + "body": [ + [ + { + "text": "Name of Institution", + "border": [ + true, + true, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{institutionName}}", + "border": [ + false, + true, + false, + true + ], + "style": "receipt-table" + }, + { + "text": " ", + "border": [ + false, + true, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": " ", + "border": [ + false, + true, + true, + true + ], + "style": "receipt-table" + } + ] + ] + }, + "layout": {} + }, + { + "text":"BUILT-UP AREA DETAILS", + "style":"block-head" + }, + { + "style": "next-noc-table", + "table": { + "widths": [ + "15%", + "20%", + "*", + "20%", + "20%" + ], + "body": + [ + [ + { + "text": "Floor", + "style": "receipt-table-value22" + },{ + "text": "Usage", + "style": "receipt-table-value22" + }, + { + "text": "Sub Usage", + "style": "receipt-table-value22" + }, + { + "text": "Occupancy", + "style": "receipt-table-value22" + }, + { + "text": "Built Area (Sq. Yard) /annual Rent", + "style": "receipt-table-value22" + } + ], + "{{#var_floors}}[{\"text\":\"{{floor_no}}\",\"style\":\"receipt-table\"},{\"text\":\"{{usage_category}}\",\"style\":\"receipt-table\"},{\"text\":\"{{sub_usage_category}}\",\"style\":\"receipt-table\"},{\"text\":\"{{occupancy_type}}\",\"style\":\"receipt-table\"},{\"text\":\"{{builtup_area}}/{{arv_rent}}\",\"style\":\"receipt-table\"}]{{/var_floors}}" + ] + + + }, + "layout": {} + }, + { + "text":"ADDITIONAL DETAILS", + "style":"block-head" + }, + { + "style": "next-noc-table2", + "table": { + "widths": [ + "25%", + "25%", + "25%", + "25%" + ], + "body": [ + [ + { + "text": "Vasika No.", + "border": [ + true, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{vasikaNo}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Vasika Date", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{vasikaDate}}", + "border": [ + false, + true, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "Allotment No", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{allotmentNo}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Allotment Date", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{allotmentDate}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "Business Name", + "border": [ + true, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{businessName}}", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table" + }, + { + "text": "Remarks", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{remarks}}", + "border": [ + false, + false, + true, + true + ], + "style": "receipt-table" + } + ] + ] + }, + "layout": {} + }, + { + "text": "Mobile Number {{ownerMobileNumber}} Assessee Signature: {{generated_by}}: {{user-name}} Approved By: {{approvedBy}} ", + "style": "receipt-approver" + } + , + { + "style": "receipt-approver", + "columns": [ + { + "text": [ + { + "text": "{{commissioner/eo}}", + "bold": true + } + ], + "alignment": "right", + "margin": [ + 0, + 0, + -10, + 1 + ] + } + ] + }, + { + "style": "pt-disclaimer", + "stack": + [ + { + "text": [{"text": "{{disclamer}} : Citizen for Online Payments please refer to the link ", "bold": true, "style": "pt-disclaimer-value"}, + {"text": "https://mseva.lgpunjab.gov.in/", "bold": true, "fontSize": 8, "color": "blue", "decoration": "underline"}]}, + { "text": "1. Payment received by cheque/demand draft shall be subject to realization, This is a computer generated document, hence requires no signature."}, + {"text":"2. This document is not a proof of Property Ownership and regularization of unauthorized construction."}, + {"text":"3. Assessment & Payment is subject to verification/Scrutiny by competitive authority.Also deposit property tax dues for earlier years. Ignore, if already paid."}, + {"text":"4. Residential Property will not be considered Commercial even if Commercial property tax is paid"}, + { + "text":"Now log a complaint from WhatsApp, give a missed call on 8750975975 or send a Hi message on WhatsApp to this number", "bold": true, "fontSize": 8, "color": "blue", "decoration": "underline"} + ] + } + ], + "styles": { + "noc-head": { + "margin": [ + -30, + -30, + 0, + 1 + ] + }, + "block-head": { + "fontSize": 7, + "bold": true, + "letterSpacing": 0.74, + "margin": [ + -25, + 10, + 0, + -10 + ] + }, + "pt-reciept-citizen-table": { + "fontSize": 7, + "color": "#484848" + }, + "receipt-assess-table-header": { + "bold": true, + "fillColor": "#D8D8D8", + "color": "#484848" + }, + "receipt-logo-header": { + "color": "#000000", + "fontSize": 8.5, + "bold": true, + "letterSpacing": 0.74, + "margin": [ + 0, + 0, + 0, + 3 + ] + }, + "receipt-logo-sub-header": { + "color": "#000000", + "fontSize": 8.5, + "letterSpacing": 0.6 + }, + "noc-table": { + "fontSize": 7, + "color": "#000000", + "margin": [ + -25, + 5, + -22, + -8 + ] + }, + "next-noc-table": { + "fontSize": 7, + "color": "#000000", + "margin": [ + -25, + 7, + -22, + -8 + ] + }, "next-noc-table2": { + "fontSize": 7, + "color": "#000000", + "margin": [ + -25, + 10, + -22, + 0 + ] + }, + "receipt-table-value": { + "color": "#000000", + "bold": true, + "fontSize": 7, + "fontWeight": 500, + "margin": [ + 8, + 2, + 0, + -5 + ] + }, + "receipt-table-value22": { + "color": "#000000", + "bold": true, + "fontSize": 7, + "fontWeight": 500, + "backgroundColor": "#D3D3D3", + "margin": [ + -4, + 0, + 0, + 0 + ] + }, + "receipt-table": { + "color": "#000000", + "bold": false, + "fontSize": 7, + "fontWeight": 400, + "margin": [ + 0, + 0, + 0, + 0 + ] + },"receipt-tableee": { + "color": "#000000", + "bold": true, + "fontSize": 7, + "fontWeight": 500, + "margin": [ + 0, + 2, + 0, + -6 + ] + }, + "receipt-approver": { + "fontSize": 7, + "bold": true, + "margin": [ + -27, + 7, + -10, + 0 + ], + "color": "#484848" + },"receipt-approver2": { + "fontSize": 7, + "bold": true, + "margin": [ + -27, + 1, + -10, + 0 + ], + "color": "#484848" + }, + "no-signature": { + "fontSize": 7, + "margin": [ + -27, + 20, + -10, + 0 + ], + "color": "#484848" + }, + "pt-disclaimer": { + "fontSize": 8, + "margin": [ + -27, + 10, + -10, + 0 + ], + "color": "#484848" + }, + "pt-disclaimer-value": { + "fontSize": 8, + "margin": [ + 2, + 0, + 0, + 0 + ], + "color": "#484848" + }, + "amounts": + { + "fontSize": 8, + "backgroundColor": "#D3D3D3" + }, + "amountss": + { + "fontSize": 8 + } + } + } +} diff --git a/configs/pdf-service/format-config/pt-receipt.json b/configs/pdf-service/format-config/pt-receipt.json new file mode 100644 index 00000000..4a1b0797 --- /dev/null +++ b/configs/pdf-service/format-config/pt-receipt.json @@ -0,0 +1,808 @@ +{ + "key":"pt-receipt", + "config":{ + + "content":[ + { + "style": "pt-reciept-citizen-table", + "margin": [ + 0, + 0, + 0, + 18 + ], + "table": { + "widths": [ + 50, + "*", + 100 + ], + "body": [ + [ + { + "image": "{{variable38}}", + "width": 30, + "margin": [ + 10, + 10, + 10, + 10 + ] + }, + { + "stack": [ + { + "text": "{{variable35}} NAGAR PANCHAYAT", + "style": "receipt-logo-header" + }, + { + "text": "Property Tax Payment Receipt ({{variable36}}) ", + "style": "receipt-logo-sub-header" + } + ], + "alignment": "center", + "margin": [ + 0, + 5, + 0, + 0 + ] + }, + { + "text": [ + { + "text": "Receipt No.: ", + "bold": true + }, + "{{variable15}}" + ], + "margin": [10, 10, 10, 2] + } + ] + ] + }, + "layout": {} + }, + { + "style": "receipt-header-details", + "columns": [ + { + "text": [ + { + "text": "Date: ", + "bold": true + }, + "{{variable16}}" + ], + "alignment": "left" + }, + { + "text": [ + { + "text": "Contact Us: ", + "bold": true + }, + "0183-2545155" + ], + "alignment": "right" + } + ] + }, + { + "style": "receipt-header-details", + "columns": [ + { + "text": [ + { + "text": "Assessment Year: ", + "bold": true + }, + "{{variable1}}" + ], + "alignment": "left" + }, + { + "text": [ + { + "text": "Website: ", + "bold": true + }, + "www.amritsarcorp.com" + ], + "alignment": "right" + } + ] + }, + { + "style": "pt-reciept-citizen-table", + "table": { + "body": [ + [ + { + "text": "Existing Property ID:", + "border": [ + true, + true, + false, + true + ], + "style": "receipt-table-key" + }, + { + "text": "{{variable2}}", + "border": [ + false, + true, + true, + true + ] + }, + { + "text": "Property Tax Unique ID:", + "border": [ + true, + true, + false, + true + ], + "style": "receipt-table-key" + }, + { + "text": "{{variable3}}", + "border": [ + false, + true, + true, + true + ] + }, + { + "text": "Assessment No:", + "border": [ + true, + true, + false, + true + ], + "style": "receipt-table-key" + }, + { + "text": "{{variable4}}", + "border": [ + false, + true, + true, + true + ] + } + ] + ] + }, + "layout": {} + }, + { + "text": "PROPERTY ADDRESS", + "style": "pt-reciept-citizen-subheader" + }, + { + "style": "pt-reciept-citizen-table", + "table": { + "widths": [ + "*", + "*", + "*", + "*" + ], + "body": [ + [ + { + "text": "House/Door No.:", + "border": [ + true, + true, + false, + true + ], + "style": "receipt-table-key" + }, + { + "text": "{{variable5}}", + "border": [ + false, + true, + true, + true + ] + }, + { + "text": "Building/Colony Name.:", + "border": [ + true, + true, + false, + true + ], + "style": "receipt-table-key" + }, + { + "text": "{{variable6}}", + "border": [ + false, + true, + true, + true + ] + } + ], + [ + { + "text": "Street Name:", + "border": [ + true, + true, + false, + true + ], + "style": "receipt-table-key" + }, + { + "text": "{{variable7}}", + "border": [ + false, + true, + true, + true + ] + }, + { + "text": "Locality/Mohalla:", + "border": [ + true, + true, + false, + true + ], + "style": "receipt-table-key" + }, + { + "text": "{{variable8}}", + "border": [ + false, + true, + true, + true + ] + } + ] + ] + }, + "layout": {} + }, + { + "text": "ASSESSMENT INFORMATION", + "style": "pt-reciept-citizen-subheader" + }, + { + "style": "pt-reciept-citizen-table", + "table": { + "widths": [ + "*", + "*", + "*", + "*" + ], + "body": [ + [ + { + "text": "Plot Size(sq yards)", + "border": [ + true, + true, + false, + true + ], + "style": "receipt-table-key" + }, + { + "text": "{{variable9}}", + "border": [ + false, + true, + true, + true + ] + }, + { + "text": "Property Type:", + "border": [ + true, + true, + false, + true + ], + "style": "receipt-table-key" + }, + { + "text": "{{variable10}}", + "border": [ + false, + true, + true, + true + ] + } + ] + ] + }, + "layout": {} + }, + { + "text": "BUILT-UP AREA DETAILS", + "style": "pt-reciept-citizen-subheader" + }, + { + "style": "receipt-assess-table", + "table": { + "widths": [ + "*", + "*", + "*", + "*", + "*" + ], + "body": [ + [ + { + "text": "Floor", + "style": "receipt-assess-table-header" + }, + { + "text": "Usage Type", + "style": "receipt-assess-table-header" + }, + { + "text": "Sub Usage Type", + "style": "receipt-assess-table-header" + }, + { + "text": "Occupancy", + "style": "receipt-assess-table-header" + }, + { + "text": "Built Area/Total Annual Rent(sq yards)", + "style": "receipt-assess-table-header" + } + ], + "{{variable12}}" + ] + }, + "layout": {} + }, + { + "text": "OWNERSHIP INFORMATION", + "style": "pt-reciept-citizen-subheader" + }, + { + "style": "pt-reciept-citizen-table", + "table": { + "widths": [ + "*", + "*", + "*", + "*" + ], + "body": ["{{#variable11}}[{\"text\":\"Owner Name\",\"border\":[true,true,false,true],\"style\":\"receipt-table-key\"},{\"text\":\"{{name}}\",\"border\":[false,true,true,true]},{\"text\":\"Father's Name\",\"border\":[true,true,false,true],\"style\":\"receipt-table-key\"},{\"text\":\"{{fatherOrHusbandName}}\",\"border\":[false,true,true,true]}]{{/variable11}}"] + }, + "layout": {} + }, + { + "text": "PAYABLE AMOUNT", + "style": "pt-reciept-citizen-subheader" + }, + { + "style": "receipt-assess-table", + "table": { + "widths": [ + "auto", + "auto", + "auto", + "auto", + "auto", + "auto", + "auto", + "auto", + "auto", + "auto" + ], + "body": [ + [ + { + "text": "Property Tax" + }, + { + "text": "Fire Cess" + }, + { + "text": "Cancer Cess" + }, + { + "text": "Penalty" + }, + { + "text": "Rebate" + }, + { + "text": "Interest" + }, + { + "text": "Usage Exemption" + }, + { + "text": "Special Category Exemption" + }, + { + "text": "Round Off" + }, + { + "text": "Total" + } + ], + [ + { + "text": "{{variable17}}" + }, + { + "text": "{{variable18}}" + }, + { + "text": "{{variable19}}" + }, + { + "text": "{{variable20}}" + }, + { + "text": "{{variable21}}" + }, + { + "text": "{{variable22}}" + }, + { + "text": "{{variable23}}" + }, + { + "text": "{{variable24}}" + }, + { + "text": "{{variable25}}" + }, + { + "text": "{{variable34}}" + } + ] + ] + }, + "layout": {} + }, + { + "text": "PAYMENT INFORMATION", + "style": "pt-reciept-citizen-subheader" + }, + { + "style": "pt-reciept-citizen-table", + "table": { + "widths": [ + "auto", + "auto", + "auto", + "auto" + ], + "body": [ + [ + { + "text": "Total Amount Paid:", + "border": [ + true, + true, + false, + true + ], + "style": "receipt-table-key" + }, + { + "text": "{{variable27}}", + "border": [ + false, + true, + true, + true + ], + "style": "receipt-table-value" + }, + { + "text": "Pending Amount:", + "border": [ + true, + true, + false, + true + ], + "style": "receipt-table-key" + }, + { + "text": "{{variable37}}", + "border": [ + false, + true, + true, + true + ] + } + ], + [ + { + "text": "Payment Mode:", + "border": [ + true, + true, + false, + true + ], + "style": "receipt-table-key" + }, + { + "text": "{{variable28}}", + "border": [ + false, + true, + true, + true + ] + }, + { + "text": "Bank Name:", + "border": [ + true, + true, + false, + true + ], + "style": "receipt-table-key" + }, + { + "text": "{{variable29}}", + "border": [ + false, + true, + true, + true + ] + } + ], + [ + { + "text": "Transaction ID/ Cheque/ DD No.:", + "border": [ + true, + true, + false, + true + ], + "style": "receipt-table-key" + }, + { + "text": "{{variable30}}", + "border": [ + false, + true, + true, + true + ] + }, + { + "text": "Transaction Date:", + "border": [ + true, + true, + false, + true + ], + "style": "receipt-table-key" + }, + { + "text": "{{variable31}}", + "border": [ + false, + true, + true, + true + ] + } + ], + [ + { + "text": "G8 Receipt No:", + "border": [ + true, + true, + false, + true + ], + "style": "receipt-table-key" + }, + { + "text": "{{variable32}}", + "border": [ + false, + true, + true, + true + ] + }, + { + "text": "G8 Receipt Issue Date:", + "border": [ + true, + true, + false, + true + ], + "style": "receipt-table-key" + }, + { + "text": "{{variable33}}", + "border": [ + false, + true, + true, + true + ] + } + ] + ] + }, + "layout": {} + }, + { + "text": "Commissioner/EO", + "alignment": "right", + "color": "#484848", + "fontSize": 12, + "bold": true, + "margin": [ + 0, + 30, + 0, + 30 + ] + }, + { + "text": "Note:", + "alignment": "left", + "style": "receipt-footer" + }, + { + "ol": [ + { + "text": "Payment received by cheque/demand draft shall be subject to realization.", + "margin": [ + 0, + 0, + 0, + 5 + ] + }, + { + "text": "This document is not a proof of Property Ownership and regularization of unauthorized construction.", + "margin": [ + 0, + 0, + 0, + 5 + ] + }, + { + "text": "This is a computer generated document, hence requires no signature.", + "margin": [ + 0, + 0, + 0, + 5 + ] + }, + { + "text": "Assessment & Payment is subject to verification/Scrutiny by competitive authority.", + "margin": [ + 0, + 0, + 0, + 5 + ] + }, + { + "text": "Please deposit property tax dues for earlier years also. Ignore, if already paid.", + "margin": [ + 0, + 0, + 0, + 5 + ] + } + ], + "alignment": "left", + "style": "receipt-footer" + } + ], + "styles": { + "pt-reciept-citizen-subheader": { + "fontSize": 10, + "bold": true, + "margin": [ + 0, + 16, + 0, + 8 + ], + "color": "#484848" + }, + "pt-reciept-citizen-table": { + "fontSize": 10, + "color": "#484848" + }, + "receipt-assess-table": { + "fontSize": 10, + "color": "#484848", + "margin": [ + 0, + 8, + 0, + 0 + ] + }, + "receipt-assess-table-header": { + "bold": true, + "fillColor": "#D8D8D8", + "color": "#484848" + }, + "receipt-header-details": { + "fontSize": 9, + "margin": [ + 0, + 0, + 0, + 8 + ], + "color": "#484848" + }, + "receipt-table-key": { + "color": "#484848", + "bold": true + }, + "receipt-table-value": { + "color": "#484848" + }, + "receipt-logo-header": { + "color": "#484848", + "fontSize": 16, + "bold": true, + "decoration": "underline", + "decorationColor": "#484848" + }, + "receipt-logo-sub-header": { + "color": "#484848", + "fontSize": 13, + "decoration": "underline", + "decorationColor": "#484848" + }, + "receipt-footer": { + "color": "#484848", + "fontSize": 8, + "margin": [ + 0, + 0, + 0, + 5 + ] + } + } + } +} \ No newline at end of file diff --git a/configs/pdf-service/format-config/ptmutationcertificate.json b/configs/pdf-service/format-config/ptmutationcertificate.json new file mode 100644 index 00000000..07b8fe6d --- /dev/null +++ b/configs/pdf-service/format-config/ptmutationcertificate.json @@ -0,0 +1,518 @@ +{ + "key": "ptmutationcertificate", + "config": { + "defaultStyle": { + "font": "Cambay" + }, + "content": [ + { + "style": "noc-head", + "table": { + "widths": [ + "*" + ], + "body": [ + [ + { + "image": "{{ULB_LOGO}}", + "width": 70, + "height": 82, + "alignment": "center", + "margin": [ + 0, + 10, + 0, + 10 + ] + } + ], + [ + { + "stack": [ + { + "text": "{{ULB_CITY}} {{municipal_corportaion}}", + "style": "receipt-logo-header" + }, + { + "text": "{{ULB_ADDRESS}}", + "style": "receipt-logo-sub-header" + }, + { + "style": "noc-head", + "table": { + "widths": [ + "*", + "*" + ], + "body": [ + [ + { + "text": "{{corporation_fax}} : {{CorporationContact_Value}} ", + "style": "receipt-sub-address-sub-header" + } + ] + ] + }, + "layout": "noBorders" + }, + { + "style": "noc-head", + "table": { + "widths": [ + "*", + "*" + ], + "body": [ + [ + { + "text": "{{corporation_website}} : {{corporationWebsite}}", + "style": "receipt-sub-website-sub-header" + } + ] + ] + }, + "layout": "noBorders" + }, + { + "style": "noc-head", + "table": { + "widths": [ + "*", + "*" + ], + "body": [ + [ + { + "text": "{{corporation_email}} : {{corporationEmail}}", + "style": "receipt-sub-email-sub-header" + } + ] + ] + }, + "layout": "noBorders" + } + ], + "alignment": "left", + "margin": [ + 0, + 10, + 0, + 0 + ] + } + ], + [ + { + "stack": [ + { + "text": "{{Mutation_Approval_Certificate}}", + "style": "receipt-sub-logo-header" + }, + { + "style": "noc-head", + "table": { + "widths": [ + "35%", + "65%" + ], + "body": [ + [ + { + "text": "{{Property_ID_Label}}", + "style": "receipt-content" + }, + { + "text": "{{Property_ID}}", + "style": "receipt-content", + "font": "Roboto" + } + ] + ] + }, + "layout": "noBorders" + }, + { + "style": "noc-head", + "table": { + "widths": [ + "35%", + "65%" + ], + "body": [ + [ + { + "text": "{{Mutation_Number_Label}}", + "style": "receipt-content" + }, + { + "text": "{{Mutation_Number}}", + "style": "receipt-content", + "font": "Roboto" + } + ] + ] + }, + "layout": "noBorders" + }, + { + "style": "noc-head", + "table": { + "widths": [ + "35%", + "65%" + ], + "body": [ + [ + { + "text": "{{Application_Number_Label}}", + "style": "receipt-content" + }, + { + "text": "{{Application_Number}}", + "style": "receipt-content", + "font": "Roboto" + } + ] + ] + }, + "layout": "noBorders" + }, + { + "style": "noc-head", + "table": { + "widths": [ + "35%", + "65%" + ], + "body": [ + [ + { + "text": "{{Receipt_Number_Label}}", + "style": "receipt-content" + }, + { + "text": "{{Receipt_Number}}", + "style": "receipt-content", + "font": "Roboto" + } + ] + ] + }, + "layout": "noBorders" + }, + { + "style": "noc-head", + "table": { + "widths": [ + "35%", + "65%" + ], + "body": [ + [ + { + "text": "{{Approval_Date_Label}}", + "style": "receipt-content" + }, + { + "text": "{{Approval_Date}}", + "style": "receipt-content", + "font": "Roboto" + } + ] + ] + }, + "layout": "noBorders" + } + ], + "alignment": "left", + "margin": [ + 0, + 10, + 0, + 0 + ] + } + + ], + [ + { + "stack": [ + { + "text": "{{Order_Label}}", + "bold": true, + "style": "receipt-order-header" + }, + { + "text": "{{Mutation_Declaration_Label}}", + "style": "receipt-order-content" + } + ], + "alignment": "left", + "margin": [ + 0, + 10, + 0, + 0 + ] + } + ], + [ + { + "stack": [ + { + "style": "noc-head", + "table": { + "widths": [ + "35%", + "65%" + ], + "body": [ + [ + { + "text": "{{Transferrer_Details_Label}}", + "style": "receipt-content" + }, + { + "text": "{{Transferrer_Name}} {{Transferrer_Relation}} {{Transferrer_Relative_Name}}", + "style": "receipt-content" + } + ] + ] + }, + "layout": "noBorders" + }, + { + "style": "noc-head", + "table": { + "widths": [ + "35%", + "65%" + ], + "body": [ + [ + { + "text": "{{Transferree_Details_Label}}", + "style": "receipt-content" + }, + { + "text": "{{Transferree_Name}} {{Transferree_Relation}} {{Transferree_Relative_Name}}", + "style": "receipt-content" + } + ] + ] + }, + "layout": "noBorders" + } + ], + "alignment": "left", + "margin": [ + 0, + 10, + 0, + 0 + ] + } + + ], + [ + { + "stack": [ + { + "text": "{{Mutation_To_Label}}", + "bold": true, + "style": "receipt-order-header" + }, + { + "text": "{{Shri_Smt_Label}} {{Transferree_Name}}", + "style": "receipt-order-content" + }, + { + "text": "{{Transferree_Address}}", + "style": "receipt-order-content" + } + ], + "alignment": "left", + "margin": [ + 0, + 10, + 0, + 0 + ] + } + ] + ] + }, + "layout": "noBorders" + }, + { + "style": "receipt-approver", + "columns": [ + { + "text": [ + { + "text": "{{approved_by}} ", + "bold": true + }, + { + "text": "{{approved_by_value}}", + "bold": false + } + ], + "alignment": "left" + }, + { + "text": [ + { + "text": "{{commissioner}}", + "bold": true + } + ], + "alignment": "right" + } + ] + } + ], + "styles": { + "noc-head": { + "margin": [ + -30, + -35, + 0, + -2 + ] + }, + "receipt-approver": { + "color": "#000000", + "fontSize": 14, + "letterSpacing": 0.6, + "alignment": "center", + "margin": [ + -10, + 50, + 0, + 1 + ] + }, + "receipt-logo-header": { + "color": "#000000", + "fontSize": 20, + "letterSpacing": 0.74, + "alignment": "center", + "margin": [ + 0, + 0, + 0, + 5 + ] + }, + "receipt-sub-logo-header": { + "color": "#000000", + "fontSize": 18, + "letterSpacing": 0.74, + "alignment": "center", + "margin": [ + 0, + 5, + 0, + 10 + ] + }, + "receipt-logo-sub-header": { + "color": "#484848", + "fontSize": 14, + "letterSpacing": 0.6, + "alignment": "center", + "margin": [ + 0, + 5, + 0, + 0 + ] + }, + "receipt-sub-logo-sub-header": { + "color": "#484848", + "fontSize": 14, + "letterSpacing": 0.6, + "alignment": "left", + "margin": [ + 50, + 40, + 0, + 0 + ] + }, + "receipt-sub-address-sub-header": { + "color": "#484848", + "fontSize": 14, + "letterSpacing": 0.1, + "alignment": "right", + "margin": [ + 50, + 30, + -80, + 0 + ] + }, + "receipt-sub-website-sub-header": { + "color": "#484848", + "fontSize": 14, + "letterSpacing": 0.1, + "alignment": "right", + "margin": [ + 50, + 30, + -120, + 0 + ] + }, + "receipt-sub-email-sub-header": { + "color": "#484848", + "fontSize": 14, + "letterSpacing": 0.1, + "alignment": "right", + "margin": [ + 50, + 30, + -110, + 0 + ] + }, + "receipt-order-header": { + "color": "#000000", + "fontSize": 14, + "letterSpacing": 0.6, + "alignment": "left", + "margin": [ + 19, + 0, + 0, + 1 + ] + }, + "receipt-order-content": { + "color": "#484848", + "fontSize": 14, + "letterSpacing": 0.4, + "alignment": "left", + "margin": [ + 19, + -2, + 0, + 1 + ] + }, + "receipt-content": { + "color": "#000000", + "fontSize": 14, + "letterSpacing": 0.4, + "alignment": "left", + "margin": [ + 50, + 30, + 0, + 0 + ] + } + } + } + } \ No newline at end of file diff --git a/configs/pdf-service/format-config/sewerage-bill-amendment-note.json b/configs/pdf-service/format-config/sewerage-bill-amendment-note.json new file mode 100644 index 00000000..2b021649 --- /dev/null +++ b/configs/pdf-service/format-config/sewerage-bill-amendment-note.json @@ -0,0 +1,521 @@ +{ + "key": "sw-bill-amendment-credit-note", + "config": { + "defaultStyle": { + "font": "Cambay" + }, + + "content": [ + { + "style": "noc-head", + "table": { + "widths": [ + 60, + "*", + 120 + ], + "color":"#484848", + "body": [ + [ + { + "image": "{{logoImage}}", + "width": 50, + "height": 61.25 + }, + { + "stack": [ + { + "text": "{{logo-header}} {{mcGrade}}", + "style": "receipt-logo-header" + }, + { + "text": "{{note_type}}", + "style": "receipt-logo-sub-header" + } + ], + "alignment": "left", + "margin": [ + 0, + 10, + 0, + 0 + ] + }, + { + "stack": [ + { + "text": "{{address}}" + }, + { + "text": "{{phoneNumber}}" + }, + { + "text": "{{website}}" + }, + { + "text": "{{email}}" + } + ], + "alignment": "right", + "color": "#484848", + "margin": [ + -100, + 0, + -25, + 0 + ] + } + ] + ] + }, + "layout": "noBorders" + }, + + { + "style": "note-info", + "columns": [ + { + "text": [ + { + "text": "{{note_id}} ", + "bold": true + }, + { + "text": "{{applicationNo}}", + "bold": false + } + ], + "alignment": "left" + }, + { + "text": [ + { + "text": "{{note_date}}", + "bold": true + }, + { + "text": "{{date}}", + "bold": false + } + ], + "alignment": "right", + "margin": [ + 0, + 0, + -10, + 1 + ] + } + ] + }, + + { + "style": "header", + "columns": [ + { + "text": [ + { + "text": "{{against}}", + "bold": true + } + ], + "alignment": "left" + } + ] + }, + { + "style": "header-1", + "text": "{{user-name}}", + "alignment": "left" + }, + { + "style": "header-1", + "text": "{{permanentAddress}}", + "alignment": "left" + }, + { + "style": "header", + "text": " ", + "alignment": "left" + }, + + { + "style": "note-info-1", + "columns": [ + { + "text": [ + { + "text": "{{adjustment_amount_details}}", + "bold": true + } + ], + "alignment": "left" + }, + { + "text": [ + { + "text": "{{total_amount}}", + "bold": true + } + ], + "alignment": "right", + "margin": [ + 0, + 0, + -200, + 1 + ] + }, + { + "text": [ + { + "text": "{{rs}} {{totalAmount}}", + "bold": true + } + ], + "alignment": "right", + "fontSize": 20, + "margin": [ + 0, + 25, + -10, + 1 + ] + } + ] + }, + + { + "style": "ws-table", + "table": { + "widths": [ + "70%" + ], + "body": [ + [ + { + "table": { + "widths": [ + "10%", + "30%", + "30%" + ], + "body": [ + [ + { + "text": "{{sl_no}}", + "alignment": "center" + }, + { + "text": "{{tax_heads}}", + "alignment": "left" + }, + { + "text": "{{reduced_amount}}", + "alignment": "right" + } + ], + [ + { + "text": "1.", + "alignment": "center" + }, + { + "text": "{{sewerage_charge}}", + "alignment": "left" + }, + { + "text": "{{sewerageCharge}}", + "alignment": "right" + } + ], + [ + { + "text": "2.", + "alignment": "center" + }, + { + "text": "{{interest}}", + "alignment": "left" + }, + { + "text": "{{sewerageInterest}}", + "alignment": "right" + } + ], + [ + { + "text": "3.", + "alignment": "center" + }, + { + "text": "{{penalty}}", + "alignment": "left" + }, + { + "text": "{{seweragePenalty}}", + "alignment": "right" + } + ], + [ + { + "text": " " + }, + { + "text": "{{total_amount}}", + "alignment": "left" + }, + { + "text": "{{totalAmount}}", + "alignment": "right" + } + ] + ] + }, + "border": [ + false, + false, + false, + false + ] + } + ] + ] + }, + "layout": {} + }, + + { + "style": "ws-table-1", + "table": { + "widths": [ + "130%" + ], + "body": [ + [ + { + "table": { + "widths": [ + "120%" + ], + "body": [ + [ + { + "text": "{{box_note}}", + "alignment": "left" + } + ] + ] + }, + "border": [ + false, + false, + false, + false + ] + } + ] + ] + }, + "layout": {} + }, + + { + "style": "header", + "text": " ", + "alignment": "left" + }, + + { + "style": "receipt-approver", + "columns": [ + { + "text": [ + { + "text": "{{generated_by}}: ", + "bold": true + }, + { + "text": "{{user-name}}", + "bold": false + } + ], + "alignment": "left" + }, + { + "text": [ + { + "text": "{{commissioner/eo}}", + "bold": true + } + ], + "alignment": "right", + "margin": [ + 0, + 0, + -10, + 1 + ] + } + ] + }, + + { + "style": "no-signature", + "text": "{{no_signature}}" + }, + + { + "style": "no-signature", + "text": "{{box_validity}}" + } + ], + + "styles": { + "noc-head": { + "margin": [ + -30, + -30, + 0, + 1 + ] + }, + "ws-head": { + "margin": [ + -39, + -38, + -38, + 0 + ] + }, + "receipt-logo-header": { + "color": "#000000", + "fontSize": 14, + "bold": true, + "letterSpacing": 0.74, + "margin": [ + 0, + 0, + 0, + 5 + ] + }, + "ws-table": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -25, + 18, + -8, + 10 + ] + }, + "ws-table-1": { + "fontSize": 12, + "color": "#000000", + "margin": [ + 380, + -120, + 20, + 10 + ] + }, + "receipt-logo-sub-header": { + "color": "#000000", + "fontSize": 12, + "letterSpacing": 0.6 + }, + "receipt-table-value": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 8, + 8, + 0, + 8 + ] + }, + "receipt-table": { + "color": "#000000", + "bold": false, + "fontSize": 12, + "fontWeight": 400, + "margin": [ + -10, + 8, + 0, + 8 + ] + }, + "header": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + -25, + 15, + 0, + -10 + ] + }, + "header-1": { + "color": "#000000", + "bold": false, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + -25, + 15, + 0, + -10 + ] + }, + "receipt-approver": { + "fontSize": 12, + "bold": true, + "margin": [ + -27, + 50, + -10, + 0 + ], + "color": "#484848" + }, + "note-info": { + "fontSize": 12, + "bold": true, + "margin": [ + -27, + 10, + -10, + 0 + ], + "color": "#000000" + }, + "note-info-1": { + "fontSize": 12, + "bold": true, + "margin": [ + -27, + 10, + -10, + -45 + ], + "color": "#000000" + }, + "no-signature": { + "fontSize": 12, + "margin": [ + -27, + 10, + -10, + 0 + ], + "color": "#484848" + } + } + } +} diff --git a/configs/pdf-service/format-config/sw-bill.json b/configs/pdf-service/format-config/sw-bill.json new file mode 100644 index 00000000..1984a44e --- /dev/null +++ b/configs/pdf-service/format-config/sw-bill.json @@ -0,0 +1,1234 @@ +{ + "key": "sw-bill", + "config": { + "defaultStyle": { + "font": "Cambay" + }, + "content": [ + { + "style": "noc-head", + "table": { + "widths": [ + 60, + "*", + 120 + ], + "body": [ + [ + { + "image": "{{logoImage}}", + "width": 45, + "height": 50 + }, + { + "stack": [ + { + "text": "{{logo_header}} {{mcGrade}}", + "style": "receipt-logo-header" + }, + { + "stack": [ + { + "text": "{{address}}" + }, + { + "text": "{{phoneNumber}}" + }, + { + "text": "{{website}}" + }, + { + "text": "{{email}}" + } + ] + } + ], + "alignment": "left", + "margin": [ + 0, + 1, + 0, + 0 + ] + }, + { + "stack": [ + { + "text": "{{total_amount_due}} {{tseting}}" + }, + { + "text": "{{Rs}} {{totalAmountDue}}", + "style": "amount-due" + } + ], + "alignment": "right", + "color": "#484848", + "margin": [ + -150, + 1, + -20, + 0 + ] + } + ] + ] + }, + "layout": "noBorders" + }, + { + "style": "noc-table2", + "table": { + "widths": [ + "103%" + ], + "body": [ + [ + { + "text": "{{serviceType}} Bill for Period {{fromPeriod}} - {{toPeriod}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2", + "alignment":"center" + } + ] + ] + }, + "layout": {} + }, + { + "style": "noc-table2", + "table": { + "widths": [ + "103%" + ], + "body": [ + [ + { + "table": { + "widths": [ + "8%", + "22%", + "15%", + "21%", + "15%", + "21%" + ], + "body": [ + [ + { + "text": "{{bill_no}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{billNo}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{bill_issue_date}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{billIssueDate}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "Bill Due Date", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{billDueDate}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + } + ] + ] + }, + "border": [ + false, + true, + false, + true + ] + } + ] + + ] + }, + "layout": {} + }, + { + "style": "noc-table2", + "table": { + "widths": [ + "103%" + ], + "body": [ + [ + { + "table": { + "widths": [ + "23%", + "25%", + "23%", + "*" + ], + "body": [ + [ + { + "text": "{{consumer_no}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "Old Consumer No.", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "House No.", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "Ledger Id", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + } + ], + [ + { + "text": "{{consumerCode}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{oldConnectionNo}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{houseNo}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text":"{{ledgerId}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + } + ], + [ + { + "text": "Plot Size", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "Consumer Name", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "Guardian Name", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "Locality", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + } + ], + [ + { + "text": "{{plotSize}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{ownerName}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{guardianName}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text":"{{locality}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + } + ], + [ + { + "text": "Usage Type", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "Mobile Number", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "Street Name/Landmark", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "Address", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + } + ], + [ + { + "text": "{{usageType}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + + { + "text": "{{mobileNo}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text":"{{streetName}}{{landmark}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{payerAddress}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + } + ] + ] + }, + "border": [ + true, + true, + true, + true + ] + } + ] + ] + }, + "layout": {} + }, + { + "style": "noc-table2", + "table": { + "widths": [ + "103%" + ], + "body": [ + [ + { + "text": "{{billing_summary_property_tax}} {{serviceType}}", + "border": [ + true, + true, + true, + false + ], + "style": "receipt-table-value" + } + ], + [ + { + "table": { + "widths": [ + "12%", + "23%", + "15%", + "10%", + "10%", + "10%", + "10%", + "*" + ], + "body": [ + [ + { + "text": "{{arrears_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{advanceAdjusted_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{advanceAvailable_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + },{ + "text": "{{charge_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{penalty_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{rebate_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{others_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{total_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + } + ], + [ + { + "text": "{{arrears}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text":"{{advanceAdjusted}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{advanceAvailable}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{charge}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{penalty}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{rebate}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{others}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{calculatedTotal}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2", + "bold": true + } + ] + ] + }, + "border": [ + true, + true, + true, + true + ] + } + ] + ] + }, + "layout": {} + }, + { + "style": "noc-table3", + "table": { + "widths": [ + "103%" + ], + "body": [ + [ + { + "text": "{{important_message}}", + "border": [ + true, + true, + true, + false + ], + "margin": [ + 9, + 1, + 0, + 1 + ], + "style": "receipt-table-value" + } + ], + [ + { + "text": "1. Online payment can be done for {{serviceType}} charges payment. http://bit.ly/{{logo_header}}{{serviceType}}", + "border": [ + true, + false, + true, + false + ], + "margin": [ + 4, + 0, + 0, + 0.5 + ] + } + ], + [ + { + "text": "2. If last day to pay bill is a holiday. Kindly pay your bills either online or offline on previous working day to avoid penalty.", + "border": [ + true, + false, + true, + false + ], + "margin": [ + 4, + 0, + 0, + 0.5 + ] + } + ], + [ + { + "text": "3. Payment mode available: Cash/Cheque at office counter,Online: Credit/Debit Card/PayTM/FreeCharge/BBPS/Airtel/SewaKendra.", + "border": [ + true, + false, + true, + false + ], + "margin": [ + 4, + 0, + 0, + 0.5 + ] + } + ], + [ + { + "text": "4. Please bring this bill while making payment at office counter.", + "border": [ + true, + false, + true, + false + ], + "margin": [ + 4, + 0, + 0, + 0.5 + ] + } + ], + [ + { + "text": "5. {{rate}}% Late payment charges will be applied after due date", + "border": [ + true, + false, + true, + false + ], + "margin": [ + 4, + 0, + 0, + 0.5 + ] + } + ], + [ + { + "text": "6. Interest & late payment charges calculated based on the payment date will reflect in next bill ", + "border": [ + true, + false, + true, + true + ], + "margin": [ + 4, + 0, + 0, + 0.5 + ] + } + ] + ] + }, + "layout": {} + }, + { + "canvas": [ + { + "type": "line", + "x1": -40, + "y1": 28, + "x2": 700, + "y2": 28, + "dash": { + "length": 10, + "space": 5 + } + } + ] + }, + { + "text": "Authorized Signatory", + "style": "footer-bottom" + }, + { + "image": "{{scissorImage}}", + "width": 19, + "height": 19, + "margin": [ + -30, + -9.8, + 0, + 0 + ] + }, + { + "text": "{{acknowledgement_for}}", + "style": "footer-header" + }, + { + "style": "noc-table4", + "table": { + "widths": [ + "*", + "*", + "*", + "*" + ], + "body": [ + [ + { + "text": "{{date_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{billdate}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Bill Due Date", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{billDueDate}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{consumer_no}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{consumerID}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{bill_no}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{billNo}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{name_address}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerName}}, {{nameAddress}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{total_payment}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{total}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + } + ] + ] + } + }, + { + "text": "{{receivers_signature}}", + "style": "footer-bottom" + } + ], + "styles": { + "noc-head": { + "margin": [ + -25, + -30, + 0, + 1 + ] + }, + "receipt-logo-header": { + "color": "#484848", + "fontFamily": "Roboto", + "fontSize": 14, + "bold": true, + "letterSpacing": 0.74, + "margin": [ + 0, + -10, + 0, + 1 + ] + }, + "receipt-logo-sub-header": { + "color": "#484848", + "fontFamily": "Roboto", + "fontSize": 12, + "letterSpacing": 0.6 + }, + "noc-table": { + "fontSize": 10, + "color": "#484848", + "margin": [ + -25, + 13, + -8, + -8 + ] + }, + "noc-table4": { + "fontSize": 10, + "color": "#484848", + "margin": [ + -25, + 40, + -8, + -8 + ] + }, + "noc-table2": { + "fontSize": 10, + "color": "#484848", + "margin": [ + -25, + 8, + -8, + -8 + ] + }, + "noc-table3": { + "fontSize": 10, + "color": "#484848", + "margin": [ + -25, + 13, + -8, + -8 + ] + }, + "receipt-table-value": { + "color": "#000000", + "bold": true, + "fontSize": 10, + "fontWeight": 500, + "margin": [ + 8, + 1, + 0, + 0 + ] + }, + "receipt-table-value2": { + "color": "#000000", + "bold": true, + "fontSize": 10, + "fontWeight": 500, + "margin": [ + 3, + 1, + 0, + 0 + ] + }, + "receipt-table": { + "color": "#484848", + "bold": true, + "fontSize": 10, + "fontWeight": 400, + "margin": [ + -30, + 1, + 0, + 0 + ] + }, + "receipt-table2": { + "color": "#484848", + "bold": true, + "fontSize": 10, + "fontWeight": 400, + "margin": [ + 3, + 2, + 0, + 2 + ] + }, + "right-receipt-table": { + "color": "#000000", + "bold": true, + "fontSize": 10, + "fontWeight": 500, + "margin": [ + 8, + 5, + 0, + 10 + ] + }, + "right-receipt-table2": { + "color": "#484848", + "bold": true, + "fontSize": 10, + "fontWeight": 400, + "margin": [ + -30, + 5, + 0, + 0 + ] + }, + "receipt-approver": { + "fontSize": 10, + "bold": true, + "margin": [ + -27, + 30, + -10, + 0 + ], + "color": "#484848" + }, + "no-signature": { + "fontSize": 10, + "margin": [ + -27, + 25, + -10, + 0 + ], + "color": "#484848" + }, + "amount-due": { + "fontSize": 20, + "color": "#FC8019", + "bold": true, + "fontWeight": 700 + }, + "pt-disclaimer": { + "fontSize": 8, + "margin": [ + -27, + 20, + -10, + 0 + ], + "color": "#484848" + }, + "pt-disclaimer-value": { + "fontSize": 8, + "margin": [ + 0, + 2, + 0, + 0 + ], + "color": "#484848" + }, + "qr-text": { + "fontSize": 12, + "margin": [ + 40, + 0, + 0, + 0 + ], + "color": "#484848", + "alignment": "left" + }, + "qr-image": { + "margin": [ + -40, + -1, + -3, + 0 + ], + "color": "#484848", + "alignment": "right" + }, + "footer-header": { + "margin": [ + 0, + 2, + 0, + -40 + ], + "bold": true, + "color": "#000000", + "alignment": "center" + }, + "footer-bottom": { + "margin": [ + 0, + 20, + 0, + 0 + ], + "bold": true, + "color": "#000000", + "alignment": "right" + } + } + } +} diff --git a/configs/pdf-service/format-config/testconsolidatedreceipt.json b/configs/pdf-service/format-config/testconsolidatedreceipt.json new file mode 100644 index 00000000..bb9d7d72 --- /dev/null +++ b/configs/pdf-service/format-config/testconsolidatedreceipt.json @@ -0,0 +1,573 @@ +{ + "key": "testconsolidatedreceipt", + "config": { + "defaultStyle": { + "font": "Cambay" + }, + "content": [ + { + "style": "noc-head", + "table": { + "widths": [ + 60, + "*", + 120 + ], + "body": [ + [ + { + "image": "{{logoImage}}", + "width": 50, + "height": 61.25 + }, + { + "stack": [ + { + "text": "{{logo-header}} {{Municipal_Corporation}}", + "style": "receipt-logo-header" + }, + { + "text": "{{serviceType}} {{payment_receipt}}", + "style": "receipt-logo-sub-header" + } + ], + "alignment": "left", + "margin": [ + 0, + 10, + 0, + 0 + ] + }, + { + "stack": [ + { + "text": "{{address}}" + }, + { + "text": "{{phoneNumber}}" + }, + { + "text": "{{website}}" + }, + { + "text": "{{email}}" + } + ], + "alignment": "right", + "color": "#484848", + "margin": [ + -100, + 0, + -25, + 0 + ] + } + ] + ] + }, + "layout": "noBorders" + }, + { + "style": "noc-table", + "table": { + "widths": [ + "25%", + "25%", + "25%", + "25%" + ], + "body": [ + [ + { + "text": "{{receipt_no}}.", + "border": [ + true, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{receiptNo}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table", + "font": "Roboto" + }, + { + "text": "{{consumer_id}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{consumerID}}", + "border": [ + false, + true, + true, + false + ], + "style": "receipt-table", + "font": "Roboto" + } + ], + [ + { + "text": "{{payment_date}}", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{paymentDate}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{payer_name}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerName}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{payer_contact}}", + "border": [ + true, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerContact}}", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table" + }, + { + "text" : " ", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text" : " ", + "border": [ + false, + false, + true, + true + ], + "style": "receipt-table" + } + ] + ] + }, + "layout": {} + }, + { + "style": "next-noc-table", + "table": { + "widths": [ + "25%", + "25%", + "25%", + "25%" + ], + "body": [ + [ + { + "text": "{{service_type}}", + "border": [ + true, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{serviceType}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{billing_period}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{fromPeriod}} {{to}} {{toPeriod}}", + "border": [ + false, + true, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{paid_amount}}", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "₹ {{paidAmount}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{pending_amount}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "₹ {{pendingAmount}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{payment_mode}}", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{paymentMode}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{transaction_id}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{transactionID}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table", + "font": "Roboto" + } + ], + [ + { + "text": "{{g8_receipt_no}}.", + "border": [ + true, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{G8ReceiptNo}}", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table" + }, + { + "text": "{{g8_receipt_date}}", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{G8ReceiptDate}}", + "border": [ + false, + false, + true, + true + ], + "style": "receipt-table" + } + ] + ] + }, + "layout": {} + }, + { + "style": "receipt-approver", + "columns": [ + { + "text": [ + { + "text": "{{generated_by}}: ", + "bold": true + }, + { + "text": "{{user-name}}", + "bold": false + } + ], + "alignment": "left" + }, + { + "text": [ + { + "text": "{{commissioner/eo}}", + "bold": true + } + ], + "alignment": "right", + "margin": [ + 0, + 0, + -10, + 1 + ] + } + ] + }, + { + "style": "no-signature", + "text": "{{no_signature}}" + }, + { + "style": "pt-disclaimer", + "stack": [ + { + "text": "{{disclamer}}", + "bold": true, + "style": "pt-disclaimer-value" + }, + { + "text": "{{disclamer_1}}", + "bold": false, + "style": "pt-disclaimer-value" + }, + { + "text": "{{disclamer_2}}", + "bold": false, + "style": "pt-disclaimer-value" + }, + { + "text": "{{disclamer_3}}", + "bold": false, + "style": "pt-disclaimer-value" + } + ] + } + ], + "styles": { + "noc-head": { + "margin": [ + -30, + -30, + 0, + 1 + ] + }, + "receipt-logo-header": { + "color": "#000000", + "fontSize": 14, + "bold": true, + "letterSpacing": 0.74, + "margin": [ + 0, + 0, + 0, + 5 + ] + }, + "receipt-logo-sub-header": { + "color": "#000000", + "fontSize": 12, + "letterSpacing": 0.6 + }, + "noc-table": { + "fontSize": 12, + "color": "#000000", + "margin": [ + -25, + 45, + -22, + -8 + ] + }, + "next-noc-table": { + "fontSize": 12, + "color": "#000000", + "margin": [ + -25, + 28, + -22, + -8 + ] + }, + "receipt-table-value": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 8, + 8, + 0, + 8 + ] + }, + "receipt-table": { + "color": "#000000", + "bold": false, + "fontSize": 12, + "fontWeight": 400, + "margin": [ + -30, + 8, + 0, + 8 + ] + }, + "receipt-approver": { + "fontSize": 12, + "bold": true, + "margin": [ + -27, + 50, + -10, + 0 + ], + "color": "#484848" + }, + "no-signature": { + "fontSize": 12, + "margin": [ + -27, + 35, + -10, + 0 + ], + "color": "#484848" + }, + "pt-disclaimer": { + "fontSize": 12, + "margin": [ + -27, + 30, + -10, + 0 + ], + "color": "#484848" + }, + "pt-disclaimer-value": { + "fontSize": 12, + "margin": [ + 2, + 5, + 0, + 0 + ], + "color": "#484848" + } + }, + "footer": "(function(currentPage, pageCount) { return currentPage.toString() + ' of ' + pageCount; })" + } +} diff --git a/configs/pdf-service/format-config/testlocalconsolidatedbill.json b/configs/pdf-service/format-config/testlocalconsolidatedbill.json new file mode 100644 index 00000000..2d7fde53 --- /dev/null +++ b/configs/pdf-service/format-config/testlocalconsolidatedbill.json @@ -0,0 +1,999 @@ +{ + "key": "testlocalconsolidatedbill", + "config": { + "defaultStyle": { + "font": "Cambay" + }, + "content": [ + { + "style": "noc-head", + "table": { + "widths": [ + 60, + "*", + 120 + ], + "body": [ + [ + { + "image": "{{logoImage}}", + "width": 50, + "height": 61.25 + }, + { + "stack": [ + { + "text": "{{logo_header}}", + "style": "receipt-logo-header" + }, + { + "stack": [ + { + "text": "C Block, Ranjit Avenue, Amritsar" + }, + { + "text": " Tel. +91-183-2502339" + }, + { + "text": "website: www.amritsarcorp.com" + }, + { + "text": "Email: cmcasr@punjab.gov.in" + } + ] + } + ], + "alignment": "left", + "margin": [ + 0, + 10, + 0, + 0 + ] + }, + { + "stack": [ + { + "text": "{{total_amount_due}}" + }, + { + "text": "{{totalAmountDue}}", + "style": "amount-due" + } + ], + "alignment": "right", + "color": "#484848", + "margin": [ + -150, + 2, + -20, + 0 + ] + } + ] + ] + }, + "layout": "noBorders" + }, + { + "style": "noc-table", + "table": { + "widths": [ + 130, + 130, + -2, + 130, + 130 + ], + "body": [ + [ + { + "text": "{{payer_name}}", + "border": [ + true, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerName}}", + "border": [ + false, + true, + true, + false + ], + "style": "receipt-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ] + }, + { + "text": "{{bill_no}}", + "border": [ + true, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{billNo}}", + "border": [ + false, + true, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{mobile_no}}", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{mobileNo}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ] + }, + { + "text": "{{bill_period}}", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{fromPeriod}} - {{toPeriod}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{payer_address}}", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerAddress}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ] + }, + { + "text": "{{bill_issue_date}}", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{billIssueDate}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": " ", + "border": [ + true, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": " ", + "border": [ + false, + false, + true, + true + ], + "style": "receipt-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ] + }, + { + "text": "{{bill_due_date}}", + "border": [ + true, + false, + false, + true + ], + "style": "right-receipt-table" + }, + { + "text": "{{billDueDate}}", + "border": [ + false, + false, + true, + true + ], + "style": "right-receipt-table2" + } + ] + ] + }, + "layout": {} + }, + { + "style": "noc-table2", + "table": { + "widths": [ + "103%" + ], + "body": [ + [ + { + "text": "{{billing_summary_property_tax}}", + "border": [ + true, + true, + true, + false + ], + "style": "receipt-table-value" + } + ], + [ + { + "table": { + "widths": [ + "18%", + "26%", + "10%", + "9%", + "10%", + "9%", + "10%", + "9%" + ], + "body": [ + [ + { + "text": "{{property_id}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{bill_period}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{arrears_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{charge_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{penalty_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{rebate_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{others_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{total_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + } + ], + [ + { + "text": "{{propertyID}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{fromPeriod}}-{{toPeriod}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{arrears}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{charge}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{penalty}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{rebate}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{others}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{total}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2", + "bold": true + } + ] + ] + }, + "border": [ + true, + false, + true, + true + ] + } + ] + ] + }, + "layout": {} + }, + { + "style": "noc-table3", + "table": { + "widths": [ + "103%" + ], + "body": [ + [ + { + "text": "{{important_message}}", + "border": [ + true, + true, + true, + false + ], + "margin": [ + 9, + 10, + 0, + 5 + ], + "style": "receipt-table-value" + } + ], + [ + { + "ol": [ + { + "text": "{{payment_received}}", + "margin": [ + 8, + 0, + 0, + 5 + ] + }, + { + "text": "{{this_document}}", + "margin": [ + 8, + 0, + 0, + 5 + ] + }, + { + "text": "{{this_is_a}}", + "margin": [ + 8, + 0, + 0, + 5 + ] + }, + { + "text": "{{assessment_payment}}", + "margin": [ + 8, + 0, + 0, + 5 + ] + }, + { + "text": "{{please_deposit}}", + "margin": [ + 8, + 0, + 0, + 5 + ] + }, + { + "text": "{{if_the_tax}}", + "margin": [ + 8, + 0, + 0, + 10 + ] + } + ], + "border": [ + true, + false, + true, + true + ], + "alignment": "left" + } + ] + ] + }, + "layout": {} + }, + { + "canvas": [ + { + "type": "line", + "x1": -40, + "y1": 30, + "x2": 700, + "y2": 30, + "dash": { + "length": 10, + "space": 5 + } + } + ] + }, + { + "image": "{{scissorImage}}", + "width": 14, + "height": 14, + "margin": [ + -30, + -7, + 0, + 0 + ] + }, + { + "text": "{{acknowledgement_for}}", + "style": "footer-header" + }, + { + "style": "noc-table", + "table": { + "widths": [ + "*", + "*", + "*", + "*" + ], + "body": [ + [ + { + "text": "{{date_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "date", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{consumer_id}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{consumerID}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{bill_no}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{billNo}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{name_address}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{nameAddress}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{total_payment}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{totalPayment}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + } + ] + ] + } + }, + { + "text": "{{receivers_signature}}", + "style": "footer-bottom" + } + ], + "styles": { + "noc-head": { + "margin": [ + -25, + -30, + 0, + 1 + ] + }, + "receipt-logo-header": { + "color": "#484848", + "fontFamily": "Roboto", + "fontSize": 14, + "bold": true, + "letterSpacing": 0.74, + "margin": [ + 0, + -10, + 0, + 5 + ] + }, + "receipt-logo-sub-header": { + "color": "#484848", + "fontFamily": "Roboto", + "fontSize": 13, + "letterSpacing": 0.6 + }, + "noc-table": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -25, + 45, + -8, + -8 + ] + }, + "noc-table2": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -25, + 18, + -8, + -8 + ] + }, + "noc-table3": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -25, + 30, + -8, + -8 + ] + }, + "receipt-table-value": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 8, + 5, + 0, + 0 + ] + }, + "receipt-table-value2": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 3, + 5, + 0, + 0 + ] + }, + "receipt-table": { + "color": "#484848", + "bold": true, + "fontSize": 12, + "fontWeight": 400, + "margin": [ + -30, + 5, + 0, + 0 + ] + }, + "receipt-table2": { + "color": "#484848", + "bold": true, + "fontSize": 11, + "fontWeight": 400, + "margin": [ + 3, + 8, + 0, + 10 + ] + }, + "right-receipt-table": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 8, + -10, + 0, + 10 + ] + }, + "right-receipt-table2": { + "color": "#484848", + "bold": true, + "fontSize": 12, + "fontWeight": 400, + "margin": [ + -30, + -10, + 0, + 0 + ] + }, + "receipt-approver": { + "fontSize": 12, + "bold": true, + "margin": [ + -27, + 50, + -10, + 0 + ], + "color": "#484848" + }, + "no-signature": { + "fontSize": 12, + "margin": [ + -27, + 35, + -10, + 0 + ], + "color": "#484848" + }, + "amount-due": { + "fontSize": 30, + "color": "#FC8019", + "bold": true, + "fontWeight": 700 + }, + "pt-disclaimer": { + "fontSize": 12, + "margin": [ + -27, + 30, + -10, + 0 + ], + "color": "#484848" + }, + "pt-disclaimer-value": { + "fontSize": 12, + "margin": [ + 0, + 5, + 0, + 0 + ], + "color": "#484848" + }, + "qr-text": { + "fontSize": 12, + "margin": [ + 40, + 0, + 0, + 0 + ], + "color": "#484848", + "alignment": "left" + }, + "qr-image": { + "margin": [ + -40, + -1, + -3, + 0 + ], + "color": "#484848", + "alignment": "right" + }, + "footer-header": { + "margin": [ + 0, + 15, + 0, + -40 + ], + "color": "#000000", + "alignment": "center" + }, + "footer-bottom": { + "margin": [ + 0, + 10, + 0, + 0 + ], + "color": "#000000", + "alignment": "right" + } + } + } + } \ No newline at end of file diff --git a/configs/pdf-service/format-config/testlocalconsolidatedreceipt.json b/configs/pdf-service/format-config/testlocalconsolidatedreceipt.json new file mode 100644 index 00000000..6aecca7b --- /dev/null +++ b/configs/pdf-service/format-config/testlocalconsolidatedreceipt.json @@ -0,0 +1,579 @@ +{ + "key": "testlocalconsolidatedreceipt", + "config": { + "defaultStyle": { + "font": "Cambay" + }, + "content": [ + { + "style": "noc-head", + "table": { + "widths": [ + 60, + "*", + 120 + ], + "body": [ + [ + { + "image": "{{logoImage}}", + "width": 50, + "height": 61.25 + }, + { + "stack": [ + { + "text": "{{logo-header}}", + "style": "receipt-logo-header" + }, + { + "text": "{{serviceType}} {{payment_receipt}}", + "style": "receipt-logo-sub-header" + } + ], + "alignment": "left", + "margin": [ + 0, + 10, + 0, + 0 + ] + }, + { + "stack": [ + { + "text": "{{address}}" + }, + { + "text": "{{phoneNumber}}" + }, + { + "text": "{{website}}" + }, + { + "text": "{{email}}" + } + ], + "alignment": "right", + "color": "#484848", + "margin": [ + -100, + 0, + -25, + 0 + ] + } + ] + ] + }, + "layout": "noBorders" + }, + { + "style": "noc-table", + "table": { + "widths": [ + "*", + "*", + "*", + "*" + ], + "body": [ + [ + { + "text": "{{receipt_no}}.", + "border": [ + true, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{receiptNo}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{consumer_id}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{consumerID}}", + "border": [ + false, + true, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{payment_date}}", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{paymentDate}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{payer_name}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerName}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{payer_contact}}", + "border": [ + true, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerContact}}", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table" + }, + { + "text" : " ", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text" : " ", + "border": [ + false, + false, + true, + true + ], + "style": "receipt-table" + } + ] + ] + }, + "layout": {} + }, + { + "style": "next-noc-table", + "table": { + "widths": [ + "25%", + "25%", + "25%", + "25%" + ], + "body": [ + [ + { + "text": "{{service_type}}", + "border": [ + true, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{serviceType}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{billing_period}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{fromPeriod}} {{to}} {{toPeriod}}", + "border": [ + false, + true, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{paid_amount}}", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "₹ {{paidAmount}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{pending_amount}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "₹ {{pendingAmount}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{payment_mode}}", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{paymentMode}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{transaction_id}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{transactionID}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{g8_receipt_no}}.", + "border": [ + true, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{G8ReceiptNo}}", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table" + }, + { + "text": "{{g8_receipt_date}}", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{G8ReceiptDate}}", + "border": [ + false, + false, + true, + true + ], + "style": "receipt-table" + } + ] + ] + }, + "layout": {} + }, + { + "style": "receipt-approver", + "columns": [ + { + "text": [ + { + "text": "{{generated_by}}: ", + "bold": true + }, + { + "text": "{{user-name}}", + "bold": false + } + ], + "alignment": "left" + }, + { + "text": [ + { + "text": "{{commissioner/eo}}", + "bold": true + } + ], + "alignment": "right", + "margin": [ + 0, + 0, + -10, + 1 + ] + } + ] + }, + { + "style": "no-signature", + "text": "{{no_signature}}" + }, + { + "style": "pt-disclaimer", + "stack": [ + { + "text": "{{disclamer}}", + "bold": true, + "style": "pt-disclaimer-value" + }, + { + "text": "{{disclamer_1}}", + "bold": false, + "style": "pt-disclaimer-value" + }, + { + "text": "{{disclamer_2}}", + "bold": false, + "style": "pt-disclaimer-value" + }, + { + "text": "{{disclamer_3}}", + "bold": false, + "style": "pt-disclaimer-value" + }, + { + "text": "{{disclamer_4}}", + "bold": false, + "style": "pt-disclaimer-value" + }, + { + "text": "{{disclamer_5}}", + "bold": false, + "style": "pt-disclaimer-value" + } + ] + } + ], + "styles": { + "noc-head": { + "margin": [ + -30, + -30, + 0, + 1 + ] + }, + "receipt-logo-header": { + "color": "#000000", + "fontSize": 14, + "bold": true, + "letterSpacing": 0.74, + "margin": [ + 0, + 0, + 0, + 5 + ] + }, + "receipt-logo-sub-header": { + "color": "#000000", + "fontSize": 12, + "letterSpacing": 0.6 + }, + "noc-table": { + "fontSize": 12, + "color": "#000000", + "margin": [ + -25, + 45, + -22, + -8 + ] + }, + "next-noc-table": { + "fontSize": 12, + "color": "#000000", + "margin": [ + -25, + 28, + -22, + -8 + ] + }, + "receipt-table-value": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 8, + 8, + 0, + 8 + ] + }, + "receipt-table": { + "color": "#000000", + "bold": false, + "fontSize": 12, + "fontWeight": 400, + "margin": [ + -30, + 8, + 0, + 8 + ] + }, + "receipt-approver": { + "fontSize": 12, + "bold": true, + "margin": [ + -27, + 50, + -10, + 0 + ], + "color": "#484848" + }, + "no-signature": { + "fontSize": 12, + "margin": [ + -27, + 35, + -10, + 0 + ], + "color": "#484848" + }, + "pt-disclaimer": { + "fontSize": 12, + "margin": [ + -27, + 30, + -10, + 0 + ], + "color": "#484848" + }, + "pt-disclaimer-value": { + "fontSize": 12, + "margin": [ + 2, + 5, + 0, + 0 + ], + "color": "#484848" + } + } + } +} \ No newline at end of file diff --git a/configs/pdf-service/format-config/tl-receipt.json b/configs/pdf-service/format-config/tl-receipt.json new file mode 100644 index 00000000..b11b6fb8 --- /dev/null +++ b/configs/pdf-service/format-config/tl-receipt.json @@ -0,0 +1,902 @@ +{ + "key":"tl-receipt", + "config":{ + "content": [ + { + "style": "tl-head", + "table": { + "widths": [ + 50, + "*", + 100 + ], + "body": [ + [ + { + "image": "{{variable33}}", + "width": 50, + "height": 61.25, + "margin": [ + 45, + 12, + 10, + 10 + ] + }, + { + "stack": [ + { + "text": "{{variable30}} Nagar Panchayat", + "style": "receipt-logo-header" + }, + { + "text": "Trade License Payment Receipt ({{variable31}})", + "style": "receipt-logo-sub-header" + } + ], + "alignment": "center", + "margin": [ + 56, + 23, + 0, + 0 + ] + }, + { + "stack": [ + { + "text": "Receipt No.", + "style": "receipt-no", + "bold": true + }, + { + "text": "{{variable16}}", + "style": "receipt-no", + "bold": true + } + ], + "alignment": "center", + "margin": [-50, 30, 0, 2] + } + ] + ] + }, + "layout": "noBorders" + }, + { + "style": "pt-reciept-citizen-header", + "columns": [ + { + "text": [ + { + "text": "Application Type ", + "bold": true + }, + { + "text": "{{variable1}}", + "bold": false + } + ], + "alignment": "left" + }, + { + "text": [ + { + "text": "Old License No. ", + "bold": true + }, + { + "text": "{{variable2}}", + "bold": false + } + ], + "alignment": "right" + } + ] + }, + { + "style": "pt-reciept-citizen-header", + "columns": [ + { + "text": [ + { + "text": "Application No. ", + "bold": true + }, + { + "text": "{{variable3}}", + "bold": false + } + ], + "alignment": "left" + }, + { + "text": [ + { + "text": "Receipt No. ", + "bold": true + }, + { + "text": "{{variable16}}", + "bold": false + } + ], + "alignment": "right" + } + ] + }, + { + "style": "pt-reciept-citizen-header", + "columns": [ + { + "text": [ + { + "text": "Financial Year ", + "bold": true + }, + { + "text": "{{variable4}}", + "bold": false + } + ], + "alignment": "left" + }, + { + "text": [ + { + "text": "Payment Date ", + "bold": true + }, + { + "text": "{{variable17}}", + "bold": false + } + ], + "alignment": "right" + } + ] + }, + { + "text": "TRADE DETAILS", + "style": "pt-reciept-citizen-subheader" + }, + + { + "style": "pt-reciept-citizen-table", + "table": { + "widths": ["*", "*", "*", "*"], + "body": [ + [ + { + "text": "Trade Name", + "border": [ + true, + true, + false, + true + ], + "style": "receipt-table-key" + }, + { + "text": "{{variable5}}", + "border": [ + false, + true, + true, + true + ] + }, + { + "text": "Trade Category", + "border": [ + true, + true, + false, + true + ], + "style": "receipt-table-key" + }, + { + "text": "{{variable6}}", + "border": [ + false, + true, + true, + true + ] + } + ] + ] + }, + "layout": {} + }, + { + "style": "pt-reciept-citizen-table", + "table": { + "widths": ["24%", "76%"], + "body": [ + [ + { + "text": "Trade Type", + "border": [ + true, + false, + false, + true + ], + "style": "receipt-table-key" + }, + { + "text": "{{variable7}}", + "border": [ + false, + false, + true, + true + ] + } + ], + [ + { + "text": "Accessories", + "border": [ + true, + true, + false, + true + ], + "style": "receipt-table-key" + }, + { + "text": "{{variable8}}", + "border": [ + false, + true, + true, + true + ] + } + ] + ] + }, + "layout": {} + }, + { + "text": "TRADE LOCATION DETAILS", + "style": "pt-reciept-citizen-subheader" + }, + { + "style": "pt-reciept-citizen-table", + "table": { + "widths": ["*", "*", "*", "*"], + "body": [ + [ + { + "text": "House/Door No.", + "border": [ + true, + true, + false, + true + ], + "style": "receipt-table-key" + }, + { + "text": "{{variable9}}", + "border": [ + false, + true, + true, + true + ] + }, + { + "text": "Building/Colony Name.", + "border": [ + true, + true, + false, + true + ], + "style": "receipt-table-key" + }, + { + "text": "{{variable10}}", + "border": [ + false, + true, + true, + true + ] + } + ], + [ + { + "text": "Street Name", + "border": [ + true, + true, + false, + true + ], + "style": "receipt-table-key" + }, + { + "text": "{{variable11}}", + "border": [ + false, + true, + true, + true + ] + }, + { + "text": "Locality/Mohalla", + "border": [ + true, + true, + false, + true + ], + "style": "receipt-table-key" + }, + { + "text": "{{variable12}}", + "border": [ + false, + true, + true, + true + ] + } + ] + ] + }, + "layout": {} + }, + { + "text": "OWNERSHIP INFORMATION", + "style": "pt-reciept-citizen-subheader" + }, + { + "style": "pt-reciept-citizen-table", + "table": { + "widths":["*", "*", "*", "*"], + "body": ["{{#variable13}}[{\"text\":\"Owner Name\",\"border\":[true,true,false,true],\"style\":\"receipt-table-key\"},{\"text\":\"{{name}}","border\":[false,true,true,true]},{\"text\":\"Mobile No.\",\"border\":[true,true,false,true],\"style\":\"receipt-table-key\"},{\"text\":\"{{mobileNumber}}\",\"border\":[false,true,true,true]}]{{/variable13}}"] + }, + "layout": {} + }, + { + "text": "PAYABLE AMOUNT", + "style": "pt-reciept-citizen-subheader" + }, + { + "style": "pt-reciept-citizen-table", + "table": { + "widths": ["*", "*", "*", "*", "*", "*"], + "body": [ + [ + { + "text": "Trade License Fee", + "border": [ + true, + true, + true, + true, + true, + true, + true + ], + "style": "receipt-table-key", + "alignment": "center" + }, + { + "text": "Penalty", + "border": [ + true, + true, + true, + true, + true, + true, + true + ], + "style": "receipt-table-key", + "alignment": "center" + }, + { + "text": "Rebate", + "border": [ + true, + true, + true, + true, + true, + true, + true + ], + "style": "receipt-table-key", + "alignment": "center" + }, + { + "text": "Adhoc Penalty", + "border": [ + true, + true, + true, + true, + true, + true, + true + ], + "style": "receipt-table-key", + "alignment": "center" + }, + { + "text": "Adhoc Rebate", + "border": [ + true, + true, + true, + true, + true, + true, + true + ], + "style": "receipt-table-key", + "alignment": "center" + }, + { + "text": "Total", + "border": [ + true, + true, + true, + true, + true, + true, + true + ], + "style": "receipt-table-key", + "alignment": "center" + } + ], + [ + { + "text": "{{variable18}}", + "border": [ + true, + true, + true, + true, + true, + true, + true + ], + "style": "receipt-table-value", + "alignment": "center" + }, + { + "text": "{{variable26}}", + "border": [ + true, + true, + true, + true, + true, + true, + true + ], + "style": "receipt-table-value", + "alignment": "center" + }, + { + "text": "{{variable27}}", + "border": [ + true, + true, + true, + true, + true, + true, + true + ], + "style": "receipt-table-value", + "alignment": "center" + }, + { + "text": "{{variable28}}", + "border": [ + true, + true, + true, + true, + true, + true, + true + ], + "style": "receipt-table-value", + "alignment": "center" + }, + { + "text": "{{variable29}}", + "border": [ + true, + true, + true, + true, + true, + true, + true + ], + "style": "receipt-table-value", + "alignment": "center" + }, + { + "text": "{{variable19}}", + "border": [ + true, + true, + true, + true, + true, + true, + true + ], + "style": "receipt-table-value", + "alignment": "center" + } + ] + ] + }, + "layout": {} + }, + { + "text": "PAYMENT INFORMATION", + "style": "pt-reciept-citizen-subheader" + }, + { + "style": "pt-reciept-citizen-table", + "table": { + "widths": ["*", "*", "*", "*"], + "body": [ + [ + { + "text": "Total Amount Paid:", + "border": [ + true, + true, + false, + true + ], + "style": "receipt-table-key" + }, + { + "text": "{{variable20}}", + "border": [ + false, + true, + true, + true + ] + }, + { + "text": "Amount Due:", + "border": [ + true, + true, + false, + true + ], + "style": "receipt-table-key" + }, + { + "text": "{{variable32}}", + "border": [ + false, + true, + true, + true + ] + } + ] + ] + }, + "layout": {} + }, + { + "style": "pt-reciept-citizen-table", + "table": { + "widths": ["*", "*", "*"], + "body": [ + [ + { + "text": "Payment Mode", + "border": [ + true, + true, + true, + true, + true, + true, + true + ], + "style": "receipt-table-key", + "alignment": "center" + }, + { + "text": "Transaction ID/ Cheque/ DD No.", + "border": [ + true, + true, + true, + true, + true, + true, + true + ], + "style": "receipt-table-key", + "alignment": "center" + }, + { + "text": "Bank Name & Branch", + "border": [ + true, + true, + true, + true, + true, + true, + true + ], + "style": "receipt-table-key", + "alignment": "center" + } + ], + [ + { + "text": "{{variable21}}", + "border": [ + true, + true, + true, + true, + true, + true, + true + ], + "style": "receipt-table-value", + "alignment": "center" + }, + { + "text": "{{variable22}}", + "border": [ + true, + true, + true, + true, + true, + true, + true + ], + "style": "receipt-table-value", + "alignment": "center" + }, + { + "text": "{{variable23}}", + "border": [ + true, + true, + true, + true, + true, + true, + true + ], + "style": "receipt-table-value", + "alignment": "center" + } + ] + ] + }, + "layout": {} + }, + { + "style": "pt-reciept-citizen-table", + "table": { + "widths": ["*", "*", "*", "*"], + "body": [ + [ + { + "text": "G8 Receipt No:", + "border": [ + true, + true, + false, + true + ], + "style": "receipt-table-key" + }, + { + "text": "{{variable24}}", + "border": [ + false, + true, + true, + true + ] + }, + { + "text": "G8 Receipt Issue Date:", + "border": [ + true, + true, + false, + true + ], + "style": "receipt-table-key" + }, + { + "text": "{{variable25}}", + "border": [ + false, + true, + true, + true + ] + } + ] + ] + }, + "layout": {} + }, + { + "style": "receipt-approver", + "columns": [ + { + "text": [ + { + "text": "Generated by: ", + "bold": true + }, + { + "text": "Kulvinder Approver", + "bold": false + } + ], + "alignment": "left" + }, + { + "text": [ + { + "text": "Commissioner/EO", + "bold": true + } + ], + "alignment": "right" + } + ] + } + ], + "footer": [ + { + "text": "Note:\n1. Payment received by cheque/demand draft shall be subject to realization.\n2. This document is not a proof of Property Ownership.\n3. This is a computer generated document, hence requires no signature.", + "style": "receipt-footer" + } + ], + "styles": { + "tl-head": { + "fillColor": "#F2F2F2", + "margin": [ + -41, + -41, + -41, + 0 + ] + }, + "pt-reciept-citizen-header": { + "fontSize": 12, + "bold": true, + "margin": [ + 0, + 8, + 0, + 0 + ], + "color": "#484848" + }, + "pt-reciept-citizen-subheader": { + "fontSize": 10, + "bold": true, + "margin": [ + 0, + 16, + 0, + 8 + ], + "color": "#484848" + }, + "pt-reciept-citizen-table": { + "fontSize": 10, + "color": "#484848" + }, + "receipt-assess-table": { + "fontSize": 10, + "color": "#484848", + "margin": [ + 0, + 8, + 0, + 0 + ] + }, + "receipt-assess-table-header": { + "bold": true, + "fillColor": "#D8D8D8", + "color": "#484848" + }, + "receipt-header-details": { + "fontSize": 9, + "margin": [ + 0, + 0, + 0, + 8 + ], + "color": "#484848" + }, + "receipt-table-key": { + "color": "#484848", + "bold": true + }, + "receipt-table-value": { + "color": "#484848" + }, + "receipt-logo-header": { + "color": "#484848", + "fontFamily": "Roboto", + "fontSize": 16, + "bold": true, + "letterSpacing": 0.74 + }, + "receipt-logo-sub-header": { + "color": "#484848", + "fontFamily": "Roboto", + "fontSize": 13, + "letterSpacing": 1.6, + "margin": [ + 0, + 6, + 0, + 0 + ] + }, + "receipt-footer": { + "color": "#484848", + "fontSize": 8, + "margin": [ + 30, + -20, + 0, + 0 + ] + }, + "receipt-no": { + "color": "#484848", + "fontSize": 10 + }, + "receipt-approver": { + "fontSize": 10, + "bold": true, + "margin": [ + 0, + 60, + 0, + 8 + ], + "color": "#484848" + } + } + } +} + \ No newline at end of file diff --git a/configs/pdf-service/format-config/tlapplication.json b/configs/pdf-service/format-config/tlapplication.json new file mode 100644 index 00000000..5fc7b2ab --- /dev/null +++ b/configs/pdf-service/format-config/tlapplication.json @@ -0,0 +1,1395 @@ +{ + "key": "tlapplication", + "config": { + "defaultStyle": { + "font": "Cambay" + }, + "content": [ + { + "style": "noc-head", + "table": { + "widths": [ + "*", + "*", + "*" + ], + "body": [ + [ + { + "text":"{{trade_license_application}}", + "style": "receipt-logo-header" + }, + { + "text":"{{application_no}}", + "alignment":"right", + "color": "#484848", + "margin": [ + 0, + 2, + -50, + 0 + ] + }, + { + "text":"{{applicationNumber}}", + "alignment": "right", + "color": "#484848", + "bold": true, + "margin": [ + -150, + 2, + -20, + 0 + ] + } + ] + ] + }, + "layout": "noBorders" + }, + { + "style": "noc-table2", + "table": { + "widths": [ + "*" + ], + "body": [ + [ + { + "stack":[ + { + "text":"{{total_amount}}", + "style":"receipt-table-value-total", + "bold" : false + }, + { + "text":"{{Rs}} {{totalAmount}}", + "style":"receipt-table-value-total", + "fontSize": 15 + } + ], + "border":[ + true, + true, + true, + false + ] + } + ], + [ + { + "stack":[ + { + "table": { + "widths": [ + "*", + "*" + ], + "body": [ + [ + { + "text":"{{trade_license_tax}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table-value-down" + }, + { + "text":"{{tradeLicenseTax}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table-value-down" + } + ] + ] + } + }, + { + "table": { + "widths": [ + "*", + "*" + ], + "body": [ + [ + { + "text":"{{rebate_label}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table-value-down" + }, + { + "text":"{{rebate}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table-value-down" + } + ] + ] + } + }, + { + "table": { + "widths": [ + "*", + "*" + ], + "body": [ + [ + { + "text":"{{penalty_label}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table-value-down" + }, + { + "text":"{{penalty}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table-value-down" + } + ] + ] + } + }, + { + "canvas": [ + { + "type": "line", + "x1": 0, "y1": 0, + "x2": 315, "y2": 0, + "lineWidth": 1 + } + ] + }, + { + "table": { + "widths": [ + "*", + "*" + ], + "body": [ + [ + { + "text":"{{total_amount}}", + "border":[ + false, + false, + false, + false + ], + "bold": true, + "style": "receipt-table-value-down" + }, + { + "text":"{{totalAmount}}", + "border":[ + false, + false, + false, + false + ], + "bold": true, + "style": "receipt-table-value-down" + } + ] + ] + } + } + ], + "border":[ + true, + false, + true, + true + ], + "margin": [ + 0, + -15, + 0, + 0 + ] + } + ] + ] + }, + "layout": {} + }, + { + "style": "noc-table2", + "table": { + "widths": [ + "*" + ], + "body": [ + [ + { + "text":"{{trade_details}}", + "border":[ + true, + true, + true, + false + ], + "style": "receipt-table-value" + } + ], + [ + { + "table": { + "widths": [ + "25%", + "25%", + "30%", + "20%" + ], + "body": [ + [ + { + "text":"{{application_type}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table-value-cont" + }, + { + "text":"{{old_application_number}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table-value-cont", + "fontSize": 9 + }, + { + "text":"{{licence_type}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table-value-cont" + }, + { + "text":"{{trade_name}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table-value-cont" + } + ], + [ + { + "text":"{{applicationType}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text":"{{oldLicenseNumber}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text":"{{licenseType}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text":"{{tradeName}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table2" + } + ], + [ + { + "text":"{{structure_type}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table-value-cont" + }, + { + "text":"{{structure_sub_type}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table-value-cont", + "fontSize": 9 + }, + { + "text":"{{trade_commencement}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table-value-cont" + }, + { + "text":"{{trade_gst_no}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table-value-cont" + } + ], + [ + { + "text":"{{structureType}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text":"{{structureSubType}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text":"{{commencementDate}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text":"{{tradeGstNo}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table2" + } + ], + [ + { + "text":"{{operational_area}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table-value-cont" + }, + { + "text":"{{no_of_employees}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table-value-cont", + "fontSize": 9 + }, + { + "text":" ", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table-value-cont" + }, + { + "text":" ", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table-value-cont" + } + ], + [ + { + "text":"{{operationalArea}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text":"{{noOfEmployees}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text":" ", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text":" ", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table2" + } + ] + ] + }, + "border":[ + true, + false, + true, + false + ] + } + + ], + [ + { + "canvas": [ + { + "type": "line", + "x1": 5, "y1": 0, + "x2": 550, "y2": 0, + "lineWidth": 1 + } + ], + "border":[ + true, + false, + true, + false + ] + } + ], + [ + { + "table": { + "widths": [ + "*", + "*", + "*", + "*", + "*" + ], + "body": + [ + [ + { + "text": "{{trade_category}}", + "style": "receipt-table-value" + }, + { + "text": "{{trade_type}}", + "style": "receipt-table-value" + }, + { + "text": "{{trade_sub_type}}", + "style": "receipt-table-value" + }, + { + "text": "{{uom_measurement}}", + "style": "receipt-table-value" + }, + { + "text": "{{uom_value}}", + "style": "receipt-table-value" + } + ], + "{{#variable13}}[ { \"text\":\"{{tradeCat}}\", \"border\":[ true, false, true, true ], \"style\": \"receipt-table2\" }, { \"text\":\"{{tradetyp}}\", \"border\":[ false, false, true, true ], \"style\": \"receipt-table2\" }, { \"text\":\"{{tradesub}}\", \"border\":[ false, false, true,true ], \"style\": \"receipt-table2\" }, { \"text\":\"{{UOM-measurement}}\", \"border\":[ false, false, true, true ], \"style\": \"receipt-table2\" } ,{ \"text\":\"{{uomValue}}\", \"border\":[ false, false, true,true ], \"style\": \"receipt-table2\" }]{{/variable13}}" ] + }, + "border":[ + true, + false, + true, + false + ] + } + + ], + + [ + { + "table": { + "widths": [ + "*", + "*", + "*", + "*" + ], + "body": + [ + [ + { + "text": "{{accesory_type}}", + "style": "receipt-table-value" + }, + { + "text": "{{uom_label}}", + "style": "receipt-table-value" + }, + { + "text": "{{uom_value}}", + "style": "receipt-table-value" + }, + { + "text": "{{accessory_count}}", + "style": "receipt-table-value" + } + ], + "{{#variable14}}[ { \"text\":\"{{accesoryType}}\", \"border\":[ true, false, true,true ], \"style\": \"receipt-table2\" }, { \"text\":\"{{uom}}\", \"border\":[ false, false, true, true], \"style\": \"receipt-table2\" }, { \"text\":\"{{accessoryUomValue}}\", \"border\":[ false, false,true, true], \"style\": \"receipt-table2\" }, { \"text\":\"{{accessoryCount}}\", \"border\":[ false, false, true,true ], \"style\": \"receipt-table2\" } ]{{/variable14}}" ] + } + } + + ], + + [ + { + "table": { + "widths": [ + "25%", + "25%", + "20%", + "30%" + ], + "body": [ + [ + { + "text":"{{property_assessment_id}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table-value-cont" + }, + { + "text":"{{city_label}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table-value-cont", + "fontSize": 9 + }, + { + "text":"{{door_house_no}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table-value-cont" + }, + { + "text":"{{building_colony_name}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table-value-cont" + } + ], + [ + { + "text":"{{propertyAssessmentId}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text":"{{city}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text":"{{doorHouseNo}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text":"{{buildingColonyName}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table2" + } + ], + [ + { + "text":"{{street_name}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table-value-cont" + }, + { + "text":"{{mohalla_label}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table-value-cont", + "fontSize": 9 + }, + { + "text":"{{pincode_label}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table-value-cont" + }, + { + "text":"{{electricity_connection_no}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table-value-cont" + } + ], + [ + { + "text":"{{streetName}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text":"{{mohalla}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text":"{{pincode}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text":"{{electricityConnectionNo}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table2" + } + ] + ] + }, + "border":[ + true, + false, + true, + true + ] + } + + ] + ] + }, + "layout": {} + }, + { + "stack": [ + { + "style": "noc-table2", + "table": { + "widths": [ + "*" + ], + "body": [ + [ + { + "text":"{{owner_details}}", + "border":[ + true, + true, + true, + false + ], + "style": "receipt-table-value" + } + ], + [ + { + "table": { + "widths": [ + "25%", + "25%", + "25%", + "25%" + ], + "body": [ + [ + { + "text":"{{type_of_ownership}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table-value-cont" + }, + { + "text":"{{type_of_sub_ownership}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table-value-cont", + "fontSize": 9 + }, + { + "text":"Mobile Number/Alternate Contact", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table-value-cont" + }, + { + "text":"{{name_label}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table-value-cont" + } + ], + [ + { + "text":"{{typeOfOwnership}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text":"{{typeOfSubOwnership}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text":"{{mobileNo}}, {{altContactNumber}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text":"{{name}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table2" + } + ], + [ + { + "text":"{{father_husband}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table-value-cont" + }, + { + "text":"{{relationship_label}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table-value-cont", + "fontSize": 9 + }, + { + "text":"{{gender_label}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table-value-cont" + }, + { + "text":"{{date_of_birth}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table-value-cont" + } + ], + [ + { + "text":"{{fatherHusbandName}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text":"{{relationship}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text":"{{gender}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text":"{{dateOfBirth}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table2" + } + ], + [ + { + "text":"{{email_label}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table-value-cont" + }, + { + "text":"{{pan_no}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table-value-cont", + "fontSize": 9 + }, + { + "text":"{{correspondance_address}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table-value-cont" + }, + { + "text":"{{special_owner}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table-value-cont" + } + ], + [ + { + "text":"{{email}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text":"{{panNo}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text":"{{correspondenceAddress}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text":"{{specialOwnerCategory}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table2" + } + ] + ] + }, + "border":[ + true, + false, + true, + true + ] + } + + ] + ], + "unbreakable": true + }, + "layout": {} + } + ], + "unbreakable": true + }, + { + "stack": [ + { + "style": "noc-table2", + "table": { + "widths": [ + "*" + ], + "body": [ + [ + { + "text":"{{documents_label}}", + "border":[ + true, + true, + true, + false + ], + "style": "receipt-table-value" + } + ], + [ + { + "table": { + "widths": [ + "33%", + "33%", + "33%", + "1%" + ], + "body": [ + [ + { + "text":"{{ownership_proof}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table-value-cont" + }, + { + "text":"{{owners_id_proof}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table-value-cont", + "fontSize": 9 + }, + { + "text":"{{owner_photo}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table-value-cont", + "fontSize": 9 + } + + ], + [ + { + "text":"{{ownershipProof}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text":"{{ownersIdProof}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text":"{{ownerPhoto}}", + "border":[ + false, + false, + false, + false + ], + "style": "receipt-table2" + } + ] + ] + }, + "border":[ + true, + false, + true, + true + ] + } + + ] + ], + "unbreakable": true + }, + "layout": {} + } + ], + "unbreakable": true + } + + ], + "styles": { + "noc-head": { + "margin": [ + -25, + -40, + 0, + 0 + ] + }, + "receipt-logo-header": { + "color": "#484848", + "fontSize": 11, + "bold": true, + "letterSpacing": 0.74, + "margin": [ + 0, + 0, + 0, + 2 + ] + }, + "noc-table": { + "fontSize": 9, + "color": "#484848", + "margin": [ + -25, + 45, + -8, + -8 + ] + }, + "noc-table2": { + "fontSize": 9, + "color": "#484848", + "margin": [ + -25, + 8, + -25, + -8 + ] + }, + "receipt-table-value": { + "color": "#000000", + "bold": true, + "fontSize": 9, + "fontWeight": 350, + "margin": [ + 1, + 1, + 0, + 0 + ] + }, + "receipt-table-value-total": { + "color": "#000000", + "bold": true, + "fontSize": 10, + "fontWeight": 350, + "alignment": "right", + "margin": [ + 0, + 0, + 15, + 0 + ] + }, + "receipt-table-value-down": { + "color": "#000000", + "bold": false, + "fontSize": 9, + "fontWeight": 250, + "alignment": "left", + "margin": [ + 0, + 0, + 0, + 0 + ] + }, + "next-noc-table": { + "fontSize": 12, + "color": "#000000", + "margin": [ + -25, + 15, + -22, + -8 + ] + }, + "receipt-table-value2": { + "color": "#000000", + "bold": false, + "fontSize": 9, + "fontWeight": 250, + "margin": [ + 0, + 0, + 0, + 0 + ] + }, + "receipt-table-value-cont": { + "color": "#000000", + "bold": false, + "fontSize": 9, + "fontWeight": 250, + "margin": [ + 0, + 0, + 0, + 0 + ] + }, + "receipt-table": { + "color": "#484848", + "bold": true, + "fontSize": 9, + "fontWeight": 250, + "margin": [ + -50, + 1, + 0, + 0 + ] + }, + "receipt-table2": { + "color": "#000000", + "bold": true, + "fontSize": 9, + "fontWeight": 200, + "margin": [ + 0, + 0, + 0, + 0 + ] + } + + } + + } +} diff --git a/configs/pdf-service/format-config/tlcertificate.json b/configs/pdf-service/format-config/tlcertificate.json new file mode 100644 index 00000000..56be9e4d --- /dev/null +++ b/configs/pdf-service/format-config/tlcertificate.json @@ -0,0 +1,703 @@ +{ + "key": "tlcertificate", + "config": { + "defaultStyle": { + "font": "Cambay" + }, + + "content": [ + { + "style":"noc-head", + "table":{ + "widths":[ + "*" + ], + "body":[ + [ + + { + "style":"noc-head", + "table": + { + "widths":["30%","*"], + "body": + [ + [ + { + "image": "{{logoImage}}", + "width": 70, + "height": 82, + "alignment": "center", + "margin": [30, 40, 0,10 ] + }, + + { + "stack": + [ + { + "text":"{{mcGrade}},{{city}}", + "style":"receipt-logo-header" + }, + { + "text":"{{ulb-address}}", + "style":"receipt-logo-sub-header" + }, + { + "text": "{{corporation_contact}} : {{corporationContact}} ", + "style": "receipt-logo-sub-header" + + }, + { + "text": "{{corporation_website}} : {{corporationWebsite}}", + "style": "receipt-logo-sub-header" + + }, + { + "text": "{{corporation_email}} : {{corporationEmail}}", + "style": "receipt-logo-sub-header" + + } + ], + "alignment":"left", + "margin":[0,40,0,0] + + + + + + } + ] + ] + }, + "layout":"noBorders" + } + + ], + + + + [ + { + "stack": [ + { + "text":"{{trade_license_certifcate}}", + "style":"receipt-sub-logo-header" + }, + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":"{{trade_license_no}}", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":"{{tradeLicenseNo}}", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + }, + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":"{{application_no}}", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":"{{applicationNo}}", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + }, + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":"{{reciept_no}}", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":"{{recieptNo}}", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + }, + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":"{{financial_year}}", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":"{{financialYear}}", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + }, + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":"{{trade_name}}", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":"{{tradeName}}", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + }, + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":"{{trade_owner_name}}", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":"{{tradeOwnerName}}", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + }, + + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":"{{trade_owner_contact}}", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":"{{tradeOwnerContact}}", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + }, + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":"{{trade_address}}", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":"{{doorNo}},{{streetName}},{{buildingName}},{{localityNName}}, {{city}}", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + }, + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":"Structure Type/Sub Type", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":"{{structureType}}, {{structureSubType}}", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + }, + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":"{{trade_license_fee}}", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":"{{tradeLicenseFee}}", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + }, + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":"{{license_issue_date}}", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":"{{licenseIssueDate}}", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + }, + + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":"{{license_validity}}", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":"{{licenseValidityFrom}} {{to}} {{licenseValidityTo}}", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + }, + { + "style":"noc-head2", + "table":{ + "widths": [ + "*", + "*", + "*" + ], + "body": + [ + [ + { + "text": "{{trade_category}}", + "style": "receipt-table-value2" + }, + { + "text": "{{trade_type}}", + "style": "receipt-table-value" + }, + { + "text": "{{trade_sub_type}}", + "style": "receipt-table-value" + } + ], + "{{#variable13}}[ { \"text\":\"{{tradeCat}}\", \"border\":[ true, false, true, true ], \"style\": \"receipt-table3\" }, { \"text\":\"{{tradetyp}}\", \"border\":[ false, false, true, true ], \"style\": \"receipt-table2\" }, { \"text\":\"{{tradesub}}\", \"border\":[ false, false, true,true ], \"style\": \"receipt-table2\" }]{{/variable13}}" ] + }, + "border":[ + true, + false, + true, + false + ] + }, + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":" ", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":" ", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + }, + { + "style":"noc-head2", + "table": { + "widths": [ + "55%", + "15%", + "15%", + "15%" + ], + "body": + [ + [ + { + "text": "{{accesory_type}}", + "style": "receipt-table-value2" + }, + { + "text": "{{uom_label}}", + "style": "receipt-table-value" + }, + { + "text": "{{uom_value}}", + "style": "receipt-table-value" + }, + { + "text": "{{accessory_count}}", + "style": "receipt-table-value" + } + ], + "{{#variable14}}[ { \"text\":\"{{accesoryType}}\", \"border\":[ true, false, true,true ], \"style\": \"receipt-table3\" }, { \"text\":\"{{uom}}\", \"border\":[ false, false, true, true], \"style\": \"receipt-table2\" }, { \"text\":\"{{accessoryUomValue}}\", \"border\":[ false, false,true, true], \"style\": \"receipt-table2\" }, { \"text\":\"{{accessoryCount}}\", \"border\":[ false, false, true,true ], \"style\": \"receipt-table2\" } ]{{/variable14}}" ] + } , + "border":[ + true, + false, + true, + false + ] + }, { + "style": "noc-head2", + "table": { + "widths": [ + "50%", + "*", + "15%" + ], + "body": + [ + [ + { + "text": "Owner Name", + "style": "receipt-table-value2" + }, + { + "text": "Father/Husband Name", + "style": "receipt-table-value" + }, + { + "text": "Mobile Number", + "style": "receipt-table-value" + } + ], + "{{#variable_owners}}[{ \"text\":\"{{name}}\", \"border\":[ true, false, true, true ], \"style\": \"receipt-table3\" }, { \"text\":\"{{fatherOrHusbandName}}\", \"border\":[ false, false, true, true ], \"style\": \"receipt-table2\" }, { \"text\":\"{{mobileNumber}}\", \"border\":[ false, false, true, true ], \"style\": \"receipt-table2\" }]{{/variable_owners}}" + ] + }, "layout": {} + + + } + + ], + "alignment":"left", + "margin":[ + 0, + 10, + 0, + 0 + ] + } + ] + ] + }, + "layout":"noBorders" + }, + { + "style":"receipt-approver", + "columns": [ + { + "text":[ + { + "text":"{{approved_by}} ", + "bold": true + }, + { + "text":" {{approvedBy}}", + "bold": false + } + ], + "alignment":"left" + }, + { + "text":[ + { + "text":"Authorised Signatory", + "bold": true + } + ], + "alignment":"right" + } + ] + }, + { + "text":"Disclaimer", + "style":"disclaimer" + }, + { + "ol": + [ + "This license is not the proof of ownership.", + "This Trade License is issued under rule 10.39 of the Municipal Account Code 2017 with condition that the applicant shall obtain relevant NOC from concerned departments like Punjab Pollution control board / Fire Ofce /Health Department/ Excise Department/Deputy Commissioner (under Explosive Act) whichever applicable.", + "The Municipal Council/Corporation reserves the right to cancel this Trade License for Breach of any condition in accordance with law.", + "This is a computer generated document, hence requires no signature.", + "The grant of Trade License is not approval to any violation of building by laws, town planning scheme.", + "This license is issued subject to the self declaration of the applicant" + ], + "style":"disclaimer" + + } + ], + + + "styles": { + "noc-head": { + "margin": [ + -30, + -35, + 0, + -2 + ] + }, + + "noc-head2": { + "margin": [ + 22, + 2,0,0 + ] + }, + "receipt-table-value": { + "color": "#000000", + "fontSize": 9, + "margin": [ + 0, + 2, + 0, + 0 + ] + }, + "receipt-table2": { + "color": "#000000", + "fontSize": 9, + + "margin": [ + 0, + 2, + 0, + 0 + ] + }, + "receipt-table-value2": { + "color": "#000000", + "fontSize": 9, + "margin": [ + 0, + 2, + 0, + 0 + ] + }, + "receipt-table3": { + "color": "#000000", + "fontSize": 9, + "margin": [ + 0, + 2, + 0, + 0 + ] + }, + "receipt-approver": { + "color": "#000000", + "fontSize": 12, + "letterSpacing": 0.6, + "alignment": "center", + "margin": [ + -10, + 30, + 0, + 1 + ] + }, + "receipt-logo-header": { + "color": "#000000", + "fontSize": 17, + "letterSpacing": 0.74, + "alignment": "center", + "margin": [ + 0, + 0, + 0, + 0 + ] + }, + "receipt-sub-logo-header": { + "color": "#000000", + "fontSize": 16, + "letterSpacing": 0.74, + "alignment": "center", + "margin": [ + 0, + -10, + 0, + 0 + ] + }, + "receipt-logo-sub-header": { + "color": "#484848", + "fontSize": 10, + "letterSpacing": 0.6, + "alignment": "center", + "margin": [ + 0, + -5, + 0, + 0 + ] + }, + "receipt-sub-logo-sub-header": { + "color": "#484848", + "fontSize": 12, + "letterSpacing": 0.6, + "alignment": "left", + "margin": [ + 50, + 30, + 0, + 0 + ] + }, + "receipt-sub-address-sub-header": { + "color": "#484848", + "fontSize": 12, + "letterSpacing": 0.1, + "alignment": "right", + "margin": [ + 50, + 30, + -90, + 0 + ] + }, + "receipt-sub-website-sub-header": { + "color": "#484848", + "fontSize": 12, + "letterSpacing": 0.1, + "alignment": "right", + "margin": [ + 50, + 30, + -120, + 0 + ] + }, + "receipt-sub-email-sub-header": { + "color": "#484848", + "fontSize": 12, + "letterSpacing": 0.1, + "alignment": "right", + "margin": [ + 20, + 30, + -110, + 0 + ] + }, + "disclaimer": + { + "fontSize":"10", + "margin": [ + 2, + 3, + 0, + 0 + ] + } + } + + + } + } diff --git a/configs/pdf-service/format-config/tlrenewalcertificate.json b/configs/pdf-service/format-config/tlrenewalcertificate.json new file mode 100644 index 00000000..6d730906 --- /dev/null +++ b/configs/pdf-service/format-config/tlrenewalcertificate.json @@ -0,0 +1,702 @@ +{ + "key": "tlrenewalcertificate", + "config": { + "defaultStyle": { + "font": "Cambay" + }, + + "content": [ + { + "style":"noc-head", + "table":{ + "widths":[ + "*" + ], + "body":[ + [ + + { + "style":"noc-head", + "table": + { + "widths":["30%","*"], + "body": + [ + [ + { + "image": "{{logoImage}}", + "width": 70, + "height": 82, + "alignment": "center", + "margin": [30, 40, 0,10 ] + }, + + { + "stack": + [ + { + "text":"{{mcGrade}},{{city}}", + "style":"receipt-logo-header" + }, + { + "text":"{{ulb-address}}", + "style":"receipt-logo-sub-header" + }, + { + "text": "{{corporation_contact}} : {{corporationContact}} ", + "style": "receipt-logo-sub-header" + + }, + { + "text": "{{corporation_website}} : {{corporationWebsite}}", + "style": "receipt-logo-sub-header" + + }, + { + "text": "{{corporation_email}} : {{corporationEmail}}", + "style": "receipt-logo-sub-header" + + } + ], + "alignment":"left", + "margin":[0,40,0,0] + + + + + + } + ] + ] + }, + "layout":"noBorders" + } + + ], + + + + [ + { + "stack": [ + { + "text":"{{trade_license_certifcate}}", + "style":"receipt-sub-logo-header" + }, + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":"{{trade_license_no}}", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":"{{tradeLicenseNo}}", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + }, + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":"{{application_no}}", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":"{{applicationNo}}", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + }, + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":"{{reciept_no}}", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":"{{recieptNo}}", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + }, + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":"{{financial_year}}", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":"{{financialYear}}", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + }, + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":"{{trade_name}}", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":"{{tradeName}}", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + }, + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":"{{trade_owner_name}}", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":"{{tradeOwnerName}}", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + }, + + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":"{{trade_owner_contact}}", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":"{{tradeOwnerContact}}", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + }, + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":"{{trade_address}}", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":"{{doorNo}},{{streetName}},{{buildingName}},{{localityNName}}, {{city}}", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + }, + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":"Structure Type/Sub Type", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":"{{structureType}}, {{structureSubType}}", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + }, + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":"{{trade_license_fee}}", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":"{{tradeLicenseFee}}", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + }, + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":"{{license_issue_date}}", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":"{{licenseIssueDate}}", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + }, + + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":"{{license_validity}}", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":"{{licenseValidityFrom}} {{to}} {{licenseValidityTo}}", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + }, + { + "style":"noc-head2", + "table":{ + "widths": [ + "*", + "*", + "*" + ], + "body": + [ + [ + { + "text": "{{trade_category}}", + "style": "receipt-table-value2" + }, + { + "text": "{{trade_type}}", + "style": "receipt-table-value" + }, + { + "text": "{{trade_sub_type}}", + "style": "receipt-table-value" + } + ], + "{{#variable13}}[ { \"text\":\"{{tradeCat}}\", \"border\":[ true, false, true, true ], \"style\": \"receipt-table3\" }, { \"text\":\"{{tradetyp}}\", \"border\":[ false, false, true, true ], \"style\": \"receipt-table2\" }, { \"text\":\"{{tradesub}}\", \"border\":[ false, false, true,true ], \"style\": \"receipt-table2\" }]{{/variable13}}" ] + }, + "border":[ + true, + false, + true, + false + ] + }, + { + "style":"noc-head", + "table":{ + "widths":[ + "35%", + "65%" + ], + "body":[ + [ + { + "text":" ", + "style":"receipt-sub-logo-sub-header" + }, + { + "text":" ", + "style":"receipt-sub-logo-sub-header" + } + ] + ] + }, + "layout":"noBorders" + }, + { + "style":"noc-head2", + "table": { + "widths": [ + "55%", + "15%", + "15%", + "15%" + ], + "body": + [ + [ + { + "text": "{{accesory_type}}", + "style": "receipt-table-value2" + }, + { + "text": "{{uom_label}}", + "style": "receipt-table-value" + }, + { + "text": "{{uom_value}}", + "style": "receipt-table-value" + }, + { + "text": "{{accessory_count}}", + "style": "receipt-table-value" + } + ], + "{{#variable14}}[ { \"text\":\"{{accesoryType}}\", \"border\":[ true, false, true,true ], \"style\": \"receipt-table3\" }, { \"text\":\"{{uom}}\", \"border\":[ false, false, true, true], \"style\": \"receipt-table2\" }, { \"text\":\"{{accessoryUomValue}}\", \"border\":[ false, false,true, true], \"style\": \"receipt-table2\" }, { \"text\":\"{{accessoryCount}}\", \"border\":[ false, false, true,true ], \"style\": \"receipt-table2\" } ]{{/variable14}}" ] + } , + "border":[ + true, + false, + true, + false + ] + }, { + "style": "noc-head2", + "table": { + "widths": [ + "50%", + "*", + "15%" + ], + "body": + [ + [ + { + "text": "Owner Name", + "style": "receipt-table-value2" + }, + { + "text": "Father/Husband Name", + "style": "receipt-table-value" + }, + { + "text": "Mobile Number", + "style": "receipt-table-value" + } + ], + "{{#variable_owners}}[{ \"text\":\"{{name}}\", \"border\":[ true, false, true, true ], \"style\": \"receipt-table3\" }, { \"text\":\"{{fatherOrHusbandName}}\", \"border\":[ false, false, true, true ], \"style\": \"receipt-table2\" }, { \"text\":\"{{mobileNumber}}\", \"border\":[ false, false, true, true ], \"style\": \"receipt-table2\" }]{{/variable_owners}}" + ] + }, "layout": {} + + + } + + ], + "alignment":"left", + "margin":[ + 0, + 10, + 0, + 0 + ] + } + ] + ] + }, + "layout":"noBorders" + }, + { + "style":"receipt-approver", + "columns": [ + { + "text":[ + { + "text":"{{approved_by}} ", + "bold": true + }, + { + "text":"Auto Approved", + "bold": false + } + ], + "alignment":"left" + }, + { + "text":[ + { + "text":"Authorised Signatory", + "bold": true + } + ], + "alignment":"right" + } + ] + }, + { + "text":"Disclaimer", + "style":"disclaimer" + }, + { + "ol": + [ + "This license is not the proof of ownership.", + "This Trade License is issued under rule 10.39 of the Municipal Account Code 2017 with condition that the applicant shall obtain relevant NOC from concerned departments like Punjab Pollution control board / Fire Ofce /Health Department/ Excise Department/Deputy Commissioner (under Explosive Act) whichever applicable.", + "The Municipal Council/Corporation reserves the right to cancel this Trade License for Breach of any condition in accordance with law.", + "This is a computer generated document, hence requires no signature.", + "The grant of Trade License is not approval to any violation of building by laws, town planning scheme." + ], + "style":"disclaimer" + + } + ], + + + "styles": { + "noc-head": { + "margin": [ + -30, + -35, + 0, + -2 + ] + }, + + "noc-head2": { + "margin": [ + 22, + 2,0,0 + ] + }, + "receipt-table-value": { + "color": "#000000", + "fontSize": 9, + "margin": [ + 0, + 2, + 0, + 0 + ] + }, + "receipt-table2": { + "color": "#000000", + "fontSize": 9, + + "margin": [ + 0, + 2, + 0, + 0 + ] + }, + "receipt-table-value2": { + "color": "#000000", + "fontSize": 9, + "margin": [ + 0, + 2, + 0, + 0 + ] + }, + "receipt-table3": { + "color": "#000000", + "fontSize": 9, + "margin": [ + 0, + 2, + 0, + 0 + ] + }, + "receipt-approver": { + "color": "#000000", + "fontSize": 12, + "letterSpacing": 0.6, + "alignment": "center", + "margin": [ + -10, + 30, + 0, + 1 + ] + }, + "receipt-logo-header": { + "color": "#000000", + "fontSize": 17, + "letterSpacing": 0.74, + "alignment": "center", + "margin": [ + 0, + 0, + 0, + 0 + ] + }, + "receipt-sub-logo-header": { + "color": "#000000", + "fontSize": 16, + "letterSpacing": 0.74, + "alignment": "center", + "margin": [ + 0, + -10, + 0, + 0 + ] + }, + "receipt-logo-sub-header": { + "color": "#484848", + "fontSize": 10, + "letterSpacing": 0.6, + "alignment": "center", + "margin": [ + 0, + -5, + 0, + 0 + ] + }, + "receipt-sub-logo-sub-header": { + "color": "#484848", + "fontSize": 12, + "letterSpacing": 0.6, + "alignment": "left", + "margin": [ + 50, + 30, + 0, + 0 + ] + }, + "receipt-sub-address-sub-header": { + "color": "#484848", + "fontSize": 12, + "letterSpacing": 0.1, + "alignment": "right", + "margin": [ + 50, + 30, + -90, + 0 + ] + }, + "receipt-sub-website-sub-header": { + "color": "#484848", + "fontSize": 12, + "letterSpacing": 0.1, + "alignment": "right", + "margin": [ + 50, + 30, + -120, + 0 + ] + }, + "receipt-sub-email-sub-header": { + "color": "#484848", + "fontSize": 12, + "letterSpacing": 0.1, + "alignment": "right", + "margin": [ + 20, + 30, + -110, + 0 + ] + }, + "disclaimer": + { + "fontSize":"10", + "margin": [ + 2, + 3, + 0, + 0 + ] + } + } + + + } + } diff --git a/configs/pdf-service/format-config/tradelicense-bill.json b/configs/pdf-service/format-config/tradelicense-bill.json new file mode 100644 index 00000000..93131e26 --- /dev/null +++ b/configs/pdf-service/format-config/tradelicense-bill.json @@ -0,0 +1,955 @@ +{ + "key": "tradelicense-bill", + "config": { + "defaultStyle": { + "font": "Cambay" + }, + "content": [ + { + "style": "noc-head", + "table": { + "widths": [ + 60, + "*", + 120 + ], + "body": [ + [ + { + "image": "{{logoImage}}", + "width": 50, + "height": 61.25 + }, + { + "stack": [ + { + "text": "{{logo_header}} {{Municipal_Corporation}}", + "style": "receipt-logo-header" + }, + { + "stack": [ + { + "text": "{{address}}" + }, + { + "text": "{{phoneNumber}}" + }, + { + "text": "{{website}}" + }, + { + "text": "{{email}}" + } + ] + } + ], + "alignment": "left", + "margin": [ + 0, + 10, + 0, + 0 + ] + }, + { + "stack": [ + { + "text": "{{total_amount_due}}" + }, + { + "text": "{{Rs}} {{totalAmountDue}}", + "style": "amount-due" + } + ], + "alignment": "right", + "color": "#484848", + "margin": [ + -150, + 2, + -20, + 0 + ] + } + ] + ] + }, + "layout": "noBorders" + }, + { + "style": "noc-table", + "table": { + "widths": [ + 130, + 130, + -2, + 130, + 130 + ], + "body": [ + [ + { + "text": "{{payer_name}}", + "border": [ + true, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerName}}", + "border": [ + false, + true, + true, + false + ], + "style": "receipt-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ] + }, + { + "text": "{{bill_no}}", + "border": [ + true, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{billNo}}", + "border": [ + false, + true, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{mobile_no}}", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{mobileNo}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ] + }, + { + "text": "{{bill_period}}", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{fromPeriod}} - {{toPeriod}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{payer_address}}", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerAddress}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ] + }, + { + "text": "{{bill_issue_date}}", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{billIssueDate}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": " ", + "border": [ + true, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": " ", + "border": [ + false, + false, + true, + true + ], + "style": "receipt-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ] + }, + { + "text": "{{bill_due_date}}", + "border": [ + true, + false, + false, + true + ], + "style": "right-receipt-table" + }, + { + "text": "{{billDueDate}}", + "border": [ + false, + false, + true, + true + ], + "style": "right-receipt-table2" + } + ] + ] + }, + "layout": {} + }, + { + "style": "noc-table2", + "table": { + "widths": [ + "103%" + ], + "body": [ + [ + { + "text": "{{billing_summary_property_tax}} {{serviceType}}", + "border": [ + true, + true, + true, + false + ], + "style": "receipt-table-value" + } + ], + [ + { + "table": { + "widths": [ + "30%", + "26%", + "10%", + "11%", + "10%", + "9%", + "10%", + "9%" + ], + "body": [ + [ + { + "text": "{{tl_application_no}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{bill_period}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{charge_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{penalty_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{rebate_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{others_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{total_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + } + ], + [ + { + "text": "{{propertyID}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{fromPeriod}}-{{toPeriod}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{charge}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{penalty}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{rebate}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{others}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{totalAmountDue}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2", + "bold": true + } + ] + ] + }, + "border": [ + true, + false, + true, + true + ] + } + ] + ] + }, + "layout": {} + }, + + { + "style" : "noc-table3", + "table" : { + "widths": [ + "103%" + ], + "body":[ + [ + { + "style": "noc-table3", + "table": { + "widths": [ + "100%" + ], + "body": ["[{\"text\": \"{{important_message}}\",\"border\":[false,false,false,false],\"style\":\"bill-message-header\"}],{{#variable11}}[{\"text\":\"{{disclaimerContent}}\",\"border\":[false,false,false,false],\"style\":\"bill-message-value\"}]{{/variable11}}"] + } + } + ] + ] + + } + }, + { + "canvas": [ + { + "type": "line", + "x1": -40, + "y1": 30, + "x2": 700, + "y2": 30, + "dash": { + "length": 10, + "space": 5 + } + } + ] + }, + { + "image": "{{scissorImage}}", + "width": 24, + "height": 24, + "margin": [ + -30, + -11.2, + 0, + 0 + ] + }, + + { + "text": "{{acknowledgement_for}}", + "style": "footer-header", + "pageBreak": "before" + + }, + { + "style": "noc-table4", + "table": { + "widths": [ + "25%", + "25%", + "25%", + "25%" + ], + "body": [ + [ + { + "text": "{{date_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{billdate}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{consumer_id}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{consumerID}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{bill_no}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{billNo}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{name_address}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerName}}, {{nameAddress}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{total_payment}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{total}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + } + ] + ] + } + }, + { + "text": "{{receivers_signature}}", + "style": "footer-bottom" + } + ], + "styles": { + "noc-head": { + "margin": [ + -25, + -30, + 0, + 1 + ] + }, + "receipt-logo-header": { + "color": "#484848", + "fontFamily": "Roboto", + "fontSize": 14, + "bold": true, + "letterSpacing": 0.74, + "margin": [ + 0, + -10, + 0, + 5 + ] + }, + "receipt-logo-sub-header": { + "color": "#484848", + "fontFamily": "Roboto", + "fontSize": 13, + "letterSpacing": 0.6 + }, + "noc-table": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -25, + 10, + -8, + -8 + ] + }, + "noc-table4": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -25, + 75, + -8, + -8 + ] + }, + "noc-table2": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -25, + 18, + -8, + -8 + ] + }, + "noc-table3": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -25, + 30, + -8, + -8 + ] + }, + "receipt-table-value": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 8, + 5, + 0, + 0 + ] + }, + "receipt-table-value2": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 3, + 5, + 0, + 0 + ] + }, + "receipt-table": { + "color": "#484848", + "bold": true, + "fontSize": 12, + "fontWeight": 400, + "margin": [ + -10, + 5, + 0, + 0 + ] + }, + "receipt-table2": { + "color": "#484848", + "bold": true, + "fontSize": 11, + "fontWeight": 400, + "margin": [ + 3, + 8, + 0, + 10 + ] + }, + "right-receipt-table": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 8, + 5, + 0, + 10 + ] + }, + "right-receipt-table2": { + "color": "#484848", + "bold": true, + "fontSize": 12, + "fontWeight": 400, + "margin": [ + -10, + 5, + 0, + 0 + ] + }, + "receipt-approver": { + "fontSize": 12, + "bold": true, + "margin": [ + -27, + 50, + -10, + 0 + ], + "color": "#484848" + }, + "no-signature": { + "fontSize": 12, + "margin": [ + -27, + 35, + -10, + 0 + ], + "color": "#484848" + }, + "amount-due": { + "fontSize": 30, + "color": "#FC8019", + "bold": true, + "fontWeight": 700 + }, + "pt-disclaimer": { + "fontSize": 12, + "margin": [ + -27, + 30, + -10, + 0 + ], + "color": "#484848" + }, + "pt-disclaimer-value": { + "fontSize": 12, + "margin": [ + 2, + 5, + 0, + 0 + ], + "color": "#484848" + }, + "qr-text": { + "fontSize": 12, + "margin": [ + 40, + 0, + 0, + 0 + ], + "color": "#484848", + "alignment": "left" + }, + "qr-image": { + "margin": [ + -40, + -1, + -3, + 0 + ], + "color": "#484848", + "alignment": "right" + }, + "footer-header": { + "margin": [ + 0, + 15, + 0, + -40 + ], + "bold": true, + "color": "#000000", + "alignment": "center" + }, + "footer-bottom": { + "margin": [ + 0, + 50, + 0, + 0 + ], + "bold": true, + "color": "#000000", + "alignment": "right" + }, + "bill-message-header": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 28, + -15, + 0, + 10 + ] + }, + "bill-message-value": { + "color": "#484848", + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 28, + -5, + 0, + 10 + ] + }, + "disclaimer-table": { + "fontSize": 12, + "bold": false, + "color": "#FC8019", + "margin": [ + -25, + 16, + -8, + -8 + ] + } + } + } +} \ No newline at end of file diff --git a/configs/pdf-service/format-config/tradelicense-receipt.json b/configs/pdf-service/format-config/tradelicense-receipt.json new file mode 100644 index 00000000..53676af7 --- /dev/null +++ b/configs/pdf-service/format-config/tradelicense-receipt.json @@ -0,0 +1,1006 @@ +{ + "key": "tradelicense-receipt", + "config": { + "defaultStyle": { + "font": "Cambay" + }, + "content": [ + { + "style": "noc-head", + "table": { + "widths": [ + 60, + "*", + 120 + ], + "body": [ + [ + { + "image": "{{logoImage}}", + "width": 50, + "height": 61.25 + }, + { + "stack": [ + { + "text": "{{mcGrade}} {{logo-header}}", + "style": "receipt-logo-header" + }, + { + "text": "{{serviceType}} {{payment_receipt}}", + "style": "receipt-logo-sub-header" + } + ], + "alignment": "left", + "margin": [ + 0, + 0, + 0, + 0 + ] + }, + { + "stack": [ + { + "text": "{{address}}", + "style":"receipt-logo-address-header" + }, + { + "text": "{{phoneNumber}}", + "style":"receipt-logo-address-header" + + }, + { + "text": "{{website}}", + "style":"receipt-logo-address-header" + + }, + { + "text": "{{email}}", + "style":"receipt-logo-address-header" + + } + ], + "alignment": "right", + "color": "#484848", + "margin": [ + -100, + 0, + -25, + 0 + ] + } + ] + ] + }, + "layout": "noBorders" + }, + { + "style": "noc-table", + "table": { + "widths": [ + "20%", + "29%", + "22%", + "29%" + ], + "body": [ + [ + { + "text": "{{receipt_no}}.", + "border": [ + true, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{receiptNo}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{consumer_id}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{consumerID}}", + "border": [ + false, + true, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "Application Type", + "border": [ + true, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{applicationType}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "License No.", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{licenseNumber}}", + "border": [ + false, + true, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "Financial Year", + "border": [ + true, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{financialYear}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Payer Contact", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerContact}}", + "border": [ + false, + true, + true, + false + ], + "style": "receipt-table" + } + + ], + [ + { + "text": "{{payment_date}}", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{paymentDate}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Payer Name", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerName}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "Address", + "border": [ + true, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{tradeDoor || ' '}} {{tradeBuilding || ''}} {{tradeStreet || ''}} {{mohalla}},{{logo-header}}", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table" + }, + { + "text" : " ", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text" : " ", + "border": [ + false, + false, + true, + true + ], + "style": "receipt-table" + } + ] + ] + }, + "layout": {} + }, + { + "style": "next-noc-table", + "table": { + "widths": [ + "25%", + "25%", + "25%", + "25%" + ], + "body": [ + [ + { + "text": "{{service_type}}", + "border": [ + true, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{serviceType}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{billing_period}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{fromPeriod}} {{to}} {{toPeriod}}", + "border": [ + false, + true, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "Trade Name", + "border": [ + true, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{tradeName}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Structure Type", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{structureType}},{{structureSubType}}", + "border": [ + false, + true, + true, + false + ], + "style": "receipt-table" + } + ], [ + { + "text": "{{payment_mode}}", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{paymentMode}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{paid_amount}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "₹ {{paidAmount}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{pending_amount}}", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "₹ {{pendingAmount}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Trade License Fee,Renewal Penalty", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "₹ {{tradeFee}} , ₹ {{renewalPenalty}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "Adhoc Rebate", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "₹ {{adhocRebate}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Rebate Reason", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{adhocRebateReason}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "Adhoc Penalty", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "₹ {{adhocPenalty}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Penalty reason", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{adhocPenaltyReason}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "Rebate Comments", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{rebateComments}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Penalty Comments", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{penaltyComments}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "Cheque/DD/PO/Transaction No.", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{chequeNo}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Cheque/DD/PO/Transaction Date", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{chequeDate}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ],[ + { + "text": "IFSC Code", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{ifsc}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Bank/Branch Name", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{bank}},{{branch}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{g8_receipt_no}}.", + "border": [ + true, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{G8ReceiptNo}}", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table" + }, + { + "text": "{{g8_receipt_date}}", + "border": [ + false, + false, + false, + true + ], + "style": "receipt-table-value" + }, + { + "text": "{{G8ReceiptDate}}", + "border": [ + false, + false, + true, + true + ], + "style": "receipt-table" + } + ] + ] + }, + "layout": {} + }, + + { + "style": "next-noc-table", + "table": { + "widths": [ + "*", + "*", + "*" + ], + "body": + [ + [ + { + "text": "Trade Category", + "style": "receipt-table-value" + }, + { + "text": "Trade Type", + "style": "receipt-table-value" + }, + { + "text": "Trade Sub Type", + "style": "receipt-table-value" + } + ], + "{{#variable13}}[{ \"text\":\"{{tradeCat}}\", \"border\":[ true, false, true, true ], \"style\": \"receipt-table\" }, { \"text\":\"{{tradeTyp}}\", \"border\":[ false, false, true, true ], \"style\": \"receipt-table\" },{ \"text\":\"{{tradeSub}}\", \"border\":[ false, false, true, true ], \"style\": \"receipt-table\"}]{{/variable13}}" + ] + }, "layout": {} + + + }, + { + "style": "next-noc-table", + "table": { + "widths": [ + "55%", + "15%", + "15%", + "15%" + ], + "body": + [ + [ + { + "text": "Accessory Type", + "style": "receipt-table-value" + }, + { + "text": "UOM", + "style": "receipt-table-value" + }, + { + "text": "UOM Value", + "style": "receipt-table-value" + }, + { + "text": "Count", + "style": "receipt-table-value" + } + ], + "{{#variable_acc}}[{ \"text\":\"{{accesoryType}}\", \"border\":[ true, false, true, true ], \"style\": \"receipt-table\" }, { \"text\":\"{{uom}}\", \"border\":[ false, false, true, true ], \"style\": \"receipt-table\" }, { \"text\":\"{{accessoryUomValue}}\", \"border\":[ false, false, true, true ], \"style\": \"receipt-table\" }, { \"text\":\"{{accessoryCount}}\", \"border\":[ false, false, true, true ], \"style\": \"receipt-table\"}]{{/variable_acc}}" + ] + }, "layout": {} + + + },{ + "style": "next-noc-table", + "table": { + "widths": [ + "55%", + "*", + "15%" + ], + "body": + [ + [ + { + "text": "Owner Name", + "style": "receipt-table-value" + }, + { + "text": "Father/Husband Name", + "style": "receipt-table-value" + }, + { + "text": "Mobile Number", + "style": "receipt-table-value" + } + ], + "{{#variable_owners}}[{ \"text\":\"{{name}}\", \"border\":[ true, false, true, true ], \"style\": \"receipt-table\" }, { \"text\":\"{{fatherOrHusbandName}}\", \"border\":[ false, false, true, true ], \"style\": \"receipt-table\" }, { \"text\":\"{{mobileNumber}}\", \"border\":[ false, false, true, true ], \"style\": \"receipt-table\" }]{{/variable_owners}}" + ] + }, "layout": {} + + + }, + { + "style": "receipt-approver", + "columns": [ + { + "text": [ + { + "text": "{{generated_by}}: ", + "bold": true + }, + { + "text": "{{user-name}}", + "bold": false + } + ], + "alignment": "left" + }, + { + "text": [ + { + "text": "Authorised Signatory", + "bold": true + } + ], + "alignment": "right", + "margin": [ + 0, + 4, + -10, + 1 + ] + } + ] + }, + { + "style": "no-signature", + "text": "This is a computer generted recepit hence requires no signature." + }, + { + "style": "pt-disclaimer", + "stack": [ + { + "text": "{{disclamer}}", + "bold": true, + "style": "pt-disclaimer-value" + }, + + { + "ol": + [ + "Payment received by Cheque/DD shall be subject to realization", + "This document is not a proof of property ownership" + ] + }, + { + "text":"Now log a complaint from WhatsApp, give a missed call on 8750975975 or send a Hi message on WhatsApp to this number", "bold": true, "fontSize": 8, "color": "blue", "decoration": "underline"} + ] + } + ], + "styles": { + "noc-head": { + "margin": [ + -30, + -30, + 0, + 1 + ] + }, + "receipt-logo-header": { + "color": "#000000", + "fontSize": 14, + "bold": true, + "letterSpacing": 0.74, + "margin": [ + 0, + 0, + 0, + 1 + ] + }, + "receipt-logo-sub-header": { + "color": "#000000", + "fontSize": 12, + "letterSpacing": 0.6 + }, + "receipt-logo-address-header": { + "color": "#000000", + "fontSize": 8, + "letterSpacing": 0.6 + }, + "noc-table": { + "fontSize": 10, + "color": "#000000", + "margin": [ + -25, + 1, + -22, + -8 + ] + }, + "next-noc-table": { + "fontSize": 10, + "color": "#000000", + "margin": [ + -25, + 10, + -22, + -8 + ] + }, + "receipt-table-value": { + "color": "#000000", + "bold": true, + "fontSize": 10, + "fontWeight": 400, + "margin": [ + 2, + -1, + 0, + 0 + ] + }, + "receipt-table": { + "color": "#000000", + "bold": false, + "fontSize": 10, + "fontWeight": 300, + "margin": [ + 0, + -1, + 0, + 0 + ] + }, + "receipt-approver": { + "fontSize": 10, + "bold": true, + "margin": [ + -27, + 30, + -10, + 0 + ], + "color": "#484848" + }, + "no-signature": { + "fontSize": 8, + "margin": [ + -27, + 5, + -10, + 0 + ], + "color": "#484848" + }, + "pt-disclaimer": { + "fontSize": 9, + "margin": [ + -27, + 0, + -10, + 0 + ], + "color": "#484848" + }, + "pt-disclaimer-value": { + "fontSize": 10, + "margin": [ + 0, + 0, + 0, + 0 + ], + "color": "#484848" + } + } + } +} diff --git a/configs/pdf-service/format-config/ws-applicationsewerage.json b/configs/pdf-service/format-config/ws-applicationsewerage.json new file mode 100644 index 00000000..63f1ffc1 --- /dev/null +++ b/configs/pdf-service/format-config/ws-applicationsewerage.json @@ -0,0 +1,1211 @@ +{ + "key": "ws-applicationsewerage", + "config": { + "defaultStyle": { + "font": "Cambay" + }, + "content": [ + { + "style": "ws-head", + "table": { + "widths": [ + 60, + "*", + 120 + ], + "body": [ + [ + { + "image": "{{logoImage}}", + "width": 40, + "height": 43, + "margin": [ + 12, + 5, + 12, + 5 + ] + }, + { + "stack": [ + { + "text": "{{logo_header}} {{mcGrade}}", + "style": "receipt-logo-header" + }, + { + "text": "{{logo_sub_header}}", + "fontSize": 10 + } + ], + "alignment": "left", + "margin": [ + 10, + 10, + 0, + 0 + ] + } + ] + ] + }, + "layout": "noBorders" + }, + { + "columns": [ + { + "text": "Sewerage Application No. : {{applicationNo}}", + "fontSize":10, + "alignment": "left", + "margin": [ + -23, + 0, + 0, + 0 + ] + } + ] + }, + { + "text": "{{property_details_header}}", + "style": "header" + }, + { + "style": "ws-table", + "table": { + "widths": [ + "103%" + ], + "body": [ + [ + { + "table": { + "widths": [ + "25%", + "25%", + "25%", + "25%" + ], + "body": [ + [ + { + "text": "{{property_id}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{property_type}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{property_usage_type}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{property_usage_sub_type}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + } + ], + [ + { + "text": "{{propertyId}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{propertyType}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{propertyUsageType}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{propertyUsageSubType}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + } + ], + [ + { + "text": "{{plot_size}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{no_of_floor}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{rainwater_harvesting_facility}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + } + ], + [ + { + "text": "{{plotSize}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{noOfFloor}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{rainwaterHarvestingFacility}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + } + ] + ] + }, + "border": [ + true, + true, + true, + true + ] + } + ] + ] + }, + "layout": {} + }, + { + "text": "{{property_location_details_header}}", + "style": "header" + }, + { + "style": "ws-table", + "table": { + "widths": [ + "103%" + ], + "body": [ + [ + { + "table": { + "widths": [ + "25%", + "25%", + "25%", + "25%" + ], + "body": [ + [ + { + "text": "{{city}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{door_house_no}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{building_colony_name}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{street_name}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + } + ], + [ + { + "text": "{{cityName}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{doorHouseNo}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{buildingColonyName}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{streetName}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + } + ], + [ + { + "text": "{{locality_mohalla}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{pin_code}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + } + ], + [ + { + "text": "{{localityMohalla}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{pinCode}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + } + ] + ] + }, + "border": [ + true, + true, + true, + true + ] + } + ] + ] + }, + "layout": {} + }, + { + "text": "{{property_owner_details_header}}", + "style": "header" + }, + { + "style": "ws-table", + "table": { + "widths": [ + "103%" + ], + "body": [ + [ + { + "table": { + "widths": [ + "25%", + "25%", + "25%", + "25%" + ], + "body": [ + "{{#variable13}}[{\"text\":\"{{owner_name}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\" }, { \"text\":\"{{email_label}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\", \"fontSize\": 8 }, { \"text\":\"{{gender_label}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\" }, { \"text\":\"{{dob_label}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\" } ], [ { \"text\":\"{{ownerName}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" }, { \"text\":\"{{ownerEmailId}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" }, { \"text\":\"{{gender}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" }, { \"text\":\"{{ownerDob}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" } ], [ { \"text\":\"{{guardian_name}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\" }, { \"text\":\"{{relationship_label}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\", \"fontSize\": 8 }, { \"text\":\"{{correspondence_address}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\" }, { \"text\":\"{{special_applicant_category}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\" } ], [ { \"text\":\"{{guardianName}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" }, { \"text\":\"{{relationshipLabel}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" }, { \"text\":\"{{correspondenceAddress}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" }, { \"text\":\"{{specialApplicantCategory}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" } ]{{/variable13}}" + ] + }, + "border": [ + true, + true, + true, + true + ] + } + ] + ] + }, + "layout": {} + }, + { + "text": "{{connection_details_header}}", + "style": "header" + }, + { + "style": "ws-table", + "table": { + "widths": [ + "103%" + ], + "body": [ + [ + { + "table": { + "widths": [ + "25%", + "25%", + "25%", + "25%" + ], + "body": [ + [ + { + "text": "{{apply_category}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{no_of_water_closets_proposed}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{no_of_water_toilets_proposed}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + } + ], + [ + { + "text": "{{applyCategory}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{noOfWaterClosetsProposed}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{noOfWaterToiletsProposed}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + } + ] + ] + }, + "border": [ + true, + true, + true, + true + ] + } + ] + ] + }, + "layout": {} + }, + { + "text": "{{document_details_header}}", + "style": "header" + }, + { + "stack": [ + { + "style": "ws-table", + "table": { + "widths": [ + "103%" + ], + "body": [ + [ + { + "table": { + "widths": [ + "33%", + "33%", + "33%", + "1%" + ], + "body": [ + [ + { + "text": "{{ownership_proof}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{owners_id_proof}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table", + "fontSize": 8 + }, + { + "text": "{{electricty_bill}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table", + "fontSize": 8 + } + ], + [ + { + "text": "{{ownershipProof}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{ownersIdProof}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{electricityBill}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + } + ], + [ + { + "text": "{{plumber_report}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{building_plan}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table", + "fontSize": 8 + }, + { + "text": "{{property_tax_reciept}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table", + "fontSize": 8 + } + ], + [ + { + "text": "{{plumberReport}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{buildingPlan}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{ptTaxReciept}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + } + ] + ] + }, + "border" : [ + true, + true, + true, + true + ] + } + ] + ] + } + } + ] + + }, + { + "text": "{{plumber_details_header}}", + "style": "header" + }, + { + "style": "ws-table", + "table": { + "widths": [ + "103%" + ], + "body": [ + [ + { + "table": { + "widths": [ + "25%", + "25%", + "25%", + "25%" + ], + "body": [ + [ + { + "text": "{{plumber_provided_by}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{plumber_licence_no}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{plumber_name}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{plumber_mobile_no}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + } + ], + [ + { + "text": "{{plumberProvidedBy}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{plumberLicenceNo}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{plumberName}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{plumberMobileNo}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + } + ] + ] + }, + "border": [ + true, + true, + true, + true + ] + } + ] + ] + }, + "layout": {} + }, + { + "text": "{{road_charges_header}}", + "style": "header" + }, + { + "style": "ws-table", + "table": { + "widths": [ + "103%" + ], + "body": [ + [ + { + "table": { + "widths": [ + "25%", + "25%", + "25%", + "25%" + ], + "body": [ + [ + { + "text": "{{road_type}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{area_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + } + ], + [ + { + "text": "{{roadType}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{area}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + } + ] + ] + }, + "border": [ + true, + true, + true, + true + ] + } + ] + ] + }, + "layout": {} + }, + { + "text": "{{activation_details_header}}", + "style": "header" + }, + { + "style": "ws-table", + "table": { + "widths": [ + "103%" + ], + "body": [ + [ + { + "table": { + "widths": [ + "25%", + "25%", + "25%", + "25%" + ], + "body": [ + [ + { + "text": "{{connection_execution_date}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{connectionExecutionDate}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + } + ] + ] + }, + "border": [ + true, + true, + true, + true + ] + } + ] + ] + }, + "layout": {} + } + ], + "styles": { + "ws-head": { + "margin": [ + -39, + -38, + -38, + 0 + ] + }, + "receipt-logo-header": { + "color": "#000000", + "fontFamily": "Cambay", + "fontSize": 10, + "bold": true, + "letterSpacing": 0.5, + "margin": [ + 0, + -10, + 0, + 0 + ] + }, + "ws-table": { + "fontSize": 9, + "color": "#484848", + "margin": [ + -25, + 0, + -8, + 0 + ] + }, + "header": { + "color": "#000000", + "textTransform": "uppercase", + "bold": true, + "fontSize": 9, + "fontWeight": 500, + "margin": [ + -25, + 1, + 0, + 1 + ] + }, + "ws-sub-table-value": { + "color": "#000000", + "bold": true, + "fontSize": 9, + "fontWeight": 500, + "margin": [ + 3, + 0, + 0, + 0 + ] + }, + "ws-sub-table": { + "color": "#484848", + "bold": true, + "fontSize": 9, + "fontWeight": 400, + "margin": [ + 3, + 0, + 0, + 0 + ] + }, + "qr-image": { + "margin": [ + -40, + -1, + -3, + 0 + ], + "color": "#484848", + "alignment": "right", + "backgroundColor": "#dddddd" + }, + "receipt-table-value-total": { + "color": "#000000", + "bold": true, + "fontSize": 9, + "fontWeight": 500, + "alignment": "right", + "margin": [ + 0, + 5, + 30, + 0 + ] + } + } + } +} diff --git a/configs/pdf-service/format-config/ws-applicationwater.json b/configs/pdf-service/format-config/ws-applicationwater.json new file mode 100644 index 00000000..dd94db75 --- /dev/null +++ b/configs/pdf-service/format-config/ws-applicationwater.json @@ -0,0 +1,1347 @@ +{ + "key": "ws-applicationwater", + "config": { + "defaultStyle": { + "font": "Cambay" + }, + "content": [ + { + "style": "ws-head", + "table": { + "widths": [ + 60, + "*", + 120 + ], + "body": [ + [ + { + "image": "{{logoImage}}", + "width": 40, + "height": 43, + "margin": [ + 12, + 5, + 12, + 5 + ] + }, + { + "stack": [ + { + "text": "{{logo_header}} {{mcGrade}}", + "style": "receipt-logo-header" + }, + { + "text": "{{logo_sub_header}}", + "fontSize": 10 + + } + ], + "alignment": "left", + "margin": [ + 10, + 10, + 0, + 0 + ] + } + ] + ] + }, + "layout": "noBorders" + }, + { + "columns": [ + { + "text": "Water Application No. : {{applicationNo}}", + "fontSize":10, + "alignment": "left", + "margin": [ + -23, + 0, + 0, + 0 + ] + } + ] + }, + { + "text": "{{property_details_header}}", + "style": "header" + }, + { + "style": "ws-table", + "table": { + "widths": [ + "103%" + ], + "body": [ + [ + { + "table": { + "widths": [ + "25%", + "25%", + "25%", + "25%" + ], + "body": [ + [ + { + "text": "{{property_id}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{property_type}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{property_usage_type}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{property_usage_sub_type}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + } + ], + [ + { + "text": "{{propertyId}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{propertyType}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{propertyUsageType}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{propertyUsageSubType}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + } + ], + [ + { + "text": "{{plot_size}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{no_of_floor}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{rainwater_harvesting_facility}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + } + ], + [ + { + "text": "{{plotSize}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{noOfFloor}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{rainwaterHarvestingFacility}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + } + ] + ] + }, + "border": [ + true, + true, + true, + true + ] + } + ] + ] + }, + "layout": {} + }, + { + "text": "{{property_location_details_header}}", + "style": "header" + }, + { + "style": "ws-table", + "table": { + "widths": [ + "103%" + ], + "body": [ + [ + { + "table": { + "widths": [ + "25%", + "25%", + "25%", + "25%" + ], + "body": [ + [ + { + "text": "{{city}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{door_house_no}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{building_colony_name}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{street_name}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + } + ], + [ + { + "text": "{{cityName}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{doorHouseNo}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{buildingColonyName}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{streetName}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + } + ], + [ + { + "text": "{{locality_mohalla}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{pin_code}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + } + ], + [ + { + "text": "{{localityMohalla}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{pinCode}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + } + ] + ] + }, + "border": [ + true, + true, + true, + true + ] + } + ] + ] + }, + "layout": {} + }, + { + "text": "{{property_owner_details_header}}", + "style": "header" + }, + { + "style": "ws-table", + "table": { + "widths": [ + "103%" + ], + "body": [ + [ + { + "table": { + "widths": [ + "25%", + "25%", + "25%", + "25%" + ], + "body": [ + "{{#variable13}}[{\"text\":\"{{owner_name}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\" }, { \"text\":\"{{email_label}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\", \"fontSize\": 8 }, { \"text\":\"{{gender_label}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\" }, { \"text\":\"{{dob_label}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\" } ], [ { \"text\":\"{{ownerName}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" }, { \"text\":\"{{ownerEmailId}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" }, { \"text\":\"{{gender}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" }, { \"text\":\"{{ownerDob}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" } ], [ { \"text\":\"{{guardian_name}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\" }, { \"text\":\"{{relationship_label}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\", \"fontSize\": 8 }, { \"text\":\"{{correspondence_address}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\" }, { \"text\":\"{{special_applicant_category}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table\" } ], [ { \"text\":\"{{guardianName}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" }, { \"text\":\"{{relationshipLabel}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" }, { \"text\":\"{{correspondenceAddress}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" }, { \"text\":\"{{specialApplicantCategory}}\", \"border\":[ false, false, false, false ], \"style\": \"ws-sub-table-value\" } ]{{/variable13}}" + ] + }, + "border": [ + true, + true, + true, + true + ] + } + ] + ] + }, + "layout": {} + }, + { + "text": "{{connection_details_header}}", + "style": "header" + }, + { + "style": "ws-table", + "table": { + "widths": [ + "103%" + ], + "body": [ + [ + { + "table": { + "widths": [ + "25%", + "25%", + "25%", + "25%" + ], + "body": [ + [ + { + "text": "{{apply_category}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{no_of_taps_proposed}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{pipe_size_proposed}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + } + ], + [ + { + "text": "{{applyCategory}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{noOfTapsProposed}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{pipeSizeProposed}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + } + ] + ] + }, + "border": [ + true, + true, + true, + true + ] + } + ] + ] + }, + "layout": {} + }, + { + "text": "{{document_details_header}}", + "style": "header" + }, + { + "style": "ws-table", + "table": { + "widths": [ + "103%" + ], + "body": [ + [ + { + "table": { + "widths": [ + "33%", + "33%", + "33%", + "1%" + ], + "body": [ + [ + { + "text": "{{ownership_proof}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{owners_id_proof}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table", + "fontSize": 8 + }, + { + "text": "{{electricty_bill}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table", + "fontSize": 8 + } + ], + [ + { + "text": "{{ownershipProof}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{ownersIdProof}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{electricityBill}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + } + ], + [ + { + "text": "{{plumber_report}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{building_plan}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table", + "fontSize": 8 + }, + { + "text": "{{property_tax_reciept}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table", + "fontSize": 8 + } + ], + [ + { + "text": "{{plumberReport}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{buildingPlan}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{ptTaxReciept}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + } + ] + ] + }, + "border" : [ + true, + true, + true, + true + ] + } + ] + ] + } + }, + { + "text": "{{additional_connection_details_header}}", + "style": "header" + }, + { + "style": "ws-table", + "table": { + "widths": [ + "103%" + ], + "body": [ + [ + { + "table": { + "widths": [ + "18%", + "18%", + "20%", + "18%", + "*" + ], + "body": [ + [ + { + "text": "{{connection_type}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{no_of_taps}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{water_source}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{water_sub_source}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{pipe_size}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + } + ], + [ + { + "text": "{{connectionType}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{noOfTaps}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{waterSource}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{waterSubSource}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{pipeSize}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + } + ] + ] + }, + "border": [ + true, + true, + true, + true + ] + } + ] + ] + }, + "layout": {} + }, + { + "text": "{{plumber_details_header}}", + "style": "header" + }, + { + "style": "ws-table", + "table": { + "widths": [ + "103%" + ], + "body": [ + [ + { + "table": { + "widths": [ + "25%", + "25%", + "25%", + "25%" + ], + "body": [ + [ + { + "text": "{{plumber_provided_by}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{plumber_licence_no}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{plumber_name}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{plumber_mobile_no}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + } + ], + [ + { + "text": "{{plumberProvidedBy}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{plumberLicenceNo}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{plumberName}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{plumberMobileNo}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + } + ] + ] + }, + "border": [ + true, + true, + true, + true + ] + } + ] + ] + }, + "layout": {} + }, + { + "text": "{{road_charges_header}}", + "style": "header" + }, + { + "style": "ws-table", + "table": { + "widths": [ + "103%" + ], + "body": [ + [ + { + "table": { + "widths": [ + "25%", + "25%", + "25%", + "25%" + ], + "body": [ + [ + { + "text": "{{road_type}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{roadType}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{area_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{area}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + } + ] + ] + }, + "border": [ + true, + true, + true, + true + ] + } + ] + ] + }, + "layout": {} + }, + { + "text": "{{activation_details_header}}", + "style": "header" + }, + { + "style": "ws-table", + "table": { + "widths": [ + "103%" + ], + "body": [ + [ + { + "table": { + "widths": [ + "25%", + "25%", + "25%", + "25%" + ], + "body": [ + [ + { + "text": "{{connection_execution_date}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{meter_id}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{meter_installation_date}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{initial_meter_reading}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + } + ], + [ + { + "text": "{{connectionExecutionDate}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{meterId}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{meterInstallationDate}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{initialMeterReading}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + } + ] + ] + }, + "border": [ + true, + true, + true, + true + ] + } + ] + ] + }, + "layout": {} + } + ], + "styles": { + "ws-head": { + "margin": [ + -39, + -38, + -38, + 0 + ] + }, + "receipt-logo-header": { + "color": "#000000", + "fontFamily": "Cambay", + "fontSize": 10, + "bold": true, + "letterSpacing": 0.5, + "margin": [ + 0, + -10, + 0, + 0 + ] + }, + "ws-table": { + "fontSize": 9, + "color": "#484848", + "margin": [ + -25, + 0, + -8, + 0 + ] + }, + "header": { + "color": "#000000", + "textTransform": "uppercase", + "bold": true, + "fontSize": 9, + "fontWeight": 500, + "margin": [ + -25, + 1, + 0, + 1 + ] + }, + "ws-sub-table-value": { + "color": "#000000", + "bold": true, + "fontSize": 9, + "fontWeight": 500, + "margin": [ + 3, + 0, + 0, + 0 + ] + }, + "ws-sub-table": { + "color": "#484848", + "bold": true, + "fontSize": 9, + "fontWeight": 400, + "margin": [ + 3, + 0, + 0, + 0 + ] + }, + "qr-image": { + "margin": [ + -40, + -1, + -3, + 0 + ], + "color": "#484848", + "alignment": "right", + "backgroundColor": "#dddddd" + }, + "receipt-table-value-total": { + "color": "#000000", + "bold": true, + "fontSize": 9, + "fontWeight": 500, + "alignment": "right", + "margin": [ + 0, + 5, + 30, + 0 + ] + } + } + } +} diff --git a/configs/pdf-service/format-config/ws-bill.json b/configs/pdf-service/format-config/ws-bill.json new file mode 100644 index 00000000..402514d1 --- /dev/null +++ b/configs/pdf-service/format-config/ws-bill.json @@ -0,0 +1,1234 @@ +{ + "key": "ws-bill", + "config": { + "defaultStyle": { + "font": "Cambay" + }, + "content": [ + { + "style": "noc-head", + "table": { + "widths": [ + 60, + "*", + 120 + ], + "body": [ + [ + { + "image": "{{logoImage}}", + "width": 45, + "height": 50 + }, + { + "stack": [ + { + "text": "{{logo_header}} {{mcGrade}}", + "style": "receipt-logo-header" + }, + { + "stack": [ + { + "text": "{{address}}" + }, + { + "text": "{{phoneNumber}}" + }, + { + "text": "{{website}}" + }, + { + "text": "{{email}}" + } + ] + } + ], + "alignment": "left", + "margin": [ + 0, + 1, + 0, + 0 + ] + }, + { + "stack": [ + { + "text": "{{total_amount_due}} {{testing billWS}}" + }, + { + "text": "{{Rs}} {{totalAmountDue}}", + "style": "amount-due" + } + ], + "alignment": "right", + "color": "#484848", + "margin": [ + -150, + 1, + -20, + 0 + ] + } + ] + ] + }, + "layout": "noBorders" + }, + { + "style": "noc-table2", + "table": { + "widths": [ + "103%" + ], + "body": [ + [ + { + "text": "{{serviceType}} Bill for Period {{fromPeriod}} - {{toPeriod}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2", + "alignment":"center" + } + ] + ] + }, + "layout": {} + }, + { + "style": "noc-table2", + "table": { + "widths": [ + "103%" + ], + "body": [ + [ + { + "table": { + "widths": [ + "8%", + "22%", + "15%", + "21%", + "15%", + "21%" + ], + "body": [ + [ + { + "text": "{{bill_no}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{billNo}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{bill_issue_date}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{billIssueDate}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "Bill Due Date", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{billDueDate}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + } + ] + ] + }, + "border": [ + false, + true, + false, + true + ] + } + ] + + ] + }, + "layout": {} + }, + { + "style": "noc-table2", + "table": { + "widths": [ + "103%" + ], + "body": [ + [ + { + "table": { + "widths": [ + "23%", + "25%", + "23%", + "*" + ], + "body": [ + [ + { + "text": "{{consumer_no}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "Old Consumer No.", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "House No.", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "Ledger Id", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + } + ], + [ + { + "text": "{{consumerCode}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{oldConnectionNo}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{houseNo}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text":"{{ledgerId}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + } + ], + [ + { + "text": "Plot Size", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "Consumer Name", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "Guardian Name", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "Locality", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + } + ], + [ + { + "text": "{{plotSize}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{ownerName}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{guardianName}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text":"{{locality}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + } + ], + [ + { + "text": "Usage Type", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "Mobile Number", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "Street Name/Landmark", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "Address", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + } + ], + [ + { + "text": "{{usageTypedddddd}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + + { + "text": "{{mobileNodddd}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text":"{{streetName}}{{landmark}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{payerAddress}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + } + ] + ] + }, + "border": [ + true, + true, + true, + true + ] + } + ] + ] + }, + "layout": {} + }, + { + "style": "noc-table2", + "table": { + "widths": [ + "103%" + ], + "body": [ + [ + { + "text": "{{billing_summary_property_tax}} {{serviceType}}", + "border": [ + true, + true, + true, + false + ], + "style": "receipt-table-value" + } + ], + [ + { + "table": { + "widths": [ + "12%", + "23%", + "15%", + "10%", + "10%", + "10%", + "10%", + "*" + ], + "body": [ + [ + { + "text": "{{arrears_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{advanceAdjusted_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{advanceAvailable_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + },{ + "text": "{{charge_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{penalty_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{rebate_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{others_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + }, + { + "text": "{{total_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value2" + } + ], + [ + { + "text": "{{arrears}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text":"{{advanceAdjusted}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{advanceAvailable}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{charge}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{penalty}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{rebate}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{others}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2" + }, + { + "text": "{{calculatedTotal}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table2", + "bold": true + } + ] + ] + }, + "border": [ + true, + true, + true, + true + ] + } + ] + ] + }, + "layout": {} + }, + { + "style": "noc-table3", + "table": { + "widths": [ + "103%" + ], + "body": [ + [ + { + "text": "{{important_message}}", + "border": [ + true, + true, + true, + false + ], + "margin": [ + 9, + 1, + 0, + 1 + ], + "style": "receipt-table-value" + } + ], + [ + { + "text": "1. Online payment can be done for {{serviceType}} charges payment. http://bit.ly/{{logo_header}}{{serviceType}}", + "border": [ + true, + false, + true, + false + ], + "margin": [ + 4, + 0, + 0, + 0.5 + ] + } + ], + [ + { + "text": "2. If last day to pay bill is a holiday. Kindly pay your bills either online or offline on previous working day to avoid penalty.", + "border": [ + true, + false, + true, + false + ], + "margin": [ + 4, + 0, + 0, + 0.5 + ] + } + ], + [ + { + "text": "3. Payment mode available: Cash/Cheque at office counter,Online: Credit/Debit Card/PayTM/FreeCharge/BBPS/Airtel/SewaKendra.", + "border": [ + true, + false, + true, + false + ], + "margin": [ + 4, + 0, + 0, + 0.5 + ] + } + ], + [ + { + "text": "4. Please bring this bill while making payment at office counter.", + "border": [ + true, + false, + true, + false + ], + "margin": [ + 4, + 0, + 0, + 0.5 + ] + } + ], + [ + { + "text": "5. {{rate}}% Late payment charges will be applied after due date", + "border": [ + true, + false, + true, + false + ], + "margin": [ + 4, + 0, + 0, + 0.5 + ] + } + ], + [ + { + "text": "6. Interest & late payment charges calculated based on the payment date will reflect in next bill ", + "border": [ + true, + false, + true, + true + ], + "margin": [ + 4, + 0, + 0, + 0.5 + ] + } + ] + ] + }, + "layout": {} + }, + { + "canvas": [ + { + "type": "line", + "x1": -40, + "y1": 28, + "x2": 700, + "y2": 28, + "dash": { + "length": 10, + "space": 5 + } + } + ] + }, + { + "text": "Authorized Signatory", + "style": "footer-bottom" + }, + { + "image": "{{scissorImage}}", + "width": 19, + "height": 19, + "margin": [ + -30, + -9.8, + 0, + 0 + ] + }, + { + "text": "{{acknowledgement_for}}", + "style": "footer-header" + }, + { + "style": "noc-table4", + "table": { + "widths": [ + "*", + "*", + "*", + "*" + ], + "body": [ + [ + { + "text": "{{date_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{billdate}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Bill Due Date", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{billDueDate}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{consumer_no}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{consumerID}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{bill_no}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{billNo}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{name_address}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerName}}, {{nameAddress}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{total_payment}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{total}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + } + ] + ] + } + }, + { + "text": "{{receivers_signature}}", + "style": "footer-bottom" + } + ], + "styles": { + "noc-head": { + "margin": [ + -25, + -30, + 0, + 1 + ] + }, + "receipt-logo-header": { + "color": "#484848", + "fontFamily": "Roboto", + "fontSize": 14, + "bold": true, + "letterSpacing": 0.74, + "margin": [ + 0, + -10, + 0, + 1 + ] + }, + "receipt-logo-sub-header": { + "color": "#484848", + "fontFamily": "Roboto", + "fontSize": 12, + "letterSpacing": 0.6 + }, + "noc-table": { + "fontSize": 10, + "color": "#484848", + "margin": [ + -25, + 13, + -8, + -8 + ] + }, + "noc-table4": { + "fontSize": 10, + "color": "#484848", + "margin": [ + -25, + 40, + -8, + -8 + ] + }, + "noc-table2": { + "fontSize": 10, + "color": "#484848", + "margin": [ + -25, + 8, + -8, + -8 + ] + }, + "noc-table3": { + "fontSize": 10, + "color": "#484848", + "margin": [ + -25, + 13, + -8, + -8 + ] + }, + "receipt-table-value": { + "color": "#000000", + "bold": true, + "fontSize": 10, + "fontWeight": 500, + "margin": [ + 8, + 1, + 0, + 0 + ] + }, + "receipt-table-value2": { + "color": "#000000", + "bold": true, + "fontSize": 10, + "fontWeight": 500, + "margin": [ + 3, + 1, + 0, + 0 + ] + }, + "receipt-table": { + "color": "#484848", + "bold": true, + "fontSize": 10, + "fontWeight": 400, + "margin": [ + -30, + 1, + 0, + 0 + ] + }, + "receipt-table2": { + "color": "#484848", + "bold": true, + "fontSize": 10, + "fontWeight": 400, + "margin": [ + 3, + 2, + 0, + 2 + ] + }, + "right-receipt-table": { + "color": "#000000", + "bold": true, + "fontSize": 10, + "fontWeight": 500, + "margin": [ + 8, + 5, + 0, + 10 + ] + }, + "right-receipt-table2": { + "color": "#484848", + "bold": true, + "fontSize": 10, + "fontWeight": 400, + "margin": [ + -30, + 5, + 0, + 0 + ] + }, + "receipt-approver": { + "fontSize": 10, + "bold": true, + "margin": [ + -27, + 30, + -10, + 0 + ], + "color": "#484848" + }, + "no-signature": { + "fontSize": 10, + "margin": [ + -27, + 25, + -10, + 0 + ], + "color": "#484848" + }, + "amount-due": { + "fontSize": 20, + "color": "#FC8019", + "bold": true, + "fontWeight": 700 + }, + "pt-disclaimer": { + "fontSize": 8, + "margin": [ + -27, + 20, + -10, + 0 + ], + "color": "#484848" + }, + "pt-disclaimer-value": { + "fontSize": 8, + "margin": [ + 0, + 2, + 0, + 0 + ], + "color": "#484848" + }, + "qr-text": { + "fontSize": 12, + "margin": [ + 40, + 0, + 0, + 0 + ], + "color": "#484848", + "alignment": "left" + }, + "qr-image": { + "margin": [ + -40, + -1, + -3, + 0 + ], + "color": "#484848", + "alignment": "right" + }, + "footer-header": { + "margin": [ + 0, + 2, + 0, + -40 + ], + "bold": true, + "color": "#000000", + "alignment": "center" + }, + "footer-bottom": { + "margin": [ + 0, + 20, + 0, + 0 + ], + "bold": true, + "color": "#000000", + "alignment": "right" + } + } + } +} diff --git a/configs/pdf-service/format-config/ws-consolidatedacknowlegment.json b/configs/pdf-service/format-config/ws-consolidatedacknowlegment.json new file mode 100644 index 00000000..5e2e9c5f --- /dev/null +++ b/configs/pdf-service/format-config/ws-consolidatedacknowlegment.json @@ -0,0 +1,984 @@ +{ + "key": "ws-consolidatedacknowlegment", + "config": { + "defaultStyle": { + "font": "Cambay" + }, + "content": [ + { + "style": "ws-head", + "table": { + "widths": [ + 60, + "*", + 120 + ], + "body": [ + [ + { + "image": "{{logoImage}}", + "width": 50, + "height": 61.25, + "margin": [ + 12, + 10, + 12, + 10 + ] + }, + { + "stack": [ + { + "text": "{{logo_header}} {{mcGrade}}", + "style": "receipt-logo-header" + }, + { + "text": "{{logo_sub_header}}" + } + ], + "alignment": "left", + "margin": [ + 10, + 30, + 0, + 0 + ] + }, + { + "stack": [ + { + "table": { + "widths": [ + "*", + "*" + ], + "body": [ + [ + { + "image": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAABkAAAAZAAQMAAAAbwhzkAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAGUExURQAAAP7+/soH9D0AAAYwSURBVHja7dyxcYNAEAVQPA4UugRKoTRcGqW4BIcKNMKBcABzXu8JhIXn/UwSJ/Zt/Oea8Z+kAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAXkiyGdTn77iaHt79nLHa1oQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEJA9IC+ZVvolhHS3b88hpE+130FAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQP4AMmQK7vNpruVme80OppxAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQECOCeluH1PdeBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQkGND4pvaQUBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBADgYJE0OG+TTh0TggICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB7QqqSgpS78TUBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQF5LGRF4h2MjwoICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICMhGkPI0izvTP6Ju/IosLnk/b1/yBwEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEB+RVyz1+mdjDlEu6gW4wKAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKyB6Scc1hp76MdjCGk3I0f5jsAAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQHZBRJ348PhYkhNrb6rWTIICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICMi2kB8yPfTRJFKepnz07fbjdX40tT4QEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEJCtICuSqtWndjDllHotCAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAjIRpDPpj797B+umSOv08PvGcj0sQUBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAdkD8pJppV/mkMXRYT5VuRtf3kFXU8kHAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQF5DGQoltbbImQxzYpMkMVN7SAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAeDnMZEype8p46CgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIA8AeSem9pr0oKAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgOwJSU0zh3ynW7yvOM17ceRurAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICMi2kKr00dFTZgdTrjU7AAEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEB2RhyvICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICArMkXJlylJdANIpEAAAAASUVORK5CYII=", + "width": 70, + "height": 70, + "alignment": "right", + "border": [ + false, + false, + false, + false + ], + "style": "qr-image" + } + ] + ] + } + } + ] + } + ] + ] + }, + "layout": "noBorders" + }, + { + "columns": [ + { + "width": "20%", + "text": "{{consumer_no}}" + }, + { + "width": "50%", + "text": "{{consumerNo}}" + }, + { + "width": "14%", + "text": " " + }, + { + "width": "10%", + "text": "{{status_label}}", + "alignment": "right" + }, + { + "width": "10%", + "text": "{{status}}", + "alignment": "right" + } + ], + "margin": [ + -26, + 4, + 0, + 0 + ] + }, + { + "text": "{{service_details_header}}", + "style": "header" + }, + { + "style": "ws-table-property", + "table": { + "widths": [ + "103%" + ], + "body": [ + [ + { + "table": { + "widths": [ + "25%", + "25%", + "25%", + "25%" + ], + "body": [ + [ + { + "text": "{{service}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{connection_category}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{connection_type}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{meter_id}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + } + ], + [ + { + "text": "{{water_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{connectionCategory}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{connectionType}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{meterID}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + } + ], + [ + { + "text": "{{pipe_size}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{connection_execution_date}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{rainwater_harvesting_facility}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{water_source}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + } + ], + [ + { + "text": "{{pipeSize}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{connectionExecutionDate}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{rainwaterHarvestingFacility}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{waterSource}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + } + ], + [ + { + "text": "{{water_sub_source}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + } + ], + [ + { + "text": "{{waterSubSource}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + } + ] + ] + }, + "border": [ + true, + true, + true, + true + ] + } + ] + ] + }, + "layout": {} + }, + { + "text": "{{property_details_header}}", + "style": "header" + }, + { + "style": "ws-table-property", + "table": { + "widths": [ + "103%" + ], + "body": [ + [ + { + "table": { + "widths": [ + "25%", + "25%", + "25%", + "25%" + ], + "body": [ + [ + { + "text": "{{property_type}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{property_usage_type}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{plot_size}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + } + ], + [ + { + "text": "{{propertyType}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{propertyUsageType}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{plotSize}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + } + ], + [ + { + "text": "{{property_ID}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{city_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{plot_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{building_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + } + ], + [ + { + "text": "{{propertyID}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{city}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{plot}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{building}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + } + ], + [ + { + "text": "{{street_name}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{locality_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{pincode_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{location_on_map}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + } + ], + [ + { + "text": "{{streetName}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{locality}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{pincode}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{lat}} {{long}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + } + ] + ] + }, + "border": [ + true, + true, + true, + true + ] + } + ] + ] + }, + "layout": {} + }, + { + "text": "{{owner_details_header}}", + "style": "header" + }, + { + "style": "ws-table-property", + "table": { + "widths": [ + "103%" + ], + "body": [ + [ + { + "table": { + "widths": [ + "25%", + "25%", + "25%", + "25%" + ], + "body": [ + [ + { + "text": "{{owner_mobile_number}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{owner_name}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{gender_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{guardian_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + } + ], + [ + { + "text": "{{ownerMobileNumber}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{ownerName}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{gender}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{guardian}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + } + ], + [ + { + "text": "{{guardian_name}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{owner_category}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{email_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{correspondence_address}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + } + ], + [ + { + "text": "{{guardianName}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{ownerCategory}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{email}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{correspondenceAddress}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + } + ] + ] + }, + "border": [ + true, + true, + true, + true + ] + } + ] + ] + }, + "layout": {} + } + ], + "styles": { + "ws-head": { + "fillColor": "#F2F2F2", + "margin": [ + -39, + -38, + -38, + 0 + ] + }, + "receipt-logo-header": { + "color": "#000000", + "fontFamily": "Cambay", + "fontSize": 14, + "bold": true, + "letterSpacing": 0.74, + "margin": [ + 0, + -10, + 0, + 5 + ] + }, + "ws-table": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -25, + 18, + -8, + 10 + ] + }, + "ws-table-property": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -25, + 8, + -8, + 2 + ] + }, + "header": { + "color": "#000000", + "textTransform": "uppercase", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + -25, + 5, + 0, + -10 + ] + }, + "ws-sub-table-value": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 3, + 0, + 0, + 1 + ] + }, + "ws-sub-table": { + "color": "#484848", + "bold": true, + "fontSize": 12, + "fontWeight": 400, + "margin": [ + 3, + 1, + 0, + 0 + ] + }, + "qr-image": { + "margin": [ + -40, + -1, + -3, + 0 + ], + "color": "#484848", + "alignment": "right", + "backgroundColor": "#dddddd" + } + } + } +} diff --git a/configs/pdf-service/format-config/ws-consolidatedsewerageconnection.json b/configs/pdf-service/format-config/ws-consolidatedsewerageconnection.json new file mode 100644 index 00000000..1eed2e44 --- /dev/null +++ b/configs/pdf-service/format-config/ws-consolidatedsewerageconnection.json @@ -0,0 +1,785 @@ +{ + "key": "ws-consolidatedsewerageconnection", + "config": { + "defaultStyle": { + "font": "Cambay" + }, + "content": [ + { + "style": "ws-head", + "table": { + "widths": [ + 60, + "*", + 120 + ], + "body": [ + [ + { + "image": "{{logoImage}}", + "width": 50, + "height": 61.25, + "margin": [ + 12, + 10, + 12, + 10 + ] + }, + { + "stack": [ + { + "text": "{{logo_header}} {{mcGrade}}", + "style": "receipt-logo-header" + }, + { + "text": "{{logo_sub_header}}" + } + ], + "alignment": "left", + "margin": [ + 10, + 30, + 0, + 0 + ] + }, + { + "stack": [ + { + "table": { + "widths": [ + "*", + "*" + ], + "body": [ + [ + { + "image": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAABkAAAAZAAQMAAAAbwhzkAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAGUExURQAAAP7+/soH9D0AAAYwSURBVHja7dyxcYNAEAVQPA4UugRKoTRcGqW4BIcKNMKBcABzXu8JhIXn/UwSJ/Zt/Oea8Z+kAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAXkiyGdTn77iaHt79nLHa1oQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEJA9IC+ZVvolhHS3b88hpE+130FAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQP4AMmQK7vNpruVme80OppxAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQECOCeluH1PdeBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQkGND4pvaQUBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBADgYJE0OG+TTh0TggICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB7QqqSgpS78TUBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQF5LGRF4h2MjwoICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICMhGkPI0izvTP6Ju/IosLnk/b1/yBwEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEB+RVyz1+mdjDlEu6gW4wKAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKyB6Scc1hp76MdjCGk3I0f5jsAAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQHZBRJ348PhYkhNrb6rWTIICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICMi2kB8yPfTRJFKepnz07fbjdX40tT4QEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEJCtICuSqtWndjDllHotCAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAjIRpDPpj797B+umSOv08PvGcj0sQUBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAdkD8pJppV/mkMXRYT5VuRtf3kFXU8kHAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQF5DGQoltbbImQxzYpMkMVN7SAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAeDnMZEype8p46CgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIA8AeSem9pr0oKAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgOwJSU0zh3ynW7yvOM17ceRurAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICMi2kKr00dFTZgdTrjU7AAEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEB2RhyvICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICArMkXJlylJdANIpEAAAAASUVORK5CYII=", + "width": 70, + "height": 70, + "alignment": "right", + "border": [ + false, + false, + false, + false + ], + "style": "qr-image" + } + ] + ] + } + } + ] + } + ] + ] + }, + "layout": "noBorders" + }, + { + "columns": [ + { + "width": "20%", + "text": "{{consumer_no}}" + }, + { + "width": "50%", + "text": "{{consumerNo}}" + }, + { + "width": "14%", + "text": " " + }, + { + "width": "10%", + "text": "{{status_label}}", + "alignment": "right" + }, + { + "width": "10%", + "text": "{{status}}", + "alignment": "right" + } + ], + "margin": [ + -26, + 10, + 0, + 0 + ] + }, + { + "text": "{{service_details_header}}", + "style": "header" + }, + { + "style": "ws-table", + "table": { + "widths": [ + "103%" + ], + "body": [ + [ + { + "table": { + "widths": [ + "25%", + "50%", + "25%" + ], + "body": [ + [ + { + "text": "{{service}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{connection_execution_date}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{unit_of_measurement}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + } + ], + [ + { + "text": "{{sewarage_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{connectionExecutionDate}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{uom}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + } + ] + ] + }, + "border": [ + true, + true, + true, + true + ] + } + ] + ] + }, + "layout": {} + }, + { + "text": "{{property_details_header}}", + "style": "header" + }, + { + "style": "ws-table", + "table": { + "widths": [ + "103%" + ], + "body": [ + [ + { + "table": { + "widths": [ + "25%", + "25%", + "25%", + "25%" + ], + "body": [ + [ + { + "text": "{{property_type}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{property_usage_type}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{plot_size}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + } + ], + [ + { + "text": "{{propertyType}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{propertyUsageType}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{plotSize}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + } + ], + [ + { + "text": "{{property_ID}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{city_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{plot_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{building_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + } + ], + [ + { + "text": "{{propertyID}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{city}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{plot}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{building}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + } + ], + [ + { + "text": "{{street_name}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{locality_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{pincode_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{location_on_map}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + } + ], + [ + { + "text": "{{streetName}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{locality}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{pincode}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{lat}} {{long}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + } + ] + ] + }, + "border": [ + true, + true, + true, + true + ] + } + ] + ] + }, + "layout": {} + }, + { + "text": "{{owner_details_header}}", + "style": "header" + }, + { + "style": "ws-table", + "table": { + "widths": [ + "103%" + ], + "body": [ + [ + { + "table": { + "widths": [ + "25%", + "25%", + "25%", + "25%" + ], + "body": [ + [ + { + "text": "{{owner_mobile_number}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{owner_name}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{gender_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{guardian_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + } + ], + [ + { + "text": "{{ownerMobileNumber}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{ownerName}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{gender}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{guardian}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + } + ], + [ + { + "text": "{{guardian_name}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{owner_category}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{email_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{correspondence_address}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + } + ], + [ + { + "text": "{{guardianName}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{ownerCategory}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{email}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + }, + { + "text": "{{correspondenceAddress}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table-value" + } + ] + ] + }, + "border": [ + true, + true, + true, + true + ] + } + ] + ] + }, + "layout": {} + } + ], + "styles": { + "ws-head": { + "fillColor": "#F2F2F2", + "margin": [ + -39, + -38, + -38, + 0 + ] + }, + "receipt-logo-header": { + "color": "#000000", + "fontFamily": "Cambay", + "fontSize": 14, + "bold": true, + "letterSpacing": 0.74, + "margin": [ + 0, + -10, + 0, + 5 + ] + }, + "ws-table": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -25, + 8, + -8, + 4 + ] + }, + "header": { + "color": "#000000", + "textTransform": "uppercase", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + -25, + 12, + 0, + -10 + ] + }, + "ws-sub-table-value": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 3, + 0, + 0, + 2 + ] + }, + "ws-sub-table": { + "color": "#484848", + "bold": true, + "fontSize": 12, + "fontWeight": 400, + "margin": [ + 3, + 2, + 0, + 0 + ] + }, + "qr-image": { + "margin": [ + -40, + -1, + -3, + 0 + ], + "color": "#484848", + "alignment": "right", + "backgroundColor": "#dddddd" + } + } + } +} diff --git a/configs/pdf-service/format-config/ws-estimationnotice.json b/configs/pdf-service/format-config/ws-estimationnotice.json new file mode 100644 index 00000000..ddc08e4f --- /dev/null +++ b/configs/pdf-service/format-config/ws-estimationnotice.json @@ -0,0 +1,703 @@ +{ + "key": "ws-estimationnotice", + "config": { + "defaultStyle": { + "font": "Cambay" + }, + "content": [ + { + "style": "ws-head", + "table": { + "widths": [ + 60, + "*", + 120 + ], + "body": [ + [ + { + "image": "{{logoImage}}", + "width": 55, + "height": 61.25, + "margin": [ + 12, + 10, + 12, + 10 + ] + }, + { + "stack": [ + { + "text": "{{tenantName}} - {{UAT}}", + "style": "receipt-logo-header", + "margin": [ + 0, + 0, + 0, + 20 + ] + }, + { + "text": "{{estimation_notice_header}} {{service}} {{connection_header}}", + "style": "receipt-logo-header" + } + ], + "alignment": "center", + "margin": [ + 10, + 30, + 0, + 0 + ] + } + ] + ] + }, + "layout": "noBorders" + }, + { + "style": "ws-table-property", + "table": { + "widths": [ + "103%" + ], + "body": [ + [ + { + "table": { + "widths": [ + "16%", + "44%", + "18%", + "22%" + ], + "body": [ + [ + { + "text": "{{app_no}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": ": {{appNo}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{app_date}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": ": {{appDate}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + } + ], + [ + { + "text": "{{user_name}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": ": {{name}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{guardian_name}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": ": {{guardianName}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + } + ], + [ + { + "text": "{{usage_type}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": ": {{usageType}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": "{{mobile_no}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": ": {{mobileNumber}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + } + ], + [ + { + "text": "{{house_no}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": ": {{houseNo}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + } + ], + [ + { + "text": "{{user_address}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": ": {{address}}, PIN:{{pincode}}", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "ws-sub-table" + } + ] + ] + }, + "border": [ + false, + false, + false, + false + ] + } + ] + ] + }, + "layout": {} + }, + { + "text": "{{estimation_header}} {{service}} {{connection_header}}", + "style": "receipt-logo-header", + "alignment": "center" + }, + { + "style": "ws-table-property", + "table": { + "widths": [ + "*" + ], + "body": [ + [ + { + "table": { + "widths": [ + "auto", + "*", + "*" + ], + "body": [ + [ + { + "text": "{{sl_no}}", + "alignment": "center" + }, + { + "text": "{{fee_estimate}}", + "alignment": "center" + }, + { + "text": "{{amount}}", + "alignment": "center" + } + ], + [ + { + "text": "1.", + "alignment": "center" + }, + { + "text": "{{form_fee}}" + }, + { + "text": "{{formFee}}", + "alignment": "right" + } + ], + [ + { + "text": "2.", + "alignment": "center" + }, + { + "text": "{{scrutiny_fee}}" + }, + { + "text": "{{ScrutinyFee}}", + "alignment": "right" + } + ], + [ + { + "text": "3.", + "alignment": "center" + }, + { + "text": "{{one_time_fee}}" + }, + { + "text": "{{oneTimeFee}}", + "alignment": "right" + } + ], + [ + { + "text": "4.", + "alignment": "center" + }, + { + "text": "{{other_charge}}" + }, + { + "text": "{{otherCharge}}", + "alignment": "right" + } + ], + [ + { + "text": "5.", + "alignment": "center" + }, + { + "text": "{{road_charge}}" + }, + { + "text": "{{roadCharge}}", + "alignment": "right" + } + ], + [ + { + "text": "6.", + "alignment": "center" + }, + { + "text": "{{security_charge}}" + }, + { + "text": "{{securityCharge}}", + "alignment": "right" + } + ], + [ + { + "text": "7.", + "alignment": "center" + }, + { + "text": "{{tax_cess}}" + }, + { + "text": "{{taxCess}}", + "alignment": "right" + } + ], + [ + { + "text": "8.", + "alignment": "center" + }, + { + "text": "{{penalty}}" + }, + { + "text": "{{penaltyAmount}}", + "alignment": "right" + } + ], + [ + { + "text": "9.", + "alignment": "center" + }, + { + "text": "{{rebate}}" + }, + { + "text": "{{rebateAmount}}", + "alignment": "right" + } + ], [ + { + "text": "10.", + "alignment": "center" + }, + { + "text": "Connection Fee" + }, + { + "text": "{{connectionFee}}", + "alignment": "right" + } + ],[ + { + "text": "11.", + "alignment": "center" + }, + { + "text": "Composition Fee" + }, + { + "text": "{{compositionFee}}", + "alignment": "right" + } + ],[ + { + "text": "12.", + "alignment": "center" + }, + { + "text": "User Charges" + }, + { + "text": "{{userCharges}}", + "alignment": "right" + } + ], + [ + { + "text": "(+)", + "alignment": "center" + }, + { + "text": "{{comments}}" + }, + { + "text": "{{penaltyComments}}", + "alignment": "right" + } + ], + [ + { + "text": " " + }, + { + "text": "{{grand_total}}" + }, + { + "text": "{{totalAmount}}", + "alignment": "right" + } + ] + ] + }, + "border": [ + false, + false, + false, + false + ] + } + ] + ] + }, + "layout": {} + }, + { + "text": "{{approved_by}}", + "alignment": "right" + } + ], + "styles": { + "ws-head": { + "margin": [ + -39, + -38, + -38, + 0 + ] + }, + "receipt-logo-header": { + "color": "#000000", + "fontFamily": "Cambay", + "fontSize": 14, + "bold": true, + "letterSpacing": 0.74, + "margin": [ + 0, + -10, + 0, + 5 + ] + }, + "ws-table": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -25, + 18, + -8, + 10 + ] + }, + "ws-table-property": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -25, + 18, + -8, + 50 + ] + }, + "header": { + "color": "#000000", + "textTransform": "uppercase", + "bold": true, + "fontSize": 10, + "fontWeight": 500, + "margin": [ + -25, + 15, + 0, + -10 + ] + }, + "ws-sub-table-value": { + "color": "#000000", + "fontSize": 10, + "fontWeight": 500 + }, + "ws-sub-table": { + "color": "#000000", + "bold": true, + "fontSize": 10, + "fontWeight": 400, + "margin": [ + 3, + 8, + 0, + 0 + ] + }, + "qr-image": { + "margin": [ + -40, + -1, + -3, + 0 + ], + "color": "#484848", + "alignment": "right", + "backgroundColor": "#dddddd" + }, + "receipt-table-value": { + "color": "#000000", + "bold": true, + "fontSize": 10, + "fontWeight": 500, + "margin": [ + 5, + 5, + 0, + 0 + ] + }, + "receipt-table-value-total": { + "color": "#000000", + "bold": true, + "fontSize": 10, + "fontWeight": 500, + "alignment": "right", + "margin": [ + 0, + 5, + 30, + 0 + ] + }, + "receipt-table-value-down": { + "color": "#000000", + "bold": false, + "fontSize": 10, + "fontWeight": 400, + "alignment": "left", + "margin": [ + 3, + 5, + 0, + 5 + ] + }, + "receipt-table-value2": { + "color": "#000000", + "bold": false, + "fontSize": 10, + "fontWeight": 500, + "margin": [ + 3, + 0, + 0, + 0 + ] + }, + "receipt-table-value-cont": { + "color": "#000000", + "bold": false, + "fontSize": 10, + "fontWeight": 400, + "margin": [ + 3, + 0, + 0, + 0 + ] + }, + "receipt-table": { + "color": "#484848", + "bold": true, + "fontSize": 10, + "fontWeight": 400, + "margin": [ + -30, + 5, + 0, + 0 + ] + }, + "receipt-table2": { + "color": "#000000", + "bold": true, + "fontSize": 10, + "fontWeight": 500, + "margin": [ + 3, + 0, + 0, + 0 + ] + } + } + } +} diff --git a/configs/pdf-service/format-config/ws-onetime-receipt.json b/configs/pdf-service/format-config/ws-onetime-receipt.json new file mode 100644 index 00000000..8e957540 --- /dev/null +++ b/configs/pdf-service/format-config/ws-onetime-receipt.json @@ -0,0 +1,881 @@ +{ + "key": "ws-onetime-receipt", + "config": { + "defaultStyle": { + "font": "Cambay" + }, + "content": [ + { + "style": "noc-head", + "table": { + "widths": [ + 60, + "*", + 120 + ], + "body": [ + [ + { + "image": "{{logoImage}}", + "width": 60, + "height": 61.25 + }, + { + "stack": [ + { + "text": "{{logo-header}}{{mcGrade}}", + "style": "receipt-logo-header" + }, + { + "text": "{{serviceType}} {{payment_receipt}}(Employee Copy)", + "style": "receipt-logo-sub-header" + } + ], + "alignment": "left", + "margin": [ + 0, + 7, + 0, + 0 + ] + }, + { + "stack": [ + { + "text": "{{address}}" + }, + { + "text": "{{phoneNumber}}" + }, + { + "text": "{{website}}" + }, + { + "text": "{{email}}" + } + ], + "alignment": "right", + "color": "#484848", + "margin": [ + -100, + 0, + -25, + 0 + ] + } + ] + ] + }, + "layout": "noBorders" + }, + { + "style": "noc-table", + "table": { + "widths": [ + "34%", + "18%", + "36%", + "12%" + ], + "body": [ + [ + { + "text": "{{receipt_no}}.", + "border": [ + true, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{receiptNo}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table", + "font": "Roboto" + }, + { + "text": "{{consumer_id}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{consumerID}}", + "border": [ + false, + true, + true, + false + ], + "style": "receipt-table", + "font": "Roboto" + } + ], + [ + { + "text": "{{payment_date}}", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{paymentDate}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{payer_name}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerName}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{payer_contact}}", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerContact}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Payment Mode", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{paymentMode}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "Chq/DD/PO/Txn Date", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{chequeDD}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Chq/DD/PO/Txn Date", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{chequeDDDate}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + + } + ], + [ + { + "text": "Bank Name", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{bankName}},{{branchName}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "IFSC Code", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{ifsc}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + + } + ] + + ] + }, + "layout": {} + }, + { + "style": "next-noc-table", + "table": { + "widths": [ + "65%", + "35%" + ], + "body": + [ + [ + { + "text": "Description Head of A/C", + "style": "receipt-table-value22" + },{ + "text": "Amount(in Rupees)", + "style": "receipt-table-value22" + } + ], + "{{#var_paymentheads}}[{\"text\":\"{{taxheaddd}}\",\"style\":\"receipt-tableee\",\"alignment\":\"left\"},{\"text\":\"{{amountt}}\",\"style\":\"receipt-tableee\",\"alignment\":\"right\"}]{{/var_paymentheads}}" + ] + + + }, + "layout": {} + }, + { + "style": "receipt-approver", + "columns": [ + { + "text": [ + { + "text": "{{generated_by}}: ", + "bold": true + }, + { + "text": "{{user-name}}", + "bold": false + } + ], + "alignment": "left" + }, + { + "text": [ + { + "text": "{{commissioner/eo}}", + "bold": true + } + ], + "alignment": "right", + "margin": [ + 0, + 0, + -10, + 1 + ] + } + ] + }, + { + "style": "no-signature", + "text": "{{no_signature}}" + }, + { + "text":"-----------------------------x-----------------------------x-----------------------------x-----------------------------x-----------------------------", + "style":"next-noc-table2", + "alignment":"center" + + }, + { + "text":" ", + "style":"next-noc-table2" + + }, + { + "text":" ", + "style":"next-noc-table2" + + }, + { + "style": "noc-head", + "table": { + "widths": [ + 60, + "*", + 120 + ], + "body": [ + [ + { + "image": "{{logoImage}}", + "width": 60, + "height": 61.25 + }, + { + "stack": [ + { + "text": "{{logo-header}} {{Municipal_Corporation}}", + "style": "receipt-logo-header" + }, + { + "text": "{{serviceType}} {{payment_receipt}}(Citizen Copy)", + "style": "receipt-logo-sub-header" + } + ], + "alignment": "left", + "margin": [ + 13, + 7, + 0, + 0 + ] + }, + { + "stack": [ + { + "text": "{{address}}" + }, + { + "text": "{{phoneNumber}}" + }, + { + "text": "{{website}}" + }, + { + "text": "{{email}}" + } + ], + "alignment": "right", + "color": "#484848", + "margin": [ + -100, + 0, + -25, + -3 + ] + } + ] + ] + }, + "layout": "noBorders" + }, + { + "style": "noc-table", + "table": { + "widths": [ + "34%", + "16%", + "36%", + "14%" + ], + "body": [ + [ + { + "text": "{{receipt_no}}.", + "border": [ + true, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{receiptNo}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table", + "font": "Roboto" + }, + { + "text": "{{consumer_id}}", + "border": [ + false, + true, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{consumerID}}", + "border": [ + false, + true, + true, + false + ], + "style": "receipt-table", + "font": "Roboto" + } + ], + [ + { + "text": "{{payment_date}}", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{paymentDate}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "{{payer_name}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerName}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "{{payer_contact}}", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{payerContact}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Payment Mode", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{paymentMode}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } + ], + [ + { + "text": "Chq/DD/PO/Txn Date", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{chequeDD}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Chq/DD/PO/Txn Date", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{chequeDDDate}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + + } + ], + [ + { + "text": "Bank Name", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{bankName}},{{branchName}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "IFSC Code", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{ifsc}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + + } + ] + + ] + }, + "layout": {} + }, + { + "style": "next-noc-table", + "table": { + "widths": [ + "65%", + "35%" + ], + "body": + [ + [ + { + "text": "Description Head of A/C", + "style": "receipt-table-value22" + },{ + "text": "Amount(in Rupees)", + "style": "receipt-table-value22" + } + ], + "{{#var_paymentheads}}[{\"text\":\"{{taxheaddd}}\",\"style\":\"receipt-tableee\",\"alignment\":\"left\"},{\"text\":\"{{amountt}}\",\"style\":\"receipt-tableee\",\"alignment\":\"right\"}]{{/var_paymentheads}}" + ] + + + }, + "layout": {} + }, + { + "style": "receipt-approver", + "columns": [ + { + "text": [ + { + "text": "{{generated_by}}: ", + "bold": true + }, + { + "text": "{{user-name}}", + "bold": false + } + ], + "alignment": "left" + }, + { + "text": [ + { + "text": "{{commissioner/eo}}", + "bold": true + } + ], + "alignment": "right", + "margin": [ + 0, + 0, + -10, + 1 + ] + } + ] + }, + { + "style": "no-signature", + "text": "{{no_signature}}" + } + ], + "styles": { + "noc-head": { + "margin": [ + -30, + -30, + 0, + 0 + ] + }, + "receipt-table-value22": { + "color": "#000000", + "bold": true, + "fontSize": 10, + "fontWeight": 500, + "backgroundColor": "#D3D3D3", + "margin": [ + 8, + 0, + 0, + 0 + ] + }, + "receipt-logo-header": { + "color": "#000000", + "fontSize": 14, + "bold": true, + "letterSpacing": 0.74, + "margin": [ + 0, + 0, + 0, + 2 + ] + }, + "receipt-logo-sub-header": { + "color": "#000000", + "fontSize": 12, + "letterSpacing": 0.6 + }, + "noc-table": { + "fontSize": 12, + "color": "#000000", + "margin": [ + -25, + 7, + -22, + -8 + ] + }, + "next-noc-table": { + "fontSize": 12, + "color": "#000000", + "margin": [ + -25, + 7, + -22, + -8 + ] + }, + "next-noc-table2": { + "fontSize": 8, + "color": "#000000", + "margin": [ + -25, + 0, + -22, + 0 + ] + }, + "receipt-table-value": { + "color": "#000000", + "bold": true, + "fontSize": 10, + "fontWeight": 500, + "margin": [ + 8, + 0, + 0, + 0 + ] + }, + "receipt-tableee": { + "color": "#000000", + "bold": false, + "fontSize": 10, + "fontWeight": 400, + "margin": [ + 8, + 0, + 0, + 0 + ] + }, + "receipt-table": { + "color": "#000000", + "bold": false, + "fontSize": 10, + "fontWeight": 400, + "margin": [ + -30, + 0, + 0, + 0 + ] + }, + "receipt-approver": { + "fontSize": 8, + "bold": true, + "margin": [ + -27, + 10, + -10, + 0 + ], + "color": "#484848" + }, + "no-signature": { + "fontSize": 8, + "margin": [ + -27, + 1, + -10, + 0 + ], + "color": "#484848" + }, + "pt-disclaimer": { + "fontSize": 12, + "margin": [ + -27, + 30, + -10, + 0 + ], + "color": "#484848" + }, + "pt-disclaimer-value": { + "fontSize": 12, + "margin": [ + 2, + 5, + 0, + 0 + ], + "color": "#484848" + } + } + } +} diff --git a/configs/pdf-service/format-config/ws-sanctionletter.json b/configs/pdf-service/format-config/ws-sanctionletter.json new file mode 100644 index 00000000..06c5ee84 --- /dev/null +++ b/configs/pdf-service/format-config/ws-sanctionletter.json @@ -0,0 +1,636 @@ +{ + "key": "ws-sanctionletter", + "config": { + "defaultStyle": { + "font": "Cambay" + }, + "content": [ + { + "style": "ws-head", + "table": { + "widths": [ + 60, + "*", + 120 + ], + "body": [ + [ + { + "image": "{{logoImage}}", + "width": 60, + "height": 61.25, + "margin": [ + 50, + 30, + 12, + 10 + ] + }, + { + "stack": [ + { + "text": "{{mcGrade}}", + "style": "receipt-logo-header", + "margin": [ + 0, + 0, + 0, + 10 + ] + }, + { + "text": "{{tenantName}}", + "style": "receipt-logo-header" + }, + { + "text": "{{sanctionLetter}}", + "style": "receipt-logo-header" + } + ], + "alignment": "center", + "margin": [ + 90, + 30, + 0, + 0 + ] + } + ] + ] + }, + "layout": "noBorders" + }, + { + "style": "ws-table-property", + "table": { + "widths": [ + "103%" + ], + "body": [ + [ + { + "border": [ + false, + false, + false, + false + ], + "columns": [ + { + "width": "auto", + "text": "{{date_label}}", + "style": "ws-sub-header", + "alignment": "right" + }, + { + "width": "auto", + "text": "{{sanctionLetterDate}}", + "alignment": "right", + "style": "ws-sub-data" + } + ] + } + ], + [ + { + "border": [ + false, + false, + false, + false + ], + "columns": [ + { + "width": "20%", + "text": "{{sub_label}}", + "style": "receipt-value-down-sub" + }, + { + "width": "80%", + "text": "{{applicationType}} {{sub_data1}} {{applicationType}} {{sub_data2}} {{doorNo}} {{locality_label}} {{locality}} {{order_issued}} ", + "style": "receipt-value-down" + } + ], + "margin": [ + 50, + 10, + 0, + 0 + ] + } + ], + [ + { + "border": [ + false, + false, + false, + false + ], + "columns": [ + { + "width": "20%", + "text": "{{ref_label}}", + "style": "receipt-value-down-sub" + }, + { + "width": "80%", + "ol": [ + { + "text": "{{ref_message1}} {{ownerName}} {{doorNo}} {{locality_label}} {{locality}} {{dated_label}} {{appCreatedDate}}", + "style": "receipt-value-down" + }, + { + "text": "{{ref_message2}}{{applicationNumber}} {{dated_label}} {{estimationLetterDate}}", + "style": "receipt-value-down" + } + ] + } + ], + "margin": [ + 50, + 10, + 0, + 0 + ] + } + ], + [ + { + "border": [ + false, + false, + false, + false + ], + "columns": [ + { + "width": "100%", + "text": "{{order_label}}", + "style": "receipt-value-down-sub" + } + ], + "margin": [ + 25, + 10, + 0, + 0 + ] + } + ], + [ + { + "border": [ + false, + false, + false, + false + ], + "columns": [ + { + "width": "100%", + "text": "{{in_ref_label}} {{applicationNumber}} {{dated}} {{appCreatedDate}} {{order_message2}} {{applicationType}} {{order_message3}} {{door_no}} {{doorNo}} {{locality_label}} {{locality}}{{order_message4}} {{totalAmount}} {{order_message5}} {{applicationType}} {{order_message6}} {{totalAmount}} {{dated}} {{sanctionLetterDate}} {{order_message7}}", + "style": "receipt-value-down" + } + ], + "margin": [ + 50, + 10, + 0, + 0 + ] + } + ], + [ + { + "border": [ + false, + false, + false, + false + ], + "columns": [ + { + "width": "100%", + "text": "{{order_message12}} {{plumberName}}{{order_message13}} {{licenceNo}}{{order_message14}} {{contactNo}}{{order_message10}} 10 {{order_message15}} {{slaDate}}{{order_message11}}", + "style": "receipt-value-down" + } + ], + "margin": [ + 50, + 10, + 0, + 0 + ] + } + ], + [ + { + "stack": [ + { + "text": "{{for_commissioner_label}}", + "style": "receipt-table-value-total", + "fontSize": 12 + } + ], + "border": [ + false, + false, + false, + false + ], + "margin": [ + 40, + 60, + 0, + 0 + ] + } + ], + [ + { + "stack": [ + { + "table": { + "widths": [ + "10%", + "40%" + ], + "body": [ + [ + { + "text": "{{to_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-value-down-sub" + }, + { + "text": " ", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-value-down-sub" + } + ], + [ + { + "text": "{{sri_smt_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-value-down-sub" + }, + { + "text": "{{ownerName}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-value-down-sub" + } + ], + [ + { + "text": "{{door_no_label}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-value-down-sub" + }, + { + "text": "{{doorNo}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-value-down-sub" + } + ] + ] + } + }, + [ + { + "border": [ + false, + false, + false, + false + ], + "columns": [ + { + "width": "auto", + "text": "{{app_no}}", + "style": "receipt-value-down-sub" + }, + { + "width": "2%", + "text": ":" + }, + { + "width": "40%", + "text": "{{applicationNumber}}", + "style": "receipt-value-down-sub" + } + ], + "margin": [ + 0, + 10, + 0, + 0 + ] + } + ] + ], + "border": [ + false, + false, + false, + false + ], + "margin": [ + 20, + 5, + 0, + 0 + ] + } + ] + ] + }, + "layout": {} + }, + { + "text": "{{approved_by}}", + "alignment": "center", + "style": "receipt-down-footer" + } + ], + "styles": { + "ws-head": { + "margin": [ + -39, + -38, + -38, + 0 + ] + }, + "receipt-down-footer": { + "color": "#FF0000", + "fontFamily": "Cambay", + "fontSize": 14, + "bold": true, + "letterSpacing": 0.74, + "margin": [ + 0, + -10, + 0, + 5 + ] + }, + "ws-consumer-sub-header": { + "color": "#000000", + "fontSize": 12, + "fontWeight": 500 + }, + "receipt-value-down": { + "color": "#000000", + "bold": false, + "fontSize": 10, + "fontWeight": 400, + "alignment": "left", + "margin": [ + -8, + 0, + 0, + 5 + ] + }, + "receipt-value-down-sub": { + "color": "#000000", + "bold": true, + "fontSize": 10, + "fontWeight": 400, + "alignment": "left", + "margin": [ + 10, + 0, + 0, + 1 + ] + }, + "ws-sub-header": { + "color": "#000000", + "bold": true, + "fontSize": 10, + "fontWeight": 500, + "margin": [ + 380, + 10, + 10, + 10 + ] + }, + "ws-order-header": { + "color": "#000000", + "bold": true, + "fontSize": 10, + "fontWeight": 500, + "margin": [ + 10, + 10, + 10, + 10 + ] + }, + "receipt-logo-header": { + "color": "#000000", + "fontFamily": "Cambay", + "fontSize": 14, + "bold": true, + "letterSpacing": 0.74, + "margin": [ + 10, + -8, + 20, + 10 + ] + }, + "ws-table": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -25, + 18, + -8, + 10 + ] + }, + "ws-table-property": { + "fontSize": 12, + "color": "#484848", + "margin": [ + -25, + 18, + -8, + 50 + ] + }, + "header": { + "color": "#000000", + "textTransform": "uppercase", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + -25, + 15, + 0, + -10 + ] + }, + "ws-sub-table-value": { + "color": "#000000", + "fontSize": 12, + "fontWeight": 500 + }, + "ws-sub-table": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 400, + "margin": [ + 3, + 8, + 0, + 0 + ] + }, + "ws-sub-data": { + "color": "#000000", + "fontSize": 10, + "fontWeight": 400, + "margin": [ + -5, + 10, + 10, + 10 + ] + }, + "qr-image": { + "margin": [ + -40, + -1, + -3, + 0 + ], + "color": "#484848", + "alignment": "right", + "backgroundColor": "#dddddd" + }, + "receipt-table-value": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 5, + 5, + 0, + 0 + ] + }, + "receipt-table-value-total": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "alignment": "right", + "margin": [ + 0, + 5, + 30, + 0 + ] + }, + "receipt-table-value-down": { + "color": "#000000", + "bold": false, + "fontSize": 12, + "fontWeight": 400, + "alignment": "left", + "margin": [ + 3, + 5, + 0, + 5 + ] + }, + "receipt-table-value2": { + "color": "#000000", + "bold": false, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 3, + 0, + 0, + 0 + ] + }, + "receipt-table-value-cont": { + "color": "#000000", + "bold": false, + "fontSize": 11, + "fontWeight": 400, + "margin": [ + 3, + 0, + 0, + 0 + ] + }, + "receipt-table": { + "color": "#484848", + "bold": true, + "fontSize": 12, + "fontWeight": 400, + "margin": [ + -30, + 5, + 0, + 0 + ] + }, + "receipt-table2": { + "color": "#000000", + "bold": true, + "fontSize": 12, + "fontWeight": 500, + "margin": [ + 3, + 0, + 0, + 0 + ] + } + } + } +} diff --git a/configs/reports/configs/asset-reports.yml b/configs/reports/configs/asset-reports.yml new file mode 100644 index 00000000..5e38d058 --- /dev/null +++ b/configs/reports/configs/asset-reports.yml @@ -0,0 +1,1522 @@ +--- +ReportDefinitions: +- reportName: AssetImmovableRegister + summary: Immovable Asset Register Report + version: 1.0.0 + moduleName: asset + viewPath: assetImmovableReport + selectiveDownload: true + externalService: + - entity: $.MdmsRes.ASSET.AssetCategory + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=ASSET&masterName=AssetCategory&tenantId=$tenantid&filter=%5B%3F%28+%40.assetCategoryType%3D%3D%27IMMOVABLE%27++%26%26+%40.isAssetAllow%3D%3Dtrue%29%5D + keyOrder: id,name,depreciationRate,parent,tenantId + tableName: tbl_assetsubcategory + stateData: true + - entity: $.MdmsRes.ASSET.AssetCategory + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=ASSET&masterName=AssetCategory&tenantId=$tenantid&filter=%5B%3F%28+%40.assetCategoryType%3D%3D%27IMMOVABLE%27++%26%26+%40.isAssetAllow%3D%3Dfalse%29%5D + keyOrder: id,name,tenantId + tableName: tbl_assetcategory + stateData: true + sourceColumns: + - name: name + label: reports.asset.name + type: string + source: asset + - name: code + label: reports.asset.code + type: string + linkedReport: + reportName: AssetImmovableRegisterDetail + linkedColumn: _parent?reportName={reportName}&assetdetail={code} + source: asset + - name: dateofcreation + label: reports.asset.dateofcreation + type: epoch + source: asset + - name: grossvalue + label: reports.asset.grossvalue + type: number + source: asset + - name: originalvalue + label: reports.asset.originalvalue + type: number + source: asset + searchParams: + - name: assetcategory + label: reports.asset.assetCategory + isMandatory: false + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=ASSET&masterName=AssetCategory&tenantId=$tenantid&filter=%5B%3F(%20%40.assetCategoryType%3D%3D%27IMMOVABLE%27%20%26%26%20%40.isAssetAllow%3D%3Dfalse)%5D|$.MdmsRes.ASSET.AssetCategory.*.id|$.MdmsRes.ASSET.AssetCategory.*.name + source: asset + stateData: true + wrapper: true + searchClause : AND assetsubcategory.assetsubcategoryparent =$assetcategory + - name: assetsubcategory + label: reports.asset.assetSubCategory + isMandatory: false + type: url + pattern: /egov-mdms-service/v1/_get?moduleName=ASSET&masterName=AssetCategory&tenantId=$tenantid&filter=%5B%3F(%20%40.parent%3D%3D{assetcategory})%5D|$.MdmsRes.ASSET.AssetCategory.*.id|$.MdmsRes.ASSET.AssetCategory.*.name + source: asset + stateData: true + wrapper: true + searchClause : AND asset.assetcategory=$assetsubcategory + - name: department + label: reports.asset.departmentCode + isMandatory: false + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=common-masters&masterName=Department&tenantId=$tenantid|$..code|$..name + source: asset + stateData: true + wrapper: true + searchClause : AND asset.departmentcode=$department + - name: code + label: reports.asset.code + type: string + isMandatory: false + source: asset + searchClause : AND asset.code in ($code) + - name: name + label: reports.asset.name + type: string + isMandatory: false + source: asset + searchClause : AND asset.name ilike $name + - name: originalvaluefrom + label: reports.asset.originalvaluefrom + type: number + source: asset + searchClause : AND asset.originalvalue>=$originalvaluefrom + isMandatory: false + - name: originalvalueto + label: reports.asset.originalvalueto + type: number + source: asset + searchClause : AND asset.originalvalue<=$originalvalueto + isMandatory: false + - name: fromDate + label: reports.asset.fromDate + type: date + source: asset + searchClause : AND asset.createddate>=$fromDate + isMandatory: false + - name: toDate + label: reports.asset.toDate + type: date + source: asset + searchClause : AND asset.createddate<=$toDate + isMandatory: false + + + + + query: select asset.name,asset.code,asset.ordernumber,asset.warrantyavailable,asset.wipreferenceno,asset.titledocumentsavailable as titledocumentsavailable, + asset.accumulateddepreciation,asset.grossvalue,asset.id,asset.quantity,asset.totalarea,asset.openingdate,asset.fundsource, + asset.location,(select string_agg(land.surveynumber,',') from egasset_asset_landdetails land where land.isenabled=true and asset.id=land.assetid group by asset.id) as + totalsurveyno,asset.acquiredfrom,asset.anticipatedLife,asset.modeofacquisition,asset.warrantyexpirydate,asset.defectliabilityyear as + defectliability,asset.defectliabilitymonth as defectliabilitymonth,asset.assetCategoryType,asset.defectliabilityday as defectliabilityday, + asset.securitydepositretained,asset.securitydepositrealized,asset.dateofcreation,asset.acquisitiondate,asset.grossvalue,asset.originalvalue, + currentvalue.currentamount,disposal.salevalue as disposalsalevalue,disposal.profitlossvoucherreference as disposalvoucherno,disposal.disposaldate, + disposal.buyername,disposal.buyeraddress,revaluation.revaluationdate,revaluation.incrementalrevalsum,revaluation.decrementalrevalsum, + depreciation.depreciationvalue,depreciation.totaldepreciationval,assetsubcategoryname,assetSubCategory.depreciationrate,assetsubcategoryparent, + assetparentcategoryname from egasset_asset asset left outer join (select b.* from egasset_current_value b inner join ( select assetid,tenantid, + max(createdtime) as createdtime from egasset_current_value where tenantid = $tenantid group by assetid,tenantid) c ON b.assetid = c.assetid + and b.tenantid=c.tenantid AND c.createdtime=b.createdtime) currentvalue ON asset.id=currentvalue.assetid AND asset.tenantid=currentvalue.tenantid + left outer join egasset_disposal disposal ON asset.id=disposal.assetid AND asset.tenantId = disposal.tenantid left outer join + ( select dep1.*,depsum.totaldepreciationval from egasset_depreciation dep1 inner join (select assetid,tenantid,max(createdtime) as createdtime + from egasset_depreciation where tenantid = $tenantid group by assetid,tenantid ) depmax ON dep1.assetid=depmax.assetid AND + dep1.tenantid=depmax.tenantid AND dep1.createdtime=depmax.createdtime inner join (select assetid,tenantid,sum(depreciationvalue) as + totaldepreciationval from egasset_depreciation where tenantid = $tenantid group by assetid,tenantid) depsum ON dep1.assetid=depsum.assetid + AND dep1.tenantid=depsum.tenantid ) depreciation ON asset.id=depreciation.assetid AND asset.tenantid=depreciation.tenantid left outer join + (select rev1.*,revinc.incrementalrevalsum,revdec.decrementalrevalsum from egasset_revaluation rev1 inner join (select assetid,tenantid,max(createddate) + as createddate from egasset_revaluation where tenantid = $tenantid group by assetid,tenantid ) revalmax ON rev1.assetid=revalmax.assetid AND + rev1.tenantid=revalmax.tenantid AND rev1.createddate=revalmax.createddate left outer join (select assetid,tenantid,sum(revaluationamount) as + incrementalrevalsum from egasset_revaluation where tenantid = $tenantid AND typeofchange='INCREASED' group by assetid,tenantid) revinc + ON rev1.assetid=revinc.assetid and rev1.tenantid=revinc.tenantid left outer join (select assetid,tenantid,sum(revaluationamount) as decrementalrevalsum + from egasset_revaluation where tenantid = $tenantid AND typeofchange='DECREASED' group by assetid,tenantid) revdec + ON rev1.assetid=revdec.assetid and rev1.tenantid=revdec.tenantid where rev1.tenantid = $tenantid) revaluation + ON asset.tenantid=revaluation.tenantid AND asset.id=revaluation.assetid + left outer join ( select assetSubcategory.name assetsubcategoryname,assetSubcategory.depreciationrate as depreciationrate, + assetSubcategory.parent as assetsubcategoryparent,assetSubcategory.tenantid as tenantid,assetSubcategory.id assetsubcategoryid, + ac.name as assetparentcategoryname,ac.id assetparentcategoryid from (VALUES tbl_assetsubcategory) as assetSubcategory (id,name,depreciationRate,parent,tenantId) + inner join (VALUES tbl_assetcategory) as ac (id,name,tenantId) ON assetSubcategory.parent = ac.id ) as + assetsubcategory ON asset.assetcategory::character varying=assetsubcategory.assetsubcategoryid + where asset.tenantid = $tenantid AND asset.assetCategoryType='IMMOVABLE' + + +- reportName: AssetImmovableRegisterDetail + summary: Immovable Asset Register Report + version: 1.0.0 + moduleName: asset + viewPath: assetImmovableReport + selectiveDownload: true + externalService: + - entity: $.MdmsRes.egf-master.FinancialYear + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=egf-master&masterName=FinancialYear&tenantId=$tenantid&filter=%5B%3F(%20%40.startingDate%20%3C%3D%20$currentTime%20%26%26%20%40.endingDate%20%3E%3D%20$currentTime)%5D + keyOrder: startingDate,endingDate + tableName: tbl_financialYears + stateData: true + - entity: $.MdmsRes.ASSET.AssetCategory + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=ASSET&masterName=AssetCategory&tenantId=$tenantid&filter=%5B%3F%28+%40.assetCategoryType%3D%3D%27IMMOVABLE%27++%26%26+%40.isAssetAllow%3D%3Dtrue%29%5D + keyOrder: id,name,depreciationRate,parent,tenantId + tableName: tbl_assetsubcategory + stateData: true + - entity: $.MdmsRes.ASSET.AssetCategory + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=ASSET&masterName=AssetCategory&tenantId=$tenantid&filter=%5B%3F%28+%40.assetCategoryType%3D%3D%27IMMOVABLE%27++%26%26+%40.isAssetAllow%3D%3Dfalse%29%5D + keyOrder: id,name,tenantId + tableName: tbl_assetcategory + stateData: true + - entity: $.MdmsRes.egf-master.Fund + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=egf-master&masterName=Fund&tenantId=$tenantid + keyOrder: id,tenantId,name,code + tableName: tbl_funds + stateData: true + sourceColumns: + - name: id + label: reports.asset.id + type: number + source: asset + - name: quantity + label: reports.asset.quantity + type: number + source: asset + - name: plintharea + label: reports.asset.plintharea + type: number + source: asset + showColumn: true + - name: cubiccontents + label: reports.asset.cubiccontents + type: string + source: asset + - name: landsurveyno + label: reports.asset.landsurveyno + type: string + source: asset + - name: length + label: reports.asset.length + type: number + source: asset + - name: width + label: reports.asset.width + type: number + source: asset + - name: height + label: reports.asset.height + type: number + source: asset + - name: totalarea + label: reports.asset.totalarea + type: number + source: asset + - name: acquiredfrom + label: reports.asset.acquiredfrom + type: string + source: asset + - name: anticipatedLife + label: reports.asset.anticipatedLife + type: number + source: asset + - name: modeofacquisition + label: reports.asset.modeofacquisition + type: string + source: asset + - name: warrantyexpirydate + label: reports.asset.warrantyexpirydate + type: number + source: asset + - name: defectliability + label: reports.asset.defectliability + type: number + source: asset + - name: defectliabilitymonth + label: reports.asset.defectliabilitymonth + type: number + source: asset + - name: defectliabilityday + label: reports.asset.defectliabilityday + type: string + source: asset + - name: securitydepositretained + label: reports.asset.securitydepositretained + type: number + source: asset + - name: securitydepositrealized + label: reports.asset.securitydepositrealized + type: number + source: asset + - name: dateofcreation + label: reports.asset.dateofcreation + type: string + source: asset + - name: acquisitiondate + label: reports.asset.acquisitiondate + type: string + source: asset + - name: grossvalue + label: reports.asset.grossvalue + type: number + source: asset + - name: originalvalue + label: reports.asset.originalvalue + type: number + source: asset + - name: currentvalue + label: reports.asset.currentvalue + type: number + source: asset + - name: currentamount + label: reports.asset.currentamount + type: number + source: asset + - name: disposalsalevalue + label: reports.asset.disposalsalevalue + type: number + source: asset + - name: disposalvoucherno + label: reports.asset.disposalvoucherno + type: number + source: asset + - name: disposaldate + label: reports.asset.disposaldate + type: string + source: asset + - name: revaluationdate + label: reports.asset.revaluationdate + type: string + source: asset + - name: incrementalrevalsum + label: reports.asset.incrementalrevalsum + type: number + source: asset + - name: decrementalrevalsum + label: reports.asset.decrementalrevalsum + type: number + source: asset + - name: depreciationvalue + label: reports.asset.depreciationvalue + type: number + source: asset + - name: totaldepreciationval + label: reports.asset.totaldepreciationval + type: number + source: asset + - name: name + label: reports.asset.name + type: string + source: asset + - name: code + label: reports.asset.code + type: string + source: asset + - name: ordernumber + label: reports.asset.ordernumber + type: number + - name: warrantyavailable + label: reports.asset.warrantyavailable + type: string + source: asset + - name: wipreferenceno + label: reports.asset.wipreferenceno + type: string + source: asset + - name: floors + label: reports.asset.floors + type: number + source: asset + - name: titledocumentsavailable + label: reports.asset.titledocumentsavailable + type: number + - name: buyername + label: reports.asset.buyername + type: string + source: asset + - name: accumulateddepreciation + label: reports.asset.accumulateddepreciation + type: number + source: asset + - name: openingdate + label: reports.asset.openingdate + type: number + source: asset + - name: fundsourcename + label: reports.asset.fundsource + type: string + source: asset + - name: location + label: reports.asset.location + type: string + source: asset + - name: totalsurveyno + label: reports.asset.totalsurveyno + type: string + source: asset + - name: assetattributes + label: reports.asset.assetattributes + type: string + source: asset + - name: assetsubcategoryname + label: reports.asset.assetsubcategoryname + type: string + source: asset + - name: assetparentcategoryname + label: reports.asset.assetparentcategoryname + type: string + source: asset + - name: depreciationrate + label: reports.asset.depreciationrate + type: string + source: asset + - name: totalrevalsum + label: reports.asset.totalrevalsum + type: string + source: asset + - name: prevtotaldepreciationval + label: reports.asset.prevtotaldepreciationval + type: string + source: asset + - name: currtotaldepreciationval + label: reports.asset.currtotaldepreciationval + type: string + source: asset + searchParams: + - name: fromDate + label: reports.asset.fromDate + type: date + source: asset + searchClause : AND asset.createddate>=$fromDate + isMandatory: false + - name: toDate + label: reports.asset.toDate + type: date + source: asset + searchClause : AND asset.createddate<=$toDate + isMandatory: false + - name: name + label: reports.asset.name + type: string + isMandatory: false + source: asset + searchClause : AND asset.name=$name + - name: code + label: reports.asset.code + type: string + isMandatory: false + source: asset + searchClause : AND asset.code=$code + - name: assetdetail + label: reports.asset.detail + type: number + isMandatory: false + source: asset + searchClause : and asset.code in ($assetdetail) + + query: select asset.name,asset.code,asset.ordernumber,asset.warrantyavailable,asset.wipreferenceno,asset.titledocumentsavailable as titledocumentsavailable, + asset.accumulateddepreciation,asset.grossvalue,asset.id,asset.quantity,asset.totalarea,asset.openingdate,asset.fundsource,funds.fundsourcename, + asset.location,(select string_agg(land.surveynumber,',') from egasset_asset_landdetails land where land.isenabled=true and asset.id=land.assetid group by asset.id) as + totalsurveyno,asset.acquiredfrom,asset.anticipatedLife,asset.modeofacquisition,asset.warrantyexpirydate,asset.defectliabilityyear as + defectliability,asset.defectliabilitymonth as defectliabilitymonth,asset.assetCategoryType,asset.defectliabilityday as defectliabilityday, coalesce(grossvalue,0.0)-coalesce(accumulateddepreciation,0.0)+coalesce(incrementalrevalsum,0.0)-coalesce(decrementalrevalsum,0.0) as totalrevalsum, + asset.securitydepositretained,asset.securitydepositrealized,asset.dateofcreation,asset.acquisitiondate,asset.grossvalue,asset.originalvalue, + currentvalue.currentamount,disposal.salevalue as disposalsalevalue,disposal.profitlossvoucherreference as disposalvoucherno,disposal.disposaldate, + disposal.buyername,disposal.buyeraddress,revaluation.revaluationdate,revaluation.incrementalrevalsum,revaluation.decrementalrevalsum, + depreciation.depreciationvalue,depreciation.totaldepreciationval,depreciation.prevtotaldepreciationval,depreciation.currtotaldepreciationval,assetsubcategoryname,assetSubCategory.depreciationrate,assetsubcategoryparent, assetparentcategoryname from egasset_asset asset left outer join (select b.* from egasset_current_value b inner join ( select assetid,tenantid, max(createdtime) as createdtime from egasset_current_value where tenantid = $tenantid group by assetid,tenantid) c ON b.assetid = c.assetid and b.tenantid=c.tenantid AND c.createdtime=b.createdtime) currentvalue ON asset.id=currentvalue.assetid AND asset.tenantid=currentvalue.tenantid left outer join egasset_disposal disposal ON asset.id=disposal.assetid AND asset.tenantId = disposal.tenantid left outer join ( select dep1.*,depsum.totaldepreciationval,prevtotaldepreciationval,currtotaldepreciationval from egasset_depreciation dep1 + inner join (select assetid,tenantid,max(createdtime) as createdtime from egasset_depreciation where tenantid = $tenantid group by assetid,tenantid ) depmax ON dep1.assetid=depmax.assetid AND + dep1.tenantid=depmax.tenantid AND dep1.createdtime=depmax.createdtime inner join + (select assetid,tenantid,sum(depreciationvalue) as totaldepreciationval from egasset_depreciation where tenantid = $tenantid group by assetid,tenantid) depsum + ON dep1.assetid=depsum.assetid AND dep1.tenantid=depsum.tenantid left outer join + (select assetid,tenantid,sum(depreciationvalue) as prevtotaldepreciationval from egasset_depreciation where tenantid = $tenantid AND todate<=(select startingDate::bigint from (VALUES tbl_financialYears) as financialYears (startingDate,endingDate)) group by assetid,tenantid) prevdepsum + ON dep1.assetid=prevdepsum.assetid AND dep1.tenantid=prevdepsum.tenantid left outer join (select assetid,tenantid,sum(depreciationvalue) as currtotaldepreciationval + from egasset_depreciation where tenantid = $tenantid AND (todate BETWEEN (select startingDate::bigint from (VALUES tbl_financialYears) as financialYears (startingDate,endingDate)) + AND (select endingDate::bigint from (VALUES tbl_financialYears) as financialYears (startingDate,endingDate)) ) group by assetid,tenantid) currdepsum + ON dep1.assetid=currdepsum.assetid AND dep1.tenantid=currdepsum.tenantid) + depreciation ON asset.id=depreciation.assetid AND asset.tenantid=depreciation.tenantid + left outer join + (select rev1.*,revinc.incrementalrevalsum,revdec.decrementalrevalsum from egasset_revaluation rev1 inner join (select assetid,tenantid,max(createddate) + as createddate from egasset_revaluation where tenantid = $tenantid group by assetid,tenantid ) revalmax ON rev1.assetid=revalmax.assetid AND + rev1.tenantid=revalmax.tenantid AND rev1.createddate=revalmax.createddate left outer join (select assetid,tenantid,sum(revaluationamount) as + incrementalrevalsum from egasset_revaluation where tenantid = $tenantid AND typeofchange='INCREASED' group by assetid,tenantid) revinc + ON rev1.assetid=revinc.assetid and rev1.tenantid=revinc.tenantid left outer join (select assetid,tenantid,sum(revaluationamount) as decrementalrevalsum + from egasset_revaluation where tenantid = $tenantid AND typeofchange='DECREASED' group by assetid,tenantid) revdec + ON rev1.assetid=revdec.assetid and rev1.tenantid=revdec.tenantid where rev1.tenantid = $tenantid) revaluation + ON asset.tenantid=revaluation.tenantid AND asset.id=revaluation.assetid + left outer join ( select assetSubcategory.name assetsubcategoryname,assetSubcategory.depreciationrate as depreciationrate, + assetSubcategory.parent as assetsubcategoryparent,assetSubcategory.tenantid as tenantid,assetSubcategory.id assetsubcategoryid, + ac.name as assetparentcategoryname,ac.id assetparentcategoryid from (VALUES tbl_assetsubcategory) as assetSubcategory (id,name,depreciationRate,parent,tenantId) + inner join (VALUES tbl_assetcategory) as ac (id,name,tenantId) ON assetSubcategory.parent = ac.id ) as + assetsubcategory ON asset.assetcategory::character varying=assetsubcategory.assetsubcategoryid + left outer join (select funds.name fundsourcename,funds.code from (VALUES tbl_funds) as funds (id,tenantId,name,code)) as funds ON asset.fundsource=funds.code + where asset.tenantid = $tenantid AND asset.assetCategoryType='IMMOVABLE' + + +- reportName: AssetMovableRegister + summary: Movable Asset Register Report + version: 1.0.0 + moduleName: asset + viewPath: assetMovableReport + selectiveDownload: true + externalService: + - entity: $.MdmsRes.ASSET.AssetCategory + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=ASSET&masterName=AssetCategory&tenantId=$tenantid&filter=%5B%3F%28+%40.assetCategoryType%3D%3D%27MOVABLE%27++%26%26+%40.isAssetAllow%3D%3Dtrue%29%5D + keyOrder: id,name,depreciationRate,parent,tenantId + tableName: tbl_assetsubcategory + stateData: true + - entity: $.MdmsRes.ASSET.AssetCategory + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=ASSET&masterName=AssetCategory&tenantId=$tenantid&filter=%5B%3F%28+%40.assetCategoryType%3D%3D%27MOVABLE%27++%26%26+%40.isAssetAllow%3D%3Dfalse%29%5D + keyOrder: id,name,tenantId + tableName: tbl_assetcategory + stateData: true + sourceColumns: + - name: name + label: reports.asset.name + type: string + source: asset + - name: code + label: reports.asset.code + type: string + linkedReport: + reportName: AssetMovableRegisterDetail + linkedColumn: _parent?reportName={reportName}&assetdetail={code} + source: asset + - name: dateofcreation + label: reports.asset.dateofcreation + type: epoch + source: asset + - name: grossvalue + label: reports.asset.grossvalue + type: number + source: asset + - name: originalvalue + label: reports.asset.originalvalue + type: number + source: asset + searchParams: + - name: assetcategory + label: reports.asset.assetCategory + isMandatory: false + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=ASSET&masterName=AssetCategory&tenantId=$tenantid&filter=%5B%3F(%20%40.assetCategoryType%3D%3D%27MOVABLE%27%20%26%26%20%40.isAssetAllow%3D%3Dfalse)%5D|$.MdmsRes.ASSET.AssetCategory.*.id|$.MdmsRes.ASSET.AssetCategory.*.name + source: asset + wrapper: true + stateData: true + searchClause : AND assetsubcategory.assetsubcategoryparent =$assetcategory + - name: assetsubcategory + label: reports.asset.assetSubCategory + isMandatory: false + type: url + pattern: /egov-mdms-service/v1/_get?moduleName=ASSET&masterName=AssetCategory&tenantId=$tenantid&filter=%5B%3F(%20%40.parent%3D%3D{assetcategory})%5D|$.MdmsRes.ASSET.AssetCategory.*.id|$.MdmsRes.ASSET.AssetCategory.*.name + source: asset + wrapper: true + stateData: true + searchClause : AND asset.assetcategory=$assetsubcategory + - name: department + label: reports.asset.departmentCode + isMandatory: false + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=common-masters&masterName=Department&tenantId=$tenantid|$..code|$..name + source: asset + wrapper: true + stateData: true + searchClause : AND asset.departmentcode=$department + - name: code + label: reports.asset.code + type: string + isMandatory: false + source: asset + searchClause : AND asset.code in ($code) + - name: name + label: reports.asset.name + type: string + isMandatory: false + source: asset + searchClause : AND asset.name=$name + - name: originalvaluefrom + label: reports.asset.originalvaluefrom + type: number + source: asset + searchClause : AND asset.originalvalue>=$originalvaluefrom + isMandatory: false + - name: originalvalueto + label: reports.asset.originalvalueto + type: number + source: asset + searchClause : AND asset.originalvalue<=$originalvalueto + isMandatory: false + - name: fromDate + label: reports.asset.fromDate + type: date + source: asset + searchClause : AND asset.createddate>=$fromDate + isMandatory: false + - name: toDate + label: reports.asset.toDate + type: date + source: asset + searchClause : AND asset.createddate<=$toDate + isMandatory: false + + + + + + query: select asset.name,asset.code,asset.ordernumber,asset.warrantyavailable,asset.wipreferenceno,asset.titledocumentsavailable as titledocumentsavailable,asset.accumulateddepreciation,asset.grossvalue,asset.id,asset.quantity,asset.totalarea,asset.openingdate,asset.fundsource,asset.location,asset.assetCategoryType, + asset.acquiredfrom,asset.anticipatedLife,asset.modeofacquisition,asset.warrantyexpirydate,asset.defectliabilityyear as defectliability,asset.defectliabilitymonth as defectliabilitymonth,(select string_agg(land.surveynumber,',') from egasset_asset_landdetails land where land.isenabled=true and asset.id=land.assetid group by asset.id) as totalsurveyno, + asset.defectliabilityday as defectliabilityday,asset.securitydepositretained, + asset.securitydepositrealized,asset.dateofcreation,asset.acquisitiondate,asset.grossvalue,asset.originalvalue,currentvalue.currentamount, + disposal.salevalue as disposalsalevalue,disposal.profitlossvoucherreference as disposalvoucherno,disposal.disposaldate,disposal.buyername,disposal.buyeraddress, + revaluation.revaluationdate,revaluation.incrementalrevalsum,revaluation.decrementalrevalsum, + depreciation.depreciationvalue,depreciation.totaldepreciationval,assetsubcategoryname,assetSubCategory.depreciationrate,assetsubcategoryparent, + assetparentcategoryname + from egasset_asset asset left outer join + (select b.* from egasset_current_value b inner join ( select assetid,tenantid,max(createdtime) as createdtime from egasset_current_value + where tenantid = $tenantid group by assetid,tenantid) c + ON b.assetid = c.assetid and b.tenantid=c.tenantid AND c.createdtime=b.createdtime) currentvalue + ON asset.id=currentvalue.assetid AND asset.tenantid=currentvalue.tenantid + left outer join egasset_disposal disposal ON asset.id=disposal.assetid AND asset.tenantId = disposal.tenantid + left outer join ( select dep1.*,depsum.totaldepreciationval from egasset_depreciation dep1 + inner join + (select assetid,tenantid,max(createdtime) as createdtime from egasset_depreciation where tenantid = $tenantid + group by assetid,tenantid ) depmax ON dep1.assetid=depmax.assetid AND dep1.tenantid=depmax.tenantid AND dep1.createdtime=depmax.createdtime + inner join (select assetid,tenantid,sum(depreciationvalue) as totaldepreciationval from egasset_depreciation + where tenantid = $tenantid group by assetid,tenantid) depsum ON dep1.assetid=depsum.assetid + AND dep1.tenantid=depsum.tenantid ) depreciation ON asset.id=depreciation.assetid AND asset.tenantid=depreciation.tenantid + left outer join + (select rev1.*,revinc.incrementalrevalsum,revdec.decrementalrevalsum from egasset_revaluation rev1 inner join + (select assetid,tenantid,max(createddate) as createddate from egasset_revaluation where tenantid = $tenantid + group by assetid,tenantid ) revalmax ON rev1.assetid=revalmax.assetid AND rev1.tenantid=revalmax.tenantid AND rev1.createddate=revalmax.createddate + left outer join + (select assetid,tenantid,sum(revaluationamount) as incrementalrevalsum from egasset_revaluation where tenantid = $tenantid + AND typeofchange='INCREASED' group by assetid,tenantid) revinc ON rev1.assetid=revinc.assetid and rev1.tenantid=revinc.tenantid + left outer join (select assetid,tenantid,sum(revaluationamount) as decrementalrevalsum from egasset_revaluation + where tenantid = $tenantid AND typeofchange='DECREASED' group by assetid,tenantid) revdec + ON rev1.assetid=revdec.assetid and rev1.tenantid=revdec.tenantid + where rev1.tenantid = $tenantid) revaluation + ON asset.tenantid=revaluation.tenantid AND asset.id=revaluation.assetid + left outer join ( select assetSubcategory.name assetsubcategoryname,assetSubcategory.depreciationrate as depreciationrate, + assetSubcategory.parent as assetsubcategoryparent,assetSubcategory.tenantid as tenantid,assetSubcategory.id assetsubcategoryid, + ac.name as assetparentcategoryname,ac.id assetparentcategoryid from (VALUES tbl_assetsubcategory) as assetSubcategory (id,name,depreciationRate,parent,tenantId) + inner join (VALUES tbl_assetcategory) as ac (id,name,tenantId) ON assetSubcategory.parent = ac.id ) as + assetsubcategory ON asset.assetcategory::character varying=assetsubcategory.assetsubcategoryid + where asset.tenantid = $tenantid AND asset.assetCategoryType='MOVABLE' + + +- reportName: AssetMovableRegisterDetail + summary: Movable Asset Register Report + version: 1.0.0 + moduleName: asset + viewPath: assetMovableReport + selectiveDownload: true + externalService: + - entity: $.MdmsRes.egf-master.FinancialYear + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=egf-master&masterName=FinancialYear&tenantId=$tenantid&filter=%5B%3F(%20%40.startingDate%20%3C%3D%20$currentTime%20%26%26%20%40.endingDate%20%3E%3D%20$currentTime)%5D + keyOrder: startingDate,endingDate + tableName: tbl_financialYears + stateData: true + - entity: $.MdmsRes.ASSET.AssetCategory + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=ASSET&masterName=AssetCategory&tenantId=$tenantid&filter=%5B%3F%28+%40.assetCategoryType%3D%3D%27MOVABLE%27++%26%26+%40.isAssetAllow%3D%3Dtrue%29%5D + keyOrder: id,name,depreciationRate,parent,tenantId + tableName: tbl_assetsubcategory + stateData: true + - entity: $.MdmsRes.ASSET.AssetCategory + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=ASSET&masterName=AssetCategory&tenantId=$tenantid&filter=%5B%3F%28+%40.assetCategoryType%3D%3D%27MOVABLE%27++%26%26+%40.isAssetAllow%3D%3Dfalse%29%5D + keyOrder: id,name,tenantId + tableName: tbl_assetcategory + stateData: true + - entity: $.MdmsRes.egf-master.Fund + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=egf-master&masterName=Fund&tenantId=$tenantid + keyOrder: id,tenantId,name,code + tableName: tbl_funds + stateData: true + sourceColumns: + - name: id + label: reports.asset.id + type: number + source: asset + - name: quantity + label: reports.asset.quantity + type: number + source: asset + - name: plintharea + label: reports.asset.plintharea + type: number + source: asset + showColumn: true + - name: cubiccontents + label: reports.asset.cubiccontents + type: string + source: asset + - name: landsurveyno + label: reports.asset.landsurveyno + type: string + source: asset + - name: length + label: reports.asset.length + type: number + source: asset + - name: width + label: reports.asset.width + type: number + source: asset + - name: height + label: reports.asset.height + type: number + source: asset + - name: totalarea + label: reports.asset.totalarea + type: number + source: asset + - name: acquiredfrom + label: reports.asset.acquiredfrom + type: string + source: asset + - name: anticipatedLife + label: reports.asset.anticipatedLife + type: number + source: asset + - name: modeofacquisition + label: reports.asset.modeofacquisition + type: string + source: asset + - name: warrantyexpirydate + label: reports.asset.warrantyexpirydate + type: number + source: asset + - name: defectliability + label: reports.asset.defectliability + type: number + source: asset + - name: defectliabilitymonth + label: reports.asset.defectliabilitymonth + type: number + source: asset + - name: defectliabilityday + label: reports.asset.defectliabilityday + type: string + source: asset + - name: securitydepositretained + label: reports.asset.securitydepositretained + type: number + source: asset + - name: securitydepositrealized + label: reports.asset.securitydepositrealized + type: number + source: asset + - name: dateofcreation + label: reports.asset.dateofcreation + type: string + source: asset + - name: acquisitiondate + label: reports.asset.acquisitiondate + type: string + source: asset + - name: grossvalue + label: reports.asset.grossvalue + type: number + source: asset + - name: originalvalue + label: reports.asset.originalvalue + type: number + source: asset + - name: currentvalue + label: reports.asset.currentvalue + type: number + source: asset + - name: currentamount + label: reports.asset.currentamount + type: number + source: asset + - name: disposalsalevalue + label: reports.asset.disposalsalevalue + type: number + source: asset + - name: disposalvoucherno + label: reports.asset.disposalvoucherno + type: number + source: asset + - name: disposaldate + label: reports.asset.disposaldate + type: string + source: asset + - name: revaluationdate + label: reports.asset.revaluationdate + type: string + source: asset + - name: incrementalrevalsum + label: reports.asset.incrementalrevalsum + type: number + source: asset + - name: decrementalrevalsum + label: reports.asset.decrementalrevalsum + type: number + source: asset + - name: depreciationvalue + label: reports.asset.depreciationvalue + type: number + source: asset + - name: totaldepreciationval + label: reports.asset.totaldepreciationval + type: number + source: asset + - name: name + label: reports.asset.name + type: string + source: asset + - name: code + label: reports.asset.code + type: string + source: asset + - name: ordernumber + label: reports.asset.ordernumber + type: number + - name: warrantyavailable + label: reports.asset.warrantyavailable + type: string + source: asset + - name: wipreferenceno + label: reports.asset.wipreferenceno + type: string + source: asset + - name: floors + label: reports.asset.floors + type: number + source: asset + - name: titledocumentsavailable + label: reports.asset.titledocumentsavailable + type: number + - name: buyername + label: reports.asset.buyername + type: string + source: asset + - name: accumulateddepreciation + label: reports.asset.accumulateddepreciation + type: number + source: asset + - name: openingdate + label: reports.asset.openingdate + type: number + source: asset + - name: fundsourcename + label: reports.asset.fundsource + type: string + source: asset + - name: location + label: reports.asset.location + type: string + source: asset + - name: totalsurveyno + label: reports.asset.totalsurveyno + type: string + source: asset + - name: assetsubcategoryname + label: reports.asset.assetsubcategoryname + type: string + source: asset + - name: assetparentcategoryname + label: reports.asset.assetparentcategoryname + type: string + source: asset + - name: depreciationrate + label: reports.asset.depreciationrate + type: number + source: asset + - name: totalrevalsum + label: reports.asset.totalrevalsum + type: number + source: asset + - name: prevtotaldepreciationval + label: reports.asset.prevtotaldepreciationval + type: string + source: asset + - name: currtotaldepreciationval + label: reports.asset.currtotaldepreciationval + type: string + source: asset + searchParams: + - name: fromDate + label: reports.asset.fromDate + type: date + source: asset + searchClause : AND asset.createddate>=$fromDate + isMandatory: false + - name: toDate + label: reports.asset.toDate + type: date + source: asset + searchClause : AND asset.createddate<=$toDate + isMandatory: false + - name: name + label: reports.asset.name + type: string + isMandatory: false + source: asset + searchClause : AND asset.name=$name + - name: code + label: reports.asset.code + type: string + isMandatory: false + source: asset + searchClause : AND asset.code=$code + - name: assetcategory + label: reports.asset.assetcategory + type: string + isMandatory: false + source: asset + searchClause : AND asset.assetcategory=assetcategory + - name: assetdetail + label: reports.asset.detail + type: number + isMandatory: false + source: asset + searchClause : and asset.code in ($assetdetail) + + query: select asset.name,asset.code,asset.ordernumber,asset.warrantyavailable,asset.wipreferenceno,asset.titledocumentsavailable as titledocumentsavailable,asset.accumulateddepreciation,asset.grossvalue,asset.id,asset.quantity,asset.totalarea,asset.openingdate,asset.fundsource,asset.location,asset.assetCategoryType, + asset.acquiredfrom,asset.anticipatedLife,asset.modeofacquisition,asset.warrantyexpirydate,asset.defectliabilityyear as defectliability,asset.defectliabilitymonth as defectliabilitymonth,(select string_agg(land.surveynumber,',') from egasset_asset_landdetails land where land.isenabled=true and asset.id=land.assetid group by asset.id) as totalsurveyno,coalesce(grossvalue,0.0)-coalesce(accumulateddepreciation,0.0)+coalesce(incrementalrevalsum,0.0)-coalesce(decrementalrevalsum,0.0) as totalrevalsum, + asset.defectliabilityday as defectliabilityday,asset.securitydepositretained, + asset.securitydepositrealized,asset.dateofcreation,asset.acquisitiondate,asset.grossvalue,asset.originalvalue,currentvalue.currentamount,funds.fundsourcename, + disposal.salevalue as disposalsalevalue,disposal.profitlossvoucherreference as disposalvoucherno,disposal.disposaldate,disposal.buyername,disposal.buyeraddress, + revaluation.revaluationdate,revaluation.incrementalrevalsum,revaluation.decrementalrevalsum, + depreciation.depreciationvalue,depreciation.totaldepreciationval,depreciation.currtotaldepreciationval,depreciation.prevtotaldepreciationval,assetsubcategoryname,assetSubCategory.depreciationrate,assetsubcategoryparent, assetparentcategoryname from egasset_asset asset left outer join + (select b.* from egasset_current_value b inner join ( select assetid,tenantid,max(createdtime) as createdtime from egasset_current_value where tenantid = $tenantid group by assetid,tenantid) c + ON b.assetid = c.assetid and b.tenantid=c.tenantid AND c.createdtime=b.createdtime) currentvalue + ON asset.id=currentvalue.assetid AND asset.tenantid=currentvalue.tenantid left outer join egasset_disposal disposal ON asset.id=disposal.assetid AND asset.tenantId = disposal.tenantid left outer join ( select dep1.*,depsum.totaldepreciationval,prevtotaldepreciationval,currtotaldepreciationval from egasset_depreciation dep1 inner join (select assetid,tenantid,max(createdtime) as createdtime from egasset_depreciation where tenantid = $tenantid group by assetid,tenantid ) depmax ON dep1.assetid=depmax.assetid AND dep1.tenantid=depmax.tenantid AND dep1.createdtime=depmax.createdtime inner join (select assetid,tenantid,sum(depreciationvalue) as totaldepreciationval from egasset_depreciation where tenantid = $tenantid group by assetid,tenantid) depsum ON dep1.assetid=depsum.assetid AND dep1.tenantid=depsum.tenantid left outer join (select assetid,tenantid,sum(depreciationvalue) as prevtotaldepreciationval from egasset_depreciation where tenantid = $tenantid AND todate<=(select startingDate::bigint from (VALUES tbl_financialYears) as financialYears (startingDate,endingDate)) group by assetid,tenantid) prevdepsum ON dep1.assetid=prevdepsum.assetid AND dep1.tenantid=prevdepsum.tenantid left outer join (select assetid,tenantid,sum(depreciationvalue) as currtotaldepreciationval from egasset_depreciation where tenantid = $tenantid AND (todate BETWEEN (select startingDate::bigint from (VALUES tbl_financialYears) as financialYears (startingDate,endingDate)) AND (select endingDate::bigint from (VALUES tbl_financialYears) as financialYears (startingDate,endingDate)) ) group by assetid,tenantid) currdepsum ON dep1.assetid=currdepsum.assetid AND dep1.tenantid=currdepsum.tenantid) depreciation ON asset.id=depreciation.assetid AND asset.tenantid=depreciation.tenantid left outer join + (select rev1.*,revinc.incrementalrevalsum,revdec.decrementalrevalsum from egasset_revaluation rev1 inner join + (select assetid,tenantid,max(createddate) as createddate from egasset_revaluation where tenantid = $tenantid + group by assetid,tenantid ) revalmax ON rev1.assetid=revalmax.assetid AND rev1.tenantid=revalmax.tenantid AND rev1.createddate=revalmax.createddate + left outer join + (select assetid,tenantid,sum(revaluationamount) as incrementalrevalsum from egasset_revaluation where tenantid = $tenantid + AND typeofchange='INCREASED' group by assetid,tenantid) revinc ON rev1.assetid=revinc.assetid and rev1.tenantid=revinc.tenantid + left outer join (select assetid,tenantid,sum(revaluationamount) as decrementalrevalsum from egasset_revaluation + where tenantid = $tenantid AND typeofchange='DECREASED' group by assetid,tenantid) revdec + ON rev1.assetid=revdec.assetid and rev1.tenantid=revdec.tenantid + where rev1.tenantid = $tenantid) revaluation + ON asset.tenantid=revaluation.tenantid AND asset.id=revaluation.assetid + left outer join ( select assetSubcategory.name assetsubcategoryname,assetSubcategory.depreciationrate as depreciationrate, + assetSubcategory.parent as assetsubcategoryparent,assetSubcategory.tenantid as tenantid,assetSubcategory.id assetsubcategoryid, + ac.name as assetparentcategoryname,ac.id assetparentcategoryid from (VALUES tbl_assetsubcategory) as assetSubcategory (id,name,depreciationRate,parent,tenantId) + inner join (VALUES tbl_assetcategory) as ac (id,name,tenantId) ON assetSubcategory.parent = ac.id) as + assetsubcategory ON asset.assetcategory::character varying=assetsubcategory.assetsubcategoryid left outer join (select funds.name fundsourcename,funds.code from (VALUES tbl_funds) as funds (id,tenantId,name,code)) as funds ON asset.fundsource=funds.code + where asset.tenantid = $tenantid AND asset.assetCategoryType='MOVABLE' + + +- reportName: AssetSchedule + summary: Asset Schedule Register Report + version: 1.0.0 + moduleName: asset + viewPath: assetScheduleReport + externalService: + - entity: $.MdmsRes.egf-master.FinancialYear + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=egf-master&masterName=FinancialYear&tenantId=$tenantid&filter=%5B%3F(%20%40.startingDate%20%3C%3D%20$currentTime%20%26%26%20%40.endingDate%20%3E%3D%20$currentTime)%5D + keyOrder: startingDate,endingDate + tableName: tbl_financialYears + stateData: true + - entity: $.MdmsRes.ASSET.AssetCategory + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=ASSET&masterName=AssetCategory&tenantId=$tenantid&filter=%5B%3F%28+@.parent%21%3Dnull%29%5D + keyOrder: id,name,depreciationRate,parent,tenantId + tableName: tbl_assetsubcategory + stateData: true + - entity: $.MdmsRes.ASSET.AssetCategory + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=ASSET&masterName=AssetCategory&tenantId=$tenantid&filter=%5B%3F%28+%40.parent%3D%3Dnull%29%5D + keyOrder: id,name,tenantId + tableName: tbl_assetcategory + stateData: true + - entity: $.MdmsRes.ASSET.AssetCategory + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=ASSET&masterName=AssetCategory&tenantId=$tenantid + keyOrder: id,name,tenantId,depreciationRate,parent + tableName: tbl_assetcategories + stateData: true + sourceColumns: + - name: assetparentcategoryname + label: reports.asset.assetparentcategoryname + type: string + source: asset + - name: assetsubcategoryname + label: reports.asset.assetsubcategoryname + type: string + source: asset + - name: name + label: reports.asset.schedulename + type: string + source: asset + - name: depreciationrate + label: reports.asset.depreciationrate + type: string + source: asset + - name: code + label: reports.asset.code + type: string + source: asset + - name: revaluationreserveaccount + label: reports.asset.revaluationreserveaccount + type: string + source: asset + - name: previousfynetblock + label: reports.asset.currentstartnetblock + type: number + source: asset + - name: plusrevalsum + label: reports.asset.plusrevalsum + type: string + source: asset + - name: minusrevalsum + label: reports.asset.minusrevalsum + type: number + source: asset + - name: revaltotal + label: reports.asset.revaltotal + type: number + source: asset + - name: accumulateddepreciationaccount + label: reports.asset.accumulateddepreciationaccount + type: string + source: asset + - name: startdepval + label: reports.asset.startdepval + type: number + source: asset + - name: currdepsum + label: reports.asset.currdepsum + type: number + source: asset + - name: totaldepsum + label: reports.asset.totaldepsum + type: number + source: asset + - name: endcurrentamount + label: reports.asset.endcurrentamount + type: string + source: asset + - name: previousfynetblock + label: reports.asset.previousfynetblock + type: string + source: asset + searchParams: + - name: assetcategorytype + label: reports.asset.assetcategorytype + isMandatory: false + type: singlevaluelist + pattern: 'list://IMMOVABLE:IMMOVABLE,MOVABLE:MOVABLE,LAND:LAND' + source: asset + - name: assetcategory + label: reports.asset.assetCategory + isMandatory: false + type: url + pattern: /egov-mdms-service/v1/_get?moduleName=ASSET&masterName=AssetCategory&tenantId=$tenantid&filter=%5B%3F(%20%40.assetCategoryType%3D%3D%27{assetcategorytype}%27%20%26%26%20%40.isAssetAllow%3D%3Dfalse)%5D|$.MdmsRes.ASSET.AssetCategory.*.id|$.MdmsRes.ASSET.AssetCategory.*.name + source: asset + wrapper: true + stateData: true + searchClause : + - name: assetsubcategory + label: reports.asset.assetSubCategory + isMandatory: false + type: url + pattern: /egov-mdms-service/v1/_get?moduleName=ASSET&masterName=AssetCategory&tenantId=$tenantid&filter=%5B%3F(%20%40.parent%3D%3D{assetcategory})%5D|$.MdmsRes.ASSET.AssetCategory.*.id|$.MdmsRes.ASSET.AssetCategory.*.name + source: asset + stateData: true + wrapper: true + searchClause : AND asset.assetcategory=$assetsubcategory + - name: department + label: reports.asset.departmentCode + isMandatory: false + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=common-masters&masterName=Department&tenantId=$tenantid|$..id|$..name + source: asset + wrapper: true + stateData: true + searchClause : AND asset.departmentcode=$department + - name: code + label: reports.asset.code + type: string + isMandatory: false + source: asset + searchClause : AND asset.code in ($code) + - name: name + label: reports.asset.name + type: string + isMandatory: false + source: asset + searchClause : AND asset.name=$name + - name: originalvaluefrom + label: reports.asset.originalvaluefrom + type: number + source: asset + searchClause : AND asset.originalvalue>=$originalvaluefrom + isMandatory: false + - name: originalvalueto + label: reports.asset.originalvalueto + type: number + source: asset + searchClause : AND asset.originalvalue<=$originalvalueto + isMandatory: false + - name: fromDate + label: reports.asset.fromDate + type: date + source: asset + searchClause : AND asset.createddate>=$fromDate + isMandatory: false + - name: toDate + label: reports.asset.toDate + type: date + source: asset + searchClause : AND asset.createddate<=$toDate + isMandatory: false + + + query: select asset.code,asset.assetcategory,asset.name,asset.originalvalue,asset.revaluationreserveaccount, + asset.accumulateddepreciationaccount,asset.assetaccount,asset.accumulateddepreciation,previousfynetblock,endcurrentamount, + plusrevalsum,minusrevalsum,coalesce(prevdepsum,0)+coalesce(asset.accumulateddepreciation,0) as startdepval, + coalesce(previousfynetblock,0.0)+coalesce(plusrevalsum,0.0)-coalesce(minusRevalsum,0.0) as revaltotal,prevdepsum, currdepsum, + coalesce(prevdepsum,0.0)+coalesce(currdepsum,0.0)+coalesce(asset.accumulateddepreciation,0.0) as totaldepsum,assetsubcategoryname,assetSubCategory.depreciationrate,assetsubcategoryparent, + assetparentcategoryname from egasset_asset asset inner join (select distinct(current.assetid),current.tenantid,current.transactiondate,previousfynetblock,current.createdtime, + endcurrentamount,plusrevalsum,minusrevalsum ,previousfynetblock+plusrevalsum-minusRevalsum as revaltotal,prevdepsum,currdepsum, + prevdepsum+currdepsum as totaldepsum from egasset_current_value current inner join (select value.assetid,currentamount as + endcurrentamount,value.tenantid,value.transactiondate,value.createdtime from egasset_current_value value inner join (select max(createdtime) as createdtime, + assetid,tenantid from egasset_current_value where tenantid=$tenantid AND transactiondate<=(select endingDate::bigint::bigint from (VALUES tbl_financialYears) as financialYears (startingDate,endingDate)) + GROUP BY assetid,tenantid) as maxvalue ON value.assetid=maxvalue.assetid and value.tenantid=maxvalue.tenantid AND + value.createdtime=maxvalue.createdtime) endcurrent ON current.assetid=endcurrent.assetid AND current.tenantid= + endcurrent.tenantid AND current.createdtime=endcurrent.createdtime left outer join (select value.assetid,currentamount as + previousfynetblock,value.tenantid,value.transactiondate,value.createdtime from egasset_current_value value inner join (select max(createdtime) as + createdtime,assetid,tenantid from egasset_current_value where tenantid=$tenantid AND transactiondate<=(select startingDate::bigint from (VALUES tbl_financialYears) as financialYears (startingDate,endingDate)) GROUP BY assetid,tenantid ) as maxvalue ON value.assetid=maxvalue.assetid and + value.tenantid=maxvalue.tenantid AND value.createdtime=maxvalue.createdtime) prevyearcurrent ON current.assetid= + prevyearcurrent.assetid AND current.tenantid=prevyearcurrent.tenantid AND current.createdtime=prevyearcurrent.createdtime + left outer join (select COALESCE(sum(revaluationamount),0.0) plusRevalsum,assetid,tenantid from egasset_revaluation where + tenantid=$tenantid AND typeofchange='INCREASED' AND (revaluationdate BETWEEN (select startingDate::bigint from (VALUES tbl_financialYears) as financialYears (startingDate,endingDate)) AND (select endingDate::bigint from (VALUES tbl_financialYears) as financialYears (startingDate,endingDate))) + GROUP BY assetid,tenantid ) plusreval ON current.assetid=plusreval.assetid AND current.tenantid= + plusreval.tenantid left outer join (select sum(revaluationamount) minusRevalsum,assetid,tenantid from egasset_revaluation where + tenantid=$tenantid AND typeofchange='DECREASED' AND (revaluationdate between (select startingDate::bigint from (VALUES tbl_financialYears) as financialYears (startingDate,endingDate)) and (select endingDate::bigint from (VALUES tbl_financialYears) as financialYears (startingDate,endingDate))) GROUP BY assetid,tenantid ) minusreval ON current.assetid=minusreval.assetid AND current.tenantid= + minusreval.tenantid left outer join (select sum(depreciationvalue) prevdepsum,assetid,tenantid from egasset_depreciation where + tenantid=$tenantid AND todate<(select startingDate::bigint from (VALUES tbl_financialYears) as financialYears (startingDate,endingDate)) GROUP BY assetid,tenantid ) prevdep ON current.assetid=prevdep. + assetid AND current.tenantid=prevdep.tenantid left outer join (select sum(depreciationvalue) currdepsum,assetid,tenantid from + egasset_depreciation where tenantid=$tenantid AND (todate between (select startingDate::bigint from (VALUES tbl_financialYears) as financialYears (startingDate,endingDate)) and (select endingDate::bigint from (VALUES tbl_financialYears) as financialYears (startingDate,endingDate))) GROUP BY assetid,tenantid ) currdep ON current.assetid=currdep.assetid AND current.tenantid= + currdep.tenantid) as transactions ON asset.id=transactions.assetid AND asset.tenantid=transactions.tenantid + left outer join ( select assetSubcategory.name as assetsubcategoryname,CASE WHEN assetSubcategory.depreciationrate='null' THEN 'NA' WHEN assetSubcategory.depreciationrate='' THEN 'NA' ELSE assetSubcategory.depreciationrate END, + assetSubcategory.parent as assetsubcategoryparent,assetSubcategory.tenantid as tenantid,assetSubcategory.id assetsubcategoryid, + ac.name as assetparentcategoryname from (VALUES tbl_assetsubcategory) as assetSubcategory (id,name,depreciationRate,parent,tenantId) + inner join (VALUES tbl_assetcategories) as ac (id,name,tenantId) ON assetSubcategory.parent = ac.id ) as + assetsubcategory ON asset.assetcategory::character varying=assetsubcategory.assetsubcategoryid + WHERE asset.tenantid=$tenantid + +- reportName: LandRegister + summary: Land Register Report + version: 1.0.0 + moduleName: asset + viewPath: landRegisterReport + selectiveDownload: true + externalService: + - entity: $.MdmsRes.ASSET.AssetCategory + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=ASSET&masterName=AssetCategory&tenantId=$tenantid&filter=%5B%3F%28+%40.assetCategoryType%3D%3D%27LAND%27++%26%26+%40.isAssetAllow%3D%3Dtrue%29%5D + keyOrder: id,name,depreciationRate,parent,tenantId + tableName: tbl_assetsubcategory + stateData: true + - entity: $.MdmsRes.ASSET.AssetCategory + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=ASSET&masterName=AssetCategory&tenantId=$tenantid&filter=%5B%3F%28+%40.assetCategoryType%3D%3D%27LAND%27++%26%26+%40.isAssetAllow%3D%3Dfalse%29%5D + keyOrder: id,name,tenantId + tableName: tbl_assetcategory + stateData: true + sourceColumns: + - name: name + label: reports.asset.name + type: string + source: asset + - name: code + label: reports.asset.code + type: string + linkedReport: + reportName: LandRegisterDetail + linkedColumn: _parent?reportName={reportName}&assetdetail={code} + source: asset + - name: dateofcreation + label: reports.asset.dateofcreation + type: epoch + source: asset + - name: grossvalue + label: reports.asset.grossvalue + type: number + source: asset + - name: originalvalue + label: reports.asset.originalvalue + type: number + source: asset + searchParams: + - name: assetcategory + label: reports.asset.assetCategory + isMandatory: false + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=ASSET&masterName=AssetCategory&tenantId=$tenantid&filter=%5B%3F(%20%40.assetCategoryType%3D%3D%27LAND%27%20%26%26%20%40.isAssetAllow%3D%3Dfalse)%5D|$.MdmsRes.ASSET.AssetCategory.*.id|$.MdmsRes.ASSET.AssetCategory.*.name + source: asset + wrapper: true + stateData: true + searchClause : AND assetsubcategory.assetsubcategoryparent =$assetcategory + - name: assetsubcategory + label: reports.asset.assetSubCategory + isMandatory: false + type: url + pattern: /egov-mdms-service/v1/_get?moduleName=ASSET&masterName=AssetCategory&tenantId=$tenantid&filter=%5B%3F(%20%40.parent%3D%3D{assetcategory})%5D|$.MdmsRes.ASSET.AssetCategory.*.id|$.MdmsRes.ASSET.AssetCategory.*.name + source: asset + wrapper: true + stateData: true + searchClause : AND asset.assetcategory=$assetsubcategory + - name: department + label: reports.asset.departmentCode + isMandatory: false + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=common-masters&masterName=Department&tenantId=$tenantid|$..code|$..name + source: asset + wrapper: true + stateData: true + searchClause : AND asset.departmentcode=$department + - name: code + label: reports.asset.code + type: string + isMandatory: false + source: asset + searchClause : AND asset.code in ($code) + - name: name + label: reports.asset.name + type: string + isMandatory: false + source: asset + searchClause : AND asset.name=$name + - name: originalvaluefrom + label: reports.asset.originalvaluefrom + type: number + source: asset + searchClause : AND asset.originalvalue>=$originalvaluefrom + isMandatory: false + - name: originalvalueto + label: reports.asset.originalvalueto + type: number + source: asset + searchClause : AND asset.originalvalue<=$originalvalueto + isMandatory: false + - name: fromDate + label: reports.asset.fromDate + type: date + source: asset + searchClause : AND asset.createddate>=$fromDate + isMandatory: false + - name: toDate + label: reports.asset.toDate + type: date + source: asset + searchClause : AND asset.createddate<=$toDate + isMandatory: false + + + + + query: select asset.name,asset.code,asset.ordernumber,asset.warrantyavailable,asset.wipreferenceno,asset.titledocumentsavailable as titledocumentsavailable,asset.accumulateddepreciation,asset.grossvalue,asset.id,asset.quantity,asset.totalarea,asset.openingdate,asset.fundsource,asset.location,(select string_agg(land.surveynumber,',') from egasset_asset_landdetails land where land.isenabled=true and asset.id=land.assetid group by asset.id) as totalsurveyno, + asset.acquiredfrom,asset.anticipatedLife,asset.modeofacquisition,asset.warrantyexpirydate,asset.defectliabilityyear as defectliability,asset.defectliabilitymonth as defectliabilitymonth,asset.assetCategoryType, + asset.defectliabilityday as defectliabilityday,asset.securitydepositretained, + asset.securitydepositrealized,asset.dateofcreation,asset.acquisitiondate,asset.grossvalue,asset.originalvalue,currentvalue.currentamount, + disposal.salevalue as disposalsalevalue,disposal.profitlossvoucherreference as disposalvoucherno,disposal.disposaldate,disposal.buyername,disposal.buyeraddress, + revaluation.revaluationdate,revaluation.incrementalrevalsum,revaluation.decrementalrevalsum,assetsubcategoryname,assetSubCategory.depreciationrate,assetsubcategoryparent, + assetparentcategoryname + from egasset_asset asset left outer join + (select b.* from egasset_current_value b inner join ( select assetid,tenantid,max(createdtime) as createdtime from egasset_current_value + where tenantid = $tenantid group by assetid,tenantid) c + ON b.assetid = c.assetid and b.tenantid=c.tenantid AND c.createdtime=b.createdtime) currentvalue + ON asset.id=currentvalue.assetid AND asset.tenantid=currentvalue.tenantid + left outer join egasset_disposal disposal ON asset.id=disposal.assetid AND asset.tenantId = disposal.tenantid + left outer join + (select rev1.*,revinc.incrementalrevalsum,revdec.decrementalrevalsum from egasset_revaluation rev1 inner join + (select assetid,tenantid,max(createddate) as createddate from egasset_revaluation where tenantid = $tenantid + group by assetid,tenantid ) revalmax ON rev1.assetid=revalmax.assetid AND rev1.tenantid=revalmax.tenantid AND rev1.createddate=revalmax.createddate + left outer join + (select assetid,tenantid,sum(revaluationamount) as incrementalrevalsum from egasset_revaluation where tenantid = $tenantid + AND typeofchange='INCREASED' group by assetid,tenantid) revinc ON rev1.assetid=revinc.assetid and rev1.tenantid=revinc.tenantid + left outer join (select assetid,tenantid,sum(revaluationamount) as decrementalrevalsum from egasset_revaluation + where tenantid = $tenantid AND typeofchange='DECREASED' group by assetid,tenantid) revdec + ON rev1.assetid=revdec.assetid and rev1.tenantid=revdec.tenantid + where rev1.tenantid = $tenantid) revaluation + ON asset.tenantid=revaluation.tenantid AND asset.id=revaluation.assetid + left outer join ( select assetSubcategory.name assetsubcategoryname,assetSubcategory.depreciationrate as depreciationrate, + assetSubcategory.parent as assetsubcategoryparent,assetSubcategory.tenantid as tenantid,assetSubcategory.id assetsubcategoryid, + ac.name as assetparentcategoryname from (VALUES tbl_assetsubcategory) as assetSubcategory (id,name,depreciationRate,parent,tenantId) + inner join (VALUES tbl_assetcategory) as ac (id,name,tenantId) ON assetSubcategory.parent = ac.id ) as + assetsubcategory ON asset.assetcategory::character varying=assetsubcategory.assetsubcategoryid + where asset.tenantid = $tenantid AND asset.assetCategoryType='LAND' + + +- reportName: LandRegisterDetail + summary: Land Register Report + version: 1.0.0 + moduleName: asset + viewPath: landRegisterReport + selectiveDownload: true + externalService: + - entity: $.MdmsRes.ASSET.AssetCategory + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=ASSET&masterName=AssetCategory&tenantId=$tenantid&filter=%5B%3F%28+%40.assetCategoryType%3D%3D%27LAND%27++%26%26+%40.isAssetAllow%3D%3Dtrue%29%5D + keyOrder: id,name,depreciationRate,parent,tenantId + tableName: tbl_assetsubcategory + stateData: true + - entity: $.MdmsRes.ASSET.AssetCategory + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=ASSET&masterName=AssetCategory&tenantId=$tenantid&filter=%5B%3F%28+%40.assetCategoryType%3D%3D%27LAND%27++%26%26+%40.isAssetAllow%3D%3Dfalse%29%5D + keyOrder: id,name,tenantId + tableName: tbl_assetcategory + stateData: true + - entity: $.MdmsRes.egf-master.Fund + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=egf-master&masterName=Fund&tenantId=$tenantid + keyOrder: id,tenantId,name,code + tableName: tbl_funds + stateData: true + sourceColumns: + - name: id + label: reports.asset.id + type: number + source: asset + - name: quantity + label: reports.asset.quantity + type: number + source: asset + - name: plintharea + label: reports.asset.plintharea + type: number + source: asset + showColumn: true + - name: cubiccontents + label: reports.asset.cubiccontents + type: string + source: asset + - name: landsurveyno + label: reports.asset.landsurveyno + type: string + source: asset + - name: length + label: reports.asset.length + type: number + source: asset + - name: width + label: reports.asset.width + type: number + source: asset + - name: height + label: reports.asset.height + type: number + source: asset + - name: totalarea + label: reports.asset.totalarea + type: number + source: asset + - name: acquiredfrom + label: reports.asset.acquiredfrom + type: string + source: asset + - name: anticipatedLife + label: reports.asset.anticipatedLife + type: number + source: asset + - name: modeofacquisition + label: reports.asset.modeofacquisition + type: string + source: asset + - name: warrantyexpirydate + label: reports.asset.warrantyexpirydate + type: number + source: asset + - name: defectliability + label: reports.asset.defectliability + type: number + source: asset + - name: defectliabilitymonth + label: reports.asset.defectliabilitymonth + type: number + source: asset + - name: defectliabilityday + label: reports.asset.defectliabilityday + type: string + source: asset + - name: securitydepositretained + label: reports.asset.securitydepositretained + type: number + source: asset + - name: securitydepositrealized + label: reports.asset.securitydepositrealized + type: number + source: asset + - name: dateofcreation + label: reports.asset.dateofcreation + type: string + source: asset + - name: acquisitiondate + label: reports.asset.acquisitiondate + type: string + source: asset + - name: grossvalue + label: reports.asset.grossvalue + type: number + source: asset + - name: originalvalue + label: reports.asset.originalvalue + type: number + source: asset + - name: currentvalue + label: reports.asset.currentvalue + type: number + source: asset + - name: currentamount + label: reports.asset.currentamount + type: number + source: asset + - name: disposalsalevalue + label: reports.asset.disposalsalevalue + type: number + source: asset + - name: disposalvoucherno + label: reports.asset.disposalvoucherno + type: number + source: asset + - name: disposaldate + label: reports.asset.disposaldate + type: string + source: asset + - name: revaluationdate + label: reports.asset.revaluationdate + type: string + source: asset + - name: incrementalrevalsum + label: reports.asset.incrementalrevalsum + type: number + source: asset + - name: decrementalrevalsum + label: reports.asset.decrementalrevalsum + type: number + source: asset + - name: depreciationvalue + label: reports.asset.depreciationvalue + type: number + source: asset + - name: totaldepreciationval + label: reports.asset.totaldepreciationval + type: number + source: asset + - name: name + label: reports.asset.name + type: string + source: asset + - name: code + label: reports.asset.code + type: string + source: asset + - name: ordernumber + label: reports.asset.ordernumber + type: number + - name: warrantyavailable + label: reports.asset.warrantyavailable + type: string + source: asset + - name: wipreferenceno + label: reports.asset.wipreferenceno + type: string + source: asset + - name: floors + label: reports.asset.floors + type: number + source: asset + - name: titledocumentsavailable + label: reports.asset.titledocumentsavailable + type: number + - name: buyername + label: reports.asset.buyername + type: string + source: asset + - name: accumulateddepreciation + label: reports.asset.accumulateddepreciation + type: number + source: asset + - name: openingdate + label: reports.asset.openingdate + type: number + source: asset + - name: fundsourcename + label: reports.asset.fundsource + type: string + source: asset + - name: location + label: reports.asset.location + type: string + source: asset + - name: totalsurveyno + label: reports.asset.totalsurveyno + type: string + source: asset + - name: assetattributes + label: reports.asset.assetattributes + type: string + source: asset + - name: assetsubcategoryname + label: reports.asset.assetsubcategoryname + type: string + source: asset + - name: assetparentcategoryname + label: reports.asset.assetparentcategoryname + type: string + source: asset + - name: depreciationrate + label: reports.asset.depreciationrate + type: number + source: asset + - name: totalrevalsum + label: reports.asset.totalrevalsum + type: number + source: asset + searchParams: + - name: fromDate + label: reports.asset.fromDate + type: date + source: asset + searchClause : AND asset.createddate>=$fromDate + isMandatory: false + - name: toDate + label: reports.asset.toDate + type: date + source: asset + searchClause : AND asset.createddate<=$toDate + isMandatory: false + - name: name + label: reports.asset.name + type: string + isMandatory: false + source: asset + searchClause : AND asset.name=$name + - name: code + label: reports.asset.code + type: string + isMandatory: false + source: asset + searchClause : AND asset.code=$code + - name: assetdetail + label: reports.asset.detail + type: number + isMandatory: false + source: asset + searchClause : and asset.code in ($assetdetail) + + query: select asset.name,asset.code,asset.ordernumber,asset.warrantyavailable,asset.wipreferenceno,asset.titledocumentsavailable as titledocumentsavailable,asset.accumulateddepreciation,asset.grossvalue,asset.id,asset.quantity,asset.totalarea,asset.openingdate,asset.fundsource,asset.location,(select string_agg(land.surveynumber,',') from egasset_asset_landdetails land where land.isenabled=true and asset.id=land.assetid group by asset.id) as totalsurveyno,asset.assetattributes,funds.fundsourcename, + asset.acquiredfrom,asset.anticipatedLife,asset.modeofacquisition,asset.warrantyexpirydate,asset.defectliabilityyear as defectliability,asset.defectliabilitymonth as defectliabilitymonth,asset.assetCategoryType,coalesce(grossvalue,0.0)-coalesce(accumulateddepreciation,0.0)+coalesce(incrementalrevalsum,0.0)-coalesce(decrementalrevalsum,0.0) as totalrevalsum, + asset.defectliabilityday as defectliabilityday,asset.securitydepositretained, + asset.securitydepositrealized,asset.dateofcreation,asset.acquisitiondate,asset.grossvalue,asset.originalvalue,currentvalue.currentamount, + disposal.salevalue as disposalsalevalue,disposal.profitlossvoucherreference as disposalvoucherno,disposal.disposaldate,disposal.buyername,disposal.buyeraddress, + revaluation.revaluationdate,revaluation.incrementalrevalsum,revaluation.decrementalrevalsum,assetsubcategoryname,assetSubCategory.depreciationrate,assetsubcategoryparent, + assetparentcategoryname + from egasset_asset asset left outer join + (select b.* from egasset_current_value b inner join ( select assetid,tenantid,max(createdtime) as createdtime from egasset_current_value + where tenantid = $tenantid group by assetid,tenantid) c + ON b.assetid = c.assetid and b.tenantid=c.tenantid AND c.createdtime=b.createdtime) currentvalue + ON asset.id=currentvalue.assetid AND asset.tenantid=currentvalue.tenantid + left outer join egasset_disposal disposal ON asset.id=disposal.assetid AND asset.tenantId = disposal.tenantid + left outer join + (select rev1.*,revinc.incrementalrevalsum,revdec.decrementalrevalsum from egasset_revaluation rev1 inner join + (select assetid,tenantid,max(createddate) as createddate from egasset_revaluation where tenantid = $tenantid + group by assetid,tenantid ) revalmax ON rev1.assetid=revalmax.assetid AND rev1.tenantid=revalmax.tenantid AND rev1.createddate=revalmax.createddate + left outer join + (select assetid,tenantid,sum(revaluationamount) as incrementalrevalsum from egasset_revaluation where tenantid = $tenantid + AND typeofchange='INCREASED' group by assetid,tenantid) revinc ON rev1.assetid=revinc.assetid and rev1.tenantid=revinc.tenantid + left outer join (select assetid,tenantid,sum(revaluationamount) as decrementalrevalsum from egasset_revaluation + where tenantid = $tenantid AND typeofchange='DECREASED' group by assetid,tenantid) revdec + ON rev1.assetid=revdec.assetid and rev1.tenantid=revdec.tenantid + where rev1.tenantid = $tenantid) revaluation + ON asset.tenantid=revaluation.tenantid AND asset.id=revaluation.assetid + left outer join ( select assetSubcategory.name assetsubcategoryname,assetSubcategory.depreciationrate as depreciationrate, + assetSubcategory.parent as assetsubcategoryparent,assetSubcategory.tenantid as tenantid,assetSubcategory.id assetsubcategoryid, + ac.name as assetparentcategoryname from (VALUES tbl_assetsubcategory) as assetSubcategory (id,name,depreciationRate,parent,tenantId) + inner join (VALUES tbl_assetcategory) as ac (id,name,tenantId) ON assetSubcategory.parent = ac.id ) as + assetsubcategory ON asset.assetcategory::character varying=assetsubcategory.assetsubcategoryid left outer join (select funds.name fundsourcename,funds.code from (VALUES tbl_funds) as funds (id,tenantId,name,code)) as funds ON asset.fundsource=funds.code + where asset.tenantid = $tenantid AND asset.assetCategoryType='LAND' diff --git a/configs/reports/configs/citizen-reports.yml b/configs/reports/configs/citizen-reports.yml new file mode 100644 index 00000000..47098b07 --- /dev/null +++ b/configs/reports/configs/citizen-reports.yml @@ -0,0 +1,49 @@ +--- +ReportDefinitions: +- reportName: CitizenService + summary: Citizen Services Report + version: 1.0.0 + moduleName: citizen + sourceColumns: + - name: receiptNo + label: reports.citizen.receiptno + type: string + source: citizen + - name: receiptDate + label: reports.citizen.receiptdate + type: number + source: citizen + - name: totalAmount + label: reports.citizen.totalamount + type: number + source: citizen + - name: payeeName + label: reports.citizen.payeename + type: number + source: citizen + - name: consumerAddress + label: reports.citizen.consumeraddress + type: number + source: citizen + - name: print + label: reports.citizen.print + type: number + source: citizen + linkedReport: + reportName: ReceiptDetail + linkedColumn: _url?/pgr/viewGrievance/:srn + searchParams: + - name: consumerno + label: reports.citizen.consumerno + type: string + source: citizen + isMandatory: false + searchClause: and consumerNo = $consumerno + - name: receiptno + label: reports.citizen.receiptno + type: string + source: citizen + isMandatory: false + searchClause: and receiptno = $receiptno + query: select receiptNo,receiptDate,totalAmount,payeeName,consumerAddress,'print' as print from egcl_legacy_receipt_header where tenantid = $tenantid + diff --git a/configs/reports/configs/common-reports.yml b/configs/reports/configs/common-reports.yml new file mode 100644 index 00000000..98f4b55f --- /dev/null +++ b/configs/reports/configs/common-reports.yml @@ -0,0 +1,68 @@ +--- +ReportDefinitions: +- reportName: CommonInbox + summary: Common Inbox + version: 1.0.0 + moduleName: common + sourceColumns: + - name: createddate + label: reports.common.createddate + type: epoch + source: common + - name: sendername + label: reports.common.sendername + type: string + source: egpgr_router + - name: natureoftask + label: reports.common.natureoftask + type: string + source: common + - name: status + label: reports.common.status + type: string + source: common + - name: details + label: reports.common.details + type: string + source: common + - name: url + label: reports.common.url + type: string + source: common + searchParams: + - name: positionId + label: reports.pgr.complaintcategorytype + type: number + source: seva + - name: complainttype + label: reports.pgr.complainttype + type: number + source: seva + query: select * from ( + (select sub.createddate as createddate,sub.name as senderName,'Grievance' as natureoftask ,sub_a.code as status, + 'Complaint No.'|| sub.crn||' regarding '|| + (select name from egpgr_complainttype where code =sub.servicecode AND tenantid=sub.tenantid) ||' in '|| sub_a.code as details, + replace('_url?/pgr/viewGrievance/:srn',':srn',replace(sub.crn, '/', '%2F')::character varying) as url from submission sub inner join submission_attribute sub_a on sub.crn = sub_a.crn where + sub_a.key in('systemStatus','status') and sub_a.code in ('REGISTERED','FORWARDED','PROCESSING','REOPENED','ONHOLD') and sub.positionid IN ($positionId) and sub.tenantid = $tenantid order by createdDate desc) + union + (select createddate as createddate,sendername as sendername,natureoftask as natureoftask,value as status, abstractestimate.abstractestimatenumber::character varying ||':'||comments as details, + replace('_url?/non-framework/works/transaction/update/abstractEstimate/:id', ':id', replace(abstractestimate.abstractestimatenumber, '/', '%2F')::character varying) as url from EG_WF_STATES states JOIN + egw_abstractestimate abstractestimate ON abstractestimate.stateid = states.id::character varying where type = 'AbstractEstimate' and owner_pos IN ($positionId) + and states.tenantId=$tenantid and states.status<>2 order by states.createdDate desc) + union + (select createddate as createddate,sendername as sendername,natureoftask as natureoftask,value as status, abstractestimate.abstractestimatenumber::character varying ||':'||comments as details, + replace('_url?/non-framework/works/transaction/update/abstractEstimate/:id', ':id', replace(abstractestimate.abstractestimatenumber, '/', '%2F')::character varying) as url from EG_WF_STATES states JOIN + egw_abstractestimate abstractestimate ON abstractestimate.stateid = states.id::character varying where type = 'SpilloverAbstractEstimate' and owner_pos IN ($positionId) + and states.tenantId=$tenantid and states.status<>2 order by states.createdDate desc) + union + (select createddate as createddate,sendername as sendername,natureoftask as natureoftask,value as status, detailedestimate.id::character varying ||':'||comments as details, + replace('_url?/non-framework/works/transaction/viewDetailedEstimate/:id', ':id', replace(detailedestimate.estimatenumber, '/', '%2F')::character varying) as url from EG_WF_STATES states JOIN + egw_detailedestimate detailedestimate ON detailedestimate.stateid = states.id::character varying where type = 'DetailedEstimate' and owner_pos IN ($positionId) + and states.tenantId=$tenantid and states.status<>2 order by states.createdDate desc) + union + (select createddate as createddate,sendername as sendername,natureoftask as natureoftask,value as status, detailedestimate.id::character varying ||':'||comments as details, + replace('_url?/non-framework/works/transaction/viewDetailedEstimate/:id', ':id', replace(detailedestimate.estimatenumber, '/', '%2F')::character varying) as url from EG_WF_STATES states JOIN + egw_detailedestimate detailedestimate ON detailedestimate.stateid = states.id::character varying where type = 'SpilloverDetailedEstimate' and owner_pos IN ($positionId) + and states.tenantId=$tenantid and states.status<>2 order by states.createdDate desc)) result + order by createddate desc; + diff --git a/configs/reports/configs/e-pass-reports.yml b/configs/reports/configs/e-pass-reports.yml new file mode 100644 index 00000000..bb145438 --- /dev/null +++ b/configs/reports/configs/e-pass-reports.yml @@ -0,0 +1,96 @@ +ReportDefinitions: +- reportName: epassreport + summary: epass report + version: 1.0.0 + moduleName: rainmaker-epass + sourceColumns: + - name: applicationnumber + label: reports.epass.applicationnumber + type: string + source: epass + total: false + - name: applicationdate + label: reports.epass.applicationdate + type: string + source: epass + total: false + - name: fromdistrict + label: reports.epass.fromdistrict + type: string + source: epass + total: false + - name: todistrict + label: reports.epass.todistrict + type: string + source: epass + total: false + - name: tradeType + label: reports.epass.tradetype + type: string + source: epass + total: false + - name: issuedate + label: reports.epass.issuedate + type: string + source: epass + total: false + - name: purpose + label: reports.epass.purpose + type: string + source: epass + total: false + - name: vehiclenumber + label: reports.epass.vehiclenumber + type: string + source: epass + total: false + - name: licensenumber + label: reports.epass.licensenumber + type: string + source: epass + total: false + - name: status + label: reports.epass.status + type: string + source: epass + total: false + - name: rejectionremarks + label: reports.epass.rejectionremarks + type: string + source: epass + total: false + searchParams: + - name: fromDate + label: reports.epass.fromDate + type: epoch + source: epass + isMandatory: false + searchClause: AND tl.createdtime >= $fromDate + - name: toDate + label: reports.epass.toDate + type: epoch + source: epass + isMandatory: false + searchClause: AND tl.createdtime <= $toDate + query: | + select + tl.applicationnumber, + to_char((To_timestamp(tl.createdtime/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY HH:MI AM') as applicationDate, + CASE WHEN tlu.tradeType = 'INTERSTATE' THEN 'Other State to MP Pass' + WHEN tlu.tradeType = 'INTRASTATE' THEN 'MP Inter District Pass' + WHEN tlu.tradeType = 'MP_TO_OTHER_STATE' THEN 'MP to Other State Pass' + ELSE 'NA' END as tradeType, + initcap(replace(tld.additionaldetail->>'fromDistrict', 'MP_', '')) as fromDistrict, + initcap(replace(tld.additionaldetail->>'toDistrict', 'MP_', '')) as toDistrict, + COALESCE(to_char((To_timestamp(tl.issueddate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY HH:MI AM'), '') as issueDate, + initcap(replace(COALESCE(tld.additionaldetail->>'purpose', ''), '_',' ')) as purpose, + COALESCE(tld.additionaldetail->>'vehicleNumber', '') as vehicleNumber, + COALESCE(tl.licensenumber, '') as licensenumber, + initcap(tl.status) as status, + COALESCE(tlw.comment, '') as rejectionRemarks + from eg_tl_tradelicense as tl + inner join eg_tl_tradelicensedetail as tld on tld.tradelicenseid = tl.id + inner join eg_tl_TradeUnit as tlu on tlu.tradeLicenseDetailId = tld.id + left join eg_wf_processinstance_v2 as tlw on tlw.businessid = tl.applicationnumber and tlw.action = 'REJECT' + where tl.tenantid = $tenantid and tl.status not in ('INITIATED') + orderby: order by tl.createdtime desc diff --git a/configs/reports/configs/finance-reports.yml b/configs/reports/configs/finance-reports.yml new file mode 100644 index 00000000..a7cb996b --- /dev/null +++ b/configs/reports/configs/finance-reports.yml @@ -0,0 +1,177 @@ +ReportDefinitions: + - reportName: ReceiptRegister + summary: Receipt Register + version: 1.0.0 + moduleName: finance + externalService: + - entity: $.MdmsRes.common-masters.Department + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=common-masters&masterName=Department&tenantId=$tenantId + keyOrder: name,code + tableName: tbl_def_dept + sourceColumns: + - name: receiptnumber + label: reports.fin.erp.receiptnumber + type: string + source: finance-erp + total: false + - name: receiptdate + label: reports.fin.erp.receiptdate + type: string + source: finance-erp + total: false + - name: service + label: reports.fin.erp.service + type: string + source: finance-erp + total: false + - name: department + label: reports.fin.erp.department + type: string + source: finance-erp + total: false + - name: cash + label: reports.fin.erp.cash + type: number + source: finance-erp + total: true + - name: chequenumber + label: reports.fin.erp.chequenumber + type: number + source: finance-erp + total: false + - name: cheque + label: reports.fin.erp.cheque + type: number + source: finance-erp + total: true + - name: online + label: reports.fin.erp.online + type: number + source: finance-erp + total: true + - name: card + label: reports.fin.erp.card + type: number + source: finance-erp + total: true + - name: status + label: reports.fin.erp.status + type: string + source: finance-erp + total: false + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: false + searchClause: AND receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: false + searchClause: AND receiptdate <= $toDate + - name: dept + label: Department + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=common-masters&masterName=Department|$.MdmsRes.common-masters.Department[*].code|$.MdmsRes.common-masters.Department[*].name + source: finance-erp + wrapper: true + isMandatory: false + searchClause: AND deptmap_def.code = $dept + - name: service + label: Service + type: singlevaluelist + pattern: http://egov-common-masters:8080/egov-common-masters/businessDetails/_search?tenantId=$tenantid&active=true|$.BusinessDetails[*].code|$.BusinessDetails[*].name + source: finance-erp + wrapper: true + isMandatory: false + searchClause: AND rt.businessdetails = $service + + query: select to_char(to_timestamp(rt.receiptdate/1000),'DD/MM/YYYY') as receiptdate, rt.receiptnumber as receiptnumber, bd.name as Service, deptmap_def.name as department, (case when instrumenttype='Cash' then ins.amount end) as cash, (case when instrumenttype='Cheque' then ins.amount when instrumenttype='DD' then ins.amount end) as cheque, (case when instrumenttype='Cheque' then ins.instrumentnumber when instrumenttype='DD' then ins.instrumentnumber end) as chequenumber, (case when instrumenttype='Online' then ins.amount end) as online, (case when instrumenttype='Card' then amount end) as card, rt.status as status from egcl_receiptheader rt inner join (VALUES tbl_def_dept) AS deptmap_def(name,code) on deptmap_def.code=rt.department, eg_businessdetails bd, egcl_instrumentheader ins where ins.id = (select instrumentheader from egcl_receiptinstrument where receiptheader = rt.id) and rt.tenantid = bd.tenantid and rt.businessdetails = bd.code + orderby: ORDER BY receiptdate DESC NULLS LAST + - reportName: BankRemittance + summary: BankRemittance + version: 1.0.0 + moduleName: finance + sourceColumns: + - name: receiptnumber + label: reports.fin.erp.receiptnumber + type: string + source: finance-erp + total: false + - name: receiptdate + label: reports.fin.erp.receiptdate + type: string + source: finance-erp + total: false + - name: modeofpayment + label: reports.fin.erp.modeofpayment + type: string + source: finance-erp + total: false + - name: chequenumber + label: reports.fin.erp.chequenumber + type: string + source: finance-erp + total: false + - name: bankname + label: reports.fin.erp.bankname + type: string + source: finance-erp + total: false + - name: branchname + label: reports.fin.erp.branchname + type: string + source: finance-erp + total: false + - name: chequdate + label: reports.fin.erp.chequedate + type: string + source: finance-erp + total: false + - name: amount + label: reports.fin.erp.amount + type: number + source: finance-erp + total: true + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: false + searchClause: AND receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: false + searchClause: AND receiptdate <= $toDate + - name: dept + label: Department + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=common-masters&masterName=Department|$.MdmsRes.common-masters.Department[*].code|$.MdmsRes.common-masters.Department[*].name + source: finance-erp + wrapper: true + isMandatory: false + searchClause: AND rt.department = $dept + - name: service + label: Service + type: singlevaluelist + pattern: http://egov-common-masters:8080/egov-common-masters/businessDetails/_search?tenantId=$tenantid&active=true|$.BusinessDetails[*].code|$.BusinessDetails[*].name + source: finance-erp + wrapper: true + isMandatory: false + searchClause: AND rt.businessdetails = $service + - name: bankaccount + label: Bank Account + type: singlevaluelist + pattern: https://jalandhar-dev.egovernments.org/services/EGF/rest/bankaccount?tenantId=$tenantid|$.bankaccounts[*].code|$.bankaccounts[*].account + source: finance-erp + wrapper: true + isMandatory: false + searchClause: And ins.bankaccountid = $bankaccount + + query: select receiptnumber as receiptnumber , to_char(to_timestamp(receiptdate/1000),'DD/MM/YYYY') as receiptdate, instrumenttypeid as modeofpayment, transactionnumber as chequenumber, bankid as bankname, branchname branchname,amount as amount from egf_instrumentvoucher vh INNER JOIN egf_instrument ins on ins.id = vh.instrumentid INNER JOIN egcl_receiptheader rt on rt.id = vh.receiptheaderid WHERE rt.status = 'Remitted' diff --git a/configs/reports/configs/hrms-reports.yml b/configs/reports/configs/hrms-reports.yml new file mode 100644 index 00000000..c41187ca --- /dev/null +++ b/configs/reports/configs/hrms-reports.yml @@ -0,0 +1,85 @@ +--- +ReportDefinitions: +- reportName: HRMSEmployeewiseReport + decryptionPathId: TradeLicenseDetailsReport_v2 + summary: HRMS Employeewise Report + version: 1.0.0 + moduleName: rainmaker-hrms + sourceColumns: + - name: name + label: reports.hrms.name + type: string + source: hrms + total: false + - name: mobilenumber + label: reports.hrms.mobilenumber + type: string + source: hrms + total: false + - name: tenantid + label: reports.hrms.tenantid + type: string + source: hrms + total: false + - name: role_assigned + label: reports.hrms.role_assigned + type: string + source: hrms + total: false + - name: user_id + label: reports.hrms.user_id + type: string + source: hrms + total: false + - name: departmentname + label: report.hrms.departmentname + type: string + source: hrms + total: false + - name: designationname + label: reports.hrms.designationname + type: string + source: hrms + total: false + - name: status + label: reports.hrms.status + type: string + source: hrms + total: false + searchParams: + - name: ulb + label: ULB + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: pt + wrapper: true + isMandatory: false + searchClause: AND u.tenantId = $ulb + query: | + with userroles as + ( + select user_id,string_agg(role_code,',') as role_codes + from eg_userrole_v1 + group by user_id + ) + select + u.name, + u.mobilenumber, + u.tenantid, + r.role_codes as role_assigned, + e.code as user_id, + --assign.department, + --assign.designation, + msg.message as departmentname, + msg1.message as designationname, + case + when u.active='true' then 'Active' + when u.active='false' then 'Inactive' + end as status + from eg_user u + Left Outer join userroles r on u.id=r.user_id inner join eg_hrms_employee e on u.id=e.id + Left Outer join eg_hrms_assignment assign on e.uuid=assign.employeeid and assign.iscurrentassignment='true' + Left Outer join message as msg on msg.code=concat('COMMON_MASTERS_DEPARTMENT_',assign.department) and msg.locale='en_IN' + Left Outer join message as msg1 on msg1.code=concat('COMMON_MASTERS_DESIGNATION_',assign.designation) and msg1.locale='en_IN' + where u.type!='CITIZEN' + orderby: ORDER BY u.tenantId asc diff --git a/configs/reports/configs/inventoryReport.yml b/configs/reports/configs/inventoryReport.yml new file mode 100644 index 00000000..d04da1db --- /dev/null +++ b/configs/reports/configs/inventoryReport.yml @@ -0,0 +1,1090 @@ +--- +ReportDefinitions: + # Stock Opening Balance Report +- reportName: openingBalanceReport + summary: Stock Opening Balance Report + version: 1.0.0 + moduleName: inventory + externalService: + - entity: $.MdmsRes.inventory.Material + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=inventory&masterName=Material&tenantId=$tenantid + keyOrder: code,name,tenantId + tableName: tbl_material + - entity: $.MdmsRes.common-masters.Uom + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=common-masters&masterName=Uom&tenantId=$tenantid + keyOrder: code,conversionFactor,tenantId + tableName: tbl_uom + sourceColumns: + + - name: financialYear + label: inventory.financialYear + type: string + source: materialReceipt + + - name: storeName + label: inventory.store.name + type: string + source: materialReceipt + + - name: materialCode + label: inventory.material.code + type: string + source: materialReceipt + + - name: materialName + label: inventory.materialName + type: string + source: material + + - name: materialTypeName + label: inventory.material.materialtype + type: string + source: materialReceiptDetails + + - name: uom + label: reports.inventory.openbal.Uom + type: string + source: materialReceiptDetails + + - name: qty + label: reports.inventory.openbal.Qty. + type: string + source: materialReceiptDetails + + - name: rate + label: inventory.Rate + type: string + source: materialReceiptDetails + + - name: totalAmount + label: reports.inventory.openbal.TotalAmount + type: string + source: materialReceiptDetails + + - name: remarks + label: reports.inventory.openbal.Remarks + type: string + source: materialReceiptDetails + + searchParams: + - name: financialYear + label: inventory.financialYear + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$..finYearRange|$..finYearRange + source: materialReceipt + isMandatory: true + + - name: storeName + label: inventory.store.name + type: singlevaluelist + pattern: http://inventory-services:8080/inventory-services/stores/_search?active=true&tenantId=$tenantid|$..code|$..name + source: store + isMandatory: true + wrapper: true + + - name: materialTypeName + label: inventory.material.materialtype + type: singlevaluelist + pattern: 'list://OPENING BALANCE:OPENING BALANCE' + source: materialReceipt + isMandatory: false + searchClause: AND matrcpt.receiptType = $materialTypeName + + - name: materialName + label: inventory.materialName + type: string + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=inventory&masterName=Material&tenantId=$tenantid|$.MdmsRes.inventory.Material.*.code|$.MdmsRes.inventory.Material.*.name + source: materialReceipt + isMandatory: false + searchClause: AND mat.name = $materialName + query: SELECT matrcpt.financialyear AS financialyear, + store.name AS storeName, + matrcptdtl.material AS materialcode, + mat.name AS materialname, + matrcpt.receiptType AS materialtypename, + matrcptdtl.uomno AS uom, + (matrcptdtl.receivedqty / (SELECT CAST(conversionFactor AS bigint) FROM (values tbl_uom )AS tb (code,conversionFactor,tenantid) + WHERE tb.code = matrcptdtl.uomno AND tb.tenantid= $tenantid AND matrcptdtl.tenantid = $tenantid)) ::numeric(13,2) AS qty, + matrcptdtl.unitrate AS rate, + (matrcptdtl.unitrate * (matrcptdtl.receivedqty / (SELECT CAST(conversionFactor AS bigint) FROM (values tbl_uom )AS tb (code,conversionFactor,tenantid) + WHERE tb.code = matrcptdtl.uomno AND tb.tenantid= $tenantid AND matrcptdtl.tenantid = $tenantid))) ::numeric(13,2) AS totalamount, + matrcptdtl.remarks AS remarks + FROM materialreceipt matrcpt, + (VALUES tbl_material) AS mat (code, name, tenantid), + (VALUES tbl_uom) AS uomtbl (code,conversionFactor,tenantid), + materialreceiptdetail matrcptdtl , store store + WHERE matrcpt.financialyear = $financialYear + AND matrcpt.receivingstore = store.code + AND matrcpt.receivingstore = $storeName + AND store.tenantid = matrcpt.tenantid + AND mat.tenantid= matrcpt.tenantid + AND uomtbl.code=matrcptdtl.uomno + AND uomtbl.tenantid= store.tenantid + AND matrcpt.tenantid = matrcptdtl.tenantid + AND mat.tenantid = matrcpt.tenantid + AND matrcpt.tenantid = $tenantid + AND matrcpt.mrnnumber = matrcptdtl.mrnnumber + AND mat.code = matrcptdtl.material + +# Supplier Report +- reportName: supplierreport + summary: Supplier List + version: 1.0.0 + moduleName: inventory + sourceColumns: + - name: supplierCode + label: inventory.supplier.code + type: string + source: supplier + + - name: supplierType + label: inventory.supplier.type + type: string + source: supplier + + - name: supplierName + label: inventory.supplier.name + type: string + source: supplier + + - name: status + label: inventory.common.status + type: string + source: supplier + + - name: address + label: inventory.supplier.address + type: string + source: supplier + + - name: contactNo + label: inventory.common.contactNo + type: string + source: supplier + + - name: email + label: inventory.report.email + type: string + source: supplier + + - name: cstNo + label: inventory.common.cstno + type: string + source: supplier + + - name: bankName + label: inventory.common.bankname + type: string + source: supplier + + - name: bankBranch + label: inventory.common.bankbranchname + type: string + source: supplier + + - name: bankAcctNo + label: inventory.common.bankacctno + type: string + source: supplier + + - name: ifsc + label: inventory.common.ifsc + type: string + source: supplier + + - name: contactPerson + label: inventory.common.contactperson + type: string + source: supplier + + - name: contactPersonNo + label: inventory.common.contactpersonno + type: string + source: supplier + + query: SELECT supplier.code AS supplierCode, supplier.type AS supplierType, supplier.name AS supplierName, + supplier.status AS status, supplier.address AS address , supplier.contactno AS contactNo, + supplier.email AS email, supplier.cstno AS cstNo, + bank.name AS bankName, supplier.bankbranch AS bankBranch, supplier.bankacctno AS bankAcctNo, + supplier.bankifsc AS ifsc, supplier.contactperson AS contactPerson, + supplier.contactpersonno AS contactPersonNo + FROM supplier AS supplier, egf_bank bank + WHERE + bank.code = supplier.bankcode + AND bank.tenantid = supplier.tenantid + AND supplier.tenantid = $tenantid + ORDER BY supplier.name asc; + +# Material Returned Report +# Need to change drop down Link based on report and Query +- reportName: materialReturnedReport + summary: Material Returned Report + version: 1.0.0 + moduleName: inventory + sourceColumns: + + - name: materialReturnNo + label: inventory.materialReturnNo + type: string + source: inventory + + - name: returnDate + label: inventory.returnDate + type: string + source: inventory + + - name: supplierName + label: inventory.supplierName + type: epoch + source: inventory + + - name: materialCode + label: inventory.materialCode + type: string + source: inventory + + - name: materialName + label: inventory.materialName + type: string + source: inventory + + - name: returnedQty + label: inventory.returnedQty + type: string + source: inventory + + - name: uom + label: inventory.uom + type: string + source: inventory + + - name: unitRate + label: inventory.unitRate + type: string + source: inventory + + - name: totalReturnedAmount + label: inventory.totalReturnedAmount + type: string + source: inventory + + - name: returnRemarks + label: inventory.returnRemarks + type: string + source: inventory + + - name: returnBy + label: inventory.returnBy + type: string + source: inventory + + searchParams: + + - name: storeName + label: inventory.store.name + type: singlevaluelist + pattern: http://inventory-services:8080/inventory-services/stores/_search?active=true&tenantId=$tenantid|$..code|$..name + source: store + isMandatory: true + + - name: fromDate + label: inventory.fromDate + type: epoch + source: inventory + isMandatory: false + + - name: toDate + label: inventory.toDate + type: epoch + source: inventory + isMandatory: false + + - name: supplierName + label: inventory.supplierName + pattern: http://inventory-services:8080/inventory-services/suppliers/_search?tenantId=$tenantid|$..code|$..name + type: singlevaluelist + source: inventory + isMandatory: false + + - name: materialReturnNo + label: inventory.materialReturnNo + type: singlevaluelist + source: inventory + isMandatory: false + + - name: materialName + label: inventory.materialName + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=inventory&masterName=Material&tenantId=$tenantid|$.MdmsRes.inventory.Material.*.code|$.MdmsRes.inventory.Material.*.name + type: singlevaluelist + source: inventory + isMandatory: false + + query: SELECT * FROM material; + +# Disposal of Scrap Report +# Need to Change drop down Link based on report and Query +- reportName: disposalOfScrapReport + summary: Disposal of Scrap Report + version: 1.0.0 + moduleName: inventory + sourceColumns: + + - name: storeName + label: inventory.storeName + type: string + source: inventory + + - name: materialCode + label: inventory.materialCode + type: string + source: inventory + + - name: materialName + label: inventory.materialName + type: string + source: inventory + + - name: materialTypeName + label: inventory.materialTypeName + type: epoch + source: inventory + + - name: disposalNo + label: inventory.disposalNo + type: string + source: inventory + + - name: disposalDate + label: inventory.disposalDate + type: string + source: inventory + + - name: disposalQty + label: inventory.disposalQty + type: string + source: inventory + + - name: uom + label: inventory.uom + type: string + source: inventory + + - name: disposalValue + label: inventory.disposalValue + type: string + source: inventory + + - name: lotNo + label: inventory.lotNo + type: string + source: inventory + + - name: disposalBy + label: inventory.disposalBy + type: string + source: inventory + + - name: remarks + label: inventory.remarks + type: string + source: inventory + + searchParams: + + - name: storeName + label: inventory.store.name + type: singlevaluelist + pattern: http://inventory-services:8080/inventory-services/stores/_search?active=true&tenantId=$tenantid|$..code|$..name + source: store + isMandatory: true + + - name: disposalFromDate + label: inventory.disposalFromDate + type: epoch + source: inventory + isMandatory: false + + - name: toDate + label: inventory.toDate + type: epoch + source: inventory + isMandatory: false + + - name: materialtypename + label: inventory.materialtypename + type: singlevaluelist + source: inventory + isMandatory: false + + - name: disposalNo + label: inventory.disposalNo + type: singlevaluelist + source: inventory + isMandatory: false + + - name: materialName + label: inventory.materialName + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=inventory&masterName=Material&tenantId=$tenantid|$.MdmsRes.inventory.Material.*.code|$.MdmsRes.inventory.Material.*.name + type: singlevaluelist + source: inventory + isMandatory: false + + query: SELECT * FROM material; + +# Rates comparison with history data Report +- reportName: ratesComparisonWithHistory + summary: Rates comparison with history data + version: 1.0.0 + moduleName: inventory + externalService: + - entity: $.MdmsRes.inventory.Material + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=inventory&masterName=Material&tenantId=$tenantid + keyOrder: code,name,tenantId + tableName: tbl_material + sourceColumns: + + - name: materialCode + label: inventory.material.code + type: string + source: inventory + + - name: materialName + label: inventory.material.name + type: string + source: inventory + + - name: supplierName + label: inventory.supplierName + type: string + source: inventory + + - name: rateType + label: inventory.rateType + type: string + source: inventory + + - name: currentRate + label: inventory.currentRate + type: string + source: inventory + + - name: currentYear + label: inventory.currentYear + type: string + source: inventory + + - name: previousYear + label: inventory.previousYear + type: string + source: inventory + + searchParams: + - name: supplierName + label: inventory.supplierName + pattern: http://inventory-services:8080/inventory-services/suppliers/_search?tenantId=$tenantid|$..code|$..name + type: singlevaluelist + source: inventory + searchClause: AND pl.supplier = $supplierName + wrapper: true + isMandatory: false + + - name: materialName + label: inventory.materialName + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=inventory&masterName=Material&tenantId=$tenantid|$.MdmsRes.inventory.Material.*.code|$.MdmsRes.inventory.Material.*.name + type: singlevaluelist + source: inventory + searchClause: AND pld.material = $materialName + isMandatory: false + wrapper: true + + query: SELECT pld.material AS materialCode, + sup.name AS supplierName, + mat.name AS materialName, + pl.ratetype AS ratetype, + pld.ratePerUnit AS currentRate, + (SELECT count(*) FROM pricelistdetails WHERE material=pld.material AND pld.tenantid = $tenantid + AND fromdate::bigint >= (SELECT EXTRACT(EPOCH FROM timestamptz (CONCAT ((SELECT to_char(now(),'YYYY')),'-','01','-','01')))) + AND todate::bigint <= (SELECT EXTRACT(EPOCH FROM timestamptz (CONCAT ((SELECT to_char(now(),'YYYY')),'-','03','-','01'))))) AS currentYear, + (SELECT count(*) FROM pricelistdetails WHERE material=pld.material AND pricelistdetails.tenantid = $tenantid + AND fromdate::bigint >= (SELECT EXTRACT(EPOCH FROM timestamptz (CONCAT ((SELECT to_char(now()- interval '1 year','YYYY')),'-','01','-','01')))) + AND todate::bigint <= (SELECT EXTRACT(EPOCH FROM timestamptz (CONCAT ((SELECT to_char(now()- interval '1 year','YYYY')),'-','12','-','31'))))) AS previousYear + FROM pricelist pl,pricelistdetails pld,supplier sup,(VALUES tbl_material) AS mat (code, name, tenantid) + WHERE + pld.tenantid = sup.tenantid + AND sup.tenantid = pl.tenantid + AND pl.tenantid = $tenantid + AND mat.tenantid = pld.tenantid + AND pl.supplier = sup.code + AND pl.id = pld.pricelist + AND pld.deleted = false + AND mat.code = pld.material + +# Comparison between different rates Report +- reportName: comparisonBetweenDifferentRates + summary: Comparison between different rates + version: 1.0.0 + moduleName: inventory + externalService: + - entity: $.MdmsRes.inventory.Material + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=inventory&masterName=Material&tenantId=$tenantid + keyOrder: code,name,tenantId + tableName: tbl_material + sourceColumns: + + - name: materialCode + label: inventory.material.code + type: string + source: inventory + + - name: materialName + label: inventory.materialName + type: string + source: inventory + + - name: supplierName + label: inventory.supplierName + type: string + source: inventory + + - name: dtt + label: inventory.DTT + type: string + source: inventory + + - name: quotation + label: inventory.quotation + type: string + source: inventory + + - name: dgsnd + label: inventory.DGSND + type: string + source: inventory + + - name: tender + label: inventory.tender + type: string + source: inventory + + searchParams: + - name: supplierName + label: inventory.supplierName + pattern: http://inventory-services:8080/inventory-services/suppliers/_search?tenantId=$tenantid|$..code|$..name + type: singlevaluelist + source: inventory + searchClause: AND pl.supplier = $supplierName + wrapper: true + isMandatory: false + + - name: materialName + label: inventory.materialName + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=inventory&masterName=Material&tenantId=$tenantid|$.MdmsRes.inventory.Material.*.code|$.MdmsRes.inventory.Material.*.name + type: singlevaluelist + source: inventory + searchClause: AND pld.material = $materialName + isMandatory: false + wrapper: true + + + query: SELECT pld.material AS materialCode, + mat.name AS materialName, + sup.name AS supplierName, + ((SELECT ratePerUnit FROM pricelistdetails WHERE material=pld.material AND pl.rateType = 'Quotation' AND pld.tenantid = $tenantid + AND FROMdate::bigint <= (SELECT extract(epoch FROM now())*1000) AND todate::bigint >= (SELECT extract(epoch FROM now()))*1000) + ORDER BY createdtime desc limit 1) AS quotation, + ((SELECT ratePerUnit FROM pricelistdetails WHERE material=pld.material AND pl.rateType ='DGSC Rate Contract' AND pld.tenantid = $tenantid + AND FROMdate::bigint <= (SELECT extract(epoch FROM now())*1000) AND todate::bigint >= (SELECT extract(epoch FROM now()))*1000) + ORDER BY createdtime desc limit 1) AS dgsnd, + ((SELECT ratePerUnit FROM pricelistdetails WHERE material=pld.material AND pl.rateType = 'ULB Rate Contract' AND pld.tenantid = $tenantid + AND FROMdate::bigint <= (SELECT extract(epoch FROM now())*1000) AND todate::bigint >= (SELECT extract(epoch FROM now()))*1000) + ORDER BY createdtime desc limit 1) AS dtt, + ((SELECT ratePerUnit FROM pricelistdetails WHERE material=pld.material AND pl.rateType = 'One Time Tender' AND pld.tenantid = $tenantid + AND FROMdate::bigint <= (SELECT extract(epoch FROM now())*1000) AND todate::bigint >= (SELECT extract(epoch FROM now()))*1000) + ORDER BY createdtime desc limit 1) AS tender + FROM pricelistdetails pld, pricelist pl, (VALUES tbl_material) AS mat (code, name, tenantid) , supplier sup + WHERE pld.tenantid = $tenantid + AND pl.tenantid = pld.tenantid + AND sup.tenantid=pl.tenantId + AND mat.tenantid = pl.tenantid + AND mat.code = pld.material + AND sup.code = pl.supplier + AND pld.deleted = false + AND pld.pricelist = pl.id + +# Procurement Expenditure Report +# Need to Change drop down Link based on report and Query +- reportName: procurementExpenditureReport + summary: Procurement Expenditure Report + version: 1.0.0 + moduleName: inventory + sourceColumns: + + - name: budgetHeadCode + label: inventory.budgetHeadCode + type: string + source: inventory + + - name: nameOfBudgetHead + label: inventory.nameOfBudgetHead + type: string + source: inventory + + - name: estimateBudget + label: inventory.estimateBudget + type: string + source: inventory + + - name: actualExpenses + label: inventory.actualExpenses + type: string + source: inventory + + - name: remainingBudget + label: inventory.remainingBudget + type: string + source: inventory + + searchParams: + + - name: storeName + label: inventory.store.name + type: singlevaluelist + pattern: http://inventory-services:8080/inventory-services/stores/_search?active=true&tenantId=$tenantid|$..code|$..name + source: inventory + isMandatory: true + wrapper: true + + - name: financialYear + label: inventory.financialYear + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$..finYearRange|$..finYearRange + source: inventory + isMandatory: true + + - name: budgetHead + label: inventory.budgetHead + type: singlevaluelist + source: inventory + isMandatory: true + + query: SELECT * FROM material; + +# Supplier wise Purchase Order History Report +- reportName: SupplierwisesPurchaseOrderHistoryReport + summary: Supplier wise Purchase Order History + version: 1.0.0 + moduleName: inventory + sourceColumns: + + - name: supplierName + label: inventory.supplierName + type: string + source: inventory + + - name: supplierCompanyName + label: inventory.supplierCompanyName + type: string + source: inventory + + - name: poNo + label: inventory.poNo + type: string + source: inventory + + - name: poDate + label: inventory.poDate + type: epoch + source: inventory + + - name: poStatus + label: inventory.poStatus + type: string + source: inventory + + - name: expectedDeliveryDate + label: inventory.expecteddeliverydate + type: epoch + source: inventory + + - name: paymentDueDate + label: inventory.paymentDueDate + type: epoch + source: inventory + + - name: qtyOrdered + label: inventory.qtyOrdered + type: string + source: inventory + + - name: poTotal + label: inventory.poTotal + type: string + source: inventory + + - name: amountPaid + label: inventory.amountPaid + type: string + source: inventory + + - name: balanceDue + label: inventory.balanceDue + type: string + source: inventory + + searchParams: + + - name: supplierName + label: inventory.supplierName + pattern: http://inventory-services:8080/inventory-services/suppliers/_search?tenantId=$tenantid|$..code|$..name + type: singlevaluelist + source: inventory + searchClause: AND po.supplier = $supplierName + wrapper: true + isMandatory: false + + - name: supplierCompanyName + label: inventory.supplierCompanyName + pattern: http://inventory-services:8080/inventory-services/suppliers/_search?tenantId=$tenantid&type=COMPANY|$..code|$..name + type: singlevaluelist + source: inventory + searchClause: AND sup.name = $supplierCompanyName + isMandatory: false + + - name: storeName + label: inventory.store.name + pattern: http://inventory-services:8080/inventory-services/stores/_search?active=true&tenantId=$tenantid|$..code|$..name + type: singlevaluelist + searchClause: AND po.store = $storeName + source: inventory + isMandatory: false + wrapper: true + + - name: poNo + label: inventory.poNo + type: string + source: inventory + searchClause: AND po.purchaseordernumber = $poNo + isMandatory: false + + - name: poDate + label: inventory.poDate + type: epoch + source: inventory + searchClause: AND po.purchaseorderdate = $poDate + isMandatory: false + + query: SELECT sup.name AS suppliername, + (SELECT name FROM supplier WHERE type = 'COMPANY' AND tenantid =$tenantid) AS supplierCompanyName, + po.purchaseorderNumber AS PoNo, + po.purchaseorderdate AS PoDate, + po.status AS postatus, + po.expecteddeliverydate AS expecteddeliverydate, + pod.orderquantity AS qtyOrdered + FROM supplier sup,purchaseorder po,purchaseorderdetail pod + WHERE po.tenantid = $tenantid + AND pod.tenantid = po.tenantid + AND pod.tenantid = sup.tenantid + AND po.purchaseordernumber = pod.purchaseorder + AND po.supplier = sup.code + +# Material wise Purchase Order History Report +- reportName: MaterialwisePurchaseOrderHistoryReport + summary: Material wise Purchase Order History + version: 1.0.0 + moduleName: inventory + externalService: + - entity: $.MdmsRes.inventory.Material + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=inventory&masterName=Material&tenantId=$tenantid + keyOrder: code,name,tenantId,description + tableName: tbl_material + sourceColumns: + + - name: materialName + label: inventory.materialName + type: string + source: inventory + + - name: materialdescription + label: inventory.material.description + type: string + source: inventory + + - name: poNo + label: inventory.poNo + type: string + source: inventory + + - name: poDate + label: inventory.poDate + type: epoch + source: inventory + + - name: poStatus + label: inventory.poStatus + type: string + source: inventory + + - name: expectedDeliveryDate + label: inventory.expecteddeliverydate + type: epoch + source: inventory + + - name: paymentDueDate + label: inventory.paymentDueDate + type: epoch + source: inventory + + - name: qtyOrdered + label: inventory.qtyOrdered + type: string + source: inventory + + - name: poTotal + label: inventory.poTotal + type: string + source: inventory + + searchParams: + + - name: materialName + label: inventory.materialName + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=inventory&masterName=Material&tenantId=$tenantid + type: singlevaluelist + source: inventory + searchClause: AND pld.material = $materialName + wrapper: true + isMandatory: false + + - name: storeName + label: inventory.store.name + pattern: http://inventory-services:8080/inventory-services/stores/_search?active=true&tenantId=$tenantid|$..code|$..name + type: singlevaluelist + source: inventory + searchClause: AND po.store = $storeName + isMandatory: false + wrapper: true + + - name: poNo + label: inventory.poNo + type: string + source: inventory + searchClause: AND po.purchaseordernumber = $poNo + isMandatory: false + + - name: poDate + label: inventory.poDate + type: epoch + source: inventory + searchClause: AND po.purchaseorderdate = $poDate + isMandatory: false + + query: SELECT mat.name AS materialName, + mat .description AS materialdescription, + po.purchaseorderNumber AS PoNo, + po.purchaseorderdate AS PoDate, + po.status AS postatus, + po.expecteddeliverydate AS expecteddeliverydate, + pod.orderquantity AS qtyOrdered + FROM (VALUES tbl_material) AS mat (code, name, tenantid,description),purchaseorder po,purchaseorderdetail pod + WHERE po.tenantid = $tenantid + AND pod.tenantid = po.tenantid + AND pod.tenantid = mat.tenantid + AND po.purchaseordernumber = pod.purchaseorder + AND pod.material = mat.code + +# Inventory Register Report +- reportName: inventoryRegisterReport + summary: Inventory Register + version: 1.0.0 + moduleName: inventory + sourceColumns: + - name: storeName + label: inventory.store.name + type: string + source: inventory + + - name: deptName + label: inventory.deptName + type: string + source: inventory + + - name: materialName + label: inventory.materialName + type: string + source: material + + - name: supplierName + label: inventory.suppliername + type: string + source: inventory + + - name: qty + label: inventory.qty + type: string + source: inventory + + - name: uom + label: inventory.uom + type: string + source: inventory + + - name: unitRate + label: inventory.unitrate + type: string + source: inventory + + - name: totalAmount + label: inventory.totalAmount + type: string + source: inventory + + - name: receiptDate + label: inventory.date + type: string + source: inventory + + - name: transactionNumber + label: inventory.transactionnumber + type: string + source: inventory + + - name: receiptType + label: inventory.receiptType + type: string + source: inventory + + searchParams: + - name: storeName + label: inventory.store.name + type: singlevaluelist + pattern: http://inventory-services:8080/inventory-services/stores/_search?active=true&tenantId=$tenantid|$..code|$..name + source: store + searchClause: AND store.code = $storeName + isMandatory: true + wrapper: true + + - name: materialName + label: inventory.materialName + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=inventory&masterName=Material&tenantId=$tenantid|$.MdmsRes.inventory.Material.*.code|$.MdmsRes.inventory.Material.*.name + source: materialReceipt + isMandatory: false + query: select store.name as storeName,store.department as deptName, + sup.name as supplierName, + detail.receivedqty as qty,detail.uomno as uom,detail.unitrate as unitRate, + (detail.receivedqty * detail.unitrate) as totalAmount, + (select to_date(to_char(to_timestamp(Trunc(CAST(mat.receiptdate as bigint)/1000 )), 'YYYY/MM/DD'), 'YYYY-MM-DD')) as receiptDate, + detail.mrnnumber as transactionNumber,mat.receipttype as receipttype + from materialreceiptdetail detail,materialreceipt mat,store store,supplier sup + where detail.tenantid=$tenantid + AND mat.tenantid=detail.tenantid + AND store.tenantid=mat.tenantid + AND sup.tenantid= store.tenantid + AND mat.suppliercode =sup.code + AND mat.receivingstore=store.code + AND mat.mrnnumber=detail.mrnnumber + +# Need to add query +# Stock Aging Report +- reportName: stockAgingReport + summary: Stock Aging Report + version: 1.0.0 + moduleName: inventory + sourceColumns: + - name: materialCode + label: inventory.materialcode + type: string + source: inventory + + - name: materialName + label: inventory.materialName + type: string + source: inventory + + - name: materialTypeName + label: inventory.materialTypeName + type: string + source: material + + - name: lotNo + label: inventory.lotNo + type: string + source: inventory + + - name: qtyFrom0to90Days + label: inventory.qtyFrom0to90Days + type: string + source: inventory + + - name: stockValueFrom0to90Days + label: inventory.stockValueFrom0to90Days + type: string + source: inventory + + - name: qtyFrom91to180Days + label: inventory.qtyFrom91to180Days + type: string + source: inventory + + - name: stockValueFrom91to180Days + label: inventory.stockValueFrom91to180Days + type: string + source: inventory + + - name: qtyFrom181DaysAndAbove + label: inventory.qtyFrom181DaysAndAbove + type: string + source: inventory + + - name: stockValueFrom181DaysAndAbove + label: inventory.stockValueFrom181DaysAndAbove + type: string + source: inventory + + - name: totalQty + label: inventory.totalQty + type: string + source: inventory + + - name: totalStockValue + label: inventory.totalStockValue + type: string + source: inventory + + searchParams: + - name: storeName + label: inventory.store.name + type: singlevaluelist + pattern: http://inventory-services:8080/inventory-services/stores/_search?active=true&tenantId=$tenantid|$..code|$..name + source: store + searchClause: AND store.code = $storeName + isMandatory: true + wrapper: true + + - name: materialTypeName + label: inventory.materialTypeName + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=inventory&masterName=MaterialType&tenantId=$tenantid|$.MdmsRes.inventory.Material.*.code|$.MdmsRes.inventory.Material.*.name + source: materialReceipt + isMandatory: false + + - name: materialName + label: inventory.materialName + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=inventory&masterName=Material&tenantId=$tenantid|$.MdmsRes.inventory.Material.*.code|$.MdmsRes.inventory.Material.*.name + source: materialReceipt + isMandatory: false + + - name: asOnDate + label: inventory.asOnDate + type: epoch + source: inventory + isMandatory: true + query: + + + + + + + diff --git a/configs/reports/configs/lcms-reports.yml b/configs/reports/configs/lcms-reports.yml new file mode 100644 index 00000000..ed7a3602 --- /dev/null +++ b/configs/reports/configs/lcms-reports.yml @@ -0,0 +1,891 @@ +--- +ReportDefinitions: +- reportName: CaseRegisterReport + summary: Case Register Report + version: 1.0.0 + moduleName: lcms + selectiveDownload: true + externalService: + - entity: $.MdmsRes.lcms.court + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=lcms&masterName=court&tenantId=$tenantid + keyOrder: code,name + tableName: tbl_court + sourceColumns: + - name: caseno + label: reports.lcms.caseNo + type: string + source: lcms + showColumn: true + - name: plantiffname + label: reports.lcms.nameOfPlaintiff + type: string + source: lcms + showColumn: true + - name: defendant + label: reports.lcms.nameOfDefendant + type: string + source: lcms + showColumn: true + - name: pleaderengagementdetails + label: reports.lcms.amountOfPleadersEngaged + type: string + source: lcms + showColumn: false + - name: sectionapplied + label: reports.lcms.sectionApplied + type: string + source: lcms + showColumn: false + - name: receiptdate + label: reports.lcms.dateOfReceiptOfOfficer + type: epoch + source: lcms + showColumn: false + - name: summondate + label: reports.lcms.dateOfSummon + type: epoch + source: lcms + showColumn: false + - name: resolutiondetails + label: reports.lcms.resolutionOfMunicipalDate + type: string + source: lcms + showColumn: false + - name: pleaderfee + label: reports.lcms.particularsOfPleadersFee + type: string + source: lcms + showColumn: false + - name: vakalatnamagenerationdate + label: reports.lcms.dateOfProductionOfVakalatnama + type: epoch + source: lcms + showColumn: false + - name: courtname + label: reports.lcms.suitFiledCourtName + type: string + source: lcms + showColumn: true + - name: departmentperson + label: reports.lcms.nameOfResponsibleOfficer + type: string + source: lcms + showColumn: false + - name: judgementdate + label: reports.lcms.dateOfJudgment + type: epoch + source: lcms + showColumn: false + - name: casejudgement + label: reports.lcms.judgmentDetails + type: string + source: lcms + showColumn: false + - name: advocateopinion + label: reports.lcms.opinionOfPleader + type: string + source: lcms + showColumn: false + - name: furtherprocessdetails + label: reports.lcms.furtherProcessDetails + type: string + source: lcms + showColumn: false + - name: particularsamount + label: reports.lcms.particularsOfActualAmount + type: string + source: lcms + showColumn: false + - name: voucherdate + label: reports.lcms.dateOfCredit + type: epoch + source: lcms + showColumn: false + - name: paymentdetails + label: reports.lcms.particularsOfPayment + type: string + source: lcms + showColumn: false + - name: voucherdate + label: reports.lcms.dateOfDebit + type: epoch + source: lcms + showColumn: false + - name: verificationremarks + label: reports.lcms.remarksRegardingReferenceToCourt + type: string + source: lcms + showColumn: false + - name: remarks + label: reports.lcms.remarks + type: string + source: lcms + showColumn: false + searchParams: + - name: fromDate + label: reports.lcms.fromDate + type: epoch + source: lcms + isMandatory: true + - name: toDate + label: reports.lcms.toDate + type: epoch + source: lcms + isMandatory: true + - name: caseNo + label: reports.lcms.caseNo + type: string + isMandatory: false + source: lcms + searchClause : AND upper(lc.caseno) = upper($caseNo) + - name: lcNumber + label: reports.lcms.lcNumber + type: string + isMandatory: false + source: lcms + searchClause : AND upper(lc.summonreferenceno) = upper($lcNumber) + - name: caseTitle + label: reports.lcms.caseTitle + type: string + isMandatory: false + source: lcms + searchClause : AND upper(lc.casedetails) = upper($caseTitle) + - name: courtName + label: reports.lcms.courtName + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=lcms&masterName=court|$..code|$..name + source: lcms + wrapper: true + isMandatory: false + searchClause : AND lc.courtname ->> 'code' = $courtName + - name: plaintiff + label: reports.lcms.plaintiff + type: string + isMandatory: false + source: lcms + searchClause : AND upper(lc.plantiffname) = upper($plaintiff) + - name: defendant + label: reports.lcms.defendant + type: string + isMandatory: false + source: lcms + searchClause : AND upper(lc.defendant) = upper($defendant) + - name: department + label: reports.lcms.department + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=common-masters&masterName=Department|$..code|$..name + source: lcms + wrapper: true + isMandatory: false + searchClause : AND lc.departmentname ->> 'code' = $department + - name: caseStatus + label: reports.lcms.caseStatus + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=lcms&masterName=caseStatus|$..code|$..name + source: lcms + wrapper: true + isMandatory: false + searchClause : AND lc.casestatus ->> 'code' = $caseStatus + query: select lc.caseno, lc.plantiffname, lc.defendant, lc.pleaderengagementdetails ,lc.sectionapplied, lc.summondate, CONCAT(lc.resloution, ', ', lc.resloutiondate) AS resolutiondetails, lc.vakalatnamagenerationdate, (select name from (VALUES tbl_court) as court (code,name) where court.code=lc.courtname::jsonb ->> 'code')as courtname, lc.departmentperson, lhd.judgementdate, lhd.casejudgement, lhd.advocateopinion, lhd.furtherprocessdetails, lc.remarks from egov_lcms_case lc LEFT OUTER JOIN egov_lcms_hearing_details as lhd ON (lc.code = lhd.casecode AND lhd.casestatus ->> 'code'= 'FO') WHERE lc.caseregistrationdate>=$fromDate and lc.caseregistrationdate<=$toDate AND lc.tenantid=$tenantid +- reportName: CaseSummaryReport + summary: Case Summary Report + version: 1.0.0 + moduleName: lcms + selectiveDownload: true + externalService: + - entity: $.MdmsRes.lcms.caseType + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=lcms&masterName=caseType&tenantId=$tenantid + keyOrder: code,name + tableName: tbl_casetype + - entity: $.MdmsRes.lcms.court + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=lcms&masterName=court&tenantId=$tenantid + keyOrder: code,name + tableName: tbl_court + - entity: $.MdmsRes.lcms.caseStatus + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=lcms&masterName=caseStatus&tenantId=$tenantid + keyOrder: code,name + tableName: tbl_casestatus + - entity: $.MdmsRes.common-masters.Department + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=common-masters&masterName=Department&tenantId=$tenantid + keyOrder: code,name + tableName: tbl_department + sourceColumns: + - name: caseno + label: reports.lcms.caseNo + type: string + source: lcms + showColumn: true + - name: department + label: reports.lcms.department + type: string + source: lcms + showColumn: false + - name: casetype + label: reports.lcms.caseType + type: string + source: lcms + showColumn: false + - name: plantiffname + label: reports.lcms.plaintiff + type: string + source: lcms + showColumn: true + - name: defendant + label: reports.lcms.defendant + type: string + source: lcms + showColumn: true + - name: courtname + label: reports.lcms.courtName + type: string + source: lcms + showColumn: true + - name: advocate + label: reports.lcms.advocateName + type: string + source: lcms + showColumn: false + - name: casestatus + label: reports.lcms.status + type: string + source: lcms + showColumn: false + searchParams: + - name: fromDate + label: reports.lcms.fromDate + type: epoch + source: lcms + isMandatory: true + - name: toDate + label: reports.lcms.toDate + type: epoch + source: lcms + isMandatory: true + - name: caseNo + label: reports.lcms.caseNo + type: string + isMandatory: false + source: lcms + searchClause : AND lc.caseno=$caseNo + - name: department + label: reports.lcms.department + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=common-masters&masterName=Department|$..code|$..name + source: lcms + wrapper: true + isMandatory: false + searchClause : AND lc.departmentname ->> 'code' = $department + - name: advocate + label: reports.lcms.advocate + type: singlevaluelist + pattern: http://lcms-services:8080/lcms-services/legalcase/advocate/_search?tenantId=$tenantid&pageSize=500|$..code|$..name + source: lcms + searchClause : AND position($advocate in tempadvocate.advocatecode) > 0 + isMandatory: false + - name: courtName + label: reports.lcms.courtName + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=lcms&masterName=court|$..code|$..name + source: lcms + wrapper: true + isMandatory: false + searchClause : AND lc.courtname ->> 'code' = $courtName + - name: plaintiff + label: reports.lcms.plaintiff + type: string + isMandatory: false + source: lcms + searchClause : AND lc.plantiffname = $plaintiff + - name: defendant + label: reports.lcms.defendant + type: string + isMandatory: false + source: lcms + searchClause : AND lc.defendant = $defendant + query: select lc.caseno, (select name from (VALUES tbl_department) as departmentdata (code,name) where departmentdata.code= lc.departmentname->>'code')as department, (select name from (VALUES tbl_casetype) as casetype (code,name) where casetype.code=lc.casetype::jsonb ->> 'code') as casetype, lc.plantiffName, lc.defendant, (select name from (VALUES tbl_court) as court (code,name) where court.code=lc.courtname::jsonb ->> 'code') as courtname, tempadvocate.advocatename as advocate,(select name from (VALUES tbl_casestatus) as casestatus (code,name) where casestatus.code=lc.casestatus::jsonb ->> 'code') as casestatus from egov_lcms_case as lc left outer join + (select lca.casecode as casecode, string_agg(la.name,',') as advocatename,string_agg(la.code,',') as advocatecode from egov_lcms_case_advocate as lca inner join egov_lcms_advocate as la on la.code=lca.advocate->>'code' where lca.tenantid=$tenantid group by lca.casecode) as tempadvocate on lc.code=tempadvocate.casecode WHERE lc.caseregistrationdate>=$fromDate and lc.caseregistrationdate<=$toDate and lc.tenantid=$tenantid + +- reportName: CaseDetailReport + summary: Case Detail Report + version: 1.0.0 + moduleName: lcms + selectiveDownload: true + externalService: + - entity: $.MdmsRes.lcms.court + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=lcms&masterName=court&tenantId=$tenantid + keyOrder: code,name,type + tableName: tbl_court + - entity: $.MdmsRes.lcms.caseCategory + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=lcms&masterName=caseCategory&tenantId=$tenantid + keyOrder: code,name + tableName: tbl_casecategory + - entity: $.MdmsRes.lcms.caseStatus + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=lcms&masterName=caseStatus&tenantId=$tenantid + keyOrder: code,name + tableName: tbl_casestatus + - entity: $.MdmsRes.common-masters.Department + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=common-masters&masterName=Department&tenantId=$tenantid + keyOrder: code,name + tableName: tbl_department + + sourceColumns: + - name: caseno + label: reports.lcms.caseNo + type: string + source: lcms + showColumn: false + - name: courtname + label: reports.lcms.courtName + type: string + source: lcms + showColumn: true + - name: courttype + label: reports.lcms.courtType + type: string + source: lcms + showColumn: false + - name: department + label: reports.lcms.department + type: string + source: lcms + showColumn: false + - name: casecategory + label: reports.lcms.caseCategory + type: string + source: lcms + showColumn: false + - name: sectionapplied + label: reports.lcms.sectionNo + type: string + source: lcms + showColumn: false + - name: advocate + label: reports.lcms.advocateName + type: string + source: lcms + showColumn: false + - name: plantiffname + label: reports.lcms.petitionName + type: string + source: lcms + showColumn: true + - name: defendant + label: reports.lcms.defendant + type: string + source: lcms + showColumn: true + - name: casestatus + label: reports.lcms.caseStatus + type: string + source: lcms + showColumn: true + searchParams: + - name: fromDate + label: reports.lcms.fromDate + type: epoch + source: lcms + isMandatory: true + - name: toDate + label: reports.lcms.toDate + type: epoch + source: lcms + isMandatory: true + - name: caseStatus + label: reports.lcms.caseStatus + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=lcms&masterName=caseStatus|$..code|$..name + source: lcms + wrapper: true + isMandatory: false + searchClause : AND lc.casestatus ->> 'code'= $caseStatus + - name: sectionNo + label: reports.lcms.sectionNo + type: string + isMandatory: false + source: lcms + searchClause : AND lc.sectionapplied=$sectionNo + - name: advocate + label: reports.lcms.advocate + type: singlevaluelist + pattern: http://lcms-services:8080/lcms-services/legalcase/advocate/_search?tenantId=$tenantid&pageSize=500|$..code|$..name + source: lcms + isMandatory: false + searchClause : AND position($advocate in tempadvocate.advocatecode) > 0 + - name: courtName + label: reports.lcms.courtName + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=lcms&masterName=court|$..code|$..name + source: lcms + wrapper: true + isMandatory: false + searchClause : AND lc.courtname ->> 'code' = $courtName + - name: plaintiff + label: reports.lcms.plaintiff + type: string + isMandatory: false + source: lcms + searchClause : AND lc.plantiffname = $plaintiff + - name: defendant + label: reports.lcms.defendant + type: string + isMandatory: false + source: lcms + searchClause : AND lc.defendant = $defendant + - name: caseCategory + label: reports.lcms.caseCategory + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=lcms&masterName=caseCategory|$..code|$..name + source: lcms + wrapper: true + isMandatory: false + searchClause : AND lc.casecategory ->> 'code' = $caseCategory + - name: department + label: reports.lcms.department + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=common-masters&masterName=Department|$..code|$..name + source: lcms + wrapper: true + isMandatory: false + searchClause : AND lc.departmentname ->> 'code' = $department + - name: caseType + label: reports.lcms.caseType + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=lcms&masterName=caseType|$..code|$..name + source: lcms + wrapper: true + isMandatory: false + searchClause : AND lc.casetype ->> 'code' = $caseType + query: select lc.caseno, (select name from (VALUES tbl_court) as court (code,name,type) where court.code=lc.courtname::jsonb ->> 'code') as courtname, (select type from (VALUES tbl_court) as court (code,name,type) where court.code=lc.courtname::jsonb ->> 'code') as courttype, (select name from (VALUES tbl_department) as departmentdata (code,name) where departmentdata.code= lc.departmentname->>'code')as department, (select name from (VALUES tbl_casecategory) as caseCategory (code,name) where caseCategory.code=lc.casecategory::jsonb ->> 'code') as casecategory, lc.sectionapplied, tempadvocate.advocatename as advocate, lc.plantiffName,lc.defendant, (select name from (VALUES tbl_casestatus) as caseStatus (code,name) where caseStatus.code=lc.casestatus::jsonb ->> 'code') as casestatus from egov_lcms_case as lc left outer join + (select lca.casecode as casecode, string_agg(la.name,',') as advocatename,string_agg(la.code,',') as advocatecode from egov_lcms_case_advocate as lca inner join egov_lcms_advocate as la on la.code=lca.advocate->>'code' where lca.tenantid=$tenantid group by lca.casecode) as tempadvocate on lc.code=tempadvocate.casecode WHERE lc.caseregistrationdate>=$fromDate and lc.caseregistrationdate<=$toDate and lc.tenantid=$tenantid +- reportName: CaseHistoryReport + summary: Case History Report + version: 1.0.0 + moduleName: lcms + selectiveDownload: true + externalService: + - entity: $.MdmsRes.lcms.caseType + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=lcms&masterName=caseType&tenantId=$tenantid + keyOrder: code,name + tableName: tbl_casetype + - entity: $.MdmsRes.lcms.court + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=lcms&masterName=court&tenantId=$tenantid + keyOrder: code,name + tableName: tbl_court + - entity: $.MdmsRes.lcms.caseStatus + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=lcms&masterName=caseStatus&tenantId=$tenantid + keyOrder: code,name + tableName: tbl_casestatus + - entity: $.MdmsRes.common-masters.Department + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=common-masters&masterName=Department&tenantId=$tenantid + keyOrder: code,name + tableName: tbl_department + sourceColumns: + - name: caseno + label: reports.lcms.caseNo + type: string + source: lcms + showColumn: true + - name: summondate + label: reports.lcms.caseDate + type: epoch + source: lcms + showColumn: false + - name: courtname + label: reports.lcms.courtName + type: string + source: lcms + showColumn: true + - name: casetype + label: reports.lcms.caseType + type: string + source: lcms + showColumn: true + - name: department + label: reports.lcms.department + type: string + source: lcms + showColumn: false + - name: advocate + label: reports.lcms.advocateName + type: string + source: lcms + showColumn: true + - name: plantiffname + label: reports.lcms.plaintiff + type: string + source: lcms + showColumn: false + - name: defendant + label: reports.lcms.defendant + type: string + source: lcms + showColumn: false + - name: hearingdate + label: reports.lcms.hearingDate + type: epoch + source: lcms + showColumn: false + - name: casestatus + label: reports.lcms.status + type: string + source: lcms + showColumn: false + searchParams: + - name: fromDate + label: reports.lcms.fromDate + type: epoch + source: lcms + isMandatory: true + - name: toDate + label: reports.lcms.toDate + type: epoch + source: lcms + isMandatory: true + + - name: oragnization + label: reports.lcms.organization + type: singlevaluelist + pattern: http://lcms-services:8080/lcms-services/legalcase/advocate/agency/_search?tenantId=$tenantid&pageSize=500|$.agencies[*].name|$.agencies[*].name + source: lcms + isMandatory: false + + - name: advocatename + label: reports.lcms.advocate + type: url + pattern: /lcms-services/legalcase/advocate/agency/_search?tenantId=$tenantid&agencyName={oragnization}&pageSize=500|$.agencies[*].advocates[*].code|$.agencies[*].advocates[*].name + source: lcms + isMandatory: false + searchClause : AND position($advocatename in tempadvocate.advocatecode) > 0 + + - name: department + label: reports.lcms.department + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=common-masters&masterName=Department|$..code|$..name + source: lcms + wrapper: true + isMandatory: false + searchClause : AND lc.departmentname ->> 'code' = $department + - name: caseType + label: reports.lcms.caseType + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=lcms&masterName=caseType|$..code|$..name + source: lcms + wrapper: true + isMandatory: false + searchClause : AND lc.casetype ->> 'code' = $caseType + - name: courtName + label: reports.lcms.courtName + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=lcms&masterName=court|$..code|$..name + source: lcms + wrapper: true + isMandatory: false + searchClause : AND lc.courtname ->> 'code' = $courtName + + - name: caseStatus + label: reports.lcms.caseStatus + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=lcms&masterName=caseStatus|$..code|$..name + source: lcms + wrapper: true + isMandatory: false + searchClause : AND lc.casestatus ->> 'code'= $caseStatus + query: select lc.caseno, lc.summondate, (select name from (VALUES tbl_court) as court (code,name) where court.code=lc.courtname::jsonb ->> 'code') as courtname, (select name from (VALUES tbl_casetype) as caseType (code,name) where caseType.code=lc.casetype::jsonb ->> 'code') as casetype, tempadvocate.advocatename as advocate, (select name from (VALUES tbl_department) as departmentdata (code,name) where departmentdata.code= lc.departmentname->>'code')as department, lc.plantiffName, lc.defendant, lc.hearingdate, (select name from (VALUES tbl_casestatus) as caseStatus (code,name) where caseStatus.code=lc.casestatus::jsonb ->> 'code') as casestatus from egov_lcms_case as lc left outer join (select lca.casecode as casecode, string_agg(la.name,',') as advocatename,string_agg(la.code,',') as advocatecode from egov_lcms_case_advocate as lca inner join egov_lcms_advocate as la on la.code=lca.advocate->>'code' where lca.tenantid=$tenantid group by lca.casecode) as tempadvocate on lc.code=tempadvocate.casecode WHERE lc.caseregistrationdate>=$fromDate and lc.caseregistrationdate<=$toDate +- reportName: CasePendencyReport + summary: Case Pendency Report + version: 1.0.0 + moduleName: lcms + selectiveDownload: true + externalService: + - entity: $.MdmsRes.lcms.caseType + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=lcms&masterName=caseType&tenantId=$tenantid + keyOrder: code,name + tableName: tbl_casetype + - entity: $.MdmsRes.lcms.court + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=lcms&masterName=court&tenantId=$tenantid + keyOrder: code,name + tableName: tbl_court + - entity: $.MdmsRes.lcms.caseStatus + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=lcms&masterName=caseStatus&tenantId=$tenantid + keyOrder: code,name + tableName: tbl_casestatus + - entity: $.MdmsRes.common-masters.Department + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=common-masters&masterName=Department&tenantId=$tenantid + keyOrder: code,name + tableName: tbl_department + sourceColumns: + - name: caseno + label: reports.lcms.caseNo + type: string + source: lcms + showColumn: true + - name: advocate + label: reports.lcms.advocateName + type: string + source: lcms + showColumn: true + - name: department + label: reports.lcms.department + type: string + source: lcms + showColumn: true + - name: courtname + label: reports.lcms.courtName + type: string + source: lcms + showColumn: false + - name: casetype + label: reports.lcms.caseType + type: string + source: lcms + showColumn: true + - name: plantiffname + label: reports.lcms.plaintiff + type: string + source: lcms + showColumn: false + - name: defendant + label: reports.lcms.defendant + type: string + source: lcms + showColumn: false + - name: casejudgement + label: reports.lcms.hearingDetails + type: string + source: lcms + showColumn: false + - name: casestatus + label: reports.lcms.caseStatus + type: string + source: lcms + showColumn: false + searchParams: + - name: fromDate + label: reports.lcms.fromDate + type: epoch + source: lcms + isMandatory: true + - name: toDate + label: reports.lcms.toDate + type: epoch + source: lcms + isMandatory: true + - name: department + label: reports.lcms.department + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=common-masters&masterName=Department|$..code|$..name + source: lcms + wrapper: true + isMandatory: false + searchClause : AND lc.departmentname ->> 'code' = $department + - name: advocate + label: reports.lcms.advocate + type: singlevaluelist + pattern: http://lcms-services:8080/lcms-services/legalcase/advocate/_search?tenantId=$tenantid&pageSize=500|$..code|$..name + source: lcms + isMandatory: false + searchClause : AND position($advocate in tempadvocate.advocatecode) > 0 + query: select lc.caseno, tempadvocate.advocatename as advocate, (select name from (VALUES tbl_department) as departmentdata (code,name) where departmentdata.code= lc.departmentname->>'code')as department, (select name from (VALUES tbl_court) as court (code,name) where court.code=lc.courtname::jsonb ->> 'code') as courtname, (select name from (VALUES tbl_casetype) as caseType (code,name) where caseType.code=lc.casetype::jsonb ->> 'code') as casetype, lc.plantiffName, lc.defendant, (select casejudgement from egov_lcms_hearing_details as lhd where lhd.casestatus->>'code'=lc.casestatus->>'code' and lhd.casecode=lc.code order by createdtime desc limit 1 ) as casejudgement, (select name from (VALUES tbl_casestatus) as caseStatus (code,name) where caseStatus.code=lc.casestatus::jsonb ->> 'code') as casestatus from egov_lcms_case as lc left outer join (select lca.casecode as casecode, string_agg(la.name,',') as advocatename,string_agg(la.code,',') as advocatecode from egov_lcms_case_advocate as lca inner join egov_lcms_advocate as la on la.code=lca.advocate->>'code' where lca.tenantid=$tenantid group by lca.casecode) as tempadvocate on lc.code=tempadvocate.casecode WHERE lc.caseregistrationdate>=$fromDate and lc.caseregistrationdate<=$toDate and lc.tenantid=$tenantid +- reportName: CaseStatusReport + summary: Case Status Report + version: 1.0.0 + moduleName: lcms + selectiveDownload: true + externalService: + - entity: $.MdmsRes.lcms.caseType + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=lcms&masterName=caseType&tenantId=$tenantid + keyOrder: code,name + tableName: tbl_casetype + - entity: $.MdmsRes.lcms.court + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=lcms&masterName=court&tenantId=$tenantid + keyOrder: code,name + tableName: tbl_court + - entity: $.MdmsRes.lcms.caseStatus + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=lcms&masterName=caseStatus&tenantId=$tenantid + keyOrder: code,name + tableName: tbl_casestatus + - entity: $.MdmsRes.common-masters.Department + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=common-masters&masterName=Department&tenantId=$tenantid + keyOrder: code,name + tableName: tbl_department + + sourceColumns: + - name: caseno + label: reports.lcms.caseNo + type: string + source: lcms + showColumn: true + - name: advocate + label: reports.lcms.advocateName + type: string + source: lcms + showColumn: true + - name: department + label: reports.lcms.department + type: string + source: lcms + showColumn: false + - name: courtname + label: reports.lcms.courtName + type: string + source: lcms + showColumn: false + - name: casetype + label: reports.lcms.caseType + type: string + source: lcms + showColumn: true + - name: plantiffname + label: reports.lcms.plaintiff + type: string + source: lcms + showColumn: false + - name: defendant + label: reports.lcms.defendant + type: string + source: lcms + showColumn: false + - name: casejudgement + label: reports.lcms.hearingDetails + type: string + source: lcms + showColumn: false + - name: casestatus + label: reports.lcms.status + type: string + source: lcms + showColumn: true + searchParams: + - name: fromDate + label: reports.lcms.fromDate + type: epoch + source: lcms + isMandatory: true + - name: toDate + label: reports.lcms.toDate + type: epoch + source: lcms + isMandatory: true + - name: caseStatus + label: reports.lcms.caseStatus + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=lcms&masterName=caseStatus|$..code|$..name + source: lcms + wrapper: true + isMandatory: false + searchClause : AND lc.casestatus ->> 'code'= $caseStatus + query: select lc.caseno, (select string_agg(name, ', ') from egov_lcms_advocate where code in( select advocate->>'code' from egov_lcms_case_advocate where casecode=lc.code)) as advocate, (select name from (VALUES tbl_department) as departmentdata (code,name) where departmentdata.code= lc.departmentname->>'code')as department,(select name from (VALUES tbl_court) as court (code,name) where court.code=lc.courtname::jsonb ->> 'code') as courtname, (select name from (VALUES tbl_casetype) as caseType (code,name) where caseType.code=lc.casetype::jsonb ->> 'code') as casetype, lc.plantiffName, lc.defendant,(select casejudgement from egov_lcms_hearing_details as lhd where lhd.casestatus->>'code'=lc.casestatus->>'code' and lhd.casecode=lc.code order by createdtime desc limit 1) as casejudgement, (select name from (VALUES tbl_casestatus) as caseStatus (code,name) where caseStatus.code=lc.casestatus::jsonb ->> 'code') as casestatus from egov_lcms_case as lc WHERE lc.caseregistrationdate>=$fromDate and lc.caseregistrationdate<=$toDate and lc.tenantid=$tenantid +- reportName: DueDateReport + summary: Due Date Report + version: 1.0.0 + moduleName: lcms + selectiveDownload: true + externalService: + - entity: $.MdmsRes.lcms.caseType + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=lcms&masterName=caseType&tenantId=$tenantid + keyOrder: code,name + tableName: tbl_casetype + - entity: $.MdmsRes.lcms.court + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=lcms&masterName=court&tenantId=$tenantid + keyOrder: code,name + tableName: tbl_court + - entity: $.MdmsRes.lcms.caseStatus + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=lcms&masterName=caseStatus&tenantId=$tenantid + keyOrder: code,name + tableName: tbl_casestatus + - entity: $.MdmsRes.common-masters.Department + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=common-masters&masterName=Department&tenantId=$tenantid + keyOrder: code,name + tableName: tbl_department + sourceColumns: + - name: caseno + label: reports.lcms.caseNo + type: string + source: lcms + showColumn: true + - name: courtname + label: reports.lcms.courtName + type: string + source: lcms + showColumn: false + - name: casetype + label: reports.lcms.caseType + type: string + source: lcms + showColumn: true + - name: department + label: reports.lcms.department + type: string + source: lcms + showColumn: false + - name: departmentperson + label: reports.lcms.concernedPersonName + type: string + source: lcms + showColumn: false + - name: advocate + label: reports.lcms.advocateName + type: string + source: lcms + showColumn: true + - name: plantiffname + label: reports.lcms.plaintiff + type: string + source: lcms + showColumn: false + - name: defendant + label: reports.lcms.defendant + type: string + source: lcms + showColumn: false + - name: casestatus + label: reports.lcms.caseStatus + type: string + source: lcms + showColumn: true + - name: hearingdate + label: reports.lcms.hearingDetailsDateAndTime + type: epoch + source: lcms + showColumn: false + searchParams: + - name: fromDate + label: reports.lcms.fromDate + type: epoch + source: lcms + isMandatory: true + - name: toDate + label: reports.lcms.toDate + type: epoch + source: lcms + isMandatory: true + - name: department + label: reports.lcms.department + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=common-masters&masterName=Department|$..code|$..name + source: lcms + wrapper: true + isMandatory: false + searchClause : AND lc.departmentname ->> 'code' = $department + - name: departmentPerson + label: reports.lcms.departmentPerson + type: string + isMandatory: false + source: lcms + searchClause : AND lc.departmentperson=$departmentPerson + - name: advocate + label: reports.lcms.advocate + type: singlevaluelist + pattern: http://lcms-services:8080/lcms-services/legalcase/advocate/_search?tenantId=$tenantid&pageSize=500|$..code|$..name + source: lcms + isMandatory: false + searchClause : AND position($advocate in tempadvocate.advocatecode) > 0 + - name: courtName + label: reports.lcms.courtName + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=lcms&masterName=court|$..code|$..name + source: lcms + wrapper: true + isMandatory: false + searchClause : AND lc.courtname ->> 'code' = $courtName + query: select lc.caseno, (select name from (VALUES tbl_court) as court (code,name) where court.code=lc.courtname::jsonb ->> 'code') as courtname, (select name from (VALUES tbl_casetype) as caseType (code,name) where caseType.code=lc.casetype::jsonb ->> 'code') as casetype, (select name from (VALUES tbl_department) as departmentdata (code,name) where departmentdata.code= lc.departmentname->>'code')as department, lc.departmentperson, tempadvocate.advocatename as advocate, lc.plantiffName, lc.defendant, (select name from (VALUES tbl_casestatus) as caseStatus (code,name) where caseStatus.code=lc.casestatus::jsonb ->> 'code') as casestatus, lc.hearingdate from egov_lcms_case as lc left outer join (select lca.casecode as casecode, string_agg(la.name,',') as advocatename,string_agg(la.code,',') as advocatecode from egov_lcms_case_advocate as lca inner join egov_lcms_advocate as la on la.code=lca.advocate->>'code' where lca.tenantid=$tenantid group by lca.casecode) as tempadvocate on lc.code=tempadvocate.casecode WHERE lc.caseregistrationdate>=$fromDate and lc.caseregistrationdate<=$toDate and lc.tenantid=$tenantid diff --git a/configs/reports/configs/pgr-reports.yml b/configs/reports/configs/pgr-reports.yml new file mode 100644 index 00000000..2193f618 --- /dev/null +++ b/configs/reports/configs/pgr-reports.yml @@ -0,0 +1,2683 @@ +ReportDefinitions: +- reportName: SourceWiseReport + summary: Fetches reports based on the source of reception of the complaint + version: 1.0.0 + moduleName: rainmaker-pgr + sourceColumns: + - name: citizen_mobile_app + label: reports.rainmaker-pgr.citizen_mobile_app + type: string + source: eg_pgr_service + - name: citizen_web_app + label: reports.rainmaker-pgr.citizen_web_app + type: string + source: eg_pgr_service + - name: counter_desktop + label: reports.rainmaker-pgr.counter_desktop + type: string + source: eg_pgr_service + searchParams: + - name: tenantId + label: reports.rainmaker-pgr.tenantId + type: singlevaluelist + pattern: 'list://Wet:Wet,Dry:Dry' + source: eg_pgr_service + isMandatory: false + - name: fromDate + label: reports.rainmaker-pgr.datefrom + type: epoch + source: eg_pgr_service + isMandatory: false + - name: toDate + label: reports.rainmaker-pgr.dateto + type: epoch + source: eg_pgr_service + isMandatory: false + query: SELECT sum(case when source = 'mobileapp' then 1 else 0 end) as citizen_mobile_app, sum(case when source = 'web' then 1 else 0 end) as citizen_web_app, sum(case when source = 'ivr' then 1 else 0 end) as counter_desktop FROM eg_pgr_service WHERE tenantid = $tenantid + +- reportName: DescriptionReport + summary: Fetches department wise reports based description of the complaint + version: 1.0.0 + moduleName: rainmaker-pgr + externalService: + - entity: $.MdmsRes.RAINMAKER-PGR.ServiceDefs + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=RAINMAKER-PGR&masterName=ServiceDefs&tenantId=$tenantId + keyOrder: serviceCode,department,slaHours + tableName: tbl_dept + - entity: $.MdmsRes.common-masters.Department + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=common-masters&masterName=Department&tenantId=$tenantId + keyOrder: name,code + tableName: tbl_def_dept + - entity: $.TenantBoundary[0].boundary + apiURL: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search?hierarchyTypeCode=ADMIN&boundaryType=Locality&tenantId=$tenantId + keyOrder: name,code + tableName: tbl_boundary + sourceColumns: + - name: department + label: reports.rainmaker-pgr.department + type: string + source: eg_pgr_service + total: false + - name: servicecode + label: reports.rainmaker-pgr.servicecode + type: string + source: eg_pgr_service + total: false + - name: complaintNo + label: reports.rainmaker-pgr.complaintNo + type: string + source: eg_pgr_service + total: false + - name: date + label: reports.rainmaker-pgr.date + type: string + source: eg_pgr_service + total: false + - name: name + label: reports.rainmaker-pgr.name + type: string + source: eg_pgr_service + total: false + - name: phone + label: reports.rainmaker-pgr.phone + type: string + source: eg_pgr_service + total: false + - name: address + label: reports.rainmaker-pgr.address + type: string + source: eg_pgr_service + total: false + - name: locality + label: reports.rainmaker-pgr.locality + type: string + source: eg_pgr_service + total: false + - name: landmark + label: reports.rainmaker-pgr.landmark + type: string + source: eg_pgr_service + total: false + - name: description + label: reports.rainmaker-pgr.description + type: string + source: eg_pgr_service + total: false + - name: lastassignedto + label: reports.rainmaker-pgr.lastassignedto + type: string + source: eg_pgr_service + total: false + - name: status + label: reports.rainmaker-pgr.status + type: string + source: eg_pgr_service + total: false + - name: slahours + label: reports.rainmaker-pgr.slahours + type: string + source: eg_pgr_service + total: false + - name: actiondate + label: reports.rainmaker-pgr.actiondate + type: string + source: eg_pgr_service + total: false + searchParams: + - name: fromDate + label: reports.rainmaker-pgr.datefrom + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND eg_pgr_service.createdtime >= $fromDate + - name: toDate + label: reports.rainmaker-pgr.dateto + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND eg_pgr_service.createdtime <= $toDate + query: | + SELECT + DISTINCT ON (servicerequestid) + ua.name as lastassignedto, + (SELECT deptmap_def.name FROM (VALUES tbl_def_dept) AS deptmap_def(name,code) INNER JOIN (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) on deptmap.serviceCode = eg_pgr_service.servicecode and deptmap_def.code = deptmap.department) AS department, + regexp_replace(servicecode, '([a-z])([A-Z])', '\1 \2','g') AS servicecode, + (SELECT boundary_def.name FROM (VALUES tbl_boundary) AS boundary_def(name,code) where code=eg_pgr_address.mohalla) as locality, + servicerequestid AS complaintNo, + to_char(to_timestamp(TRUNC(CAST(eg_pgr_service.createdtime AS bigint) / 1000)), 'DD/MM/YYYY') AS date, + eg_user.name, + phone, + eg_pgr_address.landmark, + eg_pgr_address.housenoandstreetname as address, + description, + (SELECT (CASE WHEN (((SELECT deptmap.slaHours FROM (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) WHERE deptmap.serviceCode = eg_pgr_service.servicecode)::integer / 24) - (epa.when - eg_pgr_service.createdtime)::bigint/86400000) < 1 THEN CONCAT('Overdue by ', ((epa.when - eg_pgr_service.createdtime)::bigint/86400000) - ((SELECT deptmap.slaHours FROM (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) WHERE deptmap.serviceCode = eg_pgr_service.servicecode)::integer / 24), ' days') ELSE CONCAT(((SELECT deptmap.slaHours FROM (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) WHERE deptmap.serviceCode = eg_pgr_service.servicecode)::integer / 24) - (epa.when - eg_pgr_service.createdtime)::bigint/86400000, ' days remaining') END) as slaHours), + Initcap(eg_pgr_service.status) as status, + to_char((To_timestamp(epa.when/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS actiondate + FROM eg_pgr_service + left outer join eg_pgr_address on eg_pgr_address.uuid = eg_pgr_service.addressid + left outer join eg_user on eg_user.id = eg_pgr_service.accountid::int + left outer join eg_pgr_action as epa on epa.businesskey = eg_pgr_service.servicerequestid and epa.action in ('assign','reassign','resolve') + left outer join eg_user as ua on (ua.id = epa.assignee::int or ua.id = split_part(epa.by,':',1)::INTEGER) + WHERE + eg_pgr_service.tenantid LIKE $tenantid + AND eg_pgr_address.uuid = eg_pgr_service.addressid + AND eg_pgr_service.status IN ('open','assigned','reassigrequested','rejected','closed','resolved') + orderby: ORDER BY servicerequestid, epa."when" desc + +- reportName: StateSourceReport + summary: Source of complaints across tenants + version: 1.0.0 + moduleName: rainmaker-pgr + sourceColumns: + - name: tenantid + label: reports.rainmaker-pgr.tenantid + type: string + source: eg_pgr_service + total: false + - name: whatsapp + label: reports.rainmaker-pgr.source.whatsapp + type: string + source: eg_pgr_service + total: true + - name: ivr + label: reports.rainmaker-pgr.source.ivr + type: string + source: eg_pgr_service + total: true + - name: mobileapp + label: reports.rainmaker-pgr.source.mobileapp + type: string + source: eg_pgr_service + total: true + - name: web + label: reports.rainmaker-pgr.source.web + type: string + source: eg_pgr_service + total: true + - name: unknown + label: reports.rainmaker-pgr.source.unknown + type: string + source: eg_pgr_service + total: true + searchParams: + - name: fromDate + label: reports.rainmaker-pgr.datefrom + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND createdtime >= $fromDate + - name: toDate + label: reports.rainmaker-pgr.dateto + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND createdtime <= $toDate + query: | + select initcap(split_part(tenantid, '.', 2)) as tenantid, + SUM(CASE WHEN source ='whatsapp' THEN 1 ELSE 0 END) as whatsapp, + SUM(CASE WHEN source ='ivr' THEN 1 ELSE 0 END) as ivr, + SUM(CASE WHEN source ='mobileapp' THEN 1 ELSE 0 END) as mobileapp, + SUM(CASE WHEN source ='web' THEN 1 ELSE 0 END) as web, + SUM(CASE WHEN source NOT IN ('web', 'ivr', 'mobileapp','whatsapp') OR source is NULL THEN 1 ELSE 0 END) as unknown + from eg_pgr_service + WHERE tenantid != 'pb.testing' + + groupby: GROUP BY tenantid + orderby: ORDER BY tenantid + +- reportName: EmployeeReport + summary: Fetches complaints for employees + version: 1.0.0 + moduleName: rainmaker-pgr + externalService: + - entity: $.MdmsRes.RAINMAKER-PGR.ServiceDefs + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=RAINMAKER-PGR&masterName=ServiceDefs&tenantId=$tenantId + keyOrder: serviceCode,department,slaHours + tableName: tbl_dept + - entity: $.TenantBoundary[0].boundary + apiURL: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search?hierarchyTypeCode=ADMIN&boundaryType=Locality&tenantId=$tenantId + keyOrder: name,code + tableName: tbl_boundary + sourceColumns: + - name: department + label: reports.rainmaker-pgr.department + type: string + source: eg_pgr_service + total: false + - name: servicecode + label: reports.rainmaker-pgr.servicecode + type: string + source: eg_pgr_service + total: false + - name: complaintNo + label: reports.rainmaker-pgr.complaintNo + type: string + source: eg_pgr_service + total: false + - name: date + label: reports.rainmaker-pgr.date + type: string + source: eg_pgr_service + total: false + - name: name + label: reports.rainmaker-pgr.name + type: string + source: eg_pgr_service + total: false + - name: phone + label: reports.rainmaker-pgr.phone + type: string + source: eg_pgr_service + total: false + - name: locality + label: reports.rainmaker-pgr.locality + type: string + source: eg_pgr_service + total: false + - name: address + label: reports.rainmaker-pgr.address + type: string + source: eg_pgr_service + total: false + - name: landmark + label: reports.rainmaker-pgr.landmark + type: string + source: eg_pgr_service + total: false + - name: description + label: reports.rainmaker-pgr.description + type: string + source: eg_pgr_service + total: false + - name: status + label: reports.rainmaker-pgr.status + type: string + source: eg_pgr_service + total: false + - name: slahours + label: reports.rainmaker-pgr.slahours + type: string + source: eg_pgr_service + total: false + searchParams: + - name: fromDate + label: reports.rainmaker-pgr.datefrom + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND eg_pgr_service.createdtime >= $fromDate + - name: toDate + label: reports.rainmaker-pgr.dateto + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND eg_pgr_service.createdtime <= $toDate + query: | + SELECT (SELECT deptmap.department FROM (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) WHERE deptmap.serviceCode = eg_pgr_service.servicecode) AS department, + regexp_replace(eg_pgr_service.servicecode, '([a-z])([A-Z])', '\1 \2','g') AS servicecode, + servicerequestid AS complaintNo, + to_char(to_timestamp(TRUNC(CAST(eg_pgr_service.createdtime AS bigint) / 1000)), 'DD/MM/YYYY') AS date, + (SELECT boundary_def.name FROM (VALUES tbl_boundary) AS boundary_def(name,code) where code=eg_pgr_address.mohalla) as locality, + eg_user.name, + phone, + eg_pgr_service.landmark, + housenoandstreetname as address, + description, + (SELECT (CASE WHEN (((SELECT deptmap.slaHours FROM (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) WHERE deptmap.serviceCode = eg_pgr_service.servicecode)::integer / 24) - ((((select extract(epoch from now())) * 1000) - eg_pgr_service.createdtime)::bigint/86400000)) < 1 THEN CONCAT('Overdue by ', ((((select extract(epoch from now())) * 1000) - eg_pgr_service.createdtime)::bigint/86400000) - ((SELECT deptmap.slaHours FROM (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) WHERE deptmap.serviceCode = eg_pgr_service.servicecode)::integer / 24), ' days') ELSE CONCAT(((SELECT deptmap.slaHours FROM (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) WHERE deptmap.serviceCode = eg_pgr_service.servicecode)::integer / 24) - ((((select extract(epoch from now())) * 1000) - eg_pgr_service.createdtime)::bigint/86400000), ' days remaining') END) as slaHours), + initcap(status) as status FROM eg_pgr_service + INNER JOIN eg_user ON eg_pgr_service.accountid = eg_user.id::VARCHAR + INNER JOIN eg_pgr_address ON eg_pgr_service.addressid = eg_pgr_address.uuid + WHERE eg_pgr_service.status = 'assigned' + AND servicerequestid IN (SELECT DISTINCT businesskey FROM eg_pgr_action WHERE status = 'assigned' AND "when" IN (select max("when") FROM eg_pgr_action WHERE assignee NOTNULL GROUP BY businesskey) AND assignee = $userid) + orderby: ORDER BY eg_pgr_service.createdtime asc + +- reportName: StateULBReport + summary: Fetches complaints stats for all ULBs in state + version: 1.0.0 + moduleName: rainmaker-pgr + sourceColumns: + - name: tenantid + label: reports.rainmaker-pgr.tenantid + type: string + source: eg_pgr_service + total: false + - name: open + label: reports.rainmaker-pgr.status.open + type: string + source: eg_pgr_service + total: true + - name: assigned + label: reports.rainmaker-pgr.status.assigned + type: string + source: eg_pgr_service + total: true + - name: closed + label: reports.rainmaker-pgr.status.closed + type: string + source: eg_pgr_service + total: true + - name: reassignrequested + label: reports.rainmaker-pgr.status.reassignrequested + type: string + source: eg_pgr_service + total: true + - name: rejected + label: reports.rainmaker-pgr.status.rejected + type: string + source: eg_pgr_service + total: true + - name: total + label: reports.rainmaker-pgr.total + type: string + source: eg_pgr_service + total: true + searchParams: + - name: fromDate + label: reports.rainmaker-pgr.datefrom + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND createdtime >= $fromDate + - name: toDate + label: reports.rainmaker-pgr.dateto + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND createdtime <= $toDate + query: | + select initcap(split_part(tenantid, '.', 2)) as tenantid, + SUM(CASE WHEN status ='open' THEN 1 ELSE 0 END) as open, + SUM(CASE WHEN status ='assigned' THEN 1 ELSE 0 END) as assigned, + SUM(CASE WHEN status in ('closed', 'resolved') THEN 1 ELSE 0 END) as closed, + SUM(CASE WHEN status ='reassignrequested' THEN 1 ELSE 0 END) as reassignrequested, + SUM(CASE WHEN status ='rejected' THEN 1 ELSE 0 END) as rejected, + COUNT(status) as total + from eg_pgr_service + WHERE tenantid != 'pb.testing' + groupby: GROUP BY tenantid + orderby: ORDER BY tenantid + +- reportName: ComplaintTypesReport + summary: Fetches complaint stats based on complaint types for a ULB + version: 1.0.0 + moduleName: rainmaker-pgr + sourceColumns: + - name: tenantid + label: reports.rainmaker-pgr.tenantid + type: string + source: eg_pgr_service + total: false + - name: complainttype + label: reports.rainmaker-pgr.complainttype + type: string + source: eg_pgr_service + total: false + - name: open + label: reports.rainmaker-pgr.status.open + type: string + source: eg_pgr_service + total: true + - name: assigned + label: reports.rainmaker-pgr.status.assigned + type: string + source: eg_pgr_service + total: true + - name: closed + label: reports.rainmaker-pgr.status.closed + type: string + source: eg_pgr_service + total: true + - name: reassignrequested + label: reports.rainmaker-pgr.status.reassignrequested + type: string + source: eg_pgr_service + total: true + - name: rejected + label: reports.rainmaker-pgr.status.rejected + type: string + source: eg_pgr_service + total: true + - name: total + label: reports.rainmaker-pgr.total + type: string + source: eg_pgr_service + total: true + searchParams: + - name: ulb + label: ULB + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: pt + wrapper: true + isMandatory: false + searchClause: AND tenantid = $ulb + - name: fromDate + label: reports.rainmaker-pgr.datefrom + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND createdtime >= $fromDate + - name: toDate + label: reports.rainmaker-pgr.dateto + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND createdtime <= $toDate + query: | + select + initcap(split_part(tenantid, '.', 2)) as tenantid, + regexp_replace(servicecode, '([a-z])([A-Z])', '\1 \2','g') as complainttype, + SUM(CASE WHEN status ='open' THEN 1 ELSE 0 END) as open, + SUM(CASE WHEN status ='assigned' THEN 1 ELSE 0 END) as assigned, + SUM(CASE WHEN status in ('closed', 'resolved') THEN 1 ELSE 0 END) as closed, + SUM(CASE WHEN status ='reassignrequested' THEN 1 ELSE 0 END) as reassignrequested, + SUM(CASE WHEN status ='rejected' THEN 1 ELSE 0 END) as rejected, + count(status) as total + from eg_pgr_service + WHERE tenantid != 'pb.testing' + groupby: GROUP BY tenantid,servicecode + orderby: ORDER BY tenantid,servicecode + +- reportName: DepartmentReport + summary: Fetches complaint stats based on complaint types for a ULB + version: 1.0.0 + moduleName: rainmaker-pgr + externalService: + - entity: $.MdmsRes.RAINMAKER-PGR.ServiceDefs + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=RAINMAKER-PGR&masterName=ServiceDefs&tenantId=$tenantId + keyOrder: serviceCode,department,slaHours + tableName: tbl_dept + - entity: $.MdmsRes.common-masters.Department + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=common-masters&masterName=Department&tenantId=$tenantId + keyOrder: name,code + tableName: tbl_def_dept + sourceColumns: + - name: tenantid + label: reports.rainmaker-pgr.tenantid + type: string + source: eg_pgr_service + total: false + - name: department + label: reports.rainmaker-pgr.department + type: string + source: eg_pgr_service + total: false + - name: open + label: reports.rainmaker-pgr.status.open + type: string + source: eg_pgr_service + total: true + - name: assigned + label: reports.rainmaker-pgr.status.assigned + type: string + source: eg_pgr_service + total: true + - name: closed + label: reports.rainmaker-pgr.status.closed + type: string + source: eg_pgr_service + total: true + - name: reassignrequested + label: reports.rainmaker-pgr.status.reassignrequested + type: string + source: eg_pgr_service + total: true + - name: rejected + label: reports.rainmaker-pgr.status.rejected + type: string + source: eg_pgr_service + total: true + searchParams: + - name: ulb + label: ULB + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: pt + wrapper: true + isMandatory: false + searchClause: AND tenantid = $ulb + - name: fromDate + label: reports.rainmaker-pgr.datefrom + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND createdtime >= $fromDate + - name: toDate + label: reports.rainmaker-pgr.dateto + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND createdtime <= $toDate + query: | + select + initcap(split_part(tenantid, '.', 2)) as tenantid, + deptmap_def.name as department, + SUM(CASE WHEN status ='open' THEN 1 ELSE 0 END) as open, + SUM(CASE WHEN status ='assigned' THEN 1 ELSE 0 END) as assigned, + SUM(CASE WHEN status in ('closed', 'resolved') THEN 1 ELSE 0 END) as closed, + SUM(CASE WHEN status ='reassignrequested' THEN 1 ELSE 0 END) as reassignrequested, + SUM(CASE WHEN status ='rejected' THEN 1 ELSE 0 END) as rejected, + count(status) as total + from eg_pgr_service + INNER JOIN (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) ON deptmap.serviceCode = eg_pgr_service.servicecode + INNER JOIN (VALUES tbl_def_dept) AS deptmap_def(name,code) ON deptmap.department = deptmap_def.code + WHERE tenantid != 'pb.testing' + groupby: GROUP BY tenantid,deptmap_def.name + orderby: ORDER BY tenantid,deptmap_def.name + +- reportName: ULBDepartmentReport + summary: Fetches complaint stats based on department types for a ULB + version: 1.0.0 + moduleName: rainmaker-pgr + externalService: + - entity: $.MdmsRes.RAINMAKER-PGR.ServiceDefs + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=RAINMAKER-PGR&masterName=ServiceDefs&tenantId=$tenantId + keyOrder: serviceCode,department,slaHours + tableName: tbl_dept + - entity: $.MdmsRes.common-masters.Department + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=common-masters&masterName=Department&tenantId=$tenantId + keyOrder: name,code + tableName: tbl_def_dept + sourceColumns: + - name: department + label: reports.rainmaker-pgr.department + type: string + source: eg_pgr_service + total: false + - name: rejected + label: reports.rainmaker-pgr.rejected + type: string + source: pgr_data + total: true + - name: resolved + label: reports.rainmaker-pgr.resolved + type: string + source: pgr_data + total: true + - name: resolvedoutsidesla + label: reports.rainmaker-pgr.resolvedoutsidesla + type: string + source: pgr_data + total: true + - name: open + label: reports.rainmaker-pgr.open + type: string + source: pgr_data + total: true + - name: assigned + label: reports.rainmaker-pgr.assigned + type: string + source: pgr_data + total: true + - name: outsidesla + label: reports.rainmaker-pgr.outsidesla + type: string + source: pgr_data + total: true + searchParams: + - name: fromDate + label: reports.rainmaker-pgr.datefrom + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND pgr_data.createdtime >= $fromDate + - name: toDate + label: reports.rainmaker-pgr.dateto + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND pgr_data.createdtime <= $toDate + query: | + with pgr_data as (select + servicerequestid, + servicecode, + createdtime, + status, + (select max("when") from eg_pgr_action where action='resolve' and businesskey = servicerequestid) as resolvedtime, + (select min("when") from eg_pgr_action where action='open' and businesskey = servicerequestid) as opentime + from eg_pgr_service as ps + where + tenantid = $tenantid) + + select + deptmap_def.name as department, + count(*) as total, + SUM (CASE WHEN status in ('rejected') THEN 1 ELSE 0 END) as rejected, + SUM (CASE WHEN status in ('closed', 'resolved') THEN 1 ELSE 0 END) as resolved, + SUM (CASE WHEN status in ('closed', 'resolved') and (resolvedtime - opentime) >= 14 * 86400 * 1000 THEN 1 ELSE 0 END) as resolvedoutsidesla, + SUM (CASE WHEN status in ('assigned', 'reassignrequested') THEN 1 ELSE 0 END) as assigned, + SUM (CASE WHEN status in ('open') THEN 1 ELSE 0 END) as open, + SUM (CASE WHEN status in ('assigned', 'reassignrequested', 'open') and (extract(epoch from now()) * 1000 - opentime) >= 14 * 86400 * 1000 THEN 1 ELSE 0 END) as outsidesla + from pgr_data + INNER JOIN (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) ON deptmap.serviceCode = pgr_data.servicecode + INNER JOIN (VALUES tbl_def_dept) AS deptmap_def(name,code) ON deptmap.department = deptmap_def.code + WHERE 1=1 + groupby: GROUP BY deptmap_def.name + orderby: ORDER BY deptmap_def.name + +- reportName: ULBEmployeeWiseReport + summary: Fetches employee wise assignment report + version: 1.0.0 + moduleName: rainmaker-pgr + sourceColumns: + - name: employee + label: reports.rainmaker-pgr.employee + type: string + source: pgr_data + total: false + - name: rejected + label: reports.rainmaker-pgr.rejected + type: string + source: pgr_data + total: true + - name: resolved + label: reports.rainmaker-pgr.resolved + type: string + source: pgr_data + total: true + - name: resolvedoutsidesla + label: reports.rainmaker-pgr.resolvedoutsidesla + type: string + source: pgr_data + total: true + - name: open + label: reports.rainmaker-pgr.open + type: string + source: pgr_data + total: true + - name: assigned + label: reports.rainmaker-pgr.assigned + type: string + source: pgr_data + total: true + - name: outsidesla + label: reports.rainmaker-pgr.outsidesla + type: string + source: pgr_data + total: true + searchParams: + - name: fromDate + label: reports.rainmaker-pgr.datefrom + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND pgr_data.createdtime >= $fromDate + - name: toDate + label: reports.rainmaker-pgr.dateto + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND pgr_data.createdtime <= $toDate + query: | + with pgr_data as (select + (select assignee from eg_pgr_action as pa where + pa.businesskey = ps.servicerequestid + and pa."action" in ('assign', 'reassign') + order by "when" desc + fetch first 1 rows only + ) as assignee, + servicerequestid, + createdtime, + status, + (select max("when") from eg_pgr_action where action='resolve' and businesskey = servicerequestid) as resolvedtime, + (select min("when") from eg_pgr_action where action='open' and businesskey = servicerequestid) as opentime + from eg_pgr_service as ps + where + tenantid = $tenantid) + + select + coalesce((select name from eg_user where id::varchar = assignee),'-- Unassigned --') as employee, + SUM (CASE WHEN status in ('rejected') THEN 1 ELSE 0 END) as rejected, + SUM (CASE WHEN status in ('closed', 'resolved') THEN 1 ELSE 0 END) as resolved, + SUM (CASE WHEN status in ('closed', 'resolved') and (resolvedtime - opentime) >= 14 * 86400 * 1000 THEN 1 ELSE 0 END) as resolvedoutsidesla, + SUM (CASE WHEN status in ('assigned', 'reassignrequested') THEN 1 ELSE 0 END) as assigned, + SUM (CASE WHEN status in ('open') THEN 1 ELSE 0 END) as open, + SUM (CASE WHEN status in ('assigned', 'reassignrequested', 'open') and (extract(epoch from now()) * 1000 - opentime) >= 14 * 86400 * 1000 THEN 1 ELSE 0 END) as outsidesla + from pgr_data + WHERE 1=1 + orderby: ORDER BY assignee NULLS FIRST + groupby: GROUP BY assignee + + +- reportName: UlbPgrSlaReport + summary: Fetches employee sla + version: 1.0.0 + moduleName: rainmaker-pgr + sourceColumns: + - name: tenantid + label: reports.rainmaker-pgr.tenantid + type: string + source: eg_pgr_service + total: false + - name: complainttype + label: reports.rainmaker-pgr.complainttype + type: string + source: eg_pgr_service + total: false + - name: total + label: reports.rainmaker-pgr.total + type: string + source: eg_pgr_service + total: true + - name: pendinginsla + label: reports.rainmaker-pgr.pendinginsla + type: string + source: eg_pgr_service + total: true + - name: pendingoutsidesla + label: reports.rainmaker-pgr.pendingoutsidesla + type: string + source: eg_pgr_service + total: true + - name: resolvedinsla + label: reports.rainmaker-pgr.resolvedinsla + type: string + source: eg_pgr_service + total: true + - name: resolvedoutsidesla + label: reports.rainmaker-pgr.resolvedoutsidesla + type: string + source: eg_pgr_service + total: true + searchParams: + - name: fromDate + label: reports.rainmaker-pgr.datefrom + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND pgr_data.createdtime >= $fromDate + - name: toDate + label: reports.rainmaker-pgr.dateto + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND pgr_data.createdtime <= $toDate + query: | + with pgr_data as (select + servicerequestid, + servicecode, + createdtime, + status, + (select max("when") from eg_pgr_action where action='resolve' and businesskey = servicerequestid) as resolvedtime, + (select min("when") from eg_pgr_action where action='open' and businesskey = servicerequestid) as opentime + from eg_pgr_service as ps) + select + initcap(split_part(tenantid, '.', 2)) as tenantid, + regexp_replace(eg_pgr_service.servicecode, '([a-z])([A-Z])', '\1 \2','g') as complainttype, + count(eg_pgr_service.status) as total, + SUM (CASE WHEN eg_pgr_service.status in ('assigned', 'reassignrequested', 'open') and (extract(epoch from now()) * 1000 - opentime) < 14 * 86400 * 1000 THEN 1 ELSE 0 END) as pendinginsla, + SUM (CASE WHEN eg_pgr_service.status in ('assigned', 'reassignrequested', 'open') and (extract(epoch from now()) * 1000 - opentime) >= 14 * 86400 * 1000 THEN 1 ELSE 0 END) as pendingoutsidesla, + SUM (CASE WHEN eg_pgr_service.status in ('closed', 'resolved') and (resolvedtime - opentime) < 14 * 86400 * 1000 THEN 1 ELSE 0 END) as resolvedinsla, + SUM (CASE WHEN eg_pgr_service.status in ('closed', 'resolved') and (resolvedtime - opentime) >= 14 * 86400 * 1000 THEN 1 ELSE 0 END) as resolvedoutsidesla + from eg_pgr_service,pgr_data + WHERE tenantid != 'pb.testing' and eg_pgr_service.servicerequestid=pgr_data.servicerequestid + groupby: GROUP BY tenantid,eg_pgr_service.servicecode + orderby: ORDER BY tenantid,eg_pgr_service.servicecode + +- reportName: FeedbackReport + summary: Fetches complaint state based on Feedback + version: 1.0.0 + moduleName: rainmaker-pgr + externalService: + - entity: $.MdmsRes.RAINMAKER-PGR.ServiceDefs + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=RAINMAKER-PGR&masterName=ServiceDefs&tenantId=$tenantId + keyOrder: serviceCode,department,slaHours + tableName: tbl_dept + - entity: $.MdmsRes.common-masters.Department + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=common-masters&masterName=Department&tenantId=$tenantId + keyOrder: name,code + tableName: tbl_def_dept + sourceColumns: + - name: department + label: reports.rainmaker-pgr.department + type: string + source: eg_pgr_service + total: false + - name: tenantid + label: reports.rainmaker-pgr.tenantid + type: string + source: eg_pgr_service + total: false + - name: citizenname + label: reports.rainmaker-pgr.citizenname + type: string + source: eg_pgr_service + total: false + - name: complainttype + label: reports.rainmaker-pgr.complainttype + type: string + source: eg_pgr_service + total: false + - name: complaintnumber + label: reports.rainmaker-pgr.complaintnumber + type: string + source: eg_pgr_service + total: false + - name: lastassignto + label: reports.rainmaker-pgr.lastassignto + type: string + source: eg_pgr_service + total: false + - name: rating + label: reports.rainmaker-pgr.rating + type: string + source: eg_pgr_service + total: false + - name: feedback + label: reports.rainmaker-pgr.feedback + type: string + source: eg_pgr_service + total: false + searchParams: + - name: ulb + label: ULB + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: pt + wrapper: true + isMandatory: false + searchClause: AND eg_pgr_service.tenantid = $ulb + - name: fromDate + label: reports.rainmaker-pgr.datefrom + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND eg_pgr_service.createdtime >= $fromDate + - name: toDate + label: reports.rainmaker-pgr.dateto + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND eg_pgr_service.createdtime <= $toDate + query: | + SELECT + DISTINCT ON (servicerequestid) + initcap(split_part(eg_pgr_service.tenantid, '.', 2)) as tenantid, + (SELECT deptmap_def.name FROM (VALUES tbl_def_dept) AS deptmap_def(name,code) INNER JOIN (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) on deptmap.serviceCode = eg_pgr_service.servicecode and deptmap_def.code = deptmap.department) AS department, + regexp_replace(servicecode, '([a-z])([A-Z])', '\1 \2','g') AS complainttype, + ua.name as lastassignto, + servicerequestid AS complaintnumber, + eg_user.name AS citizenname, + rating, feedback FROM eg_pgr_service + left outer join eg_pgr_address on eg_pgr_address.uuid = eg_pgr_service.addressid + left outer join eg_user on eg_user.id = eg_pgr_service.accountid::int + left outer join eg_pgr_action as epa on epa.businesskey = eg_pgr_service.servicerequestid and epa.action in ('assign','reassign') + left outer join eg_user as ua on ua.id = epa.assignee::int + WHERE + eg_pgr_address.uuid = eg_pgr_service.addressid + AND rating is not null AND feedback is not null + orderby: ORDER BY servicerequestid, epa."when" desc + + +- reportName: SourceWiseReport_v2 + summary: Fetches reports based on the source of reception of the complaint + version: 1.0.0 + moduleName: rainmaker-pgr + sourceColumns: + - name: citizen_mobile_app + label: reports.rainmaker-pgr.citizen_mobile_app + type: string + source: eg_pgr_service + total: true + - name: citizen_web_app + label: reports.rainmaker-pgr.citizen_web_app + type: string + source: eg_pgr_service + total: true + - name: counter_desktop + label: reports.rainmaker-pgr.counter_desktop + type: string + source: eg_pgr_service + total: true + searchParams: + - name: fromDate + label: reports.rainmaker-pgr.datefrom + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND eg_pgr_service.createdtime >= $fromDate + - name: toDate + label: reports.rainmaker-pgr.dateto + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND eg_pgr_service.createdtime >= $fromDate + query: | + SELECT + sum(case when source = 'mobileapp' then 1 else 0 end) as citizen_mobile_app, + sum(case when source = 'web' then 1 else 0 end) as citizen_web_app, + sum(case when source = 'ivr' then 1 else 0 end) as counter_desktop + FROM eg_pgr_service + WHERE tenantid = $tenantid + +- reportName: DescriptionReport_v2 + decryptionPathId: DescriptionReport_v2 + summary: Fetches department wise reports based description of the complaint + version: 1.0.0 + moduleName: rainmaker-pgr + externalService: + - entity: $.MdmsRes.RAINMAKER-PGR.ServiceDefs + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=RAINMAKER-PGR&masterName=ServiceDefs&tenantId=$tenantId + keyOrder: serviceCode,department,slaHours + tableName: tbl_dept + - entity: $.MdmsRes.common-masters.Department + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=common-masters&masterName=Department&tenantId=$tenantId + keyOrder: name,code + tableName: tbl_def_dept + - entity: $.TenantBoundary[0].boundary + apiURL: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search?hierarchyTypeCode=ADMIN&boundaryType=Locality&tenantId=$tenantId + keyOrder: name,code + tableName: tbl_boundary + sourceColumns: + - name: department + label: reports.rainmaker-pgr.department + type: string + source: eg_pgr_service + total: false + - name: servicecode + label: reports.rainmaker-pgr.servicecode + type: string + source: eg_pgr_service + total: false + - name: complaintNo + label: reports.rainmaker-pgr.complaintNo + type: string + source: eg_pgr_service + total: false + - name: date + label: reports.rainmaker-pgr.date + type: string + source: eg_pgr_service + total: false + - name: name + label: reports.rainmaker-pgr.name + type: string + source: eg_pgr_service + total: false + - name: phone + label: reports.rainmaker-pgr.phone + type: string + source: eg_pgr_service + total: false + - name: address + label: reports.rainmaker-pgr.address + type: string + source: eg_pgr_service + total: false + - name: locality + label: reports.rainmaker-pgr.locality + type: string + source: eg_pgr_service + total: false + - name: landmark + label: reports.rainmaker-pgr.landmark + type: string + source: eg_pgr_service + total: false + - name: description + label: reports.rainmaker-pgr.description + type: string + source: eg_pgr_service + total: false + - name: lastassignedto + label: reports.rainmaker-pgr.lastassignedto + type: string + source: eg_pgr_service + total: false + - name: status + label: reports.rainmaker-pgr.status + type: string + source: eg_pgr_service + total: false + - name: slahours + label: reports.rainmaker-pgr.slahours + type: string + source: eg_pgr_service + total: false + - name: actiondate + label: reports.rainmaker-pgr.actiondate + type: string + source: eg_pgr_service + total: false + - name: source + label: reports.rainmaker-pgr.source + type: string + source: eg_pgr_service + total: false + searchParams: + - name: fromDate + label: reports.rainmaker-pgr.datefrom + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND eg_pgr_service.createdtime >= $fromDate + - name: toDate + label: reports.rainmaker-pgr.dateto + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND eg_pgr_service.createdtime <= $toDate + query: | + SELECT + DISTINCT ON (servicerequestid) + (case when ua.name is null then '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' else ua.name end) as lastassignedto, --value for Unassigned + (SELECT deptmap_def.name FROM (VALUES tbl_def_dept) AS deptmap_def(name,code) INNER JOIN (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) on deptmap.serviceCode = eg_pgr_service.servicecode and deptmap_def.code = deptmap.department) AS department, + regexp_replace(servicecode, '([a-z])([A-Z])', '\1 \2','g') AS servicecode, + (SELECT boundary_def.name FROM (VALUES tbl_boundary) AS boundary_def(name,code) where code=eg_pgr_address.mohalla) as locality, + servicerequestid AS complaintNo, + to_char(to_timestamp(TRUNC(CAST(eg_pgr_service.createdtime AS bigint) / 1000)), 'DD/MM/YYYY') AS date, + (case when eg_user.name is null then '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' else eg_user.name end) as name, --value for NULL + phone, + eg_pgr_address.landmark, + eg_pgr_address.housenoandstreetname as address, + description, + source, + (SELECT (CASE WHEN (((SELECT deptmap.slaHours FROM (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) WHERE deptmap.serviceCode = eg_pgr_service.servicecode)::integer / 24) - (epa.when - eg_pgr_service.createdtime)::bigint/86400000) < 1 THEN CONCAT('Overdue by ', ((epa.when - eg_pgr_service.createdtime)::bigint/86400000) - ((SELECT deptmap.slaHours FROM (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) WHERE deptmap.serviceCode = eg_pgr_service.servicecode)::integer / 24), ' days') ELSE CONCAT(((SELECT deptmap.slaHours FROM (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) WHERE deptmap.serviceCode = eg_pgr_service.servicecode)::integer / 24) - (epa.when - eg_pgr_service.createdtime)::bigint/86400000, ' days remaining') END) as slaHours), + Initcap(eg_pgr_service.status) as status, + to_char((To_timestamp(epa.when/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS actiondate + FROM eg_pgr_service + left outer join eg_pgr_address on eg_pgr_address.uuid = eg_pgr_service.addressid + left outer join eg_user on eg_user.id = eg_pgr_service.accountid::int + left outer join eg_pgr_action as epa on epa.businesskey = eg_pgr_service.servicerequestid and epa.action in ('assign','reassign','resolve') + left outer join eg_user as ua on (ua.id = epa.assignee::int or ua.id = split_part(epa.by,':',1)::INTEGER) + WHERE + eg_pgr_service.tenantid LIKE $tenantid + AND eg_pgr_address.uuid = eg_pgr_service.addressid + AND eg_pgr_service.status IN ('open','assigned','reassigrequested','rejected','closed','resolved') + orderby: ORDER BY servicerequestid, epa."when" desc + +- reportName: StateSourceReport_v2 + summary: Source of complaints across tenants + version: 1.0.0 + moduleName: rainmaker-pgr + sourceColumns: + - name: tenantid + label: reports.rainmaker-pgr.tenantid + type: string + source: eg_pgr_service + total: false + - name: whatsapp + label: reports.rainmaker-pgr.source.whatsapp + type: string + source: eg_pgr_service + total: true + - name: ivr + label: reports.rainmaker-pgr.source.ivr + type: string + source: eg_pgr_service + total: true + - name: mobileapp + label: reports.rainmaker-pgr.source.mobileapp + type: string + source: eg_pgr_service + total: true + - name: web + label: reports.rainmaker-pgr.source.web + type: string + source: eg_pgr_service + total: true + - name: unknown + label: reports.rainmaker-pgr.source.unknown + type: string + source: eg_pgr_service + total: true + searchParams: + - name: fromDate + label: reports.rainmaker-pgr.datefrom + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND createdtime >= $fromDate + - name: toDate + label: reports.rainmaker-pgr.dateto + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND createdtime <= $toDate + query: | + select initcap(split_part(tenantid, '.', 2)) as tenantid, + SUM(CASE WHEN source ='whatsapp' THEN 1 ELSE 0 END) as whatsapp, + SUM(CASE WHEN source ='ivr' THEN 1 ELSE 0 END) as ivr, + SUM(CASE WHEN source ='mobileapp' THEN 1 ELSE 0 END) as mobileapp, + SUM(CASE WHEN source ='web' THEN 1 ELSE 0 END) as web, + SUM(CASE WHEN source NOT IN ('web', 'ivr', 'mobileapp','whatsapp') OR source is NULL THEN 1 ELSE 0 END) as unknown + from eg_pgr_service + WHERE tenantid != 'pb.testing' + groupby: GROUP BY tenantid + orderby: ORDER BY tenantid + +- reportName: EmployeeReport_v2 + decryptionPathId: EmployeeReport_v2 + summary: Fetches complaints for employees + version: 1.0.0 + moduleName: rainmaker-pgr + externalService: + - entity: $.MdmsRes.RAINMAKER-PGR.ServiceDefs + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=RAINMAKER-PGR&masterName=ServiceDefs&tenantId=$tenantId + keyOrder: serviceCode,department,slaHours + tableName: tbl_dept + - entity: $.TenantBoundary[0].boundary + apiURL: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search?hierarchyTypeCode=ADMIN&boundaryType=Locality&tenantId=$tenantId + keyOrder: name,code + tableName: tbl_boundary + sourceColumns: + - name: department + label: reports.rainmaker-pgr.department + type: string + source: eg_pgr_service + total: false + - name: servicecode + label: reports.rainmaker-pgr.servicecode + type: string + source: eg_pgr_service + total: false + - name: complaintNo + label: reports.rainmaker-pgr.complaintNo + type: string + source: eg_pgr_service + total: false + - name: date + label: reports.rainmaker-pgr.date + type: string + source: eg_pgr_service + total: false + - name: name + label: reports.rainmaker-pgr.name + type: string + source: eg_pgr_service + total: false + - name: phone + label: reports.rainmaker-pgr.phone + type: string + source: eg_pgr_service + total: false + - name: locality + label: reports.rainmaker-pgr.locality + type: string + source: eg_pgr_service + total: false + - name: address + label: reports.rainmaker-pgr.address + type: string + source: eg_pgr_service + total: false + - name: landmark + label: reports.rainmaker-pgr.landmark + type: string + source: eg_pgr_service + total: false + - name: description + label: reports.rainmaker-pgr.description + type: string + source: eg_pgr_service + total: false + - name: status + label: reports.rainmaker-pgr.status + type: string + source: eg_pgr_service + total: false + - name: slahours + label: reports.rainmaker-pgr.slahours + type: string + source: eg_pgr_service + total: false + searchParams: + - name: fromDate + label: reports.rainmaker-pgr.datefrom + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND eg_pgr_service.createdtime >= $fromDate + - name: toDate + label: reports.rainmaker-pgr.dateto + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND eg_pgr_service.createdtime <= $toDate + query: | + SELECT (SELECT deptmap.department FROM (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) WHERE deptmap.serviceCode = eg_pgr_service.servicecode) AS department, + regexp_replace(eg_pgr_service.servicecode, '([a-z])([A-Z])', '\1 \2','g') AS servicecode, + servicerequestid AS complaintNo, + to_char(to_timestamp(TRUNC(CAST(eg_pgr_service.createdtime AS bigint) / 1000)), 'DD/MM/YYYY') AS date, + (SELECT boundary_def.name FROM (VALUES tbl_boundary) AS boundary_def(name,code) where code=eg_pgr_address.mohalla) as locality, + eg_user.name, + phone, + eg_pgr_service.landmark, + housenoandstreetname as address, + description, + (SELECT (CASE WHEN (((SELECT deptmap.slaHours FROM (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) WHERE deptmap.serviceCode = eg_pgr_service.servicecode)::integer / 24) - ((((select extract(epoch from now())) * 1000) - eg_pgr_service.createdtime)::bigint/86400000)) < 1 THEN CONCAT('Overdue by ', ((((select extract(epoch from now())) * 1000) - eg_pgr_service.createdtime)::bigint/86400000) - ((SELECT deptmap.slaHours FROM (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) WHERE deptmap.serviceCode = eg_pgr_service.servicecode)::integer / 24), ' days') ELSE CONCAT(((SELECT deptmap.slaHours FROM (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) WHERE deptmap.serviceCode = eg_pgr_service.servicecode)::integer / 24) - ((((select extract(epoch from now())) * 1000) - eg_pgr_service.createdtime)::bigint/86400000), ' days remaining') END) as slaHours), + initcap(status) as status FROM eg_pgr_service + INNER JOIN eg_user ON eg_pgr_service.accountid = eg_user.id::VARCHAR + INNER JOIN eg_pgr_address ON eg_pgr_service.addressid = eg_pgr_address.uuid + WHERE eg_pgr_service.status = 'assigned' + AND servicerequestid IN (SELECT DISTINCT businesskey FROM eg_pgr_action WHERE status = 'assigned' AND "when" IN (select max("when") FROM eg_pgr_action WHERE assignee NOTNULL GROUP BY businesskey) AND assignee = $userid) + orderby: ORDER BY eg_pgr_service.createdtime asc + +- reportName: StateULBReport_v2 + summary: Fetches complaints stats for all ULBs in state + version: 1.0.0 + moduleName: rainmaker-pgr + sourceColumns: + - name: tenantid + label: reports.rainmaker-pgr.tenantid + type: string + source: eg_pgr_service + total: false + - name: open + label: reports.rainmaker-pgr.status.open + type: string + source: eg_pgr_service + total: true + - name: assigned + label: reports.rainmaker-pgr.status.assigned + type: string + source: eg_pgr_service + total: true + - name: closed + label: reports.rainmaker-pgr.status.closed + type: string + source: eg_pgr_service + total: true + - name: reassignrequested + label: reports.rainmaker-pgr.status.reassignrequested + type: string + source: eg_pgr_service + total: true + - name: rejected + label: reports.rainmaker-pgr.status.rejected + type: string + source: eg_pgr_service + total: true + - name: total + label: reports.rainmaker-pgr.total + type: string + source: eg_pgr_service + total: true + searchParams: + - name: fromDate + label: reports.rainmaker-pgr.datefrom + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND createdtime >= $fromDate + - name: toDate + label: reports.rainmaker-pgr.dateto + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND createdtime <= $toDate + query: | + select initcap(split_part(tenantid, '.', 2)) as tenantid, + SUM(CASE WHEN status ='open' THEN 1 ELSE 0 END) as open, + SUM(CASE WHEN status ='assigned' THEN 1 ELSE 0 END) as assigned, + SUM(CASE WHEN status in ('closed', 'resolved') THEN 1 ELSE 0 END) as closed, + SUM(CASE WHEN status ='reassignrequested' THEN 1 ELSE 0 END) as reassignrequested, + SUM(CASE WHEN status ='rejected' THEN 1 ELSE 0 END) as rejected, + COUNT(status) as total + from eg_pgr_service + WHERE tenantid != 'pb.testing' + groupby: GROUP BY tenantid + orderby: ORDER BY tenantid + +- reportName: ComplaintTypeWiseReport + summary: Fetches complaint stats based on complaint types for a ULB + version: 1.0.0 + moduleName: rainmaker-pgr + sourceColumns: + - name: tenantid + label: reports.rainmaker-pgr.tenantid + type: string + source: eg_pgr_service + total: false + - name: complainttype + label: reports.rainmaker-pgr.complainttype + type: string + source: eg_pgr_service + total: false + - name: open + label: reports.rainmaker-pgr.status.open + type: string + source: eg_pgr_service + total: true + - name: assigned + label: reports.rainmaker-pgr.status.assigned + type: string + source: eg_pgr_service + total: true + - name: closed + label: reports.rainmaker-pgr.status.closed + type: string + source: eg_pgr_service + total: true + - name: reassignrequested + label: reports.rainmaker-pgr.status.reassignrequested + type: string + source: eg_pgr_service + total: true + - name: rejected + label: reports.rainmaker-pgr.status.rejected + type: string + source: eg_pgr_service + total: true + - name: total + label: reports.rainmaker-pgr.total + type: string + source: eg_pgr_service + total: true + searchParams: + - name: fromDate + label: reports.rainmaker-pgr.datefrom + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND createdtime >= $fromDate + - name: toDate + label: reports.rainmaker-pgr.dateto + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND createdtime <= $toDate + query: | + select + initcap(split_part(tenantid, '.', 2)) as tenantid, + regexp_replace(servicecode, '([a-z])([A-Z])', '\1 \2','g') as complainttype, + SUM(CASE WHEN status ='open' THEN 1 ELSE 0 END) as open, + SUM(CASE WHEN status ='assigned' THEN 1 ELSE 0 END) as assigned, + SUM(CASE WHEN status in ('closed', 'resolved') THEN 1 ELSE 0 END) as closed, + SUM(CASE WHEN status ='reassignrequested' THEN 1 ELSE 0 END) as reassignrequested, + SUM(CASE WHEN status ='rejected' THEN 1 ELSE 0 END) as rejected, + count(status) as total + from eg_pgr_service + WHERE tenantid = $tenantid + groupby: GROUP BY tenantid,servicecode + orderby: ORDER BY tenantid,servicecode + +- reportName: DepartmentReport_v2 + summary: Fetches complaint stats based on complaint types for a ULB + version: 1.0.0 + moduleName: rainmaker-pgr + externalService: + - entity: $.MdmsRes.RAINMAKER-PGR.ServiceDefs + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=RAINMAKER-PGR&masterName=ServiceDefs&tenantId=$tenantId + keyOrder: serviceCode,department,slaHours + tableName: tbl_dept + - entity: $.MdmsRes.common-masters.Department + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=common-masters&masterName=Department&tenantId=$tenantId + keyOrder: name,code + tableName: tbl_def_dept + sourceColumns: + - name: tenantid + label: reports.rainmaker-pgr.tenantid + type: string + source: eg_pgr_service + total: false + - name: department + label: reports.rainmaker-pgr.department + type: string + source: eg_pgr_service + total: false + - name: open + label: reports.rainmaker-pgr.status.open + type: string + source: eg_pgr_service + total: true + - name: assigned + label: reports.rainmaker-pgr.status.assigned + type: string + source: eg_pgr_service + total: true + - name: closed + label: reports.rainmaker-pgr.status.closed + type: string + source: eg_pgr_service + total: true + - name: reassignrequested + label: reports.rainmaker-pgr.status.reassignrequested + type: string + source: eg_pgr_service + total: true + - name: rejected + label: reports.rainmaker-pgr.status.rejected + type: string + source: eg_pgr_service + total: true + searchParams: + - name: ulb + label: ULB + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: pt + wrapper: true + isMandatory: false + searchClause: AND tenantid = $ulb + - name: fromDate + label: reports.rainmaker-pgr.datefrom + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND createdtime >= $fromDate + - name: toDate + label: reports.rainmaker-pgr.dateto + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND createdtime <= $toDate + query: | + select + initcap(split_part(tenantid, '.', 2)) as tenantid, + deptmap_def.name as department, + SUM(CASE WHEN status ='open' THEN 1 ELSE 0 END) as open, + SUM(CASE WHEN status ='assigned' THEN 1 ELSE 0 END) as assigned, + SUM(CASE WHEN status in ('closed', 'resolved') THEN 1 ELSE 0 END) as closed, + SUM(CASE WHEN status ='reassignrequested' THEN 1 ELSE 0 END) as reassignrequested, + SUM(CASE WHEN status ='rejected' THEN 1 ELSE 0 END) as rejected, + count(status) as total + from eg_pgr_service + INNER JOIN (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) ON deptmap.serviceCode = eg_pgr_service.servicecode + INNER JOIN (VALUES tbl_def_dept) AS deptmap_def(name,code) ON deptmap.department = deptmap_def.code + WHERE tenantid != 'pb.testing' + groupby: GROUP BY tenantid,deptmap_def.name + orderby: ORDER BY tenantid,deptmap_def.name + +- reportName: ULBDepartmentReport_v2 + summary: Fetches complaint stats based on department types for a ULB + version: 1.0.0 + moduleName: rainmaker-pgr + externalService: + - entity: $.MdmsRes.RAINMAKER-PGR.ServiceDefs + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=RAINMAKER-PGR&masterName=ServiceDefs&tenantId=$tenantId + keyOrder: serviceCode,department,slaHours + tableName: tbl_dept + - entity: $.MdmsRes.common-masters.Department + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=common-masters&masterName=Department&tenantId=$tenantId + keyOrder: name,code + tableName: tbl_def_dept + sourceColumns: + - name: department + label: reports.rainmaker-pgr.department + type: string + source: eg_pgr_service + total: false + - name: rejected + label: reports.rainmaker-pgr.rejected + type: string + source: pgr_data + total: true + - name: resolved + label: reports.rainmaker-pgr.resolved + type: string + source: pgr_data + total: true + - name: resolvedoutsidesla + label: reports.rainmaker-pgr.resolvedoutsidesla + type: string + source: pgr_data + total: true + - name: open + label: reports.rainmaker-pgr.open + type: string + source: pgr_data + total: true + - name: assigned + label: reports.rainmaker-pgr.assigned + type: string + source: pgr_data + total: true + - name: outsidesla + label: reports.rainmaker-pgr.outsidesla + type: string + source: pgr_data + total: true + searchParams: + - name: fromDate + label: reports.rainmaker-pgr.datefrom + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND pgr_data.createdtime >= $fromDate + - name: toDate + label: reports.rainmaker-pgr.dateto + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND pgr_data.createdtime <= $toDate + query: | + with pgr_data as (select + servicerequestid, + servicecode, + createdtime, + status, + (select max("when") from eg_pgr_action where action='resolve' and businesskey = servicerequestid) as resolvedtime, + (select min("when") from eg_pgr_action where action='open' and businesskey = servicerequestid) as opentime + from eg_pgr_service as ps + where + tenantid = $tenantid) + + select + deptmap_def.name as department, + count(*) as total, + SUM (CASE WHEN status in ('rejected') THEN 1 ELSE 0 END) as rejected, + SUM (CASE WHEN status in ('closed', 'resolved') THEN 1 ELSE 0 END) as resolved, + SUM (CASE WHEN status in ('closed', 'resolved') and (resolvedtime - opentime) >= 14 * 86400 * 1000 THEN 1 ELSE 0 END) as resolvedoutsidesla, + SUM (CASE WHEN status in ('assigned', 'reassignrequested') THEN 1 ELSE 0 END) as assigned, + SUM (CASE WHEN status in ('open') THEN 1 ELSE 0 END) as open, + SUM (CASE WHEN status in ('assigned', 'reassignrequested', 'open') and (extract(epoch from now()) * 1000 - opentime) >= 14 * 86400 * 1000 THEN 1 ELSE 0 END) as outsidesla + from pgr_data + INNER JOIN (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) ON deptmap.serviceCode = pgr_data.servicecode + INNER JOIN (VALUES tbl_def_dept) AS deptmap_def(name,code) ON deptmap.department = deptmap_def.code + WHERE 1=1 + groupby: GROUP BY deptmap_def.name + orderby: ORDER BY deptmap_def.name + +- reportName: ULBEmployeeWiseReport_v2 + decryptionPathId: ULBEmployeeWiseReport + summary: Fetches employee wise assignment report + version: 1.0.0 + moduleName: rainmaker-pgr + sourceColumns: + - name: employee + label: reports.rainmaker-pgr.employee + type: string + source: pgr_data + total: false + - name: rejected + label: reports.rainmaker-pgr.rejected + type: string + source: pgr_data + total: true + - name: resolved + label: reports.rainmaker-pgr.resolved + type: string + source: pgr_data + total: true + - name: resolvedoutsidesla + label: reports.rainmaker-pgr.resolvedoutsidesla + type: string + source: pgr_data + total: true + - name: open + label: reports.rainmaker-pgr.open + type: string + source: pgr_data + total: true + - name: assigned + label: reports.rainmaker-pgr.assigned + type: string + source: pgr_data + total: true + - name: outsidesla + label: reports.rainmaker-pgr.outsidesla + type: string + source: pgr_data + total: true + searchParams: + - name: fromDate + label: reports.rainmaker-pgr.datefrom + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND pgr_data.createdtime >= $fromDate + - name: toDate + label: reports.rainmaker-pgr.dateto + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND pgr_data.createdtime <= $toDate + query: | + with pgr_data as (select + (select assignee from eg_pgr_action as pa where + pa.businesskey = ps.servicerequestid + and pa."action" in ('assign', 'reassign') + order by "when" desc + fetch first 1 rows only + ) as assignee, + servicerequestid, + createdtime, + status, + (select max("when") from eg_pgr_action where action='resolve' and businesskey = servicerequestid) as resolvedtime, + (select min("when") from eg_pgr_action where action='open' and businesskey = servicerequestid) as opentime + from eg_pgr_service as ps + where + tenantid = $tenantid) + select + coalesce((select name from eg_user where id::varchar = assignee),'30048|23/xn3x2FAxn8vYAN0IdplsOxaE=') as employee, -- encrypted value for NULL + SUM (CASE WHEN status in ('rejected') THEN 1 ELSE 0 END) as rejected, + SUM (CASE WHEN status in ('closed', 'resolved') THEN 1 ELSE 0 END) as resolved, + SUM (CASE WHEN status in ('closed', 'resolved') and (resolvedtime - opentime) >= 14 * 86400 * 1000 THEN 1 ELSE 0 END) as resolvedoutsidesla, + SUM (CASE WHEN status in ('assigned', 'reassignrequested') THEN 1 ELSE 0 END) as assigned, + SUM (CASE WHEN status in ('open') THEN 1 ELSE 0 END) as open, + SUM (CASE WHEN status in ('assigned', 'reassignrequested', 'open') and (extract(epoch from now()) * 1000 - opentime) >= 14 * 86400 * 1000 THEN 1 ELSE 0 END) as outsidesla + from pgr_data + WHERE 1=1 + groupby: GROUP BY assignee + orderby: ORDER BY assignee NULLS FIRST + + +- reportName: UlbPgrSlaReport_v2 + summary: Fetches employee sla for state + version: 1.0.0 + moduleName: rainmaker-pgr + sourceColumns: + - name: tenantid + label: reports.rainmaker-pgr.tenantid + type: string + source: eg_pgr_service + total: false + - name: complainttype + label: reports.rainmaker-pgr.complainttype + type: string + source: eg_pgr_service + total: false + - name: total + label: reports.rainmaker-pgr.total + type: string + source: eg_pgr_service + total: true + - name: pendinginsla + label: reports.rainmaker-pgr.pendinginsla + type: string + source: eg_pgr_service + total: true + - name: pendingoutsidesla + label: reports.rainmaker-pgr.pendingoutsidesla + type: string + source: eg_pgr_service + total: true + - name: resolvedinsla + label: reports.rainmaker-pgr.resolvedinsla + type: string + source: eg_pgr_service + total: true + - name: resolvedoutsidesla + label: reports.rainmaker-pgr.resolvedoutsidesla + type: string + source: eg_pgr_service + total: true + searchParams: + - name: fromDate + label: reports.rainmaker-pgr.datefrom + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND pgr_data.createdtime >= $fromDate + - name: toDate + label: reports.rainmaker-pgr.dateto + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND pgr_data.createdtime <= $toDate + query: | + with pgr_data as (select + servicerequestid, + servicecode, + createdtime, + status, + (select max("when") from eg_pgr_action where action='resolve' and businesskey = servicerequestid) as resolvedtime, + (select min("when") from eg_pgr_action where action='open' and businesskey = servicerequestid) as opentime + from eg_pgr_service as ps) + select + initcap(split_part(tenantid, '.', 2)) as tenantid, + regexp_replace(eg_pgr_service.servicecode, '([a-z])([A-Z])', '\1 \2','g') as complainttype, + count(eg_pgr_service.status) as total, + SUM (CASE WHEN eg_pgr_service.status in ('assigned', 'reassignrequested', 'open') and (extract(epoch from now()) * 1000 - opentime) < 14 * 86400 * 1000 THEN 1 ELSE 0 END) as pendinginsla, + SUM (CASE WHEN eg_pgr_service.status in ('assigned', 'reassignrequested', 'open') and (extract(epoch from now()) * 1000 - opentime) >= 14 * 86400 * 1000 THEN 1 ELSE 0 END) as pendingoutsidesla, + SUM (CASE WHEN eg_pgr_service.status in ('closed', 'resolved') and (resolvedtime - opentime) < 14 * 86400 * 1000 THEN 1 ELSE 0 END) as resolvedinsla, + SUM (CASE WHEN eg_pgr_service.status in ('closed', 'resolved') and (resolvedtime - opentime) >= 14 * 86400 * 1000 THEN 1 ELSE 0 END) as resolvedoutsidesla + from eg_pgr_service,pgr_data + WHERE tenantid != 'pb.testing' and eg_pgr_service.servicerequestid=pgr_data.servicerequestid + groupby: GROUP BY tenantid,eg_pgr_service.servicecode + orderby: ORDER BY tenantid,eg_pgr_service.servicecode + +- reportName: FeedbackReport_v2 + decryptionPathId: FeedbackReport_v2 + summary: Fetches complaint state based on Feedback + version: 1.0.0 + moduleName: rainmaker-pgr + externalService: + - entity: $.MdmsRes.RAINMAKER-PGR.ServiceDefs + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=RAINMAKER-PGR&masterName=ServiceDefs&tenantId=$tenantId + keyOrder: serviceCode,department,slaHours + tableName: tbl_dept + - entity: $.MdmsRes.common-masters.Department + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=common-masters&masterName=Department&tenantId=$tenantId + keyOrder: name,code + tableName: tbl_def_dept + sourceColumns: + - name: department + label: reports.rainmaker-pgr.department + type: string + source: eg_pgr_service + total: false + - name: tenantid + label: reports.rainmaker-pgr.tenantid + type: string + source: eg_pgr_service + total: false + - name: citizenname + label: reports.rainmaker-pgr.citizenname + type: string + source: eg_pgr_service + total: false + - name: complainttype + label: reports.rainmaker-pgr.complainttype + type: string + source: eg_pgr_service + total: false + - name: complaintnumber + label: reports.rainmaker-pgr.complaintnumber + type: string + source: eg_pgr_service + total: false + - name: lastassignto + label: reports.rainmaker-pgr.lastassignto + type: string + source: eg_pgr_service + total: false + - name: rating + label: reports.rainmaker-pgr.rating + type: string + source: eg_pgr_service + total: false + - name: feedback + label: reports.rainmaker-pgr.feedback + type: string + source: eg_pgr_service + total: false + searchParams: + - name: ulb + label: ULB + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: pt + wrapper: true + isMandatory: false + searchClause: AND eg_pgr_service.tenantid = $ulb + - name: fromDate + label: reports.rainmaker-pgr.datefrom + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND eg_pgr_service.createdtime >= $fromDate + - name: toDate + label: reports.rainmaker-pgr.dateto + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND eg_pgr_service.createdtime <= $toDate + query: | + SELECT + DISTINCT ON (servicerequestid) + initcap(split_part(eg_pgr_service.tenantid, '.', 2)) as tenantid, + (SELECT deptmap_def.name FROM (VALUES tbl_def_dept) AS deptmap_def(name,code) INNER JOIN (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) on deptmap.serviceCode = eg_pgr_service.servicecode and deptmap_def.code = deptmap.department) AS department, + regexp_replace(servicecode, '([a-z])([A-Z])', '\1 \2','g') AS complainttype, + ua.name as lastassignto, + servicerequestid AS complaintnumber, + eg_user.name AS citizenname, + rating, feedback FROM eg_pgr_service + left outer join eg_pgr_address on eg_pgr_address.uuid = eg_pgr_service.addressid + left outer join eg_user on eg_user.id = eg_pgr_service.accountid::int + left outer join eg_pgr_action as epa on epa.businesskey = eg_pgr_service.servicerequestid and epa.action in ('assign','reassign') + left outer join eg_user as ua on ua.id = epa.assignee::int + WHERE + eg_pgr_address.uuid = eg_pgr_service.addressid + AND rating is not null AND feedback is not null + orderby: ORDER BY servicerequestid, epa."when" desc + + +- reportName: ComplaintTypesReport_v2 + summary: Fetches complaint stats based on complaint types for a ULB + version: 1.0.0 + moduleName: rainmaker-pgr + sourceColumns: + - name: tenantid + label: reports.rainmaker-pgr.tenantid + type: string + source: eg_pgr_service + total: false + - name: complainttype + label: reports.rainmaker-pgr.complainttype + type: string + source: eg_pgr_service + total: false + - name: open + label: reports.rainmaker-pgr.status.open + type: string + source: eg_pgr_service + total: true + - name: assigned + label: reports.rainmaker-pgr.status.assigned + type: string + source: eg_pgr_service + total: true + - name: closed + label: reports.rainmaker-pgr.status.closed + type: string + source: eg_pgr_service + total: true + - name: reassignrequested + label: reports.rainmaker-pgr.status.reassignrequested + type: string + source: eg_pgr_service + total: true + - name: rejected + label: reports.rainmaker-pgr.status.rejected + type: string + source: eg_pgr_service + total: true + - name: total + label: reports.rainmaker-pgr.total + type: string + source: eg_pgr_service + total: true + searchParams: + - name: ulb + label: ULB + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: pt + wrapper: true + isMandatory: false + searchClause: AND tenantid = $ulb + - name: fromDate + label: reports.rainmaker-pgr.datefrom + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND createdtime >= $fromDate + - name: toDate + label: reports.rainmaker-pgr.dateto + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND createdtime <= $toDate + query: | + select + initcap(split_part(tenantid, '.', 2)) as tenantid, + regexp_replace(servicecode, '([a-z])([A-Z])', '\1 \2','g') as complainttype, + SUM(CASE WHEN status ='open' THEN 1 ELSE 0 END) as open, + SUM(CASE WHEN status ='assigned' THEN 1 ELSE 0 END) as assigned, + SUM(CASE WHEN status in ('closed', 'resolved') THEN 1 ELSE 0 END) as closed, + SUM(CASE WHEN status ='reassignrequested' THEN 1 ELSE 0 END) as reassignrequested, + SUM(CASE WHEN status ='rejected' THEN 1 ELSE 0 END) as rejected, + count(status) as total + from eg_pgr_service + WHERE tenantid != 'pb.testing' + groupby: GROUP BY tenantid,servicecode + orderby: ORDER BY tenantid,servicecode + + + + +- reportName: StateDescriptionReport_v2 + decryptionPathId: DescriptionReport_v2 + summary: Fetches state description wise reports + version: 1.0.0 + moduleName: rainmaker-pgr + externalService: + - entity: $.MdmsRes.RAINMAKER-PGR.ServiceDefs + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=RAINMAKER-PGR&masterName=ServiceDefs&tenantId=$tenantId + keyOrder: serviceCode,department,slaHours + tableName: tbl_dept + - entity: $.MdmsRes.common-masters.Department + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=common-masters&masterName=Department&tenantId=$tenantId + keyOrder: name,code + tableName: tbl_def_dept + sourceColumns: + - name: department + label: reports.rainmaker-pgr.department + type: string + source: eg_pgr_service + total: false + - name: servicecode + label: reports.rainmaker-pgr.servicecode + type: string + source: eg_pgr_service + total: false + - name: complaintNo + label: reports.rainmaker-pgr.complaintNo + type: string + source: eg_pgr_service + total: false + - name: date + label: reports.rainmaker-pgr.date + type: string + source: eg_pgr_service + total: false + - name: name + label: reports.rainmaker-pgr.name + type: string + source: eg_pgr_service + total: false + - name: phone + label: reports.rainmaker-pgr.phone + type: string + source: eg_pgr_service + total: false + - name: address + label: reports.rainmaker-pgr.address + type: string + source: eg_pgr_service + total: false + - name: landmark + label: reports.rainmaker-pgr.landmark + type: string + source: eg_pgr_service + total: false + - name: description + label: reports.rainmaker-pgr.description + type: string + source: eg_pgr_service + total: false + - name: lastassignedto + label: reports.rainmaker-pgr.lastassignedto + type: string + source: eg_pgr_service + total: false + - name: status + label: reports.rainmaker-pgr.status + type: string + source: eg_pgr_service + total: false + - name: slahours + label: reports.rainmaker-pgr.slahours + type: string + source: eg_pgr_service + total: false + - name: actiondate + label: reports.rainmaker-pgr.actiondate + type: string + source: eg_pgr_service + total: false + - name: source + label: reports.rainmaker-pgr.source + type: string + source: eg_pgr_service + total: false + - name: tenantid + label: reports.rainmaker-pgr.tenantid + type: string + source: eg_pgr_service + total: false + searchParams: + - name: fromDate + label: reports.rainmaker-pgr.datefrom + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND eg_pgr_service.createdtime >= $fromDate + - name: toDate + label: reports.rainmaker-pgr.dateto + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND eg_pgr_service.createdtime <= $toDate + - name: ulb + label: ULB + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants..code|$.MdmsRes.tenant.tenants..name + source: eg_pgr_service + wrapper: true + isMandatory: false + searchClause: AND eg_pgr_service.tenantid = $ulb + + query: | + SELECT + DISTINCT ON (servicerequestid) + (case when ua.name is null then '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' else ua.name end) as lastassignedto, --value for Unassigned + (SELECT deptmap_def.name FROM (VALUES tbl_def_dept) AS deptmap_def(name,code) INNER JOIN (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) on deptmap.serviceCode = eg_pgr_service.servicecode and deptmap_def.code = deptmap.department) AS department, + regexp_replace(servicecode, '([a-z])([A-Z])', '\1 \2','g') AS servicecode, + --(SELECT boundary_def.name FROM (VALUES tbl_boundary) AS boundary_def(name,code) where code=eg_pgr_address.mohalla) as locality, + servicerequestid AS complaintNo, + to_char(to_timestamp(TRUNC(CAST(eg_pgr_service.createdtime AS bigint) / 1000)), 'DD/MM/YYYY') AS date, + (case when eg_user.name is null then '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' else eg_user.name end) as name, --value for NULL + phone, + eg_pgr_address.landmark, + eg_pgr_address.housenoandstreetname as address, + description, + source, + eg_pgr_service.tenantid, + (SELECT (CASE WHEN (((SELECT deptmap.slaHours FROM (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) WHERE deptmap.serviceCode = eg_pgr_service.servicecode)::integer / 24) - (epa.when - eg_pgr_service.createdtime)::bigint/86400000) < 1 THEN CONCAT('Overdue by ', ((epa.when - eg_pgr_service.createdtime)::bigint/86400000) - ((SELECT deptmap.slaHours FROM (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) WHERE deptmap.serviceCode = eg_pgr_service.servicecode)::integer / 24), ' days') ELSE CONCAT(((SELECT deptmap.slaHours FROM (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) WHERE deptmap.serviceCode = eg_pgr_service.servicecode)::integer / 24) - (epa.when - eg_pgr_service.createdtime)::bigint/86400000, ' days remaining') END) as slaHours), + Initcap(eg_pgr_service.status) as status, + to_char((To_timestamp(epa.when/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS actiondate + FROM eg_pgr_service + left outer join eg_pgr_address on eg_pgr_address.uuid = eg_pgr_service.addressid + left outer join eg_user on eg_user.id = eg_pgr_service.accountid::int + left outer join eg_pgr_action as epa on epa.businesskey = eg_pgr_service.servicerequestid and epa.action in ('assign','reassign','resolve') + left outer join eg_user as ua on (ua.id = epa.assignee::int or ua.id = split_part(epa.by,':',1)::INTEGER) + WHERE + eg_pgr_service.tenantid !='pb.testing' + AND eg_pgr_address.uuid = eg_pgr_service.addressid + AND eg_pgr_service.status IN ('open','assigned','reassigrequested','rejected','closed','resolved') + orderby: ORDER BY servicerequestid, epa."when" desc + +- reportName: UlbwisePgrSlaReport_v2 + summary: Fetches Ulb employee sla + version: 1.0.0 + moduleName: rainmaker-pgr + sourceColumns: + - name: tenantid + label: reports.rainmaker-pgr.tenantid + type: string + source: eg_pgr_service + total: false + - name: complainttype + label: reports.rainmaker-pgr.complainttype + type: string + source: eg_pgr_service + total: false + - name: total + label: reports.rainmaker-pgr.total + type: string + source: eg_pgr_service + total: true + - name: pendinginsla + label: reports.rainmaker-pgr.pendinginsla + type: string + source: eg_pgr_service + total: true + - name: pendingoutsidesla + label: reports.rainmaker-pgr.pendingoutsidesla + type: string + source: eg_pgr_service + total: true + - name: resolvedinsla + label: reports.rainmaker-pgr.resolvedinsla + type: string + source: eg_pgr_service + total: true + - name: resolvedoutsidesla + label: reports.rainmaker-pgr.resolvedoutsidesla + type: string + source: eg_pgr_service + total: true + searchParams: + - name: fromDate + label: reports.rainmaker-pgr.datefrom + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND pgr_data.createdtime >= $fromDate + - name: toDate + label: reports.rainmaker-pgr.dateto + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND pgr_data.createdtime <= $toDate + query: | + with pgr_data as (select + servicerequestid, + servicecode, + createdtime, + status, + (select max("when") from eg_pgr_action where action='resolve' and businesskey = servicerequestid) as resolvedtime, + (select min("when") from eg_pgr_action where action='open' and businesskey = servicerequestid) as opentime + from eg_pgr_service as ps) + select + initcap(split_part(tenantid, '.', 2)) as tenantid, + regexp_replace(eg_pgr_service.servicecode, '([a-z])([A-Z])', '\1 \2','g') as complainttype, + count(eg_pgr_service.status) as total, + SUM (CASE WHEN eg_pgr_service.status in ('assigned', 'reassignrequested', 'open') and (extract(epoch from now()) * 1000 - opentime) < 14 * 86400 * 1000 THEN 1 ELSE 0 END) as pendinginsla, + SUM (CASE WHEN eg_pgr_service.status in ('assigned', 'reassignrequested', 'open') and (extract(epoch from now()) * 1000 - opentime) >= 14 * 86400 * 1000 THEN 1 ELSE 0 END) as pendingoutsidesla, + SUM (CASE WHEN eg_pgr_service.status in ('closed', 'resolved') and (resolvedtime - opentime) < 14 * 86400 * 1000 THEN 1 ELSE 0 END) as resolvedinsla, + SUM (CASE WHEN eg_pgr_service.status in ('closed', 'resolved') and (resolvedtime - opentime) >= 14 * 86400 * 1000 THEN 1 ELSE 0 END) as resolvedoutsidesla + from eg_pgr_service,pgr_data + WHERE tenantid = $tenantid and eg_pgr_service.servicerequestid=pgr_data.servicerequestid + groupby: GROUP BY tenantid,eg_pgr_service.servicecode + orderby: ORDER BY tenantid,eg_pgr_service.servicecode + +- reportName: DescriptionReport_NEW_v2 + decryptionPathId: DescriptionReport_v2 + summary: Fetches department wise reports based description of the complaint + version: 1.0.0 + moduleName: rainmaker-pgr + externalService: + - entity: $.MdmsRes.RAINMAKER-PGR.ServiceDefs + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=RAINMAKER-PGR&masterName=ServiceDefs&tenantId=$tenantId + keyOrder: serviceCode,department,slaHours + tableName: tbl_dept + - entity: $.MdmsRes.common-masters.Department + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=common-masters&masterName=Department&tenantId=$tenantId + keyOrder: name,code + tableName: tbl_def_dept + - entity: $.TenantBoundary[0].boundary + apiURL: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search?hierarchyTypeCode=ADMIN&boundaryType=Locality&tenantId=$tenantId + keyOrder: name,code + tableName: tbl_boundary + sourceColumns: + - name: department + label: reports.rainmaker-pgr.department + type: string + source: eg_pgr_service + total: false + - name: servicecode + label: reports.rainmaker-pgr.servicecode + type: string + source: eg_pgr_service + total: false + - name: complaintNo + label: reports.rainmaker-pgr.complaintNo + type: string + source: eg_pgr_service + total: false + - name: date + label: reports.rainmaker-pgr.date + type: string + source: eg_pgr_service + total: false + - name: name + label: reports.rainmaker-pgr.name + type: string + source: eg_pgr_service + total: false + - name: phone + label: reports.rainmaker-pgr.phone + type: string + source: eg_pgr_service + total: false + - name: address + label: reports.rainmaker-pgr.address + type: string + source: eg_pgr_service + total: false + - name: locality + label: reports.rainmaker-pgr.locality + type: string + source: eg_pgr_service + total: false + - name: landmark + label: reports.rainmaker-pgr.landmark + type: string + source: eg_pgr_service + total: false + - name: description + label: reports.rainmaker-pgr.description + type: string + source: eg_pgr_service + total: false + - name: lastassignedto + label: reports.rainmaker-pgr.lastassignedto + type: string + source: eg_pgr_service + total: false + - name: status + label: reports.rainmaker-pgr.status + type: string + source: eg_pgr_service + total: false + - name: slahours + label: reports.rainmaker-pgr.slahours + type: string + source: eg_pgr_service + total: false + - name: actiondate + label: reports.rainmaker-pgr.actiondate + type: string + source: eg_pgr_service + total: false + - name: source + label: reports.rainmaker-pgr.source + type: string + source: eg_pgr_service + total: false + searchParams: + - name: fromDate + label: reports.rainmaker-pgr.datefrom + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND eg_pgr_service.createdtime >= $fromDate + - name: toDate + label: reports.rainmaker-pgr.dateto + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND eg_pgr_service.createdtime <= $toDate + query: | + with comps as + ( + select businesskey,max(eg_pgr_action.when) as actiontime + from eg_pgr_action + where tenantid=$tenantid + group by businesskey + ) + SELECT + DISTINCT ON (servicerequestid) + (case when ua.name is null then '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' else ua.name::varchar end) as lastassignedto, --value for Unassigned + (SELECT deptmap_def.name FROM (VALUES tbl_def_dept) AS deptmap_def(name,code) INNER JOIN (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) on deptmap.serviceCode = eg_pgr_service.servicecode and deptmap_def.code = deptmap.department) AS department, + regexp_replace(servicecode, '([a-z])([A-Z])', '\1 \2','g') AS servicecode, + (SELECT boundary_def.name FROM (VALUES tbl_boundary) AS boundary_def(name,code) where code=eg_pgr_address.mohalla) as locality, + servicerequestid AS complaintNo, + to_char(to_timestamp(TRUNC(CAST(eg_pgr_service.createdtime AS bigint) / 1000)), 'DD/MM/YYYY') AS date, + (case when eg_user.name is null then '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' else eg_user.name end) as name, --value for NULL + phone, + eg_pgr_address.landmark, + eg_pgr_address.housenoandstreetname as address, + description, + source, + (SELECT (CASE WHEN (((SELECT deptmap.slaHours FROM (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) WHERE deptmap.serviceCode = eg_pgr_service.servicecode)::integer / 24) - (epa.when - eg_pgr_service.createdtime)::bigint/86400000) < 1 THEN CONCAT('Overdue by ', ((epa.when - eg_pgr_service.createdtime)::bigint/86400000) - ((SELECT deptmap.slaHours FROM (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) WHERE deptmap.serviceCode = eg_pgr_service.servicecode)::integer / 24), ' days') ELSE CONCAT(((SELECT deptmap.slaHours FROM (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) WHERE deptmap.serviceCode = eg_pgr_service.servicecode)::integer / 24) - (epa.when - eg_pgr_service.createdtime)::bigint/86400000, ' days remaining') END) as slaHours), + Initcap(eg_pgr_service.status) as status, + to_char((To_timestamp(epa.when/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS actiondate + FROM eg_pgr_service + left outer join eg_pgr_address on eg_pgr_address.uuid = eg_pgr_service.addressid + left outer join eg_user on eg_user.id = eg_pgr_service.accountid::int + left outer join eg_pgr_action as epa on epa.businesskey = eg_pgr_service.servicerequestid and epa.action in ('assign','reassign','resolve') + inner join comps on concat(comps.actiontime,comps.businesskey)=concat(epa.when,epa.businesskey) and comps.businesskey=eg_pgr_service.servicerequestid and comps.actiontime=epa.when + --left outer join eg_user as ua on (ua.id = epa.assignee::integer or ua.id = split_part(epa.by,':',1)::INTEGER) + left outer join eg_user as ua on (ua.id = (case when epa.assignee is not null then epa.assignee::integer else split_part(epa.by,':',1)::INTEGER end)) + WHERE + eg_pgr_service.tenantid LIKE $tenantid + AND eg_pgr_address.uuid = eg_pgr_service.addressid + AND eg_pgr_service.status IN ('open','assigned','reassigrequested','rejected','closed','resolved') + orderby: ORDER BY servicerequestid, epa."when" desc + +- reportName: WBDescriptionReport_NEW_v2 + decryptionPathId: DescriptionReport_v2 + summary: Fetches department wise reports based description of the complaint + version: 1.0.0 + moduleName: rainmaker-pgr + externalService: + - entity: $.MdmsRes.RAINMAKER-PGR.ServiceDefs + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=RAINMAKER-PGR&masterName=ServiceDefs&tenantId=$tenantId + keyOrder: serviceCode,department,slaHours + tableName: tbl_dept + - entity: $.MdmsRes.common-masters.Department + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=common-masters&masterName=Department&tenantId=$tenantId + keyOrder: name,code + tableName: tbl_def_dept + sourceColumns: + - name: department + label: reports.rainmaker-pgr.department + type: string + source: eg_pgr_service + total: false + - name: servicecode + label: reports.rainmaker-pgr.servicecode + type: string + source: eg_pgr_service + total: false + - name: complaintNo + label: reports.rainmaker-pgr.complaintNo + type: string + source: eg_pgr_service + total: false + - name: date + label: reports.rainmaker-pgr.date + type: string + source: eg_pgr_service + total: false + - name: name + label: reports.rainmaker-pgr.name + type: string + source: eg_pgr_service + total: false + - name: phone + label: reports.rainmaker-pgr.phone + type: string + source: eg_pgr_service + total: false + - name: address + label: reports.rainmaker-pgr.address + type: string + source: eg_pgr_service + total: false + - name: locality + label: reports.rainmaker-pgr.locality + type: string + source: eg_pgr_service + total: false + - name: landmark + label: reports.rainmaker-pgr.landmark + type: string + source: eg_pgr_service + total: false + - name: description + label: reports.rainmaker-pgr.description + type: string + source: eg_pgr_service + total: false + - name: lastassignedto + label: reports.rainmaker-pgr.lastassignedto + type: string + source: eg_pgr_service + total: false + - name: status + label: reports.rainmaker-pgr.status + type: string + source: eg_pgr_service + total: false + - name: slahours + label: reports.rainmaker-pgr.slahours + type: string + source: eg_pgr_service + total: false + - name: actiondate + label: reports.rainmaker-pgr.actiondate + type: string + source: eg_pgr_service + total: false + - name: source + label: reports.rainmaker-pgr.source + type: string + source: eg_pgr_service + total: false + searchParams: + - name: fromDate + label: reports.rainmaker-pgr.datefrom + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND eg_pgr_service.createdtime >= $fromDate + - name: toDate + label: reports.rainmaker-pgr.dateto + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND eg_pgr_service.createdtime <= $toDate + query: | + SELECT + DISTINCT ON (servicerequestid) + (case when ua.name is null then '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' else ua.name end) as lastassignedto, --value for Unassigned + (SELECT deptmap_def.name FROM (VALUES tbl_def_dept) AS deptmap_def(name,code) INNER JOIN (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) on deptmap.serviceCode = eg_pgr_service.servicecode and deptmap_def.code = deptmap.department) AS department, + regexp_replace(servicecode, '([a-z])([A-Z])', '\1 \2','g') AS servicecode, + --(SELECT boundary_def.name FROM (VALUES tbl_boundary) AS boundary_def(name,code) where code=eg_pgr_address.mohalla) as locality, + servicerequestid AS complaintNo, + to_char(to_timestamp(TRUNC(CAST(eg_pgr_service.createdtime AS bigint) / 1000)), 'DD/MM/YYYY') AS date, + (case when eg_user.name is null then '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' else eg_user.name end) as name, --value for NULL + phone, + eg_pgr_address.landmark, + eg_pgr_address.housenoandstreetname as address, + description, + source, + (SELECT (CASE WHEN (((SELECT deptmap.slaHours FROM (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) WHERE deptmap.serviceCode = eg_pgr_service.servicecode)::integer / 24) - (epa.when - eg_pgr_service.createdtime)::bigint/86400000) < 1 THEN CONCAT('Overdue by ', ((epa.when - eg_pgr_service.createdtime)::bigint/86400000) - ((SELECT deptmap.slaHours FROM (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) WHERE deptmap.serviceCode = eg_pgr_service.servicecode)::integer / 24), ' days') ELSE CONCAT(((SELECT deptmap.slaHours FROM (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) WHERE deptmap.serviceCode = eg_pgr_service.servicecode)::integer / 24) - (epa.when - eg_pgr_service.createdtime)::bigint/86400000, ' days remaining') END) as slaHours), + Initcap(eg_pgr_service.status) as status, + to_char((To_timestamp(epa.when/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS actiondate + FROM eg_pgr_service + left outer join eg_pgr_address on eg_pgr_address.uuid = eg_pgr_service.addressid + left outer join eg_user on eg_user.id = eg_pgr_service.accountid::int + left outer join eg_pgr_action as epa on epa.businesskey = eg_pgr_service.servicerequestid and epa.action in ('assign','reassign','resolve') + left outer join eg_user as ua on (ua.id = epa.assignee::int or ua.id = split_part(epa.by,':',1)::INTEGER) + WHERE + eg_pgr_service.tenantid LIKE $tenantid + AND eg_pgr_address.uuid = eg_pgr_service.addressid + AND eg_pgr_service.servicecode in ('PipelineWorkTrafficJam','PipelineWorkTrenchpitNotBackfilled','PipelineWorkHouseConnectionDamaged','PipelineWorkRoadNotRestored','CivilWorksOverheadReservoirTank','CivilWorksWaterTreatmentPlant','EnvironmentalImpactHazardousMaterialAtSiteEtc','EnvironmentalImpactNoiseAndAirPollution','EnvironmentalImpactVehiclePollution','EnvironmentalImpactSoilContamination','EnvironmentalImpactSoilErosion','EnvironmentalImpactUnauthorisedTreeCutting','SocialImpactSexualHarrasmentAtWorkSiteEtc','SocialImpactResettlementOrRehabilitation','SocialImpactDamageOfProperty','SocialImpactLossOfLivelihood') + AND eg_pgr_service.status IN ('open','assigned','reassigrequested','rejected','closed','resolved') + orderby: ORDER BY servicerequestid, epa.when desc + +- reportName: StateWBDescriptionReport_NEW_v2 + decryptionPathId: DescriptionReport_v2 + summary: Fetches department wise reports based description of the complaint + version: 1.0.0 + moduleName: rainmaker-pgr + externalService: + - entity: $.MdmsRes.RAINMAKER-PGR.ServiceDefs + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=RAINMAKER-PGR&masterName=ServiceDefs&tenantId=$tenantId + keyOrder: serviceCode,department,slaHours + tableName: tbl_dept + - entity: $.MdmsRes.common-masters.Department + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=common-masters&masterName=Department&tenantId=$tenantId + keyOrder: name,code + tableName: tbl_def_dept + sourceColumns: + - name: department + label: reports.rainmaker-pgr.department + type: string + source: eg_pgr_service + total: false + - name: servicecode + label: reports.rainmaker-pgr.servicecode + type: string + source: eg_pgr_service + total: false + - name: complaintNo + label: reports.rainmaker-pgr.complaintNo + type: string + source: eg_pgr_service + total: false + - name: date + label: reports.rainmaker-pgr.date + type: string + source: eg_pgr_service + total: false + - name: name + label: reports.rainmaker-pgr.name + type: string + source: eg_pgr_service + total: false + - name: phone + label: reports.rainmaker-pgr.phone + type: string + source: eg_pgr_service + total: false + - name: address + label: reports.rainmaker-pgr.address + type: string + source: eg_pgr_service + total: false + - name: locality + label: reports.rainmaker-pgr.locality + type: string + source: eg_pgr_service + total: false + - name: landmark + label: reports.rainmaker-pgr.landmark + type: string + source: eg_pgr_service + total: false + - name: description + label: reports.rainmaker-pgr.description + type: string + source: eg_pgr_service + total: false + - name: lastassignedto + label: reports.rainmaker-pgr.lastassignedto + type: string + source: eg_pgr_service + total: false + - name: status + label: reports.rainmaker-pgr.status + type: string + source: eg_pgr_service + total: false + - name: slahours + label: reports.rainmaker-pgr.slahours + type: string + source: eg_pgr_service + total: false + - name: actiondate + label: reports.rainmaker-pgr.actiondate + type: string + source: eg_pgr_service + total: false + - name: source + label: reports.rainmaker-pgr.source + type: string + source: eg_pgr_service + total: false + - name: tenantid + label: reports.rainmaker-pgr.tenantid + type: string + source: eg_pgr_service + total: false + searchParams: + - name: fromDate + label: reports.rainmaker-pgr.datefrom + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND eg_pgr_service.createdtime >= $fromDate + - name: toDate + label: reports.rainmaker-pgr.dateto + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND eg_pgr_service.createdtime <= $toDate + query: | + SELECT + DISTINCT ON (servicerequestid) + (case when ua.name is null then '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' else ua.name end) as lastassignedto, --value for Unassigned + (SELECT deptmap_def.name FROM (VALUES tbl_def_dept) AS deptmap_def(name,code) INNER JOIN (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) on deptmap.serviceCode = eg_pgr_service.servicecode and deptmap_def.code = deptmap.department) AS department, + regexp_replace(servicecode, '([a-z])([A-Z])', '\1 \2','g') AS servicecode, + --(SELECT boundary_def.name FROM (VALUES tbl_boundary) AS boundary_def(name,code) where code=eg_pgr_address.mohalla) as locality, + servicerequestid AS complaintNo, + to_char(to_timestamp(TRUNC(CAST(eg_pgr_service.createdtime AS bigint) / 1000)), 'DD/MM/YYYY') AS date, + (case when eg_user.name is null then '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' else eg_user.name end) as name, --value for NULL + phone, + eg_pgr_address.landmark, + eg_pgr_address.housenoandstreetname as address, + description, + source, + eg_pgr_service.tenantid, + (SELECT (CASE WHEN (((SELECT deptmap.slaHours FROM (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) WHERE deptmap.serviceCode = eg_pgr_service.servicecode)::integer / 24) - (epa.when - eg_pgr_service.createdtime)::bigint/86400000) < 1 THEN CONCAT('Overdue by ', ((epa.when - eg_pgr_service.createdtime)::bigint/86400000) - ((SELECT deptmap.slaHours FROM (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) WHERE deptmap.serviceCode = eg_pgr_service.servicecode)::integer / 24), ' days') ELSE CONCAT(((SELECT deptmap.slaHours FROM (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) WHERE deptmap.serviceCode = eg_pgr_service.servicecode)::integer / 24) - (epa.when - eg_pgr_service.createdtime)::bigint/86400000, ' days remaining') END) as slaHours), + Initcap(eg_pgr_service.status) as status, + to_char((To_timestamp(epa.when/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS actiondate + FROM eg_pgr_service + left outer join eg_pgr_address on eg_pgr_address.uuid = eg_pgr_service.addressid + left outer join eg_user on eg_user.id = eg_pgr_service.accountid::int + left outer join eg_pgr_action as epa on epa.businesskey = eg_pgr_service.servicerequestid and epa.action in ('assign','reassign','resolve') + left outer join eg_user as ua on (ua.id = epa.assignee::int or ua.id = split_part(epa.by,':',1)::INTEGER) + WHERE + eg_pgr_service.tenantid !='pb.testing' + AND eg_pgr_address.uuid = eg_pgr_service.addressid + AND eg_pgr_service.servicecode in ('PipelineWorkTrafficJam','PipelineWorkTrenchpitNotBackfilled','PipelineWorkHouseConnectionDamaged','PipelineWorkRoadNotRestored','CivilWorksOverheadReservoirTank','CivilWorksWaterTreatmentPlant','EnvironmentalImpactHazardousMaterialAtSiteEtc','EnvironmentalImpactNoiseAndAirPollution','EnvironmentalImpactVehiclePollution','EnvironmentalImpactSoilContamination','EnvironmentalImpactSoilErosion','EnvironmentalImpactUnauthorisedTreeCutting','SocialImpactSexualHarrasmentAtWorkSiteEtc','SocialImpactResettlementOrRehabilitation','SocialImpactDamageOfProperty','SocialImpactLossOfLivelihood') + AND eg_pgr_service.status IN ('open','assigned','reassigrequested','rejected','closed','resolved') + orderby: ORDER BY servicerequestid, epa."when" desc + +- reportName: StateMsevaappDescriptionReport_NEW_v2 + decryptionPathId: DescriptionReport_v2 + summary: Fetches department wise reports based description of the complaint + version: 1.0.0 + moduleName: rainmaker-pgr + externalService: + - entity: $.MdmsRes.RAINMAKER-PGR.ServiceDefs + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=RAINMAKER-PGR&masterName=ServiceDefs&tenantId=$tenantId + keyOrder: serviceCode,department,slaHours + tableName: tbl_dept + - entity: $.MdmsRes.common-masters.Department + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=common-masters&masterName=Department&tenantId=$tenantId + keyOrder: name,code + tableName: tbl_def_dept + sourceColumns: + - name: department + label: reports.rainmaker-pgr.department + type: string + source: eg_pgr_service + total: false + - name: servicecode + label: reports.rainmaker-pgr.servicecode + type: string + source: eg_pgr_service + total: false + - name: complaintNo + label: reports.rainmaker-pgr.complaintNo + type: string + source: eg_pgr_service + total: false + - name: date + label: reports.rainmaker-pgr.date + type: string + source: eg_pgr_service + total: false + - name: name + label: reports.rainmaker-pgr.name + type: string + source: eg_pgr_service + total: false + - name: phone + label: reports.rainmaker-pgr.phone + type: string + source: eg_pgr_service + total: false + - name: address + label: reports.rainmaker-pgr.address + type: string + source: eg_pgr_service + total: false + - name: locality + label: reports.rainmaker-pgr.locality + type: string + source: eg_pgr_service + total: false + - name: landmark + label: reports.rainmaker-pgr.landmark + type: string + source: eg_pgr_service + total: false + - name: description + label: reports.rainmaker-pgr.description + type: string + source: eg_pgr_service + total: false + - name: lastassignedto + label: reports.rainmaker-pgr.lastassignedto + type: string + source: eg_pgr_service + total: false + - name: status + label: reports.rainmaker-pgr.status + type: string + source: eg_pgr_service + total: false + - name: slahours + label: reports.rainmaker-pgr.slahours + type: string + source: eg_pgr_service + total: false + - name: actiondate + label: reports.rainmaker-pgr.actiondate + type: string + source: eg_pgr_service + total: false + - name: source + label: reports.rainmaker-pgr.source + type: string + source: eg_pgr_service + total: false + - name: tenantid + label: reports.rainmaker-pgr.tenantid + type: string + source: eg_pgr_service + total: false + searchParams: + - name: fromDate + label: reports.rainmaker-pgr.datefrom + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND eg_pgr_service.createdtime >= $fromDate + - name: toDate + label: reports.rainmaker-pgr.dateto + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND eg_pgr_service.createdtime <= $toDate + query: | + SELECT + DISTINCT ON (servicerequestid) + (case when ua.name is null then '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' else ua.name end) as lastassignedto, --value for Unassigned + (SELECT deptmap_def.name FROM (VALUES tbl_def_dept) AS deptmap_def(name,code) INNER JOIN (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) on deptmap.serviceCode = eg_pgr_service.servicecode and deptmap_def.code = deptmap.department) AS department, + regexp_replace(servicecode, '([a-z])([A-Z])', '\1 \2','g') AS servicecode, + --(SELECT boundary_def.name FROM (VALUES tbl_boundary) AS boundary_def(name,code) where code=eg_pgr_address.mohalla) as locality, + servicerequestid AS complaintNo, + to_char(to_timestamp(TRUNC(CAST(eg_pgr_service.createdtime AS bigint) / 1000)), 'DD/MM/YYYY') AS date, + (case when eg_user.name is null then '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' else eg_user.name end) as name, --value for NULL + phone, + eg_pgr_address.landmark, + eg_pgr_address.housenoandstreetname as address, + description, + source, + eg_pgr_service.tenantid, + (SELECT (CASE WHEN (((SELECT deptmap.slaHours FROM (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) WHERE deptmap.serviceCode = eg_pgr_service.servicecode)::integer / 24) - (epa.when - eg_pgr_service.createdtime)::bigint/86400000) < 1 THEN CONCAT('Overdue by ', ((epa.when - eg_pgr_service.createdtime)::bigint/86400000) - ((SELECT deptmap.slaHours FROM (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) WHERE deptmap.serviceCode = eg_pgr_service.servicecode)::integer / 24), ' days') ELSE CONCAT(((SELECT deptmap.slaHours FROM (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) WHERE deptmap.serviceCode = eg_pgr_service.servicecode)::integer / 24) - (epa.when - eg_pgr_service.createdtime)::bigint/86400000, ' days remaining') END) as slaHours), + Initcap(eg_pgr_service.status) as status, + to_char((To_timestamp(epa.when/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS actiondate + FROM eg_pgr_service + left outer join eg_pgr_address on eg_pgr_address.uuid = eg_pgr_service.addressid + left outer join eg_user on eg_user.id = eg_pgr_service.accountid::int + left outer join eg_pgr_action as epa on epa.businesskey = eg_pgr_service.servicerequestid and epa.action in ('assign','reassign','resolve') + left outer join eg_user as ua on (ua.id = epa.assignee::int or ua.id = split_part(epa.by,':',1)::INTEGER) + WHERE + eg_pgr_service.tenantid !='pb.testing' + AND eg_pgr_address.uuid = eg_pgr_service.addressid + AND eg_pgr_service.servicecode in ('PropertyTaxIssue','TradeLicenseIssue','FireNocIssue','WaterandSewerageIssue') + AND eg_pgr_service.status IN ('open','assigned','reassigrequested') + orderby: ORDER BY servicerequestid, epa."when" desc + diff --git a/configs/reports/configs/pt-reports.yml b/configs/reports/configs/pt-reports.yml new file mode 100644 index 00000000..f4b4e906 --- /dev/null +++ b/configs/reports/configs/pt-reports.yml @@ -0,0 +1,9541 @@ +--- +ReportDefinitions: +- reportName: ReceiptRegister + decryptionPathId: ReceiptRegister + summary: Receipt Register + version: 1.0.0 + moduleName: rainmaker-pt + additionalConfig: + print: + pdfPageSize: "A1" + sourceColumns: + - name: receiptnumber + label: reports.pt.receiptNo + type: string + source: pt + total: false + - name: receiptdate + label: reports.pt.receiptDate + type: string + source: pt + total: false + - name: g8issuedate + label: reports.pt.g8issuedate + type: string + source: pt + total: false + - name: g8receiptno + label: reports.pt.g8receiptno + type: string + source: pt + total: false + - name: amount + label: reports.pt.amount + type: string + source: pt + total: true + - name: propertytax + label: reports.pt.propertyTax + type: string + source: pt + total: true + - name: firecess + label: reports.pt.fireCess + type: string + source: pt + total: true + - name: cancercess + label: reports.pt.cancerCess + type: string + source: pt + total: true + - name: rebate + label: reports.pt.rebate + type: string + source: pt + total: true + - name: adhocrebate + label: reports.pt.adhocrebate + type: string + source: pt + total: true + - name: penalty + label: reports.pt.penalty + type: string + source: pt + total: true + - name: adhocpenalty + label: reports.pt.adhocpenalty + type: string + source: pt + total: true + - name: interest + label: reports.pt.interest + type: string + source: pt + total: true + - name: exemption + label: reports.pt.exemption + type: string + source: pt + total: true + - name: adjustment + label: reports.pt.roundoff + type: string + source: pt + total: true + - name: pendingamount + label: reports.pt.pendingamount + type: string + source: pt + total: true + - name: propertyid + label: reports.pt.propertyId + type: string + source: pt + total: false + - name: usagetype + label: reports.pt.usagetype + type: string + source: pt + total: false + - name: assessmentnumber + label: reports.pt.assessmentNo + type: string + source: pt + total: false + - name: financialyear + label: reports.pt.financialYear + type: string + source: pt + total: false + - name: instrumenttype + label: reports.pt.paymentMode + type: string + source: pt + total: false + - name: transactionnumber + label: reports.pt.ddChequeTransactionNo + type: string + source: pt + total: false + - name: transactiondate + label: reports.pt.ddChequeTransactionDate + type: string + source: pt + total: false + - name: bankname + label: reports.pt.bankName + type: string + source: pt + total: false + - name: collectorname + label: reports.pt.collectorname + type: string + source: pt + total: false + - name: remarks + label: reports.pt.remarks + type: string + source: pt + total: false + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: true + searchClause: AND rh.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: true + searchClause: AND rh.receiptdate <= $toDate + - name: paymentMode + label: Payment Mode + type: singlevaluelist + pattern: 'list://Cash:Cash,Online:Online,Card:Card,DD:DD,Cheque:Cheque' + source: pt + isMandatory: false + searchClause: AND instrumenttype = $paymentMo + - name: financialyear + label: Financial Year + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name + source: pt + wrapper: true + isMandatory: false + searchClause: AND financialyear = $financialyear + - name: localityArray + label: reports.pt.zoneList + type: boundarylist + source: pt + isMandatory: false + searchClause: AND pt_addr.locality IN ($localityArray) + query: | + -- Use CTE to force query plan, compute & use CTE later + WITH receipt_breakup AS ( + SELECT + receiptheader, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, + SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as propertytax, + (SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN adjustedamount ELSE 0 END) )as exemption, + ( SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END)) as adjustment + FROM egcl_receiptdetails_v1 as rd + INNER JOIN egcl_receiptheader_v1 as rh on rh.id = rd.receiptheader + WHERE rd.tenantid = $tenantid and rh.status != 'Cancelled' and businessdetails='PT' + GROUP BY rd.receiptheader + ) + SELECT + rh.tenantid AS tenantid, + rh.id, + Substring(rh.consumercode, '(.*):') AS propertyid, + Substring(rh.consumercode, ':(.*)') AS assessmentnumber, + rh.consumercode, + to_char((To_timestamp(rh.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS receiptdate, + bankid AS bankname, + receiptnumber, + amount, + instrumenttype, + transactionnumber, + to_char((To_timestamp(transactiondate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, + receipt_breakup.*, + rh.totalamount - ih.amount AS pendingamount, + pt_detail.financialyear, + to_char((To_timestamp(rh.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, + Initcap(COALESCE(pt_detail.usagecategoryminor, pt_detail.usagecategorymajor)) as usagetype, + manualreceiptnumber as g8receiptno, + (case when eg_user.name is null then '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' else eg_user.name end) as collectorname, + pt_detail.additionaldetails->>'remarks' as "remarks" + FROM egcl_receiptheader_v1 AS rh + JOIN egcl_receiptinstrument_v1 AS ri ON rh.id = ri.receiptheader + JOIN egcl_instrumentheader_v1 AS ih ON ih.id = ri.instrumentheader + JOIN receipt_breakup ON rh.id = receipt_breakup.receiptheader + JOIN eg_pt_propertydetail_v2 pt_detail ON (pt_detail.property || ':' || pt_detail.assessmentnumber) = rh.consumercode + JOIN eg_pt_address_v2 pt_addr ON pt_detail.property = pt_addr.property + LEFT OUTER JOIN eg_user ON eg_user.id = rh.createdby::INTEGER + WHERE rh.tenantid = $tenantid and rh.status != 'Cancelled' and businessdetails='PT' + orderby: ORDER BY rh.receiptdate DESC + +- reportName: CancelledReceiptRegister + summary: Receipt Register for cancelled Receipts + version: 1.0.0 + moduleName: rainmaker-pt + additionalConfig: + print: + pdfPageSize: "A1" + sourceColumns: + - name: receiptnumber + label: reports.pt.receiptNo + type: string + source: pt + total: false + - name: status + label: reports.pt.status + type: string + source: pt + total: false + - name: transactiondate + label: reports.pt.receiptDate + type: string + source: pt + total: false + - name: g8issuedate + label: reports.pt.g8issuedate + type: string + source: pt + total: false + - name: g8receiptno + label: reports.pt.g8receiptno + type: string + source: pt + total: false + - name: amount + label: reports.pt.amount + type: string + source: pt + total: true + - name: propertytax + label: reports.pt.propertyTax + type: string + source: pt + total: true + - name: firecess + label: reports.pt.fireCess + type: string + source: pt + total: true + - name: cancercess + label: reports.pt.cancerCess + type: string + source: pt + total: true + - name: rebate + label: reports.pt.rebate + type: string + source: pt + total: true + - name: adhocrebate + label: reports.pt.adhocrebate + type: string + source: pt + total: true + - name: penalty + label: reports.pt.penalty + type: string + source: pt + total: true + - name: adhocpenalty + label: reports.pt.adhocpenalty + type: string + source: pt + total: true + - name: interest + label: reports.pt.interest + type: string + source: pt + total: true + - name: exemption + label: reports.pt.exemption + type: string + source: pt + total: true + - name: adjustment + label: reports.pt.roundoff + type: string + source: pt + total: true + - name: propertyid + label: reports.pt.propertyId + type: string + source: pt + total: false + - name: usagetype + label: reports.pt.usagetype + type: string + source: pt + total: false + - name: assessmentnumber + label: reports.pt.assessmentNo + type: string + source: pt + total: false + - name: financialyear + label: reports.pt.financialYear + type: string + source: pt + total: false + - name: instrumenttype + label: reports.pt.paymentMode + type: string + source: pt + total: false + - name: transactionnumber + label: reports.pt.ddChequeTransactionNo + type: string + source: pt + total: false + - name: bankname + label: reports.pt.bankName + type: string + source: pt + total: false + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: false + searchClause: AND rh.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: false + searchClause: AND rh.receiptdate <= $toDate + - name: paymentMode + label: Payment Mode + type: singlevaluelist + pattern: 'list://Cash:Cash,Online:Online,Card:Card,DD:DD,Cheque:Cheque' + source: pt + isMandatory: false + searchClause: AND instrumenttype = $paymentMode + - name: financialyear + label: Financial Year + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name + source: pt + wrapper: true + isMandatory: false + searchClause: AND financialyear = $financialyear + - name: localityArray + label: reports.pt.zoneList + type: boundarylist + source: pt + isMandatory: false + searchClause: AND pt_addr.locality IN ($localityArray) + query: | + -- Use CTE to force query plan, compute & use CTE later + WITH receipt_breakup AS ( + SELECT + receiptheader, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, + SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as propertytax, + (SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN adjustedamount ELSE 0 END) )as exemption, + ( SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END)) as adjustment + FROM egcl_receiptdetails_v1 as rd + INNER JOIN egcl_receiptheader_v1 as rh on rh.id = rd.receiptheader + WHERE rd.tenantid = $tenantid and rh.status = 'Cancelled' and businessdetails='PT' + GROUP BY rd.receiptheader + ) + SELECT + rh.tenantid AS tenantid, + rh.id, + Substring(rh.consumercode, '(.*):') AS propertyid, + Substring(rh.consumercode, ':(.*)') AS assessmentnumber, + rh.status, + rh.consumercode, + rh.receiptdate, + to_char((To_timestamp(rh.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, + bankid AS bankname, + receiptnumber, + amount, + instrumenttype, + transactionnumber, + receipt_breakup.*, + rh.totalamount - ih.amount AS pendingamount, + pt_detail.financialyear, + to_char((To_timestamp(rh.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, + Initcap(COALESCE(pt_detail.usagecategoryminor, pt_detail.usagecategorymajor)) as usagetype, + manualreceiptnumber as g8receiptno + FROM egcl_receiptheader_v1 AS rh + JOIN egcl_receiptinstrument_v1 AS ri ON rh.id = ri.receiptheader + JOIN egcl_instrumentheader_v1 AS ih ON ih.id = ri.instrumentheader + JOIN receipt_breakup ON rh.id = receipt_breakup.receiptheader + JOIN eg_pt_propertydetail_v2 pt_detail ON (pt_detail.property || ':' || pt_detail.assessmentnumber) = rh.consumercode + JOIN eg_pt_address_v2 pt_addr ON pt_detail.property = pt_addr.property + WHERE rh.tenantid = $tenantid and rh.status = 'Cancelled' and businessdetails='PT' + orderby: ORDER BY rh.receiptdate DESC + +- reportName: OldUlbWisePtCollection + summary: ULB-wise PT Collection + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: totalassessments + label: reports.pt.totalassessments + type: string + source: pt + total: true + - name: totalamountpaid + label: reports.pt.totalamountpaid + type: string + source: pt + total: true + - name: totalamountdue + label: reports.pt.totalamountdue + type: string + source: pt + total: true + searchParams: + - name: financialyear + label: Financial Year + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name + source: pt + wrapper: true + isMandatory: false + searchClause: AND financialyear = $financialyear + - name: usage + label: Usage + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=PropertyTax&masterName=UsageCategoryMajor|$..code|$..name + source: pt + wrapper: true + isMandatory: false + searchClause: AND usagecategorymajor = $usage + query: | + SELECT + tenantid, + COUNT(*) AS totalassessments, + SUM(totalamount) AS totalamount, + SUM(amount) AS totalamountpaid, + (SUM(totalamount) - SUM(amount)) AS totalamountdue + FROM eg_pt_propertydetail_v2 AS pd + LEFT OUTER JOIN + (SELECT consumercode, totalamount, amount FROM egcl_receiptheader_v1 AS rh + LEFT OUTER JOIN egcl_receiptinstrument_v1 AS ri ON rh.id = ri.receiptheader + LEFT OUTER JOIN egcl_instrumentheader_v1 AS ih ON ri.instrumentheader = ih.id + and ih.instrumentstatus != 'CANCELLED' + where rh.status != 'Cancelled' + ) AS instrument_data ON (pd.property || ':' || pd.assessmentnumber) = instrument_data.consumercode + WHERE tenantid = $tenantid + groupby: GROUP BY tenantid + orderby: ORDER BY tenantid, totalamountpaid DESC NULLS LAST + +- reportName: StateCancelledReceiptRegister + summary: Receipt Register for cancelled Receipts State + version: 1.0.0 + moduleName: rainmaker-pt + additionalConfig: + print: + pdfPageSize: "A1" + sourceColumns: + - name: tenantid + label: reports.pt.ulbName + type: string + source: pt + total: false + - name: receiptnumber + label: reports.pt.receiptNo + type: string + source: pt + total: false + - name: status + label: reports.pt.status + type: string + source: pt + total: false + - name: transactiondate + label: reports.pt.receiptDate + type: string + source: pt + total: false + - name: g8issuedate + label: reports.pt.g8issuedate + type: string + source: pt + total: false + - name: g8receiptno + label: reports.pt.g8receiptno + type: string + source: pt + total: false + - name: amount + label: reports.pt.amount + type: string + source: pt + total: true + - name: propertytax + label: reports.pt.propertyTax + type: string + source: pt + total: true + - name: firecess + label: reports.pt.fireCess + type: string + source: pt + total: true + - name: cancercess + label: reports.pt.cancerCess + type: string + source: pt + total: true + - name: rebate + label: reports.pt.rebate + type: string + source: pt + total: true + - name: adhocrebate + label: reports.pt.adhocrebate + type: string + source: pt + total: true + - name: penalty + label: reports.pt.penalty + type: string + source: pt + total: true + - name: adhocpenalty + label: reports.pt.adhocpenalty + type: string + source: pt + total: true + - name: interest + label: reports.pt.interest + type: string + source: pt + total: true + - name: exemption + label: reports.pt.exemption + type: string + source: pt + total: true + - name: adjustment + label: reports.pt.roundoff + type: string + source: pt + total: true + - name: propertyid + label: reports.pt.propertyId + type: string + source: pt + total: false + - name: usagetype + label: reports.pt.usagetype + type: string + source: pt + total: false + - name: assessmentnumber + label: reports.pt.assessmentNo + type: string + source: pt + total: false + - name: financialyear + label: reports.pt.financialYear + type: string + source: pt + total: false + - name: instrumenttype + label: reports.pt.paymentMode + type: string + source: pt + total: false + - name: transactionnumber + label: reports.pt.ddChequeTransactionNo + type: string + source: pt + total: false + - name: bankname + label: reports.pt.bankName + type: string + source: pt + total: false + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: false + searchClause: AND rh.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: false + searchClause: AND rh.receiptdate <= $toDate + - name: paymentMode + label: Payment Mode + type: singlevaluelist + pattern: 'list://Cash:Cash,Online:Online,Card:Card,DD:DD,Cheque:Cheque' + source: pt + isMandatory: false + searchClause: AND instrumenttype = $paymentMode + - name: financialyear + label: Financial Year + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name + source: pt + wrapper: true + isMandatory: false + searchClause: AND financialyear = $financialyear + query: | + -- Use CTE to force query plan, compute & use CTE later + WITH receipt_breakup AS ( + SELECT + receiptheader, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, + SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as propertytax, + (SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN adjustedamount ELSE 0 END) )as exemption, + ( SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END)) as adjustment + FROM egcl_receiptdetails_v1 as rd + INNER JOIN egcl_receiptheader_v1 as rh on rh.id = rd.receiptheader + WHERE rd.tenantid !='pb.testing' and rh.status = 'Cancelled' and businessdetails='PT' + GROUP BY rd.receiptheader + ) + SELECT + rh.tenantid AS tenantid, + rh.id, + Substring(rh.consumercode, '(.*):') AS propertyid, + Substring(rh.consumercode, ':(.*)') AS assessmentnumber, + rh.status, + rh.consumercode, + rh.receiptdate, + to_char((To_timestamp(rh.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, + bankid AS bankname, + receiptnumber, + amount, + instrumenttype, + transactionnumber, + receipt_breakup.*, + rh.totalamount - ih.amount AS pendingamount, + pt_detail.financialyear, + to_char((To_timestamp(rh.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, + Initcap(COALESCE(pt_detail.usagecategoryminor, pt_detail.usagecategorymajor)) as usagetype, + manualreceiptnumber as g8receiptno + FROM egcl_receiptheader_v1 AS rh + JOIN egcl_receiptinstrument_v1 AS ri ON rh.id = ri.receiptheader + JOIN egcl_instrumentheader_v1 AS ih ON ih.id = ri.instrumentheader + JOIN receipt_breakup ON rh.id = receipt_breakup.receiptheader + JOIN eg_pt_propertydetail_v2 pt_detail ON (pt_detail.property || ':' || pt_detail.assessmentnumber) = rh.consumercode + JOIN eg_pt_address_v2 pt_addr ON pt_detail.property = pt_addr.property + WHERE rh.tenantid != 'pb.testing' and rh.status = 'Cancelled' and businessdetails='PT' + orderby: ORDER BY rh.receiptdate DESC + +- reportName: StateWidePtCollection + summary: State Wide PT Collection + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: tenantid + label: reports.pt.ulbName + type: string + source: pt + total: false + - name: totalassessments + label: reports.pt.totalassessments + type: string + source: pt + total: true + - name: totalamountpaid + label: reports.pt.totalamountpaid + type: string + source: pt + total: true + - name: totaloffline + label: reports.pt.totaloffline + type: string + source: pt + total: true + - name: totalonline + label: reports.pt.totalonline + type: string + source: pt + total: true + - name: totalamountdue + label: reports.pt.totalamountdue + type: string + source: pt + total: true + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: false + searchClause: AND receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: false + searchClause: AND receiptdate <= $toDate + - name: ulb + label: ULB + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: pt + wrapper: true + isMandatory: false + searchClause: AND tenantid = $ulb + - name: financialyear + label: Financial Year + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name + source: pt + wrapper: true + isMandatory: false + searchClause: AND financialyear = $financialyear + - name: usage + label: Usage + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=PropertyTax&masterName=UsageCategoryMajor|$..code|$..name + source: pt + wrapper: true + isMandatory: false + searchClause: AND usagecategorymajor = $usage + query: | + SELECT + initcap(split_part(tenantid, '.', 2)) as tenantid, + COUNT(*) AS totalassessments, + SUM(totalamount) AS totalamount, + SUM(amount) AS totalamountpaid, + SUM(CASE WHEN collectiontype LIKE 'ONLINE' THEN amount ELSE 0 END) AS totalonline, + SUM(CASE WHEN collectiontype LIKE 'COUNTER' THEN amount ELSE 0 END) AS totaloffline, + (SUM(totalamount) - SUM(amount)) AS totalamountdue + FROM eg_pt_propertydetail_v2 AS pd + LEFT OUTER JOIN (SELECT consumercode, totalamount, amount, collectiontype, receiptdate FROM egcl_receiptheader_v1 AS rh + LEFT OUTER JOIN egcl_receiptinstrument_v1 AS ri ON rh.id = ri.receiptheader + LEFT OUTER JOIN egcl_instrumentheader_v1 AS ih ON ri.instrumentheader = ih.id and ih.instrumentstatus != 'CANCELLED' + where rh.status != 'Cancelled' and rh.tenantid != 'pb.testing' and businessdetails='PT' + ) AS tbl_amounts ON (pd.property || ':' || pd.assessmentnumber) = tbl_amounts.consumercode + WHERE tenantid not in ('pb.testing','pb.ludhiana_legacy') + groupby: GROUP BY tenantid + orderby: ORDER BY tenantid, totalamountpaid DESC NULLS LAST + +- reportName: UlbWisePtCollection + summary: State Wide PT Collection + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: totalassessments + label: reports.pt.totalassessments + type: string + source: pt + total: true + - name: totalamountpaid + label: reports.pt.totalamountpaid + type: string + source: pt + total: true + - name: totaloffline + label: reports.pt.totaloffline + type: string + source: pt + total: true + - name: countoffline + label: reports.pt.countoffline + type: string + source: pt + total: true + - name: totalonline + label: reports.pt.totalonline + type: string + source: pt + total: true + - name: countonline + label: reports.pt.countonline + type: string + source: pt + total: true + - name: totalamountdue + label: reports.pt.totalamountdue + type: string + source: pt + total: true + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: false + searchClause: AND receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: false + searchClause: AND receiptdate <= $toDate + - name: financialyear + label: Financial Year + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name + source: pt + wrapper: true + isMandatory: false + searchClause: AND financialyear = $financialyear + - name: usage + label: Usage + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=PropertyTax&masterName=UsageCategoryMajor|$..code|$..name + source: pt + wrapper: true + isMandatory: false + searchClause: AND usagecategorymajor = $usage + query: | + SELECT + initcap(split_part(tenantid, '.', 2)) as tenantid, + COUNT(collectiontype) AS totalassessments, + SUM(totalamount) AS totalamount, + SUM(amount) AS totalamountpaid, + SUM(CASE WHEN collectiontype LIKE 'ONLINE' THEN amount ELSE 0 END) AS totalonline, + SUM(CASE WHEN collectiontype LIKE 'ONLINE' THEN 1 ELSE 0 END) AS countonline, + SUM(CASE WHEN collectiontype LIKE 'COUNTER' THEN amount ELSE 0 END) AS totaloffline, + SUM(CASE WHEN collectiontype LIKE 'COUNTER' THEN 1 ELSE 0 END) AS countoffline, + (SUM(totalamount) - SUM(amount)) AS totalamountdue + FROM eg_pt_propertydetail_v2 AS pd + LEFT OUTER JOIN (SELECT consumercode, totalamount, amount, collectiontype, receiptdate FROM egcl_receiptheader_v1 AS rh + LEFT OUTER JOIN egcl_receiptinstrument_v1 AS ri ON rh.id = ri.receiptheader + LEFT OUTER JOIN egcl_instrumentheader_v1 AS ih ON ri.instrumentheader = ih.id and ih.instrumentstatus != 'CANCELLED' + where rh.status != 'Cancelled' + ) AS tbl_amounts ON (pd.property || ':' || pd.assessmentnumber) = tbl_amounts.consumercode + WHERE tenantid LIKE CONCAT(SPLIT_PART($tenantid, '.', 1), '%') and tenantid = $tenantid + groupby: GROUP BY tenantid + orderby: ORDER BY tenantid, totalamountpaid DESC NULLS LAST + + +- reportName: ULBPTDataDumpReportOld + summary: ULB level report + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: ulb + label: reports.pt.ulb + type: string + source: pt + total: false + - name: propertytaxuniqueid + label: reports.pt.propertytaxuniqueid + type: string + source: pt + total: false + - name: transcationdate + label: reports.pt.transcationdate + type: string + source: pt + total: false + - name: receiptnumber + label: reports.pt.receiptnumber + type: string + source: pt + total: false + - name: existingpropertyid + label: reports.pt.existingpropertyid + type: string + source: pt + total: false + - name: financialyear + label: reports.pt.financialYear + type: string + source: pt + total: false + - name: ownername + label: reports.pt.ownername + type: string + source: pt + total: false + - name: guardianname + label: reports.pt.guardianname + type: string + source: pt + total: false + - name: totalarea + label: reports.pt.totalarea + type: string + source: pt + total: false + - name: builtarea + label: reports.pt.builtarea + type: string + source: pt + total: false + - name: floors + label: reports.pt.floors + type: string + source: pt + total: false + - name: occupancy + label: reports.pt.occupancy + type: string + source: pt + total: false + - name: propertytype + label: reports.pt.propertytype + type: string + source: pt + total: false + - name: mobileno + label: reports.pt.mobileno + type: string + source: pt + total: false + - name: transcationmode + label: reports.pt.transcationmode + type: string + source: pt + total: false + - name: paymentamount + label: reports.pt.paymentamount + type: string + source: pt + total: true + - name: paymentdate + label: reports.pt.paymentdate + type: string + source: pt + total: false + - name: emailid + label: reports.pt.emailid + type: string + source: pt + total: false + - name: address + label: reports.pt.address + type: string + source: pt + total: false + - name: remarks + label: reports.pt.remarks + type: string + source: pt + total: false + - name: businessname + label: reports.pt.businessname + type: string + source: pt + total: false + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: true + searchClause: AND rh.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: true + searchClause: AND rh.receiptdate <= $toDate + query: | + --S.no Service Name ULB Property Tax Unique ID Date Of Transcation Receipt Number Existing Property ID Owner Name Guardian Name Total Area (SQ.YARD) Covered Area/Built Area (SQ.FEET) Floors Occupancy (Rented,Self /Unoccupied) Type Of Property Mobile Number Transcation Mode of Payment Payment Amount Payment Date Email Id Address + with eg_pt_unit_v2_ot as ( + select + propertydetail, + string_agg(distinct pu.occupancytype, ',') as occupancytype, + string_agg(distinct coalesce(usagecategoryminor, usagecategorymajor), ',') as propertytype + from eg_pt_unit_v2 as pu + where pu.tenantid = $tenantid + group by propertydetail + ) + select + distinct on (rh.receiptnumber) + initcap(split_part(rh.tenantid, '.', 2)) as "ulb", + split_part(consumercode, ':', 1) as "propertytaxuniqueid", + to_char((To_timestamp(receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS "transcationdate", + receiptnumber as "receiptnumber", + pt.oldpropertyid as "existingpropertyid", + pd.financialyear as "financialyear", + eu."name" as "ownername", + eu.guardian as "guardianname", + pd.landarea as "totalarea", + pd.builduparea * 9 as "builtarea", + pd.nooffloors as "floors", + pot.occupancytype as "occupancy", + pot.propertytype as "propertytype", + eu.mobilenumber as "mobileno", + instrumenttype as "transcationmode", + ih.amount as "paymentamount", + to_char((To_timestamp(ih.transactiondate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS "paymentdate", + eu.emailid as "emailid" , + REGEXP_REPLACE(REGEXP_REPLACE(CONCAT(pta.doorno, ',', pta.addressline1, ',', pta.addressline2, ',', pta.buildingname, ',', pta.pincode), ',+', ','), '^,|,$', '') as "address", + pd.additionaldetails->>'remarks' as "remarks", + pt.additionaldetails->>'FirmBusinessName' as "businessname" + from egcl_receiptheader_v1 as rh + inner join egcl_receiptinstrument_v1 as ri on ri.receiptheader = rh.id + inner join egcl_instrumentheader_v1 as ih on ih.id = ri.instrumentheader + inner join eg_pt_property_v2 as pt on pt.propertyid = split_part(consumercode, ':', 1) + inner join eg_pt_propertydetail_v2 as pd on pd.assessmentnumber = split_part(consumercode, ':', 2) + inner join eg_pt_owner_v2 as po on po.propertydetail = pd.assessmentnumber + inner join eg_user as eu on eu.uuid = po.userid + inner join eg_pt_address_v2 as pta on pta.property = pt.propertyid + left outer join eg_pt_unit_v2_ot as pot on pot.propertydetail = pd.assessmentnumber + where rh.tenantid = $tenantid and rh.status != 'Cancelled' + +- reportName: ReceiptRegisterShort + summary: Receipt Register + version: 1.0.0 + moduleName: rainmaker-pt + additionalConfig: + print: + pdfPageSize: "Legal" + sourceColumns: + - name: receiptnumber + label: reports.pt.receiptNo + type: string + source: pt + total: false + - name: transactiondate + label: reports.pt.receiptDate + type: string + source: pt + total: false + - name: g8receiptno + label: reports.pt.g8book + type: string + source: pt + total: false + - name: g8issuedate + label: reports.pt.g8dated + type: string + source: pt + total: false + - name: propertyid + label: reports.pt.ptrId + type: string + source: pt + total: false + - name: financialyear + label: reports.pt.financialYear + type: string + source: pt + total: false + - name: instrumenttype + label: reports.pt.paymentMode + type: string + source: pt + total: false + - name: amount + label: reports.pt.taxamount + type: string + source: pt + total: true + - name: transactionnumber + label: reports.pt.ddChequeNo + type: string + source: pt + total: false + - name: bankname + label: reports.pt.bankName + type: string + source: pt + total: false + - name: collectorname + label: reports.pt.collectorname + type: string + source: pt + total: false + - name: remarks + label: reports.pt.remarks + type: string + source: pt + total: false + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: true + searchClause: AND rh.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: true + searchClause: AND rh.receiptdate <= $toDate + - name: paymentMode + label: Payment Mode + type: singlevaluelist + pattern: 'list://Cash:Cash,Online:Online,Card:Card,DD:DD,Cheque:Cheque' + source: pt + isMandatory: false + searchClause: AND instrumenttype = $paymentMode + - name: financialyear + label: Financial Year + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name + source: pt + wrapper: true + isMandatory: false + searchClause: AND financialyear = $financialyear + - name: localityArray + label: reports.pt.zoneList + type: boundarylist + source: pt + isMandatory: false + searchClause: AND pt_addr.locality IN ($localityArray) + - name: collectorname + label: reports.pt.collectorname + type: singlevaluelist + pattern: http://egov-hrms:8080/egov-hrms/employees/_search?tenantId=$tenantid&roles=PTCEMP|$.Employees[*].user.id|$.Employees[*].user.name + source: pt + wrapper: true + isMandatory: false + searchClause: AND eg_user.id = $collectorname::INTEGER + query: | + -- Use CTE to force query plan, compute & use CTE later + WITH receipt_breakup AS ( + SELECT + receiptheader, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, + SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as propertytax, + (SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN adjustedamount ELSE 0 END) )as exemption, + ( SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END)) as adjustment + FROM egcl_receiptdetails_v1 as rd + INNER JOIN egcl_receiptheader_v1 as rh on rh.id = rd.receiptheader + WHERE rd.tenantid = $tenantid and rh.status != 'Cancelled' and businessdetails ='PT' + GROUP BY rd.receiptheader + ) + SELECT + rh.tenantid AS tenantid, + rh.id, + Substring(rh.consumercode, '(.*):') AS propertyid, + Substring(rh.consumercode, ':(.*)') AS assessmentnumber, + rh.consumercode, + rh.receiptdate, + to_char((To_timestamp(rh.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, + bankid AS bankname, + receiptnumber, + amount, + instrumenttype, + transactionnumber, + receipt_breakup.*, + rh.totalamount - ih.amount AS pendingamount, + pt_detail.financialyear, + to_char((To_timestamp(rh.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, + Initcap(COALESCE(pt_detail.usagecategoryminor, pt_detail.usagecategorymajor)) as usagetype, + manualreceiptnumber as g8receiptno, + (CASE WHEN collectiontype='COUNTER' THEN eg_user.name ELSE '' END) as collectorname, + pt_detail.additionaldetails->>'remarks' as "remarks" + FROM egcl_receiptheader_v1 AS rh + JOIN egcl_receiptinstrument_v1 AS ri ON rh.id = ri.receiptheader + JOIN egcl_instrumentheader_v1 AS ih ON ih.id = ri.instrumentheader + JOIN receipt_breakup ON rh.id = receipt_breakup.receiptheader + JOIN eg_pt_propertydetail_v2 pt_detail ON (pt_detail.property || ':' || pt_detail.assessmentnumber) = rh.consumercode + JOIN eg_pt_address_v2 pt_addr ON pt_detail.property = pt_addr.property + LEFT OUTER JOIN eg_user ON eg_user.id = rh.createdby::INTEGER + WHERE rh.tenantid = $tenantid and rh.status != 'Cancelled' and businessdetails ='PT' + orderby: ORDER BY rh.receiptdate DESC + + +- reportName: ULBPTDataDumpReport + summary: ULB level report + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: ulb + label: reports.pt.ulb + type: string + source: pt + total: false + - name: propertytaxuniqueid + label: reports.pt.propertytaxuniqueid + type: string + source: pt + total: false + - name: transcationdate + label: reports.pt.transcationdate + type: string + source: pt + total: false + - name: receiptnumber + label: reports.pt.receiptnumber + type: string + source: pt + total: false + - name: existingpropertyid + label: reports.pt.existingpropertyid + type: string + source: pt + total: false + - name: financialyear + label: reports.pt.financialYear + type: string + source: pt + total: false + - name: ownername + label: reports.pt.ownername + type: string + source: pt + total: false + - name: guardianname + label: reports.pt.guardianname + type: string + source: pt + total: false + - name: totalarea + label: reports.pt.totalarea + type: string + source: pt + total: false + - name: builtarea + label: reports.pt.builtarea + type: string + source: pt + total: false + - name: floors + label: reports.pt.floors + type: string + source: pt + total: false + - name: occupancy + label: reports.pt.occupancy + type: string + source: pt + total: false + - name: propertytype + label: reports.pt.propertytype + type: string + source: pt + total: false + - name: mobileno + label: reports.pt.mobileno + type: string + source: pt + total: false + - name: transcationmode + label: reports.pt.transcationmode + type: string + source: pt + total: false + - name: paymentamount + label: reports.pt.paymentamount + type: string + source: pt + total: true + - name: paymentdate + label: reports.pt.paymentdate + type: string + source: pt + total: false + - name: emailid + label: reports.pt.emailid + type: string + source: pt + total: false + - name: address + label: reports.pt.address + type: string + source: pt + total: false + - name: payeraddress + label: reports.pt.payeraddress + type: string + source: pt + total: false + - name: remarks + label: reports.pt.remarks + type: string + source: pt + total: false + - name: businessname + label: reports.pt.businessname + type: string + source: pt + total: false + - name: localitycode + label: reports.pt.localitycode + type: string + source: pt + total: false + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: true + searchClause: AND rh.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: true + searchClause: AND rh.receiptdate <= $toDate + - name: financialyear + label: Financial Year + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name + source: pt + wrapper: true + isMandatory: false + searchClause: AND pd.financialyear = $financialyear + - name: localityArray + label: reports.pt.zoneList + type: boundarylist + source: pt + isMandatory: false + searchClause: AND pta.locality IN ($localityArray) + query: | + --S.no Service Name ULB Property Tax Unique ID Date Of Transcation Receipt Number Existing Property ID Owner Name Guardian Name Total Area (SQ.YARD) Covered Area/Built Area (SQ.FEET) Floors Occupancy (Rented,Self /Unoccupied) Type Of Property Mobile Number Transcation Mode of Payment Payment Amount Payment Date Email Id Address + with eg_pt_unit_v2_ot as ( + select + propertydetail, + string_agg(distinct pu.occupancytype, ',') as occupancytype, + string_agg(distinct coalesce(usagecategoryminor, usagecategorymajor), ',') as propertytype + from eg_pt_unit_v2 as pu + where pu.tenantid = $tenantid + group by propertydetail + ) + select + distinct on (rh.receiptnumber) + initcap(split_part(rh.tenantid, '.', 2)) as "ulb", + split_part(consumercode, ':', 1) as "propertytaxuniqueid", + to_char((To_timestamp(receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS "transcationdate", + receiptnumber as "receiptnumber", + pt.oldpropertyid as "existingpropertyid", + pd.financialyear as "financialyear", + eu."name" as "ownername", + eu.guardian as "guardianname", + pd.landarea as "totalarea", + pd.builduparea * 9 as "builtarea", + pd.nooffloors as "floors", + pot.occupancytype as "occupancy", + pot.propertytype as "propertytype", + eu.mobilenumber as "mobileno", + instrumenttype as "transcationmode", + ih.amount as "paymentamount", + to_char((To_timestamp(ih.transactiondate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS "paymentdate", + eu.emailid as "emailid", + REGEXP_REPLACE(REGEXP_REPLACE(CONCAT(pta.doorno, ',', pta.addressline1, ',', pta.addressline2, ',', pta.buildingname, ',', pta.pincode), ',+', ','), '^,|,$', '') as "address", + rh.payeraddress as "payeraddress", + pd.additionaldetails->>'remarks' as "remarks", + pt.additionaldetails->>'FirmBusinessName' as "businessname", + pta.locality as "localitycode" + from egcl_receiptheader_v1 as rh + inner join egcl_receiptinstrument_v1 as ri on ri.receiptheader = rh.id + inner join egcl_instrumentheader_v1 as ih on ih.id = ri.instrumentheader + inner join eg_pt_property_v2 as pt on pt.propertyid = split_part(consumercode, ':', 1) + inner join eg_pt_propertydetail_v2 as pd on pd.assessmentnumber = split_part(consumercode, ':', 2) + inner join eg_pt_owner_v2 as po on po.propertydetail = pd.assessmentnumber + inner join eg_user as eu on eu.uuid = po.userid + inner join eg_pt_address_v2 as pta on pta.property = pt.propertyid + left outer join eg_pt_unit_v2_ot as pot on pot.propertydetail = pd.assessmentnumber + where rh.tenantid = $tenantid and rh.status != 'Cancelled' and businessdetails ='PT' + +- reportName: Sewa_Kendra_ReceiptRegister + summary: Sewa Kendra Receipt Register + version: 1.0.0 + moduleName: rainmaker-pt + additionalConfig: + print: + pdfPageSize: "A1" + sourceColumns: + - name: receiptnumber + label: reports.pt.receiptNo + type: string + source: pt + total: false + - name: receiptdate + label: reports.pt.receiptDate + type: string + source: pt + total: false + - name: g8issuedate + label: reports.pt.g8issuedate + type: string + source: pt + total: false + - name: g8receiptno + label: reports.pt.g8receiptno + type: string + source: pt + total: false + - name: amount + label: reports.pt.amount + type: string + source: pt + total: true + - name: propertytax + label: reports.pt.propertyTax + type: string + source: pt + total: true + - name: firecess + label: reports.pt.fireCess + type: string + source: pt + total: true + - name: cancercess + label: reports.pt.cancerCess + type: string + source: pt + total: true + - name: rebate + label: reports.pt.rebate + type: string + source: pt + total: true + - name: adhocrebate + label: reports.pt.adhocrebate + type: string + source: pt + total: true + - name: penalty + label: reports.pt.penalty + type: string + source: pt + total: true + - name: adhocpenalty + label: reports.pt.adhocpenalty + type: string + source: pt + total: true + - name: interest + label: reports.pt.interest + type: string + source: pt + total: true + - name: exemption + label: reports.pt.exemption + type: string + source: pt + total: true + - name: adjustment + label: reports.pt.roundoff + type: string + source: pt + total: true + - name: pendingamount + label: reports.pt.pendingamount + type: string + source: pt + total: true + - name: propertyid + label: reports.pt.propertyId + type: string + source: pt + total: false + - name: usagetype + label: reports.pt.usagetype + type: string + source: pt + total: false + - name: assessmentnumber + label: reports.pt.assessmentNo + type: string + source: pt + total: false + - name: financialyear + label: reports.pt.financialYear + type: string + source: pt + total: false + - name: instrumenttype + label: reports.pt.paymentMode + type: string + source: pt + total: false + - name: transactionnumber + label: reports.pt.ddChequeTransactionNo + type: string + source: pt + total: false + - name: transactiondate + label: reports.pt.ddChequeTransactionDate + type: string + source: pt + total: false + - name: bankname + label: reports.pt.bankName + type: string + source: pt + total: false + - name: collectorname + label: reports.pt.collectorname + type: string + source: pt + total: false + - name: remarks + label: reports.pt.remarks + type: string + source: pt + total: false + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: true + searchClause: AND rh.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: true + searchClause: AND rh.receiptdate <= $toDate + - name: paymentMode + label: Payment Mode + type: singlevaluelist + pattern: 'list://Cash:Cash,Online:Online,Card:Card,DD:DD,Cheque:Cheque' + source: pt + isMandatory: false + searchClause: AND instrumenttype = $paymentMode + - name: financialyear + label: Financial Year + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name + source: pt + wrapper: true + isMandatory: false + searchClause: AND financialyear = $financialyear + - name: localityArray + label: reports.pt.zoneList + type: boundarylist + source: pt + isMandatory: false + searchClause: AND pt_addr.locality IN ($localityArray) + query: | + -- Use CTE to force query plan, compute & use CTE later + WITH receipt_breakup AS ( + SELECT + receiptheader, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, + SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as propertytax, + (SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN adjustedamount ELSE 0 END) )as exemption, + ( SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END)) as adjustment + FROM egcl_receiptdetails_v1 as rd + INNER JOIN egcl_receiptheader_v1 as rh on rh.id = rd.receiptheader + WHERE rd.tenantid = $tenantid and rh.status != 'Cancelled' and businessdetails='PT' and rh.createdby::INTEGER in (select user_id from eg_userrole_v1 where role_code ='SEVA_KENDRA_EMP') + GROUP BY rd.receiptheader + ) + SELECT + rh.tenantid AS tenantid, + rh.id, + Substring(rh.consumercode, '(.*):') AS propertyid, + Substring(rh.consumercode, ':(.*)') AS assessmentnumber, + rh.consumercode, + to_char((To_timestamp(rh.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS receiptdate, + bankid AS bankname, + receiptnumber, + amount, + instrumenttype, + transactionnumber, + to_char((To_timestamp(transactiondate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, + receipt_breakup.*, + rh.totalamount - ih.amount AS pendingamount, + pt_detail.financialyear, + to_char((To_timestamp(rh.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, + Initcap(COALESCE(pt_detail.usagecategoryminor, pt_detail.usagecategorymajor)) as usagetype, + manualreceiptnumber as g8receiptno, + (case when eg_user.name is null then '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' else eg_user.name end) as collectorname, + pt_detail.additionaldetails->>'remarks' as "remarks" + FROM egcl_receiptheader_v1 AS rh + JOIN egcl_receiptinstrument_v1 AS ri ON rh.id = ri.receiptheader + JOIN egcl_instrumentheader_v1 AS ih ON ih.id = ri.instrumentheader + JOIN receipt_breakup ON rh.id = receipt_breakup.receiptheader + JOIN eg_pt_propertydetail_v2 pt_detail ON (pt_detail.property || ':' || pt_detail.assessmentnumber) = rh.consumercode + JOIN eg_pt_address_v2 pt_addr ON pt_detail.property = pt_addr.property + LEFT OUTER JOIN eg_user ON eg_user.id = rh.createdby::INTEGER + WHERE rh.tenantid = $tenantid and rh.status != 'Cancelled' and businessdetails='PT' and rh.createdby::INTEGER in + (select user_id from eg_userrole_v1 where role_code ='SEVA_KENDRA_EMP') + orderby: ORDER BY rh.receiptdate DESC + +- reportName: ReceiptRegisterSummary + summary: Receipt Register Summary + version: 1.0.0 + moduleName: rainmaker-pt + additionalConfig: + print: + pdfPageSize: "A1" + sourceColumns: + - name: ulb + label: reports.pt.ulb + type: string + source: pt + total: false + - name: adhocpenalty + label: reports.pt.adhocpenalty + type: string + source: pt + total: true + - name: adhocrebate + label: reports.pt.adhocrebate + type: string + source: pt + total: true + - name: firecess + label: reports.pt.firecess + type: string + source: pt + total: true + - name: cancercess + label: reports.pt.cancercess + type: string + source: pt + total: true + - name: interest + label: reports.pt.interest + type: string + source: pt + total: true + - name: penalty + label: reports.pt.penalty + type: string + source: pt + total: true + - name: rebate + label: reports.pt.rebate + type: string + source: pt + total: true + - name: propertytax + label: reports.pt.propertytax + type: string + source: pt + total: true + - name: exemption + label: reports.pt.exemption + type: string + source: pt + total: true + - name: adjustment + label: reports.pt.adjustment + type: string + source: pt + total: true + - name: adhocrebate + label: reports.pt.adhocrebate + type: string + source: pt + total: true + - name: noofassessments + label: reports.pt.noofassessments + type: string + source: pt + total: true + - name: collectorname + label: reports.pt.collectorname + type: string + source: pt + total: false + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: true + searchClause: AND rh.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: true + searchClause: AND rh.receiptdate <= $toDate + - name: collectorname + label: reports.pt.collectorname + type: singlevaluelist + pattern: http://egov-hrms:8080/egov-hrms/employees/_search?tenantId=$tenantid&roles=PTCEMP|$.Employees[*].user.id|$.Employees[*].user.name + source: pt + wrapper: true + isMandatory: false + searchClause: AND eg_user.id = $collectorname::INTEGER + query: | + -- Use CTE to force query plan, compute & use CTE later + SELECT + split_part(rd.tenantid,'.',2) as ulb, + Count (*)/8 noofassessments, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, + SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as propertytax, + (SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN adjustedamount ELSE 0 END) )as exemption, + ( SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END)) as adjustment, + (CASE WHEN collectiontype='COUNTER' THEN eg_user.name ELSE 'Online' END) as collectorname + FROM egcl_receiptdetails_v1 as rd + INNER JOIN egcl_receiptheader_v1 as rh on rh.id = rd.receiptheader + LEFT OUTER JOIN eg_user ON eg_user.id = rh.createdby::INTEGER + WHERE rd.tenantid = $tenantid and rh.status != 'Cancelled' and businessdetails='PT' + groupby: group by rd.tenantid,collectorname + +- reportName: StateReceiptRegisterSummary + summary: Receipt Register Summary + version: 1.0.0 + moduleName: rainmaker-pt + additionalConfig: + print: + pdfPageSize: "A1" + sourceColumns: + - name: ulb + label: reports.pt.ulb + type: string + source: pt + total: false + - name: adhocpenalty + label: reports.pt.adhocpenalty + type: string + source: pt + total: true + - name: adhocrebate + label: reports.pt.adhocrebate + type: string + source: pt + total: true + - name: firecess + label: reports.pt.firecess + type: string + source: pt + total: true + - name: cancercess + label: reports.pt.cancercess + type: string + source: pt + total: true + - name: interest + label: reports.pt.interest + type: string + source: pt + total: true + - name: penalty + label: reports.pt.penalty + type: string + source: pt + total: true + - name: rebate + label: reports.pt.rebate + type: string + source: pt + total: true + - name: propertytax + label: reports.pt.propertytax + type: string + source: pt + total: true + - name: exemption + label: reports.pt.exemption + type: string + source: pt + total: true + - name: adjustment + label: reports.pt.adjustment + type: string + source: pt + total: true + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: false + searchClause: AND rh.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: false + searchClause: AND rh.receiptdate <= $toDate + - name: ulb + label: ULB + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: pt + wrapper: true + isMandatory: false + searchClause: AND rd.tenantid = $ulb + query: | + -- Use CTE to force query plan, compute & use CTE later + SELECT + split_part(rd.tenantid,'.',2) as ulb, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, + SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as propertytax, + (SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN adjustedamount ELSE 0 END) )as exemption, + ( SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END)) as adjustment + FROM egcl_receiptdetails_v1 as rd + INNER JOIN egcl_receiptheader_v1 as rh on rh.id = rd.receiptheader + WHERE rd.tenantid != 'pb.testing' and rh.status != 'Cancelled' and businessdetails='PT' + groupby: group by rd.tenantid + orderby: order by rd.tenantid + +- reportName: FYCollectionsReport + summary: FY Collections + version: 1.0.0 + moduleName: rainmaker-pt + additionalConfig: + print: + pdfPageSize: "Legal" + sourceColumns: + - name: financialyear + label: reports.pt.financialyear + type: string + source: pt + total: false + - name: residential + label: reports.pt.residential + type: string + source: pt + total: true + - name: nonresidential + label: reports.pt.nonresidential + type: string + source: pt + total: true + - name: mixed + label: reports.pt.mixed + type: string + source: pt + total: true + - name: totalamount + label: reports.pt.totalamount + type: string + source: pt + total: true + - name: online + label: reports.pt.online + type: string + source: pt + total: true + - name: cash + label: reports.pt.cash + type: string + source: pt + total: true + - name: cheque + label: reports.pt.cheque + type: string + source: pt + total: true + - name: dd + label: reports.pt.dd + type: string + source: pt + total: true + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: false + searchClause: AND rh.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: false + searchClause: AND rh.receiptdate <= $toDate + - name: localityArray + label: reports.pt.zoneList + type: boundarylist + source: pt + isMandatory: false + searchClause: AND pt_addr.locality IN ($localityArray) + query: | + -- Use CTE to force query plan, compute & use CTE later + SELECT + financialyear, + sum(case when usagecategorymajor='RESIDENTIAL' then amount else 0 end) as "residential", + sum(case when usagecategorymajor='RESIDENTIAL' then 1 else 0 end) as "countresidential", + sum(case when usagecategorymajor='NONRESIDENTIAL' then amount else 0 end) as "nonresidential", + sum(case when usagecategorymajor='NONRESIDENTIAL' then 1 else 0 end) as "countnonresidential", + sum(case when usagecategorymajor='MIXED' then amount else 0 end) as "mixed", + sum(case when usagecategorymajor='MIXED' then 1 else 0 end) as "countmixed", + sum(amount) as totalamount, + count(amount) as totalcount, + sum(case when instrumenttype='Online' then amount else 0 end) as "online", + sum(case when instrumenttype='Cash' then amount else 0 end) as "cash", + sum(case when instrumenttype='Cheque' then amount else 0 end) as "cheque", + sum(case when instrumenttype='DD' then amount else 0 end) as "dd" + FROM egcl_receiptheader_v1 AS rh + JOIN egcl_receiptinstrument_v1 AS ri ON rh.id = ri.receiptheader + JOIN egcl_instrumentheader_v1 AS ih ON ih.id = ri.instrumentheader + JOIN eg_pt_propertydetail_v2 pt_detail ON (pt_detail.property || ':' || pt_detail.assessmentnumber) = rh.consumercode + JOIN eg_pt_address_v2 pt_addr ON pt_detail.property = pt_addr.property + LEFT OUTER JOIN eg_user ON eg_user.id = rh.createdby::INTEGER + WHERE rh.tenantid = $tenantid and rh.status != 'Cancelled' + groupby: GROUP BY financialyear + orderby: ORDER BY financialyear + +- reportName: ULBDEFAULTERPTREPORT + summary: ULB Defaulter Pt report + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: ulb + label: reports.pt.ulb + type: string + source: pt + total: false + - name: propertytaxuniqueid + label: reports.pt.propertytaxuniqueid + type: string + source: pt + total: false + - name: transcationdate + label: reports.pt.transcationdate + type: string + source: pt + total: false + - name: receiptnumber + label: reports.pt.receiptnumber + type: string + source: pt + total: false + - name: existingpropertyid + label: reports.pt.existingpropertyid + type: string + source: pt + total: false + - name: financialyear + label: reports.pt.financialYear + type: string + source: pt + total: false + - name: ownername + label: reports.pt.ownername + type: string + source: pt + total: false + - name: guardianname + label: reports.pt.guardianname + type: string + source: pt + total: false + - name: propertytype + label: reports.pt.propertytype + type: string + source: pt + total: false + - name: mobileno + label: reports.pt.mobileno + type: string + source: pt + total: false + - name: address + label: reports.pt.address + type: string + source: pt + total: false + - name: payeraddress + label: reports.pt.payeraddress + type: string + source: pt + total: false + searchParams: + - name: localityArray + label: reports.pt.zoneList + type: boundarylist + source: pt + isMandatory: true + searchClause: AND pta.locality IN ($localityArray) + query: | + --S.no Service Name ULB Property Tax Unique ID Date Of Transcation Receipt Number Existing Property ID Type Of Property Mobile Number Address + with eg_pt_unit_v2_ot as ( + select + propertydetail, + string_agg(distinct pu.occupancytype, ',') as occupancytype, + string_agg(distinct coalesce(usagecategoryminor, usagecategorymajor), ',') as propertytype + from eg_pt_unit_v2 as pu + where pu.tenantid =$tenantid + group by propertydetail + ) + select + distinct on (rh.receiptnumber) + initcap(split_part(rh.tenantid, '.', 2)) as "ulb", + split_part(consumercode, ':', 1) as "propertytaxuniqueid", + to_char((To_timestamp(receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS "transcationdate", + receiptnumber as "receiptnumber", + pt.oldpropertyid as "existingpropertyid", + pd.financialyear as "financialyear", + eu."name" as "ownername", + eu.guardian as "guardianname", + pot.propertytype as "propertytype", + eu.mobilenumber as "mobileno", + REGEXP_REPLACE(REGEXP_REPLACE(CONCAT(pta.doorno, ',', pta.addressline1, ',', pta.addressline2, ',', pta.buildingname, ',', pta.pincode), ',+', ','), '^,|,$', '') as "address" + from egcl_receiptheader_v1 as rh + inner join egcl_receiptinstrument_v1 as ri on ri.receiptheader = rh.id + inner join egcl_instrumentheader_v1 as ih on ih.id = ri.instrumentheader + inner join eg_pt_property_v2 as pt on pt.propertyid = split_part(consumercode, ':', 1) + inner join eg_pt_propertydetail_v2 as pd on pd.assessmentnumber = split_part(consumercode, ':', 2) + inner join eg_pt_owner_v2 as po on po.propertydetail = pd.assessmentnumber + inner join eg_user as eu on eu.uuid = po.userid + inner join eg_pt_address_v2 as pta on pta.property = pt.propertyid + left outer join eg_pt_unit_v2_ot as pot on pot.propertydetail = pd.assessmentnumber + where rh.tenantid =$tenantid and pd.property not in (select property from eg_pt_propertydetail_v2 where financialyear in ('2019-20')) + +- reportName: ReceiptRegister_V2 + decryptionPathId: ReceiptRegister_V2 + summary: Receipt Register + version: 1.0.0 + moduleName: rainmaker-pt + additionalConfig: + print: + pdfPageSize: "A1" + sourceColumns: + - name: receiptnumber + label: reports.pt.receiptNo + type: string + source: pt + total: false + - name: receiptdate + label: reports.pt.receiptDate + type: string + source: pt + total: false + - name: g8issuedate + label: reports.pt.g8issuedate + type: string + source: pt + total: false + - name: g8receiptno + label: reports.pt.g8receiptno + type: string + source: pt + total: false + - name: amount + label: reports.pt.amount + type: string + source: pt + total: true + - name: propertytax + label: reports.pt.propertyTax + type: string + source: pt + total: true + - name: firecess + label: reports.pt.fireCess + type: string + source: pt + total: true + - name: cancercess + label: reports.pt.cancerCess + type: string + source: pt + total: true + - name: rebate + label: reports.pt.rebate + type: string + source: pt + total: true + - name: adhocrebate + label: reports.pt.adhocrebate + type: string + source: pt + total: true + - name: penalty + label: reports.pt.penalty + type: string + source: pt + total: true + - name: adhocpenalty + label: reports.pt.adhocpenalty + type: string + source: pt + total: true + - name: interest + label: reports.pt.interest + type: string + source: pt + total: true + - name: exemption + label: reports.pt.exemption + type: string + source: pt + total: true + - name: adjustment + label: reports.pt.roundoff + type: string + source: pt + total: true + - name: pendingamount + label: reports.pt.pendingamount + type: string + source: pt + total: true + - name: consumercode + label: reports.pt.propertyId + type: string + source: pt + total: false + - name: usagetype + label: reports.pt.usagetype + type: string + source: pt + total: false + - name: instrumenttype + label: reports.pt.paymentMode + type: string + source: pt + total: false + - name: transactionnumber + label: reports.pt.ddChequeTransactionNo + type: string + source: pt + total: false + - name: transactiondate + label: reports.pt.ddChequeTransactionDate + type: string + source: pt + total: false + - name: transactiondate + label: reports.pt.ddChequeTransactionDate + type: string + source: pt + total: false + - name: bankname + label: reports.pt.bankName + type: string + source: pt + total: false + - name: collectorname + label: reports.pt.collectorname + type: string + source: pt + total: false + - name: financialyear + label: reports.pt.financialyear + type: string + source: pt + total: false + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: true + searchClause: AND pd.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: true + searchClause: AND pd.receiptdate <= $toDate + - name: financialyear + label: Financial Year + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name + source: pt + wrapper: true + isMandatory: false + searchClause: AND concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) = $financialyear + - name: paymentMode + label: Payment Mode + type: singlevaluelist + pattern: 'list://CARD:Card,CASH:Cash,CHEQUE:Cheque,DD:DD,OFFLINE_NEFT:NEFT,OFFLINE_RTGS:RTGS,ONLINE:Online,POSTAL_ORDER:PostalOrder' + source: pt + isMandatory: false + searchClause: AND payment.paymentmode = replace($paymentMode,',','_') + - name: localityArray + label: reports.pt.zoneList + type: boundarylist + source: pt + isMandatory: false + searchClause: AND pt_addr.locality IN ($localityArray) + query: | + -- Use CTE to force query plan, compute & use CTE later + WITH receipt_breakup AS ( + SELECT + pd.id as pdid, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, + SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN bad.amount ELSE 0 END) as propertytax, + SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as paidpropertytax, + (SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN bad.amount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN bad.amount ELSE 0 END) ) as exemption, + (SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END)) as adjustment + FROM egcl_billaccountdetail as bad + INNER JOIN egcl_billdetial as bd on bd.id = bad.billdetailid + INNER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid + INNER JOIN egcl_payment as payment on pd.paymentid=payment.id + WHERE payment.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' + GROUP BY pdid + ) + SELECT + pd.tenantid AS tenantid, + pd.id, + pt.propertyid as consumercode, + to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS receiptdate, + payment.ifsccode AS bankname, + receiptnumber, + payment.totalamountpaid as amount, + payment.paymentmode as instrumenttype, + payment.transactionnumber, + concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear, + to_char((To_timestamp(payment.transactiondate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, + payment.totaldue - payment.totalamountpaid AS pendingamount, + Initcap(case when pt.usagecategory like '%.%' then split_part(pt.usagecategory,'.',2) else pt.usagecategory end) as usagetype, + (case when eg_user.name is null then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else eg_user.name end) as collectorname, + receipt_breakup.*, + to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, + manualreceiptnumber as g8receiptno + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment,eg_pg_transactions as pg, eg_pt_property as pt, receipt_breakup, egcl_bill bill, + (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr + where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + and pt.propertyid = bill.consumercode and receipt_breakup.pdid=pd.id and pt.status!='INACTIVE' + and pt_addr.propertyid=pt.id and payment.transactionnumber = pg.txn_id + --and pt.propertyid='PT-1012-978737' + --and receiptnumber='PT/1012/2020-21/001021' + orderby: ORDER BY pd.receiptdate DESC; + + +- reportName: ReceiptRegister_without_locality_V2 + decryptionPathId: ReceiptRegister_V2 + summary: Receipt Register + version: 1.0.0 + moduleName: rainmaker-pt + additionalConfig: + print: + pdfPageSize: "A1" + sourceColumns: + - name: receiptnumber + label: reports.pt.receiptNo + type: string + source: pt + total: false + - name: receiptdate + label: reports.pt.receiptDate + type: string + source: pt + total: false + - name: g8issuedate + label: reports.pt.g8issuedate + type: string + source: pt + total: false + - name: g8receiptno + label: reports.pt.g8receiptno + type: string + source: pt + total: false + - name: amount + label: reports.pt.amount + type: string + source: pt + total: true + - name: propertytax + label: reports.pt.propertyTax + type: string + source: pt + total: true + - name: paidpropertytax + label: reports.pt.paidpropertyTax + type: string + source: pt + total: true + - name: firecess + label: reports.pt.fireCess + type: string + source: pt + total: true + - name: cancercess + label: reports.pt.cancerCess + type: string + source: pt + total: true + - name: rebate + label: reports.pt.rebate + type: string + source: pt + total: true + - name: adhocrebate + label: reports.pt.adhocrebate + type: string + source: pt + total: true + - name: penalty + label: reports.pt.penalty + type: string + source: pt + total: true + - name: adhocpenalty + label: reports.pt.adhocpenalty + type: string + source: pt + total: true + - name: interest + label: reports.pt.interest + type: string + source: pt + total: true + - name: exemption + label: reports.pt.exemption + type: string + source: pt + total: true + - name: adjustment + label: reports.pt.roundoff + type: string + source: pt + total: true + - name: pendingamount + label: reports.pt.pendingamount + type: string + source: pt + total: true + - name: consumercode + label: reports.pt.propertyId + type: string + source: pt + total: false + - name: usagetype + label: reports.pt.usagetype + type: string + source: pt + total: false + - name: surveyid + label: reports.pt.surveyid + type: string + source: pt + total: false + - name: instrumenttype + label: reports.pt.paymentMode + type: string + source: pt + total: false + - name: transactionnumber + label: reports.pt.ddChequeTransactionNo + type: string + source: pt + total: false + - name: transactiondate + label: reports.pt.ddChequeTransactionDate + type: string + source: pt + total: false + - name: bankname + label: reports.pt.bankName + type: string + source: pt + total: false + - name: collectorname + label: reports.pt.collectorname + type: string + source: pt + total: false + - name: financialyear + label: reports.pt.financialyear + type: string + source: pt + total: false + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: true + searchClause: AND pd.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: true + searchClause: AND pd.receiptdate <= $toDate + - name: financialyear + label: Financial Year + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name + source: pt + wrapper: true + isMandatory: false + searchClause: AND concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) = $financialyear + - name: paymentMode + label: Payment Mode + type: singlevaluelist + pattern: 'list://CARD:Card,CASH:Cash,CHEQUE:Cheque,DD:DD,OFFLINE_NEFT:NEFT,OFFLINE_RTGS:RTGS,ONLINE:Online,POSTAL_ORDER:PostalOrder' + source: pt + isMandatory: false + searchClause: AND payment.paymentmode = replace($paymentMode,',','_') + query: | + -- Use CTE to force query plan, compute & use CTE later + WITH receipt_breakup AS ( + SELECT + pd.id as pdid, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, + SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN bad.amount ELSE 0 END) as propertytax, + SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as paidpropertytax, + (SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN bad.amount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN bad.amount ELSE 0 END) ) as exemption, + (SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END)) as adjustment + FROM egcl_billaccountdetail as bad + INNER JOIN egcl_billdetial as bd on bd.id = bad.billdetailid + INNER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid + INNER JOIN egcl_payment as payment on pd.paymentid=payment.id + WHERE payment.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' + AND pd.receiptdate >= $fromDate AND pd.receiptdate <= $toDate + GROUP BY pdid + ) + SELECT + pd.tenantid AS tenantid, + pd.id, + pt.propertyid as consumercode, + pt.surveyid as surveyid, + to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS receiptdate, + --payment.ifsccode AS bankname, + concat(bank_branches.bank_name,' ',bank_branches.branch) as bankname, + receiptnumber, + payment.totalamountpaid as amount, + payment.paymentmode as instrumenttype, + payment.transactionnumber, + concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear, + to_char((To_timestamp(payment.instrumentdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, + payment.totaldue - payment.totalamountpaid AS pendingamount, + Initcap(case when pt.usagecategory like '%.%' then split_part(pt.usagecategory,'.',2) else pt.usagecategory end) as usagetype, + (case when eg_user.name is null then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else eg_user.name end) as collectorname, + receipt_breakup.*, + to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, + manualreceiptnumber as g8receiptno + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment left outer join bank_branches on bank_branches.ifsc=payment.ifsccode, + (select * from (select *,(row_number() over(partition by propertyid order by lastmodifiedtime desc)) as rw from eg_pt_property where tenantid=$tenantid) pts where rw=1) as pt, + receipt_breakup, egcl_bill bill + --,(select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr + where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + and pt.propertyid = bill.consumercode and receipt_breakup.pdid=pd.id --and pt.status!='INACTIVE' + --and pt_addr.propertyid=pt.id + orderby: ORDER BY pd.receiptdate DESC; + + +- reportName: CancelledReceiptRegister_V2 + decryptionPathId: CancelledReceiptRegister_V2 + summary: Receipt Register for cancelled Receipts + version: 1.0.0 + moduleName: rainmaker-pt + additionalConfig: + print: + pdfPageSize: "A1" + sourceColumns: + - name: receiptnumber + label: reports.pt.receiptNo + type: string + source: pt + total: false + - name: receiptdate + label: reports.pt.receiptDate + type: string + source: pt + total: false + - name: g8issuedate + label: reports.pt.g8issuedate + type: string + source: pt + total: false + - name: g8receiptno + label: reports.pt.g8receiptno + type: string + source: pt + total: false + - name: amount + label: reports.pt.amount + type: string + source: pt + total: true + - name: propertytax + label: reports.pt.propertyTax + type: string + source: pt + total: true + - name: firecess + label: reports.pt.fireCess + type: string + source: pt + total: true + - name: cancercess + label: reports.pt.cancerCess + type: string + source: pt + total: true + - name: rebate + label: reports.pt.rebate + type: string + source: pt + total: true + - name: adhocrebate + label: reports.pt.adhocrebate + type: string + source: pt + total: true + - name: penalty + label: reports.pt.penalty + type: string + source: pt + total: true + - name: adhocpenalty + label: reports.pt.adhocpenalty + type: string + source: pt + total: true + - name: interest + label: reports.pt.interest + type: string + source: pt + total: true + - name: exemption + label: reports.pt.exemption + type: string + source: pt + total: true + - name: adjustment + label: reports.pt.roundoff + type: string + source: pt + total: true + - name: pendingamount + label: reports.pt.pendingamount + type: string + source: pt + total: true + - name: consumercode + label: reports.pt.propertyId + type: string + source: pt + total: false + - name: instrumenttype + label: reports.pt.paymentMode + type: string + source: pt + total: false + - name: transactionnumber + label: reports.pt.ddChequeTransactionNo + type: string + source: pt + total: false + - name: transactiondate + label: reports.pt.ddChequeTransactionDate + type: string + source: pt + total: false + - name: bankname + label: reports.pt.bankName + type: string + source: pt + total: false + - name: collectorname + label: reports.pt.collectorname + type: string + source: pt + total: false + - name: financialyear + label: reports.pt.financialyear + type: string + source: pt + total: false + - name: paymentstatus + label: reports.pt.paymentstatus + type: string + source: pt + total: false + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: true + searchClause: AND pd.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: true + searchClause: AND pd.receiptdate <= $toDate + - name: financialyear + label: Financial Year + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name + source: pt + wrapper: true + isMandatory: false + searchClause: AND concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) = $financialyear + - name: paymentMode + label: Payment Mode + type: singlevaluelist + pattern: 'list://CARD:Card,CASH:Cash,CHEQUE:Cheque,DD:DD,OFFLINE_NEFT:NEFT,OFFLINE_RTGS:RTGS,ONLINE:Online,POSTAL_ORDER:PostalOrder' + source: pt + isMandatory: false + searchClause: AND payment.paymentmode = replace($paymentMode,',','_') + query: | + -- Use CTE to force query plan, compute & use CTE later + WITH receipt_breakup AS ( + SELECT + pd.id as pdid, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, + SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN bad.amount ELSE 0 END) as propertytax, + SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as paidpropertytax, + (SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN bad.amount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN bad.amount ELSE 0 END) ) as exemption, + (SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END)) as adjustment + FROM egcl_billaccountdetail as bad + INNER JOIN egcl_billdetial as bd on bd.id = bad.billdetailid + INNER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid + INNER JOIN egcl_payment as payment on pd.paymentid=payment.id + WHERE payment.tenantid = $tenantid and payment.paymentstatus = 'CANCELLED' and pd.businessservice='PT' + GROUP BY pdid + ) + SELECT + pd.tenantid AS tenantid, + pd.id, + bill.consumercode as consumercode, + to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS receiptdate, + --payment.ifsccode AS bankname, + concat(bank_branches.bank_name,' ',bank_branches.branch) as bankname, + receiptnumber, + payment.totalamountpaid as amount, + payment.paymentmode as instrumenttype, + payment.transactionnumber, + concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear, + to_char((To_timestamp(payment.transactiondate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, + payment.totaldue - payment.totalamountpaid AS pendingamount, + --Initcap(case when pt.usagecategory like '%.%' then split_part(pt.usagecategory,'.',2) else pt.usagecategory end) as usagetype, + (case when eg_user.name is null then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else eg_user.name end) as collectorname, + receipt_breakup.*, + to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, + manualreceiptnumber as g8receiptno, + bill.additionaldetails + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment left outer join bank_branches on bank_branches.ifsc=payment.ifsccode, receipt_breakup, egcl_bill bill + --,(select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr + where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus = 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + --and pt.propertyid = bill.consumercode + and receipt_breakup.pdid=pd.id + --and pt_addr.propertyid=pt.id + orderby: ORDER BY pd.receiptdate DESC; + +- reportName: OldUlbWisePtCollection_V2 + summary: ULB-wise PT Collection + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: totalassessments + label: reports.pt.totalassessments + type: string + source: pt + total: true + - name: totalamountpaid + label: reports.pt.totalamountpaid + type: string + source: pt + total: true + - name: totalamountdue + label: reports.pt.totalamountdue + type: string + source: pt + total: true + searchParams: + - name: financialyear + label: Financial Year + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name + source: pt + wrapper: true + isMandatory: false + searchClause: AND financialyear = $financialyear + - name: usage + label: Usage + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=PropertyTax&masterName=UsageCategoryMajor|$..code|$..name + source: pt + wrapper: true + isMandatory: false + searchClause: AND usagecategorymajor = $usage + query: | + SELECT + tenantid, + COUNT(*) AS totalassessments, + SUM(totalamount) AS totalamount, + SUM(amount) AS totalamountpaid, + (SUM(totalamount) - SUM(amount)) AS totalamountdue + FROM eg_pt_propertydetail_v2 AS pd + LEFT OUTER JOIN + (SELECT consumercode, totalamount, amount FROM egcl_receiptheader_v1 AS rh + LEFT OUTER JOIN egcl_receiptinstrument_v1 AS ri ON rh.id = ri.receiptheader + LEFT OUTER JOIN egcl_instrumentheader_v1 AS ih ON ri.instrumentheader = ih.id + and ih.instrumentstatus != 'CANCELLED' + where rh.status != 'Cancelled' + ) AS instrument_data ON (pd.property || ':' || pd.assessmentnumber) = instrument_data.consumercode + WHERE tenantid = $tenantid + groupby: GROUP BY tenantid + orderby: ORDER BY tenantid, totalamountpaid DESC NULLS LAST + +- reportName: StateCancelledReceiptRegister_V2 + decryptionPathId: CancelledReceiptRegister_V2 + summary: Receipt Register for cancelled Receipts state + version: 1.0.0 + moduleName: rainmaker-pt + additionalConfig: + print: + pdfPageSize: "A1" + sourceColumns: + - name: tenantid + label: reports.pt.ulb + type: string + source: pt + total: false + - name: receiptnumber + label: reports.pt.receiptNo + type: string + source: pt + total: false + - name: receiptdate + label: reports.pt.receiptDate + type: string + source: pt + total: false + - name: g8issuedate + label: reports.pt.g8issuedate + type: string + source: pt + total: false + - name: g8receiptno + label: reports.pt.g8receiptno + type: string + source: pt + total: false + - name: amount + label: reports.pt.amount + type: string + source: pt + total: true + - name: paystatus + label: reports.pt.paymentstatus + type: string + source: pt + total: false + - name: propertytax + label: reports.pt.propertyTax + type: string + source: pt + total: true + - name: firecess + label: reports.pt.fireCess + type: string + source: pt + total: true + - name: cancercess + label: reports.pt.cancerCess + type: string + source: pt + total: true + - name: rebate + label: reports.pt.rebate + type: string + source: pt + total: true + - name: adhocrebate + label: reports.pt.adhocrebate + type: string + source: pt + total: true + - name: penalty + label: reports.pt.penalty + type: string + source: pt + total: true + - name: adhocpenalty + label: reports.pt.adhocpenalty + type: string + source: pt + total: true + - name: interest + label: reports.pt.interest + type: string + source: pt + total: true + - name: exemption + label: reports.pt.exemption + type: string + source: pt + total: true + - name: adjustment + label: reports.pt.roundoff + type: string + source: pt + total: true + - name: pendingamount + label: reports.pt.pendingamount + type: string + source: pt + total: true + - name: consumercode + label: reports.pt.propertyId + type: string + source: pt + total: false + - name: usagetype + label: reports.pt.usagetype + type: string + source: pt + total: false + - name: instrumenttype + label: reports.pt.paymentMode + type: string + source: pt + total: false + - name: transactionnumber + label: reports.pt.ddChequeTransactionNo + type: string + source: pt + total: false + - name: transactiondate + label: reports.pt.ddChequeTransactionDate + type: string + source: pt + total: false + - name: bankname + label: reports.pt.bankName + type: string + source: pt + total: false + - name: collectorname + label: reports.pt.collectorname + type: string + source: pt + total: false + - name: financialyear + label: reports.pt.financialyear + type: string + source: pt + total: false + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: true + searchClause: AND pd.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: true + searchClause: AND pd.receiptdate <= $toDate + - name: paymentMode + label: Payment Mode + type: singlevaluelist + pattern: 'list://CARD:Card,CASH:Cash,CHEQUE:Cheque,DD:DD,OFFLINE_NEFT:NEFT,OFFLINE_RTGS:RTGS,ONLINE:Online,POSTAL_ORDER:PostalOrder' + source: pt + isMandatory: false + searchClause: AND payment.paymentmode = replace($paymentMode,',','_') + query: | + -- Use CTE to force query plan, compute & use CTE later + WITH receipt_breakup AS ( + SELECT + pd.id as pdid, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, + SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as propertytax, + (SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN adjustedamount ELSE 0 END) )as exemption, + ( SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END)) as adjustment + FROM egcl_billaccountdetail as bad + INNER JOIN egcl_billdetial as bd on bd.id = bad.billdetailid + INNER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid + INNER JOIN egcl_payment as payment on pd.paymentid=payment.id + WHERE bad.tenantid not in ('pb.testing','pb.ludhiana_legacy') and payment.paymentstatus = 'CANCELLED' and pd.businessservice='PT' + GROUP BY pdid + ) + SELECT + pd.tenantid AS tenantid, + pd.id, + bill.consumercode, + to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS receiptdate, + payment.ifsccode AS bankname, + receiptnumber, + payment.totalamountpaid as amount, + payment.paymentmode as instrumenttype, + payment.transactionnumber, + concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear, + to_char((To_timestamp(payment.transactiondate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, + pd.due AS pendingamount, + Initcap(case when pt.usagecategory like '%.%' then split_part(pt.usagecategory,'.',2) else pt.usagecategory end) as usagetype, + (CASE WHEN billd.collectiontype='COUNTER' THEN eg_user.name ELSE '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' END) as collectorname, + receipt_breakup.*, + to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, manualreceiptnumber as g8receiptno, + payment.paymentstatus as paystatus + FROM egcl_paymentdetail pd, eg_user, eg_pt_property as pt, egcl_billdetial as billd, egcl_payment payment,receipt_breakup, egcl_bill bill, (select bill.id as billid, min(bd.fromperiod) fromperiod, max(bd.toperiod) toperiod from egcl_billdetial bd, egcl_bill bill where bill.id=bd.billid group by bill.id) bd + WHERE pd.paymentid=payment.id and eg_user.id = pd.createdby::INTEGER and pt.propertyid = bill.consumercode and bill.id=pd.billid and bill.id=billd.billid and bd.billid=bill.id and payment.paymentstatus = 'CANCELLED' and pd.businessservice='PT' and payment.tenantid not in ('pb.testing','pb.ludhiana_legacy') and receipt_breakup.pdid=pd.id + orderby: ORDER BY pd.receiptdate DESC; + +- reportName: StateWidePtCollection_V2 + summary: State Wide PT Collection + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: tenantid + label: reports.pt.tenantid + type: string + source: pt + total: false + - name: totalamountpaid + label: reports.pt.totalamountpaid + type: string + source: pt + total: true + - name: totalassessments + label: reports.pt.totalassessments + type: string + source: pt + total: true + - name: totaloffline + label: reports.pt.totaloffline + type: string + source: pt + total: true + - name: countoffline + label: reports.pt.countoffline + type: string + source: pt + total: true + - name: totalonline + label: reports.pt.totalonline + type: string + source: pt + total: true + - name: countonline + label: reports.pt.countonline + type: string + source: pt + total: true + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: false + searchClause: AND pd.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: false + searchClause: AND pd.receiptdate <= $toDate + - name: financialyear + label: Financial Year + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name + source: pt + wrapper: true + isMandatory: false + searchClause: AND concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) = $financialyear + - name: usage + label: Usage + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=PropertyTax&masterName=UsageCategoryMajor|$..code|$..name + source: pt + wrapper: true + isMandatory: false + searchClause: AND pt.usagecategory = $usage + query: | + SELECT + initcap(split_part(payment.tenantid, '.', 2)) as tenantid, + sum(payment.totalamountpaid) as totalamountpaid, + count(payment.totalamountpaid) as totalassessments, + sum(case when payment.paymentmode='ONLINE' then payment.totalamountpaid else 0 end) as "totalonline", + sum(case when payment.paymentmode='ONLINE' then 1 else 0 end) as "countonline", + sum(case when payment.paymentmode='CASH' then payment.totalamountpaid else 0 end) + + sum(case when payment.paymentmode='CHEQUE' then payment.totalamountpaid else 0 end) + + sum(case when payment.paymentmode='DD' then payment.totalamountpaid else 0 end) + + sum(case when payment.paymentmode='CARD' then payment.totalamountpaid else 0 end) + + sum(case when payment.paymentmode='OFFLINE_RTGS' then payment.totalamountpaid else 0 end) + + sum(case when payment.paymentmode='OFFLINE_NEFT' then payment.totalamountpaid else 0 end) + + sum(case when payment.paymentmode='POTAL_ORDER' then payment.totalamountpaid else 0 end) as "totaloffline", + sum(case when payment.paymentmode!='ONLINE' then 1 else 0 end) as "countoffline" + --concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, + (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid!='pb.testing' group by propertyid ) pt_addr + where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid!='pb.testing' + and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id + groupby: GROUP BY payment.tenantid + orderby: ORDER BY payment.tenantid, totalamountpaid DESC NULLS LAST + + +- reportName: UlbWisePtCollection_V2 + summary: ULB Wide PT Collection + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: totalamountpaid + label: reports.pt.totalamountpaid + type: string + source: pt + total: true + - name: totalassessments + label: reports.pt.totalassessments + type: string + source: pt + total: true + - name: totaloffline + label: reports.pt.totaloffline + type: string + source: pt + total: true + - name: countoffline + label: reports.pt.countoffline + type: string + source: pt + total: true + - name: totalonline + label: reports.pt.totalonline + type: string + source: pt + total: true + - name: countonline + label: reports.pt.countonline + type: string + source: pt + total: true + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: false + searchClause: AND pd.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: false + searchClause: AND pd.receiptdate <= $toDate + - name: financialyear + label: Financial Year + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name + source: pt + wrapper: true + isMandatory: false + searchClause: AND concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) = $financialyear + - name: usage + label: Usage + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=PropertyTax&masterName=UsageCategoryMajor|$..code|$..name + source: pt + wrapper: true + isMandatory: false + searchClause: AND upper(split_part(pt.usagecategory,'.',1)) = $usage + query: | + SELECT + --initcap(split_part(payment.tenantid, '.', 2)) as tenantid, + sum(payment.totalamountpaid) as totalamountpaid, + count(payment.totalamountpaid) as totalassessments, + sum(case when payment.paymentmode='ONLINE' then payment.totalamountpaid else 0 end) as "totalonline", + sum(case when payment.paymentmode='ONLINE' then 1 else 0 end) as "countonline", + sum(case when payment.paymentmode='CASH' then payment.totalamountpaid else 0 end) + + sum(case when payment.paymentmode='CHEQUE' then payment.totalamountpaid else 0 end) + + sum(case when payment.paymentmode='DD' then payment.totalamountpaid else 0 end) + + sum(case when payment.paymentmode='CARD' then payment.totalamountpaid else 0 end) + + sum(case when payment.paymentmode='OFFLINE_RTGS' then payment.totalamountpaid else 0 end) + + sum(case when payment.paymentmode='OFFLINE_NEFT' then payment.totalamountpaid else 0 end) + + sum(case when payment.paymentmode='POTAL_ORDER' then payment.totalamountpaid else 0 end) as "totaloffline", + sum(case when payment.paymentmode!='ONLINE' then 1 else 0 end) as "countoffline" + --concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, + (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr + where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id + + +- reportName: ReceiptRegisterShort_V2 + decryptionPathId: ReceiptRegisterShort_V2 + summary: Receipt Register + version: 1.0.0 + moduleName: rainmaker-pt + additionalConfig: + print: + pdfPageSize: "Legal" + sourceColumns: + - name: receiptnumber + label: reports.pt.receiptNo + type: string + source: pt + total: false + - name: transactiondate + label: reports.pt.receiptDate + type: string + source: pt + total: false + - name: g8receiptno + label: reports.pt.g8book + type: string + source: pt + total: false + - name: g8issuedate + label: reports.pt.g8dated + type: string + source: pt + total: false + - name: propertyid + label: reports.pt.ptrId + type: string + source: pt + total: false + - name: financialyear + label: reports.pt.financialYear + type: string + source: pt + total: false + - name: instrumenttype + label: reports.pt.paymentMode + type: string + source: pt + total: false + - name: amount + label: reports.pt.taxamount + type: string + source: pt + total: true + - name: transactionnumber + label: reports.pt.ddChequeNo + type: string + source: pt + total: false + - name: bankname + label: reports.pt.bankName + type: string + source: pt + total: false + - name: collectorname + label: reports.pt.collectorname + type: string + source: pt + total: false + - name: remarks + label: reports.pt.remarks + type: string + source: pt + total: false + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: true + searchClause: AND pd.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: true + searchClause: AND pd.receiptdate <= $toDate + - name: paymentMode + label: Payment Mode + type: singlevaluelist + pattern: 'list://CARD:Card,CASH:Cash,CHEQUE:Cheque,DD:DD,OFFLINE_NEFT:NEFT,OFFLINE_RTGS:RTGS,ONLINE:Online,POSTAL_ORDER:PostalOrder' + source: pt + isMandatory: false + searchClause: AND payment.paymentmode = replace($paymentMode,',','_') + - name: financialyear + label: Financial Year + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name + source: pt + wrapper: true + isMandatory: false + searchClause: AND concat(to_char((To_timestamp(bd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(bd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) = $financialyear + - name: localityArray + label: reports.pt.zoneList + type: boundarylist + source: pt + isMandatory: false + searchClause: AND pt_addr.locality IN ($localityArray) + - name: collectorname + label: reports.pt.collectorname + type: singlevaluelist + pattern: http://egov-hrms:8080/egov-hrms/employees/_search?tenantId=$tenantid&roles=PTCEMP|$.Employees[*].user.id|$.Employees[*].user.name + source: pt + wrapper: true + isMandatory: false + searchClause: AND eg_user.id = $collectorname::INTEGER + query: | + -- Use CTE to force query plan, compute & use CTE later + SELECT + pt.propertyid as propertyid, + to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') as transactiondate, + payment.ifsccode AS bankname, + receiptnumber, + payment.totalamountpaid as amount, + payment.paymentmode as instrumenttype, + payment.transactionnumber as transactionnumber, + --concat(to_char((To_timestamp(bd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(bd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY')) AS financialyear, + --concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear, + getfinancialyear(pd.billid) as financialyear, + (case when eg_user.name is null then '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' else eg_user.name end) as collectorname, + --receipt_breakup.*, + to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, + manualreceiptnumber as g8receiptno, + 'NA' as remarks + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, + (select bill.id as billid, bill.consumercode as consumercodei, min(bd.fromperiod) fromperiod, max(bd.toperiod) toperiod from egcl_billdetial bd, egcl_bill bill + where bill.id=bd.billid and bill.tenantid = $tenantid group by bill.id) bd, + (select string_agg(distinct propertyid,',') as propertyid,string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr + where pd.paymentid=payment.id and bd.billid=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + and pt.propertyid = bd.consumercodei and pt.status!='INACTIVE' + and pt_addr.propertyid=pt.id + orderby: ORDER BY pd.receiptdate DESC; + + +- reportName: ReceiptRegisterShort_WithoutLocality_V2 + decryptionPathId: ReceiptRegisterShort_V2 + summary: Receipt Register + version: 1.0.0 + moduleName: rainmaker-pt + additionalConfig: + print: + pdfPageSize: "Legal" + sourceColumns: + - name: receiptnumber + label: reports.pt.receiptNo + type: string + source: pt + total: false + - name: transactiondate + label: reports.pt.receiptDate + type: string + source: pt + total: false + - name: g8receiptno + label: reports.pt.g8book + type: string + source: pt + total: false + - name: g8issuedate + label: reports.pt.g8dated + type: string + source: pt + total: false + - name: propertyid + label: reports.pt.ptrId + type: string + source: pt + total: false + - name: oldpropertyid + label: reports.pt.oldpropertyid + type: string + source: pt + total: false + - name: financialyear + label: reports.pt.financialYear + type: string + source: pt + total: false + - name: instrumenttype + label: reports.pt.paymentMode + type: string + source: pt + total: false + - name: amount + label: reports.pt.taxamount + type: string + source: pt + total: true + - name: transactionnumber + label: reports.pt.ddChequeNo + type: string + source: pt + total: false + - name: bankname + label: reports.pt.bankName + type: string + source: pt + total: false + - name: collectorname + label: reports.pt.collectorname + type: string + source: pt + total: false + - name: remarks + label: reports.pt.remarks + type: string + source: pt + total: false + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: true + searchClause: AND pd.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: true + searchClause: AND pd.receiptdate <= $toDate + - name: paymentMode + label: Payment Mode + type: singlevaluelist + pattern: 'list://CARD:Card,CASH:Cash,CHEQUE:Cheque,DD:DD,OFFLINE_NEFT:NEFT,OFFLINE_RTGS:RTGS,ONLINE:Online,POSTAL_ORDER:PostalOrder' + source: pt + isMandatory: false + searchClause: AND payment.paymentmode = replace($paymentMode,',','_') + - name: financialyear + label: Financial Year + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name + source: pt + wrapper: true + isMandatory: false + searchClause: AND concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) = $financialyear + - name: collectorname + label: reports.pt.collectorname + type: singlevaluelist + pattern: http://egov-hrms:8080/egov-hrms/employees/_search?tenantId=$tenantid&roles=PTCEMP|$.Employees[*].user.id|$.Employees[*].user.name + source: pt + wrapper: true + isMandatory: false + searchClause: AND eg_user.id = $collectorname::INTEGER + query: | + -- Use CTE to force query plan, compute & use CTE later + SELECT + pt.propertyid as propertyid, + oldpropertyid, + to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') as transactiondate, + payment.ifsccode AS bankname, + receiptnumber, + payment.totalamountpaid as amount, + payment.paymentmode as instrumenttype, + payment.transactionnumber as transactionnumber, + --concat(to_char((To_timestamp(bd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(bd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY')) AS financialyear, + --concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear, + getfinancialyear(pd.billid) as financialyear, + (case when eg_user.name is null then '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' else eg_user.name end) as collectorname, + --receipt_breakup.*, + to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, + manualreceiptnumber as g8receiptno, + 'NA' as remarks + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, + (select * from (select *,(row_number() over(partition by propertyid order by lastmodifiedtime desc)) as rw from eg_pt_property where tenantid=$tenantid) pts where rw=1) as pt, + (select bill.id as billid, bill.consumercode as consumercodei, min(bd.fromperiod) fromperiod, max(bd.toperiod) toperiod from egcl_billdetial bd, egcl_bill bill + where bill.id=bd.billid and bill.tenantid = $tenantid group by bill.id) bd + where pd.paymentid=payment.id and bd.billid=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + and pt.propertyid = bd.consumercodei --and pt.status!='INACTIVE' + orderby: ORDER BY pd.receiptdate DESC; + + +- reportName: ULBPTDataDumpReport_V2 + decryptionPathId: ULBPTDataDumpReport_V2 + summary: ULB level report + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: ulb + label: reports.pt.ulb + type: string + source: pt + total: false + - name: propertytaxuniqueid + label: reports.pt.propertytaxuniqueid + type: string + source: pt + total: false + - name: existingpropertyid + label: reports.pt.existingpropertyid + type: string + source: pt + total: false + - name: receiptnumber + label: reports.pt.receiptnumber + type: string + source: pt + total: false + - name: paymentamount + label: reports.pt.paymentamount + type: string + source: pt + total: false + - name: ownername + label: reports.pt.ownername + type: string + source: pt + total: false + - name: guardianname + label: reports.pt.guardianname + type: string + source: pt + total: false + - name: mobileno + label: reports.pt.mobileno + type: string + source: pt + total: false + - name: address + label: reports.pt.address + type: string + source: pt + total: false + - name: businessname + label: reports.pt.businessname + type: string + source: pt + total: false + - name: localityname + label: reports.pt.localityname + type: string + source: pt + total: false + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: true + searchClause: AND payd.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: true + searchClause: AND payd.receiptdate <= $toDate + - name: financialyear + label: Financial Year + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name + source: pt + wrapper: true + isMandatory: false + searchClause: AND concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) = $financialyear + - name: paymentMode + label: Payment Mode + type: singlevaluelist + pattern: 'list://CARD:Card,CASH:Cash,CHEQUE:Cheque,DD:DD,OFFLINE_NEFT:NEFT,OFFLINE_RTGS:RTGS,ONLINE:Online,POSTAL_ORDER:PostalOrder' + source: pt + isMandatory: false + searchClause: AND payment.paymentmode = replace($paymentMode,',','_') + - name: localityArray + label: reports.pt.zoneList + type: boundarylist + source: pt + isMandatory: false + searchClause: AND pta.locality IN ($localityArray) + query: | + --S.no Service Name ULB Property Tax Unique ID Date Of Transcation Receipt Number Existing Property ID Owner Name Guardian Name Total Area (SQ.YARD) Covered Area/Built Area (SQ.FEET) Floors Occupancy (Rented,Self /Unoccupied) Type Of Property Mobile Number Transcation Mode of Payment Payment Amount Payment Date Email Id Address + with eg_pt_unit_v2_ot as ( + select + propertyid + -- string_agg(distinct pu.occupancytype, ',') as occupancytype, + -- string_agg(distinct Initcap(case when usagecategory like '%.%' then split_part(usagecategory,'.',2) else usagecategory end),',') as propertytype + from eg_pt_unit as pu + where pu.tenantid = $tenantid + group by propertyid + ) + select + distinct on (payd.receiptnumber) + initcap(split_part(payd.tenantid, '.', 2)) as "ulb", + split_part(consumercode, ':', 1) as "propertytaxuniqueid", + --to_char((To_timestamp(receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS "transcationdate", + receiptnumber as "receiptnumber", + pt.oldpropertyid as "existingpropertyid", + --concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) AS "financialyear", + --getfinancialyear(payd.billid) as financialyear, + eu."name" as "ownername", + eu.guardian as "guardianname", + --pt.landarea as "totalarea", + --pt.superbuiltuparea * 9 as "builtarea", + --pt.nooffloors as "floors", + eu.mobilenumber as "mobileno", + --paymentmode as "transcationmode", + payment.totalamountpaid as "paymentamount", + --to_char((To_timestamp(payment.transactiondate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS "paymentdate", + --eu.emailid as "emailid", + REGEXP_REPLACE(REGEXP_REPLACE(CONCAT(pta.doorno, ',', pta.buildingname, ',',pta.street,',', pta.pincode), ',+', ','), '^,|,$', '') as "address", + --payment.payeraddress as "payeraddress", + --pt.additionaldetails->>'remarks' as "remarks", + pt.additionaldetails->>'FirmBusinessName' as "businessname", + --pot.occupancytype as occupancy, + --pot.propertytype as propertytype, + --pta.locality as "localitycode", + localnames.localityname as localityname + from egcl_paymentdetail as payd + inner join egcl_payment as payment on payment.id = payd.paymentid + inner join egcl_bill as bill on bill.id = payd.billid + inner join egcl_billdetial as billd on billd.billid=bill.id + inner join eg_pt_property as pt on pt.propertyid = bill.consumercode + inner join eg_pt_owner as po on po.propertyid = pt.id and po.status='ACTIVE' + inner join eg_user as eu on eu.uuid = po.userid + inner join eg_pt_address as pta on pta.propertyid = pt.id + left outer join eg_bndry_mohalla as localnames on pta.locality=localnames.localitycode + left outer join eg_pt_unit_v2_ot as pot on pot.propertyid = pt.id + where payd.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and payd.businessservice='PT' and pt.status!='INACTIVE' + + +- reportName: Sewa_Kendra_ReceiptRegister_V2 + summary: Sewa Kendra Receipt Register + version: 1.0.0 + moduleName: rainmaker-pt + additionalConfig: + print: + pdfPageSize: "A1" + sourceColumns: + - name: receiptnumber + label: reports.pt.receiptNo + type: string + source: pt + total: false + - name: receiptdate + label: reports.pt.receiptDate + type: string + source: pt + total: false + - name: g8issuedate + label: reports.pt.g8issuedate + type: string + source: pt + total: false + - name: g8receiptno + label: reports.pt.g8receiptno + type: string + source: pt + total: false + - name: amount + label: reports.pt.amount + type: string + source: pt + total: true + - name: propertytax + label: reports.pt.propertyTax + type: string + source: pt + total: true + - name: firecess + label: reports.pt.fireCess + type: string + source: pt + total: true + - name: cancercess + label: reports.pt.cancerCess + type: string + source: pt + total: true + - name: rebate + label: reports.pt.rebate + type: string + source: pt + total: true + - name: adhocrebate + label: reports.pt.adhocrebate + type: string + source: pt + total: true + - name: penalty + label: reports.pt.penalty + type: string + source: pt + total: true + - name: adhocpenalty + label: reports.pt.adhocpenalty + type: string + source: pt + total: true + - name: interest + label: reports.pt.interest + type: string + source: pt + total: true + - name: exemption + label: reports.pt.exemption + type: string + source: pt + total: true + - name: adjustment + label: reports.pt.roundoff + type: string + source: pt + total: true + - name: pendingamount + label: reports.pt.pendingamount + type: string + source: pt + total: true + - name: propertyid + label: reports.pt.propertyId + type: string + source: pt + total: false + - name: usagetype + label: reports.pt.usagetype + type: string + source: pt + total: false + - name: assessmentnumber + label: reports.pt.assessmentNo + type: string + source: pt + total: false + - name: financialyear + label: reports.pt.financialYear + type: string + source: pt + total: false + - name: instrumenttype + label: reports.pt.paymentMode + type: string + source: pt + total: false + - name: transactionnumber + label: reports.pt.ddChequeTransactionNo + type: string + source: pt + total: false + - name: transactiondate + label: reports.pt.ddChequeTransactionDate + type: string + source: pt + total: false + - name: bankname + label: reports.pt.bankName + type: string + source: pt + total: false + - name: collectorname + label: reports.pt.collectorname + type: string + source: pt + total: false + - name: remarks + label: reports.pt.remarks + type: string + source: pt + total: false + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: true + searchClause: AND rh.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: true + searchClause: AND rh.receiptdate <= $toDate + - name: paymentMode + label: Payment Mode + type: singlevaluelist + pattern: 'list://CARD:Card,CASH:Cash,CHEQUE:Cheque,DD:DD,OFFLINE_NEFT:NEFT,OFFLINE_RTGS:RTGS,ONLINE:Online,POSTAL_ORDER:PostalOrder' + source: pt + isMandatory: false + searchClause: AND instrumenttype = replace($paymentMode,',','_') + - name: financialyear + label: Financial Year + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name + source: pt + wrapper: true + isMandatory: false + searchClause: AND financialyear = $financialyear + - name: localityArray + label: reports.pt.zoneList + type: boundarylist + source: pt + isMandatory: false + searchClause: AND pt_addr.locality IN ($localityArray) + query: | + -- Use CTE to force query plan, compute & use CTE later + WITH receipt_breakup AS ( + SELECT + receiptnumber, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, + SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as propertytax, + (SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN adjustedamount ELSE 0 END) )as exemption, + ( SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END)) as adjustment + FROM egcl_billaccountdetail as bad + INNER JOIN egcl_billdetial as bd on bd.id = bad.billdetailid + INNER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid + INNER JOIN egcl_payment as payment on pd.paymentid=payment.id + WHERE bd.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' + and pd.createdby::INTEGER in (select user_id from eg_userrole_v1 where role_code ='SEVA_KENDRA_EMP') + GROUP BY pd.receiptnumber + ) + SELECT + bill.tenantid AS tenantid, + bill.id, + pt_detail.property AS propertyid, + pt_detail.assessmentnumber AS assessmentnumber, + bill.consumercode, + pd.receiptdate, + to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, + payment.ifsccode AS bankname, + pd.receiptnumber, + payment.totalamountpaid as amount, + payment.paymentmode as instrumenttype, + payment.transactionnumber, + receipt_breakup.*, + pd.due AS pendingamount, + pt_detail.financialyear, + to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, + Initcap(COALESCE(pt_detail.usagecategoryminor, pt_detail.usagecategorymajor)) as usagetype, + manualreceiptnumber as g8receiptno, + (CASE WHEN collectiontype='COUNTER' THEN eg_user.name ELSE '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' END) as collectorname, + pt_detail.additionaldetails->>'remarks' as "remarks" + FROM egcl_bill AS bill + INNER JOIN egcl_billdetial as bd on bd.billid = bill.id + LEFT OUTER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid + LEFT OUTER JOIN egcl_payment as payment on pd.paymentid=payment.id + JOIN eg_pt_propertydetail_v2 pt_detail ON pt_detail.property = bill.consumercode + JOIN eg_pt_address_v2 pt_addr ON pt_detail.property = pt_addr.property + JOIN receipt_breakup ON receipt_breakup.receiptnumber = pd.receiptnumber + LEFT OUTER JOIN eg_user ON eg_user.id = pd.createdby::INTEGER + WHERE bd.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and pd.createdby::INTEGER in (select user_id + FROM eg_userrole_v1 where role_code ='SEVA_KENDRA_EMP') + orderby: ORDER BY pd.receiptdate DESC + + +- reportName: ReceiptRegisterSummary_V2 + decryptionPathId: ReceiptRegisterShort_V2 + summary: Receipt Register Summary + version: 1.0.0 + moduleName: rainmaker-pt + additionalConfig: + print: + pdfPageSize: "A1" + sourceColumns: + - name: ulb + label: reports.pt.ulb + type: string + source: pt + total: false + - name: adhocpenalty + label: reports.pt.adhocpenalty + type: string + source: pt + total: true + - name: adhocrebate + label: reports.pt.adhocrebate + type: string + source: pt + total: true + - name: firecess + label: reports.pt.firecess + type: string + source: pt + total: true + - name: cancercess + label: reports.pt.cancercess + type: string + source: pt + total: true + - name: interest + label: reports.pt.interest + type: string + source: pt + total: true + - name: penalty + label: reports.pt.penalty + type: string + source: pt + total: true + - name: rebate + label: reports.pt.rebate + type: string + source: pt + total: true + - name: propertytax + label: reports.pt.propertytax + type: string + source: pt + total: true + - name: exemption + label: reports.pt.exemption + type: string + source: pt + total: true + - name: adjustment + label: reports.pt.adjustment + type: string + source: pt + total: true + - name: noofassessments + label: reports.pt.noofassessments + type: string + source: pt + total: true + - name: sumcash + label: reports.pt.sumcash + type: string + source: pt + total: true + - name: sumcheque + label: reports.pt.sumcheque + type: string + source: pt + total: true + - name: countcheque + label: reports.pt.countcheque + type: string + source: pt + total: true + - name: sumonline + label: reports.pt.sumonline + type: string + source: pt + total: true + - name: totalamount + label: reports.pt.totalamount + type: string + source: pt + total: true + - name: collectorname + label: reports.pt.collectorname + type: string + source: pt + total: false + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: true + searchClause: AND pd.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: true + searchClause: AND pd.receiptdate <= $toDate + - name: collectorname + label: reports.pt.collectorname + type: singlevaluelist + pattern: http://egov-hrms:8080/egov-hrms/employees/_search?tenantId=$tenantid&roles=PTCEMP|$.Employees[*].user.id|$.Employees[*].user.name + source: pt + wrapper: true + isMandatory: false + searchClause: AND eg_user.id = $collectorname::INTEGER + query: | + -- Use CTE to force query plan, compute & use CTE later + SELECT + split_part(bd.tenantid,'.',2) as ulb, + Count (distinct pd.paymentid) as noofassessments, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, + SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as propertytax, + (SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN adjustedamount ELSE 0 END) )as exemption, + ( SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END)) as adjustment, + sum(case when payment.paymentmode='CASH' then bad.adjustedamount else 0 end) as sumcash, + sum(case when payment.paymentmode='CHEQUE' then bad.adjustedamount else 0 end) as sumcheque, + COUNT(distinct case when payment.paymentmode='CHEQUE' then concat(payment.paymentmode,payment.instrumentnumber,payment.ifsccode,payment.totalamountpaid) end) as countcheque, + sum(case when payment.paymentmode='ONLINE' then bad.adjustedamount else 0 end) as sumonline, + (CASE WHEN payment.paymentmode!='ONLINE' THEN eg_user.name ELSE '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' END) as collectorname, --for Online collecion show None as collectorname + sum(adjustedamount) as totalamount + FROM egcl_billaccountdetail as bad + INNER JOIN egcl_billdetial as bd on bd.id = bad.billdetailid + INNER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid + INNER JOIN egcl_payment as payment on pd.paymentid=payment.id + LEFT OUTER JOIN eg_user ON eg_user.id = pd.createdby::INTEGER + WHERE bd.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' + groupby: group by collectorname,bd.tenantid + +- reportName: StateReceiptRegisterSummary_V2 + summary: Receipt Register Summary + version: 1.0.0 + moduleName: rainmaker-pt + additionalConfig: + print: + pdfPageSize: "A1" + sourceColumns: + - name: ulb + label: reports.pt.ulb + type: string + source: pt + total: false + - name: adhocpenalty + label: reports.pt.adhocpenalty + type: string + source: pt + total: true + - name: adhocrebate + label: reports.pt.adhocrebate + type: string + source: pt + total: true + - name: firecess + label: reports.pt.firecess + type: string + source: pt + total: true + - name: cancercess + label: reports.pt.cancercess + type: string + source: pt + total: true + - name: interest + label: reports.pt.interest + type: string + source: pt + total: true + - name: penalty + label: reports.pt.penalty + type: string + source: pt + total: true + - name: rebate + label: reports.pt.rebate + type: string + source: pt + total: true + - name: propertytax + label: reports.pt.propertytax + type: string + source: pt + total: true + - name: exemption + label: reports.pt.exemption + type: string + source: pt + total: true + - name: adjustment + label: reports.pt.adjustment + type: string + source: pt + total: true + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: false + searchClause: AND pd.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: false + searchClause: AND pd.receiptdate <= $toDate + - name: ulb + label: ULB + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: pt + wrapper: true + isMandatory: false + searchClause: AND bd.tenantid = $ulb + query: | + -- Use CTE to force query plan, compute & use CTE later + SELECT + split_part(bd.tenantid,'.',2) as ulb, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, + SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as propertytax, + (SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN adjustedamount ELSE 0 END) )as exemption, + ( SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END)) as adjustment + FROM egcl_billaccountdetail as bad + INNER JOIN egcl_billdetial as bd on bd.id = bad.billdetailid + INNER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid + WHERE bd.tenantid != 'pb.testing' and pd.businessservice='PT' + groupby: group by bd.tenantid + orderby: order by bd.tenantid + +- reportName: FYCollectionsReport_V2 + summary: FY Collections + version: 1.0.0 + moduleName: rainmaker-pt + additionalConfig: + print: + pdfPageSize: "Legal" + sourceColumns: + - name: financialyear + label: reports.pt.financialyear + type: string + source: pt + total: false + - name: residential + label: reports.pt.residential + type: string + source: pt + total: true + - name: countresidential + label: reports.pt.countresidential + type: string + source: pt + total: true + - name: nonresidential + label: reports.pt.nonresidential + type: string + source: pt + total: true + - name: countnonresidential + label: reports.pt.countnonresidential + type: string + source: pt + total: true + - name: mixed + label: reports.pt.mixed + type: string + source: pt + total: true + - name: countmixed + label: reports.pt.countmixed + type: string + source: pt + total: true + - name: totalamount + label: reports.pt.totalamount + type: string + source: pt + total: true + - name: totalcount + label: reports.pt.totalcount + type: string + source: pt + total: true + - name: online + label: reports.pt.online + type: string + source: pt + total: true + - name: cash + label: reports.pt.cash + type: string + source: pt + total: true + - name: cheque + label: reports.pt.cheque + type: string + source: pt + total: true + - name: dd + label: reports.pt.dd + type: string + source: pt + total: true + - name: card + label: reports.pt.card + type: string + source: pt + total: true + - name: neft + label: reports.pt.neft + type: string + source: pt + total: true + - name: rtgs + label: reports.pt.rtgs + type: string + source: pt + total: true + - name: po + label: reports.pt.po + type: string + source: pt + total: true + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: false + searchClause: AND pd.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: false + searchClause: AND pd.receiptdate <= $toDate + - name: localityArray + label: reports.pt.zoneList + type: boundarylist + source: pt + isMandatory: false + searchClause: AND pt_addr.locality IN ($localityArray) + query: | + -- Use CTE to force query plan, compute & use CTE later + SELECT + sum(payment.totalamountpaid) as totalamount, + count(payment.totalamountpaid) as totalcount, + sum(case when payment.paymentmode='ONLINE' then payment.totalamountpaid else 0 end) as "online", + sum(case when payment.paymentmode='CASH' then payment.totalamountpaid else 0 end) as "cash", + sum(case when payment.paymentmode='CHEQUE' then payment.totalamountpaid else 0 end) as "cheque", + sum(case when payment.paymentmode='DD' then payment.totalamountpaid else 0 end) as "dd", + sum(case when payment.paymentmode='CARD' then payment.totalamountpaid else 0 end) as "card", + sum(case when payment.paymentmode='OFFLINE_RTGS' then payment.totalamountpaid else 0 end) as "rtgs", + sum(case when payment.paymentmode='OFFLINE_NEFT' then payment.totalamountpaid else 0 end) as "neft", + sum(case when payment.paymentmode='POTAL_ORDER' then payment.totalamountpaid else 0 end) as "po", + sum(case when split_part(pt.usagecategory, '.', 1)='RESIDENTIAL' then payment.totalamountpaid else 0 end) as "residential", + sum(case when split_part(pt.usagecategory, '.', 1)='RESIDENTIAL' then 1 else 0 end) as "countresidential", + sum(case when split_part(pt.usagecategory, '.', 1) = 'NONRESIDENTIAL' then payment.totalamountpaid else 0 end) as "nonresidential", + sum(case when pt.usagecategory like 'NONRESIDENTIAL%' then 1 else 0 end) as "countnonresidential", + sum(case when pt.usagecategory='MIXED' then payment.totalamountpaid else 0 end) as "mixed", + sum(case when pt.usagecategory='MIXED' then 1 else 0 end) as "countmixed", + concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, + (select * from (select *,(row_number() over(partition by propertyid order by lastmodifiedtime desc)) as rw from eg_pt_property where tenantid=$tenantid) pts where rw=1) as pt, + egcl_bill bill, + (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr + where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + and pt.propertyid = bill.consumercode and pt_addr.propertyid=pt.id --and pt.status!='INACTIVE' + groupby: GROUP BY financialyear + orderby: ORDER BY financialyear + +- reportName: FYCollectionsReport_WithoutLocality_V2 + summary: FY Collections + version: 1.0.0 + moduleName: rainmaker-pt + additionalConfig: + print: + pdfPageSize: "Legal" + sourceColumns: + - name: financialyear + label: reports.pt.financialyear + type: string + source: pt + total: false + - name: residential + label: reports.pt.residential + type: string + source: pt + total: true + - name: countresidential + label: reports.pt.countresidential + type: string + source: pt + total: true + - name: nonresidential + label: reports.pt.nonresidential + type: string + source: pt + total: true + - name: countnonresidential + label: reports.pt.countnonresidential + type: string + source: pt + total: true + - name: mixed + label: reports.pt.mixed + type: string + source: pt + total: true + - name: countmixed + label: reports.pt.countmixed + type: string + source: pt + total: true + - name: totalamount + label: reports.pt.totalamount + type: string + source: pt + total: true + - name: totalcount + label: reports.pt.totalcount + type: string + source: pt + total: true + - name: online + label: reports.pt.online + type: string + source: pt + total: true + - name: cash + label: reports.pt.cash + type: string + source: pt + total: true + - name: cheque + label: reports.pt.cheque + type: string + source: pt + total: true + - name: dd + label: reports.pt.dd + type: string + source: pt + total: true + - name: card + label: reports.pt.card + type: string + source: pt + total: true + - name: neft + label: reports.pt.neft + type: string + source: pt + total: true + - name: rtgs + label: reports.pt.rtgs + type: string + source: pt + total: true + - name: po + label: reports.pt.po + type: string + source: pt + total: true + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: false + searchClause: AND pd.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: false + searchClause: AND pd.receiptdate <= $toDate + query: | + -- Use CTE to force query plan, compute & use CTE later + SELECT + sum(payment.totalamountpaid) as totalamount, + count(payment.totalamountpaid) as totalcount, + sum(case when payment.paymentmode='ONLINE' then payment.totalamountpaid else 0 end) as "online", + sum(case when payment.paymentmode='CASH' then payment.totalamountpaid else 0 end) as "cash", + sum(case when payment.paymentmode='CHEQUE' then payment.totalamountpaid else 0 end) as "cheque", + sum(case when payment.paymentmode='DD' then payment.totalamountpaid else 0 end) as "dd", + sum(case when payment.paymentmode='CARD' then payment.totalamountpaid else 0 end) as "card", + sum(case when payment.paymentmode='OFFLINE_RTGS' then payment.totalamountpaid else 0 end) as "rtgs", + sum(case when payment.paymentmode='OFFLINE_NEFT' then payment.totalamountpaid else 0 end) as "neft", + sum(case when payment.paymentmode='POTAL_ORDER' then payment.totalamountpaid else 0 end) as "po", + sum(case when split_part(pt.usagecategory, '.', 1)='RESIDENTIAL' then payment.totalamountpaid else 0 end) as "residential", + sum(case when split_part(pt.usagecategory, '.', 1)='RESIDENTIAL' then 1 else 0 end) as "countresidential", + sum(case when split_part(pt.usagecategory, '.', 1) = 'NONRESIDENTIAL' then payment.totalamountpaid else 0 end) as "nonresidential", + sum(case when pt.usagecategory like 'NONRESIDENTIAL%' then 1 else 0 end) as "countnonresidential", + sum(case when pt.usagecategory='MIXED' then payment.totalamountpaid else 0 end) as "mixed", + sum(case when pt.usagecategory='MIXED' then 1 else 0 end) as "countmixed", + concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, + (select * from (select *,(row_number() over(partition by propertyid order by lastmodifiedtime desc)) as rw from eg_pt_property where tenantid=$tenantid) pts where rw=1) as pt, + egcl_bill bill + where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + and pt.propertyid = bill.consumercode --and pt.status!='INACTIVE' + groupby: GROUP BY financialyear + orderby: ORDER BY financialyear + +- reportName: ULBDEFAULTERPTREPORT_V2 + decryptionPathId: ULBDEFAULTERPTREPORT_V2 + summary: ULB Defaulter Pt report + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: ulb + label: reports.pt.ulb + type: string + source: pt + total: false + - name: propertytaxuniqueid + label: reports.pt.propertytaxuniqueid + type: string + source: pt + total: false + - name: transcationdate + label: reports.pt.transcationdate + type: string + source: pt + total: false + - name: receiptnumber + label: reports.pt.receiptnumber + type: string + source: pt + total: false + - name: existingpropertyid + label: reports.pt.existingpropertyid + type: string + source: pt + total: false + - name: financialyear + label: reports.pt.financialYear + type: string + source: pt + total: false + - name: ownername + label: reports.pt.ownername + type: string + source: pt + total: false + - name: guardianname + label: reports.pt.guardianname + type: string + source: pt + total: false + - name: propertytype + label: reports.pt.propertytype + type: string + source: pt + total: false + - name: mobileno + label: reports.pt.mobileno + type: string + source: pt + total: false + - name: address + label: reports.pt.address + type: string + source: pt + total: false + - name: payeraddress + label: reports.pt.payeraddress + type: string + source: pt + total: false + searchParams: + - name: localityArray + label: reports.pt.zoneList + type: boundarylist + source: pt + isMandatory: false + searchClause: AND pta.locality IN ($localityArray) + query: | + --S.no Service Name ULB Property Tax Unique ID Date Of Transcation Receipt Number Existing Property ID Type Of Property Mobile Number Address + with eg_pt_unit_v2_ot as ( + select + propertyid, + string_agg(distinct pu.occupancytype, ',') as occupancytype, + --string_agg(distinct coalesce(usagecategory), ',') as propertytype + string_agg(distinct Initcap(case when usagecategory like '%.%' then split_part(usagecategory,'.',2) else usagecategory end),',') as propertytype + from eg_pt_unit as pu + where pu.tenantid = $tenantid + group by propertyid + ) + select + distinct on (payd.receiptnumber) + initcap(split_part(payd.tenantid, '.', 2)) as "ulb", + split_part(consumercode, ':', 1) as "propertytaxuniqueid", + to_char((To_timestamp(payd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS "transcationdate", + payd.receiptnumber as "receiptnumber", + pt.oldpropertyid as "existingpropertyid", + concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) AS "financialyear", + eu."name" as "ownername", + eu.guardian as "guardianname", + pot.propertytype as "propertytype", + eu.mobilenumber as "mobileno", + REGEXP_REPLACE(REGEXP_REPLACE(CONCAT(pta.doorno, ',', pta.buildingname, ',',pta.street,',', pta.pincode), ',+', ','), '^,|,$', '') as "address" + from egcl_paymentdetail as payd + + inner join egcl_payment as payment on payment.id = payd.paymentid + inner join egcl_bill as bill on bill.id = payd.billid + inner join egcl_billdetial as billd on billd.billid=bill.id + inner join eg_pt_property as pt on pt.propertyid = bill.consumercode + inner join eg_pt_owner as po on po.propertyid = pt.id and po.status='ACTIVE' + inner join eg_user as eu on eu.uuid = po.userid + inner join eg_pt_address as pta on pta.propertyid = pt.id + left outer join eg_pt_unit_v2_ot as pot on pot.propertyid = pt.id + where payd.tenantid = $tenantid + and bill.consumercode not in (select consumercode from egcl_bill where tenantid=$tenantid and businessservice='PT' and id in (select billid from egcl_billdetial where tenantid=$tenantid and concat(to_char((To_timestamp(fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) ='2020-21')) + and pt.status!='INACTIVE' + +- reportName: ULBDEFAULTERPTREPORT_NEW_V2_OLD + decryptionPathId: ULBDEFAULTERPTREPORT_V2 + summary: ULB Defaulter Pt report + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: propertytaxuniqueid + label: reports.pt.propertytaxuniqueid + type: string + source: pt + total: false + - name: existingpropertyid + label: reports.pt.existingpropertyid + type: string + source: pt + total: false + - name: ownername + label: reports.pt.ownername + type: string + source: pt + total: false + - name: propertytype + label: reports.pt.propertytype + type: string + source: pt + total: false + - name: mobileno + label: reports.pt.mobileno + type: string + source: pt + total: false + - name: address + label: reports.pt.address + type: string + source: pt + total: false + searchParams: + - name: localityArray + label: reports.pt.zoneList + type: boundarylist + source: pt + isMandatory: false + searchClause: AND pta.locality IN ($localityArray) + query: | + --S.no Service Name ULB Property Tax Unique ID Date Of Transcation Receipt Number Existing Property ID Type Of Property Mobile Number Address + with eg_pt_unit_v2_ot as ( + select + propertyid, + string_agg(distinct pu.occupancytype, ',') as occupancytype, + --string_agg(distinct coalesce(usagecategory), ',') as propertytype + string_agg(distinct Initcap(case when usagecategory like '%.%' then split_part(usagecategory,'.',2) else usagecategory end),',') as propertytype + from eg_pt_unit as pu + where pu.tenantid = $tenantid + group by propertyid + ) + select + --distinct on (payd.receiptnumber) + --initcap(split_part(payd.tenantid, '.', 2)) as "ulb", + --split_part(consumercode, ':', 1) as "propertytaxuniqueid", + --to_char((To_timestamp(payd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS "transcationdate", + --payd.receiptnumber as "receiptnumber", + pt.propertyid as "propertytaxuniqueid", + string_agg(pt.oldpropertyid,',') as "existingpropertyid", + --concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) AS "financialyear", + split_part(string_agg(eu."name",','),',',1) as "ownername", --first owner + --eu.guardian as "guardianname", + string_agg(pot.propertytype,',') as "propertytype", + split_part(string_agg(eu.mobilenumber,','),',',1) as "mobileno", + --string_agg(distinct REGEXP_REPLACE(REGEXP_REPLACE(CONCAT(pta.doorno, ',', pta.buildingname, ',',pta.street,',', pta.pincode), ',+', ','), '^,|,$', ''),',') as "address", + string_agg(distinct concat(pta.doorno,',',pta.plotno,',',pta.buildingname,',',pta.street,',',pta.landmark,',',eg_bndry_mohalla.localityname,',',pta.city),',') as "address" + from eg_pt_property pt + --inner join egcl_payment as payment on payment.id = payd.paymentid + --inner join egcl_bill as bill on bill.id = payd.billid + --inner join egcl_billdetial as billd on billd.billid=bill.id + --inner join as pt on pt.propertyid = bill.consumercode + inner join eg_pt_owner as po on po.propertyid = pt.id and po.status='ACTIVE' + inner join eg_user as eu on eu.uuid = po.userid + inner join eg_pt_address as pta on pta.propertyid = pt.id + inner join eg_pt_unit_v2_ot as pot on pot.propertyid = pt.id + inner join eg_bndry_mohalla on eg_bndry_mohalla.localitycode=pta.locality + where pt.tenantid = $tenantid + --and bill.consumercode not in (select consumercode from egcl_bill where tenantid=$tenantid and businessservice='PT' and id in (select billid from egcl_billdetial where tenantid=$tenantid and concat(to_char((To_timestamp(fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) ='2020-21')) + and pt.status!='INACTIVE' + and pt.propertyid not in (select consumercode from egcl_bill where tenantid=$tenantid and businessservice='PT' and id in (select billid from egcl_billdetial where tenantid=$tenantid and concat(to_char((To_timestamp(fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) ='2020-21')) + groupby: group by pt.propertyid + +- reportName: ULBDEFAULTERPTREPORT_NEW_V2 + decryptionPathId: ULBDEFAULTERPTREPORT_V2 + summary: ULB Defaulter Pt report + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: propertytaxuniqueid + label: reports.pt.propertytaxuniqueid + type: string + source: pt + total: false + - name: existingpropertyid + label: reports.pt.existingpropertyid + type: string + source: pt + total: false + - name: financailyear + label: reports.pt.financailyear + type: string + source: pt + total: false + - name: amountcollected + label: reports.pt.amountcollected + type: string + source: pt + total: true + - name: ownername + label: reports.pt.ownername + type: string + source: pt + total: false + - name: propertytype + label: reports.pt.propertytype + type: string + source: pt + total: false + - name: mobileno + label: reports.pt.mobileno + type: string + source: pt + total: false + - name: address + label: reports.pt.address + type: string + source: pt + total: false + - name: blockcode + label: reports.pt.blockname + type: string + source: pt + total: false + query: | + --S.no Service Name ULB Property Tax Unique ID Date Of Transcation Receipt Number Existing Property ID Type Of Property Mobile Number Address + with props as + (select + pt.propertyid as "propertytaxuniqueid", + string_agg(distinct collection.finyear, ', ') as "financailyear" , + --string_agg(collection.taxpaid::varchar, ', ') as "amountcollected" , + max(collection.taxpaid) as "amountcollected" , + string_agg(distinct pt.oldpropertyid,',') as "existingpropertyid", + split_part(string_agg(eu."name",','),',',1) as "ownername", + string_agg(pot.propertytype,',') as "propertytype", + split_part(string_agg(eu.mobilenumber,','),',',1) as "mobileno", + string_agg(distinct REGEXP_REPLACE(REGEXP_REPLACE(CONCAT(pta.doorno, ',', pta.buildingname, ',',pta.street,',',pta.localityname,',', pta.pincode), ',+', ','), '^,|,$', ''),',') as "address", + string_agg(distinct blockcode,',') as blockcode + from eg_pt_property pt + inner join (select a.consumercode, to_char((To_timestamp(a.taxperiodfrom/1000) at time Zone 'Asia/Kolkata'),'YYYY')||'-'||to_char((To_timestamp(a.taxperiodfrom/1000) at time Zone 'Asia/Kolkata'),'YYYY')::int+1 as finyear, a.tax, a.taxpaid from (select d.consumercode, d.taxperiodfrom, sum(dd.taxamount) tax, sum(dd.collectionamount) as taxpaid + from egbs_demanddetail_v1 dd, egbs_demand_v1 d + where dd.demandid=d.id + and d.status!='CANCELLED' and dd.tenantid=$tenantid and d.tenantid=$tenantid and d.consumercode like 'PT%' + group by d.consumercode, d.taxperiodfrom + having sum(dd.taxamount - dd.collectionamount)=0) a, + (select d.consumercode, max(d.taxperiodfrom) maxperiod + from egbs_demanddetail_v1 dd, egbs_demand_v1 d + where dd.demandid=d.id + and d.status!='CANCELLED' and dd.tenantid=$tenantid and d.tenantid=$tenantid and d.consumercode like 'PT%' + group by d.consumercode + having sum(dd.taxamount - dd.collectionamount)=0) b + where a.consumercode=b.consumercode and a.taxperiodfrom=b.maxperiod + ) collection ON collection.consumercode = pt.propertyid + inner join (SELECT DISTINCT ON (propertyid) propertyid ,name as name , mobilenumber + FROM eg_pt_owner , eg_user + WHERE uuid = userid and eg_pt_owner.tenantid=$tenantid + AND status = 'ACTIVE' + AND active = true ) eu ON pt.id=eu.propertyid + inner join (SELECT propertyid , locality,blockcode,doorno,street,buildingname,pincode,localityname, max(createdtime) + from eg_pt_address inner join eg_bndry_mohalla on eg_bndry_mohalla.localitycode=locality where eg_pt_address.tenantid=$tenantid + group by propertyid, locality, doorno,street,buildingname,pincode,localityname,blockcode) pta ON pt.id=pta.propertyid + inner join (select propertyid, + string_agg(distinct pu.occupancytype, ',') as occupancytype, + string_agg(distinct Initcap(case when usagecategory like '%.%' then split_part(usagecategory,'.',2) else usagecategory end),',') as propertytype + from eg_pt_unit as pu + where pu.tenantid = $tenantid + group by propertyid) pot ON pot.propertyid = pt.id + where pt.tenantid = $tenantid + and pt.status!='INACTIVE' + and pt.propertyid not in ( + + select consumercode from egcl_bill + where tenantid=$tenantid + and businessservice='PT' + and id in (select billid + from egcl_billdetial + where tenantid=$tenantid and concat(to_char((To_timestamp(fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) ='2020-21')) + group by pt.propertyid + ), + prop2019 as + ( + select + oldpropertyid as oldpropertyid, + pt.propertyid as propertyid + from eg_pt_property pt + inner join eg_pt_assessment as assessment on assessment.propertyid=pt.propertyid and assessment.assessmentyear='2019-20' and assessment.tenantid=$tenantid + where pt.tenantid=$tenantid + group by pt.propertyid,oldpropertyid + ) + select * from props + where propertytaxuniqueid not in (select propertyid from prop2019 where oldpropertyid in (select concat('RID',previous_returnid) from ikon_2020_21_non_migrated_records where tenantid=$tenantid)) + +- reportName: ULBDEFAULTERPTREPORT_FY_SEARCH + decryptionPathId: ULBDEFAULTERPTREPORT_V2 + summary: ULB Defaulter Pt report + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: propertytaxuniqueid + label: reports.pt.propertytaxuniqueid + type: string + source: pt + total: false + - name: existingpropertyid + label: reports.pt.existingpropertyid + type: string + source: pt + total: false + - name: financailyear + label: reports.pt.financailyear + type: string + source: pt + total: false + - name: amountcollected + label: reports.pt.amountcollected + type: string + source: pt + total: true + - name: ownername + label: reports.pt.ownername + type: string + source: pt + total: false + - name: propertytype + label: reports.pt.propertytype + type: string + source: pt + total: false + - name: mobileno + label: reports.pt.mobileno + type: string + source: pt + total: false + - name: address + label: reports.pt.address + type: string + source: pt + total: false + - name: blockcode + label: reports.pt.blockname + type: string + source: pt + total: false + searchParams: + - name: finYear + label: Financial Year + type: singlevaluelist + pattern: 'list://2015-16:2015-16,2016-17:2016-17,2017-18:2017-18,2017-18:2017-18,2018-19:2018-19,2019-20:2019-20,2020-21:2020-21,2021-22:2021-22,2022-23:2022-23,2023-24:2023-24' + source: pt + isMandatory: true + searchClause: AND 1=1 + query: | + --S.no Service Name ULB Property Tax Unique ID Date Of Transcation Receipt Number Existing Property ID Type Of Property Mobile Number Address + with props as + (select + pt.propertyid as "propertytaxuniqueid", + string_agg(distinct collection.finyear, ', ') as "financailyear" , + --string_agg(collection.taxpaid::varchar, ', ') as "amountcollected" , + max(collection.taxpaid) as "amountcollected" , + string_agg(distinct pt.oldpropertyid,',') as "existingpropertyid", + split_part(string_agg(eu."name",','),',',1) as "ownername", + string_agg(pot.propertytype,',') as "propertytype", + split_part(string_agg(eu.mobilenumber,','),',',1) as "mobileno", + string_agg(distinct REGEXP_REPLACE(REGEXP_REPLACE(CONCAT(pta.doorno, ',', pta.buildingname, ',',pta.street,',',pta.localityname,',', pta.pincode), ',+', ','), '^,|,$', ''),',') as "address", + string_agg(distinct blockcode,',') as blockcode + from eg_pt_property pt + inner join (select a.consumercode, to_char((To_timestamp(a.taxperiodfrom/1000) at time Zone 'Asia/Kolkata'),'YYYY')||'-'||to_char((To_timestamp(a.taxperiodfrom/1000) at time Zone 'Asia/Kolkata'),'YYYY')::int+1 as finyear, a.tax, a.taxpaid from (select d.consumercode, d.taxperiodfrom, sum(dd.taxamount) tax, sum(dd.collectionamount) as taxpaid + from egbs_demanddetail_v1 dd, egbs_demand_v1 d + where dd.demandid=d.id + and d.status!='CANCELLED' and dd.tenantid=$tenantid and d.tenantid=$tenantid and d.consumercode like 'PT%' + group by d.consumercode, d.taxperiodfrom + having sum(dd.taxamount - dd.collectionamount)=0) a, + (select d.consumercode, max(d.taxperiodfrom) maxperiod + from egbs_demanddetail_v1 dd, egbs_demand_v1 d + where dd.demandid=d.id + and d.status!='CANCELLED' and dd.tenantid=$tenantid and d.tenantid=$tenantid and d.consumercode like 'PT%' + group by d.consumercode + having sum(dd.taxamount - dd.collectionamount)=0) b + where a.consumercode=b.consumercode and a.taxperiodfrom=b.maxperiod + ) collection ON collection.consumercode = pt.propertyid + inner join (SELECT DISTINCT ON (propertyid) propertyid ,name as name , mobilenumber + FROM eg_pt_owner , eg_user + WHERE uuid = userid and eg_pt_owner.tenantid=$tenantid + AND status = 'ACTIVE' + AND active = true ) eu ON pt.id=eu.propertyid + inner join (SELECT propertyid , locality,blockcode,doorno,street,buildingname,pincode,localityname, max(createdtime) + from eg_pt_address inner join eg_bndry_mohalla on eg_bndry_mohalla.localitycode=locality where eg_pt_address.tenantid=$tenantid + group by propertyid, locality, doorno,street,buildingname,pincode,localityname,blockcode) pta ON pt.id=pta.propertyid + inner join (select propertyid, + string_agg(distinct pu.occupancytype, ',') as occupancytype, + string_agg(distinct Initcap(case when usagecategory like '%.%' then split_part(usagecategory,'.',2) else usagecategory end),',') as propertytype + from eg_pt_unit as pu + where pu.tenantid = $tenantid + group by propertyid) pot ON pot.propertyid = pt.id + where pt.tenantid = $tenantid + and pt.status!='INACTIVE' + and pt.propertyid not in ( + select consumercode from egcl_bill + where tenantid=$tenantid + and businessservice='PT' + and id in (select billid + from egcl_billdetial + where tenantid=$tenantid and concat(to_char((To_timestamp(fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) =$finYear)) + group by pt.propertyid + ) + select * from props where 1=1 + --where propertytaxuniqueid not in (select propertyid from prop2019 where oldpropertyid in (select concat('RID',previous_returnid) from ikon_2020_21_non_migrated_records where tenantid=$tenantid)) + +- reportName: ULBDEFAULTERPTREPORT_MINI_STATE_V2_OLD + decryptionPathId: ULBDEFAULTERPTREPORT_V2 + summary: ULB Defaulter Pt report + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: propertytaxuniqueid + label: reports.pt.propertytaxuniqueid + type: string + source: pt + total: false + - name: existingpropertyid + label: reports.pt.existingpropertyid + type: string + source: pt + total: false + - name: ownername + label: reports.pt.ownername + type: string + source: pt + total: false + - name: propertytype + label: reports.pt.propertytype + type: string + source: pt + total: false + - name: mobileno + label: reports.pt.mobileno + type: string + source: pt + total: false + - name: address + label: reports.pt.address + type: string + source: pt + total: false + searchParams: + - name: ulb + label: ULB + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: pt + wrapper: true + isMandatory: false + searchClause: AND pt.tenantid = $ulb + query: | + --S.no Service Name ULB Property Tax Unique ID Date Of Transcation Receipt Number Existing Property ID Type Of Property Mobile Number Address + with eg_pt_unit_v2_ot as ( + select + propertyid, + string_agg(distinct pu.occupancytype, ',') as occupancytype, + --string_agg(distinct coalesce(usagecategory), ',') as propertytype + string_agg(distinct Initcap(case when usagecategory like '%.%' then split_part(usagecategory,'.',2) else usagecategory end),',') as propertytype + from eg_pt_unit as pu + where pu.tenantid = $ulb + group by propertyid + ), + prop2019 as + ( + select + oldpropertyid as oldpropertyid, + pt.propertyid as propertyid + from eg_pt_property pt + inner join eg_pt_assessment as assessment on assessment.propertyid=pt.propertyid and assessment.assessmentyear='2019-20' and assessment.tenantid=$ulb + where pt.tenantid=$ulb + group by pt.propertyid,oldpropertyid + ) + select + --distinct on (payd.receiptnumber) + --initcap(split_part(payd.tenantid, '.', 2)) as "ulb", + --split_part(consumercode, ':', 1) as "propertytaxuniqueid", + --to_char((To_timestamp(payd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS "transcationdate", + --payd.receiptnumber as "receiptnumber", + pt.propertyid as "propertytaxuniqueid", + string_agg(pt.oldpropertyid,',') as "existingpropertyid", + --concat(to_char((To_timestamp(billd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(billd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) AS "financialyear", + split_part(string_agg(eu."name",','),',',1) as "ownername", + --eu.guardian as "guardianname", + string_agg(pot.propertytype,',') as "propertytype", + split_part(string_agg(eu.mobilenumber,','),',',1) as "mobileno", + string_agg(distinct REGEXP_REPLACE(REGEXP_REPLACE(CONCAT(pta.doorno, ',', pta.buildingname, ',',pta.street,',', pta.pincode), ',+', ','), '^,|,$', ''),',') as "address" + from eg_pt_property pt + --inner join egcl_payment as payment on payment.id = payd.paymentid + --inner join egcl_bill as bill on bill.id = payd.billid + --inner join egcl_billdetial as billd on billd.billid=bill.id + --inner join as pt on pt.propertyid = bill.consumercode + inner join eg_pt_owner as po on po.propertyid = pt.id and po.status='ACTIVE' + inner join eg_user as eu on eu.uuid = po.userid + inner join eg_pt_address as pta on pta.propertyid = pt.id + inner join eg_pt_unit_v2_ot as pot on pot.propertyid = pt.id + where pt.tenantid = $ulb + --and bill.consumercode not in (select consumercode from egcl_bill where tenantid=$ulb and businessservice='PT' and id in (select billid from egcl_billdetial where tenantid=$ulb and concat(to_char((To_timestamp(fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) ='2020-21')) + and pt.status!='INACTIVE' + and pt.propertyid not in (select consumercode from egcl_bill where tenantid=$ulb and businessservice='PT' and id in (select billid from egcl_billdetial where tenantid=$ulb and concat(to_char((To_timestamp(fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-',to_char((To_timestamp(toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')) ='2020-21')) + and pt.propertyid not in (select propertyid from prop2019 where oldpropertyid in (select concat('RID',previous_returnid) from ikon_2020_21_non_migrated_records where tenantid=$ulb)) + groupby: group by pt.propertyid + +- reportName: ULBDEFAULTERPTREPORT_MINI_STATE_V2 + decryptionPathId: ULBDEFAULTERPTREPORT_V2 + summary: ULB Defaulter Pt report + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: ownername + label: reports.pt.ownername + type: string + source: pt + total: false + - name: mobileno + label: reports.pt.mobileno + type: string + source: pt + total: false + searchParams: + - name: ulb + label: ULB + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: pt + wrapper: true + isMandatory: false + searchClause: AND 1=1 + query: | + --S.no Service Name ULB Property Tax Unique ID Date Of Transcation Receipt Number Existing Property ID Type Of Property Mobile Number Address + select mobilenumber,name from eg_user + where uuid in (select userid from eg_pt_owner where propertyid in + (select id from eg_pt_property where status='ACTIVE' and tenantid=$ulb + and propertyid in (select consumercode from egcl_bill where id in (select billid from egcl_billdetial where fromperiod=1554076800000 and toperiod=1585699199000 and tenantid=$ulb and amountpaid>100000) and businessservice='PT') + and propertyid not in (select consumercode from egcl_bill where id in (select billid from egcl_billdetial where fromperiod=1585699200000 and toperiod=1617215399000 and tenantid=$ulb ) and businessservice='PT') + )) + +- reportName: ZoneFYReport_V2 + summary: Zone FY Collection + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: zonecode + label: reports.pt.zonename + type: string + source: pt + total: false + - name: 2013_14PTR + label: reports.pt.2013_14_PTR + type: string + source: pt + total: true + - name: 2013_14Collection + label: reports.pt.2013_14Collection + type: string + source: pt + total: true + - name: 2014_15PTR + label: reports.pt.2014_15_PTR + type: string + source: pt + total: true + - name: 2014_15Collection + label: reports.pt.2014_15Collection + type: string + source: pt + total: true + - name: 2015_16PTR + label: reports.pt.2015_16_PTR + type: string + source: pt + total: true + - name: 2015_16Collection + label: reports.pt.2015_16Collection + type: string + source: pt + total: true + - name: 2016_17PTR + label: reports.pt.2016_17_PTR + type: string + source: pt + total: true + - name: 2016_17Collection + label: reports.pt.2016_17Collection + type: string + source: pt + total: true + - name: 2017_18PTR + label: reports.pt.2017_18_PTR + type: string + source: pt + total: true + - name: 2017_18Collection + label: reports.pt.2017_18Collection + type: string + source: pt + total: true + - name: 2018_19PTR + label: reports.pt.2018_19_PTR + type: string + source: pt + total: true + - name: 2018_19Collection + label: reports.pt.2018_19Collection + type: string + source: pt + total: true + - name: 2019_20PTR + label: reports.pt.2019_20_PTR + type: string + source: pt + total: true + - name: 2019_20Collection + label: reports.pt.2019_20Collection + type: string + source: pt + total: true + - name: 2020_21PTR + label: reports.pt.2020_21_PTR + type: string + source: pt + total: true + - name: 2020_21Collection + label: reports.pt.2020_21Collection + type: string + source: pt + total: true + - name: 2021_22PTR + label: reports.pt.2021_22_PTR + type: string + source: pt + total: true + - name: 2021_22Collection + label: reports.pt.2021_22Collection + type: string + source: pt + total: true + - name: 2022_23PTR + label: reports.pt.2022_23_PTR + type: string + source: pt + total: true + - name: 2022_23Collection + label: reports.pt.2022_23Collection + type: string + source: pt + total: true + - name: totalptr + label: reports.pt.totalptr + type: string + source: pt + total: true + - name: totalcollection + label: reports.pt.totalcollection + type: string + source: pt + total: true + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: true + searchClause: AND 1=1 + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: true + searchClause: AND 1=1 + query: | + --S.no Service Name ULB Property Tax Unique ID Date Of Transcation Receipt Number Existing Property ID Type Of Property Mobile Number Address + with fy2013 as + ( + SELECT + zonecode, + sum(payment.totalamountpaid) as amount, + count(payment.totalamountpaid) as totalcount, + concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, + (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr + INNER JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality and eg_bndry_mohalla.tenantid=$tenantid + where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id + and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY'))='2013-14' + and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate + GROUP BY financialyear,zonecode + + ), + fy2014 as + ( + SELECT + zonecode, + sum(payment.totalamountpaid) as amount, + count(payment.totalamountpaid) as totalcount, + concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, + (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr + INNER JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality and eg_bndry_mohalla.tenantid=$tenantid + where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id + and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY'))='2014-15' + and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate + GROUP BY financialyear,zonecode + ), + fy2015 as + ( + SELECT + zonecode, + sum(payment.totalamountpaid) as amount, + count(payment.totalamountpaid) as totalcount, + concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, + (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr + INNER JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality and eg_bndry_mohalla.tenantid=$tenantid + where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id + and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY'))='2015-16' + and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate + GROUP BY financialyear,zonecode + ), + fy2016 as + ( + SELECT + zonecode, + sum(payment.totalamountpaid) as amount, + count(payment.totalamountpaid) as totalcount, + concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, + (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr + inner JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality + where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id + and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY'))='2016-17' + and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate + GROUP BY financialyear,zonecode + ), + fy2017 as + ( + SELECT + zonecode, + sum(payment.totalamountpaid) as amount, + count(payment.totalamountpaid) as totalcount, + concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, + (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr + INNER JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality and eg_bndry_mohalla.tenantid=$tenantid + where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id + and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY'))='2017-18' + and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate + GROUP BY financialyear,zonecode + ), + fy2018 as + ( + SELECT + zonecode, + sum(payment.totalamountpaid) as amount, + count(payment.totalamountpaid) as totalcount, + concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, + (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr + INNER JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality and eg_bndry_mohalla.tenantid=$tenantid + where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id + and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY'))='2018-19' + and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate + GROUP BY financialyear,zonecode + ), + fy2019 as + ( + SELECT + zonecode, + sum(payment.totalamountpaid) as amount, + count(payment.totalamountpaid) as totalcount, + concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, + (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr + INNER JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality and eg_bndry_mohalla.tenantid=$tenantid + where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id + and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY'))='2019-20' + and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate + GROUP BY financialyear,zonecode + ), + fy2020 as + ( + SELECT + zonecode, + sum(payment.totalamountpaid) as amount, + count(payment.totalamountpaid) as totalcount, + concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, + (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr + INNER JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality and eg_bndry_mohalla.tenantid=$tenantid + where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id + and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY'))='2020-21' + and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate + GROUP BY financialyear,zonecode + ), + fy2021 as + ( + SELECT + zonecode, + sum(payment.totalamountpaid) as amount, + count(payment.totalamountpaid) as totalcount, + concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, + (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr + INNER JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality and eg_bndry_mohalla.tenantid=$tenantid + where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id + and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY'))='2021-22' + and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate + GROUP BY financialyear,zonecode + ), + fy2022 as + ( + SELECT + zonecode, + sum(payment.totalamountpaid) as amount, + count(payment.totalamountpaid) as totalcount, + concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, + (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr + INNER JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality and eg_bndry_mohalla.tenantid=$tenantid + where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id + and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY'))='2022-23' + and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate + GROUP BY financialyear,zonecode + ), + fy2023 as + ( + SELECT + zonecode, + sum(payment.totalamountpaid) as amount, + count(payment.totalamountpaid) as totalcount, + concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, + (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr + INNER JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality and eg_bndry_mohalla.tenantid=$tenantid + where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id + and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY'))='2023-24' + and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate + GROUP BY financialyear,zonecode + ), + zones as + ( + select zonecode,string_agg(distinct zonename,',') as zname from eg_bndry_mohalla where tenantid=$tenantid group by zonecode + ) + SELECT + zones.zonecode as zonecode, + zones.zname as zonename, + coalesce(fy2013.totalcount,0) as "2013_14PTR", + coalesce(fy2013.amount,0) as "2013_14Collection", + coalesce(fy2014.totalcount,0) as "2014_15PTR", + coalesce(fy2014.amount,0) as "2014_15Collection", + coalesce(fy2015.totalcount,0) as "2015_16PTR", + coalesce(fy2015.amount,0) as "2015_16Collection", + coalesce(fy2016.totalcount,0) as "2016_17PTR", + coalesce(fy2016.amount,0) as "2016_17Collection", + coalesce(fy2017.totalcount,0) as "2017_18PTR", + coalesce(fy2017.amount,0) as "2017_18Collection", + coalesce(fy2018.totalcount,0) as "2018_19PTR", + coalesce(fy2018.amount,0) as "2018_19Collection", + coalesce(fy2019.totalcount,0) as "2019_20PTR", + coalesce(fy2019.amount,0) as "2019_20Collection", + coalesce(fy2020.totalcount,0) as "2020_21PTR", + coalesce(fy2020.amount,0) as "2020_21Collection", + coalesce(fy2021.totalcount,0) as "2021_22PTR", + coalesce(fy2021.amount,0) as "2021_22Collection", + coalesce(fy2022.totalcount,0) as "2022_23PTR", + coalesce(fy2022.amount,0) as "2022_23Collection", + coalesce(fy2023.totalcount,0) as "2023_24PTR", + coalesce(fy2023.amount,0) as "2023_24Collection", + coalesce(fy2013.totalcount,0)+coalesce(fy2014.totalcount,0)+coalesce(fy2015.totalcount,0)+coalesce(fy2016.totalcount,0)+coalesce(fy2017.totalcount,0)+coalesce(fy2018.totalcount,0)+coalesce(fy2019.totalcount,0)+coalesce(fy2020.totalcount,0)+coalesce(fy2021.totalcount,0)+coalesce(fy2022.totalcount,0)+coalesce(fy2023.totalcount,0) as "totalptr", + coalesce(fy2013.amount,0)+coalesce(fy2014.amount,0)+coalesce(fy2015.amount,0)+coalesce(fy2016.amount,0)+coalesce(fy2017.amount,0)+coalesce(fy2018.amount,0)+coalesce(fy2019.amount,0)+coalesce(fy2020.amount,0)+coalesce(fy2021.amount,0)+coalesce(fy2022.amount,0)+coalesce(fy2023.amount,0) as "totalcollection" + from zones + left outer join fy2013 on fy2013.zonecode=zones.zonecode + left outer join fy2014 on fy2014.zonecode=zones.zonecode + left outer join fy2015 on fy2015.zonecode=zones.zonecode + left outer join fy2016 on fy2016.zonecode=zones.zonecode + left outer join fy2017 on fy2017.zonecode=zones.zonecode + left outer join fy2018 on fy2018.zonecode=zones.zonecode + left outer join fy2019 on fy2019.zonecode=zones.zonecode + left outer join fy2020 on fy2020.zonecode=zones.zonecode + left outer join fy2021 on fy2021.zonecode=zones.zonecode + left outer join fy2022 on fy2022.zonecode=zones.zonecode + left outer join fy2023 on fy2023.zonecode=zones.zonecode + where 1=1 + orderby: order by zonename + + +- reportName: BlockFYReport_V2 + summary: Block FY Collection + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: blockname + label: reports.pt.blockname + type: string + source: pt + total: false + - name: 2013_14PTR + label: reports.pt.2013_14_PTR + type: string + source: pt + total: true + - name: 2013_14Collection + label: reports.pt.2013_14Collection + type: string + source: pt + total: true + - name: 2014_15PTR + label: reports.pt.2014_15_PTR + type: string + source: pt + total: true + - name: 2014_15Collection + label: reports.pt.2014_15Collection + type: string + source: pt + total: true + - name: 2015_16PTR + label: reports.pt.2015_16_PTR + type: string + source: pt + total: true + - name: 2015_16Collection + label: reports.pt.2015_16Collection + type: string + source: pt + total: true + - name: 2016_17PTR + label: reports.pt.2016_17_PTR + type: string + source: pt + total: true + - name: 2016_17Collection + label: reports.pt.2016_17Collection + type: string + source: pt + total: true + - name: 2017_18PTR + label: reports.pt.2017_18_PTR + type: string + source: pt + total: true + - name: 2017_18Collection + label: reports.pt.2017_18Collection + type: string + source: pt + total: true + - name: 2018_19PTR + label: reports.pt.2018_19_PTR + type: string + source: pt + total: true + - name: 2018_19Collection + label: reports.pt.2018_19Collection + type: string + source: pt + total: true + - name: 2019_20PTR + label: reports.pt.2019_20_PTR + type: string + source: pt + total: true + - name: 2019_20Collection + label: reports.pt.2019_20Collection + type: string + source: pt + total: true + - name: 2020_21PTR + label: reports.pt.2020_21_PTR + type: string + source: pt + total: true + - name: 2020_21Collection + label: reports.pt.2020_21Collection + type: string + source: pt + total: true + - name: 2021_22PTR + label: reports.pt.2020_21_PTR + type: string + source: pt + total: true + - name: 2021_22Collection + label: reports.pt.2020_21Collection + type: string + source: pt + total: true + - name: 2022_23PTR + label: reports.pt.2022_23_PTR + type: string + source: pt + total: true + - name: 2021_22Collection + label: reports.pt.2022_23Collection + type: string + source: pt + total: true + - name: totalptr + label: reports.pt.totalptr + type: string + source: pt + total: true + - name: totalcollection + label: reports.pt.totalcollection + type: string + source: pt + total: true + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: true + searchClause: AND 1=1 + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: true + searchClause: AND 1=1 + query: | + --S.no Service Name ULB Property Tax Unique ID Date Of Transcation Receipt Number Existing Property ID Type Of Property Mobile Number Address + with fy2013 as + ( + SELECT + blockcode, + sum(payment.totalamountpaid) as amount, + count(payment.totalamountpaid) as totalcount, + concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY')) as financialyear + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, + (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr + INNER JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality and eg_bndry_mohalla.tenantid=$tenantid + where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id + and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY'))='2013-14' + and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate + GROUP BY financialyear,blockcode + + ), + fy2014 as + ( + SELECT + blockcode, + sum(payment.totalamountpaid) as amount, + count(payment.totalamountpaid) as totalcount, + concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY')) as financialyear + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, + (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr + INNER JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality and eg_bndry_mohalla.tenantid=$tenantid + where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id + and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY'))='2014-15' + and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate + GROUP BY financialyear,blockcode + ), + fy2015 as + ( + SELECT + blockcode, + sum(payment.totalamountpaid) as amount, + count(payment.totalamountpaid) as totalcount, + concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY')) as financialyear + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, + (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr + INNER JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality and eg_bndry_mohalla.tenantid=$tenantid + where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id + and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY'))='2015-16' + and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate + GROUP BY financialyear,blockcode + ), + fy2016 as + ( + SELECT + blockcode, + sum(payment.totalamountpaid) as amount, + count(payment.totalamountpaid) as totalcount, + concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY')) as financialyear + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, + (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr + inner JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality + where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id + and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY'))='2016-17' + and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate + GROUP BY financialyear,blockcode + ), + fy2017 as + ( + SELECT + blockcode, + sum(payment.totalamountpaid) as amount, + count(payment.totalamountpaid) as totalcount, + concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY')) as financialyear + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, + (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr + INNER JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality and eg_bndry_mohalla.tenantid=$tenantid + where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id + and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY'))='2017-18' + and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate + GROUP BY financialyear,blockcode + ), + fy2018 as + ( + SELECT + blockcode, + sum(payment.totalamountpaid) as amount, + count(payment.totalamountpaid) as totalcount, + concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY')) as financialyear + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, + (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr + INNER JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality and eg_bndry_mohalla.tenantid=$tenantid + where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id + and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY'))='2018-19' + and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate + GROUP BY financialyear,blockcode + ), + fy2019 as + ( + SELECT + blockcode, + sum(payment.totalamountpaid) as amount, + count(payment.totalamountpaid) as totalcount, + concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY')) as financialyear + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, + (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr + INNER JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality and eg_bndry_mohalla.tenantid=$tenantid + where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id + and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY'))='2019-20' + and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate + GROUP BY financialyear,blockcode + ), + fy2020 as + ( + SELECT + blockcode, + sum(payment.totalamountpaid) as amount, + count(payment.totalamountpaid) as totalcount, + concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY')) as financialyear + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, + (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr + INNER JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality and eg_bndry_mohalla.tenantid=$tenantid + where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id + and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY'))='2020-21' + and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate + GROUP BY financialyear,blockcode + ), + fy2021 as + ( + SELECT + blockcode, + sum(payment.totalamountpaid) as amount, + count(payment.totalamountpaid) as totalcount, + concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY')) as financialyear + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, + (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr + INNER JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality and eg_bndry_mohalla.tenantid=$tenantid + where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id + and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY'))='2021-22' + and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate + GROUP BY financialyear,blockcode + ), + fy2022 as + ( + SELECT + blockcode, + sum(payment.totalamountpaid) as amount, + count(payment.totalamountpaid) as totalcount, + concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY')) as financialyear + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, + (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr + INNER JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality and eg_bndry_mohalla.tenantid=$tenantid + where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id + and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY'))='2022-23' + and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate + GROUP BY financialyear,blockcode + ), + fy2023 as + ( + SELECT + blockcode, + sum(payment.totalamountpaid) as amount, + count(payment.totalamountpaid) as totalcount, + concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY')) as financialyear + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, egcl_bill bill, + (select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr + INNER JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode= pt_addr.locality and eg_bndry_mohalla.tenantid=$tenantid + where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + and pt.propertyid = bill.consumercode and pt.status!='INACTIVE' and pt_addr.propertyid=pt.id + and concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time zone 'Asia/Kolkata'),'YY'))='2023-24' + and pd.receiptdate>=$fromDate and pd.receiptdate<=$toDate + GROUP BY financialyear,blockcode + ), + blocks as + ( + select blockcode,string_agg(distinct blockname,',') as zname from eg_bndry_mohalla where tenantid=$tenantid group by blockcode + ) + SELECT + blocks.blockcode as blockcode, + blocks.zname as blockname, + coalesce(fy2013.totalcount,0) as "2013_14PTR", + coalesce(fy2013.amount,0) as "2013_14Collection", + coalesce(fy2014.totalcount,0) as "2014_15PTR", + coalesce(fy2014.amount,0) as "2014_15Collection", + coalesce(fy2015.totalcount,0) as "2015_16PTR", + coalesce(fy2015.amount,0) as "2015_16Collection", + coalesce(fy2016.totalcount,0) as "2016_17PTR", + coalesce(fy2016.amount,0) as "2016_17Collection", + coalesce(fy2017.totalcount,0) as "2017_18PTR", + coalesce(fy2017.amount,0) as "2017_18Collection", + coalesce(fy2018.totalcount,0) as "2018_19PTR", + coalesce(fy2018.amount,0) as "2018_19Collection", + coalesce(fy2019.totalcount,0) as "2019_20PTR", + coalesce(fy2019.amount,0) as "2019_20Collection", + coalesce(fy2020.totalcount,0) as "2020_21PTR", + coalesce(fy2021.amount,0) as "2021_22Collection", + coalesce(fy2021.totalcount,0) as "2021_22PTR", + coalesce(fy2020.amount,0) as "2020_21Collection", + coalesce(fy2022.totalcount,0) as "2022_23PTR", + coalesce(fy2022.amount,0) as "2022_23Collection", + coalesce(fy2013.totalcount,0)+coalesce(fy2014.totalcount,0)+coalesce(fy2015.totalcount,0)+coalesce(fy2016.totalcount,0)+coalesce(fy2017.totalcount,0)+coalesce(fy2018.totalcount,0)+coalesce(fy2019.totalcount,0)+coalesce(fy2020.totalcount,0)+coalesce(fy2021.totalcount,0)+coalesce(fy2022.totalcount,0)+coalesce(fy2023.totalcount,0) as "totalptr", + coalesce(fy2013.amount,0)+coalesce(fy2014.amount,0)+coalesce(fy2015.amount,0)+coalesce(fy2016.amount,0)+coalesce(fy2017.amount,0)+coalesce(fy2018.amount,0)+coalesce(fy2019.amount,0)+coalesce(fy2020.amount,0)+coalesce(fy2021.amount,0)+coalesce(fy2022.amount,0)+coalesce(fy2023.amount,0) as "totalcollection" + from blocks + left outer join fy2013 on fy2013.blockcode=blocks.blockcode + left outer join fy2014 on fy2014.blockcode=blocks.blockcode + left outer join fy2015 on fy2015.blockcode=blocks.blockcode + left outer join fy2016 on fy2016.blockcode=blocks.blockcode + left outer join fy2017 on fy2017.blockcode=blocks.blockcode + left outer join fy2018 on fy2018.blockcode=blocks.blockcode + left outer join fy2019 on fy2019.blockcode=blocks.blockcode + left outer join fy2020 on fy2020.blockcode=blocks.blockcode + left outer join fy2021 on fy2021.blockcode=blocks.blockcode + left outer join fy2022 on fy2022.blockcode=blocks.blockcode + left outer join fy2023 on fy2023.blockcode=blocks.blockcode + where 1=1 + orderby: order by blockname + +- reportName: TopPayersReport_V2 + decryptionPathId: ULBDEFAULTERPTREPORT_V2 + summary: ULB Defaulter Pt report + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: consumercode + label: reports.pt.consumercode + type: string + source: pt + total: false + - name: receiptnumber + label: reports.pt.receiptnumber + type: string + source: pt + total: false + - name: totalamountpaid + label: reports.pt.totalamountpaid + type: string + source: pt + total: false + - name: ownername + label: reports.pt.ownername + type: string + source: pt + total: false + - name: usagecategory + label: reports.pt.usagecategory + type: string + source: pt + total: false + - name: mobileno + label: reports.pt.mobilenumber + type: string + source: pt + total: false + - name: address + label: reports.pt.address + type: string + source: pt + total: false + searchParams: + - name: ulb + label: ULB + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: pt + wrapper: true + isMandatory: false + searchClause: AND egcl_billdetial.tenantid=$ulb + query: | + --S.no Service Name ULB Property Tax Unique ID Date Of Transcation Receipt Number Existing Property ID Type Of Property Mobile Number Address + select distinct bill.consumercode,pt.usagecategory,pd.receiptnumber ,p.totalamountpaid, + concat(pa.doorno,' ',pa.buildingname,pa.street,' ',pa.city,' ,',pa.pincode) as address, u.name as ownername, u.mobilenumber as mobileno + from egcl_payment p inner join + egcl_paymentdetail pd on pd.paymentid=p.id and p.paymentstatus !='CANCELLED' and p.tenantid=$tenantid + and pd.businessservice='PT' inner join egcl_bill bill on bill.id=pd.billid inner join eg_pt_property pt + on bill.consumercode=pt.propertyid and pt.status='ACTIVE' and + pt.usagecategory like '%NONRESIDENTIAL.INDUSTRIAL%' inner join eg_pt_address pa on pa.propertyid=pt.id inner join eg_pt_owner po on + po.propertyid=pt.id inner join eg_user u on u.uuid=po.userid and u.active=true + + orderby: order by p.totalamountpaid desc limit 150 + +- reportName: PendingPTApplicationsReport_V2 + summary: ULB-wise PT Collection + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: tenantid + label: reports.pt.tenantid + type: string + source: pt + total: false + - name: propertyid + label: reports.pt.propertyid + type: string + source: pt + total: false + - name: applicationnumber + label: reports.pt.applicationnumber + type: string + source: pt + total: false + - name: oldpropertyid + label: reports.pt.oldpropertyid + type: string + source: pt + total: false + - name: status + label: reports.pt.status + type: string + source: pt + total: false + - name: propertytype + label: reports.pt.propertytype + type: string + source: pt + total: false + - name: usagecategory + label: reports.pt.usagecategory + type: string + source: pt + total: false + - name: channel + label: reports.pt.channel + type: string + source: pt + total: false + - name: createdon + label: reports.pt.createdon + type: string + source: pt + total: false + query: | + select + tenantid, + propertyid, + acknowldgementnumber as applicationnumber, + oldpropertyid, + status, + propertytype, + usagecategory, + channel, + to_char((To_timestamp(createdtime/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') as createdon + from eg_pt_property where status='INWORKFLOW' and tenantid=$tenantid + +- reportName: StatusReport_V2 + decryptionPathId: StatusReport_V2 + summary: Status Report + version: 1.0.0 + moduleName: rainmaker-pt + additionalConfig: + print: + pdfPageSize: "A1" + sourceColumns: + - name: propertyid + label: reports.pt.propertyid + type: string + source: pt + total: false + - name: applicationnumber + label: reports.pt.applicationnumber + type: string + source: pt + total: false + - name: usagecategory + label: reports.pt.usagecategory + type: string + source: pt + total: false + - name: financialyear + label: reports.pt.financialyear + type: string + source: pt + total: false + - name: createdtime + label: reports.pt.createdtime + type: string + source: pt + total: false + - name: createdby + label: reports.pt.createdby + type: string + source: pt + total: false + - name: zone + label: reports.pt.zone + type: string + source: pt + total: false + - name: block + label: reports.pt.block + type: string + source: pt + total: false + - name: localityname + label: reports.pt.localityname + type: string + source: pt + total: false + - name: approvedby + label: reports.pt.approvedby + type: string + source: pt + total: false + - name: address + label: reports.pt.address + type: string + source: pt + total: false + - name: status + label: reports.pt.status + type: string + source: pt + total: false + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: true + searchClause: AND propety.createdtime >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: true + searchClause: AND propety.createdtime <= $toDate + query: | + -- Use CTE to force query plan, compute & use CTE later + SELECT + propety.propertyid, propety.acknowldgementnumber as applicationnumber, propety.usagecategory, + to_char((To_timestamp(propety.createdtime/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS createdtime, + (case when eu.name is null then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else eu.name end) AS createdby, + localnames.zonecode AS zone, localnames.blockcode AS block, localnames.localityname AS localityname, + REGEXP_REPLACE(REGEXP_REPLACE(CONCAT(pta.doorno, ',', pta.buildingname, ',',pta.street,',', pta.pincode), ',+', ','), '^,|,$', '') as "address", pt_detail.financialyear, propety.status, + (case when propety.status = 'INWORKFLOW' then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else euser.name end) as approvedby + FROM eg_pt_property as propety + Left outer join eg_user as eu on eu.uuid = propety.createdby + Left outer join eg_user as euser on euser.uuid = propety.lastmodifiedby + Left outer join eg_pt_address as pta on pta.propertyid = propety.id + INNER join eg_pt_propertydetail_v2 pt_detail ON pt_detail.property = propety.propertyid + Left outer join egcl_bill as bill on bill.consumercode = propety.propertyid + Left outer join eg_bndry_mohalla as localnames on pta.locality=localnames.localitycode + WHERE propety.tenantid=$tenantid AND propety.acknowldgementnumber NOTNULL AND propety.status='ACTIVE' + orderby: ORDER BY propety.createdtime DESC + +- reportName: ULBPTData + decryptionPathId: ULBPTDataDumpReport_V2 + summary: ULB-wise PT Data + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: propertyid + label: reports.pt.propertyId + type: string + source: pt + total: false + - name: ownername + label: reports.pt.ownername + type: string + source: pt + total: false + - name: guardianname + label: reports.pt.guardianname + type: string + source: pt + total: false + - name: mobileno + label: reports.pt.mobileno + type: string + source: pt + total: false + - name: useruuid + label: reports.pt.useruuid + type: string + source: pt + total: false + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: true + searchClause: AND pt.createdtime >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: true + searchClause: AND pt.createdtime <= $toDate + query: | + select pt.propertyid as propertyid, u.name as ownername, u.guardian as guardianname, u.mobilenumber as mobileno, u.uuid as useruuid from eg_pt_property pt, eg_pt_owner po, eg_user u where pt.id=po.propertyid and po.userid=u.uuid and pt.status='ACTIVE' and po.status='ACTIVE' and pt.tenantid=$tenantid + orderby: ORDER BY pt.propertyid DESC NULLS LAST + +- reportName: PTReportforGISMapping + decryptionPathId: ULBPTDataDumpReport_V2 + summary: PT Report for GIS Mapping + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: propertyid + label: reports.pt.propertyid + type: string + source: pt + total: false + - name: applicationnumber + label: reports.pt.applicationnumber + type: string + source: pt + total: false + - name: oldpropertyid + label: reports.pt.oldpropertyid + type: string + source: pt + total: false + - name: nooffloors + label: reports.pt.nooffloors + type: string + source: pt + total: false + - name: landarea + label: reports.pt.landarea + type: string + source: pt + total: false + - name: usagecategory + label: reports.pt.usagecategory + type: string + source: pt + total: false + - name: surveyid + label: reports.pt.surveyid + type: string + source: pt + total: false + - name: ownername + label: reports.pt.ownername + type: string + source: pt + total: false + - name: guardianname + label: reports.pt.guardianname + type: string + source: pt + total: false + - name: mobileno + label: reports.pt.mobileno + type: string + source: pt + total: false + - name: locality + label: reports.pt.locality + type: string + source: pt + total: false + - name: localityname + label: reports.pt.localityname + type: string + source: pt + total: false + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: false + searchClause: AND p.createdtime >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: false + searchClause: AND p.createdtime <= $toDate + query: | + select distinct p.propertyid,p.nooffloors,p.landarea,p.usagecategory,p.surveyid,p.oldpropertyid,u.name as ownername, + u.guardian as guardianname,u.mobilenumber as mobileno, a.locality,localnames.localityname as localityname + from eg_pt_property as p inner join eg_pt_owner as o on p.id=o.propertyid and o.tenantid=$tenantid inner join eg_user as u + on o.userid=u.uuid and o.status='ACTIVE' inner join eg_pt_address as a on p.id=a.propertyid + left outer join eg_bndry_mohalla as localnames on a.locality=localnames.localitycode + where p.tenantid=$tenantid and p.status='ACTIVE' + and + o.propertyid in (select id from eg_pt_property where tenantid=$tenantid and status='ACTIVE') + orderby: ORDER BY p.propertyid + + +- reportName: PT_DEFAULTER_REPORT_V2 + decryptionPathId: ULBDEFAULTERPTREPORT_V2 + summary: ULB_PT_DEFAULTER + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: propertyid + label: reports.pt.propertyId + type: string + source: pt + total: false + - name: oldpropertyid + label: reports.pt.oldpropertyId + type: string + source: pt + total: false + - name: businessname + label: reports.pt.busnessname + type: string + source: pt + total: false + - name: financialyear + label: reports.pt.financialyear + type: string + source: pt + total: false + - name: latestfy + label: reports.pt.latestfy + type: string + source: pt + total: false + - name: max_pt_tax + label: reports.pt.max_pt_tax + type: string + source: pt + total: true + - name: max_paid + label: reports.pt.max_paid + type: string + source: pt + total: true + - name: propertytype + label: reports.pt.propertytype + type: string + source: pt + total: false + - name: propertyusagetype + label: reports.pt.propertyusagetype + type: string + source: pt + total: false + - name: address + label: reports.pt.address + type: string + source: pt + total: false + - name: block + label: reports.pt.block + type: string + source: pt + total: false + - name: ownername + label: reports.pt.ownername + type: string + source: pt + total: false + - name: mobileno + label: reports.pt.mobileno + type: string + source: pt + total: false + searchParams: + - name: finYear + label: Financial Year + type: singlevaluelist + pattern: 'list://2015-16:2015-16,2016-17:2016-17,2017-18:2017-18,2017-18:2017-18,2018-19:2018-19,2019-20:2019-20,2020-21:2020-21,2021-22:2021-22,2022-23:2022-23,2023-24:2023-24' + source: pt + isMandatory: false + searchClause: AND 1=1 + - name: usageType + label: Usage Type + type: singlevaluelist + pattern: 'list://RESIDENTIAL:Residential,NONRESIDENTIAL:NonResidential,MIXED:Mixed' + source: pt + isMandatory: false + searchClause: AND split_part(props.propertyusagetype,'.',1) = $usageType + - name: localityArray + label: reports.pt.zoneList + type: boundarylist + source: pt + isMandatory: false + searchClause: AND props.localitycode IN ($localityArray) + query: | + with assessments as + ( + select + propertyid, + string_agg(concat(assessmentyears,' (Rs.',totalamount,')'),', ') as fy, + max(assessmentyears) as latest_fy, + max(totalamount) as maxtotal, + max(propertytax) as max_pt_tax + from report_assessments + where tenantid=$tenantid + and propertyid not in (select propertyid from report_assessments where tenantid=$tenantid and assessmentyears =$finYear) + group by propertyid + ), + owners as + ( + select + split_part(string_agg(ownername,','),',',1) as ownername, + split_part(string_agg(mobileNumber,','),',',1) as mobileNumber, + propertyid + from report_owners + group by propertyid + ) + select + assessments.propertyid as propertyid, + props.oldpropertyid as oldpropertyid, + props.firmbusinessname as businessname, + assessments.fy as financialyear, + assessments.latest_fy as latestfy, + assessments.max_pt_tax as max_pt_tax, + assessments.maxtotal as max_paid, + props.propertytype as propertytype, + propertyusagetype as propertyusagetype, + concat(address,' ',localityname) as address, + blockcode as block, + owners.ownername as ownername, + owners.mobileNumber as mobileno + from report_properties props + inner join assessments on assessments.propertyid=props.propertyid + inner join owners on owners.propertyid=props.propertyid + where props.oldpropertyid not in (select concat('RID',previous_returnid) from ikon_2020_21_non_migrated_records where tenantid=$tenantid and replace(session,'-20','-')=$finYear) + +- reportName: PT_RECEIPTREGISTER_REPORT_V2 + decryptionPathId: ReceiptRegister_V2 + summary: Receipt Register + version: 1.0.0 + moduleName: rainmaker-pt + additionalConfig: + print: + pdfPageSize: "A1" + sourceColumns: + - name: receiptnumber + label: reports.pt.receiptNo + type: string + source: pt + total: false + - name: receiptdate + label: reports.pt.receiptDate + type: string + source: pt + total: false + - name: transactiondate + label: reports.pt.transactiondate + type: string + source: pt + total: false + - name: g8issuedate + label: reports.pt.g8issuedate + type: string + source: pt + total: false + - name: g8receiptno + label: reports.pt.g8receiptno + type: string + source: pt + total: false + - name: amount + label: reports.pt.amount + type: string + source: pt + total: true + - name: propertytax + label: reports.pt.propertyTax + type: string + source: pt + total: true + - name: paidpropertytax + label: reports.pt.paidpropertyTax + type: string + source: pt + total: true + - name: firecess + label: reports.pt.fireCess + type: string + source: pt + total: true + - name: cancercess + label: reports.pt.cancerCess + type: string + source: pt + total: true + - name: rebate + label: reports.pt.rebate + type: string + source: pt + total: true + - name: adhocrebate + label: reports.pt.adhocrebate + type: string + source: pt + total: true + - name: penalty + label: reports.pt.penalty + type: string + source: pt + total: true + - name: adhocpenalty + label: reports.pt.adhocpenalty + type: string + source: pt + total: true + - name: interest + label: reports.pt.interest + type: string + source: pt + total: true + - name: exemption + label: reports.pt.exemption + type: string + source: pt + total: true + - name: adjustment + label: reports.pt.roundoff + type: string + source: pt + total: true + - name: consumercode + label: reports.pt.propertyId + type: string + source: pt + total: false + - name: instrumenttype + label: reports.pt.paymentMode + type: string + source: pt + total: false + - name: collectorname + label: reports.pt.collectorname + type: string + source: pt + total: false + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: false + searchClause: AND rp.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: false + searchClause: AND rp.receiptdate <= $toDate + - name: paymentMode + label: Payment Mode + type: singlevaluelist + pattern: 'list://CARD:Card,CASH:Cash,CHEQUE:Cheque,DD:DD,OFFLINE_NEFT:NEFT,OFFLINE_RTGS:RTGS,ONLINE:Online,POSTAL_ORDER:PostalOrder' + source: pt + isMandatory: false + searchClause: AND rp.paymentmode = replace($paymentMode,',','_') + query: | + with assessments as + ( + select + billid, + sum(ra.propertytax) as propertytax, + sum(ra.paidpropertytax) as paidpropertytax, + sum(ra.firecess) as firecess, + sum(ra.cancercess) as cancercess, + sum(ra.adhocrebate) as adhocrebate, + sum(ra.rebate) as rebate, + sum(ra.penalty) as penalty, + sum(ra.adhocpenalty) as adhocpenalty, + sum(ra.interest) as interest, + sum(ra.exemption) as exemption, + sum(ra.adjustment) as roundoff + from report_assessments ra + where tenantid=$tenantid + group by billid + ) + select + rp.receiptnumber, + rp.propertyid as consumercode, + to_char((To_timestamp(rp.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') as "receiptdate", + to_char((To_timestamp(rp.transactiondate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') as "transactiondate", + rp.paymentmode, + rp.g8_issuedate as g8issuedate, + rp.g8_receiptnumber as g8receiptno, + rp.amoutpaid as amount, + rp.paymentmode as instrumenttype, + asmt.propertytax as propertytax, + asmt.paidpropertytax as paidpropertytax, + asmt.firecess as firecess, + asmt.cancercess as cancercess, + asmt.adhocrebate as adhocrebate, + asmt.rebate as rebate, + asmt.penalty as penalty, + asmt.adhocpenalty as adhocpenalty, + asmt.interest as interest, + asmt.exemption as exemption, + asmt.roundoff as adjustment, + (case when rp.collectedby is null then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else rp.collectedby end) as collectorname + from report_payments as rp + inner join assessments as asmt on asmt.billid = rp.billid -- asmt.billid like concat('%',rp.billid,'%') + where rp.paymentstatus!='CANCELLED' and rp.tenantid=$tenantid + orderby: order by receiptnumber + + + + +- reportName: PT_DATA_DUMP_REPORT_V2 + decryptionPathId: ULBPTDataDumpReport_V2 + summary: ULB level report + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: ulb + label: reports.pt.ulb + type: string + source: pt + total: false + - name: propertytaxuniqueid + label: reports.pt.propertytaxuniqueid + type: string + source: pt + total: false + - name: existingpropertyid + label: reports.pt.existingpropertyid + type: string + source: pt + total: false + - name: ownername + label: reports.pt.ownername + type: string + source: pt + total: false + - name: surveyid + label: reports.pt.surveyid + type: string + source: pt + total: false + - name: guardianname + label: reports.pt.guardianname + type: string + source: pt + total: false + - name: mobileno + label: reports.pt.mobileno + type: string + source: pt + total: false + - name: address + label: reports.pt.address + type: string + source: pt + total: false + - name: businessname + label: reports.pt.businessname + type: string + source: pt + total: false + - name: usagetype + label: reports.pt.propertyusagetype + type: string + source: pt + total: false + - name: localityname + label: reports.pt.localityname + type: string + source: pt + total: false + - name: totalarea + label: reports.pt.totalarea + type: string + source: pt + total: false + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: true + searchClause: AND rp.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: true + searchClause: AND rp.receiptdate <= $toDate + - name: localityArray + label: reports.pt.zoneList + type: boundarylist + source: pt + isMandatory: false + searchClause: AND pt.localitycode IN ($localityArray) + query: | + --S.no Service Name ULB Property Tax Unique ID Date Of Transcation Receipt Number Existing Property ID Owner Name Guardian Name Total Area (SQ.YARD) Covered Area/Built Area (SQ.FEET) Floors Occupancy (Rented,Self /Unoccupied) Type Of Property Mobile Number Transcation Mode of Payment Payment Amount Payment Date Email Id Address + with owners as + ( + select + split_part(string_agg(ownername,','),',',1) as ownername, + split_part(string_agg(mobilenumber,','),',',1) as mobilenumber, + split_part(string_agg(guardianname,','),',',1) as guardianname, + --split_part(string_agg(emailid,','),',',1) as emailid, + propertyid + from report_owners where status='ACTIVE' and tenantid=$tenantid + group by propertyid + ), + units as + ( + select + propertyid + --sum(builtuparea) as builtuparea, + --string_agg(occupancytype,',') as occupancytype + from report_units + where active='true' and tenantid=$tenantid + group by propertyid + ) + --payments as + --( + --select propertyid, sum(amoutpaid) as amountpaid from report_payments where tenantid=$tenantid and paymentstatus!='CANCELLED' + --group by propertyid + + --) + select + --rp.billid, + --ra.billid, + pt.tenantid as ulb, + pt.propertyid as propertytaxuniqueid, + --to_char((To_timestamp(rp.transactiondate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') as "transactiondate", + --rp.receiptnumber as receiptnumber, + --to_char((To_timestamp(rp.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS "paymentdate", + --rp.paymentmode as paymentmode, + pt.oldpropertyid as existingpropertyid, + --ra.assessmentyears as financialyear, + --getfinancialyear(rp.billid) as financialyear, + owners.ownername as ownername, + owners.guardianname as guardianname, + owners.mobilenumber as mobileno, + pt.plotsize as totalarea, + --ru.builtuparea as builtarea, + --pt.nooffloors as floors, + --ru.occupancytype as occupancy, + --pt.propertytype as propertytype, + --rp.payermobilenumber as mobilenumber, + --ra.totalamount as paymentamount, + --rp.amoutpaid as paymentamount, + --rp.transactiondate as transcationdate, + --owners.emailid as emailid, + pt.address as address, + pt.surveyid, + --pt.additionaldetails->>'remarks' as remarks, + --pt.additionaldetails->>'businessName' as firmbusinessname, + pt.firmbusinessname as businessname, + --pt.localitycode as localitycode, + pt.localityname as localityname, + --pt.zonename as zonename, + --pt.blockname as blockname, + pt.propertyusagetype as usagetype + from report_properties pt + inner join units as ru on ru.propertyid=pt.propertyid + inner join report_payments as rp on rp.propertyid=pt.propertyid and rp.paymentstatus!='CANCELLED' + --inner join report_assessments ra on split_part(ra.billid,',',1)=rp.billid and ra.propertyid=rp.propertyid + inner join owners on owners.propertyid=pt.propertyid and propertystatus='ACTIVE' + where pt.tenantid=$tenantid + + +- reportName: PT_ZoneFYReport_V2 + summary: Zone FY Collection + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: zonename + label: reports.pt.zonename + type: string + source: pt + total: false + - name: 2013_14PTR + label: reports.pt.2013_14_PTR + type: string + source: pt + total: true + - name: 2013_14Collection + label: reports.pt.2013_14Collection + type: string + source: pt + total: true + - name: 2014_15PTR + label: reports.pt.2014_15_PTR + type: string + source: pt + total: true + - name: 2014_15Collection + label: reports.pt.2014_15Collection + type: string + source: pt + total: true + - name: 2015_16PTR + label: reports.pt.2015_16_PTR + type: string + source: pt + total: true + - name: 2015_16Collection + label: reports.pt.2015_16Collection + type: string + source: pt + total: true + - name: 2016_17PTR + label: reports.pt.2016_17_PTR + type: string + source: pt + total: true + - name: 2016_17Collection + label: reports.pt.2016_17Collection + type: string + source: pt + total: true + - name: 2017_18PTR + label: reports.pt.2017_18_PTR + type: string + source: pt + total: true + - name: 2017_18Collection + label: reports.pt.2017_18Collection + type: string + source: pt + total: true + - name: 2018_19PTR + label: reports.pt.2018_19_PTR + type: string + source: pt + total: true + - name: 2018_19Collection + label: reports.pt.2018_19Collection + type: string + source: pt + total: true + - name: 2019_20PTR + label: reports.pt.2019_20_PTR + type: string + source: pt + total: true + - name: 2019_20Collection + label: reports.pt.2019_20Collection + type: string + source: pt + total: true + - name: 2020_21PTR + label: reports.pt.2020_21_PTR + type: string + source: pt + total: true + - name: 2020_21Collection + label: reports.pt.2020_21Collection + type: string + source: pt + total: true + - name: 2021_22PTR + label: reports.pt.2021_22_PTR + type: string + source: pt + total: true + - name: 2021_22Collection + label: reports.pt.2021_22Collection + type: string + source: pt + total: true + - name: 2022_23PTR + label: reports.pt.2022_23_PTR + type: string + source: pt + total: true + - name: 2022_23Collection + label: reports.pt.2022_23Collection + type: string + source: pt + total: true + - name: 2023_24PTR + label: reports.pt.2023_24_PTR + type: string + source: pt + total: true + - name: 2023_24Collection + label: reports.pt.2023_24Collection + type: string + source: pt + total: true + - name: totalptr + label: reports.pt.totalptr + type: string + source: pt + total: true + - name: totalcollection + label: reports.pt.totalcollection + type: string + source: pt + total: true + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: true + searchClause: AND 1=1 + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: true + searchClause: AND 1=1 + query: | + --S.no Service Name ULB Property Tax Unique ID Date Of Transcation Receipt Number Existing Property ID Type Of Property Mobile Number Address + with summary as + ( + select + assessmentyears, + zonename, + sum(totalamount) as amount, + count(distinct receiptnumber) as totalcount + from report_assessments as asmt + inner join report_properties as pt on pt.propertyid=asmt.propertyid + inner join report_payments as payment on payment.billid=asmt.billid and (asmt.totalamount>0 or payment.amoutpaid=0) + where payment.paymentstatus!='CANCELLED' and pt.tenantid=$tenantid + and asmt.createdtime>=$fromDate + and asmt.createdtime<=$toDate + group by assessmentyears,zonename + ) + select + zonename, + sum(case when assessmentyears='2013-14' then amount else 0 end) as "2013_14Collection", + sum(case when assessmentyears='2013-14' then totalcount else 0 end) as "2013_14PTR", + sum(case when assessmentyears='2014-15' then amount else 0 end) as "2014_15Collection", + sum(case when assessmentyears='2014-15' then totalcount else 0 end) as "2014_15PTR", + sum(case when assessmentyears='2015-16' then amount else 0 end) as "2015_16Collection", + sum(case when assessmentyears='2015-16' then totalcount else 0 end) as "2015_16PTR", + sum(case when assessmentyears='2016-17' then amount else 0 end) as "2016_17Collection", + sum(case when assessmentyears='2016-17' then totalcount else 0 end) as "2016_17PTR", + sum(case when assessmentyears='2017-18' then amount else 0 end) as "2017_18Collection", + sum(case when assessmentyears='2017-18' then totalcount else 0 end) as "2017_18PTR", + sum(case when assessmentyears='2018-19' then amount else 0 end) as "2018_19Collection", + sum(case when assessmentyears='2018-19' then totalcount else 0 end) as "2018_19PTR", + sum(case when assessmentyears='2019-20' then amount else 0 end) as "2019_20Collection", + sum(case when assessmentyears='2019-20' then totalcount else 0 end) as "2019_20PTR", + sum(case when assessmentyears='2020-21' then amount else 0 end) as "2020_21Collection", + sum(case when assessmentyears='2020-21' then totalcount else 0 end) as "2020_21PTR", + sum(case when assessmentyears='2021-22' then amount else 0 end) as "2021_22Collection", + sum(case when assessmentyears='2021-22' then totalcount else 0 end) as "2021_22PTR", + sum(case when assessmentyears='2022-23' then amount else 0 end) as "2022_23Collection", + sum(case when assessmentyears='2022-23' then totalcount else 0 end) as "2022_23PTR", + sum(case when assessmentyears='2023-24' then amount else 0 end) as "2023_24Collection", + sum(case when assessmentyears='2023-24' then totalcount else 0 end) as "2023_24PTR", + sum(amount) as totalcollection, + sum(totalcount) as totalptr + from summary + where 1=1 + groupby: group by zonename + + +- reportName: PT_BlockFYReport_V2 + summary: Block FY Collection + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: blockname + label: reports.pt.blockname + type: string + source: pt + total: false + - name: 2013_14PTR + label: reports.pt.2013_14_PTR + type: string + source: pt + total: true + - name: 2013_14Collection + label: reports.pt.2013_14Collection + type: string + source: pt + total: true + - name: 2014_15PTR + label: reports.pt.2014_15_PTR + type: string + source: pt + total: true + - name: 2014_15Collection + label: reports.pt.2014_15Collection + type: string + source: pt + total: true + - name: 2015_16PTR + label: reports.pt.2015_16_PTR + type: string + source: pt + total: true + - name: 2015_16Collection + label: reports.pt.2015_16Collection + type: string + source: pt + total: true + - name: 2016_17PTR + label: reports.pt.2016_17_PTR + type: string + source: pt + total: true + - name: 2016_17Collection + label: reports.pt.2016_17Collection + type: string + source: pt + total: true + - name: 2017_18PTR + label: reports.pt.2017_18_PTR + type: string + source: pt + total: true + - name: 2017_18Collection + label: reports.pt.2017_18Collection + type: string + source: pt + total: true + - name: 2018_19PTR + label: reports.pt.2018_19_PTR + type: string + source: pt + total: true + - name: 2018_19Collection + label: reports.pt.2018_19Collection + type: string + source: pt + total: true + - name: 2019_20PTR + label: reports.pt.2019_20_PTR + type: string + source: pt + total: true + - name: 2019_20Collection + label: reports.pt.2019_20Collection + type: string + source: pt + total: true + - name: 2020_21PTR + label: reports.pt.2020_21_PTR + type: string + source: pt + total: true + - name: 2020_21Collection + label: reports.pt.2020_21Collection + type: string + source: pt + total: true + - name: 2021_22PTR + label: reports.pt.2020_21_PTR + type: string + source: pt + total: true + - name: 2021_22Collection + label: reports.pt.2020_21Collection + type: string + source: pt + total: true + - name: 2022_23PTR + label: reports.pt.2022_23_PTR + type: string + source: pt + total: true + - name: 2022_23Collection + label: reports.pt.2022_23Collection + type: string + source: pt + total: true + - name: 2023_24PTR + label: reports.pt.2023_24_PTR + type: string + source: pt + total: true + - name: 2023_24Collection + label: reports.pt.2023_24Collection + type: string + source: pt + total: true + - name: totalptr + label: reports.pt.totalptr + type: string + source: pt + total: true + - name: totalcollection + label: reports.pt.totalcollection + type: string + source: pt + total: true + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: true + searchClause: AND 1=1 + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: true + searchClause: AND 1=1 + query: | + --S.no Service Name ULB Property Tax Unique ID Date Of Transcation Receipt Number Existing Property ID Type Of Property Mobile Number Address + with summary as + ( + select + assessmentyears, + blockname, + sum(totalamount) as amount, + count(distinct receiptnumber) as totalcount + from report_assessments as asmt + inner join report_properties as pt on pt.propertyid=asmt.propertyid + inner join report_payments as payment on payment.billid=asmt.billid and (asmt.totalamount>0 or payment.amoutpaid=0) + where payment.paymentstatus!='CANCELLED' and pt.tenantid=$tenantid + and asmt.createdtime>=$fromDate + and asmt.createdtime<=$toDate + group by assessmentyears,blockname + ) + select + blockname, + sum(case when assessmentyears='2013-14' then amount else 0 end) as "2013_14Collection", + sum(case when assessmentyears='2013-14' then totalcount else 0 end) as "2013_14PTR", + sum(case when assessmentyears='2014-15' then amount else 0 end) as "2014_15Collection", + sum(case when assessmentyears='2014-15' then totalcount else 0 end) as "2014_15PTR", + sum(case when assessmentyears='2015-16' then amount else 0 end) as "2015_16Collection", + sum(case when assessmentyears='2015-16' then totalcount else 0 end) as "2015_16PTR", + sum(case when assessmentyears='2016-17' then amount else 0 end) as "2016_17Collection", + sum(case when assessmentyears='2016-17' then totalcount else 0 end) as "2016_17PTR", + sum(case when assessmentyears='2017-18' then amount else 0 end) as "2017_18Collection", + sum(case when assessmentyears='2017-18' then totalcount else 0 end) as "2017_18PTR", + sum(case when assessmentyears='2018-19' then amount else 0 end) as "2018_19Collection", + sum(case when assessmentyears='2018-19' then totalcount else 0 end) as "2018_19PTR", + sum(case when assessmentyears='2019-20' then amount else 0 end) as "2019_20Collection", + sum(case when assessmentyears='2019-20' then totalcount else 0 end) as "2019_20PTR", + sum(case when assessmentyears='2020-21' then amount else 0 end) as "2020_21Collection", + sum(case when assessmentyears='2020-21' then totalcount else 0 end) as "2020_21PTR", + sum(case when assessmentyears='2021-22' then amount else 0 end) as "2021_22Collection", + sum(case when assessmentyears='2021-22' then totalcount else 0 end) as "2021_22PTR", + sum(case when assessmentyears='2022-23' then amount else 0 end) as "2022_23Collection", + sum(case when assessmentyears='2022-23' then totalcount else 0 end) as "2022_23PTR", + sum(case when assessmentyears='2023-24' then amount else 0 end) as "2023_24Collection", + sum(case when assessmentyears='2023-24' then totalcount else 0 end) as "2023_24PTR", + sum(amount) as totalcollection, + sum(totalcount) as totalptr + from summary + where 1=1 + groupby: group by blockname + +- reportName: PT_NO_PAYMENT_DEFAULTERS_REPORT + summary: PT NO PAYMENT DEFAULTERS_REPORT + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: tenantid + label: reports.pt.tenantid + type: string + source: pt + total: false + - name: propertyid + label: reports.pt.propertyid + type: string + source: pt + total: false + - name: surveyid + label: reports.pt.surveyid + type: string + source: pt + total: false + - name: oldpropertyid + label: reports.pt.oldpropertyid + type: string + source: pt + total: false + - name: firmbusinessname + label: reports.pt.firmbusinessname + type: string + source: pt + total: false + - name: address + label: reports.pt.address + type: string + source: pt + total: false + - name: blockname + label: reports.pt.blockname + type: string + source: pt + total: false + - name: zonename + label: reports.pt.zonename + type: string + source: pt + total: false + - name: propertyusagetype + label: reports.pt.propertyusagetype + type: string + source: pt + total: false + - name: propertytype + label: reports.pt.propertytype + type: string + source: pt + total: false + - name: superbuilduparea + label: reports.pt.superbuilduparea + type: string + source: pt + total: false + - name: nooffloors + label: reports.pt.nooffloors + type: string + source: pt + total: false + - name: ownershipcategory + label: reports.pt.ownershipcategory + type: string + source: pt + total: false + - name: source + label: reports.pt.source + type: string + source: pt + total: false + - name: channel + label: reports.pt.channel + type: string + source: pt + total: false + - name: plotsize + label: reports.pt.plotsize + type: string + source: pt + total: false + - name: propertystatus + label: reports.pt.propertystatus + type: string + source: pt + total: false + searchParams: + - name: usageType + label: Usage Type + type: singlevaluelist + pattern: 'list://RESIDENTIAL:Residential,NONRESIDENTIAL:NonResidential,MIXED:Mixed,' + source: pt + isMandatory: false + searchClause: AND split_part(propertyusagetype,'.',1) = $usageType + - name: localityArray + label: reports.pt.zoneList + type: boundarylist + source: pt + isMandatory: false + searchClause: AND localitycode IN ($localityArray) + - name: fromPlotsize + label: reports.pt.fromPlotsize + type: string + source: pt + isMandatory: false + searchClause: AND plotsize >= ($fromPlotsize)::int + - name: toPlotsize + label: reports.pt.toPlotsize + type: string + source: pt + isMandatory: false + searchClause: AND plotsize <= ($toPlotsize)::int + query: | + select + tenantid, + propertyid, + surveyid, + oldpropertyid, + firmbusinessname, + concat(address,' ',localityname) as address, + blockname, + zonename, + plotsize, + propertyusagetype, + propertytype, + superbuilduparea, + nooffloors, + ownershipcategory, + source, + channel, + propertystatus + from report_properties_withoutdemand + where tenantid=$tenantid + +- reportName: PTReceiptRegister_7to10Sept2020 + decryptionPathId: ReceiptRegister_V2 + summary: PTReceiptRegister_7to10Sept2020 + version: 1.0.0 + moduleName: rainmaker-pt + additionalConfig: + print: + pdfPageSize: "A1" + sourceColumns: + - name: receiptnumber + label: reports.pt.receiptNo + type: string + source: pt + total: false + - name: receiptdate + label: reports.pt.receiptDate + type: string + source: pt + total: false + - name: consumercode + label: reports.pt.consumercode + type: string + source: pt + total: false + - name: tenantid + label: reports.pt.tenantid + type: string + source: pt + total: false + - name: g8issuedate + label: reports.pt.g8issuedate + type: string + source: pt + total: false + - name: g8receiptno + label: reports.pt.g8receiptno + type: string + source: pt + total: false + - name: amount + label: reports.pt.amount + type: string + source: pt + total: true + - name: propertytax + label: reports.pt.propertyTax + type: string + source: pt + total: true + - name: firecess + label: reports.pt.fireCess + type: string + source: pt + total: true + - name: cancercess + label: reports.pt.cancerCess + type: string + source: pt + total: true + - name: rebate + label: reports.pt.rebate + type: string + source: pt + total: true + - name: adhocrebate + label: reports.pt.adhocrebate + type: string + source: pt + total: true + - name: penalty + label: reports.pt.penalty + type: string + source: pt + total: true + - name: adhocpenalty + label: reports.pt.adhocpenalty + type: string + source: pt + total: true + - name: interest + label: reports.pt.interest + type: string + source: pt + total: true + - name: exemption + label: reports.pt.exemption + type: string + source: pt + total: true + - name: adjustment + label: reports.pt.roundoff + type: string + source: pt + total: true + - name: pendingamount + label: reports.pt.pendingamount + type: string + source: pt + total: true + - name: paidpropertytax + label: reports.pt.paidpropertytax + type: string + source: pt + total: true + - name: usagetype + label: reports.pt.usagetype + type: string + source: pt + total: false + - name: instrumenttype + label: reports.pt.paymentMode + type: string + source: pt + total: false + - name: transactionnumber + label: reports.pt.ddChequeTransactionNo + type: string + source: pt + total: false + - name: surveyid + label: reports.pt.surveyid + type: string + source: pt + total: false + - name: transactiondate + label: reports.pt.transactiondate + type: string + source: pt + total: false + - name: collectorname + label: reports.pt.collectorname + type: string + source: pt + total: false + - name: financialyear + label: reports.pt.financialyear + type: string + source: pt + total: false + + query: | + -- Use CTE to force query plan, compute & use CTE later + SELECT + tenantid, consumercode, surveyid, receiptdate, receiptnumber, amount, instrumenttype, transactionnumber, + financialyear, transactiondate, pendingamount, usagetype, collectorname, pdid, adhocpenalty, adhocrebate, firecess, cancercess, interest, + penalty, rebate, propertytax, paidpropertytax, exemption, adjustment, g8issuedate, g8receiptno from pt_7to10sept2020_receipts + where tenantid=$tenantid + orderby: ORDER BY receiptdate DESC; + + +- reportName: TempReport + decryptionPathId: ULBDEFAULTERPTREPORT_V2 + summary: ULB Temporar report + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: propertyuid + label: reports.pt.propertytaxuniqueid + type: string + source: pt + total: false + - name: propertyid + label: reports.pt.propertyid + type: string + source: pt + total: false + - name: oldpropertyid + label: reports.pt.oldpropertyid + type: string + source: pt + total: false + - name: address + label: reports.pt.address + type: string + source: pt + total: false + - name: ownername + label: reports.pt.ownername + type: string + source: pt + total: false + - name: mobileno + label: reports.pt.mobilenumber + type: string + source: pt + total: false + searchParams: + - name: finYear + label: Financial Year + type: singlevaluelist + pattern: 'list://1554057000000:2019-20,1585679400000:2020-21,1617215400000:2021-22,1648751400000:2022-23,1648771200000:2023-24' + source: pt + isMandatory: true + searchClause: AND 1=1 + query: | + select eg_pt_owner.propertyid as propertyuid, + pt.propertyid as propertyid, + oldpropertyid, + concat(case when pta.doorno is null then '' else 'door no ' end,pta.doorno,' location ',pta.plotno,pta.buildingname,pta.street) as address, + name as ownername, + mobilenumber as mobileno + from eg_pt_owner + inner join eg_user on eg_pt_owner.userid=eg_user.uuid + inner join eg_pt_property pt on pt.id=eg_pt_owner.propertyid + inner join eg_pt_address pta on pta.propertyid=pt.id + where eg_pt_owner.propertyid in + (select id + from eg_pt_property + where tenantid=$tenantid and status='ACTIVE' and propertyid not in (select consumercode from egbs_demand_v1 where tenantid=$tenantid and businessservice='PT' and taxperiodfrom=$finYear::bigint ) -- and taxperiodfrom=1617215400000) -- 2021-22 + ) + + +- reportName: DailyCollectionReport + summary: Collection Register + version: 1.0.0 + moduleName: rainmaker-pt + additionalConfig: + print: + pdfPageSize: "A4" + sourceColumns: + - name: instrumenttype + label: reports.pt.paymentMode + type: string + source: pt + total: false + - name: count_receipts + label: reports.pt.count + type: string + source: pt + total: true + - name: paid_without_cess + label: reports.pt.withoutCess + type: string + source: pt + total: true + - name: firecess + label: reports.pt.fireCess + type: string + source: pt + total: true + - name: cancercess + label: reports.pt.cancerCess + type: string + source: pt + total: true + - name: totalpaid + label: reports.pt.total + type: string + source: pt + total: true + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: true + searchClause: AND pd.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: true + searchClause: AND pd.receiptdate <= $toDate + query: | + -- Use CTE to force query plan, compute & use CTE later + WITH receipt_breakup AS ( + SELECT + pd.id as pdid, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, + SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN bad.amount ELSE 0 END) as propertytax, + SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as paidpropertytax, + (SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN bad.amount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN bad.amount ELSE 0 END) ) as exemption, + (SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END)) as adjustment + FROM egcl_billaccountdetail as bad + INNER JOIN egcl_billdetial as bd on bd.id = bad.billdetailid + INNER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid + INNER JOIN egcl_payment as payment on pd.paymentid=payment.id + WHERE payment.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' + AND pd.receiptdate >= $fromDate AND pd.receiptdate <= $toDate + GROUP BY pdid + ) + SELECT + concat(payment.paymentmode,substring(instrumentnumber,0,position ('/' in instrumentnumber))) as instrumenttype, + count(*) as count_receipts, + sum(payment.totalamountpaid)-sum(receipt_breakup.firecess+receipt_breakup.cancercess) as paid_without_cess, + sum(receipt_breakup.firecess) as firecess, + sum(receipt_breakup.cancercess) as cancercess, + sum(payment.totalamountpaid) as totalpaid + FROM egcl_paymentdetail pd, egcl_payment payment , receipt_breakup + where pd.paymentid=payment.id and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + and receipt_breakup.pdid=pd.id and paymentmode not in ('CHEQUE','OFFLINE_NEFT','OFFLINE_RTGS') + groupby: group by instrumenttype,substring(instrumentnumber,0,position ('/' in instrumentnumber)) + + +- reportName: DailyChequeDetail + summary: Cheque RTGS NEFT Collection Register + version: 1.0.0 + moduleName: rainmaker-pt + additionalConfig: + print: + pdfPageSize: "A3" + sourceColumns: + - name: instrumenttype + label: reports.pt.paymentMode + type: string + source: pt + total: false + - name: receiptnumber + label: reports.pt.receiptno + type: string + source: pt + total: false + - name: receiptdate + label: reports.pt.receiptdate + type: string + source: pt + total: false + - name: transactionnumber + label: reports.pt.transactionno + type: string + source: pt + total: false + - name: transactiondate + label: reports.pt.transactiondate + type: string + source: pt + total: false + - name: ifsc + label: reports.pt.ifsccode + type: string + source: pt + total: false + - name: bankname + label: reports.pt.bankname + type: string + source: pt + total: false + - name: amount_without_cess + label: reports.pt.withoutCess + type: string + source: pt + total: true + - name: firecess + label: reports.pt.fireCess + type: string + source: pt + total: true + - name: cancercess + label: reports.pt.cancerCess + type: string + source: pt + total: true + - name: amount + label: reports.pt.total + type: string + source: pt + total: true + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: true + searchClause: AND pd.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: true + searchClause: AND pd.receiptdate <= $toDate + query: | + -- Use CTE to force query plan, compute & use CTE later + WITH receipt_breakup AS ( + SELECT + pd.id as pdid, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, + SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN bad.amount ELSE 0 END) as propertytax, + SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) as paidpropertytax, + (SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN bad.amount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_OWNER_EXEMPTION' THEN bad.amount ELSE 0 END) ) as exemption, + (SUM(CASE WHEN taxheadcode LIKE 'PT_ROUNDOFF' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END)) as adjustment + FROM egcl_billaccountdetail as bad + INNER JOIN egcl_billdetial as bd on bd.id = bad.billdetailid + INNER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid + INNER JOIN egcl_payment as payment on pd.paymentid=payment.id + WHERE payment.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' + and paymentmode in ('CHEQUE','OFFLINE_NEFT','OFFLINE_RTGS') + AND pd.receiptdate >= $fromDate AND pd.receiptdate <= $toDate + GROUP BY pdid + ) + SELECT + payment.paymentmode as instrumenttype, + receiptnumber, + to_char((To_timestamp(receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS receiptdate, + payment.transactionnumber, + to_char((To_timestamp(payment.instrumentdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, + payment.ifsccode AS ifsc, + concat(bank_branches.bank_name,' ',bank_branches.branch) as bankname, + payment.totalamountpaid-firecess-cancercess as amount_without_cess, + receipt_breakup.firecess as firecess, + receipt_breakup.cancercess as cancercess, + payment.totalamountpaid as amount + FROM egcl_paymentdetail pd, egcl_payment payment left outer join bank_branches on bank_branches.ifsc=payment.ifsccode, receipt_breakup + where pd.paymentid=payment.id and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + and receipt_breakup.pdid=pd.id and payment.paymentmode in ('CHEQUE','CARD','DD') + orderby: ORDER BY pd.receiptdate DESC; + + +- reportName: cybertech_additional_transactions + summary: CyberTech Additional Transactions + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: client_data_property_id + label: reports.pt.client_data_property_id + type: string + source: pt + total: false + - name: returnid + label: reports.pt.returnid + type: string + source: pt + total: false + - name: previousyearid + label: reports.pt.previousyearid + type: string + source: pt + total: false + - name: acknowledgementno + label: reports.pt.acknowledgementno + type: string + source: pt + total: false + - name: entrydate + label: reports.pt.entrydate + type: string + source: pt + total: false + - name: zone + label: reports.pt.zone + type: string + source: pt + total: false + - name: sector + label: reports.pt.sector + type: string + source: pt + total: false + - name: colony + label: reports.pt.colony + type: string + source: pt + total: false + - name: house_no + label: reports.pt.house_no + type: string + source: pt + total: false + - name: owner_detail + label: reports.pt.owner_detail + type: string + source: pt + total: false + - name: lease_detail + label: reports.pt.lease_detail + type: string + source: pt + total: false + - name: property_address + label: reports.pt.property_address + type: string + source: pt + total: false + - name: covered_measure_detail + label: reports.pt.covered_measure_detail + type: string + source: pt + total: false + - name: uncovered_measure_detail + label: reports.pt.uncovered_measure_detail + type: string + source: pt + total: false + - name: land_usage_type + label: reports.pt.land_usage_type + type: string + source: pt + total: false + - name: usage + label: reports.pt.usage + type: string + source: pt + total: false + - name: covered_area + label: reports.pt.covered_area + type: string + source: pt + total: false + - name: applicable_tax + label: reports.pt.applicable_tax + type: string + source: pt + total: true + - name: fire_charges + label: reports.pt.fire_charges + type: string + source: pt + total: true + - name: interest + label: reports.pt.interest + type: string + source: pt + total: true + - name: penalty + label: reports.pt.penalty + type: string + source: pt + total: true + - name: rebate + label: reports.pt.rebate + type: string + source: pt + total: true + - name: exemption_amount + label: reports.pt.exemption_amount + type: string + source: pt + total: true + - name: total_payable_tax + label: reports.pt.total_payable_tax + type: string + source: pt + total: true + - name: payment_mode + label: reports.pt.payment_mode + type: string + source: pt + total: false + - name: transaction_id + label: reports.pt.transaction_id + type: string + source: pt + total: false + - name: g8_book_no + label: reports.pt.g8_book_no + type: string + source: pt + total: false + - name: g8receiptno + label: reports.pt.g8receiptno + type: string + source: pt + total: false + - name: paymentdate + label: reports.pt.paymentdate + type: string + source: pt + total: false + - name: property_type + label: reports.pt.property_type + type: string + source: pt + total: false + - name: session + label: reports.pt.session + type: string + source: pt + total: false + - name: buildingcategory + label: reports.pt.buildingcategory + type: string + source: pt + total: false + query: | + select * from patiala_cybertech_additional_transactions + orderby: ORDER BY paymentdate + +- reportName: WithoutUpinTransactions + summary: WithoutUpinTransactions + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: client_data_property_id + label: reports.pt.client_data_property_id + type: string + source: pt + total: false + - name: level_detail_name + label: reports.pt.returnid + type: string + source: pt + total: false + - name: previousyearid + label: reports.pt.previousyearid + type: string + source: pt + total: false + - name: acknowledgementno + label: reports.pt.acknowledgementno + type: string + source: pt + total: false + - name: upin + label: reports.pt.acknowledgementno + type: string + source: pt + total: false + - name: entrydate + label: reports.pt.entrydate + type: string + source: pt + total: false + - name: zone + label: reports.pt.zone + type: string + source: pt + total: false + - name: sector + label: reports.pt.sector + type: string + source: pt + total: false + - name: colony + label: reports.pt.colony + type: string + source: pt + total: false + - name: house_no + label: reports.pt.house_no + type: string + source: pt + total: false + - name: owner_detail + label: reports.pt.owner_detail + type: string + source: pt + total: false + - name: lease_detail + label: reports.pt.lease_detail + type: string + source: pt + total: false + - name: property_address + label: reports.pt.property_address + type: string + source: pt + total: false + - name: covered_measure_detail + label: reports.pt.covered_measure_detail + type: string + source: pt + total: false + - name: uncovered_measure_detail + label: reports.pt.uncovered_measure_detail + type: string + source: pt + total: false + - name: land_usage_type + label: reports.pt.land_usage_type + type: string + source: pt + total: false + - name: usage + label: reports.pt.usage + type: string + source: pt + total: false + - name: plot_area + label: reports.pt.plot_area + type: string + source: pt + total: false + - name: covered_area + label: reports.pt.covered_area + type: string + source: pt + total: false + - name: applicable_tax + label: reports.pt.applicable_tax + type: string + source: pt + total: true + - name: fire_charges + label: reports.pt.fire_charges + type: string + source: pt + total: true + - name: interest + label: reports.pt.interest + type: string + source: pt + total: true + - name: penalty + label: reports.pt.penalty + type: string + source: pt + total: true + - name: rebate + label: reports.pt.rebate + type: string + source: pt + total: true + - name: exemption_amount + label: reports.pt.exemption_amount + type: string + source: pt + total: true + - name: total_payable_tax + label: reports.pt.total_payable_tax + type: string + source: pt + total: true + - name: payment_mode + label: reports.pt.payment_mode + type: string + source: pt + total: false + - name: cheque_no + label: reports.pt.cheque_no + type: string + source: pt + total: false + - name: cheque_realisation_date + label: reports.pt.cheque_realisation_date + type: string + source: pt + total: false + - name: cheque_status + label: reports.pt.cheque_status + type: string + source: pt + total: false + - name: remark + label: reports.pt.remark + type: string + source: pt + total: false + - name: post_tid + label: reports.pt.pos_id + type: string + source: pt + total: false + - name: pos_invoice_num + label: reports.pt.pos_invoice_num + type: string + source: pt + total: false + - name: transaction_id + label: reports.pt.transaction_id + type: string + source: pt + total: false + - name: g8_book_no + label: reports.pt.g8_book_no + type: string + source: pt + total: false + - name: g8receiptno + label: reports.pt.g8receiptno + type: string + source: pt + total: false + - name: paymentdate + label: reports.pt.paymentdate + type: string + source: pt + total: false + - name: property_type + label: reports.pt.property_type + type: string + source: pt + total: false + - name: session + label: reports.pt.session + type: string + source: pt + total: false + - name: buildingcategory + label: reports.pt.buildingcategory + type: string + source: pt + total: false + query: | + select * from patiala_without_upin_transactions + orderby: ORDER BY paymentdate + +- reportName: OCCUPANCY_TYPE_REPORT + decryptionPathId: ULBDEFAULTERPTREPORT_V2 + summary: Occupancy Type Report + version: 1.0.0 + moduleName: rainmaker-pt + additionalConfig: + print: + pdfPageSize: "A3" + sourceColumns: + - name: propertyid + label: reports.pt.propertyid + type: string + source: pt + total: false + - name: oldpropertyid + label: reports.pt.oldpropertyid + type: string + source: pt + total: false + - name: propertystatus + label: reports.pt.status + type: string + source: pt + total: false + - name: firmbusinessname + label: reports.pt.businessname + type: string + source: pt + total: false + - name: address + label: reports.pt.address + type: string + source: pt + total: false + - name: localityname + label: reports.pt.locality + type: string + source: pt + total: false + - name: blockname + label: reports.pt.blockname + type: string + source: pt + total: false + - name: propertyusagetype + label: reports.pt.propertyusage + type: string + source: pt + total: false + - name: propertytype + label: reports.pt.propertytype + type: string + source: pt + total: false + - name: plotsize + label: reports.pt.plotsize + type: string + source: pt + total: false + - name: unit + label: reports.pt.units + type: string + source: pt + total: false + - name: fy + label: reports.pt.financialyear + type: string + source: pt + total: false + - name: ownername + label: reports.pt.ownername + type: string + source: pt + total: false + - name: mobileno + label: reports.pt.mobileno + type: string + source: pt + total: false + searchParams: + - name: occupancy + label: Occupancy Type + type: singlevaluelist + pattern: 'list://RENTED:Rented,SELFOCCUPIED:SelfOccupied,UNOCCUPIED:UnOccupied,PG:Paying Guest' + source: pt + isMandatory: false + searchClause: and units.unit like concat('%',$occupancy,'%') + query: | + -- Use CTE to force query plan, compute & use CTE later + with units as + ( + select propertyid,string_agg(concat(floorno,'/', occupancytype,'/',usagecategory,'/',builtuparea,'/',avr),' # ') as unit + from report_units + where tenantid=$tenantid + group by propertyid + ), + assessments as + ( + select + propertyid, + string_agg(distinct concat(financialyear),', ') as fy + --max(assessmentyears) as latest_fy, + --max(totalamount) as maxtotal, + --max(propertytax) as max_pt_tax + from eg_pt_asmt_assessment + where tenantid=$tenantid + group by propertyid + ), + owners as + ( + select + split_part(string_agg(ownername,','),',',1) as ownername, + split_part(string_agg(mobileNumber,','),',',1) as mobilenumber, + propertyid + from report_owners + where tenantid=$tenantid + group by propertyid + ) + select + props.propertyid, + oldpropertyid, + propertystatus, + firmbusinessname, + address, + localityname, + blockname, + propertyusagetype, + propertytype, + plotsize, + units.unit as unit, + assessments.fy as fy, + owners.ownername as ownername, + owners.mobilenumber as mobileno + from report_properties props + inner join units on units.propertyid=props.propertyid + left outer join assessments on assessments.propertyid=props.propertyid + inner join owners on owners.propertyid=props.propertyid + where props.tenantid=$tenantid and propertystatus!='INACTIVE' + --and assessments.fy not like '%2021-22%' + +- reportName: DEFAULTER_REPORT_WITH_LOCALITY + decryptionPathId: ULBDEFAULTERPTREPORT_V2 + summary: Occupancy Type Report + version: 1.0.0 + moduleName: rainmaker-pt + additionalConfig: + print: + pdfPageSize: "A3" + sourceColumns: + - name: propertyid + label: reports.pt.propertyid + type: string + source: pt + total: false + - name: oldpropertyid + label: reports.pt.oldpropertyid + type: string + source: pt + total: false + - name: propertystatus + label: reports.pt.status + type: string + source: pt + total: false + - name: firmbusinessname + label: reports.pt.businessname + type: string + source: pt + total: false + - name: address + label: reports.pt.address + type: string + source: pt + total: false + - name: localityname + label: reports.pt.locality + type: string + source: pt + total: false + - name: blockname + label: reports.pt.blockname + type: string + source: pt + total: false + - name: propertyusagetype + label: reports.pt.propertyusage + type: string + source: pt + total: false + - name: propertytype + label: reports.pt.propertytype + type: string + source: pt + total: false + - name: plotsize + label: reports.pt.plotsize + type: string + source: pt + total: false + - name: fy + label: reports.pt.financialyear + type: string + source: pt + total: false + - name: ownername + label: reports.pt.ownername + type: string + source: pt + total: false + - name: mobileno + label: reports.pt.mobileno + type: string + source: pt + total: false + searchParams: + - name: fy + label: Financial Year + type: singlevaluelist + pattern: 'list://1427846400000:2015-16,1459468800000:2016-17,1491004800000:2017-18,1522521000000:2018-19,1522540800000:2019-20,1554076800000:2020-21,1617215400000:2021-22,1648751400000:2022-23,1648771200000:2023-24' + source: pt + isMandatory: true + searchClause: and assessments.fy not like concat('%',$fy,'%') + - name: blockname + label: reports.pt.blockname + type: string + source: pt + isMandatory: false + searchClause: AND upper(blockname) LIKE CONCAT('%',upper($blockname),'%') + - name: localityname + label: reports.pt.localityname + type: string + source: pt + isMandatory: false + searchClause: AND upper(localityname) LIKE CONCAT('%',upper($localityname),'%') + query: | + -- Use CTE to force query plan, compute & use CTE later + with assessments as + ( + select + propertyid, + string_agg(distinct concat(financialyear),', ') as fy + --max(assessmentyears) as latest_fy, + --max(totalamount) as maxtotal, + --max(propertytax) as max_pt_tax + from eg_pt_asmt_assessment + where tenantid=$tenantid + group by propertyid + ), + owners as + ( + select + split_part(string_agg(ownername,','),',',1) as ownername, + split_part(string_agg(mobileNumber,','),',',1) as mobilenumber, + propertyid + from report_owners + where tenantid=$tenantid + group by propertyid + ) + select + props.propertyid, + oldpropertyid, + propertystatus, + firmbusinessname, + address, + localityname, + blockname, + propertyusagetype, + propertytype, + plotsize, + assessments.fy as fy, + owners.ownername as ownername, + owners.mobilenumber as mobileno + from report_properties props + left outer join assessments on assessments.propertyid=props.propertyid + left outer join owners on owners.propertyid=props.propertyid + where props.tenantid=$tenantid and propertystatus!='INACTIVE' + +- reportName: DEFAULTER_REPORT_WITH_LOCALITY_UNPAID_DEMAND + decryptionPathId: ULBDEFAULTERPTREPORT_V2 + summary: Occupancy Type Report + version: 1.0.0 + moduleName: rainmaker-pt + additionalConfig: + print: + pdfPageSize: "A3" + sourceColumns: + - name: propertyid + label: reports.pt.propertyid + type: string + source: pt + total: false + - name: oldpropertyid + label: reports.pt.oldpropertyid + type: string + source: pt + total: false + - name: propertystatus + label: reports.pt.status + type: string + source: pt + total: false + - name: firmbusinessname + label: reports.pt.businessname + type: string + source: pt + total: false + - name: address + label: reports.pt.address + type: string + source: pt + total: false + - name: localityname + label: reports.pt.locality + type: string + source: pt + total: false + - name: blockname + label: reports.pt.blockname + type: string + source: pt + total: false + - name: propertyusagetype + label: reports.pt.propertyusage + type: string + source: pt + total: false + - name: propertytype + label: reports.pt.propertytype + type: string + source: pt + total: false + - name: plotsize + label: reports.pt.plotsize + type: string + source: pt + total: false + - name: ownername + label: reports.pt.ownername + type: string + source: pt + total: false + - name: mobileno + label: reports.pt.mobileno + type: string + source: pt + total: false + - name: tentativedemand + label: reports.pt.tentativedemand + type: string + source: pt + total: false + - name: financialyears + label: reports.pt.financialyears + type: string + source: pt + total: false + searchParams: + - name: fy + label: Financial Year + type: singlevaluelist + pattern: 'list://1427846400000:2015-16,1459468800000:2016-17,1491004800000:2017-18,1522540800000:2018-19,1554076800000:2019-20,1585699200000:2020-21,1617215400000:2021-22,1648751400000:2022-23,1648771200000:2023-24' + source: pt + isMandatory: true + searchClause: and 1=1 + - name: usageCat + label: Usage Category + type: singlevaluelist + pattern: 'list://NONRESIDENTIAL:NONRESIDENTIAL,MIXED:MIXED,RESIDENTIAL:RESIDENTIAL' + source: pt + isMandatory: true + searchClause: and 1=1 + - name: blockname + label: reports.pt.blockname + type: string + source: pt + isMandatory: false + searchClause: AND upper(blockname) LIKE CONCAT('%',upper($blockname),'%') + - name: localityname + label: reports.pt.localityname + type: string + source: pt + isMandatory: false + searchClause: AND upper(localityname) LIKE CONCAT('%',upper($localityname),'%') + query: | + -- Use CTE to force query plan, compute & use CTE later + with properties as + ( + select distinct consumercode as propertyid from egbs_demand_v1 where taxperiodfrom::varchar=$fy and businessservice='PT' and status!='CANCELLED' + and ispaymentcompleted=false and tenantid=$tenantid + ), + props as + ( + select * from report_properties where tenantid=$tenantid and propertystatus='ACTIVE' and propertyusagetype like concat($usageCat,'%') + ), + demands as + ( + select consumercode as propertyid,sum(taxamount) as demand,string_agg(distinct to_char((To_timestamp(d.taxperiodfrom/1000) at time Zone 'Asia/Kolkata'),'YYYY'),',') as financialyears + from egbs_demand_v1 d + inner join egbs_demanddetail_v1 dd on dd.demandid=d.id + inner join properties p on p.propertyid=consumercode + where businessservice='PT' and status!='CANCELLED' + and ispaymentcompleted=false and d.tenantid=$tenantid + and taxamount!=collectionamount + group by consumercode + ), + owners as + ( + select + split_part(string_agg(ownername,','),',',1) as ownername, + split_part(string_agg(mobileNumber,','),',',1) as mobilenumber, + propertyid + from report_owners + where tenantid=$tenantid + group by propertyid + ) + select + props.propertyid, + props.oldpropertyid, + props.propertystatus, + demands.demand as tentativedemand, + demands.financialyears as financialyears, + firmbusinessname, + address, + localityname, + blockname, + propertyusagetype, + propertytype, + plotsize, + to_char((To_timestamp($fy::bigint/1000) at time Zone 'Asia/Kolkata'),'YYYY') || '-' || ((to_char((To_timestamp($fy::bigint/1000) at time Zone 'Asia/Kolkata'),'YY'))::int+1)::text as fy, --assessments.fy as fy, + owners.ownername as ownername, + owners.mobilenumber as mobileno + from properties + inner join props on props.propertyid=properties.propertyid + inner join demands on demands.propertyid=properties.propertyid + inner join owners on owners.propertyid=properties.propertyid + where 1=1 + +- reportName: Count_UsageCategory_V2 + decryptionPathId: ReceiptRegisterShort_V2 + summary: Count Usagecategory + version: 1.0.0 + moduleName: rainmaker-pt + additionalConfig: + print: + pdfPageSize: "Legal" + sourceColumns: + - name: category + label: reports.pt.category + type: string + source: pt + total: false + - name: property_type + label: reports.pt.property_type + type: string + source: pt + total: false + - name: count + label: reports.pt.count + type: string + source: pt + total: true + query: | + -- Use CTE to force query plan, compute & use CTE later + SELECT + (case when position('.' in usagecategory)=0 then usagecategory else split_part(usagecategory,'.',2) end) as category,(case when position('.' in propertytype)=0 then propertytype else split_part(propertytype,'.',1) end) as property_type ,count (propertyid) as count from eg_pt_property + where tenantid=$tenantid and status='ACTIVE' + groupby: GROUP BY category,property_type + orderby: ORDER BY category + +- reportName: TopPayersReportCOM_V2 + decryptionPathId: ULBDEFAULTERPTREPORT_V2 + summary: ULB Defaulter Pt report + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: consumercode + label: reports.pt.consumercode + type: string + source: pt + total: false + - name: receiptnumber + label: reports.pt.receiptnumber + type: string + source: pt + total: false + - name: totalamountpaid + label: reports.pt.totalamountpaid + type: string + source: pt + total: false + - name: fy + label: reports.pt.fy + type: string + source: pt + total: false + - name: ownername + label: reports.pt.ownername + type: string + source: pt + total: false + - name: usagecategory + label: reports.pt.usagecategory + type: string + source: pt + total: false + - name: mobileno + label: reports.pt.mobilenumber + type: string + source: pt + total: false + - name: address + label: reports.pt.address + type: string + source: pt + total: false + searchParams: + - name: ulb + label: ULB + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: pt + wrapper: true + isMandatory: false + searchClause: AND 1=1 + - name: finYear + label: Financial Year + type: singlevaluelist + pattern: 'list://2015-16:2015-16,2016-17:2016-17,2017-18:2017-18,2017-18:2017-18,2018-19:2018-19,2019-20:2019-20,2020-21:2020-21,2021-22:2021-22,2022-23:2022-23,2023-24:2023-24' + source: pt + isMandatory: true + searchClause: AND to_char((To_timestamp(bd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY') || '-' || to_char((To_timestamp(bd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')=$finYear + - name: usageCat + label: Usage Category + type: singlevaluelist + pattern: 'list://NONRESIDENTIAL.COMMERCIAL:Commercial,MIXED:Mixed,NONRESIDENTIAL.INDUSTRIAL:Industrial,NONRESIDENTIAL.INSTITUTIONAL:Institutional' + source: pt + isMandatory: false + searchClause: and 1=1 + query: | + --S.no Service Name ULB Property Tax Unique ID Date Of Transcation Receipt Number Existing Property ID Type Of Property Mobile Number Address + select distinct bd.consumercode,pt.usagecategory,pd.receiptnumber ,p.totalamountpaid, + to_char((To_timestamp(bd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY') || '-' || to_char((To_timestamp(bd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY') as fy, + concat(pa.doorno,' ',pa.buildingname,pa.street,' ',pa.city,' ,',pa.pincode) as address, u.name as ownername, u.mobilenumber as mobileno + from egcl_payment p + inner join egcl_paymentdetail pd on pd.paymentid=p.id and p.paymentstatus !='CANCELLED' and p.tenantid=$ulb and pd.businessservice='PT' + inner join egbs_bill_v1 bill on bill.id=pd.billid + inner join egbs_billdetail_v1 bd on bill.id=bd.billid + inner join eg_pt_property pt on bd.consumercode=pt.propertyid and pt.status='ACTIVE' and pt.usagecategory like '%NONRESIDENTIAL%' + inner join eg_pt_address pa on pa.propertyid=pt.id + inner join eg_pt_owner po on po.propertyid=pt.id inner join eg_user u on u.uuid=po.userid and u.active=true + where p.totalamountpaid>=10000 + orderby: order by p.totalamountpaid desc limit 300 + +- reportName: TopPayersReportRESD_V2 + decryptionPathId: ULBDEFAULTERPTREPORT_V2 + summary: ULB Defaulter Pt report + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: consumercode + label: reports.pt.consumercode + type: string + source: pt + total: false + - name: receiptnumber + label: reports.pt.receiptnumber + type: string + source: pt + total: false + - name: totalamountpaid + label: reports.pt.totalamountpaid + type: string + source: pt + total: false + - name: fy + label: reports.pt.fy + type: string + source: pt + total: false + - name: ownername + label: reports.pt.ownername + type: string + source: pt + total: false + - name: usagecategory + label: reports.pt.usagecategory + type: string + source: pt + total: false + - name: mobileno + label: reports.pt.mobilenumber + type: string + source: pt + total: false + - name: address + label: reports.pt.address + type: string + source: pt + total: false + searchParams: + - name: ulb + label: ULB + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: pt + wrapper: true + isMandatory: false + searchClause: AND 1=1 + - name: finYear + label: Financial Year + type: singlevaluelist + pattern: 'list://2015-16:2015-16,2016-17:2016-17,2017-18:2017-18,2017-18:2017-18,2018-19:2018-19,2019-20:2019-20,2020-21:2020-21,2021-22:2021-22,2022-23:2022-23,2023-24:2023-24' + source: pt + isMandatory: true + searchClause: AND to_char((To_timestamp(bd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY') || '-' || to_char((To_timestamp(bd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY')=$finYear + query: | + --S.no Service Name ULB Property Tax Unique ID Date Of Transcation Receipt Number Existing Property ID Type Of Property Mobile Number Address + select distinct bd.consumercode,pt.usagecategory,pd.receiptnumber ,p.totalamountpaid, + to_char((To_timestamp(bd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY') || '-' || to_char((To_timestamp(bd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YY') as fy, + concat(pa.doorno,' ',pa.buildingname,pa.street,' ',pa.city,' ,',pa.pincode) as address, u.name as ownername, u.mobilenumber as mobileno + from egcl_payment p + inner join egcl_paymentdetail pd on pd.paymentid=p.id and p.paymentstatus !='CANCELLED' and p.tenantid=$ulb and pd.businessservice='PT' + inner join egbs_bill_v1 bill on bill.id=pd.billid + inner join egbs_billdetail_v1 bd on bill.id=bd.billid + inner join eg_pt_property pt on bd.consumercode=pt.propertyid and pt.status='ACTIVE' and pt.usagecategory='RESIDENTIAL' + inner join eg_pt_address pa on pa.propertyid=pt.id + inner join eg_pt_owner po on po.propertyid=pt.id inner join eg_user u on u.uuid=po.userid and u.active=true + where p.totalamountpaid>=1000 + orderby: order by p.totalamountpaid desc limit 300 + +- reportName: ReceiptRegisterGatewayTxnId_V2 + decryptionPathId: ReceiptRegisterShort_V2 + summary: Receipt Register GatewayTxnId + version: 1.0.0 + moduleName: rainmaker-pt + additionalConfig: + print: + pdfPageSize: "Legal" + sourceColumns: + - name: receiptnumber + label: reports.pt.receiptNo + type: string + source: pt + total: false + - name: transactiondate + label: reports.pt.receiptDate + type: string + source: pt + total: false + - name: propertyid + label: reports.pt.ptrId + type: string + source: pt + total: false + - name: financialyear + label: reports.pt.financialYear + type: string + source: pt + total: false + - name: instrumenttype + label: reports.pt.paymentMode + type: string + source: pt + total: false + - name: amount + label: reports.pt.taxamount + type: string + source: pt + total: true + - name: transactionnumber + label: reports.pt.ddChequeNo + type: string + source: pt + total: false + - name: gateway_txn_id + label: reports.pt.gateway_txn_id + type: string + source: pt + total: false + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: true + searchClause: AND pd.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: true + searchClause: AND pd.receiptdate <= $toDate + - name: paymentMode + label: Payment Mode + type: singlevaluelist + pattern: 'list://CARD:Card,CASH:Cash,CHEQUE:Cheque,DD:DD,OFFLINE_NEFT:NEFT,OFFLINE_RTGS:RTGS,ONLINE:Online,POSTAL_ORDER:PostalOrder' + source: pt + isMandatory: false + searchClause: AND payment.paymentmode = replace($paymentMode,',','_') + - name: financialyear + label: Financial Year + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name + source: pt + wrapper: true + isMandatory: false + searchClause: AND concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) = $financialyear + - name: collectorname + label: reports.pt.collectorname + type: singlevaluelist + pattern: http://egov-hrms:8080/egov-hrms/employees/_search?tenantId=$tenantid&roles=PTCEMP|$.Employees[*].user.id|$.Employees[*].user.name + source: pt + wrapper: true + isMandatory: false + searchClause: AND eg_user.id = $collectorname::INTEGER + query: | + -- Use CTE to force query plan, compute & use CTE later + SELECT + pt.propertyid as propertyid, + to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') as transactiondate, + receiptnumber, + payment.totalamountpaid as amount, + payment.paymentmode as instrumenttype, + payment.transactionnumber as transactionnumber, + pg.gateway_txn_id, + --concat(to_char((To_timestamp(bd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(bd.toperiod/1000) at time Zone 'Asia/Kolkata'),'YYYY')) AS financialyear, + --concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear, + getfinancialyear(pd.billid) as financialyear, + (case when eg_user.name is null then '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' else eg_user.name end) as collectorname + --receipt_breakup.*, + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, + (select * from (select *,(row_number() over(partition by propertyid order by lastmodifiedtime desc)) as rw from eg_pt_property where tenantid=$tenantid) pts where rw=1) as pt, + (select bill.id as billid, bill.consumercode as consumercodei, min(bd.fromperiod) fromperiod, max(bd.toperiod) toperiod from egcl_billdetial bd, egcl_bill bill + where bill.id=bd.billid and bill.tenantid = $tenantid group by bill.id) bd + LEFT JOIN eg_pg_transactions as pg on ( txn_status='SUCCESS' and pg.bill_id=bd.billid ) + where pd.paymentid=payment.id and bd.billid=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='PT' and payment.tenantid=$tenantid + and pt.propertyid = bd.consumercodei --and pt.status!='INACTIVE' + orderby: ORDER BY pd.receiptdate DESC; + +- reportName: PropertyDumpReport + decryptionPathId: ULBPTDataDumpReport_V2 + summary: Receipt Register GatewayTxnId + version: 1.0.0 + moduleName: rainmaker-pt + additionalConfig: + print: + pdfPageSize: "Legal" + sourceColumns: + - name: propertyid + label: reports.pt.ptrId + type: string + source: pt + total: false + - name: oldpropertyid + label: reports.pt.oldpropertyid + type: string + source: pt + total: false + - name: propertytype + label: reports.pt.propertytype + type: string + source: pt + total: false + - name: address + label: reports.pt.address + type: string + source: pt + total: false + - name: localityname + label: reports.pt.locality + type: string + source: pt + total: false + - name: propertyusagetype + label: reports.pt.propertyusagetype + type: string + source: pt + total: true + - name: ownershipcategory + label: reports.pt.ownershipcategory + type: string + source: pt + total: false + - name: ownername + label: reports.pt.ownername + type: string + source: pt + total: false + - name: mobileno + label: reports.pt.mobileno + type: string + source: pt + total: false + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: true + searchClause: AND pt.createdtime>=$fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: true + searchClause: AND pt.createdtime<=$toDate + query: | + -- Use CTE to force query plan, compute & use CTE later + with owners as + ( + select + split_part(string_agg(ownername,','),',',1) as ownername, + split_part(string_agg(mobilenumber,','),',',1) as mobilenumber, + propertyid + from report_owners where status='ACTIVE' and tenantid=$tenantid + group by propertyid + ) + --select pt.propertyid,oldpropertyid,status,propertytype,usagecategory,concat (doorno,',',buildingname,',',street,',',locality) as address,owners.ownername,owners.mobilenumber + --from eg_pt_property pt + select pt.propertyid,oldpropertyid,propertystatus,propertytype,address,localitycode,localityname,propertyusagetype,ownershipcategory,owners.ownername as ownername,owners.mobilenumber as mobileno + from report_properties pt + inner join owners on owners.propertyid=pt.propertyid + where pt.tenantid=$tenantid and propertystatus='ACTIVE' + +- reportName: STATEDUMPDEPARTMENT_REPORT_V2 + decryptionPathId: ULBPTDataDumpReport_V2 + summary: ULB level report + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: ulb + label: reports.pt.ulb + type: string + source: pt + total: false + - name: propertytaxuniqueid + label: reports.pt.propertytaxuniqueid + type: string + source: pt + total: false + - name: surveyid + label: reports.pt.surveyid + type: string + source: pt + total: false + - name: oldpropertyid + label: reports.pt.oldpropertyid + type: string + source: pt + total: false + - name: nooffloors + label: reports.pt.nooffloors + type: string + source: pt + total: false + - name: totalarea + label: reports.pt.totalarea + type: string + source: pt + total: false + - name: ownername + label: reports.pt.ownername + type: string + source: pt + total: false + - name: emailid + label: reports.pt.emailid + type: string + source: pt + total: false + - name: guardianname + label: reports.pt.guardianname + type: string + source: pt + total: false + - name: mobileno + label: reports.pt.mobileno + type: string + source: pt + total: false + - name: address + label: reports.pt.address + type: string + source: pt + total: false + - name: businessname + label: reports.pt.businessname + type: string + source: pt + total: false + - name: usagetype + label: reports.pt.propertyusagetype + type: string + source: pt + total: false + - name: localityname + label: reports.pt.localityname + type: string + source: pt + total: false + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: false + searchClause: AND pt.createdtime >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: false + searchClause: AND pt.createdtime <= $toDate + - name: ulb + label: ULB + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: pt + wrapper: true + isMandatory: false + searchClause: AND pt.tenantid = $ulb + query: | + --S.no Service Name ULB Property Tax Unique ID Date Of Transcation Receipt Number Existing Property ID Owner Name Guardian Name Total Area (SQ.YARD) Covered Area/Built Area (SQ.FEET) Floors Occupancy (Rented,Self /Unoccupied) Type Of Property Mobile Number Transcation Mode of Payment Payment Amount Payment Date Email Id Address + with owners as + ( + select + split_part(string_agg(ownername,','),',',1) as ownername, + split_part(string_agg(mobilenumber,','),',',1) as mobilenumber, + split_part(string_agg(guardianname,','),',',1) as guardianname, + split_part(string_agg(emailid,','),',',1) as emailid, + propertyid + from report_owners where status='ACTIVE' and tenantid =$ulb + group by propertyid + ), + properties as + ( + select + propertyid, + tenantid as tenantid, + address as address, + localityname as localityname, + plotsize as plotsize, + propertyusagetype as usagetype, + surveyid, + oldpropertyid, + nooffloors, + createdtime as createdtime + from report_properties + where propertystatus='ACTIVE' and tenantid =$ulb + --group by propertyid + ) + select + pt.tenantid as ulb, + pt.propertyid as propertytaxuniqueid, + owners.ownername as ownername, + owners.guardianname as guardianname, + owners.mobilenumber as mobileno, + pt.plotsize as totalarea, + owners.emailid as emailid, + pt.address as address, + pt.usagetype as usagetype, + pt.surveyid as surveyid, + pt.oldpropertyid as oldpropertyid, + pt.nooffloors as nooffloors, + pt.localityname as localityname + from properties pt + inner join owners on owners.propertyid=pt.propertyid + where 1=1 + + +- reportName: PROPERTY_CATEGORY_REPORT_V2 + decryptionPathId: ULBPTDataDumpReport_V2 + summary: ULB level report + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: propertyid + label: reports.pt.propertyid + type: string + source: pt + total: false + - name: oldpropertyid + label: reports.pt.oldpropertyid + type: string + source: pt + total: false + - name: surveyid + label: reports.pt.surveyid + type: string + source: pt + total: false + - name: propertytype + label: reports.pt.propertytype + type: string + source: pt + total: false + - name: ownership + label: reports.pt.ownership + type: string + source: pt + total: false + - name: propertycategory + label: reports.pt.propertycategory + type: string + source: pt + total: false + - name: plotsize + label: reports.pt.plotsize + type: string + source: pt + total: false + - name: buildingname + label: reports.pt.buildingname + type: string + source: pt + total: false + - name: doorno + label: reports.pt.doorno + type: string + source: pt + total: false + - name: street + label: reports.pt.street + type: string + source: pt + total: false + - name: locality + label: reports.pt.locality + type: string + source: pt + total: false + - name: blockname + label: reports.pt.blockname + type: string + source: pt + total: false + - name: ownername + label: reports.pt.ownername + type: string + source: pt + total: false + - name: mobileno + label: reports.pt.mobileno + type: string + source: pt + total: false + - name: unitcategory + label: reports.pt.unitcategory + type: string + source: pt + total: false + - name: addr_survey + label: reports.pt.survey_address + type: string + source: pt + total: false + - name: businessname + label: reports.pt.businessname + type: string + source: pt + total: false + searchParams: + - name: category + label: reports.pt.usagecategory + type: string + source: pt + isMandatory: true + searchClause: AND 1=1 + - name: nameofbusiness + label: reports.pt.nameofbusinness + type: string + source: pt + isMandatory: false + searchClause: AND upper(pt.additionalDetails->>'businessName') LIKE CONCAT('%',upper($nameofbusiness),'%') + query: | + --S.no Service Name ULB Property Tax Unique ID Date Of Transcation Receipt Number Existing Property ID Owner Name Guardian Name Total Area (SQ.YARD) Covered Area/Built Area (SQ.FEET) Floors Occupancy (Rented,Self /Unoccupied) Type Of Property Mobile Number Transcation Mode of Payment Payment Amount Payment Date Email Id Address + with properties as + ( + select distinct propertyid as propertyid from eg_pt_unit where tenantid=$tenantid and usagecategory LIKE CONCAT('%',upper($category),'%') --like '%EDUCATION%' + ), + owners as + ( + select + split_part(string_agg(userid,','),',',1) as owner_userid, + propertyid + from eg_pt_owner + where tenantid=$tenantid and propertyid in (select propertyid from properties) and status='ACTIVE' + group by propertyid + ) + select + pt.propertyid as propertyid, + pt.oldpropertyid as oldpropertyid, + pt.surveyid as surveyid, + pt.propertytype as propertytype, + pt.ownershipcategory as ownership, + pt.usagecategory as propertycategory, + pt.landarea as plotsize, + adr.buildingname as buildingname, + adr.doorno as doorno, + adr.street as street, + bndry.localityname as locality, + bndry.blockname as blockname, + eg_user.name as ownername, + eg_user.mobilenumber as mobileno, + $category as unitcategory, + (pt.additionalDetails->'legacyInfo')->>'address' as addr_survey, + pt.additionalDetails->>'businessName' as businessname + from eg_pt_property pt + inner join eg_pt_address adr on adr.propertyid =pt.id + inner join properties props on props.propertyid=pt.id + inner join owners on owners.propertyid=pt.id + inner join eg_user on eg_user.uuid=owners.owner_userid + inner join eg_bndry_mohalla bndry on bndry.localitycode=adr.locality + where pt.status!='INACTIVE' + + +- reportName: PAID_PROPERTY_CATEGORY_REPORT_V2 + decryptionPathId: ULBPTDataDumpReport_V2 + summary: ULB level report + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: propertyid + label: reports.pt.propertyid + type: string + source: pt + total: false + - name: oldpropertyid + label: reports.pt.oldpropertyid + type: string + source: pt + total: false + - name: surveyid + label: reports.pt.surveyid + type: string + source: pt + total: false + - name: propertytype + label: reports.pt.propertytype + type: string + source: pt + total: false + - name: ownership + label: reports.pt.ownership + type: string + source: pt + total: false + - name: propertycategory + label: reports.pt.propertycategory + type: string + source: pt + total: false + - name: plotsize + label: reports.pt.plotsize + type: string + source: pt + total: false + - name: buildingname + label: reports.pt.buildingname + type: string + source: pt + total: false + - name: doorno + label: reports.pt.doorno + type: string + source: pt + total: false + - name: street + label: reports.pt.street + type: string + source: pt + total: false + - name: locality + label: reports.pt.locality + type: string + source: pt + total: false + - name: blockname + label: reports.pt.blockname + type: string + source: pt + total: false + - name: ownername + label: reports.pt.ownername + type: string + source: pt + total: false + - name: mobileno + label: reports.pt.mobileno + type: string + source: pt + total: false + - name: unitcategory + label: reports.pt.unitcategory + type: string + source: pt + total: false + - name: addr_survey + label: reports.pt.survey_address + type: string + source: pt + total: false + - name: businessname + label: reports.pt.businessname + type: string + source: pt + total: false + - name: assessmentyear + label: reports.pt.assessmentyear + type: string + source: pt + total: false + searchParams: + - name: category + label: reports.pt.usageownercategory + type: string + source: pt + isMandatory: true + searchClause: AND 1=1 + - name: nameofbusiness + label: reports.pt.nameofbusinness + type: string + source: pt + isMandatory: false + searchClause: AND upper(pt.additionalDetails->>'businessName') LIKE CONCAT('%',upper($nameofbusiness),'%') + - name: finYear + label: Financial Year + type: singlevaluelist + pattern: 'list://2015-16:2015-16,2016-17:2016-17,2017-18:2017-18,2017-18:2017-18,2018-19:2018-19,2019-20:2019-20,2020-21:2020-21,2021-22:2021-22,2022-23:2022-23,2023-24:2023-24' + source: pt + isMandatory: true + searchClause: AND 1=1 + query: | + --S.no Service Name ULB Property Tax Unique ID Date Of Transcation Receipt Number Existing Property ID Owner Name Guardian Name Total Area (SQ.YARD) Covered Area/Built Area (SQ.FEET) Floors Occupancy (Rented,Self /Unoccupied) Type Of Property Mobile Number Transcation Mode of Payment Payment Amount Payment Date Email Id Address + with properties as + ( + select distinct propertyid as propertyid from eg_pt_unit where tenantid=$tenantid and (usagecategory LIKE CONCAT('%',upper($category),'%') or ownershipcategory LIKE CONCAT('%',upper($category),'%')) --like '%EDUCATION%' + ), + owners as + ( + select + split_part(string_agg(userid,','),',',1) as owner_userid, + propertyid + from eg_pt_owner + where tenantid=$tenantid and propertyid in (select propertyid from properties) and status='ACTIVE' + group by propertyid + ), + assessments as + ( + select + distinct propertyid + from report_assessments + where tenantid=$tenantid AND assessmentyears=$finYear + ) + select + pt.propertyid as propertyid, + pt.oldpropertyid as oldpropertyid, + pt.surveyid as surveyid, + pt.propertytype as propertytype, + pt.ownershipcategory as ownership, + pt.usagecategory as propertycategory, + pt.landarea as plotsize, + adr.buildingname as buildingname, + adr.doorno as doorno, + adr.street as street, + bndry.localityname as locality, + bndry.blockname as blockname, + eg_user.name as ownername, + eg_user.mobilenumber as mobileno, + $category as unitcategory, + (pt.additionalDetails->'legacyInfo')->>'address' as addr_survey, + pt.additionalDetails->>'businessName' as businessname, + $finYear as assessmentyear + from eg_pt_property pt + inner join eg_pt_address adr on adr.propertyid =pt.id + inner join properties props on props.propertyid=pt.id + inner join owners on owners.propertyid=pt.id + inner join eg_user on eg_user.uuid=owners.owner_userid + inner join eg_bndry_mohalla bndry on bndry.localitycode=adr.locality + inner join assessments on assessments.propertyid=pt.propertyid + where pt.status!='INACTIVE' + + +- reportName: DEFAULTER_REPORT_WITH_LOCALITY_UNPAID_DEMAND_NEW + decryptionPathId: ULBPTDataDumpReport_V2 + summary: ULB level report + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: propertyid + label: reports.pt.propertyid + type: string + source: pt + total: false + - name: oldpropertyid + label: reports.pt.oldpropertyid + type: string + source: pt + total: false + - name: surveyid + label: reports.pt.surveyid + type: string + source: pt + total: false + - name: tentativedemand + label: reports.pt.tentativedemand + type: string + source: pt + total: true + - name: assessmentyear + label: reports.pt.assessmentyear + type: string + source: pt + total: false + - name: propertytype + label: reports.pt.propertytype + type: string + source: pt + total: false + - name: ownership + label: reports.pt.ownership + type: string + source: pt + total: false + - name: propertycategory + label: reports.pt.propertycategory + type: string + source: pt + total: false + - name: businessname + label: reports.pt.businessname + type: string + source: pt + total: false + - name: address + label: reports.pt.address + type: string + source: pt + total: false + - name: plotsize + label: reports.pt.plotsize + type: string + source: pt + total: false + - name: localityname + label: reports.pt.locality + type: string + source: pt + total: false + - name: blockname + label: reports.pt.blockname + type: string + source: pt + total: false + - name: ownername + label: reports.pt.ownername + type: string + source: pt + total: false + - name: mobileno + label: reports.pt.mobileno + type: string + source: pt + total: false + searchParams: + - name: nameofbusiness + label: reports.pt.nameofbusinness + type: string + source: pt + isMandatory: false + searchClause: AND upper(pt.firmbusinessname) LIKE CONCAT('%',upper($nameofbusiness),'%') + - name: fy + label: Financial Year + type: singlevaluelist + pattern: 'list://2015:2015-16,2016:2016-17,2017:2017-18,2018:2018-19,2019:2019-20,2020:2020-21,2021:2021-22,2022:2022-23,2023:2023-24' + source: pt + isMandatory: false + searchClause: and d.fy like concat('%',$fy,'%') + - name: usageCat + label: Usage Category + type: singlevaluelist + pattern: 'list://NONRESIDENTIAL:NONRESIDENTIAL,MIXED:MIXED,RESIDENTIAL:RESIDENTIAL' + source: pt + isMandatory: false + searchClause: and pt.propertyusagetype like concat($usageCat,'%') + - name: usageSubCat + label: Usage Sub Category + type: string + source: pt + isMandatory: false + searchClause: u.unitusage like concat('%',upper($usageSubCat),'%') + - name: blockname + label: reports.pt.blockname + type: string + source: pt + isMandatory: false + searchClause: AND upper(blockname) LIKE CONCAT('%',upper($blockname),'%') + - name: localityname + label: reports.pt.localityname + type: string + source: pt + isMandatory: false + searchClause: AND upper(localityname) LIKE CONCAT('%',upper($localityname),'%') + query: | + --S.no Service Name ULB Property Tax Unique ID Date Of Transcation Receipt Number Existing Property ID Owner Name Guardian Name Total Area (SQ.YARD) Covered Area/Built Area (SQ.FEET) Floors Occupancy (Rented,Self /Unoccupied) Type Of Property Mobile Number Transcation Mode of Payment Payment Amount Payment Date Email Id Address + with owners as + ( + select + split_part(string_agg(ownername,','),',',1) as ownername, + split_part(string_agg(mobilenumber,','),',',1) as mobilenumber, + propertyid + from report_owners + where tenantid=$tenantid and status='ACTIVE' and propertyid in (select propertyid from report_unpaid_demand where tenantid=$tenantid) + group by propertyid + ), + units as + ( + select distinct propertyid as propertyid,string_agg(usagecategory,',') as unitusage from report_units where propertyid in (select propertyid from report_unpaid_demand where tenantid=$tenantid) and active=true group by propertyid + ) + select + d.propertyid as propertyid, + pt.oldpropertyid as oldpropertyid, + pt.surveyid as surveyid, + d.demand as tentativedemand, + d.fy as assessmentyear, + pt.address as address, + pt.blockname as blockname, + pt.propertyusagetype as propertycategory, + pt.propertytype as propertytype, + pt.ownershipcategory as ownership, + pt.plotsize as plotsize, + pt.firmbusinessname as businessname, + pt.localityname as localityname, + owners.ownername as ownername, + owners.mobilenumber as mobileno + from report_unpaid_demand d + left join report_properties pt on pt.propertyid=d.propertyid and pt.propertystatus!='INACTIVE' + inner join units u on u.propertyid=pt.propertyid + inner join owners on owners.propertyid=pt.propertyid + where d.tenantid=$tenantid and d.demand>0 + + +- reportName: STATEDEFAULTER_REPORT_WITH_LOCALITY_UNPAID_DEMAND_NEW + decryptionPathId: ULBPTDataDumpReport_V2 + summary: ULB level report + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: propertyid + label: reports.pt.propertyid + type: string + source: pt + total: false + - name: oldpropertyid + label: reports.pt.oldpropertyid + type: string + source: pt + total: false + - name: surveyid + label: reports.pt.surveyid + type: string + source: pt + total: false + - name: tentativedemand + label: reports.pt.tentativedemand + type: string + source: pt + total: true + - name: assessmentyear + label: reports.pt.assessmentyear + type: string + source: pt + total: false + - name: propertytype + label: reports.pt.propertytype + type: string + source: pt + total: false + - name: ownership + label: reports.pt.ownership + type: string + source: pt + total: false + - name: propertycategory + label: reports.pt.propertycategory + type: string + source: pt + total: false + - name: businessname + label: reports.pt.businessname + type: string + source: pt + total: false + - name: address + label: reports.pt.address + type: string + source: pt + total: false + - name: plotsize + label: reports.pt.plotsize + type: string + source: pt + total: false + - name: localityname + label: reports.pt.locality + type: string + source: pt + total: false + - name: blockname + label: reports.pt.blockname + type: string + source: pt + total: false + - name: ownername + label: reports.pt.ownername + type: string + source: pt + total: false + - name: mobileno + label: reports.pt.mobileno + type: string + source: pt + total: false + searchParams: + - name: nameofbusiness + label: reports.pt.nameofbusinness + type: string + source: pt + isMandatory: false + searchClause: AND upper(pt.firmbusinessname) LIKE CONCAT('%',upper($nameofbusiness),'%') + - name: fy + label: Financial Year + type: singlevaluelist + pattern: 'list://2015:2015-16,2016:2016-17,2017:2017-18,2018:2018-19,2019:2019-20,2020:2020-21,2021:2021-22,2022:2022-23,2023:2023-24' + source: pt + isMandatory: false + searchClause: and d.fy like concat('%',$fy,'%') + - name: usageCat + label: Usage Category + type: singlevaluelist + pattern: 'list://NONRESIDENTIAL:NONRESIDENTIAL,MIXED:MIXED,RESIDENTIAL:RESIDENTIAL' + source: pt + isMandatory: false + searchClause: and pt.propertyusagetype like concat($usageCat,'%') + - name: usageSubCat + label: Usage Sub Category + type: string + source: pt + isMandatory: false + searchClause: u.unitusage like concat('%',upper($usageSubCat),'%') + - name: blockname + label: reports.pt.blockname + type: string + source: pt + isMandatory: false + searchClause: AND upper(blockname) LIKE CONCAT('%',upper($blockname),'%') + - name: localityname + label: reports.pt.localityname + type: string + source: pt + isMandatory: false + searchClause: AND upper(localityname) LIKE CONCAT('%',upper($localityname),'%') + - name: ulb + label: ULB + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: pt + wrapper: true + isMandatory: false + searchClause: AND pt.tenantid = $ulb + query: | + --S.no Service Name ULB Property Tax Unique ID Date Of Transcation Receipt Number Existing Property ID Owner Name Guardian Name Total Area (SQ.YARD) Covered Area/Built Area (SQ.FEET) Floors Occupancy (Rented,Self /Unoccupied) Type Of Property Mobile Number Transcation Mode of Payment Payment Amount Payment Date Email Id Address + with owners as + ( + select + split_part(string_agg(ownername,','),',',1) as ownername, + split_part(string_agg(mobilenumber,','),',',1) as mobilenumber, + propertyid + from report_owners + where tenantid!='pb.testing' and status='ACTIVE' and propertyid in (select propertyid from report_unpaid_demand where tenantid!='pb.testing') + group by propertyid + ), + units as + ( + select distinct propertyid as propertyid,string_agg(usagecategory,',') as unitusage from report_units where propertyid in (select propertyid from report_unpaid_demand where tenantid!='pb.testing') and active=true group by propertyid + ) + select + d.propertyid as propertyid, + pt.oldpropertyid as oldpropertyid, + pt.surveyid as surveyid, + d.demand as tentativedemand, + d.fy as assessmentyear, + pt.address as address, + pt.blockname as blockname, + pt.propertyusagetype as propertycategory, + pt.propertytype as propertytype, + pt.ownershipcategory as ownership, + pt.plotsize as plotsize, + pt.firmbusinessname as businessname, + pt.localityname as localityname, + owners.ownername as ownername, + owners.mobilenumber as mobileno + from report_unpaid_demand d + left join report_properties pt on pt.propertyid=d.propertyid and pt.propertystatus!='INACTIVE' + inner join units u on u.propertyid=pt.propertyid + inner join owners on owners.propertyid=pt.propertyid + where d.tenantid!='pb.testing' and d.demand>0 + +- reportName: USERNAME_PT + decryptionPathId: ULBPTDataDumpReport_V2 + summary: USERNAME_PT + version: 1.0.0 + moduleName: rainmaker-pt + additionalConfig: + print: + pdfPageSize: "Legal" + sourceColumns: + - name: tenantid + label: reports.pt.tenantid + type: string + source: pt + total: false + - name: propertyid + label: reports.pt.propertyid + type: string + source: pt + total: false + - name: ownername + label: reports.pt.ownername + type: string + source: pt + total: false + - name: guardianname + label: reports.pt.guardianname + type: string + source: pt + total: false + - name: mobileno + label: reports.pt.mobileno + type: string + source: pt + total: false + searchParams: + - name: ulb + label: ULB + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: pt + wrapper: true + isMandatory: false + searchClause: AND report_owners.tenantid = $ulb + query: | + -- Use CTE to force query plan, compute & use CTE later + SELECT + tenantid, + propertyid, + ownername as ownername, + guardianname as guardianname, + mobilenumber as mobileno + from report_owners + where 1=1 + +- reportName: PropertyListReport + decryptionPathId: ULBPTDataDumpReport_V2 + summary: PT Report for GIS Mapping + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: propertyid + label: reports.pt.propertyid + type: string + source: pt + total: false + - name: surveyid + label: reports.pt.surveyid + type: string + source: pt + total: false + - name: oldpropertyid + label: reports.pt.oldpropertyid + type: string + source: pt + total: false + - name: firmbusinessname + label: reports.pt.oldpropertyid + type: string + source: pt + total: false + - name: address + label: reports.pt.address + type: string + source: pt + total: false + - name: landarea + label: reports.pt.landarea + type: string + source: pt + total: false + - name: usagecategory + label: reports.pt.usagecategory + type: string + source: pt + total: false + - name: ownername + label: reports.pt.ownername + type: string + source: pt + total: false + - name: guardianname + label: reports.pt.guardianname + type: string + source: pt + total: false + - name: mobileno + label: reports.pt.mobileno + type: string + source: pt + total: false + - name: localityname + label: reports.pt.localityname + type: string + source: pt + total: false + - name: propertytype + label: reports.pt.propertytype + type: string + source: pt + total: false + - name: ownertype + label: reports.pt.ownertype + type: string + source: pt + total: false + searchParams: + query: | + select *,plotsize as landarea,propertyusagetype as usagecategory,mobilenumber as mobileno + from report_properties p + inner join report_owners o on o.propertyid=p.propertyid + where p.tenantid=$tenantid and propertystatus='ACTIVE' + orderby: ORDER BY p.propertyid + + diff --git a/configs/reports/configs/rainmaker-common-reports.yml b/configs/reports/configs/rainmaker-common-reports.yml new file mode 100644 index 00000000..e13742a1 --- /dev/null +++ b/configs/reports/configs/rainmaker-common-reports.yml @@ -0,0 +1,127 @@ +ReportDefinitions: + - reportName: CollectionRegister + summary: Collection Register + version: 1.0.0 + moduleName: rainmaker-common + externalService: + - entity: $.MdmsRes.BillingService.BusinessService[*] + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=pb&moduleName=BillingService&masterName=BusinessService&filter=[?(@.type=='Adhoc')] + keyOrder: code,businessService + tableName: tbl_businessserviceList + sourceColumns: + - name: service + label: reports.common.CollectionRegister.serviceResult + type: string + source: common + total: false + - name: channel + label: reports.common.CollectionRegister.channel + type: string + source: common + total: false + - name: cash_count + label: reports.common.CollectionRegister.transactions + type: number + source: common + total: true + - name: cash_sum + label: reports.common.CollectionRegister.cash + type: number + source: common + total: true + - name: cheque_count + label: reports.common.CollectionRegister.transactions + type: number + source: common + total: true + - name: cheque_sum + label: reports.common.CollectionRegister.cheque + type: number + source: common + total: true + - name: dd_count + label: reports.common.CollectionRegister.transactions + type: number + source: common + total: true + - name: dd_sum + label: reports.common.CollectionRegister.dd + type: number + source: common + total: true + - name: online_count + label: reports.common.CollectionRegister.transactions + type: number + source: common + total: true + - name: online_sum + label: reports.common.CollectionRegister.online + type: number + source: common + total: true + - name: card_count + label: reports.common.CollectionRegister.transactions + type: number + source: common + total: true + - name: card_sum + label: reports.common.CollectionRegister.card + type: number + source: common + total: true + - name: total + label: reports.common.CollectionRegister.total + type: number + source: common + total: true + + searchParams: + - name: ulb + label: reports.common.CollectionRegister.ulb + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: common + wrapper: true + isMandatory: true + searchClause: AND rt.tenantId = $ulb + - name: service + label: reports.common.CollectionRegister.service + type: multivaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=BillingService&masterName=BusinessService&filter=[?(@.type=='Adhoc')]|$.MdmsRes.BillingService.BusinessService.*.code|$.MdmsRes.BillingService.BusinessService.*.businessService + source: common + wrapper: true + state: true + isMandatory: true + isLocalisationRequired: true + localisationPrefix: "BILLINGSERVICE_BUSINESSSERVICE_" + searchClause: AND REGEXP_REPLACE(rt.businessdetails,'\..*','') IN ($service) + - name: paymentMode + label: reports.common.CollectionRegister.mode + type: singlevaluelist + pattern: 'list://Cash:Cash,Online:Online,Card:Card,DD:DD,Cheque:Cheque' + source: common + isMandatory: false + searchClause: AND instrumenttype = $paymentMode + - name: channel + label: reports.common.CollectionRegister.channel + type: singlevaluelist + pattern: 'list://COUNTER:COUNTER,FIELD:FIELD' + source: common + isMandatory: false + searchClause: AND collectiontype = $channel + - name: fromDate + label: reports.common.CollectionRegister.fromdate + type: epoch + source: common + isMandatory: true + searchClause: AND receiptdate >= $fromDate + - name: toDate + label: reports.common.CollectionRegister.todate + type: epoch + source: common + isMandatory: true + searchClause: AND receiptdate <= $toDate + + query: select COALESCE(message,REGEXP_REPLACE(businessdetails,'\..*','')) service,collectiontype channel,sum(case when instrumenttype='Cash' then 1 else 0 end) as cash_count, sum(case when instrumenttype='Cash' then ins.amount else 0 end) as cash_sum, sum(case when instrumenttype='Cheque' then 1 else 0 end) as cheque_count, sum(case when instrumenttype='Cheque' then ins.amount else 0 end) as cheque_sum, sum(case when instrumenttype='DD' then 1 else 0 end) as dd_count, sum(case when instrumenttype='DD' then ins.amount else 0 end) as dd_sum, sum(case when instrumenttype='Online' then 1 else 0 end) as online_count, sum(case when instrumenttype='Online' then ins.amount else 0 end) as online_sum, sum(case when instrumenttype='Card' then 1 else 0 end) as card_count, sum(case when instrumenttype='Card' then amount else 0 end) as card_sum,sum(amount) total from egcl_receiptheader_v1 rt inner join egcl_receiptinstrument_v1 ihead on rt.id=receiptheader inner join egcl_instrumentheader_v1 ins on instrumentheader=ins.id left outer join message on LOWER(concat('BILLINGSERVICE_BUSINESSSERVICE_',REGEXP_REPLACE(businessdetails,'\..*','')))=LOWER(code) AND module='rainmaker-uc' where businessdetails IN (select code from (VALUES tbl_businessserviceList) AS serv_list(code,servicename)) + groupby: group by service,collectiontype + orderby: order by service,collectiontype \ No newline at end of file diff --git a/configs/reports/configs/rainmaker-noc-reports.yml b/configs/reports/configs/rainmaker-noc-reports.yml new file mode 100644 index 00000000..e2f13945 --- /dev/null +++ b/configs/reports/configs/rainmaker-noc-reports.yml @@ -0,0 +1,831 @@ +--- +ReportDefinitions: + - reportName: UrbanCollectionReport + summary: Collection Report + version: 1.0.0 + moduleName: rainmaker-noc + sourceColumns: + - name: localisedmessage + label: reports.noc.collectionreport.usagetype + type: string + source: rainmaker-noc + total: false + - name: transactionNumber + label: reports.noc.collectionreport.transactionNumber + type: string + source: rainmaker-noc + total: true + - name: fees_counter + label: reports.noc.collectionreport.fees_counter + type: string + source: rainmaker-noc + total: true + - name: fees_online + label: reports.noc.collectionreport.fees_online + type: string + source: rainmaker-noc + total: true + searchParams: + - name: fromDate + label: reports.noc.collectionreport.fromDate + type: epoch + source: pt + isMandatory: false + searchClause: AND receiptdate >= $fromDate + - name: toDate + label: reports.noc.collectionreport.toDate + type: epoch + source: pt + isMandatory: false + searchClause: AND receiptdate <= $toDate + - name: channel + label: reports.noc.collectionreport.channel + type: multivaluelist + pattern: 'list://COUNTER:ULB Counter,ONLINE:Online by Citizen' + source: common + isMandatory: false + searchClause: AND collectiontype IN ($channel) + - name: paymentMode + label: reports.noc.collectionreport.paymentMode + type: singlevaluelist + pattern: 'list://Cash:Cash,Online:Online,Card:Card,DD:DD,Cheque:Cheque' + source: common + isMandatory: false + searchClause: AND instrumenttype = $paymentMode + - name: ulb + label: reports.noc.collectionreport.ulb + type: multivaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: noc + wrapper: true + isMandatory: false + searchClause: AND fnoc.tenantId IN ($ulb) + query: select COALESCE(message,usagetype) localisedmessage, COUNT(*) as transactionNumber, sum(case when collectiontype='COUNTER' then ins.amount else 0 end) fees_counter, sum(case when collectiontype='ONLINE' then ins.amount else 0 end) fees_online from eg_fn_firenoc fnoc inner join eg_fn_firenocdetail fdet on fdet.firenocuuid=fnoc.uuid inner join egcl_receiptheader_v1 rhead on rhead.consumercode=fdet.applicationnumber inner join eg_fn_buidlings build on build.firenocdetailsuuid=fdet.uuid inner join egcl_receiptinstrument_v1 recins on recins.receiptheader=rhead.id inner join egcl_instrumentheader_v1 ins on recins.instrumentheader=ins.id left outer join message on code=concat('FIRENOC_BUILDINGTYPE_',UPPER(REGEXP_REPLACE(usagetype,'\..*',''))) and module='rainmaker-noc' where 1=1 + groupby: GROUP BY localisedmessage + orderby: ORDER BY localisedmessage + + - reportName: UrbanApplicationStatusReport + summary: Application Status Report + version: 1.0.0 + moduleName: rainmaker-noc + sourceColumns: + - name: application_status + label: reports.noc.applicationstatusreport.appStatus + type: string + source: rainmaker-noc + total: false + - name: number_of_application + label: reports.noc.applicationstatusreport.noofapplications + type: string + source: rainmaker-noc + total: true + searchParams: + - name: fromDate + label: reports.noc.applicationstatusreport.fromDate + type: epoch + source: noc + isMandatory: false + searchClause: AND applicationdate >= $fromDate + - name: toDate + label: reports.noc.applicationstatusreport.toDate + type: epoch + source: noc + isMandatory: false + searchClause: AND applicationdate <= $toDate + - name: ulb + label: reports.noc.applicationstatusreport.ulb + type: multivaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: noc + wrapper: true + isMandatory: false + searchClause: AND fnoc.tenantId IN ($ulb) + query: select COALESCE(message,state) application_status,count(*) number_of_application from eg_fn_firenoc fnoc inner join eg_fn_firenocdetail fdet on fdet.firenocuuid=fnoc.uuid inner join (SELECT DISTINCT ON (businessid) * FROM eg_wf_processinstance_v2 ORDER BY businessid,createdtime desc) pinstance on pinstance.businessid=fdet.applicationnumber inner join eg_wf_state_v2 wfstate on pinstance.status=wfstate.uuid left outer join message on code=concat('WF_FIRENOC_',UPPER(state)) and module='rainmaker-noc' where 1=1 + groupby: GROUP BY application_status + orderby: ORDER BY application_status + + - reportName: UrbanChannelsReport + summary: Channels Report + version: 1.0.0 + moduleName: rainmaker-noc + sourceColumns: + - name: channel + label: reports.noc.channelsreport.channel + type: string + source: rainmaker-noc + total: false + - name: number_of_applications + label: reports.noc.channelsreport.applicationNo + type: string + source: rainmaker-noc + total: true + - name: percentage + label: reports.noc.channelsreport.percentage + type: string + source: rainmaker-noc + total: false + searchParams: + - name: fromDate + label: reports.noc.channelsreport.fromDate + type: epoch + source: noc + isMandatory: false + searchClause: AND applicationdate >= $fromDate + - name: toDate + label: reports.noc.channelsreport.toDate + type: epoch + source: noc + isMandatory: false + searchClause: AND applicationdate <= $toDate + - name: ulb + label: reports.noc.channelsreport.ulb + type: multivaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: noc + wrapper: true + isMandatory: false + searchClause: AND fnoc.tenantId IN ($ulb) + query: select channel, count (*) number_of_applications,round((count (*)::decimal/(select count(*) from eg_fn_firenoc fnoc inner join eg_fn_firenocdetail fdet on fdet.firenocuuid=fnoc.uuid))*100,2) percentage from eg_fn_firenoc fnoc inner join eg_fn_firenocdetail fdet on fdet.firenocuuid=fnoc.uuid + groupby: GROUP BY channel + orderby: ORDER BY channel + + + - reportName: UrbanCollectionReport_V2 + summary: Collection Report + version: 1.0.0 + moduleName: rainmaker-noc + sourceColumns: + - name: localisedmessage + label: reports.noc.collectionreport.usagetype + type: string + source: rainmaker-noc + total: false + - name: transactionNumber + label: reports.noc.collectionreport.transactionNumber + type: string + source: rainmaker-noc + total: true + - name: fees_counter + label: reports.noc.collectionreport.fees_counter + type: string + source: rainmaker-noc + total: true + - name: fees_online + label: reports.noc.collectionreport.fees_online + type: string + source: rainmaker-noc + total: true + searchParams: + - name: fromDate + label: reports.noc.collectionreport.fromDate + type: epoch + source: pt + isMandatory: false + searchClause: AND receiptdate >= $fromDate + - name: toDate + label: reports.noc.collectionreport.toDate + type: epoch + source: pt + isMandatory: false + searchClause: AND receiptdate <= $toDate + - name: channel + label: reports.noc.collectionreport.channel + type: multivaluelist + pattern: 'list://COUNTER:ULB Counter,ONLINE:Online by Citizen' + source: common + isMandatory: false + searchClause: AND collectiontype IN ($channel) + - name: ulb + label: reports.noc.collectionreport.ulb + type: multivaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: noc + wrapper: true + isMandatory: false + searchClause: AND fnoc.tenantId IN ($ulb) + query: | + Select + COALESCE(message,usagetype) localisedmessage, + COUNT(*) as transactionNumber, + --(select COALESCE((select message from message where code=concat('FIRENOC_FIRESTATIONS_',UPPER(REGEXP_REPLACE(firestationid,'\..*',''))) limit 1), firestationid)) as firestation, + SUM (CASE WHEN egcl_payment.paymentmode='CASH' THEN egcl_payment.totalamountpaid ELSE 0 END) as fees_counter, + SUM (CASE WHEN egcl_payment.paymentmode='ONLINE' THEN egcl_payment.totalamountpaid ELSE 0 END) AS fees_online + from eg_fn_firenoc AS fnoc + INNER JOIN eg_fn_firenocdetail fdet on fdet.firenocuuid=fnoc.uuid + INNER JOIN egcl_bill as bill on bill.consumercode=fdet.applicationnumber + INNER JOIN egcl_billdetial as billd on billd.billid=bill.id + INNER JOIN eg_fn_buidlings build on build.firenocdetailsuuid=fdet.uuid + INNER JOIN egcl_paymentdetail ON (egcl_paymentdetail.billid=bill.id AND egcl_paymentdetail.businessservice='FIRENOC') + INNER JOIN egcl_payment on egcl_payment.id=egcl_paymentdetail.paymentid + LEFT OUTER JOIN message on code=concat('FIRENOC_BUILDINGTYPE_',UPPER(REGEXP_REPLACE(usagetype,'\..*',''))) + INNER JOIN eg_fn_address as fad on fad.firenocdetailsuuid=fdet.uuid and module='rainmaker-noc' + where 1=1 + and egcl_payment.tenantid!='pb.testing' and fad.areatype='Urban' and egcl_payment.paymentstatus!='CANCELLED' + groupby: GROUP BY (localisedmessage) + orderby: ORDER BY localisedmessage + + - reportName: UrbanApplicationStatusReport_V2 + summary: Application Status Report + version: 1.0.0 + moduleName: rainmaker-noc + sourceColumns: + - name: application_status + label: reports.noc.applicationstatusreport.appStatus + type: string + source: rainmaker-noc + total: false + - name: number_of_application + label: reports.noc.applicationstatusreport.noofapplications + type: string + source: rainmaker-noc + total: true + searchParams: + - name: fromDate + label: reports.noc.applicationstatusreport.fromDate + type: epoch + source: noc + isMandatory: false + searchClause: AND applicationdate >= $fromDate + - name: toDate + label: reports.noc.applicationstatusreport.toDate + type: epoch + source: noc + isMandatory: false + searchClause: AND applicationdate <= $toDate + - name: ulb + label: reports.noc.applicationstatusreport.ulb + type: multivaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: noc + wrapper: true + isMandatory: false + searchClause: AND fnoc.tenantid IN ($ulb) + query: | + select + COALESCE(message,state) application_status, + count(*) number_of_application + from eg_fn_firenoc fnoc + inner join eg_fn_firenocdetail fdet on fdet.firenocuuid=fnoc.uuid + inner join (SELECT DISTINCT ON (businessid) * FROM eg_wf_processinstance_v2 ORDER BY businessid,createdtime desc) pinstance on pinstance.businessid=fdet.applicationnumber + inner join eg_wf_state_v2 wfstate on pinstance.status=wfstate.uuid + left outer join message on code=concat('WF_FIRENOC_',UPPER(state)) and module='rainmaker-noc' + where 1=1 and fnoc.tenantid!='pb.testing' + groupby: GROUP BY application_status + orderby: ORDER BY application_status + + + - reportName: UrbanChannelsReport_V2 + summary: Channels Report + version: 1.0.0 + moduleName: rainmaker-noc + sourceColumns: + - name: channel + label: reports.noc.channelsreport.channel + type: string + source: rainmaker-noc + total: false + - name: number_of_applications + label: reports.noc.channelsreport.applicationNo + type: string + source: rainmaker-noc + total: true + - name: percentage + label: reports.noc.channelsreport.percentage + type: string + source: rainmaker-noc + total: false + searchParams: + - name: fromDate + label: reports.noc.channelsreport.fromDate + type: epoch + source: noc + isMandatory: false + searchClause: AND applicationdate >= $fromDate + - name: toDate + label: reports.noc.channelsreport.toDate + type: epoch + source: noc + isMandatory: false + searchClause: AND applicationdate <= $toDate + - name: ulb + label: reports.noc.channelsreport.ulb + type: multivaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: noc + wrapper: true + isMandatory: false + searchClause: AND fnoc.tenantid IN ($ulb) + query: | + select + channel, + count (*) number_of_applications, + round((count (*)::decimal/(select count(*) from eg_fn_firenoc fnoc inner join eg_fn_firenocdetail fdet on fdet.firenocuuid=fnoc.uuid))*100,2) percentage + from eg_fn_firenoc fnoc + inner join eg_fn_firenocdetail fdet on fdet.firenocuuid=fnoc.uuid + where 1=1 and fnoc.tenantid!='pb.testing' + groupby: GROUP BY channel + orderby: ORDER BY channel + + - reportName: RuralDistrictWiseCollectionReport_V2 + summary: Rural District Wise Collection Report + version: 1.0.0 + moduleName: rainmaker-noc + sourceColumns: + - name: subdistrict + label: reports.noc.collectionreport.subdistrict + type: string + source: rainmaker-noc + total: false + - name: firestation + label: reports.noc.collectionreport.firestation + type: string + source: rainmaker-noc + total: false + - name: localisedmessage + label: reports.noc.collectionreport.usagetype + type: string + source: rainmaker-noc + total: false + - name: transactionNumber + label: reports.noc.collectionreport.transactionNumber + type: string + source: rainmaker-noc + total: true + - name: fees_counter + label: reports.noc.collectionreport.fees_counter + type: string + source: rainmaker-noc + total: true + - name: fees_online + label: reports.noc.collectionreport.fees_online + type: string + source: rainmaker-noc + total: true + searchParams: + - name: fromDate + label: reports.noc.collectionreport.fromDate + type: epoch + source: noc + isMandatory: false + searchClause: AND receiptdate >= $fromDate + - name: toDate + label: reports.noc.collectionreport.toDate + type: epoch + source: noc + isMandatory: false + searchClause: AND receiptdate <= $toDate + - name: channel + label: reports.noc.collectionreport.channel + type: multivaluelist + pattern: 'list://COUNTER:ULB Counter,ONLINE:Online by Citizen' + source: common + isMandatory: false + searchClause: AND collectiontype IN ($channel) + - name: district + label: reports.noc.collectionreport.district + type: multivaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.city.districtTenantCode|$.MdmsRes.tenant.tenants.*.city.districtName + source: noc + wrapper: true + isMandatory: false + searchClause: AND fad.city IN ($district) + query: | + Select + COALESCE(message,usagetype) localisedmessage, + COUNT(*) as transactionNumber, + fad.subdistrict, + --(select COALESCE((select message from message where code=concat('FIRENOC_FIRESTATIONS_',UPPER(REGEXP_REPLACE(firestationid,'\..*',''))) limit 1), firestationid)) as firestation, + SUM (CASE WHEN egcl_payment.paymentmode='CASH' THEN egcl_payment.totalamountpaid ELSE 0 END) as fees_counter, + SUM (CASE WHEN egcl_payment.paymentmode='ONLINE' THEN egcl_payment.totalamountpaid ELSE 0 END) AS fees_online + from eg_fn_firenoc AS fnoc + INNER JOIN eg_fn_firenocdetail fdet on fdet.firenocuuid=fnoc.uuid + INNER JOIN egcl_bill as bill on bill.consumercode=fdet.applicationnumber + INNER JOIN egcl_billdetial as billd on billd.billid=bill.id + INNER JOIN eg_fn_buidlings build on build.firenocdetailsuuid=fdet.uuid + INNER JOIN egcl_paymentdetail ON (egcl_paymentdetail.billid=bill.id AND egcl_paymentdetail.businessservice='FIRENOC') + INNER JOIN egcl_payment on egcl_payment.id=egcl_paymentdetail.paymentid + LEFT OUTER JOIN message on code=concat('FIRENOC_BUILDINGTYPE_',UPPER(REGEXP_REPLACE(usagetype,'\..*',''))) + INNER JOIN eg_fn_address as fad on fad.firenocdetailsuuid=fdet.uuid and module='rainmaker-noc' + where 1=1 and egcl_payment.tenantid!='pb.testing' and fad.areatype='Rural' and egcl_payment.paymentstatus!='CANCELLED' + groupby: GROUP BY (localisedmessage),fad.subdistrict + orderby: ORDER BY localisedmessage + + + - reportName: RuralDistrictWiseApplicationStatusReport_V2 + summary: Rural District Wise Application Status Report + version: 1.0.0 + moduleName: rainmaker-noc + sourceColumns: + - name: subdistrict + label: reports.noc.collectionreport.subdistrict + type: string + source: rainmaker-noc + total: false + - name: firestation + label: reports.noc.collectionreport.firestation + type: string + source: rainmaker-noc + total: false + - name: application_status + label: reports.noc.applicationstatusreport.appStatus + type: string + source: rainmaker-noc + total: false + - name: number_of_application + label: reports.noc.applicationstatusreport.noofapplications + type: string + source: rainmaker-noc + total: true + searchParams: + - name: fromDate + label: reports.noc.applicationstatusreport.fromDate + type: epoch + source: noc + isMandatory: false + searchClause: AND applicationdate >= $fromDate + - name: toDate + label: reports.noc.applicationstatusreport.toDate + type: epoch + source: noc + isMandatory: false + searchClause: AND applicationdate <= $toDate + - name: district + label: reports.noc.applicationstatusreport.district + type: multivaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.city.districtTenantCode|$.MdmsRes.tenant.tenants.*.city.districtName + source: noc + wrapper: true + isMandatory: false + searchClause: AND fad.city IN ($district) + query: | + select + fad.subdistrict as subdistrict, + (select COALESCE((select message from message where code=concat('FIRENOC_FIRESTATIONS_',UPPER(REGEXP_REPLACE(firestationid,'\..*',''))) limit 1), firestationid)) as firestation, + COALESCE(message,state) application_status, + count(*) number_of_application + from eg_fn_firenoc fnoc + inner join eg_fn_firenocdetail fdet on fdet.firenocuuid=fnoc.uuid + inner join (SELECT DISTINCT ON (businessid) * FROM eg_wf_processinstance_v2 ORDER BY businessid,createdtime desc) pinstance on pinstance.businessid=fdet.applicationnumber + inner join eg_wf_state_v2 wfstate on pinstance.status=wfstate.uuid left outer join message on code=concat('WF_FIRENOC_',UPPER(state)) and module='rainmaker-noc' + inner join eg_fn_address as fad on fad.firenocdetailsuuid=fdet.uuid + where 1=1 AND fad.subdistrict NOT LIKE 'pb.%' + groupby: GROUP BY (application_status,subdistrict,firestation) + orderby: ORDER BY application_status + + - reportName: RuralDistrictWiseChannelsReport_V2 + summary: Rural District Wise Channels Report + version: 1.0.0 + moduleName: rainmaker-noc + sourceColumns: + - name: subdistrict + label: reports.noc.collectionreport.subdistrict + type: string + source: rainmaker-noc + total: false + - name: firestation + label: reports.noc.collectionreport.firestation + type: string + source: rainmaker-noc + total: false + - name: channel + label: reports.noc.channelsreport.channel + type: string + source: rainmaker-noc + total: false + - name: number_of_applications + label: reports.noc.channelsreport.applicationNo + type: string + source: rainmaker-noc + total: true + - name: percentage + label: reports.noc.channelsreport.percentage + type: string + source: rainmaker-noc + total: false + searchParams: + - name: fromDate + label: reports.noc.channelsreport.fromDate + type: epoch + source: noc + isMandatory: false + searchClause: AND applicationdate >= $fromDate + - name: toDate + label: reports.noc.channelsreport.toDate + type: epoch + source: noc + isMandatory: false + searchClause: AND applicationdate <= $toDate + - name: district + label: reports.noc.channelsreport.district + type: multivaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.city.districtTenantCode|$.MdmsRes.tenant.tenants.*.city.districtName + source: noc + wrapper: true + isMandatory: false + searchClause: AND fad.city IN ($district) + query: | + select + channel, + fad.subdistrict as subdistrict, + (select COALESCE((select message from message where code=concat('FIRENOC_FIRESTATIONS_',UPPER(REGEXP_REPLACE(firestationid,'\..*',''))) limit 1), firestationid)) as firestation, + count (*) number_of_applications, + round((count (*)::decimal/(select count(*) from eg_fn_firenoc fnoc inner join eg_fn_firenocdetail fdet on fdet.firenocuuid=fnoc.uuid))*100,2) percentage + from eg_fn_firenoc fnoc + inner join eg_fn_firenocdetail fdet on fdet.firenocuuid=fnoc.uuid + inner join eg_fn_address as fad on fad.firenocdetailsuuid=fdet.uuid + Where 1=1 AND fad.subdistrict NOT LIKE 'pb.%' + groupby: GROUP BY (channel,subdistrict,firestation) + orderby: ORDER BY channel + + - reportName: ReceiptRegisterFirenocReport_V2 + decryptionPathId: ReceiptRegister_V2 + summary: Receipt Register FireNoc + version: 1.0.0 + moduleName: rainmaker-noc + additionalConfig: + print: + pdfPageSize: "A3" + sourceColumns: + - name: ulb + label: reports.noc.ulb + type: string + source: rainmaker-noc + total: false + - name: receiptnumber + label: reports.noc.receiptnumber + type: string + source: rainmaker-noc + total: false + - name: applicationnumber + label: reports.noc.applicationnumber + type: string + source: rainmaker-noc + total: false + - name: receiptdate + label: reports.noc.receiptdate + type: string + source: rainmaker-noc + total: false + - name: g8issuedate + label: reports.noc.g8issuedate + type: string + source: rainmaker-noc + total: false + - name: g8receiptno + label: reports.noc.g8receiptno + type: string + source: rainmaker-noc + total: false + - name: status + label: reports.noc.status + type: string + source: rainmaker-noc + total: false + - name: servicecategory + label: reports.noc.servicecategory + type: string + source: rainmaker-noc + total: false + - name: totalamount + label: reports.noc.totalamount + type: string + source: rainmaker-noc + total: true + - name: paymentmode + label: reports.noc.paymentmode + type: string + source: rainmaker-noc + total: false + - name: ddorchequenumber + label: reports.noc.ddorchequenumber + type: string + source: rainmaker-noc + total: false + - name: firenoctype + label: reports.noc.firenoctype + type: string + source: rainmaker-noc + total: false + - name: usagetype + label: reports.noc.usagetype + type: string + source: rainmaker-noc + total: false + - name: areatype + label: reports.noc.areatype + type: string + source: rainmaker-noc + total: false + - name: ownername + label: reports.noc.ownername + type: string + source: rainmaker-noc + total: false + - name: collectiontype + label: reports.noc.collectiontype + type: string + source: rainmaker-noc + total: false + - name: collectorname + label: reports.noc.collectorname + type: string + source: rainmaker-noc + total: false + searchParams: + - name: fromDate + label: reports.noc.fromDate + type: epoch + source: noc + isMandatory: false + searchClause: AND applicationdate >= $fromDate + - name: toDate + label: reports.noc.toDate + type: epoch + source: noc + isMandatory: false + searchClause: AND applicationdate <= $toDate + - name: ulb + label: reports.noc.ulb + type: multivaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: noc + wrapper: true + isMandatory: false + searchClause: AND fnoc.tenantId IN ($ulb) + query: | + -- Use CTE to force query plan, compute & use CTE later + WITH receipt_breakup AS ( + SELECT + egcl_billaccountdetail.billdetailid bill_id, + string_agg(distinct consumercode,',') as consumercode + FROM egcl_billaccountdetail + LEFT JOIN egcl_bill as bill on bill.id = egcl_billaccountdetail.billdetailid + WHERE bill.tenantid!='pb.testing' AND businessservice='FIRENOC' + GROUP BY billdetailid + ) + SELECT + payment.tenantid as ulb, + paydetail.receiptnumber as receiptnumber, + To_char((To_timestamp(paydetail.receiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as receiptdate, + To_char((To_timestamp(paydetail.manualreceiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as g8issuedate, + paydetail.manualreceiptnumber as g8receiptno, + payment.paymentstatus as status, + paydetail.businessservice as servicecategory, + receipt_breakup.*, + payment.totalamountpaid as totalamount, + paymentmode as paymentmode, + (case when paymentmode like 'CASH' then '' else transactionnumber end) as ddorchequenumber, + 'System' as collectiontype, + eg_user.name as collectorname, + fdet.firenoctype as firenoctype, + build.usagetype as usagetype, + fad.areatype as areatype, + fdet.applicationnumber as applicationnumber, + build.name as ownername + FROM egcl_payment AS payment + LEFT JOIN egcl_paymentdetail as paydetail on paydetail.paymentid=payment.id + LEFT JOIN receipt_breakup ON paydetail.billid = receipt_breakup.bill_id + JOIN eg_user ON payment.createdby::INTEGER=eg_user.id + JOIN egcl_bill as bill ON bill.id=paydetail.billid + JOIN eg_fn_firenocdetail AS fdet ON fdet.applicationnumber=bill.consumercode + JOIN eg_fn_buidlings AS build ON build.firenocdetailsuuid=fdet.uuid + INNER JOIN eg_fn_address as fad on fad.firenocdetailsuuid=fdet.uuid + WHERE payment.tenantid!='pb.testing' AND paydetail.businessservice='FIRENOC' AND paydetail.receiptnumber NOT LIKE 'MP%' and payment.tenantid = $tenantid + and payment.paymentstatus!='CANCELLED' + orderby: ORDER BY paydetail.receiptdate DESC + + - reportName: CancelledReceiptRegisterFirenocReport_V2 + decryptionPathId: ReceiptRegister_V2 + summary: Cancelled Receipt Register FireNoc + version: 1.0.0 + moduleName: rainmaker-noc + additionalConfig: + print: + pdfPageSize: "A3" + sourceColumns: + - name: ulb + label: reports.noc.ulb + type: string + source: rainmaker-noc + total: false + - name: receiptnumber + label: reports.noc.receiptnumber + type: string + source: rainmaker-noc + total: false + - name: applicationnumber + label: reports.noc.applicationnumber + type: string + source: rainmaker-noc + total: false + - name: receiptdate + label: reports.noc.receiptdate + type: string + source: rainmaker-noc + total: false + - name: g8issuedate + label: reports.noc.g8issuedate + type: string + source: rainmaker-noc + total: false + - name: g8receiptno + label: reports.noc.g8receiptno + type: string + source: rainmaker-noc + total: false + - name: status + label: reports.noc.status + type: string + source: rainmaker-noc + total: false + - name: servicecategory + label: reports.noc.servicecategory + type: string + source: rainmaker-noc + total: false + - name: totalamount + label: reports.noc.totalamount + type: string + source: rainmaker-noc + total: true + - name: paymentmode + label: reports.noc.paymentmode + type: string + source: rainmaker-noc + total: false + - name: ddorchequenumber + label: reports.noc.ddorchequenumber + type: string + source: rainmaker-noc + total: false + - name: collectiontype + label: reports.noc.collectiontype + type: string + source: rainmaker-noc + total: false + - name: collectorname + label: reports.noc.collectorname + type: string + source: rainmaker-noc + total: false + searchParams: + - name: fromDate + label: reports.noc.fromDate + type: epoch + source: noc + isMandatory: false + searchClause: AND applicationdate >= $fromDate + - name: toDate + label: reports.noc.toDate + type: epoch + source: noc + isMandatory: false + searchClause: AND applicationdate <= $toDate + - name: ulb + label: reports.noc.ulb + type: multivaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: noc + wrapper: true + isMandatory: false + searchClause: AND fnoc.tenantId IN ($ulb) + query: | + -- Use CTE to force query plan, compute & use CTE later + WITH receipt_breakup AS ( + SELECT + egcl_billaccountdetail.billdetailid bill_id, + string_agg(distinct consumercode,',') as consumercode + FROM egcl_billaccountdetail + LEFT JOIN egcl_bill as bill on bill.id = egcl_billaccountdetail.billdetailid + WHERE bill.tenantid!='pb.testing' AND businessservice in ('FIRENOC') + GROUP BY billdetailid + ) + SELECT + payment.tenantid as ulb, + paydetail.receiptnumber as receiptnumber, + To_char((To_timestamp(paydetail.receiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as receiptdate, + To_char((To_timestamp(paydetail.manualreceiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as g8issuedate, + paydetail.manualreceiptnumber as g8receiptno, + payment.paymentstatus as status, + paydetail.businessservice as servicecategory, + receipt_breakup.*, + payment.totalamountpaid as totalamount, + paymentmode as paymentmode, + (case when paymentmode like 'CASH' then '' else transactionnumber end) as ddorchequenumber, + 'System' as collectiontype, + eg_user.name as collectorname, + fdet.firenoctype as firenoctype, + build.usagetype as usagetype, + fdet.applicationnumber as applicationnumber, + build.name as ownername + FROM egcl_payment AS payment + LEFT JOIN egcl_paymentdetail as paydetail on paydetail.paymentid=payment.id + LEFT JOIN receipt_breakup ON paydetail.billid = receipt_breakup.bill_id + JOIN eg_user ON payment.createdby::INTEGER=eg_user.id + JOIN egcl_bill as bill ON bill.id=paydetail.billid + JOIN eg_fn_firenocdetail AS fdet ON fdet.applicationnumber=bill.consumercode + JOIN eg_fn_buidlings AS build ON build.firenocdetailsuuid=fdet.uuid + WHERE payment.tenantid!='pb.testing' and paydetail.businessservice not in ('PT','TL','UC') and payment.paymentstatus = 'CANCELLED' and paydetail.receiptnumber NOT LIKE 'MP%' + --and paydetail.tenantid=$tenantid + orderby: ORDER BY paydetail.receiptdate DESC + diff --git a/configs/reports/configs/rainmaker-pgr-reports.yml b/configs/reports/configs/rainmaker-pgr-reports.yml new file mode 100644 index 00000000..6a0aadaf --- /dev/null +++ b/configs/reports/configs/rainmaker-pgr-reports.yml @@ -0,0 +1,727 @@ +ReportDefinitions: +- reportName: SourceWiseReport + summary: Fetches reports based on the source of reception of the complaint + version: 1.0.0 + moduleName: rainmaker-pgr + sourceColumns: + - name: citizen_mobile_app + label: reports.rainmaker-pgr.citizen_mobile_app + type: number + source: eg_pgr_service + - name: citizen_web_app + label: reports.rainmaker-pgr.citizen_web_app + type: number + source: eg_pgr_service + - name: counter_desktop + label: reports.rainmaker-pgr.counter_desktop + type: number + source: eg_pgr_service + searchParams: + - name: tenantId + label: reports.rainmaker-pgr.tenantId + type: singlevaluelist + pattern: 'list://Wet:Wet,Dry:Dry' + source: eg_pgr_service + isMandatory: true + - name: fromDate + label: reports.rainmaker-pgr.datefrom + type: epoch + source: eg_pgr_service + isMandatory: true + - name: toDate + label: reports.rainmaker-pgr.dateto + type: epoch + source: eg_pgr_service + isMandatory: true + query: SELECT sum(case when source = 'mobileapp' then 1 else 0 end) as citizen_mobile_app, sum(case when source = 'web' then 1 else 0 end) as citizen_web_app, sum(case when source = 'ivr' then 1 else 0 end) as counter_desktop FROM eg_pgr_service WHERE tenantid = $tenantid + +- reportName: DescriptionReport + summary: Fetches department wise reports based description of the complaint + version: 1.0.0 + moduleName: rainmaker-pgr + externalService: + - entity: $.MdmsRes.RAINMAKER-PGR.ServiceDefs + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=RAINMAKER-PGR&masterName=ServiceDefs&tenantId=$tenantId + keyOrder: serviceCode,department,slaHours + tableName: tbl_dept + - entity: $.MdmsRes.common-masters.Department + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=common-masters&masterName=Department&tenantId=$tenantId + keyOrder: name,code + tableName: tbl_def_dept + - entity: $.TenantBoundary[0].boundary + apiURL: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search?hierarchyTypeCode=ADMIN&boundaryType=Locality&tenantId=$tenantId + keyOrder: name,code + tableName: tbl_boundary + sourceColumns: + - name: department + label: reports.rainmaker-pgr.department + type: string + source: eg_pgr_service + total: false + - name: servicecode + label: reports.rainmaker-pgr.servicecode + type: string + source: eg_pgr_service + total: false + - name: complaintNo + label: reports.rainmaker-pgr.complaintNo + type: string + source: eg_pgr_service + total: false + - name: date + label: reports.rainmaker-pgr.date + type: string + source: eg_pgr_service + total: false + - name: name + label: reports.rainmaker-pgr.name + type: string + source: eg_pgr_service + total: false + - name: phone + label: reports.rainmaker-pgr.phone + type: string + source: eg_pgr_service + total: false + - name: address + label: reports.rainmaker-pgr.address + type: string + source: eg_pgr_service + total: false + - name: locality + label: reports.rainmaker-pgr.locality + type: string + source: eg_pgr_service + total: false + - name: landmark + label: reports.rainmaker-pgr.landmark + type: string + source: eg_pgr_service + total: false + - name: description + label: reports.rainmaker-pgr.description + type: string + source: eg_pgr_service + total: false + - name: lastassignedto + label: reports.rainmaker-pgr.lastassignedto + type: string + source: eg_pgr_service + total: false + - name: status + label: reports.rainmaker-pgr.status + type: string + source: eg_pgr_service + total: false + - name: slahours + label: reports.rainmaker-pgr.slahours + type: string + source: eg_pgr_service + total: false + searchParams: + - name: fromDate + label: reports.rainmaker-pgr.datefrom + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND eg_pgr_service.createdtime >= $fromDate + - name: toDate + label: reports.rainmaker-pgr.dateto + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND eg_pgr_service.createdtime <= $toDate + query: | + SELECT + DISTINCT ON (servicerequestid) + ua.name as lastassignedto, + (SELECT deptmap_def.name FROM (VALUES tbl_def_dept) AS deptmap_def(name,code) INNER JOIN (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) on deptmap.serviceCode = eg_pgr_service.servicecode and deptmap_def.code = deptmap.department) AS department, + regexp_replace(servicecode, '([a-z])([A-Z])', '\1 \2','g') AS servicecode, + (SELECT boundary_def.name FROM (VALUES tbl_boundary) AS boundary_def(name,code) where code=eg_pgr_address.mohalla) as locality, + servicerequestid AS complaintNo, + to_char(to_timestamp(TRUNC(CAST(eg_pgr_service.createdtime AS bigint) / 1000)), 'DD/MM/YYYY') AS date, + eg_user.name, + phone, + eg_pgr_address.landmark, + eg_pgr_address.housenoandstreetname as address, + description, + (SELECT (CASE WHEN (((SELECT deptmap.slaHours FROM (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) WHERE deptmap.serviceCode = eg_pgr_service.servicecode)::integer / 24) - ((((select extract(epoch from now())) * 1000) - eg_pgr_service.createdtime)::bigint/86400000)) < 1 THEN CONCAT('Overdue by ', ((((select extract(epoch from now())) * 1000) - eg_pgr_service.createdtime)::bigint/86400000) - ((SELECT deptmap.slaHours FROM (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) WHERE deptmap.serviceCode = eg_pgr_service.servicecode)::integer / 24), ' days') ELSE CONCAT(((SELECT deptmap.slaHours FROM (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) WHERE deptmap.serviceCode = eg_pgr_service.servicecode)::integer / 24) - ((((select extract(epoch from now())) * 1000) - eg_pgr_service.createdtime)::bigint/86400000), ' days remaining') END) as slaHours), + Initcap(eg_pgr_service.status) as status + FROM eg_pgr_service + left outer join eg_pgr_address on eg_pgr_address.uuid = eg_pgr_service.addressid + left outer join eg_user on eg_user.id = eg_pgr_service.accountid::int + left outer join eg_pgr_action as epa on epa.businesskey = eg_pgr_service.servicerequestid and epa.action in ('assign','reassign') + left outer join eg_user as ua on ua.id = epa.assignee::int + WHERE + eg_pgr_service.tenantid LIKE $tenantid + AND eg_pgr_address.uuid = eg_pgr_service.addressid + AND eg_pgr_service.status IN ('open','assigned','reassigrequested','rejected') + orderby: ORDER BY servicerequestid, epa."when" desc + +- reportName: StateSourceReport + summary: Source of complaints across tenants + version: 1.0.0 + moduleName: rainmaker-pgr + sourceColumns: + - name: tenantid + label: reports.rainmaker-pgr.tenantid + type: string + source: eg_pgr_service + total: false + - name: ivr + label: reports.rainmaker-pgr.source.ivr + type: string + source: eg_pgr_service + total: true + - name: mobileapp + label: reports.rainmaker-pgr.source.mobileapp + type: string + source: eg_pgr_service + total: true + - name: web + label: reports.rainmaker-pgr.source.web + type: string + source: eg_pgr_service + total: true + - name: unknown + label: reports.rainmaker-pgr.source.unknown + type: string + source: eg_pgr_service + total: true + searchParams: + - name: fromDate + label: reports.rainmaker-pgr.datefrom + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND createdtime >= $fromDate + - name: toDate + label: reports.rainmaker-pgr.dateto + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND createdtime <= $toDate + query: | + select initcap(split_part(tenantid, '.', 2)) as tenantid, + SUM(CASE WHEN source ='ivr' THEN 1 ELSE 0 END) as ivr, + SUM(CASE WHEN source ='mobileapp' THEN 1 ELSE 0 END) as mobileapp, + SUM(CASE WHEN source ='web' THEN 1 ELSE 0 END) as web, + SUM(CASE WHEN source NOT IN ('web', 'ivr', 'mobileapp') OR source is NULL THEN 1 ELSE 0 END) as unknown + from eg_pgr_service + WHERE tenantid != 'pb.testing' + + groupby: GROUP BY tenantid + orderby: ORDER BY tenantid + +- reportName: EmployeeReport + summary: Fetches complaints for employees + version: 1.0.0 + moduleName: rainmaker-pgr + externalService: + - entity: $.MdmsRes.RAINMAKER-PGR.ServiceDefs + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=RAINMAKER-PGR&masterName=ServiceDefs&tenantId=$tenantId + keyOrder: serviceCode,department,slaHours + tableName: tbl_dept + - entity: $.TenantBoundary[0].boundary + apiURL: http://egov-location.egov:8080/egov-location/location/v11/boundarys/_search?hierarchyTypeCode=ADMIN&boundaryType=Locality&tenantId=$tenantId + keyOrder: name,code + tableName: tbl_boundary + sourceColumns: + - name: department + label: reports.rainmaker-pgr.department + type: string + source: eg_pgr_service + total: false + - name: servicecode + label: reports.rainmaker-pgr.servicecode + type: string + source: eg_pgr_service + total: false + - name: complaintNo + label: reports.rainmaker-pgr.complaintNo + type: string + source: eg_pgr_service + total: false + - name: date + label: reports.rainmaker-pgr.date + type: string + source: eg_pgr_service + total: false + - name: name + label: reports.rainmaker-pgr.name + type: string + source: eg_pgr_service + total: false + - name: phone + label: reports.rainmaker-pgr.phone + type: string + source: eg_pgr_service + total: false + - name: locality + label: reports.rainmaker-pgr.locality + type: string + source: eg_pgr_service + total: false + - name: address + label: reports.rainmaker-pgr.address + type: string + source: eg_pgr_service + total: false + - name: landmark + label: reports.rainmaker-pgr.landmark + type: string + source: eg_pgr_service + total: false + - name: description + label: reports.rainmaker-pgr.description + type: string + source: eg_pgr_service + total: false + - name: status + label: reports.rainmaker-pgr.status + type: string + source: eg_pgr_service + total: false + - name: slahours + label: reports.rainmaker-pgr.slahours + type: string + source: eg_pgr_service + total: false + searchParams: + - name: fromDate + label: reports.rainmaker-pgr.datefrom + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND eg_pgr_service.createdtime >= $fromDate + - name: toDate + label: reports.rainmaker-pgr.dateto + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND eg_pgr_service.createdtime <= $toDate + query: | + SELECT (SELECT deptmap.department FROM (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) WHERE deptmap.serviceCode = eg_pgr_service.servicecode) AS department, + regexp_replace(eg_pgr_service.servicecode, '([a-z])([A-Z])', '\1 \2','g') AS servicecode, + servicerequestid AS complaintNo, + to_char(to_timestamp(TRUNC(CAST(eg_pgr_service.createdtime AS bigint) / 1000)), 'DD/MM/YYYY') AS date, + (SELECT boundary_def.name FROM (VALUES tbl_boundary) AS boundary_def(name,code) where code=eg_pgr_address.mohalla) as locality, + eg_user.name, + phone, + eg_pgr_service.landmark, + housenoandstreetname as address, + description, + (SELECT (CASE WHEN (((SELECT deptmap.slaHours FROM (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) WHERE deptmap.serviceCode = eg_pgr_service.servicecode)::integer / 24) - ((((select extract(epoch from now())) * 1000) - eg_pgr_service.createdtime)::bigint/86400000)) < 1 THEN CONCAT('Overdue by ', ((((select extract(epoch from now())) * 1000) - eg_pgr_service.createdtime)::bigint/86400000) - ((SELECT deptmap.slaHours FROM (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) WHERE deptmap.serviceCode = eg_pgr_service.servicecode)::integer / 24), ' days') ELSE CONCAT(((SELECT deptmap.slaHours FROM (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) WHERE deptmap.serviceCode = eg_pgr_service.servicecode)::integer / 24) - ((((select extract(epoch from now())) * 1000) - eg_pgr_service.createdtime)::bigint/86400000), ' days remaining') END) as slaHours), + initcap(status) as status FROM eg_pgr_service + INNER JOIN eg_user ON eg_pgr_service.accountid = eg_user.id::VARCHAR + INNER JOIN eg_pgr_address ON eg_pgr_service.addressid = eg_pgr_address.uuid + WHERE eg_pgr_service.status = 'assigned' + AND servicerequestid IN (SELECT DISTINCT businesskey FROM eg_pgr_action WHERE status = 'assigned' AND "when" IN (select max("when") FROM eg_pgr_action WHERE assignee NOTNULL GROUP BY businesskey) AND assignee = $userid) + orderby: ORDER BY eg_pgr_service.createdtime asc + +- reportName: StateULBReport + summary: Fetches complaints stats for all ULBs in state + version: 1.0.0 + moduleName: rainmaker-pgr + sourceColumns: + - name: tenantid + label: reports.rainmaker-pgr.tenantid + type: string + source: eg_pgr_service + total: false + - name: open + label: reports.rainmaker-pgr.status.open + type: string + source: eg_pgr_service + total: true + - name: assigned + label: reports.rainmaker-pgr.status.assigned + type: string + source: eg_pgr_service + total: true + - name: closed + label: reports.rainmaker-pgr.status.closed + type: string + source: eg_pgr_service + total: true + - name: reassignrequested + label: reports.rainmaker-pgr.status.reassignrequested + type: string + source: eg_pgr_service + total: true + - name: rejected + label: reports.rainmaker-pgr.status.rejected + type: string + source: eg_pgr_service + total: true + - name: total + label: reports.rainmaker-pgr.total + type: string + source: eg_pgr_service + total: true + searchParams: + - name: fromDate + label: reports.rainmaker-pgr.datefrom + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND createdtime >= $fromDate + - name: toDate + label: reports.rainmaker-pgr.dateto + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND createdtime <= $toDate + query: | + select initcap(split_part(tenantid, '.', 2)) as tenantid, + SUM(CASE WHEN status ='open' THEN 1 ELSE 0 END) as open, + SUM(CASE WHEN status ='assigned' THEN 1 ELSE 0 END) as assigned, + SUM(CASE WHEN status in ('closed', 'resolved') THEN 1 ELSE 0 END) as closed, + SUM(CASE WHEN status ='reassignrequested' THEN 1 ELSE 0 END) as reassignrequested, + SUM(CASE WHEN status ='rejected' THEN 1 ELSE 0 END) as rejected, + COUNT(status) as total + from eg_pgr_service + WHERE tenantid != 'pb.testing' + groupby: GROUP BY tenantid + orderby: ORDER BY tenantid + +- reportName: ComplaintTypesReport + summary: Fetches complaint stats based on complaint types for a ULB + version: 1.0.0 + moduleName: rainmaker-pgr + sourceColumns: + - name: tenantid + label: reports.rainmaker-pgr.tenantid + type: string + source: eg_pgr_service + total: false + - name: complainttype + label: reports.rainmaker-pgr.complainttype + type: string + source: eg_pgr_service + total: false + - name: open + label: reports.rainmaker-pgr.status.open + type: string + source: eg_pgr_service + total: true + - name: assigned + label: reports.rainmaker-pgr.status.assigned + type: string + source: eg_pgr_service + total: true + - name: closed + label: reports.rainmaker-pgr.status.closed + type: string + source: eg_pgr_service + total: true + - name: reassignrequested + label: reports.rainmaker-pgr.status.reassignrequested + type: string + source: eg_pgr_service + total: true + - name: rejected + label: reports.rainmaker-pgr.status.rejected + type: string + source: eg_pgr_service + total: true + - name: total + label: reports.rainmaker-pgr.total + type: string + source: eg_pgr_service + total: true + searchParams: + - name: ulb + label: ULB + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: pt + wrapper: true + isMandatory: false + searchClause: AND tenantid = $ulb + - name: fromDate + label: reports.rainmaker-pgr.datefrom + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND createdtime >= $fromDate + - name: toDate + label: reports.rainmaker-pgr.dateto + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND createdtime <= $toDate + query: | + select + initcap(split_part(tenantid, '.', 2)) as tenantid, + regexp_replace(servicecode, '([a-z])([A-Z])', '\1 \2','g') as complainttype, + SUM(CASE WHEN status ='open' THEN 1 ELSE 0 END) as open, + SUM(CASE WHEN status ='assigned' THEN 1 ELSE 0 END) as assigned, + SUM(CASE WHEN status in ('closed', 'resolved') THEN 1 ELSE 0 END) as closed, + SUM(CASE WHEN status ='reassignrequested' THEN 1 ELSE 0 END) as reassignrequested, + SUM(CASE WHEN status ='rejected' THEN 1 ELSE 0 END) as rejected, + count(status) as total + from eg_pgr_service + WHERE tenantid != 'pb.testing' + groupby: GROUP BY tenantid,servicecode + orderby: ORDER BY tenantid,servicecode + +- reportName: DepartmentReport + summary: Fetches complaint stats based on complaint types for a ULB + version: 1.0.0 + moduleName: rainmaker-pgr + externalService: + - entity: $.MdmsRes.RAINMAKER-PGR.ServiceDefs + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=RAINMAKER-PGR&masterName=ServiceDefs&tenantId=$tenantId + keyOrder: serviceCode,department,slaHours + tableName: tbl_dept + - entity: $.MdmsRes.common-masters.Department + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=common-masters&masterName=Department&tenantId=$tenantId + keyOrder: name,code + tableName: tbl_def_dept + sourceColumns: + - name: tenantid + label: reports.rainmaker-pgr.tenantid + type: string + source: eg_pgr_service + total: false + - name: department + label: reports.rainmaker-pgr.department + type: string + source: eg_pgr_service + total: false + - name: open + label: reports.rainmaker-pgr.status.open + type: string + source: eg_pgr_service + total: true + - name: assigned + label: reports.rainmaker-pgr.status.assigned + type: string + source: eg_pgr_service + total: true + - name: closed + label: reports.rainmaker-pgr.status.closed + type: string + source: eg_pgr_service + total: true + - name: reassignrequested + label: reports.rainmaker-pgr.status.reassignrequested + type: string + source: eg_pgr_service + total: true + - name: rejected + label: reports.rainmaker-pgr.status.rejected + type: string + source: eg_pgr_service + total: true + searchParams: + - name: ulb + label: ULB + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: pt + wrapper: true + isMandatory: false + searchClause: AND tenantid = $ulb + - name: fromDate + label: reports.rainmaker-pgr.datefrom + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND createdtime >= $fromDate + - name: toDate + label: reports.rainmaker-pgr.dateto + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND createdtime <= $toDate + query: | + select + initcap(split_part(tenantid, '.', 2)) as tenantid, + deptmap_def.name as department, + SUM(CASE WHEN status ='open' THEN 1 ELSE 0 END) as open, + SUM(CASE WHEN status ='assigned' THEN 1 ELSE 0 END) as assigned, + SUM(CASE WHEN status in ('closed', 'resolved') THEN 1 ELSE 0 END) as closed, + SUM(CASE WHEN status ='reassignrequested' THEN 1 ELSE 0 END) as reassignrequested, + SUM(CASE WHEN status ='rejected' THEN 1 ELSE 0 END) as rejected, + count(status) as total + from eg_pgr_service + INNER JOIN (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) ON deptmap.serviceCode = eg_pgr_service.servicecode + INNER JOIN (VALUES tbl_def_dept) AS deptmap_def(name,code) ON deptmap.department = deptmap_def.code + WHERE tenantid != 'pb.testing' + groupby: GROUP BY tenantid,deptmap_def.name + orderby: ORDER BY tenantid,deptmap_def.name + +- reportName: ULBDepartmentReport + summary: Fetches complaint stats based on department types for a ULB + version: 1.0.0 + moduleName: rainmaker-pgr + externalService: + - entity: $.MdmsRes.RAINMAKER-PGR.ServiceDefs + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=RAINMAKER-PGR&masterName=ServiceDefs&tenantId=$tenantId + keyOrder: serviceCode,department,slaHours + tableName: tbl_dept + - entity: $.MdmsRes.common-masters.Department + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=common-masters&masterName=Department&tenantId=$tenantId + keyOrder: name,code + tableName: tbl_def_dept + sourceColumns: + - name: department + label: reports.rainmaker-pgr.department + type: string + source: eg_pgr_service + total: false + - name: rejected + label: reports.rainmaker-pgr.rejected + type: string + source: pgr_data + total: true + - name: resolved + label: reports.rainmaker-pgr.resolved + type: string + source: pgr_data + total: true + - name: resolvedoutsidesla + label: reports.rainmaker-pgr.resolvedoutsidesla + type: string + source: pgr_data + total: true + - name: open + label: reports.rainmaker-pgr.open + type: string + source: pgr_data + total: true + - name: assigned + label: reports.rainmaker-pgr.assigned + type: string + source: pgr_data + total: true + - name: outsidesla + label: reports.rainmaker-pgr.outsidesla + type: string + source: pgr_data + total: true + searchParams: + - name: fromDate + label: reports.rainmaker-pgr.datefrom + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND pgr_data.createdtime >= $fromDate + - name: toDate + label: reports.rainmaker-pgr.dateto + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND pgr_data.createdtime <= $toDate + query: | + with pgr_data as (select + servicerequestid, + servicecode, + createdtime, + status, + (select max("when") from eg_pgr_action where action='resolve' and businesskey = servicerequestid) as resolvedtime, + (select min("when") from eg_pgr_action where action='open' and businesskey = servicerequestid) as opentime + from eg_pgr_service as ps + where + tenantid = $tenantid) + + select + deptmap_def.name as department, + count(*) as total, + SUM (CASE WHEN status in ('rejected') THEN 1 ELSE 0 END) as rejected, + SUM (CASE WHEN status in ('closed', 'resolved') THEN 1 ELSE 0 END) as resolved, + SUM (CASE WHEN status in ('closed', 'resolved') and (resolvedtime - opentime) >= 14 * 86400 * 1000 THEN 1 ELSE 0 END) as resolvedoutsidesla, + SUM (CASE WHEN status in ('assigned', 'reassignrequested') THEN 1 ELSE 0 END) as assigned, + SUM (CASE WHEN status in ('open') THEN 1 ELSE 0 END) as open, + SUM (CASE WHEN status in ('assigned', 'reassignrequested', 'open') and (extract(epoch from now()) * 1000 - opentime) >= 14 * 86400 * 1000 THEN 1 ELSE 0 END) as outsidesla + from pgr_data + INNER JOIN (VALUES tbl_dept) AS deptmap(serviceCode, department, slaHours) ON deptmap.serviceCode = pgr_data.servicecode + INNER JOIN (VALUES tbl_def_dept) AS deptmap_def(name,code) ON deptmap.department = deptmap_def.code + WHERE 1=1 + groupby: GROUP BY deptmap_def.name + orderby: ORDER BY deptmap_def.name + +- reportName: ULBEmployeeWiseReport + summary: Fetches employee wise assignment report + version: 1.0.0 + moduleName: rainmaker-pgr + sourceColumns: + - name: employee + label: reports.rainmaker-pgr.employee + type: string + source: pgr_data + total: false + - name: rejected + label: reports.rainmaker-pgr.rejected + type: string + source: pgr_data + total: true + - name: resolved + label: reports.rainmaker-pgr.resolved + type: string + source: pgr_data + total: true + - name: resolvedoutsidesla + label: reports.rainmaker-pgr.resolvedoutsidesla + type: string + source: pgr_data + total: true + - name: open + label: reports.rainmaker-pgr.open + type: string + source: pgr_data + total: true + - name: assigned + label: reports.rainmaker-pgr.assigned + type: string + source: pgr_data + total: true + - name: outsidesla + label: reports.rainmaker-pgr.outsidesla + type: string + source: pgr_data + total: true + searchParams: + - name: fromDate + label: reports.rainmaker-pgr.datefrom + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND pgr_data.createdtime >= $fromDate + - name: toDate + label: reports.rainmaker-pgr.dateto + type: epoch + source: eg_pgr_service + isMandatory: false + searchClause: AND pgr_data.createdtime <= $toDate + query: | + with pgr_data as (select + (select assignee from eg_pgr_action as pa where + pa.businesskey = ps.servicerequestid + and pa."action" in ('assign', 'reassign') + order by "when" desc + fetch first 1 rows only + ) as assignee, + servicerequestid, + createdtime, + status, + (select max("when") from eg_pgr_action where action='resolve' and businesskey = servicerequestid) as resolvedtime, + (select min("when") from eg_pgr_action where action='open' and businesskey = servicerequestid) as opentime + from eg_pgr_service as ps + where + tenantid = $tenantid) + + select + coalesce((select name from eg_user where id::varchar = assignee),'-- Unassigned --') as employee, + SUM (CASE WHEN status in ('rejected') THEN 1 ELSE 0 END) as rejected, + SUM (CASE WHEN status in ('closed', 'resolved') THEN 1 ELSE 0 END) as resolved, + SUM (CASE WHEN status in ('closed', 'resolved') and (resolvedtime - opentime) >= 14 * 86400 * 1000 THEN 1 ELSE 0 END) as resolvedoutsidesla, + SUM (CASE WHEN status in ('assigned', 'reassignrequested') THEN 1 ELSE 0 END) as assigned, + SUM (CASE WHEN status in ('open') THEN 1 ELSE 0 END) as open, + SUM (CASE WHEN status in ('assigned', 'reassignrequested', 'open') and (extract(epoch from now()) * 1000 - opentime) >= 14 * 86400 * 1000 THEN 1 ELSE 0 END) as outsidesla + from pgr_data + WHERE 1=1 + orderby: ORDER BY assignee NULLS FIRST + groupby: GROUP BY assignee diff --git a/configs/reports/configs/rainmaker-pt-reports.yml b/configs/reports/configs/rainmaker-pt-reports.yml new file mode 100644 index 00000000..6203a4e5 --- /dev/null +++ b/configs/reports/configs/rainmaker-pt-reports.yml @@ -0,0 +1,1093 @@ +--- +ReportDefinitions: +- reportName: ReceiptRegister + summary: Receipt Register + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: receiptnumber + label: reports.pt.receiptNo + type: string + source: pt + total: false + - name: transactiondate + label: reports.pt.receiptDate + type: string + source: pt + total: false + - name: g8issuedate + label: reports.pt.g8issuedate + type: string + source: pt + total: false + - name: g8receiptno + label: reports.pt.g8receiptno + type: string + source: pt + total: false + - name: amount + label: reports.pt.amount + type: string + source: pt + total: true + - name: propertytax + label: reports.pt.propertyTax + type: string + source: pt + total: true + - name: firecess + label: reports.pt.fireCess + type: string + source: pt + total: true + - name: cancercess + label: reports.pt.cancerCess + type: string + source: pt + total: true + - name: rebate + label: reports.pt.rebate + type: string + source: pt + total: true + - name: adhocrebate + label: reports.pt.adhocrebate + type: string + source: pt + total: true + - name: penalty + label: reports.pt.penalty + type: string + source: pt + total: true + - name: adhocpenalty + label: reports.pt.adhocpenalty + type: string + source: pt + total: true + - name: interest + label: reports.pt.interest + type: string + source: pt + total: true + - name: exemption + label: reports.pt.exemption + type: string + source: pt + total: true + - name: adjusment + label: reports.pt.roundoff + type: string + source: pt + total: true + - name: pendingamount + label: reports.pt.pendingamount + type: string + source: pt + total: true + - name: propertyid + label: reports.pt.propertyId + type: string + source: pt + total: false + - name: usagetype + label: reports.pt.usagetype + type: string + source: pt + total: false + - name: assessmentnumber + label: reports.pt.assessmentNo + type: string + source: pt + total: false + - name: financialyear + label: reports.pt.financialYear + type: string + source: pt + total: false + - name: instrumenttype + label: reports.pt.paymentMode + type: string + source: pt + total: false + - name: transactionnumber + label: reports.pt.ddChequeTransactionNo + type: string + source: pt + total: false + - name: bankname + label: reports.pt.bankName + type: string + source: pt + total: false + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: false + searchClause: AND rh.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: false + searchClause: AND rh.receiptdate <= $toDate + - name: paymentMode + label: Payment Mode + type: singlevaluelist + pattern: 'list://Cash:Cash,Online:Online,Card:Card,DD:DD,Cheque:Cheque' + source: pt + isMandatory: false + searchClause: AND instrumenttype = $paymentMode + - name: financialyear + label: Financial Year + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name + source: pt + wrapper: true + isMandatory: false + searchClause: AND financialyear = $financialyear + - name: localityArray + label: reports.pt.zoneList + type: boundarylist + source: pt + isMandatory: false + searchClause: AND pt_addr.locality IN ($localityArray) + query: | + -- Use CTE to force query plan, compute & use CTE later + WITH receipt_breakup AS ( + SELECT + receiptheader, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocrebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, + SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, + (SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END)) + as propertytax, + SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN adjustedamount ELSE 0 END) as exemption, + (SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END)) as adjusment + FROM egcl_receiptdetails_v1 + WHERE tenantid LIKE $tenantid + GROUP BY receiptheader + ) + SELECT + rh.tenantid AS tenantid, + rh.id, + Substring(rh.consumercode, '(.*):') AS propertyid, + Substring(rh.consumercode, ':(.*)') AS assessmentnumber, + rh.consumercode, + rh.receiptdate, + To_char(To_timestamp(rh.receiptdate / 1000), 'DD/MM/YYYY') AS transactiondate, + bankid AS bankname, + receiptnumber, + amount, + instrumenttype, + transactionnumber, + receipt_breakup.*, + rh.totalamount - ih.amount AS pendingamount, + pt_detail.financialyear, + To_char(To_timestamp(rh.manualreceiptdate / 1000), 'DD/MM/YYYY') AS g8issuedate, + Initcap(COALESCE(pt_detail.usagecategoryminor, pt_detail.usagecategorymajor)) as usagetype, + manualreceiptnumber as g8receiptno + FROM egcl_receiptheader_v1 AS rh + JOIN egcl_receiptinstrument_v1 AS ri ON rh.id = ri.receiptheader + JOIN egcl_instrumentheader_v1 AS ih ON ih.id = ri.instrumentheader + JOIN receipt_breakup ON rh.id = receipt_breakup.receiptheader + JOIN eg_pt_propertydetail_v2 pt_detail ON CONCAT(pt_detail.property, ':', pt_detail.assessmentnumber) = rh.consumercode + JOIN eg_pt_address_v2 pt_addr ON pt_detail.property = pt_addr.property + WHERE rh.tenantid LIKE $tenantid and rh.status != 'Cancelled' + orderby: ORDER BY rh.receiptdate DESC + +- reportName: CancelledReceiptRegister + summary: Receipt Register for cancelled Receipts + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: receiptnumber + label: reports.pt.receiptNo + type: string + source: pt + total: false + - name: status + label: reports.pt.status + type: string + source: pt + total: false + - name: transactiondate + label: reports.pt.receiptDate + type: string + source: pt + total: false + - name: g8issuedate + label: reports.pt.g8issuedate + type: string + source: pt + total: false + - name: g8receiptno + label: reports.pt.g8receiptno + type: string + source: pt + total: false + - name: amount + label: reports.pt.amount + type: string + source: pt + total: true + - name: propertytax + label: reports.pt.propertyTax + type: string + source: pt + total: true + - name: firecess + label: reports.pt.fireCess + type: string + source: pt + total: true + - name: cancercess + label: reports.pt.cancerCess + type: string + source: pt + total: true + - name: rebate + label: reports.pt.rebate + type: string + source: pt + total: true + - name: adhocrebate + label: reports.pt.adhocrebate + type: string + source: pt + total: true + - name: penalty + label: reports.pt.penalty + type: string + source: pt + total: true + - name: adhocpenalty + label: reports.pt.adhocpenalty + type: string + source: pt + total: true + - name: interest + label: reports.pt.interest + type: string + source: pt + total: true + - name: exemption + label: reports.pt.exemption + type: string + source: pt + total: true + - name: adjusment + label: reports.pt.roundoff + type: string + source: pt + total: true + - name: propertyid + label: reports.pt.propertyId + type: string + source: pt + total: false + - name: usagetype + label: reports.pt.usagetype + type: string + source: pt + total: false + - name: assessmentnumber + label: reports.pt.assessmentNo + type: string + source: pt + total: false + - name: financialyear + label: reports.pt.financialYear + type: string + source: pt + total: false + - name: instrumenttype + label: reports.pt.paymentMode + type: string + source: pt + total: false + - name: transactionnumber + label: reports.pt.ddChequeTransactionNo + type: string + source: pt + total: false + - name: bankname + label: reports.pt.bankName + type: string + source: pt + total: false + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: false + searchClause: AND rh.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: false + searchClause: AND rh.receiptdate <= $toDate + - name: paymentMode + label: Payment Mode + type: singlevaluelist + pattern: 'list://Cash:Cash,Online:Online,Card:Card,DD:DD,Cheque:Cheque' + source: pt + isMandatory: false + searchClause: AND instrumenttype = $paymentMode + - name: financialyear + label: Financial Year + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name + source: pt + wrapper: true + isMandatory: false + searchClause: AND financialyear = $financialyear + - name: localityArray + label: reports.pt.zoneList + type: boundarylist + source: pt + isMandatory: false + searchClause: AND pt_addr.locality IN ($localityArray) + query: | + -- Use CTE to force query plan, compute & use CTE later + WITH receipt_breakup AS ( + SELECT + receiptheader, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocrebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, + SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, + (SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END)) + as propertytax, + SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN adjustedamount ELSE 0 END) as exemption, + (SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END)) as adjusment + FROM egcl_receiptdetails_v1 + WHERE tenantid LIKE $tenantid + GROUP BY receiptheader + ) + SELECT + rh.tenantid AS tenantid, + rh.id, + Substring(rh.consumercode, '(.*):') AS propertyid, + Substring(rh.consumercode, ':(.*)') AS assessmentnumber, + rh.status, + rh.consumercode, + rh.receiptdate, + To_char(To_timestamp(rh.receiptdate / 1000), 'DD/MM/YYYY') AS transactiondate, + bankid AS bankname, + receiptnumber, + amount, + instrumenttype, + transactionnumber, + receipt_breakup.*, + rh.totalamount - ih.amount AS pendingamount, + pt_detail.financialyear, + To_char(To_timestamp(rh.manualreceiptdate / 1000), 'DD/MM/YYYY') AS g8issuedate, + Initcap(COALESCE(pt_detail.usagecategoryminor, pt_detail.usagecategorymajor)) as usagetype, + manualreceiptnumber as g8receiptno + FROM egcl_receiptheader_v1 AS rh + JOIN egcl_receiptinstrument_v1 AS ri ON rh.id = ri.receiptheader + JOIN egcl_instrumentheader_v1 AS ih ON ih.id = ri.instrumentheader + JOIN receipt_breakup ON rh.id = receipt_breakup.receiptheader + JOIN eg_pt_propertydetail_v2 pt_detail ON CONCAT(pt_detail.property, ':', pt_detail.assessmentnumber) = rh.consumercode + JOIN eg_pt_address_v2 pt_addr ON pt_detail.property = pt_addr.property + WHERE rh.tenantid LIKE $tenantid and rh.status = 'Cancelled' + orderby: ORDER BY rh.receiptdate DESC + +- reportName: OldUlbWisePtCollection + summary: ULB-wise PT Collection + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: totalassessments + label: reports.pt.totalassessments + type: string + source: pt + total: true + - name: totalamountpaid + label: reports.pt.totalamountpaid + type: string + source: pt + total: true + - name: totalamountdue + label: reports.pt.totalamountdue + type: string + source: pt + total: true + searchParams: + - name: financialyear + label: Financial Year + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name + source: pt + wrapper: true + isMandatory: false + searchClause: AND financialyear = $financialyear + - name: usage + label: Usage + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=PropertyTax&masterName=UsageCategoryMajor|$..code|$..name + source: pt + wrapper: true + isMandatory: false + searchClause: AND usagecategorymajor = $usage + query: | + SELECT + tenantid, + COUNT(*) AS totalassessments, + SUM(totalamount) AS totalamount, + SUM(amount) AS totalamountpaid, + (SUM(totalamount) - SUM(amount)) AS totalamountdue + FROM eg_pt_propertydetail_v2 AS pd + LEFT OUTER JOIN + (SELECT consumercode, totalamount, amount FROM egcl_receiptheader_v1 AS rh + LEFT OUTER JOIN egcl_receiptinstrument_v1 AS ri ON rh.id = ri.receiptheader + LEFT OUTER JOIN egcl_instrumentheader_v1 AS ih ON ri.instrumentheader = ih.id + and ih.instrumentstatus != 'CANCELLED' + where rh.status != 'Cancelled' + ) AS instrument_data ON CONCAT(pd.property, ':', pd.assessmentnumber) = instrument_data.consumercode + WHERE tenantid = $tenantid + groupby: GROUP BY tenantid + orderby: ORDER BY tenantid, totalamountpaid DESC NULLS LAST + +- reportName: StateCancelledReceiptRegister + summary: Receipt Register for cancelled Receipts State + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: tenantid + label: reports.pt.ulbName + type: string + source: pt + total: false + - name: receiptnumber + label: reports.pt.receiptNo + type: string + source: pt + total: false + - name: status + label: reports.pt.status + type: string + source: pt + total: false + - name: transactiondate + label: reports.pt.receiptDate + type: string + source: pt + total: false + - name: g8issuedate + label: reports.pt.g8issuedate + type: string + source: pt + total: false + - name: g8receiptno + label: reports.pt.g8receiptno + type: string + source: pt + total: false + - name: amount + label: reports.pt.amount + type: string + source: pt + total: true + - name: propertytax + label: reports.pt.propertyTax + type: string + source: pt + total: true + - name: firecess + label: reports.pt.fireCess + type: string + source: pt + total: true + - name: cancercess + label: reports.pt.cancerCess + type: string + source: pt + total: true + - name: rebate + label: reports.pt.rebate + type: string + source: pt + total: true + - name: adhocrebate + label: reports.pt.adhocrebate + type: string + source: pt + total: true + - name: penalty + label: reports.pt.penalty + type: string + source: pt + total: true + - name: adhocpenalty + label: reports.pt.adhocpenalty + type: string + source: pt + total: true + - name: interest + label: reports.pt.interest + type: string + source: pt + total: true + - name: exemption + label: reports.pt.exemption + type: string + source: pt + total: true + - name: adjusment + label: reports.pt.roundoff + type: string + source: pt + total: true + - name: propertyid + label: reports.pt.propertyId + type: string + source: pt + total: false + - name: usagetype + label: reports.pt.usagetype + type: string + source: pt + total: false + - name: assessmentnumber + label: reports.pt.assessmentNo + type: string + source: pt + total: false + - name: financialyear + label: reports.pt.financialYear + type: string + source: pt + total: false + - name: instrumenttype + label: reports.pt.paymentMode + type: string + source: pt + total: false + - name: transactionnumber + label: reports.pt.ddChequeTransactionNo + type: string + source: pt + total: false + - name: bankname + label: reports.pt.bankName + type: string + source: pt + total: false + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: false + searchClause: AND rh.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: false + searchClause: AND rh.receiptdate <= $toDate + - name: paymentMode + label: Payment Mode + type: singlevaluelist + pattern: 'list://Cash:Cash,Online:Online,Card:Card,DD:DD,Cheque:Cheque' + source: pt + isMandatory: false + searchClause: AND instrumenttype = $paymentMode + - name: financialyear + label: Financial Year + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name + source: pt + wrapper: true + isMandatory: false + searchClause: AND financialyear = $financialyear + query: | + -- Use CTE to force query plan, compute & use CTE later + WITH receipt_breakup AS ( + SELECT + receiptheader, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocrebate, + SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, + SUM(CASE WHEN taxheadcode LIKE 'PT_FIRE_CESS' THEN adjustedamount ELSE 0 END) as firecess, + SUM(CASE WHEN taxheadcode LIKE 'PT_CANCER_CESS' THEN adjustedamount ELSE 0 END) as cancercess, SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as interest, SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as penalty, + SUM(CASE WHEN taxheadcode LIKE 'PT_TIME_REBATE' THEN adjustedamount ELSE 0 END) as rebate, + (SUM(CASE WHEN taxheadcode LIKE 'PT_TAX' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END)) + as propertytax, + SUM(CASE WHEN taxheadcode LIKE 'PT_UNIT_USAGE_EXEMPTION' THEN adjustedamount ELSE 0 END) as exemption, + (SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_CREDIT' THEN adjustedamount ELSE 0 END) + + SUM(CASE WHEN taxheadcode LIKE 'PT_DECIMAL_CEILING_DEBIT' THEN adjustedamount ELSE 0 END)) as adjusment + FROM egcl_receiptdetails_v1 + WHERE tenantid != 'pb.testing' + GROUP BY receiptheader + ) + SELECT + initcap(split_part(rh.tenantid, '.', 2)) as tenantid, + rh.id, + Substring(rh.consumercode, '(.*):') AS propertyid, + Substring(rh.consumercode, ':(.*)') AS assessmentnumber, + rh.status, + rh.consumercode, + rh.receiptdate, + To_char(To_timestamp(rh.receiptdate / 1000), 'DD/MM/YYYY') AS transactiondate, + bankid AS bankname, + receiptnumber, + amount, + instrumenttype, + transactionnumber, + receipt_breakup.*, + pt_detail.financialyear, + To_char(To_timestamp(rh.manualreceiptdate / 1000), 'DD/MM/YYYY') AS g8issuedate, + Initcap(COALESCE(pt_detail.usagecategoryminor, pt_detail.usagecategorymajor)) as usagetype, + manualreceiptnumber as g8receiptno + FROM egcl_receiptheader_v1 AS rh + JOIN egcl_receiptinstrument_v1 AS ri ON rh.id = ri.receiptheader + JOIN egcl_instrumentheader_v1 AS ih ON ih.id = ri.instrumentheader + JOIN receipt_breakup ON rh.id = receipt_breakup.receiptheader + JOIN eg_pt_propertydetail_v2 pt_detail ON CONCAT(pt_detail.property, ':', pt_detail.assessmentnumber) = rh.consumercode + JOIN eg_pt_address_v2 pt_addr ON pt_detail.property = pt_addr.property + WHERE rh.tenantid != 'pb.testing' and rh.status = 'Cancelled' + orderby: ORDER BY rh.receiptdate DESC + +- reportName: StateWidePtCollection + summary: State Wide PT Collection + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: tenantid + label: reports.pt.ulbName + type: string + source: pt + total: false + - name: totalassessments + label: reports.pt.totalassessments + type: string + source: pt + total: true + - name: totalamountpaid + label: reports.pt.totalamountpaid + type: string + source: pt + total: true + - name: totaloffline + label: reports.pt.totaloffline + type: string + source: pt + total: true + - name: totalonline + label: reports.pt.totalonline + type: string + source: pt + total: true + - name: totalamountdue + label: reports.pt.totalamountdue + type: string + source: pt + total: true + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: false + searchClause: AND receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: false + searchClause: AND receiptdate <= $toDate + - name: ulb + label: ULB + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: pt + wrapper: true + isMandatory: false + searchClause: AND tenantid = $ulb + - name: financialyear + label: Financial Year + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name + source: pt + wrapper: true + isMandatory: false + searchClause: AND financialyear = $financialyear + - name: usage + label: Usage + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=PropertyTax&masterName=UsageCategoryMajor|$..code|$..name + source: pt + wrapper: true + isMandatory: false + searchClause: AND usagecategorymajor = $usage + query: | + SELECT + initcap(split_part(tenantid, '.', 2)) as tenantid, + COUNT(*) AS totalassessments, + SUM(totalamount) AS totalamount, + SUM(amount) AS totalamountpaid, + SUM(CASE WHEN collectiontype LIKE 'ONLINE' THEN amount ELSE 0 END) AS totalonline, + SUM(CASE WHEN collectiontype LIKE 'COUNTER' THEN amount ELSE 0 END) AS totaloffline, + (SUM(totalamount) - SUM(amount)) AS totalamountdue + FROM eg_pt_propertydetail_v2 AS pd + LEFT OUTER JOIN (SELECT consumercode, totalamount, amount, collectiontype, receiptdate FROM egcl_receiptheader_v1 AS rh + LEFT OUTER JOIN egcl_receiptinstrument_v1 AS ri ON rh.id = ri.receiptheader + LEFT OUTER JOIN egcl_instrumentheader_v1 AS ih ON ri.instrumentheader = ih.id and ih.instrumentstatus != 'CANCELLED' + where rh.status != 'Cancelled' + ) AS tbl_amounts ON CONCAT(pd.property, ':', pd.assessmentnumber) = tbl_amounts.consumercode + WHERE tenantid LIKE CONCAT(SPLIT_PART($tenantid, '.', 1), '%') and tenantid != 'pb.testing' + groupby: GROUP BY tenantid + orderby: ORDER BY tenantid, totalamountpaid DESC NULLS LAST + +- reportName: UlbWisePtCollection + summary: State Wide PT Collection + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: totalassessments + label: reports.pt.totalassessments + type: string + source: pt + total: true + - name: totalamountpaid + label: reports.pt.totalamountpaid + type: string + source: pt + total: true + - name: totaloffline + label: reports.pt.totaloffline + type: string + source: pt + total: true + - name: totalonline + label: reports.pt.totalonline + type: string + source: pt + total: true + - name: totalamountdue + label: reports.pt.totalamountdue + type: string + source: pt + total: true + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: false + searchClause: AND receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: false + searchClause: AND receiptdate <= $toDate + - name: financialyear + label: Financial Year + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=egf-master&masterName=FinancialYear|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].code|$.MdmsRes.egf-master.FinancialYear.[?(@.module=='PT')].name + source: pt + wrapper: true + isMandatory: false + searchClause: AND financialyear = $financialyear + - name: usage + label: Usage + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=PropertyTax&masterName=UsageCategoryMajor|$..code|$..name + source: pt + wrapper: true + isMandatory: false + searchClause: AND usagecategorymajor = $usage + query: | + SELECT + initcap(split_part(tenantid, '.', 2)) as tenantid, + COUNT(*) AS totalassessments, + SUM(totalamount) AS totalamount, + SUM(amount) AS totalamountpaid, + SUM(CASE WHEN collectiontype LIKE 'ONLINE' THEN amount ELSE 0 END) AS totalonline, + SUM(CASE WHEN collectiontype LIKE 'COUNTER' THEN amount ELSE 0 END) AS totaloffline, + (SUM(totalamount) - SUM(amount)) AS totalamountdue + FROM eg_pt_propertydetail_v2 AS pd + LEFT OUTER JOIN (SELECT consumercode, totalamount, amount, collectiontype, receiptdate FROM egcl_receiptheader_v1 AS rh + LEFT OUTER JOIN egcl_receiptinstrument_v1 AS ri ON rh.id = ri.receiptheader + LEFT OUTER JOIN egcl_instrumentheader_v1 AS ih ON ri.instrumentheader = ih.id and ih.instrumentstatus != 'CANCELLED' + where rh.status != 'Cancelled' + ) AS tbl_amounts ON CONCAT(pd.property, ':', pd.assessmentnumber) = tbl_amounts.consumercode + WHERE tenantid LIKE CONCAT(SPLIT_PART($tenantid, '.', 1), '%') and tenantid = $tenantid + groupby: GROUP BY tenantid + orderby: ORDER BY tenantid, totalamountpaid DESC NULLS LAST + + +- reportName: ULBPTDataDumpReport + summary: ULB level report + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: ulb + label: reports.pt.ulb + type: string + source: pt + total: false + - name: propertytaxuniqueid + label: reports.pt.propertytaxuniqueid + type: string + source: pt + total: false + - name: transcationdate + label: reports.pt.transcationdate + type: string + source: pt + total: false + - name: receiptnumber + label: reports.pt.receiptnumber + type: string + source: pt + total: false + - name: existingpropertyid + label: reports.pt.existingpropertyid + type: string + source: pt + total: false + - name: ownername + label: reports.pt.ownername + type: string + source: pt + total: false + - name: guardianname + label: reports.pt.guardianname + type: string + source: pt + total: false + - name: totalarea + label: reports.pt.totalarea + type: string + source: pt + total: false + - name: builtarea + label: reports.pt.builtarea + type: string + source: pt + total: false + - name: floors + label: reports.pt.floors + type: string + source: pt + total: false + - name: occupancy + label: reports.pt.occupancy + type: string + source: pt + total: false + - name: propertytype + label: reports.pt.propertytype + type: string + source: pt + total: false + - name: mobileno + label: reports.pt.mobileno + type: string + source: pt + total: false + - name: transcationmode + label: reports.pt.transcationmode + type: string + source: pt + total: false + - name: paymentamount + label: reports.pt.paymentamount + type: string + source: pt + total: true + - name: paymentdate + label: reports.pt.paymentdate + type: string + source: pt + total: false + - name: emailid + label: reports.pt.emailid + type: string + source: pt + total: false + - name: address + label: reports.pt.address + type: string + source: pt + total: false + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: false + searchClause: AND rh.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: false + searchClause: AND rh.receiptdate <= $toDate + query: | + --S.no Service Name ULB Property Tax Unique ID Date Of Transcation Receipt Number Existing Property ID Owner Name Guardian Name Total Area (SQ.YARD) Covered Area/Built Area (SQ.FEET) Floors Occupancy (Rented,Self /Unoccupied) Type Of Property Mobile Number Transcation Mode of Payment Payment Amount Payment Date Email Id Address + with eg_pt_unit_v2_ot as ( + select + propertydetail, + string_agg(distinct pu.occupancytype, ',') as occupancytype, + string_agg(distinct coalesce(usagecategoryminor, usagecategorymajor), ',') as propertytype + from eg_pt_unit_v2 as pu + where pu.tenantid = $tenantid + group by propertydetail + ) + select + distinct on (rh.receiptnumber) + initcap(split_part(rh.tenantid, '.', 2)) as "ulb", + split_part(consumercode, ':', 1) as "propertytaxuniqueid", + to_timestamp(receiptdate/1000) at time zone 'Asia/Kolkata' as "transcationdate", + receiptnumber as "receiptnumber", + pt.oldpropertyid as "existingpropertyid", + eu."name" as "ownername", + eu.guardian as "guardianname", + pd.landarea as "totalarea", + pd.builduparea * 9 as "builtarea", + pd.nooffloors as "floors", + pot.occupancytype as "occupancy", + pot.propertytype as "propertytype", + eu.mobilenumber as "mobileno", + instrumenttype as "transcationmode", + ih.amount as "paymentamount", + to_timestamp(ih.transactiondate/1000) at time zone 'Asia/Kolkata' as "paymentdate", + eu.emailid as "emailid" , + REGEXP_REPLACE(REGEXP_REPLACE(CONCAT(pta.doorno, ',', pta.addressline1, ',', pta.addressline2, ',', pta.buildingname, ',', pta.pincode), ',+', ','), '^,|,$', '') as "address" + from egcl_receiptheader_v1 as rh + inner join egcl_receiptinstrument_v1 as ri on ri.receiptheader = rh.id inner join egcl_instrumentheader_v1 as ih on ih.id = ri.instrumentheader + inner join eg_pt_property_v2 as pt on pt.propertyid = split_part(consumercode, ':', 1) + inner join eg_pt_propertydetail_v2 as pd on pd.assessmentnumber = split_part(consumercode, ':', 2) + inner join eg_pt_owner_v2 as po on po.propertydetail = pd.assessmentnumber + inner join eg_user as eu on eu.uuid = po.userid + inner join eg_pt_address_v2 as pta on pta.property = pt.propertyid + inner join eg_pt_unit_v2_ot as pot on pot.propertydetail = pd.assessmentnumber + where rh.tenantid = $tenantid + +- reportName: PT_NO_PAYMENT_DEFAULTERS + summary: PT NO PAYMENT DEFAULTERS + version: 1.0.0 + moduleName: rainmaker-pt + sourceColumns: + - name: tenantid + label: reports.pt.tenantid + type: string + source: pt + total: false + - name: propertyid + label: reports.pt.propertyid + type: string + source: pt + total: false + - name: surveyid + label: reports.pt.surveyid + type: string + source: pt + total: false + - name: oldpropertyid + label: reports.pt.oldpropertyid + type: string + source: pt + total: false + - name: firmbusinessname + label: reports.pt.firmbusinessname + type: string + source: pt + total: false + - name: address + label: reports.pt.address + type: string + source: pt + total: false + - name: blockname + label: reports.pt.blockname + type: string + source: pt + total: false + - name: zonename + label: reports.pt.zonename + type: string + source: pt + total: false + - name: propertyusagetype + label: reports.pt.propertyusagetype + type: string + source: pt + total: false + - name: propertytype + label: reports.pt.propertytype + type: string + source: pt + total: false + - name: superbuilduparea + label: reports.pt.superbuilduparea + type: string + source: pt + total: false + - name: nooffloors + label: reports.pt.nooffloors + type: string + source: pt + total: false + - name: ownershipcategory + label: reports.pt.ownershipcategory + type: string + source: pt + total: false + - name: source + label: reports.pt.source + type: string + source: pt + total: false + - name: channel + label: reports.pt.channel + type: string + source: pt + total: false + - name: propertystatus + label: reports.pt.propertystatus + type: string + source: pt + total: false + query: | + select + tenantid, + propertyid, + surveyid, + oldpropertyid, + firmbusinessname, + concat(address,' ',localityname) as address, + blockname, + zonename, + propertyusagetype, + propertytype, + superbuilduparea, + nooffloors, + ownershipcategory, + source, + channel, + propertystatus + from report_properties_withoutdemand where tenantid=$tenantid + diff --git a/configs/reports/configs/rainmaker-tl-reports.yml b/configs/reports/configs/rainmaker-tl-reports.yml new file mode 100644 index 00000000..9987e3e4 --- /dev/null +++ b/configs/reports/configs/rainmaker-tl-reports.yml @@ -0,0 +1,781 @@ +--- +ReportDefinitions: +- reportName: TradeLicenseRegistryReport + decryptionPathId: TradeLicenseRegistryReport + summary: TL Receipt Register Report + version: 1.0.0 + moduleName: rainmaker-tl + sourceColumns: + - name: receiptnumber + label: report.tl.receiptnumber + type: string + source: tl + total: false + - name: receiptIssueDate + label: report.tl.receiptissuedate + type: string + source: tl + total: false + - name: g8issuedate + label: report.tl.g8issuedate + type: string + source: tl + total: false + - name: g8receiptno + label: report.tl.g8receiptno + type: string + source: tl + total: false + - name: licensenumber + label: report.tl.licensenumber + type: string + source: tl + total: false + - name: formattedIssuedDate + label: report.tl.issueddate + type: string + source: tl + total: false + - name: name + label: report.tl.user.name + type: string + source: tl + total: false + - name: mobilenumber + label: report.tl.user.mobilenumber + type: string + source: tl + total: false + - name: bankid + label: report.tl.bankid + type: string + source: tl + total: false + - name: branchname + label: report.tl.branchname + type: string + source: tl + total: false + - name: transactionumber + label: report.tl.transactionumber + type: string + source: tl + total: false + - name: instrumenttype + label: report.tl.instrumenttype + type: string + source: tl + total: false + - name: status + label: report.tl.status + type: string + source: tl + total: false + - name: tradeTypeName + label: report.tl.tradetype + type: string + source: tl + total: true + - name: acc + label: report.tl.accessorycategories + type: string + source: tl + total: false + - name: tradeName + label: report.tl.tradeName + type: string + source: tl + total: false + - name: totalamount + label: report.tl.receipt.totalamount + type: string + source: tl + total: true + searchParams: + - name: fromDate + label: reports.tl.fromDate + type: epoch + source: tl + isMandatory: false + searchClause: AND receipt.createddate >= $fromDate + - name: toDate + label: reports.tl.toDate + type: epoch + source: tl + isMandatory: false + searchClause: AND receipt.createddate <= $toDate + query: | + SELECT + licensenumber, + to_char(To_timestamp(issueddate / 1000), 'DD/MM/YYYY') as formattedIssuedDate, + tl.tradeName, + initcap(tl.status) as status, + to_char(To_timestamp(receipt.receiptdate / 1000), 'DD/MM/YYYY') as receiptIssueDate , + receipt.receiptnumber, + tradeTypeName, + acc, + name, + mobilenumber, + ih.bankid, + ih.branchname, + ih.transactionnumber, + ih.instrumenttype, + amount as totalamount, + To_char(To_timestamp(receipt.manualreceiptdate / 1000), 'DD/MM/YYYY') AS g8issuedate, + receipt.manualreceiptnumber as g8receiptno + + FROM eg_tl_tradelicense tl + INNER JOIN eg_tl_tradelicensedetail tld ON tld.tradelicenseid = tl.id + INNER JOIN ( + SELECT tradelicensedetailid,array_to_string(array_agg(message.message),', ') as tradeTypeName FROM eg_tl_tradeunit + INNER JOIN message ON split_part(message.code,'_',2) = tradeType AND message.locale = 'en_IN' GROUP BY 1) tlunit ON tlunit.tradelicensedetailid = tld.id + INNER JOIN ( + SELECT tradelicensedetailid, array_to_string(array_agg(name),', ') as name, array_to_string(array_agg(mobilenumber),', ') as mobilenumber + FROM eg_tl_owner tlowner + INNER JOIN eg_user tluser ON tluser.uuid = tlowner.id + group by tradelicensedetailid + ) tlown ON tlown.tradelicensedetailid = tld.id + LEFT OUTER JOIN egcl_receiptheader_v1 receipt ON receipt.consumercode = tl.applicationnumber and receipt.status != 'Cancelled' + LEFT OUTER JOIN egcl_receiptinstrument_v1 as ri ON ri.receiptheader = receipt.id + LEFT OUTER JOIN egcl_instrumentheader_v1 as ih ON ih.id = ri.instrumentheader and ih.instrumentstatus != 'CANCELLED' + LEFT OUTER JOIN (SELECT tradelicensedetailid,array_to_string(array_agg(message.message),',') AS acc FROM eg_tl_accessory + LEFT OUTER JOIN message ON split_part(message.code,'_',2) = accessorycategory AND message.locale = 'en_IN' GROUP BY 1 ) tlacc ON tlacc.tradelicensedetailid = tld.id + WHERE tl.Status in ('APPROVED', 'PAID', 'CANCELLED') AND tl.tenantId LIKE $tenantid + +- reportName: StateTradeLicenseCancelledRegistryReport + summary: TL Cancelled Receipt Register Report + version: 1.0.0 + moduleName: rainmaker-tl + sourceColumns: + - name: tenantId + label: report.tl.tenantid + type: string + source: tl + total: false + - name: receiptnumber + label: report.tl.receiptnumber + type: string + source: tl + total: false + - name: receiptIssueDate + label: report.tl.receiptissuedate + type: string + source: tl + total: false + - name: g8issuedate + label: report.tl.g8issuedate + type: string + source: tl + total: false + - name: g8receiptno + label: report.tl.g8receiptno + type: string + source: tl + total: false + - name: licensenumber + label: report.tl.licensenumber + type: string + source: tl + total: false + - name: formattedIssuedDate + label: report.tl.issueddate + type: string + source: tl + total: false + - name: name + label: report.tl.user.name + type: string + source: tl + total: false + - name: mobilenumber + label: report.tl.user.mobilenumber + type: string + source: tl + total: false + - name: bankid + label: report.tl.bankid + type: string + source: tl + total: false + - name: branchname + label: report.tl.branchname + type: string + source: tl + total: false + - name: transactionumber + label: report.tl.transactionumber + type: string + source: tl + total: false + - name: instrumenttype + label: report.tl.instrumenttype + type: string + source: tl + total: false + - name: status + label: report.tl.status + type: string + source: tl + total: false + - name: tradeTypeName + label: report.tl.tradetype + type: string + source: tl + total: false + - name: acc + label: report.tl.accessorycategories + type: string + source: tl + total: false + - name: tradeName + label: report.tl.tradeName + type: string + source: tl + total: false + - name: totalamount + label: report.tl.receipt.totalamount + type: number + source: tl + total: true + searchParams: + - name: fromDate + label: reports.tl.fromDate + type: epoch + source: tl + isMandatory: false + searchClause: AND receipt.createddate >= $fromDate + - name: toDate + label: reports.tl.toDate + type: epoch + source: tl + isMandatory: false + searchClause: AND receipt.createddate <= $toDate + query: | + SELECT + initcap(split_part(tl.tenantId, '.', 2)) as tenantId, + licensenumber, + to_char(To_timestamp(issueddate / 1000), 'DD/MM/YYYY') as formattedIssuedDate, + tl.tradeName, + initcap(tl.status) as status, + to_char(To_timestamp(receipt.receiptdate / 1000), 'DD/MM/YYYY') as receiptIssueDate , + receipt.receiptnumber, + tradeTypeName, + acc, + name, + mobilenumber, + ih.bankid, + ih.branchname, + ih.transactionnumber, + ih.instrumenttype, + amount as totalamount, + To_char(To_timestamp(receipt.manualreceiptdate / 1000), 'DD/MM/YYYY') AS g8issuedate, + receipt.manualreceiptnumber as g8receiptno + + FROM eg_tl_tradelicense tl + INNER JOIN eg_tl_tradelicensedetail tld ON tld.tradelicenseid = tl.id + INNER JOIN ( + SELECT tradelicensedetailid,array_to_string(array_agg(message.message),', ') as tradeTypeName FROM eg_tl_tradeunit + INNER JOIN message ON split_part(message.code,'_',2) = tradeType AND message.locale = 'en_IN' GROUP BY 1) tlunit ON tlunit.tradelicensedetailid = tld.id + INNER JOIN ( + SELECT tradelicensedetailid, array_to_string(array_agg(name),', ') as name, array_to_string(array_agg(mobilenumber),', ') as mobilenumber + FROM eg_tl_owner tlowner + INNER JOIN eg_user tluser ON tluser.uuid = tlowner.id + group by tradelicensedetailid + ) tlown ON tlown.tradelicensedetailid = tld.id + INNER JOIN egcl_receiptheader_v1 receipt ON receipt.consumercode = tl.applicationnumber and receipt.status = 'Cancelled' + INNER JOIN egcl_receiptinstrument_v1 as ri ON ri.receiptheader = receipt.id + INNER JOIN egcl_instrumentheader_v1 as ih ON ih.id = ri.instrumentheader + LEFT OUTER JOIN (SELECT tradelicensedetailid,array_to_string(array_agg(message.message),',') AS acc FROM eg_tl_accessory + LEFT OUTER JOIN message ON split_part(message.code,'_',2) = accessorycategory AND message.locale = 'en_IN' GROUP BY 1 ) tlacc ON tlacc.tradelicensedetailid = tld.id + WHERE tl.tenantId != 'pb.testing' + +- reportName: TradeLicenseCancelledRegistryReport + summary: TL Cancelled Receipt Register Report + version: 1.0.0 + moduleName: rainmaker-tl + sourceColumns: + - name: receiptnumber + label: report.tl.receiptnumber + type: string + source: tl + total: false + - name: receiptIssueDate + label: report.tl.receiptissuedate + type: string + source: tl + total: false + - name: g8issuedate + label: report.tl.g8issuedate + type: string + source: tl + total: false + - name: g8receiptno + label: report.tl.g8receiptno + type: string + source: tl + total: false + - name: licensenumber + label: report.tl.licensenumber + type: string + source: tl + total: false + - name: formattedIssuedDate + label: report.tl.issueddate + type: string + source: tl + total: false + - name: name + label: report.tl.user.name + type: string + source: tl + total: false + - name: mobilenumber + label: report.tl.user.mobilenumber + type: string + source: tl + total: false + - name: bankid + label: report.tl.bankid + type: string + source: tl + total: false + - name: branchname + label: report.tl.branchname + type: string + source: tl + total: false + - name: transactionumber + label: report.tl.transactionumber + type: string + source: tl + total: false + - name: instrumenttype + label: report.tl.instrumenttype + type: string + source: tl + total: false + - name: status + label: report.tl.status + type: string + source: tl + total: false + - name: tradeTypeName + label: report.tl.tradetype + type: string + source: tl + total: false + - name: acc + label: report.tl.accessorycategories + type: string + source: tl + total: false + - name: tradeName + label: report.tl.tradeName + type: string + source: tl + total: false + - name: totalamount + label: report.tl.receipt.totalamount + type: number + source: tl + total: true + searchParams: + - name: fromDate + label: reports.tl.fromDate + type: epoch + source: tl + isMandatory: false + searchClause: AND receipt.createddate >= $fromDate + - name: toDate + label: reports.tl.toDate + type: epoch + source: tl + isMandatory: false + searchClause: AND receipt.createddate <= $toDate + query: | + SELECT + licensenumber, + to_char(To_timestamp(issueddate / 1000), 'DD/MM/YYYY') as formattedIssuedDate, + tl.tradeName, + initcap(tl.status) as status, + to_char(To_timestamp(receipt.receiptdate / 1000), 'DD/MM/YYYY') as receiptIssueDate , + receipt.receiptnumber, + tradeTypeName, + acc, + name, + mobilenumber, + ih.bankid, + ih.branchname, + ih.transactionnumber, + ih.instrumenttype, + amount as totalamount, + To_char(To_timestamp(receipt.manualreceiptdate / 1000), 'DD/MM/YYYY') AS g8issuedate, + receipt.manualreceiptnumber as g8receiptno + + FROM eg_tl_tradelicense tl + INNER JOIN eg_tl_tradelicensedetail tld ON tld.tradelicenseid = tl.id + INNER JOIN ( + SELECT tradelicensedetailid,array_to_string(array_agg(message.message),', ') as tradeTypeName FROM eg_tl_tradeunit + INNER JOIN message ON split_part(message.code,'_',2) = tradeType AND message.locale = 'en_IN' GROUP BY 1) tlunit ON tlunit.tradelicensedetailid = tld.id + INNER JOIN ( + SELECT tradelicensedetailid, array_to_string(array_agg(name),', ') as name, array_to_string(array_agg(mobilenumber),', ') as mobilenumber + FROM eg_tl_owner tlowner + INNER JOIN eg_user tluser ON tluser.uuid = tlowner.id + group by tradelicensedetailid + ) tlown ON tlown.tradelicensedetailid = tld.id + INNER JOIN egcl_receiptheader_v1 receipt ON receipt.consumercode = tl.applicationnumber and receipt.status = 'Cancelled' + INNER JOIN egcl_receiptinstrument_v1 as ri ON ri.receiptheader = receipt.id + INNER JOIN egcl_instrumentheader_v1 as ih ON ih.id = ri.instrumentheader + LEFT OUTER JOIN (SELECT tradelicensedetailid,array_to_string(array_agg(message.message),',') AS acc FROM eg_tl_accessory + LEFT OUTER JOIN message ON split_part(message.code,'_',2) = accessorycategory AND message.locale = 'en_IN' GROUP BY 1 ) tlacc ON tlacc.tradelicensedetailid = tld.id + WHERE tl.tenantId LIKE $tenantid + + +- reportName: TradeWiseCollectionReport + summary: Collection according to tradeTypes + version: 1.0.0 + moduleName: rainmaker-tl + sourceColumns: + - name: transactionNumber + label: report.tl.totalTransaction + type: string + source: tl + total: false + - name: online + label: report.tl.online.collection + type: number + source: tl + total: true + - name: offline + label: report.tl.offline.collection + type: number + source: tl + total: true + - name: total + label: report.tl.totalCollection + type: number + source: tl + total: true + searchParams: + - name: fromDate + label: reports.tl.fromDate + type: epoch + source: tl + isMandatory: false + searchClause: AND rh.receiptdate >= $fromDate + - name: toDate + label: reports.tl.toDate + type: epoch + source: tl + isMandatory: false + searchClause: AND rh.receiptdate <= $toDate + query: | + select + sum(ih.amount) as total, + count(*) as transactionNumber, + sum(case collectiontype when 'COUNTER' then amount else 0 end) as offline, + sum(case collectiontype when 'ONLINE' then amount else 0 end) as online, + initcap(split_part(rh.tenantId, '.', 2)) as tenantId + from egcl_receiptheader_v1 as rh + inner join egcl_receiptinstrument_v1 as ri on ri.receiptheader = rh.id + inner join egcl_instrumentheader_v1 as ih on ih.id = ri.instrumentheader + where rh.businessdetails = 'TL' and rh.status !='Cancelled' and rh.tenantid !='pb.testing' + AND rh.tenantId LIKE $tenantid + groupby: GROUP BY rh.tenantId + +- reportName: TradeLicenseApplicationStatusReport + summary: Nummber of applications by there status + version: 1.0.0 + moduleName: rainmaker-tl + externalService: + - entity: $.messages[*] + apiURL: http://egov-localization:8080/localization/messages/v1/_search?locale=en_IN&tenantId=pb&module=rainmaker-tl + keyOrder: code,message + tableName: tbl_localization + sourceColumns: + - name: status + label: report.tl.status + type: string + source: tl + total: false + - name: total + label: report.tl.total + type: number + source: tl + total: true + searchParams: + - name: fromDate + label: reports.tl.fromDate + type: epoch + source: tl + isMandatory: false + searchClause: AND tl.lastmodifiedtime >= $fromDate + - name: toDate + label: reports.tl.toDate + type: epoch + source: tl + isMandatory: false + searchClause: AND tl.lastmodifiedtime <= $toDate + query: SELECT COUNT(applicationnumber) as total,message.message as status from eg_tl_tradelicense tl LEFT OUTER JOIN message ON split_part(message.code,'_',2) = status AND message.locale = 'en_IN' WHERE tl.tenantid LIKE $tenantid + groupby: GROUP BY message.message + orderby: ORDER BY case message.message when 'Pending Application' then 1 when 'Pending Payment' then 2 when 'Pending Approval' then 3 when 'Approved' then 4 when 'Rejected' then 5 when 'Cancelled' then 6 else 7 end + +- reportName: TradeLicenseULBWiseApplicationStatusReport + summary: Nummber of applications by there status + version: 1.0.0 + moduleName: rainmaker-tl + sourceColumns: + - name: tenantId + label: report.tl.tenantid + type: string + source: tl + total: false + - name: initiated + label: TL_INITIATED + type: number + source: tl + total: true + - name: applied + label: TL_APPLIED + type: number + source: tl + total: true + - name: paid + label: TL_PAID + type: number + source: tl + total: true + - name: approved + label: TL_APPROVED + type: number + source: tl + total: true + - name: rejected + label: TL_REJECTED + type: number + source: tl + total: true + - name: cancelled + label: TL_CANCELLED + type: number + source: tl + total: true + searchParams: + - name: fromDate + label: reports.tl.fromDate + type: epoch + source: tl + isMandatory: false + searchClause: AND tl.lastmodifiedtime >= $fromDate + - name: toDate + label: reports.tl.toDate + type: epoch + source: tl + isMandatory: false + searchClause: AND tl.lastmodifiedtime <= $toDate + query: | + SELECT + initcap(split_part(tenantId, '.', 2)) as tenantId, + SUM(CASE status when 'REJECTED' then 1 else 0 end) as rejected, + SUM(CASE status when 'INITIATED' then 1 else 0 end) as initiated, + SUM(CASE status when 'PAID' then 1 else 0 end) as paid, + SUM(CASE status when 'APPROVED' then 1 else 0 end) as approved, + SUM(CASE status when 'APPLIED' then 1 else 0 end) as applied, + SUM(CASE status when 'CANCELLED' then 1 else 0 end) as cancelled + FROM eg_tl_tradelicense as tl + WHERE tl.tenantid != 'pb.testing' + groupby: GROUP BY tenantid + orderby: ORDER BY tenantid + + +- reportName: StateLevelStatus + summary: Nummber of applications by there status state level + version: 1.0.0 + moduleName: rainmaker-tl + sourceColumns: + - name: status + label: report.tl.status + type: string + source: tl + total: false + - name: total + label: report.tl.total + type: number + source: tl + total: true + searchParams: + - name: fromDate + label: reports.tl.fromDate + type: epoch + source: tl + isMandatory: false + searchClause: AND tl.lastmodifiedtime >= $fromDate + - name: toDate + label: reports.tl.toDate + type: epoch + source: tl + isMandatory: false + searchClause: AND tl.lastmodifiedtime <= $toDate + - name: ulb + label: ULB + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: tl + wrapper: true + isMandatory: false + searchClause: AND tl.tenantId = $ulb + query: SELECT COUNT(applicationnumber) as total,message.message as status from eg_tl_tradelicense tl LEFT OUTER JOIN (select distinct module,code,locale,tenantid,message from message where module='rainmaker-tl' ) as message ON split_part(message.code,'_',2) = status AND message.locale = 'en_IN' WHERE 1=1 + groupby: GROUP BY message.message + orderby: ORDER BY case message.message when 'Pending Application' then 1 when 'Pending Payment' then 2 when 'Pending Approval' then 3 when 'Approved' then 4 when 'Rejected' then 5 when 'Cancelled' then 6 else 7 end + + + +- reportName: StateLevelTradeWiseCollection + summary: Collection according to tradeTypes state level + version: 1.0.0 + moduleName: rainmaker-tl + sourceColumns: + - name: tenantId + label: report.tl.tenantid + type: string + source: tl + total: false + - name: transactionNumber + label: report.tl.totalTransaction + type: string + source: tl + total: true + - name: online + label: report.tl.online.collection + type: number + source: tl + total: true + - name: offline + label: report.tl.offline.collection + type: number + source: tl + total: true + - name: total + label: report.tl.totalCollection + type: number + source: tl + total: true + searchParams: + - name: fromDate + label: reports.tl.fromDate + type: epoch + source: tl + isMandatory: false + searchClause: AND rh.receiptdate >= $fromDate + - name: toDate + label: reports.tl.toDate + type: epoch + source: tl + isMandatory: false + searchClause: AND rh.receiptdate <= $toDate + - name: ulb + label: ULB + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: tl + wrapper: true + isMandatory: false + searchClause: AND tl.tenantId = $ulb + query: | + select + sum(ih.amount) as total, + count(*) as transactionNumber, + sum(case collectiontype when 'COUNTER' then amount else 0 end) as offline, + sum(case collectiontype when 'ONLINE' then amount else 0 end) as online, + initcap(split_part(rh.tenantId, '.', 2)) as tenantId + from egcl_receiptheader_v1 as rh + inner join egcl_receiptinstrument_v1 as ri on ri.receiptheader = rh.id + inner join egcl_instrumentheader_v1 as ih on ih.id = ri.instrumentheader + where rh.businessdetails = 'TL' and rh.status !='Cancelled' and rh.tenantid !='pb.testing' + groupby: GROUP BY rh.tenantId + orderby: ORDER BY rh.tenantId asc + + +- reportName: StateLevelTradeLicenseRegistryReport + summary: TL Basic Report State Level + version: 1.0.0 + moduleName: rainmaker-tl + sourceColumns: + - name: tenantId + label: report.tl.tenantId + type: string + source: tl + total: false + - name: licensenumber + label: report.tl.licensenumber + type: string + source: tl + total: false + - name: formattedIssuedDate + label: report.tl.issueddate + type: string + source: tl + total: false + - name: g8issuedate + label: report.tl.g8issuedate + type: string + source: tl + total: false + - name: g8receiptno + label: report.tl.g8receiptno + type: string + source: tl + total: false + - name: name + label: report.tl.user.name + type: string + source: tl + total: false + - name: mobilenumber + label: report.tl.user.mobilenumber + type: string + source: tl + total: false + - name: tradeTypeName + label: report.tl.tradetype + type: string + source: tl + total: false + - name: acc + label: report.tl.accessorycategories + type: string + source: tl + total: false + - name: tradeName + label: report.tl.tradeName + type: string + source: tl + total: false + - name: totalamount + label: report.tl.receipt.totalamount + type: number + source: tl + total: true + searchParams: + - name: fromDate + label: reports.tl.fromDate + type: epoch + source: tl + isMandatory: false + searchClause: AND issueddate >= $fromDate + - name: toDate + label: reports.tl.toDate + type: epoch + source: tl + isMandatory: false + searchClause: AND issueddate <= $toDate + - name: ulb + label: ULB + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: tl + wrapper: true + isMandatory: false + searchClause: AND tl.tenantId = $ulb + query: SELECT tl.tenantId as tenantId,licensenumber,to_char(To_timestamp(issueddate / 1000), 'DD/MM/YYYY') as formattedIssuedDate,tl.tradeName,tradeTypeName,acc, name,mobilenumber,amount as totalamount,To_char(To_timestamp(receipt.manualreceiptdate / 1000), 'DD/MM/YYYY') AS g8issuedate,receipt.manualreceiptnumber as g8receiptno FROM eg_tl_tradelicense tl INNER JOIN eg_tl_tradelicensedetail tld ON tld.tradelicenseid = tl.id INNER JOIN eg_tl_owner tlowner ON tlowner.tradelicensedetailid = tld.id INNER JOIN (SELECT tradelicensedetailid,message.message as tradeTypeName FROM eg_tl_tradeunit INNER JOIN message ON split_part(message.code,'_',2) = tradeType) tlunit ON tlunit.tradelicensedetailid = tld.id INNER JOIN eg_user tluser ON tluser.uuid = tlowner.id LEFT OUTER JOIN egcl_receiptheader_v1 receipt ON receipt.consumercode = tl.applicationnumber LEFT JOIN egcl_receiptinstrument_v1 as ri ON ri.receiptheader = receipt.id LEFT JOIN egcl_instrumentheader_v1 as ih ON ih.id = ri.instrumentheader LEFT OUTER JOIN (SELECT tradelicensedetailid,array_to_string(array_agg(message.message),',') AS acc FROM eg_tl_accessory LEFT OUTER JOIN message ON split_part(message.code,'_',2) = accessorycategory AND message.locale = 'en_IN' GROUP BY 1 ) tlacc ON tlacc.tradelicensedetailid = tld.id WHERE tl.Status = 'APPROVED' + orderby: ORDER BY tl.tenantId asc diff --git a/configs/reports/configs/swm-reports.yml b/configs/reports/configs/swm-reports.yml new file mode 100644 index 00000000..48c97dfc --- /dev/null +++ b/configs/reports/configs/swm-reports.yml @@ -0,0 +1,135 @@ +ReportDefinitions: +- reportName: DumpingGroundDetailReport + summary: Dumping Ground Details report + version: 1.0.0 + moduleName: swm + externalService: + - entity: $.MdmsRes.swm.DumpingGround + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=swm&masterName=DumpingGround&tenantId=$tenantid + keyOrder: code,name,tenantId,isProcessingSite + tableName: tbl_swmdumpingground + stateData: true + sourceColumns: + - name: dumpinggroundname + label: reports.swm.dumpingground + type: string + source: mdms + - name: date + label: reports.swm.date + type: string + source: egswm_sourcesegregation + - name: wetwastecollected + label: reports.swm.wetwaste + type: number + source: egswm_collectiondetails + - name: drywastecollected + label: reports.swm.drywaste + type: number + source: egswm_collectiondetails + - name: sortdate + label: reports.swm.date + type: string + source: egswm_sourcesegregation + showColumn: false + + searchParams: + - name: dumpinggroundcode + label: reports.swm.dumpingground + type: singlevaluelist + source: mdms + isMandatory: false + stateData: true + wrapper: true + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=swm&masterName=DumpingGround&tenantId=$tenantid|$.MdmsRes.swm.DumpingGround.*.code|$.MdmsRes.swm.DumpingGround.*.name + searchClause: and ssg.dumpingground = $dumpinggroundcode + - name: wasteprocess + label: reports.swm.wasteprocess + type: singlevaluelist + pattern: 'list://false:Dump,true:Process' + source: wastetypeprocess + isMandatory: false + searchClause: and dg.isProcessingSite = $wasteprocess + - name: wastetype + label: reports.swm.wastetype + type: singlevaluelist + pattern: 'list://Wet:Wet,Dry:Dry' + source: wastetype + isMandatory: false + - name: fromDate + label: reports.swm.datefrom + type: epoch + source: egswm_sourcesegregation + isMandatory: true + - name: toDate + label: reports.swm.dateto + type: epoch + source: egswm_sourcesegregation + isMandatory: true + query: select dg.name as dumpinggroundname, CASE WHEN $wastetype = 'Wet' THEN sum(cd.wetwastecollected) WHEN $wastetype = 'Dry' THEN 0 ELSE sum(cd.wetwastecollected) END as wetwastecollected, CASE WHEN $wastetype = 'Wet' THEN 0 WHEN $wastetype = 'Dry' THEN sum(cd.drywastecollected) ELSE sum(cd.drywastecollected) END as drywastecollected, to_char((to_timestamp(ssg.sourcesegregationdate/1000) AT TIME ZONE 'Asia/Kolkata')::date,'dd/mm/yyyy') as date, (to_timestamp(ssg.sourcesegregationdate/1000) AT TIME ZONE 'Asia/Kolkata')::date as sortdate from egswm_collectiondetails cd, egswm_sourcesegregation ssg, (VALUES tbl_swmdumpingground) as dg (code,name,tenantId,isProcessingSite) where cd.sourcesegregation = ssg.code and cd.tenantid = $tenantid and ssg.tenantid = $tenantid and ssg.dumpingground = dg.code and ssg.sourcesegregationdate >= $fromDate and ssg.sourcesegregationdate <= $toDate + groupBy: group by date, dumpinggroundname, sortdate order by dumpinggroundname, sortdate; + +- reportName: ExpenditureIncurredReport + summary: Expenditure incurred on Transportation report + version: 1.0.0 + moduleName: swm + externalService: + - entity: $.MdmsRes.swm.VehicleType + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=swm&masterName=VehicleType&tenantId=$tenantid + keyOrder: code,name,tenantId + tableName: tbl_swmvehicletype + stateData: true + sourceColumns: + - name: date + label: reports.swm.date + type: string + source: egswm_vehiclemaintenancedetails + - name: vehicletype + label: reports.swm.vehicletype + type: string + source: mdms + - name: registrationnumber + label: reports.swm.registrationnumber + type: string + source: egswm_vehicle + - name: fuellingcost + label: reports.swm.fuellingcost + type: number + source: egswm_vehiclefuellingdetails + - name: maintenancecost + label: reports.swm.maintenancecost + type: number + source: egswm_vehiclemaintenancedetails + - name: salary + label: reports.swm.salary + type: string + source: employee + - name: totalcost + label: reports.swm.totalcost + type: number + source: egswm_vehiclemaintenancedetails + searchParams: + - name: vehicle + label: reports.swm.vehicle + type: singlevaluelistac + source: egswm_vehicle + isMandatory: true + wrapper: true + pattern: http://swm-services:8080/swm-services/vehicles/_search?tenantId=$tenantid|$..regNumber|$..regNumber + - name: typeofvehicle + label: reports.swm.vehicletype + type: string + source: egswm_vehicle + isMandatory: false + wrapper: true + pattern: /swm-services/vehicles/_search?tenantId=$tenantid®Numbers={vehicle}|$..vehicleType.name|$..vehicleType.name + - name: fromDate + label: reports.swm.datefrom + type: epoch + source: egswm_vehiclemaintenancedetails + isMandatory: true + - name: toDate + label: reports.swm.dateto + type: epoch + source: egswm_vehiclemaintenancedetails + isMandatory: true + query: select to_char(result.date,'dd/mm/yyyy') as date,COALESCE(sum(result.fuellingcost),0) as fuellingcost,COALESCE(sum(result.maintenancecost),0) as maintenancecost,COALESCE(sum(result.totalcost),0) as totalcost, result.vehicletype as vehicletype, result.registrationnumber registrationnumber,'' as salary from ((select (to_timestamp(vmd.actualmaintenancedate/1000) AT TIME ZONE 'Asia/Kolkata')::date as date,0 as fuellingcost,COALESCE(sum(vmd.costincurred),0) as maintenancecost,COALESCE(sum(vmd.costincurred),0) as totalcost, vt.name as vehicletype,vehicle.regnumber as registrationnumber from egswm_vehicle vehicle, egswm_vehiclemaintenancedetails vmd, (VALUES tbl_swmvehicletype) as vt (code,name,tenantId) where vehicle.regnumber = $vehicle and vehicle.vehicletype = vt.code and vehicle.regnumber = vmd.vehicle and vehicle.tenantid = $tenantid and vmd.tenantid = $tenantid and vmd.actualmaintenancedate >= $fromDate and vmd.actualmaintenancedate <= $toDate group by date, vt.name, registrationnumber) UNION (select (to_timestamp(vfd.transactiondate/1000) AT TIME ZONE 'Asia/Kolkata')::date as date, COALESCE(sum(vfd.totalcostincurred),0) as fuellingcost, 0 as maintenancecost, COALESCE(sum(vfd.totalcostincurred),0) as totalcost, vt.name as vehicletype,vehicle.regnumber as registrationnumber from egswm_vehicle vehicle, egswm_vehiclefuellingdetails vfd, (VALUES tbl_swmvehicletype) as vt (code,name,tenantId) where vehicle.regnumber = $vehicle and vehicle.vehicletype = vt.code and vehicle.regnumber = vfd.vehicle and vehicle.tenantid = $tenantid and vfd.tenantid = $tenantid and vfd.transactiondate >= $fromDate and vfd.transactiondate <= $toDate group by date, vt.name, registrationnumber)) as result group by result.date, result.registrationnumber, result.vehicletype order by result.registrationnumber, result.date, result.vehicletype; diff --git a/configs/reports/configs/tl-reports.yml b/configs/reports/configs/tl-reports.yml new file mode 100644 index 00000000..e023d98a --- /dev/null +++ b/configs/reports/configs/tl-reports.yml @@ -0,0 +1,2990 @@ +--- +ReportDefinitions: +- reportName: TradeLicenseRegistryReport + summary: TL Receipt Register Report + version: 1.0.0 + moduleName: rainmaker-tl + sourceColumns: + - name: receiptnumber + label: report.tl.receiptnumber + type: string + source: tl + total: false + - name: receiptIssueDate + label: report.tl.receiptissuedate + type: string + source: tl + total: false + - name: g8issuedate + label: report.tl.g8issuedate + type: string + source: tl + total: false + - name: g8receiptno + label: report.tl.g8receiptno + type: string + source: tl + total: false + - name: licensenumber + label: report.tl.licensenumber + type: string + source: tl + total: false + - name: formattedIssuedDate + label: report.tl.issueddate + type: string + source: tl + total: false + - name: name + label: report.tl.user.name + type: string + source: tl + total: false + - name: mobilenumber + label: report.tl.user.mobilenumber + type: string + source: tl + total: false + - name: bankid + label: report.tl.bankid + type: string + source: tl + total: false + - name: branchname + label: report.tl.branchname + type: string + source: tl + total: false + - name: transactionnumber + label: report.tl.transactionumber + type: string + source: tl + total: false + - name: instrumenttype + label: report.tl.instrumenttype + type: string + source: tl + total: false + - name: status + label: report.tl.status + type: string + source: tl + total: false + - name: tradeTypeName + label: report.tl.tradetype + type: string + source: tl + total: true + - name: acc + label: report.tl.accessorycategories + type: string + source: tl + total: false + - name: tradeName + label: report.tl.tradeName + type: string + source: tl + total: false + - name: totalamount + label: report.tl.receipt.totalamount + type: string + source: tl + total: true + - name: collectorname + label: reports.uc.collectorname + type: string + source: pt + total: false + searchParams: + - name: fromDate + label: reports.tl.fromDate + type: epoch + source: tl + isMandatory: false + searchClause: AND receipt.createddate >= $fromDate + - name: toDate + label: reports.tl.toDate + type: epoch + source: tl + isMandatory: false + searchClause: AND receipt.createddate <= $toDate + - name: collectorname + label: reports.uc.collectorname + type: singlevaluelist + pattern: http://egov-hrms:8080/egov-hrms/employees/_search?tenantId=$tenantid&roles=TL_CEMP|$.Employees[*].user.id|$.Employees[*].user.name + source: pt + wrapper: true + isMandatory: false + searchClause: AND eg_user.id = $collectorname::INTEGER + query: | + SELECT + licensenumber, + to_char((To_timestamp(issueddate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as formattedIssuedDate, + tl.tradeName, + initcap(tl.status) as status, + to_char((To_timestamp(receipt.receiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as receiptIssueDate , + receipt.receiptnumber, + tradeTypeName, + acc, + tlown.name, + tlown.mobilenumber, + ih.bankid, + ih.branchname, + ih.transactionnumber as transactionnumber, + ih.instrumenttype, + amount as totalamount, + To_char((To_timestamp(receipt.manualreceiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') AS g8issuedate, + receipt.manualreceiptnumber as g8receiptno, + (CASE WHEN collectiontype='COUNTER' THEN eg_user.name ELSE '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' END) as collectorname --value for Online + + FROM eg_tl_tradelicense tl + INNER JOIN eg_tl_tradelicensedetail tld ON tld.tradelicenseid = tl.id + INNER JOIN ( + SELECT tradelicensedetailid, array_to_string(array_agg(message.message),', ') as tradeTypeName FROM eg_tl_tradeunit + LEFT OUTER JOIN message ON code = CONCAT('TRADELICENSE_TRADETYPE_', REGEXP_REPLACE(tradetype, '[^A-Za-z0-9]','_','g')) AND message.locale = 'en_IN' GROUP BY 1) tlunit ON tlunit.tradelicensedetailid = tld.id + INNER JOIN ( + SELECT tradelicensedetailid, array_to_string(array_agg(name),', ') as name, array_to_string(array_agg(mobilenumber),', ') as mobilenumber + FROM eg_tl_owner tlowner + INNER JOIN eg_user tluser ON tluser.uuid = tlowner.id + group by tradelicensedetailid + ) tlown ON tlown.tradelicensedetailid = tld.id + LEFT OUTER JOIN egcl_receiptheader_v1 receipt ON receipt.consumercode = tl.applicationnumber and receipt.status != 'Cancelled' + LEFT OUTER JOIN egcl_receiptinstrument_v1 as ri ON ri.receiptheader = receipt.id + LEFT OUTER JOIN egcl_instrumentheader_v1 as ih ON ih.id = ri.instrumentheader and ih.instrumentstatus != 'CANCELLED' + LEFT OUTER JOIN ( + SELECT tradelicensedetailid,array_to_string(array_agg(message.message),',') AS acc FROM eg_tl_accessory + LEFT OUTER JOIN message ON code=CONCAT('TRADELICENSE_ACCESSORIESCATEGORY_', REGEXP_REPLACE(accessorycategory, '[^A-Za-z0-9]','_', 'g')) AND message.locale = 'en_IN' GROUP BY 1 ) tlacc ON tlacc.tradelicensedetailid = tld.id + Join eg_user ON eg_user.id = receipt.createdby::INTEGER + WHERE tl.tenantId = $tenantid + + +- reportName: StateTradeLicenseCancelledRegistryReport + summary: TL Cancelled Receipt Register Report + version: 1.0.0 + moduleName: rainmaker-tl + sourceColumns: + - name: tenantId + label: report.tl.tenantid + type: string + source: tl + total: false + - name: receiptnumber + label: report.tl.receiptnumber + type: string + source: tl + total: false + - name: receiptIssueDate + label: report.tl.receiptissuedate + type: string + source: tl + total: false + - name: g8issuedate + label: report.tl.g8issuedate + type: string + source: tl + total: false + - name: g8receiptno + label: report.tl.g8receiptno + type: string + source: tl + total: false + - name: licensenumber + label: report.tl.licensenumber + type: string + source: tl + total: false + - name: formattedIssuedDate + label: report.tl.issueddate + type: string + source: tl + total: false + - name: name + label: report.tl.user.name + type: string + source: tl + total: false + - name: mobilenumber + label: report.tl.user.mobilenumber + type: string + source: tl + total: false + - name: bankid + label: report.tl.bankid + type: string + source: tl + total: false + - name: branchname + label: report.tl.branchname + type: string + source: tl + total: false + - name: transactionumber + label: report.tl.transactionumber + type: string + source: tl + total: false + - name: instrumenttype + label: report.tl.instrumenttype + type: string + source: tl + total: false + - name: status + label: report.tl.status + type: string + source: tl + total: false + - name: tradeTypeName + label: report.tl.tradetype + type: string + source: tl + total: false + - name: acc + label: report.tl.accessorycategories + type: string + source: tl + total: false + - name: tradeName + label: report.tl.tradeName + type: string + source: tl + total: false + - name: totalamount + label: report.tl.receipt.totalamount + type: string + source: tl + total: true + searchParams: + - name: fromDate + label: reports.tl.fromDate + type: epoch + source: tl + isMandatory: false + searchClause: AND receipt.createddate >= $fromDate + - name: toDate + label: reports.tl.toDate + type: epoch + source: tl + isMandatory: false + searchClause: AND receipt.createddate <= $toDate + query: | + SELECT + initcap(split_part(tl.tenantId, '.', 2)) as tenantId, + licensenumber, + to_char((To_timestamp(issueddate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as formattedIssuedDate, + tl.tradeName, + initcap(tl.status) as status, + to_char((To_timestamp(receipt.receiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as receiptIssueDate , + receipt.receiptnumber, + tradeTypeName, + acc, + name, + mobilenumber, + ih.bankid, + ih.branchname, + ih.transactionnumber, + ih.instrumenttype, + amount as totalamount, + To_char((To_timestamp(receipt.manualreceiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') AS g8issuedate, + receipt.manualreceiptnumber as g8receiptno + + FROM eg_tl_tradelicense tl + INNER JOIN eg_tl_tradelicensedetail tld ON tld.tradelicenseid = tl.id + INNER JOIN ( + SELECT tradelicensedetailid, array_to_string(array_agg(message.message),', ') as tradeTypeName FROM eg_tl_tradeunit + LEFT OUTER JOIN message ON code = CONCAT('TRADELICENSE_TRADETYPE_', REGEXP_REPLACE(tradetype, '[^A-Za-z0-9]','_','g')) AND message.locale = 'en_IN' GROUP BY 1) tlunit ON tlunit.tradelicensedetailid = tld.id + INNER JOIN ( + SELECT tradelicensedetailid, array_to_string(array_agg(name),', ') as name, array_to_string(array_agg(mobilenumber),', ') as mobilenumber + FROM eg_tl_owner tlowner + INNER JOIN eg_user tluser ON tluser.uuid = tlowner.id + group by tradelicensedetailid + ) tlown ON tlown.tradelicensedetailid = tld.id + INNER JOIN egcl_receiptheader_v1 receipt ON receipt.consumercode = tl.applicationnumber and receipt.status = 'Cancelled' + INNER JOIN egcl_receiptinstrument_v1 as ri ON ri.receiptheader = receipt.id + INNER JOIN egcl_instrumentheader_v1 as ih ON ih.id = ri.instrumentheader + LEFT OUTER JOIN ( + SELECT tradelicensedetailid,array_to_string(array_agg(message.message),',') AS acc FROM eg_tl_accessory + LEFT OUTER JOIN message ON code=CONCAT('TRADELICENSE_ACCESSORIESCATEGORY_', REGEXP_REPLACE(accessorycategory, '[^A-Za-z0-9]','_', 'g')) AND message.locale = 'en_IN' GROUP BY 1 ) tlacc ON tlacc.tradelicensedetailid = tld.id + WHERE tl.tenantId != 'pb.testing' + +- reportName: TradeLicenseCancelledRegistryReport + summary: TL Cancelled Receipt Register Report + version: 1.0.0 + moduleName: rainmaker-tl + sourceColumns: + - name: receiptnumber + label: report.tl.receiptnumber + type: string + source: tl + total: false + - name: receiptIssueDate + label: report.tl.receiptissuedate + type: string + source: tl + total: false + - name: g8issuedate + label: report.tl.g8issuedate + type: string + source: tl + total: false + - name: g8receiptno + label: report.tl.g8receiptno + type: string + source: tl + total: false + - name: licensenumber + label: report.tl.licensenumber + type: string + source: tl + total: false + - name: formattedIssuedDate + label: report.tl.issueddate + type: string + source: tl + total: false + - name: name + label: report.tl.user.name + type: string + source: tl + total: false + - name: mobilenumber + label: report.tl.user.mobilenumber + type: string + source: tl + total: false + - name: bankid + label: report.tl.bankid + type: string + source: tl + total: false + - name: branchname + label: report.tl.branchname + type: string + source: tl + total: false + - name: transactionumber + label: report.tl.transactionumber + type: string + source: tl + total: false + - name: instrumenttype + label: report.tl.instrumenttype + type: string + source: tl + total: false + - name: status + label: report.tl.status + type: string + source: tl + total: false + - name: tradeTypeName + label: report.tl.tradetype + type: string + source: tl + total: false + - name: acc + label: report.tl.accessorycategories + type: string + source: tl + total: false + - name: tradeName + label: report.tl.tradeName + type: string + source: tl + total: false + - name: totalamount + label: report.tl.receipt.totalamount + type: string + source: tl + total: true + searchParams: + - name: fromDate + label: reports.tl.fromDate + type: epoch + source: tl + isMandatory: false + searchClause: AND receipt.createddate >= $fromDate + - name: toDate + label: reports.tl.toDate + type: epoch + source: tl + isMandatory: false + searchClause: AND receipt.createddate <= $toDate + query: | + SELECT + licensenumber, + to_char((To_timestamp(issueddate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as formattedIssuedDate, + tl.tradeName, + initcap(tl.status) as status, + to_char((To_timestamp(receipt.receiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as receiptIssueDate , + receipt.receiptnumber, + tradeTypeName, + acc, + name, + mobilenumber, + ih.bankid, + ih.branchname, + ih.transactionnumber, + ih.instrumenttype, + amount as totalamount, + To_char((To_timestamp(receipt.manualreceiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') AS g8issuedate, + receipt.manualreceiptnumber as g8receiptno + + FROM eg_tl_tradelicense tl + INNER JOIN eg_tl_tradelicensedetail tld ON tld.tradelicenseid = tl.id + INNER JOIN ( + SELECT tradelicensedetailid, array_to_string(array_agg(message.message),', ') as tradeTypeName FROM eg_tl_tradeunit + LEFT OUTER JOIN message ON code = CONCAT('TRADELICENSE_TRADETYPE_', REGEXP_REPLACE(tradetype, '[^A-Za-z0-9]','_','g')) AND message.locale = 'en_IN' GROUP BY 1) tlunit ON tlunit.tradelicensedetailid = tld.id + INNER JOIN ( + SELECT tradelicensedetailid, array_to_string(array_agg(name),', ') as name, array_to_string(array_agg(mobilenumber),', ') as mobilenumber + FROM eg_tl_owner tlowner + INNER JOIN eg_user tluser ON tluser.uuid = tlowner.id + group by tradelicensedetailid + ) tlown ON tlown.tradelicensedetailid = tld.id + INNER JOIN egcl_receiptheader_v1 receipt ON receipt.consumercode = tl.applicationnumber and receipt.status = 'Cancelled' + INNER JOIN egcl_receiptinstrument_v1 as ri ON ri.receiptheader = receipt.id + INNER JOIN egcl_instrumentheader_v1 as ih ON ih.id = ri.instrumentheader + LEFT OUTER JOIN ( + SELECT tradelicensedetailid,array_to_string(array_agg(message.message),',') AS acc FROM eg_tl_accessory + LEFT OUTER JOIN message ON code=CONCAT('TRADELICENSE_ACCESSORIESCATEGORY_', REGEXP_REPLACE(accessorycategory, '[^A-Za-z0-9]','_', 'g')) AND message.locale = 'en_IN' GROUP BY 1 ) tlacc ON tlacc.tradelicensedetailid = tld.id + WHERE tl.tenantId LIKE $tenantid + + +- reportName: TradeWiseCollectionReport + summary: Collection according to tradeTypes + version: 1.0.0 + moduleName: rainmaker-tl + sourceColumns: + - name: transactionNumber + label: report.tl.totalTransaction + type: string + source: tl + total: false + - name: online + label: report.tl.online.collection + type: string + source: tl + total: true + - name: offline + label: report.tl.offline.collection + type: string + source: tl + total: true + - name: total + label: report.tl.totalCollection + type: string + source: tl + total: true + searchParams: + - name: fromDate + label: reports.tl.fromDate + type: epoch + source: tl + isMandatory: false + searchClause: AND rh.receiptdate >= $fromDate + - name: toDate + label: reports.tl.toDate + type: epoch + source: tl + isMandatory: false + searchClause: AND rh.receiptdate <= $toDate + query: | + select + sum(ih.amount) as total, + count(*) as transactionNumber, + sum(case collectiontype when 'COUNTER' then amount else 0 end) as offline, + sum(case collectiontype when 'ONLINE' then amount else 0 end) as online, + initcap(split_part(rh.tenantId, '.', 2)) as tenantId + from egcl_receiptheader_v1 as rh + inner join egcl_receiptinstrument_v1 as ri on ri.receiptheader = rh.id + inner join egcl_instrumentheader_v1 as ih on ih.id = ri.instrumentheader + where rh.businessdetails = 'TL' and rh.status !='Cancelled' and rh.tenantid !='pb.testing' + AND rh.tenantId LIKE $tenantid + groupby: GROUP BY rh.tenantId + +- reportName: TradeLicenseApplicationStatusReport + summary: Nummber of applications by there status + version: 1.0.0 + moduleName: rainmaker-tl + externalService: + - entity: $.messages[*] + apiURL: http://egov-localization:8080/localization/messages/v1/_search?locale=en_IN&tenantId=pb&module=rainmaker-tl + keyOrder: code,message + tableName: tbl_localization + sourceColumns: + - name: status + label: report.tl.status + type: string + source: tl + total: false + - name: total + label: report.tl.total + type: string + source: tl + total: true + searchParams: + - name: fromDate + label: reports.tl.fromDate + type: epoch + source: tl + isMandatory: false + searchClause: AND tl.lastmodifiedtime >= $fromDate + - name: toDate + label: reports.tl.toDate + type: epoch + source: tl + isMandatory: false + searchClause: AND tl.lastmodifiedtime <= $toDate + query: | + SELECT + COUNT(applicationnumber) as total, + message.message as status + from eg_tl_tradelicense tl + LEFT OUTER JOIN message ON split_part(message.code,'_',2) = status AND split_part(message.code,'_',1)='TL' AND message.locale = 'en_IN' + WHERE tl.tenantid LIKE $tenantid + groupby: GROUP BY message.message + orderby: ORDER BY case message.message when 'Pending Application' then 1 when 'Pending Payment' then 2 when 'Pending Approval' then 3 when 'Approved' then 4 when 'Rejected' then 5 when 'Cancelled' then 6 else 7 end + +- reportName: TradeLicenseULBWiseApplicationStatusReport + summary: Nummber of applications by there status + version: 1.0.0 + moduleName: rainmaker-tl + sourceColumns: + - name: tenantId + label: report.tl.tenantid + type: string + source: tl + total: false + - name: initiated + label: TL_INITIATED + type: string + source: tl + total: true + - name: applied + label: TL_APPLIED + type: string + source: tl + total: true + - name: paid + label: TL_PAID + type: string + source: tl + total: true + - name: approved + label: TL_APPROVED + type: string + source: tl + total: true + - name: rejected + label: TL_REJECTED + type: string + source: tl + total: true + - name: cancelled + label: TL_CANCELLED + type: string + source: tl + total: true + searchParams: + - name: fromDate + label: reports.tl.fromDate + type: epoch + source: tl + isMandatory: false + searchClause: AND tl.lastmodifiedtime >= $fromDate + - name: toDate + label: reports.tl.toDate + type: epoch + source: tl + isMandatory: false + searchClause: AND tl.lastmodifiedtime <= $toDate + query: | + SELECT + initcap(split_part(tenantId, '.', 2)) as tenantId, + SUM(CASE status when 'REJECTED' then 1 else 0 end) as rejected, + SUM(CASE status when 'INITIATED' then 1 else 0 end) as initiated, + SUM(CASE status when 'PAID' then 1 else 0 end) as paid, + SUM(CASE status when 'APPROVED' then 1 else 0 end) as approved, + SUM(CASE status when 'APPLIED' then 1 else 0 end) as applied, + SUM(CASE status when 'CANCELLED' then 1 else 0 end) as cancelled + FROM eg_tl_tradelicense as tl + WHERE tl.tenantid != 'pb.testing' + groupby: GROUP BY tenantid + orderby: ORDER BY tenantid + + +- reportName: StateLevelStatus + summary: Nummber of applications by there status state level + version: 1.0.0 + moduleName: rainmaker-tl + sourceColumns: + - name: status + label: report.tl.status + type: string + source: tl + total: false + - name: total + label: report.tl.total + type: string + source: tl + total: true + searchParams: + - name: fromDate + label: reports.tl.fromDate + type: epoch + source: tl + isMandatory: false + searchClause: AND tl.lastmodifiedtime >= $fromDate + - name: toDate + label: reports.tl.toDate + type: epoch + source: tl + isMandatory: false + searchClause: AND tl.lastmodifiedtime <= $toDate + - name: ulb + label: ULB + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: tl + wrapper: true + isMandatory: false + searchClause: AND tl.tenantId = $ulb + query: | + SELECT + COUNT(applicationnumber) as total, + message.message as status + from eg_tl_tradelicense tl + LEFT OUTER JOIN message ON split_part(message.code,'_',2) = status AND split_part(message.code,'_',1)='TL' AND message.locale = 'en_IN' + WHERE tl.tenantid!='pb.testing' + groupby: GROUP BY message.message + orderby: ORDER BY case message.message when 'Pending Application' then 1 when 'Pending Payment' then 2 when 'Pending Approval' then 3 when 'Approved' then 4 when 'Rejected' then 5 when 'Cancelled' then 6 else 7 end + +- reportName: ULBLevelStatus + summary: Nummber of applications by there status ULB level + version: 1.0.0 + moduleName: rainmaker-tl + sourceColumns: + - name: status + label: report.tl.status + type: string + source: tl + total: false + - name: total + label: report.tl.total + type: string + source: tl + total: true + searchParams: + - name: fromDate + label: reports.tl.fromDate + type: epoch + source: tl + isMandatory: false + searchClause: AND tl.lastmodifiedtime >= $fromDate + - name: toDate + label: reports.tl.toDate + type: epoch + source: tl + isMandatory: false + searchClause: AND tl.lastmodifiedtime <= $toDate + query: | + SELECT + COUNT(applicationnumber) as total, + message.message as status + from eg_tl_tradelicense tl + LEFT OUTER JOIN message ON split_part(message.code,'_',2) = status AND split_part(message.code,'_',1)='TL' AND message.locale = 'en_IN' + WHERE tl.tenantid=$tenantid + groupby: GROUP BY message.message + orderby: ORDER BY case message.message when 'Pending Application' then 1 when 'Pending Payment' then 2 when 'Pending Approval' then 3 when 'Approved' then 4 when 'Rejected' then 5 when 'Cancelled' then 6 else 7 end + + +- reportName: StateLevelTradeWiseCollection + summary: Collection according to tradeTypes state level + version: 1.0.0 + moduleName: rainmaker-tl + sourceColumns: + - name: tenantId + label: report.tl.tenantid + type: string + source: tl + total: false + - name: transactionNumber + label: report.tl.totalTransaction + type: string + source: tl + total: true + - name: online + label: report.tl.online.collection + type: string + source: tl + total: true + - name: offline + label: report.tl.offline.collection + type: string + source: tl + total: true + - name: total + label: report.tl.totalCollection + type: string + source: tl + total: true + searchParams: + - name: fromDate + label: reports.tl.fromDate + type: epoch + source: tl + isMandatory: false + searchClause: AND rh.receiptdate >= $fromDate + - name: toDate + label: reports.tl.toDate + type: epoch + source: tl + isMandatory: false + searchClause: AND rh.receiptdate <= $toDate + - name: ulb + label: ULB + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: tl + wrapper: true + isMandatory: false + searchClause: AND tl.tenantId = $ulb + query: | + select + sum(ih.amount) as total, + count(*) as transactionNumber, + sum(case collectiontype when 'COUNTER' then amount else 0 end) as offline, + sum(case collectiontype when 'ONLINE' then amount else 0 end) as online, + initcap(split_part(rh.tenantId, '.', 2)) as tenantId + from egcl_receiptheader_v1 as rh + inner join egcl_receiptinstrument_v1 as ri on ri.receiptheader = rh.id + inner join egcl_instrumentheader_v1 as ih on ih.id = ri.instrumentheader + where rh.businessdetails = 'TL' and rh.status !='Cancelled' and rh.tenantid !='pb.testing' + groupby: GROUP BY rh.tenantId + orderby: ORDER BY rh.tenantId asc + + +- reportName: StateLevelTradeLicenseRegistryReport + summary: TL Basic Report State Level + version: 1.0.0 + moduleName: rainmaker-tl + sourceColumns: + - name: tenantId + label: report.tl.tenantId + type: string + source: tl + total: false + - name: licensenumber + label: report.tl.licensenumber + type: string + source: tl + total: false + - name: formattedIssuedDate + label: report.tl.issueddate + type: string + source: tl + total: false + - name: g8issuedate + label: report.tl.g8issuedate + type: string + source: tl + total: false + - name: g8receiptno + label: report.tl.g8receiptno + type: string + source: tl + total: false + - name: name + label: report.tl.user.name + type: string + source: tl + total: false + - name: mobilenumber + label: report.tl.user.mobilenumber + type: string + source: tl + total: false + - name: tradeTypeName + label: report.tl.tradetype + type: string + source: tl + total: false + - name: acc + label: report.tl.accessorycategories + type: string + source: tl + total: false + - name: tradeName + label: report.tl.tradeName + type: string + source: tl + total: false + - name: totalamount + label: report.tl.receipt.totalamount + type: string + source: tl + total: true + searchParams: + - name: fromDate + label: reports.tl.fromDate + type: epoch + source: tl + isMandatory: false + searchClause: AND issueddate >= $fromDate + - name: toDate + label: reports.tl.toDate + type: epoch + source: tl + isMandatory: false + searchClause: AND issueddate <= $toDate + - name: ulb + label: ULB + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: tl + wrapper: true + isMandatory: false + searchClause: AND tl.tenantId = $ulb + query: | + SELECT + tl.tenantId as tenantId, + licensenumber, + to_char((To_timestamp(issueddate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as formattedIssuedDate, + tl.tradeName, + tradeTypeName, + acc, + name, + mobilenumber, + amount as totalamount, + To_char((To_timestamp(receipt.manualreceiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') AS g8issuedate, + receipt.manualreceiptnumber as g8receiptno + FROM eg_tl_tradelicense tl + INNER JOIN eg_tl_tradelicensedetail tld ON tld.tradelicenseid = tl.id + INNER JOIN eg_tl_owner tlowner ON tlowner.tradelicensedetailid = tld.id + INNER JOIN ( + SELECT tradelicensedetailid, array_to_string(array_agg(message.message),', ') as tradeTypeName FROM eg_tl_tradeunit + LEFT OUTER JOIN message ON code = CONCAT('TRADELICENSE_TRADETYPE_', REGEXP_REPLACE(tradetype, '[^A-Za-z0-9]','_','g')) AND message.locale = 'en_IN' GROUP BY 1) tlunit ON tlunit.tradelicensedetailid = tld.id + INNER JOIN eg_user tluser ON tluser.uuid = tlowner.id + LEFT OUTER JOIN egcl_receiptheader_v1 receipt ON receipt.consumercode = tl.applicationnumber + LEFT JOIN egcl_receiptinstrument_v1 as ri ON ri.receiptheader = receipt.id + LEFT JOIN egcl_instrumentheader_v1 as ih ON ih.id = ri.instrumentheader + LEFT OUTER JOIN + ( + SELECT tradelicensedetailid,array_to_string(array_agg(message.message),',') AS acc FROM eg_tl_accessory + LEFT OUTER JOIN message ON code=CONCAT('TRADELICENSE_ACCESSORIESCATEGORY_', REGEXP_REPLACE(accessorycategory, '[^A-Za-z0-9]','_', 'g')) AND message.locale = 'en_IN' GROUP BY 1 ) tlacc ON tlacc.tradelicensedetailid = tld.id + WHERE tl.Status = 'APPROVED' + orderby: ORDER BY tl.tenantId asc + + +- reportName: SearchTradeLicenseApplicationReport + summary: TL Search Application Report + version: 1.0.0 + moduleName: rainmaker-tl + sourceColumns: + - name: applicationnumber + label: report.tl.applicationnumber + type: string + source: tl + total: false + - name: licensenumber + label: report.tl.licensenumber + type: string + source: tl + total: false + - name: tradeName + label: report.tl.tradeName + type: string + source: tl + total: false + - name: name + label: report.tl.user.name + type: string + source: tl + total: false + - name: mobilenumber + label: report.tl.user.mobilenumber + type: string + source: tl + total: false + - name: formattedIssuedDate + label: report.tl.issueddate + type: string + source: tl + total: false + - name: status + label: report.tl.status + type: string + source: tl + total: false + searchParams: + - name: fromDate + label: reports.tl.fromDate + type: epoch + source: tl + isMandatory: false + searchClause: AND tl.applicationdate >= $fromDate + - name: toDate + label: reports.tl.toDate + type: epoch + source: tl + isMandatory: false + searchClause: AND tl.applicationdate <= $toDate + - name: localityArray + label: reports.tl.zoneList + type: boundarylist + source: tl + isMandatory: false + searchClause: AND tla.locality IN ($localityArray) + query: | + SELECT + tl.applicationnumber, + tl.licensenumber, + tl.tradeName, + (split_part(tl.tenantId, '.', 2)) as tenantId, + ownername, + mobilenumber, + tla.locality, + to_char((To_timestamp(applicationdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as applicationDate, + tl.status + from eg_tl_tradelicense as tl + INNER JOIN eg_tl_tradelicensedetail tld ON + tld.tradelicenseid = tl.id + INNER JOIN eg_tl_address as tla ON + tla.tradelicensedetailid=tld.id + INNER JOIN (SELECT tradelicensedetailid, array_to_string(array_agg(name),', ') as ownername, array_to_string(array_agg(mobilenumber),', ') as mobilenumber + FROM eg_tl_owner tlowner + INNER JOIN eg_user tluser ON + tluser.uuid = tlowner.id + group by tradelicensedetailid + ) tlown ON tlown.tradelicensedetailid = tld.id + WHERE tl.tenantid=$tenantid + +- reportName: TradeLicenseDetailsReport + summary: Trade License Details Report + version: 1.0.0 + moduleName: rainmaker-tl + sourceColumns: + - name: applicationnumber + label: report.tl.applicationnumber + type: string + source: tl + total: false + - name: propertyid + label: report.tl.propertyid + type: string + source: tl + total: false + - name: financialyear + label: report.tl.financialyear + type: string + source: tl + total: false + - name: licensetype + label: report.tl.licensetype + type: string + source: tl + total: false + - name: oldlicensenumber + label: report.tl.oldlicensenumber + type: string + source: tl + total: false + - name: licensenumber + label: report.tl.licensenumber + type: string + source: tl + total: false + - name: tradeName + label: report.tl.tradeName + type: string + source: tl + total: false + - name: name + label: report.tl.user.name + type: string + source: tl + total: false + - name: mobilenumber + label: report.tl.user.mobilenumber + type: string + source: tl + total: false + - name: formattedIssuedDate + label: report.tl.issueddate + type: string + source: tl + total: false + - name: tradeTypeName + label: report.tl.tradetype + type: string + source: tl + total: false + - name: acc + label: report.tl.accessorycategories + type: string + source: tl + total: false + - name: totalamount + label: report.tl.receipt.totalamount + type: string + source: tl + total: true + searchParams: + - name: fromDate + label: reports.tl.fromDate + type: epoch + source: tl + isMandatory: false + searchClause: AND tl.applicationdate >= $fromDate + - name: toDate + label: reports.tl.toDate + type: epoch + source: tl + isMandatory: false + searchClause: AND tl.applicationdate <= $toDate + - name: localityArray + label: reports.tl.zoneList + type: boundarylist + source: tl + isMandatory: false + searchClause: AND tla.locality IN ($localityArray) + query: | + SELECT + tl.applicationnumber, + propertyid, + financialyear, + (case when oldlicensenumber is null then 'New' else 'Renewal' end) AS licensetype, + + oldlicensenumber, + licensenumber, + to_char((To_timestamp(issueddate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as formattedIssuedDate, + tl.tradeName, + tradeTypeName, + + acc, + name, + mobilenumber, + amount as totalamount + FROM eg_tl_tradelicense tl + INNER JOIN eg_tl_tradelicensedetail tld ON tld.tradelicenseid = tl.id + + INNER JOIN eg_tl_address as tla ON + tla.tradelicensedetailid=tld.id + INNER JOIN eg_tl_owner tlowner ON tlowner.tradelicensedetailid = tld.id + INNER JOIN ( + SELECT tradelicensedetailid, array_to_string(array_agg(message.message),', ') as tradeTypeName FROM eg_tl_tradeunit + LEFT OUTER JOIN message ON code = CONCAT('TRADELICENSE_TRADETYPE_', REGEXP_REPLACE(tradetype, '[^A-Za-z0-9]','_','g')) AND message.locale = 'en_IN' GROUP BY 1) tlunit ON tlunit.tradelicensedetailid = tld.id + INNER JOIN eg_user tluser ON tluser.uuid = tlowner.id + LEFT OUTER JOIN egcl_receiptheader_v1 receipt ON receipt.consumercode = tl.applicationnumber + LEFT JOIN egcl_receiptinstrument_v1 as ri ON ri.receiptheader = receipt.id + LEFT JOIN egcl_instrumentheader_v1 as ih ON ih.id = ri.instrumentheader + LEFT OUTER JOIN + ( + SELECT tradelicensedetailid,array_to_string(array_agg(message.message),',') AS acc FROM eg_tl_accessory + LEFT OUTER JOIN message ON code=CONCAT('TRADELICENSE_ACCESSORIESCATEGORY_', REGEXP_REPLACE(accessorycategory, '[^A-Za-z0-9]','_', 'g')) AND message.locale = 'en_IN' GROUP BY 1 ) tlacc ON tlacc.tradelicensedetailid = tld.id + WHERE tl.tenantid=$tenantid + +- reportName: StateDefaulterReport + summary: TL Defautler + version: 1.0.0 + moduleName: rainmaker-tl + sourceColumns: + - name: ulb + label: report.tl.ulb + type: string + source: tl + total: false + - name: licensenumber + label: report.tl.licensenumber + type: string + source: tl + total: false + - name: applicationnumber + label: report.tl.applicationnumber + type: string + source: tl + total: false + - name: oldlicensenumber + label: report.tl.oldlicensenumber + type: string + source: tl + total: false + - name: financialyear + label: report.tl.financialyear + type: string + source: tl + total: false + - name: tradename + label: report.tl.tradename + type: string + source: tl + total: false + - name: ownername + label: report.tl.ownername + type: string + source: tl + total: false + - name: mobilenumber + label: report.tl.mobilenumber + type: string + source: tl + total: false + query: | + select + split_part(tenantid,'.',2) as ulb, + licensenumber, + applicationnumber, + oldlicensenumber, + financialyear, + tradename, + name as ownername, + mobilenumber + from eg_tl_tradelicense tl + INNER JOIN eg_tl_tradelicensedetail tld ON tld.tradelicenseid = tl.id + INNER JOIN ( + SELECT tradelicensedetailid, array_to_string(array_agg(name),', ') as name, array_to_string(array_agg(mobilenumber),', ') as mobilenumber + FROM eg_tl_owner tlowner + INNER JOIN eg_user tluser ON tluser.uuid = tlowner.id + group by tradelicensedetailid + ) tlown ON tlown.tradelicensedetailid = tld.id + where validto < extract (epoch from NOW())*1000 and licensenumber is not null and licensenumber not in (select oldlicensenumber from eg_tl_tradelicense where oldlicensenumber is not null) + and tenantid!='pb.testing' + orderby: order by tenantid + +- reportName: ULBDefaulterReport + summary: TL Defautler + version: 1.0.0 + moduleName: rainmaker-tl + sourceColumns: + - name: ulb + label: report.tl.ulb + type: string + source: tl + total: false + - name: licensenumber + label: report.tl.licensenumber + type: string + source: tl + total: false + - name: applicationnumber + label: report.tl.applicationnumber + type: string + source: tl + total: false + - name: oldlicensenumber + label: report.tl.oldlicensenumber + type: string + source: tl + total: false + - name: financialyear + label: report.tl.financialyear + type: string + source: tl + total: false + - name: tradename + label: report.tl.tradename + type: string + source: tl + total: false + - name: ownername + label: report.tl.ownername + type: string + source: tl + total: false + - name: mobilenumber + label: report.tl.mobilenumber + type: string + source: tl + total: false + query: | + select + split_part(tenantid,'.',2) as ulb, + licensenumber, + applicationnumber, + oldlicensenumber, + financialyear, + tradename, + name as ownername, + mobilenumber + from eg_tl_tradelicense tl + INNER JOIN eg_tl_tradelicensedetail tld ON tld.tradelicenseid = tl.id + INNER JOIN ( + SELECT tradelicensedetailid, array_to_string(array_agg(name),', ') as name, array_to_string(array_agg(mobilenumber),', ') as mobilenumber + FROM eg_tl_owner tlowner + INNER JOIN eg_user tluser ON tluser.uuid = tlowner.id + group by tradelicensedetailid + ) tlown ON tlown.tradelicensedetailid = tld.id + where validto < extract (epoch from NOW())*1000 and licensenumber is not null and licensenumber not in (select oldlicensenumber from eg_tl_tradelicense where oldlicensenumber is not null) + and tenantid = $tenantid + + +- reportName: TradeLicenseRegistryReport_v2 + decryptionPathId: TradeLicenseRegistryReport_v2 + summary: TL Receipt Register Report + version: 1.0.0 + moduleName: rainmaker-tl + sourceColumns: + - name: receiptnumber + label: report.tl.receiptnumber + type: string + source: tl + total: false + - name: receiptIssueDate + label: report.tl.receiptissuedate + type: string + source: tl + total: false + - name: g8issuedate + label: report.tl.g8issuedate + type: string + source: tl + total: false + - name: g8receiptno + label: report.tl.g8receiptno + type: string + source: tl + total: false + - name: licensenumber + label: report.tl.licensenumber + type: string + source: tl + total: false + - name: formattedIssuedDate + label: report.tl.issueddate + type: string + source: tl + total: false + - name: name + label: report.tl.user.name + type: string + source: tl + total: false + - name: mobilenumber + label: report.tl.user.mobilenumber + type: string + source: tl + total: false + - name: bankid + label: report.tl.bankid + type: string + source: tl + total: false + - name: branchname + label: report.tl.branchname + type: string + source: tl + total: false + - name: transactionnumber + label: report.tl.transactionumber + type: string + source: tl + total: false + - name: instrumenttype + label: report.tl.instrumenttype + type: string + source: tl + total: false + - name: status + label: report.tl.status + type: string + source: tl + total: false + - name: tradeTypeName + label: report.tl.tradetype + type: string + source: tl + total: false + - name: acc + label: report.tl.accessorycategories + type: string + source: tl + total: false + - name: tradeName + label: report.tl.tradeName + type: string + source: tl + total: false + - name: totalamount + label: report.tl.receipt.totalamount + type: string + source: tl + total: true + - name: collectorname + label: reports.uc.collectorname + type: string + source: pt + total: false + searchParams: + - name: fromDate + label: reports.tl.fromDate + type: epoch + source: tl + isMandatory: false + searchClause: AND egcl_paymentdetail.receiptdate >= $fromDate + - name: toDate + label: reports.tl.toDate + type: epoch + source: tl + isMandatory: false + searchClause: AND egcl_paymentdetail.receiptdate <= $toDate + - name: collectorname + label: reports.uc.collectorname + type: singlevaluelist + pattern: http://egov-hrms:8080/egov-hrms/employees/_search?tenantId=$tenantid&roles=TL_CEMP|$.Employees[*].user.id|$.Employees[*].user.name + source: pt + wrapper: true + isMandatory: false + searchClause: AND eg_user.id = $collectorname::INTEGER + query: | + SELECT + licensenumber, + to_char((To_timestamp(issueddate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as formattedIssuedDate, + tl.tradeName, + initcap(tl.status) as status, + to_char((To_timestamp(egcl_paymentdetail.receiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as receiptIssueDate , + egcl_paymentdetail.receiptnumber, + tradeTypeName, + acc, + split_part(tlown.name,',',1) as name, -- showing first name as decryption service not able to decrypt multiple comma seperated encrypted names + split_part(tlown.mobilenumber,',',1) as mobilenumber, -- similary showing first mobilenumber only + payment.ifsccode as bankid, -- ih.bankid, + payment.ifsccode as branchname, --ih.branchname, + payment.transactionnumber as transactionnumber, -- ih.transactionnumber as transactionnumber, + payment.paymentmode as instrumenttype, -- ih.instrumenttype, + payment.totalamountpaid as totalamount, --amount as totalamount, + To_char((To_timestamp(egcl_paymentdetail.manualreceiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') AS g8issuedate, + egcl_paymentdetail.manualreceiptnumber as g8receiptno, + (CASE WHEN paymentmode!='ONLINE' THEN eg_user.name ELSE '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' END) as collectorname + FROM eg_tl_tradelicense tl + INNER JOIN eg_tl_tradelicensedetail tld ON tld.tradelicenseid = tl.id + INNER JOIN ( + SELECT tradelicensedetailid, array_to_string(array_agg(message.message),', ') as tradeTypeName FROM eg_tl_tradeunit + LEFT OUTER JOIN message ON code = CONCAT('TRADELICENSE_TRADETYPE_', REGEXP_REPLACE(tradetype, '[^A-Za-z0-9]','_','g')) AND message.locale = 'en_IN' GROUP BY 1) tlunit ON tlunit.tradelicensedetailid = tld.id + INNER JOIN ( + SELECT tradelicensedetailid, array_to_string(array_agg(name),', ') as name, array_to_string(array_agg(mobilenumber),', ') as mobilenumber + FROM eg_tl_owner tlowner + INNER JOIN eg_user tluser ON tluser.uuid = tlowner.id + group by tradelicensedetailid + ) tlown ON tlown.tradelicensedetailid = tld.id + LEFT OUTER JOIN egcl_bill bill ON bill.consumercode = tl.applicationnumber + LEFT OUTER JOIN egcl_paymentdetail on bill.id=egcl_paymentdetail.billid + LEFT OUTER JOIN egcl_payment as payment ON payment.id = egcl_paymentdetail.paymentid + LEFT OUTER JOIN ( + SELECT tradelicensedetailid,array_to_string(array_agg(message.message),',') AS acc FROM eg_tl_accessory + LEFT OUTER JOIN message ON code=CONCAT('TRADELICENSE_ACCESSORIESCATEGORY_', REGEXP_REPLACE(accessorycategory, '[^A-Za-z0-9]','_', 'g')) AND message.locale = 'en_IN' GROUP BY 1 ) tlacc ON tlacc.tradelicensedetailid = tld.id + Join eg_user ON eg_user.id = egcl_paymentdetail.createdby::INTEGER + WHERE tl.tenantId = $tenantid and payment.paymentstatus!='CANCELLED' + orderby: ORDER BY egcl_paymentdetail.receiptnumber DESC; + +- reportName: StateTradeLicenseCancelledRegistryReport_v2 + decryptionPathId: TradeLicenseCancelledRegistryReport_v2 + summary: TL Cancelled Receipt Register Report + version: 1.0.0 + moduleName: rainmaker-tl + sourceColumns: + - name: tenantId + label: report.tl.tenantid + type: string + source: tl + total: false + - name: receiptnumber + label: report.tl.receiptnumber + type: string + source: tl + total: false + - name: receiptIssueDate + label: report.tl.receiptissuedate + type: string + source: tl + total: false + - name: g8issuedate + label: report.tl.g8issuedate + type: string + source: tl + total: false + - name: g8receiptno + label: report.tl.g8receiptno + type: string + source: tl + total: false + - name: licensenumber + label: report.tl.licensenumber + type: string + source: tl + total: false + - name: formattedIssuedDate + label: report.tl.issueddate + type: string + source: tl + total: false + - name: name + label: report.tl.user.name + type: string + source: tl + total: false + - name: mobilenumber + label: report.tl.user.mobilenumber + type: string + source: tl + total: false + - name: bankid + label: report.tl.bankid + type: string + source: tl + total: false + - name: branchname + label: report.tl.branchname + type: string + source: tl + total: false + - name: transactionumber + label: report.tl.transactionumber + type: string + source: tl + total: false + - name: instrumenttype + label: report.tl.instrumenttype + type: string + source: tl + total: false + - name: status + label: report.tl.status + type: string + source: tl + total: false + - name: tradeTypeName + label: report.tl.tradetype + type: string + source: tl + total: false + - name: acc + label: report.tl.accessorycategories + type: string + source: tl + total: false + - name: tradeName + label: report.tl.tradeName + type: string + source: tl + total: false + - name: totalamount + label: report.tl.receipt.totalamount + type: string + source: tl + total: true + searchParams: + - name: fromDate + label: reports.tl.fromDate + type: epoch + source: tl + isMandatory: false + searchClause: AND paydetail.receiptdate >= $fromDate + - name: toDate + label: reports.tl.toDate + type: epoch + source: tl + isMandatory: false + searchClause: AND paydetail.receiptdate <= $toDate + query: | + SELECT + initcap(split_part(tl.tenantId, '.', 2)) as tenantId, + licensenumber, + to_char((To_timestamp(issueddate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as formattedIssuedDate, + tl.tradeName, + initcap(tl.status) as status, + to_char((To_timestamp(paydetail.receiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as receiptIssueDate , + paydetail.receiptnumber, + tradeTypeName, + acc, + split_part(name,',',1) as name, -- showing first name as decryption service not able to decrypt multiple encrypted values seperate by comma + payment.mobilenumber, + payment.ifsccode as bankid, -- ih.bankid, + payment.ifsccode as branchname, --ih.branchname, + payment.transactionnumber as transactionnumber, -- ih.transactionnumber as transactionnumber, + payment.paymentmode as instrumenttype, -- ih.instrumenttype, + payment.totalamountpaid as totalamount, --amount as totalamount, + To_char((To_timestamp(paydetail.manualreceiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') AS g8issuedate, + paydetail.manualreceiptnumber as g8receiptno + FROM eg_tl_tradelicense tl + INNER JOIN eg_tl_tradelicensedetail tld ON tld.tradelicenseid = tl.id + INNER JOIN ( + SELECT tradelicensedetailid, array_to_string(array_agg(message.message),', ') as tradeTypeName FROM eg_tl_tradeunit + LEFT OUTER JOIN message ON code = CONCAT('TRADELICENSE_TRADETYPE_', REGEXP_REPLACE(tradetype, '[^A-Za-z0-9]','_','g')) AND message.locale = 'en_IN' GROUP BY 1) tlunit ON tlunit.tradelicensedetailid = tld.id + INNER JOIN ( + SELECT tradelicensedetailid, array_to_string(array_agg(name),', ') as name, array_to_string(array_agg(mobilenumber),', ') as mobilenumber + FROM eg_tl_owner tlowner + INNER JOIN eg_user tluser ON tluser.uuid = tlowner.id + group by tradelicensedetailid + ) tlown ON tlown.tradelicensedetailid = tld.id + INNER JOIN egcl_bill as bill ON bill.consumercode = tl.applicationnumber + INNER JOIN egcl_paymentdetail as paydetail on bill.id=paydetail.billid + INNER JOIN egcl_payment as payment on payment.id=paydetail.paymentid and payment.paymentstatus='CANCELLED' + LEFT OUTER JOIN ( + SELECT tradelicensedetailid,array_to_string(array_agg(message.message),',') AS acc FROM eg_tl_accessory + LEFT OUTER JOIN message ON code=CONCAT('TRADELICENSE_ACCESSORIESCATEGORY_', REGEXP_REPLACE(accessorycategory, '[^A-Za-z0-9]','_', 'g')) AND message.locale = 'en_IN' GROUP BY 1 ) tlacc ON tlacc.tradelicensedetailid = tld.id + WHERE tl.tenantId != 'pb.testing' + + +- reportName: TradeLicenseCancelledRegistryReport_v2 + decryptionPathId: TradeLicenseCancelledRegistryReport_v2 + summary: TL Cancelled Receipt Register Report + version: 1.0.0 + moduleName: rainmaker-tl + sourceColumns: + - name: receiptnumber + label: report.tl.receiptnumber + type: string + source: tl + total: false + - name: receiptIssueDate + label: report.tl.receiptissuedate + type: string + source: tl + total: false + - name: g8issuedate + label: report.tl.g8issuedate + type: string + source: tl + total: false + - name: g8receiptno + label: report.tl.g8receiptno + type: string + source: tl + total: false + - name: licensenumber + label: report.tl.licensenumber + type: string + source: tl + total: false + - name: formattedIssuedDate + label: report.tl.issueddate + type: string + source: tl + total: false + - name: name + label: report.tl.user.name + type: string + source: tl + total: false + - name: mobilenumber + label: report.tl.user.mobilenumber + type: string + source: tl + total: false + - name: bankid + label: report.tl.bankid + type: string + source: tl + total: false + - name: branchname + label: report.tl.branchname + type: string + source: tl + total: false + - name: transactionumber + label: report.tl.transactionumber + type: string + source: tl + total: false + - name: instrumenttype + label: report.tl.instrumenttype + type: string + source: tl + total: false + - name: status + label: report.tl.status + type: string + source: tl + total: false + - name: tradeTypeName + label: report.tl.tradetype + type: string + source: tl + total: false + - name: acc + label: report.tl.accessorycategories + type: string + source: tl + total: false + - name: tradeName + label: report.tl.tradeName + type: string + source: tl + total: false + - name: totalamount + label: report.tl.receipt.totalamount + type: string + source: tl + total: true + searchParams: + - name: fromDate + label: reports.tl.fromDate + type: epoch + source: tl + isMandatory: false + searchClause: AND paydetail.receiptdate >= $fromDate + - name: toDate + label: reports.tl.toDate + type: epoch + source: tl + isMandatory: false + searchClause: AND paydetail.receiptdate <= $toDate + query: | + SELECT + licensenumber, + to_char((To_timestamp(issueddate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as formattedIssuedDate, + tl.tradeName, + initcap(tl.status) as status, + to_char((To_timestamp(paydetail.receiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as receiptIssueDate , + paydetail.receiptnumber, + tradeTypeName, + acc, + split_part(name,',',1) as name, -- showing first name as decryption service not able to decrypt multiple encrypted values seperate by comma + payment.mobilenumber, + payment.ifsccode as bankid, -- ih.bankid, + payment.ifsccode as branchname, --ih.branchname, + payment.transactionnumber as transactionnumber, -- ih.transactionnumber as transactionnumber, + payment.paymentmode as instrumenttype, -- ih.instrumenttype, + payment.totalamountpaid as totalamount, --amount as totalamount, + To_char((To_timestamp(paydetail.manualreceiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') AS g8issuedate, + paydetail.manualreceiptnumber as g8receiptno + FROM eg_tl_tradelicense tl + INNER JOIN eg_tl_tradelicensedetail tld ON tld.tradelicenseid = tl.id + INNER JOIN ( + SELECT tradelicensedetailid, array_to_string(array_agg(message.message),', ') as tradeTypeName FROM eg_tl_tradeunit + LEFT OUTER JOIN message ON code = CONCAT('TRADELICENSE_TRADETYPE_', REGEXP_REPLACE(tradetype, '[^A-Za-z0-9]','_','g')) AND message.locale = 'en_IN' GROUP BY 1) tlunit ON tlunit.tradelicensedetailid = tld.id + INNER JOIN ( + SELECT tradelicensedetailid, array_to_string(array_agg(name),', ') as name, array_to_string(array_agg(mobilenumber),', ') as mobilenumber + FROM eg_tl_owner tlowner + INNER JOIN eg_user tluser ON tluser.uuid = tlowner.id + group by tradelicensedetailid + ) tlown ON tlown.tradelicensedetailid = tld.id + INNER JOIN egcl_bill as bill ON bill.consumercode = tl.applicationnumber + INNER JOIN egcl_paymentdetail as paydetail on bill.id=paydetail.billid + INNER JOIN egcl_payment as payment on payment.id=paydetail.paymentid and payment.paymentstatus='CANCELLED' + LEFT OUTER JOIN ( + SELECT tradelicensedetailid,array_to_string(array_agg(message.message),',') AS acc FROM eg_tl_accessory + LEFT OUTER JOIN message ON code=CONCAT('TRADELICENSE_ACCESSORIESCATEGORY_', REGEXP_REPLACE(accessorycategory, '[^A-Za-z0-9]','_', 'g')) AND message.locale = 'en_IN' GROUP BY 1 ) tlacc ON tlacc.tradelicensedetailid = tld.id + WHERE tl.tenantId LIKE $tenantid + + +- reportName: TradeWiseCollectionReport_v2 + summary: Collection according to tradeTypes + version: 1.0.0 + moduleName: rainmaker-tl + sourceColumns: + - name: transactionNumber + label: report.tl.totalTransaction + type: string + source: tl + total: false + - name: online + label: report.tl.online.collection + type: string + source: tl + total: true + - name: offline + label: report.tl.offline.collection + type: string + source: tl + total: true + - name: total + label: report.tl.totalCollection + type: string + source: tl + total: true + searchParams: + - name: fromDate + label: reports.tl.fromDate + type: epoch + source: tl + isMandatory: false + searchClause: AND paydetail.receiptdate >= $fromDate + - name: toDate + label: reports.tl.toDate + type: epoch + source: tl + isMandatory: false + searchClause: AND paydetail.receiptdate <= $toDate + query: | + select + sum(payment.totalamountpaid) as total, + count(*) as transactionNumber, + sum(case when payment.paymentmode!='ONLINE' then totalamountpaid else 0 end) as offline, + sum(case when payment.paymentmode='ONLINE' then totalamountpaid else 0 end) as online, + initcap(split_part(payment.tenantId, '.', 2)) as tenantId + from egcl_payment as payment + inner join egcl_paymentdetail paydetail on paydetail.paymentid=payment.id + where paydetail.businessservice = 'TL' and payment.paymentstatus != 'CANCELLED' + AND payment.tenantId LIKE '$tenantid' + groupby: GROUP BY payment.tenantId + + +- reportName: TradeLicenseApplicationStatusReport_v2 + summary: Nummber of applications by there status + version: 1.0.0 + moduleName: rainmaker-tl + externalService: + - entity: $.messages[*] + apiURL: http://egov-localization:8080/localization/messages/v1/_search?locale=en_IN&tenantId=pb&module=rainmaker-tl + keyOrder: code,message + tableName: tbl_localization + sourceColumns: + - name: status + label: report.tl.status + type: string + source: tl + total: false + - name: total + label: report.tl.total + type: string + source: tl + total: true + searchParams: + - name: fromDate + label: reports.tl.fromDate + type: epoch + source: tl + isMandatory: false + searchClause: AND tl.lastmodifiedtime >= $fromDate + - name: toDate + label: reports.tl.toDate + type: epoch + source: tl + isMandatory: false + searchClause: AND tl.lastmodifiedtime <= $toDate + query: | + SELECT + COUNT(applicationnumber) as total, + message.message as status + from eg_tl_tradelicense tl + LEFT OUTER JOIN message ON split_part(message.code,'_',2) = status AND split_part(message.code,'_',1)='TL' AND message.locale = 'en_IN' + WHERE tl.tenantid LIKE $tenantid + groupby: GROUP BY message.message + orderby: ORDER BY case message.message when 'Pending Application' then 1 when 'Pending Payment' then 2 when 'Pending Approval' then 3 when 'Approved' then 4 when 'Rejected' then 5 when 'Cancelled' then 6 else 7 end + + +- reportName: TradeLicenseULBWiseApplicationStatusReport_v2 + summary: Nummber of applications by there status + version: 1.0.0 + moduleName: rainmaker-tl + sourceColumns: + - name: tenantId + label: report.tl.tenantid + type: string + source: tl + total: false + - name: initiated + label: TL_INITIATED + type: string + source: tl + total: true + - name: applied + label: TL_APPLIED + type: string + source: tl + total: true + - name: pendingpayment + label: TL_PENDINGPAYMENT + type: string + source: tl + total: true + - name: paid + label: TL_PAID + type: string + source: tl + total: true + - name: fieldinspection + label: TL_FIELDINSPECTION + type: string + source: tl + total: true + - name: pendingapproval + label: TL_PENDINGAPPROVAL + type: string + source: tl + total: true + - name: approved + label: TL_APPROVED + type: string + source: tl + total: true + - name: rejected + label: TL_REJECTED + type: string + source: tl + total: true + - name: cancelled + label: TL_CANCELLED + type: string + source: tl + total: true + - name: citizenactionrequired + label: TL_CITIZENACTIONREQUIRED + type: string + source: tl + total: true + searchParams: + - name: fromDate + label: reports.tl.fromDate + type: epoch + source: tl + isMandatory: false + searchClause: AND tl.lastmodifiedtime >= $fromDate + - name: toDate + label: reports.tl.toDate + type: epoch + source: tl + isMandatory: false + searchClause: AND tl.lastmodifiedtime <= $toDate + - name: ulb + label: ULB + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: tl + wrapper: true + isMandatory: false + searchClause: AND tl.tenantId = $ulb + query: | + SELECT + initcap(split_part(tenantId, '.', 2)) as tenantId, + SUM(CASE status when 'REJECTED' then 1 else 0 end) as rejected, + SUM(CASE status when 'INITIATED' then 1 else 0 end) as initiated, + SUM(CASE status when 'PENDINGPAYMENT' then 1 else 0 end) as pendingpayment, + SUM(CASE status when 'PAID' then 1 else 0 end) as paid, + SUM(CASE status when 'FIELDINSPECTION' then 1 else 0 end) as fieldinspection, + SUM(CASE status when 'CITIZENACTIONREQUIRED' then 1 else 0 end) as citizenactionrequired, + SUM(CASE status when 'PENDINGAPPROVAL' then 1 else 0 end) as pendingapproval, + SUM(CASE status when 'APPROVED' then 1 else 0 end) as approved, + SUM(CASE status when 'APPLIED' then 1 else 0 end) as applied, + SUM(CASE status when 'CANCELLED' then 1 else 0 end) as cancelled + FROM eg_tl_tradelicense as tl + WHERE tl.tenantid != 'pb.testing' + groupby: GROUP BY tenantid + orderby: ORDER BY tenantid + + +- reportName: StateLevelStatus_v2 + summary: Nummber of applications by there status state level + version: 1.0.0 + moduleName: rainmaker-tl + sourceColumns: + - name: status + label: report.tl.status + type: string + source: tl + total: false + - name: total + label: report.tl.total + type: string + source: tl + total: true + searchParams: + - name: fromDate + label: reports.tl.fromDate + type: epoch + source: tl + isMandatory: false + searchClause: AND tl.lastmodifiedtime >= $fromDate + - name: toDate + label: reports.tl.toDate + type: epoch + source: tl + isMandatory: false + searchClause: AND tl.lastmodifiedtime <= $toDate + - name: ulb + label: ULB + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: tl + wrapper: true + isMandatory: false + searchClause: AND tl.tenantId = $ulb + query: | + SELECT + COUNT(applicationnumber) as total, + message.message as status + from eg_tl_tradelicense tl + LEFT OUTER JOIN message ON split_part(message.code,'_',2) = status AND split_part(message.code,'_',1)='TL' AND message.locale = 'en_IN' + WHERE tl.tenantid!='pb.testing' + groupby: GROUP BY message.message + orderby: ORDER BY case message.message when 'Pending Application' then 1 when 'Pending Payment' then 2 when 'Pending Approval' then 3 when 'Approved' then 4 when 'Rejected' then 5 when 'Cancelled' then 6 else 7 end + + +- reportName: ULBLevelStatus_v2 + summary: Nummber of applications by there status ULB level + version: 1.0.0 + moduleName: rainmaker-tl + sourceColumns: + - name: status + label: report.tl.status + type: string + source: tl + total: false + - name: total + label: report.tl.total + type: string + source: tl + total: true + searchParams: + - name: fromDate + label: reports.tl.fromDate + type: epoch + source: tl + isMandatory: false + searchClause: AND tl.lastmodifiedtime >= $fromDate + - name: toDate + label: reports.tl.toDate + type: epoch + source: tl + isMandatory: false + searchClause: AND tl.lastmodifiedtime <= $toDate + query: | + SELECT + COUNT(applicationnumber) as total, + message.message as status + from eg_tl_tradelicense tl + LEFT OUTER JOIN message ON split_part(message.code,'_',2) = status AND split_part(message.code,'_',1)='TL' AND message.locale = 'en_IN' + WHERE tl.tenantid=$tenantid + groupby: GROUP BY message.message + orderby: ORDER BY case message.message when 'Pending Application' then 1 when 'Pending Payment' then 2 when 'Pending Approval' then 3 when 'Approved' then 4 when 'Rejected' then 5 when 'Cancelled' then 6 else 7 end + + +- reportName: StateLevelTradeWiseCollection_v2 + summary: Collection according to tradeTypes state level + version: 1.0.0 + moduleName: rainmaker-tl + sourceColumns: + - name: tenantId + label: report.tl.tenantid + type: string + source: tl + total: false + - name: transactionNumber + label: report.tl.totalTransaction + type: string + source: tl + total: true + - name: online + label: report.tl.online.collection + type: string + source: tl + total: true + - name: offline + label: report.tl.offline.collection + type: string + source: tl + total: true + - name: total + label: report.tl.totalCollection + type: string + source: tl + total: true + searchParams: + - name: fromDate + label: reports.tl.fromDate + type: epoch + source: tl + isMandatory: false + searchClause: AND paydetail.receiptdate >= $fromDate + - name: toDate + label: reports.tl.toDate + type: epoch + source: tl + isMandatory: false + searchClause: AND paydetail.receiptdate <= $toDate + - name: ulb + label: ULB + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: tl + wrapper: true + isMandatory: false + searchClause: AND payment.tenantId = $ulb + query: | + select + sum(payment.totalamountpaid) as total, + count(*) as transactionNumber, + sum(case when payment.paymentmode!='ONLINE' then payment.totalamountpaid else 0 end) as offline, + sum(case payment.paymentmode when 'ONLINE' then payment.totalamountpaid else 0 end) as online, + initcap(split_part(payment.tenantId, '.', 2)) as tenantId + from egcl_payment as payment + inner join egcl_paymentdetail as paydetail on paydetail.paymentid=payment.id + where paydetail.businessservice = 'TL' and payment.tenantid !='pb.testing' and payment.paymentstatus != 'CANCELLED' + groupby: GROUP BY payment.tenantId + orderby: ORDER BY payment.tenantId asc + + +- reportName: StateLevelTradeLicenseRegistryReport_v2 + decryptionPathId: StateLevelTradeLicenseRegistryReport_v2 + summary: TL Basic Report State Level + version: 1.0.0 + moduleName: rainmaker-tl + sourceColumns: + - name: tenantId + label: report.tl.tenantId + type: string + source: tl + total: false + - name: licensenumber + label: report.tl.licensenumber + type: string + source: tl + total: false + - name: formattedIssuedDate + label: report.tl.issueddate + type: string + source: tl + total: false + - name: g8issuedate + label: report.tl.g8issuedate + type: string + source: tl + total: false + - name: g8receiptno + label: report.tl.g8receiptno + type: string + source: tl + total: false + - name: name + label: report.tl.user.name + type: string + source: tl + total: false + - name: mobilenumber + label: report.tl.user.mobilenumber + type: string + source: tl + total: false + - name: tradeTypeName + label: report.tl.tradetype + type: string + source: tl + total: false + - name: acc + label: report.tl.accessorycategories + type: string + source: tl + total: false + - name: tradeName + label: report.tl.tradeName + type: string + source: tl + total: false + - name: totalamount + label: report.tl.receipt.totalamount + type: string + source: tl + total: true + searchParams: + - name: fromDate + label: reports.tl.fromDate + type: epoch + source: tl + isMandatory: false + searchClause: AND issueddate >= $fromDate + - name: toDate + label: reports.tl.toDate + type: epoch + source: tl + isMandatory: false + searchClause: AND issueddate <= $toDate + - name: ulb + label: ULB + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: tl + wrapper: true + isMandatory: false + searchClause: AND tl.tenantId = $ulb + query: | + SELECT + tl.tenantId as tenantId, + licensenumber, + to_char((To_timestamp(issueddate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as formattedIssuedDate, + tl.tradeName, + tradeTypeName, + acc, + name, + mobilenumber, + paydetail.amountpaid as totalamount, + To_char((To_timestamp(paydetail.manualreceiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') AS g8issuedate, + paydetail.manualreceiptnumber as g8receiptno + FROM eg_tl_tradelicense tl + INNER JOIN eg_tl_tradelicensedetail tld ON tld.tradelicenseid = tl.id + INNER JOIN eg_tl_owner tlowner ON tlowner.tradelicensedetailid = tld.id + INNER JOIN ( + SELECT tradelicensedetailid, array_to_string(array_agg(message.message),', ') as tradeTypeName FROM eg_tl_tradeunit + LEFT OUTER JOIN message ON code = CONCAT('TRADELICENSE_TRADETYPE_', REGEXP_REPLACE(tradetype, '[^A-Za-z0-9]','_','g')) AND message.locale = 'en_IN' GROUP BY 1) tlunit ON tlunit.tradelicensedetailid = tld.id + INNER JOIN eg_user tluser ON tluser.uuid = tlowner.id + LEFT OUTER JOIN egcl_bill as bill ON bill.consumercode = tl.applicationnumber + inner join egcl_paymentdetail as paydetail on paydetail.billid=bill.id + LEFT OUTER JOIN + ( + SELECT tradelicensedetailid,array_to_string(array_agg(message.message),',') AS acc FROM eg_tl_accessory + LEFT OUTER JOIN message ON code=CONCAT('TRADELICENSE_ACCESSORIESCATEGORY_', REGEXP_REPLACE(accessorycategory, '[^A-Za-z0-9]','_', 'g')) AND message.locale = 'en_IN' GROUP BY 1 ) tlacc ON tlacc.tradelicensedetailid = tld.id + WHERE tl.Status = 'APPROVED' + orderby: ORDER BY tl.tenantId asc + + +- reportName: SearchTradeLicenseApplicationReport_v2 + decryptionPathId: SearchTradeLicenseApplicationReport_v2 + summary: TL Search Application Report + version: 1.0.0 + moduleName: rainmaker-tl + sourceColumns: + - name: applicationnumber + label: report.tl.applicationnumber + type: string + source: tl + total: false + - name: licensenumber + label: report.tl.licensenumber + type: string + source: tl + total: false + - name: tradeName + label: report.tl.tradeName + type: string + source: tl + total: false + - name: name + label: report.tl.user.name + type: string + source: tl + total: false + - name: mobilenumber + label: report.tl.user.mobilenumber + type: string + source: tl + total: false + - name: formattedIssuedDate + label: report.tl.issueddate + type: string + source: tl + total: false + - name: status + label: report.tl.status + type: string + source: tl + total: false + searchParams: + - name: fromDate + label: reports.tl.fromDate + type: epoch + source: tl + isMandatory: false + searchClause: AND tl.applicationdate >= $fromDate + - name: toDate + label: reports.tl.toDate + type: epoch + source: tl + isMandatory: false + searchClause: AND tl.applicationdate <= $toDate + - name: localityArray + label: reports.tl.zoneList + type: boundarylist + source: tl + isMandatory: false + searchClause: AND tla.locality IN ($localityArray) + query: | + SELECT + tl.applicationnumber, + tl.licensenumber, + tl.tradeName, + (split_part(tl.tenantId, '.', 2)) as tenantId, + split_part(ownername,',',1) as ownername, + split_part(mobilenumber,',',1) as mobilenumber, + tla.locality, + to_char((To_timestamp(applicationdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as applicationDate, + tl.status + from eg_tl_tradelicense as tl + INNER JOIN eg_tl_tradelicensedetail tld ON + tld.tradelicenseid = tl.id + INNER JOIN eg_tl_address as tla ON + tla.tradelicensedetailid=tld.id + INNER JOIN (SELECT tradelicensedetailid, array_to_string(array_agg(name),', ') as ownername, array_to_string(array_agg(mobilenumber),', ') as mobilenumber + FROM eg_tl_owner tlowner + INNER JOIN eg_user tluser ON + tluser.uuid = tlowner.id + group by tradelicensedetailid + ) tlown ON tlown.tradelicensedetailid = tld.id + WHERE tl.tenantid=$tenantid + + +- reportName: TradeLicenseDetailsReport_v2 + decryptionPathId: TradeLicenseDetailsReport_v2 + summary: Trade License Details Report + version: 1.0.0 + moduleName: rainmaker-tl + sourceColumns: + - name: applicationnumber + label: report.tl.applicationnumber + type: string + source: tl + total: false + - name: propertyid + label: report.tl.propertyid + type: string + source: tl + total: false + - name: financialyear + label: report.tl.financialyear + type: string + source: tl + total: false + - name: licensetype + label: report.tl.licensetype + type: string + source: tl + total: false + - name: oldlicensenumber + label: report.tl.oldlicensenumber + type: string + source: tl + total: false + - name: licensenumber + label: report.tl.licensenumber + type: string + source: tl + total: false + - name: tradeName + label: report.tl.tradeName + type: string + source: tl + total: false + - name: name + label: report.tl.user.name + type: string + source: tl + total: false + - name: mobilenumber + label: report.tl.user.mobilenumber + type: string + source: tl + total: false + - name: formattedIssuedDate + label: report.tl.issueddate + type: string + source: tl + total: false + - name: tradeTypeName + label: report.tl.tradetype + type: string + source: tl + total: false + - name: acc + label: report.tl.accessorycategories + type: string + source: tl + total: false + - name: totalamount + label: report.tl.receipt.totalamount + type: string + source: tl + total: true + - name: zone + label: report.tl.zone + type: string + source: tl + total: false + - name: ward_block + label: report.tl.locality + type: string + source: tl + total: false + - name: locality + label: report.tl.locality + type: string + source: tl + total: false + - name: status + label: report.tl.receipt.status + type: string + source: tl + total: false + searchParams: + - name: fromDate + label: reports.tl.fromDate + type: epoch + source: tl + isMandatory: false + searchClause: AND applicationdate >= $fromDate + - name: toDate + label: reports.tl.toDate + type: epoch + source: tl + isMandatory: false + searchClause: AND applicationdate <= $toDate + - name: localityArray + label: reports.tl.zoneList + type: boundarylist + source: tl + isMandatory: false + searchClause: AND eg_tl_address.locality IN ($localityArray) + query: | + SELECT + tl.applicationnumber as applicationnumber, + locality_tlb.locality as locality, + eg_bndry_mohalla.blockcode as ward_block, + eg_bndry_mohalla.zonecode as zone, + propertyid, + financialyear, + (case when oldlicensenumber is null then 'New' else 'Renewal' end) AS licensetype, + oldlicensenumber, + licensenumber, + to_char((To_timestamp(issueddate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as formattedIssuedDate, + tl.tradeName, + tradeTypeName, + acc, + name, + mobilenumber, + paydetail.amountpaid as totalamount, + tl.status as status + FROM eg_tl_tradelicense tl + INNER JOIN eg_tl_tradelicensedetail tld ON tld.tradelicenseid = tl.id + INNER JOIN ( + select tradelicensedetailid, array_to_string(array_agg(message.message),', ') as locality,array_to_string(array_agg(locality),', ') as localitycode from eg_tl_address as tla + LEFT OUTER JOIN message on code=CONCAT(UPPER(REGEXP_REPLACE( $tenantid , '[^A-Za-z0-9]','_', 'g')),'_REVENUE_', REGEXP_REPLACE( locality , '[^A-Za-z0-9]','_', 'g')) + AND message.locale = 'en_IN' group by 1) locality_tlb ON locality_tlb.tradelicensedetailid = tld.id + INNER JOIN eg_tl_owner tlowner ON tlowner.tradelicensedetailid = tld.id + INNER JOIN ( + SELECT tradelicensedetailid, array_to_string(array_agg(message.message),', ') as tradeTypeName FROM eg_tl_tradeunit + LEFT OUTER JOIN message ON code = CONCAT('TRADELICENSE_TRADETYPE_', REGEXP_REPLACE(tradetype, '[^A-Za-z0-9]','_','g')) AND message.locale = 'en_IN' GROUP BY 1) tlunit ON tlunit.tradelicensedetailid = tld.id + INNER JOIN eg_user tluser ON tluser.uuid = tlowner.id + LEFT OUTER JOIN egcl_bill bill ON bill.consumercode = tl.applicationnumber + LEFT OUTER JOIN egcl_paymentdetail as paydetail on paydetail.billid=bill.id + INNER JOIN eg_tl_address ON eg_tl_address.tradelicensedetailid = tld.id + INNER JOIN eg_bndry_mohalla ON eg_bndry_mohalla.localitycode= eg_tl_address.locality + LEFT OUTER JOIN + ( + SELECT tradelicensedetailid,array_to_string(array_agg(message.message),',') AS acc FROM eg_tl_accessory + LEFT OUTER JOIN message ON code=CONCAT('TRADELICENSE_ACCESSORIESCATEGORY_', REGEXP_REPLACE(accessorycategory, '[^A-Za-z0-9]','_', 'g')) AND message.locale = 'en_IN' GROUP BY 1 ) tlacc ON tlacc.tradelicensedetailid = tld.id + WHERE tl.tenantid=$tenantid + + +- reportName: StateDefaulterReport_v2 + decryptionPathId: StateDefaulterReport_v2 + summary: TL Defautler + version: 1.0.0 + moduleName: rainmaker-tl + sourceColumns: + - name: ulb + label: report.tl.ulb + type: string + source: tl + total: false + - name: licensenumber + label: report.tl.licensenumber + type: string + source: tl + total: false + - name: applicationnumber + label: report.tl.applicationnumber + type: string + source: tl + total: false + - name: oldlicensenumber + label: report.tl.oldlicensenumber + type: string + source: tl + total: false + - name: financialyear + label: report.tl.financialyear + type: string + source: tl + total: false + - name: tradename + label: report.tl.tradename + type: string + source: tl + total: false + - name: ownername + label: report.tl.ownername + type: string + source: tl + total: false + - name: mobilenumber + label: report.tl.mobilenumber + type: string + source: tl + total: false + query: | + select + split_part(tenantid,'.',2) as ulb, + licensenumber, + applicationnumber, + oldlicensenumber, + financialyear, + tradename, + split_part(name,',',1) as ownername, + split_part(mobilenumber,',',1) as mobilenumber + from eg_tl_tradelicense tl + INNER JOIN eg_tl_tradelicensedetail tld ON tld.tradelicenseid = tl.id + INNER JOIN ( + SELECT tradelicensedetailid, array_to_string(array_agg(name),', ') as name, array_to_string(array_agg(mobilenumber),', ') as mobilenumber + FROM eg_tl_owner tlowner + INNER JOIN eg_user tluser ON tluser.uuid = tlowner.id + group by tradelicensedetailid + ) tlown ON tlown.tradelicensedetailid = tld.id + where validto < extract (epoch from NOW())*1000 and licensenumber is not null and licensenumber not in (select oldlicensenumber from eg_tl_tradelicense where oldlicensenumber is not null) + and tenantid!='pb.testing' + orderby: order by tenantid + + +- reportName: ULBDefaulterReport_v2 + decryptionPathId: StateDefaulterReport_v2 + summary: TL Defautler + version: 1.0.0 + moduleName: rainmaker-tl + sourceColumns: + - name: ulb + label: report.tl.ulb + type: string + source: tl + total: false + - name: licensenumber + label: report.tl.licensenumber + type: string + source: tl + total: false + - name: applicationnumber + label: report.tl.applicationnumber + type: string + source: tl + total: false + - name: oldlicensenumber + label: report.tl.oldlicensenumber + type: string + source: tl + total: false + - name: financialyear + label: report.tl.financialyear + type: string + source: tl + total: false + - name: tradename + label: report.tl.tradename + type: string + source: tl + total: false + - name: ownername + label: report.tl.ownername + type: string + source: tl + total: false + - name: zonename + label: report.tl.zonename + type: string + source: tl + total: false + - name: blockname + label: report.tl.blockname + type: string + source: tl + total: false + - name: mobilenumber + label: report.tl.mobilenumber + type: string + source: tl + total: false + query: | + select + distinct on (tl.applicationnumber) + applicationnumber, + split_part(tl.tenantid,'.',2) as ulb, + licensenumber, + oldlicensenumber, + financialyear, + tradename, + zonename, + blockname, + split_part(name,',',1) as ownername, + split_part(mobilenumber,',',1) as mobilenumber + from eg_tl_tradelicense tl + INNER JOIN eg_tl_tradelicensedetail tld ON tld.tradelicenseid = tl.id + inner join eg_tl_address as tla on tla.tradelicensedetailid = tld.id + inner join eg_bndry_mohalla on eg_bndry_mohalla.localitycode=tla.locality + INNER JOIN ( + SELECT tradelicensedetailid, array_to_string(array_agg(name),', ') as name, array_to_string(array_agg(mobilenumber),', ') as mobilenumber + FROM eg_tl_owner tlowner + INNER JOIN eg_user tluser ON tluser.uuid = tlowner.id + group by tradelicensedetailid + ) tlown ON tlown.tradelicensedetailid = tld.id + where validto < extract (epoch from NOW())*1000 and licensenumber is not null and licensenumber not in (select oldlicensenumber from eg_tl_tradelicense where oldlicensenumber is not null) + and tl.tenantid = $tenantid + + + +- reportName: StateTradeLicenseDetailsReport_v2 + decryptionPathId: TradeLicenseDetailsReport_v2 + summary: State Trade License Details Report + version: 1.0.0 + moduleName: rainmaker-tl + sourceColumns: + - name: applicationnumber + label: report.tl.applicationnumber + type: string + source: tl + total: false + - name: propertyid + label: report.tl.propertyid + type: string + source: tl + total: false + - name: financialyear + label: report.tl.financialyear + type: string + source: tl + total: false + - name: licensetype + label: report.tl.licensetype + type: string + source: tl + total: false + - name: oldlicensenumber + label: report.tl.oldlicensenumber + type: string + source: tl + total: false + - name: licensenumber + label: report.tl.licensenumber + type: string + source: tl + total: false + - name: tradeName + label: report.tl.tradeName + type: string + source: tl + total: false + - name: name + label: report.tl.user.name + type: string + source: tl + total: false + - name: mobilenumber + label: report.tl.user.mobilenumber + type: string + source: tl + total: false + - name: formattedIssuedDate + label: report.tl.issueddate + type: string + source: tl + total: false + - name: tradeTypeName + label: report.tl.tradetype + type: string + source: tl + total: false + - name: acc + label: report.tl.accessorycategories + type: string + source: tl + total: false + - name: totalamount + label: report.tl.receipt.totalamount + type: string + source: tl + total: true + - name: tenantid + label: report.tl.tenantid + type: string + source: tl + total: false + - name: address + label: report.tl.address + type: string + source: tl + total: false + - name: emailid + label: report.tl.emailid + type: string + source: tl + total: false + - name: status + label: report.tl.receipt.status + type: string + source: tl + total: false + searchParams: + - name: fromDate + label: reports.tl.fromDate + type: epoch + source: tl + isMandatory: false + searchClause: AND tl.applicationdate >= $fromDate + - name: toDate + label: reports.tl.toDate + type: epoch + source: tl + isMandatory: false + searchClause: AND tl.applicationdate <= $toDate + query: | + SELECT + tl.applicationnumber as applicationnumber, + propertyid, + financialyear, + (case when oldlicensenumber is null then 'New' else 'Renewal' end) AS licensetype, + oldlicensenumber, + string_agg(tl.licensenumber, ', ') as "licensenumber", + to_char((To_timestamp(issueddate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as formattedIssuedDate, + string_agg(tl.tradeName, ', ') as "tradeName", + string_agg(tl.tenantid, ', ') as "tenantid", + tradeTypeName, + acc, + name, + (case when emailid is null then '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' else emailid end) as emailid, + string_agg(distinct REGEXP_REPLACE(REGEXP_REPLACE(CONCAT(tla.doorno, ',', tla.buildingname, ',',tla.street,',',tla.localityname,',', tla.pincode), ',+', ','), '^,|,$', ''),',') as "address", + mobilenumber, + paydetail.amountpaid as totalamount, + tl.status as status + FROM eg_tl_tradelicense tl + INNER JOIN eg_tl_tradelicensedetail tld ON tld.tradelicenseid = tl.id + inner join (SELECT tradelicensedetailid , locality,doorno,street,buildingname,pincode,localityname, max(createdtime) + from eg_tl_address inner join eg_bndry_mohalla on eg_bndry_mohalla.localitycode=eg_tl_address.locality where eg_tl_address.tenantid=eg_bndry_mohalla.tenantid + group by tradelicensedetailid, locality, doorno,street,buildingname,pincode,localityname) tla ON tld.id=tla.tradelicensedetailid + INNER JOIN eg_tl_owner tlowner ON tlowner.tradelicensedetailid = tld.id + INNER JOIN ( + SELECT tradelicensedetailid, array_to_string(array_agg(message.message),', ') as tradeTypeName FROM eg_tl_tradeunit + LEFT OUTER JOIN message ON code = CONCAT('TRADELICENSE_TRADETYPE_', REGEXP_REPLACE(tradetype, '[^A-Za-z0-9]','_','g')) AND message.locale = 'en_IN' GROUP BY 1) tlunit ON tlunit.tradelicensedetailid = tld.id + INNER JOIN eg_user tluser ON tluser.uuid = tlowner.id + LEFT OUTER JOIN egcl_bill bill ON bill.consumercode = tl.applicationnumber + LEFT OUTER JOIN egcl_paymentdetail as paydetail on paydetail.billid=bill.id + INNER JOIN eg_tl_address ON eg_tl_address.tradelicensedetailid = tld.id + LEFT OUTER JOIN + ( + SELECT tradelicensedetailid,array_to_string(array_agg(message.message),',') AS acc FROM eg_tl_accessory + LEFT OUTER JOIN message ON code=CONCAT('TRADELICENSE_ACCESSORIESCATEGORY_', REGEXP_REPLACE(accessorycategory, '[^A-Za-z0-9]','_', 'g')) AND message.locale = 'en_IN' GROUP BY 1 ) tlacc ON tlacc.tradelicensedetailid = tld.id + WHERE tl.tenantid!='pb.testing' + groupby: group by tl.applicationnumber, tl.propertyid, tl.financialyear, tl.oldlicensenumber, tl.issueddate, tlunit.tradetypename, tlacc.acc,tluser.name,tluser.emailid, tluser.mobilenumber,paydetail.amountpaid, tl.status,tl.tenantid + orderby: order by tl.tenantid + +- reportName: TradeLicensePendencyReport_v2 + decryptionPathId: TradeLicensePendencyReport_v2 + summary: Trade License Pendency Report + version: 1.0.0 + moduleName: rainmaker-tl + sourceColumns: + - name: applicationnumber + label: report.tl.applicationnumber + type: string + source: tl + total: false + - name: tradename + label: report.tl.tradename + type: string + source: tl + total: false + - name: financialyear + label: report.tl.financialyear + type: string + source: tl + total: false + - name: licensetype + label: report.tl.licensetype + type: string + source: tl + total: false + - name: licensenumber + label: report.tl.licensenumber + type: string + source: tl + total: false + - name: name + label: report.tl.user.name + type: string + source: tl + total: false + - name: totalamount + label: report.tl.totalamount + type: string + source: tl + total: true + - name: status + label: report.tl.status + type: string + source: tl + total: false + - name: assignee + label: report.tl.assignee + type: string + source: tl + total: false + - name: days + label: report.tl.days + type: string + source: tl + total: false + searchParams: + - name: fromDate + label: reports.tl.fromDate + type: epoch + source: tl + isMandatory: false + searchClause: AND applicationdate >= $fromDate + - name: toDate + label: reports.tl.toDate + type: epoch + source: tl + isMandatory: false + searchClause: AND applicationdate <= $toDate + query: | + SELECT + string_agg(DISTINCT t.applicationnumber,',')as applicationnumber, + string_agg(DISTINCT t.tradeName,',') as tradename, + string_agg(DISTINCT financialyear,',') as financialyear, + t.applicationdate, + string_agg(DISTINCT(case when oldlicensenumber is null then 'New' else 'Renewal' end),',') AS licensetype, + string_agg(distinct licensenumber,',') as licensenumber, + split_part(string_agg(u.name,','),',',1) as name, -- string_agg(name,',') as name, + string_agg(distinct paydetail.amountpaid::varchar,',') as totalamount, + string_agg(distinct t.status,',') as status, + split_part(string_agg(distinct us.name,','),',',1) as assignee, + CURRENT_DATE- to_timestamp(cast(t.applicationdate/1000 as bigint))::date as days + FROM eg_tl_tradelicense t INNER JOIN eg_tl_tradelicensedetail td ON td.tradelicenseid = t.id + INNER JOIN eg_tl_owner O ON O.tradelicensedetailid = td.id + INNER JOIN eg_user u ON u.uuid = O.id + LEFT OUTER JOIN egcl_bill bill ON bill.consumercode = t.applicationnumber + LEFT OUTER JOIN egcl_paymentdetail as paydetail on paydetail.billid=bill.id + INNER JOIN eg_wf_processinstance_v2 AS WFP ON WFP.businessid=t.applicationnumber and WFP.lastmodifiedtime + in (select max(lastmodifiedtime) from eg_wf_processinstance_v2 where businessid=t.applicationnumber) + INNER JOIN eg_wf_assignee_v2 as W ON W.processinstanceid=WFP.id + INNER JOIN eg_user us ON us.uuid = W.assignee + WHERE t.status NOT IN ('APPROVED','CANCELLED','REJECTED','PENDINGPAYMENT','INITIATED') + and t.tenantid=$tenantid + groupby: GROUP BY O.tradelicensedetailid,applicationdate + orderby: ORDER BY applicationnumber DESC + +- reportName: EmployeeWiseCollectionTL_v2 + decryptionPathId: MiscReceiptULB_v2 + summary: Employee Wise Collection TL + version: 1.0.0 + moduleName: rainmaker-tl + additionalConfig: + print: + pdfPageSize: "A3" + sourceColumns: + - name: collectorname + label: reports.tl.collectorname + type: string + source: tl + total: false + - name: paymentmode + label: reports.tl.paymentmode + type: string + source: tl + total: false + - name: countofreceipts + label: reports.tl.countofreceipts + type: string + source: tl + total: true + - name: totalamount + label: reports.tl.totalamount + type: string + source: tl + total: true + searchParams: + - name: fromDate + label: reports.tl.fromDate + type: epoch + source: tl + isMandatory: false + searchClause: AND receipt.createddate >= $fromDate + - name: toDate + label: reports.tl.toDate + type: epoch + source: tl + isMandatory: false + searchClause: AND receipt.createddate <= $toDate + - name: collectorname + label: reports.tl.collectorname + type: singlevaluelist + pattern: http://egov-hrms:8080/egov-hrms/employees/_search?tenantId=$tenantid&roles=TL_CEMP|$.Employees[*].user.id|$.Employees[*].user.name + source: pt + wrapper: true + isMandatory: false + searchClause: AND eg_user.id = $collectorname::INTEGER + query: | + SELECT + eg_user.name as collectorname, + paymentmode as paymentmode, + count(paydetail.receiptnumber) as Countofreceipts, + Sum(payment.totalamountpaid) as totalamount + FROM egcl_payment AS payment + JOIN egcl_paymentdetail as paydetail on paydetail.paymentid=payment.id + JOIN eg_user ON payment.createdby::INTEGER=eg_user.id + WHERE payment.tenantid=$tenantid AND businessservice in ('TL') and payment.paymentstatus != 'CANCELLED' + groupby: GROUP BY collectorname , paymentmode + +- reportName: TLReceiptRegister_7to10Sept2020 + decryptionPathId: TradeLicenseRegistryReport_v2 + summary: TLReceiptRegister_7to10Sept2020 + version: 1.0.0 + moduleName: rainmaker-tl + additionalConfig: + print: + pdfPageSize: "A3" + sourceColumns: + - name: tenantid + label: reports.tl.tenantid + type: string + source: tl + total: false + - name: receiptnumber + label: reports.tl.receiptnumber + type: string + source: tl + total: false + - name: receiptissuedate + label: reports.tl.receiptissuedate + type: string + source: tl + total: false + - name: g8issuedate + label: reports.tl.g8issuedate + type: string + source: tl + total: false + - name: g8receiptno + label: reports.tl.g8receiptno + type: string + source: tl + total: false + - name: name + label: reports.tl.name + type: string + source: tl + total: false + - name: formattedissueddate + label: reports.tl.formattedissueddate + type: string + source: tl + total: false + - name: licensenumber + label: reports.tl.licensenumber + type: string + source: tl + total: false + - name: acc + label: reports.tl.acc + type: string + source: tl + total: false + - name: tradename + label: reports.tl.tradename + type: string + source: tl + total: true + - name: status + label: reports.tl.status + type: string + source: tl + total: false + - name: tradetypename + label: reports.tl.tradetypename + type: string + source: tl + total: true + - name: totalamount + label: reports.tl.totalamount + type: string + source: tl + total: true + - name: transactionnumber + label: reports.tl.transactionnumber + type: string + source: tl + total: false + - name: instrumenttype + label: reports.tl.instrumenttype + type: string + source: tl + total: false + - name: mobilenumber + label: reports.tl.mobilenumber + type: string + source: tl + total: false + - name: collectorname + label: reports.tl.collectorname + type: string + source: tl + total: false + + query: | + -- Use CTE to force query plan, compute & use CTE later + SELECT + licensenumber, formattedissueddate, tradename, status, receiptissuedate, receiptnumber, tradetypename, acc, + name, mobilenumber,transactionnumber, instrumenttype, totalamount, g8issuedate, g8receiptno, collectorname,tenantid from tl_7to10sept2020_receipts + where tenantid=$tenantid + orderby: ORDER BY receiptissuedate DESC + + +- reportName: StateTradesubtype_v2 + decryptionPathId: TradeLicenseDetailsReport_v2 + summary: State Trade Subtype Collection Report + version: 1.0.0 + moduleName: rainmaker-tl + sourceColumns: + - name: tradetype + label: report.tl.tradetype + type: string + source: tl + total: false + - name: count + label: report.tl.count + type: string + source: tl + total: false + - name: collectionamount + label: report.tl.collectionamount + type: string + source: tl + total: false + - name: tradesubtype + label: report.tl.tradesubtype + type: string + source: tl + total: false + - name: workflowcode + label: report.tl.workflowcode + type: string + source: tl + total: false + - name: category + label: report.tl.category + type: string + source: tl + total: false + searchParams: + - name: fromDate + label: reports.tl.fromDate + type: epoch + source: tl + isMandatory: false + searchClause: AND tl.applicationdate >= $fromDate + - name: toDate + label: reports.tl.toDate + type: epoch + source: tl + isMandatory: false + searchClause: AND tl.applicationdate <= $toDate + query: | + SELECT + tradetype,count(*) as count,sum(pd.amountpaid) as collectionamount,message as tradesubtype,workflowcode, + (case when tl.workflowcode!='NEWTL.HAZ' then 'Non Hazardeous' else 'Hazardeous' end) as category + from eg_tl_tradelicense tl + inner join eg_tl_tradelicensedetail td on td.tradelicenseid=tl.id + inner join eg_tl_tradeunit tu on tu.tradelicensedetailid=td.id + inner join egbs_billdetail_v1 bd on bd.consumercode=tl.applicationnumber + inner join message on message.code=replace(concat('TRADELICENSE_TRADETYPE_',replace(tradetype,'.','_')),'-','_') + inner join egcl_paymentdetail pd on pd.billid=bd.billid + where status='APPROVED' and tl.tenantid!='pb.testing' + groupby: GROUP BY tradetype,message,workflowcode; + + + + + + diff --git a/configs/reports/configs/uc-reports.yml b/configs/reports/configs/uc-reports.yml new file mode 100644 index 00000000..bcf1e6ba --- /dev/null +++ b/configs/reports/configs/uc-reports.yml @@ -0,0 +1,2404 @@ +ReportDefinitions: + - reportName: MiscReceipt + summary: Receipt Register Miscellaneous + version: 1.0.0 + moduleName: rainmaker-uc + sourceColumns: + - name: ulb + label: reports.uc.ulb + type: string + source: uc + total: false + - name: receiptnumber + label: reports.uc.receiptnumber + type: string + source: uc + total: false + - name: receiptdate + label: reports.uc.receiptdate + type: string + source: uc + total: false + - name: g8issuedate + label: reports.uc.g8issuedate + type: string + source: uc + total: false + - name: g8receiptno + label: reports.uc.g8receiptno + type: string + source: uc + total: false + - name: status + label: reports.uc.receiptstatus + type: string + source: uc + total: false + - name: servicecategory + label: reports.uc.businessdetails + type: string + source: uc + total: false + - name: cgst + label: reports.uc.cgst + type: string + source: uc + total: true + - name: tax + label: reports.uc.tax + type: string + source: uc + total: true + - name: fieldcollection + label: reports.uc.fieldcollection + type: string + source: uc + total: true + - name: sgst + label: reports.uc.sgst + type: string + source: uc + total: true + - name: ddorchequenumber + label: reports.uc.ddorchequenumber + type: string + source: uc + total: false + - name: collectiontype + label: reports.uc.collectiontype + type: string + source: uc + total: false + - name: collectorname + label: reports.uc.collectorname + type: string + source: uc + total: false + - name: totalamount + label: reports.uc.totalamount + type: string + source: uc + total: true + - name: paymentmode + label: reports.uc.paymentmode + type: string + source: uc + total: false + searchParams: + - name: fromDate + label: reports.uc.fromDate + type: epoch + source: uc + isMandatory: false + searchClause: AND rh.receiptdate >= $fromDate + - name: toDate + label: reports.uc.toDate + type: epoch + source: uc + isMandatory: false + searchClause: AND rh.receiptdate <= $toDate + - name: ulb + label: reports.uc.ulb + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: uc + wrapper: true + isMandatory: false + searchClause: AND rh.tenantid = $ulb + query: | + -- Use CTE to force query plan, compute & use CTE later + WITH receipt_breakup AS ( + SELECT + receiptheader, + SUM(CASE WHEN taxheadcode LIKE '%_CGST' THEN adjustedamount ELSE 0 END) as cgst, + SUM(CASE WHEN taxheadcode LIKE '%_TAX' THEN adjustedamount ELSE 0 END) as tax, + SUM(CASE WHEN taxheadcode LIKE '%_SGST' THEN adjustedamount ELSE 0 END) as sgst, + SUM(CASE WHEN taxheadcode LIKE '%_FIELD_FEE' THEN adjustedamount ELSE 0 END) as fieldcollection + FROM egcl_receiptdetails_v1 as rd + INNER JOIN egcl_receiptheader_v1 as rh on rh.id = rd.receiptheader + WHERE rh.status != 'Cancelled' AND rh.tenantid!='pb.testing' AND businessdetails not in ('PT','TL') + GROUP BY rd.receiptheader + ) + SELECT + rh.tenantid as ulb, + rh.receiptnumber as receiptnumber, + To_char((To_timestamp(rh.receiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as receiptdate, + To_char((To_timestamp(rh.manualreceiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as g8issuedate, + rh.manualreceiptnumber as g8receiptno, + rh.status as status, + businessdetails as servicecategory, + receipt_breakup.*, + amount as totalamount, + instrumenttype as paymentmode, + (case when instrumenttype like 'Cash' then '' else transactionnumber end) as ddorchequenumber, + 'System' as collectiontype, + eg_user.name as collectorname + FROM egcl_receiptheader_v1 AS rh + JOIN egcl_receiptinstrument_v1 AS ri ON rh.id = ri.receiptheader + JOIN egcl_instrumentheader_v1 AS ih ON ih.id = ri.instrumentheader + JOIN receipt_breakup ON rh.id = receipt_breakup.receiptheader + JOIN eg_user ON rh.createdby::INTEGER=eg_user.id + WHERE rh.status != 'Cancelled' AND rh.tenantid!='pb.testing' AND businessdetails not in ('PT','TL') + orderby: ORDER BY rh.receiptdate DESC + + - reportName: MiscReceiptULB + summary: Receipt Register Miscellaneous + version: 1.0.0 + moduleName: rainmaker-uc + additionalConfig: + print: + pdfPageSize: "A3" + sourceColumns: + - name: ulb + label: reports.uc.ulb + type: string + source: uc + total: false + - name: receiptnumber + label: reports.uc.receiptnumber + type: string + source: uc + total: false + - name: receiptdate + label: reports.uc.receiptdate + type: string + source: uc + total: false + - name: g8issuedate + label: reports.uc.g8issuedate + type: string + source: uc + total: false + - name: g8receiptno + label: reports.uc.g8receiptno + type: string + source: uc + total: false + - name: status + label: reports.uc.receiptstatus + type: string + source: uc + total: false + - name: servicecategory + label: reports.uc.businessdetails + type: string + source: uc + total: false + - name: cgst + label: reports.uc.cgst + type: string + source: uc + total: true + - name: tax + label: reports.uc.tax + type: string + source: uc + total: true + - name: fieldcollection + label: reports.uc.fieldcollection + type: string + source: uc + total: true + - name: sgst + label: reports.uc.sgst + type: string + source: uc + total: true + - name: ddorchequenumber + label: reports.uc.ddorchequenumber + type: string + source: uc + total: false + - name: ddchequedate + label: reports.uc.ddorchequedate + type: string + source: uc + total: false + - name: bankname + label: reports.uc.bankname + type: string + source: uc + total: false + - name: branchname + label: reports.uc.branchname + type: string + source: uc + total: false + - name: collectiontype + label: reports.uc.collectiontype + type: string + source: uc + total: false + - name: collectorname + label: reports.uc.collectorname + type: string + source: uc + total: false + - name: totalamount + label: reports.uc.totalamount + type: string + source: uc + total: true + - name: paymentmode + label: reports.uc.paymentmode + type: string + source: uc + total: false + - name: comments + label: reports.uc.comment + type: string + source: uc + total: false + searchParams: + - name: fromDate + label: reports.uc.fromDate + type: epoch + source: uc + isMandatory: true + searchClause: AND rh.receiptdate >= $fromDate + - name: toDate + label: reports.uc.toDate + type: epoch + source: uc + isMandatory: true + searchClause: AND rh.receiptdate <= $toDate + - name: businessservice + label: reports.uc.businessservice + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=BillingService&masterName=BusinessService&tenantId=$tenantid|$.MdmsRes.BillingService.BusinessService[*].code|$.MdmsRes.BillingService.BusinessService[*].code + source: uc + wrapper: true + isMandatory: false + searchClause: AND rh.businessdetails = $businessservice + - name: collectorname + label: reports.uc.collectorname + type: singlevaluelist + pattern: http://egov-hrms:8080/egov-hrms/employees/_search?tenantId=$tenantid&roles=UC_EMP|$.Employees[*].user.id|$.Employees[*].user.name + source: uc + wrapper: true + isMandatory: false + searchClause: AND eg_user.id = $collectorname::INTEGER + query: | + -- Use CTE to force query plan, compute & use CTE later + WITH receipt_breakup AS ( + SELECT + receiptheader, + SUM(CASE WHEN taxheadcode LIKE '%_CGST' THEN adjustedamount ELSE 0 END) as cgst, + SUM(CASE WHEN taxheadcode LIKE '%_TAX' THEN adjustedamount ELSE 0 END) as tax, + SUM(CASE WHEN taxheadcode LIKE '%_SGST' THEN adjustedamount ELSE 0 END) as sgst, + SUM(CASE WHEN taxheadcode LIKE '%_FIELD_FEE' THEN adjustedamount ELSE 0 END) as fieldcollection + FROM egcl_receiptdetails_v1 as rd + INNER JOIN egcl_receiptheader_v1 as rh on rh.id = rd.receiptheader + where status!='Cancelled' and businessdetails not in ('PT','TL') and rd.tenantid=$tenantid + GROUP BY rd.receiptheader + ) + SELECT + rh.tenantid as ulb, + rh.receiptnumber as receiptnumber, + To_char((To_timestamp(rh.receiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as receiptdate, + To_char((To_timestamp(rh.manualreceiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as g8issuedate, + rh.manualreceiptnumber as g8receiptno, + rh.status as status, + businessdetails as servicecategory, + receipt_breakup.*, + amount as totalamount, + instrumenttype as paymentmode, + (case when instrumenttype like 'Cash' then '' else transactionnumber end) as ddorchequenumber, + (case when instrumenttype like 'DD' or instrumenttype like 'Cheque' then To_char((To_timestamp(ih.transactiondate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') else '' end) as ddchequedate, + ih.bankid as bankname, + ih.branchname as branchname, + 'System' as collectiontype, + eg_user.name as collectorname, + rh.additionaldetails->>'comment' as comments + FROM egcl_receiptheader_v1 AS rh + JOIN egcl_receiptinstrument_v1 AS ri ON rh.id = ri.receiptheader + JOIN egcl_instrumentheader_v1 AS ih ON ih.id = ri.instrumentheader + JOIN receipt_breakup ON rh.id = receipt_breakup.receiptheader + JOIN eg_user ON rh.createdby::INTEGER=eg_user.id + WHERE rh.status != 'Cancelled' AND businessdetails not in ('PT','TL') + and rh.tenantid=$tenantid + orderby: ORDER BY rh.receiptdate DESC + + - reportName: MiscReceiptStateWide + summary: State Receipt Register Miscellaneous + version: 1.0.0 + moduleName: rainmaker-uc + sourceColumns: + - name: ulb + label: reports.uc.ulb + type: string + source: uc + total: false + - name: servicecategory + label: reports.uc.businessdetails + type: string + source: uc + total: false + - name: cgst + label: reports.uc.cgst + type: string + source: uc + total: true + - name: tax + label: reports.uc.tax + type: string + source: uc + total: true + - name: fieldcollection + label: reports.uc.fieldcollection + type: string + source: uc + total: true + - name: sgst + label: reports.uc.sgst + type: string + source: uc + total: true + - name: totalamount + label: reports.uc.totalamount + type: string + source: uc + total: true + searchParams: + - name: fromDate + label: reports.uc.fromDate + type: epoch + source: uc + isMandatory: false + searchClause: AND rh.receiptdate >= $fromDate + - name: toDate + label: reports.uc.toDate + type: epoch + source: uc + isMandatory: false + searchClause: AND rh.receiptdate <= $toDate + - name: ulb + label: reports.uc.ulb + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: uc + wrapper: true + isMandatory: false + searchClause: AND rh.tenantid = $ulb + query: | + -- Use CTE to force query plan, compute & use CTE later + SELECT + rh.tenantid as ulb,rh.businessdetails as servicecategory, count(*) as receipts, + SUM(CASE WHEN taxheadcode LIKE '%_FIELD_FEE' THEN adjustedamount ELSE 0 END) as fieldcollection, + SUM(CASE WHEN taxheadcode LIKE '%_TAX' THEN adjustedamount ELSE 0 END) as tax, + SUM(CASE WHEN taxheadcode LIKE '%_CGST' THEN adjustedamount ELSE 0 END) as cgst, + SUM(CASE WHEN taxheadcode LIKE '%_SGST' THEN adjustedamount ELSE 0 END) as sgst, + sum(totalamount) as totalamount + from egcl_receiptheader_v1 rh, egcl_receiptdetails_v1 as rd + WHERE rh.id=rd.receiptheader and rh.status != 'Cancelled' AND rh.tenantid!='pb.testing' AND businessdetails not in ('PT','TL') + groupby: group by rh.tenantid,rh.businessdetails + orderby: order by rh.tenantid + + - reportName: MiscReceiptState + summary: State Miscellaneous Receipt Register + version: 1.0.0 + moduleName: rainmaker-uc + sourceColumns: + - name: ulb + label: reports.uc.ulb + type: string + source: uc + total: false + - name: noofreceipts + label: reports.uc.noOfReceipts + type: string + source: uc + total: true + - name: tax + label: reports.uc.tax + type: string + source: uc + total: true + - name: cgst + label: reports.uc.cgst + type: string + source: uc + total: true + - name: sgst + label: reports.uc.sgst + type: string + source: uc + total: true + - name: fieldcollection + label: reports.uc.fieldCollection + type: string + source: uc + total: true + - name: totalamount + label: reports.uc.totalamount + type: string + source: uc + total: true + searchParams: + - name: fromDate + label: reports.uc.fromDate + type: epoch + source: uc + isMandatory: false + searchClause: AND rh.receiptdate >= $fromDate + - name: toDate + label: reports.uc.toDate + type: epoch + source: uc + isMandatory: false + searchClause: AND rh.receiptdate <= $toDate + - name: ulb + label: reports.uc.ulb + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: uc + wrapper: true + isMandatory: false + searchClause: AND rh.tenantid = $ulb + query: | + -- Use CTE to force query plan, compute & use CTE later + SELECT + rh.tenantid as ulb, + count(distinct rh.id) as noofreceipts, + SUM(CASE WHEN taxheadcode LIKE '%_TAX' THEN adjustedamount ELSE 0 END) as tax, + SUM(CASE WHEN taxheadcode LIKE '%_CGST' THEN adjustedamount ELSE 0 END) as cgst, + SUM(CASE WHEN taxheadcode LIKE '%_SGST' THEN adjustedamount ELSE 0 END) as sgst, + SUM(CASE WHEN taxheadcode LIKE '%_FIELD_FEE' THEN adjustedamount ELSE 0 END) as fieldcollection, + sum(amount) as totalamount + from egcl_receiptheader_v1 rh, egcl_receiptdetails_v1 as rd + WHERE rh.id=rd.receiptheader and rh.status != 'Cancelled' AND rh.tenantid!='pb.testing' AND businessdetails not in ('PT','TL') + groupby: group by rh.tenantid + + + + - reportName: MiscCollectionState + summary: State Miscellaneous Collection Register + version: 1.0.0 + moduleName: rainmaker-uc + sourceColumns: + - name: ulb + label: reports.uc.ulb + type: string + source: uc + total: false + - name: offlinetransactions + label: reports.uc.noOfOfflineTransactions + type: string + source: uc + total: true + - name: onlinetransactions + label: reports.uc.noOfOnlineTransactions + type: string + source: uc + total: true + - name: totaltransactions + label: reports.uc.totalTransactions + type: string + source: uc + total: true + - name: offlinecollection + label: reports.uc.offlineCollection + type: string + source: uc + total: true + - name: onlinecollection + label: reports.uc.onlineCollection + type: string + source: uc + total: true + - name: totalcollection + label: reports.uc.totalCollection + type: string + source: uc + total: true + searchParams: + - name: fromDate + label: reports.uc.fromDate + type: epoch + source: uc + isMandatory: false + searchClause: AND rh.receiptdate >= $fromDate + - name: toDate + label: reports.uc.toDate + type: epoch + source: uc + isMandatory: false + searchClause: AND rh.receiptdate <= $toDate + - name: ulb + label: reports.uc.ulb + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: uc + wrapper: true + isMandatory: false + searchClause: AND rh.tenantid = $ulb + query: | + -- Use CTE to force query plan, compute & use CTE later + SELECT + initcap(split_part(rh.tenantId, '.', 2)) as ulb, + count(*) FILTER (where collectiontype='COUNTER') as offlinetransactions, + count(*) FILTER (where collectiontype='ONLINE') as onlinetransactions, + count(*) as totaltransactions, + sum(case collectiontype when 'COUNTER' then ih.amount else 0 end) as offlinecollection, + sum(case collectiontype when 'ONLINE' then ih.amount else 0 end) as onlinecollection, + sum(ih.amount) as totalcollection + from egcl_receiptheader_v1 as rh + inner join egcl_receiptinstrument_v1 as ri on ri.receiptheader = rh.id + inner join egcl_instrumentheader_v1 as ih on ih.id = ri.instrumentheader + where rh.businessdetails not in ('PT','TL') and rh.status !='Cancelled' and rh.tenantid !='pb.testing' + groupby: GROUP BY rh.tenantid + orderby: ORDER BY rh.tenantId asc + + - reportName: MiscBusinessServiceCollectionTenant + summary: Miscellaneous Business Service Collection + version: 1.0.0 + moduleName: rainmaker-uc + sourceColumns: + - name: servicetype + label: reports.uc.serviceType + type: string + source: uc + total: false + - name: totalreceipts + label: reports.uc.totalReceipts + type: string + source: uc + total: true + - name: tax + label: reports.uc.tax + type: string + source: uc + total: true + - name: cgst + label: reports.uc.cgst + type: string + source: uc + total: true + - name: sgst + label: reports.uc.sgst + type: string + source: uc + total: true + - name: fieldcollection + label: reports.uc.fieldCollection + type: string + source: uc + total: true + - name: totalcollection + label: reports.uc.totalCollection + type: string + source: uc + total: true + searchParams: + - name: fromDate + label: reports.uc.fromDate + type: epoch + source: uc + isMandatory: false + searchClause: AND rh.receiptdate >= $fromDate + - name: toDate + label: reports.uc.toDate + type: epoch + source: uc + isMandatory: false + searchClause: AND rh.receiptdate <= $toDate + query: | + -- Use CTE to force query plan, compute & use CTE later + SELECT + rh.businessdetails as servicetype, + count(distinct rh.id) as totalreceipts, + SUM(CASE WHEN taxheadcode LIKE '%_TAX' THEN adjustedamount ELSE 0 END) as tax, + SUM(CASE WHEN taxheadcode LIKE '%_CGST' THEN adjustedamount ELSE 0 END) as cgst, + SUM(CASE WHEN taxheadcode LIKE '%_SGST' THEN adjustedamount ELSE 0 END) as sgst, + SUM(CASE WHEN taxheadcode LIKE '%_FIELD_FEE' THEN adjustedamount ELSE 0 END) as fieldcollection, + SUM(amount) as totalcollection + from egcl_receiptheader_v1 rh, egcl_receiptdetails_v1 as rd + WHERE rh.id=rd.receiptheader and rh.status != 'Cancelled' AND rh.tenantid=$tenantid AND businessdetails not in ('PT','TL') + groupby: GROUP BY rh.businessdetails + orderby: ORDER BY rh.businessdetails + + - reportName: MiscReceiptULBCancelled + summary: Cancelled Receipt Miscellaneous + version: 1.0.0 + moduleName: rainmaker-uc + additionalConfig: + print: + pdfPageSize: "A3" + sourceColumns: + - name: ulb + label: reports.uc.ulb + type: string + source: uc + total: false + - name: receiptnumber + label: reports.uc.receiptnumber + type: string + source: uc + total: false + - name: receiptdate + label: reports.uc.receiptdate + type: string + source: uc + total: false + - name: servicecategory + label: reports.uc.businessdetails + type: string + source: uc + total: false + - name: cgst + label: reports.uc.cgst + type: string + source: uc + total: true + - name: tax + label: reports.uc.tax + type: string + source: uc + total: true + - name: fieldcollection + label: reports.uc.fieldcollection + type: string + source: uc + total: true + - name: sgst + label: reports.uc.sgst + type: string + source: uc + total: true + - name: ddorchequenumber + label: reports.uc.ddorchequenumber + type: string + source: uc + total: false + - name: ddchequedate + label: reports.uc.ddorchequedate + type: string + source: uc + total: false + - name: collectiontype + label: reports.uc.collectiontype + type: string + source: uc + total: false + - name: collectorname + label: reports.uc.collectorname + type: string + source: uc + total: false + - name: totalamount + label: reports.uc.totalamount + type: string + source: uc + total: true + - name: paymentmode + label: reports.uc.paymentmode + type: string + source: uc + total: false + searchParams: + - name: fromDate + label: reports.uc.fromDate + type: epoch + source: uc + isMandatory: false + searchClause: AND rh.receiptdate >= $fromDate + - name: toDate + label: reports.uc.toDate + type: epoch + source: uc + isMandatory: false + searchClause: AND rh.receiptdate <= $toDate + - name: collectorname + label: reports.uc.collectorname + type: singlevaluelist + pattern: http://egov-hrms:8080/egov-hrms/employees/_search?tenantId=$tenantid&roles=UC_EMP|$.Employees[*].user.id|$.Employees[*].user.name + source: uc + wrapper: true + isMandatory: false + searchClause: AND eg_user.id = $collectorname::INTEGER + query: | + -- Use CTE to force query plan, compute & use CTE later + WITH receipt_breakup AS ( + SELECT + receiptheader, + SUM(CASE WHEN taxheadcode LIKE '%_CGST' THEN adjustedamount ELSE 0 END) as cgst, + SUM(CASE WHEN taxheadcode LIKE '%_TAX' THEN adjustedamount ELSE 0 END) as tax, + SUM(CASE WHEN taxheadcode LIKE '%_SGST' THEN adjustedamount ELSE 0 END) as sgst, + SUM(CASE WHEN taxheadcode LIKE '%_FIELD_FEE' THEN adjustedamount ELSE 0 END) as fieldcollection + FROM egcl_receiptdetails_v1 as rd + INNER JOIN egcl_receiptheader_v1 as rh on rh.id = rd.receiptheader + WHERE rh.status = 'Cancelled' AND businessdetails not in ('PT','TL') and rh.tenantid=$tenantid + GROUP BY rd.receiptheader + ) + SELECT + rh.tenantid as ulb, + rh.receiptnumber as receiptnumber, + To_char((To_timestamp(rh.receiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as receiptdate, + businessdetails as servicecategory, + receipt_breakup.*, + amount as totalamount, + instrumenttype as paymentmode, + (case when instrumenttype like 'Cash' then '' else transactionnumber end) as ddorchequenumber, + (case when instrumenttype like 'DD' or instrumenttype like 'Cheque' then To_char((To_timestamp(ih.transactiondate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') else '' end) as ddchequedate, + eg_user.name as collectorname + FROM egcl_receiptheader_v1 AS rh + JOIN egcl_receiptinstrument_v1 AS ri ON rh.id = ri.receiptheader + JOIN egcl_instrumentheader_v1 AS ih ON ih.id = ri.instrumentheader + JOIN receipt_breakup ON rh.id = receipt_breakup.receiptheader + JOIN eg_user ON rh.createdby::INTEGER=eg_user.id + WHERE rh.status = 'Cancelled' AND businessdetails not in ('PT','TL') + and rh.tenantid=$tenantid + orderby: ORDER BY rh.receiptdate DESC + + - reportName: MiscReceiptULBShort + summary: Receipt Register Miscellaneous + version: 1.0.0 + moduleName: rainmaker-uc + additionalConfig: + print: + pdfPageSize: "A3" + sourceColumns: + - name: consumername + label: reports.uc.consumername + type: string + source: uc + total: false + - name: mobilenumber + label: reports.uc.mobilenumber + type: string + source: uc + total: false + - name: receiptdate + label: reports.uc.receiptdate + type: string + source: uc + total: false + - name: servicecategory + label: reports.uc.businessdetails + type: string + source: uc + total: false + - name: amount + label: reports.uc.totalamount + type: string + source: uc + total: true + - name: remarks + label: reports.uc.remarks + type: string + source: uc + total: false + - name: collectorname + label: reports.uc.collectorname + type: string + source: uc + total: false + searchParams: + - name: fromDate + label: reports.uc.fromDate + type: epoch + source: uc + isMandatory: false + searchClause: AND rh.receiptdate >= $fromDate + - name: toDate + label: reports.uc.toDate + type: epoch + source: uc + isMandatory: false + searchClause: AND rh.receiptdate <= $toDate + - name: collectorname + label: reports.uc.collectorname + type: singlevaluelist + pattern: http://egov-hrms:8080/egov-hrms/employees/_search?tenantId=$tenantid&roles=UC_EMP|$.Employees[*].user.id|$.Employees[*].user.name + source: uc + wrapper: true + isMandatory: false + searchClause: AND eg_user.id = $collectorname::INTEGER + query: | + -- Use CTE to force query plan, compute & use CTE later + SELECT + rh.payername as consumername, + rh.payermobile as mobilenumber, + To_char((To_timestamp(rh.receiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as receiptdate, + businessdetails as servicecategory, + rh.totalamount as amount, + eg_user.name as collectorname, + rh.additionaldetails->>'comment' as remarks + FROM egcl_receiptheader_v1 AS rh + JOIN egcl_receiptinstrument_v1 AS ri ON rh.id = ri.receiptheader + JOIN egcl_instrumentheader_v1 AS ih ON ih.id = ri.instrumentheader + JOIN eg_user ON rh.createdby::INTEGER=eg_user.id + WHERE rh.status != 'Cancelled' AND businessdetails not in ('PT','TL') + and rh.tenantid=$tenantid + orderby: ORDER BY rh.receiptdate DESC + + + - reportName: MiscReceipt_v2 + decryptionPathId: MiscReceiptULB_v2 + summary: Receipt Register Miscellaneous + version: 1.0.0 + moduleName: rainmaker-uc + sourceColumns: + - name: ulb + label: reports.uc.ulb + type: string + source: uc + total: false + - name: receiptnumber + label: reports.uc.receiptnumber + type: string + source: uc + total: false + - name: receiptdate + label: reports.uc.receiptdate + type: string + source: uc + total: false + - name: g8issuedate + label: reports.uc.g8issuedate + type: string + source: uc + total: false + - name: g8receiptno + label: reports.uc.g8receiptno + type: string + source: uc + total: false + - name: status + label: reports.uc.receiptstatus + type: string + source: uc + total: false + - name: servicecategory + label: reports.uc.businessdetails + type: string + source: uc + total: false + - name: cgst + label: reports.uc.cgst + type: string + source: uc + total: true + - name: tax + label: reports.uc.tax + type: string + source: uc + total: true + - name: fieldcollection + label: reports.uc.fieldcollection + type: string + source: uc + total: true + - name: sgst + label: reports.uc.sgst + type: string + source: uc + total: true + - name: ddorchequenumber + label: reports.uc.ddorchequenumber + type: string + source: uc + total: false + - name: collectiontype + label: reports.uc.collectiontype + type: string + source: uc + total: false + - name: collectorname + label: reports.uc.collectorname + type: string + source: uc + total: false + - name: totalamount + label: reports.uc.totalamount + type: string + source: uc + total: true + - name: paymentmode + label: reports.uc.paymentmode + type: string + source: uc + total: false + searchParams: + - name: fromDate + label: reports.uc.fromDate + type: epoch + source: uc + isMandatory: true + searchClause: AND paydetail.receiptdate >= $fromDate + - name: toDate + label: reports.uc.toDate + type: epoch + source: uc + isMandatory: true + searchClause: AND paydetail.receiptdate <= $toDate + - name: ulb + label: reports.uc.ulb + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: uc + wrapper: true + isMandatory: false + searchClause: AND paydetail.tenantid = $ulb + query: | + -- Use CTE to force query plan, compute & use CTE later + WITH receipt_breakup AS ( + SELECT + string_agg(distinct billd.billid,',') bill_id, + SUM(CASE WHEN taxheadcode LIKE '%_CGST' THEN adjustedamount ELSE 0 END) as cgst, + SUM(CASE WHEN taxheadcode LIKE '%_TAX' THEN adjustedamount ELSE 0 END) as tax, + SUM(CASE WHEN taxheadcode LIKE '%_SGST' THEN adjustedamount ELSE 0 END) as sgst, + SUM(CASE WHEN taxheadcode LIKE '%_FEE' THEN adjustedamount ELSE 0 END) as fieldcollection + FROM egcl_billaccountdetail + inner join egcl_billdetial as billd on billd.id=egcl_billaccountdetail.billdetailid + INNER JOIN egcl_bill as bill on bill.id = billd.billid + WHERE bill.tenantid!='pb.testing' AND businessservice not in ('PT','TL','FIRENOC') -- and rh.status != 'Cancelled' + GROUP BY billdetailid + ) + SELECT + payment.tenantid as ulb, + paydetail.receiptnumber as receiptnumber, + To_char((To_timestamp(paydetail.receiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as receiptdate, + To_char((To_timestamp(paydetail.manualreceiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as g8issuedate, + paydetail.manualreceiptnumber as g8receiptno, + payment.paymentstatus as status, + businessservice as servicecategory, + receipt_breakup.*, + payment.totalamountpaid as totalamount, + paymentmode as paymentmode, + (case when paymentmode like 'CASH' then '' else transactionnumber end) as ddorchequenumber, + 'System' as collectiontype, + eg_user.name as collectorname + FROM egcl_payment AS payment + JOIN egcl_paymentdetail as paydetail on paydetail.paymentid=payment.id + LEFT JOIN receipt_breakup ON paydetail.billid = receipt_breakup.bill_id + JOIN eg_user ON payment.createdby::INTEGER=eg_user.id + WHERE payment.tenantid!='pb.testing' AND businessservice not in ('PT','TL','FIRENOC') and payment.paymentstatus != 'CANCELLED' + orderby: ORDER BY paydetail.receiptdate DESC + + + - reportName: MiscReceiptULB_v2 + decryptionPathId: MiscReceiptULB_v2 + summary: Receipt Register Miscellaneous + version: 1.0.0 + moduleName: rainmaker-uc + additionalConfig: + print: + pdfPageSize: "A3" + sourceColumns: + - name: ulb + label: reports.uc.ulb + type: string + source: uc + total: false + - name: receiptnumber + label: reports.uc.receiptnumber + type: string + source: uc + total: false + - name: receiptdate + label: reports.uc.receiptdate + type: string + source: uc + total: false + - name: g8issuedate + label: reports.uc.g8issuedate + type: string + source: uc + total: false + - name: g8receiptno + label: reports.uc.g8receiptno + type: string + source: uc + total: false + - name: status + label: reports.uc.receiptstatus + type: string + source: uc + total: false + - name: servicecategory + label: reports.uc.businessdetails + type: string + source: uc + total: false + - name: cgst + label: reports.uc.cgst + type: string + source: uc + total: true + - name: tax + label: reports.uc.tax + type: string + source: uc + total: true + - name: fieldcollection + label: reports.uc.fieldcollection + type: string + source: uc + total: true + - name: sgst + label: reports.uc.sgst + type: string + source: uc + total: true + - name: ddorchequenumber + label: reports.uc.ddorchequenumber + type: string + source: uc + total: false + - name: ddchequedate + label: reports.uc.ddorchequedate + type: string + source: uc + total: false + - name: bankname + label: reports.uc.bankname + type: string + source: uc + total: false + - name: branchname + label: reports.uc.branchname + type: string + source: uc + total: false + - name: collectiontype + label: reports.uc.collectiontype + type: string + source: uc + total: false + - name: collectorname + label: reports.uc.collectorname + type: string + source: uc + total: false + - name: totalamount + label: reports.uc.totalamount + type: string + source: uc + total: true + - name: paymentmode + label: reports.uc.paymentmode + type: string + source: uc + total: false + - name: remarks + label: reports.uc.remarks + type: string + source: uc + total: false + searchParams: + - name: fromDate + label: reports.uc.fromDate + type: epoch + source: uc + isMandatory: true + searchClause: AND paydetail.receiptdate >= $fromDate + - name: toDate + label: reports.uc.toDate + type: epoch + source: uc + isMandatory: true + searchClause: AND paydetail.receiptdate <= $toDate + - name: businessservice + label: reports.uc.businessservice + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=BillingService&masterName=BusinessService&tenantId=$tenantid|$.MdmsRes.BillingService.BusinessService[*].code|$.MdmsRes.BillingService.BusinessService[*].code + source: uc + wrapper: true + isMandatory: false + searchClause: AND businessservice = $businessservice + - name: collectorname + label: reports.uc.collectorname + type: singlevaluelist + pattern: http://egov-hrms:8080/egov-hrms/employees/_search?tenantId=$tenantid&roles=UC_EMP|$.Employees[*].user.id|$.Employees[*].user.name + source: uc + wrapper: true + isMandatory: false + searchClause: AND eg_user.id = $collectorname::INTEGER + query: | + -- Use CTE to force query plan, compute & use CTE later + WITH receipt_breakup AS ( + SELECT + bill.id as bill_id, + SUM(CASE WHEN taxheadcode LIKE '%_CGST' THEN adjustedamount ELSE 0 END) as cgst, + SUM(CASE WHEN taxheadcode LIKE '%_TAX' THEN adjustedamount ELSE 0 END) as tax, + SUM(CASE WHEN taxheadcode LIKE '%_SGST' THEN adjustedamount ELSE 0 END) as sgst, + SUM(CASE WHEN taxheadcode LIKE '%_FEE' THEN adjustedamount ELSE 0 END) as fieldcollection + FROM egcl_billaccountdetail + INNER JOIN egcl_billdetial as billd on billd.id = egcl_billaccountdetail.billdetailid + INNER JOIN egcl_bill as bill on bill.id=billd.billid + WHERE billd.tenantid=$tenantid AND businessservice not in ('PT','TL','FIRENOC','WS','SW','WS.ONE_TIME_FEE') + GROUP BY billdetailid,bill.id + ) + SELECT + payment.tenantid as ulb, + paydetail.receiptnumber as receiptnumber, + To_char((To_timestamp(paydetail.receiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as receiptdate, + To_char((To_timestamp(paydetail.manualreceiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as g8issuedate, + paydetail.manualreceiptnumber as g8receiptno, + bank_branches.bank_name as bankname, + bank_branches.branch as branchname, + payment.paymentstatus as status, + businessservice as servicecategory, + receipt_breakup.*, + payment.totalamountpaid as totalamount, + paymentmode as paymentmode, + (case when paymentmode like 'CASH' then '' else transactionnumber end) as ddorchequenumber, + (case when paymentmode like 'DD' or paymentmode like 'CHEQUE' then To_char((To_timestamp(payment.instrumentdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') else '' end) as ddchequedate, + 'System' as collectiontype, + eg_user.name as collectorname, + billd.additionaldetails->>'comment' as remarks + FROM egcl_payment AS payment + JOIN egcl_paymentdetail as paydetail on paydetail.paymentid=payment.id + JOIN receipt_breakup ON paydetail.billid = receipt_breakup.bill_id + JOIN egcl_billdetial as billd on billd.billid=paydetail.billid + JOIN eg_user ON payment.createdby::INTEGER=eg_user.id + LEFT OUTER JOIN bank_branches on bank_branches.ifsc=payment.ifsccode + WHERE payment.tenantid=$tenantid AND businessservice not in ('PT','TL','FIRENOC','WS','SW','WS.ONE_TIME_FEE') and payment.paymentstatus != 'CANCELLED' + orderby: ORDER BY paydetail.receiptdate DESC + + + - reportName: MiscReceiptStateWide_v2 + summary: State Receipt Register Miscellaneous + version: 1.0.0 + moduleName: rainmaker-uc + sourceColumns: + - name: ulb + label: reports.uc.ulb + type: string + source: uc + total: false + - name: servicecategory + label: reports.uc.businessdetails + type: string + source: uc + total: false + - name: cgst + label: reports.uc.cgst + type: string + source: uc + total: true + - name: tax + label: reports.uc.tax + type: string + source: uc + total: true + - name: fieldcollection + label: reports.uc.fieldcollection + type: string + source: uc + total: true + - name: sgst + label: reports.uc.sgst + type: string + source: uc + total: true + - name: totalamount + label: reports.uc.totalamount + type: string + source: uc + total: true + searchParams: + - name: fromDate + label: reports.uc.fromDate + type: epoch + source: uc + isMandatory: false + searchClause: AND paydetail.receiptdate >= $fromDate + - name: toDate + label: reports.uc.toDate + type: epoch + source: uc + isMandatory: false + searchClause: AND paydetail.receiptdate <= $toDate + - name: ulb + label: reports.uc.ulb + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: uc + wrapper: true + isMandatory: false + searchClause: AND paydetail.tenantid = $ulb + query: | + -- Use CTE to force query plan, compute & use CTE later + SELECT + payment.tenantid as ulb, + paydetail.businessservice as servicecategory, + count(*) as receipts, + SUM(CASE WHEN taxheadcode LIKE '%_FEE' THEN adjustedamount ELSE 0 END) as fieldcollection, + SUM(CASE WHEN taxheadcode LIKE '%_TAX' THEN adjustedamount ELSE 0 END) as tax, + SUM(CASE WHEN taxheadcode LIKE '%_CGST' THEN adjustedamount ELSE 0 END) as cgst, + SUM(CASE WHEN taxheadcode LIKE '%_SGST' THEN adjustedamount ELSE 0 END) as sgst, + sum(paydetail.amountpaid) as totalamount + from egcl_payment payment + inner join egcl_paymentdetail as paydetail on paydetail.paymentid=payment.id + inner join egcl_billaccountdetail as ebd on paydetail.billid=ebd.billdetailid + WHERE payment.tenantid!='pb.testing' AND paydetail.businessservice not in ('PT','TL','FIRENOC') and payment.paymentstatus != 'CANCELLED' + groupby: group by payment.tenantid,paydetail.businessservice + orderby: order by payment.tenantid + + - reportName: MiscReceiptState_v2 + summary: State Miscellaneous Receipt Register + version: 1.0.0 + moduleName: rainmaker-uc + sourceColumns: + - name: ulb + label: reports.uc.ulb + type: string + source: uc + total: false + - name: noofreceipts + label: reports.uc.noOfReceipts + type: string + source: uc + total: true + - name: tax + label: reports.uc.tax + type: string + source: uc + total: true + - name: cgst + label: reports.uc.cgst + type: string + source: uc + total: true + - name: sgst + label: reports.uc.sgst + type: string + source: uc + total: true + - name: fieldcollection + label: reports.uc.fieldCollection + type: string + source: uc + total: true + - name: totalamount + label: reports.uc.totalamount + type: string + source: uc + total: true + searchParams: + - name: fromDate + label: reports.uc.fromDate + type: epoch + source: uc + isMandatory: false + searchClause: AND paydetail.receiptdate >= $fromDate + - name: toDate + label: reports.uc.toDate + type: epoch + source: uc + isMandatory: false + searchClause: AND paydetail.receiptdate <= $toDate + - name: businessservice + label: reports.uc.businessservice + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=BillingService&masterName=BusinessService&tenantId=$tenantid|$.MdmsRes.BillingService.BusinessService[*].code|$.MdmsRes.BillingService.BusinessService[*].code + source: uc + wrapper: true + isMandatory: false + searchClause: AND paydetail.businessservice = $businessservice + - name: ulb + label: reports.uc.ulb + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: uc + wrapper: true + isMandatory: false + searchClause: AND paydetail.tenantid = $ulb + query: | + -- Use CTE to force query plan, compute & use CTE later + SELECT + paydetail.tenantid as ulb, + count(distinct paydetail.receiptnumber) as noofreceipts, + SUM(CASE WHEN taxheadcode LIKE '%_TAX' THEN adjustedamount ELSE 0 END) as tax, + SUM(CASE WHEN taxheadcode LIKE '%_CGST' THEN adjustedamount ELSE 0 END) as cgst, + SUM(CASE WHEN taxheadcode LIKE '%_SGST' THEN adjustedamount ELSE 0 END) as sgst, + SUM(CASE WHEN taxheadcode LIKE '%_FEE' THEN adjustedamount ELSE 0 END) as fieldcollection, + sum(adjustedamount) as totalamount + from egcl_paymentdetail paydetail + INNER JOIN egcl_bill as bill on bill.id = paydetail.billid + inner join egcl_billdetial as billd on billd.billid=bill.id + inner join egcl_billaccountdetail as ebd on ebd.billdetailid=billd.id + inner join egcl_payment as payment on paydetail.paymentid=payment.id + WHERE paydetail.tenantid!='pb.testing' AND paydetail.businessservice not in ('PT','TL','FIRENOC') and payment.paymentstatus!='CANCELLED' + groupby: group by paydetail.tenantid + + - reportName: MiscCollectionState_v2 + summary: State Miscellaneous Collection Register + version: 1.0.0 + moduleName: rainmaker-uc + sourceColumns: + - name: ulb + label: reports.uc.ulb + type: string + source: uc + total: false + - name: offlinetransactions + label: reports.uc.noOfOfflineTransactions + type: string + source: uc + total: true + - name: onlinetransactions + label: reports.uc.noOfOnlineTransactions + type: string + source: uc + total: true + - name: totaltransactions + label: reports.uc.totalTransactions + type: string + source: uc + total: true + - name: offlinecollection + label: reports.uc.offlineCollection + type: string + source: uc + total: true + - name: onlinecollection + label: reports.uc.onlineCollection + type: string + source: uc + total: true + - name: totalcollection + label: reports.uc.totalCollection + type: string + source: uc + total: true + searchParams: + - name: fromDate + label: reports.uc.fromDate + type: epoch + source: uc + isMandatory: false + searchClause: AND paydetail.receiptdate >= $fromDate + - name: toDate + label: reports.uc.toDate + type: epoch + source: uc + isMandatory: false + searchClause: AND paydetail.receiptdate <= $toDate + - name: ulb + label: reports.uc.ulb + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: uc + wrapper: true + isMandatory: false + searchClause: AND paydetail.tenantid = $ulb + query: | + -- Use CTE to force query plan, compute & use CTE later + SELECT + initcap(split_part(payment.tenantId, '.', 2)) as ulb, + count(*) FILTER (where payment.paymentmode!='ONLINE') as offlinetransactions, + count(*) FILTER (where payment.paymentmode='ONLINE') as onlinetransactions, + count(*) as totaltransactions, + sum(case when paymentmode!='ONLINE' then payment.totalamountpaid else 0 end) as offlinecollection, + sum(case paymentmode when 'ONLINE' then payment.totalamountpaid else 0 end) as onlinecollection, + sum(payment.totalamountpaid) as totalcollection + from egcl_payment as payment + inner join egcl_paymentdetail as paydetail on paydetail.paymentid=payment.id + where paydetail.businessservice not in ('PT','TL','FIRENOC') and payment.tenantid !='pb.testing' and payment.paymentstatus != 'CANCELLED' + groupby: GROUP BY payment.tenantid + orderby: ORDER BY payment.tenantId asc + + + - reportName: MiscBusinessServiceCollectionTenant_v2 + summary: Miscellaneous Business Service Collection + version: 1.0.0 + moduleName: rainmaker-uc + sourceColumns: + - name: servicetype + label: reports.uc.serviceType + type: string + source: uc + total: false + - name: totalreceipts + label: reports.uc.totalReceipts + type: string + source: uc + total: true + - name: tax + label: reports.uc.tax + type: string + source: uc + total: true + - name: cgst + label: reports.uc.cgst + type: string + source: uc + total: true + - name: sgst + label: reports.uc.sgst + type: string + source: uc + total: true + - name: fieldcollection + label: reports.uc.fieldCollection + type: string + source: uc + total: true + - name: totalcollection + label: reports.uc.totalCollection + type: string + source: uc + total: true + searchParams: + - name: fromDate + label: reports.uc.fromDate + type: epoch + source: uc + isMandatory: false + searchClause: AND paydetail.receiptdate >= $fromDate + - name: toDate + label: reports.uc.toDate + type: epoch + source: uc + isMandatory: false + searchClause: AND paydetail.receiptdate <= $toDate + query: | + -- Use CTE to force query plan, compute & use CTE later + SELECT + paydetail.businessservice as servicetype, + count(distinct paydetail.receiptnumber) totalreceipts, + SUM(CASE WHEN taxheadcode LIKE '%_CGST' THEN adjustedamount ELSE 0 END) as cgst, + SUM(CASE WHEN taxheadcode LIKE '%_TAX' THEN adjustedamount ELSE 0 END) as tax, + SUM(CASE WHEN taxheadcode LIKE '%_SGST' THEN adjustedamount ELSE 0 END) as sgst, + SUM(CASE WHEN taxheadcode LIKE '%_FEE' THEN adjustedamount ELSE 0 END) as fieldcollection, + SUM(adjustedamount) as totalcollection + FROM egcl_billaccountdetail + INNER JOIN egcl_billdetial as billd on billd.id = egcl_billaccountdetail.billdetailid + INNER JOIN egcl_bill as bill on bill.id=billd.billid + INNER Join egcl_paymentdetail as paydetail ON paydetail.billid = bill.id + Inner join egcl_payment as payment on paydetail.paymentid = payment.id + WHERE billd.tenantid=$tenantid AND paydetail.businessservice not in ('PT','TL','FIRENOC') and payment.paymentStatus!='CANCELLED' + groupby: GROUP BY paydetail.businessservice + orderby: ORDER BY paydetail.businessservice + + + - reportName: MiscReceiptULBCancelled_v2 + decryptionPathId: MiscReceiptULB_v2 + summary: Cancelled Receipt Miscellaneous + version: 1.0.0 + moduleName: rainmaker-uc + additionalConfig: + print: + pdfPageSize: "A3" + sourceColumns: + - name: ulb + label: reports.uc.ulb + type: string + source: uc + total: false + - name: receiptnumber + label: reports.uc.receiptnumber + type: string + source: uc + total: false + - name: receiptdate + label: reports.uc.receiptdate + type: string + source: uc + total: false + - name: servicecategory + label: reports.uc.businessdetails + type: string + source: uc + total: false + - name: cgst + label: reports.uc.cgst + type: string + source: uc + total: true + - name: tax + label: reports.uc.tax + type: string + source: uc + total: true + - name: fieldcollection + label: reports.uc.fieldcollection + type: string + source: uc + total: true + - name: sgst + label: reports.uc.sgst + type: string + source: uc + total: true + - name: ddorchequenumber + label: reports.uc.ddorchequenumber + type: string + source: uc + total: false + - name: ddchequedate + label: reports.uc.ddorchequedate + type: string + source: uc + total: false + - name: collectiontype + label: reports.uc.collectiontype + type: string + source: uc + total: false + - name: collectorname + label: reports.uc.collectorname + type: string + source: uc + total: false + - name: totalamount + label: reports.uc.totalamount + type: string + source: uc + total: true + - name: paymentmode + label: reports.uc.paymentmode + type: string + source: uc + total: false + searchParams: + - name: fromDate + label: reports.uc.fromDate + type: epoch + source: uc + isMandatory: false + searchClause: AND paydetail.receiptdate >= $fromDate + - name: toDate + label: reports.uc.toDate + type: epoch + source: uc + isMandatory: false + searchClause: AND paydetail.receiptdate <= $toDate + - name: collectorname + label: reports.uc.collectorname + type: singlevaluelist + pattern: http://egov-hrms:8080/egov-hrms/employees/_search?tenantId=$tenantid&roles=UC_EMP|$.Employees[*].user.id|$.Employees[*].user.name + source: uc + wrapper: true + isMandatory: false + searchClause: AND eg_user.id = $collectorname::INTEGER + query: | + -- Use CTE to force query plan, compute & use CTE later + WITH receipt_breakup AS ( + SELECT + bill.id as bill_id, + SUM(CASE WHEN taxheadcode LIKE '%_CGST' THEN adjustedamount ELSE 0 END) as cgst, + SUM(CASE WHEN taxheadcode LIKE '%_TAX' THEN adjustedamount ELSE 0 END) as tax, + SUM(CASE WHEN taxheadcode LIKE '%_SGST' THEN adjustedamount ELSE 0 END) as sgst, + SUM(CASE WHEN taxheadcode LIKE '%_FEE' THEN adjustedamount ELSE 0 END) as fieldcollection + FROM egcl_billaccountdetail + INNER JOIN egcl_billdetial as billd on billd.id = egcl_billaccountdetail.billdetailid + INNER JOIN egcl_bill as bill on bill.id=billd.billid + WHERE billd.tenantid=$tenantid AND businessservice not in ('PT','TL','FIRENOC','WS','SW','WS.ONE_TIME_FEE') + GROUP BY billdetailid,bill.id + ) + SELECT + payment.tenantid as ulb, + paydetail.receiptnumber as receiptnumber, + To_char((To_timestamp(paydetail.receiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as receiptdate, + To_char((To_timestamp(paydetail.manualreceiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as g8issuedate, + paydetail.manualreceiptnumber as g8receiptno, + payment.paymentstatus as status, + businessservice as servicecategory, + receipt_breakup.*, + payment.totalamountpaid as totalamount, + paymentmode as paymentmode, + (case when paymentmode like 'CASH' then '' else transactionnumber end) as ddorchequenumber, + (case when paymentmode like 'DD' or paymentmode like 'CHEQUE' then To_char((To_timestamp(payment.transactiondate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') else '' end) as ddchequedate, + 'System' as collectiontype, + (case when eg_user.name is null then '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' else eg_user.name end) as collectorname + FROM egcl_payment AS payment + JOIN egcl_paymentdetail as paydetail on paydetail.paymentid=payment.id + JOIN receipt_breakup ON paydetail.billid = receipt_breakup.bill_id + JOIN eg_user ON payment.createdby::INTEGER=eg_user.id + WHERE payment.tenantid=$tenantid AND businessservice not in ('PT','TL','FIRENOC','WS','SW','WS.ONE_TIME_FEE') and payment.paymentstatus = 'CANCELLED' + orderby: ORDER BY paydetail.receiptdate DESC + + - reportName: MiscReceiptULBShort_v2 + decryptionPathId: MiscReceiptULB_v2 + summary: Receipt Register Miscellaneous + version: 1.0.0 + moduleName: rainmaker-uc + additionalConfig: + print: + pdfPageSize: "A3" + sourceColumns: + - name: consumername + label: reports.uc.consumername + type: string + source: uc + total: false + - name: mobilenumber + label: reports.uc.mobilenumber + type: string + source: uc + total: false + - name: receiptdate + label: reports.uc.receiptdate + type: string + source: uc + total: false + - name: servicecategory + label: reports.uc.businessdetails + type: string + source: uc + total: false + - name: amount + label: reports.uc.totalamount + type: string + source: uc + total: true + - name: remarks + label: reports.uc.remarks + type: string + source: uc + total: false + - name: collectorname + label: reports.uc.collectorname + type: string + source: uc + total: false + searchParams: + - name: fromDate + label: reports.uc.fromDate + type: epoch + source: uc + isMandatory: false + searchClause: AND paydetail.receiptdate >= $fromDate + - name: toDate + label: reports.uc.toDate + type: epoch + source: uc + isMandatory: false + searchClause: AND paydetail.receiptdate <= $toDate + - name: collectorname + label: reports.uc.collectorname + type: singlevaluelist + pattern: http://egov-hrms:8080/egov-hrms/employees/_search?tenantId=$tenantid&roles=UC_EMP|$.Employees[*].user.id|$.Employees[*].user.name + source: uc + wrapper: true + isMandatory: false + searchClause: AND eg_user.id = $collectorname::INTEGER + query: | + -- Use CTE to force query plan, compute & use CTE later + SELECT + payment.payername as consumername, + payment.mobilenumber as mobilenumber, + To_char((To_timestamp(paydetail.receiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as receiptdate, + paydetail.businessservice as servicecategory, + payment.totalamountpaid as amount, + (case when eg_user.name is null then '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' else eg_user.name end) as collectorname, + billd.additionaldetails->>'comment' as remarks + FROM egcl_payment AS payment + INNER JOIN egcl_paymentdetail as paydetail on paydetail.paymentid=payment.id + INNER JOIN egcl_billdetial as billd on billd.billid=paydetail.billid + JOIN eg_user ON payment.createdby::INTEGER=eg_user.id + WHERE paydetail.businessservice not in ('PT','TL','FIRENOC') and payment.paymentstatus != 'CANCELLED' and payment.tenantid =$tenantid + orderby: ORDER BY paydetail.receiptdate DESC + + - reportName: EmployeeWiseCollectionUC_v2 + decryptionPathId: MiscReceiptULB_v2 + summary: Employee Wise Collection UC + version: 1.0.0 + moduleName: rainmaker-uc + additionalConfig: + print: + pdfPageSize: "A3" + sourceColumns: + - name: collectorname + label: reports.uc.collectorname + type: string + source: uc + total: false + - name: paymentmode + label: reports.uc.paymentmode + type: string + source: uc + total: false + - name: countofreceipts + label: reports.uc.countofreceipts + type: string + source: uc + total: true + - name: totalamount + label: reports.uc.totalamount + type: string + source: uc + total: true + searchParams: + - name: fromDate + label: reports.uc.fromDate + type: epoch + source: uc + isMandatory: false + searchClause: AND paydetail.receiptdate >= $fromDate + - name: toDate + label: reports.uc.toDate + type: epoch + source: uc + isMandatory: false + searchClause: AND paydetail.receiptdate <= $toDate + - name: collectorname + label: reports.uc.collectorname + type: singlevaluelist + pattern: http://egov-hrms:8080/egov-hrms/employees/_search?tenantId=$tenantid&roles=UC_EMP|$.Employees[*].user.id|$.Employees[*].user.name + source: uc + wrapper: true + isMandatory: false + searchClause: AND eg_user.id = $collectorname::INTEGER + query: | + SELECT + eg_user.name as collectorname, + paymentmode as paymentmode, + count(paydetail.receiptnumber) as Countofreceipts, + Sum(payment.totalamountpaid) as totalamount + FROM egcl_payment AS payment + JOIN egcl_paymentdetail as paydetail on paydetail.paymentid=payment.id + JOIN eg_user ON payment.createdby::INTEGER=eg_user.id + WHERE payment.tenantid=$tenantid AND businessservice not in ('PT','TL','FIRENOC') and payment.paymentstatus != 'CANCELLED' + groupby: group by collectorname , paymentmode + + + - reportName: echallanReport_v2 + decryptionPathId: MiscReceiptULB_v2 + summary: eChallan Report + version: 1.0.0 + moduleName: rainmaker-uc + additionalConfig: + print: + pdfPageSize: "A3" + sourceColumns: + - name: totalamount + label: reports.uc.totalamount + type: string + source: uc + total: true + - name: challanno + label: reports.uc.challanno + type: string + source: uc + total: false + - name: status + label: reports.uc.status + type: string + source: uc + total: false + - name: businessservice + label: reports.uc.businessservice + type: string + source: uc + total: false + - name: description + label: reports.uc.description + type: string + source: uc + total: false + - name: applicationstatus + label: reports.uc.applicationstatus + type: string + source: uc + total: false + - name: receiptnumber + label: reports.uc.receiptnumber + type: string + source: uc + total: false + - name: receiptdate + label: reports.uc.receiptdate + type: string + source: uc + total: false + - name: doorno + label: reports.uc.doorno + type: string + source: uc + total: false + - name: buildingname + label: reports.uc.buildingname + type: string + source: uc + total: false + - name: street + label: reports.uc.street + type: string + source: uc + total: false + - name: mobilenumber + label: reports.uc.mobilenumber + type: string + source: uc + total: false + - name: manualreceiptnumber + label: reports.uc.manualreceiptnumber + type: string + source: uc + total: false + - name: manualreceiptdate + label: reports.uc.manualreceiptdate + type: string + source: uc + total: false + - name: ifsc + label: reports.uc.ifsc + type: string + source: uc + total: false + - name: bankname + label: reports.uc.bankname + type: string + source: uc + total: false + - name: branchname + label: reports.uc.branchname + type: string + source: uc + total: false + - name: cheque_dd_no + label: reports.uc.cheque_dd_no + type: string + source: uc + total: false + - name: transactionnumber + label: reports.uc.transactionnumber + type: string + source: uc + total: false + - name: cgst + label: reports.uc.cgst + type: string + source: uc + total: false + - name: sgst + label: reports.uc.sgst + type: string + source: uc + total: false + - name: tax + label: reports.uc.tax + type: string + source: uc + total: false + - name: fieldcollection + label: reports.uc.fieldcollection + type: string + source: uc + total: false + - name: collectorname + label: reports.uc.collectorname + type: string + source: uc + total: false + searchParams: + - name: fromDate + label: reports.uc.fromDate + type: epoch + source: uc + isMandatory: false + searchClause: AND eg_echallan.createdtime >= $fromDate + - name: toDate + label: reports.uc.toDate + type: epoch + source: uc + isMandatory: false + searchClause: AND eg_echallan.createdtime <= $toDate + - name: businessservice + label: reports.uc.businessservice + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=BillingService&masterName=BusinessService&tenantId=$tenantid|$.MdmsRes.BillingService.BusinessService[*].code|$.MdmsRes.BillingService.BusinessService[*].code + source: uc + wrapper: true + isMandatory: false + searchClause: AND businessservice = $businessservice + - name: collectorname + label: reports.uc.collectorname + type: singlevaluelist + pattern: http://egov-hrms:8080/egov-hrms/employees/_search?tenantId=$tenantid&roles=UC_EMP|$.Employees[*].user.id|$.Employees[*].user.name + source: uc + wrapper: true + isMandatory: false + searchClause: AND eg_user.id = $collectorname::INTEGER + query: | + -- Use CTE to force query plan, compute & use CTE later + SELECT + string_agg(distinct egcl_bill.status,',') as billstatus, + string_agg(distinct egcl_bill.totalamount::text,',') as totalamount, + eg_echallan.challanno, + string_agg(distinct eg_echallan.businessservice,',') as businessservice, + string_agg(distinct eg_echallan.description,',') as description, + string_agg(distinct eg_echallan.applicationstatus,',') as status, + string_agg(distinct egcl_paymentdetail.receiptnumber,',') as receiptnumber, + string_agg(distinct doorno,',') as doorno, + string_agg(distinct buildingname,',') as buildingname, + string_agg(distinct street,',') as street, + string_agg(distinct payment.mobilenumber,',') as mobilenumber, + string_agg(distinct egcl_paymentdetail.manualreceiptnumber,',') as manualreceiptnumber, + string_agg(distinct egcl_paymentdetail.manualreceiptdate::text,',') as manualreceiptdate, + string_agg(distinct payment.ifsccode,',') as ifsc, + string_agg(distinct bank_branches.bank_name,',') as bankname, + string_agg(distinct bank_branches.branch,',') as branchname, + string_agg(distinct payment.instrumentnumber,',') as cheque_dd_no, + string_agg(distinct payment.instrumentdate::text,',') as cheque_date, + string_agg(distinct payment.transactionnumber,',') as transactionnumber, + SUM(CASE WHEN bad.taxheadcode LIKE '%_CGST' THEN adjustedamount ELSE 0 END) as cgst, + SUM(CASE WHEN bad.taxheadcode LIKE '%_SGST' THEN adjustedamount ELSE 0 END) as sgst, + SUM(CASE WHEN bad.taxheadcode LIKE '%_TAX' THEN adjustedamount ELSE 0 END) as tax, + SUM(CASE WHEN bad.taxheadcode LIKE '%_FEE' THEN adjustedamount ELSE 0 END) as fieldcollection, + string_agg(distinct eg_user.name,',') as collectorname, + To_char((To_timestamp(egcl_paymentdetail.receiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as receiptdate + from eg_echallan inner JOIN egcl_bill ON (eg_echallan.tenantid=$tenantid and eg_echallan.challanno=egcl_bill.consumercode ) inner join egcl_paymentdetail on (egcl_paymentdetail.tenantid=$tenantid and egcl_bill.id=egcl_paymentdetail.billid) + inner JOIN eg_challan_address egchallan ON egchallan.echallanid=eg_echallan.id inner JOIN egcl_payment as payment on (payment.tenantid=$tenantid and egcl_paymentdetail.paymentid=payment.id) INNER JOIN egcl_billdetial as billd on billd.billid = egcl_bill.id inner join egcl_billaccountdetail as bad on bad.billdetailid=billd.id left join bank_branches on bank_branches.ifsc=payment.ifsccode inner JOIN eg_user ON payment.createdby::INTEGER=eg_user.id + where eg_echallan.tenantid=$tenantid and egcl_bill.businessservice not in ('PT','TL','FIRENOC','WS','SW','WS.ONE_TIME_FEE') and payment.paymentstatus != 'CANCELLED' + groupby: group by challanno , egcl_paymentdetail.receiptdate + + - reportName: NewMiscReceiptULB_v2 + decryptionPathId: MiscReceiptULB_v2 + summary: Receipt Register Miscellaneous + version: 1.0.0 + moduleName: rainmaker-uc + additionalConfig: + print: + pdfPageSize: "A3" + sourceColumns: + - name: ulb + label: reports.uc.ulb + type: string + source: uc + total: false + - name: receiptnumber + label: reports.uc.receiptnumber + type: string + source: uc + total: false + - name: receiptdate + label: reports.uc.receiptdate + type: string + source: uc + total: false + - name: g8issuedate + label: reports.uc.g8issuedate + type: string + source: uc + total: false + - name: challanno + label: reports.uc.challanno + type: string + source: uc + total: false + - name: payername + label: reports.uc.payername + type: string + source: uc + total: false + - name: g8receiptno + label: reports.uc.g8receiptno + type: string + source: uc + total: false + - name: status + label: reports.uc.receiptstatus + type: string + source: uc + total: false + - name: servicecategory + label: reports.uc.businessdetails + type: string + source: uc + total: false + - name: cgst + label: reports.uc.cgst + type: string + source: uc + total: true + - name: tax + label: reports.uc.tax + type: string + source: uc + total: true + - name: fieldcollection + label: reports.uc.fieldcollection + type: string + source: uc + total: true + - name: sgst + label: reports.uc.sgst + type: string + source: uc + total: true + - name: ddorchequenumber + label: reports.uc.ddorchequenumber + type: string + source: uc + total: false + - name: ddchequedate + label: reports.uc.ddorchequedate + type: string + source: uc + total: false + - name: bankname + label: reports.uc.bankname + type: string + source: uc + total: false + - name: branchname + label: reports.uc.branchname + type: string + source: uc + total: false + - name: transactionnumber + label: reports.uc.transactionnumber + type: string + source: uc + total: false + - name: collectiontype + label: reports.uc.collectiontype + type: string + source: uc + total: false + - name: collectorname + label: reports.uc.collectorname + type: string + source: uc + total: false + - name: totalamount + label: reports.uc.totalamount + type: string + source: uc + total: true + - name: paymentmode + label: reports.uc.paymentmode + type: string + source: uc + total: false + - name: remarks + label: reports.uc.remarks + type: string + source: uc + total: false + searchParams: + - name: fromDate + label: reports.uc.fromDate + type: epoch + source: uc + isMandatory: true + searchClause: AND paydetail.receiptdate >= $fromDate + - name: toDate + label: reports.uc.toDate + type: epoch + source: uc + isMandatory: true + searchClause: AND paydetail.receiptdate <= $toDate + - name: businessservice + label: reports.uc.businessservice + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=BillingService&masterName=BusinessService&tenantId=$tenantid|$.MdmsRes.BillingService.BusinessService[*].code|$.MdmsRes.BillingService.BusinessService[*].code + source: uc + wrapper: true + isMandatory: false + searchClause: AND bill.businessservice = $businessservice + - name: collectorname + label: reports.uc.collectorname + type: singlevaluelist + pattern: http://egov-hrms:8080/egov-hrms/employees/_search?tenantId=$tenantid&roles=UC_EMP|$.Employees[*].user.id|$.Employees[*].user.name + source: uc + wrapper: true + isMandatory: false + searchClause: AND eg_user.id = $collectorname::INTEGER + query: | + -- Use CTE to force query plan, compute & use CTE later + WITH receipt_breakup AS ( + SELECT + bill.id as bill_id, + SUM(CASE WHEN taxheadcode LIKE '%_CGST' THEN adjustedamount ELSE 0 END) as cgst, + SUM(CASE WHEN taxheadcode LIKE '%_TAX' THEN adjustedamount ELSE 0 END) as tax, + SUM(CASE WHEN taxheadcode LIKE '%_SGST' THEN adjustedamount ELSE 0 END) as sgst, + SUM(CASE WHEN taxheadcode LIKE '%_FEE' THEN adjustedamount ELSE 0 END) as fieldcollection + FROM egcl_billaccountdetail + INNER JOIN egcl_billdetial as billd on billd.id = egcl_billaccountdetail.billdetailid + INNER JOIN egcl_bill as bill on bill.id=billd.billid + WHERE billd.tenantid=$tenantid AND businessservice not in ('PT','TL','FIRENOC','WS','SW','WS.ONE_TIME_FEE') + GROUP BY billdetailid,bill.id + ) + SELECT + payment.tenantid as ulb, + paydetail.receiptnumber as receiptnumber, + To_char((To_timestamp(paydetail.receiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as receiptdate, + To_char((To_timestamp(paydetail.manualreceiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as g8issuedate, + paydetail.manualreceiptnumber as g8receiptno, + challan.challanno as challanno, + payment.payername as payername, + bank_branches.bank_name as bankname, + bank_branches.branch as branchname, + payment.transactionnumber as transactionnumber, + payment.paymentstatus as status, + bill.businessservice as servicecategory, + receipt_breakup.*, + payment.totalamountpaid as totalamount, + paymentmode as paymentmode, + (case when paymentmode like 'CASH' then '' else transactionnumber end) as ddorchequenumber, + (case when paymentmode like 'DD' or paymentmode like 'CHEQUE' then To_char((To_timestamp(payment.instrumentdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') else '' end) as ddchequedate, + 'System' as collectiontype, + eg_user.name as collectorname, + challan.description as remarks + FROM egcl_payment AS payment + JOIN egcl_paymentdetail as paydetail on paydetail.paymentid=payment.id + JOIN receipt_breakup ON paydetail.billid = receipt_breakup.bill_id + JOIN egcl_billdetial as billd on billd.billid=paydetail.billid + LEFT OUTER JOIN egcl_bill as bill on bill.id=paydetail.billid + LEFT OUTER JOIN eg_echallan as challan on challan.challanno=bill.consumercode + JOIN eg_user ON payment.createdby::INTEGER=eg_user.id + LEFT OUTER JOIN bank_branches on bank_branches.ifsc=payment.ifsccode + WHERE payment.tenantid=$tenantid AND bill.businessservice not in ('PT','TL','FIRENOC','WS','SW','WS.ONE_TIME_FEE') and payment.paymentstatus != 'CANCELLED' + orderby: ORDER BY paydetail.receiptdate DESC + + - reportName: uc_7to10sept2020_receipts + decryptionPathId: MiscReceiptULB_v2 + summary: uc_7to10sept2020_receipts + version: 1.0.0 + moduleName: rainmaker-uc + additionalConfig: + print: + pdfPageSize: "A3" + sourceColumns: + - name: ulb + label: reports.uc.ulb + type: string + source: uc + total: false + - name: receiptnumber + label: reports.uc.receiptnumber + type: string + source: uc + total: false + - name: receiptdate + label: reports.uc.receiptdate + type: string + source: uc + total: false + - name: g8issuedate + label: reports.uc.g8issuedate + type: string + source: uc + total: false + - name: g8receiptno + label: reports.uc.g8receiptno + type: string + source: uc + total: false + - name: payername + label: reports.uc.payername + type: string + source: uc + total: false + - name: status + label: reports.uc.receiptstatus + type: string + source: uc + total: false + - name: servicecategory + label: reports.uc.businessdetails + type: string + source: uc + total: false + - name: cgst + label: reports.uc.cgst + type: string + source: uc + total: true + - name: tax + label: reports.uc.tax + type: string + source: uc + total: true + - name: fieldcollection + label: reports.uc.fieldcollection + type: string + source: uc + total: true + - name: sgst + label: reports.uc.sgst + type: string + source: uc + total: true + - name: totalamount + label: reports.uc.totalamount + type: string + source: uc + total: true + - name: paymentmode + label: reports.uc.paymentmode + type: string + source: uc + total: false + - name: ddorchequenumber + label: reports.uc.ddorchequenumber + type: string + source: uc + total: false + - name: ddchequedate + label: reports.uc.ddorchequedate + type: string + source: uc + total: false + - name: collectiontype + label: reports.uc.collectiontype + type: string + source: uc + total: false + - name: collectorname + label: reports.uc.collectorname + type: string + source: uc + total: false + - name: remarks + label: reports.uc.remarks + type: string + source: uc + total: false + + query: | + -- Use CTE to force query plan, compute & use CTE later + SELECT + ulb,receiptnumber,receiptdate,g8issuedate,g8receiptno,payername,status,servicecategory,bill_id,cgst,tax,sgst,fieldcollection,totalamount,paymentmode,ddorchequenumber,ddchequedate, collectiontype,collectorname,remarks from uc_7to10sept2020_receipts + where ulb=$tenantid + orderby: ORDER BY receiptdate DESC + + - reportName: ULBNEWMiscReceipt_v2 + decryptionPathId: MiscReceiptULB_v2 + summary: ULB New Receipt Register Miscellaneous + version: 1.0.0 + moduleName: rainmaker-uc + sourceColumns: + - name: ulb + label: reports.uc.ulb + type: string + source: uc + total: false + - name: receiptnumber + label: reports.uc.receiptnumber + type: string + source: uc + total: false + - name: receiptdate + label: reports.uc.receiptdate + type: string + source: uc + total: false + - name: g8issuedate + label: reports.uc.g8issuedate + type: string + source: uc + total: false + - name: g8receiptno + label: reports.uc.g8receiptno + type: string + source: uc + total: false + - name: status + label: reports.uc.receiptstatus + type: string + source: uc + total: false + - name: servicecategory + label: reports.uc.businessdetails + type: string + source: uc + total: false + - name: cgst + label: reports.uc.cgst + type: string + source: uc + total: true + - name: tax + label: reports.uc.tax + type: string + source: uc + total: true + - name: fieldcollection + label: reports.uc.fieldcollection + type: string + source: uc + total: true + - name: sgst + label: reports.uc.sgst + type: string + source: uc + total: true + - name: ddorchequenumber + label: reports.uc.ddorchequenumber + type: string + source: uc + total: false + - name: collectiontype + label: reports.uc.collectiontype + type: string + source: uc + total: false + - name: collectorname + label: reports.uc.collectorname + type: string + source: uc + total: false + - name: totalamount + label: reports.uc.totalamount + type: string + source: uc + total: true + - name: paymentmode + label: reports.uc.paymentmode + type: string + source: uc + total: false + searchParams: + - name: fromDate + label: reports.uc.fromDate + type: epoch + source: uc + isMandatory: true + searchClause: AND paydetail.receiptdate >= $fromDate + - name: toDate + label: reports.uc.toDate + type: epoch + source: uc + isMandatory: true + searchClause: AND paydetail.receiptdate <= $toDate + - name: ulb + label: reports.uc.ulb + type: singlevaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?tenantId=$tenantid&moduleName=tenant&masterName=tenants|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + source: uc + wrapper: true + isMandatory: false + searchClause: AND paydetail.tenantid = $ulb + query: | + -- Use CTE to force query plan, compute & use CTE later + WITH receipt_breakup AS ( + SELECT + string_agg(distinct billd.billid,',') bill_id, + SUM(CASE WHEN taxheadcode LIKE '%_CGST' THEN adjustedamount ELSE 0 END) as cgst, + SUM(CASE WHEN taxheadcode LIKE '%_TAX' THEN adjustedamount ELSE 0 END) as tax, + SUM(CASE WHEN taxheadcode LIKE '%_SGST' THEN adjustedamount ELSE 0 END) as sgst, + SUM(CASE WHEN taxheadcode LIKE '%_FEE' THEN adjustedamount ELSE 0 END) as fieldcollection + FROM egcl_billaccountdetail + inner join egcl_billdetial as billd on billd.id=egcl_billaccountdetail.billdetailid + INNER JOIN egcl_bill as bill on bill.id = billd.billid + WHERE bill.tenantid!='pb.testing' AND businessservice not in ('PT','TL','FIRENOC') -- and rh.status != 'Cancelled' + GROUP BY billdetailid + ) + SELECT + payment.tenantid as ulb, + paydetail.receiptnumber as receiptnumber, + To_char((To_timestamp(paydetail.receiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as receiptdate, + To_char((To_timestamp(paydetail.manualreceiptdate / 1000) at time Zone 'Asia/Kolkata'), 'DD/MM/YYYY') as g8issuedate, + paydetail.manualreceiptnumber as g8receiptno, + payment.paymentstatus as status, + businessservice as servicecategory, + receipt_breakup.*, + payment.totalamountpaid as totalamount, + paymentmode as paymentmode, + (case when paymentmode like 'CASH' then '' else transactionnumber end) as ddorchequenumber, + 'System' as collectiontype, + eg_user.name as collectorname + FROM egcl_payment AS payment + JOIN egcl_paymentdetail as paydetail on paydetail.paymentid=payment.id + LEFT JOIN receipt_breakup ON paydetail.billid = receipt_breakup.bill_id + JOIN eg_user ON payment.createdby::INTEGER=eg_user.id + WHERE payment.tenantid!='pb.testing' AND businessservice not in ('PT','TL','FIRENOC') and payment.paymentstatus != 'CANCELLED' + orderby: ORDER BY paydetail.receiptdate DESC diff --git a/configs/reports/configs/works-reports.yml b/configs/reports/configs/works-reports.yml new file mode 100644 index 00000000..43aa78d0 --- /dev/null +++ b/configs/reports/configs/works-reports.yml @@ -0,0 +1,565 @@ +--- +ReportDefinitions: +- reportName: WorkOrderRegister + summary: Work Order Register + version: 1.0.0 + moduleName: works + viewPath: workOrderRegister + externalService: + - entity: $.MdmsRes.egf-master.FinancialYear + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=egf-master&masterName=FinancialYear&tenantId=$tenantid&filter=%5B%3F%28%40.active%3D%3Dtrue%29%5D + keyOrder: finYearRange,startingDate,endingDate,tenantId + tableName: tbl_financialyear + stateData: true + sourceColumns: + - name: workorderdate + label: reports.works.workorderdate + type: epoch + source: works + - name: nameofwork + label: reports.works.nameofwork + type: string + source: works + - name: workordernumber + label: reports.works.workordernumber + type: number + source: works + - name: referencenoofwip + label: reports.works.referencenoofwip + type: string + source: works + - name: estimateamount + label: reports.works.estimateamount + type: number + source: works + - name: tenderamount + label: reports.works.tenderamount + type: number + source: works + - name: contractorname + label: reports.works.contractorname + type: string + source: works + - name: approvedattherateof + label: reports.works.approvedattherateof + type: number + source: works + - name: totalvalueofthework + label: reports.works.totalvalueofthework + type: number + source: works + - name: emdamount + label: reports.works.emdamount + type: number + source: works + - name: sanctionedfinyear + label: reports.works.sanctionedfinyear + type: string + source: works + - name: securitydepositamount + label: reports.works.securitydepositamount + type: number + source: works + - name: expectedcompletiondate + label: reports.works.expectedcompletiondate + type: epoch + source: works + searchParams: + - name: fromDate + label: reports.works.wofromDate + type: date + source: works + searchClause : AND wo.workorderdate>=$fromDate + isMandatory: false + - name: toDate + label: reports.works.wotoDate + type: date + source: works + searchClause : AND wo.workorderdate<=$toDate + isMandatory: false + - name: contractorName + label: reports.works.contractorname + type: string + source: works + searchClause : AND contractor.name=$contractorName + isMandatory: false + - name: amountFrom + label: reports.works.woamountfrom + type: number + source: works + searchClause : AND loae.estimateloaamount>=$amountFrom + isMandatory: false + - name: amountUpto + label: reports.works.woamountupto + type: number + source: works + searchClause : AND loae.estimateloaamount<=$amountUpto + isMandatory: false + + query: select wo.workorderdate, de.nameofwork, wo.workordernumber, de.projectcode as referencenoofwip, de.estimatevalue as estimateamount, de.workvalue as tenderamount, contractor.name as contractorname, loa.tenderfinalizedpercentage as approvedattherateof, loa.loaamount as totalvalueofthework, loa.emdamountdeposited as emdamount, (select sum(amount) from egw_securitydeposit where letterofacceptance=loa.id) as securitydepositamount, (select finyear.finYearRange from (values tbl_financialyear) as finyear (finYearRange,startingDate,endingDate,tenantId) where wo.createdtime between startingDate::bigint and endingDate::bigint) as sanctionedfinyear, ((select coalesce(statusdate, innerwo.workorderdate) from egw_workorder innerwo left join egw_offlinestatus fs on fs.objecttype='WorkOrderOffline' and fs.status='WORK_COMMENCED' and fs.objectnumber=innerwo.workordernumber where innerwo.workordernumber=wo.workordernumber) + loa.contractperiod*24*12*60*1000) as expectedcompletiondate from egw_workorder wo, egw_letterofacceptance loa, egw_letterofacceptanceestimate loae, egw_detailedestimate de, egw_contractor contractor where wo.letterofacceptance=loa.id and wo.letterofacceptance=loae.letterofacceptance and loae.letterofacceptance=loa.id and loae.detailedestimate=de.estimatenumber and contractor.code=loa.contractor + +- reportName: WorkStatusReport + summary: Work Status Report + version: 1.0.0 + moduleName: works + viewPath: WorkStatusReport + sourceColumns: + - name: nameofwork + label: reports.works.nameofwork + type: epoch + source: works + - name: fund + label: reports.works.fund + type: string + source: works + - name: typeofwork + label: reports.works.typeofwork + type: string + source: works + - name: subtypeofwork + label: reports.works.subtypeofwork + type: string + source: works + - name: estimatevalue + label: reports.works.estimatevalue + type: number + source: works + - name: agencyfirmname + label: reports.works.agencyfirmname + type: string + source: works + - name: workorderamount + label: reports.works.workorderamount + type: number + source: works + - name: billsubmittedtilldate + label: reports.works.billsubmittedtilldate + type: number + source: works + - name: worksstatuspercentage + label: reports.works.worksstatuspercentage + type: number + source: works + - name: amountpaidtilldate + label: reports.works.amountpaidtilldate + type: number + source: works + searchParams: + - name: fund + label: reports.works.fund + isMandatory: false + type: multivaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=egf-master&masterName=Fund&tenantId=$tenantid&filter=%5B%3F%28%40.active%3D%3Dtrue%29%5D + source: works + stateData: true + wrapper: true + searchClause : AND de.fund in ($fund) + - name: typeofwork + label: reports.works.typeofwork + isMandatory: false + type: multivaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=works&masterName=TypeOfWork&tenantId=$tenantid&filter=%5B%3F%28%40.active%3D%3Dtrue%29%5D + source: works + stateData: true + wrapper: true + searchClause : AND de.workstype in ($typeofwork) + - name: subtypeofwork + label: reports.works.subtypeofwork + isMandatory: false + type: multivaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=works&masterName=TypeOfWork&tenantId=$tenantid&filter%3D%5B%3F%28%20%40.parent%3D%3D%7Btypeofwork%7D%29%5D%7C%24.MdmsRes.works.TypeOfWork.%2A.code%7C%24.MdmsRes..works.TypeOfWork.%2A.name + source: works + stateData: true + wrapper: true + searchClause : AND de.workssubtype in ($subtypeofwork) + - name: department + label: reports.works.department + isMandatory: false + type: multivaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=common-masters&masterName=Department&tenantId=$tenantid&filter=%5B%3F%28%40.active%3D%3Dtrue%29%5D + source: works + stateData: true + wrapper: true + searchClause : AND de.department in ($department) + - name: scheme + label: reports.works.scheme + isMandatory: false + type: multivaluelist + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=Works&masterName=Scheme&tenantId=$tenantid&filter=%5B%3F%28%40.active%3D%3Dtrue%29%5D + source: works + stateData: true + wrapper: true + searchClause : AND de.scheme in ($scheme) + - name: status + label: reports.works.status + isMandatory: false + type: multivaluelist + pattern: 'list://Documentation stage:Documentation stage,Tendering Stage:Tendering Stage,Work In Progress Stage:Work In Progress Stage,Completed:Completed' + source: works + stateData: true + wrapper: true + searchClause : AND de.status in ('Approved') + + query: select de.nameofwork AS nameofwork, de.fund as fund, de.workstype AS typeofwork, de.workssubtype AS subtypeofwork, de.estimatevalue As estimatevalue, contractor.name as firmname, loa.loaamount AS workorderamount, cb.contractorbillamount as billsubmittedtilldate, tm.totalpercentage AS workstatuspercentage, (select COALESCE(sum(br.billamount),0) from egf_billregister br where br.billnumber=cb.billnumber) as amountpaidtilldate from egw_detailedestimate de, egw_letterofacceptanceestimate loae,egw_contractor contractor, egw_milestone m, egw_trackmilestone tm, egw_letterofacceptance loa, egw_contractorbill cb where loa.id=loae.letterofacceptance and loae.detailedestimate=de.id and contractor.code = loa.contractor and m.letterofacceptanceestimate = loae.id and m.id=tm.milestone and loae.id=cb.letterofacceptanceestimate; + +- reportName: WorkInProgressRegister + summary: Work In Progress Register + version: 1.0.0 + moduleName: works + externalService: + - entity: $.MdmsRes.works.TypeOfWork + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=works&masterName=TypeOfWork&tenantId=$tenantid&filter=%5B%3F%28%40.parent%3D%3Dnull%20%26%26%20%40.active%3D%3D%27true%27%29%5D + keyOrder: name,code,description,tenantId + tableName: tbl_typeofwork + stateData: true + - entity: $.MdmsRes.works.TypeOfWork + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=works&masterName=TypeOfWork&tenantId=$tenantid&filter=%5B%3F%28%40.parent%21%3Dnull%20%26%26%20%40.active%3D%3D%27true%27%29%5D + keyOrder: name,code,description,tenantId + tableName: tbl_subtypeofwork + stateData: true + - entity: $.MdmsRes.works.WorksStatus + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=works&masterName=WorksStatus&tenantId=$tenantid&filter=%5B%3F%28%40.moduleType%3D%3D%27DetailedEstimate%27%29%5D + keyOrder: code,description,tenantId + tableName: tbl_workstatus + stateData: true + sourceColumns: + - name: wincode + label: reports.works.wincode + type: string + source: works + linkedReport: + reportName: WorkInProgressDetails + linkedColumn: _parent?reportName={reportName}&wcode={wincode} + - name: nameofwork + label: reports.works.nameofwork + type: string + source: works + - name: subtypeofwork + label: reports.works.subtypeofwork + type: string + source: works + - name: status + label: reports.works.status + type: string + source: works + searchParams: + - name: typeOfWork + label: reports.works.typeofwork + type: singlevaluelist + source: works + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=works&masterName=TypeOfWork&tenantId=$tenantid&filter=%5B%3F%28%40.parent%3D%3Dnull%20%26%26%20%40.active%3D%3D%27true%27%29%5D|$.MdmsRes.works.TypeOfWork.*.code|$.MdmsRes.works.TypeOfWork.*.name + wrapper: true + stateData: true + searchClause : AND de.workstype=$typeOfWork + isMandatory: false + - name: subTypeOfWork + label: reports.works.subtypeofwork + type: singlevaluelist + source: works + pattern: /egov-mdms-service/v1/_get?moduleName=works&masterName=TypeOfWork&tenantId=$tenantid&filter=%5B%3F(%40.parent%3D%3D%27{typeOfWork}%27%20%26%26%20%40.active%3D%3D%27true%27)%5D|$.MdmsRes.works.TypeOfWork.*.code|$.MdmsRes.works.TypeOfWork.*.name + wrapper: true + stateData: true + searchClause : AND de.workssubtype=$subTypeOfWork + isMandatory: false + - name: nameOfWork + label: reports.works.nameofwork + type: string + source: works + searchClause : AND de.nameofwork=$nameOfWork + isMandatory: false + - name: wincode + label: reports.works.wincode + type: string + source: works + searchClause : AND de.projectcode=$wincode + isMandatory: false + - name: status + label: reports.works.status + type: singlevaluelist + source: works + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=works&masterName=WorksStatus&tenantId=$tenantid&filter=%5B%3F%28%40.moduleType%3D%3D%27DetailedEstimate%27%29%5D|$..code|$..description + wrapper: true + stateData: true + searchClause : AND de.status=$status + isMandatory: false + - name: statusason + label: reports.works.statusason + type: string + source: works + searchClause : AND de.status=$statusason + isMandatory: false + + query: select de.projectcode as wincode, de.nameofwork, tw.name||'/'||stw.name as subtypeofwork, workstatus.description as status from egw_detailedestimate de, (values tbl_workstatus) as workstatus (code,description,tenantId), (values tbl_typeofwork) as tw (name,code,description,tenantId), (values tbl_subtypeofwork) as stw (name,code,description,tenantId) where de.status='CREATED' and workstatus.code=de.status and tw.code=de.workstype and stw.code=de.workssubtype + +- reportName: WorkInProgressDetails + summary: Work In Progress Details + version: 1.0.0 + moduleName: works + externalService: + - entity: $.MdmsRes.egf-master.FinancialYear + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=egf-master&masterName=FinancialYear&tenantId=$tenantid&filter=%5B%3F%28%40.active%3D%3Dtrue%29%5D + keyOrder: finYearRange,startingDate,endingDate,tenantId + tableName: tbl_financialyear + stateData: true + - entity: $.MdmsRes.works.Scheme + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=works&masterName=Scheme&tenantId=$tenantid&filter=%5B%3F%28%40.parent%21%3Dnull%29%5D + keyOrder: name,code + tableName: tbl_scheme + stateData: true + sourceColumns: + - name: nameofwork + label: reports.works.nameofwork + type: string + source: works + - name: distributedforfinyear + label: reports.works.distributedforfinyear + type: string + source: works + - name: accountcode + label: reports.works.accountcode + type: string + source: works + - name: estimatevalue + label: reports.works.estimatevalue + type: number + source: works + - name: location + label: reports.works.location + type: string + source: works + - name: expectedcompletiondate + label: reports.works.expectedcompletiondate + type: epoch + source: works + - name: schemename + label: reports.works.schemename + type: string + source: works + - name: actualcompletiondate + label: reports.works.actualcompletiondate + type: epoch + source: works + - name: resolutionnumberanddate + label: reports.works.resolutionnumberanddate + type: string + source: works + - name: capitalisationdate + label: reports.works.capitalisationdate + type: epoch + source: works + - name: workordernumber + label: reports.works.workordernumber + type: number + source: works + - name: wincode + label: reports.works.wincode + type: number + source: works + - name: approvedbudget + label: reports.works.approvedbudget + type: string + source: works + - name: assetidentificationnumber + label: reports.works.assetidentificationnumber + type: string + source: works + - name: securitydepositamount + label: reports.works.securitydepositamount + type: string + source: works + - name: totalexpensesincurredsofar + label: reports.works.totalexpensesincurredsofar + type: string + source: works + - name: paymentdate + label: reports.works.paymentdate + type: epoch + source: works + - name: amount + label: reports.works.amount + type: number + source: works + - name: deductionamount + label: reports.works.deductionamount + type: number + source: works + - name: netpayable + label: reports.works.netpayable + type: number + source: works + - name: vouchernumber + label: reports.works.vouchernumber + type: string + source: works + - name: securitydepositrefunddate + label: reports.works.securitydepositrefunddate + type: epoch + source: works + - name: securitydepositrefundamount + label: reports.works.securitydepositrefundamount + type: number + source: works + - name: outstandingsecuritydepositamount + label: reports.works.outstandingsecuritydepositamount + type: number + source: works + - name: remarks + label: reports.works.remarks + type: string + source: works + - name: headofdepartment + label: reports.works.headofdepartment + type: string + source: works + searchParams: + - name: wcode + label: reports.works.wincode + type: string + source: works + searchClause : AND de.projectcode=$wcode + isMandatory: false + + query: select de.nameofwork, (select finyear.finYearRange from (values tbl_financialyear) as finyear (finYearRange,startingDate,endingDate,tenantId) where de.estimatedate between startingDate::bigint and endingDate::bigint) as distributedforfinyear, de.budgetgroup as accountcode, de.estimatevalue, de.location, ((select coalesce(statusdate, innerwo.workorderdate) from egw_workorder innerwo left join egw_offlinestatus fs on fs.objecttype='WorkOrderOffline' and fs.status='WORK_COMMENCED' and fs.objectnumber=innerwo.workordernumber where innerwo.workordernumber=wo.workordernumber) + loa.contractperiod*24*12*60*1000) as expectedcompletiondate, (select scheme.name from (values tbl_scheme) as scheme (name, code) where scheme.code=de.scheme) as schemename, (select cb.workcompletiondate from egw_contractorbill cb, egf_billregister bg where bg.billnumber=cb.billnumber and bg.billtype='contractorbill' and bg.billsubtype='Final' and cb.letterofacceptanceestimate=loae.id) as actualcompletiondate, de.councilresolutionnumber||'/'||de.councilresolutiondate as resolutionnumberanddate, (select bg.billdate from egw_contractorbill cb, egf_billregister bg where bg.billnumber=cb.billnumber and bg.billtype='contractorbill' and bg.billsubtype='Final' and cb.letterofacceptanceestimate=loae.id) as capitalisationdate, wo.workordernumber, de.projectcode as wincode, de.estimatevalue as approvedbudget, '' as assetidentificationnumber, (select sum(amount) from egw_securitydeposit where letterofacceptance=loa.id) as securitydepositamount, (select sum(bg.billamount) from egw_contractorbill cb, egf_billregister bg where bg.billnumber=cb.billnumber and bg.billtype='contractorbill' and cb.deleted=false and cb.letterofacceptanceestimate=loae.id) as totalexpensesincurredsofar, br.billdate as paymentdate, br.billamount as amount, br.billnumber as vouchernumber from egw_detailedestimate de left join egw_letterofacceptanceestimate loae on loae.detailedestimate=de.estimatenumber left join egw_letterofacceptance loa on loae.letterofacceptance=loa.id left join egw_workorder wo on wo.letterofacceptance=loa.id left join egw_contractorbill cb on cb.letterofacceptanceestimate=loae.id left join egf_billregister br on cb.billnumber=br.billnumber and br.billtype='contractorbill'where wo.letterofacceptance=loa.id and loae.letterofacceptance= wo.letterofacceptance and loae.letterofacceptance=loa.id and loae.detailedestimate=de.estimatenumber + +- reportName: ProjectStatusReport + summary: Project Status Report + version: 1.0.0 + moduleName: works + externalService: + - entity: $.MdmsRes.tenant.tenants[*].city + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_search + keyOrder: name,districtName, regionName + tableName: tbl_tenant + postObject: $RequestInfo,"MdmsCriteria":{"tenantId":"default","moduleDetails":[{"moduleName":"tenant","masterDetails":[{"name":"tenants","filter":"[?(@.code=='$tenantid')]"}]}]} + stateData: true + - entity: $.MdmsRes.works.Scheme + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=works&masterName=Scheme&tenantId=$tenantid&filter=%5B%3F%28%40.parent%21%3Dnull%29%5D + keyOrder: name,code + tableName: tbl_scheme + stateData: true + - entity: $.MdmsRes.works.TypeOfWork + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=works&masterName=TypeOfWork&tenantId=$tenantid&filter=%5B%3F%28%40.parent%3D%3Dnull%20%26%26%20%40.active%3D%3D%27true%27%29%5D + keyOrder: name,code,description,tenantId + tableName: tbl_typeofwork + stateData: true + - entity: $.MdmsRes.works.TypeOfWork + apiURL: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=works&masterName=TypeOfWork&tenantId=$tenantid&filter=%5B%3F%28%40.parent%21%3Dnull%20%26%26%20%40.active%3D%3D%27true%27%29%5D + keyOrder: name,code,description,tenantId + tableName: tbl_subtypeofwork + stateData: true + sourceColumns: + - name: divisionname + label: reports.works.division + type: string + source: works + - name: districtname + label: reports.works.district + type: string + source: works + - name: ulbname + label: reports.works.ulbname + type: string + source: works + - name: typeofwork + label: reports.works.typeofwork + type: string + source: works + - name: subtypeofwork + label: reports.works.subtypeofwork + type: string + source: works + - name: schemename + label: reports.works.schemename + type: string + source: works + - name: estimatenumber + label: reports.works.estimatenumber + type: string + source: works + - name: nameofwork + label: reports.works.nameofwork + type: string + source: works + - name: estimateamount + label: reports.works.estimateamount + type: number + source: works + - name: sanctionedamount + label: reports.works.sanctionedamount + type: number + source: works + - name: workstatus + label: reports.works.status + type: string + source: works + - name: billsreceivedtill + label: reports.works.billsreceivedtill + type: string + source: works + - name: paymentdonetill + label: reports.works.paymentdonetill + type: number + source: works + searchParams: + - name: division + label: reports.works.division + type: singlevaluelist + source: works + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=tenant&masterName=tenants&tenantId=$tenantid|$.MdmsRes.tenant.tenants.*.city.regionName|$.MdmsRes.tenant.tenants.*.city.regionName + wrapper: true + stateData: true + searchClause : AND de.workstype=$typeOfWork + isMandatory: false + - name: district + label: reports.works.district + type: singlevaluelist + isMandatory: false + type: string + source: works + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=tenant&masterName=tenants&tenantId=$tenantid|$.MdmsRes.tenant.tenants.*.city.districtName|$.MdmsRes.tenant.tenants.*.city.districtName + wrapper: true + stateData: true + searchClause : AND de.workstype in ($typeofwork) + - name: ulb + label: reports.works.ulbname + isMandatory: false + type: multivaluelist + source: works + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=tenant&masterName=tenants&tenantId=$tenantid|$.MdmsRes.tenant.tenants.*.code|$.MdmsRes.tenant.tenants.*.name + wrapper: true + stateData: true + searchClause : AND de.workssubtype in ($subtypeofwork) + - name: status + label: reports.works.status + type: singlevaluelist + source: works + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=works&masterName=WorksStatus&tenantId=$tenantid&filter=%5B%3F%28%40.moduleType%3D%3D%27DetailedEstimate%27%29%5D|$..code|$..description + wrapper: true + stateData: true + searchClause : AND de.status=$status + isMandatory: false + - name: statusason + label: reports.works.statusason + type: string + source: works + searchClause : AND de.status=$statusason + isMandatory: false + - name: typeOfWork + label: reports.works.typeofwork + type: singlevaluelist + source: works + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=works&masterName=TypeOfWork&tenantId=$tenantid&filter=%5B%3F%28%40.parent%3D%3Dnull%20%26%26%20%40.active%3D%3D%27true%27%29%5D|$..code|$..name + wrapper: true + stateData: true + searchClause : AND de.workstype=$typeOfWork + isMandatory: false + - name: subTypeOfWork + label: reports.works.subtypeofwork + type: singlevaluelist + source: works + pattern: http://egov-mdms-service:8080/egov-mdms-service/v1/_get?moduleName=works&masterName=TypeOfWork&tenantId=$tenantid&filter=%5B%3F%28%40.parent%3D%3D%7BtypeOfWork%7D%20%26%26%20%40.active%3D%3D%27true%27%29%5D|$..code|$..name + wrapper: true + stateData: true + searchClause : AND de.workssubtype=$subTypeOfWork + isMandatory: false + query: select (select city.name from (values tbl_tenant) as city (name, districtName, regionName)) as divisionname, (select city.districtName from (values tbl_tenant) as city (name, districtName, regionName)) as districtname, (select name from (values tbl_tenant) as city (name, districtName, regionName)) as ulbname, (select tw.name from (values tbl_typeofwork) as tw (name,code,description,tenantId) where tw.code=de.workstype) as typeofwork, (select stw.name from (values tbl_subtypeofwork) as stw (name,code,description,tenantId) where stw.code=de.workssubtype) as subtypeofwork, (select scheme.name from (values tbl_scheme) as scheme (name, code) where scheme.code=de.scheme) as schemename, de.estimatenumber, de.nameofwork, de.estimatevalue as estimateamount, loa.loaamount as sanctionedamount, (select sum(bg.billamount) from egw_contractorbill cb, egf_billregister bg where bg.billnumber=cb.billnumber and bg.billtype='contractorbill' and cb.deleted=false and cb.letterofacceptanceestimate=loae.id) as billsreceivedtill from egw_letterofacceptance loa, egw_detailedestimate de, egw_letterofacceptanceestimate loae left join egw_contractorbill cb on cb.letterofacceptanceestimate=loae.id left join egf_billregister br on cb.billnumber=br.billnumber and br.billtype='contractorbill' where loae.letterofacceptance=loa.id and loae.detailedestimate=de.estimatenumber diff --git a/configs/reports/configs/ws-reports.yml b/configs/reports/configs/ws-reports.yml new file mode 100644 index 00000000..1f28f7d7 --- /dev/null +++ b/configs/reports/configs/ws-reports.yml @@ -0,0 +1,1845 @@ +--- +ReportDefinitions: +- reportName: ReceiptRegisterSW + decryptionPathId: ULBPTDataDumpReport_V2 + summary: Receipt Register + version: 1.0.0 + moduleName: rainmaker-ws + additionalConfig: + print: + pdfPageSize: "A1" + sourceColumns: + - name: receiptno + label: reports.ws.receiptno + type: string + source: ws + total: false + - name: connectionno + label: reports.ws.connectionno + type: string + source: ws + total: false + - name: mobileno + label: reports.ws.mobileno + type: string + source: ws + total: false + - name: receiptdate1 + label: reports.ws.receiptdate + type: string + source: ws + total: false + - name: service + label: reports.ws.serive + type: string + source: ws + total: false + - name: billnumber + label: reports.ws.billnumber + type: string + source: ws + total: false + - name: billdate1 + label: reports.ws.billdate + type: string + source: ws + total: false + - name: paidby + label: reports.ws.paidby + type: string + source: ws + total: false + - name: amountpaid + label: reports.ws.amountpaid + type: string + source: ws + total: true + - name: paymentmode + label: reports.ws.paymentmode + type: string + source: ws + total: false + - name: paymentstatus + label: reports.ws.paymentstatus + type: string + source: ws + total: false + - name: ownername1 + label: reports.ws.ownername1 + type: string + source: ws + total: false + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: true + searchClause: AND pd.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: true + searchClause: AND pd.receiptdate <= $toDate + - name: serviceType + label: serviceType + type: singlevaluelist + pattern: 'list://WS%:Water,SW%:Sewerage' + source: pt + isMandatory: true + searchClause: AND pd.businessservice like $serviceType + - name: receiptNumber + label: receiptNumber + type: string + source: pt + isMandatory: false + searchClause: AND pd.receiptnumber like $receiptNumber + - name: paymentStatus + label: paymentStatus + type: singlevaluelist + pattern: 'list://NEW:NEW,DEPOSITED:DEPOSITED' + source: pt + isMandatory: false + searchClause: AND payment.paymentstatus like $paymentStatus + - name: paymentMode + label: paymentMode + type: singlevaluelist + pattern: 'list://CASH:CASH,CHEQUE:CHEQUE,DD:DD,ONLINE:ONLINE,CARD:CARD,OFFLINE_NEFT:OFFLINE NEFT' + source: pt + isMandatory: false + searchClause: AND payment.paymentmode like $paymentMode + query: | + -- Use CTE to force query plan, compute & use CTE later + select + receiptnumber as receiptno, + bill.consumercode as connectionno, + usr.mobilenumber as mobileno, + to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') as receiptdate1, + bill.businessservice as service, + billnumber, + to_char((To_timestamp(bill.billdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') as billdate1, + paidby, + amountpaid, + paymentmode, + paymentstatus, + payername as ownername1 + from egcl_paymentdetail pd + inner join egcl_bill as bill on bill.id=pd.billid + inner join egcl_payment as payment on payment.id=pd.paymentid + inner join eg_user as usr on usr.id=payment.createdby::integer and payment.paymentstatus!='CANCELLED' + where payment.tenantid=$tenantid and pd.businessservice in ('WS','SW') and bill.status='ACTIVE' + orderby: order by pd.receiptdate desc + + +- reportName: ReceiptRegisterSW_OLD + summary: Receipt Register + version: 1.0.0 + moduleName: rainmaker-ws + additionalConfig: + print: + pdfPageSize: "A1" + sourceColumns: + - name: connectionno + label: reports.ws.connectionno + type: string + source: ws + total: false + - name: consumercode + label: reports.ws.consumercode + type: string + source: ws + total: false + - name: receiptdate + label: reports.ws.receiptdate + type: string + source: ws + total: false + - name: receiptnumber + label: reports.ws.receiptnumber + type: string + source: ws + total: false + - name: instrumenttype + label: reports.ws.instrumenttype + type: string + source: ws + total: false + - name: bankname + label: reports.ws.bankname + type: string + source: ws + total: false + - name: transactionnumber + label: reports.ws.transactionnumber + type: string + source: ws + total: false + - name: transactiondate + label: reports.ws.transactiondate + type: string + source: ws + total: false + - name: billperiod + label: reports.ws.billperiod + type: string + source: ws + total: false + - name: amount + label: reports.ws.amount + type: string + source: ws + total: true + - name: pendingamount + label: reports.ws.pendingamount + type: string + source: ws + total: true + - name: usagetype + label: reports.ws.usagetype + type: string + source: ws + total: false + - name: adhocpenalty + label: reports.ws.adhocpenalty + type: string + source: ws + total: true + - name: adhocrebate + label: reports.ws.adhocrebate + type: string + source: ws + total: true + - name: compositionfee + label: reports.ws.compositionfee + type: string + source: ws + total: true + - name: connectionfee + label: reports.ws.connectionfee + type: string + source: ws + total: true + - name: roundoff + label: reports.ws.roundoff + type: string + source: ws + total: true + - name: formfee + label: reports.ws.formfee + type: string + source: ws + total: true + - name: onetimefee + label: reports.ws.onetimefee + type: string + source: ws + total: true + - name: othercharge + label: reports.ws.othercharge + type: string + source: ws + total: true + - name: otherfee + label: reports.ws.otherfee + type: string + source: ws + total: true + - name: roadcuttingcharge + label: reports.ws.roadcuttingcharge + type: string + source: ws + total: true + - name: securityfee + label: reports.ws.securityfee + type: string + source: ws + total: true + - name: securitycharge + label: reports.ws.securitycharge + type: string + source: ws + total: true + - name: taxandcess + label: reports.ws.interest + type: string + source: ws + total: true + - name: usercharge + label: reports.ws.usercharge + type: string + source: ws + total: true + - name: g8issuedate + label: reports.ws.g8issuedate + type: string + source: ws + total: false + - name: g8receiptno + label: reports.ws.g8receiptno + type: string + source: ws + total: false + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: true + searchClause: AND pd.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: true + searchClause: AND pd.receiptdate <= $toDate + - name: connectionType + label: connectionType + type: singlevaluelist + pattern: 'list://WS%:Water,SW%:Sewerage' + source: pt + isMandatory: true + searchClause: AND pd.businessservice like $connectionType + query: | + -- Use CTE to force query plan, compute & use CTE later + WITH receipt_breakup AS + ( + SELECT + pd.id as pdid, + SUM(CASE WHEN taxheadcode LIKE 'SW_ADHOC_PENALTY' THEN adjustedamount ELSE 0 END) as adhocpenalty, + SUM(CASE WHEN taxheadcode LIKE 'SW_ADHOC_REBATE' THEN adjustedamount ELSE 0 END) as adhocrebate, + SUM(CASE WHEN taxheadcode LIKE 'SW_COMPOSITION_FEE' THEN adjustedamount ELSE 0 END) as compositionfee, + SUM(CASE WHEN taxheadcode LIKE 'SW_CONNECTION_FEE' THEN adjustedamount ELSE 0 END) as connectionfee, + SUM(CASE WHEN taxheadcode LIKE 'SW_FEE_ROUND_OFF' THEN adjustedamount ELSE 0 END) as roundoff, + SUM(CASE WHEN taxheadcode LIKE 'SW_FORM_FEE' THEN adjustedamount ELSE 0 END) as formfee, + SUM(CASE WHEN taxheadcode LIKE 'SW_ONE_TIME_FEE' THEN adjustedamount ELSE 0 END) as onetimefee, + SUM(CASE WHEN taxheadcode LIKE 'SW_OTHER_CHARGE' THEN bad.amount ELSE 0 END) as othercharge, + SUM(CASE WHEN taxheadcode LIKE 'SW_OTHER_FEE' THEN adjustedamount ELSE 0 END) as otherfee, + SUM(CASE WHEN taxheadcode LIKE 'SW_ROAD_CUTTING_CHARGE' THEN bad.amount ELSE 0 END) as roadcuttingcharge, + SUM(CASE WHEN taxheadcode LIKE 'SW_SCRUTINY_FEE' THEN bad.amount ELSE 0 END) as scrutinyfee, + SUM(CASE WHEN taxheadcode LIKE 'SW_SECURITY_CHARGE' THEN adjustedamount ELSE 0 END) as securitycharge, + SUM(CASE WHEN taxheadcode LIKE 'SW_TAX_AND_CESS' THEN adjustedamount ELSE 0 END) as taxandcess, + SUM(CASE WHEN taxheadcode LIKE 'SW_USER_CHARGE' THEN adjustedamount ELSE 0 END) as usercharge + FROM egcl_billaccountdetail as bad + INNER JOIN egcl_billdetial as bd on bd.id = bad.billdetailid + INNER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid + INNER JOIN egcl_payment as payment on pd.paymentid=payment.id + WHERE payment.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' + group by pdid + ) + SELECT + --count(*) + pd.tenantid AS tenantid, + pd.id, + pt.propertyid as consumercode, + to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS receiptdate, + payment.ifsccode AS bankname, + receiptnumber, + payment.totalamountpaid as amount, + payment.paymentmode as instrumenttype, + payment.transactionnumber, + concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY')) as billperiod, + to_char((To_timestamp(payment.transactiondate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, + payment.totaldue - payment.totalamountpaid AS pendingamount, + Initcap(case when pt.usagecategory like '%.%' then split_part(pt.usagecategory,'.',2) else pt.usagecategory end) as usagetype, + (case when eg_user.name is null then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else eg_user.name end) as collectorname, + receipt_breakup.*, + to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, + manualreceiptnumber as g8receiptno + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment, eg_pt_property as pt, receipt_breakup, egcl_bill bill, eg_sw_connection + --(select string_agg(distinct propertyid,',') as propertyid, string_agg(distinct locality,',') as locality from eg_pt_address where tenantid=$tenantid group by propertyid ) pt_addr + where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice like $connectionType and payment.tenantid=$tenantid + and pt.id = eg_sw_connection.property_id + and receipt_breakup.pdid=pd.id + and pt.status!='INACTIVE' + --and pt_addr.propertyid=pt.id + --and pt.propertyid='PT-1012-978737' + --and receiptnumber='PT/1012/2020-21/001021' + orderby: ORDER BY pd.receiptdate DESC + + +- reportName: ReceiptRegisterReportSW + decryptionPathId: ReceiptRegisterShort_V2 + summary: Receipt Register + version: 1.0.0 + moduleName: rainmaker-ws + additionalConfig: + print: + pdfPageSize: "A1" + sourceColumns: + - name: receiptnumber + label: reports.ws.receiptnumber + type: string + source: ws + total: false + - name: receiptdate + label: reports.ws.receiptdate + type: string + source: ws + total: false + - name: service + label: reports.ws.service + type: string + source: ws + total: false + - name: collectorname + label: reports.ws.collectorname + type: string + source: ws + total: false + - name: online + label: reports.ws.online + type: string + source: ws + total: true + - name: cash + label: reports.ws.cash + type: string + source: ws + total: true + - name: cheque + label: reports.ws.cheque + type: string + source: ws + total: true + - name: dd + label: reports.ws.dd + type: string + source: ws + total: true + - name: cheque_dd_date + label: reports.ws.cheque_dd_date + type: string + source: ws + total: false + - name: cheque_dd_transaction_number + label: reports.ws.cheque_dd_transaction_number + type: string + source: ws + total: false + - name: card + label: reports.ws.card + type: string + source: ws + total: true + - name: rtgs + label: reports.ws.rtgs + type: string + source: ws + total: true + - name: neft + label: reports.ws.neft + type: string + source: ws + total: true + - name: po + label: reports.ws.po + type: string + source: ws + total: true + - name: paymentstatus + label: reports.ws.paymentstatus + type: string + source: ws + total: false + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: true + searchClause: AND pd.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: true + searchClause: AND pd.receiptdate <= $toDate + - name: connectionType + label: connectionType + type: singlevaluelist + pattern: 'list://WS%:Water,SW%:Sewerage' + source: pt + isMandatory: true + searchClause: AND pd.businessservice like $connectionType + query: | + -- Use CTE to force query plan, compute & use CTE later + select + receiptnumber, + to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') as receiptdate1, + businessservice as service, + (case when eg_user.name is null then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else eg_user.name end) as collectorname, + case when payment.paymentmode='ONLINE' then payment.totalamountpaid else 0 end as "online", + case when payment.paymentmode='CASH' then payment.totalamountpaid else 0 end as cash, + case when payment.paymentmode='CHEQUE' then payment.totalamountpaid else 0 end as cheque, + case when payment.paymentmode='DD' then payment.totalamountpaid else 0 end as dd, + to_char((To_timestamp(instrumentdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') as cheque_dd_date, + instrumentnumber as cheque_dd_transaction_number, + case when payment.paymentmode='CARD' then payment.totalamountpaid else 0 end as card, + case when payment.paymentmode='OFFLINE_RTGS' then payment.totalamountpaid else 0 end as rtgs, + case when payment.paymentmode='OFFLINE_NEFT' then payment.totalamountpaid else 0 end as neft, + case when payment.paymentmode='POTAL_ORDER' then payment.totalamountpaid else 0 end as po + from egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER + inner join egcl_payment payment on payment.id=pd.paymentid + where pd.tenantid=$tenantid + orderby: order by pd.receiptdate + + +- reportName: BaseRegisterReportWS + summary: Base Register Report WS + version: 1.0.0 + moduleName: rainmaker-ws + additionalConfig: + print: + pdfPageSize: "A1" + sourceColumns: + - name: connectionno + label: reports.ws.connectionno + type: string + source: ws + total: false + - name: plotsize + label: reports.ws.plotsize + type: string + source: ws + total: false + - name: applicationno + label: reports.ws.applicationno + type: string + source: ws + total: false + - name: propertyid + label: reports.ws.propertyid + type: string + source: ws + total: false + - name: connectionholdertype + label: reports.ws.connectionholdertype + type: string + source: ws + total: false + - name: applicationstatus + label: reports.ws.applicationstatus + type: string + source: ws + total: false + - name: connectionholder + label: reports.ws.connectionholder + type: string + source: ws + total: false + - name: name + label: reports.ws.ownername + type: string + source: ws + total: false + - name: address + label: reports.ws.address + type: string + source: ws + total: false + query: | + -- Use CTE to force query plan, compute & use CTE later + with ptowner as + ( + select split_part(string_agg(userid,','),',',1) as owneruserid, + propertyid + from eg_pt_owner + where tenantid=$tenantid and status='ACTIVE' + group by propertyid + ) + --, + -- ptaddress as + --( + -- select + -- split_part(string_agg(locality,','),',',1) as locality, + -- split_part(string_agg(concat(doorno,' ',plotno,' ',buildingname,' ',street,' ',city),'|'),'|',1) as address, + -- propertyid + -- from eg_pt_address + -- where tenantid=$tenantid + -- group by propertyid + --) + select + connectionno, + pt.landarea as plotsize, + oldconnectionno, + applicationno, + pt.propertyid, + ch.connectionholdertype, + wsconnection.applicationstatus, + users.name as connectionHolder, + userowner.name as name + --concat(address,' ',localityname) as address + from eg_ws_connection wsconnection + inner join eg_pt_property as pt on pt.id=wsconnection.property_id + left outer join eg_ws_connectionholder as ch on ch.connectionid=wsconnection.id + left outer join eg_user as users on ch.userid=users.uuid + inner join ptowner on ptowner.propertyid=pt.id + left outer join eg_user as userowner on ptowner.owneruserid=userowner.uuid + --inner join ptaddress on ptaddress.propertyid=pt.id + --INNER JOIN eg_bndry_mohalla on eg_bndry_mohalla.localitycode=ptaddress.locality + +- reportName: FieldCollectionSearchReportWS + decryptionPathId: FieldCollectionSearchReportWS + summary: Field Collection Search Report WS + version: 1.0.0 + moduleName: rainmaker-ws + additionalConfig: + print: + pdfPageSize: "A1" + sourceColumns: + - name: receiptnumber + label: reports.ws.receiptnumber + type: string + source: ws + total: false + - name: receiptdate1 + label: reports.ws.receiptdate + type: string + source: ws + total: false + - name: businessservice + label: reports.ws.businessservice + type: string + source: ws + total: false + - name: amountpaid + label: reports.ws.amountpaid + type: string + source: ws + total: true + - name: consumercode + label: reports.ws.consumercode + type: string + source: ws + total: false + - name: paymentstatus + label: reports.ws.paymentstatus + type: string + source: ws + total: false + - name: paymentmode + label: reports.ws.paymentmode + type: string + source: ws + total: false + - name: name + label: reports.ws.name + type: string + source: ws + total: false + - name: mobilenumber + label: reports.ws.mobilenumber + type: string + source: ws + total: false + searchParams: + - name: connectionType + label: connectionType + type: singlevaluelist + pattern: 'list://WS%:Water,SW%:Sewerage' + source: pt + isMandatory: true + searchClause: AND pd.businessservice like $connectionType + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: false + searchClause: AND pd.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: false + searchClause: AND pd.receiptdate <= $toDate + query: | + -- Use CTE to force query plan, compute & use CTE later + select + receiptnumber, + to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS receiptdate1, + pd.businessservice, + pd.amountpaid, + consumercode, + paymentstatus, + paymentmode, + usr.name as name, + usr.mobilenumber as mobilenumber + from egcl_paymentdetail pd + inner join egcl_bill as bill on bill.id=pd.billid + INNER join egcl_payment as payment on payment.id=pd.paymentid + inner join eg_user as usr on usr.id=payment.createdby::integer + where pd.tenantid=$tenantid + orderby: ORDER BY pd.receiptdate DESC + +- reportName: FieldCollectionSearchReceiptWS + summary: Field Collection Search Receipt WS + version: 1.0.0 + moduleName: rainmaker-ws + additionalConfig: + print: + pdfPageSize: "A1" + sourceColumns: + - name: receiptnumber + label: reports.ws.receiptnumber + type: string + source: ws + total: false + - name: receiptdate1 + label: reports.ws.receiptdate + type: string + source: ws + total: false + - name: manualreceiptnumber + label: reports.ws.manualreceiptnumber + type: string + source: ws + total: false + - name: businessservice + label: reports.ws.businessservice + type: string + source: ws + total: false + - name: amountpaid + label: reports.ws.amountpaid + type: string + source: ws + total: true + - name: consumercode + label: reports.ws.consumercode + type: string + source: ws + total: false + - name: paymentstatus + label: reports.ws.paymentstatus + type: string + source: ws + total: false + - name: paymentmode + label: reports.ws.paymentmode + type: string + source: ws + total: false + - name: billnumber + label: reports.ws.billnumber + type: string + source: ws + total: false + - name: billdescription + label: reports.ws.billdescription + type: string + source: ws + total: false + searchParams: + - name: connectionType + label: connectionType + type: singlevaluelist + pattern: 'list://WS%:Water,SW%:Sewerage' + source: pt + isMandatory: true + searchClause: AND bill.businessservice like $connectionType + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: false + searchClause: AND pd.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: false + searchClause: AND pd.receiptdate <= $toDate + query: | + -- Use CTE to force query plan, compute & use CTE later + select + receiptnumber, + manualreceiptnumber, + to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS receiptdate1, + pd.businessservice as businessservice, + billnumber, + billdescription, + consumercode, + pd.amountpaid as amountpaid, + paymentmode, + paymentstatus + from egcl_paymentdetail pd + inner join egcl_bill as bill on bill.id=pd.billid + inner join egcl_billdetial as billd on billd.billid=pd.billid + INNER join egcl_payment as payment on payment.id=pd.paymentid + where 1=1 + orderby: ORDER BY pd.receiptdate DESC + + +- reportName: ChequeCollectionReportWS + summary: Cheque Collection Report WS + version: 1.0.0 + moduleName: rainmaker-ws + additionalConfig: + print: + pdfPageSize: "A1" + sourceColumns: + - name: consumercode + label: reports.ws.consumercode + type: string + source: ws + total: false + - name: connectionno + label: reports.ws.connectionno + type: string + source: ws + total: false + - name: oldconnectionno + label: reports.ws.oldconnectionno + type: string + source: ws + total: false + - name: receiptnumber + label: reports.ws.receiptnumber + type: string + source: ws + total: false + - name: receiptdate1 + label: reports.ws.receiptdate + type: string + source: ws + total: false + - name: manualreceiptnumber + label: reports.ws.manualreceiptnumber + type: string + source: ws + total: false + - name: manualreceiptdate + label: reports.ws.manualreceiptdate + type: string + source: ws + total: false + - name: cheque_dd_no + label: reports.ws.cheque_dd_no + type: string + source: ws + total: false + - name: cheque_dd_date + label: reports.ws.cheque_dd_date + type: string + source: ws + total: false + - name: paymentmode + label: reports.ws.paymentmode + type: string + source: ws + total: false + - name: paymentstatus + label: reports.ws.paymentstatus + type: string + source: ws + total: false + - name: bank_name + label: reports.ws.bank_name + type: string + source: ws + total: false + - name: branch + label: reports.ws.branch + type: string + source: ws + total: false + - name: amountpaid + label: reports.ws.amountpaid + type: string + source: ws + total: true + - name: businessservice + label: reports.ws.businessservice + type: string + source: ws + total: false + searchParams: + - name: connectionType + label: connectionType + type: singlevaluelist + pattern: 'list://WS%:Water,SW%:Sewerage' + source: pt + isMandatory: true + searchClause: AND bill.businessservice like $connectionType + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: false + searchClause: AND pd.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: false + searchClause: AND pd.receiptdate <= $toDate + query: | + -- Use CTE to force query plan, compute & use CTE later + select + consumercode, + wsconnection.connectionno, + wsconnection.oldconnectionno, + receiptnumber, + to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') as receiptdate1, + manualreceiptnumber, + to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') as manualreceiptdate, + transactionnumber as cheque_dd_no, + to_char((To_timestamp(transactiondate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') as cheque_dd_date, + paymentmode, + paymentstatus, + bank_name, + branch, + pd.amountpaid, + pd.businessservice + from egcl_paymentdetail pd + inner join egcl_payment payment on payment.id=pd.paymentid + left outer join bank_branches on bank_branches.ifsc=payment.ifsccode + inner join egcl_bill bill on bill.id=pd.billid + inner join eg_ws_connection wsconnection on wsconnection.connectionno=bill.consumercode + where payment.paymentmode='CHEQUE' and pd.tenantid=$tenantid and payment.paymentstatus!='CANCELLED' + orderby: ORDER BY pd.receiptdate DESC + +- reportName: SearchOnlineReceiptsWS + decryptionPathId: ReceiptRegisterShort_V2 + summary: Search Online Receipts WS + version: 1.0.0 + moduleName: rainmaker-ws + additionalConfig: + print: + pdfPageSize: "A1" + sourceColumns: + - name: billnumber + label: reports.ws.billnumber + type: string + source: ws + total: false + - name: consumercode + label: reports.ws.consumercode + type: string + source: ws + total: false + - name: receiptnumber + label: reports.ws.receiptnumber + type: string + source: ws + total: false + - name: receiptdate1 + label: reports.ws.receiptdate1 + type: string + source: ws + total: false + - name: amountpaid + label: reports.ws.amountpaid + type: string + source: ws + total: true + - name: transactionnumber + label: reports.ws.transactionnumber + type: string + source: ws + total: false + - name: transactiondate1 + label: reports.ws.transactiondate + type: string + source: ws + total: false + - name: businessservice + label: reports.ws.businessservice + type: string + source: ws + total: false + - name: paymentstatus + label: reports.ws.paymentstatus + type: string + source: ws + total: false + - name: paymentmode + label: reports.ws.paymentmode + type: string + source: ws + total: false + - name: collectorname + label: reports.ws.collectorname + type: string + source: ws + total: false + searchParams: + - name: connectionType + label: connectionType + type: singlevaluelist + pattern: 'list://WS%:Water,SW%:Sewerage' + source: pt + isMandatory: true + searchClause: AND bill.businessservice like $connectionType + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: false + searchClause: AND payment.transactiondate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: false + searchClause: AND payment.transactiondate <= $toDate + query: | + -- Use CTE to force query plan, compute & use CTE later + select + billnumber, + bill.consumercode as consumercode, + pd.receiptnumber as receiptnumber, + to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') as receiptate1, + pd.amountpaid, + pd.businessservice , + paymentstatus , + payment.transactionnumber , + to_char((To_timestamp(payment.transactiondate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') as transactiondate1, + paymentmode, + (case when eg_user.name is null then '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' else eg_user.name end) as collectorname + from egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER + inner join egcl_bill as bill on bill.id=pd.billid + INNER join egcl_payment as payment on payment.id=pd.paymentid + where paymentmode='ONLINE' and payment.tenantid=$tenantid + orderby: ORDER BY payment.transactiondate DESC + +- reportName: ReceiptCollections + summary: Receipt Collections + version: 1.0.0 + moduleName: rainmaker-ws + additionalConfig: + print: + pdfPageSize: "A1" + sourceColumns: + - name: receiptnumber + label: reports.ws.receiptnumber + type: string + source: ws + total: false + - name: receiptdate1 + label: reports.ws.receiptdate + type: string + source: ws + total: false + - name: businessservice + label: reports.ws.businessservice + type: string + source: ws + total: false + - name: amountpaid + label: reports.ws.amountpaid + type: string + source: ws + total: true + - name: consumercode + label: reports.ws.consumercode + type: string + source: ws + total: false + - name: paymentmode + label: reports.ws.paymentmode + type: string + source: ws + total: false + - name: billnumber + label: reports.ws.billnumber + type: string + source: ws + total: false + - name: paidby + label: reports.ws.paidby + type: string + source: ws + total: false + searchParams: + - name: connectionType + label: connectionType + type: singlevaluelist + pattern: 'list://WS%:Water,SW%:Sewerage' + source: pt + isMandatory: true + searchClause: AND pd.businessservice like $connectionType + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: false + searchClause: AND payment.transactiondate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: false + searchClause: AND payment.transactiondate <= $toDate + query: | + -- Use CTE to force query plan, compute & use CTE later + select + consumercode, + receiptnumber, + to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') as receiptdate1, + amountpaid, + paymentmode, + pd.businessservice, + bill.billnumber, + payment.paidby + from egcl_paymentdetail pd + inner join egcl_bill as bill on bill.id=pd.billid + inner join egcl_payment as payment on payment.id=pd.paymentid and payment.paymentstatus!='CANCELLED' + where pd.tenantid=$tenantid + orderby: ORDER BY pd.receiptdate DESC + +- reportName: JE_PendencyReport + decryptionPathId: JE_PendencyReport_WS + summary: JE_Pendency Report + version: 1.0.0 + moduleName: rainmaker-ws + additionalConfig: + print: + pdfPageSize: "A1" + sourceColumns: + - name: name + label: reports.ws.name + type: string + source: ws + total: false + - name: count + label: reports.ws.count + type: string + source: ws + total: true + query: | + -- Use CTE to force query plan, compute & use CTE later + select usr.name,count(*) + from eg_ws_connection con + inner join eg_user as usr on usr.uuid=con.createdby and usr.type='EMPLOYEE' + where applicationstatus not in ('INITIATED') and con.tenantid=$tenantid + groupby: GROUP BY con.createdby,usr.name + +- reportName: CashCollectionReport + decryptionPathId: ReceiptRegisterShort_V2 + summary: Cash Collection Report + version: 1.0.0 + moduleName: rainmaker-ws + additionalConfig: + print: + pdfPageSize: "A1" + sourceColumns: + - name: receiptnumber + label: reports.ws.receiptnumber + type: string + source: ws + total: false + - name: receiptdate1 + label: reports.ws.receiptdate + type: string + source: ws + total: false + - name: amountpaid + label: reports.ws.amountpaid + type: string + source: ws + total: true + - name: consumercode + label: reports.ws.consumercode + type: string + source: ws + total: false + - name: collectorname + label: reports.ws.collectorname + type: string + source: ws + total: false + searchParams: + - name: connectionType + label: connectionType + type: singlevaluelist + pattern: 'list://WS%:Water,SW%:Sewerage' + source: pt + isMandatory: true + searchClause: AND pd.businessservice like $connectionType + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: false + searchClause: AND pd.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: false + searchClause: AND pd.receiptdate <= $toDate + - name: collectorname + label: reports.pt.collectorname + type: singlevaluelist + pattern: http://egov-hrms:8080/egov-hrms/employees/_search?tenantId=$tenantid&roles=WS_CEMP,WS_CLERK,SW_CEMP,SW_CLERK|$.Employees[*].user.id|$.Employees[*].user.name + source: ws + wrapper: true + isMandatory: false + searchClause: AND eg_user.id = $collectorname::INTEGER + query: | + -- Use CTE to force query plan, compute & use CTE later + select + consumercode, + receiptnumber, + to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') as receiptdate1, + amountpaid, + (case when eg_user.name is null then '30048|23/xn3x2FAxn8vYAN0IdplsOxaE=' else eg_user.name end) as collectorname + from egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER + inner join egcl_bill as bill on bill.id=pd.billid + inner join egcl_payment as payment on payment.id=pd.paymentid and payment.paymentmode='CASH' and payment.paymentstatus!='CANCELLED' + and pd.businessservice in ('WS','SW') where payment.tenantid=$tenantid + orderby: ORDER BY pd.receiptdate DESC + +- reportName: CollectionsSummaryHeadwiseReport + summary: Collections Summary Headwise Report + version: 1.0.0 + moduleName: rainmaker-ws + additionalConfig: + print: + pdfPageSize: "A1" + sourceColumns: + - name: taxheadcode + label: reports.ws.taxheadcode + type: string + source: ws + total: false + - name: totalamountpaid + label: reports.ws.totalamountpaid + type: string + source: ws + total: true + - name: totalassessments + label: reports.ws.totalassessments + type: string + source: ws + total: true + - name: totalonline + label: reports.ws.totalonline + type: string + source: ws + total: true + - name: countonline + label: reports.ws.countonline + type: string + source: ws + total: true + - name: totalcash + label: reports.ws.totalcash + type: string + source: ws + total: true + - name: countcash + label: reports.ws.countcash + type: string + source: ws + total: true + - name: totalcheque + label: reports.ws.totalcheque + type: string + source: ws + total: true + - name: totaldd + label: reports.ws.totaldd + type: string + source: ws + total: true + - name: countdd + label: reports.ws.countdd + type: string + source: ws + total: true + - name: totalcard + label: reports.ws.totalcard + type: string + source: ws + total: true + - name: countcard + label: reports.ws.countcard + type: string + source: ws + total: true + - name: totalrtgs + label: reports.ws.totalrtgs + type: string + source: ws + total: true + - name: totalneft + label: reports.ws.totalneft + type: string + source: ws + total: true + - name: countneft + label: reports.ws.countneft + type: string + source: ws + total: true + - name: totalPO + label: reports.ws.totalPO + type: string + source: ws + total: true + - name: countPO + label: reports.ws.countPO + type: string + source: ws + total: true + - name: countoffline + label: reports.ws.countoffline + type: string + source: ws + total: true + searchParams: + - name: connectionType + label: connectionType + type: singlevaluelist + pattern: 'list://WS%:Water,SW%:Sewerage' + source: pt + isMandatory: true + searchClause: AND pd.businessservice like $connectionType + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: false + searchClause: AND pd.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: false + searchClause: AND pd.receiptdate <= $toDate + query: | + -- Use CTE to force query plan, compute & use CTE later + SELECT + taxheadcode, + sum(payment.totalamountpaid) as totalamountpaid, + count(payment.totalamountpaid) as totalassessments, + sum(case when payment.paymentmode='ONLINE' then payment.totalamountpaid else 0 end) as "totalonline", + sum(case when payment.paymentmode='ONLINE' then 1 else 0 end) as "countonline", + sum(case when payment.paymentmode='CASH' then payment.totalamountpaid else 0 end) as totalcash, + sum(case when payment.paymentmode='CASH' then 1 else 0 end) as countcash, + sum(case when payment.paymentmode='CHEQUE' then payment.totalamountpaid else 0 end) as totalcheque, + sum(case when payment.paymentmode='CHEQUE' then 1 else 0 end) as countcheque, + sum(case when payment.paymentmode='DD' then payment.totalamountpaid else 0 end) as totalDD, + sum(case when payment.paymentmode='DD' then 1 else 0 end) as countDD, + sum(case when payment.paymentmode='CARD' then payment.totalamountpaid else 0 end) as totalcard, + sum(case when payment.paymentmode='CARD' then 1 else 0 end) as countcard, + sum(case when payment.paymentmode='OFFLINE_RTGS' then payment.totalamountpaid else 0 end) as totalRTGS, + sum(case when payment.paymentmode='OFFLINE_RTGS' then 1 else 0 end) as countRTGS, + sum(case when payment.paymentmode='OFFLINE_NEFT' then payment.totalamountpaid else 0 end) as totalNEFT, + sum(case when payment.paymentmode='OFFLINE_NEFT' then 1 else 0 end) as countNEFT, + sum(case when payment.paymentmode='POTAL_ORDER' then payment.totalamountpaid else 0 end) as "totalPO", + sum(case when payment.paymentmode='POTAL_ORDER' then 1 else 0 end) as "countPO", + sum(case when payment.paymentmode!='ONLINE' then 1 else 0 end) as "countoffline" + FROM egcl_paymentdetail pd + INNER join egcl_payment as payment on pd.paymentid=payment.id + INNER JOIN egcl_billdetial as bd on pd.billid = bd.billid + INNER JOIN egcl_billaccountdetail as bad on bad.billdetailid = bd.id + where payment.paymentstatus != 'CANCELLED' and payment.tenantid=$tenantid + groupby: GROUP BY taxheadcode + + +- reportName: ArrearReport + summary: Arrear Report + version: 1.0.0 + moduleName: rainmaker-ws + additionalConfig: + print: + pdfPageSize: "A1" + sourceColumns: + - name: consumercode + label: reports.ws.consumercode + type: string + source: ws + total: false + - name: totalamount + label: reports.ws.totalamount + type: string + source: ws + total: true + - name: amountpaid + label: reports.ws.amountpaid + type: string + source: ws + total: true + - name: dueamount + label: reports.ws.dueamount + type: string + source: ws + total: true + searchParams: + - name: connectionType + label: connectionType + type: singlevaluelist + pattern: 'list://WS%:Water,SW%:Sewerage' + source: pt + isMandatory: true + searchClause: AND businessservice like $connectionType + query: | + -- Use CTE to force query plan, compute & use CTE later + with demands as + ( + select demandid,sum(taxamount) as amount,sum(collectionamount) as collection,sum(taxamount-collectionamount) as arrear + from egbs_demanddetail_v1 where tenantid=$tenantid + group by demandid + having sum(taxamount-collectionamount)>0 + ) + select consumercode,sum(amount) as totalamount,sum(collection) as amountpaid,sum(arrear) as dueamount + from egbs_demand_v1 d + inner join demands on demands.demandid=d.id and status='ACTIVE' + where tenantid=$tenantid + groupby: group by consumercode + + +- reportName: SearchWaterChargeReport + summary: Search Water Charge Notice Report + version: 1.0.0 + moduleName: rainmaker-ws + additionalConfig: + print: + pdfPageSize: "A1" + sourceColumns: + - name: connectionno + label: reports.ws.connectionno + type: string + source: ws + total: false + - name: oldconnectionno + label: reports.ws.connectionno + type: string + source: ws + total: false + - name: ownername + label: reports.ws.connectionno + type: string + source: ws + total: false + - name: propertyid + label: reports.ws.propertyid + type: string + source: ws + total: false + - name: connectiontype + label: reports.ws.propertyid + type: string + source: ws + total: false + - name: billnumber + label: reports.ws.billno + type: string + source: ws + total: false + - name: fromdate + label: reports.ws.fromdate + type: string + source: ws + total: false + - name: todate + label: reports.ws.todate + type: string + source: ws + total: false + searchParams: + - name: fromDate + label: reports.ws.fromBillDate + type: epoch + source: ws + isMandatory: false + searchClause: AND bill.billdate >= $fromDate + - name: toDate + label: reports.ws.toBillDate + type: epoch + source: ws + isMandatory: false + searchClause: AND bill.billdate <= $toDate + - name: mobilenumber + label: reports.ws.mobilenumber + type: string + source: ws + isMandatory: false + searchClause: AND owners.mobilenumber=$mobilenumber + - name: connectionNumber + label: reports.ws.connectionNumber + type: string + source: ws + isMandatory: false + searchClause: AND connectionno=$connectionNumber + - name: oldConnectionNumber + label: reports.ws.oldConnectionNumber + type: string + source: ws + isMandatory: false + searchClause: AND oldconnectionno=$oldConnectionNumber + query: | + -- Use CTE to force query plan, compute & use CTE later + with owners as + ( + select + split_part(string_agg(name,','),',',1) as ownername, + split_part(string_agg(mobilenumber,','),',',1) as mobilenumber, + pt.propertyid as propertyid + from eg_user usr + inner join eg_pt_owner on eg_pt_owner.userid=usr.uuid + inner join eg_pt_property pt on eg_pt_owner.propertyid=pt.id and pt.status='ACTIVE' + where pt.tenantid=$tenantid + group by pt.propertyid + ) + select + connectionno, + oldconnectionno, + pt.propertyid, + ownername, + connectiontype, + bill.billnumber, + to_char((To_timestamp(bill.billdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') as billdate, + to_char((To_timestamp(bd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') fromperiod, + to_char((To_timestamp(bd.toperiod/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') toperiod, + bill.totalamount, + bill.businessservice + from eg_ws_connection wsconnection + inner join eg_pt_property pt on pt.id=wsconnection.property_id and pt.status='ACTIVE' + inner join eg_ws_service on eg_ws_service.connection_id=wsconnection.id + inner join egcl_bill bill on bill.consumercode=wsconnection.connectionno + inner join egcl_billdetial bd on bill.id=bd.billid + inner join owners on owners.propertyid=pt.propertyid + where wsconnection.tenantid=$tenantid and wsconnection.status='Active' and bill.businessservice like 'WS%' + orderby: order by bill.billdate desc + + +- reportName: SearchSewerageChargeReport + summary: Search Sewerage Charge Notice Report + version: 1.0.0 + moduleName: rainmaker-ws + additionalConfig: + print: + pdfPageSize: "A1" + sourceColumns: + - name: connectionno + label: reports.ws.connectionno + type: string + source: ws + total: false + - name: oldconnectionno + label: reports.ws.connectionno + type: string + source: ws + total: false + - name: ownername + label: reports.ws.connectionno + type: string + source: ws + total: false + - name: propertyid + label: reports.ws.propertyid + type: string + source: ws + total: false + - name: billnumber + label: reports.ws.billno + type: string + source: ws + total: false + - name: fromdate + label: reports.ws.fromdate + type: string + source: ws + total: false + - name: todate + label: reports.ws.todate + type: string + source: ws + total: false + searchParams: + - name: fromDate + label: reports.ws.fromBillDate + type: epoch + source: ws + isMandatory: false + searchClause: AND bill.billdate >= $fromDate + - name: toDate + label: reports.ws.toBillDate + type: epoch + source: ws + isMandatory: false + searchClause: AND bill.billdate <= $toDate + - name: mobilenumber + label: reports.ws.mobilenumber + type: string + source: ws + isMandatory: false + searchClause: AND owners.mobilenumber=$mobilenumber + - name: connectionNumber + label: reports.ws.connectionNumber + type: string + source: ws + isMandatory: false + searchClause: AND connectionno=$connectionNumber + - name: oldConnectionNumber + label: reports.ws.oldConnectionNumber + type: string + source: ws + isMandatory: false + searchClause: AND oldconnectionno=$oldConnectionNumber + query: | + -- Use CTE to force query plan, compute & use CTE later + with owners as + ( + select + split_part(string_agg(name,','),',',1) as ownername, + pt.propertyid as propertyid + from eg_user usr + inner join eg_pt_owner on eg_pt_owner.userid=usr.uuid + inner join eg_pt_property pt on eg_pt_owner.propertyid=pt.id and pt.status='ACTIVE' + where pt.tenantid=$tenantid + group by pt.propertyid + ) + select + connectionno, + oldconnectionno, + pt.propertyid, + ownername, + bill.billnumber, + to_char((To_timestamp(bill.billdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') as billdate, + to_char((To_timestamp(bd.fromperiod/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') fromperiod, + to_char((To_timestamp(bd.toperiod/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') toperiod, + bill.totalamount, + bill.businessservice + from eg_sw_connection swconnection + inner join eg_pt_property pt on pt.id=swconnection.property_id and pt.status='ACTIVE' + inner join egcl_bill bill on bill.consumercode=swconnection.connectionno + inner join egcl_billdetial bd on bill.id=bd.billid + inner join owners on owners.propertyid=pt.propertyid + where swconnection.tenantid=$tenantid and swconnection.status='Active' and bill.businessservice like 'SW%' + orderby: order by bill.billdate desc + +- reportName: estimation_charge + summary: estimation charge + version: 1.0.0 + moduleName: rainmaker-ws + additionalConfig: + print: + pdfPageSize: "A1" + sourceColumns: +- name: receiptnumber + label: reports.ws.receiptnumber + type: string + source: ws + total: false +- name: consumercode + label: reports.ws.consumercode + type: string + source: ws + total: false +- name: Advance + label: reports.ws.Advance + type: string + source: ws + total: false +- name: receiptdate + label: reports.ws.receiptdate + type: string + source: ws + total: false +- name: instrumenttype + label: reports.ws.instrumenttype + type: string + source: ws + total: false +- name: Water_Charge + label: reports.ws.Water_Charge + type: string + source: ws + total: true +- name: Composition_Fee + label: reports.ws.Composition_Fee + type: string + source: ws + total: true +- name: Connection_Fee + label: reports.ws.Connection_Fee + type: string + source: ws + total: true +- name: Fee_Round_off + label: reports.ws.Fee_Round_off + type: string + source: ws + total: true +- name: Other_Fee + label: reports.ws.Other_Fee + type: string + source: ws + total: true +- name: Road_Cutting_Charge + label: reports.ws.Road_Cutting_Charge + type: string + source: ws + total: true +- name: water_round_off + label: reports.ws.water_round_off + type: string + source: ws + total: true +- name: secuirty_dep + label: reports.ws.secuirty_dep + type: string + source: ws + total: true +- name: supervision_charge + label: reports.ws.supervision_charge + type: string + source: ws + total: true +- name: tax_adjustment + label: reports.ws.tax_adjustment + type: string + source: ws + total: false +- name: WS_time_interest + label: reports.ws.WS_time_interest + type: string + source: ws + total: false +- name: Ws_time_penalty + label: reports.ws.Ws_time_penalty + type: string + source: ws + total: false +- name: User_Charge + label: reports.ws.User_Charge + type: string + source: ws + total: false +- name: paidby + label: reports.ws.paidby + type: string + source: ws + total: false +- name: amount + label: reports.ws.amount + type: string + source: ws + total: true +- name: transactionnumber + label: reports.ws.transactionnumber + type: string + source: ws + total: false +- name: financialyear + label: reports.ws.financialyear + type: string + source: ws + total: false +- name: g8receiptno + label: reports.ws.g8receiptno + type: string + source: ws + total: false +- name: pendingamount + label: reports.ws.pendingamount + type: string + source: ws + total: false +- name: tenantid + label: reports.ws.tenantid + type: string + source: ws + total: false + searchParams: + - name: fromDate + label: reports.pt.fromDate + type: epoch + source: pt + isMandatory: true + searchClause: AND pd.receiptdate >= $fromDate + - name: toDate + label: reports.pt.toDate + type: epoch + source: pt + isMandatory: true + searchClause: AND pd.receiptdate <= $toDate + - name: serviceType + label: serviceType + type: singlevaluelist + pattern: 'list://WS%:Water,SW%:Sewerage' + source: pt + isMandatory: true + searchClause: AND pd.businessservice like $serviceType + - name: receiptNumber + label: receiptNumber + type: string + source: pt + isMandatory: false + searchClause: AND pd.receiptnumber like $receiptNumber + - name: paymentStatus + label: paymentStatus + type: singlevaluelist + pattern: 'list://NEW:NEW,DEPOSITED:DEPOSITED' + source: pt + isMandatory: false + searchClause: AND payment.paymentstatus like $paymentStatus + - name: paymentMode + label: paymentMode + type: singlevaluelist + pattern: 'list://CASH:CASH,CHEQUE:CHEQUE,DD:DD,ONLINE:ONLINE,CARD:CARD,OFFLINE_NEFT:OFFLINE NEFT' + source: pt + isMandatory: false + searchClause: AND payment.paymentmode like $paymentMode + query: | + -- Use CTE to force query plan, compute & use CTE later + WITH receipt_breakup AS ( + SELECT + pd.id as pdid, + SUM(CASE WHEN taxheadcode LIKE 'WS_ADVANCE_CARRYFORWARD' THEN adjustedamount ELSE 0 END) as Advance, + SUM(CASE WHEN taxheadcode LIKE 'WS_CHARGE' THEN adjustedamount ELSE 0 END) as Water_Charge, + SUM(CASE WHEN taxheadcode LIKE 'WS_COMPOSITION_FEE' THEN adjustedamount ELSE 0 END) as Composition_Fee, + SUM(CASE WHEN taxheadcode LIKE 'WS_CONNECTION_FEE' THEN adjustedamount ELSE 0 END) as Connection_Fee, + SUM(CASE WHEN taxheadcode LIKE 'WS_FEE_ROUND_OFF' THEN adjustedamount ELSE 0 END) as Fee_Round_off , + SUM(CASE WHEN taxheadcode LIKE 'WS_OTHER_FEE' THEN adjustedamount ELSE 0 END) as Other_Fee, + SUM(CASE WHEN taxheadcode LIKE 'WS_ROAD_CUTTING_CHARGE' THEN adjustedamount ELSE 0 END) as Road_Cutting_Charge, + SUM(CASE WHEN taxheadcode LIKE 'WS_Round_Off' THEN adjustedamount ELSE 0 END) as water_round_off, + SUM(CASE WHEN taxheadcode LIKE 'WS_SECURITY_DEPOSIT' THEN adjustedamount ELSE 0 END) as secuirty_dep, + SUM(CASE WHEN taxheadcode LIKE 'WS_SUPERVISION_CHARGE' THEN adjustedamount ELSE 0 END) as supervision_charge, + SUM(CASE WHEN taxheadcode LIKE 'WS_TAX_ADJUSTMENT' THEN adjustedamount ELSE 0 END) as tax_adjustment, + SUM(CASE WHEN taxheadcode LIKE 'WS_TIME_INTEREST' THEN adjustedamount ELSE 0 END) as WS_time_interest, + SUM(CASE WHEN taxheadcode LIKE 'WS_TIME_PENALTY' THEN adjustedamount ELSE 0 END) as Ws_time_penalty, + SUM(CASE WHEN taxheadcode LIKE 'WS_USER_CHARGE' THEN adjustedamount ELSE 0 END) as User_Charge + + FROM egcl_billaccountdetail as bad + INNER JOIN egcl_billdetial as bd on bd.id = bad.billdetailid + INNER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid + INNER JOIN egcl_payment as payment on pd.paymentid=payment.id + WHERE payment.tenantid = $tenantid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='WS.ONE_TIME_FEE' + -- AND pd.receiptdate >= $fromDate AND pd.receiptdate <= $toDate + GROUP BY pdid + ) + + SELECT + -- pd.id, + pt.applicationno as consumercode, + to_char((To_timestamp(pd.receiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS receiptdate, + --payment.ifsccode AS bankname, + --concat(bank_branches.bank_name,' ',bank_branches.branch) as bankname, + receiptnumber, + payment.totalamountpaid as amount, + payment.paymentmode as instrumenttype, + payment.transactionnumber, + concat(to_char((To_timestamp(get_fromperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YYYY'),'-', to_char((To_timestamp(get_toperiod(pd.billid)/1000) at time Zone 'Asia/Kolkata'),'YY')) as financialyear, + to_char((To_timestamp(payment.instrumentdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS transactiondate, + payment.totaldue - payment.totalamountpaid AS pendingamount, + --Initcap(case when pt.usagecategory like '%.%' then split_part(pt.usagecategory,'.',2) else pt.usagecategory end) as usagetype, + (case when eg_user.name is null then '30048|21Fj+c3k2ldB0X3AzIh7atXB' else eg_user.name end) as collectorname, + receipt_breakup.*, + to_char((To_timestamp(pd.manualreceiptdate/1000) at time Zone 'Asia/Kolkata'),'DD-MM-YYYY') AS g8issuedate, + manualreceiptnumber as g8receiptno + FROM egcl_paymentdetail pd Left outer join eg_user on eg_user.id = pd.createdby::INTEGER, egcl_payment payment left outer join bank_branches on bank_branches.ifsc=payment.ifsccode, + + (select * from (select *,(row_number() over(partition by applicationno order by lastmodifiedtime desc)) as rw from eg_ws_connection where tenantid=$tenantid) pts where rw=1) as pt, + + receipt_breakup, egcl_bill bill + + where pd.paymentid=payment.id and bill.id=pd.billid and payment.paymentstatus != 'CANCELLED' and pd.businessservice='WS.ONE_TIME_FEE' and payment.tenantid=$tenantid + + and pt.applicationno = bill.consumercode and receipt_breakup.pdid=pd.id diff --git a/configs/reports/report.config b/configs/reports/report.config new file mode 100644 index 00000000..d61eda0e --- /dev/null +++ b/configs/reports/report.config @@ -0,0 +1,7 @@ +rainmaker-pgr=file:///work-dir/punjab-rainmaker-customization/configs/reports/configs/pgr-reports.yml +rainmaker-pt=file:///work-dir/punjab-rainmaker-customization/configs/reports/configs/pt-reports.yml +rainmaker-tl=file:///work-dir/punjab-rainmaker-customization/configs/reports/configs/tl-reports.yml +rainmaker-uc=file:///work-dir/punjab-rainmaker-customization/configs/reports/configs/uc-reports.yml +rainmaker-noc=file:///work-dir/punjab-rainmaker-customization/configs/reports/configs/rainmaker-noc-reports.yml +rainmaker-ws=file:///work-dir/punjab-rainmaker-customization/configs/reports/configs/ws-reports.yml +rainmaker-hrms=file:///work-dir/punjab-rainmaker-customization/configs/reports/configs/hrms-reports.yml diff --git a/configs/upload-templates/collection_receipt_workflow_template.xls b/configs/upload-templates/collection_receipt_workflow_template.xls new file mode 100644 index 0000000000000000000000000000000000000000..43d4b9284ccf3323ebc9f705ca7499df284c4242 GIT binary patch literal 9728 zcmeHtg;yQf^7X|bxCM824GzKG9fG^NYjAgWm*DP%AVGsea1X(QyL~q^^M09O^8E$x z^aO1V)UG-$F9imU27m-W0{{RbfB?JyxD5yZ01g2FpaP&l-wD~;I2qeG z=_hEQs zxAOUxQdG{E1{`hyigehLt7;t`3d}63q}3UYcq;UX*HKhxweqbEcLWmq!&7Lv z+O=j_TtWo=<`p2N*31NOEWt2HwM=Mdgr@Hy8Aw*zhFh3l^)9-3=^cn+wq&DOcLT6~LvJx_ByKV%&&stltW)-*npy@q*m!!-7~w52UP$M759CCp}u zJ$3I4gmw%@GG76#wjCi~;5t@h;;OhV;lTai z4uu@d=C2}gZ_AeuRJbQiy1IYh_rj06$Bo{#JNdsqLfi%^1Ft&1J zp#S;*KYIQbbMkMGUJ)-N*UJbOd@TMDGI%|^5{o1#EleHoO1&y1e$+a>#<<8z2ikjRZS=7E_qYv3-_HyBFfs^g%}h(}gOpK`WxmTWl32GfwjwgKP&bVs~95t54^` z8C|H4UUagVgNnqgC^yXGVgqEkm%f?}tfwPc?tSbqz2$=^L;ev2rK`Y<^>32o%C@6z z00~kJ2>>7hBjaYp;A-n&X<%z>`7@7IsJyeyU_|rDX?T9`RxY`%|TkX1b?JW}mo z{=wbR1fqD7Qq#Br2|Z#I>T7CALbY!HJ0f-|A~r~XvW(St$=Nt-cJndG#mvxj6+I0Y z4Mhm0)}{NJH0pp|jy7R`gR%MoIeuq%@_VcQRuKCj2zh z*PoJ3o0eEB_~6Z zxIoO>DZIbE6=mzM7Odfp?!J%JdROOJ<>;nI_J~+_hN%9;f+?CK+Dlj|OM?u49ALKU zhr>j%h0ZW<&7d9d^%7BYUmCqwVM3ISxk~+Y21#l-oo6HAlE>m1XazV4O8V6|!W}7d zBP)?5!Ik&1P;MMp9|=(8x?p<5Uwt+bLC*-2^h3Dz@m6)jyQ0O&wc84RG;cMstKrvO zr)gk~+O2CXq-NLD==;udcPSWfp?>n5E0}IEXLVA!)48`q0%v+(;EvD@@ALL;SE_s?CfWSRn<)#KIS?Q^BkjV~ozs7LF5m!@w1Eq~Y89yFjJG zO85zS4v$QATi$AgKC`Z$EVhCJ7F@ab7wSYRB85=t}GW;eSd!O=Pj$$^{Fi6lGoK+M$U!O*?yRwWyv3t5rSr-^yo>P$-(!3y=E^d<4;I=?K% zjC5}Gbh6sYxDIFmXAyN=M2S(A0Pf%~nZ0=OUeg=8e+xTEqqK$(;lB3wX6a-ed(;fU=Ao<`v4)Mvj`NV%v?J+Bt!T@2} zW6eqS6{&*8;GH&qG@YDC#B5b~0_c{`FOg10WJh$ylG&2tTp4}TCVy8>JkW(%M2od5 z3pK65MNnwv!P1hSh%lc?ZpA0J190m}u+Li$^i~-hWFBB=&0vxy-&)T(mb5wQ#^wCj zl9GfbD~J#t*SsTm0EO5QAjZVF2snw<;%JOh(oo@t+dLen7u!UQ$~j`gysH-o zqP=Z%(7m`SP##GNXfRI{%v+_>IORxCeJ?`fjAj;8^&ZSeq4J>|5@D-dww!vIdcX<| zKE#~I2m>>$(Yftu(ptW{3^6bO#*fh^2W%^Ja%8frH+L8ba?263Gjb~N=`GO=8nON| zMWI4`4M(1DvSgd05RU2c>CpTx9jK?!Xw&vnUGBmf7etcBZqz_9^lolY?~?Q;)552) zP}9B;C2;Sk)NJB;%f3UjxC>~|GS9tj(E=&b{-Uu7Iv=qd90=b zr;(I1RCcLZb>$)EdE3CaJzQ)tM%T8>;tL-QGbpyDYE?UKsohR?TIxoZdx-h*^Hr&4 zn>e;tR(SNwxXp_ky-5LZX};~F+Q`e2cU>Vvw!cMqHwMy2SttOYpYUh7`v=0E%#5v# z8UFbH1KfuiqY*glXk8e0Z{ZwWAKq-mkgcwdTP3WJ8f7KoHZ~n9sIoA}ci^Ccl5t)t zQWh4a2-@-{PVs}mcV5K6kT&cQOj3-_lT>b#W>`sTy1++>J$06pTxa`uoI9OPb*6fV zrNZ{aC+mKcKjY1eoKGd4PWH9rpk(!u6HkmpHiogeg{6IvTFUWpK(-!&9+(Ha6}HMt zCXnDj7N6fYsF3G)0P)m?ZHxI{pUop5DwvB!}=x zlD?iFI^;H(;soI%Dc97>YRU3yw|eUYLxXk|f8Y@ZapP}#PF+)?p!k^Gl0EKV zG&8)OR3#VQhSU(U$$e&SmDcl8pL9Ii>$aF8gbvX3EYbxl)f%`wc+~7_nkoS?WA#re zZkp#hNV195hnK&b&1+XXRvCG{I-#pw--=fj6Ev5r>{}B|0N1uI0$VLW#i!L9l4Vk2 zdN7xZru(jUPU=WUzWKsZURc7RC73>_(ZaQL5#6X~HyU*nE81yo+*x))hHPHXr<1+&kS<=|i{0B^-MZFBYAG8iG9{%S zvoX5QkB=Cux?N8v`={)CGZd#ieO(W?BPm_ar(Bmco6G17AHC1c_7X7Gyf1g;V(=E1 zaPd-4h{9@5sx}Od$s_dr5bjSw-e&bN3iieGBk#JD{umhq)p3< zxDZui{2e|VC9IgEdrGORRwxp$yj>`CdybcRQ@SSX;s;W7KN{7+CAL7+!L_`yCOas(og zIM)CP46m34Zed;_T=_bta>4_AfcgACQwH=XZodg(8{xuQCi#$#9 zjiX^K++61$k`~)Bm7F5`F+H349MvcESw?nRC)J4clJE{CD`*DCR4z01K#b$dEWc7Y zq(IXcU!Nvg*O=Pc`@6lS3`1Tkyu}t?k<{kc&Q$iuibjxGe*?Nr@GWARY7SzTF}}S^ z;vfoI!!*U?^$#y?I~pI``T;%NRov~$h=%d1NPi?j|ezhUy@v)ydDj@oS& zqQoB~5TDxxUA@6OCL^I3OP3VdC|WH*#)xmy-=xwmCz8-@*^|GeU|x)wfYTH*Uip+6 zE`6!&#zLNJSQz3=gPt={c`tkJ785lsYuZ}Tmi_@2BL3EmN-IhzMY4ETllOSFa^}Ei zSJ_n~1(I@M8dG1|1V_OcQ$ZI&5KYH4P-h`cebPyNQhq-rPgB%>`xT=#I=b8T)w)RM zc8I{DK(GmJ;*KGDNkdvkWYw#&G*OQPmJewl@&*hngfUJ^3vKr97S85nog#&FB#}<_ zQH)cJ{umpy+@s0&8vSi)Av4T!tp=?)4lMgoh{%>A#1t)lo7mtt2z=F!GgJT(BgvZEjrkld&-BLWC2!v=U^8A(`S*Jrn!rbm@GP;8`be z^Q~#r-Xrm8Zl&|n5Mb@&!0qWIh>Gb1 zu@%pn-}Gdmj01#{X5A$_HfFpdz`7afa=tLjXmrT-hS%3CEH$vuLc__;u-#ZYi*oRuR#Chi z%=)6~%ujnDnRRnFyxcKs0_Ez*<6-B^QKGmjFKC-WLU}iZGnmMx7qOh65e2>0!AU{) z>_cS*wIVrBmx!(3g`^yyn1|d{9^`_lI`UYfweL)gxULtcpoK7fa0jBLKOy2`UOg~J z|6^;LZZrrvB0^gC3r6F{-R4KF1uy$!WWucb#^GEIYZr?klSW=j@J`u+iNmj4K{}Q1 zj^RC4Y9?`cPC7~85f*1{@3bi5_cWoMqwbv) z2}M>as%lv@x|#My{=!%nT^9bTQau>)%Vzn*W%*27fS&8Seq2y!W0nr*Dh(uq5xRsK zo!ww6jt`A-Gu>aULapHnk}gvU3GFdu!wR)F@b!sC-h#x<@EoS+&eY{aSGTVJn9$cJ z9r=7DYA!SfTG})jm|PlFOfFi<3AtAxw<)fJZS8zS4@lW<`%dO5=_>m@Fxixp-v>)E zF_zIM(bG~Vl$9v>sFi_WY+94XRN;f`urUW@zK;LrfGJ(&jhNh?0JZGJYBM=IAKVLpeW2dm&t}Gb{OW1AOB9|k2{8o`NZa^f9UZUnn)$kz z2fe~2*KZ@E@|kPp)3GKuR912cdI?Tt=}8@)EgY?Qp=)O?zZG$R zG0;p!fsb-558W|XAb4*l1P<^pqRUO=p}v&yj$qwcaJ^;b%9B&zpADaNqF8?1W9;3z z^i(~~3KU~=^Zw>}#1#scGk5GYTks*KTl0FXr~W;|B3AZ>E&B-j`K$~wRJ|Q1EO`no z%=aM&bkc-_Z3~qzy&N4+eArsgj7@Evun^JYurzutX+#Tt4=W4F8MUP z()dKQy>!21l(??xmwhCRi{3 zs=elLI=r+SXs*b&s%=&h-knE8T1p#%l}Rj*7ularJ@=vmZ$25^Lj z%$(#C1amsglo6>NWT~CQbNIJBCz@q+YTaETrQqC+`IXz zC)iSL%DeL%omMAMlBDbYHbC6g%u?OJ89`uxNd64a&mP5JW#^wwi(kd(A1#Z(nC|c% zMl_LYuqPom&xEf*a6(G##4Rd2Uk_Et*k4A2q2r0wpQitq4kjxr88#5Bjt*NJq(J(J+3VA{P#X>N zA(rp^f<%}*sT)~VlRPk zaI7O5hYtS{9zm@>&hj#Yb+F>7sm!Yjie-$&43wD;EpckFyPbLJl)dI*Y&BS-1&69V z<>Y&GDZ`dCRT1a(?%;s%BEE;wiC^1Zzieh zY>h6Y*J@~;wkY9Q&|4oBQtu`Ophw_9rvnm1^)s)}DZ@6nbk?n%K;86{;anrIg-i?c zAs2@jC60`co}!;Vu2`V&?gjI<-tYAQiyopbGwh?bZ^{=Dy!YSs7Y2&zzn&s~tvJP} zcGY@SewI|LcFR>+awc-}1atp|-en$4*>taNt<+{cf1I)x|5^zS`Uzvtjv*U)iF|-h z^xO4qAeWqTUFI9C{P&cEuR=k8GknSaME6@FJi(Tk3IJhX3`~*8z?Pknt)aYwt(_x- zp{;}QUt6*N>(l{57a6ZB*Gq`@c}?a40sffI*f%o1NowYBh>U#9%!|aXISySCFn75m zwN&YnhREkIzA?bbZWK{KT>z#|L6b!iUq}f$N<(zXCU$&a>=i@2llHozg7sS|NXYBY zM>75J+etxc@33lg{3AdmxQAt;T~=|zYqz-NzmRq31+;vqFyO;IdX3Y6Z3XKVU+k*x zXX@`B{7%mbl9-DKf*|($QZgRD9UK|u#HxNg(!;@}Uef)!U`b@AR5Hj=v}FRU;_40ix^Q8A@LQ1}O|UgA4`$ApIS8`gV5zgB=iWe;t|e0=7Vf z8gvYHM*z2i!?_|4=T~7Mu69wQ4-(&GDpPEjS4SFJ5qCHj(=<7=;ISX|&C~5pSYid2 zOZOsn^0R!{c0L*eIF2R8Rg&BMinb3rL_AF6DHA_g^!rUwT`$E9TvQ{6_Yh*>6~a=9 zs*3s6c`Pk@oHbK@%UGLi$HrFJrWWUhD2w}4|LedDrTD#JL-dPlJ83DISs5zZ+vRjlQJX1_nP!{>k10!lQNqvETcl+KpphEfs?I4 z?&E){X^67NYTP%U4Jb;5b@FwyR?EM!MuN_da zqWAL5L&1msR@;z#>p4{Qoy>Uix|2xBuk{9`65c;$L0- zmtJ1>Mt^xZM)+-~^reHB)!i=#Hn0D1@T=B)Y5Gzl|1vei`qT8KVt(o2rHK6HArSjz z41OyqUpjoL$$mKu#`(kH3q|%@h4#|vKQsIdIZQ7*8ng=6NyKNFR&@>_0AV{HZlAAPkvm25P z)(3I>Cn6TAeGnudfjlUJKPdWO!Q?^kp+!*(QD0K=r6{-+r4*X1-*@g^yDq!UMuX6j zvwZV&=FFU#GiT<^-LJo@nw$J^!)3{#N5v}(=~5}l;u|QJX6gYE56a{%q|@mP8^sm6 zjVv(l&Xs%U!zTIx?)fUf1jsLQ^V?`yD^o4f0$mcvFCmt+N(}j^JdfQjp4P)-vQ-t+ zGyA?MMt(7w75z6Yu$Zmbo^5~L-@M1YK)&03krCfNEeZunwpJ z)&q9|cLVnT8-R_#y}%}5Gr&1mZqD-kC_eyf1%fWW&dqPGZl$!`7AQ5bizR;fY|RB; z`Fi(XhDUthn^C{`3A{rxLf>ePMEk7&i}vdrA_jeP8cwU|Ij ziPeORFOtjNkk0*#rnQ<@AT{Ju?el|jcEc~fgnatNv+g1A8~bqo4M{|zlG6&gm56!a{1c}@EZ#7cNE~4=H>h02|6D>#FVD3a~_<;q@UDBU^Mm_#CPR%uRMBX` z{^r4_f6&*m(J199-us{9m1xRw198HfHbO{4viT|_10scqh+!fUnAZ?2ZpeT}5=IjY z+8pn<@z6XF?~6oj_4?nuE3Bp<#Q> zI%q#ta6B3rtqtyeD7ddiwlm}{BG(DySi#Pds^FBSK}@Dm>B`=1S>-yE zPwt#Ov2!-HcY9WOQfl%2){o`!cS0JB1|!oylN-{5vCHHIjrJlhRWZ_w*0KM_%jHg8 zJbVQ>?*`|q!Sry~wM<8WY^9J#@4=q^&6`&*a9#=`PR+o(fdWp=gBp7|H7{y>oj5fg zYBW1*l&RD&7N=&Q2LEx}Jg70GIc;9l=nPKHhZ9gb%)^e0Cxu?@%0qdnfa*4Yzclxd0uXh{?y!)Cd_1ixBp1Wb9fp1W@j{xj> z44{Xc0_YoO0q(>Ez>RntpeK9`(B9JkcmD!FOV0v)-~J5njhh0f;|9R-ugp7dR_Y}2 z{kmLbj^7A`faK&CtEivl424jb55C^><163sc9o0YhC;ugjG|H@`*B>)rHhv)c5Mut zdjs}sxc*)Xc>WyTA@F$5b3h^hurJqKh>zwKxI>|5HGLH2RRkQ2Z;M@jEo7VMEFizMKtrF-!PbAEmNuWJf3f~;(3?>0%abhC{@MS(EXNG~ Hi~hd=G7&-w literal 0 HcmV?d00001 diff --git a/configs/upload-templates/property-residential.xlsx b/configs/upload-templates/property-residential.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..8bbecf5842d7fdfe653c594801a790906aaea20b GIT binary patch literal 40176 zcmeFYWk6NYwl+*7DWaqz2&i-j2ue31NVlYP3P^VdNJt~0fQZsvA}ydu2!eDeDXnz# z&9xWyIp?1Ho%_Cj?&}Zt-gD16=IHT^vDorAQPIvIVIZAALPENLq;-gG`WP7r=?x|l z(rKgY-W^uN%q)J0Wp-V+V0sH^ozyHM=Xpil<)yRhXc15aM zG?r1b1kay9^Q}+#X_WK^RR1?x&z|2n<5pP1Z;fFpqLuML`mR~*$)kgkg`sCTMph-< zL8jG=O;jr(xVPuZY)eF{`NlU`!~)VEtM>8IHDSx&4hs*L=*&TiFDh#kQ5O5GD9yx} zNi-wiJsF)9UPi6+CIL75aSmCFew`P~&6N}9HZngDOn$(V>3yx}ST(i8g_RVt=;~2m zt8#+Km+Lt-Mr=pch&f4vLCEK%9>FiJDTddyF4^YF)JKn=*9qfo_er@Wi#7BpB+>6Z zyO=yVBT}~2`Lxfso3IFMTZ=8*|OZHWXOzlXw!+fiSA&NX_yw%wKEd4Cv$x;-0qYtU_ShK^fJTdnoQX0pK` zUa!O8IVACsi^4BvSCpa+Hw}@^jF79W&)v9}GAk|Kb$Wt@d*Pg(QdO9r){4?Pvdgj< z4oEdhwAn?bdBUB{$--24+{Z_*o z_(lfAEDi{2T{|O7dsY_c|Nj@v|BEB|7twR0I;BzB2?AGqR|sato>-xuGAk!J<$5~n zB-^DDuL0Rhv=l=r(awE$r_icqRt@%APEXs>Z-`1|%e!}X&7QM96+JhokWE|2`b0JD+3kl#jY7uh z4{eqD`$_9KQZ?9m$IOG=sxTaQ0*ZH>%1f8@wr{nE+)0tkt)CXVptQ(i5r5e|nnxfc zROJ)~-%{~TRa@tZ*xLjqBN3WNwF_}E2Ir;ob+4)Q~B`X{zPBwNH1~xVpQ0e;~GRUC*fxZ8` z|24(PT7di?u;O=s`D|~3cInm0`SmLp_n(w6W5$c^P(7evvavWkkijs+Zm#lQH;C}p z<*$yb9;Fx#@ObuAnh{xn07W!*K3DO+cW2|mC=FY&qEYb&Z1i=h!kgAMBE(dsiBVzRH8kJtD(Jb*;y6PsV%Dgi$ZB z*8a&+f1iua^X;^r0^-=3F5e?lC8YQxj%A|DyRO?Wk6i z-Z94cgK-rrA!{NB$83A(CCZ`f(%LJ%cj;fW)YwKeqs3k$siJ>%R9bx6kSj6hag1Ui z{qy`$?T&;n~7FBSpnCP}_!@`We>W7MY6*2y0i=@_Uj37ML zN&&~zmh3OiHK!FLWwFdEter&yrqS;;XGMjL%%Ams?GZt;^9tW_RA740u^oNJgY_6sF78lC#0~X_@UwpI3*jFZc6N-LP}M-nNqD8Q&-hfb ztLL`pC3|~@Amf|#oCI59J4Y9@8g+;XX^WNzblvhvm3=>(U-h~C^iHvv^#hjN8itG$ zy-g8Tn27sn2{1-gU08NHvU(U%P9VKRj^HN#%|a z5J;CfjUVjv$b#TwChtt4{6e*owW%ZP%UVvKY`!GtOFK{BQDQcHe2%BwJNU-SYVB+c zrIKH&Z$rPZ1pq+=F6Q(2+~BWXoxAeqKeU@r2JQsc4avq(|>Q%HDo^_CkoX@D_H=hnp|i zao17yhrZl8VJa;k?)CPW3Tfy>i(`+ADQ0BS01kK1l3s#wgTa|yd%>N}k+g6o^OA?}$wxb~-d7ef>BK;YW_NGQg_v~2_FPu>FPgmEnnYd2isXMnHNVjs4R_Nsk z^`&yAkdJ-@t=DF+p`j{7$IB|39vvhUp+3AUOZ4R?&iT&mq;K3Le20g`l5ZY7*Jz1; zU{*2oq9MxLrqNK4{pgz~KduZ-+kxSNB%l82wI@b1TXVYOZ%mSF4Kd%?p)%19Ht|jE z*cxhR+|?^eDcg>`NHzG4bJKo1aXD`>{)!i4%tVXbkX3*10UP`C`wBx%7~@N?z4^a= z;xfL$5|+-iYG0p1@%oNq5izE0d$Z^6s;m16XLq#INo?3_PWm4?C-h1OF7s`0pV~e! zb~^ZEpyi$wAKpkcO*THw%w}>URV5{`uM6d7&$p{+C)pMyS{+ZX1@f;x_A!%vOD%L1 zu=qGu;4JA1-YhGfy5(i#voeNE2FR|~+h13j&TE|Uxrmv+7|uDLD!gD`w7+9;@aW}J z6?4n|Q2x~~b$62}y|L^4nTK}@6!M8N^Mv1;Iay{n5#{gfaN}$Ro>SIS@i#8@@G{Uq zB0=NPLJ_T};UPFAw+#|o5b-|X-uZm{@qn2_exF}I)9g2N99P?32c(3q=946&Iym?R z3>vGqPkCP!+{&1YNx{=g#ACm{+oI*>?@9`X<)AzACn(!q zTWgWL=X{!nGn?4;;eJSQVL@A5qJbPqKIc;u3!h1~mBOw?SWJumR+zIIyWM^3CEl`#1b+1Y@BcKtQ3t2HdPBBu$5_`tW%vxI$U&D>>i z269s~Gfgq}no?UdNzR(&^7f)#@*}2<56@ zEfYR3s}~)iA+9zEU)Gf^X=pn#XYj^bFX$GYzCvG}%yY^-f!HJVwClPVYc-9+XDTtt z(`D+HmfA$sd7MnYD38s3G39=RsV#}ma&I@HEnS9n$?nd)yymk~U+w9K51*75xD`5~ zJK8nalTxyOimf~$_c&g2=~BD)=cxzhOPggLOpd-%Cv2=RwHq^1+6l(sx_>@njJ4%XHw^Vj6zeCDT9Bzb2iXPhh3{M4#HHsl~@aKFAO);g*wy+>(}BYXO*1G?PC;hsVZi`>w+?)>uG75Rl( zp00w}gV%1@-yZ74_|kWVZQn|z>qgr4VqhPxW5^ZVX!D2jw6dW@{LccuJY?9H4Sh#w z(@)T;;PC1JyN2shBK@es{SxpNXDKlY+betgE^;x!AlI|tXThSU4U2IH90Wzoial@P zCB!-64YR+qxmyzdl-_Lm<^y*+o?W-iij?I>S`O;+({g0qJh3(uOT><3o=un!1^k^G z?VSr=y7SialK8a_TO+eNKAwHVx=n8HaV_Z(q`<#3plrWQG}Iq{0hpHNuM7yoU_>6| z_yK}*Ba3cZy zBaztaO3CN;_V#UBEdCYm3v;IDWC?Z3PpWa(ORE^hg!>cXtLyRK*2zuo${9)ycE~D} zcuL*Sml!8<#)>`j^&JuO_oVjnW$*YNq_5wSr6bmMVqUeuz?GCKXD3{JvtC~w_%Z6p z_^s_d@|84C9H|W%|H81CnrGU6*?ju31Tkw|EGBmZXY%WwNQQ9qv%Bl^N%Xv4*&^bg zKRMyv*6dX-GpG>a_C|9UcRGV{cA|;5m*2}_T}AQS5{EnJn*Y{W=ULVgA`T>^4L{_6 zRyD3b+G>BIWphq4&VQU_;3)ModHm&&+?z_&7tE;2rB%qsR~|JO2rDs%ux0f{tq;60 zIND3j&pyL(ODx#Io1%V=t+W-yu&2_-lXhX{mQkj%3sRNT)2rWNu)xuIn>vXJ>wS z|F9bO*3#WQCHcdI@XheeB`LY{HGCB*dfZD}`Bw|hukhzRtn>0LzV2RFaWwUTM{+#b z#`c~-KDmU zoE}|PYwKpMrM4xT#+m)ue(tMwMuK0KXZbyM-j;N1B*>Q53>>&_*_jOEv>6_Gt*p9N z=vgM;@}fN2w{lI`{Zu>H=~+`dsPjTCIV}2lGV`WM@y9L7s~f^fy(>;vOL`6;Kk5B^ zFki^eQ{6c5USeNMfAX)-UqJr1%Q@d9U_vrC<4HX7VanhzJYr8iAnpU*seP|9In zI*`)vfG_dM=Io+n(q2cDZiDqH*}AWdGfxjzP4*fWNw#G2Aoi zkaInMsiJf*a2+S{R;ofohELwn=!N9vhwKlFdnSk8fAJD9!>3$2>UsaJ#H9u6WR`7H zqNK7U&r||W3o`y(Qv`M(ABpJgI2~NGuXKK--4hWc1}*cW5gtiLPIYKn1c#6G>e}aq zA`b{(Sacs?uH@sduqfYOP~JsfdU)hqP=06ZFyQ>l@h-kMarIT~Cr3}#cyb$W@j9;U zS{{bye50<=A{oscAg|$1*COqF*Be45xm<>ELa~2qVMud*^l0P@$%@_LttRc_y6DwY z^pw%7SoA4Tt7P;k(W~h6x>2h{^t#cjc=Y2@s}%I((W|KRf-~5;%6r;}H`V5sx62jR zF7|B4UJrL!k@ny=u238mpBUVyEQw{%*?g*-H8n3zpqWL`lp@bMR8t4X^1tyYqB_ZzKh>F%?2}#zA8v<{;Ncm5C6iYh!uJiUQQrcN7IK zOe-l0&`jGa)>2L1RIH_*wot6SFs-FnOEc}J=t(vG_O?%~`NjdOc2?D-;F!hO#@BbW z165V)Ra(*AE=qEu7>YX1J>xZBBS{1{UtiYQ{)m&}^4Xr%{qud+ny;}WwVSWGb+-F( z#$7(UvF?AmPsxECSHB!q?$&SBHhr{$H@+?*poJ10!HTSS-DcjbMW_|WX19t&VDLy!rlXlCBBtMLK zpX5q@WePie*yCy;-xv@1YKQdsi02R8`A?Dyy^iplJUXN}EPd3$Lf4xvBo+0_9mwP}$UlSr3^$_q9|eC&}7mOgt+6mQk(l=?fX$g)S{S%vR^4((_kq zJynZS43V%zm&d}GPF|~VdMEmR#dtM>)**IlqXgxGJ!Qa1@APU!t(BZ(O8@fMv)Kzb z=4TXk64QlI&tZ!$vwUe2-4)=;x`Zwg^|9mGY6PdLx2S$gwf5qb-NWdlq308>`dLZO z`DnOtx7qHDu{(hgSJq2I^?76Z&K7=Df%bUrjwfVUW(@h{aj!I5IqZhLPhRPB86AnW zJ%?+>!MNjUm_?)8>4y;kPG1G5i?b>%q0>o{=Q+Lo$<~T1IcOYYJG2`Wxo^5itm1uY z40Y)rNr=og-l|Nj5-R@Kp_m-$jtVZ<;R45B40=c}aoF{=KU)n&u==LjY`I-Zyksx2 z!(=KgL2{a`()5#jJUeS5FNb1hyY5WAO9wwkIN+?a{wdp?bQAOW1P!0i>hKG?owdlc z?WA)FiLS<~R5U75K+7JeQt|BF99$dixk3_SJrM|#7+O;EbKnOgC&cp6+@#oXMKDgo z-y`4Ij%_$4i?`#t35@ebs+030M+pj9mdN$hjm5JYpKLH4Sws8NTTWQkLUt)uV#UbJP;%RaMQA-QI=nszZ5F9U) zA#U~!wMsX6)6m6H5@qsJ{plu}f87l<1Vs4d?zlhiE=9=n>)p@)yqo#gyAe`nK~mdw z!s;^)U6;AZ&%qcG>Go3%zp;WwrWTn@hB^6Yo|o5ifbV3hfz#B2OBWI$INBZzI9hf2 zRSeZXSuz&?ll=dcEmV{G|4_~N2=P}ve@Y9l{GyQd3xDeDTKb=A4g6EgnTS7)GeG0C zd@BpM^Dq8nFZHJ~e!tz&onS7(mTgR-WiP=+p1A6Jbf%k}2M#SQ5YFWAQ~9WWdd!;l zpFHrT{>gaN?DB~AOJ#-y7lOweWBqHXaF}62@~r*pv?meK@vB0 zTI&8|5HpC(l5XPIX;Zb=zvEfrLSVQKXG;)}i^*h8WLe66Yg8>?JP?T&#N;4<=<*fC ztlU}Qh!1<;gSo^_YRo8IQKQq3>e zBN|yaluzDdxW6=+5#Di;{lV@zg})4N3gIVXKSQbg-(NW#3H_0F9{#0jn9gy=fTH$V z+MkA${LKTesA5K@B}i1wa#fml7gk#gn1@?N^(GItbCGa$bN3<>-2%{sD3SlRwA)$s z_OzL^7fHAjd3%vJZbh*%aG%t&QZ#4-j zgc8%|4RXYv>l1VJ-~K2?qJpU`apQI7ZAr_rOin;EF@!uTect;z{SDGstp|C;u>l$% zZ`&)-bSP8Eb6v!GW_PWqH?5m3B+-J!JUulV)jX3{UwN6XTvM6cSi!zSJZxRrK}bB7 zHndfxSv5quk;yz?UpWv20wXOo?0d5C^^*Y!qjVho}VBnWIRJ zNmEwG%$v}e!dtB_cA*nl5XaWa5CWaL*l;PL0wOiBRHUIFZQauv((JT=Vd92c-;ZeN zynnKi`{u*;Tr1OOBB8~+7IQVE52~q^Jq)E429Jd=I%9~GXl#g^KsUE@W=h1=ucFsm zT`a`t5k4@R&LdV?%xg9EGpEHy-1`MAdnntKWdgY_om0Nh)WAvJpY44vU4L+wEB?`V z99hTBQWdg$@?q{i%_Xgwesf6qdGUAj6n3J8e0b{{KbvtGU?2o;@eAe(k>=(N(#N>L z=taoW4KGhY%RsT#C|$nIs+}qYq8@! zCFDVSs-Zllg++b5bml3cGPGpPh%6zL69Um1JQ3?n1Je>f(7NmsDwT;wBWy|>J1nh7 z*cGfGn(7~X1M7ybld5lQy=vq2;BtmZ!t6-J!tGbB_5KKH0`!oi0a4ld#!3x551Zx@ ze`)X2{>BQGd1$=Ic`W8%+!)_nR`yMy;)Dbtz&3SI5VdMPb6;BT47}?Gv@0`@^o2ZD zqHh-y1Mmfg)LwDCG9nHl24oe2L~-B{x6w;qWj-x8C>6OlfGtu2yaA=aTa|?CqpFO0 zCYk}vvOICud|JRzurN+66*DZ@0E#BN`H2d7cAE<~x>S8%*7xbC<9*etZ8I>WV6tX> z!=mh4Ma4;T%3cd=9Yu3A7o48MiLGaaPotp1`t*NFcm@Mjo&lshb4Fu!Wt2CtNY1#h zNKygPY-F%Vaj;17?ebWheh86LIbe}c$r*%AVUZ#*V3BT#UKGMZh~(P~ixg^+iB5ae^3B)g>05SMVNL$cR?S}nq`S`g8%wzY3)~gTN$Lg0Z+uEf zfQewX!4_s#;@W_2%R4VJWDq37(x1+Ky$dNk{)?U$a&8dAapd)-5I-zj&v^zPH(0nPOjx)t zq8Bqy!uHztRt+T=5mavXlp-vRO%*IGBk4m18TpHdP#^rFTq=BaN^NqGiq45O%CMNo8M(3kb*kddjpp^MbcnGui`MVJ)lxG%YuM z3VD0Tm#H2EKOnGpI;gAEY;{qO5cUSX2f+;l#Ie?!kgxjE!+eCsX2ze?S7@eKG%Q0G zYP3X-S;0CNi66qvB=abf^fdTpEI1cYS3qu~t)w>Lq0$vYbzwI#_^s2z{K1W)I7%cNv!T-RW2%Iat=+V_Ch^ z2+^=%kA5n|D1oO>$1o#Li!~%2K{qgjv)~PCojKzh1!Z5!3!Hm6IKUI4P!M4nFRg&Z zbRXfK!@r}9)Sl;lBdg}0vcbFI&ieN{h!zmT{c)h7O zUZScFFD?cDR^uw~z@WL;1*Y-SK|l(#oJ0-c8?7NKrkiU0idql!Hy`yAr{L#HIyQB0 z<@A_x=ahzPX6W^Rb(%J;?6L zt`V(iidtAX;vIR**aR?7uNjf}rHtV1Gr;A$Rk=!-qWl%+gc(A>ow>wZ6|XWQ%d-=V zB56aVPbz9Cn=|T{WmXbB3s5KKLZ-hJg{FYs=9^bjI5du@Q{9#Z_zRI^G}e&8yqiI^ z#=OYNK3hJaPh2*ldLd3+RtP&u<%6oPQG;rdO0nigJFWW&DohOHMi)4fRDjbL3*~6# zMAoQ)tsx9U(uGU|<|VBuXlVc-ZNj`|#F_&7Cvup*zaO_$%}M~V2GvM)VyH%$GomP} zE1O>e6oNH~4dOe@EAvE{LK3~t5XUCIOA9VHh`SH;)@DUypz#qcy)g5m46#ZnQ3+EM zTZpE04nbR*ah!P6r&2;D9FXd+rv_MXH5F$fbdad_e*1#gTNpYasJdQ~HRQ_yDC=-6 z7}Vxcl>{S&Ky~6C(-92pIB{}}VIgCUApNU3(={qVMhd4RCTMT)R<{1l6+8YFD6huR>dW%`yJT>T3B)Dzj6F# zAsf2luC@`R%Mzfr$je3B2F*+%nuSdM#ul-HSZA1UN?(-$&e+@1h?#KUtOg8>s9hQ# zeSytkj-aJ~y$iN1l<1D>L#4e9C6DyGVKR{#iuDk3AgaBw#z)+Ab)3ALnvN+@hyY}` zN=vM(25f^92gR}1cfD1@#=eXEmEXs*4848}^0fc~EWE1}C~gCOFY)5SQs`z=Ibx1_>hl5wXg1gD_cjf&~Z40OHK!M(n_>b=vxW7z>>Mprh{| z_Ro9=fj_?cLj?$!R5+`F1c;UaK7PjrA3-!AtgPL=`X4It7fDygfThw4KY6INX51~d*>@fE@+-x9IpWj20}7y*x9TN;ssvcX zG6aimDBl-fr*(@e0g$KpyqvJnGLN{f!W@(}vr^tXQ$It69XH1Eq1@FmY%cB`aNP+h z{SxUtIw->;y8jZ*5iKqnUW2(YbMhtQ*krWw%=AH&R6vQz+!_>3vz!2+^VdD*<}dae z2mqz;Q-nNnV+~rYXSX{1zvF~Zasv&{_F^eQF{0xN2~s9hYVlC%`$QI^;+FEDN?Pq# zgH^=z;)Am$7E}mvyxB;v=A`AdGKE}1V5LmuYtZL-qYD9pxihL2NFq>rmw?I#j`wja zfU1uNA(HP^zr*}nbUl0=ooXof0@2l+(h6zCO(h6Tge?Yve&m=0s1O6@aE(Xs$^v@q zU&9G-RHA!>$(! zb|A;F5+}t47$dvA*c4$02yg5VQ)n@RdI=J;ETXbQc=`en9NgW7b0iaepzkr>6|1c@ zrn=7zm;$w($c?eM8GEm_z`FRAzUF68Um}~XMWbiD`JA}iac9n^AAxT679 z;zZyA>2Uy)0pNk^b{s1reL$!8Z=^zb+60t+1gkGmPW;SuDQJM-Qvhf<+-MVoLg%OC zJg}c3@GN3NfKVL>rQB|901&~>-j--}cTG^6AOeV~1*lD+7l+cbDcWx}{vRws&L8%7 z*@tPtxetsxAp8Bgi{1R#>+Wj*5lGN30A9w9fyTW@=p{_#-g2RZqh$cRjGm?g5feB3 z-C(zoCfvR|G9<^ycb>22z)9)X&^ks=aIQQy0HXRG=QnZ)SpE(fXdoc;8|wL0BZzzr zd4q4rA5{~v>yN7WJ1sEqiW7&Iex%|mrXP;+8(-dX?KWz_2S!x++Hd8oUiJZ?sS)5+ zPznd0<8?fVoF8F70 zLgcc4rEt)t{uu?t3F?>*95XBbKE=bA0sq(*TV#Gx2 zr|%Z^0{#C;7u6_1Q1t{2Cy4c9o9HXs%7Nk!t%2zR0H_r{$0jL9dWnd3>pVoo_=n-} zGf(}Wli?TW3G?t9AUpQ&t>gIn#Z7<3{=Y^6w!$z$n*li;ibom$WJHQcp+ zj0na+1Kwjw!ZnU7I}W}gjUAE(C7`)R1v=BoFxntM@#))n7Njw)=eC1MLI9M3@6JNi zYc#i8!2C(T=UiwKL0tB-!W_&YRy8(a?XOVOcba>i-CZYnl3~l11D-b!ujtu8-)7#! z+`ETF$>n9rAP&HXYDl8iHv`Z;mqI8YSLJ8#g~;mIAgjMhpT_adBQA5sbVJj~&PZ6wGX(0S8>zGJrQ}LN59PHbN7DHYn81#POi1uD2Gu z4juFi0Ac|x9W(_JpuvSxKsk01lO_VOfD~a_7D5D`uT1}3{9f)5!vokf;!yomXNHFa zaZn=51S1MCq{aOB6`SB#NC{Akf58fb2!sYE@c_N#9*;M8qc2^V7XheZKr6DB*c*WX ztRM{V#=wZG`8uAT!EvuVhCnJ%{Z<8F2S9T#lb>CG-^{xr;4nBsr9>K5$X#qny$E14 zT{6!t<*50fhREV-PIbkPnF>NJxxY(=Ob?Aj7E1{soj^4hQ7NGLMf?v_IcwfmC;lh$ zzs^LUvhQ-;6awh}=Tu+}n%cl8=Xx3*=9NQ_wct{F1t2KWA4;jNfJ}j+IDnGcs)5sC z99vrffz8T1C`UuxG~+LI#i=OR-KG~J@Dc_z>Q+DOTL_>YVic4?r17hnG`?5O031Cq z0Mp3s^q)5IEqs_FrPT*c4JTD98|$ zfreCIhzcm^B7u3GoNB>$e??GSU|%O`q@S!fJ5HzkO1mR z5yApw8Jq{kOFvwk1bE&b4*jb^0UG;8lm|rZm6r zs=QnXaBU`^=pqr3 zftb@Gsws_AVFi?G^1=8J0`XcvUUD!B?T3cD5Z@u`4Vurb62zIk2*IELk(S;=27>^z zLR$(N$d<6n9)oCwHZV%NT;z`Y73#w^`xZ+l;NHH6;TO%q`5$U`5EPky88RWt^l|vs zK`8Y5sONX>K)~Qwhra@YW4B8df(D);j(d(f8w*_VEJ{b@#{h8(bi8d`(-$R@Ez#+-@g_EiWu9pR=)sTIm(gEDbLP-5dPJ2>>|RK%oIR??--tu*r{$;577e2{8sD_J%ra2u4981u)YxBdsn$Jeq*U z=>Sc_%m2yhy`6P&hFHm1y_UPJ|_EeCOeojw}*HZX{=smnd{ zDH_7D62i;ie0>2N&IztbecA0jqr>*K!v}g>Xe_9|!*A}7r3WtIoOtJXZr1a4z0>xM-j}3 zXS#g3+N0lT7H6oTSp}Wb>Fe;8*-dYuYqxH0 zmTvp{t=;+5hz*^vIsfR~?Z@A~#+37JFOk(veVXtP+aa4**~Hz5@(bAlzf4G08&v89 z$HypRQj~OzI_X)jz2p)7Y<7ox_9=%lA5Jw&2L<1~fZz-#wbV+#amW2Avr{H?e0~e~ zo^Io>0TGVUeg8!UHxb8%hMf=n`qxF~?PZerdv-tNTe#N|$~{e+0XqX&5L7i30Z&!U zae$|%U)M8ux2^gSU$k`^=NFrBK)gPk&Y)Kt?1=#^T`%3=pJZ@5w0+kg9vFO?c&h;V ztwHB4n_DS-u5P<)GtoUcDV^iD$Eyaa$;a;uDCEEQ@_cf*W4!0M_5RM*zkt_ zf3K(U*~t_E-fR0`2S4m)Y6yC`cJsL%)@>%wu1<7p6xFP`RB!Fh%q)F7Jlq&u=$M|{ zIA~id$ywUi?Cm%xS(-lF?9Ev#={VdNX1vLMDD;SAZ=<2%!{LX+>A9V=ZYhSC*F4Px zrz~hJ;I?&( zm8HDy$?eCrJJa8ExB^|uYF_PcOq3RzK6+b_y#H*sv$LSwhFgu>YrnswqhoHTS@&?V zZFxuc{8ISQ;9(&p5?}w3N14mURJwq`wR4!VM*?_FDar@yEAO0Eb~iRFNNmOqUDw{t z><;xcv8>ZMs;Ld<$UMeh^o*)Ie0JC=cdNh(d1RP5r;cUsTEM*AhNz5Sy{>@suCPbH z%_lR5{nG1&vq52AR#Gj{L>#`B7S%TeoA9MB4u}foZ|CQ z{qtD|F;%XW3+AF|n7ofh!yah69eldW$zB!k;J8f-$wmV8WEIQb=^s=c* z5UfoaXQd>0w3kA%a4=rGvsdSKU{<;7;!&k;x!HOme4*`NxMOB+;**|-eU)>3fi80j zarpF6wQm0TnWWXu-ax;N9&>iDelGqI%BjZ2XurUn(aA$=|B&7o_PCYt@lmGyN8FT@ z#NkP!R5{HD?n>MJ6;5&%WJ{loTkoD+>+PgWsjbxz;ETQB`KqdJ*nJseblmM_<@R#p zq#f7MT&?@EZqJ8(i8srKp98#JR%tNzw{0b<8NKwQ$UJJF#hk@7O6M*ZAB~kOe6m^7 zJ8>|5IDGG0wrVMitW<;!`ccBfdkKPo;^&~`gA8b)p*y{x6?oRGEPHe4pwuL7xbsZdyS~sV}wWU;aJFT#6ox~Y%wXJ(O_?k>W1+P3bQT9rpRKFHjwa1lGIm@)Fs&TzERW8VyU(KR zS%339{N}mFBw*pC>ACA@yY<;oi6Oi##>V7uVsv()dH03o>g#O=o4SpT)mrzI)!DJe zQOCJB=Br0#d%IajSKk(Nzx(j{28&-VcZ$(JFxRqU<(o}o+C zw-%mk)J$89C#~g_Xb3!hK8GZEKsB9%8>PcPIV-Y;zOOj&`B6c)#~BHpIZS$8qlkC* zcZas(3X1V=H6l%W_jm-as$g7mH`U=*mP(euFx|2CTRN2c#RvHw?>4E*&T8CT zO-=WSQsQmpig`R3W#c_P5Le39TFJaa5o%|8v-WpI*{+M>lcPHheN~cmS zB}U_hCs*%k#d(-iu;qkR@+Q|Z5ceDj^0z!ZcgIN7rmkVylclPAE$+PKvm9+%hBhUO z_ZXB}b8qP}G4rlb%8YH~8>1 zqWSA&Ol2#suN&XpRypY;bci=7k!=gicnFw(Kw?k!^wVL~*#xAQDmkNTdiY_{WYr$6Kru-L6u@48%T@2ZhnH?t95`d0; z+mLRa1xLQQ4=Xj#d25$lTvwz~Y^GC0pUcsVM6!1t+nPRIeRwYYy576WiIR^&%6B%y zxQto()yle0#5XD>vfi1m4CHC(-HaJz@sUU;FDb}ocguRSc(MMR>((RoUc(gjCm$_4 z`OBxksowbf>{y9<+=P#tw0ebG&RM6j-mFVZLpO0u$qb)G6_r_$RaCj->a?noC*@66 z{A}u=i=(s-dFZ6CFGp7&1Su=IqC(`7?c8jnn7>?X%^$cP@rXQ)j#s4RCkWFL%%Mj81UzDnna4j<*Vctt;1I?HX2O+J?ZXWihl zL0g6^{5rpF>D(k9{gjT-!}G24Ko3*&RVh&|8U9fOMm7S(YW`H?+rNn2`Af#4zhoTH{U4(9tFGQD zC5u&OFrMclnXHjSs9y3;^_CQoyhQbE)2|z`=xE05Ct#(*PKOqAYUSFuKb_{W^PkGR z^_Ma)|0VzFzvO@Lm;Ar61NfFe@csGAG2embYL5B-_!r;vfAPKX7vHXb@?BnFftzx2 zb893$`N_=|U?zj)93i}&AH0=$bOc+Xir=KXE&ci#VsC;OSdc>gOPi-#x+5JpmLSAf=<&p7V+PFuy}STW6$Dh}Q^BeC^{(N*uTX~j zPgyp-=zh9I-vv&Y=+&qQYx^uMoVYrnI@dK!WC~7k6pj_8=7S5-&a&s-`=X6g3Qm!! z+uW8{0~h*+Ijdb?pF!6Ir*Lz(STn(e6!nQQ{>7R)Qj~YC9b)M&`PdQC(fLFX)}Dza zuw$bPmDhWc6I+OOm+gbhZQmS57pzJAzUOCUJdhc8oc&Q2Zs*ne`aLk#)7JK(a4KZU z*1OKc6YozEPl|n)EsLWtKfnGVuR4i38wK&X(23J@g2J4r3yHf#& zb25SVE!a+I4}@J0>WRFLii3ake09XDQUvLUn!>XVCvf`p2L!Z;u6xvVp$jsN9-Mppelj(I-R;uF6@SN z^&ZKosI!D(+?mFDpINBWxlLIc0+y*oyhVM{Fne*Ccu4(upe4Y|IYP8+@Giq^$GaYj z`trfM#ID1;6e$RsuEV=%d5?F!6!pCa??U5)cU?J8=+6gsH8fDoLQG8Q5o|!8V)GNEFIK?Hsn-{P0az^3-`Bt98gLd8n^z=z z(fFE+)KF|ug5tHWpRkPoW_KdqHBwq}+Mr8~c<-ws0CIh9SO4n#eHwe&mz98Q;_4T^*h zNBM6OLITQA3n#(?qFjUpOd!M(xrh)jf)Nt%6^5Vb1GGUxn3OZt(#3%;E>c<<+Mswq z3b36n1L+^QlPR@uH%#mGC771WX)Kh>Fs*B_vVxvSMerh&<@W_^34K6*Tg-PIt4kVJ z;I^MI68gtj+I?Hh1v|=1yrll}v{Fyy^O7~Pa^y~32oiyO6(2+64AyHpn55(}$#lB9 z?)OJ8@J~GNy3SGZmG-SOi};R8gpc>W_Qt0jji49MG6<7fPir_!E@1k32cuyT0delK zoydZU~%-`P9NX_Ysz-W`u>wBEm9Ygm1nL-+ZD#DnbVq1_=ie#$VhQ z7pIH7*IYfQ$oti*mf{Y%fFTG(D`56i9|{76O?{L(ptVvJ(=}G5wlwfQcgf zgujUUe#AjU8=5XmteBP1Ul%5JbWF@Ak_uH65h3iPP=rv0qTL`(<;w0YBnUuunC3PO z<5hno%s$vaML;7=9e_}X2z%)xV-Q{uA(2$1@ZmvHm<{Jpv>j4}OhGNMOzDQS1+iQU z$?Vmtc~{Y;TDz`8ZtQPFE7d07(ar>{t``7noCEy848FjQ1J?KlGOS__gvJR{V2w+4 zNfA7SHGT#U7BfP^mlh9BDrTmv^#K!{gi~hTeVM9_BIy_(W5@G(mi4rwnhi1i)Wgs! z$zkUDx^xl;fsS5D_&URfX)R$LiCiU2w}f?MDvD5eL|G)2B_t+DloiJ=HzE~L39~V9 z%*LvO?-!U-x(!STg@=&#E=;#pL`rWOD(uc-ZC-lg! zToYpCSQuM-rP@*d>eZE!8i~SFm~9d7kTrcA1jiW)#~O}nwrwG9!nsr;buYXZi3u8N zYI>3>;_ccfZ`QdM#xaM(^!jXlHk?kWa1w-OM%T$-nKm*_d zVXZ;|6={T9O(vYX7W1ws=R6Oop`GcI1d#9N@*XufUy{T(vIAHU6dM7HNlmwo_Fa=x zWe?+ozmNldfL1f1+AibT(GKo<6wJPp+cs-+8`uT7({5Fee1EnC2PjZ2Q!NqifVTp? zkus{F_m+Yw=3S)6p#*eKN|{0*6oi)o`#!WoNgP(avGIYnSSBMRnKlFD86(;40CRN? z(Q!aw@b0MtTgi75S}5n30K=r_tAy#%d>8GLURv*44M<*Jyisv~nTNpV;PeDE1}ccQ z*e_hc+pYoO4H3M9;&v$zB!#J2*sU!9SP|o}AYP`HrhrhxPuam+C{+O50rP#Vd_<*2 zumb1ncTm{A3OVun64F`VKu~}@)5OC`I0vZw>kn?@33IZCKI!*SSU)bn~ zdip27pq~CCHU=$z_?v~}K8peHioN|X#x8885uh2!3n%-(I}otNPHvb*UQQ>70?`Fi zGXEdq_5s`k+yjA|jx_*b9pJCXSAjt-?X{ z02~&m5`Y(2;gAo28;`RhtX_;CngfsnVP%kDFG+&rfymDP5$ivl7*;=`!2O^d-?>cJ zrni6NAsn-6sj*x*oz%gqDefSRY<9Q*BbWJGJ^%WS|4jA&7VRI=hXH|eU{?sk{?IeT zFkEE+Ln8tt1Pu0HIRF1o2Z3orsQCAA`Q2XsM3?`TxZZe1P?kW-Q^*Ur4}!-+g$4pU zKYZaop$#FEe>0}xc=-3lEeL!9%93O6rZ^SAhYaey*(vlw+BxJ666Y-YE;{4tyP0H< zmG*#k9jcIvUrK^XSdj0`mjr=oZ@D6aQQnW6>%>N}QVI3loF%6)lY~KGF(O;HHqxu{ z11&nm!L@;0fDZ&pYH;{FCwi^X&f0^Vzkv_czIBg64Z7$%YW%k`YB)e)P7(j8Q{uOi zF$WcsrUqju32I<~df$tin**}`F4F`=s}^^}KG2A4+XSG2wt8Mt#Bc!u8yt`U+AUX9 zG5U^I^=R;~f}jU8gP)7|dZG#E5L^GS)mxCZ5sA55E9tfKrMI9Sf#P@W6_oKncNo7; zK46Q9V`SG(1#((3ZheDT&Pi>^X-jdb`{B#$cP~RE^7C^Ce{MwqjULG35TbdJ;&6j3 zS{51ToCfzjUi$l74S;uQj5`oj`3~5Y8k?}B-2xh^9RQX9n0Pn!GBII4%&&K~C#ior zyry^hkSXes0>*s!{^(#h1znVpEfP62 zA?|voz(#u1u!6R>qorKkM?8XbXV`0 zt2u5|O=RG5))wbDNg!UUxEU^YM!GoJfBhix)^bf}S}(PWeYkp!hm`JK`_&aXd<<-g zl8!20KOgAp^W*T>cT6y|#~vgVK5XZ;1>cy^%#4;c2t6%1wKg^Yb_@o&WLU7tn;Io; z5xn6B{IUNI;-eD>{87>X z{+0y(SfPjbID3eRxa-n5zB0e4AfRUQ1zw5sfH$q!Nc3uYcaa^?p6Eiqmw;vJ1B`4Hugp7mz!-=bEaE^ytJ9ebeFxNHxrd>KkQA< zf1W(xtGQ8da(yLjhWoN4!z_2fNv6Id)R~p;F{il+H&NH1^l6Vlp81U7>4OO`frS3K ziR%>SpHMt9Y007I7l=8E*uH(VN4>4r-EX5a9@ks=s?Ke{@^DY5Lc@!$YHWUDd35@4 zzRJn$DAls$)ovD3m|(ja<#MZem2UOQGIlJ@Lqx7QcedU9qKo~68hU+3xO;jp@~;bJdfF;-iXs9kZSVQtPo zBACzGnwR(IgMa>!(cHL&>AjAer0K?n)q}mNq~?ZQGnLdT{^ieysrxTN*ZkI?$NzT* zrHw#eN>S*(et0(aq~P=(lV^>_y~&i&@UfM~EvJPm6i1^qPJsv2DTljvza4heO?e&I zmNDHlSlb!TCrR2FJ=oU@_brI>12I-XUlJ4$K>F(~7 z?hX-)QW z|IDL9>HIXS4DVvgE2(phBb6NFh_d#zXX?-=+2&RrnRftx`=EN;=X`3R;;SUn9jjK$ z5dxG?JpNi=#RzTN?ODlrGLL8~?R@*z=viOI=g*JD_c!ZgH>_HooEPzqcY~|5axZeX z3Ty9bIGu4lHOjq@U(nb*{&AoCkDXjp-GF`W+W=Qlf9@&kV5(wlB71(C_eJ%%isq|D10a^MF4mo=<%+h1&yxxz zG+M4MNp%xZpOomiH1P2JyhlU4M=z5J8bA76a@4IHuuY6}q1KW1p2_M_PmgS44UW|r z%S*hF1|yXM8=d2{J=)kTkf9uZGzM&boE{lcSM=!44E8pZ$`RX(d_9915?-3Skf0wKy)9+7=F_ofdH zww^aS)l*~emp4B8+KANXD#ZL)TCsYy#mrQrR>ORjOoP`NM{m6v@4DJebKihys^z^E zwvRv0UOm8hX^+f&`8W{G#^?8{p5k6XSGic)edjQEnK_uPka9*R%pp$cm3<8I>@!2n zS+1xu61(RVRJmmkW)J#U?|8F^MJGc6^LD~7?37F2DxARETgzkPP>5~f*ml1{XA)C{ z?~QqH+wZXAN`PSTJ}_3I7_^2(4>vE85XG8l%rbwj{&VRP6q|mmKs55YszUif%UCBC zC8$5uWoo6z%03UX8PeK>u+hFwq0~mn@>@P}(LHh)$PU0xDl;M}Y|yjHmpWu_IXj(p zU$&Wgy!uQ;ZrV<`_=~Q}c2Y7~92V3K*(mmePac?JrJh~M@0&WI<7>ns9fK76ooMj2 znGG*0g5@&HXqamalspryyET&;dQ~CFAf?cgjt^ zL$`uz(COWwr^*|YxU&3FxC2Odi`g*O- z6lG?u@@=qfSLP4VXH?oFE5_$%3t!VC`dyLOeVE^|3W=`djEA|S%ilBNj(T@*y#BhZ zjI(?zavMN*MPkd9J`~h7#f25^xgyzX*FMz(H86P6IT7p{_TK8nVBaV!CUyIGr;FKT z6>PK52`lE|d?;l(hTTRpt+3};$I~a5Cmp~u{qMUXFK{OF2>|xdcMtzRF6CnQxht}k zBDVPZz?0YdPtPT?$Jm zFPu5By&LP=o*aX_#vj^J@hk6A2TWPhW$7?D>zbGHHV=+E}o4 z+7`W!AljSbyN;Gr>E0vV_8HzAv|T<->tAo3U%PW@M9>}bS=mfMt`0ihmeJmunvPzw z+raF5jXb%v&y1EY?;Ll@%(S=ryuBKhzqP8nFk-`RPuG4L-PE@;s?e`l)AwY*_ik0| zK)YjpI2&~RdSR}YD9Xxufe26g$bmm9>TD@BKH~lGC1$=cHE3V9=oh^e~S$PJq7iK)3iMA#z zV7Iy{-)T&LRbL)!Tefj+aac4c-QTNCgSi~u54oKGriVUt62OIthp+6y>$PtKvlHE% z!FTaGP~xN@PIEZ#p;cQn*ISXM&x9rQQmY;Fa4iQ=@YF4hsO$0a^$oGyxI`&49dv zQB7OJw8_AM34An7`N{rzoo)+$PAKFt>cRb$2=GXJg_^_10s5Lzr5j8H7O5lO%dnN{mf&|rb<@QLF4_@t}fFYP>g2;AUW_ws^Y{P6lW z5tRuYw$gnsuV>3>FE-WDLWtx)i$T#Z66pj8(-qR@2D`0{OcQ~#e z1w30Uff2b=HEB+ijl1R%T+u~2%c7bRQ8+sRDR8D;Z*Wi#VNKd;fjyLx=x<Qp<2#AzeyK1!468!aCUm46!fuR9MA`kFf3v<8ZQLb}HOfcwRT&VIy; zgG^rdZ#3bNM%kTT#=`KD+mGZo9i{yi01Wn>XX){UM1NB!+TqG{Kvov|K>pqCSVZm3 zG)PC8?6AMx6P|YNJ0h-x^p|A-8hB&By97YvIS>suzTap7V#bcJ``?ftZ+RpRdz?v= zcG^))cZZ}=s`~s_Yyiq*fR%p%QZ5LroSdf-6<;fCl(r{0d3{3i>})H4lnx<0t)}R> zh23p<;IAx+_-@Moh$aSX%HA(igw{lbN9L4V9$S1z{)UADID{COlMoO}G_XUEfTOa` z^3Tw^{qG^Ne+3pP5FdlxL~-ec^EC%q$zLf6h)ncv=8yyc(t`n*Nd7OBAL-EtoF4Ch zBLqnLe`Kivus5WDz403fp*6CfK3#qPPoJUyqX+<@$O8GaV2L<773O+DL*=*J{Q#W1 z|7+MC=-)g!DO7)_$XhT?h>EG`JoYbBE^c|;k>S$aOyaqzf zTcU6$k8f%nrO$xj%>nQ#e}I2eFFN`s_?e?|k3Yb}I(vN61%@}(rAa81B@K{xrBEeA znJfm5Qe;SkCjCu}RXzn}(2x2 zT&x78g1m5QP1t+-Oh1SKl#&J_M#&IlnNs9%CByOUp=?sr!pvuD-IR4=Tj)irM2T;5 zv%^_UFj&_3z~Q0Dj5lLiApue##EH7OL=mheFIfore_Z$$!$Odz298-oLX2kgk$tcb z8kW+OkF6?4K~DVgU37H)v80 z8IB4VCg9u`&6PT|p8fZRnV@Lve#*JXG%gER){0eaR-(cKQ$>-14g07_g4rWVr8W!l z^7f%-l-+qb{jkVR`TAZ9QDJchLW+cML<62eIQ}Km^PvcFnlR2&D7{E+r7kCXGi+EX zgo*)aka%CJ=e7*0maM>D#uHA<#!7Dp zu}P;o8J13udNX!|QpOplg}gVbiHev4otF(#;}^D$KcKZ*HL?$_^EqmeQ7(a?&BWxAsPdPUYKKW8GrdZOd&#mw=~dEzyp zV|}p+3sY7i@nb`R{$iXyPX0z%xFs0n2G4KK)RG6q3Y1A=J4j7fSR)w44%ccLGqO`z zNyvsRww3T*Wbd}aIO$NfA#-zd4yoR4<&U9}u;1c>DiFF$G+Reg@Kj@Ba=%BWt>xW^Tv@zBx{C}k_b7iUkq^w&$ZGG z%}M|g=0zA3mo3p5AANik-~K zqg|I3D^+!TyY4z}9I>RZfovr-_3J_@6BZ!)4IRs&oQL2w0`UTy0H`|#s zq15Ns{|G;&HB$xt`f}s&2;LB}$~d~_XEmNYuN$1r=Cv8Smm_U5);pRr8-v?!`^Za+pLC;*ORw(STCTn8 zonE(KkMhVq8X=I>y9_$ARu$ACU|fE?PF`@CnA2xXqdsgL?0sUXeQMxoPo0!aS-Caf z(v%WG;9a2Y^P#=>9QRzh<*6z5Y4^H2zP=bAA2_dxe{GY2@6FEb@pyYbe0F|bQ*Q!k zqtou~VEg#!bL0@4da!Wwi3iuM(W_Q%5#HHlC#U3W*tX4q33E9Ad~ZwNgt>JtU0Yj5 zWMk=OX$Z^W1DcmZYjb0ee#u^RbiK<8h8|bO zf-CPQmzp`pI*8;Zx`LY2lNmu1-X%C%oxrul7qdRx9uGr!atnxe`bV{&x1Z7?>2zA1 z{bw$dOAAEFF5wiZw7wX*c`#2xJv`N)UhdGe*!jPfZ47kbwOLz)AIY$X#s6@G@WIQ~ z7{SxqleN{s-$k}DI@$>zKVvTEE&j0fwiUJc^mJzRTqH}iWvb;mnJ$&SiEj`DCjTymZD zVMANXt$aH(#J*{@-n=rgHXBQ>V0CwM^uLu!BwOe|XhPy7yV;wR0Nka09v~}Gip0rO z)i=h=Q_IubvC|gGY+{;@BF8!HY~FHT&(6R6z>w}`F`}dMfd9vFHz%GHvv>#)kO(Xg z5Ww);_qWPAni^Rd{rvf3$n8*FGkie=)tl}cFH|dMn|O6=H@4-R%={rK;X&@Eon>^{ zKoqkG({d#A+c>U^JUKB*9T=|zK?->0v9aXGcYy({4@lfhab+nNY^j6!A75Fh<&L|I zcsh)XzsAsNaiq&1L6TwD6JIFPE^K%q(`zXZr@qk2f|KyRybD}{G^84=e(BZrao$oi zZ&Qe~P=LXquUDsw+(Kl)yOV@LPq^U_9bJdCPc;;h1|+Mj>4{_%91!gcG&7WmnK;C8 z4KjZEwjN#_uM7_1@+4hcwpwJ@SdreaMwq!1Xc=?~=#d30hptNEeVJqz_;@71i{i}H zeHCyZ*A32P+KhIwljK5|G%jN;)Pt@$Y@PXN-@K@6ucqjgUo+mMIC|ciS#wzdqGY*# z8|giUF#U)M64^)pB_jNI;-s#Lo43zA^YF`h^UUs43552!&dTcI+1BVMD!J{Ig--|& zghJzhzk{x57|bRGzMl?4U_FhLDA-|vYXKEbAPL6a4a1-8nlhbF@rx;N0JBa6q);dbq? zTyJkQtHnPcRqt`rrRw8#)p))`x6#ijUc5XTV}=Ms25LF5Hk$G~B1Yetq>y=A zEz6)&XBbL@=i1tfEDd-8R~Qa4s`?I?BD0xp{@FsAm@<{Nn@r9jRYs03Pz>u$vb_`=mXv9n-Frm(@B=Xs z5dxGE6K@ZXBM_^#-bj73r3$vmPCeL^ObQKd~ zNrI5Hr`C7T=qoi!ZzSX6$6i18Mpmyy<4c8K=j=qAY;sko6gd0Gn?=Ehy?#7SIAYY% zvNUnzy;<37!US@AYkEEZ6Q*vU{zBf)1!f*S@!YAVf2j8Wf zY{bbRsZc(jw-IxfietKXNT|Mhil|;-xy4~#I=7uc;B?wb2(syVfJ|%-MjwEO zqZ`~Fy5Mi%g{r@6$2hh+`FbZKcYiz2hZHf&F+#xhtD0s#lLRn;k0$6kjSrsE;ZV5fF-6>NRa&-L@% z)azcX1D7RJ#fz!N>m9M=^Hh&bxR+Q&f{>B=2zAaC&b3Uns@g~~bv6P52Sb22y~miA zViCet5M_xt(^6}oqf763Cl)KC&t!p^AC!LT9C*8>vT)IQhyzlm6tW&Vr07gi`MF$b zq|w-2lfFp%S!I}-GGFXo(q@yBtG%OoQL9KkJhDb(3du*th%vC8sUrNeG?Q{oVF`G5 zM%0q}tjuxKw&*vKNbGs=%;SlEq$73<@cTSzk&)vqM>2XV2+3zS=D~yDblFU7T-f2v z9&0Ni>f00;+}%0Us}hckEFqzviUh?MowrVBrub0u2*WgMA^c7&Ud@22-_*zY=cbDH zPEg>%avy1gM>sme!ep2QUKBCgtj3bM3xVUR%&A{WKec{SdX~ z)YGy78R3g$MC)e7q88uC(KDB0GP17dl6P1(?+OB5;Z>hd8?KTVGQ|yXf7_{9*(W4M z<7b2=m#hq)W)sF2ZGU8x>UqCjfDsY+j5=;okWPRaB0nXFj_t)4&bm*~_b3c_kf2GP z*7>ke{_2#W`sQ^sB^JHU#N~SR5QC-PbwBgbqSYV_$9PMiC=jYfrQILW)luNq=}Mmm z;$+0huXd^uj(f=f%`T}iea>JnEJ_#IYNy{f!J_R$hVwNIqYDSMQ;UJ z=Ml2`rfQu2!MX(;)!EW8Du^&A0vlB6dHH>hM!b-S?(cE*a;c`-et}|? ziF%(R*91+c3W01H5rnu6dfpuz82jX{O-B%c+%JZS?sVM0$Br=VykI30!zf{l+~b)I zS>X@IZwOj>yvXCp(du2lbTXGTp*U1%!EWDO^(cdOAF>)Hsnu<@i*c3=$3>hx&nMJ@Ze2I-qny~GLE95 za=c0)F66=sJBy$;(A5kr3B4r`9JKhVi8Vnk1*2eq?5mS$BNY$rQB<0An?_n9GNGgr znOjwgHS8myGVE1OV{tr$h((zHO`PLQXPlI0ezm`(Uo5E#KU_A3C9^q3x$PQykLW3- zN1)F4CA-ij=z}*Au^RR6?I7a^{o|5jsik~pqc|E>1GKKK+YfPW$Oeh`a=qJBCZNFr zPSKQfDNT+krSIRRkEq*YmFyONa;C7w#%xMroy0VpD;mI~)}aUuPbAGc+{|Pc1Y^~H zNw)G<&e@UB6vTmK!I)pbN;JPz*>RTCx1>@WoM=%S$`wanFX4cXwe3vzEJ9U+xbM{E z#hnuFqrU_V8dOJ+j2}_ghOfu#plV!hnRf9ZtCV6a(c&5##J;ke}kq(E>>vO8?lqoLtx~h_k;BzmB z?5j+4us@Vf_FgZ?D^$o^*_fVND6M*(jvScP2vydTncEL2OFV^sVU}BsK9*aS_jid* zsBU*`57$=oXt~qbE8zY%js76fQv#c@Ff~Wzwq&)Wf0DBtO_8GdMRwRXC;z2b<5mEu zG4eb?K4Z`v96cQS`>QbLjUGUvi0%7xPz=3trz z$e$QA6a5J;Dq?IZCqqpA;gEabL_6Zbc7`+XD1DyFd$Yz$cM96#UX!B2A|$r+4yKeW zB{B)R0(vB!zNl@HugLIj@9gfgo=$h`HMuPoE!c4n>u!&)v$igT67@s9%M z!7C;vEqGrh%#IM`oqmbj>D*q;_{@!977o|;-WAjm*Q0%@_E>Ad{04W>ntdsAX5Wd^ zdeG(QQg8;7w=)$AzS#rMd4bW2)5CEga~6zJ2=lb3b0IOlxms=@1Yj zE!o9~7Skym6!S)iZ(zS&W2MxhfRGsa|i1rT1V?oMew`rJaOj=yf zU3gakAp=7h0hQbWGN}F_U8I?i(d2fwdc7~>B)s;rtfZdj=G4y888uf7{#EgIgz06j zR<-y|W~c4mH%sAL_lt>l{OrM0J6nLz|H0ewgT%QA08eNC=idI&cl^uS7MB6L8N}<1=rGZEtvRg(lu_RvIfUjqw5$CglMyW*pjcsV?+?zVd-=zoRRULzpxr&T3 zKfkDfpk~p=n$y=(7<4!YEjXp3ST&l1yXKw`I1=9LBbRRsB~~Szh#qi!okZ~(Be(-w z%=EvKyGhY}D;%9g=8`Iqjqzqu^6H{y%~vopFfL|`@KSlqz)kHn*ARZ#qv*#+=JS_> z*{x$ub0OC99EbAiGxO=;;bHt!Z+O5+W7oY^XShm)FUK3yxw(XHms-D3aAv)!LK z6GQ=C{r<9WqCe&Fzh!VloU{cfKim&@>K$`fQ{>Se!}OpB)S=FQkW3qH@;|R4$=Pi` z*)3M9gS3G@-yTSnBAqC!(f98ry%sR;ibdUZDvZ!U|9W>|bV?2`dWtr?S{1`-$WCKp zL)s82hId$UMioo&0d}r?c3Yy#dh8j3U^q|fqbIf)PKbjNjU<%y6;o$Ece1 zrP;)`oo{}}4_4$}fuGKDhk z#$g@3%Zf@1XX{KE)#??sYI`^4ExJD@I4=q7MhPGczJQg7h#*kU3~dbL>}_lv==5xD zzppzY$Od~xo(TfDxUvvo$mK5HMD#T_o@zfkQpawrAmqZg0LL~F= z;nE6+lUQFYyf(-7jC@O@fGo+T5$4yZEhe7-3C0wCg4Wm`pK^6KDCe7-HGFxiTk%*` zi}(ZrvTOux*I_XpY*^NM_SzH8d$)@-b_}2Qa$G8r zWXM8DzA9iuV|OwA;J2kxAR(hw%Otl>$&=+k4xPvaIf*Oqx{YR*PlKh!bgU8qdQQjA z_chVYvjE!hEQwkY3pOI!Em(op}$?Ji=p5Ge_f4#dOZB4_i3#t&D1rf*=HL7$6B zy&*cLNfx`hK?i;Ecjb9?j0v&)Y-berlFs1DljBQm6ieTiUEze^ z93qeIr#^jFWocj~6*(wzigql#@`jHXE`!H( zi=NM%u8U9G8IobiB6sE?+Gc`oekR5NGD!XpkeZcC>9<48CfX!WmC=%tv^wJi-k z-NL*<6`N%UG5{Q|e!$^h+Z&D>?y_N>RnS5W|6?d?vSM-->7r3euR zVcyHw?S*M>J{UL_^08&T_j30;7rKef^J7#f1;zK{0k6~7W#$y%)^~Xt%$e(~Qa{%4 zi1f>z^=;qO`k24jvsML_ixuw(06)goG<0=`4lijuPp#ar0{^=9@*5Qk#cjiLFhf+( zO2T7xw+wEcL<^6NmazP) z;nlvX4d6nsmz|tQEQ%N+TrOQFiXq}t&h^Y#uguWS{wMfuj+w!?!X1&aHkrI3uF?i490mLSx}&~e*MixXj&)LN2d1_ za@c*)d4*Pyy%vEeESSvGCZlvhqNCs|M6P_JVu0F>ZPxgsIM>Zs3XfPvpc&=BIcc(! zTf-V2i?my!AL6xo=0aO(OEI{}T1q4J7`UlSM2*4yn zk-Yd z>&KRpf3#^7o2~|p2?XTA{}~W13II`nZ@$~~JFOo*7GUEdOa8g*4?Sx&TH1Ub6iQf!FenJbpagz$m~IP`^;>eSV+-Pe%a*0FVCt0`Lg> zX~^GWfxx1`J=$NQ>wsnGfOr7)XMw-}=-&c^0(VS*f!ap=0R6o||KE30fuVtWVZWf4 zBmX1lUwtxQXy9(hFKD*tKS2L(!yl9MpY7>iXdoc%F(4qot!rR5|7@)ME}a?woAh5z l7hrMVI_DR_%cTFon1AIcIH0WhUUH&<$N Date: Thu, 21 Dec 2023 12:26:52 +0530 Subject: [PATCH 1216/1242] delete --- jenkins/archiver.groovy | 9 - jenkins/code_builder.groovy | 17 - jenkins/image_builder.groovy | 31 - jenkins/notifier.groovy | 30 - rainmaker-custom-service/.dockerignore | 1 - rainmaker-custom-service/.gitignore | 3 - rainmaker-custom-service/Dockerfile | 8 - rainmaker-custom-service/bnd.js | 15 - rainmaker-custom-service/build.wkflo | 9 - rainmaker-custom-service/encrypt.js | 41 - rainmaker-custom-service/index.js | 1136 -------- rainmaker-custom-service/package.json | 23 - rainmaker-custom-service/static/css/bnd.css | 137 - rainmaker-custom-service/static/js/bnd.js | 128 - .../templates/apicall.html | 45 - .../templates/bndlogin.html | 32 - .../templates/common/footer.html | 2 - .../templates/common/header.html | 13 - .../templates/common/scripts.html | 4 - .../utils/asyncMiddleware.js | 9 - rainmaker-custom-service/yarn.lock | 2297 ----------------- services/.gitignore | 6 - .../rainmaker-custom-service/.dockerignore | 1 - services/rainmaker-custom-service/.gitignore | 2 - services/rainmaker-custom-service/Dockerfile | 9 - services/rainmaker-custom-service/bnd.js | 15 - services/rainmaker-custom-service/build.wkflo | 9 - services/rainmaker-custom-service/encrypt.js | 41 - services/rainmaker-custom-service/index.js | 581 ----- .../rainmaker-custom-service/package.json | 22 - .../static/css/bnd.css | 137 - .../rainmaker-custom-service/static/js/bnd.js | 128 - .../templates/apicall.html | 45 - .../templates/bndlogin.html | 32 - .../templates/common/footer.html | 2 - .../templates/common/header.html | 13 - .../templates/common/scripts.html | 4 - .../utils/asyncMiddleware.js | 9 - services/rainmaker-custom-service/yarn.lock | 2297 ----------------- static/js/ulb-override.js | 100 - 40 files changed, 7443 deletions(-) delete mode 100644 jenkins/archiver.groovy delete mode 100644 jenkins/code_builder.groovy delete mode 100644 jenkins/image_builder.groovy delete mode 100644 jenkins/notifier.groovy delete mode 100644 rainmaker-custom-service/.dockerignore delete mode 100644 rainmaker-custom-service/.gitignore delete mode 100644 rainmaker-custom-service/Dockerfile delete mode 100644 rainmaker-custom-service/bnd.js delete mode 100644 rainmaker-custom-service/build.wkflo delete mode 100644 rainmaker-custom-service/encrypt.js delete mode 100644 rainmaker-custom-service/index.js delete mode 100644 rainmaker-custom-service/package.json delete mode 100644 rainmaker-custom-service/static/css/bnd.css delete mode 100644 rainmaker-custom-service/static/js/bnd.js delete mode 100644 rainmaker-custom-service/templates/apicall.html delete mode 100644 rainmaker-custom-service/templates/bndlogin.html delete mode 100644 rainmaker-custom-service/templates/common/footer.html delete mode 100644 rainmaker-custom-service/templates/common/header.html delete mode 100644 rainmaker-custom-service/templates/common/scripts.html delete mode 100644 rainmaker-custom-service/utils/asyncMiddleware.js delete mode 100644 rainmaker-custom-service/yarn.lock delete mode 100644 services/.gitignore delete mode 100644 services/rainmaker-custom-service/.dockerignore delete mode 100644 services/rainmaker-custom-service/.gitignore delete mode 100644 services/rainmaker-custom-service/Dockerfile delete mode 100644 services/rainmaker-custom-service/bnd.js delete mode 100644 services/rainmaker-custom-service/build.wkflo delete mode 100644 services/rainmaker-custom-service/encrypt.js delete mode 100644 services/rainmaker-custom-service/index.js delete mode 100644 services/rainmaker-custom-service/package.json delete mode 100644 services/rainmaker-custom-service/static/css/bnd.css delete mode 100644 services/rainmaker-custom-service/static/js/bnd.js delete mode 100644 services/rainmaker-custom-service/templates/apicall.html delete mode 100644 services/rainmaker-custom-service/templates/bndlogin.html delete mode 100644 services/rainmaker-custom-service/templates/common/footer.html delete mode 100644 services/rainmaker-custom-service/templates/common/header.html delete mode 100644 services/rainmaker-custom-service/templates/common/scripts.html delete mode 100644 services/rainmaker-custom-service/utils/asyncMiddleware.js delete mode 100644 services/rainmaker-custom-service/yarn.lock delete mode 100644 static/js/ulb-override.js diff --git a/jenkins/archiver.groovy b/jenkins/archiver.groovy deleted file mode 100644 index 2ecdaf2e..00000000 --- a/jenkins/archiver.groovy +++ /dev/null @@ -1,9 +0,0 @@ -def archiveArtifacts(artifacts){ - stage("Archive Results") { - for (artifact in artifacts) { - archive "${artifact}" - } - } -} - -return this; diff --git a/jenkins/code_builder.groovy b/jenkins/code_builder.groovy deleted file mode 100644 index a17c2ae4..00000000 --- a/jenkins/code_builder.groovy +++ /dev/null @@ -1,17 +0,0 @@ -def build(path, ci_image){ - def build_workflow_exists = fileExists("${path}/build.wkflo"); - if (build_workflow_exists) { - build_wkflo = load("${path}/build.wkflo") - build_wkflo.build(path, ci_image) - } else { - defaultMavenBuild(path, ci_image) - } -} - -def defaultMavenBuild(path, ci_image){ - stage("Build"){ - sh "./build.sh ${path}" - } -} - -return this; diff --git a/jenkins/image_builder.groovy b/jenkins/image_builder.groovy deleted file mode 100644 index 984cc136..00000000 --- a/jenkins/image_builder.groovy +++ /dev/null @@ -1,31 +0,0 @@ -def build(module_name, service_name, commit_id){ - stage("Build docker image") { - build_image("${module_name}/${service_name}", "egovio/${service_name}", commit_id) - - def migration_exists = fileExists "${module_name}/${service_name}/src/main/resources/db/Dockerfile" - if (migration_exists) { - build_image("${module_name}/${service_name}/src/main/resources/db", "egovio/${service_name}-db", commit_id) - } - } -} - -def build_image(dockerfile_path, image_name, commit_id){ - sh "cd ${dockerfile_path} && docker build --no-cache -t ${image_name} ." - sh "docker tag ${image_name} ${image_name}:${BUILD_ID}-${commit_id}" - sh "docker tag ${image_name} ${image_name}:latest" -} - -def publish(service_name, commit_id){ - stage("Publish docker image") { - sh "docker images | grep egovio/${service_name} | awk '{b=\$1\":\"\$2; print b}' | while read x; do docker push \$x; done" - } -} - - -def clean(service_name, commit_id){ - stage("Clean docker image and unused volumes") { - sh "docker images | grep egovio/${service_name} | awk '{b=\$1\":\"\$2; print b}' | while read x; do docker rmi \$x; done" - } -} - -return this; diff --git a/jenkins/notifier.groovy b/jenkins/notifier.groovy deleted file mode 100644 index ba0eecee..00000000 --- a/jenkins/notifier.groovy +++ /dev/null @@ -1,30 +0,0 @@ -def notifyBuild(buildStatus = 'STARTED') { - buildStatus = buildStatus ?: 'SUCCESSFUL' - def BUILD_STATUS = buildStatus - def colorName = 'RED' - def colorCode = '#FF0000' - def subject = "${buildStatus}: Job ${env.JOB_NAME} #${env.BUILD_NUMBER}" - def summary = "${subject} (${env.BUILD_URL})" - - if (buildStatus == 'STARTED') { - color = 'YELLOW' - colorCode = '#FFFF00' - } else if (buildStatus == 'SUCCESSFUL') { - color = 'GREEN' - colorCode = '#00FF00' - } else { - color = 'RED' - colorCode = '#FF0000' - } - - slackSend (color: colorCode, message: summary) - emailext ( - body: '${JELLY_SCRIPT, template="html_gmail"}', - recipientProviders: [[$class: 'CulpritsRecipientProvider'], [$class: 'DevelopersRecipientProvider'], [$class: 'RequesterRecipientProvider']], - replyTo: '$DEFAULT_REPLYTO', - subject: subject, - to: '$DEFAULT_RECIPIENTS' - ) -} - -return this; diff --git a/rainmaker-custom-service/.dockerignore b/rainmaker-custom-service/.dockerignore deleted file mode 100644 index 3c3629e6..00000000 --- a/rainmaker-custom-service/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -node_modules diff --git a/rainmaker-custom-service/.gitignore b/rainmaker-custom-service/.gitignore deleted file mode 100644 index 6cacf563..00000000 --- a/rainmaker-custom-service/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -sampleRequest.js -nodemon.json -.vscode diff --git a/rainmaker-custom-service/Dockerfile b/rainmaker-custom-service/Dockerfile deleted file mode 100644 index 37c7dacd..00000000 --- a/rainmaker-custom-service/Dockerfile +++ /dev/null @@ -1,8 +0,0 @@ -FROM egovio/alpine-node-builder-10:yarn AS build -RUN mkdir /opt/app -COPY package.json yarn.lock /opt/app/ -WORKDIR /opt/app -RUN yarn install -COPY . /opt/app -CMD ["node", "index.js"] - diff --git a/rainmaker-custom-service/bnd.js b/rainmaker-custom-service/bnd.js deleted file mode 100644 index 3514c63d..00000000 --- a/rainmaker-custom-service/bnd.js +++ /dev/null @@ -1,15 +0,0 @@ -let requests = require("request") - -requests.post("http://13.126.198.70/eDistServices/ModuleCommon/serAuth.asmx/serAuthExternalUser", - { - form: { - username: "eomcbrn", - password: "esewa@123" - }, - headers: { - "x-api-key": "Tw0AxM3kyV3mb8SM" - } - } -,function(a,b,c) { - console.log(a,c); -}) \ No newline at end of file diff --git a/rainmaker-custom-service/build.wkflo b/rainmaker-custom-service/build.wkflo deleted file mode 100644 index 95cba3d1..00000000 --- a/rainmaker-custom-service/build.wkflo +++ /dev/null @@ -1,9 +0,0 @@ -def build(path, ci_image) { - stage("Build") { - docker.image("egovio/ci-react:v8.4.0").inside { - sh "cd ${path}/ && rm -rf node_modules"; - } - } -} - -return this; diff --git a/rainmaker-custom-service/encrypt.js b/rainmaker-custom-service/encrypt.js deleted file mode 100644 index 130ba4c9..00000000 --- a/rainmaker-custom-service/encrypt.js +++ /dev/null @@ -1,41 +0,0 @@ -const ENCRYPTION_KEY = process.env.ENCRYPTION_KEY -const ENCRYPTION_IV = process.env.ENCRYPTION_IV -const JWT_KEY = process.env.JWT_KEY -const JWT_EXPIRY = process.env.JWT_EXPIRY || '5min' -const DEBUG_MODE = Boolean(process.env.DEBUG_MODE) || false; - -function log(val) { - if (DEBUG_MODE) { - console.log(val) - } -} - -log ("EK=" + ENCRYPTION_KEY) -log ("EI=" + ENCRYPTION_IV) - -var encrypt = function (pass) { - // Include Library - var crypto = require('crypto'); - - // Declare Key and Block - var key = ENCRYPTION_KEY; - var iv = ENCRYPTION_IV; - - // Calc Cipher - var cipher = crypto.createCipheriv('aes256', key, iv) - var crypted = cipher.update(pass, 'utf8', 'base64') - crypted += cipher.final('base64'); - - // Return Cipher Text - return crypted; -} - - -var jwt = require("jsonwebtoken"); - -jwt_sign = (data) => jwt.sign(data, JWT_KEY, { expiresIn: JWT_EXPIRY }); - -module.exports = { - jwt_sign, - encrypt -} \ No newline at end of file diff --git a/rainmaker-custom-service/index.js b/rainmaker-custom-service/index.js deleted file mode 100644 index a77c07f9..00000000 --- a/rainmaker-custom-service/index.js +++ /dev/null @@ -1,1136 +0,0 @@ -var express = require('express'), - slash = require('express-slash'); -var bodyParser = require('body-parser') -var url = require("url"); -var request = require('request-promise'); -const { - asyncMiddleware -} = require('./utils/asyncMiddleware'); - -var app = express(); -var mustache = require('mustache-express') -const Cryptr = require('cryptr'); -var { - encrypt, - jwt_sign -} = require('./encrypt') - -app.use(require('morgan')('dev')); - -app.engine('html', mustache()) -app.set('view engine', 'html') -app.set('views', __dirname + '/templates') -app.disable('view cache'); - -// https://codepen.io/graphicfreedom/pen/evaBXm - -const DEBUG_MODE = Boolean(process.env.DEBUG_MODE) || false; -const PT_DEMAND_HOST = process.env.PT_DEMAND_HOST - -const PT_ZERO_ASSESSMENTYEAR = process.env.PT_ZERO_ASSESSMENTYEAR || "2013-14"; -const PT_ZERO_TENANTS = (process.env.PT_ZERO_TENANTS || "pb.testing").split(","); - -// -const PT_INTEGRATION_ASSESSMENTYEAR =process.env.PT_INTEGRATION_ASSESSMENTYEAR || "2013-14" -const PT_INTEGRATION_TENANTS = (process.env.PT_INTEGRATION_TENANTS || "pb.testing").split(","); - -const PT_INTEGRATION_HOST = process.env.PT_INTEGRATION_HOST -const PT_CALCULATOR_V2_HOST = process.env.PT_CALCULATOR_V2_HOST - -// - -const PT_ENABLE_FC_CALC = Boolean(process.env.PT_ENABLE_FC_CALC || false); -const EGOV_MDMS_HOST = process.env.EGOV_MDMS_HOST -const EGOV_BND_LOGIN_URL = process.env.EGOV_BND_LOGIN_URL -const EGOV_BND_REDIRECT_URL = process.env.EGOV_BND_REDIRECT_URL -// const EGOV_BND_API_KEY = process.env.EGOV_BND_API_KEY -const EGOV_BND_ENCRYPTION_KEY = process.env.EGOV_BND_ENCRYPTION_KEY || "Vol0otuji0X03wSuZGI3zySUzxj7bReQ" - -function log(val) { - if (DEBUG_MODE) { - console.log(val) - } -} - -log("ENCKEY=" + EGOV_BND_ENCRYPTION_KEY) - -const cryptr = new Cryptr(EGOV_BND_ENCRYPTION_KEY); - - -function getUserUUID(data) { - return data.RequestInfo.userInfo.uuid; -} - -function isCitizen(data) { - return data.RequestInfo.userInfo.roles.filter(role => role.code.toUpperCase() == "CITIZEN").length > 0 -} - -function getUserID(data) { - return data.RequestInfo.userInfo.id; -} - -function getIntegrateYearDemand(demands){ - for(demand of demands["Demands"]){ - let demandYear = new Date(demand["taxPeriodFrom"]).getFullYear(); - let integrationYear = PT_INTEGRATION_ASSESSMENTYEAR.split("-")[0]; - let demandStatus = demand["status"] - - log("getIntegrateYearDemand> Demand year: "+ demandYear+" Integrated Year: "+integrationYear+" Demand Status: "+demandStatus); - - if((demandYear == integrationYear) && (demandStatus == "ACTIVE")){ - demands["Demands"] = [demand]; - break; - } - - } - - log("Response from getIntegrateYearDemand: "+ JSON.stringify(demands)); - - return demands; -} - -function isValidDemand(demands){ - let count = 0; - for(demand of demands["Demands"]){ - demandYear = new Date(demand["taxPeriodFrom"]).getFullYear() - integrationYear = PT_INTEGRATION_ASSESSMENTYEAR.split("-")[0] - demandStatus = demand["status"] - if((demandYear == integrationYear) && (demandStatus == "ACTIVE")){ - count++; - } - } - - return count == 1; -} - -function isReceiptGenerated(demand){ - for (demandDetail of demand["Demands"][0]["demandDetails"]) - { - if(demandDetail.collectionAmount || 0 > 0){ - return true; - } - } - return false; -} - -async function getFireCessConfig(tenantId) { - let fireCessConfig = await request.post({ - url: url.resolve(EGOV_MDMS_HOST, "/egov-mdms-service/v1/_search?tenantId=" + tenantId), - body: { - RequestInfo: { - "apiId": "Rainmaker-custom-service", - "ver": ".01", - "ts": "", - "action": "_search", - "did": "1", - "key": "", - "msgId": "20170310130900|en_IN", - "authToken": null - }, - "MdmsCriteria": { - "tenantId": tenantId, - "moduleDetails": [{ - "moduleName": "PropertyTax", - "masterDetails": [{ - "name": "FireCess" - }] - }] - } - }, - json: true - }) - - return fireCessConfig["MdmsRes"]["PropertyTax"]["FireCess"][0]; -} - -const TAX_TYPE = { - PT_TAX: false, - PT_TIME_REBATE: true, - PT_UNIT_USAGE_EXEMPTION: true, - PT_TIME_PENALTY: false, - PT_CANCER_CESS: false, - PT_ADHOC_PENALTY: false, - PT_ADHOC_REBATE: true, - PT_DECIMAL_CEILING_CREDIT: false, - PT_DECIMAL_CEILING_DEBIT: true, - PT_FIRE_CESS: false, - PT_OWNER_EXEMPTION: true, - PT_TIME_INTEREST: false -} - -if (PT_DEMAND_HOST === undefined) { - throw Error("PT_DEMAND_HOST environment variable needs to be configured to run this") -} - -if (PT_CALCULATOR_V2_HOST === undefined) { - throw Error("PT_CALCULATOR_V2_HOST environment variable needs to be configured to run this") -} - -function round(num, digits) { - return parseFloat(parseFloat(num).toFixed(digits)) -} - -// parse application/x-www-form-urlencoded -app.use(bodyParser.urlencoded({ - extended: true -})) - -// parse application/json -app.use(bodyParser.json()) - -// Because you're the type of developer who cares about this sort of thing! -app.enable('strict routing'); - -// Create the router using the same routing options as the app. -var router = express.Router({ - caseSensitive: app.get('case sensitive routing'), - strict: app.get('strict routing') -}); - -router.use("/static", express.static("static")) - -// Add the `slash()` middleware after your app's `router`, optionally specify -// an HTTP status code to use when redirecting (defaults to 301). -app.use('/customization', router); -// app.use(slash()); -app.use(express.json()); - -var promise = require('bluebird'); - -var options = { - // Initialization Options - promiseLib: promise -}; - -var pgp = require('pg-promise')(options); - -const connectionString = { - host: process.env.DB_HOST || 'localhost', - port: 5432, - database: process.env.DB_NAME || 'postgres', - user: process.env.DB_USER || 'postgres', - password: process.env.DB_PASSWORD || 'postgres' -}; - -// var connectionString = 'postgres://localhost:5432/egov_prod_db'; -var db = pgp(connectionString); -var path = require('path'); - -query = `SELECT servicerequestid as complaint_no, servicecode as complaint_type, eg_user.name as citizen_name, eg_user.mobilenumber as citizen_mobile, address, landmark, description as details -FROM eg_pgr_service INNER JOIN eg_user ON eg_pgr_service.accountid = cast(eg_user.id as varchar) -WHERE eg_pgr_service.status = 'assigned' AND servicerequestid IN (select DISTINCT businesskey from eg_pgr_action where status = 'assigned' AND "when" -IN (select max("when") from eg_pgr_action where assignee NOTNULL group by businesskey) AND assignee = $1);` - -router.get('/open/reports/*', function (req, res) { - res.render('apicall.html'); -}); - -router.get('/open/bndlogin', function (req, res) { - res.render('bndlogin.html'); -}); - -router.post('/protected/bndlogin/unlinkAccount', asyncMiddleware(async function (req, res) { - let uuid = getUserUUID(req.body); - - data = await db.any("DELETE FROM custom_eg_user_metatdata where user_id = $1 and key = $2", [uuid, 'BND_CREDENTIALS']); - res.status(200).send({}) -})); - -router.post('/protected/bndlogin/linkAccount', asyncMiddleware(async function (req, res) { - let username = req.body.username - let password = req.body.password - let uuid = getUserUUID(req.body); - let payload = { - Username: username, - Password: encrypt(password) - } - - log("inside linkAccount") - log(payload) - - let response = await request.post(EGOV_BND_LOGIN_URL, { - json: payload - }) - - log(response) - - if (response.sys_message && response.sys_message == 'Invalid User and Password') { - res.status(200).send({ - code: "INVALID_CREDENTIALS", - message: "Invalid User and Password" - }) - return - } else if (response.sys_message && response.sys_message == 'INTERNAL APPLICATION ERROR') { - res.status(200).send({ - code: "ERROR", - message: "Something went wrong" - }) - return - } - - loginID = response["data"][0]["loginID"]; - data = await db.any("select value from custom_eg_user_metatdata where user_id = $1 and key = $2", [uuid, 'BND_CREDENTIALS']); - value = { - username, - GUID: cryptr.encrypt(loginID) - } - - if (data.length == 0) { - await db.any("insert into custom_eg_user_metatdata(key, user_id, value) values ($1, $2, $3:json)", - ['BND_CREDENTIALS', uuid, value]) - } else { - await db.any("update custom_eg_user_metatdata set value = $3:json where key = $1 and user_id = $2", - ['BND_CREDENTIALS', uuid, value]) - } - res.json({ - code: "SUCCESS", - redirect: EGOV_BND_REDIRECT_URL + jwt_sign({ - loginID: encrypt(loginID) - }) - }) -})); - -router.post('/protected/bndlogin', asyncMiddleware(async function (req, res) { - try { - let uuid = getUserUUID(req.body); - data = await db.any("select value from custom_eg_user_metatdata where user_id = $1 and key = $2", [uuid, 'BND_CREDENTIALS']); - - if (data.length == 0) { - res.json({ - "code": "NO_CREDENTIAL_MAPPING", - "message": "Please update your Birth and Death credentials" - }) - return - } - - let loginID = cryptr.decrypt(data[0]["value"]["GUID"]) - - res.json({ - code: "SUCCESS", - redirect: EGOV_BND_REDIRECT_URL + jwt_sign({ - loginID: encrypt(loginID) - }) - }) - - } catch (ex) { - console.log("Exception occured while login", ex) - res.json({ - "code": "ERROR", - "message": "Failed to login to BND - " + ex.toString() - }) - } - -})); - -// function getFireCessPercentage(propertyDetails, fireCessConfig) { -// // let propertyDetails = request["CalculationCriteria"][0]["propertyDetails"][0] - -// let propertyUsageCategoryMajor = propertyDetails["usageCategoryMajor"] -// let units = propertyDetails["units"] -// let propertyAttributes = propertyDetails["additionalDetails"] -// let unitSet = new Set() - -// for (unit of units) { -// unitSet.add(unit["usageCategoryMajor"]) -// } -// let firecess_category_major = 0; -// let firecess_building_height = 0; -// let firecess_inflammable = 0; - -// if (propertyUsageCategoryMajor == "RESIDENTIAL" || (unitSet.size == 1 && unitSet.has("RESIDENTIAL"))) { -// // There is no category major firecess applicable as it i -// firecess_category_major = 0 -// } else { -// firecess_category_major = fireCessConfig.dynamicRates.firecess_category_major; -// } - -// if (propertyAttributes && -// propertyAttributes.heightAbove36Feet && -// propertyAttributes.heightAbove36Feet.toString() == "true") { -// // height is above 36 feet -// firecess_building_height = fireCessConfig.dynamicRates.firecess_building_height; -// } - -// if (propertyAttributes && -// propertyAttributes.inflammable && -// propertyAttributes.inflammable.toString() == "true") { -// // height is above 36 feet -// firecess_inflammable = fireCessConfig.dynamicRates.firecess_inflammable; -// } - -// return { -// firecess_inflammable, -// firecess_building_height, -// firecess_category_major, -// firecess: firecess_category_major + firecess_building_height + firecess_inflammable -// } -// } - -// function calculateNewFireCess(taxHeads, firecess_percent, taxField, taxHeadCodeField) { - -// let applicablePropertyTax = 0 -// for (taxHead of taxHeads) { -// if (taxHead[taxHeadCodeField] == "PT_TAX") { -// applicablePropertyTax += taxHead[taxField] -// } else if (taxHead[taxHeadCodeField] == "PT_UNIT_USAGE_EXEMPTION") { -// applicablePropertyTax += taxHead[taxField] -// } else if (taxHead[taxHeadCodeField] == "PT_OWNER_EXEMPTION") { -// applicablePropertyTax += taxHead[taxField] -// } -// } - -// return round(applicablePropertyTax * (firecess_percent / 100), 2); -// } - -async function findDemandForConsumerCode(consumerCode, tenantId, service, RequestInfo) { - - log("Got Request to Find Demand for Comsumer code: "+consumerCode+" tenantid : "+tenantId+" Service : "+service); - let fromDate = 1364774400000 - let toDate = 1396310399000 - let status = "ACTIVE" - let demandSearchResponse = await request.post({ - url: url.resolve(PT_DEMAND_HOST, "/billing-service/demand/_search?tenantId=" + tenantId + - "&consumerCode=" + consumerCode + "&businessService=" + service + "&periodFrom=" + fromDate + - "&periodTo=" + toDate + "&status=" + status), - body: { - RequestInfo - }, - json: true - }) - - log("Got response from demand search : "+ JSON.stringify(demandSearchResponse)); - - return demandSearchResponse; -} - - - -async function updateDemand(demands, RequestInfo) { - let demandUpdateResponse = await request.post({ - url: url.resolve(PT_DEMAND_HOST, "/billing-service/demand/_update"), - body: { - RequestInfo, - "Demands": demands - }, - json: true - }) - - return demandUpdateResponse; -} - -async function getOldRequestBody(requestBody) { - log("Translate Call for Property: "+ JSON.stringify(requestBody)); - let CalculationCriteria = await request.post({ - url: url.resolve(PT_CALCULATOR_V2_HOST, "/pt-calculator-v2/propertytax/v2/_translate"), - body: requestBody, - json: true - }) - - log("Response from Translate API: " +JSON.stringify(CalculationCriteria)); - - return CalculationCriteria; -} - -async function findEstimate(requestBody){ - - log("Got Request to find estimate : "+ JSON.stringify(requestBody)) - - let estimateRes = await request.post({ - url: url.resolve(PT_CALCULATOR_V2_HOST, "/pt-calculator-v2/propertytax/v2/_estimate"), - body: requestBody, - json: true - }) - - log("Got response from estimate : "+ JSON.stringify(estimateRes)); - - return estimateRes; -} -// function _estimateTaxProcessor(request, response, fireCessConfig) { -// response = _estimateZeroTaxProcessor(request, response); - -// let index = 0; -// for (let calc of request["CalculationCriteria"]) { -// let fireCessPercentage = getFireCessPercentage(calc["property"]["propertyDetails"][0], fireCessConfig) - -// let updateFirecessAmount = calculateNewFireCess(response["Calculation"][0]["taxHeadEstimates"], fireCessPercentage.firecess, "estimateAmount", "taxHeadCode") -// let taxes = getUpdateTaxSummary(response["Calculation"][index], updateFirecessAmount, "taxHeadCode", "estimateAmount") - -// response["Calculation"][index]["totalAmount"] = taxes.totalAmount -// response["Calculation"][index]["taxAmount"] = round(taxes.taxAmount, 2) -// response["Calculation"][index]["rebate"] = taxes.rebate - -// index++ -// } - -// return response; -// } - - -async function _estimateIntegrationTaxProcessor(req1, res1) { - - log("Calling PMIDC estimate API: "+ JSON.stringify(res1) ) - - let estimate = await request.post({ - url: url.resolve(PT_INTEGRATION_HOST, "/apt_estimate_pt_2013/api_estimate_pt_2013"), - body: {request:req1, response:res1}, - json: true - }) - - log("Got response from PMIDC estimate API: " + JSON.stringify(estimate)) - - return estimate; -} - - - -function _estimateZeroTaxProcessor(request, response) { - let index = 0; - console.log("Request:",request, "Response:", response ); - - console.log("request[CalculationCriteria]:", request["CalculationCriteria"]) - - for (let calc of response["Calculation"]) { - console.log("Response Calculation:", calc ); - - let assessmentYear = request["CalculationCriteria"][index]["assessmentYear"] - let tenantId = request["CalculationCriteria"][index]["tenantId"] - let newTotal = 0; - - if (isCitizen(request) && assessmentYear == PT_ZERO_ASSESSMENTYEAR) { - - data = - { - "ResponseInfo":null, - "Errors":[ - { - "code":"CitizenOnlineNotAllowed", - "message":"Sorry but online assessment for " + PT_ZERO_ASSESSMENTYEAR + " is not allowed. Please make the payment at the counter", - "description": "Sorry but online assessment for " + PT_ZERO_ASSESSMENTYEAR + " is not allowed. Please make the payment at the counter", - "params":null - } - ] - } - return data; - - } - - if (!(assessmentYear == PT_ZERO_ASSESSMENTYEAR && PT_ZERO_TENANTS.indexOf(tenantId) >= 0)) - continue - - let taxHeads = calc["taxHeadEstimates"]; - - for (taxHead of taxHeads) { - if (taxHead.taxHeadCode != "PT_ADHOC_PENALTY" && taxHead.taxHeadCode != 'PT_ADVANCE_CARRYFORWARD') { - taxHead.estimateAmount = 0 - } else if (taxHead.taxHeadCode == 'PT_ADVANCE_CARRYFORWARD') { - newTotal += taxHead.estimateAmount - } else { - newTotal += taxHead.estimateAmount - } - } - - calc["totalAmount"] = newTotal - calc["taxAmount"] = 0 - calc["rebate"] = 0 - calc["penalty"] = newTotal - calc["exemption"] = 0 - - index++ - } - - return response; -} - - -// function getUpdateTaxSummary(calculation, newTaxAmount, taxHeadCodeField, taxAmountField) { -// let ceilingTaxHead = null; -// let firecessTaxHead = null; - -// let taxAmount = 0, -// penalty = 0, -// rebate = 0, -// exemption = 0 -// let taxHeads = calculation["taxHeadEstimates"] -// for (taxHead of taxHeads) { -// if (taxHead[taxHeadCodeField] == "PT_FIRE_CESS") { -// let existingTaxAmount = taxHead[taxAmountField] -// taxHead[taxAmountField] = newTaxAmount -// firecessTaxHead = taxHead -// taxAmount += newTaxAmount -// if (DEBUG_MODE) { -// taxHead.oldEstimateAmount = existingTaxAmount -// } -// } else { -// switch (taxHead[taxHeadCodeField]) { -// case "PT_DECIMAL_CEILING_CREDIT": -// case "PT_DECIMAL_CEILING_DEBIT": -// case "PT_ROUNDOFF": -// ceilingTaxHead = taxHead -// break -// case "PT_ADVANCE_CARRYFORWARD": -// exemption += taxHead[taxAmountField] -// break -// default: -// switch (taxHead.category) { -// case "PENALTY": -// penalty += taxHead[taxAmountField] -// break -// case "TAX": -// taxAmount += taxHead[taxAmountField] -// break -// case "REBATE": -// rebate += taxHead[taxAmountField] -// break -// case "EXEMPTION": -// exemption += taxHead[taxAmountField] -// break -// default: -// console.log("Going to default for taxHead", taxHead) -// taxAmount += taxHead[taxAmountField] -// } - -// } -// } -// } - -// taxAmount = round(taxAmount, 2) -// penalty = round(penalty, 2) -// exemption = round(exemption, 2) -// rebate = round(rebate, 2) - -// let totalAmount = taxAmount + penalty - rebate - exemption - -// totalAmount = round(totalAmount, 2) -// let fractionAmount = totalAmount - Math.trunc(totalAmount) -// let newCeilingTax = false - -// if (ceilingTaxHead == null && fractionAmount == 0) { - -// } else { -// let ceilingDelta = 0.0; - -// if (ceilingTaxHead == null) { -// ceilingTaxHead = { -// taxHeadCode: "", -// estimateAmount: 0, -// category: null -// } -// newCeilingTax = true -// taxHeads.push(ceilingTaxHead) -// } - -// if (fractionAmount < 0.5) { -// ceilingDelta = parseFloat(fractionAmount.toFixed(2)) -// totalAmount = Math.trunc(totalAmount) -// ceilingTaxHead[taxHeadCodeField] = "PT_ROUNDOFF" -// ceilingTaxHead[taxAmountField] = -ceilingDelta -// rebate += ceilingDelta -// } else { -// ceilingDelta = parseFloat((1 - fractionAmount).toFixed(2)) - -// totalAmount = Math.trunc(totalAmount) + 1 -// ceilingTaxHead[taxHeadCodeField] = "PT_ROUNDOFF" -// ceilingTaxHead[taxAmountField] = ceilingDelta -// taxAmount += ceilingDelta -// } -// } - -// return { -// taxHeads, -// rebate, -// totalAmount, -// taxAmount, -// newCeilingTax, -// ceilingTaxHead, -// firecessTaxHead -// } -// } - -async function _createAndUpdateZeroTaxProcessor(request, response) { - console.log("Entered in to _createAndUpdateZeroTaxProcessor======"); - console.log("Request:", request); - console.log("Response:", response); - let index = 0 - - for (reqProperty of response["Assessments"]) { - - let resProperty = response["Assessments"][index] - let propertyId = resProperty["propertyId"] - let assessmentNumber = resProperty["assessmentNumber"] - - let assessmentYear = resProperty["financialYear"] - let tenantId = reqProperty["tenantId"] - - // for (reqProperty of request["Properties"]) { - - // let resProperty = response["Properties"][index] - // let propertyId = resProperty["propertyId"] - - // let assessmentNumber = resProperty["propertyDetails"][0]["assessmentNumber"] - - // let assessmentYear = resProperty["propertyDetails"][0]["financialYear"] - // let tenantId = reqProperty["tenantId"] - - if (isCitizen(request) && assessmentYear === PT_ZERO_ASSESSMENTYEAR) { - data = - { - "ResponseInfo":null, - "Errors":[ - { - "code":"CitizenOnlineNotAllowed", - "message":"Sorry but online assessment for " + PT_ZERO_ASSESSMENTYEAR + " is not allowed. Please make the payment at the counter", - "description": "Sorry but online assessment for " + PT_ZERO_ASSESSMENTYEAR + " is not allowed. Please make the payment at the counter", - "params":null - } - ] - }; - return data; - } - - if (!(assessmentYear == PT_ZERO_ASSESSMENTYEAR && PT_ZERO_TENANTS.indexOf(tenantId) >= 0)) - continue - - request_info = request["RequestInfo"] || request["requestInfo"] - - let consumerCode = propertyId - let service = "PT" - // let calc = response["Properties"][index]["propertyDetails"][0]["calculation"] - - let newTotal = 0; - - let demandSearchResponse = await findDemandForConsumerCode(consumerCode, tenantId, service, request["RequestInfo"]) - - for (demandDetail of demandSearchResponse["Demands"][0]["demandDetails"]) { - if (demandDetail.taxHeadMasterCode != "PT_ADHOC_PENALTY" && demandDetail.taxHeadMasterCode != 'PT_ADVANCE_CARRYFORWARD') { - demandDetail.taxAmount = 0 - } else if (demandDetail.taxHeadMasterCode == 'PT_ADVANCE_CARRYFORWARD') { - newTotal += demandDetail.taxAmount - } else { - newTotal += demandDetail.taxAmount - } - } - - /*let taxHeads = calc["taxHeadEstimates"]; - - for (taxHead of taxHeads) { - if (taxHead.taxHeadCode != "PT_ADHOC_PENALTY" && taxHead.taxHeadCode == 'PT_ADVANCE_CARRYFORWARD') { - taxHead.estimateAmount = 0 - } - }*/ - let demandUpdateResponse = await updateDemand(demandSearchResponse["Demands"], request["RequestInfo"]) - - /* calc["taxAmount"] = 0; - calc["exemption"] = 0; - calc["totalAmount"] = newTotal; - calc["rebate"] = 0 - calc["penanlty"] = newTotal*/ - index++ - } - - return response; -} - -async function _createAndUpdateIntegrationTaxProcessor(req, response){ - - console.log("REQ : ", JSON.stringify(req)) - console.log("RESPONSE : ", JSON.stringify(response)) - - let reqProperty = req["Assessment"]; - - let propertyId = reqProperty["propertyId"] - - let assessmentYear = reqProperty["financialYear"] - let tenantId = reqProperty["tenantId"] - - if (!(assessmentYear == PT_INTEGRATION_ASSESSMENTYEAR && PT_INTEGRATION_TENANTS.indexOf(tenantId) >= 0)) - return response; - - let oldRequestbody = await getOldRequestBody(req) - - oldRequestbody["CalculationCriteria"][0]["assessmentYear"] = assessmentYear; - // assessmentYear field was there in old request body but not present in new request body Without this field we will get null pointer exception. - - log("Got Assessment CREATE/ UPDATE request for tenantid: "+tenantId+" and finanancial year: "+assessmentYear) - log("Assessment CREATE/ UPDATE Request body: "+ JSON.stringify(reqProperty) ) - - let estimateResponseBody = await findEstimate(req) - console.log("After Getting Response from entimate sending it to PMIDC TO get the Estimate Response") - let estimateResponse = await _estimateIntegrationTaxProcessor(oldRequestbody, estimateResponseBody) - - - - request_info = req["RequestInfo"] || req["requestInfo"] - - let consumerCode = propertyId - let service = "PT" - let calc = estimateResponse["Calculation"][0] - let taxHeads = calc["taxHeadEstimates"]; - let createTaxHeadsArray = {}; - let TaxHeadsType= {}; //Collecting All the Tax head coming from PMIDC - - for(taxHead of taxHeads){ - createTaxHeadsArray[taxHead.taxHeadCode] = taxHead.estimateAmount; - TaxHeadsType[taxHead.taxHeadCode] = taxHead.estimateAmount; - //print(texthead) - console.log(taxHead.taxHeadCode , ": ", taxHead.estimateAmount) - } - - let demandSearchResponse = await findDemandForConsumerCode(consumerCode, tenantId, service, req["RequestInfo"]) - - if( !isValidDemand(demandSearchResponse)){ - //Throw Error - data = - { - "ResponseInfo":null, - "Errors":[ - { - "code":"MultipleActiveDemandForOneFinancialYear", - "message":"There are multiple demand for property id : "+ propertyId +" for financial year" + PT_INTEGRATION_ASSESSMENTYEAR, - "description": "There multiple demand for property id : "+ propertyId +" for financial year" + PT_INTEGRATION_ASSESSMENTYEAR, - "params":null - } - ] - }; - return data; - } - - demandSearchResponse = getIntegrateYearDemand(demandSearchResponse) - - log("Search Demand response For Integrated Year: " + JSON.stringify(demandSearchResponse)) - - if(isReceiptGenerated(demandSearchResponse)){ - //Throw Error - data = - { - "ResponseInfo":null, - "Errors":[ - { - "code":"MultiplePaymentNotAllowed", - "message":"There already exists a recipt for property id : "+ propertyId +" for financial year" + PT_INTEGRATION_ASSESSMENTYEAR, - "description": "There already exists a recipt for property id : "+ propertyId +" for financial year" + PT_INTEGRATION_ASSESSMENTYEAR, - "params":null - } - ] - }; - return data; - } - - - let newTotal = 0; - - for (demandDetail of demandSearchResponse["Demands"][0]["demandDetails"]) - { - if(demandDetail.taxAmount){ - demandDetail.taxAmount = 0 - } - delete TaxHeadsType[demandDetail.taxHeadMasterCode]//Deleting tax head codes present in both TaxHeadsType and demandDetail - console.log("Deleted taxhead from TaxHeadsType: ", demandDetail.taxHeadMasterCode); - } - - console.log("After Deleting the taxhead present in demand: ", JSON.stringify(TaxHeadsType)); - console.log("demandSearchResponse AFTER MAKING EVERYTHING ZERO : ", JSON.stringify(demandSearchResponse)) - - if(!(Object.keys(TaxHeadsType).length === 0)){ - for(taxHead in TaxHeadsType){ - taxHeadObj={}; - taxHeadObj["taxHeadMasterCode"] = taxHead; - taxHeadObj["taxAmount"] = 0; - taxHeadObj["collectionAmount"] = 0; - demandSearchResponse["Demands"][0]["demandDetails"].push(taxHeadObj); // Adding those obj to demand details for which taxhead there was no entry in it - console.log("Pushing obj", taxHeadObj); - } - } - - console.log("After Adding All the tax head demandDetail: ", demandSearchResponse["Demands"][0]["demandDetails"]) - - for (demandDetail of demandSearchResponse["Demands"][0]["demandDetails"]) - { - if(createTaxHeadsArray[demandDetail.taxHeadMasterCode]) - { - demandDetail.taxAmount = createTaxHeadsArray[demandDetail.taxHeadMasterCode]; - createTaxHeadsArray[demandDetail.taxHeadMasterCode] =0; // Incase of Multiple PT_ROUNDOFF - newTotal += demandDetail.taxAmount; - } - } - - console.log("demandSearchResponse AFTER SETTING THE VALUE: ", JSON.stringify(demandSearchResponse)) - - let demandUpdateResponse = await updateDemand(demandSearchResponse["Demands"], req["RequestInfo"]) - - console.log("demandUpdateResponse : ", JSON.stringify(demandUpdateResponse)) - - calc["taxAmount"] = 0; - calc["exemption"] = 0; - calc["totalAmount"] = newTotal; - calc["rebate"] = 0; - calc["penalty"] = 0; - - log("Demand Updated with Details : " + demandUpdateResponse ) - - return response; - -} - -// async function _createAndUpdateTaxProcessor(request, response, fireCessConfig) { - -// let index = 0 -// for (reqProperty of request["Properties"]) { - -// let resProperty = response["Properties"][index] -// let propertyId = resProperty["propertyId"] - -// let assessmentNumber = resProperty["propertyDetails"][0]["assessmentNumber"] - -// let consumerCode = propertyId + ":" + assessmentNumber -// let service = "PT" -// let tenantId = reqProperty["tenantId"] - -// let demandSearchResponse = await findDemandForConsumerCode(consumerCode, tenantId, service, request["RequestInfo"]) - -// let fireCessPercentage = getFireCessPercentage(reqProperty["propertyDetails"][0], fireCessConfig) - -// if (DEBUG_MODE) { -// demandSearchResponse["Demands"][0]["firecess"] = fireCessPercentage -// } -// let calc = response["Properties"][index]["propertyDetails"][0]["calculation"] -// let updateFirecessTax = calculateNewFireCess(calc["taxHeadEstimates"], fireCessPercentage.firecess, "estimateAmount", "taxHeadCode") - -// let taxes = getUpdateTaxSummary(calc, -// updateFirecessTax, "taxHeadCode", "estimateAmount") - -// if (taxes.newCeilingTax) { -// let firstDemand = demandSearchResponse["Demands"][0]["demandDetails"][0] -// let newDemand = { -// id: null, -// demandId: firstDemand["demandId"], -// taxHeadMasterCode: taxes.ceilingTaxHead.taxHeadCode, -// taxAmount: taxes.ceilingTaxHead.estimateAmount, -// tenantId: firstDemand["tenantId"], -// collectionAmount: 0 -// } -// demandSearchResponse["Demands"][0]["demandDetails"].push(newDemand) -// } - -// for (demandDetail of demandSearchResponse["Demands"][0]["demandDetails"]) { -// if (demandDetail.taxHeadMasterCode == "PT_FIRE_CESS") { -// demandDetail.taxAmount = taxes.firecessTaxHead.estimateAmount -// } -// if (demandDetail.taxHeadMasterCode == "PT_ROUNDOFF" && demandDetail.adjustedAmount == 0.0) { -// demandDetail.taxHeadMasterCode = taxes.ceilingTaxHead.taxHeadCode -// demandDetail.taxAmount = taxes.ceilingTaxHead.estimateAmount -// } -// } - -// let demandUpdateResponse = await updateDemand(demandSearchResponse["Demands"], request["RequestInfo"]) - -// // let updateTaxHeads = [] - -// // for (taxHead of demandSearchResponse["Demands"]) { -// // updateTaxHeads.push({ -// // taxHeadCode: taxHead.taxHeadMasterCode, -// // estimateAmount: taxHead.taxtAmount, -// // category: taxHead.category -// // }) -// // } - -// calc["totalAmount"] = taxes.totalAmount -// calc["taxAmount"] = taxes.taxAmount -// calc["rebate"] = taxes.rebate -// // calc["taxHeadEstimates"] = updateTaxHeads -// index++ -// } - -// return response -// } - -async function _createAndUpdateRequestHandler(req, res) { - let { - request, - response - } = getRequestResponse(req) - - - let assessmentYear = request["Assessment"]["financialYear"] - let tenantId = request["Assessment"]["tenantId"] - - if (assessmentYear == PT_ZERO_ASSESSMENTYEAR && PT_ZERO_TENANTS.indexOf(tenantId) >= 0){ - response = await _createAndUpdateZeroTaxProcessor(request, response) - }else if(assessmentYear == PT_INTEGRATION_ASSESSMENTYEAR && PT_INTEGRATION_TENANTS.indexOf(tenantId) >= 0){ - log("Got Request for Assessment Create and Update") - - response = await _createAndUpdateIntegrationTaxProcessor(request, response) - } - - // if (!PT_ENABLE_FC_CALC) - if ("Errors" in response) - res.status(400).json(response) - else - res.json(response); - - // firecess logic is enabled, so execute it - // let tenantId = request["Properties"][0]["tenantId"] - - // let fireCessConfig = await getFireCessConfig(tenantId) - // if (fireCessConfig && fireCessConfig.dynamicFirecess && fireCessConfig.dynamicFirecess == true) { - // let updatedResponse = await _createAndUpdateTaxProcessor(request, response, fireCessConfig) - // res.json(updatedResponse); - // } else { - // res.json(response) - // } -} - -function getRequestResponse(req) { - let request = null, - response = null - - if (typeof req.body.request === "string") { - request = JSON.parse(req.body.request) - if (req.body.response) - response = JSON.parse(req.body.response) - } else { - request = req.body.request - response = req.body.response - } - - return { - request, - response - } -} - -router.post('/protected/punjab-pt/assessment/_create', asyncMiddleware(_createAndUpdateRequestHandler)) - -router.post('/protected/punjab-pt/assessment/_update', asyncMiddleware(_createAndUpdateRequestHandler)) - -router.post('/open/punjab-pt/payu/confirm', asyncMiddleware((async function (req, res) { - let return_data = req.body; - original_callback = req.query.original_callback; - delete req.query['original_callback']; - let txnid = req.query.eg_pg_txnid - delete req.query['eg_pg_txnid']; - - new_query_params = Object.assign({}, return_data, req.query); - redirect_url = url.format( - { - pathname: original_callback, - query: new_query_params - } - ) - //ensuring the first query param is eg_pg_txnid - redirect_url = redirect_url.replace('?', '?'+ 'eg_pg_txnid=' + txnid +'&') - res.redirect(redirect_url); -}))) - -router.post('/protected/punjab-pt/pre-hook/pg-service/transaction/v1/_create', asyncMiddleware((async function (req, res) { - let { - request - } = getRequestResponse(req) - - if (request['Transaction']['tenantId'] == 'pb.jalandhar' || request['Transaction']['tenantId'] == 'pb.testing') { - let original_callback = request['Transaction']['callbackUrl']; - request['Transaction']['gateway'] = 'PAYU' - url_callback = url.parse(original_callback) - - url_callback.query = url_callback.query || {}; - - url_callback.query['original_callback'] = url_callback.path; - - url_callback.path = '/customization/open/punjab-pt/payu/confirm'; - url_callback.pathname = '/customization/open/punjab-pt/payu/confirm'; - - request['Transaction']['callbackUrl'] = url.format(url_callback); - } - // else if (request['Transaction']['tenantId'] == 'pb.amritsar' || request['Transaction']['tenantId'] == 'pb.mohali' || request['Transaction']['tenantId'] == 'pb.hoshiarpur' || request['Transaction']['tenantId'] == 'pb.kapurthala' || request['Transaction']['tenantId'] == 'pb.khanna' || request['Transaction']['tenantId'] == 'pb.moga' || request['Transaction']['tenantId'] == 'pb.mandigobindgarh'|| request['Transaction']['tenantId'] == 'pb.handiaya') { - else { - let original_callback = request['Transaction']['callbackUrl']; - request['Transaction']['gateway'] = 'RAZORPAY' - url_callback = url.parse(original_callback) - url_callback.query = url_callback.query || {}; - url_callback.query['original_callback'] = url_callback.path; - request['Transaction']['callbackUrl'] = url.format(url_callback); - - } - res.json(request); -}))); - -router.post('/protected/punjab-pt/pt-calculator-v2/_estimate', asyncMiddleware(async function (req, res) { - - let { - request, - response - } = getRequestResponse(req) - - - // let oldRequestbody = getOldRequestBody(request) - - // oldRequestbody["CalculationCriteria"][0]["assessmentYear"] = oldRequestbody["CalculationCriteria"][0]["property"]["propertyDetails"][0]["financialYear"] - // // assessmentYear field was there in old request body but not present in new request body so we are adding this field. - - // request = oldRequestbody; - - let tenantId = request["Assessment"]["tenantId"] - let assessmentYear = request["Assessment"]["financialYear"] - - - let oldRequestbody = await getOldRequestBody(request); - console.log("Old Request Body:", oldRequestbody); - oldRequestbody["CalculationCriteria"][0]["assessmentYear"] = assessmentYear; - // assessmentYear field was there in old request body but not present in new request body Without this field we will get null pointer exception. - - - if (assessmentYear == PT_ZERO_ASSESSMENTYEAR && PT_ZERO_TENANTS.indexOf(tenantId) >= 0){ - response = _estimateZeroTaxProcessor(oldRequestbody, response) - } - else if (assessmentYear == PT_INTEGRATION_ASSESSMENTYEAR){ - - if(PT_INTEGRATION_TENANTS.indexOf(tenantId) >= 0){ - log(":: Estimate request Received ::"); - - log("Got request for tenantid: "+tenantId+" and finanancial year: "+assessmentYear) - log("Request body: "+ JSON.stringify(request)); - - response = await _estimateIntegrationTaxProcessor(oldRequestbody, response) - } else if(isCitizen(request)){ - data = - { - "ResponseInfo":null, - "Errors":[ - { - "code":"CitizenOnlineNotAllowed", - "message":"Sorry but online assessment for " + PT_INTEGRATION_ASSESSMENTYEAR + " is not allowed. Please make the payment at the counter", - "description": "Sorry but online assessment for " + PT_INTEGRATION_ASSESSMENTYEAR + " is not allowed. Please make the payment at the counter", - "params":null - } - ] - } - response = data; - } - - } - - - // if (!PT_ENABLE_FC_CALC) - if ("Errors" in response) - res.status(400).json(response) - else - res.json(response); - - // let tenantId = request["CalculationCriteria"][0]["tenantId"] - - // let fireCessConfig = await getFireCessConfig(tenantId) - - // if (fireCessConfig && fireCessConfig.dynamicFirecess && fireCessConfig.dynamicFirecess == true) { - // let updatedResponse = _estimateTaxProcessor(request, response, fireCessConfig) - // res.json(updatedResponse); - // } else { - // res.json(response); - // } -})) - -app.listen(8000, () => { - console.log("Listening on port 8000") -}); - -// TODO: -// Add total amount to calculations "totalAmount": 460, -// "taxAmount": 510, diff --git a/rainmaker-custom-service/package.json b/rainmaker-custom-service/package.json deleted file mode 100644 index adfe942c..00000000 --- a/rainmaker-custom-service/package.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "name": "nodeservice", - "version": "1.0.0", - "main": "index.js", - "license": "MIT", - "dependencies": { - "bluebird": "^3.5.1", - "cryptr": "^4.0.0", - "excel4node": "^1.5.0", - "express": "^4.16.3", - "express-slash": "^2.0.1", - "jsonwebtoken": "^8.4.0", - "mustache-express": "^1.2.7", - "nodemon": "^1.18.4", - "pg-promise": "^8.4.5", - "request": "^2.88.0", - "request-promise": "^4.2.2", - "morgan": "*" - }, - "scripts": { - "debug": "nodemon --inspect index.js" - } -} diff --git a/rainmaker-custom-service/static/css/bnd.css b/rainmaker-custom-service/static/css/bnd.css deleted file mode 100644 index d19b007b..00000000 --- a/rainmaker-custom-service/static/css/bnd.css +++ /dev/null @@ -1,137 +0,0 @@ -body { - height: 100%; - padding: 0px; - margin: 0px; - background: #333; - font-family: 'Roboto', sans-serif !important; - font-size: 1em; - } - h1 { - font-family: 'Roboto', sans-serif; - font-size: 30px; - color: #999; - font-weight: 300; - margin-bottom: 55px; - margin-top: 45px; - text-transform: uppercase; - } - h1 small { - display: block; - font-size: 18px; - text-transform: none; - letter-spacing: 1.5px; - margin-top: 12px; - } - .row { - max-width: 950px; - margin: 0 auto; - } - .btn { - white-space: normal; - } - .button-wrap { - position: relative; - text-align: center; - } - .button-wrap .btn { - font-family: 'Roboto', sans-serif; - box-shadow: 0 0 15px 5px rgba(0, 0, 0, 0.5); - border-radius: 0px; - border-color: #222; - cursor: pointer; - text-transform: uppercase; - font-size: 1.1em; - font-weight: 400; - letter-spacing: 1px; - } - .button-wrap .btn small { - font-size: 0.8rem; - letter-spacing: normal; - text-transform: none; - } - /** SPINNER CREATION **/ - .loader { - position: relative; - text-align: center; - margin: 15px auto 35px auto; - z-index: 9999; - display: block; - width: 80px; - height: 80px; - border: 10px solid rgba(0, 0, 0, 0.3); - border-radius: 50%; - border-top-color: #000; - animation: spin 1s ease-in-out infinite; - -webkit-animation: spin 1s ease-in-out infinite; - } - @keyframes spin { - to { - -webkit-transform: rotate(360deg); - } - } - @-webkit-keyframes spin { - to { - -webkit-transform: rotate(360deg); - } - } - /** MODAL STYLING **/ - .modal-content { - border-radius: 0px; - box-shadow: 0 0 20px 8px rgba(0, 0, 0, 0.7); - } - .modal-backdrop.show { - opacity: 0.75; - } - .loader-txt p { - font-size: 13px; - color: #666; - } - .loader-txt p small { - font-size: 11.5px; - color: #999; - } - - html, -body { - height: 100%; -} - -body { - display: -ms-flexbox; - display: flex; - -ms-flex-align: center; - align-items: center; - padding-top: 40px; - padding-bottom: 40px; - background-color: #f5f5f5; -} - -.form-signin { - width: 100%; - max-width: 530px; - padding: 15px; - margin: auto; -} -.form-signin .checkbox { - font-weight: 400; -} -.form-signin .form-control { - position: relative; - box-sizing: border-box; - height: auto; - padding: 10px; - font-size: 16px; -} -.form-signin .form-control:focus { - z-index: 2; -} -.form-signin input[type="email"] { - margin-bottom: -1px; - border-bottom-right-radius: 0; - border-bottom-left-radius: 0; -} -.form-signin input[type="password"] { - margin-bottom: 10px; - border-top-left-radius: 0; - border-top-right-radius: 0; -} \ No newline at end of file diff --git a/rainmaker-custom-service/static/js/bnd.js b/rainmaker-custom-service/static/js/bnd.js deleted file mode 100644 index 4cbfa5d6..00000000 --- a/rainmaker-custom-service/static/js/bnd.js +++ /dev/null @@ -1,128 +0,0 @@ -$(document).ready(() => { - $("#linkAccount").on('click', linkAccount) - if (getAuthToken() !== null) { - let params = (new URL(document.location)).searchParams; - if (params.get("unlink") !== null) - { - unlinkAccount(); - } else { - setTimeout(loginToBND, 10); - } - } else { - $("#msg").html("You need to be logged in to access this page") - $("#form").hide() - } -}); - -function unlinkAccount() { - axios({ - url: location.pathname.replace("/open/", "/protected/") + "/unlinkAccount", - method: 'POST', - json: true, // important - headers: { - 'Accept': 'application/json' - }, - data: { - RequestInfo: { - "authToken": getAuthToken(), - } - } - }).then((response) => { - window.location.assign(window.location.href.replace("unlink", "")) - }); -} - -function linkAccount() { - username = $("#username").val(); - password = $("#password").val() - - axios({ - url: location.pathname.replace("/open/", "/protected/") + "/linkAccount", - method: 'POST', - json: true, // important - headers: { - 'Accept': 'application/json' - }, - data: { - username: username, - password: password, - RequestInfo: { - "authToken": getAuthToken(), - } - } - }).then((response) => { - let res = response.data; - if (res && res.code && res.code == "SUCCESS" && res.redirect) { - var urlInfo = decodeURI(window.location.href).split('?'); - var path = urlInfo[0]; - $("#msg").html("The application has been opened in new window. If you want to unlink your account click here") - window.open(res.redirect,"bnd", "", true) - } else { - $("#msg").text(res.message).css("color", "red"); - } - }); -} - -function getAuthToken() { - var access_token = localStorage.getItem("token"); - return access_token; -} - -function loginToBND() { - showLoader() - try { - axios({ - url: location.href.replace("/open/", "/protected/"), - method: 'POST', - json: true, // important - headers: { - 'Accept': 'application/json' - }, - data: { - RequestInfo: { - "authToken": getAuthToken() - } - } - }).then((response) => { - hideLoader() - switch (response.data.code) { - case "NO_CREDENTIAL_MAPPING": - $('#msg').text("Please enter your eSewa Health application Username & Password to link your account") - $('#inputEmail').val(response.data.username || "") - $("#form").show() - break - case "INVALID_CREDENTIALS": - $('#msg').text(response.data.message) - $('#inputEmail').val(response.data.username || "") - $("#form").show() - break - case "SUCCESS": - $("#msg").html("The application has been opened in new window. If you want to unlink your account click here") - window.open(response.data.redirect,"bnd", "", true) - break; - default: - $('#msg').text(response.data.message || "Some error occcured while processing your request") - break - } - }).catch((err) => { - hideLoader(); - }); - } catch (ex) { - hideLoader() - } -} - -function showLoader() { - $("#loadMe").modal({ - backdrop: "static", //remove ability to close modal with click - keyboard: false, //remove option to close with keyboard - show: true //Display loader! - }); -} - -function hideLoader() { - $("#loadMe").modal("hide") - $('#loadMe').on('shown.bs.modal', function (e) { - $("#loadMe").modal('hide'); - }) -} \ No newline at end of file diff --git a/rainmaker-custom-service/templates/apicall.html b/rainmaker-custom-service/templates/apicall.html deleted file mode 100644 index f6382bba..00000000 --- a/rainmaker-custom-service/templates/apicall.html +++ /dev/null @@ -1,45 +0,0 @@ -{{>common/header}} -
No report available for your user type
- -{{>common/body}} \ No newline at end of file diff --git a/rainmaker-custom-service/templates/bndlogin.html b/rainmaker-custom-service/templates/bndlogin.html deleted file mode 100644 index e7290ac1..00000000 --- a/rainmaker-custom-service/templates/bndlogin.html +++ /dev/null @@ -1,32 +0,0 @@ -{{>common/header}} - - - -{{>common/scripts}} - - -{{>common/footer}} \ No newline at end of file diff --git a/rainmaker-custom-service/templates/common/footer.html b/rainmaker-custom-service/templates/common/footer.html deleted file mode 100644 index 1fd5f4f2..00000000 --- a/rainmaker-custom-service/templates/common/footer.html +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/rainmaker-custom-service/templates/common/header.html b/rainmaker-custom-service/templates/common/header.html deleted file mode 100644 index 63d94260..00000000 --- a/rainmaker-custom-service/templates/common/header.html +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - eGov Extension - - \ No newline at end of file diff --git a/rainmaker-custom-service/templates/common/scripts.html b/rainmaker-custom-service/templates/common/scripts.html deleted file mode 100644 index 9f6c78bb..00000000 --- a/rainmaker-custom-service/templates/common/scripts.html +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/rainmaker-custom-service/utils/asyncMiddleware.js b/rainmaker-custom-service/utils/asyncMiddleware.js deleted file mode 100644 index e261ae12..00000000 --- a/rainmaker-custom-service/utils/asyncMiddleware.js +++ /dev/null @@ -1,9 +0,0 @@ -const asyncMiddleware = fn => - (req, res, next) => { - Promise.resolve(fn(req, res, next)) - .catch(next); - }; - -module.exports = { - asyncMiddleware -} \ No newline at end of file diff --git a/rainmaker-custom-service/yarn.lock b/rainmaker-custom-service/yarn.lock deleted file mode 100644 index 04493197..00000000 --- a/rainmaker-custom-service/yarn.lock +++ /dev/null @@ -1,2297 +0,0 @@ -# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -# yarn lockfile v1 - - -abbrev@1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" - -accepts@~1.3.5: - version "1.3.5" - resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.5.tgz#eb777df6011723a3b14e8a72c0805c8e86746bd2" - dependencies: - mime-types "~2.1.18" - negotiator "0.6.1" - -ajv@^6.5.5: - version "6.6.2" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.6.2.tgz#caceccf474bf3fc3ce3b147443711a24063cc30d" - dependencies: - fast-deep-equal "^2.0.1" - fast-json-stable-stringify "^2.0.0" - json-schema-traverse "^0.4.1" - uri-js "^4.2.2" - -ansi-align@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-2.0.0.tgz#c36aeccba563b89ceb556f3690f0b1d9e3547f7f" - dependencies: - string-width "^2.0.0" - -ansi-regex@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" - -ansi-regex@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" - -ansi-styles@^3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" - dependencies: - color-convert "^1.9.0" - -anymatch@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb" - dependencies: - micromatch "^3.1.4" - normalize-path "^2.1.1" - -aproba@^1.0.3: - version "1.2.0" - resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" - -are-we-there-yet@~1.1.2: - version "1.1.5" - resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21" - dependencies: - delegates "^1.0.0" - readable-stream "^2.0.6" - -arr-diff@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520" - -arr-flatten@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1" - -arr-union@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4" - -array-flatten@1.1.1: - version "1.1.1" - resolved "http://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" - -array-unique@^0.3.2: - version "0.3.2" - resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" - -asn1@~0.2.3: - version "0.2.4" - resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136" - dependencies: - safer-buffer "~2.1.0" - -assert-plus@1.0.0, assert-plus@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" - -assign-symbols@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367" - -async-each@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d" - -async@~2.6.0: - version "2.6.1" - resolved "https://registry.yarnpkg.com/async/-/async-2.6.1.tgz#b245a23ca71930044ec53fa46aa00a3e87c6a610" - dependencies: - lodash "^4.17.10" - -asynckit@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" - -atob@^2.1.1: - version "2.1.2" - resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" - -aws-sign2@~0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8" - -aws4@^1.8.0: - version "1.8.0" - resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f" - -balanced-match@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" - -base@^0.11.1: - version "0.11.2" - resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f" - dependencies: - cache-base "^1.0.1" - class-utils "^0.3.5" - component-emitter "^1.2.1" - define-property "^1.0.0" - isobject "^3.0.1" - mixin-deep "^1.2.0" - pascalcase "^0.1.1" - -bcrypt-pbkdf@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e" - dependencies: - tweetnacl "^0.14.3" - -binary-extensions@^1.0.0: - version "1.12.0" - resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.12.0.tgz#c2d780f53d45bba8317a8902d4ceeaf3a6385b14" - -bluebird@^3.5.0, bluebird@^3.5.1: - version "3.5.3" - resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.3.tgz#7d01c6f9616c9a51ab0f8c549a79dfe6ec33efa7" - -body-parser@1.18.3: - version "1.18.3" - resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.18.3.tgz#5b292198ffdd553b3a0f20ded0592b956955c8b4" - dependencies: - bytes "3.0.0" - content-type "~1.0.4" - debug "2.6.9" - depd "~1.1.2" - http-errors "~1.6.3" - iconv-lite "0.4.23" - on-finished "~2.3.0" - qs "6.5.2" - raw-body "2.3.3" - type-is "~1.6.16" - -boxen@^1.2.1: - version "1.3.0" - resolved "https://registry.yarnpkg.com/boxen/-/boxen-1.3.0.tgz#55c6c39a8ba58d9c61ad22cd877532deb665a20b" - dependencies: - ansi-align "^2.0.0" - camelcase "^4.0.0" - chalk "^2.0.1" - cli-boxes "^1.0.0" - string-width "^2.0.0" - term-size "^1.2.0" - widest-line "^2.0.0" - -brace-expansion@^1.1.7: - version "1.1.11" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" - dependencies: - balanced-match "^1.0.0" - concat-map "0.0.1" - -braces@^2.3.0, braces@^2.3.1: - version "2.3.2" - resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729" - dependencies: - arr-flatten "^1.1.0" - array-unique "^0.3.2" - extend-shallow "^2.0.1" - fill-range "^4.0.0" - isobject "^3.0.1" - repeat-element "^1.1.2" - snapdragon "^0.8.1" - snapdragon-node "^2.0.1" - split-string "^3.0.2" - to-regex "^3.0.1" - -buffer-equal-constant-time@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz#f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819" - -buffer-writer@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/buffer-writer/-/buffer-writer-2.0.0.tgz#ce7eb81a38f7829db09c873f2fbb792c0c98ec04" - -bytes@3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048" - -cache-base@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2" - dependencies: - collection-visit "^1.0.0" - component-emitter "^1.2.1" - get-value "^2.0.6" - has-value "^1.0.0" - isobject "^3.0.1" - set-value "^2.0.0" - to-object-path "^0.3.0" - union-value "^1.0.0" - unset-value "^1.0.0" - -camelcase@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd" - -capture-stack-trace@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz#a6c0bbe1f38f3aa0b92238ecb6ff42c344d4135d" - -caseless@~0.12.0: - version "0.12.0" - resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" - -chalk@^2.0.1: - version "2.4.1" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e" - dependencies: - ansi-styles "^3.2.1" - escape-string-regexp "^1.0.5" - supports-color "^5.3.0" - -chokidar@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.4.tgz#356ff4e2b0e8e43e322d18a372460bbcf3accd26" - dependencies: - anymatch "^2.0.0" - async-each "^1.0.0" - braces "^2.3.0" - glob-parent "^3.1.0" - inherits "^2.0.1" - is-binary-path "^1.0.0" - is-glob "^4.0.0" - lodash.debounce "^4.0.8" - normalize-path "^2.1.1" - path-is-absolute "^1.0.0" - readdirp "^2.0.0" - upath "^1.0.5" - optionalDependencies: - fsevents "^1.2.2" - -chownr@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.1.tgz#54726b8b8fff4df053c42187e801fb4412df1494" - -ci-info@^1.5.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.6.0.tgz#2ca20dbb9ceb32d4524a683303313f0304b1e497" - -class-utils@^0.3.5: - version "0.3.6" - resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463" - dependencies: - arr-union "^3.1.0" - define-property "^0.2.5" - isobject "^3.0.0" - static-extend "^0.1.1" - -cli-boxes@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-1.0.0.tgz#4fa917c3e59c94a004cd61f8ee509da651687143" - -code-point-at@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" - -collection-visit@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0" - dependencies: - map-visit "^1.0.0" - object-visit "^1.0.0" - -color-convert@^1.9.0: - version "1.9.3" - resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" - dependencies: - color-name "1.1.3" - -color-name@1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" - -combined-stream@^1.0.6, combined-stream@~1.0.6: - version "1.0.7" - resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.7.tgz#2d1d24317afb8abe95d6d2c0b07b57813539d828" - dependencies: - delayed-stream "~1.0.0" - -component-emitter@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6" - -concat-map@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" - -configstore@^3.0.0: - version "3.1.2" - resolved "https://registry.yarnpkg.com/configstore/-/configstore-3.1.2.tgz#c6f25defaeef26df12dd33414b001fe81a543f8f" - dependencies: - dot-prop "^4.1.0" - graceful-fs "^4.1.2" - make-dir "^1.0.0" - unique-string "^1.0.0" - write-file-atomic "^2.0.0" - xdg-basedir "^3.0.0" - -console-control-strings@^1.0.0, console-control-strings@~1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" - -content-disposition@0.5.2: - version "0.5.2" - resolved "http://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz#0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4" - -content-type@~1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b" - -cookie-signature@1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" - -cookie@0.3.1: - version "0.3.1" - resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb" - -copy-descriptor@^0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" - -core-js@~2.3.0: - version "2.3.0" - resolved "http://registry.npmjs.org/core-js/-/core-js-2.3.0.tgz#fab83fbb0b2d8dc85fa636c4b9d34c75420c6d65" - -core-util-is@1.0.2, core-util-is@~1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" - -create-error-class@^3.0.0: - version "3.0.2" - resolved "https://registry.yarnpkg.com/create-error-class/-/create-error-class-3.0.2.tgz#06be7abef947a3f14a30fd610671d401bca8b7b6" - dependencies: - capture-stack-trace "^1.0.0" - -cross-spawn@^5.0.1: - version "5.1.0" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449" - dependencies: - lru-cache "^4.0.1" - shebang-command "^1.2.0" - which "^1.2.9" - -crypto-random-string@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-1.0.0.tgz#a230f64f568310e1498009940790ec99545bca7e" - -cryptr@^4.0.0: - version "4.0.2" - resolved "https://registry.yarnpkg.com/cryptr/-/cryptr-4.0.2.tgz#8a93b5ca7667d1a6131e396bab23a134ff1f5dc6" - -dashdash@^1.12.0: - version "1.14.1" - resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0" - dependencies: - assert-plus "^1.0.0" - -debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3: - version "2.6.9" - resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" - dependencies: - ms "2.0.0" - -debug@^3.1.0: - version "3.2.6" - resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b" - dependencies: - ms "^2.1.1" - -decode-uri-component@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545" - -deep-extend@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" - -deepmerge@2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-2.1.1.tgz#e862b4e45ea0555072bf51e7fd0d9845170ae768" - -define-property@^0.2.5: - version "0.2.5" - resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116" - dependencies: - is-descriptor "^0.1.0" - -define-property@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6" - dependencies: - is-descriptor "^1.0.0" - -define-property@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d" - dependencies: - is-descriptor "^1.0.2" - isobject "^3.0.1" - -delayed-stream@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" - -delegates@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" - -depd@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" - -destroy@~1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80" - -detect-libc@^1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" - -dot-prop@^4.1.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.0.tgz#1f19e0c2e1aa0e32797c49799f2837ac6af69c57" - dependencies: - is-obj "^1.0.0" - -duplexer3@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2" - -ecc-jsbn@~0.1.1: - version "0.1.2" - resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9" - dependencies: - jsbn "~0.1.0" - safer-buffer "^2.1.0" - -ecdsa-sig-formatter@1.0.10: - version "1.0.10" - resolved "https://registry.yarnpkg.com/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.10.tgz#1c595000f04a8897dfb85000892a0f4c33af86c3" - dependencies: - safe-buffer "^5.0.1" - -ee-first@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" - -encodeurl@~1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" - -es6-promise@~3.0.2: - version "3.0.2" - resolved "http://registry.npmjs.org/es6-promise/-/es6-promise-3.0.2.tgz#010d5858423a5f118979665f46486a95c6ee2bb6" - -escape-html@~1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" - -escape-string-regexp@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" - -etag@~1.8.1: - version "1.8.1" - resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" - -excel4node@^1.5.0: - version "1.7.0" - resolved "https://registry.yarnpkg.com/excel4node/-/excel4node-1.7.0.tgz#e7f8a797284832d86dda8713745323cd2302d9d2" - dependencies: - deepmerge "2.1.1" - image-size "0.6.3" - jszip "3.1.5" - lodash.get "4.4.2" - lodash.isequal "4.5.0" - lodash.isundefined "3.0.1" - lodash.reduce "4.6.0" - lodash.uniqueid "4.0.1" - mime "2.3.1" - uuid "3.3.2" - xmlbuilder "10.0.0" - -execa@^0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777" - dependencies: - cross-spawn "^5.0.1" - get-stream "^3.0.0" - is-stream "^1.1.0" - npm-run-path "^2.0.0" - p-finally "^1.0.0" - signal-exit "^3.0.0" - strip-eof "^1.0.0" - -expand-brackets@^2.1.4: - version "2.1.4" - resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622" - dependencies: - debug "^2.3.3" - define-property "^0.2.5" - extend-shallow "^2.0.1" - posix-character-classes "^0.1.0" - regex-not "^1.0.0" - snapdragon "^0.8.1" - to-regex "^3.0.1" - -express-slash@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/express-slash/-/express-slash-2.0.1.tgz#76eb869fed8f71ae4f98785cbe00bf1bb454d627" - -express@^4.16.3: - version "4.16.4" - resolved "https://registry.yarnpkg.com/express/-/express-4.16.4.tgz#fddef61926109e24c515ea97fd2f1bdbf62df12e" - dependencies: - accepts "~1.3.5" - array-flatten "1.1.1" - body-parser "1.18.3" - content-disposition "0.5.2" - content-type "~1.0.4" - cookie "0.3.1" - cookie-signature "1.0.6" - debug "2.6.9" - depd "~1.1.2" - encodeurl "~1.0.2" - escape-html "~1.0.3" - etag "~1.8.1" - finalhandler "1.1.1" - fresh "0.5.2" - merge-descriptors "1.0.1" - methods "~1.1.2" - on-finished "~2.3.0" - parseurl "~1.3.2" - path-to-regexp "0.1.7" - proxy-addr "~2.0.4" - qs "6.5.2" - range-parser "~1.2.0" - safe-buffer "5.1.2" - send "0.16.2" - serve-static "1.13.2" - setprototypeof "1.1.0" - statuses "~1.4.0" - type-is "~1.6.16" - utils-merge "1.0.1" - vary "~1.1.2" - -extend-shallow@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f" - dependencies: - is-extendable "^0.1.0" - -extend-shallow@^3.0.0, extend-shallow@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8" - dependencies: - assign-symbols "^1.0.0" - is-extendable "^1.0.1" - -extend@~3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" - -extglob@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543" - dependencies: - array-unique "^0.3.2" - define-property "^1.0.0" - expand-brackets "^2.1.4" - extend-shallow "^2.0.1" - fragment-cache "^0.2.1" - regex-not "^1.0.0" - snapdragon "^0.8.1" - to-regex "^3.0.1" - -extsprintf@1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05" - -extsprintf@^1.2.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f" - -fast-deep-equal@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49" - -fast-json-stable-stringify@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2" - -fill-range@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7" - dependencies: - extend-shallow "^2.0.1" - is-number "^3.0.0" - repeat-string "^1.6.1" - to-regex-range "^2.1.0" - -finalhandler@1.1.1: - version "1.1.1" - resolved "http://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz#eebf4ed840079c83f4249038c9d703008301b105" - dependencies: - debug "2.6.9" - encodeurl "~1.0.2" - escape-html "~1.0.3" - on-finished "~2.3.0" - parseurl "~1.3.2" - statuses "~1.4.0" - unpipe "~1.0.0" - -for-in@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" - -forever-agent@~0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" - -form-data@~2.3.2: - version "2.3.3" - resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6" - dependencies: - asynckit "^0.4.0" - combined-stream "^1.0.6" - mime-types "^2.1.12" - -forwarded@~0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84" - -fragment-cache@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19" - dependencies: - map-cache "^0.2.2" - -fresh@0.5.2: - version "0.5.2" - resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" - -fs-minipass@^1.2.5: - version "1.2.5" - resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.5.tgz#06c277218454ec288df77ada54a03b8702aacb9d" - dependencies: - minipass "^2.2.1" - -fs.realpath@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" - -fsevents@^1.2.2: - version "1.2.4" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.4.tgz#f41dcb1af2582af3692da36fc55cbd8e1041c426" - dependencies: - nan "^2.9.2" - node-pre-gyp "^0.10.0" - -gauge@~2.7.3: - version "2.7.4" - resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7" - dependencies: - aproba "^1.0.3" - console-control-strings "^1.0.0" - has-unicode "^2.0.0" - object-assign "^4.1.0" - signal-exit "^3.0.0" - string-width "^1.0.1" - strip-ansi "^3.0.1" - wide-align "^1.1.0" - -get-stream@^3.0.0: - version "3.0.0" - resolved "http://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14" - -get-value@^2.0.3, get-value@^2.0.6: - version "2.0.6" - resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28" - -getpass@^0.1.1: - version "0.1.7" - resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa" - dependencies: - assert-plus "^1.0.0" - -glob-parent@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae" - dependencies: - is-glob "^3.1.0" - path-dirname "^1.0.0" - -glob@^7.0.5: - version "7.1.3" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1" - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.0.4" - once "^1.3.0" - path-is-absolute "^1.0.0" - -global-dirs@^0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-0.1.1.tgz#b319c0dd4607f353f3be9cca4c72fc148c49f445" - dependencies: - ini "^1.3.4" - -got@^6.7.1: - version "6.7.1" - resolved "http://registry.npmjs.org/got/-/got-6.7.1.tgz#240cd05785a9a18e561dc1b44b41c763ef1e8db0" - dependencies: - create-error-class "^3.0.0" - duplexer3 "^0.1.4" - get-stream "^3.0.0" - is-redirect "^1.0.0" - is-retry-allowed "^1.0.0" - is-stream "^1.0.0" - lowercase-keys "^1.0.0" - safe-buffer "^5.0.1" - timed-out "^4.0.0" - unzip-response "^2.0.1" - url-parse-lax "^1.0.0" - -graceful-fs@^4.1.11, graceful-fs@^4.1.2: - version "4.1.15" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00" - -har-schema@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92" - -har-validator@~5.1.0: - version "5.1.3" - resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz#1ef89ebd3e4996557675eed9893110dc350fa080" - dependencies: - ajv "^6.5.5" - har-schema "^2.0.0" - -has-flag@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" - -has-unicode@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" - -has-value@^0.3.1: - version "0.3.1" - resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f" - dependencies: - get-value "^2.0.3" - has-values "^0.1.4" - isobject "^2.0.0" - -has-value@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177" - dependencies: - get-value "^2.0.6" - has-values "^1.0.0" - isobject "^3.0.0" - -has-values@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771" - -has-values@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f" - dependencies: - is-number "^3.0.0" - kind-of "^4.0.0" - -http-errors@1.6.3, http-errors@~1.6.2, http-errors@~1.6.3: - version "1.6.3" - resolved "http://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d" - dependencies: - depd "~1.1.2" - inherits "2.0.3" - setprototypeof "1.1.0" - statuses ">= 1.4.0 < 2" - -http-signature@~1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1" - dependencies: - assert-plus "^1.0.0" - jsprim "^1.2.2" - sshpk "^1.7.0" - -iconv-lite@0.4.23: - version "0.4.23" - resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63" - dependencies: - safer-buffer ">= 2.1.2 < 3" - -iconv-lite@^0.4.4: - version "0.4.24" - resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" - dependencies: - safer-buffer ">= 2.1.2 < 3" - -ignore-by-default@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/ignore-by-default/-/ignore-by-default-1.0.1.tgz#48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09" - -ignore-walk@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.1.tgz#a83e62e7d272ac0e3b551aaa82831a19b69f82f8" - dependencies: - minimatch "^3.0.4" - -image-size@0.6.3: - version "0.6.3" - resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.6.3.tgz#e7e5c65bb534bd7cdcedd6cb5166272a85f75fb2" - -immediate@~3.0.5: - version "3.0.6" - resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b" - -import-lazy@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43" - -imurmurhash@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" - -inflight@^1.0.4: - version "1.0.6" - resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" - dependencies: - once "^1.3.0" - wrappy "1" - -inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@~2.0.1, inherits@~2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" - -ini@^1.3.4, ini@~1.3.0: - version "1.3.5" - resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" - -ipaddr.js@1.8.0: - version "1.8.0" - resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.8.0.tgz#eaa33d6ddd7ace8f7f6fe0c9ca0440e706738b1e" - -is-accessor-descriptor@^0.1.6: - version "0.1.6" - resolved "http://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6" - dependencies: - kind-of "^3.0.2" - -is-accessor-descriptor@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656" - dependencies: - kind-of "^6.0.0" - -is-binary-path@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898" - dependencies: - binary-extensions "^1.0.0" - -is-buffer@^1.1.5: - version "1.1.6" - resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" - -is-ci@^1.0.10: - version "1.2.1" - resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.2.1.tgz#e3779c8ee17fccf428488f6e281187f2e632841c" - dependencies: - ci-info "^1.5.0" - -is-data-descriptor@^0.1.4: - version "0.1.4" - resolved "http://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56" - dependencies: - kind-of "^3.0.2" - -is-data-descriptor@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7" - dependencies: - kind-of "^6.0.0" - -is-descriptor@^0.1.0: - version "0.1.6" - resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca" - dependencies: - is-accessor-descriptor "^0.1.6" - is-data-descriptor "^0.1.4" - kind-of "^5.0.0" - -is-descriptor@^1.0.0, is-descriptor@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec" - dependencies: - is-accessor-descriptor "^1.0.0" - is-data-descriptor "^1.0.0" - kind-of "^6.0.2" - -is-extendable@^0.1.0, is-extendable@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" - -is-extendable@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4" - dependencies: - is-plain-object "^2.0.4" - -is-extglob@^2.1.0, is-extglob@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" - -is-fullwidth-code-point@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb" - dependencies: - number-is-nan "^1.0.0" - -is-fullwidth-code-point@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" - -is-glob@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a" - dependencies: - is-extglob "^2.1.0" - -is-glob@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.0.tgz#9521c76845cc2610a85203ddf080a958c2ffabc0" - dependencies: - is-extglob "^2.1.1" - -is-installed-globally@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.1.0.tgz#0dfd98f5a9111716dd535dda6492f67bf3d25a80" - dependencies: - global-dirs "^0.1.0" - is-path-inside "^1.0.0" - -is-npm@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-1.0.0.tgz#f2fb63a65e4905b406c86072765a1a4dc793b9f4" - -is-number@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195" - dependencies: - kind-of "^3.0.2" - -is-obj@^1.0.0: - version "1.0.1" - resolved "http://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f" - -is-path-inside@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz#8ef5b7de50437a3fdca6b4e865ef7aa55cb48036" - dependencies: - path-is-inside "^1.0.1" - -is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" - dependencies: - isobject "^3.0.1" - -is-redirect@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-redirect/-/is-redirect-1.0.0.tgz#1d03dded53bd8db0f30c26e4f95d36fc7c87dc24" - -is-retry-allowed@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz#11a060568b67339444033d0125a61a20d564fb34" - -is-stream@^1.0.0, is-stream@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" - -is-typedarray@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" - -is-windows@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" - -isarray@1.0.0, isarray@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" - -isexe@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" - -isobject@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89" - dependencies: - isarray "1.0.0" - -isobject@^3.0.0, isobject@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" - -isstream@~0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" - -jsbn@~0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" - -json-schema-traverse@^0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" - -json-schema@0.2.3: - version "0.2.3" - resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13" - -json-stringify-safe@~5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" - -jsonwebtoken@^8.4.0: - version "8.4.0" - resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-8.4.0.tgz#8757f7b4cb7440d86d5e2f3becefa70536c8e46a" - dependencies: - jws "^3.1.5" - lodash.includes "^4.3.0" - lodash.isboolean "^3.0.3" - lodash.isinteger "^4.0.4" - lodash.isnumber "^3.0.3" - lodash.isplainobject "^4.0.6" - lodash.isstring "^4.0.1" - lodash.once "^4.0.0" - ms "^2.1.1" - -jsprim@^1.2.2: - version "1.4.1" - resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2" - dependencies: - assert-plus "1.0.0" - extsprintf "1.3.0" - json-schema "0.2.3" - verror "1.10.0" - -jszip@3.1.5: - version "3.1.5" - resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.1.5.tgz#e3c2a6c6d706ac6e603314036d43cd40beefdf37" - dependencies: - core-js "~2.3.0" - es6-promise "~3.0.2" - lie "~3.1.0" - pako "~1.0.2" - readable-stream "~2.0.6" - -jwa@^1.1.5: - version "1.1.6" - resolved "https://registry.yarnpkg.com/jwa/-/jwa-1.1.6.tgz#87240e76c9808dbde18783cf2264ef4929ee50e6" - dependencies: - buffer-equal-constant-time "1.0.1" - ecdsa-sig-formatter "1.0.10" - safe-buffer "^5.0.1" - -jws@^3.1.5: - version "3.1.5" - resolved "https://registry.yarnpkg.com/jws/-/jws-3.1.5.tgz#80d12d05b293d1e841e7cb8b4e69e561adcf834f" - dependencies: - jwa "^1.1.5" - safe-buffer "^5.0.1" - -kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0: - version "3.2.2" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" - dependencies: - is-buffer "^1.1.5" - -kind-of@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57" - dependencies: - is-buffer "^1.1.5" - -kind-of@^5.0.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d" - -kind-of@^6.0.0, kind-of@^6.0.2: - version "6.0.2" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051" - -latest-version@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-3.1.0.tgz#a205383fea322b33b5ae3b18abee0dc2f356ee15" - dependencies: - package-json "^4.0.0" - -lie@~3.1.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/lie/-/lie-3.1.1.tgz#9a436b2cc7746ca59de7a41fa469b3efb76bd87e" - dependencies: - immediate "~3.0.5" - -lodash.debounce@^4.0.8: - version "4.0.8" - resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" - -lodash.get@4.4.2: - version "4.4.2" - resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99" - -lodash.includes@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/lodash.includes/-/lodash.includes-4.3.0.tgz#60bb98a87cb923c68ca1e51325483314849f553f" - -lodash.isboolean@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz#6c2e171db2a257cd96802fd43b01b20d5f5870f6" - -lodash.isequal@4.5.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0" - -lodash.isinteger@^4.0.4: - version "4.0.4" - resolved "https://registry.yarnpkg.com/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz#619c0af3d03f8b04c31f5882840b77b11cd68343" - -lodash.isnumber@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz#3ce76810c5928d03352301ac287317f11c0b1ffc" - -lodash.isplainobject@^4.0.6: - version "4.0.6" - resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb" - -lodash.isstring@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451" - -lodash.isundefined@3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/lodash.isundefined/-/lodash.isundefined-3.0.1.tgz#23ef3d9535565203a66cefd5b830f848911afb48" - -lodash.once@^4.0.0: - version "4.1.1" - resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac" - -lodash.reduce@4.6.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/lodash.reduce/-/lodash.reduce-4.6.0.tgz#f1ab6b839299ad48f784abbf476596f03b914d3b" - -lodash.uniqueid@4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/lodash.uniqueid/-/lodash.uniqueid-4.0.1.tgz#3268f26a7c88e4f4b1758d679271814e31fa5b26" - -lodash@^4.13.1, lodash@^4.17.10: - version "4.17.11" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d" - -lowercase-keys@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f" - -lru-cache@^4.0.1, lru-cache@~4.1.3: - version "4.1.5" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd" - dependencies: - pseudomap "^1.0.2" - yallist "^2.1.2" - -make-dir@^1.0.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c" - dependencies: - pify "^3.0.0" - -manakin@0.5.2: - version "0.5.2" - resolved "https://registry.yarnpkg.com/manakin/-/manakin-0.5.2.tgz#abe3df430ca6085f6983f6e4cf5af0298f4d30cc" - -map-cache@^0.2.2: - version "0.2.2" - resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf" - -map-visit@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f" - dependencies: - object-visit "^1.0.0" - -media-typer@0.3.0: - version "0.3.0" - resolved "http://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" - -merge-descriptors@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" - -methods@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" - -micromatch@^3.1.10, micromatch@^3.1.4: - version "3.1.10" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23" - dependencies: - arr-diff "^4.0.0" - array-unique "^0.3.2" - braces "^2.3.1" - define-property "^2.0.2" - extend-shallow "^3.0.2" - extglob "^2.0.4" - fragment-cache "^0.2.1" - kind-of "^6.0.2" - nanomatch "^1.2.9" - object.pick "^1.3.0" - regex-not "^1.0.0" - snapdragon "^0.8.1" - to-regex "^3.0.2" - -mime-db@~1.37.0: - version "1.37.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.37.0.tgz#0b6a0ce6fdbe9576e25f1f2d2fde8830dc0ad0d8" - -mime-types@^2.1.12, mime-types@~2.1.18, mime-types@~2.1.19: - version "2.1.21" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.21.tgz#28995aa1ecb770742fe6ae7e58f9181c744b3f96" - dependencies: - mime-db "~1.37.0" - -mime@1.4.1: - version "1.4.1" - resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6" - -mime@2.3.1: - version "2.3.1" - resolved "http://registry.npmjs.org/mime/-/mime-2.3.1.tgz#b1621c54d63b97c47d3cfe7f7215f7d64517c369" - -minimatch@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" - dependencies: - brace-expansion "^1.1.7" - -minimist@0.0.8: - version "0.0.8" - resolved "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" - -minimist@^1.2.0: - version "1.2.0" - resolved "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" - -minipass@^2.2.1, minipass@^2.3.4: - version "2.3.5" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.5.tgz#cacebe492022497f656b0f0f51e2682a9ed2d848" - dependencies: - safe-buffer "^5.1.2" - yallist "^3.0.0" - -minizlib@^1.1.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.2.1.tgz#dd27ea6136243c7c880684e8672bb3a45fd9b614" - dependencies: - minipass "^2.2.1" - -mixin-deep@^1.2.0: - version "1.3.1" - resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.1.tgz#a49e7268dce1a0d9698e45326c5626df3543d0fe" - dependencies: - for-in "^1.0.2" - is-extendable "^1.0.1" - -mkdirp@^0.5.0, mkdirp@^0.5.1: - version "0.5.1" - resolved "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" - dependencies: - minimist "0.0.8" - -ms@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" - -ms@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a" - -mustache-express@^1.2.7: - version "1.2.8" - resolved "https://registry.yarnpkg.com/mustache-express/-/mustache-express-1.2.8.tgz#caf3fc93e5b729e92077b1c4ff713aba4bced259" - dependencies: - async "~2.6.0" - lru-cache "~4.1.3" - mustache "~2.3.0" - -mustache@~2.3.0: - version "2.3.2" - resolved "https://registry.yarnpkg.com/mustache/-/mustache-2.3.2.tgz#a6d4d9c3f91d13359ab889a812954f9230a3d0c5" - -nan@^2.9.2: - version "2.12.1" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.12.1.tgz#7b1aa193e9aa86057e3c7bbd0ac448e770925552" - -nanomatch@^1.2.9: - version "1.2.13" - resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119" - dependencies: - arr-diff "^4.0.0" - array-unique "^0.3.2" - define-property "^2.0.2" - extend-shallow "^3.0.2" - fragment-cache "^0.2.1" - is-windows "^1.0.2" - kind-of "^6.0.2" - object.pick "^1.3.0" - regex-not "^1.0.0" - snapdragon "^0.8.1" - to-regex "^3.0.1" - -needle@^2.2.1: - version "2.2.4" - resolved "https://registry.yarnpkg.com/needle/-/needle-2.2.4.tgz#51931bff82533b1928b7d1d69e01f1b00ffd2a4e" - dependencies: - debug "^2.1.2" - iconv-lite "^0.4.4" - sax "^1.2.4" - -negotiator@0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9" - -node-pre-gyp@^0.10.0: - version "0.10.3" - resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.10.3.tgz#3070040716afdc778747b61b6887bf78880b80fc" - dependencies: - detect-libc "^1.0.2" - mkdirp "^0.5.1" - needle "^2.2.1" - nopt "^4.0.1" - npm-packlist "^1.1.6" - npmlog "^4.0.2" - rc "^1.2.7" - rimraf "^2.6.1" - semver "^5.3.0" - tar "^4" - -nodemon@^1.18.4: - version "1.18.9" - resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-1.18.9.tgz#90b467efd3b3c81b9453380aeb2a2cba535d0ead" - dependencies: - chokidar "^2.0.4" - debug "^3.1.0" - ignore-by-default "^1.0.1" - minimatch "^3.0.4" - pstree.remy "^1.1.6" - semver "^5.5.0" - supports-color "^5.2.0" - touch "^3.1.0" - undefsafe "^2.0.2" - update-notifier "^2.5.0" - -nopt@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d" - dependencies: - abbrev "1" - osenv "^0.1.4" - -nopt@~1.0.10: - version "1.0.10" - resolved "https://registry.yarnpkg.com/nopt/-/nopt-1.0.10.tgz#6ddd21bd2a31417b92727dd585f8a6f37608ebee" - dependencies: - abbrev "1" - -normalize-path@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9" - dependencies: - remove-trailing-separator "^1.0.1" - -npm-bundled@^1.0.1: - version "1.0.5" - resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.5.tgz#3c1732b7ba936b3a10325aef616467c0ccbcc979" - -npm-packlist@^1.1.6: - version "1.1.12" - resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.1.12.tgz#22bde2ebc12e72ca482abd67afc51eb49377243a" - dependencies: - ignore-walk "^3.0.1" - npm-bundled "^1.0.1" - -npm-run-path@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f" - dependencies: - path-key "^2.0.0" - -npmlog@^4.0.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" - dependencies: - are-we-there-yet "~1.1.2" - console-control-strings "~1.1.0" - gauge "~2.7.3" - set-blocking "~2.0.0" - -number-is-nan@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" - -oauth-sign@~0.9.0: - version "0.9.0" - resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455" - -object-assign@^4.1.0: - version "4.1.1" - resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" - -object-copy@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c" - dependencies: - copy-descriptor "^0.1.0" - define-property "^0.2.5" - kind-of "^3.0.3" - -object-visit@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb" - dependencies: - isobject "^3.0.0" - -object.pick@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747" - dependencies: - isobject "^3.0.1" - -on-finished@~2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947" - dependencies: - ee-first "1.1.1" - -once@^1.3.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" - dependencies: - wrappy "1" - -os-homedir@^1.0.0: - version "1.0.2" - resolved "http://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" - -os-tmpdir@^1.0.0: - version "1.0.2" - resolved "http://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" - -osenv@^0.1.4: - version "0.1.5" - resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410" - dependencies: - os-homedir "^1.0.0" - os-tmpdir "^1.0.0" - -p-finally@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae" - -package-json@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/package-json/-/package-json-4.0.1.tgz#8869a0401253661c4c4ca3da6c2121ed555f5eed" - dependencies: - got "^6.7.1" - registry-auth-token "^3.0.1" - registry-url "^3.0.3" - semver "^5.1.0" - -packet-reader@0.3.1: - version "0.3.1" - resolved "https://registry.yarnpkg.com/packet-reader/-/packet-reader-0.3.1.tgz#cd62e60af8d7fea8a705ec4ff990871c46871f27" - -pako@~1.0.2: - version "1.0.7" - resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.7.tgz#2473439021b57f1516c82f58be7275ad8ef1bb27" - -parseurl@~1.3.2: - version "1.3.2" - resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.2.tgz#fc289d4ed8993119460c156253262cdc8de65bf3" - -pascalcase@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14" - -path-dirname@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0" - -path-is-absolute@^1.0.0: - version "1.0.1" - resolved "http://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" - -path-is-inside@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53" - -path-key@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40" - -path-to-regexp@0.1.7: - version "0.1.7" - resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" - -performance-now@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" - -pg-connection-string@0.1.3: - version "0.1.3" - resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-0.1.3.tgz#da1847b20940e42ee1492beaf65d49d91b245df7" - -pg-minify@0.5.5: - version "0.5.5" - resolved "https://registry.yarnpkg.com/pg-minify/-/pg-minify-0.5.5.tgz#6c961a61aa19f469d8edfe5a3c0da58760f3c339" - -pg-pool@^2.0.4: - version "2.0.5" - resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-2.0.5.tgz#f00556fab23f1bbb14b0650ba8d0e447434a1b04" - -pg-promise@^8.4.5: - version "8.5.4" - resolved "https://registry.yarnpkg.com/pg-promise/-/pg-promise-8.5.4.tgz#3c1c656d340b1d8e21bbd8017a650c795b375aca" - dependencies: - manakin "0.5.2" - pg "7.7.1" - pg-minify "0.5.5" - spex "2.1.0" - -pg-types@~1.12.1: - version "1.12.1" - resolved "https://registry.yarnpkg.com/pg-types/-/pg-types-1.12.1.tgz#d64087e3903b58ffaad279e7595c52208a14c3d2" - dependencies: - postgres-array "~1.0.0" - postgres-bytea "~1.0.0" - postgres-date "~1.0.0" - postgres-interval "^1.1.0" - -pg@7.7.1: - version "7.7.1" - resolved "https://registry.yarnpkg.com/pg/-/pg-7.7.1.tgz#546b192ff484322b69689391f885de3ba91a30d4" - dependencies: - buffer-writer "2.0.0" - packet-reader "0.3.1" - pg-connection-string "0.1.3" - pg-pool "^2.0.4" - pg-types "~1.12.1" - pgpass "1.x" - semver "4.3.2" - -pgpass@1.x: - version "1.0.2" - resolved "https://registry.yarnpkg.com/pgpass/-/pgpass-1.0.2.tgz#2a7bb41b6065b67907e91da1b07c1847c877b306" - dependencies: - split "^1.0.0" - -pify@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176" - -posix-character-classes@^0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" - -postgres-array@~1.0.0: - version "1.0.3" - resolved "https://registry.yarnpkg.com/postgres-array/-/postgres-array-1.0.3.tgz#c561fc3b266b21451fc6555384f4986d78ec80f5" - -postgres-bytea@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/postgres-bytea/-/postgres-bytea-1.0.0.tgz#027b533c0aa890e26d172d47cf9ccecc521acd35" - -postgres-date@~1.0.0: - version "1.0.3" - resolved "https://registry.yarnpkg.com/postgres-date/-/postgres-date-1.0.3.tgz#e2d89702efdb258ff9d9cee0fe91bd06975257a8" - -postgres-interval@^1.1.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/postgres-interval/-/postgres-interval-1.1.2.tgz#bf71ff902635f21cb241a013fc421d81d1db15a9" - dependencies: - xtend "^4.0.0" - -prepend-http@^1.0.1: - version "1.0.4" - resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc" - -process-nextick-args@~1.0.6: - version "1.0.7" - resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3" - -process-nextick-args@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa" - -proxy-addr@~2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.4.tgz#ecfc733bf22ff8c6f407fa275327b9ab67e48b93" - dependencies: - forwarded "~0.1.2" - ipaddr.js "1.8.0" - -pseudomap@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3" - -psl@^1.1.24, psl@^1.1.28: - version "1.1.31" - resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.31.tgz#e9aa86d0101b5b105cbe93ac6b784cd547276184" - -pstree.remy@^1.1.6: - version "1.1.6" - resolved "https://registry.yarnpkg.com/pstree.remy/-/pstree.remy-1.1.6.tgz#73a55aad9e2d95814927131fbf4dc1b62d259f47" - -punycode@^1.4.1: - version "1.4.1" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" - -punycode@^2.1.0, punycode@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" - -qs@6.5.2, qs@~6.5.2: - version "6.5.2" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36" - -range-parser@~1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e" - -raw-body@2.3.3: - version "2.3.3" - resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.3.3.tgz#1b324ece6b5706e153855bc1148c65bb7f6ea0c3" - dependencies: - bytes "3.0.0" - http-errors "1.6.3" - iconv-lite "0.4.23" - unpipe "1.0.0" - -rc@^1.0.1, rc@^1.1.6, rc@^1.2.7: - version "1.2.8" - resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" - dependencies: - deep-extend "^0.6.0" - ini "~1.3.0" - minimist "^1.2.0" - strip-json-comments "~2.0.1" - -readable-stream@^2.0.2, readable-stream@^2.0.6: - version "2.3.6" - resolved "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf" - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.3" - isarray "~1.0.0" - process-nextick-args "~2.0.0" - safe-buffer "~5.1.1" - string_decoder "~1.1.1" - util-deprecate "~1.0.1" - -readable-stream@~2.0.6: - version "2.0.6" - resolved "http://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e" - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.1" - isarray "~1.0.0" - process-nextick-args "~1.0.6" - string_decoder "~0.10.x" - util-deprecate "~1.0.1" - -readdirp@^2.0.0: - version "2.2.1" - resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525" - dependencies: - graceful-fs "^4.1.11" - micromatch "^3.1.10" - readable-stream "^2.0.2" - -regex-not@^1.0.0, regex-not@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c" - dependencies: - extend-shallow "^3.0.2" - safe-regex "^1.1.0" - -registry-auth-token@^3.0.1: - version "3.3.2" - resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.3.2.tgz#851fd49038eecb586911115af845260eec983f20" - dependencies: - rc "^1.1.6" - safe-buffer "^5.0.1" - -registry-url@^3.0.3: - version "3.1.0" - resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-3.1.0.tgz#3d4ef870f73dde1d77f0cf9a381432444e174942" - dependencies: - rc "^1.0.1" - -remove-trailing-separator@^1.0.1: - version "1.1.0" - resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef" - -repeat-element@^1.1.2: - version "1.1.3" - resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce" - -repeat-string@^1.6.1: - version "1.6.1" - resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" - -request-promise-core@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.1.tgz#3eee00b2c5aa83239cfb04c5700da36f81cd08b6" - dependencies: - lodash "^4.13.1" - -request-promise@^4.2.2: - version "4.2.2" - resolved "https://registry.yarnpkg.com/request-promise/-/request-promise-4.2.2.tgz#d1ea46d654a6ee4f8ee6a4fea1018c22911904b4" - dependencies: - bluebird "^3.5.0" - request-promise-core "1.1.1" - stealthy-require "^1.1.0" - tough-cookie ">=2.3.3" - -request@^2.88.0: - version "2.88.0" - resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef" - dependencies: - aws-sign2 "~0.7.0" - aws4 "^1.8.0" - caseless "~0.12.0" - combined-stream "~1.0.6" - extend "~3.0.2" - forever-agent "~0.6.1" - form-data "~2.3.2" - har-validator "~5.1.0" - http-signature "~1.2.0" - is-typedarray "~1.0.0" - isstream "~0.1.2" - json-stringify-safe "~5.0.1" - mime-types "~2.1.19" - oauth-sign "~0.9.0" - performance-now "^2.1.0" - qs "~6.5.2" - safe-buffer "^5.1.2" - tough-cookie "~2.4.3" - tunnel-agent "^0.6.0" - uuid "^3.3.2" - -resolve-url@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" - -ret@~0.1.10: - version "0.1.15" - resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc" - -rimraf@^2.6.1: - version "2.6.2" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36" - dependencies: - glob "^7.0.5" - -safe-buffer@5.1.2, safe-buffer@^5.0.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: - version "5.1.2" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" - -safe-regex@^1.1.0: - version "1.1.0" - resolved "http://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e" - dependencies: - ret "~0.1.10" - -"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: - version "2.1.2" - resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" - -sax@^1.2.4: - version "1.2.4" - resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" - -semver-diff@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-2.1.0.tgz#4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36" - dependencies: - semver "^5.0.3" - -semver@4.3.2: - version "4.3.2" - resolved "http://registry.npmjs.org/semver/-/semver-4.3.2.tgz#c7a07158a80bedd052355b770d82d6640f803be7" - -semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.5.0: - version "5.6.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004" - -send@0.16.2: - version "0.16.2" - resolved "https://registry.yarnpkg.com/send/-/send-0.16.2.tgz#6ecca1e0f8c156d141597559848df64730a6bbc1" - dependencies: - debug "2.6.9" - depd "~1.1.2" - destroy "~1.0.4" - encodeurl "~1.0.2" - escape-html "~1.0.3" - etag "~1.8.1" - fresh "0.5.2" - http-errors "~1.6.2" - mime "1.4.1" - ms "2.0.0" - on-finished "~2.3.0" - range-parser "~1.2.0" - statuses "~1.4.0" - -serve-static@1.13.2: - version "1.13.2" - resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.2.tgz#095e8472fd5b46237db50ce486a43f4b86c6cec1" - dependencies: - encodeurl "~1.0.2" - escape-html "~1.0.3" - parseurl "~1.3.2" - send "0.16.2" - -set-blocking@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" - -set-value@^0.4.3: - version "0.4.3" - resolved "https://registry.yarnpkg.com/set-value/-/set-value-0.4.3.tgz#7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1" - dependencies: - extend-shallow "^2.0.1" - is-extendable "^0.1.1" - is-plain-object "^2.0.1" - to-object-path "^0.3.0" - -set-value@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.0.tgz#71ae4a88f0feefbbf52d1ea604f3fb315ebb6274" - dependencies: - extend-shallow "^2.0.1" - is-extendable "^0.1.1" - is-plain-object "^2.0.3" - split-string "^3.0.1" - -setprototypeof@1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656" - -shebang-command@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" - dependencies: - shebang-regex "^1.0.0" - -shebang-regex@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3" - -signal-exit@^3.0.0, signal-exit@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d" - -snapdragon-node@^2.0.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b" - dependencies: - define-property "^1.0.0" - isobject "^3.0.0" - snapdragon-util "^3.0.1" - -snapdragon-util@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2" - dependencies: - kind-of "^3.2.0" - -snapdragon@^0.8.1: - version "0.8.2" - resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d" - dependencies: - base "^0.11.1" - debug "^2.2.0" - define-property "^0.2.5" - extend-shallow "^2.0.1" - map-cache "^0.2.2" - source-map "^0.5.6" - source-map-resolve "^0.5.0" - use "^3.1.0" - -source-map-resolve@^0.5.0: - version "0.5.2" - resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.2.tgz#72e2cc34095543e43b2c62b2c4c10d4a9054f259" - dependencies: - atob "^2.1.1" - decode-uri-component "^0.2.0" - resolve-url "^0.2.1" - source-map-url "^0.4.0" - urix "^0.1.0" - -source-map-url@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3" - -source-map@^0.5.6: - version "0.5.7" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" - -spex@2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/spex/-/spex-2.1.0.tgz#21939ab7722322c3a1d002870fab022daa79335f" - -split-string@^3.0.1, split-string@^3.0.2: - version "3.1.0" - resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2" - dependencies: - extend-shallow "^3.0.0" - -split@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/split/-/split-1.0.1.tgz#605bd9be303aa59fb35f9229fbea0ddec9ea07d9" - dependencies: - through "2" - -sshpk@^1.7.0: - version "1.16.0" - resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.0.tgz#1d4963a2fbffe58050aa9084ca20be81741c07de" - dependencies: - asn1 "~0.2.3" - assert-plus "^1.0.0" - bcrypt-pbkdf "^1.0.0" - dashdash "^1.12.0" - ecc-jsbn "~0.1.1" - getpass "^0.1.1" - jsbn "~0.1.0" - safer-buffer "^2.0.2" - tweetnacl "~0.14.0" - -static-extend@^0.1.1: - version "0.1.2" - resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6" - dependencies: - define-property "^0.2.5" - object-copy "^0.1.0" - -"statuses@>= 1.4.0 < 2": - version "1.5.0" - resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" - -statuses@~1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087" - -stealthy-require@^1.1.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b" - -string-width@^1.0.1: - version "1.0.2" - resolved "http://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" - dependencies: - code-point-at "^1.0.0" - is-fullwidth-code-point "^1.0.0" - strip-ansi "^3.0.0" - -"string-width@^1.0.2 || 2", string-width@^2.0.0, string-width@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" - dependencies: - is-fullwidth-code-point "^2.0.0" - strip-ansi "^4.0.0" - -string_decoder@~0.10.x: - version "0.10.31" - resolved "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" - -string_decoder@~1.1.1: - version "1.1.1" - resolved "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" - dependencies: - safe-buffer "~5.1.0" - -strip-ansi@^3.0.0, strip-ansi@^3.0.1: - version "3.0.1" - resolved "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" - dependencies: - ansi-regex "^2.0.0" - -strip-ansi@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f" - dependencies: - ansi-regex "^3.0.0" - -strip-eof@^1.0.0: - version "1.0.0" - resolved "http://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf" - -strip-json-comments@~2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" - -supports-color@^5.2.0, supports-color@^5.3.0: - version "5.5.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" - dependencies: - has-flag "^3.0.0" - -tar@^4: - version "4.4.8" - resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.8.tgz#b19eec3fde2a96e64666df9fdb40c5ca1bc3747d" - dependencies: - chownr "^1.1.1" - fs-minipass "^1.2.5" - minipass "^2.3.4" - minizlib "^1.1.1" - mkdirp "^0.5.0" - safe-buffer "^5.1.2" - yallist "^3.0.2" - -term-size@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/term-size/-/term-size-1.2.0.tgz#458b83887f288fc56d6fffbfad262e26638efa69" - dependencies: - execa "^0.7.0" - -through@2: - version "2.3.8" - resolved "http://registry.npmjs.org/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" - -timed-out@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f" - -to-object-path@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af" - dependencies: - kind-of "^3.0.2" - -to-regex-range@^2.1.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38" - dependencies: - is-number "^3.0.0" - repeat-string "^1.6.1" - -to-regex@^3.0.1, to-regex@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce" - dependencies: - define-property "^2.0.2" - extend-shallow "^3.0.2" - regex-not "^1.0.2" - safe-regex "^1.1.0" - -touch@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/touch/-/touch-3.1.0.tgz#fe365f5f75ec9ed4e56825e0bb76d24ab74af83b" - dependencies: - nopt "~1.0.10" - -tough-cookie@>=2.3.3: - version "2.5.0" - resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2" - dependencies: - psl "^1.1.28" - punycode "^2.1.1" - -tough-cookie@~2.4.3: - version "2.4.3" - resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781" - dependencies: - psl "^1.1.24" - punycode "^1.4.1" - -tunnel-agent@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" - dependencies: - safe-buffer "^5.0.1" - -tweetnacl@^0.14.3, tweetnacl@~0.14.0: - version "0.14.5" - resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" - -type-is@~1.6.16: - version "1.6.16" - resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.16.tgz#f89ce341541c672b25ee7ae3c73dee3b2be50194" - dependencies: - media-typer "0.3.0" - mime-types "~2.1.18" - -undefsafe@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/undefsafe/-/undefsafe-2.0.2.tgz#225f6b9e0337663e0d8e7cfd686fc2836ccace76" - dependencies: - debug "^2.2.0" - -union-value@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4" - dependencies: - arr-union "^3.1.0" - get-value "^2.0.6" - is-extendable "^0.1.1" - set-value "^0.4.3" - -unique-string@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-1.0.0.tgz#9e1057cca851abb93398f8b33ae187b99caec11a" - dependencies: - crypto-random-string "^1.0.0" - -unpipe@1.0.0, unpipe@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" - -unset-value@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559" - dependencies: - has-value "^0.3.1" - isobject "^3.0.0" - -unzip-response@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97" - -upath@^1.0.5: - version "1.1.0" - resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.0.tgz#35256597e46a581db4793d0ce47fa9aebfc9fabd" - -update-notifier@^2.5.0: - version "2.5.0" - resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-2.5.0.tgz#d0744593e13f161e406acb1d9408b72cad08aff6" - dependencies: - boxen "^1.2.1" - chalk "^2.0.1" - configstore "^3.0.0" - import-lazy "^2.1.0" - is-ci "^1.0.10" - is-installed-globally "^0.1.0" - is-npm "^1.0.0" - latest-version "^3.0.0" - semver-diff "^2.0.0" - xdg-basedir "^3.0.0" - -uri-js@^4.2.2: - version "4.2.2" - resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0" - dependencies: - punycode "^2.1.0" - -urix@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72" - -url-parse-lax@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-1.0.0.tgz#7af8f303645e9bd79a272e7a14ac68bc0609da73" - dependencies: - prepend-http "^1.0.1" - -use@^3.1.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f" - -util-deprecate@~1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" - -utils-merge@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" - -uuid@3.3.2, uuid@^3.3.2: - version "3.3.2" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131" - -vary@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" - -verror@1.10.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400" - dependencies: - assert-plus "^1.0.0" - core-util-is "1.0.2" - extsprintf "^1.2.0" - -which@^1.2.9: - version "1.3.1" - resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" - dependencies: - isexe "^2.0.0" - -wide-align@^1.1.0: - version "1.1.3" - resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457" - dependencies: - string-width "^1.0.2 || 2" - -widest-line@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-2.0.1.tgz#7438764730ec7ef4381ce4df82fb98a53142a3fc" - dependencies: - string-width "^2.1.1" - -wrappy@1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" - -write-file-atomic@^2.0.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.3.0.tgz#1ff61575c2e2a4e8e510d6fa4e243cce183999ab" - dependencies: - graceful-fs "^4.1.11" - imurmurhash "^0.1.4" - signal-exit "^3.0.2" - -xdg-basedir@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-3.0.0.tgz#496b2cc109eca8dbacfe2dc72b603c17c5870ad4" - -xmlbuilder@10.0.0: - version "10.0.0" - resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-10.0.0.tgz#c64e52f8ae097fe5fd46d1c38adaade071ee1b55" - -xtend@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af" - -yallist@^2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" - -yallist@^3.0.0, yallist@^3.0.2: - version "3.0.3" - resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.3.tgz#b4b049e314be545e3ce802236d6cd22cd91c3de9" diff --git a/services/.gitignore b/services/.gitignore deleted file mode 100644 index e3409419..00000000 --- a/services/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -node_modules -*.log -*.pyc -*.xlsx -.vscode/ -nodemon.json \ No newline at end of file diff --git a/services/rainmaker-custom-service/.dockerignore b/services/rainmaker-custom-service/.dockerignore deleted file mode 100644 index 3c3629e6..00000000 --- a/services/rainmaker-custom-service/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -node_modules diff --git a/services/rainmaker-custom-service/.gitignore b/services/rainmaker-custom-service/.gitignore deleted file mode 100644 index 4f9f8bf4..00000000 --- a/services/rainmaker-custom-service/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -sampleRequest.js -nodemon.json \ No newline at end of file diff --git a/services/rainmaker-custom-service/Dockerfile b/services/rainmaker-custom-service/Dockerfile deleted file mode 100644 index c7c85163..00000000 --- a/services/rainmaker-custom-service/Dockerfile +++ /dev/null @@ -1,9 +0,0 @@ -FROM node:8.12-alpine -RUN npm install -g yarn -RUN mkdir /opt/app -COPY package.json yarn.lock /opt/app/ -WORKDIR /opt/app -RUN yarn install -COPY . /opt/app -CMD ["node", "index.js"] - diff --git a/services/rainmaker-custom-service/bnd.js b/services/rainmaker-custom-service/bnd.js deleted file mode 100644 index 3514c63d..00000000 --- a/services/rainmaker-custom-service/bnd.js +++ /dev/null @@ -1,15 +0,0 @@ -let requests = require("request") - -requests.post("http://13.126.198.70/eDistServices/ModuleCommon/serAuth.asmx/serAuthExternalUser", - { - form: { - username: "eomcbrn", - password: "esewa@123" - }, - headers: { - "x-api-key": "Tw0AxM3kyV3mb8SM" - } - } -,function(a,b,c) { - console.log(a,c); -}) \ No newline at end of file diff --git a/services/rainmaker-custom-service/build.wkflo b/services/rainmaker-custom-service/build.wkflo deleted file mode 100644 index 95cba3d1..00000000 --- a/services/rainmaker-custom-service/build.wkflo +++ /dev/null @@ -1,9 +0,0 @@ -def build(path, ci_image) { - stage("Build") { - docker.image("egovio/ci-react:v8.4.0").inside { - sh "cd ${path}/ && rm -rf node_modules"; - } - } -} - -return this; diff --git a/services/rainmaker-custom-service/encrypt.js b/services/rainmaker-custom-service/encrypt.js deleted file mode 100644 index 130ba4c9..00000000 --- a/services/rainmaker-custom-service/encrypt.js +++ /dev/null @@ -1,41 +0,0 @@ -const ENCRYPTION_KEY = process.env.ENCRYPTION_KEY -const ENCRYPTION_IV = process.env.ENCRYPTION_IV -const JWT_KEY = process.env.JWT_KEY -const JWT_EXPIRY = process.env.JWT_EXPIRY || '5min' -const DEBUG_MODE = Boolean(process.env.DEBUG_MODE) || false; - -function log(val) { - if (DEBUG_MODE) { - console.log(val) - } -} - -log ("EK=" + ENCRYPTION_KEY) -log ("EI=" + ENCRYPTION_IV) - -var encrypt = function (pass) { - // Include Library - var crypto = require('crypto'); - - // Declare Key and Block - var key = ENCRYPTION_KEY; - var iv = ENCRYPTION_IV; - - // Calc Cipher - var cipher = crypto.createCipheriv('aes256', key, iv) - var crypted = cipher.update(pass, 'utf8', 'base64') - crypted += cipher.final('base64'); - - // Return Cipher Text - return crypted; -} - - -var jwt = require("jsonwebtoken"); - -jwt_sign = (data) => jwt.sign(data, JWT_KEY, { expiresIn: JWT_EXPIRY }); - -module.exports = { - jwt_sign, - encrypt -} \ No newline at end of file diff --git a/services/rainmaker-custom-service/index.js b/services/rainmaker-custom-service/index.js deleted file mode 100644 index 568554fc..00000000 --- a/services/rainmaker-custom-service/index.js +++ /dev/null @@ -1,581 +0,0 @@ -var express = require('express'), - slash = require('express-slash'); -var bodyParser = require('body-parser') - -var request = require('request-promise'); -const { - asyncMiddleware -} = require('./utils/asyncMiddleware'); - -var app = express(); -var mustache = require('mustache-express') -const Cryptr = require('cryptr'); -var {encrypt, jwt_sign } = require('./encrypt') - -app.engine('html', mustache()) -app.set('view engine', 'html') -app.set('views', __dirname + '/templates') -app.disable('view cache'); - -// https://codepen.io/graphicfreedom/pen/evaBXm - -const DEBUG_MODE = Boolean(process.env.DEBUG_MODE) || false; -const PT_DEMAND_HOST = process.env.PT_DEMAND_HOST -const EGOV_MDMS_HOST = process.env.EGOV_MDMS_HOST -const EGOV_BND_LOGIN_URL = process.env.EGOV_BND_LOGIN_URL -const EGOV_BND_REDIRECT_URL = process.env.EGOV_BND_REDIRECT_URL -// const EGOV_BND_API_KEY = process.env.EGOV_BND_API_KEY -const EGOV_BND_ENCRYPTION_KEY = process.env.EGOV_BND_ENCRYPTION_KEY || "Vol0otuji0X03wSuZGI3zySUzxj7bReQ" - -function log(val) { - if (DEBUG_MODE) { - console.log(val) - } -} - -log ("ENCKEY=" + EGOV_BND_ENCRYPTION_KEY) - -const cryptr = new Cryptr(EGOV_BND_ENCRYPTION_KEY); - - -function getUserUUID(data) { - return data.RequestInfo.userInfo.uuid; -} - -function getUserID(data) { - return data.RequestInfo.userInfo.id; -} - -async function getFireCessConfig(tenantId) { - let fireCessConfig = await request.post({ - url: EGOV_MDMS_HOST + "egov-mdms-service/v1/_search?tenantId=" + tenantId, - body: { - RequestInfo: { - "apiId": "Rainmaker-custom-service", - "ver": ".01", - "ts": "", - "action": "_search", - "did": "1", - "key": "", - "msgId": "20170310130900|en_IN", - "authToken": null - }, - "MdmsCriteria": { - "tenantId": tenantId, - "moduleDetails": [{ - "moduleName": "PropertyTax", - "masterDetails": [{ - "name": "FireCess" - }] - }] - } - }, - json: true - }) - - return fireCessConfig["MdmsRes"]["PropertyTax"]["FireCess"][0]; -} - -const TAX_TYPE = { - PT_TAX: false, - PT_TIME_REBATE: true, - PT_UNIT_USAGE_EXEMPTION: true, - PT_TIME_PENALTY: false, - PT_CANCER_CESS: false, - PT_ADHOC_PENALTY: false, - PT_ADHOC_REBATE: true, - PT_DECIMAL_CEILING_CREDIT: false, - PT_DECIMAL_CEILING_DEBIT: true, - PT_FIRE_CESS: false, - PT_OWNER_EXEMPTION: true, - PT_TIME_INTEREST: false -} - -if (PT_DEMAND_HOST === undefined) { - throw Error("PT_DEMAND_HOST environment variable needs to be configured to run this") -} - -function round(num, digits) { - return parseFloat(parseFloat(num).toFixed(digits)) -} - -// parse application/x-www-form-urlencoded -app.use(bodyParser.urlencoded({ - extended: true -})) - -// parse application/json -app.use(bodyParser.json()) - -// Because you're the type of developer who cares about this sort of thing! -app.enable('strict routing'); - -// Create the router using the same routing options as the app. -var router = express.Router({ - caseSensitive: app.get('case sensitive routing'), - strict: app.get('strict routing') -}); - -router.use("/static", express.static("static")) - -// Add the `slash()` middleware after your app's `router`, optionally specify -// an HTTP status code to use when redirecting (defaults to 301). -app.use('/customization', router); -// app.use(slash()); -app.use(express.json()); - -var promise = require('bluebird'); - -var options = { - // Initialization Options - promiseLib: promise -}; - -var pgp = require('pg-promise')(options); - -const connectionString = { - host: process.env.DB_HOST || 'localhost', - port: 5432, - database: process.env.DB_NAME || 'postgres', - user: process.env.DB_USER || 'postgres', - password: process.env.DB_PASSWORD || 'postgres' -}; - -// var connectionString = 'postgres://localhost:5432/egov_prod_db'; -var db = pgp(connectionString); -var path = require('path'); - -query = `SELECT servicerequestid as complaint_no, servicecode as complaint_type, eg_user.name as citizen_name, eg_user.mobilenumber as citizen_mobile, address, landmark, description as details -FROM eg_pgr_service INNER JOIN eg_user ON eg_pgr_service.accountid = cast(eg_user.id as varchar) -WHERE eg_pgr_service.status = 'assigned' AND servicerequestid IN (select DISTINCT businesskey from eg_pgr_action where status = 'assigned' AND "when" -IN (select max("when") from eg_pgr_action where assignee NOTNULL group by businesskey) AND assignee = $1);` - -router.get('/open/reports/*', function (req, res) { - res.render('apicall.html'); -}); - -router.get('/open/bndlogin', function (req, res) { - res.render('bndlogin.html'); -}); - -router.post('/protected/bndlogin/unlinkAccount', asyncMiddleware(async function (req, res) { - let uuid = getUserUUID(req.body); - - data = await db.any("DELETE FROM custom_eg_user_metatdata where user_id = $1 and key = $2", [uuid, 'BND_CREDENTIALS']); - res.status(200).send({}) -})); - -router.post('/protected/bndlogin/linkAccount', asyncMiddleware(async function (req, res) { - let username = req.body.username - let password = req.body.password - let uuid = getUserUUID(req.body); - let payload = { - Username: username, - Password: encrypt(password) - } - - log("inside linkAccount") - log(payload) - - let response = await request.post(EGOV_BND_LOGIN_URL, { - json: payload - }) - - log(response) - - if (response.sys_message && response.sys_message == 'Invalid User and Password') { - res.status(200).send({ code: "INVALID_CREDENTIALS", message: "Invalid User and Password"} ) - return - } else if (response.sys_message && response.sys_message == 'INTERNAL APPLICATION ERROR') { - res.status(200).send({ code: "ERROR", message: "Something went wrong"} ) - return - } - - loginID = response["data"][0]["loginID"]; - data = await db.any("select value from custom_eg_user_metatdata where user_id = $1 and key = $2", [uuid, 'BND_CREDENTIALS']); - value = { - username, - GUID: cryptr.encrypt(loginID) - } - - if (data.length == 0) { - await db.any("insert into custom_eg_user_metatdata(key, user_id, value) values ($1, $2, $3:json)", - ['BND_CREDENTIALS', uuid, value]) - } else { - await db.any("update custom_eg_user_metatdata set value = $3:json where key = $1 and user_id = $2", - ['BND_CREDENTIALS', uuid, value]) - } - res.json({code: "SUCCESS", redirect: EGOV_BND_REDIRECT_URL + jwt_sign({loginID: encrypt(loginID)})}) -})); - -router.post('/protected/bndlogin', asyncMiddleware(async function (req, res) { - try { - let uuid = getUserUUID(req.body); - data = await db.any("select value from custom_eg_user_metatdata where user_id = $1 and key = $2", [uuid, 'BND_CREDENTIALS']); - - if (data.length == 0) { - res.json({ - "code": "NO_CREDENTIAL_MAPPING", - "message": "Please update your Birth and Death credentials" - }) - return - } - - let loginID = cryptr.decrypt(data[0]["value"]["GUID"]) - - res.json({ - code: "SUCCESS", - redirect: EGOV_BND_REDIRECT_URL + jwt_sign({loginID: encrypt(loginID)}) - }) - - } catch (ex) { - console.log("Exception occured while login", ex) - res.json({ - "code": "ERROR", - "message": "Failed to login to BND - " + ex.toString() - }) - } - -})); - -function getFireCessPercentage(propertyDetails) { - // let propertyDetails = request["CalculationCriteria"][0]["propertyDetails"][0] - - let propertyUsageCategoryMajor = propertyDetails["usageCategoryMajor"] - let units = propertyDetails["units"] - let propertyAttributes = propertyDetails["additionalDetails"] - let unitSet = new Set() - - for (unit of units) { - unitSet.add(unit["usageCategoryMajor"]) - } - let firecess_category_major = 0; - let firecess_building_height = 0; - let firecess_inflammable = 0; - - if (propertyUsageCategoryMajor == "RESIDENTIAL" || (unitSet.size == 1 && unitSet.has("RESIDENTIAL"))) { - // There is no category major firecess applicable as it i - firecess_category_major = 0 - } else { - firecess_category_major = 5.0 - } - - if (propertyAttributes && - propertyAttributes.heightAbove36Feet && - propertyAttributes.heightAbove36Feet.toString() == "true") { - // height is above 36 feet - firecess_building_height = 2.0 - } - - if (propertyAttributes && - propertyAttributes.inflammable && - propertyAttributes.inflammable.toString() == "true") { - // height is above 36 feet - firecess_inflammable = 10.0 - } - - return { - firecess_inflammable, - firecess_building_height, - firecess_category_major, - firecess: firecess_category_major + firecess_building_height + firecess_inflammable - } -} - -function calculateNewFireCess(taxHeads, firecess_percent, taxField, taxHeadCodeField) { - - let applicablePropertyTax = 0 - for (taxHead of taxHeads) { - if (taxHead[taxHeadCodeField] == "PT_TAX") { - applicablePropertyTax += taxHead[taxField] - } else if (taxHead[taxHeadCodeField] == "PT_UNIT_USAGE_EXEMPTION") { - applicablePropertyTax -= taxHead[taxField] - } else if (taxHead[taxHeadCodeField] == "PT_OWNER_EXEMPTION") { - applicablePropertyTax -= taxHead[taxField] - } - } - - return round(applicablePropertyTax * (firecess_percent / 100), 2); -} - -async function findDemandForConsumerCode(consumerCode, tenantId, service, RequestInfo) { - let demandSearchResponse = await request.post({ - url: PT_DEMAND_HOST + "/billing-service/demand/_search?tenantId=" + tenantId + - "&consumerCode=" + consumerCode + "&businessService=" + service, - body: { - RequestInfo - }, - json: true - }) - - return demandSearchResponse; -} - -async function updateDemand(demands, RequestInfo) { - let demandUpdateResponse = await request.post({ - url: PT_DEMAND_HOST + "/billing-service/demand/_update", - body: { - RequestInfo, - "Demands": demands - }, - json: true - }) - - return demandUpdateResponse; -} - -function _estimateTaxProcessor(request, response) { - let index = 0; - for (let calc of request["CalculationCriteria"]) { - let fireCessPercentage = getFireCessPercentage(calc["property"]["propertyDetails"][0]) - - let updateFirecessAmount = calculateNewFireCess(response["Calculation"][0]["taxHeadEstimates"], fireCessPercentage.firecess, "estimateAmount", "taxHeadCode") - let taxes = getUpdateTaxSummary(response["Calculation"][index], updateFirecessAmount, "taxHeadCode", "estimateAmount") - - response["Calculation"][index]["totalAmount"] = taxes.totalAmount - response["Calculation"][index]["taxAmount"] = round(taxes.taxAmount, 2) - response["Calculation"][index]["rebate"] = taxes.rebate - - index++ - } - - return response; -} - -function getUpdateTaxSummary(calculation, newTaxAmount, taxHeadCodeField, taxAmountField) { - let ceilingTaxHead = null; - let firecessTaxHead = null; - - let taxAmount = 0, - penalty = 0, - rebate = 0, - exemption = 0 - let taxHeads = calculation["taxHeadEstimates"] - for (taxHead of taxHeads) { - if (taxHead[taxHeadCodeField] == "PT_FIRE_CESS") { - let existingTaxAmount = taxHead[taxAmountField] - taxHead[taxAmountField] = newTaxAmount - firecessTaxHead = taxHead - taxAmount += newTaxAmount - if (DEBUG_MODE) { - taxHead.oldEstimateAmount = existingTaxAmount - } - } else { - switch (taxHead[taxHeadCodeField]) { - case "PT_DECIMAL_CEILING_CREDIT": - case "PT_DECIMAL_CEILING_DEBIT": - ceilingTaxHead = taxHead - break - case "PT_ADVANCE_CARRYFORWARD": - exemption += taxHead[taxAmountField] - break - default: - switch (taxHead.category) { - case "PENALTY": - penalty += taxHead[taxAmountField] - break - case "TAX": - taxAmount += taxHead[taxAmountField] - break - case "REBATE": - rebate += taxHead[taxAmountField] - break - case "EXEMPTION": - exemption += taxHead[taxAmountField] - break - default: - console.log("Going to default for taxHead", taxHead) - taxAmount += taxHead[taxAmountField] - } - - } - } - } - - taxAmount = round(taxAmount, 2) - penalty = round(penalty, 2) - exemption = round(exemption, 2) - rebate = round(rebate, 2) - - let totalAmount = taxAmount + penalty - rebate - exemption - - totalAmount = round(totalAmount, 2) - let fractionAmount = totalAmount - Math.trunc(totalAmount) - let newCeilingTax = false - - if (ceilingTaxHead == null && fractionAmount == 0) { - - } else { - let ceilingDelta = 0.0; - - if (ceilingTaxHead == null) { - ceilingTaxHead = { - taxHeadCode: "", - estimateAmount: 0, - category: null - } - newCeilingTax = true - taxHeads.push(ceilingTaxHead) - } - - if (fractionAmount < 0.5) { - ceilingDelta = parseFloat(fractionAmount.toFixed(2)) - totalAmount = Math.trunc(totalAmount) - ceilingTaxHead[taxHeadCodeField] = "PT_DECIMAL_CEILING_DEBIT" - ceilingTaxHead[taxAmountField] = ceilingDelta - rebate += ceilingDelta - } else { - ceilingDelta = parseFloat((1 - fractionAmount).toFixed(2)) - - totalAmount = Math.trunc(totalAmount) + 1 - ceilingTaxHead[taxHeadCodeField] = "PT_DECIMAL_CEILING_CREDIT" - ceilingTaxHead[taxAmountField] = ceilingDelta - taxAmount += ceilingDelta - } - } - - return { - taxHeads, - rebate, - totalAmount, - taxAmount, - newCeilingTax, - ceilingTaxHead, - firecessTaxHead - } -} - -async function _createAndUpdateTaxProcessor(request, response) { - let index = 0 - for (reqProperty of request["Properties"]) { - - let resProperty = response["Properties"][index] - let propertyId = resProperty["propertyId"] - - let assessmentNumber = resProperty["propertyDetails"][0]["assessmentNumber"] - - let consumerCode = propertyId + ":" + assessmentNumber - let service = "PT" - let tenantId = reqProperty["tenantId"] - - let demandSearchResponse = await findDemandForConsumerCode(consumerCode, tenantId, service, request["RequestInfo"]) - - let fireCessPercentage = getFireCessPercentage(reqProperty["propertyDetails"][0]) - - if (DEBUG_MODE) { - demandSearchResponse["Demands"][0]["firecess"] = fireCessPercentage - } - let calc = response["Properties"][index]["propertyDetails"][0]["calculation"] - let updateFirecessTax = calculateNewFireCess(calc["taxHeadEstimates"], fireCessPercentage.firecess, "estimateAmount", "taxHeadCode") - - let taxes = getUpdateTaxSummary(calc, - updateFirecessTax, "taxHeadCode", "estimateAmount") - - if (taxes.newCeilingTax) { - let firstDemand = demandSearchResponse["Demands"][0]["demandDetails"][0] - let newDemand = { - id: null, - demandId: firstDemand["demandId"], - taxHeadMasterCode: taxes.ceilingTaxHead.taxHeadCode, - taxAmount: taxes.ceilingTaxHead.estimateAmount, - tenantId: firstDemand["tenantId"], - collectionAmount: 0 - } - demandSearchResponse["Demands"][0]["demandDetails"].push(newDemand) - } - - for (demandDetail of demandSearchResponse["Demands"][0]["demandDetails"]) { - if (demandDetail.taxHeadMasterCode == "PT_FIRE_CESS") { - demandDetail.taxAmount = taxes.firecessTaxHead.estimateAmount - } - if (demandDetail.taxHeadMasterCode == "PT_DECIMAL_CEILING_DEBIT" || demandDetail.taxHeadMasterCode == "PT_DECIMAL_CEILING_DEBIT") { - demandDetail.taxHeadMasterCode = taxes.ceilingTaxHead.taxHeadCode - demandDetail.taxAmount = taxes.ceilingTaxHead.estimateAmount - } - } - - let demandUpdateResponse = await updateDemand(demandSearchResponse["Demands"], request["RequestInfo"]) - - // let updateTaxHeads = [] - - // for (taxHead of demandSearchResponse["Demands"]) { - // updateTaxHeads.push({ - // taxHeadCode: taxHead.taxHeadMasterCode, - // estimateAmount: taxHead.taxtAmount, - // category: taxHead.category - // }) - // } - - calc["totalAmount"] = taxes.totalAmount - calc["taxAmount"] = taxes.taxAmount - calc["rebate"] = taxes.rebate - // calc["taxHeadEstimates"] = updateTaxHeads - index++ - } - - return response -} - -async function _createAndUpdateRequestHandler(req, res) { - let { - request, - response - } = getRequestResponse(req) - - let tenantId = request["Properties"][0]["tenantId"] - - let fireCessConfig = await getFireCessConfig(tenantId) - if (fireCessConfig && fireCessConfig.dynamicFirecess && fireCessConfig.dynamicFirecess == true) { - let updatedResponse = await _createAndUpdateTaxProcessor(request, response) - res.json(updatedResponse); - } else { - res.json(response) - } -} - -function getRequestResponse(req) { - let request, response - - if (typeof req.body.request === "string") { - request = JSON.parse(req.body.request) - response = JSON.parse(req.body.response) - } else { - request = req.body.request - response = req.body.response - } - return { - request, - response - } -} - -router.post('/protected/punjab-pt/property/_create', asyncMiddleware(_createAndUpdateRequestHandler)) - -router.post('/protected/punjab-pt/property/_update', asyncMiddleware(_createAndUpdateRequestHandler)) - -router.post('/protected/punjab-pt/pt-calculator-v2/_estimate', asyncMiddleware(async function (req, res) { - - let { - request, - response - } = getRequestResponse(req) - - let tenantId = request["CalculationCriteria"][0]["tenantId"] - - let fireCessConfig = await getFireCessConfig(tenantId) - - if (fireCessConfig && fireCessConfig.dynamicFirecess && fireCessConfig.dynamicFirecess == true) { - let updatedResponse = _estimateTaxProcessor(request, response) - res.json(updatedResponse); - } else { - res.json(response); - } -})) - -app.listen(8000, () => { - console.log("Listening on port 8000") -}); - -// TODO: -// Add total amount to calculations "totalAmount": 460, -// "taxAmount": 510, \ No newline at end of file diff --git a/services/rainmaker-custom-service/package.json b/services/rainmaker-custom-service/package.json deleted file mode 100644 index f49122be..00000000 --- a/services/rainmaker-custom-service/package.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "name": "nodeservice", - "version": "1.0.0", - "main": "index.js", - "license": "MIT", - "dependencies": { - "bluebird": "^3.5.1", - "cryptr": "^4.0.0", - "excel4node": "^1.5.0", - "express": "^4.16.3", - "express-slash": "^2.0.1", - "jsonwebtoken": "^8.4.0", - "mustache-express": "^1.2.7", - "nodemon": "^1.18.4", - "pg-promise": "^8.4.5", - "request": "^2.88.0", - "request-promise": "^4.2.2" - }, - "scripts": { - "debug": "nodemon --inspect index.js" - } -} diff --git a/services/rainmaker-custom-service/static/css/bnd.css b/services/rainmaker-custom-service/static/css/bnd.css deleted file mode 100644 index d19b007b..00000000 --- a/services/rainmaker-custom-service/static/css/bnd.css +++ /dev/null @@ -1,137 +0,0 @@ -body { - height: 100%; - padding: 0px; - margin: 0px; - background: #333; - font-family: 'Roboto', sans-serif !important; - font-size: 1em; - } - h1 { - font-family: 'Roboto', sans-serif; - font-size: 30px; - color: #999; - font-weight: 300; - margin-bottom: 55px; - margin-top: 45px; - text-transform: uppercase; - } - h1 small { - display: block; - font-size: 18px; - text-transform: none; - letter-spacing: 1.5px; - margin-top: 12px; - } - .row { - max-width: 950px; - margin: 0 auto; - } - .btn { - white-space: normal; - } - .button-wrap { - position: relative; - text-align: center; - } - .button-wrap .btn { - font-family: 'Roboto', sans-serif; - box-shadow: 0 0 15px 5px rgba(0, 0, 0, 0.5); - border-radius: 0px; - border-color: #222; - cursor: pointer; - text-transform: uppercase; - font-size: 1.1em; - font-weight: 400; - letter-spacing: 1px; - } - .button-wrap .btn small { - font-size: 0.8rem; - letter-spacing: normal; - text-transform: none; - } - /** SPINNER CREATION **/ - .loader { - position: relative; - text-align: center; - margin: 15px auto 35px auto; - z-index: 9999; - display: block; - width: 80px; - height: 80px; - border: 10px solid rgba(0, 0, 0, 0.3); - border-radius: 50%; - border-top-color: #000; - animation: spin 1s ease-in-out infinite; - -webkit-animation: spin 1s ease-in-out infinite; - } - @keyframes spin { - to { - -webkit-transform: rotate(360deg); - } - } - @-webkit-keyframes spin { - to { - -webkit-transform: rotate(360deg); - } - } - /** MODAL STYLING **/ - .modal-content { - border-radius: 0px; - box-shadow: 0 0 20px 8px rgba(0, 0, 0, 0.7); - } - .modal-backdrop.show { - opacity: 0.75; - } - .loader-txt p { - font-size: 13px; - color: #666; - } - .loader-txt p small { - font-size: 11.5px; - color: #999; - } - - html, -body { - height: 100%; -} - -body { - display: -ms-flexbox; - display: flex; - -ms-flex-align: center; - align-items: center; - padding-top: 40px; - padding-bottom: 40px; - background-color: #f5f5f5; -} - -.form-signin { - width: 100%; - max-width: 530px; - padding: 15px; - margin: auto; -} -.form-signin .checkbox { - font-weight: 400; -} -.form-signin .form-control { - position: relative; - box-sizing: border-box; - height: auto; - padding: 10px; - font-size: 16px; -} -.form-signin .form-control:focus { - z-index: 2; -} -.form-signin input[type="email"] { - margin-bottom: -1px; - border-bottom-right-radius: 0; - border-bottom-left-radius: 0; -} -.form-signin input[type="password"] { - margin-bottom: 10px; - border-top-left-radius: 0; - border-top-right-radius: 0; -} \ No newline at end of file diff --git a/services/rainmaker-custom-service/static/js/bnd.js b/services/rainmaker-custom-service/static/js/bnd.js deleted file mode 100644 index 4cbfa5d6..00000000 --- a/services/rainmaker-custom-service/static/js/bnd.js +++ /dev/null @@ -1,128 +0,0 @@ -$(document).ready(() => { - $("#linkAccount").on('click', linkAccount) - if (getAuthToken() !== null) { - let params = (new URL(document.location)).searchParams; - if (params.get("unlink") !== null) - { - unlinkAccount(); - } else { - setTimeout(loginToBND, 10); - } - } else { - $("#msg").html("You need to be logged in to access this page") - $("#form").hide() - } -}); - -function unlinkAccount() { - axios({ - url: location.pathname.replace("/open/", "/protected/") + "/unlinkAccount", - method: 'POST', - json: true, // important - headers: { - 'Accept': 'application/json' - }, - data: { - RequestInfo: { - "authToken": getAuthToken(), - } - } - }).then((response) => { - window.location.assign(window.location.href.replace("unlink", "")) - }); -} - -function linkAccount() { - username = $("#username").val(); - password = $("#password").val() - - axios({ - url: location.pathname.replace("/open/", "/protected/") + "/linkAccount", - method: 'POST', - json: true, // important - headers: { - 'Accept': 'application/json' - }, - data: { - username: username, - password: password, - RequestInfo: { - "authToken": getAuthToken(), - } - } - }).then((response) => { - let res = response.data; - if (res && res.code && res.code == "SUCCESS" && res.redirect) { - var urlInfo = decodeURI(window.location.href).split('?'); - var path = urlInfo[0]; - $("#msg").html("The application has been opened in new window. If you want to unlink your account click here") - window.open(res.redirect,"bnd", "", true) - } else { - $("#msg").text(res.message).css("color", "red"); - } - }); -} - -function getAuthToken() { - var access_token = localStorage.getItem("token"); - return access_token; -} - -function loginToBND() { - showLoader() - try { - axios({ - url: location.href.replace("/open/", "/protected/"), - method: 'POST', - json: true, // important - headers: { - 'Accept': 'application/json' - }, - data: { - RequestInfo: { - "authToken": getAuthToken() - } - } - }).then((response) => { - hideLoader() - switch (response.data.code) { - case "NO_CREDENTIAL_MAPPING": - $('#msg').text("Please enter your eSewa Health application Username & Password to link your account") - $('#inputEmail').val(response.data.username || "") - $("#form").show() - break - case "INVALID_CREDENTIALS": - $('#msg').text(response.data.message) - $('#inputEmail').val(response.data.username || "") - $("#form").show() - break - case "SUCCESS": - $("#msg").html("The application has been opened in new window. If you want to unlink your account click here") - window.open(response.data.redirect,"bnd", "", true) - break; - default: - $('#msg').text(response.data.message || "Some error occcured while processing your request") - break - } - }).catch((err) => { - hideLoader(); - }); - } catch (ex) { - hideLoader() - } -} - -function showLoader() { - $("#loadMe").modal({ - backdrop: "static", //remove ability to close modal with click - keyboard: false, //remove option to close with keyboard - show: true //Display loader! - }); -} - -function hideLoader() { - $("#loadMe").modal("hide") - $('#loadMe').on('shown.bs.modal', function (e) { - $("#loadMe").modal('hide'); - }) -} \ No newline at end of file diff --git a/services/rainmaker-custom-service/templates/apicall.html b/services/rainmaker-custom-service/templates/apicall.html deleted file mode 100644 index f6382bba..00000000 --- a/services/rainmaker-custom-service/templates/apicall.html +++ /dev/null @@ -1,45 +0,0 @@ -{{>common/header}} -
No report available for your user type
- -{{>common/body}} \ No newline at end of file diff --git a/services/rainmaker-custom-service/templates/bndlogin.html b/services/rainmaker-custom-service/templates/bndlogin.html deleted file mode 100644 index e7290ac1..00000000 --- a/services/rainmaker-custom-service/templates/bndlogin.html +++ /dev/null @@ -1,32 +0,0 @@ -{{>common/header}} - - - -{{>common/scripts}} - - -{{>common/footer}} \ No newline at end of file diff --git a/services/rainmaker-custom-service/templates/common/footer.html b/services/rainmaker-custom-service/templates/common/footer.html deleted file mode 100644 index 1fd5f4f2..00000000 --- a/services/rainmaker-custom-service/templates/common/footer.html +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/services/rainmaker-custom-service/templates/common/header.html b/services/rainmaker-custom-service/templates/common/header.html deleted file mode 100644 index 63d94260..00000000 --- a/services/rainmaker-custom-service/templates/common/header.html +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - eGov Extension - - \ No newline at end of file diff --git a/services/rainmaker-custom-service/templates/common/scripts.html b/services/rainmaker-custom-service/templates/common/scripts.html deleted file mode 100644 index 9f6c78bb..00000000 --- a/services/rainmaker-custom-service/templates/common/scripts.html +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/services/rainmaker-custom-service/utils/asyncMiddleware.js b/services/rainmaker-custom-service/utils/asyncMiddleware.js deleted file mode 100644 index e261ae12..00000000 --- a/services/rainmaker-custom-service/utils/asyncMiddleware.js +++ /dev/null @@ -1,9 +0,0 @@ -const asyncMiddleware = fn => - (req, res, next) => { - Promise.resolve(fn(req, res, next)) - .catch(next); - }; - -module.exports = { - asyncMiddleware -} \ No newline at end of file diff --git a/services/rainmaker-custom-service/yarn.lock b/services/rainmaker-custom-service/yarn.lock deleted file mode 100644 index 6abd99f7..00000000 --- a/services/rainmaker-custom-service/yarn.lock +++ /dev/null @@ -1,2297 +0,0 @@ -# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -# yarn lockfile v1 - - -abbrev@1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" - -accepts@~1.3.5: - version "1.3.5" - resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.5.tgz#eb777df6011723a3b14e8a72c0805c8e86746bd2" - dependencies: - mime-types "~2.1.18" - negotiator "0.6.1" - -ajv@^6.5.5: - version "6.6.2" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.6.2.tgz#caceccf474bf3fc3ce3b147443711a24063cc30d" - dependencies: - fast-deep-equal "^2.0.1" - fast-json-stable-stringify "^2.0.0" - json-schema-traverse "^0.4.1" - uri-js "^4.2.2" - -ansi-align@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-2.0.0.tgz#c36aeccba563b89ceb556f3690f0b1d9e3547f7f" - dependencies: - string-width "^2.0.0" - -ansi-regex@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" - -ansi-regex@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" - -ansi-styles@^3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" - dependencies: - color-convert "^1.9.0" - -anymatch@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb" - dependencies: - micromatch "^3.1.4" - normalize-path "^2.1.1" - -aproba@^1.0.3: - version "1.2.0" - resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" - -are-we-there-yet@~1.1.2: - version "1.1.5" - resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21" - dependencies: - delegates "^1.0.0" - readable-stream "^2.0.6" - -arr-diff@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520" - -arr-flatten@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1" - -arr-union@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4" - -array-flatten@1.1.1: - version "1.1.1" - resolved "http://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" - -array-unique@^0.3.2: - version "0.3.2" - resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" - -asn1@~0.2.3: - version "0.2.4" - resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136" - dependencies: - safer-buffer "~2.1.0" - -assert-plus@1.0.0, assert-plus@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" - -assign-symbols@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367" - -async-each@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d" - -async@~2.6.0: - version "2.6.1" - resolved "https://registry.yarnpkg.com/async/-/async-2.6.1.tgz#b245a23ca71930044ec53fa46aa00a3e87c6a610" - dependencies: - lodash "^4.17.10" - -asynckit@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" - -atob@^2.1.1: - version "2.1.2" - resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" - -aws-sign2@~0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8" - -aws4@^1.8.0: - version "1.8.0" - resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f" - -balanced-match@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" - -base@^0.11.1: - version "0.11.2" - resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f" - dependencies: - cache-base "^1.0.1" - class-utils "^0.3.5" - component-emitter "^1.2.1" - define-property "^1.0.0" - isobject "^3.0.1" - mixin-deep "^1.2.0" - pascalcase "^0.1.1" - -bcrypt-pbkdf@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e" - dependencies: - tweetnacl "^0.14.3" - -binary-extensions@^1.0.0: - version "1.12.0" - resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.12.0.tgz#c2d780f53d45bba8317a8902d4ceeaf3a6385b14" - -bluebird@^3.5.0, bluebird@^3.5.1: - version "3.5.3" - resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.3.tgz#7d01c6f9616c9a51ab0f8c549a79dfe6ec33efa7" - -body-parser@1.18.3: - version "1.18.3" - resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.18.3.tgz#5b292198ffdd553b3a0f20ded0592b956955c8b4" - dependencies: - bytes "3.0.0" - content-type "~1.0.4" - debug "2.6.9" - depd "~1.1.2" - http-errors "~1.6.3" - iconv-lite "0.4.23" - on-finished "~2.3.0" - qs "6.5.2" - raw-body "2.3.3" - type-is "~1.6.16" - -boxen@^1.2.1: - version "1.3.0" - resolved "https://registry.yarnpkg.com/boxen/-/boxen-1.3.0.tgz#55c6c39a8ba58d9c61ad22cd877532deb665a20b" - dependencies: - ansi-align "^2.0.0" - camelcase "^4.0.0" - chalk "^2.0.1" - cli-boxes "^1.0.0" - string-width "^2.0.0" - term-size "^1.2.0" - widest-line "^2.0.0" - -brace-expansion@^1.1.7: - version "1.1.11" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" - dependencies: - balanced-match "^1.0.0" - concat-map "0.0.1" - -braces@^2.3.0, braces@^2.3.1: - version "2.3.2" - resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729" - dependencies: - arr-flatten "^1.1.0" - array-unique "^0.3.2" - extend-shallow "^2.0.1" - fill-range "^4.0.0" - isobject "^3.0.1" - repeat-element "^1.1.2" - snapdragon "^0.8.1" - snapdragon-node "^2.0.1" - split-string "^3.0.2" - to-regex "^3.0.1" - -buffer-equal-constant-time@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz#f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819" - -buffer-writer@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/buffer-writer/-/buffer-writer-2.0.0.tgz#ce7eb81a38f7829db09c873f2fbb792c0c98ec04" - -bytes@3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048" - -cache-base@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2" - dependencies: - collection-visit "^1.0.0" - component-emitter "^1.2.1" - get-value "^2.0.6" - has-value "^1.0.0" - isobject "^3.0.1" - set-value "^2.0.0" - to-object-path "^0.3.0" - union-value "^1.0.0" - unset-value "^1.0.0" - -camelcase@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd" - -capture-stack-trace@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz#a6c0bbe1f38f3aa0b92238ecb6ff42c344d4135d" - -caseless@~0.12.0: - version "0.12.0" - resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" - -chalk@^2.0.1: - version "2.4.1" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e" - dependencies: - ansi-styles "^3.2.1" - escape-string-regexp "^1.0.5" - supports-color "^5.3.0" - -chokidar@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.4.tgz#356ff4e2b0e8e43e322d18a372460bbcf3accd26" - dependencies: - anymatch "^2.0.0" - async-each "^1.0.0" - braces "^2.3.0" - glob-parent "^3.1.0" - inherits "^2.0.1" - is-binary-path "^1.0.0" - is-glob "^4.0.0" - lodash.debounce "^4.0.8" - normalize-path "^2.1.1" - path-is-absolute "^1.0.0" - readdirp "^2.0.0" - upath "^1.0.5" - optionalDependencies: - fsevents "^1.2.2" - -chownr@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.1.tgz#54726b8b8fff4df053c42187e801fb4412df1494" - -ci-info@^1.5.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.6.0.tgz#2ca20dbb9ceb32d4524a683303313f0304b1e497" - -class-utils@^0.3.5: - version "0.3.6" - resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463" - dependencies: - arr-union "^3.1.0" - define-property "^0.2.5" - isobject "^3.0.0" - static-extend "^0.1.1" - -cli-boxes@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-1.0.0.tgz#4fa917c3e59c94a004cd61f8ee509da651687143" - -code-point-at@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" - -collection-visit@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0" - dependencies: - map-visit "^1.0.0" - object-visit "^1.0.0" - -color-convert@^1.9.0: - version "1.9.3" - resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" - dependencies: - color-name "1.1.3" - -color-name@1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" - -combined-stream@^1.0.6, combined-stream@~1.0.6: - version "1.0.7" - resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.7.tgz#2d1d24317afb8abe95d6d2c0b07b57813539d828" - dependencies: - delayed-stream "~1.0.0" - -component-emitter@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6" - -concat-map@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" - -configstore@^3.0.0: - version "3.1.2" - resolved "https://registry.yarnpkg.com/configstore/-/configstore-3.1.2.tgz#c6f25defaeef26df12dd33414b001fe81a543f8f" - dependencies: - dot-prop "^4.1.0" - graceful-fs "^4.1.2" - make-dir "^1.0.0" - unique-string "^1.0.0" - write-file-atomic "^2.0.0" - xdg-basedir "^3.0.0" - -console-control-strings@^1.0.0, console-control-strings@~1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" - -content-disposition@0.5.2: - version "0.5.2" - resolved "http://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz#0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4" - -content-type@~1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b" - -cookie-signature@1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" - -cookie@0.3.1: - version "0.3.1" - resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb" - -copy-descriptor@^0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" - -core-js@~2.3.0: - version "2.3.0" - resolved "http://registry.npmjs.org/core-js/-/core-js-2.3.0.tgz#fab83fbb0b2d8dc85fa636c4b9d34c75420c6d65" - -core-util-is@1.0.2, core-util-is@~1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" - -create-error-class@^3.0.0: - version "3.0.2" - resolved "https://registry.yarnpkg.com/create-error-class/-/create-error-class-3.0.2.tgz#06be7abef947a3f14a30fd610671d401bca8b7b6" - dependencies: - capture-stack-trace "^1.0.0" - -cross-spawn@^5.0.1: - version "5.1.0" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449" - dependencies: - lru-cache "^4.0.1" - shebang-command "^1.2.0" - which "^1.2.9" - -crypto-random-string@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-1.0.0.tgz#a230f64f568310e1498009940790ec99545bca7e" - -cryptr@^4.0.0: - version "4.0.2" - resolved "https://registry.yarnpkg.com/cryptr/-/cryptr-4.0.2.tgz#8a93b5ca7667d1a6131e396bab23a134ff1f5dc6" - -dashdash@^1.12.0: - version "1.14.1" - resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0" - dependencies: - assert-plus "^1.0.0" - -debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3: - version "2.6.9" - resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" - dependencies: - ms "2.0.0" - -debug@^3.1.0: - version "3.2.6" - resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b" - dependencies: - ms "^2.1.1" - -decode-uri-component@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545" - -deep-extend@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" - -deepmerge@2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-2.1.1.tgz#e862b4e45ea0555072bf51e7fd0d9845170ae768" - -define-property@^0.2.5: - version "0.2.5" - resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116" - dependencies: - is-descriptor "^0.1.0" - -define-property@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6" - dependencies: - is-descriptor "^1.0.0" - -define-property@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d" - dependencies: - is-descriptor "^1.0.2" - isobject "^3.0.1" - -delayed-stream@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" - -delegates@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" - -depd@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" - -destroy@~1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80" - -detect-libc@^1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" - -dot-prop@^4.1.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.0.tgz#1f19e0c2e1aa0e32797c49799f2837ac6af69c57" - dependencies: - is-obj "^1.0.0" - -duplexer3@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2" - -ecc-jsbn@~0.1.1: - version "0.1.2" - resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9" - dependencies: - jsbn "~0.1.0" - safer-buffer "^2.1.0" - -ecdsa-sig-formatter@1.0.10: - version "1.0.10" - resolved "https://registry.yarnpkg.com/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.10.tgz#1c595000f04a8897dfb85000892a0f4c33af86c3" - dependencies: - safe-buffer "^5.0.1" - -ee-first@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" - -encodeurl@~1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" - -es6-promise@~3.0.2: - version "3.0.2" - resolved "http://registry.npmjs.org/es6-promise/-/es6-promise-3.0.2.tgz#010d5858423a5f118979665f46486a95c6ee2bb6" - -escape-html@~1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" - -escape-string-regexp@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" - -etag@~1.8.1: - version "1.8.1" - resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" - -excel4node@^1.5.0: - version "1.7.0" - resolved "https://registry.yarnpkg.com/excel4node/-/excel4node-1.7.0.tgz#e7f8a797284832d86dda8713745323cd2302d9d2" - dependencies: - deepmerge "2.1.1" - image-size "0.6.3" - jszip "3.1.5" - lodash.get "4.4.2" - lodash.isequal "4.5.0" - lodash.isundefined "3.0.1" - lodash.reduce "4.6.0" - lodash.uniqueid "4.0.1" - mime "2.3.1" - uuid "3.3.2" - xmlbuilder "10.0.0" - -execa@^0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777" - dependencies: - cross-spawn "^5.0.1" - get-stream "^3.0.0" - is-stream "^1.1.0" - npm-run-path "^2.0.0" - p-finally "^1.0.0" - signal-exit "^3.0.0" - strip-eof "^1.0.0" - -expand-brackets@^2.1.4: - version "2.1.4" - resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622" - dependencies: - debug "^2.3.3" - define-property "^0.2.5" - extend-shallow "^2.0.1" - posix-character-classes "^0.1.0" - regex-not "^1.0.0" - snapdragon "^0.8.1" - to-regex "^3.0.1" - -express-slash@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/express-slash/-/express-slash-2.0.1.tgz#76eb869fed8f71ae4f98785cbe00bf1bb454d627" - -express@^4.16.3: - version "4.16.4" - resolved "https://registry.yarnpkg.com/express/-/express-4.16.4.tgz#fddef61926109e24c515ea97fd2f1bdbf62df12e" - dependencies: - accepts "~1.3.5" - array-flatten "1.1.1" - body-parser "1.18.3" - content-disposition "0.5.2" - content-type "~1.0.4" - cookie "0.3.1" - cookie-signature "1.0.6" - debug "2.6.9" - depd "~1.1.2" - encodeurl "~1.0.2" - escape-html "~1.0.3" - etag "~1.8.1" - finalhandler "1.1.1" - fresh "0.5.2" - merge-descriptors "1.0.1" - methods "~1.1.2" - on-finished "~2.3.0" - parseurl "~1.3.2" - path-to-regexp "0.1.7" - proxy-addr "~2.0.4" - qs "6.5.2" - range-parser "~1.2.0" - safe-buffer "5.1.2" - send "0.16.2" - serve-static "1.13.2" - setprototypeof "1.1.0" - statuses "~1.4.0" - type-is "~1.6.16" - utils-merge "1.0.1" - vary "~1.1.2" - -extend-shallow@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f" - dependencies: - is-extendable "^0.1.0" - -extend-shallow@^3.0.0, extend-shallow@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8" - dependencies: - assign-symbols "^1.0.0" - is-extendable "^1.0.1" - -extend@~3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" - -extglob@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543" - dependencies: - array-unique "^0.3.2" - define-property "^1.0.0" - expand-brackets "^2.1.4" - extend-shallow "^2.0.1" - fragment-cache "^0.2.1" - regex-not "^1.0.0" - snapdragon "^0.8.1" - to-regex "^3.0.1" - -extsprintf@1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05" - -extsprintf@^1.2.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f" - -fast-deep-equal@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49" - -fast-json-stable-stringify@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2" - -fill-range@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7" - dependencies: - extend-shallow "^2.0.1" - is-number "^3.0.0" - repeat-string "^1.6.1" - to-regex-range "^2.1.0" - -finalhandler@1.1.1: - version "1.1.1" - resolved "http://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz#eebf4ed840079c83f4249038c9d703008301b105" - dependencies: - debug "2.6.9" - encodeurl "~1.0.2" - escape-html "~1.0.3" - on-finished "~2.3.0" - parseurl "~1.3.2" - statuses "~1.4.0" - unpipe "~1.0.0" - -for-in@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" - -forever-agent@~0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" - -form-data@~2.3.2: - version "2.3.3" - resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6" - dependencies: - asynckit "^0.4.0" - combined-stream "^1.0.6" - mime-types "^2.1.12" - -forwarded@~0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84" - -fragment-cache@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19" - dependencies: - map-cache "^0.2.2" - -fresh@0.5.2: - version "0.5.2" - resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" - -fs-minipass@^1.2.5: - version "1.2.5" - resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.5.tgz#06c277218454ec288df77ada54a03b8702aacb9d" - dependencies: - minipass "^2.2.1" - -fs.realpath@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" - -fsevents@^1.2.2: - version "1.2.4" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.4.tgz#f41dcb1af2582af3692da36fc55cbd8e1041c426" - dependencies: - nan "^2.9.2" - node-pre-gyp "^0.10.0" - -gauge@~2.7.3: - version "2.7.4" - resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7" - dependencies: - aproba "^1.0.3" - console-control-strings "^1.0.0" - has-unicode "^2.0.0" - object-assign "^4.1.0" - signal-exit "^3.0.0" - string-width "^1.0.1" - strip-ansi "^3.0.1" - wide-align "^1.1.0" - -get-stream@^3.0.0: - version "3.0.0" - resolved "http://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14" - -get-value@^2.0.3, get-value@^2.0.6: - version "2.0.6" - resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28" - -getpass@^0.1.1: - version "0.1.7" - resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa" - dependencies: - assert-plus "^1.0.0" - -glob-parent@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae" - dependencies: - is-glob "^3.1.0" - path-dirname "^1.0.0" - -glob@^7.0.5: - version "7.1.3" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1" - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.0.4" - once "^1.3.0" - path-is-absolute "^1.0.0" - -global-dirs@^0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-0.1.1.tgz#b319c0dd4607f353f3be9cca4c72fc148c49f445" - dependencies: - ini "^1.3.4" - -got@^6.7.1: - version "6.7.1" - resolved "http://registry.npmjs.org/got/-/got-6.7.1.tgz#240cd05785a9a18e561dc1b44b41c763ef1e8db0" - dependencies: - create-error-class "^3.0.0" - duplexer3 "^0.1.4" - get-stream "^3.0.0" - is-redirect "^1.0.0" - is-retry-allowed "^1.0.0" - is-stream "^1.0.0" - lowercase-keys "^1.0.0" - safe-buffer "^5.0.1" - timed-out "^4.0.0" - unzip-response "^2.0.1" - url-parse-lax "^1.0.0" - -graceful-fs@^4.1.11, graceful-fs@^4.1.2: - version "4.1.15" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00" - -har-schema@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92" - -har-validator@~5.1.0: - version "5.1.3" - resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz#1ef89ebd3e4996557675eed9893110dc350fa080" - dependencies: - ajv "^6.5.5" - har-schema "^2.0.0" - -has-flag@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" - -has-unicode@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" - -has-value@^0.3.1: - version "0.3.1" - resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f" - dependencies: - get-value "^2.0.3" - has-values "^0.1.4" - isobject "^2.0.0" - -has-value@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177" - dependencies: - get-value "^2.0.6" - has-values "^1.0.0" - isobject "^3.0.0" - -has-values@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771" - -has-values@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f" - dependencies: - is-number "^3.0.0" - kind-of "^4.0.0" - -http-errors@1.6.3, http-errors@~1.6.2, http-errors@~1.6.3: - version "1.6.3" - resolved "http://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d" - dependencies: - depd "~1.1.2" - inherits "2.0.3" - setprototypeof "1.1.0" - statuses ">= 1.4.0 < 2" - -http-signature@~1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1" - dependencies: - assert-plus "^1.0.0" - jsprim "^1.2.2" - sshpk "^1.7.0" - -iconv-lite@0.4.23: - version "0.4.23" - resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63" - dependencies: - safer-buffer ">= 2.1.2 < 3" - -iconv-lite@^0.4.4: - version "0.4.24" - resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" - dependencies: - safer-buffer ">= 2.1.2 < 3" - -ignore-by-default@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/ignore-by-default/-/ignore-by-default-1.0.1.tgz#48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09" - -ignore-walk@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.1.tgz#a83e62e7d272ac0e3b551aaa82831a19b69f82f8" - dependencies: - minimatch "^3.0.4" - -image-size@0.6.3: - version "0.6.3" - resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.6.3.tgz#e7e5c65bb534bd7cdcedd6cb5166272a85f75fb2" - -immediate@~3.0.5: - version "3.0.6" - resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b" - -import-lazy@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43" - -imurmurhash@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" - -inflight@^1.0.4: - version "1.0.6" - resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" - dependencies: - once "^1.3.0" - wrappy "1" - -inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@~2.0.1, inherits@~2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" - -ini@^1.3.4, ini@~1.3.0: - version "1.3.5" - resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" - -ipaddr.js@1.8.0: - version "1.8.0" - resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.8.0.tgz#eaa33d6ddd7ace8f7f6fe0c9ca0440e706738b1e" - -is-accessor-descriptor@^0.1.6: - version "0.1.6" - resolved "http://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6" - dependencies: - kind-of "^3.0.2" - -is-accessor-descriptor@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656" - dependencies: - kind-of "^6.0.0" - -is-binary-path@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898" - dependencies: - binary-extensions "^1.0.0" - -is-buffer@^1.1.5: - version "1.1.6" - resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" - -is-ci@^1.0.10: - version "1.2.1" - resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.2.1.tgz#e3779c8ee17fccf428488f6e281187f2e632841c" - dependencies: - ci-info "^1.5.0" - -is-data-descriptor@^0.1.4: - version "0.1.4" - resolved "http://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56" - dependencies: - kind-of "^3.0.2" - -is-data-descriptor@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7" - dependencies: - kind-of "^6.0.0" - -is-descriptor@^0.1.0: - version "0.1.6" - resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca" - dependencies: - is-accessor-descriptor "^0.1.6" - is-data-descriptor "^0.1.4" - kind-of "^5.0.0" - -is-descriptor@^1.0.0, is-descriptor@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec" - dependencies: - is-accessor-descriptor "^1.0.0" - is-data-descriptor "^1.0.0" - kind-of "^6.0.2" - -is-extendable@^0.1.0, is-extendable@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" - -is-extendable@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4" - dependencies: - is-plain-object "^2.0.4" - -is-extglob@^2.1.0, is-extglob@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" - -is-fullwidth-code-point@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb" - dependencies: - number-is-nan "^1.0.0" - -is-fullwidth-code-point@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" - -is-glob@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a" - dependencies: - is-extglob "^2.1.0" - -is-glob@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.0.tgz#9521c76845cc2610a85203ddf080a958c2ffabc0" - dependencies: - is-extglob "^2.1.1" - -is-installed-globally@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.1.0.tgz#0dfd98f5a9111716dd535dda6492f67bf3d25a80" - dependencies: - global-dirs "^0.1.0" - is-path-inside "^1.0.0" - -is-npm@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-1.0.0.tgz#f2fb63a65e4905b406c86072765a1a4dc793b9f4" - -is-number@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195" - dependencies: - kind-of "^3.0.2" - -is-obj@^1.0.0: - version "1.0.1" - resolved "http://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f" - -is-path-inside@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz#8ef5b7de50437a3fdca6b4e865ef7aa55cb48036" - dependencies: - path-is-inside "^1.0.1" - -is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" - dependencies: - isobject "^3.0.1" - -is-redirect@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-redirect/-/is-redirect-1.0.0.tgz#1d03dded53bd8db0f30c26e4f95d36fc7c87dc24" - -is-retry-allowed@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz#11a060568b67339444033d0125a61a20d564fb34" - -is-stream@^1.0.0, is-stream@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" - -is-typedarray@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" - -is-windows@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" - -isarray@1.0.0, isarray@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" - -isexe@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" - -isobject@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89" - dependencies: - isarray "1.0.0" - -isobject@^3.0.0, isobject@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" - -isstream@~0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" - -jsbn@~0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" - -json-schema-traverse@^0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" - -json-schema@0.2.3: - version "0.2.3" - resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13" - -json-stringify-safe@~5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" - -jsonwebtoken@^8.4.0: - version "8.4.0" - resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-8.4.0.tgz#8757f7b4cb7440d86d5e2f3becefa70536c8e46a" - dependencies: - jws "^3.1.5" - lodash.includes "^4.3.0" - lodash.isboolean "^3.0.3" - lodash.isinteger "^4.0.4" - lodash.isnumber "^3.0.3" - lodash.isplainobject "^4.0.6" - lodash.isstring "^4.0.1" - lodash.once "^4.0.0" - ms "^2.1.1" - -jsprim@^1.2.2: - version "1.4.1" - resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2" - dependencies: - assert-plus "1.0.0" - extsprintf "1.3.0" - json-schema "0.2.3" - verror "1.10.0" - -jszip@3.1.5: - version "3.1.5" - resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.1.5.tgz#e3c2a6c6d706ac6e603314036d43cd40beefdf37" - dependencies: - core-js "~2.3.0" - es6-promise "~3.0.2" - lie "~3.1.0" - pako "~1.0.2" - readable-stream "~2.0.6" - -jwa@^1.1.5: - version "1.1.6" - resolved "https://registry.yarnpkg.com/jwa/-/jwa-1.1.6.tgz#87240e76c9808dbde18783cf2264ef4929ee50e6" - dependencies: - buffer-equal-constant-time "1.0.1" - ecdsa-sig-formatter "1.0.10" - safe-buffer "^5.0.1" - -jws@^3.1.5: - version "3.1.5" - resolved "https://registry.yarnpkg.com/jws/-/jws-3.1.5.tgz#80d12d05b293d1e841e7cb8b4e69e561adcf834f" - dependencies: - jwa "^1.1.5" - safe-buffer "^5.0.1" - -kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0: - version "3.2.2" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" - dependencies: - is-buffer "^1.1.5" - -kind-of@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57" - dependencies: - is-buffer "^1.1.5" - -kind-of@^5.0.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d" - -kind-of@^6.0.0, kind-of@^6.0.2: - version "6.0.2" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051" - -latest-version@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-3.1.0.tgz#a205383fea322b33b5ae3b18abee0dc2f356ee15" - dependencies: - package-json "^4.0.0" - -lie@~3.1.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/lie/-/lie-3.1.1.tgz#9a436b2cc7746ca59de7a41fa469b3efb76bd87e" - dependencies: - immediate "~3.0.5" - -lodash.debounce@^4.0.8: - version "4.0.8" - resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" - -lodash.get@4.4.2: - version "4.4.2" - resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99" - -lodash.includes@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/lodash.includes/-/lodash.includes-4.3.0.tgz#60bb98a87cb923c68ca1e51325483314849f553f" - -lodash.isboolean@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz#6c2e171db2a257cd96802fd43b01b20d5f5870f6" - -lodash.isequal@4.5.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0" - -lodash.isinteger@^4.0.4: - version "4.0.4" - resolved "https://registry.yarnpkg.com/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz#619c0af3d03f8b04c31f5882840b77b11cd68343" - -lodash.isnumber@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz#3ce76810c5928d03352301ac287317f11c0b1ffc" - -lodash.isplainobject@^4.0.6: - version "4.0.6" - resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb" - -lodash.isstring@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451" - -lodash.isundefined@3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/lodash.isundefined/-/lodash.isundefined-3.0.1.tgz#23ef3d9535565203a66cefd5b830f848911afb48" - -lodash.once@^4.0.0: - version "4.1.1" - resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac" - -lodash.reduce@4.6.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/lodash.reduce/-/lodash.reduce-4.6.0.tgz#f1ab6b839299ad48f784abbf476596f03b914d3b" - -lodash.uniqueid@4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/lodash.uniqueid/-/lodash.uniqueid-4.0.1.tgz#3268f26a7c88e4f4b1758d679271814e31fa5b26" - -lodash@^4.13.1, lodash@^4.17.10: - version "4.17.14" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.14.tgz#9ce487ae66c96254fe20b599f21b6816028078ba" - -lowercase-keys@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f" - -lru-cache@^4.0.1, lru-cache@~4.1.3: - version "4.1.5" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd" - dependencies: - pseudomap "^1.0.2" - yallist "^2.1.2" - -make-dir@^1.0.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c" - dependencies: - pify "^3.0.0" - -manakin@0.5.2: - version "0.5.2" - resolved "https://registry.yarnpkg.com/manakin/-/manakin-0.5.2.tgz#abe3df430ca6085f6983f6e4cf5af0298f4d30cc" - -map-cache@^0.2.2: - version "0.2.2" - resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf" - -map-visit@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f" - dependencies: - object-visit "^1.0.0" - -media-typer@0.3.0: - version "0.3.0" - resolved "http://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" - -merge-descriptors@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" - -methods@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" - -micromatch@^3.1.10, micromatch@^3.1.4: - version "3.1.10" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23" - dependencies: - arr-diff "^4.0.0" - array-unique "^0.3.2" - braces "^2.3.1" - define-property "^2.0.2" - extend-shallow "^3.0.2" - extglob "^2.0.4" - fragment-cache "^0.2.1" - kind-of "^6.0.2" - nanomatch "^1.2.9" - object.pick "^1.3.0" - regex-not "^1.0.0" - snapdragon "^0.8.1" - to-regex "^3.0.2" - -mime-db@~1.37.0: - version "1.37.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.37.0.tgz#0b6a0ce6fdbe9576e25f1f2d2fde8830dc0ad0d8" - -mime-types@^2.1.12, mime-types@~2.1.18, mime-types@~2.1.19: - version "2.1.21" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.21.tgz#28995aa1ecb770742fe6ae7e58f9181c744b3f96" - dependencies: - mime-db "~1.37.0" - -mime@1.4.1: - version "1.4.1" - resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6" - -mime@2.3.1: - version "2.3.1" - resolved "http://registry.npmjs.org/mime/-/mime-2.3.1.tgz#b1621c54d63b97c47d3cfe7f7215f7d64517c369" - -minimatch@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" - dependencies: - brace-expansion "^1.1.7" - -minimist@0.0.8: - version "0.0.8" - resolved "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" - -minimist@^1.2.0: - version "1.2.0" - resolved "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" - -minipass@^2.2.1, minipass@^2.3.4: - version "2.3.5" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.5.tgz#cacebe492022497f656b0f0f51e2682a9ed2d848" - dependencies: - safe-buffer "^5.1.2" - yallist "^3.0.0" - -minizlib@^1.1.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.2.1.tgz#dd27ea6136243c7c880684e8672bb3a45fd9b614" - dependencies: - minipass "^2.2.1" - -mixin-deep@^1.2.0: - version "1.3.1" - resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.1.tgz#a49e7268dce1a0d9698e45326c5626df3543d0fe" - dependencies: - for-in "^1.0.2" - is-extendable "^1.0.1" - -mkdirp@^0.5.0, mkdirp@^0.5.1: - version "0.5.1" - resolved "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" - dependencies: - minimist "0.0.8" - -ms@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" - -ms@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a" - -mustache-express@^1.2.7: - version "1.2.8" - resolved "https://registry.yarnpkg.com/mustache-express/-/mustache-express-1.2.8.tgz#caf3fc93e5b729e92077b1c4ff713aba4bced259" - dependencies: - async "~2.6.0" - lru-cache "~4.1.3" - mustache "~2.3.0" - -mustache@~2.3.0: - version "2.3.2" - resolved "https://registry.yarnpkg.com/mustache/-/mustache-2.3.2.tgz#a6d4d9c3f91d13359ab889a812954f9230a3d0c5" - -nan@^2.9.2: - version "2.12.1" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.12.1.tgz#7b1aa193e9aa86057e3c7bbd0ac448e770925552" - -nanomatch@^1.2.9: - version "1.2.13" - resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119" - dependencies: - arr-diff "^4.0.0" - array-unique "^0.3.2" - define-property "^2.0.2" - extend-shallow "^3.0.2" - fragment-cache "^0.2.1" - is-windows "^1.0.2" - kind-of "^6.0.2" - object.pick "^1.3.0" - regex-not "^1.0.0" - snapdragon "^0.8.1" - to-regex "^3.0.1" - -needle@^2.2.1: - version "2.2.4" - resolved "https://registry.yarnpkg.com/needle/-/needle-2.2.4.tgz#51931bff82533b1928b7d1d69e01f1b00ffd2a4e" - dependencies: - debug "^2.1.2" - iconv-lite "^0.4.4" - sax "^1.2.4" - -negotiator@0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9" - -node-pre-gyp@^0.10.0: - version "0.10.3" - resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.10.3.tgz#3070040716afdc778747b61b6887bf78880b80fc" - dependencies: - detect-libc "^1.0.2" - mkdirp "^0.5.1" - needle "^2.2.1" - nopt "^4.0.1" - npm-packlist "^1.1.6" - npmlog "^4.0.2" - rc "^1.2.7" - rimraf "^2.6.1" - semver "^5.3.0" - tar "^4" - -nodemon@^1.18.4: - version "1.18.9" - resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-1.18.9.tgz#90b467efd3b3c81b9453380aeb2a2cba535d0ead" - dependencies: - chokidar "^2.0.4" - debug "^3.1.0" - ignore-by-default "^1.0.1" - minimatch "^3.0.4" - pstree.remy "^1.1.6" - semver "^5.5.0" - supports-color "^5.2.0" - touch "^3.1.0" - undefsafe "^2.0.2" - update-notifier "^2.5.0" - -nopt@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d" - dependencies: - abbrev "1" - osenv "^0.1.4" - -nopt@~1.0.10: - version "1.0.10" - resolved "https://registry.yarnpkg.com/nopt/-/nopt-1.0.10.tgz#6ddd21bd2a31417b92727dd585f8a6f37608ebee" - dependencies: - abbrev "1" - -normalize-path@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9" - dependencies: - remove-trailing-separator "^1.0.1" - -npm-bundled@^1.0.1: - version "1.0.5" - resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.5.tgz#3c1732b7ba936b3a10325aef616467c0ccbcc979" - -npm-packlist@^1.1.6: - version "1.1.12" - resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.1.12.tgz#22bde2ebc12e72ca482abd67afc51eb49377243a" - dependencies: - ignore-walk "^3.0.1" - npm-bundled "^1.0.1" - -npm-run-path@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f" - dependencies: - path-key "^2.0.0" - -npmlog@^4.0.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" - dependencies: - are-we-there-yet "~1.1.2" - console-control-strings "~1.1.0" - gauge "~2.7.3" - set-blocking "~2.0.0" - -number-is-nan@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" - -oauth-sign@~0.9.0: - version "0.9.0" - resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455" - -object-assign@^4.1.0: - version "4.1.1" - resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" - -object-copy@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c" - dependencies: - copy-descriptor "^0.1.0" - define-property "^0.2.5" - kind-of "^3.0.3" - -object-visit@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb" - dependencies: - isobject "^3.0.0" - -object.pick@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747" - dependencies: - isobject "^3.0.1" - -on-finished@~2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947" - dependencies: - ee-first "1.1.1" - -once@^1.3.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" - dependencies: - wrappy "1" - -os-homedir@^1.0.0: - version "1.0.2" - resolved "http://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" - -os-tmpdir@^1.0.0: - version "1.0.2" - resolved "http://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" - -osenv@^0.1.4: - version "0.1.5" - resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410" - dependencies: - os-homedir "^1.0.0" - os-tmpdir "^1.0.0" - -p-finally@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae" - -package-json@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/package-json/-/package-json-4.0.1.tgz#8869a0401253661c4c4ca3da6c2121ed555f5eed" - dependencies: - got "^6.7.1" - registry-auth-token "^3.0.1" - registry-url "^3.0.3" - semver "^5.1.0" - -packet-reader@0.3.1: - version "0.3.1" - resolved "https://registry.yarnpkg.com/packet-reader/-/packet-reader-0.3.1.tgz#cd62e60af8d7fea8a705ec4ff990871c46871f27" - -pako@~1.0.2: - version "1.0.7" - resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.7.tgz#2473439021b57f1516c82f58be7275ad8ef1bb27" - -parseurl@~1.3.2: - version "1.3.2" - resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.2.tgz#fc289d4ed8993119460c156253262cdc8de65bf3" - -pascalcase@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14" - -path-dirname@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0" - -path-is-absolute@^1.0.0: - version "1.0.1" - resolved "http://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" - -path-is-inside@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53" - -path-key@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40" - -path-to-regexp@0.1.7: - version "0.1.7" - resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" - -performance-now@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" - -pg-connection-string@0.1.3: - version "0.1.3" - resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-0.1.3.tgz#da1847b20940e42ee1492beaf65d49d91b245df7" - -pg-minify@0.5.5: - version "0.5.5" - resolved "https://registry.yarnpkg.com/pg-minify/-/pg-minify-0.5.5.tgz#6c961a61aa19f469d8edfe5a3c0da58760f3c339" - -pg-pool@^2.0.4: - version "2.0.5" - resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-2.0.5.tgz#f00556fab23f1bbb14b0650ba8d0e447434a1b04" - -pg-promise@^8.4.5: - version "8.5.4" - resolved "https://registry.yarnpkg.com/pg-promise/-/pg-promise-8.5.4.tgz#3c1c656d340b1d8e21bbd8017a650c795b375aca" - dependencies: - manakin "0.5.2" - pg "7.7.1" - pg-minify "0.5.5" - spex "2.1.0" - -pg-types@~1.12.1: - version "1.12.1" - resolved "https://registry.yarnpkg.com/pg-types/-/pg-types-1.12.1.tgz#d64087e3903b58ffaad279e7595c52208a14c3d2" - dependencies: - postgres-array "~1.0.0" - postgres-bytea "~1.0.0" - postgres-date "~1.0.0" - postgres-interval "^1.1.0" - -pg@7.7.1: - version "7.7.1" - resolved "https://registry.yarnpkg.com/pg/-/pg-7.7.1.tgz#546b192ff484322b69689391f885de3ba91a30d4" - dependencies: - buffer-writer "2.0.0" - packet-reader "0.3.1" - pg-connection-string "0.1.3" - pg-pool "^2.0.4" - pg-types "~1.12.1" - pgpass "1.x" - semver "4.3.2" - -pgpass@1.x: - version "1.0.2" - resolved "https://registry.yarnpkg.com/pgpass/-/pgpass-1.0.2.tgz#2a7bb41b6065b67907e91da1b07c1847c877b306" - dependencies: - split "^1.0.0" - -pify@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176" - -posix-character-classes@^0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" - -postgres-array@~1.0.0: - version "1.0.3" - resolved "https://registry.yarnpkg.com/postgres-array/-/postgres-array-1.0.3.tgz#c561fc3b266b21451fc6555384f4986d78ec80f5" - -postgres-bytea@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/postgres-bytea/-/postgres-bytea-1.0.0.tgz#027b533c0aa890e26d172d47cf9ccecc521acd35" - -postgres-date@~1.0.0: - version "1.0.3" - resolved "https://registry.yarnpkg.com/postgres-date/-/postgres-date-1.0.3.tgz#e2d89702efdb258ff9d9cee0fe91bd06975257a8" - -postgres-interval@^1.1.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/postgres-interval/-/postgres-interval-1.1.2.tgz#bf71ff902635f21cb241a013fc421d81d1db15a9" - dependencies: - xtend "^4.0.0" - -prepend-http@^1.0.1: - version "1.0.4" - resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc" - -process-nextick-args@~1.0.6: - version "1.0.7" - resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3" - -process-nextick-args@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa" - -proxy-addr@~2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.4.tgz#ecfc733bf22ff8c6f407fa275327b9ab67e48b93" - dependencies: - forwarded "~0.1.2" - ipaddr.js "1.8.0" - -pseudomap@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3" - -psl@^1.1.24, psl@^1.1.28: - version "1.1.31" - resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.31.tgz#e9aa86d0101b5b105cbe93ac6b784cd547276184" - -pstree.remy@^1.1.6: - version "1.1.6" - resolved "https://registry.yarnpkg.com/pstree.remy/-/pstree.remy-1.1.6.tgz#73a55aad9e2d95814927131fbf4dc1b62d259f47" - -punycode@^1.4.1: - version "1.4.1" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" - -punycode@^2.1.0, punycode@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" - -qs@6.5.2, qs@~6.5.2: - version "6.5.2" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36" - -range-parser@~1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e" - -raw-body@2.3.3: - version "2.3.3" - resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.3.3.tgz#1b324ece6b5706e153855bc1148c65bb7f6ea0c3" - dependencies: - bytes "3.0.0" - http-errors "1.6.3" - iconv-lite "0.4.23" - unpipe "1.0.0" - -rc@^1.0.1, rc@^1.1.6, rc@^1.2.7: - version "1.2.8" - resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" - dependencies: - deep-extend "^0.6.0" - ini "~1.3.0" - minimist "^1.2.0" - strip-json-comments "~2.0.1" - -readable-stream@^2.0.2, readable-stream@^2.0.6: - version "2.3.6" - resolved "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf" - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.3" - isarray "~1.0.0" - process-nextick-args "~2.0.0" - safe-buffer "~5.1.1" - string_decoder "~1.1.1" - util-deprecate "~1.0.1" - -readable-stream@~2.0.6: - version "2.0.6" - resolved "http://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e" - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.1" - isarray "~1.0.0" - process-nextick-args "~1.0.6" - string_decoder "~0.10.x" - util-deprecate "~1.0.1" - -readdirp@^2.0.0: - version "2.2.1" - resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525" - dependencies: - graceful-fs "^4.1.11" - micromatch "^3.1.10" - readable-stream "^2.0.2" - -regex-not@^1.0.0, regex-not@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c" - dependencies: - extend-shallow "^3.0.2" - safe-regex "^1.1.0" - -registry-auth-token@^3.0.1: - version "3.3.2" - resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.3.2.tgz#851fd49038eecb586911115af845260eec983f20" - dependencies: - rc "^1.1.6" - safe-buffer "^5.0.1" - -registry-url@^3.0.3: - version "3.1.0" - resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-3.1.0.tgz#3d4ef870f73dde1d77f0cf9a381432444e174942" - dependencies: - rc "^1.0.1" - -remove-trailing-separator@^1.0.1: - version "1.1.0" - resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef" - -repeat-element@^1.1.2: - version "1.1.3" - resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce" - -repeat-string@^1.6.1: - version "1.6.1" - resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" - -request-promise-core@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.1.tgz#3eee00b2c5aa83239cfb04c5700da36f81cd08b6" - dependencies: - lodash "^4.13.1" - -request-promise@^4.2.2: - version "4.2.2" - resolved "https://registry.yarnpkg.com/request-promise/-/request-promise-4.2.2.tgz#d1ea46d654a6ee4f8ee6a4fea1018c22911904b4" - dependencies: - bluebird "^3.5.0" - request-promise-core "1.1.1" - stealthy-require "^1.1.0" - tough-cookie ">=2.3.3" - -request@^2.88.0: - version "2.88.0" - resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef" - dependencies: - aws-sign2 "~0.7.0" - aws4 "^1.8.0" - caseless "~0.12.0" - combined-stream "~1.0.6" - extend "~3.0.2" - forever-agent "~0.6.1" - form-data "~2.3.2" - har-validator "~5.1.0" - http-signature "~1.2.0" - is-typedarray "~1.0.0" - isstream "~0.1.2" - json-stringify-safe "~5.0.1" - mime-types "~2.1.19" - oauth-sign "~0.9.0" - performance-now "^2.1.0" - qs "~6.5.2" - safe-buffer "^5.1.2" - tough-cookie "~2.4.3" - tunnel-agent "^0.6.0" - uuid "^3.3.2" - -resolve-url@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" - -ret@~0.1.10: - version "0.1.15" - resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc" - -rimraf@^2.6.1: - version "2.6.2" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36" - dependencies: - glob "^7.0.5" - -safe-buffer@5.1.2, safe-buffer@^5.0.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: - version "5.1.2" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" - -safe-regex@^1.1.0: - version "1.1.0" - resolved "http://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e" - dependencies: - ret "~0.1.10" - -"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: - version "2.1.2" - resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" - -sax@^1.2.4: - version "1.2.4" - resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" - -semver-diff@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-2.1.0.tgz#4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36" - dependencies: - semver "^5.0.3" - -semver@4.3.2: - version "4.3.2" - resolved "http://registry.npmjs.org/semver/-/semver-4.3.2.tgz#c7a07158a80bedd052355b770d82d6640f803be7" - -semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.5.0: - version "5.6.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004" - -send@0.16.2: - version "0.16.2" - resolved "https://registry.yarnpkg.com/send/-/send-0.16.2.tgz#6ecca1e0f8c156d141597559848df64730a6bbc1" - dependencies: - debug "2.6.9" - depd "~1.1.2" - destroy "~1.0.4" - encodeurl "~1.0.2" - escape-html "~1.0.3" - etag "~1.8.1" - fresh "0.5.2" - http-errors "~1.6.2" - mime "1.4.1" - ms "2.0.0" - on-finished "~2.3.0" - range-parser "~1.2.0" - statuses "~1.4.0" - -serve-static@1.13.2: - version "1.13.2" - resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.2.tgz#095e8472fd5b46237db50ce486a43f4b86c6cec1" - dependencies: - encodeurl "~1.0.2" - escape-html "~1.0.3" - parseurl "~1.3.2" - send "0.16.2" - -set-blocking@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" - -set-value@^0.4.3: - version "0.4.3" - resolved "https://registry.yarnpkg.com/set-value/-/set-value-0.4.3.tgz#7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1" - dependencies: - extend-shallow "^2.0.1" - is-extendable "^0.1.1" - is-plain-object "^2.0.1" - to-object-path "^0.3.0" - -set-value@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.0.tgz#71ae4a88f0feefbbf52d1ea604f3fb315ebb6274" - dependencies: - extend-shallow "^2.0.1" - is-extendable "^0.1.1" - is-plain-object "^2.0.3" - split-string "^3.0.1" - -setprototypeof@1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656" - -shebang-command@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" - dependencies: - shebang-regex "^1.0.0" - -shebang-regex@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3" - -signal-exit@^3.0.0, signal-exit@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d" - -snapdragon-node@^2.0.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b" - dependencies: - define-property "^1.0.0" - isobject "^3.0.0" - snapdragon-util "^3.0.1" - -snapdragon-util@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2" - dependencies: - kind-of "^3.2.0" - -snapdragon@^0.8.1: - version "0.8.2" - resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d" - dependencies: - base "^0.11.1" - debug "^2.2.0" - define-property "^0.2.5" - extend-shallow "^2.0.1" - map-cache "^0.2.2" - source-map "^0.5.6" - source-map-resolve "^0.5.0" - use "^3.1.0" - -source-map-resolve@^0.5.0: - version "0.5.2" - resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.2.tgz#72e2cc34095543e43b2c62b2c4c10d4a9054f259" - dependencies: - atob "^2.1.1" - decode-uri-component "^0.2.0" - resolve-url "^0.2.1" - source-map-url "^0.4.0" - urix "^0.1.0" - -source-map-url@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3" - -source-map@^0.5.6: - version "0.5.7" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" - -spex@2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/spex/-/spex-2.1.0.tgz#21939ab7722322c3a1d002870fab022daa79335f" - -split-string@^3.0.1, split-string@^3.0.2: - version "3.1.0" - resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2" - dependencies: - extend-shallow "^3.0.0" - -split@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/split/-/split-1.0.1.tgz#605bd9be303aa59fb35f9229fbea0ddec9ea07d9" - dependencies: - through "2" - -sshpk@^1.7.0: - version "1.16.0" - resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.0.tgz#1d4963a2fbffe58050aa9084ca20be81741c07de" - dependencies: - asn1 "~0.2.3" - assert-plus "^1.0.0" - bcrypt-pbkdf "^1.0.0" - dashdash "^1.12.0" - ecc-jsbn "~0.1.1" - getpass "^0.1.1" - jsbn "~0.1.0" - safer-buffer "^2.0.2" - tweetnacl "~0.14.0" - -static-extend@^0.1.1: - version "0.1.2" - resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6" - dependencies: - define-property "^0.2.5" - object-copy "^0.1.0" - -"statuses@>= 1.4.0 < 2": - version "1.5.0" - resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" - -statuses@~1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087" - -stealthy-require@^1.1.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b" - -string-width@^1.0.1: - version "1.0.2" - resolved "http://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" - dependencies: - code-point-at "^1.0.0" - is-fullwidth-code-point "^1.0.0" - strip-ansi "^3.0.0" - -"string-width@^1.0.2 || 2", string-width@^2.0.0, string-width@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" - dependencies: - is-fullwidth-code-point "^2.0.0" - strip-ansi "^4.0.0" - -string_decoder@~0.10.x: - version "0.10.31" - resolved "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" - -string_decoder@~1.1.1: - version "1.1.1" - resolved "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" - dependencies: - safe-buffer "~5.1.0" - -strip-ansi@^3.0.0, strip-ansi@^3.0.1: - version "3.0.1" - resolved "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" - dependencies: - ansi-regex "^2.0.0" - -strip-ansi@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f" - dependencies: - ansi-regex "^3.0.0" - -strip-eof@^1.0.0: - version "1.0.0" - resolved "http://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf" - -strip-json-comments@~2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" - -supports-color@^5.2.0, supports-color@^5.3.0: - version "5.5.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" - dependencies: - has-flag "^3.0.0" - -tar@^4: - version "4.4.8" - resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.8.tgz#b19eec3fde2a96e64666df9fdb40c5ca1bc3747d" - dependencies: - chownr "^1.1.1" - fs-minipass "^1.2.5" - minipass "^2.3.4" - minizlib "^1.1.1" - mkdirp "^0.5.0" - safe-buffer "^5.1.2" - yallist "^3.0.2" - -term-size@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/term-size/-/term-size-1.2.0.tgz#458b83887f288fc56d6fffbfad262e26638efa69" - dependencies: - execa "^0.7.0" - -through@2: - version "2.3.8" - resolved "http://registry.npmjs.org/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" - -timed-out@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f" - -to-object-path@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af" - dependencies: - kind-of "^3.0.2" - -to-regex-range@^2.1.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38" - dependencies: - is-number "^3.0.0" - repeat-string "^1.6.1" - -to-regex@^3.0.1, to-regex@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce" - dependencies: - define-property "^2.0.2" - extend-shallow "^3.0.2" - regex-not "^1.0.2" - safe-regex "^1.1.0" - -touch@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/touch/-/touch-3.1.0.tgz#fe365f5f75ec9ed4e56825e0bb76d24ab74af83b" - dependencies: - nopt "~1.0.10" - -tough-cookie@>=2.3.3: - version "2.5.0" - resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2" - dependencies: - psl "^1.1.28" - punycode "^2.1.1" - -tough-cookie@~2.4.3: - version "2.4.3" - resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781" - dependencies: - psl "^1.1.24" - punycode "^1.4.1" - -tunnel-agent@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" - dependencies: - safe-buffer "^5.0.1" - -tweetnacl@^0.14.3, tweetnacl@~0.14.0: - version "0.14.5" - resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" - -type-is@~1.6.16: - version "1.6.16" - resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.16.tgz#f89ce341541c672b25ee7ae3c73dee3b2be50194" - dependencies: - media-typer "0.3.0" - mime-types "~2.1.18" - -undefsafe@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/undefsafe/-/undefsafe-2.0.2.tgz#225f6b9e0337663e0d8e7cfd686fc2836ccace76" - dependencies: - debug "^2.2.0" - -union-value@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4" - dependencies: - arr-union "^3.1.0" - get-value "^2.0.6" - is-extendable "^0.1.1" - set-value "^0.4.3" - -unique-string@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-1.0.0.tgz#9e1057cca851abb93398f8b33ae187b99caec11a" - dependencies: - crypto-random-string "^1.0.0" - -unpipe@1.0.0, unpipe@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" - -unset-value@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559" - dependencies: - has-value "^0.3.1" - isobject "^3.0.0" - -unzip-response@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97" - -upath@^1.0.5: - version "1.1.0" - resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.0.tgz#35256597e46a581db4793d0ce47fa9aebfc9fabd" - -update-notifier@^2.5.0: - version "2.5.0" - resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-2.5.0.tgz#d0744593e13f161e406acb1d9408b72cad08aff6" - dependencies: - boxen "^1.2.1" - chalk "^2.0.1" - configstore "^3.0.0" - import-lazy "^2.1.0" - is-ci "^1.0.10" - is-installed-globally "^0.1.0" - is-npm "^1.0.0" - latest-version "^3.0.0" - semver-diff "^2.0.0" - xdg-basedir "^3.0.0" - -uri-js@^4.2.2: - version "4.2.2" - resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0" - dependencies: - punycode "^2.1.0" - -urix@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72" - -url-parse-lax@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-1.0.0.tgz#7af8f303645e9bd79a272e7a14ac68bc0609da73" - dependencies: - prepend-http "^1.0.1" - -use@^3.1.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f" - -util-deprecate@~1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" - -utils-merge@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" - -uuid@3.3.2, uuid@^3.3.2: - version "3.3.2" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131" - -vary@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" - -verror@1.10.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400" - dependencies: - assert-plus "^1.0.0" - core-util-is "1.0.2" - extsprintf "^1.2.0" - -which@^1.2.9: - version "1.3.1" - resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" - dependencies: - isexe "^2.0.0" - -wide-align@^1.1.0: - version "1.1.3" - resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457" - dependencies: - string-width "^1.0.2 || 2" - -widest-line@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-2.0.1.tgz#7438764730ec7ef4381ce4df82fb98a53142a3fc" - dependencies: - string-width "^2.1.1" - -wrappy@1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" - -write-file-atomic@^2.0.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.3.0.tgz#1ff61575c2e2a4e8e510d6fa4e243cce183999ab" - dependencies: - graceful-fs "^4.1.11" - imurmurhash "^0.1.4" - signal-exit "^3.0.2" - -xdg-basedir@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-3.0.0.tgz#496b2cc109eca8dbacfe2dc72b603c17c5870ad4" - -xmlbuilder@10.0.0: - version "10.0.0" - resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-10.0.0.tgz#c64e52f8ae097fe5fd46d1c38adaade071ee1b55" - -xtend@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af" - -yallist@^2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" - -yallist@^3.0.0, yallist@^3.0.2: - version "3.0.3" - resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.3.tgz#b4b049e314be545e3ce802236d6cd22cd91c3de9" diff --git a/static/js/ulb-override.js b/static/js/ulb-override.js deleted file mode 100644 index 91887493..00000000 --- a/static/js/ulb-override.js +++ /dev/null @@ -1,100 +0,0 @@ -var appOverrides = (function() { - var INIT_VALUES = { - pbFireCess: { - inflammable: false, - heightAbove36Feet: false, - }, - }; - var state = JSON.parse(JSON.stringify(INIT_VALUES)); - - var pbFireCess = { - fireCessOnChange: function(e) { - state.pbFireCess[e.target.id] = e.target.checked; - }, - initForm: function() { - var basicInfoEle = document.getElementById("basicInformation"); - var newEle = document.getElementById("pbFireCess"); - - if (basicInfoEle != null && basicInfoEle != undefined && (newEle == null && newEle == undefined)) { - var fireCessNode = document.createElement("div"); - fireCessNode.innerHTML = - '
'; - basicInfoEle.parentNode.insertBefore(fireCessNode, basicInfoEle.nextSibling); - - var inflammable = document.getElementById("inflammable"); - var heightAbove36Feet = document.getElementById("heightAbove36Feet"); - - inflammable.checked = state.pbFireCess.inflammable; - heightAbove36Feet.checked = state.pbFireCess.heightAbove36Feet; - var tab = document.getElementsByClassName("form-tab-index").item(0) - if (tab.textContent == "4") { - inflammable.disabled = 'disabled' - heightAbove36Feet.disabled = 'disabled' - } - - inflammable.addEventListener("change", pbFireCess.fireCessOnChange); - heightAbove36Feet.addEventListener("change", pbFireCess.fireCessOnChange); - } - }, - resetForm: function(data) { - state.pbFireCess = JSON.parse(JSON.stringify(INIT_VALUES.pbFireCess)); - }, - updateForm: function(data) { - var property = data.Properties[0]; - if (property && property.propertyDetails && property.propertyDetails[0].additionalDetails) { - var imflammable = property.propertyDetails[0].additionalDetails.inflammable; - var heightAbove36Feet = property.propertyDetails[0].additionalDetails.heightAbove36Feet; - - if (imflammable !== undefined && imflammable !== null) { - state.pbFireCess.inflammable = imflammable; - if (document.getElementById("inflammable")) document.getElementById("inflammable").checked = imflammable; - } - - if (heightAbove36Feet !== undefined && heightAbove36Feet !== null) { - state.pbFireCess.heightAbove36Feet = heightAbove36Feet; - if (document.getElementById("heightAbove36Feet")) document.getElementById("heightAbove36Feet").checked = heightAbove36Feet; - } - } - }, - submitForm: function(property) { - if (property && property[0].propertyDetails) { - property[0].propertyDetails[0]["additionalDetails"] = state.pbFireCess; - } - }, - }; - - var API = { - initForm: function(formKey, data) { - switch (formKey) { - case "basicInformation": - return pbFireCess.initForm(data); - default: - return; - } - }, - resetForm: function(formKey, data) { - switch (formKey) { - case "basicInformation": - return pbFireCess.resetForm(data); - default: - return; - } - }, - validateForm: function(formKey, data) { - switch (formKey) { - default: - return true; - } - }, - updateForms: function(data) { - pbFireCess.updateForm(data); - return; - }, - submitForm: function(data) { - pbFireCess.submitForm(data); - return; - }, - }; - return API; -})(); - From e28c57620d5b15885d5d74568cd93308052147c5 Mon Sep 17 00:00:00 2001 From: erramesh000 Date: Thu, 21 Dec 2023 12:27:27 +0530 Subject: [PATCH 1217/1242] replace prod to uat --- jenkins/archiver.groovy | 9 + jenkins/code_builder.groovy | 17 + jenkins/image_builder.groovy | 31 + jenkins/notifier.groovy | 30 + rainmaker-custom-service/.dockerignore | 1 + rainmaker-custom-service/.gitignore | 3 + rainmaker-custom-service/Dockerfile | 8 + rainmaker-custom-service/bnd.js | 15 + rainmaker-custom-service/build.wkflo | 9 + rainmaker-custom-service/encrypt.js | 41 + rainmaker-custom-service/index.js | 1105 ++++++++ rainmaker-custom-service/package.json | 23 + rainmaker-custom-service/static/css/bnd.css | 137 + rainmaker-custom-service/static/js/bnd.js | 128 + .../templates/apicall.html | 45 + .../templates/bndlogin.html | 32 + .../templates/common/footer.html | 2 + .../templates/common/header.html | 13 + .../templates/common/scripts.html | 4 + .../utils/asyncMiddleware.js | 9 + rainmaker-custom-service/yarn.lock | 2297 +++++++++++++++++ services/.gitignore | 6 + .../rainmaker-custom-service/.dockerignore | 1 + services/rainmaker-custom-service/.gitignore | 2 + services/rainmaker-custom-service/Dockerfile | 9 + services/rainmaker-custom-service/bnd.js | 15 + services/rainmaker-custom-service/build.wkflo | 9 + services/rainmaker-custom-service/encrypt.js | 41 + services/rainmaker-custom-service/index.js | 581 +++++ .../rainmaker-custom-service/package.json | 22 + .../static/css/bnd.css | 137 + .../rainmaker-custom-service/static/js/bnd.js | 128 + .../templates/apicall.html | 45 + .../templates/bndlogin.html | 32 + .../templates/common/footer.html | 2 + .../templates/common/header.html | 13 + .../templates/common/scripts.html | 4 + .../utils/asyncMiddleware.js | 9 + services/rainmaker-custom-service/yarn.lock | 2297 +++++++++++++++++ static/js/ulb-override.js | 100 + 40 files changed, 7412 insertions(+) create mode 100644 jenkins/archiver.groovy create mode 100644 jenkins/code_builder.groovy create mode 100644 jenkins/image_builder.groovy create mode 100644 jenkins/notifier.groovy create mode 100644 rainmaker-custom-service/.dockerignore create mode 100644 rainmaker-custom-service/.gitignore create mode 100644 rainmaker-custom-service/Dockerfile create mode 100644 rainmaker-custom-service/bnd.js create mode 100644 rainmaker-custom-service/build.wkflo create mode 100644 rainmaker-custom-service/encrypt.js create mode 100644 rainmaker-custom-service/index.js create mode 100644 rainmaker-custom-service/package.json create mode 100644 rainmaker-custom-service/static/css/bnd.css create mode 100644 rainmaker-custom-service/static/js/bnd.js create mode 100644 rainmaker-custom-service/templates/apicall.html create mode 100644 rainmaker-custom-service/templates/bndlogin.html create mode 100644 rainmaker-custom-service/templates/common/footer.html create mode 100644 rainmaker-custom-service/templates/common/header.html create mode 100644 rainmaker-custom-service/templates/common/scripts.html create mode 100644 rainmaker-custom-service/utils/asyncMiddleware.js create mode 100644 rainmaker-custom-service/yarn.lock create mode 100644 services/.gitignore create mode 100644 services/rainmaker-custom-service/.dockerignore create mode 100644 services/rainmaker-custom-service/.gitignore create mode 100644 services/rainmaker-custom-service/Dockerfile create mode 100644 services/rainmaker-custom-service/bnd.js create mode 100644 services/rainmaker-custom-service/build.wkflo create mode 100644 services/rainmaker-custom-service/encrypt.js create mode 100644 services/rainmaker-custom-service/index.js create mode 100644 services/rainmaker-custom-service/package.json create mode 100644 services/rainmaker-custom-service/static/css/bnd.css create mode 100644 services/rainmaker-custom-service/static/js/bnd.js create mode 100644 services/rainmaker-custom-service/templates/apicall.html create mode 100644 services/rainmaker-custom-service/templates/bndlogin.html create mode 100644 services/rainmaker-custom-service/templates/common/footer.html create mode 100644 services/rainmaker-custom-service/templates/common/header.html create mode 100644 services/rainmaker-custom-service/templates/common/scripts.html create mode 100644 services/rainmaker-custom-service/utils/asyncMiddleware.js create mode 100644 services/rainmaker-custom-service/yarn.lock create mode 100644 static/js/ulb-override.js diff --git a/jenkins/archiver.groovy b/jenkins/archiver.groovy new file mode 100644 index 00000000..2ecdaf2e --- /dev/null +++ b/jenkins/archiver.groovy @@ -0,0 +1,9 @@ +def archiveArtifacts(artifacts){ + stage("Archive Results") { + for (artifact in artifacts) { + archive "${artifact}" + } + } +} + +return this; diff --git a/jenkins/code_builder.groovy b/jenkins/code_builder.groovy new file mode 100644 index 00000000..a17c2ae4 --- /dev/null +++ b/jenkins/code_builder.groovy @@ -0,0 +1,17 @@ +def build(path, ci_image){ + def build_workflow_exists = fileExists("${path}/build.wkflo"); + if (build_workflow_exists) { + build_wkflo = load("${path}/build.wkflo") + build_wkflo.build(path, ci_image) + } else { + defaultMavenBuild(path, ci_image) + } +} + +def defaultMavenBuild(path, ci_image){ + stage("Build"){ + sh "./build.sh ${path}" + } +} + +return this; diff --git a/jenkins/image_builder.groovy b/jenkins/image_builder.groovy new file mode 100644 index 00000000..984cc136 --- /dev/null +++ b/jenkins/image_builder.groovy @@ -0,0 +1,31 @@ +def build(module_name, service_name, commit_id){ + stage("Build docker image") { + build_image("${module_name}/${service_name}", "egovio/${service_name}", commit_id) + + def migration_exists = fileExists "${module_name}/${service_name}/src/main/resources/db/Dockerfile" + if (migration_exists) { + build_image("${module_name}/${service_name}/src/main/resources/db", "egovio/${service_name}-db", commit_id) + } + } +} + +def build_image(dockerfile_path, image_name, commit_id){ + sh "cd ${dockerfile_path} && docker build --no-cache -t ${image_name} ." + sh "docker tag ${image_name} ${image_name}:${BUILD_ID}-${commit_id}" + sh "docker tag ${image_name} ${image_name}:latest" +} + +def publish(service_name, commit_id){ + stage("Publish docker image") { + sh "docker images | grep egovio/${service_name} | awk '{b=\$1\":\"\$2; print b}' | while read x; do docker push \$x; done" + } +} + + +def clean(service_name, commit_id){ + stage("Clean docker image and unused volumes") { + sh "docker images | grep egovio/${service_name} | awk '{b=\$1\":\"\$2; print b}' | while read x; do docker rmi \$x; done" + } +} + +return this; diff --git a/jenkins/notifier.groovy b/jenkins/notifier.groovy new file mode 100644 index 00000000..ba0eecee --- /dev/null +++ b/jenkins/notifier.groovy @@ -0,0 +1,30 @@ +def notifyBuild(buildStatus = 'STARTED') { + buildStatus = buildStatus ?: 'SUCCESSFUL' + def BUILD_STATUS = buildStatus + def colorName = 'RED' + def colorCode = '#FF0000' + def subject = "${buildStatus}: Job ${env.JOB_NAME} #${env.BUILD_NUMBER}" + def summary = "${subject} (${env.BUILD_URL})" + + if (buildStatus == 'STARTED') { + color = 'YELLOW' + colorCode = '#FFFF00' + } else if (buildStatus == 'SUCCESSFUL') { + color = 'GREEN' + colorCode = '#00FF00' + } else { + color = 'RED' + colorCode = '#FF0000' + } + + slackSend (color: colorCode, message: summary) + emailext ( + body: '${JELLY_SCRIPT, template="html_gmail"}', + recipientProviders: [[$class: 'CulpritsRecipientProvider'], [$class: 'DevelopersRecipientProvider'], [$class: 'RequesterRecipientProvider']], + replyTo: '$DEFAULT_REPLYTO', + subject: subject, + to: '$DEFAULT_RECIPIENTS' + ) +} + +return this; diff --git a/rainmaker-custom-service/.dockerignore b/rainmaker-custom-service/.dockerignore new file mode 100644 index 00000000..3c3629e6 --- /dev/null +++ b/rainmaker-custom-service/.dockerignore @@ -0,0 +1 @@ +node_modules diff --git a/rainmaker-custom-service/.gitignore b/rainmaker-custom-service/.gitignore new file mode 100644 index 00000000..6cacf563 --- /dev/null +++ b/rainmaker-custom-service/.gitignore @@ -0,0 +1,3 @@ +sampleRequest.js +nodemon.json +.vscode diff --git a/rainmaker-custom-service/Dockerfile b/rainmaker-custom-service/Dockerfile new file mode 100644 index 00000000..37c7dacd --- /dev/null +++ b/rainmaker-custom-service/Dockerfile @@ -0,0 +1,8 @@ +FROM egovio/alpine-node-builder-10:yarn AS build +RUN mkdir /opt/app +COPY package.json yarn.lock /opt/app/ +WORKDIR /opt/app +RUN yarn install +COPY . /opt/app +CMD ["node", "index.js"] + diff --git a/rainmaker-custom-service/bnd.js b/rainmaker-custom-service/bnd.js new file mode 100644 index 00000000..3514c63d --- /dev/null +++ b/rainmaker-custom-service/bnd.js @@ -0,0 +1,15 @@ +let requests = require("request") + +requests.post("http://13.126.198.70/eDistServices/ModuleCommon/serAuth.asmx/serAuthExternalUser", + { + form: { + username: "eomcbrn", + password: "esewa@123" + }, + headers: { + "x-api-key": "Tw0AxM3kyV3mb8SM" + } + } +,function(a,b,c) { + console.log(a,c); +}) \ No newline at end of file diff --git a/rainmaker-custom-service/build.wkflo b/rainmaker-custom-service/build.wkflo new file mode 100644 index 00000000..95cba3d1 --- /dev/null +++ b/rainmaker-custom-service/build.wkflo @@ -0,0 +1,9 @@ +def build(path, ci_image) { + stage("Build") { + docker.image("egovio/ci-react:v8.4.0").inside { + sh "cd ${path}/ && rm -rf node_modules"; + } + } +} + +return this; diff --git a/rainmaker-custom-service/encrypt.js b/rainmaker-custom-service/encrypt.js new file mode 100644 index 00000000..130ba4c9 --- /dev/null +++ b/rainmaker-custom-service/encrypt.js @@ -0,0 +1,41 @@ +const ENCRYPTION_KEY = process.env.ENCRYPTION_KEY +const ENCRYPTION_IV = process.env.ENCRYPTION_IV +const JWT_KEY = process.env.JWT_KEY +const JWT_EXPIRY = process.env.JWT_EXPIRY || '5min' +const DEBUG_MODE = Boolean(process.env.DEBUG_MODE) || false; + +function log(val) { + if (DEBUG_MODE) { + console.log(val) + } +} + +log ("EK=" + ENCRYPTION_KEY) +log ("EI=" + ENCRYPTION_IV) + +var encrypt = function (pass) { + // Include Library + var crypto = require('crypto'); + + // Declare Key and Block + var key = ENCRYPTION_KEY; + var iv = ENCRYPTION_IV; + + // Calc Cipher + var cipher = crypto.createCipheriv('aes256', key, iv) + var crypted = cipher.update(pass, 'utf8', 'base64') + crypted += cipher.final('base64'); + + // Return Cipher Text + return crypted; +} + + +var jwt = require("jsonwebtoken"); + +jwt_sign = (data) => jwt.sign(data, JWT_KEY, { expiresIn: JWT_EXPIRY }); + +module.exports = { + jwt_sign, + encrypt +} \ No newline at end of file diff --git a/rainmaker-custom-service/index.js b/rainmaker-custom-service/index.js new file mode 100644 index 00000000..fc742333 --- /dev/null +++ b/rainmaker-custom-service/index.js @@ -0,0 +1,1105 @@ +var express = require('express'), + slash = require('express-slash'); +var bodyParser = require('body-parser') +var url = require("url"); +var request = require('request-promise'); +const { + asyncMiddleware +} = require('./utils/asyncMiddleware'); + +var app = express(); +var mustache = require('mustache-express') +const Cryptr = require('cryptr'); +var { + encrypt, + jwt_sign +} = require('./encrypt') + +app.use(require('morgan')('dev')); + +app.engine('html', mustache()) +app.set('view engine', 'html') +app.set('views', __dirname + '/templates') +app.disable('view cache'); + +// https://codepen.io/graphicfreedom/pen/evaBXm + +const DEBUG_MODE = Boolean(process.env.DEBUG_MODE) || false; +const PT_DEMAND_HOST = process.env.PT_DEMAND_HOST + +const PT_ZERO_ASSESSMENTYEAR = process.env.PT_ZERO_ASSESSMENTYEAR || "2013-14"; +const PT_ZERO_TENANTS = (process.env.PT_ZERO_TENANTS || "pb.testing").split(","); + +// +const PT_INTEGRATION_ASSESSMENTYEAR =process.env.PT_INTEGRATION_ASSESSMENTYEAR || "2013-14" +const PT_INTEGRATION_TENANTS = (process.env.PT_INTEGRATION_TENANTS || "pb.testing").split(","); + +const PT_INTEGRATION_HOST = process.env.PT_INTEGRATION_HOST +const PT_CALCULATOR_V2_HOST = process.env.PT_CALCULATOR_V2_HOST + +// + +const PT_ENABLE_FC_CALC = Boolean(process.env.PT_ENABLE_FC_CALC || false); +const EGOV_MDMS_HOST = process.env.EGOV_MDMS_HOST +const EGOV_BND_LOGIN_URL = process.env.EGOV_BND_LOGIN_URL +const EGOV_BND_REDIRECT_URL = process.env.EGOV_BND_REDIRECT_URL +// const EGOV_BND_API_KEY = process.env.EGOV_BND_API_KEY +const EGOV_BND_ENCRYPTION_KEY = process.env.EGOV_BND_ENCRYPTION_KEY || "Vol0otuji0X03wSuZGI3zySUzxj7bReQ" + +function log(val) { + if (DEBUG_MODE) { + console.log(val) + } +} + +log("ENCKEY=" + EGOV_BND_ENCRYPTION_KEY) + +const cryptr = new Cryptr(EGOV_BND_ENCRYPTION_KEY); + + +function getUserUUID(data) { + return data.RequestInfo.userInfo.uuid; +} + +function isCitizen(data) { + return data.RequestInfo.userInfo.roles.filter(role => role.code.toUpperCase() == "CITIZEN").length > 0 +} + +function getUserID(data) { + return data.RequestInfo.userInfo.id; +} + +function getIntegrateYearDemand(demands){ + for(demand of demands["Demands"]){ + let demandYear = new Date(demand["taxPeriodFrom"]).getFullYear(); + let integrationYear = PT_INTEGRATION_ASSESSMENTYEAR.split("-")[0]; + let demandStatus = demand["status"] + + log("getIntegrateYearDemand> Demand year: "+ demandYear+" Integrated Year: "+integrationYear+" Demand Status: "+demandStatus); + + if((demandYear == integrationYear) && (demandStatus == "ACTIVE")){ + demands["Demands"] = [demand]; + break; + } + + } + + log("Response from getIntegrateYearDemand: "+ JSON.stringify(demands)); + + return demands; +} + +function isValidDemand(demands){ + let count = 0; + for(demand of demands["Demands"]){ + demandYear = new Date(demand["taxPeriodFrom"]).getFullYear() + integrationYear = PT_INTEGRATION_ASSESSMENTYEAR.split("-")[0] + demandStatus = demand["status"] + if((demandYear == integrationYear) && (demandStatus == "ACTIVE")){ + count++; + } + } + + return count == 1; +} + +function isReceiptGenerated(demand){ + for (demandDetail of demand["Demands"][0]["demandDetails"]) + { + if(demandDetail.collectionAmount || 0 > 0){ + return true; + } + } + return false; +} + +async function getFireCessConfig(tenantId) { + let fireCessConfig = await request.post({ + url: url.resolve(EGOV_MDMS_HOST, "/egov-mdms-service/v1/_search?tenantId=" + tenantId), + body: { + RequestInfo: { + "apiId": "Rainmaker-custom-service", + "ver": ".01", + "ts": "", + "action": "_search", + "did": "1", + "key": "", + "msgId": "20170310130900|en_IN", + "authToken": null + }, + "MdmsCriteria": { + "tenantId": tenantId, + "moduleDetails": [{ + "moduleName": "PropertyTax", + "masterDetails": [{ + "name": "FireCess" + }] + }] + } + }, + json: true + }) + + return fireCessConfig["MdmsRes"]["PropertyTax"]["FireCess"][0]; +} + +const TAX_TYPE = { + PT_TAX: false, + PT_TIME_REBATE: true, + PT_UNIT_USAGE_EXEMPTION: true, + PT_TIME_PENALTY: false, + PT_CANCER_CESS: false, + PT_ADHOC_PENALTY: false, + PT_ADHOC_REBATE: true, + PT_DECIMAL_CEILING_CREDIT: false, + PT_DECIMAL_CEILING_DEBIT: true, + PT_FIRE_CESS: false, + PT_OWNER_EXEMPTION: true, + PT_TIME_INTEREST: false +} + +if (PT_DEMAND_HOST === undefined) { + throw Error("PT_DEMAND_HOST environment variable needs to be configured to run this") +} + +if (PT_CALCULATOR_V2_HOST === undefined) { + throw Error("PT_CALCULATOR_V2_HOST environment variable needs to be configured to run this") +} + +function round(num, digits) { + return parseFloat(parseFloat(num).toFixed(digits)) +} + +// parse application/x-www-form-urlencoded +app.use(bodyParser.urlencoded({ + extended: true +})) + +// parse application/json +app.use(bodyParser.json()) + +// Because you're the type of developer who cares about this sort of thing! +app.enable('strict routing'); + +// Create the router using the same routing options as the app. +var router = express.Router({ + caseSensitive: app.get('case sensitive routing'), + strict: app.get('strict routing') +}); + +router.use("/static", express.static("static")) + +// Add the `slash()` middleware after your app's `router`, optionally specify +// an HTTP status code to use when redirecting (defaults to 301). +app.use('/customization', router); +// app.use(slash()); +app.use(express.json()); + +var promise = require('bluebird'); + +var options = { + // Initialization Options + promiseLib: promise +}; + +var pgp = require('pg-promise')(options); + +const connectionString = { + host: process.env.DB_HOST || 'localhost', + port: 5432, + database: process.env.DB_NAME || 'postgres', + user: process.env.DB_USER || 'postgres', + password: process.env.DB_PASSWORD || 'postgres' +}; + +// var connectionString = 'postgres://localhost:5432/egov_prod_db'; +var db = pgp(connectionString); +var path = require('path'); + +query = `SELECT servicerequestid as complaint_no, servicecode as complaint_type, eg_user.name as citizen_name, eg_user.mobilenumber as citizen_mobile, address, landmark, description as details +FROM eg_pgr_service INNER JOIN eg_user ON eg_pgr_service.accountid = cast(eg_user.id as varchar) +WHERE eg_pgr_service.status = 'assigned' AND servicerequestid IN (select DISTINCT businesskey from eg_pgr_action where status = 'assigned' AND "when" +IN (select max("when") from eg_pgr_action where assignee NOTNULL group by businesskey) AND assignee = $1);` + +router.get('/open/reports/*', function (req, res) { + res.render('apicall.html'); +}); + +router.get('/open/bndlogin', function (req, res) { + res.render('bndlogin.html'); +}); + +router.post('/protected/bndlogin/unlinkAccount', asyncMiddleware(async function (req, res) { + let uuid = getUserUUID(req.body); + + data = await db.any("DELETE FROM custom_eg_user_metatdata where user_id = $1 and key = $2", [uuid, 'BND_CREDENTIALS']); + res.status(200).send({}) +})); + +router.post('/protected/bndlogin/linkAccount', asyncMiddleware(async function (req, res) { + let username = req.body.username + let password = req.body.password + let uuid = getUserUUID(req.body); + let payload = { + Username: username, + Password: encrypt(password) + } + + log("inside linkAccount") + log(payload) + + let response = await request.post(EGOV_BND_LOGIN_URL, { + json: payload + }) + + log(response) + + if (response.sys_message && response.sys_message == 'Invalid User and Password') { + res.status(200).send({ + code: "INVALID_CREDENTIALS", + message: "Invalid User and Password" + }) + return + } else if (response.sys_message && response.sys_message == 'INTERNAL APPLICATION ERROR') { + res.status(200).send({ + code: "ERROR", + message: "Something went wrong" + }) + return + } + + loginID = response["data"][0]["loginID"]; + data = await db.any("select value from custom_eg_user_metatdata where user_id = $1 and key = $2", [uuid, 'BND_CREDENTIALS']); + value = { + username, + GUID: cryptr.encrypt(loginID) + } + + if (data.length == 0) { + await db.any("insert into custom_eg_user_metatdata(key, user_id, value) values ($1, $2, $3:json)", + ['BND_CREDENTIALS', uuid, value]) + } else { + await db.any("update custom_eg_user_metatdata set value = $3:json where key = $1 and user_id = $2", + ['BND_CREDENTIALS', uuid, value]) + } + res.json({ + code: "SUCCESS", + redirect: EGOV_BND_REDIRECT_URL + jwt_sign({ + loginID: encrypt(loginID) + }) + }) +})); + +router.post('/protected/bndlogin', asyncMiddleware(async function (req, res) { + try { + let uuid = getUserUUID(req.body); + data = await db.any("select value from custom_eg_user_metatdata where user_id = $1 and key = $2", [uuid, 'BND_CREDENTIALS']); + + if (data.length == 0) { + res.json({ + "code": "NO_CREDENTIAL_MAPPING", + "message": "Please update your Birth and Death credentials" + }) + return + } + + let loginID = cryptr.decrypt(data[0]["value"]["GUID"]) + + res.json({ + code: "SUCCESS", + redirect: EGOV_BND_REDIRECT_URL + jwt_sign({ + loginID: encrypt(loginID) + }) + }) + + } catch (ex) { + console.log("Exception occured while login", ex) + res.json({ + "code": "ERROR", + "message": "Failed to login to BND - " + ex.toString() + }) + } + +})); + +// function getFireCessPercentage(propertyDetails, fireCessConfig) { +// // let propertyDetails = request["CalculationCriteria"][0]["propertyDetails"][0] + +// let propertyUsageCategoryMajor = propertyDetails["usageCategoryMajor"] +// let units = propertyDetails["units"] +// let propertyAttributes = propertyDetails["additionalDetails"] +// let unitSet = new Set() + +// for (unit of units) { +// unitSet.add(unit["usageCategoryMajor"]) +// } +// let firecess_category_major = 0; +// let firecess_building_height = 0; +// let firecess_inflammable = 0; + +// if (propertyUsageCategoryMajor == "RESIDENTIAL" || (unitSet.size == 1 && unitSet.has("RESIDENTIAL"))) { +// // There is no category major firecess applicable as it i +// firecess_category_major = 0 +// } else { +// firecess_category_major = fireCessConfig.dynamicRates.firecess_category_major; +// } + +// if (propertyAttributes && +// propertyAttributes.heightAbove36Feet && +// propertyAttributes.heightAbove36Feet.toString() == "true") { +// // height is above 36 feet +// firecess_building_height = fireCessConfig.dynamicRates.firecess_building_height; +// } + +// if (propertyAttributes && +// propertyAttributes.inflammable && +// propertyAttributes.inflammable.toString() == "true") { +// // height is above 36 feet +// firecess_inflammable = fireCessConfig.dynamicRates.firecess_inflammable; +// } + +// return { +// firecess_inflammable, +// firecess_building_height, +// firecess_category_major, +// firecess: firecess_category_major + firecess_building_height + firecess_inflammable +// } +// } + +// function calculateNewFireCess(taxHeads, firecess_percent, taxField, taxHeadCodeField) { + +// let applicablePropertyTax = 0 +// for (taxHead of taxHeads) { +// if (taxHead[taxHeadCodeField] == "PT_TAX") { +// applicablePropertyTax += taxHead[taxField] +// } else if (taxHead[taxHeadCodeField] == "PT_UNIT_USAGE_EXEMPTION") { +// applicablePropertyTax += taxHead[taxField] +// } else if (taxHead[taxHeadCodeField] == "PT_OWNER_EXEMPTION") { +// applicablePropertyTax += taxHead[taxField] +// } +// } + +// return round(applicablePropertyTax * (firecess_percent / 100), 2); +// } + +async function findDemandForConsumerCode(consumerCode, tenantId, service, RequestInfo) { + + log("Got Request to Find Demand for Comsumer code: "+consumerCode+" tenantid : "+tenantId+" Service : "+service); + + let demandSearchResponse = await request.post({ + url: url.resolve(PT_DEMAND_HOST, "/billing-service/demand/_search?tenantId=" + tenantId + + "&consumerCode=" + consumerCode + "&businessService=" + service), + body: { + RequestInfo + }, + json: true + }) + + log("Got response from demand search : "+ JSON.stringify(demandSearchResponse)); + + return demandSearchResponse; +} + + + +async function updateDemand(demands, RequestInfo) { + let demandUpdateResponse = await request.post({ + url: url.resolve(PT_DEMAND_HOST, "/billing-service/demand/_update"), + body: { + RequestInfo, + "Demands": demands + }, + json: true + }) + + return demandUpdateResponse; +} + +async function getOldRequestBody(requestBody) { + log("Translate Call for Property: "+ JSON.stringify(requestBody)); + let CalculationCriteria = await request.post({ + url: url.resolve(PT_CALCULATOR_V2_HOST, "/pt-calculator-v2/propertytax/v2/_translate"), + body: requestBody, + json: true + }) + + log("Response from Translate API: " +JSON.stringify(CalculationCriteria)); + + return CalculationCriteria; +} + +async function findEstimate(requestBody){ + + log("Got Request to find estimate : "+ JSON.stringify(requestBody)) + + let estimateRes = await request.post({ + url: url.resolve(PT_CALCULATOR_V2_HOST, "/pt-calculator-v2/propertytax/v2/_estimate"), + body: requestBody, + json: true + }) + + log("Got response from estimate : "+ JSON.stringify(estimateRes)); + + return estimateRes; +} +// function _estimateTaxProcessor(request, response, fireCessConfig) { +// response = _estimateZeroTaxProcessor(request, response); + +// let index = 0; +// for (let calc of request["CalculationCriteria"]) { +// let fireCessPercentage = getFireCessPercentage(calc["property"]["propertyDetails"][0], fireCessConfig) + +// let updateFirecessAmount = calculateNewFireCess(response["Calculation"][0]["taxHeadEstimates"], fireCessPercentage.firecess, "estimateAmount", "taxHeadCode") +// let taxes = getUpdateTaxSummary(response["Calculation"][index], updateFirecessAmount, "taxHeadCode", "estimateAmount") + +// response["Calculation"][index]["totalAmount"] = taxes.totalAmount +// response["Calculation"][index]["taxAmount"] = round(taxes.taxAmount, 2) +// response["Calculation"][index]["rebate"] = taxes.rebate + +// index++ +// } + +// return response; +// } + + +async function _estimateIntegrationTaxProcessor(req1, res1) { + + log("Calling PMIDC estimate API: "+ JSON.stringify(res1) ) + + let estimate = await request.post({ + url: url.resolve(PT_INTEGRATION_HOST, "/apt_estimate_pt_2013/api_estimate_pt_2013"), + body: {request:req1, response:res1}, + json: true + }) + + log("Got response from PMIDC estimate API: " + JSON.stringify(estimate)) + + return estimate; +} + + + +function _estimateZeroTaxProcessor(request, response) { + let index = 0; + + for (let calc of response["Calculation"]) { + let assessmentYear = request["CalculationCriteria"][index]["assessmentYear"] + let tenantId = request["CalculationCriteria"][index]["tenantId"] + let newTotal = 0; + + if (isCitizen(request) && assessmentYear == PT_ZERO_ASSESSMENTYEAR) { + + data = + { + "ResponseInfo":null, + "Errors":[ + { + "code":"CitizenOnlineNotAllowed", + "message":"Sorry but online assessment for " + PT_ZERO_ASSESSMENTYEAR + " is not allowed. Please make the payment at the counter", + "description": "Sorry but online assessment for " + PT_ZERO_ASSESSMENTYEAR + " is not allowed. Please make the payment at the counter", + "params":null + } + ] + } + return data; + + } + + if (!(assessmentYear == PT_ZERO_ASSESSMENTYEAR && PT_ZERO_TENANTS.indexOf(tenantId) >= 0)) + continue + + let taxHeads = calc["taxHeadEstimates"]; + + for (taxHead of taxHeads) { + if (taxHead.taxHeadCode != "PT_ADHOC_PENALTY" && taxHead.taxHeadCode != 'PT_ADVANCE_CARRYFORWARD') { + taxHead.estimateAmount = 0 + } else if (taxHead.taxHeadCode == 'PT_ADVANCE_CARRYFORWARD') { + newTotal += taxHead.estimateAmount + } else { + newTotal += taxHead.estimateAmount + } + } + + calc["totalAmount"] = newTotal + calc["taxAmount"] = 0 + calc["rebate"] = 0 + calc["penalty"] = newTotal + calc["exemption"] = 0 + + index++ + } + + return response; +} + + +// function getUpdateTaxSummary(calculation, newTaxAmount, taxHeadCodeField, taxAmountField) { +// let ceilingTaxHead = null; +// let firecessTaxHead = null; + +// let taxAmount = 0, +// penalty = 0, +// rebate = 0, +// exemption = 0 +// let taxHeads = calculation["taxHeadEstimates"] +// for (taxHead of taxHeads) { +// if (taxHead[taxHeadCodeField] == "PT_FIRE_CESS") { +// let existingTaxAmount = taxHead[taxAmountField] +// taxHead[taxAmountField] = newTaxAmount +// firecessTaxHead = taxHead +// taxAmount += newTaxAmount +// if (DEBUG_MODE) { +// taxHead.oldEstimateAmount = existingTaxAmount +// } +// } else { +// switch (taxHead[taxHeadCodeField]) { +// case "PT_DECIMAL_CEILING_CREDIT": +// case "PT_DECIMAL_CEILING_DEBIT": +// case "PT_ROUNDOFF": +// ceilingTaxHead = taxHead +// break +// case "PT_ADVANCE_CARRYFORWARD": +// exemption += taxHead[taxAmountField] +// break +// default: +// switch (taxHead.category) { +// case "PENALTY": +// penalty += taxHead[taxAmountField] +// break +// case "TAX": +// taxAmount += taxHead[taxAmountField] +// break +// case "REBATE": +// rebate += taxHead[taxAmountField] +// break +// case "EXEMPTION": +// exemption += taxHead[taxAmountField] +// break +// default: +// console.log("Going to default for taxHead", taxHead) +// taxAmount += taxHead[taxAmountField] +// } + +// } +// } +// } + +// taxAmount = round(taxAmount, 2) +// penalty = round(penalty, 2) +// exemption = round(exemption, 2) +// rebate = round(rebate, 2) + +// let totalAmount = taxAmount + penalty - rebate - exemption + +// totalAmount = round(totalAmount, 2) +// let fractionAmount = totalAmount - Math.trunc(totalAmount) +// let newCeilingTax = false + +// if (ceilingTaxHead == null && fractionAmount == 0) { + +// } else { +// let ceilingDelta = 0.0; + +// if (ceilingTaxHead == null) { +// ceilingTaxHead = { +// taxHeadCode: "", +// estimateAmount: 0, +// category: null +// } +// newCeilingTax = true +// taxHeads.push(ceilingTaxHead) +// } + +// if (fractionAmount < 0.5) { +// ceilingDelta = parseFloat(fractionAmount.toFixed(2)) +// totalAmount = Math.trunc(totalAmount) +// ceilingTaxHead[taxHeadCodeField] = "PT_ROUNDOFF" +// ceilingTaxHead[taxAmountField] = -ceilingDelta +// rebate += ceilingDelta +// } else { +// ceilingDelta = parseFloat((1 - fractionAmount).toFixed(2)) + +// totalAmount = Math.trunc(totalAmount) + 1 +// ceilingTaxHead[taxHeadCodeField] = "PT_ROUNDOFF" +// ceilingTaxHead[taxAmountField] = ceilingDelta +// taxAmount += ceilingDelta +// } +// } + +// return { +// taxHeads, +// rebate, +// totalAmount, +// taxAmount, +// newCeilingTax, +// ceilingTaxHead, +// firecessTaxHead +// } +// } + +async function _createAndUpdateZeroTaxProcessor(request, response) { + let index = 0 + for (reqProperty of request["Properties"]) { + + let resProperty = response["Properties"][index] + let propertyId = resProperty["propertyId"] + + let assessmentNumber = resProperty["propertyDetails"][0]["assessmentNumber"] + + let assessmentYear = resProperty["propertyDetails"][0]["financialYear"] + let tenantId = reqProperty["tenantId"] + + if (isCitizen(request) && assessmentYear === PT_ZERO_ASSESSMENTYEAR) { + data = + { + "ResponseInfo":null, + "Errors":[ + { + "code":"CitizenOnlineNotAllowed", + "message":"Sorry but online assessment for " + PT_ZERO_ASSESSMENTYEAR + " is not allowed. Please make the payment at the counter", + "description": "Sorry but online assessment for " + PT_ZERO_ASSESSMENTYEAR + " is not allowed. Please make the payment at the counter", + "params":null + } + ] + }; + return data; + } + + if (!(assessmentYear == PT_ZERO_ASSESSMENTYEAR && PT_ZERO_TENANTS.indexOf(tenantId) >= 0)) + continue + + request_info = request["RequestInfo"] || request["requestInfo"] + + let consumerCode = propertyId + ":" + assessmentNumber + let service = "PT" + let calc = response["Properties"][index]["propertyDetails"][0]["calculation"] + + let newTotal = 0; + + let demandSearchResponse = await findDemandForConsumerCode(consumerCode, tenantId, service, request["RequestInfo"]) + + for (demandDetail of demandSearchResponse["Demands"][0]["demandDetails"]) { + if (demandDetail.taxHeadMasterCode != "PT_ADHOC_PENALTY" && demandDetail.taxHeadMasterCode != 'PT_ADVANCE_CARRYFORWARD') { + demandDetail.taxAmount = 0 + } else if (demandDetail.taxHeadMasterCode == 'PT_ADVANCE_CARRYFORWARD') { + newTotal += demandDetail.taxAmount + } else { + newTotal += demandDetail.taxAmount + } + } + + let taxHeads = calc["taxHeadEstimates"]; + + for (taxHead of taxHeads) { + if (taxHead.taxHeadCode != "PT_ADHOC_PENALTY" && taxHead.taxHeadCode == 'PT_ADVANCE_CARRYFORWARD') { + taxHead.estimateAmount = 0 + } + } + let demandUpdateResponse = await updateDemand(demandSearchResponse["Demands"], request["RequestInfo"]) + + calc["taxAmount"] = 0; + calc["exemption"] = 0; + calc["totalAmount"] = newTotal; + calc["rebate"] = 0 + calc["penanlty"] = newTotal + index++ + } + + return response; +} + +async function _createAndUpdateIntegrationTaxProcessor(req, response){ + + console.log("REQ : ", JSON.stringify(req)) + console.log("RESPONSE : ", JSON.stringify(response)) + + let reqProperty = req["Assessment"]; + + let propertyId = reqProperty["propertyId"] + + let assessmentYear = reqProperty["financialYear"] + let tenantId = reqProperty["tenantId"] + + if (!(assessmentYear == PT_INTEGRATION_ASSESSMENTYEAR && PT_INTEGRATION_TENANTS.indexOf(tenantId) >= 0)) + return response; + + let oldRequestbody = await getOldRequestBody(req) + + oldRequestbody["CalculationCriteria"][0]["assessmentYear"] = assessmentYear; + // assessmentYear field was there in old request body but not present in new request body Without this field we will get null pointer exception. + + log("Got Assessment CREATE/ UPDATE request for tenantid: "+tenantId+" and finanancial year: "+assessmentYear) + log("Assessment CREATE/ UPDATE Request body: "+ JSON.stringify(reqProperty) ) + + let estimateResponseBody = await findEstimate(req) + console.log("After Getting Response from entimate sending it to PMIDC TO get the Estimate Response") + let estimateResponse = await _estimateIntegrationTaxProcessor(oldRequestbody, estimateResponseBody) + + + + request_info = req["RequestInfo"] || req["requestInfo"] + + let consumerCode = propertyId + let service = "PT" + let calc = estimateResponse["Calculation"][0] + let taxHeads = calc["taxHeadEstimates"]; + let createTaxHeadsArray = {}; + let TaxHeadsType= {}; //Collecting All the Tax head coming from PMIDC + + for(taxHead of taxHeads){ + createTaxHeadsArray[taxHead.taxHeadCode] = taxHead.estimateAmount; + TaxHeadsType[taxHead.taxHeadCode] = taxHead.estimateAmount; + //print(texthead) + console.log(taxHead.taxHeadCode , ": ", taxHead.estimateAmount) + } + + let demandSearchResponse = await findDemandForConsumerCode(consumerCode, tenantId, service, req["RequestInfo"]) + + if( !isValidDemand(demandSearchResponse)){ + //Throw Error + data = + { + "ResponseInfo":null, + "Errors":[ + { + "code":"MultipleActiveDemandForOneFinancialYear", + "message":"There are multiple demand for property id : "+ propertyId +" for financial year" + PT_INTEGRATION_ASSESSMENTYEAR, + "description": "There multiple demand for property id : "+ propertyId +" for financial year" + PT_INTEGRATION_ASSESSMENTYEAR, + "params":null + } + ] + }; + return data; + } + + demandSearchResponse = getIntegrateYearDemand(demandSearchResponse) + + log("Search Demand response For Integrated Year: " + JSON.stringify(demandSearchResponse)) + + if(isReceiptGenerated(demandSearchResponse)){ + //Throw Error + data = + { + "ResponseInfo":null, + "Errors":[ + { + "code":"MultiplePaymentNotAllowed", + "message":"There already exists a recipt for property id : "+ propertyId +" for financial year" + PT_INTEGRATION_ASSESSMENTYEAR, + "description": "There already exists a recipt for property id : "+ propertyId +" for financial year" + PT_INTEGRATION_ASSESSMENTYEAR, + "params":null + } + ] + }; + return data; + } + + + let newTotal = 0; + + for (demandDetail of demandSearchResponse["Demands"][0]["demandDetails"]) + { + if(demandDetail.taxAmount){ + demandDetail.taxAmount = 0 + } + delete TaxHeadsType[demandDetail.taxHeadMasterCode]//Deleting tax head codes present in both TaxHeadsType and demandDetail + console.log("Deleted taxhead from TaxHeadsType: ", demandDetail.taxHeadMasterCode); + } + + console.log("After Deleting the taxhead present in demand: ", JSON.stringify(TaxHeadsType)); + console.log("demandSearchResponse AFTER MAKING EVERYTHING ZERO : ", JSON.stringify(demandSearchResponse)) + + if(!(Object.keys(TaxHeadsType).length === 0)){ + for(taxHead in TaxHeadsType){ + taxHeadObj={}; + taxHeadObj["taxHeadMasterCode"] = taxHead; + taxHeadObj["taxAmount"] = 0; + taxHeadObj["collectionAmount"] = 0; + demandSearchResponse["Demands"][0]["demandDetails"].push(taxHeadObj); // Adding those obj to demand details for which taxhead there was no entry in it + console.log("Pushing obj", taxHeadObj); + } + } + + console.log("After Adding All the tax head demandDetail: ", demandSearchResponse["Demands"][0]["demandDetails"]) + + for (demandDetail of demandSearchResponse["Demands"][0]["demandDetails"]) + { + if(createTaxHeadsArray[demandDetail.taxHeadMasterCode]) + { + demandDetail.taxAmount = createTaxHeadsArray[demandDetail.taxHeadMasterCode]; + createTaxHeadsArray[demandDetail.taxHeadMasterCode] =0; // Incase of Multiple PT_ROUNDOFF + newTotal += demandDetail.taxAmount; + } + } + + console.log("demandSearchResponse AFTER SETTING THE VALUE: ", JSON.stringify(demandSearchResponse)) + + let demandUpdateResponse = await updateDemand(demandSearchResponse["Demands"], req["RequestInfo"]) + + console.log("demandUpdateResponse : ", JSON.stringify(demandUpdateResponse)) + + calc["taxAmount"] = 0; + calc["exemption"] = 0; + calc["totalAmount"] = newTotal; + calc["rebate"] = 0; + calc["penalty"] = 0; + + log("Demand Updated with Details : " + demandUpdateResponse ) + + return response; + +} + +// async function _createAndUpdateTaxProcessor(request, response, fireCessConfig) { + +// let index = 0 +// for (reqProperty of request["Properties"]) { + +// let resProperty = response["Properties"][index] +// let propertyId = resProperty["propertyId"] + +// let assessmentNumber = resProperty["propertyDetails"][0]["assessmentNumber"] + +// let consumerCode = propertyId + ":" + assessmentNumber +// let service = "PT" +// let tenantId = reqProperty["tenantId"] + +// let demandSearchResponse = await findDemandForConsumerCode(consumerCode, tenantId, service, request["RequestInfo"]) + +// let fireCessPercentage = getFireCessPercentage(reqProperty["propertyDetails"][0], fireCessConfig) + +// if (DEBUG_MODE) { +// demandSearchResponse["Demands"][0]["firecess"] = fireCessPercentage +// } +// let calc = response["Properties"][index]["propertyDetails"][0]["calculation"] +// let updateFirecessTax = calculateNewFireCess(calc["taxHeadEstimates"], fireCessPercentage.firecess, "estimateAmount", "taxHeadCode") + +// let taxes = getUpdateTaxSummary(calc, +// updateFirecessTax, "taxHeadCode", "estimateAmount") + +// if (taxes.newCeilingTax) { +// let firstDemand = demandSearchResponse["Demands"][0]["demandDetails"][0] +// let newDemand = { +// id: null, +// demandId: firstDemand["demandId"], +// taxHeadMasterCode: taxes.ceilingTaxHead.taxHeadCode, +// taxAmount: taxes.ceilingTaxHead.estimateAmount, +// tenantId: firstDemand["tenantId"], +// collectionAmount: 0 +// } +// demandSearchResponse["Demands"][0]["demandDetails"].push(newDemand) +// } + +// for (demandDetail of demandSearchResponse["Demands"][0]["demandDetails"]) { +// if (demandDetail.taxHeadMasterCode == "PT_FIRE_CESS") { +// demandDetail.taxAmount = taxes.firecessTaxHead.estimateAmount +// } +// if (demandDetail.taxHeadMasterCode == "PT_ROUNDOFF" && demandDetail.adjustedAmount == 0.0) { +// demandDetail.taxHeadMasterCode = taxes.ceilingTaxHead.taxHeadCode +// demandDetail.taxAmount = taxes.ceilingTaxHead.estimateAmount +// } +// } + +// let demandUpdateResponse = await updateDemand(demandSearchResponse["Demands"], request["RequestInfo"]) + +// // let updateTaxHeads = [] + +// // for (taxHead of demandSearchResponse["Demands"]) { +// // updateTaxHeads.push({ +// // taxHeadCode: taxHead.taxHeadMasterCode, +// // estimateAmount: taxHead.taxtAmount, +// // category: taxHead.category +// // }) +// // } + +// calc["totalAmount"] = taxes.totalAmount +// calc["taxAmount"] = taxes.taxAmount +// calc["rebate"] = taxes.rebate +// // calc["taxHeadEstimates"] = updateTaxHeads +// index++ +// } + +// return response +// } + +async function _createAndUpdateRequestHandler(req, res) { + let { + request, + response + } = getRequestResponse(req) + + + let assessmentYear = request["Assessment"]["financialYear"] + let tenantId = request["Assessment"]["tenantId"] + + if (assessmentYear == PT_ZERO_ASSESSMENTYEAR && PT_ZERO_TENANTS.indexOf(tenantId) >= 0){ + response = await _createAndUpdateZeroTaxProcessor(request, response) + }else if(assessmentYear == PT_INTEGRATION_ASSESSMENTYEAR && PT_INTEGRATION_TENANTS.indexOf(tenantId) >= 0){ + log("Got Request for Assessment Create and Update") + + response = await _createAndUpdateIntegrationTaxProcessor(request, response) + } + + // if (!PT_ENABLE_FC_CALC) + if ("Errors" in response) + res.status(400).json(response) + else + res.json(response); + + // firecess logic is enabled, so execute it + // let tenantId = request["Properties"][0]["tenantId"] + + // let fireCessConfig = await getFireCessConfig(tenantId) + // if (fireCessConfig && fireCessConfig.dynamicFirecess && fireCessConfig.dynamicFirecess == true) { + // let updatedResponse = await _createAndUpdateTaxProcessor(request, response, fireCessConfig) + // res.json(updatedResponse); + // } else { + // res.json(response) + // } +} + +function getRequestResponse(req) { + let request = null, + response = null + + if (typeof req.body.request === "string") { + request = JSON.parse(req.body.request) + if (req.body.response) + response = JSON.parse(req.body.response) + } else { + request = req.body.request + response = req.body.response + } + + return { + request, + response + } +} + +router.post('/protected/punjab-pt/assessment/_create', asyncMiddleware(_createAndUpdateRequestHandler)) + +router.post('/protected/punjab-pt/assessment/_update', asyncMiddleware(_createAndUpdateRequestHandler)) + +router.post('/open/punjab-pt/payu/confirm', asyncMiddleware((async function (req, res) { + let return_data = req.body; + original_callback = req.query.original_callback; + delete req.query['original_callback']; + let txnid = req.query.eg_pg_txnid + delete req.query['eg_pg_txnid']; + + new_query_params = Object.assign({}, return_data, req.query); + redirect_url = url.format( + { + pathname: original_callback, + query: new_query_params + } + ) + //ensuring the first query param is eg_pg_txnid + redirect_url = redirect_url.replace('?', '?'+ 'eg_pg_txnid=' + txnid +'&') + res.redirect(redirect_url); +}))) + +router.post('/protected/punjab-pt/pre-hook/pg-service/transaction/v1/_create', asyncMiddleware((async function (req, res) { + let { + request + } = getRequestResponse(req) + + if (request['Transaction']['tenantId'] == 'pb.jalandhar' || request['Transaction']['tenantId'] == 'pb.testing') { + let original_callback = request['Transaction']['callbackUrl']; + request['Transaction']['gateway'] = 'PAYU' + url_callback = url.parse(original_callback) + + url_callback.query = url_callback.query || {}; + + url_callback.query['original_callback'] = url_callback.path; + + url_callback.path = '/customization/open/punjab-pt/payu/confirm'; + url_callback.pathname = '/customization/open/punjab-pt/payu/confirm'; + + request['Transaction']['callbackUrl'] = url.format(url_callback); + } + + res.json(request); +}))); + +router.post('/protected/punjab-pt/pt-calculator-v2/_estimate', asyncMiddleware(async function (req, res) { + + let { + request, + response + } = getRequestResponse(req) + + + // let oldRequestbody = getOldRequestBody(request) + + // oldRequestbody["CalculationCriteria"][0]["assessmentYear"] = oldRequestbody["CalculationCriteria"][0]["property"]["propertyDetails"][0]["financialYear"] + // // assessmentYear field was there in old request body but not present in new request body so we are adding this field. + + // request = oldRequestbody; + + let tenantId = request["Assessment"]["tenantId"] + let assessmentYear = request["Assessment"]["financialYear"] + + + let oldRequestbody = await getOldRequestBody(request); + oldRequestbody["CalculationCriteria"][0]["assessmentYear"] = assessmentYear; + // assessmentYear field was there in old request body but not present in new request body Without this field we will get null pointer exception. + + + if (assessmentYear == PT_ZERO_ASSESSMENTYEAR && PT_ZERO_TENANTS.indexOf(tenantId) >= 0){ + response = _estimateZeroTaxProcessor(request, response) + } + else if (assessmentYear == PT_INTEGRATION_ASSESSMENTYEAR){ + + if(PT_INTEGRATION_TENANTS.indexOf(tenantId) >= 0){ + log(":: Estimate request Received ::"); + + log("Got request for tenantid: "+tenantId+" and finanancial year: "+assessmentYear) + log("Request body: "+ JSON.stringify(request)); + + response = await _estimateIntegrationTaxProcessor(oldRequestbody, response) + } else if(isCitizen(request)){ + data = + { + "ResponseInfo":null, + "Errors":[ + { + "code":"CitizenOnlineNotAllowed", + "message":"Sorry but online assessment for " + PT_INTEGRATION_ASSESSMENTYEAR + " is not allowed. Please make the payment at the counter", + "description": "Sorry but online assessment for " + PT_INTEGRATION_ASSESSMENTYEAR + " is not allowed. Please make the payment at the counter", + "params":null + } + ] + } + response = data; + } + + } + + + // if (!PT_ENABLE_FC_CALC) + if ("Errors" in response) + res.status(400).json(response) + else + res.json(response); + + // let tenantId = request["CalculationCriteria"][0]["tenantId"] + + // let fireCessConfig = await getFireCessConfig(tenantId) + + // if (fireCessConfig && fireCessConfig.dynamicFirecess && fireCessConfig.dynamicFirecess == true) { + // let updatedResponse = _estimateTaxProcessor(request, response, fireCessConfig) + // res.json(updatedResponse); + // } else { + // res.json(response); + // } +})) + +app.listen(8000, () => { + console.log("Listening on port 8000") +}); + +// TODO: +// Add total amount to calculations "totalAmount": 460, +// "taxAmount": 510, diff --git a/rainmaker-custom-service/package.json b/rainmaker-custom-service/package.json new file mode 100644 index 00000000..adfe942c --- /dev/null +++ b/rainmaker-custom-service/package.json @@ -0,0 +1,23 @@ +{ + "name": "nodeservice", + "version": "1.0.0", + "main": "index.js", + "license": "MIT", + "dependencies": { + "bluebird": "^3.5.1", + "cryptr": "^4.0.0", + "excel4node": "^1.5.0", + "express": "^4.16.3", + "express-slash": "^2.0.1", + "jsonwebtoken": "^8.4.0", + "mustache-express": "^1.2.7", + "nodemon": "^1.18.4", + "pg-promise": "^8.4.5", + "request": "^2.88.0", + "request-promise": "^4.2.2", + "morgan": "*" + }, + "scripts": { + "debug": "nodemon --inspect index.js" + } +} diff --git a/rainmaker-custom-service/static/css/bnd.css b/rainmaker-custom-service/static/css/bnd.css new file mode 100644 index 00000000..d19b007b --- /dev/null +++ b/rainmaker-custom-service/static/css/bnd.css @@ -0,0 +1,137 @@ +body { + height: 100%; + padding: 0px; + margin: 0px; + background: #333; + font-family: 'Roboto', sans-serif !important; + font-size: 1em; + } + h1 { + font-family: 'Roboto', sans-serif; + font-size: 30px; + color: #999; + font-weight: 300; + margin-bottom: 55px; + margin-top: 45px; + text-transform: uppercase; + } + h1 small { + display: block; + font-size: 18px; + text-transform: none; + letter-spacing: 1.5px; + margin-top: 12px; + } + .row { + max-width: 950px; + margin: 0 auto; + } + .btn { + white-space: normal; + } + .button-wrap { + position: relative; + text-align: center; + } + .button-wrap .btn { + font-family: 'Roboto', sans-serif; + box-shadow: 0 0 15px 5px rgba(0, 0, 0, 0.5); + border-radius: 0px; + border-color: #222; + cursor: pointer; + text-transform: uppercase; + font-size: 1.1em; + font-weight: 400; + letter-spacing: 1px; + } + .button-wrap .btn small { + font-size: 0.8rem; + letter-spacing: normal; + text-transform: none; + } + /** SPINNER CREATION **/ + .loader { + position: relative; + text-align: center; + margin: 15px auto 35px auto; + z-index: 9999; + display: block; + width: 80px; + height: 80px; + border: 10px solid rgba(0, 0, 0, 0.3); + border-radius: 50%; + border-top-color: #000; + animation: spin 1s ease-in-out infinite; + -webkit-animation: spin 1s ease-in-out infinite; + } + @keyframes spin { + to { + -webkit-transform: rotate(360deg); + } + } + @-webkit-keyframes spin { + to { + -webkit-transform: rotate(360deg); + } + } + /** MODAL STYLING **/ + .modal-content { + border-radius: 0px; + box-shadow: 0 0 20px 8px rgba(0, 0, 0, 0.7); + } + .modal-backdrop.show { + opacity: 0.75; + } + .loader-txt p { + font-size: 13px; + color: #666; + } + .loader-txt p small { + font-size: 11.5px; + color: #999; + } + + html, +body { + height: 100%; +} + +body { + display: -ms-flexbox; + display: flex; + -ms-flex-align: center; + align-items: center; + padding-top: 40px; + padding-bottom: 40px; + background-color: #f5f5f5; +} + +.form-signin { + width: 100%; + max-width: 530px; + padding: 15px; + margin: auto; +} +.form-signin .checkbox { + font-weight: 400; +} +.form-signin .form-control { + position: relative; + box-sizing: border-box; + height: auto; + padding: 10px; + font-size: 16px; +} +.form-signin .form-control:focus { + z-index: 2; +} +.form-signin input[type="email"] { + margin-bottom: -1px; + border-bottom-right-radius: 0; + border-bottom-left-radius: 0; +} +.form-signin input[type="password"] { + margin-bottom: 10px; + border-top-left-radius: 0; + border-top-right-radius: 0; +} \ No newline at end of file diff --git a/rainmaker-custom-service/static/js/bnd.js b/rainmaker-custom-service/static/js/bnd.js new file mode 100644 index 00000000..4cbfa5d6 --- /dev/null +++ b/rainmaker-custom-service/static/js/bnd.js @@ -0,0 +1,128 @@ +$(document).ready(() => { + $("#linkAccount").on('click', linkAccount) + if (getAuthToken() !== null) { + let params = (new URL(document.location)).searchParams; + if (params.get("unlink") !== null) + { + unlinkAccount(); + } else { + setTimeout(loginToBND, 10); + } + } else { + $("#msg").html("You need to be logged in to access this page") + $("#form").hide() + } +}); + +function unlinkAccount() { + axios({ + url: location.pathname.replace("/open/", "/protected/") + "/unlinkAccount", + method: 'POST', + json: true, // important + headers: { + 'Accept': 'application/json' + }, + data: { + RequestInfo: { + "authToken": getAuthToken(), + } + } + }).then((response) => { + window.location.assign(window.location.href.replace("unlink", "")) + }); +} + +function linkAccount() { + username = $("#username").val(); + password = $("#password").val() + + axios({ + url: location.pathname.replace("/open/", "/protected/") + "/linkAccount", + method: 'POST', + json: true, // important + headers: { + 'Accept': 'application/json' + }, + data: { + username: username, + password: password, + RequestInfo: { + "authToken": getAuthToken(), + } + } + }).then((response) => { + let res = response.data; + if (res && res.code && res.code == "SUCCESS" && res.redirect) { + var urlInfo = decodeURI(window.location.href).split('?'); + var path = urlInfo[0]; + $("#msg").html("The application has been opened in new window. If you want to unlink your account click here") + window.open(res.redirect,"bnd", "", true) + } else { + $("#msg").text(res.message).css("color", "red"); + } + }); +} + +function getAuthToken() { + var access_token = localStorage.getItem("token"); + return access_token; +} + +function loginToBND() { + showLoader() + try { + axios({ + url: location.href.replace("/open/", "/protected/"), + method: 'POST', + json: true, // important + headers: { + 'Accept': 'application/json' + }, + data: { + RequestInfo: { + "authToken": getAuthToken() + } + } + }).then((response) => { + hideLoader() + switch (response.data.code) { + case "NO_CREDENTIAL_MAPPING": + $('#msg').text("Please enter your eSewa Health application Username & Password to link your account") + $('#inputEmail').val(response.data.username || "") + $("#form").show() + break + case "INVALID_CREDENTIALS": + $('#msg').text(response.data.message) + $('#inputEmail').val(response.data.username || "") + $("#form").show() + break + case "SUCCESS": + $("#msg").html("The application has been opened in new window. If you want to unlink your account click here") + window.open(response.data.redirect,"bnd", "", true) + break; + default: + $('#msg').text(response.data.message || "Some error occcured while processing your request") + break + } + }).catch((err) => { + hideLoader(); + }); + } catch (ex) { + hideLoader() + } +} + +function showLoader() { + $("#loadMe").modal({ + backdrop: "static", //remove ability to close modal with click + keyboard: false, //remove option to close with keyboard + show: true //Display loader! + }); +} + +function hideLoader() { + $("#loadMe").modal("hide") + $('#loadMe').on('shown.bs.modal', function (e) { + $("#loadMe").modal('hide'); + }) +} \ No newline at end of file diff --git a/rainmaker-custom-service/templates/apicall.html b/rainmaker-custom-service/templates/apicall.html new file mode 100644 index 00000000..f6382bba --- /dev/null +++ b/rainmaker-custom-service/templates/apicall.html @@ -0,0 +1,45 @@ +{{>common/header}} +
No report available for your user type
+ +{{>common/body}} \ No newline at end of file diff --git a/rainmaker-custom-service/templates/bndlogin.html b/rainmaker-custom-service/templates/bndlogin.html new file mode 100644 index 00000000..e7290ac1 --- /dev/null +++ b/rainmaker-custom-service/templates/bndlogin.html @@ -0,0 +1,32 @@ +{{>common/header}} + + + +{{>common/scripts}} + + +{{>common/footer}} \ No newline at end of file diff --git a/rainmaker-custom-service/templates/common/footer.html b/rainmaker-custom-service/templates/common/footer.html new file mode 100644 index 00000000..1fd5f4f2 --- /dev/null +++ b/rainmaker-custom-service/templates/common/footer.html @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/rainmaker-custom-service/templates/common/header.html b/rainmaker-custom-service/templates/common/header.html new file mode 100644 index 00000000..63d94260 --- /dev/null +++ b/rainmaker-custom-service/templates/common/header.html @@ -0,0 +1,13 @@ + + + + + + + + + + + eGov Extension + + \ No newline at end of file diff --git a/rainmaker-custom-service/templates/common/scripts.html b/rainmaker-custom-service/templates/common/scripts.html new file mode 100644 index 00000000..9f6c78bb --- /dev/null +++ b/rainmaker-custom-service/templates/common/scripts.html @@ -0,0 +1,4 @@ + + + + diff --git a/rainmaker-custom-service/utils/asyncMiddleware.js b/rainmaker-custom-service/utils/asyncMiddleware.js new file mode 100644 index 00000000..e261ae12 --- /dev/null +++ b/rainmaker-custom-service/utils/asyncMiddleware.js @@ -0,0 +1,9 @@ +const asyncMiddleware = fn => + (req, res, next) => { + Promise.resolve(fn(req, res, next)) + .catch(next); + }; + +module.exports = { + asyncMiddleware +} \ No newline at end of file diff --git a/rainmaker-custom-service/yarn.lock b/rainmaker-custom-service/yarn.lock new file mode 100644 index 00000000..04493197 --- /dev/null +++ b/rainmaker-custom-service/yarn.lock @@ -0,0 +1,2297 @@ +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + + +abbrev@1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" + +accepts@~1.3.5: + version "1.3.5" + resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.5.tgz#eb777df6011723a3b14e8a72c0805c8e86746bd2" + dependencies: + mime-types "~2.1.18" + negotiator "0.6.1" + +ajv@^6.5.5: + version "6.6.2" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.6.2.tgz#caceccf474bf3fc3ce3b147443711a24063cc30d" + dependencies: + fast-deep-equal "^2.0.1" + fast-json-stable-stringify "^2.0.0" + json-schema-traverse "^0.4.1" + uri-js "^4.2.2" + +ansi-align@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-2.0.0.tgz#c36aeccba563b89ceb556f3690f0b1d9e3547f7f" + dependencies: + string-width "^2.0.0" + +ansi-regex@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" + +ansi-regex@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" + +ansi-styles@^3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" + dependencies: + color-convert "^1.9.0" + +anymatch@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb" + dependencies: + micromatch "^3.1.4" + normalize-path "^2.1.1" + +aproba@^1.0.3: + version "1.2.0" + resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" + +are-we-there-yet@~1.1.2: + version "1.1.5" + resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21" + dependencies: + delegates "^1.0.0" + readable-stream "^2.0.6" + +arr-diff@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520" + +arr-flatten@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1" + +arr-union@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4" + +array-flatten@1.1.1: + version "1.1.1" + resolved "http://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" + +array-unique@^0.3.2: + version "0.3.2" + resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" + +asn1@~0.2.3: + version "0.2.4" + resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136" + dependencies: + safer-buffer "~2.1.0" + +assert-plus@1.0.0, assert-plus@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" + +assign-symbols@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367" + +async-each@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d" + +async@~2.6.0: + version "2.6.1" + resolved "https://registry.yarnpkg.com/async/-/async-2.6.1.tgz#b245a23ca71930044ec53fa46aa00a3e87c6a610" + dependencies: + lodash "^4.17.10" + +asynckit@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" + +atob@^2.1.1: + version "2.1.2" + resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" + +aws-sign2@~0.7.0: + version "0.7.0" + resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8" + +aws4@^1.8.0: + version "1.8.0" + resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f" + +balanced-match@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" + +base@^0.11.1: + version "0.11.2" + resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f" + dependencies: + cache-base "^1.0.1" + class-utils "^0.3.5" + component-emitter "^1.2.1" + define-property "^1.0.0" + isobject "^3.0.1" + mixin-deep "^1.2.0" + pascalcase "^0.1.1" + +bcrypt-pbkdf@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e" + dependencies: + tweetnacl "^0.14.3" + +binary-extensions@^1.0.0: + version "1.12.0" + resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.12.0.tgz#c2d780f53d45bba8317a8902d4ceeaf3a6385b14" + +bluebird@^3.5.0, bluebird@^3.5.1: + version "3.5.3" + resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.3.tgz#7d01c6f9616c9a51ab0f8c549a79dfe6ec33efa7" + +body-parser@1.18.3: + version "1.18.3" + resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.18.3.tgz#5b292198ffdd553b3a0f20ded0592b956955c8b4" + dependencies: + bytes "3.0.0" + content-type "~1.0.4" + debug "2.6.9" + depd "~1.1.2" + http-errors "~1.6.3" + iconv-lite "0.4.23" + on-finished "~2.3.0" + qs "6.5.2" + raw-body "2.3.3" + type-is "~1.6.16" + +boxen@^1.2.1: + version "1.3.0" + resolved "https://registry.yarnpkg.com/boxen/-/boxen-1.3.0.tgz#55c6c39a8ba58d9c61ad22cd877532deb665a20b" + dependencies: + ansi-align "^2.0.0" + camelcase "^4.0.0" + chalk "^2.0.1" + cli-boxes "^1.0.0" + string-width "^2.0.0" + term-size "^1.2.0" + widest-line "^2.0.0" + +brace-expansion@^1.1.7: + version "1.1.11" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" + dependencies: + balanced-match "^1.0.0" + concat-map "0.0.1" + +braces@^2.3.0, braces@^2.3.1: + version "2.3.2" + resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729" + dependencies: + arr-flatten "^1.1.0" + array-unique "^0.3.2" + extend-shallow "^2.0.1" + fill-range "^4.0.0" + isobject "^3.0.1" + repeat-element "^1.1.2" + snapdragon "^0.8.1" + snapdragon-node "^2.0.1" + split-string "^3.0.2" + to-regex "^3.0.1" + +buffer-equal-constant-time@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz#f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819" + +buffer-writer@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/buffer-writer/-/buffer-writer-2.0.0.tgz#ce7eb81a38f7829db09c873f2fbb792c0c98ec04" + +bytes@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048" + +cache-base@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2" + dependencies: + collection-visit "^1.0.0" + component-emitter "^1.2.1" + get-value "^2.0.6" + has-value "^1.0.0" + isobject "^3.0.1" + set-value "^2.0.0" + to-object-path "^0.3.0" + union-value "^1.0.0" + unset-value "^1.0.0" + +camelcase@^4.0.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd" + +capture-stack-trace@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz#a6c0bbe1f38f3aa0b92238ecb6ff42c344d4135d" + +caseless@~0.12.0: + version "0.12.0" + resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" + +chalk@^2.0.1: + version "2.4.1" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e" + dependencies: + ansi-styles "^3.2.1" + escape-string-regexp "^1.0.5" + supports-color "^5.3.0" + +chokidar@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.4.tgz#356ff4e2b0e8e43e322d18a372460bbcf3accd26" + dependencies: + anymatch "^2.0.0" + async-each "^1.0.0" + braces "^2.3.0" + glob-parent "^3.1.0" + inherits "^2.0.1" + is-binary-path "^1.0.0" + is-glob "^4.0.0" + lodash.debounce "^4.0.8" + normalize-path "^2.1.1" + path-is-absolute "^1.0.0" + readdirp "^2.0.0" + upath "^1.0.5" + optionalDependencies: + fsevents "^1.2.2" + +chownr@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.1.tgz#54726b8b8fff4df053c42187e801fb4412df1494" + +ci-info@^1.5.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.6.0.tgz#2ca20dbb9ceb32d4524a683303313f0304b1e497" + +class-utils@^0.3.5: + version "0.3.6" + resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463" + dependencies: + arr-union "^3.1.0" + define-property "^0.2.5" + isobject "^3.0.0" + static-extend "^0.1.1" + +cli-boxes@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-1.0.0.tgz#4fa917c3e59c94a004cd61f8ee509da651687143" + +code-point-at@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" + +collection-visit@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0" + dependencies: + map-visit "^1.0.0" + object-visit "^1.0.0" + +color-convert@^1.9.0: + version "1.9.3" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" + dependencies: + color-name "1.1.3" + +color-name@1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" + +combined-stream@^1.0.6, combined-stream@~1.0.6: + version "1.0.7" + resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.7.tgz#2d1d24317afb8abe95d6d2c0b07b57813539d828" + dependencies: + delayed-stream "~1.0.0" + +component-emitter@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6" + +concat-map@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" + +configstore@^3.0.0: + version "3.1.2" + resolved "https://registry.yarnpkg.com/configstore/-/configstore-3.1.2.tgz#c6f25defaeef26df12dd33414b001fe81a543f8f" + dependencies: + dot-prop "^4.1.0" + graceful-fs "^4.1.2" + make-dir "^1.0.0" + unique-string "^1.0.0" + write-file-atomic "^2.0.0" + xdg-basedir "^3.0.0" + +console-control-strings@^1.0.0, console-control-strings@~1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" + +content-disposition@0.5.2: + version "0.5.2" + resolved "http://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz#0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4" + +content-type@~1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b" + +cookie-signature@1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" + +cookie@0.3.1: + version "0.3.1" + resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb" + +copy-descriptor@^0.1.0: + version "0.1.1" + resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" + +core-js@~2.3.0: + version "2.3.0" + resolved "http://registry.npmjs.org/core-js/-/core-js-2.3.0.tgz#fab83fbb0b2d8dc85fa636c4b9d34c75420c6d65" + +core-util-is@1.0.2, core-util-is@~1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" + +create-error-class@^3.0.0: + version "3.0.2" + resolved "https://registry.yarnpkg.com/create-error-class/-/create-error-class-3.0.2.tgz#06be7abef947a3f14a30fd610671d401bca8b7b6" + dependencies: + capture-stack-trace "^1.0.0" + +cross-spawn@^5.0.1: + version "5.1.0" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449" + dependencies: + lru-cache "^4.0.1" + shebang-command "^1.2.0" + which "^1.2.9" + +crypto-random-string@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-1.0.0.tgz#a230f64f568310e1498009940790ec99545bca7e" + +cryptr@^4.0.0: + version "4.0.2" + resolved "https://registry.yarnpkg.com/cryptr/-/cryptr-4.0.2.tgz#8a93b5ca7667d1a6131e396bab23a134ff1f5dc6" + +dashdash@^1.12.0: + version "1.14.1" + resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0" + dependencies: + assert-plus "^1.0.0" + +debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3: + version "2.6.9" + resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" + dependencies: + ms "2.0.0" + +debug@^3.1.0: + version "3.2.6" + resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b" + dependencies: + ms "^2.1.1" + +decode-uri-component@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545" + +deep-extend@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" + +deepmerge@2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-2.1.1.tgz#e862b4e45ea0555072bf51e7fd0d9845170ae768" + +define-property@^0.2.5: + version "0.2.5" + resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116" + dependencies: + is-descriptor "^0.1.0" + +define-property@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6" + dependencies: + is-descriptor "^1.0.0" + +define-property@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d" + dependencies: + is-descriptor "^1.0.2" + isobject "^3.0.1" + +delayed-stream@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" + +delegates@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" + +depd@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" + +destroy@~1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80" + +detect-libc@^1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" + +dot-prop@^4.1.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.0.tgz#1f19e0c2e1aa0e32797c49799f2837ac6af69c57" + dependencies: + is-obj "^1.0.0" + +duplexer3@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2" + +ecc-jsbn@~0.1.1: + version "0.1.2" + resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9" + dependencies: + jsbn "~0.1.0" + safer-buffer "^2.1.0" + +ecdsa-sig-formatter@1.0.10: + version "1.0.10" + resolved "https://registry.yarnpkg.com/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.10.tgz#1c595000f04a8897dfb85000892a0f4c33af86c3" + dependencies: + safe-buffer "^5.0.1" + +ee-first@1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" + +encodeurl@~1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" + +es6-promise@~3.0.2: + version "3.0.2" + resolved "http://registry.npmjs.org/es6-promise/-/es6-promise-3.0.2.tgz#010d5858423a5f118979665f46486a95c6ee2bb6" + +escape-html@~1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" + +escape-string-regexp@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" + +etag@~1.8.1: + version "1.8.1" + resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" + +excel4node@^1.5.0: + version "1.7.0" + resolved "https://registry.yarnpkg.com/excel4node/-/excel4node-1.7.0.tgz#e7f8a797284832d86dda8713745323cd2302d9d2" + dependencies: + deepmerge "2.1.1" + image-size "0.6.3" + jszip "3.1.5" + lodash.get "4.4.2" + lodash.isequal "4.5.0" + lodash.isundefined "3.0.1" + lodash.reduce "4.6.0" + lodash.uniqueid "4.0.1" + mime "2.3.1" + uuid "3.3.2" + xmlbuilder "10.0.0" + +execa@^0.7.0: + version "0.7.0" + resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777" + dependencies: + cross-spawn "^5.0.1" + get-stream "^3.0.0" + is-stream "^1.1.0" + npm-run-path "^2.0.0" + p-finally "^1.0.0" + signal-exit "^3.0.0" + strip-eof "^1.0.0" + +expand-brackets@^2.1.4: + version "2.1.4" + resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622" + dependencies: + debug "^2.3.3" + define-property "^0.2.5" + extend-shallow "^2.0.1" + posix-character-classes "^0.1.0" + regex-not "^1.0.0" + snapdragon "^0.8.1" + to-regex "^3.0.1" + +express-slash@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/express-slash/-/express-slash-2.0.1.tgz#76eb869fed8f71ae4f98785cbe00bf1bb454d627" + +express@^4.16.3: + version "4.16.4" + resolved "https://registry.yarnpkg.com/express/-/express-4.16.4.tgz#fddef61926109e24c515ea97fd2f1bdbf62df12e" + dependencies: + accepts "~1.3.5" + array-flatten "1.1.1" + body-parser "1.18.3" + content-disposition "0.5.2" + content-type "~1.0.4" + cookie "0.3.1" + cookie-signature "1.0.6" + debug "2.6.9" + depd "~1.1.2" + encodeurl "~1.0.2" + escape-html "~1.0.3" + etag "~1.8.1" + finalhandler "1.1.1" + fresh "0.5.2" + merge-descriptors "1.0.1" + methods "~1.1.2" + on-finished "~2.3.0" + parseurl "~1.3.2" + path-to-regexp "0.1.7" + proxy-addr "~2.0.4" + qs "6.5.2" + range-parser "~1.2.0" + safe-buffer "5.1.2" + send "0.16.2" + serve-static "1.13.2" + setprototypeof "1.1.0" + statuses "~1.4.0" + type-is "~1.6.16" + utils-merge "1.0.1" + vary "~1.1.2" + +extend-shallow@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f" + dependencies: + is-extendable "^0.1.0" + +extend-shallow@^3.0.0, extend-shallow@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8" + dependencies: + assign-symbols "^1.0.0" + is-extendable "^1.0.1" + +extend@~3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" + +extglob@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543" + dependencies: + array-unique "^0.3.2" + define-property "^1.0.0" + expand-brackets "^2.1.4" + extend-shallow "^2.0.1" + fragment-cache "^0.2.1" + regex-not "^1.0.0" + snapdragon "^0.8.1" + to-regex "^3.0.1" + +extsprintf@1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05" + +extsprintf@^1.2.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f" + +fast-deep-equal@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49" + +fast-json-stable-stringify@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2" + +fill-range@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7" + dependencies: + extend-shallow "^2.0.1" + is-number "^3.0.0" + repeat-string "^1.6.1" + to-regex-range "^2.1.0" + +finalhandler@1.1.1: + version "1.1.1" + resolved "http://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz#eebf4ed840079c83f4249038c9d703008301b105" + dependencies: + debug "2.6.9" + encodeurl "~1.0.2" + escape-html "~1.0.3" + on-finished "~2.3.0" + parseurl "~1.3.2" + statuses "~1.4.0" + unpipe "~1.0.0" + +for-in@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" + +forever-agent@~0.6.1: + version "0.6.1" + resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" + +form-data@~2.3.2: + version "2.3.3" + resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6" + dependencies: + asynckit "^0.4.0" + combined-stream "^1.0.6" + mime-types "^2.1.12" + +forwarded@~0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84" + +fragment-cache@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19" + dependencies: + map-cache "^0.2.2" + +fresh@0.5.2: + version "0.5.2" + resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" + +fs-minipass@^1.2.5: + version "1.2.5" + resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.5.tgz#06c277218454ec288df77ada54a03b8702aacb9d" + dependencies: + minipass "^2.2.1" + +fs.realpath@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" + +fsevents@^1.2.2: + version "1.2.4" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.4.tgz#f41dcb1af2582af3692da36fc55cbd8e1041c426" + dependencies: + nan "^2.9.2" + node-pre-gyp "^0.10.0" + +gauge@~2.7.3: + version "2.7.4" + resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7" + dependencies: + aproba "^1.0.3" + console-control-strings "^1.0.0" + has-unicode "^2.0.0" + object-assign "^4.1.0" + signal-exit "^3.0.0" + string-width "^1.0.1" + strip-ansi "^3.0.1" + wide-align "^1.1.0" + +get-stream@^3.0.0: + version "3.0.0" + resolved "http://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14" + +get-value@^2.0.3, get-value@^2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28" + +getpass@^0.1.1: + version "0.1.7" + resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa" + dependencies: + assert-plus "^1.0.0" + +glob-parent@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae" + dependencies: + is-glob "^3.1.0" + path-dirname "^1.0.0" + +glob@^7.0.5: + version "7.1.3" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1" + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.0.4" + once "^1.3.0" + path-is-absolute "^1.0.0" + +global-dirs@^0.1.0: + version "0.1.1" + resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-0.1.1.tgz#b319c0dd4607f353f3be9cca4c72fc148c49f445" + dependencies: + ini "^1.3.4" + +got@^6.7.1: + version "6.7.1" + resolved "http://registry.npmjs.org/got/-/got-6.7.1.tgz#240cd05785a9a18e561dc1b44b41c763ef1e8db0" + dependencies: + create-error-class "^3.0.0" + duplexer3 "^0.1.4" + get-stream "^3.0.0" + is-redirect "^1.0.0" + is-retry-allowed "^1.0.0" + is-stream "^1.0.0" + lowercase-keys "^1.0.0" + safe-buffer "^5.0.1" + timed-out "^4.0.0" + unzip-response "^2.0.1" + url-parse-lax "^1.0.0" + +graceful-fs@^4.1.11, graceful-fs@^4.1.2: + version "4.1.15" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00" + +har-schema@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92" + +har-validator@~5.1.0: + version "5.1.3" + resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz#1ef89ebd3e4996557675eed9893110dc350fa080" + dependencies: + ajv "^6.5.5" + har-schema "^2.0.0" + +has-flag@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" + +has-unicode@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" + +has-value@^0.3.1: + version "0.3.1" + resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f" + dependencies: + get-value "^2.0.3" + has-values "^0.1.4" + isobject "^2.0.0" + +has-value@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177" + dependencies: + get-value "^2.0.6" + has-values "^1.0.0" + isobject "^3.0.0" + +has-values@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771" + +has-values@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f" + dependencies: + is-number "^3.0.0" + kind-of "^4.0.0" + +http-errors@1.6.3, http-errors@~1.6.2, http-errors@~1.6.3: + version "1.6.3" + resolved "http://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d" + dependencies: + depd "~1.1.2" + inherits "2.0.3" + setprototypeof "1.1.0" + statuses ">= 1.4.0 < 2" + +http-signature@~1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1" + dependencies: + assert-plus "^1.0.0" + jsprim "^1.2.2" + sshpk "^1.7.0" + +iconv-lite@0.4.23: + version "0.4.23" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63" + dependencies: + safer-buffer ">= 2.1.2 < 3" + +iconv-lite@^0.4.4: + version "0.4.24" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" + dependencies: + safer-buffer ">= 2.1.2 < 3" + +ignore-by-default@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/ignore-by-default/-/ignore-by-default-1.0.1.tgz#48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09" + +ignore-walk@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.1.tgz#a83e62e7d272ac0e3b551aaa82831a19b69f82f8" + dependencies: + minimatch "^3.0.4" + +image-size@0.6.3: + version "0.6.3" + resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.6.3.tgz#e7e5c65bb534bd7cdcedd6cb5166272a85f75fb2" + +immediate@~3.0.5: + version "3.0.6" + resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b" + +import-lazy@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43" + +imurmurhash@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" + +inflight@^1.0.4: + version "1.0.6" + resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" + dependencies: + once "^1.3.0" + wrappy "1" + +inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@~2.0.1, inherits@~2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" + +ini@^1.3.4, ini@~1.3.0: + version "1.3.5" + resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" + +ipaddr.js@1.8.0: + version "1.8.0" + resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.8.0.tgz#eaa33d6ddd7ace8f7f6fe0c9ca0440e706738b1e" + +is-accessor-descriptor@^0.1.6: + version "0.1.6" + resolved "http://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6" + dependencies: + kind-of "^3.0.2" + +is-accessor-descriptor@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656" + dependencies: + kind-of "^6.0.0" + +is-binary-path@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898" + dependencies: + binary-extensions "^1.0.0" + +is-buffer@^1.1.5: + version "1.1.6" + resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" + +is-ci@^1.0.10: + version "1.2.1" + resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.2.1.tgz#e3779c8ee17fccf428488f6e281187f2e632841c" + dependencies: + ci-info "^1.5.0" + +is-data-descriptor@^0.1.4: + version "0.1.4" + resolved "http://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56" + dependencies: + kind-of "^3.0.2" + +is-data-descriptor@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7" + dependencies: + kind-of "^6.0.0" + +is-descriptor@^0.1.0: + version "0.1.6" + resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca" + dependencies: + is-accessor-descriptor "^0.1.6" + is-data-descriptor "^0.1.4" + kind-of "^5.0.0" + +is-descriptor@^1.0.0, is-descriptor@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec" + dependencies: + is-accessor-descriptor "^1.0.0" + is-data-descriptor "^1.0.0" + kind-of "^6.0.2" + +is-extendable@^0.1.0, is-extendable@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" + +is-extendable@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4" + dependencies: + is-plain-object "^2.0.4" + +is-extglob@^2.1.0, is-extglob@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" + +is-fullwidth-code-point@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb" + dependencies: + number-is-nan "^1.0.0" + +is-fullwidth-code-point@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" + +is-glob@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a" + dependencies: + is-extglob "^2.1.0" + +is-glob@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.0.tgz#9521c76845cc2610a85203ddf080a958c2ffabc0" + dependencies: + is-extglob "^2.1.1" + +is-installed-globally@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.1.0.tgz#0dfd98f5a9111716dd535dda6492f67bf3d25a80" + dependencies: + global-dirs "^0.1.0" + is-path-inside "^1.0.0" + +is-npm@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-1.0.0.tgz#f2fb63a65e4905b406c86072765a1a4dc793b9f4" + +is-number@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195" + dependencies: + kind-of "^3.0.2" + +is-obj@^1.0.0: + version "1.0.1" + resolved "http://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f" + +is-path-inside@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz#8ef5b7de50437a3fdca6b4e865ef7aa55cb48036" + dependencies: + path-is-inside "^1.0.1" + +is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" + dependencies: + isobject "^3.0.1" + +is-redirect@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-redirect/-/is-redirect-1.0.0.tgz#1d03dded53bd8db0f30c26e4f95d36fc7c87dc24" + +is-retry-allowed@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz#11a060568b67339444033d0125a61a20d564fb34" + +is-stream@^1.0.0, is-stream@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" + +is-typedarray@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" + +is-windows@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" + +isarray@1.0.0, isarray@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" + +isexe@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" + +isobject@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89" + dependencies: + isarray "1.0.0" + +isobject@^3.0.0, isobject@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" + +isstream@~0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" + +jsbn@~0.1.0: + version "0.1.1" + resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" + +json-schema-traverse@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" + +json-schema@0.2.3: + version "0.2.3" + resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13" + +json-stringify-safe@~5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" + +jsonwebtoken@^8.4.0: + version "8.4.0" + resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-8.4.0.tgz#8757f7b4cb7440d86d5e2f3becefa70536c8e46a" + dependencies: + jws "^3.1.5" + lodash.includes "^4.3.0" + lodash.isboolean "^3.0.3" + lodash.isinteger "^4.0.4" + lodash.isnumber "^3.0.3" + lodash.isplainobject "^4.0.6" + lodash.isstring "^4.0.1" + lodash.once "^4.0.0" + ms "^2.1.1" + +jsprim@^1.2.2: + version "1.4.1" + resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2" + dependencies: + assert-plus "1.0.0" + extsprintf "1.3.0" + json-schema "0.2.3" + verror "1.10.0" + +jszip@3.1.5: + version "3.1.5" + resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.1.5.tgz#e3c2a6c6d706ac6e603314036d43cd40beefdf37" + dependencies: + core-js "~2.3.0" + es6-promise "~3.0.2" + lie "~3.1.0" + pako "~1.0.2" + readable-stream "~2.0.6" + +jwa@^1.1.5: + version "1.1.6" + resolved "https://registry.yarnpkg.com/jwa/-/jwa-1.1.6.tgz#87240e76c9808dbde18783cf2264ef4929ee50e6" + dependencies: + buffer-equal-constant-time "1.0.1" + ecdsa-sig-formatter "1.0.10" + safe-buffer "^5.0.1" + +jws@^3.1.5: + version "3.1.5" + resolved "https://registry.yarnpkg.com/jws/-/jws-3.1.5.tgz#80d12d05b293d1e841e7cb8b4e69e561adcf834f" + dependencies: + jwa "^1.1.5" + safe-buffer "^5.0.1" + +kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0: + version "3.2.2" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" + dependencies: + is-buffer "^1.1.5" + +kind-of@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57" + dependencies: + is-buffer "^1.1.5" + +kind-of@^5.0.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d" + +kind-of@^6.0.0, kind-of@^6.0.2: + version "6.0.2" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051" + +latest-version@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-3.1.0.tgz#a205383fea322b33b5ae3b18abee0dc2f356ee15" + dependencies: + package-json "^4.0.0" + +lie@~3.1.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/lie/-/lie-3.1.1.tgz#9a436b2cc7746ca59de7a41fa469b3efb76bd87e" + dependencies: + immediate "~3.0.5" + +lodash.debounce@^4.0.8: + version "4.0.8" + resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" + +lodash.get@4.4.2: + version "4.4.2" + resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99" + +lodash.includes@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/lodash.includes/-/lodash.includes-4.3.0.tgz#60bb98a87cb923c68ca1e51325483314849f553f" + +lodash.isboolean@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz#6c2e171db2a257cd96802fd43b01b20d5f5870f6" + +lodash.isequal@4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0" + +lodash.isinteger@^4.0.4: + version "4.0.4" + resolved "https://registry.yarnpkg.com/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz#619c0af3d03f8b04c31f5882840b77b11cd68343" + +lodash.isnumber@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz#3ce76810c5928d03352301ac287317f11c0b1ffc" + +lodash.isplainobject@^4.0.6: + version "4.0.6" + resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb" + +lodash.isstring@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451" + +lodash.isundefined@3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/lodash.isundefined/-/lodash.isundefined-3.0.1.tgz#23ef3d9535565203a66cefd5b830f848911afb48" + +lodash.once@^4.0.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac" + +lodash.reduce@4.6.0: + version "4.6.0" + resolved "https://registry.yarnpkg.com/lodash.reduce/-/lodash.reduce-4.6.0.tgz#f1ab6b839299ad48f784abbf476596f03b914d3b" + +lodash.uniqueid@4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/lodash.uniqueid/-/lodash.uniqueid-4.0.1.tgz#3268f26a7c88e4f4b1758d679271814e31fa5b26" + +lodash@^4.13.1, lodash@^4.17.10: + version "4.17.11" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d" + +lowercase-keys@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f" + +lru-cache@^4.0.1, lru-cache@~4.1.3: + version "4.1.5" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd" + dependencies: + pseudomap "^1.0.2" + yallist "^2.1.2" + +make-dir@^1.0.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c" + dependencies: + pify "^3.0.0" + +manakin@0.5.2: + version "0.5.2" + resolved "https://registry.yarnpkg.com/manakin/-/manakin-0.5.2.tgz#abe3df430ca6085f6983f6e4cf5af0298f4d30cc" + +map-cache@^0.2.2: + version "0.2.2" + resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf" + +map-visit@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f" + dependencies: + object-visit "^1.0.0" + +media-typer@0.3.0: + version "0.3.0" + resolved "http://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" + +merge-descriptors@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" + +methods@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" + +micromatch@^3.1.10, micromatch@^3.1.4: + version "3.1.10" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23" + dependencies: + arr-diff "^4.0.0" + array-unique "^0.3.2" + braces "^2.3.1" + define-property "^2.0.2" + extend-shallow "^3.0.2" + extglob "^2.0.4" + fragment-cache "^0.2.1" + kind-of "^6.0.2" + nanomatch "^1.2.9" + object.pick "^1.3.0" + regex-not "^1.0.0" + snapdragon "^0.8.1" + to-regex "^3.0.2" + +mime-db@~1.37.0: + version "1.37.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.37.0.tgz#0b6a0ce6fdbe9576e25f1f2d2fde8830dc0ad0d8" + +mime-types@^2.1.12, mime-types@~2.1.18, mime-types@~2.1.19: + version "2.1.21" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.21.tgz#28995aa1ecb770742fe6ae7e58f9181c744b3f96" + dependencies: + mime-db "~1.37.0" + +mime@1.4.1: + version "1.4.1" + resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6" + +mime@2.3.1: + version "2.3.1" + resolved "http://registry.npmjs.org/mime/-/mime-2.3.1.tgz#b1621c54d63b97c47d3cfe7f7215f7d64517c369" + +minimatch@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" + dependencies: + brace-expansion "^1.1.7" + +minimist@0.0.8: + version "0.0.8" + resolved "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" + +minimist@^1.2.0: + version "1.2.0" + resolved "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" + +minipass@^2.2.1, minipass@^2.3.4: + version "2.3.5" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.5.tgz#cacebe492022497f656b0f0f51e2682a9ed2d848" + dependencies: + safe-buffer "^5.1.2" + yallist "^3.0.0" + +minizlib@^1.1.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.2.1.tgz#dd27ea6136243c7c880684e8672bb3a45fd9b614" + dependencies: + minipass "^2.2.1" + +mixin-deep@^1.2.0: + version "1.3.1" + resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.1.tgz#a49e7268dce1a0d9698e45326c5626df3543d0fe" + dependencies: + for-in "^1.0.2" + is-extendable "^1.0.1" + +mkdirp@^0.5.0, mkdirp@^0.5.1: + version "0.5.1" + resolved "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" + dependencies: + minimist "0.0.8" + +ms@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" + +ms@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a" + +mustache-express@^1.2.7: + version "1.2.8" + resolved "https://registry.yarnpkg.com/mustache-express/-/mustache-express-1.2.8.tgz#caf3fc93e5b729e92077b1c4ff713aba4bced259" + dependencies: + async "~2.6.0" + lru-cache "~4.1.3" + mustache "~2.3.0" + +mustache@~2.3.0: + version "2.3.2" + resolved "https://registry.yarnpkg.com/mustache/-/mustache-2.3.2.tgz#a6d4d9c3f91d13359ab889a812954f9230a3d0c5" + +nan@^2.9.2: + version "2.12.1" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.12.1.tgz#7b1aa193e9aa86057e3c7bbd0ac448e770925552" + +nanomatch@^1.2.9: + version "1.2.13" + resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119" + dependencies: + arr-diff "^4.0.0" + array-unique "^0.3.2" + define-property "^2.0.2" + extend-shallow "^3.0.2" + fragment-cache "^0.2.1" + is-windows "^1.0.2" + kind-of "^6.0.2" + object.pick "^1.3.0" + regex-not "^1.0.0" + snapdragon "^0.8.1" + to-regex "^3.0.1" + +needle@^2.2.1: + version "2.2.4" + resolved "https://registry.yarnpkg.com/needle/-/needle-2.2.4.tgz#51931bff82533b1928b7d1d69e01f1b00ffd2a4e" + dependencies: + debug "^2.1.2" + iconv-lite "^0.4.4" + sax "^1.2.4" + +negotiator@0.6.1: + version "0.6.1" + resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9" + +node-pre-gyp@^0.10.0: + version "0.10.3" + resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.10.3.tgz#3070040716afdc778747b61b6887bf78880b80fc" + dependencies: + detect-libc "^1.0.2" + mkdirp "^0.5.1" + needle "^2.2.1" + nopt "^4.0.1" + npm-packlist "^1.1.6" + npmlog "^4.0.2" + rc "^1.2.7" + rimraf "^2.6.1" + semver "^5.3.0" + tar "^4" + +nodemon@^1.18.4: + version "1.18.9" + resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-1.18.9.tgz#90b467efd3b3c81b9453380aeb2a2cba535d0ead" + dependencies: + chokidar "^2.0.4" + debug "^3.1.0" + ignore-by-default "^1.0.1" + minimatch "^3.0.4" + pstree.remy "^1.1.6" + semver "^5.5.0" + supports-color "^5.2.0" + touch "^3.1.0" + undefsafe "^2.0.2" + update-notifier "^2.5.0" + +nopt@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d" + dependencies: + abbrev "1" + osenv "^0.1.4" + +nopt@~1.0.10: + version "1.0.10" + resolved "https://registry.yarnpkg.com/nopt/-/nopt-1.0.10.tgz#6ddd21bd2a31417b92727dd585f8a6f37608ebee" + dependencies: + abbrev "1" + +normalize-path@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9" + dependencies: + remove-trailing-separator "^1.0.1" + +npm-bundled@^1.0.1: + version "1.0.5" + resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.5.tgz#3c1732b7ba936b3a10325aef616467c0ccbcc979" + +npm-packlist@^1.1.6: + version "1.1.12" + resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.1.12.tgz#22bde2ebc12e72ca482abd67afc51eb49377243a" + dependencies: + ignore-walk "^3.0.1" + npm-bundled "^1.0.1" + +npm-run-path@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f" + dependencies: + path-key "^2.0.0" + +npmlog@^4.0.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" + dependencies: + are-we-there-yet "~1.1.2" + console-control-strings "~1.1.0" + gauge "~2.7.3" + set-blocking "~2.0.0" + +number-is-nan@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" + +oauth-sign@~0.9.0: + version "0.9.0" + resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455" + +object-assign@^4.1.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" + +object-copy@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c" + dependencies: + copy-descriptor "^0.1.0" + define-property "^0.2.5" + kind-of "^3.0.3" + +object-visit@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb" + dependencies: + isobject "^3.0.0" + +object.pick@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747" + dependencies: + isobject "^3.0.1" + +on-finished@~2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947" + dependencies: + ee-first "1.1.1" + +once@^1.3.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" + dependencies: + wrappy "1" + +os-homedir@^1.0.0: + version "1.0.2" + resolved "http://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" + +os-tmpdir@^1.0.0: + version "1.0.2" + resolved "http://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" + +osenv@^0.1.4: + version "0.1.5" + resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410" + dependencies: + os-homedir "^1.0.0" + os-tmpdir "^1.0.0" + +p-finally@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae" + +package-json@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/package-json/-/package-json-4.0.1.tgz#8869a0401253661c4c4ca3da6c2121ed555f5eed" + dependencies: + got "^6.7.1" + registry-auth-token "^3.0.1" + registry-url "^3.0.3" + semver "^5.1.0" + +packet-reader@0.3.1: + version "0.3.1" + resolved "https://registry.yarnpkg.com/packet-reader/-/packet-reader-0.3.1.tgz#cd62e60af8d7fea8a705ec4ff990871c46871f27" + +pako@~1.0.2: + version "1.0.7" + resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.7.tgz#2473439021b57f1516c82f58be7275ad8ef1bb27" + +parseurl@~1.3.2: + version "1.3.2" + resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.2.tgz#fc289d4ed8993119460c156253262cdc8de65bf3" + +pascalcase@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14" + +path-dirname@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0" + +path-is-absolute@^1.0.0: + version "1.0.1" + resolved "http://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" + +path-is-inside@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53" + +path-key@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40" + +path-to-regexp@0.1.7: + version "0.1.7" + resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" + +performance-now@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" + +pg-connection-string@0.1.3: + version "0.1.3" + resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-0.1.3.tgz#da1847b20940e42ee1492beaf65d49d91b245df7" + +pg-minify@0.5.5: + version "0.5.5" + resolved "https://registry.yarnpkg.com/pg-minify/-/pg-minify-0.5.5.tgz#6c961a61aa19f469d8edfe5a3c0da58760f3c339" + +pg-pool@^2.0.4: + version "2.0.5" + resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-2.0.5.tgz#f00556fab23f1bbb14b0650ba8d0e447434a1b04" + +pg-promise@^8.4.5: + version "8.5.4" + resolved "https://registry.yarnpkg.com/pg-promise/-/pg-promise-8.5.4.tgz#3c1c656d340b1d8e21bbd8017a650c795b375aca" + dependencies: + manakin "0.5.2" + pg "7.7.1" + pg-minify "0.5.5" + spex "2.1.0" + +pg-types@~1.12.1: + version "1.12.1" + resolved "https://registry.yarnpkg.com/pg-types/-/pg-types-1.12.1.tgz#d64087e3903b58ffaad279e7595c52208a14c3d2" + dependencies: + postgres-array "~1.0.0" + postgres-bytea "~1.0.0" + postgres-date "~1.0.0" + postgres-interval "^1.1.0" + +pg@7.7.1: + version "7.7.1" + resolved "https://registry.yarnpkg.com/pg/-/pg-7.7.1.tgz#546b192ff484322b69689391f885de3ba91a30d4" + dependencies: + buffer-writer "2.0.0" + packet-reader "0.3.1" + pg-connection-string "0.1.3" + pg-pool "^2.0.4" + pg-types "~1.12.1" + pgpass "1.x" + semver "4.3.2" + +pgpass@1.x: + version "1.0.2" + resolved "https://registry.yarnpkg.com/pgpass/-/pgpass-1.0.2.tgz#2a7bb41b6065b67907e91da1b07c1847c877b306" + dependencies: + split "^1.0.0" + +pify@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176" + +posix-character-classes@^0.1.0: + version "0.1.1" + resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" + +postgres-array@~1.0.0: + version "1.0.3" + resolved "https://registry.yarnpkg.com/postgres-array/-/postgres-array-1.0.3.tgz#c561fc3b266b21451fc6555384f4986d78ec80f5" + +postgres-bytea@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/postgres-bytea/-/postgres-bytea-1.0.0.tgz#027b533c0aa890e26d172d47cf9ccecc521acd35" + +postgres-date@~1.0.0: + version "1.0.3" + resolved "https://registry.yarnpkg.com/postgres-date/-/postgres-date-1.0.3.tgz#e2d89702efdb258ff9d9cee0fe91bd06975257a8" + +postgres-interval@^1.1.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/postgres-interval/-/postgres-interval-1.1.2.tgz#bf71ff902635f21cb241a013fc421d81d1db15a9" + dependencies: + xtend "^4.0.0" + +prepend-http@^1.0.1: + version "1.0.4" + resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc" + +process-nextick-args@~1.0.6: + version "1.0.7" + resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3" + +process-nextick-args@~2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa" + +proxy-addr@~2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.4.tgz#ecfc733bf22ff8c6f407fa275327b9ab67e48b93" + dependencies: + forwarded "~0.1.2" + ipaddr.js "1.8.0" + +pseudomap@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3" + +psl@^1.1.24, psl@^1.1.28: + version "1.1.31" + resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.31.tgz#e9aa86d0101b5b105cbe93ac6b784cd547276184" + +pstree.remy@^1.1.6: + version "1.1.6" + resolved "https://registry.yarnpkg.com/pstree.remy/-/pstree.remy-1.1.6.tgz#73a55aad9e2d95814927131fbf4dc1b62d259f47" + +punycode@^1.4.1: + version "1.4.1" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" + +punycode@^2.1.0, punycode@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" + +qs@6.5.2, qs@~6.5.2: + version "6.5.2" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36" + +range-parser@~1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e" + +raw-body@2.3.3: + version "2.3.3" + resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.3.3.tgz#1b324ece6b5706e153855bc1148c65bb7f6ea0c3" + dependencies: + bytes "3.0.0" + http-errors "1.6.3" + iconv-lite "0.4.23" + unpipe "1.0.0" + +rc@^1.0.1, rc@^1.1.6, rc@^1.2.7: + version "1.2.8" + resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" + dependencies: + deep-extend "^0.6.0" + ini "~1.3.0" + minimist "^1.2.0" + strip-json-comments "~2.0.1" + +readable-stream@^2.0.2, readable-stream@^2.0.6: + version "2.3.6" + resolved "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf" + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.3" + isarray "~1.0.0" + process-nextick-args "~2.0.0" + safe-buffer "~5.1.1" + string_decoder "~1.1.1" + util-deprecate "~1.0.1" + +readable-stream@~2.0.6: + version "2.0.6" + resolved "http://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e" + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.1" + isarray "~1.0.0" + process-nextick-args "~1.0.6" + string_decoder "~0.10.x" + util-deprecate "~1.0.1" + +readdirp@^2.0.0: + version "2.2.1" + resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525" + dependencies: + graceful-fs "^4.1.11" + micromatch "^3.1.10" + readable-stream "^2.0.2" + +regex-not@^1.0.0, regex-not@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c" + dependencies: + extend-shallow "^3.0.2" + safe-regex "^1.1.0" + +registry-auth-token@^3.0.1: + version "3.3.2" + resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.3.2.tgz#851fd49038eecb586911115af845260eec983f20" + dependencies: + rc "^1.1.6" + safe-buffer "^5.0.1" + +registry-url@^3.0.3: + version "3.1.0" + resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-3.1.0.tgz#3d4ef870f73dde1d77f0cf9a381432444e174942" + dependencies: + rc "^1.0.1" + +remove-trailing-separator@^1.0.1: + version "1.1.0" + resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef" + +repeat-element@^1.1.2: + version "1.1.3" + resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce" + +repeat-string@^1.6.1: + version "1.6.1" + resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" + +request-promise-core@1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.1.tgz#3eee00b2c5aa83239cfb04c5700da36f81cd08b6" + dependencies: + lodash "^4.13.1" + +request-promise@^4.2.2: + version "4.2.2" + resolved "https://registry.yarnpkg.com/request-promise/-/request-promise-4.2.2.tgz#d1ea46d654a6ee4f8ee6a4fea1018c22911904b4" + dependencies: + bluebird "^3.5.0" + request-promise-core "1.1.1" + stealthy-require "^1.1.0" + tough-cookie ">=2.3.3" + +request@^2.88.0: + version "2.88.0" + resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef" + dependencies: + aws-sign2 "~0.7.0" + aws4 "^1.8.0" + caseless "~0.12.0" + combined-stream "~1.0.6" + extend "~3.0.2" + forever-agent "~0.6.1" + form-data "~2.3.2" + har-validator "~5.1.0" + http-signature "~1.2.0" + is-typedarray "~1.0.0" + isstream "~0.1.2" + json-stringify-safe "~5.0.1" + mime-types "~2.1.19" + oauth-sign "~0.9.0" + performance-now "^2.1.0" + qs "~6.5.2" + safe-buffer "^5.1.2" + tough-cookie "~2.4.3" + tunnel-agent "^0.6.0" + uuid "^3.3.2" + +resolve-url@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" + +ret@~0.1.10: + version "0.1.15" + resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc" + +rimraf@^2.6.1: + version "2.6.2" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36" + dependencies: + glob "^7.0.5" + +safe-buffer@5.1.2, safe-buffer@^5.0.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: + version "5.1.2" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" + +safe-regex@^1.1.0: + version "1.1.0" + resolved "http://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e" + dependencies: + ret "~0.1.10" + +"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: + version "2.1.2" + resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" + +sax@^1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" + +semver-diff@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-2.1.0.tgz#4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36" + dependencies: + semver "^5.0.3" + +semver@4.3.2: + version "4.3.2" + resolved "http://registry.npmjs.org/semver/-/semver-4.3.2.tgz#c7a07158a80bedd052355b770d82d6640f803be7" + +semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.5.0: + version "5.6.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004" + +send@0.16.2: + version "0.16.2" + resolved "https://registry.yarnpkg.com/send/-/send-0.16.2.tgz#6ecca1e0f8c156d141597559848df64730a6bbc1" + dependencies: + debug "2.6.9" + depd "~1.1.2" + destroy "~1.0.4" + encodeurl "~1.0.2" + escape-html "~1.0.3" + etag "~1.8.1" + fresh "0.5.2" + http-errors "~1.6.2" + mime "1.4.1" + ms "2.0.0" + on-finished "~2.3.0" + range-parser "~1.2.0" + statuses "~1.4.0" + +serve-static@1.13.2: + version "1.13.2" + resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.2.tgz#095e8472fd5b46237db50ce486a43f4b86c6cec1" + dependencies: + encodeurl "~1.0.2" + escape-html "~1.0.3" + parseurl "~1.3.2" + send "0.16.2" + +set-blocking@~2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" + +set-value@^0.4.3: + version "0.4.3" + resolved "https://registry.yarnpkg.com/set-value/-/set-value-0.4.3.tgz#7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1" + dependencies: + extend-shallow "^2.0.1" + is-extendable "^0.1.1" + is-plain-object "^2.0.1" + to-object-path "^0.3.0" + +set-value@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.0.tgz#71ae4a88f0feefbbf52d1ea604f3fb315ebb6274" + dependencies: + extend-shallow "^2.0.1" + is-extendable "^0.1.1" + is-plain-object "^2.0.3" + split-string "^3.0.1" + +setprototypeof@1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656" + +shebang-command@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" + dependencies: + shebang-regex "^1.0.0" + +shebang-regex@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3" + +signal-exit@^3.0.0, signal-exit@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d" + +snapdragon-node@^2.0.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b" + dependencies: + define-property "^1.0.0" + isobject "^3.0.0" + snapdragon-util "^3.0.1" + +snapdragon-util@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2" + dependencies: + kind-of "^3.2.0" + +snapdragon@^0.8.1: + version "0.8.2" + resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d" + dependencies: + base "^0.11.1" + debug "^2.2.0" + define-property "^0.2.5" + extend-shallow "^2.0.1" + map-cache "^0.2.2" + source-map "^0.5.6" + source-map-resolve "^0.5.0" + use "^3.1.0" + +source-map-resolve@^0.5.0: + version "0.5.2" + resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.2.tgz#72e2cc34095543e43b2c62b2c4c10d4a9054f259" + dependencies: + atob "^2.1.1" + decode-uri-component "^0.2.0" + resolve-url "^0.2.1" + source-map-url "^0.4.0" + urix "^0.1.0" + +source-map-url@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3" + +source-map@^0.5.6: + version "0.5.7" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" + +spex@2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/spex/-/spex-2.1.0.tgz#21939ab7722322c3a1d002870fab022daa79335f" + +split-string@^3.0.1, split-string@^3.0.2: + version "3.1.0" + resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2" + dependencies: + extend-shallow "^3.0.0" + +split@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/split/-/split-1.0.1.tgz#605bd9be303aa59fb35f9229fbea0ddec9ea07d9" + dependencies: + through "2" + +sshpk@^1.7.0: + version "1.16.0" + resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.0.tgz#1d4963a2fbffe58050aa9084ca20be81741c07de" + dependencies: + asn1 "~0.2.3" + assert-plus "^1.0.0" + bcrypt-pbkdf "^1.0.0" + dashdash "^1.12.0" + ecc-jsbn "~0.1.1" + getpass "^0.1.1" + jsbn "~0.1.0" + safer-buffer "^2.0.2" + tweetnacl "~0.14.0" + +static-extend@^0.1.1: + version "0.1.2" + resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6" + dependencies: + define-property "^0.2.5" + object-copy "^0.1.0" + +"statuses@>= 1.4.0 < 2": + version "1.5.0" + resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" + +statuses@~1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087" + +stealthy-require@^1.1.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b" + +string-width@^1.0.1: + version "1.0.2" + resolved "http://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" + dependencies: + code-point-at "^1.0.0" + is-fullwidth-code-point "^1.0.0" + strip-ansi "^3.0.0" + +"string-width@^1.0.2 || 2", string-width@^2.0.0, string-width@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" + dependencies: + is-fullwidth-code-point "^2.0.0" + strip-ansi "^4.0.0" + +string_decoder@~0.10.x: + version "0.10.31" + resolved "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" + +string_decoder@~1.1.1: + version "1.1.1" + resolved "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" + dependencies: + safe-buffer "~5.1.0" + +strip-ansi@^3.0.0, strip-ansi@^3.0.1: + version "3.0.1" + resolved "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" + dependencies: + ansi-regex "^2.0.0" + +strip-ansi@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f" + dependencies: + ansi-regex "^3.0.0" + +strip-eof@^1.0.0: + version "1.0.0" + resolved "http://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf" + +strip-json-comments@~2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" + +supports-color@^5.2.0, supports-color@^5.3.0: + version "5.5.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" + dependencies: + has-flag "^3.0.0" + +tar@^4: + version "4.4.8" + resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.8.tgz#b19eec3fde2a96e64666df9fdb40c5ca1bc3747d" + dependencies: + chownr "^1.1.1" + fs-minipass "^1.2.5" + minipass "^2.3.4" + minizlib "^1.1.1" + mkdirp "^0.5.0" + safe-buffer "^5.1.2" + yallist "^3.0.2" + +term-size@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/term-size/-/term-size-1.2.0.tgz#458b83887f288fc56d6fffbfad262e26638efa69" + dependencies: + execa "^0.7.0" + +through@2: + version "2.3.8" + resolved "http://registry.npmjs.org/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" + +timed-out@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f" + +to-object-path@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af" + dependencies: + kind-of "^3.0.2" + +to-regex-range@^2.1.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38" + dependencies: + is-number "^3.0.0" + repeat-string "^1.6.1" + +to-regex@^3.0.1, to-regex@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce" + dependencies: + define-property "^2.0.2" + extend-shallow "^3.0.2" + regex-not "^1.0.2" + safe-regex "^1.1.0" + +touch@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/touch/-/touch-3.1.0.tgz#fe365f5f75ec9ed4e56825e0bb76d24ab74af83b" + dependencies: + nopt "~1.0.10" + +tough-cookie@>=2.3.3: + version "2.5.0" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2" + dependencies: + psl "^1.1.28" + punycode "^2.1.1" + +tough-cookie@~2.4.3: + version "2.4.3" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781" + dependencies: + psl "^1.1.24" + punycode "^1.4.1" + +tunnel-agent@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" + dependencies: + safe-buffer "^5.0.1" + +tweetnacl@^0.14.3, tweetnacl@~0.14.0: + version "0.14.5" + resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" + +type-is@~1.6.16: + version "1.6.16" + resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.16.tgz#f89ce341541c672b25ee7ae3c73dee3b2be50194" + dependencies: + media-typer "0.3.0" + mime-types "~2.1.18" + +undefsafe@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/undefsafe/-/undefsafe-2.0.2.tgz#225f6b9e0337663e0d8e7cfd686fc2836ccace76" + dependencies: + debug "^2.2.0" + +union-value@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4" + dependencies: + arr-union "^3.1.0" + get-value "^2.0.6" + is-extendable "^0.1.1" + set-value "^0.4.3" + +unique-string@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-1.0.0.tgz#9e1057cca851abb93398f8b33ae187b99caec11a" + dependencies: + crypto-random-string "^1.0.0" + +unpipe@1.0.0, unpipe@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" + +unset-value@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559" + dependencies: + has-value "^0.3.1" + isobject "^3.0.0" + +unzip-response@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97" + +upath@^1.0.5: + version "1.1.0" + resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.0.tgz#35256597e46a581db4793d0ce47fa9aebfc9fabd" + +update-notifier@^2.5.0: + version "2.5.0" + resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-2.5.0.tgz#d0744593e13f161e406acb1d9408b72cad08aff6" + dependencies: + boxen "^1.2.1" + chalk "^2.0.1" + configstore "^3.0.0" + import-lazy "^2.1.0" + is-ci "^1.0.10" + is-installed-globally "^0.1.0" + is-npm "^1.0.0" + latest-version "^3.0.0" + semver-diff "^2.0.0" + xdg-basedir "^3.0.0" + +uri-js@^4.2.2: + version "4.2.2" + resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0" + dependencies: + punycode "^2.1.0" + +urix@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72" + +url-parse-lax@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-1.0.0.tgz#7af8f303645e9bd79a272e7a14ac68bc0609da73" + dependencies: + prepend-http "^1.0.1" + +use@^3.1.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f" + +util-deprecate@~1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" + +utils-merge@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" + +uuid@3.3.2, uuid@^3.3.2: + version "3.3.2" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131" + +vary@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" + +verror@1.10.0: + version "1.10.0" + resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400" + dependencies: + assert-plus "^1.0.0" + core-util-is "1.0.2" + extsprintf "^1.2.0" + +which@^1.2.9: + version "1.3.1" + resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" + dependencies: + isexe "^2.0.0" + +wide-align@^1.1.0: + version "1.1.3" + resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457" + dependencies: + string-width "^1.0.2 || 2" + +widest-line@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-2.0.1.tgz#7438764730ec7ef4381ce4df82fb98a53142a3fc" + dependencies: + string-width "^2.1.1" + +wrappy@1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" + +write-file-atomic@^2.0.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.3.0.tgz#1ff61575c2e2a4e8e510d6fa4e243cce183999ab" + dependencies: + graceful-fs "^4.1.11" + imurmurhash "^0.1.4" + signal-exit "^3.0.2" + +xdg-basedir@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-3.0.0.tgz#496b2cc109eca8dbacfe2dc72b603c17c5870ad4" + +xmlbuilder@10.0.0: + version "10.0.0" + resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-10.0.0.tgz#c64e52f8ae097fe5fd46d1c38adaade071ee1b55" + +xtend@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af" + +yallist@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" + +yallist@^3.0.0, yallist@^3.0.2: + version "3.0.3" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.3.tgz#b4b049e314be545e3ce802236d6cd22cd91c3de9" diff --git a/services/.gitignore b/services/.gitignore new file mode 100644 index 00000000..e3409419 --- /dev/null +++ b/services/.gitignore @@ -0,0 +1,6 @@ +node_modules +*.log +*.pyc +*.xlsx +.vscode/ +nodemon.json \ No newline at end of file diff --git a/services/rainmaker-custom-service/.dockerignore b/services/rainmaker-custom-service/.dockerignore new file mode 100644 index 00000000..3c3629e6 --- /dev/null +++ b/services/rainmaker-custom-service/.dockerignore @@ -0,0 +1 @@ +node_modules diff --git a/services/rainmaker-custom-service/.gitignore b/services/rainmaker-custom-service/.gitignore new file mode 100644 index 00000000..4f9f8bf4 --- /dev/null +++ b/services/rainmaker-custom-service/.gitignore @@ -0,0 +1,2 @@ +sampleRequest.js +nodemon.json \ No newline at end of file diff --git a/services/rainmaker-custom-service/Dockerfile b/services/rainmaker-custom-service/Dockerfile new file mode 100644 index 00000000..c7c85163 --- /dev/null +++ b/services/rainmaker-custom-service/Dockerfile @@ -0,0 +1,9 @@ +FROM node:8.12-alpine +RUN npm install -g yarn +RUN mkdir /opt/app +COPY package.json yarn.lock /opt/app/ +WORKDIR /opt/app +RUN yarn install +COPY . /opt/app +CMD ["node", "index.js"] + diff --git a/services/rainmaker-custom-service/bnd.js b/services/rainmaker-custom-service/bnd.js new file mode 100644 index 00000000..3514c63d --- /dev/null +++ b/services/rainmaker-custom-service/bnd.js @@ -0,0 +1,15 @@ +let requests = require("request") + +requests.post("http://13.126.198.70/eDistServices/ModuleCommon/serAuth.asmx/serAuthExternalUser", + { + form: { + username: "eomcbrn", + password: "esewa@123" + }, + headers: { + "x-api-key": "Tw0AxM3kyV3mb8SM" + } + } +,function(a,b,c) { + console.log(a,c); +}) \ No newline at end of file diff --git a/services/rainmaker-custom-service/build.wkflo b/services/rainmaker-custom-service/build.wkflo new file mode 100644 index 00000000..95cba3d1 --- /dev/null +++ b/services/rainmaker-custom-service/build.wkflo @@ -0,0 +1,9 @@ +def build(path, ci_image) { + stage("Build") { + docker.image("egovio/ci-react:v8.4.0").inside { + sh "cd ${path}/ && rm -rf node_modules"; + } + } +} + +return this; diff --git a/services/rainmaker-custom-service/encrypt.js b/services/rainmaker-custom-service/encrypt.js new file mode 100644 index 00000000..130ba4c9 --- /dev/null +++ b/services/rainmaker-custom-service/encrypt.js @@ -0,0 +1,41 @@ +const ENCRYPTION_KEY = process.env.ENCRYPTION_KEY +const ENCRYPTION_IV = process.env.ENCRYPTION_IV +const JWT_KEY = process.env.JWT_KEY +const JWT_EXPIRY = process.env.JWT_EXPIRY || '5min' +const DEBUG_MODE = Boolean(process.env.DEBUG_MODE) || false; + +function log(val) { + if (DEBUG_MODE) { + console.log(val) + } +} + +log ("EK=" + ENCRYPTION_KEY) +log ("EI=" + ENCRYPTION_IV) + +var encrypt = function (pass) { + // Include Library + var crypto = require('crypto'); + + // Declare Key and Block + var key = ENCRYPTION_KEY; + var iv = ENCRYPTION_IV; + + // Calc Cipher + var cipher = crypto.createCipheriv('aes256', key, iv) + var crypted = cipher.update(pass, 'utf8', 'base64') + crypted += cipher.final('base64'); + + // Return Cipher Text + return crypted; +} + + +var jwt = require("jsonwebtoken"); + +jwt_sign = (data) => jwt.sign(data, JWT_KEY, { expiresIn: JWT_EXPIRY }); + +module.exports = { + jwt_sign, + encrypt +} \ No newline at end of file diff --git a/services/rainmaker-custom-service/index.js b/services/rainmaker-custom-service/index.js new file mode 100644 index 00000000..568554fc --- /dev/null +++ b/services/rainmaker-custom-service/index.js @@ -0,0 +1,581 @@ +var express = require('express'), + slash = require('express-slash'); +var bodyParser = require('body-parser') + +var request = require('request-promise'); +const { + asyncMiddleware +} = require('./utils/asyncMiddleware'); + +var app = express(); +var mustache = require('mustache-express') +const Cryptr = require('cryptr'); +var {encrypt, jwt_sign } = require('./encrypt') + +app.engine('html', mustache()) +app.set('view engine', 'html') +app.set('views', __dirname + '/templates') +app.disable('view cache'); + +// https://codepen.io/graphicfreedom/pen/evaBXm + +const DEBUG_MODE = Boolean(process.env.DEBUG_MODE) || false; +const PT_DEMAND_HOST = process.env.PT_DEMAND_HOST +const EGOV_MDMS_HOST = process.env.EGOV_MDMS_HOST +const EGOV_BND_LOGIN_URL = process.env.EGOV_BND_LOGIN_URL +const EGOV_BND_REDIRECT_URL = process.env.EGOV_BND_REDIRECT_URL +// const EGOV_BND_API_KEY = process.env.EGOV_BND_API_KEY +const EGOV_BND_ENCRYPTION_KEY = process.env.EGOV_BND_ENCRYPTION_KEY || "Vol0otuji0X03wSuZGI3zySUzxj7bReQ" + +function log(val) { + if (DEBUG_MODE) { + console.log(val) + } +} + +log ("ENCKEY=" + EGOV_BND_ENCRYPTION_KEY) + +const cryptr = new Cryptr(EGOV_BND_ENCRYPTION_KEY); + + +function getUserUUID(data) { + return data.RequestInfo.userInfo.uuid; +} + +function getUserID(data) { + return data.RequestInfo.userInfo.id; +} + +async function getFireCessConfig(tenantId) { + let fireCessConfig = await request.post({ + url: EGOV_MDMS_HOST + "egov-mdms-service/v1/_search?tenantId=" + tenantId, + body: { + RequestInfo: { + "apiId": "Rainmaker-custom-service", + "ver": ".01", + "ts": "", + "action": "_search", + "did": "1", + "key": "", + "msgId": "20170310130900|en_IN", + "authToken": null + }, + "MdmsCriteria": { + "tenantId": tenantId, + "moduleDetails": [{ + "moduleName": "PropertyTax", + "masterDetails": [{ + "name": "FireCess" + }] + }] + } + }, + json: true + }) + + return fireCessConfig["MdmsRes"]["PropertyTax"]["FireCess"][0]; +} + +const TAX_TYPE = { + PT_TAX: false, + PT_TIME_REBATE: true, + PT_UNIT_USAGE_EXEMPTION: true, + PT_TIME_PENALTY: false, + PT_CANCER_CESS: false, + PT_ADHOC_PENALTY: false, + PT_ADHOC_REBATE: true, + PT_DECIMAL_CEILING_CREDIT: false, + PT_DECIMAL_CEILING_DEBIT: true, + PT_FIRE_CESS: false, + PT_OWNER_EXEMPTION: true, + PT_TIME_INTEREST: false +} + +if (PT_DEMAND_HOST === undefined) { + throw Error("PT_DEMAND_HOST environment variable needs to be configured to run this") +} + +function round(num, digits) { + return parseFloat(parseFloat(num).toFixed(digits)) +} + +// parse application/x-www-form-urlencoded +app.use(bodyParser.urlencoded({ + extended: true +})) + +// parse application/json +app.use(bodyParser.json()) + +// Because you're the type of developer who cares about this sort of thing! +app.enable('strict routing'); + +// Create the router using the same routing options as the app. +var router = express.Router({ + caseSensitive: app.get('case sensitive routing'), + strict: app.get('strict routing') +}); + +router.use("/static", express.static("static")) + +// Add the `slash()` middleware after your app's `router`, optionally specify +// an HTTP status code to use when redirecting (defaults to 301). +app.use('/customization', router); +// app.use(slash()); +app.use(express.json()); + +var promise = require('bluebird'); + +var options = { + // Initialization Options + promiseLib: promise +}; + +var pgp = require('pg-promise')(options); + +const connectionString = { + host: process.env.DB_HOST || 'localhost', + port: 5432, + database: process.env.DB_NAME || 'postgres', + user: process.env.DB_USER || 'postgres', + password: process.env.DB_PASSWORD || 'postgres' +}; + +// var connectionString = 'postgres://localhost:5432/egov_prod_db'; +var db = pgp(connectionString); +var path = require('path'); + +query = `SELECT servicerequestid as complaint_no, servicecode as complaint_type, eg_user.name as citizen_name, eg_user.mobilenumber as citizen_mobile, address, landmark, description as details +FROM eg_pgr_service INNER JOIN eg_user ON eg_pgr_service.accountid = cast(eg_user.id as varchar) +WHERE eg_pgr_service.status = 'assigned' AND servicerequestid IN (select DISTINCT businesskey from eg_pgr_action where status = 'assigned' AND "when" +IN (select max("when") from eg_pgr_action where assignee NOTNULL group by businesskey) AND assignee = $1);` + +router.get('/open/reports/*', function (req, res) { + res.render('apicall.html'); +}); + +router.get('/open/bndlogin', function (req, res) { + res.render('bndlogin.html'); +}); + +router.post('/protected/bndlogin/unlinkAccount', asyncMiddleware(async function (req, res) { + let uuid = getUserUUID(req.body); + + data = await db.any("DELETE FROM custom_eg_user_metatdata where user_id = $1 and key = $2", [uuid, 'BND_CREDENTIALS']); + res.status(200).send({}) +})); + +router.post('/protected/bndlogin/linkAccount', asyncMiddleware(async function (req, res) { + let username = req.body.username + let password = req.body.password + let uuid = getUserUUID(req.body); + let payload = { + Username: username, + Password: encrypt(password) + } + + log("inside linkAccount") + log(payload) + + let response = await request.post(EGOV_BND_LOGIN_URL, { + json: payload + }) + + log(response) + + if (response.sys_message && response.sys_message == 'Invalid User and Password') { + res.status(200).send({ code: "INVALID_CREDENTIALS", message: "Invalid User and Password"} ) + return + } else if (response.sys_message && response.sys_message == 'INTERNAL APPLICATION ERROR') { + res.status(200).send({ code: "ERROR", message: "Something went wrong"} ) + return + } + + loginID = response["data"][0]["loginID"]; + data = await db.any("select value from custom_eg_user_metatdata where user_id = $1 and key = $2", [uuid, 'BND_CREDENTIALS']); + value = { + username, + GUID: cryptr.encrypt(loginID) + } + + if (data.length == 0) { + await db.any("insert into custom_eg_user_metatdata(key, user_id, value) values ($1, $2, $3:json)", + ['BND_CREDENTIALS', uuid, value]) + } else { + await db.any("update custom_eg_user_metatdata set value = $3:json where key = $1 and user_id = $2", + ['BND_CREDENTIALS', uuid, value]) + } + res.json({code: "SUCCESS", redirect: EGOV_BND_REDIRECT_URL + jwt_sign({loginID: encrypt(loginID)})}) +})); + +router.post('/protected/bndlogin', asyncMiddleware(async function (req, res) { + try { + let uuid = getUserUUID(req.body); + data = await db.any("select value from custom_eg_user_metatdata where user_id = $1 and key = $2", [uuid, 'BND_CREDENTIALS']); + + if (data.length == 0) { + res.json({ + "code": "NO_CREDENTIAL_MAPPING", + "message": "Please update your Birth and Death credentials" + }) + return + } + + let loginID = cryptr.decrypt(data[0]["value"]["GUID"]) + + res.json({ + code: "SUCCESS", + redirect: EGOV_BND_REDIRECT_URL + jwt_sign({loginID: encrypt(loginID)}) + }) + + } catch (ex) { + console.log("Exception occured while login", ex) + res.json({ + "code": "ERROR", + "message": "Failed to login to BND - " + ex.toString() + }) + } + +})); + +function getFireCessPercentage(propertyDetails) { + // let propertyDetails = request["CalculationCriteria"][0]["propertyDetails"][0] + + let propertyUsageCategoryMajor = propertyDetails["usageCategoryMajor"] + let units = propertyDetails["units"] + let propertyAttributes = propertyDetails["additionalDetails"] + let unitSet = new Set() + + for (unit of units) { + unitSet.add(unit["usageCategoryMajor"]) + } + let firecess_category_major = 0; + let firecess_building_height = 0; + let firecess_inflammable = 0; + + if (propertyUsageCategoryMajor == "RESIDENTIAL" || (unitSet.size == 1 && unitSet.has("RESIDENTIAL"))) { + // There is no category major firecess applicable as it i + firecess_category_major = 0 + } else { + firecess_category_major = 5.0 + } + + if (propertyAttributes && + propertyAttributes.heightAbove36Feet && + propertyAttributes.heightAbove36Feet.toString() == "true") { + // height is above 36 feet + firecess_building_height = 2.0 + } + + if (propertyAttributes && + propertyAttributes.inflammable && + propertyAttributes.inflammable.toString() == "true") { + // height is above 36 feet + firecess_inflammable = 10.0 + } + + return { + firecess_inflammable, + firecess_building_height, + firecess_category_major, + firecess: firecess_category_major + firecess_building_height + firecess_inflammable + } +} + +function calculateNewFireCess(taxHeads, firecess_percent, taxField, taxHeadCodeField) { + + let applicablePropertyTax = 0 + for (taxHead of taxHeads) { + if (taxHead[taxHeadCodeField] == "PT_TAX") { + applicablePropertyTax += taxHead[taxField] + } else if (taxHead[taxHeadCodeField] == "PT_UNIT_USAGE_EXEMPTION") { + applicablePropertyTax -= taxHead[taxField] + } else if (taxHead[taxHeadCodeField] == "PT_OWNER_EXEMPTION") { + applicablePropertyTax -= taxHead[taxField] + } + } + + return round(applicablePropertyTax * (firecess_percent / 100), 2); +} + +async function findDemandForConsumerCode(consumerCode, tenantId, service, RequestInfo) { + let demandSearchResponse = await request.post({ + url: PT_DEMAND_HOST + "/billing-service/demand/_search?tenantId=" + tenantId + + "&consumerCode=" + consumerCode + "&businessService=" + service, + body: { + RequestInfo + }, + json: true + }) + + return demandSearchResponse; +} + +async function updateDemand(demands, RequestInfo) { + let demandUpdateResponse = await request.post({ + url: PT_DEMAND_HOST + "/billing-service/demand/_update", + body: { + RequestInfo, + "Demands": demands + }, + json: true + }) + + return demandUpdateResponse; +} + +function _estimateTaxProcessor(request, response) { + let index = 0; + for (let calc of request["CalculationCriteria"]) { + let fireCessPercentage = getFireCessPercentage(calc["property"]["propertyDetails"][0]) + + let updateFirecessAmount = calculateNewFireCess(response["Calculation"][0]["taxHeadEstimates"], fireCessPercentage.firecess, "estimateAmount", "taxHeadCode") + let taxes = getUpdateTaxSummary(response["Calculation"][index], updateFirecessAmount, "taxHeadCode", "estimateAmount") + + response["Calculation"][index]["totalAmount"] = taxes.totalAmount + response["Calculation"][index]["taxAmount"] = round(taxes.taxAmount, 2) + response["Calculation"][index]["rebate"] = taxes.rebate + + index++ + } + + return response; +} + +function getUpdateTaxSummary(calculation, newTaxAmount, taxHeadCodeField, taxAmountField) { + let ceilingTaxHead = null; + let firecessTaxHead = null; + + let taxAmount = 0, + penalty = 0, + rebate = 0, + exemption = 0 + let taxHeads = calculation["taxHeadEstimates"] + for (taxHead of taxHeads) { + if (taxHead[taxHeadCodeField] == "PT_FIRE_CESS") { + let existingTaxAmount = taxHead[taxAmountField] + taxHead[taxAmountField] = newTaxAmount + firecessTaxHead = taxHead + taxAmount += newTaxAmount + if (DEBUG_MODE) { + taxHead.oldEstimateAmount = existingTaxAmount + } + } else { + switch (taxHead[taxHeadCodeField]) { + case "PT_DECIMAL_CEILING_CREDIT": + case "PT_DECIMAL_CEILING_DEBIT": + ceilingTaxHead = taxHead + break + case "PT_ADVANCE_CARRYFORWARD": + exemption += taxHead[taxAmountField] + break + default: + switch (taxHead.category) { + case "PENALTY": + penalty += taxHead[taxAmountField] + break + case "TAX": + taxAmount += taxHead[taxAmountField] + break + case "REBATE": + rebate += taxHead[taxAmountField] + break + case "EXEMPTION": + exemption += taxHead[taxAmountField] + break + default: + console.log("Going to default for taxHead", taxHead) + taxAmount += taxHead[taxAmountField] + } + + } + } + } + + taxAmount = round(taxAmount, 2) + penalty = round(penalty, 2) + exemption = round(exemption, 2) + rebate = round(rebate, 2) + + let totalAmount = taxAmount + penalty - rebate - exemption + + totalAmount = round(totalAmount, 2) + let fractionAmount = totalAmount - Math.trunc(totalAmount) + let newCeilingTax = false + + if (ceilingTaxHead == null && fractionAmount == 0) { + + } else { + let ceilingDelta = 0.0; + + if (ceilingTaxHead == null) { + ceilingTaxHead = { + taxHeadCode: "", + estimateAmount: 0, + category: null + } + newCeilingTax = true + taxHeads.push(ceilingTaxHead) + } + + if (fractionAmount < 0.5) { + ceilingDelta = parseFloat(fractionAmount.toFixed(2)) + totalAmount = Math.trunc(totalAmount) + ceilingTaxHead[taxHeadCodeField] = "PT_DECIMAL_CEILING_DEBIT" + ceilingTaxHead[taxAmountField] = ceilingDelta + rebate += ceilingDelta + } else { + ceilingDelta = parseFloat((1 - fractionAmount).toFixed(2)) + + totalAmount = Math.trunc(totalAmount) + 1 + ceilingTaxHead[taxHeadCodeField] = "PT_DECIMAL_CEILING_CREDIT" + ceilingTaxHead[taxAmountField] = ceilingDelta + taxAmount += ceilingDelta + } + } + + return { + taxHeads, + rebate, + totalAmount, + taxAmount, + newCeilingTax, + ceilingTaxHead, + firecessTaxHead + } +} + +async function _createAndUpdateTaxProcessor(request, response) { + let index = 0 + for (reqProperty of request["Properties"]) { + + let resProperty = response["Properties"][index] + let propertyId = resProperty["propertyId"] + + let assessmentNumber = resProperty["propertyDetails"][0]["assessmentNumber"] + + let consumerCode = propertyId + ":" + assessmentNumber + let service = "PT" + let tenantId = reqProperty["tenantId"] + + let demandSearchResponse = await findDemandForConsumerCode(consumerCode, tenantId, service, request["RequestInfo"]) + + let fireCessPercentage = getFireCessPercentage(reqProperty["propertyDetails"][0]) + + if (DEBUG_MODE) { + demandSearchResponse["Demands"][0]["firecess"] = fireCessPercentage + } + let calc = response["Properties"][index]["propertyDetails"][0]["calculation"] + let updateFirecessTax = calculateNewFireCess(calc["taxHeadEstimates"], fireCessPercentage.firecess, "estimateAmount", "taxHeadCode") + + let taxes = getUpdateTaxSummary(calc, + updateFirecessTax, "taxHeadCode", "estimateAmount") + + if (taxes.newCeilingTax) { + let firstDemand = demandSearchResponse["Demands"][0]["demandDetails"][0] + let newDemand = { + id: null, + demandId: firstDemand["demandId"], + taxHeadMasterCode: taxes.ceilingTaxHead.taxHeadCode, + taxAmount: taxes.ceilingTaxHead.estimateAmount, + tenantId: firstDemand["tenantId"], + collectionAmount: 0 + } + demandSearchResponse["Demands"][0]["demandDetails"].push(newDemand) + } + + for (demandDetail of demandSearchResponse["Demands"][0]["demandDetails"]) { + if (demandDetail.taxHeadMasterCode == "PT_FIRE_CESS") { + demandDetail.taxAmount = taxes.firecessTaxHead.estimateAmount + } + if (demandDetail.taxHeadMasterCode == "PT_DECIMAL_CEILING_DEBIT" || demandDetail.taxHeadMasterCode == "PT_DECIMAL_CEILING_DEBIT") { + demandDetail.taxHeadMasterCode = taxes.ceilingTaxHead.taxHeadCode + demandDetail.taxAmount = taxes.ceilingTaxHead.estimateAmount + } + } + + let demandUpdateResponse = await updateDemand(demandSearchResponse["Demands"], request["RequestInfo"]) + + // let updateTaxHeads = [] + + // for (taxHead of demandSearchResponse["Demands"]) { + // updateTaxHeads.push({ + // taxHeadCode: taxHead.taxHeadMasterCode, + // estimateAmount: taxHead.taxtAmount, + // category: taxHead.category + // }) + // } + + calc["totalAmount"] = taxes.totalAmount + calc["taxAmount"] = taxes.taxAmount + calc["rebate"] = taxes.rebate + // calc["taxHeadEstimates"] = updateTaxHeads + index++ + } + + return response +} + +async function _createAndUpdateRequestHandler(req, res) { + let { + request, + response + } = getRequestResponse(req) + + let tenantId = request["Properties"][0]["tenantId"] + + let fireCessConfig = await getFireCessConfig(tenantId) + if (fireCessConfig && fireCessConfig.dynamicFirecess && fireCessConfig.dynamicFirecess == true) { + let updatedResponse = await _createAndUpdateTaxProcessor(request, response) + res.json(updatedResponse); + } else { + res.json(response) + } +} + +function getRequestResponse(req) { + let request, response + + if (typeof req.body.request === "string") { + request = JSON.parse(req.body.request) + response = JSON.parse(req.body.response) + } else { + request = req.body.request + response = req.body.response + } + return { + request, + response + } +} + +router.post('/protected/punjab-pt/property/_create', asyncMiddleware(_createAndUpdateRequestHandler)) + +router.post('/protected/punjab-pt/property/_update', asyncMiddleware(_createAndUpdateRequestHandler)) + +router.post('/protected/punjab-pt/pt-calculator-v2/_estimate', asyncMiddleware(async function (req, res) { + + let { + request, + response + } = getRequestResponse(req) + + let tenantId = request["CalculationCriteria"][0]["tenantId"] + + let fireCessConfig = await getFireCessConfig(tenantId) + + if (fireCessConfig && fireCessConfig.dynamicFirecess && fireCessConfig.dynamicFirecess == true) { + let updatedResponse = _estimateTaxProcessor(request, response) + res.json(updatedResponse); + } else { + res.json(response); + } +})) + +app.listen(8000, () => { + console.log("Listening on port 8000") +}); + +// TODO: +// Add total amount to calculations "totalAmount": 460, +// "taxAmount": 510, \ No newline at end of file diff --git a/services/rainmaker-custom-service/package.json b/services/rainmaker-custom-service/package.json new file mode 100644 index 00000000..f49122be --- /dev/null +++ b/services/rainmaker-custom-service/package.json @@ -0,0 +1,22 @@ +{ + "name": "nodeservice", + "version": "1.0.0", + "main": "index.js", + "license": "MIT", + "dependencies": { + "bluebird": "^3.5.1", + "cryptr": "^4.0.0", + "excel4node": "^1.5.0", + "express": "^4.16.3", + "express-slash": "^2.0.1", + "jsonwebtoken": "^8.4.0", + "mustache-express": "^1.2.7", + "nodemon": "^1.18.4", + "pg-promise": "^8.4.5", + "request": "^2.88.0", + "request-promise": "^4.2.2" + }, + "scripts": { + "debug": "nodemon --inspect index.js" + } +} diff --git a/services/rainmaker-custom-service/static/css/bnd.css b/services/rainmaker-custom-service/static/css/bnd.css new file mode 100644 index 00000000..d19b007b --- /dev/null +++ b/services/rainmaker-custom-service/static/css/bnd.css @@ -0,0 +1,137 @@ +body { + height: 100%; + padding: 0px; + margin: 0px; + background: #333; + font-family: 'Roboto', sans-serif !important; + font-size: 1em; + } + h1 { + font-family: 'Roboto', sans-serif; + font-size: 30px; + color: #999; + font-weight: 300; + margin-bottom: 55px; + margin-top: 45px; + text-transform: uppercase; + } + h1 small { + display: block; + font-size: 18px; + text-transform: none; + letter-spacing: 1.5px; + margin-top: 12px; + } + .row { + max-width: 950px; + margin: 0 auto; + } + .btn { + white-space: normal; + } + .button-wrap { + position: relative; + text-align: center; + } + .button-wrap .btn { + font-family: 'Roboto', sans-serif; + box-shadow: 0 0 15px 5px rgba(0, 0, 0, 0.5); + border-radius: 0px; + border-color: #222; + cursor: pointer; + text-transform: uppercase; + font-size: 1.1em; + font-weight: 400; + letter-spacing: 1px; + } + .button-wrap .btn small { + font-size: 0.8rem; + letter-spacing: normal; + text-transform: none; + } + /** SPINNER CREATION **/ + .loader { + position: relative; + text-align: center; + margin: 15px auto 35px auto; + z-index: 9999; + display: block; + width: 80px; + height: 80px; + border: 10px solid rgba(0, 0, 0, 0.3); + border-radius: 50%; + border-top-color: #000; + animation: spin 1s ease-in-out infinite; + -webkit-animation: spin 1s ease-in-out infinite; + } + @keyframes spin { + to { + -webkit-transform: rotate(360deg); + } + } + @-webkit-keyframes spin { + to { + -webkit-transform: rotate(360deg); + } + } + /** MODAL STYLING **/ + .modal-content { + border-radius: 0px; + box-shadow: 0 0 20px 8px rgba(0, 0, 0, 0.7); + } + .modal-backdrop.show { + opacity: 0.75; + } + .loader-txt p { + font-size: 13px; + color: #666; + } + .loader-txt p small { + font-size: 11.5px; + color: #999; + } + + html, +body { + height: 100%; +} + +body { + display: -ms-flexbox; + display: flex; + -ms-flex-align: center; + align-items: center; + padding-top: 40px; + padding-bottom: 40px; + background-color: #f5f5f5; +} + +.form-signin { + width: 100%; + max-width: 530px; + padding: 15px; + margin: auto; +} +.form-signin .checkbox { + font-weight: 400; +} +.form-signin .form-control { + position: relative; + box-sizing: border-box; + height: auto; + padding: 10px; + font-size: 16px; +} +.form-signin .form-control:focus { + z-index: 2; +} +.form-signin input[type="email"] { + margin-bottom: -1px; + border-bottom-right-radius: 0; + border-bottom-left-radius: 0; +} +.form-signin input[type="password"] { + margin-bottom: 10px; + border-top-left-radius: 0; + border-top-right-radius: 0; +} \ No newline at end of file diff --git a/services/rainmaker-custom-service/static/js/bnd.js b/services/rainmaker-custom-service/static/js/bnd.js new file mode 100644 index 00000000..4cbfa5d6 --- /dev/null +++ b/services/rainmaker-custom-service/static/js/bnd.js @@ -0,0 +1,128 @@ +$(document).ready(() => { + $("#linkAccount").on('click', linkAccount) + if (getAuthToken() !== null) { + let params = (new URL(document.location)).searchParams; + if (params.get("unlink") !== null) + { + unlinkAccount(); + } else { + setTimeout(loginToBND, 10); + } + } else { + $("#msg").html("You need to be logged in to access this page") + $("#form").hide() + } +}); + +function unlinkAccount() { + axios({ + url: location.pathname.replace("/open/", "/protected/") + "/unlinkAccount", + method: 'POST', + json: true, // important + headers: { + 'Accept': 'application/json' + }, + data: { + RequestInfo: { + "authToken": getAuthToken(), + } + } + }).then((response) => { + window.location.assign(window.location.href.replace("unlink", "")) + }); +} + +function linkAccount() { + username = $("#username").val(); + password = $("#password").val() + + axios({ + url: location.pathname.replace("/open/", "/protected/") + "/linkAccount", + method: 'POST', + json: true, // important + headers: { + 'Accept': 'application/json' + }, + data: { + username: username, + password: password, + RequestInfo: { + "authToken": getAuthToken(), + } + } + }).then((response) => { + let res = response.data; + if (res && res.code && res.code == "SUCCESS" && res.redirect) { + var urlInfo = decodeURI(window.location.href).split('?'); + var path = urlInfo[0]; + $("#msg").html("The application has been opened in new window. If you want to unlink your account click here") + window.open(res.redirect,"bnd", "", true) + } else { + $("#msg").text(res.message).css("color", "red"); + } + }); +} + +function getAuthToken() { + var access_token = localStorage.getItem("token"); + return access_token; +} + +function loginToBND() { + showLoader() + try { + axios({ + url: location.href.replace("/open/", "/protected/"), + method: 'POST', + json: true, // important + headers: { + 'Accept': 'application/json' + }, + data: { + RequestInfo: { + "authToken": getAuthToken() + } + } + }).then((response) => { + hideLoader() + switch (response.data.code) { + case "NO_CREDENTIAL_MAPPING": + $('#msg').text("Please enter your eSewa Health application Username & Password to link your account") + $('#inputEmail').val(response.data.username || "") + $("#form").show() + break + case "INVALID_CREDENTIALS": + $('#msg').text(response.data.message) + $('#inputEmail').val(response.data.username || "") + $("#form").show() + break + case "SUCCESS": + $("#msg").html("The application has been opened in new window. If you want to unlink your account click here") + window.open(response.data.redirect,"bnd", "", true) + break; + default: + $('#msg').text(response.data.message || "Some error occcured while processing your request") + break + } + }).catch((err) => { + hideLoader(); + }); + } catch (ex) { + hideLoader() + } +} + +function showLoader() { + $("#loadMe").modal({ + backdrop: "static", //remove ability to close modal with click + keyboard: false, //remove option to close with keyboard + show: true //Display loader! + }); +} + +function hideLoader() { + $("#loadMe").modal("hide") + $('#loadMe').on('shown.bs.modal', function (e) { + $("#loadMe").modal('hide'); + }) +} \ No newline at end of file diff --git a/services/rainmaker-custom-service/templates/apicall.html b/services/rainmaker-custom-service/templates/apicall.html new file mode 100644 index 00000000..f6382bba --- /dev/null +++ b/services/rainmaker-custom-service/templates/apicall.html @@ -0,0 +1,45 @@ +{{>common/header}} +
No report available for your user type
+ +{{>common/body}} \ No newline at end of file diff --git a/services/rainmaker-custom-service/templates/bndlogin.html b/services/rainmaker-custom-service/templates/bndlogin.html new file mode 100644 index 00000000..e7290ac1 --- /dev/null +++ b/services/rainmaker-custom-service/templates/bndlogin.html @@ -0,0 +1,32 @@ +{{>common/header}} + + + +{{>common/scripts}} + + +{{>common/footer}} \ No newline at end of file diff --git a/services/rainmaker-custom-service/templates/common/footer.html b/services/rainmaker-custom-service/templates/common/footer.html new file mode 100644 index 00000000..1fd5f4f2 --- /dev/null +++ b/services/rainmaker-custom-service/templates/common/footer.html @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/services/rainmaker-custom-service/templates/common/header.html b/services/rainmaker-custom-service/templates/common/header.html new file mode 100644 index 00000000..63d94260 --- /dev/null +++ b/services/rainmaker-custom-service/templates/common/header.html @@ -0,0 +1,13 @@ + + + + + + + + + + + eGov Extension + + \ No newline at end of file diff --git a/services/rainmaker-custom-service/templates/common/scripts.html b/services/rainmaker-custom-service/templates/common/scripts.html new file mode 100644 index 00000000..9f6c78bb --- /dev/null +++ b/services/rainmaker-custom-service/templates/common/scripts.html @@ -0,0 +1,4 @@ + + + + diff --git a/services/rainmaker-custom-service/utils/asyncMiddleware.js b/services/rainmaker-custom-service/utils/asyncMiddleware.js new file mode 100644 index 00000000..e261ae12 --- /dev/null +++ b/services/rainmaker-custom-service/utils/asyncMiddleware.js @@ -0,0 +1,9 @@ +const asyncMiddleware = fn => + (req, res, next) => { + Promise.resolve(fn(req, res, next)) + .catch(next); + }; + +module.exports = { + asyncMiddleware +} \ No newline at end of file diff --git a/services/rainmaker-custom-service/yarn.lock b/services/rainmaker-custom-service/yarn.lock new file mode 100644 index 00000000..6abd99f7 --- /dev/null +++ b/services/rainmaker-custom-service/yarn.lock @@ -0,0 +1,2297 @@ +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + + +abbrev@1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" + +accepts@~1.3.5: + version "1.3.5" + resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.5.tgz#eb777df6011723a3b14e8a72c0805c8e86746bd2" + dependencies: + mime-types "~2.1.18" + negotiator "0.6.1" + +ajv@^6.5.5: + version "6.6.2" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.6.2.tgz#caceccf474bf3fc3ce3b147443711a24063cc30d" + dependencies: + fast-deep-equal "^2.0.1" + fast-json-stable-stringify "^2.0.0" + json-schema-traverse "^0.4.1" + uri-js "^4.2.2" + +ansi-align@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-2.0.0.tgz#c36aeccba563b89ceb556f3690f0b1d9e3547f7f" + dependencies: + string-width "^2.0.0" + +ansi-regex@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" + +ansi-regex@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" + +ansi-styles@^3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" + dependencies: + color-convert "^1.9.0" + +anymatch@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb" + dependencies: + micromatch "^3.1.4" + normalize-path "^2.1.1" + +aproba@^1.0.3: + version "1.2.0" + resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" + +are-we-there-yet@~1.1.2: + version "1.1.5" + resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21" + dependencies: + delegates "^1.0.0" + readable-stream "^2.0.6" + +arr-diff@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520" + +arr-flatten@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1" + +arr-union@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4" + +array-flatten@1.1.1: + version "1.1.1" + resolved "http://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" + +array-unique@^0.3.2: + version "0.3.2" + resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" + +asn1@~0.2.3: + version "0.2.4" + resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136" + dependencies: + safer-buffer "~2.1.0" + +assert-plus@1.0.0, assert-plus@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" + +assign-symbols@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367" + +async-each@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d" + +async@~2.6.0: + version "2.6.1" + resolved "https://registry.yarnpkg.com/async/-/async-2.6.1.tgz#b245a23ca71930044ec53fa46aa00a3e87c6a610" + dependencies: + lodash "^4.17.10" + +asynckit@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" + +atob@^2.1.1: + version "2.1.2" + resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" + +aws-sign2@~0.7.0: + version "0.7.0" + resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8" + +aws4@^1.8.0: + version "1.8.0" + resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f" + +balanced-match@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" + +base@^0.11.1: + version "0.11.2" + resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f" + dependencies: + cache-base "^1.0.1" + class-utils "^0.3.5" + component-emitter "^1.2.1" + define-property "^1.0.0" + isobject "^3.0.1" + mixin-deep "^1.2.0" + pascalcase "^0.1.1" + +bcrypt-pbkdf@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e" + dependencies: + tweetnacl "^0.14.3" + +binary-extensions@^1.0.0: + version "1.12.0" + resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.12.0.tgz#c2d780f53d45bba8317a8902d4ceeaf3a6385b14" + +bluebird@^3.5.0, bluebird@^3.5.1: + version "3.5.3" + resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.3.tgz#7d01c6f9616c9a51ab0f8c549a79dfe6ec33efa7" + +body-parser@1.18.3: + version "1.18.3" + resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.18.3.tgz#5b292198ffdd553b3a0f20ded0592b956955c8b4" + dependencies: + bytes "3.0.0" + content-type "~1.0.4" + debug "2.6.9" + depd "~1.1.2" + http-errors "~1.6.3" + iconv-lite "0.4.23" + on-finished "~2.3.0" + qs "6.5.2" + raw-body "2.3.3" + type-is "~1.6.16" + +boxen@^1.2.1: + version "1.3.0" + resolved "https://registry.yarnpkg.com/boxen/-/boxen-1.3.0.tgz#55c6c39a8ba58d9c61ad22cd877532deb665a20b" + dependencies: + ansi-align "^2.0.0" + camelcase "^4.0.0" + chalk "^2.0.1" + cli-boxes "^1.0.0" + string-width "^2.0.0" + term-size "^1.2.0" + widest-line "^2.0.0" + +brace-expansion@^1.1.7: + version "1.1.11" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" + dependencies: + balanced-match "^1.0.0" + concat-map "0.0.1" + +braces@^2.3.0, braces@^2.3.1: + version "2.3.2" + resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729" + dependencies: + arr-flatten "^1.1.0" + array-unique "^0.3.2" + extend-shallow "^2.0.1" + fill-range "^4.0.0" + isobject "^3.0.1" + repeat-element "^1.1.2" + snapdragon "^0.8.1" + snapdragon-node "^2.0.1" + split-string "^3.0.2" + to-regex "^3.0.1" + +buffer-equal-constant-time@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz#f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819" + +buffer-writer@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/buffer-writer/-/buffer-writer-2.0.0.tgz#ce7eb81a38f7829db09c873f2fbb792c0c98ec04" + +bytes@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048" + +cache-base@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2" + dependencies: + collection-visit "^1.0.0" + component-emitter "^1.2.1" + get-value "^2.0.6" + has-value "^1.0.0" + isobject "^3.0.1" + set-value "^2.0.0" + to-object-path "^0.3.0" + union-value "^1.0.0" + unset-value "^1.0.0" + +camelcase@^4.0.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd" + +capture-stack-trace@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz#a6c0bbe1f38f3aa0b92238ecb6ff42c344d4135d" + +caseless@~0.12.0: + version "0.12.0" + resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" + +chalk@^2.0.1: + version "2.4.1" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e" + dependencies: + ansi-styles "^3.2.1" + escape-string-regexp "^1.0.5" + supports-color "^5.3.0" + +chokidar@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.4.tgz#356ff4e2b0e8e43e322d18a372460bbcf3accd26" + dependencies: + anymatch "^2.0.0" + async-each "^1.0.0" + braces "^2.3.0" + glob-parent "^3.1.0" + inherits "^2.0.1" + is-binary-path "^1.0.0" + is-glob "^4.0.0" + lodash.debounce "^4.0.8" + normalize-path "^2.1.1" + path-is-absolute "^1.0.0" + readdirp "^2.0.0" + upath "^1.0.5" + optionalDependencies: + fsevents "^1.2.2" + +chownr@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.1.tgz#54726b8b8fff4df053c42187e801fb4412df1494" + +ci-info@^1.5.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.6.0.tgz#2ca20dbb9ceb32d4524a683303313f0304b1e497" + +class-utils@^0.3.5: + version "0.3.6" + resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463" + dependencies: + arr-union "^3.1.0" + define-property "^0.2.5" + isobject "^3.0.0" + static-extend "^0.1.1" + +cli-boxes@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-1.0.0.tgz#4fa917c3e59c94a004cd61f8ee509da651687143" + +code-point-at@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" + +collection-visit@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0" + dependencies: + map-visit "^1.0.0" + object-visit "^1.0.0" + +color-convert@^1.9.0: + version "1.9.3" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" + dependencies: + color-name "1.1.3" + +color-name@1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" + +combined-stream@^1.0.6, combined-stream@~1.0.6: + version "1.0.7" + resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.7.tgz#2d1d24317afb8abe95d6d2c0b07b57813539d828" + dependencies: + delayed-stream "~1.0.0" + +component-emitter@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6" + +concat-map@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" + +configstore@^3.0.0: + version "3.1.2" + resolved "https://registry.yarnpkg.com/configstore/-/configstore-3.1.2.tgz#c6f25defaeef26df12dd33414b001fe81a543f8f" + dependencies: + dot-prop "^4.1.0" + graceful-fs "^4.1.2" + make-dir "^1.0.0" + unique-string "^1.0.0" + write-file-atomic "^2.0.0" + xdg-basedir "^3.0.0" + +console-control-strings@^1.0.0, console-control-strings@~1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" + +content-disposition@0.5.2: + version "0.5.2" + resolved "http://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz#0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4" + +content-type@~1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b" + +cookie-signature@1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" + +cookie@0.3.1: + version "0.3.1" + resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb" + +copy-descriptor@^0.1.0: + version "0.1.1" + resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" + +core-js@~2.3.0: + version "2.3.0" + resolved "http://registry.npmjs.org/core-js/-/core-js-2.3.0.tgz#fab83fbb0b2d8dc85fa636c4b9d34c75420c6d65" + +core-util-is@1.0.2, core-util-is@~1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" + +create-error-class@^3.0.0: + version "3.0.2" + resolved "https://registry.yarnpkg.com/create-error-class/-/create-error-class-3.0.2.tgz#06be7abef947a3f14a30fd610671d401bca8b7b6" + dependencies: + capture-stack-trace "^1.0.0" + +cross-spawn@^5.0.1: + version "5.1.0" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449" + dependencies: + lru-cache "^4.0.1" + shebang-command "^1.2.0" + which "^1.2.9" + +crypto-random-string@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-1.0.0.tgz#a230f64f568310e1498009940790ec99545bca7e" + +cryptr@^4.0.0: + version "4.0.2" + resolved "https://registry.yarnpkg.com/cryptr/-/cryptr-4.0.2.tgz#8a93b5ca7667d1a6131e396bab23a134ff1f5dc6" + +dashdash@^1.12.0: + version "1.14.1" + resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0" + dependencies: + assert-plus "^1.0.0" + +debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3: + version "2.6.9" + resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" + dependencies: + ms "2.0.0" + +debug@^3.1.0: + version "3.2.6" + resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b" + dependencies: + ms "^2.1.1" + +decode-uri-component@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545" + +deep-extend@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" + +deepmerge@2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-2.1.1.tgz#e862b4e45ea0555072bf51e7fd0d9845170ae768" + +define-property@^0.2.5: + version "0.2.5" + resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116" + dependencies: + is-descriptor "^0.1.0" + +define-property@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6" + dependencies: + is-descriptor "^1.0.0" + +define-property@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d" + dependencies: + is-descriptor "^1.0.2" + isobject "^3.0.1" + +delayed-stream@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" + +delegates@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" + +depd@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" + +destroy@~1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80" + +detect-libc@^1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" + +dot-prop@^4.1.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.0.tgz#1f19e0c2e1aa0e32797c49799f2837ac6af69c57" + dependencies: + is-obj "^1.0.0" + +duplexer3@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2" + +ecc-jsbn@~0.1.1: + version "0.1.2" + resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9" + dependencies: + jsbn "~0.1.0" + safer-buffer "^2.1.0" + +ecdsa-sig-formatter@1.0.10: + version "1.0.10" + resolved "https://registry.yarnpkg.com/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.10.tgz#1c595000f04a8897dfb85000892a0f4c33af86c3" + dependencies: + safe-buffer "^5.0.1" + +ee-first@1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" + +encodeurl@~1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" + +es6-promise@~3.0.2: + version "3.0.2" + resolved "http://registry.npmjs.org/es6-promise/-/es6-promise-3.0.2.tgz#010d5858423a5f118979665f46486a95c6ee2bb6" + +escape-html@~1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" + +escape-string-regexp@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" + +etag@~1.8.1: + version "1.8.1" + resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" + +excel4node@^1.5.0: + version "1.7.0" + resolved "https://registry.yarnpkg.com/excel4node/-/excel4node-1.7.0.tgz#e7f8a797284832d86dda8713745323cd2302d9d2" + dependencies: + deepmerge "2.1.1" + image-size "0.6.3" + jszip "3.1.5" + lodash.get "4.4.2" + lodash.isequal "4.5.0" + lodash.isundefined "3.0.1" + lodash.reduce "4.6.0" + lodash.uniqueid "4.0.1" + mime "2.3.1" + uuid "3.3.2" + xmlbuilder "10.0.0" + +execa@^0.7.0: + version "0.7.0" + resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777" + dependencies: + cross-spawn "^5.0.1" + get-stream "^3.0.0" + is-stream "^1.1.0" + npm-run-path "^2.0.0" + p-finally "^1.0.0" + signal-exit "^3.0.0" + strip-eof "^1.0.0" + +expand-brackets@^2.1.4: + version "2.1.4" + resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622" + dependencies: + debug "^2.3.3" + define-property "^0.2.5" + extend-shallow "^2.0.1" + posix-character-classes "^0.1.0" + regex-not "^1.0.0" + snapdragon "^0.8.1" + to-regex "^3.0.1" + +express-slash@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/express-slash/-/express-slash-2.0.1.tgz#76eb869fed8f71ae4f98785cbe00bf1bb454d627" + +express@^4.16.3: + version "4.16.4" + resolved "https://registry.yarnpkg.com/express/-/express-4.16.4.tgz#fddef61926109e24c515ea97fd2f1bdbf62df12e" + dependencies: + accepts "~1.3.5" + array-flatten "1.1.1" + body-parser "1.18.3" + content-disposition "0.5.2" + content-type "~1.0.4" + cookie "0.3.1" + cookie-signature "1.0.6" + debug "2.6.9" + depd "~1.1.2" + encodeurl "~1.0.2" + escape-html "~1.0.3" + etag "~1.8.1" + finalhandler "1.1.1" + fresh "0.5.2" + merge-descriptors "1.0.1" + methods "~1.1.2" + on-finished "~2.3.0" + parseurl "~1.3.2" + path-to-regexp "0.1.7" + proxy-addr "~2.0.4" + qs "6.5.2" + range-parser "~1.2.0" + safe-buffer "5.1.2" + send "0.16.2" + serve-static "1.13.2" + setprototypeof "1.1.0" + statuses "~1.4.0" + type-is "~1.6.16" + utils-merge "1.0.1" + vary "~1.1.2" + +extend-shallow@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f" + dependencies: + is-extendable "^0.1.0" + +extend-shallow@^3.0.0, extend-shallow@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8" + dependencies: + assign-symbols "^1.0.0" + is-extendable "^1.0.1" + +extend@~3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" + +extglob@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543" + dependencies: + array-unique "^0.3.2" + define-property "^1.0.0" + expand-brackets "^2.1.4" + extend-shallow "^2.0.1" + fragment-cache "^0.2.1" + regex-not "^1.0.0" + snapdragon "^0.8.1" + to-regex "^3.0.1" + +extsprintf@1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05" + +extsprintf@^1.2.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f" + +fast-deep-equal@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49" + +fast-json-stable-stringify@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2" + +fill-range@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7" + dependencies: + extend-shallow "^2.0.1" + is-number "^3.0.0" + repeat-string "^1.6.1" + to-regex-range "^2.1.0" + +finalhandler@1.1.1: + version "1.1.1" + resolved "http://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz#eebf4ed840079c83f4249038c9d703008301b105" + dependencies: + debug "2.6.9" + encodeurl "~1.0.2" + escape-html "~1.0.3" + on-finished "~2.3.0" + parseurl "~1.3.2" + statuses "~1.4.0" + unpipe "~1.0.0" + +for-in@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" + +forever-agent@~0.6.1: + version "0.6.1" + resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" + +form-data@~2.3.2: + version "2.3.3" + resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6" + dependencies: + asynckit "^0.4.0" + combined-stream "^1.0.6" + mime-types "^2.1.12" + +forwarded@~0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84" + +fragment-cache@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19" + dependencies: + map-cache "^0.2.2" + +fresh@0.5.2: + version "0.5.2" + resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" + +fs-minipass@^1.2.5: + version "1.2.5" + resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.5.tgz#06c277218454ec288df77ada54a03b8702aacb9d" + dependencies: + minipass "^2.2.1" + +fs.realpath@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" + +fsevents@^1.2.2: + version "1.2.4" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.4.tgz#f41dcb1af2582af3692da36fc55cbd8e1041c426" + dependencies: + nan "^2.9.2" + node-pre-gyp "^0.10.0" + +gauge@~2.7.3: + version "2.7.4" + resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7" + dependencies: + aproba "^1.0.3" + console-control-strings "^1.0.0" + has-unicode "^2.0.0" + object-assign "^4.1.0" + signal-exit "^3.0.0" + string-width "^1.0.1" + strip-ansi "^3.0.1" + wide-align "^1.1.0" + +get-stream@^3.0.0: + version "3.0.0" + resolved "http://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14" + +get-value@^2.0.3, get-value@^2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28" + +getpass@^0.1.1: + version "0.1.7" + resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa" + dependencies: + assert-plus "^1.0.0" + +glob-parent@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae" + dependencies: + is-glob "^3.1.0" + path-dirname "^1.0.0" + +glob@^7.0.5: + version "7.1.3" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1" + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.0.4" + once "^1.3.0" + path-is-absolute "^1.0.0" + +global-dirs@^0.1.0: + version "0.1.1" + resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-0.1.1.tgz#b319c0dd4607f353f3be9cca4c72fc148c49f445" + dependencies: + ini "^1.3.4" + +got@^6.7.1: + version "6.7.1" + resolved "http://registry.npmjs.org/got/-/got-6.7.1.tgz#240cd05785a9a18e561dc1b44b41c763ef1e8db0" + dependencies: + create-error-class "^3.0.0" + duplexer3 "^0.1.4" + get-stream "^3.0.0" + is-redirect "^1.0.0" + is-retry-allowed "^1.0.0" + is-stream "^1.0.0" + lowercase-keys "^1.0.0" + safe-buffer "^5.0.1" + timed-out "^4.0.0" + unzip-response "^2.0.1" + url-parse-lax "^1.0.0" + +graceful-fs@^4.1.11, graceful-fs@^4.1.2: + version "4.1.15" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00" + +har-schema@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92" + +har-validator@~5.1.0: + version "5.1.3" + resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz#1ef89ebd3e4996557675eed9893110dc350fa080" + dependencies: + ajv "^6.5.5" + har-schema "^2.0.0" + +has-flag@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" + +has-unicode@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" + +has-value@^0.3.1: + version "0.3.1" + resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f" + dependencies: + get-value "^2.0.3" + has-values "^0.1.4" + isobject "^2.0.0" + +has-value@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177" + dependencies: + get-value "^2.0.6" + has-values "^1.0.0" + isobject "^3.0.0" + +has-values@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771" + +has-values@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f" + dependencies: + is-number "^3.0.0" + kind-of "^4.0.0" + +http-errors@1.6.3, http-errors@~1.6.2, http-errors@~1.6.3: + version "1.6.3" + resolved "http://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d" + dependencies: + depd "~1.1.2" + inherits "2.0.3" + setprototypeof "1.1.0" + statuses ">= 1.4.0 < 2" + +http-signature@~1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1" + dependencies: + assert-plus "^1.0.0" + jsprim "^1.2.2" + sshpk "^1.7.0" + +iconv-lite@0.4.23: + version "0.4.23" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63" + dependencies: + safer-buffer ">= 2.1.2 < 3" + +iconv-lite@^0.4.4: + version "0.4.24" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" + dependencies: + safer-buffer ">= 2.1.2 < 3" + +ignore-by-default@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/ignore-by-default/-/ignore-by-default-1.0.1.tgz#48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09" + +ignore-walk@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.1.tgz#a83e62e7d272ac0e3b551aaa82831a19b69f82f8" + dependencies: + minimatch "^3.0.4" + +image-size@0.6.3: + version "0.6.3" + resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.6.3.tgz#e7e5c65bb534bd7cdcedd6cb5166272a85f75fb2" + +immediate@~3.0.5: + version "3.0.6" + resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b" + +import-lazy@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43" + +imurmurhash@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" + +inflight@^1.0.4: + version "1.0.6" + resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" + dependencies: + once "^1.3.0" + wrappy "1" + +inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@~2.0.1, inherits@~2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" + +ini@^1.3.4, ini@~1.3.0: + version "1.3.5" + resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" + +ipaddr.js@1.8.0: + version "1.8.0" + resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.8.0.tgz#eaa33d6ddd7ace8f7f6fe0c9ca0440e706738b1e" + +is-accessor-descriptor@^0.1.6: + version "0.1.6" + resolved "http://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6" + dependencies: + kind-of "^3.0.2" + +is-accessor-descriptor@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656" + dependencies: + kind-of "^6.0.0" + +is-binary-path@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898" + dependencies: + binary-extensions "^1.0.0" + +is-buffer@^1.1.5: + version "1.1.6" + resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" + +is-ci@^1.0.10: + version "1.2.1" + resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.2.1.tgz#e3779c8ee17fccf428488f6e281187f2e632841c" + dependencies: + ci-info "^1.5.0" + +is-data-descriptor@^0.1.4: + version "0.1.4" + resolved "http://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56" + dependencies: + kind-of "^3.0.2" + +is-data-descriptor@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7" + dependencies: + kind-of "^6.0.0" + +is-descriptor@^0.1.0: + version "0.1.6" + resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca" + dependencies: + is-accessor-descriptor "^0.1.6" + is-data-descriptor "^0.1.4" + kind-of "^5.0.0" + +is-descriptor@^1.0.0, is-descriptor@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec" + dependencies: + is-accessor-descriptor "^1.0.0" + is-data-descriptor "^1.0.0" + kind-of "^6.0.2" + +is-extendable@^0.1.0, is-extendable@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" + +is-extendable@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4" + dependencies: + is-plain-object "^2.0.4" + +is-extglob@^2.1.0, is-extglob@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" + +is-fullwidth-code-point@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb" + dependencies: + number-is-nan "^1.0.0" + +is-fullwidth-code-point@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" + +is-glob@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a" + dependencies: + is-extglob "^2.1.0" + +is-glob@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.0.tgz#9521c76845cc2610a85203ddf080a958c2ffabc0" + dependencies: + is-extglob "^2.1.1" + +is-installed-globally@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.1.0.tgz#0dfd98f5a9111716dd535dda6492f67bf3d25a80" + dependencies: + global-dirs "^0.1.0" + is-path-inside "^1.0.0" + +is-npm@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-1.0.0.tgz#f2fb63a65e4905b406c86072765a1a4dc793b9f4" + +is-number@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195" + dependencies: + kind-of "^3.0.2" + +is-obj@^1.0.0: + version "1.0.1" + resolved "http://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f" + +is-path-inside@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz#8ef5b7de50437a3fdca6b4e865ef7aa55cb48036" + dependencies: + path-is-inside "^1.0.1" + +is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" + dependencies: + isobject "^3.0.1" + +is-redirect@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-redirect/-/is-redirect-1.0.0.tgz#1d03dded53bd8db0f30c26e4f95d36fc7c87dc24" + +is-retry-allowed@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz#11a060568b67339444033d0125a61a20d564fb34" + +is-stream@^1.0.0, is-stream@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" + +is-typedarray@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" + +is-windows@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" + +isarray@1.0.0, isarray@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" + +isexe@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" + +isobject@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89" + dependencies: + isarray "1.0.0" + +isobject@^3.0.0, isobject@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" + +isstream@~0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" + +jsbn@~0.1.0: + version "0.1.1" + resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" + +json-schema-traverse@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" + +json-schema@0.2.3: + version "0.2.3" + resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13" + +json-stringify-safe@~5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" + +jsonwebtoken@^8.4.0: + version "8.4.0" + resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-8.4.0.tgz#8757f7b4cb7440d86d5e2f3becefa70536c8e46a" + dependencies: + jws "^3.1.5" + lodash.includes "^4.3.0" + lodash.isboolean "^3.0.3" + lodash.isinteger "^4.0.4" + lodash.isnumber "^3.0.3" + lodash.isplainobject "^4.0.6" + lodash.isstring "^4.0.1" + lodash.once "^4.0.0" + ms "^2.1.1" + +jsprim@^1.2.2: + version "1.4.1" + resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2" + dependencies: + assert-plus "1.0.0" + extsprintf "1.3.0" + json-schema "0.2.3" + verror "1.10.0" + +jszip@3.1.5: + version "3.1.5" + resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.1.5.tgz#e3c2a6c6d706ac6e603314036d43cd40beefdf37" + dependencies: + core-js "~2.3.0" + es6-promise "~3.0.2" + lie "~3.1.0" + pako "~1.0.2" + readable-stream "~2.0.6" + +jwa@^1.1.5: + version "1.1.6" + resolved "https://registry.yarnpkg.com/jwa/-/jwa-1.1.6.tgz#87240e76c9808dbde18783cf2264ef4929ee50e6" + dependencies: + buffer-equal-constant-time "1.0.1" + ecdsa-sig-formatter "1.0.10" + safe-buffer "^5.0.1" + +jws@^3.1.5: + version "3.1.5" + resolved "https://registry.yarnpkg.com/jws/-/jws-3.1.5.tgz#80d12d05b293d1e841e7cb8b4e69e561adcf834f" + dependencies: + jwa "^1.1.5" + safe-buffer "^5.0.1" + +kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0: + version "3.2.2" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" + dependencies: + is-buffer "^1.1.5" + +kind-of@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57" + dependencies: + is-buffer "^1.1.5" + +kind-of@^5.0.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d" + +kind-of@^6.0.0, kind-of@^6.0.2: + version "6.0.2" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051" + +latest-version@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-3.1.0.tgz#a205383fea322b33b5ae3b18abee0dc2f356ee15" + dependencies: + package-json "^4.0.0" + +lie@~3.1.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/lie/-/lie-3.1.1.tgz#9a436b2cc7746ca59de7a41fa469b3efb76bd87e" + dependencies: + immediate "~3.0.5" + +lodash.debounce@^4.0.8: + version "4.0.8" + resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" + +lodash.get@4.4.2: + version "4.4.2" + resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99" + +lodash.includes@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/lodash.includes/-/lodash.includes-4.3.0.tgz#60bb98a87cb923c68ca1e51325483314849f553f" + +lodash.isboolean@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz#6c2e171db2a257cd96802fd43b01b20d5f5870f6" + +lodash.isequal@4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0" + +lodash.isinteger@^4.0.4: + version "4.0.4" + resolved "https://registry.yarnpkg.com/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz#619c0af3d03f8b04c31f5882840b77b11cd68343" + +lodash.isnumber@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz#3ce76810c5928d03352301ac287317f11c0b1ffc" + +lodash.isplainobject@^4.0.6: + version "4.0.6" + resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb" + +lodash.isstring@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451" + +lodash.isundefined@3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/lodash.isundefined/-/lodash.isundefined-3.0.1.tgz#23ef3d9535565203a66cefd5b830f848911afb48" + +lodash.once@^4.0.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac" + +lodash.reduce@4.6.0: + version "4.6.0" + resolved "https://registry.yarnpkg.com/lodash.reduce/-/lodash.reduce-4.6.0.tgz#f1ab6b839299ad48f784abbf476596f03b914d3b" + +lodash.uniqueid@4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/lodash.uniqueid/-/lodash.uniqueid-4.0.1.tgz#3268f26a7c88e4f4b1758d679271814e31fa5b26" + +lodash@^4.13.1, lodash@^4.17.10: + version "4.17.14" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.14.tgz#9ce487ae66c96254fe20b599f21b6816028078ba" + +lowercase-keys@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f" + +lru-cache@^4.0.1, lru-cache@~4.1.3: + version "4.1.5" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd" + dependencies: + pseudomap "^1.0.2" + yallist "^2.1.2" + +make-dir@^1.0.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c" + dependencies: + pify "^3.0.0" + +manakin@0.5.2: + version "0.5.2" + resolved "https://registry.yarnpkg.com/manakin/-/manakin-0.5.2.tgz#abe3df430ca6085f6983f6e4cf5af0298f4d30cc" + +map-cache@^0.2.2: + version "0.2.2" + resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf" + +map-visit@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f" + dependencies: + object-visit "^1.0.0" + +media-typer@0.3.0: + version "0.3.0" + resolved "http://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" + +merge-descriptors@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" + +methods@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" + +micromatch@^3.1.10, micromatch@^3.1.4: + version "3.1.10" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23" + dependencies: + arr-diff "^4.0.0" + array-unique "^0.3.2" + braces "^2.3.1" + define-property "^2.0.2" + extend-shallow "^3.0.2" + extglob "^2.0.4" + fragment-cache "^0.2.1" + kind-of "^6.0.2" + nanomatch "^1.2.9" + object.pick "^1.3.0" + regex-not "^1.0.0" + snapdragon "^0.8.1" + to-regex "^3.0.2" + +mime-db@~1.37.0: + version "1.37.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.37.0.tgz#0b6a0ce6fdbe9576e25f1f2d2fde8830dc0ad0d8" + +mime-types@^2.1.12, mime-types@~2.1.18, mime-types@~2.1.19: + version "2.1.21" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.21.tgz#28995aa1ecb770742fe6ae7e58f9181c744b3f96" + dependencies: + mime-db "~1.37.0" + +mime@1.4.1: + version "1.4.1" + resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6" + +mime@2.3.1: + version "2.3.1" + resolved "http://registry.npmjs.org/mime/-/mime-2.3.1.tgz#b1621c54d63b97c47d3cfe7f7215f7d64517c369" + +minimatch@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" + dependencies: + brace-expansion "^1.1.7" + +minimist@0.0.8: + version "0.0.8" + resolved "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" + +minimist@^1.2.0: + version "1.2.0" + resolved "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" + +minipass@^2.2.1, minipass@^2.3.4: + version "2.3.5" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.5.tgz#cacebe492022497f656b0f0f51e2682a9ed2d848" + dependencies: + safe-buffer "^5.1.2" + yallist "^3.0.0" + +minizlib@^1.1.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.2.1.tgz#dd27ea6136243c7c880684e8672bb3a45fd9b614" + dependencies: + minipass "^2.2.1" + +mixin-deep@^1.2.0: + version "1.3.1" + resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.1.tgz#a49e7268dce1a0d9698e45326c5626df3543d0fe" + dependencies: + for-in "^1.0.2" + is-extendable "^1.0.1" + +mkdirp@^0.5.0, mkdirp@^0.5.1: + version "0.5.1" + resolved "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" + dependencies: + minimist "0.0.8" + +ms@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" + +ms@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a" + +mustache-express@^1.2.7: + version "1.2.8" + resolved "https://registry.yarnpkg.com/mustache-express/-/mustache-express-1.2.8.tgz#caf3fc93e5b729e92077b1c4ff713aba4bced259" + dependencies: + async "~2.6.0" + lru-cache "~4.1.3" + mustache "~2.3.0" + +mustache@~2.3.0: + version "2.3.2" + resolved "https://registry.yarnpkg.com/mustache/-/mustache-2.3.2.tgz#a6d4d9c3f91d13359ab889a812954f9230a3d0c5" + +nan@^2.9.2: + version "2.12.1" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.12.1.tgz#7b1aa193e9aa86057e3c7bbd0ac448e770925552" + +nanomatch@^1.2.9: + version "1.2.13" + resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119" + dependencies: + arr-diff "^4.0.0" + array-unique "^0.3.2" + define-property "^2.0.2" + extend-shallow "^3.0.2" + fragment-cache "^0.2.1" + is-windows "^1.0.2" + kind-of "^6.0.2" + object.pick "^1.3.0" + regex-not "^1.0.0" + snapdragon "^0.8.1" + to-regex "^3.0.1" + +needle@^2.2.1: + version "2.2.4" + resolved "https://registry.yarnpkg.com/needle/-/needle-2.2.4.tgz#51931bff82533b1928b7d1d69e01f1b00ffd2a4e" + dependencies: + debug "^2.1.2" + iconv-lite "^0.4.4" + sax "^1.2.4" + +negotiator@0.6.1: + version "0.6.1" + resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9" + +node-pre-gyp@^0.10.0: + version "0.10.3" + resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.10.3.tgz#3070040716afdc778747b61b6887bf78880b80fc" + dependencies: + detect-libc "^1.0.2" + mkdirp "^0.5.1" + needle "^2.2.1" + nopt "^4.0.1" + npm-packlist "^1.1.6" + npmlog "^4.0.2" + rc "^1.2.7" + rimraf "^2.6.1" + semver "^5.3.0" + tar "^4" + +nodemon@^1.18.4: + version "1.18.9" + resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-1.18.9.tgz#90b467efd3b3c81b9453380aeb2a2cba535d0ead" + dependencies: + chokidar "^2.0.4" + debug "^3.1.0" + ignore-by-default "^1.0.1" + minimatch "^3.0.4" + pstree.remy "^1.1.6" + semver "^5.5.0" + supports-color "^5.2.0" + touch "^3.1.0" + undefsafe "^2.0.2" + update-notifier "^2.5.0" + +nopt@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d" + dependencies: + abbrev "1" + osenv "^0.1.4" + +nopt@~1.0.10: + version "1.0.10" + resolved "https://registry.yarnpkg.com/nopt/-/nopt-1.0.10.tgz#6ddd21bd2a31417b92727dd585f8a6f37608ebee" + dependencies: + abbrev "1" + +normalize-path@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9" + dependencies: + remove-trailing-separator "^1.0.1" + +npm-bundled@^1.0.1: + version "1.0.5" + resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.5.tgz#3c1732b7ba936b3a10325aef616467c0ccbcc979" + +npm-packlist@^1.1.6: + version "1.1.12" + resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.1.12.tgz#22bde2ebc12e72ca482abd67afc51eb49377243a" + dependencies: + ignore-walk "^3.0.1" + npm-bundled "^1.0.1" + +npm-run-path@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f" + dependencies: + path-key "^2.0.0" + +npmlog@^4.0.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" + dependencies: + are-we-there-yet "~1.1.2" + console-control-strings "~1.1.0" + gauge "~2.7.3" + set-blocking "~2.0.0" + +number-is-nan@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" + +oauth-sign@~0.9.0: + version "0.9.0" + resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455" + +object-assign@^4.1.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" + +object-copy@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c" + dependencies: + copy-descriptor "^0.1.0" + define-property "^0.2.5" + kind-of "^3.0.3" + +object-visit@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb" + dependencies: + isobject "^3.0.0" + +object.pick@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747" + dependencies: + isobject "^3.0.1" + +on-finished@~2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947" + dependencies: + ee-first "1.1.1" + +once@^1.3.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" + dependencies: + wrappy "1" + +os-homedir@^1.0.0: + version "1.0.2" + resolved "http://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" + +os-tmpdir@^1.0.0: + version "1.0.2" + resolved "http://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" + +osenv@^0.1.4: + version "0.1.5" + resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410" + dependencies: + os-homedir "^1.0.0" + os-tmpdir "^1.0.0" + +p-finally@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae" + +package-json@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/package-json/-/package-json-4.0.1.tgz#8869a0401253661c4c4ca3da6c2121ed555f5eed" + dependencies: + got "^6.7.1" + registry-auth-token "^3.0.1" + registry-url "^3.0.3" + semver "^5.1.0" + +packet-reader@0.3.1: + version "0.3.1" + resolved "https://registry.yarnpkg.com/packet-reader/-/packet-reader-0.3.1.tgz#cd62e60af8d7fea8a705ec4ff990871c46871f27" + +pako@~1.0.2: + version "1.0.7" + resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.7.tgz#2473439021b57f1516c82f58be7275ad8ef1bb27" + +parseurl@~1.3.2: + version "1.3.2" + resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.2.tgz#fc289d4ed8993119460c156253262cdc8de65bf3" + +pascalcase@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14" + +path-dirname@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0" + +path-is-absolute@^1.0.0: + version "1.0.1" + resolved "http://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" + +path-is-inside@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53" + +path-key@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40" + +path-to-regexp@0.1.7: + version "0.1.7" + resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" + +performance-now@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" + +pg-connection-string@0.1.3: + version "0.1.3" + resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-0.1.3.tgz#da1847b20940e42ee1492beaf65d49d91b245df7" + +pg-minify@0.5.5: + version "0.5.5" + resolved "https://registry.yarnpkg.com/pg-minify/-/pg-minify-0.5.5.tgz#6c961a61aa19f469d8edfe5a3c0da58760f3c339" + +pg-pool@^2.0.4: + version "2.0.5" + resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-2.0.5.tgz#f00556fab23f1bbb14b0650ba8d0e447434a1b04" + +pg-promise@^8.4.5: + version "8.5.4" + resolved "https://registry.yarnpkg.com/pg-promise/-/pg-promise-8.5.4.tgz#3c1c656d340b1d8e21bbd8017a650c795b375aca" + dependencies: + manakin "0.5.2" + pg "7.7.1" + pg-minify "0.5.5" + spex "2.1.0" + +pg-types@~1.12.1: + version "1.12.1" + resolved "https://registry.yarnpkg.com/pg-types/-/pg-types-1.12.1.tgz#d64087e3903b58ffaad279e7595c52208a14c3d2" + dependencies: + postgres-array "~1.0.0" + postgres-bytea "~1.0.0" + postgres-date "~1.0.0" + postgres-interval "^1.1.0" + +pg@7.7.1: + version "7.7.1" + resolved "https://registry.yarnpkg.com/pg/-/pg-7.7.1.tgz#546b192ff484322b69689391f885de3ba91a30d4" + dependencies: + buffer-writer "2.0.0" + packet-reader "0.3.1" + pg-connection-string "0.1.3" + pg-pool "^2.0.4" + pg-types "~1.12.1" + pgpass "1.x" + semver "4.3.2" + +pgpass@1.x: + version "1.0.2" + resolved "https://registry.yarnpkg.com/pgpass/-/pgpass-1.0.2.tgz#2a7bb41b6065b67907e91da1b07c1847c877b306" + dependencies: + split "^1.0.0" + +pify@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176" + +posix-character-classes@^0.1.0: + version "0.1.1" + resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" + +postgres-array@~1.0.0: + version "1.0.3" + resolved "https://registry.yarnpkg.com/postgres-array/-/postgres-array-1.0.3.tgz#c561fc3b266b21451fc6555384f4986d78ec80f5" + +postgres-bytea@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/postgres-bytea/-/postgres-bytea-1.0.0.tgz#027b533c0aa890e26d172d47cf9ccecc521acd35" + +postgres-date@~1.0.0: + version "1.0.3" + resolved "https://registry.yarnpkg.com/postgres-date/-/postgres-date-1.0.3.tgz#e2d89702efdb258ff9d9cee0fe91bd06975257a8" + +postgres-interval@^1.1.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/postgres-interval/-/postgres-interval-1.1.2.tgz#bf71ff902635f21cb241a013fc421d81d1db15a9" + dependencies: + xtend "^4.0.0" + +prepend-http@^1.0.1: + version "1.0.4" + resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc" + +process-nextick-args@~1.0.6: + version "1.0.7" + resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3" + +process-nextick-args@~2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa" + +proxy-addr@~2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.4.tgz#ecfc733bf22ff8c6f407fa275327b9ab67e48b93" + dependencies: + forwarded "~0.1.2" + ipaddr.js "1.8.0" + +pseudomap@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3" + +psl@^1.1.24, psl@^1.1.28: + version "1.1.31" + resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.31.tgz#e9aa86d0101b5b105cbe93ac6b784cd547276184" + +pstree.remy@^1.1.6: + version "1.1.6" + resolved "https://registry.yarnpkg.com/pstree.remy/-/pstree.remy-1.1.6.tgz#73a55aad9e2d95814927131fbf4dc1b62d259f47" + +punycode@^1.4.1: + version "1.4.1" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" + +punycode@^2.1.0, punycode@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" + +qs@6.5.2, qs@~6.5.2: + version "6.5.2" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36" + +range-parser@~1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e" + +raw-body@2.3.3: + version "2.3.3" + resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.3.3.tgz#1b324ece6b5706e153855bc1148c65bb7f6ea0c3" + dependencies: + bytes "3.0.0" + http-errors "1.6.3" + iconv-lite "0.4.23" + unpipe "1.0.0" + +rc@^1.0.1, rc@^1.1.6, rc@^1.2.7: + version "1.2.8" + resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" + dependencies: + deep-extend "^0.6.0" + ini "~1.3.0" + minimist "^1.2.0" + strip-json-comments "~2.0.1" + +readable-stream@^2.0.2, readable-stream@^2.0.6: + version "2.3.6" + resolved "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf" + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.3" + isarray "~1.0.0" + process-nextick-args "~2.0.0" + safe-buffer "~5.1.1" + string_decoder "~1.1.1" + util-deprecate "~1.0.1" + +readable-stream@~2.0.6: + version "2.0.6" + resolved "http://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e" + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.1" + isarray "~1.0.0" + process-nextick-args "~1.0.6" + string_decoder "~0.10.x" + util-deprecate "~1.0.1" + +readdirp@^2.0.0: + version "2.2.1" + resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525" + dependencies: + graceful-fs "^4.1.11" + micromatch "^3.1.10" + readable-stream "^2.0.2" + +regex-not@^1.0.0, regex-not@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c" + dependencies: + extend-shallow "^3.0.2" + safe-regex "^1.1.0" + +registry-auth-token@^3.0.1: + version "3.3.2" + resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.3.2.tgz#851fd49038eecb586911115af845260eec983f20" + dependencies: + rc "^1.1.6" + safe-buffer "^5.0.1" + +registry-url@^3.0.3: + version "3.1.0" + resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-3.1.0.tgz#3d4ef870f73dde1d77f0cf9a381432444e174942" + dependencies: + rc "^1.0.1" + +remove-trailing-separator@^1.0.1: + version "1.1.0" + resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef" + +repeat-element@^1.1.2: + version "1.1.3" + resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce" + +repeat-string@^1.6.1: + version "1.6.1" + resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" + +request-promise-core@1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.1.tgz#3eee00b2c5aa83239cfb04c5700da36f81cd08b6" + dependencies: + lodash "^4.13.1" + +request-promise@^4.2.2: + version "4.2.2" + resolved "https://registry.yarnpkg.com/request-promise/-/request-promise-4.2.2.tgz#d1ea46d654a6ee4f8ee6a4fea1018c22911904b4" + dependencies: + bluebird "^3.5.0" + request-promise-core "1.1.1" + stealthy-require "^1.1.0" + tough-cookie ">=2.3.3" + +request@^2.88.0: + version "2.88.0" + resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef" + dependencies: + aws-sign2 "~0.7.0" + aws4 "^1.8.0" + caseless "~0.12.0" + combined-stream "~1.0.6" + extend "~3.0.2" + forever-agent "~0.6.1" + form-data "~2.3.2" + har-validator "~5.1.0" + http-signature "~1.2.0" + is-typedarray "~1.0.0" + isstream "~0.1.2" + json-stringify-safe "~5.0.1" + mime-types "~2.1.19" + oauth-sign "~0.9.0" + performance-now "^2.1.0" + qs "~6.5.2" + safe-buffer "^5.1.2" + tough-cookie "~2.4.3" + tunnel-agent "^0.6.0" + uuid "^3.3.2" + +resolve-url@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" + +ret@~0.1.10: + version "0.1.15" + resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc" + +rimraf@^2.6.1: + version "2.6.2" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36" + dependencies: + glob "^7.0.5" + +safe-buffer@5.1.2, safe-buffer@^5.0.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: + version "5.1.2" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" + +safe-regex@^1.1.0: + version "1.1.0" + resolved "http://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e" + dependencies: + ret "~0.1.10" + +"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: + version "2.1.2" + resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" + +sax@^1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" + +semver-diff@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-2.1.0.tgz#4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36" + dependencies: + semver "^5.0.3" + +semver@4.3.2: + version "4.3.2" + resolved "http://registry.npmjs.org/semver/-/semver-4.3.2.tgz#c7a07158a80bedd052355b770d82d6640f803be7" + +semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.5.0: + version "5.6.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004" + +send@0.16.2: + version "0.16.2" + resolved "https://registry.yarnpkg.com/send/-/send-0.16.2.tgz#6ecca1e0f8c156d141597559848df64730a6bbc1" + dependencies: + debug "2.6.9" + depd "~1.1.2" + destroy "~1.0.4" + encodeurl "~1.0.2" + escape-html "~1.0.3" + etag "~1.8.1" + fresh "0.5.2" + http-errors "~1.6.2" + mime "1.4.1" + ms "2.0.0" + on-finished "~2.3.0" + range-parser "~1.2.0" + statuses "~1.4.0" + +serve-static@1.13.2: + version "1.13.2" + resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.2.tgz#095e8472fd5b46237db50ce486a43f4b86c6cec1" + dependencies: + encodeurl "~1.0.2" + escape-html "~1.0.3" + parseurl "~1.3.2" + send "0.16.2" + +set-blocking@~2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" + +set-value@^0.4.3: + version "0.4.3" + resolved "https://registry.yarnpkg.com/set-value/-/set-value-0.4.3.tgz#7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1" + dependencies: + extend-shallow "^2.0.1" + is-extendable "^0.1.1" + is-plain-object "^2.0.1" + to-object-path "^0.3.0" + +set-value@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.0.tgz#71ae4a88f0feefbbf52d1ea604f3fb315ebb6274" + dependencies: + extend-shallow "^2.0.1" + is-extendable "^0.1.1" + is-plain-object "^2.0.3" + split-string "^3.0.1" + +setprototypeof@1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656" + +shebang-command@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" + dependencies: + shebang-regex "^1.0.0" + +shebang-regex@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3" + +signal-exit@^3.0.0, signal-exit@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d" + +snapdragon-node@^2.0.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b" + dependencies: + define-property "^1.0.0" + isobject "^3.0.0" + snapdragon-util "^3.0.1" + +snapdragon-util@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2" + dependencies: + kind-of "^3.2.0" + +snapdragon@^0.8.1: + version "0.8.2" + resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d" + dependencies: + base "^0.11.1" + debug "^2.2.0" + define-property "^0.2.5" + extend-shallow "^2.0.1" + map-cache "^0.2.2" + source-map "^0.5.6" + source-map-resolve "^0.5.0" + use "^3.1.0" + +source-map-resolve@^0.5.0: + version "0.5.2" + resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.2.tgz#72e2cc34095543e43b2c62b2c4c10d4a9054f259" + dependencies: + atob "^2.1.1" + decode-uri-component "^0.2.0" + resolve-url "^0.2.1" + source-map-url "^0.4.0" + urix "^0.1.0" + +source-map-url@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3" + +source-map@^0.5.6: + version "0.5.7" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" + +spex@2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/spex/-/spex-2.1.0.tgz#21939ab7722322c3a1d002870fab022daa79335f" + +split-string@^3.0.1, split-string@^3.0.2: + version "3.1.0" + resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2" + dependencies: + extend-shallow "^3.0.0" + +split@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/split/-/split-1.0.1.tgz#605bd9be303aa59fb35f9229fbea0ddec9ea07d9" + dependencies: + through "2" + +sshpk@^1.7.0: + version "1.16.0" + resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.0.tgz#1d4963a2fbffe58050aa9084ca20be81741c07de" + dependencies: + asn1 "~0.2.3" + assert-plus "^1.0.0" + bcrypt-pbkdf "^1.0.0" + dashdash "^1.12.0" + ecc-jsbn "~0.1.1" + getpass "^0.1.1" + jsbn "~0.1.0" + safer-buffer "^2.0.2" + tweetnacl "~0.14.0" + +static-extend@^0.1.1: + version "0.1.2" + resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6" + dependencies: + define-property "^0.2.5" + object-copy "^0.1.0" + +"statuses@>= 1.4.0 < 2": + version "1.5.0" + resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" + +statuses@~1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087" + +stealthy-require@^1.1.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b" + +string-width@^1.0.1: + version "1.0.2" + resolved "http://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" + dependencies: + code-point-at "^1.0.0" + is-fullwidth-code-point "^1.0.0" + strip-ansi "^3.0.0" + +"string-width@^1.0.2 || 2", string-width@^2.0.0, string-width@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" + dependencies: + is-fullwidth-code-point "^2.0.0" + strip-ansi "^4.0.0" + +string_decoder@~0.10.x: + version "0.10.31" + resolved "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" + +string_decoder@~1.1.1: + version "1.1.1" + resolved "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" + dependencies: + safe-buffer "~5.1.0" + +strip-ansi@^3.0.0, strip-ansi@^3.0.1: + version "3.0.1" + resolved "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" + dependencies: + ansi-regex "^2.0.0" + +strip-ansi@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f" + dependencies: + ansi-regex "^3.0.0" + +strip-eof@^1.0.0: + version "1.0.0" + resolved "http://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf" + +strip-json-comments@~2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" + +supports-color@^5.2.0, supports-color@^5.3.0: + version "5.5.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" + dependencies: + has-flag "^3.0.0" + +tar@^4: + version "4.4.8" + resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.8.tgz#b19eec3fde2a96e64666df9fdb40c5ca1bc3747d" + dependencies: + chownr "^1.1.1" + fs-minipass "^1.2.5" + minipass "^2.3.4" + minizlib "^1.1.1" + mkdirp "^0.5.0" + safe-buffer "^5.1.2" + yallist "^3.0.2" + +term-size@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/term-size/-/term-size-1.2.0.tgz#458b83887f288fc56d6fffbfad262e26638efa69" + dependencies: + execa "^0.7.0" + +through@2: + version "2.3.8" + resolved "http://registry.npmjs.org/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" + +timed-out@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f" + +to-object-path@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af" + dependencies: + kind-of "^3.0.2" + +to-regex-range@^2.1.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38" + dependencies: + is-number "^3.0.0" + repeat-string "^1.6.1" + +to-regex@^3.0.1, to-regex@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce" + dependencies: + define-property "^2.0.2" + extend-shallow "^3.0.2" + regex-not "^1.0.2" + safe-regex "^1.1.0" + +touch@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/touch/-/touch-3.1.0.tgz#fe365f5f75ec9ed4e56825e0bb76d24ab74af83b" + dependencies: + nopt "~1.0.10" + +tough-cookie@>=2.3.3: + version "2.5.0" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2" + dependencies: + psl "^1.1.28" + punycode "^2.1.1" + +tough-cookie@~2.4.3: + version "2.4.3" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781" + dependencies: + psl "^1.1.24" + punycode "^1.4.1" + +tunnel-agent@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" + dependencies: + safe-buffer "^5.0.1" + +tweetnacl@^0.14.3, tweetnacl@~0.14.0: + version "0.14.5" + resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" + +type-is@~1.6.16: + version "1.6.16" + resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.16.tgz#f89ce341541c672b25ee7ae3c73dee3b2be50194" + dependencies: + media-typer "0.3.0" + mime-types "~2.1.18" + +undefsafe@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/undefsafe/-/undefsafe-2.0.2.tgz#225f6b9e0337663e0d8e7cfd686fc2836ccace76" + dependencies: + debug "^2.2.0" + +union-value@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4" + dependencies: + arr-union "^3.1.0" + get-value "^2.0.6" + is-extendable "^0.1.1" + set-value "^0.4.3" + +unique-string@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-1.0.0.tgz#9e1057cca851abb93398f8b33ae187b99caec11a" + dependencies: + crypto-random-string "^1.0.0" + +unpipe@1.0.0, unpipe@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" + +unset-value@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559" + dependencies: + has-value "^0.3.1" + isobject "^3.0.0" + +unzip-response@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97" + +upath@^1.0.5: + version "1.1.0" + resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.0.tgz#35256597e46a581db4793d0ce47fa9aebfc9fabd" + +update-notifier@^2.5.0: + version "2.5.0" + resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-2.5.0.tgz#d0744593e13f161e406acb1d9408b72cad08aff6" + dependencies: + boxen "^1.2.1" + chalk "^2.0.1" + configstore "^3.0.0" + import-lazy "^2.1.0" + is-ci "^1.0.10" + is-installed-globally "^0.1.0" + is-npm "^1.0.0" + latest-version "^3.0.0" + semver-diff "^2.0.0" + xdg-basedir "^3.0.0" + +uri-js@^4.2.2: + version "4.2.2" + resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0" + dependencies: + punycode "^2.1.0" + +urix@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72" + +url-parse-lax@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-1.0.0.tgz#7af8f303645e9bd79a272e7a14ac68bc0609da73" + dependencies: + prepend-http "^1.0.1" + +use@^3.1.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f" + +util-deprecate@~1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" + +utils-merge@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" + +uuid@3.3.2, uuid@^3.3.2: + version "3.3.2" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131" + +vary@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" + +verror@1.10.0: + version "1.10.0" + resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400" + dependencies: + assert-plus "^1.0.0" + core-util-is "1.0.2" + extsprintf "^1.2.0" + +which@^1.2.9: + version "1.3.1" + resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" + dependencies: + isexe "^2.0.0" + +wide-align@^1.1.0: + version "1.1.3" + resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457" + dependencies: + string-width "^1.0.2 || 2" + +widest-line@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-2.0.1.tgz#7438764730ec7ef4381ce4df82fb98a53142a3fc" + dependencies: + string-width "^2.1.1" + +wrappy@1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" + +write-file-atomic@^2.0.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.3.0.tgz#1ff61575c2e2a4e8e510d6fa4e243cce183999ab" + dependencies: + graceful-fs "^4.1.11" + imurmurhash "^0.1.4" + signal-exit "^3.0.2" + +xdg-basedir@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-3.0.0.tgz#496b2cc109eca8dbacfe2dc72b603c17c5870ad4" + +xmlbuilder@10.0.0: + version "10.0.0" + resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-10.0.0.tgz#c64e52f8ae097fe5fd46d1c38adaade071ee1b55" + +xtend@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af" + +yallist@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" + +yallist@^3.0.0, yallist@^3.0.2: + version "3.0.3" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.3.tgz#b4b049e314be545e3ce802236d6cd22cd91c3de9" diff --git a/static/js/ulb-override.js b/static/js/ulb-override.js new file mode 100644 index 00000000..91887493 --- /dev/null +++ b/static/js/ulb-override.js @@ -0,0 +1,100 @@ +var appOverrides = (function() { + var INIT_VALUES = { + pbFireCess: { + inflammable: false, + heightAbove36Feet: false, + }, + }; + var state = JSON.parse(JSON.stringify(INIT_VALUES)); + + var pbFireCess = { + fireCessOnChange: function(e) { + state.pbFireCess[e.target.id] = e.target.checked; + }, + initForm: function() { + var basicInfoEle = document.getElementById("basicInformation"); + var newEle = document.getElementById("pbFireCess"); + + if (basicInfoEle != null && basicInfoEle != undefined && (newEle == null && newEle == undefined)) { + var fireCessNode = document.createElement("div"); + fireCessNode.innerHTML = + '
'; + basicInfoEle.parentNode.insertBefore(fireCessNode, basicInfoEle.nextSibling); + + var inflammable = document.getElementById("inflammable"); + var heightAbove36Feet = document.getElementById("heightAbove36Feet"); + + inflammable.checked = state.pbFireCess.inflammable; + heightAbove36Feet.checked = state.pbFireCess.heightAbove36Feet; + var tab = document.getElementsByClassName("form-tab-index").item(0) + if (tab.textContent == "4") { + inflammable.disabled = 'disabled' + heightAbove36Feet.disabled = 'disabled' + } + + inflammable.addEventListener("change", pbFireCess.fireCessOnChange); + heightAbove36Feet.addEventListener("change", pbFireCess.fireCessOnChange); + } + }, + resetForm: function(data) { + state.pbFireCess = JSON.parse(JSON.stringify(INIT_VALUES.pbFireCess)); + }, + updateForm: function(data) { + var property = data.Properties[0]; + if (property && property.propertyDetails && property.propertyDetails[0].additionalDetails) { + var imflammable = property.propertyDetails[0].additionalDetails.inflammable; + var heightAbove36Feet = property.propertyDetails[0].additionalDetails.heightAbove36Feet; + + if (imflammable !== undefined && imflammable !== null) { + state.pbFireCess.inflammable = imflammable; + if (document.getElementById("inflammable")) document.getElementById("inflammable").checked = imflammable; + } + + if (heightAbove36Feet !== undefined && heightAbove36Feet !== null) { + state.pbFireCess.heightAbove36Feet = heightAbove36Feet; + if (document.getElementById("heightAbove36Feet")) document.getElementById("heightAbove36Feet").checked = heightAbove36Feet; + } + } + }, + submitForm: function(property) { + if (property && property[0].propertyDetails) { + property[0].propertyDetails[0]["additionalDetails"] = state.pbFireCess; + } + }, + }; + + var API = { + initForm: function(formKey, data) { + switch (formKey) { + case "basicInformation": + return pbFireCess.initForm(data); + default: + return; + } + }, + resetForm: function(formKey, data) { + switch (formKey) { + case "basicInformation": + return pbFireCess.resetForm(data); + default: + return; + } + }, + validateForm: function(formKey, data) { + switch (formKey) { + default: + return true; + } + }, + updateForms: function(data) { + pbFireCess.updateForm(data); + return; + }, + submitForm: function(data) { + pbFireCess.submitForm(data); + return; + }, + }; + return API; +})(); + From 240931df1ce546a43dbf3a6e17c55b7a29a60f2d Mon Sep 17 00:00:00 2001 From: erramesh000 <83356629+erramesh000@users.noreply.github.com> Date: Wed, 3 Jan 2024 10:44:20 +0530 Subject: [PATCH 1218/1242] Update ws-onetime-receipt.json testing --- configs/pdf-service/format-config/ws-onetime-receipt.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/pdf-service/format-config/ws-onetime-receipt.json b/configs/pdf-service/format-config/ws-onetime-receipt.json index 8e957540..29f90765 100644 --- a/configs/pdf-service/format-config/ws-onetime-receipt.json +++ b/configs/pdf-service/format-config/ws-onetime-receipt.json @@ -23,7 +23,7 @@ { "stack": [ { - "text": "{{logo-header}}{{mcGrade}}", + "text": "{{logo-header}}=='Amritsar' ? 'TestTestone': 'testtwo' {{mcGrade}}", "style": "receipt-logo-header" }, { From 6a46010935424dfbe01129b2c4726976f38d5b49 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 3 Jan 2024 11:12:18 +0530 Subject: [PATCH 1219/1242] Update ws-onetime-receipt.json pdf --- configs/pdf-service/format-config/ws-onetime-receipt.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/pdf-service/format-config/ws-onetime-receipt.json b/configs/pdf-service/format-config/ws-onetime-receipt.json index 29f90765..e1cc56fa 100644 --- a/configs/pdf-service/format-config/ws-onetime-receipt.json +++ b/configs/pdf-service/format-config/ws-onetime-receipt.json @@ -23,7 +23,7 @@ { "stack": [ { - "text": "{{logo-header}}=='Amritsar' ? 'TestTestone': 'testtwo' {{mcGrade}}", + "text": "{{logo-header}}=='pb.amritsar' ? 'TestTestone': 'testtwo' {{mcGrade}}", "style": "receipt-logo-header" }, { From b6ec97dd883edc232486fd72b9ae77a2139e6bbb Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 3 Jan 2024 11:36:52 +0530 Subject: [PATCH 1220/1242] Update ws-onetime-receipt.json --- configs/pdf-service/data-config/ws-onetime-receipt.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/pdf-service/data-config/ws-onetime-receipt.json b/configs/pdf-service/data-config/ws-onetime-receipt.json index 9502c79b..985682ec 100644 --- a/configs/pdf-service/data-config/ws-onetime-receipt.json +++ b/configs/pdf-service/data-config/ws-onetime-receipt.json @@ -545,7 +545,7 @@ }, { "variable": "logo-header", - "value": "$.MdmsRes.tenant.tenants[0].code", + "value": "$.MdmsRes.tenant.tenants[0].code=='pb.amritsar':'AMR WATER SEW':$.MdmsRes.tenant.tenants[0].code", "localisation": { "required": true, "prefix": "TENANT_TENANTS", From c4de68da30793b01000d1239c34aa416a9705091 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 3 Jan 2024 11:39:07 +0530 Subject: [PATCH 1221/1242] Update ws-onetime-receipt.json --- configs/pdf-service/format-config/ws-onetime-receipt.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/pdf-service/format-config/ws-onetime-receipt.json b/configs/pdf-service/format-config/ws-onetime-receipt.json index e1cc56fa..8de779fd 100644 --- a/configs/pdf-service/format-config/ws-onetime-receipt.json +++ b/configs/pdf-service/format-config/ws-onetime-receipt.json @@ -23,7 +23,7 @@ { "stack": [ { - "text": "{{logo-header}}=='pb.amritsar' ? 'TestTestone': 'testtwo' {{mcGrade}}", + "text": "{{logo-header}} {{mcGrade}}", "style": "receipt-logo-header" }, { From 60ecfcab98be762ecbfdb610ba913ac9099e0547 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 3 Jan 2024 11:40:06 +0530 Subject: [PATCH 1222/1242] Update ws-onetime-receipt.json --- configs/pdf-service/data-config/ws-onetime-receipt.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/pdf-service/data-config/ws-onetime-receipt.json b/configs/pdf-service/data-config/ws-onetime-receipt.json index 985682ec..72b25a63 100644 --- a/configs/pdf-service/data-config/ws-onetime-receipt.json +++ b/configs/pdf-service/data-config/ws-onetime-receipt.json @@ -545,7 +545,7 @@ }, { "variable": "logo-header", - "value": "$.MdmsRes.tenant.tenants[0].code=='pb.amritsar':'AMR WATER SEW':$.MdmsRes.tenant.tenants[0].code", + "value": "$.MdmsRes.tenant.tenants[0].code=='pb.amritsar'?'AMR WATER SEW':$.MdmsRes.tenant.tenants[0].code", "localisation": { "required": true, "prefix": "TENANT_TENANTS", From 6f3bb3f89ad7254c858d56c09fb261af8a81302b Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 3 Jan 2024 12:29:15 +0530 Subject: [PATCH 1223/1242] syntax correction --- configs/pdf-service/data-config/ws-onetime-receipt.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/pdf-service/data-config/ws-onetime-receipt.json b/configs/pdf-service/data-config/ws-onetime-receipt.json index 72b25a63..9502c79b 100644 --- a/configs/pdf-service/data-config/ws-onetime-receipt.json +++ b/configs/pdf-service/data-config/ws-onetime-receipt.json @@ -545,7 +545,7 @@ }, { "variable": "logo-header", - "value": "$.MdmsRes.tenant.tenants[0].code=='pb.amritsar'?'AMR WATER SEW':$.MdmsRes.tenant.tenants[0].code", + "value": "$.MdmsRes.tenant.tenants[0].code", "localisation": { "required": true, "prefix": "TENANT_TENANTS", From 7c39adf7ff4fe8e64aa639d33d16bbfcb18719be Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 3 Jan 2024 12:32:22 +0530 Subject: [PATCH 1224/1242] amritsar mcGrade update --- configs/pdf-service/format-config/ws-onetime-receipt.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/pdf-service/format-config/ws-onetime-receipt.json b/configs/pdf-service/format-config/ws-onetime-receipt.json index 8de779fd..df2e8243 100644 --- a/configs/pdf-service/format-config/ws-onetime-receipt.json +++ b/configs/pdf-service/format-config/ws-onetime-receipt.json @@ -393,7 +393,7 @@ { "stack": [ { - "text": "{{logo-header}} {{Municipal_Corporation}}", + "text": "{{logo-header}} {{mcGrade}}", "style": "receipt-logo-header" }, { From ab088fd0e9af84775eea040aa331b164e0813236 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 3 Jan 2024 13:23:13 +0530 Subject: [PATCH 1225/1242] Update ws-onetime-receipt.json --- configs/pdf-service/data-config/ws-onetime-receipt.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/pdf-service/data-config/ws-onetime-receipt.json b/configs/pdf-service/data-config/ws-onetime-receipt.json index 9502c79b..d5a70579 100644 --- a/configs/pdf-service/data-config/ws-onetime-receipt.json +++ b/configs/pdf-service/data-config/ws-onetime-receipt.json @@ -523,7 +523,7 @@ "value": "$.MdmsRes.tenant.tenants[0].address" }, { - "variable":"mcGrade", + "variable":"mcGradePwssb", "value":"$.MdmsRes.tenant.tenants[0].city.pwssbGrade" }, { From afa34e746149dd4295d5aa4f1aa61346a68c08d0 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 3 Jan 2024 13:24:10 +0530 Subject: [PATCH 1226/1242] Update ws-onetime-receipt.json --- configs/pdf-service/format-config/ws-onetime-receipt.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/pdf-service/format-config/ws-onetime-receipt.json b/configs/pdf-service/format-config/ws-onetime-receipt.json index df2e8243..3f7685aa 100644 --- a/configs/pdf-service/format-config/ws-onetime-receipt.json +++ b/configs/pdf-service/format-config/ws-onetime-receipt.json @@ -23,7 +23,7 @@ { "stack": [ { - "text": "{{logo-header}} {{mcGrade}}", + "text": "{{logo-header}} {{mcGradePwssb}}", "style": "receipt-logo-header" }, { From bb7bee8aa0dbae2702b74c22bbf095d965170ce5 Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 3 Jan 2024 13:28:42 +0530 Subject: [PATCH 1227/1242] mcGrade Pwssb parameter --- configs/pdf-service/format-config/ws-onetime-receipt.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/pdf-service/format-config/ws-onetime-receipt.json b/configs/pdf-service/format-config/ws-onetime-receipt.json index 3f7685aa..5ed1e43d 100644 --- a/configs/pdf-service/format-config/ws-onetime-receipt.json +++ b/configs/pdf-service/format-config/ws-onetime-receipt.json @@ -393,7 +393,7 @@ { "stack": [ { - "text": "{{logo-header}} {{mcGrade}}", + "text": "{{logo-header}} {{mcGradePwssb}}", "style": "receipt-logo-header" }, { From e3f02bec19c0e209ebe6e2973ff3bafd4b2fa24b Mon Sep 17 00:00:00 2001 From: Gurpreet Sigh Khanna <45963460+gurpreetsinghkhanna@users.noreply.github.com> Date: Wed, 3 Jan 2024 15:21:45 +0530 Subject: [PATCH 1228/1242] Update ws-bill.json pdf --- configs/pdf-service/format-config/ws-bill.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/pdf-service/format-config/ws-bill.json b/configs/pdf-service/format-config/ws-bill.json index 402514d1..e4f5d16c 100644 --- a/configs/pdf-service/format-config/ws-bill.json +++ b/configs/pdf-service/format-config/ws-bill.json @@ -23,7 +23,7 @@ { "stack": [ { - "text": "{{logo_header}} {{mcGrade}}", + "text": "{{logo_header}} {{mcGradePwssb}}", "style": "receipt-logo-header" }, { From 93b5c1515d2b0c1c7b76aceb608362cdeec4a58f Mon Sep 17 00:00:00 2001 From: erramesh000 <83356629+erramesh000@users.noreply.github.com> Date: Wed, 6 Mar 2024 11:07:48 +0530 Subject: [PATCH 1229/1242] Update CCAVANUE index.js --- rainmaker-custom-service/index.js | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/rainmaker-custom-service/index.js b/rainmaker-custom-service/index.js index fc742333..960a4741 100644 --- a/rainmaker-custom-service/index.js +++ b/rainmaker-custom-service/index.js @@ -1019,6 +1019,20 @@ router.post('/protected/punjab-pt/pre-hook/pg-service/transaction/v1/_create', a request['Transaction']['callbackUrl'] = url.format(url_callback); } +else if (request['Transaction']['tenantId'] == 'pb.amritsar' && (request['Transaction']['module']=="WS" || request['Transaction']['module']=="SW")) { + let original_callback = request['Transaction']['callbackUrl']; + request['Transaction']['gateway'] = 'CCAVANUE' + url_callback = url.parse(original_callback) + + url_callback.query = url_callback.query || {}; + + url_callback.query['original_callback'] = url_callback.path; + + url_callback.path = '/customization/open/punjab-pt/payu/confirm'; + url_callback.pathname = '/customization/open/punjab-pt/payu/confirm'; + + request['Transaction']['callbackUrl'] = url.format(url_callback); + } res.json(request); }))); From 7d7eeb778be5633f8f5ba32885ccfc86af08f812 Mon Sep 17 00:00:00 2001 From: erramesh000 <83356629+erramesh000@users.noreply.github.com> Date: Wed, 6 Mar 2024 11:52:52 +0530 Subject: [PATCH 1230/1242] Update index.js --- rainmaker-custom-service/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rainmaker-custom-service/index.js b/rainmaker-custom-service/index.js index 960a4741..b29a2f19 100644 --- a/rainmaker-custom-service/index.js +++ b/rainmaker-custom-service/index.js @@ -1007,7 +1007,7 @@ router.post('/protected/punjab-pt/pre-hook/pg-service/transaction/v1/_create', a if (request['Transaction']['tenantId'] == 'pb.jalandhar' || request['Transaction']['tenantId'] == 'pb.testing') { let original_callback = request['Transaction']['callbackUrl']; - request['Transaction']['gateway'] = 'PAYU' + request['Transaction']['gateway'] = 'CCAVANUE' url_callback = url.parse(original_callback) url_callback.query = url_callback.query || {}; From 67f918a2a9b0760909c474f4e91ba5493b1b8b8b Mon Sep 17 00:00:00 2001 From: erramesh000 <83356629+erramesh000@users.noreply.github.com> Date: Wed, 6 Mar 2024 12:19:24 +0530 Subject: [PATCH 1231/1242] Revert index.js --- rainmaker-custom-service/index.js | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/rainmaker-custom-service/index.js b/rainmaker-custom-service/index.js index b29a2f19..fc742333 100644 --- a/rainmaker-custom-service/index.js +++ b/rainmaker-custom-service/index.js @@ -1007,21 +1007,7 @@ router.post('/protected/punjab-pt/pre-hook/pg-service/transaction/v1/_create', a if (request['Transaction']['tenantId'] == 'pb.jalandhar' || request['Transaction']['tenantId'] == 'pb.testing') { let original_callback = request['Transaction']['callbackUrl']; - request['Transaction']['gateway'] = 'CCAVANUE' - url_callback = url.parse(original_callback) - - url_callback.query = url_callback.query || {}; - - url_callback.query['original_callback'] = url_callback.path; - - url_callback.path = '/customization/open/punjab-pt/payu/confirm'; - url_callback.pathname = '/customization/open/punjab-pt/payu/confirm'; - - request['Transaction']['callbackUrl'] = url.format(url_callback); - } -else if (request['Transaction']['tenantId'] == 'pb.amritsar' && (request['Transaction']['module']=="WS" || request['Transaction']['module']=="SW")) { - let original_callback = request['Transaction']['callbackUrl']; - request['Transaction']['gateway'] = 'CCAVANUE' + request['Transaction']['gateway'] = 'PAYU' url_callback = url.parse(original_callback) url_callback.query = url_callback.query || {}; From 835797767da48598faca08f353116e90a993e153 Mon Sep 17 00:00:00 2001 From: erramesh000 <83356629+erramesh000@users.noreply.github.com> Date: Wed, 6 Mar 2024 12:51:20 +0530 Subject: [PATCH 1232/1242] Update index.js --- rainmaker-custom-service/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rainmaker-custom-service/index.js b/rainmaker-custom-service/index.js index fc742333..26cb57b1 100644 --- a/rainmaker-custom-service/index.js +++ b/rainmaker-custom-service/index.js @@ -1007,7 +1007,7 @@ router.post('/protected/punjab-pt/pre-hook/pg-service/transaction/v1/_create', a if (request['Transaction']['tenantId'] == 'pb.jalandhar' || request['Transaction']['tenantId'] == 'pb.testing') { let original_callback = request['Transaction']['callbackUrl']; - request['Transaction']['gateway'] = 'PAYU' + request['Transaction']['gateway'] = 'CCAVANUE' url_callback = url.parse(original_callback) url_callback.query = url_callback.query || {}; From 58a2eef1698b58cadad9832b67ea221e14eb6ff5 Mon Sep 17 00:00:00 2001 From: erramesh000 <83356629+erramesh000@users.noreply.github.com> Date: Wed, 6 Mar 2024 16:41:31 +0530 Subject: [PATCH 1233/1242] Update index.js --- rainmaker-custom-service/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rainmaker-custom-service/index.js b/rainmaker-custom-service/index.js index 26cb57b1..fc742333 100644 --- a/rainmaker-custom-service/index.js +++ b/rainmaker-custom-service/index.js @@ -1007,7 +1007,7 @@ router.post('/protected/punjab-pt/pre-hook/pg-service/transaction/v1/_create', a if (request['Transaction']['tenantId'] == 'pb.jalandhar' || request['Transaction']['tenantId'] == 'pb.testing') { let original_callback = request['Transaction']['callbackUrl']; - request['Transaction']['gateway'] = 'CCAVANUE' + request['Transaction']['gateway'] = 'PAYU' url_callback = url.parse(original_callback) url_callback.query = url_callback.query || {}; From a48904b59e004c6c5c70ab5da0fead9a07400f36 Mon Sep 17 00:00:00 2001 From: erramesh000 <83356629+erramesh000@users.noreply.github.com> Date: Tue, 12 Mar 2024 12:08:30 +0530 Subject: [PATCH 1234/1242] Update address usagetype --- .../data-config/ws-onetime-receipt.json | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/configs/pdf-service/data-config/ws-onetime-receipt.json b/configs/pdf-service/data-config/ws-onetime-receipt.json index d5a70579..34c61492 100644 --- a/configs/pdf-service/data-config/ws-onetime-receipt.json +++ b/configs/pdf-service/data-config/ws-onetime-receipt.json @@ -19,6 +19,18 @@ "path": "$.payerName" } }, + { + "variable": "UsageCategory", + "value": { + "path": "$.usageCategory" + } + }, + { + "variable": "ADdress", + "value": { + "path": "$.address" + } + }, { "variable": "user-name", "value": { @@ -486,7 +498,7 @@ } }, { - "variable": "Municipal_Corporation", + "variable": "mcGrade", "value": { "path": "PDF_STATIC_LABEL_MDMS_MUNICIPAL_CORPORATION" }, From 6545bcc694cdfcd14cd19a5d57541c1c764c8e7e Mon Sep 17 00:00:00 2001 From: erramesh000 <83356629+erramesh000@users.noreply.github.com> Date: Tue, 12 Mar 2024 12:10:51 +0530 Subject: [PATCH 1235/1242] Update ws-onetime-receipt.json --- .../format-config/ws-onetime-receipt.json | 86 +++++++++++++++++++ 1 file changed, 86 insertions(+) diff --git a/configs/pdf-service/format-config/ws-onetime-receipt.json b/configs/pdf-service/format-config/ws-onetime-receipt.json index 5ed1e43d..cf365939 100644 --- a/configs/pdf-service/format-config/ws-onetime-receipt.json +++ b/configs/pdf-service/format-config/ws-onetime-receipt.json @@ -249,6 +249,49 @@ } ], + [ + { + "text": "Usage Category", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{UsageCategory}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Address", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{ADdress}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + + } + ], [ { "text": "Bank Name", @@ -617,6 +660,49 @@ ], "style": "receipt-table" + } + ], + [ + { + "text": "Usage Category", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{UsageCategory}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Address", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{ADdress}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + } ], [ From 04e0565fd0f89cc3d07f585dc20915b3d113e5f9 Mon Sep 17 00:00:00 2001 From: erramesh000 <83356629+erramesh000@users.noreply.github.com> Date: Tue, 12 Mar 2024 14:58:35 +0530 Subject: [PATCH 1236/1242] Update ws-onetime-receipt.json --- .../data-config/ws-onetime-receipt.json | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/configs/pdf-service/data-config/ws-onetime-receipt.json b/configs/pdf-service/data-config/ws-onetime-receipt.json index 34c61492..d5a70579 100644 --- a/configs/pdf-service/data-config/ws-onetime-receipt.json +++ b/configs/pdf-service/data-config/ws-onetime-receipt.json @@ -19,18 +19,6 @@ "path": "$.payerName" } }, - { - "variable": "UsageCategory", - "value": { - "path": "$.usageCategory" - } - }, - { - "variable": "ADdress", - "value": { - "path": "$.address" - } - }, { "variable": "user-name", "value": { @@ -498,7 +486,7 @@ } }, { - "variable": "mcGrade", + "variable": "Municipal_Corporation", "value": { "path": "PDF_STATIC_LABEL_MDMS_MUNICIPAL_CORPORATION" }, From dfe1925c96e5c90989154383b3d6fc8a94d1c8d5 Mon Sep 17 00:00:00 2001 From: erramesh000 <83356629+erramesh000@users.noreply.github.com> Date: Tue, 12 Mar 2024 14:59:50 +0530 Subject: [PATCH 1237/1242] Update ws-onetime-receipt.json --- .../format-config/ws-onetime-receipt.json | 86 ------------------- 1 file changed, 86 deletions(-) diff --git a/configs/pdf-service/format-config/ws-onetime-receipt.json b/configs/pdf-service/format-config/ws-onetime-receipt.json index cf365939..5ed1e43d 100644 --- a/configs/pdf-service/format-config/ws-onetime-receipt.json +++ b/configs/pdf-service/format-config/ws-onetime-receipt.json @@ -249,49 +249,6 @@ } ], - [ - { - "text": "Usage Category", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{UsageCategory}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "Address", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{ADdress}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - - } - ], [ { "text": "Bank Name", @@ -660,49 +617,6 @@ ], "style": "receipt-table" - } - ], - [ - { - "text": "Usage Category", - "border": [ - true, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{UsageCategory}}", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table" - }, - { - "text": "Address", - "border": [ - false, - false, - false, - false - ], - "style": "receipt-table-value" - }, - { - "text": "{{ADdress}}", - "border": [ - false, - false, - true, - false - ], - "style": "receipt-table" - } ], [ From 60f8d6466aaaa4c9606c788ab816fb570326eedb Mon Sep 17 00:00:00 2001 From: erramesh000 <83356629+erramesh000@users.noreply.github.com> Date: Wed, 13 Mar 2024 10:32:37 +0530 Subject: [PATCH 1238/1242] Update Land area ws-onetime-receipt.json --- .../format-config/ws-onetime-receipt.json | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/configs/pdf-service/format-config/ws-onetime-receipt.json b/configs/pdf-service/format-config/ws-onetime-receipt.json index 5ed1e43d..8350ca33 100644 --- a/configs/pdf-service/format-config/ws-onetime-receipt.json +++ b/configs/pdf-service/format-config/ws-onetime-receipt.json @@ -291,6 +291,29 @@ "style": "receipt-table" } + ], + [ + { + "text": "Land Area", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{LandArea}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + } + ] ] From 414fa22c5a7b53a1f6f20020439e9e19e90c497e Mon Sep 17 00:00:00 2001 From: erramesh000 <83356629+erramesh000@users.noreply.github.com> Date: Wed, 13 Mar 2024 10:34:59 +0530 Subject: [PATCH 1239/1242] Update land area ws-onetime-receipt.json --- .../data-config/ws-onetime-receipt.json | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/configs/pdf-service/data-config/ws-onetime-receipt.json b/configs/pdf-service/data-config/ws-onetime-receipt.json index d5a70579..889853da 100644 --- a/configs/pdf-service/data-config/ws-onetime-receipt.json +++ b/configs/pdf-service/data-config/ws-onetime-receipt.json @@ -19,6 +19,24 @@ "path": "$.payerName" } }, + { + "variable": "UsageCategory", + "value": { + "path": "$.usageCategory" + } + }, + { + "variable": "ADdress", + "value": { + "path": "$.address" + } + }, + { + "variable": "LandArea", + "value": { + "path": "$.propertyDetail.landArea" + } + }, { "variable": "user-name", "value": { From 3556c2c660e3ed8457d7eb4947aca25906efa016 Mon Sep 17 00:00:00 2001 From: erramesh000 <83356629+erramesh000@users.noreply.github.com> Date: Wed, 13 Mar 2024 10:39:16 +0530 Subject: [PATCH 1240/1242] Update ws-onetime-receipt.json --- .../format-config/ws-onetime-receipt.json | 113 +++++++++++++++++- 1 file changed, 111 insertions(+), 2 deletions(-) diff --git a/configs/pdf-service/format-config/ws-onetime-receipt.json b/configs/pdf-service/format-config/ws-onetime-receipt.json index 8350ca33..4f2b136b 100644 --- a/configs/pdf-service/format-config/ws-onetime-receipt.json +++ b/configs/pdf-service/format-config/ws-onetime-receipt.json @@ -248,7 +248,50 @@ "style": "receipt-table" } - ], + ], + [ + { + "text": "Usage Category", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{UsageCategory}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Address", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{ADdress}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + + } + ], [ { "text": "Bank Name", @@ -641,7 +684,50 @@ "style": "receipt-table" } - ], + ], + [ + { + "text": "Usage Category", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{UsageCategory}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + }, + { + "text": "Address", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{ADdress}}", + "border": [ + false, + false, + true, + false + ], + "style": "receipt-table" + + } + ], [ { "text": "Bank Name", @@ -684,6 +770,29 @@ "style": "receipt-table" } + ], + [ + { + "text": "Land Area", + "border": [ + true, + false, + false, + false + ], + "style": "receipt-table-value" + }, + { + "text": "{{LandArea}}", + "border": [ + false, + false, + false, + false + ], + "style": "receipt-table" + } + ] ] From 3a6ebb3baf1ebe351efabbfa19e002a55d347f47 Mon Sep 17 00:00:00 2001 From: vinothrallapalli-eGov Date: Sun, 14 Jul 2024 18:53:52 +0530 Subject: [PATCH 1241/1242] Apply prod changes into UAT --- .../egov-searcher/rainmaker-pt-gissearch.yml | 361 +++++++++++------- 1 file changed, 213 insertions(+), 148 deletions(-) diff --git a/configs/egov-searcher/rainmaker-pt-gissearch.yml b/configs/egov-searcher/rainmaker-pt-gissearch.yml index 3034a9e5..48941f08 100644 --- a/configs/egov-searcher/rainmaker-pt-gissearch.yml +++ b/configs/egov-searcher/rainmaker-pt-gissearch.yml @@ -1,149 +1,214 @@ ---- SearchDefinitions: - moduleName: rainmaker-pt-gissearch - summary: Searcher configuration for Adhoc Requirment - version: 1.0.0 - definitions: - - name: searchNewTaxPayments - query: - baseQuery: | - select array_to_json(array_agg(row_to_json(data))) from ( - select - concat(pt.propertyid , '/' , pt.surveyid) as primarykey, - pt.oldpropertyid as oldpropertyid, - pt.surveyid as surveyid, - pd.amountpaid as amount, - getfinancialyearforgis(pd.billid) as financialyear, - bn.blockname, - pt.tenantid as tenantid, - pd.receiptnumber as receiptnumber, - to_char(to_timestamp(cast(pd.receiptdate/1000 as bigint))::date , 'dd/mm/yyyy') as receiptdate, - pt.landarea as plotarea - from egcl_paymentdetail AS pd - INNER JOIN egcl_bill on pd.billid=egcl_bill.id - INNER JOIN eg_pt_property AS pt ON pt.propertyid = egcl_bill.consumercode AND ((pt.oldpropertyid IS NOT NULL - AND pt.oldpropertyid != '') OR pt.surveyid is not null) - INNER JOIN eg_pt_address As ad ON ad.propertyid=pt.id and ad.lastmodifiedtime in (select max(lastmodifiedtime) from eg_pt_address where propertyid=pt.id) - INNER JOIN eg_bndry_mohalla As bn ON ad.locality=bn.localitycode and ad.tenantid=bn.tenantid $where) data - groupBy: null - orderBy: null - searchParams: - condition: AND - params: - - name: pd.receiptdate - isMandatory: false - jsonPath: $.searchCriteria.fromDate - operator: GE - - name: pd.receiptdate - isMandatory: false - jsonPath: $.searchCriteria.toDate - operator: LE - - name: pt.tenantid - isMandatory: true - jsonPath: $.searchCriteria.tenantId - operator: = - - name: bn.blockname - isMandatory: false - jsonPath: $.searchCriteria.blockcode - operator: = - output: - jsonFormat: - ResponseInfo: {} - outJsonPath: $.data - responseInfoPath: $.ResponseInfo - - name: searchTLApplicationsEODB - query: - baseQuery: | - select array_to_json(array_agg(row_to_json(data))) from ( - select - tl.applicationnumber, - tld.additionalDetail::text, - tl.status,additionalDetail->>'IPIN' as iPin, - additionalDetail->>'APPID' as appId, - additionalDetail->>'mobileNo' as mobileNp - from eg_tl_tradelicense tl - inner join eg_tl_tradelicensedetail tld on tld.tradelicenseid=tl.id and tld.additionalDetail->>'CHANNEL'='EODB' ) data - groupBy: null - orderBy: null - searchParams: - condition: AND - params: null - output: - jsonFormat: - ResponseInfo: {} - outJsonPath: $.data - responseInfoPath: $.ResponseInfo - - name: IFMSintegration - query: - baseQuery: | - select array_to_json(array_agg(row_to_json(data))) from - (with details as - ( - SELECT pd.receiptnumber,payment.paidby,bill.consumercode,pd.amountpaid, - pd.businessservice, - pd.tenantid,payment.paymentmode,payment.transactionnumber as transactionNo ,t.mobile_number, taxheadcode , - SUM(adjustedamount) as amount FROM egcl_billaccountdetail as bad - INNER JOIN egcl_billdetial as bd on bd.id = bad.billdetailid - INNER JOIN egcl_bill bill on bd.billid = bill.id - INNER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid - INNER JOIN egcl_payment as payment on pd.paymentid=payment.id - left outer join eg_pg_transactions t on t.bill_id=pd.billid - $where and payment.paymentstatus != 'CANCELLED' - GROUP BY pd.receiptnumber,pd.businessservice,pd.amountpaid,pd.tenantid, - payment.paymentmode,t.mobile_number,payment.transactionnumber, - bill.consumercode,payment.paidby,bad.taxheadcode - ) - select receiptnumber, - paidby, - consumercode, - amountpaid, - businessservice, - tenantid, - paymentmode, - transactionNo , - mobile_number, - json_agg( json_build_object('taxheadcode', taxheadcode,'amount', amount::text)) as taxheads , - ( case when consumercode like 'PT%' then (select usagecategory from eg_pt_property where propertyid=consumercode and status='ACTIVE') else '' end) as ptype - from details - group by receiptnumber,paidby, consumercode, amountpaid, businessservice, tenantid,paymentmode,transactionNo ,mobile_number - ) as data - groupBy: null - orderBy: null - searchParams: - condition: AND - params: - - name: pd.receiptdate - isMandatory: false - jsonPath: $.searchCriteria.fromDate - operator: GE - - name: pd.receiptdate - isMandatory: false - jsonPath: $.searchCriteria.toDate - operator: LE - output: - jsonFormat: - ResponseInfo: {} - outJsonPath: $.data - responseInfoPath: $.ResponseInfo - - name: GetTenantConfig - query: - baseQuery: | - select array_to_json(array_agg(row_to_json(data))) from ( - select id,tenantid,locality,issurveyidmandatory - from eg_tenant_config - $where - ) data - groupBy: null - orderBy: null - searchParams: - condition: AND - params: - - name: tenantid - isMandatory: true - jsonPath: $.searchCriteria.tenantId - operator: = - output: - jsonFormat: - ResponseInfo: {} - outJsonPath: $.data - responseInfoPath: $.ResponseInfo + moduleName: rainmaker-pt-gissearch + summary: Searcher configuration for Adhoc Requirment + version: 1.0.0 + definitions: + + - name: searchNewTaxPayments + query: + baseQuery: | + select array_to_json(array_agg(row_to_json(data))) from ( + select + concat(pt.propertyid , '/' , pt.surveyid) as primarykey, + pt.oldpropertyid as oldpropertyid, + pt.surveyid as surveyid, + pd.amountpaid as amount, + getfinancialyearforgis(pd.billid) as financialyear, + bn.blockname, + pt.tenantid as tenantid, + pd.receiptnumber as receiptnumber, + to_char(to_timestamp(cast(pd.receiptdate/1000 as bigint))::date , 'dd/mm/yyyy') as receiptdate, + pt.landarea as plotarea + from egcl_paymentdetail AS pd + INNER JOIN egcl_bill on pd.billid=egcl_bill.id + INNER JOIN eg_pt_property AS pt ON pt.propertyid = egcl_bill.consumercode AND ((pt.oldpropertyid IS NOT NULL + AND pt.oldpropertyid != '') OR pt.surveyid is not null) + INNER JOIN eg_pt_address As ad ON ad.propertyid=pt.id and ad.lastmodifiedtime in (select max(lastmodifiedtime) from eg_pt_address where propertyid=pt.id) + INNER JOIN eg_bndry_mohalla As bn ON ad.locality=bn.localitycode and ad.tenantid=bn.tenantid $where) data + groupBy: + orderBy: + searchParams: + condition: AND + params: + - name: pd.receiptdate + isMandatory: false + jsonPath: $.searchCriteria.fromDate + operator: GE + - name: pd.receiptdate + isMandatory: false + jsonPath: $.searchCriteria.toDate + operator: LE + - name: pt.tenantid + isMandatory: true + jsonPath: $.searchCriteria.tenantId + operator: = + - name: bn.blockname + isMandatory: false + jsonPath: $.searchCriteria.blockcode + operator: = + + + output: + jsonFormat: {"ResponseInfo": {}} + outJsonPath: $.data + responseInfoPath: $.ResponseInfo + + + - name: searchTLApplicationsEODB + query: + baseQuery: | + select array_to_json(array_agg(row_to_json(data))) from ( + select + tl.applicationnumber, + tld.additionalDetail::text, + tl.status,additionalDetail->>'IPIN' as iPin, + additionalDetail->>'APPID' as appId, + additionalDetail->>'mobileNo' as mobileNp + from eg_tl_tradelicense tl + inner join eg_tl_tradelicensedetail tld on tld.tradelicenseid=tl.id and tld.additionalDetail->>'CHANNEL'='EODB' ) data + groupBy: + orderBy: + searchParams: + condition: AND + params: + + + output: + jsonFormat: {"ResponseInfo": {}} + outJsonPath: $.data + responseInfoPath: $.ResponseInfo + + + - name: IFMSintegration + query: + baseQuery: | + select array_to_json(array_agg(row_to_json(data))) from + (with details as + ( + SELECT pd.receiptnumber,payment.paidby,bill.consumercode,pd.amountpaid, + pd.businessservice, + pd.tenantid,payment.paymentmode,payment.transactionnumber as transactionNo ,t.mobile_number, taxheadcode , + SUM(adjustedamount) as amount FROM egcl_billaccountdetail as bad + INNER JOIN egcl_billdetial as bd on bd.id = bad.billdetailid + INNER JOIN egcl_bill bill on bd.billid = bill.id + INNER JOIN egcl_paymentdetail as pd on pd.billid = bd.billid + INNER JOIN egcl_payment as payment on pd.paymentid=payment.id + left outer join eg_pg_transactions t on t.bill_id=pd.billid + $where and payment.paymentstatus != 'CANCELLED' + GROUP BY pd.receiptnumber,pd.businessservice,pd.amountpaid,pd.tenantid, + payment.paymentmode,t.mobile_number,payment.transactionnumber, + bill.consumercode,payment.paidby,bad.taxheadcode + ) + select receiptnumber, + paidby, + consumercode, + amountpaid, + businessservice, + tenantid, + paymentmode, + transactionNo , + mobile_number, + json_agg( json_build_object('taxheadcode', taxheadcode,'amount', amount::text)) as taxheads , + ( case when consumercode like 'PT%' then (select usagecategory from eg_pt_property where propertyid=consumercode and status='ACTIVE') else '' end) as ptype + from details + group by receiptnumber,paidby, consumercode, amountpaid, businessservice, tenantid,paymentmode,transactionNo ,mobile_number + ) as data + groupBy: + orderBy: + searchParams: + condition: AND + params: + - name: pd.receiptdate + isMandatory: false + jsonPath: $.searchCriteria.fromDate + operator: GE + - name: pd.receiptdate + isMandatory: false + jsonPath: $.searchCriteria.toDate + operator: LE + + output: + jsonFormat: {"ResponseInfo": {}} + outJsonPath: $.data + responseInfoPath: $.ResponseInfo + + + - name: GetTenantConfig + query: + baseQuery: | + select array_to_json(array_agg(row_to_json(data))) from ( + select id,tenantid,locality,issurveyidmandatory + from eg_tenant_config + $where + ) data + groupBy: + orderBy: + searchParams: + condition: AND + params: + - name: tenantid + isMandatory: true + jsonPath: $.searchCriteria.tenantId + operator: = + + output: + jsonFormat: {"ResponseInfo": {}} + outJsonPath: $.data + responseInfoPath: $.ResponseInfo + + + + - name: searchGisMap + query: + baseQuery: | + select array_to_json(array_agg(row_to_json(data))) from ( + with units as + ( + select + propertyuuid, + string_agg(occupancytype,',') as occupancy, + sum(builtuparea) as builtup_area + from report_units + where propertyuuid in (select pt_uuid from report_properties $where) + group by propertyuuid + ) + select + surveyid, + split_part(surveyid,'-',1) as town, + split_part(surveyid,'-',2) as sector, + split_part(surveyid,'-',3) as subsector, + 'plot' as plot, + rp.tenantid as city, + rp.propertyid as property_id, + oldpropertyid as oldpropertyid, + 'uidno' as uid_no, + 'blockcode' as wardno, + builtup_area as builtup_area, + plotsize as land_area, + 'area' as area, + nooffloors as no_of_floors, + propertyusagetype as usage_category, + occupancy as occupancy, + ownershipcategory as ownership_category, + assessmentyears as financial_year, + rpay.amoutpaid as amunt_paid, + rpay.receiptdate as date_of_payment + from report_properties rp + inner join units ru on rp.pt_uuid=ru.propertyuuid + inner join report_assessments ra on ra.propertyid=rp.propertyid + inner join report_payments rpay on (rpay.propertyid=rp.propertyid and rpay.amoutpaid=ra.amount) + $where) data + groupBy: + orderBy: + searchParams: + condition: AND + params: + - name: surveyid + isMandatory: true + jsonPath: $.searchCriteria.plot_map_id + operator: = + + output: + jsonFormat: {"ResponseInfo": {}} + outJsonPath: $.data + responseInfoPath: $.ResponseInfo From c016cf4d783ad0a5daa4368c2bf6b5b2a38b6f71 Mon Sep 17 00:00:00 2001 From: Amardeep Gumber <45850454+deepgumber9996@users.noreply.github.com> Date: Wed, 7 Aug 2024 11:13:30 +0530 Subject: [PATCH 1242/1242] Update integrated bills --- configs/egov-searcher/bill-genie.yml | 78 ++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) diff --git a/configs/egov-searcher/bill-genie.yml b/configs/egov-searcher/bill-genie.yml index bac78338..6986cab4 100644 --- a/configs/egov-searcher/bill-genie.yml +++ b/configs/egov-searcher/bill-genie.yml @@ -336,3 +336,81 @@ SearchDefinitions: jsonFormat: {"ResponseInfo": {},"Bills": []} outJsonPath: $.Bills responseInfoPath: $.ResponseInfo + + - name: integratedbills + isCustomerRowMapEnabled: true + rowMapperKey: billsearch + query: + baseQuery: with bill_data as ( + SELECT conn.status as conn_status,conn.property_id as pid,conn.oldConnectionNo as oldpid,conn.additionaldetails as conn_add,b.id AS b_id, b.mobilenumber, + b.tenantid AS b_tenantid, b.payername AS b_payername, + b.payeraddress AS b_payeraddress, b.payeremail AS b_payeremail, + b.isactive AS b_isactive, b.iscancelled AS b_iscancelled, + b.createdby AS b_createdby, b.status as b_status, b.filestoreid AS b_filestoreid, + b.createddate AS b_createddate, b.lastmodifiedby AS b_lastmodifiedby, + b.lastmodifieddate AS b_lastmodifieddate, bd.id AS bd_id, + bd.billid AS bd_billid, bd.tenantid AS bd_tenantid, + bd.businessservice AS bd_businessservice, bd.demandid, + bd.fromperiod, bd.toperiod, + bd.billno AS bd_billno, bd.billdate AS bd_billdate, + bd.consumercode AS bd_consumercode, bd.consumertype AS bd_consumertype, + bd.billdescription AS bd_billdescription, bd.displaymessage AS bd_displaymessage, + bd.minimumamount AS bd_minimumamount, bd.totalamount AS bd_totalamount, + bd.callbackforapportioning AS bd_callbackforapportioning, bd.expirydate AS bd_expirydate, + bd.partpaymentallowed AS bd_partpaymentallowed, bd.isadvanceallowed as bd_isadvanceallowed, + bd.collectionmodesnotallowed AS bd_collectionmodesnotallowed, bd.createddate as bd_createddate, + b.additionaldetails as b_additionaldetails, bd.additionaldetails as bd_additionaldetails, + ad.id AS ad_id, ad.tenantid AS ad_tenantid, + ad.billdetail AS ad_billdetail, ad.glcode AS ad_glcode, + ad.orderno AS ad_orderno, ad.accountdescription AS ad_accountdescription, + ad.amount AS ad_amount, ad.adjustedamount AS ad_adjustedamount, + ad.taxheadcode AS ad_taxheadcode, ad.demanddetailid, + ad.isactualdemand AS ad_isactualdemand, ad.purpose AS ad_purpose, + ad.additionaldetails as ad_additionaldetails, + ptadd.doorNo as ptadd_doorNo, ptadd.landmark as ptadd_landmark, + ptadd.city as ptadd_city, ptadd.pincode as ptadd_pincode, + ptadd.locality as ptadd_locality, ptown.userid as ptown_userid + + FROM egbs_bill_v1 b INNER JOIN egbs_billdetail_v1 bd ON b.id = bd.billid AND b.tenantid = bd.tenantid AND b.status='ACTIVE' + INNER JOIN egbs_billaccountdetail_v1 ad ON bd.id = ad.billdetail AND bd.tenantid = ad.tenantid + INNER JOIN eg_ws_connection conn ON bd.consumercode = conn.connectionno + INNER JOIN eg_pt_property pt ON conn.property_id = pt.propertyid + INNER JOIN eg_pt_address ptadd ON ptadd.propertyid = pt.id + INNER JOIN eg_pt_owner ptown ON ptown.propertyid = pt.id $where AND bd.businessservice IN ('WS', 'SW') order by conn.property_id asc) + + select * from bill_data inner join (select max(b_createddate) as maxcreateddate,bd_businessservice as business from bill_data group by bd_businessservice) as max ON max.business=bd_businessservice + searchParams: + condition: AND + params: + - name: b.tenantid + isMandatory: true + jsonPath: $.searchCriteria.tenantId + - name: bd.consumercode + isMandatory: false + jsonPath: $.searchCriteria.consumerCode + operator: ILIKE + - name: b.mobilenumber + isMandatory: false + jsonPath: $.searchCriteria.mobileNumber + - name: bd.billno + isMandatory: false + jsonPath: $.searchCriteria.billNo + - name: ptadd.locality + isMandatory: false + jsonPath: $.searchCriteria.locality + - name: fromperiod + isMandatory: false + jsonPath: $.searchCriteria.fromPeriod + operator: LE + - name: toperiod + isMandatory: false + jsonPath: $.searchCriteria.toPeriod + operator: GE + - name: b.status + isMandatory: false + jsonPath: $.searchCriteria.billActive + + output: + jsonFormat: {"ResponseInfo": {},"Bills": []} + outJsonPath: $.Bills + responseInfoPath: $.ResponseInfo